From 7f65c026bec0f9ceb46753a46dfa376a405162a5 Mon Sep 17 00:00:00 2001 From: Alexander Kellett Date: Mon, 6 Oct 2003 18:31:25 +0000 Subject: [PATCH] sick of having two different coding styles between kio/bookmarks and here, so, add 4 space modelines to all files. i'll gradually fix the files over the coming days. svn path=/trunk/kdebase/konqueror/keditbookmarks/; revision=256804 --- keditbookmarks/actionsimpl.h | 2 + keditbookmarks/bookmarkinfo.cpp | 2 + keditbookmarks/bookmarkinfo.h | 2 + keditbookmarks/bookmarkiterator.cpp | 2 + keditbookmarks/bookmarkiterator.h | 2 + keditbookmarks/commands.cpp | 2 + keditbookmarks/commands.h | 2 + keditbookmarks/dcop.cpp | 2 + keditbookmarks/dcop.h | 2 + keditbookmarks/exporters.cpp | 2 + keditbookmarks/exporters.h | 2 + keditbookmarks/favicons.cpp | 2 + keditbookmarks/favicons.h | 2 + keditbookmarks/importers.cpp | 2 + keditbookmarks/importers.h | 2 + keditbookmarks/kinsertionsort.h | 2 + keditbookmarks/listview.cpp | 2 + keditbookmarks/listview.h | 2 + keditbookmarks/main.cpp | 2 + keditbookmarks/search.cpp | 2 + keditbookmarks/search.h | 2 + keditbookmarks/testlink.cpp | 2 + keditbookmarks/testlink.h | 2 + keditbookmarks/toplevel.h | 182 ++++++++++++++-------------- keditbookmarks/updater.cpp | 2 + 25 files changed, 140 insertions(+), 90 deletions(-) diff --git a/keditbookmarks/actionsimpl.h b/keditbookmarks/actionsimpl.h index 321adf6c54..2013b8a301 100644 --- a/keditbookmarks/actionsimpl.h +++ b/keditbookmarks/actionsimpl.h @@ -1,3 +1,5 @@ +// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*- +// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2003 Alexander Kellett diff --git a/keditbookmarks/bookmarkinfo.cpp b/keditbookmarks/bookmarkinfo.cpp index 35e911e117..d49546bcde 100644 --- a/keditbookmarks/bookmarkinfo.cpp +++ b/keditbookmarks/bookmarkinfo.cpp @@ -1,3 +1,5 @@ +// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*- +// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2003 Alexander Kellett diff --git a/keditbookmarks/bookmarkinfo.h b/keditbookmarks/bookmarkinfo.h index d1d87899ab..6eaf068f7e 100644 --- a/keditbookmarks/bookmarkinfo.h +++ b/keditbookmarks/bookmarkinfo.h @@ -1,3 +1,5 @@ +// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*- +// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2000 David Faure Copyright (C) 2002-2003 Alexander Kellett diff --git a/keditbookmarks/bookmarkiterator.cpp b/keditbookmarks/bookmarkiterator.cpp index 96eec1cb4b..b10aab810c 100644 --- a/keditbookmarks/bookmarkiterator.cpp +++ b/keditbookmarks/bookmarkiterator.cpp @@ -1,3 +1,5 @@ +// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*- +// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2000 David Faure Copyright (C) 2002-2003 Alexander Kellett diff --git a/keditbookmarks/bookmarkiterator.h b/keditbookmarks/bookmarkiterator.h index 3d50f594d5..5a8f153f0b 100644 --- a/keditbookmarks/bookmarkiterator.h +++ b/keditbookmarks/bookmarkiterator.h @@ -1,3 +1,5 @@ +// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*- +// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2002-2003 Alexander Kellett diff --git a/keditbookmarks/commands.cpp b/keditbookmarks/commands.cpp index aa84fdbba1..aba0c969ef 100644 --- a/keditbookmarks/commands.cpp +++ b/keditbookmarks/commands.cpp @@ -1,3 +1,5 @@ +// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*- +// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2000 David Faure Copyright (C) 2002-2003 Alexander Kellett diff --git a/keditbookmarks/commands.h b/keditbookmarks/commands.h index f19737ecda..26ced4e13d 100644 --- a/keditbookmarks/commands.h +++ b/keditbookmarks/commands.h @@ -1,3 +1,5 @@ +// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*- +// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2000 David Faure Copyright (C) 2002-2003 Alexander Kellett diff --git a/keditbookmarks/dcop.cpp b/keditbookmarks/dcop.cpp index f8a84f2409..d4897b5f4c 100644 --- a/keditbookmarks/dcop.cpp +++ b/keditbookmarks/dcop.cpp @@ -1,3 +1,5 @@ +// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*- +// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2000 David Faure Copyright (C) 2002-2003 Alexander Kellett diff --git a/keditbookmarks/dcop.h b/keditbookmarks/dcop.h index f0c8302b23..78c4806182 100644 --- a/keditbookmarks/dcop.h +++ b/keditbookmarks/dcop.h @@ -1,3 +1,5 @@ +// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*- +// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2003 Alexander Kellett diff --git a/keditbookmarks/exporters.cpp b/keditbookmarks/exporters.cpp index beb16d5c23..98204f4f45 100644 --- a/keditbookmarks/exporters.cpp +++ b/keditbookmarks/exporters.cpp @@ -1,3 +1,5 @@ +// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*- +// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2003 Alexander Kellett diff --git a/keditbookmarks/exporters.h b/keditbookmarks/exporters.h index eb36bbc147..76ee8642c5 100644 --- a/keditbookmarks/exporters.h +++ b/keditbookmarks/exporters.h @@ -1,3 +1,5 @@ +// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*- +// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2003 Alexander Kellett diff --git a/keditbookmarks/favicons.cpp b/keditbookmarks/favicons.cpp index 01c0bd0b54..f7b87e42da 100644 --- a/keditbookmarks/favicons.cpp +++ b/keditbookmarks/favicons.cpp @@ -1,3 +1,5 @@ +// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*- +// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2002-2003 Alexander Kellett diff --git a/keditbookmarks/favicons.h b/keditbookmarks/favicons.h index 8d0e448629..7fcecc3bb6 100644 --- a/keditbookmarks/favicons.h +++ b/keditbookmarks/favicons.h @@ -1,3 +1,5 @@ +// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*- +// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2002-2003 Alexander Kellett diff --git a/keditbookmarks/importers.cpp b/keditbookmarks/importers.cpp index 2feded326e..d41ef708e2 100644 --- a/keditbookmarks/importers.cpp +++ b/keditbookmarks/importers.cpp @@ -1,3 +1,5 @@ +// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*- +// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2000 David Faure Copyright (C) 2002-2003 Alexander Kellett diff --git a/keditbookmarks/importers.h b/keditbookmarks/importers.h index d549b90f55..f44fe3ea19 100644 --- a/keditbookmarks/importers.h +++ b/keditbookmarks/importers.h @@ -1,3 +1,5 @@ +// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*- +// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2000 David Faure Copyright (C) 2002-2003 Alexander Kellett diff --git a/keditbookmarks/kinsertionsort.h b/keditbookmarks/kinsertionsort.h index 916dc9331e..124e420107 100644 --- a/keditbookmarks/kinsertionsort.h +++ b/keditbookmarks/kinsertionsort.h @@ -1,3 +1,5 @@ +// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*- +// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2000 David Faure diff --git a/keditbookmarks/listview.cpp b/keditbookmarks/listview.cpp index ea472018ec..e3af99f538 100644 --- a/keditbookmarks/listview.cpp +++ b/keditbookmarks/listview.cpp @@ -1,3 +1,5 @@ +// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*- +// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2000 David Faure Copyright (C) 2002-2003 Alexander Kellett diff --git a/keditbookmarks/listview.h b/keditbookmarks/listview.h index f3f51ed26b..f699a9be53 100644 --- a/keditbookmarks/listview.h +++ b/keditbookmarks/listview.h @@ -1,3 +1,5 @@ +// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*- +// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2002-2003 Alexander Kellett diff --git a/keditbookmarks/main.cpp b/keditbookmarks/main.cpp index 8440124a0f..4ce97e2c9b 100644 --- a/keditbookmarks/main.cpp +++ b/keditbookmarks/main.cpp @@ -1,3 +1,5 @@ +// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*- +// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2000 David Faure Copyright (C) 2002-2003 Alexander Kellett diff --git a/keditbookmarks/search.cpp b/keditbookmarks/search.cpp index 262d01b1c9..400f4cbdb4 100644 --- a/keditbookmarks/search.cpp +++ b/keditbookmarks/search.cpp @@ -1,3 +1,5 @@ +// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*- +// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2003 Alexander Kellett diff --git a/keditbookmarks/search.h b/keditbookmarks/search.h index 69a1608951..5d6dedfb94 100644 --- a/keditbookmarks/search.h +++ b/keditbookmarks/search.h @@ -1,3 +1,5 @@ +// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*- +// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2003 Alexander Kellett diff --git a/keditbookmarks/testlink.cpp b/keditbookmarks/testlink.cpp index d77aaaebb3..6459290e3e 100644 --- a/keditbookmarks/testlink.cpp +++ b/keditbookmarks/testlink.cpp @@ -1,3 +1,5 @@ +// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*- +// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2000 David Faure Copyright (C) 2002-2003 Alexander Kellett diff --git a/keditbookmarks/testlink.h b/keditbookmarks/testlink.h index dd0316427a..acbd5788f8 100644 --- a/keditbookmarks/testlink.h +++ b/keditbookmarks/testlink.h @@ -1,3 +1,5 @@ +// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*- +// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2000 David Faure Copyright (C) 2002-2003 Alexander Kellett diff --git a/keditbookmarks/toplevel.h b/keditbookmarks/toplevel.h index 7517450252..e25516c8cf 100644 --- a/keditbookmarks/toplevel.h +++ b/keditbookmarks/toplevel.h @@ -1,3 +1,5 @@ +// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*- +// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2000 David Faure Copyright (C) 2002-2003 Alexander Kellett @@ -32,153 +34,153 @@ class MagicKLineEdit; class BookmarkInfoWidget; struct SelcAbilities { - bool itemSelected:1; - bool group:1; - bool root:1; - bool separator:1; - bool urlIsEmpty:1; - bool multiSelect:1; - bool singleSelect:1; - bool notEmpty:1; - bool tbShowState:1; + bool itemSelected:1; + bool group:1; + bool root:1; + bool separator:1; + bool urlIsEmpty:1; + bool multiSelect:1; + bool singleSelect:1; + bool notEmpty:1; + bool tbShowState:1; }; class CmdHistory : public QObject { - Q_OBJECT + Q_OBJECT public: - CmdHistory(KActionCollection *collection); - virtual ~CmdHistory() { ; } + CmdHistory(KActionCollection *collection); + virtual ~CmdHistory() { ; } - void notifyDocSaved(); + void notifyDocSaved(); - void clearHistory(); - void addCommand(KCommand *); - void didCommand(KCommand *); + void clearHistory(); + void addCommand(KCommand *); + void didCommand(KCommand *); - static CmdHistory *self(); + static CmdHistory *self(); protected slots: - void slotCommandExecuted(); - void slotDocumentRestored(); + void slotCommandExecuted(); + void slotDocumentRestored(); private: - KCommandHistory m_commandHistory; - static CmdHistory *s_self; + KCommandHistory m_commandHistory; + static CmdHistory *s_self; }; class KBookmark; class KBookmarkManager; class CurrentMgr : public QObject { - Q_OBJECT + Q_OBJECT public: - typedef enum {HTMLExport, OperaExport, IEExport, MozillaExport, NetscapeExport} ExportType; + typedef enum {HTMLExport, OperaExport, IEExport, MozillaExport, NetscapeExport} ExportType; - static CurrentMgr* self() { if (!s_mgr) { s_mgr = new CurrentMgr(); } return s_mgr; } - static KBookmark bookmarkAt(const QString & a); + static CurrentMgr* self() { if (!s_mgr) { s_mgr = new CurrentMgr(); } return s_mgr; } + static KBookmark bookmarkAt(const QString & a); - KBookmarkManager* mgr() const { return m_mgr; } - bool showNSBookmarks() const; - QString correctAddress(const QString &address) const; - QString path() const; + KBookmarkManager* mgr() const { return m_mgr; } + bool showNSBookmarks() const; + QString correctAddress(const QString &address) const; + QString path() const; - void createManager(const QString &filename); - void notifyManagers(); - bool managerSave(); - void saveAs(const QString &fileName); - void doExport(ExportType type, const QString & path = QString::null); - void setUpdate(bool update); + void createManager(const QString &filename); + void notifyManagers(); + bool managerSave(); + void saveAs(const QString &fileName); + void doExport(ExportType type, const QString & path = QString::null); + void setUpdate(bool update); protected slots: - void slotBookmarksChanged(const QString &, const QString &); + void slotBookmarksChanged(const QString &, const QString &); private: - CurrentMgr() : m_mgr(0) { ; } - KBookmarkManager *m_mgr; - static CurrentMgr *s_mgr; + CurrentMgr() : m_mgr(0) { ; } + KBookmarkManager *m_mgr; + static CurrentMgr *s_mgr; }; class KEBApp : public KMainWindow { - Q_OBJECT + Q_OBJECT public: - static KEBApp* self() { return s_topLevel; } + static KEBApp* self() { return s_topLevel; } - KEBApp(const QString & bookmarksFile, bool readonly, const QString &address, bool browser, const QString &caption); - virtual ~KEBApp(); + KEBApp(const QString & bookmarksFile, bool readonly, const QString &address, bool browser, const QString &caption); + virtual ~KEBApp(); - void setModifiedFlag(bool); + void setModifiedFlag(bool); - void updateActions(); - void setActionsEnabled(SelcAbilities); + void updateActions(); + void setActionsEnabled(SelcAbilities); - void setCancelFavIconUpdatesEnabled(bool); - void setCancelTestsEnabled(bool); + void setCancelFavIconUpdatesEnabled(bool); + void setCancelTestsEnabled(bool); - void notifyCommandExecuted(); + void notifyCommandExecuted(); - QWidget* popupMenuFactory(const char *type) { - return factory()->container(type, this); - } + QWidget* popupMenuFactory(const char *type) { + return factory()->container(type, this); + } - KToggleAction* getToggleAction(const char *) const; + KToggleAction* getToggleAction(const char *) const; - QString caption() const { return m_caption; } - bool readonly() const { return m_readOnly; } - bool modified() const { return m_modified; } - bool splitView() const { return m_splitView; } - bool browser() const { return m_browser; } - bool nsShown() const; + QString caption() const { return m_caption; } + bool readonly() const { return m_readOnly; } + bool modified() const { return m_modified; } + bool splitView() const { return m_splitView; } + bool browser() const { return m_browser; } + bool nsShown() const; - BookmarkInfoWidget *bkInfo() { return m_bkinfo; } + BookmarkInfoWidget *bkInfo() { return m_bkinfo; } public slots: - void slotSaveOnClose(); - void slotAdvancedAddBookmark(); - void slotFilteredToolbar(); - void slotSplitView(); + void slotSaveOnClose(); + void slotAdvancedAddBookmark(); + void slotFilteredToolbar(); + void slotSplitView(); - void slotConfigureKeyBindings(); - void slotConfigureToolbars(); + void slotConfigureKeyBindings(); + void slotConfigureToolbars(); protected slots: - void slotClipboardDataChanged(); - void slotNewToolbarConfig(); + void slotClipboardDataChanged(); + void slotNewToolbarConfig(); private: - static KBookmarkManager* bookmarkManager(); + static KBookmarkManager* bookmarkManager(); - virtual bool queryClose(); + virtual bool queryClose(); - void readConfig(); - void resetActions(); - void createActions(); + void readConfig(); + void resetActions(); + void createActions(); - void updateListView(); + void updateListView(); - static KEBApp *s_topLevel; - KBookmarkEditorIface *m_dcopIface; + static KEBApp *s_topLevel; + KBookmarkEditorIface *m_dcopIface; public: // only temporary - CmdHistory *m_cmdHistory; - QString m_bookmarksFilename; - QString m_caption; + CmdHistory *m_cmdHistory; + QString m_bookmarksFilename; + QString m_caption; - bool m_modified:1; - bool m_saveOnClose:1; + bool m_modified:1; + bool m_saveOnClose:1; - void construct(); + void construct(); private: - MagicKLineEdit *m_iSearchLineEdit; - BookmarkInfoWidget *m_bkinfo; + MagicKLineEdit *m_iSearchLineEdit; + BookmarkInfoWidget *m_bkinfo; - bool m_canPaste:1; - bool m_readOnly:1; + bool m_canPaste:1; + bool m_readOnly:1; - bool m_advancedAddBookmark:1; - bool m_splitView:1; - bool m_browser:1; - bool m_filteredToolbar:1; + bool m_advancedAddBookmark:1; + bool m_splitView:1; + bool m_browser:1; + bool m_filteredToolbar:1; }; #endif diff --git a/keditbookmarks/updater.cpp b/keditbookmarks/updater.cpp index 12c4f84037..72034c8587 100644 --- a/keditbookmarks/updater.cpp +++ b/keditbookmarks/updater.cpp @@ -1,3 +1,5 @@ +// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*- +// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2003 Alexander Kellett