summaryrefslogtreecommitdiffstats
path: root/superkaramba/src
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 06:08:18 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 06:08:18 +0000
commit6335dc55802871b5a43492f217b6edbb420204c4 (patch)
tree50c6c8672a52687568edea475614dfe3d98e62e5 /superkaramba/src
parent9b8c9f1f9e974ff0176108cfbd8852cd99ea68c8 (diff)
downloadtdeutils-6335dc55802871b5a43492f217b6edbb420204c4.tar.gz
tdeutils-6335dc55802871b5a43492f217b6edbb420204c4.zip
rename the following methods:
tqfind find tqreplace replace tqcontains contains git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeutils@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'superkaramba/src')
-rw-r--r--superkaramba/src/clickarea.cpp4
-rw-r--r--superkaramba/src/clickmap.cpp2
-rw-r--r--superkaramba/src/cpusensor.cpp12
-rw-r--r--superkaramba/src/datesensor.cpp2
-rw-r--r--superkaramba/src/disksensor.cpp28
-rw-r--r--superkaramba/src/imagelabel.cpp12
-rw-r--r--superkaramba/src/karamba.cpp6
-rw-r--r--superkaramba/src/karamba.h2
-rw-r--r--superkaramba/src/karambaapp.cpp2
-rw-r--r--superkaramba/src/memsensor.cpp16
-rw-r--r--superkaramba/src/meter.cpp2
-rw-r--r--superkaramba/src/misc_python.cpp2
-rw-r--r--superkaramba/src/networksensor.cpp14
-rw-r--r--superkaramba/src/noatunsensor.cpp14
-rw-r--r--superkaramba/src/rsssensor.cpp2
-rw-r--r--superkaramba/src/sensorsensor.cpp4
-rw-r--r--superkaramba/src/systemtray.cpp2
-rw-r--r--superkaramba/src/taskmanager.cpp10
-rw-r--r--superkaramba/src/taskmanager.h2
-rw-r--r--superkaramba/src/textlabel.cpp2
-rw-r--r--superkaramba/src/themesdlg.cpp4
-rw-r--r--superkaramba/src/themewidget.cpp2
-rw-r--r--superkaramba/src/uptimesensor.cpp14
-rw-r--r--superkaramba/src/xmmssensor.cpp10
24 files changed, 85 insertions, 85 deletions
diff --git a/superkaramba/src/clickarea.cpp b/superkaramba/src/clickarea.cpp
index 986ae4b..c2ca63e 100644
--- a/superkaramba/src/clickarea.cpp
+++ b/superkaramba/src/clickarea.cpp
@@ -27,7 +27,7 @@ ClickArea::~ClickArea()
bool ClickArea::click( TQMouseEvent *e )
{
- if( rect.tqcontains( e->x(), e->y() ) )
+ if( rect.contains( e->x(), e->y() ) )
{
//qDebug(TQString::number(e->type()));
//KShellProcess ksp;
@@ -44,7 +44,7 @@ bool ClickArea::click( TQMouseEvent *e )
{
TQString program;
program = onClick;
- program.tqreplace( TQRegExp("%v", false), value );
+ program.replace( TQRegExp("%v", false), value );
if( !program.isEmpty() )
{
diff --git a/superkaramba/src/clickmap.cpp b/superkaramba/src/clickmap.cpp
index 34f74e9..8b25bce 100644
--- a/superkaramba/src/clickmap.cpp
+++ b/superkaramba/src/clickmap.cpp
@@ -41,7 +41,7 @@ void ClickMap::setTextProps( TextField *t )
bool ClickMap::click( TQMouseEvent *e ) {
//Don't load the web page if the click isn't for us
- if (boundingBox.tqcontains(e->x(), e->y())) {
+ if (boundingBox.contains(e->x(), e->y())) {
int index = ((e -> y() - getY()) / text.getLineHeight()) + 1;
if (index >= 1 && index <= (int)displays.count()) {
diff --git a/superkaramba/src/cpusensor.cpp b/superkaramba/src/cpusensor.cpp
index 164572c..1cf9a06 100644
--- a/superkaramba/src/cpusensor.cpp
+++ b/superkaramba/src/cpusensor.cpp
@@ -145,12 +145,12 @@ void CPUSensor::update()
{
format = "%v";
}
- format.tqreplace( TQRegExp("%load", false), TQString::number( load ) );
- format.tqreplace( TQRegExp("%user", false), TQString::number( user ) );
- format.tqreplace( TQRegExp("%nice", false), TQString::number( nice ) );
- format.tqreplace( TQRegExp("%idle", false), TQString::number( idle ) );
- format.tqreplace( TQRegExp("%system", false), TQString::number( system ) );
- format.tqreplace( TQRegExp("%v", false), TQString::number( load ) );
+ format.replace( TQRegExp("%load", false), TQString::number( load ) );
+ format.replace( TQRegExp("%user", false), TQString::number( user ) );
+ format.replace( TQRegExp("%nice", false), TQString::number( nice ) );
+ format.replace( TQRegExp("%idle", false), TQString::number( idle ) );
+ format.replace( TQRegExp("%system", false), TQString::number( system ) );
+ format.replace( TQRegExp("%v", false), TQString::number( load ) );
meter->setValue( format );
++it;
diff --git a/superkaramba/src/datesensor.cpp b/superkaramba/src/datesensor.cpp
index 24e3156..9db258f 100644
--- a/superkaramba/src/datesensor.cpp
+++ b/superkaramba/src/datesensor.cpp
@@ -80,7 +80,7 @@ void DateSensor::toggleCalendar(TQMouseEvent *ev)
TQString height = sp->getParam("CALHEIGHT");
TQRect rect(meter->getX(),meter->getY(),width.toInt(), height.toInt());
- if (rect.tqcontains( ev->x(), ev->y() ))
+ if (rect.contains( ev->x(), ev->y() ))
{
if (hidden)
{
diff --git a/superkaramba/src/disksensor.cpp b/superkaramba/src/disksensor.cpp
index a896ebe..b53c6e3 100644
--- a/superkaramba/src/disksensor.cpp
+++ b/superkaramba/src/disksensor.cpp
@@ -114,31 +114,31 @@ void DiskSensor::processExited(KProcess *)
{
format = "%u";
}
- format.tqreplace( TQRegExp("%fp", false),TQString::number(getPercentFree(mntPt)));
- format.tqreplace( TQRegExp("%fg",false),
+ format.replace( TQRegExp("%fp", false),TQString::number(getPercentFree(mntPt)));
+ format.replace( TQRegExp("%fg",false),
TQString::number(getFreeSpace(mntPt)/(1024*1024)));
- format.tqreplace( TQRegExp("%fkb",false),
+ format.replace( TQRegExp("%fkb",false),
TQString::number(getFreeSpace(mntPt)*8) );
- format.tqreplace( TQRegExp("%fk",false),
+ format.replace( TQRegExp("%fk",false),
TQString::number(getFreeSpace(mntPt)) );
- format.tqreplace( TQRegExp("%f", false),TQString::number(getFreeSpace(mntPt)/1024));
+ format.replace( TQRegExp("%f", false),TQString::number(getFreeSpace(mntPt)/1024));
- format.tqreplace( TQRegExp("%up", false),TQString::number(getPercentUsed(mntPt)));
- format.tqreplace( TQRegExp("%ug",false),
+ format.replace( TQRegExp("%up", false),TQString::number(getPercentUsed(mntPt)));
+ format.replace( TQRegExp("%ug",false),
TQString::number(getUsedSpace(mntPt)/(1024*1024)));
- format.tqreplace( TQRegExp("%ukb",false),
+ format.replace( TQRegExp("%ukb",false),
TQString::number(getUsedSpace(mntPt)*8) );
- format.tqreplace( TQRegExp("%uk",false),
+ format.replace( TQRegExp("%uk",false),
TQString::number(getUsedSpace(mntPt)) );
- format.tqreplace( TQRegExp("%u", false),TQString::number(getUsedSpace(mntPt)/1024));
+ format.replace( TQRegExp("%u", false),TQString::number(getUsedSpace(mntPt)/1024));
- format.tqreplace( TQRegExp("%tg",false),
+ format.replace( TQRegExp("%tg",false),
TQString::number(getTotalSpace(mntPt)/(1024*1024)));
- format.tqreplace( TQRegExp("%tkb",false),
+ format.replace( TQRegExp("%tkb",false),
TQString::number(getTotalSpace(mntPt)*8));
- format.tqreplace( TQRegExp("%tk",false),
+ format.replace( TQRegExp("%tk",false),
TQString::number(getTotalSpace(mntPt)));
- format.tqreplace( TQRegExp("%t", false),TQString::number(getTotalSpace(mntPt)/1024));
+ format.replace( TQRegExp("%t", false),TQString::number(getTotalSpace(mntPt)/1024));
meter->setValue(format);
++lit;
}
diff --git a/superkaramba/src/imagelabel.cpp b/superkaramba/src/imagelabel.cpp
index 5a28a11..ef38ec0 100644
--- a/superkaramba/src/imagelabel.cpp
+++ b/superkaramba/src/imagelabel.cpp
@@ -86,15 +86,15 @@ ChannelIntensity::ChannelIntensity(ImageLabel* img, float r, TQString c,
ratio = (ratio < -1) ? -1 : ratio;
channel = 0;
- if (c.tqfind("red", 0 , false))
+ if (c.find("red", 0 , false))
{
channel = 0;
}
- else if (c.tqfind("green", 0, false))
+ else if (c.find("green", 0, false))
{
channel = 1;
}
- else if (c.tqfind("blue", 0, false))
+ else if (c.find("blue", 0, false))
{
channel = 2;
}
@@ -384,7 +384,7 @@ void ImageLabel::mUpdate(TQPainter* p)
bool ImageLabel::click(TQMouseEvent* e)
{
- if (getBoundingBox().tqcontains(e -> x(), e -> y()) && isEnabled())
+ if (getBoundingBox().contains(e -> x(), e -> y()) && isEnabled())
{
TQString program;
if (e -> button() == Qt::LeftButton)
@@ -530,7 +530,7 @@ void ImageLabel::rolloverImage(TQMouseEvent *e)
if (zoomed)
{
- if (!rect_off.tqcontains(e->pos()))
+ if (!rect_off.contains(e->pos()))
{
// rollover the image to the zoomed image
//setValue(fn_roll);
@@ -545,7 +545,7 @@ void ImageLabel::rolloverImage(TQMouseEvent *e)
}
else
{
- if (rect_off.tqcontains(e->pos()))
+ if (rect_off.contains(e->pos()))
{
// rollover the image to the zoomed image
//setValue(fn_roll);
diff --git a/superkaramba/src/karamba.cpp b/superkaramba/src/karamba.cpp
index 6717b85..ca6e2cc 100644
--- a/superkaramba/src/karamba.cpp
+++ b/superkaramba/src/karamba.cpp
@@ -70,7 +70,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance,
KURL url;
- if(fn.tqfind('/') == -1)
+ if(fn.find('/') == -1)
url.setFileName(fn);
else
url = fn;
@@ -1338,7 +1338,7 @@ void karamba::passClick(TQMouseEvent *e)
{
Meter* meter = (Meter*)(*it);
// Check if meter is still in list
- if (clickList->tqcontainsRef(meter) && meter->click(e))
+ if (clickList->containsRef(meter) && meter->click(e))
{
// callback
meterClicked(e, meter);
@@ -1388,7 +1388,7 @@ void karamba::passWheelClick( TQWheelEvent *e )
{
Meter* meter = (Meter*)(*it);
// Check if meter is still in list
- if (clickList->tqcontainsRef(meter) && meter->click(&fakeEvent))
+ if (clickList->containsRef(meter) && meter->click(&fakeEvent))
{
if (RichTextLabel* richText = dynamic_cast<RichTextLabel*>(meter))
{
diff --git a/superkaramba/src/karamba.h b/superkaramba/src/karamba.h
index 51d5b82..7184f4c 100644
--- a/superkaramba/src/karamba.h
+++ b/superkaramba/src/karamba.h
@@ -142,7 +142,7 @@ public:
void changeInterval(int interval);
void setWidgetUpdate(bool wu) { widgetUpdate = wu; };
bool getWidgetUpdate() { return widgetUpdate; };
- bool hasMeter(Meter* meter) { return meterList->tqcontainsRef(meter) > 0; };
+ bool hasMeter(Meter* meter) { return meterList->containsRef(meter) > 0; };
char getTempUnit() { return tempUnit; };
void addMenuConfigOption(TQString key, TQString name);
bool setMenuConfigOption(TQString key, bool value);
diff --git a/superkaramba/src/karambaapp.cpp b/superkaramba/src/karambaapp.cpp
index 063ac1f..87f6e60 100644
--- a/superkaramba/src/karambaapp.cpp
+++ b/superkaramba/src/karambaapp.cpp
@@ -309,7 +309,7 @@ void KarambaApplication::deleteKaramba(karamba* k, bool reloading)
bool KarambaApplication::hasKaramba(karamba* k)
{
- return karambaList->tqcontainsRef(TQT_TQOBJECT(k)) > 0;
+ return karambaList->containsRef(TQT_TQOBJECT(k)) > 0;
}
// XXX: I guess this should be made with mutex/semaphores
diff --git a/superkaramba/src/memsensor.cpp b/superkaramba/src/memsensor.cpp
index 842889b..dda7983 100644
--- a/superkaramba/src/memsensor.cpp
+++ b/superkaramba/src/memsensor.cpp
@@ -318,17 +318,17 @@ void MemSensor::update()
format = "%um";
}
- format.tqreplace( TQRegExp("%fmb", false), TQString::number( (int)(( totalMem - usedMemNoBuffers)/1024.0+0.5)));
- format.tqreplace( TQRegExp("%fm", false), TQString::number( (int)( ( totalMem - usedMem )/1024.0+0.5) ));
+ format.replace( TQRegExp("%fmb", false), TQString::number( (int)(( totalMem - usedMemNoBuffers)/1024.0+0.5)));
+ format.replace( TQRegExp("%fm", false), TQString::number( (int)( ( totalMem - usedMem )/1024.0+0.5) ));
- format.tqreplace( TQRegExp("%umb", false), TQString::number( (int)((usedMemNoBuffers)/1024.0+0.5)));
- format.tqreplace( TQRegExp("%um", false), TQString::number( (int)((usedMem)/1024.0+0.5 )));
+ format.replace( TQRegExp("%umb", false), TQString::number( (int)((usedMemNoBuffers)/1024.0+0.5)));
+ format.replace( TQRegExp("%um", false), TQString::number( (int)((usedMem)/1024.0+0.5 )));
- format.tqreplace( TQRegExp("%tm", false), TQString::number( (int)( (totalMem)/1024.0+0.5)));
+ format.replace( TQRegExp("%tm", false), TQString::number( (int)( (totalMem)/1024.0+0.5)));
- format.tqreplace( TQRegExp("%fs", false), TQString::number( (int)((totalSwap - usedSwap)/1024.0+0.5)));
- format.tqreplace( TQRegExp("%us", false), TQString::number( (int)(usedSwap/1024.0+0.5)));
- format.tqreplace( TQRegExp("%ts", false), TQString::number( (int)(totalSwap/1024.0+0.5)));
+ format.replace( TQRegExp("%fs", false), TQString::number( (int)((totalSwap - usedSwap)/1024.0+0.5)));
+ format.replace( TQRegExp("%us", false), TQString::number( (int)(usedSwap/1024.0+0.5)));
+ format.replace( TQRegExp("%ts", false), TQString::number( (int)(totalSwap/1024.0+0.5)));
meter->setValue(format);
++it;
diff --git a/superkaramba/src/meter.cpp b/superkaramba/src/meter.cpp
index 8374bbf..e9030e6 100644
--- a/superkaramba/src/meter.cpp
+++ b/superkaramba/src/meter.cpp
@@ -105,7 +105,7 @@ bool Meter::isEnabled()
bool Meter::insideActiveArea(int x, int y)
{
- return boundingBox.tqcontains(x, y) && clickable;
+ return boundingBox.contains(x, y) && clickable;
}
#include "meter.moc"
diff --git a/superkaramba/src/misc_python.cpp b/superkaramba/src/misc_python.cpp
index 933147c..018c66e 100644
--- a/superkaramba/src/misc_python.cpp
+++ b/superkaramba/src/misc_python.cpp
@@ -167,7 +167,7 @@ long attachClickArea(long widget, long meter, TQString LeftButton, TQString Midd
Meter* currMeter = (Meter*) meter;
// Look if currMeter has an ClickArea attached.
- bool meterAlreadyClickable = currTheme->clickList->tqcontainsRef(currMeter);
+ bool meterAlreadyClickable = currTheme->clickList->containsRef(currMeter);
// if currMeter is of type ImageLabel*
if (ImageLabel* image = dynamic_cast<ImageLabel*>(currMeter))
diff --git a/superkaramba/src/networksensor.cpp b/superkaramba/src/networksensor.cpp
index 10138b4..09de816 100644
--- a/superkaramba/src/networksensor.cpp
+++ b/superkaramba/src/networksensor.cpp
@@ -102,11 +102,11 @@ void NetworkSensor::getInOutBytes ( unsigned long &in,unsigned long &out) const
{
TQTextStream t( &file ); // use a text stream
line = t.readLine();
- while(line !=0 && !line.tqcontains(device))
+ while(line !=0 && !line.contains(device))
{
line = t.readLine();
}
- if ( line.tqcontains( device ) )
+ if ( line.contains( device ) )
{
TQRegExp rx( "\\W+"+device+":\\D*(\\d+)(?:\\D+\\d+){7}\\D+(\\d+)", false);
rx.search(line);
@@ -115,7 +115,7 @@ void NetworkSensor::getInOutBytes ( unsigned long &in,unsigned long &out) const
}
else
{
- qDebug("Network sensor: can not tqfind %s", device.ascii());
+ qDebug("Network sensor: can not find %s", device.ascii());
in = 0;
out = 0;
}
@@ -148,11 +148,11 @@ void NetworkSensor::update()
format = "%in";
}
- format.tqreplace( TQRegExp("%inkb", false), TQString::number( ((inB - receivedBytes)*8)/delay, 'f', decimals ) );
- format.tqreplace( TQRegExp("%in", false), TQString::number( (inB - receivedBytes)/delay, 'f', decimals ) );
+ format.replace( TQRegExp("%inkb", false), TQString::number( ((inB - receivedBytes)*8)/delay, 'f', decimals ) );
+ format.replace( TQRegExp("%in", false), TQString::number( (inB - receivedBytes)/delay, 'f', decimals ) );
- format.tqreplace( TQRegExp("%outkb", false), TQString::number( ((outB - transmittedBytes)*8)/delay, 'f', decimals ) );
- format.tqreplace( TQRegExp("%out", false), TQString::number( (outB - transmittedBytes)/delay, 'f', decimals ) );
+ format.replace( TQRegExp("%outkb", false), TQString::number( ((outB - transmittedBytes)*8)/delay, 'f', decimals ) );
+ format.replace( TQRegExp("%out", false), TQString::number( (outB - transmittedBytes)/delay, 'f', decimals ) );
meter->setValue( format );
++it;
diff --git a/superkaramba/src/noatunsensor.cpp b/superkaramba/src/noatunsensor.cpp
index d948bc9..798557f 100644
--- a/superkaramba/src/noatunsensor.cpp
+++ b/superkaramba/src/noatunsensor.cpp
@@ -77,17 +77,17 @@ void NoatunSensor::update()
else
{
- format.tqreplace( TQRegExp("%title", false), title );
- format.tqreplace( TQRegExp("%id", false), noatunID );
+ format.replace( TQRegExp("%title", false), title );
+ format.replace( TQRegExp("%id", false), noatunID );
- format.tqreplace( TQRegExp("%length", false), TQTime( 0,0,0 ).
+ format.replace( TQRegExp("%length", false), TQTime( 0,0,0 ).
addMSecs( songLength )
.toString( "h:mm:ss" ) );
- format.tqreplace( TQRegExp("%time", false), TQTime( 0,0,0 ).
+ format.replace( TQRegExp("%time", false), TQTime( 0,0,0 ).
addMSecs( currentTime )
.toString( "h:mm:ss" ) );
- format.tqreplace( TQRegExp("%remain", false), TQTime( 0,0,0 ).
+ format.replace( TQRegExp("%remain", false), TQTime( 0,0,0 ).
addMSecs( songLength )
.addMSecs(-currentTime )
.toString( "h:mm:ss" ) );
@@ -147,8 +147,8 @@ TQString NoatunSensor::getTitle()
if (replyType == TQSTRING_OBJECT_NAME_STRING)
{
reply >> result;
- result.tqreplace( TQRegExp("_")," " );
- result.tqreplace( TQRegExp(".mp3$"),"" );
+ result.replace( TQRegExp("_")," " );
+ result.replace( TQRegExp(".mp3$"),"" );
}
else
diff --git a/superkaramba/src/rsssensor.cpp b/superkaramba/src/rsssensor.cpp
index 155ddd5..5a999ec 100644
--- a/superkaramba/src/rsssensor.cpp
+++ b/superkaramba/src/rsssensor.cpp
@@ -95,7 +95,7 @@ void RssSensor::update()
{
TQDomNodeList links = docElem.elementsByTagName( "link" );
TQDomNodeList displays;
- if ( format.tqcontains( "%d", false ) > 0 )
+ if ( format.contains( "%d", false ) > 0 )
{
displays = docElem.elementsByTagName( "description" );
}
diff --git a/superkaramba/src/sensorsensor.cpp b/superkaramba/src/sensorsensor.cpp
index 3232665..ed6934e 100644
--- a/superkaramba/src/sensorsensor.cpp
+++ b/superkaramba/src/sensorsensor.cpp
@@ -91,9 +91,9 @@ void SensorSensor::processExited(KProcess *)
}
#if defined __FreeBSD__ || defined(Q_OS_NETBSD)
- format.tqreplace( TQRegExp("%v", false), sensorMap[sensorMapBSD[type]]);
+ format.replace( TQRegExp("%v", false), sensorMap[sensorMapBSD[type]]);
#else
- format.tqreplace( TQRegExp("%v", false), sensorMap[type]);
+ format.replace( TQRegExp("%v", false), sensorMap[type]);
#endif
meter->setValue(format);
++lit;
diff --git a/superkaramba/src/systemtray.cpp b/superkaramba/src/systemtray.cpp
index bf95a9c..e5268fb 100644
--- a/superkaramba/src/systemtray.cpp
+++ b/superkaramba/src/systemtray.cpp
@@ -153,7 +153,7 @@ void Systemtray::updateTrayWindows( void )
while ((emb = m_Wins.current()) != 0L)
{
WId wid = emb->embeddedWinId();
- if ((wid == 0) || !kwin_module->systemTrayWindows().tqcontains(wid) )
+ if ((wid == 0) || !kwin_module->systemTrayWindows().contains(wid) )
m_Wins.remove(emb);
else
m_Wins.next();
diff --git a/superkaramba/src/taskmanager.cpp b/superkaramba/src/taskmanager.cpp
index 7f091ce..90f0efe 100644
--- a/superkaramba/src/taskmanager.cpp
+++ b/superkaramba/src/taskmanager.cpp
@@ -138,7 +138,7 @@ void TaskManager::windowAdded(WId w )
WId transient_for = (WId) transient_for_tmp;
// check if it's transient for a skiptaskbar window
- if (_skiptaskbar_windows.tqcontains(transient_for))
+ if (_skiptaskbar_windows.contains(transient_for))
return;
// lets see if this is a transient for an existing task
@@ -464,9 +464,9 @@ bool Task::isModified() const
{
static TQString modStr = TQString::fromUtf8("[") + i18n("modified") + TQString::fromUtf8("]");
#ifdef KDE_3_2
- int modStrPos = _info.visibleName().tqfind(modStr);
+ int modStrPos = _info.visibleName().find(modStr);
#else
- int modStrPos = _info.visibleName.tqfind(modStr);
+ int modStrPos = _info.visibleName.find(modStr);
#endif
return ( modStrPos != -1 );
@@ -608,10 +608,10 @@ bool Task::idMatch( const TQString& id1, const TQString& id2 )
if ( id1.isEmpty() || id2.isEmpty() )
return false;
- if ( id1.tqcontains( id2 ) > 0 )
+ if ( id1.contains( id2 ) > 0 )
return true;
- if ( id2.tqcontains( id1 ) > 0 )
+ if ( id2.contains( id1 ) > 0 )
return true;
return false;
diff --git a/superkaramba/src/taskmanager.h b/superkaramba/src/taskmanager.h
index 8172287..70cff97 100644
--- a/superkaramba/src/taskmanager.h
+++ b/superkaramba/src/taskmanager.h
@@ -204,7 +204,7 @@ public:
//* @internal
void removeTransient( WId w ) { _transients.remove( w ); }
//* @internal
- bool hasTransient( WId w ) const { return _transients.tqcontains( w ); }
+ bool hasTransient( WId w ) const { return _transients.contains( w ); }
//* @internal
void setActive(bool a);
diff --git a/superkaramba/src/textlabel.cpp b/superkaramba/src/textlabel.cpp
index 376f226..0cf8891 100644
--- a/superkaramba/src/textlabel.cpp
+++ b/superkaramba/src/textlabel.cpp
@@ -339,7 +339,7 @@ void TextLabel::mUpdate(TQPainter *p)
bool TextLabel::click(TQMouseEvent* e)
{
- if (getBoundingBox().tqcontains(e -> x(), e -> y()) && isEnabled())
+ if (getBoundingBox().contains(e -> x(), e -> y()) && isEnabled())
{
TQString program;
if (e -> button() == Qt::LeftButton)
diff --git a/superkaramba/src/themesdlg.cpp b/superkaramba/src/themesdlg.cpp
index 1a996cd..bf4cd93 100644
--- a/superkaramba/src/themesdlg.cpp
+++ b/superkaramba/src/themesdlg.cpp
@@ -416,9 +416,9 @@ bool ThemesDlg::filter(int index, TQWidget* widget, void* data)
}
else
{
- if(w->themeName->text().lower().tqcontains(searchText))
+ if(w->themeName->text().lower().contains(searchText))
return true;
- if(w->description->text().lower().tqcontains(searchText))
+ if(w->description->text().lower().contains(searchText))
return true;
}
return false;
diff --git a/superkaramba/src/themewidget.cpp b/superkaramba/src/themewidget.cpp
index cd941b9..8eab4d0 100644
--- a/superkaramba/src/themewidget.cpp
+++ b/superkaramba/src/themewidget.cpp
@@ -58,7 +58,7 @@ ThemeWidget::~ThemeWidget()
int ThemeWidget::addInstance()
{
int i = 1;
- while(m_instancePool.tqfind(i) != m_instancePool.end())
+ while(m_instancePool.find(i) != m_instancePool.end())
++i;
m_instancePool.append(i);
updateRunning();
diff --git a/superkaramba/src/uptimesensor.cpp b/superkaramba/src/uptimesensor.cpp
index 4025f3a..1dcc280 100644
--- a/superkaramba/src/uptimesensor.cpp
+++ b/superkaramba/src/uptimesensor.cpp
@@ -101,13 +101,13 @@ void UptimeSensor::update()
{
format = "%dd %h:%M";
}
- format.tqreplace( TQRegExp("%d"), TQString::number(days));
- format.tqreplace( TQRegExp("%H"), TQString::number(hours).rightJustify(2,'0'));
- format.tqreplace( TQRegExp("%M"), TQString::number(mins).rightJustify(2,'0'));
- format.tqreplace( TQRegExp("%S"), TQString::number(secs).rightJustify(2,'0'));
- format.tqreplace( TQRegExp("%h"), TQString::number(hours));
- format.tqreplace( TQRegExp("%m"), TQString::number(mins));
- format.tqreplace( TQRegExp("%s"), TQString::number(secs));
+ format.replace( TQRegExp("%d"), TQString::number(days));
+ format.replace( TQRegExp("%H"), TQString::number(hours).rightJustify(2,'0'));
+ format.replace( TQRegExp("%M"), TQString::number(mins).rightJustify(2,'0'));
+ format.replace( TQRegExp("%S"), TQString::number(secs).rightJustify(2,'0'));
+ format.replace( TQRegExp("%h"), TQString::number(hours));
+ format.replace( TQRegExp("%m"), TQString::number(mins));
+ format.replace( TQRegExp("%s"), TQString::number(secs));
meter->setValue(format);
++it;
diff --git a/superkaramba/src/xmmssensor.cpp b/superkaramba/src/xmmssensor.cpp
index 60c7455..d78d119 100644
--- a/superkaramba/src/xmmssensor.cpp
+++ b/superkaramba/src/xmmssensor.cpp
@@ -210,19 +210,19 @@ void XMMSSensor::update()
{
- format.tqreplace( TQRegExp("%title", false), title );
+ format.replace( TQRegExp("%title", false), title );
- format.tqreplace( TQRegExp("%length", false), TQTime( 0,0,0 ).
+ format.replace( TQRegExp("%length", false), TQTime( 0,0,0 ).
addMSecs( songLength )
.toString( "h:mm:ss" ) );
- format.tqreplace( TQRegExp("%time", false), TQTime( 0,0,0 ).
+ format.replace( TQRegExp("%time", false), TQTime( 0,0,0 ).
addMSecs( currentTime )
.toString( "h:mm:ss" ) );
if( isPlaying )
{
- format.tqreplace( TQRegExp("%remain", false), TQTime( 0,0,0 ).
+ format.replace( TQRegExp("%remain", false), TQTime( 0,0,0 ).
addMSecs( songLength )
.addMSecs(-currentTime )
.toString( "h:mm:ss" ) );
@@ -230,7 +230,7 @@ void XMMSSensor::update()
else
{
- format.tqreplace( TQRegExp("%remain", false), TQTime( 0,0,0 ).toString("h:mm:ss" ) );
+ format.replace( TQRegExp("%remain", false), TQTime( 0,0,0 ).toString("h:mm:ss" ) );
}
meter->setValue(format);
}