Skip to content
Permalink
Browse files
Moved all sources for gui lib into src/gui and updated all dependent …
…classes and makefiles

git-svn-id: http://svn.osgeo.org/qgis/trunk@4619 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux committed Jan 8, 2006
1 parent 9d02a24 commit 42636d6ba8a52c71238b2983d95bf9ab90b785bc
Showing with 79 additions and 364 deletions.
  1. +2 −0 ChangeLog
  2. +6 −5 configure.in
  3. +2 −2 plugins/copyright_label/Makefile.am
  4. +1 −1 plugins/copyright_label/plugin.h
  5. +2 −2 plugins/delimited_text/Makefile.am
  6. +2 −2 plugins/delimited_text/qgsdelimitedtextplugin.cpp
  7. +1 −1 plugins/delimited_text/qgsdelimitedtextplugin.h
  8. +1 −1 plugins/delimited_text/qgsdelimitedtextplugingui.cpp
  9. +2 −2 plugins/geoprocessing/Makefile.am
  10. +1 −1 plugins/geoprocessing/qgsdlgpgbuffer.cpp
  11. +1 −1 plugins/geoprocessing/qgspggeoprocessing.h
  12. +2 −2 plugins/georeferencer/Makefile.am
  13. +2 −2 plugins/gps_importer/Makefile.am
  14. +1 −1 plugins/gps_importer/qgsgpsplugingui.h
  15. +3 −3 plugins/grass/Makefile.am
  16. +1 −1 plugins/grass/qgsgrassattributes.h
  17. +2 −2 plugins/grass/qgsgrassmapcalc.h
  18. +3 −3 plugins/grass/qgsgrassmodule.h
  19. +1 −1 plugins/grass/qgsgrassnewmapset.h
  20. +1 −1 plugins/grass/qgsgrassplugin.h
  21. +2 −2 plugins/grass/qgsgrasstools.h
  22. +3 −3 plugins/grid_maker/Makefile.am
  23. +2 −2 plugins/grid_maker/plugin.cpp
  24. +1 −1 plugins/north_arrow/Makefile.am
  25. +1 −1 plugins/north_arrow/plugin.h
  26. +1 −1 plugins/scale_bar/Makefile.am
  27. +1 −1 plugins/scale_bar/plugin.h
  28. +3 −3 plugins/spit/Makefile.am
  29. +1 −1 plugins/spit/qgseditreservedwordsdialog.cpp
  30. +1 −1 plugins/spit/qgsspit.cpp
  31. +1 −1 plugins/spit/qgsspitplugin.cpp
  32. +1 −1 plugins/spit/qgsspitplugin.h
  33. +4 −292 src/Makefile.am
  34. +1 −1 src/composer/Makefile.am
  35. +1 −1 src/core/Makefile.am
  36. +2 −2 src/designer/Makefile.am
  37. 0 src/{ → gui}/main.cpp
  38. +3 −3 src/{ → gui}/qgisapp.cpp
  39. 0 src/{ → gui}/qgisapp.h
  40. 0 src/{ → gui}/qgisiface.cpp
  41. 0 src/{ → gui}/qgisiface.h
  42. 0 src/{ → gui}/qgisinterface.cpp
  43. 0 src/{ → gui}/qgisinterface.h
  44. 0 src/{ → gui}/qgsabout.cpp
  45. 0 src/{ → gui}/qgsabout.h
  46. 0 src/{ → gui}/qgsaddattrdialog.cpp
  47. 0 src/{ → gui}/qgsaddattrdialog.h
  48. 0 src/{ → gui}/qgsadvancedattrsearch.cpp
  49. 0 src/{ → gui}/qgsadvancedattrsearch.h
  50. 0 src/{ → gui}/qgsattributeaction.cpp
  51. 0 src/{ → gui}/qgsattributeaction.h
  52. 0 src/{ → gui}/qgsattributeactiondialog.cpp
  53. 0 src/{ → gui}/qgsattributeactiondialog.h
  54. 0 src/{ → gui}/qgsattributedialog.cpp
  55. 0 src/{ → gui}/qgsattributedialog.h
  56. 0 src/{ → gui}/qgsattributetable.cpp
  57. 0 src/{ → gui}/qgsattributetable.h
  58. 0 src/{ → gui}/qgsattributetabledisplay.cpp
  59. 0 src/{ → gui}/qgsattributetabledisplay.h
  60. 0 src/{ → gui}/qgsbookmarks.cpp
  61. 0 src/{ → gui}/qgsbookmarks.h
  62. 0 src/{ → gui}/qgsclipboard.cpp
  63. 0 src/{ → gui}/qgsclipboard.h
  64. 0 src/{ → gui}/qgscontcoldialog.cpp
  65. 0 src/{ → gui}/qgscontcoldialog.h
  66. 0 src/{ → gui}/qgscontinuouscolrenderer.cpp
  67. 0 src/{ → gui}/qgscontinuouscolrenderer.h
  68. 0 src/{ → gui}/qgscoordinatetransform.cpp
  69. 0 src/{ → gui}/qgscoordinatetransform.h
  70. 0 src/{ → gui}/qgscsexception.h
  71. 0 src/{ → gui}/qgscursors.h
  72. 0 src/{ → gui}/qgscustomprojectiondialog.cpp
  73. 0 src/{ → gui}/qgscustomprojectiondialog.h
  74. 0 src/{ → gui}/qgsdbsourceselect.cpp
  75. 0 src/{ → gui}/qgsdbsourceselect.h
  76. 0 src/{ → gui}/qgsdelattrdialog.cpp
  77. 0 src/{ → gui}/qgsdelattrdialog.h
  78. 0 src/{ → gui}/qgsencodingfiledialog.cpp
  79. 0 src/{ → gui}/qgsencodingfiledialog.h
  80. 0 src/{ → gui}/qgsfeature.cpp
  81. 0 src/{ → gui}/qgsfeature.h
  82. 0 src/{ → gui}/qgsfillstylewidget.cpp
  83. 0 src/{ → gui}/qgsfillstylewidget.h
  84. 0 src/{ → gui}/qgsgeomtypedialog.cpp
  85. 0 src/{ → gui}/qgsgeomtypedialog.h
  86. 0 src/{ → gui}/qgsgraduatedsymrenderer.cpp
  87. 0 src/{ → gui}/qgsgraduatedsymrenderer.h
  88. 0 src/{ → gui}/qgsgrasydialog.cpp
  89. 0 src/{ → gui}/qgsgrasydialog.h
  90. 0 src/{ → gui}/qgshelpviewer.cpp
  91. 0 src/{ → gui}/qgshelpviewer.h
  92. 0 src/{ → gui}/qgsidentifyresults.cpp
  93. 0 src/{ → gui}/qgsidentifyresults.h
  94. 0 src/{ → gui}/qgslabel.cpp
  95. 0 src/{ → gui}/qgslabel.h
  96. 0 src/{ → gui}/qgslabeldialog.cpp
  97. 0 src/{ → gui}/qgslabeldialog.h
  98. 0 src/{ → gui}/qgslayerprojectionselector.cpp
  99. 0 src/{ → gui}/qgslayerprojectionselector.h
  100. 0 src/{ → gui}/qgslinestyledialog.cpp
  101. 0 src/{ → gui}/qgslinestyledialog.h
  102. 0 src/{ → gui}/qgslinestylewidget.cpp
  103. 0 src/{ → gui}/qgslinestylewidget.h
  104. 0 src/{ → gui}/qgsludialog.cpp
  105. 0 src/{ → gui}/qgsludialog.h
  106. 0 src/{ → gui}/qgsmapcanvas.cpp
  107. 0 src/{ → gui}/qgsmapcanvas.h
  108. 0 src/{ → gui}/qgsmapcanvasproperties.h
  109. 0 src/{ → gui}/qgsmaplayer.cpp
  110. 0 src/{ → gui}/qgsmaplayer.h
  111. 0 src/{ → gui}/qgsmaplayerinterface.h
  112. 0 src/{ → gui}/qgsmaplayerregistry.cpp
  113. 0 src/{ → gui}/qgsmaplayerregistry.h
  114. 0 src/{ → gui}/qgsmapoverviewcanvas.cpp
  115. 0 src/{ → gui}/qgsmapoverviewcanvas.h
  116. 0 src/{ → gui}/qgsmapserverexport.cpp
  117. 0 src/{ → gui}/qgsmapserverexport.h
  118. 0 src/{ → gui}/qgsmarkerdialog.cpp
  119. 0 src/{ → gui}/qgsmarkerdialog.h
  120. 0 src/{ → gui}/qgsmeasure.cpp
  121. 0 src/{ → gui}/qgsmeasure.h
  122. 0 src/{ → gui}/qgsmessageviewer.cpp
  123. 0 src/{ → gui}/qgsmessageviewer.h
  124. 0 src/{ → gui}/qgsnewconnection.cpp
  125. 0 src/{ → gui}/qgsnewconnection.h
  126. 0 src/{ → gui}/qgsnewhttpconnection.cpp
  127. 0 src/{ → gui}/qgsnewhttpconnection.h
  128. 0 src/{ → gui}/qgsoptions.cpp
  129. 0 src/{ → gui}/qgsoptions.h
  130. 0 src/{ → gui}/qgspastetransformations.cpp
  131. 0 src/{ → gui}/qgspastetransformations.h
  132. 0 src/{ → gui}/qgspatterndialog.cpp
  133. 0 src/{ → gui}/qgspatterndialog.h
  134. 0 src/{ → gui}/qgspgquerybuilder.cpp
  135. 0 src/{ → gui}/qgspgquerybuilder.h
  136. 0 src/{ → gui}/qgspgutil.cpp
  137. 0 src/{ → gui}/qgspgutil.h
  138. +1 −1 src/{ → gui}/qgspluginmanager.cpp
  139. 0 src/{ → gui}/qgspluginmanager.h
  140. 0 src/{ → gui}/qgspluginmetadata.cpp
  141. 0 src/{ → gui}/qgspluginmetadata.h
  142. 0 src/{ → gui}/qgspointstylewidget.cpp
  143. 0 src/{ → gui}/qgspointstylewidget.h
  144. 0 src/{ → gui}/qgsproject.cpp
  145. 0 src/{ → gui}/qgsproject.h
  146. 0 src/{ → gui}/qgsprojectproperties.cpp
  147. 0 src/{ → gui}/qgsprojectproperties.h
  148. 0 src/{ → gui}/qgsrasterlayerproperties.cpp
  149. 0 src/{ → gui}/qgsrasterlayerproperties.h
  150. 0 src/{ → gui}/qgsrunprocess.cpp
  151. 0 src/{ → gui}/qgsrunprocess.h
  152. 0 src/{ → gui}/qgsserversourceselect.cpp
  153. 0 src/{ → gui}/qgsserversourceselect.h
  154. 0 src/{ → gui}/qgssinglesymrenderer.cpp
  155. 0 src/{ → gui}/qgssinglesymrenderer.h
  156. 0 src/{ → gui}/qgssisydialog.cpp
  157. 0 src/{ → gui}/qgssisydialog.h
  158. 0 src/{ → gui}/qgsspatialrefsys.cpp
  159. 0 src/{ → gui}/qgsspatialrefsys.h
  160. 0 src/{ → gui}/qgstable.h
  161. 0 src/{ → gui}/qgsuniquevalrenderer.cpp
  162. 0 src/{ → gui}/qgsuniquevalrenderer.h
  163. 0 src/{ → gui}/qgsuvaldialog.cpp
  164. 0 src/{ → gui}/qgsuvaldialog.h
  165. 0 src/{ → gui}/qgsvectorfilewriter.cpp
  166. 0 src/{ → gui}/qgsvectorfilewriter.h
  167. 0 src/{ → gui}/qgsvectorlayer.cpp
  168. 0 src/{ → gui}/qgsvectorlayer.h
  169. 0 src/{ → gui}/qgsvectorlayerproperties.cpp
  170. 0 src/{ → gui}/qgsvectorlayerproperties.h
  171. 0 src/{ → gui}/qgsvectorsymbologywidget.cpp
  172. 0 src/{ → gui}/qgsvectorsymbologywidget.h
  173. +1 −1 src/legend/Makefile.am
  174. +2 −2 src/providers/delimitedtext/Makefile.am
  175. +1 −1 src/providers/gpx/Makefile.am
  176. +2 −2 src/providers/grass/Makefile.am
  177. +2 −2 src/providers/ogr/Makefile.am
  178. +2 −2 src/providers/postgres/Makefile.am
  179. +1 −1 src/providers/wms/Makefile.am
  180. +1 −1 src/raster/Makefile.am
@@ -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 [timlinux] 0.7.9.8
** moved all sources for gui lib into src/gui
2006-01-08 [gsherman] 0.7.9.7
** Moved providers to the src directory
2006-01-08 [timlinux] 0.7.9.6
@@ -29,7 +29,7 @@ dnl ---------------------------------------------------------------------------
MAJOR_VERSION=0
MINOR_VERSION=7
MICRO_VERSION=9
EXTRA_VERSION=7
EXTRA_VERSION=8
if test $EXTRA_VERSION -eq 0; then
VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}
else
@@ -478,21 +478,22 @@ AC_CONFIG_FILES([
src/composer/Makefile
src/core/Makefile
src/designer/Makefile
src/gui/Makefile
src/legend/Makefile
src/mac/Contents/Makefile
src/mac/Contents/Resources/Makefile
src/mac/Makefile
src/raster/Makefile
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
src/raster/Makefile
src/ui/Makefile
src/widgets/Makefile
src/widgets/projectionselector/Makefile
tools/Makefile
tools/mapserver_export/Makefile
tools/qgis_config/Makefile
@@ -49,9 +49,9 @@ pluginguibase.cpp: pluginguibase.h pluginguibase.ui
BUILT_SOURCES = $(plugin_MOC) $(plugin_UI) $(plugin_RES)


copyrightlabelplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../src/libqgis_gui.la ../../src/core/libqgis_core.la
copyrightlabelplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../src/gui/libqgis_gui.la ../../src/core/libqgis_core.la
copyrightlabelplugin_la_LDFLAGS = -avoid-version -module
copyrightlabelplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src -I../../src/ui -I../../src/core
copyrightlabelplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src/gui -I../../src/ui -I../../src/core

CLEANFILES = $(BUILT_SOURCES)

@@ -20,7 +20,7 @@
#ifndef QGSCOPYRIGHTLABELPLUGIN
#define QGSCOPYRIGHTLABELPLUGIN
#include "../qgisplugin.h"
#include "../../src/qgisapp.h"
#include "qgisapp.h"
#include <qwidget.h>
#include <qfont.h>
#include <qcolor.h>
@@ -50,9 +50,9 @@ BUILT_SOURCES = $(plugin_MOC) $(plugin_UI) $(plugin_RES)



delimitedtextplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../src/libqgis_gui.la ../../src/core/libqgis_core.la
delimitedtextplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../src/gui/libqgis_gui.la ../../src/core/libqgis_core.la
delimitedtextplugin_la_LDFLAGS = -avoid-version -module
delimitedtextplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src/core -I../../src/ -I../../src/ui
delimitedtextplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src/core -I../../src/gui -I../../src/ui

CLEANFILES = $(BUILT_SOURCES)

@@ -22,8 +22,8 @@

// includes

#include "../../src/qgisapp.h"
#include "../../src/qgsmaplayer.h"
#include "qgisapp.h"
#include "qgsmaplayer.h"
#include "qgsdelimitedtextplugin.h"


@@ -22,7 +22,7 @@
#include "../qgisplugin.h"
#include <qwidget.h>
#include "ui_qgsdelimitedtextpluginguibase.h"
#include "../../src/qgisapp.h"
#include "qgisapp.h"

/**
* \class QgsDelimitedTextPlugin
@@ -26,7 +26,7 @@
#include "qgsdelimitedtextplugingui.h"
//Added by qt3to4:
#include <QTextStream>
#include "../../src/qgisiface.h"
#include "qgisiface.h"

QgsDelimitedTextPluginGui::QgsDelimitedTextPluginGui() : QDialog()
{
@@ -51,9 +51,9 @@ qgsdlgpgbufferbase.h: qgsdlgpgbufferbase.ui
BUILT_SOURCES = $(pggeoprocessing_MOC) $(pggeoprocessing_UI)


pggeoprocessingplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) $(PG_LIB) ../../src/core/libqgis_core.la ../../src/libqgis_gui.la
pggeoprocessingplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) $(PG_LIB) ../../src/core/libqgis_core.la ../../src/gui/libqgis_gui.la
pggeoprocessingplugin_la_LDFLAGS = -avoid-version -module
pggeoprocessingplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src/ui -I../../src -I../../src/core
pggeoprocessingplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src/ui -I../../src/gui -I../../src/core

CLEANFILES = $(BUILT_SOURCES)

@@ -25,7 +25,7 @@
#include <qvalidator.h>
#include "qgsdlgpgbuffer.h"
#include <qspinbox.h>
#include "../../src/qgisiface.h"
#include "qgisiface.h"

QgsDlgPgBuffer::QgsDlgPgBuffer( QgisIface * _qI, QWidget * parent, const char *name)
:QDialog(parent, name),qI(_qI)
@@ -37,7 +37,7 @@ class Q3PopupMenu;
class QAction;

//#include "qgsworkerclass.h"
#include "../../src/qgisapp.h"
#include "qgisapp.h"

/**
* \class QgsPgGeoprocessing
@@ -64,8 +64,8 @@ georefplugin_la_SOURCES = plugin.cpp \

nodist_georefplugin_la_SOURCES = $(plugin_MOC) $(plugin_UIHEADERS) $(plugin_UISOURCES)

georefplugin_la_CXXFLAGS = -I../ -I../../src/ui -I../../src/raster -I../../src -I../../src/core $(GDAL_CFLAGS) $(GSL_CFLAGS) $(QT_CXXFLAGS) $(GEOS_CFLAGS)
georefplugin_la_LDFLAGS = -avoid-version -module $(GDAL_LDADD) $(GSL_LIBS) $(QT_LDADD) ../../src/libqgis_gui.la ../../src/core/libqgis_core.la
georefplugin_la_CXXFLAGS = -I../ -I../../src/ui -I../../src/raster -I../../src/gui -I../../src/core $(GDAL_CFLAGS) $(GSL_CFLAGS) $(QT_CXXFLAGS) $(GEOS_CFLAGS)
georefplugin_la_LDFLAGS = -avoid-version -module $(GDAL_LDADD) $(GSL_LIBS) $(QT_LDADD) ../../src/gui/libqgis_gui.la ../../src/core/libqgis_core.la

BUILT_SOURCES = $(plugin_UIHEADERS) $(plugin_UISOURCES) $(plugin_MOC)
CLEANFILES = $(BUILT_SOURCES)
@@ -60,9 +60,9 @@ plugin_QRC = qgsgps_plugin.qrc

BUILT_SOURCES = $(plugin_MOC) $(plugin_UI)

gpsimporterplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../src/libqgis_gui.la ../../src/core/libqgis_core.la
gpsimporterplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../src/gui/libqgis_gui.la ../../src/core/libqgis_core.la
gpsimporterplugin_la_CFLAGS = $(CFLAGS) $(EXTRA_CFLAGS) $(DEBUG_QGIS)
gpsimporterplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src/core -I../../src/ui -I../../src
gpsimporterplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src/core -I../../src/ui -I../../src/gui
gpsimporterplugin_la_LDFLAGS = -avoid-version -module

CLEANFILES = $(BUILT_SOURCES)
@@ -18,7 +18,7 @@
#ifndef QGSGPSPLUGINGUI_H
#define QGSGPSPLUGINGUI_H

#include "../../src/qgsvectorlayer.h"
#include "qgsvectorlayer.h"
#include "ui_qgsgpspluginguibase.h"
#include "qgsbabelformat.h"
#include "qgsgpsdevice.h"
@@ -12,7 +12,7 @@

SUBDIRS = config modules themes

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

DEFS=-DGRASS_BASE=\"$(GRASS_BASE)\" -DHAVE_OPENPTY=$(HAVE_OPENPTY)
if !HAVE_QTMAC
@@ -114,9 +114,9 @@ qgsgrassregionbase.h: qgsgrassregionbase.ui
BUILT_SOURCES = $(plugin_MOC) $(plugin_UI)


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_LIBADD = $(QT_LDADD) ../../src/providers/grass/libqgisgrass.la $(GRASS_LIB) $(PG_LIB) $(GDAL_LDADD) ../../src/gui/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
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 -I../../src/widgets/projectionselector

CLEANFILES = $(BUILT_SOURCES)

@@ -18,7 +18,7 @@

/* First attribute in the table is always field, second attribute is category */

#include "../../src/qgsidentifyresults.h"
#include "qgsidentifyresults.h"
//Added by qt3to4:
#include <QEvent>

@@ -39,8 +39,8 @@ class QPixmap;
#include <q3canvas.h>

// Must be here, so that it is included to moc file
#include "../../src/qgisapp.h"
#include "../../src/qgisiface.h"
#include "qgisapp.h"
#include "qgisiface.h"

class QgsGrassProvider;
class QgsGrassTools;
@@ -38,9 +38,9 @@ class QPixmap;
#include <q3process.h>

// Must be here, so that it is included to moc file
#include "../../src/qgisapp.h"
#include "../../src/qgisiface.h"
#include "../../src/qgsvectorlayer.h"
#include "qgisapp.h"
#include "qgisiface.h"
#include "qgsvectorlayer.h"

class QgsGrassProvider;
class QgsGrassTools;
@@ -30,7 +30,7 @@ class QCloseEvent;
#include "qgisiface.h"
#include "qgspoint.h"
#include "qgsspatialrefsys.h"
#include "widgets/projectionselector/qgsprojectionselector.h"
#include "qgsprojectionselector.h"

class QgsGrassProvider;
#include "qgsgrassplugin.h"
@@ -20,7 +20,7 @@
#include <qwidget.h>
#include <qpen.h>

#include "../../src/qgisapp.h"
#include "qgisapp.h"

#include <vector>

@@ -25,8 +25,8 @@ class QDomNode;
class QDomElement;

// Must be here, so that it is included to moc file
#include "../../src/qgisapp.h"
#include "../../src/qgisiface.h"
#include "qgisapp.h"
#include "qgisiface.h"

class QgsGrassProvider;
#include "ui_qgsgrasstoolsbase.h"
@@ -62,9 +62,9 @@ plugin_QRC = gridmaker_plugin.qrc

BUILT_SOURCES = $(plugin_MOC) $(plugin_UI) $(plugin_RES)

gridmakerplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../src/core/libqgis_core.la ../../src/libqgis_gui.la
gridmakerplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../src/core/libqgis_core.la ../../src/gui/libqgis_gui.la
gridmakerplugin_la_CFLAGS = $(CFLAGS) $(EXTRA_CFLAGS) $(DEBUG_QGIS)
gridmakerplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src/core -I../../src/ui -I../../src
gridmakerplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src/core -I../../src/ui -I../../src/gui
gridmakerplugin_la_LDFLAGS = -avoid-version -module

##
@@ -83,7 +83,7 @@ gridmaker_SOURCES = main.cpp \

gridmaker_LDADD = $(QT_LDADD)
gridmaker_CFLAGS = $(CFLAGS) $(EXTRA_CFLAGS) $(DEBUG_QGIS)
gridmaker_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PKGDATAPATH) $(DEBUG_QGIS) -I../../src -I../../src/ui -I../../src/core
gridmaker_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PKGDATAPATH) $(DEBUG_QGIS) -I../../src/gui -I../../src/ui -I../../src/core

standalone_MOC = plugingui.moc.cpp

@@ -22,8 +22,8 @@ email : tim@linfiniti.com

// includes

#include "../../src/qgisapp.h"
#include "../../src/qgsmaplayer.h"
#include "qgisapp.h"
#include "qgsmaplayer.h"
#include "plugin.h"


@@ -52,7 +52,7 @@ BUILT_SOURCES = $(plugin_MOC) $(plugin_UI) $(plugin_RES)

northarrowplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../src/core/libqgis_core.la
northarrowplugin_la_LDFLAGS = -avoid-version -module
northarrowplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) $(PKGDATAPATH) -I../../src -I../../src/ui -I../../src/core
northarrowplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) $(PKGDATAPATH) -I../../src/gui -I../../src/ui -I../../src/core

CLEANFILES = $(BUILT_SOURCES)

@@ -21,7 +21,7 @@
#define QGSNORTHARROWPLUGIN

#include "../qgisplugin.h"
#include "../../src/qgisapp.h"
#include "qgisapp.h"

class QToolBar;
/**
@@ -51,7 +51,7 @@ BUILT_SOURCES = $(plugin_MOC) $(plugin_UI) $(plugin_RES)

libScaleBarplugin_la_LIBADD = $(QT_LDADD) ../../src/core/libqgis_core.la
libScaleBarplugin_la_LDFLAGS = -avoid-version -module
libScaleBarplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src -I../../src/ui -I../../src/core
libScaleBarplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src/gui -I../../src/ui -I../../src/core

CLEANFILES = $(BUILT_SOURCES)

@@ -27,7 +27,7 @@ email : sbr00pwb@users.sourceforge.net
#include <q3pointarray.h>


#include "../../src/qgisapp.h"
#include "qgisapp.h"
class QToolBar;
/**
* \class Plugin
@@ -52,7 +52,7 @@ spitplugin_la_SOURCES = $(common_sources) \
qgsspitplugin.cpp \
qgsspitplugin.h

spit_SOURCES = ../../src/qgsmessageviewer.cpp ../../src/qgspgutil.cpp $(common_sources) main.cpp $(SPIT_UIC) $(spit_MOC)
spit_SOURCES = ../../src/gui/qgsmessageviewer.cpp ../../src/gui/qgspgutil.cpp $(common_sources) main.cpp $(SPIT_UIC) $(spit_MOC)

nodist_spitplugin_la_SOURCES = $(spitplugin_la_MOC)

@@ -67,12 +67,12 @@ BUILT_SOURCES = $(spit_MOC) $(spit_UI) $(spitplugin_la_MOC)

spitplugin_la_LIBADD = $(QT_LDADD) $(PG_LIB) $(GDAL_LDADD) ../../src/core/libqgis_core.la
spitplugin_la_LDFLAGS = -avoid-version -module
spitplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(GDAL_CFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(GEOS_CFLAGS) -I../../src -I../../src/ui -I../../src/core
spitplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(GDAL_CFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(GEOS_CFLAGS) -I../../src/gui -I../../src/ui -I../../src/core


spit_LDADD = $(QT_LDADD) $(PG_LIB) $(GDAL_LDADD)
#spit_LDFLAGS = -avoid-version -module
spit_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(GDAL_CFLAGS) $(QT_CXXFLAGS) $(PG_INC) -I../../src -I../../src/ui -I../../src/core
spit_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(GDAL_CFLAGS) $(QT_CXXFLAGS) $(PG_INC) -I../../src/gui -I../../src/ui -I../../src/core

CLEANFILES = $(BUILT_SOURCES)

@@ -2,7 +2,7 @@
#include <qpixmap.h>
#include <q3listview.h>
#include <q3textedit.h>
#include "../../src/qgspgutil.h"
#include "qgspgutil.h"
#include "spit_icons.h"

#include "qgseditreservedwordsdialog.h"
@@ -34,7 +34,7 @@
#include <qsettings.h>
#include <qpixmap.h>
#include <iostream>
#include "../../src/qgspgutil.h"
#include "qgspgutil.h"
#include "qgsspit.h"
#include "qgsconnectiondialog.h"
#include "qgseditreservedwordsdialog.h"
@@ -21,7 +21,7 @@
// includes
#include <iostream>
#include <vector>
#include "../../src/qgisapp.h"
#include "qgisapp.h"

#include <q3toolbar.h>
#include <qmenubar.h>
@@ -35,7 +35,7 @@ class QMenuBar;
class Q3PopupMenu;

//#include "qgsworkerclass.h"
#include "../../src/qgisapp.h"
#include "qgisapp.h"

/**
* \class QgsSpitPlugin

0 comments on commit 42636d6

Please sign in to comment.