summaryrefslogtreecommitdiff
path: root/src/urlbar
diff options
context:
space:
mode:
Diffstat (limited to 'src/urlbar')
-rw-r--r--src/urlbar/completionwidget.h4
-rw-r--r--src/urlbar/listitem.cpp4
-rw-r--r--src/urlbar/listitem.h14
-rw-r--r--src/urlbar/rsswidget.cpp2
-rw-r--r--src/urlbar/rsswidget.h2
-rw-r--r--src/urlbar/stackedurlbar.h2
-rw-r--r--src/urlbar/webshortcutwidget.h4
7 files changed, 16 insertions, 16 deletions
diff --git a/src/urlbar/completionwidget.h b/src/urlbar/completionwidget.h
index cd3e9549..517a7ea6 100644
--- a/src/urlbar/completionwidget.h
+++ b/src/urlbar/completionwidget.h
@@ -53,12 +53,12 @@ public:
void suggestUrls(const QString &text);
-private slots:
+private Q_SLOTS:
void itemChosen(ListItem *item, Qt::MouseButton = Qt::LeftButton, Qt::KeyboardModifiers = Qt::NoModifier);
void updateSearchList(const UrlSearchList &list, const QString& text);
void updateList();
-signals:
+Q_SIGNALS:
void chosenUrl(const KUrl &, Rekonq::OpenType);
void nextItemSubChoice();
diff --git a/src/urlbar/listitem.cpp b/src/urlbar/listitem.cpp
index a8561ca3..0be4b761 100644
--- a/src/urlbar/listitem.cpp
+++ b/src/urlbar/listitem.cpp
@@ -217,7 +217,7 @@ static QString highlightWordsInText(const QString &text, const QStringList &word
{
QString ret = text;
QBitArray boldSections(ret.size());
- foreach(const QString & wordToPointOut, words)
+ Q_FOREACH(const QString & wordToPointOut, words)
{
int index = ret.indexOf(wordToPointOut, 0, Qt::CaseInsensitive);
while (index > -1)
@@ -475,7 +475,7 @@ EngineBar::EngineBar(KService::Ptr selectedEngine, QWidget *parent)
if (SearchEngine::defaultEngine().isNull())
return;
m_engineGroup->addAction(newEngineAction(SearchEngine::defaultEngine(), selectedEngine));
- foreach(const KService::Ptr & engine, SearchEngine::favorites())
+ Q_FOREACH(const KService::Ptr & engine, SearchEngine::favorites())
{
if (engine->desktopEntryName() != SearchEngine::defaultEngine()->desktopEntryName())
{
diff --git a/src/urlbar/listitem.h b/src/urlbar/listitem.h
index af0c58e2..1768438a 100644
--- a/src/urlbar/listitem.h
+++ b/src/urlbar/listitem.h
@@ -64,10 +64,10 @@ public:
KUrl url();
virtual QString text();
-public slots:
+public Q_SLOTS:
virtual void nextItemSubChoice();
-signals:
+Q_SIGNALS:
void itemClicked(ListItem *item, Qt::MouseButton, Qt::KeyboardModifiers);
void updateList();
@@ -150,10 +150,10 @@ public:
explicit EngineBar(KService::Ptr selectedEngine, QWidget *parent = 0);
void selectNextEngine();
-signals:
+Q_SIGNALS:
void searchEngineChanged(KService::Ptr engine);
-private slots:
+private Q_SLOTS:
void changeSearchEngine();
private:
@@ -173,10 +173,10 @@ public:
explicit SearchListItem(const UrlSearchItem &item, const QString &text, QWidget *parent = 0);
QString text();
-public slots:
+public Q_SLOTS:
virtual void nextItemSubChoice();
-private slots:
+private Q_SLOTS:
void changeSearchEngine(KService::Ptr engine);
private:
@@ -257,7 +257,7 @@ private:
QString m_url;
QByteArray m_data;
-private slots:
+private Q_SLOTS:
void slotData(KIO::Job* job, const QByteArray& data);
void slotResult(KJob* job);
};
diff --git a/src/urlbar/rsswidget.cpp b/src/urlbar/rsswidget.cpp
index ee5ea29f..d4778cf5 100644
--- a/src/urlbar/rsswidget.cpp
+++ b/src/urlbar/rsswidget.cpp
@@ -87,7 +87,7 @@ RSSWidget::RSSWidget(const QMap< KUrl, QString > &map, QWidget *parent)
m_feeds = new KComboBox(this);
m_feeds->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
- foreach(const QString & title, m_map)
+ Q_FOREACH(const QString & title, m_map)
{
m_feeds->addItem(title);
}
diff --git a/src/urlbar/rsswidget.h b/src/urlbar/rsswidget.h
index 904f8ad2..702ea3ae 100644
--- a/src/urlbar/rsswidget.h
+++ b/src/urlbar/rsswidget.h
@@ -45,7 +45,7 @@ public:
void showAt(const QPoint &pos);
-private slots:
+private Q_SLOTS:
void accept();
private:
diff --git a/src/urlbar/stackedurlbar.h b/src/urlbar/stackedurlbar.h
index b0583df1..7296a2f8 100644
--- a/src/urlbar/stackedurlbar.h
+++ b/src/urlbar/stackedurlbar.h
@@ -48,7 +48,7 @@ public:
UrlBar *currentUrlBar();
UrlBar *urlBar(int index);
-private slots:
+private Q_SLOTS:
void moveBar(int, int);
};
diff --git a/src/urlbar/webshortcutwidget.h b/src/urlbar/webshortcutwidget.h
index bdbc9ca6..bc072f47 100644
--- a/src/urlbar/webshortcutwidget.h
+++ b/src/urlbar/webshortcutwidget.h
@@ -44,11 +44,11 @@ public:
void show(const KUrl &url, const QString &openSearchName, const QPoint &pos);
-private slots:
+private Q_SLOTS:
void accept();
void shortcutsChanged(const QString& newShorthands);
-signals:
+Q_SIGNALS:
void webShortcutSet(const KUrl &url, const QString &openSearchName, const QString &webShortcut);
private: