From ba71ca2a540b6de9bad09dc6d8d5a536e172d759 Mon Sep 17 00:00:00 2001
From: Akira Ohgaki <akiraohgaki@gmail.com>
Date: Mon, 17 Oct 2016 09:52:31 +0900
Subject: [PATCH] Private method
---
src/utility/package.cpp | 32 ++++++++++++++++----------------
src/utility/package.h | 4 +++-
2 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/src/utility/package.cpp b/src/utility/package.cpp
index eb2e58c..7cd2668 100644
--- a/src/utility/package.cpp
+++ b/src/utility/package.cpp
@@ -9,23 +9,12 @@ namespace Utility {
Package::Package(QObject *parent) : QObject(parent)
{}
-bool Package::process(const QString &program, const QStringList &arguments)
-{
- QProcess process;
- process.start(program, arguments);
- if (process.waitForFinished()) {
- process.waitForReadyRead();
- return true;
- }
- return false;
-}
-
bool Package::installProgram(const QString &path, const QString &targetPath)
{
QString program = "install";
QStringList arguments;
arguments << "-m" << "755" << "-p" << path << targetPath;
- return process(program, arguments);
+ return _process(program, arguments);
}
bool Package::installFile(const QString &path, const QString &targetPath)
@@ -33,7 +22,7 @@ bool Package::installFile(const QString &path, const QString &targetPath)
QString program = "install";
QStringList arguments;
arguments << "-m" << "644" << "-p" << path << targetPath;
- return process(program, arguments);
+ return _process(program, arguments);
}
bool Package::installPlasmapkg(const QString &path, const QString &type)
@@ -41,7 +30,7 @@ bool Package::installPlasmapkg(const QString &path, const QString &type)
QString program = "plasmapkg2";
QStringList arguments;
arguments << "-t" << type << "-i" << path;
- return process(program, arguments);
+ return _process(program, arguments);
}
bool Package::uninstallPlasmapkg(const QString &path, const QString &type)
@@ -49,7 +38,7 @@ bool Package::uninstallPlasmapkg(const QString &path, const QString &type)
QString program = "plasmapkg2";
QStringList arguments;
arguments << "-t" << type << "-r" << path;
- return process(program, arguments);
+ return _process(program, arguments);
}
bool Package::uncompressArchive(const QString &path, const QString &targetDir)
@@ -100,10 +89,21 @@ bool Package::uncompressArchive(const QString &path, const QString &targetDir)
arguments << "e" << path << targetDir;
}
- return process(program, arguments);
+ return _process(program, arguments);
}
return false;
}
+bool Package::_process(const QString &program, const QStringList &arguments)
+{
+ QProcess process;
+ process.start(program, arguments);
+ if (process.waitForFinished()) {
+ process.waitForReadyRead();
+ return true;
+ }
+ return false;
+}
+
} // namespace Utility
diff --git a/src/utility/package.h b/src/utility/package.h
index 6300962..04f8180 100644
--- a/src/utility/package.h
+++ b/src/utility/package.h
@@ -12,12 +12,14 @@ class Package : public QObject
public:
explicit Package(QObject *parent = 0);
- static bool process(const QString &program, const QStringList &arguments);
static bool installProgram(const QString &path, const QString &targetPath);
static bool installFile(const QString &path, const QString &targetPath);
static bool installPlasmapkg(const QString &path, const QString &type = "plasmoid");
static bool uninstallPlasmapkg(const QString &path, const QString &type = "plasmoid");
static bool uncompressArchive(const QString &path, const QString &targetDir);
+
+private:
+ static bool _process(const QString &program, const QStringList &arguments);
};
} // namespace Utility
--
GitLab