Merge branch 'Applications/18.04'

[dolphin.git] / src / dolphinviewcontainer.h

diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h
index 877089e4c709dc23e69995c11f609b64092f694a..b5bcc78ad344c55ddc0c1720cec0a1b887085851 100644 (file)
--- a/src/dolphinviewcontainer.h
+++ b/src/dolphinviewcontainer.h
@@ -20,18 +20,18 @@
 #ifndef DOLPHINVIEWCONTAINER_H
 #define DOLPHINVIEWCONTAINER_H
 
-#include <KFileItem>
+#include "config-dolphin.h"
+#include "views/dolphinview.h"
+
 #include <KCompletion>
+#include <KFileItem>
 #include <KIO/Job>
-
 #include <KUrlNavigator>
 
 #include <QElapsedTimer>
+#include <QPushButton>
 #include <QWidget>
 
-#include <views/dolphinview.h>
-#include <config-dolphin.h>
-
 #ifdef KF5Activities_FOUND
 namespace KActivities {
     class ResourceInstance;
@@ -93,6 +93,8 @@ public:
     void setAutoGrabFocus(bool grab);
     bool autoGrabFocus() const;
 
+    QString currentSearchText() const;
+
     const DolphinStatusBar* statusBar() const;
     DolphinStatusBar* statusBar();
 
@@ -318,7 +320,9 @@ private:
 
 private:
     QVBoxLayout* m_topLayout;
+    QWidget* m_navigatorWidget;
     KUrlNavigator* m_urlNavigator;
+    QPushButton* m_emptyTrashButton;
     DolphinSearchBox* m_searchBox;
     KMessageWidget* m_messageWidget;