Designer: Fix build warnings about missing QLatin1String().

Change-Id: I12d2f00de4bd5ed3fa2cd5448d6590f7179e98d4
Reviewed-on: http://codereview.qt.nokia.com/2392
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

4 files changed, 11 insertions, 11 deletions

diff --git a/src/designer/src/lib/shared/actioneditor.cpp b/src/designer/src/lib/shared/actioneditor.cpp
index 14b50a620..83e260eb3 100644
--- a/src/designer/src/lib/shared/actioneditor.cpp
+++ b/src/designer/src/lib/shared/actioneditor.cpp
@@ -146,7 +146,7 @@ ActionEditor::ActionEditor(QDesignerFormEditorInterface *core, QWidget *parent,
     toolbar->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
     l->addWidget(toolbar);
     // edit actions
-    QIcon documentNewIcon = QIcon::fromTheme("document-new", createIconSet(QLatin1String("filenew.png")));
+    QIcon documentNewIcon = QIcon::fromTheme(QLatin1String("document-new"), createIconSet(QLatin1String("filenew.png")));
     m_actionNew->setIcon(documentNewIcon);
     m_actionNew->setEnabled(false);
     connect(m_actionNew, SIGNAL(triggered()), this, SLOT(slotNewAction()));
@@ -156,17 +156,17 @@ ActionEditor::ActionEditor(QDesignerFormEditorInterface *core, QWidget *parent,
 
     m_actionCut->setEnabled(false);
     connect(m_actionCut, SIGNAL(triggered()), this, SLOT(slotCut()));
-    QIcon editCutIcon = QIcon::fromTheme("edit-cut", createIconSet(QLatin1String("editcut.png")));
+    QIcon editCutIcon = QIcon::fromTheme(QLatin1String("edit-cut"), createIconSet(QLatin1String("editcut.png")));
     m_actionCut->setIcon(editCutIcon);
 
     m_actionCopy->setEnabled(false);
     connect(m_actionCopy, SIGNAL(triggered()), this, SLOT(slotCopy()));
-    QIcon editCopyIcon = QIcon::fromTheme("edit-copy", createIconSet(QLatin1String("editcopy.png")));
+    QIcon editCopyIcon = QIcon::fromTheme(QLatin1String("edit-copy"), createIconSet(QLatin1String("editcopy.png")));
     m_actionCopy->setIcon(editCopyIcon);
     toolbar->addAction(m_actionCopy);
 
     connect(m_actionPaste, SIGNAL(triggered()), this, SLOT(slotPaste()));
-    QIcon editPasteIcon = QIcon::fromTheme("edit-paste", createIconSet(QLatin1String("editpaste.png")));
+    QIcon editPasteIcon = QIcon::fromTheme(QLatin1String("edit-paste"), createIconSet(QLatin1String("editpaste.png")));
     m_actionPaste->setIcon(editPasteIcon);
     toolbar->addAction(m_actionPaste);
 
@@ -175,7 +175,7 @@ ActionEditor::ActionEditor(QDesignerFormEditorInterface *core, QWidget *parent,
 
     connect(m_actionNavigateToSlot, SIGNAL(triggered()), this, SLOT(navigateToSlotCurrentAction()));
 
-    QIcon editDeleteIcon = QIcon::fromTheme("edit-delete", createIconSet(QLatin1String("editdelete.png")));
+    QIcon editDeleteIcon = QIcon::fromTheme(QLatin1String("edit-delete"), createIconSet(QLatin1String("editdelete.png")));
     m_actionDelete->setIcon(editDeleteIcon);
     m_actionDelete->setEnabled(false);
     connect(m_actionDelete, SIGNAL(triggered()), this, SLOT(slotDelete()));
@@ -247,7 +247,7 @@ QToolButton *ActionEditor::createConfigureMenuButton(const QString &t, QMenu **p
 {
     QToolButton *configureButton = new QToolButton;
     QAction *configureAction = new QAction(t, configureButton);
-    QIcon configureIcon = QIcon::fromTheme("document-properties", createIconSet(QLatin1String("configure.png")));
+    QIcon configureIcon = QIcon::fromTheme(QLatin1String("document-properties"), createIconSet(QLatin1String("configure.png")));
     configureAction->setIcon(configureIcon);
     QMenu *configureMenu = new QMenu;
     configureAction->setMenu(configureMenu);
diff --git a/src/designer/src/lib/shared/filterwidget.cpp b/src/designer/src/lib/shared/filterwidget.cpp
index 955d2e6d1..8d8aa9c0d 100644
--- a/src/designer/src/lib/shared/filterwidget.cpp
+++ b/src/designer/src/lib/shared/filterwidget.cpp
@@ -193,7 +193,7 @@ FilterWidget::FilterWidget(QWidget *parent, LayoutMode lm)  :
     QIcon icon = QIcon::fromTheme(layoutDirection() == Qt::LeftToRight ?
                      QLatin1String("edit-clear-locationbar-rtl") :
                      QLatin1String("edit-clear-locationbar-ltr"),
-                     QIcon::fromTheme("edit-clear", createIconSet(QLatin1String("cleartext.png"))));
+                     QIcon::fromTheme(QLatin1String("edit-clear"), createIconSet(QLatin1String("cleartext.png"))));
 
     m_button->setIcon(icon);
     m_button->setToolTip(tr("Clear text"));
diff --git a/src/designer/src/lib/shared/qtresourceview.cpp b/src/designer/src/lib/shared/qtresourceview.cpp
index e57e04f66..cbb05391d 100644
--- a/src/designer/src/lib/shared/qtresourceview.cpp
+++ b/src/designer/src/lib/shared/qtresourceview.cpp
@@ -583,20 +583,20 @@ QtResourceView::QtResourceView(QDesignerFormEditorInterface *core, QWidget *pare
 {
     d_ptr->q_ptr = this;
 
-    QIcon editIcon = QIcon::fromTheme("document-properties", qdesigner_internal::createIconSet(QLatin1String("edit.png")));
+    QIcon editIcon = QIcon::fromTheme(QLatin1String("document-properties"), qdesigner_internal::createIconSet(QLatin1String("edit.png")));
     d_ptr->m_editResourcesAction = new QAction(editIcon, tr("Edit Resources..."), this);
     d_ptr->m_toolBar->addAction(d_ptr->m_editResourcesAction);
     connect(d_ptr->m_editResourcesAction, SIGNAL(triggered()), this, SLOT(slotEditResources()));
     d_ptr->m_editResourcesAction->setEnabled(false);
 
-    QIcon refreshIcon = QIcon::fromTheme("view-refresh", qdesigner_internal::createIconSet(QLatin1String("reload.png")));
+    QIcon refreshIcon = QIcon::fromTheme(QLatin1String("view-refresh"), qdesigner_internal::createIconSet(QLatin1String("reload.png")));
     d_ptr->m_reloadResourcesAction = new QAction(refreshIcon, tr("Reload"), this);
 
     d_ptr->m_toolBar->addAction(d_ptr->m_reloadResourcesAction);
     connect(d_ptr->m_reloadResourcesAction, SIGNAL(triggered()), this, SLOT(slotReloadResources()));
     d_ptr->m_reloadResourcesAction->setEnabled(false);
 
-    QIcon copyIcon = QIcon::fromTheme("edit-copy", qdesigner_internal::createIconSet(QLatin1String("editcopy.png")));
+    QIcon copyIcon = QIcon::fromTheme(QLatin1String("edit-copy"), qdesigner_internal::createIconSet(QLatin1String("editcopy.png")));
     d_ptr->m_copyResourcePathAction = new QAction(copyIcon, tr("Copy Path"), this);
     connect(d_ptr->m_copyResourcePathAction, SIGNAL(triggered()), this, SLOT(slotCopyResourcePath()));
     d_ptr->m_copyResourcePathAction->setEnabled(false);
diff --git a/src/designer/src/lib/shared/richtexteditor.cpp b/src/designer/src/lib/shared/richtexteditor.cpp
index 2d7c91623..54b22e487 100644
--- a/src/designer/src/lib/shared/richtexteditor.cpp
+++ b/src/designer/src/lib/shared/richtexteditor.cpp
@@ -843,7 +843,7 @@ void RichTextEditorDialog::setDefaultFont(const QFont &font)
 void RichTextEditorDialog::setText(const QString &text)
 {
     // Generally simplify rich text unless verbose text is found.
-    const bool isSimplifiedRichText = !text.startsWith("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">");
+    const bool isSimplifiedRichText = !text.startsWith(QLatin1String("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">"));
     m_editor->setSimplifyRichText(isSimplifiedRichText);
     m_editor->setText(text);
     m_text_edit->setPlainText(text);