From 98e46099f6366309366ea54fc4b97fd5cb383fa7 Mon Sep 17 00:00:00 2001 From: Christoph Egger Date: Mon, 25 May 2015 01:55:52 +0200 Subject: [PATCH 1/1] Move qt.hxx up one directory We're using Qt now a lot more than only for GUI purposes. Reflect reality in location of qt.hxx headerfile Ref T24 --- CMakeLists.txt | 2 +- src/core/BasicBlock.cxx | 2 +- src/core/Comment.cxx | 2 +- src/core/Function.cxx | 2 +- src/core/InformationManager.cxx | 2 +- src/core/tests/BasicBlockTest.cxx | 2 +- src/core/tests/CommentTest.cxx | 2 +- src/core/tests/FunctionTest.cxx | 2 +- src/gui/dialogs/NewFunctionDialog.hxx | 3 ++- src/gui/dialogs/SimpleStringDialog.hxx | 3 ++- src/gui/widgets/BasicBlockWidget.hxx | 2 +- src/gui/widgets/CFGScene.hxx | 2 +- src/gui/widgets/FridaDock.hxx | 2 +- src/gui/widgets/FunctionWidget.hxx | 2 +- src/gui/widgets/LogDock.hxx | 2 +- src/gui/widgets/ScriptingDock.hxx | 3 ++- src/{gui => }/qt.hxx | 0 17 files changed, 19 insertions(+), 16 deletions(-) rename src/{gui => }/qt.hxx (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index c0abdf5..dfa4112 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,7 +71,7 @@ SET(frida_SOURCES SET(frida_HEADERS src/include_llvm.hxx src/core/InformationManager.hxx - src/gui/qt.hxx + src/qt.hxx src/gui/Mainwindow.hxx src/gui/widgets/BasicBlockWidget.hxx src/gui/widgets/CFGScene.hxx diff --git a/src/core/BasicBlock.cxx b/src/core/BasicBlock.cxx index a88b399..e09421d 100644 --- a/src/core/BasicBlock.cxx +++ b/src/core/BasicBlock.cxx @@ -1,5 +1,5 @@ #include "BasicBlock.hxx" -#include "gui/qt.hxx" +#include "qt.hxx" #include "core/InformationManager.hxx" #include diff --git a/src/core/Comment.cxx b/src/core/Comment.cxx index 6ef19a2..983366e 100644 --- a/src/core/Comment.cxx +++ b/src/core/Comment.cxx @@ -2,7 +2,7 @@ #include "Function.hxx" #include "InformationManager.hxx" #include "events/ChangeCommentEvent.hxx" -#include "gui/qt.hxx" +#include "qt.hxx" Comment::Comment(uint64_t address, InformationManager* manager) : address(address) diff --git a/src/core/Function.cxx b/src/core/Function.cxx index 4f8efe1..79dccda 100644 --- a/src/core/Function.cxx +++ b/src/core/Function.cxx @@ -2,7 +2,7 @@ #include "BasicBlock.hxx" #include "core/events/RenameFunctionEvent.hxx" #include "InformationManager.hxx" -#include "gui/qt.hxx" +#include "qt.hxx" Function::Function(uint64_t start_address, bool dynamic, InformationManager* manager) : start_address(start_address) diff --git a/src/core/InformationManager.cxx b/src/core/InformationManager.cxx index b964982..3525ca9 100644 --- a/src/core/InformationManager.cxx +++ b/src/core/InformationManager.cxx @@ -7,7 +7,7 @@ #include "core/events/NewFunctionEvent.hxx" #include "core/events/ChangeCommentEvent.hxx" -#include "gui/qt.hxx" +#include "qt.hxx" #include #include diff --git a/src/core/tests/BasicBlockTest.cxx b/src/core/tests/BasicBlockTest.cxx index e4095ff..7d4d2d5 100644 --- a/src/core/tests/BasicBlockTest.cxx +++ b/src/core/tests/BasicBlockTest.cxx @@ -1,7 +1,7 @@ #include #include -#include "gui/qt.hxx" +#include "qt.hxx" #include "core/InformationManager.hxx" #include "core/BasicBlock.hxx" diff --git a/src/core/tests/CommentTest.cxx b/src/core/tests/CommentTest.cxx index 870402a..a65730c 100644 --- a/src/core/tests/CommentTest.cxx +++ b/src/core/tests/CommentTest.cxx @@ -1,6 +1,6 @@ #include -#include "gui/qt.hxx" +#include "qt.hxx" #include "core/InformationManager.hxx" #include "core/BasicBlock.hxx" #include "core/Comment.hxx" diff --git a/src/core/tests/FunctionTest.cxx b/src/core/tests/FunctionTest.cxx index af95bd0..17d3b72 100644 --- a/src/core/tests/FunctionTest.cxx +++ b/src/core/tests/FunctionTest.cxx @@ -1,6 +1,6 @@ #include -#include "gui/qt.hxx" +#include "qt.hxx" #include "core/InformationManager.hxx" #include "core/BasicBlock.hxx" #include "core/Function.hxx" diff --git a/src/gui/dialogs/NewFunctionDialog.hxx b/src/gui/dialogs/NewFunctionDialog.hxx index 9f04ed1..b89c38e 100644 --- a/src/gui/dialogs/NewFunctionDialog.hxx +++ b/src/gui/dialogs/NewFunctionDialog.hxx @@ -1,4 +1,5 @@ -#include "gui/qt.hxx" + +#include "qt.hxx" class NewFunctionDialog : public QDialog { Q_OBJECT diff --git a/src/gui/dialogs/SimpleStringDialog.hxx b/src/gui/dialogs/SimpleStringDialog.hxx index 4fbb26c..fafab90 100644 --- a/src/gui/dialogs/SimpleStringDialog.hxx +++ b/src/gui/dialogs/SimpleStringDialog.hxx @@ -1,4 +1,5 @@ -#include "gui/qt.hxx" + +#include "qt.hxx" class SimpleStringDialog : public QDialog { Q_OBJECT diff --git a/src/gui/widgets/BasicBlockWidget.hxx b/src/gui/widgets/BasicBlockWidget.hxx index 30eeb69..7c402c0 100644 --- a/src/gui/widgets/BasicBlockWidget.hxx +++ b/src/gui/widgets/BasicBlockWidget.hxx @@ -1,7 +1,7 @@ #ifndef INCLUDE__BasicBlockWidget_hxx #define INCLUDE__BasicBlockWidget_hxx -#include "gui/qt.hxx" +#include "qt.hxx" #include #include #include diff --git a/src/gui/widgets/CFGScene.hxx b/src/gui/widgets/CFGScene.hxx index 094233c..0efacfd 100644 --- a/src/gui/widgets/CFGScene.hxx +++ b/src/gui/widgets/CFGScene.hxx @@ -1,7 +1,7 @@ #ifndef INCLUDE__CFGScene_hxx #define INCLUDE__CFGScene_hxx -#include "gui/qt.hxx" +#include "qt.hxx" #include "BasicBlockWidget.hxx" #include diff --git a/src/gui/widgets/FridaDock.hxx b/src/gui/widgets/FridaDock.hxx index 4f81e85..2bfacd0 100644 --- a/src/gui/widgets/FridaDock.hxx +++ b/src/gui/widgets/FridaDock.hxx @@ -1,7 +1,7 @@ #ifndef INCLUDE__FridaDock_hxx_ #define INCLUDE__FridaDock_hxx_ -#include "gui/qt.hxx" +#include "qt.hxx" class FridaDock : public QDockWidget { Q_OBJECT diff --git a/src/gui/widgets/FunctionWidget.hxx b/src/gui/widgets/FunctionWidget.hxx index 6a26f1a..8400df8 100644 --- a/src/gui/widgets/FunctionWidget.hxx +++ b/src/gui/widgets/FunctionWidget.hxx @@ -1,7 +1,7 @@ #ifndef INCLUDE__FunctionWidget_hxx_ #define INCLUDE__FunctionWidget_hxx_ -#include "gui/qt.hxx" +#include "qt.hxx" #include diff --git a/src/gui/widgets/LogDock.hxx b/src/gui/widgets/LogDock.hxx index bda8203..e710635 100644 --- a/src/gui/widgets/LogDock.hxx +++ b/src/gui/widgets/LogDock.hxx @@ -1,7 +1,7 @@ #ifndef INCLUDE__LogDock_hxx_ #define INCLUDE__LogDock_hxx_ -#include "gui/qt.hxx" +#include "qt.hxx" #include class FridaDock; diff --git a/src/gui/widgets/ScriptingDock.hxx b/src/gui/widgets/ScriptingDock.hxx index 094e520..9c6c09b 100644 --- a/src/gui/widgets/ScriptingDock.hxx +++ b/src/gui/widgets/ScriptingDock.hxx @@ -1,6 +1,7 @@ #ifndef INCLUDE__ScriptingDock_hxx #define INCLUDE__ScriptingDock_hxx -#include "gui/qt.hxx" + +#include "qt.hxx" #include #include diff --git a/src/gui/qt.hxx b/src/qt.hxx similarity index 100% rename from src/gui/qt.hxx rename to src/qt.hxx -- 2.39.2