diff --git a/src/kbookmarkactionmenu.h b/src/kbookmarkactionmenu.h index cc17faa..e49f14a 100644 --- a/src/kbookmarkactionmenu.h +++ b/src/kbookmarkactionmenu.h @@ -1,40 +1,41 @@ /* This file is part of the KDE project Copyright (C) 1998, 1999 Torben Weis Copyright (C) 2006 Daniel Teske This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library 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 Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef KBOOKMARKACTIONMENU_H #define KBOOKMARKACTIONMENU_H #include "kbookmarkactioninterface.h" #include "kactionmenu.h" /*** * A wrapper around KActionMenu to provide a nice constructor for bookmark groups. * */ class KBOOKMARKS_EXPORT KBookmarkActionMenu : public KActionMenu, public KBookmarkActionInterface { + Q_OBJECT public: KBookmarkActionMenu(const KBookmark &bm, QObject *parent); KBookmarkActionMenu(const KBookmark &bm, const QString &text, QObject *parent); virtual ~KBookmarkActionMenu(); }; #endif diff --git a/src/kbookmarkimporter_ie.h b/src/kbookmarkimporter_ie.h index e2f7564..6304854 100644 --- a/src/kbookmarkimporter_ie.h +++ b/src/kbookmarkimporter_ie.h @@ -1,53 +1,54 @@ // -*- c-basic-offset:4; indent-tabs-mode:nil -*- /* This file is part of the KDE libraries Copyright (C) 2002 Alexander Kellett This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License version 2 as published by the Free Software Foundation. This library 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 Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef __kbookmarkimporter_ie_h #define __kbookmarkimporter_ie_h #include #include /** * A class for importing IE bookmarks */ class KBOOKMARKS_EXPORT KIEBookmarkImporterImpl : public KBookmarkImporterBase { + Q_OBJECT public: KIEBookmarkImporterImpl() { } void parse() override; QString findDefaultLocation(bool forSaving = false) const override; private: class KIEBookmarkImporterImplPrivate *d; }; class KBOOKMARKS_EXPORT KIEBookmarkExporterImpl : public KBookmarkExporterBase { public: KIEBookmarkExporterImpl(KBookmarkManager *mgr, const QString &path) : KBookmarkExporterBase(mgr, path) { ; } ~KIEBookmarkExporterImpl() override {} void write(const KBookmarkGroup &) override; private: class KIEBookmarkExporterImplPrivate *d; }; #endif diff --git a/src/kbookmarkimporter_ns.h b/src/kbookmarkimporter_ns.h index b57aef2..b7354e5 100644 --- a/src/kbookmarkimporter_ns.h +++ b/src/kbookmarkimporter_ns.h @@ -1,79 +1,80 @@ // -*- c-basic-offset:4; indent-tabs-mode:nil -*- /* This file is part of the KDE libraries Copyright (C) 2000 David Faure This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License version 2 as published by the Free Software Foundation. This library 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 Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef __kbookmarkimporter_ns_h #define __kbookmarkimporter_ns_h #include "kbookmarkimporter.h" #include "kbookmarkexporter.h" /** * A class for importing NS bookmarks * utf8 defaults to off */ class KBOOKMARKS_EXPORT KNSBookmarkImporterImpl : public KBookmarkImporterBase { Q_OBJECT // For QObject::tr public: KNSBookmarkImporterImpl() : m_utf8(false) { } void setUtf8(bool utf8) { m_utf8 = utf8; } void parse() override; QString findDefaultLocation(bool forSaving = false) const override; private: bool m_utf8; class KNSBookmarkImporterImplPrivate *d; }; /** * A class for importing Mozilla bookmarks * utf8 defaults to on */ class KBOOKMARKS_EXPORT KMozillaBookmarkImporterImpl : public KNSBookmarkImporterImpl { + Q_OBJECT public: KMozillaBookmarkImporterImpl() { setUtf8(true); } private: class KMozillaBookmarkImporterImplPrivate *d; }; class KBOOKMARKS_EXPORT KNSBookmarkExporterImpl : public KBookmarkExporterBase { public: KNSBookmarkExporterImpl(KBookmarkManager *mgr, const QString &fileName) : KBookmarkExporterBase(mgr, fileName) { ; } ~KNSBookmarkExporterImpl() override {} void write(const KBookmarkGroup &parent) override; void setUtf8(bool); protected: QString folderAsString(const KBookmarkGroup &parent) const; private: bool m_utf8; class KNSBookmarkExporterImplPrivate *d; }; #endif diff --git a/src/kbookmarkmenu_p.h b/src/kbookmarkmenu_p.h index b289da5..badc756 100644 --- a/src/kbookmarkmenu_p.h +++ b/src/kbookmarkmenu_p.h @@ -1,123 +1,124 @@ // -*- c-basic-offset:4; indent-tabs-mode:nil -*- /* This file is part of the KDE project Copyright (C) 2003 Alexander Kellett This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library 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 Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef __kbookmarkmenu_p_h__ #define __kbookmarkmenu_p_h__ #include #include #include #include #include "kbookmark.h" #include "kbookmarkactioninterface.h" #include "kbookmarkimporter.h" #include "kbookmarkmanager.h" class QString; class QMenu; class KBookmark; class KBookmarkGroup; class KBookmarkOwner; class KBookmarkMenu; #define KEDITBOOKMARKS_BINARY "keditbookmarks" class KImportedBookmarkMenu : public KBookmarkMenu { friend class KBookmarkMenuImporter; Q_OBJECT public: //TODO simplfy KImportedBookmarkMenu(KBookmarkManager *mgr, KBookmarkOwner *owner, QMenu *parentMenu, const QString &type, const QString &location); KImportedBookmarkMenu(KBookmarkManager *mgr, KBookmarkOwner *owner, QMenu *parentMenu); ~KImportedBookmarkMenu(); void clear() override; void refill() override; protected Q_SLOTS: void slotNSLoad(); private: QString m_type; QString m_location; }; class KBookmarkTreeItem : public QTreeWidgetItem { public: KBookmarkTreeItem(QTreeWidget *tree); KBookmarkTreeItem(QTreeWidgetItem *parent, QTreeWidget *tree, const KBookmarkGroup &bk); ~KBookmarkTreeItem(); QString address(); private: QString m_address; }; class KBookmarkSettings { public: bool m_advancedaddbookmark; bool m_contextmenu; static KBookmarkSettings *s_self; static void readSettings(); static KBookmarkSettings *self(); }; /** * A class connected to KNSBookmarkImporter, to fill KActionMenus. */ class KBookmarkMenuImporter : public QObject { Q_OBJECT public: KBookmarkMenuImporter(KBookmarkManager *mgr, KImportedBookmarkMenu *menu) : m_menu(menu), m_pManager(mgr) {} void openBookmarks(const QString &location, const QString &type); void connectToImporter(const QObject &importer); protected Q_SLOTS: void newBookmark(const QString &text, const QString &url, const QString &); void newFolder(const QString &text, bool, const QString &); void newSeparator(); void endFolder(); protected: QStack mstack; KImportedBookmarkMenu *m_menu; KBookmarkManager *m_pManager; }; class KImportedBookmarkActionMenu : public KActionMenu, public KBookmarkActionInterface { + Q_OBJECT public: KImportedBookmarkActionMenu(const QIcon &icon, const QString &text, QObject *parent) : KActionMenu(icon, text, parent), KBookmarkActionInterface(KBookmark()) { } ~KImportedBookmarkActionMenu() {} }; #endif