changes to support compilation under Qt 3.1.x

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

src/main.cpp

@@ -30,7 +30,6 @@ 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 "."

src/qgscontcoldialogbase.ui

@@ -1,4 +1,4 @@
-<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
+<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>QgsContColDialogBase</class>
 <widget class="QDialog">
     <property name="name">

src/qgsgrasydialogbase.ui

@@ -1,4 +1,4 @@
-<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
+<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>QgsGraSyDialogBase</class>
 <widget class="QDialog">
     <property name="name">

src/qgshelpviewer.ui

@@ -1,4 +1,4 @@
-<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
+<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>QgsHelpViewer</class>
 <widget class="QDialog">
     <property name="name">

src/qgsmaplayer.h

@@ -126,8 +126,6 @@ class QgsMapLayer:public QObject
 
 	  signals:void visibilityChanged(void);
   protected:
-        //popup menu that will apear when right clicking legend
-        QPopupMenu *popMenu;
 	//! Extent of the layer
 	  QgsRect layerExtent;
 	//! Indicates if the layer is valid and can be drawn
@@ -141,12 +139,14 @@ class QgsMapLayer:public QObject
 	QPixmap m_legendPixmap;
 	/** Name of the layer - used for display  */
 	QString layerName;
+  //! context menu
+  QPopupMenu *popMenu;
   private:						// Private attributes
 	/** Unique ID of this layer - used to refer to this layer  in QGIS code */
 	  QString ID;
 	/** Type of the layer (eg. vector, raster, database  */
 	int layerType;
-
+  
 	//! Tag for embedding additional information
 	QString tag;
   /**  */
@@ -161,7 +161,7 @@ class QgsMapLayer:public QObject
 
   signals:
 	  /**This signal should be connected with the slot QgsMapCanvas::refresh()*/
-	  void repaintRequested();
+	virtual void repaintRequested();
 };
 
 #endif

src/qgsmapserverexport.cpp

@@ -238,7 +238,7 @@ void QgsMapserverExport::writeMapFile(){
 void QgsMapserverExport::showHelp(){
 	//QMessageBox::information(this, "Help","Help");
 	QgsHelpViewer *hv = new QgsHelpViewer(this);
-	hv->setModal(false);
+// causes problems in qt3.1.x:	hv->setModal(false);
 	hv->setCaption("QGIS Help - Mapserver Export");
 	hv->show();
 }

src/qgsmapserverexportbase.ui

@@ -1,4 +1,4 @@
-<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
+<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>QgsMapserverExportBase</class>
 <widget class="QDialog">
     <property name="name">

src/qgspluginmanager.cpp

@@ -30,7 +30,8 @@ QgsPluginManager::QgsPluginManager(QWidget *parent, const char * name)
  : QgsPluginManagerBase(parent, name)
 {
   // set the default lib dir to the qgis install directory/lib
-  QString appDir = qApp->applicationDirPath();
+  char **argv = qApp->argv();
+  QString appDir = argv[0];
   int bin = appDir.findRev("/bin", -1, false);
   QString baseDir = appDir.left(bin);
   QString libDir = baseDir + "/lib";

src/qgspluginmanagerbase.ui

@@ -1,4 +1,4 @@
-<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
+<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>QgsPluginManagerBase</class>
 <widget class="QDialog">
     <property name="name">

src/qgsproviderregistry.cpp

@@ -44,7 +44,8 @@ QgsProviderRegistry::QgsProviderRegistry(){
 // check all libs in the current plugin directory and get name and descriptions
 //TODO figure out how to register and identify data source plugin for a specific
 //TODO layer type
-QString appDir = qApp->applicationDirPath();
+char **argv = qApp->argv();
+QString appDir = argv[0];
 int bin = appDir.findRev("/bin", -1, false);
 QString baseDir = appDir.left(bin);
 QString libDir = baseDir + "/lib";