diff options
author | Gatis Paeglis <gatis.paeglis@qt.io> | 2016-11-03 16:31:53 +0100 |
---|---|---|
committer | Gatis Paeglis <gatis.paeglis@qt.io> | 2016-11-04 16:42:37 +0000 |
commit | bab94048db9f15c78f62c5b639a539b6d936365c (patch) | |
tree | 6737c83ce0aa27ae36ebcdca1e62e58a79ec91aa | |
parent | 9a163f9fa3eaa6e12db1e22b9cef5e6175407508 (diff) |
Add the missing QT_{BEGIN,END}_NAMESPACE macros
Change-Id: Ic3d8cb21d253ac574709e862225c246b539d059d
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
-rw-r--r-- | src/lib/qotaclient.cpp | 4 | ||||
-rw-r--r-- | src/lib/qotaclient_p.h | 4 | ||||
-rw-r--r-- | src/lib/qotarepositoryconfig.cpp | 4 | ||||
-rw-r--r-- | src/lib/qotarepositoryconfig.h | 4 | ||||
-rw-r--r-- | src/lib/qotarepositoryconfig_p.h | 4 |
5 files changed, 18 insertions, 2 deletions
diff --git a/src/lib/qotaclient.cpp b/src/lib/qotaclient.cpp index 725dfb0..e4d05ef 100644 --- a/src/lib/qotaclient.cpp +++ b/src/lib/qotaclient.cpp @@ -37,12 +37,12 @@ #include <QtCore/QDir> #include <QtCore/QThread> +QT_BEGIN_NAMESPACE + Q_LOGGING_CATEGORY(qota, "b2qt.ota") const QString repoConfigPath(QStringLiteral("/etc/ostree/remotes.d/qt-os.conf")); -QT_BEGIN_NAMESPACE - QOtaClientPrivate::QOtaClientPrivate(QOtaClient *client) : q_ptr(client), m_initialized(false), diff --git a/src/lib/qotaclient_p.h b/src/lib/qotaclient_p.h index cabee87..e93a4e5 100644 --- a/src/lib/qotaclient_p.h +++ b/src/lib/qotaclient_p.h @@ -35,6 +35,8 @@ #include <QtCore/QScopedPointer> #include <QtCore/QJsonDocument> +QT_BEGIN_NAMESPACE + Q_DECLARE_LOGGING_CATEGORY(qota) class QThread; @@ -106,4 +108,6 @@ public: QByteArray m_rollbackInfo; }; +QT_END_NAMESPACE + #endif // QOTACLIENT_P_H diff --git a/src/lib/qotarepositoryconfig.cpp b/src/lib/qotarepositoryconfig.cpp index b557326..f2049ee 100644 --- a/src/lib/qotarepositoryconfig.cpp +++ b/src/lib/qotarepositoryconfig.cpp @@ -33,6 +33,8 @@ #include <QtCore/QDir> #include <QtCore/QTextStream> +QT_BEGIN_NAMESPACE + const QString url(QStringLiteral("url=")); const QString clientCert(QStringLiteral("tls-client-cert-path=")); const QString clientKey(QStringLiteral("tls-client-key-path=")); @@ -272,3 +274,5 @@ QString QOtaRepositoryConfig::tlsCaPath() const { return d_func()->m_tlsCaPath; } + +QT_END_NAMESPACE diff --git a/src/lib/qotarepositoryconfig.h b/src/lib/qotarepositoryconfig.h index e4f0fb6..0182a70 100644 --- a/src/lib/qotarepositoryconfig.h +++ b/src/lib/qotarepositoryconfig.h @@ -32,6 +32,8 @@ #include <QtCore/QObject> #include <QtCore/QString> +QT_BEGIN_NAMESPACE + class QOtaClient; class QOtaRepositoryConfigPrivate; @@ -81,4 +83,6 @@ private: friend class QOtaClient; }; +QT_END_NAMESPACE + #endif // QOTAREPOSITORYCONFIG_H diff --git a/src/lib/qotarepositoryconfig_p.h b/src/lib/qotarepositoryconfig_p.h index 9f7caf1..6ad12ca 100644 --- a/src/lib/qotarepositoryconfig_p.h +++ b/src/lib/qotarepositoryconfig_p.h @@ -34,6 +34,8 @@ #include <QtCore/QObject> #include <QtCore/QString> +QT_BEGIN_NAMESPACE + class QOtaRepositoryConfig; class QOtaRepositoryConfigPrivate : public QObject @@ -55,3 +57,5 @@ public: bool m_tlsPermissive; QString m_tlsCaPath; }; + +QT_END_NAMESPACE |