From d8602d8a3b647fede5696d4be5f240082434d239 Mon Sep 17 00:00:00 2001
From: mhugent <mhugent@c8812cc2-4d05-0410-92ff-de0c093fc19c>
Date: Wed, 18 Aug 2004 21:32:21 +0000
Subject: [PATCH] changed Makefile.am and removed unused includes to make qgis
 compiling again

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@1904 c8812cc2-4d05-0410-92ff-de0c093fc19c
---
 src/Makefile.am          | 5 -----
 src/qgsgrasydialog.cpp   | 1 -
 src/qgslabel.h           | 1 +
 src/qgslabelattributes.h | 1 +
 src/qgslabeldialog.cpp   | 1 -
 src/qgsmapcanvas.cpp     | 1 -
 src/qgssisydialog.cpp    | 1 -
 7 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 814b64a3b5b..0e38f518e5b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -42,7 +42,6 @@ headers =		qgis.h					\
 			qgscontinuouscolrenderer.h		\
 			qgscoordinatetransform.h		\
 			qgscustomsymbol.h			\
-			qgsdatabaselayer.h			\
 			qgsdataprovider.h			\
 			qgsdatasource.h				\
 			qgsdlgvectorlayerproperties.h		\
@@ -94,7 +93,6 @@ headers =		qgis.h					\
 			qgsuniquevalrenderer.h			\
 			qgsuvaldialog.h				\
 			qgsvectorlayer.h			\
-			qgsvectorlayerproperties.h		\
 			splashscreen.h				\
 			qgisapp.h \
 			qgsscalecalculator.h \
@@ -129,7 +127,6 @@ qgis_UIC =	qgisappbase.ui					\
 		qgssimadialogbase.ui				\
 		qgssisydialogbase.ui				\
 		qgsuvaldialogbase.ui				\
-		qgsvectorlayerpropertiesbase.ui \
 		qgsprojectpropertiesbase.ui
 
 ## all the ui files generate a corresponding header file
@@ -182,7 +179,6 @@ qgis_MOC =	qgisapp.moc.cpp				\
 		qgssisydialog.moc.cpp			\
 		qgsuvaldialog.moc.cpp			\
 		qgsvectorlayer.moc.cpp			\
-		qgsvectorlayerproperties.moc.cpp	\
 		splashscreen.moc.cpp \
 		qgsprojectproperties.moc.cpp \
 		qgsoptions.moc.cpp			\
@@ -247,7 +243,6 @@ qgis_SOURCES =  main.cpp			\
 		qgsuniquevalrenderer.cpp	\
 		qgsuvaldialog.cpp		\
 		qgsvectorlayer.cpp		\
-		qgsvectorlayerproperties.cpp	\
 		splashscreen.cpp \
 		qgsscalecalculator.cpp  \
 		qgsprojectproperties.cpp \
diff --git a/src/qgsgrasydialog.cpp b/src/qgsgrasydialog.cpp
index ce87239fa51..8f303ec68e1 100644
--- a/src/qgsgrasydialog.cpp
+++ b/src/qgsgrasydialog.cpp
@@ -26,7 +26,6 @@
 #include "qgsgraduatedsymrenderer.h"
 #include "qgsvectorlayer.h"
 #include "qgslegenditem.h"
-#include "qgsvectorlayerproperties.h"
 #include "qgsdataprovider.h"
 #include "qgsfield.h"
 #include "qscrollview.h"
diff --git a/src/qgslabel.h b/src/qgslabel.h
index 6b92d1cefbd..6ae4149f1e8 100644
--- a/src/qgslabel.h
+++ b/src/qgslabel.h
@@ -18,6 +18,7 @@
 
 #include <vector>
 #include <list>
+#include <qdom.h>
 
 class QString;
 class QWidget;
diff --git a/src/qgslabelattributes.h b/src/qgslabelattributes.h
index 6b6241f6be7..b10c4a33e2a 100644
--- a/src/qgslabelattributes.h
+++ b/src/qgslabelattributes.h
@@ -17,6 +17,7 @@
 #define QGSLABELATTRIBUTES_H
 
 #include <qnamespace.h>
+#include <qpen.h>
 class QString;
 class QFont;
 class QColor;
diff --git a/src/qgslabeldialog.cpp b/src/qgslabeldialog.cpp
index b1db21a1a89..465631391b1 100644
--- a/src/qgslabeldialog.cpp
+++ b/src/qgslabeldialog.cpp
@@ -35,7 +35,6 @@
 #include "qgsfield.h"
 #include "qgspatterndialog.h"
 #include "qgslinestyledialog.h"
-#include "qgsvectorlayerproperties.h"
 
 #include "qgslabelattributes.h"
 #include "qgslabel.h"
diff --git a/src/qgsmapcanvas.cpp b/src/qgsmapcanvas.cpp
index 6881737514e..e1828c27666 100644
--- a/src/qgsmapcanvas.cpp
+++ b/src/qgsmapcanvas.cpp
@@ -38,7 +38,6 @@
 #include "qgsmaplayer.h"
 #include "qgslegend.h"
 #include "qgslegenditem.h"
-#include "qgsdatabaselayer.h"
 #include "qgscoordinatetransform.h"
 #include "qgsmarkersymbol.h"
 #include "qgspolygonsymbol.h"
diff --git a/src/qgssisydialog.cpp b/src/qgssisydialog.cpp
index 1a4b15847d6..5f982c24479 100644
--- a/src/qgssisydialog.cpp
+++ b/src/qgssisydialog.cpp
@@ -28,7 +28,6 @@
 #include "qgslegenditem.h"
 #include "qgsrenderitem.h"
 #include "qgssinglesymrenderer.h"
-#include "qgsvectorlayerproperties.h"
 #include <qlineedit.h>
 #include <qtoolbutton.h>
 #include <qlabel.h>