diff options
| author | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2017-11-22 17:01:06 +0200 |
|---|---|---|
| committer | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2017-11-24 11:53:21 +0000 |
| commit | 724309463d63480ca755d5f309825a9dd078d012 (patch) | |
| tree | ef26954371c0b56141ca59894f67dd14446f933b /src/displaysettings | |
| parent | 5f7d1bacb8701e24ea185c63e05e5f8883cbef2c (diff) | |
Fix compilation with namespaces
Task-number: QTBUG-64693
Change-Id: I35487b54271f031077c0f96a90eb47f0683caa77
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
Diffstat (limited to 'src/displaysettings')
| -rw-r--r-- | src/displaysettings/displaysettings.cpp | 4 | ||||
| -rw-r--r-- | src/displaysettings/displaysettings_p.cpp | 4 | ||||
| -rw-r--r-- | src/displaysettings/displaysettings_p.h | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/src/displaysettings/displaysettings.cpp b/src/displaysettings/displaysettings.cpp index 0ab5177..6cadfc2 100644 --- a/src/displaysettings/displaysettings.cpp +++ b/src/displaysettings/displaysettings.cpp @@ -29,6 +29,8 @@ #include "displaysettings.h" #include "displaysettings_p.h" +QT_BEGIN_NAMESPACE + DisplaySettings::DisplaySettings(QObject *parent) : QObject(parent) ,d_ptr(new DisplaySettingsPrivate(this)) @@ -88,3 +90,5 @@ void DisplaySettings::setPhysicalScreenSizeOverride(bool enable) Q_D(DisplaySettings); d->setPhysicalScreenSizeOverride(enable); } + +QT_END_NAMESPACE diff --git a/src/displaysettings/displaysettings_p.cpp b/src/displaysettings/displaysettings_p.cpp index c7bbc9a..890d868 100644 --- a/src/displaysettings/displaysettings_p.cpp +++ b/src/displaysettings/displaysettings_p.cpp @@ -30,6 +30,8 @@ #include <QDirIterator> #include "displaysettings_p.h" +QT_BEGIN_NAMESPACE + DisplaySettingsPrivate::DisplaySettingsPrivate(DisplaySettings *qq) :q_ptr(qq) ,m_brightness(255) @@ -238,3 +240,5 @@ void PhysicalScreenSize::setEnabled(bool enable) // Rewrite appcontroller.conf with or without the physical width/height lines. write(enable); } + +QT_END_NAMESPACE diff --git a/src/displaysettings/displaysettings_p.h b/src/displaysettings/displaysettings_p.h index 329ed81..7e1d9cd 100644 --- a/src/displaysettings/displaysettings_p.h +++ b/src/displaysettings/displaysettings_p.h @@ -43,6 +43,8 @@ #include <QTimer> #include "displaysettings.h" +QT_BEGIN_NAMESPACE + class PhysicalScreenSize : public QObject { Q_OBJECT @@ -101,4 +103,6 @@ private: PhysicalScreenSize *m_physScreenSize; }; +QT_END_NAMESPACE + #endif // DISPLAYSETTINGSPRIVATE_H |