summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorShlomi Fish <shlomif@shlomifish.org>2019-05-22 15:35:03 +0000
committerShlomi Fish <shlomif@shlomifish.org>2019-05-22 16:46:15 +0000
commitd86d8a76f1cd6fd9f4b2eaacddfbc3f90e9a1aeb (patch)
treeacb996c00f1d6fc154f0cd6980c3944be2552e83 /src
parentAllow scale offset in groups using the knot like in paths (diff)
downloadinkscape-d86d8a76f1cd6fd9f4b2eaacddfbc3f90e9a1aeb.tar.gz
inkscape-d86d8a76f1cd6fd9f4b2eaacddfbc3f90e9a1aeb.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/io/resource-manager.cpp1
-rw-r--r--src/io/resource-manager.h6
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 <glibmm/object.h>
-
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