diff --git a/python/plugins/mapserver_export/mapserverexport.py b/python/plugins/mapserver_export/mapserverexport.py index e731fed24b8..d215ad1ad34 100644 --- a/python/plugins/mapserver_export/mapserverexport.py +++ b/python/plugins/mapserver_export/mapserverexport.py @@ -59,7 +59,7 @@ class MapServerExport: "MapServer Export", self.iface.mainWindow()) #self.action.setWhatsThis("Configuration for Zoom To Point plugin") # connect the action to the run method - QObject.connect(self.action, SIGNAL("activated()"), self.run) + QObject.connect(self.action, SIGNAL("triggered()"), self.run) QObject.connect(self.iface, SIGNAL("currentThemeChanged ( QString )"), self.setCurrentTheme) # Add toolbar button and menu item diff --git a/python/plugins/plugin_installer/installer_plugin.py b/python/plugins/plugin_installer/installer_plugin.py index b5d042d7614..b93ea3e3429 100644 --- a/python/plugins/plugin_installer/installer_plugin.py +++ b/python/plugins/plugin_installer/installer_plugin.py @@ -69,7 +69,7 @@ class InstallerPlugin(): else: # old plugin API nextAction = self.mainWindow().menuBar().actions()[4].menu().actions()[1] self.mainWindow().menuBar().actions()[4].menu().insertAction(nextAction,self.action) - QObject.connect(self.action, SIGNAL("activated()"), self.run) + QObject.connect(self.action, SIGNAL("triggered()"), self.run) QObject.connect(self.iface, SIGNAL("currentThemeChanged ( QString )"), self.setCurrentTheme) self.statusLabel = None diff --git a/src/plugins/copyright_label/plugin.cpp b/src/plugins/copyright_label/plugin.cpp index 412692605f9..02b87c1bd89 100644 --- a/src/plugins/copyright_label/plugin.cpp +++ b/src/plugins/copyright_label/plugin.cpp @@ -80,7 +80,7 @@ void QgsCopyrightLabelPlugin::initGui() setCurrentTheme( "" ); myQActionPointer->setWhatsThis( tr( "Creates a copyright label that is displayed on the map canvas." ) ); // Connect the action to the run - connect( myQActionPointer, SIGNAL( activated() ), this, SLOT( run() ) ); + connect( myQActionPointer, SIGNAL( triggered() ), this, SLOT( run() ) ); // This calls the renderer everytime the cnavas has drawn itself connect( qGisInterface->mapCanvas(), SIGNAL( renderComplete( QPainter * ) ), this, SLOT( renderLabel( QPainter * ) ) ); //this resets this plugin up if a project is loaded diff --git a/src/plugins/delimited_text/qgsdelimitedtextplugin.cpp b/src/plugins/delimited_text/qgsdelimitedtextplugin.cpp index 7c10516cde9..7cfa0f3aee5 100644 --- a/src/plugins/delimited_text/qgsdelimitedtextplugin.cpp +++ b/src/plugins/delimited_text/qgsdelimitedtextplugin.cpp @@ -104,7 +104,7 @@ void QgsDelimitedTextPlugin::initGui() "The file must have a header row containing the field names. " "X and Y fields are required and must contain coordinates in decimal units." ) ); // Connect the action to the run - connect( myQActionPointer, SIGNAL( activated() ), this, SLOT( run() ) ); + connect( myQActionPointer, SIGNAL( triggered() ), this, SLOT( run() ) ); // Add the icon to the toolbar qGisInterface->addToolBarIcon( myQActionPointer ); qGisInterface->addPluginToMenu( tr( "&Delimited text" ), myQActionPointer ); diff --git a/src/plugins/dxf2shp_converter/dxf2shpconverter.cpp b/src/plugins/dxf2shp_converter/dxf2shpconverter.cpp index 3af35957e06..388560af9c7 100644 --- a/src/plugins/dxf2shp_converter/dxf2shpconverter.cpp +++ b/src/plugins/dxf2shp_converter/dxf2shpconverter.cpp @@ -77,7 +77,7 @@ void dxf2shpConverter::initGui() mQActionPointer->setWhatsThis( tr( "Converts DXF files in Shapefile format" ) ); // Connect the action to the run - connect( mQActionPointer, SIGNAL( activated() ), this, SLOT( run() ) ); + connect( mQActionPointer, SIGNAL( triggered() ), this, SLOT( run() ) ); // Add the icon to the toolbar mQGisIface->addToolBarIcon( mQActionPointer ); diff --git a/src/plugins/gps_importer/qgsgpsplugin.cpp b/src/plugins/gps_importer/qgsgpsplugin.cpp index e24edb54993..71875f4942f 100644 --- a/src/plugins/gps_importer/qgsgpsplugin.cpp +++ b/src/plugins/gps_importer/qgsgpsplugin.cpp @@ -93,8 +93,8 @@ void QgsGPSPlugin::initGui() mQActionPointer->setWhatsThis( tr( "Creates a new GPX layer and displays it on the map canvas" ) ); mCreateGPXAction->setWhatsThis( tr( "Creates a new GPX layer and displays it on the map canvas" ) ); - connect( mQActionPointer, SIGNAL( activated() ), this, SLOT( run() ) ); - connect( mCreateGPXAction, SIGNAL( activated() ), this, SLOT( createGPX() ) ); + connect( mQActionPointer, SIGNAL( triggered() ), this, SLOT( run() ) ); + connect( mCreateGPXAction, SIGNAL( triggered() ), this, SLOT( createGPX() ) ); mQGisInterface->fileToolBar()->addAction( mQActionPointer ); mQGisInterface->addPluginToMenu( tr( "&Gps" ), mQActionPointer ); diff --git a/src/plugins/north_arrow/plugin.cpp b/src/plugins/north_arrow/plugin.cpp index 0e0420eea5f..21ea5d8fa19 100644 --- a/src/plugins/north_arrow/plugin.cpp +++ b/src/plugins/north_arrow/plugin.cpp @@ -96,7 +96,7 @@ void QgsNorthArrowPlugin::initGui() setCurrentTheme( "" ); myQActionPointer->setWhatsThis( tr( "Creates a north arrow that is displayed on the map canvas" ) ); // Connect the action to the run - connect( myQActionPointer, SIGNAL( activated() ), this, SLOT( run() ) ); + connect( myQActionPointer, SIGNAL( triggered() ), this, SLOT( run() ) ); //render the arrow each time the map is rendered connect( qGisInterface->mapCanvas(), SIGNAL( renderComplete( QPainter * ) ), this, SLOT( renderNorthArrow( QPainter * ) ) ); //this resets this plugin up if a project is loaded diff --git a/src/plugins/quick_print/quickprintplugin.cpp b/src/plugins/quick_print/quickprintplugin.cpp index 64c49f11bf9..d29ef9300f4 100644 --- a/src/plugins/quick_print/quickprintplugin.cpp +++ b/src/plugins/quick_print/quickprintplugin.cpp @@ -78,7 +78,7 @@ void QuickPrintPlugin::initGui() // Set the what's this text mQActionPointer->setWhatsThis( tr( "Provides a way to quickly produce a map with minimal user input." ) ); // Connect the action to the run - connect( mQActionPointer, SIGNAL( activated() ), this, SLOT( run() ) ); + connect( mQActionPointer, SIGNAL( triggered() ), this, SLOT( run() ) ); // Add the icon to the toolbar mQGisIface->addToolBarIcon( mQActionPointer ); mQGisIface->addPluginToMenu( tr( "&Quick Print" ), mQActionPointer ); diff --git a/src/plugins/scale_bar/plugin.cpp b/src/plugins/scale_bar/plugin.cpp index e5086296993..71e5c398aca 100644 --- a/src/plugins/scale_bar/plugin.cpp +++ b/src/plugins/scale_bar/plugin.cpp @@ -103,7 +103,7 @@ void QgsScaleBarPlugin::initGui() setCurrentTheme( "" ); myQActionPointer->setWhatsThis( tr( "Creates a scale bar that is displayed on the map canvas" ) ); // Connect the action to the run - connect( myQActionPointer, SIGNAL( activated() ), this, SLOT( run() ) ); + connect( myQActionPointer, SIGNAL( triggered() ), this, SLOT( run() ) ); //render the scale bar each time the map is rendered connect( qGisInterface->mapCanvas(), SIGNAL( renderComplete( QPainter * ) ), this, SLOT( renderScaleBar( QPainter * ) ) ); //this resets this plugin up if a project is loaded