Skip to content

Commit

Permalink
Remove unneeded 'Razer' prefix from various types
Browse files Browse the repository at this point in the history 
Everything is already in the openrazer namespace, so no point in making
it extra verbose. There won't be any naming conflicts anyways.
  • Loading branch information
@z3ntu
z3ntu committed May 5, 2024
1 parent 7ab28c8 commit 858223e
Show file tree
Hide file tree
Showing 14 changed files with 223 additions and 223 deletions.
66 changes: 33 additions & 33 deletions include/libopenrazer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "libopenrazer/manager.h"
#include "libopenrazer/misc.h"
#include "libopenrazer/openrazer.h"
#include "libopenrazer/razercapability.h"
#include "libopenrazer/capability.h"

// NOTE: DBus types -> Qt/C++ types: http://doc.qt.io/qt-5/qdbustypesystem.html#primitive-types

Expand All @@ -25,42 +25,42 @@ namespace libopenrazer {
/*!
* List of effects provided by OpenRazer.
*/
const QVector<RazerCapability> ledFxList {
RazerCapability(::openrazer::RazerEffect::Off, Led::tr("Off"), 0),
RazerCapability(::openrazer::RazerEffect::On, Led::tr("On"), 0),
RazerCapability(::openrazer::RazerEffect::Static, Led::tr("Static"), 1),
RazerCapability(::openrazer::RazerEffect::Breathing, Led::tr("Breathing"), 1),
RazerCapability(::openrazer::RazerEffect::BreathingDual, Led::tr("Breathing Dual"), 2),
RazerCapability(::openrazer::RazerEffect::BreathingRandom, Led::tr("Breathing Random"), 0),
RazerCapability(::openrazer::RazerEffect::BreathingMono, Led::tr("Breathing"), 0),
RazerCapability(::openrazer::RazerEffect::Blinking, Led::tr("Blinking"), 1),
RazerCapability(::openrazer::RazerEffect::Spectrum, Led::tr("Spectrum"), 0),
RazerCapability(::openrazer::RazerEffect::Wave, Led::tr("Wave"), 0),
RazerCapability(::openrazer::RazerEffect::Wheel, Led::tr("Wheel"), 0),
RazerCapability(::openrazer::RazerEffect::Reactive, Led::tr("Reactive"), 1),
RazerCapability(::openrazer::RazerEffect::Ripple, Led::tr("Ripple"), 1),
RazerCapability(::openrazer::RazerEffect::RippleRandom, Led::tr("Ripple Random"), 0),
const QVector<Capability> ledFxList {
Capability(::openrazer::Effect::Off, Led::tr("Off"), 0),
Capability(::openrazer::Effect::On, Led::tr("On"), 0),
Capability(::openrazer::Effect::Static, Led::tr("Static"), 1),
Capability(::openrazer::Effect::Breathing, Led::tr("Breathing"), 1),
Capability(::openrazer::Effect::BreathingDual, Led::tr("Breathing Dual"), 2),
Capability(::openrazer::Effect::BreathingRandom, Led::tr("Breathing Random"), 0),
Capability(::openrazer::Effect::BreathingMono, Led::tr("Breathing"), 0),
Capability(::openrazer::Effect::Blinking, Led::tr("Blinking"), 1),
Capability(::openrazer::Effect::Spectrum, Led::tr("Spectrum"), 0),
Capability(::openrazer::Effect::Wave, Led::tr("Wave"), 0),
Capability(::openrazer::Effect::Wheel, Led::tr("Wheel"), 0),
Capability(::openrazer::Effect::Reactive, Led::tr("Reactive"), 1),
Capability(::openrazer::Effect::Ripple, Led::tr("Ripple"), 1),
Capability(::openrazer::Effect::RippleRandom, Led::tr("Ripple Random"), 0),
};

/*!
* Mapping from openrazer::RazerLedId to a human readable string
* Mapping from openrazer::LedId to a human readable string
*/
const QHash<::openrazer::RazerLedId, QString> ledIdToStringTable {
{ ::openrazer::RazerLedId::Unspecified, "" },
{ ::openrazer::RazerLedId::ScrollWheelLED, Led::tr("Scroll Wheel") },
{ ::openrazer::RazerLedId::BatteryLED, Led::tr("Battery") },
{ ::openrazer::RazerLedId::LogoLED, Led::tr("Logo") },
{ ::openrazer::RazerLedId::BacklightLED, Led::tr("Backlight") },
{ ::openrazer::RazerLedId::MacroRecordingLED, Led::tr("Macro Recording") },
{ ::openrazer::RazerLedId::GameModeLED, Led::tr("Game Mode") },
{ ::openrazer::RazerLedId::KeymapRedLED, Led::tr("Keymap Red") },
{ ::openrazer::RazerLedId::KeymapGreenLED, Led::tr("Keymap Green") },
{ ::openrazer::RazerLedId::KeymapBlueLED, Led::tr("Keymap Blue") },
{ ::openrazer::RazerLedId::RightSideLED, Led::tr("Right Side") },
{ ::openrazer::RazerLedId::LeftSideLED, Led::tr("Left Side") },
{ ::openrazer::RazerLedId::ChargingLED, Led::tr("Charging") },
{ ::openrazer::RazerLedId::FastChargingLED, Led::tr("Fast Charging") },
{ ::openrazer::RazerLedId::FullyChargedLED, Led::tr("Fully Charged") },
const QHash<::openrazer::LedId, QString> ledIdToStringTable {
{ ::openrazer::LedId::Unspecified, "" },
{ ::openrazer::LedId::ScrollWheelLED, Led::tr("Scroll Wheel") },
{ ::openrazer::LedId::BatteryLED, Led::tr("Battery") },
{ ::openrazer::LedId::LogoLED, Led::tr("Logo") },
{ ::openrazer::LedId::BacklightLED, Led::tr("Backlight") },
{ ::openrazer::LedId::MacroRecordingLED, Led::tr("Macro Recording") },
{ ::openrazer::LedId::GameModeLED, Led::tr("Game Mode") },
{ ::openrazer::LedId::KeymapRedLED, Led::tr("Keymap Red") },
{ ::openrazer::LedId::KeymapGreenLED, Led::tr("Keymap Green") },
{ ::openrazer::LedId::KeymapBlueLED, Led::tr("Keymap Blue") },
{ ::openrazer::LedId::RightSideLED, Led::tr("Right Side") },
{ ::openrazer::LedId::LeftSideLED, Led::tr("Left Side") },
{ ::openrazer::LedId::ChargingLED, Led::tr("Charging") },
{ ::openrazer::LedId::FastChargingLED, Led::tr("Fast Charging") },
{ ::openrazer::LedId::FullyChargedLED, Led::tr("Fully Charged") },
};

}
Expand Down
24 changes: 12 additions & 12 deletions include/libopenrazer/razercapability.h → include/libopenrazer/capability.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
//
// SPDX-License-Identifier: GPL-3.0-or-later

#ifndef RAZERCAPABILITY_H
#define RAZERCAPABILITY_H
#ifndef CAPABILITY_H
#define CAPABILITY_H

namespace libopenrazer {

Expand All @@ -12,15 +12,15 @@ namespace libopenrazer {
*
* Helper-class used by libopenrazer for providing lists of lighting effect capabilities that can be implemented e.g. in a combobox. It can contain the number of colors an effect needs, if the effect is the 'Wave' effect and a human readable string for displaying in the UI.
*/
class RazerCapability
class Capability
{
public:
/// @cond
RazerCapability();
RazerCapability(::openrazer::RazerEffect identifier, QString displayString, int numColors);
RazerCapability(::openrazer::RazerEffect, QString displayString);
RazerCapability(const RazerCapability &other);
~RazerCapability();
Capability();
Capability(::openrazer::Effect identifier, QString displayString, int numColors);
Capability(::openrazer::Effect, QString displayString);
Capability(const Capability &other);
~Capability();
/// @endcond

/*!
Expand All @@ -33,7 +33,7 @@ class RazerCapability
*
* e.g. \c "lighting_logo_spectrum"
*/
::openrazer::RazerEffect getIdentifier() const;
::openrazer::Effect getIdentifier() const;

/*!
* Returns a human-readable string describing the capability
Expand All @@ -44,12 +44,12 @@ class RazerCapability

private:
int numColors;
::openrazer::RazerEffect identifier;
::openrazer::Effect identifier;
QString displayString;
};

}

Q_DECLARE_METATYPE(libopenrazer::RazerCapability)
Q_DECLARE_METATYPE(libopenrazer::Capability)

#endif // RAZERCAPABILITY_H
#endif // CAPABILITY_H
24 changes: 12 additions & 12 deletions include/libopenrazer/device.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,14 +97,14 @@ class Device : public QObject
*
* \sa getDPI(), maxDPI(), getAllowedDPIValues()
*/
virtual void setDPI(::openrazer::RazerDPI dpi) = 0;
virtual void setDPI(::openrazer::DPI dpi) = 0;

/*!
* Returns the DPI of the mouse (e.g. `[800, 800]`).
*
* \sa setDPI()
*/
virtual ::openrazer::RazerDPI getDPI() = 0;
virtual ::openrazer::DPI getDPI() = 0;

/*!
* Sets the DPI stages of the mouse to the specified \a dpiStages and sets stage nr. \a activeStage active.
Expand All @@ -114,7 +114,7 @@ class Device : public QObject
*
* \sa getDPIStages(), maxDPI()
*/
virtual void setDPIStages(uchar activeStage, QVector<::openrazer::RazerDPI> dpiStages) = 0;
virtual void setDPIStages(uchar activeStage, QVector<::openrazer::DPI> dpiStages) = 0;

/*!
* Returns a pair of the active DPI stage and the configured DPI stages of the mouse.
Expand All @@ -124,7 +124,7 @@ class Device : public QObject
*
* \sa setDPIStages(), maxDPI()
*/
virtual QPair<uchar, QVector<::openrazer::RazerDPI>> getDPIStages() = 0;
virtual QPair<uchar, QVector<::openrazer::DPI>> getDPIStages() = 0;

/*!
* Returns the maximum DPI possible for the device.
Expand Down Expand Up @@ -232,10 +232,10 @@ class Device : public ::libopenrazer::Device
ushort getPollRate() override;
void setPollRate(ushort pollrate) override;
QVector<ushort> getSupportedPollRates() override;
void setDPI(::openrazer::RazerDPI dpi) override;
::openrazer::RazerDPI getDPI() override;
void setDPIStages(uchar activeStage, QVector<::openrazer::RazerDPI> dpiStages) override;
QPair<uchar, QVector<::openrazer::RazerDPI>> getDPIStages() override;
void setDPI(::openrazer::DPI dpi) override;
::openrazer::DPI getDPI() override;
void setDPIStages(uchar activeStage, QVector<::openrazer::DPI> dpiStages) override;
QPair<uchar, QVector<::openrazer::DPI>> getDPIStages() override;
ushort maxDPI() override;
QVector<ushort> getAllowedDPI() override;
double getBatteryPercent() override;
Expand Down Expand Up @@ -282,10 +282,10 @@ class Device : public ::libopenrazer::Device
ushort getPollRate() override;
void setPollRate(ushort pollrate) override;
QVector<ushort> getSupportedPollRates() override;
void setDPI(::openrazer::RazerDPI dpi) override;
::openrazer::RazerDPI getDPI() override;
void setDPIStages(uchar activeStage, QVector<::openrazer::RazerDPI> dpiStages) override;
QPair<uchar, QVector<::openrazer::RazerDPI>> getDPIStages() override;
void setDPI(::openrazer::DPI dpi) override;
::openrazer::DPI getDPI() override;
void setDPIStages(uchar activeStage, QVector<::openrazer::DPI> dpiStages) override;
QPair<uchar, QVector<::openrazer::DPI>> getDPIStages() override;
ushort maxDPI() override;
QVector<ushort> getAllowedDPI() override;
double getBatteryPercent() override;
Expand Down
20 changes: 10 additions & 10 deletions include/libopenrazer/led.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ class Led : public QObject
/*!
* Returns if the device has the specified \a fx
*/
virtual bool hasFx(::openrazer::RazerEffect fx) = 0;
virtual bool hasFx(::openrazer::Effect fx) = 0;

/*!
* Returns the currently active effect
*/
virtual ::openrazer::RazerEffect getCurrentEffect() = 0;
virtual ::openrazer::Effect getCurrentEffect() = 0;

/*!
* Returns the currently active colors (the list will have at least 3 elements)
Expand All @@ -51,7 +51,7 @@ class Led : public QObject
/*!
* Returns the Led ID of this Led
*/
virtual ::openrazer::RazerLedId getLedId() = 0;
virtual ::openrazer::LedId getLedId() = 0;

/*!
* Sets the LED to none / off.
Expand Down Expand Up @@ -141,16 +141,16 @@ class LedPrivate;
class Led : public ::libopenrazer::Led
{
public:
Led(Device *device, QDBusObjectPath objectPath, ::openrazer::RazerLedId ledId, QString lightingLocation);
Led(Device *device, QDBusObjectPath objectPath, ::openrazer::LedId ledId, QString lightingLocation);
~Led() override;

QDBusObjectPath getObjectPath() override;
bool hasBrightness() override;
bool hasFx(::openrazer::RazerEffect fx) override;
::openrazer::RazerEffect getCurrentEffect() override;
bool hasFx(::openrazer::Effect fx) override;
::openrazer::Effect getCurrentEffect() override;
QVector<::openrazer::RGB> getCurrentColors() override;
::openrazer::WaveDirection getWaveDirection() override;
::openrazer::RazerLedId getLedId() override;
::openrazer::LedId getLedId() override;
void setOff() override;
void setOn() override;
void setStatic(::openrazer::RGB color) override;
Expand Down Expand Up @@ -186,11 +186,11 @@ class Led : public ::libopenrazer::Led

QDBusObjectPath getObjectPath() override;
bool hasBrightness() override;
bool hasFx(::openrazer::RazerEffect fx) override;
::openrazer::RazerEffect getCurrentEffect() override;
bool hasFx(::openrazer::Effect fx) override;
::openrazer::Effect getCurrentEffect() override;
QVector<::openrazer::RGB> getCurrentColors() override;
::openrazer::WaveDirection getWaveDirection() override;
::openrazer::RazerLedId getLedId() override;
::openrazer::LedId getLedId() override;
void setOff() override;
void setOn() override;
void setStatic(::openrazer::RGB color) override;
Expand Down
Loading

0 comments on commit 858223e

Please sign in to comment.