Skip to content

Commit 6e1946c

Browse files
kossebaukossebau
committed
Remove module prefix from Qt includes
1 parent 3cffbfa commit 6e1946c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+102
-89
lines changed

Diff for: ‎components/keyboardlayout/keyboardlayout.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
#include "keyboardlayout.h"
2121

22-
#include <QtDBus/QDBusInterface>
23-
#include <QtDBus/QDBusReply>
22+
#include <QDBusInterface>
23+
#include <QDBusReply>
2424

2525
#include <QDebug>
2626
#include "debug.h"

Diff for: ‎components/keyboardlayout/keyboardlayout.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
#ifndef KEYBOARDLAYOUT_H
2121
#define KEYBOARDLAYOUT_H
2222

23-
#include <QtCore/QObject>
24-
#include <QtCore/QStringList>
23+
#include <QObject>
24+
#include <QStringList>
2525

2626
class QDBusInterface;
2727
class QDBusPendingCallWatcher;

Diff for: ‎components/shellprivate/widgetexplorer/kcategorizeditemsviewmodels.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
#include "kcategorizeditemsviewmodels_p.h"
2121
#include <klocalizedstring.h>
22+
#include <QDebug>
2223

2324
#define COLUMN_COUNT 4
2425

Diff for: ‎components/shellprivate/widgetexplorer/kcategorizeditemsviewmodels_p.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@
2020
#ifndef PLASMA_KCATEGORIZEDITEMSVIEWMODELS_P_H
2121
#define PLASMA_KCATEGORIZEDITEMSVIEWMODELS_P_H
2222

23-
#include <QtGui/QtGui>
24-
#include <QtCore/QtCore>
2523
#include <QIcon>
24+
#include <QPair>
25+
#include <QStandardItem>
26+
#include <QSortFilterProxyModel>
2627

2728
namespace KCategorizedItemsViewModels {
2829

Diff for: ‎components/shellprivate/widgetexplorer/plasmaappletitemmodel.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
#include <QStandardPaths>
2323
#include <QFileInfo>
24+
#include <QMimeData>
2425

2526
#include <klocalizedstring.h>
2627
#include <kservicetypetrader.h>

Diff for: ‎dataengines/activities/ActivityData.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
#include <QObject>
2424
#include <QString>
25-
#include <QtDBus/QDBusArgument>
25+
#include <QDBusArgument>
2626
#include <QDebug>
2727

2828
class ActivityData {

Diff for: ‎dataengines/activities/activityengine.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#ifndef ACTIVITY_ENGINE_H
2121
#define ACTIVITY_ENGINE_H
2222

23-
#include <QtCore/QHash>
23+
#include <QHash>
2424

2525
#include <Plasma/Service>
2626
#include <Plasma/DataEngine>

Diff for: ‎dataengines/calendar/calendarengine.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#include "calendarengine.h"
2323

24-
#include <QtCore/QDate>
24+
#include <QDate>
2525

2626
#include <KCalendarSystem>
2727
#include <KDateTime>

Diff for: ‎dataengines/geolocation/geolocationprovider.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
#ifndef GEOLOCATIONPROVIDER_H
1919
#define GEOLOCATIONPROVIDER_H
2020

21-
#include <QtCore/QHash>
22-
#include <QtCore/QObject>
23-
#include <QtCore/QTimer>
21+
#include <QHash>
22+
#include <QObject>
23+
#include <QTimer>
2424

2525
#include <Plasma/DataEngine>
2626

Diff for: ‎dataengines/hotplug/hotplugjob.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
#include "hotplugjob.h"
2020
#include "hotplugengine.h"
2121

22-
#include <QtDBus/QDBusInterface>
23-
#include <QtDBus/QDBusReply>
22+
#include <QDBusInterface>
23+
#include <QDBusReply>
2424

2525
#include <QDebug>
2626

Diff for: ‎dataengines/places/placesengine.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
#include "placesengine.h"
2020

21-
#include <QtCore/QString>
21+
#include <QString>
2222
#include <QIcon>
2323
#include <QDebug>
2424

Diff for: ‎dataengines/powermanagement/powermanagementengine.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@
3434

3535
#include <QDebug>
3636

37-
#include <QtDBus/QDBusConnectionInterface>
38-
#include <QtDBus/QDBusError>
39-
#include <QtDBus/QDBusInterface>
40-
#include <QtDBus/QDBusMetaType>
41-
#include <QtDBus/QDBusReply>
42-
#include <QtDBus/QDBusPendingCallWatcher>
37+
#include <QDBusConnectionInterface>
38+
#include <QDBusError>
39+
#include <QDBusInterface>
40+
#include <QDBusMetaType>
41+
#include <QDBusReply>
42+
#include <QDBusPendingCallWatcher>
4343

4444
#include <Plasma/DataContainer>
4545
#include "powermanagementservice.h"

Diff for: ‎dataengines/powermanagement/powermanagementengine.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
#include <solid/battery.h>
2727

28-
#include <QtDBus/QDBusConnection>
28+
#include <QDBusConnection>
2929
#include <QHash>
3030
#include <QPair>
3131

Diff for: ‎dataengines/statusnotifieritem/statusnotifieritemjob.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#define STATUSNOTIFIERITEMJOB_H
2222

2323
// Qt
24-
#include <QtWidgets/QMenu>
24+
#include <QMenu>
2525

2626
// own
2727
#include "statusnotifieritemsource.h"

Diff for: ‎dataengines/statusnotifieritem/statusnotifieritemsource.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <Plasma/DataContainer>
2626
#include <QString>
2727
#include <QDBusPendingCallWatcher>
28-
#include <QtWidgets/QMenu>
28+
#include <QMenu>
2929

3030
#include "statusnotifieritem_interface.h"
3131

Diff for: ‎dataengines/systemmonitor/sensorclient.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
#ifndef KSG_SENSORCLIENT_H
2323
#define KSG_SENSORCLIENT_H
2424

25-
#include <QtCore/QByteArray>
26-
#include <QtCore/QList>
27-
#include <QtCore/QString>
25+
#include <QByteArray>
26+
#include <QList>
27+
#include <QString>
2828

2929
namespace KSGRD {
3030

Diff for: ‎freespacenotifier/freespacenotifier.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,9 @@
2121

2222
#include <QDir>
2323
#include <QMenu>
24+
#include <QDBusInterface>
2425
#include <QDebug>
2526

26-
#include <QtDBus/QtDBus>
27-
2827
#include <KLocalizedString>
2928
#include <KRun>
3029
#include <KConfigDialog>

Diff for: ‎freespacenotifier/freespacenotifier.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
#ifndef _FREESPACENOTIFIER_H_
2121
#define _FREESPACENOTIFIER_H_
2222

23-
#include <QtCore/QTimer>
24-
#include <QtDBus/QDBusInterface>
23+
#include <QTimer>
2524

2625
class KNotification;
2726
class KStatusNotifierItem;
27+
class QDBusInterface;
2828

2929
class FreeSpaceNotifier : public QObject
3030
{

Diff for: ‎freespacenotifier/module.h

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
#include <KDEDModule>
2424
#include <QObject>
25-
#include <QtDBus/QtDBus>
2625

2726
#include "freespacenotifier.h"
2827

Diff for: ‎kioslave/desktop/desktopnotifier.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
#include <kdirnotify.h>
2626

2727
#include <QStandardPaths>
28-
#include <QUrl>
28+
#include <QFile>
29+
#include <QDir>
2930

3031
K_PLUGIN_FACTORY_WITH_JSON(DesktopNotifierFactory,
3132
"desktopnotifier.json",

Diff for: ‎kioslave/desktop/desktopnotifier.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
#define DESKTOPNOTIFIER_H
2121

2222
#include <kdedmodule.h>
23-
#include <QtDBus/QtDBus>
23+
#include <QDBusAbstractAdaptor>
24+
#include <QUrl>
2425

2526
class KDirWatch;
2627

Diff for: ‎klipper/autotests/historytest.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
1919
#include "../history.h"
2020
#include "../historystringitem.h"
2121
// Qt
22-
#include <QtTest/QtTest>
22+
#include <QtTest>
2323
#include <QSignalSpy>
2424
#include <QObject>
2525

Diff for: ‎klipper/autotests/modeltest.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@
4040
****************************************************************************/
4141

4242

43-
#include <QtGui/QtGui>
43+
#include <QtGui>
4444

4545
#include "modeltest.h"
4646

47-
#include <QtTest/QtTest>
47+
#include <QtTest>
4848

4949
/*!
5050
Connect to all of the models signals. Whenever anything happens recheck everything.

Diff for: ‎krunner/view.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#include <KGlobalAccel>
3636
#include <KLocalizedString>
3737
#include <KDirWatch>
38-
#include <KCrash/KCrash>
38+
#include <KCrash>
3939

4040
#include <kdeclarative/qmlobject.h>
4141

Diff for: ‎krunner/view.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#define VIEW_H
2121

2222
#include <QPointer>
23-
#include <QtQuick/QQuickView>
23+
#include <QQuickView>
2424
#include <KConfigGroup>
2525
#include <KSharedConfig>
2626

Diff for: ‎ksmserver/legacy.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2929
3030
******************************************************************/
3131

32-
#include <QtX11Extras/QX11Info>
32+
#include <QX11Info>
3333
#include <QDebug>
3434

3535
#include <config-workspace.h>

Diff for: ‎ksmserver/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3131
#include <string.h>
3232

3333
#include <KMessageBox>
34-
#include <QtDBus/QtDBus>
3534

3635
#include <kconfiggroup.h>
3736
#include <kdbusservice.h>
@@ -45,6 +44,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
4544
#include <QX11Info>
4645

4746
#include <QApplication>
47+
#include <QCommandLineParser>
4848
#include <QQuickWindow>
4949
#include <X11/extensions/Xrender.h>
5050

Diff for: ‎ksmserver/server.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
6666
#include <QFile>
6767
#include <QPushButton>
6868
#include <QRegExp>
69-
#include <QtDBus/QtDBus>
69+
#include <QDBusConnection>
7070
#include <QSocketNotifier>
7171
#include <QStandardPaths>
7272
#include <QDebug>

Diff for: ‎ksmserver/shutdown.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
6060
#include <QApplication>
6161
#include <QPushButton>
6262
#include <QTimer>
63-
#include <QtDBus/QtDBus>
63+
#include <QFile>
64+
#include <QProcess>
65+
#include <QFutureWatcher>
6466
#include <QtConcurrentRun>
6567

6668
#include <KConfig>

Diff for: ‎ksmserver/shutdowndlg.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3030
#include <QQuickItem>
3131
#include <QTimer>
3232
#include <QFile>
33-
#include <QtDBus/QDBusConnection>
34-
#include <QtDBus/QDBusMessage>
35-
#include <QtDBus/QDBusPendingCall>
33+
#include <QDBusConnection>
34+
#include <QDBusMessage>
35+
#include <QDBusPendingCall>
3636
#include <QQuickView>
3737
#include <QQmlContext>
3838
#include <QQmlEngine>
3939
#include <QQmlPropertyMap>
4040
#include <QPainter>
4141
#include <QStandardPaths>
42-
#include <QtX11Extras/qx11info_x11.h>
42+
#include <QX11Info>
4343
#include <QScreen>
4444
#include <QStandardPaths>
4545

Diff for: ‎ksmserver/startup.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
6060
#endif
6161

6262
#include <QTimer>
63-
#include <QtDBus/QtDBus>
63+
#include <QDBusConnection>
64+
#include <QDBusMessage>
65+
#include <QDBusPendingCall>
6466
#include <phonon/audiooutput.h>
6567
#include <phonon/mediaobject.h>
6668
#include <phonon/mediasource.h>

Diff for: ‎ktimezoned/ktimezoned_win.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626

2727
#include <QStringList>
2828
#include <QTextStream>
29-
#include <QtDBus/QtDBus>
29+
#include <QDBusConnection>
30+
#include <QDBusMessage>
3031
#include <QThread>
3132
#include <QDebug>
3233

Diff for: ‎kuiserver/jobview.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626

2727
#include <KLocalizedString>
2828
#include <KFormat>
29-
#include <QtDBus/QDBusPendingReply>
30-
#include <qdbusabstractinterface.h>
29+
#include <QDBusPendingReply>
30+
#include <QDBusAbstractInterface>
3131

3232
JobView::JobView(uint jobId, QObject *parent)
3333
: QObject(parent),

Diff for: ‎kuiserver/jobview.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#ifndef JOBVIEW_H
2323
#define JOBVIEW_H
2424

25-
#include <QtDBus/QDBusObjectPath>
25+
#include <QDBusObjectPath>
2626

2727
#include <kio/global.h>
2828

Diff for: ‎kuiserver/progresslistdelegate_p.h

+2-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@
2222

2323
#include "progresslistmodel.h"
2424

25-
#include <QtCore/QList>
26-
#include <QtCore/QObject>
27-
25+
#include <QList>
26+
#include <QObject>
2827
#include <QListView>
2928
#include <QPushButton>
3029
#include <QProgressBar>

Diff for: ‎kuiserver/progresslistmodel.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include "jobviewserver_interface.h"
2828
#include "requestviewcallwatcher.h"
2929
#include "uiserver.h"
30-
#include <QtDBus/qdbusabstractinterface.h>
30+
#include <QDBusAbstractInterface>
3131

3232
ProgressListModel::ProgressListModel(QObject *parent)
3333
: QAbstractItemModel(parent), QDBusContext(), m_jobId(1),

0 commit comments

Comments
 (0)