From 6335dc55802871b5a43492f217b6edbb420204c4 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/kdeutils@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- ark/arch.cpp | 2 +- ark/archiveformatdlg.cpp | 2 +- ark/archiveformatinfo.cpp | 14 +- ark/archiveformatinfo.h | 2 +- ark/arkapp.cpp | 6 +- ark/arkutils.cpp | 2 +- ark/arkwidget.cpp | 10 +- ark/compressedfile.cpp | 2 +- ark/filelistview.cpp | 8 +- ark/lha.cpp | 6 +- ark/mainwindow.cpp | 2 +- ark/rar.cpp | 2 +- ark/sevenzip.cpp | 4 +- ark/tar.cpp | 4 +- ark/zip.cpp | 2 +- ark/zoo.cpp | 2 +- kcalc/kcalc.cpp | 66 +++--- kcalc/kcalc.h | 2 +- kcalc/kcalc_button.cpp | 10 +- kcalc/knumber/knumber.cpp | 4 +- kdelirc/irkick/irkick.cpp | 6 +- kdelirc/irkick/klircclient.cpp | 4 +- kdelirc/kcmlirc/addaction.cpp | 28 +-- kdelirc/kcmlirc/editaction.cpp | 4 +- kdelirc/kdelirc/modes.cpp | 8 +- kdessh/sshdlg.cpp | 2 +- kdf/disklist.cpp | 66 +++--- kdf/disklist.h | 2 +- kdf/disks.cpp | 38 ++-- kdf/kdfwidget.cpp | 18 +- kdf/kwikdisk.cpp | 6 +- kdf/listview.cpp | 2 +- kdf/mntconfig.cpp | 6 +- kedit/kedit.cpp | 16 +- kedit/kedit.h | 2 +- kedit/ktextfiledlg.cpp | 4 +- kfloppy/floppy.h | 2 +- kfloppy/format.cpp | 26 +-- kgpg/keygener.cpp | 2 +- kgpg/keyinfowidget.cpp | 16 +- kgpg/keyservers.cpp | 20 +- kgpg/kgpg.cpp | 10 +- kgpg/kgpginterface.cpp | 234 ++++++++++----------- kgpg/kgpglibrary.cpp | 2 +- kgpg/kgpgoptions.cpp | 10 +- kgpg/listkeys.cpp | 78 +++---- kgpg/popuppublic.cpp | 16 +- khexedit/dialog.cc | 4 +- khexedit/draglabel.cc | 2 +- khexedit/exportdialog.cc | 4 +- khexedit/hexbuffer.cc | 18 +- khexedit/hexbuffer.h | 2 +- khexedit/hexeditorwidget.cc | 8 +- khexedit/hexeditorwidget.h | 4 +- khexedit/hexmanagerwidget.cc | 16 +- khexedit/hexmanagerwidget.h | 2 +- khexedit/hexviewwidget.cc | 2 +- khexedit/lib/codecs/kcharcodec.cpp | 2 +- khexedit/lib/controller/kvalueeditor.cpp | 2 +- khexedit/lib/kbigbuffer.cpp | 6 +- khexedit/lib/kbigbuffer.h | 8 +- khexedit/lib/kbufferdrag.cpp | 6 +- khexedit/lib/kdatabuffer.cpp | 4 +- khexedit/lib/kdatabuffer.h | 14 +- khexedit/lib/kfixedsizebuffer.cpp | 4 +- khexedit/lib/kfixedsizebuffer.h | 6 +- khexedit/lib/khexedit.cpp | 8 +- khexedit/lib/kplainbuffer.cpp | 4 +- khexedit/lib/kplainbuffer.h | 8 +- khexedit/lib/kwrappingrobuffer.cpp | 2 +- khexedit/lib/kwrappingrobuffer.h | 6 +- khexedit/parts/kpart/khepart.cpp | 2 +- khexedit/toplevel.cc | 16 +- khexedit/toplevel.h | 4 +- kjots/CHANGES | 4 +- kjots/KJotsMain.cpp | 2 +- kjots/kjotsentry.cpp | 14 +- klaptopdaemon/acpi_helper.cpp | 2 +- klaptopdaemon/battery.cpp | 2 +- klaptopdaemon/daemondock.cpp | 2 +- klaptopdaemon/kpcmcia.cpp | 16 +- klaptopdaemon/portable.cpp | 24 +-- klaptopdaemon/sony.cpp | 4 +- klaptopdaemon/xautolock.cc | 4 +- klaptopdaemon/xautolock_engine.c | 2 +- kmilo/generic/generic_monitor.cpp | 2 +- kmilo/kmilo_kvaio/kvaio.cpp | 4 +- kmilo/thinkpad/kcmthinkpad/main.cpp | 2 +- kmilo/thinkpad/thinkpad.cpp | 2 +- .../kmultiformlistbox-multivisible.cpp | 4 +- kregexpeditor/KWidgetStreamer/kwidgetstreamer.h | 2 +- kregexpeditor/characterswidget.cpp | 2 +- kregexpeditor/compoundwidget.cpp | 4 +- kregexpeditor/editorwindow.cpp | 4 +- kregexpeditor/qt-only/clean | 2 +- kregexpeditor/regexpwidget.cpp | 2 +- kregexpeditor/singlecontainerwidget.cpp | 2 +- kregexpeditor/userdefinedregexps.cpp | 2 +- ksim/baselist.h | 2 +- ksim/ksimpref.cpp | 6 +- ksim/ksimsysinfo.cpp | 34 +-- ksim/ksimview.cpp | 2 +- ksim/library/pluginloader.cpp | 20 +- ksim/library/pluginloader.h | 10 +- ksim/library/pluginmodule.cpp | 2 +- ksim/library/themeloader.cpp | 34 +-- ksim/monitorprefs.cpp | 4 +- ksim/monitors/cpu/ksimcpu.cpp | 14 +- ksim/monitors/disk/ksimdisk.cpp | 8 +- ksim/monitors/filesystem/filesystemwidget.cpp | 2 +- ksim/monitors/filesystem/fsystemconfig.cpp | 8 +- ksim/monitors/lm_sensors/sensorbase.cpp | 10 +- ksim/monitors/lm_sensors/sensorsconfig.cpp | 2 +- ksim/monitors/net/ksimnet.cpp | 10 +- ksim/monitors/net/netdialog.cpp | 2 +- ksim/monitors/snmp/browsedialog.cpp | 2 +- ksim/monitors/snmp/configpage.cpp | 8 +- ksim/monitors/snmp/hostdialog.cpp | 8 +- ksim/monitors/snmp/labelmonitor.cpp | 4 +- ksim/monitors/snmp/monitorconfig.cpp | 2 +- ksim/monitors/snmp/monitordialog.cpp | 6 +- ksim/monitors/snmp/session.cpp | 2 +- kwallet/allyourbase.cpp | 6 +- kwallet/allyourbase.h | 4 +- kwallet/konfigurator/konfigurator.cpp | 4 +- kwallet/kwalleteditor.cpp | 16 +- kwallet/kwalletmanager.cpp | 6 +- kwallet/kwmapeditor.cpp | 4 +- kwallet/kwmapeditor.h | 2 +- superkaramba/doc/faq/faq.dat | 2 +- superkaramba/doc/faq/faq.html | 4 +- superkaramba/doc/faq/faq.txt | 4 +- superkaramba/doc/python_api/make_api_doc.sh | 2 +- superkaramba/examples/taskBar/cleanbar/cleanbar.py | 4 +- superkaramba/src/clickarea.cpp | 4 +- superkaramba/src/clickmap.cpp | 2 +- superkaramba/src/cpusensor.cpp | 12 +- superkaramba/src/datesensor.cpp | 2 +- superkaramba/src/disksensor.cpp | 28 +-- superkaramba/src/imagelabel.cpp | 12 +- superkaramba/src/karamba.cpp | 6 +- superkaramba/src/karamba.h | 2 +- superkaramba/src/karambaapp.cpp | 2 +- superkaramba/src/memsensor.cpp | 16 +- superkaramba/src/meter.cpp | 2 +- superkaramba/src/misc_python.cpp | 2 +- superkaramba/src/networksensor.cpp | 14 +- superkaramba/src/noatunsensor.cpp | 14 +- superkaramba/src/rsssensor.cpp | 2 +- superkaramba/src/sensorsensor.cpp | 4 +- superkaramba/src/systemtray.cpp | 2 +- superkaramba/src/taskmanager.cpp | 10 +- superkaramba/src/taskmanager.h | 2 +- superkaramba/src/textlabel.cpp | 2 +- superkaramba/src/themesdlg.cpp | 4 +- superkaramba/src/themewidget.cpp | 2 +- superkaramba/src/uptimesensor.cpp | 14 +- superkaramba/src/xmmssensor.cpp | 10 +- 158 files changed, 742 insertions(+), 742 deletions(-) diff --git a/ark/arch.cpp b/ark/arch.cpp index 336fe59..9b9aa00 100644 --- a/ark/arch.cpp +++ b/ark/arch.cpp @@ -297,7 +297,7 @@ void Arch::slotReceivedTOC( KProcess*, char* data, int length ) { processLine( m_buffer ); } - else if ( m_buffer.tqfind( m_headerString.data() ) == -1 ) + else if ( m_buffer.find( m_headerString.data() ) == -1 ) { if ( m_header_removed && !m_finished ) { diff --git a/ark/archiveformatdlg.cpp b/ark/archiveformatdlg.cpp index f9ac931..68c0d3f 100644 --- a/ark/archiveformatdlg.cpp +++ b/ark/archiveformatdlg.cpp @@ -56,7 +56,7 @@ ArchiveFormatDlg::ArchiveFormatDlg( TQWidget * tqparent, const TQString & defaul TQStringList list = ArchiveFormatInfo::self()->allDescriptions(); list.sort(); m_combo->insertStringList( list ); - m_combo->setCurrentItem( list.tqfindIndex( defaultDescription ) ); + m_combo->setCurrentItem( list.findIndex( defaultDescription ) ); } TQString ArchiveFormatDlg::mimeType() diff --git a/ark/archiveformatinfo.cpp b/ark/archiveformatinfo.cpp index ea07d6a..2dcbabb 100644 --- a/ark/archiveformatinfo.cpp +++ b/ark/archiveformatinfo.cpp @@ -72,7 +72,7 @@ void ArchiveFormatInfo::buildFormatInfos() addFormatInfo( COMPRESSED_FORMAT, "application/x-xz", ".xz" ); addFormatInfo( COMPRESSED_FORMAT, "application/x-lzop", ".lzo" ); addFormatInfo( COMPRESSED_FORMAT, "application/x-compress", ".Z" ); - tqfind( COMPRESSED_FORMAT ).description = i18n( "Compressed File" ); + find( COMPRESSED_FORMAT ).description = i18n( "Compressed File" ); addFormatInfo( ZOO_FORMAT, "application/x-zoo", ".zoo" ); @@ -90,7 +90,7 @@ void ArchiveFormatInfo::buildFormatInfos() void ArchiveFormatInfo::addFormatInfo( ArchType type, TQString mime, TQString stdExt ) { - FormatInfo & info = tqfind( type ); + FormatInfo & info = find( type ); KDesktopFile * desktopFile = new KDesktopFile( mime + ".desktop", true, "mime" ); if( !desktopFile ) @@ -146,7 +146,7 @@ TQStringList ArchiveFormatInfo::allDescriptions() return descriptions; } -ArchiveFormatInfo::FormatInfo & ArchiveFormatInfo::tqfind( ArchType type ) +ArchiveFormatInfo::FormatInfo & ArchiveFormatInfo::find( ArchType type ) { InfoList::Iterator it = m_formatInfos.begin(); for( ; it != m_formatInfos.end(); ++it ) @@ -177,7 +177,7 @@ ArchType ArchiveFormatInfo::archTypeForMimeType( const TQString & mimeType ) InfoList::Iterator it = m_formatInfos.begin(); for( ; it != m_formatInfos.end(); ++it ) { - int index = (*it).mimeTypes.tqfindIndex( mimeType ); + int index = (*it).mimeTypes.findIndex( mimeType ); if( index != -1 ) return (*it).type; } @@ -243,7 +243,7 @@ TQString ArchiveFormatInfo::mimeTypeForDescription( const TQString & description int index; for( ; it != m_formatInfos.end(); ++it ) { - index = (*it).allDescriptions.tqfindIndex( description ); + index = (*it).allDescriptions.findIndex( description ); if ( index != -1 ) return (* (*it).mimeTypes.at( index ) ); } @@ -256,7 +256,7 @@ TQString ArchiveFormatInfo::descriptionForMimeType( const TQString & mimeType ) int index; for( ; it != m_formatInfos.end(); ++it ) { - index = (*it).mimeTypes.tqfindIndex( mimeType ); + index = (*it).mimeTypes.findIndex( mimeType ); if ( index != -1 ) return (* (*it).allDescriptions.at( index ) ); } @@ -269,7 +269,7 @@ TQString ArchiveFormatInfo::defaultExtension( const TQString & mimeType ) int index; for( ; it != m_formatInfos.end(); ++it ) { - index = (*it).mimeTypes.tqfindIndex( mimeType ); + index = (*it).mimeTypes.findIndex( mimeType ); if ( index != -1 ) return (* (*it).defaultExtensions.at( index ) ); } diff --git a/ark/archiveformatinfo.h b/ark/archiveformatinfo.h index e1c987d..5ba5ef3 100644 --- a/ark/archiveformatinfo.h +++ b/ark/archiveformatinfo.h @@ -59,7 +59,7 @@ private: enum ArchType type; }; - FormatInfo & tqfind ( ArchType type ); + FormatInfo & find ( ArchType type ); typedef TQValueList InfoList; InfoList m_formatInfos; diff --git a/ark/arkapp.cpp b/ark/arkapp.cpp index 3085399..c4604e6 100644 --- a/ark/arkapp.cpp +++ b/ark/arkapp.cpp @@ -85,7 +85,7 @@ static TQString resolveFilename(const TQString & _arkname) if (name.at(0) != '/') { // copy the path from _arkname - int index = _arkname.tqfindRev('/'); + int index = _arkname.findRev('/'); name = _arkname.left(index + 1) + name; } kdDebug(1601) << "Now resolve " << name << endl; @@ -243,7 +243,7 @@ ArkApplication::addOpenArk(const KURL & _arkname, MainWindow *_ptr) else realName = _arkname.prettyURL(); openArksList.append(realName); - m_windowsHash.tqreplace(realName, _ptr); + m_windowsHash.replace(realName, _ptr); kdDebug(1601) << "Saved ptr " << _ptr << " added open ark: " << realName << endl; } @@ -287,7 +287,7 @@ ArkApplication::isArkOpenAlready(const KURL & _arkname) realName = resolveFilename(_arkname.path()); // follow symlink else realName = _arkname.prettyURL(); - return ( openArksList.tqfindIndex(realName) != -1 ); + return ( openArksList.findIndex(realName) != -1 ); } #include "arkapp.moc" diff --git a/ark/arkutils.cpp b/ark/arkutils.cpp index 94b5bc1..210f9bb 100644 --- a/ark/arkutils.cpp +++ b/ark/arkutils.cpp @@ -101,7 +101,7 @@ TQString ArkUtils::getTimeStamp(const TQString &_month, TQString year, timestamp; - if (_yearOrTime.tqcontains(":")) + if (_yearOrTime.contains(":")) // it has a timestamp so we have to figure out the year { year.sprintf("%d", ArkUtils::getYear(nMonth, thisYear, thisMonth)); diff --git a/ark/arkwidget.cpp b/ark/arkwidget.cpp index 2eb922b..f070d4d 100644 --- a/ark/arkwidget.cpp +++ b/ark/arkwidget.cpp @@ -453,7 +453,7 @@ ArkWidget::guessName( const KURL &archive ) ext = (*it).remove( '*' ); if ( fileName.endsWith( ext ) ) { - fileName = fileName.left( fileName.tqfindRev( ext ) ); + fileName = fileName.left( fileName.findRev( ext ) ); break; } } @@ -1204,7 +1204,7 @@ ArkWidget::toLocalFile( const KURL& url ) TQString strURL = url.prettyURL(); TQString tempfile = tmpDir(); - tempfile += strURL.right(strURL.length() - strURL.tqfindRev("/") - 1); + tempfile += strURL.right(strURL.length() - strURL.findRev("/") - 1); deleteAfterUse(tempfile); // remember for deletion KURL tempurl; tempurl.setPath( tempfile ); if( !KIO::NetAccess::dircopy(url, tempurl, this) ) @@ -1643,10 +1643,10 @@ ArkWidget::slotEditFinished(KProcess *kp) TQStringList::Iterator it = list.begin(); TQString filename = *it; TQString path; - if (filename.tqcontains('/') > 3) + if (filename.contains('/') > 3) { kdDebug(1601) << "Filename is originally: " << filename << endl; - int i = filename.tqfind('/', 5); + int i = filename.find('/', 5); path = filename.left(1+i); kdDebug(1601) << "Changing to dir: " << path << endl; TQDir::setCurrent(path); @@ -1734,7 +1734,7 @@ ArkWidget::showCurrentFile() TQString fullname = tmpDir(); fullname += name; - if(fullname.tqcontains("../")) + if(fullname.contains("../")) fullname.remove("../"); //Convert the TQString filename to KURL to escape the bad characters diff --git a/ark/compressedfile.cpp b/ark/compressedfile.cpp index 17df279..f935eac 100644 --- a/ark/compressedfile.cpp +++ b/ark/compressedfile.cpp @@ -289,7 +289,7 @@ void CompressedFile::addFile( const TQStringList &urls ) proc.start(KProcess::Block); m_tmpfile = file.right(file.length() - - file.tqfindRev("/")-1); + - file.findRev("/")-1); m_tmpfile = m_tmpdir + '/' + m_tmpfile; kdDebug(1601) << "Temp file name is " << m_tmpfile << endl; diff --git a/ark/filelistview.cpp b/ark/filelistview.cpp index 82a0c21..a4e2f02 100644 --- a/ark/filelistview.cpp +++ b/ark/filelistview.cpp @@ -129,7 +129,7 @@ void FileLVI::setText( int column, const TQString &text ) name = name.left( name.length() - 1 ); if ( name.startsWith( "/" ) ) name = name.mid( 1 ); - int pos = name.tqfindRev( '/' ); + int pos = name.findRev( '/' ); if ( pos != -1 ) name = name.right( name.length() - pos - 1 ); TQListViewItem::setText( column, name ); @@ -242,7 +242,7 @@ void FileListView::removeColumn( int index ) { for ( unsigned int i = index; i < m_columnMap.count() - 2; i++ ) { - m_columnMap.tqreplace( i, m_columnMap[ i + 1 ] ); + m_columnMap.replace( i, m_columnMap[ i + 1 ] ); } m_columnMap.remove( m_columnMap[ m_columnMap.count() - 1 ] ); @@ -509,11 +509,11 @@ FileLVI* FileListView::findParent( const TQString& fullname ) if ( name.startsWith( "/" ) ) name = name.mid( 1 ); // Checks if this entry needs a tqparent - if ( !name.tqcontains( '/' ) ) + if ( !name.contains( '/' ) ) return static_cast< FileLVI* >( 0 ); // Get a list of ancestors - TQString parentFullname = name.left( name.tqfindRev( '/' ) ); + TQString parentFullname = name.left( name.findRev( '/' ) ); TQStringList ancestorList = TQStringList::split( '/', parentFullname ); // Checks if the listview contains the first item in the list of ancestors diff --git a/ark/lha.cpp b/ark/lha.cpp index d34fd51..f83e809 100644 --- a/ark/lha.cpp +++ b/ark/lha.cpp @@ -67,7 +67,7 @@ bool LhaArch::processLine( const TQCString &line ) char columns[13][80]; char filename[4096]; - if ( line.tqcontains( "[generic]" ) ) + if ( line.contains( "[generic]" ) ) { sscanf( _line, " %79[]\\[generic] %79[0-9] %79[0-9] %79[0-9.%*] %10[-a-z0-9 ] %3[A-Za-z]%1[ ]%2[0-9 ]%1[ ]%5[ 0-9:]%1[ ]%4095[^\n]", @@ -76,7 +76,7 @@ bool LhaArch::processLine( const TQCString &line ) columns[9], filename ); strcpy( columns[1], " " ); } - else if ( line.tqcontains( "[MS-DOS]" ) ) + else if ( line.contains( "[MS-DOS]" ) ) { sscanf( _line, " %79[]\\[MS-DOS] %79[0-9] %79[0-9] %79[0-9.%*] %10[-a-z0-9 ] %3[A-Za-z]%1[ ]%2[0-9 ]%1[ ]%5[ 0-9:]%1[ ]%4095[^\n]", @@ -103,7 +103,7 @@ bool LhaArch::processLine( const TQCString &line ) TQString file = filename; TQString name, link; bool bLink = false; - int pos = file.tqfind( " -> " ); + int pos = file.find( " -> " ); if ( pos != -1 ) { bLink = true; diff --git a/ark/mainwindow.cpp b/ark/mainwindow.cpp index 045ce1a..6434bca 100644 --- a/ark/mainwindow.cpp +++ b/ark/mainwindow.cpp @@ -263,7 +263,7 @@ MainWindow::getOpenURL( bool addOnly, const TQString & caption, if ( !suggestedName.isEmpty() ) { filter = TQString(); - combo->setCurrentItem( list.tqfindIndex( ArchiveFormatInfo::self()->descriptionForMimeType( + combo->setCurrentItem( list.findIndex( ArchiveFormatInfo::self()->descriptionForMimeType( KMimeType::findByPath( suggestedName, 0, true )->name() ) ) ); } diff --git a/ark/rar.cpp b/ark/rar.cpp index 056e6c4..1cebe05 100644 --- a/ark/rar.cpp +++ b/ark/rar.cpp @@ -291,7 +291,7 @@ void RarArch::unarchFileInternal() bool RarArch::passwordRequired() { - return m_lastShellOutput.tqfindRev("password incorrect ?)")+1; + return m_lastShellOutput.findRev("password incorrect ?)")+1; } void RarArch::remove( TQStringList *list ) diff --git a/ark/sevenzip.cpp b/ark/sevenzip.cpp index 2292214..0673f6c 100644 --- a/ark/sevenzip.cpp +++ b/ark/sevenzip.cpp @@ -330,11 +330,11 @@ void SevenZipArch::slotReceivedTOC( KProcess*, char* data, int length ) startChar = lfChar + 1; // Check if the header was found - if ( m_buffer.tqfind( m_headerString.data() ) != -1 ) + if ( m_buffer.find( m_headerString.data() ) != -1 ) { if ( !m_header_removed ) { - m_nameColumnPos = m_buffer.tqfindRev( ' ' ) + 1; + m_nameColumnPos = m_buffer.findRev( ' ' ) + 1; m_header_removed = true; } else diff --git a/ark/tar.cpp b/ark/tar.cpp index 4bc6c0a..e91f5ca 100644 --- a/ark/tar.cpp +++ b/ark/tar.cpp @@ -322,14 +322,14 @@ void TarArch::slotListingDone(KProcess *_kp) if (flv!=NULL && flv->totalFiles()>0) { const TQString firstfile = ((FileLVI *) flv->firstChild())->fileName(); - if (list.tqfind(TQRegExp(TQString("\\s\\./%1[/\\n]").tqarg(firstfile)))>=0) + if (list.find(TQRegExp(TQString("\\s\\./%1[/\\n]").tqarg(firstfile)))>=0) { m_dotslash = true; kdDebug(1601) << k_funcinfo << "archive has dot-slash" << endl; } else { - if (list.tqfind(TQRegExp(TQString("\\s%1[/\\n]").tqarg(firstfile)))>=0) + if (list.find(TQRegExp(TQString("\\s%1[/\\n]").tqarg(firstfile)))>=0) { // archive doesn't have dot-slash m_dotslash = false; diff --git a/ark/zip.cpp b/ark/zip.cpp index 59db0c9..4a647b5 100644 --- a/ark/zip.cpp +++ b/ark/zip.cpp @@ -240,7 +240,7 @@ void ZipArch::unarchFileInternal() bool ZipArch::passwordRequired() { - return m_lastShellOutput.tqfindRev("unable to get password\n")!=-1 || m_lastShellOutput.endsWith("password inflating\n") || m_lastShellOutput.tqfindRev("password incorrect--reenter:")!=-1 || m_lastShellOutput.endsWith("incorrect password\n"); + return m_lastShellOutput.findRev("unable to get password\n")!=-1 || m_lastShellOutput.endsWith("password inflating\n") || m_lastShellOutput.findRev("password incorrect--reenter:")!=-1 || m_lastShellOutput.endsWith("incorrect password\n"); } void ZipArch::remove( TQStringList *list ) diff --git a/ark/zoo.cpp b/ark/zoo.cpp index 6f9a53e..32b161b 100644 --- a/ark/zoo.cpp +++ b/ark/zoo.cpp @@ -287,7 +287,7 @@ TQString fixTime( const TQString &_strTime ) // +3 or -3 etc. TQString strTime = _strTime; - if ( strTime.tqcontains("+") || strTime.tqcontains("-") ) + if ( strTime.contains("+") || strTime.contains("-") ) { TQCharRef c = strTime.tqat( 8 ); int offset = strTime.right( strTime.length() - 9 ).toInt(); diff --git a/kcalc/kcalc.cpp b/kcalc/kcalc.cpp index a10b98d..0a68046 100644 --- a/kcalc/kcalc.cpp +++ b/kcalc/kcalc.cpp @@ -258,42 +258,42 @@ KCalculator::KCalculator(TQWidget *tqparent, const char *name) smallBtnLayout->addWidget(pbScientific["HypMode"], 0, 1); smallBtnLayout->addWidget(pbLogic["AND"], 0, 2); smallBtnLayout->addWidget(pbMod, 0, 3); - smallBtnLayout->addWidget(NumButtonGroup->tqfind(0xA), 0, 4); + smallBtnLayout->addWidget(NumButtonGroup->find(0xA), 0, 4); smallBtnLayout->addWidget(pbConstant[0], 0, 5); smallBtnLayout->addWidget(pbStat["Mean"], 1, 0); smallBtnLayout->addWidget(pbScientific["Sine"], 1, 1); smallBtnLayout->addWidget(pbLogic["OR"], 1, 2); smallBtnLayout->addWidget(pbReci, 1, 3); - smallBtnLayout->addWidget(NumButtonGroup->tqfind(0xB), 1, 4); + smallBtnLayout->addWidget(NumButtonGroup->find(0xB), 1, 4); smallBtnLayout->addWidget(pbConstant[1], 1, 5); smallBtnLayout->addWidget(pbStat["StandardDeviation"], 2, 0); smallBtnLayout->addWidget(pbScientific["Cosine"], 2, 1); smallBtnLayout->addWidget(pbLogic["XOR"], 2, 2); smallBtnLayout->addWidget(pbFactorial, 2, 3); - smallBtnLayout->addWidget(NumButtonGroup->tqfind(0xC), 2, 4); + smallBtnLayout->addWidget(NumButtonGroup->find(0xC), 2, 4); smallBtnLayout->addWidget(pbConstant[2], 2, 5); smallBtnLayout->addWidget(pbStat["Median"], 3, 0); smallBtnLayout->addWidget(pbScientific["Tangent"], 3, 1); smallBtnLayout->addWidget(pbLogic["LeftShift"], 3, 2); smallBtnLayout->addWidget(pbSquare, 3, 3); - smallBtnLayout->addWidget(NumButtonGroup->tqfind(0xD), 3, 4); + smallBtnLayout->addWidget(NumButtonGroup->find(0xD), 3, 4); smallBtnLayout->addWidget(pbConstant[3], 3, 5); smallBtnLayout->addWidget(pbStat["InputData"], 4, 0); smallBtnLayout->addWidget(pbScientific["Log10"], 4, 1); smallBtnLayout->addWidget(pbLogic["RightShift"], 4, 2); smallBtnLayout->addWidget(pbRoot, 4, 3); - smallBtnLayout->addWidget(NumButtonGroup->tqfind(0xE), 4, 4); + smallBtnLayout->addWidget(NumButtonGroup->find(0xE), 4, 4); smallBtnLayout->addWidget(pbConstant[4], 4, 5); smallBtnLayout->addWidget(pbStat["ClearData"], 5, 0); smallBtnLayout->addWidget(pbScientific["LogNatural"], 5, 1); smallBtnLayout->addWidget(pbLogic["One-Complement"], 5, 2); smallBtnLayout->addWidget(pbPower, 5, 3); - smallBtnLayout->addWidget(NumButtonGroup->tqfind(0xF), 5, 4); + smallBtnLayout->addWidget(NumButtonGroup->find(0xF), 5, 4); smallBtnLayout->addWidget(pbConstant[5], 5, 5); smallBtnLayout->setRowStretch(0, 0); @@ -614,22 +614,22 @@ TQWidget* KCalculator::setupNumericKeys(TQWidget *tqparent) thisLayout->addWidget(pbX, 0, 2); thisLayout->addWidget(pbMinus, 0, 3); - thisLayout->addWidget(NumButtonGroup->tqfind(7), 1, 0); - thisLayout->addWidget(NumButtonGroup->tqfind(8), 1, 1); - thisLayout->addWidget(NumButtonGroup->tqfind(9), 1, 2); + thisLayout->addWidget(NumButtonGroup->find(7), 1, 0); + thisLayout->addWidget(NumButtonGroup->find(8), 1, 1); + thisLayout->addWidget(NumButtonGroup->find(9), 1, 2); thisLayout->addMultiCellWidget(pbPlus, 1, 2, 3, 3); - thisLayout->addWidget(NumButtonGroup->tqfind(4), 2, 0); - thisLayout->addWidget(NumButtonGroup->tqfind(5), 2, 1); - thisLayout->addWidget(NumButtonGroup->tqfind(6), 2, 2); + thisLayout->addWidget(NumButtonGroup->find(4), 2, 0); + thisLayout->addWidget(NumButtonGroup->find(5), 2, 1); + thisLayout->addWidget(NumButtonGroup->find(6), 2, 2); //thisLayout->addMultiCellWidget(pbPlus, 1, 2, 3, 3); - thisLayout->addWidget(NumButtonGroup->tqfind(1), 3, 0); - thisLayout->addWidget(NumButtonGroup->tqfind(2), 3, 1); - thisLayout->addWidget(NumButtonGroup->tqfind(3), 3, 2); + thisLayout->addWidget(NumButtonGroup->find(1), 3, 0); + thisLayout->addWidget(NumButtonGroup->find(2), 3, 1); + thisLayout->addWidget(NumButtonGroup->find(3), 3, 2); thisLayout->addMultiCellWidget(pbEqual, 3, 4, 3, 3); - thisLayout->addMultiCellWidget(NumButtonGroup->tqfind(0), 4, 4, 0, 1); + thisLayout->addMultiCellWidget(NumButtonGroup->find(0), 4, 4, 0, 1); thisLayout->addWidget(pbPeriod, 4, 2); //thisLayout->addMultiCellWidget(pbEqual, 3, 4, 3, 3); @@ -1060,11 +1060,11 @@ void KCalculator::updateGeometry(void) l = mLargePage->childrenListObject(); - int h1 = (NumButtonGroup->tqfind(0x0F))->tqminimumSize().height(); + int h1 = (NumButtonGroup->find(0x0F))->tqminimumSize().height(); int h2 = static_cast( (static_cast(h1) + 4.0) / 5.0 ); s.setWidth(mLargePage->fontMetrics().width("MMM") + TQApplication::tqstyle(). - tqpixelMetric(TQStyle::PM_ButtonMargin, NumButtonGroup->tqfind(0x0F))*2); + tqpixelMetric(TQStyle::PM_ButtonMargin, NumButtonGroup->find(0x0F))*2); s.setHeight(h1 + h2); for(uint i = 0; i < l.count(); i++) @@ -1087,11 +1087,11 @@ void KCalculator::updateGeometry(void) l = mNumericPage->childrenListObject(); // silence please - h1 = (NumButtonGroup->tqfind(0x0F))->tqminimumSize().height(); + h1 = (NumButtonGroup->find(0x0F))->tqminimumSize().height(); h2 = (int)((((float)h1 + 4.0) / 5.0)); s.setWidth(mLargePage->fontMetrics().width("MMM") + TQApplication::tqstyle(). - tqpixelMetric(TQStyle::PM_ButtonMargin, NumButtonGroup->tqfind(0x0F))*2); + tqpixelMetric(TQStyle::PM_ButtonMargin, NumButtonGroup->find(0x0F))*2); s.setHeight(h1 + h2); for(uint i = 0; i < l.count(); i++) @@ -1109,7 +1109,7 @@ void KCalculator::updateGeometry(void) // Set Buttons of double size TQSize t(s); t.setWidth(2*s.width()); - NumButtonGroup->tqfind(0x00)->setFixedSize(t); + NumButtonGroup->find(0x00)->setFixedSize(t); t = s; t.setHeight(2*s.height()); pbEqual->setFixedSize(t); @@ -1151,11 +1151,11 @@ void KCalculator::slotBaseSelected(int base) // Enable the buttons not available in this base for (int i=0; itqfind(i)->setEnabled (true); + NumButtonGroup->find(i)->setEnabled (true); // Disable the buttons not available in this base for (int i=current_base; i<16; i++) - NumButtonGroup->tqfind(i)->setEnabled (false); + NumButtonGroup->find(i)->setEnabled (false); // Only enable the decimal point in decimal pbPeriod->setEnabled(current_base == NB_DECIMAL); @@ -2006,7 +2006,7 @@ void KCalculator::slotLogicshow(bool toggled) resetBase(); BaseChooseGroup->show(); for (int i=10; i<16; i++) - (NumButtonGroup->tqfind(i))->show(); + (NumButtonGroup->find(i))->show(); } else { @@ -2023,7 +2023,7 @@ void KCalculator::slotLogicshow(bool toggled) statusBar()->removeItem(1); calc_display->setStatusText(1, TQString()); for (int i=10; i<16; i++) - (NumButtonGroup->tqfind(i))->hide(); + (NumButtonGroup->find(i))->hide(); } adjustSize(); setFixedSize(tqsizeHint()); @@ -2144,7 +2144,7 @@ void KCalculator::set_colors() TQPalette numPal(KCalcSettings::numberButtonsColor(), bg); for(int i=0; i<10; i++) { - (NumButtonGroup->tqfind(i))->setPalette(numPal); + (NumButtonGroup->find(i))->setPalette(numPal); } TQPalette funcPal(KCalcSettings::functionButtonsColor(), bg); @@ -2163,7 +2163,7 @@ void KCalculator::set_colors() TQPalette hexPal(KCalcSettings::hexButtonsColor(), bg); for(int i=10; i<16; i++) { - (NumButtonGroup->tqfind(i))->setPalette(hexPal); + (NumButtonGroup->find(i))->setPalette(hexPal); } TQPalette memPal(KCalcSettings::memoryButtonsColor(), bg); @@ -2217,26 +2217,26 @@ bool KCalculator::eventFilter(TQObject *o, TQEvent *e) // Was it hex-button or normal digit?? if (num_but <10) for(int i=0; i<10; i++) - (NumButtonGroup->tqfind(i))->setPalette(pal); + (NumButtonGroup->find(i))->setPalette(pal); else for(int i=10; i<16; i++) - (NumButtonGroup->tqfind(i))->setPalette(pal); + (NumButtonGroup->find(i))->setPalette(pal); return true; } - else if( mFunctionButtonList.tqfindRef((KCalcButton*)o) != -1) + else if( mFunctionButtonList.findRef((KCalcButton*)o) != -1) { list = &mFunctionButtonList; } - else if( mStatButtonList.tqfindRef((KCalcButton*)o) != -1) + else if( mStatButtonList.findRef((KCalcButton*)o) != -1) { list = &mStatButtonList; } - else if( mMemButtonList.tqfindRef((KCalcButton*)o) != -1) + else if( mMemButtonList.findRef((KCalcButton*)o) != -1) { list = &mMemButtonList; } - else if( mOperationButtonList.tqfindRef((KCalcButton*)o) != -1) + else if( mOperationButtonList.findRef((KCalcButton*)o) != -1) { list = &mOperationButtonList; } diff --git a/kcalc/kcalc.h b/kcalc/kcalc.h index f135a3c..4cb058d 100644 --- a/kcalc/kcalc.h +++ b/kcalc/kcalc.h @@ -86,7 +86,7 @@ private: void keyReleaseEvent(TQKeyEvent *e); void set_precision(); void set_style(); - void resetBase(void) { (BaseChooseGroup->tqfind(1))->animateClick();}; + void resetBase(void) { (BaseChooseGroup->find(1))->animateClick();}; void UpdateDisplay(bool get_amount_from_core = false, bool store_result_in_history = false); diff --git a/kcalc/kcalc_button.cpp b/kcalc/kcalc_button.cpp index f9ddabc..8e69f6d 100644 --- a/kcalc/kcalc_button.cpp +++ b/kcalc/kcalc_button.cpp @@ -47,7 +47,7 @@ KCalcButton::KCalcButton(const TQString &label, TQWidget * tqparent, void KCalcButton::addMode(ButtonModeFlags mode, TQString label, TQString tooltip, bool is_label_richtext) { - if (_mode.tqcontains(mode)) _mode.remove(mode); + if (_mode.contains(mode)) _mode.remove(mode); _mode[mode] = ButtonMode(label, tooltip, is_label_richtext); @@ -67,7 +67,7 @@ void KCalcButton::slotSetMode(ButtonModeFlags mode, bool flag) return; // nothing to do } - if (_mode.tqcontains(new_mode)) { + if (_mode.contains(new_mode)) { // save accel, because setting label erases accel TQKeySequence _accel = accel(); @@ -92,7 +92,7 @@ void KCalcButton::slotSetMode(ButtonModeFlags mode, bool flag) static TQString escape(TQString str) { - str.tqreplace('&', "&&"); + str.replace('&', "&&"); return str; } @@ -128,7 +128,7 @@ void KCalcButton::drawButtonLabel(TQPainter *paint) { if (_show_accel_mode) { KPushButton::drawButtonLabel(paint); - } else if (_mode.tqcontains(_mode_flags)) { + } else if (_mode.contains(_mode_flags)) { paintLabel(paint); } } @@ -159,7 +159,7 @@ void KSquareButton::drawButtonLabel(TQPainter *paint) { if (_show_accel_mode) { KPushButton::drawButtonLabel(paint); - } else if (_mode.tqcontains(_mode_flags)) { + } else if (_mode.contains(_mode_flags)) { paintLabel(paint); } } diff --git a/kcalc/knumber/knumber.cpp b/kcalc/knumber/knumber.cpp index 123fee7..a0fcaec 100644 --- a/kcalc/knumber/knumber.cpp +++ b/kcalc/knumber/knumber.cpp @@ -276,7 +276,7 @@ static void _inc_by_one(TQString &str, int position) // Cut off if more digits in fractional part than 'precision' static void _round(TQString &str, int precision) { - int decimalSymbolPos = str.tqfind('.'); + int decimalSymbolPos = str.find('.'); if (decimalSymbolPos == -1) if (precision == 0) return; @@ -312,7 +312,7 @@ static void _round(TQString &str, int precision) break; } - decimalSymbolPos = str.tqfind('.'); + decimalSymbolPos = str.find('.'); str.truncate(decimalSymbolPos + precision + 1); // if precision == 0 delete also '.' diff --git a/kdelirc/irkick/irkick.cpp b/kdelirc/irkick/irkick.cpp index 036974c..cd3140c 100644 --- a/kdelirc/irkick/irkick.cpp +++ b/kdelirc/irkick/irkick.cpp @@ -195,7 +195,7 @@ bool IRKick::getPrograms(const IRAction &action, TQStringList &programs) for(QCStringList::iterator i = buf.begin(); i != buf.end(); ++i) { TQString program = TQString::fromUtf8(*i); - if(program.tqcontains(r)) + if(program.contains(r)) programs += program; } if(programs.size() > 1 && action.ifMulti() == IM_DONTSEND) @@ -206,7 +206,7 @@ bool IRKick::getPrograms(const IRAction &action, TQStringList &programs) for(TQValueList::iterator i = s.fromLast(); i != s.end(); i--) { int p = KWin::info(*i).pid; TQString id = action.program() + "-" + TQString().setNum(p); - if(programs.tqcontains(id)) + if(programs.contains(id)) { programs.clear(); programs += id; break; @@ -220,7 +220,7 @@ bool IRKick::getPrograms(const IRAction &action, TQStringList &programs) for(TQValueList::iterator i = s.begin(); i != s.end(); ++i) { int p = KWin::info(*i).pid; TQString id = action.program() + "-" + TQString().setNum(p); - if(programs.tqcontains(id)) + if(programs.contains(id)) { programs.clear(); programs += id; break; diff --git a/kdelirc/irkick/klircclient.cpp b/kdelirc/irkick/klircclient.cpp index 544eb2a..d78b1e0 100644 --- a/kdelirc/irkick/klircclient.cpp +++ b/kdelirc/irkick/klircclient.cpp @@ -177,14 +177,14 @@ void KLircClient::slotRead() { //