diff options
author | Ken Moore <ken@ixsystems.com> | 2017-02-27 11:58:42 -0500 |
---|---|---|
committer | Ken Moore <ken@ixsystems.com> | 2017-02-27 11:58:42 -0500 |
commit | 7e00d31d1dcb444869512710ad2af5055834b028 (patch) | |
tree | 2a865193a268efca28cedf3a4fb8d9e0c9048eae | |
parent | Silence some compile warnings in all the various OS templates. (diff) | |
download | lumina-7e00d31d1dcb444869512710ad2af5055834b028.tar.gz lumina-7e00d31d1dcb444869512710ad2af5055834b028.tar.bz2 lumina-7e00d31d1dcb444869512710ad2af5055834b028.zip |
Clean up a couple more compile warnings about unused variables.
-rw-r--r-- | src-qt5/core/libLumina/LuminaXDG.cpp | 8 | ||||
-rw-r--r-- | src-qt5/core/libLumina/OSInterface-template.cpp | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src-qt5/core/libLumina/LuminaXDG.cpp b/src-qt5/core/libLumina/LuminaXDG.cpp index 38128fc7..cbc90f25 100644 --- a/src-qt5/core/libLumina/LuminaXDG.cpp +++ b/src-qt5/core/libLumina/LuminaXDG.cpp @@ -476,7 +476,7 @@ void XDGDesktopList::updateList(){ bool firstrun = lastCheck.isNull() || oldkeys.isEmpty(); lastCheck = QDateTime::currentDateTime(); //Variables for internal loop use only (to prevent re-initializing variable on every iteration) - bool ok; QString path; QDir dir; QStringList apps; + QString path; QDir dir; QStringList apps; for(int i=0; i<appDirs.length(); i++){ if( !dir.cd(appDirs[i]) ){ continue; } //could not open dir for some reason apps = dir.entryList(QStringList() << "*.desktop",QDir::Files, QDir::Name); @@ -485,11 +485,9 @@ void XDGDesktopList::updateList(){ if(files.contains(path) && (files.value(path)->lastRead>QFileInfo(path).lastModified()) ){ //Re-use previous data for this file (nothing changed) found << files[path]->name; //keep track of which files were already found - ok=true; }else{ - ok=false; - if(files.contains(path)){ appschanged = true; files.take(path)->deleteLater(); } //files.remove(path); } - XDGDesktop *dFile = new XDGDesktop(path, this); //will change the "ok" variable as needed + if(files.contains(path)){ appschanged = true; files.take(path)->deleteLater(); } + XDGDesktop *dFile = new XDGDesktop(path, this); if(dFile->type!=XDGDesktop::BAD){ appschanged = true; //flag that something changed - needed to load a file if(!oldkeys.contains(path)){ newfiles << path; } //brand new file (not an update to a previously-read file) diff --git a/src-qt5/core/libLumina/OSInterface-template.cpp b/src-qt5/core/libLumina/OSInterface-template.cpp index 62915f2f..96b01e60 100644 --- a/src-qt5/core/libLumina/OSInterface-template.cpp +++ b/src-qt5/core/libLumina/OSInterface-template.cpp @@ -51,7 +51,7 @@ QList<QVariant> OSInterface::status(OSInterface::Interface){ } //Individual Interface interactions -bool OSInterface::modify(OSInterface::Interface, QList<QVariant> args){ //returns: success/failure +bool OSInterface::modify(OSInterface::Interface, QList<QVariant>){ //returns: success/failure // ==== Interface modification argument lists ==== // Battery: <NO MODIFICATION> // Volume: [int (set percent volume) ] |