Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-24 02:42:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kio: merge KRun overloads

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2016-04-30 02:33:42 +00:00
parent 344cd812dc
commit 1b558d29f3
2 changed files with 7 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
kio/kio/krun.cpp
View file

@ -992,11 +992,6 @@ bool KRun::run(const QString& _exec, const KUrl::List& _urls, QWidget* window, c
return run(*service, _urls, window, false, QString(), asn);
}
bool KRun::runCommand(const QString &cmd, QWidget* window)
{
return runCommand(cmd, window, QString());
}
bool KRun::runCommand(const QString& cmd, QWidget* window, const QString& workingDirectory)
{
if (cmd.isEmpty()) {
@ -1014,11 +1009,6 @@ bool KRun::runCommand(const QString& cmd, QWidget* window, const QString& workin
return KRun::runCommand(cmd, bin, bin /*iconName*/, window, QByteArray(), workingDirectory);
}
bool KRun::runCommand(const QString& cmd, const QString &execName, const QString & iconName, QWidget* window, const QByteArray& asn)
{
return runCommand(cmd, execName, iconName, window, asn, QString());
}
bool KRun::runCommand(const QString& cmd, const QString &execName, const QString & iconName,
QWidget* window, const QByteArray& asn, const QString& workingDirectory)
{

29
kio/kio/krun.h
View file

@ -256,18 +256,12 @@ public:
* @p cmd must be a shell command. You must not append "&"
* to it, since the function will do that for you.
* @param window The top-level widget of the app that invoked this object.
* @param workingDirectory a working directory, so that a command like
* "kwrite file.txt" finds file.txt from the right place.
*
* @return @c true on success, @c false on error
*/
static bool runCommand(const QString &cmd, QWidget* window);
/**
* Overload that also takes a working directory, so that a command like
* "kwrite file.txt" finds file.txt from the right place.
* @since 4.4
*/
static bool runCommand(const QString &cmd, QWidget* window, const QString& workingDirectory);
// TODO KDE5: merge the above with 2-args runCommand, using QString()
static bool runCommand(const QString &cmd, QWidget* window, const QString& workingDirectory = QString());
/**
* Same as the other runCommand(), but it also takes the name of the
@ -279,22 +273,13 @@ public:
* @param icon icon for app starting notification
* @param window The top-level widget of the app that invoked this object.
* @param asn Application startup notification id, if any (otherwise "").
* @param workingDirectory the working directory for the started process. The default
* (if passing an empty string) is the user's document path.
* @return @c true on success, @c false on error
*/
static bool runCommand(const QString& cmd, const QString& execName,
const QString & icon, QWidget* window, const QByteArray& asn = QByteArray());
/**
* Overload that also takes a working directory, so that a command like
* "kwrite file.txt" finds file.txt from the right place.
* @param workingDirectory the working directory for the started process. The default
* (if passing an empty string) is the user's document path.
* @since 4.4
*/
static bool runCommand(const QString& cmd, const QString & execName,
const QString & icon, QWidget* window,
const QByteArray& asn, const QString& workingDirectory);
// TODO KDE5: merge the above with 5-args runCommand, using QString()
const QString& icon, QWidget* window, const QByteArray& asn = QByteArray(),
const QString& workingDirectory = QString());
/**
* Display the Open-With dialog for those URLs, and run the chosen application.