From 69c1f0ed5a646864e504cb0ed30fe856bae1e1c5 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Tue, 6 Oct 2015 06:49:24 +0300 Subject: [PATCH] * small build changes * drop cast (they were added to try to avoid possible crash) --- sources/.kdev4/awesomewidgets.kdev4 | 2 +- sources/CMakeLists.txt | 4 ++-- .../awesome-widget/plugin/awdataengineaggregator.cpp | 10 +++++----- sources/awesome-widget/plugin/awdataengineaggregator.h | 2 +- sources/awesome-widget/plugin/awkeys.cpp | 5 +++-- sources/awesome-widget/plugin/awkeys.h | 4 ++-- sources/awesomewidgets/CMakeLists.txt | 4 +--- sources/awesomewidgets/abstractextitem.cpp | 4 +--- sources/awesomewidgets/abstractextitem.h | 2 +- sources/extsysmon/CMakeLists.txt | 10 ++++------ sources/extsysmon/extsysmonaggregator.cpp | 4 ++-- sources/libraries.cmake | 2 +- sources/version.h.in | 4 ++-- 13 files changed, 26 insertions(+), 31 deletions(-) diff --git a/sources/.kdev4/awesomewidgets.kdev4 b/sources/.kdev4/awesomewidgets.kdev4 index 06b7657..970b6dc 100644 --- a/sources/.kdev4/awesomewidgets.kdev4 +++ b/sources/.kdev4/awesomewidgets.kdev4 @@ -8,7 +8,7 @@ ProjectRootRelative=./ [CMake][CMake Build Directory 0] Build Directory Path=file:///home/arcanis/Documents/github/awesome-widgets/build -Build Type=Debug +Build Type=Release CMake Binary=file:///usr/bin/cmake Environment Profile= Extra Arguments= diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt index e9c2753..2390a04 100644 --- a/sources/CMakeLists.txt +++ b/sources/CMakeLists.txt @@ -17,8 +17,8 @@ set(PROJECT_VERSION_MAJOR "2") set(PROJECT_VERSION_MINOR "4") set(PROJECT_VERSION_PATCH "0") set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") -set(PROJECT_COMMIT_SHA "Commit hash" CACHE INTERNAL "") # append git version if any +set(PROJECT_COMMIT_SHA "Commit hash" CACHE INTERNAL "") include(checkgit.cmake) string(TIMESTAMP CURRENT_DATE "%Y-%m-%d %H:%M" UTC) @@ -34,7 +34,7 @@ option(BUILD_DEB_PACKAGE "Build deb package" OFF) option(BUILD_RPM_PACKAGE "Build rpm package" OFF) # build details option(BUILD_FUTURE "Build with the features which will be marked as stable later" OFF) -option(BUILD_TEST "Build with additional test abilities" OFF) +option(BUILD_TESTING "Build with additional test abilities" OFF) # flags if(CMAKE_COMPILER_IS_GNUCXX) diff --git a/sources/awesome-widget/plugin/awdataengineaggregator.cpp b/sources/awesome-widget/plugin/awdataengineaggregator.cpp index 0c2d355..b5f8a86 100644 --- a/sources/awesome-widget/plugin/awdataengineaggregator.cpp +++ b/sources/awesome-widget/plugin/awdataengineaggregator.cpp @@ -57,8 +57,8 @@ void AWDataEngineAggregator::connectVisualization() { qCDebug(LOG_AW); - connect(this, SIGNAL(updateData(QString, QVariantHash)), - parent(), SLOT(dataUpdated(QString, QVariantHash))); + connect(this, SIGNAL(updateData(QString, QVariantMap)), + parent(), SLOT(dataUpdated(QString, QVariantMap))); return static_cast(parent())->unlock(); } @@ -68,8 +68,8 @@ void AWDataEngineAggregator::disconnectVisualization() { qCDebug(LOG_AW); - disconnect(this, SIGNAL(updateData(QString, QVariantHash)), - parent(), SLOT(dataUpdated(QString, QVariantHash))); + disconnect(this, SIGNAL(updateData(QString, QVariantMap)), + parent(), SLOT(dataUpdated(QString, QVariantMap))); return QTimer::singleShot(5 * m_interval, this, SLOT(connectVisualization())); } @@ -101,7 +101,7 @@ void AWDataEngineAggregator::dataUpdated(const QString sourceName, const Plasma: qCDebug(LOG_AW) << "Source" << sourceName; qCDebug(LOG_AW) << "Data" << data; - return emit(updateData(QString(sourceName), qvariant_cast(data))); + return emit(updateData(sourceName, data)); } diff --git a/sources/awesome-widget/plugin/awdataengineaggregator.h b/sources/awesome-widget/plugin/awdataengineaggregator.h index 629e4d3..198295c 100644 --- a/sources/awesome-widget/plugin/awdataengineaggregator.h +++ b/sources/awesome-widget/plugin/awdataengineaggregator.h @@ -35,7 +35,7 @@ public: void setInterval(const int _interval); signals: - void updateData(const QString sourceName, const QVariantHash sdata); + void updateData(const QString sourceName, const QVariantMap sdata); public slots: // additional methods to control this and visualization diff --git a/sources/awesome-widget/plugin/awkeys.cpp b/sources/awesome-widget/plugin/awkeys.cpp index c8e4c5f..911d2ea 100644 --- a/sources/awesome-widget/plugin/awkeys.cpp +++ b/sources/awesome-widget/plugin/awkeys.cpp @@ -85,6 +85,7 @@ void AWKeys::unlock() { qCDebug(LOG_AW); + qCWarning(LOG_AW) << "Unlock stream"; lock = false; } @@ -404,7 +405,7 @@ void AWKeys::addDevice(const QString source) } -void AWKeys::dataUpdated(const QString sourceName, const QVariantHash data) +void AWKeys::dataUpdated(const QString sourceName, const QVariantMap data) { qCDebug(LOG_AW); qCDebug(LOG_AW) << "Source" << sourceName; @@ -699,7 +700,7 @@ QString AWKeys::parsePattern(QString pattern) const } -void AWKeys::setDataBySource(const QString sourceName, const QVariantHash data) +void AWKeys::setDataBySource(const QString sourceName, const QVariantMap data) { qCDebug(LOG_AW); qCDebug(LOG_AW) << "Source" << sourceName; diff --git a/sources/awesome-widget/plugin/awkeys.h b/sources/awesome-widget/plugin/awkeys.h index 5bc2c02..262514e 100644 --- a/sources/awesome-widget/plugin/awkeys.h +++ b/sources/awesome-widget/plugin/awkeys.h @@ -60,7 +60,7 @@ public: public slots: void addDevice(const QString source); - void dataUpdated(const QString sourceName, const QVariantHash data); + void dataUpdated(const QString sourceName, const QVariantMap data); signals: void dropSourceFromDataengine(const QString source); @@ -78,7 +78,7 @@ private: void addKeyToCache(const QString type, const QString key = QString("")); void calculateValues(); QString parsePattern(QString pattern) const; - void setDataBySource(const QString sourceName, const QVariantHash data); + void setDataBySource(const QString sourceName, const QVariantMap data); // objects AWDataAggregator *dataAggregator = nullptr; AWDataEngineAggregator *dataEngineAggregator = nullptr; diff --git a/sources/awesomewidgets/CMakeLists.txt b/sources/awesomewidgets/CMakeLists.txt index 5b722ee..48c71b9 100644 --- a/sources/awesomewidgets/CMakeLists.txt +++ b/sources/awesomewidgets/CMakeLists.txt @@ -26,10 +26,8 @@ file(RELATIVE_PATH SUBPROJECT_WEATHER_JSON ${CMAKE_SOURCE_DIR} ${SUBPROJECT_WEAT # prepare configure_file(${SUBPROJECT_WEATHER_JSON_IN} ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_WEATHER_JSON}) -qt5_wrap_cpp(SUBPROJECT_MOC_SOURCE ${SUBPROJECT_HEADER}) qt5_wrap_ui(SUBPROJECT_UI_HEADER ${SUBPROJECT_UI}) -add_library(${SUBPROJECT} STATIC ${SUBPROJECT_SOURCE} ${SUBPROJECT_MOC_SOURCE} - ${SUBPROJECT_HEADER} ${SUBPROJECT_UI_HEADER}) +add_library(${SUBPROJECT} STATIC ${SUBPROJECT_SOURCE} ${SUBPROJECT_HEADER} ${SUBPROJECT_UI_HEADER}) target_link_libraries(${SUBPROJECT} ${Qt_LIBRARIES} ${Kf5_LIBRARIES}) # install diff --git a/sources/awesomewidgets/abstractextitem.cpp b/sources/awesomewidgets/abstractextitem.cpp index e7effa8..1f1fada 100644 --- a/sources/awesomewidgets/abstractextitem.cpp +++ b/sources/awesomewidgets/abstractextitem.cpp @@ -47,10 +47,8 @@ AbstractExtItem::~AbstractExtItem() template -T *AbstractExtItem::copy(const QString _fileName, const int _number) +T *AbstractExtItem::copy(const QString, const int) { - Q_UNUSED(_fileName) - Q_UNUSED(_number) qCDebug(LOG_LIB); // an analog of pure virtual method diff --git a/sources/awesomewidgets/abstractextitem.h b/sources/awesomewidgets/abstractextitem.h index 94077a7..2cf54db 100644 --- a/sources/awesomewidgets/abstractextitem.h +++ b/sources/awesomewidgets/abstractextitem.h @@ -39,7 +39,7 @@ public: explicit AbstractExtItem(QWidget *parent = nullptr, const QString desktopName = QString(), const QStringList directories = QStringList()); virtual ~AbstractExtItem(); - template T *copy(const QString _fileName, const int _number); + template T *copy(const QString, const int); // get methods int apiVersion() const; QString comment() const; diff --git a/sources/extsysmon/CMakeLists.txt b/sources/extsysmon/CMakeLists.txt index 6f46bb1..b9344ab 100644 --- a/sources/extsysmon/CMakeLists.txt +++ b/sources/extsysmon/CMakeLists.txt @@ -1,5 +1,4 @@ set(SUBPROJECT plasma_dataengine_extsysmon) -set(PLUGIN_NAME ${SUBPROJECT}) message(STATUS "Subproject ${SUBPROJECT}") add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.plasma.awesomewidget\") @@ -26,13 +25,12 @@ configure_file(${SUBPROJECT_DESKTOP_IN} ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT # make qt5_wrap_cpp(TASK_MOC_SOURCE ${TASK_HEADER}) -qt5_wrap_ui(SUBPROJECT_UI_HEADER ${SUBPROJECT_UI}) -add_library(${PLUGIN_NAME} MODULE ${SUBPROJECT_SOURCE} ${SUBPROJECT_UI_HEADER} ${TASK_MOC_SOURCE}) -target_link_libraries(${PLUGIN_NAME} ${PROJECT_LIBRARY} ${Qt_LIBRARIES} ${Kf5_LIBRARIES}) -kcoreaddons_desktop_to_json(${PLUGIN_NAME} ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_DESKTOP}) +add_library(${SUBPROJECT} MODULE ${SUBPROJECT_SOURCE} ${TASK_MOC_SOURCE}) +target_link_libraries(${SUBPROJECT} ${PROJECT_LIBRARY} ${Qt_LIBRARIES} ${Kf5_LIBRARIES}) +kcoreaddons_desktop_to_json(${SUBPROJECT} ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_DESKTOP}) # install -install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine) +install(TARGETS ${SUBPROJECT} DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_DESKTOP} DESTINATION ${SERVICES_INSTALL_DIR}) install(FILES ${SUBPROJECT_CONF} DESTINATION ${CONFIG_INSTALL_DIR}) install(FILES ${SUBPROJECT_INI} DESTINATION ${CONFIG_INSTALL_DIR}) diff --git a/sources/extsysmon/extsysmonaggregator.cpp b/sources/extsysmon/extsysmonaggregator.cpp index e8f017c..ce65603 100644 --- a/sources/extsysmon/extsysmonaggregator.cpp +++ b/sources/extsysmon/extsysmonaggregator.cpp @@ -154,10 +154,10 @@ void ExtSysMonAggregator::init(const QHash config) AbstractExtSysMonSource *weatherItem = new WeatherSource(this, QStringList()); foreach(QString source, weatherItem->sources()) m_map[source] = weatherItem; -#ifdef BUILD_TEST +#ifdef BUILD_TESTING // additional load source AbstractExtSysMonSource *loadItem = new LoadSource(this, QStringList()); foreach(QString source, loadItem->sources()) m_map[source] = loadItem; -#endif /* BUILD_TEST */ +#endif /* BUILD_TESTING */ } diff --git a/sources/libraries.cmake b/sources/libraries.cmake index 21c1a6b..ee4c44c 100644 --- a/sources/libraries.cmake +++ b/sources/libraries.cmake @@ -1,4 +1,4 @@ -# required by translation packae +# required by translation package find_package(Gettext REQUIRED) # main qt libraries diff --git a/sources/version.h.in b/sources/version.h.in index 551c2a3..b2fc435 100644 --- a/sources/version.h.in +++ b/sources/version.h.in @@ -25,7 +25,7 @@ // available time keys #define TIME_KEYS "dddd,ddd,dd,d,MMMM,MMM,MM,M,yyyy,yy,hh,h,HH,H,mm,m,ss,s,t,ap,a,AP,A" #cmakedefine BUILD_FUTURE -#cmakedefine BUILD_TEST +#cmakedefine BUILD_TESTING // links #define HOMEPAGE "https://arcanis.name/projects/awesome-widgets/" @@ -50,6 +50,6 @@ #define BUILD_RPM_PACKAGE "@BUILD_RPM_PACKAGE@" // additional functions #define PROP_FUTURE "@BUILD_FUTURE@" -#define PROP_TEST "@BUILD_TEST@" +#define PROP_TEST "@BUILD_TESTING@" #endif /* VERSION_H */