Revert "derivation of the lastbar branch: UltimateLastBar :)"

This reverts commit f45e39322dd7561bc1cd2756b4c9223bc586425b.

1 files changed, 14 insertions, 12 deletions

diff --git a/src/urlbar/urlbar.h b/src/urlbar/urlbar.h
index 18878e5f..39911bb2 100644
--- a/src/urlbar/urlbar.h
+++ b/src/urlbar/urlbar.h
@@ -2,10 +2,10 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2010 by Andrea Diamantini <adjam7 at gmail dot com>
 * Copyright (C) 2009 by Domrachev Alexandr <alexandr.domrachev@gmail.com>
 * Copyright (C) 2009 by Paweł Prażak <pawelprazak at gmail dot com>
-* Copyright (C) 2009 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2009-2010 by Lionel Chauvin <megabigbug@yahoo.fr>
 *
 *
 * This program is free software; you can redistribute it and/or
@@ -32,23 +32,23 @@
 
 
 // Local Includes
+#include "rekonqprivate_export.h"
 #include "lineedit.h"
-#include "completionwidget.h"
 
 // KDE Includes
 #include <KUrl>
-#include <KComboBox>
+#include <KHistoryComboBox>
 
 // Qt Includes
 #include <QUrl>
-#include <QPointer>
 
 // Forward Declarations
 class QLinearGradient;
 class QWidget;
+class KCompletion;
 
 
-class UrlBar : public KComboBox
+class REKONQ_TESTS_EXPORT UrlBar : public KHistoryComboBox
 {
     Q_OBJECT
 
@@ -64,6 +64,9 @@ public:
     
     void setProgress(int progress);
 
+signals:
+    void activated(const KUrl&);
+
 public slots:
     void setUrl(const QUrl &url);
     void updateProgress(int progress);
@@ -72,15 +75,17 @@ public slots:
 private slots:
     void activated(const QString& url);
     void loadFinished(bool);
-    void suggestUrls(const QString &editedText);
+    void cleared();
 
 protected:
     virtual void paintEvent(QPaintEvent *event);
     virtual void keyPressEvent(QKeyEvent *event);
-    virtual void focusInEvent(QFocusEvent *event);
-    virtual void changeEvent (QEvent* event);
 
 private:
+    void setupLineEdit();
+
+    KLineEdit *lineEdit() const;
+
     static QLinearGradient generateGradient(const QColor &color, int height);
 
     static QColor s_defaultBaseColor;
@@ -89,9 +94,6 @@ private:
 
     KUrl m_currentUrl;
     int m_progress;
-
-    CompletionWidget *m_box;
-    KUrl m_suggestedUrl;
 };
 
 #endif