web/surfer
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove singletons when qt is still initialized; refs #170

Browse Source
This commit is contained in:
Marc Wäckerlin
2013-04-03 09:23:41 +00:00
parent 0315e93444
commit c7d6f5ac18
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/browser.hxx
View File

@@ -241,6 +241,8 @@ class Browser: public QMainWindow, protected Ui::Browser {
~Browser() { ~Browser() {
TRC; TRC;
QWebSettings::clearIconDatabase(); QWebSettings::clearIconDatabase();
qbrowserlib::Settings::purge(); // free singleton
qbrowserlib::ErrorLog::purge(); // free singleton
} }
//! Whitelisting //! Whitelisting

7
src/qbrowserlib/errorlog.hxx
View File

@@ -26,8 +26,11 @@ namespace qbrowserlib {
public: public:
//! Singleton //! Singleton
static ErrorLog& instance(QWidget* p=0) { static ErrorLog& instance(QWidget* p=0) {
static ErrorLog _instance(p); static ErrorLog* _instance(new ErrorLog(p));
return _instance; return *_instance;
}
static void purge() {
delete &instance();
} }
private: // singleton private: // singleton
ErrorLog(const ErrorLog&); ErrorLog(const ErrorLog&);

9
src/qbrowserlib/settings.hxx
View File

@@ -39,8 +39,13 @@ namespace qbrowserlib {
//! Singleton //! Singleton
static Settings& instance(MimeTypes mimetypes=MimeTypes(), QWidget* p=0, static Settings& instance(MimeTypes mimetypes=MimeTypes(), QWidget* p=0,
QSettings* settings=0, bool autoWrite=true) { QSettings* settings=0, bool autoWrite=true) {
static Settings _instance(mimetypes, p, settings, autoWrite); static Settings* _instance
return _instance; (new Settings(mimetypes, p, settings, autoWrite));
return *_instance;
}
static void purge() {
delete &instance();
} }
private: private: