diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-07-30 20:59:07 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-07-30 13:55:23 -0700 |
| commit | 7fe76a5dbdef4a833122e0311191dd51896575f4 (patch) | |
| tree | 34b1d4f8a7c2d6d4b6b97a142ca27937c4ec4284 /desktop-widgets | |
| parent | 4bdd811f06096c2420a05dd3cc78fffbd7f3a663 (diff) | |
| download | subsurface-7fe76a5dbdef4a833122e0311191dd51896575f4.tar.gz | |
Cleanup: Make WindowsTitleUpdate a global object
WindowsTitleUpdate is such a trivial object (a QObject with a single
signal and no own state), that it's not really understandable why
it would need all that "singleton" boiler-plate. Just make it
a default constructed/destructed global object.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'desktop-widgets')
| -rw-r--r-- | desktop-widgets/mainwindow.cpp | 3 | ||||
| -rw-r--r-- | desktop-widgets/mainwindow.h | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp index 64ea2ef6d..9da89f8f5 100644 --- a/desktop-widgets/mainwindow.cpp +++ b/desktop-widgets/mainwindow.cpp @@ -218,8 +218,7 @@ MainWindow::MainWindow() : QMainWindow(), connect(information(), SIGNAL(diveSiteChanged(struct dive_site *)), mapWidget, SLOT(centerOnDiveSite(struct dive_site *))); connect(this, &MainWindow::showError, ui.mainErrorMessage, &NotificationWidget::showError, Qt::AutoConnection); - wtu = new WindowTitleUpdate(); - connect(WindowTitleUpdate::instance(), SIGNAL(updateTitle()), this, SLOT(setAutomaticTitle())); + connect(&windowTitleUpdate, &WindowTitleUpdate::updateTitle, this, &MainWindow::setAutomaticTitle); #ifdef NO_PRINTING plannerDetails->printPlan()->hide(); ui.menuFile->removeAction(ui.actionPrint); diff --git a/desktop-widgets/mainwindow.h b/desktop-widgets/mainwindow.h index 8c7347fd3..da3396981 100644 --- a/desktop-widgets/mainwindow.h +++ b/desktop-widgets/mainwindow.h @@ -17,7 +17,6 @@ #include "ui_mainwindow.h" #include "ui_plannerDetails.h" #include "desktop-widgets/notificationwidget.h" -#include "core/windowtitleupdate.h" #include "core/gpslocation.h" #define NUM_RECENT_FILES 4 @@ -253,7 +252,6 @@ private: QHash<QByteArray, WidgetForQuadrant> applicationState; QHash<QByteArray, PropertiesForQuadrant> stateProperties; - WindowTitleUpdate *wtu; GpsLocation *locationProvider; QMenu *connections; QAction *share_on_fb; |