Skip to content
Permalink
Browse files
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
  • Loading branch information
g_j_m committed Mar 4, 2006
1 parent cdf64d9 commit 46557f49f174aecbb1a52f011f38c727ffa29f2d
Showing with 11 additions and 23 deletions.
  1. +10 −19 src/plugins/scale_bar/plugin.cpp
  2. +1 −4 src/plugins/scale_bar/plugin.h
@@ -21,38 +21,29 @@ email : sbr00pwb@users.sourceforge.net
/* $Id$ */

// includes
#include <cmath>

#include <qgisapp.h>
#include "qgisgui.h"
#include <qgsmaplayer.h>
#include "plugin.h"
#include "qgsproject.h"
#include "qgsmapcanvas.h"

#include <qtoolbar.h>
#include <qmenubar.h>
#include <qmessagebox.h>
#include <q3popupmenu.h>
#include <qlineedit.h>
#include <qaction.h>
#include <qapplication.h>
#include <qcursor.h>
#include <qpen.h>
#include <qgspoint.h>
#include <q3pointarray.h>
#include <qgsmaptopixel.h>
#include <qstring.h>
#include <qfontmetrics.h>
#include <qfont.h>

#include <QPainter>
#include <QAction>
#include <QPen>
#include <q3pointarray.h>
#include <QString>
#include <QFontMetrics>
#include <QFont>
#include <q3paintdevicemetrics.h>
#include <qspinbox.h>
#include <qcolor.h>
#include <qcolordialog.h>
#include <qglobal.h>
#include <QColor>

//non qt includes
#include <iostream>
#include <cmath>

//the gui subclass
#include "plugingui.h"
@@ -22,13 +22,10 @@ email : sbr00pwb@users.sourceforge.net
#ifndef QGSCALEBARPLUGIN
#define QGSCALEBARPLUGIN
#include "../qgisplugin.h"
#include <qwidget.h>
#include <qpainter.h>
#include <q3pointarray.h>


#include "qgisapp.h"
class QToolBar;
class QPainter;
/**
* \class Plugin
* \brief OpenModeller plugin for QGIS

0 comments on commit 46557f4

Please sign in to comment.