diff --git a/shared/common.cpp b/shared/common.cpp index 339dd4e..52283f3 100644 --- a/shared/common.cpp +++ b/shared/common.cpp @@ -36,32 +36,14 @@ bool Common::initSqliteDatabase(QString path) return true; } -QString Common::findInPath(QString needle) -{ - QStringList results; - QString pathVar = QProcessEnvironment::systemEnvironment().value("PATH", "/usr/bin/:/bin/:"); - QStringList paths = pathVar.split(":"); - for(const QString &path : paths) - { - // TODO: can pass ../ but so be it for now. - - QFileInfo info{path + "/" + needle}; - if(info.exists()) - { - return info.absoluteFilePath(); - } - } - return ""; -} - void Common::setPdfViewer() { QString value; /* TODO: well, we should query this probably from xdg*/ - QString okularPath = findInPath("okular"); - QString evincePath = findInPath("evince"); - QString qpdfviewPath = findInPath("qpdfview"); + QString okularPath = QStandardPaths::findExecutable("okular"); + QString evincePath = QStandardPaths::findExecutable("evince"); + QString qpdfviewPath = QStandardPaths::findExecutable("qpdfview"); if(okularPath != "") { diff --git a/shared/common.h b/shared/common.h index 26308de..62b7537 100644 --- a/shared/common.h +++ b/shared/common.h @@ -16,7 +16,6 @@ void setupAppInfo(); QString databasePath(); QString ipcSocketPath(); void setPdfViewer(); -QString findInPath(QString needle); bool initSqliteDatabase(QString path); void ensureConfigured(); QStringList excludedPaths();