mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-01 02:53:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup SubsurfaceWebServices class

Browse source 
* Remove statuic SubsurfaceWebServices::instance() member.

Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Boris Barbulovski 2014-02-09 17:51:19 +01:00 • committed by Dirk Hohndel
parent a8823c1793
commit 9eb47602dd
3 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
qt-ui/mainwindow.cpp
View file

@ -277,7 +277,9 @@ void MainWindow::on_actionDownloadDC_triggered()
void MainWindow::on_actionDownloadWeb_triggered() void MainWindow::on_actionDownloadWeb_triggered()
{ {
SubsurfaceWebServices::instance()->exec(); SubsurfaceWebServices dlg(this);
dlg.exec();
} }
void MainWindow::on_actionDivelogs_de_triggered() void MainWindow::on_actionDivelogs_de_triggered()

7
qt-ui/subsurfacewebservices.cpp
View file

@ -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) SubsurfaceWebServices::SubsurfaceWebServices(QWidget* parent, Qt::WindowFlags f)
{ {
QSettings s; QSettings s;

3
qt-ui/subsurfacewebservices.h
View file

@ -47,7 +47,7 @@ protected:
class SubsurfaceWebServices : public WebServices { class SubsurfaceWebServices : public WebServices {
Q_OBJECT Q_OBJECT
public: public:
static SubsurfaceWebServices* instance(); explicit SubsurfaceWebServices(QWidget* parent = 0, Qt::WindowFlags f = 0);
private slots: private slots:
void startDownload(); void startDownload();
@ -56,7 +56,6 @@ private slots:
void downloadError(QNetworkReply::NetworkError error); void downloadError(QNetworkReply::NetworkError error);
void startUpload(){} /*no op*/ void startUpload(){} /*no op*/
private: private:
explicit SubsurfaceWebServices(QWidget* parent = 0, Qt::WindowFlags f = 0);
void setStatusText(int status); void setStatusText(int status);
void download_dialog_traverse_xml(xmlNodePtr node, unsigned int *download_status); void download_dialog_traverse_xml(xmlNodePtr node, unsigned int *download_status);
unsigned int download_dialog_parse_response(const QByteArray& length); unsigned int download_dialog_parse_response(const QByteArray& length);