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 da60668879387374fd267881bb2ebbd73ebfbe28..9e285511ae5f39dadf7af8c504de024380f4024e 100644 (file)
--- a/src/views/viewmodecontroller.cpp
+++ b/src/views/viewmodecontroller.cpp
@@ -1,31 +1,18 @@
-/***************************************************************************
- *   Copyright (C) 2010 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: 2010 Peter Penz <peter.penz19@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 
 #include "viewmodecontroller.h"
 
 #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()
 {
 }
 
@@ -33,26 +20,26 @@ ViewModeController::~ViewModeController()
 {
 }
 
-KUrl ViewModeController::url() const
+QUrl ViewModeController::url() const
 {
     return m_url;
 }
 
-void ViewModeController::redirectToUrl(const KUrl& 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);
     }
 }
 
@@ -67,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);
     }
 }
 
@@ -76,12 +63,13 @@ int ViewModeController::zoomLevel() const
     return m_zoomLevel;
 }
 
-void ViewModeController::setUrl(const KUrl& 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"