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
qgis · Jan 8, 2006 · ee30549 · ee30549
1 parent bc934c6
commit ee30549
Show file tree

Hide file tree

Showing 26 changed files with 68 additions and 68 deletions.
diff --git a/providers/delimitedtext/Makefile.am b/providers/delimitedtext/Makefile.am
@@ -1,14 +1,14 @@
 ## $Id$
 
-INCLUDES = -I../../src
+INCLUDES = -I../../src/core/ -I../../src/
 
 plugindir = ${pkglibdir}
 plugin_LTLIBRARIES = delimitedtextprovider.la 
 
 delimitedtextprovider_la_SOURCES = qgsdelimitedtextprovider.cpp
 
 
-delimitedtextprovider_la_LIBADD = $(QT_LDADD)  $(GDAL_LIB) $(GEOS_LDADD) ../../src/libqgis.la
+delimitedtextprovider_la_LIBADD = $(QT_LDADD)  $(GDAL_LIB) $(GEOS_LDADD) ../../src/libqgis_gui.la ../../src/core/libqgis_core.la
 delimitedtextprovider_la_LDFLAGS = -avoid-version -module
 delimitedtextprovider_la_CXXFLAGS = $(GDAL_CFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GEOS_CFLAGS)
 

diff --git a/providers/delimitedtext/qgsdelimitedtextprovider.cpp b/providers/delimitedtext/qgsdelimitedtextprovider.cpp
@@ -33,11 +33,11 @@
 
 #include <ogrsf_frmts.h>
 
-#include "../../src/qgsdataprovider.h"
-#include "../../src/qgsencodingfiledialog.h"
-#include "../../src/qgsfeature.h"
-#include "../../src/qgsfield.h"
-#include "../../src/qgsrect.h"
+#include "qgsdataprovider.h"
+#include "qgsencodingfiledialog.h"
+#include "qgsfeature.h"
+#include "qgsfield.h"
+#include "qgsrect.h"
 
 
 #ifdef WIN32

diff --git a/providers/delimitedtext/qgsdelimitedtextprovider.h b/providers/delimitedtext/qgsdelimitedtextprovider.h
@@ -17,7 +17,7 @@
 
 /* $Id$ */
 
-#include "../../src/qgsvectordataprovider.h"
+#include "qgsvectordataprovider.h"
 
 
 #include <map>

diff --git a/providers/gpx/Makefile.am b/providers/gpx/Makefile.am
@@ -2,7 +2,7 @@
 
 if HAVE_EXPAT
 
-INCLUDES = -I../../src
+INCLUDES = -I../../src/core
 
 plugindir = ${pkglibdir}
 plugin_LTLIBRARIES = gpxprovider.la 
@@ -11,7 +11,7 @@ gpxprovider_la_SOURCES = qgsgpxprovider.cpp		\
 	gpsdata.cpp
 
 
-gpxprovider_la_LIBADD = $(QT_LDADD) $(GEOS_LDADD) ../../src/libqgis.la
+gpxprovider_la_LIBADD = $(QT_LDADD) $(GEOS_LDADD) ../../src/core/libqgis_core.la
 gpxprovider_la_LDFLAGS = -avoid-version -module
 gpxprovider_la_CXXFLAGS = $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GEOS_CFLAGS) $(GDAL_CFLAGS)
 

diff --git a/providers/gpx/gpsdata.h b/providers/gpx/gpsdata.h
@@ -30,7 +30,7 @@
 #include <qstring.h>
 #include <qtextstream.h>
 
-#include "../../src/qgsrect.h"
+#include "qgsrect.h"
 
 
 /** This is the parent class for all GPS data classes (except tracksegment).

diff --git a/providers/gpx/qgsgpxprovider.cpp b/providers/gpx/qgsgpxprovider.cpp
@@ -34,11 +34,11 @@
 #include <qstringlist.h>
 #include <qrect.h>
 
-#include "../../src/qgis.h"
-#include "../../src/qgsdataprovider.h"
-#include "../../src/qgsfeature.h"
-#include "../../src/qgsfield.h"
-#include "../../src/qgsrect.h"
+#include "qgis.h"
+#include "qgsdataprovider.h"
+#include "qgsfeature.h"
+#include "qgsfield.h"
+#include "qgsrect.h"
 #include "qgsgpxprovider.h"
 #include "gpsdata.h"
 

diff --git a/providers/gpx/qgsgpxprovider.h b/providers/gpx/qgsgpxprovider.h
@@ -19,7 +19,7 @@
 
 #include <map>
 
-#include "../../src/qgsvectordataprovider.h"
+#include "qgsvectordataprovider.h"
 #include "gpsdata.h"
 
 

diff --git a/providers/grass/Makefile.am b/providers/grass/Makefile.am
@@ -2,7 +2,7 @@
 ## $Id$
 ##
 
-INCLUDES = -I../../src
+INCLUDES = -I../../src/core
 
 lib_LTLIBRARIES = libqgisgrass.la
 
@@ -30,7 +30,7 @@ libqgisgrass_la_SOURCES = qgsgrassprovider.cpp \
 			qgsgrass.cpp \
 			qgsgrass.h
 
-libqgisgrass_la_LIBADD = $(QT_LDADD) $(GRASS_LIB) ../../src/libqgis.la
+libqgisgrass_la_LIBADD = $(QT_LDADD) $(GRASS_LIB) ../../src/core/libqgis_core.la
 libqgisgrass_la_LDFLAGS = -version-info $(INTERFACE_VERSION)
 libqgisgrass_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) -I$(GRASS_INC) $(DEBUG_QGIS) $(GEOS_CFLAGS) $(GDAL_CFLAGS)
 if HAVE_POSTGRESQL

diff --git a/providers/grass/provider.cpp b/providers/grass/provider.cpp
@@ -25,11 +25,11 @@
 #include <qdatetime.h>
 #include <qmessagebox.h>
 
-#include "../../src/qgis.h"
-#include "../../src/qgsdataprovider.h"
-#include "../../src/qgsfeature.h"
-#include "../../src/qgsfield.h"
-#include "../../src/qgsrect.h"
+#include "qgis.h"
+#include "qgsdataprovider.h"
+#include "qgsfeature.h"
+#include "qgsfield.h"
+#include "qgsrect.h"
 
 extern "C" {
 #include <gis.h>

diff --git a/providers/grass/qgsgrassprovider.cpp b/providers/grass/qgsgrassprovider.cpp
@@ -29,12 +29,12 @@
 //Added by qt3to4:
 #include <Q3CString>
 
-#include "../../src/qgis.h"
-#include "../../src/qgsdataprovider.h"
-#include "../../src/qgsfeature.h"
-#include "../../src/qgsfield.h"
-#include "../../src/qgsrect.h"
-#include "../../src/qgsfeatureattribute.h"
+#include "qgis.h"
+#include "qgsdataprovider.h"
+#include "qgsfeature.h"
+#include "qgsfield.h"
+#include "qgsrect.h"
+#include "qgsfeatureattribute.h"
 
 extern "C" {
 #include <gprojects.h>

diff --git a/providers/grass/qgsgrassprovider.h b/providers/grass/qgsgrassprovider.h
@@ -19,7 +19,7 @@
 class QgsFeature;
 class QgsField;
 #include <qdatetime.h>
-#include "../../src/qgsvectordataprovider.h"
+#include "qgsvectordataprovider.h"
 
 /* Update.
  * Vectors are updated (reloaded) if:

diff --git a/providers/ogr/Makefile.am b/providers/ogr/Makefile.am
@@ -1,12 +1,12 @@
-INCLUDES = -I../../src
+INCLUDES = -I../../src/core/
 
 plugindir = ${pkglibdir}
 plugin_LTLIBRARIES = ogrprovider.la 
 
 ogrprovider_la_SOURCES = qgsogrprovider.cpp			\
 			 qgsogrprovider.h
 
-ogrprovider_la_LIBADD = $(QT_LDADD)  $(GDAL_LDADD) $(GEOS_LDADD) ../../src/libqgis.la
+ogrprovider_la_LIBADD = $(QT_LDADD)  $(GDAL_LDADD) $(GEOS_LDADD) ../../src/core/libqgis_core.la
 ogrprovider_la_LDFLAGS = -avoid-version -module
 ogrprovider_la_CXXFLAGS := $(GDAL_CFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GEOS_CFLAGS)
 
diff --git a/providers/ogr/qgsogrprovider.cpp b/providers/ogr/qgsogrprovider.cpp
@@ -51,11 +51,11 @@ email                : sherman at mrcc.com
 #endif 
 
 
-#include "../../src/qgssearchtreenode.h"
-#include "../../src/qgsdataprovider.h"
-#include "../../src/qgsfeature.h"
-#include "../../src/qgsfield.h"
-#include "../../src/qgis.h"
+#include "qgssearchtreenode.h"
+#include "qgsdataprovider.h"
+#include "qgsfeature.h"
+#include "qgsfield.h"
+#include "qgis.h"
 
 
 #ifdef WIN32

diff --git a/providers/ogr/qgsogrprovider.h b/providers/ogr/qgsogrprovider.h
@@ -16,8 +16,8 @@ email                : sherman at mrcc.com
  ***************************************************************************/
 /* $Id$ */
 
-#include "../../src/qgsrect.h"
-#include "../../src/qgsvectordataprovider.h"
+#include "qgsrect.h"
+#include "qgsvectordataprovider.h"
 #include <geos.h>
 
 #include <ogr_spatialref.h>

diff --git a/providers/postgres/Makefile.am b/providers/postgres/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I../../src
+INCLUDES = -I../../src/core/ -I../../src/
 
 %.moc.cpp: %.h
 	$(MOC) -o $@ $<
@@ -27,7 +27,7 @@ postgresprovider_la_SOURCES =					\
 
 BUILT_SOURCES = $(postgresprovider_MOC)
 
-postgresprovider_la_LIBADD = $(QT_LDADD) $(PG_LIB) $(GEOS_LDADD) ../../src/libqgis.la
+postgresprovider_la_LIBADD = $(QT_LDADD) $(PG_LIB) $(GEOS_LDADD) ../../src/core/libqgis_core.la
 postgresprovider_la_LDFLAGS = -avoid-version -module
 postgresprovider_la_CXXFLAGS = $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS) $(GEOS_CFLAGS) $(GDAL_CFLAGS)
 

diff --git a/providers/postgres/qgspostgisbox2d.cpp b/providers/postgres/qgspostgisbox2d.cpp
@@ -21,7 +21,7 @@
 
 #include <qstring.h>
 
-#include "../../src/qgsrect.h"
+#include "qgsrect.h"
 
 #include "qgspostgisbox2d.h"
 

diff --git a/providers/postgres/qgspostgisbox2d.h b/providers/postgres/qgspostgisbox2d.h
@@ -24,7 +24,7 @@
 
 #include <qstring.h>
 
-#include "../../src/qgsrect.h"
+#include "qgsrect.h"
 
 /*!
  * \brief   PostgreSQL/PostGIS "box3d" representation and transformation

diff --git a/providers/postgres/qgspostgisbox3d.cpp b/providers/postgres/qgspostgisbox3d.cpp
@@ -21,7 +21,7 @@
 
 #include <qstring.h>
 
-#include "../../src/qgsrect.h"
+#include "qgsrect.h"
 
 #include "qgspostgisbox3d.h"
 

diff --git a/providers/postgres/qgspostgisbox3d.h b/providers/postgres/qgspostgisbox3d.h
@@ -24,7 +24,7 @@
 
 #include <qstring.h>
 
-#include "../../src/qgsrect.h"
+#include "qgsrect.h"
 
 /*!
  * \brief   PostgreSQL/PostGIS "box3d" representation and transformation

diff --git a/providers/postgres/qgspostgrescountthread.cpp b/providers/postgres/qgspostgrescountthread.cpp
@@ -21,11 +21,11 @@
 #include <qevent.h>
 #include <qapplication.h>
 
-#include "../../src/qgis.h"
-#include "../../src/qgsrect.h"
-#include "../../src/qgsmapcanvas.h"
+#include "qgis.h"
+#include "qgsrect.h"
+#include "qgsmapcanvas.h"
 
-#include "../../src/qgsprovidercountcalcevent.h"
+#include "qgsprovidercountcalcevent.h"
 
 #include "qgspostgrescountthread.h"
 

diff --git a/providers/postgres/qgspostgresextentthread.cpp b/providers/postgres/qgspostgresextentthread.cpp
@@ -23,9 +23,9 @@
 //Added by qt3to4:
 #include <QCustomEvent>
 
-#include "../../src/qgis.h"
-#include "../../src/qgsrect.h"
-#include "../../src/qgsmapcanvas.h"
+#include "qgis.h"
+#include "qgsrect.h"
+#include "qgsmapcanvas.h"
 
 
 #include "qgspostgresextentthread.h"

diff --git a/providers/postgres/qgspostgresprovider.cpp b/providers/postgres/qgspostgresprovider.cpp
@@ -38,13 +38,13 @@
 #include <netinet/in.h>
 #endif
 
-#include "../../src/qgis.h"
-#include "../../src/qgsfeature.h"
-#include "../../src/qgsfield.h"
-#include "../../src/qgsrect.h"
+#include "qgis.h"
+#include "qgsfeature.h"
+#include "qgsfield.h"
+#include "qgsrect.h"
 
-#include "../../src/qgsprovidercountcalcevent.h"
-#include "../../src/qgsproviderextentcalcevent.h"
+#include "qgsprovidercountcalcevent.h"
+#include "qgsproviderextentcalcevent.h"
 
 #include "qgspostgresprovider.h"
 

diff --git a/providers/postgres/qgspostgresprovider.h b/providers/postgres/qgspostgresprovider.h
@@ -25,8 +25,8 @@ extern "C"
 {
 #include <libpq-fe.h>
 }
-#include "../../src/qgsvectordataprovider.h"
-#include "../../src/qgsrect.h"
+#include "qgsvectordataprovider.h"
+#include "qgsrect.h"
 #include <list>
 #include <queue>
 #include <fstream>

diff --git a/providers/wms/Makefile.am b/providers/wms/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I../../src -I../../src/raster
+INCLUDES = -I../../src -I../../src/raster -I../../src/core
 
 %.moc.cpp: %.h
 	$(MOC) -o $@ $<
@@ -10,11 +10,11 @@ plugin_LTLIBRARIES     = wmsprovider.la
 ## non-uic files generated from MOC
 
 wmsprovider_MOC =	qgswmsprovider.moc.cpp			\
-			qgshttptransaction.moc.cpp
+			qgshttptransaction.moc.cpp \
+		../../src/core/qgsdataprovider.moc.cpp		\
+		../../src/core/qgsrasterdataprovider.moc.cpp		
 
 wmsprovider_la_SOURCES =					\
-		../../src/qgsdataprovider.moc.cpp		\
-		../../src/qgsrasterdataprovider.moc.cpp		\
 		qgswmsprovider.cpp				\
 		qgswmsprovider.moc.cpp				\
 		qgswmsprovider.h				\

diff --git a/providers/wms/qgswmsprovider.cpp b/providers/wms/qgswmsprovider.cpp
@@ -21,7 +21,7 @@
 #include <fstream>
 #include <iostream>
 
-#include "../../src/qgsrect.h"
+#include "qgsrect.h"
 #include "qgshttptransaction.h"
 
 #include "qgswmsprovider.h"

diff --git a/providers/wms/qgswmsprovider.h b/providers/wms/qgswmsprovider.h
@@ -24,8 +24,8 @@
 #include <map>
 #include <vector>
 
-#include "../../src/qgsrasterdataprovider.h"
-#include "../../src/qgsrect.h"
+#include "qgsrasterdataprovider.h"
+#include "qgsrect.h"
 
 #include "qgsdatasourceuri.h"