From 9bcc168b9b27178780ee273736ddd85d3d4d328e Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Fri, 25 Sep 2020 21:03:29 +0200 Subject: [PATCH] Inspector: Move everything into the Inspector namespace --- DevTools/Inspector/RemoteObject.cpp | 4 ++++ DevTools/Inspector/RemoteObject.h | 4 ++++ DevTools/Inspector/RemoteObjectGraphModel.cpp | 4 ++++ DevTools/Inspector/RemoteObjectGraphModel.h | 4 ++++ DevTools/Inspector/RemoteObjectPropertyModel.cpp | 4 ++++ DevTools/Inspector/RemoteObjectPropertyModel.h | 4 ++++ DevTools/Inspector/RemoteProcess.cpp | 4 ++++ DevTools/Inspector/RemoteProcess.h | 4 ++++ DevTools/Inspector/main.cpp | 3 ++- 9 files changed, 34 insertions(+), 1 deletion(-) diff --git a/DevTools/Inspector/RemoteObject.cpp b/DevTools/Inspector/RemoteObject.cpp index 86ec74c669..ce88259482 100644 --- a/DevTools/Inspector/RemoteObject.cpp +++ b/DevTools/Inspector/RemoteObject.cpp @@ -27,6 +27,8 @@ #include "RemoteObject.h" #include "RemoteObjectPropertyModel.h" +namespace Inspector { + RemoteObject::RemoteObject() : m_property_model(RemoteObjectPropertyModel::create(*this)) { @@ -37,3 +39,5 @@ RemoteObjectPropertyModel& RemoteObject::property_model() m_property_model->update(); return *m_property_model; } + +} diff --git a/DevTools/Inspector/RemoteObject.h b/DevTools/Inspector/RemoteObject.h index 5f55c77352..1c231f2f01 100644 --- a/DevTools/Inspector/RemoteObject.h +++ b/DevTools/Inspector/RemoteObject.h @@ -31,6 +31,8 @@ #include #include +namespace Inspector { + class RemoteObjectPropertyModel; class RemoteObject { @@ -51,3 +53,5 @@ public: NonnullRefPtr m_property_model; }; + +} diff --git a/DevTools/Inspector/RemoteObjectGraphModel.cpp b/DevTools/Inspector/RemoteObjectGraphModel.cpp index 8579b622da..bdc2da1049 100644 --- a/DevTools/Inspector/RemoteObjectGraphModel.cpp +++ b/DevTools/Inspector/RemoteObjectGraphModel.cpp @@ -32,6 +32,8 @@ #include #include +namespace Inspector { + RemoteObjectGraphModel::RemoteObjectGraphModel(RemoteProcess& process) : m_process(process) { @@ -118,3 +120,5 @@ void RemoteObjectGraphModel::update() { did_update(); } + +} diff --git a/DevTools/Inspector/RemoteObjectGraphModel.h b/DevTools/Inspector/RemoteObjectGraphModel.h index 338c92e4e6..efcdab3cf4 100644 --- a/DevTools/Inspector/RemoteObjectGraphModel.h +++ b/DevTools/Inspector/RemoteObjectGraphModel.h @@ -32,6 +32,8 @@ #include #include +namespace Inspector { + class RemoteProcess; class RemoteObjectGraphModel final : public GUI::Model { @@ -60,3 +62,5 @@ private: GUI::Icon m_layout_icon; GUI::Icon m_timer_icon; }; + +} diff --git a/DevTools/Inspector/RemoteObjectPropertyModel.cpp b/DevTools/Inspector/RemoteObjectPropertyModel.cpp index e0a8d1852f..ac892a2f7e 100644 --- a/DevTools/Inspector/RemoteObjectPropertyModel.cpp +++ b/DevTools/Inspector/RemoteObjectPropertyModel.cpp @@ -28,6 +28,8 @@ #include "RemoteObject.h" #include "RemoteProcess.h" +namespace Inspector { + RemoteObjectPropertyModel::RemoteObjectPropertyModel(RemoteObject& object) : m_object(object) { @@ -235,3 +237,5 @@ const JsonPath* RemoteObjectPropertyModel::find_cached_path(const Vector #include +namespace Inspector { + class RemoteObject; class RemoteObjectPropertyModel final : public GUI::Model { @@ -66,3 +68,5 @@ private: RemoteObject& m_object; mutable NonnullOwnPtrVector m_paths; }; + +} diff --git a/DevTools/Inspector/RemoteProcess.cpp b/DevTools/Inspector/RemoteProcess.cpp index 6e8dce5894..6b783ad149 100644 --- a/DevTools/Inspector/RemoteProcess.cpp +++ b/DevTools/Inspector/RemoteProcess.cpp @@ -31,6 +31,8 @@ #include #include +namespace Inspector { + RemoteProcess* s_the; RemoteProcess& RemoteProcess::the() @@ -195,3 +197,5 @@ void RemoteProcess::update() exit(1); } } + +} diff --git a/DevTools/Inspector/RemoteProcess.h b/DevTools/Inspector/RemoteProcess.h index d81ad4d9a3..427b7183b5 100644 --- a/DevTools/Inspector/RemoteProcess.h +++ b/DevTools/Inspector/RemoteProcess.h @@ -29,6 +29,8 @@ #include #include +namespace Inspector { + class RemoteObjectGraphModel; class RemoteObject; @@ -63,3 +65,5 @@ private: RefPtr m_socket; NonnullOwnPtrVector m_roots; }; + +} diff --git a/DevTools/Inspector/main.cpp b/DevTools/Inspector/main.cpp index b69576aeee..19d469a628 100644 --- a/DevTools/Inspector/main.cpp +++ b/DevTools/Inspector/main.cpp @@ -36,11 +36,12 @@ #include #include #include -#include #include #include #include +using namespace Inspector; + [[noreturn]] static void print_usage_and_exit() { printf("usage: Inspector \n");