3 files changed, 18 insertions, 14 deletions

diff --git a/src/panels/information/filemetadataconfigurationdialog.cpp b/src/panels/information/filemetadataconfigurationdialog.cpp
index 2f8c16037..5671d34ef 100644
--- a/src/panels/information/filemetadataconfigurationdialog.cpp
+++ b/src/panels/information/filemetadataconfigurationdialog.cpp
@@ -46,8 +46,8 @@ FileMetaDataConfigurationDialog::FileMetaDataConfigurationDialog(QWidget* parent
     QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok);
     okButton->setDefault(true);
     okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
-    connect(buttonBox, SIGNAL(accepted()), this, SLOT(slotAccepted()));
-    connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
+    connect(buttonBox, &QDialogButtonBox::accepted, this, &FileMetaDataConfigurationDialog::slotAccepted);
+    connect(buttonBox, &QDialogButtonBox::rejected, this, &FileMetaDataConfigurationDialog::reject);
     buttonBox->button(QDialogButtonBox::Ok)->setDefault(true);
 
     m_descriptionLabel = new QLabel(i18nc("@label::textbox",
@@ -68,16 +68,16 @@ FileMetaDataConfigurationDialog::FileMetaDataConfigurationDialog(QWidget* parent
     topLayout->addWidget(m_configWidget);
     mainLayout->addWidget(mainWidget);
     mainLayout->addWidget(buttonBox);
-    
 
-    const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"),
+
+    const KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")),
                                     "FileMetaDataConfigurationDialog");
     KWindowConfig::restoreWindowSize(windowHandle(), dialogConfig);
 }
 
 FileMetaDataConfigurationDialog::~FileMetaDataConfigurationDialog()
 {
-    KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"),
+    KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")),
                               "FileMetaDataConfigurationDialog");
     KWindowConfig::saveWindowSize(windowHandle(), dialogConfig);
 }
diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp
index c18d4738e..6bfc4ed01 100644
--- a/src/panels/information/informationpanelcontent.cpp
+++ b/src/panels/information/informationpanelcontent.cpp
@@ -169,14 +169,14 @@ void InformationPanelContent::showItem(const KFileItem& item)
     }
 
     const QUrl itemUrl = item.url();
-    const bool isSearchUrl = itemUrl.scheme().contains("search") && item.localPath().isEmpty();
+    const bool isSearchUrl = itemUrl.scheme().contains(QStringLiteral("search")) && item.localPath().isEmpty();
     if (!applyPlace(itemUrl)) {
         setNameLabelText(item.text());
         if (isSearchUrl) {
             // in the case of a search-URL the URL is not readable for humans
             // (at least not useful to show in the Information Panel)
             KIconLoader iconLoader;
-            QPixmap icon = iconLoader.loadIcon("nepomuk",
+            QPixmap icon = iconLoader.loadIcon(QStringLiteral("nepomuk"),
                                                KIconLoader::NoGroup,
                                                KIconLoader::SizeEnormous);
             m_preview->setPixmap(icon);
@@ -213,7 +213,7 @@ void InformationPanelContent::showItem(const KFileItem& item)
 
     if (InformationPanelSettings::previewsShown()) {
         const QString mimeType = item.mimetype();
-        const bool usePhonon = mimeType.startsWith("audio/") || mimeType.startsWith("video/");
+        const bool usePhonon = mimeType.startsWith(QLatin1String("audio/")) || mimeType.startsWith(QLatin1String("video/"));
         if (usePhonon) {
             m_phononWidget->show();
             m_phononWidget->setUrl(item.targetUrl());
@@ -240,7 +240,7 @@ void InformationPanelContent::showItems(const KFileItemList& items)
     }
 
     KIconLoader iconLoader;
-    QPixmap icon = iconLoader.loadIcon("dialog-information",
+    QPixmap icon = iconLoader.loadIcon(QStringLiteral("dialog-information"),
                                        KIconLoader::NoGroup,
                                        KIconLoader::SizeEnormous);
     m_preview->setPixmap(icon);
@@ -290,12 +290,12 @@ void InformationPanelContent::configureSettings(const QList<QAction*>& customCon
     QMenu popup(this);
 
     QAction* previewAction = popup.addAction(i18nc("@action:inmenu", "Preview"));
-    previewAction->setIcon(QIcon::fromTheme("view-preview"));
+    previewAction->setIcon(QIcon::fromTheme(QStringLiteral("view-preview")));
     previewAction->setCheckable(true);
     previewAction->setChecked(InformationPanelSettings::previewsShown());
 
     QAction* configureAction = popup.addAction(i18nc("@action:inmenu", "Configure..."));
-    configureAction->setIcon(QIcon::fromTheme("configure"));
+    configureAction->setIcon(QIcon::fromTheme(QStringLiteral("configure")));
 
     popup.addSeparator();
     foreach (QAction* action, customContextMenuActions) {
@@ -403,7 +403,7 @@ void InformationPanelContent::setNameLabelText(const QString& text)
     QTextLine line = textLayout.createLine();
     while (line.isValid()) {
         line.setLineWidth(m_nameLabel->width());
-        wrappedText += processedText.mid(line.textStart(), line.textLength());
+        wrappedText += processedText.midRef(line.textStart(), line.textLength());
 
         line = textLayout.createLine();
         if (line.isValid()) {
diff --git a/src/panels/information/phononwidget.cpp b/src/panels/information/phononwidget.cpp
index 1d6361f19..e4885ab76 100644
--- a/src/panels/information/phononwidget.cpp
+++ b/src/panels/information/phononwidget.cpp
@@ -38,6 +38,8 @@
 
 class EmbeddedVideoPlayer : public Phonon::VideoWidget
 {
+    Q_OBJECT
+
     public:
         EmbeddedVideoPlayer(QWidget *parent = 0) :
             Phonon::VideoWidget(parent)
@@ -128,13 +130,13 @@ void PhononWidget::showEvent(QShowEvent *event)
 
         m_playButton->setToolTip(i18n("play"));
         m_playButton->setIconSize(buttonSize);
-        m_playButton->setIcon(QIcon::fromTheme("media-playback-start"));
+        m_playButton->setIcon(QIcon::fromTheme(QStringLiteral("media-playback-start")));
         m_playButton->setAutoRaise(true);
         connect(m_playButton, &QToolButton::clicked, this, &PhononWidget::play);
 
         m_stopButton->setToolTip(i18n("stop"));
         m_stopButton->setIconSize(buttonSize);
-        m_stopButton->setIcon(QIcon::fromTheme("media-playback-stop"));
+        m_stopButton->setIcon(QIcon::fromTheme(QStringLiteral("media-playback-stop")));
         m_stopButton->setAutoRaise(true);
         m_stopButton->hide();
         connect(m_stopButton, &QToolButton::clicked, this, &PhononWidget::stop);
@@ -231,3 +233,5 @@ void PhononWidget::applyVideoSize()
         m_videoPlayer->setSizeHint(m_videoSize);
     }
 }
+
+#include "phononwidget.moc"