Reenable Qt Signal keywords

As we're not using any boost signals any more no need to hide the
special keywords.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ae3e44eda895963fd79625995ab972bdf20bac2..4ad154583b4df40800d8fa6f500c993b28351e23 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,6 @@ add_definitions(${GUILE_CFLAGS})
 
 add_definitions(${LLVM_CFLAGS})
 add_definitions(-std=c++11 -Wall -Wextra)
 
 add_definitions(${LLVM_CFLAGS})
 add_definitions(-std=c++11 -Wall -Wextra)

-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/core/Comment.cxx b/src/core/Comment.cxx
index 2e6ce6153ef694c6e1867116ac0c75e618c0871f..03c7668b5f1477e0b554b2e6f16b4244e02ea853 100644 (file)
--- a/src/core/Comment.cxx
+++ b/src/core/Comment.cxx
@@ -17,7 +17,7 @@ Comment::Comment(uint64_t address, Function* location, InformationManager* manag
 void Comment::setText(const std::string& text) {
        ChangeCommentEvent event(address, location, this);
        this->text = text;
 void Comment::setText(const std::string& text) {
        ChangeCommentEvent event(address, location, this);
        this->text = text;

-       Q_EMIT manager->changeCommentEvent(&event);
+       emit manager->changeCommentEvent(&event);

 }
 
 uint64_t Comment::getAddress() {
 }
 
 uint64_t Comment::getAddress() {

diff --git a/src/core/Function.cxx b/src/core/Function.cxx
index 12b3830d323bb9cea841449eb6c6de754fc65e68..ac3910d21a0348b35d9b63d3710125867b0f85ac 100644 (file)
--- a/src/core/Function.cxx
+++ b/src/core/Function.cxx
@@ -13,7 +13,7 @@ Function::Function(uint64_t start_address, bool dynamic, InformationManager* man
 void Function::setName(const std::string& new_name) {
        name = new_name;
        RenameFunctionEvent event(new_name, this, start_address);
 void Function::setName(const std::string& new_name) {
        name = new_name;
        RenameFunctionEvent event(new_name, this, start_address);

-       Q_EMIT manager->renameFunctionEvent(&event);
+       emit manager->renameFunctionEvent(&event);

 }
 
 void Function::serialize(QXmlStreamWriter& stream) {
 }
 
 void Function::serialize(QXmlStreamWriter& stream) {

diff --git a/src/core/InformationManager.cxx b/src/core/InformationManager.cxx
index b7229d376854639dfc8cc16fbece136f2ef9bed2..c548a553507dbae95d56e52515f1c494fe6067be 100644 (file)
--- a/src/core/InformationManager.cxx
+++ b/src/core/InformationManager.cxx
@@ -270,7 +270,7 @@ void InformationManager::finishFunction(Function* fun) {
                blocks.insert(std::make_pair(bl->getStartAddress(), bl));
        }
        NewFunctionEvent event(fun->getStartAddress(), fun);
                blocks.insert(std::make_pair(bl->getStartAddress(), bl));
        }
        NewFunctionEvent event(fun->getStartAddress(), fun);

-       Q_EMIT newFunctionEvent(&event);
+       emit newFunctionEvent(&event);

 }
 
 void InformationManager::finishBasicBlock(BasicBlock*) {
 }
 
 void InformationManager::finishBasicBlock(BasicBlock*) {


@@ -279,7 +279,7 @@ void InformationManager::finishBasicBlock(BasicBlock*) {
 void InformationManager::finishComment(Comment* c) {
        LOG4CXX_DEBUG(logger, "Finishing comment " << c->getAddress());
        ChangeCommentEvent event(c->getAddress(), c->getLocation(), c);
 void InformationManager::finishComment(Comment* c) {
        LOG4CXX_DEBUG(logger, "Finishing comment " << c->getAddress());
        ChangeCommentEvent event(c->getAddress(), c->getLocation(), c);

-       Q_EMIT changeCommentEvent(&event);
+       emit changeCommentEvent(&event);

 }
 
 void InformationManager::deleteFunction(Function* f) {
 }
 
 void InformationManager::deleteFunction(Function* f) {

diff --git a/src/core/InformationManager.hxx b/src/core/InformationManager.hxx
index 23645440a1e05760abecbf40f0d6587ca66aff81..2f70d7365d7a27353ffc6ce843f47f99fae832f4 100644 (file)
--- a/src/core/InformationManager.hxx
+++ b/src/core/InformationManager.hxx
@@ -28,7 +28,7 @@ class QPluginLoader;
 class InformationManager : public QObject {
 #ifndef SWIG
        Q_OBJECT
 class InformationManager : public QObject {
 #ifndef SWIG
        Q_OBJECT

-Q_SIGNALS:
+signals:

 #else
 public:
 #endif
 #else
 public:
 #endif

diff --git a/src/gui/Mainwindow.hxx b/src/gui/Mainwindow.hxx
index a89179598a095c71e16b32d432b40f5bd9d5855d..1b497dfce301d3d2d2015d3b0dce96cf4b64cd5d 100644 (file)
--- a/src/gui/Mainwindow.hxx
+++ b/src/gui/Mainwindow.hxx
@@ -26,7 +26,7 @@ class Mainwindow : public QMainWindow {
 public:
        Mainwindow(InformationManager* mgr);
 
 public:
        Mainwindow(InformationManager* mgr);
 

-public Q_SLOTS:
+public slots:

        void switchMainPlaneToAddress(uint64_t);
        void requestNewFunctionByAddress(uint64_t address);
 
        void switchMainPlaneToAddress(uint64_t);
        void requestNewFunctionByAddress(uint64_t address);
 


@@ -58,7 +58,7 @@ private:
        InformationManager* manager;
        log4cxx::LoggerPtr logger;
 
        InformationManager* manager;
        log4cxx::LoggerPtr logger;
 

-private Q_SLOTS:
+private slots:

        void quit();
        void open();
        void load();
        void quit();
        void open();
        void load();

diff --git a/src/gui/widgets/ScriptingDock.hxx b/src/gui/widgets/ScriptingDock.hxx
index 9c6c09b444daab2646b8d0ca74b8ef70f9fc588c..8ec86feee5a8be942a32ac8dddae2ed75c80a447 100644 (file)
--- a/src/gui/widgets/ScriptingDock.hxx
+++ b/src/gui/widgets/ScriptingDock.hxx
@@ -22,7 +22,7 @@ private:
        QLineEdit * line;
 
        Interpreter* interpreter;
        QLineEdit * line;
 
        Interpreter* interpreter;

-private Q_SLOTS:
+private slots:

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