Martchus
/
cpp-utilities
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename TestApplication::m_instance to TestApplication::s_instance

This commit is contained in:
Martchus 2019-06-17 21:03:37 +02:00
parent 5efb1b4710
commit 66bb3e5253
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/testutils.cpp
View File

@ -93,7 +93,7 @@ bool makeDir(const string &path)
#endif #endif
} }
TestApplication *TestApplication::m_instance = nullptr; TestApplication *TestApplication::s_instance = nullptr;
/*! /*!
* \class TestApplication * \class TestApplication
@ -123,10 +123,10 @@ TestApplication::TestApplication(int argc, const char *const *argv)
, m_unitsArg("units", 'u', "specifies the units to test; omit to test all units", { "unit1", "unit2", "unit3" }) , m_unitsArg("units", 'u', "specifies the units to test; omit to test all units", { "unit1", "unit2", "unit3" })
{ {
// check whether there is already an instance // check whether there is already an instance
if (m_instance) { if (s_instance) {
throw runtime_error("only one TestApplication instance allowed at a time"); throw runtime_error("only one TestApplication instance allowed at a time");
} }
m_instance = this; s_instance = this;
// handle specified arguments (if present) // handle specified arguments (if present)
if (argc && argv) { if (argc && argv) {
@ -212,7 +212,7 @@ TestApplication::TestApplication(int argc, const char *const *argv)
*/ */
TestApplication::~TestApplication() TestApplication::~TestApplication()
{ {
m_instance = nullptr; s_instance = nullptr;
} }
/*! /*!

6
tests/testutils.h
View File

@ -61,7 +61,7 @@ private:
std::vector<std::string> m_testFilesPaths; std::vector<std::string> m_testFilesPaths;
std::string m_workingDir; std::string m_workingDir;
bool m_valid; bool m_valid;
static TestApplication *m_instance; static TestApplication *s_instance;
}; };
/*! /*!
@ -80,7 +80,7 @@ inline TestApplication::operator bool() const
*/ */
inline const TestApplication *TestApplication::instance() inline const TestApplication *TestApplication::instance()
{ {
return TestApplication::m_instance; return TestApplication::s_instance;
} }
/*! /*!
@ -88,7 +88,7 @@ inline const TestApplication *TestApplication::instance()
*/ */
inline const char *TestApplication::appPath() inline const char *TestApplication::appPath()
{ {
return m_instance ? m_instance->applicationPath() : ""; return s_instance ? s_instance->applicationPath() : "";
} }
/*! /*!