diff --git a/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.h b/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.h index 2e4e57e15a..f3dd50602c 100644 --- a/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.h +++ b/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.h @@ -18,7 +18,7 @@ class Basic2DWindowOpenGLDisplayPlugin : public OpenGLDisplayPlugin { Q_OBJECT using Parent = OpenGLDisplayPlugin; public: - virtual const QString& getName() const override { return NAME; } + virtual const QString getName() const override { return NAME; } virtual float getTargetFrameRate() const override { return _framerateTarget ? (float) _framerateTarget : TARGET_FRAMERATE_Basic2DWindowOpenGL; } diff --git a/libraries/display-plugins/src/display-plugins/NullDisplayPlugin.h b/libraries/display-plugins/src/display-plugins/NullDisplayPlugin.h index 1852ed53ee..1da0441d8f 100644 --- a/libraries/display-plugins/src/display-plugins/NullDisplayPlugin.h +++ b/libraries/display-plugins/src/display-plugins/NullDisplayPlugin.h @@ -12,7 +12,7 @@ class NullDisplayPlugin : public DisplayPlugin { public: ~NullDisplayPlugin() final {} - const QString& getName() const override { return NAME; } + const QString getName() const override { return NAME; } grouping getGrouping() const override { return DEVELOPER; } glm::uvec2 getRecommendedRenderSize() const override; diff --git a/libraries/display-plugins/src/display-plugins/hmd/DebugHmdDisplayPlugin.h b/libraries/display-plugins/src/display-plugins/hmd/DebugHmdDisplayPlugin.h index 509e13eda7..9bb82b1836 100644 --- a/libraries/display-plugins/src/display-plugins/hmd/DebugHmdDisplayPlugin.h +++ b/libraries/display-plugins/src/display-plugins/hmd/DebugHmdDisplayPlugin.h @@ -13,7 +13,7 @@ class DebugHmdDisplayPlugin : public HmdDisplayPlugin { using Parent = HmdDisplayPlugin; public: - const QString& getName() const override { return NAME; } + const QString getName() const override { return NAME; } grouping getGrouping() const override { return DEVELOPER; } bool isSupported() const override; diff --git a/libraries/display-plugins/src/display-plugins/stereo/InterleavedStereoDisplayPlugin.h b/libraries/display-plugins/src/display-plugins/stereo/InterleavedStereoDisplayPlugin.h index 8c3ebcaa6d..debd340f24 100644 --- a/libraries/display-plugins/src/display-plugins/stereo/InterleavedStereoDisplayPlugin.h +++ b/libraries/display-plugins/src/display-plugins/stereo/InterleavedStereoDisplayPlugin.h @@ -13,7 +13,7 @@ class InterleavedStereoDisplayPlugin : public StereoDisplayPlugin { Q_OBJECT using Parent = StereoDisplayPlugin; public: - const QString& getName() const override { return NAME; } + const QString getName() const override { return NAME; } grouping getGrouping() const override { return ADVANCED; } glm::uvec2 getRecommendedRenderSize() const override; diff --git a/libraries/display-plugins/src/display-plugins/stereo/SideBySideStereoDisplayPlugin.h b/libraries/display-plugins/src/display-plugins/stereo/SideBySideStereoDisplayPlugin.h index d4d20243ea..79bf2a9ecb 100644 --- a/libraries/display-plugins/src/display-plugins/stereo/SideBySideStereoDisplayPlugin.h +++ b/libraries/display-plugins/src/display-plugins/stereo/SideBySideStereoDisplayPlugin.h @@ -15,7 +15,7 @@ class SideBySideStereoDisplayPlugin : public StereoDisplayPlugin { Q_OBJECT using Parent = StereoDisplayPlugin; public: - virtual const QString& getName() const override { return NAME; } + virtual const QString getName() const override { return NAME; } virtual grouping getGrouping() const override { return ADVANCED; } virtual glm::uvec2 getRecommendedRenderSize() const override; diff --git a/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp b/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp index c1f764f5fa..39371cc3e3 100755 --- a/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp +++ b/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp @@ -18,7 +18,7 @@ #include #include -const QString KeyboardMouseDevice::NAME = "Keyboard/Mouse"; +const char* KeyboardMouseDevice::NAME = "Keyboard/Mouse"; bool KeyboardMouseDevice::_enableTouch = true; void KeyboardMouseDevice::pluginUpdate(float deltaTime, const controller::InputCalibrationData& inputCalibrationData) { diff --git a/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.h b/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.h index 8177c9bcc0..399ca4e93d 100644 --- a/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.h +++ b/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.h @@ -52,21 +52,21 @@ public: MOUSE_AXIS_WHEEL_X_POS, MOUSE_AXIS_WHEEL_X_NEG, }; - + enum TouchAxisChannel { TOUCH_AXIS_X_POS = MOUSE_AXIS_WHEEL_X_NEG + 1, TOUCH_AXIS_X_NEG, TOUCH_AXIS_Y_POS, TOUCH_AXIS_Y_NEG, }; - + enum TouchButtonChannel { TOUCH_BUTTON_PRESS = TOUCH_AXIS_Y_NEG + 1, }; // Plugin functions bool isSupported() const override { return true; } - const QString& getName() const override { return NAME; } + const QString getName() const override { return NAME; } bool isHandController() const override { return false; } @@ -88,8 +88,8 @@ public: void wheelEvent(QWheelEvent* event); static void enableTouch(bool enableTouch) { _enableTouch = enableTouch; } - - static const QString NAME; + + static const char* NAME; protected: diff --git a/libraries/input-plugins/src/input-plugins/TouchscreenDevice.cpp b/libraries/input-plugins/src/input-plugins/TouchscreenDevice.cpp index 64f02b5df3..20952df4d7 100644 --- a/libraries/input-plugins/src/input-plugins/TouchscreenDevice.cpp +++ b/libraries/input-plugins/src/input-plugins/TouchscreenDevice.cpp @@ -21,7 +21,7 @@ #include #include -const QString TouchscreenDevice::NAME = "Touchscreen"; +const char* TouchscreenDevice::NAME = "Touchscreen"; bool TouchscreenDevice::isSupported() const { for (auto touchDevice : QTouchDevice::devices()) { diff --git a/libraries/input-plugins/src/input-plugins/TouchscreenDevice.h b/libraries/input-plugins/src/input-plugins/TouchscreenDevice.h index 7bfaa23be8..65e771e8f0 100644 --- a/libraries/input-plugins/src/input-plugins/TouchscreenDevice.h +++ b/libraries/input-plugins/src/input-plugins/TouchscreenDevice.h @@ -22,7 +22,7 @@ class QGestureEvent; class TouchscreenDevice : public InputPlugin { Q_OBJECT public: - + enum TouchAxisChannel { TOUCH_AXIS_X_POS = 0, TOUCH_AXIS_X_NEG, @@ -37,7 +37,7 @@ public: // Plugin functions virtual bool isSupported() const override; - virtual const QString& getName() const override { return NAME; } + virtual const QString getName() const override { return NAME; } bool isHandController() const override { return false; } @@ -48,8 +48,8 @@ public: void touchEndEvent(const QTouchEvent* event); void touchUpdateEvent(const QTouchEvent* event); void touchGestureEvent(const QGestureEvent* event); - - static const QString NAME; + + static const char* NAME; protected: diff --git a/libraries/plugins/src/plugins/Plugin.cpp b/libraries/plugins/src/plugins/Plugin.cpp index 7c30f252c9..58c71aa97c 100644 --- a/libraries/plugins/src/plugins/Plugin.cpp +++ b/libraries/plugins/src/plugins/Plugin.cpp @@ -7,7 +7,7 @@ // #include "Plugin.h" -QString Plugin::UNKNOWN_PLUGIN_ID("unknown"); +const char* Plugin::UNKNOWN_PLUGIN_ID { "unknown" }; void Plugin::setContainer(PluginContainer* container) { _container = container; diff --git a/libraries/plugins/src/plugins/Plugin.h b/libraries/plugins/src/plugins/Plugin.h index 0452c7fbfe..15588fafa4 100644 --- a/libraries/plugins/src/plugins/Plugin.h +++ b/libraries/plugins/src/plugins/Plugin.h @@ -18,7 +18,7 @@ class Plugin : public QObject { Q_OBJECT public: /// \return human-readable name - virtual const QString& getName() const = 0; + virtual const QString getName() const = 0; typedef enum { STANDARD, ADVANCED, DEVELOPER } grouping; @@ -26,10 +26,10 @@ public: virtual grouping getGrouping() const { return STANDARD; } /// \return string ID (not necessarily human-readable) - virtual const QString& getID() const { assert(false); return UNKNOWN_PLUGIN_ID; } + virtual const QString getID() const { assert(false); return UNKNOWN_PLUGIN_ID; } virtual bool isSupported() const; - + void setContainer(PluginContainer* container); /// Called when plugin is initially loaded, typically at application start @@ -74,6 +74,6 @@ signals: protected: bool _active { false }; PluginContainer* _container { nullptr }; - static QString UNKNOWN_PLUGIN_ID; + static const char* UNKNOWN_PLUGIN_ID; }; diff --git a/libraries/shared/src/shared/Factory.h b/libraries/shared/src/shared/Factory.h index 6f1da6644b..00b7787fdb 100644 --- a/libraries/shared/src/shared/Factory.h +++ b/libraries/shared/src/shared/Factory.h @@ -23,12 +23,12 @@ namespace hifi { using Builder = std::function; using BuilderMap = std::map; - void registerBuilder(const Key& name, Builder builder) { + void registerBuilder(const Key name, Builder builder) { // FIXME don't allow name collisions _builders[name] = builder; } - Pointer create(const Key& name) const { + Pointer create(const Key name) const { const auto& entryIt = _builders.find(name); if (entryIt != _builders.end()) { return (*entryIt).second(); @@ -39,7 +39,7 @@ namespace hifi { template class Registrar { public: - Registrar(const Key& name, SimpleFactory& factory) { + Registrar(const Key name, SimpleFactory& factory) { factory.registerBuilder(name, [] { return std::make_shared(); }); } }; diff --git a/plugins/hifiCodec/src/HiFiCodec.cpp b/plugins/hifiCodec/src/HiFiCodec.cpp index 4e9336ff90..77c369dcae 100644 --- a/plugins/hifiCodec/src/HiFiCodec.cpp +++ b/plugins/hifiCodec/src/HiFiCodec.cpp @@ -18,7 +18,7 @@ #include "HiFiCodec.h" -const QString HiFiCodec::NAME = "hifiAC"; +const char* HiFiCodec::NAME { "hifiAC" }; void HiFiCodec::init() { } diff --git a/plugins/hifiCodec/src/HiFiCodec.h b/plugins/hifiCodec/src/HiFiCodec.h index eeba8d56d8..09b247ff7e 100644 --- a/plugins/hifiCodec/src/HiFiCodec.h +++ b/plugins/hifiCodec/src/HiFiCodec.h @@ -16,11 +16,11 @@ class HiFiCodec : public CodecPlugin { Q_OBJECT - + public: // Plugin functions bool isSupported() const override; - const QString& getName() const override { return NAME; } + const QString getName() const override { return NAME; } void init() override; void deinit() override; @@ -36,7 +36,7 @@ public: virtual void releaseDecoder(Decoder* decoder) override; private: - static const QString NAME; + static const char* NAME; }; #endif // hifi_HiFiCodec_h diff --git a/plugins/hifiSdl2/src/Joystick.h b/plugins/hifiSdl2/src/Joystick.h index a10e02d325..7ea17739e3 100644 --- a/plugins/hifiSdl2/src/Joystick.h +++ b/plugins/hifiSdl2/src/Joystick.h @@ -29,7 +29,7 @@ class Joystick : public QObject, public controller::InputDevice { public: using Pointer = std::shared_ptr; - const QString& getName() const { return _name; } + const QString getName() const { return _name; } SDL_GameController* getGameController() { return _sdlGameController; } diff --git a/plugins/hifiSdl2/src/SDL2Manager.cpp b/plugins/hifiSdl2/src/SDL2Manager.cpp index b6fa567aee..5ab5758412 100644 --- a/plugins/hifiSdl2/src/SDL2Manager.cpp +++ b/plugins/hifiSdl2/src/SDL2Manager.cpp @@ -41,7 +41,7 @@ static_assert( "SDL2 equvalence: Enums and values from StandardControls.h are assumed to match enums from SDL_gamecontroller.h"); -const QString SDL2Manager::NAME = "SDL2"; +const char* SDL2Manager::NAME = "SDL2"; SDL_JoystickID SDL2Manager::getInstanceId(SDL_GameController* controller) { SDL_Joystick* joystick = SDL_GameControllerGetJoystick(controller); diff --git a/plugins/hifiSdl2/src/SDL2Manager.h b/plugins/hifiSdl2/src/SDL2Manager.h index fc1654bce1..4501d0792b 100644 --- a/plugins/hifiSdl2/src/SDL2Manager.h +++ b/plugins/hifiSdl2/src/SDL2Manager.h @@ -20,11 +20,11 @@ class SDL2Manager : public InputPlugin { Q_OBJECT - + public: // Plugin functions bool isSupported() const override; - const QString& getName() const override { return NAME; } + const QString getName() const override { return NAME; } QStringList getSubdeviceNames() override; bool isHandController() const override { return false; } @@ -39,14 +39,14 @@ public: void pluginFocusOutEvent() override; void pluginUpdate(float deltaTime, const controller::InputCalibrationData& inputCalibrationData) override; - + signals: void joystickAdded(Joystick* joystick); void joystickRemoved(Joystick* joystick); - + private: SDL_JoystickID getInstanceId(SDL_GameController* controller); - + int axisInvalid() const { return SDL_CONTROLLER_AXIS_INVALID; } int axisLeftX() const { return SDL_CONTROLLER_AXIS_LEFTX; } int axisLeftY() const { return SDL_CONTROLLER_AXIS_LEFTY; } @@ -55,7 +55,7 @@ private: int axisTriggerLeft() const { return SDL_CONTROLLER_AXIS_TRIGGERLEFT; } int axisTriggerRight() const { return SDL_CONTROLLER_AXIS_TRIGGERRIGHT; } int axisMax() const { return SDL_CONTROLLER_AXIS_MAX; } - + int buttonInvalid() const { return SDL_CONTROLLER_BUTTON_INVALID; } int buttonFaceBottom() const { return SDL_CONTROLLER_BUTTON_A; } int buttonFaceRight() const { return SDL_CONTROLLER_BUTTON_B; } @@ -73,13 +73,13 @@ private: int buttonDpadLeft() const { return SDL_CONTROLLER_BUTTON_DPAD_LEFT; } int buttonDpadRight() const { return SDL_CONTROLLER_BUTTON_DPAD_RIGHT; } int buttonMax() const { return SDL_CONTROLLER_BUTTON_MAX; } - + int buttonPressed() const { return SDL_PRESSED; } int buttonRelease() const { return SDL_RELEASED; } QMap _openJoysticks; bool _isInitialized { false } ; - static const QString NAME; + static const char* NAME; QStringList _subdeviceNames; }; diff --git a/plugins/hifiSixense/src/SixenseManager.cpp b/plugins/hifiSixense/src/SixenseManager.cpp index baf13f1fae..7d443bd50d 100644 --- a/plugins/hifiSixense/src/SixenseManager.cpp +++ b/plugins/hifiSixense/src/SixenseManager.cpp @@ -55,15 +55,15 @@ bool SixenseManager::_sixenseLoaded = false; -const QString SixenseManager::NAME = "Sixense"; -const QString SixenseManager::HYDRA_ID_STRING = "Razer Hydra"; +const char* SixenseManager::NAME { "Sixense" }; +const char* SixenseManager::HYDRA_ID_STRING { "Razer Hydra" }; -const QString MENU_PARENT = "Developer"; -const QString MENU_NAME = "Sixense"; -const QString MENU_PATH = MENU_PARENT + ">" + MENU_NAME; -const QString TOGGLE_SMOOTH = "Smooth Sixense Movement"; -const QString SHOW_DEBUG_RAW = "Debug Draw Raw Data"; -const QString SHOW_DEBUG_CALIBRATED = "Debug Draw Calibrated Data"; +const char* MENU_PARENT { "Developer" }; +const char* MENU_NAME { "Sixense" }; +const char* MENU_PATH { "Developer" ">" "Sixense" }; +const char* TOGGLE_SMOOTH { "Smooth Sixense Movement" }; +const char* SHOW_DEBUG_RAW { "Debug Draw Raw Data" }; +const char* SHOW_DEBUG_CALIBRATED { "Debug Draw Calibrated Data" }; bool SixenseManager::isSupported() const { #if defined(HAVE_SIXENSE) && !defined(Q_OS_OSX) diff --git a/plugins/hifiSixense/src/SixenseManager.h b/plugins/hifiSixense/src/SixenseManager.h index c77569474e..5237dba791 100644 --- a/plugins/hifiSixense/src/SixenseManager.h +++ b/plugins/hifiSixense/src/SixenseManager.h @@ -28,8 +28,8 @@ class SixenseManager : public InputPlugin { public: // Plugin functions virtual bool isSupported() const override; - virtual const QString& getName() const override { return NAME; } - virtual const QString& getID() const override { return HYDRA_ID_STRING; } + virtual const QString getName() const override { return NAME; } + virtual const QString getID() const override { return HYDRA_ID_STRING; } // Sixense always seems to initialize even if the hydras are not present. Is there // a way we can properly detect whether the hydras are present? @@ -92,8 +92,8 @@ private: std::shared_ptr _inputDevice { std::make_shared() }; - static const QString NAME; - static const QString HYDRA_ID_STRING; + static const char* NAME; + static const char* HYDRA_ID_STRING; static bool _sixenseLoaded; }; diff --git a/plugins/pcmCodec/src/PCMCodecManager.cpp b/plugins/pcmCodec/src/PCMCodecManager.cpp index 315d0622ab..7278edaf92 100644 --- a/plugins/pcmCodec/src/PCMCodecManager.cpp +++ b/plugins/pcmCodec/src/PCMCodecManager.cpp @@ -15,7 +15,7 @@ #include "PCMCodecManager.h" -const QString PCMCodec::NAME = "pcm"; +const char* PCMCodec::NAME { "pcm" }; void PCMCodec::init() { } @@ -55,7 +55,7 @@ void PCMCodec::releaseDecoder(Decoder* decoder) { // do nothing } -const QString zLibCodec::NAME = "zlib"; +const char* zLibCodec::NAME { "zlib" }; void zLibCodec::init() { } diff --git a/plugins/pcmCodec/src/PCMCodecManager.h b/plugins/pcmCodec/src/PCMCodecManager.h index 55d7c866f1..d58a219fef 100644 --- a/plugins/pcmCodec/src/PCMCodecManager.h +++ b/plugins/pcmCodec/src/PCMCodecManager.h @@ -16,11 +16,11 @@ class PCMCodec : public CodecPlugin, public Encoder, public Decoder { Q_OBJECT - + public: // Plugin functions bool isSupported() const override; - const QString& getName() const override { return NAME; } + const QString getName() const override { return NAME; } void init() override; void deinit() override; @@ -45,7 +45,7 @@ public: virtual void trackLostFrames(int numFrames) override { } private: - static const QString NAME; + static const char* NAME; }; class zLibCodec : public CodecPlugin, public Encoder, public Decoder { @@ -54,7 +54,7 @@ class zLibCodec : public CodecPlugin, public Encoder, public Decoder { public: // Plugin functions bool isSupported() const override; - const QString& getName() const override { return NAME; } + const QString getName() const override { return NAME; } void init() override; void deinit() override; @@ -80,7 +80,7 @@ public: virtual void trackLostFrames(int numFrames) override { } private: - static const QString NAME; + static const char* NAME; }; #endif // hifi__PCMCodecManager_h