frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2023-10-10 13:36:59 +02:00
Code Issues Releases Wiki Activity

refactor: Resolve some clang warnings (#915)

Browse Source
This commit is contained in:
Murat Seker 2020-08-02 22:35:09 +02:00 committed by GitHub
parent 031b9a6b7c
commit d183c630c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -17,3 +17,4 @@ CMakeCache.txt
/lib
.directory
*.pyc
compile_commands.json

5
include/commandline/Option.h
View File

@ -26,11 +26,12 @@ public:
);
Option(const QCommandLineOption &other);
virtual ~Option() = default;
virtual bool validate(Parser &parser, QString &value);
QString name();
QString getError();
QString value(Parser &parser);
QString getError();
QString value(Parser &parser);
const char* getCString(Parser &parser);
protected:

2
include/flatbufserver/FlatBufferConnection.h
View File

@ -18,7 +18,7 @@
namespace hyperionnet
{
class Reply;
struct Reply;
}
///

2
include/grabber/AmlogicWrapper.h
View File

@ -24,7 +24,7 @@ public slots:
///
/// Performs a single frame grab and computes the led-colors
///
virtual void action();
void action() override;
private:
/// The actual grabber

2
include/grabber/DispmanxFrameGrabber.h
View File

@ -42,7 +42,7 @@ public:
///
///@brief Set new width and height for dispmanx, overwrite Grabber.h impl
virtual bool setWidthHeight(int width, int height);
bool setWidthHeight(int width, int height) override;
private:
///

2
include/grabber/DispmanxWrapper.h
View File

@ -26,7 +26,7 @@ public slots:
///
/// Performs a single frame grab and computes the led-colors
///
virtual void action();
void action() override;
private:
/// The actual grabber

2
include/grabber/FramebufferFrameGrabber.h
View File

@ -32,7 +32,7 @@ public:
///
/// @brief Overwrite Grabber.h implememtation
///
virtual void setDevicePath(const QString& path);
void setDevicePath(const QString& path) override;
private:
/// Framebuffer device e.g. /dev/fb0

2
include/grabber/FramebufferWrapper.h
View File

@ -26,7 +26,7 @@ public slots:
///
/// Performs a single frame grab and computes the led-colors
///
virtual void action();
void action() override;
private:
/// The actual grabber

2
include/grabber/OsxFrameGrabber.h
View File

@ -40,7 +40,7 @@ public:
///
/// @brief Overwrite Grabber.h implementation
///
virtual void setDisplayIndex(int index);
void setDisplayIndex(int index) override;
private:
/// display

2
include/grabber/OsxWrapper.h
View File

@ -26,7 +26,7 @@ public slots:
///
/// Performs a single frame grab and computes the led-colors
///
virtual void action();
void action() override;
private:
/// The actual grabber

12
include/grabber/QtGrabber.h
View File

@ -27,22 +27,22 @@ public:
/// @param[out] image The snapped screenshot (should be initialized with correct width and
/// height)
///
virtual int grabFrame(Image<ColorRgb> & image);
int grabFrame(Image<ColorRgb> & image);
///
/// @brief Set a new video mode
///
virtual void setVideoMode(VideoMode mode);
void setVideoMode(VideoMode mode) override;
///
/// @brief Apply new width/height values, overwrite Grabber.h implementation as qt doesn't use width/height, just pixelDecimation to calc dimensions
///
virtual bool setWidthHeight(int width, int height) { return true; };
bool setWidthHeight(int width, int height) override { return true; };
///
/// @brief Apply new pixelDecimation
///
virtual void setPixelDecimation(int pixelDecimation);
void setPixelDecimation(int pixelDecimation) override;
///
/// Set the crop values
@ -51,12 +51,12 @@ public:
/// @param cropTop Top pixel crop
/// @param cropBottom Bottom pixel crop
///
virtual void setCropping(unsigned cropLeft, unsigned cropRight, unsigned cropTop, unsigned cropBottom);
void setCropping(unsigned cropLeft, unsigned cropRight, unsigned cropTop, unsigned cropBottom) override;
///
/// @brief Apply display index
///
virtual void setDisplayIndex(int index);
void setDisplayIndex(int index) override;
private slots:
///

2
include/grabber/QtWrapper.h
View File

@ -25,7 +25,7 @@ public slots:
///
/// Performs a single frame grab and computes the led-colors
///
virtual void action();
void action() override;
private:
/// The actual grabber

8
include/grabber/V4L2Wrapper.h
View File

@ -22,11 +22,11 @@ public:
bool getCecDetectionEnable();
public slots:
bool start();
void stop();
bool start() override;
void stop() override;
void setSignalThreshold(double redSignalThreshold, double greenSignalThreshold, double blueSignalThreshold);
void setCropping(unsigned cropLeft, unsigned cropRight, unsigned cropTop, unsigned cropBottom);
void setCropping(unsigned cropLeft, unsigned cropRight, unsigned cropTop, unsigned cropBottom) override;
void setSignalDetectionOffset(double verticalMin, double horizontalMin, double verticalMax, double horizontalMax);
void setSignalDetectionEnable(bool enable);
void setCecDetectionEnable(bool enable);
@ -38,7 +38,7 @@ private slots:
void newFrame(const Image<ColorRgb> & image);
void readError(const char* err);
virtual void action();
void action() override;
private:
/// The V4L2 grabber

10
include/grabber/X11Grabber.h
View File

@ -34,23 +34,23 @@ public:
/// @param[out] image The snapped screenshot (should be initialized with correct width and
/// height)
///
virtual int grabFrame(Image<ColorRgb> & image, bool forceUpdate=false);
int grabFrame(Image<ColorRgb> & image, bool forceUpdate=false);
///
/// update dimension according current screen
int updateScreenDimensions(bool force=false);
virtual void setVideoMode(VideoMode mode);
void setVideoMode(VideoMode mode) override;
///
/// @brief Apply new width/height values, overwrite Grabber.h implementation as X11 doesn't use width/height, just pixelDecimation to calc dimensions
///
virtual bool setWidthHeight(int width, int height) { return true; };
bool setWidthHeight(int width, int height) override { return true; };
///
/// @brief Apply new pixelDecimation
///
virtual void setPixelDecimation(int pixelDecimation);
void setPixelDecimation(int pixelDecimation) override;
///
/// Set the crop values
@ -59,7 +59,7 @@ public:
/// @param cropTop Top pixel crop
/// @param cropBottom Bottom pixel crop
///
virtual void setCropping(unsigned cropLeft, unsigned cropRight, unsigned cropTop, unsigned cropBottom);
void setCropping(unsigned cropLeft, unsigned cropRight, unsigned cropTop, unsigned cropBottom) override;
protected:
bool nativeEventFilter(const QByteArray & eventType, void * message, long int * result) override;

2
include/grabber/X11Wrapper.h
View File

@ -35,7 +35,7 @@ public slots:
///
/// Performs a single frame grab and computes the led-colors
///
virtual void action();
void action() override;
private:
/// The actual grabber

2
libsrc/commandline/ColorsOption.cpp
View File

@ -22,7 +22,7 @@ bool ColorsOption::validate(Parser & parser, QString & value)
QRegularExpressionMatch match = hexRe.match(value);
if(match.hasMatch())
{
for(const QString m : match.capturedTexts())
for(const QString & m : match.capturedTexts())
{
_colors.push_back(QColor(QString("#%1").arg(m)));
}

2
libsrc/hyperion/HyperionIManager.cpp
View File

@ -41,7 +41,7 @@ const QVector<QVariantMap> HyperionIManager::getInstanceData()
void HyperionIManager::startAll()
{
for(const auto entry : _instanceTable->getAllInstances(true))
for(const auto & entry : _instanceTable->getAllInstances(true))
{
startInstance(entry["instance"].toInt());
}

10
libsrc/hyperion/SettingsManager.cpp
View File

@ -41,7 +41,7 @@ SettingsManager::SettingsManager(const quint8& instance, QObject* parent)
// transform json to string lists
QStringList keyList = defaultConfig.keys();
QStringList defValueList;
for(const auto key : keyList)
for(const auto & key : keyList)
{
if(defaultConfig[key].isObject())
{
@ -54,7 +54,7 @@ SettingsManager::SettingsManager(const quint8& instance, QObject* parent)
}
// fill database with default data if required
for(const auto key : keyList)
for(const auto & key : keyList)
{
QString val = defValueList.takeFirst();
// prevent overwrite
@ -65,7 +65,7 @@ SettingsManager::SettingsManager(const quint8& instance, QObject* parent)
// need to validate all data in database constuct the entire data object
// TODO refactor schemaChecker to accept QJsonArray in validate(); QJsonDocument container? To validate them per entry...
QJsonObject dbConfig;
for(const auto key : keyList)
for(const auto & key : keyList)
{
QJsonDocument doc = _sTable->getSettingsRecord(key);
if(doc.isArray())
@ -140,7 +140,7 @@ bool SettingsManager::saveSettings(QJsonObject config, const bool& correct)
// extract keys and data
QStringList keyList = config.keys();
QStringList newValueList;
for(const auto key : keyList)
for(const auto & key : keyList)
{
if(config[key].isObject())
{
@ -153,7 +153,7 @@ bool SettingsManager::saveSettings(QJsonObject config, const bool& correct)
}
// compare database data with new data to emit/save changes accordingly
for(const auto key : keyList)
for(const auto & key : keyList)
{
QString data = newValueList.takeFirst();
if(_sTable->getSettingsRecordString(key) != data)