qgisapp.cpp :

- moved #include <qgsconfig.h> to header

qgisapp.h :

 - #include <qgsconfig.h> moved here because otherwise addDataBaseLayer() not
    declared

qgisappbase.ui.h :

 - added debug statement for when QgisAppBase::addDatabaseLayer() invoked
   instead of QgisApp::addDataBaseLayer()

qgsvectorlayer.h

 - deleted extra #include <map>


git-svn-id: http://svn.osgeo.org/qgis/trunk@1090 c8812cc2-4d05-0410-92ff-de0c093fc19c

src/qgisapp.cpp

@@ -18,8 +18,6 @@
  ***************************************************************************/
 /* $Id$ */
 
-#include <qgsconfig.h>
-
 #include <dlfcn.h>
 
 #include <qaction.h>

src/qgisapp.h

@@ -36,11 +36,16 @@ class QgsMapLayer;
 class QSocket;
 class QgsProviderRegistry;
 class QgsHelpViewer;
+class QgsMapCanvas;
+
 #include "qgisappbase.uic.h"
 #include "qgisiface.h"
-class QgsMapCanvas;
 #include "splashscreen.h"
+#include "qgsconfig.h"
+
 static SplashScreen * gSplashScreen ;
+
+
 /*! \class QgisApp
  * \brief Main window for the Qgis application
  */
@@ -130,10 +135,10 @@ private:
         /** Overloaded version of the above function provided for convenience that takes a qstring pointer */
         bool isValidVectorFileName (QString * theFileNameQString);
 
-  #ifdef HAVE_POSTGRESQL
+#ifdef HAVE_POSTGRESQL
   //! Add a databaselayer to the map
   void addDatabaseLayer();
-  #endif
+#endif
 
   //! Exit Qgis
   void fileExit();

src/qgisappbase.ui.h

@@ -21,7 +21,10 @@ void QgisAppBase::fileOpen()
 
 void QgisAppBase::addDatabaseLayer()
 {
-
+#ifdef QGISDEBUG
+    std::cerr << __FILE__ << ":" << __LINE__ 
+	    << " QgisAppBase::addDatabaseLayer() invoked instead of QgisApp::addDatabaseLayer().\n\tIs HAVE_POSTGRESQL defined?\n";
+#endif
 }
 
 

src/qgsvectorlayer.h

@@ -32,10 +32,11 @@ class QgisApp;
 class QgsIdentifyResults;
 
 #include <map>
+
 #include "qgsmaplayer.h"
 #include "qvaluevector.h"
 #include "qgsattributetabledisplay.h"
-#include <map>
+
 
 /*! \class QgsVectorLayer
  * \brief Vector layer backed by a data source provider