summaryrefslogtreecommitdiffstats
path: root/src/displaysettings/displaysettings.h
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@qt.io>2016-10-06 08:37:41 +0200
committerShawn Rutledge <shawn.rutledge@qt.io>2016-11-16 11:54:55 +0000
commit48af5733bcd959146ac157a3c4759c8d89ccc465 (patch)
tree435177130f0cb39290fc0e89bf2885624c24eb58 /src/displaysettings/displaysettings.h
parent2b6766f09ad53f1cf2ba7cfe95976b4322c2e8fd (diff)
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 <laszlo.agocs@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'src/displaysettings/displaysettings.h')
-rw-r--r--src/displaysettings/displaysettings.h4
1 files changed, 2 insertions, 2 deletions
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);