From d60c64f6f1480cfead6b6761c32c230cf557f898 2017-12-11 09:29:38 From: Alexandre Leroux Date: 2017-12-11 09:29:38 Subject: [PATCH] (Minor) Fixes vera warnings for AMDA plugin --- diff --git a/plugins/amda/CMakeLists.txt b/plugins/amda/CMakeLists.txt index 1b66326..dcce263 100644 --- a/plugins/amda/CMakeLists.txt +++ b/plugins/amda/CMakeLists.txt @@ -92,7 +92,7 @@ SCIQLOP_COPY_TO_TARGET(LIBRARY ${SQPAMDA_LIBRARY_NAME} ${EXTERN_SHARED_LIBRARIES LIST(APPEND CHECKSTYLE_INPUT_FILES ${MODULE_SOURCES}) SCIQLOP_SET_TO_PARENT_SCOPE(CHECKSTYLE_INPUT_FILES) # Vera++ exclusion files -#LIST(APPEND CHECKSTYLE_EXCLUSION_FILES ${CMAKE_CURRENT_SOURCE_DIR}/vera-exclusions/exclusions.txt) +LIST(APPEND CHECKSTYLE_EXCLUSION_FILES ${CMAKE_CURRENT_SOURCE_DIR}/vera-exclusions/exclusions.txt) SCIQLOP_SET_TO_PARENT_SCOPE(CHECKSTYLE_EXCLUSION_FILES) # diff --git a/plugins/amda/include/AmdaPlugin.h b/plugins/amda/include/AmdaPlugin.h index 199f9ea..aeca5d2 100644 --- a/plugins/amda/include/AmdaPlugin.h +++ b/plugins/amda/include/AmdaPlugin.h @@ -11,8 +11,8 @@ Q_DECLARE_LOGGING_CATEGORY(LOG_AmdaPlugin) -#ifndef PLUGIN_JSON_FILE_PATH -#define PLUGIN_JSON_FILE_PATH "amda.json" +#ifndef SCIQLOP_PLUGIN_JSON_FILE_PATH +#define SCIQLOP_PLUGIN_JSON_FILE_PATH "amda.json" #endif class DataSourceItem; @@ -20,7 +20,7 @@ class DataSourceItem; class SCIQLOP_AMDA_EXPORT AmdaPlugin : public QObject, public IPlugin { Q_OBJECT Q_INTERFACES(IPlugin) - Q_PLUGIN_METADATA(IID "sciqlop.plugin.IPlugin" FILE PLUGIN_JSON_FILE_PATH) + Q_PLUGIN_METADATA(IID "sciqlop.plugin.IPlugin" FILE SCIQLOP_PLUGIN_JSON_FILE_PATH) public: /// @sa IPlugin::initialize() void initialize() override; diff --git a/plugins/amda/include/AmdaProvider.h b/plugins/amda/include/AmdaProvider.h index 3736954..6a57c0d 100644 --- a/plugins/amda/include/AmdaProvider.h +++ b/plugins/amda/include/AmdaProvider.h @@ -27,10 +27,6 @@ public: void requestDataAborting(QUuid acqIdentifier) override; -private slots: - void onReplyDownloadProgress(QUuid acqIdentifier, - std::shared_ptr networkRequest, double progress); - private: void retrieveData(QUuid token, const SqpRange &dateTime, const QVariantHash &data); @@ -39,6 +35,10 @@ private: std::map, double> > m_AcqIdToRequestProgressMap; + +private slots: + void onReplyDownloadProgress(QUuid acqIdentifier, + std::shared_ptr networkRequest, double progress); }; #endif // SCIQLOP_AMDAPROVIDER_H diff --git a/plugins/amda/meson.build b/plugins/amda/meson.build index 4ce7c5e..7728623 100644 --- a/plugins/amda/meson.build +++ b/plugins/amda/meson.build @@ -25,7 +25,7 @@ amdaplugin_inc = include_directories(['include', '../../plugin/include']) moc_gen = generator(moc, output : 'moc_@BASENAME@.cpp', arguments : ['@INPUT@', - '-DPLUGIN_JSON_FILE_PATH="'+meson.source_root()+'/plugins/amda/resources/amda.json"', + '-DSCIQLOP_PLUGIN_JSON_FILE_PATH="'+meson.source_root()+'/plugins/amda/resources/amda.json"', '-I', meson.current_source_dir()+'/include', '-I', meson.current_source_dir()+'/../../plugin/include', '-o', '@OUTPUT@']) diff --git a/plugins/amda/vera-exclusions/exclusions.txt b/plugins/amda/vera-exclusions/exclusions.txt new file mode 100644 index 0000000..0a5db22 --- /dev/null +++ b/plugins/amda/vera-exclusions/exclusions.txt @@ -0,0 +1,5 @@ +AmdaResultParser\.h:\d+:.*IPSIS_S01.* +AmdaResultParserHelper\.h:\d+:.*IPSIS_S01.* + +AmdaProvider\.cpp:\d+:.*IPSIS_S04_VARIABLE.*found: QStringLiteral +AmdaResultParserHelper\.cpp:\d+:.*IPSIS_S04_VARIABLE.*found: QT_VERSION_CHECK \ No newline at end of file