diff options
Diffstat (limited to 'kicker/libkicker')
| -rw-r--r-- | kicker/libkicker/appletinfo.cpp | 2 | ||||
| -rw-r--r-- | kicker/libkicker/kickertip.cpp | 2 | ||||
| -rw-r--r-- | kicker/libkicker/menuinfo.cpp | 4 | ||||
| -rw-r--r-- | kicker/libkicker/panelbutton.cpp | 10 | ||||
| -rw-r--r-- | kicker/libkicker/simplebutton.cpp | 8 |
5 files changed, 13 insertions, 13 deletions
diff --git a/kicker/libkicker/appletinfo.cpp b/kicker/libkicker/appletinfo.cpp index 4a851df55..73a13749f 100644 --- a/kicker/libkicker/appletinfo.cpp +++ b/kicker/libkicker/appletinfo.cpp @@ -81,7 +81,7 @@ AppletInfo::AppletInfo( const TQString& deskFile, const TQString& configFile, co else { m_configFile.append("_") - .append(kapp->randomString(20).lower()) + .append(tdeApp->randomString(20).lower()) .append("_rc"); } } diff --git a/kicker/libkicker/kickertip.cpp b/kicker/libkicker/kickertip.cpp index c896c830a..d0aab24de 100644 --- a/kicker/libkicker/kickertip.cpp +++ b/kicker/libkicker/kickertip.cpp @@ -82,7 +82,7 @@ KickerTip::KickerTip(TQWidget * parent) hide(); connect(&m_frameTimer, TQ_SIGNAL(timeout()), TQ_SLOT(internalUpdate())); // // FIXME: The settingsChanged(SettingsCategory) signal is not available under Trinity; where was it originally supposed to come from? -// connect(kapp, TQ_SIGNAL(settingsChanged(SettingsCategory)), TQ_SLOT(slotSettingsChanged())); +// connect(tdeApp, TQ_SIGNAL(settingsChanged(SettingsCategory)), TQ_SLOT(slotSettingsChanged())); } KickerTip::~KickerTip() diff --git a/kicker/libkicker/menuinfo.cpp b/kicker/libkicker/menuinfo.cpp index 8cdc4c664..808c90f80 100644 --- a/kicker/libkicker/menuinfo.cpp +++ b/kicker/libkicker/menuinfo.cpp @@ -39,13 +39,13 @@ MenuInfo::MenuInfo(const TQString& desktopFile) df.setGroup("Desktop Entry"); TQStringList list = df.readListEntry("X-TDE-AuthorizeAction"); - if (kapp && !list.isEmpty()) + if (tdeApp && !list.isEmpty()) { for(TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) { - if (!kapp->authorize((*it).stripWhiteSpace())) + if (!tdeApp->authorize((*it).stripWhiteSpace())) return; } } diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp index 0708d0b5f..688f5604d 100644 --- a/kicker/libkicker/panelbutton.cpp +++ b/kicker/libkicker/panelbutton.cpp @@ -89,12 +89,12 @@ PanelButton::PanelButton( TQWidget* parent, const char* name, bool forceStandard updateSettings(TDEApplication::SETTINGS_MOUSE); - kapp->addKipcEventMask(KIPC::SettingsChanged | KIPC::IconChanged); + tdeApp->addKipcEventMask(KIPC::SettingsChanged | KIPC::IconChanged); installEventFilter(KickerTip::the()); - connect(kapp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(updateSettings(int))); - connect(kapp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(updateIcon(int))); + connect(tdeApp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(updateSettings(int))); + connect(tdeApp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(updateIcon(int))); } void PanelButton::configure() @@ -1057,8 +1057,8 @@ void PanelPopupButton::slotExecMenu() m_pressedDuringPopup = false; KickerTip::enableTipping(false); - kapp->syncX(); - kapp->processEvents(); + tdeApp->syncX(); + tdeApp->processEvents(); if (!m_initialized) { diff --git a/kicker/libkicker/simplebutton.cpp b/kicker/libkicker/simplebutton.cpp index 79fd19915..b6eaf3b79 100644 --- a/kicker/libkicker/simplebutton.cpp +++ b/kicker/libkicker/simplebutton.cpp @@ -47,13 +47,13 @@ SimpleButton::SimpleButton(TQWidget *parent, const char *name, bool forceStandar { 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 ); } |