diff options
| author | adjam <adjam@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-05-07 09:45:30 +0000 |
|---|---|---|
| committer | adjam <adjam@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-05-07 09:45:30 +0000 |
| commit | f8d79895735973381665d7cf5012b2ea41efa400 (patch) | |
| tree | cc490c88a63b957ce8d6592c9888e3222c29fc45 /src/urlbar.cpp | |
| parent | EBN Krazy fixes. 2nd round.. (diff) | |
| parent | Improved contextual menu usability (diff) | |
| download | rekonq-f8d79895735973381665d7cf5012b2ea41efa400.tar.xz | |
Fixing MERGING issues..
git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/playground/network/rekonq@964690 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/urlbar.cpp')
| -rw-r--r-- | src/urlbar.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/urlbar.cpp b/src/urlbar.cpp index 29eaed70..e2756aa6 100644 --- a/src/urlbar.cpp +++ b/src/urlbar.cpp @@ -24,15 +24,6 @@ #include "urlbar.h" #include "urlbar.moc" -// Qt Includes -#include <QtCore> -#include <QtGui> - -// KDE Includes -#include <KDebug> -#include <KCompletionBox> -#include <KUrl> - // Local Includes #include "application.h" #include "history.h" @@ -40,6 +31,16 @@ #include "mainwindow.h" #include "webview.h" +// KDE Includes +#include <KDebug> +#include <KCompletionBox> +#include <KUrl> + +// Qt Includes +#include <QtGui/QPainter> +#include <QtGui/QPaintEvent> +#include <QtGui/QPalette> + QColor UrlBar::s_defaultBaseColor; |