aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVitaly Fanaskov <vitaly.fanaskov@qt.io>2019-09-30 12:46:11 +0200
committerVitaly Fanaskov <vitaly.fanaskov@qt.io>2019-09-30 10:55:53 +0000
commit821cfa27631d79b6b35250dd8dbaa673921adfc6 (patch)
tree1bbb26124ed9f2bdfcf6de54e040fb4cd1a5d210
parent6d974b116ddcc9705266f95d1991a9b51035f61d (diff)
Fix gcc5 builds
Task-number: QTCREATORBUG-22862 Change-Id: I255952272a69ea8110e3ddceb63d15084af656f0 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
-rw-r--r--common/utils.h8
-rw-r--r--ui/encouragementwidget.cpp6
-rw-r--r--ui/encouragementwidget.h7
-rw-r--r--ui/outputpane.cpp6
-rw-r--r--ui/outputpane.h6
5 files changed, 22 insertions, 11 deletions
diff --git a/common/utils.h b/common/utils.h
index a2eb689..6bf5fd4 100644
--- a/common/utils.h
+++ b/common/utils.h
@@ -26,7 +26,9 @@
#include <QtCore/QString>
-namespace UsageStatistic::Internal::Utils {
+namespace UsageStatistic {
+namespace Internal {
+namespace Utils {
//! Secret key for authentication defined during building
constexpr auto secret() { return USP_AUTH_KEY; }
@@ -34,4 +36,6 @@ constexpr auto secret() { return USP_AUTH_KEY; }
//! Base server URL defined during building
constexpr auto serverUrl() { return USP_SERVER_URL; }
-} // namespace UsageStatistic::Internal::Utils
+} // namespace Utils
+} // namespace Internal
+} // namespace UsageStatistic
diff --git a/ui/encouragementwidget.cpp b/ui/encouragementwidget.cpp
index b1a84bc..457422e 100644
--- a/ui/encouragementwidget.cpp
+++ b/ui/encouragementwidget.cpp
@@ -31,7 +31,8 @@
#include "usagestatisticconstants.h"
-namespace UsageStatistic::Internal {
+namespace UsageStatistic {
+namespace Internal {
using namespace KUserFeedback;
@@ -96,4 +97,5 @@ void EncouragementWidget::onProviderChanged(const std::shared_ptr<Provider> &p)
EncouragementWidget::~EncouragementWidget() = default;
-} // namespace UsageStatistic::Internal
+} // namespace Internal
+} // namespace UsageStatistic
diff --git a/ui/encouragementwidget.h b/ui/encouragementwidget.h
index 6d299d0..6386a54 100644
--- a/ui/encouragementwidget.h
+++ b/ui/encouragementwidget.h
@@ -31,7 +31,8 @@ class Provider;
class FeedbackConfigUiController;
}
-namespace UsageStatistic::Internal {
+namespace UsageStatistic {
+namespace Internal {
namespace Ui { class EncouragementWidget; }
@@ -64,5 +65,5 @@ private:
std::unique_ptr<KUserFeedback::FeedbackConfigUiController> m_controller;
};
-} // namespace UsageStatistic::Internal
-
+} // namespace Internal
+} // namespace UsageStatistic
diff --git a/ui/outputpane.cpp b/ui/outputpane.cpp
index a635815..3529ca3 100644
--- a/ui/outputpane.cpp
+++ b/ui/outputpane.cpp
@@ -30,7 +30,8 @@
#include "encouragementwidget.h"
-namespace UsageStatistic::Internal {
+namespace UsageStatistic {
+namespace Internal {
OutputPane::OutputPane() = default;
@@ -116,4 +117,5 @@ void OutputPane::setProvider(std::shared_ptr<KUserFeedback::Provider> provider)
Q_EMIT providerChanged(m_provider);
}
-} // namespace UsageStatistic::Internal
+} // namespace Internal
+} // namespace UsageStatistic
diff --git a/ui/outputpane.h b/ui/outputpane.h
index 3965db6..039b3f2 100644
--- a/ui/outputpane.h
+++ b/ui/outputpane.h
@@ -37,7 +37,8 @@ QT_END_NAMESPACE
namespace KUserFeedback { class Provider; }
-namespace UsageStatistic::Internal {
+namespace UsageStatistic {
+namespace Internal {
class EncouragementWidget;
@@ -88,6 +89,7 @@ private: // Data
QPointer<QWidget> m_outputPaneWidget;
};
-} // namespace UsageStatistic::Internal
+} // namespace Internal
+} // namespace UsageStatistic
Q_DECLARE_METATYPE(std::shared_ptr<KUserFeedback::Provider>)