From e7a3742539dbb8e459ba9043cf467e06de3756d4 Mon Sep 17 00:00:00 2001 From: Hannah von Reth Date: Fri, 17 Jul 2020 14:33:22 +0000 Subject: [PATCH] Replace url().path() with url().toLocalFile() This fixes support for no unix platforms. toLocalFile() results in C:/foo instead of /C:/foo --- src/lib/fileAnalyzer.cpp | 8 +++---- src/lib/kioLogFileReader.cpp | 4 ++-- src/lib/loadingBar.cpp | 8 +++---- src/lib/localLogFileReader.cpp | 12 +++++----- src/lib/logFile.cpp | 4 ++-- src/lib/logModeConfiguration.cpp | 5 ++--- src/lib/processOutputLogFileReader.cpp | 12 +++++----- src/loggerDialog.cpp | 2 +- src/modes/acpid/acpidAnalyzer.h | 2 +- src/modes/apache/apacheAccessAnalyzer.h | 2 +- src/modes/apache/apacheAnalyzer.h | 2 +- .../authenticationConfigurationWidget.h | 4 ++-- src/modes/base/fileListHelper.cpp | 14 ++++++------ src/modes/base/genericConfiguration.cpp | 2 +- src/modes/base/syslogAnalyzer.cpp | 4 ++-- src/modes/cups/cupsAccessAnalyzer.h | 2 +- src/modes/cups/cupsAnalyzer.cpp | 2 +- src/modes/cups/cupsPageAnalyzer.h | 2 +- src/modes/cups/cupsPdfAnalyzer.h | 2 +- src/modes/kernel/kernelAnalyzer.h | 2 +- src/modes/samba/sambaAnalyzer.h | 2 +- src/modes/xorg/xorgAnalyzer.cpp | 2 +- src/modes/xsession/xsessionAnalyzer.h | 2 +- .../xsession/xsessionConfigurationWidget.h | 4 ++-- tests/kernelAnalyzerTest.cpp | 4 ++-- tests/systemAnalyzerTest.cpp | 22 +++++++++---------- 26 files changed, 65 insertions(+), 66 deletions(-) diff --git a/src/lib/fileAnalyzer.cpp b/src/lib/fileAnalyzer.cpp index 477d25d..91f3192 100644 --- a/src/lib/fileAnalyzer.cpp +++ b/src/lib/fileAnalyzer.cpp @@ -66,7 +66,7 @@ void FileAnalyzer::deleteLogFiles() // Remove the watching on the monitored files foreach (LogFileReader *logFileReader, logFileReaders) { - logDebug() << "Remove file : " << logFileReader->logFile().url().path(); + logDebug() << "Remove file : " << logFileReader->logFile().url().toLocalFile(); delete logFileReader; } @@ -91,7 +91,7 @@ void FileAnalyzer::setLogFiles(const QList &logFiles) void FileAnalyzer::logFileChanged(LogFileReader *logFileReader, ReadingMode readingMode, const QStringList &content) { - QString filePath = logFileReader->logFile().url().path(); + QString filePath = logFileReader->logFile().url().toLocalFile(); if (readingMode == Analyzer::FullRead) logDebug() << "File " << filePath << " has been modified on full read."; else @@ -153,7 +153,7 @@ int FileAnalyzer::insertLines(const QStringList &bufferedLines, const LogFile &l // If there is no line if (bufferedLines.isEmpty()) { - logWarning() << "File is empty : " << logFile.url().path(); + logWarning() << "File is empty : " << logFile.url().toLocalFile(); } int stop = 0; @@ -196,7 +196,7 @@ int FileAnalyzer::insertLines(const QStringList &bufferedLines, const LogFile &l ++currentPosition; } - logDebug() << "Total read lines :" << (bufferedLines.size() - stop) << "(" << logFile.url().path() << ")"; + logDebug() << "Total read lines :" << (bufferedLines.size() - stop) << "(" << logFile.url().toLocalFile() << ")"; return insertedLogLineCount; } diff --git a/src/lib/kioLogFileReader.cpp b/src/lib/kioLogFileReader.cpp index 17e7858..20ea641 100644 --- a/src/lib/kioLogFileReader.cpp +++ b/src/lib/kioLogFileReader.cpp @@ -62,13 +62,13 @@ KioLogFileReader::KioLogFileReader(const LogFile &logFile) d->fileWatch = new KDirWatch(this); connect(d->fileWatch, &KDirWatch::dirty, this, &KioLogFileReader::watchFile); - d->fileWatch->addFile(logFile.url().path()); + d->fileWatch->addFile(logFile.url().toLocalFile()); /* d->fileWatch.setInterval(1000); connect(& (d->fileWatch), SIGNAL(timeout()), this, SLOT(watchFile())); */ - logDebug() << "Starting " << logFile.url().path(); + logDebug() << "Starting " << logFile.url().toLocalFile(); } KioLogFileReader::~KioLogFileReader() diff --git a/src/lib/loadingBar.cpp b/src/lib/loadingBar.cpp index 37917f8..e4d06f8 100644 --- a/src/lib/loadingBar.cpp +++ b/src/lib/loadingBar.cpp @@ -91,20 +91,20 @@ void LoadingBar::startLoading(const LogMode &logMode, const LogFile &logFile, in if (d->firstLoading) d->label->setText(i18np("Loading %2...
%3 - (%4)", "Loading %2...
%3 - (%4/%1 files)", fileCount, - logMode.name(), logFile.url().path(), fileIndex)); + logMode.name(), logFile.url().toLocalFile(), fileIndex)); else d->label->setText(i18np("Reloading %2...
%3 - (%4)", "Reloading %2...
%3 - (%4/%1 files)", fileCount, - logMode.name(), logFile.url().path(), fileIndex)); + logMode.name(), logFile.url().toLocalFile(), fileIndex)); } // Only one file else { if (d->firstLoading) d->label->setText( - i18n("Loading %1...
%2", logMode.name(), logFile.url().path())); + i18n("Loading %1...
%2", logMode.name(), logFile.url().toLocalFile())); else d->label->setText( - i18n("Reloading %1...
%2", logMode.name(), logFile.url().path())); + i18n("Reloading %1...
%2", logMode.name(), logFile.url().toLocalFile())); } } diff --git a/src/lib/localLogFileReader.cpp b/src/lib/localLogFileReader.cpp index 5e72980..6910fc9 100644 --- a/src/lib/localLogFileReader.cpp +++ b/src/lib/localLogFileReader.cpp @@ -80,13 +80,13 @@ void LocalLogFileReader::init() // Init current file position d->previousFilePosition = 0; - logDebug() << "Reading local file " << d->logFile.url().path(); + logDebug() << "Reading local file " << d->logFile.url().toLocalFile(); } void LocalLogFileReader::watchFile(bool enable) { Q_D(LocalLogFileReader); - QString filePath = d->logFile.url().path(); + QString filePath = d->logFile.url().toLocalFile(); if (enable == true) { logDebug() << "Monitoring file : " << filePath; @@ -108,7 +108,7 @@ void LocalLogFileReader::watchFile(bool enable) QIODevice *LocalLogFileReader::open() { Q_D(LocalLogFileReader); - QString filePath = d->logFile.url().path(); + const QString filePath = d->logFile.url().toLocalFile(); if (d->logFile.url().isValid() == false) { QString message(i18n("This file is not valid. Please adjust it in the settings of KSystemLog.")); @@ -186,7 +186,7 @@ QStringList LocalLogFileReader::readContent(QIODevice *inputDevice) // Get the size file for the next calculation d->previousFilePosition = inputDevice->size(); - logDebug() << "New file position : " << d->previousFilePosition << " (" << d->logFile.url().path() << ")"; + logDebug() << "New file position : " << d->previousFilePosition << " (" << d->logFile.url().toLocalFile() << ")"; return rawBuffer; } @@ -203,13 +203,13 @@ void LocalLogFileReader::logFileModified() QIODevice *inputDevice = open(); if (inputDevice == nullptr) { - logCritical() << "Could not open file " << d->logFile.url().path(); + logCritical() << "Could not open file " << d->logFile.url().toLocalFile(); return; } // If there are new lines in the file, insert only them or this is the first time we read this file if (d->previousFilePosition != 0 && d->previousFilePosition <= inputDevice->size()) { - logDebug() << "Reading from position " << d->previousFilePosition << " (" << d->logFile.url().path() + logDebug() << "Reading from position " << d->previousFilePosition << " (" << d->logFile.url().toLocalFile() << ")"; if (inputDevice->isSequential()) { diff --git a/src/lib/logFile.cpp b/src/lib/logFile.cpp index e26bfe1..989f9f4 100644 --- a/src/lib/logFile.cpp +++ b/src/lib/logFile.cpp @@ -87,12 +87,12 @@ LogLevel *LogFile::defaultLogLevel() const QDataStream &operator<<(QDataStream &out, const LogFile &logFile) { - out << logFile.url().path(); + out << logFile.url().toLocalFile(); return out; } QDebug &operator<<(QDebug &out, const LogFile &logFile) { - out << logFile.url().path(); + out << logFile.url().toLocalFile(); return out; } diff --git a/src/lib/logModeConfiguration.cpp b/src/lib/logModeConfiguration.cpp index 198e68b..ad36a65 100644 --- a/src/lib/logModeConfiguration.cpp +++ b/src/lib/logModeConfiguration.cpp @@ -212,12 +212,11 @@ LogFile LogModeConfiguration::findGenericLogFile(const QString &file) { LogLevel *level = Globals::instance().informationLogLevel(); - QUrl url(file); + QUrl url = QUrl::fromLocalFile(file); if (!url.isValid()) { logWarning() << i18n("URL '%1' is not valid, skipping this URL.", url.path()); return LogFile(QUrl(), Globals::instance().noLogLevel()); } - return LogFile(url, level); } @@ -240,7 +239,7 @@ QList LogModeConfiguration::findNoModeLogFiles(const QStringList &strin LogLevel *level = Globals::instance().noLogLevel(); foreach (const QString &string, stringList) { - QUrl url(string); + QUrl url = QUrl::fromLocalFile(string); if (!url.isValid()) { logWarning() << i18n("URL '%1' is not valid, skipping this URL.", url.path()); continue; diff --git a/src/lib/processOutputLogFileReader.cpp b/src/lib/processOutputLogFileReader.cpp index 4c7d63c..0c3d90b 100644 --- a/src/lib/processOutputLogFileReader.cpp +++ b/src/lib/processOutputLogFileReader.cpp @@ -75,7 +75,7 @@ void ProcessOutputLogFileReader::init() d->processUpdater.setInterval(PROCESS_OUTPUT_UPDATER_INTERVAL); connect(&(d->processUpdater), &QTimer::timeout, this, &ProcessOutputLogFileReader::startProcess); - logDebug() << "Using process name " << d->logFile.url().path(); + logDebug() << "Using process name " << d->logFile.url().toLocalFile(); } void ProcessOutputLogFileReader::watchFile(bool enable) @@ -83,7 +83,7 @@ void ProcessOutputLogFileReader::watchFile(bool enable) Q_D(ProcessOutputLogFileReader); if (enable == true) { - logDebug() << "Monitoring process : " << d->logFile.url().path(); + logDebug() << "Monitoring process : " << d->logFile.url().toLocalFile(); // Reinit current file position d->previousLinesCount = 0; @@ -118,7 +118,7 @@ void ProcessOutputLogFileReader::startProcess() connect(d->process, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(emitProcessOutput(int,QProcess::ExitStatus))); - d->process->start(d->logFile.url().path(), QStringList(), QIODevice::ReadOnly | QIODevice::Text); + d->process->start(d->logFile.url().toLocalFile(), QStringList(), QIODevice::ReadOnly | QIODevice::Text); d->process->waitForStarted(); @@ -133,7 +133,7 @@ void ProcessOutputLogFileReader::closeProcess() // Get the size file for the next calculation d->previousLinesCount = d->availableStandardOutput.count(); - logDebug() << "New lines count : " << d->previousLinesCount << " (" << d->logFile.url().path() << ")"; + logDebug() << "New lines count : " << d->previousLinesCount << " (" << d->logFile.url().toLocalFile() << ")"; d->availableStandardOutput.clear(); @@ -157,7 +157,7 @@ void ProcessOutputLogFileReader::emitProcessOutput(int /*exitCode*/, QProcess::E << d->availableStandardOutput.count() << "currently"; if (exitStatus == QProcess::CrashExit) { - QString message(i18n("The process '%1' crashed.", d->logFile.url().path())); + QString message(i18n("The process '%1' crashed.", d->logFile.url().toLocalFile())); emit errorOccured(i18n("Process Crashed"), message); emit statusBarChanged(message); } @@ -171,7 +171,7 @@ void ProcessOutputLogFileReader::emitProcessOutput(int /*exitCode*/, QProcess::E } // If there are new lines in the file, insert only them or this is the first time we read this file else if (d->previousLinesCount != 0 && d->previousLinesCount <= d->availableStandardOutput.count()) { - logDebug() << "Reading from line " << d->previousLinesCount << " (" << d->logFile.url().path() << ")"; + logDebug() << "Reading from line " << d->previousLinesCount << " (" << d->logFile.url().toLocalFile() << ")"; QStringList newOutputs; diff --git a/src/loggerDialog.cpp b/src/loggerDialog.cpp index 21d5cdc..ec9e9a0 100644 --- a/src/loggerDialog.cpp +++ b/src/loggerDialog.cpp @@ -234,7 +234,7 @@ void LoggerDialog::sendMessage() if (fileActivation->isChecked()) { arguments << QStringLiteral("-f"); - arguments << file->url().path(); + arguments << file->url().toLocalFile(); } // Else, the user types the content of its message else { diff --git a/src/modes/acpid/acpidAnalyzer.h b/src/modes/acpid/acpidAnalyzer.h index 3aa2f0d..ca018d8 100644 --- a/src/modes/acpid/acpidAnalyzer.h +++ b/src/modes/acpid/acpidAnalyzer.h @@ -116,7 +116,7 @@ protected: list.append(message); return new LogLine(logLineInternalIdGenerator++, QDateTime(date, time), list, - originalFile.url().path(), Globals::instance().informationLogLevel(), logMode); + originalFile.url().toLocalFile(), Globals::instance().informationLogLevel(), logMode); } }; diff --git a/src/modes/apache/apacheAccessAnalyzer.h b/src/modes/apache/apacheAccessAnalyzer.h index cbb499b..5bd6595 100644 --- a/src/modes/apache/apacheAccessAnalyzer.h +++ b/src/modes/apache/apacheAccessAnalyzer.h @@ -129,7 +129,7 @@ protected: list.append(message); list.append(url); - return new LogLine(logLineInternalIdGenerator++, dateTime, list, originalLogFile.url().path(), + return new LogLine(logLineInternalIdGenerator++, dateTime, list, originalLogFile.url().toLocalFile(), Globals::instance().informationLogLevel(), logMode); } }; diff --git a/src/modes/apache/apacheAnalyzer.h b/src/modes/apache/apacheAnalyzer.h index 505ebd2..9c4082c 100644 --- a/src/modes/apache/apacheAnalyzer.h +++ b/src/modes/apache/apacheAnalyzer.h @@ -137,7 +137,7 @@ protected: list.append(line); return new LogLine(logLineInternalIdGenerator++, QDateTime(date, time), list, - originalLogFile.url().path(), findLogLevel(level), logMode); + originalLogFile.url().toLocalFile(), findLogLevel(level), logMode); } private: diff --git a/src/modes/authentication/authenticationConfigurationWidget.h b/src/modes/authentication/authenticationConfigurationWidget.h index 13b242c..bda7a43 100644 --- a/src/modes/authentication/authenticationConfigurationWidget.h +++ b/src/modes/authentication/authenticationConfigurationWidget.h @@ -97,7 +97,7 @@ public Q_SLOTS: .findLogMode(QStringLiteral(AUTHENTICATION_LOG_MODE_ID)) ->logModeConfiguration(); - authenticationConfiguration->setAuthenticationPath(authenticationUrlRequester->url().path()); + authenticationConfiguration->setAuthenticationPath(authenticationUrlRequester->url().toLocalFile()); } void readConfig() override @@ -123,7 +123,7 @@ public Q_SLOTS: protected: bool isValid() const override { - if (authenticationUrlRequester->url().path().isEmpty() == false) { + if (authenticationUrlRequester->url().toLocalFile().isEmpty() == false) { return true; } diff --git a/src/modes/base/fileListHelper.cpp b/src/modes/base/fileListHelper.cpp index 164127c..e3c265a 100644 --- a/src/modes/base/fileListHelper.cpp +++ b/src/modes/base/fileListHelper.cpp @@ -94,7 +94,7 @@ QStringList FileListHelper::findPaths(const QList &urls) paths.append(foundPath); } } else { - paths.append(url.path()); + paths.append(url.toLocalFile()); } } } @@ -119,7 +119,7 @@ bool FileListHelper::isValidFile(const QUrl &url) } // If it's a directory, it's not valid - if (QDir(url.path()).exists()) { + if (QDir(url.toLocalFile()).exists()) { return false; } @@ -156,19 +156,19 @@ QUrl FileListHelper::openUrl(const QString &originPath) QStringList FileListHelper::expandJoker(const QUrl &url) { - QDir directory = QDir(url.path().left(url.path().count() - url.fileName().count())); + const QFileInfo info(url.toLocalFile()); - logDebug() << "Dir " << directory.path(); - QString filename = url.fileName(); + logDebug() << "Dir " << info.dir().path(); + QString filename = info.fileName(); if (filename.isEmpty()) { return QStringList(); } QStringList foundPaths; - const QStringList files = directory.entryList(QStringList(filename), QDir::Files | QDir::NoSymLinks); + const QStringList files = info.dir().entryList(QStringList(filename), QDir::Files | QDir::NoSymLinks); foreach (const QString &file, files) { - foundPaths.append(directory.absoluteFilePath(file)); + foundPaths.append(info.dir().absoluteFilePath(file)); } return foundPaths; diff --git a/src/modes/base/genericConfiguration.cpp b/src/modes/base/genericConfiguration.cpp index 3c494e1..1c30908 100644 --- a/src/modes/base/genericConfiguration.cpp +++ b/src/modes/base/genericConfiguration.cpp @@ -101,7 +101,7 @@ QList GenericLogModeConfiguration::findGenericLogFiles() else level = Globals::instance().informationLogLevel(); - QUrl url(stringValue); + const QUrl url = QUrl::fromLocalFile(stringValue); if (!url.isValid()) { logWarning() << i18n("URL '%1' is not valid, skipping this URL.", url.path()); continue; diff --git a/src/modes/base/syslogAnalyzer.cpp b/src/modes/base/syslogAnalyzer.cpp index 5439987..76475c4 100644 --- a/src/modes/base/syslogAnalyzer.cpp +++ b/src/modes/base/syslogAnalyzer.cpp @@ -176,7 +176,7 @@ LogLine *SyslogAnalyzer::parseMessage(const QString &logLine, const LogFile &ori list.append(process); list.append(message); - return new LogLine(logLineInternalIdGenerator++, dateTime, list, originalFile.url().path(), + return new LogLine(logLineInternalIdGenerator++, dateTime, list, originalFile.url().toLocalFile(), originalFile.defaultLogLevel(), logMode); } @@ -185,7 +185,7 @@ inline LogLine *SyslogAnalyzer::undefinedLogLine(const QString &message, const L QStringList items; items << undefinedHostName() << undefinedProcess() << message; return new LogLine(logLineInternalIdGenerator++, QDateTime::currentDateTime(), items, - originalFile.url().path(), originalFile.defaultLogLevel(), logMode); + originalFile.url().toLocalFile(), originalFile.defaultLogLevel(), logMode); } inline QString SyslogAnalyzer::undefinedHostName() diff --git a/src/modes/cups/cupsAccessAnalyzer.h b/src/modes/cups/cupsAccessAnalyzer.h index c3fafab..008fdd2 100644 --- a/src/modes/cups/cupsAccessAnalyzer.h +++ b/src/modes/cups/cupsAccessAnalyzer.h @@ -104,7 +104,7 @@ protected: LogLevel *logLevel = findLevel(capturedTexts.at(capturedTexts.count() - 1)); return new LogLine(logLineInternalIdGenerator++, dateTime, capturedTexts, - originalLogFile.url().path(), logLevel, logMode); + originalLogFile.url().toLocalFile(), logLevel, logMode); } inline LogLevel *findLevel(const QString &status) const diff --git a/src/modes/cups/cupsAnalyzer.cpp b/src/modes/cups/cupsAnalyzer.cpp index 1fa7d23..c82e3da 100644 --- a/src/modes/cups/cupsAnalyzer.cpp +++ b/src/modes/cups/cupsAnalyzer.cpp @@ -63,7 +63,7 @@ LogLine *CupsAnalyzer::parseMessage(const QString &logLine, const LogFile &origi QStringList list; list.append(message); - return new LogLine(logLineInternalIdGenerator++, dateTime, list, originalLogFile.url().path(), + return new LogLine(logLineInternalIdGenerator++, dateTime, list, originalLogFile.url().toLocalFile(), findLogLevel(level), logMode); } diff --git a/src/modes/cups/cupsPageAnalyzer.h b/src/modes/cups/cupsPageAnalyzer.h index b974dfb..247b27c 100644 --- a/src/modes/cups/cupsPageAnalyzer.h +++ b/src/modes/cups/cupsPageAnalyzer.h @@ -90,7 +90,7 @@ protected: QDateTime dateTime = ParsingHelper::instance()->parseHttpDateTime(capturedTexts.takeAt(3)); return new LogLine(logLineInternalIdGenerator++, dateTime, capturedTexts, - originalLogFile.url().path(), Globals::instance().informationLogLevel(), logMode); + originalLogFile.url().toLocalFile(), Globals::instance().informationLogLevel(), logMode); } }; diff --git a/src/modes/cups/cupsPdfAnalyzer.h b/src/modes/cups/cupsPdfAnalyzer.h index 3552a2d..9063889 100644 --- a/src/modes/cups/cupsPdfAnalyzer.h +++ b/src/modes/cups/cupsPdfAnalyzer.h @@ -99,7 +99,7 @@ protected: LogLevel *logLevel = findLogLevel(capturedTexts.takeAt(0)); return new LogLine(logLineInternalIdGenerator++, dateTime, capturedTexts, - originalLogFile.url().path(), logLevel, logMode); + originalLogFile.url().toLocalFile(), logLevel, logMode); } LogLevel *findLogLevel(const QString &level) diff --git a/src/modes/kernel/kernelAnalyzer.h b/src/modes/kernel/kernelAnalyzer.h index eb5352e..66d2361 100644 --- a/src/modes/kernel/kernelAnalyzer.h +++ b/src/modes/kernel/kernelAnalyzer.h @@ -125,7 +125,7 @@ protected: */ LogLine *line - = new LogLine(logLineInternalIdGenerator++, dateTime, messages, originalLogFile.url().path(), + = new LogLine(logLineInternalIdGenerator++, dateTime, messages, originalLogFile.url().toLocalFile(), Globals::instance().informationLogLevel(), logMode); return line; diff --git a/src/modes/samba/sambaAnalyzer.h b/src/modes/samba/sambaAnalyzer.h index c633064..124c802 100644 --- a/src/modes/samba/sambaAnalyzer.h +++ b/src/modes/samba/sambaAnalyzer.h @@ -136,7 +136,7 @@ protected: LogLine *returnedLogLine = currentLogLine; currentLogLine = new LogLine(logLineInternalIdGenerator++, QDateTime(date, time), list, - originalLogFile.url().path(), + originalLogFile.url().toLocalFile(), Globals::instance().informationLogLevel(), logMode); return returnedLogLine; diff --git a/src/modes/xorg/xorgAnalyzer.cpp b/src/modes/xorg/xorgAnalyzer.cpp index 4affa02..b45b17e 100644 --- a/src/modes/xorg/xorgAnalyzer.cpp +++ b/src/modes/xorg/xorgAnalyzer.cpp @@ -77,7 +77,7 @@ LogLine *XorgAnalyzer::parseMessage(const QString &logLine, const LogFile &origi list.append(logLineType->name()); list.append(string); - return new LogLine(logLineInternalIdGenerator++, currentDateTime, list, originalFile.url().path(), + return new LogLine(logLineInternalIdGenerator++, currentDateTime, list, originalFile.url().toLocalFile(), logLineType, logMode); } diff --git a/src/modes/xsession/xsessionAnalyzer.h b/src/modes/xsession/xsessionAnalyzer.h index 24f44f0..10d06d8 100644 --- a/src/modes/xsession/xsessionAnalyzer.h +++ b/src/modes/xsession/xsessionAnalyzer.h @@ -108,7 +108,7 @@ protected: logLevel = Globals::instance().informationLogLevel(); return new LogLine(logLineInternalIdGenerator++, currentDateTime, QStringList() << program << message, - originalFile.url().path(), logLevel, logMode); + originalFile.url().toLocalFile(), logLevel, logMode); } private: diff --git a/src/modes/xsession/xsessionConfigurationWidget.h b/src/modes/xsession/xsessionConfigurationWidget.h index 8183820..3a582ff 100644 --- a/src/modes/xsession/xsessionConfigurationWidget.h +++ b/src/modes/xsession/xsessionConfigurationWidget.h @@ -89,7 +89,7 @@ public Q_SLOTS: .findLogMode(QStringLiteral(X_SESSION_LOG_MODE_ID)) ->logModeConfiguration(); - configuration->setXSessionPath(xsessionUrlRequester->url().path()); + configuration->setXSessionPath(xsessionUrlRequester->url().toLocalFile()); configuration->setIgnoreXorgErrors(ignoreXorgErrors->isChecked()); } @@ -118,7 +118,7 @@ public Q_SLOTS: protected: bool isValid() const override { - if (xsessionUrlRequester->url().path().isEmpty() == false) { + if (xsessionUrlRequester->url().toLocalFile().isEmpty() == false) { return true; } diff --git a/tests/kernelAnalyzerTest.cpp b/tests/kernelAnalyzerTest.cpp index 120768a..e3787b0 100644 --- a/tests/kernelAnalyzerTest.cpp +++ b/tests/kernelAnalyzerTest.cpp @@ -117,7 +117,7 @@ void KernelAnalyzerTest::testUbuntuDmesg() assertedDateTime = assertedDateTime.addSecs(22); assertedDateTime = assertedDateTime.addMSecs(232); - testUtil.testLine(logLines.at(0), logFiles.at(0).url().path(), Globals::instance().informationLogLevel(), + testUtil.testLine(logLines.at(0), logFiles.at(0).url().toLocalFile(), Globals::instance().informationLogLevel(), assertedDateTime, items); testUtil.destroyReader(kernelAnalyzer); @@ -149,7 +149,7 @@ void KernelAnalyzerTest::testSuseDmesg() QStringList items = QStringList() << QStringLiteral("r8169") << QStringLiteral("eth0: link down"); - testUtil.testLine(logLines.at(0), logFiles.at(0).url().path(), Globals::instance().informationLogLevel(), + testUtil.testLine(logLines.at(0), logFiles.at(0).url().toLocalFile(), Globals::instance().informationLogLevel(), kernelAnalyzer->findStartupTime(), items); testUtil.destroyReader(kernelAnalyzer); diff --git a/tests/systemAnalyzerTest.cpp b/tests/systemAnalyzerTest.cpp index 869b452..64c468d 100644 --- a/tests/systemAnalyzerTest.cpp +++ b/tests/systemAnalyzerTest.cpp @@ -95,7 +95,7 @@ void SystemAnalyzerTest::testOneLine() << QStringLiteral("[11663.656000] eth1: no IPv6 routers present"); const int year = QDate::currentDate().year(); - testUtil.testLine(logLines.at(0), logFiles.at(0).url().path(), logFiles.at(0).defaultLogLevel(), + testUtil.testLine(logLines.at(0), logFiles.at(0).url().toLocalFile(), logFiles.at(0).defaultLogLevel(), QDateTime(QDate(year, 8, 21), QTime(22, 52, 44)), items ); @@ -171,7 +171,7 @@ void SystemAnalyzerTest::testMultipleLines() addedLines << QStringLiteral("Aug 18 17:04:28 localhost test: Test line 1"); addedLines << QStringLiteral("Aug 18 17:04:30 localhost test: Test line 2"); - testUtil.addLogLines(logFile.url().path(), addedLines); + testUtil.addLogLines(logFile.url().toLocalFile(), addedLines); // Assert that the model has been updated QCOMPARE(model->itemCount(), 50); @@ -215,29 +215,29 @@ void SystemAnalyzerTest::testStrangeLines() // Classical log line items = QStringList() << QStringLiteral("localhost") << QStringLiteral("kernel") << QStringLiteral("Kernel panic"); - testUtil.testLine(model->logLines().at(0), logFiles.at(0).url().path(), logFiles.at(0).defaultLogLevel(), + testUtil.testLine(model->logLines().at(0), logFiles.at(0).url().toLocalFile(), logFiles.at(0).defaultLogLevel(), QDateTime(QDate(year, 8, 10), QTime(17, 04, 28)), items); //-- MARK -- log line items = QStringList() << QStringLiteral("localhost") << QStringLiteral("syslog") << QStringLiteral("-- MARK --"); - testUtil.testLine(model->logLines().at(1), logFiles.at(0).url().path(), logFiles.at(0).defaultLogLevel(), + testUtil.testLine(model->logLines().at(1), logFiles.at(0).url().toLocalFile(), logFiles.at(0).defaultLogLevel(), QDateTime(QDate(year, 8, 11), QTime(13, 49, 38)), items); // Last message repeated n time log line items = QStringList() << QStringLiteral("localhost") << QStringLiteral("syslog") << QStringLiteral("last message repeated 4 times"); - testUtil.testLine(model->logLines().at(2), logFiles.at(0).url().path(), logFiles.at(0).defaultLogLevel(), + testUtil.testLine(model->logLines().at(2), logFiles.at(0).url().toLocalFile(), logFiles.at(0).defaultLogLevel(), QDateTime(QDate(year, 8, 12), QTime(18, 10, 32)), items); //"Aug 13 17:04:28 testprocess: Say ouhou " -> No host name items = QStringList() << undefined << QStringLiteral("testprocess") << QStringLiteral("Say ouhou "); - testUtil.testLine(model->logLines().at(3), logFiles.at(0).url().path(), logFiles.at(0).defaultLogLevel(), + testUtil.testLine(model->logLines().at(3), logFiles.at(0).url().toLocalFile(), logFiles.at(0).defaultLogLevel(), QDateTime(QDate(year, 8, 13), QTime(17, 04, 28)), items); //"Aug 14 17:04:28 localhost kernel say ouhou" -> No process name and not a syslog message items = QStringList() << QStringLiteral("localhost") << undefined << QStringLiteral("kernel say ouhou"); - testUtil.testLine(model->logLines().at(4), logFiles.at(0).url().path(), logFiles.at(0).defaultLogLevel(), + testUtil.testLine(model->logLines().at(4), logFiles.at(0).url().toLocalFile(), logFiles.at(0).defaultLogLevel(), QDateTime(QDate(year, 8, 14), QTime(17, 04, 28)), items); //"Aug 15 22:39:01 localhost /USR/SBIN/CRON[9433]: (root) CMD ( [ -d /var/lib/php5 ] && find @@ -246,7 +246,7 @@ void SystemAnalyzerTest::testStrangeLines() << QStringLiteral( "(root) CMD ( [ -d /var/lib/php5 ] && find /var/lib/php5/ -type f -cmin " "+$(/usr/lib/php5/maxlifetime) -print0 | xargs -r -0 rm)"); - testUtil.testLine(model->logLines().at(5), logFiles.at(0).url().path(), logFiles.at(0).defaultLogLevel(), + testUtil.testLine(model->logLines().at(5), logFiles.at(0).url().toLocalFile(), logFiles.at(0).defaultLogLevel(), QDateTime(QDate(year, 8, 15), QTime(22, 39, 01)), items); //"blablalbla" -> Invalid line @@ -321,7 +321,7 @@ void SystemAnalyzerTest::testMaxLines() QStringList addedLines; addedLines << QStringLiteral("Aug 18 10:00:00 localhost test: Line 8"); - testUtil.addLogLines(logFile.url().path(), addedLines); + testUtil.addLogLines(logFile.url().toLocalFile(), addedLines); QCOMPARE(model->itemCount(), 5); compareWithMinTime(model->logLines(), QDateTime(QDate(2007, 8, 18), QTime(11, 0, 0))); @@ -332,7 +332,7 @@ void SystemAnalyzerTest::testMaxLines() addedLines.clear(); addedLines << QStringLiteral("Aug 18 10:00:00 localhost test: Line 9"); addedLines << QStringLiteral("Aug 18 19:00:00 localhost test: Line 10"); - testUtil.addLogLines(logFile.url().path(), addedLines); + testUtil.addLogLines(logFile.url().toLocalFile(), addedLines); QCOMPARE(model->itemCount(), 6); compareWithMinTime(model->logLines(), QDateTime(QDate(2007, 8, 18), QTime(11, 0, 0))); @@ -340,7 +340,7 @@ void SystemAnalyzerTest::testMaxLines() addedLines.clear(); addedLines << QStringLiteral("Aug 18 20:00:00 localhost test: Line 11"); addedLines << QStringLiteral("Aug 18 21:00:00 localhost test: Line 12"); - testUtil.addLogLines(logFile.url().path(), addedLines); + testUtil.addLogLines(logFile.url().toLocalFile(), addedLines); QCOMPARE(model->itemCount(), 6); compareWithMinTime(model->logLines(), QDateTime(QDate(2007, 8, 18), QTime(13, 0, 0))); -- GitLab