diff options
Diffstat (limited to 'src/xbel.cpp')
| -rw-r--r-- | src/xbel.cpp | 67 |
1 files changed, 27 insertions, 40 deletions
diff --git a/src/xbel.cpp b/src/xbel.cpp index 3accd76d..788c6d03 100644 --- a/src/xbel.cpp +++ b/src/xbel.cpp @@ -1,43 +1,30 @@ -/**************************************************************************** -** -** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) -** -** This file is part of the demonstration applications of the Qt Toolkit. -** -** Commercial Usage -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. -** -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License versions 2.0 or 3.0 as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information -** to ensure GNU General Public Licensing requirements will be met: -** http://www.fsf.org/licensing/licenses/info/GPLv2.html and -** http://www.gnu.org/copyleft/gpl.html. In addition, as a special -** exception, Nokia gives you certain additional rights. These rights -** are described in the Nokia Qt GPL Exception version 1.3, included in -** the file GPL_EXCEPTION.txt in this package. -** -** Qt for Windows(R) Licensees -** As a special exception, Nokia, as the sole copyright holder for Qt -** Designer, grants users of the Qt/Eclipse Integration plug-in the -** right for the Qt/Eclipse Integration to link to functionality -** provided by Qt Designer and its related libraries. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at qt-sales@nokia.com. -** -****************************************************************************/ - +/* ============================================================ + * + * This file is a part of the reKonq project + * + * Copyright (C) 2008 by Andrea Diamantini <adjam7 at gmail dot 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, 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. + * + * ============================================================ */ + +// Local Includes #include "xbel.h" -#include <QtCore/QFile> +// KDE Includes +#include <KLocalizedString> + +// Qt Includes +#include <QFile> BookmarkNode::BookmarkNode(BookmarkNode::Type type, BookmarkNode *parent) : expanded(false) @@ -137,7 +124,7 @@ BookmarkNode *XbelReader::read(QIODevice *device) && (version.isEmpty() || version == QLatin1String("1.0"))) { readXBEL(root); } else { - raiseError(QObject::tr("The file is not an XBEL version 1.0 file.")); + raiseError( i18n("The file is not an XBEL version 1.0 file.") ); } } } @@ -235,7 +222,7 @@ void XbelReader::readBookmarkNode(BookmarkNode *parent) } } if (bookmark->title.isEmpty()) - bookmark->title = QObject::tr("Unknown title"); + bookmark->title = i18n("Unknown title"); } void XbelReader::skipUnknownElement() |