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

@@ -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 \

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"

src/qgslabel.h

@@ -18,6 +18,7 @@
 
 #include <vector>
 #include <list>
+#include <qdom.h>
 
 class QString;
 class QWidget;

src/qgslabelattributes.h

@@ -17,6 +17,7 @@
 #define QGSLABELATTRIBUTES_H
 
 #include <qnamespace.h>
+#include <qpen.h>
 class QString;
 class QFont;
 class QColor;

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"

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"

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>