Skip to content
Permalink
Browse files
fix grass plugin compile error
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8944 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Jul 28, 2008
1 parent 97d0b8a commit eab3d0c67091d4c6fe7ef3b626ea4e9f1b312aa7
@@ -115,6 +115,7 @@ INCLUDE_DIRECTORIES(
../../core/renderer
../../core/symbology
../../gui
../../providers/grass
${CMAKE_CURRENT_BINARY_DIR}/../../ui
${GRASS_INCLUDE_DIR}
${GDAL_INCLUDE_DIR}
@@ -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"

@@ -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 );
@@ -81,7 +81,6 @@ public slots:
void regionChanged();

private:
QIcon getThemeIcon(const QString theName);
QgisInterface *mIface;

//! Current GISBASE
@@ -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"
@@ -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>

@@ -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"
@@ -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 );
@@ -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"
@@ -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()
@@ -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"
@@ -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"

@@ -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()
@@ -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"
@@ -32,7 +32,7 @@ extern "C" {

#include "qgisinterface.h"

#include "../../src/providers/grass/qgsgrass.h"
#include "qgsgrass.h"
#include "qgsgrassutils.h"
#include "qgsgrassselect.h"

0 comments on commit eab3d0c

Please sign in to comment.