diff --git a/CHANGELOG b/CHANGELOG index ad926e9..8370635 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,8 @@ +Ver.3.0.1: ++ add patches for old Qt versions +- drop `nullptr` checking +* move dialogs to QML part + Ver.3.0.0: + add tags upunits, downunits, upkb, downkb + add tags dalbum, dartist, dtitle, salbum, sartist, stitle diff --git a/CHANGELOG-RU b/CHANGELOG-RU index 1a3b98c..c1fcbd5 100644 --- a/CHANGELOG-RU +++ b/CHANGELOG-RU @@ -1,3 +1,8 @@ +Вер.3.0.1: ++ добавлены патчи для старых версий Qt +- убрана проверка на nullptr +* диалоги перемещены в QML + Вер.3.0.0: + добавлены теги upunits, downunits, upkb, downkb + добавлены теги dalbum, dartist, dtitle, salbum, sartist, stitle diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 66fb446..3f94a57 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -81,6 +81,8 @@ for more details. To avoid manual labor there is automatic cmake target named * Create one file (source and header) per class. * `else if` construction is allowed and recommended. * 'true ? foo : bar' construction is allowed and recommended for one-line assignment. +* any global pointer should be assign to `nullptr` after deletion and before + initialization. Exception: if object is deleted into class destructor. Comments -------- @@ -101,7 +103,7 @@ Development * Officially the latest libraries versions should be used. In addition it is possible to add workarounds for all versions (usually by using preprocessor - directives). + directives); in this case patches should be placed to `packages` directory. * Build should not contain any warning. * Try to minimize message in Release build with logging disabled. It is highly recommended to fix KDE/Qt specific warning if possible diff --git a/packages/PKGBUILD b/packages/PKGBUILD index 812e17f..3cc9da5 100644 --- a/packages/PKGBUILD +++ b/packages/PKGBUILD @@ -2,7 +2,7 @@ pkgname=plasma5-applet-awesome-widgets _pkgname=awesome-widgets -pkgver=3.0.0 +pkgver=3.0.1 pkgrel=1 pkgdesc="Collection of minimalistic Plasmoids which look like Awesome WM widgets (ex-PyTextMonitor)" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ optdepends=("catalyst: for GPU monitor" makedepends=('cmake' 'extra-cmake-modules') source=(https://github.com/arcan1s/awesome-widgets/releases/download/V.${pkgver}/${_pkgname}-${pkgver}-src.tar.xz) install=${pkgname}.install -md5sums=('4878899f092ee12ad8f935f0551ef6b2') +md5sums=('71f5b358d443075540377284ee868a93') backup=('etc/xdg/plasma-dataengine-extsysmon.conf') prepare() { @@ -28,8 +28,9 @@ prepare() { build () { cd "${srcdir}/build" cmake -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_BUILD_TYPE=Optimization \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_FUTURE=ON \ "../${_pkgname}" make } diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt index 8e45d58..bc96fb9 100644 --- a/sources/CMakeLists.txt +++ b/sources/CMakeLists.txt @@ -15,7 +15,7 @@ set(PROJECT_CONTACT "esalexeev@gmail.com") set(PROJECT_LICENSE "GPL3") set(PROJECT_VERSION_MAJOR "3") set(PROJECT_VERSION_MINOR "0") -set(PROJECT_VERSION_PATCH "0") +set(PROJECT_VERSION_PATCH "1") set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") # append git version if any set(PROJECT_COMMIT_SHA "Commit hash" CACHE INTERNAL "") diff --git a/sources/awesome-widget/package/metadata.desktop b/sources/awesome-widget/package/metadata.desktop index ddba55c..8983e48 100644 --- a/sources/awesome-widget/package/metadata.desktop +++ b/sources/awesome-widget/package/metadata.desktop @@ -20,7 +20,7 @@ X-Plasma-RemoteLocation= X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis X-KDE-PluginInfo-Email=esalexeev@gmail.com X-KDE-PluginInfo-Name=org.kde.plasma.awesomewidget -X-KDE-PluginInfo-Version=3.0.0 +X-KDE-PluginInfo-Version=3.0.1 X-KDE-PluginInfo-Website=http://arcanis.name/projects/awesome-widgets/ X-KDE-PluginInfo-Category=System Information X-KDE-PluginInfo-Depends= diff --git a/sources/awesome-widget/plugin/awkeys.cpp b/sources/awesome-widget/plugin/awkeys.cpp index e5b9861..39e0647 100644 --- a/sources/awesome-widget/plugin/awkeys.cpp +++ b/sources/awesome-widget/plugin/awkeys.cpp @@ -66,22 +66,15 @@ AWKeys::~AWKeys() qCDebug(LOG_AW) << __PRETTY_FUNCTION__; // extensions - if (graphicalItems != nullptr) - delete graphicalItems; - if (extQuotes != nullptr) - delete extQuotes; - if (extScripts != nullptr) - delete extScripts; - if (extUpgrade != nullptr) - delete extUpgrade; - if (extWeather != nullptr) - delete extWeather; + delete graphicalItems; + delete extQuotes; + delete extScripts; + delete extUpgrade; + delete extWeather; // core - if (dataEngineAggregator != nullptr) - delete dataEngineAggregator; - if (m_threadPool != nullptr) - delete m_threadPool; + delete dataEngineAggregator; + delete m_threadPool; delete aggregator; delete dataAggregator; } @@ -471,16 +464,16 @@ void AWKeys::reinitKeys() { // renew extensions // delete them if any - if (graphicalItems != nullptr) - delete graphicalItems; - if (extQuotes != nullptr) - delete extQuotes; - if (extScripts != nullptr) - delete extScripts; - if (extUpgrade != nullptr) - delete extUpgrade; - if (extWeather != nullptr) - delete extWeather; + delete graphicalItems; + graphicalItems = nullptr; + delete extQuotes; + extQuotes = nullptr; + delete extScripts; + extScripts = nullptr; + delete extUpgrade; + extUpgrade = nullptr; + delete extWeather; + extWeather = nullptr; // create graphicalItems = new ExtItemAggregator(nullptr, QString("desktops")); diff --git a/sources/desktop-panel/package/metadata.desktop b/sources/desktop-panel/package/metadata.desktop index f3ec7f3..3f82376 100644 --- a/sources/desktop-panel/package/metadata.desktop +++ b/sources/desktop-panel/package/metadata.desktop @@ -20,7 +20,7 @@ X-Plasma-RemoteLocation= X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis X-KDE-PluginInfo-Email=esalexeev@gmail.com X-KDE-PluginInfo-Name=org.kde.plasma.desktoppanel -X-KDE-PluginInfo-Version=3.0.0 +X-KDE-PluginInfo-Version=3.0.1 X-KDE-PluginInfo-Website=http://arcanis.name/projects/awesome-widgets/ X-KDE-PluginInfo-Category=System Information X-KDE-PluginInfo-Depends=