From 6072b7c4becba184ae74813ae70f5614e6df2024 Mon Sep 17 00:00:00 2001
From: "S. Razi Alavizadeh" <srazi61@yahoo.com>
Date: Thu, 17 Jan 2013 17:54:30 +0330
Subject: [PATCH] [Windows] fixed include conflicting when defining 'W7TASKBAR'

---
 src/lib/app/qupzilla.cpp    | 4 ++--
 src/lib/webview/webpage.cpp | 2 +-
 src/lib/webview/webview.cpp | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/lib/app/qupzilla.cpp b/src/lib/app/qupzilla.cpp
index 8b289db6b..5621143da 100644
--- a/src/lib/app/qupzilla.cpp
+++ b/src/lib/app/qupzilla.cpp
@@ -25,6 +25,8 @@
 #include "locationbar.h"
 #include "searchtoolbar.h"
 #include "websearchbar.h"
+#include "pluginproxy.h"
+#include "sidebar.h"
 #include "downloadmanager.h"
 #include "cookiejar.h"
 #include "cookiemanager.h"
@@ -40,12 +42,10 @@
 #include "rssmanager.h"
 #include "mainapplication.h"
 #include "aboutdialog.h"
-#include "pluginproxy.h"
 #include "checkboxdialog.h"
 #include "adblockmanager.h"
 #include "clickablelabel.h"
 #include "docktitlebarwidget.h"
-#include "sidebar.h"
 #include "iconprovider.h"
 #include "progressbar.h"
 #include "adblockicon.h"
diff --git a/src/lib/webview/webpage.cpp b/src/lib/webview/webpage.cpp
index eec4260e1..2ab0c412e 100644
--- a/src/lib/webview/webpage.cpp
+++ b/src/lib/webview/webpage.cpp
@@ -19,13 +19,13 @@
 #include "tabbedwebview.h"
 #include "tabwidget.h"
 #include "qupzilla.h"
+#include "pluginproxy.h"
 #include "downloadmanager.h"
 #include "webpluginfactory.h"
 #include "mainapplication.h"
 #include "checkboxdialog.h"
 #include "widget.h"
 #include "globalfunctions.h"
-#include "pluginproxy.h"
 #include "speeddial.h"
 #include "popupwebpage.h"
 #include "popupwebview.h"
diff --git a/src/lib/webview/webview.cpp b/src/lib/webview/webview.cpp
index 20fb26f6f..ee4a30505 100644
--- a/src/lib/webview/webview.cpp
+++ b/src/lib/webview/webview.cpp
@@ -15,6 +15,7 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * ============================================================ */
+
 #include "webview.h"
 #include "webpage.h"
 #include "mainapplication.h"
@@ -22,6 +23,7 @@
 #include "iconprovider.h"
 #include "history.h"
 #include "autofillmodel.h"
+#include "pluginproxy.h"
 #include "downloadmanager.h"
 #include "sourceviewer.h"
 #include "siteinfo.h"
@@ -31,7 +33,6 @@
 #include "settings.h"
 #include "qzsettings.h"
 #include "enhancedmenu.h"
-#include "pluginproxy.h"
 
 #include <QDir>
 #include <QTimer>