IRC backend: Qt should be included first to prevent conflict with Boost's foreach
This commit is contained in:
parent
9f74fb5bb7
commit
180397daab
3 changed files with 5 additions and 7 deletions
|
@ -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");
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue