6 files changed, 14 insertions, 15 deletions
diff --git a/src/urlbar/bookmarkwidget.cpp b/src/urlbar/bookmarkwidget.cpp
index 6b39c2c8..47c06d75 100644
--- a/src/urlbar/bookmarkwidget.cpp
+++ b/src/urlbar/bookmarkwidget.cpp
@@ -51,9 +51,6 @@
 #include <QDBusConnection>
 #include <QDBusConnectionInterface>
 
-// Nepomuk config include
-#include "config-nepomuk.h"
-
 #ifdef HAVE_NEPOMUK
 // Local Nepomuk Includes
 #include "resourcelinkdialog.h"
@@ -360,7 +357,9 @@ void BookmarkWidget::addCommentSlot()
 
 void BookmarkWidget::linkToResourceSlot()
 {
-    Nepomuk::ResourceLinkDialog r(m_nfoResource);
-    r.exec();
+    QPointer<Nepomuk::ResourceLinkDialog> r = new Nepomuk::ResourceLinkDialog(m_nfoResource);
+    r->exec();
+    
+    r->deleteLater();
 }
 #endif
diff --git a/src/urlbar/bookmarkwidget.h b/src/urlbar/bookmarkwidget.h
index e5f25d37..39f6fbd4 100644
--- a/src/urlbar/bookmarkwidget.h
+++ b/src/urlbar/bookmarkwidget.h
@@ -35,15 +35,13 @@
 #include <QPlainTextEdit>
 
 // Nepomuk config include
-#include "config-nepomuk.h"
-
-#ifdef HAVE_NEPOMUK
+#include <config-nepomuk.h>
 
 // Nepomuk Includes
+#ifdef HAVE_NEPOMUK
 #include <Nepomuk/Resource>
 #include <Nepomuk/Tag>
 #include <Nepomuk/Vocabulary/NFO>
-
 #endif
 
 // Forward Declarations
diff --git a/src/urlbar/completionwidget.h b/src/urlbar/completionwidget.h
index 2857bacf..57a90b0e 100644
--- a/src/urlbar/completionwidget.h
+++ b/src/urlbar/completionwidget.h
@@ -49,7 +49,7 @@ class CompletionWidget : public QFrame
     Q_OBJECT
 
 public:
-    CompletionWidget(QWidget *parent);
+    explicit CompletionWidget(QWidget *parent);
 
     virtual bool eventFilter(QObject *obj, QEvent *ev);
     void setVisible(bool visible);
diff --git a/src/urlbar/resourcelinkdialog.cpp b/src/urlbar/resourcelinkdialog.cpp
index 8a4b5685..b300c8ec 100644
--- a/src/urlbar/resourcelinkdialog.cpp
+++ b/src/urlbar/resourcelinkdialog.cpp
@@ -234,10 +234,12 @@ void Nepomuk::ResourceLinkDialog::showContextMenu(const QPoint &pos)
 
 void Nepomuk::ResourceLinkDialog::createNewResourceSlot()
 {
-    Nepomuk::NewResourceDialog newResource(d->m_resourceSelect->currentIndex(), d->m_nfoResource);
-    //close();
-    newResource.exec();
+    QPointer<Nepomuk::NewResourceDialog> r = new Nepomuk::NewResourceDialog(d->m_resourceSelect->currentIndex(), d->m_nfoResource);
+    r->exec();
+
     setRelatedResources();
+
+    r->deleteLater();
 }
 
 
diff --git a/src/urlbar/urlbar.h b/src/urlbar/urlbar.h
index beb1caf4..cce5cd46 100644
--- a/src/urlbar/urlbar.h
+++ b/src/urlbar/urlbar.h
@@ -53,7 +53,7 @@ class IconButton : public QToolButton
     Q_OBJECT
 
 public:
-    IconButton(QWidget *parent = 0);
+    explicit IconButton(QWidget *parent = 0);
 
 Q_SIGNALS:
     void clicked(QPoint);
diff --git a/src/urlbar/urlsuggester.h b/src/urlbar/urlsuggester.h
index 18b63bd4..33bcb398 100644
--- a/src/urlbar/urlsuggester.h
+++ b/src/urlbar/urlsuggester.h
@@ -121,7 +121,7 @@ class UrlSuggester : public QObject
     Q_OBJECT
 
 public:
-    UrlSuggester(const QString &typedUrl);
+    explicit UrlSuggester(const QString &typedUrl);
 
     UrlSuggestionList orderedSearchItems();