Rename Analyzer to Console

It's become much more than just an analytic tool by now, containing also
schema and survey management.

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)

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)

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
 {

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
 {

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
 {

autotests/productapitest.cpp

@@ -30,7 +30,7 @@
 #include <QSignalSpy>
 #include <QStandardPaths>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 class ProductApiTest : public QObject
 {

autotests/productmodeltest.cpp

@@ -29,7 +29,7 @@
 #include <QSignalSpy>
 #include <QStandardPaths>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 class ProductModelTest : public QObject
 {

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
 {

autotests/providertest.cpp

@@ -39,7 +39,7 @@
 #include <QStandardPaths>
 
 using namespace UserFeedback;
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 class ProviderTest : public QObject
 {

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
 {

autotests/sampletest.cpp

@@ -24,7 +24,7 @@
 #include <QObject>
 #include <QStandardPaths>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 class SampleTest : public QObject
 {

autotests/schemamodeltest.cpp

@@ -26,7 +26,7 @@
 #include <QSignalSpy>
 #include <QStandardPaths>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 class SchemaModelTest : public QObject
 {

autotests/schematemplatetest.cpp

@@ -26,7 +26,7 @@
 #include <QObject>
 #include <QStandardPaths>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 class SchemaTemplateTest : public QObject
 {

autotests/servercontroller.cpp

@@ -26,7 +26,7 @@
 #include <QUrl>
 #include <QSignalSpy>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 ServerController::ServerController()
 {

autotests/surveyapitest.cpp

@@ -32,7 +32,7 @@
 
 #include <limits>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 class SurveyApiTest : public QObject
 {

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
 {

data/org.kde.UserFeedbackAnalyzer.schema → data/org.kde.UserFeedbackConsole.schema

@@ -61,7 +61,7 @@
             "type": "numeric"
         }
     ],
-    "name": "org.kde.UserFeedbackAnalyzer",
+    "name": "org.kde.UserFeedbackConsole",
     "schema": [
         {
             "elements": [

src/CMakeLists.txt

 add_subdirectory(provider)
 add_subdirectory(server)
 if(Qt5Charts_FOUND AND NOT CMAKE_VERSION VERSION_LESS 3.0)
-    add_subdirectory(analyzer)
+    add_subdirectory(console)
 endif()

src/analyzer/CMakeLists.txt → src/console/CMakeLists.txt

-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})

src/analyzer/analytics/aggregator.cpp → 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;