Merge branch 'master' into frameworks

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

diff --git a/src/panels/information/informationpanelcontent.h b/src/panels/information/informationpanelcontent.h
index ed9200aef4cd0d1dbb175a6b769c1678ae3e96e8..533e9de3b559628cc036c6ea05b6bcdb4be44bf2 100644 (file)
--- a/src/panels/information/informationpanelcontent.h
+++ b/src/panels/information/informationpanelcontent.h
@@ -20,11 +20,12 @@
 #ifndef INFORMATIONPANELCONTENT_H
 #define INFORMATIONPANELCONTENT_H
 
-#include "config-nepomuk.h"
-#include <KConfig>
+#include "config-baloo.h"
 #include <KFileItem>
-#include <KUrl>
-#include <KVBox>
+#include <QUrl>
+
+#include <QPointer>
+#include <QWidget>
 
 class KFileItemList;
 class PhononWidget;
@@ -35,10 +36,14 @@ class QString;
 class QLabel;
 class QScrollArea;
 
-#ifndef HAVE_NEPOMUK
+namespace KIO {
+  class PreviewJob;
+}
+
+#ifndef HAVE_BALOO
 class KFileMetaDataWidget;
 #else
-namespace Nepomuk2 {
+namespace Baloo {
     class FileMetaDataWidget;
 }
 #endif
@@ -76,11 +81,11 @@ public:
     void configureSettings(const QList<QAction*>& customContextMenuActions);
 
 signals:
-    void urlActivated( const KUrl& url );
+    void urlActivated( const QUrl& url );
 
 protected:
     /** @see QObject::eventFilter() */
-    virtual bool eventFilter(QObject* obj, QEvent* event);
+    virtual bool eventFilter(QObject* obj, QEvent* event) Q_DECL_OVERRIDE;
 
 private slots:
     /**
@@ -116,7 +121,7 @@ private:
      * @return True, if the URL represents exactly a place.
      * @param url The url to check.
      */
-    bool applyPlace(const KUrl& url);
+    bool applyPlace(const QUrl& url);
 
     /**
      * Sets the text for the label \a m_nameLabel and assures that the
@@ -135,16 +140,16 @@ private:
 private:
     KFileItem m_item;
 
-    bool m_pendingPreview;
+    QPointer<KIO::PreviewJob> m_previewJob;
     QTimer* m_outdatedPreviewTimer;
 
     PixmapViewer* m_preview;
     PhononWidget* m_phononWidget;
     QLabel* m_nameLabel;
-#ifndef HAVE_NEPOMUK
+#ifndef HAVE_BALOO
     KFileMetaDataWidget* m_metaDataWidget;
 #else
-    Nepomuk2::FileMetaDataWidget* m_metaDataWidget;
+    Baloo::FileMetaDataWidget* m_metaDataWidget;
 #endif
     QScrollArea* m_metaDataArea;