From 5c6ef1d9c7f355931817e780525edaf45772212c Mon Sep 17 00:00:00 2001 From: ulmus-scott <36139124+ulmus-scott@users.noreply.github.com> Date: Thu, 1 Jul 2021 13:38:56 -0400 Subject: [PATCH] Spaces and braces --- mythtv/libs/libmyth/mythcontext.cpp | 71 +++++++++++++++++------------ 1 file changed, 41 insertions(+), 30 deletions(-) diff --git a/mythtv/libs/libmyth/mythcontext.cpp b/mythtv/libs/libmyth/mythcontext.cpp index 9807fa4ae87..42606317467 100644 --- a/mythtv/libs/libmyth/mythcontext.cpp +++ b/mythtv/libs/libmyth/mythcontext.cpp @@ -57,7 +57,7 @@ #define LOC QString("MythContext: ") -#if QT_VERSION < QT_VERSION_CHECK(5,10,0) +#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) #define qEnvironmentVariable getenv #endif @@ -306,7 +306,8 @@ void MythContextPrivate::EndTempWindow(void) if (m_guiStartup && !m_guiStartup->m_Exit) { MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack(); - if (mainStack) { + if (mainStack) + { mainStack->PopScreen(m_guiStartup, false); m_guiStartup = nullptr; } @@ -328,7 +329,7 @@ bool MythContextPrivate::checkPort(QString &host, int port, std::chrono::seconds { PortChecker checker; if (m_guiStartup) - QObject::connect(m_guiStartup,&GUIStartup::cancelPortCheck,&checker,&PortChecker::cancelPortCheck); + QObject::connect(m_guiStartup, &GUIStartup::cancelPortCheck, &checker, &PortChecker::cancelPortCheck); return checker.checkPort(host, port, timeLimit); } @@ -374,7 +375,8 @@ bool MythContextPrivate::Init(const bool gui, gCoreContext->SaveLocaleDefaults(); // Close GUI Startup Window. - if (m_guiStartup) { + if (m_guiStartup) + { MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack(); if (mainStack) mainStack->PopScreen(m_guiStartup, false); @@ -591,7 +593,8 @@ bool MythContextPrivate::LoadDatabaseSettings(void) } #else //elif defined Q_OS_ANDROID #define ANDROID_EXCEPTION_CHECK \ - if (env->ExceptionCheck()) { \ + if (env->ExceptionCheck()) \ + { \ env->ExceptionClear(); \ exception=true; \ } @@ -605,13 +608,13 @@ bool MythContextPrivate::LoadDatabaseSettings(void) QAndroidJniObject activity = QtAndroid::androidActivity(); ANDROID_EXCEPTION_CHECK; QAndroidJniObject appctx = activity.callObjectMethod - ("getApplicationContext","()Landroid/content/Context;"); + ("getApplicationContext", "()Landroid/content/Context;"); ANDROID_EXCEPTION_CHECK; QAndroidJniObject contentR = appctx.callObjectMethod ("getContentResolver", "()Landroid/content/ContentResolver;"); ANDROID_EXCEPTION_CHECK; QAndroidJniObject androidId = QAndroidJniObject::callStaticObjectMethod - ("android/provider/Settings$Secure","getString", + ("android/provider/Settings$Secure", "getString", "(Landroid/content/ContentResolver;Ljava/lang/String;)Ljava/lang/String;", contentR.object(), myID.object()); @@ -703,7 +706,7 @@ bool MythContextPrivate::SaveDatabaseParams( void MythContextSlotHandler::OnCloseDialog(void) { - if (d && d->m_loop + if (d && d->m_loop && d->m_loop->isRunning()) d->m_loop->exit(); } @@ -826,11 +829,10 @@ QString MythContextPrivate::TestDBconnection(bool prompt) st_success = 6 } startupState = st_start; - static const std::array kGuiStatuses - {"start","dbAwake","dbStarted","dbConnects","beWOL","beAwake", - "success" }; + static const std::array kGuiStatuses + {"start", "dbAwake", "dbStarted", "dbConnects", "beWOL", "beAwake", "success"}; - auto secondsStartupScreenDelay = gCoreContext->GetDurSetting("StartupScreenDelay",2s); + auto secondsStartupScreenDelay = gCoreContext->GetDurSetting("StartupScreenDelay", 2s); auto msStartupScreenDelay = std::chrono::duration_cast(secondsStartupScreenDelay); do { @@ -845,7 +847,8 @@ QString MythContextPrivate::TestDBconnection(bool prompt) port = 3306; std::chrono::seconds wakeupTime = 3s; int attempts = 11; - if (m_dbParams.m_wolEnabled) { + if (m_dbParams.m_wolEnabled) + { wakeupTime = m_dbParams.m_wolReconnect; attempts = m_dbParams.m_wolRetry + 1; startupState = st_start; @@ -903,7 +906,8 @@ QString MythContextPrivate::TestDBconnection(bool prompt) m_guiStartup->setMessageState("empty"); processEvents(); } - switch (startupState) { + switch (startupState) + { case st_start: if (m_dbParams.m_wolEnabled) { @@ -959,7 +963,8 @@ QString MythContextPrivate::TestDBconnection(bool prompt) startupState = st_beWOL; } } - else { + else + { startupState = st_success; break; } @@ -970,7 +975,8 @@ QString MythContextPrivate::TestDBconnection(bool prompt) backendPort = MythCoreContext::GetMasterServerPort(); [[clang::fallthrough]]; case st_beWOL: - if (!beWOLCmd.isEmpty()) { + if (!beWOLCmd.isEmpty()) + { if (attempt > 0) MythWakeup(beWOLCmd); if (!checkPort(backendIP, backendPort, useTimeout)) @@ -1065,14 +1071,18 @@ void MythContextPrivate::ShowGuiStartup(void) TempMainWindow(false); MythMainWindow *mainWindow = GetMythMainWindow(); MythScreenStack *mainStack = mainWindow->GetMainStack(); - if (mainStack) { - if (!m_guiStartup) { - m_guiStartup = new GUIStartup(mainStack,m_loop); - if (!m_guiStartup->Create()) { + if (mainStack) + { + if (!m_guiStartup) + { + m_guiStartup = new GUIStartup(mainStack, m_loop); + if (!m_guiStartup->Create()) + { delete m_guiStartup; m_guiStartup = nullptr; } - if (m_guiStartup) { + if (m_guiStartup) + { mainStack->AddScreen(m_guiStartup, false); processEvents(); } @@ -1252,7 +1262,7 @@ bool MythContextPrivate::DefaultUPnP(QString& Error) // ---------------------------------------------------------------------- - std::chrono::milliseconds timeout_ms { 2s }; + std::chrono::milliseconds timeout_ms {2s}; auto timeout_s = duration_cast(timeout_ms); LOG(VB_GENERAL, LOG_INFO, loc + QString("UPNP Search up to %1 secs") .arg(timeout_s.count())); @@ -1488,12 +1498,12 @@ bool MythContextPrivate::saveSettingsCache(void) XmlConfiguration config = XmlConfiguration("cache/contextcache.xml"); for (const auto & setting : kSettingsToSave) { - QString cacheValue = config.GetValue("Settings/"+setting,QString()); + QString cacheValue = config.GetValue("Settings/"+setting, QString()); gCoreContext->ClearOverrideSettingForSession(setting); - QString value = gCoreContext->GetSetting(setting,QString()); + QString value = gCoreContext->GetSetting(setting, QString()); if (value != cacheValue) { - config.SetValue("Settings/"+setting,value); + config.SetValue("Settings/" + setting, value); m_settingsCacheDirty = true; } } @@ -1508,9 +1518,9 @@ void MythContextPrivate::loadSettingsCacheOverride(void) const XmlConfiguration config = XmlConfiguration("cache/contextcache.xml"); for (const auto & setting : kSettingsToSave) { - if (!gCoreContext->GetSetting(setting,QString()).isEmpty()) + if (!gCoreContext->GetSetting(setting, QString()).isEmpty()) continue; - QString value = config.GetValue("Settings/"+setting,QString()); + QString value = config.GetValue("Settings/"+setting, QString()); if (!value.isEmpty()) gCoreContext->OverrideSettingForSession(setting, value); } @@ -1522,13 +1532,13 @@ void MythContextPrivate::loadSettingsCacheOverride(void) const void MythContextPrivate::clearSettingsCacheOverride(void) { - QString language = gCoreContext->GetSetting("Language",QString()); + QString language = gCoreContext->GetSetting("Language", QString()); for (const auto & setting : kSettingsToSave) gCoreContext->ClearOverrideSettingForSession(setting); // Restore power off TV setting gCoreContext->ClearOverrideSettingForSession("PowerOffTVAllowed"); - if (language != gCoreContext->GetSetting("Language",QString())) + if (language != gCoreContext->GetSetting("Language", QString())) MythTranslation::load("mythfrontend"); } @@ -1544,7 +1554,8 @@ MythContext::MythContext(QString binversion, bool needsBackend) { #ifdef _WIN32 static bool WSAStarted = false; - if (!WSAStarted) { + if (!WSAStarted) + { WSADATA wsadata; int res = WSAStartup(MAKEWORD(2, 0), &wsadata); LOG(VB_SOCKET, LOG_INFO,