fix grass plugin compile error

git-svn-id: http://svn.osgeo.org/qgis/trunk@8944 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jul 28, 2008 · cf69dee · cf69dee
1 parent 1aa16af
commit cf69dee
Show file tree

Hide file tree

Showing 15 changed files with 29 additions and 28 deletions.
diff --git a/src/plugins/grass/CMakeLists.txt b/src/plugins/grass/CMakeLists.txt
@@ -115,6 +115,7 @@ INCLUDE_DIRECTORIES(
      ../../core/renderer 
      ../../core/symbology
      ../../gui
+     ../../providers/grass
      ${CMAKE_CURRENT_BINARY_DIR}/../../ui
      ${GRASS_INCLUDE_DIR}
      ${GDAL_INCLUDE_DIR}

diff --git a/src/plugins/grass/qgsgrassattributes.cpp b/src/plugins/grass/qgsgrassattributes.cpp
@@ -51,8 +51,8 @@ extern "C" {
 #include <grass/Vect.h>
 }
 
-#include "../../src/providers/grass/qgsgrass.h"
-#include "../../src/providers/grass/qgsgrassprovider.h"
+#include "qgsgrass.h"
+#include "qgsgrassprovider.h"
 #include "qgsgrassedit.h"
 #include "qgsgrassattributes.h"
 

diff --git a/src/plugins/grass/qgsgrassbrowser.cpp b/src/plugins/grass/qgsgrassbrowser.cpp
@@ -48,11 +48,12 @@ extern "C" {
 #include <grass/Vect.h>
 }
 
-#include "../../src/providers/grass/qgsgrass.h"
+#include "qgsgrass.h"
 #include "qgsgrassmodel.h"
 #include "qgsgrassbrowser.h"
 #include "qgsgrassselect.h"
 #include "qgsgrassutils.h"
+#include "qgsgrassplugin.h"
 
 QgsGrassBrowser::QgsGrassBrowser ( QgisInterface *iface, 
 	 QWidget * parent, Qt::WFlags f )
@@ -66,47 +67,47 @@ QgsGrassBrowser::QgsGrassBrowser ( QgisInterface *iface,
   QToolBar *tb = addToolBar(tr("Tools"));
 
   mActionAddMap = new QAction( 
-    getThemeIcon("grass_add_map.png"), 
+    QgsGrassPlugin::getThemeIcon("grass_add_map.png"), 
     tr("Add selected map to canvas"), this);
   mActionAddMap->setEnabled(false); 
   ag->addAction ( mActionAddMap );
   tb->addAction ( mActionAddMap );
   connect ( mActionAddMap, SIGNAL(triggered()), this, SLOT(addMap()) );
 
   mActionCopyMap = new QAction( 
-    getThemeIcon("grass_copy_map.png"), 
+    QgsGrassPlugin::getThemeIcon("grass_copy_map.png"), 
     tr("Copy selected map"), this);
   mActionCopyMap->setEnabled(false); 
   ag->addAction ( mActionCopyMap );
   tb->addAction ( mActionCopyMap );
   connect ( mActionCopyMap, SIGNAL(triggered()), this, SLOT(copyMap()) );
 
   mActionRenameMap = new QAction( 
-    getThemeIcon("grass_rename_map.png"), 
+    QgsGrassPlugin::getThemeIcon("grass_rename_map.png"), 
     tr("Rename selected map"), this);
   mActionRenameMap->setEnabled(false); 
   ag->addAction ( mActionRenameMap );
   tb->addAction ( mActionRenameMap );
   connect ( mActionRenameMap, SIGNAL(triggered()), this, SLOT(renameMap()) );
 
   mActionDeleteMap = new QAction( 
-    getThemeIcon("grass_delete_map.png"), 
+    QgsGrassPlugin::getThemeIcon("grass_delete_map.png"), 
     tr("Delete selected map"), this);
   mActionDeleteMap->setEnabled(false); 
   ag->addAction ( mActionDeleteMap );
   tb->addAction ( mActionDeleteMap );
   connect ( mActionDeleteMap, SIGNAL(triggered()), this, SLOT(deleteMap()) );
 
   mActionSetRegion = new QAction( 
-    getThemeIcon("grass_set_region.png"), 
+    QgsGrassPlugin::getThemeIcon("grass_set_region.png"), 
     tr("Set current region to selected map"), this);
   mActionSetRegion->setEnabled(false); 
   ag->addAction ( mActionSetRegion );
   tb->addAction ( mActionSetRegion );
   connect ( mActionSetRegion, SIGNAL(triggered()), this, SLOT(setRegion()) );
 
   mActionRefresh = new QAction( 
-    getThemeIcon("grass_refresh.png"), 
+    QgsGrassPlugin::getThemeIcon("grass_refresh.png"), 
     tr("Refresh"), this);
   ag->addAction ( mActionRefresh );
   tb->addAction ( mActionRefresh );

diff --git a/src/plugins/grass/qgsgrassbrowser.h b/src/plugins/grass/qgsgrassbrowser.h
@@ -81,7 +81,6 @@ public slots:
     void regionChanged();
 
 private:
-    QIcon getThemeIcon(const QString theName);
     QgisInterface *mIface;
 
     //! Current GISBASE

diff --git a/src/plugins/grass/qgsgrassedit.cpp b/src/plugins/grass/qgsgrassedit.cpp
@@ -66,8 +66,8 @@ extern "C" {
 #include <grass/Vect.h>
 }
 
-#include "../../src/providers/grass/qgsgrass.h"
-#include "../../src/providers/grass/qgsgrassprovider.h"
+#include "qgsgrass.h"
+#include "qgsgrassprovider.h"
 #include "qgsgrassattributes.h"
 #include "qgsgrassedit.h"
 #include "qgsgrassedittools.h"

diff --git a/src/plugins/grass/qgsgrassedittools.cpp b/src/plugins/grass/qgsgrassedittools.cpp
@@ -21,7 +21,7 @@
 #include "qgsgrassedittools.h"
 #include "qgsgrassedit.h"
 #include "qgsgrassattributes.h"
-#include "../../src/providers/grass/qgsgrassprovider.h"
+#include "qgsgrassprovider.h"
 #include "qgsvertexmarker.h"
 #include <QMouseEvent>
 

diff --git a/src/plugins/grass/qgsgrassmapcalc.cpp b/src/plugins/grass/qgsgrassmapcalc.cpp
@@ -60,8 +60,8 @@ extern "C" {
 #include <grass/Vect.h>
 }
 
-#include "../../src/providers/grass/qgsgrass.h"
-#include "../../src/providers/grass/qgsgrassprovider.h"
+#include "qgsgrass.h"
+#include "qgsgrassprovider.h"
 #include "qgsgrassattributes.h"
 #include "qgsgrassmodule.h"
 #include "qgsgrasstools.h"

diff --git a/src/plugins/grass/qgsgrassmodel.cpp b/src/plugins/grass/qgsgrassmodel.cpp
@@ -43,8 +43,8 @@ extern "C" {
 #include <grass/Vect.h>
 }
 
-#include "../../src/providers/grass/qgsgrass.h"
-#include "../../src/providers/grass/qgsgrassprovider.h"
+#include "qgsgrass.h"
+#include "qgsgrassprovider.h"
 #include "qgsgrassmodel.h"
 #include "qgsgrassselect.h"
 
@@ -589,7 +589,7 @@ void QgsGrassModel::addItems(QgsGrassModelItem *item, QStringList list, int type
 
     if ( insertAt >= 0 )
     {
-      QgsDebugMsg( QString("insert %1 at %2").arg(name).arg(insertAt) );;
+      QgsDebugMsg( QString("insert %1 at %2").arg(name).arg(insertAt) );
       beginInsertRows( index, insertAt, insertAt );
       QgsGrassModelItem *newItem = new QgsGrassModelItem();
       item->mChildren.insert( insertAt, newItem );

diff --git a/src/plugins/grass/qgsgrassmodule.cpp b/src/plugins/grass/qgsgrassmodule.cpp
@@ -83,8 +83,8 @@ extern "C" {
 #include <grass/Vect.h>
 }
 
-#include "../../src/providers/grass/qgsgrass.h"
-#include "../../src/providers/grass/qgsgrassprovider.h"
+#include "qgsgrass.h"
+#include "qgsgrassprovider.h"
 #include "qgsgrassattributes.h"
 #include "qgsgrassmodule.h"
 #include "qgsgrassmapcalc.h"

diff --git a/src/plugins/grass/qgsgrassnewmapset.cpp b/src/plugins/grass/qgsgrassnewmapset.cpp
@@ -57,7 +57,7 @@
 #include "qgsspatialrefsys.h"
 #include "qgsprojectionselector.h"
 
-#include "../../src/providers/grass/qgsgrass.h"
+#include "qgsgrass.h"
 #include "qgsgrassnewmapset.h"
 
 // For bug in GPJ_osr_to_grass()

diff --git a/src/plugins/grass/qgsgrassplugin.cpp b/src/plugins/grass/qgsgrassplugin.cpp
@@ -57,8 +57,8 @@ extern "C" {
 }
 
 #include "qgsgrassplugin.h"
-#include "../../src/providers/grass/qgsgrass.h"
-#include "../../src/providers/grass/qgsgrassprovider.h"
+#include "qgsgrass.h"
+#include "qgsgrassprovider.h"
 
 //the gui subclass
 #include "qgsgrassutils.h"

diff --git a/src/plugins/grass/qgsgrassregion.cpp b/src/plugins/grass/qgsgrassregion.cpp
@@ -57,7 +57,7 @@ extern "C" {
 #include <grass/gis.h>
 }
 
-#include "../../src/providers/grass/qgsgrass.h"
+#include "qgsgrass.h"
 #include "qgsgrassplugin.h"
 #include "qgsgrassregion.h"
 

diff --git a/src/plugins/grass/qgsgrassselect.cpp b/src/plugins/grass/qgsgrassselect.cpp
@@ -32,7 +32,7 @@ extern "C" {
 #include <grass/Vect.h>
 }
 
-#include "../../src/providers/grass/qgsgrass.h"
+#include "qgsgrass.h"
 #include "qgsgrassselect.h"
 
 QgsGrassSelect::QgsGrassSelect(int type):QgsGrassSelectBase()

diff --git a/src/plugins/grass/qgsgrasstools.cpp b/src/plugins/grass/qgsgrasstools.cpp
@@ -63,8 +63,8 @@ extern "C" {
 #include <grass/Vect.h>
 }
 
-#include "../../src/providers/grass/qgsgrass.h"
-#include "../../src/providers/grass/qgsgrassprovider.h"
+#include "qgsgrass.h"
+#include "qgsgrassprovider.h"
 #include "qgsgrassattributes.h"
 #include "qgsgrasstools.h"
 #include "qgsgrassmodule.h"

diff --git a/src/plugins/grass/qgsgrassutils.cpp b/src/plugins/grass/qgsgrassutils.cpp
@@ -32,7 +32,7 @@ extern "C" {
 
 #include "qgisinterface.h"
 
-#include "../../src/providers/grass/qgsgrass.h"
+#include "qgsgrass.h"
 #include "qgsgrassutils.h"
 #include "qgsgrassselect.h"