diff --git a/src/ProcessInfo.cpp b/src/ProcessInfo.cpp index 89bcbdac7..2844d9f57 100644 --- a/src/ProcessInfo.cpp +++ b/src/ProcessInfo.cpp @@ -329,9 +329,8 @@ NullProcessInfo::NullProcessInfo(int aPid, const QString& /*titleFormat*/) { } -bool NullProcessInfo::readProcessInfo(int /*pid*/) +void NullProcessInfo::readProcessInfo(int /*pid*/) { - return false; } bool NullProcessInfo::readCurrentDir(int /*pid*/) @@ -350,18 +349,16 @@ UnixProcessInfo::UnixProcessInfo(int aPid, const QString& titleFormat) setUserNameRequired(titleFormat.contains(QLatin1String("%u"))); } -bool UnixProcessInfo::readProcessInfo(int aPid) +void UnixProcessInfo::readProcessInfo(int aPid) { // prevent _arguments from growing longer and longer each time this // method is called. clearArguments(); - bool ok = readProcInfo(aPid); - if (ok) { - ok |= readArguments(aPid); - ok |= readCurrentDir(aPid); + if (readProcInfo(aPid)) { + readArguments(aPid); + readCurrentDir(aPid); } - return ok; } void UnixProcessInfo::readUserName() diff --git a/src/ProcessInfo.h b/src/ProcessInfo.h index 08f1efff1..dbb0a5a53 100644 --- a/src/ProcessInfo.h +++ b/src/ProcessInfo.h @@ -218,7 +218,7 @@ protected: * * @param pid The process id of the process to read */ - virtual bool readProcessInfo(int pid) = 0; + virtual void readProcessInfo(int pid) = 0; /** * Determine the current directory of the process. @@ -306,7 +306,7 @@ public: */ explicit NullProcessInfo(int pid, const QString& titleFormat); protected: - bool readProcessInfo(int pid) Q_DECL_OVERRIDE; + void readProcessInfo(int pid) Q_DECL_OVERRIDE; bool readCurrentDir(int pid) Q_DECL_OVERRIDE; void readUserName(void) Q_DECL_OVERRIDE; }; @@ -330,7 +330,7 @@ protected: * Implementation of ProcessInfo::readProcessInfo(); calls the * four private methods below in turn. */ - bool readProcessInfo(int pid ) Q_DECL_OVERRIDE; + void readProcessInfo(int pid ) Q_DECL_OVERRIDE; void readUserName(void) Q_DECL_OVERRIDE;