peranger/qskinny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

singletons should be destroyd at program termination

Browse Source
This commit is contained in:
Uwe Rathmann 2021-10-12 10:36:45 +02:00
parent 5791341996
commit fef2464120
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/dialogs/QskDialog.cpp
View File

@ -206,13 +206,8 @@ static QString qskSelectWindow(
class QskDialog::PrivateData class QskDialog::PrivateData
{ {
public: public:
PrivateData()
: policy( QskDialog::TopLevelWindow )
{
}
QPointer< QWindow > transientParent; QPointer< QWindow > transientParent;
QskDialog::Policy policy : 2; QskDialog::Policy policy = QskDialog::TopLevelWindow;
}; };
QskDialog::QskDialog() QskDialog::QskDialog()
@ -226,11 +221,8 @@ QskDialog::~QskDialog()
QskDialog* QskDialog::instance() QskDialog* QskDialog::instance()
{ {
static QskDialog* s_instance = nullptr; static QskDialog instance;
if ( s_instance == nullptr ) return &instance;
s_instance = new QskDialog();
return s_instance;
} }
void QskDialog::setPolicy( Policy policy ) void QskDialog::setPolicy( Policy policy )

2
src/dialogs/QskDialog.h
View File

@ -147,8 +147,6 @@ class QSK_EXPORT QskDialog : public QObject
QskDialog(); QskDialog();
~QskDialog() override; ~QskDialog() override;
static QskDialog* s_instance;
class PrivateData; class PrivateData;
std::unique_ptr< PrivateData > m_data; std::unique_ptr< PrivateData > m_data;
}; };