diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2012-12-28 16:50:41 +0100 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2012-12-28 16:50:41 +0100 |
commit | faa7f72c417b4ccd9b794b32b988312186d62e59 (patch) | |
tree | 19a4db56f1526e073ce87a0c05a0923d5a6e442f /src/bookmarks | |
parent | SVN_SILENT made messages (.desktop file) (diff) | |
download | rekonq-faa7f72c417b4ccd9b794b32b988312186d62e59.tar.xz |
Krazy Fixes, first shot
Diffstat (limited to 'src/bookmarks')
-rw-r--r-- | src/bookmarks/bookmarkmanager.h | 2 | ||||
-rw-r--r-- | src/bookmarks/bookmarkowner.cpp | 10 | ||||
-rw-r--r-- | src/bookmarks/bookmarkowner.h | 2 | ||||
-rw-r--r-- | src/bookmarks/bookmarkscontextmenu.cpp | 2 | ||||
-rw-r--r-- | src/bookmarks/bookmarkscontextmenu.h | 1 | ||||
-rw-r--r-- | src/bookmarks/bookmarkstoolbar.h | 2 |
6 files changed, 10 insertions, 9 deletions
diff --git a/src/bookmarks/bookmarkmanager.h b/src/bookmarks/bookmarkmanager.h index 0e86fcca..c970d390 100644 --- a/src/bookmarks/bookmarkmanager.h +++ b/src/bookmarks/bookmarkmanager.h @@ -129,7 +129,7 @@ private: * (actually konqueror's bookmarks). * @param parent The WebWindow to provide bookmarks objects. */ - BookmarkManager(QObject *parent = 0); + explicit BookmarkManager(QObject *parent = 0); public Q_SLOTS: /** diff --git a/src/bookmarks/bookmarkowner.cpp b/src/bookmarks/bookmarkowner.cpp index 20a602a6..ba2d8f63 100644 --- a/src/bookmarks/bookmarkowner.cpp +++ b/src/bookmarks/bookmarkowner.cpp @@ -46,9 +46,7 @@ // Qt Includes #include <QClipboard> -// Nepomuk config include -#include "config-nepomuk.h" - +// Nepomuk Includes #ifdef HAVE_NEPOMUK // Local Nepomuk Includes #include "resourcelinkdialog.h" @@ -330,9 +328,11 @@ void BookmarkOwner::editBookmark(KBookmark bookmark) void BookmarkOwner::fancyBookmark(KBookmark bookmark) { Nepomuk::Resource nfoResource = (KUrl)bookmark.url(); - Nepomuk::ResourceLinkDialog r(nfoResource); - r.exec(); + QPointer<Nepomuk::ResourceLinkDialog> r = new Nepomuk::ResourceLinkDialog(nfoResource); + r->exec(); + + r->deleteLater(); } #endif diff --git a/src/bookmarks/bookmarkowner.h b/src/bookmarks/bookmarkowner.h index aca338dd..6a18c237 100644 --- a/src/bookmarks/bookmarkowner.h +++ b/src/bookmarks/bookmarkowner.h @@ -35,7 +35,7 @@ #include "rekonq_defines.h" // Nepomuk config include -#include "config-nepomuk.h" +#include <config-nepomuk.h> // KDE Includes #include <KAction> diff --git a/src/bookmarks/bookmarkscontextmenu.cpp b/src/bookmarks/bookmarkscontextmenu.cpp index 54e558cc..69cde758 100644 --- a/src/bookmarks/bookmarkscontextmenu.cpp +++ b/src/bookmarks/bookmarkscontextmenu.cpp @@ -29,7 +29,7 @@ #include "bookmarkscontextmenu.h" // Nepomuk config include -#include "config-nepomuk.h" +#include <config-nepomuk.h> // Local Includes #include "bookmarkowner.h" diff --git a/src/bookmarks/bookmarkscontextmenu.h b/src/bookmarks/bookmarkscontextmenu.h index c927f3a6..b98e3408 100644 --- a/src/bookmarks/bookmarkscontextmenu.h +++ b/src/bookmarks/bookmarkscontextmenu.h @@ -27,6 +27,7 @@ #ifndef BOOKMARKS_CONTEXT_MENU_H #define BOOKMARKS_CONTEXT_MENU_H + // KDE Includes #include <KBookmarkMenu> diff --git a/src/bookmarks/bookmarkstoolbar.h b/src/bookmarks/bookmarkstoolbar.h index 4098f2a3..bca7864f 100644 --- a/src/bookmarks/bookmarkstoolbar.h +++ b/src/bookmarks/bookmarkstoolbar.h @@ -82,7 +82,7 @@ class BookmarkToolBar : public KToolBar Q_OBJECT public: - BookmarkToolBar(QWidget *parent); + explicit BookmarkToolBar(QWidget *parent); ~BookmarkToolBar(); protected: |