Skip to content

Commit ee30549

Browse files
author
timlinux
committedJan 8, 2006
Refactored libqgis into two roughly inequal parts.
libqgis_core is intended to have non gui code libqgis_gui is intended to have gui related code Updated makefiles and code throughout in order for it to build with this new arrangemetn Code in src/ will be moved into src/gui in a follow up commit git-svn-id: http://svn.osgeo.org/qgis/trunk@4501 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent bc934c6 commit ee30549

26 files changed

+68
-68
lines changed
 

‎providers/delimitedtext/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
## $Id$
22

3-
INCLUDES = -I../../src
3+
INCLUDES = -I../../src/core/ -I../../src/
44

55
plugindir = ${pkglibdir}
66
plugin_LTLIBRARIES = delimitedtextprovider.la
77

88
delimitedtextprovider_la_SOURCES = qgsdelimitedtextprovider.cpp
99

1010

11-
delimitedtextprovider_la_LIBADD = $(QT_LDADD) $(GDAL_LIB) $(GEOS_LDADD) ../../src/libqgis.la
11+
delimitedtextprovider_la_LIBADD = $(QT_LDADD) $(GDAL_LIB) $(GEOS_LDADD) ../../src/libqgis_gui.la ../../src/core/libqgis_core.la
1212
delimitedtextprovider_la_LDFLAGS = -avoid-version -module
1313
delimitedtextprovider_la_CXXFLAGS = $(GDAL_CFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GEOS_CFLAGS)
1414

‎providers/delimitedtext/qgsdelimitedtextprovider.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@
3333

3434
#include <ogrsf_frmts.h>
3535

36-
#include "../../src/qgsdataprovider.h"
37-
#include "../../src/qgsencodingfiledialog.h"
38-
#include "../../src/qgsfeature.h"
39-
#include "../../src/qgsfield.h"
40-
#include "../../src/qgsrect.h"
36+
#include "qgsdataprovider.h"
37+
#include "qgsencodingfiledialog.h"
38+
#include "qgsfeature.h"
39+
#include "qgsfield.h"
40+
#include "qgsrect.h"
4141

4242

4343
#ifdef WIN32

‎providers/delimitedtext/qgsdelimitedtextprovider.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
/* $Id$ */
1919

20-
#include "../../src/qgsvectordataprovider.h"
20+
#include "qgsvectordataprovider.h"
2121

2222

2323
#include <map>

‎providers/gpx/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
if HAVE_EXPAT
44

5-
INCLUDES = -I../../src
5+
INCLUDES = -I../../src/core
66

77
plugindir = ${pkglibdir}
88
plugin_LTLIBRARIES = gpxprovider.la
@@ -11,7 +11,7 @@ gpxprovider_la_SOURCES = qgsgpxprovider.cpp \
1111
gpsdata.cpp
1212

1313

14-
gpxprovider_la_LIBADD = $(QT_LDADD) $(GEOS_LDADD) ../../src/libqgis.la
14+
gpxprovider_la_LIBADD = $(QT_LDADD) $(GEOS_LDADD) ../../src/core/libqgis_core.la
1515
gpxprovider_la_LDFLAGS = -avoid-version -module
1616
gpxprovider_la_CXXFLAGS = $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GEOS_CFLAGS) $(GDAL_CFLAGS)
1717

‎providers/gpx/gpsdata.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include <qstring.h>
3131
#include <qtextstream.h>
3232

33-
#include "../../src/qgsrect.h"
33+
#include "qgsrect.h"
3434

3535

3636
/** This is the parent class for all GPS data classes (except tracksegment).

‎providers/gpx/qgsgpxprovider.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@
3434
#include <qstringlist.h>
3535
#include <qrect.h>
3636

37-
#include "../../src/qgis.h"
38-
#include "../../src/qgsdataprovider.h"
39-
#include "../../src/qgsfeature.h"
40-
#include "../../src/qgsfield.h"
41-
#include "../../src/qgsrect.h"
37+
#include "qgis.h"
38+
#include "qgsdataprovider.h"
39+
#include "qgsfeature.h"
40+
#include "qgsfield.h"
41+
#include "qgsrect.h"
4242
#include "qgsgpxprovider.h"
4343
#include "gpsdata.h"
4444

‎providers/gpx/qgsgpxprovider.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
#include <map>
2121

22-
#include "../../src/qgsvectordataprovider.h"
22+
#include "qgsvectordataprovider.h"
2323
#include "gpsdata.h"
2424

2525

‎providers/grass/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
## $Id$
33
##
44

5-
INCLUDES = -I../../src
5+
INCLUDES = -I../../src/core
66

77
lib_LTLIBRARIES = libqgisgrass.la
88

@@ -30,7 +30,7 @@ libqgisgrass_la_SOURCES = qgsgrassprovider.cpp \
3030
qgsgrass.cpp \
3131
qgsgrass.h
3232

33-
libqgisgrass_la_LIBADD = $(QT_LDADD) $(GRASS_LIB) ../../src/libqgis.la
33+
libqgisgrass_la_LIBADD = $(QT_LDADD) $(GRASS_LIB) ../../src/core/libqgis_core.la
3434
libqgisgrass_la_LDFLAGS = -version-info $(INTERFACE_VERSION)
3535
libqgisgrass_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) -I$(GRASS_INC) $(DEBUG_QGIS) $(GEOS_CFLAGS) $(GDAL_CFLAGS)
3636
if HAVE_POSTGRESQL

‎providers/grass/provider.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
#include <qdatetime.h>
2626
#include <qmessagebox.h>
2727

28-
#include "../../src/qgis.h"
29-
#include "../../src/qgsdataprovider.h"
30-
#include "../../src/qgsfeature.h"
31-
#include "../../src/qgsfield.h"
32-
#include "../../src/qgsrect.h"
28+
#include "qgis.h"
29+
#include "qgsdataprovider.h"
30+
#include "qgsfeature.h"
31+
#include "qgsfield.h"
32+
#include "qgsrect.h"
3333

3434
extern "C" {
3535
#include <gis.h>

‎providers/grass/qgsgrassprovider.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929
//Added by qt3to4:
3030
#include <Q3CString>
3131

32-
#include "../../src/qgis.h"
33-
#include "../../src/qgsdataprovider.h"
34-
#include "../../src/qgsfeature.h"
35-
#include "../../src/qgsfield.h"
36-
#include "../../src/qgsrect.h"
37-
#include "../../src/qgsfeatureattribute.h"
32+
#include "qgis.h"
33+
#include "qgsdataprovider.h"
34+
#include "qgsfeature.h"
35+
#include "qgsfield.h"
36+
#include "qgsrect.h"
37+
#include "qgsfeatureattribute.h"
3838

3939
extern "C" {
4040
#include <gprojects.h>

‎providers/grass/qgsgrassprovider.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
class QgsFeature;
2020
class QgsField;
2121
#include <qdatetime.h>
22-
#include "../../src/qgsvectordataprovider.h"
22+
#include "qgsvectordataprovider.h"
2323

2424
/* Update.
2525
* Vectors are updated (reloaded) if:

‎providers/ogr/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
INCLUDES = -I../../src
1+
INCLUDES = -I../../src/core/
22

33
plugindir = ${pkglibdir}
44
plugin_LTLIBRARIES = ogrprovider.la
55

66
ogrprovider_la_SOURCES = qgsogrprovider.cpp \
77
qgsogrprovider.h
88

9-
ogrprovider_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) $(GEOS_LDADD) ../../src/libqgis.la
9+
ogrprovider_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) $(GEOS_LDADD) ../../src/core/libqgis_core.la
1010
ogrprovider_la_LDFLAGS = -avoid-version -module
1111
ogrprovider_la_CXXFLAGS := $(GDAL_CFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GEOS_CFLAGS)
1212

‎providers/ogr/qgsogrprovider.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ email : sherman at mrcc.com
5151
#endif
5252

5353

54-
#include "../../src/qgssearchtreenode.h"
55-
#include "../../src/qgsdataprovider.h"
56-
#include "../../src/qgsfeature.h"
57-
#include "../../src/qgsfield.h"
58-
#include "../../src/qgis.h"
54+
#include "qgssearchtreenode.h"
55+
#include "qgsdataprovider.h"
56+
#include "qgsfeature.h"
57+
#include "qgsfield.h"
58+
#include "qgis.h"
5959

6060

6161
#ifdef WIN32

‎providers/ogr/qgsogrprovider.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ email : sherman at mrcc.com
1616
***************************************************************************/
1717
/* $Id$ */
1818

19-
#include "../../src/qgsrect.h"
20-
#include "../../src/qgsvectordataprovider.h"
19+
#include "qgsrect.h"
20+
#include "qgsvectordataprovider.h"
2121
#include <geos.h>
2222

2323
#include <ogr_spatialref.h>

‎providers/postgres/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
INCLUDES = -I../../src
1+
INCLUDES = -I../../src/core/ -I../../src/
22

33
%.moc.cpp: %.h
44
$(MOC) -o $@ $<
@@ -27,7 +27,7 @@ postgresprovider_la_SOURCES = \
2727

2828
BUILT_SOURCES = $(postgresprovider_MOC)
2929

30-
postgresprovider_la_LIBADD = $(QT_LDADD) $(PG_LIB) $(GEOS_LDADD) ../../src/libqgis.la
30+
postgresprovider_la_LIBADD = $(QT_LDADD) $(PG_LIB) $(GEOS_LDADD) ../../src/core/libqgis_core.la
3131
postgresprovider_la_LDFLAGS = -avoid-version -module
3232
postgresprovider_la_CXXFLAGS = $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS) $(GEOS_CFLAGS) $(GDAL_CFLAGS)
3333

‎providers/postgres/qgspostgisbox2d.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#include <qstring.h>
2323

24-
#include "../../src/qgsrect.h"
24+
#include "qgsrect.h"
2525

2626
#include "qgspostgisbox2d.h"
2727

‎providers/postgres/qgspostgisbox2d.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
#include <qstring.h>
2626

27-
#include "../../src/qgsrect.h"
27+
#include "qgsrect.h"
2828

2929
/*!
3030
* \brief PostgreSQL/PostGIS "box3d" representation and transformation

‎providers/postgres/qgspostgisbox3d.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#include <qstring.h>
2323

24-
#include "../../src/qgsrect.h"
24+
#include "qgsrect.h"
2525

2626
#include "qgspostgisbox3d.h"
2727

‎providers/postgres/qgspostgisbox3d.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
#include <qstring.h>
2626

27-
#include "../../src/qgsrect.h"
27+
#include "qgsrect.h"
2828

2929
/*!
3030
* \brief PostgreSQL/PostGIS "box3d" representation and transformation

‎providers/postgres/qgspostgrescountthread.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
#include <qevent.h>
2222
#include <qapplication.h>
2323

24-
#include "../../src/qgis.h"
25-
#include "../../src/qgsrect.h"
26-
#include "../../src/qgsmapcanvas.h"
24+
#include "qgis.h"
25+
#include "qgsrect.h"
26+
#include "qgsmapcanvas.h"
2727

28-
#include "../../src/qgsprovidercountcalcevent.h"
28+
#include "qgsprovidercountcalcevent.h"
2929

3030
#include "qgspostgrescountthread.h"
3131

‎providers/postgres/qgspostgresextentthread.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
//Added by qt3to4:
2424
#include <QCustomEvent>
2525

26-
#include "../../src/qgis.h"
27-
#include "../../src/qgsrect.h"
28-
#include "../../src/qgsmapcanvas.h"
26+
#include "qgis.h"
27+
#include "qgsrect.h"
28+
#include "qgsmapcanvas.h"
2929

3030

3131
#include "qgspostgresextentthread.h"

‎providers/postgres/qgspostgresprovider.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@
3838
#include <netinet/in.h>
3939
#endif
4040

41-
#include "../../src/qgis.h"
42-
#include "../../src/qgsfeature.h"
43-
#include "../../src/qgsfield.h"
44-
#include "../../src/qgsrect.h"
41+
#include "qgis.h"
42+
#include "qgsfeature.h"
43+
#include "qgsfield.h"
44+
#include "qgsrect.h"
4545

46-
#include "../../src/qgsprovidercountcalcevent.h"
47-
#include "../../src/qgsproviderextentcalcevent.h"
46+
#include "qgsprovidercountcalcevent.h"
47+
#include "qgsproviderextentcalcevent.h"
4848

4949
#include "qgspostgresprovider.h"
5050

‎providers/postgres/qgspostgresprovider.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ extern "C"
2525
{
2626
#include <libpq-fe.h>
2727
}
28-
#include "../../src/qgsvectordataprovider.h"
29-
#include "../../src/qgsrect.h"
28+
#include "qgsvectordataprovider.h"
29+
#include "qgsrect.h"
3030
#include <list>
3131
#include <queue>
3232
#include <fstream>

‎providers/wms/Makefile.am

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
INCLUDES = -I../../src -I../../src/raster
1+
INCLUDES = -I../../src -I../../src/raster -I../../src/core
22

33
%.moc.cpp: %.h
44
$(MOC) -o $@ $<
@@ -10,11 +10,11 @@ plugin_LTLIBRARIES = wmsprovider.la
1010
## non-uic files generated from MOC
1111

1212
wmsprovider_MOC = qgswmsprovider.moc.cpp \
13-
qgshttptransaction.moc.cpp
13+
qgshttptransaction.moc.cpp \
14+
../../src/core/qgsdataprovider.moc.cpp \
15+
../../src/core/qgsrasterdataprovider.moc.cpp
1416

1517
wmsprovider_la_SOURCES = \
16-
../../src/qgsdataprovider.moc.cpp \
17-
../../src/qgsrasterdataprovider.moc.cpp \
1818
qgswmsprovider.cpp \
1919
qgswmsprovider.moc.cpp \
2020
qgswmsprovider.h \

‎providers/wms/qgswmsprovider.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include <fstream>
2222
#include <iostream>
2323

24-
#include "../../src/qgsrect.h"
24+
#include "qgsrect.h"
2525
#include "qgshttptransaction.h"
2626

2727
#include "qgswmsprovider.h"

‎providers/wms/qgswmsprovider.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
#include <map>
2525
#include <vector>
2626

27-
#include "../../src/qgsrasterdataprovider.h"
28-
#include "../../src/qgsrect.h"
27+
#include "qgsrasterdataprovider.h"
28+
#include "qgsrect.h"
2929

3030
#include "qgsdatasourceuri.h"
3131

0 commit comments

Comments
 (0)