Completed conversion from Qt3 to Qt4 widgets

Fixed an 'EOF on connection' error (postgres connection wasn't being freed).
Fixed a crash in the standalone spit when clicking close
Made the standaone spit program behave like a main window rather than
  a dialog box (ie it has a taskbar entry now).
Fixed bug with spit not putting data into non-default schema.
Fixed bug with UI display after deleting selected shapefiles.
Misc. code tidy ups.



git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4754 c8812cc2-4d05-0410-92ff-de0c093fc19c

src/plugins/spit/main.cpp

@@ -4,10 +4,9 @@
 int main( int argc, char ** argv )
 {
     QApplication a( argc, argv );
-    QgsSpit w;
+    QgsSpit w(0, Qt::Window);
     w.show();
 
-		// Moved get schema to constructor so plugins will work w.getSchema();
     a.connect( &a, SIGNAL( lastWindowClosed() ), &a, SLOT( quit() ) );
 
     return a.exec();

src/plugins/spit/qgsshapefile.cpp

@@ -16,7 +16,7 @@
  ***************************************************************************/
 /* $Id$ */
 
-#include <qapplication.h>
+#include <QApplication>
 #include <ogrsf_frmts.h>
 #include <ogr_geometry.h>
 #include <string>
@@ -249,8 +249,8 @@ void QgsShapeFile::setColumnNames(QStringList columns)
   }
 }
 
-bool QgsShapeFile::insertLayer(QString dbname, QString schema, QString geom_col, QString srid, PGconn * conn, Q3ProgressDialog * pro, bool &fin){
-  connect(pro, SIGNAL(cancelled()), this, SLOT(cancelImport()));
+bool QgsShapeFile::insertLayer(QString dbname, QString schema, QString geom_col, QString srid, PGconn * conn, QProgressDialog& pro, bool &fin){
+  connect(&pro, SIGNAL(cancelled()), this, SLOT(cancelImport()));
   import_cancelled = false;
   bool result = true;
   // Mangle the table name to make it PG compliant by replacing spaces with 
@@ -291,7 +291,7 @@ bool QgsShapeFile::insertLayer(QString dbname, QString schema, QString geom_col,
     PQclear(res);
   }
 
-  query = "SELECT AddGeometryColumn(\'" + dbname + "\', \'" + table_name + "\', \'"+geom_col+"\', " + srid +
+  query = "SELECT AddGeometryColumn(\'" + schema + "\', \'" + table_name + "\', \'"+geom_col+"\', " + srid +
     ", \'" + geom_type + "\', 2)";            
   if(result) res = PQexec(conn, (const char *)query);
   if(PQresultStatus(res)!=PGRES_TUPLES_OK){
@@ -365,7 +365,7 @@ bool QgsShapeFile::insertLayer(QString dbname, QString schema, QString geom_col,
           PQclear(res);
         }
 
-        pro->setProgress(pro->progress()+1);
+        pro.setValue(pro.value()+1);
         qApp->processEvents();
         delete[] geo_temp;
       }

src/plugins/spit/qgsshapefile.h

@@ -20,11 +20,12 @@
 #define QGSSHAPEFILE_H
 
 #include <vector>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qobject.h>
+#include <QString>
+#include <QStringList>
+#include <QObject>
 #include <ogrsf_frmts.h>
-#include <q3progressdialog.h>
+
+class QProgressDialog;
 
 class OGRLayer;
 class OGRDataSource;
@@ -43,7 +44,7 @@ class QgsShapeFile : public QObject
   ~QgsShapeFile();
   int getFeatureCount();
   QString getFeatureClass();
-  bool insertLayer(QString dbname, QString schema, QString geom_col, QString srid, PGconn * conn, Q3ProgressDialog * pro, bool &fin);
+  bool insertLayer(QString dbname, QString schema, QString geom_col, QString srid, PGconn * conn, QProgressDialog& pro, bool &fin);
 
   bool is_valid();
   QString getName();