From 3b422b54aa13be4eb59c80b1f7bb2a514aac583f Mon Sep 17 00:00:00 2001 From: Andrew Date: Fri, 18 Jan 2013 12:15:59 -0600 Subject: Re-added settings files to project. --- MultiMC.pro | 10 ++++++++-- MultiMC.pro.user | 2 +- data/settingsmacros.h | 35 ----------------------------------- data/settingsmacrosundef.h | 26 -------------------------- util/settingsmacros.h | 35 +++++++++++++++++++++++++++++++++++ util/settingsmacrosundef.h | 26 ++++++++++++++++++++++++++ 6 files changed, 70 insertions(+), 64 deletions(-) delete mode 100644 data/settingsmacros.h delete mode 100644 data/settingsmacrosundef.h create mode 100644 util/settingsmacros.h create mode 100644 util/settingsmacrosundef.h diff --git a/MultiMC.pro b/MultiMC.pro index 0ca6daee..4da6e82f 100644 --- a/MultiMC.pro +++ b/MultiMC.pro @@ -20,7 +20,9 @@ SOURCES += main.cpp\ data/stdinstance.cpp \ data/inifile.cpp \ gui/settingsdialog.cpp \ - gui/modeditwindow.cpp + gui/modeditwindow.cpp \ + data/appsettings.cpp \ + data/settingsbase.cpp HEADERS += gui/mainwindow.h \ data/instancebase.h \ @@ -29,7 +31,11 @@ HEADERS += gui/mainwindow.h \ data/stdinstance.h \ data/inifile.h \ gui/settingsdialog.h \ - gui/modeditwindow.h + gui/modeditwindow.h \ + data/appsettings.h \ + data/settingsbase.h \ + util/settingsmacros.h \ + util/settingsmacrosundef.h FORMS += gui/mainwindow.ui \ gui/settingsdialog.ui \ diff --git a/MultiMC.pro.user b/MultiMC.pro.user index 21852a10..55968de6 100644 --- a/MultiMC.pro.user +++ b/MultiMC.pro.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget diff --git a/data/settingsmacros.h b/data/settingsmacros.h deleted file mode 100644 index 94e52155..00000000 --- a/data/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 diff --git a/data/settingsmacrosundef.h b/data/settingsmacrosundef.h deleted file mode 100644 index 85b13bac..00000000 --- a/data/settingsmacrosundef.h +++ /dev/null @@ -1,26 +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 SETTINGSMACROSUNDEF_H -#define SETTINGSMACROSUNDEF_H - -#undef DEFINE_SETTING -#undef DEFINE_SETTING_STR -#undef DEFINE_SETTING_BOOL -#undef DEFINE_SETTING_INT - -#undef STR_VAL - -#endif // SETTINGSMACROSUNDEF_H diff --git a/util/settingsmacros.h b/util/settingsmacros.h new file mode 100644 index 00000000..94e52155 --- /dev/null +++ b/util/settingsmacros.h @@ -0,0 +1,35 @@ +/* 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 diff --git a/util/settingsmacrosundef.h b/util/settingsmacrosundef.h new file mode 100644 index 00000000..85b13bac --- /dev/null +++ b/util/settingsmacrosundef.h @@ -0,0 +1,26 @@ +/* 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 SETTINGSMACROSUNDEF_H +#define SETTINGSMACROSUNDEF_H + +#undef DEFINE_SETTING +#undef DEFINE_SETTING_STR +#undef DEFINE_SETTING_BOOL +#undef DEFINE_SETTING_INT + +#undef STR_VAL + +#endif // SETTINGSMACROSUNDEF_H -- cgit