diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2010-09-02 17:15:20 +0200 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2010-09-02 17:15:20 +0200 |
commit | 6af2fc9af52731ac3630c9019c0bfebd877666b9 (patch) | |
tree | 4bac4a651bd6bbd612f1e2174a193d8920d75913 /src/bookmarks/bookmarkowner.h | |
parent | Merge commit 'refs/merge-requests/196' of git://gitorious.org/rekonq/mainline... (diff) | |
download | rekonq-6af2fc9af52731ac3630c9019c0bfebd877666b9.tar.xz |
Code Review.
General clean up
let member variables have better names, starting with _ and the needed get functions
signals/slots --> Q_SIGNALS/Q_SLOTS
moc headers
Diffstat (limited to 'src/bookmarks/bookmarkowner.h')
-rw-r--r-- | src/bookmarks/bookmarkowner.h | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/bookmarks/bookmarkowner.h b/src/bookmarks/bookmarkowner.h index e0c2a8ad..795ccbf0 100644 --- a/src/bookmarks/bookmarkowner.h +++ b/src/bookmarks/bookmarkowner.h @@ -40,6 +40,7 @@ // Forward Declarations class KAction; + /** * Reimplementation of KBookmarkOwner, this class allows to manage * bookmarks as actions. @@ -111,14 +112,7 @@ public: */ virtual void openFolderinTabs(const KBookmarkGroup &bookmark); -signals: - /** - * This signal is emitted when an url has to be loaded - * @param url the URL to load - */ - void openUrl(const KUrl &, const Rekonq::OpenType &); - -public slots: +public Q_SLOTS: void setCurrentBookmark(const KBookmark &bookmark); void openBookmark(const KBookmark &bookmark = KBookmark()); @@ -132,16 +126,23 @@ public slots: void editBookmark(KBookmark bookmark = KBookmark()); bool deleteBookmark(KBookmark bookmark = KBookmark()); -private: - KBookmarkManager *m_manager; - - QVector<KAction*> m_actions; - KBookmark m_currentBookmark; +Q_SIGNALS: + /** + * This signal is emitted when an url has to be loaded + * @param url the URL to load + */ + void openUrl(const KUrl &, const Rekonq::OpenType &); +private: void setupActions(); void createAction(const BookmarkAction &action, const QString &text, const QString &icon, const QString &help, const char *slot); + + + KBookmarkManager *m_manager; + QVector<KAction*> m_actions; + KBookmark m_currentBookmark; }; #endif // BOOKMARKOWNER_H |