mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup: remove unnecessary signal

Browse source 
The edit dive site button was connected to a *signal* of MainWindow,
which was connected to a slot of MainWindow. Remove the unnecessary
intermediate signal.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-03-16 11:51:42 +01:00 committed by Dirk Hohndel
parent cd3a8ba354
commit d0435672ac
3 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
desktop-widgets/mainwindow.cpp
View file

@ -218,7 +218,6 @@ MainWindow::MainWindow() : QMainWindow(),
connect(DivePlannerPointsModel::instance(), SIGNAL(planCanceled()), this, SLOT(planCanceled())); connect(DivePlannerPointsModel::instance(), SIGNAL(planCanceled()), this, SLOT(planCanceled()));
connect(DivePlannerPointsModel::instance(), SIGNAL(variationsComputed(QString)), this, SLOT(updateVariations(QString))); connect(DivePlannerPointsModel::instance(), SIGNAL(variationsComputed(QString)), this, SLOT(updateVariations(QString)));
connect(plannerDetails->printPlan(), SIGNAL(pressed()), divePlannerWidget, SLOT(printDecoPlan())); connect(plannerDetails->printPlan(), SIGNAL(pressed()), divePlannerWidget, SLOT(printDecoPlan()));
connect(this, SIGNAL(startDiveSiteEdit()), this, SLOT(on_actionDiveSiteEdit_triggered()));
connect(mainTab, &MainTab::diveSiteChanged, mapWidget, &MapWidget::centerOnSelectedDiveSite); connect(mainTab, &MainTab::diveSiteChanged, mapWidget, &MapWidget::centerOnSelectedDiveSite);
connect(this, &MainWindow::showError, ui.mainErrorMessage, &NotificationWidget::showError, Qt::AutoConnection); connect(this, &MainWindow::showError, ui.mainErrorMessage, &NotificationWidget::showError, Qt::AutoConnection);
@ -386,7 +385,7 @@ void MainWindow::editDiveSite(dive_site *ds)
setApplicationState("EditDiveSite"); setApplicationState("EditDiveSite");
} }
void MainWindow::on_actionDiveSiteEdit_triggered() void MainWindow::startDiveSiteEdit()
{ {
editDiveSite(get_dive_site_for_dive(&displayed_dive)); editDiveSite(get_dive_site_for_dive(&displayed_dive));
} }

4
desktop-widgets/mainwindow.h
View file

@ -134,7 +134,6 @@ slots:
void on_actionReplanDive_triggered(); void on_actionReplanDive_triggered();
void on_action_Check_for_Updates_triggered(); void on_action_Check_for_Updates_triggered();
void on_actionDiveSiteEdit_triggered();
void selectionChanged(); void selectionChanged();
void initialUiSetup(); void initialUiSetup();
@ -156,7 +155,6 @@ protected:
void closeEvent(QCloseEvent *); void closeEvent(QCloseEvent *);
signals: signals:
void startDiveSiteEdit();
void showError(QString message); void showError(QString message);
public public
@ -177,7 +175,7 @@ slots:
void disableShortcuts(bool disablePaste = true); void disableShortcuts(bool disablePaste = true);
void enableShortcuts(); void enableShortcuts();
void updateVariations(QString); void updateVariations(QString);
void startDiveSiteEdit();
private: private:
Ui::MainWindow ui; Ui::MainWindow ui;

2
desktop-widgets/tab-widgets/maintab.cpp
View file

@ -82,7 +82,7 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent),
ui.weights->setModel(weightModel); ui.weights->setModel(weightModel);
closeMessage(); closeMessage();
connect(ui.editDiveSiteButton, SIGNAL(clicked()), MainWindow::instance(), SIGNAL(startDiveSiteEdit())); connect(ui.editDiveSiteButton, &QToolButton::clicked, MainWindow::instance(), &MainWindow::startDiveSiteEdit);
connect(ui.location, &DiveLocationLineEdit::entered, MapWidget::instance(), &MapWidget::centerOnIndex); connect(ui.location, &DiveLocationLineEdit::entered, MapWidget::instance(), &MapWidget::centerOnIndex);
connect(ui.location, &DiveLocationLineEdit::currentChanged, MapWidget::instance(), &MapWidget::centerOnIndex); connect(ui.location, &DiveLocationLineEdit::currentChanged, MapWidget::instance(), &MapWidget::centerOnIndex);