merging newurlbar branch

Merge branch 'newurlbar'

1 files changed, 8 insertions, 9 deletions

diff --git a/src/urlbar.h b/src/urlbar.h
index 5d766a92..d0f80f17 100644
--- a/src/urlbar.h
+++ b/src/urlbar.h
@@ -24,36 +24,35 @@
 #include "webview.h"
 
 // KDE Includes
-#include <KLineEdit>
-#include <KComboBox>
+#include <KHistoryComboBox>
 
 // Qt Includes
-#include <QWidget>
-#include <QLabel>
+#include <QtGui>
 
 
-class UrlBar : public QWidget
+class UrlBar : public KHistoryComboBox
 {
 Q_OBJECT
 
 public:
-    UrlBar(QWidget *parent = 0);
+    UrlBar(KHistoryComboBox *parent = 0);
     ~UrlBar();
 
-    KLineEdit *lineEdit();
+    QLineEdit *lineEdit();
     void setWebView(WebView *webView);
 
 private slots:
     void webViewUrlChanged(const QUrl &url);
     void webViewIconChanged();
 
+    void prova();
+
 private:
     QLinearGradient generateGradient(const QColor &color) const;
 
     WebView *m_webView;
 
-    QLabel *m_iconLabel;
-    KLineEdit *m_lineEdit;
+    QLineEdit *m_lineEdit;
     QColor m_defaultBaseColor;
 };