Skip to content

Commit eab3d0c

Browse files
author
jef
committedJul 28, 2008
fix grass plugin compile error
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8944 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
final-1_7_1final-1_7_0
1 parent 97d0b8a commit eab3d0c

15 files changed

+29
-28
lines changed
 

‎src/plugins/grass/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ INCLUDE_DIRECTORIES(
115115
../../core/renderer
116116
../../core/symbology
117117
../../gui
118+
../../providers/grass
118119
${CMAKE_CURRENT_BINARY_DIR}/../../ui
119120
${GRASS_INCLUDE_DIR}
120121
${GDAL_INCLUDE_DIR}

‎src/plugins/grass/qgsgrassattributes.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ extern "C" {
5151
#include <grass/Vect.h>
5252
}
5353

54-
#include "../../src/providers/grass/qgsgrass.h"
55-
#include "../../src/providers/grass/qgsgrassprovider.h"
54+
#include "qgsgrass.h"
55+
#include "qgsgrassprovider.h"
5656
#include "qgsgrassedit.h"
5757
#include "qgsgrassattributes.h"
5858

‎src/plugins/grass/qgsgrassbrowser.cpp

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,12 @@ extern "C" {
4848
#include <grass/Vect.h>
4949
}
5050

51-
#include "../../src/providers/grass/qgsgrass.h"
51+
#include "qgsgrass.h"
5252
#include "qgsgrassmodel.h"
5353
#include "qgsgrassbrowser.h"
5454
#include "qgsgrassselect.h"
5555
#include "qgsgrassutils.h"
56+
#include "qgsgrassplugin.h"
5657

5758
QgsGrassBrowser::QgsGrassBrowser ( QgisInterface *iface,
5859
QWidget * parent, Qt::WFlags f )
@@ -66,47 +67,47 @@ QgsGrassBrowser::QgsGrassBrowser ( QgisInterface *iface,
6667
QToolBar *tb = addToolBar(tr("Tools"));
6768

6869
mActionAddMap = new QAction(
69-
getThemeIcon("grass_add_map.png"),
70+
QgsGrassPlugin::getThemeIcon("grass_add_map.png"),
7071
tr("Add selected map to canvas"), this);
7172
mActionAddMap->setEnabled(false);
7273
ag->addAction ( mActionAddMap );
7374
tb->addAction ( mActionAddMap );
7475
connect ( mActionAddMap, SIGNAL(triggered()), this, SLOT(addMap()) );
7576

7677
mActionCopyMap = new QAction(
77-
getThemeIcon("grass_copy_map.png"),
78+
QgsGrassPlugin::getThemeIcon("grass_copy_map.png"),
7879
tr("Copy selected map"), this);
7980
mActionCopyMap->setEnabled(false);
8081
ag->addAction ( mActionCopyMap );
8182
tb->addAction ( mActionCopyMap );
8283
connect ( mActionCopyMap, SIGNAL(triggered()), this, SLOT(copyMap()) );
8384

8485
mActionRenameMap = new QAction(
85-
getThemeIcon("grass_rename_map.png"),
86+
QgsGrassPlugin::getThemeIcon("grass_rename_map.png"),
8687
tr("Rename selected map"), this);
8788
mActionRenameMap->setEnabled(false);
8889
ag->addAction ( mActionRenameMap );
8990
tb->addAction ( mActionRenameMap );
9091
connect ( mActionRenameMap, SIGNAL(triggered()), this, SLOT(renameMap()) );
9192

9293
mActionDeleteMap = new QAction(
93-
getThemeIcon("grass_delete_map.png"),
94+
QgsGrassPlugin::getThemeIcon("grass_delete_map.png"),
9495
tr("Delete selected map"), this);
9596
mActionDeleteMap->setEnabled(false);
9697
ag->addAction ( mActionDeleteMap );
9798
tb->addAction ( mActionDeleteMap );
9899
connect ( mActionDeleteMap, SIGNAL(triggered()), this, SLOT(deleteMap()) );
99100

100101
mActionSetRegion = new QAction(
101-
getThemeIcon("grass_set_region.png"),
102+
QgsGrassPlugin::getThemeIcon("grass_set_region.png"),
102103
tr("Set current region to selected map"), this);
103104
mActionSetRegion->setEnabled(false);
104105
ag->addAction ( mActionSetRegion );
105106
tb->addAction ( mActionSetRegion );
106107
connect ( mActionSetRegion, SIGNAL(triggered()), this, SLOT(setRegion()) );
107108

108109
mActionRefresh = new QAction(
109-
getThemeIcon("grass_refresh.png"),
110+
QgsGrassPlugin::getThemeIcon("grass_refresh.png"),
110111
tr("Refresh"), this);
111112
ag->addAction ( mActionRefresh );
112113
tb->addAction ( mActionRefresh );

‎src/plugins/grass/qgsgrassbrowser.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ public slots:
8181
void regionChanged();
8282

8383
private:
84-
QIcon getThemeIcon(const QString theName);
8584
QgisInterface *mIface;
8685

8786
//! Current GISBASE

‎src/plugins/grass/qgsgrassedit.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ extern "C" {
6666
#include <grass/Vect.h>
6767
}
6868

69-
#include "../../src/providers/grass/qgsgrass.h"
70-
#include "../../src/providers/grass/qgsgrassprovider.h"
69+
#include "qgsgrass.h"
70+
#include "qgsgrassprovider.h"
7171
#include "qgsgrassattributes.h"
7272
#include "qgsgrassedit.h"
7373
#include "qgsgrassedittools.h"

‎src/plugins/grass/qgsgrassedittools.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "qgsgrassedittools.h"
2222
#include "qgsgrassedit.h"
2323
#include "qgsgrassattributes.h"
24-
#include "../../src/providers/grass/qgsgrassprovider.h"
24+
#include "qgsgrassprovider.h"
2525
#include "qgsvertexmarker.h"
2626
#include <QMouseEvent>
2727

‎src/plugins/grass/qgsgrassmapcalc.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ extern "C" {
6060
#include <grass/Vect.h>
6161
}
6262

63-
#include "../../src/providers/grass/qgsgrass.h"
64-
#include "../../src/providers/grass/qgsgrassprovider.h"
63+
#include "qgsgrass.h"
64+
#include "qgsgrassprovider.h"
6565
#include "qgsgrassattributes.h"
6666
#include "qgsgrassmodule.h"
6767
#include "qgsgrasstools.h"

‎src/plugins/grass/qgsgrassmodel.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ extern "C" {
4343
#include <grass/Vect.h>
4444
}
4545

46-
#include "../../src/providers/grass/qgsgrass.h"
47-
#include "../../src/providers/grass/qgsgrassprovider.h"
46+
#include "qgsgrass.h"
47+
#include "qgsgrassprovider.h"
4848
#include "qgsgrassmodel.h"
4949
#include "qgsgrassselect.h"
5050

@@ -589,7 +589,7 @@ void QgsGrassModel::addItems(QgsGrassModelItem *item, QStringList list, int type
589589

590590
if ( insertAt >= 0 )
591591
{
592-
QgsDebugMsg( QString("insert %1 at %2").arg(name).arg(insertAt) );;
592+
QgsDebugMsg( QString("insert %1 at %2").arg(name).arg(insertAt) );
593593
beginInsertRows( index, insertAt, insertAt );
594594
QgsGrassModelItem *newItem = new QgsGrassModelItem();
595595
item->mChildren.insert( insertAt, newItem );

‎src/plugins/grass/qgsgrassmodule.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ extern "C" {
8383
#include <grass/Vect.h>
8484
}
8585

86-
#include "../../src/providers/grass/qgsgrass.h"
87-
#include "../../src/providers/grass/qgsgrassprovider.h"
86+
#include "qgsgrass.h"
87+
#include "qgsgrassprovider.h"
8888
#include "qgsgrassattributes.h"
8989
#include "qgsgrassmodule.h"
9090
#include "qgsgrassmapcalc.h"

‎src/plugins/grass/qgsgrassnewmapset.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
#include "qgsspatialrefsys.h"
5858
#include "qgsprojectionselector.h"
5959

60-
#include "../../src/providers/grass/qgsgrass.h"
60+
#include "qgsgrass.h"
6161
#include "qgsgrassnewmapset.h"
6262

6363
// For bug in GPJ_osr_to_grass()

‎src/plugins/grass/qgsgrassplugin.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ extern "C" {
5757
}
5858

5959
#include "qgsgrassplugin.h"
60-
#include "../../src/providers/grass/qgsgrass.h"
61-
#include "../../src/providers/grass/qgsgrassprovider.h"
60+
#include "qgsgrass.h"
61+
#include "qgsgrassprovider.h"
6262

6363
//the gui subclass
6464
#include "qgsgrassutils.h"

‎src/plugins/grass/qgsgrassregion.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ extern "C" {
5757
#include <grass/gis.h>
5858
}
5959

60-
#include "../../src/providers/grass/qgsgrass.h"
60+
#include "qgsgrass.h"
6161
#include "qgsgrassplugin.h"
6262
#include "qgsgrassregion.h"
6363

‎src/plugins/grass/qgsgrassselect.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ extern "C" {
3232
#include <grass/Vect.h>
3333
}
3434

35-
#include "../../src/providers/grass/qgsgrass.h"
35+
#include "qgsgrass.h"
3636
#include "qgsgrassselect.h"
3737

3838
QgsGrassSelect::QgsGrassSelect(int type):QgsGrassSelectBase()

‎src/plugins/grass/qgsgrasstools.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ extern "C" {
6363
#include <grass/Vect.h>
6464
}
6565

66-
#include "../../src/providers/grass/qgsgrass.h"
67-
#include "../../src/providers/grass/qgsgrassprovider.h"
66+
#include "qgsgrass.h"
67+
#include "qgsgrassprovider.h"
6868
#include "qgsgrassattributes.h"
6969
#include "qgsgrasstools.h"
7070
#include "qgsgrassmodule.h"

‎src/plugins/grass/qgsgrassutils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ extern "C" {
3232

3333
#include "qgisinterface.h"
3434

35-
#include "../../src/providers/grass/qgsgrass.h"
35+
#include "qgsgrass.h"
3636
#include "qgsgrassutils.h"
3737
#include "qgsgrassselect.h"
3838

0 commit comments

Comments
 (0)
Please sign in to comment.