From 181cced4e6fe3a8b6e967cedc4ff84b53b3c8c92 Mon Sep 17 00:00:00 2001 From: Brian Potchik Date: Fri, 10 May 2019 16:25:43 -0400 Subject: Use Qt qobject casting style for DockWidgets. --- ui/dockhandler.h | 13 +++++++------ ui/featuremap.h | 1 + ui/functionsview.h | 1 + ui/logview.h | 1 + ui/minigraph.h | 1 + ui/scriptingconsole.h | 1 + ui/xreflist.h | 1 + 7 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ui/dockhandler.h b/ui/dockhandler.h index d02a41fe..eb64cfc2 100644 --- a/ui/dockhandler.h +++ b/ui/dockhandler.h @@ -61,13 +61,14 @@ public: QWidget* getParentWindow() { return m_parentWindow; } - virtual void notifyFontChanged() { }; - virtual void notifyOffsetChanged(uint64_t /*offset*/) { }; - virtual void notifyThemeChanged() { }; - virtual void notifyViewChanged(ViewFrame* /*frame*/) { }; - virtual void notifyVisibilityChanged(bool /*visible*/) { }; - virtual bool shouldBeVisible(ViewFrame* /*frame*/) { return true; }; + virtual void notifyFontChanged() { } + virtual void notifyOffsetChanged(uint64_t /*offset*/) { } + virtual void notifyThemeChanged() { } + virtual void notifyViewChanged(ViewFrame* /*frame*/) { } + virtual void notifyVisibilityChanged(bool /*visible*/) { } + virtual bool shouldBeVisible(ViewFrame* /*frame*/) { return true; } }; +Q_DECLARE_INTERFACE(DockContextHandler, "binary.ninja.dockcontexthandler/1.0"); class BINARYNINJAUIAPI DockHandler: public QObject { diff --git a/ui/featuremap.h b/ui/featuremap.h index beff9ccb..e01b5f50 100644 --- a/ui/featuremap.h +++ b/ui/featuremap.h @@ -25,6 +25,7 @@ class ViewFrame; class BINARYNINJAUIAPI FeatureMap: public QWidget, public BinaryNinja::BinaryDataNotification, public DockContextHandler { Q_OBJECT + Q_INTERFACES(DockContextHandler) QImage* m_image = nullptr; QImage* m_staticImage = nullptr; diff --git a/ui/functionsview.h b/ui/functionsview.h index 4ca9a4a3..65b40c45 100644 --- a/ui/functionsview.h +++ b/ui/functionsview.h @@ -11,6 +11,7 @@ class FunctionList; class BINARYNINJAUIAPI FunctionsView: public QWidget, public DockContextHandler, public BinaryNinja::BinaryDataNotification { Q_OBJECT + Q_INTERFACES(DockContextHandler) BinaryViewRef m_data; diff --git a/ui/logview.h b/ui/logview.h index a83d36b2..0b5272c0 100644 --- a/ui/logview.h +++ b/ui/logview.h @@ -106,6 +106,7 @@ public Q_SLOTS: class BINARYNINJAUIAPI LogView: public QListView, public DockContextHandler { Q_OBJECT + Q_INTERFACES(DockContextHandler) QPointer m_logStatus; std::vector> m_actionEnableList; diff --git a/ui/minigraph.h b/ui/minigraph.h index 74e08b5c..54bf400b 100644 --- a/ui/minigraph.h +++ b/ui/minigraph.h @@ -16,6 +16,7 @@ class ViewFrame; class BINARYNINJAUIAPI MiniGraph: public QWidget, public DockContextHandler { Q_OBJECT + Q_INTERFACES(DockContextHandler) FlowGraphWidget* m_flowGraphWidget = nullptr; diff --git a/ui/scriptingconsole.h b/ui/scriptingconsole.h index a2c5c199..482516c3 100644 --- a/ui/scriptingconsole.h +++ b/ui/scriptingconsole.h @@ -56,6 +56,7 @@ class ScriptingConsoleWidget; class BINARYNINJAUIAPI ScriptingConsole: public QWidget, public DockContextHandler, BinaryNinja::ScriptingOutputListener { Q_OBJECT + Q_INTERFACES(DockContextHandler) struct ScriptOutput { diff --git a/ui/xreflist.h b/ui/xreflist.h index 148161e0..f6d4feec 100644 --- a/ui/xreflist.h +++ b/ui/xreflist.h @@ -53,6 +53,7 @@ public: class BINARYNINJAUIAPI CrossReferenceList: public QListView, public DockContextHandler { Q_OBJECT + Q_INTERFACES(DockContextHandler) ViewFrame* m_view; CrossReferenceListModel* m_list; -- cgit v1.3.1