diff options
Diffstat (limited to 'kicker-applets/mediacontrol')
-rw-r--r-- | kicker-applets/mediacontrol/amarokInterface.cpp | 36 | ||||
-rw-r--r-- | kicker-applets/mediacontrol/jukInterface.cpp | 38 | ||||
-rw-r--r-- | kicker-applets/mediacontrol/kscdInterface.cpp | 36 | ||||
-rw-r--r-- | kicker-applets/mediacontrol/mediacontrol.cpp | 4 | ||||
-rw-r--r-- | kicker-applets/mediacontrol/noatunInterface.cpp | 36 | ||||
-rw-r--r-- | kicker-applets/mediacontrol/simplebutton.cpp | 8 |
6 files changed, 79 insertions, 79 deletions
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 ); } |