summaryrefslogtreecommitdiffstats
path: root/src/displaysettings
diff options
context:
space:
mode:
authorRainer Keller <Rainer.Keller@qt.io>2016-10-24 15:52:03 +0200
committerRainer Keller <Rainer.Keller@qt.io>2016-10-31 07:55:17 +0000
commit197bed092d8d88446d3708cd393c8f9c3a8d0491 (patch)
tree48cebb3d757f10bc90f89b881003e98392afce90 /src/displaysettings
parent57b15814c8865e517c43fe173c0ffcadf8557ade (diff)
Fix compile error: 0 is not allowed for pointer initialization anymore
Change-Id: Ic8b789a46dafd379fdd48279d6eb138f978e80a5 Reviewed-by: Risto Avila <risto.avila@qt.io> Reviewed-by: Kimmo Ollila <kimmo.ollila@theqtcompany.com> Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'src/displaysettings')
-rw-r--r--src/displaysettings/displaysettings.h2
-rw-r--r--src/displaysettings/displaysettings_p.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/displaysettings/displaysettings.h b/src/displaysettings/displaysettings.h
index c0032d8..04cd3fd 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 = Q_NULLPTR);
~DisplaySettings();
int displayBrightness();
diff --git a/src/displaysettings/displaysettings_p.h b/src/displaysettings/displaysettings_p.h
index 672eb95..b1c0e4d 100644
--- a/src/displaysettings/displaysettings_p.h
+++ b/src/displaysettings/displaysettings_p.h
@@ -37,7 +37,7 @@ class PhysicalScreenSize : public QObject
Q_OBJECT
public:
- explicit PhysicalScreenSize(QObject *parent=0);
+ explicit PhysicalScreenSize(QObject *parent = Q_NULLPTR);
virtual ~PhysicalScreenSize();
void setSize(int inches);