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 d5080b7489ffbd6eaddf306960f12ab84bf42ee6..8a6433f916c0f3d5a30280c7c96329ebb92595f5 100644 (file)
--- 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)
 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)
 
 separate_arguments(LLVM_LDFLAGS)
 separate_arguments(LLVM_LIBS)

diff --git a/src/gui/Mainwindow.hxx b/src/gui/Mainwindow.hxx
index 032cabd8e0cfdb354fa59f58142635ec74c95351..9ce1b6bdbb8350e426bc95ff0adaf2d09390464d 100644 (file)
--- 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;
 
     std::shared_ptr<Disassembler> disassembler;
        std::map<uint64_t, BasicBlockWidget*> blocks;

-private slots:
+private Q_SLOTS:

     void quit();
     void open();
 };
     void quit();
     void open();
 };

diff --git a/src/gui/widgets/ScriptingDock.hxx b/src/gui/widgets/ScriptingDock.hxx
index ce5319182a118387aa23327580bd407d87a4ed55..ebbbc98f3332d506293962543a256d22a3d45917 100644 (file)
--- 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;
 
     SCM guile_output_port;
     SCM guile_error_port;

-private slots:
+private Q_SLOTS:

     void doEvaluate();
 };
 
     void doEvaluate();
 };