Skip to content

Commit 14ee4e7

Browse files
luis-pereiraluis-pereira
committed
Ran fixqt4headers
Command: fixqt4headers.pl --strip-modules Uses --strip-modules to minimize conditional version compilation. Signed-off-by: Luís Pereira <[email protected]>
1 parent a7b9fd2 commit 14ee4e7

25 files changed

+80
-80
lines changed

‎qiconfix/qiconloader.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@
5353
#include <QtGui/QIconEnginePlugin>
5454
#include <QtGui/QPixmapCache>
5555
#include <QtGui/QIconEngine>
56-
#include <QtGui/QStyleOption>
57-
#include <QtCore/QList>
58-
#include <QtCore/QHash>
59-
#include <QtCore/QDir>
60-
#include <QtCore/QSettings>
56+
#include <QStyleOption>
57+
#include <QList>
58+
#include <QHash>
59+
#include <QDir>
60+
#include <QSettings>
6161
#include <QtGui/QPainter>
62-
#include <QtGui/QApplication>
63-
#include <QtCore/QLatin1Literal>
62+
#include <QApplication>
63+
#include <QLatin1Literal>
6464
//#ifdef Q_WS_MAC
6565
//#include <private/qt_cocoa_helpers_mac_p.h>
6666
//#endif

‎qiconfix/qiconloader_p.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
#include <QtGui/QPixmapCache>
7474
//#include "qt/qicon_p.h"
7575
//#include "qt/qfactoryloader_p.h"
76-
#include <QtCore/QHash>
76+
#include <QHash>
7777

7878
QT_BEGIN_NAMESPACE
7979

‎xdgaction.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828

2929
#include "xdgaction.h"
3030
#include "xdgicon.h"
31-
#include <QtCore/QDebug>
32-
#include <QtCore/QCoreApplication>
31+
#include <QDebug>
32+
#include <QCoreApplication>
3333

3434

3535
/************************************************

‎xdgaction.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232

3333
#include "xdgdesktopfile.h"
3434

35-
#include <QtGui/QAction>
36-
#include <QtCore/QString>
35+
#include <QAction>
36+
#include <QString>
3737

3838

3939
/*******************************************************************/ /*!

‎xdgautostart.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828

2929
#include "xdgautostart.h"
3030
#include "xdgdirs.h"
31-
#include <QtCore/QDebug>
32-
#include <QtCore/QSet>
33-
#include <QtCore/QDir>
31+
#include <QDebug>
32+
#include <QSet>
33+
#include <QDir>
3434

3535
/************************************************
3636
The Autostart Directories are $XDG_CONFIG_DIRS/autostart. If the same filename is

‎xdgdesktopfile.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@
3939
#include "xdgdirs.h"
4040

4141
#include <stdlib.h>
42-
#include <QtCore/QSharedData>
43-
#include <QtCore/QFile>
44-
#include <QtCore/QDir>
45-
#include <QtCore/QFileInfo>
42+
#include <QSharedData>
43+
#include <QFile>
44+
#include <QDir>
45+
#include <QFileInfo>
4646
#include <QDebug>
47-
#include <QtCore/QHash>
48-
#include <QtCore/QProcess>
47+
#include <QHash>
48+
#include <QProcess>
4949
#include <QUrl>
5050
#include <QDesktopServices>
5151
#include <QList>

‎xdgdesktopfile.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@
3030
#ifndef QTXDG_XDGDESKTOPFILE_H
3131
#define QTXDG_XDGDESKTOPFILE_H
3232

33-
#include <QtCore/QSharedDataPointer>
33+
#include <QSharedDataPointer>
3434
//#include <QObject>
35-
#include <QtCore/QString>
36-
#include <QtCore/QVariant>
37-
#include <QtCore/QStringList>
35+
#include <QString>
36+
#include <QVariant>
37+
#include <QStringList>
3838
#include <QtGui/QIcon>
39-
#include <QtCore/QSettings>
39+
#include <QSettings>
4040

4141
class XdgDesktopFileData;
4242

‎xdgdirs.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828

2929
#include "xdgdirs.h"
3030
#include <stdlib.h>
31-
#include <QtCore/QDir>
32-
#include <QtCore/QDebug>
31+
#include <QDir>
32+
#include <QDebug>
3333

3434

3535
/************************************************

‎xdgdirs.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
#ifndef QTXDG_XDGDIRS_H
3131
#define QTXDG_XDGDIRS_H
3232

33-
#include <QtCore/QString>
34-
#include <QtCore/QStringList>
33+
#include <QString>
34+
#include <QStringList>
3535

3636
/*! @brief The XdgMenu class implements the "XDG Base Directory Specification" from freedesktop.org.
3737
* This specification defines where these files should be looked for by defining one or more base

‎xdgicon.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@
2929

3030
#include "xdgicon.h"
3131

32-
#include <QtCore/QString>
33-
#include <QtCore/QDebug>
34-
#include <QtCore/QDir>
35-
#include <QtCore/QStringList>
36-
#include <QtCore/QFileInfo>
37-
#include <QtCore/QCache>
32+
#include <QString>
33+
#include <QDebug>
34+
#include <QDir>
35+
#include <QStringList>
36+
#include <QFileInfo>
37+
#include <QCache>
3838
#include "qiconfix/qiconloader_p.h"
39-
#include <QtCore/QCoreApplication>
39+
#include <QCoreApplication>
4040

4141
#define DEFAULT_APP_ICON "application-x-executable"
4242

‎xdgicon.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
#define QTXDG_XDGICON_H
3232

3333
#include <QtGui/QIcon>
34-
#include <QtCore/QString>
35-
#include <QtCore/QStringList>
34+
#include <QString>
35+
#include <QStringList>
3636

3737
class XdgIcon
3838
{

‎xdgmenu.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,19 @@
3636
#include "xdgdirs.h"
3737
#include "xdgmenulayoutprocessor.h"
3838

39-
#include <QtCore/QDebug>
39+
#include <QDebug>
4040
#include <QtXml/QDomElement>
4141
#include <QtXml/QDomNamedNodeMap>
42-
#include <QtCore/QFile>
43-
#include <QtCore/QSettings>
44-
#include <QtCore/QFileInfo>
45-
#include <QtCore/QDir>
46-
#include <QtCore/QHash>
47-
#include <QtCore/QLocale>
48-
#include <QtCore/QFileSystemWatcher>
49-
#include <QtCore/QTranslator>
50-
#include <QtCore/QCoreApplication>
51-
#include <QtCore/QCryptographicHash>
42+
#include <QFile>
43+
#include <QSettings>
44+
#include <QFileInfo>
45+
#include <QDir>
46+
#include <QHash>
47+
#include <QLocale>
48+
#include <QFileSystemWatcher>
49+
#include <QTranslator>
50+
#include <QCoreApplication>
51+
#include <QCryptographicHash>
5252

5353
void installTranslation(const QString &name)
5454
{

‎xdgmenu.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
#define QTXDG_XDGMENU_H
3232

3333
#include <QObject>
34-
#include <QtCore/QString>
35-
#include <QtCore/QStringList>
34+
#include <QString>
35+
#include <QStringList>
3636
#include <QtXml/QDomDocument>
3737

3838

‎xdgmenu_p.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727

2828

2929
#include "xdgmenu.h"
30-
#include <QtCore/QObject>
31-
#include <QtCore/QFileSystemWatcher>
32-
#include <QtCore/QTimer>
30+
#include <QObject>
31+
#include <QFileSystemWatcher>
32+
#include <QTimer>
3333

3434
#define REBUILD_DELAY 3000
3535

‎xdgmenuapplinkprocessor.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
#define QTXDG_XDGMENUAPPLINKPROCESSOR_H
3131

3232
#include "xdgmenurules.h"
33-
#include <QtCore/QObject>
33+
#include <QObject>
3434
#include <QtXml/QDomElement>
35-
#include <QtCore/QLinkedList>
36-
#include <QtCore/QString>
37-
#include <QtCore/QHash>
35+
#include <QLinkedList>
36+
#include <QString>
37+
#include <QHash>
3838

3939
class XdgMenu;
4040
class XdgMenuAppFileInfo;

‎xdgmenulayoutprocessor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include "xdgmenulayoutprocessor.h"
3030
#include "xmlhelper.h"
3131
#include <QDebug>
32-
#include <QtCore/QMap>
32+
#include <QMap>
3333

3434

3535
/************************************************

‎xdgmenulayoutprocessor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#define QTXDG_XDGMENULAYOUTPROCESSOR_H
3131

3232
#include <QtXml/QDomElement>
33-
#include <QtCore/QList>
33+
#include <QList>
3434

3535
struct LayoutItem
3636
{

‎xdgmenureader.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@
3131
#include "xdgdirs.h"
3232
#include "xmlhelper.h"
3333

34-
#include <QtCore/QFile>
35-
#include <QtCore/QFileInfo>
36-
#include <QtCore/QDebug>
37-
#include <QtCore/QString>
38-
#include <QtCore/QDir>
34+
#include <QFile>
35+
#include <QFileInfo>
36+
#include <QDebug>
37+
#include <QString>
38+
#include <QDir>
3939
#include <QDebug>
4040
#include <QtXml/QDomNamedNodeMap>
4141
#include <QtXml/QDomNode>

‎xdgmenureader.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
#ifndef QTXDG_XDGMENUREADER_H
3030
#define QTXDG_XDGMENUREADER_H
3131

32-
#include <QtCore/QObject>
33-
#include <QtCore/QString>
34-
#include <QtCore/QStringList>
32+
#include <QObject>
33+
#include <QString>
34+
#include <QStringList>
3535
#include <QtXml/QDomDocument>
3636
#include <QtXml/QDomElement>
3737
class XdgMenu;

‎xdgmenurules.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
#ifndef QTXDG_XDGMENURULES_H
3535
#define QTXDG_XDGMENURULES_H
3636

37-
#include <QtCore/QObject>
37+
#include <QObject>
3838
#include <QtXml/QDomElement>
39-
#include <QtCore/QLinkedList>
39+
#include <QLinkedList>
4040

4141
#include "xdgdesktopfile.h"
4242

‎xdgmenuwidget.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232
#include "xdgaction.h"
3333
#include "xdgmenu.h"
3434

35-
#include <QtCore/QEvent>
36-
#include <QtCore/QDebug>
37-
#include <QtCore/QUrl>
35+
#include <QEvent>
36+
#include <QDebug>
37+
#include <QUrl>
3838
#include <QtGui/QDrag>
3939
#include <QtGui/QMouseEvent>
40-
#include <QtGui/QApplication>
40+
#include <QApplication>
4141

4242
class XdgMenuWidgetPrivate
4343
{

‎xdgmime.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include <QFileInfo>
3434
#include <magic.h>
3535
#include <QDebug>
36-
#include <QtCore/QStringList>
36+
#include <QStringList>
3737
#include <QMap>
3838
#include <QDir>
3939
#include <QFileInfo>

‎xdgmime.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
#ifndef QTXDG_XDGMIME_H
3030
#define QTXDG_XDGMIME_H
3131

32-
#include <QtCore/QString>
33-
#include <QtCore/QFileInfo>
32+
#include <QString>
33+
#include <QFileInfo>
3434
#include <QtGui/QIcon>
3535

3636
struct XdgMimeData;

‎xmlhelper.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
#include "xmlhelper.h"
3030

31-
#include <QtCore/QDebug>
31+
#include <QDebug>
3232
#include <QtXml/QDomElement>
3333
#include <QtXml/QDomNode>
3434

‎xmlhelper.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#ifndef QTXDG_XMLHELPER_H
3030
#define QTXDG_XMLHELPER_H
3131

32-
#include <QtCore/QDebug>
32+
#include <QDebug>
3333
#include <QtXml/QDomElement>
3434
#include <QtXml/QDomNode>
3535

0 commit comments

Comments
 (0)