From 00ea3abd0138fa3883fa4241ccd628638b8fdea1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=20Ander=20Pe=C3=B1alba?= <jonan88@gmail.com>
Date: Fri, 3 Sep 2010 18:00:08 +0200
Subject: No need to show the url in the bookmark widget (specially if it's not
 editable).

---
 src/urlbar/bookmarkwidget.h | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'src/urlbar/bookmarkwidget.h')

diff --git a/src/urlbar/bookmarkwidget.h b/src/urlbar/bookmarkwidget.h
index c3c15e18..b95e55db 100644
--- a/src/urlbar/bookmarkwidget.h
+++ b/src/urlbar/bookmarkwidget.h
@@ -30,14 +30,13 @@
 // Rekonq Includes
 #include "rekonq_defines.h"
 
-// KDE Includes
-#include <KUrl>
-#include <KBookmark>
-#include <KLineEdit>
-
 // Qt Includes
 #include <QtGui/QFrame>
 
+// Forward Declarations
+class KBookmark;
+class KLineEdit;
+
 
 class BookmarkWidget : public QFrame
 {
@@ -45,7 +44,7 @@ class BookmarkWidget : public QFrame
 
 public:
     explicit BookmarkWidget(const KBookmark &bookmark, QWidget *parent = 0);
-    ~BookmarkWidget();
+    virtual ~BookmarkWidget();
 
     void showAt(const QPoint &pos);
 
@@ -55,9 +54,8 @@ private slots:
     void removeBookmark();
 
 private:
-    KBookmark m_bookmark;
+    KBookmark *m_bookmark;
     KLineEdit *m_name;
-
 };
 
 #endif // BOOKMARKWIDGET_H
-- 
cgit v1.2.1


From 1d341f01de25b734fbc52fd14394b7f4cdcd4214 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=20Ander=20Pe=C3=B1alba?= <jonan88@gmail.com>
Date: Fri, 10 Sep 2010 10:28:15 +0200
Subject: BookmarkWidget now inherits from QMenu (much nicer).

---
 src/urlbar/bookmarkwidget.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/urlbar/bookmarkwidget.h')

diff --git a/src/urlbar/bookmarkwidget.h b/src/urlbar/bookmarkwidget.h
index b95e55db..e97c1859 100644
--- a/src/urlbar/bookmarkwidget.h
+++ b/src/urlbar/bookmarkwidget.h
@@ -31,14 +31,14 @@
 #include "rekonq_defines.h"
 
 // Qt Includes
-#include <QtGui/QFrame>
+#include <QtGui/QMenu>
 
 // Forward Declarations
 class KBookmark;
 class KLineEdit;
 
 
-class BookmarkWidget : public QFrame
+class BookmarkWidget : public QMenu
 {
     Q_OBJECT
 
-- 
cgit v1.2.1


From f24af9b9aea23cac811e11014b38e435b7c1a818 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=20Ander=20Pe=C3=B1alba?= <jonan88@gmail.com>
Date: Fri, 10 Sep 2010 11:50:38 +0200
Subject: The RSS widget and the bookmark widget are now more consistent (they
 have the same look and behavior)

---
 src/urlbar/bookmarkwidget.h | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/urlbar/bookmarkwidget.h')

diff --git a/src/urlbar/bookmarkwidget.h b/src/urlbar/bookmarkwidget.h
index e97c1859..e07dac24 100644
--- a/src/urlbar/bookmarkwidget.h
+++ b/src/urlbar/bookmarkwidget.h
@@ -27,9 +27,6 @@
 #ifndef BOOKMARKWIDGET_H
 #define BOOKMARKWIDGET_H
 
-// Rekonq Includes
-#include "rekonq_defines.h"
-
 // Qt Includes
 #include <QtGui/QMenu>
 
@@ -50,7 +47,6 @@ public:
 
 private slots:
     void accept();
-    void reject();
     void removeBookmark();
 
 private:
-- 
cgit v1.2.1