Few more cleanups on #includes

git-svn-id: http://svn.osgeo.org/qgis/trunk@4996 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Mar 10, 2006 · 66c28e40ed5817338bdd01597174cf2e0cfacef0 · 66c28e4
1 parent e7dcb81
commit 66c28e40ed5817338bdd01597174cf2e0cfacef0
Unified Split

Showing with 2 additions and 15 deletions.

+2 −1 src/gui/qgsmaplayer.h

+0 −10 src/gui/qgsvectorlayer.cpp

+0 −4 src/gui/qgsvectorlayer.h
diff --git a/src/gui/qgsmaplayer.h b/src/gui/qgsmaplayer.h
@@ -24,6 +24,8 @@
 
 #include <QObject>
 #include <QPixmap>
+#include <QMenu> // not forward declared because other .h files
+                 // inherit from us and we're being nice to them.
 
 #include "qgis.h"
 #include "qgsrect.h"
@@ -40,7 +42,6 @@ class QgsLegendLayerFile;
 class QDomNode;
 class QDomDocument;
 class QKeyEvent;
-class QMenu;
 
 /** \class QgsMapLayer
  * \brief Base class for all map layer types.

diff --git a/src/gui/qgsvectorlayer.cpp b/src/gui/qgsvectorlayer.cpp
@@ -40,25 +40,15 @@
 #include <netinet/in.h>
 #endif
 
-#include <Q3ListView>
-#include <Q3Picture>
-#include <Q3PopupMenu>
-#include <Q3ProgressDialog>
-
-#include <QAction>
 #include <QApplication>
 #include <QCursor>
-#include <QLabel>
-#include <QLibrary>
-#include <QPolygon>
 #include <QMessageBox>
 #include <QPainter>
 #include <QPixmap>
 #include <QPolygonF>
 #include <QProgressDialog>
 #include <QString>
 #include <QSettings>
-#include <QWidget>
 
 #include "qgsapplication.h"
 #include "qgisapp.h"

diff --git a/src/gui/qgsvectorlayer.h b/src/gui/qgsvectorlayer.h
@@ -23,10 +23,6 @@
 #include <set>
 #include <vector>
 
-#include <QPixmap>
-#include <Q3PopupMenu>
-#include <Q3ValueVector>
-
 #include "qgsmaplayer.h"
 #include "qgsattributeaction.h"
 #include "qgsgeometry.h"