From 54cdfdf03d64cdee13a3f838f20b1063006b24bf Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Mon, 20 Jan 2025 18:25:59 +0900
Subject: Use tdeApp
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
---
atlantikdesigner/designer/designer.cpp | 4 +--
doc/ksig/index.docbook | 2 +-
doc/tutorials/docprimer/index.docbook | 4 +--
doc/tutorials/markup/index.docbook | 4 +--
kate/filetemplates/plugin/filetemplates.cpp | 12 +++----
kate/insertcommand/plugin_kateinsertcommand.cpp | 2 +-
kate/textfilter/plugin_katetextfilter.cpp | 2 +-
kicker-applets/kbinaryclock/kbinaryclock.cpp | 2 +-
kicker-applets/kolourpicker/simplebutton.cpp | 8 ++---
kicker-applets/math/mathapplet.cpp | 2 +-
kicker-applets/mediacontrol/amarokInterface.cpp | 36 ++++++++++----------
kicker-applets/mediacontrol/jukInterface.cpp | 38 +++++++++++-----------
kicker-applets/mediacontrol/kscdInterface.cpp | 36 ++++++++++----------
kicker-applets/mediacontrol/mediacontrol.cpp | 4 +--
kicker-applets/mediacontrol/noatunInterface.cpp | 36 ++++++++++----------
kicker-applets/mediacontrol/simplebutton.cpp | 8 ++---
konq-plugins/akregator/akregatorplugin.cpp | 2 +-
konq-plugins/arkplugin/arkplugin.cpp | 14 ++++----
konq-plugins/fsview/fsview.cpp | 4 +--
konq-plugins/fsview/fsview_part.cpp | 4 +--
konq-plugins/fsview/scan.cpp | 2 +-
konq-plugins/kimgalleryplugin/imgalleryplugin.cpp | 4 +--
konq-plugins/kuick/kdirmenu.cpp | 2 +-
konq-plugins/kuick/kmetamenu.cpp | 12 +++----
konq-plugins/kuick/kuick_plugin.cpp | 6 ++--
konq-plugins/searchbar/searchbar.cpp | 8 ++---
konq-plugins/sidebar/metabar/src/configdialog.cpp | 12 +++----
konq-plugins/sidebar/metabar/src/defaultplugin.cpp | 2 +-
konq-plugins/sidebar/metabar/src/httpplugin.cpp | 2 +-
konq-plugins/sidebar/metabar/src/metabarwidget.cpp | 8 ++---
konq-plugins/sidebar/metabar/src/serviceloader.cpp | 2 +-
konq-plugins/sidebar/newsticker/sidebar_news.cpp | 2 +-
.../tdehtmlsettingsplugin/settingsplugin.cpp | 10 +++---
konq-plugins/webarchiver/archivedialog.cpp | 2 +-
konq-plugins/webarchiver/webarchivecreator.cpp | 2 +-
ksig/ksig.cpp | 12 +++----
noatun-plugins/dub/dub/dubapp.cpp | 2 +-
noatun-plugins/lyrics/lyrics.cpp | 2 +-
noatun-plugins/nexscope/nex.cpp | 2 +-
39 files changed, 159 insertions(+), 159 deletions(-)
diff --git a/atlantikdesigner/designer/designer.cpp b/atlantikdesigner/designer/designer.cpp
index 4a7ea7b..3c45735 100644
--- a/atlantikdesigner/designer/designer.cpp
+++ b/atlantikdesigner/designer/designer.cpp
@@ -74,7 +74,7 @@ AtlanticDesigner::AtlanticDesigner(TQWidget *parent, const char *name)
createGUI("atlantikdesignerui.rc");
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup("General");
TQColor defaultColor = colorGroup().background();
defaultBg = config->readColorEntry("alternateBackground", &defaultColor);
@@ -837,7 +837,7 @@ void AtlanticDesigner::closeEvent(TQCloseEvent *e)
recentAct->saveEntries(TDEGlobal::config(), "Designer recent files");
e->accept();
- kapp->quit();
+ tdeApp->quit();
}
void AtlanticDesigner::changeEstate(int index)
diff --git a/doc/ksig/index.docbook b/doc/ksig/index.docbook
index 7a5946a..1de7a4a 100644
--- a/doc/ksig/index.docbook
+++ b/doc/ksig/index.docbook
@@ -386,7 +386,7 @@ Documentation Copyright © 2006 Richard A. Johnson
<appendix id="installation">
<title>Installation</title>
-<sect1 id="getting-kapp">
+<sect1 id="getting-tdeApp">
<title>How to obtain &ksig;</title>
&install.intro.documentation;
diff --git a/doc/tutorials/docprimer/index.docbook b/doc/tutorials/docprimer/index.docbook
index ec95a29..bf86a0c 100644
--- a/doc/tutorials/docprimer/index.docbook
+++ b/doc/tutorials/docprimer/index.docbook
@@ -455,7 +455,7 @@ appropriate:
any noteworthy features, &etc;.</para>
</listitem>
<listitem>
-<para>Using <replaceable>KApp</replaceable>: Task-based description of
+<para>Using <replaceable>TDEApp</replaceable>: Task-based description of
the most common uses of the application.</para>
</listitem>
<listitem>
@@ -1937,7 +1937,7 @@ to contact a programmer is to ask about a feature or behavior of an
application that you're documenting. To find the appropriate person to
contact for a particular application, look in the
<menuchoice><guimenu>Help</guimenu> <guimenuitem>About
-<replaceable>KApp</replaceable></guimenuitem></menuchoice> menu item for
+<replaceable>TDEApp</replaceable></guimenuitem></menuchoice> menu item for
the maintainer. If you can't find a maintainer, ask on
<email>kde-doc-english@kde.org</email> or
<email>kde-devel@kde.org</email>. If asking on the kde-devel list,
diff --git a/doc/tutorials/markup/index.docbook b/doc/tutorials/markup/index.docbook
index f0cb70b..432aec1 100644
--- a/doc/tutorials/markup/index.docbook
+++ b/doc/tutorials/markup/index.docbook
@@ -159,7 +159,7 @@ class="starttag">sect<replaceable>N</replaceable></sgmltag> tags must
have an <sgmltag class="attribute">id</sgmltag>. The <sgmltag
class="attribute">id</sgmltag> must be in all lower case, and with
dashes separating words. For example, <markup><sect1
-id="how-to-obtain-kapp"></markup>.
+id="how-to-obtain-tdeApp"></markup>.
</para>
</listitem>
@@ -550,7 +550,7 @@ To:
<para>In short: change any occurrence of <quote>kmyapplication</quote>
to the real name of your application. Do <emphasis>not</emphasis> use
-<quote>kappname</quote> or <quote>kapp</quote> directly in a document
+<quote>kappname</quote> or <quote>tdeApp</quote> directly in a document
yourself.</para>
<para>The entity <quote>package</quote> is used similarly. It allows
diff --git a/kate/filetemplates/plugin/filetemplates.cpp b/kate/filetemplates/plugin/filetemplates.cpp
index 31d1745..39c0c40 100644
--- a/kate/filetemplates/plugin/filetemplates.cpp
+++ b/kate/filetemplates/plugin/filetemplates.cpp
@@ -140,7 +140,7 @@ KateFileTemplates::KateFileTemplates( TQObject* parent, const char* name )
TQ_SLOT(slotOpenTemplate(const KURL &)),
m_actionCollection,
"file_templates_recent" );
- m_acRecentTemplates->loadEntries( kapp->config(), "Recent Templates" );
+ m_acRecentTemplates->loadEntries( tdeApp->config(), "Recent Templates" );
// template menu
m_dw = new KDirWatch( this, "template_dirwatch" );
@@ -180,7 +180,7 @@ void KateFileTemplates::updateTemplateDirs(const TQString &d)
TQRegExp re( "\\b(\\w+)\\s*=\\s*(.+)(?:\\s+\\w+=|$)" );
re.setMinimal( true );
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
TQStringList hidden;
config->readListEntry( "Hidden", hidden, ';' );
@@ -239,7 +239,7 @@ void KateFileTemplates::updateTemplateDirs(const TQString &d)
KateFileTemplates::~KateFileTemplates()
{
- m_acRecentTemplates->saveEntries( kapp->config(), "Recent Templates" );
+ m_acRecentTemplates->saveEntries( tdeApp->config(), "Recent Templates" );
delete m_emailstuff;
delete m_user;
}
@@ -388,7 +388,7 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url )
}
// this may take a moment..
- kapp->setOverrideCursor( TQCursor(TQCursor::WaitCursor) );
+ tdeApp->setOverrideCursor( TQCursor(TQCursor::WaitCursor) );
// create a new document
application()->activeMainWindow()->viewManager()->openURL( KURL() );
@@ -485,7 +485,7 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url )
doc->setModified( false );
- kapp->restoreOverrideCursor();
+ tdeApp->restoreOverrideCursor();
m_acRecentTemplates->addURL( url );
// clean up
@@ -1188,7 +1188,7 @@ void KateTemplateManager::slotRemoveTemplate()
// Find all instances of filename, and try to delete them.
// If it fails (there was a global, unwritable instance), add to a
// list of removed templates
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
TQString fname = item->templateinfo->filename.section( '/', -1 );
TQStringList templates = TDEGlobal::dirs()->findAllResources(
"data", fname.prepend( "kate/plugins/katefiletemplates/templates/" ),
diff --git a/kate/insertcommand/plugin_kateinsertcommand.cpp b/kate/insertcommand/plugin_kateinsertcommand.cpp
index 5351795..f744b55 100644
--- a/kate/insertcommand/plugin_kateinsertcommand.cpp
+++ b/kate/insertcommand/plugin_kateinsertcommand.cpp
@@ -109,7 +109,7 @@ void PluginKateInsertCommand::removeView(Kate::MainWindow *win)
void PluginKateInsertCommand::slotInsertCommand()
{
- if (!kapp->authorize("shell_access")) {
+ if (!tdeApp->authorize("shell_access")) {
KMessageBox::sorry(0,i18n("You are not allowed to execute arbitrary external applications. If you want to be able to do this, contact your system administrator."),i18n("Access Restrictions"));
return;
}
diff --git a/kate/textfilter/plugin_katetextfilter.cpp b/kate/textfilter/plugin_katetextfilter.cpp
index f5bb625..0cb992f 100644
--- a/kate/textfilter/plugin_katetextfilter.cpp
+++ b/kate/textfilter/plugin_katetextfilter.cpp
@@ -252,7 +252,7 @@ PluginKateTextFilter::slotFilterCloseStdin (TDEProcess * pProcess)
void
PluginKateTextFilter::slotEditFilter () // PCP
{
- if (!kapp->authorize("shell_access")) {
+ if (!tdeApp->authorize("shell_access")) {
KMessageBox::sorry(0,i18n(
"You are not allowed to execute arbitrary external applications. If "
"you want to be able to do this, contact your system administrator."),
diff --git a/kicker-applets/kbinaryclock/kbinaryclock.cpp b/kicker-applets/kbinaryclock/kbinaryclock.cpp
index 192c781..98eca66 100644
--- a/kicker-applets/kbinaryclock/kbinaryclock.cpp
+++ b/kicker-applets/kbinaryclock/kbinaryclock.cpp
@@ -305,7 +305,7 @@ void KBinaryClock::openContextMenu() {
if (!bImmutable)
{
- if (kapp->authorize("user/root"))
+ if (tdeApp->authorize("user/root"))
{
menu->insertItem(SmallIcon("date"), i18n("&Adjust Date && Time..."), 103, 4);
}
diff --git a/kicker-applets/kolourpicker/simplebutton.cpp b/kicker-applets/kolourpicker/simplebutton.cpp
index 6e099b8..c37e3fc 100644
--- a/kicker-applets/kolourpicker/simplebutton.cpp
+++ b/kicker-applets/kolourpicker/simplebutton.cpp
@@ -39,13 +39,13 @@ SimpleButton::SimpleButton(TQWidget *parent, const char *name)
{
setBackgroundOrigin( AncestorOrigin );
- connect( kapp, TQ_SIGNAL( settingsChanged( int ) ),
+ connect( tdeApp, TQ_SIGNAL( settingsChanged( int ) ),
TQ_SLOT( slotSettingsChanged( int ) ) );
- connect( kapp, TQ_SIGNAL( iconChanged( int ) ),
+ connect( tdeApp, TQ_SIGNAL( iconChanged( int ) ),
TQ_SLOT( slotIconChanged( int ) ) );
- kapp->addKipcEventMask( KIPC::SettingsChanged );
- kapp->addKipcEventMask( KIPC::IconChanged );
+ tdeApp->addKipcEventMask( KIPC::SettingsChanged );
+ tdeApp->addKipcEventMask( KIPC::IconChanged );
slotSettingsChanged( TDEApplication::SETTINGS_MOUSE );
}
diff --git a/kicker-applets/math/mathapplet.cpp b/kicker-applets/math/mathapplet.cpp
index f38bcb2..5614237 100644
--- a/kicker-applets/math/mathapplet.cpp
+++ b/kicker-applets/math/mathapplet.cpp
@@ -246,7 +246,7 @@ void MathApplet::evaluate(const TQString& command)
Parser evaluator;
- kapp->propagateSessionManager();
+ tdeApp->propagateSessionManager();
_input->addToHistory(command);
diff --git a/kicker-applets/mediacontrol/amarokInterface.cpp b/kicker-applets/mediacontrol/amarokInterface.cpp
index 482c59b..dbf14f6 100644
--- a/kicker-applets/mediacontrol/amarokInterface.cpp
+++ b/kicker-applets/mediacontrol/amarokInterface.cpp
@@ -33,12 +33,12 @@ AmarokInterface::AmarokInterface() : PlayerInterface()
mAmarokTimer = new TQTimer ( this, "mAmaroKTimer" );
connect(mAmarokTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateSlider()) );
- kapp->dcopClient()->setNotifications ( true );
+ tdeApp->dcopClient()->setNotifications ( true );
- connect(kapp->dcopClient(), TQ_SIGNAL(applicationRegistered(const TQCString&)),
+ connect(tdeApp->dcopClient(), TQ_SIGNAL(applicationRegistered(const TQCString&)),
TQ_SLOT(appRegistered(const TQCString&)) );
- connect(kapp->dcopClient(), TQ_SIGNAL(applicationRemoved(const TQCString&)),
+ connect(tdeApp->dcopClient(), TQ_SIGNAL(applicationRemoved(const TQCString&)),
TQ_SLOT(appRemoved(const TQCString&)));
TQTimer::singleShot(0, this, TQ_SLOT(myInit()));
@@ -46,7 +46,7 @@ AmarokInterface::AmarokInterface() : PlayerInterface()
AmarokInterface::~AmarokInterface()
{
- kapp->dcopClient()->setNotifications(false);
+ tdeApp->dcopClient()->setNotifications(false);
delete mAmarokTimer;
}
@@ -96,7 +96,7 @@ void AmarokInterface::updateSlider ( )
TQByteArray data, replyData;
TQCString replyType;
- if (!kapp->dcopClient()->call(mAppId, "player", "trackTotalTime()",data, replyType, replyData))
+ if (!tdeApp->dcopClient()->call(mAppId, "player", "trackTotalTime()",data, replyType, replyData))
{
//kdDebug(90200) << "mediacontrol: DCOP communication Error" << endl;
// -2 is an internal errornumber, might be used later
@@ -121,7 +121,7 @@ void AmarokInterface::updateSlider ( )
replyData = 0;
replyType = 0;
- if (!kapp->dcopClient()->call(mAppId, "player", "trackCurrentTime()",data, replyType, replyData))
+ if (!tdeApp->dcopClient()->call(mAppId, "player", "trackCurrentTime()",data, replyType, replyData))
{
//kdDebug(90200) << "mediacontrol: DCOP communication error" << endl;
time = -2;
@@ -166,7 +166,7 @@ void AmarokInterface::dropEvent(TQDropEvent* event)
TQByteArray data;
TQDataStream arg(data, IO_WriteOnly);
arg << list;
- if (!kapp->dcopClient()->send(mAppId, "player", "addMediaList(KURL::List)",data))
+ if (!tdeApp->dcopClient()->send(mAppId, "player", "addMediaList(KURL::List)",data))
kdDebug(90200) << "Couldn't send drop to amarok" << endl;
}
}
@@ -188,7 +188,7 @@ void AmarokInterface::jumpToTime( int sec )
TQByteArray data;
TQDataStream arg(data, IO_WriteOnly);
arg << sec;
- kapp->dcopClient()->send(mAppId, "player", "seek(int)", data);
+ tdeApp->dcopClient()->send(mAppId, "player", "seek(int)", data);
}
void AmarokInterface::playpause()
@@ -196,37 +196,37 @@ void AmarokInterface::playpause()
if (!findRunningAmarok())
startPlayer("amarok");
TQByteArray data;
- kapp->dcopClient()->send(mAppId, "player", "playPause()", data);
+ tdeApp->dcopClient()->send(mAppId, "player", "playPause()", data);
}
void AmarokInterface::stop()
{
TQByteArray data;
- kapp->dcopClient()->send(mAppId, "player", "stop()", data);
+ tdeApp->dcopClient()->send(mAppId, "player", "stop()", data);
}
void AmarokInterface::next()
{
TQByteArray data;
- kapp->dcopClient()->send(mAppId, "player", "next()", data);
+ tdeApp->dcopClient()->send(mAppId, "player", "next()", data);
}
void AmarokInterface::prev()
{
TQByteArray data;
- kapp->dcopClient()->send(mAppId, "player", "prev()", data);
+ tdeApp->dcopClient()->send(mAppId, "player", "prev()", data);
}
void AmarokInterface::volumeUp()
{
TQByteArray data;
- kapp->dcopClient()->send(mAppId, "player", "volumeUp()", data);
+ tdeApp->dcopClient()->send(mAppId, "player", "volumeUp()", data);
}
void AmarokInterface::volumeDown()
{
TQByteArray data;
- kapp->dcopClient()->send(mAppId, "player", "volumeDown()", data);
+ tdeApp->dcopClient()->send(mAppId, "player", "volumeDown()", data);
}
const TQString AmarokInterface::getTrackTitle() const
@@ -234,7 +234,7 @@ const TQString AmarokInterface::getTrackTitle() const
TQString title;
TQByteArray data, replyData;
TQCString replyType;
- if (!kapp->dcopClient()->call(mAppId, "player", "nowPlaying()",data, replyType, replyData))
+ if (!tdeApp->dcopClient()->call(mAppId, "player", "nowPlaying()",data, replyType, replyData))
{
//kdDebug(90200) << "mediacontrol: DCOP communication Error" << endl;
return TQString("");
@@ -257,7 +257,7 @@ const TQString AmarokInterface::getTrackTitle() const
bool AmarokInterface::findRunningAmarok()
{
- QCStringList allApps = kapp->dcopClient()->registeredApplications();
+ QCStringList allApps = tdeApp->dcopClient()->registeredApplications();
TQValueList<TQCString>::const_iterator iterator;
TQByteArray data, replyData;
TQCString replyType;
@@ -266,7 +266,7 @@ bool AmarokInterface::findRunningAmarok()
{
if ((*iterator).contains("amarok",false))
{
- if (kapp->dcopClient()->call((*iterator), "player", "interfaces()", data, replyType, replyData) )
+ if (tdeApp->dcopClient()->call((*iterator), "player", "interfaces()", data, replyType, replyData) )
{
if ( replyType == "QCStringList" )
{
@@ -294,7 +294,7 @@ int AmarokInterface::playingStatus()
TQByteArray data, replyData;
TQCString replyType;
- if (kapp->dcopClient()->call(mAppId, "player", "status()", data, replyType,
+ if (tdeApp->dcopClient()->call(mAppId, "player", "status()", data, replyType,
replyData))
{
int status = 0;
diff --git a/kicker-applets/mediacontrol/jukInterface.cpp b/kicker-applets/mediacontrol/jukInterface.cpp
index 67e4b4a..a240fdd 100644
--- a/kicker-applets/mediacontrol/jukInterface.cpp
+++ b/kicker-applets/mediacontrol/jukInterface.cpp
@@ -33,12 +33,12 @@ JuKInterface::JuKInterface() : PlayerInterface(), mProc(0)
mJuKTimer = new TQTimer ( this, "mJukTimer" );
connect(mJuKTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateSlider()) );
- kapp->dcopClient()->setNotifications ( true );
+ tdeApp->dcopClient()->setNotifications ( true );
- connect(kapp->dcopClient(), TQ_SIGNAL(applicationRegistered(const TQCString&)),
+ connect(tdeApp->dcopClient(), TQ_SIGNAL(applicationRegistered(const TQCString&)),
TQ_SLOT(appRegistered(const TQCString&)) );
- connect(kapp->dcopClient(), TQ_SIGNAL(applicationRemoved(const TQCString&)),
+ connect(tdeApp->dcopClient(), TQ_SIGNAL(applicationRemoved(const TQCString&)),
TQ_SLOT(appRemoved(const TQCString&)));
TQTimer::singleShot(0, this, TQ_SLOT(myInit()));
@@ -46,7 +46,7 @@ JuKInterface::JuKInterface() : PlayerInterface(), mProc(0)
JuKInterface::~JuKInterface()
{
- kapp->dcopClient()->setNotifications(false);
+ tdeApp->dcopClient()->setNotifications(false);
delete mJuKTimer;
}
@@ -122,7 +122,7 @@ void JuKInterface::updateSlider ()
TQByteArray data, replyData;
TQCString replyType;
- if (kapp->dcopClient()->call(mAppId, "Player", "totalTime()", data,
+ if (tdeApp->dcopClient()->call(mAppId, "Player", "totalTime()", data,
replyType, replyData))
{
TQDataStream reply(replyData, IO_ReadOnly);
@@ -134,7 +134,7 @@ void JuKInterface::updateSlider ()
replyData = 0;
replyType = 0;
- if (kapp->dcopClient()->call(mAppId, "Player", "currentTime()", data,
+ if (tdeApp->dcopClient()->call(mAppId, "Player", "currentTime()", data,
replyType, replyData))
{
TQDataStream reply(replyData, IO_ReadOnly);
@@ -179,7 +179,7 @@ void JuKInterface::dropEvent(TQDropEvent* event)
// Use call instead of send to make sure the files are added
// before we try to play.
- if (!kapp->dcopClient()->call(mAppId, "Collection", "openFile(TQStringList)", data,
+ if (!tdeApp->dcopClient()->call(mAppId, "Collection", "openFile(TQStringList)", data,
replyType, replyData, true))
{
kdDebug(90200) << "Couldn't send drop to juk" << endl;
@@ -190,7 +190,7 @@ void JuKInterface::dropEvent(TQDropEvent* event)
TQDataStream strArg(strData, IO_WriteOnly);
strArg << *fileList.begin();
- if (!kapp->dcopClient()->send(mAppId, "Player", "play(TQString)", strData))
+ if (!tdeApp->dcopClient()->send(mAppId, "Player", "play(TQString)", strData))
kdDebug(90200) << "Couldn't send play command to juk" << endl;
}
}
@@ -213,8 +213,8 @@ void JuKInterface::jumpToTime( int sec )
TQDataStream arg(data, IO_WriteOnly);
arg << sec;
// Used in JuK shipping with KDE < 3.3
- //kapp->dcopClient()->send(mAppId, "Player", "setTime(int)", data);
- kapp->dcopClient()->send(mAppId, "Player", "seek(int)", data);
+ //tdeApp->dcopClient()->send(mAppId, "Player", "setTime(int)", data);
+ tdeApp->dcopClient()->send(mAppId, "Player", "seek(int)", data);
}
void JuKInterface::playpause()
@@ -222,37 +222,37 @@ void JuKInterface::playpause()
if (!findRunningJuK())
startPlayer("juk");
TQByteArray data;
- kapp->dcopClient()->send(mAppId, "Player", "playPause()", data);
+ tdeApp->dcopClient()->send(mAppId, "Player", "playPause()", data);
}
void JuKInterface::stop()
{
TQByteArray data;
- kapp->dcopClient()->send(mAppId, "Player", "stop()", data);
+ tdeApp->dcopClient()->send(mAppId, "Player", "stop()", data);
}
void JuKInterface::next()
{
TQByteArray data;
- kapp->dcopClient()->send(mAppId, "Player", "forward()", data);
+ tdeApp->dcopClient()->send(mAppId, "Player", "forward()", data);
}
void JuKInterface::prev()
{
TQByteArray data;
- kapp->dcopClient()->send(mAppId, "Player", "back()", data);
+ tdeApp->dcopClient()->send(mAppId, "Player", "back()", data);
}
void JuKInterface::volumeUp()
{
TQByteArray data;
- kapp->dcopClient()->send(mAppId, "Player", "volumeUp()", data);
+ tdeApp->dcopClient()->send(mAppId, "Player", "volumeUp()", data);
}
void JuKInterface::volumeDown()
{
TQByteArray data;
- kapp->dcopClient()->send(mAppId, "Player", "volumeDown()", data);
+ tdeApp->dcopClient()->send(mAppId, "Player", "volumeDown()", data);
}
const TQString JuKInterface::getTrackTitle() const
@@ -261,7 +261,7 @@ const TQString JuKInterface::getTrackTitle() const
TQByteArray data, replyData;
TQCString replyType;
- if (kapp->dcopClient()->call(mAppId, "Player", "playingString()",data,
+ if (tdeApp->dcopClient()->call(mAppId, "Player", "playingString()",data,
replyType, replyData))
{
TQDataStream reply(replyData, IO_ReadOnly);
@@ -277,7 +277,7 @@ const TQString JuKInterface::getTrackTitle() const
// FIXME: what if we have a dcop app named, let's say, 'jukfrontend'?
bool JuKInterface::findRunningJuK()
{
- QCStringList allApps = kapp->dcopClient()->registeredApplications();
+ QCStringList allApps = tdeApp->dcopClient()->registeredApplications();
TQValueList<TQCString>::const_iterator iterator;
for (iterator = allApps.constBegin(); iterator != allApps.constEnd(); ++iterator)
@@ -296,7 +296,7 @@ int JuKInterface::playingStatus()
TQByteArray data, replyData;
TQCString replyType;
- if (kapp->dcopClient()->call(mAppId, "Player", "status()", data, replyType,
+ if (tdeApp->dcopClient()->call(mAppId, "Player", "status()", data, replyType,
replyData))
{
int status = 0;
diff --git a/kicker-applets/mediacontrol/kscdInterface.cpp b/kicker-applets/mediacontrol/kscdInterface.cpp
index 6f88bbf..0717489 100644
--- a/kicker-applets/mediacontrol/kscdInterface.cpp
+++ b/kicker-applets/mediacontrol/kscdInterface.cpp
@@ -33,12 +33,12 @@ KsCDInterface::KsCDInterface() : PlayerInterface()
mKsCDTimer = new TQTimer(this, "mKsCDTimer");
connect(mKsCDTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateSlider()) );
- kapp->dcopClient()->setNotifications ( true );
+ tdeApp->dcopClient()->setNotifications ( true );
- connect(kapp->dcopClient(), TQ_SIGNAL(applicationRegistered(const TQCString&)),
+ connect(tdeApp->dcopClient(), TQ_SIGNAL(applicationRegistered(const TQCString&)),
TQ_SLOT(appRegistered(const TQCString&)) );
- connect(kapp->dcopClient(), TQ_SIGNAL(applicationRemoved(const TQCString&)),
+ connect(tdeApp->dcopClient(), TQ_SIGNAL(applicationRemoved(const TQCString&)),
TQ_SLOT(appRemoved(const TQCString&)));
TQTimer::singleShot(0, this, TQ_SLOT(myInit()));
@@ -46,7 +46,7 @@ KsCDInterface::KsCDInterface() : PlayerInterface()
KsCDInterface::~KsCDInterface()
{
- kapp->dcopClient()->setNotifications(false);
+ tdeApp->dcopClient()->setNotifications(false);
delete mKsCDTimer;
}
@@ -100,7 +100,7 @@ void KsCDInterface::updateSlider()
TQByteArray data, replyData;
TQCString replyType;
- if (kapp->dcopClient()->call(mAppId, "CDPlayer", "currentTrackLength()", data,
+ if (tdeApp->dcopClient()->call(mAppId, "CDPlayer", "currentTrackLength()", data,
replyType, replyData))
{
TQDataStream reply(replyData, IO_ReadOnly);
@@ -112,7 +112,7 @@ void KsCDInterface::updateSlider()
replyData = 0;
replyType = 0;
- if (kapp->dcopClient()->call(mAppId, "CDPlayer", "currentPosition()", data,
+ if (tdeApp->dcopClient()->call(mAppId, "CDPlayer", "currentPosition()", data,
replyType, replyData))
{
TQDataStream reply(replyData, IO_ReadOnly);
@@ -161,7 +161,7 @@ void KsCDInterface::jumpToTime(int sec)
TQByteArray data;
TQDataStream arg(data, IO_WriteOnly);
arg << sec;
- kapp->dcopClient()->send(mAppId, "CDPlayer", "jumpTo(int)", data);
+ tdeApp->dcopClient()->send(mAppId, "CDPlayer", "jumpTo(int)", data);
}
void KsCDInterface::playpause()
@@ -169,37 +169,37 @@ void KsCDInterface::playpause()
if (!findRunningKsCD())
startPlayer("kscd");
TQByteArray data;
- kapp->dcopClient()->send(mAppId, "CDPlayer", "play()", data);
+ tdeApp->dcopClient()->send(mAppId, "CDPlayer", "play()", data);
}
void KsCDInterface::stop()
{
TQByteArray data;
- kapp->dcopClient()->send(mAppId, "CDPlayer", "stop()", data);
+ tdeApp->dcopClient()->send(mAppId, "CDPlayer", "stop()", data);
}
void KsCDInterface::next()
{
TQByteArray data;
- kapp->dcopClient()->send(mAppId, "CDPlayer", "next()", data);
+ tdeApp->dcopClient()->send(mAppId, "CDPlayer", "next()", data);
}
void KsCDInterface::prev()
{
TQByteArray data;
- kapp->dcopClient()->send(mAppId, "CDPlayer", "previous()", data);
+ tdeApp->dcopClient()->send(mAppId, "CDPlayer", "previous()", data);
}
void KsCDInterface::volumeUp()
{
TQByteArray data;
- kapp->dcopClient()->send(mAppId, "CDPlayer", "volumeUp()", data);
+ tdeApp->dcopClient()->send(mAppId, "CDPlayer", "volumeUp()", data);
}
void KsCDInterface::volumeDown()
{
TQByteArray data;
- kapp->dcopClient()->send(mAppId, "CDPlayer", "volumeDown()", data);
+ tdeApp->dcopClient()->send(mAppId, "CDPlayer", "volumeDown()", data);
}
const TQString KsCDInterface::getTrackTitle() const
@@ -209,7 +209,7 @@ const TQString KsCDInterface::getTrackTitle() const
TQCString replyType;
// Get track title from KsCD...
- if (kapp->dcopClient()->call(mAppId, "CDPlayer", "currentTrackTitle()", data,
+ if (tdeApp->dcopClient()->call(mAppId, "CDPlayer", "currentTrackTitle()", data,
replyType, replyData))
{
TQDataStream reply(replyData, IO_ReadOnly);
@@ -220,7 +220,7 @@ const TQString KsCDInterface::getTrackTitle() const
}
// Album...
- if (kapp->dcopClient()->call(mAppId, "CDPlayer", "currentAlbum()", data,
+ if (tdeApp->dcopClient()->call(mAppId, "CDPlayer", "currentAlbum()", data,
replyType, replyData))
{
TQDataStream reply(replyData, IO_ReadOnly);
@@ -231,7 +231,7 @@ const TQString KsCDInterface::getTrackTitle() const
}
// Artist...
- if (kapp->dcopClient()->call(mAppId, "CDPlayer", "currentArtist()", data,
+ if (tdeApp->dcopClient()->call(mAppId, "CDPlayer", "currentArtist()", data,
replyType, replyData))
{
TQDataStream reply(replyData, IO_ReadOnly);
@@ -291,7 +291,7 @@ const TQString KsCDInterface::getTrackTitle() const
bool KsCDInterface::findRunningKsCD()
{
- QCStringList allApps = kapp->dcopClient()->registeredApplications();
+ QCStringList allApps = tdeApp->dcopClient()->registeredApplications();
TQValueList<TQCString>::const_iterator iterator;
for (iterator = allApps.constBegin(); iterator != allApps.constEnd(); ++iterator)
@@ -310,7 +310,7 @@ int KsCDInterface::playingStatus()
TQByteArray data, replyData;
TQCString replyType;
- if (kapp->dcopClient()->call(mAppId, "CDPlayer", "getStatus()", data, replyType,
+ if (tdeApp->dcopClient()->call(mAppId, "CDPlayer", "getStatus()", data, replyType,
replyData))
{
int status = 0;
diff --git a/kicker-applets/mediacontrol/mediacontrol.cpp b/kicker-applets/mediacontrol/mediacontrol.cpp
index a7ef56c..6f13511 100644
--- a/kicker-applets/mediacontrol/mediacontrol.cpp
+++ b/kicker-applets/mediacontrol/mediacontrol.cpp
@@ -146,8 +146,8 @@ MediaControl::MediaControl(const TQString &configFile, Type t, int actions,
time_slider->installEventFilter(this);
// request notification of changes in icon style
- kapp->addKipcEventMask(KIPC::IconChanged);
- connect(kapp, TQ_SIGNAL(iconChanged(int)), this, TQ_SLOT(slotIconChanged()));
+ tdeApp->addKipcEventMask(KIPC::IconChanged);
+ connect(tdeApp, TQ_SIGNAL(iconChanged(int)), this, TQ_SLOT(slotIconChanged()));
reparseConfig();
diff --git a/kicker-applets/mediacontrol/noatunInterface.cpp b/kicker-applets/mediacontrol/noatunInterface.cpp
index fd58bf5..99f22c5 100644
--- a/kicker-applets/mediacontrol/noatunInterface.cpp
+++ b/kicker-applets/mediacontrol/noatunInterface.cpp
@@ -33,19 +33,19 @@ NoatunInterface::NoatunInterface() : PlayerInterface()
connect(mNoatunTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateSlider()));
- connect(kapp->dcopClient(), TQ_SIGNAL(applicationRegistered(const TQCString&)),
+ connect(tdeApp->dcopClient(), TQ_SIGNAL(applicationRegistered(const TQCString&)),
TQ_SLOT(appRegistered(const TQCString&)) );
- connect(kapp->dcopClient(), TQ_SIGNAL(applicationRemoved(const TQCString&)),
+ connect(tdeApp->dcopClient(), TQ_SIGNAL(applicationRemoved(const TQCString&)),
TQ_SLOT(appRemoved(const TQCString&)));
- kapp->dcopClient()->setNotifications(true);
+ tdeApp->dcopClient()->setNotifications(true);
TQTimer::singleShot(0, this, TQ_SLOT(myInit()));
}
NoatunInterface::~NoatunInterface()
{
- kapp->dcopClient()->setNotifications(false);
+ tdeApp->dcopClient()->setNotifications(false);
}
void NoatunInterface::myInit()
@@ -94,7 +94,7 @@ void NoatunInterface::updateSlider()
TQByteArray data, replyData;
TQCString replyType;
- if (!kapp->dcopClient()->call(mAppId, "Noatun", "length()", data, replyType, replyData, false, 200))
+ if (!tdeApp->dcopClient()->call(mAppId, "Noatun", "length()", data, replyType, replyData, false, 200))
{
//kdDebug(90200) << "mediacontrol: DCOP communication Error" << endl;
// -2 is an internal errornumber, might be used later
@@ -119,7 +119,7 @@ void NoatunInterface::updateSlider()
replyData = 0;
replyType = 0;
- if (!kapp->dcopClient()->call(mAppId, "Noatun", "position()", data,
+ if (!tdeApp->dcopClient()->call(mAppId, "Noatun", "position()", data,
replyType, replyData, false, 200))
{
//kdDebug(90200) << "mediacontrol: DCOP communication error" << endl;
@@ -153,7 +153,7 @@ int NoatunInterface::playingStatus()
TQByteArray data, replyData;
TQCString replyType;
- if (!kapp->dcopClient()->call(mAppId, "Noatun", "state()", data, replyType,
+ if (!tdeApp->dcopClient()->call(mAppId, "Noatun", "state()", data, replyType,
replyData, false, 200))
{
return Stopped;
@@ -192,7 +192,7 @@ void NoatunInterface::dropEvent(TQDropEvent* event)
TQByteArray data;
TQDataStream arg(data, IO_WriteOnly);
arg << list.toStringList() << false;
- kapp->dcopClient()->send(mAppId, "Noatun", "addFile(TQStringList,bool)", data);
+ tdeApp->dcopClient()->send(mAppId, "Noatun", "addFile(TQStringList,bool)", data);
}
}
@@ -213,41 +213,41 @@ void NoatunInterface::jumpToTime(int sec)
TQByteArray data;
TQDataStream arg(data, IO_WriteOnly);
arg << (sec*1000); // noatun wants milliseconds
- kapp->dcopClient()->send(mAppId, "Noatun", "skipTo(int)", data);
+ tdeApp->dcopClient()->send(mAppId, "Noatun", "skipTo(int)", data);
}
void NoatunInterface::playpause()
{
if (!findRunningNoatun())
startPlayer("noatun");
- kapp->dcopClient()->send(mAppId, "Noatun", "playpause()", TQString());
+ tdeApp->dcopClient()->send(mAppId, "Noatun", "playpause()", TQString());
}
void NoatunInterface::stop()
{
- kapp->dcopClient()->send(mAppId, "Noatun", "stop()", TQString());
+ tdeApp->dcopClient()->send(mAppId, "Noatun", "stop()", TQString());
}
void NoatunInterface::next()
{
// fastForward() is noatun from kde2
- //kapp->dcopClient()->send("noatun", "Noatun", "fastForward()", TQString());
- kapp->dcopClient()->send(mAppId, "Noatun", "forward()", TQString());
+ //tdeApp->dcopClient()->send("noatun", "Noatun", "fastForward()", TQString());
+ tdeApp->dcopClient()->send(mAppId, "Noatun", "forward()", TQString());
}
void NoatunInterface::prev()
{
- kapp->dcopClient()->send(mAppId, "Noatun", "back()", TQString());
+ tdeApp->dcopClient()->send(mAppId, "Noatun", "back()", TQString());
}
void NoatunInterface::volumeUp()
{
- kapp->dcopClient()->send(mAppId, "Noatun", "volumeDown()", TQString());
+ tdeApp->dcopClient()->send(mAppId, "Noatun", "volumeDown()", TQString());
}
void NoatunInterface::volumeDown()
{
- kapp->dcopClient()->send(mAppId, "Noatun", "volumeUp()", TQString());
+ tdeApp->dcopClient()->send(mAppId, "Noatun", "volumeUp()", TQString());
}
const TQString NoatunInterface::getTrackTitle() const
@@ -255,7 +255,7 @@ const TQString NoatunInterface::getTrackTitle() const
TQString title("");
TQByteArray data, replyData;
TQCString replyType;
- if (kapp->dcopClient()->call(mAppId, "Noatun", "title()", data, replyType,
+ if (tdeApp->dcopClient()->call(mAppId, "Noatun", "title()", data, replyType,
replyData, false, 200))
{
TQDataStream reply(replyData, IO_ReadOnly);
@@ -268,7 +268,7 @@ const TQString NoatunInterface::getTrackTitle() const
bool NoatunInterface::findRunningNoatun()
{
// FIXME: what if we have a dcop app named, let's say, 'noatunfrontend'?
- QCStringList allApps = kapp->dcopClient()->registeredApplications();
+ QCStringList allApps = tdeApp->dcopClient()->registeredApplications();
TQValueList<TQCString>::const_iterator iterator;
for (iterator = allApps.constBegin(); iterator != allApps.constEnd(); ++iterator)
diff --git a/kicker-applets/mediacontrol/simplebutton.cpp b/kicker-applets/mediacontrol/simplebutton.cpp
index 6e099b8..c37e3fc 100644
--- a/kicker-applets/mediacontrol/simplebutton.cpp
+++ b/kicker-applets/mediacontrol/simplebutton.cpp
@@ -39,13 +39,13 @@ SimpleButton::SimpleButton(TQWidget *parent, const char *name)
{
setBackgroundOrigin( AncestorOrigin );
- connect( kapp, TQ_SIGNAL( settingsChanged( int ) ),
+ connect( tdeApp, TQ_SIGNAL( settingsChanged( int ) ),
TQ_SLOT( slotSettingsChanged( int ) ) );
- connect( kapp, TQ_SIGNAL( iconChanged( int ) ),
+ connect( tdeApp, TQ_SIGNAL( iconChanged( int ) ),
TQ_SLOT( slotIconChanged( int ) ) );
- kapp->addKipcEventMask( KIPC::SettingsChanged );
- kapp->addKipcEventMask( KIPC::IconChanged );
+ tdeApp->addKipcEventMask( KIPC::SettingsChanged );
+ tdeApp->addKipcEventMask( KIPC::IconChanged );
slotSettingsChanged( TDEApplication::SETTINGS_MOUSE );
}
diff --git a/konq-plugins/akregator/akregatorplugin.cpp b/konq-plugins/akregator/akregatorplugin.cpp
index 6aafbec..ad194fe 100644
--- a/konq-plugins/akregator/akregatorplugin.cpp
+++ b/konq-plugins/akregator/akregatorplugin.cpp
@@ -52,7 +52,7 @@ AkregatorMenu::AkregatorMenu( KonqPopupMenu * popupmenu, const char *name, const
: KonqPopupMenuPlugin( popupmenu, name), PluginBase(), m_conf(0), m_part(0)
{
kdDebug() << "AkregatorMenu::AkregatorMenu()" << endl;
- if ( TQCString( kapp->name() ) == "kdesktop" && !kapp->authorize("editable_desktop_icons" ) )
+ if ( TQCString( tdeApp->name() ) == "kdesktop" && !tdeApp->authorize("editable_desktop_icons" ) )
return;
// Do nothing if user has turned us off.
diff --git a/konq-plugins/arkplugin/arkplugin.cpp b/konq-plugins/arkplugin/arkplugin.cpp
index cf8f473..b3c59b4 100644
--- a/konq-plugins/arkplugin/arkplugin.cpp
+++ b/konq-plugins/arkplugin/arkplugin.cpp
@@ -45,7 +45,7 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis
: KonqPopupMenuPlugin( popupmenu, name),
m_compAsMapper( 0 ), m_addToMapper( 0 ), m_conf( 0 )
{
- if ( ( TQCString( kapp->name() ) == "kdesktop" && !kapp->authorize("editable_desktop_icons" ) )
+ if ( ( TQCString( tdeApp->name() ) == "kdesktop" && !tdeApp->authorize("editable_desktop_icons" ) )
|| ( TDEStandardDirs::findExe( "ark" ).isNull() ) )
return;
@@ -544,7 +544,7 @@ void ArkMenu::compressAs( const TQStringList &name, const KURL & compressed )
args << "--add-to";
args += name;
args << compressed.url();
- kapp->tdeinitExec( "ark", args );
+ tdeApp->tdeinitExec( "ark", args );
}
void ArkMenu::slotAddTo( int pos )
@@ -557,7 +557,7 @@ void ArkMenu::slotAddTo( int pos )
archive.setFileName( m_archiveList[ pos ].fileName() );
args << archive.url();
- kapp->tdeinitExec( "ark", args );
+ tdeApp->tdeinitExec( "ark", args );
}
void ArkMenu::slotAdd()
@@ -565,7 +565,7 @@ void ArkMenu::slotAdd()
TQStringList args( m_urlStringList );
args.prepend( "--add" );
- kapp->tdeinitExec( "ark", args );
+ tdeApp->tdeinitExec( "ark", args );
}
void ArkMenu::slotExtractHere()
@@ -578,7 +578,7 @@ void ArkMenu::slotExtractHere()
KURL targetDirectory = ( *it ).url();
targetDirectory.setPath( targetDirectory.directory() );
args << "--extract-to" << targetDirectory.url() << ( *it ).url();
- kapp->tdeinitExec( "ark", args );
+ tdeApp->tdeinitExec( "ark", args );
}
}
@@ -597,7 +597,7 @@ void ArkMenu::slotExtractToSubfolders()
stripExtension( dirName );
targetDir.setPath( dirName );
args << "--extract-to" << targetDir.url() << *it;
- kapp->tdeinitExec( "ark", args );
+ tdeApp->tdeinitExec( "ark", args );
}
}
@@ -609,7 +609,7 @@ void ArkMenu::slotExtractTo()
{
TQStringList args;
args << "--extract" << *it;
- kapp->tdeinitExec( "ark", args );
+ tdeApp->tdeinitExec( "ark", args );
}
}
diff --git a/konq-plugins/fsview/fsview.cpp b/konq-plugins/fsview/fsview.cpp
index fe669cd..14a61a0 100644
--- a/konq-plugins/fsview/fsview.cpp
+++ b/konq-plugins/fsview/fsview.cpp
@@ -137,7 +137,7 @@ void FSView::setPath(TQString p)
KURL u;
u.setPath(_path);
- if (!kapp->authorizeURLAction("list", KURL(), u))
+ if (!tdeApp->authorizeURLAction("list", KURL(), u))
{
TQString msg = TDEIO::buildErrorString(TDEIO::ERR_ACCESS_DENIED, u.prettyURL());
KMessageBox::queuedMessageBox(this, KMessageBox::Sorry, msg);
@@ -428,7 +428,7 @@ void FSView::saveFSOptions()
void FSView::quit()
{
saveFSOptions();
- TDEApplication::kApplication()->quit();
+ tdeApp->quit();
}
void FSView::doRedraw()
diff --git a/konq-plugins/fsview/fsview_part.cpp b/konq-plugins/fsview/fsview_part.cpp
index 86f7f16..28433ba 100644
--- a/konq-plugins/fsview/fsview_part.cpp
+++ b/konq-plugins/fsview/fsview_part.cpp
@@ -145,8 +145,8 @@ FSViewPart::FSViewPart(TQWidget *parentWidget, const char *widgetName,
TQ_SLOT (slotShowColorMenu()));
slotSettingsChanged(TDEApplication::SETTINGS_MOUSE);
- if (kapp)
- connect( kapp, TQ_SIGNAL( settingsChanged(int) ),
+ if (tdeApp)
+ connect( tdeApp, TQ_SIGNAL( settingsChanged(int) ),
TQ_SLOT( slotSettingsChanged(int) ) );
TQObject::connect(_view,TQ_SIGNAL(returnPressed(TreeMapItem*)),
diff --git a/konq-plugins/fsview/scan.cpp b/konq-plugins/fsview/scan.cpp
index 85af06d..2114bd3 100644
--- a/konq-plugins/fsview/scan.cpp
+++ b/konq-plugins/fsview/scan.cpp
@@ -224,7 +224,7 @@ int ScanDir::scan(ScanItem* si, ScanItemList& list, int data)
KURL u;
u.setPath(si->absPath);
- if (!kapp->authorizeURLAction("list", KURL(), u)) {
+ if (!tdeApp->authorizeURLAction("list", KURL(), u)) {
if (_parent)
_parent->subScanFinished();
diff --git a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp
index 6d4b6f1..61a3a4e 100644
--- a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp
+++ b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp
@@ -89,7 +89,7 @@ void KImGalleryPlugin::slotExecute()
m_cancelled = false;
m_progressDlg->show();
if ( createHtml( url, m_part->url().path(), m_configDlg->recursionLevel() > 0 ? m_configDlg->recursionLevel() + 1 : 0 , m_configDlg->getImageFormat()) ) {
- kapp->invokeBrowser(url.url()); // Open a browser to show the result
+ tdeApp->invokeBrowser(url.url()); // Open a browser to show the result
} else {
deleteCancelledGallery(url, m_part->url().path(), m_configDlg->recursionLevel() > 0 ? m_configDlg->recursionLevel() + 1 : 0, m_configDlg->getImageFormat());
}
@@ -234,7 +234,7 @@ void KImGalleryPlugin::createBody(TQTextStream& stream, const TQString& sourceDi
m_progressDlg->setTotalSteps( numOfImages );
m_progressDlg->setProgress( imgIndex );
- kapp->processEvents();
+ tdeApp->processEvents();
imgIndex++;
}
stream << "</tr>" << endl;
diff --git a/konq-plugins/kuick/kdirmenu.cpp b/konq-plugins/kuick/kdirmenu.cpp
index beba6d0..8af9242 100644
--- a/konq-plugins/kuick/kdirmenu.cpp
+++ b/konq-plugins/kuick/kdirmenu.cpp
@@ -130,7 +130,7 @@ void KDirMenu::slotAboutToShow( ) {
KURL u;
u.setPath((*it)->absFilePath());
- if (kapp->authorizeURLAction("list", u, u))
+ if (tdeApp->authorizeURLAction("list", u, u))
{
insert(new KDirMenu(this, src, (*it)->absFilePath(), name),
TDEIO::decodeFileName( fileName ));
diff --git a/konq-plugins/kuick/kmetamenu.cpp b/konq-plugins/kuick/kmetamenu.cpp
index 8346a0a..4641408 100644
--- a/konq-plugins/kuick/kmetamenu.cpp
+++ b/konq-plugins/kuick/kmetamenu.cpp
@@ -49,7 +49,7 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url,
KURL u;
u.setPath(TQDir::homeDirPath());
- if ( kapp->authorizeURLAction("list", u, u) )
+ if ( tdeApp->authorizeURLAction("list", u, u) )
{
m_home = new KDirMenu( parent, url, u.path() , text );
insertItem( SmallIcon( "kfm_home" ), i18n("&Home Folder"), m_home);
@@ -60,7 +60,7 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url,
}
u.setPath(TQDir::rootDirPath());
- if ( kapp->authorizeURLAction("list", u, u) )
+ if ( tdeApp->authorizeURLAction("list", u, u) )
{
m_root = new KDirMenu( parent, url, u.path() , text );
insertItem( SmallIcon( "folder_red" ), i18n("&Root Folder"), m_root);
@@ -73,7 +73,7 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url,
TQString confDir = TQDir::rootDirPath()+ "etc";
u.setPath(confDir);
if ( TQFileInfo( confDir ).isWritable() &&
- kapp->authorizeURLAction("list", u, u) )
+ tdeApp->authorizeURLAction("list", u, u) )
{
m_etc = new KDirMenu( parent, url, confDir, text );
insertItem( SmallIcon( "folder_yellow" ) ,
@@ -88,7 +88,7 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url,
&& dirList.find( url.path() ) == dirList.end()
&& TQFileInfo( url.path() ).isWritable()
&& TQFileInfo( url.path() ).isDir()
- && kapp->authorizeURLAction("list", url, url) )
+ && tdeApp->authorizeURLAction("list", url, url) )
//Need to check whether a directory so we don't crash trying to access it
//(#60192)
{
@@ -115,7 +115,7 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url,
m_browse->plug(this);
// read the last chosen dirs
// first set the group according to our parameter
- conf = kapp->config( );
+ conf = tdeApp->config( );
conf->setGroup(key );
recent_no = conf->readNumEntry("ShowRecent", 5);
list = conf->readPathListEntry("Paths");
@@ -128,7 +128,7 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url,
break;
TQDir dir( *it );
u.setPath( *it );
- if ( !dir.exists() || !kapp->authorizeURLAction("list", u, u) ) {
+ if ( !dir.exists() || !tdeApp->authorizeURLAction("list", u, u) ) {
it = list.remove( it );
continue;
}
diff --git a/konq-plugins/kuick/kuick_plugin.cpp b/konq-plugins/kuick/kuick_plugin.cpp
index b58acc3..9f3c56e 100644
--- a/konq-plugins/kuick/kuick_plugin.cpp
+++ b/konq-plugins/kuick/kuick_plugin.cpp
@@ -47,7 +47,7 @@ KTestMenu::KTestMenu( KonqPopupMenu *popupmenu, const char *name, const TQString
addSeparator();
//popupmenu->addMerge();
connect( popup, TQ_SIGNAL(aboutToShow() ), this, TQ_SLOT(slotPrepareMenu( ) ) );
- m_imProxy = KIMProxy::instance( kapp->dcopClient() );
+ m_imProxy = KIMProxy::instance( tdeApp->dcopClient() );
}
KTestMenu::~KTestMenu( ){
delete meta_copy_mmu;
@@ -77,14 +77,14 @@ void KTestMenu::slotPrepareMenu( ) { // now it's time to set up the menu...
// search for the dummy entry 'kuick_plugin' stores it index reomev it plug copy at the position
TDEGlobal::locale()->insertCatalogue("kuick_plugin");
- bool isKDesktop = TQCString( kapp->name() ) == "kdesktop";
+ bool isKDesktop = TQCString( tdeApp->name() ) == "kdesktop";
for(int i= popup->count(); i >=1; i--) {
int id = popup->idAt( i );
TQString text = popup->text( id );
if( text.contains("kuick_plugin") ) {
popup->removeItem( id );
- if (isKDesktop && !kapp->authorize("editable_desktop_icons"))
+ if (isKDesktop && !tdeApp->authorize("editable_desktop_icons"))
{
// Remove seperator as well
id = popup->idAt( i-1 );
diff --git a/konq-plugins/searchbar/searchbar.cpp b/konq-plugins/searchbar/searchbar.cpp
index 842b256..cf249d7 100644
--- a/konq-plugins/searchbar/searchbar.cpp
+++ b/konq-plugins/searchbar/searchbar.cpp
@@ -113,7 +113,7 @@ SearchBarPlugin::SearchBarPlugin(TQObject *parent, const char *name,
SearchBarPlugin::~SearchBarPlugin()
{
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup("SearchBar");
config->writeEntry("Mode", (int) m_searchMode);
config->writeEntry("CurrentEngine", m_currentEngine);
@@ -463,7 +463,7 @@ void SearchBarPlugin::searchEnginesSelected(TDEProcess *process)
{
if(!process || process->exitStatus() == 0)
{
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup("SearchBar");
config->writeEntry("CurrentEngine", m_currentEngine);
config->sync();
@@ -501,7 +501,7 @@ void SearchBarPlugin::configurationChanged()
m_providerName = file.readName();
}
- config = kapp->config();
+ config = tdeApp->config();
config->setGroup("SearchBar");
m_searchMode = (SearchModes) config->readNumEntry("Mode", (int) UseSearchProvider);
m_currentEngine = config->readEntry("CurrentEngine", engine);
@@ -623,7 +623,7 @@ void SearchBarCombo::show()
void SearchBarPlugin::selectGoogleSuggestMode()
{
m_googleMode = (GoogleMode)m_googleMenu->currentItem();
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup("SearchBar");
config->writeEntry("GoogleSuggestMode", m_googleMode);
config->sync();
diff --git a/konq-plugins/sidebar/metabar/src/configdialog.cpp b/konq-plugins/sidebar/metabar/src/configdialog.cpp
index f198b9e..47bfa19 100644
--- a/konq-plugins/sidebar/metabar/src/configdialog.cpp
+++ b/konq-plugins/sidebar/metabar/src/configdialog.cpp
@@ -229,7 +229,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent
}
}
else{
- DCOPRef action(kapp->dcopClient()->appId(), TQCString(topWidgetName).append("/action/").append((*it).utf8()));
+ DCOPRef action(tdeApp->dcopClient()->appId(), TQCString(topWidgetName).append("/action/").append((*it).utf8()));
TQString text = action.call("plainText()");
TQString icon = iconConfig->readEntry(*it, action.call("icon()"));
@@ -351,7 +351,7 @@ void ConfigDialog::createLink()
if(!name_str.isEmpty() && !url_str.isEmpty()){
if(icon_str.isEmpty()){
- icon_str = kapp->iconLoader()->iconPath("folder", TDEIcon::Small);
+ icon_str = tdeApp->iconLoader()->iconPath("folder", TDEIcon::Small);
}
TQPixmap icon(icon_str);
@@ -434,7 +434,7 @@ void ConfigDialog::editLink(TQListViewItem *item)
if(!name_str.isEmpty() && !url_str.isEmpty()){
if(icon_str.isEmpty()){
- icon_str = kapp->iconLoader()->iconPath("folder", TDEIcon::Small);
+ icon_str = tdeApp->iconLoader()->iconPath("folder", TDEIcon::Small);
}
TQPixmap icon(icon_str);
@@ -529,7 +529,7 @@ void ConfigDialog::loadAvailableActions()
TQByteArray data, replyData;
TQCString replyType;
- if(DCOPClient::mainClient()->call(kapp->dcopClient()->appId(), topWidgetName, "actionMap()", data, replyType, replyData)){
+ if(DCOPClient::mainClient()->call(tdeApp->dcopClient()->appId(), topWidgetName, "actionMap()", data, replyType, replyData)){
if(replyType == "TQMap<TQCString,DCOPRef>"){
TQMap<TQCString,DCOPRef> actionMap;
@@ -568,7 +568,7 @@ void ConfigDialog::loadThemes()
TQString theme = config->readEntry("Theme", "default");
bool foundTheme = false;
- TQStringList dirs = kapp->dirs()->findDirs("data", "metabar/themes");
+ TQStringList dirs = tdeApp->dirs()->findDirs("data", "metabar/themes");
for(TQStringList::Iterator it = dirs.begin(); it != dirs.end(); ++it){
TQStringList theme_list = TQDir(*it).entryList(TQDir::Dirs);
@@ -599,7 +599,7 @@ void ConfigDialog::installTheme()
KTar archive(file);
archive.open(IO_ReadOnly);
- kapp->processEvents();
+ tdeApp->processEvents();
const KArchiveDirectory* rootDir = archive.directory();
rootDir->copyTo(themedir);
diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
index 79b1ea7..8e0d1bf 100644
--- a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
@@ -104,7 +104,7 @@ void DefaultPlugin::loadActions(DOM::HTMLElement node)
}
}
else{
- DCOPRef action(kapp->dcopClient()->appId(), TQCString(m_html->view()->topLevelWidget()->name()).append("/action/").append((*it).utf8()));
+ DCOPRef action(tdeApp->dcopClient()->appId(), TQCString(m_html->view()->topLevelWidget()->name()).append("/action/").append((*it).utf8()));
if(!action.isNull()){
if(action.call("enabled()")){
diff --git a/konq-plugins/sidebar/metabar/src/httpplugin.cpp b/konq-plugins/sidebar/metabar/src/httpplugin.cpp
index 5930589..7a1c5c4 100644
--- a/konq-plugins/sidebar/metabar/src/httpplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/httpplugin.cpp
@@ -107,7 +107,7 @@ bool HTTPPlugin::handleRequest(const KURL &url)
KURL url("http://www.google.com/search");
url.addQueryItem("q", keyword);
- DCOPRef ref(kapp->dcopClient()->appId(), m_html->view()->topLevelWidget()->name());
+ DCOPRef ref(tdeApp->dcopClient()->appId(), m_html->view()->topLevelWidget()->name());
DCOPReply reply = ref.call("openURL", url.url());
}
diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
index c66fc19..c90c35e 100644
--- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
@@ -210,7 +210,7 @@ void MetabarWidget::setFileItems(const KFileItemList &items, bool check)
TQString MetabarWidget::getCurrentURL()
{
- DCOPRef ref(kapp->dcopClient()->appId(), this->topLevelWidget()->name());
+ DCOPRef ref(tdeApp->dcopClient()->appId(), this->topLevelWidget()->name());
DCOPReply reply = ref.call("currentURL()");
if (reply.isValid()) {
@@ -226,19 +226,19 @@ TQString MetabarWidget::getCurrentURL()
void MetabarWidget::openURL(const TQString &url)
{
- DCOPRef ref(kapp->dcopClient()->appId(), this->topLevelWidget()->name());
+ DCOPRef ref(tdeApp->dcopClient()->appId(), this->topLevelWidget()->name());
DCOPReply reply = ref.call("openURL", url);
}
void MetabarWidget::openTab(const TQString &url)
{
- DCOPRef ref(kapp->dcopClient()->appId(), this->topLevelWidget()->name());
+ DCOPRef ref(tdeApp->dcopClient()->appId(), this->topLevelWidget()->name());
DCOPReply reply = ref.call("newTab", url);
}
void MetabarWidget::callAction(const TQString &action)
{
- DCOPRef ref(kapp->dcopClient()->appId(), TQString(TQString(this->topLevelWidget()->name()).append("/action/").append(action)).utf8());
+ DCOPRef ref(tdeApp->dcopClient()->appId(), TQString(TQString(this->topLevelWidget()->name()).append("/action/").append(action)).utf8());
if(ref.call("enabled()")){
ref.call("activate()");
}
diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.cpp b/konq-plugins/sidebar/metabar/src/serviceloader.cpp
index 4749f53..0ab683f 100644
--- a/konq-plugins/sidebar/metabar/src/serviceloader.cpp
+++ b/konq-plugins/sidebar/metabar/src/serviceloader.cpp
@@ -78,7 +78,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int
if(cfg.hasKey("X-TDE-ShowIfRunning" )){
const TQString app = cfg.readEntry( "X-TDE-ShowIfRunning" );
- if(!kapp->dcopClient()->isApplicationRegistered(app.utf8())){
+ if(!tdeApp->dcopClient()->isApplicationRegistered(app.utf8())){
continue;
}
}
diff --git a/konq-plugins/sidebar/newsticker/sidebar_news.cpp b/konq-plugins/sidebar/newsticker/sidebar_news.cpp
index 99497af..f701ae2 100644
--- a/konq-plugins/sidebar/newsticker/sidebar_news.cpp
+++ b/konq-plugins/sidebar/newsticker/sidebar_news.cpp
@@ -123,7 +123,7 @@ namespace KSB_News {
TQString rdfservice_error;
int err = 0;
- if (! kapp->dcopClient()->isApplicationRegistered("rssservice"))
+ if (! tdeApp->dcopClient()->isApplicationRegistered("rssservice"))
if (TDEApplication::startServiceByDesktopName("rssservice", TQString(),
&rdfservice_error) > 0)
err = 1;
diff --git a/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp b/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp
index 58dc041..70a2ac5 100644
--- a/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp
+++ b/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp
@@ -46,8 +46,8 @@ SettingsPlugin::SettingsPlugin( TQObject* parent, const char* name,
setInstance(SettingsPluginFactory::instance());
- if ( !kapp->dcopClient()->isAttached() )
- kapp->dcopClient()->attach();
+ if ( !tdeApp->dcopClient()->isAttached() )
+ tdeApp->dcopClient()->attach();
TDEActionMenu *menu = new TDEActionMenu( i18n("HTML Settings"), "configure",
actionCollection(), "action menu" );
@@ -190,7 +190,7 @@ void SettingsPlugin::toggleCookies()
TQByteArray data, replyData;
TQDataStream stream( data, IO_WriteOnly );
stream << part->url().url() << advice;
- bool ok = kapp->dcopClient()->call( "kded", "kcookiejar",
+ bool ok = tdeApp->dcopClient()->call( "kded", "kcookiejar",
"setDomainAdvice(TQString,TQString)",
data, replyType, replyData, true );
@@ -225,7 +225,7 @@ bool SettingsPlugin::cookiesEnabled( const TQString& url )
TQCString replyType;
TQDataStream stream( data, IO_WriteOnly );
stream << url;
- kapp->dcopClient()->call( "kcookiejar", "kcookiejar", "getDomainAdvice(TQString)", data, replyType, reply, true );
+ tdeApp->dcopClient()->call( "kcookiejar", "kcookiejar", "getDomainAdvice(TQString)", data, replyType, reply, true );
bool enabled = false;
@@ -315,7 +315,7 @@ void SettingsPlugin::updateIOSlaves()
TQByteArray data;
TQDataStream stream( data, IO_WriteOnly );
- DCOPClient* client = kapp->dcopClient();
+ DCOPClient* client = tdeApp->dcopClient();
if ( !client->isAttached() )
client->attach();
diff --git a/konq-plugins/webarchiver/archivedialog.cpp b/konq-plugins/webarchiver/archivedialog.cpp
index 8ca6951..63ccfe3 100644
--- a/konq-plugins/webarchiver/archivedialog.cpp
+++ b/konq-plugins/webarchiver/archivedialog.cpp
@@ -397,7 +397,7 @@ TQString ArchiveDialog::handleLink(const KURL& _url, const TQString& _link)
KURL url(getAbsoluteURL(_url, _link));
TQString tarFileName;
- if (kapp->authorizeURLAction("redirect", _url, url))
+ if (tdeApp->authorizeURLAction("redirect", _url, url))
{
if (m_state==Retrieving)
m_urlsToDownload.append(url);
diff --git a/konq-plugins/webarchiver/webarchivecreator.cpp b/konq-plugins/webarchiver/webarchivecreator.cpp
index 6dd562e..451fb8a 100644
--- a/konq-plugins/webarchiver/webarchivecreator.cpp
+++ b/konq-plugins/webarchiver/webarchivecreator.cpp
@@ -66,7 +66,7 @@ bool WebArchiveCreator::create(const TQString &path, int width, int height, TQIm
m_completed = false;
startTimer(5000);
while (!m_completed)
- kapp->processOneEvent();
+ tdeApp->processOneEvent();
killTimers();
// render the HTML page on a bigger pixmap and use smoothScale,
diff --git a/ksig/ksig.cpp b/ksig/ksig.cpp
index 9ca08a5..d1db3e1 100644
--- a/ksig/ksig.cpp
+++ b/ksig/ksig.cpp
@@ -68,10 +68,10 @@ void KSig::setupActions()
KStdAction::save(this, TQ_SLOT(save()), actionCollection());
KStdAction::quit(this, TQ_SLOT(quit()), actionCollection());
- KStdAction::cut(kapp, TQ_SLOT(cut()), actionCollection());
- KStdAction::copy(kapp, TQ_SLOT(copy()), actionCollection());
- KStdAction::paste(kapp, TQ_SLOT(paste()), actionCollection());
- new TDEAction(i18n("C&lear"), "edit-clear", 0, kapp, TQ_SLOT(clear()), actionCollection(), "clear");
+ KStdAction::cut(tdeApp, TQ_SLOT(cut()), actionCollection());
+ KStdAction::copy(tdeApp, TQ_SLOT(copy()), actionCollection());
+ KStdAction::paste(tdeApp, TQ_SLOT(paste()), actionCollection());
+ new TDEAction(i18n("C&lear"), "edit-clear", 0, tdeApp, TQ_SLOT(clear()), actionCollection(), "clear");
new TDEAction(i18n("Edit Standard Header"), 0, 0, this, TQ_SLOT(editHeader()), actionCollection(), "editHeader");
new TDEAction(i18n("Edit Standard Footer"), 0, 0, this, TQ_SLOT(editFooter()), actionCollection(), "editFooter");
@@ -211,9 +211,9 @@ void KSig::setDataChanged(bool value)
changed = value;
if(changed)
- setCaption(kapp->makeStdCaption(TQString(), true, true));
+ setCaption(tdeApp->makeStdCaption(TQString(), true, true));
else
- setCaption(kapp->makeStdCaption(TQString(), true, false));
+ setCaption(tdeApp->makeStdCaption(TQString(), true, false));
}
void KSig::editHeader()
diff --git a/noatun-plugins/dub/dub/dubapp.cpp b/noatun-plugins/dub/dub/dubapp.cpp
index 3520fa9..5f2caa6 100644
--- a/noatun-plugins/dub/dub/dubapp.cpp
+++ b/noatun-plugins/dub/dub/dubapp.cpp
@@ -38,7 +38,7 @@ DubApp::DubApp(TQWidget* parent, const char* name)
: TDEMainWindow(parent, name)
{
kdDebug(90010) << "cons dubapp" << endl;
- config=kapp->config();
+ config=tdeApp->config();
// call inits to invoke all other construction parts
initStatusBar();
diff --git a/noatun-plugins/lyrics/lyrics.cpp b/noatun-plugins/lyrics/lyrics.cpp
index 270dde4..f369eaf 100644
--- a/noatun-plugins/lyrics/lyrics.cpp
+++ b/noatun-plugins/lyrics/lyrics.cpp
@@ -255,7 +255,7 @@ Lyrics::~Lyrics()
bool Lyrics::queryClose()
{
- if( kapp->sessionSaving())
+ if( tdeApp->sessionSaving())
return true;
hide();
htmlpart->closeURL();
diff --git a/noatun-plugins/nexscope/nex.cpp b/noatun-plugins/nexscope/nex.cpp
index 87f4cc9..f099b84 100644
--- a/noatun-plugins/nexscope/nex.cpp
+++ b/noatun-plugins/nexscope/nex.cpp
@@ -513,7 +513,7 @@ void Nex::go()
break;
}
#ifdef NOTHREAD
- kapp->processEvents();
+ tdeApp->processEvents();
#endif
frame->clear();
}
--
cgit v1.2.1