From 448743c7b65b48d8129f135ed781c11dce7ecb07 Mon Sep 17 00:00:00 2001 From: vng Date: Mon, 4 Jun 2012 16:36:42 -0700 Subject: [PATCH] Compilation fixes. --- qt/mainwindow.cpp | 4 ---- qt/update_dialog.cpp | 2 +- qt/update_dialog.hpp | 3 +-- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/qt/mainwindow.cpp b/qt/mainwindow.cpp index a385e7ec76..1aa9369c94 100644 --- a/qt/mainwindow.cpp +++ b/qt/mainwindow.cpp @@ -143,10 +143,6 @@ bool MainWindow::winEvent(MSG * msg, long * result) MainWindow::~MainWindow() { SaveState(); -#ifndef NO_DOWNLOADER - if (m_updateDialog) - m_updateDialog->DetachFromStorage(); -#endif } void MainWindow::SaveState() diff --git a/qt/update_dialog.cpp b/qt/update_dialog.cpp index f1d850a29c..722648bd1b 100644 --- a/qt/update_dialog.cpp +++ b/qt/update_dialog.cpp @@ -88,7 +88,7 @@ namespace qt bind(&UpdateDialog::OnCountryDownloadProgress, this, _1, _2)); } - void UpdateDialog::DetachFromStorage() + UpdateDialog::~UpdateDialog() { // tell download manager that we're gone... m_storage.Unsubscribe(m_observerSlotId); diff --git a/qt/update_dialog.hpp b/qt/update_dialog.hpp index 0932ff47ed..e02c7729e1 100644 --- a/qt/update_dialog.hpp +++ b/qt/update_dialog.hpp @@ -17,6 +17,7 @@ namespace qt public: explicit UpdateDialog(QWidget * parent, storage::Storage & storage); + virtual ~UpdateDialog(); /// @name Called from downloader to notify GUI //@{ @@ -27,8 +28,6 @@ namespace qt void ShowModal(); - void DetachFromStorage(); - private slots: void OnItemClick(QTreeWidgetItem * item, int column); void OnCloseClick();