libtransport.git Changeset - b15fcedf4544

Changeset - b15fcedf4544

Parent rev.

Child rev.

[Not reviewed]

0 3 0

Vitaly Takmazov - 8 years ago 2017-12-01 10:44:10
vitalyster@gmail.com

communi: use QT_NO_KEYWORDS to prevent clashing with Boost

3 files changed with 2 insertions and 2 deletions:

backends/libcommuni/CMakeLists.txt

backends/libcommuni/ircnetworkplugin.h

include/Swiften/SwiftenCompat.h

0 comments (0 inline, 0 general)

backends/libcommuni/CMakeLists.txt

➞

Show inline comments

@@ @@ -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)

backends/libcommuni/ircnetworkplugin.h

➞

Show inline comments

 			return m_config;
+		}
-	public slots:
+	public Q_SLOTS:
 		void readData();
 		void sendData(const std::string &string);

include/Swiften/SwiftenCompat.h

➞

Show inline comments

@@ @@ -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

0 comments (0 inline, 0 general)