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.h | |
| 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.h')
| -rw-r--r-- | src/urlbar.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/urlbar.h b/src/urlbar.h index 236792bd..d8fb9029 100644 --- a/src/urlbar.h +++ b/src/urlbar.h @@ -23,18 +23,18 @@ #ifndef URLBAR_H #define URLBAR_H -// Qt Includes -#include <QIcon> -#include <QPointer> -#include <QUrl> + +// Local Includes +#include "lineedit.h" // KDE Includes #include <KUrl> #include <KHistoryComboBox> -// Local Includes -#include "lineedit.h" - +// Qt Includes +#include <QIcon> +#include <QPointer> +#include <QUrl> // Forward Declarations class QLinearGradient; |