Unifies macro style

REVIEW: 103242
REVIEWED-BY: adjam

58 files changed, 120 insertions, 120 deletions

diff --git a/src/adblock/adblockmanager.cpp b/src/adblock/adblockmanager.cpp
index b18547ad..0f91c02f 100644
--- a/src/adblock/adblockmanager.cpp
+++ b/src/adblock/adblockmanager.cpp
@@ -108,7 +108,7 @@ void AdBlockManager::loadSettings(bool checkUpdateDate)
 
     // else
     QStringList titles = ReKonfig::subscriptionTitles();
-    foreach(const QString & title, titles)
+    Q_FOREACH(const QString & title, titles)
     {
         rules = rulesGroup.readEntry(title + "-rules" , QStringList());
         loadRules(rules);
@@ -118,7 +118,7 @@ void AdBlockManager::loadSettings(bool checkUpdateDate)
 
 void AdBlockManager::loadRules(const QStringList &rules)
 {
-    foreach(const QString & stringRule, rules)
+    Q_FOREACH(const QString & stringRule, rules)
     {
         // ! rules are comments
         if (stringRule.startsWith('!'))
@@ -187,7 +187,7 @@ QNetworkReply *AdBlockManager::block(const QNetworkRequest &request, WebPage *pa
         return 0;
     }
 
-    foreach(const AdBlockRule & filter, _whiteList)
+    Q_FOREACH(const AdBlockRule & filter, _whiteList)
     {
         if (filter.match(request, urlString, urlStringLowerCase))
         {
@@ -208,7 +208,7 @@ QNetworkReply *AdBlockManager::block(const QNetworkRequest &request, WebPage *pa
     if (!page)
         return 0;
 
-    foreach(const AdBlockRule & filter, _blackList)
+    Q_FOREACH(const AdBlockRule & filter, _blackList)
     {
         if (filter.match(request, urlString, urlStringLowerCase))
         {
@@ -216,7 +216,7 @@ QNetworkReply *AdBlockManager::block(const QNetworkRequest &request, WebPage *pa
 
             QWebElement document = page->mainFrame()->documentElement();
             QWebElementCollection elements = document.findAll("*");
-            foreach(QWebElement el, elements)
+            Q_FOREACH(QWebElement el, elements)
             {
                 const QString srcAttribute = el.attribute("src");
                 if (filter.match(request, srcAttribute, srcAttribute.toLower()))
@@ -251,11 +251,11 @@ void AdBlockManager::applyHidingRules(WebPage *page)
     QWebElement document = page->mainFrame()->documentElement();
 
     // HIDE RULES
-    foreach(const QString & filter, _hideList)
+    Q_FOREACH(const QString & filter, _hideList)
     {
         QWebElementCollection elements = document.findAll(filter);
 
-        foreach(QWebElement el, elements)
+        Q_FOREACH(QWebElement el, elements)
         {
             if (el.isNull())
                 continue;
@@ -301,7 +301,7 @@ void AdBlockManager::slotResult(KJob *job)
 
     QList<QByteArray> list = _buffer.split('\n');
     QStringList ruleList;
-    foreach(const QByteArray & ba, list)
+    Q_FOREACH(const QByteArray & ba, list)
     {
         ruleList << QString(ba);
     }
@@ -331,7 +331,7 @@ void AdBlockManager::subscriptionData(KIO::Job* job, const QByteArray& data)
 void AdBlockManager::saveRules(const QStringList &rules)
 {
     QStringList cleanedRules;
-    foreach(const QString & r, rules)
+    Q_FOREACH(const QString & r, rules)
     {
         if (!r.startsWith('!') && !r.startsWith('[') && !r.isEmpty())
             cleanedRules << r;
diff --git a/src/adblock/adblockmanager.h b/src/adblock/adblockmanager.h
index 216764eb..f220082a 100644
--- a/src/adblock/adblockmanager.h
+++ b/src/adblock/adblockmanager.h
@@ -157,7 +157,7 @@ public:
     void applyHidingRules(WebPage *page);
     void addSubscription(const QString &title, const QString &location);
 
-public slots:
+public Q_SLOTS:
     void loadSettings(bool checkUpdateDate = true);
     void showSettings();
 
@@ -166,7 +166,7 @@ private:
     void saveRules(const QStringList &);
     void loadRules(const QStringList &);
 
-private slots:
+private Q_SLOTS:
     void slotResult(KJob *);
     void subscriptionData(KIO::Job*, const QByteArray&);
 
diff --git a/src/adblock/adblocknetworkreply.h b/src/adblock/adblocknetworkreply.h
index 9b5c48da..f85868b8 100644
--- a/src/adblock/adblocknetworkreply.h
+++ b/src/adblock/adblocknetworkreply.h
@@ -3,7 +3,7 @@
  * This file is a part of the rekonq project
  *
  * Copyright (c) 2009 by Benjamin C. Meyer <ben@meyerhome.net>
- * Copyright (C) 2010 by Andrea Diamantini <adjam7 at gmail dot com>
+ * Copyright (C) 2010-2011 by Andrea Diamantini <adjam7 at gmail dot com>
  *
  *
  * This program is free software; you can redistribute it and/or
@@ -50,7 +50,7 @@ public:
 protected:
     qint64 readData(char *data, qint64 maxSize);
 
-private slots:
+private Q_SLOTS:
     void delayedFinished();
 
 };
diff --git a/src/adblock/adblockrulefallbackimpl.cpp b/src/adblock/adblockrulefallbackimpl.cpp
index 36aabc30..27fc4345 100644
--- a/src/adblock/adblockrulefallbackimpl.cpp
+++ b/src/adblock/adblockrulefallbackimpl.cpp
@@ -64,14 +64,14 @@ AdBlockRuleFallbackImpl::AdBlockRuleFallbackImpl(const QString &filter)
         if (options.contains(QL1S("third-party")))
             m_thirdPartyOption = true;
 
-        foreach(const QString & option, options)
+        Q_FOREACH(const QString & option, options)
         {
             // Domain restricted filter
             const QString domainKeyword(QL1S("domain="));
             if (option.startsWith(domainKeyword))
             {
                 QStringList domainList = option.mid(domainKeyword.length()).split(QL1C('|'));
-                foreach(const QString & domain, domainList)
+                Q_FOREACH(const QString & domain, domainList)
                 {
                     if (domain.startsWith(QL1C('~')))
                         m_whiteDomains.insert(domain.toLower());
diff --git a/src/adblock/adblockwidget.cpp b/src/adblock/adblockwidget.cpp
index a5153f98..c5f09d5a 100644
--- a/src/adblock/adblockwidget.cpp
+++ b/src/adblock/adblockwidget.cpp
@@ -123,7 +123,7 @@ void AdBlockWidget::load()
     const QStringList subscriptions = ReKonfig::subscriptionTitles();
 
     // load automatic rules
-    foreach(const QString & sub, subscriptions)
+    Q_FOREACH(const QString & sub, subscriptions)
     {
         QTreeWidgetItem *subItem = new QTreeWidgetItem(treeWidget);
         subItem->setText(0, sub);
@@ -134,7 +134,7 @@ void AdBlockWidget::load()
     KSharedConfig::Ptr config = KSharedConfig::openConfig("adblock", KConfig::SimpleConfig, "appdata");
     KConfigGroup localGroup(config, "rules");
     const QStringList rules = localGroup.readEntry("local-rules" , QStringList());
-    foreach(const QString & rule, rules)
+    Q_FOREACH(const QString & rule, rules)
     {
         listWidget->addItem(rule);
     }
@@ -149,7 +149,7 @@ void AdBlockWidget::loadRules(QTreeWidgetItem *item)
     QString str = item->text(0) + "-rules";
     QStringList rules = localGroup.readEntry(str , QStringList());
 
-    foreach(const QString & rule, rules)
+    Q_FOREACH(const QString & rule, rules)
     {
         QTreeWidgetItem *subItem = new QTreeWidgetItem(item);
         subItem->setText(0, rule);
diff --git a/src/adblock/adblockwidget.h b/src/adblock/adblockwidget.h
index daaf499e..aff8a007 100644
--- a/src/adblock/adblockwidget.h
+++ b/src/adblock/adblockwidget.h
@@ -45,13 +45,13 @@ public:
 
     bool changed();
 
-signals:
+Q_SIGNALS:
     void changed(bool);
 
-public slots:
+public Q_SLOTS:
     void save();
 
-private slots:
+private Q_SLOTS:
     void hasChanged();
 
     void slotInfoLinkActivated(const QString &);
diff --git a/src/analyzer/analyzerpanel.h b/src/analyzer/analyzerpanel.h
index bf1220e7..5dc98d15 100644
--- a/src/analyzer/analyzerpanel.h
+++ b/src/analyzer/analyzerpanel.h
@@ -52,7 +52,7 @@ class REKONQ_TESTS_EXPORT NetworkAnalyzerPanel : public QDockWidget
 public:
     NetworkAnalyzerPanel(const QString &title, QWidget *parent);
 
-public slots:
+public Q_SLOTS:
     void toggle(bool enable);
     void changeCurrentPage();
 
diff --git a/src/analyzer/networkanalyzer.cpp b/src/analyzer/networkanalyzer.cpp
index 12c048ae..0cfae040 100644
--- a/src/analyzer/networkanalyzer.cpp
+++ b/src/analyzer/networkanalyzer.cpp
@@ -166,7 +166,7 @@ void NetworkAnalyzer::requestFinished(QObject *replyObject)
 
     // Record the reply headers
     QList<QByteArray> headerValues;
-    foreach(const QByteArray & header, reply->rawHeaderList())
+    Q_FOREACH(const QByteArray & header, reply->rawHeaderList())
     {
         headerValues += reply->rawHeader(header);
     }
@@ -203,7 +203,7 @@ void NetworkAnalyzer::showItemDetails(QTreeWidgetItem *item)
     QNetworkRequest req = _itemRequestMap[item];
     details += i18n("<h3>Request Details</h3>");
     details += QL1S("<ul>");
-    foreach(const QByteArray & header, req.rawHeaderList())
+    Q_FOREACH(const QByteArray & header, req.rawHeaderList())
     {
         details += QL1S("<li>");
         details += QL1S(header);
diff --git a/src/analyzer/networkanalyzer.h b/src/analyzer/networkanalyzer.h
index ec9d33e0..7b9e17da 100644
--- a/src/analyzer/networkanalyzer.h
+++ b/src/analyzer/networkanalyzer.h
@@ -57,7 +57,7 @@ class NetworkAnalyzer : public QWidget
 public:
     NetworkAnalyzer(QWidget *parent = 0);
 
-private slots:
+private Q_SLOTS:
     void addRequest(QNetworkAccessManager::Operation op, const QNetworkRequest &req, QNetworkReply *reply);
 
     void clear();
diff --git a/src/application.h b/src/application.h
index 02b3009b..27b46e92 100644
--- a/src/application.h
+++ b/src/application.h
@@ -102,7 +102,7 @@ public:
         return _privateBrowsingAction;
     };
 
-public slots:
+public Q_SLOTS:
     /**
      * Save application's configuration
      *
@@ -121,7 +121,7 @@ protected:
     // This is used to track which window was activated most recently
     bool eventFilter(QObject *watched, QEvent *event);
 
-private slots:
+private Q_SLOTS:
     void loadResolvedUrl(ThreadWeaver::Job *);
 
     void updateConfiguration();
diff --git a/src/bookmarks/bookmarkprovider.cpp b/src/bookmarks/bookmarkprovider.cpp
index 9b4be96f..ca705715 100644
--- a/src/bookmarks/bookmarkprovider.cpp
+++ b/src/bookmarks/bookmarkprovider.cpp
@@ -179,7 +179,7 @@ KBookmark BookmarkProvider::bookmarkForUrl(const KUrl &url)
 
 void BookmarkProvider::slotBookmarksChanged()
 {
-    foreach(BookmarkToolBar * bookmarkToolBar, m_bookmarkToolBars)
+    Q_FOREACH(BookmarkToolBar * bookmarkToolBar, m_bookmarkToolBars)
     {
         if (bookmarkToolBar)
         {
@@ -231,7 +231,7 @@ void BookmarkProvider::fillBookmarkBar(BookmarkToolBar *toolBar)
 
 void BookmarkProvider::slotPanelChanged()
 {
-    foreach(BookmarksPanel * panel, m_bookmarkPanels)
+    Q_FOREACH(BookmarksPanel * panel, m_bookmarkPanels)
     {
         if (panel && panel != sender())
             panel->loadFoldedState();
@@ -253,7 +253,7 @@ void BookmarkProvider::find(QList<KBookmark> *list, const KBookmark &bookmark, c
     {
         QStringList words = text.split(' ');
         bool matches = true;
-        foreach(const QString & word, words)
+        Q_FOREACH(const QString & word, words)
         {
             if (!bookmark.url().url().contains(word, Qt::CaseInsensitive)
                     && !bookmark.fullText().contains(word, Qt::CaseInsensitive))
diff --git a/src/bookmarks/bookmarkstoolbar.h b/src/bookmarks/bookmarkstoolbar.h
index 3eaa1e87..5cc28305 100644
--- a/src/bookmarks/bookmarkstoolbar.h
+++ b/src/bookmarks/bookmarkstoolbar.h
@@ -59,7 +59,7 @@ protected:
     virtual void refill();
     virtual QAction* actionForBookmark(const KBookmark &bookmark);
 
-private slots:
+private Q_SLOTS:
     void actionHovered();
 
 private:
@@ -92,7 +92,7 @@ public:
 protected:
     bool eventFilter(QObject *watched, QEvent *event);
 
-private slots:
+private Q_SLOTS:
     void contextMenu(const QPoint &);
     void actionHovered();
     void menuDisplayed();
diff --git a/src/bookmarks/bookmarkstreemodel.cpp b/src/bookmarks/bookmarkstreemodel.cpp
index 42cd7b28..8e6104a4 100644
--- a/src/bookmarks/bookmarkstreemodel.cpp
+++ b/src/bookmarks/bookmarkstreemodel.cpp
@@ -344,7 +344,7 @@ void BookmarksTreeModel::bookmarksChanged(const QString &groupAddress)
         QStringList indexChain(groupAddress.split('/', QString::SkipEmptyParts));
         bool ok;
         int i;
-        foreach(const QString & sIndex, indexChain)
+        Q_FOREACH(const QString & sIndex, indexChain)
         {
             i = sIndex.toInt(&ok);
             if (!ok)
diff --git a/src/clicktoflash.cpp b/src/clicktoflash.cpp
index a1b0c5bb..94ae40ae 100644
--- a/src/clicktoflash.cpp
+++ b/src/clicktoflash.cpp
@@ -3,7 +3,7 @@
 * This file is a part of the rekonq project
 *
 * Copyright (C) 2009 by Benjamin C. Meyer <ben@meyerhome.net>
-* Copyright (C) 2010 by Matthieu Gicquel <matgic78@gmail.com>
+* Copyright (C) 2010-2011 by Matthieu Gicquel <matgic78@gmail.com>
 *
 *
 * This program is free software; you can redistribute it and/or
@@ -88,7 +88,7 @@ void ClickToFlash::load()
         elements.append(docElement.findAll(selector.arg(QL1S("object"))));
         elements.append(docElement.findAll(selector.arg(QL1S("embed"))));
 
-        foreach(QWebElement element, elements)
+        Q_FOREACH(QWebElement element, elements)
         {
             if (checkElement(element))
             {
diff --git a/src/clicktoflash.h b/src/clicktoflash.h
index 49c866b5..d7648204 100644
--- a/src/clicktoflash.h
+++ b/src/clicktoflash.h
@@ -3,7 +3,7 @@
 * This file is a part of the rekonq project
 *
 * Copyright (C) 2009 by Benjamin C. Meyer <ben@meyerhome.net>
-* Copyright (C) 2010 by Matthieu Gicquel <matgic78@gmail.com>
+* Copyright (C) 2010-2011 by Matthieu Gicquel <matgic78@gmail.com>
 *
 *
 * This program is free software; you can redistribute it and/or
@@ -47,10 +47,10 @@ class REKONQ_TESTS_EXPORT ClickToFlash : public QWidget
 public:
     explicit ClickToFlash(const QUrl &pluginUrl, QWidget *parent = 0);
 
-signals:
+Q_SIGNALS:
     void signalLoadClickToFlash(bool);
 
-private slots:
+private Q_SLOTS:
     void load();
 
 private:
diff --git a/src/history/autosaver.h b/src/history/autosaver.h
index 70511d36..f165377c 100644
--- a/src/history/autosaver.h
+++ b/src/history/autosaver.h
@@ -56,10 +56,10 @@ public:
      */
     void saveIfNeccessary();
 
-signals:
+Q_SIGNALS:
     void saveNeeded();
 
-public slots:
+public Q_SLOTS:
     void changeOccurred();
 
 protected:
diff --git a/src/history/historymanager.cpp b/src/history/historymanager.cpp
index a5cd29e3..d9d6a93b 100644
--- a/src/history/historymanager.cpp
+++ b/src/history/historymanager.cpp
@@ -255,7 +255,7 @@ QList<HistoryItem> HistoryManager::find(const QString &text)
 
         QStringList words = text.split(' ');
         bool matches = true;
-        foreach(const QString & word, words)
+        Q_FOREACH(const QString & word, words)
         {
             if (!url.contains(word, Qt::CaseInsensitive)
                     && !item.title.contains(word, Qt::CaseInsensitive))
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index ff500b4a..9ba7ee79 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1295,7 +1295,7 @@ void MainWindow::clearPrivateData()
             path.remove("rekonq");
             QDir cacheDir(path);
             QStringList fileList = cacheDir.entryList();
-            foreach(const QString & str, fileList)
+            Q_FOREACH(const QString & str, fileList)
             {
                 QFile file(path + str);
                 file.remove();
diff --git a/src/networkaccessmanager.h b/src/networkaccessmanager.h
index 49d12516..216e0f3d 100644
--- a/src/networkaccessmanager.h
+++ b/src/networkaccessmanager.h
@@ -46,7 +46,7 @@ public:
 protected:
     virtual QNetworkReply *createRequest(QNetworkAccessManager::Operation op, const QNetworkRequest &request, QIODevice *outgoingData = 0);
 
-signals:
+Q_SIGNALS:
     void networkData(QNetworkAccessManager::Operation op, const QNetworkRequest &request, QNetworkReply *reply);
 
 private:
diff --git a/src/newtabpage.cpp b/src/newtabpage.cpp
index 271ad4bb..4929c9be 100644
--- a/src/newtabpage.cpp
+++ b/src/newtabpage.cpp
@@ -382,7 +382,7 @@ void NewTabPage::browsingMenu(const KUrl &currentUrl)
                                    QL1S("download"),
                                    KIconLoader::Toolbar));
 
-    foreach(QWebElement it, navItems)
+    Q_FOREACH(QWebElement it, navItems)
     {
         const QString aTagString(QL1C('a'));
         const QString hrefAttributeString(QL1S("href"));
@@ -584,7 +584,7 @@ void NewTabPage::downloadsPage()
         return;
     }
 
-    foreach(DownloadItem * item, list)
+    Q_FOREACH(DownloadItem * item, list)
     {
         m_root.prependInside(markup(QL1S("div")));
 
diff --git a/src/paneltreeview.h b/src/paneltreeview.h
index 3198aeea..ba499e14 100644
--- a/src/paneltreeview.h
+++ b/src/paneltreeview.h
@@ -2,7 +2,7 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2010 by Yoann Laissus <yoann dot laissus at gmail dot com>
+* Copyright (C) 2010-2011 by Yoann Laissus <yoann dot laissus at gmail dot com>
 *
 *
 * This program is free software; you can redistribute it and/or
@@ -44,7 +44,7 @@ class REKONQ_TESTS_EXPORT PanelTreeView : public QTreeView
 public:
     PanelTreeView(QWidget *parent = 0);
 
-signals:
+Q_SIGNALS:
     void openUrl(const KUrl &, const Rekonq::OpenType & = Rekonq::CurrentTab);
     void itemHovered(const QString &);
     void delKeyPressed();
@@ -52,7 +52,7 @@ signals:
     void contextMenuGroupRequested(const QPoint &pos);
     void contextMenuEmptyRequested(const QPoint &pos);
 
-public slots:
+public Q_SLOTS:
     void copyToClipboard();
     void openInCurrentTab();
     void openInNewTab();
diff --git a/src/protocolhandler.h b/src/protocolhandler.h
index a7041d33..a4ee61e4 100644
--- a/src/protocolhandler.h
+++ b/src/protocolhandler.h
@@ -65,10 +65,10 @@ public:
      */
     bool postHandling(const QNetworkRequest &request, QWebFrame *frame);
 
-signals:
+Q_SIGNALS:
     void downloadUrl(const KUrl &);
 
-private slots:
+private Q_SLOTS:
     void showResults(const KFileItemList &);
     void slotMostLocalUrlResult(KJob *);
 
diff --git a/src/settings/adblockwidget.cpp b/src/settings/adblockwidget.cpp
index 3c7ec38f..17f05e75 100644
--- a/src/settings/adblockwidget.cpp
+++ b/src/settings/adblockwidget.cpp
@@ -123,7 +123,7 @@ void AdBlockWidget::load()
     QStringList subscriptions = ReKonfig::subscriptionTitles();
 
     // load automatic rules
-    foreach(const QString & sub, subscriptions)
+    Q_FOREACH(const QString & sub, subscriptions)
     {
         QTreeWidgetItem *subItem = new QTreeWidgetItem(treeWidget);
         subItem->setText(0, sub);
@@ -134,7 +134,7 @@ void AdBlockWidget::load()
     KSharedConfig::Ptr config = KSharedConfig::openConfig("adblock", KConfig::SimpleConfig, "appdata");
     KConfigGroup localGroup(config, "rules");
     QStringList rules = localGroup.readEntry("local-rules" , QStringList());
-    foreach(const QString & rule, rules)
+    Q_FOREACH(const QString & rule, rules)
     {
         listWidget->addItem(rule);
     }
@@ -149,7 +149,7 @@ void AdBlockWidget::loadRules(QTreeWidgetItem *item)
     QString str = item->text(0) + "-rules";
     QStringList rules = localGroup.readEntry(str , QStringList());
 
-    foreach(const QString & rule, rules)
+    Q_FOREACH(const QString & rule, rules)
     {
         QTreeWidgetItem *subItem = new QTreeWidgetItem(item);
         subItem->setText(0, rule);
diff --git a/src/settings/generalwidget.h b/src/settings/generalwidget.h
index 6372dcc2..2dfbaf58 100644
--- a/src/settings/generalwidget.h
+++ b/src/settings/generalwidget.h
@@ -46,10 +46,10 @@ public:
     bool changed();
     void checkKGetPresence();
 
-signals:
+Q_SIGNALS:
     void changed(bool);
 
-private slots:
+private Q_SLOTS:
     void hasChanged();
     void setHomeToCurrentPage();
     void disableHomeSettings(bool);
diff --git a/src/settings/networkwidget.h b/src/settings/networkwidget.h
index eecb10eb..74a0e312 100644
--- a/src/settings/networkwidget.h
+++ b/src/settings/networkwidget.h
@@ -46,10 +46,10 @@ public:
     void save();
     bool changed();
 
-signals:
+Q_SIGNALS:
     void changed(bool);
 
-private slots:
+private Q_SLOTS:
     void hasChanged();
 
 private:
diff --git a/src/settings/settingsdialog.h b/src/settings/settingsdialog.h
index 486ce88c..98089990 100644
--- a/src/settings/settingsdialog.h
+++ b/src/settings/settingsdialog.h
@@ -56,7 +56,7 @@ protected:
 private:
     Private* const d;
 
-private slots:
+private Q_SLOTS:
     void readConfig();
     void saveSettings();
 };
diff --git a/src/settings/tabswidget.h b/src/settings/tabswidget.h
index 611863f3..056f030c 100644
--- a/src/settings/tabswidget.h
+++ b/src/settings/tabswidget.h
@@ -45,10 +45,10 @@ public:
     void save();
     bool changed();
 
-signals:
+Q_SIGNALS:
     void changed(bool);
 
-private slots:
+private Q_SLOTS:
     void hasChanged();
 
 private:
diff --git a/src/settings/webkitwidget.h b/src/settings/webkitwidget.h
index de584a11..8561d60a 100644
--- a/src/settings/webkitwidget.h
+++ b/src/settings/webkitwidget.h
@@ -45,10 +45,10 @@ public:
     void save();
     bool changed();
 
-signals:
+Q_SIGNALS:
     void changed(bool);
 
-private slots:
+private Q_SLOTS:
     void hasChanged();
     void updateJavascriptSettings(bool);
 
diff --git a/src/tabbar.h b/src/tabbar.h
index 1cb66592..78d48cdb 100644
--- a/src/tabbar.h
+++ b/src/tabbar.h
@@ -67,7 +67,7 @@ public:
     static const int baseWidthDivisor = 4;
     static const int minWidthDivisor = 8;
 
-signals:
+Q_SIGNALS:
     void cloneTab(int index);
     void closeTab(int index);
     void closeOtherTabs(int index);
@@ -91,7 +91,7 @@ protected:
     void dropEvent(QDropEvent *event);
     void dragEnterEvent(QDragEnterEvent *event);
 
-private slots:
+private Q_SLOTS:
     void cloneTab();
     void closeTab();
     void closeOtherTabs();
diff --git a/src/tests/findbar_test.cpp b/src/tests/findbar_test.cpp
index 6266c0d3..3efb2d7b 100644
--- a/src/tests/findbar_test.cpp
+++ b/src/tests/findbar_test.cpp
@@ -36,11 +36,11 @@ class FindBarTest : public QObject
 {
     Q_OBJECT
 
-public slots:
+public Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
-private slots:
+private Q_SLOTS:
     void matchCase();
     void notifyMatch();
 
diff --git a/src/tests/listitem_test.cpp b/src/tests/listitem_test.cpp
index 53918040..bfa22139 100644
--- a/src/tests/listitem_test.cpp
+++ b/src/tests/listitem_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 Pierre Rossi <pierre.rossi@gmail.com>
+ * Copyright 2010-2011 Pierre Rossi <pierre.rossi@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,11 +28,11 @@ class ListItemTest : public QObject
 {
     Q_OBJECT
 
-public slots:
+public Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
-private slots:
+private Q_SLOTS:
 
     void wordHighLighting_data();
     void wordHighLighting();
diff --git a/src/tests/mainview_test.cpp b/src/tests/mainview_test.cpp
index 750306c6..141490ea 100644
--- a/src/tests/mainview_test.cpp
+++ b/src/tests/mainview_test.cpp
@@ -36,11 +36,11 @@ class MainViewTest : public QObject
 {
     Q_OBJECT
 
-public slots:
+public Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
-private slots:
+private Q_SLOTS:
     void tabwidget_data();
     void tabwidget();
 
diff --git a/src/tests/mainwindow_test.cpp b/src/tests/mainwindow_test.cpp
index c67b0991..44dde8b6 100644
--- a/src/tests/mainwindow_test.cpp
+++ b/src/tests/mainwindow_test.cpp
@@ -38,11 +38,11 @@ class MainWindowTest : public QObject
 {
     Q_OBJECT
 
-public slots:
+public Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
-private slots:
+private Q_SLOTS:
 
 
 private:
diff --git a/src/tests/networkaccessmanager_test.cpp b/src/tests/networkaccessmanager_test.cpp
index ca8df515..ed6856f7 100644
--- a/src/tests/networkaccessmanager_test.cpp
+++ b/src/tests/networkaccessmanager_test.cpp
@@ -33,11 +33,11 @@ class NetworkAccessManagerTest : public QObject
 {
     Q_OBJECT
 
-public slots:
+public Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
-private slots:
+private Q_SLOTS:
 
 private:
     NetworkAccessManager *manager;
diff --git a/src/tests/protocolhandler_test.cpp b/src/tests/protocolhandler_test.cpp
index cc884e36..2e73a1d2 100644
--- a/src/tests/protocolhandler_test.cpp
+++ b/src/tests/protocolhandler_test.cpp
@@ -35,11 +35,11 @@ class ProtocolhandlerTest : public QObject
 {
     Q_OBJECT
 
-public slots:
+public Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
-private slots:
+private Q_SLOTS:
     void preHandling_data();
     void preHandling();
 
diff --git a/src/tests/sessionmanager_test.cpp b/src/tests/sessionmanager_test.cpp
index b4b392e4..a2ddbfe3 100644
--- a/src/tests/sessionmanager_test.cpp
+++ b/src/tests/sessionmanager_test.cpp
@@ -37,11 +37,11 @@ class SessionManagerTest : public QObject
 {
     Q_OBJECT
 
-public slots:
+public Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
-private slots:
+private Q_SLOTS:
 
 private:
     SessionManager *sessman;
diff --git a/src/tests/tabbar_test.cpp b/src/tests/tabbar_test.cpp
index a5c2063d..0ff73c3f 100644
--- a/src/tests/tabbar_test.cpp
+++ b/src/tests/tabbar_test.cpp
@@ -75,11 +75,11 @@ class TabBarTest : public QObject
 {
     Q_OBJECT
 
-public slots:
+public Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
-private slots:
+private Q_SLOTS:
     void tabSizeHint_data();
     void tabSizeHint();
 
diff --git a/src/tests/urlbar_test.cpp b/src/tests/urlbar_test.cpp
index 2b651513..4e1aaae5 100644
--- a/src/tests/urlbar_test.cpp
+++ b/src/tests/urlbar_test.cpp
@@ -37,11 +37,11 @@ class UrlBarTest : public QObject
 {
     Q_OBJECT
 
-public slots:
+public Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
-private slots:
+private Q_SLOTS:
 
 private:
     UrlBar *bar;
diff --git a/src/tests/walletbar_test.cpp b/src/tests/walletbar_test.cpp
index e406d6e0..ac186bcc 100644
--- a/src/tests/walletbar_test.cpp
+++ b/src/tests/walletbar_test.cpp
@@ -33,11 +33,11 @@ class WalletBarTest : public QObject
 {
     Q_OBJECT
 
-public slots:
+public Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
-private slots:
+private Q_SLOTS:
 
 private:
     WalletBar *bar;
diff --git a/src/tests/webpage_test.cpp b/src/tests/webpage_test.cpp
index 219a6c77..9b170329 100644
--- a/src/tests/webpage_test.cpp
+++ b/src/tests/webpage_test.cpp
@@ -35,11 +35,11 @@ class WebPageTest : public QObject
 {
     Q_OBJECT
 
-public slots:
+public Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
-private slots:
+private Q_SLOTS:
     void manageNetworkErrors();
     void downloadRequest();
     void downloadAllContentsWithKGet();
diff --git a/src/tests/websnap_test.cpp b/src/tests/websnap_test.cpp
index a90573af..31d2e5cf 100644
--- a/src/tests/websnap_test.cpp
+++ b/src/tests/websnap_test.cpp
@@ -34,11 +34,11 @@ class WebSnapTest : public QObject
     Q_OBJECT
 
 
-public slots:
+public Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
-private slots:
+private Q_SLOTS:
 
 private:
     WebSnap *snap;
diff --git a/src/tests/webtab_test.cpp b/src/tests/webtab_test.cpp
index d57a97f4..073f1521 100644
--- a/src/tests/webtab_test.cpp
+++ b/src/tests/webtab_test.cpp
@@ -36,7 +36,7 @@ class WebTabTest : public QObject
 {
     Q_OBJECT
 
-public slots:
+public Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
diff --git a/src/tests/webview_test.cpp b/src/tests/webview_test.cpp
index 5de9cd09..1846e142 100644
--- a/src/tests/webview_test.cpp
+++ b/src/tests/webview_test.cpp
@@ -34,11 +34,11 @@ class WebViewTest : public QObject
 {
     Q_OBJECT
 
-public slots:
+public Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
-private slots:
+private Q_SLOTS:
 
 private:
     WebView *view;
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:
diff --git a/src/urlpanel.h b/src/urlpanel.h
index 48dfcffe..73ffc024 100644
--- a/src/urlpanel.h
+++ b/src/urlpanel.h
@@ -73,7 +73,7 @@ private:
     PanelTreeView *_treeView;
     bool _loaded;
 
-private slots:
+private Q_SLOTS:
     void expandTreeView();
 };
 
diff --git a/src/webicon.h b/src/webicon.h
index 34afadd3..df5cc828 100644
--- a/src/webicon.h
+++ b/src/webicon.h
@@ -44,7 +44,7 @@ class REKONQ_TESTS_EXPORT WebIcon : public QObject
 public:
     explicit WebIcon(const KUrl &url, QObject *parent = 0);
 
-private slots:
+private Q_SLOTS:
     void load();
     void saveIcon(bool);
 
diff --git a/src/webinspectorpanel.h b/src/webinspectorpanel.h
index 6f988585..70776a77 100644
--- a/src/webinspectorpanel.h
+++ b/src/webinspectorpanel.h
@@ -2,7 +2,7 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2010 by Matthieu Gicquel <matgic78 at gmail dot com>
+* Copyright (C) 2010-2011 by Matthieu Gicquel <matgic78 at gmail dot com>
 *
 *
 * This program is free software; you can redistribute it and/or
@@ -48,7 +48,7 @@ class REKONQ_TESTS_EXPORT WebInspectorPanel : public QDockWidget
 public:
     WebInspectorPanel(QString title, QWidget *parent);
 
-public slots:
+public Q_SLOTS:
     void toggle(bool enable);
     void changeCurrentPage();
 
diff --git a/src/webpage.cpp b/src/webpage.cpp
index 5fe03113..a9ac1a84 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -703,14 +703,14 @@ void WebPage::downloadAllContentsWithKGet()
     KUrl relativeUrl;
 
     QWebElementCollection images = mainFrame()->documentElement().findAll("img");
-    foreach(const QWebElement & img, images)
+    Q_FOREACH(const QWebElement & img, images)
     {
         relativeUrl.setEncodedUrl(img.attribute("src").toUtf8(), KUrl::TolerantMode);
         contents << baseUrl.resolved(relativeUrl).toString();
     }
 
     QWebElementCollection links = mainFrame()->documentElement().findAll("a");
-    foreach(const QWebElement & link, links)
+    Q_FOREACH(const QWebElement & link, links)
     {
         relativeUrl.setEncodedUrl(link.attribute("href").toUtf8(), KUrl::TolerantMode);
         contents << baseUrl.resolved(relativeUrl).toString();
diff --git a/src/webpluginfactory.h b/src/webpluginfactory.h
index 4f6201ea..98172887 100644
--- a/src/webpluginfactory.h
+++ b/src/webpluginfactory.h
@@ -48,10 +48,10 @@ public:
                             const QStringList &argumentNames,
                             const QStringList &argumentValues) const;
 
-signals:
+Q_SIGNALS:
     void signalLoadClickToFlash(bool) const;
 
-public slots:
+public Q_SLOTS:
     void setLoadClickToFlash(bool load);
 
 private:
diff --git a/src/websnap.h b/src/websnap.h
index dd2cb93b..37cdc618 100644
--- a/src/websnap.h
+++ b/src/websnap.h
@@ -128,11 +128,11 @@ public:
     static bool existsImage(const KUrl &url);
 
 
-private slots:
+private Q_SLOTS:
     void saveResult(bool ok = true);
     void load();
 
-signals:
+Q_SIGNALS:
     void snapDone(bool ok);
 
 private:
diff --git a/src/webtab.cpp b/src/webtab.cpp
index 61c9077f..b4694064 100644
--- a/src/webtab.cpp
+++ b/src/webtab.cpp
@@ -195,7 +195,7 @@ void WebTab::showRSSInfo(const QPoint &pos)
 
     QMap<KUrl, QString> map;
 
-    foreach(const QWebElement & el, col)
+    Q_FOREACH(const QWebElement & el, col)
     {
         QString urlString;
         if (el.attribute("href").startsWith(QL1S("http")))
diff --git a/src/webview.cpp b/src/webview.cpp
index 18ec4550..e524ae24 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -339,7 +339,7 @@ void WebView::contextMenuEvent(QContextMenuEvent *event)
         //All favourite ones
         KActionMenu *searchMenu = new KActionMenu(KIcon("edit-find"), i18nc("@title:menu", "Search"), this);
 
-        foreach(const KService::Ptr & engine, SearchEngine::favorites())
+        Q_FOREACH(const KService::Ptr & engine, SearchEngine::favorites())
         {
             a = new KAction(i18nc("@item:inmenu Search, %1 = search engine", "With %1", engine->name()), this);
             a->setIcon(rApp->iconManager()->iconForUrl(SearchEngine::buildQuery(engine, "")));