From 5a6fbaa3738de2f22171e5ef511d0250cfe006b6 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Fri, 13 Jul 2018 16:25:23 +0530 Subject: [PATCH] Remove references to lib in all #include headers. --- client/chatroomwidget.cpp | 8 ++++---- client/imageprovider.cpp | 4 ++-- client/logindialog.cpp | 2 +- client/main.cpp | 2 +- client/mainwindow.cpp | 12 ++++++------ client/models/messageeventmodel.cpp | 14 +++++++------- client/models/roomlistmodel.cpp | 4 ++-- client/models/roomlistmodel.h | 4 ++-- client/models/userlistmodel.cpp | 6 +++--- client/networkconfigdialog.cpp | 2 +- client/quaternionconnection.h | 2 +- client/quaternionroom.cpp | 4 ++-- client/quaternionroom.h | 2 +- client/roomdialogs.cpp | 8 ++++---- client/roomlistdock.cpp | 2 +- client/systemtrayicon.cpp | 2 +- client/userlistdock.cpp | 6 +++--- 17 files changed, 42 insertions(+), 42 deletions(-) diff --git a/client/chatroomwidget.cpp b/client/chatroomwidget.cpp index e72a7ed..bcd8921 100644 --- a/client/chatroomwidget.cpp +++ b/client/chatroomwidget.cpp @@ -36,10 +36,10 @@ #include #include -#include "lib/events/roommessageevent.h" -#include "lib/user.h" -#include "lib/connection.h" -#include "lib/settings.h" +#include +#include +#include +#include #include "models/messageeventmodel.h" #include "imageprovider.h" #include "chatedit.h" diff --git a/client/imageprovider.cpp b/client/imageprovider.cpp index a627bf1..94f8a4f 100644 --- a/client/imageprovider.cpp +++ b/client/imageprovider.cpp @@ -19,8 +19,8 @@ #include "imageprovider.h" -#include "lib/connection.h" -#include "lib/jobs/mediathumbnailjob.h" +#include +#include #include #include diff --git a/client/logindialog.cpp b/client/logindialog.cpp index f5d082b..633c6e0 100644 --- a/client/logindialog.cpp +++ b/client/logindialog.cpp @@ -19,7 +19,7 @@ #include "logindialog.h" -#include "lib/connection.h" +#include #include #include diff --git a/client/main.cpp b/client/main.cpp index 547f1c7..08c7db6 100644 --- a/client/main.cpp +++ b/client/main.cpp @@ -26,7 +26,7 @@ #include "networksettings.h" #include "mainwindow.h" #include "activitydetector.h" -#include "lib/settings.h" +#include int main( int argc, char* argv[] ) { diff --git a/client/mainwindow.cpp b/client/mainwindow.cpp index 4dd4879..1c22e9f 100644 --- a/client/mainwindow.cpp +++ b/client/mainwindow.cpp @@ -27,11 +27,11 @@ #include "roomdialogs.h" #include "systemtrayicon.h" -#include "lib/csapi/joining.h" -#include "lib/connection.h" -#include "lib/networkaccessmanager.h" -#include "lib/settings.h" -#include "lib/logging.h" +#include +#include +#include +#include +#include #include #include diff --git a/client/models/messageeventmodel.cpp b/client/models/messageeventmodel.cpp index 56d3452..1f18379 100644 --- a/client/models/messageeventmodel.cpp +++ b/client/models/messageeventmodel.cpp @@ -24,12 +24,12 @@ #include // for qmlRegisterType() #include "../quaternionroom.h" -#include "lib/connection.h" -#include "lib/user.h" -#include "lib/settings.h" -#include "lib/events/roommemberevent.h" -#include "lib/events/simplestateevents.h" -#include "lib/events/redactionevent.h" +#include +#include +#include +#include +#include +#include enum EventRoles { EventTypeRole = Qt::UserRole + 1, diff --git a/client/models/roomlistmodel.cpp b/client/models/roomlistmodel.cpp index 39b045b..8e85d65 100644 --- a/client/models/roomlistmodel.cpp +++ b/client/models/roomlistmodel.cpp @@ -21,8 +21,8 @@ #include "../quaternionroom.h" -#include "lib/user.h" -#include "lib/connection.h" +#include +#include #include diff --git a/client/models/roomlistmodel.h b/client/models/roomlistmodel.h index cdc3dd3..79f648f 100644 --- a/client/models/roomlistmodel.h +++ b/client/models/roomlistmodel.h @@ -20,8 +20,8 @@ #pragma once #include "../quaternionroom.h" -#include "lib/connection.h" -#include "lib/util.h" +#include +#include #include diff --git a/client/models/userlistmodel.cpp b/client/models/userlistmodel.cpp index 54b7cf6..704b1f5 100644 --- a/client/models/userlistmodel.cpp +++ b/client/models/userlistmodel.cpp @@ -23,9 +23,9 @@ #include #include -#include "lib/connection.h" -#include "lib/room.h" -#include "lib/user.h" +#include +#include +#include UserListModel::UserListModel(QObject* parent) diff --git a/client/networkconfigdialog.cpp b/client/networkconfigdialog.cpp index 64006db..2b32e28 100644 --- a/client/networkconfigdialog.cpp +++ b/client/networkconfigdialog.cpp @@ -18,7 +18,7 @@ #include "networkconfigdialog.h" -#include "lib/networksettings.h" +#include #include #include diff --git a/client/quaternionconnection.h b/client/quaternionconnection.h index 707790b..b421ef0 100644 --- a/client/quaternionconnection.h +++ b/client/quaternionconnection.h @@ -19,7 +19,7 @@ #pragma once -#include "lib/connection.h" +#include class QuaternionConnection: public QMatrixClient::Connection { diff --git a/client/quaternionroom.cpp b/client/quaternionroom.cpp index c156283..ae38009 100644 --- a/client/quaternionroom.cpp +++ b/client/quaternionroom.cpp @@ -19,8 +19,8 @@ #include "quaternionroom.h" -#include "lib/user.h" -#include "lib/events/roommessageevent.h" +#include +#include using namespace QMatrixClient; diff --git a/client/quaternionroom.h b/client/quaternionroom.h index f7ab255..46410cb 100644 --- a/client/quaternionroom.h +++ b/client/quaternionroom.h @@ -19,7 +19,7 @@ #pragma once -#include "lib/room.h" +#include class QuaternionRoom: public QMatrixClient::Room { diff --git a/client/roomdialogs.cpp b/client/roomdialogs.cpp index 1de2d48..0d75ea9 100644 --- a/client/roomdialogs.cpp +++ b/client/roomdialogs.cpp @@ -19,10 +19,10 @@ #include "roomdialogs.h" #include "quaternionroom.h" -#include "lib/user.h" -#include "lib/connection.h" -#include "lib/csapi/create_room.h" -#include "lib/logging.h" +#include +#include +#include +#include #include #include diff --git a/client/roomlistdock.cpp b/client/roomlistdock.cpp index 3486382..6b61210 100644 --- a/client/roomlistdock.cpp +++ b/client/roomlistdock.cpp @@ -26,7 +26,7 @@ #include "models/roomlistmodel.h" #include "quaternionroom.h" -#include "lib/connection.h" +#include class RoomListItemDelegate : public QStyledItemDelegate { diff --git a/client/systemtrayicon.cpp b/client/systemtrayicon.cpp index 5da7684..deaaee7 100644 --- a/client/systemtrayicon.cpp +++ b/client/systemtrayicon.cpp @@ -21,7 +21,7 @@ #include "mainwindow.h" #include "quaternionroom.h" -#include "lib/settings.h" +#include SystemTrayIcon::SystemTrayIcon(MainWindow* parent) : QSystemTrayIcon(parent) diff --git a/client/userlistdock.cpp b/client/userlistdock.cpp index 76039ac..4cb0c32 100644 --- a/client/userlistdock.cpp +++ b/client/userlistdock.cpp @@ -23,9 +23,9 @@ #include #include -#include "lib/connection.h" -#include "lib/room.h" -#include "lib/user.h" +#include +#include +#include #include "models/userlistmodel.h" UserListDock::UserListDock(QWidget* parent)