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

List:       kde-commits
Subject:    [calligra] /: Use KStandardGuiItem more
From:       Pino Toscano <pino () kde ! org>
Date:       2016-12-10 14:22:21
Message-ID: E1cFiXd-0004yM-8C () code ! kde ! org
[Download RAW message or body]

Git commit 2dadd69d6ff289c011c6a51e78e428ad945e807d by Pino Toscano.
Committed on 10/12/2016 at 14:22.
Pushed by pino into branch 'master'.

Use KStandardGuiItem more

M  +2    -1    libs/main/KoTemplateCreateDia.cpp
M  +2    -2    plugins/textediting/thesaurus/Thesaurus.cpp
M  +2    -1    sheets/part/View.cpp

https://commits.kde.org/calligra/2dadd69d6ff289c011c6a51e78e428ad945e807d

diff --git a/libs/main/KoTemplateCreateDia.cpp b/libs/main/KoTemplateCreateDia.cpp
index 496943d7b27..2d43de69124 100644
--- a/libs/main/KoTemplateCreateDia.cpp
+++ b/libs/main/KoTemplateCreateDia.cpp
@@ -58,6 +58,7 @@
 #include <kconfiggroup.h>
 #include <ksharedconfig.h>
 #include <kio/job.h>
+#include <kstandardguiitem.h>
 
 // ODF thumbnail extent
 static const int thumbnailExtent = 128;
@@ -469,7 +470,7 @@ void KoTemplateCreateDia::slotRemove() {
         }
 
     if(KMessageBox::warningContinueCancel(this, what,
-                                 removed,KGuiItem(i18n("&Delete"), \
koIconName("edit-delete")))==KMessageBox::Cancel) { +                                 \
removed,KStandardGuiItem::del())==KMessageBox::Cancel) {  d->m_name->setFocus();
         return;
     }
diff --git a/plugins/textediting/thesaurus/Thesaurus.cpp \
b/plugins/textediting/thesaurus/Thesaurus.cpp index de8f324c684..a5b92705064 100644
--- a/plugins/textediting/thesaurus/Thesaurus.cpp
+++ b/plugins/textediting/thesaurus/Thesaurus.cpp
@@ -71,6 +71,7 @@ NOT TODO:
 #include <khistorycombobox.h>
 #include <krun.h>
 #include <kcombobox.h>
+#include <kstandardguiitem.h>
 
 Thesaurus::Thesaurus()
 {
@@ -252,8 +253,7 @@ void Thesaurus::checkSection(QTextDocument *document, int \
startPosition, int end  if (document)
             m_word = document->toPlainText();
         m_dialog->showButton(KoDialog::Ok, false);
-        m_dialog->setButtonGuiItem(KoDialog::Cancel,
-                KGuiItem(i18nc("@action:button Close thesaurus dialog", "&Close"), \
koIconName("dialog-cancel"))); +        m_dialog->setButtonGuiItem(KoDialog::Cancel, \
KStandardGuiItem::close());  m_replaceLineEdit->setEnabled(false);
         m_replaceLabel->setEnabled(false);
     }
diff --git a/sheets/part/View.cpp b/sheets/part/View.cpp
index 72fc26685b8..b85064bced9 100644
--- a/sheets/part/View.cpp
+++ b/sheets/part/View.cpp
@@ -68,6 +68,7 @@
 #include <kstandardaction.h>
 #include <ktoggleaction.h>
 #include <kxmlguifactory.h>
+#include <kstandardguiitem.h>
 
 // Calligra includes
 #include <KoComponentData.h>
@@ -1742,7 +1743,7 @@ void View::deleteSheet()
         return;
     }
     int ret = KMessageBox::warningContinueCancel(this, i18n("You are about to remove \
                the active sheet.\nDo you want to continue?"),
-              i18n("Remove Sheet"), KGuiItem(i18n("&Delete"), \
koIconName("edit-delete"))); +              i18n("Remove Sheet"), \
KStandardGuiItem::del());  
     if (ret == KMessageBox::Continue) {
         selection()->emitCloseEditor(false); // discard changes


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