From 7cbd7aafd65b19102d1c81d9ed3955304f272ecd Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Sat, 17 Feb 2007 13:43:47 +0000 Subject: Cleanup: don't use deprecated Qt3 classes or methods, removed unnecessary includes svn path=/trunk/KDE/kdebase/apps/; revision=634516 --- src/urlnavigator.h | 79 ++++++++++++++++++++++++------------------------------ 1 file changed, 35 insertions(+), 44 deletions(-) (limited to 'src/urlnavigator.h') diff --git a/src/urlnavigator.h b/src/urlnavigator.h index bafece2ea..1815a902c 100644 --- a/src/urlnavigator.h +++ b/src/urlnavigator.h @@ -1,40 +1,33 @@ -/************************************************************************** -* Copyright (C) 2006 by Peter Penz * -* peter.penz@gmx.at * -* * -* 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 * -***************************************************************************/ - -#ifndef UrlNAVIGATOR_H -#define UrlNAVIGATOR_H - - -//Added by qt3to4: -#include -#include -#include -#include +/*************************************************************************** + * Copyright (C) 2006 by Peter Penz () * + * Copyright (C) 2006 by Aaron J. Seigo () * + * Copyright (C) 2006 by Patrice Tremblay * + * * + * 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 * + ***************************************************************************/ + +#ifndef URLNAVIGATOR_H +#define URLNAVIGATOR_H + +#include #include -#include -#include +#include -class QComboBox; class QLabel; class QLineEdit; -class Q3PopupMenu; class QCheckBox; class KUrl; @@ -45,26 +38,24 @@ class BookmarkSelector; class ProtocolCombo; /** - * @brief Navigation bar which contains the current shown Url. + * @brief Navigation bar which contains the current shown URL. * - * The Url navigator offers two modes: + * The URL navigator offers two modes: * - Editable: Represents the 'classic' mode, where the current Url * is editable inside a line editor. - * - Non editable: The Url is represented by a number of buttons, where - * clicking on a button results in activating the Url + * - Non editable: The URL is represented by a number of buttons, where + * clicking on a button results in activating the URL * the button represents. This mode also supports drag * and drop of items. * * The mode can be changed by a toggle button located on the left side of * the navigator. * - * The Url navigator also remembers the Url history and allows to go + * The URL navigator also remembers the URL history and allows to go * back and forward within this history. - * - * @author Peter Penz */ -typedef Q3ValueList UrlStack; +typedef QLinkedList UrlStack; class UrlNavigator : public KHBox { @@ -117,7 +108,7 @@ public: * @param index Output parameter which indicates the current * index of the location. */ - const Q3ValueList& history(int& index) const; + const QLinkedList& history(int& index) const; /** * Goes back one step in the Url history. The signals @@ -250,14 +241,14 @@ private slots: private: bool m_active; int m_historyIndex; - Q3ValueList m_history; + QLinkedList m_history; QCheckBox* m_toggleButton; BookmarkSelector* m_bookmarkSelector; KUrlComboBox* m_pathBox; ProtocolCombo* m_protocols; QLabel* m_protocolSeparator; QLineEdit* m_host; - Q3ValueList m_navButtons; + QLinkedList m_navButtons; //UrlStack m_urls; /** -- cgit v1.3