X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/257eeebf4b71f846799009394370e0755a4225e1..801fb7e0fd8e16afc8aed164a57a5fa563ccf5a4:/src/dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 7809ca7e3..b1b67447f 100644
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -1,21 +1,8 @@
-/***************************************************************************
- *   Copyright (C) 2007 by Peter Penz <peter.penz19@gmail.com>             *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
- ***************************************************************************/
+/*
+ * SPDX-FileCopyrightText: 2007 Peter Penz <peter.penz19@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 
 #include "dolphinviewcontainer.h"
 
@@ -30,7 +17,6 @@
 #include "views/viewmodecontroller.h"
 #include "views/viewproperties.h"
 #include "dolphin_detailsmodesettings.h"
-#include "views/dolphinview.h"
 
 #ifdef HAVE_KACTIVITIES
 #include <KActivities/ResourceInstance>
@@ -45,7 +31,6 @@
 #include <KProtocolManager>
 #include <KShell>
 #include <KUrlComboBox>
-#include <KUrlNavigator>
 
 #include <QDropEvent>
 #include <QLoggingCategory>
@@ -425,7 +410,7 @@ void DolphinViewContainer::setSearchModeEnabled(bool enabled)
 
     m_searchModeEnabled = enabled;
 
-    emit searchModeEnabledChanged(enabled);
+    Q_EMIT searchModeEnabledChanged(enabled);
 }
 
 bool DolphinViewContainer::isSearchModeEnabled() const
@@ -673,7 +658,7 @@ void DolphinViewContainer::closeFilterBar()
 {
     m_filterBar->closeFilterBar();
     m_view->setFocus();
-    emit showFilterBarChanged(false);
+    Q_EMIT showFilterBarChanged(false);
 }
 
 void DolphinViewContainer::setNameFilter(const QString& nameFilter)
@@ -723,6 +708,7 @@ void DolphinViewContainer::slotUrlNavigatorLocationChanged(const QUrl& url)
         redirect(QUrl(), m_urlNavigator->locationUrl(1));
     } else {
         showMessage(i18nc("@info:status", "Invalid protocol"), Error);
+        m_urlNavigator->goBack();
     }
 }