Mercurial > octave-nkf

comparison gui/src/resource-manager.cc @ 15161:ad9523348676 gui

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make resource_manager a singleton with Octave conventions * resource-manager.cc (resource_manager::instance_ok): New function. * resource-manager.h (resource_manager::instance): Call instance_ok. (resource_manager::instance_ok, resource_manager::cleanup_instance): New functions.
author Mike Miller <mtmiller@ieee.org>
date Sun, 12 Aug 2012 14:36:23 -0400
parents 098546e95a5e
children bc801a44bb1f
comparison
equal deleted inserted replaced
15160:973296940c89 15161:ad9523348676
23 23
24 #include <QFile> 24 #include <QFile>
25 #include <QDir> 25 #include <QDir>
26 #include <QNetworkProxy> 26 #include <QNetworkProxy>
27 27
28 #include "error.h"
28 #include "file-ops.h" 29 #include "file-ops.h"
29 #include "oct-env.h" 30 #include "oct-env.h"
31 #include "singleton-cleanup.h"
30 32
31 #include "defaults.h" 33 #include "defaults.h"
32 34
33 #include "resource-manager.h" 35 #include "resource-manager.h"
34 36
35 resource_manager resource_manager::_singleton; 37 resource_manager *resource_manager::_instance = 0;
38
39 bool
40 resource_manager::instance_ok ()
41 {
42 bool retval = true;
43
44 if (! _instance)
45 {
46 _instance = new resource_manager ();
47
48 if (_instance)
49 singleton_cleanup_list::add (cleanup_instance);
50 }
51
52 if (! _instance)
53 {
54 ::error ("unable to create resource_manager object!");
55 }
56
57 return retval;
58 }
36 59
37 resource_manager::resource_manager () 60 resource_manager::resource_manager ()
38 { 61 {
39 _settings = 0; 62 _settings = 0;
40 _first_run = false; 63 _first_run = false;