Refactoring: Remove legacy class

Author: TheOneRing

src/gui/CMakeLists.txt

@@ -44,7 +44,6 @@ target_sources(OpenCloudGui PRIVATE
     networksettings.cpp
     notifications.cpp
     openfilemanager.cpp
-    owncloudgui.cpp
     protocolwidget.cpp
     protocolitem.cpp
     issueswidget.cpp

src/gui/accountsettings.cpp

@@ -187,7 +187,7 @@ void AccountSettings::slotRemoveCurrentFolder(Folder *folder)
         tr("<p>Do you really want to stop syncing the folder <i>%1</i>?</p>"
            "<p><b>Note:</b> This will <b>not</b> delete any files.</p>")
             .arg(shortGuiLocalPath),
-        QMessageBox::NoButton, ocApp()->gui()->settingsDialog());
+        QMessageBox::NoButton, ocApp()->settingsDialog());
     messageBox->setAttribute(Qt::WA_DeleteOnClose);
     QPushButton *yesButton = messageBox->addButton(tr("Remove Folder Sync Connection"), QMessageBox::YesRole);
     messageBox->addButton(tr("Cancel"), QMessageBox::NoRole);
@@ -304,14 +304,14 @@ void AccountSettings::slotForceSyncCurrentFolder(Folder *folder)
         auto messageBox = new QMessageBox(QMessageBox::Question, tr("Internet connection is metered"),
             tr("Synchronization is paused because the Internet connection is a metered connection"
                "<p>Do you really want to force a Synchronization now?"),
-            QMessageBox::Yes | QMessageBox::No, ocApp()->gui()->settingsDialog());
+            QMessageBox::Yes | QMessageBox::No, ocApp()->settingsDialog());
         messageBox->setAttribute(Qt::WA_DeleteOnClose);
         connect(messageBox, &QMessageBox::accepted, this, [folder = QPointer<Folder>(folder), this] {
             if (folder) {
                 doForceSyncCurrentFolder(folder);
             }
         });
-        ownCloudGui::raise();
+        ocApp()->showSettings();
         messageBox->open();
     } else {
         doForceSyncCurrentFolder(folder);
@@ -477,11 +477,11 @@ void AccountSettings::addModalLegacyDialog(QWidget *widget, ModalWidgetSizePolic
     connect(widget, &QWidget::destroyed, this, [this, outerWidget] {
         outerWidget->deleteLater();
         if (!_goingDown) {
-            ocApp()->gui()->settingsDialog()->ceaseModality(_accountState->account().get());
+            ocApp()->settingsDialog()->ceaseModality(_accountState->account().get());
         }
     });
     widget->setVisible(true);
-    ocApp()->gui()->settingsDialog()->requestModality(_accountState->account().get());
+    ocApp()->settingsDialog()->requestModality(_accountState->account().get());
 }
 
 void AccountSettings::addModalWidget(AccountModalWidget *widget)
@@ -491,9 +491,9 @@ void AccountSettings::addModalWidget(AccountModalWidget *widget)
 
     connect(widget, &AccountModalWidget::finished, this, [widget, this] {
         widget->deleteLater();
-        ocApp()->gui()->settingsDialog()->ceaseModality(_accountState->account().get());
+        ocApp()->settingsDialog()->ceaseModality(_accountState->account().get());
     });
-    ocApp()->gui()->settingsDialog()->requestModality(_accountState->account().get());
+    ocApp()->settingsDialog()->requestModality(_accountState->account().get());
 }
 
 uint AccountSettings::unsyncedSpaces() const

src/gui/accountsettings.h

@@ -19,7 +19,6 @@
 #include "folder.h"
 #include "gui/notifications.h"
 #include "gui/qmlutils.h"
-#include "owncloudgui.h"
 #include "progressdispatcher.h"
 
 #include <QSortFilterProxyModel>

src/gui/accountstate.cpp

@@ -61,15 +61,15 @@ UpdateUrlDialog *AccountState::updateUrlDialog(const QUrl &newUrl)
         return nullptr;
     }
 
-    _updateUrlDialog = UpdateUrlDialog::fromAccount(_account, newUrl, ocApp()->gui()->settingsDialog());
+    _updateUrlDialog = UpdateUrlDialog::fromAccount(_account, newUrl, ocApp()->settingsDialog());
 
     connect(_updateUrlDialog, &UpdateUrlDialog::accepted, this, [=]() {
         _account->setUrl(newUrl);
         Q_EMIT _account->wantsAccountSaved(_account.data());
         Q_EMIT urlUpdated();
     });
 
-    ownCloudGui::raise();
+    ocApp()->showSettings();
     _updateUrlDialog->open();
 
     return _updateUrlDialog;
@@ -180,9 +180,9 @@ AccountState::AccountState(AccountPtr account)
     }
 
     connect(account.data(), &Account::appProviderErrorOccured, this, [](const QString &error) {
-        QMessageBox *msgBox = new QMessageBox(QMessageBox::Information, Theme::instance()->appNameGUI(), error, {}, ocApp()->gui()->settingsDialog());
+        QMessageBox *msgBox = new QMessageBox(QMessageBox::Information, Theme::instance()->appNameGUI(), error, {}, ocApp()->settingsDialog());
         msgBox->setAttribute(Qt::WA_DeleteOnClose);
-        ownCloudGui::raise();
+        ocApp()->showSettings();
         msgBox->open();
     });
 }
@@ -390,7 +390,7 @@ void AccountState::checkConnectivity(bool blockJobs)
             // ignore errors for already accepted certificates
             auto filteredErrors = _account->accessManager()->filterSslErrors(errors);
             if (!filteredErrors.isEmpty()) {
-                _tlsDialog = new TlsErrorDialog(filteredErrors, _account->url().host(), ocApp()->gui()->settingsDialog());
+                _tlsDialog = new TlsErrorDialog(filteredErrors, _account->url().host(), ocApp()->settingsDialog());
                 _tlsDialog->setAttribute(Qt::WA_DeleteOnClose);
                 QSet<QSslCertificate> certs;
                 certs.reserve(filteredErrors.size());
@@ -411,7 +411,7 @@ void AccountState::checkConnectivity(bool blockJobs)
                     setState(SignedOut);
                 });
 
-                ownCloudGui::raise();
+                ocApp()->showSettings();
                 _tlsDialog->open();
             }
         }