From: Christoph Egger <christoph@christoph-egger.org>
Date: Wed, 27 May 2015 11:47:41 +0000 (+0200)
Subject: Reenable Qt Signal keywords
X-Git-Url: https://git.siccegge.de//index.cgi?a=commitdiff_plain;h=057e0e59829f19ee4d9a550f2d3dc9fe9df5c92c;p=frida%2Ffrida.git

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 6ae3e44..4ad1545 100644
--- 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(-DQT_NO_KEYWORDS)
 
 separate_arguments(LLVM_LDFLAGS)
 separate_arguments(LLVM_LIBS)
diff --git a/src/core/Comment.cxx b/src/core/Comment.cxx
index 2e6ce61..03c7668 100644
--- 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;
-	Q_EMIT manager->changeCommentEvent(&event);
+	emit manager->changeCommentEvent(&event);
 }
 
 uint64_t Comment::getAddress() {
diff --git a/src/core/Function.cxx b/src/core/Function.cxx
index 12b3830..ac3910d 100644
--- 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);
-	Q_EMIT manager->renameFunctionEvent(&event);
+	emit manager->renameFunctionEvent(&event);
 }
 
 void Function::serialize(QXmlStreamWriter& stream) {
diff --git a/src/core/InformationManager.cxx b/src/core/InformationManager.cxx
index b7229d3..c548a55 100644
--- 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);
-	Q_EMIT newFunctionEvent(&event);
+	emit newFunctionEvent(&event);
 }
 
 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);
-	Q_EMIT changeCommentEvent(&event);
+	emit changeCommentEvent(&event);
 }
 
 void InformationManager::deleteFunction(Function* f) {
diff --git a/src/core/InformationManager.hxx b/src/core/InformationManager.hxx
index 2364544..2f70d73 100644
--- a/src/core/InformationManager.hxx
+++ b/src/core/InformationManager.hxx
@@ -28,7 +28,7 @@ class QPluginLoader;
 class InformationManager : public QObject {
 #ifndef SWIG
 	Q_OBJECT
-Q_SIGNALS:
+signals:
 #else
 public:
 #endif
diff --git a/src/gui/Mainwindow.hxx b/src/gui/Mainwindow.hxx
index a891795..1b497df 100644
--- a/src/gui/Mainwindow.hxx
+++ b/src/gui/Mainwindow.hxx
@@ -26,7 +26,7 @@ class Mainwindow : public QMainWindow {
 public:
 	Mainwindow(InformationManager* mgr);
 
-public Q_SLOTS:
+public slots:
 	void switchMainPlaneToAddress(uint64_t);
 	void requestNewFunctionByAddress(uint64_t address);
 
@@ -58,7 +58,7 @@ private:
 	InformationManager* manager;
 	log4cxx::LoggerPtr logger;
 
-private Q_SLOTS:
+private slots:
 	void quit();
 	void open();
 	void load();
diff --git a/src/gui/widgets/ScriptingDock.hxx b/src/gui/widgets/ScriptingDock.hxx
index 9c6c09b..8ec86fe 100644
--- a/src/gui/widgets/ScriptingDock.hxx
+++ b/src/gui/widgets/ScriptingDock.hxx
@@ -22,7 +22,7 @@ private:
 	QLineEdit * line;
 
 	Interpreter* interpreter;
-private Q_SLOTS:
+private slots:
 	void doEvaluate();
 };