Formatting

This commit is contained in:
Klaus Basan
2018-02-18 00:56:21 +01:00
parent 602373c97a
commit 2bbc433d30
7 changed files with 7 additions and 11 deletions

View File

@@ -19,7 +19,7 @@ namespace BlackCore
QString CActionBind::registerAction(const QString &action, const QPixmap &icon) QString CActionBind::registerAction(const QString &action, const QPixmap &icon)
{ {
const QString a = CActionBind::normalizeAction(action); const QString a = CActionBind::normalizeAction(action);
auto inputManger = CInputManager::instance(); CInputManager *inputManger = CInputManager::instance();
Q_ASSERT_X(inputManger, Q_FUNC_INFO, "Missing input manager"); Q_ASSERT_X(inputManger, Q_FUNC_INFO, "Missing input manager");
inputManger->registerAction(a, icon); inputManger->registerAction(a, icon);
return a; return a;

View File

@@ -89,6 +89,7 @@ namespace BlackGui
ui->le_Simulator->setText(simulator.toQString(true)); ui->le_Simulator->setText(simulator.toQString(true));
QTimer::singleShot(500, [this]() QTimer::singleShot(500, [this]()
{ {
if (!sApp || sApp->isShuttingDown()) { return; }
this->updateViewToCurrentModels(); this->updateViewToCurrentModels();
}); });
} }

View File

@@ -34,8 +34,8 @@ namespace BlackGui
} }
HWND hWindow = FindWindow(lpClassName.data(), lpWindowName.data()); HWND hWindow = FindWindow(lpClassName.data(), lpWindowName.data());
if (hWindow) { return QWindow::fromWinId(reinterpret_cast<WId>(hWindow)); }
if (hWindow) return QWindow::fromWinId(reinterpret_cast<WId>(hWindow)); return nullptr;
else return nullptr;
} }
} }

View File

@@ -21,7 +21,6 @@ namespace BlackGui
class BLACKGUI_EXPORT CWindowFinderWindows : public IWindowFinder class BLACKGUI_EXPORT CWindowFinderWindows : public IWindowFinder
{ {
public: public:
//! Constructor //! Constructor
CWindowFinderWindows() {} CWindowFinderWindows() {}
@@ -30,7 +29,6 @@ namespace BlackGui
//! \copydoc IWindowFinder::findForeignWindow //! \copydoc IWindowFinder::findForeignWindow
virtual QWindow *findForeignWindow(const QString &windowName, const QString &className) override; virtual QWindow *findForeignWindow(const QString &windowName, const QString &className) override;
}; };
} }

View File

@@ -42,4 +42,4 @@ namespace BlackInput
}; };
} }
#endif // BLACKINPUT_JOYSTICK_H #endif // guard

View File

@@ -37,7 +37,7 @@ namespace BlackMisc
CAtomicFile(const QString &filename) : QFile(filename) {} CAtomicFile(const QString &filename) : QFile(filename) {}
//! \copydoc QFile::~QFile //! \copydoc QFile::~QFile
~CAtomicFile() { if (std::uncaught_exception()) { QFile::close(); } } virtual ~CAtomicFile() { if (std::uncaught_exception()) { QFile::close(); } }
//! \copydoc QFile::open //! \copydoc QFile::open
//! Just before opening the file, the filename is changed so we actually write to a temporary file. //! Just before opening the file, the filename is changed so we actually write to a temporary file.

View File

@@ -152,10 +152,7 @@ void CSwiftData::initMenu()
void CSwiftData::performGracefulShutdown() void CSwiftData::performGracefulShutdown()
{ {
if (m_updater) if (m_updater) { m_updater->abandonAndWait(); }
{
m_updater->abandonAndWait();
}
} }
void CSwiftData::consolidationSettingChanged() void CSwiftData::consolidationSettingChanged()