osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Qt: Rename the "check for updates" slot. 

The "Check for Updates..." action doesn't exist when
QMetaObject::connectSlotsByName is called. Rename
on_actionHelpCheckForUpdates_triggered to checkForUpdates so that we
don't get the warning

QMetaObject::connectSlotsByName: No matching signal for on_actionHelpCheckForUpdates_triggered()

at startup.

Change-Id: Icbd7eb98731023c323212e6ec3d3c98f1321e245
Reviewed-on: https://code.wireshark.org/review/4510
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2014-10-06 15:33:50 -07:00
parent 0644b34067
commit a17067abb1
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/qt/main_window.cpp
View File

@ -282,7 +282,7 @@ MainWindow::MainWindow(QWidget *parent) :
QAction *update_sep = main_ui_->menuHelp->insertSeparator(main_ui_->actionHelpAbout);
QAction *update_action = new QAction(tr("Check for Updates..."), main_ui_->menuHelp);
main_ui_->menuHelp->insertAction(update_sep, update_action);
connect(update_action, SIGNAL(triggered()), this, SLOT(on_actionHelpCheckForUpdates_triggered()));
connect(update_action, SIGNAL(triggered()), this, SLOT(checkForUpdates()));
#endif
master_split_.setObjectName(tr("splitterMaster"));
extra_split_.setObjectName(tr("splitterExtra"));

2
ui/qt/main_window.h
View File

@ -342,7 +342,7 @@ private slots:
void on_actionHelpAbout_triggered();
#ifdef HAVE_SOFTWARE_UPDATE
void on_actionHelpCheckForUpdates_triggered();
void checkForUpdates();
#endif
void on_goToCancel_clicked();

2
ui/qt/main_window_slots.cpp
View File

@ -2329,7 +2329,7 @@ void MainWindow::on_actionHelpSampleCaptures_triggered() {
}
#ifdef HAVE_SOFTWARE_UPDATE
void MainWindow::on_actionHelpCheckForUpdates_triggered()
void MainWindow::checkForUpdates()
{
software_update_check();
}