Use one config-dolphin.h.cmake configuration file

[dolphin.git] / src / views / dolphinview.h

diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h
index 0f288f94218b323156edfda03ad84b4b5737910e..0a5011d2fce0bb64af7f4c18155f11dc6be354e3 100644 (file)
--- a/src/views/dolphinview.h
+++ b/src/views/dolphinview.h
@@ -14,7 +14,7 @@
 
 #include <KFileItem>
 #include <KIO/Job>
 
 #include <KFileItem>
 #include <KIO/Job>

-#include <config-baloo.h>
+#include <config-dolphin.h>

 #include <kio/fileundomanager.h>
 #include <kparts/part.h>
 
 #include <kio/fileundomanager.h>
 #include <kparts/part.h>
 


@@ -510,13 +510,12 @@ Q_SIGNALS:
     /**
      * Is emitted if a context menu is requested for the item \a item,
      * which is part of \a url. If the item is null, the context menu
     /**
      * Is emitted if a context menu is requested for the item \a item,
      * which is part of \a url. If the item is null, the context menu

-     * for the URL should be shown and the custom actions \a customActions
-     * will be added.
+     * for the URL should be shown.

      */
     void requestContextMenu(const QPoint& pos,
                             const KFileItem& item,
      */
     void requestContextMenu(const QPoint& pos,
                             const KFileItem& item,

-                            const QUrl& url,
-                            const QList<QAction*>& customActions);
+                            const KFileItemList &selectedItems,
+                            const QUrl& url);

 
     /**
      * Is emitted if an information message with the content \a msg
 
     /**
      * Is emitted if an information message with the content \a msg


@@ -635,6 +634,7 @@ private Q_SLOTS:
     void slotViewContextMenuRequested(const QPointF& pos);
     void slotHeaderContextMenuRequested(const QPointF& pos);
     void slotHeaderColumnWidthChangeFinished(const QByteArray& role, qreal current);
     void slotViewContextMenuRequested(const QPointF& pos);
     void slotHeaderContextMenuRequested(const QPointF& pos);
     void slotHeaderColumnWidthChangeFinished(const QByteArray& role, qreal current);

+    void slotSidePaddingWidthChanged(qreal width);

     void slotItemHovered(int index);
     void slotItemUnhovered(int index);
     void slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* event);
     void slotItemHovered(int index);
     void slotItemUnhovered(int index);
     void slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* event);


@@ -862,6 +862,8 @@ private:
 
     void updatePlaceholderLabel();
 
 
     void updatePlaceholderLabel();
 

+    void tryShowNameToolTip(QEvent* event);
+

 private:
     void updatePalette();
     void showLoadingPlaceholder();
 private:
     void updatePalette();
     void showLoadingPlaceholder();