applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-29 18:35:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

i18n: drop superfluous QObject* parent

Browse source 
These additional pointers were introduced for translations,
and needed their own tricks to get lupdate to recognize the
strings. Using QCoreApplication::translate() removes the
need to a QObject to provide context. Drop the now-unneeded
parameters.
This commit is contained in:
Adriaan de Groot 2018-02-07 17:12:49 +01:00
parent c71385e93f
commit d27675d660
10 changed files with 19 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/libcalamares/utils/CalamaresUtilsSystem.h
View file

@ -41,7 +41,6 @@ public:
/** @brief Explain a typical external process failure.
*
* @param parent Used as context for translation calls.
* @param errorCode Return code from runCommand() or similar
* (negative values get special explanation). The member
* function uses the exit code stored in the ProcessResult
@ -53,18 +52,18 @@ public:
* @param timeout Timeout passed to the process runner, for explaining
* error code -4 (timeout).
*/
static Calamares::JobResult explainProcess( const QObject* parent, int errorCode, const QString& command, const QString& output, int timeout );
static Calamares::JobResult explainProcess( int errorCode, const QString& command, const QString& output, int timeout );
/// @brief Convenience wrapper for explainProcess()
inline Calamares::JobResult explainProcess( const QObject* parent, const QString& command, int timeout ) const
inline Calamares::JobResult explainProcess( const QString& command, int timeout ) const
{
return explainProcess( parent, getExitCode(), command, getOutput(), timeout );
return explainProcess( getExitCode(), command, getOutput(), timeout );
}
/// @brief Convenience wrapper for explainProcess()
inline Calamares::JobResult explainProcess( const QObject* parent, const QStringList& command, int timeout ) const
inline Calamares::JobResult explainProcess( const QStringList& command, int timeout ) const
{
return explainProcess( parent, getExitCode(), command.join( ' ' ), getOutput(), timeout );
return explainProcess( getExitCode(), command.join( ' ' ), getOutput(), timeout );
}
} ;