diff options
| author | Timothy Pearson <[email protected]> | 2013-01-20 00:14:45 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-20 00:14:45 -0600 |
| commit | 8f06b9a8882be84f3d0e5b0f5e3b8e51515e723f (patch) | |
| tree | 153d468e6403953c97f22688905f76cedbe05f27 /kicker-applets | |
| parent | 4b5c71fdded4cfec525273c795bfb0b79bb8a5dd (diff) | |
| download | tdeaddons-8f06b9a8882be84f3d0e5b0f5e3b8e51515e723f.tar.gz tdeaddons-8f06b9a8882be84f3d0e5b0f5e3b8e51515e723f.zip | |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kicker-applets')
| -rw-r--r-- | kicker-applets/kbinaryclock/kbinaryclock.cpp | 2 | ||||
| -rw-r--r-- | kicker-applets/kbinaryclock/kbinaryclock.kcfg | 2 | ||||
| -rw-r--r-- | kicker-applets/kolourpicker/simplebutton.cpp | 4 | ||||
| -rw-r--r-- | kicker-applets/mediacontrol/playerInterface.cpp | 2 | ||||
| -rw-r--r-- | kicker-applets/mediacontrol/simplebutton.cpp | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/kicker-applets/kbinaryclock/kbinaryclock.cpp b/kicker-applets/kbinaryclock/kbinaryclock.cpp index 9eafcc4..73319c5 100644 --- a/kicker-applets/kbinaryclock/kbinaryclock.cpp +++ b/kicker-applets/kbinaryclock/kbinaryclock.cpp @@ -180,7 +180,7 @@ void KBinaryClock::loadSettings(){ int darkFactor = prefs->darkFactor(); TQColor backgroundColor = prefs->background(); bool modifyBackground = false; - if(backgroundColor != KApplication::palette().active().background()){ + if(backgroundColor != TDEApplication::palette().active().background()){ setPaletteBackgroundColor(backgroundColor); modifyBackground = true; } diff --git a/kicker-applets/kbinaryclock/kbinaryclock.kcfg b/kicker-applets/kbinaryclock/kbinaryclock.kcfg index b5a5fb3..c118b7a 100644 --- a/kicker-applets/kbinaryclock/kbinaryclock.kcfg +++ b/kicker-applets/kbinaryclock/kbinaryclock.kcfg @@ -35,7 +35,7 @@ </entry> <entry name="Background" type="Color"> <label>Background color</label> - <default code="true">KApplication::palette().active().background()</default> + <default code="true">TDEApplication::palette().active().background()</default> </entry> <entry name="Show_Seconds" type="Bool"> <label>Whether to show seconds</label> diff --git a/kicker-applets/kolourpicker/simplebutton.cpp b/kicker-applets/kolourpicker/simplebutton.cpp index 0bc34b5..2706af2 100644 --- a/kicker-applets/kolourpicker/simplebutton.cpp +++ b/kicker-applets/kolourpicker/simplebutton.cpp @@ -47,7 +47,7 @@ SimpleButton::SimpleButton(TQWidget *parent, const char *name) kapp->addKipcEventMask( KIPC::SettingsChanged ); kapp->addKipcEventMask( KIPC::IconChanged ); - slotSettingsChanged( KApplication::SETTINGS_MOUSE ); + slotSettingsChanged( TDEApplication::SETTINGS_MOUSE ); } void SimpleButton::setPixmap(const TQPixmap &pix) @@ -142,7 +142,7 @@ void SimpleButton::generateIcons() void SimpleButton::slotSettingsChanged(int category) { - if (category != KApplication::SETTINGS_MOUSE) + if (category != TDEApplication::SETTINGS_MOUSE) { return; } diff --git a/kicker-applets/mediacontrol/playerInterface.cpp b/kicker-applets/mediacontrol/playerInterface.cpp index 9517aa8..564f783 100644 --- a/kicker-applets/mediacontrol/playerInterface.cpp +++ b/kicker-applets/mediacontrol/playerInterface.cpp @@ -26,7 +26,7 @@ PlayerInterface::~PlayerInterface() { } // Destructor void PlayerInterface::startPlayer(const TQString &desktopname) { - if (KApplication::startServiceByDesktopName(desktopname, TQStringList(), + if (TDEApplication::startServiceByDesktopName(desktopname, TQStringList(), 0, 0, 0, "", false) > 0) { KMessageBox::error(0, i18n("Could not start media player.")); diff --git a/kicker-applets/mediacontrol/simplebutton.cpp b/kicker-applets/mediacontrol/simplebutton.cpp index 0bc34b5..2706af2 100644 --- a/kicker-applets/mediacontrol/simplebutton.cpp +++ b/kicker-applets/mediacontrol/simplebutton.cpp @@ -47,7 +47,7 @@ SimpleButton::SimpleButton(TQWidget *parent, const char *name) kapp->addKipcEventMask( KIPC::SettingsChanged ); kapp->addKipcEventMask( KIPC::IconChanged ); - slotSettingsChanged( KApplication::SETTINGS_MOUSE ); + slotSettingsChanged( TDEApplication::SETTINGS_MOUSE ); } void SimpleButton::setPixmap(const TQPixmap &pix) @@ -142,7 +142,7 @@ void SimpleButton::generateIcons() void SimpleButton::slotSettingsChanged(int category) { - if (category != KApplication::SETTINGS_MOUSE) + if (category != TDEApplication::SETTINGS_MOUSE) { return; } |