diff options
| author |  Boris Barbulovski <bbarbulovski@gmail.com> | 2014-02-09 17:51:19 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2014-02-09 14:04:37 -0800 |
| commit | 9eb47602dd86e3233ee7a0ce1a10e5021c282489 (patch) | |
| tree | d621b6a22865df4ed30a8d3fc9e6503839f138fc | |
| parent | a8823c1793362d30477905917c59ec47dc2f2717 (diff) | |
| download | subsurface-9eb47602dd86e3233ee7a0ce1a10e5021c282489.tar.gz | |
Cleanup SubsurfaceWebServices class
* Remove statuic SubsurfaceWebServices::instance() member.
Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | qt-ui/mainwindow.cpp | 4 | ||||
| -rw-r--r-- | qt-ui/subsurfacewebservices.cpp | 7 | ||||
| -rw-r--r-- | qt-ui/subsurfacewebservices.h | 3 |
3 files changed, 4 insertions, 10 deletions
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index a477bbdd4..537da82be 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -277,7 +277,9 @@ void MainWindow::on_actionDownloadDC_triggered() void MainWindow::on_actionDownloadWeb_triggered() { - SubsurfaceWebServices::instance()->exec(); + SubsurfaceWebServices dlg(this); + + dlg.exec(); } void MainWindow::on_actionDivelogs_de_triggered() diff --git a/qt-ui/subsurfacewebservices.cpp b/qt-ui/subsurfacewebservices.cpp index 08cf72313..80d064d6f 100644 --- a/qt-ui/subsurfacewebservices.cpp +++ b/qt-ui/subsurfacewebservices.cpp @@ -310,13 +310,6 @@ void WebServices::resetState() // # // # -SubsurfaceWebServices* SubsurfaceWebServices::instance() -{ - static SubsurfaceWebServices *self = new SubsurfaceWebServices(mainWindow()); - self->setAttribute(Qt::WA_QuitOnClose, false); - return self; -} - SubsurfaceWebServices::SubsurfaceWebServices(QWidget* parent, Qt::WindowFlags f) { QSettings s; diff --git a/qt-ui/subsurfacewebservices.h b/qt-ui/subsurfacewebservices.h index a8478d99b..400f4086e 100644 --- a/qt-ui/subsurfacewebservices.h +++ b/qt-ui/subsurfacewebservices.h @@ -47,7 +47,7 @@ protected: class SubsurfaceWebServices : public WebServices { Q_OBJECT public: - static SubsurfaceWebServices* instance(); + explicit SubsurfaceWebServices(QWidget* parent = 0, Qt::WindowFlags f = 0); private slots: void startDownload(); @@ -56,7 +56,6 @@ private slots: void downloadError(QNetworkReply::NetworkError error); void startUpload(){} /*no op*/ private: - explicit SubsurfaceWebServices(QWidget* parent = 0, Qt::WindowFlags f = 0); void setStatusText(int status); void download_dialog_traverse_xml(xmlNodePtr node, unsigned int *download_status); unsigned int download_dialog_parse_response(const QByteArray& length); |