Skip to content
Permalink
Browse files
Moved providers directory to src subdirectory
git-svn-id: http://svn.osgeo.org/qgis/trunk@4618 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
gsherman committed Jan 8, 2006
1 parent 1b0d44b commit 9d02a24a3e7cc232a5defbba3519fa6cc3957452
Showing with 49 additions and 42 deletions.
  1. +2 −0 ChangeLog
  2. +1 −1 Makefile.am
  3. +8 −8 configure.in
  4. +3 −3 plugins/grass/Makefile.am
  5. +2 −2 plugins/grass/qgsgrassattributes.cpp
  6. +2 −2 plugins/grass/qgsgrassedit.cpp
  7. +2 −2 plugins/grass/qgsgrassmapcalc.cpp
  8. +2 −2 plugins/grass/qgsgrassmodule.cpp
  9. +1 −1 plugins/grass/qgsgrassnewmapset.cpp
  10. +2 −2 plugins/grass/qgsgrassplugin.cpp
  11. +1 −1 plugins/grass/qgsgrassregion.cpp
  12. +1 −1 plugins/grass/qgsgrassselect.cpp
  13. +2 −2 plugins/grass/qgsgrasstools.cpp
  14. +7 −2 src/Makefile.am
  15. 0 { → src}/providers/.cvsignore
  16. 0 { → src}/providers/Makefile.am
  17. 0 { → src}/providers/delimitedtext/.cvsignore
  18. +2 −2 { → src}/providers/delimitedtext/Makefile.am
  19. 0 { → src}/providers/delimitedtext/delimitedtext.pro
  20. 0 { → src}/providers/delimitedtext/qgsdelimitedtextprovider.cpp
  21. 0 { → src}/providers/delimitedtext/qgsdelimitedtextprovider.h
  22. 0 { → src}/providers/gpx/.cvsignore
  23. +2 −2 { → src}/providers/gpx/Makefile.am
  24. 0 { → src}/providers/gpx/gpsdata.cpp
  25. 0 { → src}/providers/gpx/gpsdata.h
  26. 0 { → src}/providers/gpx/gpx.pro
  27. 0 { → src}/providers/gpx/qgsgpxprovider.cpp
  28. 0 { → src}/providers/gpx/qgsgpxprovider.h
  29. 0 { → src}/providers/grass/.cvsignore
  30. +2 −2 { → src}/providers/grass/Makefile.am
  31. 0 { → src}/providers/grass/provider.cpp
  32. 0 { → src}/providers/grass/qgsgrass.cpp
  33. 0 { → src}/providers/grass/qgsgrass.h
  34. 0 { → src}/providers/grass/qgsgrassprovider.cpp
  35. 0 { → src}/providers/grass/qgsgrassprovider.h
  36. 0 { → src}/providers/mysql/README
  37. 0 { → src}/providers/mysql/mysql.pro
  38. 0 { → src}/providers/mysql/qgsmysqlprovider.cpp
  39. 0 { → src}/providers/mysql/qgsmysqlprovider.h
  40. 0 { → src}/providers/mysql/testmysql.cpp
  41. 0 { → src}/providers/ogr/.cvsignore
  42. 0 { → src}/providers/ogr/.indent.pro
  43. +2 −2 { → src}/providers/ogr/Makefile.am
  44. 0 { → src}/providers/ogr/ogr.pro
  45. 0 { → src}/providers/ogr/qgsogrfactory.cpp
  46. 0 { → src}/providers/ogr/qgsogrfactory.h
  47. 0 { → src}/providers/ogr/qgsogrprovider.cpp
  48. 0 { → src}/providers/ogr/qgsogrprovider.h
  49. 0 { → src}/providers/postgres/.cvsignore
  50. +2 −2 { → src}/providers/postgres/Makefile.am
  51. 0 { → src}/providers/postgres/postgres.pro
  52. 0 { → src}/providers/postgres/qgspostgisbox2d.cpp
  53. 0 { → src}/providers/postgres/qgspostgisbox2d.h
  54. 0 { → src}/providers/postgres/qgspostgisbox3d.cpp
  55. 0 { → src}/providers/postgres/qgspostgisbox3d.h
  56. 0 { → src}/providers/postgres/qgspostgrescountthread.cpp
  57. 0 { → src}/providers/postgres/qgspostgrescountthread.h
  58. 0 { → src}/providers/postgres/qgspostgresextentthread.cpp
  59. 0 { → src}/providers/postgres/qgspostgresextentthread.h
  60. 0 { → src}/providers/postgres/qgspostgresprovider.cpp
  61. 0 { → src}/providers/postgres/qgspostgresprovider.h
  62. 0 { → src}/providers/providers.pro
  63. 0 { → src}/providers/wms/.cvsignore
  64. +3 −3 { → src}/providers/wms/Makefile.am
  65. 0 { → src}/providers/wms/qgshttptransaction.cpp
  66. 0 { → src}/providers/wms/qgshttptransaction.h
  67. 0 { → src}/providers/wms/qgswmsprovider.cpp
  68. 0 { → src}/providers/wms/qgswmsprovider.h
  69. 0 { → src}/providers/wms/wms.pro
@@ -1,6 +1,8 @@
/* ChangeLog,v 1.214 2004/11/12 00:42:21 gsherman Exp */
------------------------------------------------------------------------------
Version 0.8 'Joesephine' .... development version
2006-01-08 [gsherman] 0.7.9.7
** Moved providers to the src directory
2006-01-08 [timlinux] 0.7.9.6
** refactored libqgis into core and gui libs.
2006-01-01 [timlinux] 0.7.9.5
@@ -31,7 +31,7 @@ docdatadir = $(datadir)/$(PACKAGE)/doc
docdata_DATA = AUTHORS

if HAVE_QT4
SUBDIRS = src providers plugins doc tools i18n helpviewer resources images
SUBDIRS = src plugins doc tools i18n helpviewer resources images
endif

pkginclude_HEADERS = qgsconfig.h
@@ -29,7 +29,7 @@ dnl ---------------------------------------------------------------------------
MAJOR_VERSION=0
MINOR_VERSION=7
MICRO_VERSION=9
EXTRA_VERSION=6
EXTRA_VERSION=7
if test $EXTRA_VERSION -eq 0; then
VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}
else
@@ -473,13 +473,6 @@ AC_CONFIG_FILES([
plugins/north_arrow/Makefile
plugins/scale_bar/Makefile
plugins/spit/Makefile
providers/Makefile
providers/delimitedtext/Makefile
providers/gpx/Makefile
providers/grass/Makefile
providers/ogr/Makefile
providers/postgres/Makefile
providers/wms/Makefile
resources/Makefile
src/Makefile
src/composer/Makefile
@@ -493,6 +486,13 @@ AC_CONFIG_FILES([
src/ui/Makefile
src/widgets/Makefile
src/widgets/projectionselector/Makefile
src/providers/Makefile
src/providers/delimitedtext/Makefile
src/providers/gpx/Makefile
src/providers/grass/Makefile
src/providers/ogr/Makefile
src/providers/postgres/Makefile
src/providers/wms/Makefile
tools/Makefile
tools/mapserver_export/Makefile
tools/qgis_config/Makefile
@@ -85,8 +85,8 @@ grassplugin_la_SOURCES = qgsgrassplugin.cpp \
qgsgrassattributes.h \
qgsgrassregion.cpp \
qgsgrassregion.h \
../../providers/grass/qgsgrass.h \
../../providers/grass/qgsgrassprovider.h \
../../src/providers/grass/qgsgrass.h \
../../src/providers/grass/qgsgrassprovider.h \
$(plugin_UI)

nodist_grassplugin_la_SOURCES = $(plugin_MOC)
@@ -114,7 +114,7 @@ qgsgrassregionbase.h: qgsgrassregionbase.ui
BUILT_SOURCES = $(plugin_MOC) $(plugin_UI)


grassplugin_la_LIBADD = $(QT_LDADD) ../../providers/grass/libqgisgrass.la $(GRASS_LIB) $(PG_LIB) $(GDAL_LDADD) ../../src/libqgis_gui.la ../../src/core/libqgis_core.la ../../src/raster/libqgis_raster.la
grassplugin_la_LIBADD = $(QT_LDADD) ../../src/providers/grass/libqgisgrass.la $(GRASS_LIB) $(PG_LIB) $(GDAL_LDADD) ../../src/libqgis_gui.la ../../src/core/libqgis_core.la ../../src/raster/libqgis_raster.la
grassplugin_la_LDFLAGS = -avoid-version -module
grassplugin_la_CXXFLAGS = $(PREFIX) $(CXXFLAGS) -I$(GRASS_INC) $(DEFS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) -I$(PG_INC) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src/legend/ -I../../src/raster -I../../src/ui

@@ -52,8 +52,8 @@ extern "C" {
#include <Vect.h>
}

#include "../../providers/grass/qgsgrass.h"
#include "../../providers/grass/qgsgrassprovider.h"
#include "../../src/providers/grass/qgsgrass.h"
#include "../../src/providers/grass/qgsgrassprovider.h"
#include "qgsgrassedit.h"
#include "qgsgrassattributes.h"

@@ -55,8 +55,8 @@ extern "C" {
#include <Vect.h>
}

#include "../../providers/grass/qgsgrass.h"
#include "../../providers/grass/qgsgrassprovider.h"
#include "../../src/providers/grass/qgsgrass.h"
#include "../../src/providers/grass/qgsgrassprovider.h"
#include "qgsgrassattributes.h"
#include "qgsgrassedit.h"

@@ -55,8 +55,8 @@ extern "C" {
#include <Vect.h>
}

#include "../../providers/grass/qgsgrass.h"
#include "../../providers/grass/qgsgrassprovider.h"
#include "../../src/providers/grass/qgsgrass.h"
#include "../../src/providers/grass/qgsgrassprovider.h"
#include "qgsgrassattributes.h"
#include "qgsgrassmodule.h"
#include "qgsgrasstools.h"
@@ -76,8 +76,8 @@ extern "C" {
#include <Vect.h>
}

#include "../../providers/grass/qgsgrass.h"
#include "../../providers/grass/qgsgrassprovider.h"
#include "../../src/providers/grass/qgsgrass.h"
#include "../../src/providers/grass/qgsgrassprovider.h"
#include "qgsgrassattributes.h"
#include "qgsgrassmodule.h"
#include "qgsgrassmapcalc.h"
@@ -54,7 +54,7 @@
#include "qgsspatialrefsys.h"
#include "../../src/widgets/projectionselector/qgsprojectionselector.h"

#include "../../providers/grass/qgsgrass.h"
#include "../../src/providers/grass/qgsgrass.h"
#include "qgsgrassnewmapset.h"

bool QgsGrassNewMapset::mRunning = false;
@@ -54,8 +54,8 @@ extern "C" {
}

#include "qgsgrassplugin.h"
#include "../../providers/grass/qgsgrass.h"
#include "../../providers/grass/qgsgrassprovider.h"
#include "../../src/providers/grass/qgsgrass.h"
#include "../../src/providers/grass/qgsgrassprovider.h"

//the gui subclass
#include "qgsgrassattributes.h"
@@ -55,7 +55,7 @@ extern "C" {
#include <gis.h>
}

#include "../../providers/grass/qgsgrass.h"
#include "../../src/providers/grass/qgsgrass.h"
#include "qgsgrassplugin.h"
#include "qgsgrassregion.h"

@@ -32,7 +32,7 @@ extern "C" {
#include <Vect.h>
}

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

QgsGrassSelect::QgsGrassSelect(int type):QgsGrassSelectBase()
@@ -63,8 +63,8 @@ extern "C" {
#include <Vect.h>
}

#include "../../providers/grass/qgsgrass.h"
#include "../../providers/grass/qgsgrassprovider.h"
#include "../../src/providers/grass/qgsgrass.h"
#include "../../src/providers/grass/qgsgrassprovider.h"
#include "qgsgrassattributes.h"
#include "qgsgrasstools.h"
#include "qgsgrassmodule.h"
@@ -16,8 +16,13 @@
if HAVE_QTMAC
MAC = mac
endif

SUBDIRS = core ui legend raster composer widgets $(MAC)
# NOTE - the order of the SUBDIRS is important. Currently the providers
# depend on the existence of libqgis_gui. Since the gui classes
# have not been moved into their own directory, the current directory
# (.) must be specified immediately before the providers
# subdirectory. Once the gui subdirectory is implemented, there is
# no need for the current directory to be in the SUBDIRS list
SUBDIRS = core ui legend raster composer widgets . providers $(MAC)

if !HAVE_QTMAC
PREFIX=-DPREFIX=\"$(prefix)\"
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,14 +1,14 @@
## $Id$

INCLUDES = -I../../src/core/ -I../../src/
INCLUDES = -I../../core/ -I../../

plugindir = ${pkglibdir}
plugin_LTLIBRARIES = delimitedtextprovider.la

delimitedtextprovider_la_SOURCES = qgsdelimitedtextprovider.cpp


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

File renamed without changes.
File renamed without changes.
@@ -2,7 +2,7 @@

if HAVE_EXPAT

INCLUDES = -I../../src/core -I../../src
INCLUDES = -I../../core -I../../

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/core/libqgis_core.la
gpxprovider_la_LIBADD = $(QT_LDADD) $(GEOS_LDADD) ../../core/libqgis_core.la
gpxprovider_la_LDFLAGS = -avoid-version -module
gpxprovider_la_CXXFLAGS = $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GEOS_CFLAGS) $(GDAL_CFLAGS)

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -2,7 +2,7 @@
## $Id$
##

INCLUDES = -I../../src/core -I../../src
INCLUDES = -I../../core -I../../

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/core/libqgis_core.la ../../src/libqgis_gui.la
libqgisgrass_la_LIBADD = $(QT_LDADD) $(GRASS_LIB) ../../core/libqgis_core.la ../../libqgis_gui.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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,12 +1,12 @@
INCLUDES = -I../../src/core/ -I../../src
INCLUDES = -I../../core/ -I../../

plugindir = ${pkglibdir}
plugin_LTLIBRARIES = ogrprovider.la

ogrprovider_la_SOURCES = qgsogrprovider.cpp \
qgsogrprovider.h

ogrprovider_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) $(GEOS_LDADD) ../../src/core/libqgis_core.la ../../src/libqgis_gui.la
ogrprovider_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) $(GEOS_LDADD) ../../core/libqgis_core.la ../../libqgis_gui.la
ogrprovider_la_LDFLAGS = -avoid-version -module
ogrprovider_la_CXXFLAGS := $(GDAL_CFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GEOS_CFLAGS)

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,4 +1,4 @@
INCLUDES = -I../../src/core/ -I../../src/
INCLUDES = -I../../core/ -I../../

%.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/core/libqgis_core.la ../../src/libqgis_gui.la
postgresprovider_la_LIBADD = $(QT_LDADD) $(PG_LIB) $(GEOS_LDADD) ../../core/libqgis_core.la ../../libqgis_gui.la
postgresprovider_la_LDFLAGS = -avoid-version -module
postgresprovider_la_CXXFLAGS = $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS) $(GEOS_CFLAGS) $(GDAL_CFLAGS)

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,4 +1,4 @@
INCLUDES = -I../../src -I../../src/raster -I../../src/core
INCLUDES = -I../../ -I../../raster -I../../core

%.moc.cpp: %.h
$(MOC) -o $@ $<
@@ -11,8 +11,8 @@ plugin_LTLIBRARIES = wmsprovider.la

wmsprovider_MOC = qgswmsprovider.moc.cpp \
qgshttptransaction.moc.cpp \
../../src/core/qgsdataprovider.moc.cpp \
../../src/core/qgsrasterdataprovider.moc.cpp
../../core/qgsdataprovider.moc.cpp \
../../core/qgsrasterdataprovider.moc.cpp

wmsprovider_la_SOURCES = \
qgswmsprovider.cpp \
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 9d02a24

Please sign in to comment.