[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [labplot] /: [krazy] don't use Qt modules in the includes.
From: Alexander Semke <null () kde ! org>
Date: 2018-09-15 11:18:26
Message-ID: E1g18ao-0002J6-O6 () code ! kde ! org
[Download RAW message or body]
Git commit 17657c5dc95265b9ae0bf831f75718da1192cfbb by Alexander Semke.
Committed on 15/09/2018 at 11:18.
Pushed by asemke into branch 'master'.
[krazy] don't use Qt modules in the includes.
M +1 -2 src/backend/datasources/LiveDataSource.cpp
M +2 -2 src/backend/datasources/LiveDataSource.h
M +1 -1 src/backend/worksheet/TextLabel.cpp
M +4 -4 src/kdefrontend/datasources/ImportFileWidget.cpp
M +0 -4 src/kdefrontend/datasources/ImportFileWidget.h
M +5 -5 src/kdefrontend/datasources/MQTTErrorWidget.cpp
M +2 -7 src/kdefrontend/datasources/MQTTErrorWidget.h
M +1 -1 tests/import_export/ASCII/MqttTest/MQTT_test.cpp
M +2 -2 tests/import_export/ASCII/MqttTest/MQTT_test.h
https://commits.kde.org/labplot/17657c5dc95265b9ae0bf831f75718da1192cfbb
diff --git a/src/backend/datasources/LiveDataSource.cpp b/src/backend/datas=
ources/LiveDataSource.cpp
index 65bec05e..2f7a4929 100644
--- a/src/backend/datasources/LiveDataSource.cpp
+++ b/src/backend/datasources/LiveDataSource.cpp
@@ -49,8 +49,7 @@ Copyright : (C) 2018 Stefan Gerlach (stefan.gerlach@uni.k=
n)
#include <QTimer>
#include <QMessageBox>
=
-#include <QtSerialPort/QSerialPort>
-#include <QtSerialPort/QSerialPortInfo>
+#include <QSerialPortInfo>
#include <QTcpSocket>
#include <QUdpSocket>
=
diff --git a/src/backend/datasources/LiveDataSource.h b/src/backend/datasou=
rces/LiveDataSource.h
index a9d6ac13..9002a0d2 100644
--- a/src/backend/datasources/LiveDataSource.h
+++ b/src/backend/datasources/LiveDataSource.h
@@ -33,7 +33,7 @@
#include "backend/spreadsheet/Spreadsheet.h"
#include "backend/matrix/Matrix.h"
=
-#include <QtNetwork/QLocalSocket>
+#include <QLocalSocket>
#include <QSerialPort>
#include <QTimer>
#include <QVector>
@@ -139,7 +139,7 @@ public:
=
void updateNow();
void pauseReading();
- void continueReading(); =
+ void continueReading();
=
void setFilter(AbstractFileFilter*);
AbstractFileFilter* filter() const;
diff --git a/src/backend/worksheet/TextLabel.cpp b/src/backend/worksheet/Te=
xtLabel.cpp
index 17aae667..14de586e 100644
--- a/src/backend/worksheet/TextLabel.cpp
+++ b/src/backend/worksheet/TextLabel.cpp
@@ -34,7 +34,7 @@
=
#include <QApplication>
#include <QBuffer>
-#include <QtConcurrent/QtConcurrentRun>
+#include <QtConcurrentRun>
#include <QDesktopWidget>
#include <QPainter>
#include <QGraphicsScene>
diff --git a/src/kdefrontend/datasources/ImportFileWidget.cpp b/src/kdefron=
tend/datasources/ImportFileWidget.cpp
index 637a7a8e..dc6d868e 100644
--- a/src/kdefrontend/datasources/ImportFileWidget.cpp
+++ b/src/kdefrontend/datasources/ImportFileWidget.cpp
@@ -80,10 +80,10 @@ Copyright : (C) 2018 Kovacs Ferencz (kferike=
98@gmail.com)
#include "MQTTConnectionManagerDialog.h"
#include "MQTTConnectionManagerWidget.h"
#include "backend/core/Project.h"
-#include <QtMqtt/QMqttClient>
-#include <QtMqtt/QMqttSubscription>
-#include <QtMqtt/QMqttTopicFilter>
-#include <QtMqtt/QMqttMessage>
+#include <QMqttClient>
+#include <QMqttSubscription>
+#include <QMqttTopicFilter>
+#include <QMqttMessage>
#include <QMessageBox>
#include <QWidgetAction>
#include <QMenu>
diff --git a/src/kdefrontend/datasources/ImportFileWidget.h b/src/kdefronte=
nd/datasources/ImportFileWidget.h
index edc70049..40f39fdd 100644
--- a/src/kdefrontend/datasources/ImportFileWidget.h
+++ b/src/kdefrontend/datasources/ImportFileWidget.h
@@ -36,10 +36,6 @@
=
#ifdef HAVE_MQTT
#include "backend/datasources/MQTTClient.h"
-#include <QtMqtt/QMqttClient>
-#include <QtMqtt/QMqttSubscription>
-#include <QtMqtt/QMqttTopicName>
-#include <QtMqtt/QMqttTopicFilter>
#endif
=
#include <QVector>
diff --git a/src/kdefrontend/datasources/MQTTErrorWidget.cpp b/src/kdefront=
end/datasources/MQTTErrorWidget.cpp
index eefeafb3..1e03837f 100644
--- a/src/kdefrontend/datasources/MQTTErrorWidget.cpp
+++ b/src/kdefrontend/datasources/MQTTErrorWidget.cpp
@@ -27,12 +27,12 @@ Copyright : (C) 2018 by Kovacs Ferencz (kfer=
ike98@gmail.com)
=
#include "src/kdefrontend/datasources/MQTTErrorWidget.h"
#ifdef HAVE_MQTT
-#include <QtMqtt/QMqttClient>
-#include <QtMqtt/QMqttSubscription>
-#include <QtMqtt/QMqttTopicFilter>
-#include <QtMqtt/QMqttMessage>
+#include "backend/datasources/MQTTClient.h"
+#include <QMqttSubscription>
+#include <QMqttTopicFilter>
+#include <QMqttMessage>
=
-MQTTErrorWidget::MQTTErrorWidget(QMqttClient::ClientError error, MQTTClien=
t* client, QWidget *parent) : QWidget(parent), =
+MQTTErrorWidget::MQTTErrorWidget(QMqttClient::ClientError error, MQTTClien=
t* client, QWidget *parent) : QWidget(parent),
m_error(error),
m_client(client)
{
diff --git a/src/kdefrontend/datasources/MQTTErrorWidget.h b/src/kdefronten=
d/datasources/MQTTErrorWidget.h
index 8b91b5c7..3ee6c70b 100644
--- a/src/kdefrontend/datasources/MQTTErrorWidget.h
+++ b/src/kdefrontend/datasources/MQTTErrorWidget.h
@@ -31,14 +31,9 @@ Copyright : (C) 2018 by Kovacs Ferencz (kferi=
ke98@gmail.com)
#include <QWidget>
=
#ifdef HAVE_MQTT
-#include <QtMqtt/QMqttClient>
-#include <QtMqtt/QMqttSubscription>
-#include <QtMqtt/QMqttTopicName>
-#include <QtMqtt/QMqttTopicFilter>
-#include <QString>
-
+#include <QMqttClient>
#include "ui_mqtterrorwidget.h"
-#include "backend/datasources/MQTTClient.h"
+class MQTTClient;
#endif
=
class MQTTErrorWidget : public QWidget {
diff --git a/tests/import_export/ASCII/MqttTest/MQTT_test.cpp b/tests/impor=
t_export/ASCII/MqttTest/MQTT_test.cpp
index 9ffe81b3..fc8096b1 100644
--- a/tests/import_export/ASCII/MqttTest/MQTT_test.cpp
+++ b/tests/import_export/ASCII/MqttTest/MQTT_test.cpp
@@ -31,7 +31,7 @@ Copyright : (C) 2018 Kovacs Ferencz (kferike98@gmail.com)
#include "ui_MQTT_test.h"
=
#include <QDateTime>
-#include <QtMqtt/QMqttClient>
+#include <QMqttClient>
#include <QMessageBox>
#include <QtMath>
#include <QTimer>
diff --git a/tests/import_export/ASCII/MqttTest/MQTT_test.h b/tests/import_=
export/ASCII/MqttTest/MQTT_test.h
index bd917cd9..52151fbc 100644
--- a/tests/import_export/ASCII/MqttTest/MQTT_test.h
+++ b/tests/import_export/ASCII/MqttTest/MQTT_test.h
@@ -31,8 +31,8 @@ Copyright : (C) 2018 Kovacs Ferencz (kferike98@gmail.com)
#define MQTT_TEST_H
=
#include <QMainWindow>
-#include <QtMqtt/QMqttClient>
-#include <QtMqtt/QMqttTopicName>
+#include <QMqttClient>
+#include <QMqttTopicName>
#include <QTimer>
#include <QVector>
#include <random>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic