From 2f86b4fe61953ef33fa988f69a852fa85cb0aaca Mon Sep 17 00:00:00 2001
From: gsherman <gsherman@c8812cc2-4d05-0410-92ff-de0c093fc19c>
Date: Sat, 27 Jul 2002 23:06:32 +0000
Subject: [PATCH] *** empty log message ***

git-svn-id: http://svn.osgeo.org/qgis/trunk@60 c8812cc2-4d05-0410-92ff-de0c093fc19c
---
 Makefile.am                |  30 --
 Makefile.in                | 620 -------------------------------------
 docs/Makefile              | 484 -----------------------------
 docs/Makefile.am           |   5 -
 docs/Makefile.in           | 484 -----------------------------
 docs/en/Makefile           | 393 -----------------------
 docs/en/Makefile.am        |  31 --
 docs/en/Makefile.in        | 393 -----------------------
 docs/en/index-1.html       |  28 --
 docs/en/index-2.html       |  60 ----
 docs/en/index-3.html       |  27 --
 docs/en/index-4.html       |  24 --
 docs/en/index-5.html       |  24 --
 docs/en/index-6.html       |  37 ---
 docs/en/index.html         |  55 ----
 docs/en/index.sgml         |  74 -----
 main.cpp                   |  54 ----
 qgisapp.cpp                | 272 ----------------
 qgisapp.h                  |  64 ----
 qgisappbase.ui             | 282 -----------------
 qgispoint.h                |   0
 qgscoordinatetransform.cpp |  68 ----
 qgscoordinatetransform.h   |  41 ---
 qgsdatabase.cpp            |   0
 qgsdatabaselayer.cpp       | 416 -------------------------
 qgsdatabaselayer.h         |  74 -----
 qgsdatasource.cpp          |  21 --
 qgsdatasource.h            |  35 ---
 qgsdbsourceselect.cpp      | 129 --------
 qgsdbsourceselect.h        |  55 ----
 qgsdbsourceselectbase.ui   | 239 --------------
 qgslinesymbol.h            |  43 ---
 qgsmapcanvas.cpp           | 152 ---------
 qgsmapcanvas.h             |  66 ----
 qgsmaplayer.cpp            |  55 ----
 qgsmaplayer.h              |  95 ------
 qgsmarkersymbol.h          |  43 ---
 qgsnewconnection.cpp       |  72 -----
 qgsnewconnection.h         |  37 ---
 qgsnewconnectionbase.ui    | 313 -------------------
 qgspoint.cpp               |  61 ----
 qgspoint.h                 |  76 -----
 qgspolygonsymbol.h         |  43 ---
 qgsrasterlayer.cpp         |  23 --
 qgsrasterlayer.h           |  35 ---
 qgsrect.cpp                | 102 ------
 qgsrect.h                  |  75 -----
 qgsshapefilelayer.h        |  42 ---
 qgssymbol.h                |  48 ---
 qgstable.h                 |  36 ---
 xpm/addlayericon.xpm       |  28 --
 xpm/line_layer.xpm         |  22 --
 xpm/open.xpm               | 127 --------
 xpm/pan.xpm                |  28 --
 xpm/point_layer.xpm        |  23 --
 xpm/polygon_layer.xpm      |  22 --
 xpm/qgis.xpm               |  75 -----
 xpm/reload.xpm             | 168 ----------
 xpm/zoom.xpm               | 224 --------------
 xpm/zoomfull.xpm           | 178 -----------
 xpm/zoomout.xpm            | 224 --------------
 61 files changed, 7055 deletions(-)
 delete mode 100644 Makefile.am
 delete mode 100644 Makefile.in
 delete mode 100644 docs/Makefile
 delete mode 100644 docs/Makefile.am
 delete mode 100644 docs/Makefile.in
 delete mode 100644 docs/en/Makefile
 delete mode 100644 docs/en/Makefile.am
 delete mode 100644 docs/en/Makefile.in
 delete mode 100644 docs/en/index-1.html
 delete mode 100644 docs/en/index-2.html
 delete mode 100644 docs/en/index-3.html
 delete mode 100644 docs/en/index-4.html
 delete mode 100644 docs/en/index-5.html
 delete mode 100644 docs/en/index-6.html
 delete mode 100644 docs/en/index.html
 delete mode 100644 docs/en/index.sgml
 delete mode 100644 main.cpp
 delete mode 100644 qgisapp.cpp
 delete mode 100644 qgisapp.h
 delete mode 100644 qgisappbase.ui
 delete mode 100644 qgispoint.h
 delete mode 100644 qgscoordinatetransform.cpp
 delete mode 100644 qgscoordinatetransform.h
 delete mode 100644 qgsdatabase.cpp
 delete mode 100644 qgsdatabaselayer.cpp
 delete mode 100644 qgsdatabaselayer.h
 delete mode 100644 qgsdatasource.cpp
 delete mode 100644 qgsdatasource.h
 delete mode 100644 qgsdbsourceselect.cpp
 delete mode 100644 qgsdbsourceselect.h
 delete mode 100644 qgsdbsourceselectbase.ui
 delete mode 100644 qgslinesymbol.h
 delete mode 100644 qgsmapcanvas.cpp
 delete mode 100644 qgsmapcanvas.h
 delete mode 100644 qgsmaplayer.cpp
 delete mode 100644 qgsmaplayer.h
 delete mode 100644 qgsmarkersymbol.h
 delete mode 100644 qgsnewconnection.cpp
 delete mode 100644 qgsnewconnection.h
 delete mode 100644 qgsnewconnectionbase.ui
 delete mode 100644 qgspoint.cpp
 delete mode 100644 qgspoint.h
 delete mode 100644 qgspolygonsymbol.h
 delete mode 100644 qgsrasterlayer.cpp
 delete mode 100644 qgsrasterlayer.h
 delete mode 100644 qgsrect.cpp
 delete mode 100644 qgsrect.h
 delete mode 100644 qgsshapefilelayer.h
 delete mode 100644 qgssymbol.h
 delete mode 100644 qgstable.h
 delete mode 100644 xpm/addlayericon.xpm
 delete mode 100644 xpm/line_layer.xpm
 delete mode 100644 xpm/open.xpm
 delete mode 100644 xpm/pan.xpm
 delete mode 100644 xpm/point_layer.xpm
 delete mode 100644 xpm/polygon_layer.xpm
 delete mode 100644 xpm/qgis.xpm
 delete mode 100644 xpm/reload.xpm
 delete mode 100644 xpm/zoom.xpm
 delete mode 100644 xpm/zoomfull.xpm
 delete mode 100644 xpm/zoomout.xpm

diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index a08c5626799..00000000000
--- a/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-####### kdevelop will overwrite this part!!! (begin)##########
-bin_PROGRAMS = qgis
-
-## INCLUDES were found outside kdevelop specific part
-
-qgis_SOURCES = qgsrect.cpp qgsrasterlayer.cpp qgspoint.cpp qgsnewconnectionbase.ui qgsnewconnection.cpp qgsmaplayer.cpp qgsmapcanvas.cpp qgsdbsourceselectbase.ui qgsdbsourceselect.cpp qgsdatasource.cpp qgsdatabaselayer.cpp qgsdatabase.cpp qgscoordinatetransform.cpp qgisappbase.ui qgisapp.cpp main.cpp 
-SOURCES = qgsrect.cpp qgsrasterlayer.cpp qgspoint.cpp qgsnewconnection.cpp qgsmaplayer.cpp qgsmapcanvas.cpp qgsdbsourceselect.cpp qgsdatasource.cpp qgsdatabaselayer.cpp qgsdatabase.cpp qgscoordinatetransform.cpp qgisapp.cpp main.cpp 
-INTERFACES = qgsnewconnectionbase.ui qgsdbsourceselectbase.ui qgisappbase.ui 
-TRANSLATIONS = 
-KDE_OPTIONS = qtonly
-qgis_LDADD   = -L$(PGSQL)/lib -lpq++ $(LIB_QT) $(LIBSOCKET)
-
-SUBDIRS = docs 
-
-EXTRA_DIST = filenew.xpm filesave.xpm fileopen.xpm main.cpp qgisapp.cpp qgisapp.h qgisappbase.ui qgscoordinatetransform.cpp qgscoordinatetransform.h qgsdatabase.cpp qgsdatabaselayer.cpp qgsdatabaselayer.h qgsdatasource.cpp qgsdatasource.h qgsdbsourceselect.cpp qgsdbsourceselectbase.ui qgsdbsourceselect.h qgslinesymbol.h qgsmapcanvas.cpp qgsmapcanvas.h qgsmaplayer.cpp qgsmaplayer.h qgsmarkersymbol.h qgsnewconnection.cpp qgsnewconnection.h qgsnewconnectionbase.ui qgspoint.cpp qgspoint.h qgspolygonsymbol.h qgsrasterlayer.cpp qgsrasterlayer.h qgsrect.cpp qgsrect.h qgsshapefilelayer.h qgssymbol.h qgstable.h 
-
-####### kdevelop will overwrite this part!!! (end)############
-
-
-# set the include path for X, qt and KDE
-INCLUDES= $(all_includes)
-
-qgis_METASOURCES = AUTO
-
-# the library search path. 
-qgis_LDFLAGS = $(all_libraries) 
-
-# them while "make clean", use CLEANFILES
-DISTCLEANFILES = $(qgis_METASOURCES)
-
diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index 4108953827f..00000000000
--- a/Makefile.in
+++ /dev/null
@@ -1,620 +0,0 @@
-# Makefile.in generated automatically by automake 1.5 from Makefile.am.
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-####### kdevelop will overwrite this part!!! (begin)##########
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-AMTAR = @AMTAR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-AWK = @AWK@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DOXYGEN = @DOXYGEN@
-DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
-DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-ECHO = @ECHO@
-EXEEXT = @EXEEXT@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@
-KDE_HAVE_DOT = @KDE_HAVE_DOT@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LEX = @LEX@
-LEXLIB = @LEXLIB@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_QTOPIA = @LIB_QTOPIA@
-LIB_SMB = @LIB_SMB@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LN_S = @LN_S@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QTDOCDIR = @QTDOCDIR@
-QTE_NORTTI = @QTE_NORTTI@
-QTOPIA_INCLUDES = @QTOPIA_INCLUDES@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RC = @RC@
-REPO = @REPO@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-am__include = @am__include@
-am__quote = @am__quote@
-idldir = @idldir@
-install_sh = @install_sh@
-jni_includes = @jni_includes@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-bin_PROGRAMS = qgis
-
-qgis_SOURCES = qgsrect.cpp qgsrasterlayer.cpp qgspoint.cpp qgsnewconnectionbase.ui qgsnewconnection.cpp qgsmaplayer.cpp qgsmapcanvas.cpp qgsdbsourceselectbase.ui qgsdbsourceselect.cpp qgsdatasource.cpp qgsdatabaselayer.cpp qgsdatabase.cpp qgscoordinatetransform.cpp qgisappbase.ui qgisapp.cpp main.cpp 
-SOURCES = qgsrect.cpp qgsrasterlayer.cpp qgspoint.cpp qgsnewconnection.cpp qgsmaplayer.cpp qgsmapcanvas.cpp qgsdbsourceselect.cpp qgsdatasource.cpp qgsdatabaselayer.cpp qgsdatabase.cpp qgscoordinatetransform.cpp qgisapp.cpp main.cpp 
-INTERFACES = qgsnewconnectionbase.ui qgsdbsourceselectbase.ui qgisappbase.ui 
-TRANSLATIONS = 
-KDE_OPTIONS = qtonly
-qgis_LDADD = -L$(PGSQL)/lib -lpq++ $(LIB_QT) $(LIBSOCKET)
-
-SUBDIRS = docs 
-
-EXTRA_DIST = filenew.xpm filesave.xpm fileopen.xpm main.cpp qgisapp.cpp qgisapp.h qgisappbase.ui qgscoordinatetransform.cpp qgscoordinatetransform.h qgsdatabase.cpp qgsdatabaselayer.cpp qgsdatabaselayer.h qgsdatasource.cpp qgsdatasource.h qgsdbsourceselect.cpp qgsdbsourceselectbase.ui qgsdbsourceselect.h qgslinesymbol.h qgsmapcanvas.cpp qgsmapcanvas.h qgsmaplayer.cpp qgsmaplayer.h qgsmarkersymbol.h qgsnewconnection.cpp qgsnewconnection.h qgsnewconnectionbase.ui qgspoint.cpp qgspoint.h qgspolygonsymbol.h qgsrasterlayer.cpp qgsrasterlayer.h qgsrect.cpp qgsrect.h qgsshapefilelayer.h qgssymbol.h qgstable.h 
-
-####### kdevelop will overwrite this part!!! (end)############
-
-# set the include path for X, qt and KDE
-INCLUDES = $(all_includes)
-
-qgis_METASOURCES = AUTO
-
-# the library search path. 
-qgis_LDFLAGS = $(all_libraries) 
-
-# them while "make clean", use CLEANFILES
-DISTCLEANFILES = $(qgis_METASOURCES)
-subdir = qgis
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-bin_PROGRAMS = qgis$(EXEEXT)
-PROGRAMS = $(bin_PROGRAMS)
-
-am_qgis_OBJECTS = qgsrect.$(OBJEXT) qgsrasterlayer.$(OBJEXT) \
-	qgspoint.$(OBJEXT) qgsnewconnection.$(OBJEXT) \
-	qgsmaplayer.$(OBJEXT) qgsmapcanvas.$(OBJEXT) \
-	qgsdbsourceselect.$(OBJEXT) qgsdatasource.$(OBJEXT) \
-	qgsdatabaselayer.$(OBJEXT) qgsdatabase.$(OBJEXT) \
-	qgscoordinatetransform.$(OBJEXT) qgisapp.$(OBJEXT) \
-	main.$(OBJEXT)
-qgis_OBJECTS = $(am_qgis_OBJECTS)
-qgis_DEPENDENCIES =
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/main.Po $(DEPDIR)/qgisapp.Po \
-@AMDEP_TRUE@	$(DEPDIR)/qgscoordinatetransform.Po \
-@AMDEP_TRUE@	$(DEPDIR)/qgsdatabase.Po \
-@AMDEP_TRUE@	$(DEPDIR)/qgsdatabaselayer.Po \
-@AMDEP_TRUE@	$(DEPDIR)/qgsdatasource.Po \
-@AMDEP_TRUE@	$(DEPDIR)/qgsdbsourceselect.Po \
-@AMDEP_TRUE@	$(DEPDIR)/qgsmapcanvas.Po $(DEPDIR)/qgsmaplayer.Po \
-@AMDEP_TRUE@	$(DEPDIR)/qgsnewconnection.Po $(DEPDIR)/qgspoint.Po \
-@AMDEP_TRUE@	$(DEPDIR)/qgsrasterlayer.Po $(DEPDIR)/qgsrect.Po
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-CXXFLAGS = @CXXFLAGS@
-DIST_SOURCES = $(qgis_SOURCES)
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
-	uninstall-info-recursive all-recursive install-data-recursive \
-	install-exec-recursive installdirs-recursive install-recursive \
-	uninstall-recursive check-recursive installcheck-recursive
-DIST_COMMON = Makefile.am Makefile.in
-DIST_SUBDIRS = $(SUBDIRS)
-SOURCES = qgsrect.cpp qgsrasterlayer.cpp qgspoint.cpp qgsnewconnection.cpp qgsmaplayer.cpp qgsmapcanvas.cpp qgsdbsourceselect.cpp qgsdatasource.cpp qgsdatabaselayer.cpp qgsdatabase.cpp qgscoordinatetransform.cpp qgisapp.cpp main.cpp 
-
-all: all-recursive
-
-.SUFFIXES:
-.SUFFIXES: .cpp .lo .o .obj
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  qgis/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && \
-	  CONFIG_HEADERS= CONFIG_LINKS= \
-	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \
-	  else :; fi; \
-	done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
-	  rm -f $(DESTDIR)$(bindir)/$$f; \
-	done
-
-clean-binPROGRAMS:
-	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-qgis$(EXEEXT): $(qgis_OBJECTS) $(qgis_DEPENDENCIES) 
-	@rm -f qgis$(EXEEXT)
-	$(CXXLINK) $(qgis_LDFLAGS) $(qgis_OBJECTS) $(qgis_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/qgisapp.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/qgscoordinatetransform.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/qgsdatabase.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/qgsdatabaselayer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/qgsdatasource.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/qgsdbsourceselect.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/qgsmapcanvas.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/qgsmaplayer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/qgsnewconnection.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/qgspoint.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/qgsrasterlayer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/qgsrect.Po@am__quote@
-
-distclean-depend:
-	-rm -rf $(DEPDIR)
-
-.cpp.o:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(CXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
-
-.cpp.obj:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(CXXCOMPILE) -c -o $@ `cygpath -w $<`
-
-.cpp.lo:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(LTCXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
-CXXDEPMODE = @CXXDEPMODE@
-uninstall-info-am:
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique $(LISP)
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || etags $(ETAGS_ARGS) $$tags  $$unique $(LISP)
-
-GTAGS:
-	here=`CDPATH=: && cd $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    $(mkinstalldirs) "$(distdir)/$$dir"; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pR $$d/$$file $(distdir) \
-	    || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	for subdir in $(SUBDIRS); do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    (cd $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile $(PROGRAMS)
-installdirs: installdirs-recursive
-installdirs-am:
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
-
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-
-distclean-am: clean-am distclean-compile distclean-depend \
-	distclean-generic distclean-libtool distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-exec-am: install-binPROGRAMS
-
-install-info: install-info-recursive
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
-	clean-binPROGRAMS clean-generic clean-libtool clean-recursive \
-	distclean distclean-compile distclean-depend distclean-generic \
-	distclean-libtool distclean-recursive distclean-tags distdir \
-	dvi dvi-am dvi-recursive info info-am info-recursive install \
-	install-am install-binPROGRAMS install-data install-data-am \
-	install-data-recursive install-exec install-exec-am \
-	install-exec-recursive install-info install-info-am \
-	install-info-recursive install-man install-recursive \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am installdirs-recursive maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-recursive tags tags-recursive uninstall \
-	uninstall-am uninstall-binPROGRAMS uninstall-info-am \
-	uninstall-info-recursive uninstall-recursive
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/docs/Makefile b/docs/Makefile
deleted file mode 100644
index 58d0584ff97..00000000000
--- a/docs/Makefile
+++ /dev/null
@@ -1,484 +0,0 @@
-# Makefile.in generated automatically by automake 1.5 from Makefile.am.
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-####### kdevelop will overwrite this part!!! (begin)##########
-
-SHELL = /bin/sh
-
-srcdir = .
-top_srcdir = ../..
-
-prefix = /usr/local
-exec_prefix = ${prefix}
-
-bindir = ${exec_prefix}/bin
-sbindir = ${exec_prefix}/sbin
-libexecdir = ${exec_prefix}/libexec
-datadir = ${prefix}/share
-sysconfdir = ${prefix}/etc
-sharedstatedir = ${prefix}/com
-localstatedir = ${prefix}/var
-libdir = ${exec_prefix}/lib
-infodir = ${prefix}/info
-mandir = ${prefix}/man
-includedir = ${prefix}/include
-oldincludedir = /usr/include
-pkgdatadir = $(datadir)/qgis
-pkglibdir = $(libdir)/qgis
-pkgincludedir = $(includedir)/qgis
-top_builddir = ../..
-
-ACLOCAL = ${SHELL} /home/sherman/development/qgis/admin/missing --run aclocal
-AUTOCONF = ${SHELL} /home/sherman/development/qgis/admin/missing --run autoconf
-AUTOMAKE = ${SHELL} /home/sherman/development/qgis/admin/missing --run automake
-AUTOHEADER = ${SHELL} /home/sherman/development/qgis/admin/missing --run autoheader
-
-INSTALL = /usr/bin/install -c -p
-INSTALL_PROGRAM = ${INSTALL} $(INSTALL_STRIP_FLAG)
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = s,x,x,
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = 
-build_triplet = i686-pc-linux-gnu
-host_alias = 
-host_triplet = i686-pc-linux-gnu
-target_alias = 
-target_triplet = i686-pc-linux-gnu
-AMTAR = ${SHELL} /home/sherman/development/qgis/admin/missing --run tar
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-AWK = gawk
-CC = gcc
-CONF_FILES = @CONF_FILES@
-CPP = gcc -E
-CXX = g++
-CXXCPP = g++ -E
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEPDIR = .deps
-DLLTOOL = @DLLTOOL@
-DOXYGEN = @DOXYGEN@
-DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
-DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-ECHO = echo
-EXEEXT = 
-FRAMEWORK_COREAUDIO = 
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = /usr/bin/msgfmt
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@
-KDE_HAVE_DOT = @KDE_HAVE_DOT@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = 
-KDE_MT_LIBS = -lpthread
-KDE_PLUGIN = -avoid-version -module -no-undefined $(KDE_RPATH) $(KDE_MT_LDFLAGS)
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = #
-KDE_USE_CLOSURE_TRUE = 
-KDE_USE_FINAL_FALSE = 
-KDE_USE_FINAL_TRUE = #
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LEX = @LEX@
-LEXLIB = @LEXLIB@
-LIBCOMPAT = 
-LIBCRYPT = -lcrypt
-LIBDL = -ldl
-LIBGEN = @LIBGEN@
-LIBJPEG = -ljpeg
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = -lpng -lz -lm
-LIBPTHREAD = -lpthread
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = -lresolv
-LIBSHADOW = @LIBSHADOW@
-LIBSM = -lSM -lICE
-LIBSOCKET =  -lresolv
-LIBTIFF = @LIBTIFF@
-LIBTOOL = $(SHELL) $(top_builddir)/libtool --silent
-LIBUCB = 
-LIBUTIL = -lutil
-LIBXINERAMA = 
-LIBZ = -lz
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_POLL = 
-LIB_QPE = 
-LIB_QT = -lqt-mt  $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread
-LIB_QTOPIA = @LIB_QTOPIA@
-LIB_SMB = @LIB_SMB@
-LIB_X11 = -lX11 $(LIBSOCKET)
-LIB_XEXT = -lXext
-LN_S = ln -s
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = /opt/qt3.0.5/bin/moc
-MSGFMT = /usr/bin/msgfmt
-NOOPT_CFLAGS = -O0
-NOOPT_CXXFLAGS = -O0
-NOREPO = -fno-repo
-OBJDUMP = @OBJDUMP@
-OBJEXT = o
-PACKAGE = qgis
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QTDOCDIR = @QTDOCDIR@
-QTE_NORTTI = 
-QTOPIA_INCLUDES = @QTOPIA_INCLUDES@
-QT_INCLUDES = -I/opt/qt3.0.5/include
-QT_LDFLAGS = -L/opt/qt3.0.5/lib
-RANLIB = ranlib
-RC = @RC@
-REPO = -frepo
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = strip
-TOPSUBDIRS =  autom4te.cache qgis
-UIC = /opt/qt3.0.5/bin/uic -L $(kde_widgetdir) -nounload
-UIC_TR = tr2i18n
-USER_INCLUDES = 
-USER_LDFLAGS = 
-USE_EXCEPTIONS = -fexceptions
-USE_RTTI = 
-USE_THREADS = 
-VERSION = 0.0.2
-WOVERLOADED_VIRTUAL = 
-XGETTEXT = /usr/bin/xgettext
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS =  -lresolv
-X_INCLUDES = -I/usr/X11R6/include
-X_LDFLAGS = -L/usr/X11R6/lib
-X_PRE_LIBS = 
-all_includes = -I/opt/qt3.0.5/include -I/usr/X11R6/include
-all_libraries = -L/usr/X11R6/lib -L/opt/qt3.0.5/lib
-am__include = include
-am__quote = 
-idldir = @idldir@
-install_sh = /home/sherman/development/qgis/admin/install-sh
-jni_includes = @jni_includes@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = 3
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-micodir = @micodir@
-qt_includes = /opt/qt3.0.5/include
-qt_libraries = /opt/qt3.0.5/lib
-x_includes = /usr/X11R6/include
-x_libraries = /usr/X11R6/lib
-
-SUBDIRS = en 
-subdir = qgis/docs
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
-	uninstall-info-recursive all-recursive install-data-recursive \
-	install-exec-recursive installdirs-recursive install-recursive \
-	uninstall-recursive check-recursive installcheck-recursive
-DIST_COMMON = Makefile.am Makefile.in
-DIST_SUBDIRS = $(SUBDIRS)
-all: all-recursive
-
-.SUFFIXES:
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  qgis/docs/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && \
-	  CONFIG_HEADERS= CONFIG_LINKS= \
-	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
-uninstall-info-am:
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique $(LISP)
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || etags $(ETAGS_ARGS) $$tags  $$unique $(LISP)
-
-GTAGS:
-	here=`CDPATH=: && cd $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    $(mkinstalldirs) "$(distdir)/$$dir"; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pR $$d/$$file $(distdir) \
-	    || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	for subdir in $(SUBDIRS); do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    (cd $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile
-installdirs: installdirs-recursive
-installdirs-am:
-
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-recursive
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-uninstall-am: uninstall-info-am
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
-	clean-generic clean-libtool clean-recursive distclean \
-	distclean-generic distclean-libtool distclean-recursive \
-	distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
-	info-recursive install install-am install-data install-data-am \
-	install-data-recursive install-exec install-exec-am \
-	install-exec-recursive install-info install-info-am \
-	install-info-recursive install-man install-recursive \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am installdirs-recursive maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-	tags tags-recursive uninstall uninstall-am uninstall-info-am \
-	uninstall-info-recursive uninstall-recursive
-
-
-####### kdevelop will overwrite this part!!! (end)############
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/docs/Makefile.am b/docs/Makefile.am
deleted file mode 100644
index 550ae5139c6..00000000000
--- a/docs/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-####### kdevelop will overwrite this part!!! (begin)##########
-
-SUBDIRS = en 
-
-####### kdevelop will overwrite this part!!! (end)############
diff --git a/docs/Makefile.in b/docs/Makefile.in
deleted file mode 100644
index aab983cebd9..00000000000
--- a/docs/Makefile.in
+++ /dev/null
@@ -1,484 +0,0 @@
-# Makefile.in generated automatically by automake 1.5 from Makefile.am.
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-####### kdevelop will overwrite this part!!! (begin)##########
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-AMTAR = @AMTAR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-AWK = @AWK@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DOXYGEN = @DOXYGEN@
-DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
-DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-ECHO = @ECHO@
-EXEEXT = @EXEEXT@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@
-KDE_HAVE_DOT = @KDE_HAVE_DOT@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LEX = @LEX@
-LEXLIB = @LEXLIB@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_QTOPIA = @LIB_QTOPIA@
-LIB_SMB = @LIB_SMB@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LN_S = @LN_S@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QTDOCDIR = @QTDOCDIR@
-QTE_NORTTI = @QTE_NORTTI@
-QTOPIA_INCLUDES = @QTOPIA_INCLUDES@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RC = @RC@
-REPO = @REPO@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-am__include = @am__include@
-am__quote = @am__quote@
-idldir = @idldir@
-install_sh = @install_sh@
-jni_includes = @jni_includes@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-SUBDIRS = en 
-subdir = qgis/docs
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
-	uninstall-info-recursive all-recursive install-data-recursive \
-	install-exec-recursive installdirs-recursive install-recursive \
-	uninstall-recursive check-recursive installcheck-recursive
-DIST_COMMON = Makefile.am Makefile.in
-DIST_SUBDIRS = $(SUBDIRS)
-all: all-recursive
-
-.SUFFIXES:
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  qgis/docs/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && \
-	  CONFIG_HEADERS= CONFIG_LINKS= \
-	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
-uninstall-info-am:
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique $(LISP)
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || etags $(ETAGS_ARGS) $$tags  $$unique $(LISP)
-
-GTAGS:
-	here=`CDPATH=: && cd $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    $(mkinstalldirs) "$(distdir)/$$dir"; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pR $$d/$$file $(distdir) \
-	    || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	for subdir in $(SUBDIRS); do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    (cd $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile
-installdirs: installdirs-recursive
-installdirs-am:
-
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-recursive
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-uninstall-am: uninstall-info-am
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
-	clean-generic clean-libtool clean-recursive distclean \
-	distclean-generic distclean-libtool distclean-recursive \
-	distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
-	info-recursive install install-am install-data install-data-am \
-	install-data-recursive install-exec install-exec-am \
-	install-exec-recursive install-info install-info-am \
-	install-info-recursive install-man install-recursive \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am installdirs-recursive maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-	tags tags-recursive uninstall uninstall-am uninstall-info-am \
-	uninstall-info-recursive uninstall-recursive
-
-
-####### kdevelop will overwrite this part!!! (end)############
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/docs/en/Makefile b/docs/en/Makefile
deleted file mode 100644
index 4594a7c4b28..00000000000
--- a/docs/en/Makefile
+++ /dev/null
@@ -1,393 +0,0 @@
-# Makefile.in generated automatically by automake 1.5 from Makefile.am.
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-####### kdevelop will overwrite this part!!! (begin)##########
-
-SHELL = /bin/sh
-
-srcdir = .
-top_srcdir = ../../..
-
-prefix = /usr/local
-exec_prefix = ${prefix}
-
-bindir = ${exec_prefix}/bin
-sbindir = ${exec_prefix}/sbin
-libexecdir = ${exec_prefix}/libexec
-datadir = ${prefix}/share
-sysconfdir = ${prefix}/etc
-sharedstatedir = ${prefix}/com
-localstatedir = ${prefix}/var
-libdir = ${exec_prefix}/lib
-infodir = ${prefix}/info
-mandir = ${prefix}/man
-includedir = ${prefix}/include
-oldincludedir = /usr/include
-pkgdatadir = $(datadir)/qgis
-pkglibdir = $(libdir)/qgis
-pkgincludedir = $(includedir)/qgis
-top_builddir = ../../..
-
-ACLOCAL = ${SHELL} /home/sherman/development/qgis/admin/missing --run aclocal
-AUTOCONF = ${SHELL} /home/sherman/development/qgis/admin/missing --run autoconf
-AUTOMAKE = ${SHELL} /home/sherman/development/qgis/admin/missing --run automake
-AUTOHEADER = ${SHELL} /home/sherman/development/qgis/admin/missing --run autoheader
-
-INSTALL = /usr/bin/install -c -p
-INSTALL_PROGRAM = ${INSTALL} $(INSTALL_STRIP_FLAG)
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = s,x,x,
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = 
-build_triplet = i686-pc-linux-gnu
-host_alias = 
-host_triplet = i686-pc-linux-gnu
-target_alias = 
-target_triplet = i686-pc-linux-gnu
-AMTAR = ${SHELL} /home/sherman/development/qgis/admin/missing --run tar
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-AWK = gawk
-CC = gcc
-CONF_FILES = @CONF_FILES@
-CPP = gcc -E
-CXX = g++
-CXXCPP = g++ -E
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEPDIR = .deps
-DLLTOOL = @DLLTOOL@
-DOXYGEN = @DOXYGEN@
-DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
-DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-ECHO = echo
-EXEEXT = 
-FRAMEWORK_COREAUDIO = 
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = /usr/bin/msgfmt
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@
-KDE_HAVE_DOT = @KDE_HAVE_DOT@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = 
-KDE_MT_LIBS = -lpthread
-KDE_PLUGIN = -avoid-version -module -no-undefined $(KDE_RPATH) $(KDE_MT_LDFLAGS)
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = #
-KDE_USE_CLOSURE_TRUE = 
-KDE_USE_FINAL_FALSE = 
-KDE_USE_FINAL_TRUE = #
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LEX = @LEX@
-LEXLIB = @LEXLIB@
-LIBCOMPAT = 
-LIBCRYPT = -lcrypt
-LIBDL = -ldl
-LIBGEN = @LIBGEN@
-LIBJPEG = -ljpeg
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = -lpng -lz -lm
-LIBPTHREAD = -lpthread
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = -lresolv
-LIBSHADOW = @LIBSHADOW@
-LIBSM = -lSM -lICE
-LIBSOCKET =  -lresolv
-LIBTIFF = @LIBTIFF@
-LIBTOOL = $(SHELL) $(top_builddir)/libtool --silent
-LIBUCB = 
-LIBUTIL = -lutil
-LIBXINERAMA = 
-LIBZ = -lz
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_POLL = 
-LIB_QPE = 
-LIB_QT = -lqt-mt  $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread
-LIB_QTOPIA = @LIB_QTOPIA@
-LIB_SMB = @LIB_SMB@
-LIB_X11 = -lX11 $(LIBSOCKET)
-LIB_XEXT = -lXext
-LN_S = ln -s
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = /opt/qt3.0.5/bin/moc
-MSGFMT = /usr/bin/msgfmt
-NOOPT_CFLAGS = -O0
-NOOPT_CXXFLAGS = -O0
-NOREPO = -fno-repo
-OBJDUMP = @OBJDUMP@
-OBJEXT = o
-PACKAGE = qgis
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QTDOCDIR = @QTDOCDIR@
-QTE_NORTTI = 
-QTOPIA_INCLUDES = @QTOPIA_INCLUDES@
-QT_INCLUDES = -I/opt/qt3.0.5/include
-QT_LDFLAGS = -L/opt/qt3.0.5/lib
-RANLIB = ranlib
-RC = @RC@
-REPO = -frepo
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = strip
-TOPSUBDIRS =  autom4te.cache qgis
-UIC = /opt/qt3.0.5/bin/uic -L $(kde_widgetdir) -nounload
-UIC_TR = tr2i18n
-USER_INCLUDES = 
-USER_LDFLAGS = 
-USE_EXCEPTIONS = -fexceptions
-USE_RTTI = 
-USE_THREADS = 
-VERSION = 0.0.2
-WOVERLOADED_VIRTUAL = 
-XGETTEXT = /usr/bin/xgettext
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS =  -lresolv
-X_INCLUDES = -I/usr/X11R6/include
-X_LDFLAGS = -L/usr/X11R6/lib
-X_PRE_LIBS = 
-all_includes = -I/opt/qt3.0.5/include -I/usr/X11R6/include
-all_libraries = -L/usr/X11R6/lib -L/opt/qt3.0.5/lib
-am__include = include
-am__quote = 
-idldir = @idldir@
-install_sh = /home/sherman/development/qgis/admin/install-sh
-jni_includes = @jni_includes@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = 3
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-micodir = @micodir@
-qt_includes = /opt/qt3.0.5/include
-qt_libraries = /opt/qt3.0.5/lib
-x_includes = /usr/X11R6/include
-x_libraries = /usr/X11R6/lib
-
-EXTRA_DIST = index.html index-1.html index-2.html index-3.html index-4.html index-5.html index-6.html 
-subdir = qgis/docs/en
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in
-all: all-am
-
-.SUFFIXES:
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  qgis/docs/en/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && \
-	  CONFIG_HEADERS= CONFIG_LINKS= \
-	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
-uninstall-info-am:
-tags: TAGS
-TAGS:
-
-
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    $(mkinstalldirs) "$(distdir)/$$dir"; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pR $$d/$$file $(distdir) \
-	    || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-
-installdirs:
-
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-generic distclean-libtool
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-data-local
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-uninstall-am: uninstall-info-am uninstall-local
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am info info-am install install-am install-data \
-	install-data-am install-data-local install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool uninstall uninstall-am uninstall-info-am \
-	uninstall-local
-
-
-install-data-local:
-	$(mkinstalldirs) $(prefix)/doc/qgis/
-	$(INSTALL_DATA) $(srcdir)/index.html $(prefix)/doc/qgis/index.html
-	$(mkinstalldirs) $(prefix)/doc/qgis/
-	$(INSTALL_DATA) $(srcdir)/index-1.html $(prefix)/doc/qgis/index-1.html
-	$(mkinstalldirs) $(prefix)/doc/qgis/
-	$(INSTALL_DATA) $(srcdir)/index-2.html $(prefix)/doc/qgis/index-2.html
-	$(mkinstalldirs) $(prefix)/doc/qgis/
-	$(INSTALL_DATA) $(srcdir)/index-3.html $(prefix)/doc/qgis/index-3.html
-	$(mkinstalldirs) $(prefix)/doc/qgis/
-	$(INSTALL_DATA) $(srcdir)/index-4.html $(prefix)/doc/qgis/index-4.html
-	$(mkinstalldirs) $(prefix)/doc/qgis/
-	$(INSTALL_DATA) $(srcdir)/index-5.html $(prefix)/doc/qgis/index-5.html
-	$(mkinstalldirs) $(prefix)/doc/qgis/
-	$(INSTALL_DATA) $(srcdir)/index-6.html $(prefix)/doc/qgis/index-6.html
-
-uninstall-local:
-	-rm -f $(prefix)/doc/qgis/index.html
-	-rm -f $(prefix)/doc/qgis/index-1.html
-	-rm -f $(prefix)/doc/qgis/index-2.html
-	-rm -f $(prefix)/doc/qgis/index-3.html
-	-rm -f $(prefix)/doc/qgis/index-4.html
-	-rm -f $(prefix)/doc/qgis/index-5.html
-	-rm -f $(prefix)/doc/qgis/index-6.html
-
-####### kdevelop will overwrite this part!!! (end)############
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/docs/en/Makefile.am b/docs/en/Makefile.am
deleted file mode 100644
index 50e3d6b9f2f..00000000000
--- a/docs/en/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-####### kdevelop will overwrite this part!!! (begin)##########
-
-
-EXTRA_DIST = index.html index-1.html index-2.html index-3.html index-4.html index-5.html index-6.html 
-
-install-data-local:
-	$(mkinstalldirs) $(prefix)/doc/qgis/
-	$(INSTALL_DATA) $(srcdir)/index.html $(prefix)/doc/qgis/index.html
-	$(mkinstalldirs) $(prefix)/doc/qgis/
-	$(INSTALL_DATA) $(srcdir)/index-1.html $(prefix)/doc/qgis/index-1.html
-	$(mkinstalldirs) $(prefix)/doc/qgis/
-	$(INSTALL_DATA) $(srcdir)/index-2.html $(prefix)/doc/qgis/index-2.html
-	$(mkinstalldirs) $(prefix)/doc/qgis/
-	$(INSTALL_DATA) $(srcdir)/index-3.html $(prefix)/doc/qgis/index-3.html
-	$(mkinstalldirs) $(prefix)/doc/qgis/
-	$(INSTALL_DATA) $(srcdir)/index-4.html $(prefix)/doc/qgis/index-4.html
-	$(mkinstalldirs) $(prefix)/doc/qgis/
-	$(INSTALL_DATA) $(srcdir)/index-5.html $(prefix)/doc/qgis/index-5.html
-	$(mkinstalldirs) $(prefix)/doc/qgis/
-	$(INSTALL_DATA) $(srcdir)/index-6.html $(prefix)/doc/qgis/index-6.html
-
-uninstall-local:
-	-rm -f $(prefix)/doc/qgis/index.html
-	-rm -f $(prefix)/doc/qgis/index-1.html
-	-rm -f $(prefix)/doc/qgis/index-2.html
-	-rm -f $(prefix)/doc/qgis/index-3.html
-	-rm -f $(prefix)/doc/qgis/index-4.html
-	-rm -f $(prefix)/doc/qgis/index-5.html
-	-rm -f $(prefix)/doc/qgis/index-6.html
-
-####### kdevelop will overwrite this part!!! (end)############
diff --git a/docs/en/Makefile.in b/docs/en/Makefile.in
deleted file mode 100644
index 99d207dd650..00000000000
--- a/docs/en/Makefile.in
+++ /dev/null
@@ -1,393 +0,0 @@
-# Makefile.in generated automatically by automake 1.5 from Makefile.am.
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-####### kdevelop will overwrite this part!!! (begin)##########
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-AMTAR = @AMTAR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-AWK = @AWK@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DOXYGEN = @DOXYGEN@
-DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
-DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-ECHO = @ECHO@
-EXEEXT = @EXEEXT@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@
-KDE_HAVE_DOT = @KDE_HAVE_DOT@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LEX = @LEX@
-LEXLIB = @LEXLIB@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_QTOPIA = @LIB_QTOPIA@
-LIB_SMB = @LIB_SMB@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LN_S = @LN_S@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QTDOCDIR = @QTDOCDIR@
-QTE_NORTTI = @QTE_NORTTI@
-QTOPIA_INCLUDES = @QTOPIA_INCLUDES@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RC = @RC@
-REPO = @REPO@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-am__include = @am__include@
-am__quote = @am__quote@
-idldir = @idldir@
-install_sh = @install_sh@
-jni_includes = @jni_includes@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-EXTRA_DIST = index.html index-1.html index-2.html index-3.html index-4.html index-5.html index-6.html 
-subdir = qgis/docs/en
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in
-all: all-am
-
-.SUFFIXES:
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  qgis/docs/en/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && \
-	  CONFIG_HEADERS= CONFIG_LINKS= \
-	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
-uninstall-info-am:
-tags: TAGS
-TAGS:
-
-
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    $(mkinstalldirs) "$(distdir)/$$dir"; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pR $$d/$$file $(distdir) \
-	    || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-
-installdirs:
-
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-generic distclean-libtool
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-data-local
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-uninstall-am: uninstall-info-am uninstall-local
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am info info-am install install-am install-data \
-	install-data-am install-data-local install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool uninstall uninstall-am uninstall-info-am \
-	uninstall-local
-
-
-install-data-local:
-	$(mkinstalldirs) $(prefix)/doc/qgis/
-	$(INSTALL_DATA) $(srcdir)/index.html $(prefix)/doc/qgis/index.html
-	$(mkinstalldirs) $(prefix)/doc/qgis/
-	$(INSTALL_DATA) $(srcdir)/index-1.html $(prefix)/doc/qgis/index-1.html
-	$(mkinstalldirs) $(prefix)/doc/qgis/
-	$(INSTALL_DATA) $(srcdir)/index-2.html $(prefix)/doc/qgis/index-2.html
-	$(mkinstalldirs) $(prefix)/doc/qgis/
-	$(INSTALL_DATA) $(srcdir)/index-3.html $(prefix)/doc/qgis/index-3.html
-	$(mkinstalldirs) $(prefix)/doc/qgis/
-	$(INSTALL_DATA) $(srcdir)/index-4.html $(prefix)/doc/qgis/index-4.html
-	$(mkinstalldirs) $(prefix)/doc/qgis/
-	$(INSTALL_DATA) $(srcdir)/index-5.html $(prefix)/doc/qgis/index-5.html
-	$(mkinstalldirs) $(prefix)/doc/qgis/
-	$(INSTALL_DATA) $(srcdir)/index-6.html $(prefix)/doc/qgis/index-6.html
-
-uninstall-local:
-	-rm -f $(prefix)/doc/qgis/index.html
-	-rm -f $(prefix)/doc/qgis/index-1.html
-	-rm -f $(prefix)/doc/qgis/index-2.html
-	-rm -f $(prefix)/doc/qgis/index-3.html
-	-rm -f $(prefix)/doc/qgis/index-4.html
-	-rm -f $(prefix)/doc/qgis/index-5.html
-	-rm -f $(prefix)/doc/qgis/index-6.html
-
-####### kdevelop will overwrite this part!!! (end)############
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/docs/en/index-1.html b/docs/en/index-1.html
deleted file mode 100644
index 4b51db1f6f8..00000000000
--- a/docs/en/index-1.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<HTML>
-<HEAD>
- <META NAME="GENERATOR" CONTENT="LinuxDoc-Tools 0.9.16">
- <TITLE>The Qgis Handbook: Introduction</TITLE>
- <LINK HREF="index-2.html" REL=next>
-
- <LINK HREF="index.html#toc1" REL=contents>
-</HEAD>
-<BODY>
-<A HREF="index-2.html">Next</A>
-Previous
-<A HREF="index.html#toc1">Contents</A>
-<HR>
-<H2><A NAME="s1">1.</A> <A HREF="index.html#toc1">Introduction</A></H2>
-
-
-<H2><A NAME="ss1.1">1.1</A> <A HREF="index.html#toc1.1">Changes</A>
-</H2>
-
-
-
-<HR>
-<A HREF="index-2.html">Next</A>
-Previous
-<A HREF="index.html#toc1">Contents</A>
-</BODY>
-</HTML>
diff --git a/docs/en/index-2.html b/docs/en/index-2.html
deleted file mode 100644
index 0bb2c0b12d3..00000000000
--- a/docs/en/index-2.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<HTML>
-<HEAD>
- <META NAME="GENERATOR" CONTENT="LinuxDoc-Tools 0.9.16">
- <TITLE>The Qgis Handbook: Installation</TITLE>
- <LINK HREF="index-3.html" REL=next>
- <LINK HREF="index-1.html" REL=previous>
- <LINK HREF="index.html#toc2" REL=contents>
-</HEAD>
-<BODY>
-<A HREF="index-3.html">Next</A>
-<A HREF="index-1.html">Previous</A>
-<A HREF="index.html#toc2">Contents</A>
-<HR>
-<H2><A NAME="s2">2.</A> <A HREF="index.html#toc2">Installation</A></H2>
-
-
-<H2><A NAME="ss2.1">2.1</A> <A HREF="index.html#toc2.1">How to obtain Qgis </A>
-</H2>
-
-
-
-<H2><A NAME="ss2.2">2.2</A> <A HREF="index.html#toc2.2">Requirements</A>
-</H2>
-
-
-
-<H2><A NAME="ss2.3">2.3</A> <A HREF="index.html#toc2.3">Compilation and installation</A>
-</H2>
-
-
-<P>In order to compile and install Qgis on your system, type the following in
-the base directory of the Qgis distribution:</P>
-<P>
-<BLOCKQUOTE><CODE>
-<PRE>
-% ./configure
-% make
-% make install
-</PRE>
-</CODE></BLOCKQUOTE>
-</P>
-
-<P>Since Qgis uses 
-<PRE>
-autoconf
-</PRE>
- you should have not trouble
-compiling it.
-Should you run into problems please report them to the the author at 
-<A HREF="mailto:sherman at mrcc dot com">Gary E.Sherman</A></P>
-
-
-
-<HR>
-<A HREF="index-3.html">Next</A>
-<A HREF="index-1.html">Previous</A>
-<A HREF="index.html#toc2">Contents</A>
-</BODY>
-</HTML>
diff --git a/docs/en/index-3.html b/docs/en/index-3.html
deleted file mode 100644
index 6c676845ad8..00000000000
--- a/docs/en/index-3.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<HTML>
-<HEAD>
- <META NAME="GENERATOR" CONTENT="LinuxDoc-Tools 0.9.16">
- <TITLE>The Qgis Handbook: Usage </TITLE>
- <LINK HREF="index-4.html" REL=next>
- <LINK HREF="index-2.html" REL=previous>
- <LINK HREF="index.html#toc3" REL=contents>
-</HEAD>
-<BODY>
-<A HREF="index-4.html">Next</A>
-<A HREF="index-2.html">Previous</A>
-<A HREF="index.html#toc3">Contents</A>
-<HR>
-<H2><A NAME="s3">3.</A> <A HREF="index.html#toc3">Usage </A></H2>
-
-
-<H2><A NAME="ss3.1">3.1</A> <A HREF="index.html#toc3.1">General Usage</A>
-</H2>
-
-
-<HR>
-<A HREF="index-4.html">Next</A>
-<A HREF="index-2.html">Previous</A>
-<A HREF="index.html#toc3">Contents</A>
-</BODY>
-</HTML>
diff --git a/docs/en/index-4.html b/docs/en/index-4.html
deleted file mode 100644
index 7e17a5719cb..00000000000
--- a/docs/en/index-4.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<HTML>
-<HEAD>
- <META NAME="GENERATOR" CONTENT="LinuxDoc-Tools 0.9.16">
- <TITLE>The Qgis Handbook: Another Section</TITLE>
- <LINK HREF="index-5.html" REL=next>
- <LINK HREF="index-3.html" REL=previous>
- <LINK HREF="index.html#toc4" REL=contents>
-</HEAD>
-<BODY>
-<A HREF="index-5.html">Next</A>
-<A HREF="index-3.html">Previous</A>
-<A HREF="index.html#toc4">Contents</A>
-<HR>
-<H2><A NAME="s4">4.</A> <A HREF="index.html#toc4">Another Section</A></H2>
-
-
-
-<HR>
-<A HREF="index-5.html">Next</A>
-<A HREF="index-3.html">Previous</A>
-<A HREF="index.html#toc4">Contents</A>
-</BODY>
-</HTML>
diff --git a/docs/en/index-5.html b/docs/en/index-5.html
deleted file mode 100644
index 51a00b167fd..00000000000
--- a/docs/en/index-5.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<HTML>
-<HEAD>
- <META NAME="GENERATOR" CONTENT="LinuxDoc-Tools 0.9.16">
- <TITLE>The Qgis Handbook: Questions and Answers</TITLE>
- <LINK HREF="index-6.html" REL=next>
- <LINK HREF="index-4.html" REL=previous>
- <LINK HREF="index.html#toc5" REL=contents>
-</HEAD>
-<BODY>
-<A HREF="index-6.html">Next</A>
-<A HREF="index-4.html">Previous</A>
-<A HREF="index.html#toc5">Contents</A>
-<HR>
-<H2><A NAME="s5">5.</A> <A HREF="index.html#toc5">Questions and Answers</A></H2>
-
-
-
-<HR>
-<A HREF="index-6.html">Next</A>
-<A HREF="index-4.html">Previous</A>
-<A HREF="index.html#toc5">Contents</A>
-</BODY>
-</HTML>
diff --git a/docs/en/index-6.html b/docs/en/index-6.html
deleted file mode 100644
index f43ca0130a7..00000000000
--- a/docs/en/index-6.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<HTML>
-<HEAD>
- <META NAME="GENERATOR" CONTENT="LinuxDoc-Tools 0.9.16">
- <TITLE>The Qgis Handbook: Copyright</TITLE>
- <LINK HREF="index-5.html" REL=previous>
- <LINK HREF="index.html#toc6" REL=contents>
-</HEAD>
-<BODY>
-Next
-<A HREF="index-5.html">Previous</A>
-<A HREF="index.html#toc6">Contents</A>
-<HR>
-<H2><A NAME="s6">6.</A> <A HREF="index.html#toc6">Copyright</A></H2>
-
-
-<P>Qgis Copyright 2002 Gary E.Sherman , sherman at mrcc dot com</P>
-
-<P>This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.</P>
-<P>This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.</P>
-<P>You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</P>
-
-
-<HR>
-Next
-<A HREF="index-5.html">Previous</A>
-<A HREF="index.html#toc6">Contents</A>
-</BODY>
-</HTML>
diff --git a/docs/en/index.html b/docs/en/index.html
deleted file mode 100644
index b994663bc25..00000000000
--- a/docs/en/index.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<HTML>
-<HEAD>
- <META NAME="GENERATOR" CONTENT="LinuxDoc-Tools 0.9.16">
- <TITLE>The Qgis Handbook</TITLE>
- <LINK HREF="index-1.html" REL=next>
-
-
-</HEAD>
-<BODY>
-<A HREF="index-1.html">Next</A>
-Previous
-Contents
-<HR>
-<H1>The Qgis Handbook</H1>
-
-<H2>Gary E.Sherman <CODE>sherman at mrcc dot com</CODE></H2>Version 0.0.2 , Sat Jul 27 09:11:07 AKDT 2002
-<HR>
-<EM>This Handbook describes Qgis Version 0.0.2</EM>
-<HR>
-<P>
-<H2><A NAME="toc1">1.</A> <A HREF="index-1.html">Introduction</A></H2>
-
-<UL>
-<LI><A NAME="toc1.1">1.1</A> <A HREF="index-1.html#ss1.1">Changes</A>
-</UL>
-<P>
-<H2><A NAME="toc2">2.</A> <A HREF="index-2.html">Installation</A></H2>
-
-<UL>
-<LI><A NAME="toc2.1">2.1</A> <A HREF="index-2.html#ss2.1">How to obtain Qgis </A>
-<LI><A NAME="toc2.2">2.2</A> <A HREF="index-2.html#ss2.2">Requirements</A>
-<LI><A NAME="toc2.3">2.3</A> <A HREF="index-2.html#ss2.3">Compilation and installation</A>
-</UL>
-<P>
-<H2><A NAME="toc3">3.</A> <A HREF="index-3.html">Usage </A></H2>
-
-<UL>
-<LI><A NAME="toc3.1">3.1</A> <A HREF="index-3.html#ss3.1">General Usage</A>
-</UL>
-<P>
-<H2><A NAME="toc4">4.</A> <A HREF="index-4.html">Another Section</A></H2>
-
-<P>
-<H2><A NAME="toc5">5.</A> <A HREF="index-5.html">Questions and Answers</A></H2>
-
-<P>
-<H2><A NAME="toc6">6.</A> <A HREF="index-6.html">Copyright</A></H2>
-
-<HR>
-<A HREF="index-1.html">Next</A>
-Previous
-Contents
-</BODY>
-</HTML>
diff --git a/docs/en/index.sgml b/docs/en/index.sgml
deleted file mode 100644
index ba368e1f786..00000000000
--- a/docs/en/index.sgml
+++ /dev/null
@@ -1,74 +0,0 @@
-
-<!doctype linuxdoc system>
-<article>
-<title>The Qgis Handbook
-<author>Gary E.Sherman <tt>sherman at mrcc dot com</tt>
-<date>Version 0.0.2 , Sat Jul 27 09:11:07 AKDT 2002
-<abstract>
-This Handbook describes Qgis Version 0.0.2
-</abstract>
-
-<toc>
-
-<sect>Introduction
-<p>
-<sect1>Changes
-<p>
-
-<sect>Installation
-<p>
-<sect1>How to obtain Qgis 
-<p>
-
-<sect1>Requirements
-<p>
-
-<sect1>Compilation and installation
-<p>
-
-In order to compile and install Qgis on your system, type the following in
-the base directory of the Qgis distribution:
-
-<tscreen><verb>
-% ./configure
-% make
-% make install
-</verb></tscreen>
-
-<p>
-Since Qgis uses <verb>autoconf</verb> you should have not trouble
-compiling it.
-Should you run into problems please report them to the the author at 
-<htmlurl url="mailto:sherman at mrcc dot com" name = "Gary E.Sherman">
-
-
-<p>
-<sect> Usage <p>
-<sect1> General Usage
-<p>
-<sect> Another Section
-<p>
-
-<sect>Questions and Answers<p>
-
-<sect>Copyright<p>
-
-Qgis Copyright 2002 Gary E.Sherman , sherman at mrcc dot com
-
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-<p>
-</article>
diff --git a/main.cpp b/main.cpp
deleted file mode 100644
index 94ebb69adc9..00000000000
--- a/main.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/***************************************************************************
-                          main.cpp  -  description
-                             -------------------
-    begin                : Fri Jun 21 10:48:28 AKDT 2002
-    copyright            : (C) 2002 by Gary E.Sherman
-    email                : sherman@mrcc.com
-***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include <qapplication.h>
-#include <qfont.h>
-#include <qstring.h>
-#include <qtextcodec.h>
-#include <qtranslator.h>
-#include <qstyle.h>
-//#include "qgis.h"
-#include "qgisapp.h"
-
-int main(int argc, char *argv[])
-{
-
-  
-  QApplication a(argc, argv);
-  // a.setFont(QFont("helvetica", 11));
-  QTranslator tor( 0 );
-  // set the location where your .qm files are in load() below as the last parameter instead of "."
-  // for development, use "/" to use the english original as
-  // .qm files are stored in the base project directory.
-  tor.load( QString("qgis.") + QTextCodec::locale(), "." );
-  a.installTranslator( &tor );
-  /* uncomment the following line, if you want a Windows 95 look*/
-  a.setStyle("Windows");
-
-  QgisApp *qgis=new QgisApp();
-  a.setMainWidget(qgis);
-
-  qgis->show();
-  a.connect( &a, SIGNAL(lastWindowClosed()), &a, SLOT(quit()) );
-
-
-  int result = a.exec();
-
-  return result;
-}
-
-
diff --git a/qgisapp.cpp b/qgisapp.cpp
deleted file mode 100644
index 9868fe592b1..00000000000
--- a/qgisapp.cpp
+++ /dev/null
@@ -1,272 +0,0 @@
-/***************************************************************************
-                          qgisapp.cpp  -  description
-                             -------------------
-    begin                : Sat Jun 22 2002
-    copyright            : (C) 2002 by Gary E.Sherman
-    email                : sherman@mrcc.com
-***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-#include <qapplication.h>
-#include <qcanvas.h>
-#include <qcolor.h>
-#include <qscrollview.h>
-#include <qstringlist.h>
-#include <qmessagebox.h>
-#include <qstatusbar.h>
-#include <qpixmap.h>
-#include <qsplitter.h>
-#include <qrect.h>
-#include <qpoint.h>
-#include <qpainter.h>
-#include <qlayout.h>
-#include <qwmatrix.h>
-#include <qfiledialog.h>
-#include <libpq++.h>
-#include <iostream>
-#include <iomanip>
-#include "qgsrect.h"
-#include "qgsmapcanvas.h"
-#include "qgsdbsourceselect.h"
-#include "qgsdatabaselayer.h"
-
-#include "qgisapp.h"
-#include "xpm/qgis.xpm"
-
-QgisApp::QgisApp (QWidget * parent, const char *name, WFlags fl):
-  QgisAppBase (parent, name, fl)
-{
-  QPixmap icon;
-  icon = QPixmap (qgis_xpm);
-  setIcon (icon);
-  QGridLayout *FrameLayout =
-    new QGridLayout (frameMain, 1, 2, 4, 6, "mainFrameLayout");
-  QSplitter *split = new QSplitter (frameMain);
-  mapToc = new QWidget (split);	//frameMain);
-  //add a canvas
-  mapCanvas = new QgsMapCanvas (split);
-  // resize it to fit in the frame
-  //    QRect r = frmCanvas->rect();
-  //    canvas->resize(r.width(), r.height());
-  mapCanvas->setBackgroundColor (Qt::white); //QColor (220, 235, 255));
-  mapCanvas->setMinimumWidth (400);
-
-
-
-
-
-
-
-
-
-  FrameLayout->addWidget (split, 0, 0);
-  mapToc->setBackgroundColor (QColor (192, 192, 192));
-
-}
-
-QgisApp::~QgisApp ()
-{
-}
-void
-QgisApp::addLayer ()
-{
-  // only supports postgis layers at present
-  // show the postgis dialog
-  QgsDbSourceSelect *dbs = new QgsDbSourceSelect ();
-  if (dbs->exec ())
-    {
-      // add files to the map canvas
-      QStringList tables = dbs->selectedTables ();
-      QString connInfo = dbs->connInfo ();
-      // for each selected table, connect to the datbase, parse the WKT geometry,
-      // and build a cavnasitem for it
-      // readWKB(connInfo,tables);
-      QStringList::Iterator it = tables.begin ();
-      while (it != tables.end ())
-	{
-
-	  // create the layer
-	  QgsDatabaseLayer *lyr = new QgsDatabaseLayer (connInfo, *it);
-	  // add it to the mapcanvas collection
-	  mapCanvas->addLayer (lyr);
-	  // no drawing done -- need to pass the layer collection
-	  // to the rendering engine (yet to be written)
-	 
-	  ++it;
-	}
-      qApp->processEvents();
-      mapCanvas->render2();
-      statusBar()->message(mapCanvas->extent().stringRep());
-
-    }
-
-}
-void
-QgisApp::fileExit ()
-{
-  QApplication::exit ();
-
-}
-
-void
-QgisApp::zoomIn ()
-{
-  /*  QWMatrix m = mapCanvas->worldMatrix();
-      m.scale( 2.0, 2.0 );
-      mapCanvas->setWorldMatrix( m );
-  */
-  // scale the extent
-  QgsRect ext = mapCanvas->extent();
-  ext.scale(0.5);
-  mapCanvas->setExtent(ext);
-  statusBar()->message(ext.stringRep());
-  mapCanvas->clear();
-  mapCanvas->render2();
-
-}
-
-void
-QgisApp::zoomOut ()
-{
-  /*    QWMatrix m = mapCanvas->worldMatrix();
-	m.scale( 0.5, 0.5 );
-	mapCanvas->setWorldMatrix( m );
-  */
-
-
-}
-void QgisApp::zoomFull(){
-  mapCanvas->zoomFullExtent();
-}
-void
-QgisApp::readWKB (const char *connInfo, QStringList tables)
-{
-//    PgCursor pgc (connInfo, "testcursor");
-//   // get "endianness"
-//   char *chkEndian = new char[4];
-//   memset (chkEndian, '\0', 4);
-//   chkEndian[0] = 0xE8;
-//   int *ce = (int *) chkEndian;
-//   bool isNDR = (232 == *ce);
-//   /*     if(*ce != 232)
-//   cout << "Big endian" << endl;
-//   else
-//   cout << "Little endian" << endl;
-//   */
-//   QStringList::Iterator it = tables.begin ();
-//   while (it != tables.end ())
-//     {
-
-//       // get the extent of the layer
-//       QString esql = "select extent(the_geom) from " + *it;
-//       PgDatabase *pd = new PgDatabase (connInfo);
-//       int result = pd->ExecTuplesOk ((const char *) esql);
-//       QString extent = pd->GetValue (0, 0);
-//       // parse out the x and y values
-//       extent = extent.right (extent.length () - extent.find ("BOX3D(") - 6);
-//       QStringList coordPairs = QStringList::split (",", extent);
-//       QStringList x1y1 = QStringList::split (" ", coordPairs[0]);
-//       QStringList x2y2 = QStringList::split (" ", coordPairs[1]);
-//       double x1 = x1y1[0].toDouble ();
-//       double y1 = x1y1[1].toDouble ();
-//       double x2 = x2y2[0].toDouble ();
-//       double y2 = x2y2[1].toDouble ();
-//       double xMu = x2 - x1;
-//       double yMu = y2 - y1;
-//       int subordinantAxisLength;
-
-
-//       // determine the dominate direction for the mapcanvas
-//       if (mapCanvas->width () > mapCanvas->height ())
-// 	{
-// 	  subordinantAxisLength = mapCanvas->height ();
-// 	  scaleFactor = yMu / subordinantAxisLength;
-// 	  mapWindow = new QRect (x1, y1, xMu, xMu);
-// 	}
-//       else
-// 	{
-// 	  subordinantAxisLength = mapCanvas->width ();
-// 	  scaleFactor = xMu / subordinantAxisLength;
-// 	  mapWindow = new QRect (x1, y1, yMu, yMu);
-// 	}
-
-//       const char *xtent = (const char *) extent;
-//       string sql = "select asbinary(the_geom,";
-//       if (isNDR)
-// 	sql += "'NDR'";
-//       else
-// 	sql += "'XDR'";
-//       sql += ") as features from ";
-//       sql += *it++;
-//       cout << sql.c_str () << endl;
-//       pgc.Declare (sql.c_str (), true);
-//       int res = pgc.Fetch ();
-//       cout << "Number of binary records: " << pgc.Tuples () << endl;
-//       bool setExtent = true;
-//       // process each record
-//       QPainter paint;
-
-//       paint.begin (mapCanvas);
-//       paint.setWindow (*mapWindow);
-//       QRect v = paint.viewport ();
-//       int d = QMIN (v.width (), v.height ());
-//       paint.setViewport (v.left () + (v.width () - d) / 2,
-// 			 v.top () + (v.height () - d) / 2, d, d);
-
-
-//       paint.setPen (Qt::red);
-
-//       for (int idx = 0; idx < pgc.Tuples (); idx++)
-// 	{
-// 	  cout << "Size of this record: " << pgc.GetLength (idx, 0) << endl;
-// 	  // allocate memory for the item
-// 	  char *feature = new char[pgc.GetLength (idx, 0) + 1];
-// 	  memset (feature, '\0', pgc.GetLength (idx, 0) + 1);
-// 	  memcpy (feature, pgc.GetValue (idx, 0), pgc.GetLength (idx, 0));
-
-
-// 	  cout << "Endian is: " << (int) feature[0] << endl;
-// 	  cout << "Geometry type is: " << (int) feature[1] << endl;
-// 	  // print the x,y coordinates
-// 	  double *x = (double *) (feature + 5);
-// 	  double *y = (double *) (feature + 5 + sizeof (double));
-// 	  cout << "x,y: " << setprecision (16) << *x << ", " << *y << endl;
-// 	  QPoint pt = paint.xForm (QPoint ((int) *x, (int) *y));
-// 	  cout << "Plotting " << *x << ", " << *y << " at " << pt.
-// 	    x () << ", " << pt.y () << endl;
-// 	  paint.drawRect ((int) *x, mapWindow->bottom () - (int) *y, 15000,
-// 			  15000);
-// 	  // free it 
-// 	  delete[]feature;
-// 	}
-//       paint.end ();
-//     }
-  
-}
-
-
-void
-QgisApp::drawPoint (double x, double y)
-{
-  QPainter paint;
-  //  QWMatrix mat (scaleFactor, 0, 0, scaleFactor, 0, 0);
-  paint.begin (mapCanvas);
-  // paint.setWorldMatrix(mat);
-  paint.setWindow (*mapWindow);
-
-  paint.setPen (Qt::blue);
-  paint.drawPoint ((int)x, (int)y);
-  paint.end ();
-}
-
-void QgisApp::drawLayers(){
-  cout << "In  QgisApp::drawLayers()" << endl;
-  mapCanvas->render2();
-}
diff --git a/qgisapp.h b/qgisapp.h
deleted file mode 100644
index a08766df198..00000000000
--- a/qgisapp.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/***************************************************************************
-                          qgisapp.h  -  description
-                             -------------------
-    begin                : Sat Jun 22 2002
-    copyright            : (C) 2002 by Gary E.Sherman
-    email                : sherman@mrcc.com
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef QGISAPP_H
-#define QGISAPP_H
-class QCanvas;
-class QRect;
-class QCanvasView;
-class QStringList;
-#include "qgisappbase.h"
-
-class QgsMapCanvas;
-/*! \class QgisApp
- * \brief Main window for the Qgis application
- */
-class QgisApp : public QgisAppBase  {
-public: 
-	QgisApp(QWidget *parent=0, const char * name=0, WFlags fl = WType_TopLevel );
-	
-	~QgisApp();
-	//public slots:
-	//! Add a layer to the map
-	void addLayer();
-	//! Exit Qgis
-	void fileExit();
-	//! Zoom out
- 	void zoomOut();
-	//! Zoom int
-  	void zoomIn();
-	//! Zoom to full extent
-	void zoomFull();
-	//! Read Well Known Binary stream from PostGIS
-	void readWKB(const char *, QStringList tables);
-	//! Draw a point on the map canvas
-	void drawPoint(double x, double y);
-	//! draw layers
-	void drawLayers();
-private:
-	//! Map canvase 
-QgsMapCanvas *mapCanvas;
-//! Table of contents (legend) for the map
-QWidget *mapToc;
-//! scale factor
- double scaleFactor;
- //! Current map window extent in real-world coordinates
- QRect *mapWindow;
-
-};
-
-#endif
diff --git a/qgisappbase.ui b/qgisappbase.ui
deleted file mode 100644
index 4552ae000d8..00000000000
--- a/qgisappbase.ui
+++ /dev/null
@@ -1,282 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>QgisAppBase</class>
-<widget class="QMainWindow">
-    <property name="name">
-        <cstring>QgisAppBase</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>609</width>
-            <height>451</height>
-        </rect>
-    </property>
-    <property name="font">
-        <font>
-            <family>Helvetica [Urw]</family>
-        </font>
-    </property>
-    <property name="caption">
-        <string>Quantum GIS</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>3</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QFrame" row="0" column="0">
-            <property name="name">
-                <cstring>frameMain</cstring>
-            </property>
-            <property name="frameShape">
-                <enum>StyledPanel</enum>
-            </property>
-            <property name="frameShadow">
-                <enum>Raised</enum>
-            </property>
-        </widget>
-    </grid>
-</widget>
-<menubar>
-    <property name="name">
-        <cstring>menubar</cstring>
-    </property>
-    <property name="font">
-        <font>
-            <pointsize>10</pointsize>
-        </font>
-    </property>
-    <property name="frameShape">
-        <enum>MenuBarPanel</enum>
-    </property>
-    <property name="frameShadow">
-        <enum>Raised</enum>
-    </property>
-    <item text="File" name="PopupMenu">
-        <action name="actionFileOpen"/>
-        <action name="actionFileExit"/>
-    </item>
-    <item text="View" name="PopupMenu_2">
-        <action name="actionAddLayer"/>
-    </item>
-</menubar>
-<toolbars>
-    <toolbar dock="2">
-        <property name="name">
-            <cstring>Toolbar</cstring>
-        </property>
-        <property name="label">
-            <string>Toolbar</string>
-        </property>
-        <action name="actionFileOpen"/>
-    </toolbar>
-    <toolbar dock="2">
-        <property name="name">
-            <cstring>mapNavigationToolbar</cstring>
-        </property>
-        <property name="label">
-            <string>Toolbar_2</string>
-        </property>
-        <action name="actionZoomIn"/>
-        <action name="actionZoomOut"/>
-        <action name="actionPan"/>
-        <action name="actionZoomFullExtent"/>
-    </toolbar>
-    <toolbar dock="2">
-        <property name="name">
-            <cstring>Toolbar_2</cstring>
-        </property>
-        <property name="label">
-            <string>Toolbar_2</string>
-        </property>
-        <action name="actionAddLayer"/>
-        <action name="drawAction"/>
-    </toolbar>
-</toolbars>
-<actions>
-    <action>
-        <property name="name">
-            <cstring>actionFileOpen</cstring>
-        </property>
-        <property name="iconSet">
-            <iconset>image0</iconset>
-        </property>
-        <property name="text">
-            <string>Open Project</string>
-        </property>
-    </action>
-    <action>
-        <property name="name">
-            <cstring>actionFileExit</cstring>
-        </property>
-        <property name="text">
-            <string>Exit</string>
-        </property>
-        <property name="menuText">
-            <string>E&amp;xit</string>
-        </property>
-    </action>
-    <action>
-        <property name="name">
-            <cstring>actionZoomIn</cstring>
-        </property>
-        <property name="iconSet">
-            <iconset>image1</iconset>
-        </property>
-        <property name="text">
-            <string>Zoom In</string>
-        </property>
-        <property name="menuText">
-            <string>Zoom &amp;In</string>
-        </property>
-    </action>
-    <action>
-        <property name="name">
-            <cstring>actionPan</cstring>
-        </property>
-        <property name="iconSet">
-            <iconset>image2</iconset>
-        </property>
-        <property name="text">
-            <string>Pan</string>
-        </property>
-        <property name="menuText">
-            <string>&amp;Pan</string>
-        </property>
-    </action>
-    <action>
-        <property name="name">
-            <cstring>actionZoomOut</cstring>
-        </property>
-        <property name="iconSet">
-            <iconset>image3</iconset>
-        </property>
-        <property name="text">
-            <string>Zoom out</string>
-        </property>
-        <property name="menuText">
-            <string>Zoom &amp;out</string>
-        </property>
-    </action>
-    <action>
-        <property name="name">
-            <cstring>actionAddLayer</cstring>
-        </property>
-        <property name="iconSet">
-            <iconset>image4</iconset>
-        </property>
-        <property name="text">
-            <string>Add Layer</string>
-        </property>
-    </action>
-    <action>
-        <property name="name">
-            <cstring>drawAction</cstring>
-        </property>
-        <property name="iconSet">
-            <iconset>image5</iconset>
-        </property>
-        <property name="text">
-            <string>Refresh </string>
-        </property>
-    </action>
-    <action>
-        <property name="name">
-            <cstring>actionZoomFullExtent</cstring>
-        </property>
-        <property name="iconSet">
-            <iconset>image6</iconset>
-        </property>
-        <property name="text">
-            <string>Zoom to full extent</string>
-        </property>
-    </action>
-</actions>
-<images>
-    <image name="image0">
-        <data format="XPM.GZ" length="2894">789c8d95496fe3461085effe1582eb66043514d9647723c8c1bb67b1c7f66c9e0972686ede77d9b23dc87f4ff7ab1645ca13247a06844fcda7aa7a45d16f564647fbbba395374bf7133739ad46d589bb1badd40f9797cf7ffef5c7cfa5e5548dfcdf384946e9f26f4bcb07935135dabbbe6a023079a0042fb003db4ce73630ed041e174a6b05de025b556a03de00d779a22bf066e034c933dd82d7c02ad72603af83755e9a02fc0c36796534f8055ce6ad71e8e7085ce9c4caf92ab82e52837afc4e588fadf4f3086e0a65643e036e7566310f7f0f9c255a597c3f4dc1e342db31cedf0bfbf14b9c5f82d3c25884c756586b2bf57f80336dacd43b04ab20f89f840b6765fe2b705e9436c7f51f84b5b5c88b914f56e832f234722dfd7002d6ba72d8175d834dd1cafcbc2bac1b8779a8015b9f9fcc8f7d654eb74ee6c17eb2322fb57cdf8db04e251f1e0b9bc4c93c2db8f279cafc7bc226759887185cfbfc6a9c6f0a9bcc61df8cfd668d514ef6790c6e7d9e32ef476153c839e37e5363a39dcc978253639cccb3dab1f4bb0fce3c4a5edb60654a27fd1e800b533be90ffb51d67fbfec03f7a372fefb8427e0b2e30770656c64dc6faaf62cf3dd467691efc04dc7d8bf6a7d3fc2d85f9e748cfcf3b1a9e2fc67e0b4e3fbc87564ec23cf3a3e07ab8e8f2337912fc079c7271d4bbe35b8e8f834721bb904eb8ef1fbc84dc795b04d22e3fecbed8c09fbc8cb2030f2d469101879974d1018f356491018fd57691018f9562a088cf92b1d04c63e2a1b04469e551904c6bc551d04c6bc751204c63c751a04465eb50a02238f5a07615e0db64138c7f3b42e83705e80f1c2399ebf4d1284f31c9c0681bf81551058817510f82bd80681333002047f01d741e0b781db2408fc199c0681f1bc6f5510f8135807c93f8fff12934868d1c38eddf0eab963e61b7abca3e4aaef1b56107ee5a9e16a66bea1433ee97bfc752d1ff3099fce7cafebfcc273e65de77c816a979e07155e7bfc15577ccd37d127d51612914c069e5bbef3bee0b8ef7539f0f53dfe64c20ffc182b4dbde65d56f344fafbf19f3ef173ac34e5175e8dbe79265d35f178c79a97549af23a6ff0266ff1367cb36a6e781f78dee1b7f04df91dbfe70fbccb7bfc91f7f920fadcf0dee143fec49ff90b7fe56ff01df177fec1098f7d8fa977055f2ff7e8095532569c73c11a3ec3b6d7a3239ee7173db10a11392aa9a21abe798f8e1a6ae9585cd1d3ab4227744a67744e17f0851e1d5dd2155dd38d74183338f4ea55a15bbaa37b9ad0037c8e1e694a4fb31cbafd107cbd2af4e035219f293dd30badce931bdca3f0a14abc3ebc7bcf1aad2f66bdf02b0ebe78bdaf72481bb4d977bcf62cfafcfbd6d0f16b4fcfb74d3b8b8e7ff7f472a1c55fdeff7b562d78fefe7de91fc88dca3a</data>
-    </image>
-    <image name="image1">
-        <data format="XPM.GZ" length="4446">789c85965b4f1e3f0ec6effb29507d57adfc9ff3245aed452950a09c0f8576b5174e3253a01c0abcb485d57ef7f53c0eb450d87d5d09fd9a38719ed8cefcf566ee706b7deecd5fafae67323b8e73f148aee6dea49bb3b3db7ffeeb1fff7ef5ba6ae6f45fe9fbb9eaf5df5ebdde9ecdc5b98d8bf36102d1f97354e0072e26ae3bb51e7c008eb5afddc4e4276e0a5f0ae6d341e6ca5816c1a51a36934b70a5568377c0f564e0f4c00d7817dc4e86f51db8932a603e7dccdc049bbf07ee27c3f8fa035bbc2bc6de8b9d671fec2703b3b1efc4f6fb0916b58071db2f4c86f16570943294e0137052333d97c0435bb476feafc63e08f6a399b19e07e38cf3e96c358c1f1afb68f305e769abc9301f7ab7f564985f666edb0ef3114fdb486b7ac91ab86d5d6b7af4c6a18aa6df5b70a766fa9c1a4b21380f41afd6071f23f6bf0587c930ffdb03639caec151d7373ddf677611f3f91c3cb66367f91226ee8aaeeaec3ca37128a2e9770c56b5a2cddf00d7adaf4cafc2580de7e10f999bcc0358a9b378a047871fd69b07f72a08f6a30eec824401ff00fbc9b01e81c36418bf310ebde949166f9c0cf3059c2603dbf906b511f32dbe211609e767d3639c0ce37bc6b14db83f463ef6455ff5960fa8dfbe9c0cf3978ca34b763f88b7af547f3bff6ae61871df8cfaebebc9307e65acfbd979510f282fd3f3ec81b11e9f666e7bd3f308dc8664f942ad712c93dd9faddff7a343bc7267ec2a67f9d8809d7701eb0bf4e9bd2b9de5c345e6c6d97e168fd7f3587ed97e12ab64eb231f5ce9b543219e5de3a801621cf9a9bb0fdef2e98b71ac23f4e726b337fdc9b856b6fd37c14de72aab17e8e9da380eb61efaa1eb5231d8fd5c662e337f063b4d2fabf7efc65192d5e302d877a9b178a0970b6eb47879d5d857def47b078edd68f3a53376aa38f6db30d6f687f8197abae4cbaccf8e712a92ed87fc57751a6ff791390ea61fef661e13ea25207f7dd1f50dcec7e837ba7af4a6cfb671aa4d1f81debe8ad1cecb35b8d6766af98d7ee8d180e0bf609cfa01f113f2dff7c965fe04761abfd5ef56e6c6f6e39dcc5d5e1ff5e5bd3670ebdfa8672fa94a56afe8dfdabd6bb1fcb778a35462f562f1c6d49a5e04fda54a71b0fa81fed2e87ea647056e53cae3c83fe9743ef24bd0cfa5ef5c7ebfe68dd360f309fd565c1a07cb77e829a28cf30aea55a2ae67f7bb9c390df63ea2df8b66a7ad27887feab6d67f04fd3954ba9ec5837843ddb7168fcc8c351ecb4fdc4f68fa2e8faf1aeb7dda79d18f423bd483e98b7842a70159fea33eb53b8db63f211f830cfd607aa29f84a0f761fa439fa0a7b371417f0dc3d0e4f3e3fec3e8aaac1ff23116831bad1e51afb11c2a9b4f7799ebec3f666e06dc3fa1bfc4fade9f173387d1e2c57ba8ddb24a561fc6dde0cc9ff1bda4ddb8b17e41e8975a0c2e9fef3c73182d1fb7324763311637daf70a9f18a73ebf07fbc6f7fb09fa490cbec8f3a1df545dd6cfe5da58e7db7dac64f639de7b961c1ffa511ceec7a97a60f807d45f1c631f4c4f7c4fa54ae3873e01f7939a3844d38b8c8734da7dce8cc762b4fa5fc85c66463da6761847d317f99e7a2d589c27d87a92dadcff0be3b11a2dffaf33d7a3e981f368758c161fe33d4a49e75b7da0de35fb877cdf97c61a0fe20d38df50a498f311effd50ea7ccb77d4a766cf9879cd58d7b7f9a83f7dfceb7c1e7cff69b6d7b9df207f351bfa117af266663fdaf706f454759d8d0bfaeb90f4beec3d46ffd168f27c41fee9eea5dd17233f74f730dafb87f752577359aff9ccd1c619ef85d2309a3fbe4747fc26de9edd1b130b078e9c7efddf9ff6cb87071ef90b1ff1319ff0573ee5b3ffe7c3e77cc1dff892aff89a677cc3dff907fffc5f3e7ccb77fc96e7f91d2ff0222ff17b5ee6155e7d3ec6ecf381d7d4639d377893b7789b777897f7789f3fbee4c3077ca8517d528fcf5c70c915d7dc70cb1df71c5ef071ec898948b8a0c0db1429d140237da1233a7ede874ee82b9dd2199dd3057d538f4bbaa26b9ad10d7da71f2ff8fca45bbaa3b7344fef6881166989ded332add02a7da0b5177cd6698336698bb6698776698ff6e9231dd0217da2cf54bca41b9554514d0db5d4514f4e1f51167d99443fa55ff29124838cf2458ee4584ee4ab9cca999ccb857cd3cfef3fbceef3402ee54aae652637f25d7ec84fb9953b792bf3f24e169e7afdca37599425792fcbb222abf241d6645d366453b664fba9d7e3bc961dd9953dd9978f534c722087f2493e3ff57ae2131f5921a57e2ffce19535a8a579b0fad7e8f35ed9a7e17569a5935e9c7afd16c7735ef73eeae1351a17f8b1cf735e0f3e5d3e43f7d4e791d7639f29aa18f415ffd3e7de2b04fdfbbbcf14551724c4e77ce03559fccde705dd1e79c5fb3cca3e8fefe5599fdfeef43f7f7ff55f91655a15</data>
-    </image>
-    <image name="image2">
-        <data format="XPM.GZ" length="661">789c8d924d0a02310c85f73d4598ec8a383a2ec523282e0571f1a88a2e4641c7858877b73f1653db111f2d34f99a8426ad35ad9673d2b5ba76e88e86cc0117d2db5bdbded79bd943554d43764d685c0d543524438bf369e7ce6ccf3cf272269cb9f7f2378bfa8730b3db9c116658375020b05e47625442c06165d9bc1b312c105f1d510c4142f522812048492259a78f7c05713f11ef49eb4b2211977af0c9954c210dc9493e8577bac2e47c5bc5487ffd83e754bd008fb59390</data>
-    </image>
-    <image name="image3">
-        <data format="XPM.GZ" length="4446">789c85975973163d0e85eff9152974474de9ebb7f7aea9b920242c217b8004a6e642b6bb591308094b3235ff7dd4e73821eb4c44917ab065cbc792dcfcf568e9607b63e9d15f0f4e4eedf4635c8a1fecfbd2a3f4e3f0f0ec9ffffac7bf1f3c2ceb25ffb318baa5f2e1df1e3cdc395d8a4b9b5f8fc619cce72f49811f703173d5ba75e07d70ac86aa9f598699eb625818e6cb7ee6926cabe0851b36b36370e9568177c1d56ce074c935780fdccc86f57b706b65c07c7993b90e9cff0adccd86f18d4b66bc2fc8c3603ccf6bf0301b58c9436bdcef37d8dc02c6b95f980de3cfc1d1166101fe044e6ed4f329786c8a86e7ff4c1e82613f3925fb7930ae389fcf76c3f80179889c6f384f53ce86f9d0bba966c3fc45e6a669311ff134b535d4cbd6c14dd337d4a323873252bfc7e0d68dfa7c215b61388f40af6608438cd8ff0c1c66c3fc6f978c713901475f9f7a3ecbdc47ccd723f0d44c2df325ccdc166dd9f23c13391491fa7d04bb5a91f337c1553394d4ab20bbe13cfa32739d79043bb58c077ab4f8c17acbe0ce05c17ed282fb60d1c0bfc0c36c584fc061368cff20878e7a0ae38db361be81d36c609e6f749b309ff18db14838bf528f69368cbf22c726e1fe14f9d8155dd9311f50bfdd6236cc7f4a8e7de2fd20deae74fd79feb5cc31e2be15f5d755b361fc3bd9f7e379510f282fea7978c9584fbf646e3aeaf901dc84c47c91861c1789f7c7f5bb6eea11af9d93fbb2673ed6e07ee803d637e8d30dfda2673e7ccd5cf7dc8ff10c7e1ee617f7b35826ae8f7ce817837728c4b3478e1e20c6919fbefb38309fde936315a1bfd69907ea2fe4ca99fb6f81ebb62f592fd0b36fe234723df4c3be4dc5c8fb39cebcc8fc0edc7b7ab1de7f92a325d6e30a786853cd78a0571ffa89f1ea1a792807eaf7041cdb89f36593eced0ef12af4ebd3b0c87aec925391b83ef2ddd5a807ea9f398ed44bf7324f09f51190af43d17635cea3e82fbe7a1ca8c70e3955d4c3a0ef50c6c8f36905aebc7d329fd1ff06341cf8af905337227e41be0f5dea33bf05f71e3feb753b73cdfd7437739bd7473d0d83376cf66bd4ef60a94cac4ff46befd69531df196fb4d2581f8c37a6867a09f4b632c511f717f09e58358c03cf877e62b5ef4f7d4a709312e72bf2cf5af7477e19fab9756d9fdfaf65721a395fd06fad4fd3c87c87be66ce38bfa15e2dfa7abcefe799d3c8f711fdde3c3bb99ee13c73b765ff31f4e750fa7a8c07f186aa6b188f9d923d1ee627ee2bd45d9bc7d7c87ebf3c2ffa5168c66aa4de8827b41e10f31ff5e9dd69e2fe82fc0c367623f5453f09c1ef87f7017d829f8ee386fe1ac6b1cee7473e84a92fb37ec8cf588cfdc47a44bdc6c55872be9c67aeb2ff94b91e910f82fe12ab0b7f5dcd1c26c68bf7d0bb6599582fe476ece9aff85ef26e5cb35f08faa517479fcf7794394ccccfedcc916c64eb277eafe82772eaf27bf09a7cb19fa19fc43014793ef49bab8dfddc4ec83e9ff7f122f390e3bd60cbf1a11fc5f1625cca4b867f403dc62976817a22ff53e9f1439f80fb49751c23f512f29826dee729792a26d6cb4ae64566d4676ac669a2bec8f7d47901b3deb89ea526f7ff823c9513f3ff247335510f9cc7ab63627c8af728259fcffa40fd7bf68ff9be8fc91e0ffb2bee732c52ccf988f77e5cf87ce63bead3b367cabc4ef6f5391ff5e78f7f95cf83ef3fcff62af71fe4af674337414fddca3c4cfcde809eae6ecf7143bf1d93df17df63f4238f26cf37f41fdf7dc1fb52e487ef1e26be7f782f7db53eebb59c39725cf17e388d13fdf13d3ae167e69dd30b5351d3a051d39f7fbb6d7f7c74d449dfeb07fda89ff4b37ed1c3ffe7a347fa55bfe9b17ed7133dd51ffa537fe9efffe5a3677aae8f75599fe88aaeea537da6cff585aedd1d63f679a9ebeeb1a19bbaa5dbbaa3bbbaa7aff4b5beb9cf47f7f5c0a37aeb1eefb4d085965a69ad8db6da69b8c7a7d74154444c0b09ba2351928c32c97bf9201feff6914ff259bec8a11cc957f9e61ec7f25d4ee4547ec84ff9758fcf6f399373792ccbf2445664559eca33792e2f644d5ecafa3d3e1bb2295bb22d3bb22b7bf24a5ecb1bd99703792befa4b84f3759482995d4d2482b9df4fea8aaf9cb64fe297d9f8f251b6db2f7f6c13eda27fb6c5fecd08eecab7df3cfef5b5e177960c7f6dd4eecd47ed84ffb65bfedccceedb12ddb135bb9e9f527df6cd59eda337b6e2f6ccd5edaba6dd8a66dd9b6eddcf4ba9ad71ec7aeedd92b7b6d6fe6986cdf0eecadbdbbe975bd16b267e4dffe7fa9857f3fdcf2ca1a54565f5a75317a9f57f6a975c31a6badb3debde2953deff0baf0b9f418aefadced75e113142788febbbeaed235af6b3edc23f82b7ed3e78f5708fefbaa4ff608f1b64ff69a2d5ef1b953b79b37709147d9275eb7db3ed7f2e03f7f7ff05ff0ee59a6</data>
-    </image>
-    <image name="image4">
-        <data format="XPM.GZ" length="661">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523232520022630543251d2e253d856405bffcbc54105b19c8563600020b03103711c44d0303b04aac005546593911b74ce2d09151c60089046512a100641a14109419789f522203f6082e19385ba9d69a0b008e2682ef</data>
-    </image>
-    <image name="image5">
-        <data format="XPM.GZ" length="3390">789c759649531c490c85effc8a0e74734cc85595595b4cccc1066f98d52bf6c41cb23668f6a5b10d13f3df27f55e81a11bfae1083ea4cc94944ab59f3f9bec6e6f4c9e3d5fba9c85d9b49db4fbe162f2acbb3a3ebefefb9fbffe5d5aceb249fc49bd9b64cb7f2c2defcc26ed64f3f4a437d03a8224f818cb17706a02ef809d095c824b9371507065827d1b1c4cb00bb831810fc09d09e7af1ac7c32a9eaf3fc169e6931cfe87e0cc04fbaf918bd17f00fbd48ff1d7b79c7ad8b7c959cdf8f466e486f1c9393837c1be0b2eeef6afc82e4d5af823dfb434c1fe96ecb2d13e05d726d8bf92b396f94b060e26d87bb273633d184fe3fa6440fe01dc9a606fc86e48195f4bf629391c833b13ec7b645fa4b83f3d03f7be66fc81e70f26d8af8daddc4901fbd12d67e807edc8ae19eb2be43ce17e82fbccf0813d90f334657f7c067b13f83b38378107729170bda0be5965c27e3b643fd6575e816b13ecebe4a2cd18cf7b7030c1fe8e5c0c19ee43f7c9f10291bf6c815b13ecdfc8e5e0b87f49ae52c7fe9981bb2a73bcdf0d706f02339ec184f53fc89573ec97cb911bcffe3d1879f0a8bf7e24872467bf7d3076499e64bc7fe4e7d2ca3b9ed792eb3e67fdf19e5d2c98637e811c8a9cf95d8c5ce5ec97376017f3657e87e4c615bc2ff49ff38d1f79059c9bc0e8075714dd98af0797550c0076bc6f5799c0e82717eaccb31e29b8318191bf6b4dd80ffdedba581fda0b639f98c017e4d28ffbe33d631cb07f4fc965e2585f47ae0bd64bf0ded19ee41cec4c60bc1f9f9bc0a8572c4631ded716b94e3df3bf223745c9f8d06fbe34c17e422e3bc6af2fc9d19ff317f3ce5726bc47bc8f58fe66cc1ff3ccb726f06b7067823fea9b2726ecbf42ae72cffbfd04c600841def33cf9baea41dfd9f9726ec87f996f726f8e3bcc2b5b1c3c09b23bb8af5c17c297cb4f37cac8fcd37facb1ab83281d12f4530818fc86d31faa35e456702e33d15bd098cfa158309e765e4180fee47101fc637eb8bf784f4f87d83fe2e6b13d6e3fecbae6d2ace63ccd32a3581f1de309ef8de8ec86d57737ff41bae8ff1e3fba0aa4d60ccdbaa3381319feac604c679f83a65ff246067c2796be42e04e41fd05f2137c11ffd1d0613fc316f9ba44f1b7edfbd00677dd2b0fee4dc04c67b6b2a13fc67e43e6b78ff980f4dddfb86f303fdd4f47dde327ff43f9e2fe3c5bc6e9bbe6e397ff17edbbe6f5bee87f7dff921363018f3303ef7a4e3fb42fedd30b88ee761dec62fcb5bc63c1df031de993d948a066db4d54e7b1d1edae6fd754ff775aa077aa8477aac277aaa677afe947ff4bed04b9de995fe88bfffd45f7aad435c71f384ff7ef47ea12f75257add45127fbfd1d545ffb8e3545fe96b7da36f1772bae1fa07feefe2ee6bfa7e3ec7db5316fcd7754337754bb71ff3ff1d4f8cef5c77f4837ed44ffa59bfe857ddbd1fff23fedff4bb269a6aa64ebde65a68a9d5786a2d3a5f4f1d44244823ad74d26b2977bb47ef3dd997e97c3db1e2400ee568cefb584ee454cee47cbe9e71c5855ccaec81f795fc909ff24baee586673ca88f9d71dffb85bc9415599557f23aae786367ccddef9db7bc9577b216e33893f7b22e1bd17b53b664fbb1fee4ee71ff9df8ef837c944ff259bed85fb47ecaff2ea6afb22bdfe4fb427dea27fc1349e3fed9a2ffe28ae8edc44b2e8594f3fe5cf17b0de277b1f255ace6bd9deec71f5456838460bea189ff01684317ba5895f2717fdb35f461101ff6c27e984a15fd0f1ec6b9581fd90e87328deb8ec2f1624ecbfffdb9f43f0b1c269c</data>
-    </image>
-    <image name="image6">
-        <data format="XPM.GZ" length="3550">789c8d96db521c390c86ef798a297497da52667abadbeddada8b104242c2100810205b7ba1b6bb399f860142b6f6dd57fe6526a9307b981f427d23d9966559cecb178383adc9e0c5cba5db99cc4ec2201ccb74f022de5d5c3cfefec76f7f2e2d17c5407f46d578502cffb2b4bc3d1b84c1e6d5659780260a34c427b13c80db24d84fc02129315f261ec524d8d364548c9360ff04f62ac17cb789c7a324f01d38b9c35fcec1b5ca81cfc04ed580afc05e85f9e89b71537a9bef1a2ce3be44fc2ce05665f1067050215e41bce3a8b2fddf1837ded7f06fc19daa07c7c4e55085f56825735d225eda058f942d5ec9ec3213b8283560f83f1afb46309eb19f729c04fbe99c4bf091b1f782f9f83d181ff0f59c2bf867bbafc538dbbd88ad6ff15449188ffc6ab42eefe735b84902bf32f69d58fe7ab04fc2f8a339db7977604982ddc60795d5cb57e3d605abaf0a1c55761e164f6c2580c5f2df27c1fe21713594716bf13799ebd6f6b70e2ec4b596cf637029c1ec8cf8aa4665fe35d827c14e73b67afb0c6e93c0bd713b0a96ff1d704882fd63e668cce61f55b6bf7789eba196a7c55f808b24d84bf0b8f205ea99a6c66d65eb09f25d3749b03f18b73158bd7ab0a8bfeddfe66f5de1ac9e70ffea9004decf1c8df98bb1e61ffb6567acd7c7f283faadfbba77d62f38b11baaec3ee2beb95112e6f773c6fe04f74da3299cc587f9d375b7f804fd06e568f5db1987265afde0bc5da5c27d15dc1757abac7f5c80d3c7f2730f6e347e5b6f15ec9d383bff4363df78cbc75be3b60f960f9b4f54960f8bbf754d1e7f903964fbd058cbddea03fdc245d739bb3f164feffac6fa15eaa519051fadffa05ef5707501706d1c479de513fdb57141b2ff61e6182dfe11b891c6ee2b6f8245ed16ef46e63ecf67f62e09f1617d5f3485f56342bff7b596af9d47ccac1b026f83bd5e5fdbcf41e6a6b3f850efbe8d7587f367c4e7a31482f579621c7df6473f55abb3fe486b606d089dd51fce47aa183abb9f782f440b5e8c517fd274a3ceee2bea597c70d64f08ef91b4b1cfe3f7c0c1fbdceff78dbba18d67d4a3f46dd9da796e19ebfc966fd4473bd2f8ccbe61dc156667bc6f6dd16a89c09f8dc353ff43bd68379068f91b83459f5b3b9f2de3aeec2c3ed47babf5152c5f6799abccebc69debec3cf19eb551cad2e2dd31eeeaded65bcbec32a3df8571e733a3dfeaec7db4fed41aebfcb6bf37e0ba8bbdf533f4f3a0a7d5db79a33f85d0f5bddd4ff4b3d025c1be6d1c7dee2f66efa3443b1fcc1f35badef27b9f79dcdbfd467eb5da626ff584f745abc3e57a9919f7458e0ffd2f467d4e6c7ee43b6a34deee27ea5d4ff7e9bee13dd7ff0c14797dd44f57693cb6bfbdcca5c5c3e8df5d8acfce03efa966a3b1f518fda7c727f1f6ec494c2cdc72e0c8ddf76f7fd4777feef9888ff9844ff98ccff9822ff9ea9ffdf99a6f78cab73ce33bbee707fdf72b3ff2b7c5fefc8a57d4fe9a57f5f70daff15b7ec7ebfacd0abf5fe87fc41fe0bd8a111b3ce14dfec85bbccd9f9efbf30eefea5c33de83f767dee7033ee42f3cd411232e9ef91ff1984bae54c97b4bbd6b76dcb0e70d62a205fea724d46ac41b1428724d1df57444c74a4c273ffbd3299dd1395de81e0fe812de57744d3734a55bdea567f1d39de661aa71e81ee99e1ee82b3dd2377aa563a7b4b2283ff49a56e90dadd15b7a47ebf45ee7fe401b74ce239a2cf4dfa48fbca2316dd1367da27b3ea41df55ea15d9ad0dea2f3a5cfb44f0774485fa8550d694445f2e6551a53b9b07e76a8a29a1c35e485854468222d8d7584e3f6b97f9204aaf45276d2cb91ae59cab18e3be1553995b345fe3f4b479ceb880bb9e40bb99ae773625978fafba3d4ff5caee546a6fc28b74ffef3f99ef9a7efb006cb547fff239ebcc65d1e71cff1fff8cfd77830ff7f8fe7c9a26711ff7bbf3f6bf9af5f97fe06b3c5625f</data>
-    </image>
-</images>
-<connections>
-    <connection>
-        <sender>actionFileExit</sender>
-        <signal>activated()</signal>
-        <receiver>QgisAppBase</receiver>
-        <slot>fileExit()</slot>
-    </connection>
-    <connection>
-        <sender>actionFileOpen</sender>
-        <signal>activated()</signal>
-        <receiver>QgisAppBase</receiver>
-        <slot>fileOpen()</slot>
-    </connection>
-    <connection>
-        <sender>actionAddLayer</sender>
-        <signal>activated()</signal>
-        <receiver>QgisAppBase</receiver>
-        <slot>addLayer()</slot>
-    </connection>
-    <connection>
-        <sender>actionZoomOut</sender>
-        <signal>activated()</signal>
-        <receiver>QgisAppBase</receiver>
-        <slot>zoomOut()</slot>
-    </connection>
-    <connection>
-        <sender>actionZoomIn</sender>
-        <signal>activated()</signal>
-        <receiver>QgisAppBase</receiver>
-        <slot>zoomIn()</slot>
-    </connection>
-    <connection>
-        <sender>drawAction</sender>
-        <signal>activated()</signal>
-        <receiver>QgisAppBase</receiver>
-        <slot>drawLayers()</slot>
-    </connection>
-    <connection>
-        <sender>actionZoomFullExtent</sender>
-        <signal>activated()</signal>
-        <receiver>QgisAppBase</receiver>
-        <slot>zoomFull()</slot>
-    </connection>
-</connections>
-<includes>
-    <include location="local" impldecl="in implementation">qgisappbase.ui.h</include>
-</includes>
-<slots>
-    <slot>fileExit()</slot>
-    <slot>fileOpen()</slot>
-    <slot>addLayer()</slot>
-    <slot>zoomIn()</slot>
-    <slot>zoomOut()</slot>
-    <slot>init()</slot>
-    <slot>drawLayers()</slot>
-    <slot>zoomFull()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/qgispoint.h b/qgispoint.h
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/qgscoordinatetransform.cpp b/qgscoordinatetransform.cpp
deleted file mode 100644
index 90fd06b2615..00000000000
--- a/qgscoordinatetransform.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/***************************************************************************
-                qgscoordinatetransform.cpp  -  description
-                             -------------------
-    begin                : Sat Jun 22 2002
-    copyright            : (C) 2002 by Gary E.Sherman
-    email                : sherman@mrcc.com
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-#include <qstring.h>
-#include <qtextstream.h>
-
-#include "qgspoint.h"
-#include "qgscoordinatetransform.h"
-
-QgsCoordinateTransform::QgsCoordinateTransform(double mupp=0, double ymax = 0, double ymin=0, double xmin = 0) : 
-  mapUnitsPerPixel(mupp), yMax(ymax), yMin(ymin), xMin(xmin){
-}
-QgsCoordinateTransform::~QgsCoordinateTransform(){
-}
-QgsPoint QgsCoordinateTransform::transform(QgsPoint p){
-  // transform x
-  double dx = (p.x() - xMin)/mapUnitsPerPixel;
-  double dy = yMax - ((p.y() - yMin))/mapUnitsPerPixel;
-  // double dy = (yMax - (p.y() - yMin))/mapUnitsPerPixel;
-  return QgsPoint(dx,dy);
-}
-
-QgsPoint QgsCoordinateTransform::transform(double x, double y){
-  return(transform(QgsPoint(x,y)));
-}
-void QgsCoordinateTransform::setMapUnitsPerPixel(double mupp){
-  mapUnitsPerPixel = mupp;
-}
-
-void QgsCoordinateTransform::setYmax(double ymax){
-  yMax = ymax;
-}
-void QgsCoordinateTransform::setYmin(double ymin){
-  yMin = ymin;
-}
-void QgsCoordinateTransform::setXmin(double xmin){
-  xMin = xmin;
-}
-void QgsCoordinateTransform::setParameters(double mupp, double xmin,
-					   double ymin, double ymax){
- mapUnitsPerPixel = mupp;
- xMin = xmin;
- yMin = ymin;
- yMax = ymax;
-
-}
-QString QgsCoordinateTransform::showParameters(){
-  QString rep;
-  QTextOStream(&rep) << "Map units/pixel: " << mapUnitsPerPixel 
-		     << " X minimum: " << xMin 
-		     << " Y minimum: " << yMin
-		     << " Y maximum: " << yMax;
-  return rep;
-		 
-}
diff --git a/qgscoordinatetransform.h b/qgscoordinatetransform.h
deleted file mode 100644
index cf1355f0699..00000000000
--- a/qgscoordinatetransform.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/***************************************************************************
-                          qgscoordinatetransform.h  -  description
-                             -------------------
-    begin                : Sat Jun 22 2002
-    copyright            : (C) 2002 by Gary E.Sherman
-    email                : sherman@mrcc.com
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-#ifndef QGSCOORDINATETRANSFORM_H
-#define QGSCOORDINATETRANSFORM_H
-class QgsPoint;
-
-class QgsCoordinateTransform{
- public:
-    QgsCoordinateTransform(double mupp=0, double ymax = 0, double ymin=0,
-			   double xmin = 0);
-    ~QgsCoordinateTransform();
-    QgsPoint transform(QgsPoint p);
-    QgsPoint transform(double x, double y);
-    void setMapUnitsPerPixel(double mupp);
-    void setYmax(double ymax);
-    void setYmin(double ymin);
-    void setXmin(double xmin);
-    void setParameters(double mupp, double xmin, double ymin, double ymax);
-    QString showParameters();
- private:
-    double mapUnitsPerPixel;
-    double yMax;
-    double yMin;
-    double xMin;
-
-};
-#endif // QGSCOORDINATETRANSFORM_H
diff --git a/qgsdatabase.cpp b/qgsdatabase.cpp
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/qgsdatabaselayer.cpp b/qgsdatabaselayer.cpp
deleted file mode 100644
index ecf331fff6e..00000000000
--- a/qgsdatabaselayer.cpp
+++ /dev/null
@@ -1,416 +0,0 @@
-/***************************************************************************
-                    qgsdatabaselayer.cpp  -  description
-                             -------------------
-    begin                : Sat Jun 22 2002
-    copyright            : (C) 2002 by Gary E.Sherman
-    email                : sherman@mrcc.com
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-#include <qstring.h>
-#include <qpainter.h>
-#include <qpointarray.h>
-#include <qbrush.h>
-#include "qgsrect.h"
-#include "qgspoint.h"
-#include <libpq++.h>
-#include <qmessagebox.h>
-#include "qgsdatabaselayer.h"
-
-QgsDatabaseLayer::QgsDatabaseLayer(const char *conninfo, QString table) :
-  QgsMapLayer(QgsMapLayer::DATABASE, table),tableName(table){
-  // create the database layer and get the needed information
-  // about it from the database
-  dataSource = conninfo;
-  PgDatabase *pd = new PgDatabase(conninfo);
-  if(pd->Status()==CONNECTION_OK){
-    // get the geometry column
-    QString sql = "select f_geometry_column from geometry_columns where f_table_name='"
-      + tableName + "'";
-    qWarning("Getting geometry column: " + sql);
-    int result = pd->ExecTuplesOk((const char *) sql);
-    if(result){
-      geometryColumn =  pd->GetValue(0,"f_geometry_column");
-      // set the extent of the layer
-      QString sql =  "select xmax(extent(" + geometryColumn + ")) as xmax,"
-	"xmin(extent(" + geometryColumn + ")) as xmin,"
-	"ymax(extent(" + geometryColumn + ")) as ymax,"
-	"ymin(extent(" + geometryColumn + ")) as ymin"
-	" from " + tableName;
-      qWarning("Getting extents: " + sql);
-      result = pd->ExecTuplesOk((const char *)sql);
-     			  
-      if(result){
-	QString vRight = pd->GetValue(0,"right");
-	layerExtent.setXmax(QString(pd->GetValue(0,"xmax")).toDouble());
-	layerExtent.setXmin(QString(pd->GetValue(0,"xmin")).toDouble());
-	layerExtent.setYmax(QString(pd->GetValue(0,"ymax")).toDouble());
-	layerExtent.setYmin(QString(pd->GetValue(0,"ymin")).toDouble());
-	QString xMsg;
-	QTextOStream(&xMsg).precision(18);
-	QTextOStream(&xMsg).width(18);
-	QTextOStream(&xMsg) << "Set extents to: " << layerExtent.xMin() << ", " <<
-	  layerExtent.yMin() << " " << layerExtent.xMax() << ", " << layerExtent.yMax();
-	qWarning(xMsg);
-       
-      }else{
-	QString msg = "Unable to access " + tableName;
-	//QMessageBox::warning(this,"Connection Problem",msg); 
-	valid = false;
-      }
-     
-    }else{
-      QString msg =  "Unable to get geometry information for " + tableName;
-      //QMessageBox::warning(this,"Connection Problem",msg); 
-      valid = false;
-    }
-   
-    delete pd;
-  }
-}
-QgsDatabaseLayer::~QgsDatabaseLayer(){
-}
-QgsRect QgsDatabaseLayer::calculateExtent(){
-  return layerExtent;
-}
-void QgsDatabaseLayer::draw(QPainter *p, QgsRect *viewExtent, int yTransform){
-  // painter is active (begin has been called
-  /* Steps to draw the layer
-     1. get the features in the view extent by SQL query
-     2. read WKB for a feature
-     3. transform
-     4. draw
-  */
-  cout << "Drawing layer using view extent " << viewExtent->stringRep() <<
-    " with a y transform of " << yTransform << endl;
-  PgCursor pgs(dataSource, "drawCursor");
-  QString sql = "select asbinary(" + geometryColumn + ",'" + endianString();
-  sql +=   "') as features from " + tableName;
-  sql += " where " + geometryColumn;
-  sql +=  " && GeometryFromText('BOX3D(" + viewExtent->stringRep();
-  sql += ")'::box3d,-1)";
-  qWarning(sql);
-  pgs.Declare((const char *)sql, true);
-  int res = pgs.Fetch();
-  cout << "Number of matching records: " << pgs.Tuples() << endl;
-  for (int idx = 0; idx < pgs.Tuples (); idx++)
-    {
-      // allocate memory for the item
-      char *feature = new char[pgs.GetLength (idx, 0) + 1];
-      memset (feature, '\0', pgs.GetLength (idx, 0) + 1);
-      memcpy (feature, pgs.GetValue (idx, 0), pgs.GetLength (idx, 0));
-      wkbType = (int)feature[1];
-      //cout << "Feature type: " << wkbType << endl;
-      // read each feature based on its type
-      double *x;
-      double *y;
-      int *nPoints;
-      int *numRings;
-      int *numPolygons;
-      int numPoints;
-      int numLineStrings;
-      int idx,jdx,kdx;
-      char *ptr;
-      char lsb;
-      int ttype;
-      QPointArray *pa;
-      switch(wkbType){
-      case WKBPoint:
-	p->setPen(Qt::red);
-	x = (double *) (feature + 5);
-	y = (double *) (feature + 5 + sizeof (double));
-	p->drawRect ((int) *x, yTransform - (int) *y, 15000,  15000);
-	break;
-      case WKBLineString:
-	p->setPen(Qt::blue);
-	// get number of points in the line
-	numPoints = (int)(feature + 1 + sizeof(int));
-	ptr = feature + 1 + 2 * sizeof(int);
-	for(idx = 0; idx < numPoints; idx++){
-	  x = (double *) ptr;
-	  ptr += sizeof(double);
-	  y = (double *) ptr;
-	  ptr += sizeof(double);
-	  if(idx == 0)
-	    p->moveTo((int) *x, yTransform - (int) *y);
-	  else
-	    p->lineTo((int) *x, yTransform - (int) *y);
-	    
-	}
-	break;
-      case WKBMultiLineString:
-	p->setPen(Qt::blue);
-	numLineStrings =  (int)(feature[5]);
-	ptr = feature+9;
-	for(jdx = 0; jdx < numLineStrings; jdx++){
-	  // each of these is a wbklinestring so must handle as such
-	  lsb = *ptr;
-	  ptr += 5; // skip type since we know its 2
-	  nPoints = (int *)ptr;
-	  ptr += sizeof(int);
-	  for(idx = 0; idx < *nPoints; idx++){
-	    x = (double *) ptr;
-	    ptr += sizeof(double);
-	    y = (double *) ptr;
-	    ptr += sizeof(double);
-	    if(idx == 0)
-	      p->moveTo((int) *x, yTransform - (int) *y);
-	    else
-	      p->lineTo((int) *x, yTransform - (int) *y);
-	    
-	  }
-	}
-	break;
-      case WKBPolygon:
-	p->setPen(Qt::blue);
-	// get number of rings in the polygon
-	numRings = (int *)(feature + 1 + sizeof(int));
-	ptr = feature + 1 + 2 * sizeof(int);
-	for(idx = 0; idx < *numRings; idx++){
-	  // get number of points in the ring
-	  nPoints = (int *)ptr;
-	  ptr += 4;
-	  pa = new QPointArray(*nPoints);
-	  for(jdx = 0; jdx < *nPoints; jdx++){
-	    // add points to a point array for drawing the polygon
-	    x = (double *) ptr;
-	    ptr += sizeof(double);
-	    y = (double *) ptr;
-	    ptr += sizeof(double);
-	    pa->setPoint(jdx,(int)*x, yTransform - (int)*y);
-	  }
-	  // draw the ring
-	  p->drawPolygon(*pa);
-	    
-	}
-	break;
-      case WKBMultiPolygon:
-	p->setPen(Qt::darkGreen);
-	QBrush brush(Qt::green);
-	p->setBrush(brush);
-	// get the number of polygons
-	ptr = feature + 5;
-	numPolygons = (int *)ptr;
-	for(kdx = 0; kdx < *numPolygons; kdx++){
-	  //skip the endian and feature type info and
-	  // get number of rings in the polygon
-	  ptr = feature + 14;
-	  numRings = (int *)ptr;
-	  ptr += 4;
-	  for(idx = 0; idx < *numRings; idx++){
-	    // get number of points in the ring
-	    nPoints = (int *)ptr;
-	    ptr += 4;
-	    pa = new QPointArray(*nPoints);
-	    for(jdx = 0; jdx < *nPoints; jdx++){
-	      // add points to a point array for drawing the polygon
-	      x = (double *) ptr;
-	      ptr += sizeof(double);
-	      y = (double *) ptr;
-	      ptr += sizeof(double);
-	      pa->setPoint(jdx,(int)*x, yTransform - (int)*y);
-	    }
-	    // draw the ring
-	    p->drawPolygon(*pa);
-	    delete pa;
-	  }
-	}
-	break;
-      }
- 
-    }
-
-
-
-}
-void QgsDatabaseLayer::draw(QPainter *p, QgsRect *viewExtent, QgsCoordinateTransform *cXf){
-  // painter is active (begin has been called
-  /* Steps to draw the layer
-     1. get the features in the view extent by SQL query
-     2. read WKB for a feature
-     3. transform
-     4. draw
-  */
-  PgCursor pgs(dataSource, "drawCursor");
-  QString sql = "select asbinary(" + geometryColumn + ",'" + endianString();
-  sql +=   "') as features from " + tableName;
-  sql += " where " + geometryColumn;
-  sql +=  " && GeometryFromText('BOX3D(" + viewExtent->stringRep();
-  sql += ")'::box3d,-1)";
-  qWarning(sql);
-  pgs.Declare((const char *)sql, true);
-  int res = pgs.Fetch();
-  cout << "Number of matching records: " << pgs.Tuples() << endl;
-  cout << "Using following transform parameters:\n" << cXf->showParameters() 
-       << endl;
-  for (int idx = 0; idx < pgs.Tuples (); idx++)
-    {
-      // allocate memory for the item
-      char *feature = new char[pgs.GetLength (idx, 0) + 1];
-      memset (feature, '\0', pgs.GetLength (idx, 0) + 1);
-      memcpy (feature, pgs.GetValue (idx, 0), pgs.GetLength (idx, 0));
-      wkbType = (int)feature[1];
-      //cout << "Feature type: " << wkbType << endl;
-      // read each feature based on its type
-      double *x;
-      double *y;
-      int *nPoints;
-      int *numRings;
-      int *numPolygons;
-      int numPoints;
-      int numLineStrings;
-      int idx,jdx,kdx;
-      char *ptr;
-      char lsb;
-      int ttype;
-      QgsPoint pt;
-      QPointArray *pa;
-      switch(wkbType){
-      case WKBPoint:
-	p->setPen(Qt::red);
-	x = (double *) (feature + 5);
-	y = (double *) (feature + 5 + sizeof (double));
-	pt = cXf->transform(*x,*y);
-	p->drawRect (pt.xToInt(), pt.yToInt(), 5,  5);
-	break;
-      case WKBLineString:
-	p->setPen(Qt::blue);
-	// get number of points in the line
-	numPoints = (int)(feature + 1 + sizeof(int));
-	ptr = feature + 1 + 2 * sizeof(int);
-	for(idx = 0; idx < numPoints; idx++){
-	  x = (double *) ptr;
-	  ptr += sizeof(double);
-	  y = (double *) ptr;
-	  ptr += sizeof(double);
-	  // transform the point
-	  pt = cXf->transform(*x, *y);
-	  if(idx == 0)
-	    p->moveTo(pt.xToInt(),pt.yToInt());
-	  else
-	    p->lineTo(pt.xToInt(),pt.yToInt());
-	    
-	}
-	break;
-      case WKBMultiLineString:
-	p->setPen(Qt::blue);
-	numLineStrings =  (int)(feature[5]);
-	ptr = feature+9;
-	for(jdx = 0; jdx < numLineStrings; jdx++){
-	  // each of these is a wbklinestring so must handle as such
-	  lsb = *ptr;
-	  ptr += 5; // skip type since we know its 2
-	  nPoints = (int *)ptr;
-	  ptr += sizeof(int);
-	  for(idx = 0; idx < *nPoints; idx++){
-	    x = (double *) ptr;
-	    ptr += sizeof(double);
-	    y = (double *) ptr;
-	    ptr += sizeof(double);
-	    // transform the point
-	    pt = cXf->transform(*x, *y);
-	    if(idx == 0)
-	      p->moveTo(pt.xToInt(),pt.yToInt());
-	    else
-	      p->lineTo(pt.xToInt(),pt.yToInt());
-	    
-	  }
-	}
-	break;
-      case WKBPolygon:
-	p->setPen(Qt::blue);
-	// get number of rings in the polygon
-	numRings = (int *)(feature + 1 + sizeof(int));
-	ptr = feature + 1 + 2 * sizeof(int);
-	for(idx = 0; idx < *numRings; idx++){
-	  // get number of points in the ring
-	  nPoints = (int *)ptr;
-	  ptr += 4;
-	  pa = new QPointArray(*nPoints);
-	  for(jdx = 0; jdx < *nPoints; jdx++){
-	    // add points to a point array for drawing the polygon
-	    x = (double *) ptr;
-	    ptr += sizeof(double);
-	    y = (double *) ptr;
-	    ptr += sizeof(double);
-	    pt = cXf->transform(*x, *y);
-	    pa->setPoint(jdx,pt.xToInt(), pt.yToInt());
-	  }
-	  // draw the ring
-	  p->drawPolygon(*pa);
-	    
-	}
-	break;
-      case WKBMultiPolygon:
-	p->setPen(Qt::darkGreen);
-	QBrush brush(Qt::green);
-	p->setBrush(brush);
-	// get the number of polygons
-	ptr = feature + 5;
-	numPolygons = (int *)ptr;
-	for(kdx = 0; kdx < *numPolygons; kdx++){
-	  //skip the endian and feature type info and
-	  // get number of rings in the polygon
-	  ptr = feature + 14;
-	  numRings = (int *)ptr;
-	  ptr += 4;
-	  for(idx = 0; idx < *numRings; idx++){
-	    // get number of points in the ring
-	    nPoints = (int *)ptr;
-	    ptr += 4;
-	    pa = new QPointArray(*nPoints);
-	    for(jdx = 0; jdx < *nPoints; jdx++){
-	      // add points to a point array for drawing the polygon
-	      x = (double *) ptr;
-	      ptr += sizeof(double);
-	      y = (double *) ptr;
-	      ptr += sizeof(double);
-	      // cout << "Transforming " << *x << "," << *y << " to ";
-		
-	      pt = cXf->transform(*x, *y);
-	      //cout << pt.xToInt() << "," << pt.yToInt() << endl;
-	      pa->setPoint(jdx,pt.xToInt(), pt.yToInt());
-	     
-	    }
-	    // draw the ring
-	    p->drawPolygon(*pa);
-	    delete pa;
-	  }
-	}
-	break;
-      }
- 
-    }
-
-
-
-}
-
-
-int QgsDatabaseLayer::endian(){
-  char *chkEndian = new char[4];
-  memset (chkEndian, '\0', 4);
-  chkEndian[0] = 0xE8;
-  int *ce = (int *) chkEndian;
-  if(232 == *ce)
-    return NDR;
-  else
-    return XDR;
-}
-QString QgsDatabaseLayer::endianString(){
-  char *chkEndian = new char[4];
-  memset (chkEndian, '\0', 4);
-  chkEndian[0] = 0xE8;
-  int *ce = (int *) chkEndian;
-  if(232 == *ce)
-    return QString("NDR");
-  else
-    return QString("XDR");
-}
diff --git a/qgsdatabaselayer.h b/qgsdatabaselayer.h
deleted file mode 100644
index 8869e2f15b9..00000000000
--- a/qgsdatabaselayer.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/***************************************************************************
-                          gsdatabaselayer.h  -  description
-                             -------------------
-    begin                : Fri Jun 28 2002
-    copyright            : (C) 2002 by Gary E.Sherman
-    email                : sherman@mrcc.com
-***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef QGSDATABASELAYER_H
-#define QGSDATABASELAYER_H
-class QString;
-class QgsRect;
-
-#include "qgsmaplayer.h"
-
-/*! \class QgsDatabaseLayer
- * \brief A map layer based on data stored in a relational database.
- *
- * At present Qgis supports PostGIS "layers" in PostgresQL. 
- */
-class QgsDatabaseLayer : public QgsMapLayer  {
- public: 
-    /*! Constructor
-     * @param conninfo Pointer to the connection information required to
-     * connect to PostgresQL
-     *@param table Name of the table in the database that this layer
-     * represents
-     */
-    QgsDatabaseLayer(const char *conninfo=0, QString table=QString::null);
-    //! Destructor
-    ~QgsDatabaseLayer();
-    virtual void draw(QPainter *, QgsRect *, int );
-    virtual void draw(QPainter *, QgsRect *, QgsCoordinateTransform *cFx);
- private:
-    //! Calculates extent of the layer using SQL and PostGIS functions
-    QgsRect calculateExtent();
-    //! Type geometry contained in the layer. This corresponds to one of the OGIS Simple geometry types
-    QString type; 
-    //! WKB type
-    int wkbType;
-    //! Name of the database containing the layer (table)
-    QString database;
-    //! Name of the table containing the features
-    QString tableName;
-    //! Name of the column in the table that contains the geometry for the features
-    QString geometryColumn;
-    //OGIS WKB types
-    enum WKBTYPE{
-	WKBPoint=1,
-	WKBLineString,
-	WKBPolygon,
-	WKBMultiPoint,
-	WKBMultiLineString,
-	WKBMultiPolygon
-    };	
-    enum ENDIAN{
-	NDR,
-	XDR
-    };
-    // Returns the endian type for the client
-    int endian();	
-    QString endianString();
-};
-
-#endif
diff --git a/qgsdatasource.cpp b/qgsdatasource.cpp
deleted file mode 100644
index ee5f31257a6..00000000000
--- a/qgsdatasource.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-/***************************************************************************
-                          qgsdatasource.cpp  -  description
-                             -------------------
-    begin                : Sat Jun 22 2002
-    copyright            : (C) 2002 by Gary E.Sherman
-    email                : sherman@mrcc.com
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-#include "qgsdatasource.h"
-QgsDataSource::QgsDataSource(){
-}
-QgsDataSource::~QgsDataSource(){
-}
diff --git a/qgsdatasource.h b/qgsdatasource.h
deleted file mode 100644
index 60e0adb346e..00000000000
--- a/qgsdatasource.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/***************************************************************************
-                          gsdatasource.h  -  description
-                             -------------------
-    begin                : Sun Jun 30 2002
-    copyright            : (C) 2002 by Gary E.Sherman
-    email                : sherman@mrcc.com
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef QGSDATASOURCE_H
-#define QGSDATASOURCE_H
-#include <qstring.h>
-
-/**Base class for spatial and tabular data
-  *@author Gary E.Sherman
-  */
-
-class QgsDataSource {
-public: 
-	QgsDataSource();
-	~QgsDataSource();
- protected:
- //! Path or uri of the datasource
- 	QString dataSource;
-};
-
-#endif
diff --git a/qgsdbsourceselect.cpp b/qgsdbsourceselect.cpp
deleted file mode 100644
index cf3c8d6a305..00000000000
--- a/qgsdbsourceselect.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-/***************************************************************************
-                    qgsdbsourceselect.h  -  description
-                             -------------------
-    begin                : Sat Jun 22 2002
-    copyright            : (C) 2002 by Gary E.Sherman
-    email                : sherman@mrcc.com
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-#include <libpq++.h>
-#include <iostream>
-#include <qsettings.h>
-#include <qpixmap.h>
-#include <qlistbox.h>
-#include <qstringlist.h>
-#include <qcombobox.h>
-#include "xpm/point_layer.xpm"
-#include "xpm/line_layer.xpm"
-#include "xpm/polygon_layer.xpm"
-#include "qgsdbsourceselect.h"
-#include "qgsnewconnection.h"
-
-QgsDbSourceSelect::QgsDbSourceSelect():QgsDbSourceSelectBase(){
-  QSettings settings;
-  QStringList keys = settings.subkeyList("/Qgis/connections");
-  QStringList::Iterator it = keys.begin();
-  while( it != keys.end() ) {
-    cmbConnections->insertItem(*it);
-
-    ++it;
-  }
-
-}
-QgsDbSourceSelect::~QgsDbSourceSelect(){
-}
-void QgsDbSourceSelect::addNewConnection(){
- 
-  QgsNewConnection *nc = new QgsNewConnection();
-  
-  if(nc->exec()){
-  }
-}
-void QgsDbSourceSelect::editConnection(){
- 
-  QgsNewConnection *nc = new QgsNewConnection(cmbConnections->currentText());
-
-  if(nc->exec()){
-    nc->saveConnection();
-  }
-}
-void QgsDbSourceSelect::addTables(){
-  //store the table info
-  for(int idx=0; idx <lstTables->numRows(); idx++){
-    if(lstTables->isSelected(idx))
-      m_selectedTables += lstTables->text(idx);
-  }
-  accept();
-}
-void QgsDbSourceSelect::dbConnect(){
-  // populate the table list
-  QSettings settings;
-  
-  QString key = "/Qgis/connections/" + cmbConnections->currentText();
-  QString host = "host="+settings.readEntry(key+"/host");
-  QString database = "dbname="+settings.readEntry(key+"/database");
-  QString username = "user="+settings.readEntry(key+"/username");
-  QString password = "password="+settings.readEntry(key+"/password");
-  m_connInfo = host +" " + database + " " + username + " " + password;
-  qDebug(m_connInfo);
-  PgDatabase *pd = new PgDatabase((const char *)m_connInfo);
-  cout << pd->ErrorMessage();
-  if(pd->Status()==CONNECTION_OK){
-    // clear the existing entries
-    lstTables->clear();
-    // create the pixmaps for the layer types
-    QPixmap pxPoint;
-    pxPoint = QPixmap(point_layer_xpm);
-    QPixmap pxLine;
-    pxLine = QPixmap(line_layer_xpm);
-    QPixmap pxPoly;
-    pxPoly = QPixmap(polygon_layer_xpm);
-    qDebug("Connection succeeded");
-    // get the list of tables
-    QString sql =  "select * from geometry_columns where f_table_schema ='"
-      + settings.readEntry(key+"/database") + "'";
-    sql += " order by f_table_name";
-    qDebug("Fetching tables using: " + sql);
-    int result = pd->ExecTuplesOk((const char *)sql);
-    if(result){
-      QString msg;
-      QTextOStream(&msg) << "Fetched " << pd->Tuples() << " tables from database";
-      qDebug( msg);
-      for(int idx = 0; idx < pd->Tuples(); idx++){
-	QString v = pd->GetValue(idx,"f_table_name");
-	QString type = pd->GetValue(idx,"type");
-	QPixmap *p;
-	if(type == "POINT" || type == "MULTIPOINT")
-	  p = &pxPoint;
-	else
-	  if(type == "MULTIPOLYGON" || type == "POLYGON")
-	    p = &pxPoly;
-	  else
-	    if(type == "LINESTRING" || type == "MULTILINESTRING")
-	      p = &pxLine;
-	    else
-	      p = 0;
-	lstTables->insertItem(*p,v);
-      }
-    }else{
-      qDebug( "Unable to get list of spatially enabled tables from geometry_columns table");
-      qDebug( pd->ErrorMessage());
-    }
-  }else{
-    qDebug( "Connection failed");
-  }
-}
-QStringList QgsDbSourceSelect::selectedTables(){
-  return m_selectedTables;
-}
-QString  QgsDbSourceSelect::connInfo(){
-  return m_connInfo;
-}
diff --git a/qgsdbsourceselect.h b/qgsdbsourceselect.h
deleted file mode 100644
index 722e5751089..00000000000
--- a/qgsdbsourceselect.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/***************************************************************************
-                          qgdbsourceselect.h  -  description
-                             -------------------
-    begin                : Sat Jun 22 2002
-    copyright            : (C) 2002 by Gary E.Sherman
-    email                : sherman@mrcc.com
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef QGSDBSOURCESELECT_H
-#define QGSDBSOURCESELECT_H
-#include "qgsdbsourceselectbase.h"
-/*! \class QgsDbSourceSelect
- * \brief Dialog to create connections and add tables from PostgresQL.
- *
- * This dialog allows the user to define and save connection information
- * for PostGIS enabled PostgresQL databases. The user can then connect and add 
- * tables from the database to the map canvas.
- */
-class QgsDbSourceSelect : public QgsDbSourceSelectBase 
-{
- public:
-    //! Constructor
-    QgsDbSourceSelect();
-    //! Destructor
-    ~QgsDbSourceSelect();
-    //! Opens the create connection dialog to build a new connection
-    void addNewConnection();
-    //! Opens a dialog to edit an existing connection
-    void editConnection();
-    //! Determines the tables the user selected and closes the dialog
-    void addTables();
-    /*! Connects to the database using the stored connection parameters. 
-    * Once connected, available layers are displayed.
-    */
-    void dbConnect();
-    //! String list containing the selected tables
-    QStringList selectedTables();
-    //! Connection info (database, host, user, password)
-    QString connInfo();
- private:
-    QString m_connInfo;
-    QStringList m_selectedTables;
-};
-
-
-#endif // QGSDBSOURCESELECT_H
diff --git a/qgsdbsourceselectbase.ui b/qgsdbsourceselectbase.ui
deleted file mode 100644
index eebd4d41382..00000000000
--- a/qgsdbsourceselectbase.ui
+++ /dev/null
@@ -1,239 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>QgsDbSourceSelectBase</class>
-<widget class="QDialog">
-    <property name="name">
-        <cstring>QgsDbSourceSelectBase</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>305</width>
-            <height>338</height>
-        </rect>
-    </property>
-    <property name="font">
-        <font>
-            <family>Helvetica [Urw]</family>
-            <pointsize>10</pointsize>
-        </font>
-    </property>
-    <property name="caption">
-        <string>Add PostGIS Table(s)</string>
-    </property>
-    <property name="sizeGripEnabled">
-        <bool>true</bool>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>11</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QLayoutWidget" row="2" column="1">
-            <property name="name">
-                <cstring>Layout5</cstring>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>0</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QPushButton" row="1" column="0">
-                    <property name="name">
-                        <cstring>btnAdd</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Add</string>
-                    </property>
-                    <property name="accel">
-                        <number>0</number>
-                    </property>
-                    <property name="autoDefault">
-                        <bool>true</bool>
-                    </property>
-                    <property name="default">
-                        <bool>true</bool>
-                    </property>
-                </widget>
-                <widget class="QPushButton" row="2" column="0">
-                    <property name="name">
-                        <cstring>btnCancel</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Cancel</string>
-                    </property>
-                    <property name="accel">
-                        <number>0</number>
-                    </property>
-                    <property name="autoDefault">
-                        <bool>true</bool>
-                    </property>
-                </widget>
-                <widget class="QPushButton" row="3" column="0">
-                    <property name="name">
-                        <cstring>btnHelp</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Help</string>
-                    </property>
-                    <property name="accel">
-                        <number>4144</number>
-                    </property>
-                    <property name="autoDefault">
-                        <bool>true</bool>
-                    </property>
-                </widget>
-                <spacer row="0" column="0">
-                    <property name="name">
-                        <cstring>Spacer1</cstring>
-                    </property>
-                    <property name="orientation">
-                        <enum>Vertical</enum>
-                    </property>
-                    <property name="sizeType">
-                        <enum>Fixed</enum>
-                    </property>
-                    <property name="sizeHint">
-                        <size>
-                            <width>20</width>
-                            <height>100</height>
-                        </size>
-                    </property>
-                </spacer>
-            </grid>
-        </widget>
-        <widget class="QGroupBox" row="0" column="0" rowspan="1" colspan="2">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="title">
-                <string>Connection Information</string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QComboBox" row="0" column="0" rowspan="1" colspan="3">
-                    <property name="name">
-                        <cstring>cmbConnections</cstring>
-                    </property>
-                </widget>
-                <widget class="QPushButton" row="1" column="0">
-                    <property name="name">
-                        <cstring>btnConnect</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Connect</string>
-                    </property>
-                </widget>
-                <widget class="QPushButton" row="1" column="2">
-                    <property name="name">
-                        <cstring>btnEdit</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Edit</string>
-                    </property>
-                </widget>
-                <widget class="QPushButton" row="1" column="1">
-                    <property name="name">
-                        <cstring>btnNew</cstring>
-                    </property>
-                    <property name="text">
-                        <string>New</string>
-                    </property>
-                </widget>
-            </grid>
-        </widget>
-        <widget class="QLabel" row="1" column="0">
-            <property name="name">
-                <cstring>TextLabel3_2_2</cstring>
-            </property>
-            <property name="font">
-                <font>
-                    <pointsize>11</pointsize>
-                </font>
-            </property>
-            <property name="text">
-                <string>Tables</string>
-            </property>
-        </widget>
-        <widget class="QListBox" row="2" column="0">
-            <property name="name">
-                <cstring>lstTables</cstring>
-            </property>
-            <property name="selectionMode">
-                <enum>Extended</enum>
-            </property>
-        </widget>
-    </grid>
-</widget>
-<connections>
-    <connection>
-        <sender>btnCancel</sender>
-        <signal>clicked()</signal>
-        <receiver>QgsDbSourceSelectBase</receiver>
-        <slot>reject()</slot>
-    </connection>
-    <connection>
-        <sender>btnConnect</sender>
-        <signal>clicked()</signal>
-        <receiver>QgsDbSourceSelectBase</receiver>
-        <slot>dbConnect()</slot>
-    </connection>
-    <connection>
-        <sender>btnAdd</sender>
-        <signal>clicked()</signal>
-        <receiver>QgsDbSourceSelectBase</receiver>
-        <slot>addTables()</slot>
-    </connection>
-    <connection>
-        <sender>btnNew</sender>
-        <signal>clicked()</signal>
-        <receiver>QgsDbSourceSelectBase</receiver>
-        <slot>addNewConnection()</slot>
-    </connection>
-    <connection>
-        <sender>btnEdit</sender>
-        <signal>clicked()</signal>
-        <receiver>QgsDbSourceSelectBase</receiver>
-        <slot>editConnection()</slot>
-    </connection>
-</connections>
-<tabstops>
-    <tabstop>cmbConnections</tabstop>
-    <tabstop>btnConnect</tabstop>
-    <tabstop>btnNew</tabstop>
-    <tabstop>btnEdit</tabstop>
-    <tabstop>lstTables</tabstop>
-    <tabstop>btnAdd</tabstop>
-    <tabstop>btnCancel</tabstop>
-    <tabstop>btnHelp</tabstop>
-</tabstops>
-<includes>
-    <include location="local" impldecl="in implementation">qgsdbsourceselectbase.ui.h</include>
-</includes>
-<slots>
-    <slot>addNewConnection()</slot>
-    <slot>addTables()</slot>
-    <slot>dbConnect()</slot>
-    <slot>init()</slot>
-    <slot>editConnection()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/qgslinesymbol.h b/qgslinesymbol.h
deleted file mode 100644
index 3b6a8630f7c..00000000000
--- a/qgslinesymbol.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/***************************************************************************
-                          qgslinesymbol.h  -  description
-                             -------------------
-    begin                : Sat Jun 22 2002
-    copyright            : (C) 2002 by Gary E.Sherman
-    email                : sherman@mrcc.com
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef QGSLINESYMBOL_H
-#define QGSLINESYMBOL_H
-
-class QString;
-
-/*! \class QgsLineSymbol
- * \brief Symbol for displaying lines
- */
-class QgsLineSymbol : public QgsSymbol{
- public:
-    //! Constructor
-    QgsLineSymbol();
-    //! Destructor
-    ~QgsLineSymbol();
-          /*! Comparison operator
-      @return True if symbols are equal
-    */
-    bool operator==(const QgsLineSymbol &r1);
-    /*! Assignment operator
-     * @param r1 QgsPolygonSymbol to assign from
-     */
-    QgsLineSymbol & operator=(const QgsLineSymbol &r1);
- private:
-  
-};
-#endif // QGSLINESYMBOL_H
diff --git a/qgsmapcanvas.cpp b/qgsmapcanvas.cpp
deleted file mode 100644
index 8fe5b6b0dde..00000000000
--- a/qgsmapcanvas.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-/***************************************************************************
-                          qgsmapcanvas.cpp  -  description
-                             -------------------
-    begin                : Sun Jun 30 2002
-    copyright            : (C) 2002 by Gary E.Sherman
-    email                : sherman@mrcc.com
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-#include <qstring.h>
-#include <qpainter.h>
-#include <qrect.h>
-#include "qgsrect.h"
-#include "qgsmaplayer.h"
-#include "qgsdatabaselayer.h"
-#include "qgscoordinatetransform.h"
-#include "qgsmapcanvas.h"
-
-QgsMapCanvas::QgsMapCanvas(QWidget *parent, const char *name ) : QWidget(parent,name) {
-  mapWindow = new QRect();
-  coordXForm = new QgsCoordinateTransform();
-}
-QgsMapCanvas::~QgsMapCanvas(){
-  delete coordXForm;
-  delete mapWindow;
-}
-void QgsMapCanvas::addLayer(QgsMapLayer *lyr){
-  layers[lyr->name()] = lyr;
-  // update extent if warranted
-  if(layers.size() == 1){
-    fullExtent = lyr->extent();
-    fullExtent.scale(1.1);
-    currentExtent = fullExtent;
-    
-  }
-
-  // set zpos to something...
-  //lyr->zpos = 0;
-}
-void QgsMapCanvas::render2(){
- QPainter *paint = new QPainter();
-  paint->begin(this);
-  //currentExtent = fullExtent;
-  QRect v = rect();// paint->viewport();
-  // calculate the translation and scaling parameters
-  double muppX, muppY;
-      muppY = currentExtent.height()/height();
-      muppX = currentExtent.width()/width();
-      cout << "MuppX is: " << muppX << "\nMuppY is: " << muppY << endl;
-      m_mupp = muppY > muppX?muppY:muppX;
-      // calculate the actual extent of the mapCanvas
-      double dxmin,dxmax,dymin,dymax,whitespace;
-      if(muppY > muppX){
-	dymin = currentExtent.yMin();
-	dymax = currentExtent.yMax();
-	whitespace = ((width() *m_mupp) - currentExtent.width())/2;
-	dxmin = currentExtent.xMin() - whitespace;
-	dxmax = currentExtent.xMax() + whitespace;
-      }else{
-	dxmin = currentExtent.xMin();
-	dxmax =  currentExtent.xMax();
-	whitespace = ((height() *m_mupp) - currentExtent.height())/2;
-	dymin = currentExtent.yMin() - whitespace;
-	dymax = currentExtent.yMax() + whitespace;
-
-      }
-      cout << "dxmin: " << dxmin << endl << "dymin: " << dymin << endl << "dymax: " << dymax << endl << "whitespace: " << whitespace << endl;
-      coordXForm->setParameters(m_mupp, dxmin,dymin,height()); //currentExtent.xMin(), 	    currentExtent.yMin(), currentExtent.yMax());
-      // update the currentExtent to match the device coordinates
-      currentExtent.setXmin(dxmin);
-      currentExtent.setXmax(dxmax);
-      currentExtent.setYmin(dymin);
-      currentExtent.setYmax(dymax);
-  // render all layers in the stack, starting at the base
-  map<QString,QgsMapLayer *>::iterator mi = layers.begin();
-  while(mi != layers.end()){
-    QgsMapLayer *ml = (*mi).second;
-    //    QgsDatabaseLayer *dbl = (QgsDatabaseLayer *)&ml;
-    ml->draw(paint, &currentExtent, coordXForm);
-    mi++;
-    //  mi.draw(p, &fullExtent);
-  }
-  paint->end();
-
-}
-void QgsMapCanvas::render(){
-  QPainter *paint = new QPainter();
-  paint->begin(this);
-  currentExtent = fullExtent;
-  mapWindow->setLeft(currentExtent.xMin());
-  mapWindow->setBottom(currentExtent.yMin());
-  
-    // determine the dominate direction for the mapcanvas
-      if (width () > height ())
-	{
-	  mapWindow->setWidth(currentExtent.width());
-	  mapWindow->setHeight(currentExtent.width());
-	}
-      else
-	{
-	  mapWindow->setWidth(currentExtent.height());
-	  mapWindow->setHeight(currentExtent.height());
-	}
-     
-      paint->setWindow(*mapWindow);
-     
- QRect v = paint->viewport ();
-      int d = QMIN (v.width (), v.height ());
-      int dm = QMAX(v.width(), v.height());
-           paint->setViewport (v.left () + (v.width () - d) / 2,
-       		 v.top () + (v.height () - d) / 2, d, d);
-      
-  // render all layers in the stack, starting at the base
-  map<QString,QgsMapLayer *>::iterator mi = layers.begin();
-  int yTransform =  currentExtent.yMax();//mapWindow->bottom() -  abs(mapWindow->height() - currentExtent.height())/2;
-  while(mi != layers.end()){
-    QgsMapLayer *ml = (*mi).second;
-    //    QgsDatabaseLayer *dbl = (QgsDatabaseLayer *)&ml;
-    ml->draw(paint, &currentExtent, yTransform);
-    mi++;
-    //  mi.draw(p, &fullExtent);
-  }
-  paint->end();
-}
-void QgsMapCanvas::paintEvent(QPaintEvent *pe){
-  render2();
-}
-QgsRect QgsMapCanvas::extent(){
-  return currentExtent;
-}
-void QgsMapCanvas::setExtent(QgsRect r){
-  currentExtent = r;
-}
-void QgsMapCanvas::clear(){
-  QPainter *p = new QPainter();
-  p->begin(this);
-  p->eraseRect(this->rect());
-  p->end();
-  
-}
-void QgsMapCanvas::zoomFullExtent(){
-  currentExtent = fullExtent;
-  clear();
-  render2();
-}
diff --git a/qgsmapcanvas.h b/qgsmapcanvas.h
deleted file mode 100644
index 6733615d55e..00000000000
--- a/qgsmapcanvas.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/***************************************************************************
-                          qgsmapcanvas.h  -  description
-                             -------------------
-    begin                : Sun Jun 30 2002
-    copyright            : (C) 2002 by Gary E.Sherman
-    email                : sherman@mrcc.com
-***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef QGSMAPCANVAS_H
-#define QGSMAPCANVAS_H
-#include <map>
-#include <qwidget.h>
-#include <qevent.h>
-#include "qgsrect.h"
-class QRect;
-class QgsCoordinateTransform;
-class QgsMapLayer;
-
-/*! \class QgsMapCanvas
- * \brief Map canvas class for displaying all GIS data types.
- */
-
-class QgsMapCanvas : public QWidget  {
-    Q_OBJECT
-public: 
-    //! Constructor
-    QgsMapCanvas(QWidget *parent=0, const char *name=0);
-    //! Destructor
-    ~QgsMapCanvas();
-    /*! Adds a layer to the map canvas.
-     * @param lyr Pointer to a layer derived from QgsMapLayer
-     */
-    void addLayer(QgsMapLayer *lyr);
-    /*! Draw the map using the symbology set for each layer
-     */
-    void render();
-    void render2();
-    void clear();
-    double mupp();
-    QgsRect extent();
-    void setExtent(QgsRect );
-    void zoomFullExtent();
- private:
-    void paintEvent(QPaintEvent *pe);
-    //! map containing the layers by name
-    map<QString,QgsMapLayer *>layers;
-    //! Full extent of the map canvas
-    QgsRect fullExtent;
-    //! Current extent
-    QgsRect currentExtent;
-    QRect *mapWindow;
-    QgsCoordinateTransform *coordXForm;
-    double m_mupp;
-
-};
-
-#endif
diff --git a/qgsmaplayer.cpp b/qgsmaplayer.cpp
deleted file mode 100644
index 0dea75127f8..00000000000
--- a/qgsmaplayer.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/***************************************************************************
-                          qgsmaplayer.cpp  -  description
-                             -------------------
-    begin                : Fri Jun 28 2002
-    copyright            : (C) 2002 by Gary E.Sherman
-    email                : sherman@mrcc.com
-***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-#include <iostream>
-#include "qgsrect.h"
-#include "qgsmaplayer.h"
-
-QgsMapLayer::QgsMapLayer(int type, QString lyrname ) 
-  : QgsDataSource(), layerName(lyrname), layerType(type)
-{
-  // assume the layer is valid (data source exists and can be used)
-  // until we learn otherwise
-  valid = true;
-}
-QgsMapLayer::~QgsMapLayer(){
-} 
-const int QgsMapLayer::type(){
-  return layerType;
-}
-/** Write property of QString layerName. */
-void QgsMapLayer::setlayerName( const QString& _newVal){
-  layerName = _newVal;
-}
-/** Read property of QString layerName. */
-const QString QgsMapLayer::name(){
-  return layerName;
-}
-const QgsRect QgsMapLayer::extent(){
-  return layerExtent;
-}
-QgsRect QgsMapLayer::calculateExtent(){
-  
-}
-void QgsMapLayer::draw(QPainter *, QgsRect *viewExtent, int yTransform){
-  cout << "In QgsMapLayer::draw" << endl;
-}
-
-void QgsMapLayer::draw(QPainter *, QgsRect *, QgsCoordinateTransform *){
-  cout << "In QgsMapLayer::draw" << endl;
-}
-
-
diff --git a/qgsmaplayer.h b/qgsmaplayer.h
deleted file mode 100644
index 95dc0176137..00000000000
--- a/qgsmaplayer.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/***************************************************************************
-                          qgsmaplayer.h  -  description
-                             -------------------
-    begin                : Fri Jun 28 2002
-    copyright            : (C) 2002 by Gary E.Sherman
-    email                : sherman@mrcc.com
-***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef QGSMAPLAYER_H
-#define QGSMAPLAYER_H
-
-#include <qwidget.h>
-#include "qgsdatasource.h"
-#include "qgsrect.h"
-#include "qgscoordinatetransform.h"
-
-
-/** \class QgsMapLayer
- * \brief Base class for all map layer types.
- * This class is the base class for all map layer types (shapefile,
- * raster, database). 
- */
-class QgsMapLayer : public QgsDataSource  {
-
- public: 
-    /*! Constructor
-     * @param type Type of layer as defined in LAYERS enum
-     * @param lyrname Display Name of the layer
-     */
-    QgsMapLayer(int type=0, QString lyrname=QString::null );
-    //! Destructor
-    virtual ~QgsMapLayer();
-    /*! Get the type of the layer
-     * @return Integer matching a value in the LAYERS enum
-     */
-    const int type();
-    /*! Set the name of the layer
-      # @param name New name for the layer
-    */
-    void setlayerName( const QString& name);
-    /*! Get the name of the layer
-     * @return the layer name
-     */
-    const QString name();
-    /*! Virtual function to calculate the extent of the current layer.
-     * This function must be overridden in all child classes and implemented
-     * based on the layer type
-     */
-    virtual QgsRect calculateExtent();
-    virtual void draw(QPainter *, QgsRect *, int);
-    virtual void draw(QPainter *, QgsRect *, QgsCoordinateTransform *cXf);
-    /*! Return the extent of the layer as a QRect
-     */
-    const QgsRect extent();
-    /*! Returns the status of the layer. An invalid layer is one which has a bad datasource
-     * or other problem. Child classes set this flag when intialized
-     *@return True if the layer is valid and can be accessed
-     */
-    bool isValid();
-
- public: // Public attributes
-    //! Layers enum defining the types of layers that can be added to a map
-    enum LAYERS {
-	VECTOR,
-	RASTER,
-	DATABASE
-    }  ;
- protected:
-    //! Extent of the layer
-    QgsRect layerExtent; 
-    //! Position in the map stack 
-    int zpos;
-    //! Indicates if the layer is valid and can be drawn
-    bool valid;
- private: // Private attributes
-    /** Name of the layer - used for display  */
-    QString layerName;
-    /** Type of the layer (eg. vector, raster, database  */
-    int layerType;
-
-    //! Tag for embedding additional information
-    QString tag;
- 
-};
-
-#endif
diff --git a/qgsmarkersymbol.h b/qgsmarkersymbol.h
deleted file mode 100644
index 3ea4904dfb2..00000000000
--- a/qgsmarkersymbol.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/***************************************************************************
-                          qgsmarkersymbol.h  -  description
-                             -------------------
-    begin                : Sat Jun 22 2002
-    copyright            : (C) 2002 by Gary E.Sherman
-    email                : sherman@mrcc.com
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef QGSMARKERSYMBOL_H
-#define QGSMARKERSYMBOL_H
-
-class QString;
-
-/*! \class QgsMarkerSymbol
- * \brief Symbol for displaying markers (points)
- */
-class QgsMarkerSymbol : public QgsSymbol{
- public:
-    //! Constructor
-    QgsMarkerSymbol();
-    //! Destructor
-    ~QgsMarkerSymbol();
-          /*! Comparison operator
-      @return True if symbols are equal
-    */
-    bool operator==(const QgsMarkerSymbol &r1);
-    /*! Assignment operator
-     * @param r1 QgsMarkerSymbol to assign from
-     */
-    QgsMarkerSymbol & operator=(const QgsMarkerSymbol &r1);
- private:
-  
-};
-#endif // QGSMARKERSYMBOL_H
diff --git a/qgsnewconnection.cpp b/qgsnewconnection.cpp
deleted file mode 100644
index d312e109b7c..00000000000
--- a/qgsnewconnection.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/***************************************************************************
-                    qgsnewconnection.cpp  -  description
-                             -------------------
-    begin                : Sat Jun 22 2002
-    copyright            : (C) 2002 by Gary E.Sherman
-    email                : sherman@mrcc.com
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-#include <qsqldatabase.h>
-#include <qsettings.h>
-#include <qlineedit.h>
-#include <qmessagebox.h>
-#include "libpq++.h"
-#include "qgsnewconnection.h"
-
-QgsNewConnection::QgsNewConnection(QString connName):QgsNewConnectionBase(){
-  if(!connName.isEmpty()){
-    // populate the dialog with the information stored for the connection
-    // populate the fields with the stored setting parameters
-    QSettings settings;
-
-    QString key = "/Qgis/connections/" +connName;
-    txtHost->setText(settings.readEntry(key+"/host"));
-    txtDatabase->setText(settings.readEntry(key+"/database"));
-    txtUsername->setText(settings.readEntry(key+"/username"));
-    txtPassword->setText(settings.readEntry(key+"/password"));
-    txtName->setText(connName);
-  }
-}
-QgsNewConnection::~QgsNewConnection(){
-}
-void QgsNewConnection::testConnection(){
-  // following line uses Qt SQL plugin - currently not used
-  // QSqlDatabase *testCon = QSqlDatabase::addDatabase("QPSQL7","testconnection");
-
-  QString connInfo = "host=" + txtHost->text() +" dbname=" + txtDatabase->text() + " user=" + txtUsername->text() + " password=" + txtPassword->text();
-  PgDatabase *pd = new PgDatabase((const char *)connInfo);
-cout << pd->ErrorMessage();
-  if(pd->Status()==CONNECTION_OK){
-    // Database successfully opened; we can now issue SQL commands.
-    QMessageBox::information(this,"Test connection","Connection to " + 
-			     txtDatabase->text() +  " was successfull");
-  }else{
-    QMessageBox::information(this,"Test connection",
-			     "Connection failed - Check settings and try again ");
-  }
-  delete pd;
-
-
-}
- 
-
-
-void QgsNewConnection::saveConnection(){
-  QSettings settings;
-  QString baseKey = "/Qgis/connections/";
-  baseKey += txtName->text();
-  settings.writeEntry( baseKey + "/host",txtHost->text() );
-  settings.writeEntry( baseKey + "/database",txtDatabase->text() );
-  settings.writeEntry( baseKey + "/username",txtUsername->text() );
-  settings.writeEntry( baseKey + "/password",txtPassword->text() );   
-
-
-}
diff --git a/qgsnewconnection.h b/qgsnewconnection.h
deleted file mode 100644
index f37d5f5cb00..00000000000
--- a/qgsnewconnection.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/***************************************************************************
-                          qgsnewconnection.h  -  description
-                             -------------------
-    begin                : Sat Jun 22 2002
-    copyright            : (C) 2002 by Gary E.Sherman
-    email                : sherman@mrcc.com
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-#ifndef QGSNEWCONNECTION_H
-#define QGSNEWCONNECTION_H
-#include "qgsnewconnectionbase.h"
-/*! \class QgsNewConnection
- * \brief Dialog to allow the user to configure and save connection
- * information for a PostgresQl database
- */
-class QgsNewConnection : public QgsNewConnectionBase 
-{
- public:
-    //! Constructor
-    QgsNewConnection(QString connName= QString::null);
-    //! Destructor
-    ~QgsNewConnection();
-    //! Tests the connection using the parameters supplied
-    void testConnection();
-    //! Saves the connection to ~/.qt/qgisrc
-    void saveConnection();
-};
-
-#endif //  QGSNEWCONNECTIONBASE_H
diff --git a/qgsnewconnectionbase.ui b/qgsnewconnectionbase.ui
deleted file mode 100644
index 5a883692482..00000000000
--- a/qgsnewconnectionbase.ui
+++ /dev/null
@@ -1,313 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>QgsNewConnectionBase</class>
-<widget class="QDialog">
-    <property name="name">
-        <cstring>QgsNewConnectionBase</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>392</width>
-            <height>196</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>Create a New PostGIS connection</string>
-    </property>
-    <property name="sizeGripEnabled">
-        <bool>true</bool>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>11</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QLayoutWidget" row="0" column="1">
-            <property name="name">
-                <cstring>Layout5</cstring>
-            </property>
-            <vbox>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>0</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QPushButton">
-                    <property name="name">
-                        <cstring>buttonOk</cstring>
-                    </property>
-                    <property name="font">
-                        <font>
-                            <pointsize>10</pointsize>
-                        </font>
-                    </property>
-                    <property name="text">
-                        <string>OK</string>
-                    </property>
-                    <property name="accel">
-                        <number>0</number>
-                    </property>
-                    <property name="autoDefault">
-                        <bool>true</bool>
-                    </property>
-                    <property name="default">
-                        <bool>true</bool>
-                    </property>
-                </widget>
-                <widget class="QPushButton">
-                    <property name="name">
-                        <cstring>buttonCancel</cstring>
-                    </property>
-                    <property name="font">
-                        <font>
-                            <pointsize>10</pointsize>
-                        </font>
-                    </property>
-                    <property name="text">
-                        <string>Cancel</string>
-                    </property>
-                    <property name="accel">
-                        <number>0</number>
-                    </property>
-                    <property name="autoDefault">
-                        <bool>true</bool>
-                    </property>
-                </widget>
-                <widget class="QPushButton">
-                    <property name="name">
-                        <cstring>buttonHelp</cstring>
-                    </property>
-                    <property name="font">
-                        <font>
-                            <pointsize>10</pointsize>
-                        </font>
-                    </property>
-                    <property name="text">
-                        <string>Help</string>
-                    </property>
-                    <property name="accel">
-                        <number>4144</number>
-                    </property>
-                    <property name="autoDefault">
-                        <bool>true</bool>
-                    </property>
-                </widget>
-                <spacer>
-                    <property name="name">
-                        <cstring>Spacer1</cstring>
-                    </property>
-                    <property name="orientation">
-                        <enum>Vertical</enum>
-                    </property>
-                    <property name="sizeType">
-                        <enum>Expanding</enum>
-                    </property>
-                </spacer>
-            </vbox>
-        </widget>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="font">
-                <font>
-                    <family>Helvetica [Urw]</family>
-                    <pointsize>10</pointsize>
-                </font>
-            </property>
-            <property name="title">
-                <string>Connection Information</string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="2">
-                    <property name="name">
-                        <cstring>txtHost</cstring>
-                    </property>
-                </widget>
-                <widget class="QLabel" row="1" column="0">
-                    <property name="name">
-                        <cstring>TextLabel1</cstring>
-                    </property>
-                    <property name="font">
-                        <font>
-                            <family>Helvetica [Adobe]</family>
-                            <pointsize>11</pointsize>
-                        </font>
-                    </property>
-                    <property name="text">
-                        <string>Host</string>
-                    </property>
-                </widget>
-                <widget class="QLineEdit" row="2" column="1" rowspan="1" colspan="2">
-                    <property name="name">
-                        <cstring>txtDatabase</cstring>
-                    </property>
-                </widget>
-                <widget class="QLabel" row="2" column="0">
-                    <property name="name">
-                        <cstring>TextLabel2</cstring>
-                    </property>
-                    <property name="font">
-                        <font>
-                            <family>helvetica</family>
-                            <pointsize>11</pointsize>
-                        </font>
-                    </property>
-                    <property name="text">
-                        <string>Database</string>
-                    </property>
-                </widget>
-                <widget class="QLineEdit" row="3" column="1">
-                    <property name="name">
-                        <cstring>txtUsername</cstring>
-                    </property>
-                </widget>
-                <widget class="QLabel" row="3" column="0">
-                    <property name="name">
-                        <cstring>TextLabel3</cstring>
-                    </property>
-                    <property name="font">
-                        <font>
-                            <family>Helvetica [Adobe]</family>
-                            <pointsize>11</pointsize>
-                        </font>
-                    </property>
-                    <property name="text">
-                        <string>Username</string>
-                    </property>
-                </widget>
-                <widget class="QLineEdit" row="4" column="1">
-                    <property name="name">
-                        <cstring>txtPassword</cstring>
-                    </property>
-                    <property name="echoMode">
-                        <enum>Password</enum>
-                    </property>
-                </widget>
-                <widget class="QLabel" row="0" column="0">
-                    <property name="name">
-                        <cstring>TextLabel1_2</cstring>
-                    </property>
-                    <property name="font">
-                        <font>
-                            <family>Helvetica [Adobe]</family>
-                            <pointsize>11</pointsize>
-                        </font>
-                    </property>
-                    <property name="text">
-                        <string>Name</string>
-                    </property>
-                </widget>
-                <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="2">
-                    <property name="name">
-                        <cstring>txtName</cstring>
-                    </property>
-                    <property name="toolTip" stdset="0">
-                        <string>Name of the new connection</string>
-                    </property>
-                </widget>
-                <widget class="QLabel" row="4" column="0">
-                    <property name="name">
-                        <cstring>TextLabel3_2</cstring>
-                    </property>
-                    <property name="font">
-                        <font>
-                            <family>helvetica</family>
-                            <pointsize>11</pointsize>
-                        </font>
-                    </property>
-                    <property name="text">
-                        <string>Password</string>
-                    </property>
-                </widget>
-                <widget class="QPushButton" row="3" column="2" rowspan="2" colspan="1">
-                    <property name="name">
-                        <cstring>btnConnect</cstring>
-                    </property>
-                    <property name="font">
-                        <font>
-                        </font>
-                    </property>
-                    <property name="text">
-                        <string>Test Connect</string>
-                    </property>
-                </widget>
-                <widget class="QCheckBox" row="5" column="1" rowspan="1" colspan="2">
-                    <property name="name">
-                        <cstring>chkStorePassword</cstring>
-                    </property>
-                    <property name="font">
-                        <font>
-                        </font>
-                    </property>
-                    <property name="text">
-                        <string>Save Password</string>
-                    </property>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<connections>
-    <connection>
-        <sender>buttonCancel</sender>
-        <signal>clicked()</signal>
-        <receiver>QgsNewConnectionBase</receiver>
-        <slot>reject()</slot>
-    </connection>
-    <connection>
-        <sender>btnConnect</sender>
-        <signal>clicked()</signal>
-        <receiver>QgsNewConnectionBase</receiver>
-        <slot>testConnection()</slot>
-    </connection>
-    <connection>
-        <sender>buttonOk</sender>
-        <signal>clicked()</signal>
-        <receiver>QgsNewConnectionBase</receiver>
-        <slot>accept()</slot>
-    </connection>
-    <connection>
-        <sender>buttonOk</sender>
-        <signal>clicked()</signal>
-        <receiver>QgsNewConnectionBase</receiver>
-        <slot>saveConnection()</slot>
-    </connection>
-</connections>
-<tabstops>
-    <tabstop>txtName</tabstop>
-    <tabstop>txtHost</tabstop>
-    <tabstop>txtDatabase</tabstop>
-    <tabstop>txtUsername</tabstop>
-    <tabstop>txtPassword</tabstop>
-    <tabstop>chkStorePassword</tabstop>
-    <tabstop>btnConnect</tabstop>
-    <tabstop>buttonOk</tabstop>
-    <tabstop>buttonCancel</tabstop>
-    <tabstop>buttonHelp</tabstop>
-</tabstops>
-<slots>
-    <slot>saveConnection()</slot>
-    <slot>testConnection()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/qgspoint.cpp b/qgspoint.cpp
deleted file mode 100644
index c80784a4479..00000000000
--- a/qgspoint.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/***************************************************************************
-                          qgspoint.cpp -  description
-                             -------------------
-    begin                : Sat Jun 22 2002
-    copyright            : (C) 2002 by Gary E.Sherman
-    email                : sherman@mrcc.com
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-#include "qgspoint.h"
-QgsPoint::QgsPoint(){
-}
-
-QgsPoint::QgsPoint(double x, double y) : m_x(x), m_y(y){
- 
-}
-
-QgsPoint::~QgsPoint(){
-}
-
-double QgsPoint::x() const {
-  return m_x;
-}
-
-double QgsPoint::y() const {
-  return m_y;
-}
-int QgsPoint::xToInt() {
-  return (int)m_x;
-}
-int QgsPoint::yToInt() {
-  return (int)m_y;
-}
-bool QgsPoint::operator==(const QgsPoint &other){
-  if((m_x == other.x()) && (m_y == other.y()))
-    return true;
-  else
-    return false;
-}
-bool QgsPoint::operator!=(const QgsPoint &other){
-  if((m_x == other.x()) && (m_y == other.y()))
-    return false;
-  else
-    return true;
-}
-
-QgsPoint & QgsPoint::operator=(const QgsPoint &other){
-  if(&other != this){
-    m_x = other.x();
-    m_y = other.y();
-  }
-  
-    return *this;
-}
diff --git a/qgspoint.h b/qgspoint.h
deleted file mode 100644
index ae9dad12ca2..00000000000
--- a/qgspoint.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/***************************************************************************
-                          qgspoint.h  -  description
-                             -------------------
-    begin                : Sat Jun 22 2002
-    copyright            : (C) 2002 by Gary E.Sherman
-    email                : sherman@mrcc.com
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef QGSPOINT_H
-#define QGSPOINT_H
-class QString;
-
-class QgsPoint {
- private:
-    //! x coordinate
-    double m_x;
-    //! y coordinate 
-    double m_y;
-  
-  
- public:
-    /// Default constructor
-	QgsPoint();
-    
-	/*! Create a point from x,y coordinates
-	 * @param x x coordinate
-	 * @param y y coordinate
-	 */
-	QgsPoint(double x, double y);
-	~QgsPoint();
-	/*! Sets the x value of the point
-	 * @param x x coordinate
-	 */
-	void setX(double x);
-
-	/*! Sets the y value of the point
-	 * @param y y coordinate
-	 */
-	void setY(double y);
-    
-    
-	/*! Get the x value of the point
-	 * @return x coordinate
-	 */
-	double x() const;
-	int xToInt();
-	/*! Get the y value of the point
-	 * @return y coordinate 
-	 */
-	double y(void) const;
-	int yToInt();
-	//! equality operator
-	bool operator==(const QgsPoint &other);
-    
-	//! Inequality operator
-	bool operator!=(const QgsPoint &other);
-    
-	/// Assignment
-	QgsPoint & operator=(const QgsPoint &other);
-};
-inline bool operator==(const QgsPoint &p1, const QgsPoint &p2){
-    if((p1.x() == p2.x()) && (p1.y() == p2.y()))
-	return true;
-    else
-	return false;
-}
-#endif //QGSPOINT_H
diff --git a/qgspolygonsymbol.h b/qgspolygonsymbol.h
deleted file mode 100644
index 255a8bab29c..00000000000
--- a/qgspolygonsymbol.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/***************************************************************************
-                          qgspolygonsymbol.h  -  description
-                             -------------------
-    begin                : Sat Jun 22 2002
-    copyright            : (C) 2002 by Gary E.Sherman
-    email                : sherman@mrcc.com
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef QGSPOLYGONSYMBOL_H
-#define QGSPOLYGONSYMBOL_H
-
-class QString;
-
-/*! \class QgsPolygonSymbol
- * \brief Symbol for displaying polygons
- */
-class QgsPolygonSymbol : public QgsSymbol{
- public:
-    //! Constructor
-    QgsPolygonSymbol();
-    //! Destructor
-    ~QgsPolygonSymbol();
-          /*! Comparison operator
-      @return True if symbols are equal
-    */
-    bool operator==(const QgsPolygonSymbol &r1);
-    /*! Assignment operator
-     * @param r1 QgsPolygonSymbol to assign from
-     */
-    QgsPolygonSymbol & operator=(const QgsPolygonSymbol &r1);
- private:
-  
-};
-#endif // QGSPOLYGONSYMBOL_H
diff --git a/qgsrasterlayer.cpp b/qgsrasterlayer.cpp
deleted file mode 100644
index a0bd66ec10d..00000000000
--- a/qgsrasterlayer.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-/***************************************************************************
-                    qgsrasterlayer.cpp -  description
-                             -------------------
-    begin                : Sat Jun 22 2002
-    copyright            : (C) 2002 by Gary E.Sherman
-    email                : sherman@mrcc.com
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-#include "qgsrasterlayer.h"
-QgsRasterLayer::QgsRasterLayer(){
-}
-QgsRasterLayer::~QgsRasterLayer(){
-}
-void QgsRasterLayer::draw(QPainter *p, QRect *viewExtent){
-}
diff --git a/qgsrasterlayer.h b/qgsrasterlayer.h
deleted file mode 100644
index 60418ee8882..00000000000
--- a/qgsrasterlayer.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/***************************************************************************
-                          gsrasterlayer.h  -  description
-                             -------------------
-    begin                : Fri Jun 28 2002
-    copyright            : (C) 2002 by Gary E.Sherman
-    email                : sherman@mrcc.com
-***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef QGSRASTERLAYER_H
-#define QGSRASTERLAYER_H
-
-#include "qgsmaplayer.h"
-/*! \class QgsRasterLayer
- * \brief Raster layer class
- */
-
-class QgsRasterLayer : public QgsMapLayer  {
- public: 
-    //! Constructor
-    QgsRasterLayer();
-    //! Destructor
-    ~QgsRasterLayer();
-    void draw(QPainter *p, QRect *viewExtent);
-};
-
-#endif
diff --git a/qgsrect.cpp b/qgsrect.cpp
deleted file mode 100644
index 8693909544b..00000000000
--- a/qgsrect.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-/***************************************************************************
-                          qgsrect.cpp  -  description
-                             -------------------
-    begin                : Sat Jun 22 2002
-    copyright            : (C) 2002 by Gary E.Sherman
-    email                : sherman@mrcc.com
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-#include <qstring.h>
-#include "qgsrect.h"
-QgsRect::QgsRect(double minX, double minY, double maxX, double maxY) :
-  xmin(minX), ymin(minY), xmax(maxX), ymax(maxY){
-}
-QgsRect::~QgsRect(){
-}
-void QgsRect::setXmin(double x){
-  xmin = x;
-}
-void QgsRect::setXmax(double x){
-  xmax = x;
-}
-void QgsRect::setYmin(double y){
-  ymin = y;
-}
-void QgsRect::setYmax(double y){
-  ymax = y;
-}
-double QgsRect::xMax() const {
-  return xmax;
-}
-double QgsRect::xMin() const {
-  return xmin;
-}
-double QgsRect::yMax() const {
-  return ymax;
-}
-double QgsRect::yMin() const {
-  return ymin;
-}
-double QgsRect::width() const{
-  return xmax - xmin;
-}
-double QgsRect::height() const {
-  return ymax - ymin;
-}
-void QgsRect::normalize(){
-  double temp;
-  if( xmin > xmax){
-    temp = xmin;
-    xmin = xmax;
-    xmax = temp;
-  }
-  if(ymin > ymax){
-    temp = ymin;
-    ymin = ymax;
-    ymax = temp;
-  }
-}
-void QgsRect::scale(double scaleFactor){
-  // scale from the center
-  double centerX = xmin + width()/2;
-  double centerY = ymin + height()/2;
-  xmin = centerX - (width()*scaleFactor)/2;
-  xmax = xmin + width()*scaleFactor;
-  ymin = centerY - (height()*scaleFactor)/2;
-  ymax = ymin + height()*scaleFactor;
-}
-QString QgsRect::stringRep() const{
-  QString tmp;
-  QString rep = tmp.setNum(xmin);;
-  rep += " ";
-  rep += tmp.setNum(ymin);
-  rep += ",";
-  rep += tmp.setNum(xmax);
-  rep += " ";
-  rep += tmp.setNum(ymax);
-  return rep;
-}
-bool QgsRect::operator==(const QgsRect &r1){
-  return (r1.xMax() == this->xMax() && r1.xMin() == this->xMin() &&
-	  r1.yMax() == this->yMax() && r1.yMin() == this->yMin());
-}
-
-QgsRect & QgsRect::operator=(const QgsRect &r){
-  if(&r != this){
-    xmax = r.xMax();
-    xmin = r.xMin();
-    ymax = r.yMax();
-    ymin = r.yMin();
-  }
-    return *this;
-  
-  
-}
diff --git a/qgsrect.h b/qgsrect.h
deleted file mode 100644
index f7004c72840..00000000000
--- a/qgsrect.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/***************************************************************************
-                          qgsrect.h  -  description
-                             -------------------
-    begin                : Sat Jun 22 2002
-    copyright            : (C) 2002 by Gary E.Sherman
-    email                : sherman@mrcc.com
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef QGSRECT_H
-#define QGSRECT_H
-
-class QString;
-
-/*! \class QgsRect
- * \brief A rectangle specified with double values.
- *
- * QgsRect is used to store a rectangle when double values are required. 
- * Examples are storing a layer extent or the current view extent of a map
- */
-class QgsRect{
- public:
-    //! Constructor
-    QgsRect(double xmin=0, double ymin=0, double xmax=0, double ymax=0);
-    //! Destructor
-    ~QgsRect();
-    //! Set the minimum x value
-    void setXmin(double x);
-    //! Set the maximum x value
-    void setXmax(double x);
-    //! Set the maximum y value
-    void setYmin(double y);
-    //! Set the maximum y value
-    void setYmax(double y);
-    //! Get the x maximum value (right side of rectangle)
-    double xMax() const;
-    //! Get the x maximum value (right side of rectangle)
-    double xMin() const;
-    //! Get the x minimum value (left side of rectangle)
-    double yMax() const;
-    //! Get the y maximum value (top side of rectangle)
-    double yMin() const;
-    //! Normalize the rectangle so it has non-negative width/height
-    void normalize();
-    //! Width of the rectangle
-    double width() const;
-    //! Height of the rectangle
-    double height() const;
-    //! Scale the rectangle around its center point
-    void scale(double);
-    //! returns string representation of form xmin,ymin xmax,ymax
-    QString stringRep() const;
-    /*! Comparison operator
-      @return True if rectangles are equal
-    */
-    bool operator==(const QgsRect &r1);
-    /*! Assignment operator
-     * @param r1 QgsRect to assign from
-     */
-    QgsRect & operator=(const QgsRect &r1);
- private:
-    double xmax;
-    double xmin;
-    double ymax;
-    double ymin;
-};
-#endif // QGSRECT_H
diff --git a/qgsshapefilelayer.h b/qgsshapefilelayer.h
deleted file mode 100644
index 80b46d7f9b6..00000000000
--- a/qgsshapefilelayer.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/***************************************************************************
-                          gsshapefilelayer.h  -  description
-                             -------------------
-    begin                : Wed Jun 26 2002
-    copyright            : (C) 2002 by Gary E.Sherman
-    email                : sherman@mrcc.com
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef QGSSHAPEFILELAYER_H
-#define QGSSHAPEFILELAYER_H
-
-#include <qgsmaplayer.h>
-
-/*! \class QgsShapeFileLayer
- * \brief Shapefile layer
- */
-
-class QgsShapeFileLayer : public QgsMapLayer  {
-public: 
-    //! Constructor
-	QgsShapeFileLayer();
-	//! Destructor
-	~QgsShapeFileLayer();
-       
-enum SHAPETYPE {
-	Point,
-	Line,
-	Polygon
-};
-
-};
-
-#endif
diff --git a/qgssymbol.h b/qgssymbol.h
deleted file mode 100644
index 997fdcc4c9f..00000000000
--- a/qgssymbol.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/***************************************************************************
-                          qgssymbol.h  -  description
-                             -------------------
-    begin                : Sat Jun 22 2002
-    copyright            : (C) 2002 by Gary E.Sherman
-    email                : sherman@mrcc.com
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef QGSSYMBOL_H
-#define QGSSYMBOL_H
-
-class QString;
-class QColor;
-
-/*! \class QgsSymbol
- * \brief Base class for symbols used in rendering map layers.
- */
-class QgsSymbol{
- public:
-    //! Constructor
-    QgsSymbol();
-    //! Set the color
-    void setColor(QColor c);
-    //! Get the current color
-    QColor color();
-    //! Destructor
-    ~QgsSymbol();
-          /*! Comparison operator
-      @return True if symbols are equal
-    */
-    bool operator==(const QgsSymbol &r1);
-    /*! Assignment operator
-     * @param r1 QgsSymbol to assign from
-     */
-    QgsSymbol & operator=(const QgsSymbol &r1);
- private:
-    QColor m_color;
-};
-#endif // QGSSYMBOL_H
diff --git a/qgstable.h b/qgstable.h
deleted file mode 100644
index dc753999e33..00000000000
--- a/qgstable.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/***************************************************************************
-                          gstable.h  -  description
-                             -------------------
-    begin                : Sun Jun 30 2002
-    copyright            : (C) 2002 by Gary E.Sherman
-    email                : sherman@mrcc.com
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef QGSTABLE_H
-#define QGSTABLE_H
-
-#include <qgsdatasource.h>
-
-/*! \class QgsTable
- * \brief Class to represent an attribute table related
- * to a map layer of any type
- */
-
-class QgsTable : public QgsDataSource  {
-public: 
-    //! Constructor
-	QgsTable();
-	//! Destructor
-	~QgsTable();
-};
-
-#endif
diff --git a/xpm/addlayericon.xpm b/xpm/addlayericon.xpm
deleted file mode 100644
index d450a4c5f1f..00000000000
--- a/xpm/addlayericon.xpm
+++ /dev/null
@@ -1,28 +0,0 @@
-/* XPM */
-static char *addlayericon[]={
-"22 22 3 1",
-". c None",
-"# c #000080",
-"a c #ffffff",
-"......................",
-"..........##a.........",
-"..........##aa........",
-"..........##aa........",
-"..........##aa........",
-"..........##aa........",
-"..........##aa........",
-"..........##aa........",
-"..........##aa........",
-"..##################a.",
-"..##################a.",
-"..aaaaaaaa##aaaaaaaaa.",
-"..aaaaaaaa##aaaaaaaaa.",
-"..........##aa........",
-"..........##aa........",
-"..........##aa........",
-"..........##aa........",
-"..........##aa........",
-"..........##aa........",
-"..........##aa........",
-"..........aaaa........",
-"..........aaa........."};
diff --git a/xpm/line_layer.xpm b/xpm/line_layer.xpm
deleted file mode 100644
index a950158937e..00000000000
--- a/xpm/line_layer.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static const char * line_layer_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #5272FF",
-"                ",
-" ..          .  ",
-"  ..        ..  ",
-"   .     ....   ",
-"    .    .      ",
-"    ...  .      ",
-"      ....      ",
-"      ..        ",
-"      ..        ",
-"      .         ",
-"     ..         ",
-"    ..          ",
-"   ..           ",
-"  ..            ",
-"  .             ",
-"                "};
-
diff --git a/xpm/open.xpm b/xpm/open.xpm
deleted file mode 100644
index 6b613ca59f1..00000000000
--- a/xpm/open.xpm
+++ /dev/null
@@ -1,127 +0,0 @@
-/* XPM */
-static char *open[]={
-"24 24 100 2",
-"Qt c None",
-".# c #000000",
-".a c #093759",
-"#H c #164774",
-"#F c #194b78",
-"#D c #1d507c",
-"#E c #20537f",
-"#B c #245783",
-"#C c #275b86",
-"#y c #285c87",
-"#z c #2b5f8a",
-".X c #2c7097",
-"#A c #2d628c",
-".J c #2d7198",
-"#v c #2e648e",
-".8 c #2f7399",
-".Y c #30749a",
-"#w c #316791",
-".K c #31759b",
-"#m c #326892",
-".9 c #32779c",
-".Z c #33789e",
-".R c #343434",
-"#x c #346a93",
-"#n c #356b95",
-".L c #35799f",
-".C c #367b9f",
-".w c #367d9b",
-".0 c #377ca0",
-"#o c #386f98",
-".M c #387ea1",
-"#e c #397099",
-".D c #3a7fa2",
-".B c #3b5b70",
-"#p c #3b729a",
-".1 c #3b80a4",
-"#f c #3c739c",
-".N c #3c82a5",
-"#. c #3d759d",
-".E c #3d83a6",
-".z c #3e84a7",
-"#g c #3f779f",
-".O c #3f86a7",
-".F c #4187a8",
-".2 c #4288a9",
-".A c #4288aa",
-".P c #438aab",
-".G c #448bac",
-".Q c #468dad",
-".x c #4987a5",
-".y c #4a88a5",
-".t c #4b88a5",
-".u c #4c89a5",
-".v c #4d89a6",
-".q c #4d8aa6",
-".r c #4e8aa6",
-".n c #4f8ba6",
-".o c #508ba6",
-".p c #518ca7",
-".j c #528ca7",
-".s c #528da7",
-".f c #538da7",
-".k c #548da7",
-".g c #548ea7",
-".l c #558ea7",
-".h c #558ea8",
-".d c #568ea8",
-".i c #568fa8",
-".b c #578fa8",
-".m c #588fa8",
-".c c #5890a8",
-".e c #5990a8",
-"#G c #5b5b5b",
-"#u c #727272",
-"#t c #bebebe",
-"#s c #c0c0c0",
-"#l c #c2c2c2",
-"#r c #c4c4c4",
-"#k c #c7c7c7",
-"#q c #c9c9c9",
-"#j c #cbcbcb",
-"#d c #cdcdcd",
-"#i c #d0d0d0",
-"#c c #d2d2d2",
-"#h c #d4d4d4",
-"#b c #d7d7d7",
-".7 c #d9d9d9",
-"#a c #dbdbdb",
-".6 c #dddddd",
-"## c #e0e0e0",
-".5 c #e2e2e2",
-".W c #e4e4e4",
-".4 c #e7e7e7",
-".V c #e9e9e9",
-".3 c #ebebeb",
-".U c #ededed",
-".I c #f0f0f0",
-".T c #f2f2f2",
-".H c #f4f4f4",
-".S c #f7f7f7",
-"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.#.#.#.#QtQtQt",
-"QtQtQtQtQtQt.a.aQtQtQtQtQtQt.#Qt.#.#.#.#.#.#.#Qt",
-"QtQtQtQtQt.a.b.c.a.aQtQtQtQt.#.#.#.#QtQtQtQt.#.#",
-"QtQtQtQtQt.a.d.b.c.e.a.aQtQt.#.#.#QtQtQtQtQtQt.#",
-"QtQtQtQt.a.f.g.h.i.b.c.e.aQt.#.#.#.#QtQtQtQtQt.#",
-"QtQtQtQt.a.j.f.k.l.d.b.m.a.#QtQtQtQtQtQtQtQtQt.#",
-"QtQtQt.a.n.o.p.j.f.k.h.i.b.a.aQtQtQtQtQtQtQt.#Qt",
-"QtQtQt.a.q.r.n.f.k.s.f.g.h.i.b.a.aQtQtQtQtQt.#Qt",
-"QtQt.a.t.u.v.o.p.j.w.w.f.k.l.d.b.c.a.aQtQt.#QtQt",
-"QtQt.a.x.y.q.r.n.w.z.A.w.w.f.g.h.i.b.c.aQtQtQtQt",
-"Qt.a.B.B.t.u.v.w.C.D.E.F.G.w.w.k.l.d.b.a.#QtQtQt",
-"Qt.a.H.I.B.B.w.J.K.L.M.N.O.P.Q.w.w.k.a.#.#QtQtQt",
-".R.S.T.U.V.W.B.B.X.Y.Z.0.1.z.2.Q.Q.w.a.#QtQtQtQt",
-".R.H.I.3.4.5.6.7.B.B.8.9.C.D.E.F.G.a#..a.aQtQtQt",
-".R.T.U.V.W###a#b#c#d.B.B.K.L.M.N.O.a#e#f#g.aQtQt",
-".R.I.3.4.5.6.7#h#i#j#k#l.B.B.Z.0.a#m#n#o#p.a.#Qt",
-"Qt.R.R.W###a#b#c#d#q#r#s#t#u.B.B.a#v#w#x.a.#.#Qt",
-"QtQt.#.R.R.7#h#i#j#k#l#u#u#t#t.a#y#z#A.a.#.#QtQt",
-"QtQtQtQt.#.R.R#d#q#u#u#t#t#u#u.a#B#C.a.#.#QtQtQt",
-"QtQtQtQtQtQt.#.R.R#t#t#u#u#t.R#D#E.a.#.#QtQtQtQt",
-"QtQtQtQtQtQtQtQt.#.R.R#t#t#u.R#F.a.#.#QtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtQt.#.R.R#G#H.a.#.#QtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtQtQtQt.#.R.R.#.#QtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt"};
diff --git a/xpm/pan.xpm b/xpm/pan.xpm
deleted file mode 100644
index 88c167dff63..00000000000
--- a/xpm/pan.xpm
+++ /dev/null
@@ -1,28 +0,0 @@
-/* XPM */
-static char *pan[]={
-"22 22 3 1",
-". c None",
-"# c #000000",
-"a c #ffffff",
-"......................",
-"......................",
-"......###.####........",
-".....##a###aa#........",
-".....#aaa##aa###......",
-".....#aaaa#aa#aa#.....",
-".....##aaa#aaaaa###...",
-"..###.#aaaaaaaaa#a#...",
-"..#a###aaaaaaaaa#a#...",
-"..#aa##aaaaaaaaaaa#...",
-"..#aaaaaaaaaaaaaaa#...",
-"..##aaaaaaaaaaaaaa#...",
-"...#aaaaaaaaaaaaa##...",
-"...#aaaaaaaaaaaaa#....",
-"...##aaaaaaaaaaa##....",
-"....##aaaaaaaaa##.....",
-".....##aaaaaaaa#......",
-"......#aaaaaaa##......",
-"......#aaaaaa#........",
-"......##aaaa##........",
-".......######.........",
-"......................"};
diff --git a/xpm/point_layer.xpm b/xpm/point_layer.xpm
deleted file mode 100644
index c9fe20be089..00000000000
--- a/xpm/point_layer.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static const char *point_layer_xpm[]={
-"16 16 4 1",
-". c None",
-"b c #008080",
-"a c #00c0c0",
-"# c #00ffff",
-"................",
-"................",
-"................",
-"................",
-"................",
-"......#aa.......",
-".....###ab......",
-"....####abb.....",
-"....####aab.....",
-"....####abb.....",
-".....ababb......",
-"......bbb.......",
-"................",
-"................",
-"................",
-"................"};
diff --git a/xpm/polygon_layer.xpm b/xpm/polygon_layer.xpm
deleted file mode 100644
index 862e0c79657..00000000000
--- a/xpm/polygon_layer.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static const char *polygon_layer_xpm[]={
-"16 16 3 1",
-". c None",
-"a c #00c000",
-"# c #ddfcc9",
-".........###....",
-".......######...",
-"....####aaa##...",
-"..#####aaaaa##..",
-"..##aaaaaaaa##..",
-".##aaaaaaaa###..",
-".##aaaaaaaaa###.",
-".###aaaaaaaaa##.",
-"...###aaaaaaaa##",
-"....##aaaaaaaa##",
-"....##aaaaaaaa##",
-".....##aaaaaa###",
-".....###aaaa####",
-"......########..",
-"........#####...",
-"................"};
diff --git a/xpm/qgis.xpm b/xpm/qgis.xpm
deleted file mode 100644
index 36b0ba2daf9..00000000000
--- a/xpm/qgis.xpm
+++ /dev/null
@@ -1,75 +0,0 @@
-/* XPM */
-static const char * qgis_xpm[] = {
-"16 16 56 1",
-" 	c None",
-".	c #FFFFFF",
-"+	c #F5F7FE",
-"@	c #D5DDFD",
-"#	c #C7D0F5",
-"$	c #D6DBEE",
-"%	c #F6F6F7",
-"&	c #D6E0FE",
-"*	c #E6EDFF",
-"=	c #D3DFFF",
-"-	c #8EA2F6",
-";	c #697AC3",
-">	c #D3D6E1",
-",	c #FEFFFF",
-"'	c #EFF3FD",
-")	c #95A1D9",
-"!	c #445393",
-"~	c #EEEFF1",
-"{	c #FBFBFB",
-"]	c #BEC2D6",
-"^	c #4F5B92",
-"/	c #A9ADBD",
-"(	c #FDFEFF",
-"_	c #F9FBFE",
-":	c #ECECEF",
-"<	c #B3B6C3",
-"[	c #4F5882",
-"}	c #868A9D",
-"|	c #EAEBEE",
-"1	c #F4F5F6",
-"2	c #FAFBFD",
-"3	c #DFE5FC",
-"4	c #B1BDF0",
-"5	c #AAB2D0",
-"6	c #8389A3",
-"7	c #323C65",
-"8	c #A8ABBA",
-"9	c #F5F5F7",
-"0	c #B2B5C3",
-"a	c #D1D3D8",
-"b	c #A5AFD6",
-"c	c #5F72C3",
-"d	c #4B5CA3",
-"e	c #323E74",
-"f	c #30385C",
-"g	c #D3D5E1",
-"h	c #666E93",
-"i	c #5D6792",
-"j	c #3E4B82",
-"k	c #2A3565",
-"l	c #31395C",
-"m	c #CBCCD4",
-"n	c #F0F0F1",
-"o	c #B5B6BD",
-"p	c #93949B",
-"q	c #B7B7BA",
-"................",
-"................",
-"................",
-"................",
-"......+@#$%.....",
-"......&*=-;>....",
-"........,')!~...",
-".........{]^/...",
-".......(_:<[}...",
-"....|12345678...",
-"....90abcdef~...",
-".....ghijklm....",
-"......nopqn.....",
-"................",
-"................",
-"................"};
diff --git a/xpm/reload.xpm b/xpm/reload.xpm
deleted file mode 100644
index b8652adce55..00000000000
--- a/xpm/reload.xpm
+++ /dev/null
@@ -1,168 +0,0 @@
-/* XPM */
-static const char *reload_xpm[]={
-"22 22 143 2",
-"Qt c None",
-".9 c #000000",
-"#V c #010101",
-"#Q c #030303",
-"#7 c #070707",
-"a. c #080808",
-"#P c #0a0a0a",
-"a# c #0b0b0b",
-"aj c #0d0d0d",
-".D c #101800",
-".w c #112405",
-"ak c #121212",
-".x c #121600",
-".f c #141400",
-"#9 c #141414",
-".P c #142908",
-".z c #142b0a",
-"#q c #151515",
-".X c #161600",
-".8 c #16310c",
-"#. c #171717",
-".H c #17320c",
-"#i c #191919",
-".W c #192c0b",
-"#2 c #1a1a1a",
-".e c #1a330d",
-".q c #1b3e0f",
-"aa c #1c1c1c",
-".b c #1c3f10",
-".c c #1c4110",
-"am c #1d1d1d",
-".g c #1d4613",
-".p c #1e4917",
-"ae c #1f1f1f",
-".y c #212106",
-"al c #212121",
-".d c #213b14",
-".# c #215017",
-"#D c #222222",
-".a c #225118",
-"#U c #242424",
-"#Z c #252525",
-"#f c #256022",
-"#H c #282828",
-".Q c #284919",
-"#E c #292929",
-".L c #296c27",
-"#K c #2a2a2a",
-".I c #2a6f2b",
-".h c #2a732f",
-"#O c #2c2c2c",
-".Y c #2c7f39",
-".7 c #2c813a",
-"#t c #2d823b",
-"#M c #2e2e2e",
-"#L c #2f2f2f",
-".v c #2f833c",
-"#s c #2f8b40",
-"#j c #2f8f46",
-".S c #2fa057",
-".R c #305020",
-".K c #31843e",
-"#c c #319e52",
-".V c #32843f",
-"#a c #32a65c",
-".r c #32a85d",
-".G c #337f3a",
-"#k c #33b364",
-"#b c #34b464",
-"#C c #353535",
-"## c #366d2f",
-".4 c #378843",
-"#w c #383838",
-"#d c #3a924c",
-"#1 c #3b3b3b",
-"#S c #3c3c3c",
-".m c #3d8f4b",
-"#6 c #404040",
-"#r c #407438",
-"#X c #414141",
-".o c #417036",
-".3 c #419652",
-"#8 c #424242",
-"#5 c #434343",
-"#p c #454545",
-"#G c #464646",
-".O c #46914f",
-".u c #46b670",
-"#h c #474747",
-".n c #477d40",
-".B c #47b671",
-"#x c #484848",
-"af c #4b4b4b",
-"#z c #4c4c4c",
-"#F c #4d4d4d",
-"ad c #505050",
-".C c #50854a",
-"#T c #515151",
-".U c #55bd7a",
-"#Y c #575757",
-"ai c #5e5e5e",
-".F c #63c284",
-".N c #63c385",
-"#e c #64c280",
-".i c #65c284",
-"#J c #686868",
-"#4 c #6a6a6a",
-"#l c #6ac684",
-"#n c #6d6d6d",
-"#v c #6e6e6e",
-"#B c #6f6f6f",
-".2 c #6fc386",
-"#N c #717171",
-"#R c #757575",
-"ab c #797979",
-".5 c #7dcb8f",
-"ag c #818181",
-"ac c #828282",
-".l c #82cd91",
-"#o c #848484",
-"#W c #898989",
-"#y c #8d8d8d",
-"#I c #9b9b9b",
-"#g c #a0a0a0",
-"#0 c #a3a3a3",
-".J c #a3daae",
-"ah c #a5a5a5",
-"#3 c #afafaf",
-".Z c #b0e1b5",
-".A c #b2e0b8",
-"#A c #b5b5b5",
-"#m c #b8b8b8",
-".t c #b8e2be",
-".k c #b9e4bd",
-".T c #bee5c1",
-"#u c #c3c3c3",
-".E c #cbe9cb",
-".6 c #ceecce",
-".1 c #d4f4d4",
-".j c #d8f0d6",
-".0 c #dff3dd",
-".M c #e0f3dd",
-".s c #ffffff",
-"QtQtQtQtQtQtQtQt.#.a.b.c.d.e.fQtQtQtQtQtQtQt",
-"QtQtQtQtQtQt.g.h.i.j.k.l.m.n.o.p.qQtQtQtQtQt",
-"QtQtQtQtQt.g.r.s.t.u.v.g.w.x.y.f.p.zQtQtQtQt",
-"QtQtQtQtQt.h.s.A.B.C.f.fQtQtQtQt.f.z.DQtQtQt",
-"QtQtQtQt.g.i.E.F.G.HQtQtQtQtQtQtQtQt.z.fQtQt",
-"QtQtQtQt.I.s.J.K.fQtQtQtQtQtQtQtQtQtQt.fQtQt",
-"QtQtQtQt.L.M.N.O.PQtQtQtQtQtQtQtQtQtQtQtQtQt",
-".f.q.Q.R.S.T.U.V.W.X.f.fQtQtQtQtQtQtQtQtQtQt",
-".f.Y.Z.0.1.2.3.4.5.6.7.8QtQtQt.9#.QtQtQtQtQt",
-"Qt.f###a#b#c#d#e.7#f.fQtQtQt.9#g#h#iQtQtQtQt",
-"QtQt.f###j#k#l.7#f.fQtQtQt.9#m#n#o#p#qQtQtQt",
-"QtQtQt.f#r#s#t#f.fQtQtQt.9#u#v#w#x#y#z#iQtQt",
-"QtQtQtQt.f###f.fQtQtQt.9#A#B#C#D#E#F#y#G#qQt",
-"QtQtQtQtQt.f.fQtQtQt#H#I#J#p#p#K#L#M#G#N#O#P",
-"QtQtQtQtQtQtQtQtQtQt.9.9#Q.9#R#S#T#U#V.9.9.9",
-"QtQtQtQtQtQtQtQtQtQtQtQtQt.9#W#X#Y#ZQtQtQtQt",
-"QtQt.9QtQtQtQtQtQtQtQtQtQt.9#0#1#T#2QtQtQtQt",
-"QtQt.9.9QtQtQtQtQtQtQtQt.9#3#4#5#6#7QtQtQtQt",
-"QtQtQt.9.9.9QtQtQtQt.9.9#3#o#8#x#9QtQtQtQtQt",
-"QtQtQtQta.#Da#aa.9.9ab#3acadad#O#7QtQtQtQtQt",
-"QtQtQtQtQt.9aeaf#4agahai#8adaj.9QtQtQtQtQtQt",
-"QtQtQtQtQtQtQt#Pak#iaealam.9QtQtQtQtQtQtQtQt"};
diff --git a/xpm/zoom.xpm b/xpm/zoom.xpm
deleted file mode 100644
index e1cca3b9a5f..00000000000
--- a/xpm/zoom.xpm
+++ /dev/null
@@ -1,224 +0,0 @@
-/* XPM */
-static char *zoom[]={
-"24 24 197 2",
-"Qt c None",
-"ac c #000000",
-"a0 c #363637",
-"aW c #3c3938",
-"#9 c #4091a0",
-"#W c #4092a0",
-"aE c #414142",
-"aq c #424243",
-"aR c #434343",
-"ad c #434344",
-"aS c #454545",
-"#8 c #46a2b3",
-"#V c #46a4b4",
-"aT c #474747",
-"#M c #474748",
-"#I c #4799a7",
-"aU c #494949",
-"a. c #4996a5",
-"#x c #4a4a4b",
-"aV c #4b4b4b",
-"#H c #4ca1b1",
-"#j c #4d4d4e",
-"aF c #4e5052",
-"ak c #4e9ba9",
-"#t c #4ea2b2",
-".8 c #505050",
-"#X c #509ca9",
-"aM c #525252",
-".W c #535353",
-"#1 c #535556",
-"aj c #54a5b3",
-"aL c #555858",
-"#7 c #55b2c4",
-"aA c #565657",
-"al c #56a0ae",
-"#U c #59b9cc",
-".y c #5b5b5b",
-"ap c #5b5b5c",
-"#s c #5cb2c5",
-"#G c #5cb8cb",
-".n c #5f5f60",
-"ab c #606263",
-"#f c #60b0c2",
-"ai c #62b2c0",
-"aN c #635920",
-"#0 c #636364",
-".K c #636464",
-".e c #646465",
-"#L c #666666",
-"aB c #675b22",
-"#6 c #68baca",
-"#w c #696969",
-".# c #6b6b6b",
-"#u c #6bb7c4",
-"#i c #6c6c6c",
-".a c #6d6d6d",
-".f c #6e6e6f",
-"#e c #6ec0d3",
-".b c #6f6f6f",
-"#T c #6fc5d8",
-".V c #707272",
-".c c #717171",
-"#F c #71c8db",
-"a# c #72b8c5",
-"#J c #72bcc7",
-".d c #737373",
-"#r c #73c5d9",
-".x c #747474",
-".m c #747475",
-".l c #747576",
-"ah c #75bdcc",
-"#5 c #75c1d0",
-"ar c #777f81",
-"az c #778284",
-"a4 c #7898b5",
-"ae c #798182",
-"ao c #798486",
-"am c #79bccb",
-".5 c #7ac2d1",
-"aK c #819092",
-"#S c #81cbdc",
-"aG c #828e90",
-"#g c #82c3cf",
-".4 c #82c9d8",
-"#4 c #83c9d6",
-"aO c #84682e",
-"#d c #85cfe0",
-"#E c #86d0e1",
-"#q c #86d1e1",
-"#Z c #889699",
-"av c #88cad7",
-"aD c #896d4f",
-".z c #8b8f90",
-".J c #8b9294",
-"aC c #8c6f4f",
-"a6 c #8c877f",
-"#N c #8c9496",
-".o c #8d9192",
-"#R c #8dd0df",
-".w c #8e9495",
-"aw c #8ecedc",
-".S c #8ecfda",
-"bb c #906741",
-".7 c #919c9e",
-"#Q c #91d3e0",
-"ag c #92ccd7",
-".3 c #93d4e2",
-".X c #959b9c",
-"#D c #95d7e6",
-"#c c #97d8e6",
-"#Y c #98d0da",
-"#P c #98d4e0",
-".R c #98d6e2",
-".T c #99d4de",
-"au c #9ad2dd",
-".k c #9ba3a4",
-".g c #9ca2a3",
-"#3 c #9cd5df",
-"#C c #a2dce9",
-".6 c #a4d6e1",
-".2 c #a5dde9",
-".G c #a6dce8",
-"a1 c #a76848",
-"#B c #a7dee9",
-"#p c #a8dfeb",
-".Q c #aadfea",
-"ax c #acdce6",
-".H c #acdde7",
-"#A c #afe0e9",
-"a3 c #b0c2d3",
-"an c #b2dfe8",
-"a2 c #b37548",
-"at c #b3dee7",
-"aX c #b47648",
-"aJ c #b4ccd1",
-".F c #b5e3ee",
-"aH c #b6cdd1",
-"#K c #b8cfd3",
-"#o c #bae7ef",
-"#h c #bbd2d4",
-".1 c #bce6ef",
-"aa c #bee4ea",
-"aY c #bf8248",
-"#b c #c0e8f0",
-"#O c #c1e2ea",
-"#z c #c1e3ea",
-"af c #c1e4ed",
-"#m c #c3e8f0",
-".E c #c3ebf3",
-"#y c #c5d2d5",
-"ay c #c6e8ed",
-".9 c #c8d4d6",
-"#l c #c9e8ef",
-"#n c #c9ebf2",
-".P c #c9ecf2",
-"aP c #ca8f49",
-".j c #cad7d8",
-".U c #cae8ed",
-"aZ c #cb9049",
-".h c #ccd7d9",
-"as c #cce8ee",
-"aI c #cce9ed",
-".I c #cceaef",
-"#v c #cee9ed",
-"#2 c #cee9ee",
-"bc c #cfc7ba",
-"#. c #d2ecf3",
-"ba c #d4cec3",
-"## c #d4edf4",
-".t c #d4f0f7",
-".D c #d4f1f7",
-".u c #d5eff5",
-"aQ c #d79d49",
-"b# c #dad5cb",
-".0 c #daf2f6",
-".s c #daf3f9",
-".v c #dceff3",
-".r c #ddf2f7",
-"#k c #dfeef0",
-".q c #dff1f4",
-"b. c #e0dcd4",
-".i c #e1eef1",
-".p c #e4eff1",
-".L c #e4f2f4",
-".A c #e6f3f5",
-"a8 c #e7e3dd",
-".Y c #ebf7fa",
-".O c #ebf9fb",
-"#a c #ecf8fa",
-"a7 c #edeae5",
-".C c #eef9fb",
-"a9 c #f2f1ee",
-".Z c #f3fbfc",
-"a5 c #f8f8f6",
-".B c #f8fcfc",
-".N c #fcfefe",
-".M c #ffffff",
-"QtQtQtQtQt.#.a.b.c.dQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
-"QtQtQt.e.f.g.h.i.j.k.l.mQtQtQtQtQtQtQtQtQtQtQtQt",
-"QtQt.n.o.p.q.r.s.t.u.v.w.xQtQtQtQtQtQtQtQtQtQtQt",
-"Qt.y.z.A.B.C.D.E.F.G.H.I.J.dQtQtQtQtQtQtQtQtQtQt",
-"Qt.K.L.B.M.N.O.P.Q.R.S.T.U.VQtQtQtQtQtQtQtQtQtQt",
-".W.X.q.Y.N.Z.0.1.2.3.4.5.6.7.bQtQtQtQtQtQtQtQtQt",
-".8.9#.###a.0#b.Q#c#d#e#f#g#h#iQtQtQtQtQtQtQtQtQt",
-"#j#k#l#m#n#o#p#c#q#r#s#t#u#v#wQtQtQtQtQtQtQtQtQt",
-"#x#y#z#A#B#C#D#E#F#G#H#I#J#K#LQtQtQtQtQtQtQtQtQt",
-"#M#N#O#P#Q#R#S#T#U#V#W#X#Y#Z#0QtQtQtQtQtQtQtQtQt",
-"Qt#1#2#3#4#5#6#7#8#9a.a#aaabacQtQtQtQtQtQtQtQtQt",
-"QtadaeafagahaiajakalamanaoapacacQtQtQtQtQtQtQtQt",
-"QtQtaqarasatauavawaxayazaAaBaCaDacQtQtQtQtQtQtQt",
-"QtQtQtaEaFaGaHaIaJaKaLaMaNaOaPaQaDacQtQtQtQtQtQt",
-"QtQtQtQtQtaRaSaTaUaVacacaWaXaYaZaQaDacQtQtQtQtQt",
-"QtQtQtQtQtacacacacacacaca0a1a2aYaZaQaDacQtQtQtQt",
-"Qta3a4a4a4a4a4a3acQtQtQtQta0a1a2aYaZaQaDacQtQtQt",
-"Qta4.Ma5a6a7a8a4acQtQtQtQtQta0a1a2aYaZaQaDacQtQt",
-"Qta4a5a9aca8b.a4acQtQtQtQtQtQta0a1a2aYaZaQaDacQt",
-"Qta4a6acacaca6a4acQtQtQtQtQtQtQta0a1a2aYaZaDacQt",
-"Qta4a7a8acb#baa4acQtQtQtQtQtQtQtQta0a1a2bba0acQt",
-"Qta4a8b.a6babca4acQtQtQtQtQtQtQtQtQta0a0a0acacQt",
-"Qta3a4a4a4a4a4a3acQtQtQtQtQtQtQtQtQtQtacacacQtQt",
-"QtacacacacacacacacQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt"};
diff --git a/xpm/zoomfull.xpm b/xpm/zoomfull.xpm
deleted file mode 100644
index 4bb804a33e2..00000000000
--- a/xpm/zoomfull.xpm
+++ /dev/null
@@ -1,178 +0,0 @@
-/* XPM */
-static char *zoomfull[]={
-"22 22 153 2",
-"Qt c None",
-"#M c #000000",
-"aw c #0b0b0b",
-"#i c #0c0c0c",
-".n c #1d1d1d",
-"#t c #232323",
-".R c #29292a",
-"as c #313131",
-"au c #323233",
-"al c #363637",
-"ak c #373738",
-"ao c #39393a",
-"#z c #398491",
-"ap c #3a3f40",
-".a c #3b3b3c",
-".c c #3c3c3d",
-"at c #3d3d3e",
-"#q c #3d8996",
-".b c #3e3e3f",
-".d c #404041",
-"#B c #404647",
-"#T c #414648",
-"aa c #414748",
-"a# c #424849",
-"#y c #4298a7",
-".z c #434343",
-"#j c #434344",
-"#g c #4399a8",
-".J c #444444",
-".p c #444445",
-"#J c #4496a5",
-"#p c #449aa9",
-"## c #454545",
-".o c #474747",
-"#C c #484848",
-"#A c #489ead",
-"af c #494949",
-".g c #49494a",
-"ae c #4a4a4a",
-".A c #4c4c4d",
-"#x c #4cb7cb",
-"#5 c #4d4d4e",
-"#o c #4dbace",
-"ad c #4f4f4f",
-"#K c #50a3b5",
-".8 c #50a6b9",
-"#I c #52a7b3",
-"#h c #54acb9",
-".e c #585859",
-"#6 c #595959",
-".# c #59595a",
-"#V c #5b5b5b",
-"#f c #5bb1c4",
-".S c #5c5c5c",
-"#O c #5c5d5c",
-".f c #5d5d5e",
-"#H c #60b3c5",
-".2 c #626262",
-"#4 c #635920",
-"#r c #63b5c4",
-"ag c #686868",
-"#w c #68bdcf",
-".9 c #6ab5c3",
-"#2 c #6b7274",
-"#u c #6c6c6c",
-"#W c #6c6d6c",
-".Z c #6cbacb",
-".7 c #6cc3d9",
-".y c #6f6f70",
-"a. c #707071",
-"ac c #717171",
-"#9 c #717172",
-"aq c #727273",
-"#7 c #737374",
-"ai c #747475",
-"#e c #74c8dd",
-"#8 c #757576",
-"aj c #767677",
-"am c #777778",
-"#v c #78c3d3",
-"#D c #797a79",
-"#Y c #79989c",
-"#G c #79bfcc",
-".m c #7a7a7b",
-".q c #7b7879",
-"#X c #7b7c7b",
-".0 c #7bc4d4",
-".B c #7d7e7d",
-"av c #7f7f80",
-".O c #81c9d6",
-".h c #868787",
-".6 c #86d1e1",
-"#R c #87cad6",
-".Y c #87cddc",
-"#1 c #88a8ad",
-".N c #8acdd9",
-"#L c #8acfe1",
-"#N c #8e8e8e",
-"ah c #928237",
-"#n c #96d5e5",
-"#d c #96d7e7",
-"#Q c #99d4e0",
-".X c #99d8e6",
-".H c #9bd6e2",
-".1 c #9da2a1",
-".M c #9dd9e6",
-".T c #a2a7a7",
-"#F c #a4dbe9",
-".G c #a5dcea",
-"#k c #a6abaa",
-"#c c #a8e1eb",
-"#Z c #a9c7ce",
-"#s c #abdfea",
-"#U c #ac993f",
-".W c #ace0eb",
-".i c #afb4b4",
-".P c #afe1ec",
-"#m c #b1dbe4",
-".L c #b1e2ec",
-".l c #b2b7b7",
-"#. c #b2c7cb",
-"#0 c #b3cad0",
-".3 c #bac0c1",
-"#P c #bae4ef",
-".j c #bbc4c6",
-".k c #bbc5c6",
-".I c #bbe7ee",
-"ab c #bda44c",
-"#S c #bde6f0",
-".F c #bde7f0",
-".V c #c3e9f0",
-".K c #c5cfd2",
-"#b c #c5e7ec",
-".E c #c6edf5",
-".5 c #cbe9f2",
-".w c #cceff7",
-"ar c #cecece",
-".Q c #ced9d9",
-".r c #cfdada",
-"#E c #d7f0f4",
-".v c #d7f3f8",
-"#l c #d8edf1",
-".x c #dce7e9",
-".t c #dcf2f5",
-".u c #ddf4fa",
-"#3 c #dece9d",
-"an c #e1e1e1",
-"#a c #e3f2f4",
-".s c #e5f0f2",
-".U c #e5f4f8",
-".4 c #e7f3f6",
-".C c #e9f8fa",
-".D c #ffffff",
-"QtQtQtQtQt.#.a.b.c.d.eQtQtQtQtQtQtQtQtQtQtQt",
-"QtQtQt.f.g.h.i.j.k.l.m.n.oQtQtQtQtQtQtQtQtQt",
-"QtQt.p.q.r.s.t.u.v.w.u.x.y.zQtQtQtQtQtQtQtQt",
-"Qt.A.B.x.C.D.C.E.F.G.H.I.x.B.JQtQtQtQtQtQtQt",
-"Qt.g.K.C.D.D.D.C.L.M.N.O.P.Q.RQtQtQtQtQtQtQt",
-".S.T.x.t.U.D.C.V.W.X.Y.Z.0.P.1.2QtQtQtQtQtQt",
-".g.3.4.5.5.C.V.P.X.6.7.8.9.L#.##QtQtQtQtQtQt",
-".g.j#a#b.I.L#c#d.6#e#f#g#h#c#.#iQtQtQtQtQtQt",
-"#j#k#l#m.H.X#n.6#e#o#p#q#r#s.T#tQtQtQtQtQtQt",
-"#u.B.r.P.N.O#v#w#x#y#z#A#n.r#BQtQtQtQtQtQtQt",
-"Qt#C#D#E#F#G#H#I#J#q#K#L#l.1#MQtQtQtQtQtQtQt",
-"Qt#N#O.B#l#P#Q#R#v.Y#S#l.B#T#M#UQtQtQtQtQtQt",
-"QtQt#V#W#X#Y#Z#b#b#0#1#2#T#M.D#3#4QtQtQtQtQt",
-"QtQtQt.S#5#6#7#8#9a.a#aa#Mab#3.D#7.bQtQtQtQt",
-"QtQtQtQtQtac#5adaeafagQt#4aha#ai.DajakQtQtQt",
-"QtQtQtQtQtQtQtQtQtQtQtQtQt#4ala#aman.maoQtQt",
-"#M#MQtQt#M#MQtQtQtQtQtQtQtQtalalapaqar.yasQt",
-"#MQtQtQtQt#MQtQtQtQtQtQtQtQtQt#Mala#a.ara.at",
-"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtauala#a.av.d",
-"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt#Mala#aw.d",
-"#MQtQtQtQt#MQtQtQtQtQtQtQtQtQtQtQtQt#M#M.dQt",
-"#M#MQtQt#M#MQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt"};
diff --git a/xpm/zoomout.xpm b/xpm/zoomout.xpm
deleted file mode 100644
index 5b27b429135..00000000000
--- a/xpm/zoomout.xpm
+++ /dev/null
@@ -1,224 +0,0 @@
-/* XPM */
-static char *zoomout[]={
-"24 24 197 2",
-"Qt c None",
-"ac c #000000",
-"a0 c #363637",
-"aW c #3c3938",
-"#9 c #4091a0",
-"#W c #4092a0",
-"aE c #414142",
-"aq c #424243",
-"aR c #434343",
-"ad c #434344",
-"aS c #454545",
-"#8 c #46a2b3",
-"#V c #46a4b4",
-"aT c #474747",
-"#M c #474748",
-"#I c #4799a7",
-"aU c #494949",
-"a. c #4996a5",
-"#x c #4a4a4b",
-"aV c #4b4b4b",
-"#H c #4ca1b1",
-"#j c #4d4d4e",
-"aF c #4e5052",
-"ak c #4e9ba9",
-"#t c #4ea2b2",
-".8 c #505050",
-"#X c #509ca9",
-"aM c #525252",
-".W c #535353",
-"#1 c #535556",
-"aj c #54a5b3",
-"aL c #555858",
-"#7 c #55b2c4",
-"aA c #565657",
-"al c #56a0ae",
-"#U c #59b9cc",
-".y c #5b5b5b",
-"ap c #5b5b5c",
-"#s c #5cb2c5",
-"#G c #5cb8cb",
-".n c #5f5f60",
-"ab c #606263",
-"#f c #60b0c2",
-"ai c #62b2c0",
-"aN c #635920",
-"#0 c #636364",
-".K c #636464",
-".e c #646465",
-"#L c #666666",
-"aB c #675b22",
-"#6 c #68baca",
-"#w c #696969",
-".# c #6b6b6b",
-"#u c #6bb7c4",
-"#i c #6c6c6c",
-".a c #6d6d6d",
-".f c #6e6e6f",
-"#e c #6ec0d3",
-".b c #6f6f6f",
-"#T c #6fc5d8",
-".V c #707272",
-".c c #717171",
-"#F c #71c8db",
-"a# c #72b8c5",
-"#J c #72bcc7",
-".d c #737373",
-"#r c #73c5d9",
-".x c #747474",
-".m c #747475",
-".l c #747576",
-"ah c #75bdcc",
-"#5 c #75c1d0",
-"ar c #777f81",
-"az c #778284",
-"a4 c #7898b5",
-"ae c #798182",
-"ao c #798486",
-"am c #79bccb",
-".5 c #7ac2d1",
-"aK c #819092",
-"#S c #81cbdc",
-"aG c #828e90",
-"#g c #82c3cf",
-".4 c #82c9d8",
-"#4 c #83c9d6",
-"aO c #84682e",
-"#d c #85cfe0",
-"#E c #86d0e1",
-"#q c #86d1e1",
-"#Z c #889699",
-"av c #88cad7",
-"aD c #896d4f",
-".z c #8b8f90",
-".J c #8b9294",
-"aC c #8c6f4f",
-"#N c #8c9496",
-".o c #8d9192",
-"#R c #8dd0df",
-".w c #8e9495",
-"aw c #8ecedc",
-".S c #8ecfda",
-"bb c #906741",
-".7 c #919c9e",
-"#Q c #91d3e0",
-"ag c #92ccd7",
-".3 c #93d4e2",
-".X c #959b9c",
-"#D c #95d7e6",
-"#c c #97d8e6",
-"#Y c #98d0da",
-"#P c #98d4e0",
-".R c #98d6e2",
-".T c #99d4de",
-"au c #9ad2dd",
-".k c #9ba3a4",
-".g c #9ca2a3",
-"#3 c #9cd5df",
-"#C c #a2dce9",
-"b. c #a39e97",
-".6 c #a4d6e1",
-".2 c #a5dde9",
-".G c #a6dce8",
-"a1 c #a76848",
-"#B c #a7dee9",
-"#p c #a8dfeb",
-".Q c #aadfea",
-"ax c #acdce6",
-".H c #acdde7",
-"#A c #afe0e9",
-"a3 c #b0c2d3",
-"an c #b2dfe8",
-"a2 c #b37548",
-"at c #b3dee7",
-"aX c #b47648",
-"aJ c #b4ccd1",
-".F c #b5e3ee",
-"aH c #b6cdd1",
-"#K c #b8cfd3",
-"#o c #bae7ef",
-"#h c #bbd2d4",
-".1 c #bce6ef",
-"aa c #bee4ea",
-"aY c #bf8248",
-"#b c #c0e8f0",
-"#O c #c1e2ea",
-"#z c #c1e3ea",
-"af c #c1e4ed",
-"#m c #c3e8f0",
-".E c #c3ebf3",
-"#y c #c5d2d5",
-"ay c #c6e8ed",
-".9 c #c8d4d6",
-"#l c #c9e8ef",
-"#n c #c9ebf2",
-".P c #c9ecf2",
-"aP c #ca8f49",
-".j c #cad7d8",
-".U c #cae8ed",
-"aZ c #cb9049",
-".h c #ccd7d9",
-"as c #cce8ee",
-"aI c #cce9ed",
-".I c #cceaef",
-"#v c #cee9ed",
-"#2 c #cee9ee",
-"bc c #cfc7ba",
-"#. c #d2ecf3",
-"ba c #d4cec3",
-"## c #d4edf4",
-".t c #d4f0f7",
-".D c #d4f1f7",
-".u c #d5eff5",
-"aQ c #d79d49",
-"b# c #dad5cb",
-".0 c #daf2f6",
-".s c #daf3f9",
-".v c #dceff3",
-".r c #ddf2f7",
-"#k c #dfeef0",
-".q c #dff1f4",
-"a9 c #e0dcd4",
-".i c #e1eef1",
-".p c #e4eff1",
-".L c #e4f2f4",
-".A c #e6f3f5",
-"a8 c #e7e3dd",
-".Y c #ebf7fa",
-".O c #ebf9fb",
-"#a c #ecf8fa",
-"a7 c #edeae5",
-".C c #eef9fb",
-"a6 c #f2f1ee",
-".Z c #f3fbfc",
-"a5 c #f8f8f6",
-".B c #f8fcfc",
-".N c #fcfefe",
-".M c #ffffff",
-"QtQtQtQtQt.#.a.b.c.dQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
-"QtQtQt.e.f.g.h.i.j.k.l.mQtQtQtQtQtQtQtQtQtQtQtQt",
-"QtQt.n.o.p.q.r.s.t.u.v.w.xQtQtQtQtQtQtQtQtQtQtQt",
-"Qt.y.z.A.B.C.D.E.F.G.H.I.J.dQtQtQtQtQtQtQtQtQtQt",
-"Qt.K.L.B.M.N.O.P.Q.R.S.T.U.VQtQtQtQtQtQtQtQtQtQt",
-".W.X.q.Y.N.Z.0.1.2.3.4.5.6.7.bQtQtQtQtQtQtQtQtQt",
-".8.9#.###a.0#b.Q#c#d#e#f#g#h#iQtQtQtQtQtQtQtQtQt",
-"#j#k#l#m#n#o#p#c#q#r#s#t#u#v#wQtQtQtQtQtQtQtQtQt",
-"#x#y#z#A#B#C#D#E#F#G#H#I#J#K#LQtQtQtQtQtQtQtQtQt",
-"#M#N#O#P#Q#R#S#T#U#V#W#X#Y#Z#0QtQtQtQtQtQtQtQtQt",
-"Qt#1#2#3#4#5#6#7#8#9a.a#aaabacQtQtQtQtQtQtQtQtQt",
-"QtadaeafagahaiajakalamanaoapacacQtQtQtQtQtQtQtQt",
-"QtQtaqarasatauavawaxayazaAaBaCaDacQtQtQtQtQtQtQt",
-"QtQtQtaEaFaGaHaIaJaKaLaMaNaOaPaQaDacQtQtQtQtQtQt",
-"QtQtQtQtacaRaSaTaUaVacacaWaXaYaZaQaDacQtQtQtQtQt",
-"QtQtQtQtQtQtQtacacQtacaca0a1a2aYaZaQaDacQtQtQtQt",
-"Qta3a4a4a4a4a4a3acQtQtQtaca0a1a2aYaZaQaDacQtQtQt",
-"Qta4.Ma5a6a7a8a4acQtQtQtQtaca0a1a2aYaZaQaDacQtQt",
-"Qta4a5a6a7a8a9a4acQtQtQtQtQtaca0a1a2aYaZaQaDacQt",
-"Qta4b.acacacb.a4acQtQtQtQtQtQtaca0a1a2aYaZaDacQt",
-"Qta4a7a8a9b#baa4acQtQtQtQtQtQtQtaca0a1a2bba0acQt",
-"Qta4a8a9b#babca4acQtQtQtQtQtQtQtQtaca0a0a0acacQt",
-"Qta3a4a4a4a4a4a3acQtQtQtQtQtQtQtQtQtacacacacQtQt",
-"QtacacacacacacacacQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt"};