Commit b15fcedf authored by Vitaly Takmazov's avatar Vitaly Takmazov

communi: use QT_NO_KEYWORDS to prevent clashing with Boost

parent be869bbb
......@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 2.6)
FILE(GLOB SRC *.cpp)
FILE(GLOB HEADERS *.h)
QT4_WRAP_CPP(SRC ${HEADERS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
add_definitions(-DQT_NO_KEYWORDS)
ADD_EXECUTABLE(spectrum2_libcommuni_backend ${SRC})
if (NOT WIN32)
......
......@@ -57,7 +57,7 @@ class IRCNetworkPlugin : public QObject, public NetworkPlugin {
return m_config;
}
public slots:
public Q_SLOTS:
void readData();
void sendData(const std::string &string);
......
......@@ -46,7 +46,6 @@
#else
#define SWIFTEN_UNIQUE_PTR std::auto_ptr
#define SWIFTEN_SHRPTR_NAMESPACE boost
#define BOOST_SIGNALS_NO_DEPRECATION_WARNING
#include <boost/signals.hpp>
#define SWIFTEN_SIGNAL_NAMESPACE boost
#define SWIFTEN_SIGNAL_CONNECTION_NAMESPACE boost::signals
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment