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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c0abdf52e0029821f24e1dabcf26f29a55e9650f..dfa41120b60602dcc546568b432cbe6f373b2277 100644 (file)
--- 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 a88b3995b80478f50d2dbbb0fb9b37115b072099..e09421d5785a1b603c9ccf951484eae37bdc0ad7 100644 (file)
--- 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 <cassert>

diff --git a/src/core/Comment.cxx b/src/core/Comment.cxx
index 6ef19a2baa09dfa99186e8ddb359a149f27336d3..983366e8d90a18c7b33d70890bd78f1f685af536 100644 (file)
--- 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 4f8efe1622ea35b2ab23a133791eb349b728b0aa..79dccda3760d510c42e0b8cb423899bc7f6dfa20 100644 (file)
--- 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 b9649829c48a3554367358e16ad5d21a047b6e5e..3525ca9e7548e741f92f3dc28e91c5982dc5d464 100644 (file)
--- 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 <quazip/quazip.h>
 #include <quazip/quazipfile.h>
 

diff --git a/src/core/tests/BasicBlockTest.cxx b/src/core/tests/BasicBlockTest.cxx
index e4095ff15f9f246d2a43f97915a24a2636861ac2..7d4d2d5606d7330eb151ce2f5ae73fadcf1136ee 100644 (file)
--- a/src/core/tests/BasicBlockTest.cxx
+++ b/src/core/tests/BasicBlockTest.cxx
@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 #include <algorithm>
 
-#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 870402a71509ec19bfc59882490ea0fe8851b465..a65730cdca7af394dbcc59756bd637c58e2d3499 100644 (file)
--- a/src/core/tests/CommentTest.cxx
+++ b/src/core/tests/CommentTest.cxx
@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
 
-#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 af95bd046c75e5bfa1e2258fb304becd89eeb31a..17d3b72ad2fcaf3e45d75d15e6affd34c73a3de0 100644 (file)
--- a/src/core/tests/FunctionTest.cxx
+++ b/src/core/tests/FunctionTest.cxx
@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
 
-#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 9f04ed1018c239fe5c36b32bf245449f67353b89..b89c38eb8447cac6b6fe8528ff3963a2a337836d 100644 (file)
--- 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 4fbb26c5af035f2d038933b32139c63af953da55..fafab905e3b94be75505b19c409aa1d5c3532733 100644 (file)
--- 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/qt.hxx b/src/gui/qt.hxx
deleted file mode 100644 (file)
index e0ff092..0000000
--- a/src/gui/qt.hxx
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef INCLUDE__qt_hxx_
-#define INCLUDE__qt_hxx_
-
-#include <QAction>
-#include <QDockWidget>
-#include <QFileDialog>
-#include <QGraphicsItem>
-#include <QGraphicsProxyWidget>
-#include <QGraphicsScene>
-#include <QGraphicsView>
-#include <QGroupBox>
-#include <QHeaderView>
-#include <QTreeWidget>
-#include <QMenu>
-#include <QMenuBar>
-#include <QMessageBox>
-#include <QPainter>
-#include <QTableWidget>
-#include <QVBoxLayout>
-#include <QGraphicsSceneMouseEvent>
-#include <QTextBrowser>
-#include <QPushButton>
-#include <QLineEdit>
-#include <QLabel>
-#include <QtGui>
-#include <QMenu>
-#include <QShortcut>
-#include <QXmlStreamWriter>
-#include <QXmlStreamReader>
-#include <QApplication>
-#include <QPluginLoader>
-
-#endif /* INCLUDE__qt_hxx_ */

diff --git a/src/gui/widgets/BasicBlockWidget.hxx b/src/gui/widgets/BasicBlockWidget.hxx
index 30eeb69d81ec30fa9c535645a76f020010c5f5bb..7c402c0a663bb4f89d8b0216ce6280aee5e752a6 100644 (file)
--- 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 <vector>
 #include <cassert>
 #include <tuple>

diff --git a/src/gui/widgets/CFGScene.hxx b/src/gui/widgets/CFGScene.hxx
index 094233c0e11ccb4b17c95fb2d76193cfcc8a6eb3..0efacfd2c98b2d2a6941cbb24f0c99ada2440098 100644 (file)
--- 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 <vector>

diff --git a/src/gui/widgets/FridaDock.hxx b/src/gui/widgets/FridaDock.hxx
index 4f81e853d0b687dff042144e5282e7a61c1248d9..2bfacd08aecdc04d61ab1978c6c377602a1a3563 100644 (file)
--- 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 6a26f1a8cbbb62d583a1ae159c408d60a26e5e8d..8400df874c4c8b52409df3ec499743a8bf79380a 100644 (file)
--- 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 <log4cxx/logger.h>
 

diff --git a/src/gui/widgets/LogDock.hxx b/src/gui/widgets/LogDock.hxx
index bda82038d51631a3ad553007cd8a1acd829ea23f..e71063530c4494144e54759d6844d573ca210eff 100644 (file)
--- 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 <log4cxx/appenderskeleton.h>
 
 class FridaDock;

diff --git a/src/gui/widgets/ScriptingDock.hxx b/src/gui/widgets/ScriptingDock.hxx
index 094e52011ecf9f8dacaec7a3b932223bc0b80409..9c6c09b444daab2646b8d0ca74b8ef70f9fc588c 100644 (file)
--- 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 <libguile.h>
 #include <log4cxx/logger.h>
 

diff --git a/src/qt.hxx b/src/qt.hxx
new file mode 100644 (file)
index 0000000..e0ff092
--- /dev/null
+++ b/src/qt.hxx
@@ -0,0 +1,33 @@
+#ifndef INCLUDE__qt_hxx_
+#define INCLUDE__qt_hxx_
+
+#include <QAction>
+#include <QDockWidget>
+#include <QFileDialog>
+#include <QGraphicsItem>
+#include <QGraphicsProxyWidget>
+#include <QGraphicsScene>
+#include <QGraphicsView>
+#include <QGroupBox>
+#include <QHeaderView>
+#include <QTreeWidget>
+#include <QMenu>
+#include <QMenuBar>
+#include <QMessageBox>
+#include <QPainter>
+#include <QTableWidget>
+#include <QVBoxLayout>
+#include <QGraphicsSceneMouseEvent>
+#include <QTextBrowser>
+#include <QPushButton>
+#include <QLineEdit>
+#include <QLabel>
+#include <QtGui>
+#include <QMenu>
+#include <QShortcut>
+#include <QXmlStreamWriter>
+#include <QXmlStreamReader>
+#include <QApplication>
+#include <QPluginLoader>
+
+#endif /* INCLUDE__qt_hxx_ */