From 1d9e2137c6d3dc572a2823b0180b20bcb5f8bd71 Mon Sep 17 00:00:00 2001 From: Volker Krause Date: Tue, 11 Apr 2017 19:20:53 +0200 Subject: [PATCH] Clean up some disabled code --- src/actionmanager.cpp | 46 ------------------------------------------- src/actionmanager.h | 3 --- 2 files changed, 49 deletions(-) diff --git a/src/actionmanager.cpp b/src/actionmanager.cpp index 2db4d22ad..9022270bd 100644 --- a/src/actionmanager.cpp +++ b/src/actionmanager.cpp @@ -806,13 +806,6 @@ void ActionManager::writeSettings() config->sync(); } -/* -void ActionManager::file_new() -{ - Q_EMIT actionNewMainWindow(); -} -*/ - void ActionManager::file_open() { const QString defaultPath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1String("/korganizer/"); @@ -1021,45 +1014,6 @@ bool ActionManager::saveAsURL(const QUrl &url) return success; } -#ifdef AKONADI_PORT_DISABLED // can go away, kept for reference -bool ActionManager::saveModifiedURL() -{ - - // If calendar isn't modified do nothing. - if (!mCalendarView->isModified()) { - return true; - } - - mHtmlExportSync = true; - if (KOPrefs::instance()->mAutoSave && !mURL.isEmpty()) { - // Save automatically, when auto save is enabled. - return saveURL(); - } else { - int result = KMessageBox::warningYesNoCancel( - dialogParent(), - i18n("The calendar has been modified.\nDo you want to save it?"), - QString(), - KStandardGuiItem::save(), KStandardGuiItem::discard()); - switch (result) { - case KMessageBox::Yes: - if (mURL.isEmpty()) { - QUrl url = getSaveURL(); - return saveAsURL(url); - } else { - return saveURL(); - } - case KMessageBox::No: - return true; - case KMessageBox::Cancel: - default: { - mHtmlExportSync = false; - return false; - } - } - } -} -#endif - QUrl ActionManager::getSaveURL() { QUrl url = diff --git a/src/actionmanager.h b/src/actionmanager.h index 8dd29d063..286d807f8 100644 --- a/src/actionmanager.h +++ b/src/actionmanager.h @@ -253,9 +253,6 @@ public Q_SLOTS: protected Q_SLOTS: void setItems(const QStringList &, int); - /** open new window */ - //void file_new(); - /** open a file, load it into the calendar. */ void file_open(); -- GitLab