Merge branch 'release/20.08'

[dolphin.git] / src / dolphinmainwindow.h

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 940a03d83d13623eeb414450858d1b8d21044e6e..79084ae7dc101df57deeec138469a454e7c2f1ab 100644 (file)
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -1,23 +1,10 @@
-/***************************************************************************
- *   Copyright (C) 2006 by Peter Penz <peter.penz19@gmail.com>             *
- *   Copyright (C) 2006 by Stefan Monov <logixoul@gmail.com>               *
- *   Copyright (C) 2006 by Cvetoslav Ludmiloff <ludmiloff@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: 2006 Peter Penz <peter.penz19@gmail.com>
+ * SPDX-FileCopyrightText: 2006 Stefan Monov <logixoul@gmail.com>
+ * SPDX-FileCopyrightText: 2006 Cvetoslav Ludmiloff <ludmiloff@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 
 #ifndef DOLPHIN_MAINWINDOW_H
 #define DOLPHIN_MAINWINDOW_H
@@ -25,7 +12,7 @@
 #include "dolphintabwidget.h"
 #include <config-baloo.h>
 #include <kio/fileundomanager.h>
-#include <ksortablelist.h>
+#include <KSortableList>
 #include <kxmlguiwindow.h>
 
 #include <QIcon>
@@ -54,6 +41,10 @@ class QIcon;
 class PlacesPanel;
 class TerminalPanel;
 
+namespace KIO {
+    class OpenUrlJob;
+}
+
 /**
  * @short Main window for Dolphin.
  *
@@ -353,9 +344,6 @@ private slots:
      */
     void toggleShowMenuBar();
 
-    /** Sets up updates for "Open Preferred Search Tool" action. */
-    void setupUpdateOpenPreferredSearchToolAction();
-
     /** Updates "Open Preferred Search Tool" action. */
     void updateOpenPreferredSearchToolAction();
 
@@ -435,12 +423,6 @@ private slots:
      */
     void handleUrl(const QUrl& url);
 
-    /**
-     * handleUrl() can trigger a stat job to see if the url can actually
-     * be listed.
-     */
-    void slotHandleUrlStatFinished(KJob* job);
-
     /**
      * Is invoked when the write state of a folder has been changed and
      * enables/disables the "Create New..." menu entry.
@@ -647,7 +629,7 @@ private:
     QToolButton* m_controlButton;
     QTimer* m_updateToolBarTimer;
 
-    KIO::Job* m_lastHandleUrlStatJob;
+    KIO::OpenUrlJob *m_lastHandleUrlOpenJob;
 
     TerminalPanel* m_terminalPanel;
     PlacesPanel* m_placesPanel;