diff options
| author | Robert Adam <dev@robert-adam.de> | 2021-04-17 09:37:05 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-17 09:37:05 +0300 |
| commit | baeddddec4c301389a088a9f7059a4b5d28c7dd1 (patch) | |
| tree | abf6a4001f7b795242e49b619fc3ffb6c0623633 /src/mumble/Translations.cpp | |
| parent | d4a5fc1047837ce2018a6381e0e74a51f65b2a8f (diff) | |
| parent | 923045ac6029bc7433c60ce2fad5a35e025beedd (diff) | |
Merge PR #4934: FORMAT: Run clang-format 10 on all source files1.4.0-development-snapshot-005
Diffstat (limited to 'src/mumble/Translations.cpp')
| -rw-r--r-- | src/mumble/Translations.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/mumble/Translations.cpp b/src/mumble/Translations.cpp index 377732c23..87332cd06 100644 --- a/src/mumble/Translations.cpp +++ b/src/mumble/Translations.cpp @@ -14,12 +14,13 @@ namespace Mumble { namespace Translations { - LifetimeGuard::LifetimeGuard(LifetimeGuard &&old) : m_bundledTranslator(old.m_bundledTranslator), - m_overwriteTranslator(old.m_overwriteTranslator), m_qtTranslator(old.m_qtTranslator) { + LifetimeGuard::LifetimeGuard(LifetimeGuard &&old) + : m_bundledTranslator(old.m_bundledTranslator), m_overwriteTranslator(old.m_overwriteTranslator), + m_qtTranslator(old.m_qtTranslator) { // Reset values of old - old.m_bundledTranslator = nullptr; + old.m_bundledTranslator = nullptr; old.m_overwriteTranslator = nullptr; - old.m_qtTranslator = nullptr; + old.m_qtTranslator = nullptr; } LifetimeGuard::~LifetimeGuard() { @@ -121,9 +122,11 @@ namespace Translations { app.installTranslator(guard.m_qtTranslator); } else if (guard.m_qtTranslator->load(locale, ":/mumble_overwrite_qtbase_")) { app.installTranslator(guard.m_qtTranslator); - } else if (guard.m_qtTranslator->load(locale, "qt_", prefix, QLibraryInfo::location(QLibraryInfo::TranslationsPath))) { + } else if (guard.m_qtTranslator->load(locale, "qt_", prefix, + QLibraryInfo::location(QLibraryInfo::TranslationsPath))) { app.installTranslator(guard.m_qtTranslator); - } else if (guard.m_qtTranslator->load(locale, "qtbase_", prefix, QLibraryInfo::location(QLibraryInfo::TranslationsPath))) { + } else if (guard.m_qtTranslator->load(locale, "qtbase_", prefix, + QLibraryInfo::location(QLibraryInfo::TranslationsPath))) { app.installTranslator(guard.m_qtTranslator); } else if (guard.m_qtTranslator->load(locale, ":/qt_")) { app.installTranslator(guard.m_qtTranslator); |