diff --git a/kdirstat/kcleanup.cpp b/kdirstat/kcleanup.cpp index c32c48c..506067c 100644 --- a/kdirstat/kcleanup.cpp +++ b/kdirstat/kcleanup.cpp @@ -278,7 +278,7 @@ KCleanup::itemDir( const KFileInfo *item ) const if ( ! item->isDir() && ! item->isDotEntry() ) { - dir.tqreplace ( TQRegExp ( "/[^/]*$" ), "" ); + dir.replace ( TQRegExp ( "/[^/]*$" ), "" ); } return dir; @@ -299,7 +299,7 @@ KCleanup::cleanTitle() const // Get rid of any "&" characters in the text that denote keyboard // shortcuts in menus. - title.tqreplace( TQRegExp( "&" ), "" ); + title.replace( TQRegExp( "&" ), "" ); return title; } @@ -311,15 +311,15 @@ KCleanup::expandVariables( const KFileInfo * item, { TQString expanded = unexpanded; - expanded.tqreplace( TQRegExp( "%p" ), + expanded.replace( TQRegExp( "%p" ), "\"" + TQString::fromLocal8Bit( item->url() ) + "\"" ); - expanded.tqreplace( TQRegExp( "%n" ), + expanded.replace( TQRegExp( "%n" ), "\"" + TQString::fromLocal8Bit( item->name() ) + "\"" ); if ( KDE::versionMajor() >= 3 && KDE::versionMinor() >= 4 ) - expanded.tqreplace( TQRegExp( "%t" ), "trash:/" ); + expanded.replace( TQRegExp( "%t" ), "trash:/" ); else - expanded.tqreplace( TQRegExp( "%t" ), KGlobalSettings::trashPath() ); + expanded.replace( TQRegExp( "%t" ), KGlobalSettings::trashPath() ); return expanded; } diff --git a/kdirstat/kdirtree.cpp b/kdirstat/kdirtree.cpp index e496329..06b2bfc 100644 --- a/kdirstat/kdirtree.cpp +++ b/kdirstat/kdirtree.cpp @@ -328,7 +328,7 @@ KFileInfo::locate( TQString url, bool findDotEntries ) // if the rest of the URL consists of several pathname components. if ( dotEntry() && - url.tqfind ( "/" ) < 0 ) // No (more) "/" in this URL + url.find ( "/" ) < 0 ) // No (more) "/" in this URL { return dotEntry()->locate( url, findDotEntries ); } diff --git a/kdirstat/kpacman.cpp b/kdirstat/kpacman.cpp index d6cf99c..ed2090c 100644 --- a/kdirstat/kpacman.cpp +++ b/kdirstat/kpacman.cpp @@ -293,7 +293,7 @@ KPacMan::mouseReleaseEvent ( TQMouseEvent *ev ) { if ( _active ) { - if ( _pacMan->lastPacMan().tqcontains( ev->pos() ) ) + if ( _pacMan->lastPacMan().contains( ev->pos() ) ) stop(); } } diff --git a/kdirstat/ktreemapview.cpp b/kdirstat/ktreemapview.cpp index 07d8412..ac4ba6b 100644 --- a/kdirstat/ktreemapview.cpp +++ b/kdirstat/ktreemapview.cpp @@ -190,7 +190,7 @@ KTreemapView::contentsMousePressEvent( TQMouseEvent * event ) // Select clicked tile's tqparent, if available if ( _selectedTile && - _selectedTile->rect().tqcontains( event->pos() ) ) + _selectedTile->rect().contains( event->pos() ) ) { if ( _selectedTile->parentTile() ) tile = _selectedTile->parentTile(); @@ -213,7 +213,7 @@ KTreemapView::contentsMousePressEvent( TQMouseEvent * event ) if ( tile ) { if ( _selectedTile && - _selectedTile->rect().tqcontains( event->pos() ) ) + _selectedTile->rect().contains( event->pos() ) ) { // If a directory (non-leaf tile) is already selected, // don't override this by