Move application strings into separate namespace
Them being in the overlay controller required them to be static, which forces the compiler to give them a memory location at compile time. They also don't really fit into the overlaycontroller.
This commit is contained in:
@@ -40,6 +40,15 @@
|
||||
|
||||
#include "openvr/ivrinput.h"
|
||||
|
||||
namespace application_strings
|
||||
{
|
||||
constexpr auto applicationOrganizationName = "matzman666";
|
||||
constexpr auto applicationName = "OpenVRAdvancedSettings";
|
||||
constexpr const char* applicationKey = "matzman666.AdvancedSettings";
|
||||
constexpr const char* applicationDisplayName = "Advanced Settings";
|
||||
constexpr const char* applicationVersionString = "v2.8.0-dev";
|
||||
} // namespace application_strings
|
||||
|
||||
// application namespace
|
||||
namespace advsettings
|
||||
{
|
||||
@@ -66,13 +75,6 @@ class OverlayController : public QObject
|
||||
Q_OBJECT
|
||||
Q_PROPERTY( bool m_desktopMode READ isDesktopMode )
|
||||
|
||||
public:
|
||||
static constexpr auto applicationOrganizationName = "matzman666";
|
||||
static constexpr auto applicationName = "OpenVRAdvancedSettings";
|
||||
static constexpr const char* applicationKey = "matzman666.AdvancedSettings";
|
||||
static constexpr const char* applicationDisplayName = "Advanced Settings";
|
||||
static constexpr const char* applicationVersionString = "v2.8.0-dev";
|
||||
|
||||
private:
|
||||
vr::VROverlayHandle_t m_ulOverlayHandle = vr::k_ulOverlayHandleInvalid;
|
||||
vr::VROverlayHandle_t m_ulOverlayThumbnailHandle
|
||||
|
||||
Reference in New Issue
Block a user