Release 3.0.1

drop nullptr checking
This commit is contained in:
arcan1s 2015-10-23 00:20:30 +03:00
parent 2d9ca281a9
commit ac089dee9c
8 changed files with 37 additions and 31 deletions

View File

@ -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: Ver.3.0.0:
+ add tags upunits, downunits, upkb, downkb + add tags upunits, downunits, upkb, downkb
+ add tags dalbum, dartist, dtitle, salbum, sartist, stitle + add tags dalbum, dartist, dtitle, salbum, sartist, stitle

View File

@ -1,3 +1,8 @@
Вер.3.0.1:
+ добавлены патчи для старых версий Qt
- убрана проверка на nullptr
* диалоги перемещены в QML
Вер.3.0.0: Вер.3.0.0:
+ добавлены теги upunits, downunits, upkb, downkb + добавлены теги upunits, downunits, upkb, downkb
+ добавлены теги dalbum, dartist, dtitle, salbum, sartist, stitle + добавлены теги dalbum, dartist, dtitle, salbum, sartist, stitle

View File

@ -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. * Create one file (source and header) per class.
* `else if` construction is allowed and recommended. * `else if` construction is allowed and recommended.
* 'true ? foo : bar' construction is allowed and recommended for one-line assignment. * '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 Comments
-------- --------
@ -101,7 +103,7 @@ Development
* Officially the latest libraries versions should be used. In addition it is * Officially the latest libraries versions should be used. In addition it is
possible to add workarounds for all versions (usually by using preprocessor 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. * Build should not contain any warning.
* Try to minimize message in Release build with logging disabled. It is highly * Try to minimize message in Release build with logging disabled. It is highly
recommended to fix KDE/Qt specific warning if possible recommended to fix KDE/Qt specific warning if possible

View File

@ -2,7 +2,7 @@
pkgname=plasma5-applet-awesome-widgets pkgname=plasma5-applet-awesome-widgets
_pkgname=awesome-widgets _pkgname=awesome-widgets
pkgver=3.0.0 pkgver=3.0.1
pkgrel=1 pkgrel=1
pkgdesc="Collection of minimalistic Plasmoids which look like Awesome WM widgets (ex-PyTextMonitor)" pkgdesc="Collection of minimalistic Plasmoids which look like Awesome WM widgets (ex-PyTextMonitor)"
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
@ -17,7 +17,7 @@ optdepends=("catalyst: for GPU monitor"
makedepends=('cmake' 'extra-cmake-modules') makedepends=('cmake' 'extra-cmake-modules')
source=(https://github.com/arcan1s/awesome-widgets/releases/download/V.${pkgver}/${_pkgname}-${pkgver}-src.tar.xz) source=(https://github.com/arcan1s/awesome-widgets/releases/download/V.${pkgver}/${_pkgname}-${pkgver}-src.tar.xz)
install=${pkgname}.install install=${pkgname}.install
md5sums=('4878899f092ee12ad8f935f0551ef6b2') md5sums=('71f5b358d443075540377284ee868a93')
backup=('etc/xdg/plasma-dataengine-extsysmon.conf') backup=('etc/xdg/plasma-dataengine-extsysmon.conf')
prepare() { prepare() {
@ -28,8 +28,9 @@ prepare() {
build () { build () {
cd "${srcdir}/build" cd "${srcdir}/build"
cmake -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ cmake -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Optimization \
-DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_PREFIX=/usr \
-DBUILD_FUTURE=ON \
"../${_pkgname}" "../${_pkgname}"
make make
} }

View File

@ -15,7 +15,7 @@ set(PROJECT_CONTACT "esalexeev@gmail.com")
set(PROJECT_LICENSE "GPL3") set(PROJECT_LICENSE "GPL3")
set(PROJECT_VERSION_MAJOR "3") set(PROJECT_VERSION_MAJOR "3")
set(PROJECT_VERSION_MINOR "0") 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}") set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
# append git version if any # append git version if any
set(PROJECT_COMMIT_SHA "Commit hash" CACHE INTERNAL "") set(PROJECT_COMMIT_SHA "Commit hash" CACHE INTERNAL "")

View File

@ -20,7 +20,7 @@ X-Plasma-RemoteLocation=
X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis
X-KDE-PluginInfo-Email=esalexeev@gmail.com X-KDE-PluginInfo-Email=esalexeev@gmail.com
X-KDE-PluginInfo-Name=org.kde.plasma.awesomewidget 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-Website=http://arcanis.name/projects/awesome-widgets/
X-KDE-PluginInfo-Category=System Information X-KDE-PluginInfo-Category=System Information
X-KDE-PluginInfo-Depends= X-KDE-PluginInfo-Depends=

View File

@ -66,22 +66,15 @@ AWKeys::~AWKeys()
qCDebug(LOG_AW) << __PRETTY_FUNCTION__; qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
// extensions // extensions
if (graphicalItems != nullptr) delete graphicalItems;
delete graphicalItems; delete extQuotes;
if (extQuotes != nullptr) delete extScripts;
delete extQuotes; delete extUpgrade;
if (extScripts != nullptr) delete extWeather;
delete extScripts;
if (extUpgrade != nullptr)
delete extUpgrade;
if (extWeather != nullptr)
delete extWeather;
// core // core
if (dataEngineAggregator != nullptr) delete dataEngineAggregator;
delete dataEngineAggregator; delete m_threadPool;
if (m_threadPool != nullptr)
delete m_threadPool;
delete aggregator; delete aggregator;
delete dataAggregator; delete dataAggregator;
} }
@ -471,16 +464,16 @@ void AWKeys::reinitKeys()
{ {
// renew extensions // renew extensions
// delete them if any // delete them if any
if (graphicalItems != nullptr) delete graphicalItems;
delete graphicalItems; graphicalItems = nullptr;
if (extQuotes != nullptr) delete extQuotes;
delete extQuotes; extQuotes = nullptr;
if (extScripts != nullptr) delete extScripts;
delete extScripts; extScripts = nullptr;
if (extUpgrade != nullptr) delete extUpgrade;
delete extUpgrade; extUpgrade = nullptr;
if (extWeather != nullptr) delete extWeather;
delete extWeather; extWeather = nullptr;
// create // create
graphicalItems graphicalItems
= new ExtItemAggregator<GraphicalItem>(nullptr, QString("desktops")); = new ExtItemAggregator<GraphicalItem>(nullptr, QString("desktops"));

View File

@ -20,7 +20,7 @@ X-Plasma-RemoteLocation=
X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis
X-KDE-PluginInfo-Email=esalexeev@gmail.com X-KDE-PluginInfo-Email=esalexeev@gmail.com
X-KDE-PluginInfo-Name=org.kde.plasma.desktoppanel 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-Website=http://arcanis.name/projects/awesome-widgets/
X-KDE-PluginInfo-Category=System Information X-KDE-PluginInfo-Category=System Information
X-KDE-PluginInfo-Depends= X-KDE-PluginInfo-Depends=