SVN_SILENT made messages (.desktop file) - always resolve ours

[dolphin.git] / src / views / viewmodecontroller.cpp

diff --git a/src/views/viewmodecontroller.cpp b/src/views/viewmodecontroller.cpp
index baad21a65de41b2ed87ded0e99f7de58520e3254..9e285511ae5f39dadf7af8c504de024380f4024e 100644 (file)
--- a/src/views/viewmodecontroller.cpp
+++ b/src/views/viewmodecontroller.cpp
@@ -8,11 +8,11 @@
 
 #include "zoomlevelinfo.h"
 
-ViewModeController::ViewModeController(QObject* parent) :
-    QObject(parent),
-    m_zoomLevel(0),
-    m_nameFilter(),
-    m_url()
+ViewModeController::ViewModeController(QObject *parent)
+    : QObject(parent)
+    , m_zoomLevel(0)
+    , m_nameFilter()
+    , m_url()
 {
 }
 
@@ -25,21 +25,21 @@ QUrl ViewModeController::url() const
     return m_url;
 }
 
-void ViewModeController::redirectToUrl(const QUrl& url)
+void ViewModeController::redirectToUrl(const QUrl &url)
 {
     m_url = url;
 }
 
 void ViewModeController::indicateActivationChange(bool active)
 {
-    emit activationChanged(active);
+    Q_EMIT activationChanged(active);
 }
 
-void ViewModeController::setNameFilter(const QString& nameFilter)
+void ViewModeController::setNameFilter(const QString &nameFilter)
 {
     if (nameFilter != m_nameFilter) {
         m_nameFilter = nameFilter;
-        emit nameFilterChanged(nameFilter);
+        Q_EMIT nameFilterChanged(nameFilter);
     }
 }
 
@@ -54,7 +54,7 @@ void ViewModeController::setZoomLevel(int level)
     Q_ASSERT(level <= ZoomLevelInfo::maximumLevel());
     if (level != m_zoomLevel) {
         m_zoomLevel = level;
-        emit zoomLevelChanged(m_zoomLevel);
+        Q_EMIT zoomLevelChanged(m_zoomLevel);
     }
 }
 
@@ -63,12 +63,13 @@ int ViewModeController::zoomLevel() const
     return m_zoomLevel;
 }
 
-void ViewModeController::setUrl(const QUrl& url)
+void ViewModeController::setUrl(const QUrl &url)
 {
     if (m_url != url) {
         m_url = url;
-        emit cancelPreviews();
-        emit urlChanged(url);
+        Q_EMIT cancelPreviews();
+        Q_EMIT urlChanged(url);
     }
 }
 
+#include "moc_viewmodecontroller.cpp"