Merge remote-tracking branch 'origin/KDE/4.12'

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

diff --git a/src/panels/information/informationpanelcontent.h b/src/panels/information/informationpanelcontent.h
index 234060749e681e9f7e89ee2b7eac4df4f4174f20..67fdf6c5ab8f77cee9025359bae332278b99c2d8 100644 (file)
--- a/src/panels/information/informationpanelcontent.h
+++ b/src/panels/information/informationpanelcontent.h
@@ -20,21 +20,35 @@
 #ifndef INFORMATIONPANELCONTENT_H
 #define INFORMATIONPANELCONTENT_H
 
+#include "config-baloo.h"
 #include <KConfig>
 #include <KFileItem>
 #include <KUrl>
 #include <KVBox>
 
+#include <QPointer>
+
 class KFileItemList;
-class KFileMetaDataWidget;
-class KFilePlacesModel;
 class PhononWidget;
 class PixmapViewer;
+class PlacesItemModel;
 class QPixmap;
 class QString;
 class QLabel;
 class QScrollArea;
 
+namespace KIO {
+  class PreviewJob;
+}
+
+#ifndef HAVE_BALOO
+class KFileMetaDataWidget;
+#else
+namespace Baloo {
+    class FileMetaDataWidget;
+}
+#endif
+
 /**
  * @brief Manages the widgets that display the meta information
 *         for file items of the Information Panel.
@@ -127,16 +141,20 @@ 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_BALOO
     KFileMetaDataWidget* m_metaDataWidget;
+#else
+    Baloo::FileMetaDataWidget* m_metaDataWidget;
+#endif
     QScrollArea* m_metaDataArea;
 
-    KFilePlacesModel* m_placesModel;
+    PlacesItemModel* m_placesItemModel;
 };
 
 #endif // INFORMATIONPANELCONTENT_H