diff options
| author | Liam P. White <inkscapebrony@gmail.com> | 2014-08-13 13:15:28 +0000 |
|---|---|---|
| committer | Liam P. White <inkscapebrony@gmail.com> | 2014-08-13 13:15:28 +0000 |
| commit | ce41e6c128161e245d9523c0b0cbbba8e12823c7 (patch) | |
| tree | 2094bef3540f195f6f32b6b664e0f50c11f4bcc9 /src/libnrtype | |
| parent | Fix build (diff) | |
| download | inkscape-ce41e6c128161e245d9523c0b0cbbba8e12823c7.tar.gz inkscape-ce41e6c128161e245d9523c0b0cbbba8e12823c7.zip | |
Revert unintentional changes
(bzr r13511)
Diffstat (limited to 'src/libnrtype')
| -rw-r--r-- | src/libnrtype/font-lister.cpp | 6 | ||||
| -rw-r--r-- | src/libnrtype/font-lister.h | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/libnrtype/font-lister.cpp b/src/libnrtype/font-lister.cpp index 3c21e62e4..43c3045b1 100644 --- a/src/libnrtype/font-lister.cpp +++ b/src/libnrtype/font-lister.cpp @@ -268,12 +268,6 @@ namespace Inkscape font_list_store->thaw_notify(); } -Inkscape::FontLister* FontLister::get_instance () -{ - static Inkscape::FontLister* instance = new Inkscape::FontLister(); - return instance; -} - void FontLister::update_font_list_recursive( SPObject *r, std::list<Glib::ustring> *l ) { diff --git a/src/libnrtype/font-lister.h b/src/libnrtype/font-lister.h index 09be16f24..c89dab550 100644 --- a/src/libnrtype/font-lister.h +++ b/src/libnrtype/font-lister.h @@ -149,7 +149,12 @@ namespace Inkscape update_font_list_recursive( SPObject *r, std::list<Glib::ustring> *l ); public: - static Inkscape::FontLister* get_instance (); + static Inkscape::FontLister* + get_instance () + { + static Inkscape::FontLister* instance = new Inkscape::FontLister(); + return instance; + } /** Takes a hand written font spec and returns a Pango generated one in * standard form. |