Moved plugins into src/plugins and updated make etc accordingly

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4624 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jan 9, 2006 · 01f762c · 01f762c
1 parent 8f3589a
commit 01f762c
Show file tree

Hide file tree

Showing 360 changed files with 51 additions and 51 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -31,7 +31,7 @@ docdatadir = $(datadir)/$(PACKAGE)/doc
 docdata_DATA = AUTHORS
 
 if HAVE_QT4
-SUBDIRS = src plugins doc tools i18n helpviewer resources images
+SUBDIRS = src doc tools i18n helpviewer resources images
 endif
 
 pkginclude_HEADERS = qgsconfig.h

diff --git a/configure.in b/configure.in
@@ -29,7 +29,7 @@ dnl ---------------------------------------------------------------------------
 MAJOR_VERSION=0
 MINOR_VERSION=7
 MICRO_VERSION=9
-EXTRA_VERSION=8
+EXTRA_VERSION=9
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}
 else
@@ -457,22 +457,6 @@ AC_CONFIG_FILES([
   images/themes/default/Makefile
   images/themes/Makefile
   images/themes/nkids/Makefile
-  plugins/Makefile
-  plugins/copyright_label/Makefile
-  plugins/delimited_text/Makefile
-  plugins/geoprocessing/Makefile
-  plugins/georeferencer/Makefile
-  plugins/gps_importer/Makefile
-  plugins/grass/config/Makefile
-  plugins/grass/Makefile
-  plugins/grass/modules/Makefile
-  plugins/grass/themes/default/Makefile
-  plugins/grass/themes/Makefile
-  plugins/grid_maker/Makefile
-  plugins/maplayer/Makefile
-  plugins/north_arrow/Makefile
-  plugins/scale_bar/Makefile
-  plugins/spit/Makefile
   resources/Makefile
   src/Makefile 
   src/composer/Makefile
@@ -483,6 +467,22 @@ AC_CONFIG_FILES([
   src/mac/Contents/Makefile
   src/mac/Contents/Resources/Makefile
   src/mac/Makefile
+  src/plugins/Makefile
+  src/plugins/copyright_label/Makefile
+  src/plugins/delimited_text/Makefile
+  src/plugins/geoprocessing/Makefile
+  src/plugins/georeferencer/Makefile
+  src/plugins/gps_importer/Makefile
+  src/plugins/grass/config/Makefile
+  src/plugins/grass/Makefile
+  src/plugins/grass/modules/Makefile
+  src/plugins/grass/themes/default/Makefile
+  src/plugins/grass/themes/Makefile
+  src/plugins/grid_maker/Makefile
+  src/plugins/maplayer/Makefile
+  src/plugins/north_arrow/Makefile
+  src/plugins/scale_bar/Makefile
+  src/plugins/spit/Makefile
   src/providers/Makefile 
   src/providers/delimitedtext/Makefile
   src/providers/gpx/Makefile

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -12,5 +12,5 @@
 #        depend on the existence of libqgis_gui. 
 #        gui *must* be specified immediately before the providers
 #        subdirectory. 
-SUBDIRS =  core ui legend raster composer widgets gui providers $(MAC) 
+SUBDIRS =  core ui legend raster composer widgets gui providers plugins $(MAC) 
 
diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
@@ -63,7 +63,7 @@ qgis_LDFLAGS = -framework ApplicationServices
 else
 qgis_LDFLAGS = -rdynamic
 endif
-qgis_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(GDAL_CFLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS)  $(HAVE_PYTHON) $(GEOS_CFLAGS) $(PYTHON_INCLUDE_DIR) -I../ui/ -I../widgets/projectionselector/ -I../legend/ -I../raster/ -I../composer/ -I../core/ -I../../plugins/
+qgis_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(GDAL_CFLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS)  $(HAVE_PYTHON) $(GEOS_CFLAGS) $(PYTHON_INCLUDE_DIR) -I../ui/ -I../widgets/projectionselector/ -I../legend/ -I../raster/ -I../composer/ -I../core/ -I../plugins/
 
 
 ##
@@ -275,7 +275,7 @@ BUILT_SOURCES = $(libqgis_gui_la_MOC) $(qgis_YACC)  $(postgresMOC)
 libqgis_gui_la_LIBADD = ../core/libqgis_core.la ../raster/libqgis_raster.la ../legend/libqgis_legend.la ../composer/libqgis_composer.la ../widgets/projectionselector/libqgsprojectionselector.la $(QT_LDADD) $(GEOS_LDADD) $(GDAL_LDADD) $(PYTHON_LIB) -lsqlite3
 libqgis_gui_la_LDFLAGS = -version-info $(INTERFACE_VERSION)
 
-libqgis_gui_la_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(GDAL_CFLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS) $(GEOS_CFLAGS) $(PYTHON_INCLUDE_DIR) $(HAVE_PYTHON) -I../ui/ -I../widgets/projectionselector/ -I../legend/ -I../raster/ -I../composer/ -I../core/ -I../../plugins/
+libqgis_gui_la_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(GDAL_CFLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS) $(GEOS_CFLAGS) $(PYTHON_INCLUDE_DIR) $(HAVE_PYTHON) -I../ui/ -I../widgets/projectionselector/ -I../legend/ -I../raster/ -I../composer/ -I../core/ -I../plugins/
 
 ##
 ## ----------------------------------------------------------------------

diff --git a/src/gui/qgsdbsourceselect.cpp b/src/gui/qgsdbsourceselect.cpp
@@ -29,9 +29,9 @@ email                : sherman at mrcc.com
 #include <qinputdialog.h>
 #include <q3groupbox.h>
 #include <QTextOStream>
-#include "../images/themes/default/point_layer.xpm"
-#include "../images/themes/default/line_layer.xpm"
-#include "../images/themes/default/polygon_layer.xpm"
+#include "../../images/themes/default/point_layer.xpm"
+#include "../../images/themes/default/line_layer.xpm"
+#include "../../images/themes/default/polygon_layer.xpm"
 #include "qgsdbsourceselect.h"
 #include "qgsnewconnection.h"
 #include "qgspgquerybuilder.h"

diff --git a/plugins/.cvsignore → src/plugins/.cvsignore b/plugins/.cvsignore → src/plugins/.cvsignore
diff --git a/plugins/Makefile.am → src/plugins/Makefile.am b/plugins/Makefile.am → src/plugins/Makefile.am
diff --git a/plugins/copyright_label/.cvsignore → src/plugins/copyright_label/.cvsignore b/plugins/copyright_label/.cvsignore → src/plugins/copyright_label/.cvsignore
diff --git a/plugins/copyright_label/Makefile.am → src/plugins/copyright_label/Makefile.am b/plugins/copyright_label/Makefile.am → src/plugins/copyright_label/Makefile.am
@@ -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/gui/libqgis_gui.la ../../src/core/libqgis_core.la
+copyrightlabelplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../gui/libqgis_gui.la ../../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/gui -I../../src/ui -I../../src/core
+copyrightlabelplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../gui -I../../ui -I../../core
 
 CLEANFILES = $(BUILT_SOURCES)
 

diff --git a/plugins/copyright_label/README → src/plugins/copyright_label/README b/plugins/copyright_label/README → src/plugins/copyright_label/README
diff --git a/plugins/copyright_label/copyright.png → src/plugins/copyright_label/copyright.png b/plugins/copyright_label/copyright.png → src/plugins/copyright_label/copyright.png
diff --git a/plugins/copyright_label/copyright_label.pro → ...ugins/copyright_label/copyright_label.pro b/plugins/copyright_label/copyright_label.pro → ...ugins/copyright_label/copyright_label.pro
diff --git a/plugins/copyright_label/copyright_plugin.qrc → ...gins/copyright_label/copyright_plugin.qrc b/plugins/copyright_label/copyright_plugin.qrc → ...gins/copyright_label/copyright_plugin.qrc
diff --git a/plugins/copyright_label/icon.xcf → src/plugins/copyright_label/icon.xcf b/plugins/copyright_label/icon.xcf → src/plugins/copyright_label/icon.xcf
diff --git a/plugins/copyright_label/icon.xpm → src/plugins/copyright_label/icon.xpm b/plugins/copyright_label/icon.xpm → src/plugins/copyright_label/icon.xpm
diff --git a/plugins/copyright_label/plugin.cpp → src/plugins/copyright_label/plugin.cpp b/plugins/copyright_label/plugin.cpp → src/plugins/copyright_label/plugin.cpp
diff --git a/plugins/copyright_label/plugin.h → src/plugins/copyright_label/plugin.h b/plugins/copyright_label/plugin.h → src/plugins/copyright_label/plugin.h
diff --git a/plugins/copyright_label/plugingui.cpp → src/plugins/copyright_label/plugingui.cpp b/plugins/copyright_label/plugingui.cpp → src/plugins/copyright_label/plugingui.cpp
diff --git a/plugins/copyright_label/plugingui.h → src/plugins/copyright_label/plugingui.h b/plugins/copyright_label/plugingui.h → src/plugins/copyright_label/plugingui.h
diff --git a/plugins/copyright_label/pluginguibase.ui → src/plugins/copyright_label/pluginguibase.ui b/plugins/copyright_label/pluginguibase.ui → src/plugins/copyright_label/pluginguibase.ui
diff --git a/plugins/copyright_label/pluginguibase.ui.h → ...lugins/copyright_label/pluginguibase.ui.h b/plugins/copyright_label/pluginguibase.ui.h → ...lugins/copyright_label/pluginguibase.ui.h
diff --git a/plugins/delimited_text/.cvsignore → src/plugins/delimited_text/.cvsignore b/plugins/delimited_text/.cvsignore → src/plugins/delimited_text/.cvsignore
diff --git a/plugins/delimited_text/Makefile.am → src/plugins/delimited_text/Makefile.am b/plugins/delimited_text/Makefile.am → src/plugins/delimited_text/Makefile.am
@@ -50,9 +50,9 @@ BUILT_SOURCES = $(plugin_MOC) $(plugin_UI) $(plugin_RES)
 
 
 
-delimitedtextplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../src/gui/libqgis_gui.la ../../src/core/libqgis_core.la
+delimitedtextplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../gui/libqgis_gui.la ../../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/gui -I../../src/ui
+delimitedtextplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../core -I../../gui -I../../ui
 
 CLEANFILES = $(BUILT_SOURCES)
 

diff --git a/plugins/delimited_text/delimited_text.png → ...plugins/delimited_text/delimited_text.png b/plugins/delimited_text/delimited_text.png → ...plugins/delimited_text/delimited_text.png
diff --git a/plugins/delimited_text/delimited_text.pro → ...plugins/delimited_text/delimited_text.pro b/plugins/delimited_text/delimited_text.pro → ...plugins/delimited_text/delimited_text.pro
diff --git a/plugins/delimited_text/delimited_text.qrc → ...plugins/delimited_text/delimited_text.qrc b/plugins/delimited_text/delimited_text.qrc → ...plugins/delimited_text/delimited_text.qrc
diff --git a/plugins/delimited_text/icon.xpm → src/plugins/delimited_text/icon.xpm b/plugins/delimited_text/icon.xpm → src/plugins/delimited_text/icon.xpm
diff --git a/...delimited_text/qgsdelimitedtextplugin.cpp → ...delimited_text/qgsdelimitedtextplugin.cpp b/...delimited_text/qgsdelimitedtextplugin.cpp → ...delimited_text/qgsdelimitedtextplugin.cpp
diff --git a/...s/delimited_text/qgsdelimitedtextplugin.h → ...s/delimited_text/qgsdelimitedtextplugin.h b/...s/delimited_text/qgsdelimitedtextplugin.h → ...s/delimited_text/qgsdelimitedtextplugin.h
diff --git a/...imited_text/qgsdelimitedtextplugingui.cpp → ...imited_text/qgsdelimitedtextplugingui.cpp b/...imited_text/qgsdelimitedtextplugingui.cpp → ...imited_text/qgsdelimitedtextplugingui.cpp
diff --git a/...elimited_text/qgsdelimitedtextplugingui.h → ...elimited_text/qgsdelimitedtextplugingui.h b/...elimited_text/qgsdelimitedtextplugingui.h → ...elimited_text/qgsdelimitedtextplugingui.h
diff --git a/...ted_text/qgsdelimitedtextpluginguibase.ui → ...ted_text/qgsdelimitedtextpluginguibase.ui b/...ted_text/qgsdelimitedtextpluginguibase.ui → ...ted_text/qgsdelimitedtextpluginguibase.ui
diff --git a/plugins/geoprocessing/.cvsignore → src/plugins/geoprocessing/.cvsignore b/plugins/geoprocessing/.cvsignore → src/plugins/geoprocessing/.cvsignore
diff --git a/plugins/geoprocessing/Makefile.am → src/plugins/geoprocessing/Makefile.am b/plugins/geoprocessing/Makefile.am → src/plugins/geoprocessing/Makefile.am
@@ -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/gui/libqgis_gui.la
+pggeoprocessingplugin_la_LIBADD = $(QT_LDADD)  $(GDAL_LDADD) $(PG_LIB) ../../core/libqgis_core.la ../../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/gui -I../../src/core
+pggeoprocessingplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../ui -I../../gui -I../../core
 
 CLEANFILES = $(BUILT_SOURCES)
 

diff --git a/plugins/geoprocessing/icon_buffer.xpm → src/plugins/geoprocessing/icon_buffer.xpm b/plugins/geoprocessing/icon_buffer.xpm → src/plugins/geoprocessing/icon_buffer.xpm
diff --git a/plugins/geoprocessing/qgsdlgpgbuffer.cpp → src/plugins/geoprocessing/qgsdlgpgbuffer.cpp b/plugins/geoprocessing/qgsdlgpgbuffer.cpp → src/plugins/geoprocessing/qgsdlgpgbuffer.cpp
diff --git a/plugins/geoprocessing/qgsdlgpgbuffer.h → src/plugins/geoprocessing/qgsdlgpgbuffer.h b/plugins/geoprocessing/qgsdlgpgbuffer.h → src/plugins/geoprocessing/qgsdlgpgbuffer.h
diff --git a/plugins/geoprocessing/qgsdlgpgbufferbase.ui → ...ugins/geoprocessing/qgsdlgpgbufferbase.ui b/plugins/geoprocessing/qgsdlgpgbufferbase.ui → ...ugins/geoprocessing/qgsdlgpgbufferbase.ui
diff --git a/plugins/geoprocessing/qgspggeoprocessing.cpp → ...gins/geoprocessing/qgspggeoprocessing.cpp b/plugins/geoprocessing/qgspggeoprocessing.cpp → ...gins/geoprocessing/qgspggeoprocessing.cpp
diff --git a/plugins/geoprocessing/qgspggeoprocessing.h → ...lugins/geoprocessing/qgspggeoprocessing.h b/plugins/geoprocessing/qgspggeoprocessing.h → ...lugins/geoprocessing/qgspggeoprocessing.h
diff --git a/plugins/georeferencer/.cvsignore → src/plugins/georeferencer/.cvsignore b/plugins/georeferencer/.cvsignore → src/plugins/georeferencer/.cvsignore
diff --git a/plugins/georeferencer/Makefile.am → src/plugins/georeferencer/Makefile.am b/plugins/georeferencer/Makefile.am → src/plugins/georeferencer/Makefile.am
@@ -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/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
+georefplugin_la_CXXFLAGS = -I../ -I../../ui -I../../raster -I../../gui -I../../core $(GDAL_CFLAGS) $(GSL_CFLAGS) $(QT_CXXFLAGS) $(GEOS_CFLAGS)
+georefplugin_la_LDFLAGS = -avoid-version -module $(GDAL_LDADD) $(GSL_LIBS) $(QT_LDADD)  ../../gui/libqgis_gui.la ../../core/libqgis_core.la
 
 BUILT_SOURCES = $(plugin_UIHEADERS) $(plugin_UISOURCES) $(plugin_MOC)
 CLEANFILES = $(BUILT_SOURCES)

diff --git a/plugins/georeferencer/add_point.xpm → src/plugins/georeferencer/add_point.xpm b/plugins/georeferencer/add_point.xpm → src/plugins/georeferencer/add_point.xpm
diff --git a/plugins/georeferencer/affine.jpg → src/plugins/georeferencer/affine.jpg b/plugins/georeferencer/affine.jpg → src/plugins/georeferencer/affine.jpg
diff --git a/plugins/georeferencer/datapointacetate.cpp → ...lugins/georeferencer/datapointacetate.cpp b/plugins/georeferencer/datapointacetate.cpp → ...lugins/georeferencer/datapointacetate.cpp
diff --git a/plugins/georeferencer/datapointacetate.h → src/plugins/georeferencer/datapointacetate.h b/plugins/georeferencer/datapointacetate.h → src/plugins/georeferencer/datapointacetate.h
diff --git a/plugins/georeferencer/helmert.jpg → src/plugins/georeferencer/helmert.jpg b/plugins/georeferencer/helmert.jpg → src/plugins/georeferencer/helmert.jpg
diff --git a/plugins/georeferencer/icon.h → src/plugins/georeferencer/icon.h b/plugins/georeferencer/icon.h → src/plugins/georeferencer/icon.h
diff --git a/plugins/georeferencer/mapcoordsdialog.cpp → ...plugins/georeferencer/mapcoordsdialog.cpp b/plugins/georeferencer/mapcoordsdialog.cpp → ...plugins/georeferencer/mapcoordsdialog.cpp
diff --git a/plugins/georeferencer/mapcoordsdialog.h → src/plugins/georeferencer/mapcoordsdialog.h b/plugins/georeferencer/mapcoordsdialog.h → src/plugins/georeferencer/mapcoordsdialog.h
diff --git a/plugins/georeferencer/mapcoordsdialogbase.ui → ...gins/georeferencer/mapcoordsdialogbase.ui b/plugins/georeferencer/mapcoordsdialogbase.ui → ...gins/georeferencer/mapcoordsdialogbase.ui
diff --git a/plugins/georeferencer/pan.xpm → src/plugins/georeferencer/pan.xpm b/plugins/georeferencer/pan.xpm → src/plugins/georeferencer/pan.xpm
diff --git a/plugins/georeferencer/plugin.cpp → src/plugins/georeferencer/plugin.cpp b/plugins/georeferencer/plugin.cpp → src/plugins/georeferencer/plugin.cpp
diff --git a/plugins/georeferencer/plugin.h → src/plugins/georeferencer/plugin.h b/plugins/georeferencer/plugin.h → src/plugins/georeferencer/plugin.h
diff --git a/plugins/georeferencer/plugingui.cpp → src/plugins/georeferencer/plugingui.cpp b/plugins/georeferencer/plugingui.cpp → src/plugins/georeferencer/plugingui.cpp
diff --git a/plugins/georeferencer/plugingui.h → src/plugins/georeferencer/plugingui.h b/plugins/georeferencer/plugingui.h → src/plugins/georeferencer/plugingui.h
diff --git a/plugins/georeferencer/pluginguibase.ui → src/plugins/georeferencer/pluginguibase.ui b/plugins/georeferencer/pluginguibase.ui → src/plugins/georeferencer/pluginguibase.ui
diff --git a/...referencer/qgsgeorefwarpoptionsdialog.cpp → ...referencer/qgsgeorefwarpoptionsdialog.cpp b/...referencer/qgsgeorefwarpoptionsdialog.cpp → ...referencer/qgsgeorefwarpoptionsdialog.cpp
diff --git a/...eoreferencer/qgsgeorefwarpoptionsdialog.h → ...eoreferencer/qgsgeorefwarpoptionsdialog.h b/...eoreferencer/qgsgeorefwarpoptionsdialog.h → ...eoreferencer/qgsgeorefwarpoptionsdialog.h
diff --git a/...erencer/qgsgeorefwarpoptionsdialogbase.ui → ...erencer/qgsgeorefwarpoptionsdialogbase.ui b/...erencer/qgsgeorefwarpoptionsdialogbase.ui → ...erencer/qgsgeorefwarpoptionsdialogbase.ui
diff --git a/plugins/georeferencer/qgsimagewarper.cpp → src/plugins/georeferencer/qgsimagewarper.cpp b/plugins/georeferencer/qgsimagewarper.cpp → src/plugins/georeferencer/qgsimagewarper.cpp
diff --git a/plugins/georeferencer/qgsimagewarper.h → src/plugins/georeferencer/qgsimagewarper.h b/plugins/georeferencer/qgsimagewarper.h → src/plugins/georeferencer/qgsimagewarper.h
diff --git a/plugins/georeferencer/qgsleastsquares.cpp → ...plugins/georeferencer/qgsleastsquares.cpp b/plugins/georeferencer/qgsleastsquares.cpp → ...plugins/georeferencer/qgsleastsquares.cpp
diff --git a/plugins/georeferencer/qgsleastsquares.h → src/plugins/georeferencer/qgsleastsquares.h b/plugins/georeferencer/qgsleastsquares.h → src/plugins/georeferencer/qgsleastsquares.h
diff --git a/plugins/georeferencer/qgspointdialog.cpp → src/plugins/georeferencer/qgspointdialog.cpp b/plugins/georeferencer/qgspointdialog.cpp → src/plugins/georeferencer/qgspointdialog.cpp
diff --git a/plugins/georeferencer/qgspointdialog.h → src/plugins/georeferencer/qgspointdialog.h b/plugins/georeferencer/qgspointdialog.h → src/plugins/georeferencer/qgspointdialog.h
diff --git a/plugins/georeferencer/qgspointdialogbase.ui → ...ugins/georeferencer/qgspointdialogbase.ui b/plugins/georeferencer/qgspointdialogbase.ui → ...ugins/georeferencer/qgspointdialogbase.ui
diff --git a/plugins/georeferencer/zoom_in.xpm → src/plugins/georeferencer/zoom_in.xpm b/plugins/georeferencer/zoom_in.xpm → src/plugins/georeferencer/zoom_in.xpm
diff --git a/plugins/georeferencer/zoom_out.xpm → src/plugins/georeferencer/zoom_out.xpm b/plugins/georeferencer/zoom_out.xpm → src/plugins/georeferencer/zoom_out.xpm
diff --git a/plugins/gps_importer/.cvsignore → src/plugins/gps_importer/.cvsignore b/plugins/gps_importer/.cvsignore → src/plugins/gps_importer/.cvsignore
diff --git a/plugins/gps_importer/Makefile.am → src/plugins/gps_importer/Makefile.am b/plugins/gps_importer/Makefile.am → src/plugins/gps_importer/Makefile.am
@@ -60,9 +60,9 @@ plugin_QRC = qgsgps_plugin.qrc
 
 BUILT_SOURCES = $(plugin_MOC) $(plugin_UI)
 
-gpsimporterplugin_la_LIBADD = $(QT_LDADD)  $(GDAL_LDADD)  ../../src/gui/libqgis_gui.la ../../src/core/libqgis_core.la
+gpsimporterplugin_la_LIBADD = $(QT_LDADD)  $(GDAL_LDADD)  ../../gui/libqgis_gui.la ../../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/gui
+gpsimporterplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../core -I../../ui -I../../gui
 gpsimporterplugin_la_LDFLAGS = -avoid-version -module 
 
 CLEANFILES = $(BUILT_SOURCES)

diff --git a/plugins/gps_importer/README → src/plugins/gps_importer/README b/plugins/gps_importer/README → src/plugins/gps_importer/README
diff --git a/plugins/gps_importer/gps.xpm → src/plugins/gps_importer/gps.xpm b/plugins/gps_importer/gps.xpm → src/plugins/gps_importer/gps.xpm
diff --git a/plugins/gps_importer/gps_importer.pro → src/plugins/gps_importer/gps_importer.pro b/plugins/gps_importer/gps_importer.pro → src/plugins/gps_importer/gps_importer.pro
diff --git a/plugins/gps_importer/icon.xpm → src/plugins/gps_importer/icon.xpm b/plugins/gps_importer/icon.xpm → src/plugins/gps_importer/icon.xpm
diff --git a/plugins/gps_importer/qgsbabelformat.cpp → src/plugins/gps_importer/qgsbabelformat.cpp b/plugins/gps_importer/qgsbabelformat.cpp → src/plugins/gps_importer/qgsbabelformat.cpp
diff --git a/plugins/gps_importer/qgsbabelformat.h → src/plugins/gps_importer/qgsbabelformat.h b/plugins/gps_importer/qgsbabelformat.h → src/plugins/gps_importer/qgsbabelformat.h
diff --git a/plugins/gps_importer/qgsgps_plugin.qrc → src/plugins/gps_importer/qgsgps_plugin.qrc b/plugins/gps_importer/qgsgps_plugin.qrc → src/plugins/gps_importer/qgsgps_plugin.qrc
diff --git a/plugins/gps_importer/qgsgpsdevice.cpp → src/plugins/gps_importer/qgsgpsdevice.cpp b/plugins/gps_importer/qgsgpsdevice.cpp → src/plugins/gps_importer/qgsgpsdevice.cpp
diff --git a/plugins/gps_importer/qgsgpsdevice.h → src/plugins/gps_importer/qgsgpsdevice.h b/plugins/gps_importer/qgsgpsdevice.h → src/plugins/gps_importer/qgsgpsdevice.h
diff --git a/plugins/gps_importer/qgsgpsdevicedialog.cpp → ...ugins/gps_importer/qgsgpsdevicedialog.cpp b/plugins/gps_importer/qgsgpsdevicedialog.cpp → ...ugins/gps_importer/qgsgpsdevicedialog.cpp
diff --git a/plugins/gps_importer/qgsgpsdevicedialog.h → ...plugins/gps_importer/qgsgpsdevicedialog.h b/plugins/gps_importer/qgsgpsdevicedialog.h → ...plugins/gps_importer/qgsgpsdevicedialog.h
diff --git a/...ns/gps_importer/qgsgpsdevicedialogbase.ui → ...ns/gps_importer/qgsgpsdevicedialogbase.ui b/...ns/gps_importer/qgsgpsdevicedialogbase.ui → ...ns/gps_importer/qgsgpsdevicedialogbase.ui
diff --git a/plugins/gps_importer/qgsgpsplugin.cpp → src/plugins/gps_importer/qgsgpsplugin.cpp b/plugins/gps_importer/qgsgpsplugin.cpp → src/plugins/gps_importer/qgsgpsplugin.cpp
diff --git a/plugins/gps_importer/qgsgpsplugin.h → src/plugins/gps_importer/qgsgpsplugin.h b/plugins/gps_importer/qgsgpsplugin.h → src/plugins/gps_importer/qgsgpsplugin.h
diff --git a/plugins/gps_importer/qgsgpsplugingui.cpp → src/plugins/gps_importer/qgsgpsplugingui.cpp b/plugins/gps_importer/qgsgpsplugingui.cpp → src/plugins/gps_importer/qgsgpsplugingui.cpp
diff --git a/plugins/gps_importer/qgsgpsplugingui.h → src/plugins/gps_importer/qgsgpsplugingui.h b/plugins/gps_importer/qgsgpsplugingui.h → src/plugins/gps_importer/qgsgpsplugingui.h
diff --git a/plugins/gps_importer/qgsgpspluginguibase.ui → ...ugins/gps_importer/qgsgpspluginguibase.ui b/plugins/gps_importer/qgsgpspluginguibase.ui → ...ugins/gps_importer/qgsgpspluginguibase.ui
diff --git a/...porter/sample_data/garmin_dump_sample.txt → ...porter/sample_data/garmin_dump_sample.txt b/...porter/sample_data/garmin_dump_sample.txt → ...porter/sample_data/garmin_dump_sample.txt
diff --git a/plugins/gps_importer/sample_data/tracks.gpx → ...ugins/gps_importer/sample_data/tracks.gpx b/plugins/gps_importer/sample_data/tracks.gpx → ...ugins/gps_importer/sample_data/tracks.gpx
diff --git a/...ns/gps_importer/sample_data/waypoints.gpx → ...ns/gps_importer/sample_data/waypoints.gpx b/...ns/gps_importer/sample_data/waypoints.gpx → ...ns/gps_importer/sample_data/waypoints.gpx
diff --git a/plugins/grass/.cvsignore → src/plugins/grass/.cvsignore b/plugins/grass/.cvsignore → src/plugins/grass/.cvsignore
diff --git a/plugins/grass/Makefile.am → src/plugins/grass/Makefile.am b/plugins/grass/Makefile.am → src/plugins/grass/Makefile.am
@@ -12,7 +12,7 @@
 
 SUBDIRS = config modules themes
 
-INCLUDES = -I../../src/gui -I../../src/core
+INCLUDES = -I../../gui -I../../core
 
 DEFS=-DGRASS_BASE=\"$(GRASS_BASE)\" -DHAVE_OPENPTY=$(HAVE_OPENPTY) 
 if !HAVE_QTMAC
@@ -85,8 +85,8 @@ grassplugin_la_SOURCES = qgsgrassplugin.cpp \
 			 qgsgrassattributes.h \
 			 qgsgrassregion.cpp \
 			 qgsgrassregion.h \
-			 ../../src/providers/grass/qgsgrass.h \
-			 ../../src/providers/grass/qgsgrassprovider.h \
+			 ../../providers/grass/qgsgrass.h \
+			 ../../providers/grass/qgsgrassprovider.h \
 			 $(plugin_UI)
 
 nodist_grassplugin_la_SOURCES = $(plugin_MOC)
@@ -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/gui/libqgis_gui.la ../../src/core/libqgis_core.la ../../src/raster/libqgis_raster.la
+grassplugin_la_LIBADD = $(QT_LDADD) ../../providers/grass/libqgisgrass.la $(GRASS_LIB) $(PG_LIB) $(GDAL_LDADD) ../../gui/libqgis_gui.la ../../core/libqgis_core.la ../../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 -I../../src/widgets/projectionselector
+grassplugin_la_CXXFLAGS = $(PREFIX) $(CXXFLAGS) -I$(GRASS_INC) $(DEFS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) -I$(PG_INC)  $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../legend/ -I../../raster -I../../ui -I../../widgets/projectionselector
 
 CLEANFILES = $(BUILT_SOURCES)
 

diff --git a/plugins/grass/add_raster.xpm → src/plugins/grass/add_raster.xpm b/plugins/grass/add_raster.xpm → src/plugins/grass/add_raster.xpm
diff --git a/plugins/grass/add_vector.xpm → src/plugins/grass/add_vector.xpm b/plugins/grass/add_vector.xpm → src/plugins/grass/add_vector.xpm
diff --git a/plugins/grass/config/.cvsignore → src/plugins/grass/config/.cvsignore b/plugins/grass/config/.cvsignore → src/plugins/grass/config/.cvsignore
diff --git a/plugins/grass/config/Makefile.am → src/plugins/grass/config/Makefile.am b/plugins/grass/config/Makefile.am → src/plugins/grass/config/Makefile.am
diff --git a/plugins/grass/config/default.qgc → src/plugins/grass/config/default.qgc b/plugins/grass/config/default.qgc → src/plugins/grass/config/default.qgc
diff --git a/plugins/grass/grass_edit.xpm → src/plugins/grass/grass_edit.xpm b/plugins/grass/grass_edit.xpm → src/plugins/grass/grass_edit.xpm
diff --git a/plugins/grass/grass_region.xpm → src/plugins/grass/grass_region.xpm b/plugins/grass/grass_region.xpm → src/plugins/grass/grass_region.xpm
diff --git a/plugins/grass/grass_region_edit.xpm → src/plugins/grass/grass_region_edit.xpm b/plugins/grass/grass_region_edit.xpm → src/plugins/grass/grass_region_edit.xpm
diff --git a/plugins/grass/grass_tools.xpm → src/plugins/grass/grass_tools.xpm b/plugins/grass/grass_tools.xpm → src/plugins/grass/grass_tools.xpm
diff --git a/plugins/grass/locations.gml → src/plugins/grass/locations.gml b/plugins/grass/locations.gml → src/plugins/grass/locations.gml
diff --git a/plugins/grass/modules/.cvsignore → src/plugins/grass/modules/.cvsignore b/plugins/grass/modules/.cvsignore → src/plugins/grass/modules/.cvsignore
diff --git a/plugins/grass/modules/Makefile.am → src/plugins/grass/modules/Makefile.am b/plugins/grass/modules/Makefile.am → src/plugins/grass/modules/Makefile.am
diff --git a/plugins/grass/modules/g.gisenv.1.png → src/plugins/grass/modules/g.gisenv.1.png b/plugins/grass/modules/g.gisenv.1.png → src/plugins/grass/modules/g.gisenv.1.png
diff --git a/plugins/grass/modules/g.gisenv.qgm → src/plugins/grass/modules/g.gisenv.qgm b/plugins/grass/modules/g.gisenv.qgm → src/plugins/grass/modules/g.gisenv.qgm
diff --git a/plugins/grass/modules/nviz.1.png → src/plugins/grass/modules/nviz.1.png b/plugins/grass/modules/nviz.1.png → src/plugins/grass/modules/nviz.1.png
diff --git a/plugins/grass/modules/nviz.qgm → src/plugins/grass/modules/nviz.qgm b/plugins/grass/modules/nviz.qgm → src/plugins/grass/modules/nviz.qgm
diff --git a/plugins/grass/modules/r.buffer.1.svg → src/plugins/grass/modules/r.buffer.1.svg b/plugins/grass/modules/r.buffer.1.svg → src/plugins/grass/modules/r.buffer.1.svg
diff --git a/plugins/grass/modules/r.buffer.2.svg → src/plugins/grass/modules/r.buffer.2.svg b/plugins/grass/modules/r.buffer.2.svg → src/plugins/grass/modules/r.buffer.2.svg
diff --git a/plugins/grass/modules/r.buffer.qgm → src/plugins/grass/modules/r.buffer.qgm b/plugins/grass/modules/r.buffer.qgm → src/plugins/grass/modules/r.buffer.qgm
diff --git a/plugins/grass/modules/r.colors.1.png → src/plugins/grass/modules/r.colors.1.png b/plugins/grass/modules/r.colors.1.png → src/plugins/grass/modules/r.colors.1.png
diff --git a/plugins/grass/modules/r.colors.2.png → src/plugins/grass/modules/r.colors.2.png b/plugins/grass/modules/r.colors.2.png → src/plugins/grass/modules/r.colors.2.png
diff --git a/plugins/grass/modules/r.colors.qgm → src/plugins/grass/modules/r.colors.qgm b/plugins/grass/modules/r.colors.qgm → src/plugins/grass/modules/r.colors.qgm
diff --git a/plugins/grass/modules/r.in.gdal.1.png → src/plugins/grass/modules/r.in.gdal.1.png b/plugins/grass/modules/r.in.gdal.1.png → src/plugins/grass/modules/r.in.gdal.1.png
diff --git a/plugins/grass/modules/r.in.gdal.2.png → src/plugins/grass/modules/r.in.gdal.2.png b/plugins/grass/modules/r.in.gdal.2.png → src/plugins/grass/modules/r.in.gdal.2.png
diff --git a/plugins/grass/modules/r.in.gdal.qgm → src/plugins/grass/modules/r.in.gdal.qgm b/plugins/grass/modules/r.in.gdal.qgm → src/plugins/grass/modules/r.in.gdal.qgm
diff --git a/plugins/grass/modules/r.mapcalc.1.png → src/plugins/grass/modules/r.mapcalc.1.png b/plugins/grass/modules/r.mapcalc.1.png → src/plugins/grass/modules/r.mapcalc.1.png
diff --git a/plugins/grass/modules/r.mapcalc.qgm → src/plugins/grass/modules/r.mapcalc.qgm b/plugins/grass/modules/r.mapcalc.qgm → src/plugins/grass/modules/r.mapcalc.qgm
diff --git a/...grass/modules/r.slope.aspect.aspect.1.png → ...grass/modules/r.slope.aspect.aspect.1.png b/...grass/modules/r.slope.aspect.aspect.1.png → ...grass/modules/r.slope.aspect.aspect.1.png
diff --git a/...grass/modules/r.slope.aspect.aspect.2.png → ...grass/modules/r.slope.aspect.aspect.2.png b/...grass/modules/r.slope.aspect.aspect.2.png → ...grass/modules/r.slope.aspect.aspect.2.png
diff --git a/...s/grass/modules/r.slope.aspect.aspect.qgm → ...s/grass/modules/r.slope.aspect.aspect.qgm b/...s/grass/modules/r.slope.aspect.aspect.qgm → ...s/grass/modules/r.slope.aspect.aspect.qgm
diff --git a/.../grass/modules/r.slope.aspect.slope.1.png → .../grass/modules/r.slope.aspect.slope.1.png b/.../grass/modules/r.slope.aspect.slope.1.png → .../grass/modules/r.slope.aspect.slope.1.png
diff --git a/.../grass/modules/r.slope.aspect.slope.2.png → .../grass/modules/r.slope.aspect.slope.2.png b/.../grass/modules/r.slope.aspect.slope.2.png → .../grass/modules/r.slope.aspect.slope.2.png
diff --git a/...ns/grass/modules/r.slope.aspect.slope.qgm → ...ns/grass/modules/r.slope.aspect.slope.qgm b/...ns/grass/modules/r.slope.aspect.slope.qgm → ...ns/grass/modules/r.slope.aspect.slope.qgm
diff --git a/plugins/grass/modules/r.to.vect.area.1.svg → ...lugins/grass/modules/r.to.vect.area.1.svg b/plugins/grass/modules/r.to.vect.area.1.svg → ...lugins/grass/modules/r.to.vect.area.1.svg
diff --git a/plugins/grass/modules/r.to.vect.area.2.svg → ...lugins/grass/modules/r.to.vect.area.2.svg b/plugins/grass/modules/r.to.vect.area.2.svg → ...lugins/grass/modules/r.to.vect.area.2.svg
diff --git a/plugins/grass/modules/r.to.vect.area.qgm → src/plugins/grass/modules/r.to.vect.area.qgm b/plugins/grass/modules/r.to.vect.area.qgm → src/plugins/grass/modules/r.to.vect.area.qgm
diff --git a/plugins/grass/modules/r.to.vect.line.1.svg → ...lugins/grass/modules/r.to.vect.line.1.svg b/plugins/grass/modules/r.to.vect.line.1.svg → ...lugins/grass/modules/r.to.vect.line.1.svg
diff --git a/plugins/grass/modules/r.to.vect.line.2.svg → ...lugins/grass/modules/r.to.vect.line.2.svg b/plugins/grass/modules/r.to.vect.line.2.svg → ...lugins/grass/modules/r.to.vect.line.2.svg
diff --git a/plugins/grass/modules/r.to.vect.line.qgm → src/plugins/grass/modules/r.to.vect.line.qgm b/plugins/grass/modules/r.to.vect.line.qgm → src/plugins/grass/modules/r.to.vect.line.qgm
diff --git a/plugins/grass/modules/r.to.vect.point.1.svg → ...ugins/grass/modules/r.to.vect.point.1.svg b/plugins/grass/modules/r.to.vect.point.1.svg → ...ugins/grass/modules/r.to.vect.point.1.svg
diff --git a/plugins/grass/modules/r.to.vect.point.2.png → ...ugins/grass/modules/r.to.vect.point.2.png b/plugins/grass/modules/r.to.vect.point.2.png → ...ugins/grass/modules/r.to.vect.point.2.png
diff --git a/plugins/grass/modules/r.to.vect.point.qgm → ...plugins/grass/modules/r.to.vect.point.qgm b/plugins/grass/modules/r.to.vect.point.qgm → ...plugins/grass/modules/r.to.vect.point.qgm
diff --git a/plugins/grass/modules/shell.1.png → src/plugins/grass/modules/shell.1.png b/plugins/grass/modules/shell.1.png → src/plugins/grass/modules/shell.1.png
diff --git a/plugins/grass/modules/shell.qgm → src/plugins/grass/modules/shell.qgm b/plugins/grass/modules/shell.qgm → src/plugins/grass/modules/shell.qgm
diff --git a/plugins/grass/modules/v.buffer.1.svg → src/plugins/grass/modules/v.buffer.1.svg b/plugins/grass/modules/v.buffer.1.svg → src/plugins/grass/modules/v.buffer.1.svg
diff --git a/plugins/grass/modules/v.buffer.2.svg → src/plugins/grass/modules/v.buffer.2.svg b/plugins/grass/modules/v.buffer.2.svg → src/plugins/grass/modules/v.buffer.2.svg
diff --git a/plugins/grass/modules/v.buffer.qgm → src/plugins/grass/modules/v.buffer.qgm b/plugins/grass/modules/v.buffer.qgm → src/plugins/grass/modules/v.buffer.qgm
diff --git a/plugins/grass/modules/v.category.add.1.png → ...lugins/grass/modules/v.category.add.1.png b/plugins/grass/modules/v.category.add.1.png → ...lugins/grass/modules/v.category.add.1.png
diff --git a/plugins/grass/modules/v.category.add.2.png → ...lugins/grass/modules/v.category.add.2.png b/plugins/grass/modules/v.category.add.2.png → ...lugins/grass/modules/v.category.add.2.png
diff --git a/plugins/grass/modules/v.category.add.qgm → src/plugins/grass/modules/v.category.add.qgm b/plugins/grass/modules/v.category.add.qgm → src/plugins/grass/modules/v.category.add.qgm
diff --git a/plugins/grass/modules/v.delaunay.area.1.png → ...ugins/grass/modules/v.delaunay.area.1.png b/plugins/grass/modules/v.delaunay.area.1.png → ...ugins/grass/modules/v.delaunay.area.1.png
diff --git a/plugins/grass/modules/v.delaunay.area.2.svg → ...ugins/grass/modules/v.delaunay.area.2.svg b/plugins/grass/modules/v.delaunay.area.2.svg → ...ugins/grass/modules/v.delaunay.area.2.svg
diff --git a/plugins/grass/modules/v.delaunay.area.qgm → ...plugins/grass/modules/v.delaunay.area.qgm b/plugins/grass/modules/v.delaunay.area.qgm → ...plugins/grass/modules/v.delaunay.area.qgm
diff --git a/plugins/grass/modules/v.delaunay.line.1.png → ...ugins/grass/modules/v.delaunay.line.1.png b/plugins/grass/modules/v.delaunay.line.1.png → ...ugins/grass/modules/v.delaunay.line.1.png
diff --git a/plugins/grass/modules/v.delaunay.line.2.svg → ...ugins/grass/modules/v.delaunay.line.2.svg b/plugins/grass/modules/v.delaunay.line.2.svg → ...ugins/grass/modules/v.delaunay.line.2.svg
diff --git a/plugins/grass/modules/v.delaunay.line.qgm → ...plugins/grass/modules/v.delaunay.line.qgm b/plugins/grass/modules/v.delaunay.line.qgm → ...plugins/grass/modules/v.delaunay.line.qgm
diff --git a/plugins/grass/modules/v.extract.list.1.svg → ...lugins/grass/modules/v.extract.list.1.svg b/plugins/grass/modules/v.extract.list.1.svg → ...lugins/grass/modules/v.extract.list.1.svg
diff --git a/plugins/grass/modules/v.extract.list.2.svg → ...lugins/grass/modules/v.extract.list.2.svg b/plugins/grass/modules/v.extract.list.2.svg → ...lugins/grass/modules/v.extract.list.2.svg
diff --git a/plugins/grass/modules/v.extract.list.qgm → src/plugins/grass/modules/v.extract.list.qgm b/plugins/grass/modules/v.extract.list.qgm → src/plugins/grass/modules/v.extract.list.qgm
diff --git a/plugins/grass/modules/v.extract.where.1.svg → ...ugins/grass/modules/v.extract.where.1.svg b/plugins/grass/modules/v.extract.where.1.svg → ...ugins/grass/modules/v.extract.where.1.svg
diff --git a/plugins/grass/modules/v.extract.where.2.svg → ...ugins/grass/modules/v.extract.where.2.svg b/plugins/grass/modules/v.extract.where.2.svg → ...ugins/grass/modules/v.extract.where.2.svg
diff --git a/plugins/grass/modules/v.extract.where.qgm → ...plugins/grass/modules/v.extract.where.qgm b/plugins/grass/modules/v.extract.where.qgm → ...plugins/grass/modules/v.extract.where.qgm
diff --git a/plugins/grass/modules/v.hull.1.png → src/plugins/grass/modules/v.hull.1.png b/plugins/grass/modules/v.hull.1.png → src/plugins/grass/modules/v.hull.1.png
diff --git a/plugins/grass/modules/v.hull.2.svg → src/plugins/grass/modules/v.hull.2.svg b/plugins/grass/modules/v.hull.2.svg → src/plugins/grass/modules/v.hull.2.svg
diff --git a/plugins/grass/modules/v.hull.qgm → src/plugins/grass/modules/v.hull.qgm b/plugins/grass/modules/v.hull.qgm → src/plugins/grass/modules/v.hull.qgm
diff --git a/plugins/grass/modules/v.in.ogr.1.png → src/plugins/grass/modules/v.in.ogr.1.png b/plugins/grass/modules/v.in.ogr.1.png → src/plugins/grass/modules/v.in.ogr.1.png
diff --git a/plugins/grass/modules/v.in.ogr.2.svg → src/plugins/grass/modules/v.in.ogr.2.svg b/plugins/grass/modules/v.in.ogr.2.svg → src/plugins/grass/modules/v.in.ogr.2.svg
diff --git a/plugins/grass/modules/v.in.ogr.qgm → src/plugins/grass/modules/v.in.ogr.qgm b/plugins/grass/modules/v.in.ogr.qgm → src/plugins/grass/modules/v.in.ogr.qgm
diff --git a/plugins/grass/modules/v.in.region.1.svg → src/plugins/grass/modules/v.in.region.1.svg b/plugins/grass/modules/v.in.region.1.svg → src/plugins/grass/modules/v.in.region.1.svg
diff --git a/plugins/grass/modules/v.in.region.qgm → src/plugins/grass/modules/v.in.region.qgm b/plugins/grass/modules/v.in.region.qgm → src/plugins/grass/modules/v.in.region.qgm
diff --git a/plugins/grass/modules/v.kernel.1.png → src/plugins/grass/modules/v.kernel.1.png b/plugins/grass/modules/v.kernel.1.png → src/plugins/grass/modules/v.kernel.1.png
diff --git a/plugins/grass/modules/v.kernel.2.png → src/plugins/grass/modules/v.kernel.2.png b/plugins/grass/modules/v.kernel.2.png → src/plugins/grass/modules/v.kernel.2.png
diff --git a/plugins/grass/modules/v.kernel.qgm → src/plugins/grass/modules/v.kernel.qgm b/plugins/grass/modules/v.kernel.qgm → src/plugins/grass/modules/v.kernel.qgm
diff --git a/plugins/grass/modules/v.mkgrid.region.1.svg → ...ugins/grass/modules/v.mkgrid.region.1.svg b/plugins/grass/modules/v.mkgrid.region.1.svg → ...ugins/grass/modules/v.mkgrid.region.1.svg
diff --git a/plugins/grass/modules/v.mkgrid.region.qgm → ...plugins/grass/modules/v.mkgrid.region.qgm b/plugins/grass/modules/v.mkgrid.region.qgm → ...plugins/grass/modules/v.mkgrid.region.qgm
diff --git a/plugins/grass/modules/v.neighbors.1.png → src/plugins/grass/modules/v.neighbors.1.png b/plugins/grass/modules/v.neighbors.1.png → src/plugins/grass/modules/v.neighbors.1.png
diff --git a/plugins/grass/modules/v.neighbors.2.png → src/plugins/grass/modules/v.neighbors.2.png b/plugins/grass/modules/v.neighbors.2.png → src/plugins/grass/modules/v.neighbors.2.png
diff --git a/plugins/grass/modules/v.neighbors.qgm → src/plugins/grass/modules/v.neighbors.qgm b/plugins/grass/modules/v.neighbors.qgm → src/plugins/grass/modules/v.neighbors.qgm
diff --git a/plugins/grass/modules/v.net.alloc.1.svg → src/plugins/grass/modules/v.net.alloc.1.svg b/plugins/grass/modules/v.net.alloc.1.svg → src/plugins/grass/modules/v.net.alloc.1.svg
diff --git a/plugins/grass/modules/v.net.alloc.2.svg → src/plugins/grass/modules/v.net.alloc.2.svg b/plugins/grass/modules/v.net.alloc.2.svg → src/plugins/grass/modules/v.net.alloc.2.svg
diff --git a/plugins/grass/modules/v.net.alloc.qgm → src/plugins/grass/modules/v.net.alloc.qgm b/plugins/grass/modules/v.net.alloc.qgm → src/plugins/grass/modules/v.net.alloc.qgm
diff --git a/plugins/grass/modules/v.net.iso.1.svg → src/plugins/grass/modules/v.net.iso.1.svg b/plugins/grass/modules/v.net.iso.1.svg → src/plugins/grass/modules/v.net.iso.1.svg
diff --git a/plugins/grass/modules/v.net.iso.2.svg → src/plugins/grass/modules/v.net.iso.2.svg b/plugins/grass/modules/v.net.iso.2.svg → src/plugins/grass/modules/v.net.iso.2.svg
diff --git a/plugins/grass/modules/v.net.iso.qgm → src/plugins/grass/modules/v.net.iso.qgm b/plugins/grass/modules/v.net.iso.qgm → src/plugins/grass/modules/v.net.iso.qgm
diff --git a/plugins/grass/modules/v.net.nodes.1.svg → src/plugins/grass/modules/v.net.nodes.1.svg b/plugins/grass/modules/v.net.nodes.1.svg → src/plugins/grass/modules/v.net.nodes.1.svg
diff --git a/plugins/grass/modules/v.net.nodes.2.svg → src/plugins/grass/modules/v.net.nodes.2.svg b/plugins/grass/modules/v.net.nodes.2.svg → src/plugins/grass/modules/v.net.nodes.2.svg
diff --git a/plugins/grass/modules/v.net.nodes.qgm → src/plugins/grass/modules/v.net.nodes.qgm b/plugins/grass/modules/v.net.nodes.qgm → src/plugins/grass/modules/v.net.nodes.qgm
diff --git a/plugins/grass/modules/v.net.salesman.1.svg → ...lugins/grass/modules/v.net.salesman.1.svg b/plugins/grass/modules/v.net.salesman.1.svg → ...lugins/grass/modules/v.net.salesman.1.svg
diff --git a/plugins/grass/modules/v.net.salesman.2.svg → ...lugins/grass/modules/v.net.salesman.2.svg b/plugins/grass/modules/v.net.salesman.2.svg → ...lugins/grass/modules/v.net.salesman.2.svg
diff --git a/plugins/grass/modules/v.net.salesman.qgm → src/plugins/grass/modules/v.net.salesman.qgm b/plugins/grass/modules/v.net.salesman.qgm → src/plugins/grass/modules/v.net.salesman.qgm
diff --git a/plugins/grass/modules/v.net.steiner.1.svg → ...plugins/grass/modules/v.net.steiner.1.svg b/plugins/grass/modules/v.net.steiner.1.svg → ...plugins/grass/modules/v.net.steiner.1.svg
diff --git a/plugins/grass/modules/v.net.steiner.2.svg → ...plugins/grass/modules/v.net.steiner.2.svg b/plugins/grass/modules/v.net.steiner.2.svg → ...plugins/grass/modules/v.net.steiner.2.svg
diff --git a/plugins/grass/modules/v.net.steiner.qgm → src/plugins/grass/modules/v.net.steiner.qgm b/plugins/grass/modules/v.net.steiner.qgm → src/plugins/grass/modules/v.net.steiner.qgm
diff --git a/plugins/grass/modules/v.overlay.and.1.svg → ...plugins/grass/modules/v.overlay.and.1.svg b/plugins/grass/modules/v.overlay.and.1.svg → ...plugins/grass/modules/v.overlay.and.1.svg
diff --git a/plugins/grass/modules/v.overlay.and.2.svg → ...plugins/grass/modules/v.overlay.and.2.svg b/plugins/grass/modules/v.overlay.and.2.svg → ...plugins/grass/modules/v.overlay.and.2.svg
diff --git a/plugins/grass/modules/v.overlay.and.3.svg → ...plugins/grass/modules/v.overlay.and.3.svg b/plugins/grass/modules/v.overlay.and.3.svg → ...plugins/grass/modules/v.overlay.and.3.svg
diff --git a/plugins/grass/modules/v.overlay.and.qgm → src/plugins/grass/modules/v.overlay.and.qgm b/plugins/grass/modules/v.overlay.and.qgm → src/plugins/grass/modules/v.overlay.and.qgm
diff --git a/plugins/grass/modules/v.overlay.not.1.svg → ...plugins/grass/modules/v.overlay.not.1.svg b/plugins/grass/modules/v.overlay.not.1.svg → ...plugins/grass/modules/v.overlay.not.1.svg
diff --git a/plugins/grass/modules/v.overlay.not.2.svg → ...plugins/grass/modules/v.overlay.not.2.svg b/plugins/grass/modules/v.overlay.not.2.svg → ...plugins/grass/modules/v.overlay.not.2.svg
diff --git a/plugins/grass/modules/v.overlay.not.3.svg → ...plugins/grass/modules/v.overlay.not.3.svg b/plugins/grass/modules/v.overlay.not.3.svg → ...plugins/grass/modules/v.overlay.not.3.svg
diff --git a/plugins/grass/modules/v.overlay.not.qgm → src/plugins/grass/modules/v.overlay.not.qgm b/plugins/grass/modules/v.overlay.not.qgm → src/plugins/grass/modules/v.overlay.not.qgm
diff --git a/plugins/grass/modules/v.overlay.or.1.svg → src/plugins/grass/modules/v.overlay.or.1.svg b/plugins/grass/modules/v.overlay.or.1.svg → src/plugins/grass/modules/v.overlay.or.1.svg
diff --git a/plugins/grass/modules/v.overlay.or.2.svg → src/plugins/grass/modules/v.overlay.or.2.svg b/plugins/grass/modules/v.overlay.or.2.svg → src/plugins/grass/modules/v.overlay.or.2.svg
diff --git a/plugins/grass/modules/v.overlay.or.3.svg → src/plugins/grass/modules/v.overlay.or.3.svg b/plugins/grass/modules/v.overlay.or.3.svg → src/plugins/grass/modules/v.overlay.or.3.svg
diff --git a/plugins/grass/modules/v.overlay.or.qgm → src/plugins/grass/modules/v.overlay.or.qgm b/plugins/grass/modules/v.overlay.or.qgm → src/plugins/grass/modules/v.overlay.or.qgm
diff --git a/plugins/grass/modules/v.overlay.xor.1.svg → ...plugins/grass/modules/v.overlay.xor.1.svg b/plugins/grass/modules/v.overlay.xor.1.svg → ...plugins/grass/modules/v.overlay.xor.1.svg
diff --git a/plugins/grass/modules/v.overlay.xor.2.svg → ...plugins/grass/modules/v.overlay.xor.2.svg b/plugins/grass/modules/v.overlay.xor.2.svg → ...plugins/grass/modules/v.overlay.xor.2.svg
diff --git a/plugins/grass/modules/v.overlay.xor.3.svg → ...plugins/grass/modules/v.overlay.xor.3.svg b/plugins/grass/modules/v.overlay.xor.3.svg → ...plugins/grass/modules/v.overlay.xor.3.svg
diff --git a/plugins/grass/modules/v.overlay.xor.qgm → src/plugins/grass/modules/v.overlay.xor.qgm b/plugins/grass/modules/v.overlay.xor.qgm → src/plugins/grass/modules/v.overlay.xor.qgm
diff --git a/plugins/grass/modules/v.random.1.png → src/plugins/grass/modules/v.random.1.png b/plugins/grass/modules/v.random.1.png → src/plugins/grass/modules/v.random.1.png
diff --git a/plugins/grass/modules/v.random.qgm → src/plugins/grass/modules/v.random.qgm b/plugins/grass/modules/v.random.qgm → src/plugins/grass/modules/v.random.qgm
diff --git a/plugins/grass/modules/v.select.overlap.1.svg → ...gins/grass/modules/v.select.overlap.1.svg b/plugins/grass/modules/v.select.overlap.1.svg → ...gins/grass/modules/v.select.overlap.1.svg
diff --git a/plugins/grass/modules/v.select.overlap.2.svg → ...gins/grass/modules/v.select.overlap.2.svg b/plugins/grass/modules/v.select.overlap.2.svg → ...gins/grass/modules/v.select.overlap.2.svg
diff --git a/plugins/grass/modules/v.select.overlap.3.svg → ...gins/grass/modules/v.select.overlap.3.svg b/plugins/grass/modules/v.select.overlap.3.svg → ...gins/grass/modules/v.select.overlap.3.svg
diff --git a/plugins/grass/modules/v.select.overlap.qgm → ...lugins/grass/modules/v.select.overlap.qgm b/plugins/grass/modules/v.select.overlap.qgm → ...lugins/grass/modules/v.select.overlap.qgm
diff --git a/plugins/grass/modules/v.surf.idw.1.png → src/plugins/grass/modules/v.surf.idw.1.png b/plugins/grass/modules/v.surf.idw.1.png → src/plugins/grass/modules/v.surf.idw.1.png
diff --git a/plugins/grass/modules/v.surf.idw.2.png → src/plugins/grass/modules/v.surf.idw.2.png b/plugins/grass/modules/v.surf.idw.2.png → src/plugins/grass/modules/v.surf.idw.2.png
diff --git a/plugins/grass/modules/v.surf.idw.qgm → src/plugins/grass/modules/v.surf.idw.qgm b/plugins/grass/modules/v.surf.idw.qgm → src/plugins/grass/modules/v.surf.idw.qgm
diff --git a/plugins/grass/modules/v.surf.rst.1.png → src/plugins/grass/modules/v.surf.rst.1.png b/plugins/grass/modules/v.surf.rst.1.png → src/plugins/grass/modules/v.surf.rst.1.png
diff --git a/plugins/grass/modules/v.surf.rst.2.png → src/plugins/grass/modules/v.surf.rst.2.png b/plugins/grass/modules/v.surf.rst.2.png → src/plugins/grass/modules/v.surf.rst.2.png
diff --git a/plugins/grass/modules/v.surf.rst.qgm → src/plugins/grass/modules/v.surf.rst.qgm b/plugins/grass/modules/v.surf.rst.qgm → src/plugins/grass/modules/v.surf.rst.qgm
diff --git a/...ns/grass/modules/v.to.rast.constant.1.svg → ...ns/grass/modules/v.to.rast.constant.1.svg b/...ns/grass/modules/v.to.rast.constant.1.svg → ...ns/grass/modules/v.to.rast.constant.1.svg
diff --git a/...ns/grass/modules/v.to.rast.constant.2.svg → ...ns/grass/modules/v.to.rast.constant.2.svg b/...ns/grass/modules/v.to.rast.constant.2.svg → ...ns/grass/modules/v.to.rast.constant.2.svg
diff --git a/plugins/grass/modules/v.to.rast.constant.qgm → ...gins/grass/modules/v.to.rast.constant.qgm b/plugins/grass/modules/v.to.rast.constant.qgm → ...gins/grass/modules/v.to.rast.constant.qgm
diff --git a/plugins/grass/modules/v.voronoi.area.1.png → ...lugins/grass/modules/v.voronoi.area.1.png b/plugins/grass/modules/v.voronoi.area.1.png → ...lugins/grass/modules/v.voronoi.area.1.png
diff --git a/plugins/grass/modules/v.voronoi.area.2.svg → ...lugins/grass/modules/v.voronoi.area.2.svg b/plugins/grass/modules/v.voronoi.area.2.svg → ...lugins/grass/modules/v.voronoi.area.2.svg
diff --git a/plugins/grass/modules/v.voronoi.area.qgm → src/plugins/grass/modules/v.voronoi.area.qgm b/plugins/grass/modules/v.voronoi.area.qgm → src/plugins/grass/modules/v.voronoi.area.qgm
diff --git a/plugins/grass/modules/v.voronoi.line.1.png → ...lugins/grass/modules/v.voronoi.line.1.png b/plugins/grass/modules/v.voronoi.line.1.png → ...lugins/grass/modules/v.voronoi.line.1.png
diff --git a/plugins/grass/modules/v.voronoi.line.2.svg → ...lugins/grass/modules/v.voronoi.line.2.svg b/plugins/grass/modules/v.voronoi.line.2.svg → ...lugins/grass/modules/v.voronoi.line.2.svg
diff --git a/plugins/grass/modules/v.voronoi.line.qgm → src/plugins/grass/modules/v.voronoi.line.qgm b/plugins/grass/modules/v.voronoi.line.qgm → src/plugins/grass/modules/v.voronoi.line.qgm
diff --git a/plugins/grass/qgsgrassattributes.cpp → src/plugins/grass/qgsgrassattributes.cpp b/plugins/grass/qgsgrassattributes.cpp → src/plugins/grass/qgsgrassattributes.cpp
diff --git a/plugins/grass/qgsgrassattributes.h → src/plugins/grass/qgsgrassattributes.h b/plugins/grass/qgsgrassattributes.h → src/plugins/grass/qgsgrassattributes.h
diff --git a/plugins/grass/qgsgrassattributesbase.ui → src/plugins/grass/qgsgrassattributesbase.ui b/plugins/grass/qgsgrassattributesbase.ui → src/plugins/grass/qgsgrassattributesbase.ui
diff --git a/plugins/grass/qgsgrassedit.cpp → src/plugins/grass/qgsgrassedit.cpp b/plugins/grass/qgsgrassedit.cpp → src/plugins/grass/qgsgrassedit.cpp
diff --git a/plugins/grass/qgsgrassedit.h → src/plugins/grass/qgsgrassedit.h b/plugins/grass/qgsgrassedit.h → src/plugins/grass/qgsgrassedit.h
diff --git a/plugins/grass/qgsgrasseditbase.ui → src/plugins/grass/qgsgrasseditbase.ui b/plugins/grass/qgsgrasseditbase.ui → src/plugins/grass/qgsgrasseditbase.ui
diff --git a/plugins/grass/qgsgrassmapcalc.cpp → src/plugins/grass/qgsgrassmapcalc.cpp b/plugins/grass/qgsgrassmapcalc.cpp → src/plugins/grass/qgsgrassmapcalc.cpp
diff --git a/plugins/grass/qgsgrassmapcalc.h → src/plugins/grass/qgsgrassmapcalc.h b/plugins/grass/qgsgrassmapcalc.h → src/plugins/grass/qgsgrassmapcalc.h
diff --git a/plugins/grass/qgsgrassmapcalcbase.ui → src/plugins/grass/qgsgrassmapcalcbase.ui b/plugins/grass/qgsgrassmapcalcbase.ui → src/plugins/grass/qgsgrassmapcalcbase.ui
diff --git a/plugins/grass/qgsgrassmodule.cpp → src/plugins/grass/qgsgrassmodule.cpp b/plugins/grass/qgsgrassmodule.cpp → src/plugins/grass/qgsgrassmodule.cpp
diff --git a/plugins/grass/qgsgrassmodule.h → src/plugins/grass/qgsgrassmodule.h b/plugins/grass/qgsgrassmodule.h → src/plugins/grass/qgsgrassmodule.h
diff --git a/plugins/grass/qgsgrassmodulebase.ui → src/plugins/grass/qgsgrassmodulebase.ui b/plugins/grass/qgsgrassmodulebase.ui → src/plugins/grass/qgsgrassmodulebase.ui
diff --git a/plugins/grass/qgsgrassnewmapset.cpp → src/plugins/grass/qgsgrassnewmapset.cpp b/plugins/grass/qgsgrassnewmapset.cpp → src/plugins/grass/qgsgrassnewmapset.cpp
diff --git a/plugins/grass/qgsgrassnewmapset.h → src/plugins/grass/qgsgrassnewmapset.h b/plugins/grass/qgsgrassnewmapset.h → src/plugins/grass/qgsgrassnewmapset.h
diff --git a/plugins/grass/qgsgrassnewmapsetbase.ui → src/plugins/grass/qgsgrassnewmapsetbase.ui b/plugins/grass/qgsgrassnewmapsetbase.ui → src/plugins/grass/qgsgrassnewmapsetbase.ui
diff --git a/plugins/grass/qgsgrassplugin.cpp → src/plugins/grass/qgsgrassplugin.cpp b/plugins/grass/qgsgrassplugin.cpp → src/plugins/grass/qgsgrassplugin.cpp
diff --git a/plugins/grass/qgsgrassplugin.h → src/plugins/grass/qgsgrassplugin.h b/plugins/grass/qgsgrassplugin.h → src/plugins/grass/qgsgrassplugin.h
diff --git a/plugins/grass/qgsgrassregion.cpp → src/plugins/grass/qgsgrassregion.cpp b/plugins/grass/qgsgrassregion.cpp → src/plugins/grass/qgsgrassregion.cpp
diff --git a/plugins/grass/qgsgrassregion.h → src/plugins/grass/qgsgrassregion.h b/plugins/grass/qgsgrassregion.h → src/plugins/grass/qgsgrassregion.h
diff --git a/plugins/grass/qgsgrassregionbase.ui → src/plugins/grass/qgsgrassregionbase.ui b/plugins/grass/qgsgrassregionbase.ui → src/plugins/grass/qgsgrassregionbase.ui
diff --git a/plugins/grass/qgsgrassselect.cpp → src/plugins/grass/qgsgrassselect.cpp b/plugins/grass/qgsgrassselect.cpp → src/plugins/grass/qgsgrassselect.cpp
diff --git a/plugins/grass/qgsgrassselect.h → src/plugins/grass/qgsgrassselect.h b/plugins/grass/qgsgrassselect.h → src/plugins/grass/qgsgrassselect.h
diff --git a/plugins/grass/qgsgrassselectbase.ui → src/plugins/grass/qgsgrassselectbase.ui b/plugins/grass/qgsgrassselectbase.ui → src/plugins/grass/qgsgrassselectbase.ui
diff --git a/plugins/grass/qgsgrassshell.cpp → src/plugins/grass/qgsgrassshell.cpp b/plugins/grass/qgsgrassshell.cpp → src/plugins/grass/qgsgrassshell.cpp
diff --git a/plugins/grass/qgsgrassshell.h → src/plugins/grass/qgsgrassshell.h b/plugins/grass/qgsgrassshell.h → src/plugins/grass/qgsgrassshell.h
diff --git a/plugins/grass/qgsgrassshellbase.ui → src/plugins/grass/qgsgrassshellbase.ui b/plugins/grass/qgsgrassshellbase.ui → src/plugins/grass/qgsgrassshellbase.ui
diff --git a/plugins/grass/qgsgrasstools.cpp → src/plugins/grass/qgsgrasstools.cpp b/plugins/grass/qgsgrasstools.cpp → src/plugins/grass/qgsgrasstools.cpp
diff --git a/plugins/grass/qgsgrasstools.h → src/plugins/grass/qgsgrasstools.h b/plugins/grass/qgsgrasstools.h → src/plugins/grass/qgsgrasstools.h
diff --git a/plugins/grass/qgsgrasstoolsbase.ui → src/plugins/grass/qgsgrasstoolsbase.ui b/plugins/grass/qgsgrasstoolsbase.ui → src/plugins/grass/qgsgrasstoolsbase.ui
diff --git a/plugins/grass/themes/.cvsignore → src/plugins/grass/themes/.cvsignore b/plugins/grass/themes/.cvsignore → src/plugins/grass/themes/.cvsignore
diff --git a/plugins/grass/themes/Makefile.am → src/plugins/grass/themes/Makefile.am b/plugins/grass/themes/Makefile.am → src/plugins/grass/themes/Makefile.am
diff --git a/plugins/grass/themes/default/.cvsignore → src/plugins/grass/themes/default/.cvsignore b/plugins/grass/themes/default/.cvsignore → src/plugins/grass/themes/default/.cvsignore
diff --git a/plugins/grass/themes/default/Makefile.am → src/plugins/grass/themes/default/Makefile.am b/plugins/grass/themes/default/Makefile.am → src/plugins/grass/themes/default/Makefile.am
diff --git a/...grass/themes/default/grass_add_vertex.png → ...grass/themes/default/grass_add_vertex.png b/...grass/themes/default/grass_add_vertex.png → ...grass/themes/default/grass_add_vertex.png
diff --git a/...grass/themes/default/grass_close_edit.png → ...grass/themes/default/grass_close_edit.png b/...grass/themes/default/grass_close_edit.png → ...grass/themes/default/grass_close_edit.png
diff --git a/...rass/themes/default/grass_delete_line.png → ...rass/themes/default/grass_delete_line.png b/...rass/themes/default/grass_delete_line.png → ...rass/themes/default/grass_delete_line.png
diff --git a/...ss/themes/default/grass_delete_vertex.png → ...ss/themes/default/grass_delete_vertex.png b/...ss/themes/default/grass_delete_vertex.png → ...ss/themes/default/grass_delete_vertex.png
diff --git a/.../themes/default/grass_edit_attributes.png → .../themes/default/grass_edit_attributes.png b/.../themes/default/grass_edit_attributes.png → .../themes/default/grass_edit_attributes.png
diff --git a/...ass/themes/default/grass_module_error.png → ...ass/themes/default/grass_module_error.png b/...ass/themes/default/grass_module_error.png → ...ass/themes/default/grass_module_error.png
diff --git a/...s/themes/default/grass_module_warning.png → ...s/themes/default/grass_module_warning.png b/...s/themes/default/grass_module_warning.png → ...s/themes/default/grass_module_warning.png
diff --git a/.../grass/themes/default/grass_move_line.png → .../grass/themes/default/grass_move_line.png b/.../grass/themes/default/grass_move_line.png → .../grass/themes/default/grass_move_line.png
diff --git a/...rass/themes/default/grass_move_vertex.png → ...rass/themes/default/grass_move_vertex.png b/...rass/themes/default/grass_move_vertex.png → ...rass/themes/default/grass_move_vertex.png
diff --git a/...ass/themes/default/grass_new_boundary.png → ...ass/themes/default/grass_new_boundary.png b/...ass/themes/default/grass_new_boundary.png → ...ass/themes/default/grass_new_boundary.png
diff --git a/...ass/themes/default/grass_new_centroid.png → ...ass/themes/default/grass_new_centroid.png b/...ass/themes/default/grass_new_centroid.png → ...ass/themes/default/grass_new_centroid.png
diff --git a/...s/grass/themes/default/grass_new_line.png → ...s/grass/themes/default/grass_new_line.png b/...s/grass/themes/default/grass_new_line.png → ...s/grass/themes/default/grass_new_line.png
diff --git a/.../grass/themes/default/grass_new_point.png → .../grass/themes/default/grass_new_point.png b/.../grass/themes/default/grass_new_point.png → .../grass/themes/default/grass_new_point.png
diff --git a/...grass/themes/default/grass_split_line.png → ...grass/themes/default/grass_split_line.png b/...grass/themes/default/grass_split_line.png → ...grass/themes/default/grass_split_line.png
diff --git a/plugins/grass/themes/default/grass_tools.png → ...gins/grass/themes/default/grass_tools.png b/plugins/grass/themes/default/grass_tools.png → ...gins/grass/themes/default/grass_tools.png
diff --git a/plugins/grid_maker/.cvsignore → src/plugins/grid_maker/.cvsignore b/plugins/grid_maker/.cvsignore → src/plugins/grid_maker/.cvsignore
diff --git a/plugins/grid_maker/Makefile.am → src/plugins/grid_maker/Makefile.am b/plugins/grid_maker/Makefile.am → src/plugins/grid_maker/Makefile.am
@@ -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/gui/libqgis_gui.la
+gridmakerplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../core/libqgis_core.la ../../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/gui 
+gridmakerplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../core -I../../ui -I../../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/gui -I../../src/ui -I../../src/core
+gridmaker_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PKGDATAPATH) $(DEBUG_QGIS) -I../../gui -I../../ui -I../../core
 
 standalone_MOC = plugingui.moc.cpp 
 

diff --git a/plugins/grid_maker/README → src/plugins/grid_maker/README b/plugins/grid_maker/README → src/plugins/grid_maker/README
diff --git a/plugins/grid_maker/dbfopen.c → src/plugins/grid_maker/dbfopen.c b/plugins/grid_maker/dbfopen.c → src/plugins/grid_maker/dbfopen.c
diff --git a/plugins/grid_maker/graticulecreator.cpp → src/plugins/grid_maker/graticulecreator.cpp b/plugins/grid_maker/graticulecreator.cpp → src/plugins/grid_maker/graticulecreator.cpp
diff --git a/plugins/grid_maker/graticulecreator.h → src/plugins/grid_maker/graticulecreator.h b/plugins/grid_maker/graticulecreator.h → src/plugins/grid_maker/graticulecreator.h
diff --git a/plugins/grid_maker/grid_maker.pro → src/plugins/grid_maker/grid_maker.pro b/plugins/grid_maker/grid_maker.pro → src/plugins/grid_maker/grid_maker.pro
diff --git a/plugins/grid_maker/grid_pic2.png → src/plugins/grid_maker/grid_pic2.png b/plugins/grid_maker/grid_pic2.png → src/plugins/grid_maker/grid_pic2.png
diff --git a/plugins/grid_maker/gridmaker_plugin.qrc → src/plugins/grid_maker/gridmaker_plugin.qrc b/plugins/grid_maker/gridmaker_plugin.qrc → src/plugins/grid_maker/gridmaker_plugin.qrc
diff --git a/plugins/grid_maker/icon.xpm → src/plugins/grid_maker/icon.xpm b/plugins/grid_maker/icon.xpm → src/plugins/grid_maker/icon.xpm
diff --git a/plugins/grid_maker/main.cpp → src/plugins/grid_maker/main.cpp b/plugins/grid_maker/main.cpp → src/plugins/grid_maker/main.cpp
diff --git a/plugins/grid_maker/plugin.cpp → src/plugins/grid_maker/plugin.cpp b/plugins/grid_maker/plugin.cpp → src/plugins/grid_maker/plugin.cpp
diff --git a/plugins/grid_maker/plugin.h → src/plugins/grid_maker/plugin.h b/plugins/grid_maker/plugin.h → src/plugins/grid_maker/plugin.h
diff --git a/plugins/grid_maker/plugingui.cpp → src/plugins/grid_maker/plugingui.cpp b/plugins/grid_maker/plugingui.cpp → src/plugins/grid_maker/plugingui.cpp
diff --git a/plugins/grid_maker/plugingui.h → src/plugins/grid_maker/plugingui.h b/plugins/grid_maker/plugingui.h → src/plugins/grid_maker/plugingui.h
diff --git a/plugins/grid_maker/pluginguibase.ui → src/plugins/grid_maker/pluginguibase.ui b/plugins/grid_maker/pluginguibase.ui → src/plugins/grid_maker/pluginguibase.ui
diff --git a/plugins/grid_maker/pluginguibase.ui.h → src/plugins/grid_maker/pluginguibase.ui.h b/plugins/grid_maker/pluginguibase.ui.h → src/plugins/grid_maker/pluginguibase.ui.h
diff --git a/plugins/grid_maker/shapefile.h → src/plugins/grid_maker/shapefile.h b/plugins/grid_maker/shapefile.h → src/plugins/grid_maker/shapefile.h
diff --git a/plugins/grid_maker/shpopen.c → src/plugins/grid_maker/shpopen.c b/plugins/grid_maker/shpopen.c → src/plugins/grid_maker/shpopen.c
diff --git a/plugins/grid_maker/utils.c → src/plugins/grid_maker/utils.c b/plugins/grid_maker/utils.c → src/plugins/grid_maker/utils.c
diff --git a/plugins/grid_maker/utils.h → src/plugins/grid_maker/utils.h b/plugins/grid_maker/utils.h → src/plugins/grid_maker/utils.h
diff --git a/plugins/maplayer/.cvsignore → src/plugins/maplayer/.cvsignore b/plugins/maplayer/.cvsignore → src/plugins/maplayer/.cvsignore
diff --git a/plugins/maplayer/Makefile.am → src/plugins/maplayer/Makefile.am b/plugins/maplayer/Makefile.am → src/plugins/maplayer/Makefile.am
@@ -31,6 +31,6 @@ maplayerplugin_la_SOURCES =  maplayertest.cpp \
 # UI dependencies			
 
 
-maplayerplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../src/libqgis.la
+maplayerplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../libqgis.la
 maplayerplugin_la_LDFLAGS = -avoid-version -module
 maplayerplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) -I../../src
diff --git a/plugins/maplayer/maplayer.pro → src/plugins/maplayer/maplayer.pro b/plugins/maplayer/maplayer.pro → src/plugins/maplayer/maplayer.pro
diff --git a/plugins/maplayer/maplayertest.cpp → src/plugins/maplayer/maplayertest.cpp b/plugins/maplayer/maplayertest.cpp → src/plugins/maplayer/maplayertest.cpp
diff --git a/plugins/maplayer/maplayertest.h → src/plugins/maplayer/maplayertest.h b/plugins/maplayer/maplayertest.h → src/plugins/maplayer/maplayertest.h
diff --git a/plugins/maplayer/matrix1.xpm → src/plugins/maplayer/matrix1.xpm b/plugins/maplayer/matrix1.xpm → src/plugins/maplayer/matrix1.xpm
diff --git a/plugins/north_arrow/.cvsignore → src/plugins/north_arrow/.cvsignore b/plugins/north_arrow/.cvsignore → src/plugins/north_arrow/.cvsignore
diff --git a/plugins/north_arrow/Makefile.am → src/plugins/north_arrow/Makefile.am b/plugins/north_arrow/Makefile.am → src/plugins/north_arrow/Makefile.am
@@ -50,9 +50,9 @@ plugin_QRC = northarrow_plugin.qrc
 BUILT_SOURCES = $(plugin_MOC) $(plugin_UI) $(plugin_RES)
 
 
-northarrowplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../src/core/libqgis_core.la 
+northarrowplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../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/gui -I../../src/ui -I../../src/core
+northarrowplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) $(PKGDATAPATH) -I../../gui -I../../ui -I../../core
 
 CLEANFILES = $(BUILT_SOURCES)