arcanis/awesome-widgets
1
0
Fork 0
mirror of https://github.com/arcan1s/awesome-widgets.git synced 2025-07-14 14:25:50 +00:00
Code Issues Projects Releases Wiki Activity

Release 3.0.1

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

41
sources/awesome-widget/plugin/awkeys.cpp
View File

@ -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<GraphicalItem>(nullptr, QString("desktops"));