Debugger: Strip QLatin1* where possible

Change-Id: Idcab23875b5dc2ecf55e3303f417b995e2252720
Reviewed-by: hjk <[email protected]>

4 files changed, 32 insertions, 32 deletions

diff --git a/src/plugins/debugger/console/console.cpp b/src/plugins/debugger/console/console.cpp
index 9391d9f05f1..1ff13a25458 100644
--- a/src/plugins/debugger/console/console.cpp
+++ b/src/plugins/debugger/console/console.cpp
@@ -104,7 +104,7 @@ Console::Console()
 
     m_showDebugButtonAction = new Utils::SavedAction(this);
     m_showDebugButtonAction->setDefaultValue(true);
-    m_showDebugButtonAction->setSettingsKey(QLatin1String(CONSOLE), QLatin1String(SHOW_LOG));
+    m_showDebugButtonAction->setSettingsKey(CONSOLE, SHOW_LOG);
     m_showDebugButtonAction->setToolTip(tr("Show debug, log, and info messages."));
     m_showDebugButtonAction->setCheckable(true);
     m_showDebugButtonAction->setChecked(true);
@@ -118,7 +118,7 @@ Console::Console()
 
     m_showWarningButtonAction = new Utils::SavedAction(this);
     m_showWarningButtonAction->setDefaultValue(true);
-    m_showWarningButtonAction->setSettingsKey(QLatin1String(CONSOLE), QLatin1String(SHOW_WARNING));
+    m_showWarningButtonAction->setSettingsKey(CONSOLE, SHOW_WARNING);
     m_showWarningButtonAction->setToolTip(tr("Show warning messages."));
     m_showWarningButtonAction->setCheckable(true);
     m_showWarningButtonAction->setChecked(true);
@@ -132,7 +132,7 @@ Console::Console()
 
     m_showErrorButtonAction = new Utils::SavedAction(this);
     m_showErrorButtonAction->setDefaultValue(true);
-    m_showErrorButtonAction->setSettingsKey(QLatin1String(CONSOLE), QLatin1String(SHOW_ERROR));
+    m_showErrorButtonAction->setSettingsKey(CONSOLE, SHOW_ERROR);
     m_showErrorButtonAction->setToolTip(tr("Show error messages."));
     m_showErrorButtonAction->setCheckable(true);
     m_showErrorButtonAction->setChecked(true);
diff --git a/src/plugins/debugger/console/consoleitemdelegate.cpp b/src/plugins/debugger/console/consoleitemdelegate.cpp
index 5a4f0becaf4..265ee6ce179 100644
--- a/src/plugins/debugger/console/consoleitemdelegate.cpp
+++ b/src/plugins/debugger/console/consoleitemdelegate.cpp
@@ -56,7 +56,7 @@ ConsoleItemDelegate::ConsoleItemDelegate(ConsoleItemModel *model, QObject *paren
     m_errorIcon(Utils::Icons::CRITICAL.icon()),
     m_expandIcon(Utils::Icons::EXPAND.icon()),
     m_collapseIcon(Utils::Icons::COLLAPSE.icon()),
-    m_prompt(Utils::Icon({{QLatin1String(":/utils/images/next.png"),
+    m_prompt(Utils::Icon({{":/utils/images/next.png",
                           Utils::Theme::TextColorNormal}}, Utils::Icon::Tint).icon())
 {
 }
@@ -183,7 +183,7 @@ void ConsoleItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &o
         if (!file.isEmpty()) {
             QFontMetrics fm(option.font);
             // Paint FileArea
-            const int pos = file.lastIndexOf(QLatin1Char('/'));
+            const int pos = file.lastIndexOf('/');
             if (pos != -1)
                 file = file.mid(pos +1);
             const int realFileWidth = fm.width(file);
@@ -269,11 +269,11 @@ QWidget *ConsoleItemDelegate::createEditor(QWidget *parent,
 {
     auto editor = new ConsoleEdit(index, parent);
     // Make the background transparent so that the prompt shines through
-    editor->setStyleSheet(QLatin1String("QTextEdit {"
-                                        "margin-left: 24px;"
-                                        "margin-top: 4px;"
-                                        "background-color: transparent;"
-                                        "}"));
+    editor->setStyleSheet("QTextEdit {"
+                          "margin-left: 24px;"
+                          "margin-top: 4px;"
+                          "background-color: transparent;"
+                          "}");
     connect(editor, &ConsoleEdit::editingFinished, this, [this, editor] {
         auto delegate = const_cast<ConsoleItemDelegate*>(this);
         emit delegate->commitData(editor);
diff --git a/src/plugins/debugger/console/consoleitemmodel.cpp b/src/plugins/debugger/console/consoleitemmodel.cpp
index 383a0e7b643..525aca0dc0d 100644
--- a/src/plugins/debugger/console/consoleitemmodel.cpp
+++ b/src/plugins/debugger/console/consoleitemmodel.cpp
@@ -87,7 +87,7 @@ int ConsoleItemModel::sizeOfFile(const QFont &font)
     if (lastReadOnlyRow < 0)
         return 0;
     QString filename = static_cast<ConsoleItem *>(rootItem()->childAt(lastReadOnlyRow))->file();
-    const int pos = filename.lastIndexOf(QLatin1Char('/'));
+    const int pos = filename.lastIndexOf('/');
     if (pos != -1)
         filename = filename.mid(pos + 1);
 
@@ -100,7 +100,7 @@ int ConsoleItemModel::sizeOfFile(const QFont &font)
 int ConsoleItemModel::sizeOfLineNumber(const QFont &font)
 {
     QFontMetrics fm(font);
-    return fm.width(QLatin1String("88888"));
+    return fm.width("88888");
 }
 
 } // Internal
diff --git a/src/plugins/debugger/console/consoleview.cpp b/src/plugins/debugger/console/consoleview.cpp
index 2891e1aa0bc..9969bfb0f5c 100644
--- a/src/plugins/debugger/console/consoleview.cpp
+++ b/src/plugins/debugger/console/consoleview.cpp
@@ -84,30 +84,30 @@ ConsoleView::ConsoleView(ConsoleItemModel *model, QWidget *parent) :
     setHeaderHidden(true);
     setRootIsDecorated(false);
     setEditTriggers(QAbstractItemView::AllEditTriggers);
-    setStyleSheet(QLatin1String("QTreeView::branch:has-siblings:!adjoins-item {"
-                                "border-image: none;"
-                                "image: none; }"
-                                "QTreeView::branch:has-siblings:adjoins-item {"
-                                "border-image: none;"
-                                "image: none; }"
-                                "QTreeView::branch:!has-children:!has-siblings:adjoins-item {"
-                                "border-image: none;"
-                                "image: none; }"
-                                "QTreeView::branch:has-children:!has-siblings:closed,"
-                                "QTreeView::branch:closed:has-children:has-siblings {"
-                                "border-image: none;"
-                                "image: none; }"
-                                "QTreeView::branch:open:has-children:!has-siblings,"
-                                "QTreeView::branch:open:has-children:has-siblings  {"
-                                "border-image: none;"
-                                "image: none; }"));
+    setStyleSheet("QTreeView::branch:has-siblings:!adjoins-item {"
+                  "border-image: none;"
+                  "image: none; }"
+                  "QTreeView::branch:has-siblings:adjoins-item {"
+                  "border-image: none;"
+                  "image: none; }"
+                  "QTreeView::branch:!has-children:!has-siblings:adjoins-item {"
+                  "border-image: none;"
+                  "image: none; }"
+                  "QTreeView::branch:has-children:!has-siblings:closed,"
+                  "QTreeView::branch:closed:has-children:has-siblings {"
+                  "border-image: none;"
+                  "image: none; }"
+                  "QTreeView::branch:open:has-children:!has-siblings,"
+                  "QTreeView::branch:open:has-children:has-siblings  {"
+                  "border-image: none;"
+                  "image: none; }");
 
     QString baseName = QApplication::style()->objectName();
     if (Utils::HostOsInfo::isAnyUnixHost() && !Utils::HostOsInfo::isMacHost()
-            && baseName == QLatin1String("windows")) {
+            && baseName == "windows") {
         // Sometimes we get the standard windows 95 style as a fallback
-        if (QStyleFactory::keys().contains(QLatin1String("Fusion"))) {
-            baseName = QLatin1String("fusion"); // Qt5
+        if (QStyleFactory::keys().contains("Fusion")) {
+            baseName = "fusion"; // Qt5
         }
     }
     auto style = new ConsoleViewStyle(baseName);