diff options
Diffstat (limited to 'src/dolphinmainwindow.h')
| -rw-r--r-- | src/dolphinmainwindow.h | 47 |
1 files changed, 13 insertions, 34 deletions
diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h index dcd73c6a7..c03eb1be0 100644 --- a/src/dolphinmainwindow.h +++ b/src/dolphinmainwindow.h @@ -1,23 +1,10 @@ -/*************************************************************************** - * Copyright (C) 2006 by Peter Penz <[email protected]> * - * Copyright (C) 2006 by Stefan Monov <[email protected]> * - * Copyright (C) 2006 by Cvetoslav Ludmiloff <[email protected]> * - * * - * 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 <[email protected]> + * SPDX-FileCopyrightText: 2006 Stefan Monov <[email protected]> + * SPDX-FileCopyrightText: 2006 Cvetoslav Ludmiloff <[email protected]> + * + * 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. * @@ -433,12 +424,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. */ @@ -607,12 +592,6 @@ private: /** Adds "What's This?" texts to many widgets and StandardActions. */ void setupWhatsThis(); - /** - * Returns the KIO::StatJob::mostLocalUrl() for the active container URL - * if it's a local file. Otherwise returns the user's home path. - */ - QString activeContainerLocalPath(); - /** Returns preferred search tool as configured in "More Search Tools" menu. */ QPointer<QAction> preferredSearchTool(); @@ -644,7 +623,7 @@ private: QToolButton* m_controlButton; QTimer* m_updateToolBarTimer; - KIO::Job* m_lastHandleUrlStatJob; + KIO::OpenUrlJob *m_lastHandleUrlOpenJob; TerminalPanel* m_terminalPanel; PlacesPanel* m_placesPanel; |