From 15186eff1e25fde585c6269c1a1b9c981f784f43 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 06:08:18 +0000 Subject: [PATCH] rename the following methods: tqfind find tqreplace replace tqcontains contains git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kuickshow@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kuickshow/src/aboutwidget.cpp | 2 +- kuickshow/src/filecache.cpp | 2 +- kuickshow/src/filewidget.cpp | 6 +++--- kuickshow/src/imlibwidget.cpp | 2 +- kuickshow/src/kuickfile.cpp | 2 +- kuickshow/src/kuickshow.cpp | 2 +- kuickshow/src/printing.cpp | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/kuickshow/src/aboutwidget.cpp b/kuickshow/src/aboutwidget.cpp index f65b522..9443100 100644 --- a/kuickshow/src/aboutwidget.cpp +++ b/kuickshow/src/aboutwidget.cpp @@ -84,7 +84,7 @@ bool AboutWidget::eventFilter( TQObject *o, TQEvent *e ) { if ( e->type() == TQEvent::MouseButtonPress ) { TQMouseEvent *ev = TQT_TQMOUSEEVENT( e ); - if ( !m_homepage->tqgeometry().tqcontains( ev->pos() ) ) { + if ( !m_homepage->tqgeometry().contains( ev->pos() ) ) { deleteLater(); return true; } diff --git a/kuickshow/src/filecache.cpp b/kuickshow/src/filecache.cpp index 5440363..d68bc89 100644 --- a/kuickshow/src/filecache.cpp +++ b/kuickshow/src/filecache.cpp @@ -42,7 +42,7 @@ FileCache * FileCache::self() KuickFile * FileCache::getFile( const KURL& url ) { TQString urlString = url.prettyURL(); - KuickFile *file = m_files.tqfind( urlString ); + KuickFile *file = m_files.find( urlString ); if ( !file ) { file = new KuickFile( url ); m_files.insert( urlString, file ); diff --git a/kuickshow/src/filewidget.cpp b/kuickshow/src/filewidget.cpp index 1828489..0f1068f 100644 --- a/kuickshow/src/filewidget.cpp +++ b/kuickshow/src/filewidget.cpp @@ -99,7 +99,7 @@ void FileWidget::initActions() TQPopupMenu *pMenu = menu->popupMenu(); int lastItemId = pMenu->idAt( pMenu->count() - 1 ); - TQMenuItem *mItem = pMenu->tqfindItem( lastItemId ); + TQMenuItem *mItem = pMenu->findItem( lastItemId ); if ( mItem && !mItem->isSeparator() ) menu->insert( sep ); @@ -152,7 +152,7 @@ void FileWidget::activatedMenu( const KFileItem *item, const TQPoint& pos ) void FileWidget::findCompletion( const TQString& text ) { if ( text.at(0) == '/' || text.at(0) == '~' || - text.tqfind('/') != -1 ) { + text.find('/') != -1 ) { TQString t = m_fileFinder->completion()->makeCompletion( text ); if (m_fileFinder->completionMode() == KGlobalSettings::CompletionPopup || @@ -399,7 +399,7 @@ void FileWidget::slotReturnPressed( const TQString& t ) setURL( url, true ); } - else if ( text.tqfind('/') != (int) text.length() -1 ) { // relative path + else if ( text.find('/') != (int) text.length() -1 ) { // relative path TQString dir = m_fileFinder->completion()->replacedPath( text ); KURL u( url(), dir ); setURL( u, true ); diff --git a/kuickshow/src/imlibwidget.cpp b/kuickshow/src/imlibwidget.cpp index 24d6fe4..14964b3 100644 --- a/kuickshow/src/imlibwidget.cpp +++ b/kuickshow/src/imlibwidget.cpp @@ -602,7 +602,7 @@ KuickImage * ImageCache::getKuimage( KuickFile * file, return 0L; KuickImage *kuim = 0L; - int index = fileList.tqfindIndex( file ); + int index = fileList.findIndex( file ); if ( index != -1 ) { if ( index == 0 ) kuim = kuickList.at( 0 ); diff --git a/kuickshow/src/kuickfile.cpp b/kuickshow/src/kuickfile.cpp index 648cf6a..9aead63 100644 --- a/kuickshow/src/kuickfile.cpp +++ b/kuickshow/src/kuickfile.cpp @@ -67,7 +67,7 @@ bool KuickFile::download() TQString ext; TQString fileName = m_url.fileName(); - int extIndex = fileName.tqfindRev('.'); + int extIndex = fileName.findRev('.'); if ( extIndex > 0 ) ext = fileName.mid( extIndex + 1 ); diff --git a/kuickshow/src/kuickshow.cpp b/kuickshow/src/kuickshow.cpp index d793b84..8752203 100644 --- a/kuickshow/src/kuickshow.cpp +++ b/kuickshow/src/kuickshow.cpp @@ -319,7 +319,7 @@ void KuickShow::initGUI( const KURL& startDir ) TQPopupMenu *mainPopup = mainActionMenu->popupMenu(); int sortingIndex = mainPopup->indexOf( sortingMenu->itemId( 0 ) ); int separatorId = mainPopup->idAt( sortingIndex + 1 ); - TQMenuItem *separatorItem = mainPopup->tqfindItem( separatorId ); + TQMenuItem *separatorItem = mainPopup->findItem( separatorId ); if ( separatorItem && separatorItem->isSeparator() ) mainPopup->removeItem( separatorId ); mainActionMenu->remove( sortingMenu ); diff --git a/kuickshow/src/printing.cpp b/kuickshow/src/printing.cpp index b2a4de6..b77696d 100644 --- a/kuickshow/src/printing.cpp +++ b/kuickshow/src/printing.cpp @@ -183,7 +183,7 @@ TQString Printing::minimizeString( TQString text, const TQFontMetrics& if ( mid <= 5 ) // sanity check return TQString(); - text.tqreplace( mid - 1, 3, "..." ); + text.replace( mid - 1, 3, "..." ); } return text;