forwardport r757231

[dolphin.git] / src / infosidebarpage.h

diff --git a/src/infosidebarpage.h b/src/infosidebarpage.h
index 4bd5671a1f92d9dfaf2116fecbf7dc85a0969c7a..ef014b3163d696146a8b83546ca394b1a3de536a 100644 (file)
--- a/src/infosidebarpage.h
+++ b/src/infosidebarpage.h
@@ -33,18 +33,10 @@
 #include <kdesktopfileactions.h>
 #include <kvbox.h>
 
-namespace KIO
-{
-    class Job;
-}
-
 class QPixmap;
-class QIcon;
 class QString;
-class QPainter;
 class KFileItem;
 class QLabel;
-class KVBox;
 class PixmapViewer;
 class MetaDataWidget;
 
@@ -59,6 +51,9 @@ public:
     explicit InfoSidebarPage(QWidget* parent = 0);
     virtual ~InfoSidebarPage();
 
+    /** @see QWidget::sizeHint() */
+    virtual QSize sizeHint() const;
+
 public slots:
     /** @see SidebarPage::setUrl() */
     virtual void setUrl(const KUrl& url);
@@ -67,12 +62,12 @@ public slots:
     virtual void setSelection(const KFileItemList& selection);
 
     /**
-     * Does a delayed request of information for the item of the given URL.
+     * Does a delayed request of information for the item \a item.
      * If within this delay InfoSidebarPage::setUrl() or InfoSidebarPage::setSelection()
      * are invoked, then the request will be skipped. Requesting a delayed item information
      * makes sense when hovering items.
      */
-    void requestDelayedItemInfo(const KUrl& url);
+    void requestDelayedItemInfo(const KFileItem& item);
 
 protected:
     /** @see QWidget::showEvent() */
@@ -110,12 +105,12 @@ private:
     enum { TimerDelay = 300 };
 
     /**
-     * Checks whether the an URL is repesented by a bookmark. If yes,
-     * then the bookmark icon and name are shown instead of a preview.
-     * @return True, if the URL represents exactly a bookmark.
+     * Checks whether the an URL is repesented by a place. If yes,
+     * then the place icon and name are shown instead of a preview.
+     * @return True, if the URL represents exactly a place.
      * @param url The url to check.
      */
-    bool applyBookmark(const KUrl& url);
+    bool applyPlace(const KUrl& url);
 
     /** Assures that any pending item information request is cancelled. */
     void cancelRequest();
@@ -148,7 +143,7 @@ private:
     KUrl m_urlCandidate;
 
     PixmapViewer* m_preview;
-    QLabel* m_name;
+    QLabel* m_nameLabel;
 
     QLabel* m_infoLabel;