diff options
| author | Andrew <forkk@forkk.net> | 2013-01-28 15:35:09 -0600 |
|---|---|---|
| committer | Andrew <forkk@forkk.net> | 2013-01-28 15:35:09 -0600 |
| commit | a25bedd7706b14cdae91556e4a577e410745f29a (patch) | |
| tree | ea803a4bcfe8dc25ee8295c406b55c4772909db1 /util | |
| parent | 8926b2422628a288fb6a04417f90e0a9739b82d1 (diff) | |
| download | MultiMC-a25bedd7706b14cdae91556e4a577e410745f29a.tar MultiMC-a25bedd7706b14cdae91556e4a577e410745f29a.tar.gz MultiMC-a25bedd7706b14cdae91556e4a577e410745f29a.tar.lz MultiMC-a25bedd7706b14cdae91556e4a577e410745f29a.tar.xz MultiMC-a25bedd7706b14cdae91556e4a577e410745f29a.zip | |
Implemented settings dialog.
Diffstat (limited to 'util')
| -rw-r--r-- | util/apputils.h (renamed from util/settingsmacrosundef.h) | 13 | ||||
| -rw-r--r-- | util/osutils.h | 27 | ||||
| -rw-r--r-- | util/settingsmacros.h | 35 |
3 files changed, 31 insertions, 44 deletions
diff --git a/util/settingsmacrosundef.h b/util/apputils.h index 85b13bac..a64adc50 100644 --- a/util/settingsmacrosundef.h +++ b/util/apputils.h @@ -13,14 +13,9 @@ * limitations under the License. */ -#ifndef SETTINGSMACROSUNDEF_H -#define SETTINGSMACROSUNDEF_H +#ifndef APPUTILS_H +#define APPUTILS_H -#undef DEFINE_SETTING -#undef DEFINE_SETTING_STR -#undef DEFINE_SETTING_BOOL -#undef DEFINE_SETTING_INT +#define STR_VAL(val) # val -#undef STR_VAL - -#endif // SETTINGSMACROSUNDEF_H +#endif // APPUTILS_H diff --git a/util/osutils.h b/util/osutils.h new file mode 100644 index 00000000..263f1f6d --- /dev/null +++ b/util/osutils.h @@ -0,0 +1,27 @@ +/* Copyright 2013 MultiMC Contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OSUTILS_H +#define OSUTILS_H + +#if defined _WIN32 | defined _WIN64 +#define WINDOWS 1 +#elif __APPLE__ & __MACH__ +#define OSX 1 +#elif __linux__ +#define LINUX 1 +#endif + +#endif // OSUTILS_H diff --git a/util/settingsmacros.h b/util/settingsmacros.h deleted file mode 100644 index 94e52155..00000000 --- a/util/settingsmacros.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2013 MultiMC Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef SETTINGSMACROS_H -#define SETTINGSMACROS_H - -#define STR_VAL(val) # val - -#define DEFINE_SETTING(funcName, name, defVal, typeName, toFunc) \ - virtual typeName Get ## funcName() const { return value(name). ## toFunc(); } \ - virtual void Set ## funcName(typeName value) { setValue(name, value); } \ - virtual void Reset ## funcName() { - -#define DEFINE_SETTING_STR(name, defVal) \ - DEFINE_SETTING(name, STR_VAL(name), defVal, QString, toString) - -#define DEFINE_SETTING_BOOL(name, defVal) \ - DEFINE_SETTING(name, STR_VAL(name), defVal, bool, toBool) - -#define DEFINE_SETTING_INT(name, defVal) \ - DEFINE_SETTING(name, STR_VAL(name), defVal, int, toInt) - -#endif // SETTINGSMACROS_H |