Skip to content

Commit 0b2317e

Browse files
jef-njef-n
committedMay 24, 2011
fix windows build by cleaning up (dynamic) linkage and some warnings
·
ltr-3_40Before-merge-new_vector_api
1 parent 49a1ec6 commit 0b2317e

24 files changed

+304
-400
lines changed
 

‎CMakeLists.txt

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -348,27 +348,17 @@ IF(COMMAND cmake_policy)
348348
ENDIF(COMMAND cmake_policy)
349349

350350
IF (WIN32)
351-
# expect that classes are being imported
352-
# Note: MSVC doesn't like when the macros are quotes
353-
# and MSYS doesn't like them unqouted (bacause of braces)
354-
IF (MSVC)
355-
ADD_DEFINITIONS("-DCORE_EXPORT=__declspec(dllimport)")
356-
ADD_DEFINITIONS("-DGUI_EXPORT=__declspec(dllimport)")
357-
ADD_DEFINITIONS("-DPYTHON_EXPORT=__declspec(dllimport)")
358-
ADD_DEFINITIONS("-DANALYSIS_EXPORT=__declspec(dllimport)")
359-
ELSE (MSVC)
360-
ADD_DEFINITIONS("\"-DCORE_EXPORT=__declspec(dllimport)\"")
361-
ADD_DEFINITIONS("\"-DGUI_EXPORT=__declspec(dllimport)\"")
362-
ADD_DEFINITIONS("\"-DPYTHON_EXPORT=__declspec(dllimport)\"")
363-
ADD_DEFINITIONS("\"-DANALYSIS_EXPORT=__declspec(dllimport)\"")
364-
ENDIF (MSVC)
351+
SET(DLLIMPORT "__declspec(dllimport)")
352+
SET(DLLEXPORT "__declspec(dllexport)")
365353
ELSE (WIN32)
366-
# other compilers don't use that MSVC construct
367-
ADD_DEFINITIONS(-DCORE_EXPORT=)
368-
ADD_DEFINITIONS(-DGUI_EXPORT=)
369-
ADD_DEFINITIONS(-DPYTHON_EXPORT=)
370-
ADD_DEFINITIONS(-DANALYSIS_EXPORT=)
371-
ENDIF (WIN32)
354+
SET(DLLIMPORT "")
355+
SET(DLLEXPORT "")
356+
ENDIF(WIN32)
357+
358+
ADD_DEFINITIONS("-DCORE_EXPORT=${DLLIMPORT}")
359+
ADD_DEFINITIONS("-DGUI_EXPORT=${DLLIMPORT}")
360+
ADD_DEFINITIONS("-DPYTHON_EXPORT=${DLLIMPORT}")
361+
ADD_DEFINITIONS("-DANALYSIS_EXPORT=${DLLIMPORT}")
372362

373363
#############################################################
374364
# user-changeable settings which can be used to customize

‎src/browser/qgsbrowsermodel.cpp

100755100644
File mode changed.

‎src/core/qgscredentials.cpp

100644100755
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ QgsCredentials *QgsCredentials::smInstance = 0;
2525
void QgsCredentials::setInstance( QgsCredentials *theInstance )
2626
{
2727
if ( smInstance )
28+
{
2829
QgsDebugMsg( "already registered an instance of QgsCredentials" );
30+
}
2931

3032
smInstance = theInstance;
3133
}

‎src/core/qgsdataitem.cpp

100755100644
Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
***************************************************************************/
1717
/* $Id$ */
1818

19-
#include <typeinfo>
20-
2119
#include <QApplication>
2220
#include <QDateTime>
2321
#include <QDir>
@@ -258,12 +256,12 @@ void QgsDataItem::refresh()
258256

259257
bool QgsDataItem::equal( const QgsDataItem *other )
260258
{
261-
if ( typeid ( this ) == typeid ( other ) &&
262-
mPath == other->path() )
263-
{
264-
return true;
265-
}
266-
return false;
259+
if ( metaObject()->className() == other->metaObject()->className() &&
260+
mPath == other->path() )
261+
{
262+
return true;
263+
}
264+
return false;
267265
}
268266

269267
// ---------------------------------------------------------------------
@@ -349,7 +347,7 @@ QgsDirectoryItem::QgsDirectoryItem( QgsDataItem* parent, QString name, QString p
349347
QgsDebugMsg( library->fileName() + " has NoDataCapabilities" );
350348
continue;
351349
}
352-
QgsDebugMsg( QString ( "%1 dataCapabilities : %2").arg(library->fileName()).arg(dataCapabilities() ) );
350+
QgsDebugMsg( QString( "%1 dataCapabilities : %2" ).arg( library->fileName() ).arg( dataCapabilities() ) );
353351
mLibraries.append( library );
354352
}
355353
else
@@ -380,11 +378,11 @@ QVector<QgsDataItem*> QgsDirectoryItem::createChildren( )
380378
children.append( item );
381379
}
382380

383-
QStringList fileEntries = dir.entryList( QDir::Dirs|QDir::NoDotAndDotDot|QDir::Files, QDir::Name );
381+
QStringList fileEntries = dir.entryList( QDir::Dirs | QDir::NoDotAndDotDot | QDir::Files, QDir::Name );
384382
foreach( QString name, fileEntries )
385383
{
386384
QString path = dir.absoluteFilePath( name );
387-
QFileInfo fileInfo ( path );
385+
QFileInfo fileInfo( path );
388386
foreach( QLibrary *library, mLibraries )
389387
{
390388
// we could/should create separate list of providers for each purpose
@@ -398,10 +396,10 @@ QVector<QgsDataItem*> QgsDirectoryItem::createChildren( )
398396

399397
int capabilities = dataCapabilities();
400398

401-
if ( !( (fileInfo.isFile() && (capabilities & QgsDataProvider::File)) ||
402-
(fileInfo.isDir() && (capabilities & QgsDataProvider::Dir))) )
399+
if ( !(( fileInfo.isFile() && ( capabilities & QgsDataProvider::File ) ) ||
400+
( fileInfo.isDir() && ( capabilities & QgsDataProvider::Dir ) ) ) )
403401
{
404-
continue;
402+
continue;
405403
}
406404

407405
dataItem_t * dataItem = ( dataItem_t * ) cast_to_fptr( library->resolve( "dataItem" ) );

‎src/core/qgsdataitem.h

100755100644
File mode changed.

‎src/core/qgspallabeling.cpp

100644100755
Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -576,9 +576,10 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, const QgsRenderContext
576576
xPos, yPos, dataDefinedPosition, angle, dataDefinedRotation ) )
577577
return;
578578
}
579-
catch ( std::exception* e )
579+
catch ( std::exception &e )
580580
{
581-
QgsDebugMsg( QString( "Ignoring feature %1 due PAL exception: " ).arg( f.id() ) + QString::fromLatin1( e->what() ) );
581+
Q_UNUSED( e );
582+
QgsDebugMsg( QString( "Ignoring feature %1 due PAL exception: " ).arg( f.id() ) + QString::fromLatin1( e.what() ) );
582583
return;
583584
}
584585

@@ -869,9 +870,10 @@ void QgsPalLabeling::registerDiagramFeature( QgsVectorLayer* layer, QgsFeature&
869870
return;
870871
}
871872
}
872-
catch ( std::exception* e )
873+
catch ( std::exception &e )
873874
{
874-
QgsDebugMsg( QString( "Ignoring feature %1 due PAL exception: " ).arg( feat.id() ) + QString::fromLatin1( e->what() ) );
875+
Q_UNUSED( e );
876+
QgsDebugMsg( QString( "Ignoring feature %1 due PAL exception: " ).arg( feat.id() ) + QString::fromLatin1( e.what() ) );
875877
return;
876878
}
877879

@@ -961,6 +963,7 @@ void QgsPalLabeling::drawLabeling( QgsRenderContext& context )
961963
}
962964
catch ( std::exception& e )
963965
{
966+
Q_UNUSED( e );
964967
QgsDebugMsg( "PAL EXCEPTION :-( " + QString::fromLatin1( e.what() ) );
965968
//mActiveLayers.clear(); // clean up
966969
return;

‎src/core/qgssearchstring.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
//! global function from parser.y that interfaces parser
2525
extern QgsSearchTreeNode* parseSearchString( const QString& str, QString& parserErrorMsg );
2626

27-
2827
QgsSearchString::QgsSearchString()
2928
{
3029
mTree = NULL;

‎src/core/qgsvectorlayer.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -778,6 +778,7 @@ void QgsVectorLayer::drawRendererV2( QgsRenderContext& rendererContext, bool lab
778778
}
779779
catch ( const QgsCsException &cse )
780780
{
781+
Q_UNUSED( cse );
781782
QgsDebugMsg( QString( "Failed to transform a point while drawing a feature of type '%1'. Ignoring this feature. %2" )
782783
.arg( fet.typeName() ).arg( cse.what() ) );
783784
}
@@ -920,6 +921,7 @@ void QgsVectorLayer::drawRendererV2Levels( QgsRenderContext& rendererContext, bo
920921
}
921922
catch ( const QgsCsException &cse )
922923
{
924+
Q_UNUSED( cse );
923925
QgsDebugMsg( QString( "Failed to transform a point while drawing a feature of type '%1'. Ignoring this feature. %2" )
924926
.arg( fet.typeName() ).arg( cse.what() ) );
925927
}
@@ -1106,6 +1108,7 @@ bool QgsVectorLayer::draw( QgsRenderContext& rendererContext )
11061108
}
11071109
catch ( QgsCsException &cse )
11081110
{
1111+
Q_UNUSED( cse );
11091112
QgsDebugMsg( QString( "Failed to transform a point while drawing a feature of type '%1'. Rendering stopped. %2" )
11101113
.arg( fet.typeName() ).arg( cse.what() ) );
11111114
return false;
@@ -1446,7 +1449,9 @@ void QgsVectorLayer::updateExtents()
14461449
mLayerExtent.setMinimal();
14471450

14481451
if ( !mDataProvider )
1452+
{
14491453
QgsDebugMsg( "invoked with null mDataProvider" );
1454+
}
14501455

14511456
if ( mDeletedFeatureIds.isEmpty() && mChangedGeometries.isEmpty() )
14521457
{
@@ -1739,7 +1744,9 @@ bool QgsVectorLayer::nextFeature( QgsFeature &f )
17391744
}
17401745

17411746
if ( !found )
1747+
{
17421748
QgsDebugMsg( QString( "No attributes for the added feature %1 found" ).arg( f.id() ) );
1749+
}
17431750
}
17441751
else
17451752
{
@@ -1841,7 +1848,9 @@ bool QgsVectorLayer::featureAtId( int featureId, QgsFeature& f, bool fetchGeomet
18411848
}
18421849

18431850
if ( !found )
1851+
{
18441852
QgsDebugMsg( QString( "No attributes for the added feature %1 found" ).arg( f.id() ) );
1853+
}
18451854
}
18461855
else
18471856
{

‎src/plugins/grass/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@ SUBDIRS(modules-common ${GRASS_MODULES_DIR} scripts themes)
1515

1616
ADD_DEFINITIONS(-DGRASS_BASE=\\\"${GRASS_PREFIX}\\\")
1717
ADD_DEFINITIONS(-DHAVE_OPENPTY=${HAVE_OPENPTY})
18+
ADD_DEFINITIONS("-DGRASS_EXPORT=${DLLIMPORT} -DGRASS_LIB_EXPORT=${DLLIMPORT}")
1819

1920
IF (WIN32)
20-
ADD_DEFINITIONS(-DHAVE_GETPT "-DGRASS_EXPORT=__declspec(dllimport)")
21+
ADD_DEFINITIONS(-DHAVE_GETPT)
2122
ELSE (WIN32)
22-
ADD_DEFINITIONS(-DHAVE_POSIX_OPENPT -DGRASS_EXPORT=)
23+
ADD_DEFINITIONS(-DHAVE_POSIX_OPENPT)
2324
ENDIF (WIN32)
2425

2526
########################################################
@@ -151,6 +152,7 @@ INCLUDE_DIRECTORIES(
151152
TARGET_LINK_LIBRARIES(grassplugin
152153
qgisgrass
153154
qgis_gui
155+
grassprovider
154156
${OPENPTY_LIBRARY}
155157
)
156158

‎src/plugins/grass/qgsgrassplugin.cpp

100644100755
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,7 @@ void QgsGrassPlugin::mapsetChanged()
256256
}
257257
catch ( QgsGrass::Exception &e )
258258
{
259+
Q_UNUSED( e );
259260
QgsDebugMsg( "Cannot read GRASS CRS : " + QString( e.what() ) );
260261
mCrs = QgsCoordinateReferenceSystem();
261262
}

‎src/plugins/grass/qgsgrassplugin.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,11 @@ class QToolBar;
4141
* \brief OpenModeller plugin for QGIS
4242
*
4343
*/
44-
class QgsGrassPlugin: public QObject, public QgisPlugin
44+
class QgsGrassPlugin : public QObject, public QgisPlugin
4545
{
46-
Q_OBJECT public:
46+
Q_OBJECT
47+
48+
public:
4749
/**
4850
* Constructor for a plugin. The QgisInterface pointer is passed by
4951
* QGIS when it attempts to instantiate the plugin.
@@ -68,7 +70,7 @@ class QgsGrassPlugin: public QObject, public QgisPlugin
6870
*/
6971
virtual int type();
7072
//! Destructor
71-
virtual ~ QgsGrassPlugin();
73+
virtual ~QgsGrassPlugin();
7274

7375
//! Get Region Pen
7476
QPen & regionPen( void );

‎src/plugins/grass/qgsgrassselect.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -337,8 +337,8 @@ void QgsGrassSelect::setLayers()
337337
return;
338338

339339
QStringList layers = QgsGrass::vectorLayers( egisdbase->text(),
340-
elocation->currentText(), emapset->currentText(),
341-
emap->currentText().toUtf8() );
340+
elocation->currentText(), emapset->currentText(),
341+
emap->currentText().toUtf8() );
342342

343343
int idx = 0;
344344
int sel = -1;

‎src/providers/grass/CMakeLists.txt

100755100644
Lines changed: 33 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,9 @@
11
ADD_DEFINITIONS(-DGRASS_BASE=\\\"${GRASS_PREFIX}\\\")
22

3-
########################################################
4-
# Files
5-
6-
SET(GRASS_PROVIDER_SRCS provider.cpp qgsgrassprovider.cpp )
7-
8-
SET(GRASS_RASTER_PROVIDER_SRCS qgsgrassrasterprovider.cpp)
9-
10-
SET(GRASS_LIB_SRCS qgsgrass.cpp)
11-
12-
SET(QGIS_D_RAST_SRCS qgis.d.rast.c)
13-
14-
SET(QGIS_G_INFO_SRCS qgis.g.info.c)
15-
163
########################################################
174
# Build
185

19-
INCLUDE_DIRECTORIES (
6+
INCLUDE_DIRECTORIES(
207
../../core
218
../../core/raster
229
${GRASS_INCLUDE_DIR}
@@ -25,18 +12,15 @@ INCLUDE_DIRECTORIES (
2512
${GEOS_INCLUDE_DIR}
2613
)
2714

28-
QT4_WRAP_CPP(GRASS_MOC_SRCS qgsgrassprovider.h)
29-
ADD_LIBRARY (qgisgrass SHARED ${GRASS_LIB_SRCS} ${GRASS_MOC_SRCS})
15+
#
16+
# GRASS library
17+
#
3018

31-
SET_TARGET_PROPERTIES(qgisgrass PROPERTIES VERSION ${COMPLETE_VERSION} SOVERSION ${COMPLETE_VERSION})
32-
33-
IF (WIN32)
34-
SET_TARGET_PROPERTIES(qgisgrass PROPERTIES COMPILE_FLAGS "\"-DGRASS_EXPORT=__declspec(dllexport)\"" )
35-
ELSE (WIN32)
36-
SET_TARGET_PROPERTIES(qgisgrass PROPERTIES COMPILE_FLAGS "-DGRASS_EXPORT=" )
37-
ENDIF (WIN32)
38-
39-
TARGET_LINK_LIBRARIES (qgisgrass
19+
ADD_LIBRARY(qgisgrass SHARED qgsgrass.cpp)
20+
SET_TARGET_PROPERTIES(qgisgrass PROPERTIES
21+
VERSION ${COMPLETE_VERSION} SOVERSION ${COMPLETE_VERSION}
22+
COMPILE_FLAGS "\"-DGRASS_LIB_EXPORT=${DLLEXPORT}\" \"-DGRASS_EXPORT=${DLLIMPORT}\"" )
23+
TARGET_LINK_LIBRARIES(qgisgrass
4024
qgis_core
4125
${GRASS_LIBRARY_gis}
4226
${GRASS_LIBRARY_vect}
@@ -49,43 +33,41 @@ IF (APPLE)
4933
SET_TARGET_PROPERTIES(qgisgrass PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE )
5034
ENDIF (APPLE)
5135

52-
ADD_LIBRARY (grassprovider MODULE ${GRASS_PROVIDER_SRCS} ${GRASS_MOC_SRCS})
36+
#
37+
# GRASS vector provider
38+
#
5339

54-
IF (WIN32)
55-
SET_TARGET_PROPERTIES(grassprovider PROPERTIES COMPILE_FLAGS "\"-DGRASS_EXPORT=__declspec(dllexport)\"" )
56-
ELSE (WIN32)
57-
SET_TARGET_PROPERTIES(grassprovider PROPERTIES COMPILE_FLAGS "-DGRASS_EXPORT=" )
58-
ENDIF (WIN32)
59-
60-
TARGET_LINK_LIBRARIES (grassprovider
61-
qgisgrass
62-
)
40+
QT4_WRAP_CPP(GRASS_PROVIDER_MOC_SRCS qgsgrassprovider.h)
41+
ADD_LIBRARY(grassprovider SHARED qgsgrassprovider.cpp ${GRASS_PROVIDER_MOC_SRCS})
42+
SET_TARGET_PROPERTIES(grassprovider PROPERTIES COMPILE_FLAGS "\"-DGRASS_EXPORT=${DLLEXPORT}\" \"-DGRASS_LIB_EXPORT=${DLLIMPORT}\"" )
43+
TARGET_LINK_LIBRARIES(grassprovider qgisgrass)
6344

64-
QT4_WRAP_CPP(GRASS_MOC_RASTERSRCS qgsgrassrasterprovider.h)
65-
ADD_LIBRARY (grassrasterprovider MODULE ${GRASS_RASTER_PROVIDER_SRCS} ${GRASS_MOC_RASTERSRCS})
45+
#
46+
# grass raster provider
47+
#
6648

67-
IF (WIN32)
68-
SET_TARGET_PROPERTIES(grassrasterprovider PROPERTIES COMPILE_FLAGS "\"-DGRASS_EXPORT=__declspec(dllexport)\"" )
69-
ELSE (WIN32)
70-
SET_TARGET_PROPERTIES(grassrasterprovider PROPERTIES COMPILE_FLAGS "-DGRASS_EXPORT=" )
71-
ENDIF (WIN32)
72-
73-
TARGET_LINK_LIBRARIES (grassrasterprovider
74-
qgisgrass
75-
qgis_core
76-
)
49+
QT4_WRAP_CPP(GRASS_RASTERPROVIDER_MOC_SRCS qgsgrassrasterprovider.h)
50+
ADD_LIBRARY(grassrasterprovider MODULE qgsgrassrasterprovider.cpp ${GRASS_RASTERPROVIDER_MOC_SRCS})
51+
SET_TARGET_PROPERTIES(grassrasterprovider PROPERTIES COMPILE_FLAGS "\"-DGRASS_EXPORT=${DLLEXPORT}\" \"-DGRASS_LIB_EXPORT=${DLLIMPORT}\"" )
52+
TARGET_LINK_LIBRARIES(grassrasterprovider qgisgrass qgis_core)
7753

78-
ADD_EXECUTABLE(qgis.d.rast ${QGIS_D_RAST_SRCS})
54+
#
55+
# grass raster display module
56+
#
7957

80-
TARGET_LINK_LIBRARIES (qgis.d.rast
58+
ADD_EXECUTABLE(qgis.d.rast qgis.d.rast.c)
59+
TARGET_LINK_LIBRARIES(qgis.d.rast
8160
${GRASS_LIBRARY_gis}
8261
${GRASS_LIBRARY_datetime}
8362
${GDAL_LIBRARY}
8463
)
8564

86-
ADD_EXECUTABLE(qgis.g.info ${QGIS_G_INFO_SRCS})
65+
#
66+
# grass info module
67+
#
8768

88-
TARGET_LINK_LIBRARIES (qgis.g.info
69+
ADD_EXECUTABLE(qgis.g.info qgis.g.info.c)
70+
TARGET_LINK_LIBRARIES(qgis.g.info
8971
${GRASS_LIBRARY_gis}
9072
${GRASS_LIBRARY_datetime}
9173
${GRASS_LIBRARY_gproj}

‎src/providers/grass/provider.cpp

Lines changed: 0 additions & 70 deletions
This file was deleted.

‎src/providers/grass/qgsgrass.cpp

100644100755
Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ extern "C"
5252

5353
#if defined(WIN32)
5454
#include <windows.h>
55-
QString GRASS_EXPORT QgsGrass::shortPath( const QString &path )
55+
QString GRASS_LIB_EXPORT QgsGrass::shortPath( const QString &path )
5656
{
5757
TCHAR buf[MAX_PATH];
5858
int len = GetShortPathName( path.toUtf8().constData(), buf, MAX_PATH );
@@ -71,7 +71,7 @@ QString GRASS_EXPORT QgsGrass::shortPath( const QString &path )
7171
}
7272
#endif
7373

74-
void GRASS_EXPORT QgsGrass::init( void )
74+
void GRASS_LIB_EXPORT QgsGrass::init( void )
7575
{
7676
// Warning!!!
7777
// G_set_error_routine() once called from plugin
@@ -420,22 +420,22 @@ int QgsGrass::error_routine( const char *msg, int fatal )
420420
return 1;
421421
}
422422

423-
void GRASS_EXPORT QgsGrass::resetError( void )
423+
void GRASS_LIB_EXPORT QgsGrass::resetError( void )
424424
{
425425
lastError = OK;
426426
}
427427

428-
int GRASS_EXPORT QgsGrass::error( void )
428+
int GRASS_LIB_EXPORT QgsGrass::error( void )
429429
{
430430
return lastError;
431431
}
432432

433-
QString GRASS_EXPORT QgsGrass::errorMessage( void )
433+
QString GRASS_LIB_EXPORT QgsGrass::errorMessage( void )
434434
{
435435
return error_message;
436436
}
437437

438-
QString GRASS_EXPORT QgsGrass::openMapset( QString gisdbase, QString location, QString mapset )
438+
QString GRASS_LIB_EXPORT QgsGrass::openMapset( QString gisdbase, QString location, QString mapset )
439439
{
440440
QgsDebugMsg( QString( "gisdbase = %1" ).arg( gisdbase.toUtf8().constData() ) );
441441
QgsDebugMsg( QString( "location = %1" ).arg( location.toUtf8().constData() ) );
@@ -659,7 +659,7 @@ QString QgsGrass::closeMapset( )
659659
return NULL;
660660
}
661661

662-
QStringList GRASS_EXPORT QgsGrass::locations( QString gisbase )
662+
QStringList GRASS_LIB_EXPORT QgsGrass::locations( QString gisbase )
663663
{
664664
QgsDebugMsg( QString( "gisbase = %1" ).arg( gisbase ) );
665665

@@ -682,7 +682,7 @@ QStringList GRASS_EXPORT QgsGrass::locations( QString gisbase )
682682
return list;
683683
}
684684

685-
QStringList GRASS_EXPORT QgsGrass::mapsets( QString gisbase, QString locationName )
685+
QStringList GRASS_LIB_EXPORT QgsGrass::mapsets( QString gisbase, QString locationName )
686686
{
687687
QgsDebugMsg( QString( "gisbase = %1 locationName = %2" ).arg( gisbase ).arg( locationName ) );
688688

@@ -692,7 +692,7 @@ QStringList GRASS_EXPORT QgsGrass::mapsets( QString gisbase, QString locationNam
692692
return QgsGrass::mapsets( gisbase + "/" + locationName );
693693
}
694694

695-
QStringList GRASS_EXPORT QgsGrass::mapsets( QString locationPath )
695+
QStringList GRASS_LIB_EXPORT QgsGrass::mapsets( QString locationPath )
696696
{
697697
QgsDebugMsg( QString( "locationPath = %1" ).arg( locationPath ) );
698698

@@ -714,7 +714,7 @@ QStringList GRASS_EXPORT QgsGrass::mapsets( QString locationPath )
714714
return list;
715715
}
716716

717-
QStringList GRASS_EXPORT QgsGrass::vectors( QString gisbase, QString locationName,
717+
QStringList GRASS_LIB_EXPORT QgsGrass::vectors( QString gisbase, QString locationName,
718718
QString mapsetName )
719719
{
720720
QgsDebugMsg( "entered." );
@@ -751,7 +751,7 @@ QStringList GRASS_EXPORT QgsGrass::vectors( QString gisbase, QString locationNam
751751
return QgsGrass::vectors( gisbase + "/" + locationName + "/" + mapsetName );
752752
}
753753

754-
QStringList GRASS_EXPORT QgsGrass::vectors( QString mapsetPath )
754+
QStringList GRASS_LIB_EXPORT QgsGrass::vectors( QString mapsetPath )
755755
{
756756
QgsDebugMsg( QString( "mapsetPath = %1" ).arg( mapsetPath ) );
757757

@@ -775,7 +775,7 @@ QStringList GRASS_EXPORT QgsGrass::vectors( QString mapsetPath )
775775
}
776776
return list;
777777
}
778-
QStringList GRASS_EXPORT QgsGrass::vectorLayers( QString gisdbase,
778+
QStringList GRASS_LIB_EXPORT QgsGrass::vectorLayers( QString gisdbase,
779779
QString location, QString mapset, QString mapName )
780780
{
781781
QStringList list;
@@ -869,7 +869,7 @@ QStringList GRASS_EXPORT QgsGrass::vectorLayers( QString gisdbase,
869869
return list;
870870
}
871871

872-
QStringList GRASS_EXPORT QgsGrass::rasters( QString gisbase, QString locationName,
872+
QStringList GRASS_LIB_EXPORT QgsGrass::rasters( QString gisbase, QString locationName,
873873
QString mapsetName )
874874
{
875875
QgsDebugMsg( "entered." );
@@ -907,7 +907,7 @@ QStringList GRASS_EXPORT QgsGrass::rasters( QString gisbase, QString locationNam
907907
return QgsGrass::rasters( gisbase + "/" + locationName + "/" + mapsetName );
908908
}
909909

910-
QStringList GRASS_EXPORT QgsGrass::rasters( QString mapsetPath )
910+
QStringList GRASS_LIB_EXPORT QgsGrass::rasters( QString mapsetPath )
911911
{
912912
QgsDebugMsg( QString( "mapsetPath = %1" ).arg( mapsetPath ) );
913913

@@ -926,7 +926,7 @@ QStringList GRASS_EXPORT QgsGrass::rasters( QString mapsetPath )
926926
return list;
927927
}
928928

929-
QStringList GRASS_EXPORT QgsGrass::elements( QString gisbase, QString locationName,
929+
QStringList GRASS_LIB_EXPORT QgsGrass::elements( QString gisbase, QString locationName,
930930
QString mapsetName, QString element )
931931
{
932932
if ( gisbase.isEmpty() || locationName.isEmpty() || mapsetName.isEmpty() )
@@ -936,7 +936,7 @@ QStringList GRASS_EXPORT QgsGrass::elements( QString gisbase, QString locationNa
936936
element );
937937
}
938938

939-
QStringList GRASS_EXPORT QgsGrass::elements( QString mapsetPath, QString element )
939+
QStringList GRASS_LIB_EXPORT QgsGrass::elements( QString mapsetPath, QString element )
940940
{
941941
QgsDebugMsg( QString( "mapsetPath = %1" ).arg( mapsetPath ) );
942942

@@ -955,7 +955,7 @@ QStringList GRASS_EXPORT QgsGrass::elements( QString mapsetPath, QString element
955955
return list;
956956
}
957957

958-
QString GRASS_EXPORT QgsGrass::regionString( struct Cell_head *window )
958+
QString GRASS_LIB_EXPORT QgsGrass::regionString( struct Cell_head *window )
959959
{
960960
QString reg;
961961
int fmt;
@@ -992,9 +992,9 @@ QString GRASS_EXPORT QgsGrass::regionString( struct Cell_head *window )
992992
return reg;
993993
}
994994

995-
bool GRASS_EXPORT QgsGrass::region( QString gisbase,
996-
QString location, QString mapset,
997-
struct Cell_head *window )
995+
bool GRASS_LIB_EXPORT QgsGrass::region( QString gisbase,
996+
QString location, QString mapset,
997+
struct Cell_head *window )
998998
{
999999
QgsGrass::setLocation( gisbase, location );
10001000

@@ -1005,7 +1005,7 @@ bool GRASS_EXPORT QgsGrass::region( QString gisbase,
10051005
return true;
10061006
}
10071007

1008-
bool GRASS_EXPORT QgsGrass::writeRegion( QString gisbase,
1008+
bool GRASS_LIB_EXPORT QgsGrass::writeRegion( QString gisbase,
10091009
QString location, QString mapset,
10101010
struct Cell_head *window )
10111011
{
@@ -1023,7 +1023,7 @@ bool GRASS_EXPORT QgsGrass::writeRegion( QString gisbase,
10231023
return true;
10241024
}
10251025

1026-
void GRASS_EXPORT QgsGrass::copyRegionExtent( struct Cell_head *source,
1026+
void GRASS_LIB_EXPORT QgsGrass::copyRegionExtent( struct Cell_head *source,
10271027
struct Cell_head *target )
10281028
{
10291029
target->north = source->north;
@@ -1034,7 +1034,7 @@ void GRASS_EXPORT QgsGrass::copyRegionExtent( struct Cell_head *source,
10341034
target->bottom = source->bottom;
10351035
}
10361036

1037-
void GRASS_EXPORT QgsGrass::copyRegionResolution( struct Cell_head *source,
1037+
void GRASS_LIB_EXPORT QgsGrass::copyRegionResolution( struct Cell_head *source,
10381038
struct Cell_head *target )
10391039
{
10401040
target->ns_res = source->ns_res;
@@ -1044,7 +1044,7 @@ void GRASS_EXPORT QgsGrass::copyRegionResolution( struct Cell_head *source,
10441044
target->ew_res3 = source->ew_res3;
10451045
}
10461046

1047-
void GRASS_EXPORT QgsGrass::extendRegion( struct Cell_head *source,
1047+
void GRASS_LIB_EXPORT QgsGrass::extendRegion( struct Cell_head *source,
10481048
struct Cell_head *target )
10491049
{
10501050
if ( source->north > target->north )
@@ -1066,9 +1066,9 @@ void GRASS_EXPORT QgsGrass::extendRegion( struct Cell_head *source,
10661066
target->bottom = source->bottom;
10671067
}
10681068

1069-
bool GRASS_EXPORT QgsGrass::mapRegion( int type, QString gisbase,
1070-
QString location, QString mapset, QString map,
1071-
struct Cell_head *window )
1069+
bool GRASS_LIB_EXPORT QgsGrass::mapRegion( int type, QString gisbase,
1070+
QString location, QString mapset, QString map,
1071+
struct Cell_head *window )
10721072
{
10731073
QgsDebugMsg( "entered." );
10741074
QgsDebugMsg( QString( "map = %1" ).arg( map ) );
@@ -1143,7 +1143,7 @@ bool GRASS_EXPORT QgsGrass::mapRegion( int type, QString gisbase,
11431143
return true;
11441144
}
11451145

1146-
QProcess GRASS_EXPORT *QgsGrass::startModule( QString gisdbase, QString location,
1146+
QProcess GRASS_LIB_EXPORT *QgsGrass::startModule( QString gisdbase, QString location,
11471147
QString module, QStringList arguments, QTemporaryFile &gisrcFile )
11481148
{
11491149
QgsDebugMsg( QString( "gisdbase = %1 location = %2" ).arg( gisdbase ).arg( location ) );
@@ -1183,7 +1183,7 @@ QProcess GRASS_EXPORT *QgsGrass::startModule( QString gisdbase, QString location
11831183
return process;
11841184
}
11851185

1186-
QByteArray GRASS_EXPORT QgsGrass::runModule( QString gisdbase, QString location,
1186+
QByteArray GRASS_LIB_EXPORT QgsGrass::runModule( QString gisdbase, QString location,
11871187
QString module, QStringList arguments )
11881188
{
11891189
QgsDebugMsg( QString( "gisdbase = %1 location = %2" ).arg( gisdbase ).arg( location ) );
@@ -1207,8 +1207,8 @@ QByteArray GRASS_EXPORT QgsGrass::runModule( QString gisdbase, QString location,
12071207
return data;
12081208
}
12091209

1210-
QString GRASS_EXPORT QgsGrass::getInfo( QString info, QString gisdbase, QString location,
1211-
QString mapset, QString map, MapType type, double x, double y )
1210+
QString GRASS_LIB_EXPORT QgsGrass::getInfo( QString info, QString gisdbase, QString location,
1211+
QString mapset, QString map, MapType type, double x, double y )
12121212
{
12131213
QgsDebugMsg( QString( "gisdbase = %1 location = %2" ).arg( gisdbase ).arg( location ) );
12141214

@@ -1244,7 +1244,7 @@ QString GRASS_EXPORT QgsGrass::getInfo( QString info, QString gisdbase, QString
12441244
return QString( data );
12451245
}
12461246

1247-
QgsCoordinateReferenceSystem GRASS_EXPORT QgsGrass::crs( QString gisdbase, QString location )
1247+
QgsCoordinateReferenceSystem GRASS_LIB_EXPORT QgsGrass::crs( QString gisdbase, QString location )
12481248
{
12491249
QgsDebugMsg( QString( "gisdbase = %1 location = %2" ).arg( gisdbase ).arg( location ) );
12501250
QgsCoordinateReferenceSystem crs = QgsCoordinateReferenceSystem();
@@ -1264,7 +1264,7 @@ QgsCoordinateReferenceSystem GRASS_EXPORT QgsGrass::crs( QString gisdbase, QStri
12641264
return crs;
12651265
}
12661266

1267-
QgsCoordinateReferenceSystem GRASS_EXPORT QgsGrass::crsDirect( QString gisdbase, QString location )
1267+
QgsCoordinateReferenceSystem GRASS_LIB_EXPORT QgsGrass::crsDirect( QString gisdbase, QString location )
12681268
{
12691269
QString Wkt;
12701270

@@ -1305,7 +1305,7 @@ QgsCoordinateReferenceSystem GRASS_EXPORT QgsGrass::crsDirect( QString gisdbase,
13051305
return srs;
13061306
}
13071307

1308-
QgsRectangle GRASS_EXPORT QgsGrass::extent( QString gisdbase, QString location, QString mapset, QString map, MapType type )
1308+
QgsRectangle GRASS_LIB_EXPORT QgsGrass::extent( QString gisdbase, QString location, QString mapset, QString map, MapType type )
13091309
{
13101310
QgsDebugMsg( QString( "gisdbase = %1 location = %2" ).arg( gisdbase ).arg( location ) );
13111311

@@ -1327,7 +1327,7 @@ QgsRectangle GRASS_EXPORT QgsGrass::extent( QString gisdbase, QString location,
13271327
return QgsRectangle( 0, 0, 0, 0 );
13281328
}
13291329

1330-
void GRASS_EXPORT QgsGrass::size( QString gisdbase, QString location, QString mapset, QString map, int *cols, int *rows )
1330+
void GRASS_LIB_EXPORT QgsGrass::size( QString gisdbase, QString location, QString mapset, QString map, int *cols, int *rows )
13311331
{
13321332
QgsDebugMsg( QString( "gisdbase = %1 location = %2" ).arg( gisdbase ).arg( location ) );
13331333

@@ -1353,7 +1353,7 @@ void GRASS_EXPORT QgsGrass::size( QString gisdbase, QString location, QString ma
13531353
QgsDebugMsg( QString( "raster size = %1 %2" ).arg( *cols ).arg( *rows ) );
13541354
}
13551355

1356-
QHash<QString, QString> GRASS_EXPORT QgsGrass::info( QString gisdbase, QString location, QString mapset, QString map, MapType type )
1356+
QHash<QString, QString> GRASS_LIB_EXPORT QgsGrass::info( QString gisdbase, QString location, QString mapset, QString map, MapType type )
13571357
{
13581358
QgsDebugMsg( QString( "gisdbase = %1 location = %2" ).arg( gisdbase ).arg( location ) );
13591359
QHash<QString, QString> inf;
@@ -1383,7 +1383,7 @@ QHash<QString, QString> GRASS_EXPORT QgsGrass::info( QString gisdbase, QString l
13831383
return inf;
13841384
}
13851385

1386-
QList<QgsGrass::Color> GRASS_EXPORT QgsGrass::colors( QString gisdbase, QString location, QString mapset, QString map )
1386+
QList<QgsGrass::Color> GRASS_LIB_EXPORT QgsGrass::colors( QString gisdbase, QString location, QString mapset, QString map )
13871387
{
13881388
QgsDebugMsg( QString( "gisdbase = %1 location = %2" ).arg( gisdbase ).arg( location ) );
13891389
QList<QgsGrass::Color> ct;
@@ -1413,7 +1413,7 @@ QList<QgsGrass::Color> GRASS_EXPORT QgsGrass::colors( QString gisdbase, QString
14131413
return ct;
14141414
}
14151415

1416-
QMap<QString, QString> GRASS_EXPORT QgsGrass::query( QString gisdbase, QString location, QString mapset, QString map, MapType type, double x, double y )
1416+
QMap<QString, QString> GRASS_LIB_EXPORT QgsGrass::query( QString gisdbase, QString location, QString mapset, QString map, MapType type, double x, double y )
14171417
{
14181418
QgsDebugMsg( QString( "gisdbase = %1 location = %2" ).arg( gisdbase ).arg( location ) );
14191419

@@ -1440,7 +1440,7 @@ QMap<QString, QString> GRASS_EXPORT QgsGrass::query( QString gisdbase, QString l
14401440
// http://freegis.org/cgi-bin/viewcvs.cgi/grass6/include/version.h.in.diff?r1=1.4&r2=1.5
14411441
// The following lines workaround this change
14421442

1443-
int GRASS_EXPORT QgsGrass::versionMajor()
1443+
int GRASS_LIB_EXPORT QgsGrass::versionMajor()
14441444
{
14451445
#ifdef GRASS_VERSION_MAJOR
14461446
return GRASS_VERSION_MAJOR;
@@ -1449,7 +1449,7 @@ int GRASS_EXPORT QgsGrass::versionMajor()
14491449
#endif
14501450
}
14511451

1452-
int GRASS_EXPORT QgsGrass::versionMinor()
1452+
int GRASS_LIB_EXPORT QgsGrass::versionMinor()
14531453
{
14541454
#ifdef GRASS_VERSION_MINOR
14551455
return GRASS_VERSION_MINOR;
@@ -1458,7 +1458,7 @@ int GRASS_EXPORT QgsGrass::versionMinor()
14581458
#endif
14591459
}
14601460

1461-
int GRASS_EXPORT QgsGrass::versionRelease()
1461+
int GRASS_LIB_EXPORT QgsGrass::versionRelease()
14621462
{
14631463
#ifdef GRASS_VERSION_RELEASE
14641464
#define QUOTE(x) #x
@@ -1467,12 +1467,12 @@ int GRASS_EXPORT QgsGrass::versionRelease()
14671467
return QString( GRASS_VERSION_RELEASE ).toInt();
14681468
#endif
14691469
}
1470-
QString GRASS_EXPORT QgsGrass::versionString()
1470+
QString GRASS_LIB_EXPORT QgsGrass::versionString()
14711471
{
14721472
return QString( GRASS_VERSION_STRING );
14731473
}
14741474

1475-
bool GRASS_EXPORT QgsGrass::isMapset( QString path )
1475+
bool GRASS_LIB_EXPORT QgsGrass::isMapset( QString path )
14761476
{
14771477
#if 0
14781478
/* TODO: G_is_mapset() was added to GRASS 6.1 06-05-24,
@@ -1496,12 +1496,12 @@ bool GRASS_EXPORT QgsGrass::isMapset( QString path )
14961496
return false;
14971497
}
14981498

1499-
QString GRASS_EXPORT QgsGrass::lockFilePath()
1499+
QString GRASS_LIB_EXPORT QgsGrass::lockFilePath()
15001500
{
15011501
return mMapsetLock;
15021502
}
15031503

1504-
QString GRASS_EXPORT QgsGrass::gisrcFilePath()
1504+
QString GRASS_LIB_EXPORT QgsGrass::gisrcFilePath()
15051505
{
15061506
if ( mGisrc.isEmpty() )
15071507
{
@@ -1514,7 +1514,7 @@ QString GRASS_EXPORT QgsGrass::gisrcFilePath()
15141514
return mGisrc;
15151515
}
15161516

1517-
void GRASS_EXPORT QgsGrass::putEnv( QString name, QString value )
1517+
void GRASS_LIB_EXPORT QgsGrass::putEnv( QString name, QString value )
15181518
{
15191519
QString env = name + "=" + value;
15201520
/* _Correct_ putenv() implementation is not making copy! */

‎src/providers/grass/qgsgrass.h

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -65,31 +65,31 @@ class QgsGrass
6565
* Active mode means that GISRC is set up and GISRC file is available,
6666
* in that case default GISDBASE, LOCATION and MAPSET may be read by GetDefaul*() functions.
6767
* Passive mode means, that GISRC is not available. */
68-
static GRASS_EXPORT bool activeMode( void );
68+
static GRASS_LIB_EXPORT bool activeMode( void );
6969

7070
//! Get default GISDBASE, returns GISDBASE name or empty string if not in active mode
71-
static GRASS_EXPORT QString getDefaultGisdbase( void );
71+
static GRASS_LIB_EXPORT QString getDefaultGisdbase( void );
7272

7373
//! Get default LOCATION_NAME, returns LOCATION_NAME name or empty string if not in active mode
74-
static GRASS_EXPORT QString getDefaultLocation( void );
74+
static GRASS_LIB_EXPORT QString getDefaultLocation( void );
7575

7676
//! Get default MAPSET, returns MAPSET name or empty string if not in active mode
77-
static GRASS_EXPORT QString getDefaultMapset( void );
77+
static GRASS_LIB_EXPORT QString getDefaultMapset( void );
7878

7979
//! Init or reset GRASS library
8080
/*!
8181
\param gisdbase full path to GRASS GISDBASE.
8282
\param location location name (not path!).
8383
*/
84-
static GRASS_EXPORT void setLocation( QString gisdbase, QString location );
84+
static GRASS_LIB_EXPORT void setLocation( QString gisdbase, QString location );
8585

8686
/*!
8787
\param gisdbase full path to GRASS GISDBASE.
8888
\param location location name (not path!).
8989
\param mapset current mupset. Note that some variables depend on mapset and
9090
may influence behaviour of some functions (e.g. search path etc.)
9191
*/
92-
static GRASS_EXPORT void setMapset( QString gisdbase, QString location, QString mapset );
92+
static GRASS_LIB_EXPORT void setMapset( QString gisdbase, QString location, QString mapset );
9393

9494
//! Error codes returned by error()
9595
enum GERROR { OK, /*!< OK. No error. */
@@ -100,139 +100,139 @@ class QgsGrass
100100
enum MapType { None, Raster, Vector, Region };
101101

102102
//! Reset error code (to OK). Call this before a piece of code where an error is expected
103-
static GRASS_EXPORT void resetError( void ); // reset error status
103+
static GRASS_LIB_EXPORT void resetError( void ); // reset error status
104104

105105
//! Check if any error occured in lately called functions. Returns value from ERROR.
106-
static GRASS_EXPORT int error( void );
106+
static GRASS_LIB_EXPORT int error( void );
107107

108108
//! Get last error message
109-
static GRASS_EXPORT QString errorMessage( void );
109+
static GRASS_LIB_EXPORT QString errorMessage( void );
110110

111111
/** \brief Open existing GRASS mapset
112112
* \return NULL string or error message
113113
*/
114-
static GRASS_EXPORT QString openMapset( QString gisdbase,
115-
QString location, QString mapset );
114+
static GRASS_LIB_EXPORT QString openMapset( QString gisdbase,
115+
QString location, QString mapset );
116116

117117
/** \brief Close mapset if it was opened from QGIS.
118118
* Delete GISRC, lock and temporary directory
119119
* \return NULL string or error message
120120
*/
121-
static GRASS_EXPORT QString closeMapset();
121+
static GRASS_LIB_EXPORT QString closeMapset();
122122

123123
//! Check if given directory contains a GRASS installation
124-
static GRASS_EXPORT bool isValidGrassBaseDir( QString const gisBase );
124+
static GRASS_LIB_EXPORT bool isValidGrassBaseDir( QString const gisBase );
125125

126126
//! Returns list of locations in given gisbase
127-
static QStringList GRASS_EXPORT locations( QString gisbase );
127+
static QStringList GRASS_LIB_EXPORT locations( QString gisbase );
128128

129129
//! Returns list of mapsets in location
130-
static GRASS_EXPORT QStringList mapsets( QString gisbase, QString locationName );
131-
static GRASS_EXPORT QStringList mapsets( QString locationPath );
130+
static GRASS_LIB_EXPORT QStringList mapsets( QString gisbase, QString locationName );
131+
static GRASS_LIB_EXPORT QStringList mapsets( QString locationPath );
132132

133133
//! List of vectors and rasters
134-
static GRASS_EXPORT QStringList vectors( QString gisbase, QString locationName,
134+
static GRASS_LIB_EXPORT QStringList vectors( QString gisbase, QString locationName,
135135
QString mapsetName );
136-
static GRASS_EXPORT QStringList vectors( QString mapsetPath );
136+
static GRASS_LIB_EXPORT QStringList vectors( QString mapsetPath );
137137

138-
static GRASS_EXPORT QStringList rasters( QString gisbase, QString locationName,
138+
static GRASS_LIB_EXPORT QStringList rasters( QString gisbase, QString locationName,
139139
QString mapsetName );
140-
static GRASS_EXPORT QStringList rasters( QString mapsetPath );
140+
static GRASS_LIB_EXPORT QStringList rasters( QString mapsetPath );
141141

142142
//! Get list of vector layers
143-
static QStringList vectorLayers( QString, QString, QString, QString );
144-
143+
static GRASS_LIB_EXPORT QStringList vectorLayers( QString, QString, QString, QString );
144+
145145
//! List of elements
146-
static GRASS_EXPORT QStringList elements( QString gisbase, QString locationName,
146+
static GRASS_LIB_EXPORT QStringList elements( QString gisbase, QString locationName,
147147
QString mapsetName, QString element );
148-
static GRASS_EXPORT QStringList elements( QString mapsetPath, QString element );
148+
static GRASS_LIB_EXPORT QStringList elements( QString mapsetPath, QString element );
149149

150150
// ! Get map region
151-
static GRASS_EXPORT bool mapRegion( int type, QString gisbase,
152-
QString location, QString mapset, QString map,
153-
struct Cell_head *window );
151+
static GRASS_LIB_EXPORT bool mapRegion( int type, QString gisbase,
152+
QString location, QString mapset, QString map,
153+
struct Cell_head *window );
154154

155155
// ! String representation of region
156-
static GRASS_EXPORT QString regionString( struct Cell_head *window );
156+
static GRASS_LIB_EXPORT QString regionString( struct Cell_head *window );
157157

158158
// ! Read current mapset region
159-
static GRASS_EXPORT bool region( QString gisbase, QString location, QString mapset,
160-
struct Cell_head *window );
159+
static GRASS_LIB_EXPORT bool region( QString gisbase, QString location, QString mapset,
160+
struct Cell_head *window );
161161

162162
// ! Write current mapset region
163-
static GRASS_EXPORT bool writeRegion( QString gisbase, QString location, QString mapset,
164-
struct Cell_head *window );
163+
static GRASS_LIB_EXPORT bool writeRegion( QString gisbase, QString location, QString mapset,
164+
struct Cell_head *window );
165165

166166
// ! Set (copy) region extent, resolution is not changed
167-
static GRASS_EXPORT void copyRegionExtent( struct Cell_head *source,
167+
static GRASS_LIB_EXPORT void copyRegionExtent( struct Cell_head *source,
168168
struct Cell_head *target );
169169

170170
// ! Set (copy) region resolution, extent is not changed
171-
static GRASS_EXPORT void copyRegionResolution( struct Cell_head *source,
171+
static GRASS_LIB_EXPORT void copyRegionResolution( struct Cell_head *source,
172172
struct Cell_head *target );
173173

174174
// ! Extend region in target to source
175-
static GRASS_EXPORT void extendRegion( struct Cell_head *source,
176-
struct Cell_head *target );
175+
static GRASS_LIB_EXPORT void extendRegion( struct Cell_head *source,
176+
struct Cell_head *target );
177177

178-
static GRASS_EXPORT void init( void );
178+
static GRASS_LIB_EXPORT void init( void );
179179

180180
// ! test if the directory is mapset
181-
static GRASS_EXPORT bool isMapset( QString path );
181+
static GRASS_LIB_EXPORT bool isMapset( QString path );
182182

183183
// ! Get the lock file
184-
static GRASS_EXPORT QString lockFilePath();
184+
static GRASS_LIB_EXPORT QString lockFilePath();
185185

186186
// ! Get current gisrc path
187-
static GRASS_EXPORT QString gisrcFilePath();
187+
static GRASS_LIB_EXPORT QString gisrcFilePath();
188188

189189
// ! Start a GRASS module in any gisdbase/location
190-
static GRASS_EXPORT QProcess *startModule( QString gisdbase, QString location, QString module, QStringList arguments, QTemporaryFile &gisrcFile );
190+
static GRASS_LIB_EXPORT QProcess *startModule( QString gisdbase, QString location, QString module, QStringList arguments, QTemporaryFile &gisrcFile );
191191

192192
// ! Run a GRASS module in any gisdbase/location
193-
static GRASS_EXPORT QByteArray runModule( QString gisdbase, QString location, QString module, QStringList arguments );
193+
static GRASS_LIB_EXPORT QByteArray runModule( QString gisdbase, QString location, QString module, QStringList arguments );
194194

195195
// ! Get info string from qgis.g.info module
196-
static GRASS_EXPORT QString getInfo( QString info, QString gisdbase,
197-
QString location, QString mapset = "", QString map = "", MapType type = None, double x = 0.0, double y = 0.0 );
196+
static GRASS_LIB_EXPORT QString getInfo( QString info, QString gisdbase,
197+
QString location, QString mapset = "", QString map = "", MapType type = None, double x = 0.0, double y = 0.0 );
198198

199199
// ! Get location projection
200-
static GRASS_EXPORT QgsCoordinateReferenceSystem crs( QString gisdbase, QString location );
200+
static GRASS_LIB_EXPORT QgsCoordinateReferenceSystem crs( QString gisdbase, QString location );
201201

202202
// ! Get location projection calling directly GRASS library
203-
static GRASS_EXPORT QgsCoordinateReferenceSystem crsDirect( QString gisdbase, QString location );
203+
static GRASS_LIB_EXPORT QgsCoordinateReferenceSystem crsDirect( QString gisdbase, QString location );
204204

205205
// ! Get map extent
206-
static GRASS_EXPORT QgsRectangle extent( QString gisdbase, QString location,
206+
static GRASS_LIB_EXPORT QgsRectangle extent( QString gisdbase, QString location,
207207
QString mapset, QString map, MapType type = None );
208208

209209
// ! Get raster map size
210-
static GRASS_EXPORT void size( QString gisdbase, QString location,
211-
QString mapset, QString map, int *cols, int *rows );
210+
static GRASS_LIB_EXPORT void size( QString gisdbase, QString location,
211+
QString mapset, QString map, int *cols, int *rows );
212212

213213
// ! Get raster info
214-
static GRASS_EXPORT QHash<QString, QString> info( QString gisdbase, QString location,
214+
static GRASS_LIB_EXPORT QHash<QString, QString> info( QString gisdbase, QString location,
215215
QString mapset, QString map, MapType type );
216216

217217
// ! List of Color
218-
static GRASS_EXPORT QList<QgsGrass::Color> colors( QString gisdbase, QString location,
218+
static GRASS_LIB_EXPORT QList<QgsGrass::Color> colors( QString gisdbase, QString location,
219219
QString mapset, QString map );
220220

221221
// ! Get map value / feautre info
222-
static GRASS_EXPORT QMap<QString, QString> query( QString gisdbase, QString location,
222+
static GRASS_LIB_EXPORT QMap<QString, QString> query( QString gisdbase, QString location,
223223
QString mapset, QString map, MapType type, double x, double y );
224224

225225
//! Library version
226-
static GRASS_EXPORT int versionMajor();
227-
static GRASS_EXPORT int versionMinor();
228-
static GRASS_EXPORT int versionRelease();
229-
static GRASS_EXPORT QString versionString();
226+
static GRASS_LIB_EXPORT int versionMajor();
227+
static GRASS_LIB_EXPORT int versionMinor();
228+
static GRASS_LIB_EXPORT int versionRelease();
229+
static GRASS_LIB_EXPORT QString versionString();
230230

231231
// set environment variable
232-
static GRASS_EXPORT void putEnv( QString name, QString value );
232+
static GRASS_LIB_EXPORT void putEnv( QString name, QString value );
233233

234234
#if defined(WIN32)
235-
static GRASS_EXPORT QString shortPath( const QString &path );
235+
static GRASS_LIB_EXPORT QString shortPath( const QString &path );
236236
#endif
237237

238238
private:

‎src/providers/grass/qgsgrassprovider.cpp

Lines changed: 89 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,23 @@
1515
***************************************************************************/
1616
/* $Id$ */
1717

18+
#include <cstring>
19+
#include <vector>
20+
#include <cfloat>
21+
22+
#include <QString>
23+
#include <QDateTime>
24+
25+
#include "qgis.h"
26+
#include "qgsdataprovider.h"
27+
#include "qgsfeature.h"
28+
#include "qgsfield.h"
29+
#include "qgsrectangle.h"
30+
31+
#include "qgsgrass.h"
32+
#include "qgsgrassprovider.h"
33+
34+
1835
#include "qgsgrassprovider.h"
1936
#include "qgsgrass.h"
2037

@@ -23,8 +40,6 @@
2340
#include "qgsfield.h"
2441
#include "qgslogger.h"
2542

26-
#include <cfloat>
27-
2843
#include <QByteArray>
2944
#include <QDir>
3045
#include <QFile>
@@ -2394,16 +2409,16 @@ QString QgsGrassProvider::description() const
23942409
} // QgsGrassProvider::description()
23952410

23962411

2397-
QgsGrassLocationItem::QgsGrassLocationItem ( QgsDataItem* parent, QString path )
2398-
: QgsDataCollectionItem ( parent, "", path )
2412+
QgsGrassLocationItem::QgsGrassLocationItem( QgsDataItem* parent, QString path )
2413+
: QgsDataCollectionItem( parent, "", path )
23992414
{
2400-
QFileInfo fi ( path );
2401-
mName =fi.baseName();
2402-
mIcon = QIcon ( getThemePixmap ( "grass_location.png" ) );
2415+
QFileInfo fi( path );
2416+
mName = fi.baseName();
2417+
mIcon = QIcon( getThemePixmap( "grass_location.png" ) );
24032418
}
2404-
QgsGrassLocationItem::~QgsGrassLocationItem () {}
2419+
QgsGrassLocationItem::~QgsGrassLocationItem() {}
24052420

2406-
bool QgsGrassLocationItem::isLocation ( QString path )
2421+
bool QgsGrassLocationItem::isLocation( QString path )
24072422
{
24082423
//QgsDebugMsg( "path = " + path );
24092424
return QFile::exists( path + QDir::separator() + "PERMANENT" + QDir::separator() + "DEFAULT_WIND" );
@@ -2414,49 +2429,49 @@ QVector<QgsDataItem*>QgsGrassLocationItem::createChildren()
24142429
QVector<QgsDataItem*> mapsets;
24152430

24162431
QDir dir( mPath );
2417-
2418-
QStringList entries = dir.entryList( QDir::Dirs|QDir::NoDotAndDotDot, QDir::Name );
2432+
2433+
QStringList entries = dir.entryList( QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name );
24192434
foreach( QString name, entries )
24202435
{
24212436
QString path = dir.absoluteFilePath( name );
24222437

2423-
if ( QgsGrassMapsetItem::isMapset ( path ) )
2438+
if ( QgsGrassMapsetItem::isMapset( path ) )
24242439
{
2425-
QgsGrassMapsetItem * mapset = new QgsGrassMapsetItem ( this, path );
2426-
mapsets.append ( mapset );
2440+
QgsGrassMapsetItem * mapset = new QgsGrassMapsetItem( this, path );
2441+
mapsets.append( mapset );
24272442
}
24282443
}
24292444
return mapsets;
24302445
}
24312446

2432-
QgsGrassMapsetItem::QgsGrassMapsetItem ( QgsDataItem* parent, QString path )
2433-
: QgsDataCollectionItem ( parent, "", path )
2447+
QgsGrassMapsetItem::QgsGrassMapsetItem( QgsDataItem* parent, QString path )
2448+
: QgsDataCollectionItem( parent, "", path )
24342449
{
2435-
QDir dir( path );
2450+
QDir dir( path );
24362451
mName = dir.dirName();
24372452
dir.cdUp();
24382453
mLocation = dir.dirName();
24392454
dir.cdUp();
24402455
mGisdbase = dir.path();
24412456

2442-
mIcon = QIcon ( getThemePixmap ( "grass_mapset.png" ) );
2457+
mIcon = QIcon( getThemePixmap( "grass_mapset.png" ) );
24432458
}
24442459

2445-
QgsGrassMapsetItem::~QgsGrassMapsetItem () {}
2460+
QgsGrassMapsetItem::~QgsGrassMapsetItem() {}
24462461

2447-
bool QgsGrassMapsetItem::isMapset ( QString path )
2462+
bool QgsGrassMapsetItem::isMapset( QString path )
24482463
{
24492464
return QFile::exists( path + QDir::separator() + "WIND" );
24502465
}
24512466

24522467
QVector<QgsDataItem*> QgsGrassMapsetItem::createChildren()
24532468
{
2454-
QVector<QgsDataItem*> items;
2455-
2469+
QVector<QgsDataItem*> items;
2470+
24562471
QStringList vectorNames = QgsGrass::vectors( mPath );
2457-
2472+
24582473
foreach( QString name, vectorNames )
2459-
{
2474+
{
24602475
QStringList layerNames = QgsGrass::vectorLayers( mGisdbase , mLocation, mName, name );
24612476

24622477
QString path = mPath + QDir::separator() + "vector" + QDir::separator() + name;
@@ -2466,10 +2481,10 @@ QVector<QgsDataItem*> QgsGrassMapsetItem::createChildren()
24662481
map = new QgsDataCollectionItem( this, name );
24672482
foreach( QString layerName, layerNames )
24682483
{
2469-
QString uri = mPath + QDir::separator() + name + QDir::separator() +layerName;
2484+
QString uri = mPath + QDir::separator() + name + QDir::separator() + layerName;
24702485
QgsLayerItem::LayerType layerType = QgsLayerItem::Vector;
2471-
QString typeName = layerName.split("_")[1];
2472-
QString baseLayerName = layerName.split("_")[0];
2486+
QString typeName = layerName.split( "_" )[1];
2487+
QString baseLayerName = layerName.split( "_" )[0];
24732488

24742489
if ( typeName == "point" )
24752490
layerType = QgsLayerItem::Point;
@@ -2478,47 +2493,80 @@ QVector<QgsDataItem*> QgsGrassMapsetItem::createChildren()
24782493
else if ( typeName == "polygon" )
24792494
layerType = QgsLayerItem::Polygon;
24802495

2481-
if ( layerNames.size() == 1 )
2496+
if ( layerNames.size() == 1 )
24822497
{
2483-
2484-
QgsLayerItem *layer = new QgsLayerItem ( this, name + " " + baseLayerName, path, uri, layerType, "grass" );
2485-
items.append( layer );
2498+
QgsLayerItem *layer = new QgsLayerItem( this, name + " " + baseLayerName, path, uri, layerType, "grass" );
2499+
items.append( layer );
24862500
}
24872501
else
24882502
{
2489-
QgsLayerItem *layer = new QgsLayerItem ( map, baseLayerName, path, uri, layerType, "grass" );
2490-
map->addChild( layer );
2503+
QgsLayerItem *layer = new QgsLayerItem( map, baseLayerName, path, uri, layerType, "grass" );
2504+
map->addChild( layer );
24912505
}
24922506
}
24932507
if ( layerNames.size() != 1 )
24942508
items.append( map );
24952509
}
2496-
2510+
24972511
QStringList rasterNames = QgsGrass::rasters( mPath );
2498-
2512+
24992513
foreach( QString name, rasterNames )
25002514
{
25012515
QString uri = mPath + QDir::separator() + "cellhd" + QDir::separator() + name;
2502-
QgsDebugMsg ( "uri = " + uri );
2516+
QgsDebugMsg( "uri = " + uri );
25032517

2504-
QgsLayerItem *layer = new QgsLayerItem ( this, name, uri, uri, QgsLayerItem::Raster, "grassraster" );
2518+
QgsLayerItem *layer = new QgsLayerItem( this, name, uri, uri, QgsLayerItem::Raster, "grassraster" );
25052519

25062520
items.append( layer );
25072521
}
25082522

25092523
return items;
25102524
}
25112525

2512-
QGISEXTERN int dataCapabilities () {
2526+
QGISEXTERN int dataCapabilities()
2527+
{
25132528
return QgsDataProvider::Dir;
25142529
}
25152530

2516-
QGISEXTERN QgsDataItem * dataItem ( QString thePath, QgsDataItem* parentItem )
2531+
QGISEXTERN QgsDataItem * dataItem( QString thePath, QgsDataItem* parentItem )
25172532
{
2518-
if ( QgsGrassLocationItem::isLocation ( thePath ) )
2533+
if ( QgsGrassLocationItem::isLocation( thePath ) )
25192534
{
2520-
QgsGrassLocationItem * location = new QgsGrassLocationItem ( parentItem, thePath );
2535+
QgsGrassLocationItem * location = new QgsGrassLocationItem( parentItem, thePath );
25212536
return location;
25222537
}
25232538
return 0;
25242539
}
2540+
2541+
/**
2542+
* Class factory to return a pointer to a newly created
2543+
* QgsGrassProvider object
2544+
*/
2545+
QGISEXTERN QgsGrassProvider * classFactory( const QString *uri )
2546+
{
2547+
return new QgsGrassProvider( *uri );
2548+
}
2549+
2550+
/** Required key function (used to map the plugin to a data store type)
2551+
*/
2552+
QGISEXTERN QString providerKey()
2553+
{
2554+
return QString( "grass" );
2555+
}
2556+
2557+
/**
2558+
* Required description function
2559+
*/
2560+
QGISEXTERN QString description()
2561+
{
2562+
return QString( "GRASS data provider" );
2563+
}
2564+
2565+
/**
2566+
* Required isProvider function. Used to determine if this shared library
2567+
* is a data provider plugin
2568+
*/
2569+
QGISEXTERN bool isProvider()
2570+
{
2571+
return true;
2572+
}

‎src/providers/grass/qgsgrassprovider.h

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -689,25 +689,25 @@ class GRASS_EXPORT QgsGrassProvider : public QgsVectorDataProvider
689689

690690
class QgsGrassLocationItem : public QgsDataCollectionItem
691691
{
692-
public:
693-
QgsGrassLocationItem (QgsDataItem* parent, QString path );
694-
~QgsGrassLocationItem();
695-
696-
static bool isLocation ( QString path );
697-
QVector<QgsDataItem*> createChildren();
692+
public:
693+
QgsGrassLocationItem( QgsDataItem* parent, QString path );
694+
~QgsGrassLocationItem();
695+
696+
static bool isLocation( QString path );
697+
QVector<QgsDataItem*> createChildren();
698698
};
699699

700-
class QgsGrassMapsetItem : public QgsDataCollectionItem
700+
class QgsGrassMapsetItem : public QgsDataCollectionItem
701701
{
702-
public:
703-
QgsGrassMapsetItem (QgsDataItem* parent, QString path );
704-
~QgsGrassMapsetItem();
705-
706-
static bool isMapset ( QString path );
707-
QVector<QgsDataItem*> createChildren();
708-
709-
QString mLocation;
710-
QString mGisdbase;
702+
public:
703+
QgsGrassMapsetItem( QgsDataItem* parent, QString path );
704+
~QgsGrassMapsetItem();
705+
706+
static bool isMapset( QString path );
707+
QVector<QgsDataItem*> createChildren();
708+
709+
QString mLocation;
710+
QString mGisdbase;
711711
};
712712

713713

‎src/providers/ogr/qgsogrprovider.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ bool QgsOgrProvider::nextFeature( QgsFeature& feature )
521521

522522
setRelevantFields( mFetchGeom, mAttributesToFetch );
523523

524-
while ( ( fet = OGR_L_GetNextFeature( ogrLayer ) ) )
524+
while (( fet = OGR_L_GetNextFeature( ogrLayer ) ) )
525525
{
526526
// skip features without geometry
527527
if ( !mFetchFeaturesWithoutGeom && !OGR_F_GetGeometryRef( fet ) )

‎src/providers/osm/osmprovider.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -541,11 +541,17 @@ bool QgsOSMDataProvider::nextFeature( QgsFeature& feature )
541541

542542
default:
543543
if ( mFeatureType == PointType )
544+
{
544545
QgsDebugMsg( "Getting next feature of type <point> failed." );
546+
}
545547
else if ( mFeatureType == LineType )
548+
{
546549
QgsDebugMsg( "Getting next feature of type <line> failed." );
550+
}
547551
else if ( mFeatureType == PolygonType )
552+
{
548553
QgsDebugMsg( "Getting next feature of type <polygon> failed." );
554+
}
549555
feature.setValid( false );
550556
return false;
551557
}

‎src/providers/sqlanywhere/CMakeLists.txt

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,10 @@
33

44
SUBDIRS( sqlanyconnection )
55

6-
SET (SA_SRCS
7-
qgssqlanywhereprovider.cpp
8-
)
9-
SET (SA_MOC_HDRS
10-
qgssqlanywhereprovider.h
11-
)
6+
SET (SA_SRCS qgssqlanywhereprovider.cpp)
7+
SET (SA_MOC_HDRS qgssqlanywhereprovider.h)
128

13-
IF (WIN32)
14-
IF (MSVC)
15-
ADD_DEFINITIONS("-DSACONN_EXPORT=__declspec(dllexport)")
16-
ELSE (MSVC)
17-
ADD_DEFINITIONS("-USACONN_EXPORT \"-DSACONN_EXPORT=__declspec(dllexport)\"")
18-
ENDIF (MSVC)
19-
ELSE (WIN32)
20-
ADD_DEFINITIONS(-DSACONN_EXPORT=)
21-
ENDIF (WIN32)
9+
ADD_DEFINITIONS("-DSACONN_EXPORT=${DLLEXPORT}")
2210

2311
########################################################
2412
# Build

‎tests/src/analysis/CMakeLists.txt

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
1818
#############################################################
1919
# Compiler defines
2020

21-
# expect that classes are being IMPORTED for the tests
22-
IF (WIN32)
23-
# expect that classes are being imported
24-
# Note: MSVC doesn't like when the macros are quotes
25-
# and MSYS doesn't like them unqouted (bacause of braces)
26-
IF (MSVC)
27-
ADD_DEFINITIONS("-DCORE_EXPORT=__declspec(dllimport)")
28-
ADD_DEFINITIONS("-DANALYzer_EXPORT=__declspec(dllimport)")
29-
#ADD_DEFINITIONS("-DPLUGIN_EXPORT=__declspec(dllimport)")
30-
#next needed for qgis gui includes
31-
ADD_DEFINITIONS("-DGUI_EXPORT=__declspec(dllexport)")
32-
ELSE (MSVC)
33-
ADD_DEFINITIONS("-UCORE_EXPORT \"-DCORE_EXPORT=__declspec(dllimport)\"")
34-
ADD_DEFINITIONS("-UANALYzer_EXPORT \"-DCORE_EXPORT=__declspec(dllimport)\"")
35-
#ADD_DEFINITIONS("\"-DPLUGIN_EXPORT=__declspec(dllimport)\"")
36-
#next needed for qgis gui includes
37-
ADD_DEFINITIONS("-UGUI_EXPORT \"-DGUI_EXPORT=__declspec(dllexport)\"")
38-
ENDIF (MSVC)
39-
ENDIF (WIN32)
40-
4121
# This define is used for tests that need to locate the test
4222
# data under tests/testdata in the qgis source tree.
4323
# the TEST_DATA_DIR variable is set in the top level CMakeLists.txt

‎tests/src/core/CMakeLists.txt

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
2121
#############################################################
2222
# Compiler defines
2323

24-
# expect that classes are being IMPORTED for the tests
25-
IF (WIN32)
26-
# expect that classes are being imported
27-
# Note: MSVC doesn't like when the macros are quotes
28-
# and MSYS doesn't like them unqouted (bacause of braces)
29-
IF (MSVC)
30-
ADD_DEFINITIONS("-DCORE_EXPORT=__declspec(dllimport)")
31-
#ADD_DEFINITIONS("-DPLUGIN_EXPORT=__declspec(dllimport)")
32-
#next needed for qgis gui includes
33-
ADD_DEFINITIONS("-DGUI_EXPORT=__declspec(dllexport)")
34-
ELSE (MSVC)
35-
ADD_DEFINITIONS("-UCORE_EXPORT \"-DCORE_EXPORT=__declspec(dllimport)\"")
36-
#ADD_DEFINITIONS("\"-DPLUGIN_EXPORT=__declspec(dllimport)\"")
37-
#next needed for qgis gui includes
38-
ADD_DEFINITIONS("-UGUI_EXPORT \"-DGUI_EXPORT=__declspec(dllexport)\"")
39-
ENDIF (MSVC)
40-
ENDIF (WIN32)
41-
4224
# This define is used for tests that need to locate the test
4325
# data under tests/testdata in the qgis source tree.
4426
# the TEST_DATA_DIR variable is set in the top level CMakeLists.txt

‎tests/src/gui/CMakeLists.txt

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
2020
#############################################################
2121
# Compiler defines
2222

23-
# expect that classes are being IMPORTED for the tests
24-
IF (WIN32)
25-
# expect that classes are being imported
26-
# Note: MSVC doesn't like when the macros are quotes
27-
# and MSYS doesn't like them unqouted (bacause of braces)
28-
IF (MSVC)
29-
ADD_DEFINITIONS("-DCORE_EXPORT=__declspec(dllimport)")
30-
#ADD_DEFINITIONS("-DPLUGIN_EXPORT=__declspec(dllimport)")
31-
#next needed for qgis gui includes
32-
ADD_DEFINITIONS("-DGUI_EXPORT=__declspec(dllimport)")
33-
ELSE (MSVC)
34-
ADD_DEFINITIONS("-UCORE_EXPORT \"-DCORE_EXPORT=__declspec(dllimport)\"")
35-
#ADD_DEFINITIONS("\"-DPLUGIN_EXPORT=__declspec(dllimport)\"")
36-
#next needed for qgis gui includes
37-
ADD_DEFINITIONS("-UGUI_EXPORT \"-DGUI_EXPORT=__declspec(dllimport)\"")
38-
ENDIF (MSVC)
39-
ENDIF (WIN32)
40-
4123
# This define is used for tests that need to locate the test
4224
# data under tests/testdata in the qgis source tree.
4325
# the TEST_DATA_DIR variable is set in the top level CMakeLists.txt

0 commit comments

Comments
 (0)
Please sign in to comment.