summaryrefslogtreecommitdiff
path: root/src/urlbar/urlbar.cpp
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2009-12-14 00:07:05 +0100
committerAndrea Diamantini <adjam7@gmail.com>2009-12-14 00:07:05 +0100
commitff8ea24c948a3f3a8e8f1652f3a6a95fc57275a8 (patch)
tree79e22a2643048aa6d928e81d8ba7d84c295864e0 /src/urlbar/urlbar.cpp
parentJust some stupid fixes (diff)
downloadrekonq-ff8ea24c948a3f3a8e8f1652f3a6a95fc57275a8.tar.xz
Moved url storing operation (add to history) in the loadUrl function,
after uri filters. This way we stored everytime the "real" url we load :)
Diffstat (limited to 'src/urlbar/urlbar.cpp')
-rw-r--r--src/urlbar/urlbar.cpp13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index e9952c01..be19dae4 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -33,10 +33,10 @@
// Local Includes
#include "application.h"
-#include "historymodels.h"
#include "lineedit.h"
#include "mainwindow.h"
#include "webview.h"
+#include "historymanager.h"
// KDE Includes
#include <KDebug>
@@ -44,9 +44,10 @@
#include <KUrl>
// Qt Includes
-#include <QtGui/QPainter>
-#include <QtGui/QPaintEvent>
-#include <QtGui/QPalette>
+#include <QPainter>
+#include <QPaintEvent>
+#include <QPalette>
+#include <QTimer>
QColor UrlBar::s_defaultBaseColor;
@@ -203,9 +204,6 @@ void UrlBar::activated(const QString& urlString)
return;
setUrl(urlString);
-
- Application::historyManager()->addHistoryEntry(urlString);
-
emit activated(m_currentUrl);
}
@@ -214,7 +212,6 @@ void UrlBar::cleared()
{
// clear the history on user's request from context menu
clear();
- Application::historyManager()->clear();
}