Improve padding in the Places View

[dolphin.git] / src / dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 3eaada941fe320e9453a506b39ecacc720301750..b1b67447f8f90d1dbe2f2b793ceb4df247fbbd1d 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -17,7 +17,6 @@
 #include "views/viewmodecontroller.h"
 #include "views/viewproperties.h"
 #include "dolphin_detailsmodesettings.h"
 #include "views/viewmodecontroller.h"
 #include "views/viewproperties.h"
 #include "dolphin_detailsmodesettings.h"

-#include "views/dolphinview.h"

 
 #ifdef HAVE_KACTIVITIES
 #include <KActivities/ResourceInstance>
 
 #ifdef HAVE_KACTIVITIES
 #include <KActivities/ResourceInstance>


@@ -32,7 +31,6 @@
 #include <KProtocolManager>
 #include <KShell>
 #include <KUrlComboBox>
 #include <KProtocolManager>
 #include <KShell>
 #include <KUrlComboBox>

-#include <KUrlNavigator>

 
 #include <QDropEvent>
 #include <QLoggingCategory>
 
 #include <QDropEvent>
 #include <QLoggingCategory>


@@ -412,7 +410,7 @@ void DolphinViewContainer::setSearchModeEnabled(bool enabled)
 
     m_searchModeEnabled = enabled;
 
 
     m_searchModeEnabled = enabled;
 

-    emit searchModeEnabledChanged(enabled);
+    Q_EMIT searchModeEnabledChanged(enabled);

 }
 
 bool DolphinViewContainer::isSearchModeEnabled() const
 }
 
 bool DolphinViewContainer::isSearchModeEnabled() const


@@ -660,7 +658,7 @@ void DolphinViewContainer::closeFilterBar()
 {
     m_filterBar->closeFilterBar();
     m_view->setFocus();
 {
     m_filterBar->closeFilterBar();
     m_view->setFocus();

-    emit showFilterBarChanged(false);
+    Q_EMIT showFilterBarChanged(false);

 }
 
 void DolphinViewContainer::setNameFilter(const QString& nameFilter)
 }
 
 void DolphinViewContainer::setNameFilter(const QString& nameFilter)


@@ -710,6 +708,7 @@ void DolphinViewContainer::slotUrlNavigatorLocationChanged(const QUrl& url)
         redirect(QUrl(), m_urlNavigator->locationUrl(1));
     } else {
         showMessage(i18nc("@info:status", "Invalid protocol"), Error);
         redirect(QUrl(), m_urlNavigator->locationUrl(1));
     } else {
         showMessage(i18nc("@info:status", "Invalid protocol"), Error);

+        m_urlNavigator->goBack();

     }
 }
 
     }
 }