[QGIS Commit] r8944 - trunk/qgis/src/plugins/grass
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Mon Jul 28 16:01:04 EDT 2008
Author: jef
Date: 2008-07-28 16:01:03 -0400 (Mon, 28 Jul 2008)
New Revision: 8944
Modified:
trunk/qgis/src/plugins/grass/CMakeLists.txt
trunk/qgis/src/plugins/grass/qgsgrassattributes.cpp
trunk/qgis/src/plugins/grass/qgsgrassbrowser.cpp
trunk/qgis/src/plugins/grass/qgsgrassbrowser.h
trunk/qgis/src/plugins/grass/qgsgrassedit.cpp
trunk/qgis/src/plugins/grass/qgsgrassedittools.cpp
trunk/qgis/src/plugins/grass/qgsgrassmapcalc.cpp
trunk/qgis/src/plugins/grass/qgsgrassmodel.cpp
trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp
trunk/qgis/src/plugins/grass/qgsgrassnewmapset.cpp
trunk/qgis/src/plugins/grass/qgsgrassplugin.cpp
trunk/qgis/src/plugins/grass/qgsgrassregion.cpp
trunk/qgis/src/plugins/grass/qgsgrassselect.cpp
trunk/qgis/src/plugins/grass/qgsgrasstools.cpp
trunk/qgis/src/plugins/grass/qgsgrassutils.cpp
Log:
fix grass plugin compile error
Modified: trunk/qgis/src/plugins/grass/CMakeLists.txt
===================================================================
--- trunk/qgis/src/plugins/grass/CMakeLists.txt 2008-07-28 19:13:41 UTC (rev 8943)
+++ trunk/qgis/src/plugins/grass/CMakeLists.txt 2008-07-28 20:01:03 UTC (rev 8944)
@@ -115,6 +115,7 @@
../../core/renderer
../../core/symbology
../../gui
+ ../../providers/grass
${CMAKE_CURRENT_BINARY_DIR}/../../ui
${GRASS_INCLUDE_DIR}
${GDAL_INCLUDE_DIR}
Modified: trunk/qgis/src/plugins/grass/qgsgrassattributes.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassattributes.cpp 2008-07-28 19:13:41 UTC (rev 8943)
+++ trunk/qgis/src/plugins/grass/qgsgrassattributes.cpp 2008-07-28 20:01:03 UTC (rev 8944)
@@ -51,8 +51,8 @@
#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"
Modified: trunk/qgis/src/plugins/grass/qgsgrassbrowser.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassbrowser.cpp 2008-07-28 19:13:41 UTC (rev 8943)
+++ trunk/qgis/src/plugins/grass/qgsgrassbrowser.cpp 2008-07-28 20:01:03 UTC (rev 8944)
@@ -48,11 +48,12 @@
#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,7 +67,7 @@
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 );
@@ -74,7 +75,7 @@
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 );
@@ -82,7 +83,7 @@
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 );
@@ -90,7 +91,7 @@
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 );
@@ -98,7 +99,7 @@
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 );
@@ -106,7 +107,7 @@
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 );
Modified: trunk/qgis/src/plugins/grass/qgsgrassbrowser.h
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassbrowser.h 2008-07-28 19:13:41 UTC (rev 8943)
+++ trunk/qgis/src/plugins/grass/qgsgrassbrowser.h 2008-07-28 20:01:03 UTC (rev 8944)
@@ -81,7 +81,6 @@
void regionChanged();
private:
- QIcon getThemeIcon(const QString theName);
QgisInterface *mIface;
//! Current GISBASE
Modified: trunk/qgis/src/plugins/grass/qgsgrassedit.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassedit.cpp 2008-07-28 19:13:41 UTC (rev 8943)
+++ trunk/qgis/src/plugins/grass/qgsgrassedit.cpp 2008-07-28 20:01:03 UTC (rev 8944)
@@ -66,8 +66,8 @@
#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"
Modified: trunk/qgis/src/plugins/grass/qgsgrassedittools.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassedittools.cpp 2008-07-28 19:13:41 UTC (rev 8943)
+++ trunk/qgis/src/plugins/grass/qgsgrassedittools.cpp 2008-07-28 20:01:03 UTC (rev 8944)
@@ -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>
Modified: trunk/qgis/src/plugins/grass/qgsgrassmapcalc.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassmapcalc.cpp 2008-07-28 19:13:41 UTC (rev 8943)
+++ trunk/qgis/src/plugins/grass/qgsgrassmapcalc.cpp 2008-07-28 20:01:03 UTC (rev 8944)
@@ -60,8 +60,8 @@
#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"
Modified: trunk/qgis/src/plugins/grass/qgsgrassmodel.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassmodel.cpp 2008-07-28 19:13:41 UTC (rev 8943)
+++ trunk/qgis/src/plugins/grass/qgsgrassmodel.cpp 2008-07-28 20:01:03 UTC (rev 8944)
@@ -43,8 +43,8 @@
#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 @@
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 );
Modified: trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp 2008-07-28 19:13:41 UTC (rev 8943)
+++ trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp 2008-07-28 20:01:03 UTC (rev 8944)
@@ -83,8 +83,8 @@
#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"
Modified: trunk/qgis/src/plugins/grass/qgsgrassnewmapset.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassnewmapset.cpp 2008-07-28 19:13:41 UTC (rev 8943)
+++ trunk/qgis/src/plugins/grass/qgsgrassnewmapset.cpp 2008-07-28 20:01:03 UTC (rev 8944)
@@ -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()
Modified: trunk/qgis/src/plugins/grass/qgsgrassplugin.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassplugin.cpp 2008-07-28 19:13:41 UTC (rev 8943)
+++ trunk/qgis/src/plugins/grass/qgsgrassplugin.cpp 2008-07-28 20:01:03 UTC (rev 8944)
@@ -57,8 +57,8 @@
}
#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"
Modified: trunk/qgis/src/plugins/grass/qgsgrassregion.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassregion.cpp 2008-07-28 19:13:41 UTC (rev 8943)
+++ trunk/qgis/src/plugins/grass/qgsgrassregion.cpp 2008-07-28 20:01:03 UTC (rev 8944)
@@ -57,7 +57,7 @@
#include <grass/gis.h>
}
-#include "../../src/providers/grass/qgsgrass.h"
+#include "qgsgrass.h"
#include "qgsgrassplugin.h"
#include "qgsgrassregion.h"
Modified: trunk/qgis/src/plugins/grass/qgsgrassselect.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassselect.cpp 2008-07-28 19:13:41 UTC (rev 8943)
+++ trunk/qgis/src/plugins/grass/qgsgrassselect.cpp 2008-07-28 20:01:03 UTC (rev 8944)
@@ -32,7 +32,7 @@
#include <grass/Vect.h>
}
-#include "../../src/providers/grass/qgsgrass.h"
+#include "qgsgrass.h"
#include "qgsgrassselect.h"
QgsGrassSelect::QgsGrassSelect(int type):QgsGrassSelectBase()
Modified: trunk/qgis/src/plugins/grass/qgsgrasstools.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrasstools.cpp 2008-07-28 19:13:41 UTC (rev 8943)
+++ trunk/qgis/src/plugins/grass/qgsgrasstools.cpp 2008-07-28 20:01:03 UTC (rev 8944)
@@ -63,8 +63,8 @@
#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"
Modified: trunk/qgis/src/plugins/grass/qgsgrassutils.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassutils.cpp 2008-07-28 19:13:41 UTC (rev 8943)
+++ trunk/qgis/src/plugins/grass/qgsgrassutils.cpp 2008-07-28 20:01:03 UTC (rev 8944)
@@ -32,7 +32,7 @@
#include "qgisinterface.h"
-#include "../../src/providers/grass/qgsgrass.h"
+#include "qgsgrass.h"
#include "qgsgrassutils.h"
#include "qgsgrassselect.h"
More information about the QGIS-commit
mailing list