Change default Dolphin toolbar layout

[dolphin.git] / src / dolphinviewcontainer.h

diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h
index 5d8a347140983daf3b0d3c171c4fb954941bb591..2c4c7a7e196e0ba4d768c072d016fd6ae2de462f 100644 (file)
--- a/src/dolphinviewcontainer.h
+++ b/src/dolphinviewcontainer.h
@@ -20,7 +20,7 @@
 #ifndef DOLPHINVIEWCONTAINER_H
 #define DOLPHINVIEWCONTAINER_H
 
-#include "config-dolphin.h"
+#include "config-kactivities.h"
 #include "views/dolphinview.h"
 
 #include <KCompletion>
@@ -32,7 +32,7 @@
 #include <QPushButton>
 #include <QWidget>
 
-#ifdef KF5Activities_FOUND
+#ifdef HAVE_KACTIVITIES
 namespace KActivities {
     class ResourceInstance;
 }
@@ -141,7 +141,7 @@ public:
      * calculated depending on settings, if a search is active and other
      * factors.
      */
-    QString getCaption() const;
+    QString caption() const;
 
 public slots:
     /**
@@ -331,6 +331,7 @@ private:
     KUrlNavigator* m_urlNavigator;
     QPushButton* m_emptyTrashButton;
     DolphinSearchBox* m_searchBox;
+    bool m_searchModeEnabled;
     KMessageWidget* m_messageWidget;
 
     DolphinView* m_view;
@@ -342,7 +343,7 @@ private:
     QElapsedTimer m_statusBarTimestamp;  // Time in ms since last update
     bool m_autoGrabFocus;
 
-#ifdef KF5Activities_FOUND
+#ifdef HAVE_KACTIVITIES
 private:
     KActivities::ResourceInstance * m_activityResourceInstance;
 #endif