diff options
Diffstat (limited to 'src/urlbar')
-rw-r--r-- | src/urlbar/completionwidget.h | 3 | ||||
-rw-r--r-- | src/urlbar/listitem.cpp | 3 | ||||
-rw-r--r-- | src/urlbar/listitem.h | 3 | ||||
-rw-r--r-- | src/urlbar/rsswidget.cpp | 1 | ||||
-rw-r--r-- | src/urlbar/rsswidget.h | 3 | ||||
-rw-r--r-- | src/urlbar/urlbar.cpp | 7 | ||||
-rw-r--r-- | src/urlbar/urlbar.h | 10 | ||||
-rw-r--r-- | src/urlbar/urlresolver.h | 4 |
8 files changed, 22 insertions, 12 deletions
diff --git a/src/urlbar/completionwidget.h b/src/urlbar/completionwidget.h index bb840c40..8382742a 100644 --- a/src/urlbar/completionwidget.h +++ b/src/urlbar/completionwidget.h @@ -28,6 +28,9 @@ #define COMPLETION_WIDGET_H +// Rekonq Includes +#include "rekonq_defines.h" + // Local Includes #include "application.h" #include "listitem.h" diff --git a/src/urlbar/listitem.cpp b/src/urlbar/listitem.cpp index d6d9e044..64baa836 100644 --- a/src/urlbar/listitem.cpp +++ b/src/urlbar/listitem.cpp @@ -55,9 +55,6 @@ #include <QWebSettings> #include <QFile> -// Defines -#define QL1S(x) QLatin1String(x) - ListItem::ListItem(const UrlSearchItem &item, QWidget *parent) : QWidget(parent) diff --git a/src/urlbar/listitem.h b/src/urlbar/listitem.h index 7dc1af39..25d651d3 100644 --- a/src/urlbar/listitem.h +++ b/src/urlbar/listitem.h @@ -28,6 +28,9 @@ #define LISTITEM_H +// Rekonq Includes +#include "rekonq_defines.h" + // Local Includes #include "urlresolver.h" diff --git a/src/urlbar/rsswidget.cpp b/src/urlbar/rsswidget.cpp index 5914b8c1..849ba3a8 100644 --- a/src/urlbar/rsswidget.cpp +++ b/src/urlbar/rsswidget.cpp @@ -33,6 +33,7 @@ #include <QDBusInterface> #include <QDBusConnectionInterface> #include <QLabel> +#include <QPushButton> // KDE Includes #include <KLocalizedString> diff --git a/src/urlbar/rsswidget.h b/src/urlbar/rsswidget.h index 253c20f2..ad1f051e 100644 --- a/src/urlbar/rsswidget.h +++ b/src/urlbar/rsswidget.h @@ -20,6 +20,9 @@ #ifndef RSSWIDGET_H #define RSSWIDGET_H +// Rekonq Includes +#include "rekonq_defines.h" + // Qt Includes #include <QFrame> #include <KUrl> diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp index 34cbb9aa..d8f9e9bd 100644 --- a/src/urlbar/urlbar.cpp +++ b/src/urlbar/urlbar.cpp @@ -51,9 +51,6 @@ #include <QTimer> #include <QVBoxLayout> -// Defines -#define QL1S(x) QLatin1String(x) - IconButton::IconButton(QWidget *parent) : QToolButton(parent) @@ -279,7 +276,7 @@ void UrlBar::loadFinished() if (ReKonfig::kgetList()) { IconButton *bt = addRightIcon(UrlBar::KGet); - connect(bt, SIGNAL(clicked(QPoint)), _tab->page(), SLOT(downloadAllContentsWithKGet())); + connect(bt, SIGNAL(clicked(QPoint)), _tab->page(), SLOT(downloadAllContentsWithKGet(QPoint))); } // show RSS @@ -293,7 +290,7 @@ void UrlBar::loadFinished() if (_tab->url().scheme() == QL1S("https")) { IconButton *bt = addRightIcon(UrlBar::SSL); - connect(bt, SIGNAL(clicked(QPoint)), _tab->page(), SLOT(showSSLInfo())); + connect(bt, SIGNAL(clicked(QPoint)), _tab->page(), SLOT(showSSLInfo(QPoint))); } update(); diff --git a/src/urlbar/urlbar.h b/src/urlbar/urlbar.h index 2c1e7f23..b644f84f 100644 --- a/src/urlbar/urlbar.h +++ b/src/urlbar/urlbar.h @@ -30,10 +30,8 @@ #ifndef URLBAR_H #define URLBAR_H - -// Local Includes -#include "rekonqprivate_export.h" -#include "application.h" +// Rekonq Includes +#include "rekonq_defines.h" // KDE Includes #include <KUrl> @@ -53,12 +51,16 @@ class WebTab; class IconButton : public QToolButton { Q_OBJECT + public: IconButton(QWidget *parent = 0); + signals: void clicked(QPoint); + protected: void mouseReleaseEvent(QMouseEvent *event); + }; diff --git a/src/urlbar/urlresolver.h b/src/urlbar/urlresolver.h index 482f8809..c16fd09b 100644 --- a/src/urlbar/urlresolver.h +++ b/src/urlbar/urlresolver.h @@ -27,6 +27,10 @@ #ifndef URL_RESOLVER_H #define URL_RESOLVER_H + +// Rekonq Includes +#include "rekonq_defines.h" + // KDE Includes #include <KUrl> |