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

List:       kde-commits
Subject:    [kdepim] /: USe QStringLiteral
From:       Montel Laurent <montel () kde ! org>
Date:       2015-07-01 12:00:52
Message-ID: E1ZAGhA-0000FH-OF () scm ! kde ! org
[Download RAW message or body]

Git commit 82eb60a89f68be5bf6dc5c1a62fab5d6748ff9f5 by Montel Laurent.
Committed on 01/07/2015 at 11:40.
Pushed by mlaurent into branch 'master'.

USe QStringLiteral

M  +1    -1    kleopatra/mainwindow_desktop.cpp
M  +1    -1    kmail/editor/kmcomposewin.cpp
M  +10   -10   kmail/kmmainwidget.cpp
M  +17   -17   ktnef/ktnefmain.cpp
M  +1    -1    messageviewer/viewer/viewer_p.cpp

http://commits.kde.org/kdepim/82eb60a89f68be5bf6dc5c1a62fab5d6748ff9f5

diff --git a/kleopatra/mainwindow_desktop.cpp b/kleopatra/mainwindow_desktop.cpp
index f08c7a0..736ac51 100644
--- a/kleopatra/mainwindow_desktop.cpp
+++ b/kleopatra/mainwindow_desktop.cpp
@@ -381,7 +381,7 @@ void MainWindow::Private::setupActions()
 
     make_actions_from_data(action_data, /*sizeof action_data / sizeof \
*action_data,*/ coll);  
-    if (QAction *action = coll->action(QLatin1String("configure_backend"))) {
+    if (QAction *action = coll->action(QStringLiteral("configure_backend"))) {
         action->setMenuRole(QAction::NoRole);    //prevent Qt OS X heuristics for \
config* actions  }
 
diff --git a/kmail/editor/kmcomposewin.cpp b/kmail/editor/kmcomposewin.cpp
index f57d3fa..e5ae453 100644
--- a/kmail/editor/kmcomposewin.cpp
+++ b/kmail/editor/kmcomposewin.cpp
@@ -1408,7 +1408,7 @@ void KMComposeWin::setupActions(void)
 
     // In Kontact, this entry would read "Configure Kontact", but bring
     // up KMail's config dialog. That's sensible, though, so fix the label.
-    QAction *configureAction = \
actionCollection()->action(QLatin1String("options_configure")); +    QAction \
*configureAction = actionCollection()->action(QStringLiteral("options_configure"));  \
if (configureAction) {  configureAction->setText(i18n("Configure KMail..."));
     }
diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
index c899fbf..04ab074 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -1156,10 +1156,10 @@ void KMMainWidget::updateMoveAction(bool hasUnreadMails, bool \
hasMails)  const bool enable_goto_unread = hasUnreadMails
                                     || (GlobalSettings::self()->loopOnGotoUnread() \
                == GlobalSettings::EnumLoopOnGotoUnread::LoopInAllFolders)
                                     || (GlobalSettings::self()->loopOnGotoUnread() \
                == GlobalSettings::EnumLoopOnGotoUnread::LoopInAllMarkedFolders);
-    actionCollection()->action(QLatin1String("go_next_message"))->setEnabled(hasMails);
                
-    actionCollection()->action(QLatin1String("go_next_unread_message"))->setEnabled(enable_goto_unread);
                
-    actionCollection()->action(QLatin1String("go_prev_message"))->setEnabled(hasMails);
                
-    actionCollection()->action(QLatin1String("go_prev_unread_message"))->setEnabled(enable_goto_unread);
 +    actionCollection()->action(QStringLiteral("go_next_message"))->setEnabled(hasMails);
 +    actionCollection()->action(QStringLiteral("go_next_unread_message"))->setEnabled(enable_goto_unread);
 +    actionCollection()->action(QStringLiteral("go_prev_message"))->setEnabled(hasMails);
 +    actionCollection()->action(QStringLiteral("go_prev_unread_message"))->setEnabled(enable_goto_unread);
                
     if (mAkonadiStandardActionManager && \
mAkonadiStandardActionManager->action(Akonadi::StandardMailActionManager::MarkAllMailAsRead)) \
                {
         mAkonadiStandardActionManager->action(Akonadi::StandardMailActionManager::MarkAllMailAsRead)->setEnabled(hasUnreadMails);
  }
@@ -3830,8 +3830,8 @@ void KMMainWidget::updateMessageActionsDelayed()
     mMessageNewList->setEnabled(newPostToMailingList);
 
     slotUpdateOnlineStatus(static_cast<GlobalSettingsBase::EnumNetworkState::type>(GlobalSettings::self()->networkState()));
                
-    if (action(QLatin1String("kmail_undo"))) {
-        action(QLatin1String("kmail_undo"))->setEnabled(kmkernel->undoStack()->size() \
> 0); +    if (action(QStringLiteral("kmail_undo"))) {
+        action(QStringLiteral("kmail_undo"))->setEnabled(kmkernel->undoStack()->size() \
> 0);  }
 
     // Enable / disable all filters.
@@ -4095,8 +4095,8 @@ QList<KActionCollection *> KMMainWidget::actionCollections() \
const  //-----------------------------------------------------------------------------
  void KMMainWidget::slotUpdateUndo()
 {
-    if (actionCollection()->action(QLatin1String("kmail_undo"))) {
-        QAction *act = actionCollection()->action(QLatin1String("kmail_undo"));
+    if (actionCollection()->action(QStringLiteral("kmail_undo"))) {
+        QAction *act = actionCollection()->action(QStringLiteral("kmail_undo"));
         act->setEnabled(!kmkernel->undoStack()->isEmpty());
         const QString infoStr = kmkernel->undoStack()->undoInfo();
         if (infoStr.isEmpty()) {
@@ -4192,8 +4192,8 @@ void KMMainWidget::initializeFilterActions()
 void KMMainWidget::updateFileMenu()
 {
     const bool isEmpty = MailCommon::Util::agentInstances().isEmpty();
-    actionCollection()->action(QLatin1String("check_mail"))->setEnabled(!isEmpty);
-    actionCollection()->action(QLatin1String("check_mail_in"))->setEnabled(!isEmpty);
 +    actionCollection()->action(QStringLiteral("check_mail"))->setEnabled(!isEmpty);
+    actionCollection()->action(QStringLiteral("check_mail_in"))->setEnabled(!isEmpty);
  }
 
 //-----------------------------------------------------------------------------
diff --git a/ktnef/ktnefmain.cpp b/ktnef/ktnefmain.cpp
index 3bfd562..8695539 100644
--- a/ktnef/ktnefmain.cpp
+++ b/ktnef/ktnefmain.cpp
@@ -151,12 +151,12 @@ void KTNEFMain::setupActions()
     messSaveAction->setIcon(QIcon::fromTheme(QStringLiteral("document-save")));
     connect(messSaveAction, &QAction::triggered, this, \
&KTNEFMain::slotSaveMessageText);  
-    actionCollection()->action(QLatin1String("view_file"))->setEnabled(false);
-    actionCollection()->action(QLatin1String("view_file_as"))->setEnabled(false);
-    actionCollection()->action(QLatin1String("extract_file"))->setEnabled(false);
-    actionCollection()->action(QLatin1String("extract_file_to"))->setEnabled(false);
-    actionCollection()->action(QLatin1String("extract_all_files"))->setEnabled(false);
                
-    actionCollection()->action(QLatin1String("properties_file"))->setEnabled(false);
+    actionCollection()->action(QStringLiteral("view_file"))->setEnabled(false);
+    actionCollection()->action(QStringLiteral("view_file_as"))->setEnabled(false);
+    actionCollection()->action(QStringLiteral("extract_file"))->setEnabled(false);
+    actionCollection()->action(QStringLiteral("extract_file_to"))->setEnabled(false);
 +    actionCollection()->action(QStringLiteral("extract_all_files"))->setEnabled(false);
 +    actionCollection()->action(QStringLiteral("properties_file"))->setEnabled(false);
  
     // Options menu
     QAction *defFolderAction = \
actionCollection()->addAction(QStringLiteral("options_default_dir")); @@ -357,12 \
+357,12 @@ void KTNEFMain::viewSelectionChanged()  const bool on1 = (nbItem == 1);
     const bool on2 = (nbItem > 0);
 
-    actionCollection()->action(QLatin1String("view_file"))->setEnabled(on1);
-    actionCollection()->action(QLatin1String("view_file_as"))->setEnabled(on1);
-    actionCollection()->action(QLatin1String("properties_file"))->setEnabled(on1);
+    actionCollection()->action(QStringLiteral("view_file"))->setEnabled(on1);
+    actionCollection()->action(QStringLiteral("view_file_as"))->setEnabled(on1);
+    actionCollection()->action(QStringLiteral("properties_file"))->setEnabled(on1);
 
-    actionCollection()->action(QLatin1String("extract_file"))->setEnabled(on2);
-    actionCollection()->action(QLatin1String("extract_file_to"))->setEnabled(on2);
+    actionCollection()->action(QStringLiteral("extract_file"))->setEnabled(on2);
+    actionCollection()->action(QStringLiteral("extract_file_to"))->setEnabled(on2);
 }
 
 void KTNEFMain::enableExtractAll(bool on)
@@ -371,16 +371,16 @@ void KTNEFMain::enableExtractAll(bool on)
         enableSingleAction(false);
     }
 
-    actionCollection()->action(QLatin1String("extract_all_files"))->setEnabled(on);
+    actionCollection()->action(QStringLiteral("extract_all_files"))->setEnabled(on);
 }
 
 void KTNEFMain::enableSingleAction(bool on)
 {
-    actionCollection()->action(QLatin1String("extract_file"))->setEnabled(on);
-    actionCollection()->action(QLatin1String("extract_file_to"))->setEnabled(on);
-    actionCollection()->action(QLatin1String("view_file"))->setEnabled(on);
-    actionCollection()->action(QLatin1String("view_file_as"))->setEnabled(on);
-    actionCollection()->action(QLatin1String("properties_file"))->setEnabled(on);
+    actionCollection()->action(QStringLiteral("extract_file"))->setEnabled(on);
+    actionCollection()->action(QStringLiteral("extract_file_to"))->setEnabled(on);
+    actionCollection()->action(QStringLiteral("view_file"))->setEnabled(on);
+    actionCollection()->action(QStringLiteral("view_file_as"))->setEnabled(on);
+    actionCollection()->action(QStringLiteral("properties_file"))->setEnabled(on);
 }
 
 void KTNEFMain::cleanup()
diff --git a/messageviewer/viewer/viewer_p.cpp b/messageviewer/viewer/viewer_p.cpp
index 99692da..d9fbd59 100644
--- a/messageviewer/viewer/viewer_p.cpp
+++ b/messageviewer/viewer/viewer_p.cpp
@@ -2879,7 +2879,7 @@ void ViewerPrivate::slotCopySelectedText()
 
 void ViewerPrivate::viewerSelectionChanged()
 {
-    mActionCollection->action(QLatin1String("kmail_copy"))->setEnabled(!mViewer->selectedText().isEmpty());
 +    mActionCollection->action(QStringLiteral("kmail_copy"))->setEnabled(!mViewer->selectedText().isEmpty());
  }
 
 void ViewerPrivate::selectAll()


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