summaryrefslogtreecommitdiffstats
path: root/kicker
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:17:06 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:17:06 -0600
commite4e0479220e9e9616b68b2a11e42cff7a8af7b3d (patch)
tree8e01571cdd132dad34ebec38b12c2dbc37d05bd9 /kicker
parentd41050ea3f6904e5156d35f664346b816b9e4d12 (diff)
downloadtdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.tar.gz
tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kicker')
-rw-r--r--kicker/applets/clock/clock.cpp20
-rw-r--r--kicker/applets/clock/clockapplet.kcfg24
-rw-r--r--kicker/applets/launcher/quicklauncher.cpp2
-rw-r--r--kicker/extensions/kasbar/ChangeLog2
-rw-r--r--kicker/extensions/kasbar/kasbarapp.cpp4
-rw-r--r--kicker/extensions/kasbar/kasbarextension.cpp2
-rw-r--r--kicker/kicker/buttons/kbutton.cpp2
-rw-r--r--kicker/kicker/buttons/urlbutton.cpp2
-rw-r--r--kicker/kicker/core/kicker.cpp2
-rw-r--r--kicker/kicker/core/main.cpp2
-rw-r--r--kicker/kicker/core/menumanager.cpp2
-rw-r--r--kicker/kicker/kicker-3.4-reverseLayout.cpp2
-rw-r--r--kicker/kicker/plugins/kickoff-beagle-plugin.cpp2
-rw-r--r--kicker/kicker/ui/hidebutton.cpp4
-rw-r--r--kicker/kicker/ui/k_mnu.cpp2
-rw-r--r--kicker/kicker/ui/k_new_mnu.cpp24
-rw-r--r--kicker/kicker/ui/recentapps.cpp2
-rw-r--r--kicker/kicker/ui/service_mnu.cpp2
-rw-r--r--kicker/libkicker/panelbutton.cpp4
-rw-r--r--kicker/libkicker/panelbutton.h6
-rw-r--r--kicker/libkicker/simplebutton.cpp4
-rw-r--r--kicker/menuext/find/findmenu.cpp2
-rw-r--r--kicker/menuext/konsole/konsole_mnu.cpp6
-rw-r--r--kicker/menuext/prefmenu/prefmenu.cpp4
-rw-r--r--kicker/menuext/tom/tom.cc2
-rw-r--r--kicker/proxy/appletproxy.cpp4
-rw-r--r--kicker/proxy/extensiondebugger.cpp4
-rw-r--r--kicker/proxy/extensionproxy.cpp4
-rw-r--r--kicker/taskbar/taskbar.cpp2
29 files changed, 72 insertions, 72 deletions
diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp
index 330a2122e..ced1fb363 100644
--- a/kicker/applets/clock/clock.cpp
+++ b/kicker/applets/clock/clock.cpp
@@ -86,23 +86,23 @@ KConfigDialogSingle::KConfigDialogSingle(Zone *zone, TQWidget *parent,
settings = new SettingsWidgetImp(prefs, zone, 0, "General");
connect(TQT_TQOBJECT(settings->kcfg_Type), TQT_SIGNAL(activated(int)), TQT_SLOT(selectPage(int)));
- settings->kcfg_PlainBackgroundColor->setDefaultColor(KApplication::palette().active().background());
- settings->kcfg_DateBackgroundColor->setDefaultColor(KApplication::palette().active().background());
+ settings->kcfg_PlainBackgroundColor->setDefaultColor(TDEApplication::palette().active().background());
+ settings->kcfg_DateBackgroundColor->setDefaultColor(TDEApplication::palette().active().background());
// Digital
digitalPage = new DigitalWidget(0, "DigitalClock");
settings->widgetStack->addWidget(digitalPage, 1);
- digitalPage->kcfg_DigitalBackgroundColor->setDefaultColor(KApplication::palette().active().background());
+ digitalPage->kcfg_DigitalBackgroundColor->setDefaultColor(TDEApplication::palette().active().background());
// Analog
analogPage = new AnalogWidget(0, "AnalogClock");
settings->widgetStack->addWidget(analogPage, 2);
- analogPage->kcfg_AnalogBackgroundColor->setDefaultColor(KApplication::palette().active().background());
+ analogPage->kcfg_AnalogBackgroundColor->setDefaultColor(TDEApplication::palette().active().background());
// Fuzzy
fuzzyPage = new FuzzyWidget(0, "FuzzyClock");
settings->widgetStack->addWidget(fuzzyPage, 3);
- fuzzyPage->kcfg_FuzzyBackgroundColor->setDefaultColor(KApplication::palette().active().background());
+ fuzzyPage->kcfg_FuzzyBackgroundColor->setDefaultColor(TDEApplication::palette().active().background());
connect(TQT_TQOBJECT(settings->kcfg_PlainShowDate), TQT_SIGNAL(toggled(bool)),
TQT_SLOT(dateToggled()));
@@ -386,7 +386,7 @@ void DigitalClock::paintEvent(TQPaintEvent*)
p.drawTiledPixmap(0, 0, width(), height(), lcdPattern);
}
else if (_prefs->digitalBackgroundColor() !=
- KApplication::palette().active().background())
+ TDEApplication::palette().active().background())
{
p.fillRect(0, 0, width(), height(), _prefs->digitalBackgroundColor());
}
@@ -553,7 +553,7 @@ void AnalogClock::paintEvent( TQPaintEvent * )
paint.drawTiledPixmap(0, 0, spWidth, spHeight, lcdPattern);
}
- else if (_prefs->analogBackgroundColor() != KApplication::palette().active().background())
+ else if (_prefs->analogBackgroundColor() != TDEApplication::palette().active().background())
{
_spPx->fill(_prefs->analogBackgroundColor());
}
@@ -1169,7 +1169,7 @@ void ClockApplet::preferences(bool timezone)
void ClockApplet::updateFollowBackground()
{
- TQColor globalBgroundColor = KApplication::palette().active().background();
+ TQColor globalBgroundColor = TDEApplication::palette().active().background();
TQColor bgColor;
switch (_prefs->type())
@@ -1306,7 +1306,7 @@ void ClockApplet::setTimerTo60()
void ClockApplet::setBackground()
{
- TQColor globalBgroundColor = KApplication::palette().active().background();
+ TQColor globalBgroundColor = TDEApplication::palette().active().background();
TQColor fgColor, bgColor;
if (!_clock)
@@ -1371,7 +1371,7 @@ void ClockApplet::globalPaletteChange()
if (!m_dateFollowBackgroundSetting && !m_followBackgroundSetting)
return;
- TQColor globalBgroundColor = KApplication::palette().active().background();
+ TQColor globalBgroundColor = TDEApplication::palette().active().background();
if (m_dateFollowBackgroundSetting)
_prefs->setDateBackgroundColor(globalBgroundColor);
diff --git a/kicker/applets/clock/clockapplet.kcfg b/kicker/applets/clock/clockapplet.kcfg
index 04beba322..e5b461e1c 100644
--- a/kicker/applets/clock/clockapplet.kcfg
+++ b/kicker/applets/clock/clockapplet.kcfg
@@ -20,11 +20,11 @@
<group name="Date">
<entry name="DateForegroundColor" type="Color" key="Foreground_Color">
<label>Foreground color.</label>
- <default code="true">KApplication::palette().active().text()</default>
+ <default code="true">TDEApplication::palette().active().text()</default>
</entry>
<entry name="DateBackgroundColor" type="Color" key="Background_Color">
<label>Foreground color.</label>
- <default code="true">KApplication::palette().active().background()</default>
+ <default code="true">TDEApplication::palette().active().background()</default>
</entry>
<entry name="DateFont" type="Font" key="Font">
<label>Font for the clock.</label>
@@ -63,11 +63,11 @@ defFont.setBold(true);
</entry>
<entry name="PlainForegroundColor" type="Color" key="Foreground_Color">
<label>Foreground color.</label>
- <default code="true">KApplication::palette().active().text()</default>
+ <default code="true">TDEApplication::palette().active().text()</default>
</entry>
<entry name="PlainBackgroundColor" type="Color" key="Background_Color">
<label>Background color.</label>
- <default code="true">KApplication::palette().active().background()</default>
+ <default code="true">TDEApplication::palette().active().background()</default>
</entry>
</group>
<group name="Digital">
@@ -89,15 +89,15 @@ defFont.setBold(true);
</entry>
<entry name="DigitalForegroundColor" type="Color" key="Foreground_Color">
<label>Foreground color.</label>
- <default code="true">KApplication::palette().active().text()</default>
+ <default code="true">TDEApplication::palette().active().text()</default>
</entry>
<entry name="DigitalBackgroundColor" type="Color" key="Background_Color">
<label>Background color.</label>
- <default code="true">KApplication::palette().active().background()</default>
+ <default code="true">TDEApplication::palette().active().background()</default>
</entry>
<entry name="DigitalShadowColor" type="Color" key="Shadow_Color">
<label>Shadow color.</label>
- <default code="true">KApplication::palette().active().mid()</default>
+ <default code="true">TDEApplication::palette().active().mid()</default>
</entry>
<entry name="DigitalBlink" type="Bool" key="Blink">
<label>Blink</label>
@@ -127,15 +127,15 @@ defFont.setBold(true);
</entry>
<entry name="AnalogForegroundColor" type="Color" key="Foreground_Color">
<label>Foreground color.</label>
- <default code="true">KApplication::palette().active().text()</default>
+ <default code="true">TDEApplication::palette().active().text()</default>
</entry>
<entry name="AnalogBackgroundColor" type="Color" key="Background_Color">
<label>Background color.</label>
- <default code="true">KApplication::palette().active().background()</default>
+ <default code="true">TDEApplication::palette().active().background()</default>
</entry>
<entry name="AnalogShadowColor" type="Color" key="Shadow_Color">
<label>Shadow color.</label>
- <default code="true">KApplication::palette().active().mid()</default>
+ <default code="true">TDEApplication::palette().active().mid()</default>
</entry>
<entry name="AnalogLCDStyle" type="Bool" key="LCD_Style">
<label>LCD Style</label>
@@ -168,11 +168,11 @@ defFont=KGlobalSettings::generalFont();
</entry>
<entry name="FuzzyForegroundColor" type="Color" key="Foreground_Color">
<label>Foreground color.</label>
- <default code="true">KApplication::palette().active().text()</default>
+ <default code="true">TDEApplication::palette().active().text()</default>
</entry>
<entry name="FuzzyBackgroundColor" type="Color" key="Background_Color">
<label>Background color.</label>
- <default code="true">KApplication::palette().active().background()</default>
+ <default code="true">TDEApplication::palette().active().background()</default>
</entry>
<entry name="Fuzzyness" type="Int">
<label>Fuzzyness</label>
diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp
index 30b125726..3f46b6b11 100644
--- a/kicker/applets/launcher/quicklauncher.cpp
+++ b/kicker/applets/launcher/quicklauncher.cpp
@@ -129,7 +129,7 @@ QuickLauncher::QuickLauncher(const TQString& configFile, Type type, int actions,
DEBUGSTR << " QuickLauncher::QuickLauncher(" << configFile <<
",...) END" << endl << flush;
- DCOPClient *dcopClient = KApplication::dcopClient();
+ DCOPClient *dcopClient = TDEApplication::dcopClient();
dcopClient->connectDCOPSignal(0, "appLauncher",
"serviceStartedByStorageId(TQString,TQString)",
"QuickLauncherApplet",
diff --git a/kicker/extensions/kasbar/ChangeLog b/kicker/extensions/kasbar/ChangeLog
index 0a899bd1d..8cbb33868 100644
--- a/kicker/extensions/kasbar/ChangeLog
+++ b/kicker/extensions/kasbar/ChangeLog
@@ -510,7 +510,7 @@
2003-08-07 Thursday 19:51 lunakl
* Rewrite handling of _NET_WM_ICON_NAME. This together with the
- recent KApplication change should hopefully make taskbar again
+ recent TDEApplication change should hopefully make taskbar again
display what it's supposed to display. Please yell if something
is still wrong.
diff --git a/kicker/extensions/kasbar/kasbarapp.cpp b/kicker/extensions/kasbar/kasbarapp.cpp
index 34341cbfe..169fe5b52 100644
--- a/kicker/extensions/kasbar/kasbarapp.cpp
+++ b/kicker/extensions/kasbar/kasbarapp.cpp
@@ -78,7 +78,7 @@ int main( int argc, char **argv )
TDECmdLineArgs::init( argc, argv, "kasbar", "KasBar", I18N_NOOP( "An alternative task manager" ), VERSION_STRING );
TDECmdLineArgs::addCmdLineOptions( options );
KGlobal::locale()->setMainCatalogue( "kasbarextension" );
- KApplication app;
+ TDEApplication app;
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
kdDebug(1345) << "Kasbar starting..." << endl;
@@ -116,7 +116,7 @@ int main( int argc, char **argv )
KWin::setOnAllDesktops( kasbar->winId(), true );
kdDebug() << "kasbar: Window id is " << kasbar->winId() << endl;
- KApplication::kApplication()->dcopClient()->registerAs( "kasbar" );
+ TDEApplication::kApplication()->dcopClient()->registerAs( "kasbar" );
app.connect( &app, TQT_SIGNAL( lastWindowClosed() ), TQT_SLOT(quit()) );
diff --git a/kicker/extensions/kasbar/kasbarextension.cpp b/kicker/extensions/kasbar/kasbarextension.cpp
index c0a55753a..3a3a023fb 100644
--- a/kicker/extensions/kasbar/kasbarextension.cpp
+++ b/kicker/extensions/kasbar/kasbarextension.cpp
@@ -92,7 +92,7 @@ KasBarExtension::KasBarExtension( const TQString& configFile,
detached_( false )
{
kdDebug(1345) << "KasBarExtension: Created '" << name << "', '" << configFile << "'" << endl;
-// KApplication::kApplication()->dcopClient()->registerAs( "kasbar" );
+// TDEApplication::kApplication()->dcopClient()->registerAs( "kasbar" );
// setBackgroundMode( NoBackground );
kasbar = new KasTasker( orientation(), this, name );
diff --git a/kicker/kicker/buttons/kbutton.cpp b/kicker/kicker/buttons/kbutton.cpp
index a07a06cfc..5cec2ae22 100644
--- a/kicker/kicker/buttons/kbutton.cpp
+++ b/kicker/kicker/buttons/kbutton.cpp
@@ -66,7 +66,7 @@ KButton::~KButton()
void KButton::properties()
{
- KApplication::startServiceByDesktopName("kmenuedit", TQStringList(),
+ TDEApplication::startServiceByDesktopName("kmenuedit", TQStringList(),
0, 0, 0, "", true);
}
diff --git a/kicker/kicker/buttons/urlbutton.cpp b/kicker/kicker/buttons/urlbutton.cpp
index a61b5d775..3b70fe9c2 100644
--- a/kicker/kicker/buttons/urlbutton.cpp
+++ b/kicker/kicker/buttons/urlbutton.cpp
@@ -146,7 +146,7 @@ void URLButton::dropEvent(TQDropEvent *ev)
KURL url( fileItem->url() );
if(!execList.isEmpty()) {
if (KDesktopFile::isDesktopFile(url.path())){
- KApplication::startServiceByDesktopPath(url.path(), execList.toStringList(),
+ TDEApplication::startServiceByDesktopPath(url.path(), execList.toStringList(),
0, 0, 0, "", true);
}
else // attempt to interpret path as directory
diff --git a/kicker/kicker/core/kicker.cpp b/kicker/kicker/core/kicker.cpp
index 7410d4877..e965d3761 100644
--- a/kicker/kicker/core/kicker.cpp
+++ b/kicker/kicker/core/kicker.cpp
@@ -188,7 +188,7 @@ bool Kicker::desktopShowing()
void Kicker::slotSettingsChanged(int category)
{
- if (category == (int)KApplication::SETTINGS_SHORTCUTS)
+ if (category == (int)TDEApplication::SETTINGS_SHORTCUTS)
{
keys->readSettings();
keys->updateConnections();
diff --git a/kicker/kicker/core/main.cpp b/kicker/kicker/core/main.cpp
index 4dc4c9864..82f82502c 100644
--- a/kicker/kicker/core/main.cpp
+++ b/kicker/kicker/core/main.cpp
@@ -139,7 +139,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
if (signal(SIGHUP, sighandler) == SIG_IGN)
signal(SIGHUP, SIG_IGN);
- // send it even before KApplication ctor, because ksmserver will launch another app as soon
+ // send it even before TDEApplication ctor, because ksmserver will launch another app as soon
// as TQApplication registers with it
DCOPClient* cl = new DCOPClient;
cl->attach();
diff --git a/kicker/kicker/core/menumanager.cpp b/kicker/kicker/core/menumanager.cpp
index 763b6cbc1..fd51c9f82 100644
--- a/kicker/kicker/core/menumanager.cpp
+++ b/kicker/kicker/core/menumanager.cpp
@@ -150,7 +150,7 @@ void MenuManager::kmenuAccelActivated()
// no button to use, make it behave like a desktop menu
TQPoint p;
// Popup the K-menu at the center of the screen.
- TQDesktopWidget* desktop = KApplication::desktop();
+ TQDesktopWidget* desktop = TDEApplication::desktop();
TQRect r;
if (desktop->numScreens() < 2)
r = desktop->geometry();
diff --git a/kicker/kicker/kicker-3.4-reverseLayout.cpp b/kicker/kicker/kicker-3.4-reverseLayout.cpp
index 110e1692f..d3fd5f755 100644
--- a/kicker/kicker/kicker-3.4-reverseLayout.cpp
+++ b/kicker/kicker/kicker-3.4-reverseLayout.cpp
@@ -23,7 +23,7 @@ int main(int argc, char** argv)
{
// We must disguise as Kicker in order to obtain the correct reverseLayout setting.
TDECmdLineArgs::init(argc, argv, "kicker", "", "", "", false);
- KApplication app(false, false);
+ TDEApplication app(false, false);
TQStringList stretchableApplets;
stretchableApplets << "taskbarapplet.desktop";
diff --git a/kicker/kicker/plugins/kickoff-beagle-plugin.cpp b/kicker/kicker/plugins/kickoff-beagle-plugin.cpp
index 3cad77ca4..223074a8d 100644
--- a/kicker/kicker/plugins/kickoff-beagle-plugin.cpp
+++ b/kicker/kicker/plugins/kickoff-beagle-plugin.cpp
@@ -132,7 +132,7 @@ void KickoffBeaglePlugin::query(TQString term, bool _genericTitle)
kdDebug () << "Previous client w/id " << current_beagle_client->id << " still running ... ignoring it." << endl;
current_beagle_client->stopClient ();
}
- current_beagle_client_id = KApplication::random ();
+ current_beagle_client_id = TDEApplication::random ();
kdDebug () << "Creating client with id:" << current_beagle_client_id << endl;
BeagleClient *beagle_client = beagle_client_new (NULL);
diff --git a/kicker/kicker/ui/hidebutton.cpp b/kicker/kicker/ui/hidebutton.cpp
index 25263e872..cd023eb8a 100644
--- a/kicker/kicker/ui/hidebutton.cpp
+++ b/kicker/kicker/ui/hidebutton.cpp
@@ -44,7 +44,7 @@ HideButton::HideButton(TQWidget *parent, const char *name)
kapp->addKipcEventMask(KIPC::SettingsChanged);
kapp->addKipcEventMask(KIPC::IconChanged);
- slotSettingsChanged(KApplication::SETTINGS_MOUSE);
+ slotSettingsChanged(TDEApplication::SETTINGS_MOUSE);
}
void HideButton::drawButton(TQPainter *p)
@@ -148,7 +148,7 @@ void HideButton::generateIcons()
void HideButton::slotSettingsChanged(int category)
{
- if (category != KApplication::SETTINGS_MOUSE)
+ if (category != TDEApplication::SETTINGS_MOUSE)
{
return;
}
diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp
index 702c92173..48ef522fd 100644
--- a/kicker/kicker/ui/k_mnu.cpp
+++ b/kicker/kicker/ui/k_mnu.cpp
@@ -87,7 +87,7 @@ PanelKMenu::PanelKMenu()
setCaption(i18n("TDE Menu"));
connect(Kicker::the(), TQT_SIGNAL(configurationChanged()),
this, TQT_SLOT(configChanged()));
- DCOPClient *dcopClient = KApplication::dcopClient();
+ DCOPClient *dcopClient = TDEApplication::dcopClient();
dcopClient->connectDCOPSignal(0, "appLauncher",
"serviceStartedByStorageId(TQString,TQString)",
dcopObjId,
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index e8a51fe28..eb7fc8114 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -2554,7 +2554,7 @@ void KMenu::slotStartService(KService::Ptr ptr)
accept();
addToHistory();
- KApplication::startServiceByDesktopPath(ptr->desktopEntryPath(),
+ TDEApplication::startServiceByDesktopPath(ptr->desktopEntryPath(),
TQStringList(), 0, 0, 0, "", true);
updateRecentlyUsedApps(ptr);
}
@@ -2587,12 +2587,12 @@ void KMenu::slotStartURL(const TQString& u)
kapp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params);
#else
DCOPRef mediamanager("ksmserver", "ksmserver");
- DCOPReply reply = mediamanager.call( "logoutTimed", (int)KApplication::ShutdownTypeNone, (int)KApplication::ShutdownModeDefault );
+ DCOPReply reply = mediamanager.call( "logoutTimed", (int)TDEApplication::ShutdownTypeNone, (int)TDEApplication::ShutdownModeDefault );
if (!reply.isValid() && KMessageBox::Continue==KMessageBox::warningContinueCancel(this, i18n("Do you really want to end the session?"),
i18n("Logout Confirmation"), KGuiItem(i18n("Logout"),"undo")))
- kapp->requestShutDown( KApplication::ShutdownConfirmNo,
- KApplication::ShutdownTypeNone,
- KApplication::ShutdownModeDefault );
+ kapp->requestShutDown( TDEApplication::ShutdownConfirmNo,
+ TDEApplication::ShutdownTypeNone,
+ TDEApplication::ShutdownModeDefault );
#endif
}
@@ -2610,9 +2610,9 @@ void KMenu::slotStartURL(const TQString& u)
#else
if (KMessageBox::Continue==KMessageBox::warningContinueCancel(this, i18n("Do you really want to turn off the computer?"),
i18n("Shutdown Confirmation"), KGuiItem(i18n("Shutdown"),"exit")))
- kapp->requestShutDown( KApplication::ShutdownConfirmNo,
- KApplication::ShutdownTypeHalt,
- KApplication::ShutdownModeDefault );
+ kapp->requestShutDown( TDEApplication::ShutdownConfirmNo,
+ TDEApplication::ShutdownTypeHalt,
+ TDEApplication::ShutdownModeDefault );
#endif
}
else if ( u == "kicker:/restart" ) {
@@ -2625,9 +2625,9 @@ void KMenu::slotStartURL(const TQString& u)
#else
if (KMessageBox::Continue==KMessageBox::warningContinueCancel(this, i18n("Do you really want to reset the computer and boot (another operating system)?"),
i18n("Restart Confirmation"), KGuiItem(i18n("Restart"),"reload")))
- kapp->requestShutDown( KApplication::ShutdownConfirmNo,
- KApplication::ShutdownTypeReboot,
- KApplication::ShutdownModeDefault );
+ kapp->requestShutDown( TDEApplication::ShutdownConfirmNo,
+ TDEApplication::ShutdownTypeReboot,
+ TDEApplication::ShutdownModeDefault );
#endif
}
#ifdef KDELIBS_SUSE
@@ -3197,7 +3197,7 @@ void KMenu::notifyServiceStarted(KService::Ptr service)
TQDataStream stream(params, IO_WriteOnly);
stream << "minicli" << service->storageId();
kdDebug() << "minicli appLauncher dcop signal: " << service->storageId() << endl;
- KApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher",
+ TDEApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher",
"serviceStartedByStorageId(TQString,TQString)", params);
}
diff --git a/kicker/kicker/ui/recentapps.cpp b/kicker/kicker/ui/recentapps.cpp
index 473b0cdf2..6e3802fe0 100644
--- a/kicker/kicker/ui/recentapps.cpp
+++ b/kicker/kicker/ui/recentapps.cpp
@@ -112,7 +112,7 @@ void RecentlyLaunchedApps::appLaunched(const TQString& strApp)
TQByteArray params;
TQDataStream stream(params, IO_WriteOnly);
stream << launchDCOPSignalSource() << strApp;
- KApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher",
+ TDEApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher",
"serviceStartedByStorageId(TQString,TQString)", params);
for (TQValueList<RecentlyLaunchedAppInfo>::iterator it = m_appInfos.begin();
diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp
index 6cb184c72..8a483f086 100644
--- a/kicker/kicker/ui/service_mnu.cpp
+++ b/kicker/kicker/ui/service_mnu.cpp
@@ -554,7 +554,7 @@ void PanelServiceMenu::slotExec(int id)
kapp->propagateSessionManager();
KService::Ptr service = static_cast<KService *>(e);
- KApplication::startServiceByDesktopPath(service->desktopEntryPath(),
+ TDEApplication::startServiceByDesktopPath(service->desktopEntryPath(),
TQStringList(), 0, 0, 0, "", true);
updateRecentlyUsedApps(service);
diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp
index e6a698153..c862b09c5 100644
--- a/kicker/libkicker/panelbutton.cpp
+++ b/kicker/libkicker/panelbutton.cpp
@@ -86,7 +86,7 @@ PanelButton::PanelButton( TQWidget* parent, const char* name, bool forceStandard
m_textColor = KGlobalSettings::textColor();
- updateSettings(KApplication::SETTINGS_MOUSE);
+ updateSettings(TDEApplication::SETTINGS_MOUSE);
kapp->addKipcEventMask(KIPC::SettingsChanged | KIPC::IconChanged);
@@ -219,7 +219,7 @@ void PanelButton::updateIcon(int group)
void PanelButton::updateSettings(int category)
{
- if (category != KApplication::SETTINGS_MOUSE)
+ if (category != TDEApplication::SETTINGS_MOUSE)
{
return;
}
diff --git a/kicker/libkicker/panelbutton.h b/kicker/libkicker/panelbutton.h
index 7fd2cca6d..3a455a58f 100644
--- a/kicker/libkicker/panelbutton.h
+++ b/kicker/libkicker/panelbutton.h
@@ -352,14 +352,14 @@ protected:
protected slots:
/**
- * Called from KApplication when global icon settings have changed.
+ * Called from TDEApplication when global icon settings have changed.
* @param group the new group
*/
void updateIcon(int group);
/**
- * Called from KApplication when global settings have changed.
- * @param category the settings category, see KApplication::SettingsCategory
+ * Called from TDEApplication when global settings have changed.
+ * @param category the settings category, see TDEApplication::SettingsCategory
*/
void updateSettings(int category);
diff --git a/kicker/libkicker/simplebutton.cpp b/kicker/libkicker/simplebutton.cpp
index d4ca8faac..178277c25 100644
--- a/kicker/libkicker/simplebutton.cpp
+++ b/kicker/libkicker/simplebutton.cpp
@@ -55,7 +55,7 @@ SimpleButton::SimpleButton(TQWidget *parent, const char *name, bool forceStandar
kapp->addKipcEventMask( KIPC::SettingsChanged );
kapp->addKipcEventMask( KIPC::IconChanged );
- slotSettingsChanged( KApplication::SETTINGS_MOUSE );
+ slotSettingsChanged( TDEApplication::SETTINGS_MOUSE );
}
void SimpleButton::setPixmap(const TQPixmap &pix)
@@ -165,7 +165,7 @@ void SimpleButton::generateIcons()
void SimpleButton::slotSettingsChanged(int category)
{
- if (category != KApplication::SETTINGS_MOUSE)
+ if (category != TDEApplication::SETTINGS_MOUSE)
{
return;
}
diff --git a/kicker/menuext/find/findmenu.cpp b/kicker/menuext/find/findmenu.cpp
index 24020e0c2..a3138102b 100644
--- a/kicker/menuext/find/findmenu.cpp
+++ b/kicker/menuext/find/findmenu.cpp
@@ -77,7 +77,7 @@ void FindMenu::slotExec( int pos )
}
else
{
- KApplication::startServiceByDesktopPath( app );
+ TDEApplication::startServiceByDesktopPath( app );
}
}
diff --git a/kicker/menuext/konsole/konsole_mnu.cpp b/kicker/menuext/konsole/konsole_mnu.cpp
index 7eab40c34..093b4fc5e 100644
--- a/kicker/menuext/konsole/konsole_mnu.cpp
+++ b/kicker/menuext/konsole/konsole_mnu.cpp
@@ -258,7 +258,7 @@ void KonsoleMenu::slotExec(int id)
args << "-r";
args << screenList[id - sessionList.count()];
}
- KApplication::tdeinitExec("konsole", args);
+ TDEApplication::tdeinitExec("konsole", args);
return;
}
@@ -292,7 +292,7 @@ void KonsoleMenu::newSession(const TQString& sURL, const TQString& title)
{
args << "-T" << title;
args << "--workdir" << url.path();
- KApplication::tdeinitExec("konsole", args);
+ TDEApplication::tdeinitExec("konsole", args);
return;
}
else if ((!url.protocol().isEmpty()) && (url.hasHost()))
@@ -305,7 +305,7 @@ void KonsoleMenu::newSession(const TQString& sURL, const TQString& title)
args << "-l" << url.user().latin1();
}
args << host.latin1();
- KApplication::tdeinitExec("konsole", args);
+ TDEApplication::tdeinitExec("konsole", args);
return;
}
/*
diff --git a/kicker/menuext/prefmenu/prefmenu.cpp b/kicker/menuext/prefmenu/prefmenu.cpp
index 93a948dee..ee2a5268d 100644
--- a/kicker/menuext/prefmenu/prefmenu.cpp
+++ b/kicker/menuext/prefmenu/prefmenu.cpp
@@ -331,7 +331,7 @@ void PrefMenu::slotExec(int id)
kapp->propagateSessionManager();
KSycocaEntry *e = m_entryMap[id];
KService::Ptr service = static_cast<KService *>(e);
- KApplication::startServiceByDesktopPath(service->desktopEntryPath(),
+ TDEApplication::startServiceByDesktopPath(service->desktopEntryPath(),
TQStringList(), 0, 0, 0, "", true);
m_dragStartPos = TQPoint(-1,-1);
}
@@ -378,7 +378,7 @@ void PrefMenu::aboutToClose()
void PrefMenu::launchControlCenter()
{
- KApplication::startServiceByDesktopName("kcontrol", TQStringList(),
+ TDEApplication::startServiceByDesktopName("kcontrol", TQStringList(),
0, 0, 0, "", true);
}
diff --git a/kicker/menuext/tom/tom.cc b/kicker/menuext/tom/tom.cc
index cdedfc73d..8e41497b6 100644
--- a/kicker/menuext/tom/tom.cc
+++ b/kicker/menuext/tom/tom.cc
@@ -827,7 +827,7 @@ void TOM::runTask(int id)
if (!m_tasks.contains(id)) return;
kapp->propagateSessionManager();
- KApplication::startServiceByDesktopPath(m_tasks[id]->desktopEntryPath(),
+ TDEApplication::startServiceByDesktopPath(m_tasks[id]->desktopEntryPath(),
TQStringList(), 0, 0, 0, "", true);
}
diff --git a/kicker/proxy/appletproxy.cpp b/kicker/proxy/appletproxy.cpp
index 04e81612e..328cec09c 100644
--- a/kicker/proxy/appletproxy.cpp
+++ b/kicker/proxy/appletproxy.cpp
@@ -78,10 +78,10 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
TDECmdLineArgs::init(argc, argv, &aboutData );
aboutData.addAuthor("Matthias Elter",0, "elter@kde.org");
aboutData.addAuthor("Matthias Ettrich",0, "ettrich@kde.org");
- KApplication::addCmdLineOptions();
+ TDEApplication::addCmdLineOptions();
TDECmdLineArgs::addCmdLineOptions(options); // Add our own options.
- KApplication a;
+ TDEApplication a;
a.disableSessionManagement();
KGlobal::dirs()->addResourceType("applets", KStandardDirs::kde_default("data") +
diff --git a/kicker/proxy/extensiondebugger.cpp b/kicker/proxy/extensiondebugger.cpp
index 4fa1d8332..0910294b1 100644
--- a/kicker/proxy/extensiondebugger.cpp
+++ b/kicker/proxy/extensiondebugger.cpp
@@ -82,10 +82,10 @@ int main( int argc, char ** argv )
TDECmdLineArgs::init(argc, argv, &aboutData );
aboutData.addAuthor("Matthias Elter",0, "elter@kde.org");
aboutData.addAuthor("Matthias Ettrich",0, "ettrich@kde.org");
- KApplication::addCmdLineOptions();
+ TDEApplication::addCmdLineOptions();
TDECmdLineArgs::addCmdLineOptions(options); // Add our own options.
- KApplication a;
+ TDEApplication a;
a.disableSessionManagement();
KGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") +
diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp
index eab6f4bb4..a5345dfcf 100644
--- a/kicker/proxy/extensionproxy.cpp
+++ b/kicker/proxy/extensionproxy.cpp
@@ -64,10 +64,10 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
TDECmdLineArgs::init(argc, argv, &aboutData );
aboutData.addAuthor("Matthias Elter",0, "elter@kde.org");
aboutData.addAuthor("Matthias Ettrich",0, "ettrich@kde.org");
- KApplication::addCmdLineOptions();
+ TDEApplication::addCmdLineOptions();
TDECmdLineArgs::addCmdLineOptions(options); // Add our own options.
- KApplication a;
+ TDEApplication a;
a.disableSessionManagement();
KGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") +
diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp
index fdb7e0ebf..131a1d79d 100644
--- a/kicker/taskbar/taskbar.cpp
+++ b/kicker/taskbar/taskbar.cpp
@@ -1176,7 +1176,7 @@ void TaskBar::slotActivatePreviousTask()
void TaskBar::slotSettingsChanged( int category )
{
- if( category == (int) KApplication::SETTINGS_SHORTCUTS )
+ if( category == (int) TDEApplication::SETTINGS_SHORTCUTS )
{
keys->readSettings();
keys->updateConnections();