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/timedatesettings | |
| 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/timedatesettings')
| -rw-r--r-- | src/timedatesettings/systemtime.cpp | 4 | ||||
| -rw-r--r-- | src/timedatesettings/systemtime_p.h | 3 | ||||
| -rw-r--r-- | src/timedatesettings/timezonefiltermodel.cpp | 3 | ||||
| -rw-r--r-- | src/timedatesettings/timezonemodel.cpp | 4 |
4 files changed, 14 insertions, 0 deletions
diff --git a/src/timedatesettings/systemtime.cpp b/src/timedatesettings/systemtime.cpp index 32e6e51..ce97899 100644 --- a/src/timedatesettings/systemtime.cpp +++ b/src/timedatesettings/systemtime.cpp @@ -29,6 +29,8 @@ #include "systemtime.h" #include "systemtime_p.h" +QT_BEGIN_NAMESPACE + SystemTime::SystemTime(QObject *parent) : QObject(parent) ,d_ptr(new SystemTimePrivate(this)) @@ -76,3 +78,5 @@ QDateTime SystemTime::time() const { return QDateTime::currentDateTime(); } + +QT_END_NAMESPACE diff --git a/src/timedatesettings/systemtime_p.h b/src/timedatesettings/systemtime_p.h index 7cdb135..a6ab646 100644 --- a/src/timedatesettings/systemtime_p.h +++ b/src/timedatesettings/systemtime_p.h @@ -43,6 +43,8 @@ #include "systemtime.h" #include "timedated_interface.h" +QT_BEGIN_NAMESPACE + class SystemTimePrivate { Q_DECLARE_PUBLIC(SystemTime) @@ -88,5 +90,6 @@ private: SystemTime *q_ptr; }; +QT_END_NAMESPACE #endif // SYSTEMTIME_P_H diff --git a/src/timedatesettings/timezonefiltermodel.cpp b/src/timedatesettings/timezonefiltermodel.cpp index c1614ef..9c2dfb7 100644 --- a/src/timedatesettings/timezonefiltermodel.cpp +++ b/src/timedatesettings/timezonefiltermodel.cpp @@ -29,6 +29,8 @@ #include "timezonemodel.h" #include "timezonefiltermodel.h" +QT_BEGIN_NAMESPACE + TimezoneFilterModel::TimezoneFilterModel(QObject* parent) :QSortFilterProxyModel(parent) { @@ -97,3 +99,4 @@ QVariant TimezoneFilterModel::itemFromRow(const int row) const return QVariant(); } +QT_END_NAMESPACE diff --git a/src/timedatesettings/timezonemodel.cpp b/src/timedatesettings/timezonemodel.cpp index 4273df9..bd56814 100644 --- a/src/timedatesettings/timezonemodel.cpp +++ b/src/timedatesettings/timezonemodel.cpp @@ -32,6 +32,8 @@ #include <QtConcurrent/QtConcurrentRun> #include "timezonemodel.h" +QT_BEGIN_NAMESPACE + TimezoneItem::TimezoneItem(const QByteArray& id, QObject *parent) :QObject(parent) { @@ -129,3 +131,5 @@ QVariant TimezoneModel::data(const QModelIndex & index, int role) const return QVariant(); } } + +QT_END_NAMESPACE |