From 180397daaba03bacfc8b51c7561ac76ae9fa6f83 Mon Sep 17 00:00:00 2001
From: vitalyster <vitalyster@gmail.com>
Date: Sun, 11 Jun 2017 22:32:05 +0300
Subject: [PATCH] IRC backend: Qt should be included first to prevent conflict
 with Boost's foreach

---
 backends/libcommuni/ircnetworkplugin.cpp | 3 +--
 backends/libcommuni/ircnetworkplugin.h   | 4 ++--
 backends/libcommuni/main.cpp             | 5 ++---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/backends/libcommuni/ircnetworkplugin.cpp b/backends/libcommuni/ircnetworkplugin.cpp
index 80e2df5d..d8354ed6 100644
--- a/backends/libcommuni/ircnetworkplugin.cpp
+++ b/backends/libcommuni/ircnetworkplugin.cpp
@@ -17,10 +17,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-
-#include "ircnetworkplugin.h"
 #include <IrcCommand>
 #include <IrcMessage>
+#include "ircnetworkplugin.h"
 #include "transport/Logging.h"
 
 DEFINE_LOGGER(logger, "IRCNetworkPlugin");
diff --git a/backends/libcommuni/ircnetworkplugin.h b/backends/libcommuni/ircnetworkplugin.h
index 6a84e93b..cc8fca02 100644
--- a/backends/libcommuni/ircnetworkplugin.h
+++ b/backends/libcommuni/ircnetworkplugin.h
@@ -21,11 +21,11 @@
 #pragma once
 
 #ifndef Q_MOC_RUN
-#include "transport/Config.h"
-#include "transport/NetworkPlugin.h"
 #include "session.h"
 #include <QtCore>
 #include <QtNetwork>
+#include "transport/Config.h"
+#include "transport/NetworkPlugin.h"
 #include "Swiften/EventLoop/Qt/QtEventLoop.h"
 #endif
 
diff --git a/backends/libcommuni/main.cpp b/backends/libcommuni/main.cpp
index 4a0146b3..a5100e03 100644
--- a/backends/libcommuni/main.cpp
+++ b/backends/libcommuni/main.cpp
@@ -17,12 +17,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-
+#include <QtCore>
+#include <QtNetwork>
 #include "transport/Config.h"
 #include "transport/NetworkPlugin.h"
 #include "transport/Logging.h"
-#include <QtCore>
-#include <QtNetwork>
 #include "Swiften/EventLoop/Qt/QtEventLoop.h"
 #include "ircnetworkplugin.h"