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
This commit is contained in:
Alexander Kellett 2003-10-06 18:31:25 +00:00
parent 2544c7596c
commit 7f65c026be
25 changed files with 140 additions and 90 deletions

View file

@ -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 <lypanov@kde.org>

View file

@ -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 <lypanov@kde.org>

View file

@ -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 <faure@kde.org>
Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>

View file

@ -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 <faure@kde.org>
Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>

View file

@ -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 <lypanov@kde.org>

View file

@ -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 <faure@kde.org>
Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>

View file

@ -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 <faure@kde.org>
Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>

View file

@ -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 <faure@kde.org>
Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>

View file

@ -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 <lypanov@kde.org>

View file

@ -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 <lypanov@kde.org>

View file

@ -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 <lypanov@kde.org>

View file

@ -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 <lypanov@kde.org>

View file

@ -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 <lypanov@kde.org>

View file

@ -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 <faure@kde.org>
Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>

View file

@ -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 <faure@kde.org>
Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>

View file

@ -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 <faure@kde.org>

View file

@ -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 <faure@kde.org>
Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>

View file

@ -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 <lypanov@kde.org>

View file

@ -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 <faure@kde.org>
Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>

View file

@ -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 <lypanov@kde.org>

View file

@ -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 <lypanov@kde.org>

View file

@ -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 <faure@kde.org>
Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>

View file

@ -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 <faure@kde.org>
Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>

View file

@ -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 <faure@kde.org>
Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>
@ -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

View file

@ -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 <lypanov@kde.org>