summaryrefslogtreecommitdiffstats
path: root/kicker/applets
diff options
context:
space:
mode:
Diffstat (limited to 'kicker/applets')
-rw-r--r--kicker/applets/clock/clock.cpp8
-rw-r--r--kicker/applets/launcher/quickbutton.cpp2
-rw-r--r--kicker/applets/lockout/lockout.cpp16
-rw-r--r--kicker/applets/menu/menuapplet.cpp2
-rw-r--r--kicker/applets/minipager/pagerapplet.cpp12
-rw-r--r--kicker/applets/minipager/pagerbutton.cpp2
-rw-r--r--kicker/applets/run/runapplet.cpp4
-rw-r--r--kicker/applets/swallow/swallow.cpp4
-rw-r--r--kicker/applets/systemtray/systemtrayapplet.cpp6
-rw-r--r--kicker/applets/taskbar/taskbarapplet.cpp2
10 files changed, 29 insertions, 29 deletions
diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp
index c8432f7e8..dab00ba20 100644
--- a/kicker/applets/clock/clock.cpp
+++ b/kicker/applets/clock/clock.cpp
@@ -919,12 +919,12 @@ ClockApplet::ClockApplet(const TQString& configFile, Type t, int actions,
connect(m_layoutTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(fixupLayout()));
connect(_timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotUpdate()));
- connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(globalPaletteChange()));
+ connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(globalPaletteChange()));
reconfigure(); // initialize clock widget
slotUpdate();
- if (kapp->authorizeTDEAction("kicker_rmb"))
+ if (tdeApp->authorizeTDEAction("kicker_rmb"))
{
menu = new TDEPopupMenu();
connect(menu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(aboutToShowContextMenu()));
@@ -1485,7 +1485,7 @@ void ClockApplet::toggleCalendar()
void ClockApplet::openContextMenu()
{
- if (!menu || !kapp->authorizeTDEAction("kicker_rmb"))
+ if (!menu || !tdeApp->authorizeTDEAction("kicker_rmb"))
return;
menu->exec( TQCursor::pos() );
@@ -1585,7 +1585,7 @@ void ClockApplet::aboutToShowContextMenu()
menu->insertItem(i18n("&Type"), type_menu, 101, 1);
menu->insertItem(i18n("Show Time&zone"), zoneMenu, 110, 2);
- 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/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp
index 2b09dac34..5878c0acd 100644
--- a/kicker/applets/launcher/quickbutton.cpp
+++ b/kicker/applets/launcher/quickbutton.cpp
@@ -118,7 +118,7 @@ QuickURL::QuickURL(const TQString &u)
}
void QuickURL::run() const
-{ kapp->propagateSessionManager(); // is this needed?
+{ tdeApp->propagateSessionManager(); // is this needed?
if (_service)
KRun::run(*(_service), KURL::List());
else
diff --git a/kicker/applets/lockout/lockout.cpp b/kicker/applets/lockout/lockout.cpp
index f0d6a7e85..770a8431f 100644
--- a/kicker/applets/lockout/lockout.cpp
+++ b/kicker/applets/lockout/lockout.cpp
@@ -88,19 +88,19 @@ Lockout::Lockout( const TQString& configFile, TQWidget *parent, const char *name
lockButton->installEventFilter( this );
logoutButton->installEventFilter( this );
- if (!kapp->authorize("lock_screen"))
+ if (!tdeApp->authorize("lock_screen"))
lockButton->hide();
- if (!kapp->authorize("logout"))
+ if (!tdeApp->authorize("logout"))
logoutButton->hide();
lockButton->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
logoutButton->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
- if ( !kapp->dcopClient()->isAttached() )
- kapp->dcopClient()->attach();
+ if ( !tdeApp->dcopClient()->isAttached() )
+ tdeApp->dcopClient()->attach();
- connect( kapp, TQ_SIGNAL( iconChanged(int) ), TQ_SLOT( slotIconChanged() ));
+ connect( tdeApp, TQ_SIGNAL( iconChanged(int) ), TQ_SLOT( slotIconChanged() ));
}
Lockout::~Lockout()
@@ -146,12 +146,12 @@ void Lockout::lock()
int kicker_screen_number = tqt_xscreen();
if ( kicker_screen_number )
appname.sprintf("kdesktop-screen-%d", kicker_screen_number);
- kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString(""));
+ tdeApp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString(""));
}
void Lockout::logout()
{
- kapp->requestShutDown();
+ tdeApp->requestShutDown();
}
void Lockout::mousePressEvent(TQMouseEvent* e)
@@ -185,7 +185,7 @@ void Lockout::propagateMouseEvent(TQMouseEvent* e)
bool Lockout::eventFilter( TQObject *o, TQEvent *e )
{
- if (!kapp->authorizeTDEAction("kicker_rmb"))
+ if (!tdeApp->authorizeTDEAction("kicker_rmb"))
return false; // Process event normally:
if( e->type() == TQEvent::MouseButtonPress )
diff --git a/kicker/applets/menu/menuapplet.cpp b/kicker/applets/menu/menuapplet.cpp
index 52e3da93b..d1aae0268 100644
--- a/kicker/applets/menu/menuapplet.cpp
+++ b/kicker/applets/menu/menuapplet.cpp
@@ -89,7 +89,7 @@ Applet::Applet( const TQString& configFile_P, TQWidget* parent_P )
setBackgroundOrigin(AncestorOrigin);
dcopclient.registerAs( "menuapplet", false );
// toolbarAppearanceChanged(int) is sent when changing macstyle
- connect( kapp, TQ_SIGNAL( toolbarAppearanceChanged( int )),
+ connect( tdeApp, TQ_SIGNAL( toolbarAppearanceChanged( int )),
this, TQ_SLOT( readSettings()));
claimSelection();
readSettings();
diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp
index 25e6e040d..fb805bef5 100644
--- a/kicker/applets/minipager/pagerapplet.cpp
+++ b/kicker/applets/minipager/pagerapplet.cpp
@@ -141,9 +141,9 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions,
connect( m_twin, TQ_SIGNAL( windowRemoved(WId) ), this, TQ_SLOT( slotWindowRemoved(WId) ) );
connect( m_twin, TQ_SIGNAL( windowChanged(WId,unsigned int) ), this, TQ_SLOT( slotWindowChanged(WId,unsigned int) ) );
connect( m_twin, TQ_SIGNAL( desktopNamesChanged() ), this, TQ_SLOT( slotDesktopNamesChanged() ) );
- connect( kapp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int)) );
+ connect( tdeApp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int)) );
- if (kapp->authorizeTDEAction("kicker_rmb") && kapp->authorizeControlModule("tde-kcmtaskbar.desktop"))
+ if (tdeApp->authorizeTDEAction("kicker_rmb") && tdeApp->authorizeControlModule("tde-kcmtaskbar.desktop"))
{
m_contextMenu = new TQPopupMenu();
connect(m_contextMenu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(aboutToShowContextMenu()));
@@ -799,7 +799,7 @@ void KMiniPager::contextMenuActivated(int result)
return;
case ConfigureDesktops:
- kapp->startServiceByDesktopName("desktop");
+ tdeApp->startServiceByDesktopName("desktop");
return;
case RenameDesktop:
@@ -883,7 +883,7 @@ void KMiniPager::slotDesktopNamesChanged()
void KMiniPager::showPager()
{
- DCOPClient *dcop=kapp->dcopClient();
+ DCOPClient *dcop=tdeApp->dcopClient();
if (dcop->isApplicationRegistered("kpager"))
{
@@ -922,7 +922,7 @@ void KMiniPager::showKPager(bool toggleShow)
pt=mapToGlobal( TQPoint(x(), y()) );
}
- DCOPClient *dcop=kapp->dcopClient();
+ DCOPClient *dcop=tdeApp->dcopClient();
TQByteArray data;
TQDataStream arg(data, IO_WriteOnly);
@@ -941,7 +941,7 @@ void KMiniPager::applicationRegistered( const TQCString & appName )
{
if (appName == "kpager")
{
- disconnect( kapp->dcopClient(), TQ_SIGNAL( applicationRegistered(const TQCString &) ),
+ disconnect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRegistered(const TQCString &) ),
this, TQ_SLOT(applicationRegistered(const TQCString &)) );
showKPager(false);
}
diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp
index 22f59956d..517f81cfe 100644
--- a/kicker/applets/minipager/pagerbutton.cpp
+++ b/kicker/applets/minipager/pagerbutton.cpp
@@ -213,7 +213,7 @@ void KMiniPagerButton::loadBgPixmap()
if (m_pager->bgType() != PagerSettings::EnumBackgroundType::BgLive)
return; // not needed
- DCOPClient *client = kapp->dcopClient();
+ DCOPClient *client = tdeApp->dcopClient();
if (!client->isAttached())
{
client->attach();
diff --git a/kicker/applets/run/runapplet.cpp b/kicker/applets/run/runapplet.cpp
index 3d1321140..104cd5efe 100644
--- a/kicker/applets/run/runapplet.cpp
+++ b/kicker/applets/run/runapplet.cpp
@@ -209,7 +209,7 @@ void RunApplet::run_command(const TQString& command)
TQString exec;
bool focusNeeded = false;
- kapp->propagateSessionManager();
+ tdeApp->propagateSessionManager();
_filterData->setData( _input->currentText().stripWhiteSpace() );
TQStringList filters;
@@ -230,7 +230,7 @@ void RunApplet::run_command(const TQString& command)
}
else if (cmd == "logout")
{
- bool shutdown = kapp->requestShutDown();
+ bool shutdown = tdeApp->requestShutDown();
if( !shutdown )
{
// This i18n string is in kdesktop/desktop.cpp as well. Maybe we should DCOP to kdesktop instead ?
diff --git a/kicker/applets/swallow/swallow.cpp b/kicker/applets/swallow/swallow.cpp
index cd1e45795..a9eea202e 100644
--- a/kicker/applets/swallow/swallow.cpp
+++ b/kicker/applets/swallow/swallow.cpp
@@ -161,7 +161,7 @@ void SwallowApplet::createApps( SwallowCommandList* list )
TQ_SLOT( embedded(SwallowApp *)));
appList->append( app );
++it;
- kapp->processEvents();
+ tdeApp->processEvents();
}
m_layout->activate();
@@ -287,7 +287,7 @@ SwallowApp::SwallowApp(const SwallowCommand *swc, TQWidget* parent,
// move window out of sight
// *process << "-geometry";
- // *process << TQString("32x32+%1+%2").arg(kapp->desktop()->width()).arg(kapp->desktop()->height());
+ // *process << TQString("32x32+%1+%2").arg(tdeApp->desktop()->width()).arg(tdeApp->desktop()->height());
connect(process, TQ_SIGNAL(processExited(TDEProcess*)),
this, TQ_SLOT(processExited(TDEProcess*)));
diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp
index 50781f9cd..d243b318e 100644
--- a/kicker/applets/systemtray/systemtrayapplet.cpp
+++ b/kicker/applets/systemtray/systemtrayapplet.cpp
@@ -106,9 +106,9 @@ SystemTrayApplet::SystemTrayApplet(const TQString& configFile, Type type, int ac
twin_module = new KWinModule(this);
- // kApplication notifies us of settings changes. added to support
+ // tdeApp notifies us of settings changes. added to support
// disabling of frame effect on mouse hover
- kapp->dcopClient()->setNotifications(true);
+ tdeApp->dcopClient()->setNotifications(true);
connectDCOPSignal("kicker", "kicker", "configurationChanged()", "loadSettings()", false);
TQTimer::singleShot(0, this, TQ_SLOT(initialize()));
@@ -682,7 +682,7 @@ void SystemTrayApplet::refreshExpandButton()
if (orientation() == TQt::Vertical)
a = m_showHidden ? TQt::DownArrow : TQt::UpArrow;
else
- a = (m_showHidden ^ kapp->reverseLayout()) ? TQt::RightArrow : TQt::LeftArrow;
+ a = (m_showHidden ^ tdeApp->reverseLayout()) ? TQt::RightArrow : TQt::LeftArrow;
m_expandButton->setArrowType(a);
}
diff --git a/kicker/applets/taskbar/taskbarapplet.cpp b/kicker/applets/taskbar/taskbarapplet.cpp
index 3c9bbead7..a34db8b73 100644
--- a/kicker/applets/taskbar/taskbarapplet.cpp
+++ b/kicker/applets/taskbar/taskbarapplet.cpp
@@ -43,7 +43,7 @@ extern "C"
// FIXME: what about two taskbars? perhaps this should be inserted just once
TDEGlobal::locale()->insertCatalogue( "ktaskbarapplet" );
int options = 0;
- if (kapp->authorizeControlModule("tde-kcmtaskbar.desktop"))
+ if (tdeApp->authorizeControlModule("tde-kcmtaskbar.desktop"))
options = KPanelApplet::Preferences;
TaskbarApplet *taskbar = new TaskbarApplet( configFile, KPanelApplet::Stretch,
options, parent, "ktaskbarapplet" );