diff --git a/src/part/localLister.cpp b/src/part/localLister.cpp index 363b093..d022eae 100644 --- a/src/part/localLister.cpp +++ b/src/part/localLister.cpp @@ -282,7 +282,7 @@ namespace Filelight if( str == "/" ) continue; str += '/'; - if( remoteFsTypes.tqcontains( FS_TYPE ) ) + if( remoteFsTypes.contains( FS_TYPE ) ) s_remoteMounts.append( str ); //**** NO! can't be sure won't have trailing slash, need to do a check first dummy!! else @@ -314,11 +314,11 @@ namespace Filelight if( str == "/" ) continue; str += "/"; - if( remoteFsTypes.tqcontains( FS_TYPE ) ) - if( b = !s_remoteMounts.tqcontains( str ) ) + if( remoteFsTypes.contains( FS_TYPE ) ) + if( b = !s_remoteMounts.contains( str ) ) s_remoteMounts.append( str ); //**** NO! can't be sure won't have trailing slash, need to do a check first dummy!! - else if( b = !s_localMounts.tqcontains( str ) ) + else if( b = !s_localMounts.contains( str ) ) s_localMounts.append( str ); //**** NO! can't be sure won't have trailing slash, need to do a check first dummy!! if( b ) kdDebug() << "MTAB: " << FS_TYPE << "\n"; diff --git a/src/part/radialMap/segmentTip.cpp b/src/part/radialMap/segmentTip.cpp index ba4a1cf..9a87d68 100644 --- a/src/part/radialMap/segmentTip.cpp +++ b/src/part/radialMap/segmentTip.cpp @@ -29,7 +29,7 @@ bool isBackingStoreActive() buffer[ N ] = '\0'; pclose( xdpyinfo ); - return TQString(TQString::fromLocal8Bit( buffer )).tqcontains( "backing-store YES" ); + return TQString(TQString::fromLocal8Bit( buffer )).contains( "backing-store YES" ); } diff --git a/src/part/scan.cpp b/src/part/scan.cpp index 4dfbb5d..77a0cef 100644 --- a/src/part/scan.cpp +++ b/src/part/scan.cpp @@ -122,7 +122,7 @@ namespace Filelight else { //something went wrong, we couldn't find the directory we were expecting - error() << "Didn't tqfind " << path << " in the cache!\n"; + error() << "Didn't find " << path << " in the cache!\n"; delete it.remove(); //safest to get rid of it break; //do a full scan } diff --git a/src/part/settingsDialog.cpp b/src/part/settingsDialog.cpp index 3e99574..2b6aa42 100644 --- a/src/part/settingsDialog.cpp +++ b/src/part/settingsDialog.cpp @@ -137,7 +137,7 @@ void SettingsDialog::addDirectory() { const TQString path = url.path( 1 ); - if( !Config::skipList.tqcontains( path ) ) + if( !Config::skipList.contains( path ) ) { Config::skipList.append( path ); m_listBox->insertItem( path ); diff --git a/src/part/summaryWidget.cpp b/src/part/summaryWidget.cpp index afa047e..d583d4d 100644 --- a/src/part/summaryWidget.cpp +++ b/src/part/summaryWidget.cpp @@ -173,7 +173,7 @@ DiskList::DiskList() if (s.isEmpty()) continue; - if (s.tqfind( BLANK ) < 0) // devicename was too long, rest in next line + if (s.find( BLANK ) < 0) // devicename was too long, rest in next line if (!t.eof()) { // just appends the next line TQString v = t.readLine(); s = s.append( v.latin1() ); @@ -181,27 +181,27 @@ DiskList::DiskList() } Disk disk; - disk.device = s.left( s.tqfind( BLANK ) ); - s = s.remove( 0, s.tqfind( BLANK ) + 1 ); + disk.device = s.left( s.find( BLANK ) ); + s = s.remove( 0, s.find( BLANK ) + 1 ); #ifndef NO_FS_TYPE - disk.type = s.left( s.tqfind( BLANK ) ); - s = s.remove( 0, s.tqfind( BLANK ) + 1 ); + disk.type = s.left( s.find( BLANK ) ); + s = s.remove( 0, s.find( BLANK ) + 1 ); #endif - int n = s.tqfind( BLANK ); + int n = s.find( BLANK ); disk.size = s.left( n ).toInt(); s = s.remove( 0, n + 1 ); - n = s.tqfind( BLANK ); + n = s.find( BLANK ); disk.used = s.left( n ).toInt(); s = s.remove( 0, n + 1 ); - n = s.tqfind( BLANK ); + n = s.find( BLANK ); disk.free = s.left( n ).toInt(); s = s.remove( 0, n + 1 ); - s = s.remove( 0, s.tqfind( BLANK ) + 1 ); // delete the capacity 94% + s = s.remove( 0, s.find( BLANK ) + 1 ); // delete the capacity 94% disk.mount = s; disk.guessIconName(); @@ -214,21 +214,21 @@ DiskList::DiskList() void Disk::guessIconName() { - if( mount.tqcontains( "cdrom", false ) ) icon = "cdrom"; - else if( device.tqcontains( "cdrom", false ) ) icon = "cdrom"; - else if( mount.tqcontains( "writer", false ) ) icon = "cdwriter"; - else if( device.tqcontains( "writer", false ) ) icon = "cdwriter"; - else if( mount.tqcontains( "mo", false ) ) icon = "mo"; - else if( device.tqcontains( "mo", false ) ) icon = "mo"; - else if( device.tqcontains( "fd", false ) ) { - if( device.tqcontains( "360", false ) ) icon = "5floppy"; - if( device.tqcontains( "1200", false ) ) icon = "5floppy"; + if( mount.contains( "cdrom", false ) ) icon = "cdrom"; + else if( device.contains( "cdrom", false ) ) icon = "cdrom"; + else if( mount.contains( "writer", false ) ) icon = "cdwriter"; + else if( device.contains( "writer", false ) ) icon = "cdwriter"; + else if( mount.contains( "mo", false ) ) icon = "mo"; + else if( device.contains( "mo", false ) ) icon = "mo"; + else if( device.contains( "fd", false ) ) { + if( device.contains( "360", false ) ) icon = "5floppy"; + if( device.contains( "1200", false ) ) icon = "5floppy"; else icon = "3floppy"; } - else if( mount.tqcontains( "floppy", false ) ) icon = "3floppy"; - else if( mount.tqcontains( "zip", false ) ) icon = "zip"; - else if( type.tqcontains( "nfs", false ) ) icon = "nfs"; + else if( mount.contains( "floppy", false ) ) icon = "3floppy"; + else if( mount.contains( "zip", false ) ) icon = "zip"; + else if( type.contains( "nfs", false ) ) icon = "nfs"; else icon = "hdd";