fix plasma crash with extquotes

rewrite main widget to use signal-slot model
This commit is contained in:
arcan1s
2015-06-30 07:13:58 +03:00
parent aa15e13713
commit 41deb8ef72
6 changed files with 43 additions and 15 deletions

View File

@ -355,17 +355,20 @@ QStringList AWKeys::getHddDevices()
}
bool AWKeys::setDataBySource(const QString sourceName, const QVariantMap data,
void AWKeys::setDataBySource(const QString sourceName, const QVariantMap data,
const QVariantMap params)
{
if (debug) qDebug() << PDEBUG;
if (debug) qDebug() << PDEBUG << ":" << "Source" << sourceName;
if (sourceName == QString("update")) return true;
if (sourceName == QString("update")) {
emit(needToBeUpdated());
return;
}
// checking
if (!checkKeys(data)) return false;
if (keys.isEmpty()) return false;
if (!checkKeys(data)) return;
if (keys.isEmpty()) return;
// regular expressions
QRegExp cpuRegExp = QRegExp(QString("cpu/cpu.*/TotalLoad"));
@ -653,11 +656,9 @@ bool AWKeys::setDataBySource(const QString sourceName, const QVariantMap data,
values[QString("cuptime")].replace(QString("$mm"), QString("%1").arg(minutes, 2, 10, QChar('0')));
values[QString("cuptime")].replace(QString("$m"), QString("%1").arg(minutes));
} else {
if (debug) qDebug() << PDEBUG << ":" << "Source not found";
return true;
if (debug) qDebug() << PDEBUG << ":" << "Source" << sourceName << "not found";
emit(dropSourceFromDataengine(sourceName));
}
return false;
}