[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [pim-data-exporter/Applications/16.12] gui: Use KStandardGuiItem::overwrite()
From:       Pino Toscano <pino () kde ! org>
Date:       2016-12-04 15:03:35
Message-ID: E1cDYKF-0004wc-UE () code ! kde ! org
[Download RAW message or body]

Git commit cb315d15767a4d610c199de93ef11cf9b9be3319 by Pino Toscano.
Committed on 04/12/2016 at 15:03.
Pushed by pino into branch 'Applications/16.12'.

Use KStandardGuiItem::overwrite()

... instead of creating the KGuiItem from scratch

M  +2    -1    gui/importexportprogressindicatorgui.cpp

https://commits.kde.org/pim-data-exporter/cb315d15767a4d610c199de93ef11cf9b=
9be3319

diff --git a/gui/importexportprogressindicatorgui.cpp b/gui/importexportpro=
gressindicatorgui.cpp
index 51b896c..2d000dc 100644
--- a/gui/importexportprogressindicatorgui.cpp
+++ b/gui/importexportprogressindicatorgui.cpp
@@ -22,6 +22,7 @@
 #include <qprogressdialog.h>
 #include <KMessageBox>
 #include <KLocalizedString>
+#include <KStandardGuiItem>
 =

 ImportExportProgressIndicatorGui::ImportExportProgressIndicatorGui(QWidget=
 *parentWidget, QObject *parent)
     : ImportExportProgressIndicatorBase(parent),
@@ -76,7 +77,7 @@ int ImportExportProgressIndicatorGui::mergeConfigMessageB=
ox(const QString &confi
     if (PimSettingExportGlobalConfig::self()->alwaysMergeConfigFile()) {
         return KMessageBox::Yes;
     }
-    return KMessageBox::warningYesNoCancel(mParentWidget, i18n("\"%1\" alr=
eady exists. Do you want to overwrite it or merge it?", configName), i18n("=
Restore"), KGuiItem(i18n("Overwrite")), KGuiItem(i18n("Merge")));
+    return KMessageBox::warningYesNoCancel(mParentWidget, i18n("\"%1\" alr=
eady exists. Do you want to overwrite it or merge it?", configName), i18n("=
Restore"), KStandardGuiItem::overwrite(), KGuiItem(i18n("Merge")));
 }
 =

 bool ImportExportProgressIndicatorGui::overwriteConfigMessageBox(const QSt=
ring &configName) const
[prev in list] [next in list] [prev in thread] [next in thread]