diff --git a/core/exportresourcearchivejob.h b/core/exportresourcearchivejob.h index 8327308a8681ce56ee6748e16ddaad882aa6a88b..7ce03367138ecf7de7e6381b0438e5a3d9799211 100644 --- a/core/exportresourcearchivejob.h +++ b/core/exportresourcearchivejob.h @@ -45,7 +45,6 @@ Q_SIGNALS: void info(const QString &str); void terminated(); - public Q_SLOTS: void slotTaskCanceled(); diff --git a/gui/dialog/synchronizeresourcedialog.h b/gui/dialog/synchronizeresourcedialog.h index 1e98cc94be900ec1b3ffcabc8fb79ac4c46e2090..07ce7cb287c81392e4d2e9c679a3505d3fb0ec42 100644 --- a/gui/dialog/synchronizeresourcedialog.h +++ b/gui/dialog/synchronizeresourcedialog.h @@ -37,7 +37,6 @@ private: void slotSelectAll(); void slotUnselectAll(); - enum DataType { ResourceIdentifier = Qt::UserRole + 1 }; diff --git a/gui/pimsettingexporterwindow.cpp b/gui/pimsettingexporterwindow.cpp index 2c9f6f884fb8657f280f473a194b91fcc71f11f9..ee5708b1ed568b2cb04814619b1100df4c50683b 100644 --- a/gui/pimsettingexporterwindow.cpp +++ b/gui/pimsettingexporterwindow.cpp @@ -279,9 +279,9 @@ void PimSettingExporterWindow::slotSaveLog() void PimSettingExporterWindow::slotBackupData() { if (KMessageBox::warningContinueCancel( - this, - i18n("Please quit all kdepim applications before backing up your data."), - i18n("Backup")) == KMessageBox::Cancel) { + this, + i18n("Please quit all kdepim applications before backing up your data."), + i18n("Backup")) == KMessageBox::Cancel) { return; } backupData(); @@ -355,10 +355,10 @@ void PimSettingExporterWindow::slotRestoreData() void PimSettingExporterWindow::loadData(const QString &filename, const QString &templateFile) { if (KMessageBox::warningYesNo( - this, - i18n("Before restoring data you must close all kdepim applications. " - "Do you want to continue?"), - i18n("Backup")) == KMessageBox::No) { + this, + i18n("Before restoring data you must close all kdepim applications. " + "Do you want to continue?"), + i18n("Backup")) == KMessageBox::No) { return; } @@ -366,13 +366,13 @@ void PimSettingExporterWindow::loadData(const QString &filename, const QString & QString currentFileName = filename; if (currentFileName.isEmpty()) { QString recentDirClass; - currentFileName = - QFileDialog::getOpenFileName( - this, - i18n("Restore backup"), - KFileWidget::getStartUrl(QUrl(QStringLiteral("kfiledialog:///pimsettingexporter")), - recentDirClass).toLocalFile(), - QStringLiteral("%1 (*.zip)").arg(i18n("Zip File"))); + currentFileName + = QFileDialog::getOpenFileName( + this, + i18n("Restore backup"), + KFileWidget::getStartUrl(QUrl(QStringLiteral("kfiledialog:///pimsettingexporter")), + recentDirClass).toLocalFile(), + QStringLiteral("%1 (*.zip)").arg(i18n("Zip File"))); if (currentFileName.isEmpty()) { return; } diff --git a/gui/pimsettingexporterwindow.h b/gui/pimsettingexporterwindow.h index 6b9badbbc38c040c041b294961693d1dfe3e0d56..ffbbaac459fe831929d21ad4e823ae0a2bac1548 100644 --- a/gui/pimsettingexporterwindow.h +++ b/gui/pimsettingexporterwindow.h @@ -66,15 +66,15 @@ private: QString mLastArchiveFileName; // Name, identifier QHash mNeedToSyncResources; - LogWidget *mLogWidget= nullptr; - KRecentFilesAction *mRecentFilesAction= nullptr; - QAction *mBackupAction= nullptr; - QAction *mRestoreAction= nullptr; - QAction *mSaveLogAction= nullptr; - QAction *mArchiveStructureInfo= nullptr; - QAction *mShowArchiveInformationsAction= nullptr; - QAction *mShowArchiveInformationsAboutCurrentArchiveAction= nullptr; - PimSettingsBackupRestoreUI *mPimSettingsBackupRestoreUI= nullptr; + LogWidget *mLogWidget = nullptr; + KRecentFilesAction *mRecentFilesAction = nullptr; + QAction *mBackupAction = nullptr; + QAction *mRestoreAction = nullptr; + QAction *mSaveLogAction = nullptr; + QAction *mArchiveStructureInfo = nullptr; + QAction *mShowArchiveInformationsAction = nullptr; + QAction *mShowArchiveInformationsAboutCurrentArchiveAction = nullptr; + PimSettingsBackupRestoreUI *mPimSettingsBackupRestoreUI = nullptr; PimSettingsTrayIcon *mTrayIcon = nullptr; };