Remove some unnecessary calls to connect(). They have been causing

g_j_m · g_j_m · commit 81dc34d6bacf · 2006-06-24T09:46:36.000Z
warnings from Qt during runtime, and don't seem to affect the operation of qgis when removed. git-svn-id: http://svn.osgeo.org/qgis/trunk@5542 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/gui/qgisapp.cpp b/src/gui/qgisapp.cpp
@@ -1690,11 +1690,6 @@ bool QgisApp::addLayer(QFileInfo const & vectorFile)
         SIGNAL(keyPressed(QKeyEvent *)),
         layer,
         SLOT(keyPressed(QKeyEvent* )));
-    //add hooks for letting layer know canvas needs to recalc the layer extents
-    QObject::connect(layer,
-        SIGNAL(recalculateExtents()),
-        mMapCanvas,
-        SLOT(recalculateExtents()));
 
   }
   else
@@ -1811,12 +1806,6 @@ bool QgisApp::addLayer(QStringList const &theLayerQStringList, const QString& en
           SIGNAL(keyPressed(QKeyEvent *)),
           layer,
           SLOT(keyPressed(QKeyEvent* )));
-      //add hooks for letting layer know canvas needs to recalc the layer extents
-      QObject::connect(layer,
-          SIGNAL(recalculateExtents()),
-          mMapCanvas,
-          SLOT(recalculateExtents()));
-
     }
     else
     {
@@ -1924,12 +1913,6 @@ void QgisApp::addDatabaseLayer()
             SIGNAL(keyPressed(QKeyEvent *)),
             layer,
             SLOT(keyPressed(QKeyEvent* )));
-        //add hooks for letting layer know canvas needs to recalc the layer extents
-        QObject::connect(layer,
-            SIGNAL(recalculateExtents()),
-            mMapCanvas,
-            SLOT(recalculateExtents()));
-
       }
       else
       {
@@ -2589,13 +2572,6 @@ void QgisApp::fileOpen()
         SIGNAL(keyPressed(QKeyEvent *)),
         myMapLayer,
         SLOT(keyPressed(QKeyEvent* )));
-
-    //add hooks for letting layer know canvas needs to recalc the layer extents
-    QObject::connect(myMapLayer,
-        SIGNAL(recalculateExtents()),
-        mMapCanvas,
-        SLOT(recalculateExtents()));
-
   }
 
   //set the projections enabled icon in the status bar
@@ -4222,13 +4198,6 @@ void QgisApp::addVectorLayer(QString vectorLayerPath, QString baseName, QString
         layer,
         SLOT(keyPressed(QKeyEvent* )));
 
-
-    //add hooks for letting layer know canvas needs to recalc the layer extents
-    QObject::connect(layer,
-        SIGNAL(recalculateExtents()),
-        mMapCanvas,
-        SLOT(recalculateExtents()));
-
     QgsProject::instance()->dirty(false); // XXX this might be redundant
 
     statusBar()->message(mMapCanvas->extent().stringRep(2));
@@ -4894,11 +4863,6 @@ bool QgisApp::addRasterLayer(QgsRasterLayer * theRasterLayer, bool theForceRedra
         SIGNAL(keyPressed(QKeyEvent * )),
         theRasterLayer,
         SLOT(keyPressed(QKeyEvent* )));
-    //add hooks for letting layer know canvas needs to recalc the layer extents
-    QObject::connect(theRasterLayer,
-        SIGNAL(recalculateExtents()),
-        mMapCanvas,
-        SLOT(recalculateExtents()));
 
     // init the context menu so it can connect to slots in main app
     // XXX now taken care of in legend theRasterLayer->initContextMenu(this);
@@ -5050,13 +5014,6 @@ void QgisApp::addRasterLayer(QString const & rasterLayerPath,
         layer,
         SLOT(keyPressed(QKeyEvent* )));
 
-
-    //add hooks for letting layer know canvas needs to recalc the layer extents
-    QObject::connect(layer,
-        SIGNAL(recalculateExtents()),
-        mMapCanvas,
-        SLOT(recalculateExtents()));
-
     QgsProject::instance()->dirty(false); // XXX this might be redundant
 
     statusBar()->message(mMapCanvas->extent().stringRep(2));
diff --git a/src/gui/qgsvectorlayer.cpp b/src/gui/qgsvectorlayer.cpp
@@ -2141,12 +2141,6 @@ bool QgsVectorLayer::setDataProvider( QString const & provider )
           this,           SLOT( updateExtents() ) 
           );
 
-      // Connect the repaintRequested chain from the data provider to this map layer
-      // in the hope that the map canvas will notice       
-      connect(dataProvider, SIGNAL( repaintRequested() ), 
-          this,           SLOT( triggerRepaint() ) 
-          );
-
       // get the extent
       QgsRect *mbr = dataProvider->extent();
 
