Skip to content

Commit f8a558a

Browse files
committed
Merge pull request #1245 from simonsonc/remove-qtgui
Remove include of QtGui in favor of individual includes
2 parents d0c93b9 + 690e7b0 commit f8a558a

14 files changed

+33
-13
lines changed

src/app/composer/qgsatlascompositionwidget.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
* *
1515
***************************************************************************/
1616

17+
#include <QMessageBox>
18+
1719
#include "qgsatlascompositionwidget.h"
1820
#include "qgsatlascomposition.h"
1921
#include "qgscomposition.h"

src/app/composer/qgscomposer.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@
8282
#include <QPaintEngine>
8383
#include <QProgressBar>
8484
#include <QProgressDialog>
85+
#include <QShortcut>
8586

8687

8788
// sort function for QList<QAction*>, e.g. menu listings

src/app/composer/qgscomposer.h

+2
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ class QResizeEvent;
4848
class QFile;
4949
class QSizeGrip;
5050
class QUndoView;
51+
class QComboBox;
52+
class QLabel;
5153

5254
/** \ingroup MapComposer
5355
* \brief A gui for composing a printable map.

src/app/qgsattributetabledialog.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
* *
1515
***************************************************************************/
1616

17-
#include <QtGui>
17+
#include <QDockWidget>
18+
#include <QMessageBox>
1819

1920
#include "qgsattributetabledialog.h"
2021
#include "qgsattributetablemodel.h"

src/app/qgsundowidget.h

+9-9
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
#ifndef QGSUNDOWIDGET_H
1616
#define QGSUNDOWIDGET_H
1717

18-
#include <QtCore/QVariant>
19-
#include <QtGui/QAction>
20-
#include <QtGui/QApplication>
21-
#include <QtGui/QButtonGroup>
22-
#include <QtGui/QDockWidget>
23-
#include <QtGui/QGridLayout>
24-
#include <QtGui/QPushButton>
25-
#include <QtGui/QSpacerItem>
26-
#include <QtGui/QWidget>
18+
#include <QVariant>
19+
#include <QAction>
20+
#include <QApplication>
21+
#include <QButtonGroup>
22+
#include <QDockWidget>
23+
#include <QGridLayout>
24+
#include <QPushButton>
25+
#include <QSpacerItem>
26+
#include <QWidget>
2727
#include <QUndoView>
2828
#include <QUndoStack>
2929

src/core/composer/qgscomposereffect.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
#ifndef QGSCOMPOSEREFFECT_H
1919
#define QGSCOMPOSEREFFECT_H
2020

21-
#include <QtGui>
2221
#include <QGraphicsEffect>
22+
#include <QPainter>
2323

2424
class CORE_EXPORT QgsComposerEffect : public QGraphicsEffect
2525
{

src/core/composer/qgscomposerlabel.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
#include <QDate>
2323
#include <QDomElement>
2424
#include <QPainter>
25+
#include <QSettings>
26+
#include <QTimer>
2527
#include <QWebFrame>
2628
#include <QWebPage>
2729
#include <QEventLoop>

src/core/composer/qgscomposerlegendstyle.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include "qgscomposition.h"
2020
#include <QFont>
2121
#include <QMap>
22+
#include <QSettings>
2223
#include <QString>
2324
#include <QDomElement>
2425
#include <QDomDocument>

src/core/composer/qgscomposermousehandles.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
* (at your option) any later version. *
1515
* *
1616
***************************************************************************/
17+
#include <QGraphicsView>
18+
#include <QGraphicsSceneHoverEvent>
1719
#include <QPainter>
1820
#include <QWidget>
1921

src/core/composer/qgscomposertable.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include "qgscomposertable.h"
1919
#include "qgslogger.h"
2020
#include <QPainter>
21+
#include <QSettings>
2122

2223
QgsComposerTable::QgsComposerTable( QgsComposition* composition )
2324
: QgsComposerItem( composition )

src/core/composer/qgspaperitem.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include "qgsstylev2.h"
2121
#include "qgslogger.h"
2222
#include <QGraphicsRectItem>
23+
#include <QGraphicsView>
2324
#include <QPainter>
2425

2526
//QgsPaperGrid

src/gui/attributetable/qgsattributetablemodel.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#include "qgsexpression.h"
2828
#include "qgsmaplayeractionregistry.h"
2929

30-
#include <QtGui>
3130
#include <QVariant>
3231

3332
#include <limits>

src/gui/qgscomposerview.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
#include <QClipboard>
2323
#include <QMimeData>
2424
#include <QGridLayout>
25+
#include <QScrollBar>
26+
#include <QDesktopWidget>
2527

2628
#include "qgsapplication.h"
2729
#include "qgscomposerview.h"

src/gui/symbology-ng/characterwidget.cpp

+7-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,13 @@
4343
**
4444
****************************************************************************/
4545

46-
#include <QtGui>
46+
#include <QFontDatabase>
47+
#include <QMouseEvent>
48+
#include <QPaintEvent>
49+
#include <QPainter>
50+
#include <QPen>
51+
#include <QPoint>
52+
#include <QToolTip>
4753

4854
#include "characterwidget.h"
4955

0 commit comments

Comments
 (0)