From: Christoph Egger <christoph@christoph-egger.org>
Date: Sat, 3 Jan 2015 10:38:00 +0000 (+0100)
Subject: change QT signals to QT_NO_KEYWORDS
X-Git-Tag: v0.1~149
X-Git-Url: https://git.siccegge.de//index.cgi?a=commitdiff_plain;h=0ce5b46ac41f3ac806ee1828eb121dd196bf1251;p=frida%2Ffrida.git

change QT signals to QT_NO_KEYWORDS

making room for bost::signal as core messaging infrastructure (it's
more flexible than Qt's signals).
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d5080b7..8a6433f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,6 +32,7 @@ string(REPLACE -O2 '' LLVM_CFLAGS ${LLVM_CFLAGS})
 separate_arguments(LLVM_CFLAGS)
 add_definitions(${LLVM_CFLAGS})
 add_definitions(-std=c++11 -Wall)
+add_definitions(-DQT_NO_KEYWORDS)
 
 separate_arguments(LLVM_LDFLAGS)
 separate_arguments(LLVM_LIBS)
diff --git a/src/gui/Mainwindow.hxx b/src/gui/Mainwindow.hxx
index 032cabd..9ce1b6b 100644
--- a/src/gui/Mainwindow.hxx
+++ b/src/gui/Mainwindow.hxx
@@ -34,7 +34,7 @@ private:
 
     std::shared_ptr<Disassembler> disassembler;
 	std::map<uint64_t, BasicBlockWidget*> blocks;
-private slots:
+private Q_SLOTS:
     void quit();
     void open();
 };
diff --git a/src/gui/widgets/ScriptingDock.hxx b/src/gui/widgets/ScriptingDock.hxx
index ce53191..ebbbc98 100644
--- a/src/gui/widgets/ScriptingDock.hxx
+++ b/src/gui/widgets/ScriptingDock.hxx
@@ -37,7 +37,7 @@ private:
 
     SCM guile_output_port;
     SCM guile_error_port;
-private slots:
+private Q_SLOTS:
     void doEvaluate();
 };