diff --git a/Userland/DevTools/HackStudio/Project.cpp b/Userland/DevTools/HackStudio/Project.cpp index ccba467776..12aca881f6 100644 --- a/Userland/DevTools/HackStudio/Project.cpp +++ b/Userland/DevTools/HackStudio/Project.cpp @@ -16,10 +16,6 @@ Project::Project(const String& root_path) m_model = GUI::FileSystemModel::create(root_path, GUI::FileSystemModel::Mode::FilesAndDirectories); } -Project::~Project() -{ -} - OwnPtr Project::open_with_root_path(const String& root_path) { if (!Core::File::is_directory(root_path)) diff --git a/Userland/DevTools/HackStudio/Project.h b/Userland/DevTools/HackStudio/Project.h index d20af59a4d..28c1918977 100644 --- a/Userland/DevTools/HackStudio/Project.h +++ b/Userland/DevTools/HackStudio/Project.h @@ -19,8 +19,6 @@ class Project { AK_MAKE_NONMOVABLE(Project); public: - ~Project(); - static OwnPtr open_with_root_path(const String& root_path); GUI::FileSystemModel& model() { return *m_model; } diff --git a/Userland/DevTools/Inspector/InspectorServerClient.h b/Userland/DevTools/Inspector/InspectorServerClient.h new file mode 100644 index 0000000000..477ad1cf69 --- /dev/null +++ b/Userland/DevTools/Inspector/InspectorServerClient.h @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2018-2021, Andreas Kling + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#pragma once + +#include +#include +#include + +namespace Inspector { + +class InspectorServerClient final + : public IPC::ServerConnection + , public InspectorClientEndpoint { + C_OBJECT(InspectorServerClient); + +public: + virtual void handshake() override + { + greet(); + } + + virtual ~InspectorServerClient() override = default; + +private: + InspectorServerClient() + : IPC::ServerConnection(*this, "/tmp/portal/inspector") + { + handshake(); + } + + virtual void dummy() override { } +}; + +} diff --git a/Userland/DevTools/Inspector/RemoteProcess.cpp b/Userland/DevTools/Inspector/RemoteProcess.cpp index 185c7a4f4b..93d07cd83c 100644 --- a/Userland/DevTools/Inspector/RemoteProcess.cpp +++ b/Userland/DevTools/Inspector/RemoteProcess.cpp @@ -8,37 +8,11 @@ #include "RemoteObject.h" #include "RemoteObjectGraphModel.h" #include "RemoteObjectPropertyModel.h" -#include -#include -#include #include #include namespace Inspector { -class InspectorServerClient final - : public IPC::ServerConnection - , public InspectorClientEndpoint { - C_OBJECT(InspectorServerClient); - -public: - virtual void handshake() override - { - greet(); - } - - virtual ~InspectorServerClient() override { } - -private: - InspectorServerClient() - : IPC::ServerConnection(*this, "/tmp/portal/inspector") - { - handshake(); - } - - virtual void dummy() override { } -}; - RemoteProcess* s_the; RemoteProcess& RemoteProcess::the() @@ -54,10 +28,6 @@ RemoteProcess::RemoteProcess(pid_t pid) m_client = InspectorServerClient::construct(); } -RemoteProcess::~RemoteProcess() -{ -} - void RemoteProcess::handle_identify_response(const JsonObject& response) { int pid = response.get("pid").to_int(); diff --git a/Userland/DevTools/Inspector/RemoteProcess.h b/Userland/DevTools/Inspector/RemoteProcess.h index 56daab8c62..5f821db693 100644 --- a/Userland/DevTools/Inspector/RemoteProcess.h +++ b/Userland/DevTools/Inspector/RemoteProcess.h @@ -6,12 +6,12 @@ #pragma once +#include "InspectorServerClient.h" #include #include namespace Inspector { -class InspectorServerClient; class RemoteObjectGraphModel; class RemoteObject; @@ -20,7 +20,6 @@ public: static RemoteProcess& the(); explicit RemoteProcess(pid_t); - ~RemoteProcess(); void update(); pid_t pid() const { return m_pid; } diff --git a/Userland/DevTools/Profiler/Profile.cpp b/Userland/DevTools/Profiler/Profile.cpp index 2c6f17f170..59f1923954 100644 --- a/Userland/DevTools/Profiler/Profile.cpp +++ b/Userland/DevTools/Profiler/Profile.cpp @@ -47,10 +47,6 @@ Profile::Profile(Vector processes, Vector events) rebuild_tree(); } -Profile::~Profile() -{ -} - GUI::Model& Profile::model() { return *m_model; diff --git a/Userland/DevTools/Profiler/Profile.h b/Userland/DevTools/Profiler/Profile.h index 799ff267ec..eaccf27ac6 100644 --- a/Userland/DevTools/Profiler/Profile.h +++ b/Userland/DevTools/Profiler/Profile.h @@ -6,7 +6,11 @@ #pragma once +#include "DisassemblyModel.h" #include "Process.h" +#include "Profile.h" +#include "ProfileModel.h" +#include "SamplesModel.h" #include #include #include @@ -22,11 +26,6 @@ namespace Profiler { -class DisassemblyModel; -class Profile; -class ProfileModel; -class SamplesModel; - class ProfileNode : public RefCounted { public: static NonnullRefPtr create(FlyString object_name, String symbol, u32 address, u32 offset, u64 timestamp, pid_t pid) @@ -130,7 +129,6 @@ struct ProcessFilter { class Profile { public: static Result, String> load_from_perfcore_file(const StringView& path); - ~Profile(); GUI::Model& model(); GUI::Model& samples_model(); diff --git a/Userland/DevTools/UserspaceEmulator/RangeAllocator.cpp b/Userland/DevTools/UserspaceEmulator/RangeAllocator.cpp index 9b04780187..d263f9afab 100644 --- a/Userland/DevTools/UserspaceEmulator/RangeAllocator.cpp +++ b/Userland/DevTools/UserspaceEmulator/RangeAllocator.cpp @@ -26,10 +26,6 @@ void RangeAllocator::initialize_with_range(VirtualAddress base, size_t size) m_available_ranges.append({ base, size }); } -RangeAllocator::~RangeAllocator() -{ -} - void RangeAllocator::dump() const { dbgln("RangeAllocator({})", this); diff --git a/Userland/DevTools/UserspaceEmulator/RangeAllocator.h b/Userland/DevTools/UserspaceEmulator/RangeAllocator.h index 9f4c28e36f..c8264bd190 100644 --- a/Userland/DevTools/UserspaceEmulator/RangeAllocator.h +++ b/Userland/DevTools/UserspaceEmulator/RangeAllocator.h @@ -14,7 +14,6 @@ namespace UserspaceEmulator { class RangeAllocator { public: RangeAllocator(); - ~RangeAllocator(); void initialize_with_range(VirtualAddress, size_t);