diff options
Diffstat (limited to 'interfaces')
| -rw-r--r-- | interfaces/kspeech/kspeech.h | 4 | ||||
| -rw-r--r-- | interfaces/tdeimproxy/library/tdeimproxy.cpp | 6 | ||||
| -rw-r--r-- | interfaces/tdescript/sample/shellscript.cpp | 2 | ||||
| -rw-r--r-- | interfaces/tdescript/scriptloader.cpp | 2 | ||||
| -rw-r--r-- | interfaces/tdescript/scriptmanager.cpp | 2 | ||||
| -rw-r--r-- | interfaces/tdetexteditor/editorchooser.cpp | 8 |
6 files changed, 12 insertions, 12 deletions
diff --git a/interfaces/kspeech/kspeech.h b/interfaces/kspeech/kspeech.h index c926b2602..0c541e9e2 100644 --- a/interfaces/kspeech/kspeech.h +++ b/interfaces/kspeech/kspeech.h @@ -306,11 +306,11 @@ * @verbatim // Register DCOP client. - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); if (!client->isRegistered()) { client->attach(); - client->registerAs(kapp->name()); + client->registerAs(tdeApp->name()); } // Connect KTTSD DCOP signals to our slots. connectDCOPSignal("kttsd", "KSpeech", diff --git a/interfaces/tdeimproxy/library/tdeimproxy.cpp b/interfaces/tdeimproxy/library/tdeimproxy.cpp index 022737ed4..7e956f718 100644 --- a/interfaces/tdeimproxy/library/tdeimproxy.cpp +++ b/interfaces/tdeimproxy/library/tdeimproxy.cpp @@ -492,7 +492,7 @@ void KIMProxy::chatWithContact( const TQString& uid ) { if ( KIMIface_stub* s = stubForUid( uid ) ) { - kapp->updateRemoteUserTimestamp( s->app() ); + tdeApp->updateRemoteUserTimestamp( s->app() ); s->chatWithContact( uid ); } } @@ -505,7 +505,7 @@ void KIMProxy::messageContact( const TQString& uid, const TQString& message ) { if ( KIMIface_stub* s = stubForUid( uid ) ) { - kapp->updateRemoteUserTimestamp( s->app() ); + tdeApp->updateRemoteUserTimestamp( s->app() ); s->messageContact( uid, message ); } } @@ -521,7 +521,7 @@ void KIMProxy::sendFile(const TQString &uid, const KURL &sourceURL, const TQStri { if ( it.current()->canReceiveFiles( uid ) ) { - kapp->updateRemoteUserTimestamp( it.current()->app() ); + tdeApp->updateRemoteUserTimestamp( it.current()->app() ); it.current()->sendFile( uid, sourceURL, altFileName, fileSize ); break; } diff --git a/interfaces/tdescript/sample/shellscript.cpp b/interfaces/tdescript/sample/shellscript.cpp index 64cf89bb8..13b634cc6 100644 --- a/interfaces/tdescript/sample/shellscript.cpp +++ b/interfaces/tdescript/sample/shellscript.cpp @@ -50,7 +50,7 @@ TQString ShellScript::script() const void ShellScript::setScript( const TQString &scriptFile ) { m_scriptName = scriptFile; - *m_script << "sh" << m_scriptName << kapp->dcopClient()->appId(); + *m_script << "sh" << m_scriptName << tdeApp->dcopClient()->appId(); } void ShellScript::setScript( const TQString &, const TQString & ) diff --git a/interfaces/tdescript/scriptloader.cpp b/interfaces/tdescript/scriptloader.cpp index 62bd33605..4abd9421d 100644 --- a/interfaces/tdescript/scriptloader.cpp +++ b/interfaces/tdescript/scriptloader.cpp @@ -56,7 +56,7 @@ TDESelectAction * ScriptLoader::getScripts() // Get the available scripts for this application. TQStringList pluginList = ""; // Find plugins - TQString searchPath = kapp->name(); + TQString searchPath = tdeApp->name(); searchPath += "/scripts/"; TQDir d(locate( "data", searchPath)); kdDebug() << "loading plugin from " << locate( "data", searchPath) << endl; diff --git a/interfaces/tdescript/scriptmanager.cpp b/interfaces/tdescript/scriptmanager.cpp index a0dfbe921..a87cdfa67 100644 --- a/interfaces/tdescript/scriptmanager.cpp +++ b/interfaces/tdescript/scriptmanager.cpp @@ -51,7 +51,7 @@ bool KScriptManager::addScript( const TQString &scriptDesktopFile) KDesktopFile desktop(scriptDesktopFile, true); m_scripts.insert(desktop.readName(), new ScriptInfo()); m_scripts[desktop.readName()]->scriptType = desktop.readType(); - TQString localpath = TQString(kapp->name()) + "/scripts/" + desktop.readEntry("X-TDE-ScriptName", ""); + TQString localpath = TQString(tdeApp->name()) + "/scripts/" + desktop.readEntry("X-TDE-ScriptName", ""); m_scripts[desktop.readName()]->scriptFile = locate("data", localpath); // m_scripts[desktop.readName()]->scriptMethod = tmpScriptMethod; success = true; diff --git a/interfaces/tdetexteditor/editorchooser.cpp b/interfaces/tdetexteditor/editorchooser.cpp index 1eddfb8d6..0fc06bd9e 100644 --- a/interfaces/tdetexteditor/editorchooser.cpp +++ b/interfaces/tdetexteditor/editorchooser.cpp @@ -75,7 +75,7 @@ EditorChooser:: ~EditorChooser(){ } void EditorChooser::readAppSetting(const TQString& postfix){ - TDEConfig *cfg=kapp->config(); + TDEConfig *cfg=tdeApp->config(); TQString previousGroup=cfg->group(); cfg->setGroup("KTEXTEDITOR:"+postfix); TQString editor=cfg->readPathEntry("editor"); @@ -90,7 +90,7 @@ void EditorChooser::readAppSetting(const TQString& postfix){ } void EditorChooser::writeAppSetting(const TQString& postfix){ - TDEConfig *cfg=kapp->config(); + TDEConfig *cfg=tdeApp->config(); TQString previousGroup=cfg->group(); cfg->setGroup("KTEXTEDITOR:"+postfix); cfg->writeEntry("DEVELOPER_INFO","NEVER TRY TO USE VALUES FROM THAT GROUP, THEY ARE SUBJECT TO CHANGES"); @@ -105,7 +105,7 @@ KTextEditor::Document *EditorChooser::createDocument(TQObject *parent,const char KTextEditor::Document *tmpDoc=0; - TDEConfig *cfg=kapp->config(); + TDEConfig *cfg=tdeApp->config(); TQString previousGroup=cfg->group(); cfg->setGroup("KTEXTEDITOR:"+postfix); TQString editor=cfg->readPathEntry("editor"); @@ -135,7 +135,7 @@ KTextEditor::Editor *EditorChooser::createEditor(TQWidget *parentWidget,TQObject KTextEditor::Editor *tmpEd=0; - TDEConfig *cfg=kapp->config(); + TDEConfig *cfg=tdeApp->config(); TQString previousGroup=cfg->group(); cfg->setGroup("KTEXTEDITOR:"+postfix); TQString editor=cfg->readPathEntry("editor"); |