From b44a0fd574329a54a8377b5fe9e58748f846611f Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Thu, 1 Apr 2010 15:38:45 +0200
Subject: Cleaning awesome bar code a bit.. - update is better than repaint
 (this also probably solves the flickering results update) - right scope for
 some methods - removed KUrl use from there

---
 src/urlbar/completionwidget.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'src/urlbar/completionwidget.cpp')

diff --git a/src/urlbar/completionwidget.cpp b/src/urlbar/completionwidget.cpp
index 3a54f890..27fcfbad 100644
--- a/src/urlbar/completionwidget.cpp
+++ b/src/urlbar/completionwidget.cpp
@@ -28,6 +28,9 @@
 #include "completionwidget.h"
 #include "completionwidget.moc"
 
+// Local Includes
+#include "application.h"
+
 // KDE Includes
 #include <KGlobalSettings>
 #include <KDebug>
@@ -41,16 +44,17 @@
 #include <QEvent>
 #include <QKeyEvent>
 
+// Defines
 #define MAX_ELEMENTS 9
-#include "application.h"
+
 
 CompletionWidget::CompletionWidget( QWidget *parent)
-:QFrame( parent, Qt::ToolTip)
+    :QFrame( parent, Qt::ToolTip)
     , _parent(parent)
     , _currentIndex(-1)
 {
     QPalette p(palette());
-    p.setColor(QPalette::Background, Qt::white); //todo: choose the correct color
+    p.setColor(QPalette::Background, Qt::white); // TODO: choose the correct color
     setPalette(p);
     setFrameStyle(QFrame::Panel);
     setLayoutDirection(Qt::LeftToRight);
@@ -126,10 +130,6 @@ void CompletionWidget::up()
     widget->activate();
 }
 
-KUrl CompletionWidget::currentUrl()
-{
-    return _list.at(_currentIndex).url;
-}
 
 void CompletionWidget::down()
 {
@@ -150,6 +150,7 @@ void CompletionWidget::down()
     widget->activate();
 }
 
+
 void CompletionWidget::clear()
 {
     QLayoutItem *child;
@@ -216,7 +217,7 @@ bool CompletionWidget::eventFilter( QObject *o, QEvent *e )
                 case Qt::Key_Enter:
                 case Qt::Key_Return:
                         hide();
-                        emit chosenUrl(currentUrl().url(), Rekonq::CurrentTab);
+                        emit chosenUrl(_list.at(_currentIndex).url, Rekonq::CurrentTab);
                         ev->accept();
                         return true;
                     break;
-- 
cgit v1.2.1