summaryrefslogtreecommitdiffstats
path: root/kicker-applets
diff options
context:
space:
mode:
Diffstat (limited to 'kicker-applets')
-rw-r--r--kicker-applets/kolourpicker/kolourpicker.cpp10
-rw-r--r--kicker-applets/ktimemon/timemon.cc2
-rw-r--r--kicker-applets/math/parser.cpp6
-rw-r--r--kicker-applets/mediacontrol/amarokInterface.cpp8
-rw-r--r--kicker-applets/mediacontrol/jukInterface.cpp6
-rw-r--r--kicker-applets/mediacontrol/mediacontrol.cpp2
-rw-r--r--kicker-applets/mediacontrol/mediacontrolconfig.cpp4
-rw-r--r--kicker-applets/mediacontrol/mpdInterface.cpp2
-rw-r--r--kicker-applets/mediacontrol/noatunInterface.cpp6
9 files changed, 23 insertions, 23 deletions
diff --git a/kicker-applets/kolourpicker/kolourpicker.cpp b/kicker-applets/kolourpicker/kolourpicker.cpp
index b415032..101bd42 100644
--- a/kicker-applets/kolourpicker/kolourpicker.cpp
+++ b/kicker-applets/kolourpicker/kolourpicker.cpp
@@ -157,7 +157,7 @@ void KolourPicker::slotHistory()
conf->sync();
}
else if (id != -1)
- setClipboard(popup.tqfindItem(id)->text());
+ setClipboard(popup.findItem(id)->text());
}
void KolourPicker::mouseReleaseEvent(TQMouseEvent *e)
@@ -174,7 +174,7 @@ void KolourPicker::mouseReleaseEvent(TQMouseEvent *e)
TQColor color(img.pixel(0, 0));
// eventually remove a dupe
- TQValueListIterator<TQColor> dupe = m_history.tqfind(color);
+ TQValueListIterator<TQColor> dupe = m_history.find(color);
if (dupe != m_history.end())
m_history.remove(dupe);
@@ -198,7 +198,7 @@ void KolourPicker::mouseReleaseEvent(TQMouseEvent *e)
TQPopupMenu *popup = copyPopup(color, true);
int id = popup->exec(e->globalPos());
if (id != -1)
- setClipboard( popup->tqfindItem(id)->text() );
+ setClipboard( popup->findItem(id)->text() );
delete popup;
}
else
@@ -294,7 +294,7 @@ TQPopupMenu *KolourPicker::copyPopup(const TQColor &c, bool title) const
// HTML, lower case hex chars
value.sprintf("#%.2x%.2x%.2x", c.red(), c.green(), c.blue());
popup->insertItem(SmallIcon("html"), value);
- if (value.tqfind(TQRegExp("[a-f]")) >= 0)
+ if (value.find(TQRegExp("[a-f]")) >= 0)
{
// HTML, upper case hex chars
value.sprintf("#%.2X%.2X%.2X", c.red(), c.green(), c.blue());
@@ -303,7 +303,7 @@ TQPopupMenu *KolourPicker::copyPopup(const TQColor &c, bool title) const
// lower case hex chars
value.sprintf( "%.2x%.2x%.2x", c.red(), c.green(), c.blue() );
popup->insertItem( SmallIcon( "html" ), value );
- if ( value.tqfind( TQRegExp( "[a-f]" ) ) >= 0 )
+ if ( value.find( TQRegExp( "[a-f]" ) ) >= 0 )
{
// upper case hex chars
value.sprintf( "%.2X%.2X%.2X", c.red(), c.green(), c.blue() );
diff --git a/kicker-applets/ktimemon/timemon.cc b/kicker-applets/ktimemon/timemon.cc
index 4b791ff..c13cfbc 100644
--- a/kicker-applets/ktimemon/timemon.cc
+++ b/kicker-applets/ktimemon/timemon.cc
@@ -164,7 +164,7 @@ void KTimeMon::paintRect(int x, int y, int w, int h, TQColor c, TQPainter *p)
void KTimeMon::maybeTip(const TQPoint& p)
{
if (sample == 0) return; // no associated sample...
- if(!TQT_TQRECT_OBJECT(rect()).tqcontains(p)) return;
+ if(!TQT_TQRECT_OBJECT(rect()).contains(p)) return;
KSample::Sample s = sample->getSample(100); // scale to 100(%)
int idle = 100 - s.kernel - s.user - s.nice;
diff --git a/kicker-applets/math/parser.cpp b/kicker-applets/math/parser.cpp
index d8592a2..e1dee3e 100644
--- a/kicker-applets/math/parser.cpp
+++ b/kicker-applets/math/parser.cpp
@@ -243,9 +243,9 @@ int Parser::addfkt(TQString str)
err=0;
errpos=1;
str.remove(" " );
- const int p1=str.tqfind('(');
- int p2=str.tqfind(',');
- const int p3=str.tqfind(")=");
+ const int p1=str.find('(');
+ int p2=str.find(',');
+ const int p3=str.find(")=");
//insert '*' when it is needed
for(int i=p1+3; i < (int) str.length();i++)
diff --git a/kicker-applets/mediacontrol/amarokInterface.cpp b/kicker-applets/mediacontrol/amarokInterface.cpp
index a89e693..b77b5d2 100644
--- a/kicker-applets/mediacontrol/amarokInterface.cpp
+++ b/kicker-applets/mediacontrol/amarokInterface.cpp
@@ -68,7 +68,7 @@ void AmarokInterface::myInit()
void AmarokInterface::appRegistered ( const TQCString &appId )
{
- if(appId.tqcontains("amarok",false) )
+ if(appId.contains("amarok",false) )
{
mAppId = appId;
emit playerStarted();
@@ -78,7 +78,7 @@ void AmarokInterface::appRegistered ( const TQCString &appId )
void AmarokInterface::appRemoved ( const TQCString &appId )
{
- if ( appId.tqcontains("amarok",false) )
+ if ( appId.contains("amarok",false) )
{
// is there still another amarok alive?
if ( findRunningAmarok() )
@@ -264,7 +264,7 @@ bool AmarokInterface::findRunningAmarok()
for (iterator = allApps.constBegin(); iterator != allApps.constEnd(); ++iterator)
{
- if ((*iterator).tqcontains("amarok",false))
+ if ((*iterator).contains("amarok",false))
{
if (kapp->dcopClient()->call((*iterator), "player", "interfaces()", data, replyType, replyData) )
{
@@ -274,7 +274,7 @@ bool AmarokInterface::findRunningAmarok()
QCStringList list;
reply >> list;
- if ( list.tqcontains("AmarokPlayerInterface") )
+ if ( list.contains("AmarokPlayerInterface") )
{
kdDebug(90200) << "mediacontrol: amarok found" << endl;
mAppId = *iterator;
diff --git a/kicker-applets/mediacontrol/jukInterface.cpp b/kicker-applets/mediacontrol/jukInterface.cpp
index 6ac8b49..b055424 100644
--- a/kicker-applets/mediacontrol/jukInterface.cpp
+++ b/kicker-applets/mediacontrol/jukInterface.cpp
@@ -68,7 +68,7 @@ void JuKInterface::myInit()
void JuKInterface::appRegistered ( const TQCString &appId )
{
- if(appId.tqcontains("juk",false) )
+ if(appId.contains("juk",false) )
{
mAppId = appId;
@@ -93,7 +93,7 @@ void JuKInterface::appRegistered ( const TQCString &appId )
void JuKInterface::appRemoved ( const TQCString &appId )
{
- if ( appId.tqcontains("juk",false) )
+ if ( appId.contains("juk",false) )
{
// is there still another juk alive?
if ( findRunningJuK() )
@@ -282,7 +282,7 @@ bool JuKInterface::findRunningJuK()
for (iterator = allApps.constBegin(); iterator != allApps.constEnd(); ++iterator)
{
- if ((*iterator).tqcontains("juk",false))
+ if ((*iterator).contains("juk",false))
{
mAppId = *iterator;
return true;
diff --git a/kicker-applets/mediacontrol/mediacontrol.cpp b/kicker-applets/mediacontrol/mediacontrol.cpp
index 9068aeb..cb94759 100644
--- a/kicker-applets/mediacontrol/mediacontrol.cpp
+++ b/kicker-applets/mediacontrol/mediacontrol.cpp
@@ -78,7 +78,7 @@ class MediaControlToolTip : public TQToolTip
virtual void maybeTip(const TQPoint &pt)
{
TQRect rc( mWidget->rect());
- if (rc.tqcontains(pt))
+ if (rc.contains(pt))
{
tip ( rc, mPlayer->getTrackTitle() );
}
diff --git a/kicker-applets/mediacontrol/mediacontrolconfig.cpp b/kicker-applets/mediacontrol/mediacontrolconfig.cpp
index 5f5d06a..2636398 100644
--- a/kicker-applets/mediacontrol/mediacontrolconfig.cpp
+++ b/kicker-applets/mediacontrol/mediacontrolconfig.cpp
@@ -106,7 +106,7 @@ void MediaControlConfig::load()
// find the playerstring from config in the playerlist and select it if found
TQListBoxItem *item = 0;
- item = _child->playerListBox->tqfindItem( _configFrontend->player() );
+ item = _child->playerListBox->findItem( _configFrontend->player() );
if ( item )
_child->playerListBox->setCurrentItem ( item );
else
@@ -118,7 +118,7 @@ void MediaControlConfig::load()
_child->mWheelScrollAmount->setValue( _configFrontend->mouseWheelSpeed() );
// Select the used Theme
- item = _child->themeListBox->tqfindItem( _configFrontend->theme() );
+ item = _child->themeListBox->findItem( _configFrontend->theme() );
if ( item )
_child->themeListBox->setCurrentItem( item );
else
diff --git a/kicker-applets/mediacontrol/mpdInterface.cpp b/kicker-applets/mediacontrol/mpdInterface.cpp
index e9be885..ea350d2 100644
--- a/kicker-applets/mediacontrol/mpdInterface.cpp
+++ b/kicker-applets/mediacontrol/mpdInterface.cpp
@@ -452,7 +452,7 @@ void MpdInterface::dropEvent(TQDropEvent* event)
while (!path.empty())
{
if (dispatch((TQString("add \"")
- +path.join("/").tqreplace("\"","\\\"")
+ +path.join("/").replace("\"","\\\"")
+TQString("\"\n")).latin1()))
{
if (fetchOk()) break;
diff --git a/kicker-applets/mediacontrol/noatunInterface.cpp b/kicker-applets/mediacontrol/noatunInterface.cpp
index 4047eb6..4ba4333 100644
--- a/kicker-applets/mediacontrol/noatunInterface.cpp
+++ b/kicker-applets/mediacontrol/noatunInterface.cpp
@@ -66,7 +66,7 @@ void NoatunInterface::myInit()
void NoatunInterface::appRegistered(const TQCString &appId)
{
- if (appId.tqcontains("noatun",false))
+ if (appId.contains("noatun",false))
{
mAppId = appId;
emit playerStarted();
@@ -76,7 +76,7 @@ void NoatunInterface::appRegistered(const TQCString &appId)
void NoatunInterface::appRemoved(const TQCString &appId)
{
- if (appId.tqcontains("noatun",false))
+ if (appId.contains("noatun",false))
{
// is there still another noatun alive?
if (findRunningNoatun())
@@ -273,7 +273,7 @@ bool NoatunInterface::findRunningNoatun()
for (iterator = allApps.constBegin(); iterator != allApps.constEnd(); ++iterator)
{
- if ((*iterator).tqcontains("noatun", false))
+ if ((*iterator).contains("noatun", false))
{
mAppId = *iterator;
return true;