From 48af5733bcd959146ac157a3c4759c8d89ccc465 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Thu, 6 Oct 2016 08:37:41 +0200 Subject: clean up public headers If this project is treated as a Qt module, it didn't build without these fixes because QT_NO_KEYWORDS and -Werror=zero-as-null-pointer-constant are enforced. Change-Id: Ie3ab8597b338478a5a34ed49d176ce9a647b1e0e Reviewed-by: Laszlo Agocs Reviewed-by: Teemu Holappa Reviewed-by: Samuli Piippo Reviewed-by: Andy Nichols --- src/displaysettings/displaysettings.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/displaysettings/displaysettings.h') diff --git a/src/displaysettings/displaysettings.h b/src/displaysettings/displaysettings.h index c0032d8..c6f4bab 100644 --- a/src/displaysettings/displaysettings.h +++ b/src/displaysettings/displaysettings.h @@ -42,7 +42,7 @@ class Q_DECL_EXPORT DisplaySettings : public QObject Q_PROPERTY(bool physicalScreenSizeOverride READ physicalScreenSizeOverride WRITE setPhysicalScreenSizeOverride NOTIFY physicalScreenSizeOverrideChanged) public: - DisplaySettings(QObject *parent = 0); + DisplaySettings(QObject *parent = nullptr); ~DisplaySettings(); int displayBrightness(); @@ -54,7 +54,7 @@ public Q_SLOTS: void setPhysicalScreenSizeInch(int inches); void setPhysicalScreenSizeOverride(bool enable); -signals: +Q_SIGNALS: void displayBrightnessChanged(int newValue); void physicalScreenSizeInchChanged(int newInches); void physicalScreenSizeOverrideChanged(bool newValue); -- cgit v1.2.3