summaryrefslogtreecommitdiffstats
path: root/ksysguard/gui
diff options
context:
space:
mode:
Diffstat (limited to 'ksysguard/gui')
-rw-r--r--ksysguard/gui/SensorDisplayLib/LogFile.cc2
-rw-r--r--ksysguard/gui/SensorDisplayLib/ProcessList.cc8
-rw-r--r--ksysguard/gui/SensorDisplayLib/SensorDisplay.cc2
-rw-r--r--ksysguard/gui/WorkSheet.cc2
-rw-r--r--ksysguard/gui/Workspace.cc18
-rw-r--r--ksysguard/gui/ksgrd/SensorAgent.cc2
-rw-r--r--ksysguard/gui/ksgrd/SensorManager.cc16
-rw-r--r--ksysguard/gui/ksysguard.cc8
8 files changed, 29 insertions, 29 deletions
diff --git a/ksysguard/gui/SensorDisplayLib/LogFile.cc b/ksysguard/gui/SensorDisplayLib/LogFile.cc
index bd74ff2c0..314690513 100644
--- a/ksysguard/gui/SensorDisplayLib/LogFile.cc
+++ b/ksysguard/gui/SensorDisplayLib/LogFile.cc
@@ -62,7 +62,7 @@ LogFile::addSensor(const TQString& hostName, const TQString& sensorName, const T
registerSensor(new KSGRD::SensorProperties(hostName, sensorName, sensorType, title));
- TQString sensorID = sensorName.right(sensorName.length() - (sensorName.tqfindRev("/") + 1));
+ TQString sensorID = sensorName.right(sensorName.length() - (sensorName.findRev("/") + 1));
sendRequest(sensors().tqat(0)->hostName(), TQString("logfile_register %1" ).arg(sensorID), 42);
diff --git a/ksysguard/gui/SensorDisplayLib/ProcessList.cc b/ksysguard/gui/SensorDisplayLib/ProcessList.cc
index 342a6e5e5..0dc2faf53 100644
--- a/ksysguard/gui/SensorDisplayLib/ProcessList.cc
+++ b/ksysguard/gui/SensorDisplayLib/ProcessList.cc
@@ -486,7 +486,7 @@ ProcessList::buildList()
addProcess(p, pli);
- if (selectedPIds.tqfindIndex(p->pid()) != -1)
+ if (selectedPIds.findIndex(p->pid()) != -1)
pli->setSelected(true);
}
pl.removeFirst();
@@ -513,7 +513,7 @@ ProcessList::buildTree()
int pid = ps->pid();
pl.remove();
- if (selectedPIds.tqfindIndex(pid) != -1)
+ if (selectedPIds.findIndex(pid) != -1)
pli->setSelected(true);
// insert all child processes of current process
@@ -569,10 +569,10 @@ ProcessList::extendTree(TQPtrList<KSGRD::SensorPSLine>* pl, ProcessLVI* parent,
addProcess(ps, pli);
- if (selectedPIds.tqfindIndex(ps->pid()) != -1)
+ if (selectedPIds.findIndex(ps->pid()) != -1)
pli->setSelected(true);
- if (ps->ppid() != INIT_PID && closedSubTrees.tqfindIndex(ps->ppid()) != -1)
+ if (ps->ppid() != INIT_PID && closedSubTrees.findIndex(ps->ppid()) != -1)
parent->setOpen(false);
else
parent->setOpen(true);
diff --git a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc
index 4d8c6eb37..34c448918 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc
+++ b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc
@@ -247,7 +247,7 @@ void SensorDisplay::updateWhatsThis()
void SensorDisplay::hosts( TQStringList& list )
{
for ( SensorProperties *s = mSensors.first(); s; s = mSensors.next() )
- if ( !list.tqcontains( s->hostName() ) )
+ if ( !list.contains( s->hostName() ) )
list.append( s->hostName() );
}
diff --git a/ksysguard/gui/WorkSheet.cc b/ksysguard/gui/WorkSheet.cc
index 53737fdaa..ac0793a9a 100644
--- a/ksysguard/gui/WorkSheet.cc
+++ b/ksysguard/gui/WorkSheet.cc
@@ -450,7 +450,7 @@ void WorkSheet::dropEvent( TQDropEvent *e )
* event and replace or add sensor. */
for ( uint r = 0; r < mRows; ++r )
for ( uint c = 0; c < mColumns; ++c )
- if ( mDisplayList[ r ][ c ]->tqgeometry().tqcontains( e->pos() ) ) {
+ if ( mDisplayList[ r ][ c ]->tqgeometry().contains( e->pos() ) ) {
addDisplay( hostName, sensorName, sensorType, sensorDescr, r, c );
return;
}
diff --git a/ksysguard/gui/Workspace.cc b/ksysguard/gui/Workspace.cc
index c39425919..3c1a92a56 100644
--- a/ksysguard/gui/Workspace.cc
+++ b/ksysguard/gui/Workspace.cc
@@ -196,7 +196,7 @@ void Workspace::loadWorkSheet( const KURL &url )
* code. */
TQString tmpFile;
KIO::NetAccess::download( url, tmpFile, this );
- mWorkDir = tmpFile.left( tmpFile.tqfindRev( '/' ) );
+ mWorkDir = tmpFile.left( tmpFile.findRev( '/' ) );
// Load sheet from file.
if ( !restoreWorkSheet( tmpFile ) )
@@ -240,13 +240,13 @@ void Workspace::saveWorkSheet( WorkSheet *sheet )
if ( fileName.isEmpty() )
return;
- mWorkDir = fileName.left( fileName.tqfindRev( '/' ) );
+ mWorkDir = fileName.left( fileName.findRev( '/' ) );
// extract filename without path
- TQString baseName = fileName.right( fileName.length() - fileName.tqfindRev( '/' ) - 1 );
+ TQString baseName = fileName.right( fileName.length() - fileName.findRev( '/' ) - 1 );
// chop off extension (usually '.sgrd')
- baseName = baseName.left( baseName.tqfindRev( '.' ) );
+ baseName = baseName.left( baseName.findRev( '.' ) );
changeTab( sheet, baseName );
}
@@ -278,13 +278,13 @@ void Workspace::saveWorkSheetAs( WorkSheet *sheet )
if ( fileName.isEmpty() )
return;
- mWorkDir = fileName.left( fileName.tqfindRev( '/' ) );
+ mWorkDir = fileName.left( fileName.findRev( '/' ) );
// extract filename without path
- TQString baseName = fileName.right( fileName.length() - fileName.tqfindRev( '/' ) - 1 );
+ TQString baseName = fileName.right( fileName.length() - fileName.findRev( '/' ) - 1 );
// chop off extension (usually '.sgrd')
- baseName = baseName.left( baseName.tqfindRev( '.' ) );
+ baseName = baseName.left( baseName.findRev( '.' ) );
changeTab( sheet, baseName );
} while ( !sheet->save( fileName ) );
@@ -354,10 +354,10 @@ WorkSheet *Workspace::restoreWorkSheet( const TQString &fileName, const TQString
tmpStr = newName;
// extract filename without path
- TQString baseName = tmpStr.right( tmpStr.length() - tmpStr.tqfindRev( '/' ) - 1 );
+ TQString baseName = tmpStr.right( tmpStr.length() - tmpStr.findRev( '/' ) - 1 );
// chop off extension (usually '.sgrd')
- baseName = baseName.left( baseName.tqfindRev( '.' ) );
+ baseName = baseName.left( baseName.findRev( '.' ) );
WorkSheet *sheet = new WorkSheet( this );
sheet->setTitle( baseName );
diff --git a/ksysguard/gui/ksgrd/SensorAgent.cc b/ksysguard/gui/ksgrd/SensorAgent.cc
index 363d66494..5fcb14a9c 100644
--- a/ksysguard/gui/ksgrd/SensorAgent.cc
+++ b/ksysguard/gui/ksgrd/SensorAgent.cc
@@ -99,7 +99,7 @@ void SensorAgent::processAnswer( const TQString &buffer )
int end;
// And now the real information
- while ( ( end = mAnswerBuffer.tqfind( "\nksysguardd> " ) ) >= 0 ) {
+ while ( ( end = mAnswerBuffer.find( "\nksysguardd> " ) ) >= 0 ) {
#if SA_TRACE
kdDebug(1215) << "<= " << mAnswerBuffer.left( end )
<< "(" << mInputFIFO.count() << "/"
diff --git a/ksysguard/gui/ksgrd/SensorManager.cc b/ksysguard/gui/ksgrd/SensorManager.cc
index 30bf53c43..43f878cda 100644
--- a/ksysguard/gui/ksgrd/SensorManager.cc
+++ b/ksysguard/gui/ksgrd/SensorManager.cc
@@ -162,7 +162,7 @@ bool SensorManager::engageHost( const TQString &hostName )
{
bool retVal = true;
- if ( hostName.isEmpty() || mAgents.tqfind( hostName ) == 0 ) {
+ if ( hostName.isEmpty() || mAgents.find( hostName ) == 0 ) {
if(hostName == "localhost") {
//There was a bug where the xml file would end up not specifying to connect to localhost.
//This work around makes sure we always connect to localhost
@@ -202,7 +202,7 @@ bool SensorManager::engage( const TQString &hostName, const TQString &shell,
{
SensorAgent *agent;
- if ( ( agent = mAgents.tqfind( hostName ) ) == 0 ) {
+ if ( ( agent = mAgents.find( hostName ) ) == 0 ) {
if ( port == -1 )
agent = new SensorShellAgent( this );
else
@@ -253,7 +253,7 @@ bool SensorManager::disengage( const SensorAgent *agent )
bool SensorManager::disengage( const TQString &hostName )
{
SensorAgent *agent;
- if ( ( agent = mAgents.tqfind( hostName ) ) != 0 ) {
+ if ( ( agent = mAgents.find( hostName ) ) != 0 ) {
mAgents.remove( hostName );
emit update();
return true;
@@ -266,7 +266,7 @@ bool SensorManager::resynchronize( const TQString &hostName )
{
SensorAgent *agent;
- if ( ( agent = mAgents.tqfind( hostName ) ) == 0 )
+ if ( ( agent = mAgents.find( hostName ) ) == 0 )
return false;
TQString shell, command;
@@ -327,11 +327,11 @@ bool SensorManager::event( TQEvent *event )
bool SensorManager::sendRequest( const TQString &hostName, const TQString &req,
SensorClient *client, int id )
{
- SensorAgent *agent = mAgents.tqfind( hostName );
+ SensorAgent *agent = mAgents.find( hostName );
if( !agent && hostName == "localhost") {
//we should always be able to reconnect to localhost
engage("localhost", "", "ksysguardd", -1);
- agent = mAgents.tqfind( hostName );
+ agent = mAgents.find( hostName );
}
if ( agent ) {
agent->sendRequest( req, client, id );
@@ -358,7 +358,7 @@ bool SensorManager::hostInfo( const TQString &hostName, TQString &shell,
TQString &command, int &port )
{
SensorAgent *agent;
- if ( ( agent = mAgents.tqfind( hostName ) ) != 0 ) {
+ if ( ( agent = mAgents.find( hostName ) ) != 0 ) {
agent->hostInfo( shell, command, port );
return true;
}
@@ -395,7 +395,7 @@ TQString SensorManager::translateSensor( const TQString &sensor ) const
TQString token, out;
int start = 0, end = 0;
for ( ; ; ) {
- end = sensor.tqfind( '/', start );
+ end = sensor.find( '/', start );
if ( end > 0 )
out += translateSensorPath( sensor.mid( start, end - start ) ) + "/";
else {
diff --git a/ksysguard/gui/ksysguard.cc b/ksysguard/gui/ksysguard.cc
index 570f32e90..6bc3d8398 100644
--- a/ksysguard/gui/ksysguard.cc
+++ b/ksysguard/gui/ksysguard.cc
@@ -212,9 +212,9 @@ TQStringList TopLevel::listHosts()
TQString TopLevel::readIntegerSensor( const TQString &sensorLocator )
{
- TQString host = sensorLocator.left( sensorLocator.tqfind( ':' ) );
+ TQString host = sensorLocator.left( sensorLocator.find( ':' ) );
TQString sensor = sensorLocator.right( sensorLocator.length() -
- sensorLocator.tqfind( ':' ) - 1 );
+ sensorLocator.find( ':' ) - 1 );
DCOPClientTransaction *dcopTransaction = kapp->dcopClient()->beginTransaction();
mDCopFIFO.prepend( dcopTransaction );
@@ -229,9 +229,9 @@ TQStringList TopLevel::readListSensor( const TQString& sensorLocator )
{
TQStringList retval;
- TQString host = sensorLocator.left( sensorLocator.tqfind( ':' ) );
+ TQString host = sensorLocator.left( sensorLocator.find( ':' ) );
TQString sensor = sensorLocator.right( sensorLocator.length() -
- sensorLocator.tqfind( ':' ) - 1 );
+ sensorLocator.find( ':' ) - 1 );
DCOPClientTransaction *dcopTransaction = kapp->dcopClient()->beginTransaction();
mDCopFIFO.prepend( dcopTransaction );