Skip to content

Commit 46557f4

Browse files
author
g_j_m
committed
Rationalise the #includes (and move Qt includes to Qt4 naming scheme)
git-svn-id: http://svn.osgeo.org/qgis/trunk@4964 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent cdf64d9 commit 46557f4

File tree

2 files changed

+11
-23
lines changed

2 files changed

+11
-23
lines changed

src/plugins/scale_bar/plugin.cpp

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,38 +21,29 @@ email : sbr00pwb@users.sourceforge.net
2121
/* $Id$ */
2222

2323
// includes
24-
#include <cmath>
2524

2625
#include <qgisapp.h>
2726
#include "qgisgui.h"
2827
#include <qgsmaplayer.h>
2928
#include "plugin.h"
3029
#include "qgsproject.h"
3130
#include "qgsmapcanvas.h"
32-
33-
#include <qtoolbar.h>
34-
#include <qmenubar.h>
35-
#include <qmessagebox.h>
36-
#include <q3popupmenu.h>
37-
#include <qlineedit.h>
38-
#include <qaction.h>
39-
#include <qapplication.h>
40-
#include <qcursor.h>
41-
#include <qpen.h>
4231
#include <qgspoint.h>
43-
#include <q3pointarray.h>
4432
#include <qgsmaptopixel.h>
45-
#include <qstring.h>
46-
#include <qfontmetrics.h>
47-
#include <qfont.h>
33+
34+
#include <QPainter>
35+
#include <QAction>
36+
#include <QPen>
37+
#include <q3pointarray.h>
38+
#include <QString>
39+
#include <QFontMetrics>
40+
#include <QFont>
4841
#include <q3paintdevicemetrics.h>
49-
#include <qspinbox.h>
50-
#include <qcolor.h>
51-
#include <qcolordialog.h>
52-
#include <qglobal.h>
42+
#include <QColor>
5343

5444
//non qt includes
5545
#include <iostream>
46+
#include <cmath>
5647

5748
//the gui subclass
5849
#include "plugingui.h"

src/plugins/scale_bar/plugin.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,10 @@ email : sbr00pwb@users.sourceforge.net
2222
#ifndef QGSCALEBARPLUGIN
2323
#define QGSCALEBARPLUGIN
2424
#include "../qgisplugin.h"
25-
#include <qwidget.h>
26-
#include <qpainter.h>
27-
#include <q3pointarray.h>
28-
2925

3026
#include "qgisapp.h"
3127
class QToolBar;
28+
class QPainter;
3229
/**
3330
* \class Plugin
3431
* \brief OpenModeller plugin for QGIS

0 commit comments

Comments
 (0)