X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/64cfc43b97e0216caf8b7b71dd5168eaedb3068c..f16fbcba4e9ed3cd48cb2c1a40c01daf1d511f4b:/src/dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index e92ec6022..6c5edc13f 100644
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -18,48 +18,46 @@
  ***************************************************************************/
 
 #include "dolphinviewcontainer.h"
-#include <KProtocolManager>
 
-#include <QDropEvent>
-#include <QTimer>
-#include <QMimeData>
-#include <QVBoxLayout>
-#include <QLoggingCategory>
+#include "dolphin_generalsettings.h"
+#include "dolphindebug.h"
+#include "filterbar/filterbar.h"
+#include "global.h"
+#include "search/dolphinsearchbox.h"
+#include "statusbar/dolphinstatusbar.h"
+#include "trash/dolphintrash.h"
+#include "views/viewmodecontroller.h"
+#include "views/viewproperties.h"
 
 #include <KFileItemActions>
 #include <KFilePlacesModel>
-#include <KLocalizedString>
 #include <KIO/PreviewJob>
-#include <kio_version.h>
+#include <KLocalizedString>
 #include <KMessageWidget>
+#include <KProtocolManager>
+#include <KRun>
 #include <KShell>
-#include <QUrl>
 #include <KUrlComboBox>
 #include <KUrlNavigator>
-#include <KRun>
-
-#ifdef KActivities_FOUND
-#endif
+#include <kio_version.h>
 
-#include "global.h"
-#include "dolphindebug.h"
-#include "dolphin_generalsettings.h"
-#include "filterbar/filterbar.h"
-#include "search/dolphinsearchbox.h"
-#include "statusbar/dolphinstatusbar.h"
-#include "views/viewmodecontroller.h"
-#include "views/viewproperties.h"
+#include <QDropEvent>
+#include <QLoggingCategory>
+#include <QMimeData>
+#include <QTimer>
+#include <QUrl>
+#include <QVBoxLayout>
 
 DolphinViewContainer::DolphinViewContainer(const QUrl& url, QWidget* parent) :
     QWidget(parent),
-    m_topLayout(0),
-    m_urlNavigator(0),
-    m_searchBox(0),
-    m_messageWidget(0),
-    m_view(0),
-    m_filterBar(0),
-    m_statusBar(0),
-    m_statusBarTimer(0),
+    m_topLayout(nullptr),
+    m_urlNavigator(nullptr),
+    m_searchBox(nullptr),
+    m_messageWidget(nullptr),
+    m_view(nullptr),
+    m_filterBar(nullptr),
+    m_statusBar(nullptr),
+    m_statusBarTimer(nullptr),
     m_statusBarTimestamp(),
     m_autoGrabFocus(true)
 #ifdef KActivities_FOUND
@@ -245,6 +243,11 @@ bool DolphinViewContainer::autoGrabFocus() const
     return m_autoGrabFocus;
 }
 
+QString DolphinViewContainer::currentSearchText() const
+{
+     return m_searchBox->text();
+}
+
 const DolphinStatusBar* DolphinViewContainer::statusBar() const
 {
     return m_statusBar;