[QGIS Commit] r9067 - in branches/advanced_printing_branch: debian src/app/composer src/gui

[svn_qgis at osgeo.org]

Author: jef
Date: 2008-08-16 14:20:28 -0400 (Sat, 16 Aug 2008)
New Revision: 9067

Modified:
   branches/advanced_printing_branch/debian/qgis.install
   branches/advanced_printing_branch/src/app/composer/qgscomposeritem.cpp
   branches/advanced_printing_branch/src/gui/qgsprojectionselector.cpp
   branches/advanced_printing_branch/src/gui/qgsprojectionselector.h
Log:
small fixes for test compile

Modified: branches/advanced_printing_branch/debian/qgis.install
===================================================================
--- branches/advanced_printing_branch/debian/qgis.install	2008-08-16 15:09:21 UTC (rev 9066)
+++ branches/advanced_printing_branch/debian/qgis.install	2008-08-16 18:20:28 UTC (rev 9067)
@@ -22,7 +22,6 @@
 usr/lib/qgis/libgridmakerplugin.so
 usr/lib/qgis/libnortharrowplugin.so
 usr/lib/qgis/libogrprovider.so
-usr/lib/qgis/libpggeoprocessingplugin.so
 usr/lib/qgis/libpostgresprovider.so
 usr/lib/qgis/libquickprintplugin.so
 usr/lib/qgis/libscalebarplugin.so
@@ -31,3 +30,4 @@
 usr/lib/qgis/libwfsprovider.so
 usr/lib/qgis/libwmsprovider.so
 usr/lib/qgis/libmemoryprovider.so
+usr/lib/qgis/libdxf2shpconverterplugin.so

Modified: branches/advanced_printing_branch/src/app/composer/qgscomposeritem.cpp
===================================================================
--- branches/advanced_printing_branch/src/app/composer/qgscomposeritem.cpp	2008-08-16 15:09:21 UTC (rev 9066)
+++ branches/advanced_printing_branch/src/app/composer/qgscomposeritem.cpp	2008-08-16 18:20:28 UTC (rev 9067)
@@ -24,6 +24,7 @@
 #include "qgscomposeritem.h"
 
 #include <iostream>
+#include <limits>
 #include "qgsrect.h" //just for debugging
 
 QgsComposerItem::QgsComposerItem(QgsComposition* composition): QGraphicsRectItem(0), mComposition(composition), mBoundingResizeRectangle(0), mFrame(true)

Modified: branches/advanced_printing_branch/src/gui/qgsprojectionselector.cpp
===================================================================
--- branches/advanced_printing_branch/src/gui/qgsprojectionselector.cpp	2008-08-16 15:09:21 UTC (rev 9066)
+++ branches/advanced_printing_branch/src/gui/qgsprojectionselector.cpp	2008-08-16 18:20:28 UTC (rev 9067)
@@ -936,7 +936,7 @@
 	return myRetval;
  }
 
-const void QgsProjectionSelector::showDBMissingWarning(const QString theFileName)
+void QgsProjectionSelector::showDBMissingWarning(const QString theFileName)
 {
 
     QMessageBox::critical(this, tr("Resource Location Error"), 

Modified: branches/advanced_printing_branch/src/gui/qgsprojectionselector.h
===================================================================
--- branches/advanced_printing_branch/src/gui/qgsprojectionselector.h	2008-08-16 15:09:21 UTC (rev 9066)
+++ branches/advanced_printing_branch/src/gui/qgsprojectionselector.h	2008-08-16 18:20:28 UTC (rev 9067)
@@ -156,7 +156,7 @@
       long getSelectedLongAttribute(QString attributeName);
 
       /** Show the user a warning if the srs database could not be found */
-      const void showDBMissingWarning(const QString theFileName);
+      void showDBMissingWarning(const QString theFileName);
       // List view nodes for the tree view of projections
       //! User defined projections node
       QTreeWidgetItem *mUserProjList;