summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/en/index.docbook4
-rw-r--r--katapult/katapult/katapult.cpp6
-rw-r--r--katapult/katapult/katapultsettings.cpp16
-rw-r--r--katapult/katapult/main.cpp4
-rw-r--r--katapult/plugins/catalogs/amarokcatalog/actionplaysong.cpp2
-rw-r--r--katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp6
-rw-r--r--katapult/plugins/catalogs/spellcatalog/spelling.cpp2
7 files changed, 20 insertions, 20 deletions
diff --git a/doc/en/index.docbook b/doc/en/index.docbook
index 04226d6..6f0eb30 100644
--- a/doc/en/index.docbook
+++ b/doc/en/index.docbook
@@ -60,7 +60,7 @@ Please at least include KDE, the KDE package it is in, the name
</para>
</chapter>
-<chapter id="using-kapp">
+<chapter id="using-tdeApp">
<title>Using &katapult;</title>
<sect1 id="starting">
<title>Starting &katapult;</title>
@@ -421,7 +421,7 @@ Please at least include KDE, the KDE package it is in, the name
<appendix id="installation">
<title>Installation</title>
- <sect1 id="getting-kapp">
+ <sect1 id="getting-tdeApp">
<title>How to obtain &katapult;</title>
<sect2>
<title>KDE Subversion</title>
diff --git a/katapult/katapult/katapult.cpp b/katapult/katapult/katapult.cpp
index 361cf40..a094571 100644
--- a/katapult/katapult/katapult.cpp
+++ b/katapult/katapult/katapult.cpp
@@ -48,8 +48,8 @@ Katapult::Katapult()
KSystemTray(0, "katapultSysTray")
{
// Register with DCOP
- kapp->dcopClient()->registerAs("katapult", false);
- kapp->dcopClient()->setDefaultObject(objId());
+ tdeApp->dcopClient()->registerAs("katapult", false);
+ tdeApp->dcopClient()->setDefaultObject(objId());
setPixmap(TDEGlobal::iconLoader()->loadIcon("katapult", TDEIcon::Small));
@@ -85,7 +85,7 @@ Katapult::Katapult()
if (!settings->hideNotification()) {
TQString msg = i18n("Application successfully started !\nPress %1 to use it...")
.arg(globalAccel->shortcut("show_katapult").toString());
- KPassivePopup::message(i18n("Katapult Notification"), msg, kapp->miniIcon(), this, 0, settings->notificationTimeout());
+ KPassivePopup::message(i18n("Katapult Notification"), msg, tdeApp->miniIcon(), this, 0, settings->notificationTimeout());
}
}
diff --git a/katapult/katapult/katapultsettings.cpp b/katapult/katapult/katapultsettings.cpp
index a3abe40..a909f0a 100644
--- a/katapult/katapult/katapultsettings.cpp
+++ b/katapult/katapult/katapultsettings.cpp
@@ -59,7 +59,7 @@ KatapultSettings::~KatapultSettings()
void KatapultSettings::readSettings()
{
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
_hideSessionNotification = config->readNumEntry("HideSessionNotification", 1);
_hideUserNotification = config->readNumEntry("HideUserNotification", 0);
_notificationTimeout = config->readNumEntry("NotificationTimeout", 5000);
@@ -77,18 +77,18 @@ void KatapultSettings::readSettings()
// Force a config write if notification is to be shown once.
// (in writeSettings(), _hideSessionNotification or _hideUserNotification
// is changed before writing [if necessary]).
- _forceWrite = ((kapp->isSessionRestored() && _hideSessionNotification == 1) ||
- (!kapp->isSessionRestored() && _hideUserNotification == 1));
+ _forceWrite = ((tdeApp->isSessionRestored() && _hideSessionNotification == 1) ||
+ (!tdeApp->isSessionRestored() && _hideUserNotification == 1));
}
void KatapultSettings::writeSettings()
{
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
int hideSession = _hideSessionNotification;
int hideUser = _hideUserNotification;
// If notification had to be shown once, set it to hide always.
- if (kapp->isSessionRestored()) {
+ if (tdeApp->isSessionRestored()) {
if (hideSession == 1) hideSession = 2;
} else {
if (hideUser == 1) hideUser = 2;
@@ -206,7 +206,7 @@ void KatapultSettings::setSystrayIcon(bool _systrayIcon)
bool KatapultSettings::hideNotification() const
{
- int hide = kapp->isSessionRestored() ? _hideSessionNotification : _hideUserNotification;
+ int hide = tdeApp->isSessionRestored() ? _hideSessionNotification : _hideUserNotification;
return (hide != 0 && hide != 1);
}
@@ -323,7 +323,7 @@ void KatapultSettings::loadCatalogPlugins()
(service, 0, 0, TQStringList(), &errCode);
if(catalog != 0)
{
- TDEConfigGroup group(kapp->config(), TQString("Catalogs/%1").arg(id));
+ TDEConfigGroup group(tdeApp->config(), TQString("Catalogs/%1").arg(id));
catalog->readSettings(&group);
catalog->initialize();
_activeCatalogs.insert(id, catalog);
@@ -364,7 +364,7 @@ void KatapultSettings::loadDisplayPlugins()
}
if(_display != 0)
{
- TDEConfigGroup group(kapp->config(), TQString("Displays/%1").arg(_displayName));
+ TDEConfigGroup group(tdeApp->config(), TQString("Displays/%1").arg(_displayName));
_display->readSettings(&group);
}
}
diff --git a/katapult/katapult/main.cpp b/katapult/katapult/main.cpp
index a04bf70..323bfb6 100644
--- a/katapult/katapult/main.cpp
+++ b/katapult/katapult/main.cpp
@@ -51,8 +51,8 @@ int main(int argc, char **argv)
TDECmdLineArgs::addCmdLineOptions( options );
TDEApplication app;
- if(kapp->dcopClient()->isApplicationRegistered("katapult")) {
- kapp->dcopClient()->send("katapult", "Katapult", "showLauncher()", TQByteArray());
+ if(tdeApp->dcopClient()->isApplicationRegistered("katapult")) {
+ tdeApp->dcopClient()->send("katapult", "Katapult", "showLauncher()", TQByteArray());
app.setStartupId("");
return(0);
}
diff --git a/katapult/plugins/catalogs/amarokcatalog/actionplaysong.cpp b/katapult/plugins/catalogs/amarokcatalog/actionplaysong.cpp
index a124dec..e20329e 100644
--- a/katapult/plugins/catalogs/amarokcatalog/actionplaysong.cpp
+++ b/katapult/plugins/catalogs/amarokcatalog/actionplaysong.cpp
@@ -54,5 +54,5 @@ void ActionPlaySong::execute(const KatapultItem *item) const
TQByteArray buffer;
TQDataStream stream(buffer, IO_WriteOnly);
stream << song->url();
- kapp->dcopClient()->send("amarok", "playlist", "playMedia(KURL)", buffer);
+ tdeApp->dcopClient()->send("amarok", "playlist", "playMedia(KURL)", buffer);
}
diff --git a/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp b/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp
index b20fb5d..9f7d388 100644
--- a/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp
+++ b/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp
@@ -98,7 +98,7 @@ void AmarokCatalog::queryChanged()
TQCString replyType;
TQDataStream arg(sqlQueryData, IO_WriteOnly);
arg << sqlQuery;
- if (!kapp->dcopClient()->call("amarok", "collection", "query(TQString)",
+ if (!tdeApp->dcopClient()->call("amarok", "collection", "query(TQString)",
sqlQueryData, replyType, replyData)) {
newStatus = 0;
} else {
@@ -173,7 +173,7 @@ void AmarokCatalog::queryChanged()
TQCString replyType;
TQDataStream arg(sqlQueryData, IO_WriteOnly);
arg << sqlQuery;
- if (!kapp->dcopClient()->call("amarok", "collection", "query(TQString)",
+ if (!tdeApp->dcopClient()->call("amarok", "collection", "query(TQString)",
sqlQueryData, replyType, replyData)) {
newStatus = 0;
} else {
@@ -272,7 +272,7 @@ void AmarokCatalog::checkCollectionType()
TQCString replyType;
TQDataStream arg(sqlQueryData, IO_WriteOnly);
arg << sqlQuery;
- if (!kapp->dcopClient()->call("amarok", "collection", "query(TQString)", sqlQueryData, replyType, replyData))
+ if (!tdeApp->dcopClient()->call("amarok", "collection", "query(TQString)", sqlQueryData, replyType, replyData))
{
_gotCollectionStatus = false;
diff --git a/katapult/plugins/catalogs/spellcatalog/spelling.cpp b/katapult/plugins/catalogs/spellcatalog/spelling.cpp
index 6a1c4af..9f54fca 100644
--- a/katapult/plugins/catalogs/spellcatalog/spelling.cpp
+++ b/katapult/plugins/catalogs/spellcatalog/spelling.cpp
@@ -111,7 +111,7 @@ void Spelling::evaluate() const
spellChecker->checkWord(text);
while (corrected == false) {
- kapp->processEvents();
+ tdeApp->processEvents();
}
if (misspelt) {
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-22 05:43:12 +0000