[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [ruqola] /: Fix includes
From: Laurent Montel <null () kde ! org>
Date: 2018-01-31 21:23:36
Message-ID: E1egzqy-0002ZK-Nl () code ! kde ! org
[Download RAW message or body]
Git commit 47a3e1466546c0072995959e214960083a62a800 by Laurent Montel.
Committed on 31/01/2018 at 21:19.
Pushed by mlaurent into branch 'master'.
Fix includes
M +0 -1 autotests/messagemodeltest.cpp
M +0 -2 autotests/roommodeltest.cpp
M +3 -1 src/aboutdata/qmlaboutdataauthormodel.h
M +3 -0 src/authentication.cpp
M +1 -0 src/ddpapi/ddpclient.cpp
M +1 -2 src/ddpapi/ddpclient.h
M +1 -0 src/emoji.cpp
M +0 -2 src/emoji.h
M +1 -0 src/emojimanager.cpp
M +1 -3 src/main.cpp
M +0 -1 src/message.h
M +0 -2 src/messagemodel.cpp
M +0 -1 src/messagemodel.h
M +5 -0 src/messagequeue.cpp
M +0 -1 src/messagequeue.h
M +0 -1 src/messageurl.h
M +2 -4 src/notification.cpp
M +0 -1 src/otr.h
M +1 -1 src/restapi/restapirequest.cpp
M +1 -2 src/rocketchataccount.cpp
M +1 -0 src/rocketchataccount.h
M +1 -0 src/rocketchatbackend.cpp
M +0 -1 src/rocketchatmessage.h
M +0 -1 src/roomfilterproxymodel.cpp
M +3 -1 src/roommodel.cpp
M +0 -4 src/ruqola.cpp
M +0 -1 src/ruqolalogger.h
M +0 -1 src/unityservicemanager.h
M +1 -1 src/usersmodelforroom.h
M +1 -0 tests/messagemodelgui.cpp
https://commits.kde.org/ruqola/47a3e1466546c0072995959e214960083a62a800
diff --git a/autotests/messagemodeltest.cpp b/autotests/messagemodeltest.cpp
index 47629d4..c19e4f7 100644
--- a/autotests/messagemodeltest.cpp
+++ b/autotests/messagemodeltest.cpp
@@ -20,7 +20,6 @@
#include "messagemodeltest.h"
#include "messagemodel.h"
-#include <QJsonDocument>
#include <QTest>
QTEST_GUILESS_MAIN(MessageModelTest)
diff --git a/autotests/roommodeltest.cpp b/autotests/roommodeltest.cpp
index 8142860..887fe61 100644
--- a/autotests/roommodeltest.cpp
+++ b/autotests/roommodeltest.cpp
@@ -23,9 +23,7 @@
#include "roommodeltest.h"
#include "roommodel.h"
-#include <QAbstractItemModel>
#include <qglobal.h>
-#include <QJsonDocument>
#include <QJsonObject>
#include <QJsonArray>
#include <QSignalSpy>
diff --git a/src/aboutdata/qmlaboutdataauthormodel.h b/src/aboutdata/qmlaboutdataauthormodel.h
index 6d2c133..fa901fe 100644
--- a/src/aboutdata/qmlaboutdataauthormodel.h
+++ b/src/aboutdata/qmlaboutdataauthormodel.h
@@ -21,9 +21,11 @@
#ifndef RUQOLAABOUTDATAAUTHORMODEL_H
#define RUQOLAABOUTDATAAUTHORMODEL_H
-#include <KAboutData>
#include <QAbstractListModel>
#include "libruqola_private_export.h"
+#include <KAboutData>
+#include <QList>
+#include <QHash>
class LIBRUQOLACORE_TESTS_EXPORT QmlAboutDataAuthorModel : public QAbstractListModel
{
diff --git a/src/authentication.cpp b/src/authentication.cpp
index 6918866..1982948 100644
--- a/src/authentication.cpp
+++ b/src/authentication.cpp
@@ -28,6 +28,9 @@
#include <QOAuth2AuthorizationCodeFlow>
#include <QFile>
+#include <QJsonArray>
+#include <QSettings>
+#include <QUuid>
Authentication::Authentication()
{
diff --git a/src/ddpapi/ddpclient.cpp b/src/ddpapi/ddpclient.cpp
index 2009ee4..01d5884 100644
--- a/src/ddpapi/ddpclient.cpp
+++ b/src/ddpapi/ddpclient.cpp
@@ -35,6 +35,7 @@
#include <QJsonDocument>
#include <QJsonObject>
#include <QJsonArray>
+#include <QStandardPaths>
namespace RuqolaTestWebSocket {
LIBRUQOLACORE_EXPORT AbstractWebSocket *_k_ruqola_webSocket = nullptr;
diff --git a/src/ddpapi/ddpclient.h b/src/ddpapi/ddpclient.h
index ab92bb1..b3b89c9 100644
--- a/src/ddpapi/ddpclient.h
+++ b/src/ddpapi/ddpclient.h
@@ -26,8 +26,7 @@
#include "rocketchatmessage.h"
#include "libruqolacore_export.h"
#include <functional>
-#include <QtCore>
-#include <QWebSocket>
+#include <QQueue>
class QJsonObject;
class QJsonDocument;
diff --git a/src/emoji.cpp b/src/emoji.cpp
index 004f4eb..bcb7879 100644
--- a/src/emoji.cpp
+++ b/src/emoji.cpp
@@ -21,6 +21,7 @@
#include "emoji.h"
#include <QJsonObject>
+#include <QJsonArray>
Emoji::Emoji()
{
diff --git a/src/emoji.h b/src/emoji.h
index 20489c4..396fa6f 100644
--- a/src/emoji.h
+++ b/src/emoji.h
@@ -21,9 +21,7 @@
#ifndef EMOJI_H
#define EMOJI_H
-#include <QJsonArray>
#include <QString>
-#include <QObject>
#include <QDebug>
#include "libruqola_private_export.h"
diff --git a/src/emojimanager.cpp b/src/emojimanager.cpp
index 8dd1070..1594c45 100644
--- a/src/emojimanager.cpp
+++ b/src/emojimanager.cpp
@@ -21,6 +21,7 @@
#include "emojimanager.h"
#include <QJsonObject>
+#include <QJsonArray>
#include "ruqola_debug.h"
//TODO cache emoji ?
diff --git a/src/main.cpp b/src/main.cpp
index 7494860..317fb6a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -21,8 +21,7 @@
*/
#include <QApplication>
-#include <QtQml>
-#include <KLocalizedContext>
+#include <QCommandLineParser>
#include <KLocalizedString>
#include <KCrash>
#include "ruqolaregisterengine.h"
@@ -30,7 +29,6 @@
#include <QIcon>
#include <KAboutData>
-#include <QJsonDocument>
#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
#include <KIconTheme>
diff --git a/src/message.h b/src/message.h
index d655e60..4332232 100644
--- a/src/message.h
+++ b/src/message.h
@@ -27,7 +27,6 @@
#include <QJsonObject>
#include <QString>
#include <QVector>
-#include <QObject>
class LIBRUQOLACORE_TESTS_EXPORT Message
{
diff --git a/src/messagemodel.cpp b/src/messagemodel.cpp
index 6eb20f1..e7d5d6f 100644
--- a/src/messagemodel.cpp
+++ b/src/messagemodel.cpp
@@ -21,8 +21,6 @@
*/
#include <QFile>
-#include <QVector>
-#include <QJsonObject>
#include <QJsonDocument>
#include <QDataStream>
#include <QModelIndex>
diff --git a/src/messagemodel.h b/src/messagemodel.h
index d2e6558..125cea2 100644
--- a/src/messagemodel.h
+++ b/src/messagemodel.h
@@ -28,7 +28,6 @@
#include <QAbstractListModel>
#include <QObject>
#include <QByteArray>
-#include <QJsonObject>
class RocketChatAccount;
class TextConverter;
diff --git a/src/messagequeue.cpp b/src/messagequeue.cpp
index 25bd612..4efc4a7 100644
--- a/src/messagequeue.cpp
+++ b/src/messagequeue.cpp
@@ -26,6 +26,11 @@
#include "messagequeue.h"
#include "rocketchataccount.h"
+#include <QJsonArray>
+#include <QPair>
+#include <QDir>
+#include <QDataStream>
+
MessageQueue::MessageQueue(RocketChatAccount *account, QObject *parent)
: QObject(parent)
, mRocketChatAccount(account)
diff --git a/src/messagequeue.h b/src/messagequeue.h
index 312dd77..e768770 100644
--- a/src/messagequeue.h
+++ b/src/messagequeue.h
@@ -23,7 +23,6 @@
#ifndef MESSAGEQUEUE_H
#define MESSAGEQUEUE_H
-#include <QtCore>
#include <QObject>
class RocketChatAccount;
class MessageQueue : public QObject
diff --git a/src/messageurl.h b/src/messageurl.h
index b694622..dcfacd7 100644
--- a/src/messageurl.h
+++ b/src/messageurl.h
@@ -22,7 +22,6 @@
#define MESSAGEURL_H
#include "libruqola_private_export.h"
-#include <QObject>
#include <QDebug>
class LIBRUQOLACORE_TESTS_EXPORT MessageUrl
{
diff --git a/src/notification.cpp b/src/notification.cpp
index 80c17ac..a9ff967 100644
--- a/src/notification.cpp
+++ b/src/notification.cpp
@@ -1,6 +1,7 @@
/*
* Copyright 2016 Riccardo Iaconelli <riccardo@kde.org>
+ * Copyright 2018 Laurent Montel <montel@kde.org>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
@@ -24,10 +25,7 @@
#include "ruqola.h"
#include "ruqola_debug.h"
#include <KLocalizedString>
-
-#include <QAction>
-#include <QMenu>
-#include <QMessageBox>
+#include <QIcon>
Notification::Notification(QObject *parent)
: KStatusNotifierItem(parent)
diff --git a/src/otr.h b/src/otr.h
index 62b79d5..6e06e85 100644
--- a/src/otr.h
+++ b/src/otr.h
@@ -23,7 +23,6 @@
#include "libruqola_private_export.h"
#include <QDebug>
#include <QJsonArray>
-#include <QObject>
struct CryptoSettings
{
diff --git a/src/restapi/restapirequest.cpp b/src/restapi/restapirequest.cpp
index bde33a4..16da675 100644
--- a/src/restapi/restapirequest.cpp
+++ b/src/restapi/restapirequest.cpp
@@ -27,9 +27,9 @@
#include <QUrlQuery>
#include <QJsonDocument>
#include <QJsonObject>
-#include <QJsonArray>
#include <QNetworkCookie>
#include <QNetworkCookieJar>
+#include <QJsonArray>
RestApiRequest::RestApiRequest(QObject *parent)
: QObject(parent)
diff --git a/src/rocketchataccount.cpp b/src/rocketchataccount.cpp
index b2bad57..8cdc72b 100644
--- a/src/rocketchataccount.cpp
+++ b/src/rocketchataccount.cpp
@@ -42,10 +42,9 @@
#include "ddpapi/ddpclient.h"
#include "restapi/restapirequest.h"
-#include <KLocalizedString>
#include <QDesktopServices>
#include <QFile>
-#include <QFileDialog>
+#include <QTimer>
RocketChatAccount::RocketChatAccount(const QString &accountFileName, QObject *parent)
: QObject(parent)
diff --git a/src/rocketchataccount.h b/src/rocketchataccount.h
index c951f83..7034467 100644
--- a/src/rocketchataccount.h
+++ b/src/rocketchataccount.h
@@ -22,6 +22,7 @@
#define ROCKETCHATACCOUNT_H
#include <QObject>
+#include <QUrl>
#include <ddpapi/ddpclient.h>
#include "rocketchataccountsettings.h"
#include "libruqola_private_export.h"
diff --git a/src/rocketchatbackend.cpp b/src/rocketchatbackend.cpp
index 4b31fa0..5283993 100644
--- a/src/rocketchatbackend.cpp
+++ b/src/rocketchatbackend.cpp
@@ -32,6 +32,7 @@
#include "user.h"
#include <QJsonObject>
+#include <QJsonArray>
void process_publicsettings(const QJsonObject &obj, RocketChatAccount *account)
{
diff --git a/src/rocketchatmessage.h b/src/rocketchatmessage.h
index 5233336..15a6568 100644
--- a/src/rocketchatmessage.h
+++ b/src/rocketchatmessage.h
@@ -25,7 +25,6 @@
#include "user.h"
#include <QString>
#include <QJsonDocument>
-#include <QObject>
class QDateTime;
class LIBRUQOLACORE_TESTS_EXPORT RocketChatMessage
{
diff --git a/src/roomfilterproxymodel.cpp b/src/roomfilterproxymodel.cpp
index b985a2a..006613f 100644
--- a/src/roomfilterproxymodel.cpp
+++ b/src/roomfilterproxymodel.cpp
@@ -20,7 +20,6 @@
#include "roomfilterproxymodel.h"
#include "roommodel.h"
-#include <QDebug>
RoomFilterProxyModel::RoomFilterProxyModel(QObject *parent)
: QSortFilterProxyModel(parent)
diff --git a/src/roommodel.cpp b/src/roommodel.cpp
index d69a428..cd260c6 100644
--- a/src/roommodel.cpp
+++ b/src/roommodel.cpp
@@ -26,8 +26,10 @@
#include "roomwrapper.h"
#include <KLocalizedString>
-#include <QAbstractItemModel>
#include <QIcon>
+#include <QDir>
+#include <QFile>
+#include <QJsonArray>
RoomModel::RoomModel(RocketChatAccount *account, QObject *parent)
: QAbstractListModel(parent)
diff --git a/src/ruqola.cpp b/src/ruqola.cpp
index e3f0ad0..d36c8e5 100644
--- a/src/ruqola.cpp
+++ b/src/ruqola.cpp
@@ -30,10 +30,6 @@
#include "aboutdata/qmlaboutdata.h"
#include "restapi/restapirequest.h"
#include <KNotification>
-#include <QFileDialog>
-#include <QTcpSocket>
-#include <QDataStream>
-#include <KAboutData>
Ruqola::Ruqola(QObject *parent)
: QObject(parent)
diff --git a/src/ruqolalogger.h b/src/ruqolalogger.h
index f5c2b39..259c1ac 100644
--- a/src/ruqolalogger.h
+++ b/src/ruqolalogger.h
@@ -20,7 +20,6 @@
#ifndef RUQOLALOGGER_H
#define RUQOLALOGGER_H
-#include <QObject>
#include <QFile>
class RuqolaLogger
diff --git a/src/unityservicemanager.h b/src/unityservicemanager.h
index 2a4b0c3..ec142b9 100644
--- a/src/unityservicemanager.h
+++ b/src/unityservicemanager.h
@@ -21,7 +21,6 @@
#define UNITYSERVICEMANAGER_H
#include "libruqola_private_export.h"
-#include <QModelIndex>
#include <QObject>
class QDBusServiceWatcher;
class QAbstractItemModel;
diff --git a/src/usersmodelforroom.h b/src/usersmodelforroom.h
index bee4f57..c579fa4 100644
--- a/src/usersmodelforroom.h
+++ b/src/usersmodelforroom.h
@@ -21,8 +21,8 @@
#ifndef USERSFORROOMMODEL_H
#define USERSFORROOMMODEL_H
-#include <QSortFilterProxyModel>
#include "libruqolacore_export.h"
+#include <QAbstractListModel>
class LIBRUQOLACORE_EXPORT UsersModelForRoom : public QAbstractListModel
{
diff --git a/tests/messagemodelgui.cpp b/tests/messagemodelgui.cpp
index f7a38f6..01d2f21 100644
--- a/tests/messagemodelgui.cpp
+++ b/tests/messagemodelgui.cpp
@@ -36,6 +36,7 @@
#include <rocketchataccount.h>
#include <QTextEdit>
#include <QPushButton>
+#include <QDateTime>
MessageModelGui::MessageModelGui(QWidget *parent)
: QWidget(parent)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic