summaryrefslogtreecommitdiffstats
path: root/libsettings/src/keyring.cpp
diff options
context:
space:
mode:
authorOrochimarufan <orochimarufan.x3@gmail.com>2013-02-25 22:47:03 +0100
committerOrochimarufan <orochimarufan.x3@gmail.com>2013-03-22 13:56:57 +0100
commitf4c9cb8c1d395422b7e4f1c27ac92b6df08a39bb (patch)
tree595a93410af4ff4e238d27d78b030c595915d4cc /libsettings/src/keyring.cpp
parentf01bf10dc511268ead551a191a6a3211c006ba44 (diff)
downloadMultiMC-f4c9cb8c1d395422b7e4f1c27ac92b6df08a39bb.tar
MultiMC-f4c9cb8c1d395422b7e4f1c27ac92b6df08a39bb.tar.gz
MultiMC-f4c9cb8c1d395422b7e4f1c27ac92b6df08a39bb.tar.lz
MultiMC-f4c9cb8c1d395422b7e4f1c27ac92b6df08a39bb.tar.xz
MultiMC-f4c9cb8c1d395422b7e4f1c27ac92b6df08a39bb.zip
refactor indendation, fix a bug in MinecraftProcess & fix a bug in
InstanceLauncher
Diffstat (limited to 'libsettings/src/keyring.cpp')
-rw-r--r--libsettings/src/keyring.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/libsettings/src/keyring.cpp b/libsettings/src/keyring.cpp
index 1b13e35c..9eaba684 100644
--- a/libsettings/src/keyring.cpp
+++ b/libsettings/src/keyring.cpp
@@ -6,7 +6,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -37,27 +37,27 @@ class Win32Keystore;
Keyring *Keyring::instance()
{
- if (m_instance == nullptr)
- {
+ if (m_instance == nullptr)
+ {
#ifdef KEYRING
- m_instance = new KEYRING();
- if (!m_instance->isValid())
- {
- qWarning("Could not create SystemKeyring! falling back to StubKeyring.");
- m_instance = new StubKeyring();
- }
+ m_instance = new KEYRING();
+ if (!m_instance->isValid())
+ {
+ qWarning("Could not create SystemKeyring! falling back to StubKeyring.");
+ m_instance = new StubKeyring();
+ }
#else
- qWarning("Keyrings are not supported on your OS. Fallback StubKeyring is insecure!");
- m_instance = new StubKeyring();
+ qWarning("Keyrings are not supported on your OS. Fallback StubKeyring is insecure!");
+ m_instance = new StubKeyring();
#endif
- atexit(Keyring::destroy);
- }
- return m_instance;
+ atexit(Keyring::destroy);
+ }
+ return m_instance;
}
void Keyring::destroy()
{
- delete m_instance;
+ delete m_instance;
}
Keyring *Keyring::m_instance;