diff options
| -rw-r--r-- | api/plugin-api.cpp | 2 | ||||
| -rw-r--r-- | compat/macros.hpp | 2 | ||||
| -rw-r--r-- | cv/numeric.hpp | 1 | ||||
| -rw-r--r-- | filter-accela/ftnoir_accela_filtercontrols.ui | 2 | ||||
| -rw-r--r-- | options/scoped.hpp | 8 |
5 files changed, 10 insertions, 5 deletions
diff --git a/api/plugin-api.cpp b/api/plugin-api.cpp index 6820ff2c..a8ede390 100644 --- a/api/plugin-api.cpp +++ b/api/plugin-api.cpp @@ -69,5 +69,5 @@ module_status module_status_mixin::status_ok() { return module_status(); } module_status module_status_mixin::error(const QString& error) { - return module_status(error.isEmpty() ? QString(_("Unknown error")) : error); + return module_status(error.isEmpty() ? _("Unknown error") : error); } diff --git a/compat/macros.hpp b/compat/macros.hpp index ed0bd8da..e3b5976a 100644 --- a/compat/macros.hpp +++ b/compat/macros.hpp @@ -2,7 +2,7 @@ #include <QCoreApplication> #define otr_tr(str) (QCoreApplication::translate(OTR_MODULE_NAME, (str))) -#define _(x) otr_tr(x) +#define _(x) otr_tr((x)) #if defined _MSC_VER # diff --git a/cv/numeric.hpp b/cv/numeric.hpp index 27287c1e..0edb7f58 100644 --- a/cv/numeric.hpp +++ b/cv/numeric.hpp @@ -1,7 +1,6 @@ #pragma once #include <opencv2/core.hpp> -#include <limits> namespace types { using f = double; diff --git a/filter-accela/ftnoir_accela_filtercontrols.ui b/filter-accela/ftnoir_accela_filtercontrols.ui index dc3a81e9..dbb227ee 100644 --- a/filter-accela/ftnoir_accela_filtercontrols.ui +++ b/filter-accela/ftnoir_accela_filtercontrols.ui @@ -53,7 +53,7 @@ <enum>QFrame::NoFrame</enum> </property> <property name="text"> - <string><html><head/><body><p align="right"><br/><span style=" font-size:10pt;">Accela by </span><a href="https://github.com/sthalik"><span style=" font-size:10pt; text-decoration: underline; color:#0057ae;">Stanisław Halik</span></a><span style=" font-size:10pt;"><br/>Thanks to </span><a href="https://github.com/dbaarda"><span style=" font-size:10pt; text-decoration: underline; color:#0057ae;">Donovan Baarda</span></a></p><p align="right"><span style=" font-size:10pt;">2012-2015</span></p><p align="right"><br/><span style=" font-size:8pt;">Visit </span><a href="https://github.com/opentrack/opentrack/wiki/Accela-in-opentrack-2.3"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">our wiki</span></a><span style=" font-size:8pt;"> for description of the settings.</span></p></body></html></string> + <string><html><head/><body><p align="right"><br/><span style=" font-size:10pt;">Accela by </span><a href="https://github.com/sthalik"><span style=" font-size:10pt; text-decoration: underline; color:#0057ae;">Stanisław Halik</span></a><span style=" font-size:10pt;"><br/>Thanks to </span><a href="https://github.com/dbaarda"><span style=" font-size:10pt; text-decoration: underline; color:#0057ae;">Donovan Baarda</span></a></p><p align="right"><span style=" font-size:10pt;">2012-2017</span></p><p align="right"><br/><span style=" font-size:8pt;">Visit </span><a href="https://github.com/opentrack/opentrack/wiki/Accela-in-opentrack-2.3"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">our wiki</span></a><span style=" font-size:8pt;"> for description of the settings.</span></p></body></html></string> </property> <property name="textFormat"> <enum>Qt::RichText</enum> diff --git a/options/scoped.hpp b/options/scoped.hpp index 117bbf56..49c3d18f 100644 --- a/options/scoped.hpp +++ b/options/scoped.hpp @@ -1,6 +1,7 @@ #pragma once #include "bundle.hpp" +#include "value.hpp" #include <QString> #include "export.hpp" @@ -20,11 +21,16 @@ private: struct OTR_OPTIONS_EXPORT opts { + template<typename t> using value = options::value<t>; + using bundle = options::bundle; + bundle b; + + virtual ~opts(); opts(const QString& name); + opts& operator=(const opts&) = delete; opts(const opts&) = delete; - virtual ~opts(); }; } |