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

Qt: Convert more "pressed" signals to "clicked". 

Convert the "pressed" signals in the interface toolbar, LTE RLC
statistics dialog, and path chooser delegate to "clicked".

Change-Id: I86de6d2d019133d7ae85c39956388859065a3af2
Reviewed-on: https://code.wireshark.org/review/31126
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2018-12-19 09:56:22 -08:00
parent 099e5dddf2
commit f6fb8c876f
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ui/qt/interface_toolbar.cpp
View File

@ -183,11 +183,11 @@ QWidget *InterfaceToolbar::createButton(iface_toolbar_control *control)
{ {
case INTERFACE_ROLE_CONTROL: case INTERFACE_ROLE_CONTROL:
setDefaultValue(control->num, (gchar *)control->display); setDefaultValue(control->num, (gchar *)control->display);
connect(button, SIGNAL(pressed()), this, SLOT(onControlButtonPressed())); connect(button, SIGNAL(clicked()), this, SLOT(onControlButtonClicked()));
break; break;
case INTERFACE_ROLE_HELP: case INTERFACE_ROLE_HELP:
connect(button, SIGNAL(pressed()), this, SLOT(onHelpButtonPressed())); connect(button, SIGNAL(clicked()), this, SLOT(onHelpButtonClicked()));
if (help_link_.isEmpty()) if (help_link_.isEmpty())
{ {
// No help URL provided // No help URL provided
@ -196,11 +196,11 @@ QWidget *InterfaceToolbar::createButton(iface_toolbar_control *control)
break; break;
case INTERFACE_ROLE_LOGGER: case INTERFACE_ROLE_LOGGER:
connect(button, SIGNAL(pressed()), this, SLOT(onLogButtonPressed())); connect(button, SIGNAL(clicked()), this, SLOT(onLogButtonClicked()));
break; break;
case INTERFACE_ROLE_RESTORE: case INTERFACE_ROLE_RESTORE:
connect(button, SIGNAL(pressed()), this, SLOT(onRestoreButtonPressed())); connect(button, SIGNAL(clicked()), this, SLOT(onRestoreButtonClicked()));
break; break;
default: default:
@ -604,7 +604,7 @@ void InterfaceToolbar::controlSend(QString ifname, int num, int command, const Q
} }
} }
void InterfaceToolbar::onControlButtonPressed() void InterfaceToolbar::onControlButtonClicked()
{ {
const QString &ifname = ui->interfacesComboBox->currentText(); const QString &ifname = ui->interfacesComboBox->currentText();
QPushButton *button = static_cast<QPushButton *>(sender()); QPushButton *button = static_cast<QPushButton *>(sender());
@ -650,7 +650,7 @@ void InterfaceToolbar::onLineEditChanged()
interface_[ifname].value_changed[num] = true; interface_[ifname].value_changed[num] = true;
} }
void InterfaceToolbar::onLogButtonPressed() void InterfaceToolbar::onLogButtonClicked()
{ {
const QString &ifname = ui->interfacesComboBox->currentText(); const QString &ifname = ui->interfacesComboBox->currentText();
QPushButton *button = static_cast<QPushButton *>(sender()); QPushButton *button = static_cast<QPushButton *>(sender());
@ -670,7 +670,7 @@ void InterfaceToolbar::onLogButtonPressed()
interface_[ifname].log_dialog[num]->activateWindow(); interface_[ifname].log_dialog[num]->activateWindow();
} }
void InterfaceToolbar::onHelpButtonPressed() void InterfaceToolbar::onHelpButtonClicked()
{ {
QUrl help_url(help_link_); QUrl help_url(help_link_);
@ -824,7 +824,7 @@ void InterfaceToolbar::sendChangedValues(QString ifname)
} }
} }
void InterfaceToolbar::onRestoreButtonPressed() void InterfaceToolbar::onRestoreButtonClicked()
{ {
const QString &ifname = ui->interfacesComboBox->currentText(); const QString &ifname = ui->interfacesComboBox->currentText();

8
ui/qt/interface_toolbar.h
View File

@ -61,10 +61,10 @@ private slots:
void startReaderThread(QString ifname, void *control_in); void startReaderThread(QString ifname, void *control_in);
void updateWidgets(); void updateWidgets();
void onControlButtonPressed(); void onControlButtonClicked();
void onLogButtonPressed(); void onLogButtonClicked();
void onHelpButtonPressed(); void onHelpButtonClicked();
void onRestoreButtonPressed(); void onRestoreButtonClicked();
void onCheckBoxChanged(int state); void onCheckBoxChanged(int state);
void onComboBoxChanged(int idx); void onComboBoxChanged(int idx);
void onLineEditChanged(); void onLineEditChanged();

4
ui/qt/lte_rlc_statistics_dialog.cpp
View File

@ -674,11 +674,11 @@ LteRlcStatisticsDialog::LteRlcStatisticsDialog(QWidget &parent, CaptureFile &cf,
launchULGraph_ = new QPushButton(QString("Launch UL Graph")); launchULGraph_ = new QPushButton(QString("Launch UL Graph"));
launchULGraph_->setEnabled(false); launchULGraph_->setEnabled(false);
filter_controls_grid->addWidget(launchULGraph_); filter_controls_grid->addWidget(launchULGraph_);
connect(launchULGraph_, SIGNAL(pressed()), this, SLOT(launchULGraphButtonClicked())); connect(launchULGraph_, SIGNAL(clicked()), this, SLOT(launchULGraphButtonClicked()));
launchDLGraph_ = new QPushButton(QString("Launch DL Graph")); launchDLGraph_ = new QPushButton(QString("Launch DL Graph"));
launchDLGraph_->setEnabled(false); launchDLGraph_->setEnabled(false);
filter_controls_grid->addWidget(launchDLGraph_); filter_controls_grid->addWidget(launchDLGraph_);
connect(launchDLGraph_, SIGNAL(pressed()), this, SLOT(launchDLGraphButtonClicked())); connect(launchDLGraph_, SIGNAL(clicked()), this, SLOT(launchDLGraphButtonClicked()));
showSRFilterCheckBox_ = new QCheckBox(tr("Include SR frames in filter")); showSRFilterCheckBox_ = new QCheckBox(tr("Include SR frames in filter"));
filter_controls_grid->addWidget(showSRFilterCheckBox_); filter_controls_grid->addWidget(showSRFilterCheckBox_);

2
ui/qt/models/path_chooser_delegate.cpp
View File

@ -50,7 +50,7 @@ QWidget* PathChooserDelegate::createEditor(QWidget *parent, const QStyleOptionVi
pathEditor->setFocusProxy(lineEdit); pathEditor->setFocusProxy(lineEdit);
pathEditor->setFocusPolicy(lineEdit->focusPolicy()); pathEditor->setFocusPolicy(lineEdit->focusPolicy());
connect(btnBrowse, SIGNAL(pressed()), this, SLOT(browse_button_clicked())); connect(btnBrowse, SIGNAL(clicked()), this, SLOT(browse_button_clicked()));
return pathEditor; return pathEditor;
} }