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 c41f4043f17192258b21d0bf36721fb5f414b5fb..67fdf6c5ab8f77cee9025359bae332278b99c2d8 100644 (file)
--- a/src/panels/information/informationpanelcontent.h
+++ b/src/panels/information/informationpanelcontent.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2009-2010 by Peter Penz <peter.penz@gmx.at>             *
+ *   Copyright (C) 2009-2010 by Peter Penz <peter.penz19@gmail.com>        *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -20,20 +20,35 @@
 #ifndef INFORMATIONPANELCONTENT_H
 #define INFORMATIONPANELCONTENT_H
 
-#include <kconfig.h>
-#include <kfileitem.h>
-#include <kurl.h>
-#include <kvbox.h>
+#include "config-baloo.h"
+#include <KConfig>
+#include <KFileItem>
+#include <KUrl>
+#include <KVBox>
+
+#include <QPointer>
 
 class KFileItemList;
-class KFileMetaDataWidget;
 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.
@@ -92,8 +107,7 @@ private slots:
      */
     void markOutdatedPreview();
 
-    void slotPlayingStarted();
-    void slotPlayingStopped();
+    void slotHasVideoChanged(bool hasVideo);
 
     /**
      * Is invoked after the file meta data configuration dialog has been
@@ -127,14 +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;
+
+    PlacesItemModel* m_placesItemModel;
 };
 
 #endif // INFORMATIONPANELCONTENT_H