mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2025-04-05 05:27:39 +03:00
Move singleton instance code to static member functions.
This commit is contained in:
parent
8d6b200dd7
commit
d3fcf2e0c4
10 changed files with 65 additions and 45 deletions
|
@ -28,6 +28,8 @@
|
|||
|
||||
#include "core/Config.h"
|
||||
|
||||
Clipboard* Clipboard::m_instance(0);
|
||||
|
||||
Clipboard::Clipboard(QObject* parent)
|
||||
: QObject(parent)
|
||||
, m_timer(new QTimer(this))
|
||||
|
@ -75,13 +77,11 @@ void Clipboard::clearClipboard()
|
|||
#endif
|
||||
}
|
||||
|
||||
Clipboard* clipboard()
|
||||
Clipboard* Clipboard::instance()
|
||||
{
|
||||
static Clipboard* instance(0);
|
||||
|
||||
if (!instance) {
|
||||
instance = new Clipboard(qApp);
|
||||
if (!m_instance) {
|
||||
m_instance = new Clipboard(qApp);
|
||||
}
|
||||
|
||||
return instance;
|
||||
return m_instance;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue