# # # patch "src/view/dialogs/DialogManager.h" # from [fb0c84bfd291c84c6ab6614f5b0f428ee284353b] # to [2f93abf7a40acf2c42de1849769f1e1c0e9f060c] # # patch "src/view/dialogs/ServerDialogManager.cpp" # from [2e6ba55e01475839f23dd7c73218ade7c5bbb27e] # to [52e9ac734727c17fae848c7f4393327aa6ba0226] # # patch "src/view/dialogs/ServerDialogManager.h" # from [c6fc35b5aef74c4989563d2be9c35f0f34501905] # to [1c3df9c4b35acd6a8ffb707fd21e681422c48baa] # # patch "src/view/mainwindows/DatabaseWindow.cpp" # from [55a1e7f3e8933fc25ad16646d25be9e4792a205b] # to [9d43491fab42bd93ccd6285b088282e5f18a8e83] # # patch "src/view/mainwindows/ServerWindow.cpp" # from [b946fbbaeb71f07104d63d3a0a52c0590a3e11c6] # to [f123f672b2404bf2da4678c71c4274b7627b05c5] # # patch "src/view/mainwindows/WorkspaceWindow.cpp" # from [9b7fca4b808d4282a3b8d634a83e3678939147f4] # to [0ecae633fd216bc08efa9a5d583b95a9c8de6d0a] # ============================================================ --- src/view/dialogs/DialogManager.h fb0c84bfd291c84c6ab6614f5b0f428ee284353b +++ src/view/dialogs/DialogManager.h 2f93abf7a40acf2c42de1849769f1e1c0e9f060c @@ -70,8 +70,6 @@ private: MonotoneHandlePtr monotoneHandle; private: - void cleanup(); - QStack openDialogs; private slots: ============================================================ --- src/view/mainwindows/DatabaseWindow.cpp 55a1e7f3e8933fc25ad16646d25be9e4792a205b +++ src/view/mainwindows/DatabaseWindow.cpp 9d43491fab42bd93ccd6285b088282e5f18a8e83 @@ -164,7 +164,7 @@ void DatabaseWindow::load(const Monotone tr("%1 - database mode - guitone").arg(fi.fileName()) ); - reinterpret_cast(dialogManager)->init(monotoneHandle); + dialogManager->init(monotoneHandle); databaseVariables->setMonotoneHandle(monotoneHandle); QTimer::singleShot(0, this, SLOT(checkForEmptyDatabase())); ============================================================ --- src/view/mainwindows/WorkspaceWindow.cpp 9b7fca4b808d4282a3b8d634a83e3678939147f4 +++ src/view/mainwindows/WorkspaceWindow.cpp 0ecae633fd216bc08efa9a5d583b95a9c8de6d0a @@ -421,7 +421,7 @@ void WorkspaceWindow::load(const Monoton arg(MonotoneUtil::getBranchNameShort(handle)) ); - reinterpret_cast(dialogManager)->init(handle); + dialogManager->init(handle); invModel->setMonotoneHandle(handle); invWatcher->setMonotoneHandle(handle); ============================================================ --- src/view/dialogs/ServerDialogManager.cpp 2e6ba55e01475839f23dd7c73218ade7c5bbb27e +++ src/view/dialogs/ServerDialogManager.cpp 52e9ac734727c17fae848c7f4393327aa6ba0226 @@ -27,11 +27,6 @@ ServerDialogManager::~ServerDialogManage ServerDialogManager::~ServerDialogManager() { - cleanup(); -} - -void ServerDialogManager::cleanup() -{ if (changesetBrowser) delete changesetBrowser; if (fileDiff) delete fileDiff; if (fileHistory) delete fileHistory; ============================================================ --- src/view/dialogs/ServerDialogManager.h c6fc35b5aef74c4989563d2be9c35f0f34501905 +++ src/view/dialogs/ServerDialogManager.h 1c3df9c4b35acd6a8ffb707fd21e681422c48baa @@ -64,11 +64,6 @@ protected: RevisionManifest * revisionManifest; SelectRevision * selectRevision; CreateCert * createCert; - -private: - void cleanup(); - - MonotoneHandlePtr monotoneHandle; }; #endif ============================================================ --- src/view/mainwindows/ServerWindow.cpp b946fbbaeb71f07104d63d3a0a52c0590a3e11c6 +++ src/view/mainwindows/ServerWindow.cpp f123f672b2404bf2da4678c71c4274b7627b05c5 @@ -111,7 +111,6 @@ void ServerWindow::load(const MonotoneHa void ServerWindow::load(const MonotoneHandlePtr & handle) { I(handle->getType() == MonotoneHandle::server_handle); - APP->manager()->getThread(handle); monotoneHandle = handle; @@ -141,6 +140,6 @@ void ServerWindow::load(const MonotoneHa tr("%1 - server mode - guitone").arg(winTitle) ); - reinterpret_cast(dialogManager)->init(handle); + dialogManager->init(monotoneHandle); }