summaryrefslogtreecommitdiffstats
path: root/tests/TestUtil.h
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-09-06 18:16:56 +0200
committerPetr Mrázek <peterix@gmail.com>2014-09-06 19:03:05 +0200
commit20cb97a35af5097e9d3b2062c0dfcb5f2e5fff5c (patch)
tree56bf51e681f2e73590a549499bd83d7b505c39f8 /tests/TestUtil.h
parent36efcf8d3c0cbd7823fc65569cfc2b011435db2c (diff)
downloadMultiMC-20cb97a35af5097e9d3b2062c0dfcb5f2e5fff5c.tar
MultiMC-20cb97a35af5097e9d3b2062c0dfcb5f2e5fff5c.tar.gz
MultiMC-20cb97a35af5097e9d3b2062c0dfcb5f2e5fff5c.tar.lz
MultiMC-20cb97a35af5097e9d3b2062c0dfcb5f2e5fff5c.tar.xz
MultiMC-20cb97a35af5097e9d3b2062c0dfcb5f2e5fff5c.zip
Sync from quickmods
Diffstat (limited to 'tests/TestUtil.h')
-rw-r--r--tests/TestUtil.h35
1 files changed, 18 insertions, 17 deletions
diff --git a/tests/TestUtil.h b/tests/TestUtil.h
index e7017743..87a910d9 100644
--- a/tests/TestUtil.h
+++ b/tests/TestUtil.h
@@ -9,29 +9,30 @@
#include "test_config.h"
-struct TestsInternal
+class TestsInternal
{
- static QByteArray readFile(const QString &fileName)
- {
- QFile f(fileName);
- f.open(QFile::ReadOnly);
- return f.readAll();
- }
- static QString readFileUtf8(const QString &fileName)
- {
- return QString::fromUtf8(readFile(fileName));
- }
+public:
+ static QByteArray readFile(const QString &fileName)
+ {
+ QFile f(fileName);
+ f.open(QFile::ReadOnly);
+ return f.readAll();
+ }
+ static QString readFileUtf8(const QString &fileName)
+ {
+ return QString::fromUtf8(readFile(fileName));
+ }
};
-#define MULTIMC_GET_TEST_FILE(file) TestsInternal::readFile(QFINDTESTDATA( file ))
-#define MULTIMC_GET_TEST_FILE_UTF8(file) TestsInternal::readFileUtf8(QFINDTESTDATA( file ))
+#define MULTIMC_GET_TEST_FILE(file) TestsInternal::readFile(QFINDTESTDATA(file))
+#define MULTIMC_GET_TEST_FILE_UTF8(file) TestsInternal::readFileUtf8(QFINDTESTDATA(file))
#ifdef Q_OS_LINUX
-# define _MMC_EXTRA_ARGV , "-platform", "offscreen"
-# define _MMC_EXTRA_ARGC 2
+#define _MMC_EXTRA_ARGV , "-platform", "offscreen"
+#define _MMC_EXTRA_ARGC 2
#else
-# define _MMC_EXTRA_ARGV
-# define _MMC_EXTRA_ARGC 0
+#define _MMC_EXTRA_ARGV
+#define _MMC_EXTRA_ARGC 0
#endif