summaryrefslogtreecommitdiffstats
path: root/src/sdk
diff options
context:
space:
mode:
authorKarsten Heimrich <karsten.heimrich@theqtcompany.com>2015-09-01 14:00:17 +0200
committerNiels Weber <niels.weber@theqtcompany.com>2015-09-07 10:41:45 +0000
commitcab3405ad2b0d269924a93263298304bff8807eb (patch)
tree2cc70eac08d78376998e8406ed41211b42598449 /src/sdk
parent823efa49cc61e91d7deb7b14d0bc05991c142474 (diff)
Missed to rename classes and to update docs and tests.
Change-Id: I2d79ab4094cb9706287d44160543c19b35a66c95 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Diffstat (limited to 'src/sdk')
-rw-r--r--src/sdk/installerbase.cpp6
-rw-r--r--src/sdk/main.cpp2
-rw-r--r--src/sdk/settingsdialog.cpp2
-rw-r--r--src/sdk/translations/de.ts4
-rw-r--r--src/sdk/translations/en.ts2
-rw-r--r--src/sdk/translations/fr.ts4
-rw-r--r--src/sdk/translations/it.ts4
-rw-r--r--src/sdk/translations/ja.ts4
-rw-r--r--src/sdk/translations/pl.ts4
-rw-r--r--src/sdk/translations/ru.ts4
-rw-r--r--src/sdk/translations/zh_cn.ts4
-rw-r--r--src/sdk/updatechecker.cpp6
12 files changed, 23 insertions, 23 deletions
diff --git a/src/sdk/installerbase.cpp b/src/sdk/installerbase.cpp
index 38ff0e406..f115ddb41 100644
--- a/src/sdk/installerbase.cpp
+++ b/src/sdk/installerbase.cpp
@@ -76,13 +76,13 @@ InstallerBase::~InstallerBase()
int InstallerBase::run()
{
- KDRunOnceChecker runCheck(qApp->applicationDirPath() + QLatin1String("/lockmyApp1234865.lock"));
- if (runCheck.isRunning(KDRunOnceChecker::ConditionFlag::Lockfile)) {
+ RunOnceChecker runCheck(qApp->applicationDirPath() + QLatin1String("/lockmyApp1234865.lock"));
+ if (runCheck.isRunning(RunOnceChecker::ConditionFlag::Lockfile)) {
// It is possible to install an application and thus the maintenance tool into a
// directory that requires elevated permission to create a lock file. Since this
// cannot be done without requesting credentials from the user, we silently ignore
// the fact that we could not create the lock file and check the running processes.
- if (runCheck.isRunning(KDRunOnceChecker::ConditionFlag::ProcessList)) {
+ if (runCheck.isRunning(RunOnceChecker::ConditionFlag::ProcessList)) {
QInstaller::MessageBoxHandler::information(0, QLatin1String("AlreadyRunning"),
QString::fromLatin1("Waiting for %1").arg(qAppName()),
QString::fromLatin1("Another %1 instance is already running. Wait "
diff --git a/src/sdk/main.cpp b/src/sdk/main.cpp
index feea95a37..c0d4891b4 100644
--- a/src/sdk/main.cpp
+++ b/src/sdk/main.cpp
@@ -201,7 +201,7 @@ int main(int argc, char *argv[])
if (QInstaller::isVerbose())
std::cout << VERSION << std::endl << BUILDDATE << std::endl << SHA << std::endl;
- const KDSelfRestarter restarter(argc, argv);
+ const SelfRestarter restarter(argc, argv);
return InstallerBase(argc, argv).run();
} catch (const QInstaller::Error &e) {
diff --git a/src/sdk/settingsdialog.cpp b/src/sdk/settingsdialog.cpp
index c2e0cc27a..4f2f41e69 100644
--- a/src/sdk/settingsdialog.cpp
+++ b/src/sdk/settingsdialog.cpp
@@ -342,7 +342,7 @@ void SettingsDialog::testRepository()
msgBox.setWindowModality(Qt::WindowModal);
msgBox.setDetailedText(testJob.errorString());
- const bool isError = (testJob.error() > KDJob::NoError);
+ const bool isError = (testJob.error() > Job::NoError);
const bool isEnabled = current->data(1, Qt::CheckStateRole).toBool();
msgBox.setText(isError
diff --git a/src/sdk/translations/de.ts b/src/sdk/translations/de.ts
index 33adc97c6..32cc79e40 100644
--- a/src/sdk/translations/de.ts
+++ b/src/sdk/translations/de.ts
@@ -131,14 +131,14 @@
</message>
</context>
<context>
- <name>KDJob</name>
+ <name>Job</name>
<message>
<source>Canceled</source>
<translation>Abgebrochen</translation>
</message>
</context>
<context>
- <name>KDLockFile</name>
+ <name>LockFile</name>
<message>
<source>Cannot create lock file &apos;%1&apos;: %2</source>
<translation>Konnte keine Sperrdatei %1 anlegen. Fehlermeldung: %2</translation>
diff --git a/src/sdk/translations/en.ts b/src/sdk/translations/en.ts
index 653a91a81..c559cb93e 100644
--- a/src/sdk/translations/en.ts
+++ b/src/sdk/translations/en.ts
@@ -67,7 +67,7 @@
</message>
</context>
<context>
- <name>KDJob</name>
+ <name>Job</name>
<message>
<source>Canceled</source>
<translation type="unfinished"></translation>
diff --git a/src/sdk/translations/fr.ts b/src/sdk/translations/fr.ts
index 615dcc5cf..c0351120f 100644
--- a/src/sdk/translations/fr.ts
+++ b/src/sdk/translations/fr.ts
@@ -131,14 +131,14 @@
</message>
</context>
<context>
- <name>KDJob</name>
+ <name>Job</name>
<message>
<source>Canceled</source>
<translation>Annulé</translation>
</message>
</context>
<context>
- <name>KDLockFile</name>
+ <name>LockFile</name>
<message>
<source>Cannot create lock file &apos;%1&apos;: %2</source>
<translation>Impossible de poser un fichier de verrouillage &apos;%1&apos; : %2</translation>
diff --git a/src/sdk/translations/it.ts b/src/sdk/translations/it.ts
index 17ec711f1..91458b78e 100644
--- a/src/sdk/translations/it.ts
+++ b/src/sdk/translations/it.ts
@@ -131,14 +131,14 @@
</message>
</context>
<context>
- <name>KDJob</name>
+ <name>Job</name>
<message>
<source>Canceled</source>
<translation>Annullato</translation>
</message>
</context>
<context>
- <name>KDLockFile</name>
+ <name>LockFile</name>
<message>
<source>Cannot create lock file &apos;%1&apos;: %2</source>
<translation>Impossibile creare il file &apos;%1&apos;: %2</translation>
diff --git a/src/sdk/translations/ja.ts b/src/sdk/translations/ja.ts
index f4d7e102b..facd4c0a7 100644
--- a/src/sdk/translations/ja.ts
+++ b/src/sdk/translations/ja.ts
@@ -25,7 +25,7 @@
</message>
</context>
<context>
- <name>KDJob</name>
+ <name>Job</name>
<message>
<source>Canceled</source>
<translation>キャンセルしました</translation>
@@ -2626,7 +2626,7 @@ as root and then clicking OK.</source>
</message>
</context>
<context>
- <name>KDLockFile</name>
+ <name>LockFile</name>
<message>
<source>Cannot create lock file &apos;%1&apos;: %2</source>
<translation>ロックファイル &apos;%1&apos; を作成できませんでした: %2</translation>
diff --git a/src/sdk/translations/pl.ts b/src/sdk/translations/pl.ts
index 3de7f4678..98af6f62d 100644
--- a/src/sdk/translations/pl.ts
+++ b/src/sdk/translations/pl.ts
@@ -131,14 +131,14 @@
</message>
</context>
<context>
- <name>KDJob</name>
+ <name>Job</name>
<message>
<source>Canceled</source>
<translation>Anulowano</translation>
</message>
</context>
<context>
- <name>KDLockFile</name>
+ <name>LockFile</name>
<message>
<source>Cannot create lock file &apos;%1&apos;: %2</source>
<translation>Nie można zablokować pliku &quot;%1&quot;: %2</translation>
diff --git a/src/sdk/translations/ru.ts b/src/sdk/translations/ru.ts
index 57f2c9ba4..81ebdb00e 100644
--- a/src/sdk/translations/ru.ts
+++ b/src/sdk/translations/ru.ts
@@ -131,14 +131,14 @@
</message>
</context>
<context>
- <name>KDJob</name>
+ <name>Job</name>
<message>
<source>Canceled</source>
<translation>Отменено</translation>
</message>
</context>
<context>
- <name>KDLockFile</name>
+ <name>LockFile</name>
<message>
<source>Cannot create lock file &apos;%1&apos;: %2</source>
<translation>Не удалось создать файл блокировки «%1»: %2</translation>
diff --git a/src/sdk/translations/zh_cn.ts b/src/sdk/translations/zh_cn.ts
index f3f4d0565..a826448d9 100644
--- a/src/sdk/translations/zh_cn.ts
+++ b/src/sdk/translations/zh_cn.ts
@@ -131,14 +131,14 @@
</message>
</context>
<context>
- <name>KDJob</name>
+ <name>Job</name>
<message>
<source>Canceled</source>
<translation>已取消</translation>
</message>
</context>
<context>
- <name>KDLockFile</name>
+ <name>LockFile</name>
<message>
<source>Cannot create lock file &apos;%1&apos;: %2</source>
<translation>无法创建锁文件“%1”:%2</translation>
diff --git a/src/sdk/updatechecker.cpp b/src/sdk/updatechecker.cpp
index ea0427098..7c10cec19 100644
--- a/src/sdk/updatechecker.cpp
+++ b/src/sdk/updatechecker.cpp
@@ -54,13 +54,13 @@ UpdateChecker::UpdateChecker(int &argc, char *argv[])
int UpdateChecker::check()
{
- KDRunOnceChecker runCheck(qApp->applicationDirPath() + QLatin1String("/lockmyApp15021976.lock"));
- if (runCheck.isRunning(KDRunOnceChecker::ConditionFlag::Lockfile)) {
+ RunOnceChecker runCheck(qApp->applicationDirPath() + QLatin1String("/lockmyApp15021976.lock"));
+ if (runCheck.isRunning(RunOnceChecker::ConditionFlag::Lockfile)) {
// It is possible to install an application and thus the maintenance tool into a
// directory that requires elevated permission to create a lock file. Since this
// cannot be done without requesting credentials from the user, we silently ignore
// the fact that we could not create the lock file and check the running processes.
- if (runCheck.isRunning(KDRunOnceChecker::ConditionFlag::ProcessList))
+ if (runCheck.isRunning(RunOnceChecker::ConditionFlag::ProcessList))
throw QInstaller::Error(QLatin1String("An instance is already checking for updates."));
}