1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
|
From 5a6fbaa3738de2f22171e5ef511d0250cfe006b6 Mon Sep 17 00:00:00 2001
From: Arun Isaac <arunisaac@systemreboot.net>
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 <QtCore/QRegularExpression>
#include <QtCore/QStringBuilder>
-#include "lib/events/roommessageevent.h"
-#include "lib/user.h"
-#include "lib/connection.h"
-#include "lib/settings.h"
+#include <events/roommessageevent.h>
+#include <user.h>
+#include <connection.h>
+#include <settings.h>
#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 <connection.h>
+#include <jobs/mediathumbnailjob.h>
#include <QtCore/QWaitCondition>
#include <QtCore/QDebug>
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 <connection.h>
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QPushButton>
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 <settings.h>
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 <csapi/joining.h>
+#include <connection.h>
+#include <networkaccessmanager.h>
+#include <settings.h>
+#include <logging.h>
#include <QtCore/QTimer>
#include <QtCore/QDebug>
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 <QtQml> // 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 <connection.h>
+#include <user.h>
+#include <settings.h>
+#include <events/roommemberevent.h>
+#include <events/simplestateevents.h>
+#include <events/redactionevent.h>
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 <user.h>
+#include <connection.h>
#include <QtGui/QIcon>
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 <connection.h>
+#include <util.h>
#include <QtCore/QAbstractListModel>
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 <QtCore/QDebug>
#include <QtGui/QPixmap>
-#include "lib/connection.h"
-#include "lib/room.h"
-#include "lib/user.h"
+#include <connection.h>
+#include <room.h>
+#include <user.h>
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 <networksettings.h>
#include <QtGui/QIntValidator>
#include <QtWidgets/QGroupBox>
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 <connection.h>
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 <user.h>
+#include <events/roommessageevent.h>
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 <room.h>
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 <user.h>
+#include <connection.h>
+#include <csapi/create_room.h>
+#include <logging.h>
#include <QtWidgets/QComboBox>
#include <QtWidgets/QLineEdit>
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 <connection.h>
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 <settings.h>
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 <QtWidgets/QHeaderView>
#include <QtWidgets/QMenu>
-#include "lib/connection.h"
-#include "lib/room.h"
-#include "lib/user.h"
+#include <connection.h>
+#include <room.h>
+#include <user.h>
#include "models/userlistmodel.h"
UserListDock::UserListDock(QWidget* parent)
|
