From cf17c1bb77a6113d208437b718ea5410609bb99a Mon Sep 17 00:00:00 2001
From: Volker Krause <vkrause@kde.org>
Date: Sun, 19 Feb 2017 11:35:29 +0100
Subject: [PATCH] Rename Analyzer to Console
It's become much more than just an analytic tool by now, containing also
schema and survey management.
---
CMakeLists.txt | 6 +++---
autotests/CMakeLists.txt | 8 ++++----
autotests/categoryaggregationmodeltest.cpp | 12 +++++------
autotests/datamodeltest.cpp | 8 ++++----
autotests/numericaggregationmodeltest.cpp | 12 +++++------
autotests/productapitest.cpp | 2 +-
autotests/productmodeltest.cpp | 2 +-
autotests/producttest.cpp | 6 +++---
autotests/providertest.cpp | 2 +-
autotests/ratiosetaggregationmodeltest.cpp | 12 +++++------
autotests/sampletest.cpp | 2 +-
autotests/schemamodeltest.cpp | 2 +-
autotests/schematemplatetest.cpp | 2 +-
autotests/servercontroller.cpp | 2 +-
autotests/surveyapitest.cpp | 2 +-
autotests/timeaggregationmodeltest.cpp | 10 +++++-----
...ema => org.kde.UserFeedbackConsole.schema} | 2 +-
src/CMakeLists.txt | 2 +-
src/{analyzer => console}/CMakeLists.txt | 20 +++++++++----------
.../analytics/aggregator.cpp | 2 +-
.../analytics/aggregator.h | 12 +++++------
.../analytics/analyticsview.cpp | 2 +-
.../analytics/analyticsview.h | 8 ++++----
.../analytics/analyticsview.ui | 4 ++--
.../analytics/categoryaggregator.cpp | 2 +-
.../analytics/categoryaggregator.h | 8 ++++----
.../analytics/chartutil.cpp | 2 +-
.../analytics/chartutil.h | 8 ++++----
.../analytics/numericaggregator.cpp | 2 +-
.../analytics/numericaggregator.h | 8 ++++----
.../analytics/ratiosetaggregator.cpp | 2 +-
.../analytics/ratiosetaggregator.h | 8 ++++----
.../analytics/totalaggregator.cpp | 2 +-
.../analytics/totalaggregator.h | 10 +++++-----
src/{analyzer => console}/connectdialog.cpp | 2 +-
src/{analyzer => console}/connectdialog.h | 8 ++++----
src/{analyzer => console}/connectdialog.ui | 8 ++++----
.../core/aggregation.cpp | 2 +-
src/{analyzer => console}/core/aggregation.h | 12 +++++------
.../core/aggregationelement.cpp | 2 +-
.../core/aggregationelement.h | 12 +++++------
src/{analyzer => console}/core/product.cpp | 4 ++--
src/{analyzer => console}/core/product.h | 12 +++++------
src/{analyzer => console}/core/sample.cpp | 4 ++--
src/{analyzer => console}/core/sample.h | 12 +++++------
.../core/schemaentry.cpp | 4 ++--
src/{analyzer => console}/core/schemaentry.h | 12 +++++------
.../core/schemaentryelement.cpp | 4 ++--
.../core/schemaentryelement.h | 14 ++++++-------
.../core/schemaentrytemplates.cpp | 2 +-
.../core/schemaentrytemplates.h | 8 ++++----
src/{analyzer => console}/core/survey.cpp | 4 ++--
src/{analyzer => console}/core/survey.h | 12 +++++------
src/{analyzer => console}/core/util.h | 8 ++++----
src/{analyzer => console}/main.cpp | 4 ++--
src/{analyzer => console}/mainwindow.cpp | 4 ++--
src/{analyzer => console}/mainwindow.h | 8 ++++----
src/{analyzer => console}/mainwindow.ui | 20 +++++++++----------
.../model/aggregateddatamodel.cpp | 2 +-
.../model/aggregateddatamodel.h | 8 ++++----
.../model/aggregationeditormodel.cpp | 2 +-
.../model/aggregationeditormodel.h | 8 ++++----
.../model/aggregationelementmodel.cpp | 2 +-
.../model/aggregationelementmodel.h | 8 ++++----
.../model/categoryaggregationmodel.cpp | 2 +-
.../model/categoryaggregationmodel.h | 8 ++++----
src/{analyzer => console}/model/datamodel.cpp | 4 ++--
src/{analyzer => console}/model/datamodel.h | 8 ++++----
.../model/extrarowsproxymodel.cpp | 2 +-
.../model/extrarowsproxymodel.h | 8 ++++----
.../model/numericaggregationmodel.cpp | 2 +-
.../model/numericaggregationmodel.h | 8 ++++----
.../model/productmodel.cpp | 2 +-
.../model/productmodel.h | 8 ++++----
.../model/ratiosetaggregationmodel.cpp | 2 +-
.../model/ratiosetaggregationmodel.h | 8 ++++----
.../model/rolemappingproxymodel.cpp | 2 +-
.../model/rolemappingproxymodel.h | 8 ++++----
.../model/schemamodel.cpp | 2 +-
src/{analyzer => console}/model/schemamodel.h | 8 ++++----
.../model/singlerowfilterproxymodel.cpp | 2 +-
.../model/singlerowfilterproxymodel.h | 8 ++++----
.../model/surveymodel.cpp | 2 +-
src/{analyzer => console}/model/surveymodel.h | 8 ++++----
.../model/timeaggregationmodel.cpp | 2 +-
.../model/timeaggregationmodel.h | 8 ++++----
src/{analyzer => console}/rest/restapi.cpp | 2 +-
src/{analyzer => console}/rest/restapi.h | 8 ++++----
src/{analyzer => console}/rest/restclient.cpp | 6 +++---
src/{analyzer => console}/rest/restclient.h | 8 ++++----
src/{analyzer => console}/rest/serverinfo.cpp | 6 +++---
src/{analyzer => console}/rest/serverinfo.h | 8 ++++----
.../schemaeditor/aggregationeditwidget.cpp | 2 +-
.../schemaeditor/aggregationeditwidget.h | 8 ++++----
.../schemaeditor/aggregationeditwidget.ui | 4 ++--
.../schemaeditor/schemaeditor.cpp | 2 +-
.../schemaeditor/schemaeditor.h | 8 ++++----
.../schemaeditor/schemaeditor.ui | 12 +++++------
.../schemaeditor/schemaeditwidget.cpp | 2 +-
.../schemaeditor/schemaeditwidget.h | 8 ++++----
.../schemaeditor/schemaeditwidget.ui | 4 ++--
.../schemaentryitemeditorfactory.cpp | 4 ++--
.../schemaentryitemeditorfactory.h | 8 ++++----
.../schematemplates/applicationVersion.schema | 0
.../schematemplates/platform.schema | 0
.../schematemplates/propertyRatio.schema | 0
.../schematemplates/qtVersion.schema | 0
.../schematemplates/schematemplates.qrc | 0
.../schematemplates/screens.schema | 0
.../schematemplates/usageCount.schema | 0
.../schematemplates/usageTime.schema | 0
.../surveyeditor/surveydialog.cpp | 2 +-
.../surveyeditor/surveydialog.h | 8 ++++----
.../surveyeditor/surveydialog.ui | 8 ++++----
.../surveyeditor/surveyeditor.cpp | 2 +-
.../surveyeditor/surveyeditor.h | 8 ++++----
.../surveyeditor/surveyeditor.ui | 4 ++--
.../widgets/metaenumcombobox.cpp | 2 +-
.../widgets/metaenumcombobox.h | 8 ++++----
src/provider/widgets/feedbackconfigdialog.h | 6 +++---
120 files changed, 333 insertions(+), 333 deletions(-)
rename data/{org.kde.UserFeedbackAnalyzer.schema => org.kde.UserFeedbackConsole.schema} (98%)
rename src/{analyzer => console}/CMakeLists.txt (65%)
rename src/{analyzer => console}/analytics/aggregator.cpp (97%)
rename src/{analyzer => console}/analytics/aggregator.h (86%)
rename src/{analyzer => console}/analytics/analyticsview.cpp (99%)
rename src/{analyzer => console}/analytics/analyticsview.h (92%)
rename src/{analyzer => console}/analytics/analyticsview.ui (98%)
rename src/{analyzer => console}/analytics/categoryaggregator.cpp (99%)
rename src/{analyzer => console}/analytics/categoryaggregator.h (89%)
rename src/{analyzer => console}/analytics/chartutil.cpp (96%)
rename src/{analyzer => console}/analytics/chartutil.h (85%)
rename src/{analyzer => console}/analytics/numericaggregator.cpp (98%)
rename src/{analyzer => console}/analytics/numericaggregator.h (88%)
rename src/{analyzer => console}/analytics/ratiosetaggregator.cpp (99%)
rename src/{analyzer => console}/analytics/ratiosetaggregator.h (89%)
rename src/{analyzer => console}/analytics/totalaggregator.cpp (98%)
rename src/{analyzer => console}/analytics/totalaggregator.h (83%)
rename src/{analyzer => console}/connectdialog.cpp (98%)
rename src/{analyzer => console}/connectdialog.h (88%)
rename src/{analyzer => console}/connectdialog.ui (92%)
rename src/{analyzer => console}/core/aggregation.cpp (98%)
rename src/{analyzer => console}/core/aggregation.h (83%)
rename src/{analyzer => console}/core/aggregationelement.cpp (98%)
rename src/{analyzer => console}/core/aggregationelement.h (83%)
rename src/{analyzer => console}/core/product.cpp (98%)
rename src/{analyzer => console}/core/product.h (85%)
rename src/{analyzer => console}/core/sample.cpp (98%)
rename src/{analyzer => console}/core/sample.h (84%)
rename src/{analyzer => console}/core/schemaentry.cpp (98%)
rename src/{analyzer => console}/core/schemaentry.h (91%)
rename src/{analyzer => console}/core/schemaentryelement.cpp (97%)
rename src/{analyzer => console}/core/schemaentryelement.h (81%)
rename src/{analyzer => console}/core/schemaentrytemplates.cpp (97%)
rename src/{analyzer => console}/core/schemaentrytemplates.h (83%)
rename src/{analyzer => console}/core/survey.cpp (98%)
rename src/{analyzer => console}/core/survey.h (85%)
rename src/{analyzer => console}/core/util.h (92%)
rename src/{analyzer => console}/main.cpp (94%)
rename src/{analyzer => console}/mainwindow.cpp (98%)
rename src/{analyzer => console}/mainwindow.h (91%)
rename src/{analyzer => console}/mainwindow.ui (93%)
rename src/{analyzer => console}/model/aggregateddatamodel.cpp (98%)
rename src/{analyzer => console}/model/aggregateddatamodel.h (90%)
rename src/{analyzer => console}/model/aggregationeditormodel.cpp (98%)
rename src/{analyzer => console}/model/aggregationeditormodel.h (89%)
rename src/{analyzer => console}/model/aggregationelementmodel.cpp (98%)
rename src/{analyzer => console}/model/aggregationelementmodel.h (88%)
rename src/{analyzer => console}/model/categoryaggregationmodel.cpp (99%)
rename src/{analyzer => console}/model/categoryaggregationmodel.h (89%)
rename src/{analyzer => console}/model/datamodel.cpp (98%)
rename src/{analyzer => console}/model/datamodel.h (93%)
rename src/{analyzer => console}/model/extrarowsproxymodel.cpp (98%)
rename src/{analyzer => console}/model/extrarowsproxymodel.h (88%)
rename src/{analyzer => console}/model/numericaggregationmodel.cpp (99%)
rename src/{analyzer => console}/model/numericaggregationmodel.h (90%)
rename src/{analyzer => console}/model/productmodel.cpp (99%)
rename src/{analyzer => console}/model/productmodel.h (91%)
rename src/{analyzer => console}/model/ratiosetaggregationmodel.cpp (99%)
rename src/{analyzer => console}/model/ratiosetaggregationmodel.h (89%)
rename src/{analyzer => console}/model/rolemappingproxymodel.cpp (97%)
rename src/{analyzer => console}/model/rolemappingproxymodel.h (86%)
rename src/{analyzer => console}/model/schemamodel.cpp (99%)
rename src/{analyzer => console}/model/schemamodel.h (92%)
rename src/{analyzer => console}/model/singlerowfilterproxymodel.cpp (96%)
rename src/{analyzer => console}/model/singlerowfilterproxymodel.h (85%)
rename src/{analyzer => console}/model/surveymodel.cpp (98%)
rename src/{analyzer => console}/model/surveymodel.h (92%)
rename src/{analyzer => console}/model/timeaggregationmodel.cpp (99%)
rename src/{analyzer => console}/model/timeaggregationmodel.h (92%)
rename src/{analyzer => console}/rest/restapi.cpp (98%)
rename src/{analyzer => console}/rest/restapi.h (94%)
rename src/{analyzer => console}/rest/restclient.cpp (94%)
rename src/{analyzer => console}/rest/restclient.h (91%)
rename src/{analyzer => console}/rest/serverinfo.cpp (93%)
rename src/{analyzer => console}/rest/serverinfo.h (90%)
rename src/{analyzer => console}/schemaeditor/aggregationeditwidget.cpp (98%)
rename src/{analyzer => console}/schemaeditor/aggregationeditwidget.h (88%)
rename src/{analyzer => console}/schemaeditor/aggregationeditwidget.ui (89%)
rename src/{analyzer => console}/schemaeditor/schemaeditor.cpp (99%)
rename src/{analyzer => console}/schemaeditor/schemaeditor.h (90%)
rename src/{analyzer => console}/schemaeditor/schemaeditor.ui (84%)
rename src/{analyzer => console}/schemaeditor/schemaeditwidget.cpp (98%)
rename src/{analyzer => console}/schemaeditor/schemaeditwidget.h (89%)
rename src/{analyzer => console}/schemaeditor/schemaeditwidget.ui (91%)
rename src/{analyzer => console}/schemaeditor/schemaentryitemeditorfactory.cpp (97%)
rename src/{analyzer => console}/schemaeditor/schemaentryitemeditorfactory.h (84%)
rename src/{analyzer => console}/schematemplates/applicationVersion.schema (100%)
rename src/{analyzer => console}/schematemplates/platform.schema (100%)
rename src/{analyzer => console}/schematemplates/propertyRatio.schema (100%)
rename src/{analyzer => console}/schematemplates/qtVersion.schema (100%)
rename src/{analyzer => console}/schematemplates/schematemplates.qrc (100%)
rename src/{analyzer => console}/schematemplates/screens.schema (100%)
rename src/{analyzer => console}/schematemplates/usageCount.schema (100%)
rename src/{analyzer => console}/schematemplates/usageTime.schema (100%)
rename src/{analyzer => console}/surveyeditor/surveydialog.cpp (97%)
rename src/{analyzer => console}/surveyeditor/surveydialog.h (87%)
rename src/{analyzer => console}/surveyeditor/surveydialog.ui (89%)
rename src/{analyzer => console}/surveyeditor/surveyeditor.cpp (98%)
rename src/{analyzer => console}/surveyeditor/surveyeditor.h (89%)
rename src/{analyzer => console}/surveyeditor/surveyeditor.ui (91%)
rename src/{analyzer => console}/widgets/metaenumcombobox.cpp (97%)
rename src/{analyzer => console}/widgets/metaenumcombobox.h (86%)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 111cde8..ae0ac2c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,9 +89,9 @@ if(Qt5Core_FOUND)
add_definitions(-DQT_DEPRECATED_WARNINGS)
set_package_properties(Qt5 PROPERTIES URL "http://qt-project.org/")
- set_package_properties(Qt5Widgets PROPERTIES TYPE RECOMMENDED PURPOSE "Required for analyzer and administraion tool.")
- set_package_properties(Qt5Charts PROPERTIES TYPE RECOMMENDED PURPOSE "Required for analyzer and administraion tool.")
- set_package_properties(KF5WidgetsAddons PROPERTIES TYPE RECOMMENDED PURPOSE "Required for analyzer and administraion tool.")
+ set_package_properties(Qt5Widgets PROPERTIES TYPE RECOMMENDED PURPOSE "Required for UserFeedbackConsole.")
+ set_package_properties(Qt5Charts PROPERTIES TYPE RECOMMENDED PURPOSE "Required for UserFeedbackConsole.")
+ set_package_properties(KF5WidgetsAddons PROPERTIES TYPE RECOMMENDED PURPOSE "Required for UserFeedbackConsole.")
# Qt4
else()
set(QT_USE_IMPORTED_TARGETS true)
diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
index 1af2eb5..5f5494e 100644
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -3,7 +3,7 @@ add_library(UserFeedbackTestUtils STATIC
servercontroller.cpp
${CMAKE_SOURCE_DIR}/3rdparty/qt/modeltest.cpp
)
-target_link_libraries(UserFeedbackTestUtils LINK_PUBLIC Qt5::Test UserFeedbackAnalyzer)
+target_link_libraries(UserFeedbackTestUtils LINK_PUBLIC Qt5::Test UserFeedbackConsole)
function(uf_add_test _file)
get_filename_component(_name ${_file} NAME_WE)
@@ -12,11 +12,11 @@ function(uf_add_test _file)
add_test(NAME ${_name} COMMAND ${_name})
endfunction()
-uf_add_test(producttest UserFeedbackAnalyzer)
-uf_add_test(schematemplatetest.cpp UserFeedbackAnalyzer)
+uf_add_test(producttest UserFeedbackConsole)
+uf_add_test(schematemplatetest.cpp UserFeedbackConsole)
uf_add_test(schemamodeltest UserFeedbackTestUtils)
uf_add_test(datasourcetest UserFeedbackCore Qt5::Gui) # needs Gui for ScreenInfoSource to work
-uf_add_test(sampletest UserFeedbackAnalyzer)
+uf_add_test(sampletest UserFeedbackConsole)
uf_add_test(datamodeltest UserFeedbackTestUtils)
uf_add_test(timeaggregationmodeltest UserFeedbackTestUtils)
uf_add_test(categoryaggregationmodeltest UserFeedbackTestUtils)
diff --git a/autotests/categoryaggregationmodeltest.cpp b/autotests/categoryaggregationmodeltest.cpp
index 88a8232..c2225b7 100644
--- a/autotests/categoryaggregationmodeltest.cpp
+++ b/autotests/categoryaggregationmodeltest.cpp
@@ -15,11 +15,11 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <analyzer/model/categoryaggregationmodel.h>
-#include <analyzer/model/datamodel.h>
-#include <analyzer/model/timeaggregationmodel.h>
-#include <analyzer/core/sample.h>
-#include <analyzer/core/schemaentrytemplates.h>
+#include <console/model/categoryaggregationmodel.h>
+#include <console/model/datamodel.h>
+#include <console/model/timeaggregationmodel.h>
+#include <console/core/sample.h>
+#include <console/core/schemaentrytemplates.h>
#include <3rdparty/qt/modeltest.h>
@@ -28,7 +28,7 @@
#include <QObject>
#include <QStandardPaths>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
class CategoryAggregationModelTest : public QObject
{
diff --git a/autotests/datamodeltest.cpp b/autotests/datamodeltest.cpp
index ababcac..e0ed86c 100644
--- a/autotests/datamodeltest.cpp
+++ b/autotests/datamodeltest.cpp
@@ -15,9 +15,9 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <analyzer/core/sample.h>
-#include <analyzer/core/schemaentrytemplates.h>
-#include <analyzer/model/datamodel.h>
+#include <console/core/sample.h>
+#include <console/core/schemaentrytemplates.h>
+#include <console/model/datamodel.h>
#include <3rdparty/qt/modeltest.h>
@@ -26,7 +26,7 @@
#include <QObject>
#include <QStandardPaths>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
class DataModelTest : public QObject
{
diff --git a/autotests/numericaggregationmodeltest.cpp b/autotests/numericaggregationmodeltest.cpp
index d30062f..ef6f2ab 100644
--- a/autotests/numericaggregationmodeltest.cpp
+++ b/autotests/numericaggregationmodeltest.cpp
@@ -15,11 +15,11 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <analyzer/model/numericaggregationmodel.h>
-#include <analyzer/model/datamodel.h>
-#include <analyzer/model/timeaggregationmodel.h>
-#include <analyzer/core/sample.h>
-#include <analyzer/core/schemaentrytemplates.h>
+#include <console/model/numericaggregationmodel.h>
+#include <console/model/datamodel.h>
+#include <console/model/timeaggregationmodel.h>
+#include <console/core/sample.h>
+#include <console/core/schemaentrytemplates.h>
#include <3rdparty/qt/modeltest.h>
@@ -28,7 +28,7 @@
#include <QObject>
#include <QStandardPaths>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
class NumericAggregationModelTest : public QObject
{
diff --git a/autotests/productapitest.cpp b/autotests/productapitest.cpp
index 68ff512..dbd1aeb 100644
--- a/autotests/productapitest.cpp
+++ b/autotests/productapitest.cpp
@@ -30,7 +30,7 @@
#include <QSignalSpy>
#include <QStandardPaths>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
class ProductApiTest : public QObject
{
diff --git a/autotests/productmodeltest.cpp b/autotests/productmodeltest.cpp
index 5818b76..a184006 100644
--- a/autotests/productmodeltest.cpp
+++ b/autotests/productmodeltest.cpp
@@ -29,7 +29,7 @@
#include <QSignalSpy>
#include <QStandardPaths>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
class ProductModelTest : public QObject
{
diff --git a/autotests/producttest.cpp b/autotests/producttest.cpp
index eab18f2..824aea3 100644
--- a/autotests/producttest.cpp
+++ b/autotests/producttest.cpp
@@ -15,8 +15,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <analyzer/core/aggregation.h>
-#include <analyzer/core/product.h>
+#include <console/core/aggregation.h>
+#include <console/core/product.h>
#include <3rdparty/qt/modeltest.h>
@@ -25,7 +25,7 @@
#include <QObject>
#include <QStandardPaths>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
class ProductTest : public QObject
{
diff --git a/autotests/providertest.cpp b/autotests/providertest.cpp
index a1cdbf8..02f15e7 100644
--- a/autotests/providertest.cpp
+++ b/autotests/providertest.cpp
@@ -39,7 +39,7 @@
#include <QStandardPaths>
using namespace UserFeedback;
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
class ProviderTest : public QObject
{
diff --git a/autotests/ratiosetaggregationmodeltest.cpp b/autotests/ratiosetaggregationmodeltest.cpp
index e3af6e6..43731ed 100644
--- a/autotests/ratiosetaggregationmodeltest.cpp
+++ b/autotests/ratiosetaggregationmodeltest.cpp
@@ -15,11 +15,11 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <analyzer/model/ratiosetaggregationmodel.h>
-#include <analyzer/model/datamodel.h>
-#include <analyzer/model/timeaggregationmodel.h>
-#include <analyzer/core/sample.h>
-#include <analyzer/core/schemaentrytemplates.h>
+#include <console/model/ratiosetaggregationmodel.h>
+#include <console/model/datamodel.h>
+#include <console/model/timeaggregationmodel.h>
+#include <console/core/sample.h>
+#include <console/core/schemaentrytemplates.h>
#include <3rdparty/qt/modeltest.h>
@@ -28,7 +28,7 @@
#include <QObject>
#include <QStandardPaths>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
class RatioSetAggregationModelTest : public QObject
{
diff --git a/autotests/sampletest.cpp b/autotests/sampletest.cpp
index 1b6e851..32474de 100644
--- a/autotests/sampletest.cpp
+++ b/autotests/sampletest.cpp
@@ -24,7 +24,7 @@
#include <QObject>
#include <QStandardPaths>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
class SampleTest : public QObject
{
diff --git a/autotests/schemamodeltest.cpp b/autotests/schemamodeltest.cpp
index 3b07e2f..a19f2c8 100644
--- a/autotests/schemamodeltest.cpp
+++ b/autotests/schemamodeltest.cpp
@@ -26,7 +26,7 @@
#include <QSignalSpy>
#include <QStandardPaths>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
class SchemaModelTest : public QObject
{
diff --git a/autotests/schematemplatetest.cpp b/autotests/schematemplatetest.cpp
index 4189c73..2f331a5 100644
--- a/autotests/schematemplatetest.cpp
+++ b/autotests/schematemplatetest.cpp
@@ -26,7 +26,7 @@
#include <QObject>
#include <QStandardPaths>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
class SchemaTemplateTest : public QObject
{
diff --git a/autotests/servercontroller.cpp b/autotests/servercontroller.cpp
index 4b9765a..d282eac 100644
--- a/autotests/servercontroller.cpp
+++ b/autotests/servercontroller.cpp
@@ -26,7 +26,7 @@
#include <QUrl>
#include <QSignalSpy>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
ServerController::ServerController()
{
diff --git a/autotests/surveyapitest.cpp b/autotests/surveyapitest.cpp
index edd8929..a2be013 100644
--- a/autotests/surveyapitest.cpp
+++ b/autotests/surveyapitest.cpp
@@ -32,7 +32,7 @@
#include <limits>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
class SurveyApiTest : public QObject
{
diff --git a/autotests/timeaggregationmodeltest.cpp b/autotests/timeaggregationmodeltest.cpp
index 814cd6c..adadd9c 100644
--- a/autotests/timeaggregationmodeltest.cpp
+++ b/autotests/timeaggregationmodeltest.cpp
@@ -15,10 +15,10 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <analyzer/core/sample.h>
-#include <analyzer/core/schemaentrytemplates.h>
-#include <analyzer/model/datamodel.h>
-#include <analyzer/model/timeaggregationmodel.h>
+#include <console/core/sample.h>
+#include <console/core/schemaentrytemplates.h>
+#include <console/model/datamodel.h>
+#include <console/model/timeaggregationmodel.h>
#include <3rdparty/qt/modeltest.h>
@@ -27,7 +27,7 @@
#include <QObject>
#include <QStandardPaths>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
class TimeAggregationModelTest : public QObject
{
diff --git a/data/org.kde.UserFeedbackAnalyzer.schema b/data/org.kde.UserFeedbackConsole.schema
similarity index 98%
rename from data/org.kde.UserFeedbackAnalyzer.schema
rename to data/org.kde.UserFeedbackConsole.schema
index b4e1cc5..73ceb0c 100644
--- a/data/org.kde.UserFeedbackAnalyzer.schema
+++ b/data/org.kde.UserFeedbackConsole.schema
@@ -61,7 +61,7 @@
"type": "numeric"
}
],
- "name": "org.kde.UserFeedbackAnalyzer",
+ "name": "org.kde.UserFeedbackConsole",
"schema": [
{
"elements": [
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 54aa636..5ca3aec 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,5 @@
add_subdirectory(provider)
add_subdirectory(server)
if(Qt5Charts_FOUND AND NOT CMAKE_VERSION VERSION_LESS 3.0)
- add_subdirectory(analyzer)
+ add_subdirectory(console)
endif()
diff --git a/src/analyzer/CMakeLists.txt b/src/console/CMakeLists.txt
similarity index 65%
rename from src/analyzer/CMakeLists.txt
rename to src/console/CMakeLists.txt
index 3b45352..0ae3a74 100644
--- a/src/analyzer/CMakeLists.txt
+++ b/src/console/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(analyzer_lib_srcs
+set(console_lib_srcs
core/aggregation.cpp
core/aggregationelement.cpp
core/product.cpp
@@ -30,16 +30,16 @@ set(analyzer_lib_srcs
schematemplates/schematemplates.qrc
)
-add_library(UserFeedbackAnalyzer STATIC ${analyzer_lib_srcs})
-target_link_libraries(UserFeedbackAnalyzer Qt5::Network)
-target_include_directories(UserFeedbackAnalyzer PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR};${CMAKE_CURRENT_SOURCE_DIR}/..>")
-target_compile_features(UserFeedbackAnalyzer PRIVATE cxx_generic_lambdas)
+add_library(UserFeedbackConsole STATIC ${console_lib_srcs})
+target_link_libraries(UserFeedbackConsole Qt5::Network)
+target_include_directories(UserFeedbackConsole PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR};${CMAKE_CURRENT_SOURCE_DIR}/..>")
+target_compile_features(UserFeedbackConsole PRIVATE cxx_generic_lambdas)
if(NOT TARGET UserFeedbackWidgets)
return()
endif()
-set(analyzer_srcs
+set(console_srcs
connectdialog.cpp
main.cpp
mainwindow.cpp
@@ -63,8 +63,8 @@ set(analyzer_srcs
widgets/metaenumcombobox.cpp
)
-add_executable(UserFeedbackAnalyzerApplication ${analyzer_srcs})
-set_target_properties(UserFeedbackAnalyzerApplication PROPERTIES OUTPUT_NAME UserFeedbackAnalyzer)
-target_link_libraries(UserFeedbackAnalyzerApplication Qt5::Widgets Qt5::Network Qt5::Charts UserFeedbackWidgets UserFeedbackAnalyzer)
+add_executable(UserFeedbackConsoleApplication ${console_srcs})
+set_target_properties(UserFeedbackConsoleApplication PROPERTIES OUTPUT_NAME UserFeedbackConsole)
+target_link_libraries(UserFeedbackConsoleApplication Qt5::Widgets Qt5::Network Qt5::Charts UserFeedbackWidgets UserFeedbackConsole)
-install(TARGETS UserFeedbackAnalyzerApplication ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS UserFeedbackConsoleApplication ${INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/src/analyzer/analytics/aggregator.cpp b/src/console/analytics/aggregator.cpp
similarity index 97%
rename from src/analyzer/analytics/aggregator.cpp
rename to src/console/analytics/aggregator.cpp
index 3169cd6..d7a472f 100644
--- a/src/analyzer/analytics/aggregator.cpp
+++ b/src/console/analytics/aggregator.cpp
@@ -19,7 +19,7 @@
#include <model/singlerowfilterproxymodel.h>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
Aggregator::Aggregator() = default;
Aggregator::~Aggregator() = default;
diff --git a/src/analyzer/analytics/aggregator.h b/src/console/analytics/aggregator.h
similarity index 86%
rename from src/analyzer/analytics/aggregator.h
rename to src/console/analytics/aggregator.h
index 7583f62..abc1e9b 100644
--- a/src/analyzer/analytics/aggregator.h
+++ b/src/console/analytics/aggregator.h
@@ -15,8 +15,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef USERFEEDBACK_ANALYZER_AGGREGATOR_H
-#define USERFEEDBACK_ANALYZER_AGGREGATOR_H
+#ifndef USERFEEDBACK_CONSOLE_AGGREGATOR_H
+#define USERFEEDBACK_CONSOLE_AGGREGATOR_H
#include <core/aggregation.h>
@@ -29,7 +29,7 @@ class QChart;
}
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
class Aggregation;
class SingleRowFilterProxyModel;
@@ -72,7 +72,7 @@ private:
}}
-Q_DECLARE_METATYPE(UserFeedback::Analyzer::Aggregator*)
-Q_DECLARE_OPERATORS_FOR_FLAGS(UserFeedback::Analyzer::Aggregator::ChartModes)
+Q_DECLARE_METATYPE(UserFeedback::Console::Aggregator*)
+Q_DECLARE_OPERATORS_FOR_FLAGS(UserFeedback::Console::Aggregator::ChartModes)
-#endif // USERFEEDBACK_ANALYZER_AGGREGATOR_H
+#endif // USERFEEDBACK_CONSOLE_AGGREGATOR_H
diff --git a/src/analyzer/analytics/analyticsview.cpp b/src/console/analytics/analyticsview.cpp
similarity index 99%
rename from src/analyzer/analytics/analyticsview.cpp
rename to src/console/analytics/analyticsview.cpp
index d90b9cb..f643fa6 100644
--- a/src/analyzer/analytics/analyticsview.cpp
+++ b/src/console/analytics/analyticsview.cpp
@@ -41,7 +41,7 @@
#include <QNetworkReply>
#include <QSettings>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
AnalyticsView::AnalyticsView(QWidget* parent) :
QWidget(parent),
diff --git a/src/analyzer/analytics/analyticsview.h b/src/console/analytics/analyticsview.h
similarity index 92%
rename from src/analyzer/analytics/analyticsview.h
rename to src/console/analytics/analyticsview.h
index 04ac754..67d130a 100644
--- a/src/analyzer/analytics/analyticsview.h
+++ b/src/console/analytics/analyticsview.h
@@ -15,8 +15,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef USERFEEDBACK_ANALYZER_ANALYTICSVIEW_H
-#define USERFEEDBACK_ANALYZER_ANALYTICSVIEW_H
+#ifndef USERFEEDBACK_CONSOLE_ANALYTICSVIEW_H
+#define USERFEEDBACK_CONSOLE_ANALYTICSVIEW_H
#include <core/product.h>
@@ -32,7 +32,7 @@ class QChart;
}
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
class Aggregator;
class AggregatedDataModel;
@@ -83,4 +83,4 @@ private:
}
}
-#endif // USERFEEDBACK_ANALYZER_ANALYTICSVIEW_H
+#endif // USERFEEDBACK_CONSOLE_ANALYTICSVIEW_H
diff --git a/src/analyzer/analytics/analyticsview.ui b/src/console/analytics/analyticsview.ui
similarity index 98%
rename from src/analyzer/analytics/analyticsview.ui
rename to src/console/analytics/analyticsview.ui
index 5a7b3d1..218747a 100644
--- a/src/analyzer/analytics/analyticsview.ui
+++ b/src/console/analytics/analyticsview.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>UserFeedback::Analyzer::AnalyticsView</class>
- <widget class="QWidget" name="UserFeedback::Analyzer::AnalyticsView">
+ <class>UserFeedback::Console::AnalyticsView</class>
+ <widget class="QWidget" name="UserFeedback::Console::AnalyticsView">
<property name="geometry">
<rect>
<x>0</x>
diff --git a/src/analyzer/analytics/categoryaggregator.cpp b/src/console/analytics/categoryaggregator.cpp
similarity index 99%
rename from src/analyzer/analytics/categoryaggregator.cpp
rename to src/console/analytics/categoryaggregator.cpp
index f5eba08..4b8bf18 100644
--- a/src/analyzer/analytics/categoryaggregator.cpp
+++ b/src/console/analytics/categoryaggregator.cpp
@@ -34,7 +34,7 @@
#include <QDebug>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
using namespace QtCharts;
CategoryAggregator::CategoryAggregator() = default;
diff --git a/src/analyzer/analytics/categoryaggregator.h b/src/console/analytics/categoryaggregator.h
similarity index 89%
rename from src/analyzer/analytics/categoryaggregator.h
rename to src/console/analytics/categoryaggregator.h
index 7645ad7..14539e0 100644
--- a/src/analyzer/analytics/categoryaggregator.h
+++ b/src/console/analytics/categoryaggregator.h
@@ -15,15 +15,15 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef USERFEEDBACK_ANALYZER_CATEGORYAGGREGATOR_H
-#define USERFEEDBACK_ANALYZER_CATEGORYAGGREGATOR_H
+#ifndef USERFEEDBACK_CONSOLE_CATEGORYAGGREGATOR_H
+#define USERFEEDBACK_CONSOLE_CATEGORYAGGREGATOR_H
#include "aggregator.h"
#include <memory>
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
class CategoryAggregationModel;
@@ -50,4 +50,4 @@ private:
}}
-#endif // USERFEEDBACK_ANALYZER_CATEGORYAGGREGATOR_H
+#endif // USERFEEDBACK_CONSOLE_CATEGORYAGGREGATOR_H
diff --git a/src/analyzer/analytics/chartutil.cpp b/src/console/analytics/chartutil.cpp
similarity index 96%
rename from src/analyzer/analytics/chartutil.cpp
rename to src/console/analytics/chartutil.cpp
index fc0ca30..7bd45ea 100644
--- a/src/analyzer/analytics/chartutil.cpp
+++ b/src/console/analytics/chartutil.cpp
@@ -21,7 +21,7 @@
#include <QApplication>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
using namespace QtCharts;
void ChartUtil::applyTheme(QtCharts::QChart *chart)
diff --git a/src/analyzer/analytics/chartutil.h b/src/console/analytics/chartutil.h
similarity index 85%
rename from src/analyzer/analytics/chartutil.h
rename to src/console/analytics/chartutil.h
index 6b273ea..42a42c2 100644
--- a/src/analyzer/analytics/chartutil.h
+++ b/src/console/analytics/chartutil.h
@@ -15,15 +15,15 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef USERFEEDBACK_ANALYZER_CHARTUTIL_H
-#define USERFEEDBACK_ANALYZER_CHARTUTIL_H
+#ifndef USERFEEDBACK_CONSOLE_CHARTUTIL_H
+#define USERFEEDBACK_CONSOLE_CHARTUTIL_H
namespace QtCharts {
class QChart;
}
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
namespace ChartUtil
{
@@ -32,4 +32,4 @@ void applyTheme(QtCharts::QChart *chart);
}}
-#endif // USERFEEDBACK_ANALYZER_CHARTUTIL_H
+#endif // USERFEEDBACK_CONSOLE_CHARTUTIL_H
diff --git a/src/analyzer/analytics/numericaggregator.cpp b/src/console/analytics/numericaggregator.cpp
similarity index 98%
rename from src/analyzer/analytics/numericaggregator.cpp
rename to src/console/analytics/numericaggregator.cpp
index a8cc8eb..56352d9 100644
--- a/src/analyzer/analytics/numericaggregator.cpp
+++ b/src/console/analytics/numericaggregator.cpp
@@ -27,7 +27,7 @@
#include <QtCharts/QHBoxPlotModelMapper>
#include <QtCharts/QValueAxis>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
using namespace QtCharts;
NumericAggregator::NumericAggregator() = default;
diff --git a/src/analyzer/analytics/numericaggregator.h b/src/console/analytics/numericaggregator.h
similarity index 88%
rename from src/analyzer/analytics/numericaggregator.h
rename to src/console/analytics/numericaggregator.h
index 9aac14a..8994386 100644
--- a/src/analyzer/analytics/numericaggregator.h
+++ b/src/console/analytics/numericaggregator.h
@@ -15,15 +15,15 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef USERFEEDBACK_ANALYZER_NUMERICAGGREGATOR_H
-#define USERFEEDBACK_ANALYZER_NUMERICAGGREGATOR_H
+#ifndef USERFEEDBACK_CONSOLE_NUMERICAGGREGATOR_H
+#define USERFEEDBACK_CONSOLE_NUMERICAGGREGATOR_H
#include "aggregator.h"
#include <memory>
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
class NumericAggregationModel;
@@ -47,4 +47,4 @@ private:
}}
-#endif // USERFEEDBACK_ANALYZER_NUMERICAGGREGATOR_H
+#endif // USERFEEDBACK_CONSOLE_NUMERICAGGREGATOR_H
diff --git a/src/analyzer/analytics/ratiosetaggregator.cpp b/src/console/analytics/ratiosetaggregator.cpp
similarity index 99%
rename from src/analyzer/analytics/ratiosetaggregator.cpp
rename to src/console/analytics/ratiosetaggregator.cpp
index 10dbf24..9d8acdd 100644
--- a/src/analyzer/analytics/ratiosetaggregator.cpp
+++ b/src/console/analytics/ratiosetaggregator.cpp
@@ -30,7 +30,7 @@
#include <QtCharts/QValueAxis>
#include <QtCharts/QVXYModelMapper>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
using namespace QtCharts;
RatioSetAggregator::RatioSetAggregator() = default;
diff --git a/src/analyzer/analytics/ratiosetaggregator.h b/src/console/analytics/ratiosetaggregator.h
similarity index 89%
rename from src/analyzer/analytics/ratiosetaggregator.h
rename to src/console/analytics/ratiosetaggregator.h
index e726b71..8c3e751 100644
--- a/src/analyzer/analytics/ratiosetaggregator.h
+++ b/src/console/analytics/ratiosetaggregator.h
@@ -15,15 +15,15 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef USERFEEDBACK_ANALYZER_RATIOSETAGGREGATOR_H
-#define USERFEEDBACK_ANALYZER_RATIOSETAGGREGATOR_H
+#ifndef USERFEEDBACK_CONSOLE_RATIOSETAGGREGATOR_H
+#define USERFEEDBACK_CONSOLE_RATIOSETAGGREGATOR_H
#include "aggregator.h"
#include <memory>
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
class RatioSetAggregationModel;
@@ -50,4 +50,4 @@ private:
}}
-#endif // USERFEEDBACK_ANALYZER_RATIOSETAGGREGATOR_H
+#endif // USERFEEDBACK_CONSOLE_RATIOSETAGGREGATOR_H
diff --git a/src/analyzer/analytics/totalaggregator.cpp b/src/console/analytics/totalaggregator.cpp
similarity index 98%
rename from src/analyzer/analytics/totalaggregator.cpp
rename to src/console/analytics/totalaggregator.cpp
index 8d6166d..f59e809 100644
--- a/src/analyzer/analytics/totalaggregator.cpp
+++ b/src/console/analytics/totalaggregator.cpp
@@ -30,7 +30,7 @@
#include <numeric>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
using namespace QtCharts;
TotalAggregator::TotalAggregator() = default;
diff --git a/src/analyzer/analytics/totalaggregator.h b/src/console/analytics/totalaggregator.h
similarity index 83%
rename from src/analyzer/analytics/totalaggregator.h
rename to src/console/analytics/totalaggregator.h
index 480e406..8d1e343 100644
--- a/src/analyzer/analytics/totalaggregator.h
+++ b/src/console/analytics/totalaggregator.h
@@ -15,8 +15,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef USERFEEDBACK_ANALYZER_TOTALAGGREGATOR_H
-#define USERFEEDBACK_ANALYZER_TOTALAGGREGATOR_H
+#ifndef USERFEEDBACK_CONSOLE_TOTALAGGREGATOR_H
+#define USERFEEDBACK_CONSOLE_TOTALAGGREGATOR_H
#include "aggregator.h"
@@ -25,11 +25,11 @@
#include <memory>
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
class TotalAggregator : public Aggregator
{
- Q_DECLARE_TR_FUNCTIONS(UserFeedback::Analyzer::TotalAggregator)
+ Q_DECLARE_TR_FUNCTIONS(UserFeedback::Console::TotalAggregator)
public:
TotalAggregator();
~TotalAggregator();
@@ -47,4 +47,4 @@ private:
}}
-#endif // USERFEEDBACK_ANALYZER_TOTALAGGREGATOR_H
+#endif // USERFEEDBACK_CONSOLE_TOTALAGGREGATOR_H
diff --git a/src/analyzer/connectdialog.cpp b/src/console/connectdialog.cpp
similarity index 98%
rename from src/analyzer/connectdialog.cpp
rename to src/console/connectdialog.cpp
index b400e4b..9d267e5 100644
--- a/src/analyzer/connectdialog.cpp
+++ b/src/console/connectdialog.cpp
@@ -24,7 +24,7 @@
#include <QIcon>
#include <QUrl>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
ConnectDialog::ConnectDialog(QWidget *parent) :
QDialog(parent),
diff --git a/src/analyzer/connectdialog.h b/src/console/connectdialog.h
similarity index 88%
rename from src/analyzer/connectdialog.h
rename to src/console/connectdialog.h
index 531f929..4380004 100644
--- a/src/analyzer/connectdialog.h
+++ b/src/console/connectdialog.h
@@ -15,15 +15,15 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef USERFEEDBACK_ANALYZER_CONNECTDIALOG_H
-#define USERFEEDBACK_ANALYZER_CONNECTDIALOG_H
+#ifndef USERFEEDBACK_CONSOLE_CONNECTDIALOG_H
+#define USERFEEDBACK_CONSOLE_CONNECTDIALOG_H
#include <QDialog>
#include <memory>
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
namespace Ui
{
@@ -53,4 +53,4 @@ private:
}
}
-#endif // USERFEEDBACK_ANALYZER_CONNECTDIALOG_H
+#endif // USERFEEDBACK_CONSOLE_CONNECTDIALOG_H
diff --git a/src/analyzer/connectdialog.ui b/src/console/connectdialog.ui
similarity index 92%
rename from src/analyzer/connectdialog.ui
rename to src/console/connectdialog.ui
index 3d1604f..70eb666 100644
--- a/src/analyzer/connectdialog.ui
+++ b/src/console/connectdialog.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>UserFeedback::Analyzer::ConnectDialog</class>
- <widget class="QDialog" name="UserFeedback::Analyzer::ConnectDialog">
+ <class>UserFeedback::Console::ConnectDialog</class>
+ <widget class="QDialog" name="UserFeedback::Console::ConnectDialog">
<property name="geometry">
<rect>
<x>0</x>
@@ -91,7 +91,7 @@
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
- <receiver>UserFeedback::Analyzer::ConnectDialog</receiver>
+ <receiver>UserFeedback::Console::ConnectDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
@@ -107,7 +107,7 @@
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
- <receiver>UserFeedback::Analyzer::ConnectDialog</receiver>
+ <receiver>UserFeedback::Console::ConnectDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
diff --git a/src/analyzer/core/aggregation.cpp b/src/console/core/aggregation.cpp
similarity index 98%
rename from src/analyzer/core/aggregation.cpp
rename to src/console/core/aggregation.cpp
index 6769fb0..979865a 100644
--- a/src/analyzer/core/aggregation.cpp
+++ b/src/console/core/aggregation.cpp
@@ -21,7 +21,7 @@
#include <QJsonArray>
#include <QJsonObject>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
static const struct {
Aggregation::Type type;
diff --git a/src/analyzer/core/aggregation.h b/src/console/core/aggregation.h
similarity index 83%
rename from src/analyzer/core/aggregation.h
rename to src/console/core/aggregation.h
index 61f6fef..7fcffe6 100644
--- a/src/analyzer/core/aggregation.h
+++ b/src/console/core/aggregation.h
@@ -15,8 +15,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef USERFEEDBACK_ANALYZER_AGGREGATION_H
-#define USERFEEDBACK_ANALYZER_AGGREGATION_H
+#ifndef USERFEEDBACK_CONSOLE_AGGREGATION_H
+#define USERFEEDBACK_CONSOLE_AGGREGATION_H
#include <core/aggregationelement.h>
@@ -26,7 +26,7 @@ class QJsonArray;
class QJsonObject;
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
class Product;
@@ -63,7 +63,7 @@ private:
}
}
-Q_DECLARE_TYPEINFO(UserFeedback::Analyzer::Aggregation, Q_MOVABLE_TYPE);
-Q_DECLARE_METATYPE(UserFeedback::Analyzer::Aggregation::Type)
+Q_DECLARE_TYPEINFO(UserFeedback::Console::Aggregation, Q_MOVABLE_TYPE);
+Q_DECLARE_METATYPE(UserFeedback::Console::Aggregation::Type)
-#endif // USERFEEDBACK_ANALYZER_AGGREGATION_H
+#endif // USERFEEDBACK_CONSOLE_AGGREGATION_H
diff --git a/src/analyzer/core/aggregationelement.cpp b/src/console/core/aggregationelement.cpp
similarity index 98%
rename from src/analyzer/core/aggregationelement.cpp
rename to src/console/core/aggregationelement.cpp
index c7f80c6..e9d6beb 100644
--- a/src/analyzer/core/aggregationelement.cpp
+++ b/src/console/core/aggregationelement.cpp
@@ -22,7 +22,7 @@
#include <QJsonArray>
#include <QJsonObject>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
static const struct {
AggregationElement::Type type;
diff --git a/src/analyzer/core/aggregationelement.h b/src/console/core/aggregationelement.h
similarity index 83%
rename from src/analyzer/core/aggregationelement.h
rename to src/console/core/aggregationelement.h
index 8889ad8..5f059e5 100644
--- a/src/analyzer/core/aggregationelement.h
+++ b/src/console/core/aggregationelement.h
@@ -15,8 +15,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef USERFEEDBACK_ANALYZER_AGGREGATIONELEMENT_H
-#define USERFEEDBACK_ANALYZER_AGGREGATIONELEMENT_H
+#ifndef USERFEEDBACK_CONSOLE_AGGREGATIONELEMENT_H
+#define USERFEEDBACK_CONSOLE_AGGREGATIONELEMENT_H
#include "schemaentry.h"
#include "schemaentryelement.h"
@@ -25,7 +25,7 @@ class QJsonArray;
class QJsonObject;
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
class Product;
@@ -64,7 +64,7 @@ private:
}
}
-Q_DECLARE_TYPEINFO(UserFeedback::Analyzer::AggregationElement, Q_MOVABLE_TYPE);
-Q_DECLARE_METATYPE(UserFeedback::Analyzer::AggregationElement)
+Q_DECLARE_TYPEINFO(UserFeedback::Console::AggregationElement, Q_MOVABLE_TYPE);
+Q_DECLARE_METATYPE(UserFeedback::Console::AggregationElement)
-#endif // USERFEEDBACK_ANALYZER_AGGREGATIONELEMENT_H
+#endif // USERFEEDBACK_CONSOLE_AGGREGATIONELEMENT_H
diff --git a/src/analyzer/core/product.cpp b/src/console/core/product.cpp
similarity index 98%
rename from src/analyzer/core/product.cpp
rename to src/console/core/product.cpp
index 61205e6..c0c8013 100644
--- a/src/analyzer/core/product.cpp
+++ b/src/console/core/product.cpp
@@ -24,10 +24,10 @@
#include <QSharedData>
#include <QString>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
class ProductData : public QSharedData
{
public:
diff --git a/src/analyzer/core/product.h b/src/console/core/product.h
similarity index 85%
rename from src/analyzer/core/product.h
rename to src/console/core/product.h
index 911b12d..ce5cf6c 100644
--- a/src/analyzer/core/product.h
+++ b/src/console/core/product.h
@@ -15,8 +15,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef USERFEEDBACK_ANALYZER_PRODUCT_H
-#define USERFEEDBACK_ANALYZER_PRODUCT_H
+#ifndef USERFEEDBACK_CONSOLE_PRODUCT_H
+#define USERFEEDBACK_CONSOLE_PRODUCT_H
#include "schemaentry.h"
@@ -27,7 +27,7 @@
class QString;
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
class Aggregation;
class ProductData;
@@ -66,7 +66,7 @@ private:
}
}
-Q_DECLARE_TYPEINFO(UserFeedback::Analyzer::Product, Q_MOVABLE_TYPE);
-Q_DECLARE_METATYPE(UserFeedback::Analyzer::Product)
+Q_DECLARE_TYPEINFO(UserFeedback::Console::Product, Q_MOVABLE_TYPE);
+Q_DECLARE_METATYPE(UserFeedback::Console::Product)
-#endif // USERFEEDBACK_ANALYZER_PRODUCT_H
+#endif // USERFEEDBACK_CONSOLE_PRODUCT_H
diff --git a/src/analyzer/core/sample.cpp b/src/console/core/sample.cpp
similarity index 98%
rename from src/analyzer/core/sample.cpp
rename to src/console/core/sample.cpp
index f2baba2..0202532 100644
--- a/src/analyzer/core/sample.cpp
+++ b/src/console/core/sample.cpp
@@ -29,9 +29,9 @@
#include <QSharedData>
#include <QVariant>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
-class UserFeedback::Analyzer::SampleData : public QSharedData
+class UserFeedback::Console::SampleData : public QSharedData
{
public:
QDateTime timestamp;
diff --git a/src/analyzer/core/sample.h b/src/console/core/sample.h
similarity index 84%
rename from src/analyzer/core/sample.h
rename to src/console/core/sample.h
index adb6d42..5afb082 100644
--- a/src/analyzer/core/sample.h
+++ b/src/console/core/sample.h
@@ -15,8 +15,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef USERFEEDBACK_ANALYZER_SAMPLE_H
-#define USERFEEDBACK_ANALYZER_SAMPLE_H
+#ifndef USERFEEDBACK_CONSOLE_SAMPLE_H
+#define USERFEEDBACK_CONSOLE_SAMPLE_H
#include <QMetaType>
#include <QSharedDataPointer>
@@ -26,7 +26,7 @@ class QDateTime;
class QString;
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
class Product;
class SampleData;
@@ -53,7 +53,7 @@ private:
}
}
-Q_DECLARE_TYPEINFO(UserFeedback::Analyzer::Sample, Q_MOVABLE_TYPE);
-Q_DECLARE_METATYPE(UserFeedback::Analyzer::Sample)
+Q_DECLARE_TYPEINFO(UserFeedback::Console::Sample, Q_MOVABLE_TYPE);
+Q_DECLARE_METATYPE(UserFeedback::Console::Sample)
-#endif // USERFEEDBACK_ANALYZER_SAMPLE_H
+#endif // USERFEEDBACK_CONSOLE_SAMPLE_H
diff --git a/src/analyzer/core/schemaentry.cpp b/src/console/core/schemaentry.cpp
similarity index 98%
rename from src/analyzer/core/schemaentry.cpp
rename to src/console/core/schemaentry.cpp
index 140ebc0..7da39bd 100644
--- a/src/analyzer/core/schemaentry.cpp
+++ b/src/console/core/schemaentry.cpp
@@ -25,10 +25,10 @@
#include <QObject>
#include <QSharedData>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
class SchemaEntryData : public QSharedData
{
diff --git a/src/analyzer/core/schemaentry.h b/src/console/core/schemaentry.h
similarity index 91%
rename from src/analyzer/core/schemaentry.h
rename to src/console/core/schemaentry.h
index cb77cb9..40709ce 100644
--- a/src/analyzer/core/schemaentry.h
+++ b/src/console/core/schemaentry.h
@@ -15,8 +15,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef USERFEEDBACK_ANALYZER_SCHEMAENTRY_H
-#define USERFEEDBACK_ANALYZER_SCHEMAENTRY_H
+#ifndef USERFEEDBACK_CONSOLE_SCHEMAENTRY_H
+#define USERFEEDBACK_CONSOLE_SCHEMAENTRY_H
#include <QObject>
#include <QSharedDataPointer>
@@ -26,7 +26,7 @@ class QJsonArray;
class QJsonObject;
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
class SchemaEntryData;
class SchemaEntryElement;
@@ -96,7 +96,7 @@ private:
}
}
-Q_DECLARE_METATYPE(UserFeedback::Analyzer::SchemaEntry)
-Q_DECLARE_TYPEINFO(UserFeedback::Analyzer::SchemaEntry, Q_MOVABLE_TYPE);
+Q_DECLARE_METATYPE(UserFeedback::Console::SchemaEntry)
+Q_DECLARE_TYPEINFO(UserFeedback::Console::SchemaEntry, Q_MOVABLE_TYPE);
-#endif // USERFEEDBACK_ANALYZER_PRODUCTSCHEMAENTRY_H
+#endif // USERFEEDBACK_CONSOLE_PRODUCTSCHEMAENTRY_H
diff --git a/src/analyzer/core/schemaentryelement.cpp b/src/console/core/schemaentryelement.cpp
similarity index 97%
rename from src/analyzer/core/schemaentryelement.cpp
rename to src/console/core/schemaentryelement.cpp
index 68a40ec..5fff688 100644
--- a/src/analyzer/core/schemaentryelement.cpp
+++ b/src/console/core/schemaentryelement.cpp
@@ -23,10 +23,10 @@
#include <QSharedData>
#include <QVector>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
class SchemaEntryElementData : public QSharedData
{
public:
diff --git a/src/analyzer/core/schemaentryelement.h b/src/console/core/schemaentryelement.h
similarity index 81%
rename from src/analyzer/core/schemaentryelement.h
rename to src/console/core/schemaentryelement.h
index d304713..67c4f2d 100644
--- a/src/analyzer/core/schemaentryelement.h
+++ b/src/console/core/schemaentryelement.h
@@ -15,8 +15,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef USERFEEDBACK_ANALYZER_SCHEMAENTRYELEMENT_H
-#define USERFEEDBACK_ANALYZER_SCHEMAENTRYELEMENT_H
+#ifndef USERFEEDBACK_CONSOLE_SCHEMAENTRYELEMENT_H
+#define USERFEEDBACK_CONSOLE_SCHEMAENTRYELEMENT_H
#include <qobjectdefs.h>
#include <QMetaType>
@@ -29,7 +29,7 @@ template <typename T> class QVector;
QT_END_NAMESPACE
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
class SchemaEntryElementData;
@@ -68,8 +68,8 @@ private:
}
}
-Q_DECLARE_METATYPE(UserFeedback::Analyzer::SchemaEntryElement)
-Q_DECLARE_METATYPE(UserFeedback::Analyzer::SchemaEntryElement::Type)
-Q_DECLARE_TYPEINFO(UserFeedback::Analyzer::SchemaEntryElement, Q_MOVABLE_TYPE);
+Q_DECLARE_METATYPE(UserFeedback::Console::SchemaEntryElement)
+Q_DECLARE_METATYPE(UserFeedback::Console::SchemaEntryElement::Type)
+Q_DECLARE_TYPEINFO(UserFeedback::Console::SchemaEntryElement, Q_MOVABLE_TYPE);
-#endif // USERFEEDBACK_ANALYZER_SCHEMAENTRYELEMENT_H
+#endif // USERFEEDBACK_CONSOLE_SCHEMAENTRYELEMENT_H
diff --git a/src/analyzer/core/schemaentrytemplates.cpp b/src/console/core/schemaentrytemplates.cpp
similarity index 97%
rename from src/analyzer/core/schemaentrytemplates.cpp
rename to src/console/core/schemaentrytemplates.cpp
index ab85f1a..c71b65d 100644
--- a/src/analyzer/core/schemaentrytemplates.cpp
+++ b/src/console/core/schemaentrytemplates.cpp
@@ -28,7 +28,7 @@
#include <algorithm>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
QVector<Product> SchemaEntryTemplates::availableTemplates()
{
diff --git a/src/analyzer/core/schemaentrytemplates.h b/src/console/core/schemaentrytemplates.h
similarity index 83%
rename from src/analyzer/core/schemaentrytemplates.h
rename to src/console/core/schemaentrytemplates.h
index b6e5b5d..4b7807b 100644
--- a/src/analyzer/core/schemaentrytemplates.h
+++ b/src/console/core/schemaentrytemplates.h
@@ -15,13 +15,13 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef USERFEEDBACK_ANALYZER_SCHEMAENTRYTEMPLATES_H
-#define USERFEEDBACK_ANALYZER_SCHEMAENTRYTEMPLATES_H
+#ifndef USERFEEDBACK_CONSOLE_SCHEMAENTRYTEMPLATES_H
+#define USERFEEDBACK_CONSOLE_SCHEMAENTRYTEMPLATES_H
template <typename T> class QVector;
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
class Product;
@@ -33,4 +33,4 @@ namespace SchemaEntryTemplates
}
}
-#endif // USERFEEDBACK_ANALYZER_SCHEMAENTRYTEMPLATES_H
+#endif // USERFEEDBACK_CONSOLE_SCHEMAENTRYTEMPLATES_H
diff --git a/src/analyzer/core/survey.cpp b/src/console/core/survey.cpp
similarity index 98%
rename from src/analyzer/core/survey.cpp
rename to src/console/core/survey.cpp
index 69e6f45..bd79ddc 100644
--- a/src/analyzer/core/survey.cpp
+++ b/src/console/core/survey.cpp
@@ -25,10 +25,10 @@
#include <QString>
#include <QUrl>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
class SurveyData : public QSharedData
{
diff --git a/src/analyzer/core/survey.h b/src/console/core/survey.h
similarity index 85%
rename from src/analyzer/core/survey.h
rename to src/console/core/survey.h
index bff1b12..35705e2 100644
--- a/src/analyzer/core/survey.h
+++ b/src/console/core/survey.h
@@ -15,8 +15,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef USERFEEDBACK_ANALYZER_SURVEY_H
-#define USERFEEDBACK_ANALYZER_SURVEY_H
+#ifndef USERFEEDBACK_CONSOLE_SURVEY_H
+#define USERFEEDBACK_CONSOLE_SURVEY_H
#include <QMetaType>
#include <QSharedDataPointer>
@@ -26,7 +26,7 @@ class QString;
class QUrl;
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
class SurveyData;
@@ -63,7 +63,7 @@ private:
}
}
-Q_DECLARE_TYPEINFO(UserFeedback::Analyzer::Survey, Q_MOVABLE_TYPE);
-Q_DECLARE_METATYPE(UserFeedback::Analyzer::Survey)
+Q_DECLARE_TYPEINFO(UserFeedback::Console::Survey, Q_MOVABLE_TYPE);
+Q_DECLARE_METATYPE(UserFeedback::Console::Survey)
-#endif // USERFEEDBACK_ANALYZER_SURVEY_H
+#endif // USERFEEDBACK_CONSOLE_SURVEY_H
diff --git a/src/analyzer/core/util.h b/src/console/core/util.h
similarity index 92%
rename from src/analyzer/core/util.h
rename to src/console/core/util.h
index 5182fcd..e54dec3 100644
--- a/src/analyzer/core/util.h
+++ b/src/console/core/util.h
@@ -15,8 +15,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef USERFEEDBACK_ANALYZER_UTIL_H
-#define USERFEEDBACK_ANALYZER_UTIL_H
+#ifndef USERFEEDBACK_CONSOLE_UTIL_H
+#define USERFEEDBACK_CONSOLE_UTIL_H
#include <QMetaEnum>
#include <QMetaType>
@@ -24,7 +24,7 @@
class QString;
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
namespace Util
{
template<typename Enum, typename Table, std::size_t N>
@@ -61,4 +61,4 @@ namespace Util
}
}
-#endif // USERFEEDBACK_ANALYZER_UTIL_H
+#endif // USERFEEDBACK_CONSOLE_UTIL_H
diff --git a/src/analyzer/main.cpp b/src/console/main.cpp
similarity index 94%
rename from src/analyzer/main.cpp
rename to src/console/main.cpp
index 0640a1f..fe977cb 100644
--- a/src/analyzer/main.cpp
+++ b/src/console/main.cpp
@@ -22,7 +22,7 @@
int main(int argc, char** argv)
{
- QCoreApplication::setApplicationName(QStringLiteral("UserFeedbackAnalyzer"));
+ QCoreApplication::setApplicationName(QStringLiteral("UserFeedbackConsole"));
QCoreApplication::setApplicationVersion(QStringLiteral(USERFEEDBACK_VERSION));
QCoreApplication::setOrganizationName(QStringLiteral("KDE"));
QCoreApplication::setOrganizationDomain(QStringLiteral("kde.org"));
@@ -31,7 +31,7 @@ int main(int argc, char** argv)
QApplication app(argc, argv);
- UserFeedback::Analyzer::MainWindow mainWindow;
+ UserFeedback::Console::MainWindow mainWindow;
mainWindow.show();
return app.exec();
diff --git a/src/analyzer/mainwindow.cpp b/src/console/mainwindow.cpp
similarity index 98%
rename from src/analyzer/mainwindow.cpp
rename to src/console/mainwindow.cpp
index 3116fb3..7e5b012 100644
--- a/src/analyzer/mainwindow.cpp
+++ b/src/console/mainwindow.cpp
@@ -47,7 +47,7 @@
#include <QTimer>
#include <QUrl>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
MainWindow::MainWindow() :
ui(new Ui::MainWindow),
@@ -113,7 +113,7 @@ MainWindow::MainWindow() :
dlg.exec();
});
connect(ui->actionAbout, &QAction::triggered, this, [this]() {
- QMessageBox::about(this, tr("About User Feedback Analyzer"), tr(
+ QMessageBox::about(this, tr("About User Feedback Console"), tr(
"Version: %1\n"
"License: LGPLv2+\n"
"Copyright ⓒ 2016 Volker Krause <vkrause@kde.org>"
diff --git a/src/analyzer/mainwindow.h b/src/console/mainwindow.h
similarity index 91%
rename from src/analyzer/mainwindow.h
rename to src/console/mainwindow.h
index ccd9e3e..8c5d566 100644
--- a/src/analyzer/mainwindow.h
+++ b/src/console/mainwindow.h
@@ -15,8 +15,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef USERFEEDBACK_ANALYZER_MAINWINDOW_H
-#define USERFEEDBACK_ANALYZER_MAINWINDOW_H
+#ifndef USERFEEDBACK_CONSOLE_MAINWINDOW_H
+#define USERFEEDBACK_CONSOLE_MAINWINDOW_H
#include <QMainWindow>
#include <QVector>
@@ -30,7 +30,7 @@ namespace UserFeedback {
class Provider;
-namespace Analyzer {
+namespace Console {
namespace Ui
{
@@ -74,4 +74,4 @@ private:
}
}
-#endif // USERFEEDBACK_ANALYZER_MAINWINDOW_H
+#endif // USERFEEDBACK_CONSOLE_MAINWINDOW_H
diff --git a/src/analyzer/mainwindow.ui b/src/console/mainwindow.ui
similarity index 93%
rename from src/analyzer/mainwindow.ui
rename to src/console/mainwindow.ui
index a9c8d26..7e8f8b9 100644
--- a/src/analyzer/mainwindow.ui
+++ b/src/console/mainwindow.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>UserFeedback::Analyzer::MainWindow</class>
- <widget class="QMainWindow" name="UserFeedback::Analyzer::MainWindow">
+ <class>UserFeedback::Console::MainWindow</class>
+ <widget class="QMainWindow" name="UserFeedback::Console::MainWindow">
<property name="geometry">
<rect>
<x>0</x>
@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
- <string>User Feedback Analyzer</string>
+ <string>User Feedback Console</string>
</property>
<widget class="QWidget" name="centralwidget">
<layout class="QVBoxLayout" name="verticalLayout_3">
@@ -29,9 +29,9 @@
</property>
<item>
<widget class="QStackedWidget" name="viewStack">
- <widget class="UserFeedback::Analyzer::AnalyticsView" name="analyticsView"/>
- <widget class="UserFeedback::Analyzer::SurveyEditor" name="surveyEditor"/>
- <widget class="UserFeedback::Analyzer::SchemaEditor" name="schemaEdit"/>
+ <widget class="UserFeedback::Console::AnalyticsView" name="analyticsView"/>
+ <widget class="UserFeedback::Console::SurveyEditor" name="surveyEditor"/>
+ <widget class="UserFeedback::Console::SchemaEditor" name="schemaEdit"/>
</widget>
</item>
<item>
@@ -194,7 +194,7 @@
<string>&Quit</string>
</property>
<property name="toolTip">
- <string>Quit the user feedback analyzer.</string>
+ <string>Quit the user feedback console.</string>
</property>
<property name="menuRole">
<enum>QAction::QuitRole</enum>
@@ -292,19 +292,19 @@
<container>1</container>
</customwidget>
<customwidget>
- <class>UserFeedback::Analyzer::SchemaEditor</class>
+ <class>UserFeedback::Console::SchemaEditor</class>
<extends>QWidget</extends>
<header>schemaeditor/schemaeditor.h</header>
<container>1</container>
</customwidget>
<customwidget>
- <class>UserFeedback::Analyzer::SurveyEditor</class>
+ <class>UserFeedback::Console::SurveyEditor</class>
<extends>QWidget</extends>
<header location="global">surveyeditor/surveyeditor.h</header>
<container>1</container>
</customwidget>
<customwidget>
- <class>UserFeedback::Analyzer::AnalyticsView</class>
+ <class>UserFeedback::Console::AnalyticsView</class>
<extends>QWidget</extends>
<header location="global">analytics/analyticsview.h</header>
<container>1</container>
diff --git a/src/analyzer/model/aggregateddatamodel.cpp b/src/console/model/aggregateddatamodel.cpp
similarity index 98%
rename from src/analyzer/model/aggregateddatamodel.cpp
rename to src/console/model/aggregateddatamodel.cpp
index 5e62644..290921e 100644
--- a/src/analyzer/model/aggregateddatamodel.cpp
+++ b/src/console/model/aggregateddatamodel.cpp
@@ -20,7 +20,7 @@
#include <QDebug>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
AggregatedDataModel::AggregatedDataModel(QObject *parent) :
QAbstractTableModel(parent)
diff --git a/src/analyzer/model/aggregateddatamodel.h b/src/console/model/aggregateddatamodel.h
similarity index 90%
rename from src/analyzer/model/aggregateddatamodel.h
rename to src/console/model/aggregateddatamodel.h
index bf09340..aa2d9f7 100644
--- a/src/analyzer/model/aggregateddatamodel.h
+++ b/src/console/model/aggregateddatamodel.h
@@ -15,14 +15,14 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef USERFEEDBACK_ANALYZER_AGGREGATEDDATAMODEL_H
-#define USERFEEDBACK_ANALYZER_AGGREGATEDDATAMODEL_H
+#ifndef USERFEEDBACK_CONSOLE_AGGREGATEDDATAMODEL_H
+#define USERFEEDBACK_CONSOLE_AGGREGATEDDATAMODEL_H
#include <QAbstractTableModel>
#include <QVector>
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
/** Joint model for all time-aggregated data, for user display and export. */
class AggregatedDataModel : public QAbstractTableModel
@@ -52,4 +52,4 @@ private:
}
}
-#endif // USERFEEDBACK_ANALYZER_AGGREGATEDDATAMODEL_H
+#endif // USERFEEDBACK_CONSOLE_AGGREGATEDDATAMODEL_H
diff --git a/src/analyzer/model/aggregationeditormodel.cpp b/src/console/model/aggregationeditormodel.cpp
similarity index 98%
rename from src/analyzer/model/aggregationeditormodel.cpp
rename to src/console/model/aggregationeditormodel.cpp
index 704b30e..4168dc1 100644
--- a/src/analyzer/model/aggregationeditormodel.cpp
+++ b/src/console/model/aggregationeditormodel.cpp
@@ -20,7 +20,7 @@
#include <core/aggregation.h>
#include <core/util.h>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
AggregationEditorModel::AggregationEditorModel(QObject* parent) :
QAbstractTableModel(parent)
diff --git a/src/analyzer/model/aggregationeditormodel.h b/src/console/model/aggregationeditormodel.h
similarity index 89%
rename from src/analyzer/model/aggregationeditormodel.h
rename to src/console/model/aggregationeditormodel.h
index 3f58b0a..3407145 100644
--- a/src/analyzer/model/aggregationeditormodel.h
+++ b/src/console/model/aggregationeditormodel.h
@@ -15,15 +15,15 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef USERFEEDBACK_ANALYZER_AGGREGATIONEDITORMODEL_H
-#define USERFEEDBACK_ANALYZER_AGGREGATIONEDITORMODEL_H
+#ifndef USERFEEDBACK_CONSOLE_AGGREGATIONEDITORMODEL_H
+#define USERFEEDBACK_CONSOLE_AGGREGATIONEDITORMODEL_H
#include <core/product.h>
#include <QAbstractTableModel>
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
class AggregationEditorModel : public QAbstractTableModel
{
@@ -48,4 +48,4 @@ private:
}
}
-#endif // USERFEEDBACK_ANALYZER_AGGREGATIONEDITORMODEL_H
+#endif // USERFEEDBACK_CONSOLE_AGGREGATIONEDITORMODEL_H
diff --git a/src/analyzer/model/aggregationelementmodel.cpp b/src/console/model/aggregationelementmodel.cpp
similarity index 98%
rename from src/analyzer/model/aggregationelementmodel.cpp
rename to src/console/model/aggregationelementmodel.cpp
index 61256d5..c7f2f5a 100644
--- a/src/analyzer/model/aggregationelementmodel.cpp
+++ b/src/console/model/aggregationelementmodel.cpp
@@ -19,7 +19,7 @@
#include <core/product.h>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
AggregationElementModel::AggregationElementModel(QObject* parent) :
QAbstractListModel(parent)
diff --git a/src/analyzer/model/aggregationelementmodel.h b/src/console/model/aggregationelementmodel.h
similarity index 88%
rename from src/analyzer/model/aggregationelementmodel.h
rename to src/console/model/aggregationelementmodel.h
index 6add72e..39e659f 100644
--- a/src/analyzer/model/aggregationelementmodel.h
+++ b/src/console/model/aggregationelementmodel.h
@@ -16,8 +16,8 @@
*/
-#ifndef USERFEEDBACK_ANALYZER_AGGREGATIONELEMENTMODEL_H
-#define USERFEEDBACK_ANALYZER_AGGREGATIONELEMENTMODEL_H
+#ifndef USERFEEDBACK_CONSOLE_AGGREGATIONELEMENTMODEL_H
+#define USERFEEDBACK_CONSOLE_AGGREGATIONELEMENTMODEL_H
#include <core/aggregation.h>
@@ -25,7 +25,7 @@
#include <QVector>
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
class Product;
@@ -48,4 +48,4 @@ private:
}
}
-#endif // USERFEEDBACK_ANALYZER_AGGREGATIONELEMENTMODEL_H
+#endif // USERFEEDBACK_CONSOLE_AGGREGATIONELEMENTMODEL_H
diff --git a/src/analyzer/model/categoryaggregationmodel.cpp b/src/console/model/categoryaggregationmodel.cpp
similarity index 99%
rename from src/analyzer/model/categoryaggregationmodel.cpp
rename to src/console/model/categoryaggregationmodel.cpp
index 17843c9..0346010 100644
--- a/src/analyzer/model/categoryaggregationmodel.cpp
+++ b/src/console/model/categoryaggregationmodel.cpp
@@ -25,7 +25,7 @@
#include <algorithm>
#include <string.h>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
CategoryAggregationModel::CategoryAggregationModel(QObject *parent) :
QAbstractTableModel(parent)
diff --git a/src/analyzer/model/categoryaggregationmodel.h b/src/console/model/categoryaggregationmodel.h
similarity index 89%
rename from src/analyzer/model/categoryaggregationmodel.h
rename to src/console/model/categoryaggregationmodel.h
index 1ff200d..5eaba21 100644
--- a/src/analyzer/model/categoryaggregationmodel.h
+++ b/src/console/model/categoryaggregationmodel.h
@@ -15,14 +15,14 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef USERFEEDBACK_ANALYZER_CATEGORYAGGREGATIONMODEL_H
-#define USERFEEDBACK_ANALYZER_CATEGORYAGGREGATIONMODEL_H
+#ifndef USERFEEDBACK_CONSOLE_CATEGORYAGGREGATIONMODEL_H
+#define USERFEEDBACK_CONSOLE_CATEGORYAGGREGATIONMODEL_H
#include <QAbstractTableModel>
#include <QVector>
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
/** Aggregate by time and one string category value (e.g. version. platform, etc). */
class CategoryAggregationModel : public QAbstractTableModel
@@ -53,4 +53,4 @@ private:
}
}
-#endif // USERFEEDBACK_ANALYZER_CATEGORYAGGREGATIONMODEL_H
+#endif // USERFEEDBACK_CONSOLE_CATEGORYAGGREGATIONMODEL_H
diff --git a/src/analyzer/model/datamodel.cpp b/src/console/model/datamodel.cpp
similarity index 98%
rename from src/analyzer/model/datamodel.cpp
rename to src/console/model/datamodel.cpp
index 797ad70..04e57e5 100644
--- a/src/analyzer/model/datamodel.cpp
+++ b/src/console/model/datamodel.cpp
@@ -26,7 +26,7 @@
#include <algorithm>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
static QString mapToString(const QVariantMap &map)
{
@@ -106,7 +106,7 @@ void DataModel::setSamples(const QVector<Sample> &samples)
endResetModel();
}
-void UserFeedback::Analyzer::DataModel::reload()
+void UserFeedback::Console::DataModel::reload()
{
if (!m_restClient || !m_restClient->isConnected() || !m_product.isValid())
return;
diff --git a/src/analyzer/model/datamodel.h b/src/console/model/datamodel.h
similarity index 93%
rename from src/analyzer/model/datamodel.h
rename to src/console/model/datamodel.h
index 0ef29a2..41f4cad 100644
--- a/src/analyzer/model/datamodel.h
+++ b/src/console/model/datamodel.h
@@ -15,8 +15,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef USERFEEDBACK_ANALYZER_DATAMODEL_H
-#define USERFEEDBACK_ANALYZER_DATAMODEL_H
+#ifndef USERFEEDBACK_CONSOLE_DATAMODEL_H
+#define USERFEEDBACK_CONSOLE_DATAMODEL_H
#include <core/product.h>
#include <core/schemaentry.h>
@@ -25,7 +25,7 @@
#include <QAbstractTableModel>
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
class RESTClient;
class Sample;
@@ -72,4 +72,4 @@ private:
}
}
-#endif // USERFEEDBACK_ANALYZER_DATAMODEL_H
+#endif // USERFEEDBACK_CONSOLE_DATAMODEL_H
diff --git a/src/analyzer/model/extrarowsproxymodel.cpp b/src/console/model/extrarowsproxymodel.cpp
similarity index 98%
rename from src/analyzer/model/extrarowsproxymodel.cpp
rename to src/console/model/extrarowsproxymodel.cpp
index 6608db2..ef3f48d 100644
--- a/src/analyzer/model/extrarowsproxymodel.cpp
+++ b/src/console/model/extrarowsproxymodel.cpp
@@ -17,7 +17,7 @@
#include "extrarowsproxymodel.h"
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
ExtraRowsProxyModel::ExtraRowsProxyModel(QObject* parent) :
QIdentityProxyModel(parent)
diff --git a/src/analyzer/model/extrarowsproxymodel.h b/src/console/model/extrarowsproxymodel.h
similarity index 88%
rename from src/analyzer/model/extrarowsproxymodel.h
rename to src/console/model/extrarowsproxymodel.h
index e3be49e..760f1dc 100644
--- a/src/analyzer/model/extrarowsproxymodel.h
+++ b/src/console/model/extrarowsproxymodel.h
@@ -15,13 +15,13 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef USERFEEDBACK_ANALYZER_EXTRAROWSPROXYMODEL_H
-#define USERFEEDBACK_ANALYZER_EXTRAROWSPROXYMODEL_H
+#ifndef USERFEEDBACK_CONSOLE_EXTRAROWSPROXYMODEL_H
+#define USERFEEDBACK_CONSOLE_EXTRAROWSPROXYMODEL_H
#include <QIdentityProxyModel>
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
class ExtraRowsProxyModel : public QIdentityProxyModel
{
@@ -44,4 +44,4 @@ private:
}}
-#endif // USERFEEDBACK_ANALYZER_EXTRAROWSPROXYMODEL_H
+#endif // USERFEEDBACK_CONSOLE_EXTRAROWSPROXYMODEL_H
diff --git a/src/analyzer/model/numericaggregationmodel.cpp b/src/console/model/numericaggregationmodel.cpp
similarity index 99%
rename from src/analyzer/model/numericaggregationmodel.cpp
rename to src/console/model/numericaggregationmodel.cpp
index b26d9e4..7f2e85e 100644
--- a/src/analyzer/model/numericaggregationmodel.cpp
+++ b/src/console/model/numericaggregationmodel.cpp
@@ -19,7 +19,7 @@
#include <model/timeaggregationmodel.h>
#include <core/sample.h>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
NumericAggregationModel::NumericAggregationModel(QObject *parent) :
QAbstractTableModel(parent)
diff --git a/src/analyzer/model/numericaggregationmodel.h b/src/console/model/numericaggregationmodel.h
similarity index 90%
rename from src/analyzer/model/numericaggregationmodel.h
rename to src/console/model/numericaggregationmodel.h
index 0c0b6c8..0449e3e 100644
--- a/src/analyzer/model/numericaggregationmodel.h
+++ b/src/console/model/numericaggregationmodel.h
@@ -15,13 +15,13 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef USERFEEDBACK_ANALYZER_NUMERICAGGREGATIONMODEL_H
-#define USERFEEDBACK_ANALYZER_NUMERICAGGREGATIONMODEL_H
+#ifndef USERFEEDBACK_CONSOLE_NUMERICAGGREGATIONMODEL_H
+#define USERFEEDBACK_CONSOLE_NUMERICAGGREGATIONMODEL_H
#include <QAbstractTableModel>
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
class NumericAggregationModel : public QAbstractTableModel
{
@@ -58,4 +58,4 @@ private:
}
}
-#endif // USERFEEDBACK_ANALYZER_NUMERICAGGREGATIONMODEL_H
+#endif // USERFEEDBACK_CONSOLE_NUMERICAGGREGATIONMODEL_H
diff --git a/src/analyzer/model/productmodel.cpp b/src/console/model/productmodel.cpp
similarity index 99%
rename from src/analyzer/model/productmodel.cpp
rename to src/console/model/productmodel.cpp
index 4b06c85..b1c4d78 100644
--- a/src/analyzer/model/productmodel.cpp
+++ b/src/console/model/productmodel.cpp
@@ -22,7 +22,7 @@
#include <QNetworkReply>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
ProductModel::ProductModel(QObject *parent) :
QAbstractListModel(parent)
diff --git a/src/analyzer/model/productmodel.h b/src/console/model/productmodel.h
similarity index 91%
rename from src/analyzer/model/productmodel.h
rename to src/console/model/productmodel.h
index 1263f7e..6868fa6 100644
--- a/src/analyzer/model/productmodel.h
+++ b/src/console/model/productmodel.h
@@ -15,8 +15,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef USERFEEDBACK_ANALYZER_PRODUCTMODEL_H
-#define USERFEEDBACK_ANALYZER_PRODUCTMODEL_H
+#ifndef USERFEEDBACK_CONSOLE_PRODUCTMODEL_H
+#define USERFEEDBACK_CONSOLE_PRODUCTMODEL_H
#include <core/product.h>
#include <rest/serverinfo.h>
@@ -25,7 +25,7 @@
#include <QVector>
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
class RESTClient;
@@ -58,4 +58,4 @@ private:
}
}
-#endif // USERFEEDBACK_ANALYZER_PRODUCTMODEL_H
+#endif // USERFEEDBACK_CONSOLE_PRODUCTMODEL_H
diff --git a/src/analyzer/model/ratiosetaggregationmodel.cpp b/src/console/model/ratiosetaggregationmodel.cpp
similarity index 99%
rename from src/analyzer/model/ratiosetaggregationmodel.cpp
rename to src/console/model/ratiosetaggregationmodel.cpp
index 33cee1c..4572cc6 100644
--- a/src/analyzer/model/ratiosetaggregationmodel.cpp
+++ b/src/console/model/ratiosetaggregationmodel.cpp
@@ -21,7 +21,7 @@
#include <QSet>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
RatioSetAggregationModel::RatioSetAggregationModel(QObject *parent) :
QAbstractTableModel(parent)
diff --git a/src/analyzer/model/ratiosetaggregationmodel.h b/src/console/model/ratiosetaggregationmodel.h
similarity index 89%
rename from src/analyzer/model/ratiosetaggregationmodel.h
rename to src/console/model/ratiosetaggregationmodel.h
index 0c8b761..93f69a6 100644
--- a/src/analyzer/model/ratiosetaggregationmodel.h
+++ b/src/console/model/ratiosetaggregationmodel.h
@@ -15,13 +15,13 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef USERFEEDBACK_ANALYZER_RATIOSETAGGREGATIONMODEL_H
-#define USERFEEDBACK_ANALYZER_RATIOSETAGGREGATIONMODEL_H
+#ifndef USERFEEDBACK_CONSOLE_RATIOSETAGGREGATIONMODEL_H
+#define USERFEEDBACK_CONSOLE_RATIOSETAGGREGATIONMODEL_H
#include <QAbstractTableModel>
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
class RatioSetAggregationModel : public QAbstractTableModel
{
@@ -50,4 +50,4 @@ private:
}
}
-#endif // USERFEEDBACK_ANALYZER_RATIOSETAGGREGATIONMODEL_H
+#endif // USERFEEDBACK_CONSOLE_RATIOSETAGGREGATIONMODEL_H
diff --git a/src/analyzer/model/rolemappingproxymodel.cpp b/src/console/model/rolemappingproxymodel.cpp
similarity index 97%
rename from src/analyzer/model/rolemappingproxymodel.cpp
rename to src/console/model/rolemappingproxymodel.cpp
index b1a1c39..8f10952 100644
--- a/src/analyzer/model/rolemappingproxymodel.cpp
+++ b/src/console/model/rolemappingproxymodel.cpp
@@ -17,7 +17,7 @@
#include "rolemappingproxymodel.h"
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
RoleMappingProxyModel::RoleMappingProxyModel(QObject* parent) :
QIdentityProxyModel(parent)
diff --git a/src/analyzer/model/rolemappingproxymodel.h b/src/console/model/rolemappingproxymodel.h
similarity index 86%
rename from src/analyzer/model/rolemappingproxymodel.h
rename to src/console/model/rolemappingproxymodel.h
index 13ecd20..522c1ae 100644
--- a/src/analyzer/model/rolemappingproxymodel.h
+++ b/src/console/model/rolemappingproxymodel.h
@@ -15,14 +15,14 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef USERFEEDBACK_ANALYZER_ROLEMAPPINGPROXYMODEL_H
-#define USERFEEDBACK_ANALYZER_ROLEMAPPINGPROXYMODEL_H
+#ifndef USERFEEDBACK_CONSOLE_ROLEMAPPINGPROXYMODEL_H
+#define USERFEEDBACK_CONSOLE_ROLEMAPPINGPROXYMODEL_H
#include <QIdentityProxyModel>
#include <QHash>
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
/**
* @todo write docs
@@ -44,4 +44,4 @@ private:
}}
-#endif // USERFEEDBACK_ANALYZER_ROLEMAPPINGPROXYMODEL_H
+#endif // USERFEEDBACK_CONSOLE_ROLEMAPPINGPROXYMODEL_H
diff --git a/src/analyzer/model/schemamodel.cpp b/src/console/model/schemamodel.cpp
similarity index 99%
rename from src/analyzer/model/schemamodel.cpp
rename to src/console/model/schemamodel.cpp
index 66ae058..b3165b3 100644
--- a/src/analyzer/model/schemamodel.cpp
+++ b/src/console/model/schemamodel.cpp
@@ -22,7 +22,7 @@
#include <limits>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
static const auto TOPLEVEL = std::numeric_limits<quintptr>::max();
diff --git a/src/analyzer/model/schemamodel.h b/src/console/model/schemamodel.h
similarity index 92%
rename from src/analyzer/model/schemamodel.h
rename to src/console/model/schemamodel.h
index 590f089..af6ea9d 100644
--- a/src/analyzer/model/schemamodel.h
+++ b/src/console/model/schemamodel.h
@@ -15,15 +15,15 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef USERFEEDBACK_ANALYZER_SCHEMAMODEL_H
-#define USERFEEDBACK_ANALYZER_SCHEMAMODEL_H
+#ifndef USERFEEDBACK_CONSOLE_SCHEMAMODEL_H
+#define USERFEEDBACK_CONSOLE_SCHEMAMODEL_H
#include <core/product.h>
#include <QAbstractTableModel>
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
class Product;
@@ -58,4 +58,4 @@ private:
}
}
-#endif // USERFEEDBACK_ANALYZER_SCHEMAMODEL_H
+#endif // USERFEEDBACK_CONSOLE_SCHEMAMODEL_H
diff --git a/src/analyzer/model/singlerowfilterproxymodel.cpp b/src/console/model/singlerowfilterproxymodel.cpp
similarity index 96%
rename from src/analyzer/model/singlerowfilterproxymodel.cpp
rename to src/console/model/singlerowfilterproxymodel.cpp
index 8b5d013..aa0e1e3 100644
--- a/src/analyzer/model/singlerowfilterproxymodel.cpp
+++ b/src/console/model/singlerowfilterproxymodel.cpp
@@ -17,7 +17,7 @@
#include "singlerowfilterproxymodel.h"
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
SingleRowFilterProxyModel::SingleRowFilterProxyModel(QObject* parent) :
QSortFilterProxyModel(parent)
diff --git a/src/analyzer/model/singlerowfilterproxymodel.h b/src/console/model/singlerowfilterproxymodel.h
similarity index 85%
rename from src/analyzer/model/singlerowfilterproxymodel.h
rename to src/console/model/singlerowfilterproxymodel.h
index e77649a..4816469 100644
--- a/src/analyzer/model/singlerowfilterproxymodel.h
+++ b/src/console/model/singlerowfilterproxymodel.h
@@ -15,13 +15,13 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef USERFEEDBACK_ANALYZER_SINGLEROWFILTERPROXYMODEL_H
-#define USERFEEDBACK_ANALYZER_SINGLEROWFILTERPROXYMODEL_H
+#ifndef USERFEEDBACK_CONSOLE_SINGLEROWFILTERPROXYMODEL_H
+#define USERFEEDBACK_CONSOLE_SINGLEROWFILTERPROXYMODEL_H
#include <QSortFilterProxyModel>
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
/** Keep a single row from the source model. */
class SingleRowFilterProxyModel : public QSortFilterProxyModel
@@ -40,4 +40,4 @@ private:
}}
-#endif // USERFEEDBACK_ANALYZER_SINGLEROWFILTERPROXYMODEL_H
+#endif // USERFEEDBACK_CONSOLE_SINGLEROWFILTERPROXYMODEL_H
diff --git a/src/analyzer/model/surveymodel.cpp b/src/console/model/surveymodel.cpp
similarity index 98%
rename from src/analyzer/model/surveymodel.cpp
rename to src/console/model/surveymodel.cpp
index 67091e8..12d6bb9 100644
--- a/src/analyzer/model/surveymodel.cpp
+++ b/src/console/model/surveymodel.cpp
@@ -24,7 +24,7 @@
#include <QNetworkReply>
#include <QUrl>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
SurveyModel::SurveyModel(QObject *parent) : QAbstractTableModel(parent)
{
diff --git a/src/analyzer/model/surveymodel.h b/src/console/model/surveymodel.h
similarity index 92%
rename from src/analyzer/model/surveymodel.h
rename to src/console/model/surveymodel.h
index d086bd4..6f3829f 100644
--- a/src/analyzer/model/surveymodel.h
+++ b/src/console/model/surveymodel.h
@@ -15,8 +15,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef USERFEEDBACK_ANALYZER_SURVEYMODEL_H
-#define USERFEEDBACK_ANALYZER_SURVEYMODEL_H
+#ifndef USERFEEDBACK_CONSOLE_SURVEYMODEL_H
+#define USERFEEDBACK_CONSOLE_SURVEYMODEL_H
#include <core/product.h>
#include <core/survey.h>
@@ -24,7 +24,7 @@
#include <QAbstractTableModel>
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
class RESTClient;
@@ -59,4 +59,4 @@ private:
}
}
-#endif // USERFEEDBACK_ANALYZER_SURVEYMODEL_H
+#endif // USERFEEDBACK_CONSOLE_SURVEYMODEL_H
diff --git a/src/analyzer/model/timeaggregationmodel.cpp b/src/console/model/timeaggregationmodel.cpp
similarity index 99%
rename from src/analyzer/model/timeaggregationmodel.cpp
rename to src/console/model/timeaggregationmodel.cpp
index aa7ca67..24ee373 100644
--- a/src/analyzer/model/timeaggregationmodel.cpp
+++ b/src/console/model/timeaggregationmodel.cpp
@@ -24,7 +24,7 @@
#include <algorithm>
#include <numeric>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
TimeAggregationModel::TimeAggregationModel(QObject *parent) :
QAbstractTableModel(parent)
diff --git a/src/analyzer/model/timeaggregationmodel.h b/src/console/model/timeaggregationmodel.h
similarity index 92%
rename from src/analyzer/model/timeaggregationmodel.h
rename to src/console/model/timeaggregationmodel.h
index 361c6e2..f887edc 100644
--- a/src/analyzer/model/timeaggregationmodel.h
+++ b/src/console/model/timeaggregationmodel.h
@@ -15,15 +15,15 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef USERFEEDBACK_ANALYZER_TIMEAGGREGATIONMODEL_H
-#define USERFEEDBACK_ANALYZER_TIMEAGGREGATIONMODEL_H
+#ifndef USERFEEDBACK_CONSOLE_TIMEAGGREGATIONMODEL_H
+#define USERFEEDBACK_CONSOLE_TIMEAGGREGATIONMODEL_H
#include <QAbstractTableModel>
#include <QDateTime>
#include <QVector>
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
class Sample;
@@ -79,4 +79,4 @@ private:
}
}
-#endif // USERFEEDBACK_ANALYZER_TIMEAGGREGATIONMODEL_H
+#endif // USERFEEDBACK_CONSOLE_TIMEAGGREGATIONMODEL_H
diff --git a/src/analyzer/rest/restapi.cpp b/src/console/rest/restapi.cpp
similarity index 98%
rename from src/analyzer/rest/restapi.cpp
rename to src/console/rest/restapi.cpp
index 48a3a8c..7c18358 100644
--- a/src/analyzer/rest/restapi.cpp
+++ b/src/console/rest/restapi.cpp
@@ -22,7 +22,7 @@
#include <core/sample.h>
#include <core/survey.h>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
QNetworkReply* RESTApi::checkSchema(RESTClient *client)
{
diff --git a/src/analyzer/rest/restapi.h b/src/console/rest/restapi.h
similarity index 94%
rename from src/analyzer/rest/restapi.h
rename to src/console/rest/restapi.h
index 4019338..9898a8d 100644
--- a/src/analyzer/rest/restapi.h
+++ b/src/console/rest/restapi.h
@@ -15,14 +15,14 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef USERFEEDBACK_ANALYZER_RESTAPI_H
-#define USERFEEDBACK_ANALYZER_RESTAPI_H
+#ifndef USERFEEDBACK_CONSOLE_RESTAPI_H
+#define USERFEEDBACK_CONSOLE_RESTAPI_H
class QNetworkReply;
template <typename T> class QVector;
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
class Product;
class RESTClient;
@@ -81,4 +81,4 @@ namespace RESTApi
}
}
-#endif // USERFEEDBACK_ANALYZER_RESTAPI_H
+#endif // USERFEEDBACK_CONSOLE_RESTAPI_H
diff --git a/src/analyzer/rest/restclient.cpp b/src/console/rest/restclient.cpp
similarity index 94%
rename from src/analyzer/rest/restclient.cpp
rename to src/console/rest/restclient.cpp
index df85897..f66cbd4 100644
--- a/src/analyzer/rest/restclient.cpp
+++ b/src/console/rest/restclient.cpp
@@ -23,7 +23,7 @@
#include <QNetworkReply>
#include <QNetworkRequest>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
RESTClient::RESTClient(QObject *parent) :
QObject(parent),
@@ -40,7 +40,7 @@ void RESTClient::connectToServer(const ServerInfo& info)
emit clientConnected();
}
-bool UserFeedback::Analyzer::RESTClient::isConnected() const
+bool UserFeedback::Console::RESTClient::isConnected() const
{
return m_serverInfo.url().isValid();
}
@@ -86,7 +86,7 @@ QNetworkRequest RESTClient::makeRequest(const QString& command)
QNetworkRequest request(url);
const auto authToken = m_serverInfo.userName().toUtf8() + ':' + m_serverInfo.password().toUtf8();
request.setRawHeader("Authorization", "Basic " + authToken.toBase64());
- request.setHeader(QNetworkRequest::UserAgentHeader, QStringLiteral("UserFeedbackAnalyzer/") + QStringLiteral(USERFEEDBACK_VERSION));
+ request.setHeader(QNetworkRequest::UserAgentHeader, QStringLiteral("UserFeedbackConsole/") + QStringLiteral(USERFEEDBACK_VERSION));
return request;
}
diff --git a/src/analyzer/rest/restclient.h b/src/console/rest/restclient.h
similarity index 91%
rename from src/analyzer/rest/restclient.h
rename to src/console/rest/restclient.h
index ac7fd9a..285008f 100644
--- a/src/analyzer/rest/restclient.h
+++ b/src/console/rest/restclient.h
@@ -15,8 +15,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef USERFEEDBACK_ANALYZER_RESTCLIENT_H
-#define USERFEEDBACK_ANALYZER_RESTCLIENT_H
+#ifndef USERFEEDBACK_CONSOLE_RESTCLIENT_H
+#define USERFEEDBACK_CONSOLE_RESTCLIENT_H
#include "serverinfo.h"
@@ -27,7 +27,7 @@ class QNetworkReply;
class QNetworkRequest;
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
/** REST communication handling. */
class RESTClient : public QObject
@@ -60,4 +60,4 @@ private:
}
}
-#endif // USERFEEDBACK_ANALYZER_RESTCLIENT_H
+#endif // USERFEEDBACK_CONSOLE_RESTCLIENT_H
diff --git a/src/analyzer/rest/serverinfo.cpp b/src/console/rest/serverinfo.cpp
similarity index 93%
rename from src/analyzer/rest/serverinfo.cpp
rename to src/console/rest/serverinfo.cpp
index 359b5bf..7f04a6e 100644
--- a/src/analyzer/rest/serverinfo.cpp
+++ b/src/console/rest/serverinfo.cpp
@@ -21,10 +21,10 @@
#include <QSettings>
#include <QUrl>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
class ServerInfoData : public QSharedData
{
public:
@@ -81,7 +81,7 @@ void ServerInfo::save() const
settings.setValue(QStringLiteral("password"), password()); // TODO
}
-UserFeedback::Analyzer::ServerInfo UserFeedback::Analyzer::ServerInfo::load(const QString& url)
+UserFeedback::Console::ServerInfo UserFeedback::Console::ServerInfo::load(const QString& url)
{
QSettings settings;
settings.beginGroup(QStringLiteral("ServerInfo"));
diff --git a/src/analyzer/rest/serverinfo.h b/src/console/rest/serverinfo.h
similarity index 90%
rename from src/analyzer/rest/serverinfo.h
rename to src/console/rest/serverinfo.h
index 30e976e..876f58b 100644
--- a/src/analyzer/rest/serverinfo.h
+++ b/src/console/rest/serverinfo.h
@@ -15,15 +15,15 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef USERFEEDBACK_ANALYZER_SERVERINFO_H
-#define USERFEEDBACK_ANALYZER_SERVERINFO_H
+#ifndef USERFEEDBACK_CONSOLE_SERVERINFO_H
+#define USERFEEDBACK_CONSOLE_SERVERINFO_H
#include <QSharedDataPointer>
class QUrl;
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
class ServerInfoData;
@@ -57,4 +57,4 @@ private:
}
}
-#endif // USERFEEDBACK_ANALYZER_SERVERINFO_H
+#endif // USERFEEDBACK_CONSOLE_SERVERINFO_H
diff --git a/src/analyzer/schemaeditor/aggregationeditwidget.cpp b/src/console/schemaeditor/aggregationeditwidget.cpp
similarity index 98%
rename from src/analyzer/schemaeditor/aggregationeditwidget.cpp
rename to src/console/schemaeditor/aggregationeditwidget.cpp
index aec8b66..fbdb989 100644
--- a/src/analyzer/schemaeditor/aggregationeditwidget.cpp
+++ b/src/console/schemaeditor/aggregationeditwidget.cpp
@@ -24,7 +24,7 @@
#include <QStyledItemDelegate>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
AggregationEditWidget::AggregationEditWidget(QWidget* parent) :
QWidget(parent),
diff --git a/src/analyzer/schemaeditor/aggregationeditwidget.h b/src/console/schemaeditor/aggregationeditwidget.h
similarity index 88%
rename from src/analyzer/schemaeditor/aggregationeditwidget.h
rename to src/console/schemaeditor/aggregationeditwidget.h
index f8050b7..b8e4cd5 100644
--- a/src/analyzer/schemaeditor/aggregationeditwidget.h
+++ b/src/console/schemaeditor/aggregationeditwidget.h
@@ -15,15 +15,15 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef USERFEEDBACK_ANALYZER_AGGREGATIONEDITWIDGET_H
-#define USERFEEDBACK_ANALYZER_AGGREGATIONEDITWIDGET_H
+#ifndef USERFEEDBACK_CONSOLE_AGGREGATIONEDITWIDGET_H
+#define USERFEEDBACK_CONSOLE_AGGREGATIONEDITWIDGET_H
#include <QWidget>
#include <memory>
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
class AggregationEditorModel;
class Product;
@@ -57,4 +57,4 @@ private:
}
}
-#endif // USERFEEDBACK_ANALYZER_AGGREGATIONEDITWIDGET_H
+#endif // USERFEEDBACK_CONSOLE_AGGREGATIONEDITWIDGET_H
diff --git a/src/analyzer/schemaeditor/aggregationeditwidget.ui b/src/console/schemaeditor/aggregationeditwidget.ui
similarity index 89%
rename from src/analyzer/schemaeditor/aggregationeditwidget.ui
rename to src/console/schemaeditor/aggregationeditwidget.ui
index af74840..18add49 100644
--- a/src/analyzer/schemaeditor/aggregationeditwidget.ui
+++ b/src/console/schemaeditor/aggregationeditwidget.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>UserFeedback::Analyzer::AggregationEditWidget</class>
- <widget class="QWidget" name="UserFeedback::Analyzer::AggregationEditWidget">
+ <class>UserFeedback::Console::AggregationEditWidget</class>
+ <widget class="QWidget" name="UserFeedback::Console::AggregationEditWidget">
<property name="geometry">
<rect>
<x>0</x>
diff --git a/src/analyzer/schemaeditor/schemaeditor.cpp b/src/console/schemaeditor/schemaeditor.cpp
similarity index 99%
rename from src/analyzer/schemaeditor/schemaeditor.cpp
rename to src/console/schemaeditor/schemaeditor.cpp
index c893fe5..a8fd9f5 100644
--- a/src/analyzer/schemaeditor/schemaeditor.cpp
+++ b/src/console/schemaeditor/schemaeditor.cpp
@@ -28,7 +28,7 @@
#include <QMessageBox>
#include <QNetworkReply>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
SchemaEditor::SchemaEditor(QWidget* parent) :
diff --git a/src/analyzer/schemaeditor/schemaeditor.h b/src/console/schemaeditor/schemaeditor.h
similarity index 90%
rename from src/analyzer/schemaeditor/schemaeditor.h
rename to src/console/schemaeditor/schemaeditor.h
index a0c2223..d764c16 100644
--- a/src/analyzer/schemaeditor/schemaeditor.h
+++ b/src/console/schemaeditor/schemaeditor.h
@@ -15,8 +15,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef USERFEEDBACK_ANALYZER_SCHEMAEDITOR_H
-#define USERFEEDBACK_ANALYZER_SCHEMAEDITOR_H
+#ifndef USERFEEDBACK_CONSOLE_SCHEMAEDITOR_H
+#define USERFEEDBACK_CONSOLE_SCHEMAEDITOR_H
#include <QWidget>
@@ -25,7 +25,7 @@
class QAction;
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
class Product;
class RESTClient;
@@ -65,4 +65,4 @@ private:
}
}
-#endif // USERFEEDBACK_ANALYZER_SCHEMAEDITOR_H
+#endif // USERFEEDBACK_CONSOLE_SCHEMAEDITOR_H
diff --git a/src/analyzer/schemaeditor/schemaeditor.ui b/src/console/schemaeditor/schemaeditor.ui
similarity index 84%
rename from src/analyzer/schemaeditor/schemaeditor.ui
rename to src/console/schemaeditor/schemaeditor.ui
index 01ff959..da176a3 100644
--- a/src/analyzer/schemaeditor/schemaeditor.ui
+++ b/src/console/schemaeditor/schemaeditor.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>UserFeedback::Analyzer::SchemaEditor</class>
- <widget class="QWidget" name="UserFeedback::Analyzer::SchemaEditor">
+ <class>UserFeedback::Console::SchemaEditor</class>
+ <widget class="QWidget" name="UserFeedback::Console::SchemaEditor">
<property name="geometry">
<rect>
<x>0</x>
@@ -28,12 +28,12 @@
<property name="currentIndex">
<number>0</number>
</property>
- <widget class="UserFeedback::Analyzer::SchemaEditWidget" name="schema">
+ <widget class="UserFeedback::Console::SchemaEditWidget" name="schema">
<attribute name="title">
<string>Schema</string>
</attribute>
</widget>
- <widget class="UserFeedback::Analyzer::AggregationEditWidget" name="aggregation">
+ <widget class="UserFeedback::Console::AggregationEditWidget" name="aggregation">
<attribute name="title">
<string>Aggregation</string>
</attribute>
@@ -80,13 +80,13 @@
</widget>
<customwidgets>
<customwidget>
- <class>UserFeedback::Analyzer::SchemaEditWidget</class>
+ <class>UserFeedback::Console::SchemaEditWidget</class>
<extends>QWidget</extends>
<header>schemaeditor/schemaeditwidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
- <class>UserFeedback::Analyzer::AggregationEditWidget</class>
+ <class>UserFeedback::Console::AggregationEditWidget</class>
<extends>QWidget</extends>
<header>schemaeditor/aggregationeditwidget.h</header>
<container>1</container>
diff --git a/src/analyzer/schemaeditor/schemaeditwidget.cpp b/src/console/schemaeditor/schemaeditwidget.cpp
similarity index 98%
rename from src/analyzer/schemaeditor/schemaeditwidget.cpp
rename to src/console/schemaeditor/schemaeditwidget.cpp
index dacfcc2..35d0e0d 100644
--- a/src/analyzer/schemaeditor/schemaeditwidget.cpp
+++ b/src/console/schemaeditor/schemaeditwidget.cpp
@@ -30,7 +30,7 @@
#include <QNetworkReply>
#include <QStyledItemDelegate>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
SchemaEditWidget::SchemaEditWidget(QWidget *parent) :
QWidget(parent),
diff --git a/src/analyzer/schemaeditor/schemaeditwidget.h b/src/console/schemaeditor/schemaeditwidget.h
similarity index 89%
rename from src/analyzer/schemaeditor/schemaeditwidget.h
rename to src/console/schemaeditor/schemaeditwidget.h
index 3917f53..b972172 100644
--- a/src/analyzer/schemaeditor/schemaeditwidget.h
+++ b/src/console/schemaeditor/schemaeditwidget.h
@@ -15,15 +15,15 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef USERFEEDBACK_ANALYZER_SCHEMAEDITWIDGET_H
-#define USERFEEDBACK_ANALYZER_SCHEMAEDITWIDGET_H
+#ifndef USERFEEDBACK_CONSOLE_SCHEMAEDITWIDGET_H
+#define USERFEEDBACK_CONSOLE_SCHEMAEDITWIDGET_H
#include <QWidget>
#include <memory>
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
namespace Ui
{
@@ -63,4 +63,4 @@ private:
}
}
-#endif // USERFEEDBACK_ANALYZER_SCHEMAEDITWIDGET_H
+#endif // USERFEEDBACK_CONSOLE_SCHEMAEDITWIDGET_H
diff --git a/src/analyzer/schemaeditor/schemaeditwidget.ui b/src/console/schemaeditor/schemaeditwidget.ui
similarity index 91%
rename from src/analyzer/schemaeditor/schemaeditwidget.ui
rename to src/console/schemaeditor/schemaeditwidget.ui
index 505808c..73c2dd1 100644
--- a/src/analyzer/schemaeditor/schemaeditwidget.ui
+++ b/src/console/schemaeditor/schemaeditwidget.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>UserFeedback::Analyzer::SchemaEditWidget</class>
- <widget class="QWidget" name="UserFeedback::Analyzer::SchemaEditWidget">
+ <class>UserFeedback::Console::SchemaEditWidget</class>
+ <widget class="QWidget" name="UserFeedback::Console::SchemaEditWidget">
<property name="geometry">
<rect>
<x>0</x>
diff --git a/src/analyzer/schemaeditor/schemaentryitemeditorfactory.cpp b/src/console/schemaeditor/schemaentryitemeditorfactory.cpp
similarity index 97%
rename from src/analyzer/schemaeditor/schemaentryitemeditorfactory.cpp
rename to src/console/schemaeditor/schemaentryitemeditorfactory.cpp
index 9f132d8..f96fce1 100644
--- a/src/analyzer/schemaeditor/schemaentryitemeditorfactory.cpp
+++ b/src/console/schemaeditor/schemaentryitemeditorfactory.cpp
@@ -25,10 +25,10 @@
#include <QDebug>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
class AggregationElementComboBox : public QComboBox
{
diff --git a/src/analyzer/schemaeditor/schemaentryitemeditorfactory.h b/src/console/schemaeditor/schemaentryitemeditorfactory.h
similarity index 84%
rename from src/analyzer/schemaeditor/schemaentryitemeditorfactory.h
rename to src/console/schemaeditor/schemaentryitemeditorfactory.h
index 0e1f65c..b03c57d 100644
--- a/src/analyzer/schemaeditor/schemaentryitemeditorfactory.h
+++ b/src/console/schemaeditor/schemaentryitemeditorfactory.h
@@ -15,15 +15,15 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef USERFEEDBACK_ANALYZER_SCHEMAENTRYITEMEDITORFACTORY_H
-#define USERFEEDBACK_ANALYZER_SCHEMAENTRYITEMEDITORFACTORY_H
+#ifndef USERFEEDBACK_CONSOLE_SCHEMAENTRYITEMEDITORFACTORY_H
+#define USERFEEDBACK_CONSOLE_SCHEMAENTRYITEMEDITORFACTORY_H
#include <QItemEditorFactory>
#include <memory>
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
class AggregationElementModel;
class Product;
@@ -44,4 +44,4 @@ private:
}
}
-#endif // USERFEEDBACK_ANALYZER_SCHEMAENTRYITEMEDITORFACTORY_H
+#endif // USERFEEDBACK_CONSOLE_SCHEMAENTRYITEMEDITORFACTORY_H
diff --git a/src/analyzer/schematemplates/applicationVersion.schema b/src/console/schematemplates/applicationVersion.schema
similarity index 100%
rename from src/analyzer/schematemplates/applicationVersion.schema
rename to src/console/schematemplates/applicationVersion.schema
diff --git a/src/analyzer/schematemplates/platform.schema b/src/console/schematemplates/platform.schema
similarity index 100%
rename from src/analyzer/schematemplates/platform.schema
rename to src/console/schematemplates/platform.schema
diff --git a/src/analyzer/schematemplates/propertyRatio.schema b/src/console/schematemplates/propertyRatio.schema
similarity index 100%
rename from src/analyzer/schematemplates/propertyRatio.schema
rename to src/console/schematemplates/propertyRatio.schema
diff --git a/src/analyzer/schematemplates/qtVersion.schema b/src/console/schematemplates/qtVersion.schema
similarity index 100%
rename from src/analyzer/schematemplates/qtVersion.schema
rename to src/console/schematemplates/qtVersion.schema
diff --git a/src/analyzer/schematemplates/schematemplates.qrc b/src/console/schematemplates/schematemplates.qrc
similarity index 100%
rename from src/analyzer/schematemplates/schematemplates.qrc
rename to src/console/schematemplates/schematemplates.qrc
diff --git a/src/analyzer/schematemplates/screens.schema b/src/console/schematemplates/screens.schema
similarity index 100%
rename from src/analyzer/schematemplates/screens.schema
rename to src/console/schematemplates/screens.schema
diff --git a/src/analyzer/schematemplates/usageCount.schema b/src/console/schematemplates/usageCount.schema
similarity index 100%
rename from src/analyzer/schematemplates/usageCount.schema
rename to src/console/schematemplates/usageCount.schema
diff --git a/src/analyzer/schematemplates/usageTime.schema b/src/console/schematemplates/usageTime.schema
similarity index 100%
rename from src/analyzer/schematemplates/usageTime.schema
rename to src/console/schematemplates/usageTime.schema
diff --git a/src/analyzer/surveyeditor/surveydialog.cpp b/src/console/surveyeditor/surveydialog.cpp
similarity index 97%
rename from src/analyzer/surveyeditor/surveydialog.cpp
rename to src/console/surveyeditor/surveydialog.cpp
index c56c6cd..17d3f91 100644
--- a/src/analyzer/surveyeditor/surveydialog.cpp
+++ b/src/console/surveyeditor/surveydialog.cpp
@@ -23,7 +23,7 @@
#include <QIcon>
#include <QUrl>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
SurveyDialog::SurveyDialog(QWidget *parent) :
QDialog(parent),
diff --git a/src/analyzer/surveyeditor/surveydialog.h b/src/console/surveyeditor/surveydialog.h
similarity index 87%
rename from src/analyzer/surveyeditor/surveydialog.h
rename to src/console/surveyeditor/surveydialog.h
index 031f689..99cb3a6 100644
--- a/src/analyzer/surveyeditor/surveydialog.h
+++ b/src/console/surveyeditor/surveydialog.h
@@ -15,8 +15,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef USERFEEDBACK_ANALYZER_SURVEYDIALOG_H
-#define USERFEEDBACK_ANALYZER_SURVEYDIALOG_H
+#ifndef USERFEEDBACK_CONSOLE_SURVEYDIALOG_H
+#define USERFEEDBACK_CONSOLE_SURVEYDIALOG_H
#include <QDialog>
@@ -25,7 +25,7 @@
class QUrl;
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
namespace Ui
{
@@ -51,4 +51,4 @@ private:
}
}
-#endif // USERFEEDBACK_ANALYZER_SURVEYDIALOG_H
+#endif // USERFEEDBACK_CONSOLE_SURVEYDIALOG_H
diff --git a/src/analyzer/surveyeditor/surveydialog.ui b/src/console/surveyeditor/surveydialog.ui
similarity index 89%
rename from src/analyzer/surveyeditor/surveydialog.ui
rename to src/console/surveyeditor/surveydialog.ui
index 6a71ad3..4ca4f28 100644
--- a/src/analyzer/surveyeditor/surveydialog.ui
+++ b/src/console/surveyeditor/surveydialog.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>UserFeedback::Analyzer::SurveyDialog</class>
- <widget class="QDialog" name="UserFeedback::Analyzer::SurveyDialog">
+ <class>UserFeedback::Console::SurveyDialog</class>
+ <widget class="QDialog" name="UserFeedback::Console::SurveyDialog">
<property name="geometry">
<rect>
<x>0</x>
@@ -61,7 +61,7 @@
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
- <receiver>UserFeedback::Analyzer::SurveyDialog</receiver>
+ <receiver>UserFeedback::Console::SurveyDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
@@ -77,7 +77,7 @@
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
- <receiver>UserFeedback::Analyzer::SurveyDialog</receiver>
+ <receiver>UserFeedback::Console::SurveyDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
diff --git a/src/analyzer/surveyeditor/surveyeditor.cpp b/src/console/surveyeditor/surveyeditor.cpp
similarity index 98%
rename from src/analyzer/surveyeditor/surveyeditor.cpp
rename to src/console/surveyeditor/surveyeditor.cpp
index 30a059b..b386cb9 100644
--- a/src/analyzer/surveyeditor/surveyeditor.cpp
+++ b/src/console/surveyeditor/surveyeditor.cpp
@@ -25,7 +25,7 @@
#include <QNetworkReply>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
SurveyEditor::SurveyEditor(QWidget* parent) :
QWidget(parent),
diff --git a/src/analyzer/surveyeditor/surveyeditor.h b/src/console/surveyeditor/surveyeditor.h
similarity index 89%
rename from src/analyzer/surveyeditor/surveyeditor.h
rename to src/console/surveyeditor/surveyeditor.h
index ed5de7c..273923f 100644
--- a/src/analyzer/surveyeditor/surveyeditor.h
+++ b/src/console/surveyeditor/surveyeditor.h
@@ -15,8 +15,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef USERFEEDBACK_ANALYZER_SURVEYEDITOR_H
-#define USERFEEDBACK_ANALYZER_SURVEYEDITOR_H
+#ifndef USERFEEDBACK_CONSOLE_SURVEYEDITOR_H
+#define USERFEEDBACK_CONSOLE_SURVEYEDITOR_H
#include <core/product.h>
@@ -25,7 +25,7 @@
#include <memory>
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
class RESTClient;
class SurveyModel;
@@ -62,4 +62,4 @@ private:
}
}
-#endif // USERFEEDBACK_ANALYZER_SURVEYEDITOR_H
+#endif // USERFEEDBACK_CONSOLE_SURVEYEDITOR_H
diff --git a/src/analyzer/surveyeditor/surveyeditor.ui b/src/console/surveyeditor/surveyeditor.ui
similarity index 91%
rename from src/analyzer/surveyeditor/surveyeditor.ui
rename to src/console/surveyeditor/surveyeditor.ui
index e6f588f..b789cc3 100644
--- a/src/analyzer/surveyeditor/surveyeditor.ui
+++ b/src/console/surveyeditor/surveyeditor.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>UserFeedback::Analyzer::SurveyEditor</class>
- <widget class="QWidget" name="UserFeedback::Analyzer::SurveyEditor">
+ <class>UserFeedback::Console::SurveyEditor</class>
+ <widget class="QWidget" name="UserFeedback::Console::SurveyEditor">
<property name="geometry">
<rect>
<x>0</x>
diff --git a/src/analyzer/widgets/metaenumcombobox.cpp b/src/console/widgets/metaenumcombobox.cpp
similarity index 97%
rename from src/analyzer/widgets/metaenumcombobox.cpp
rename to src/console/widgets/metaenumcombobox.cpp
index e8b4c72..c776830 100644
--- a/src/analyzer/widgets/metaenumcombobox.cpp
+++ b/src/console/widgets/metaenumcombobox.cpp
@@ -21,7 +21,7 @@
#include <QMetaEnum>
#include <QMetaType>
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
MetaEnumComboBox::MetaEnumComboBox(QWidget* parent) :
QComboBox(parent)
diff --git a/src/analyzer/widgets/metaenumcombobox.h b/src/console/widgets/metaenumcombobox.h
similarity index 86%
rename from src/analyzer/widgets/metaenumcombobox.h
rename to src/console/widgets/metaenumcombobox.h
index b2b108c..b3ed1f2 100644
--- a/src/analyzer/widgets/metaenumcombobox.h
+++ b/src/console/widgets/metaenumcombobox.h
@@ -15,13 +15,13 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef USERFEEDBACK_ANALYZER_METAENUMCOMBOBOX_H
-#define USERFEEDBACK_ANALYZER_METAENUMCOMBOBOX_H
+#ifndef USERFEEDBACK_CONSOLE_METAENUMCOMBOBOX_H
+#define USERFEEDBACK_CONSOLE_METAENUMCOMBOBOX_H
#include <QComboBox>
namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
class MetaEnumComboBox : public QComboBox
{
@@ -41,4 +41,4 @@ private:
}
}
-#endif // USERFEEDBACK_ANALYZER_METAENUMCOMBOBOX_H
+#endif // USERFEEDBACK_CONSOLE_METAENUMCOMBOBOX_H
diff --git a/src/provider/widgets/feedbackconfigdialog.h b/src/provider/widgets/feedbackconfigdialog.h
index 629d045..71d7d4c 100644
--- a/src/provider/widgets/feedbackconfigdialog.h
+++ b/src/provider/widgets/feedbackconfigdialog.h
@@ -15,8 +15,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef USERFEEDBACK_ANALYZER_FEEDBACKCONFIGDIALOG_H
-#define USERFEEDBACK_ANALYZER_FEEDBACKCONFIGDIALOG_H
+#ifndef USERFEEDBACK_CONSOLE_FEEDBACKCONFIGDIALOG_H
+#define USERFEEDBACK_CONSOLE_FEEDBACKCONFIGDIALOG_H
#include "userfeedbackwidgets_export.h"
#include <QDialog>
@@ -53,4 +53,4 @@ private:
}
-#endif // USERFEEDBACK_ANALYZER_FEEDBACKCONFIGDIALOG_H
+#endif // USERFEEDBACK_CONSOLE_FEEDBACKCONFIGDIALOG_H
--
GitLab