Fix for crash which was introduced by commit

[dolphin.git] / src / panels / information / informationpanelcontent.cpp

diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp
index 75052021bbd35ab0137c20e6ee3305ae07c56e41..4e32a7974f8cab0dca36023879c112c1007d63a5 100644 (file)
--- a/src/panels/information/informationpanelcontent.cpp
+++ b/src/panels/information/informationpanelcontent.cpp
@@ -27,11 +27,12 @@
 #include <KJobWidgets>
 #include <KIconEffect>
 #include <KIconLoader>
 #include <KJobWidgets>
 #include <KIconEffect>
 #include <KIconLoader>

-#include <KIcon>
-#include <KLocale>
-#include <KMenu>
+#include <QIcon>
+#include <KLocalizedString>
+#include <QMenu>

 #include <kseparator.h>
 #include <KStringHandler>
 #include <kseparator.h>
 #include <KStringHandler>

+#include <QTextDocument>

 
 #ifndef HAVE_BALOO
 #include <KFileMetaDataWidget>
 
 #ifndef HAVE_BALOO
 #include <KFileMetaDataWidget>


@@ -49,10 +50,8 @@
 #include <QEvent>
 #include <QLabel>
 #include <QPixmap>
 #include <QEvent>
 #include <QLabel>
 #include <QPixmap>

-#include <QPointer>

 #include <QResizeEvent>
 #include <QScrollArea>
 #include <QResizeEvent>
 #include <QScrollArea>

-#include <QTextDocument>

 #include <QTextLayout>
 #include <QTextLine>
 #include <QTimer>
 #include <QTextLayout>
 #include <QTextLine>
 #include <QTimer>


@@ -159,7 +158,7 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) :
 
 InformationPanelContent::~InformationPanelContent()
 {
 
 InformationPanelContent::~InformationPanelContent()
 {

-    InformationPanelSettings::self()->writeConfig();
+    InformationPanelSettings::self()->save();

 }
 
 void InformationPanelContent::showItem(const KFileItem& item)
 }
 
 void InformationPanelContent::showItem(const KFileItem& item)


@@ -170,8 +169,8 @@ void InformationPanelContent::showItem(const KFileItem& item)
         m_previewJob->kill();
     }
 
         m_previewJob->kill();
     }
 

-    const KUrl itemUrl = item.url();
-    const bool isSearchUrl = itemUrl.protocol().contains("search") && item.localPath().isEmpty();
+    const QUrl itemUrl = item.url();
+    const bool isSearchUrl = itemUrl.scheme().contains("search") && item.localPath().isEmpty();

     if (!applyPlace(itemUrl)) {
         setNameLabelText(item.text());
         if (isSearchUrl) {
     if (!applyPlace(itemUrl)) {
         setNameLabelText(item.text());
         if (isSearchUrl) {


@@ -289,7 +288,7 @@ bool InformationPanelContent::eventFilter(QObject* obj, QEvent* event)
 
 void InformationPanelContent::configureSettings(const QList<QAction*>& customContextMenuActions)
 {
 
 void InformationPanelContent::configureSettings(const QList<QAction*>& customContextMenuActions)
 {

-    KMenu popup(this);
+    QMenu popup(this);

 
     QAction* previewAction = popup.addAction(i18nc("@action:inmenu", "Preview"));
     previewAction->setIcon(QIcon::fromTheme("view-preview"));
 
     QAction* previewAction = popup.addAction(i18nc("@action:inmenu", "Preview"));
     previewAction->setIcon(QIcon::fromTheme("view-preview"));


@@ -297,7 +296,7 @@ void InformationPanelContent::configureSettings(const QList<QAction*>& customCon
     previewAction->setChecked(InformationPanelSettings::previewsShown());
 
     QAction* configureAction = popup.addAction(i18nc("@action:inmenu", "Configure..."));
     previewAction->setChecked(InformationPanelSettings::previewsShown());
 
     QAction* configureAction = popup.addAction(i18nc("@action:inmenu", "Configure..."));

-    configureAction->setIcon(KIcon("configure"));
+    configureAction->setIcon(QIcon::fromTheme("configure"));

 
     popup.addSeparator();
     foreach (QAction* action, customContextMenuActions) {
 
     popup.addSeparator();
     foreach (QAction* action, customContextMenuActions) {


@@ -332,8 +331,10 @@ void InformationPanelContent::showIcon(const KFileItem& item)
 {
     m_outdatedPreviewTimer->stop();
     if (!applyPlace(item.targetUrl())) {
 {
     m_outdatedPreviewTimer->stop();
     if (!applyPlace(item.targetUrl())) {

-        KIcon icon(item.iconName(), KIconLoader::global(), item.overlays());
-        m_preview->setPixmap(icon.pixmap(KIconLoader::SizeEnormous));
+        const QPixmap icon = KIconLoader::global()->loadIcon(item.iconName(), KIconLoader::Desktop,
+                                                             KIconLoader::SizeEnormous, KIconLoader::DefaultState,
+                                                             item.overlays());
+        m_preview->setPixmap(icon);

     }
 }
 
     }
 }
 


@@ -369,14 +370,14 @@ void InformationPanelContent::refreshMetaData()
     }
 }
 
     }
 }
 

-bool InformationPanelContent::applyPlace(const KUrl& url)
+bool InformationPanelContent::applyPlace(const QUrl& url)

 {
     const int count = m_placesItemModel->count();
     for (int i = 0; i < count; ++i) {
         const PlacesItem* item = m_placesItemModel->placesItem(i);
 {
     const int count = m_placesItemModel->count();
     for (int i = 0; i < count; ++i) {
         const PlacesItem* item = m_placesItemModel->placesItem(i);

-        if (item->url().equals(url, KUrl::CompareWithoutTrailingSlash)) {
+        if (item->url().matches(url, QUrl::StripTrailingSlash)) {

             setNameLabelText(item->text());
             setNameLabelText(item->text());

-            m_preview->setPixmap(KIcon(item->icon()).pixmap(128, 128));
+            m_preview->setPixmap(QIcon::fromTheme(item->icon()).pixmap(128, 128));

             return true;
         }
     }
             return true;
         }
     }