diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:23:57 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:23:57 -0600 |
| commit | 2877440fbda2e245d04f534ed51d7cb7c0a06482 (patch) | |
| tree | 874d2d10bf56b0547de792b6b6d48c4e895be034 /kwallet | |
| parent | 6fdacb9c2e3adb3b5da38cd8a22afc1668e1d36b (diff) | |
| download | tdeutils-2877440fbda2e245d04f534ed51d7cb7c0a06482.tar.gz tdeutils-2877440fbda2e245d04f534ed51d7cb7c0a06482.zip | |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kwallet')
| -rw-r--r-- | kwallet/konfigurator/konfigurator.cpp | 2 | ||||
| -rw-r--r-- | kwallet/kwalletmanager.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kwallet/konfigurator/konfigurator.cpp b/kwallet/konfigurator/konfigurator.cpp index 67c1c90..44e2844 100644 --- a/kwallet/konfigurator/konfigurator.cpp +++ b/kwallet/konfigurator/konfigurator.cpp @@ -164,7 +164,7 @@ void KWalletConfig::newNetworkWallet() { void KWalletConfig::launchManager() { if (!DCOPClient::mainClient()->isApplicationRegistered("kwalletmanager")) { - KApplication::startServiceByDesktopName("kwalletmanager_show"); + TDEApplication::startServiceByDesktopName("kwalletmanager_show"); } else { DCOPRef r("kwalletmanager", "kwalletmanager-mainwindow#1"); r.send("show"); diff --git a/kwallet/kwalletmanager.cpp b/kwallet/kwalletmanager.cpp index 38c525b..d73cba2 100644 --- a/kwallet/kwalletmanager.cpp +++ b/kwallet/kwalletmanager.cpp @@ -52,7 +52,7 @@ KWalletManager::KWalletManager(TQWidget *parent, const char *name, WFlags f) _kwalletdLaunch = false; TQAccel *accel = new TQAccel(this, "kwalletmanager"); - KApplication::dcopClient()->setQtBridgeEnabled(false); + TDEApplication::dcopClient()->setQtBridgeEnabled(false); _shuttingDown = false; KConfig cfg("kwalletrc"); // not sure why this setting isn't in kwalletmanagerrc... KConfigGroup walletConfigGroup(&cfg, "Wallet"); @@ -399,7 +399,7 @@ void KWalletManager::shuttingDown() { void KWalletManager::setupWallet() { - KApplication::startServiceByDesktopName("kwallet_config"); + TDEApplication::startServiceByDesktopName("kwallet_config"); } |