diff options
| author | mrsanchos <orokhovatskiy@gmail.com> | 2018-02-16 21:05:36 +0300 |
|---|---|---|
| committer | mrsanchos <orokhovatskiy@gmail.com> | 2018-02-16 21:05:36 +0300 |
| commit | b52fd95f1cc86e86ecb696eab07c8d6b6a2e9f5d (patch) | |
| tree | a8d5a8c98d8ca3b60b0805504049275a3311f59b /api | |
| parent | 82c43da829fdac974b3d6adb8742715382ddd051 (diff) | |
| parent | 7a973ae2ad396c8413405e40bcb2eaab67c95d15 (diff) | |
Merge branch 'unstable' of https://github.com/opentrack/opentrack into unstable
Diffstat (limited to 'api')
| -rw-r--r-- | api/plugin-api.cpp | 2 | ||||
| -rw-r--r-- | api/plugin-support.hpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/api/plugin-api.cpp b/api/plugin-api.cpp index a8ede390..6c9a21bc 100644 --- a/api/plugin-api.cpp +++ b/api/plugin-api.cpp @@ -60,7 +60,7 @@ IExtensionDialog::~IExtensionDialog() bool module_status::is_ok() const { - return error.isEmpty(); + return error.isNull(); } module_status::module_status(const QString& error) : error(error) {} diff --git a/api/plugin-support.hpp b/api/plugin-support.hpp index 36a8c2bf..8fc01b98 100644 --- a/api/plugin-support.hpp +++ b/api/plugin-support.hpp @@ -159,7 +159,7 @@ private: in = in.mid(pfx_len); in = in.left(in.size() - rst_len); - static const char* names[] = + static constexpr const char* const names[] = { "opentrack-tracker-", "opentrack-proto-", |