Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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 42636d6
Show file tree
Hide file tree
Showing 180 changed files with 79 additions and 364 deletions.
2 changes: 2 additions & 0 deletions ChangeLog
@@ -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
Expand Down
11 changes: 6 additions & 5 deletions configure.in
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions plugins/copyright_label/Makefile.am
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion plugins/copyright_label/plugin.h
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions plugins/delimited_text/Makefile.am
Expand Up @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions plugins/delimited_text/qgsdelimitedtextplugin.cpp
Expand Up @@ -22,8 +22,8 @@

// includes

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


Expand Down
2 changes: 1 addition & 1 deletion plugins/delimited_text/qgsdelimitedtextplugin.h
Expand Up @@ -22,7 +22,7 @@
#include "../qgisplugin.h"
#include <qwidget.h>
#include "ui_qgsdelimitedtextpluginguibase.h"
#include "../../src/qgisapp.h"
#include "qgisapp.h"

/**
* \class QgsDelimitedTextPlugin
Expand Down
2 changes: 1 addition & 1 deletion plugins/delimited_text/qgsdelimitedtextplugingui.cpp
Expand Up @@ -26,7 +26,7 @@
#include "qgsdelimitedtextplugingui.h"
//Added by qt3to4:
#include <QTextStream>
#include "../../src/qgisiface.h"
#include "qgisiface.h"

QgsDelimitedTextPluginGui::QgsDelimitedTextPluginGui() : QDialog()
{
Expand Down
4 changes: 2 additions & 2 deletions plugins/geoprocessing/Makefile.am
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion plugins/geoprocessing/qgsdlgpgbuffer.cpp
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion plugins/geoprocessing/qgspggeoprocessing.h
Expand Up @@ -37,7 +37,7 @@ class Q3PopupMenu;
class QAction;

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

/**
* \class QgsPgGeoprocessing
Expand Down
4 changes: 2 additions & 2 deletions plugins/georeferencer/Makefile.am
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions plugins/gps_importer/Makefile.am
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion plugins/gps_importer/qgsgpsplugingui.h
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions plugins/grass/Makefile.am
Expand Up @@ -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
Expand Down Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion plugins/grass/qgsgrassattributes.h
Expand Up @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions plugins/grass/qgsgrassmapcalc.h
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions plugins/grass/qgsgrassmodule.h
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion plugins/grass/qgsgrassnewmapset.h
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion plugins/grass/qgsgrassplugin.h
Expand Up @@ -20,7 +20,7 @@
#include <qwidget.h>
#include <qpen.h>

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

#include <vector>

Expand Down
4 changes: 2 additions & 2 deletions plugins/grass/qgsgrasstools.h
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions plugins/grid_maker/Makefile.am
Expand Up @@ -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

##
Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions plugins/grid_maker/plugin.cpp
Expand Up @@ -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"


Expand Down
2 changes: 1 addition & 1 deletion plugins/north_arrow/Makefile.am
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion plugins/north_arrow/plugin.h
Expand Up @@ -21,7 +21,7 @@
#define QGSNORTHARROWPLUGIN

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

class QToolBar;
/**
Expand Down
2 changes: 1 addition & 1 deletion plugins/scale_bar/Makefile.am
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion plugins/scale_bar/plugin.h
Expand Up @@ -27,7 +27,7 @@ email : sbr00pwb@users.sourceforge.net
#include <q3pointarray.h>


#include "../../src/qgisapp.h"
#include "qgisapp.h"
class QToolBar;
/**
* \class Plugin
Expand Down
6 changes: 3 additions & 3 deletions plugins/spit/Makefile.am
Expand Up @@ -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)

Expand All @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion plugins/spit/qgseditreservedwordsdialog.cpp
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion plugins/spit/qgsspit.cpp
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion plugins/spit/qgsspitplugin.cpp
Expand Up @@ -21,7 +21,7 @@
// includes
#include <iostream>
#include <vector>
#include "../../src/qgisapp.h"
#include "qgisapp.h"

#include <q3toolbar.h>
#include <qmenubar.h>
Expand Down
2 changes: 1 addition & 1 deletion plugins/spit/qgsspitplugin.h
Expand Up @@ -35,7 +35,7 @@ class QMenuBar;
class Q3PopupMenu;

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

/**
* \class QgsSpitPlugin
Expand Down

0 comments on commit 42636d6

Please sign in to comment.