Commit fcc1e1a8 authored by R. Harish Navnit's avatar R. Harish Navnit Committed by Pali Rohár

Start porting kopete to KF5

Modify Qt includes to adapt to Qt5 API's
parent 246b4b10
......@@ -57,9 +57,9 @@ add_executable(kopete_bin ${kopete_SRCS})
set_target_properties(kopete_bin PROPERTIES RUNTIME_OUTPUT_NAME kopete)
target_link_libraries(kopete_bin
KF5::Contacts
KF5::TextEditor
KF5::NotifyConfig
${KDE4_KABC_LIBS}
${KDE4_SOLID_LIBRARY}
${QIMAGEBLITZ_LIBRARIES}
kopete
......
......@@ -18,8 +18,8 @@
#ifndef ACCESSIBLECHATMESSAGEPART_H
#define ACCESSIBLECHATMESSAGEPART_H
#include <QtGui/QAccessibleTextInterface>
#include <QtGui/QAccessibleWidget>
#include <QAccessibleTextInterface>
#include <QAccessibleWidget>
class KHTMLPart;
class KHTMLView;
......
......@@ -17,7 +17,7 @@
#include "chatwindowaccessiblewidgetfactory.h"
#include <QtCore/qplugin.h>
#include <qplugin.h>
#include "accessiblechatmessagepart.h"
Q_EXPORT_PLUGIN(ChatWindowAccessibleWidgetFactory)
......
......@@ -18,8 +18,8 @@
#ifndef CHATWINDOWACCESSIBLEWIDGETFACTORY_H
#define CHATWINDOWACCESSIBLEWIDGETFACTORY_H
#include <QtGui/qaccessible.h>
#include <QtGui/QAccessiblePlugin>
#include <QAccessible>
#include <QAccessiblePlugin>
class ChatWindowAccessibleWidgetFactory: public QAccessiblePlugin {
public:
......
......@@ -27,21 +27,21 @@
#include <ctime>
// Qt includes
#include <QtCore/QByteArray>
#include <QtCore/QLatin1String>
#include <QtCore/QList>
#include <QtCore/QPointer>
#include <QtCore/QRect>
#include <QtCore/QRegExp>
#include <QtCore/QTextCodec>
#include <QtCore/QTextStream>
#include <QtCore/QTimer>
#include <QtCore/QBuffer>
#include <QtGui/QClipboard>
#include <QtGui/QCursor>
#include <QtGui/QPixmap>
#include <QtGui/QTextDocument>
#include <QtGui/QScrollBar>
#include <QByteArray>
#include <QLatin1String>
#include <QList>
#include <QPointer>
#include <QRect>
#include <QRegExp>
#include <QTextCodec>
#include <QTextStream>
#include <QTimer>
#include <QBuffer>
#include <QClipboard>
#include <QCursor>
#include <QPixmap>
#include <QTextDocument>
#include <QScrollBar>
#include <QMimeData>
#include <QApplication>
#include <QFileDialog>
......
......@@ -45,12 +45,12 @@
// Qt includes
#include <QtCore/QTimer>
#include <QtCore/QRegExp>
#include <QtCore/QEvent>
#include <QTimer>
#include <QRegExp>
#include <QEvent>
#include <QKeyEvent>
#include <QtGui/QTextCursor>
#include <QtGui/QTextCharFormat>
#include <QTextCursor>
#include <QTextCharFormat>
typedef KParts::GenericFactory<ChatTextEditPart> ChatTextEditPartFactory;
......
......@@ -21,10 +21,10 @@
#include <krichtextedit.h>
#include "kopeterichtextwidget.h"
#include <QtGui/QFont>
#include <QtGui/QColor>
#include <QtCore/QFlags>
#include <QtCore/QStringList>
#include <QFont>
#include <QColor>
#include <QFlags>
#include <QStringList>
// TODO: Use kdelibs export
#include <kopete_export.h>
......
......@@ -23,16 +23,16 @@
#include "kopetechatwindow.h"
#include <QtCore/QTextStream>
#include <QtCore/QTimer>
#include <QtGui/QDockWidget>
#include <QtGui/QFrame>
#include <QtGui/QLabel>
#include <QtGui/QLayout>
#include <QtGui/QMenu>
#include <QtGui/QPixmap>
#include <QtGui/QCloseEvent>
#include <QtGui/QVBoxLayout>
#include <QTextStream>
#include <QTimer>
#include <QDockWidget>
#include <QFrame>
#include <QLabel>
#include <QLayout>
#include <QMenu>
#include <QPixmap>
#include <QCloseEvent>
#include <QVBoxLayout>
#ifdef CHRONO
#include <QTime>
......
......@@ -34,10 +34,10 @@
// Qt includes
#include <QUrl>
#include <QtCore/QEvent>
#include <QEvent>
#include <QKeyEvent>
#include <QtGui/QTextCursor>
#include <QtGui/QTextCharFormat>
#include <QTextCursor>
#include <QTextCharFormat>
#include <QTextDocumentFragment>
// TODO: Add i18n context
......
......@@ -20,13 +20,13 @@
#include "kopeteaccountconfig.h"
#include <QtGui/QCheckBox>
#include <QtGui/QLayout>
#include <QtGui/QHeaderView>
#include <QtGui/QBoxLayout>
#include <QtCore/QPointer>
#include <QtCore/QTimer>
#include <QtGui/QContextMenuEvent>
#include <QCheckBox>
#include <QLayout>
#include <QHeaderView>
#include <QBoxLayout>
#include <QPointer>
#include <QTimer>
#include <QContextMenuEvent>
#include <kcolorbutton.h>
#include <kpushbutton.h>
......
......@@ -20,7 +20,7 @@
#ifndef CHATWINDOWCONFIG_H
#define CHATWINDOWCONFIG_H
#include <QtCore/QPointer>
#include <QPointer>
#include <kcmodule.h>
#include "ui_chatwindowconfig_style.h"
......
......@@ -20,8 +20,8 @@
#include "kopetepluginconfig.h"
// Qt includes
#include <QtCore/QByteArray>
#include <QtGui/QVBoxLayout>
#include <QByteArray>
#include <QVBoxLayout>
// KDE includes
#include <kdebug.h>
......
......@@ -18,8 +18,8 @@
#include "statusconfig_manager.h"
#include "statusconfig_general.h"
#include <QtGui/QVBoxLayout>
#include <QtGui/QTabWidget>
#include <QVBoxLayout>
#include <QTabWidget>
#include <kgenericfactory.h>
#include "kopetestatussettings.h"
......
......@@ -16,7 +16,7 @@
#include "statusconfig_manager.h"
#include <QtGui/QHeaderView>
#include <QHeaderView>
#include "kopeteonlinestatusmanager.h"
#include "statusmodel.h"
......
......@@ -18,7 +18,7 @@
#include <klocale.h>
#include <kicon.h>
#include <QtCore/QMimeData>
#include <QMimeData>
#include <QtXml/QDomDocument>
#include "kopetestatusitems.h"
......
......@@ -17,8 +17,8 @@
#ifndef STATUSTREEVIEW_H
#define STATUSTREEVIEW_H
#include <QtGui/QTreeView>
#include <QtGui/QDrag>
#include <QTreeView>
#include <QDrag>
class StatusTreeView : public QTreeView
{
......
......@@ -16,9 +16,9 @@
#include "kopeteaccountstatusbaricon.h"
#include <QtGui/QToolTip>
#include <QtGui/QMouseEvent>
#include <QtGui/QMovie>
#include <QToolTip>
#include <QMouseEvent>
#include <QMovie>
#include <KMenu>
#include <KActionMenu>
......
......@@ -17,7 +17,7 @@
#ifndef KOPETEACCOUNTSTATUSBARICON_H
#define KOPETEACCOUNTSTATUSBARICON_H
#include <QtGui/QLabel>
#include <QLabel>
namespace Kopete
{
......
......@@ -19,9 +19,9 @@
#include "kopetedbusinterface_p.h"
// Qt includes
#include <QtCore/QStringList>
#include <QtCore/QList>
#include <QtCore/QLatin1String>
#include <QStringList>
#include <QList>
#include <QLatin1String>
// KDE includes
#include <kurl.h>
......
......@@ -18,8 +18,8 @@
#ifndef KOPETE_DBUSINTERFACE_H
#define KOPETE_DBUSINTERFACE_H
#include <QtCore/QObject>
#include <QtCore/QVariantMap>
#include <QObject>
#include <QVariantMap>
class KopeteDBusInterfacePrivate;
......
......@@ -17,7 +17,7 @@
#include "kopetedbusinterface_p.h"
#include <QtCore/QTimer>
#include <QTimer>
#include <kopetecontactlist.h>
#include <kopetemetacontact.h>
......
......@@ -18,9 +18,9 @@
#ifndef KOPETE_DBUS_INTERFACE_P_H
#define KOPETE_DBUS_INTERFACE_P_H
#include <QtCore/QObject>
#include <QtCore/QVariantMap>
#include <QtCore/QTime>
#include <QObject>
#include <QVariantMap>
#include <QTime>
#include "kopetemessage.h"
#include "kopetechatsession.h"
......
......@@ -21,7 +21,7 @@
#define KOPETEWINDOW_H
// Qt includes
#include <QtGui/QLabel>
#include <QLabel>
// KDE includes
#include <kxmlguiwindow.h>
......
......@@ -16,7 +16,7 @@
#ifndef KOPETESTATUSEDITACTION_H
#define KOPETESTATUSEDITACTION_H
#include <QtGui/QWidgetAction>
#include <QWidgetAction>
#include <KDialog>
......
......@@ -16,7 +16,7 @@
#ifndef KOPETESTATUSROOTACTION_H
#define KOPETESTATUSROOTACTION_H
#include <QtCore/QObject>
#include <QObject>
#include "kopete_export.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment