From d86d8a76f1cd6fd9f4b2eaacddfbc3f90e9a1aeb Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Wed, 22 May 2019 18:35:03 +0300 Subject: Remove ResourceManager dep on Glib::object. As suggested in http://wiki.inkscape.org/wiki/index.php?title=Refactoring_projects&oldid=112116 . Needs review but seems to work well. --- src/io/resource-manager.cpp | 1 - src/io/resource-manager.h | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/io/resource-manager.cpp b/src/io/resource-manager.cpp index 406157ebd..1ae02a886 100644 --- a/src/io/resource-manager.cpp +++ b/src/io/resource-manager.cpp @@ -423,7 +423,6 @@ bool ResourceManagerImpl::searchUpwards( std::string const &base, std::string co static ResourceManagerImpl* theInstance = nullptr; ResourceManager::ResourceManager() - : Glib::Object() { } diff --git a/src/io/resource-manager.h b/src/io/resource-manager.h index 48f0687b2..7c1e242d4 100644 --- a/src/io/resource-manager.h +++ b/src/io/resource-manager.h @@ -10,13 +10,11 @@ #ifndef SEEN_INKSCAPE_RESOURCE_MANAGER_H #define SEEN_INKSCAPE_RESOURCE_MANAGER_H -#include - class SPDocument; namespace Inkscape { -class ResourceManager : public Glib::Object { +class ResourceManager { public: static ResourceManager& getManager(); @@ -25,7 +23,7 @@ public: protected: ResourceManager(); - ~ResourceManager() override; + virtual ~ResourceManager(); private: ResourceManager(ResourceManager const &) = delete; // no copy -- cgit v1.2.3