From ff8c66f117613688a0979d2296cbf6c778136419 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 06:08:18 +0000 Subject: rename the following methods: tqfind find tqreplace replace tqcontains contains git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/gwenview@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/gvcore/archive.cpp | 4 ++-- src/gvcore/busylevelmanager.cpp | 4 ++-- src/gvcore/cache.cpp | 16 ++++++++-------- src/gvcore/captionformatter.cpp | 20 ++++++++++---------- src/gvcore/cursortracker.cpp | 4 ++-- src/gvcore/documentloadedimpl.cpp | 4 ++-- src/gvcore/externaltooldialog.cpp | 2 +- src/gvcore/externaltoolmanager.cpp | 4 ++-- src/gvcore/fileopobject.cpp | 2 +- src/gvcore/filethumbnailview.cpp | 4 ++-- src/gvcore/imageloader.cpp | 4 ++-- src/gvcore/imagesavedialog.cpp | 4 ++-- src/gvcore/imageview.cpp | 8 ++++---- src/gvcore/imageviewcontroller.cpp | 2 +- src/gvcore/jpegformattype.cpp | 2 +- src/gvcore/mimetypeutils.cpp | 4 ++-- src/gvcore/slideshow.cpp | 2 +- src/gvcore/slideshow.h | 2 +- src/gvcore/thumbnailloadjob.cpp | 2 +- src/gvcore/xpm.cpp | 18 +++++++++--------- 20 files changed, 56 insertions(+), 56 deletions(-) (limited to 'src/gvcore') diff --git a/src/gvcore/archive.cpp b/src/gvcore/archive.cpp index a0e78ed..b3ad7f8 100644 --- a/src/gvcore/archive.cpp +++ b/src/gvcore/archive.cpp @@ -39,7 +39,7 @@ static const MimeTypeProtocols& mimeTypeProtocols() { KMimeType::List list = KMimeType::allMimeTypes(); KMimeType::List::Iterator it=list.begin(), end=list.end(); for (; it!=end; ++it) { - if ( (*it)->propertyNames().tqfindIndex(KDE_PROTOCOL)!= -1 ) { + if ( (*it)->propertyNames().findIndex(KDE_PROTOCOL)!= -1 ) { TQString protocol = (*it)->property(KDE_PROTOCOL).toString(); map[(*it)->name()] = protocol; } @@ -50,7 +50,7 @@ static const MimeTypeProtocols& mimeTypeProtocols() { bool fileItemIsArchive(const KFileItem* item) { - return mimeTypeProtocols().tqcontains(item->mimetype()); + return mimeTypeProtocols().contains(item->mimetype()); } bool fileItemIsDirOrArchive(const KFileItem* item) { diff --git a/src/gvcore/busylevelmanager.cpp b/src/gvcore/busylevelmanager.cpp index 326fdf1..9555a0c 100644 --- a/src/gvcore/busylevelmanager.cpp +++ b/src/gvcore/busylevelmanager.cpp @@ -67,8 +67,8 @@ BusyLevelManager* BusyLevelManager::instance() { void BusyLevelManager::setBusyLevel( TQObject* obj, BusyLevel level ) { LOG("BUSY:" << level << ":" << obj << ":" << obj->className() ); if( level > BUSY_NONE ) { - if( mBusyLevels.tqcontains( obj ) && mBusyLevels[ obj ] == level ) return; - if( !mBusyLevels.tqcontains( obj )) { + if( mBusyLevels.contains( obj ) && mBusyLevels[ obj ] == level ) return; + if( !mBusyLevels.contains( obj )) { connect( obj, TQT_SIGNAL( destroyed( TQObject* )), this, TQT_SLOT( objectDestroyed( TQObject* ))); } mBusyLevels[ obj ] = level; diff --git a/src/gvcore/cache.cpp b/src/gvcore/cache.cpp index ccebb47..f7508cb 100644 --- a/src/gvcore/cache.cpp +++ b/src/gvcore/cache.cpp @@ -96,14 +96,14 @@ struct Cache::Private { * If it can't find one, it will create a new one and return it. */ ImageData::Ptr getOrCreateImageData(const KURL& url, const TQDateTime& timestamp) { - if (mImages.tqcontains(url)) { + if (mImages.contains(url)) { ImageData::Ptr data = mImages[url]; if (data->timestamp == timestamp) return data; } ImageData::Ptr data = new ImageData(url, timestamp); mImages[url] = data; - if (mPriorityURLs.tqcontains(url)) data->priority = true; + if (mPriorityURLs.contains(url)) data->priority = true; return data; } }; @@ -144,12 +144,12 @@ Cache* Cache::instance() { void Cache::setPriorityURL( const KURL& url, bool set ) { if( set ) { d->mPriorityURLs.append( url ); - if( d->mImages.tqcontains( url )) { + if( d->mImages.contains( url )) { d->mImages[ url ]->priority = true; } } else { d->mPriorityURLs.remove( url ); - if( d->mImages.tqcontains( url )) { + if( d->mImages.contains( url )) { d->mImages[ url ]->priority = false; } checkMaxSize(); @@ -185,13 +185,13 @@ void Cache::tqinvalidate( const KURL& url ) { TQDateTime Cache::timestamp( const KURL& url ) const { LOG(url.prettyURL()); - if( d->mImages.tqcontains( url )) return d->mImages[ url ]->timestamp; + if( d->mImages.contains( url )) return d->mImages[ url ]->timestamp; return TQDateTime(); } TQByteArray Cache::file( const KURL& url ) const { LOG(url.prettyURL()); - if( d->mImages.tqcontains( url )) { + if( d->mImages.contains( url )) { const ImageData::Ptr data = d->mImages[ url ]; if( data->file.isNull()) return TQByteArray(); data->age = 0; @@ -206,7 +206,7 @@ void Cache::getFrames( const KURL& url, ImageFrames* frames, TQCString* format ) Q_ASSERT(format); frames->clear(); *format = TQCString(); - if( d->mImages.tqcontains( url )) { + if( d->mImages.contains( url )) { const ImageData::Ptr data = d->mImages[ url ]; if( data->frames.isEmpty()) return; *frames = data->frames; @@ -216,7 +216,7 @@ void Cache::getFrames( const KURL& url, ImageFrames* frames, TQCString* format ) } TQPixmap Cache::thumbnail( const KURL& url, TQSize& imagesize ) const { - if( d->mImages.tqcontains( url )) { + if( d->mImages.contains( url )) { const ImageData::Ptr data = d->mImages[ url ]; if( data->thumbnail.isNull()) return TQPixmap(); imagesize = data->imagesize; diff --git a/src/gvcore/captionformatter.cpp b/src/gvcore/captionformatter.cpp index ca34a51..74514f3 100644 --- a/src/gvcore/captionformatter.cpp +++ b/src/gvcore/captionformatter.cpp @@ -39,16 +39,16 @@ TQString CaptionFormatter::format(const TQString& format) { } TQString str=format; - str.tqreplace("%f", mFileName); - str.tqreplace("%p", mPath); - str.tqreplace("%c", comment); - str.tqreplace("%r", resolution); - str.tqreplace("%n", TQString::number(mPosition)); - str.tqreplace("%N", TQString::number(mCount)); - str.tqreplace("%a", mAperture); - str.tqreplace("%t", mExposureTime); - str.tqreplace("%i", mIso); - str.tqreplace("%l", mFocalLength); + str.replace("%f", mFileName); + str.replace("%p", mPath); + str.replace("%c", comment); + str.replace("%r", resolution); + str.replace("%n", TQString::number(mPosition)); + str.replace("%N", TQString::number(mCount)); + str.replace("%a", mAperture); + str.replace("%t", mExposureTime); + str.replace("%i", mIso); + str.replace("%l", mFocalLength); return str; } diff --git a/src/gvcore/cursortracker.cpp b/src/gvcore/cursortracker.cpp index 44e38ac..00f1736 100644 --- a/src/gvcore/cursortracker.cpp +++ b/src/gvcore/cursortracker.cpp @@ -49,7 +49,7 @@ bool CursorTracker::eventFilter(TQObject* object, TQEvent* _event) { switch (_event->type()) { case TQEvent::MouseMove: { TQMouseEvent* event=TQT_TQMOUSEEVENT(_event); - if (TQT_TQRECT_OBJECT(widget->rect()).tqcontains(event->pos()) || (event->stateAfter() & Qt::LeftButton)) { + if (TQT_TQRECT_OBJECT(widget->rect()).contains(event->pos()) || (event->stateAfter() & Qt::LeftButton)) { show(); move(event->globalPos().x() + 15, event->globalPos().y() + 15); } else { @@ -60,7 +60,7 @@ bool CursorTracker::eventFilter(TQObject* object, TQEvent* _event) { case TQEvent::MouseButtonRelease: { TQMouseEvent* event=TQT_TQMOUSEEVENT(_event); - if ( !TQT_TQRECT_OBJECT(widget->rect()).tqcontains(event->pos()) ) { + if ( !TQT_TQRECT_OBJECT(widget->rect()).contains(event->pos()) ) { hide(); } break; diff --git a/src/gvcore/documentloadedimpl.cpp b/src/gvcore/documentloadedimpl.cpp index 35a07b0..35f9441 100644 --- a/src/gvcore/documentloadedimpl.cpp +++ b/src/gvcore/documentloadedimpl.cpp @@ -79,7 +79,7 @@ void DocumentLoadedImpl::transform(ImageUtils::Orientation orientation) { TQString DocumentLoadedImpl::save(const KURL& _url, const TQCString& format) const { - if (!TQImageIO::outputFormats().tqcontains(format)) { + if (!TQImageIO::outputFormats().contains(format)) { return i18n("Gwenview cannot write files in this format."); } @@ -105,7 +105,7 @@ TQString DocumentLoadedImpl::save(const KURL& _url, const TQCString& format) con path=info.dirPath(true) + '/' + path; } path=TQDir::cleanDirPath(path); - if (links.tqcontains(path)) { + if (links.contains(path)) { return i18n("This is a circular link."); } info.setFile(path); diff --git a/src/gvcore/externaltooldialog.cpp b/src/gvcore/externaltooldialog.cpp index 1835fc9..9742c58 100644 --- a/src/gvcore/externaltooldialog.cpp +++ b/src/gvcore/externaltooldialog.cpp @@ -198,7 +198,7 @@ struct ExternalToolDialogPrivate { TQStringList::ConstIterator it=serviceTypes.begin(); for (;it!=serviceTypes.end(); ++it) { TQListViewItem* item= - mContent->mMimeTypeListView->tqfindItem(*it, 0, TQt::ExactMatch); + mContent->mMimeTypeListView->findItem(*it, 0, TQt::ExactMatch); if (item) static_cast(item)->setOn(true); } } diff --git a/src/gvcore/externaltoolmanager.cpp b/src/gvcore/externaltoolmanager.cpp index 3471bc0..0732257 100644 --- a/src/gvcore/externaltoolmanager.cpp +++ b/src/gvcore/externaltoolmanager.cpp @@ -176,7 +176,7 @@ ExternalToolManager::ExternalToolManager() { for (; itDict.current(); ++itDict) { TQString name=itDict.currentKey(); KDesktopFile* df=itDict.current(); - if (d->mDesktopFiles.tqfind(name)) { + if (d->mDesktopFiles.find(name)) { d->mDesktopFiles.remove(name); } if (df->readBoolEntry("Hidden")) { @@ -268,7 +268,7 @@ ExternalToolContext* ExternalToolManager::createContext( for (; it.current(); ++it) { urls.append(it.current()->url()); TQString mimeType=it.current()->mimetype(); - if (!mimeTypes.tqcontains(mimeType)) { + if (!mimeTypes.contains(mimeType)) { mimeTypes.append(mimeType); } } diff --git a/src/gvcore/fileopobject.cpp b/src/gvcore/fileopobject.cpp index 38dbe6b..b195072 100644 --- a/src/gvcore/fileopobject.cpp +++ b/src/gvcore/fileopobject.cpp @@ -313,7 +313,7 @@ void FileOpRenameObject::operator()() { dlg.setButtonOK( KGuiItem(i18n("&Rename"), "edit") ); dlg.lineEdit()->setText(filename); - int extPos = filename.tqfindRev('.'); + int extPos = filename.findRev('.'); if (extPos != -1) { if (filename.mid(extPos - 4, 4) == ".tar") { // Special case: *.tar.* diff --git a/src/gvcore/filethumbnailview.cpp b/src/gvcore/filethumbnailview.cpp index de43540..2448520 100644 --- a/src/gvcore/filethumbnailview.cpp +++ b/src/gvcore/filethumbnailview.cpp @@ -697,13 +697,13 @@ void FileThumbnailView::updateVisibilityInfo( int x, int y ) { if (d->mThumbnailLoadJob.isNull()) return; TQRect rect( x, y, visibleWidth(), visibleHeight()); - FileThumbnailViewItem* first = static_cast< FileThumbnailViewItem* >( tqfindFirstVisibleItem( rect )); + FileThumbnailViewItem* first = static_cast< FileThumbnailViewItem* >( findFirstVisibleItem( rect )); if (!first) { d->mThumbnailLoadJob->setPriorityItems(NULL,NULL,NULL); return; } - FileThumbnailViewItem* last = static_cast< FileThumbnailViewItem* >( tqfindLastVisibleItem( rect )); + FileThumbnailViewItem* last = static_cast< FileThumbnailViewItem* >( findLastVisibleItem( rect )); Q_ASSERT(last); // If we get a first item, then there must be a last if (currentItem() && currentItem()->intersects(rect)) { diff --git a/src/gvcore/imageloader.cpp b/src/gvcore/imageloader.cpp index 6ab91ef..06a9011 100644 --- a/src/gvcore/imageloader.cpp +++ b/src/gvcore/imageloader.cpp @@ -444,7 +444,7 @@ void ImageLoader::slotGetResult(KIO::Job* job) { static TQString mimeTypeFromFormat(const char* format) { TQStringList formats = KImageIO::types(KImageIO::Reading); TQStringList mimeTypes = KImageIO::mimeTypes(KImageIO::Reading); - int pos = formats.tqfindIndex(TQString::fromAscii(format)); + int pos = formats.findIndex(TQString::fromAscii(format)); Q_ASSERT(pos != -1); return mimeTypes[pos]; } @@ -894,7 +894,7 @@ void ImageLoader::ownerDestroyed() { //--------------------------------------------------------------------- ImageLoader* ImageLoader::loader( const KURL& url, const TQObject* owner, BusyLevel priority ) { - if( sLoaders.tqcontains( url )) { + if( sLoaders.contains( url )) { ImageLoader* loader = sLoaders[ url ]; loader->ref( owner, priority ); // resume if this owner has high priority diff --git a/src/gvcore/imagesavedialog.cpp b/src/gvcore/imagesavedialog.cpp index 81e4a44..c98b30c 100644 --- a/src/gvcore/imagesavedialog.cpp +++ b/src/gvcore/imagesavedialog.cpp @@ -67,7 +67,7 @@ ImageSaveDialog::ImageSaveDialog(KURL& url, const TQCString& imageFormat, TQWidg TQStringList patterns; for (TQStringList::const_iterator patIt=mt->patterns().begin();patIt!=mt->patterns().end();++patIt) { TQString pattern=(*patIt).lower(); - if (!patterns.tqcontains(pattern)) patterns.append(pattern); + if (!patterns.contains(pattern)) patterns.append(pattern); } if (patterns.isEmpty()) { patterns.append( TQString("*.%1").tqarg(format.lower()) ); @@ -119,7 +119,7 @@ void ImageSaveDialog::updateImageFormat(const TQString& text) { TQString name=locationEdit->currentText(); TQString suffix=KImageIO::suffix(mImageFormat); - int dotPos=name.tqfindRev('.'); + int dotPos=name.findRev('.'); if (dotPos>-1) { name=name.left(dotPos); } diff --git a/src/gvcore/imageview.cpp b/src/gvcore/imageview.cpp index e91673b..8bc670b 100644 --- a/src/gvcore/imageview.cpp +++ b/src/gvcore/imageview.cpp @@ -662,12 +662,12 @@ void ImageView::addPendingPaintInternal( bool smooth, TQRect rect ) { // handle the case of two different paints at the same position (just in case) key *= 100; bool insert = true; - while( d->mPendingPaints.tqcontains( key )) { - if( d->mPendingPaints[ key ].rect.tqcontains( rect )) { + while( d->mPendingPaints.contains( key )) { + if( d->mPendingPaints[ key ].rect.contains( rect )) { insert = false; break; } - if( rect.tqcontains( d->mPendingPaints[ key ].rect )) { + if( rect.contains( d->mPendingPaints[ key ].rect )) { break; } ++key; @@ -1142,7 +1142,7 @@ void ImageView::slotSelectZoom() { if (currentItem>=int(d->mZoomComboActions.count()) ) { TQString txt=d->mZoomCombo->currentText(); - txt=txt.left(txt.tqfind('%')); + txt=txt.left(txt.find('%')); double value=KGlobal::locale()->readNumber(txt) / 100.0; updateZoom(ZOOM_FREE, value); } else { diff --git a/src/gvcore/imageviewcontroller.cpp b/src/gvcore/imageviewcontroller.cpp index 992a961..a3721d0 100644 --- a/src/gvcore/imageviewcontroller.cpp +++ b/src/gvcore/imageviewcontroller.cpp @@ -388,7 +388,7 @@ void ImageViewController::slotAutoHide() { if (d->mFullScreenBar) { // Do not auto hide if the cursor is over the bar TQPoint pos=d->mFullScreenBar->mapFromGlobal(TQCursor::pos()); - if (TQT_TQRECT_OBJECT(d->mFullScreenBar->rect()).tqcontains(pos)) { + if (TQT_TQRECT_OBJECT(d->mFullScreenBar->rect()).contains(pos)) { d->restartAutoHideTimer(); return; } diff --git a/src/gvcore/jpegformattype.cpp b/src/gvcore/jpegformattype.cpp index 26dee4e..97ad532 100644 --- a/src/gvcore/jpegformattype.cpp +++ b/src/gvcore/jpegformattype.cpp @@ -278,7 +278,7 @@ int JPEGFormat::decode(TQImage& image, TQImageConsumer* consumer, const uchar* b mDecompress.src->bytes_in_buffer = (size_t) mSourceManager.valid_buffer_length; #ifdef BUFFER_DEBUG - qDebug("buffer tqcontains %d bytes", mSourceManager.valid_buffer_length); + qDebug("buffer contains %d bytes", mSourceManager.valid_buffer_length); #endif if(mState == INIT) { diff --git a/src/gvcore/mimetypeutils.cpp b/src/gvcore/mimetypeutils.cpp index e5a210e..921ec4a 100644 --- a/src/gvcore/mimetypeutils.cpp +++ b/src/gvcore/mimetypeutils.cpp @@ -56,10 +56,10 @@ Kind mimeTypeKind(const TQString& mimeType) { if (mimeType.startsWith("inode/directory")) { return KIND_DIR; } - if (Archive::mimeTypes().tqcontains(mimeType)) { + if (Archive::mimeTypes().contains(mimeType)) { return KIND_ARCHIVE; } - if (rasterImageMimeTypes().tqcontains(mimeType)) { + if (rasterImageMimeTypes().contains(mimeType)) { return KIND_RASTER_IMAGE; } diff --git a/src/gvcore/slideshow.cpp b/src/gvcore/slideshow.cpp index aef2a9c..ec2c74e 100644 --- a/src/gvcore/slideshow.cpp +++ b/src/gvcore/slideshow.cpp @@ -1,5 +1,5 @@ // vim: set tabstop=4 shiftwidth=4 noexpandtab -// kate: indent-mode csands; indent-width 4; tqreplace-tabs-save off; tqreplace-tabs off; tqreplace-trailing-space-save off; space-indent off; tabs-indents on; tab-width 4; +// kate: indent-mode csands; indent-width 4; replace-tabs-save off; replace-tabs off; replace-trailing-space-save off; space-indent off; tabs-indents on; tab-width 4; /* Gwenview - A simple image viewer for KDE Copyright 2000-2004 Aur�ien G�eau diff --git a/src/gvcore/slideshow.h b/src/gvcore/slideshow.h index 59cf81d..5797b37 100644 --- a/src/gvcore/slideshow.h +++ b/src/gvcore/slideshow.h @@ -1,5 +1,5 @@ // vim: set tabstop=4 shiftwidth=4 noexpandtab -// kate: indent-mode csands; indent-width 4; tqreplace-tabs-save off; tqreplace-tabs off; tqreplace-trailing-space-save off; space-indent off; tabs-indents on; tab-width 4; +// kate: indent-mode csands; indent-width 4; replace-tabs-save off; replace-tabs off; replace-trailing-space-save off; space-indent off; tabs-indents on; tab-width 4; /* Gwenview - A simple image viewer for KDE Copyright 2000-2004 Aur�ien G�eau diff --git a/src/gvcore/thumbnailloadjob.cpp b/src/gvcore/thumbnailloadjob.cpp index f4335df..1acd910 100644 --- a/src/gvcore/thumbnailloadjob.cpp +++ b/src/gvcore/thumbnailloadjob.cpp @@ -688,7 +688,7 @@ void ThumbnailLoadJob::checkThumbnail() { } // Thumbnail not found or not valid - if ( MimeTypeUtils::rasterImageMimeTypes().tqcontains(mCurrentItem->mimetype()) ) { + if ( MimeTypeUtils::rasterImageMimeTypes().contains(mCurrentItem->mimetype()) ) { // This is a raster image if (mCurrentURL.isLocalFile()) { // Original is a local file, create the thumbnail diff --git a/src/gvcore/xpm.cpp b/src/gvcore/xpm.cpp index 49acb8e..cc2cabc 100644 --- a/src/gvcore/xpm.cpp +++ b/src/gvcore/xpm.cpp @@ -70,9 +70,9 @@ static TQString fbname( const TQString &fileName ) // get file basename (sort of TQString s = fileName; if ( !s.isEmpty() ) { int i; - if ( (i = s.tqfindRev('/')) >= 0 ) + if ( (i = s.findRev('/')) >= 0 ) s = s.mid( i ); - if ( (i = s.tqfindRev('\\')) >= 0 ) + if ( (i = s.findRev('\\')) >= 0 ) s = s.mid( i ); TQRegExp r( TQString::tqfromLatin1("[a-zA-Z][a-zA-Z0-9_]*") ); int p = r.search( s ); @@ -132,15 +132,15 @@ static bool read_xpm_string( TQCString &buf, TQIODevice *d, static int nextColorSpec(const TQCString & buf) { - int i = buf.tqfind(" c "); + int i = buf.find(" c "); if (i < 0) - i = buf.tqfind(" g "); + i = buf.find(" g "); if (i < 0) - i = buf.tqfind(" g4 "); + i = buf.find(" g4 "); if (i < 0) - i = buf.tqfind(" m "); + i = buf.find(" m "); if (i < 0) - i = buf.tqfind(" s "); + i = buf.find(" s "); return i; } @@ -165,7 +165,7 @@ static void read_xpm_image_or_array( TQImageIO * iio, const char * const * sourc d = iio ? iio->ioDevice() : 0; d->readLine( buf.data(), buf.size() ); // "/* XPM */" TQRegExp r( TQString::tqfromLatin1("/\\*.XPM.\\*/") ); - if ( buf.tqfind(r) == -1 ) + if ( buf.find(r) == -1 ) return; // bad magic } else if ( !source ) { return; @@ -361,7 +361,7 @@ static void write_xpm_image( TQImageIO * iio ) TQRgb * yp = (TQRgb *)image.scanLine( y ); for( x=0; x