diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-08-09 22:25:47 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-08-09 22:25:47 -0500 |
| commit | eaa7ee2e0bbca40ba3173c4304f81957e8964291 (patch) | |
| tree | 4f793aa48a5080aedc94ce6e519c3b86708f2b88 /tqtinterface/qt4/tools | |
| parent | 79a9d7a46a20d4a0923bc06fc471fdc2176ef865 (diff) | |
| download | experimental-eaa7ee2e0bbca40ba3173c4304f81957e8964291.tar.gz experimental-eaa7ee2e0bbca40ba3173c4304f81957e8964291.zip | |
rename the following methods:
tqfind find
tqreplace replace
tqcontains contains
Diffstat (limited to 'tqtinterface/qt4/tools')
152 files changed, 1268 insertions, 1268 deletions
diff --git a/tqtinterface/qt4/tools/assistant/LICENSE.GPL b/tqtinterface/qt4/tools/assistant/LICENSE.GPL index 149f4ac..3221c03 100644 --- a/tqtinterface/qt4/tools/assistant/LICENSE.GPL +++ b/tqtinterface/qt4/tools/assistant/LICENSE.GPL @@ -59,7 +59,7 @@ modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License applies to any program or other work which tqcontains + 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" @@ -96,7 +96,7 @@ above, provided that you also meet all of these conditions: stating that you changed the files and the date of any change. b) You must cause any work that you distribute or publish, that in - whole or in part tqcontains or is derived from the Program or any + whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. @@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following: The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source -code means all the source code for all modules it tqcontains, plus any +code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include diff --git a/tqtinterface/qt4/tools/assistant/assistant_de.ts b/tqtinterface/qt4/tools/assistant/assistant_de.ts index ed4c994..15b0b97 100644 --- a/tqtinterface/qt4/tools/assistant/assistant_de.ts +++ b/tqtinterface/qt4/tools/assistant/assistant_de.ts @@ -357,7 +357,7 @@ Der Assistent ist nicht einsatzbereit!</translation> <translation><b>Geben Sie Suchbegriffe ein.</b><p>Geben Sie hier die gesuchten Begriffe ein. Die Begriffe können Wildcards (*) enthalten. Eine Phrase muß in Anführungszeichen stehen.</p></translation> </message> <message> - <source><b>Found documents</b><p>This list tqcontains all found documents from the last search. The documents are ordered, i.e. the first document has the most matches.</p></source> + <source><b>Found documents</b><p>This list contains all found documents from the last search. The documents are ordered, i.e. the first document has the most matches.</p></source> <translation><b>Gefundene Dokumente</b><p>Diese Liste beinhaltet alle gefundenen Dokumente der letzten Suche. Die Dokumente sind nach der Häufigkeit der Treffer geordnet.</p></translation> </message> <message> @@ -777,11 +777,11 @@ Bitte überprüfen Sie, das dieser an der angegeben Stelle existiert.</translati </message> <message> <source>Find &Next</source> - <translation>&Nächste tqfinden</translation> + <translation>&Nächste finden</translation> </message> <message> <source>Find Next</source> - <translation>Nächste tqfinden</translation> + <translation>Nächste finden</translation> </message> <message> <source>F3</source> @@ -789,11 +789,11 @@ Bitte überprüfen Sie, das dieser an der angegeben Stelle existiert.</translati </message> <message> <source>Find &Previous</source> - <translation>&Vorigen tqfinden</translation> + <translation>&Vorigen finden</translation> </message> <message> <source>Find Previous</source> - <translation>Vorigen tqfinden</translation> + <translation>Vorigen finden</translation> </message> <message> <source>Shift+F3</source> diff --git a/tqtinterface/qt4/tools/assistant/book/assistant.leaf b/tqtinterface/qt4/tools/assistant/book/assistant.leaf index e978b03..57bab4c 100644 --- a/tqtinterface/qt4/tools/assistant/book/assistant.leaf +++ b/tqtinterface/qt4/tools/assistant/book/assistant.leaf @@ -56,8 +56,8 @@ in which it appears. \endlist -No matter where you tqfind yourself in the Qt documentation, you will -tqfind extensive cross-referencing. Even snippets of example code +No matter where you find yourself in the Qt documentation, you will +find extensive cross-referencing. Even snippets of example code contain clickable links, so that for example, if you come across a class declaration in a code example, the class name will be a clickable link to the class's documentation. @@ -99,10 +99,10 @@ To perform an index search, click the \Toolbutton Index tab on the Sidebar beneath the line edit. If the highlighted text matches what you're looking for, double click it, (or press \Key Enter) and the documentation window will display the relevant page. You rarely have -to type in the whole word before \QA tqfinds a match. Note that for some +to type in the whole word before \QA finds a match. Note that for some words there may be more than one possible page that is relevant. -\QA also provides full text searching for tqfinding specific words in +\QA also provides full text searching for finding specific words in the documentation. Documents with the highest occurrences of the word that you are looking for appear first, and every occurrence of the word within the documentation is highlighted. @@ -272,8 +272,8 @@ options and can be used to print the current page. \section2 The Find Text Dialog -This dialog is used to tqfind text in the current page. Enter the text -you want to tqfind in the Find line edit. If you check the 'Whole words +This dialog is used to find text in the current page. Enter the text +you want to find in the Find line edit. If you check the 'Whole words only' checkbox, the search will only consider whole words, i.e. if you search for 'spin' with this checkbox checked it will not match 'spinbox', but will match 'spin'. If you check the 'Case sensitive' @@ -311,12 +311,12 @@ Some pages contain links to external web pages. In order to display these links, you must specify a web browser. Type the name of your browser's executable in the Web Browser Application line edit. Alternatively, click the \Button {(ellipsis)} button to invoke the -\Widget {Set Web Browser} dialog and navigate until you tqfind the web +\Widget {Set Web Browser} dialog and navigate until you find the web browser you want to use. Click \Button {Save} to accept the selection. To change \QA's default home page, enter the file name in the Home Page line edit. Alternatively, click the \Button {(ellipsis)} button -to invoke the \Widget {Set Homepage} dialog. Navigate until you tqfind +to invoke the \Widget {Set Homepage} dialog. Navigate until you find the home page file you want to use and then click \Button {Save} to accept the selection. @@ -328,7 +328,7 @@ Some pages contain links to PDF documents. In order to display these links, you must specify a PDF viewer. Type in the name of your PDF viewer's executable in the line edit. Alternatively, click the \Button {(ellipsis)} button to invoke the \Widget {Set PDF Browser} dialog and navigate -until you tqfind the PDF viewer you want to use. Click \Button Save to +until you find the PDF viewer you want to use. Click \Button Save to accept the selection. \chapter Full Text Searching @@ -375,7 +375,7 @@ startup page, and application icon. When it is started without any options, \QA displays a default set of documentation. When Qt is installed, the default documentation set in -\QA tqcontains the Qt reference documentation as well as the tools that +\QA contains the Qt reference documentation as well as the tools that come with Qt, such as \QD and qmake. Documentation can be added or removed from \QA by @@ -473,7 +473,7 @@ location of the profile. The property name is \c applicationicon \i Start Page- This property specifies which page \QA should initially display when the profile is used. Usually, this is the HTML file which -tqcontains the documentation's table of contents. This property also +contains the documentation's table of contents. This property also describes the default location to go to when pressing the home button in \QA's main user interface. The start page is specified relative to the location of the profile. The property name is \c startpage @@ -551,7 +551,7 @@ on how to use \QA with profiles for your own applications. When distributing \QA with your application, you will also need to copy the icon files from the \c QTDIR/tools/assistant/images -directory so that \QA tqfinds its icons. +directory so that \QA finds its icons. \omit For small documentation sets, the sidebar may not be necessary. You diff --git a/tqtinterface/qt4/tools/assistant/config.cpp b/tqtinterface/qt4/tools/assistant/config.cpp index 56ac848..1cbccbc 100644 --- a/tqtinterface/qt4/tools/assistant/config.cpp +++ b/tqtinterface/qt4/tools/assistant/config.cpp @@ -285,13 +285,13 @@ TQStringList Config::mimePaths() // Mime source for .dcf file path TQFileInfo info( *it ); TQString dcfPath = info.dirPath(TRUE); - if (lst.tqcontains(dcfPath) == 0) + if (lst.contains(dcfPath) == 0) lst << dcfPath; // Image dir for .dcf TQString imgDir = TQDir::convertSeparators( dcfPath + TQDir::separator() + profil->imageDirs[it.key()] ); - if (lst.tqcontains(imgDir) == 0) + if (lst.contains(imgDir) == 0) lst << imgDir; } return lst; diff --git a/tqtinterface/qt4/tools/assistant/docuparser.cpp b/tqtinterface/qt4/tools/assistant/docuparser.cpp index f1c2f01..a64fb47 100644 --- a/tqtinterface/qt4/tools/assistant/docuparser.cpp +++ b/tqtinterface/qt4/tools/assistant/docuparser.cpp @@ -339,7 +339,7 @@ bool DocuParser320::endElement( const TQString &nameSpace, { static const TQStringList lst = TQStringList() << "startpage" << "abouturl" << "applicationicon" << "assistantdocs"; - if (lst.tqcontains(propertyName)) + if (lst.contains(propertyName)) propertyValue = absolutify( propertyValue ); } prof->addProperty( propertyName, propertyValue ); diff --git a/tqtinterface/qt4/tools/assistant/finddialog.ui b/tqtinterface/qt4/tools/assistant/finddialog.ui index 56fd582..c34ceae 100644 --- a/tqtinterface/qt4/tools/assistant/finddialog.ui +++ b/tqtinterface/qt4/tools/assistant/finddialog.ui @@ -274,7 +274,7 @@ <variables> <variable>TQStatusBar *sb;</variable> <variable>bool onceFound;</variable> - <variable>TQString tqfindExpr;</variable> + <variable>TQString findExpr;</variable> <variable>TQTextBrowser *lastBrowser;</variable> </variables> <Q_SLOTS> diff --git a/tqtinterface/qt4/tools/assistant/finddialog.ui.h b/tqtinterface/qt4/tools/assistant/finddialog.ui.h index dc10393..9204cd7 100644 --- a/tqtinterface/qt4/tools/assistant/finddialog.ui.h +++ b/tqtinterface/qt4/tools/assistant/finddialog.ui.h @@ -37,7 +37,7 @@ void FindDialog::init() { lastBrowser = 0; onceFound = FALSE; - tqfindExpr = ""; + findExpr = ""; sb = new TQStatusBar( this ); FindDialogLayout->addWidget( sb ); sb->message( tr( "Enter the text you are looking for." ) ); @@ -57,18 +57,18 @@ void FindDialog::doFind(bool forward) TQTextBrowser *browser = (TQTextBrowser*) mainWindow()->browsers()->currentBrowser(); sb->clear(); - if (comboFind->currentText() != tqfindExpr || lastBrowser != browser) + if (comboFind->currentText() != findExpr || lastBrowser != browser) onceFound = false; - tqfindExpr = comboFind->currentText(); + findExpr = comboFind->currentText(); bool found; if (browser->hasSelectedText()) { // Search either forward or backward from cursor. - found = browser->tqfind(tqfindExpr, checkCase->isChecked(), checkWords->isChecked(), + found = browser->find(findExpr, checkCase->isChecked(), checkWords->isChecked(), forward); } else { int para = forward ? 0 : INT_MAX; int index = forward ? 0 : INT_MAX; - found = browser->tqfind(tqfindExpr, checkCase->isChecked(), checkWords->isChecked(), + found = browser->find(findExpr, checkCase->isChecked(), checkWords->isChecked(), forward, ¶, &index); } @@ -95,7 +95,7 @@ MainWindow* FindDialog::mainWindow() bool FindDialog::hasFindExpression() { - return !tqfindExpr.isEmpty(); + return !findExpr.isEmpty(); } void FindDialog::statusMessage(const TQString &message) diff --git a/tqtinterface/qt4/tools/assistant/helpdialog.ui b/tqtinterface/qt4/tools/assistant/helpdialog.ui index 3f61572..e81008f 100644 --- a/tqtinterface/qt4/tools/assistant/helpdialog.ui +++ b/tqtinterface/qt4/tools/assistant/helpdialog.ui @@ -317,7 +317,7 @@ <cstring>resultBox</cstring> </property> <property name="whatsThis" stdset="0"> - <string><b>Found documents</b><p>This list tqcontains all found documents from the last search. The documents are ordered, i.e. the first document has the most matches.</p></string> + <string><b>Found documents</b><p>This list contains all found documents from the last search. The documents are ordered, i.e. the first document has the most matches.</p></string> </property> </widget> <widget class="TQLabel" row="4" column="0"> diff --git a/tqtinterface/qt4/tools/assistant/helpdialogimpl.cpp b/tqtinterface/qt4/tools/assistant/helpdialogimpl.cpp index b608d51..8c2e0df 100644 --- a/tqtinterface/qt4/tools/assistant/helpdialogimpl.cpp +++ b/tqtinterface/qt4/tools/assistant/helpdialogimpl.cpp @@ -71,7 +71,7 @@ static TQString stripAmpersand( const TQString &str ) { TQString s( str ); - s = s.tqreplace( '&', "" ); + s = s.replace( '&', "" ); return s; } @@ -138,7 +138,7 @@ HelpNavigationListItem::HelpNavigationListItem( TQListBox *ls, const TQString &t void HelpNavigationListItem::addLink( const TQString &link ) { - int hash = link.tqfind( '#' ); + int hash = link.find( '#' ); if ( hash == -1 ) { linkList << link; return; @@ -364,10 +364,10 @@ void HelpDialog::loadIndexFile() lastKeyword = (*it).keyword; TQString lnk = (*it).link; - int i = lnk.tqfindRev('#'); + int i = lnk.findRev('#'); if ( i > -1 ) lnk = lnk.left( i ); - if (!keywordDocuments.tqcontains(lnk)) + if (!keywordDocuments.contains(lnk)) keywordDocuments.append(lnk); } framePrepare->hide(); @@ -569,13 +569,13 @@ void HelpDialog::buildContentDict() void HelpDialog::currentTabChanged( const TQString &s ) { - if ( stripAmpersand( s ).tqcontains( tr( "Index" ) ) ) + if ( stripAmpersand( s ).contains( tr( "Index" ) ) ) TQTimer::singleShot( 0, this, TQT_SLOT( loadIndexFile() ) ); - else if ( stripAmpersand( s ).tqcontains( tr( "Bookmarks" ) ) ) + else if ( stripAmpersand( s ).contains( tr( "Bookmarks" ) ) ) insertBookmarks(); - else if ( stripAmpersand( s ).tqcontains( tr( "Contents" ) ) ) + else if ( stripAmpersand( s ).contains( tr( "Contents" ) ) ) TQTimer::singleShot( 0, this, TQT_SLOT( insertContents() ) ); - else if ( stripAmpersand( s ).tqcontains( tr( "Search" ) ) ) + else if ( stripAmpersand( s ).contains( tr( "Search" ) ) ) TQTimer::singleShot( 0, this, TQT_SLOT( setupFullTextIndex() ) ); } @@ -614,11 +614,11 @@ void HelpDialog::showTopic( TQListViewItem *item ) void HelpDialog::showTopic() { - if ( stripAmpersand( tabWidget->tabLabel( tabWidget->currentPage() ) ).tqcontains( tr( "Index" ) ) ) + if ( stripAmpersand( tabWidget->tabLabel( tabWidget->currentPage() ) ).contains( tr( "Index" ) ) ) showIndexTopic(); - else if ( stripAmpersand( tabWidget->tabLabel( tabWidget->currentPage() ) ).tqcontains( tr( "Bookmarks" ) ) ) + else if ( stripAmpersand( tabWidget->tabLabel( tabWidget->currentPage() ) ).contains( tr( "Bookmarks" ) ) ) showBookmarkTopic(); - else if ( stripAmpersand( tabWidget->tabLabel( tabWidget->currentPage() ) ).tqcontains( tr( "Contents" ) ) ) + else if ( stripAmpersand( tabWidget->tabLabel( tabWidget->currentPage() ) ).contains( tr( "Contents" ) ) ) showContentsTopic(); } @@ -671,7 +671,7 @@ void HelpDialog::searchInIndex( const TQString &s ) TQString HelpDialog::titleOfLink( const TQString &link ) { TQString s( link ); - s.remove( s.tqfind( '#' ), s.length() ); + s.remove( s.find( '#' ), s.length() ); s = titleMap[ s ]; if ( s.isEmpty() ) return link; @@ -944,16 +944,16 @@ void HelpDialog::setupFullTextIndex() TQString documentName; for ( ; it != titleMap.end(); ++it ) { documentName = it.key(); - int i = documentName.tqfindRev('#'); + int i = documentName.findRev('#'); if ( i > -1 ) documentName = documentName.left( i ); - if (!documentList.tqcontains(documentName)) + if (!documentList.contains(documentName)) documentList << documentName; } loadIndexFile(); for (TQStringList::Iterator it2 = keywordDocuments.begin(); it2 != keywordDocuments.end(); ++it2) { - if (!documentList.tqcontains(*it2)) + if (!documentList.contains(*it2)) documentList << *it2; } fullTextIndex->setDocList( documentList ); @@ -996,11 +996,11 @@ void HelpDialog::setIndexingProgress( int prog ) void HelpDialog::startSearch() { TQString str = termsEdit->text(); - str = str.tqreplace( "\'", "\"" ); - str = str.tqreplace( "`", "\"" ); + str = str.replace( "\'", "\"" ); + str = str.replace( "`", "\"" ); TQString buf = str; - str = str.tqreplace( "-", " " ); - str = str.tqreplace( TQRegExp( "\\s[\\S]?\\s" ), " " ); + str = str.replace( "-", " " ); + str = str.replace( TQRegExp( "\\s[\\S]?\\s" ), " " ); terms = TQStringList::split( " ", str ); TQStringList termSeq; TQStringList seqWords; @@ -1008,28 +1008,28 @@ void HelpDialog::startSearch() for ( ; it != terms.end(); ++it ) { (*it) = (*it).simplifyWhiteSpace(); (*it) = (*it).lower(); - (*it) = (*it).tqreplace( "\"", "" ); + (*it) = (*it).replace( "\"", "" ); } - if ( str.tqcontains( '\"' ) ) { - if ( (str.tqcontains( '\"' ))%2 == 0 ) { + if ( str.contains( '\"' ) ) { + if ( (str.contains( '\"' ))%2 == 0 ) { int beg = 0; int end = 0; TQString s; - beg = str.tqfind( '\"', beg ); + beg = str.find( '\"', beg ); while ( beg != -1 ) { beg++; - end = str.tqfind( '\"', beg ); + end = str.find( '\"', beg ); s = str.mid( beg, end - beg ); s = s.lower(); s = s.simplifyWhiteSpace(); - if ( s.tqcontains( '*' ) ) { + if ( s.contains( '*' ) ) { TQMessageBox::warning( this, tr( "Full Text Search" ), tr( "Using a wildcard within phrases is not allowed." ) ); return; } seqWords += TQStringList::split( ' ', s ); termSeq << s; - beg = str.tqfind( '\"', end + 1); + beg = str.find( '\"', end + 1); } } else { TQMessageBox::warning( this, tr( "Full Text Search" ), @@ -1095,14 +1095,14 @@ void HelpDialog::showItemMenu( TQListBoxItem *item, const TQPoint &pos ) return; int id = itemPopup->exec( pos ); if ( id == 0 ) { - if ( stripAmpersand( tabWidget->tabLabel( tabWidget->currentPage() ) ).tqcontains( tr( "Index" ) ) ) + if ( stripAmpersand( tabWidget->tabLabel( tabWidget->currentPage() ) ).contains( tr( "Index" ) ) ) showTopic(); else { showResultPage( item ); } } else if ( id > 0 ) { HelpWindow *hw = help->browsers()->currentBrowser(); - if ( stripAmpersand( tabWidget->tabLabel( tabWidget->currentPage() ) ).tqcontains( tr( "Index" ) ) ) { + if ( stripAmpersand( tabWidget->tabLabel( tabWidget->currentPage() ) ).contains( tr( "Index" ) ) ) { editIndex->blockSignals( TRUE ); editIndex->setText( item->text() ); editIndex->blockSignals( FALSE ); @@ -1147,7 +1147,7 @@ void HelpDialog::showItemMenu( TQListViewItem *item, const TQPoint &pos ) return; int id = itemPopup->exec( pos ); if ( id == 0 ) { - if ( stripAmpersand( tabWidget->tabLabel( tabWidget->currentPage() ) ).tqcontains( tr( "Contents" ) ) ) + if ( stripAmpersand( tabWidget->tabLabel( tabWidget->currentPage() ) ).contains( tr( "Contents" ) ) ) showContentsTopic(); else showBookmarkTopic(); diff --git a/tqtinterface/qt4/tools/assistant/helpwindow.cpp b/tqtinterface/qt4/tools/assistant/helpwindow.cpp index 7a57028..25d774d 100644 --- a/tqtinterface/qt4/tools/assistant/helpwindow.cpp +++ b/tqtinterface/qt4/tools/assistant/helpwindow.cpp @@ -202,7 +202,7 @@ TQPopupMenu *HelpWindow::createPopupMenu( const TQPoint& pos ) if ( !lastAnchor.isEmpty() ) { if ( lastAnchor.at( 0 ) == '#' ) { TQString src = source(); - int hsh = src.tqfind( '#' ); + int hsh = src.find( '#' ); lastAnchor = ( hsh>=0 ? src.left( hsh ) : src ) + lastAnchor; } m->insertItem( tr("Open Link in New Window\tShift+LMB"), @@ -257,11 +257,11 @@ void HelpWindow::copy() TQt::TextFormat oldTf = textFormat(); setTextFormat(TQt::PlainText); TQString selectText = selectedText(); - selectText.tqreplace("<br>", "\n"); - selectText.tqreplace("\xa0", " "); - selectText.tqreplace(">", ">"); - selectText.tqreplace("<", "<"); - selectText.tqreplace("&", "&"); + selectText.replace("<br>", "\n"); + selectText.replace("\xa0", " "); + selectText.replace(">", ">"); + selectText.replace("<", "<"); + selectText.replace("&", "&"); TQClipboard *cb = TQApplication::tqclipboard(); if (cb->supportsSelection()) diff --git a/tqtinterface/qt4/tools/assistant/index.cpp b/tqtinterface/qt4/tools/assistant/index.cpp index 41e582f..7ed1a4f 100644 --- a/tqtinterface/qt4/tools/assistant/index.cpp +++ b/tqtinterface/qt4/tools/assistant/index.cpp @@ -266,7 +266,7 @@ TQStringList Index::query( const TQStringList &terms, const TQStringList &termSe TQStringList::ConstIterator it = terms.begin(); for ( it = terms.begin(); it != terms.end(); ++it ) { Entry *e = 0; - if ( (*it).tqcontains( '*' ) ) { + if ( (*it).contains( '*' ) ) { TQValueList<Document> wcts = setupDummyTerm( getWildcardTerms( *it ) ); termList.append( new Term( "dummy", wcts.count(), wcts ) ); } else if ( dict[ *it ] ) { @@ -333,8 +333,8 @@ TQString Index::getDocumentTitle( const TQString &fileName ) TQTextStream s( &file ); TQString text = s.read(); - int start = text.tqfind( "<title>", 0, FALSE ) + 7; - int end = text.tqfind( "</title>", 0, FALSE ); + int start = text.find( "<title>", 0, FALSE ) + 7; + int end = text.find( "</title>", 0, FALSE ); TQString title = ( end - start <= 0 ? tr("Untitled") : text.mid( start, end - start ) ); return title; @@ -360,9 +360,9 @@ TQStringList Index::getWildcardTerms( const TQString &term ) found = FALSE; break; } - index = text.tqfind( *iter, index ); + index = text.find( *iter, index ); if ( *iter == terms.last() && index != (int)text.length()-1 ) { - index = text.tqfindRev( *iter ); + index = text.findRev( *iter ); if ( index != (int)text.length() - (int)(*iter).length() ) { found = FALSE; break; @@ -388,7 +388,7 @@ TQStringList Index::split( const TQString &str ) { TQStringList lst; int j = 0; - int i = str.tqfind( '*', j ); + int i = str.find( '*', j ); while ( i != -1 ) { if ( i > j && i <= (int)str.length() ) { @@ -396,7 +396,7 @@ TQStringList Index::split( const TQString &str ) lst << "*"; } j = i + 1; - i = str.tqfind( '*', j ); + i = str.find( '*', j ); } int l = str.length() - 1; @@ -431,7 +431,7 @@ TQValueList<Document> Index::setupDummyTerm( const TQStringList &terms ) while ( t ) { TQValueList<Document> docs = t->documents; for ( docIt = docs.begin(); docIt != docs.end(); ++docIt ) { - if ( maxList.tqfindIndex( *docIt ) == -1 ) + if ( maxList.findIndex( *docIt ) == -1 ) maxList.append( *docIt ); } t = termList.next(); @@ -511,7 +511,7 @@ bool Index::searchForPattern( const TQStringList &patterns, const TQStringList & b = miniDict[ wordLst[j] ]->positions; aIt = a.begin(); while ( aIt != a.end() ) { - if ( b.tqfind( *aIt + 1 ) != b.end() ) { + if ( b.find( *aIt + 1 ) != b.end() ) { (*aIt)++; ++aIt; } else { diff --git a/tqtinterface/qt4/tools/assistant/main.cpp b/tqtinterface/qt4/tools/assistant/main.cpp index 42b5819..8b60a9e 100644 --- a/tqtinterface/qt4/tools/assistant/main.cpp +++ b/tqtinterface/qt4/tools/assistant/main.cpp @@ -107,8 +107,8 @@ void AssistantSocket::readClient() while ( canReadLine() ) link = readLine(); if ( !link.isNull() ) { - link = link.tqreplace( "\n", "" ); - link = link.tqreplace( "\r", "" ); + link = link.replace( "\n", "" ); + link = link.replace( "\r", "" ); emit showLinkRequest( link ); } } diff --git a/tqtinterface/qt4/tools/assistant/mainwindow.ui b/tqtinterface/qt4/tools/assistant/mainwindow.ui index d3dbdab..3074838 100644 --- a/tqtinterface/qt4/tools/assistant/mainwindow.ui +++ b/tqtinterface/qt4/tools/assistant/mainwindow.ui @@ -512,19 +512,19 @@ <sender>actionEditFind</sender> <signal>activated()</signal> <receiver>MainWindow</receiver> - <slot>tqfind()</slot> + <slot>find()</slot> </connection> <connection> <sender>actionEditFindAgain</sender> <signal>activated()</signal> <receiver>MainWindow</receiver> - <slot>tqfindAgain()</slot> + <slot>findAgain()</slot> </connection> <connection> <sender>actionEditFindAgainPrev</sender> <signal>activated()</signal> <receiver>MainWindow</receiver> - <slot>tqfindAgainPrev()</slot> + <slot>findAgainPrev()</slot> </connection> <connection> <sender>actionFilePrint</sender> @@ -618,7 +618,7 @@ <variable>TQMap<int, TQString> bookmarks;</variable> <variable>HelpDialog *helpDock;</variable> <variable>TQDockWindow *dw;</variable> - <variable>TQGuardedPtr<FindDialog> tqfindDialog;</variable> + <variable>TQGuardedPtr<FindDialog> findDialog;</variable> <variable>static TQPtrList<MainWindow> *windows;</variable> <variable>TQMap<TQAction*,TQString> *goActionDocFiles;</variable> <variable>TQStringList pendingLinks;</variable> @@ -630,9 +630,9 @@ <slot>destroy()</slot> <slot>about()</slot> <slot>aboutApplication()</slot> - <slot>tqfind()</slot> - <slot>tqfindAgain()</slot> - <slot>tqfindAgainPrev()</slot> + <slot>find()</slot> + <slot>findAgain()</slot> + <slot>findAgainPrev()</slot> <slot>goHome()</slot> <slot>print()</slot> <slot>updateBookmarkMenu()</slot> diff --git a/tqtinterface/qt4/tools/assistant/mainwindow.ui.h b/tqtinterface/qt4/tools/assistant/mainwindow.ui.h index cb079aa..68fcb95 100644 --- a/tqtinterface/qt4/tools/assistant/mainwindow.ui.h +++ b/tqtinterface/qt4/tools/assistant/mainwindow.ui.h @@ -293,32 +293,32 @@ void MainWindow::aboutApplication() box.exec(); } -void MainWindow::tqfind() +void MainWindow::find() { - if ( !tqfindDialog ) - tqfindDialog = new FindDialog( this ); - tqfindDialog->comboFind->setFocus(); - tqfindDialog->comboFind->lineEdit()->setSelection( - 0, tqfindDialog->comboFind->lineEdit()->text().length() ); - tqfindDialog->show(); + if ( !findDialog ) + findDialog = new FindDialog( this ); + findDialog->comboFind->setFocus(); + findDialog->comboFind->lineEdit()->setSelection( + 0, findDialog->comboFind->lineEdit()->text().length() ); + findDialog->show(); } -void MainWindow::tqfindAgain() +void MainWindow::findAgain() { - if (!tqfindDialog || !tqfindDialog->hasFindExpression()) { - tqfind(); + if (!findDialog || !findDialog->hasFindExpression()) { + find(); return; } - tqfindDialog->doFind(TRUE); + findDialog->doFind(TRUE); } -void MainWindow::tqfindAgainPrev() +void MainWindow::findAgainPrev() { - if (!tqfindDialog || !tqfindDialog->hasFindExpression()) { - tqfind(); + if (!findDialog || !findDialog->hasFindExpression()) { + find(); return; } - tqfindDialog->doFind(FALSE); + findDialog->doFind(FALSE); } void MainWindow::goHome() @@ -397,8 +397,8 @@ void MainWindow::setupBookmarkMenu() void MainWindow::showBookmark( int id ) { - if ( bookmarks.tqfind( id ) != bookmarks.end() ) - showLink( *bookmarks.tqfind( id ) ); + if ( bookmarks.find( id ) != bookmarks.end() ) + showLink( *bookmarks.find( id ) ); } void MainWindow::showLinkFromClient( const TQString &link ) @@ -415,14 +415,14 @@ void MainWindow::showLink( const TQString &link ) qWarning( "The link is empty!" ); } - int tqfind = link.tqfind( '#' ); - TQString name = tqfind >= 0 ? link.left( tqfind ) : link; + int find = link.find( '#' ); + TQString name = find >= 0 ? link.left( find ) : link; TQString absLink = link; TQFileInfo fi( name ); if ( fi.isRelative() ) { - if ( tqfind >= 0 ) - absLink = fi.absFilePath() + link.right( link.length() - tqfind ); + if ( find >= 0 ) + absLink = fi.absFilePath() + link.right( link.length() - find ); else absLink = fi.absFilePath(); } @@ -626,14 +626,14 @@ void MainWindow::showSearchLink( const TQString &link, const TQStringList &terms for ( ; it != terms.end(); ++it ) { int para = 0; int index = 0; - bool found = hw->tqfind( *it, FALSE, TRUE, TRUE, ¶, &index ); + bool found = hw->find( *it, FALSE, TRUE, TRUE, ¶, &index ); while ( found ) { if ( para < minPar ) { minPar = para; minIndex = index; } hw->setColor( Qt::red ); - found = hw->tqfind( *it, FALSE, TRUE, TRUE ); + found = hw->find( *it, FALSE, TRUE, TRUE ); } } hw->blockScrolling( FALSE ); @@ -651,7 +651,7 @@ void MainWindow::showGoActionLink() return; TQAction *action = (TQAction*) origin; - TQString docfile = *( goActionDocFiles->tqfind( action ) ); + TQString docfile = *( goActionDocFiles->find( action ) ); showLink( docfile ); } diff --git a/tqtinterface/qt4/tools/assistant/profile.h b/tqtinterface/qt4/tools/assistant/profile.h index f8482c7..91b0904 100644 --- a/tqtinterface/qt4/tools/assistant/profile.h +++ b/tqtinterface/qt4/tools/assistant/profile.h @@ -88,13 +88,13 @@ inline void Profile::addDCFTitle(const TQString &dcf, const TQString &title) { TQString absdcf = TQFileInfo(dcf).absFilePath(); dcfTitles[title] = absdcf; - if (docs.tqcontains(absdcf) == 0) + if (docs.contains(absdcf) == 0) docs << absdcf; } inline void Profile::addDCF( const TQString &docfile ) { - if( !docs.tqcontains( docfile ) == 0 ) + if( !docs.contains( docfile ) == 0 ) docs << docfile; } @@ -124,7 +124,7 @@ inline void Profile::addProperty( const TQString &name, inline bool Profile::hasDocFile( const TQString &name ) { - return docs.tqcontains( name ) > 0; + return docs.contains( name ) > 0; } #endif diff --git a/tqtinterface/qt4/tools/assistant/topicchooserimpl.cpp b/tqtinterface/qt4/tools/assistant/topicchooserimpl.cpp index 4cad976..daeedc5 100644 --- a/tqtinterface/qt4/tools/assistant/topicchooserimpl.cpp +++ b/tqtinterface/qt4/tools/assistant/topicchooserimpl.cpp @@ -54,7 +54,7 @@ TQString TopicChooser::link() const TQString s = listbox->currentText(); if ( s.isEmpty() ) return s; - int i = linkNames.tqfindIndex( s ); + int i = linkNames.findIndex( s ); return links[ i ]; } diff --git a/tqtinterface/qt4/tools/designer/LICENSE.GPL b/tqtinterface/qt4/tools/designer/LICENSE.GPL index 149f4ac..3221c03 100644 --- a/tqtinterface/qt4/tools/designer/LICENSE.GPL +++ b/tqtinterface/qt4/tools/designer/LICENSE.GPL @@ -59,7 +59,7 @@ modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License applies to any program or other work which tqcontains + 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" @@ -96,7 +96,7 @@ above, provided that you also meet all of these conditions: stating that you changed the files and the date of any change. b) You must cause any work that you distribute or publish, that in - whole or in part tqcontains or is derived from the Program or any + whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. @@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following: The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source -code means all the source code for all modules it tqcontains, plus any +code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include diff --git a/tqtinterface/qt4/tools/designer/designer/actiondnd.cpp b/tqtinterface/qt4/tools/designer/designer/actiondnd.cpp index d52fad4..605a264 100644 --- a/tqtinterface/qt4/tools/designer/designer/actiondnd.cpp +++ b/tqtinterface/qt4/tools/designer/designer/actiondnd.cpp @@ -244,7 +244,7 @@ TQDesignerToolBar::TQDesignerToolBar( TQMainWindow *mw ) indicator->hide(); installEventFilter( this ); widgetInserting = FALSE; - tqfindFormWindow(); + findFormWindow(); mw->setDockEnabled( TQt::DockTornOff, FALSE ); } @@ -259,11 +259,11 @@ TQDesignerToolBar::TQDesignerToolBar( TQMainWindow *mw, TQt::Dock dock ) MetaDataBase::addEntry( this ); installEventFilter( this ); widgetInserting = FALSE; - tqfindFormWindow(); + findFormWindow(); mw->setDockEnabled( TQt::DockTornOff, FALSE ); } -void TQDesignerToolBar::tqfindFormWindow() +void TQDesignerToolBar::findFormWindow() { TQWidget *w = this; while ( w ) { @@ -395,7 +395,7 @@ void TQDesignerToolBar::buttonMouseReleaseEvent( TQMouseEvent *e, TQObject *w ) { if ( widgetInserting ) doInsertWidget( mapFromGlobal( e->globalPos() ) ); - else if ( w->isWidgetType() && formWindow->widgets()->tqfind( w ) ) { + else if ( w->isWidgetType() && formWindow->widgets()->find( w ) ) { formWindow->clearSelection( FALSE ); formWindow->selectWidget( w ); } @@ -409,7 +409,7 @@ void TQDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject const int ID_DELETE = 1; const int ID_SEP = 2; const int ID_DELTOOLBAR = 3; - TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.tqfind( (TQWidget*)o ); + TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.find( (TQWidget*)o ); if ( it != actionMap.end() && ::tqqt_cast<TQSeparatorAction*>(*it) ) menu.insertItem( tr( "Delete Separator" ), ID_DELETE ); else @@ -419,11 +419,11 @@ void TQDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject menu.insertItem( tr( "Delete Toolbar" ), ID_DELTOOLBAR ); int res = menu.exec( e->globalPos() ); if ( res == ID_DELETE ) { - TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.tqfind( (TQWidget*)o ); + TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.find( (TQWidget*)o ); if ( it == actionMap.end() ) return; TQAction *a = *it; - int index = actionList.tqfind( a ); + int index = actionList.find( a ); RemoveActionFromToolBarCommand *cmd = new RemoveActionFromToolBarCommand( tr( "Delete Action '%1' from Toolbar '%2'" ). arg( a->name() ).arg( caption() ), @@ -433,7 +433,7 @@ void TQDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject } else if ( res == ID_SEP ) { calcIndicatorPos( mapFromGlobal( e->globalPos() ) ); TQAction *a = new TQSeparatorAction( 0 ); - int index = actionList.tqfindRef( *actionMap.tqfind( insertAnchor ) ); + int index = actionList.findRef( *actionMap.find( insertAnchor ) ); if ( index != -1 && afterAnchor ) ++index; if ( !insertAnchor ) @@ -474,11 +474,11 @@ void TQDesignerToolBar::buttonMousePressEvent( TQMouseEvent *e, TQObject * ) void TQDesignerToolBar::removeWidget( TQWidget *w ) { - TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.tqfind( w ); + TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.find( w ); if ( it == actionMap.end() ) return; TQAction *a = *it; - int index = actionList.tqfind( a ); + int index = actionList.find( a ); RemoveActionFromToolBarCommand *cmd = new RemoveActionFromToolBarCommand( tr( "Delete Action '%1' from Toolbar '%2'" ). arg( a->name() ).arg( caption() ), @@ -495,13 +495,13 @@ void TQDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o ) return; if ( TQABS( TQPoint( dragStartPos - e->pos() ).manhattanLength() ) < TQApplication::startDragDistance() ) return; - TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.tqfind( (TQWidget*)o ); + TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.find( (TQWidget*)o ); if ( it == actionMap.end() ) return; TQAction *a = *it; if ( !a ) return; - int index = actionList.tqfind( a ); + int index = actionList.find( a ); RemoveActionFromToolBarCommand *cmd = new RemoveActionFromToolBarCommand( tr( "Delete Action '%1' from Toolbar '%2'" ). arg( a->name() ).arg( caption() ), @@ -516,7 +516,7 @@ void TQDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o ) TQStoredDrag *drag = new ActionDrag( type, a, this ); drag->setPixmap( a->iconSet().pixmap() ); if ( ::tqqt_cast<TQDesignerAction*>(a) ) { - if ( formWindow->widgets()->tqfind( ( (TQDesignerAction*)a )->widget() ) ) + if ( formWindow->widgets()->find( ( (TQDesignerAction*)a )->widget() ) ) formWindow->selectWidget( ( (TQDesignerAction*)a )->widget(), FALSE ); } if ( !drag->drag() ) { @@ -564,7 +564,7 @@ void TQDesignerToolBar::dropEvent( TQDropEvent *e ) indicator->hide(); TQAction *a = 0; - int index = actionList.tqfindRef( *actionMap.tqfind( insertAnchor ) ); + int index = actionList.findRef( *actionMap.find( insertAnchor ) ); if ( index != -1 && afterAnchor ) ++index; if ( !insertAnchor ) @@ -579,7 +579,7 @@ void TQDesignerToolBar::dropEvent( TQDropEvent *e ) a = ::tqqt_cast<TQDesignerActionGroup*>(ActionDrag::action()); } - if ( actionList.tqfindRef( a ) != -1 ) { + if ( actionList.findRef( a ) != -1 ) { TQMessageBox::warning( MainWindow::self, tr( "Insert/Move Action" ), tr( "Action '%1' has already been added to this toolbar.\n" "An Action may only occur once in a given toolbar." ). @@ -708,7 +708,7 @@ void TQDesignerToolBar::doInsertWidget( const TQPoint &p ) installEventFilters( w ); MainWindow::self->formWindow()->insertWidget( w, TRUE ); TQDesignerAction *a = new TQDesignerAction( w, tqparent() ); - int index = actionList.tqfindRef( *actionMap.tqfind( insertAnchor ) ); + int index = actionList.findRef( *actionMap.find( insertAnchor ) ); if ( index != -1 && afterAnchor ) ++index; if ( !insertAnchor ) diff --git a/tqtinterface/qt4/tools/designer/designer/actiondnd.h b/tqtinterface/qt4/tools/designer/designer/actiondnd.h index adde1b4..e6ec528 100644 --- a/tqtinterface/qt4/tools/designer/designer/actiondnd.h +++ b/tqtinterface/qt4/tools/designer/designer/actiondnd.h @@ -85,7 +85,7 @@ public: void init(); TQWidget *widget() const { return wid; } - TQWidget *widget( TQAction *a ) const { return *widgets.tqfind( a ); } + TQWidget *widget( TQAction *a ) const { return *widgets.find( a ); } int index() const { return idx; } protected: @@ -230,7 +230,7 @@ private: void buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o ); void buttonMouseReleaseEvent( TQMouseEvent *e, TQObject *o ); void doInsertWidget( const TQPoint &p ); - void tqfindFormWindow(); + void findFormWindow(); private: TQPoint lastIndicatorPos; diff --git a/tqtinterface/qt4/tools/designer/designer/asciivalidator.cpp b/tqtinterface/qt4/tools/designer/designer/asciivalidator.cpp index c135716..9c91def 100644 --- a/tqtinterface/qt4/tools/designer/designer/asciivalidator.cpp +++ b/tqtinterface/qt4/tools/designer/designer/asciivalidator.cpp @@ -92,7 +92,7 @@ TQValidator::State AsciiValidator::validate( TQString &s, int & ) const } } - if ( allowedChars.tqfind( s[ i ] ) != -1 ) + if ( allowedChars.find( s[ i ] ) != -1 ) continue; s[i] = '_'; diff --git a/tqtinterface/qt4/tools/designer/designer/command.cpp b/tqtinterface/qt4/tools/designer/designer/command.cpp index 2f34892..10bf291 100644 --- a/tqtinterface/qt4/tools/designer/designer/command.cpp +++ b/tqtinterface/qt4/tools/designer/designer/command.cpp @@ -376,7 +376,7 @@ DeleteCommand::DeleteCommand( const TQString &n, FormWindow *fw, for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { TQObjectList *tqchildren = w->queryList( "TQWidget" ); for ( TQWidget *c = (TQWidget *)tqchildren->first(); c; c = (TQWidget *)tqchildren->next() ) { - if ( copyOfWidgets.tqfind( c ) == -1 && formWindow()->widgets()->tqfind( c ) ) { + if ( copyOfWidgets.find( c ) == -1 && formWindow()->widgets()->find( c ) ) { widgets.insert(widgets.at() + 1, c); widgets.prev(); copyOfWidgets.append(c); @@ -422,7 +422,7 @@ void DeleteCommand::unexecute() w->setName( s ); formWindow()->widgets()->insert( w, w ); formWindow()->selectWidget( w ); - TQValueList<MetaDataBase::Connection> conns = *connections.tqfind( w ); + TQValueList<MetaDataBase::Connection> conns = *connections.find( w ); TQValueList<MetaDataBase::Connection>::Iterator it = conns.begin(); for ( ; it != conns.end(); ++it ) { MetaDataBase::addConnection( formWindow(), (*it).sender, @@ -493,7 +493,7 @@ bool SetPropertyCommand::canMerge( Command *c ) if ( !widget ) return FALSE; const TQMetaProperty *p = - widget->tqmetaObject()->property( widget->tqmetaObject()->tqfindProperty( propName, TRUE ), TRUE ); + widget->tqmetaObject()->property( widget->tqmetaObject()->findProperty( propName, TRUE ), TRUE ); if ( !p ) { if ( propName == "toolTip" || propName == "whatsThis" ) return TRUE; @@ -566,16 +566,16 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString ¤ if ( select ) editor->propertyList()->setCurrentProperty( propName ); const TQMetaProperty *p = - widget->tqmetaObject()->property( widget->tqmetaObject()->tqfindProperty( propName, TRUE ), TRUE ); + widget->tqmetaObject()->property( widget->tqmetaObject()->findProperty( propName, TRUE ), TRUE ); if ( !p ) { if ( propName == "hAlign" ) { - p = widget->tqmetaObject()->property( widget->tqmetaObject()->tqfindProperty( "tqalignment", TRUE ), TRUE ); + p = widget->tqmetaObject()->property( widget->tqmetaObject()->findProperty( "tqalignment", TRUE ), TRUE ); int align = widget->property( "tqalignment" ).toInt(); align &= ~( AlignHorizontal_Mask ); align |= p->keyToValue( currentItemText ); widget->setProperty( "tqalignment", TQVariant( align ) ); } else if ( propName == "vAlign" ) { - p = widget->tqmetaObject()->property( widget->tqmetaObject()->tqfindProperty( "tqalignment", TRUE ), TRUE ); + p = widget->tqmetaObject()->property( widget->tqmetaObject()->findProperty( "tqalignment", TRUE ), TRUE ); int align = widget->property( "tqalignment" ).toInt(); align &= ~( AlignVertical_Mask ); align |= p->keyToValue( currentItemText ); @@ -1723,7 +1723,7 @@ PopulateTableCommand::PopulateTableCommand( const TQString &n, FormWindow *fw, T col.text = table->horizontalHeader()->label( i ); if ( table->horizontalHeader()->iconSet( i ) ) col.pix = table->horizontalHeader()->iconSet( i )->pixmap(); - col.field = *columnFields.tqfind( col.text ); + col.field = *columnFields.find( col.text ); oldColumns.append( col ); } for ( i = 0; i < table->verticalHeader()->count(); ++i ) { @@ -2058,7 +2058,7 @@ void AddActionToPopupCommand::execute() void AddActionToPopupCommand::unexecute() { item->hideMenu(); - int i = menu->tqfind( item->action() ); + int i = menu->find( item->action() ); menu->remove( i ); formWindow()->mainWindow()->objectHierarchy()->rebuild(); } @@ -2127,7 +2127,7 @@ RenameActionCommand::RenameActionCommand( const TQString &n, void RenameActionCommand::execute() { TQString actionText = newName; - actionText.tqreplace("&&", "&"); + actionText.replace("&&", "&"); TQString menuText = newName; action->setText( actionText ); action->setMenuText( menuText ); @@ -2206,7 +2206,7 @@ void AddMenuCommand::execute() popup->setName( "PopupMenuEditor" ); formWindow()->insertWidget( popup, TRUE ); mb->insertItem( name, popup, index ); - index = mb->tqfindItem( popup ); + index = mb->findItem( popup ); item = mb->item( index ); } else { PopupMenuEditor *popup = item->menu(); @@ -2224,7 +2224,7 @@ void AddMenuCommand::unexecute() return; } item->menu()->hide(); - int i = mb->tqfindItem( item ); + int i = mb->findItem( item ); formWindow()->removeWidget( item->menu() ); mb->removeItemAt( i ); formWindow()->mainWindow()->objectHierarchy()->rebuild(); diff --git a/tqtinterface/qt4/tools/designer/designer/configtoolboxdialog.ui.h b/tqtinterface/qt4/tools/designer/designer/configtoolboxdialog.ui.h index 4eb046b..2778f8b 100644 --- a/tqtinterface/qt4/tools/designer/designer/configtoolboxdialog.ui.h +++ b/tqtinterface/qt4/tools/designer/designer/configtoolboxdialog.ui.h @@ -58,7 +58,7 @@ void ConfigToolboxDialog::init() a; a = MainWindow::self->toolActions.prev() ) { TQString grp = ( (WidgetAction*)a )->group(); - TQListViewItem *tqparent = groups.tqfind( grp ); + TQListViewItem *tqparent = groups.find( grp ); if ( !tqparent ) { tqparent = new TQListViewItem( listViewTools ); tqparent->setText( 0, grp ); @@ -102,7 +102,7 @@ void ConfigToolboxDialog::addTool() listViewCommon->ensureItemVisible( i ); } else if ( !addKids ) { // Children processing not set, so set it - // Also tqfind the item were we shall quit + // Also find the item were we shall quit // processing tqchildren...if any such item addKids = TRUE; nextSibling = (*it)->nextSibling(); diff --git a/tqtinterface/qt4/tools/designer/designer/connectiondialog.ui.h b/tqtinterface/qt4/tools/designer/designer/connectiondialog.ui.h index 0113b95..da8fd8c 100644 --- a/tqtinterface/qt4/tools/designer/designer/connectiondialog.ui.h +++ b/tqtinterface/qt4/tools/designer/designer/connectiondialog.ui.h @@ -194,15 +194,15 @@ void ConnectionDialog::okClicked() for ( ConnectionContainer *c = connections.first(); c; c = connections.next() ) { MetaDataBase::Connection conn; - // tqfind sender widget + // find sender widget conn.sender = MainWindow::self->formWindow()->child( c->senderItem()->currentText() ); - if ( !conn.sender ) // if no sender widget, tqfind sender action - conn.sender = MainWindow::self->formWindow()->tqfindAction( c->senderItem()->currentText() ); + if ( !conn.sender ) // if no sender widget, find sender action + conn.sender = MainWindow::self->formWindow()->findAction( c->senderItem()->currentText() ); - // tqfind receiver widget + // find receiver widget conn.receiver = MainWindow::self->formWindow()->child( c->receiverItem()->currentText() ); - if ( !conn.receiver ) // if no receiver widget, tqfind receiver action - conn.receiver = MainWindow::self->formWindow()->tqfindAction( c->receiverItem()->currentText() ); + if ( !conn.receiver ) // if no receiver widget, find receiver action + conn.receiver = MainWindow::self->formWindow()->findAction( c->receiverItem()->currentText() ); conn.signal = c->signalItem()->currentText(); conn.slot = c->slotItem()->currentText(); diff --git a/tqtinterface/qt4/tools/designer/designer/connectionitems.cpp b/tqtinterface/qt4/tools/designer/designer/connectionitems.cpp index b6ab06a..1627ef8 100644 --- a/tqtinterface/qt4/tools/designer/designer/connectionitems.cpp +++ b/tqtinterface/qt4/tools/designer/designer/connectionitems.cpp @@ -227,7 +227,7 @@ SenderItem::SenderItem( TQTable *table, FormWindow *fw ) TQPtrDictIterator<TQWidget> it( *formWindow->widgets() ); while ( it.current() ) { - if ( lst.tqfind( it.current()->name() ) != lst.end() ) { + if ( lst.find( it.current()->name() ) != lst.end() ) { ++it; continue; } @@ -267,7 +267,7 @@ void SenderItem::senderChanged( const TQString &sender ) { TQObject *o = formWindow->child( sender, "TQObject" ); if ( !o ) - o = formWindow->tqfindAction( sender ); + o = formWindow->findAction( sender ); if ( !o ) return; emit currentSenderChanged( o ); @@ -284,7 +284,7 @@ ReceiverItem::ReceiverItem( TQTable *table, FormWindow *fw ) TQPtrDictIterator<TQWidget> it( *formWindow->widgets() ); while ( it.current() ) { - if ( lst.tqfind( it.current()->name() ) != lst.end() ) { + if ( lst.find( it.current()->name() ) != lst.end() ) { ++it; continue; } @@ -324,7 +324,7 @@ void ReceiverItem::receiverChanged( const TQString &receiver ) { TQObject *o = formWindow->child( receiver, "TQObject" ); if ( !o ) - o = formWindow->tqfindAction( receiver ); + o = formWindow->findAction( receiver ); if ( !o ) return; emit currentReceiverChanged( o ); @@ -460,7 +460,7 @@ void SlotItem::updateSlotList() TQMetaData::Protected) ) && !ignoreSlot( md->name() ) && checkConnectArgs( signal.latin1(), lastReceiver, md->name() ) ) - if ( lst.tqfind( md->name() ) == lst.end() ) + if ( lst.find( md->name() ) == lst.end() ) lst << MetaDataBase::normalizeFunction( md->name() ); } @@ -477,7 +477,7 @@ void SlotItem::updateSlotList() continue; s = MetaDataBase::normalizeFunction( s ); if ( checkConnectArgs( signal.latin1(), lastReceiver, s ) ) { - if ( lst.tqfind( (*it).function ) == lst.end() ) + if ( lst.find( (*it).function ) == lst.end() ) lst << s; } } @@ -494,7 +494,7 @@ void SlotItem::updateSlotList() continue; s = MetaDataBase::normalizeFunction( s ); if ( checkConnectArgs( signal.latin1(), lastReceiver, s ) ) { - if ( lst.tqfind( (*it).function ) == lst.end() ) + if ( lst.find( (*it).function ) == lst.end() ) lst << s; } } diff --git a/tqtinterface/qt4/tools/designer/designer/customwidgeteditor.ui b/tqtinterface/qt4/tools/designer/designer/customwidgeteditor.ui index f5d5a01..4565fb8 100644 --- a/tqtinterface/qt4/tools/designer/designer/customwidgeteditor.ui +++ b/tqtinterface/qt4/tools/designer/designer/customwidgeteditor.ui @@ -185,7 +185,7 @@ <string>Loads widget description file</string> </property> <property name="whatsThis" stdset="0"> - <string><b>Load Descriptions</b><p>Loads a file which tqcontains descriptions of custom widgets, so that these custom widgets can be used in the Qt Designer.</p> + <string><b>Load Descriptions</b><p>Loads a file which contains descriptions of custom widgets, so that these custom widgets can be used in the Qt Designer.</p> <p>Since it is a lot of work to type in all the information for custom widgets, you should consider using the createcw tool which is in $QTDIR/tools/designer/tools/createcw. Using createcw you can create custom widget description files for your custom widgets without the need to type in all the information manually. For more information about the README file in the createcw directory</p></string> </property> </widget> diff --git a/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.cpp b/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.cpp index 91531c3..7d364c5 100644 --- a/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.cpp +++ b/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.cpp @@ -112,7 +112,7 @@ void CustomWidgetEditor::setupSignals() { editSignal->setEnabled( FALSE ); buttonRemoveSignal->setEnabled( FALSE ); - MetaDataBase::CustomWidget *w = tqfindWidget( boxWidgets->item( boxWidgets->currentItem() ) ); + MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( !w ) return; listSignals->clear(); @@ -130,7 +130,7 @@ void CustomWidgetEditor::setupSlots() comboAccess->setEnabled( FALSE ); buttonRemoveSlot->setEnabled( FALSE ); - MetaDataBase::CustomWidget *w = tqfindWidget( boxWidgets->item( boxWidgets->currentItem() ) ); + MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( !w ) return; listSlots->clear(); @@ -149,7 +149,7 @@ void CustomWidgetEditor::setupProperties() comboType->setEnabled( FALSE ); buttonRemoveProperty->setEnabled( FALSE ); - MetaDataBase::CustomWidget *w = tqfindWidget( boxWidgets->item( boxWidgets->currentItem() ) ); + MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( !w ) return; listProperties->clear(); @@ -167,7 +167,7 @@ void CustomWidgetEditor::currentWidgetChanged( TQListBoxItem *i ) checkTimer->stop(); checkWidgetName(); - MetaDataBase::CustomWidget *w = tqfindWidget( i ); + MetaDataBase::CustomWidget *w = findWidget( i ); if ( !i || !w ) { buttonChooseHeader->setEnabled( FALSE ); editClass->setEnabled( FALSE ); @@ -239,7 +239,7 @@ void CustomWidgetEditor::addWidgetClicked() void CustomWidgetEditor::classNameChanged( const TQString &s ) { TQListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); - MetaDataBase::CustomWidget *w = tqfindWidget( i ); + MetaDataBase::CustomWidget *w = findWidget( i ); if ( !i || !w ) return; @@ -269,7 +269,7 @@ void CustomWidgetEditor::deleteWidgetClicked() checkWidgetName(); TQListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); - MetaDataBase::CustomWidget *w = tqfindWidget( i ); + MetaDataBase::CustomWidget *w = findWidget( i ); if ( mainWindow->isCustomWidgetUsed( w ) ) { TQMessageBox::information( mainWindow, tr( "Removing Custom Widget" ), @@ -299,7 +299,7 @@ void CustomWidgetEditor::deleteWidgetClicked() void CustomWidgetEditor::headerFileChanged( const TQString &s ) { TQListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); - MetaDataBase::CustomWidget *w = tqfindWidget( i ); + MetaDataBase::CustomWidget *w = findWidget( i ); if ( !i || !w ) return; @@ -309,7 +309,7 @@ void CustomWidgetEditor::headerFileChanged( const TQString &s ) void CustomWidgetEditor::heightChanged( int h ) { TQListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); - MetaDataBase::CustomWidget *w = tqfindWidget( i ); + MetaDataBase::CustomWidget *w = findWidget( i ); if ( !i || !w ) return; @@ -320,7 +320,7 @@ void CustomWidgetEditor::heightChanged( int h ) void CustomWidgetEditor::includePolicyChanged( int p ) { TQListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); - MetaDataBase::CustomWidget *w = tqfindWidget( i ); + MetaDataBase::CustomWidget *w = findWidget( i ); if ( !i || !w ) return; @@ -330,7 +330,7 @@ void CustomWidgetEditor::includePolicyChanged( int p ) void CustomWidgetEditor::pixmapChoosen() { TQListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); - MetaDataBase::CustomWidget *w = tqfindWidget( i ); + MetaDataBase::CustomWidget *w = findWidget( i ); if ( !i || !w ) return; @@ -353,7 +353,7 @@ void CustomWidgetEditor::pixmapChoosen() void CustomWidgetEditor::widthChanged( int wid ) { TQListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); - MetaDataBase::CustomWidget *w = tqfindWidget( i ); + MetaDataBase::CustomWidget *w = findWidget( i ); if ( !i || !w ) return; @@ -361,12 +361,12 @@ void CustomWidgetEditor::widthChanged( int wid ) updateCustomWidgetSizes(); } -MetaDataBase::CustomWidget *CustomWidgetEditor::tqfindWidget( TQListBoxItem *i ) +MetaDataBase::CustomWidget *CustomWidgetEditor::findWidget( TQListBoxItem *i ) { if ( !i ) return 0; - TQMap<TQListBoxItem*, MetaDataBase::CustomWidget*>::Iterator it = customWidgets.tqfind( i ); + TQMap<TQListBoxItem*, MetaDataBase::CustomWidget*>::Iterator it = customWidgets.find( i ); if ( it == customWidgets.end() ) return 0; return *it; @@ -375,7 +375,7 @@ MetaDataBase::CustomWidget *CustomWidgetEditor::tqfindWidget( TQListBoxItem *i ) void CustomWidgetEditor::chooseHeader() { TQListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); - MetaDataBase::CustomWidget *w = tqfindWidget( i ); + MetaDataBase::CustomWidget *w = findWidget( i ); if ( !i || !w ) return; @@ -389,7 +389,7 @@ void CustomWidgetEditor::chooseHeader() void CustomWidgetEditor::checkWidgetName() { TQListBoxItem *i = oldItem ? oldItem : boxWidgets->item( boxWidgets->currentItem() ); - MetaDataBase::CustomWidget *w = tqfindWidget( i ); + MetaDataBase::CustomWidget *w = findWidget( i ); oldItem = 0; if ( !i || !w ) return; @@ -442,7 +442,7 @@ void CustomWidgetEditor::addSignal() TQListBoxItem *i = new TQListBoxText( listSignals, "signal()" ); listSignals->setCurrentItem( i ); listSignals->setSelected( i, TRUE ); - MetaDataBase::CustomWidget *w = tqfindWidget( boxWidgets->item( boxWidgets->currentItem() ) ); + MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( w ) w->lstSignals.append( i->text().latin1() ); } @@ -453,18 +453,18 @@ void CustomWidgetEditor::removeSignal() delete listSignals->item( listSignals->currentItem() ); if ( listSignals->currentItem() != -1 ) listSignals->setSelected( listSignals->currentItem(), TRUE ); - MetaDataBase::CustomWidget *w = tqfindWidget( boxWidgets->item( boxWidgets->currentItem() ) ); + MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( w ) w->lstSignals.remove( s.latin1() ); } void CustomWidgetEditor::signalNameChanged( const TQString &s ) { - MetaDataBase::CustomWidget *w = tqfindWidget( boxWidgets->item( boxWidgets->currentItem() ) ); + MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( !w || listSignals->currentItem() == -1 ) return; - TQValueList<TQCString>::Iterator it = w->lstSignals.tqfind( listSignals->currentText().latin1() ); + TQValueList<TQCString>::Iterator it = w->lstSignals.find( listSignals->currentText().latin1() ); if ( it != w->lstSignals.end() ) w->lstSignals.remove( it ); listSignals->blockSignals( TRUE ); @@ -475,14 +475,14 @@ void CustomWidgetEditor::signalNameChanged( const TQString &s ) void CustomWidgetEditor::slotAccessChanged( const TQString &s ) { - MetaDataBase::CustomWidget *w = tqfindWidget( boxWidgets->item( boxWidgets->currentItem() ) ); + MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( !w || !listSlots->currentItem() ) return; MetaDataBase::Function slot; slot.function = listSlots->currentItem()->text( 0 ); slot.access = listSlots->currentItem()->text( 1 ); - TQValueList<MetaDataBase::Function>::Iterator it = w->lstSlots.tqfind( slot ); + TQValueList<MetaDataBase::Function>::Iterator it = w->lstSlots.find( slot ); if ( it != w->lstSlots.end() ) w->lstSlots.remove( it ); listSlots->currentItem()->setText( 1, s ); @@ -493,7 +493,7 @@ void CustomWidgetEditor::slotAccessChanged( const TQString &s ) void CustomWidgetEditor::slotNameChanged( const TQString &s ) { - MetaDataBase::CustomWidget *w = tqfindWidget( boxWidgets->item( boxWidgets->currentItem() ) ); + MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( !w || !listSlots->currentItem() ) return; @@ -501,7 +501,7 @@ void CustomWidgetEditor::slotNameChanged( const TQString &s ) slot.function = listSlots->currentItem()->text( 0 ); slot.access = listSlots->currentItem()->text( 1 ); slot.type = "slot"; - TQValueList<MetaDataBase::Function>::Iterator it = w->lstSlots.tqfind( slot ); + TQValueList<MetaDataBase::Function>::Iterator it = w->lstSlots.find( slot ); if ( it != w->lstSlots.end() ) w->lstSlots.remove( it ); listSlots->currentItem()->setText( 0, s ); @@ -515,7 +515,7 @@ void CustomWidgetEditor::addSlot() TQListViewItem *i = new TQListViewItem( listSlots, "slot()", "public" ); listSlots->setCurrentItem( i ); listSlots->setSelected( i, TRUE ); - MetaDataBase::CustomWidget *w = tqfindWidget( boxWidgets->item( boxWidgets->currentItem() ) ); + MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( w ) { MetaDataBase::Function slot; slot.function = "slot()"; @@ -536,7 +536,7 @@ void CustomWidgetEditor::removeSlot() delete listSlots->currentItem(); if ( listSlots->currentItem() ) listSlots->setSelected( listSlots->currentItem(), TRUE ); - MetaDataBase::CustomWidget *w = tqfindWidget( boxWidgets->item( boxWidgets->currentItem() ) ); + MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( w && slot.function != "1 2 3" ) w->lstSlots.remove( slot ); } @@ -570,14 +570,14 @@ void CustomWidgetEditor::currentSlotChanged( TQListViewItem *i ) void CustomWidgetEditor::propertyTypeChanged( const TQString &s ) { - MetaDataBase::CustomWidget *w = tqfindWidget( boxWidgets->item( boxWidgets->currentItem() ) ); + MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( !w || !listProperties->currentItem() ) return; MetaDataBase::Property property; property.property = listProperties->currentItem()->text( 0 ); property.type = listProperties->currentItem()->text( 1 ); - TQValueList<MetaDataBase::Property>::Iterator it = w->lstProperties.tqfind( property ); + TQValueList<MetaDataBase::Property>::Iterator it = w->lstProperties.find( property ); if ( it != w->lstProperties.end() ) w->lstProperties.remove( it ); listProperties->currentItem()->setText( 1, s ); @@ -588,14 +588,14 @@ void CustomWidgetEditor::propertyTypeChanged( const TQString &s ) void CustomWidgetEditor::propertyNameChanged( const TQString &s ) { - MetaDataBase::CustomWidget *w = tqfindWidget( boxWidgets->item( boxWidgets->currentItem() ) ); + MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( !w || !listProperties->currentItem() ) return; MetaDataBase::Property property; property.property = listProperties->currentItem()->text( 0 ); property.type = listProperties->currentItem()->text( 1 ); - TQValueList<MetaDataBase::Property>::Iterator it = w->lstProperties.tqfind( property ); + TQValueList<MetaDataBase::Property>::Iterator it = w->lstProperties.find( property ); if ( it != w->lstProperties.end() ) w->lstProperties.remove( it ); listProperties->currentItem()->setText( 0, s ); @@ -609,7 +609,7 @@ void CustomWidgetEditor::addProperty() TQListViewItem *i = new TQListViewItem( listProperties, "property", "String" ); listProperties->setCurrentItem( i ); listProperties->setSelected( i, TRUE ); - MetaDataBase::CustomWidget *w = tqfindWidget( boxWidgets->item( boxWidgets->currentItem() ) ); + MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( w ) { MetaDataBase::Property prop; prop.property = "property"; @@ -629,7 +629,7 @@ void CustomWidgetEditor::removeProperty() delete listProperties->currentItem(); if ( listProperties->currentItem() ) listProperties->setSelected( listProperties->currentItem(), TRUE ); - MetaDataBase::CustomWidget *w = tqfindWidget( boxWidgets->item( boxWidgets->currentItem() ) ); + MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( w && property.property != "1 2 3" ) w->lstProperties.remove( property ); } @@ -674,11 +674,11 @@ static TQString makeIndent2( int indent ) static TQString entitize2( const TQString &s ) { TQString s2 = s; - s2 = s2.tqreplace( "\"", """ ); - s2 = s2.tqreplace( "&", "&" ); - s2 = s2.tqreplace( ">", ">" ); - s2 = s2.tqreplace( "<", "<" ); - s2 = s2.tqreplace( "'", "'" ); + s2 = s2.replace( "\"", """ ); + s2 = s2.replace( "&", "&" ); + s2 = s2.replace( ">", ">" ); + s2 = s2.replace( "<", "<" ); + s2 = s2.replace( "'", "'" ); return s2; } @@ -793,7 +793,7 @@ void CustomWidgetEditor::horDataChanged( int a ) { TQSizePolicy::SizeType st = int_to_size_type( a ); TQListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); - MetaDataBase::CustomWidget *w = tqfindWidget( i ); + MetaDataBase::CustomWidget *w = findWidget( i ); if ( !i || !w ) return; @@ -814,7 +814,7 @@ void CustomWidgetEditor::verDataChanged( int a ) { TQSizePolicy::SizeType st = int_to_size_type( a ); TQListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); - MetaDataBase::CustomWidget *w = tqfindWidget( i ); + MetaDataBase::CustomWidget *w = findWidget( i ); if ( !i || !w ) return; @@ -834,7 +834,7 @@ void CustomWidgetEditor::verDataChanged( int a ) void CustomWidgetEditor::widgetIsContainer( bool b ) { TQListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); - MetaDataBase::CustomWidget *w = tqfindWidget( i ); + MetaDataBase::CustomWidget *w = findWidget( i ); if ( !i || !w ) return; diff --git a/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.h b/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.h index 719b1c2..ed0caf9 100644 --- a/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.h +++ b/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.h @@ -86,7 +86,7 @@ protected Q_SLOTS: void widgetIsContainer( bool ); private: - MetaDataBase::CustomWidget *tqfindWidget( TQListBoxItem *i ); + MetaDataBase::CustomWidget *findWidget( TQListBoxItem *i ); void setupDefinition(); void setupSignals(); void setupSlots(); diff --git a/tqtinterface/qt4/tools/designer/designer/designer.pro b/tqtinterface/qt4/tools/designer/designer/designer.pro index 4d98c51..7d147bc 100644 --- a/tqtinterface/qt4/tools/designer/designer/designer.pro +++ b/tqtinterface/qt4/tools/designer/designer/designer.pro @@ -2,7 +2,7 @@ TEMPLATE = lib CONFIG += qt warn_on staticlib qmake_cache CONFIG -= dll -!force_static:!win32:tqcontains(QT_PRODUCT,qt-internal) { +!force_static:!win32:contains(QT_PRODUCT,qt-internal) { CONFIG -= staticlib CONFIG += dll } diff --git a/tqtinterface/qt4/tools/designer/designer/designer_de.ts b/tqtinterface/qt4/tools/designer/designer/designer_de.ts index 4fd54de..ec81ece 100644 --- a/tqtinterface/qt4/tools/designer/designer/designer_de.ts +++ b/tqtinterface/qt4/tools/designer/designer/designer_de.ts @@ -423,8 +423,8 @@ so it is not possible to rename it to this name.</source> <translation type="unfinished"></translation> </message> <message encoding="UTF-8"> - <source><b>Load Descriptions</b><p>Loads a file which tqcontains descriptions of custom widgets, so that these custom widgets can be used in the Qt Designer.</p> -<p>As it is a lot of work to type in all the information for custom widgets, you should check the tool createcw which you can tqfind in $QTDIR/tools/designer/tools/createcw. Using that tool you can create custom widget description files for your custom widgets without the need of typing in all that information. For more information about that see the README file in that directory</p></source> + <source><b>Load Descriptions</b><p>Loads a file which contains descriptions of custom widgets, so that these custom widgets can be used in the Qt Designer.</p> +<p>As it is a lot of work to type in all the information for custom widgets, you should check the tool createcw which you can find in $QTDIR/tools/designer/tools/createcw. Using that tool you can create custom widget description files for your custom widgets without the need of typing in all that information. For more information about that see the README file in that directory</p></source> <translation type="unfinished"></translation> </message> <message encoding="UTF-8"> @@ -1278,7 +1278,7 @@ Do you want to reload it?</source> <translation type="unfinished"></translation> </message> <message> - <source>The project tqcontains already a form with the + <source>The project contains already a form with the filename '%1'. Please choose a new filename.</source> <translation type="unfinished"></translation> </message> @@ -2265,7 +2265,7 @@ but they are not known to the designer:</source> <translation type="unfinished"></translation> </message> <message> - <source>Couldn't tqfind the Qt documentation property index file! + <source>Couldn't find the Qt documentation property index file! Define the correct documentation path in the preferences dialog.</source> <translation type="unfinished"></translation> </message> @@ -4690,7 +4690,7 @@ Do you want to reload it?</source> <translation type="unfinished"></translation> </message> <message> - <source>The project tqcontains already a sourcefile with the + <source>The project contains already a sourcefile with the filename '%1'. Please choose a new filename.</source> <translation type="unfinished"></translation> </message> diff --git a/tqtinterface/qt4/tools/designer/designer/designer_fr.ts b/tqtinterface/qt4/tools/designer/designer/designer_fr.ts index 4fd54de..ec81ece 100644 --- a/tqtinterface/qt4/tools/designer/designer/designer_fr.ts +++ b/tqtinterface/qt4/tools/designer/designer/designer_fr.ts @@ -423,8 +423,8 @@ so it is not possible to rename it to this name.</source> <translation type="unfinished"></translation> </message> <message encoding="UTF-8"> - <source><b>Load Descriptions</b><p>Loads a file which tqcontains descriptions of custom widgets, so that these custom widgets can be used in the Qt Designer.</p> -<p>As it is a lot of work to type in all the information for custom widgets, you should check the tool createcw which you can tqfind in $QTDIR/tools/designer/tools/createcw. Using that tool you can create custom widget description files for your custom widgets without the need of typing in all that information. For more information about that see the README file in that directory</p></source> + <source><b>Load Descriptions</b><p>Loads a file which contains descriptions of custom widgets, so that these custom widgets can be used in the Qt Designer.</p> +<p>As it is a lot of work to type in all the information for custom widgets, you should check the tool createcw which you can find in $QTDIR/tools/designer/tools/createcw. Using that tool you can create custom widget description files for your custom widgets without the need of typing in all that information. For more information about that see the README file in that directory</p></source> <translation type="unfinished"></translation> </message> <message encoding="UTF-8"> @@ -1278,7 +1278,7 @@ Do you want to reload it?</source> <translation type="unfinished"></translation> </message> <message> - <source>The project tqcontains already a form with the + <source>The project contains already a form with the filename '%1'. Please choose a new filename.</source> <translation type="unfinished"></translation> </message> @@ -2265,7 +2265,7 @@ but they are not known to the designer:</source> <translation type="unfinished"></translation> </message> <message> - <source>Couldn't tqfind the Qt documentation property index file! + <source>Couldn't find the Qt documentation property index file! Define the correct documentation path in the preferences dialog.</source> <translation type="unfinished"></translation> </message> @@ -4690,7 +4690,7 @@ Do you want to reload it?</source> <translation type="unfinished"></translation> </message> <message> - <source>The project tqcontains already a sourcefile with the + <source>The project contains already a sourcefile with the filename '%1'. Please choose a new filename.</source> <translation type="unfinished"></translation> </message> diff --git a/tqtinterface/qt4/tools/designer/designer/designerappiface.cpp b/tqtinterface/qt4/tools/designer/designer/designerappiface.cpp index 5acbf58..a959d42 100644 --- a/tqtinterface/qt4/tools/designer/designer/designerappiface.cpp +++ b/tqtinterface/qt4/tools/designer/designer/designerappiface.cpp @@ -348,12 +348,12 @@ void DesignerProjectImpl::breakPoints( TQMap<TQString, TQValueList<uint> > &bps TQString DesignerProjectImpl::breakPointCondition( TQObject *o, int line ) const { - return MetaDataBase::breakPointCondition( MainWindow::self->tqfindRealObject( o ), line ); + return MetaDataBase::breakPointCondition( MainWindow::self->findRealObject( o ), line ); } void DesignerProjectImpl::setBreakPointCondition( TQObject *o, int line, const TQString &condition ) { - MetaDataBase::setBreakPointCondition( MainWindow::self->tqfindRealObject( o ), line, condition ); + MetaDataBase::setBreakPointCondition( MainWindow::self->findRealObject( o ), line, condition ); } void DesignerProjectImpl::clearAllBreakpoints() const @@ -739,7 +739,7 @@ TQAction *DesignerFormWindowImpl::createAction( const TQString& text, const TQIc void DesignerFormWindowImpl::addAction( TQAction *a ) { - if ( formWindow->actionList().tqfindRef( a ) != -1 ) + if ( formWindow->actionList().findRef( a ) != -1 ) return; formWindow->actionList().append( a ); MetaDataBase::addEntry( a ); @@ -777,7 +777,7 @@ void DesignerFormWindowImpl::addFunction( const TQCString &function, const TQStr void DesignerFormWindowImpl::setProperty( TQObject *o, const char *property, const TQVariant &value ) { - int id = o->tqmetaObject()->tqfindProperty( property, TRUE ); + int id = o->tqmetaObject()->findProperty( property, TRUE ); const TQMetaProperty* p = o->tqmetaObject()->property( id, TRUE ); if ( p && p->isValid() ) o->setProperty( property, value ); @@ -787,7 +787,7 @@ void DesignerFormWindowImpl::setProperty( TQObject *o, const char *property, con TQVariant DesignerFormWindowImpl::property( TQObject *o, const char *prop ) const { - int id = o->tqmetaObject()->tqfindProperty( prop, TRUE ); + int id = o->tqmetaObject()->findProperty( prop, TRUE ); const TQMetaProperty* p = o->tqmetaObject()->property( id, TRUE ); if ( p && p->isValid() ) return o->property( prop ); diff --git a/tqtinterface/qt4/tools/designer/designer/editfunctionsimpl.cpp b/tqtinterface/qt4/tools/designer/designer/editfunctionsimpl.cpp index 062a79c..a8ee282 100644 --- a/tqtinterface/qt4/tools/designer/designer/editfunctionsimpl.cpp +++ b/tqtinterface/qt4/tools/designer/designer/editfunctionsimpl.cpp @@ -177,10 +177,10 @@ void EditFunctions::okClicked() TQString s = function.function; s = s.simplifyWhiteSpace(); bool startNum = s[ 0 ] >= '0' && s[ 0 ] <= '9'; - bool noParens = s.tqcontains( '(' ) != 1 || s.tqcontains( ')' ) != 1; - bool illegalSpace = s.tqfind( ' ' ) != -1 && s.tqfind( ' ' ) < s.tqfind( '(' ); + bool noParens = s.contains( '(' ) != 1 || s.contains( ')' ) != 1; + bool illegalSpace = s.find( ' ' ) != -1 && s.find( ' ' ) < s.find( '(' ); - if ( startNum || noParens || illegalSpace || lst.tqfind( function.function ) != -1 ) { + if ( startNum || noParens || illegalSpace || lst.find( function.function ) != -1 ) { invalidFunctions = TRUE; invalidItems.append( (*it) ); continue; @@ -456,7 +456,7 @@ void EditFunctions::currentTypeChanged( const TQString &type ) void EditFunctions::changeItem( TQListViewItem *item, Attribute a, const TQString &nV ) { int itemId; - TQMap<TQListViewItem*, int>::Iterator fit = functionIds.tqfind( item ); + TQMap<TQListViewItem*, int>::Iterator fit = functionIds.find( item ); if ( fit != functionIds.end() ) itemId = *fit; else diff --git a/tqtinterface/qt4/tools/designer/designer/finddialog.ui.h b/tqtinterface/qt4/tools/designer/designer/finddialog.ui.h index 4eba205..b4ff3e3 100644 --- a/tqtinterface/qt4/tools/designer/designer/finddialog.ui.h +++ b/tqtinterface/qt4/tools/designer/designer/finddialog.ui.h @@ -48,7 +48,7 @@ void FindDialog::doFind() if ( !editor ) return; - if ( !editor->tqfind( comboFind->currentText(), checkCase->isChecked(), + if ( !editor->find( comboFind->currentText(), checkCase->isChecked(), checkWords->isChecked(), radioForward->isChecked(), !checkBegin->isChecked() ) ) checkBegin->setChecked( TRUE ); else diff --git a/tqtinterface/qt4/tools/designer/designer/formfile.cpp b/tqtinterface/qt4/tools/designer/designer/formfile.cpp index 3701d02..6b706a9 100644 --- a/tqtinterface/qt4/tools/designer/designer/formfile.cpp +++ b/tqtinterface/qt4/tools/designer/designer/formfile.cpp @@ -53,17 +53,17 @@ static TQString make_func_pretty( const TQString &s ) { TQString res = s; - if ( res.tqfind( ")" ) - res.tqfind( "(" ) == 1 ) + if ( res.find( ")" ) - res.find( "(" ) == 1 ) return res; - res.tqreplace( "(", "( " ); - res.tqreplace( ")", " )" ); - res.tqreplace( "&", " &" ); - res.tqreplace( "*", " *" ); - res.tqreplace( ",", ", " ); - res.tqreplace( ":", " : " ); + res.replace( "(", "( " ); + res.replace( ")", " )" ); + res.replace( "&", " &" ); + res.replace( "*", " *" ); + res.replace( ",", ", " ); + res.replace( ":", " : " ); res = res.simplifyWhiteSpace(); - res.tqreplace( " : : ", "::" ); - res.tqreplace( ">>", "> >" ); + res.replace( " : : ", "::" ); + res.replace( ">>", "> >" ); return res; } @@ -113,7 +113,7 @@ void FormFile::setFileName( const TQString &fn ) return; if ( fn.isEmpty() ) { fileNameTemp = TRUE; - if ( filename.tqfind( "unnamed" ) != 0 ) + if ( filename.find( "unnamed" ) != 0 ) filename = createUnnamedFileName(); return; } else { @@ -267,7 +267,7 @@ bool FormFile::saveAs( bool ignoreModified ) TQString f = pro->makeAbsolute( fileName() ); if ( fileNameTemp && formWindow() ) { f = TQString( formWindow()->name() ).lower(); - f.tqreplace( "::", "_" ); + f.replace( "::", "_" ); f = pro->makeAbsolute( f + ".ui" ); } bool saved = FALSE; @@ -767,7 +767,7 @@ void FormFile::removeFunctionCode( MetaDataBase::Function function ) int line = 0; int start = 0; while ( line < (*fit).start - 1 ) { - start = sourceCode.tqfind( '\n', start ); + start = sourceCode.find( '\n', start ); if ( start == -1 ) return; start++; @@ -777,7 +777,7 @@ void FormFile::removeFunctionCode( MetaDataBase::Function function ) return; int end = start; while ( line < (*fit).end + 1 ) { - end = sourceCode.tqfind( '\n', end ); + end = sourceCode.find( '\n', end ); if ( end == -1 ) { if ( line <= (*fit).end ) end = sourceCode.length() - 1; @@ -799,7 +799,7 @@ void FormFile::functionNameChanged( const TQString &oldName, const TQString &new { if ( !cod.isEmpty() ) { TQString funcStart = TQString( formWindow()->name() ) + TQString( "::" ); - int i = cod.tqfind( funcStart + oldName ); + int i = cod.find( funcStart + oldName ); if ( i != -1 ) { cod.remove( i + funcStart.length(), oldName.length() ); cod.insert( i + funcStart.length(), newName ); @@ -813,7 +813,7 @@ void FormFile::functionRetTypeChanged( const TQString &fuName, const TQString &o TQString oldFunct = oldType + " " + TQString( formWindow()->name() ) + "::" + fuName; TQString newFunct = newType + " " + TQString( formWindow()->name() ) + "::" + fuName; - int i = cod.tqfind( oldFunct ); + int i = cod.find( oldFunct ); if ( i != -1 ) { cod.remove( i, oldFunct.length() ); cod.insert( i, newFunct ); @@ -838,7 +838,7 @@ TQString FormFile::formName() const while ( !ts.eof() ) { line = ts.readLine(); if ( !className.isEmpty() ) { - int end = line.tqfind( "</class>" ); + int end = line.find( "</class>" ); if ( end == -1 ) { className += line; } else { @@ -848,8 +848,8 @@ TQString FormFile::formName() const continue; } int start; - if ( ( start = line.tqfind( "<class>" ) ) != -1 ) { - int end = line.tqfind( "</class>" ); + if ( ( start = line.find( "<class>" ) ) != -1 ) { + int end = line.find( "</class>" ); if ( end == -1 ) { className = line.mid( start + 7 ); } else { @@ -872,10 +872,10 @@ void FormFile::formWindowChangedSomehow() bool FormFile::checkFileName( bool allowBreak ) { - FormFile *ff = pro->tqfindFormFile( filename, this ); + FormFile *ff = pro->findFormFile( filename, this ); if ( ff ) TQMessageBox::warning( MainWindow::self, tr( "Invalid Filename" ), - tr( "The project already tqcontains a form with a\n" + tr( "The project already contains a form with a\n" "filename of '%1'. Please choose a new filename." ).arg( filename ) ); if (!formWindow()) // We are starting up return FALSE; @@ -892,7 +892,7 @@ bool FormFile::checkFileName( bool allowBreak ) return FALSE; } filename = pro->makeRelative( fn ); - ff = pro->tqfindFormFile( filename, this ); + ff = pro->findFormFile( filename, this ); } return TRUE; } diff --git a/tqtinterface/qt4/tools/designer/designer/formwindow.cpp b/tqtinterface/qt4/tools/designer/designer/formwindow.cpp index 0b102e9..f3155ee 100644 --- a/tqtinterface/qt4/tools/designer/designer/formwindow.cpp +++ b/tqtinterface/qt4/tools/designer/designer/formwindow.cpp @@ -97,7 +97,7 @@ static void setCursorToAll( const TQCursor &c, TQWidget *start ) static void restoreCursors( TQWidget *start, FormWindow *fw ) { - if ( fw->widgets()->tqfind( start ) ) + if ( fw->widgets()->find( start ) ) start->setCursor( MetaDataBase::cursor( start ) ); else start->setCursor( TQt::ArrowCursor ); @@ -256,7 +256,7 @@ void FormWindow::paintGrid( TQWidget *w, TQPaintEvent *e ) TQPixmap grid; TQString grid_name; grid_name.sprintf("FormWindowGrid_%d_%d", mainWindow()->grid().x(), mainWindow()->grid().y()); - if( !TQPixmapCache::tqfind( grid_name, grid ) ) { + if( !TQPixmapCache::find( grid_name, grid ) ) { grid = TQPixmap( 350 + ( 350 % mainWindow()->grid().x() ), 350 + ( 350 % mainWindow()->grid().y() ) ); grid.fill( tqcolorGroup().color( TQColorGroup::Foreground ) ); TQBitmap tqmask( grid.width(), grid.height() ); @@ -432,10 +432,10 @@ void FormWindow::insertWidget() ++it; if ( o->isWidgetType() && ( (TQWidget*)o )->isVisibleTo( this ) && - insertedWidgets.tqfind( (TQWidget*)o ) && o != TQT_TQOBJECT(w) ) { + insertedWidgets.find( (TQWidget*)o ) && o != TQT_TQOBJECT(w) ) { TQRect r2( ( (TQWidget*)o )->pos(), ( (TQWidget*)o )->size() ); - if ( r.tqcontains( r2 ) ) + if ( r.contains( r2 ) ) lst.append( (TQWidget*)o ); } } @@ -535,11 +535,11 @@ void FormWindow::handleContextMenu( TQContextMenuEvent *e, TQWidget *w ) if ( !isMainContainer( w ) && qstrcmp( w->name(), "central widget" ) != 0 ) { // press on a child widget raiseChildSelections( w ); // raise selections and select widget selectWidget( w ); - // if widget is laid out, tqfind the first non-laid out super-widget + // if widget is laid out, find the first non-laid out super-widget TQWidget *realWidget = w; // but store the original one while ( w->parentWidget() && ( WidgetFactory::layoutType( w->parentWidget()) != WidgetFactory::NoLayout || - !insertedWidgets.tqfind(w) ) ) + !insertedWidgets.find(w) ) ) w = w->parentWidget(); if ( ::tqqt_cast<TQMainWindow*>(mainContainer()) && ((TQMainWindow*)mainContainer())->centralWidget() == realWidget ) { e->accept(); @@ -596,7 +596,7 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) for ( TQObject *o = l->first(); o; o = l->next() ) { if ( !o->isWidgetType() ) continue; - if ( insertedWidgets.tqfind( (TQWidget*)o ) ) + if ( insertedWidgets.find( (TQWidget*)o ) ) selectWidget( (TQWidget*)o, FALSE ); } setPropertyShowingBlocked( FALSE ); @@ -614,9 +614,9 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) raiseChildSelections( w ); // raise selections and select widget selectWidget( w ); - // if widget is laid out, tqfind the first non-laid out super-widget + // if widget is laid out, find the first non-laid out super-widget while ( w->parentWidget() && - ( WidgetFactory::layoutType( w->parentWidget()) != WidgetFactory::NoLayout || !insertedWidgets.tqfind(w) ) ) + ( WidgetFactory::layoutType( w->parentWidget()) != WidgetFactory::NoLayout || !insertedWidgets.find(w) ) ) w = w->parentWidget(); if ( e->button() == Qt::LeftButton ) { // left button: store original tqgeometry and more as the widget might start moving @@ -674,7 +674,7 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) orderedWidgets.removeRef( w ); orderedWidgets.append( w ); for ( TQWidget *wid = orderedWidgets.last(); wid; wid = orderedWidgets.prev() ) { - int i = stackedWidgets.tqfindRef( wid ); + int i = stackedWidgets.findRef( wid ); if ( i != -1 ) { stackedWidgets.removeRef( wid ); stackedWidgets.insert( 0, wid ); @@ -690,7 +690,7 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) default: // any insert widget tool if ( e->button() == Qt::LeftButton ) { insertParent = WidgetFactory::containerOfWidget( mainContainer() ); // default tqparent for new widget is the formwindow - if ( !isMainContainer( w ) ) { // press was not on formwindow, check if we can tqfind another tqparent + if ( !isMainContainer( w ) ) { // press was not on formwindow, check if we can find another tqparent TQWidget *wid = w; for (;;) { int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( wid ) ); @@ -720,7 +720,7 @@ void FormWindow::handleMouseDblClick( TQMouseEvent *, TQWidget *w ) orderedWidgets.clear(); orderedWidgets.append( w ); for ( TQWidget *wid = orderedWidgets.last(); wid; wid = orderedWidgets.prev() ) { - int i = stackedWidgets.tqfindRef( wid ); + int i = stackedWidgets.findRef( wid ); if ( i != -1 ) { stackedWidgets.removeRef( wid ); stackedWidgets.insert( 0, wid ); @@ -752,9 +752,9 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w ) case POINTER_TOOL: if ( widgetPressed && allowMove( w ) ) { // we are prepated for a move - // if widget is laid out, tqfind the first non-laid out super-widget + // if widget is laid out, find the first non-laid out super-widget while ( w->parentWidget() && - ( WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout || !insertedWidgets.tqfind(w ) ) ) + ( WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout || !insertedWidgets.find(w ) ) ) w = w->parentWidget(); // calc correct position @@ -860,13 +860,13 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w ) wid = tqApp->widgetAt( e->globalPos(), TRUE ); if ( wid ) wid = designerWidget( wid ); - if ( wid && ( isMainContainer( wid ) || insertedWidgets.tqfind( wid ) ) && wid->isVisibleTo( this ) ) + if ( wid && ( isMainContainer( wid ) || insertedWidgets.find( wid ) ) && wid->isVisibleTo( this ) ) newendWidget = wid; if ( ::tqqt_cast<TQLayoutWidget*>(newendWidget) || ::tqqt_cast<Spacer*>(newendWidget) ) newendWidget = (TQWidget*)endWidget; drawRecRect = newendWidget != endWidget; if ( newendWidget && - ( isMainContainer( newendWidget ) || insertedWidgets.tqfind( newendWidget ) ) && !isCentralWidget( newendWidget ) ) + ( isMainContainer( newendWidget ) || insertedWidgets.find( newendWidget ) ) && !isCentralWidget( newendWidget ) ) endWidget = newendWidget; mainWindow()->statusBar()->message( tr( "Connect '%1' to '%2'" ).arg( startWidget->name() ). arg( endWidget->name() ) ); @@ -893,7 +893,7 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w ) drawRecRect = newendWidget != endWidget; if ( !newendWidget ) endWidget = newendWidget; - else if ( insertedWidgets.tqfind( newendWidget ) && !isCentralWidget( newendWidget ) ) + else if ( insertedWidgets.find( newendWidget ) && !isCentralWidget( newendWidget ) ) endWidget = newendWidget; if ( endWidget ) mainWindow()->statusBar()->message( tr( "Set buddy '%1' to '%2'" ).arg( startWidget->name() ). @@ -927,7 +927,7 @@ void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w ) if ( widgetPressed && allowMove( w ) ) { // we moved the widget sizePreviewLabel->hide(); - if ( moving.isEmpty() || w->pos() == *moving.tqfind(w) ) + if ( moving.isEmpty() || w->pos() == *moving.find(w) ) break; // restore targetContainer @@ -1160,7 +1160,7 @@ void FormWindow::handleKeyPress( TQKeyEvent *e, TQWidget *w ) TQObjectList *l = queryList( "TQWidget" ); if ( !l ) return; - if ( l->tqfind( TQT_TQOBJECT(w) ) != -1 ) + if ( l->find( TQT_TQOBJECT(w) ) != -1 ) e->accept(); delete l; } @@ -1210,7 +1210,7 @@ void FormWindow::selectWidget( TQT_BASE_OBJECT_NAME *o, bool select ) repaintSelection( (TQWidget*)opw ); if ( !isPropertyShowingBlocked() ) emitShowProperties( propertyWidget ); - WidgetSelection *s = usedSelections.tqfind( w ); + WidgetSelection *s = usedSelections.find( w ); if ( s ) { s->show(); return; @@ -1230,7 +1230,7 @@ void FormWindow::selectWidget( TQT_BASE_OBJECT_NAME *o, bool select ) s->setWidget( w ); emitSelectionChanged(); } else { - WidgetSelection *s = usedSelections.tqfind( w ); + WidgetSelection *s = usedSelections.find( w ); if ( s ) s->setWidget( 0 ); TQObject *opw = propertyWidget; @@ -1255,7 +1255,7 @@ TQPoint FormWindow::grid() const void FormWindow::updateSelection( QWidget *w ) { - WidgetSelection *s = usedSelections.tqfind( w ); + WidgetSelection *s = usedSelections.find( w ); if ( !w->isVisibleTo( this ) ) selectWidget( w, FALSE ); else if ( s ) @@ -1264,14 +1264,14 @@ void FormWindow::updateSelection( QWidget *w ) void FormWindow::raiseSelection( QWidget *w ) { - WidgetSelection *s = usedSelections.tqfind( w ); + WidgetSelection *s = usedSelections.find( w ); if ( s ) s->show(); } void FormWindow::repaintSelection( TQWidget *w ) { - WidgetSelection *s = usedSelections.tqfind( w ); + WidgetSelection *s = usedSelections.find( w ); if ( s ) s->update(); } @@ -1370,7 +1370,7 @@ void FormWindow::selectWidgets() TQPoint p = ( (TQWidget*)o )->mapToGlobal( TQPoint(0,0) ); p = mapFromGlobal( p ); TQRect r( p, ( (TQWidget*)o )->size() ); - if ( r.intersects( currRect ) && !r.tqcontains( currRect ) ) + if ( r.intersects( currRect ) && !r.contains( currRect ) ) selectWidget( (TQWidget*)o ); } } @@ -1382,7 +1382,7 @@ void FormWindow::selectWidgets() bool FormWindow::isWidgetSelected( TQT_BASE_OBJECT_NAME *w ) { if ( w->isWidgetType() ) - return usedSelections.tqfind( (TQWidget*)w ) != 0; + return usedSelections.find( (TQWidget*)w ) != 0; return FALSE; // #### do stuff for TQObjects } @@ -1425,7 +1425,7 @@ void FormWindow::raiseChildSelections( TQWidget *w ) TQPtrDictIterator<WidgetSelection> it( usedSelections ); for ( ; it.current(); ++it ) { - if ( l->tqfindRef( TQT_TQOBJECT(it.current()->widget()) ) != -1 ) + if ( l->findRef( TQT_TQOBJECT(it.current()->widget()) ) != -1 ) it.current()->show(); } delete l; @@ -1437,7 +1437,7 @@ void FormWindow::updateChildSelections( TQWidget *w ) if ( l ) { for ( TQObject *o = l->first(); o; o = l->next() ) { if ( o->isWidgetType() && - insertedWidgets.tqfind( (TQWidget*)o ) ) + insertedWidgets.find( (TQWidget*)o ) ) updateSelection( (TQWidget*)o ); } delete l; @@ -1457,7 +1457,7 @@ void FormWindow::checkSelectionsForMove( TQWidget *w ) if ( it.current()->widget() == mainContainer() ) continue; ++it; - if ( l->tqfind( TQT_TQOBJECT(sel->widget()) ) == -1 ) { + if ( l->find( TQT_TQOBJECT(sel->widget()) ) == -1 ) { if ( WidgetFactory::layoutType( w ) == WidgetFactory::NoLayout ) sel->setWidget( 0 ); } else { @@ -1566,7 +1566,7 @@ void FormWindow::invalidCheckedSelections() void FormWindow::checkPreviewGeometry( TQRect &r ) { - if ( !TQT_TQRECT_OBJECT(rect()).tqcontains( r ) ) { + if ( !TQT_TQRECT_OBJECT(rect()).contains( r ) ) { if ( r.left() < rect().left() ) r.moveTopLeft( TQPoint( 0, r.top() ) ); if ( r.right() > rect().right() ) @@ -1778,7 +1778,7 @@ void FormWindow::showOrderIndicators() w->focusPolicy() != Qt::NoFocus ) { OrderIndicator* ind = new OrderIndicator( order++, w, this ); orderIndicators.append( ind ); - if ( stackedWidgets.tqfindRef( w ) == -1 ) + if ( stackedWidgets.findRef( w ) == -1 ) stackedWidgets.append( w ); } } @@ -1875,16 +1875,16 @@ void FormWindow::lowerWidgets() commandHistory()->addCommand( cmd ); } -void tqfind_accel( const TQString &txt, TQMap<TQChar, TQWidgetList > &accels, TQWidget *w ) +void find_accel( const TQString &txt, TQMap<TQChar, TQWidgetList > &accels, TQWidget *w ) { - int i = txt.tqfind( "&" ); + int i = txt.find( "&" ); if ( i == -1 ) return; TQChar c = txt[ i + 1 ]; if ( c.isNull() || c == '&' ) return; c = c.lower(); - TQMap<TQChar, TQWidgetList >::Iterator it = accels.tqfind( c ); + TQMap<TQChar, TQWidgetList >::Iterator it = accels.find( c ); if ( it == accels.end() ) { TQWidgetList wl; wl.append( w ); @@ -1906,17 +1906,17 @@ void FormWindow::checkAccels() insertedWidgets[ (void*)o ] ) { TQWidget *w = (TQWidget*)o; const TQMetaProperty* text = - w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "text", TRUE ), TRUE ); + w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "text", TRUE ), TRUE ); const TQMetaProperty* title = - w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "title", TRUE ), TRUE ); + w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "title", TRUE ), TRUE ); const TQMetaProperty* pageTitle = - w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "pageTitle", TRUE ), TRUE ); + w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "pageTitle", TRUE ), TRUE ); if ( text ) - tqfind_accel( w->property( "text" ).toString(), accels, w ); + find_accel( w->property( "text" ).toString(), accels, w ); if ( title ) - tqfind_accel( w->property( "title" ).toString(), accels, w ); + find_accel( w->property( "title" ).toString(), accels, w ); if ( pageTitle ) - tqfind_accel( w->property( "pageTitle" ).toString(), accels, w ); + find_accel( w->property( "pageTitle" ).toString(), accels, w ); } else if ( ::tqqt_cast<MenuBarEditor*>(o) ) { ((MenuBarEditor *)o)->checkAccels( accels ); } @@ -2055,7 +2055,7 @@ void FormWindow::layoutHorizontalContainer( TQWidget *w ) for ( TQObject *o = WidgetFactory::containerOfWidget(w)->childrenListObject().first(); o; o = WidgetFactory::containerOfWidget(w)->childrenListObject().next() ) { if ( o->isWidgetType() && ( (TQWidget*)o )->isVisibleTo( this ) && - insertedWidgets.tqfind( (TQWidget*)o ) ) + insertedWidgets.find( (TQWidget*)o ) ) widgets.append( (TQWidget*)o ); } LayoutHorizontalCommand *cmd = new LayoutHorizontalCommand( tr( "Lay out tqchildren horizontally" ), @@ -2075,7 +2075,7 @@ void FormWindow::layoutVerticalContainer( TQWidget *w ) for ( TQObject *o = WidgetFactory::containerOfWidget(w)->childrenListObject().first(); o; o = WidgetFactory::containerOfWidget(w)->childrenListObject().next() ) { if ( o->isWidgetType() && ( (TQWidget*)o )->isVisibleTo( this ) && - insertedWidgets.tqfind( (TQWidget*)o ) ) + insertedWidgets.find( (TQWidget*)o ) ) widgets.append( (TQWidget*)o ); } LayoutVerticalCommand *cmd = new LayoutVerticalCommand( tr( "Lay out tqchildren vertically" ), @@ -2098,7 +2098,7 @@ void FormWindow::layoutGridContainer( TQWidget *w ) for ( TQObject *o = WidgetFactory::containerOfWidget(w)->childrenListObject().first(); o; o = WidgetFactory::containerOfWidget(w)->childrenListObject().next() ) { if ( o->isWidgetType() && ( (TQWidget*)o )->isVisibleTo( this ) && - insertedWidgets.tqfind( (TQWidget*)o ) ) + insertedWidgets.find( (TQWidget*)o ) ) widgets.append( (TQWidget*)o ); } LayoutGridCommand *cmd = new LayoutGridCommand( tr( "Lay out tqchildren in a grid" ), @@ -2149,7 +2149,7 @@ BreakLayoutCommand *FormWindow::breakLayoutCommand( TQWidget *w ) if ( o->isWidgetType() && !mainWindow()->isAToolBarChild( (TQWidget*)o ) && ( (TQWidget*)o )->isVisibleTo( this ) && - insertedWidgets.tqfind( (TQWidget*)o ) ) + insertedWidgets.find( (TQWidget*)o ) ) widgets.append( (TQWidget*)o ); } return new BreakLayoutCommand( tr( "Break Layout" ), this, WidgetFactory::widgetOfContainer( w ), widgets ); @@ -2182,7 +2182,7 @@ bool FormWindow::hasInsertedChildren( TQWidget *w ) const for ( TQObject *o = l->first(); o; o = l->next() ) { if ( o->isWidgetType() && ( (TQWidget*)o )->isVisibleTo( (FormWindow*)this ) && - insertedWidgets.tqfind( (TQWidget*)o ) ) { + insertedWidgets.find( (TQWidget*)o ) ) { delete l; return TRUE; } @@ -2196,7 +2196,7 @@ bool FormWindow::allowMove( TQWidget *w ) { w = w->parentWidget(); while ( w ) { - if ( ( isMainContainer( w ) || insertedWidgets.tqfind( w ) ) && WidgetFactory::layoutType( w ) == WidgetFactory::NoLayout ) + if ( ( isMainContainer( w ) || insertedWidgets.find( w ) ) && WidgetFactory::layoutType( w ) == WidgetFactory::NoLayout ) return TRUE; w = w->parentWidget(); } @@ -2272,7 +2272,7 @@ void FormWindow::restoreConnectionLine() w = h = 64; r = r.normalize(); - while ( r.tqcontains( p ) ) { + while ( r.contains( p ) ) { unclippedPainter->drawPixmap( p, *buffer, TQRect( p, TQSize( w, h ) ) ); unclippedPainter->setPen( Qt::red ); p.setX( p.x() + dx ); @@ -2443,7 +2443,7 @@ bool FormWindow::isDatabaseWidgetUsed() const TQPtrDictIterator<TQWidget> it( insertedWidgets ); for ( ; it.current(); ++it ) { TQString c( it.current()->className() ); - if ( dbClasses.tqcontains( c ) > 0 ) { + if ( dbClasses.contains( c ) > 0 ) { return TRUE; } } @@ -2517,7 +2517,7 @@ TQWidget *FormWindow::containerAt( const TQPoint &pos, TQWidget *notParentOf ) TQWidget *container = 0; int depth = -1; TQWidgetList selected = selectedWidgets(); - if ( TQT_TQRECT_OBJECT(rect()).tqcontains( mapFromGlobal( pos ) ) ) { + if ( TQT_TQRECT_OBJECT(rect()).contains( mapFromGlobal( pos ) ) ) { container = mainContainer(); depth = widgetDepth( container ); } @@ -2528,7 +2528,7 @@ TQWidget *FormWindow::containerAt( const TQPoint &pos, TQWidget *notParentOf ) continue; if ( !it.current()->isVisibleTo( this ) ) continue; - if ( selected.tqfind( it.current() ) != -1 ) + if ( selected.find( it.current() ) != -1 ) continue; if ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( it.current() ) ) ) && it.current() != mainContainer() ) @@ -2537,7 +2537,7 @@ TQWidget *FormWindow::containerAt( const TQPoint &pos, TQWidget *notParentOf ) // the rectangles of all ancestors of the container must contain the insert position TQWidget *w = it.current(); while ( w && !w->isTopLevel() ) { - if ( !TQT_TQRECT_OBJECT(w->rect()).tqcontains( ( w->mapFromGlobal( pos ) ) ) ) + if ( !TQT_TQRECT_OBJECT(w->rect()).contains( ( w->mapFromGlobal( pos ) ) ) ) break; w = w->parentWidget(); } @@ -2545,8 +2545,8 @@ TQWidget *FormWindow::containerAt( const TQPoint &pos, TQWidget *notParentOf ) int wd = widgetDepth( it.current() ); if ( wd == depth && container ) { - if ( ( it.current()->parentWidget()->childrenListObject() ).tqfind( TQT_TQOBJECT(it.current()) ) > - ( container->parentWidget()->childrenListObject() ).tqfind( TQT_TQOBJECT(container) ) ) + if ( ( it.current()->parentWidget()->childrenListObject() ).find( TQT_TQOBJECT(it.current()) ) > + ( container->parentWidget()->childrenListObject() ).find( TQT_TQOBJECT(container) ) ) wd++; } if ( wd > depth && !isChildOf( it.current(), notParentOf ) ) { @@ -2650,7 +2650,7 @@ Project *FormWindow::project() const return proj; } -TQAction *FormWindow::tqfindAction( const TQString &name ) +TQAction *FormWindow::findAction( const TQString &name ) { for ( TQAction *a = actionList().first(); a; a = actionList().next() ) { if ( TQString( a->name() ) == name ) diff --git a/tqtinterface/qt4/tools/designer/designer/formwindow.h b/tqtinterface/qt4/tools/designer/designer/formwindow.h index bacc45f..a4dd567 100644 --- a/tqtinterface/qt4/tools/designer/designer/formwindow.h +++ b/tqtinterface/qt4/tools/designer/designer/formwindow.h @@ -190,7 +190,7 @@ public: void setActiveObject( TQT_BASE_OBJECT_NAME *o ); TQPtrList<TQAction> &actionList() { return actions; } - TQAction *tqfindAction( const TQString &name ); + TQAction *findAction( const TQString &name ); void setProject( Project *pro ); Project *project() const; diff --git a/tqtinterface/qt4/tools/designer/designer/hierarchyview.cpp b/tqtinterface/qt4/tools/designer/designer/hierarchyview.cpp index d583bdc..11f6523 100644 --- a/tqtinterface/qt4/tools/designer/designer/hierarchyview.cpp +++ b/tqtinterface/qt4/tools/designer/designer/hierarchyview.cpp @@ -244,7 +244,7 @@ TQObject *HierarchyList::handleObjectClick( TQListViewItem *i ) if ( !i ) return 0; - TQObject *o = tqfindObject( i ); + TQObject *o = findObject( i ); if ( !o ) return 0; if ( TQT_BASE_OBJECT(formWindow) == TQT_BASE_OBJECT(o) ) { @@ -255,7 +255,7 @@ TQObject *HierarchyList::handleObjectClick( TQListViewItem *i ) } if ( o->isWidgetType() ) { TQWidget *w = (TQWidget*)o; - if ( !formWindow->widgets()->tqfind( w ) ) { + if ( !formWindow->widgets()->find( w ) ) { if ( ::tqqt_cast<TQWidgetStack*>(w->tqparent()) ) { if (::tqqt_cast<TQTabWidget*>(w->tqparent()->tqparent()) ) { ((TQTabWidget*)w->tqparent()->tqparent())->showPage( w ); @@ -274,7 +274,7 @@ TQObject *HierarchyList::handleObjectClick( TQListViewItem *i ) } else if ( ::tqqt_cast<TQMenuBar*>(w) || ::tqqt_cast<TQDockWindow*>(w) ) { formWindow->setActiveObject( w ); } else if ( ::tqqt_cast<TQPopupMenu*>(w) ) { - return 0; // ### we could try to tqfind our menu bar and change the currentMenu to our index + return 0; // ### we could try to find our menu bar and change the currentMenu to our index } else { return 0; } @@ -316,12 +316,12 @@ void HierarchyList::objectClicked( TQListViewItem *i ) } } -TQObject *HierarchyList::tqfindObject( TQListViewItem *i ) +TQObject *HierarchyList::findObject( TQListViewItem *i ) { return ( (HierarchyItem*)i )->object(); } -TQListViewItem *HierarchyList::tqfindItem( TQT_BASE_OBJECT_NAME *o ) +TQListViewItem *HierarchyList::findItem( TQT_BASE_OBJECT_NAME *o ) { TQListViewItemIterator it( this ); while ( it.current() ) { @@ -341,7 +341,7 @@ TQObject *HierarchyList::current() const void HierarchyList::changeNameOf( TQT_BASE_OBJECT_NAME *o, const TQString &name ) { - TQListViewItem *item = tqfindItem( o ); + TQListViewItem *item = findItem( o ); if ( !item ) return; item->setText( 0, name ); @@ -353,7 +353,7 @@ void HierarchyList::changeDatabaseOf( TQT_BASE_OBJECT_NAME *o, const TQString &i #ifndef TQT_NO_SQL if ( !formWindow->isDatabaseAware() ) return; - TQListViewItem *item = tqfindItem( o ); + TQListViewItem *item = findItem( o ); if ( !item ) return; item->setText( 2, info ); @@ -474,7 +474,7 @@ void HierarchyList::insertObject( TQT_BASE_OBJECT_NAME *tqbo, TQListViewItem *tq if ( !it.current()->isWidgetType() || ( (TQWidget*)it.current() )->isHidden() ) continue; - if ( !formWindow->widgets()->tqfind( (TQWidget*)it.current() ) ) { + if ( !formWindow->widgets()->find( (TQWidget*)it.current() ) ) { if ( ::tqqt_cast<TQWidgetStack*>(it.current()->tqparent()) || ::tqqt_cast<TQWidgetStack*>(it.current()) ) { TQObject *obj = it.current(); @@ -485,7 +485,7 @@ void HierarchyList::insertObject( TQT_BASE_OBJECT_NAME *tqbo, TQListViewItem *tq stack = (TQWidgetStack*)obj; else stack = (TQWidgetStack*)obj->tqparent(); - if ( widgetStacks->tqfindRef( stack ) != -1 ) + if ( widgetStacks->findRef( stack ) != -1 ) continue; widgetStacks->append( stack ); TQObjectList *l2 = stack->queryList( "TQWidget", 0, TRUE, FALSE ); @@ -590,12 +590,12 @@ void HierarchyList::showRMBMenu( TQListViewItem *i, const TQPoint & p ) if ( !i ) return; - TQObject *o = tqfindObject( i ); + TQObject *o = findObject( i ); if ( !o ) return; if ( !o->isWidgetType() || - ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(formWindow) && !formWindow->widgets()->tqfind( (TQWidget*)o ) ) ) + ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(formWindow) && !formWindow->widgets()->find( (TQWidget*)o ) ) ) return; TQWidget *w = (TQWidget*)o; diff --git a/tqtinterface/qt4/tools/designer/designer/hierarchyview.h b/tqtinterface/qt4/tools/designer/designer/hierarchyview.h index 9b04c0d..a9f2fae 100644 --- a/tqtinterface/qt4/tools/designer/designer/hierarchyview.h +++ b/tqtinterface/qt4/tools/designer/designer/hierarchyview.h @@ -138,8 +138,8 @@ public Q_SLOTS: private: void insertObject( TQT_BASE_OBJECT_NAME *o, TQListViewItem *tqparent ); - TQObject *tqfindObject( TQListViewItem *i ); - TQListViewItem *tqfindItem( TQT_BASE_OBJECT_NAME *o ); + TQObject *findObject( TQListViewItem *i ); + TQListViewItem *findItem( TQT_BASE_OBJECT_NAME *o ); TQObject *current() const; TQObject *handleObjectClick( TQListViewItem *i ); diff --git a/tqtinterface/qt4/tools/designer/designer/layout.cpp b/tqtinterface/qt4/tools/designer/designer/layout.cpp index acb6766..e6e34e1 100644 --- a/tqtinterface/qt4/tools/designer/designer/layout.cpp +++ b/tqtinterface/qt4/tools/designer/designer/layout.cpp @@ -118,7 +118,7 @@ void Layout::setup() lastList->append( w ); } - // So, now tqfind the list with the most entries + // So, now find the list with the most entries lastList = 0; TQValueList<TQWidgetList>::Iterator it = lists.begin(); for ( ; it != lists.end(); ++it ) { @@ -204,7 +204,7 @@ void Layout::finishLayout( bool needMove, TQLayout *tqlayout ) formWindow->insertWidget( layoutBase ); formWindow->selectWidget( layoutBase ); TQString n = layoutBase->name(); - if ( n.tqfind( "qt_dead_widget_" ) != -1 ) { + if ( n.find( "qt_dead_widget_" ) != -1 ) { n.remove( 0, TQString( "qt_dead_widget_" ).length() ); layoutBase->setName( n ); } @@ -257,7 +257,7 @@ void Layout::breakLayout() w->reparent( layoutBase->parentWidget(), 0, layoutBase->pos() + w->pos(), TRUE ); if ( needResize ) { - TQMap<TQWidget*, TQRect>::Iterator it = rects.tqfind( w ); + TQMap<TQWidget*, TQRect>::Iterator it = rects.find( w ); if ( it != rects.end() ) w->setGeometry( TQRect( layoutBase->pos() + (*it).topLeft(), (*it).size() ) ); } @@ -842,7 +842,7 @@ void GridLayout::buildGrid() delete grid; grid = new Grid( (int)(y.size()-1), (int)(x.size()-1) ); - // Mark the cells in the grid that tqcontains a widget + // Mark the cells in the grid that contains a widget for ( w = widgets.first(); w; w = widgets.next() ) { TQRect c(0,0,0,0), widgetPos = w->tqgeometry(); // From left til right (not including) diff --git a/tqtinterface/qt4/tools/designer/designer/listboxdnd.cpp b/tqtinterface/qt4/tools/designer/designer/listboxdnd.cpp index 191ea34..83f02b5 100644 --- a/tqtinterface/qt4/tools/designer/designer/listboxdnd.cpp +++ b/tqtinterface/qt4/tools/designer/designer/listboxdnd.cpp @@ -256,7 +256,7 @@ bool ListBoxItemDrag::decode( TQDropEvent * event, TQListBox * tqparent, TQListB int count = 0; stream >> count; - TQ_UINT8 recievePtr = 0; // data tqcontains just item pointers; no data + TQ_UINT8 recievePtr = 0; // data contains just item pointers; no data stream >> recievePtr; TQListBoxItem * item = 0; diff --git a/tqtinterface/qt4/tools/designer/designer/listviewdnd.cpp b/tqtinterface/qt4/tools/designer/designer/listviewdnd.cpp index f283dd7..6de0765 100644 --- a/tqtinterface/qt4/tools/designer/designer/listviewdnd.cpp +++ b/tqtinterface/qt4/tools/designer/designer/listviewdnd.cpp @@ -153,7 +153,7 @@ int ListViewDnd::buildFlatList( ListViewItemList & list ) list.append( *it ); } else if ( !addKids ) { // Children processing not set, so set it - // Also tqfind the item were we shall quit + // Also find the item were we shall quit // processing tqchildren...if any such item addKids = TRUE; nextSibling = (*it)->nextSibling(); diff --git a/tqtinterface/qt4/tools/designer/designer/listvieweditorimpl.cpp b/tqtinterface/qt4/tools/designer/designer/listvieweditorimpl.cpp index 5e28663..9d86a9f 100644 --- a/tqtinterface/qt4/tools/designer/designer/listvieweditorimpl.cpp +++ b/tqtinterface/qt4/tools/designer/designer/listvieweditorimpl.cpp @@ -146,7 +146,7 @@ void ListViewEditor::okClicked() void ListViewEditor::columnClickable( bool b ) { - Column *c = tqfindColumn( colPreview->item( colPreview->currentItem() ) ); + Column *c = findColumn( colPreview->item( colPreview->currentItem() ) ); if ( !c ) return; c->clickable = b; @@ -171,7 +171,7 @@ void ListViewEditor::columnDownClicked() void ListViewEditor::columnPixmapChosen() { - Column *c = tqfindColumn( colPreview->item( colPreview->currentItem() ) ); + Column *c = findColumn( colPreview->item( colPreview->currentItem() ) ); if ( !c ) return; @@ -198,7 +198,7 @@ void ListViewEditor::columnPixmapChosen() void ListViewEditor::columnPixmapDeleted() { - Column *c = tqfindColumn( colPreview->item( colPreview->currentItem() ) ); + Column *c = findColumn( colPreview->item( colPreview->currentItem() ) ); if ( !c ) return; @@ -216,7 +216,7 @@ void ListViewEditor::columnPixmapDeleted() void ListViewEditor::columnResizable( bool b ) { - Column *c = tqfindColumn( colPreview->item( colPreview->currentItem() ) ); + Column *c = findColumn( colPreview->item( colPreview->currentItem() ) ); if ( !c ) return; c->resizable = b; @@ -224,7 +224,7 @@ void ListViewEditor::columnResizable( bool b ) void ListViewEditor::columnTextChanged( const TQString &txt ) { - Column *c = tqfindColumn( colPreview->item( colPreview->currentItem() ) ); + Column *c = findColumn( colPreview->item( colPreview->currentItem() ) ); if ( !c ) return; @@ -256,7 +256,7 @@ void ListViewEditor::columnUpClicked() void ListViewEditor::currentColumnChanged( TQListBoxItem *i ) { - Column *c = tqfindColumn( i ); + Column *c = findColumn( i ); if ( !i || !c ) { colText->setEnabled( FALSE ); colPixmap->setEnabled( FALSE ); @@ -601,7 +601,7 @@ void ListViewEditor::setupItems() int i = 0; TQHeader *header = itemsPreview->header(); for ( TQListBoxItem *item = colPreview->firstItem(); item; item = item->next() ) { - Column *col = tqfindColumn( item ); + Column *col = findColumn( item ); if ( !col ) continue; if ( i >= itemsPreview->columns() ) @@ -617,7 +617,7 @@ void ListViewEditor::setupItems() itemColumn->setValue( TQMIN( numColumns - 1, itemColumn->value() ) ); } -ListViewEditor::Column *ListViewEditor::tqfindColumn( TQListBoxItem *i ) +ListViewEditor::Column *ListViewEditor::findColumn( TQListBoxItem *i ) { if ( !i ) return 0; diff --git a/tqtinterface/qt4/tools/designer/designer/listvieweditorimpl.h b/tqtinterface/qt4/tools/designer/designer/listvieweditorimpl.h index 8f2135b..24367cd 100644 --- a/tqtinterface/qt4/tools/designer/designer/listvieweditorimpl.h +++ b/tqtinterface/qt4/tools/designer/designer/listvieweditorimpl.h @@ -94,7 +94,7 @@ private: private: void setupColumns(); void setupItems(); - Column *tqfindColumn( TQListBoxItem *i ); + Column *findColumn( TQListBoxItem *i ); void transferItems( TQListView *from, TQListView *to ); void displayItem( TQListViewItem *i, int col ); diff --git a/tqtinterface/qt4/tools/designer/designer/mainwindow.cpp b/tqtinterface/qt4/tools/designer/designer/mainwindow.cpp index def15eb..c5c7485 100644 --- a/tqtinterface/qt4/tools/designer/designer/mainwindow.cpp +++ b/tqtinterface/qt4/tools/designer/designer/mainwindow.cpp @@ -143,7 +143,7 @@ static TQString textNoAccel( const TQString& text) { TQString t = text; int i; - while ( (i = t.tqfind('&') )>= 0 ) { + while ( (i = t.find('&') )>= 0 ) { t.remove(i,1); } return t; @@ -752,10 +752,10 @@ void MainWindow::helpContents() TQTextStream ts( &f ); while ( !ts.eof() ) { TQString s = ts.readLine(); - int from = s.tqfind( "\"" ); + int from = s.find( "\"" ); if ( from == -1 ) continue; - int to = s.tqfindRev( "\"" ); + int to = s.findRev( "\"" ); if ( to == -1 ) continue; propertyDocumentation[ s.mid( from + 1, to - from - 1 ) ] = s.mid( to + 2 ) + "-prop"; @@ -781,7 +781,7 @@ void MainWindow::helpContents() else source = propertyDocumentation[ "TQObject/name" ]; } else { - while ( mo && !propertyDocumentation.tqcontains( ( s = TQString( mo->className() ) + "/" + cp ) ) ) + while ( mo && !propertyDocumentation.contains( ( s = TQString( mo->className() ) + "/" + cp ) ) ) mo = TQT_TQMETAOBJECT(const_cast<QMetaObject*>(mo->superClass())); if ( mo ) source = "p:" + propertyDocumentation[s]; @@ -939,12 +939,12 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) TQPoint pos = ((TQMouseEvent*)e)->pos(); MenuBarEditor *m = ::tqqt_cast<MenuBarEditor*>(o); showProperties( o ); - if ( m->tqfindItem( pos ) >= m->count() ) + if ( m->findItem( pos ) >= m->count() ) m->setFocus(); } else if ( e->type() == TQEvent::MouseButtonPress && ::tqqt_cast<PopupMenuEditor*>(o) ) { PopupMenuEditor *m = ::tqqt_cast<PopupMenuEditor*>(o); PopupMenuEditorItem *i = m->at( ((TQMouseEvent*)e)->pos() ); - if ( m->tqfind( i->action() ) != -1 && !i->isSeparator() ) + if ( m->find( i->action() ) != -1 && !i->isSeparator() ) showProperties( i->action() ); } return TQMainWindow::eventFilter( o, e ); @@ -1261,7 +1261,7 @@ FormWindow *MainWindow::formWindow() if ( ::tqqt_cast<FormWindow*>(qworkspace->activeWindow()) ) fw = (FormWindow*)qworkspace->activeWindow(); else if ( lastActiveFormWindow && - qworkspace->windowList().tqfind( lastActiveFormWindow ) != -1) + qworkspace->windowList().find( lastActiveFormWindow ) != -1) fw = lastActiveFormWindow; return fw; } @@ -1555,18 +1555,18 @@ void MainWindow::popupWidgetMenu( const TQPoint &gp, FormWindow * /*fw*/, TQWidg void MainWindow::setupRMBProperties( TQValueList<uint> &ids, TQMap<TQString, int> &props, TQWidget *w ) { - const TQMetaProperty* text = w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "text", TRUE ), TRUE ); + const TQMetaProperty* text = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "text", TRUE ), TRUE ); if ( text && qstrcmp( text->type(), "TQString") != 0 ) text = 0; - const TQMetaProperty* title = w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "title", TRUE ), TRUE ); + const TQMetaProperty* title = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "title", TRUE ), TRUE ); if ( title && qstrcmp( title->type(), "TQString") != 0 ) title = 0; const TQMetaProperty* pagetitle = - w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "pageTitle", TRUE ), TRUE ); + w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "pageTitle", TRUE ), TRUE ); if ( pagetitle && qstrcmp( pagetitle->type(), "TQString") != 0 ) pagetitle = 0; const TQMetaProperty* pixmap = - w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "pixmap", TRUE ), TRUE ); + w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "pixmap", TRUE ), TRUE ); if ( pixmap && qstrcmp( pixmap->type(), "TQPixmap") != 0 ) pixmap = 0; @@ -2137,7 +2137,7 @@ void MainWindow::selectionChanged() static TQString fixArgs( const TQString &s2 ) { TQString s = s2; - return s.tqreplace( ',', ';' ); + return s.replace( ',', ';' ); } void MainWindow::writeConfig() @@ -2247,7 +2247,7 @@ void MainWindow::writeConfig() static TQString fixArgs2( const TQString &s2 ) { TQString s = s2; - return s.tqreplace( ';', ',' ); + return s.replace( ';', ',' ); } void MainWindow::readConfig() @@ -2295,14 +2295,14 @@ void MainWindow::readConfig() } // We know that the oldSettingsKey() will return 3.1 if ( keybase == DesignerApplication::oldSettingsKey() ) { - if (keybase.tqcontains("3.1")) + if (keybase.contains("3.1")) recentlyFiles = config.readListEntry( keybase + "RecentlyOpenedFiles", ',' ); else recentlyFiles = config.readListEntry(keybase + "RecentlyOpenedFiles"); if ( recentlyFiles.count() == 1 && recentlyFiles[0].isNull() ) recentlyFiles.clear(); - if (keybase.tqcontains("3.1")) + if (keybase.contains("3.1")) recentlyProjects = config.readListEntry( keybase + "RecentlyOpenedProjects", ',' ); else recentlyProjects = config.readListEntry( keybase + "RecentlyOpenedProjects"); @@ -2579,7 +2579,7 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f ) TQString fullSignal; for ( int i = 0; i < (int)sigs.count(); ++i ) { TQString sig = sigs.at( i ); - if ( sig.left( sig.tqfind( '(' ) ) == defSignal ) { + if ( sig.left( sig.find( '(' ) ) == defSignal ) { fullSignal = sig; break; } @@ -2587,14 +2587,14 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f ) if ( !fullSignal.isEmpty() ) { TQString signl = fullSignal; - fullSignal = fullSignal.mid( fullSignal.tqfind( '(' ) + 1 ); + fullSignal = fullSignal.mid( fullSignal.find( '(' ) + 1 ); fullSignal.remove( (int)fullSignal.length() - 1, 1 ); fullSignal = iface->createArguments( fullSignal.simplifyWhiteSpace() ); s += "(" + fullSignal + ")"; if ( !MetaDataBase::hasFunction( f, s.latin1() ) ) MetaDataBase::addFunction( f, s.latin1(), "", "public", "slot", f->project()->language(), "void" ); - s = s.left( s.tqfind( '(' ) ).latin1(); + s = s.left( s.find( '(' ) ).latin1(); if ( !MetaDataBase::hasConnection( f, w, defSignal.latin1(), f->mainContainer(), s.latin1() ) ) { MetaDataBase::Connection conn; conn.sender = TQT_TQOBJECT(w); @@ -2622,8 +2622,8 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f ) return TRUE; } - const TQMetaProperty* text = w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "text", TRUE ), TRUE ); - const TQMetaProperty* title = w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "title", TRUE ), TRUE ); + const TQMetaProperty* text = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "text", TRUE ), TRUE ); + const TQMetaProperty* title = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "title", TRUE ), TRUE ); if ( text && text->designable(w) ) { bool ok = FALSE; bool oldDoWrap = FALSE; @@ -2809,7 +2809,7 @@ void MainWindow::projectSelected( TQAction *a ) a->setOn( TRUE ); if ( currentProject ) currentProject->setActive( FALSE ); - Project *p = *projects.tqfind( a ); + Project *p = *projects.find( a ); p->setActive( TRUE ); if ( currentProject == p ) return; @@ -2886,9 +2886,9 @@ void MainWindow::showDialogHelp() else if ( ::tqqt_cast<ProjectSettingsBase*>(w) ) link += "dialog-project-settings"; else if ( ::tqqt_cast<FindDialog*>(w) ) - link += "dialog-tqfind-text"; + link += "dialog-find-text"; else if ( ::tqqt_cast<ReplaceDialog*>(w) ) - link += "dialog-tqreplace-text"; + link += "dialog-replace-text"; else if ( ::tqqt_cast<GotoLineDialog*>(w) ) link += "dialog-go-to-line"; // else if ( ::tqqt_cast<ConnectionEditorBase*>(w) ) @@ -3037,7 +3037,7 @@ TQStringList MainWindow::projectFileNames() const return res; } -Project *MainWindow::tqfindProject( const TQString &projectName ) const +Project *MainWindow::findProject( const TQString &projectName ) const { for ( TQMap<TQAction*, Project* >::ConstIterator it = projects.begin(); it != projects.end(); ++it ) { if ( (*it)->projectName() == projectName ) @@ -3104,7 +3104,7 @@ void MainWindow::addRecentlyOpened( const TQString &fn, TQStringList &lst ) TQFileInfo fi( fn ); fi.convertToAbs(); TQString f = fi.filePath(); - if ( lst.tqfind( f ) != lst.end() ) + if ( lst.find( f ) != lst.end() ) lst.remove( f ); if ( lst.count() >= 10 ) lst.pop_back(); @@ -3215,7 +3215,7 @@ void MainWindow::setModified( bool b, TQWidget *window ) void MainWindow::editorClosed( SourceEditor *e ) { - sourceEditors.take( sourceEditors.tqfindRef( e ) ); + sourceEditors.take( sourceEditors.findRef( e ) ); } void MainWindow::functionsChanged() @@ -3427,7 +3427,7 @@ void MainWindow::showSourceLine( TQObject *o, int line, LineMode lm ) mblockNewForms = TRUE; if ( !fw ) - openFormWindow( currentProject->makeAbsolute( *qwf_forms->tqfind( (TQWidget*)o ) ) ); + openFormWindow( currentProject->makeAbsolute( *qwf_forms->find( (TQWidget*)o ) ) ); else fw->formFile()->showEditor( FALSE ); tqApp->processEvents(); // give all views the chance to get the formwindow @@ -3449,7 +3449,7 @@ void MainWindow::showSourceLine( TQObject *o, int line, LineMode lm ) } -TQObject *MainWindow::tqfindRealObject( TQObject *o ) +TQObject *MainWindow::findRealObject( TQObject *o ) { TQWidgetList windows = qWorkspace()->windowList(); for ( TQWidget *w = windows.first(); w; w = windows.next() ) { @@ -3625,13 +3625,13 @@ TQString MainWindow::whatsThisFrom( const TQString &key ) } } - int i = menuHelpFile.tqfind( key ); + int i = menuHelpFile.find( key ); if ( i == -1 ) return TQString(); int start = i; int end = i; - start = menuHelpFile.tqfindRev( "<li>", i ) + 4; - end = menuHelpFile.tqfind( '\n', i ) - 1; + start = menuHelpFile.findRev( "<li>", i ) + 4; + end = menuHelpFile.find( '\n', i ) - 1; return menuHelpFile.mid( start, end - start + 1 ); } diff --git a/tqtinterface/qt4/tools/designer/designer/mainwindow.h b/tqtinterface/qt4/tools/designer/designer/mainwindow.h index 30f04df..901f6e0 100644 --- a/tqtinterface/qt4/tools/designer/designer/mainwindow.h +++ b/tqtinterface/qt4/tools/designer/designer/mainwindow.h @@ -147,7 +147,7 @@ public: TQPtrList<DesignerProject> projectList() const; TQStringList projectNames() const; TQStringList projectFileNames() const; - Project *tqfindProject( const TQString &projectName ) const; + Project *findProject( const TQString &projectName ) const; void setCurrentProject( Project *pro ); void setCurrentProjectByFilename( const TQString& proFilename ); OutputWindow *outputWindow() const { return oWindow; } @@ -172,7 +172,7 @@ public: void createNewProject( const TQString &lang ); void popupProjectMenu( const TQPoint &pos ); - TQObject *tqfindRealObject( TQObject *o ); + TQObject *findRealObject( TQObject *o ); void setSingleProject( Project *pro ); bool singleProjectMode() const { return singleProject; } @@ -452,8 +452,8 @@ private: bool autoSaveEnabled; int autoSaveInterval; TQLineEdit *incrementalSearch; - TQGuardedPtr<FindDialog> tqfindDialog; - TQGuardedPtr<ReplaceDialog> tqreplaceDialog; + TQGuardedPtr<FindDialog> findDialog; + TQGuardedPtr<ReplaceDialog> replaceDialog; TQGuardedPtr<GotoLineDialog> gotoLineDialog; Project *eProject; bool inDebugMode; diff --git a/tqtinterface/qt4/tools/designer/designer/mainwindowactions.cpp b/tqtinterface/qt4/tools/designer/designer/mainwindowactions.cpp index 281efdc..04fe15e 100644 --- a/tqtinterface/qt4/tools/designer/designer/mainwindowactions.cpp +++ b/tqtinterface/qt4/tools/designer/designer/mainwindowactions.cpp @@ -1042,7 +1042,7 @@ void MainWindow::fileNewDialog() { static int forms = 0; TQString n = "Dialog" + TQString::number( ++forms ); - while ( currentProject->tqfindFormFile( n + ".ui" ) ) + while ( currentProject->findFormFile( n + ".ui" ) ) n = "Dialog" + TQString::number( ++forms ); FormWindow *fw = 0; FormFile *ff = new FormFile( n + ".ui", FALSE, currentProject ); @@ -1240,24 +1240,24 @@ void MainWindow::fileOpen( const TQString &filter, const TQString &extension, co if ( !filename.isEmpty() ) { TQFileInfo fi( filename ); - if ( fi.extension( FALSE ) == "pro" && ( extension.isEmpty() || extension.tqfind( ";pro" ) != -1 ) ) { + if ( fi.extension( FALSE ) == "pro" && ( extension.isEmpty() || extension.find( ";pro" ) != -1 ) ) { addRecentlyOpened( filename, recentlyProjects ); openProject( filename ); - } else if ( fi.extension( FALSE ) == "ui" && ( extension.isEmpty() || extension.tqfind( ";ui" ) != -1 ) ) { + } else if ( fi.extension( FALSE ) == "ui" && ( extension.isEmpty() || extension.find( ";ui" ) != -1 ) ) { if ( !inProject ) setCurrentProject( eProject ); openFormWindow( filename ); addRecentlyOpened( filename, recentlyFiles ); - } else if ( !extension.isEmpty() && extension.tqfind( ";" + fi.extension( FALSE ) ) != -1 || - additionalSources.tqfind( fi.extension( FALSE ) ) != additionalSources.end() ) { - SourceFile *sf = project->tqfindSourceFile( project->makeRelative( filename ) ); + } else if ( !extension.isEmpty() && extension.find( ";" + fi.extension( FALSE ) ) != -1 || + additionalSources.find( fi.extension( FALSE ) ) != additionalSources.end() ) { + SourceFile *sf = project->findSourceFile( project->makeRelative( filename ) ); if ( !sf ) sf = new SourceFile( project->makeRelative( filename ), FALSE, project ); editSource( sf ); } else if ( extension.isEmpty() ) { TQString filter; for ( TQStringList::Iterator it2 = filterlist.begin(); it2 != filterlist.end(); ++it2 ) { - if ( (*it2).tqcontains( "." + fi.extension( FALSE ), FALSE ) ) { + if ( (*it2).contains( "." + fi.extension( FALSE ), FALSE ) ) { filter = *it2; break; } @@ -1314,7 +1314,7 @@ FormWindow *MainWindow::openFormWindow( const TQString &filename, bool validFile } statusBar()->message( tr( "Reading file '%1'...").arg( filename ) ); - FormFile *ff2 = currentProject->tqfindFormFile( currentProject->makeRelative(filename) ); + FormFile *ff2 = currentProject->findFormFile( currentProject->makeRelative(filename) ); if ( ff2 && ff2->formWindow() ) { ff2->formWindow()->setFocus(); return ff2->formWindow(); @@ -1560,7 +1560,7 @@ void MainWindow::editPaste() formWindow()->commandHistory()->setModified( TRUE ); } else { TQMessageBox::information( this, tr( "Paste error" ), - tr( "Can't paste widgets. Designer couldn't tqfind a container\n" + tr( "Can't paste widgets. Designer couldn't find a container\n" "to paste into which does not contain a layout. Break the tqlayout\n" "of the container you want to paste into and select this container\n" "and then paste again." ) ); @@ -1958,14 +1958,14 @@ void MainWindow::searchFind() !::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) return; - if ( !tqfindDialog ) - tqfindDialog = new FindDialog( this, 0, FALSE ); - tqfindDialog->show(); - tqfindDialog->raise(); - tqfindDialog->setEditor( ( (SourceEditor*)qWorkspace()->activeWindow() )->editorInterface(), + if ( !findDialog ) + findDialog = new FindDialog( this, 0, FALSE ); + findDialog->show(); + findDialog->raise(); + findDialog->setEditor( ( (SourceEditor*)qWorkspace()->activeWindow() )->editorInterface(), ( (SourceEditor*)qWorkspace()->activeWindow() )->object() ); - tqfindDialog->comboFind->setFocus(); - tqfindDialog->comboFind->lineEdit()->selectAll(); + findDialog->comboFind->setFocus(); + findDialog->comboFind->lineEdit()->selectAll(); } void MainWindow::searchIncremetalFindMenu() @@ -1980,7 +1980,7 @@ void MainWindow::searchIncremetalFind() !::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) return; - ( (SourceEditor*)qWorkspace()->activeWindow() )->editorInterface()->tqfind( incrementalSearch->text(), + ( (SourceEditor*)qWorkspace()->activeWindow() )->editorInterface()->find( incrementalSearch->text(), FALSE, FALSE, TRUE, FALSE ); } @@ -1990,7 +1990,7 @@ void MainWindow::searchIncremetalFindNext() !::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) return; - ( (SourceEditor*)qWorkspace()->activeWindow() )->editorInterface()->tqfind( incrementalSearch->text(), + ( (SourceEditor*)qWorkspace()->activeWindow() )->editorInterface()->find( incrementalSearch->text(), FALSE, FALSE, TRUE, TRUE ); } @@ -2000,14 +2000,14 @@ void MainWindow::searchReplace() !::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) return; - if ( !tqreplaceDialog ) - tqreplaceDialog = new ReplaceDialog( this, 0, FALSE ); - tqreplaceDialog->show(); - tqreplaceDialog->raise(); - tqreplaceDialog->setEditor( ( (SourceEditor*)qWorkspace()->activeWindow() )->editorInterface(), + if ( !replaceDialog ) + replaceDialog = new ReplaceDialog( this, 0, FALSE ); + replaceDialog->show(); + replaceDialog->raise(); + replaceDialog->setEditor( ( (SourceEditor*)qWorkspace()->activeWindow() )->editorInterface(), ( (SourceEditor*)qWorkspace()->activeWindow() )->object() ); - tqreplaceDialog->comboFind->setFocus(); - tqreplaceDialog->comboFind->lineEdit()->selectAll(); + replaceDialog->comboFind->setFocus(); + replaceDialog->comboFind->lineEdit()->selectAll(); } void MainWindow::searchGotoLine() diff --git a/tqtinterface/qt4/tools/designer/designer/menubareditor.cpp b/tqtinterface/qt4/tools/designer/designer/menubareditor.cpp index 1bfc825..429dfb8 100644 --- a/tqtinterface/qt4/tools/designer/designer/menubareditor.cpp +++ b/tqtinterface/qt4/tools/designer/designer/menubareditor.cpp @@ -44,7 +44,7 @@ #include "menubareditor.h" #include "popupmenueditor.h" -extern void tqfind_accel( const TQString &txt, TQMap<TQChar, TQWidgetList > &accels, TQWidget *w ); +extern void find_accel( const TQString &txt, TQMap<TQChar, TQWidgetList > &accels, TQWidget *w ); // Drag Object Declaration ------------------------------------------- @@ -276,12 +276,12 @@ void MenuBarEditor::removeItem( MenuBarEditorItem * item ) } } -int MenuBarEditor::tqfindItem( MenuBarEditorItem * item ) +int MenuBarEditor::findItem( MenuBarEditorItem * item ) { - return itemList.tqfindRef( item ); + return itemList.findRef( item ); } -int MenuBarEditor::tqfindItem( PopupMenuEditor * menu ) +int MenuBarEditor::findItem( PopupMenuEditor * menu ) { MenuBarEditorItem * i = itemList.first(); @@ -294,7 +294,7 @@ int MenuBarEditor::tqfindItem( PopupMenuEditor * menu ) return -1; } -int MenuBarEditor::tqfindItem( TQPoint & pos ) +int MenuBarEditor::findItem( TQPoint & pos ) { int x = borderSize(); int dx = 0; @@ -319,7 +319,7 @@ int MenuBarEditor::tqfindItem( TQPoint & pos ) r = TQRect( x, y, s.width(), s.height() ); - if ( r.tqcontains( pos ) ) + if ( r.contains( pos ) ) return itemList.at(); addItemSizeToCoords( i, x, y, w ); @@ -339,7 +339,7 @@ int MenuBarEditor::tqfindItem( TQPoint & pos ) r = TQRect( x, y, s.width(), s.height() ); - if ( r.tqcontains( pos ) ) + if ( r.contains( pos ) ) return itemList.count(); return itemList.count() + 1; @@ -420,8 +420,8 @@ void MenuBarEditor::exchange( int a, int b ) ia == &addItem || ia == &addSeparator || ib == &addItem || ib == &addSeparator ) return; // do nothing - itemList.tqreplace( b, ia ); - itemList.tqreplace( a, ib ); + itemList.replace( b, ia ); + itemList.replace( a, ib ); } void MenuBarEditor::showLineEdit( int index ) @@ -549,7 +549,7 @@ void MenuBarEditor::checkAccels( TQMap<TQChar, TQWidgetList > &accels ) MenuBarEditorItem * i = itemList.first(); while ( i ) { t = i->menuText(); - tqfind_accel( t, accels, this ); + find_accel( t, accels, this ); // do not check the accelerators in the popup menus i = itemList.next(); } @@ -600,7 +600,7 @@ void MenuBarEditor::mousePressEvent( TQMouseEvent * e ) mousePressPos = e->pos(); hideItem(); lineEdit->hide(); - currentIndex = tqfindItem( mousePressPos ); + currentIndex = findItem( mousePressPos ); showItem(); update(); e->accept(); @@ -609,7 +609,7 @@ void MenuBarEditor::mousePressEvent( TQMouseEvent * e ) void MenuBarEditor::mouseDoubleClickEvent( TQMouseEvent * e ) { mousePressPos = e->pos(); - currentIndex = tqfindItem( mousePressPos ); + currentIndex = findItem( mousePressPos ); lineEdit->hide(); if ( currentIndex > (int)itemList.count() ) { insertSeparator(); @@ -625,7 +625,7 @@ void MenuBarEditor::mouseMoveEvent( TQMouseEvent * e ) if ( ( e->pos() - mousePressPos ).manhattanLength() > 3 ) { bool itemCreated = FALSE; bool isSeparator = FALSE; - draggedItem = item( tqfindItem( mousePressPos ) ); + draggedItem = item( findItem( mousePressPos ) ); if ( draggedItem == &addItem ) { draggedItem = createItem(); itemCreated = TRUE; @@ -651,7 +651,7 @@ void MenuBarEditor::mouseMoveEvent( TQMouseEvent * e ) // If the item is dropped in the same list, // we will have two instances of the same pointer // in the list. - itemList.tqfind( draggedItem ); + itemList.find( draggedItem ); TQLNode * node = itemList.currentNode(); dropConfirmed = FALSE; d->dragCopy(); // dragevents and stuff happens @@ -697,7 +697,7 @@ void MenuBarEditor::dragMoveEvent( TQDragMoveEvent * e ) TQPoint pos = e->pos(); dropLine->move( snapToItem( pos ) ); - int idx = tqfindItem( pos ); + int idx = findItem( pos ); if ( currentIndex != idx ) { hideItem(); currentIndex = idx; @@ -1009,7 +1009,7 @@ void MenuBarEditor::dropInPlace( MenuBarEditorItem * i, const TQPoint & pos ) hideItem(); Command * cmd = 0; - int iidx = itemList.tqfindRef( i ); + int iidx = itemList.findRef( i ); if ( iidx != -1 ) { // internal dnd cmd = new MoveMenuCommand( "Item Dragged", formWnd, this, iidx, idx ); item( iidx )->tqsetVisible( TRUE ); diff --git a/tqtinterface/qt4/tools/designer/designer/menubareditor.h b/tqtinterface/qt4/tools/designer/designer/menubareditor.h index 913f0a8..7ce2c35 100644 --- a/tqtinterface/qt4/tools/designer/designer/menubareditor.h +++ b/tqtinterface/qt4/tools/designer/designer/menubareditor.h @@ -107,9 +107,9 @@ public: void removeItemAt( int index ); void removeItem( MenuBarEditorItem * item ); - int tqfindItem( MenuBarEditorItem * item ); - int tqfindItem( PopupMenuEditor * menu ); - int tqfindItem( TQPoint & pos ); + int findItem( MenuBarEditorItem * item ); + int findItem( PopupMenuEditor * menu ); + int findItem( TQPoint & pos ); MenuBarEditorItem * item( int index = -1 ); diff --git a/tqtinterface/qt4/tools/designer/designer/metadatabase.cpp b/tqtinterface/qt4/tools/designer/designer/metadatabase.cpp index 501e6cc..f428e98 100644 --- a/tqtinterface/qt4/tools/designer/designer/metadatabase.cpp +++ b/tqtinterface/qt4/tools/designer/designer/metadatabase.cpp @@ -127,7 +127,7 @@ void MetaDataBase::addEntry( TQT_BASE_OBJECT_NAME *o ) if ( !o ) return; setupDataBase(); - if ( db->tqfind( o ) ) + if ( db->find( o ) ) return; MetaDataBaseRecord *r = new MetaDataBaseRecord; r->object = TQT_TQOBJECT(o); @@ -150,7 +150,7 @@ void MetaDataBase::setPropertyChanged( TQT_BASE_OBJECT_NAME *o, const TQString & ( (PropertyObject*)o )->mdPropertyChanged( property, changed ); return; } - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -158,10 +158,10 @@ void MetaDataBase::setPropertyChanged( TQT_BASE_OBJECT_NAME *o, const TQString & } if ( changed ) { - if ( r->changedProperties.tqfindIndex( property ) == -1 ) + if ( r->changedProperties.findIndex( property ) == -1 ) r->changedProperties.append( property ); } else { - if ( r->changedProperties.tqfindIndex( property ) != -1 ) + if ( r->changedProperties.findIndex( property ) != -1 ) r->changedProperties.remove( property ); } @@ -189,20 +189,20 @@ bool MetaDataBase::isPropertyChanged( TQT_BASE_OBJECT_NAME *o, const TQString &p setupDataBase(); if ( TQT_TQOBJECT(o)->isA( "PropertyObject" ) ) return ( (PropertyObject*)o )->mdIsPropertyChanged( property ); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); return FALSE; } - return r->changedProperties.tqfindIndex( property ) != -1; + return r->changedProperties.findIndex( property ) != -1; } TQStringList MetaDataBase::changedProperties( TQT_BASE_OBJECT_NAME *o ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -220,7 +220,7 @@ void MetaDataBase::setPropertyComment( TQT_BASE_OBJECT_NAME *o, const TQString & ( (PropertyObject*)o )->mdSetPropertyComment( property, comment ); return; } - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -235,14 +235,14 @@ TQString MetaDataBase::propertyComment( TQT_BASE_OBJECT_NAME *o, const TQString setupDataBase(); if ( TQT_TQOBJECT(o)->isA( "PropertyObject" ) ) return ( (PropertyObject*)o )->mdPropertyComment( property ); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); return TQString(); } - return *r->propertyComments.tqfind( property ); + return *r->propertyComments.find( property ); } void MetaDataBase::setFakeProperty( TQT_BASE_OBJECT_NAME *o, const TQString &property, const TQVariant& value ) @@ -252,7 +252,7 @@ void MetaDataBase::setFakeProperty( TQT_BASE_OBJECT_NAME *o, const TQString &pro ( (PropertyObject*)o )->mdSetFakeProperty( property, value ); return; } - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -266,13 +266,13 @@ TQVariant MetaDataBase::fakeProperty( TQT_BASE_OBJECT_NAME * o, const TQString & setupDataBase(); if ( TQT_TQOBJECT(o)->isA( "PropertyObject" ) ) return ( (PropertyObject*)o )->mdFakeProperty( property ); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); return TQVariant(); } - TQMap<TQString, TQVariant>::Iterator it = r->fakeProperties.tqfind( property ); + TQMap<TQString, TQVariant>::Iterator it = r->fakeProperties.find( property ); if ( it != r->fakeProperties.end() ) return r->fakeProperties[property]; return WidgetFactory::defaultValue( o, property ); @@ -282,7 +282,7 @@ TQVariant MetaDataBase::fakeProperty( TQT_BASE_OBJECT_NAME * o, const TQString & TQMap<TQString,TQVariant>* MetaDataBase::fakeProperties( TQT_BASE_OBJECT_NAME* o ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -296,7 +296,7 @@ void MetaDataBase::setSpacing( TQT_BASE_OBJECT_NAME *o, int spacing ) if ( !o ) return; setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -324,7 +324,7 @@ int MetaDataBase::spacing( TQT_BASE_OBJECT_NAME *o ) setupDataBase(); if ( ::tqqt_cast<TQMainWindow*>(o) ) o = ( (TQMainWindow*)o )->centralWidget(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -339,7 +339,7 @@ void MetaDataBase::setMargin( TQT_BASE_OBJECT_NAME *o, int margin ) if ( !o ) return; setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -381,7 +381,7 @@ int MetaDataBase::margin( TQT_BASE_OBJECT_NAME *o ) setupDataBase(); if ( ::tqqt_cast<TQMainWindow*>(o) ) o = ( (TQMainWindow*)o )->centralWidget(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -395,7 +395,7 @@ void MetaDataBase::setResizeMode( TQT_BASE_OBJECT_NAME *o, const TQString &mode if ( !o ) return; setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -412,7 +412,7 @@ TQString MetaDataBase::resizeMode( TQT_BASE_OBJECT_NAME *o ) setupDataBase(); if ( ::tqqt_cast<TQMainWindow*>(o) ) o = ( (TQMainWindow*)o )->centralWidget(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -425,7 +425,7 @@ void MetaDataBase::addConnection( TQT_BASE_OBJECT_NAME *o, TQT_BASE_OBJECT_NAME TQT_BASE_OBJECT_NAME *receiver, const TQCString &slot, bool addCode ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -459,7 +459,7 @@ void MetaDataBase::removeConnection( TQT_BASE_OBJECT_NAME *o, TQObject *sender, TQObject *receiver, const TQCString &slot ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -488,7 +488,7 @@ void MetaDataBase::removeConnection( TQT_BASE_OBJECT_NAME *o, TQObject *sender, void MetaDataBase::setupConnections( TQT_BASE_OBJECT_NAME *o, const TQValueList<LanguageInterface::Connection> &conns ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -506,8 +506,8 @@ void MetaDataBase::setupConnections( TQT_BASE_OBJECT_NAME *o, const TQValueList< cit != conns.end(); ++cit ) { // #### get the correct sender object out of Bla.Blub.sender TQString senderName = (*cit).sender; - if ( senderName.tqfind( '.' ) != -1 ) - senderName = senderName.mid( senderName.tqfindRev( '.' ) + 1 ); + if ( senderName.find( '.' ) != -1 ) + senderName = senderName.mid( senderName.findRev( '.' ) + 1 ); TQObject *sender = 0; if ( formfile->formWindow() ) sender = formfile->formWindow()->child( senderName ); @@ -536,7 +536,7 @@ bool MetaDataBase::hasConnection( TQT_BASE_OBJECT_NAME *o, TQT_BASE_OBJECT_NAME TQT_BASE_OBJECT_NAME *receiver, const TQCString &slot ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -558,7 +558,7 @@ bool MetaDataBase::hasConnection( TQT_BASE_OBJECT_NAME *o, TQT_BASE_OBJECT_NAME TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQT_BASE_OBJECT_NAME *o ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -571,7 +571,7 @@ TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQT_BASE_OBJECT TQT_BASE_OBJECT_NAME *receiver ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -593,7 +593,7 @@ TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQT_BASE_OBJECT TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQT_BASE_OBJECT_NAME *o, TQT_BASE_OBJECT_NAME *object ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -614,7 +614,7 @@ TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQT_BASE_OBJECT void MetaDataBase::doConnections( TQT_BASE_OBJECT_NAME *o ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -657,8 +657,8 @@ void MetaDataBase::doConnections( TQT_BASE_OBJECT_NAME *o ) TQStrList slotList = receiver->tqmetaObject()->slotNames( TRUE ); // avoid warnings - if ( signalList.tqfind( conn.signal ) == -1 || - slotList.tqfind( conn.slot ) == -1 ) + if ( signalList.find( conn.signal ) == -1 || + slotList.find( conn.slot ) == -1 ) continue; TQObject::connect( sender, s, receiver, s2 ); @@ -668,7 +668,7 @@ void MetaDataBase::doConnections( TQT_BASE_OBJECT_NAME *o ) bool MetaDataBase::hasSlot( TQT_BASE_OBJECT_NAME *o, const TQCString &slot, bool onlyCustom ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -677,13 +677,13 @@ bool MetaDataBase::hasSlot( TQT_BASE_OBJECT_NAME *o, const TQCString &slot, bool if ( !onlyCustom ) { TQStrList slotList = TQT_TQOBJECT(o)->tqmetaObject()->slotNames( TRUE ); - if ( slotList.tqfind( slot ) != -1 ) + if ( slotList.find( slot ) != -1 ) return TRUE; if ( ::tqqt_cast<FormWindow*>(o) ) { o = ( (FormWindow*)o )->mainContainer(); slotList = TQT_TQOBJECT(o)->tqmetaObject()->slotNames( TRUE ); - if ( slotList.tqfind( slot ) != -1 ) + if ( slotList.find( slot ) != -1 ) return TRUE; } @@ -712,7 +712,7 @@ bool MetaDataBase::hasSlot( TQT_BASE_OBJECT_NAME *o, const TQCString &slot, bool bool MetaDataBase::isSlotUsed( TQT_BASE_OBJECT_NAME *o, const TQCString &slot ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -733,7 +733,7 @@ void MetaDataBase::addFunction( TQT_BASE_OBJECT_NAME *o, const TQCString &functi const TQString &returnType ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -747,7 +747,7 @@ void MetaDataBase::addFunction( TQT_BASE_OBJECT_NAME *o, const TQCString &functi f.type = type; f.language = language; f.returnType = returnType; - TQValueList<MetaDataBase::Function>::Iterator it = r->functionList.tqfind( f ); + TQValueList<MetaDataBase::Function>::Iterator it = r->functionList.find( f ); if ( it != r->functionList.end() ) r->functionList.remove( it ); r->functionList.append( f ); @@ -757,7 +757,7 @@ void MetaDataBase::addFunction( TQT_BASE_OBJECT_NAME *o, const TQCString &functi void MetaDataBase::setFunctionList( TQT_BASE_OBJECT_NAME *o, const TQValueList<Function> &functionList ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -771,7 +771,7 @@ void MetaDataBase::removeFunction( TQT_BASE_OBJECT_NAME *o, const TQCString &fun const TQString &returnType ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -795,7 +795,7 @@ void MetaDataBase::removeFunction( TQT_BASE_OBJECT_NAME *o, const TQCString &fun void MetaDataBase::removeFunction( TQT_BASE_OBJECT_NAME *o, const TQString &function ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -813,7 +813,7 @@ void MetaDataBase::removeFunction( TQT_BASE_OBJECT_NAME *o, const TQString &func TQValueList<MetaDataBase::Function> MetaDataBase::functionList( TQT_BASE_OBJECT_NAME *o, bool onlyFunctions ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -832,7 +832,7 @@ TQValueList<MetaDataBase::Function> MetaDataBase::functionList( TQT_BASE_OBJECT_ TQValueList<MetaDataBase::Function> MetaDataBase::slotList( TQT_BASE_OBJECT_NAME *o ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -850,7 +850,7 @@ void MetaDataBase::changeFunction( TQT_BASE_OBJECT_NAME *o, const TQString &func const TQString &returnType ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -874,7 +874,7 @@ void MetaDataBase::changeFunctionAttributes( TQT_BASE_OBJECT_NAME *o, const TQSt const TQString &returnType ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -898,7 +898,7 @@ void MetaDataBase::changeFunctionAttributes( TQT_BASE_OBJECT_NAME *o, const TQSt bool MetaDataBase::hasFunction( TQT_BASE_OBJECT_NAME *o, const TQCString &function, bool onlyCustom ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -907,13 +907,13 @@ bool MetaDataBase::hasFunction( TQT_BASE_OBJECT_NAME *o, const TQCString &functi if ( !onlyCustom ) { TQStrList functionList = TQT_TQOBJECT(o)->tqmetaObject()->slotNames( TRUE ); - if ( functionList.tqfind( function ) != -1 ) + if ( functionList.find( function ) != -1 ) return TRUE; if ( ::tqqt_cast<FormWindow*>(o) ) { o = ( (FormWindow*)o )->mainContainer(); functionList = TQT_TQOBJECT(o)->tqmetaObject()->slotNames( TRUE ); - if ( functionList.tqfind( function ) != -1 ) + if ( functionList.find( function ) != -1 ) return TRUE; } @@ -942,7 +942,7 @@ bool MetaDataBase::hasFunction( TQT_BASE_OBJECT_NAME *o, const TQCString &functi TQString MetaDataBase::languageOfFunction( TQT_BASE_OBJECT_NAME *o, const TQCString &function ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1036,7 +1036,7 @@ bool MetaDataBase::hasCustomWidget( const TQString &className ) void MetaDataBase::setTabOrder( TQWidget *w, const TQWidgetList &order ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*) w ); + MetaDataBaseRecord *r = db->find( (void*) w ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", w, w->name(), w->className() ); @@ -1049,7 +1049,7 @@ void MetaDataBase::setTabOrder( TQWidget *w, const TQWidgetList &order ) TQWidgetList MetaDataBase::tabOrder( TQWidget *w ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*) w ); + MetaDataBaseRecord *r = db->find( (void*) w ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", w, w->name(), w->className() ); @@ -1062,7 +1062,7 @@ TQWidgetList MetaDataBase::tabOrder( TQWidget *w ) void MetaDataBase::setIncludes( TQT_BASE_OBJECT_NAME *o, const TQValueList<Include> &incs ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1075,7 +1075,7 @@ void MetaDataBase::setIncludes( TQT_BASE_OBJECT_NAME *o, const TQValueList<Inclu TQValueList<MetaDataBase::Include> MetaDataBase::includes( TQT_BASE_OBJECT_NAME *o ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1088,7 +1088,7 @@ TQValueList<MetaDataBase::Include> MetaDataBase::includes( TQT_BASE_OBJECT_NAME void MetaDataBase::setForwards( TQT_BASE_OBJECT_NAME *o, const TQStringList &fwds ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1101,7 +1101,7 @@ void MetaDataBase::setForwards( TQT_BASE_OBJECT_NAME *o, const TQStringList &fwd TQStringList MetaDataBase::forwards( TQT_BASE_OBJECT_NAME *o ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1114,7 +1114,7 @@ TQStringList MetaDataBase::forwards( TQT_BASE_OBJECT_NAME *o ) void MetaDataBase::setVariables( TQT_BASE_OBJECT_NAME *o, const TQValueList<Variable> &vars ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1127,7 +1127,7 @@ void MetaDataBase::setVariables( TQT_BASE_OBJECT_NAME *o, const TQValueList<Vari void MetaDataBase::addVariable( TQT_BASE_OBJECT_NAME *o, const TQString &name, const TQString &access ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1142,7 +1142,7 @@ void MetaDataBase::addVariable( TQT_BASE_OBJECT_NAME *o, const TQString &name, c void MetaDataBase::removeVariable( TQT_BASE_OBJECT_NAME *o, const TQString &name ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1160,7 +1160,7 @@ void MetaDataBase::removeVariable( TQT_BASE_OBJECT_NAME *o, const TQString &name TQValueList<MetaDataBase::Variable> MetaDataBase::variables( TQT_BASE_OBJECT_NAME *o ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1173,7 +1173,7 @@ TQValueList<MetaDataBase::Variable> MetaDataBase::variables( TQT_BASE_OBJECT_NAM bool MetaDataBase::hasVariable( TQT_BASE_OBJECT_NAME *o, const TQString &name ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1190,7 +1190,7 @@ bool MetaDataBase::hasVariable( TQT_BASE_OBJECT_NAME *o, const TQString &name ) TQString MetaDataBase::extractVariableName( const TQString &name ) { - TQString n = name.right( name.length() - name.tqfindRev( ' ' ) - 1 ); + TQString n = name.right( name.length() - name.findRev( ' ' ) - 1 ); if ( n[ 0 ] == '*' || n[ 0 ] == '&' ) n[ 0 ] = ' '; if ( n[ (int)n.length() - 1 ] == ';' ) @@ -1201,7 +1201,7 @@ TQString MetaDataBase::extractVariableName( const TQString &name ) void MetaDataBase::setSignalList( TQT_BASE_OBJECT_NAME *o, const TQStringList &sigs ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1215,10 +1215,10 @@ void MetaDataBase::setSignalList( TQT_BASE_OBJECT_NAME *o, const TQStringList &s bool hasSemicolon = s.endsWith( ";" ); if ( hasSemicolon ) s = s.left( s.length() - 1 ); - int p = s.tqfind( '(' ); + int p = s.find( '(' ); if ( p < 0 ) p = s.length(); - int sp = s.tqfind( ' ' ); + int sp = s.find( ' ' ); if ( sp >= 0 && sp < p ) { s = s.mid( sp+1 ); p -= sp + 1; @@ -1234,7 +1234,7 @@ void MetaDataBase::setSignalList( TQT_BASE_OBJECT_NAME *o, const TQStringList &s TQStringList MetaDataBase::signalList( TQT_BASE_OBJECT_NAME *o ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1247,7 +1247,7 @@ TQStringList MetaDataBase::signalList( TQT_BASE_OBJECT_NAME *o ) void MetaDataBase::setMetaInfo( TQT_BASE_OBJECT_NAME *o, MetaInfo mi ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1260,7 +1260,7 @@ void MetaDataBase::setMetaInfo( TQT_BASE_OBJECT_NAME *o, MetaInfo mi ) MetaDataBase::MetaInfo MetaDataBase::metaInfo( TQT_BASE_OBJECT_NAME *o ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1306,7 +1306,7 @@ void MetaDataBase::setCursor( TQWidget *w, const TQCursor &c ) ( (PropertyObject*)w )->mdSetCursor( c ); return; } - MetaDataBaseRecord *r = db->tqfind( (void*)w ); + MetaDataBaseRecord *r = db->find( (void*)w ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", w, w->name(), w->className() ); @@ -1321,7 +1321,7 @@ TQCursor MetaDataBase::cursor( TQWidget *w ) setupDataBase(); if ( w->isA( "PropertyObject" ) ) return ( (PropertyObject*)w )->mdCursor(); - MetaDataBaseRecord *r = db->tqfind( (void*)w ); + MetaDataBaseRecord *r = db->find( (void*)w ); if ( !r ) { w->unsetCursor(); return w->cursor(); @@ -1357,7 +1357,7 @@ MetaDataBase::CustomWidget &MetaDataBase::CustomWidget::operator=( const CustomW bool MetaDataBase::CustomWidget::hasSignal( const TQCString &signal ) const { TQStrList sigList = TQWidget::tqstaticMetaObject()->signalNames( TRUE ); - if ( sigList.tqfind( signal ) != -1 ) + if ( sigList.find( signal ) != -1 ) return TRUE; for ( TQValueList<TQCString>::ConstIterator it = lstSignals.begin(); it != lstSignals.end(); ++it ) { if ( normalizeFunction( *it ) == normalizeFunction( signal ) ) @@ -1369,7 +1369,7 @@ bool MetaDataBase::CustomWidget::hasSignal( const TQCString &signal ) const bool MetaDataBase::CustomWidget::hasSlot( const TQCString &slot ) const { TQStrList slotList = TQWidget::tqstaticMetaObject()->slotNames( TRUE ); - if ( slotList.tqfind( normalizeFunction( slot ) ) != -1 ) + if ( slotList.find( normalizeFunction( slot ) ) != -1 ) return TRUE; for ( TQValueList<MetaDataBase::Function>::ConstIterator it = lstSlots.begin(); it != lstSlots.end(); ++it ) { @@ -1382,7 +1382,7 @@ bool MetaDataBase::CustomWidget::hasSlot( const TQCString &slot ) const bool MetaDataBase::CustomWidget::hasProperty( const TQCString &prop ) const { TQStrList propList = TQWidget::tqstaticMetaObject()->propertyNames( TRUE ); - if ( propList.tqfind( prop ) != -1 ) + if ( propList.find( prop ) != -1 ) return TRUE; for ( TQValueList<MetaDataBase::Property>::ConstIterator it = lstProperties.begin(); it != lstProperties.end(); ++it ) { @@ -1397,7 +1397,7 @@ void MetaDataBase::setPixmapArgument( TQT_BASE_OBJECT_NAME *o, int pixmap, const if ( !o ) return; setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1413,14 +1413,14 @@ TQString MetaDataBase::pixmapArgument( TQT_BASE_OBJECT_NAME *o, int pixmap ) if ( !o ) return TQString(); setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); return TQString(); } - return *r->pixmapArguments.tqfind( pixmap ); + return *r->pixmapArguments.find( pixmap ); } void MetaDataBase::clearPixmapArguments( TQT_BASE_OBJECT_NAME *o ) @@ -1428,7 +1428,7 @@ void MetaDataBase::clearPixmapArguments( TQT_BASE_OBJECT_NAME *o ) if ( !o ) return; setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1448,7 +1448,7 @@ void MetaDataBase::setPixmapKey( TQT_BASE_OBJECT_NAME *o, int pixmap, const TQSt ( (PropertyObject*)o )->mdSetPixmapKey( pixmap, arg ); return; } - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1466,21 +1466,21 @@ TQString MetaDataBase::pixmapKey( TQT_BASE_OBJECT_NAME *o, int pixmap ) setupDataBase(); if ( TQT_TQOBJECT(o)->isA( "PropertyObject" ) ) return ( (PropertyObject*)o )->mdPixmapKey( pixmap ); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); return TQString(); } - TQString s = *r->pixmapKeys.tqfind( pixmap ); + TQString s = *r->pixmapKeys.find( pixmap ); if ( !s.isNull() ) return s; if ( !o->isWidgetType() ) return s; TQWidget *w = (TQWidget*)o; if ( w->icon() ) - return *r->pixmapKeys.tqfind( w->icon()->serialNumber() ); + return *r->pixmapKeys.find( w->icon()->serialNumber() ); return s; } @@ -1489,7 +1489,7 @@ void MetaDataBase::clearPixmapKeys( TQT_BASE_OBJECT_NAME *o ) if ( !o ) return; setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1506,7 +1506,7 @@ void MetaDataBase::setColumnFields( TQT_BASE_OBJECT_NAME *o, const TQMap<TQStrin if ( !o ) return; setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1521,7 +1521,7 @@ TQMap<TQString, TQString> MetaDataBase::columnFields( TQT_BASE_OBJECT_NAME *o ) if ( !o ) return TQMap<TQString, TQString>(); setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1538,7 +1538,7 @@ void MetaDataBase::setEditor( const TQStringList &langs ) bool MetaDataBase::hasEditor( const TQString &lang ) { - return editorLangList.tqfind( lang ) != editorLangList.end(); + return editorLangList.find( lang ) != editorLangList.end(); } void MetaDataBase::setupInterfaceManagers( const TQString &plugDir ) @@ -1587,7 +1587,7 @@ void MetaDataBase::setBreakPoints( TQT_BASE_OBJECT_NAME *o, const TQValueList<ui if ( !o ) return; setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1600,8 +1600,8 @@ void MetaDataBase::setBreakPoints( TQT_BASE_OBJECT_NAME *o, const TQValueList<ui while ( it != r->breakPointConditions.end() ) { int line = it.key(); ++it; - if ( r->breakPoints.tqfind( line ) == r->breakPoints.end() ) - r->breakPointConditions.remove( r->breakPointConditions.tqfind( line ) ); + if ( r->breakPoints.find( line ) == r->breakPoints.end() ) + r->breakPointConditions.remove( r->breakPointConditions.find( line ) ); } } @@ -1610,7 +1610,7 @@ TQValueList<uint> MetaDataBase::breakPoints( TQT_BASE_OBJECT_NAME *o ) if ( !o ) return TQValueList<uint>(); setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1625,13 +1625,13 @@ void MetaDataBase::setBreakPointCondition( TQT_BASE_OBJECT_NAME *o, int line, co if ( !o ) return; setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); return; } - r->breakPointConditions.tqreplace( line, condition ); + r->breakPointConditions.replace( line, condition ); } TQString MetaDataBase::breakPointCondition( TQT_BASE_OBJECT_NAME *o, int line ) @@ -1639,13 +1639,13 @@ TQString MetaDataBase::breakPointCondition( TQT_BASE_OBJECT_NAME *o, int line ) if ( !o ) return TQString(); setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); return TQString(); } - TQMap<int, TQString>::Iterator it = r->breakPointConditions.tqfind( line ); + TQMap<int, TQString>::Iterator it = r->breakPointConditions.find( line ); if ( it == r->breakPointConditions.end() ) return TQString(); return *it; @@ -1660,7 +1660,7 @@ void MetaDataBase::setExportMacro( TQT_BASE_OBJECT_NAME *o, const TQString ¯ ( (PropertyObject*)o )->mdSetExportMacro( macro ); return; } - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1677,7 +1677,7 @@ TQString MetaDataBase::exportMacro( TQT_BASE_OBJECT_NAME *o ) setupDataBase(); if ( TQT_TQOBJECT(o)->isA( "PropertyObject" ) ) return ( (PropertyObject*)o )->mdExportMacro(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1689,5 +1689,5 @@ TQString MetaDataBase::exportMacro( TQT_BASE_OBJECT_NAME *o ) bool MetaDataBase::hasObject( TQT_BASE_OBJECT_NAME *o ) { - return !!db->tqfind( o ); + return !!db->find( o ); } diff --git a/tqtinterface/qt4/tools/designer/designer/multilineeditorimpl.cpp b/tqtinterface/qt4/tools/designer/designer/multilineeditorimpl.cpp index d8a1ff2..819712b 100644 --- a/tqtinterface/qt4/tools/designer/designer/multilineeditorimpl.cpp +++ b/tqtinterface/qt4/tools/designer/designer/multilineeditorimpl.cpp @@ -234,7 +234,7 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget mlined->setReadOnly( TRUE ); const TQMetaProperty *wordWrap = mlined->tqmetaObject()->property( - mlined->tqmetaObject()->tqfindProperty( "wordWrap", TRUE ), TRUE ); + mlined->tqmetaObject()->findProperty( "wordWrap", TRUE ), TRUE ); oldWrapMode = 0; oldWrapString = "NoWrap"; if ( wordWrap ) { @@ -323,7 +323,7 @@ void MultiLineEditor::insertTags( const TQString &tag ) { int pfrom, pto, ifrom, ito; TQString tagend( tag.simplifyWhiteSpace() ); - tagend.remove( tagend.tqfind( ' ', 0 ), tagend.length() ); + tagend.remove( tagend.find( ' ', 0 ), tagend.length() ); if ( textEdit->hasSelectedText() ) { textEdit->getSelection( &pfrom, &ifrom, &pto, &ito ); TQString buf = textEdit->selectedText(); diff --git a/tqtinterface/qt4/tools/designer/designer/newformimpl.cpp b/tqtinterface/qt4/tools/designer/designer/newformimpl.cpp index 1192529..92a9b87 100644 --- a/tqtinterface/qt4/tools/designer/designer/newformimpl.cpp +++ b/tqtinterface/qt4/tools/designer/designer/newformimpl.cpp @@ -141,12 +141,12 @@ static void unifyFormName( FormWindow *fw, TQWorkspace *qworkspace ) lst << w->name(); } - if ( lst.tqfindIndex( fw->name() ) == -1 ) + if ( lst.findIndex( fw->name() ) == -1 ) return; TQString origName = fw->name(); TQString n = origName; int i = 1; - while ( lst.tqfindIndex( n ) != -1 ) { + while ( lst.findIndex( n ) != -1 ) { n = origName + TQString::number( i++ ); } fw->setName( n ); @@ -310,7 +310,7 @@ void NewForm::insertTemplates( TQIconView *tView, if ( !fi->isFile() || fi->extension() != "ui" ) continue; TQString name = fi->baseName(); - name = name.tqreplace( '_', ' ' ); + name = name.replace( '_', ' ' ); CustomFormItem *ci = new CustomFormItem( tView, name ); allItems.append( ci ); ci->setDragEnabled( FALSE ); @@ -386,7 +386,7 @@ void NewForm::accept() { if ( !templateView->currentItem() ) return; - Project *pro = MainWindow::self->tqfindProject( projectCombo->currentText() ); + Project *pro = MainWindow::self->findProject( projectCombo->currentText() ); if ( !pro ) return; MainWindow::self->setCurrentProject( pro ); @@ -396,7 +396,7 @@ void NewForm::accept() void NewForm::projectChanged( const TQString &project ) { - Project *pro = MainWindow::self->tqfindProject( project ); + Project *pro = MainWindow::self->findProject( project ); if ( !pro ) return; TQIconViewItem *i; diff --git a/tqtinterface/qt4/tools/designer/designer/outputwindow.cpp b/tqtinterface/qt4/tools/designer/designer/outputwindow.cpp index ef3a943..8bc6ac3 100644 --- a/tqtinterface/qt4/tools/designer/designer/outputwindow.cpp +++ b/tqtinterface/qt4/tools/designer/designer/outputwindow.cpp @@ -187,7 +187,7 @@ ErrorItem::ErrorItem( TQListView *tqparent, TQListViewItem *after, const TQStrin setMultiLinesEnabled( TRUE ); TQString m( message ); type = m.startsWith( "Warning: " ) ? Warning : Error; - m = m.mid( m.tqfind( ':' ) + 1 ); + m = m.mid( m.find( ':' ) + 1 ); setText( 0, type == Error ? "Error" : "Warning" ); setText( 1, m ); setText( 2, TQString::number( line ) ); diff --git a/tqtinterface/qt4/tools/designer/designer/pixmapchooser.cpp b/tqtinterface/qt4/tools/designer/designer/pixmapchooser.cpp index 32b1231..8d0f41e 100644 --- a/tqtinterface/qt4/tools/designer/designer/pixmapchooser.cpp +++ b/tqtinterface/qt4/tools/designer/designer/pixmapchooser.cpp @@ -198,7 +198,7 @@ ImageIconProvider::~ImageIconProvider() const TQPixmap * ImageIconProvider::pixmap( const TQFileInfo &fi ) { TQString ext = fi.extension().upper(); - if ( fmts.tqcontains( ext ) ) { + if ( fmts.contains( ext ) ) { return &imagepm; } else { return TQFileIconProvider::pixmap( fi ); diff --git a/tqtinterface/qt4/tools/designer/designer/pixmapcollectioneditor.ui.h b/tqtinterface/qt4/tools/designer/designer/pixmapcollectioneditor.ui.h index 2dfe556..84c6bcf 100644 --- a/tqtinterface/qt4/tools/designer/designer/pixmapcollectioneditor.ui.h +++ b/tqtinterface/qt4/tools/designer/designer/pixmapcollectioneditor.ui.h @@ -67,7 +67,7 @@ void PixmapCollectionEditor::addPixmap() } updateView(); - TQIconViewItem *item = viewPixmaps->tqfindItem( lastName ); + TQIconViewItem *item = viewPixmaps->findItem( lastName ); if ( item ) { viewPixmaps->setCurrentItem( item ); viewPixmaps->ensureItemVisible( item ); @@ -130,7 +130,7 @@ void PixmapCollectionEditor::setChooserMode( bool c ) void PixmapCollectionEditor::setCurrentItem( const TQString & name ) { - TQIconViewItem *i = viewPixmaps->tqfindItem( name ); + TQIconViewItem *i = viewPixmaps->findItem( name ); if ( i ) { viewPixmaps->setCurrentItem( i ); currentChanged( i ); diff --git a/tqtinterface/qt4/tools/designer/designer/popupmenueditor.cpp b/tqtinterface/qt4/tools/designer/designer/popupmenueditor.cpp index d9d6a17..ee2eadc 100644 --- a/tqtinterface/qt4/tools/designer/designer/popupmenueditor.cpp +++ b/tqtinterface/qt4/tools/designer/designer/popupmenueditor.cpp @@ -232,7 +232,7 @@ bool PopupMenuEditorItem::eventFilter( TQObject * o, TQEvent * event ) TQChildEvent * ce = ( TQChildEvent * ) event; TQObject * c = TQT_TQOBJECT(ce->child()); TQAction * action = ::tqqt_cast<TQAction*>( c ); - if ( s->tqfind( action ) != -1 ) // avoid duplicates + if ( s->find( action ) != -1 ) // avoid duplicates return FALSE; TQActionGroup * actionGroup = ::tqqt_cast<TQActionGroup*>( c ); if ( actionGroup ) @@ -246,7 +246,7 @@ bool PopupMenuEditorItem::eventFilter( TQObject * o, TQEvent * event ) void PopupMenuEditorItem::selfDestruct() { hideMenu(); - int i = m->tqfind( s ); + int i = m->find( s ); if ( i != -1 && i < m->count() ) m->remove( i ); // remove this item a = 0; // the selfDestruct call was caused by the deletion of the action @@ -379,7 +379,7 @@ void PopupMenuEditor::insert( TQActionGroup * actionGroup, int index ) delete l; } -int PopupMenuEditor::tqfind( const TQAction * action ) +int PopupMenuEditor::find( const TQAction * action ) { PopupMenuEditorItem * i = itemList.first(); while ( i ) { @@ -390,7 +390,7 @@ int PopupMenuEditor::tqfind( const TQAction * action ) return -1; } -int PopupMenuEditor::tqfind( PopupMenuEditor * menu ) +int PopupMenuEditor::find( PopupMenuEditor * menu ) { PopupMenuEditorItem * i = itemList.first(); while ( i ) { @@ -419,8 +419,8 @@ void PopupMenuEditor::exchange( int a, int b ) ia == &addItem || ia == &addSeparator || ib == &addItem || ib == &addSeparator ) return; // do nothing - itemList.tqreplace( b, ia ); - itemList.tqreplace( a, ib ); + itemList.replace( b, ia ); + itemList.replace( a, ib ); } void PopupMenuEditor::cut( int index ) @@ -785,7 +785,7 @@ void PopupMenuEditor::mouseMoveEvent( TQMouseEvent * e ) // If the item is dropped in the same list, // we will have two instances of the same pointer // in the list. We use node instead. - int idx = itemList.tqfind( draggedItem ); + int idx = itemList.find( draggedItem ); TQLNode * node = itemList.currentNode(); d->dragCopy(); // dragevents and stuff happens @@ -1228,7 +1228,7 @@ void PopupMenuEditor::dropInPlace( PopupMenuEditorItem * i, int y ) idx++; n = itemList.next(); } - int same = itemList.tqfindRef( i ); + int same = itemList.findRef( i ); AddActionToPopupCommand * cmd = new AddActionToPopupCommand( "Drop Item", formWnd, this, i, idx ); formWnd->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -1409,7 +1409,7 @@ void PopupMenuEditor::leaveEditMode( TQKeyEvent * e ) // new item was created TQAction * a = formWnd->mainWindow()->actioneditor()->newActionEx(); TQString actionText = lineEdit->text(); - actionText.tqreplace("&&", "&"); + actionText.replace("&&", "&"); TQString menuText = lineEdit->text(); a->setText( actionText ); a->setMenuText( menuText ); @@ -1450,18 +1450,18 @@ TQString PopupMenuEditor::constructName( PopupMenuEditorItem *item ) TQWidget *e = parentEditor(); PopupMenuEditor *p = ::tqqt_cast<PopupMenuEditor*>(e); if ( p ) { - int idx = p->tqfind( item->m ); + int idx = p->find( item->m ); PopupMenuEditorItem * i = ( idx > -1 ? p->at( idx ) : 0 ); s = ( i ? TQString( i->action()->name() ).remove( "Action" ) : TQString( "" ) ); } else { MenuBarEditor *b = ::tqqt_cast<MenuBarEditor*>(e); if ( b ) { - int idx = b->tqfindItem( item->m ); + int idx = b->findItem( item->m ); MenuBarEditorItem * i = ( idx > -1 ? b->item( idx ) : 0 ); s = ( i ? i->menuText().lower() : TQString( "" ) ); } } - // tqreplace illegal characters + // replace illegal characters return ( RenameMenuCommand::makeLegal( s ) + RenameMenuCommand::makeLegal( name ) + "Action" ); diff --git a/tqtinterface/qt4/tools/designer/designer/popupmenueditor.h b/tqtinterface/qt4/tools/designer/designer/popupmenueditor.h index df070d9..1015b09 100644 --- a/tqtinterface/qt4/tools/designer/designer/popupmenueditor.h +++ b/tqtinterface/qt4/tools/designer/designer/popupmenueditor.h @@ -124,8 +124,8 @@ public: void insert( PopupMenuEditorItem * item, int index = -1 ); void insert( TQAction * action, int index = -1 ); void insert( TQActionGroup * actionGroup, int index = -1 ); - int tqfind( const TQAction * action ); - int tqfind( PopupMenuEditor * menu ); + int find( const TQAction * action ); + int find( PopupMenuEditor * menu ); int count(); PopupMenuEditorItem * at( int index ); PopupMenuEditorItem * at( TQPoint pos ) { return itemAt( pos.y() ); } @@ -160,7 +160,7 @@ public Q_SLOTS: void paste() { paste( currentIndex ); } void remove( int index ); - void remove( TQAction * a ) { remove( tqfind( a ) ); } + void remove( TQAction * a ) { remove( find( a ) ); } void resizeToContents(); void showSubMenu(); diff --git a/tqtinterface/qt4/tools/designer/designer/project.cpp b/tqtinterface/qt4/tools/designer/designer/project.cpp index fa14e25..5e0ec53 100644 --- a/tqtinterface/qt4/tools/designer/designer/project.cpp +++ b/tqtinterface/qt4/tools/designer/designer/project.cpp @@ -113,12 +113,12 @@ bool DatabaseConnection::open( bool suppressDialog ) #ifndef TQT_NO_SQL // register our name, if nec if ( nm == "(default)" ) { - if ( !TQSqlDatabase::tqcontains() ) // default doesn't exists? + if ( !TQSqlDatabase::contains() ) // default doesn't exists? conn = TQSqlDatabase::addDatabase( drv ); else conn = TQSqlDatabase::database(); } else { - if ( !TQSqlDatabase::tqcontains( nm ) ) + if ( !TQSqlDatabase::contains( nm ) ) conn = TQSqlDatabase::addDatabase( drv, nm ); else conn = TQSqlDatabase::database( nm ); @@ -290,8 +290,8 @@ void Project::setFileName( const TQString &fn, bool doClear ) } - if ( proName.tqcontains( '.' ) ) - proName = proName.left( proName.tqfind( '.' ) ); + if ( proName.contains( '.' ) ) + proName = proName.left( proName.find( '.' ) ); if ( !doClear ) return; @@ -450,7 +450,7 @@ void Project::parse() TQStringList::ConstIterator it; - int i = contents.tqfind( "LANGUAGE" ); + int i = contents.find( "LANGUAGE" ); if ( i != -1 ) { lang = ""; is_cpp = FALSE; @@ -459,7 +459,7 @@ void Project::parse() is_cpp = lang == "C++"; } - i = contents.tqfind( "DBFILE" ); + i = contents.find( "DBFILE" ); if ( i != -1 ) { dbFile = ""; TQString part = contents.mid( i + TQString( "DBFILE" ).length() ); @@ -475,7 +475,7 @@ void Project::parse() } - i = contents.tqfind( "TEMPLATE" ); + i = contents.find( "TEMPLATE" ); if ( i != -1 ) { templ = ""; TQString part = contents.mid( i + TQString( "TEMPLATE" ).length() ); @@ -503,12 +503,12 @@ void Project::parse() updateCustomSettings(); for ( it = csList.begin(); it != csList.end(); ++it ) { - i = contents.tqfind( *it ); + i = contents.find( *it ); if ( i != -1 ) { TQString val = ""; TQString part = contents.mid( i + TQString( *it ).length() ); val = parse_part( part ); - customSettings.tqreplace( *it, val ); + customSettings.replace( *it, val ); } } @@ -537,7 +537,7 @@ void Project::clear() bool Project::removeSourceFile( SourceFile *sf ) { - if ( !sourcefiles.tqcontainsRef( sf ) ) + if ( !sourcefiles.containsRef( sf ) ) return FALSE; if ( !sf->close() ) return FALSE; @@ -601,10 +601,10 @@ TQString Project::makeRelative( const TQString &f ) static void remove_contents( TQString &contents, const TQString &s ) { - int i = contents.tqfind( s ); + int i = contents.find( s ); if ( i != -1 ) { int start = i; - int end = contents.tqfind( '\n', i ); + int end = contents.find( '\n', i ); if ( end == -1 ) end = contents.length() - 1; contents.remove( start, end - start + 1 ); @@ -613,9 +613,9 @@ static void remove_contents( TQString &contents, const TQString &s ) static void remove_multiline_contents( TQString &contents, const TQString &s, int *strt = 0 ) { - int i = contents.tqfind( s ); - int startBrace = contents.tqfindRev("{", i); - int endBrace = contents.tqfindRev("}", i); + int i = contents.find( s ); + int startBrace = contents.findRev("{", i); + int endBrace = contents.findRev("}", i); // We found a startBrace before i, but no endBrace after the startBrace before i if (startBrace != -1 && endBrace < startBrace) return; @@ -745,7 +745,7 @@ void Project::save( bool onlyProjectFile ) TQString key = iface->projectKeyForExtension( TQFileInfo( f->fileName() ).extension() ); TQStringList lst = sourceToKey[ key ]; lst << makeRelative( f->fileName() ); - sourceToKey.tqreplace( key, lst ); + sourceToKey.replace( key, lst ); } for ( TQMap<TQString, TQStringList>::Iterator skit = sourceToKey.begin(); @@ -791,7 +791,7 @@ void Project::save( bool onlyProjectFile ) // custom settings for ( TQStringList::Iterator it = csList.begin(); it != csList.end(); ++it ) { - TQString val = *customSettings.tqfind( *it ); + TQString val = *customSettings.find( *it ); if ( !val.isEmpty() ) contents += *it + "\t= " + val + "\n"; } @@ -1145,7 +1145,7 @@ void Project::setCustomSetting( const TQString &key, const TQString &value ) TQString Project::customSetting( const TQString &key ) const { - return *customSettings.tqfind( key ); + return *customSettings.find( key ); } void Project::updateCustomSettings() @@ -1184,7 +1184,7 @@ void Project::addSourceFile( SourceFile *sf ) } -SourceFile* Project::tqfindSourceFile( const TQString& filename, SourceFile *ignore ) const +SourceFile* Project::findSourceFile( const TQString& filename, SourceFile *ignore ) const { TQPtrListIterator<SourceFile> it(sourcefiles); while ( it.current() ) { @@ -1195,7 +1195,7 @@ SourceFile* Project::tqfindSourceFile( const TQString& filename, SourceFile *ign return 0; } -FormFile* Project::tqfindFormFile( const TQString& filename, FormFile *ignore ) const +FormFile* Project::findFormFile( const TQString& filename, FormFile *ignore ) const { TQPtrListIterator<FormFile> it(formfiles); while ( it.current() ) { @@ -1210,23 +1210,23 @@ void Project::setIncludePath( const TQString &platform, const TQString &path ) { if ( inclPath[platform] == path ) return; - inclPath.tqreplace( platform, path ); + inclPath.replace( platform, path ); modified = TRUE; } void Project::setLibs( const TQString &platform, const TQString &path ) { - lbs.tqreplace( platform, path ); + lbs.replace( platform, path ); } void Project::setDefines( const TQString &platform, const TQString &path ) { - defs.tqreplace( platform, path ); + defs.replace( platform, path ); } void Project::setConfig( const TQString &platform, const TQString &config ) { - cfg.tqreplace( platform, config ); + cfg.replace( platform, config ); } TQString Project::config( const TQString &platform ) const @@ -1273,7 +1273,7 @@ void Project::readPlatformSettings( const TQString &contents, TQString key = platforms[ i ]; if ( key.isEmpty() ) key = "(all)"; - res.tqreplace( key, s ); + res.replace( key, s ); } } @@ -1305,7 +1305,7 @@ void Project::writePlatformSettings( TQString &contents, const TQString &setting TQString key = platforms[ i ]; if ( key.isEmpty() ) key = "(all)"; - TQMap<TQString, TQString>::ConstIterator it = input.tqfind( key ); + TQMap<TQString, TQString>::ConstIterator it = input.find( key ); if ( it == input.end() || (*it).isEmpty() ) continue; contents += p + setting + "\t+= " + *it + "\n\n"; @@ -1321,7 +1321,7 @@ void Project::addFormFile( FormFile *ff ) bool Project::removeFormFile( FormFile *ff ) { - if ( !formfiles.tqcontainsRef( ff ) ) + if ( !formfiles.containsRef( ff ) ) return FALSE; if ( !ff->close() ) return FALSE; @@ -1392,7 +1392,7 @@ TQObjectList Project::objects() const FormFile *Project::fakeFormFileFor( TQObject *o ) const { - return fakeFormFiles.tqfind( (void*)o ); + return fakeFormFiles.find( (void*)o ); } TQObject *Project::objectForFakeForm( FormWindow *fw ) const @@ -1451,14 +1451,14 @@ void Project::addAndEditFunction( const TQString &function, const TQString &func return; iface->functions( f->text(), &funcs ); TQString func = function; - int i = func.tqfind( '(' ); + int i = func.find( '(' ); if ( i != -1 ) func = func.left( i ); bool found = FALSE; for ( TQValueList<LanguageInterface::Function>::Iterator it = funcs.begin(); it != funcs.end(); ++it ) { - if ( (*it).name.left( (*it).name.tqfind( '(' ) ) == func ) { + if ( (*it).name.left( (*it).name.find( '(' ) ) == func ) { found = TRUE; break; } @@ -1503,7 +1503,7 @@ TQString Project::qualifiedName( TQObject *o ) TQObject *p = o->tqparent(); while ( p ) { name.prepend( TQString( p->name() ) + "." ); - if ( objs.tqfindRef( p ) != -1 ) + if ( objs.findRef( p ) != -1 ) break; p = p->tqparent(); } @@ -1587,7 +1587,7 @@ TQString Project::locationOfObject( TQObject *o ) return TQString(); } - TQString s = makeRelative( *qwf_forms->tqfind( (TQWidget*)o ) ); + TQString s = makeRelative( *qwf_forms->find( (TQWidget*)o ) ); s += " [Source]"; return s; } diff --git a/tqtinterface/qt4/tools/designer/designer/project.h b/tqtinterface/qt4/tools/designer/designer/project.h index bb4b8bb..ff39f5e 100644 --- a/tqtinterface/qt4/tools/designer/designer/project.h +++ b/tqtinterface/qt4/tools/designer/designer/project.h @@ -181,12 +181,12 @@ public: TQPtrListIterator<SourceFile> sourceFiles() const { return TQPtrListIterator<SourceFile>(sourcefiles); } void addSourceFile( SourceFile *sf ); bool removeSourceFile( SourceFile *sf ); - SourceFile* tqfindSourceFile( const TQString& filename, SourceFile *ignore = 0 ) const; + SourceFile* findSourceFile( const TQString& filename, SourceFile *ignore = 0 ) const; TQPtrListIterator<FormFile> formFiles() const { return TQPtrListIterator<FormFile>(formfiles); } void addFormFile( FormFile *ff ); bool removeFormFile( FormFile *ff ); - FormFile* tqfindFormFile( const TQString& filename, FormFile *ignore = 0 ) const; + FormFile* findFormFile( const TQString& filename, FormFile *ignore = 0 ) const; void setIncludePath( const TQString &platform, const TQString &path ); void setLibs( const TQString &platform, const TQString &path ); diff --git a/tqtinterface/qt4/tools/designer/designer/propertyeditor.cpp b/tqtinterface/qt4/tools/designer/designer/propertyeditor.cpp index c74d2a3..c93201d 100644 --- a/tqtinterface/qt4/tools/designer/designer/propertyeditor.cpp +++ b/tqtinterface/qt4/tools/designer/designer/propertyeditor.cpp @@ -562,7 +562,7 @@ void PropertyItem::setText( int col, const TQString &t ) { TQString txt( t ); if ( col == 1 ) - txt = txt.tqreplace( "\n", " " ); + txt = txt.replace( "\n", " " ); TQListViewItem::setText( col, txt ); } @@ -2737,7 +2737,7 @@ void EnumBox::mousePressEvent( TQMouseEvent *e ) arrowRect.setHeight( TQMAX( height() - (2 * arrowRect.y()), arrowRect.height() ) ); - if ( arrowRect.tqcontains( e->pos() ) ) { + if ( arrowRect.contains( e->pos() ) ) { arrowDown = TRUE; tqrepaint( FALSE ); } @@ -2836,7 +2836,7 @@ void PropertyEnumItem::setValue() enumString += "|" + (*it).key; } if ( !enumString.isEmpty() ) - enumString.tqreplace( 0, 1, "" ); + enumString.replace( 0, 1, "" ); box->setText( enumString ); setText( 1, enumString ); @@ -2859,7 +2859,7 @@ void PropertyEnumItem::setCurrentValues( TQStrList lst ) } } if ( !enumString.isEmpty() ) - enumString.tqreplace( 0, 1, "" ); + enumString.replace( 0, 1, "" ); box->setText( enumString ); setText( 1, enumString ); } @@ -3041,10 +3041,10 @@ void PropertyList::setupProperties() for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) { const TQMetaProperty* p = editor->widget()->tqmetaObject()-> - property( editor->widget()->tqmetaObject()->tqfindProperty( it.current(), allProperties), allProperties ); + property( editor->widget()->tqmetaObject()->findProperty( it.current(), allProperties), allProperties ); if ( !p ) continue; - if ( unique.tqcontains( TQString::tqfromLatin1( it.current() ) ) ) + if ( unique.contains( TQString::tqfromLatin1( it.current() ) ) ) continue; if ( ::tqqt_cast<TQDesignerToolBar*>(editor->widget()) || ::tqqt_cast<MenuBarEditor*>(editor->widget()) ) { @@ -3215,7 +3215,7 @@ void PropertyList::setupProperties() } } if ( item && !p->isSetType() ) { - if ( valueSet.tqfindIndex( item->name() ) == -1 ) { + if ( valueSet.findIndex( item->name() ) == -1 ) { setPropertyValue( item ); valueSet << item->name(); } @@ -3328,7 +3328,7 @@ void PropertyList::setupCusWidgetProperties( MetaDataBase::CustomWidget *cw, for ( TQValueList<MetaDataBase::Property>::Iterator it = cw->lstProperties.begin(); it != cw->lstProperties.end(); ++it ) { - if ( unique.tqcontains( TQString( (*it).property ) ) ) + if ( unique.contains( TQString( (*it).property ) ) ) continue; unique.insert( TQString( (*it).property ), TRUE ); addPropertyItem( item, (*it).property, (QVariant::Type)(int)type_to_variant( (*it).type ) ); @@ -3348,7 +3348,7 @@ bool PropertyList::addPropertyItem( PropertyItem *&item, const TQCString &name, l << ""; while ( it.current() ) { if ( editor->formWindow()->canBeBuddy( it.current() ) ) { - if ( l.tqfind( it.current()->name() ) == l.end() ) + if ( l.find( it.current()->name() ) == l.end() ) l << it.current()->name(); } ++it; @@ -3668,9 +3668,9 @@ static void clearAlignList( TQStrList &l ) { if ( l.count() == 1 ) return; - if ( l.tqfind( "AlignAuto" ) != -1 ) + if ( l.find( "AlignAuto" ) != -1 ) l.remove( "AlignAuto" ); - if ( l.tqfind( "WordBreak" ) != -1 ) + if ( l.find( "WordBreak" ) != -1 ) l.remove( "WordBreak" ); } @@ -3682,12 +3682,12 @@ void PropertyList::setPropertyValue( PropertyItem *i ) { const TQMetaProperty *p = editor->widget()->tqmetaObject()-> - property( editor->widget()->tqmetaObject()->tqfindProperty( i->name(), TRUE), TRUE ); + property( editor->widget()->tqmetaObject()->findProperty( i->name(), TRUE), TRUE ); if ( !p ) { if ( i->name() == "hAlign" ) { int align = editor->widget()->property( "tqalignment" ).toInt(); p = editor->widget()->tqmetaObject()-> - property( editor->widget()->tqmetaObject()->tqfindProperty( "tqalignment", TRUE ), TRUE ); + property( editor->widget()->tqmetaObject()->findProperty( "tqalignment", TRUE ), TRUE ); align &= ~Qt::AlignVertical_Mask; TQStrList l = p->valueToKeys( align ); clearAlignList( l ); @@ -3695,7 +3695,7 @@ void PropertyList::setPropertyValue( PropertyItem *i ) } else if ( i->name() == "vAlign" ) { int align = editor->widget()->property( "tqalignment" ).toInt(); p = editor->widget()->tqmetaObject()-> - property( editor->widget()->tqmetaObject()->tqfindProperty( "tqalignment", TRUE ), TRUE ); + property( editor->widget()->tqmetaObject()->findProperty( "tqalignment", TRUE ), TRUE ); align &= ~Qt::AlignHorizontal_Mask; ( (PropertyListItem*)i )->setCurrentItem( p->valueToKeys( align ).last() ); } else if ( i->name() == "wordwrap" ) { @@ -3859,7 +3859,7 @@ TQString PropertyList::whatsThisText( TQListViewItem *i ) TQString s; s = TQString( mo->className() ) + "::" + prop; TQMap<TQString, TQString>::Iterator it; - if ( ( it = propertyDocs.tqfind( s ) ) != propertyDocs.end() ) { + if ( ( it = propertyDocs.find( s ) ) != propertyDocs.end() ) { return *it; } mo = mo->tqsuperClass(); @@ -3918,15 +3918,15 @@ EventList::EventList( TQWidget *tqparent, FormWindow *fw, PropertyEditor *e ) TQString clean_arguments( const TQString &s ) { TQString slot = s; - TQString arg = slot.mid( slot.tqfind( '(' ) + 1 ); - arg = arg.left( arg.tqfindRev( ')' ) ); + TQString arg = slot.mid( slot.find( '(' ) + 1 ); + arg = arg.left( arg.findRev( ')' ) ); TQStringList args = TQStringList::split( ',', arg ); - slot = slot.left( slot.tqfind( '(' ) + 1 ); + slot = slot.left( slot.find( '(' ) + 1 ); int num = 0; for ( TQStringList::Iterator it = args.begin(); it != args.end(); ++it, ++num ) { TQString a = *it; int i; - if ( ( i =a.tqfind( ':' ) ) == -1 ) + if ( ( i =a.find( ':' ) ) == -1 ) slot += a.simplifyWhiteSpace(); else slot += a.mid( i + 1 ).simplifyWhiteSpace(); @@ -3982,7 +3982,7 @@ void EventList::contentsMouseDoubleClickEvent( TQMouseEvent *e ) TQString s; if ( !formWindow->project()->isCpp() ) { TQString s1 = i->text( 0 ); - int pt = s1.tqfind( "(" ); + int pt = s1.find( "(" ); if ( pt != -1 ) s1 = s1.left( pt ); s = TQString( editor->widget()->name() ) + "_" + s1; @@ -4018,7 +4018,7 @@ void EventList::showRMBMenu( TQListViewItem *i, const TQPoint &pos ) TQString s; if ( !formWindow->project()->isCpp() ) { TQString s1 = ( i->tqparent() ? i->tqparent() : i )->text( 0 ); - int pt = s1.tqfind( "(" ); + int pt = s1.find( "(" ); if ( pt != -1 ) s1 = s1.left( pt ); s = TQString( editor->widget()->name() ) + "_" + s1; @@ -4073,9 +4073,9 @@ void EventList::renamed( TQListViewItem *i ) // #### we should look if the specified slot already // exists and if we can connect to this one TQString funcname = i->text( 0 ).latin1(); - if ( funcname.tqfind( '(' ) == -1 ) { // try to create a signature + if ( funcname.find( '(' ) == -1 ) { // try to create a signature TQString sig = i->tqparent()->text( 0 ); - sig = sig.mid( sig.tqfind( '(' ) + 1 ); + sig = sig.mid( sig.find( '(' ) + 1 ); sig.remove( (int)sig.length() - 1, 1 ); LanguageInterface *iface = MetaDataBase::languageInterface( formWindow->project()->language() ); if ( iface ) @@ -4085,7 +4085,7 @@ void EventList::renamed( TQListViewItem *i ) MetaDataBase::addFunction( formWindow, funcname.latin1(), "virtual", "public", "slot", formWindow->project()->language(), "void" ); editor->formWindow()->mainWindow()-> - editFunction( i->text( 0 ).left( i->text( 0 ).tqfind( "(" ) ), TRUE ); + editFunction( i->text( 0 ).left( i->text( 0 ).find( "(" ) ), TRUE ); cmd->execute(); editor->formWindow()->mainWindow()->objectHierarchy()->updateFormDefinitionView(); editor->formWindow()->formFile()->setModified( TRUE ); @@ -4108,7 +4108,7 @@ void EventList::save( TQListViewItem *p ) \class PropertyEditor propertyeditor.h \brief PropertyEdior toplevel window - This is the toplevel window of the property editor which tqcontains a + This is the toplevel window of the property editor which contains a listview for editing properties. */ @@ -4252,7 +4252,7 @@ TQString PropertyEditor::classOfCurrentProperty() const TQMetaObject *mo = o->tqmetaObject(); while ( mo ) { TQStrList props = mo->propertyNames( FALSE ); - if ( props.tqfind( curr.latin1() ) != -1 ) + if ( props.find( curr.latin1() ) != -1 ) return mo->className(); mo = mo->tqsuperClass(); } diff --git a/tqtinterface/qt4/tools/designer/designer/qcompletionedit.cpp b/tqtinterface/qt4/tools/designer/designer/qcompletionedit.cpp index 6c19964..0439dcb 100644 --- a/tqtinterface/qt4/tools/designer/designer/qcompletionedit.cpp +++ b/tqtinterface/qt4/tools/designer/designer/qcompletionedit.cpp @@ -187,7 +187,7 @@ bool TQCompletionEdit::eventFilter( TQObject *o, TQEvent *e ) void TQCompletionEdit::addCompletionEntry( const TQString &entry ) { - if ( compList.tqfind( entry ) == compList.end() ) { + if ( compList.find( entry ) == compList.end() ) { compList << entry; compList.sort(); } @@ -195,7 +195,7 @@ void TQCompletionEdit::addCompletionEntry( const TQString &entry ) void TQCompletionEdit::removeCompletionEntry( const TQString &entry ) { - TQStringList::Iterator it = compList.tqfind( entry ); + TQStringList::Iterator it = compList.find( entry ); if ( it != compList.end() ) compList.remove( it ); } diff --git a/tqtinterface/qt4/tools/designer/designer/replacedialog.ui.h b/tqtinterface/qt4/tools/designer/designer/replacedialog.ui.h index 74fa7cb..08a86fc 100644 --- a/tqtinterface/qt4/tools/designer/designer/replacedialog.ui.h +++ b/tqtinterface/qt4/tools/designer/designer/replacedialog.ui.h @@ -51,7 +51,7 @@ void ReplaceDialog::doReplace() if ( !editor ) return; - if ( !editor->tqreplace( comboFind->currentText(), comboReplace->currentText(), checkCase->isChecked(), + if ( !editor->replace( comboFind->currentText(), comboReplace->currentText(), checkCase->isChecked(), checkWords->isChecked(), radioForward->isChecked(), !checkBegin->isChecked(), FALSE ) ) checkBegin->setChecked( TRUE ); else @@ -63,7 +63,7 @@ void ReplaceDialog::doReplaceAll() if ( !editor ) return; - if ( !editor->tqreplace( comboFind->currentText(), comboReplace->currentText(), checkCase->isChecked(), + if ( !editor->replace( comboFind->currentText(), comboReplace->currentText(), checkCase->isChecked(), checkWords->isChecked(), radioForward->isChecked(), !checkBegin->isChecked(), TRUE ) ) checkBegin->setChecked( TRUE ); else diff --git a/tqtinterface/qt4/tools/designer/designer/resource.cpp b/tqtinterface/qt4/tools/designer/designer/resource.cpp index 053c155..8ceca37 100644 --- a/tqtinterface/qt4/tools/designer/designer/resource.cpp +++ b/tqtinterface/qt4/tools/designer/designer/resource.cpp @@ -98,12 +98,12 @@ static TQString makeIndent( int indent ) static TQString entitize( const TQString &s, bool attribute = FALSE ) { TQString s2 = s; - s2 = s2.tqreplace( "&", "&" ); - s2 = s2.tqreplace( ">", ">" ); - s2 = s2.tqreplace( "<", "<" ); + s2 = s2.replace( "&", "&" ); + s2 = s2.replace( ">", ">" ); + s2 = s2.replace( "<", "<" ); if ( attribute ) { - s2 = s2.tqreplace( "\"", """ ); - s2 = s2.tqreplace( "'", "'" ); + s2 = s2.replace( "\"", """ ); + s2 = s2.replace( "'", "'" ); } return s2; } @@ -238,7 +238,7 @@ static TQString platformNeutralKeySequence(const TQKeySequence &ks) } ++i; } - // If we can't tqfind the actual translatable keyname, + // If we can't find the actual translatable keyname, // fall back on the tqunicode representation of it... // Or else characters like Key_aring may not get displayed // ( Really depends on you locale ) @@ -743,7 +743,7 @@ TQString Resource::copy() TQWidget *p = w->parentWidget(); bool save = TRUE; while ( p ) { - if ( tmp.tqfindRef( p ) != -1 ) { + if ( tmp.findRef( p ) != -1 ) { save = FALSE; break; } @@ -848,7 +848,7 @@ void Resource::saveObject( TQT_BASE_OBJECT_NAME *bobj, TQDesignerGridLayout* gri includeHints << WidgetDatabase::includeFile( classID ); } - if ( TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(formwindow) && !formwindow->widgets()->tqfind( (TQWidget*)obj ) ) + if ( TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(formwindow) && !formwindow->widgets()->find( (TQWidget*)obj ) ) return; // we don't know anything about this thing TQString attributes; @@ -1238,7 +1238,7 @@ void Resource::saveItems( TQT_BASE_OBJECT_NAME *bobj, TQTextStream &ts, int inde if ( isDataTable && !columnFields.isEmpty() ) { ts << makeIndent( indent ) << "<property name=\"field\">" << endl; indent++; - ts << makeIndent( indent ) << "<string>" << entitize( *columnFields.tqfind( l[ 0 ] ) ) << "</string>" << endl; + ts << makeIndent( indent ) << "<string>" << entitize( *columnFields.find( l[ 0 ] ) ) << "</string>" << endl; indent--; ts << makeIndent( indent ) << "</property>" << endl; } @@ -1424,9 +1424,9 @@ void Resource::saveObjectProperties( TQT_BASE_OBJECT_NAME *bobj, TQTextStream &t changed = MetaDataBase::changedProperties( w ); if ( w->isWidgetType() ) { if ( ::tqqt_cast<Spacer*>(w) ) { - if ( !changed.tqcontains( "tqsizeHint" ) ) + if ( !changed.contains( "tqsizeHint" ) ) changed << "tqsizeHint"; - if ( !changed.tqcontains( "geometry" ) ) + if ( !changed.contains( "geometry" ) ) changed << "geometry"; } else { TQToolButton *tb = ::tqqt_cast<TQToolButton*>(w); @@ -1445,9 +1445,9 @@ void Resource::saveObjectProperties( TQT_BASE_OBJECT_NAME *bobj, TQTextStream &t } if ( TQT_BASE_OBJECT(w) == TQT_BASE_OBJECT(formwindow->mainContainer()) ) { - if ( changed.tqfindIndex( "geometry" ) == -1 ) + if ( changed.findIndex( "geometry" ) == -1 ) changed << "geometry"; - if ( changed.tqfindIndex( "caption" ) == -1 ) + if ( changed.findIndex( "caption" ) == -1 ) changed << "caption"; } @@ -1459,13 +1459,13 @@ void Resource::saveObjectProperties( TQT_BASE_OBJECT_NAME *bobj, TQTextStream &t TQStrList lst = w->tqmetaObject()->propertyNames( !::tqqt_cast<Spacer*>(w) ); for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) { - if ( changed.tqfind( TQString::tqfromLatin1( it.current() ) ) == changed.end() ) + if ( changed.find( TQString::tqfromLatin1( it.current() ) ) == changed.end() ) continue; - if ( saved.tqfind( TQString::tqfromLatin1( it.current() ) ) != saved.end() ) + if ( saved.find( TQString::tqfromLatin1( it.current() ) ) != saved.end() ) continue; saved << TQString::tqfromLatin1( it.current() ); const TQMetaProperty* p = w->tqmetaObject()-> - property( w->tqmetaObject()->tqfindProperty( it.current(), TRUE ), TRUE ); + property( w->tqmetaObject()->findProperty( it.current(), TRUE ), TRUE ); if ( !p || !p->stored( w ) || ( inLayout && qstrcmp( p->name(), "geometry" ) == 0 ) ) continue; if ( ::tqqt_cast<TQLabel*>(w) && qstrcmp( p->name(), "pixmap" ) == 0 && @@ -1522,7 +1522,7 @@ void Resource::saveObjectProperties( TQT_BASE_OBJECT_NAME *bobj, TQTextStream &t void Resource::saveSetProperty( TQT_BASE_OBJECT_NAME *bobj, const TQString &name, TQVariant::Type, TQTextStream &ts, int indent ) { TQObject* w = TQT_TQOBJECT(bobj); - const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( name, TRUE ), TRUE ); + const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( name, TRUE ), TRUE ); TQStrList l( p->valueToKeys( w->property( name ).toInt() ) ); TQString v; for ( uint i = 0; i < l.count(); ++i ) { @@ -1536,7 +1536,7 @@ void Resource::saveSetProperty( TQT_BASE_OBJECT_NAME *bobj, const TQString &name void Resource::saveEnumProperty( TQT_BASE_OBJECT_NAME *bobj, const TQString &name, TQVariant::Type, TQTextStream &ts, int indent ) { TQObject* w = TQT_TQOBJECT(bobj); - const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( name, TRUE ), TRUE ); + const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( name, TRUE ), TRUE ); int value = w->property( name ).toInt(); const char* key = p->valueToKey( value ); if (key) @@ -1553,7 +1553,7 @@ void Resource::saveProperty( TQT_BASE_OBJECT_NAME *bobj, const TQString &name, c uint unum; double dob; TQString comment; - if ( w && formwindow->widgets()->tqfind( (TQWidget*)w ) || formwindow->actionList().tqfind( (TQAction*)w ) ) + if ( w && formwindow->widgets()->find( (TQWidget*)w ) || formwindow->actionList().find( (TQAction*)w ) ) comment = MetaDataBase::propertyComment( w, name ); switch ( t ) { case TQVariant::String: @@ -2182,7 +2182,7 @@ TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *tqparent, TQL void Resource::setObjectProperty( TQT_BASE_OBJECT_NAME* bobj, const TQString &prop, const TQDomElement &e ) { TQObject* obj = TQT_TQOBJECT(bobj); - const TQMetaProperty *p = obj->tqmetaObject()->property( obj->tqmetaObject()->tqfindProperty( prop, TRUE ), TRUE ); + const TQMetaProperty *p = obj->tqmetaObject()->property( obj->tqmetaObject()->findProperty( prop, TRUE ), TRUE ); if ( !::tqqt_cast<TQLayout*>(obj) ) {// no layouts in metadatabase... (RS) if ( obj->inherits( "CustomWidget" ) ) { @@ -2443,7 +2443,7 @@ static TQImage loadImageData( TQDomElement &n2 ) ba[2] = ( len & 0x0000ff00 ) >> 8; ba[3] = ( len & 0x000000ff ); TQByteArray baunzip = tqUncompress( ba, baSize ); - img.loadFromData( (const uchar*)baunzip.data(), baunzip.size(), format.left(format.tqfind('.')) ); + img.loadFromData( (const uchar*)baunzip.data(), baunzip.size(), format.left(format.find('.')) ); } else { img.loadFromData( (const uchar*)ba+lengthOffset, baSize-lengthOffset, format ); } @@ -2490,9 +2490,9 @@ void Resource::saveConnections( TQTextStream &ts, int indent ) TQValueList<MetaDataBase::Connection>::Iterator it = connections.begin(); for ( ; it != connections.end(); ++it ) { MetaDataBase::Connection conn = *it; - if ( ( knownNames.tqfindIndex( TQString( conn.sender->name() ) ) == -1 && + if ( ( knownNames.findIndex( TQString( conn.sender->name() ) ) == -1 && qstrcmp( conn.sender->name(), "this" ) != 0 ) || - ( knownNames.tqfindIndex( TQString( conn.receiver->name() ) ) == -1 && + ( knownNames.findIndex( TQString( conn.receiver->name() ) ) == -1 && qstrcmp( conn.receiver->name(), "this" ) != 0 ) ) continue; if ( formwindow->isMainContainer( (TQWidget*)(*it).receiver ) && @@ -2551,7 +2551,7 @@ void Resource::loadConnections( const TQDomElement &e ) l = 0; } if ( !conn.sender ) - conn.sender = formwindow->tqfindAction( name ); + conn.sender = formwindow->findAction( name ); } } else if ( n2.tagName() == "signal" ) { conn.signal = n2.firstChild().toText().data(); @@ -2569,7 +2569,7 @@ void Resource::loadConnections( const TQDomElement &e ) l = 0; } if ( !conn.receiver ) - conn.receiver = formwindow->tqfindAction( name ); + conn.receiver = formwindow->findAction( name ); } } else if ( n2.tagName() == "slot" ) { conn.slot = n2.firstChild().toText().data(); @@ -2620,7 +2620,7 @@ void Resource::saveCustomWidgets( TQTextStream &ts, int indent ) TQPtrList<MetaDataBase::CustomWidget> *lst = MetaDataBase::customWidgets(); for ( MetaDataBase::CustomWidget *w = lst->first(); w; w = lst->next() ) { - if ( usedCustomWidgets.tqfindIndex( w->className ) == -1 ) + if ( usedCustomWidgets.findIndex( w->className ) == -1 ) continue; ts << makeIndent( indent ) << "<customwidget>" << endl; indent++; @@ -2755,7 +2755,7 @@ void Resource::saveTabOrder( TQTextStream &ts, int indent ) indent++; for ( TQWidget *w = l.first(); w; w = l.next() ) { - if ( w->testWState( TQt::WState_ForceHide ) || knownNames.tqfindIndex( w->name() ) == -1 ) + if ( w->testWState( TQt::WState_ForceHide ) || knownNames.findIndex( w->name() ) == -1 ) continue; ts << makeIndent( indent ) << "<tabstop>" << w->name() << "</tabstop>" << endl; } @@ -3215,7 +3215,7 @@ void Resource::loadToolBars( const TQDomElement &e ) TQDomElement n2 = n.firstChild().toElement(); while ( !n2.isNull() ) { if ( n2.tagName() == "action" ) { - TQAction *a = formwindow->tqfindAction( n2.attribute( "name" ) ); + TQAction *a = formwindow->findAction( n2.attribute( "name" ) ); if ( a ) { a->addTo( tb ); tb->addAction( a ); @@ -3269,12 +3269,12 @@ void Resource::loadPopupMenu( PopupMenuEditor *p, const TQDomElement &e ) TQAction *a = 0; while ( !n.isNull() ) { if ( n.tagName() == "action" || n.tagName() == "actiongroup") { - a = formwindow->tqfindAction( n.attribute( "name" ) ); + a = formwindow->findAction( n.attribute( "name" ) ); if ( a ) p->insert( a ); } if ( n.tagName() == "item" ) { - PopupMenuEditorItem *i = p->at( p->tqfind( a ) ); + PopupMenuEditorItem *i = p->at( p->find( a ) ); if ( i ) { TQString name = n.attribute( "name" ); formwindow->unify( i, name, TRUE ); diff --git a/tqtinterface/qt4/tools/designer/designer/sourcefile.cpp b/tqtinterface/qt4/tools/designer/designer/sourcefile.cpp index 747822f..79a7353 100644 --- a/tqtinterface/qt4/tools/designer/designer/sourcefile.cpp +++ b/tqtinterface/qt4/tools/designer/designer/sourcefile.cpp @@ -191,10 +191,10 @@ TQString SourceFile::createUnnamedFileName( const TQString &extension ) extensionCounter = new TQMap<TQString, int>; int count = -1; TQMap<TQString, int>::Iterator it; - if ( ( it = extensionCounter->tqfind( extension ) ) != extensionCounter->end() ) { + if ( ( it = extensionCounter->find( extension ) ) != extensionCounter->end() ) { count = *it; ++count; - extensionCounter->tqreplace( extension, count ); + extensionCounter->replace( extension, count ); } else { count = 1; extensionCounter->insert( extension, count ); @@ -279,10 +279,10 @@ void SourceFile::checkTimeStamp() bool SourceFile::checkFileName( bool allowBreak ) { - SourceFile *sf = pro->tqfindSourceFile( filename, this ); + SourceFile *sf = pro->findSourceFile( filename, this ); if ( sf ) TQMessageBox::warning( MainWindow::self, tr( "Invalid Filename" ), - tr( "The project already tqcontains a source file with \n" + tr( "The project already contains a source file with \n" "filename '%1'. Please choose a new filename." ).arg( filename ) ); while ( sf ) { LanguageInterface *iface = MetaDataBase::languageInterface( pro->language() ); @@ -296,7 +296,7 @@ bool SourceFile::checkFileName( bool allowBreak ) return FALSE; } filename = pro->makeRelative( fn ); - sf = pro->tqfindSourceFile( filename, this ); + sf = pro->findSourceFile( filename, this ); } return TRUE; } diff --git a/tqtinterface/qt4/tools/designer/designer/startdialogimpl.cpp b/tqtinterface/qt4/tools/designer/designer/startdialogimpl.cpp index 8d342f4..f736f78 100644 --- a/tqtinterface/qt4/tools/designer/designer/startdialogimpl.cpp +++ b/tqtinterface/qt4/tools/designer/designer/startdialogimpl.cpp @@ -59,7 +59,7 @@ void StartDialog::accept() if( !tabindex ) { if ( !templateView->currentItem() ) return; - Project *pro = MainWindow::self->tqfindProject( tr( "<No Project>" ) ); + Project *pro = MainWindow::self->findProject( tr( "<No Project>" ) ); if ( !pro ) return; MainWindow::self->setCurrentProject( pro ); diff --git a/tqtinterface/qt4/tools/designer/designer/tableeditorimpl.cpp b/tqtinterface/qt4/tools/designer/designer/tableeditorimpl.cpp index 1247f5e..af20d20 100644 --- a/tqtinterface/qt4/tools/designer/designer/tableeditorimpl.cpp +++ b/tqtinterface/qt4/tools/designer/designer/tableeditorimpl.cpp @@ -165,11 +165,11 @@ void TableEditor::currentColumnChanged( TQListBoxItem *i ) #ifndef TQT_NO_SQL if ( ::tqqt_cast<TQDataTable*>(editTable) ) { - TQString s = *fieldMap.tqfind( listColumns->index( i ) ); + TQString s = *fieldMap.find( listColumns->index( i ) ); if ( s.isEmpty() ) comboFields->setCurrentItem( 0 ); - else if ( comboFields->listBox()->tqfindItem( s ) ) - comboFields->setCurrentItem( comboFields->listBox()->index( comboFields->listBox()->tqfindItem( s ) ) ); + else if ( comboFields->listBox()->findItem( s ) ) + comboFields->setCurrentItem( comboFields->listBox()->index( comboFields->listBox()->findItem( s ) ) ); else comboFields->lineEdit()->setText( s ); } @@ -241,7 +241,7 @@ void TableEditor::newColumnClicked() m.insert( table->horizontalHeader()->label( i ), TRUE ); int n = table->numCols() - 1; TQString t = TQString::number( n ); - while ( m.tqfind( t ) != m.end() ) + while ( m.find( t ) != m.end() ) t = TQString::number( ++n ); table->horizontalHeader()->setLabel( table->numCols() - 1, t ); listColumns->insertItem( t ); @@ -269,7 +269,7 @@ void TableEditor::newRowClicked() m.insert( table->verticalHeader()->label( i ), TRUE ); int n = table->numRows() - 1; TQString t = TQString::number( n ); - while ( m.tqfind( t ) != m.end() ) + while ( m.find( t ) != m.end() ) t = TQString::number( ++n ); table->verticalHeader()->setLabel( table->numRows() - 1, t ); listRows->insertItem( t ); @@ -340,7 +340,7 @@ void TableEditor::applyClicked() col.text = table->horizontalHeader()->label( i ); if ( table->horizontalHeader()->iconSet( i ) ) col.pix = table->horizontalHeader()->iconSet( i )->pixmap(); - col.field = *fieldMap.tqfind( i ); + col.field = *fieldMap.find( i ); cols.append( col ); } for ( i = 0; i < table->verticalHeader()->count(); ++i ) { @@ -430,7 +430,7 @@ void TableEditor::readFromTable() table->horizontalHeader()->setLabel( i, editTable->horizontalHeader()->label( i ) ); listColumns->insertItem( editTable->horizontalHeader()->label( i ) ); } - TQString cf = *columnFields.tqfind( editTable->horizontalHeader()->label( i ) ); + TQString cf = *columnFields.find( editTable->horizontalHeader()->label( i ) ); fieldMap.insert( i, cf ); } diff --git a/tqtinterface/qt4/tools/designer/designer/variabledialogimpl.cpp b/tqtinterface/qt4/tools/designer/designer/variabledialogimpl.cpp index e84a332..312fcb7 100644 --- a/tqtinterface/qt4/tools/designer/designer/variabledialogimpl.cpp +++ b/tqtinterface/qt4/tools/designer/designer/variabledialogimpl.cpp @@ -69,7 +69,7 @@ VariableDialog::~VariableDialog() void VariableDialog::setCurrentItem( TQString text ) { - TQListViewItem *i = varView->tqfindItem( text, 0 ); + TQListViewItem *i = varView->findItem( text, 0 ); if ( i ) varView->setCurrentItem( i ); } diff --git a/tqtinterface/qt4/tools/designer/designer/widgetfactory.cpp b/tqtinterface/qt4/tools/designer/designer/widgetfactory.cpp index 84ccb85..edd455f 100644 --- a/tqtinterface/qt4/tools/designer/designer/widgetfactory.cpp +++ b/tqtinterface/qt4/tools/designer/designer/widgetfactory.cpp @@ -103,7 +103,7 @@ #include <globaldefs.h> #include <tqobject.h> -FormWindow *tqfind_formwindow( TQWidget *w ) +FormWindow *find_formwindow( TQWidget *w ) { if ( !w ) return 0; @@ -219,7 +219,7 @@ bool TQDesignerTabWidget::eventFilter( TQObject *o, TQEvent *e ) int index = 0; TQRect rect; for ( ; index < tabBar()->count(); index++ ) { - if ( tabBar()->tabAt( index )->rect().tqcontains( de->pos() ) ) { + if ( tabBar()->tabAt( index )->rect().contains( de->pos() ) ) { rect = tabBar()->tabAt( index )->rect(); break; } @@ -228,7 +228,7 @@ bool TQDesignerTabWidget::eventFilter( TQObject *o, TQEvent *e ) if ( index == tabBar()->count() -1 ) { TQRect rect2 = rect; rect2.setLeft( rect2.left() + rect2.width() / 2 ); - if ( rect2.tqcontains( de->pos() ) ) + if ( rect2.contains( de->pos() ) ) index++; } @@ -256,24 +256,24 @@ bool TQDesignerTabWidget::eventFilter( TQObject *o, TQEvent *e ) int newIndex = 0; for ( ; newIndex < tabBar()->count(); newIndex++ ) { - if ( tabBar()->tabAt( newIndex )->rect().tqcontains( de->pos() ) ) + if ( tabBar()->tabAt( newIndex )->rect().contains( de->pos() ) ) break; } if ( newIndex == tabBar()->count() -1 ) { TQRect rect2 = tabBar()->tabAt( newIndex )->rect(); rect2.setLeft( rect2.left() + rect2.width() / 2 ); - if ( rect2.tqcontains( de->pos() ) ) + if ( rect2.contains( de->pos() ) ) newIndex++; } int oldIndex = 0; for ( ; oldIndex < tabBar()->count(); oldIndex++ ) { - if ( tabBar()->tabAt( oldIndex )->rect().tqcontains( pressPoint ) ) + if ( tabBar()->tabAt( oldIndex )->rect().contains( pressPoint ) ) break; } - FormWindow *fw = tqfind_formwindow( this ); + FormWindow *fw = find_formwindow( this ); MoveTabPageCommand *cmd = new MoveTabPageCommand( tr( "Move Tab Page" ), fw, this, dragPage, dragLabel, newIndex, oldIndex ); @@ -330,7 +330,7 @@ void TQDesignerWidgetStack::nextPage() int TQDesignerWidgetStack::currentPage() const { TQDesignerWidgetStack* that = (TQDesignerWidgetStack*) this; - return that->pages.tqfind( visibleWidget() ); + return that->pages.find( visibleWidget() ); } void TQDesignerWidgetStack::setCurrentPage( int i ) @@ -385,12 +385,12 @@ int TQDesignerWidgetStack::insertPage( TQWidget *p, int i ) raiseWidget( p ); TQApplication::sendPostedEvents(); updateButtons(); - return pages.tqfind( p ); + return pages.find( p ); } int TQDesignerWidgetStack::removePage( TQWidget *p ) { - int i = pages.tqfind( p ); + int i = pages.find( p ); pages.remove( p ); removeWidget( p ); setCurrentPage( 0 ); @@ -465,7 +465,7 @@ int TQDesignerWizard::pageNum( TQWidget *p ) void TQDesignerWizard::addPage( TQWidget *p, const TQString &t ) { TQWizard::addPage( p, t ); - if ( removedPages.tqfind( p ) ) + if ( removedPages.find( p ) ) removedPages.remove( p ); } @@ -478,7 +478,7 @@ void TQDesignerWizard::removePage( TQWidget *p ) void TQDesignerWizard::insertPage( TQWidget *p, const TQString &t, int index ) { TQWizard::insertPage( p, t, index ); - if ( removedPages.tqfind( p ) ) + if ( removedPages.find( p ) ) removedPages.remove( p ); } @@ -490,7 +490,7 @@ TQMap< int, TQStringList > *changedProperties = 0; \brief Set of static functions for creating widgets, layouts and do other stuff The widget factory offers functions to create widgets, create and - delete layouts tqfind out other details - all based on the + delete layouts find out other details - all based on the WidgetDatabase's data. So the functions that use ids use the same ids as in the WidgetDatabase. */ @@ -507,9 +507,9 @@ void WidgetFactory::saveDefaultProperties( TQT_BASE_OBJECT_NAME *tqbo, int id ) var = TQVariant( TQPixmap() ); else if ( !var.isValid() && qstrcmp( "iconSet", lst.at( i ) ) == 0 ) var = TQVariant( TQIconSet() ); - propMap.tqreplace( lst.at( i ), var ); + propMap.replace( lst.at( i ), var ); } - defaultProperties->tqreplace( id, propMap ); + defaultProperties->replace( id, propMap ); } void WidgetFactory::saveChangedProperties( TQT_BASE_OBJECT_NAME *w, int id ) @@ -547,9 +547,9 @@ TQWidget *WidgetFactory::create( int id, TQWidget *tqparent, const char *name, b return 0; MetaDataBase::addEntry( w ); - if ( !defaultProperties->tqcontains( id ) ) + if ( !defaultProperties->contains( id ) ) saveDefaultProperties( w, id ); - if ( !changedProperties->tqcontains( id ) ) + if ( !changedProperties->contains( id ) ) saveChangedProperties( w, id ); return w; @@ -696,7 +696,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa } else { b = new TQDesignerPushButton( tqparent, name ); } - TQWidget *w = tqfind_formwindow( b ); + TQWidget *w = find_formwindow( b ); b->setAutoDefault( w && ::tqqt_cast<TQDialog*>(((FormWindow*)w)->mainContainer()) ); return b; } else if ( className == "TQToolButton" ) { @@ -811,7 +811,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa else if ( className == "TQTabWidget" ) { TQTabWidget *tw = new TQDesignerTabWidget( tqparent, name ); if ( init ) { - FormWindow *fw = tqfind_formwindow( tqparent ); + FormWindow *fw = find_formwindow( tqparent ); TQWidget *w = fw ? new TQDesignerWidget( fw, tw, "tab" ) : new TQWidget( tw, "tab" ); tw->addTab( w, MainWindow::tr("Tab 1") ); MetaDataBase::addEntry( w ); @@ -824,7 +824,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa } else if ( className == "TQWidgetStack" ) { TQDesignerWidgetStack *ws = new TQDesignerWidgetStack( tqparent, name ); if ( init ) { - FormWindow *fw = tqfind_formwindow( tqparent ); + FormWindow *fw = find_formwindow( tqparent ); TQWidget *w = fw ? new TQDesignerWidget( fw, ws, "WStackPage" ) : new TQWidget( ws, "WStackPage" ); ws->insertPage( w ); MetaDataBase::addEntry( w ); @@ -841,7 +841,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa ::tqqt_cast<TQWidgetStack*>(tqparent) || ::tqqt_cast<TQToolBox*>(tqparent) || ::tqqt_cast<TQMainWindow*>(tqparent) ) ) { - FormWindow *fw = tqfind_formwindow( tqparent ); + FormWindow *fw = find_formwindow( tqparent ); if ( fw ) { TQDesignerWidget *dw = new TQDesignerWidget( fw, tqparent, name ); MetaDataBase::addEntry( dw ); @@ -956,7 +956,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa if ( !init ) return new TQDesignerToolBox( tqparent, name ); TQToolBox *tb = new TQDesignerToolBox( tqparent, name ); - FormWindow *fw = tqfind_formwindow( tqparent ); + FormWindow *fw = find_formwindow( tqparent ); TQWidget *w = fw ? new TQDesignerWidget( fw, tb, "page1" ) : new TQWidget( tb, "page1" ); tb->addItem( w, MainWindow::tr("Page 1") ); @@ -1128,7 +1128,7 @@ TQWidget* WidgetFactory::containerOfWidget( TQWidget *w ) /*! Returns the actual designer widget of the container \a w. This is normally \a w itself, but might be a tqparent or grand tqparent of \a w (e.g. when working with a tabwidget and \a w is the container which - tqcontains and layouts childs, but the actual widget known to the + contains and layouts childs, but the actual widget known to the designer is the tabwidget which is the tqparent of \a w. So this function returns the tabwidget then.) */ @@ -1378,13 +1378,13 @@ bool WidgetFactory::hasSpecialEditor( int id, TQObject *editorWidget ) { TQString className = WidgetDatabase::className( id ); - if ( className.tqcontains( "ListBox" ) ) + if ( className.contains( "ListBox" ) ) return TRUE; - if ( className.tqcontains( "ComboBox" ) ) + if ( className.contains( "ComboBox" ) ) return TRUE; - if ( className.tqcontains( "ListView" ) ) + if ( className.contains( "ListView" ) ) return TRUE; - if ( className.tqcontains( "IconView" ) ) + if ( className.contains( "IconView" ) ) return TRUE; if ( className == "TQTextEdit" || className == "TQMultiLineEdit" ) return TRUE; @@ -1398,8 +1398,8 @@ bool WidgetFactory::hasItems( int id, TQObject *editorWidget ) { TQString className = WidgetDatabase::className( id ); - if ( className.tqcontains( "ListBox" ) || className.tqcontains( "ListView" ) || - className.tqcontains( "IconView" ) || className.tqcontains( "ComboBox" ) || + if ( className.contains( "ListBox" ) || className.contains( "ListView" ) || + className.contains( "IconView" ) || className.contains( "ComboBox" ) || ::tqqt_cast<TQTable*>(editorWidget) != 0 ) return TRUE; @@ -1410,7 +1410,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget { TQString className = WidgetDatabase::className( id ); - if ( className.tqcontains( "ListBox" ) ) { + if ( className.contains( "ListBox" ) ) { if ( !::tqqt_cast<TQListBox*>(editWidget) ) return; ListBoxEditor *e = new ListBoxEditor( tqparent, editWidget, fw ); @@ -1419,7 +1419,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget return; } - if ( className.tqcontains( "ComboBox" ) ) { + if ( className.contains( "ComboBox" ) ) { if ( !::tqqt_cast<TQComboBox*>(editWidget) ) return; TQComboBox *cb = (TQComboBox*)editWidget; @@ -1435,7 +1435,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget return; } - if ( className.tqcontains( "ListView" ) ) { + if ( className.contains( "ListView" ) ) { if ( !::tqqt_cast<TQListView*>(editWidget) ) return; TQListView *lv = (TQListView*)editWidget; @@ -1445,7 +1445,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget return; } - if ( className.tqcontains( "IconView" ) ) { + if ( className.contains( "IconView" ) ) { if ( !::tqqt_cast<TQIconView*>(editWidget) ) return; IconViewEditor *e = new IconViewEditor( tqparent, editWidget, fw ); @@ -1474,15 +1474,15 @@ bool WidgetFactory::canResetProperty( TQT_BASE_OBJECT_NAME *w, const TQString &p { if ( propName == "name" || propName == "geometry" ) return FALSE; - TQStringList l = *changedProperties->tqfind( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) ); - return l.tqfindIndex( propName ) == -1; + TQStringList l = *changedProperties->find( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) ); + return l.findIndex( propName ) == -1; } bool WidgetFactory::resetProperty( TQT_BASE_OBJECT_NAME *tqbo, const TQString &propName ) { TQObject *w = TQT_TQOBJECT(tqbo); const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()-> - tqfindProperty( propName, TRUE ), TRUE ); + findProperty( propName, TRUE ), TRUE ); if (!p ) return FALSE; return p->reset( w ); @@ -1503,14 +1503,14 @@ TQVariant WidgetFactory::defaultValue( TQT_BASE_OBJECT_NAME *w, const TQString & return TQVariant( -1 ); } - return *( *defaultProperties->tqfind( WidgetDatabase::idFromClassName( classNameOf( w ) ) ) ).tqfind( propName ); + return *( *defaultProperties->find( WidgetDatabase::idFromClassName( classNameOf( w ) ) ) ).find( propName ); } TQString WidgetFactory::defaultCurrentItem( TQT_BASE_OBJECT_NAME *tqbo, const TQString &propName ) { TQObject *w = TQT_TQOBJECT(tqbo); const TQMetaProperty *p = w->tqmetaObject()-> - property( w->tqmetaObject()->tqfindProperty( propName, TRUE ), TRUE ); + property( w->tqmetaObject()->findProperty( propName, TRUE ), TRUE ); if ( !p ) { int v = defaultValue( w, "tqalignment" ).toInt(); if ( propName == "hAlign" ) { @@ -1550,7 +1550,7 @@ TQWidget *WidgetFactory::createCustomWidget( TQWidget *tqparent, const char *nam TQVariant WidgetFactory::property( TQT_BASE_OBJECT_NAME *tqbo, const char *name ) { TQObject *w = TQT_TQOBJECT(tqbo); - int id = w->tqmetaObject()->tqfindProperty( name, TRUE ); + int id = w->tqmetaObject()->findProperty( name, TRUE ); const TQMetaProperty* p = w->tqmetaObject()->property( id, TRUE ); if ( !p || !p->isValid() ) return MetaDataBase::fakeProperty( w, name ); diff --git a/tqtinterface/qt4/tools/designer/designer/widgetfactory.h b/tqtinterface/qt4/tools/designer/designer/widgetfactory.h index 77c0574..9a672da 100644 --- a/tqtinterface/qt4/tools/designer/designer/widgetfactory.h +++ b/tqtinterface/qt4/tools/designer/designer/widgetfactory.h @@ -223,7 +223,7 @@ public: void addPage( TQWidget *p, const TQString & ); void removePage( TQWidget *p ); void insertPage( TQWidget *p, const TQString &t, int index ); - bool isPageRemoved( TQWidget *p ) { return (removedPages.tqfind( p ) != 0); } + bool isPageRemoved( TQWidget *p ) { return (removedPages.find( p ) != 0); } bool isModal() const { return modal; } void setModal(bool b) { modal = b; } diff --git a/tqtinterface/qt4/tools/designer/designer/workspace.cpp b/tqtinterface/qt4/tools/designer/designer/workspace.cpp index 0694112..d22a086 100644 --- a/tqtinterface/qt4/tools/designer/designer/workspace.cpp +++ b/tqtinterface/qt4/tools/designer/designer/workspace.cpp @@ -381,7 +381,7 @@ void Workspace::sourceFileAdded( SourceFile* sf ) void Workspace::sourceFileRemoved( SourceFile* sf ) { - delete tqfindItem( sf ); + delete findItem( sf ); updateColors(); } @@ -395,7 +395,7 @@ void Workspace::formFileAdded( FormFile* ff ) void Workspace::formFileRemoved( FormFile* ff ) { - delete tqfindItem( ff ); + delete findItem( ff ); updateColors(); } @@ -407,7 +407,7 @@ void Workspace::objectAdded( TQObject *o ) void Workspace::objectRemoved( TQObject *o ) { - delete tqfindItem( o ); + delete findItem( o ); updateColors(); } @@ -419,7 +419,7 @@ void Workspace::update() void Workspace::update( FormFile* ff ) { - TQListViewItem* i = tqfindItem( ff ); + TQListViewItem* i = findItem( ff ); if ( i ) { i->tqrepaint(); if ( (i = i->firstChild()) ) @@ -430,7 +430,7 @@ void Workspace::update( FormFile* ff ) void Workspace::activeFormChanged( FormWindow *fw ) { - WorkspaceItem *i = tqfindItem( fw->formFile() ); + WorkspaceItem *i = findItem( fw->formFile() ); if ( i ) { setCurrentItem( i ); setSelected( i, TRUE ); @@ -448,7 +448,7 @@ void Workspace::activeEditorChanged( SourceEditor *se ) return; if ( se->formWindow() ) { - WorkspaceItem *i = tqfindItem( se->formWindow()->formFile() ); + WorkspaceItem *i = findItem( se->formWindow()->formFile() ); if ( i && i->firstChild() ) { if ( !i->isOpen() ) i->setAutoOpen( TRUE ); @@ -456,7 +456,7 @@ void Workspace::activeEditorChanged( SourceEditor *se ) setSelected( i->firstChild(), TRUE ); } } else { - WorkspaceItem *i = tqfindItem( se->sourceFile() ); + WorkspaceItem *i = findItem( se->sourceFile() ); if ( i ) { setCurrentItem( i ); setSelected( i, TRUE ); @@ -466,7 +466,7 @@ void Workspace::activeEditorChanged( SourceEditor *se ) closeAutoOpenItems(); } -WorkspaceItem *Workspace::tqfindItem( FormFile* ff) +WorkspaceItem *Workspace::findItem( FormFile* ff) { TQListViewItemIterator it( this ); for ( ; it.current(); ++it ) { @@ -476,7 +476,7 @@ WorkspaceItem *Workspace::tqfindItem( FormFile* ff) return 0; } -WorkspaceItem *Workspace::tqfindItem( SourceFile *sf ) +WorkspaceItem *Workspace::findItem( SourceFile *sf ) { TQListViewItemIterator it( this ); for ( ; it.current(); ++it ) { @@ -486,7 +486,7 @@ WorkspaceItem *Workspace::tqfindItem( SourceFile *sf ) return 0; } -WorkspaceItem *Workspace::tqfindItem( TQObject *o ) +WorkspaceItem *Workspace::findItem( TQObject *o ) { TQListViewItemIterator it( this ); for ( ; it.current(); ++it ) { @@ -683,7 +683,7 @@ void Workspace::bufferChosen( const TQString &buffer ) if ( bufferEdit ) bufferEdit->setText( "" ); - if ( MainWindow::self->projectFileNames().tqcontains( buffer ) ) { + if ( MainWindow::self->projectFileNames().contains( buffer ) ) { MainWindow::self->setCurrentProjectByFilename( buffer ); return; } diff --git a/tqtinterface/qt4/tools/designer/designer/workspace.h b/tqtinterface/qt4/tools/designer/designer/workspace.h index b889d3f..de96e96 100644 --- a/tqtinterface/qt4/tools/designer/designer/workspace.h +++ b/tqtinterface/qt4/tools/designer/designer/workspace.h @@ -138,9 +138,9 @@ private Q_SLOTS: void objectRemoved( TQObject * ); private: - WorkspaceItem *tqfindItem( FormFile *ff ); - WorkspaceItem *tqfindItem( SourceFile *sf ); - WorkspaceItem *tqfindItem( TQObject *o ); + WorkspaceItem *findItem( FormFile *ff ); + WorkspaceItem *findItem( SourceFile *sf ); + WorkspaceItem *findItem( TQObject *o ); void closeAutoOpenItems(); diff --git a/tqtinterface/qt4/tools/designer/editor/arghintwidget.cpp b/tqtinterface/qt4/tools/designer/editor/arghintwidget.cpp index 7f9269a..34e1ff6 100644 --- a/tqtinterface/qt4/tools/designer/editor/arghintwidget.cpp +++ b/tqtinterface/qt4/tools/designer/editor/arghintwidget.cpp @@ -191,7 +191,7 @@ ArgHintWidget::ArgHintWidget( TQWidget *tqparent, const char*name ) void ArgHintWidget::setFunctionText( int func, const TQString &text ) { - funcs.tqreplace( func, text ); + funcs.replace( func, text ); if ( func == curFunc ) { funcLabel->clear(); funcLabel->setText( text ); diff --git a/tqtinterface/qt4/tools/designer/editor/browser.cpp b/tqtinterface/qt4/tools/designer/editor/browser.cpp index 67c0e12..129d463 100644 --- a/tqtinterface/qt4/tools/designer/editor/browser.cpp +++ b/tqtinterface/qt4/tools/designer/editor/browser.cpp @@ -73,7 +73,7 @@ bool EditorBrowser::eventFilter( TQObject *o, TQEvent *e ) oldHighlightedParag->format(); oldHighlightedParag = 0; } - if ( tqfindCursor( c, from, to ) && from.paragraph() == to.paragraph() ) { + if ( findCursor( c, from, to ) && from.paragraph() == to.paragraph() ) { // avoid collision with other selections for ( int i = 0; i < curEditor->document()->numSelections(); ++i ) curEditor->document()->removeSelection( i ); @@ -132,7 +132,7 @@ void EditorBrowser::addEditor( Editor *e ) e->installEventFilter( this ); } -bool EditorBrowser::tqfindCursor( const TQTextCursor &c, TQTextCursor &from, TQTextCursor &to ) +bool EditorBrowser::findCursor( const TQTextCursor &c, TQTextCursor &from, TQTextCursor &to ) { from = c; while ( from.paragraph()->at( from.index() )->c != ' ' && from.paragraph()->at( from.index() )->c != '\t' && from.index() > 0 ) diff --git a/tqtinterface/qt4/tools/designer/editor/browser.h b/tqtinterface/qt4/tools/designer/editor/browser.h index 6d57299..f8d53c2 100644 --- a/tqtinterface/qt4/tools/designer/editor/browser.h +++ b/tqtinterface/qt4/tools/designer/editor/browser.h @@ -52,7 +52,7 @@ public: bool eventFilter( TQObject *o, TQEvent *e ); virtual void setCurrentEdior( Editor *e ); virtual void addEditor( Editor *e ); - virtual bool tqfindCursor( const TQTextCursor &c, TQTextCursor &from, TQTextCursor &to ); + virtual bool findCursor( const TQTextCursor &c, TQTextCursor &from, TQTextCursor &to ); virtual void showHelp( const TQString & ) {} protected: diff --git a/tqtinterface/qt4/tools/designer/editor/cindent.cpp b/tqtinterface/qt4/tools/designer/editor/cindent.cpp index 4c8c425..ef4f748 100644 --- a/tqtinterface/qt4/tools/designer/editor/cindent.cpp +++ b/tqtinterface/qt4/tools/designer/editor/cindent.cpp @@ -90,7 +90,7 @@ void CIndent::tabify( TQString &s ) break; } } - i = s.tqfind( '\n', i ); + i = s.find( '\n', i ); if ( i == -1 ) break; ++i; diff --git a/tqtinterface/qt4/tools/designer/editor/completion.cpp b/tqtinterface/qt4/tools/designer/editor/completion.cpp index 1b42cb0..d3a92b2 100644 --- a/tqtinterface/qt4/tools/designer/editor/completion.cpp +++ b/tqtinterface/qt4/tools/designer/editor/completion.cpp @@ -166,7 +166,7 @@ EditorCompletion::~EditorCompletion() void EditorCompletion::addCompletionEntry( const TQString &s, TQTextDocument *, bool strict ) { TQChar key( s[ 0 ] ); - TQMap<TQChar, TQStringList>::Iterator it = completionMap.tqfind( key ); + TQMap<TQChar, TQStringList>::Iterator it = completionMap.find( key ); if ( it == completionMap.end() ) { completionMap.insert( key, TQStringList( s ) ); } else { @@ -194,7 +194,7 @@ TQValueList<CompletionEntry> EditorCompletion::completionList( const TQString &s ( (EditorCompletion*)this )->updateCompletionMap( doc ); TQChar key( s[ 0 ] ); - TQMap<TQChar, TQStringList>::ConstIterator it = completionMap.tqfind( key ); + TQMap<TQChar, TQStringList>::ConstIterator it = completionMap.find( key ); if ( it == completionMap.end() ) return TQValueList<CompletionEntry>(); TQStringList::ConstIterator it2 = (*it).begin(); @@ -207,7 +207,7 @@ TQValueList<CompletionEntry> EditorCompletion::completionList( const TQString &s c.postfix = ""; c.prefix = ""; c.postfix2 = ""; - if ( (int)(*it2).length() > len && (*it2).left( len ) == s && lst.tqfind( c ) == lst.end() ) + if ( (int)(*it2).length() > len && (*it2).left( len ) == s && lst.find( c ) == lst.end() ) lst << c; } @@ -448,7 +448,7 @@ void EditorCompletion::completeCompletion() curEditor->insert( s, (uint) ( TQTextEdit::RedoIndentation | TQTextEdit::CheckNewLines | TQTextEdit::RemoveSelected ) ); - int i = s.tqfind( '(' ); + int i = s.find( '(' ); completionPopup->close(); curEditor->setFocus(); if ( i != -1 && i < (int)s.length() ) { @@ -499,7 +499,7 @@ bool EditorCompletion::doObjectCompletion( const TQString & ) static void strip( TQString &txt ) { - int i = txt.tqfind( "(" ); + int i = txt.find( "(" ); if ( i == -1 ) return; txt = txt.left( i ); @@ -517,7 +517,7 @@ bool EditorCompletion::continueComplete() return TRUE; } - TQListBoxItem *i = completionListBox->tqfindItem( searchString ); + TQListBoxItem *i = completionListBox->findItem( searchString ); if ( !i ) return FALSE; @@ -623,9 +623,9 @@ bool EditorCompletion::doArgumentHint( bool useIndex ) TQString func = function; int pnt = -1; - pnt = func.tqfindRev( '.' ); + pnt = func.findRev( '.' ); if ( pnt == -1 ) - func.tqfindRev( '>' ); + func.findRev( '>' ); if ( pnt != -1 ) func = func.mid( pnt + 1 ); diff --git a/tqtinterface/qt4/tools/designer/editor/preferences.ui.h b/tqtinterface/qt4/tools/designer/editor/preferences.ui.h index cf29fb8..7e1cdb3 100644 --- a/tqtinterface/qt4/tools/designer/editor/preferences.ui.h +++ b/tqtinterface/qt4/tools/designer/editor/preferences.ui.h @@ -114,7 +114,7 @@ void PreferencesBase::elementChanged( const TQString &element ) styles.insert( currentElement, currentStyle ); currentElement = ""; } - TQMap<TQString, ConfigStyle>::Iterator it = styles.tqfind( element ); + TQMap<TQString, ConfigStyle>::Iterator it = styles.find( element ); if ( it == styles.end() ) return; ConfigStyle s = *it; diff --git a/tqtinterface/qt4/tools/designer/editor/viewmanager.cpp b/tqtinterface/qt4/tools/designer/editor/viewmanager.cpp index 6c98f01..b0b0186 100644 --- a/tqtinterface/qt4/tools/designer/editor/viewmanager.cpp +++ b/tqtinterface/qt4/tools/designer/editor/viewmanager.cpp @@ -208,7 +208,7 @@ void ViewManager::setBreakPoints( const TQValueList<uint> &l ) TQTextParagraph *p = ( (Editor*)curView )->document()->firstParagraph(); int i = 0; while ( p ) { - if ( l.tqfind( i ) != l.end() ) { + if ( l.find( i ) != l.end() ) { if ( !p->extraData() ) { ParagData *data = new ParagData; p->setExtraData( data ); diff --git a/tqtinterface/qt4/tools/designer/editor/yyindent.cpp b/tqtinterface/qt4/tools/designer/editor/yyindent.cpp index 61bd4d6..1942ce8 100644 --- a/tqtinterface/qt4/tools/designer/editor/yyindent.cpp +++ b/tqtinterface/qt4/tools/designer/editor/yyindent.cpp @@ -171,7 +171,7 @@ int columnForIndex( const TQString& t, int index ) */ int indentOfLine( const TQString& t ) { - return columnForIndex( t, t.tqfind(firstNonWhiteSpace(t)) ); + return columnForIndex( t, t.find(firstNonWhiteSpace(t)) ); } /* @@ -198,12 +198,12 @@ static TQString trimmedCodeLine( const TQString& t ) /* Replace character and string literals by X's, since they may contain confusing characters (such as '{' and ';'). "Hello!" is - tqreplaced by XXXXXXXX. The literals are rigourously of the same + replaced by XXXXXXXX. The literals are rigourously of the same length before and after; otherwise, we would break tqalignment of continuation lines. */ k = 0; - while ( (k = trimmed.tqfind(*literal, k)) != -1 ) { + while ( (k = trimmed.find(*literal, k)) != -1 ) { for ( int i = 0; i < literal->matchedLength(); i++ ) eraseChar( trimmed, k + i, 'X' ); k += literal->matchedLength(); @@ -214,7 +214,7 @@ static TQString trimmedCodeLine( const TQString& t ) handled elsewhere. */ k = 0; - while ( (k = trimmed.tqfind(*inlineCComment, k)) != -1 ) { + while ( (k = trimmed.find(*inlineCComment, k)) != -1 ) { for ( int i = 0; i < inlineCComment->matchedLength(); i++ ) eraseChar( trimmed, k + i, ' ' ); k += inlineCComment->matchedLength(); @@ -227,7 +227,7 @@ static TQString trimmedCodeLine( const TQString& t ) foo1: bar1; bar2; */ - while ( trimmed.tqfindRev(':') != -1 && trimmed.tqfind(*label) != -1 ) { + while ( trimmed.findRev(':') != -1 && trimmed.find(*label) != -1 ) { TQString cap1 = label->cap( 1 ); int pos1 = label->pos( 1 ); int stop = cap1.length(); @@ -249,7 +249,7 @@ static TQString trimmedCodeLine( const TQString& t ) /* Remove C++-style comments. */ - k = trimmed.tqfind( "//" ); + k = trimmed.find( "//" ); if ( k != -1 ) trimmed.truncate( k ); @@ -352,7 +352,7 @@ static bool readLine() if ( yyLinizerState->inCComment ) { TQString slashAster( "/*" ); - k = yyLinizerState->line.tqfind( slashAster ); + k = yyLinizerState->line.find( slashAster ); if ( k == -1 ) { yyLinizerState->line = TQString(); } else { @@ -364,7 +364,7 @@ static bool readLine() if ( !yyLinizerState->inCComment ) { TQString asterSlash( "*/" ); - k = yyLinizerState->line.tqfind( asterSlash ); + k = yyLinizerState->line.find( asterSlash ); if ( k != -1 ) { for ( int i = 0; i < k + 2; i++ ) eraseChar( yyLinizerState->line, i, ' ' ); @@ -399,8 +399,8 @@ static bool readLine() the other way around, as we are parsing backwards. */ yyLinizerState->braceDepth += - yyLinizerState->line.tqcontains( '}' ) - - yyLinizerState->line.tqcontains( '{' ); + yyLinizerState->line.contains( '}' ) - + yyLinizerState->line.contains( '{' ); /* We use a dirty trick for @@ -416,7 +416,7 @@ static bool readLine() if ( yyLinizerState->pendingRightBrace ) yyLinizerState->braceDepth++; yyLinizerState->pendingRightBrace = - ( yyLinizerState->line.tqfind(*braceX) == 0 ); + ( yyLinizerState->line.find(*braceX) == 0 ); if ( yyLinizerState->pendingRightBrace ) yyLinizerState->braceDepth--; } while ( yyLinizerState->line.isEmpty() ); @@ -466,12 +466,12 @@ static bool bottomLineStartsInCComment() return FALSE; --p; - if ( (*p).tqfind(slashAster) != -1 || (*p).tqfind(asterSlash) != -1 ) { + if ( (*p).find(slashAster) != -1 || (*p).find(asterSlash) != -1 ) { TQString trimmed = trimmedCodeLine( *p ); - if ( trimmed.tqfind(slashAster) != -1 ) { + if ( trimmed.find(slashAster) != -1 ) { return TRUE; - } else if ( trimmed.tqfind(asterSlash) != -1 ) { + } else if ( trimmed.find(asterSlash) != -1 ) { return FALSE; } } @@ -489,7 +489,7 @@ static bool bottomLineStartsInCComment() */ static int indentWhenBottomLineStartsInCComment() { - int k = yyLine->tqfindRev( "/*" ); + int k = yyLine->findRev( "/*" ); if ( k == -1 ) { /* We found a normal text line in a comment. Align the @@ -554,7 +554,7 @@ static bool matchBracelessControlStatement() case '(': delimDepth--; if ( delimDepth == 0 ) { - if ( yyLine->tqfind(*iflikeKeyword) != -1 ) { + if ( yyLine->find(*iflikeKeyword) != -1 ) { /* We have @@ -626,12 +626,12 @@ static bool isUnfinishedLine() return FALSE; TQChar lastCh = (*yyLine)[(int) yyLine->length() - 1]; - if ( TQString("{};").tqfind(lastCh) == -1 && !yyLine->endsWith("...") ) { + if ( TQString("{};").find(lastCh) == -1 && !yyLine->endsWith("...") ) { /* It doesn't end with ';' or similar. If it's neither "TQ_OBJECT" nor "if ( x )", it must be an unfinished line. */ - unf = ( yyLine->tqcontains("TQ_OBJECT") == 0 && + unf = ( yyLine->contains("TQ_OBJECT") == 0 && !matchBracelessControlStatement() ); } else if ( lastCh == TQChar(';') ) { if ( lastParen(*yyLine) == TQChar('(') ) { @@ -755,12 +755,12 @@ static int indentForContinuationLine() end of the unfinished lines or by unbalanced parentheses. */ - if ( TQString("!=<>").tqfind((*yyLine)[j - 1]) == -1 && + if ( TQString("!=<>").find((*yyLine)[j - 1]) == -1 && (*yyLine)[j + 1] != '=' ) { if ( braceDepth == 0 && delimDepth == 0 && j < (int) yyLine->length() - 1 && !yyLine->endsWith(",") && - (yyLine->tqcontains('(') == yyLine->tqcontains(')')) ) + (yyLine->contains('(') == yyLine->contains(')')) ) hook = j; } } @@ -932,7 +932,7 @@ static int indentForStandaloneLine() YY_RESTORE(); } - if ( yyLine->endsWith(";") || yyLine->tqcontains('{') > 0 ) { + if ( yyLine->endsWith(";") || yyLine->contains('{') > 0 ) { /* The situation is possibly this, and we want to indent "z;": diff --git a/tqtinterface/qt4/tools/designer/examples/addressbook/addressbook.ui.h b/tqtinterface/qt4/tools/designer/examples/addressbook/addressbook.ui.h index bd3c218..208c628 100644 --- a/tqtinterface/qt4/tools/designer/examples/addressbook/addressbook.ui.h +++ b/tqtinterface/qt4/tools/designer/examples/addressbook/addressbook.ui.h @@ -129,7 +129,7 @@ void AddressBook::searchAddress( const TQString &expr ) TQListViewItemIterator it( addressView ); while ( it.current() ) { for ( int i = 0; i < 7; ++i ) { - if ( it.current()->text( i ).tqfind( expr ) != -1 ) + if ( it.current()->text( i ).find( expr ) != -1 ) addressView->setSelected( it.current(), TRUE ); } ++it; diff --git a/tqtinterface/qt4/tools/designer/examples/book/book8/editbook.ui.h b/tqtinterface/qt4/tools/designer/examples/book/book8/editbook.ui.h index 12e6eb6..45876fe 100644 --- a/tqtinterface/qt4/tools/designer/examples/book/book8/editbook.ui.h +++ b/tqtinterface/qt4/tools/designer/examples/book/book8/editbook.ui.h @@ -38,7 +38,7 @@ void EditBookForm::primeUpdateBook( TQSqlRecord * buffer ) int id = buffer->value( "authorid" ).toInt(); for ( int i = 0; i < ComboBoxAuthor->count(); i++ ) { TQString author = ComboBoxAuthor->text( i ); - if ( authorMap.tqcontains( author ) && authorMap[author] == id ) { + if ( authorMap.contains( author ) && authorMap[author] == id ) { ComboBoxAuthor->setCurrentItem( i ) ; break; } diff --git a/tqtinterface/qt4/tools/designer/examples/colortool/colornameform.ui.h b/tqtinterface/qt4/tools/designer/examples/colortool/colornameform.ui.h index 8c50277..70d7f62 100644 --- a/tqtinterface/qt4/tools/designer/examples/colortool/colornameform.ui.h +++ b/tqtinterface/qt4/tools/designer/examples/colortool/colornameform.ui.h @@ -20,7 +20,7 @@ void ColorNameForm::validate() { TQString name = colorLineEdit->text(); if ( ! name.isEmpty() && - ( m_colors.isEmpty() || ! m_colors.tqcontains( name ) ) ) + ( m_colors.isEmpty() || ! m_colors.contains( name ) ) ) accept(); else colorLineEdit->selectAll(); diff --git a/tqtinterface/qt4/tools/designer/examples/colortool/findform.ui b/tqtinterface/qt4/tools/designer/examples/colortool/findform.ui index 2863f02..6cec9a7 100644 --- a/tqtinterface/qt4/tools/designer/examples/colortool/findform.ui +++ b/tqtinterface/qt4/tools/designer/examples/colortool/findform.ui @@ -35,12 +35,12 @@ <string>&Look for</string> </property> <property name="buddy" stdset="0"> - <cstring>tqfindLineEdit</cstring> + <cstring>findLineEdit</cstring> </property> </widget> <widget class="TQLineEdit"> <property name="name"> - <cstring>tqfindLineEdit</cstring> + <cstring>findLineEdit</cstring> </property> </widget> </hbox> @@ -89,7 +89,7 @@ </spacer> <widget class="TQPushButton"> <property name="name"> - <cstring>tqfindPushButton</cstring> + <cstring>findPushButton</cstring> </property> <property name="text"> <string>&Find</string> @@ -118,10 +118,10 @@ <slot>accept()</slot> </connection> <connection> - <sender>tqfindPushButton</sender> + <sender>findPushButton</sender> <signal>clicked()</signal> <receiver>FindForm</receiver> - <slot>tqfind()</slot> + <slot>find()</slot> </connection> </connections> <includes> @@ -131,7 +131,7 @@ <signal>lookfor(const QString&)</signal> </Q_SIGNALS> <Q_SLOTS> - <slot>tqfind()</slot> + <slot>find()</slot> </Q_SLOTS> <functions> <function>notfound()</function> diff --git a/tqtinterface/qt4/tools/designer/examples/colortool/findform.ui.h b/tqtinterface/qt4/tools/designer/examples/colortool/findform.ui.h index 1f6e6b9..1f3e993 100644 --- a/tqtinterface/qt4/tools/designer/examples/colortool/findform.ui.h +++ b/tqtinterface/qt4/tools/designer/examples/colortool/findform.ui.h @@ -7,12 +7,12 @@ *****************************************************************************/ -void FindForm::tqfind() +void FindForm::find() { - emit lookfor( tqfindLineEdit->text() ); + emit lookfor( findLineEdit->text() ); } void FindForm::notfound() { - tqfindLineEdit->selectAll(); + findLineEdit->selectAll(); } diff --git a/tqtinterface/qt4/tools/designer/examples/colortool/mainform.ui b/tqtinterface/qt4/tools/designer/examples/colortool/mainform.ui index 448a88e..cf978bf 100644 --- a/tqtinterface/qt4/tools/designer/examples/colortool/mainform.ui +++ b/tqtinterface/qt4/tools/designer/examples/colortool/mainform.ui @@ -526,7 +526,7 @@ </connection> </connections> <includes> - <include location="local" impldecl="in declaration">tqfindform.h</include> + <include location="local" impldecl="in declaration">findform.h</include> <include location="local" impldecl="in implementation">qsettings.h</include> <include location="local" impldecl="in implementation">qradiobutton.h</include> <include location="local" impldecl="in implementation">qcheckbox.h</include> @@ -560,7 +560,7 @@ <variable>int m_clip_as;</variable> <variable>bool m_show_web;</variable> <variable>QClipboard *clipboard;</variable> - <variable>FindForm *tqfindForm;</variable> + <variable>FindForm *findForm;</variable> <variable>QMap<QString,QColor> m_colors;</variable> </variables> <Q_SLOTS> diff --git a/tqtinterface/qt4/tools/designer/examples/colortool/mainform.ui.h b/tqtinterface/qt4/tools/designer/examples/colortool/mainform.ui.h index 0026d8a..62c0729 100644 --- a/tqtinterface/qt4/tools/designer/examples/colortool/mainform.ui.h +++ b/tqtinterface/qt4/tools/designer/examples/colortool/mainform.ui.h @@ -22,7 +22,7 @@ void MainForm::init() if ( clipboard->supportsSelection() ) clipboard->setSelectionMode( TRUE ); - tqfindForm = 0; + findForm = 0; loadSettings(); m_filename = ""; m_changed = FALSE; @@ -354,12 +354,12 @@ void MainForm::editCopy() void MainForm::editFind() { - if ( ! tqfindForm ) { - tqfindForm = new FindForm( this ); - connect( tqfindForm, TQT_SIGNAL( lookfor(const TQString&) ), + if ( ! findForm ) { + findForm = new FindForm( this ); + connect( findForm, TQT_SIGNAL( lookfor(const TQString&) ), this, TQT_SLOT( lookfor(const TQString&) ) ); } - tqfindForm->show(); + findForm->show(); } void MainForm::lookfor( const TQString& text ) @@ -373,7 +373,7 @@ void MainForm::lookfor( const TQString& text ) if ( visible == tablePage && colorTable->numRows() ) { int row = colorTable->currentRow(); for ( int i = row + 1; i < colorTable->numRows(); ++i ) - if ( colorTable->text( i, 0 ).lower().tqcontains( ltext ) ) { + if ( colorTable->text( i, 0 ).lower().contains( ltext ) ) { colorTable->setCurrentCell( i, 0 ); colorTable->clearSelection(); colorTable->selectRow( i ); @@ -387,7 +387,7 @@ void MainForm::lookfor( const TQString& text ) else if ( visible == iconsPage ) { TQIconViewItem *start = colorIconView->currentItem(); for ( TQIconViewItem *item = start->nextItem(); item; item = item->nextItem() ) - if ( item->text().lower().tqcontains( ltext ) ) { + if ( item->text().lower().contains( ltext ) ) { colorIconView->setCurrentItem( item ); colorIconView->ensureItemVisible( item ); found = TRUE; @@ -397,9 +397,9 @@ void MainForm::lookfor( const TQString& text ) colorIconView->setCurrentItem( start ); } if ( ! found ) { - statusBar()->message( TQString( "Could not tqfind '%1' after here" ). + statusBar()->message( TQString( "Could not find '%1' after here" ). arg( text ) ); - tqfindForm->notfound(); + findForm->notfound(); } } diff --git a/tqtinterface/qt4/tools/designer/examples/richedit/richedit.ui.h b/tqtinterface/qt4/tools/designer/examples/richedit/richedit.ui.h index 087d8d0..e99a3ab 100644 --- a/tqtinterface/qt4/tools/designer/examples/richedit/richedit.ui.h +++ b/tqtinterface/qt4/tools/designer/examples/richedit/richedit.ui.h @@ -99,7 +99,7 @@ int EditorForm::saveAndContinue(const TQString & action) if ( textEdit->isModified() ) { switch( TQMessageBox::information( this, "Rich Edit", - "The document tqcontains unsaved changes.\n" + "The document contains unsaved changes.\n" "Do you want to save the changes?", "&Save", "&Don't Save", "&Cancel " + action, 0, // Enter == button 0 diff --git a/tqtinterface/qt4/tools/designer/integration/designer.el b/tqtinterface/qt4/tools/designer/integration/designer.el index 4449205..bea54dc 100644 --- a/tqtinterface/qt4/tools/designer/integration/designer.el +++ b/tqtinterface/qt4/tools/designer/integration/designer.el @@ -8,7 +8,7 @@ (defun designer-create-ui-file (&optional arg) (interactive "FNew UI-File: ") - (tqfind-file arg) + (find-file arg) (insert "<UI></UI>") (save-buffer) (designer-open-ui-file) diff --git a/tqtinterface/qt4/tools/designer/interfaces/editorinterface.h b/tqtinterface/qt4/tools/designer/interfaces/editorinterface.h index 4a80a12..9e273cb 100644 --- a/tqtinterface/qt4/tools/designer/interfaces/editorinterface.h +++ b/tqtinterface/qt4/tools/designer/interfaces/editorinterface.h @@ -82,8 +82,8 @@ struct EditorInterface : public TQUnknownInterface virtual void copy() = 0; virtual void paste() = 0; virtual void selectAll() = 0; - virtual bool tqfind( const TQString &expr, bool cs, bool wo, bool forward, bool startAtCursor ) = 0; - virtual bool tqreplace( const TQString &tqfind, const TQString &tqreplace, bool cs, bool wo, bool forward, bool startAtCursor, bool tqreplaceAll ) = 0; + virtual bool find( const TQString &expr, bool cs, bool wo, bool forward, bool startAtCursor ) = 0; + virtual bool replace( const TQString &find, const TQString &replace, bool cs, bool wo, bool forward, bool startAtCursor, bool replaceAll ) = 0; virtual void gotoLine( int line ) = 0; virtual void indent() = 0; virtual void scrollTo( const TQString &txt, const TQString &first ) = 0; diff --git a/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppbrowser.cpp b/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppbrowser.cpp index 00dca68..82b1447 100644 --- a/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppbrowser.cpp +++ b/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppbrowser.cpp @@ -59,12 +59,12 @@ void CppEditorBrowser::showHelp( const TQString &w ) return; } - if ( word.tqfind( '(' ) != -1 ) { - TQString txt = "::" + word.left( word.tqfind( '(' ) ); + if ( word.find( '(' ) != -1 ) { + TQString txt = "::" + word.left( word.find( '(' ) ); TQTextDocument *doc = curEditor->document(); TQTextParagraph *p = doc->firstParagraph(); while ( p ) { - if ( p->string()->toString().tqfind( txt ) != -1 ) { + if ( p->string()->toString().find( txt ) != -1 ) { curEditor->setCursorPosition( p->paragId(), 0 ); return; } diff --git a/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppcompletion.cpp b/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppcompletion.cpp index 46cd56e..f49e2d8 100644 --- a/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppcompletion.cpp +++ b/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppcompletion.cpp @@ -49,9 +49,9 @@ bool CppEditorCompletion::doObjectCompletion( const TQString &objName ) return FALSE; TQString object( objName ); int i = -1; - if ( ( i = object.tqfindRev( "->" ) ) != -1 ) + if ( ( i = object.findRev( "->" ) ) != -1 ) object = object.mid( i + 2 ); - if ( ( i = object.tqfindRev( "." ) ) != -1 ) + if ( ( i = object.findRev( "." ) ) != -1 ) object = object.mid( i + 1 ); object = object.simplifyWhiteSpace(); TQObject *obj = 0; @@ -69,7 +69,7 @@ bool CppEditorCompletion::doObjectCompletion( const TQString &objName ) if ( !obj->childrenListObject().isEmpty() ) { for ( TQObjectListIt cit( obj->childrenListObject() ); cit.current(); ++cit ) { TQString s( cit.current()->name() ); - if ( s.tqfind( " " ) == -1 && s.tqfind( "qt_" ) == -1 && s.tqfind( "unnamed" ) == -1 ) { + if ( s.find( " " ) == -1 && s.find( "qt_" ) == -1 && s.find( "unnamed" ) == -1 ) { CompletionEntry c; c.type = "variable"; c.text = s; @@ -92,19 +92,19 @@ bool CppEditorCompletion::doObjectCompletion( const TQString &objName ) ce.text = f; ce.postfix = "()"; - if ( lst.tqfind( ce ) == lst.end() ) + if ( lst.find( ce ) == lst.end() ) lst << ce; } TQStrList slts = obj->tqmetaObject()->slotNames( TRUE ); for ( TQPtrListIterator<char> sit( slts ); sit.current(); ++sit ) { TQString f( sit.current() ); - f = f.left( f.tqfind( "(" ) ); + f = f.left( f.find( "(" ) ); CompletionEntry c; c.type = "slot"; c.text = f; c.postfix = "()"; - if ( lst.tqfind( c ) == lst.end() ) + if ( lst.find( c ) == lst.end() ) lst << c; } @@ -127,16 +127,16 @@ TQValueList<TQStringList> CppEditorCompletion::functionParameters( const TQStrin TQString objName; int i = -1; - i = expr.tqfindRev( "->" ); + i = expr.findRev( "->" ); if ( i == -1 ) - i = expr.tqfindRev( "." ); + i = expr.findRev( "." ); else ++i; if ( i == -1 ) { - i = expr.tqfindRev( " " ); + i = expr.findRev( " " ); if ( i == -1 ) - i = expr.tqfindRev( "\t" ); + i = expr.findRev( "\t" ); else objName = ths->name(); @@ -155,16 +155,16 @@ TQValueList<TQStringList> CppEditorCompletion::functionParameters( const TQStrin if ( ex[ (int)ex.length() - 1 ] == '-' ) ex.remove( ex.length() - 1, 1 ); int j = -1; - j = ex.tqfindRev( "->" ); + j = ex.findRev( "->" ); if ( j == -1 ) - j = ex.tqfindRev( "." ); + j = ex.findRev( "." ); else ++j; if ( j == -1 ) { - j = ex.tqfindRev( " " ); + j = ex.findRev( " " ); if ( j == -1 ) - j = ex.tqfindRev( "\t" ); + j = ex.findRev( "\t" ); else objName = ths->name(); @@ -188,11 +188,11 @@ TQValueList<TQStringList> CppEditorCompletion::functionParameters( const TQStrin TQStrList slts = obj->tqmetaObject()->slotNames( TRUE ); for ( TQPtrListIterator<char> sit( slts ); sit.current(); ++sit ) { TQString f( sit.current() ); - f = f.left( f.tqfind( "(" ) ); + f = f.left( f.find( "(" ) ); if ( f == func ) { f = TQString( sit.current() ); - f.remove( (uint)0, f.tqfind( "(" ) + 1 ); - f = f.left( f.tqfind( ")" ) ); + f.remove( (uint)0, f.find( "(" ) + 1 ); + f = f.left( f.find( ")" ) ); TQStringList lst = TQStringList::split( ',', f ); if ( !lst.isEmpty() ) { TQValueList<TQStringList> l; @@ -204,7 +204,7 @@ TQValueList<TQStringList> CppEditorCompletion::functionParameters( const TQStrin const TQMetaProperty *prop = obj->tqmetaObject()-> - property( obj->tqmetaObject()->tqfindProperty( func[ 3 ].lower() + func.mid( 4 ), TRUE ), TRUE ); + property( obj->tqmetaObject()->findProperty( func[ 3 ].lower() + func.mid( 4 ), TRUE ), TRUE ); if ( prop ) { TQValueList<TQStringList> l; l << TQStringList( prop->type() ); diff --git a/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp b/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp index 736b082..9d34421 100644 --- a/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp +++ b/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp @@ -165,40 +165,40 @@ void EditorInterfaceImpl::selectAll() ( (CppEditor*)viewManager->currentView() )->selectAll(); } -bool EditorInterfaceImpl::tqfind( const TQString &expr, bool cs, bool wo, bool forward, bool startAtCursor ) +bool EditorInterfaceImpl::find( const TQString &expr, bool cs, bool wo, bool forward, bool startAtCursor ) { if ( !viewManager || !viewManager->currentView() ) return FALSE; CppEditor *e = (CppEditor*)viewManager->currentView(); if ( startAtCursor ) - return e->tqfind( expr, cs, wo, forward ); + return e->find( expr, cs, wo, forward ); int dummy = 0; - return e->tqfind( expr, cs, wo, forward, &dummy, &dummy ); + return e->find( expr, cs, wo, forward, &dummy, &dummy ); } -bool EditorInterfaceImpl::tqreplace( const TQString &tqfind, const TQString &tqreplace, bool cs, bool wo, - bool forward, bool startAtCursor, bool tqreplaceAll ) +bool EditorInterfaceImpl::replace( const TQString &find, const TQString &replace, bool cs, bool wo, + bool forward, bool startAtCursor, bool replaceAll ) { if ( !viewManager || !viewManager->currentView() ) return FALSE; CppEditor *e = (CppEditor*)viewManager->currentView(); bool ok = FALSE; if ( startAtCursor ) { - ok = e->tqfind( tqfind, cs, wo, forward ); + ok = e->find( find, cs, wo, forward ); } else { int dummy = 0; - ok = e->tqfind( tqfind, cs, wo, forward, &dummy, &dummy ); + ok = e->find( find, cs, wo, forward, &dummy, &dummy ); } if ( ok ) { e->removeSelectedText(); - e->insert( tqreplace, FALSE, FALSE ); + e->insert( replace, FALSE, FALSE ); } - if ( !tqreplaceAll || !ok ) { + if ( !replaceAll || !ok ) { if ( ok ) e->setSelection( e->textCursor()->paragraph()->paragId(), - e->textCursor()->index() - tqreplace.length(), + e->textCursor()->index() - replace.length(), e->textCursor()->paragraph()->paragId(), e->textCursor()->index() ); return ok; @@ -206,10 +206,10 @@ bool EditorInterfaceImpl::tqreplace( const TQString &tqfind, const TQString &tqr bool ok2 = TRUE; while ( ok2 ) { - ok2 = e->tqfind( tqfind, cs, wo, forward ); + ok2 = e->find( find, cs, wo, forward ); if ( ok2 ) { e->removeSelectedText(); - e->insert( tqreplace, FALSE, FALSE ); + e->insert( replace, FALSE, FALSE ); } } @@ -249,7 +249,7 @@ void EditorInterfaceImpl::scrollTo( const TQString &txt, const TQString & ) TQTextDocument *doc = ( (CppEditor*)viewManager->currentView() )->document(); TQTextParagraph *p = doc->firstParagraph(); while ( p ) { - if ( p->string()->toString().tqfind( txt ) != -1 ) { + if ( p->string()->toString().find( txt ) != -1 ) { ( (CppEditor*)viewManager->currentView() )->setCursorPosition( p->paragId() + 2, 0 ); break; } diff --git a/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.h b/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.h index 997a99b..5bae764 100644 --- a/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.h +++ b/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.h @@ -66,8 +66,8 @@ public: void copy(); void paste(); void selectAll(); - bool tqfind( const TQString &expr, bool cs, bool wo, bool forward, bool startAtCursor ); - bool tqreplace( const TQString &tqfind, const TQString &tqreplace, bool cs, bool wo, bool forward, bool startAtCursor, bool tqreplaceAll ); + bool find( const TQString &expr, bool cs, bool wo, bool forward, bool startAtCursor ); + bool replace( const TQString &find, const TQString &replace, bool cs, bool wo, bool forward, bool startAtCursor, bool replaceAll ); void gotoLine( int line ); void indent(); void scrollTo( const TQString &txt, const TQString &first ); diff --git a/tqtinterface/qt4/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp b/tqtinterface/qt4/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp index 14489c5..da857b5 100644 --- a/tqtinterface/qt4/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp +++ b/tqtinterface/qt4/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp @@ -93,9 +93,9 @@ void LanguageInterfaceImpl::functions( const TQString &code, TQValueList<Functio Function func; func.name = (*it).prototype(); func.name.remove( 0, (*it).returnType().length() ); - if ( func.name.tqfind( "::" ) == -1 ) + if ( func.name.find( "::" ) == -1 ) continue; - func.name.remove( (uint)0, func.name.tqfind( "::" ) + 2 ); + func.name.remove( (uint)0, func.name.find( "::" ) + 2 ); func.body = (*it).body(); func.returnType = (*it).returnType(); func.start = (*it).functionStartLineNum(); @@ -194,7 +194,7 @@ TQString LanguageInterfaceImpl::projectKeyForExtension( const TQString &extensio { // also handle something like foo.ut.cpp TQString ext = extension; - int i = ext.tqfindRev('.'); + int i = ext.findRev('.'); if ( i > -1 && i < (int)(ext.length()-1) ) ext = ext.mid( i + 1 ); if ( ext[ 0 ] == 'c' || ext[ 0 ] == 'C' ) diff --git a/tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettings.ui.h b/tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettings.ui.h index 72aea91..9902c17 100644 --- a/tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettings.ui.h +++ b/tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettings.ui.h @@ -36,10 +36,10 @@ void CppProjectSettings::reInit( TQUnknownInterface *iface ) const TQString platforms[] = { "(all)", "win32", "unix", "mac", TQString() }; for ( int i = 0; platforms[ i ] != TQString(); ++i ) { - config.tqreplace( platforms[ i ], project->config( platforms[ i ] ) ); - libs.tqreplace( platforms[ i ], project->libs( platforms[ i ] ) ); - defines.tqreplace( platforms[ i ], project->defines( platforms[ i ] ) ); - includes.tqreplace( platforms[ i ], project->includePath( platforms[ i ] ) ); + config.replace( platforms[ i ], project->config( platforms[ i ] ) ); + libs.replace( platforms[ i ], project->libs( platforms[ i ] ) ); + defines.replace( platforms[ i ], project->defines( platforms[ i ] ) ); + includes.replace( platforms[ i ], project->includePath( platforms[ i ] ) ); } editConfig->setText( config[ "(all)" ] ); editLibs->setText( libs[ "(all)" ] ); @@ -67,22 +67,22 @@ void CppProjectSettings::save( TQUnknownInterface *iface ) void CppProjectSettings::configChanged( const TQString &str ) { - config.tqreplace( comboConfig->currentText(), str ); + config.replace( comboConfig->currentText(), str ); } void CppProjectSettings::libsChanged( const TQString &str ) { - libs.tqreplace( comboLibs->currentText(), str ); + libs.replace( comboLibs->currentText(), str ); } void CppProjectSettings::definesChanged( const TQString &str ) { - defines.tqreplace( comboDefines->currentText(), str ); + defines.replace( comboDefines->currentText(), str ); } void CppProjectSettings::includesChanged( const TQString &str ) { - includes.tqreplace( comboInclude->currentText(), str ); + includes.replace( comboInclude->currentText(), str ); } void CppProjectSettings::configPlatformChanged( const TQString &plat ) diff --git a/tqtinterface/qt4/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp b/tqtinterface/qt4/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp index fe84703..5d3c96f 100644 --- a/tqtinterface/qt4/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp +++ b/tqtinterface/qt4/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp @@ -100,7 +100,7 @@ SourceTemplateInterface::Source SourceTemplateInterfaceImpl::create( const TQStr formFileName( dia.listForms->text( dia.listForms->currentItem() ) ); include.remove( include.length() - 2, 2 ); include += "h"; - int slashFind = include.tqfindRev('/'); + int slashFind = include.findRev('/'); if (slashFind != -1) include = include.mid(slashFind+1); src.code = generateMainCppCode( dia.listForms->text( dia.listForms->currentItem() ), diff --git a/tqtinterface/qt4/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp b/tqtinterface/qt4/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp index 251e2b5..0217682 100644 --- a/tqtinterface/qt4/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp +++ b/tqtinterface/qt4/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp @@ -153,7 +153,7 @@ SyntaxHighlighter_CPP::SyntaxHighlighter_CPP() int len; for ( int i = 0; keywords[ i ]; ++i ) { len = (int)strlen( keywords[ i ] ); - if ( !wordMap->tqcontains( len ) ) + if ( !wordMap->contains( len ) ) wordMap->insert( len, TQMap<TQString, int >() ); TQMap<TQString, int> &map = wordMap->operator[]( len ); map[ keywords[ i ] ] = Keyword; @@ -330,11 +330,11 @@ void SyntaxHighlighter_CPP::process( TQTextDocument *doc, TQTextParagraph *strin break; case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': case '0': - if ( alphabeth.tqfind( lastChar ) != -1 && - ( mathChars.tqfind( lastChar ) == -1 || numbers.tqfind( string->at( i - 1 )->c ) == -1 ) ) { + if ( alphabeth.find( lastChar ) != -1 && + ( mathChars.find( lastChar ) == -1 || numbers.find( string->at( i - 1 )->c ) == -1 ) ) { input = InputAlpha; } else { - if ( input == InputAlpha && numbers.tqfind( lastChar ) != -1 ) + if ( input == InputAlpha && numbers.find( lastChar ) != -1 ) input = InputAlpha; else input = InputNumber; @@ -381,9 +381,9 @@ void SyntaxHighlighter_CPP::process( TQTextDocument *doc, TQTextParagraph *strin if ( buffer[ 0 ] == 'Q' ) { string->setFormat( i - buffer.length(), buffer.length(), formatType, FALSE ); } else { - TQMap<int, TQMap<TQString, int > >::Iterator it = wordMap->tqfind( len ); + TQMap<int, TQMap<TQString, int > >::Iterator it = wordMap->find( len ); if ( it != wordMap->end() ) { - TQMap<TQString, int >::Iterator it2 = ( *it ).tqfind( buffer ); + TQMap<TQString, int >::Iterator it2 = ( *it ).find( buffer ); if ( it2 != ( *it ).end() ) string->setFormat( i - buffer.length(), buffer.length(), format( ( *it2 ) ), FALSE ); } diff --git a/tqtinterface/qt4/tools/designer/plugins/cppeditor/yyreg.cpp b/tqtinterface/qt4/tools/designer/plugins/cppeditor/yyreg.cpp index ab69cce..e1b41b5 100644 --- a/tqtinterface/qt4/tools/designer/plugins/cppeditor/yyreg.cpp +++ b/tqtinterface/qt4/tools/designer/plugins/cppeditor/yyreg.cpp @@ -180,10 +180,10 @@ static int getToken() qDebug()'s here and there. */ if ( yyCurPos >= 0 ) { - int lineStart = yyIn->tqfindRev( TQChar('\n'), yyCurPos ) + 1; + int lineStart = yyIn->findRev( TQChar('\n'), yyCurPos ) + 1; TQString line = yyIn->mid( lineStart, yyCurPos - lineStart + 2 ); - int commentStart = line.tqfind( TQString("//") ); + int commentStart = line.find( TQString("//") ); if ( commentStart != -1 ) { yyCurPos = lineStart + commentStart - 1; yyPos = yyCurPos + 2; @@ -392,7 +392,7 @@ TQString CppFunction::prototype() const /* The parser follows. We are not really parsing C++, just trying to - tqfind the start and end of function definitions. + find the start and end of function definitions. One important pitfall is that the parsed code needs not be valid. Parsing from right to left helps cope with that, as explained in @@ -654,7 +654,7 @@ static CppFunction matchFunctionPrototype( bool stripParamNames ) functions and one that relates to the following function. One good heuristic is to assume that a comment immediately followed by a function with no blank line in between relates to the - function, but there's no easy way to tqfind that out with a + function, but there's no easy way to find that out with a tokenizer. */ #if 0 @@ -689,7 +689,7 @@ static CppFunction matchFunctionPrototype( bool stripParamNames ) printf( " world!\n" ); } - The parser first tqfinds bar(). Then it tqfinds "void foo() {" and + The parser first finds bar(). Then it finds "void foo() {" and naively expects the body to extend up to "void bar()". This function's job is to count braces and make sure "int n;" is not counted as part of the body. @@ -733,8 +733,8 @@ static void setBody( CppFunction *func, const TQString& somewhatBody ) } The parser looks for left braces and tries to parse a function - prototype backwards. First it tqfinds "void bar() {". Then it works - up and tqfinds "void foo() {". + prototype backwards. First it finds "void bar() {". Then it works + up and finds "void foo() {". */ static void matchTranslationUnit( TQValueList<CppFunction> *flist ) { @@ -763,11 +763,11 @@ static void matchTranslationUnit( TQValueList<CppFunction> *flist ) Compute important line numbers. */ int functionStartLineNo = 1 + TQConstString( yyIn->tqunicode(), yyPos ) - .string().tqcontains( TQChar('\n') ); + .string().contains( TQChar('\n') ); int startLineNo = functionStartLineNo + TQConstString( yyIn->tqunicode() + yyPos, startBody - yyPos ) - .string().tqcontains( TQChar('\n') ); - int endLineNo = startLineNo + body.tqcontains( TQChar('\n') ); + .string().contains( TQChar('\n') ); + int endLineNo = startLineNo + body.contains( TQChar('\n') ); func.setLineNums( functionStartLineNo, startLineNo, endLineNo ); flist->prepend( func ); diff --git a/tqtinterface/qt4/tools/designer/plugins/dlg/dlg2ui.cpp b/tqtinterface/qt4/tools/designer/plugins/dlg/dlg2ui.cpp index cb71661..6f45017 100644 --- a/tqtinterface/qt4/tools/designer/plugins/dlg/dlg2ui.cpp +++ b/tqtinterface/qt4/tools/designer/plugins/dlg/dlg2ui.cpp @@ -254,17 +254,17 @@ static AttributeMap attribute( const TQString& name, const TQString& val ) static TQString entitize( const TQString& str ) { TQString t = str; - t.tqreplace( '&', TQString("&") ); - t.tqreplace( '>', TQString(">") ); - t.tqreplace( '<', TQString("<") ); - t.tqreplace( '"', TQString(""") ); - t.tqreplace( '\'', TQString("'") ); + t.replace( '&', TQString("&") ); + t.replace( '>', TQString(">") ); + t.replace( '<', TQString("<") ); + t.replace( '"', TQString(""") ); + t.replace( '\'', TQString("'") ); return t; } TQString Dlg2Ui::alias( const TQString& name ) const { - if ( yyAliasMap.tqcontains(name) ) + if ( yyAliasMap.contains(name) ) return yyAliasMap[name]; else return name; @@ -318,8 +318,8 @@ TQString Dlg2Ui::getTextValue( const TQDomNode& node ) return TQString(); } TQString t = child.data().stripWhiteSpace(); - t.tqreplace( "\\\\", "\\" ); - t.tqreplace( "\\n", "\n" ); + t.replace( "\\\\", "\\" ); + t.replace( "\\n", "\n" ); return t; } @@ -549,7 +549,7 @@ void Dlg2Ui::emitClosingLayout( bool needsWidget, const TQString& layoutKind ) bool Dlg2Ui::isWidgetType( const TQDomElement& e ) { - return yyWidgetTypeSet.tqcontains( e.tagName() ); + return yyWidgetTypeSet.contains( e.tagName() ); } void Dlg2Ui::emitSpacer( int spacing, int stretch ) @@ -583,7 +583,7 @@ TQString Dlg2Ui::filteredFlags( const TQString& flags, const TQRegExp& filter ) TQRegExp evil( TQString("[^0-9A-Z_a-z|]") ); TQString f = flags; - f.tqreplace( evil, TQString() ); + f.replace( evil, TQString() ); TQStringList splitted = TQStringList::split( TQChar('|'), f ); return splitted.grep( filter ).join( TQChar('|') ); } @@ -679,7 +679,7 @@ void Dlg2Ui::emitWidgetBody( const TQDomElement& e, bool layouted ) } else { TQString tagName = n.toElement().tagName(); - TQMap<TQString, int>::ConstIterator p = pp.tqfind( tagName ); + TQMap<TQString, int>::ConstIterator p = pp.find( tagName ); if ( p == pp.end() ) { /* These properties are not in the propertyDefs table, @@ -1245,7 +1245,7 @@ void Dlg2Ui::matchLayoutWidget( const TQDomElement& layoutWidget ) } if ( !widget.isEmpty() ) { - TQMap<TQString, TQDomElement>::Iterator w = yyWidgetMap.tqfind( widget ); + TQMap<TQString, TQDomElement>::Iterator w = yyWidgetMap.find( widget ); if ( w == yyWidgetMap.end() ) { syntaxError(); } else { @@ -1412,7 +1412,7 @@ void Dlg2Ui::matchWidget( const TQDomElement& widget ) if ( name.isEmpty() ) name = TQString( "Widget%1" ).arg( uniqueWidget++ ); - if ( yyWidgetMap.tqcontains(name) ) + if ( yyWidgetMap.contains(name) ) syntaxError(); yyWidgetMap.insert( name, widget ); } diff --git a/tqtinterface/qt4/tools/designer/plugins/glade/glade2ui.cpp b/tqtinterface/qt4/tools/designer/plugins/glade/glade2ui.cpp index 4571cf5..88375b0 100644 --- a/tqtinterface/qt4/tools/designer/plugins/glade/glade2ui.cpp +++ b/tqtinterface/qt4/tools/designer/plugins/glade/glade2ui.cpp @@ -236,11 +236,11 @@ static AttributeMap attribute( const TQString& name, const TQString& val ) static TQString entitize( const TQString& str ) { TQString t = str; - t.tqreplace( '&', TQString("&") ); - t.tqreplace( '>', TQString(">") ); - t.tqreplace( '<', TQString("<") ); - t.tqreplace( '"', TQString(""") ); - t.tqreplace( '\'', TQString("'") ); + t.replace( '&', TQString("&") ); + t.replace( '>', TQString(">") ); + t.replace( '<', TQString("<") ); + t.replace( '"', TQString(""") ); + t.replace( '\'', TQString("'") ); return t; } @@ -446,9 +446,9 @@ void Glade2Ui::emitAttribute( const TQString& prop, const TQVariant& val, static TQString accelerate( const TQString& gtkLabel ) { TQString qtLabel = gtkLabel; - qtLabel.tqreplace( '&', TQString("&&") ); + qtLabel.replace( '&', TQString("&&") ); // close but not quite right - qtLabel.tqreplace( TQChar('_'), TQChar('&') ); + qtLabel.replace( TQChar('_'), TQChar('&') ); return qtLabel; } @@ -456,7 +456,7 @@ static TQString decelerate( const TQString& gtkLabel ) { TQString qtLabel = gtkLabel; // ditto - qtLabel.tqreplace( '_', TQString() ); + qtLabel.replace( '_', TQString() ); return qtLabel; } @@ -591,17 +591,17 @@ int Glade2Ui::matchAccelOnActivate( const TQDomElement& accel ) if ( key.length() == 5 ) { flags = key[4].upper().latin1(); - } else if ( yyKeyMap.tqcontains(key.mid(4)) ) { + } else if ( yyKeyMap.contains(key.mid(4)) ) { flags = yyKeyMap[key.mid(4)]; } else { return 0; } - if ( modifiers.tqcontains(TQString("_CONTROL_")) ) + if ( modifiers.contains(TQString("_CONTROL_")) ) flags |= TQt::CTRL; - if ( modifiers.tqcontains(TQString("_SHIFT_")) ) + if ( modifiers.contains(TQString("_SHIFT_")) ) flags |= TQt::SHIFT; - if ( modifiers.tqcontains(TQString("_MOD1_")) ) + if ( modifiers.contains(TQString("_MOD1_")) ) flags |= TQt::ALT; return flags; } @@ -838,9 +838,9 @@ void Glade2Ui::emitPushButton( const TQString& text, const TQString& name ) attribute(TQString("class"), TQString("TQPushButton")) ); emitProperty( TQString("name"), name.latin1() ); emitProperty( TQString("text"), text ); - if ( name.tqcontains(TQString("ok")) > 0 ) { + if ( name.contains(TQString("ok")) > 0 ) { emitProperty( TQString("default"), TQVariant(TRUE, 0) ); - } else if ( name.tqcontains(TQString("help")) > 0 ) { + } else if ( name.contains(TQString("help")) > 0 ) { emitProperty( TQString("accel"), (int) TQt::Key_F1 ); } emitClosing( TQString("widget") ); @@ -1662,7 +1662,7 @@ TQString Glade2Ui::emitWidget( const TQDomElement& widget, bool layouted, button label. */ label = getTextValue( n ); - int k = label.tqfindRev( TQChar('_') ); + int k = label.findRev( TQChar('_') ); if ( k != -1 ) label = label.mid( k + 1 ); if ( !label.isEmpty() && label != TQString("OK") ) @@ -1880,7 +1880,7 @@ TQString Glade2Ui::emitWidget( const TQDomElement& widget, bool layouted, gtk2qtSelectionMode(selectionMode), TQString("enum") ); if ( !shadowType.endsWith(TQString("_NONE")) ) { - TQString tqshape = shadowType.tqcontains( TQString("_ETCHED_") ) > 0 ? + TQString tqshape = shadowType.contains( TQString("_ETCHED_") ) > 0 ? TQString( "Box" ) : TQString( "WinPanel" ); TQString shadow = shadowType.endsWith( TQString("_IN") ) ? TQString( "Sunken" ) : TQString( "Raised" ); @@ -2106,7 +2106,7 @@ TQStringList Glade2Ui::convertGladeFile( const TQString& fileName ) char *data = new char[maxLength]; TQString dir = yyFileName; - dir.truncate( dir.tqfindRev(TQChar('/')) + 1 ); + dir.truncate( dir.findRev(TQChar('/')) + 1 ); dir += yyPixmapDirectory; emitOpening( TQString("images") ); @@ -2173,7 +2173,7 @@ TQStringList Glade2Ui::convertGladeFile( const TQString& fileName ) emitFooter(); TQString outFileName = fileName; - int k = outFileName.tqfindRev( "." ); + int k = outFileName.findRev( "." ); if ( k != -1 ) outFileName.truncate( k ); if ( widgetNo != 0 ) diff --git a/tqtinterface/qt4/tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp b/tqtinterface/qt4/tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp index 0030ab8..3c03e6d 100644 --- a/tqtinterface/qt4/tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp +++ b/tqtinterface/qt4/tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp @@ -181,20 +181,20 @@ void KDEVDLG2UI::writeStyles( const TQStringList styles, bool isFrame ) TQString shadow = "NoFrame"; TQString tqshape = "StyledPanel"; int width = 2; - if ( styles.tqcontains( "WS_EX_STATICEDGE" ) ) { + if ( styles.contains( "WS_EX_STATICEDGE" ) ) { shadow = "Plain"; width = 1; defineFrame = TRUE; } - if ( styles.tqcontains( "WS_EX_CLIENTEDGE" ) ) { + if ( styles.contains( "WS_EX_CLIENTEDGE" ) ) { shadow = "Sunken"; defineFrame = TRUE; } - if ( styles.tqcontains( "WS_EX_DLGMODALFRAME" ) ) { + if ( styles.contains( "WS_EX_DLGMODALFRAME" ) ) { shadow = "Raised"; defineFrame = TRUE; } - if ( !styles.tqcontains( "WS_BORDER" ) ) { + if ( !styles.contains( "WS_BORDER" ) ) { tqshape = "NoFrame"; defineFrame = TRUE; } @@ -206,13 +206,13 @@ void KDEVDLG2UI::writeStyles( const TQStringList styles, bool isFrame ) } } - if ( styles.tqcontains("WS_DISABLED") ) + if ( styles.contains("WS_DISABLED") ) writeBool("enabled", FALSE ); - if ( styles.tqcontains("WS_EX_ACCEPTFILES") ) + if ( styles.contains("WS_EX_ACCEPTFILES") ) writeBool("acceptDrops", TRUE ); - if ( styles.tqcontains("WS_EX_TRANSPARENT") ) + if ( styles.contains("WS_EX_TRANSPARENT") ) writeBool("autoMask", TRUE ); - if ( !styles.tqcontains("WS_TABSTOP") ) + if ( !styles.contains("WS_TABSTOP") ) writeEnum("focusPolicy", "NoFocus"); } @@ -283,11 +283,11 @@ bool KDEVDLG2UI::parse( TQStringList& get ) void KDEVDLG2UI::cleanString( TQString * text ) { if ( !text ) return; - text->tqreplace( "\\n", "\n" ); - text->tqreplace( "\\t", "\t" ); - text->tqreplace( "&", "&" ); - text->tqreplace( "<", "<" ); - text->tqreplace( ">", ">" ); + text->replace( "\\n", "\n" ); + text->replace( "\\t", "\t" ); + text->replace( "&", "&" ); + text->replace( "<", "<" ); + text->replace( ">", ">" ); } /*! diff --git a/tqtinterface/qt4/tools/designer/plugins/kdevdlg/main.cpp b/tqtinterface/qt4/tools/designer/plugins/kdevdlg/main.cpp index 9ecac6e..fd2df40 100644 --- a/tqtinterface/qt4/tools/designer/plugins/kdevdlg/main.cpp +++ b/tqtinterface/qt4/tools/designer/plugins/kdevdlg/main.cpp @@ -93,7 +93,7 @@ TQStringList KDevDlgFilter::import( const TQString &, const TQString& filename ) TQTextStream in; in.setDevice( &file ); - TQString name = filename.right( filename.length() - filename.tqfindRev( TQDir::separator() ) - 1 ).section( ".", 0, 0 ); + TQString name = filename.right( filename.length() - filename.findRev( TQDir::separator() ) - 1 ).section( ".", 0, 0 ); KDEVDLG2UI c( &in, name ); TQStringList files; c.parse(); diff --git a/tqtinterface/qt4/tools/designer/plugins/rc/rc2ui.cpp b/tqtinterface/qt4/tools/designer/plugins/rc/rc2ui.cpp index a9e87b0..7f7d3f3 100644 --- a/tqtinterface/qt4/tools/designer/plugins/rc/rc2ui.cpp +++ b/tqtinterface/qt4/tools/designer/plugins/rc/rc2ui.cpp @@ -63,8 +63,8 @@ TQStringList RC2UI::splitStyles( const TQString& styles, char sep ) TQString s = styles; TQString style; TQStringList l; - while ( s.tqfind( sep ) > -1 ) { - style = s.left( s.tqfind( sep ) ); + while ( s.find( sep ) > -1 ) { + style = s.left( s.find( sep ) ); l << style.stripWhiteSpace(); s = s.right( s.length() - style.length() -1 ); } @@ -75,7 +75,7 @@ TQStringList RC2UI::splitStyles( const TQString& styles, char sep ) TQString RC2UI::parseNext( TQString& arg, char sep ) { - TQString next = arg.left( arg.tqfind(sep) ); + TQString next = arg.left( arg.find(sep) ); arg = arg.right( arg.length() - next.length() - 1 ); return next; } @@ -164,20 +164,20 @@ void RC2UI::writeStyles( const TQStringList styles, bool isFrame ) TQString shadow = "NoFrame"; TQString tqshape = "StyledPanel"; int width = 2; - if ( styles.tqcontains( "WS_EX_STATICEDGE" ) ) { + if ( styles.contains( "WS_EX_STATICEDGE" ) ) { shadow = "Plain"; width = 1; defineFrame = TRUE; } - if ( styles.tqcontains( "WS_EX_CLIENTEDGE" ) ) { + if ( styles.contains( "WS_EX_CLIENTEDGE" ) ) { shadow = "Sunken"; defineFrame = TRUE; } - if ( styles.tqcontains( "WS_EX_DLGMODALFRAME" ) ) { + if ( styles.contains( "WS_EX_DLGMODALFRAME" ) ) { shadow = "Raised"; defineFrame = TRUE; } - if ( !styles.tqcontains( "WS_BORDER" ) ) { + if ( !styles.contains( "WS_BORDER" ) ) { tqshape = "NoFrame"; defineFrame = TRUE; } @@ -189,13 +189,13 @@ void RC2UI::writeStyles( const TQStringList styles, bool isFrame ) } } - if ( styles.tqcontains("WS_DISABLED") ) + if ( styles.contains("WS_DISABLED") ) writeBool("enabled", FALSE ); - if ( styles.tqcontains("WS_EX_ACCEPTFILES") ) + if ( styles.contains("WS_EX_ACCEPTFILES") ) writeBool("acceptDrops", TRUE ); - if ( styles.tqcontains("WS_EX_TRANSPARENT") ) + if ( styles.contains("WS_EX_TRANSPARENT") ) writeBool("autoMask", TRUE ); - if ( !styles.tqcontains("WS_TABSTOP") ) + if ( !styles.contains("WS_TABSTOP") ) writeEnum("focusPolicy", "NoFocus"); } @@ -297,7 +297,7 @@ TQString RC2UI::useName( const TQString& start ) TQString name = start; int id = 1; - while ( usedNames.tqcontains( name ) ) { + while ( usedNames.contains( name ) ) { name = start + TQString( "%1" ).arg( id ); id++; } @@ -359,19 +359,19 @@ bool RC2UI::makeDialog() } while ( line[(int)line.length()-1] == '|' || line[(int)line.length()-1] == ',' ); count = sscanf( line, "%s", property ); - line = line.right( line.length() - line.tqfind(" ") -1 ); + line = line.right( line.length() - line.find(" ") -1 ); if ( TQString(property) == "STYLE" ) { styles = splitStyles(line); - if ( styles.tqcontains( "WS_CAPTION" ) ) + if ( styles.contains( "WS_CAPTION" ) ) baseClass = "TQDialog"; else baseClass = "TQWidget"; } else if ( TQString(property) == "CAPTION" ) { caption = stripQM( line ); } else if ( TQString(property) == "FONT" ) { - TQString pt = line.left( line.tqfind(",") ); + TQString pt = line.left( line.find(",") ); pointsize = pt.toInt(); - fontname = stripQM(line.right( line.length() - line.tqfind(",") - 2 )); + fontname = stripQM(line.right( line.length() - line.find(",") - 2 )); } } while ( line != "BEGIN" ); @@ -462,10 +462,10 @@ bool RC2UI::makeDialog() if ( controlType == "Static" ) { ID = IDLabel; } else if ( controlType == "Button" ) { - if ( styles.tqcontains("BS_AUTOCHECKBOX") || - styles.tqcontains("BS_3STATE") ) + if ( styles.contains("BS_AUTOCHECKBOX") || + styles.contains("BS_3STATE") ) ID = IDCheckBox; - else if ( styles.tqcontains("BS_AUTORADIOBUTTON") ) + else if ( styles.contains("BS_AUTORADIOBUTTON") ) ID = IDRadioButton; } else if ( controlType == "msctls_updown32" ) { ID = IDSpinBox; @@ -514,7 +514,7 @@ bool RC2UI::makeDialog() extendedStyles = splitStyles(parseNext( arguments )); for ( uint i = 0; i < extendedStyles.count(); i++ ) styles << (*extendedStyles.at(i)); - } while ( arguments.tqfind(',') > -1 ); + } while ( arguments.find(',') > -1 ); switch ( ID ) { case IDWidget: @@ -537,7 +537,7 @@ bool RC2UI::makeDialog() writeRect( "geometry", x,y,w,h ); writeString( "text", widgetText ); TQString align; - if ( !styles.tqcontains("SS_CENTERIMAGE") ) + if ( !styles.contains("SS_CENTERIMAGE") ) align += "|AlignTop"; else align += "|AlignVCenter"; @@ -557,7 +557,7 @@ bool RC2UI::makeDialog() writeCString("name", useName("CheckBox_"+widgetID) ); writeRect("geometry", x,y,w,h); writeString("text", widgetText ); - if ( styles.tqcontains( "BS_3STATE" ) ) + if ( styles.contains( "BS_3STATE" ) ) writeBool( "tristate", TRUE ); } break; @@ -576,13 +576,13 @@ bool RC2UI::makeDialog() writeCString( "name", useName("GroupBox_"+widgetID) ); writeRect( "geometry", x,y,w,h ); writeString( "title", widgetText ); - if ( !styles.tqcontains( "WS_BORDER" ) ) + if ( !styles.contains( "WS_BORDER" ) ) styles.append( "WS_BORDER" ); } break; case IDLineEdit: { - if ( !styles.tqcontains("ES_MULTILINE") ) { + if ( !styles.contains("ES_MULTILINE") ) { writeClass("TQLineEdit"); writeCString( "name", useName("LineEdit_"+widgetID) ); } else { @@ -591,9 +591,9 @@ bool RC2UI::makeDialog() } writeRect( "geometry", x,y,w,h ); TQString align = "AlignTop"; - if ( styles.tqcontains("ES_CENTER") ) + if ( styles.contains("ES_CENTER") ) align+="|AlignHCenter"; - else if ( styles.tqcontains("ES_RIGHT") ) + else if ( styles.contains("ES_RIGHT") ) align+="|AlignRight"; else align+="|AlignLeft"; @@ -613,9 +613,9 @@ bool RC2UI::makeDialog() writeClass("TQIconView"); writeCString("name", useName("IconView_"+widgetID) ); writeRect("geometry", x,y,w,h ); - if ( !styles.tqcontains( "LVS_SINGLESEL" ) ) + if ( !styles.contains( "LVS_SINGLESEL" ) ) writeEnum( "selectionMode", "Extended" ); - if ( styles.tqcontains( "LVS_NOLABELWRAP" ) ) + if ( styles.contains( "LVS_NOLABELWRAP" ) ) writeBool("wordWrapIconText", FALSE ); } break; @@ -625,9 +625,9 @@ bool RC2UI::makeDialog() writeClass("TQListView"); writeCString("name", useName("ListView_"+widgetID) ); writeRect("geometry", x,y,w,h ); - if ( styles.tqcontains( "TVS_LINESATROOT" ) ) + if ( styles.contains( "TVS_LINESATROOT" ) ) writeBool( "rootIsDecorated", TRUE ); - if ( styles.tqcontains( "TVS_FULLROWSELECT" ) ) + if ( styles.contains( "TVS_FULLROWSELECT" ) ) writeBool( "allColumnsShowFocus", TRUE ); } break; @@ -637,7 +637,7 @@ bool RC2UI::makeDialog() writeClass("TQProgressBar"); writeCString("name", useName("ProgressBar_"+widgetID) ); writeRect("geometry", x,y,w,h ); - if ( styles.tqcontains("TBS_VERT") ) + if ( styles.contains("TBS_VERT") ) writeEnum("orientation", "Vertical"); else writeEnum("orientation", "Horizontal"); @@ -670,11 +670,11 @@ bool RC2UI::makeDialog() writeClass("TQSlider"); writeCString("name", useName("Slider_"+widgetID) ); writeRect("geometry", x,y,w,h ); - if ( styles.tqcontains("TBS_VERT") ) + if ( styles.contains("TBS_VERT") ) writeEnum("orientation", "Vertical"); else writeEnum("orientation", "Horizontal"); - if ( !styles.tqcontains("TBS_NOTICKS") ) + if ( !styles.contains("TBS_NOTICKS") ) writeEnum("tickmarks", "Left" ); } break; @@ -694,23 +694,23 @@ bool RC2UI::makeDialog() writeClass("TQListBox"); writeCString("name", useName("ListBox_"+widgetID) ); writeRect( "geometry", x,y,w,h ); - if ( styles.tqcontains("WS_HSCROLL") ) + if ( styles.contains("WS_HSCROLL") ) writeEnum("hScrollBarMode", "Auto"); else writeEnum("hScrollBarMode", "AlwaysOff"); - if ( styles.tqcontains("WS_VSCROLL") ) + if ( styles.contains("WS_VSCROLL") ) writeEnum("vScrollBarMode", "Auto"); else writeEnum("vScrollBarMode", "AlwaysOff"); - if ( styles.tqcontains("LBS_EXTENDEDSEL") ) + if ( styles.contains("LBS_EXTENDEDSEL") ) writeEnum("selectionMode", "Extended"); - else if ( styles.tqcontains("LBS_MULTIPLESEL") ) + else if ( styles.contains("LBS_MULTIPLESEL") ) writeEnum("selectionMode", "Multi"); - else if ( styles.tqcontains("LBS_NOSEL") ) + else if ( styles.contains("LBS_NOSEL") ) writeEnum("selectionMode", "NoSelection"); else writeEnum("selectionMode", "Single"); - if ( !styles.tqcontains( "NO WS_BORDER" ) ) + if ( !styles.contains( "NO WS_BORDER" ) ) styles.append( "WS_BORDER" ); } break; @@ -719,7 +719,7 @@ bool RC2UI::makeDialog() writeClass("TQScrollBar"); writeCString("name", useName("ScrollBar_"+widgetID) ); writeRect("geometry", x,y,w,h ); - if ( styles.tqcontains("SBS_VERT") ) + if ( styles.contains("SBS_VERT") ) writeEnum("orientation", "Vertical"); else writeEnum("orientation", "Horizontal"); diff --git a/tqtinterface/qt4/tools/designer/plugins/wizards/mainwindowwizard.ui.h b/tqtinterface/qt4/tools/designer/plugins/wizards/mainwindowwizard.ui.h index 3865d12..5c3a29c 100644 --- a/tqtinterface/qt4/tools/designer/plugins/wizards/mainwindowwizard.ui.h +++ b/tqtinterface/qt4/tools/designer/plugins/wizards/mainwindowwizard.ui.h @@ -156,7 +156,7 @@ void MainWindowWizardBase::accept() getPixmap( "editpaste", pix ); TQAction *editPasteAction = dfw->createAction( tr( "Paste" ), pix, tr( "&Paste" ), CTRL + Key_V, 0, "editPasteAction" ); actions.insert( tr( "Paste" ), editPasteAction ); - getPixmap( "searchtqfind", pix ); + getPixmap( "searchfind", pix ); TQAction *editFindAction = dfw->createAction( tr( "Find" ), pix, tr( "&Find..." ), CTRL + Key_F, 0, "editFindAction" ); actions.insert( tr( "Find" ), editFindAction ); @@ -236,19 +236,19 @@ void MainWindowWizardBase::accept() dfw->addToolBarSeparator( "toolBar" ); continue; } - TQAction *a = actions.tqfind( listToolbar->text( i ) ); + TQAction *a = actions.find( listToolbar->text( i ) ); if ( !a ) continue; dfw->addToolBarAction( "toolBar", a ); dfw->addAction( a ); - if ( usedActions.tqfindRef( a ) == -1 ) + if ( usedActions.findRef( a ) == -1 ) usedActions.append( a ); } } for ( TQAction *ac = usedActions.first(); ac; ac = usedActions.next() ) { - if ( TQString( ac->name() ).tqfind( "file" ) != -1 && checkCreateConnectionsFile->isChecked() || - TQString( ac->name() ).tqfind( "edit" ) != -1 && checkCreateConnectionsEdit->isChecked() || - TQString( ac->name() ).tqfind( "help" ) != -1 && checkCreateConnectionsHelp->isChecked() ) { + if ( TQString( ac->name() ).find( "file" ) != -1 && checkCreateConnectionsFile->isChecked() || + TQString( ac->name() ).find( "edit" ) != -1 && checkCreateConnectionsEdit->isChecked() || + TQString( ac->name() ).find( "help" ) != -1 && checkCreateConnectionsHelp->isChecked() ) { TQString slot = ac->name(); slot.remove( slot.length() - 6, 6 ); slot += "()"; diff --git a/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizardimpl.cpp b/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizardimpl.cpp index e4d1d61..f8f2dd3 100644 --- a/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizardimpl.cpp +++ b/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizardimpl.cpp @@ -150,7 +150,7 @@ void SqlFormWizard::autoPopulate( bool populate ) if ( d->name() == listBoxConnection->currentText() || ( ( d->name() == "(default)" || d->name().isEmpty() ) && listBoxConnection->currentText() == "(default)" ) ) { - TQStringList lst = *d->fields().tqfind( listBoxTable->currentText() ); + TQStringList lst = *d->fields().find( listBoxTable->currentText() ); // remove primary index fields, if any listBoxSortField->insertStringList( lst ); d->open( FALSE ); diff --git a/tqtinterface/qt4/tools/designer/shared/parser.cpp b/tqtinterface/qt4/tools/designer/shared/parser.cpp index d9f01ed..90ecc68 100644 --- a/tqtinterface/qt4/tools/designer/shared/parser.cpp +++ b/tqtinterface/qt4/tools/designer/shared/parser.cpp @@ -45,9 +45,9 @@ public: TQString Parser::cleanArgs( const TQString &func ) { TQString slot( func ); - int begin = slot.tqfind( "(" ) + 1; + int begin = slot.find( "(" ) + 1; TQString args = slot.mid( begin ); - args = args.left( args.tqfind( ")" ) ); + args = args.left( args.find( ")" ) ); TQStringList lst = TQStringList::split( ',', args ); TQString res = slot.left( begin ); for ( TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { @@ -55,13 +55,13 @@ TQString Parser::cleanArgs( const TQString &func ) res += ","; TQString arg = *it; int pos = 0; - if ( ( pos = arg.tqfind( "&" ) ) != -1 ) { + if ( ( pos = arg.find( "&" ) ) != -1 ) { arg = arg.left( pos + 1 ); - } else if ( ( pos = arg.tqfind( "*" ) ) != -1 ) { + } else if ( ( pos = arg.find( "*" ) ) != -1 ) { arg = arg.left( pos + 1 ); } else { arg = arg.simplifyWhiteSpace(); - if ( ( pos = arg.tqfind( ':' ) ) != -1 ) + if ( ( pos = arg.find( ':' ) ) != -1 ) arg = arg.left( pos ).simplifyWhiteSpace() + ":" + arg.mid( pos + 1 ).simplifyWhiteSpace(); TQStringList l = TQStringList::split( ' ', arg ); if ( l.count() == 2 ) { diff --git a/tqtinterface/qt4/tools/designer/shared/ui2uib.cpp b/tqtinterface/qt4/tools/designer/shared/ui2uib.cpp index bf6335d..082e2b0 100644 --- a/tqtinterface/qt4/tools/designer/shared/ui2uib.cpp +++ b/tqtinterface/qt4/tools/designer/shared/ui2uib.cpp @@ -171,7 +171,7 @@ public: int insert() { return next++; } void setName( int no, const TQString& name ); - int tqfind( const TQString& name, int deflt = -1 ) const; + int find( const TQString& name, int deflt = -1 ) const; int count() const { return next; } private: @@ -188,10 +188,10 @@ void UibIndexMap::setName( int no, const TQString& name ) } } -int UibIndexMap::tqfind( const TQString& name, int deflt ) const +int UibIndexMap::find( const TQString& name, int deflt ) const { - TQMap<TQString, int>::ConstIterator no = nameMap.tqfind( name ); - if ( no == nameMap.end() || conflicts.tqcontains(name) ) { + TQMap<TQString, int>::ConstIterator no = nameMap.find( name ); + if ( no == nameMap.end() || conflicts.contains(name) ) { return deflt; } else { return *no; @@ -239,7 +239,7 @@ static void packString( UibStrTable& strings, TQDataStream& out, static void packStringSplit( UibStrTable& strings, TQDataStream& out, const TQString& str, TQChar sep ) { - int pos = str.tqfind( sep ); + int pos = str.find( sep ); if ( pos == -1 ) pos = str.length(); packString( strings, out, str.left(pos) ); @@ -523,7 +523,7 @@ static int outputObject( TQMap<int, TQStringList>& buddies, if ( tag == "action" ) { if ( elem.tagName() == "item" || elem.tagName() == "toolbar" ) { TQString actionName = f.attribute( "name" ); - int no = objects.tqfind( actionName ); + int no = objects.find( actionName ); if ( no != -1 ) { out << (TQ_UINT8) Object_ActionRef; packUInt16( out, no ); @@ -763,7 +763,7 @@ void convertUiToUib( TQDomDocument& doc, TQDataStream& out ) while ( !f.isNull() ) { if ( f.tagName() == "tabstop" ) { TQString widgetName = f.firstChild().toText().data(); - int no = objects.tqfind( widgetName ); + int no = objects.find( widgetName ); if ( no != -1 ) packUInt16( out2, no ); } @@ -798,7 +798,7 @@ void convertUiToUib( TQDomDocument& doc, TQDataStream& out ) while ( a != buddies.end() ) { TQStringList::ConstIterator b = (*a).begin(); while ( b != (*a).end() ) { - int no = objects.tqfind( *b ); + int no = objects.find( *b ); if ( no != -1 ) { packUInt16( out2, a.key() ); packUInt16( out2, no ); @@ -829,8 +829,8 @@ void convertUiToUib( TQDomDocument& doc, TQDataStream& out ) } TQString language = f.attribute( "language", "C++" ); - int senderNo = objects.tqfind( argMap["sender"], widgetNo ); - int receiverNo = objects.tqfind( argMap["receiver"], widgetNo ); + int senderNo = objects.find( argMap["sender"], widgetNo ); + int receiverNo = objects.find( argMap["receiver"], widgetNo ); TQString signal = UibHack::normalize( argMap["signal"] ); TQString slot = UibHack::normalize( argMap["slot"] ); diff --git a/tqtinterface/qt4/tools/designer/shared/uib.h b/tqtinterface/qt4/tools/designer/shared/uib.h index 08a69de..1016102 100644 --- a/tqtinterface/qt4/tools/designer/shared/uib.h +++ b/tqtinterface/qt4/tools/designer/shared/uib.h @@ -115,7 +115,7 @@ inline int UibStrTable::insertCString( const char *cstr ) inline int UibStrTable::insertString( const TQString& str ) { - if ( str.tqcontains('\0') || str[0] == TQChar(0x7f) ) { + if ( str.contains('\0') || str[0] == TQChar(0x7f) ) { int nextPos = table.size(); out << (TQ_UINT8) 0x7f; out << str; diff --git a/tqtinterface/qt4/tools/designer/shared/widgetdatabase.cpp b/tqtinterface/qt4/tools/designer/shared/widgetdatabase.cpp index a35fd61..d383e9d 100644 --- a/tqtinterface/qt4/tools/designer/shared/widgetdatabase.cpp +++ b/tqtinterface/qt4/tools/designer/shared/widgetdatabase.cpp @@ -764,7 +764,7 @@ TQString WidgetDatabase::createWidgetName( int id ) n = "Layout"; if ( n[ 0 ] == 'Q' && n[ 1 ].lower() != n[ 1 ] ) n = n.mid( 1 ); - int colonColon = n.tqfindRev( "::" ); + int colonColon = n.findRev( "::" ); if ( colonColon != -1 ) n = n.mid( colonColon + 2 ); @@ -783,14 +783,14 @@ int WidgetDatabase::idFromClassName( const TQString &name ) setupDataBase( -1 ); if ( name.isEmpty() ) return 0; - int *i = className2Id->tqfind( name ); + int *i = className2Id->find( name ); if ( i ) return *i; if ( name == "FormWindow" ) return idFromClassName( "TQLayoutWidget" ); #ifdef UIC setupDataBase( -2 ); - i = className2Id->tqfind( name ); + i = className2Id->find( name ); if ( i ) return *i; #endif @@ -799,7 +799,7 @@ int WidgetDatabase::idFromClassName( const TQString &name ) bool WidgetDatabase::hasWidget( const TQString &name ) { - return className2Id->tqfind( name ) != 0; + return className2Id->find( name ) != 0; } WidgetDatabaseRecord *WidgetDatabase::at( int index ) @@ -832,7 +832,7 @@ void WidgetDatabase::append( WidgetDatabaseRecord *r ) TQString WidgetDatabase::widgetGroup( const TQString &g ) { - if ( wGroups->tqfind( g ) == -1 ) + if ( wGroups->find( g ) == -1 ) wGroups->append( g ); return g; } @@ -866,7 +866,7 @@ int WidgetDatabase::numWidgetGroups() bool WidgetDatabase::isGroupVisible( const TQString &g ) { setupDataBase( -1 ); - return invisibleGroups->tqfind( g ) == -1; + return invisibleGroups->find( g ) == -1; } int WidgetDatabase::addCustomWidget( WidgetDatabaseRecord *r ) diff --git a/tqtinterface/qt4/tools/designer/tools/conv2ui/main.cpp b/tqtinterface/qt4/tools/designer/tools/conv2ui/main.cpp index 678c7f0..f336082 100644 --- a/tqtinterface/qt4/tools/designer/tools/conv2ui/main.cpp +++ b/tqtinterface/qt4/tools/designer/tools/conv2ui/main.cpp @@ -81,7 +81,7 @@ bool Conv2ui::convert( const TQString & filename, const TQDir & dest ) } if ( !TQFile::exists( absName( filename ) ) ) { - qWarning( "Conv2ui: can not tqfind file %s", filename.latin1() ); + qWarning( "Conv2ui: can not find file %s", filename.latin1() ); return FALSE; } @@ -95,7 +95,7 @@ bool Conv2ui::convert( const TQString & filename, const TQDir & dest ) if ( !interface ) continue; - if ( (*it).tqcontains( tag, FALSE ) ) { + if ( (*it).contains( tag, FALSE ) ) { // Make sure we output the files in the destination dir TQString absfile = absName( filename ); TQString current = TQDir::currentDirPath(); diff --git a/tqtinterface/qt4/tools/designer/tools/createcw/main.cpp b/tqtinterface/qt4/tools/designer/tools/createcw/main.cpp index 4a5b8ae..af98319 100644 --- a/tqtinterface/qt4/tools/designer/tools/createcw/main.cpp +++ b/tqtinterface/qt4/tools/designer/tools/createcw/main.cpp @@ -65,11 +65,11 @@ static TQString makeIndent( int indent ) static TQString entitize( const TQString &s ) { TQString s2 = s; - s2 = s2.tqreplace( "\"", """ ); - s2 = s2.tqreplace( "&", "&" ); - s2 = s2.tqreplace( ">", ">" ); - s2 = s2.tqreplace( "<", "<" ); - s2 = s2.tqreplace( "'", "'" ); + s2 = s2.replace( "\"", """ ); + s2 = s2.replace( "&", "&" ); + s2 = s2.replace( ">", ">" ); + s2 = s2.replace( "<", "<" ); + s2 = s2.replace( "'", "'" ); return s2; } @@ -130,7 +130,7 @@ static void createDescription( const TQValueList<Widget> &l, TQTextStream &ts ) for ( int i = 0; i < (int)props.count(); ++i ) { const TQMetaProperty *p = w.w->tqmetaObject()-> property( w.w->tqmetaObject()-> - tqfindProperty( props.at( i ), TRUE ), TRUE ); + findProperty( props.at( i ), TRUE ), TRUE ); if ( !p ) continue; if ( !p->writable() || !p->designable( w.w ) ) diff --git a/tqtinterface/qt4/tools/designer/uic/embed.cpp b/tqtinterface/qt4/tools/designer/uic/embed.cpp index f6b2f02..2ef80b5 100644 --- a/tqtinterface/qt4/tools/designer/uic/embed.cpp +++ b/tqtinterface/qt4/tools/designer/uic/embed.cpp @@ -230,7 +230,7 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima #endif out << "\n" - "static TQImage uic_tqfindImage( const TQString& name )\n" + "static TQImage uic_findImage( const TQString& name )\n" "{\n" " for ( int i=0; embed_image_vec[i].data; i++ ) {\n" " if ( TQString::fromUtf8(embed_image_vec[i].name) == name ) {\n" @@ -273,7 +273,7 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima out << " const TQMimeSource* data( const TQString& abs_name ) const {\n"; out << "\tconst TQMimeSource* d = TQMimeSourceFactory::data( abs_name );\n"; out << "\tif ( d || abs_name.isNull() ) return d;\n"; - out << "\tTQImage img = uic_tqfindImage( abs_name );\n"; + out << "\tTQImage img = uic_findImage( abs_name );\n"; out << "\tif ( !img.isNull() )\n"; out << "\t ((TQMimeSourceFactory*)this)->setImage( abs_name, img );\n"; out << "\treturn TQMimeSourceFactory::data( abs_name );\n"; diff --git a/tqtinterface/qt4/tools/designer/uic/form.cpp b/tqtinterface/qt4/tools/designer/uic/form.cpp index 11a0a69..728a1fd 100644 --- a/tqtinterface/qt4/tools/designer/uic/form.cpp +++ b/tqtinterface/qt4/tools/designer/uic/form.cpp @@ -192,7 +192,7 @@ void Uic::createFormDecl( const TQDomElement &e ) // register the object and unify its name objName = registerObject( objName ); TQString protector = objName.upper() + "_H"; - protector.tqreplace( "::", "_" ); + protector.replace( "::", "_" ); out << "#ifndef " << protector << endl; out << "#define " << protector << endl; out << endl; @@ -204,7 +204,7 @@ void Uic::createFormDecl( const TQDomElement &e ) TQStringList globalIncludes, localIncludes; int wid = WidgetDatabase::idFromClassName( objClass ); { - TQMap<TQString, CustomInclude>::Iterator it = customWidgetIncludes.tqfind( objClass ); + TQMap<TQString, CustomInclude>::Iterator it = customWidgetIncludes.find( objClass ); if ( it != customWidgetIncludes.end() ) { if ( ( *it ).location == "global" ) globalIncludes += (*it).header; @@ -230,7 +230,7 @@ void Uic::createFormDecl( const TQDomElement &e ) TQDomElement n2 = nl.item(i).toElement(); TQString s = n2.firstChild().toText().data(); if ( n2.attribute( "impldecl", "in implementation" ) == "in declaration" && - n2.attribute( "location" ) == "local" &&!globalIncludes.tqcontains( s ) ) { + n2.attribute( "location" ) == "local" &&!globalIncludes.contains( s ) ) { if ( s.right( 5 ) == ".ui.h" ) continue; localIncludes += s; @@ -292,7 +292,7 @@ void Uic::createFormDecl( const TQDomElement &e ) continue; // hide qlayoutwidgets if ( s == "Line" ) s = "TQFrame"; - if ( !(nofwd && customWidgets.tqcontains(s)) ) + if ( !(nofwd && customWidgets.contains(s)) ) forwardDecl += s; if ( s.mid( 2 ) == "ListBox" || s.mid( 2 ) == "ListView" || s.mid( 2 ) == "IconView" ) forwardDecl += "TQ" + s.mid( 2 ) + "Item"; @@ -325,7 +325,7 @@ void Uic::createFormDecl( const TQDomElement &e ) TQDomElement n2 = nl.item(i).toElement(); TQString s = n2.firstChild().toText().data(); if ( n2.attribute( "impldecl", "in implementation" ) == "in declaration" && - n2.attribute( "location" ) == "local" &&!globalIncludes.tqcontains( s ) ) + n2.attribute( "location" ) == "local" &&!globalIncludes.contains( s ) ) localIncludes += s; } nl = e.parentNode().toElement().elementsByTagName( "exportmacro" ); @@ -547,7 +547,7 @@ void Uic::createFormDecl( const TQDomElement &e ) writeFunctionsDecl( publicSlots, publicSlotTypes, publicSlotSpecifier ); } - // tqfind Q_SIGNALS + // find Q_SIGNALS TQStringList extraSignals; nl = e.parentNode().toElement().elementsByTagName( "signal" ); for ( i = 0; i < (int) nl.length(); i++ ) { @@ -644,9 +644,9 @@ void Uic::writeFunctionsDecl( const TQStringList &fuLst, const TQStringList &typ if ( *it3 == "pure virtual" || *it3 == "pureVirtual" ) pure = " = 0"; } - type.tqreplace( ">>", "> >" ); - if ( !signature.tqcontains("operator") ) - signature.tqreplace( ">>", "> >" ); + type.replace( ">>", "> >" ); + if ( !signature.contains("operator") ) + signature.replace( ">>", "> >" ); out << " " << specifier << type << " " << signature << pure << ";" << endl; } out << endl; @@ -673,7 +673,7 @@ void Uic::createFormImpl( const TQDomElement &e ) TQMap<TQString, CustomInclude> customWidgetIncludes; - // tqfind additional Q_SLOTS and functions + // find additional Q_SLOTS and functions TQStringList extraFuncts; TQStringList extraFunctTyp; TQStringList extraFunctSpecifier; @@ -778,7 +778,7 @@ void Uic::createFormImpl( const TQDomElement &e ) for ( i = 0; i < (int) nl.length(); i++ ) { TQDomElement n2 = nl.item(i).toElement(); TQString s = n2.firstChild().toText().data(); - if ( n2.attribute( "location" ) == "local" &&!globalIncludes.tqcontains( s ) ) { + if ( n2.attribute( "location" ) == "local" &&!globalIncludes.contains( s ) ) { if ( s.right( 5 ) == ".ui.h" && !TQFile::exists( s ) ) continue; if ( n2.attribute( "impldecl", "in implementation" ) != "in implementation" ) @@ -812,7 +812,7 @@ void Uic::createFormImpl( const TQDomElement &e ) globalIncludes += "tqheader.h"; if ( name != objClass ) { int wid = WidgetDatabase::idFromClassName( name ); - TQMap<TQString, CustomInclude>::Iterator it = customWidgetIncludes.tqfind( name ); + TQMap<TQString, CustomInclude>::Iterator it = customWidgetIncludes.find( name ); if ( it == customWidgetIncludes.end() ) globalIncludes += WidgetDatabase::includeFile( wid ); } @@ -837,7 +837,7 @@ void Uic::createFormImpl( const TQDomElement &e ) out << "#include <tqtoolbar.h>" << endl; } - // tqfind out what images are required + // find out what images are required TQStringList requiredImages; static const char *imgTags[] = { "pixmap", "iconset", 0 }; for ( i = 0; imgTags[i] != 0; i++ ) { @@ -885,7 +885,7 @@ void Uic::createFormImpl( const TQDomElement &e ) nl = n.elementsByTagName( "image" ); for ( i = 0; i < (int) nl.length(); i++ ) { TQString img = registerObject( nl.item(i).toElement().attribute("name") ); - if ( !requiredImages.tqcontains( img ) ) + if ( !requiredImages.contains( img ) ) continue; TQDomElement tmp = nl.item(i).firstChild().toElement(); if ( tmp.tagName() != "data" ) @@ -1047,7 +1047,7 @@ void Uic::createFormImpl( const TQDomElement &e ) if ( objClass == "TQWizard" ) { for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { - if ( tags.tqcontains( n.tagName() ) ) { + if ( tags.contains( n.tagName() ) ) { TQString page = createObjectImpl( n, objClass, "this" ); TQString comment; TQString label = DomTool::readAttribute( n, "title", "", comment ).toString(); @@ -1068,7 +1068,7 @@ void Uic::createFormImpl( const TQDomElement &e ) } } else { // standard widgets for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { - if ( tags.tqcontains( n.tagName() ) ) + if ( tags.contains( n.tagName() ) ) createObjectImpl( n, objName, "this" ); } } @@ -1213,7 +1213,7 @@ void Uic::createFormImpl( const TQDomElement &e ) } } - if ( extraFuncts.tqfind( "init()" ) != extraFuncts.end() ) + if ( extraFuncts.find( "init()" ) != extraFuncts.end() ) out << indent << "init();" << endl; // end of constructor @@ -1226,7 +1226,7 @@ void Uic::createFormImpl( const TQDomElement &e ) out << " */" << endl; out << nameOfClass << "::~" << bareNameOfClass << "()" << endl; out << "{" << endl; - if ( extraFuncts.tqfind( "destroy()" ) != extraFuncts.end() ) + if ( extraFuncts.find( "destroy()" ) != extraFuncts.end() ) out << indent << "destroy();" << endl; out << indent << "// no need to delete child widgets, TQt does it all for us" << endl; out << "}" << endl; diff --git a/tqtinterface/qt4/tools/designer/uic/object.cpp b/tqtinterface/qt4/tools/designer/uic/object.cpp index 1ce89b8..77ca635 100644 --- a/tqtinterface/qt4/tools/designer/uic/object.cpp +++ b/tqtinterface/qt4/tools/designer/uic/object.cpp @@ -105,7 +105,7 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla int numColumns = 0; int numRows = 0; - if ( layouts.tqcontains( e.tagName() ) ) + if ( layouts.contains( e.tagName() ) ) return createLayoutImpl( e, parentClass, tqparent, tqlayout ); objClass = getClassName( e ); @@ -137,7 +137,7 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla // the tqlayout widget is not necessary, hide it by creating its child in the tqparent TQString result; for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { - if (tags.tqcontains( n.tagName() ) ) + if (tags.contains( n.tagName() ) ) result = createObjectImpl( n, parentClass, tqparent, tqlayout ); } return result; @@ -227,28 +227,28 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla TQString call; TQString value; - if ( objClass.tqcontains( "ListBox" ) ) { + if ( objClass.contains( "ListBox" ) ) { call = createListBoxItemImpl( n, objName ); if ( !call.isEmpty() ) { if ( numItems == 0 ) trout << indent << objName << "->clear();" << endl; trout << indent << call << endl; } - } else if ( objClass.tqcontains( "ComboBox" ) ) { + } else if ( objClass.contains( "ComboBox" ) ) { call = createListBoxItemImpl( n, objName, &value ); if ( !call.isEmpty() ) { if ( numItems == 0 ) trout << indent << objName << "->clear();" << endl; trout << indent << call << endl; } - } else if ( objClass.tqcontains( "IconView" ) ) { + } else if ( objClass.contains( "IconView" ) ) { call = createIconViewItemImpl( n, objName ); if ( !call.isEmpty() ) { if ( numItems == 0 ) trout << indent << objName << "->clear();" << endl; trout << indent << call << endl; } - } else if ( objClass.tqcontains( "ListView" ) ) { + } else if ( objClass.contains( "ListView" ) ) { call = createListViewItemImpl( n, objName, TQString() ); if ( !call.isEmpty() ) { if ( numItems == 0 ) @@ -262,7 +262,7 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla TQString call; TQString value; - if ( objClass.tqcontains( "ListView" ) ) { + if ( objClass.contains( "ListView" ) ) { call = createListViewColumnImpl( n, objName, &value ); if ( !call.isEmpty() ) { out << call; @@ -288,7 +288,7 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla if ( objClass == "TQTabWidget" ) { for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { - if ( tags.tqcontains( n.tagName() ) ) { + if ( tags.contains( n.tagName() ) ) { TQString page = createObjectImpl( n, objClass, objName ); TQString comment; TQString label = DomTool::readAttribute( n, "title", "", comment ).toString(); @@ -299,7 +299,7 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla } } else if ( objClass == "TQWidgetStack" ) { for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { - if ( tags.tqcontains( n.tagName() ) ) { + if ( tags.contains( n.tagName() ) ) { TQString page = createObjectImpl( n, objClass, objName ); int id = DomTool::readAttribute( n, "id", "" ).toInt(); out << indent << objName << "->addWidget( " << page << ", " << id << " );" << endl; @@ -307,7 +307,7 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla } } else if ( objClass == "TQToolBox" ) { for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { - if ( tags.tqcontains( n.tagName() ) ) { + if ( tags.contains( n.tagName() ) ) { TQString page = createObjectImpl( n, objClass, objName ); TQString comment; TQString label = DomTool::readAttribute( n, "label", "", comment ).toString(); @@ -328,7 +328,7 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla if ( iface2 ) { bool supportsPages = iface2->supportsPages( objClass ); for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { - if ( tags.tqcontains( n.tagName() ) ) { + if ( tags.contains( n.tagName() ) ) { if ( supportsPages ) { TQString page = createObjectImpl( n, objClass, objName ); TQString comment; @@ -345,7 +345,7 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla } else { #endif for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { - if ( tags.tqcontains( n.tagName() ) ) + if ( tags.contains( n.tagName() ) ) createObjectImpl( n, objClass, objName ); } #ifdef TQT_CONTAINER_CUSTOM_WIDGETS @@ -582,7 +582,7 @@ TQString Uic::setObjectProperty( const TQString& objClass, const TQString& obj, v = "int( "; TQStringList::Iterator it = lst.begin(); while ( it != lst.end() ) { - if (((*it).tqfind("Align", 0, TRUE) == 0) + if (((*it).find("Align", 0, TRUE) == 0) || ((*it) == "WordBreak")) { v += "TQt::" + *it; } diff --git a/tqtinterface/qt4/tools/designer/uic/subclassing.cpp b/tqtinterface/qt4/tools/designer/uic/subclassing.cpp index 895c7f8..3677b78 100644 --- a/tqtinterface/qt4/tools/designer/uic/subclassing.cpp +++ b/tqtinterface/qt4/tools/designer/uic/subclassing.cpp @@ -80,7 +80,7 @@ void Uic::createSubDecl( const TQDomElement &e, const TQString& subClass ) out << " ~" << subClass << "();" << endl; out << endl; - // tqfind additional functions + // find additional functions TQStringList publicSlots, protectedSlots, privateSlots; TQStringList publicSlotTypes, protectedSlotTypes, privateSlotTypes; TQStringList publicSlotSpecifier, protectedSlotSpecifier, privateSlotSpecifier; @@ -243,7 +243,7 @@ void Uic::createSubImpl( const TQDomElement &e, const TQString& subClass ) out << endl; - // tqfind additional functions + // find additional functions TQStringList publicSlots, protectedSlots, privateSlots; TQStringList publicSlotTypes, protectedSlotTypes, privateSlotTypes; TQStringList publicSlotSpecifier, protectedSlotSpecifier, privateSlotSpecifier; diff --git a/tqtinterface/qt4/tools/designer/uic/uic.cpp b/tqtinterface/qt4/tools/designer/uic/uic.cpp index 5eed175..7a71eaf 100644 --- a/tqtinterface/qt4/tools/designer/uic/uic.cpp +++ b/tqtinterface/qt4/tools/designer/uic/uic.cpp @@ -77,10 +77,10 @@ TQString Uic::fixString( const TQString &str, bool encode ) TQString s; if ( !encode ) { s = str; - s.tqreplace( "\\", "\\\\" ); - s.tqreplace( "\"", "\\\"" ); - s.tqreplace( "\r", "" ); - s.tqreplace( "\n", "\\n\"\n\"" ); + s.replace( "\\", "\\\\" ); + s.replace( "\"", "\\\"" ); + s.replace( "\r", "" ); + s.replace( "\n", "\\n\"\n\"" ); } else { TQCString utf8 = str.utf8(); const int l = utf8.length(); @@ -236,7 +236,7 @@ TQString Uic::getFormClassName( const TQDomElement& e ) if ( n.tagName() == "class" ) { TQString s = n.firstChild().toText().data(); int i; - while ( ( i = s.tqfind(' ' )) != -1 ) + while ( ( i = s.find(' ' )) != -1 ) s[i] = '_'; cn = s; } @@ -315,7 +315,7 @@ TQString Uic::getDatabaseInfo( const TQDomElement& e, const TQString& tag ) return TQString(); n = getObjectProperty( e, "database" ); if ( n.firstChild().toElement().tagName() == "stringlist" ) { - // tqfind correct stringlist entry + // find correct stringlist entry TQDomElement n1 = n.firstChild().firstChild().toElement(); for ( int i = 0; i < child && !n1.isNull(); ++i ) n1 = n1.nextSibling().toElement(); @@ -329,7 +329,7 @@ TQString Uic::getDatabaseInfo( const TQDomElement& e, const TQString& tag ) void Uic::registerLayouts( const TQDomElement &e ) { - if ( layouts.tqcontains(e.tagName())) { + if ( layouts.contains(e.tagName())) { createObjectDecl(e); TQString t = e.tagName(); if ( t == "vbox" || t == "hbox" || t == "grid" ) @@ -512,10 +512,10 @@ void Uic::createMenuBarImpl( const TQDomElement &n, const TQString &parentClass, out << indent << itemName << " = new TQPopupMenu( this );" << endl; createPopupMenuImpl( c, parentClass, itemName ); out << indent << objName << "->insertItem( TQString(\"\"), " << itemName << ", " << i << " );" << endl; - TQString tqfindItem(objName + "->tqfindItem(%1)"); - tqfindItem = tqfindItem.arg(i); - trout << indent << "if (" << tqfindItem << ")" << endl; - trout << indent << indent << tqfindItem << "->setText( " << trcall( c.attribute( "text" ) ) << " );" << endl; + TQString findItem(objName + "->findItem(%1)"); + findItem = findItem.arg(i); + trout << indent << "if (" << findItem << ")" << endl; + trout << indent << indent << findItem << "->setText( " << trcall( c.attribute( "text" ) ) << " );" << endl; } else if ( c.tagName() == "separator" ) { out << endl; out << indent << objName << "->insertSeparator( " << i << " );" << endl; @@ -854,7 +854,7 @@ TQString Uic::createLayoutImpl( const TQDomElement &e, const TQString& parentCla if ( n.tagName() == "spacer" ) { TQString child = createSpacerImpl( n, parentClass, tqparent, objName ); out << indent << objName << "->addItem( static_cast<TQLayoutItem*>(static_cast<QLayoutItem*>( " << child << " )) );" << endl; - } else if ( tags.tqcontains( n.tagName() ) ) { + } else if ( tags.contains( n.tagName() ) ) { TQString child = createObjectImpl( n, parentClass, tqparent, objName ); if ( isLayout( child ) ) out << indent << objName << "->addLayout( static_cast<TQLayout*>(static_cast<QLayout*>( " << child << " )) );" << endl; @@ -881,7 +881,7 @@ TQString Uic::createLayoutImpl( const TQDomElement &e, const TQString& parentCla else out << indent << objName << "->addItem( " << child << ", " << row << ", " << col << " );" << endl; - } else if ( tags.tqcontains( n.tagName() ) ) { + } else if ( tags.contains( n.tagName() ) ) { TQString child = createObjectImpl( n, parentClass, tqparent, objName ); out << endl; TQString o = "Widget"; @@ -1052,13 +1052,13 @@ TQString Uic::registerObject( const TQString& name ) TQString result = name; int i; - while ( ( i = result.tqfind(' ' )) != -1 ) { + while ( ( i = result.find(' ' )) != -1 ) { result[i] = '_'; } - if ( objectNames.tqcontains( result ) ) { + if ( objectNames.contains( result ) ) { int i = 2; - while ( objectNames.tqcontains( result + "_" + TQString::number(i) ) ) + while ( objectNames.contains( result + "_" + TQString::number(i) ) ) i++; result += "_"; result += TQString::number(i); @@ -1076,7 +1076,7 @@ TQString Uic::registerObject( const TQString& name ) */ TQString Uic::registeredName( const TQString& name ) { - if ( !objectMapper.tqcontains( name ) ) + if ( !objectMapper.contains( name ) ) return name; return objectMapper[name]; } @@ -1086,7 +1086,7 @@ TQString Uic::registeredName( const TQString& name ) */ bool Uic::isObjectRegistered( const TQString& name ) { - return objectMapper.tqcontains( name ); + return objectMapper.contains( name ); } @@ -1100,7 +1100,7 @@ TQStringList Uic::unique( const TQStringList& list ) TQStringList result; for ( TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) { - if ( !result.tqcontains(*it) ) + if ( !result.contains(*it) ) result += *it; } return result; @@ -1122,7 +1122,7 @@ TQString Uic::createObjectInstance( const TQString& objClass, const TQString& tq bool Uic::isLayout( const TQString& name ) const { - return layoutObjects.tqcontains( name ); + return layoutObjects.contains( name ); } diff --git a/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.cpp b/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.cpp index 57ea838..ef46eea 100644 --- a/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.cpp +++ b/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.cpp @@ -184,7 +184,7 @@ static TQImage loadImageData( const TQString& format, ulong len, TQByteArray dat dataTmp[3] = ( len & 0x000000ff ); TQByteArray baunzip = tqUncompress( dataTmp ); len = baunzip.size(); - img.loadFromData( (const uchar*)baunzip.data(), len, format.left(format.tqfind('.')) ); + img.loadFromData( (const uchar*)baunzip.data(), len, format.left(format.find('.')) ); } else { img.loadFromData( (const uchar*)data.data(), data.size(), format ); } @@ -362,7 +362,7 @@ TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidge #ifndef TQT_NO_SQL TQMap<TQWidget*, SqlWidgetConnection>::Iterator cit = widgetFactory->sqlWidgetConnections.begin(); for( ; cit != widgetFactory->sqlWidgetConnections.end(); ++cit ) { - if ( widgetFactory->noDatabaseWidgets.tqfind( cit.key()->name() ) != + if ( widgetFactory->noDatabaseWidgets.find( cit.key()->name() ) != widgetFactory->noDatabaseWidgets.end() ) continue; if ( cit.key()->inherits( "TQDesignerDataBrowser2" ) ) @@ -378,10 +378,10 @@ TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidge TQDataTable *table = (TQDataTable*)widgetFactory->toplevel->child( it.key(), "TQDataTable" ); if ( !table ) continue; - if ( widgetFactory->noDatabaseWidgets.tqfind( table->name() ) != + if ( widgetFactory->noDatabaseWidgets.find( table->name() ) != widgetFactory->noDatabaseWidgets.end() ) continue; - TQValueList<Field> fieldMap = *widgetFactory->fieldMaps.tqfind( table ); + TQValueList<Field> fieldMap = *widgetFactory->fieldMaps.find( table ); TQString conn = (*it)[ 0 ]; TQSqlCursor* c = 0; TQSqlDatabase *db = 0; @@ -1370,7 +1370,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, return toplevel; } -/*! Installs a widget factory \a factory, which normally tqcontains +/*! Installs a widget factory \a factory, which normally contains additional widgets that can then be created using a TQWidgetFactory. See createWidget() for further details. */ @@ -1545,7 +1545,7 @@ TQWidget *TQWidgetFactory::createWidget( const TQString &className, TQWidget *tq if ( iface ) { TQWidget *w = iface->create( className, tqparent, name ); if ( w ) { - d->customWidgets.tqreplace( className.latin1(), new bool(TRUE) ); + d->customWidgets.replace( className.latin1(), new bool(TRUE) ); return w; } } @@ -1575,7 +1575,7 @@ otherwise returns FALSE. */ bool TQWidgetFactory::supportsWidget( const TQString &widget ) { setupWidgetListAndMap(); - return ( availableWidgetMap->tqfind( widget ) != availableWidgetMap->end() ); + return ( availableWidgetMap->find( widget ) != availableWidgetMap->end() ); } TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget *tqparent, @@ -1638,7 +1638,7 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget } #ifdef TQT_CONTAINER_CUSTOM_WIDGETS TQString parentClassName = tqparent ? tqparent->className() : 0; - bool isPlugin = tqparent ? !!d->customWidgets.tqfind( tqparent->className() ) : FALSE; + bool isPlugin = tqparent ? !!d->customWidgets.find( tqparent->className() ) : FALSE; if ( isPlugin ) qWarning( "####### loading custom container widgets without page support not implemented!" ); // ### TODO loading for custom container widgets without pages @@ -1819,7 +1819,7 @@ TQWidgetFactory::LayoutType TQWidgetFactory::layoutType( TQLayout *tqlayout ) co void TQWidgetFactory::setProperty( TQObject* obj, const TQString &prop, TQVariant value ) { - int offset = obj->tqmetaObject()->tqfindProperty( prop, TRUE ); + int offset = obj->tqmetaObject()->findProperty( prop, TRUE ); if ( offset != -1 ) { if ( prop == "geometry" && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(toplevel) ) { @@ -2092,7 +2092,7 @@ void TQWidgetFactory::loadConnections( const TQDomElement &e, TQObject *connecto } } if ( !conn.sender ) - conn.sender = tqfindAction( name ); + conn.sender = findAction( name ); } else if ( n2.tagName() == "signal" ) { conn.signal = n2.firstChild().toText().data(); } else if ( n2.tagName() == "receiver" ) { @@ -2135,7 +2135,7 @@ void TQWidgetFactory::loadConnections( const TQDomElement &e, TQObject *connecto delete l; } if ( !sender ) - sender = tqfindAction( conn.sender->name() ); + sender = findAction( conn.sender->name() ); if ( qstrcmp( conn.receiver->name(), toplevel->name() ) == 0 ) { receiver = TQT_TQOBJECT(toplevel); @@ -2159,14 +2159,14 @@ void TQWidgetFactory::loadConnections( const TQDomElement &e, TQObject *connecto TQStrList slotList = receiver->tqmetaObject()->slotNames( TRUE ); // if this is a connection to a custom slot and we have a connector, try this as receiver - if ( slotList.tqfind( conn.slot ) == -1 && TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(toplevel) && connector ) { + if ( slotList.find( conn.slot ) == -1 && TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(toplevel) && connector ) { slotList = connector->tqmetaObject()->slotNames( TRUE ); receiver = connector; } // avoid warnings - if ( signalList.tqfind( conn.signal ) == -1 || - slotList.tqfind( conn.slot ) == -1 ) { + if ( signalList.find( conn.signal ) == -1 || + slotList.find( conn.slot ) == -1 ) { n = n.nextSibling().toElement(); continue; } @@ -2235,8 +2235,8 @@ void TQWidgetFactory::createTableColumnOrRow( TQTable *table, const TQString& tx } TQValueList<Field> fieldMap; - if ( fieldMaps.tqfind( table ) != fieldMaps.end() ) { - fieldMap = *fieldMaps.tqfind( table ); + if ( fieldMaps.find( table ) != fieldMaps.end() ) { + fieldMap = *fieldMaps.find( table ); fieldMaps.remove( table ); } @@ -2487,7 +2487,7 @@ void TQWidgetFactory::loadToolBars( const TQDomElement &e ) TQDomElement n2 = n.firstChild().toElement(); while ( !n2.isNull() ) { if ( n2.tagName() == "action" ) { - TQAction *a = tqfindAction( n2.attribute( "name" ) ); + TQAction *a = findAction( n2.attribute( "name" ) ); if ( a ) a->addTo( tb ); } else if ( n2.tagName() == "separator" ) { @@ -2530,7 +2530,7 @@ void TQWidgetFactory::loadPopupMenu( TQPopupMenu *p, const TQDomElement &e ) TQDomElement n = e.firstChild().toElement(); while ( !n.isNull() ) { if ( n.tagName() == "action" || n.tagName() == "actiongroup" ) { - TQAction *a = tqfindAction( n.attribute( "name" ) ); + TQAction *a = findAction( n.attribute( "name" ) ); TQDomElement n2 = n.nextSibling().toElement(); if ( n2.tagName() == "item") { // load submenu TQPopupMenu *popup = new TQPopupMenu( mw ); @@ -2563,7 +2563,7 @@ void TQWidgetFactory::loadFunctions( const TQDomElement & ) { } -TQAction *TQWidgetFactory::tqfindAction( const TQString &name ) +TQAction *TQWidgetFactory::findAction( const TQString &name ) { for ( TQAction *a = actionList.first(); a; a = actionList.next() ) { if ( TQString( a->name() ) == name ) diff --git a/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.h b/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.h index 06227a2..0ce05e9 100644 --- a/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.h +++ b/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.h @@ -103,7 +103,7 @@ private: void loadMenuBar( const TQDomElement &e ); void loadPopupMenu( TQPopupMenu *p, const TQDomElement &e ); void loadFunctions( const TQDomElement &e ); - TQAction *tqfindAction( const TQString &name ); + TQAction *findAction( const TQString &name ); void loadExtraSource(); TQString translate( const char *sourceText, const char *comment = "" ); TQString translate( const TQString& sourceText, const TQString& comment = TQString() ); diff --git a/tqtinterface/qt4/tools/linguist/LICENSE.GPL b/tqtinterface/qt4/tools/linguist/LICENSE.GPL index 149f4ac..3221c03 100644 --- a/tqtinterface/qt4/tools/linguist/LICENSE.GPL +++ b/tqtinterface/qt4/tools/linguist/LICENSE.GPL @@ -59,7 +59,7 @@ modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License applies to any program or other work which tqcontains + 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" @@ -96,7 +96,7 @@ above, provided that you also meet all of these conditions: stating that you changed the files and the date of any change. b) You must cause any work that you distribute or publish, that in - whole or in part tqcontains or is derived from the Program or any + whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. @@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following: The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source -code means all the source code for all modules it tqcontains, plus any +code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include diff --git a/tqtinterface/qt4/tools/linguist/book/linguist-manager.leaf b/tqtinterface/qt4/tools/linguist/book/linguist-manager.leaf index bdbdb5b..aa99e01 100644 --- a/tqtinterface/qt4/tools/linguist/book/linguist-manager.leaf +++ b/tqtinterface/qt4/tools/linguist/book/linguist-manager.leaf @@ -77,13 +77,13 @@ Usage: \c {lupdate myproject.pro} \index Qt Designer This is a simple command line tool. \l lupdate reads a Qt \c .pro -project file, tqfinds the translatable strings in the specified source, +project file, finds the translatable strings in the specified source, header and \e {Qt Designer} interface files, and produces or updates the \c .ts translation files listed in the project file. The translation files are given to the translator who uses \e {Qt Linguist} to read the files and insert the translations. -Companies that have their own translators in-house may tqfind it useful +Companies that have their own translators in-house may find it useful to run \l lupdate regularly, perhaps monthly, as the application develops. This will lead to a fairly low volume of translation work spread evenly over the life of the project and will allow the @@ -134,5 +134,5 @@ validation, the original text will be used instead. \section1 Missing Translations Both \l lupdate and \l lrelease may be used with \c .ts translation -source files which are incomplete. Missing translations will be tqreplaced +source files which are incomplete. Missing translations will be replaced with the native language phrases at runtime. diff --git a/tqtinterface/qt4/tools/linguist/book/linguist-programmer.leaf b/tqtinterface/qt4/tools/linguist/book/linguist-programmer.leaf index a4dfa64..7cec631 100644 --- a/tqtinterface/qt4/tools/linguist/book/linguist-programmer.leaf +++ b/tqtinterface/qt4/tools/linguist/book/linguist-programmer.leaf @@ -157,7 +157,7 @@ Translations \index lupdate The \l lupdate program automatically provides a \e context for every -source text. This context is the class name of the class that tqcontains +source text. This context is the class name of the class that contains the \c tr() call. This is sufficient in the vast majority of cases. Sometimes however, the translator will need further information to uniquely identify a source text; for example, a dialog that contained @@ -350,7 +350,7 @@ Creates a \l QTranslator object without a tqparent. \index tt1_la.qm Tries to load a file called \c tt1_la.qm (the \c .qm file extension is -implicit) that tqcontains Latin translations for the source texts used in +implicit) that contains Latin translations for the source texts used in the program. No error will occur if the file is not found. \index QApplication!installTranslator() @@ -366,7 +366,7 @@ by the program. \printline hello Creates a push button that displays "Hello world!". If \c tt1_la.qm -was found and tqcontains a translation for "Hello world!", the +was found and contains a translation for "Hello world!", the translation appears; if not, the source text appears. \index tr() @@ -394,7 +394,7 @@ is shown when we run the application: The first step is to create a project file, \c tt1.pro, that lists all the source files for the project. The project file can be a qmake -project file, or even an ordinary makefile. Any file that tqcontains +project file, or even an ordinary makefile. Any file that contains \index SOURCES!in Project Files \index TRANSLATIONS!in Project Files @@ -539,12 +539,12 @@ This example is a slightly more involved and introduces a key \e {Qt Linguist} concept: "contexts". \list -\i \c arrowpad.h tqcontains the definition of \c ArrowPad, a custom widget; -\i \c arrowpad.cpp tqcontains the implementation of \c ArrowPad; -\i \c mainwindow.h tqcontains the definition of \c MainWindow, a subclass of +\i \c arrowpad.h contains the definition of \c ArrowPad, a custom widget; +\i \c arrowpad.cpp contains the implementation of \c ArrowPad; +\i \c mainwindow.h contains the definition of \c MainWindow, a subclass of \l QMainWindow -\i \c mainwindow.cpp tqcontains the implementation of \c MainWindow; -\i \c main.cpp tqcontains main(). +\i \c mainwindow.cpp contains the implementation of \c MainWindow; +\i \c main.cpp contains main(). \endlist \index tt2.pro @@ -814,7 +814,7 @@ conflict between \e \&Bestand and \e \&Boven. \index Portuguese Language \index Brazilian Language -We've included a translation file, \c tt3_pt.ts, which tqcontains some +We've included a translation file, \c tt3_pt.ts, which contains some Portuguese translations for this example. \index Troll Print @@ -834,11 +834,11 @@ Version 1.0 consists of these files: \index tt3_pt.ts \list -\i \c printpanel.h tqcontains the definition of PrintPanel; -\i \c printpanel.cpp tqcontains the implementation of PrintPanel; -\i \c mainwindow.h tqcontains the definition of \c MainWindow; -\i \c mainwindow.cpp tqcontains the implementation of \c MainWindow; -\i \c main.cpp tqcontains main(); +\i \c printpanel.h contains the definition of PrintPanel; +\i \c printpanel.cpp contains the implementation of PrintPanel; +\i \c mainwindow.h contains the definition of \c MainWindow; +\i \c mainwindow.cpp contains the implementation of \c MainWindow; +\i \c main.cpp contains main(); \i \c tt3.pro is the \e qmake project file. \i \c tt3_pt.ts is the Portuguese message file. \endlist @@ -893,7 +893,7 @@ translation shortly. \index MainWindow!in Translation Tutorial -The header file for \c MainWindow, \c mainwindow.h, tqcontains no +The header file for \c MainWindow, \c mainwindow.h, contains no surprises. In the implementation, \c mainwindow.cpp, we have some user-visible source texts that must be marked for translation. @@ -976,10 +976,10 @@ for the second pair of radio buttons: Now run \l lupdate and open \c tt3_pt.ts with \e {Qt Linguist}. You should now see two changes. -First, the translation source file now tqcontains \e three "Enabled", +First, the translation source file now contains \e three "Enabled", "Disabled" pairs. The first pair is marked "(obs.)" signifying that they are obsolete. This is because these texts appeared in \c tr() calls that -have been tqreplaced by new calls with two arguments. The second pair has +have been replaced by new calls with two arguments. The second pair has "two-sided" as their comment, and the third pair has "colors" as their comment. The comments are shown in the \e {Source text and comments} area in \e {Qt Linguist}. @@ -1013,9 +1013,9 @@ the translator. \index Comments!for Translators An additional way of helping the translator is to provide information on -how to navigate to the particular part of the application that tqcontains +how to navigate to the particular part of the application that contains the source texts they must translate. This helps them see the context -in which the translation appears and also helps them to tqfind and test +in which the translation appears and also helps them to find and test the translations. This can be achieved by using a \e TRANSLATOR comment in the source code: \code @@ -1036,7 +1036,7 @@ You should see the comments in the \e {Source text and comments} area as you browse through the list of source texts. Sometimes, particularly with large programs, it can be difficult for -the translator to tqfind their translations and check that they're +the translator to find their translations and check that they're correct. Comments that provide good navigation information can save them time: diff --git a/tqtinterface/qt4/tools/linguist/book/linguist-translator.leaf b/tqtinterface/qt4/tools/linguist/book/linguist-translator.leaf index 572c903..7a71b6a 100644 --- a/tqtinterface/qt4/tools/linguist/book/linguist-translator.leaf +++ b/tqtinterface/qt4/tools/linguist/book/linguist-translator.leaf @@ -21,7 +21,7 @@ choose \Menu File|Open from the menu bar and select a \c .ts translation source file to work on. \e {Qt Linguist}'s main window is divided into four main areas. The -left hand side tqcontains the Context list, the top right is the Source +left hand side contains the Context list, the top right is the Source text area, the middle right is the translation area and the bottom right is the phrases and guesses area. We'll describe them in detail later. @@ -86,7 +86,7 @@ The second column 'Source text' shows the text that must be translated. The third column shows the translation. \e{Qt Linguist} provides three kinds of validation: accelerator, -punctuation and phrase. If the source text tqcontains an accelerator +punctuation and phrase. If the source text contains an accelerator i.e. an ampersand, '\&' and the translated text does not contain an ampersand the translation will fail the accelerator validation. Similarly, if the source text ends with a particular punctuation @@ -103,7 +103,7 @@ The Source Text Area is a dockable window. This area appears at the middle right of the main window by default. It is comprised of three vertical sections. The first section is labelled 'Source text' below which the source text appears. The second section -tqcontains contextual information on a light blue background that the +contains contextual information on a light blue background that the programmer has added to assist the translator. If no contextual information has been given this section does not appear. The third section is labelled 'Translation' and this is where you enter the @@ -227,13 +227,13 @@ Some phrases contain variables. Variables are placeholders for items of text that are filled in at runtime. They are signified in the source text with a percent sign followed by a digit, e.g. \e {After processing file %1, file %2 is next in line}. In this example, \c %1 will be -tqreplaced at runtime with the name of the first file to be processed and +replaced at runtime with the name of the first file to be processed and \c %2 with the name of the next file to be processed. In the translated version the variables must still appear. For example a German translation might reverse the phrases, e.g. \e {Datei %2 wird bearbeitet, wenn. Datei %1 fertig ist}. Note that both variables are still used but their order has changed. The order in which variables -appear does not matter; \c %1 will always be tqreplaced by the same text +appear does not matter; \c %1 will always be replaced by the same text at runtime no matter where it appears in the source text or translation and similarly \c %2, etc. @@ -292,7 +292,7 @@ button (press Esc) once you've finished adding (and removing) phrases. When a phrase or set of phrases appears in the phrase book double clicking the required target phrase will copy it to the translation -pane at the text cursor position. If you want to \e tqreplace the text +pane at the text cursor position. If you want to \e replace the text in the translation pane with the target phrase, click the translation pane, choose \Menu {Edit|Select All} (press \Key Alt+A) and then double click the target phrase. @@ -412,7 +412,7 @@ number of projects and applications. \link {The Find Dialog} Find dialog \endlink. When the dialog pops up enter the text to be found and click the \e {Find Next} button. Source phrases, translations and comments may be searched. - \i \e {Find Next F3} \BR tqfinds the next occurrence of the text that + \i \e {Find Next F3} \BR finds the next occurrence of the text that was last entered in the Find dialog. \endlist @@ -566,7 +566,7 @@ Toggles phrase book validation on or off. \section2 The Find Dialog -\img tqfinddialog.png +\img finddialog.png \caption The Find Dialog Choose \Menu Edit|Find from the menu bar or press \Key Ctrl+F to pop diff --git a/tqtinterface/qt4/tools/linguist/linguist/finddialog.cpp b/tqtinterface/qt4/tools/linguist/linguist/finddialog.cpp index 6dc876c..fe8129a 100644 --- a/tqtinterface/qt4/tools/linguist/linguist/finddialog.cpp +++ b/tqtinterface/qt4/tools/linguist/linguist/finddialog.cpp @@ -46,60 +46,60 @@ #include <tqpushbutton.h> #include <tqwhatsthis.h> -FindDialog::FindDialog( bool tqreplace, TQWidget *tqparent, const char *name, +FindDialog::FindDialog( bool replace, TQWidget *tqparent, const char *name, bool modal ) : TQDialog( tqparent, name, modal ) { sourceText = 0; - led = new TQLineEdit( this, "tqfind line edit" ); - TQLabel *tqfindWhat = new TQLabel( led, tr("Fi&nd what:"), this, "tqfind what" ); - TQLabel *tqreplaceWith = 0; - TQPushButton *tqfindNxt = new TQPushButton( tr("&Find Next"), this, - "tqfind next" ); - tqfindNxt->setDefault( TRUE ); - connect( tqfindNxt, TQT_SIGNAL(clicked()), this, TQT_SLOT(emitFindNext()) ); - TQPushButton *cancel = new TQPushButton( tr("Cancel"), this, "cancel tqfind" ); + led = new TQLineEdit( this, "find line edit" ); + TQLabel *findWhat = new TQLabel( led, tr("Fi&nd what:"), this, "find what" ); + TQLabel *replaceWith = 0; + TQPushButton *findNxt = new TQPushButton( tr("&Find Next"), this, + "find next" ); + findNxt->setDefault( TRUE ); + connect( findNxt, TQT_SIGNAL(clicked()), this, TQT_SLOT(emitFindNext()) ); + TQPushButton *cancel = new TQPushButton( tr("Cancel"), this, "cancel find" ); connect( cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); - TQVBoxLayout *bl = new TQVBoxLayout( 6, "tqfind button tqlayout" ); - bl->addWidget( tqfindNxt ); + TQVBoxLayout *bl = new TQVBoxLayout( 6, "find button tqlayout" ); + bl->addWidget( findNxt ); - matchCase = new TQCheckBox( tr("&Match case"), this, "tqfind match case" ); + matchCase = new TQCheckBox( tr("&Match case"), this, "find match case" ); matchCase->setChecked( FALSE ); - if ( tqreplace ) { - TQWhatsThis::add( this, tr("This window allows you to search and tqreplace" + if ( replace ) { + TQWhatsThis::add( this, tr("This window allows you to search and replace" " some text in the translations.") ); - red = new TQLineEdit( this, "tqreplace line edit" ); - tqreplaceWith = new TQLabel( red, tr("Replace &with:"), this, - "tqreplace with" ); + red = new TQLineEdit( this, "replace line edit" ); + replaceWith = new TQLabel( red, tr("Replace &with:"), this, + "replace with" ); setTabOrder( led, red ); - TQPushButton *tqreplace = new TQPushButton( tr("&Replace"), this, - "tqreplace" ); - connect( tqreplace, TQT_SIGNAL(clicked()), this, TQT_SLOT(emitReplace()) ); - TQPushButton *tqreplaceAll = new TQPushButton( tr("Replace &All"), this, - "tqreplace all" ); - connect( tqreplaceAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(emitReplaceAll()) ); - setTabOrder( tqfindNxt, tqreplace ); - setTabOrder( tqreplace, tqreplaceAll ); - setTabOrder( tqreplaceAll, cancel ); - - TQWhatsThis::add( tqreplace, tr("Click here to tqreplace the next occurrence" + TQPushButton *replace = new TQPushButton( tr("&Replace"), this, + "replace" ); + connect( replace, TQT_SIGNAL(clicked()), this, TQT_SLOT(emitReplace()) ); + TQPushButton *replaceAll = new TQPushButton( tr("Replace &All"), this, + "replace all" ); + connect( replaceAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(emitReplaceAll()) ); + setTabOrder( findNxt, replace ); + setTabOrder( replace, replaceAll ); + setTabOrder( replaceAll, cancel ); + + TQWhatsThis::add( replace, tr("Click here to replace the next occurrence" " of the text you typed in.") ); - TQWhatsThis::add( tqreplaceAll, tr("Click here to tqreplace all occurrences" + TQWhatsThis::add( replaceAll, tr("Click here to replace all occurrences" " of the text you typed in.") ); - bl->addWidget( tqreplace ); - bl->addWidget( tqreplaceAll ); + bl->addWidget( replace ); + bl->addWidget( replaceAll ); TQGridLayout *gl = new TQGridLayout( this, 4, 3, 11, 11, - "tqfind outer tqlayout" ); - gl->addWidget( tqfindWhat, 0, 0 ); + "find outer tqlayout" ); + gl->addWidget( findWhat, 0, 0 ); gl->addWidget( led, 0, 1 ); - gl->addWidget( tqreplaceWith, 1, 0 ); + gl->addWidget( replaceWith, 1, 0 ); gl->addWidget( red, 1, 1 ); gl->addMultiCellWidget( matchCase, 2, 2, 0, 1 ); gl->addMultiCell( bl, 0, 3, 3, 3 ); @@ -108,12 +108,12 @@ FindDialog::FindDialog( bool tqreplace, TQWidget *tqparent, const char *name, " text in the translation source file.") ); sourceText = new TQCheckBox( tr("&Source texts"), this, - "tqfind in source texts" ); + "find in source texts" ); sourceText->setChecked( TRUE ); translations = new TQCheckBox( tr("&Translations"), this, - "tqfind in translations" ); + "find in translations" ); translations->setChecked( TRUE ); - comments = new TQCheckBox( tr("&Comments"), this, "tqfind in comments" ); + comments = new TQCheckBox( tr("&Comments"), this, "find in comments" ); comments->setChecked( TRUE ); TQWhatsThis::add( sourceText, tr("Source texts are searched when" @@ -123,11 +123,11 @@ FindDialog::FindDialog( bool tqreplace, TQWidget *tqparent, const char *name, TQWhatsThis::add( comments, tr("Comments and contexts are searched when" " checked.") ); - TQVBoxLayout *cl = new TQVBoxLayout( 6, "tqfind checkbox tqlayout" ); + TQVBoxLayout *cl = new TQVBoxLayout( 6, "find checkbox tqlayout" ); TQGridLayout *gl = new TQGridLayout( this, 3, 4, 11, 11, - "tqfind outer tqlayout" ); - gl->addWidget( tqfindWhat, 0, 0 ); + "find outer tqlayout" ); + gl->addWidget( findWhat, 0, 0 ); gl->addMultiCellWidget( led, 0, 0, 1, 2 ); gl->addWidget( matchCase, 1, 2 ); gl->addMultiCell( bl, 0, 2, 3, 3 ); @@ -147,7 +147,7 @@ FindDialog::FindDialog( bool tqreplace, TQWidget *tqparent, const char *name, TQWhatsThis::add( matchCase, tr("Texts such as 'TeX' and 'tex' are" " considered as different when checked.") ); - TQWhatsThis::add( tqfindNxt, tr("Click here to tqfind the next occurrence of the" + TQWhatsThis::add( findNxt, tr("Click here to find the next occurrence of the" " text you typed in.") ); TQWhatsThis::add( cancel, tr("Click here to close this window.") ); @@ -169,15 +169,15 @@ void FindDialog::emitFindNext() ( comments->isChecked() ? Comments : 0 ); else where = Translations; - emit tqfindNext( led->text(), where, matchCase->isChecked() ); + emit findNext( led->text(), where, matchCase->isChecked() ); } void FindDialog::emitReplace() { - emit tqreplace( led->text(), red->text(), matchCase->isChecked(), FALSE ); + emit replace( led->text(), red->text(), matchCase->isChecked(), FALSE ); } void FindDialog::emitReplaceAll() { - emit tqreplace( led->text(), red->text(), matchCase->isChecked(), TRUE ); + emit replace( led->text(), red->text(), matchCase->isChecked(), TRUE ); } diff --git a/tqtinterface/qt4/tools/linguist/linguist/finddialog.h b/tqtinterface/qt4/tools/linguist/linguist/finddialog.h index 2cf8e43..47d0ec5 100644 --- a/tqtinterface/qt4/tools/linguist/linguist/finddialog.h +++ b/tqtinterface/qt4/tools/linguist/linguist/finddialog.h @@ -46,11 +46,11 @@ class FindDialog : public TQDialog public: enum { SourceText = 0x1, Translations = 0x2, Comments = 0x4 }; - FindDialog( bool tqreplace, TQWidget *tqparent = 0, const char *name = 0, bool modal = FALSE ); + FindDialog( bool replace, TQWidget *tqparent = 0, const char *name = 0, bool modal = FALSE ); Q_SIGNALS: - void tqfindNext( const TQString& text, int where, bool matchCase ); - void tqreplace( const TQString& before, const TQString& after, bool matchCase, bool all ); + void findNext( const TQString& text, int where, bool matchCase ); + void replace( const TQString& before, const TQString& after, bool matchCase, bool all ); private Q_SLOTS: void emitFindNext(); diff --git a/tqtinterface/qt4/tools/linguist/linguist/linguist_de.ts b/tqtinterface/qt4/tools/linguist/linguist/linguist_de.ts index 31e6737..2c7708b 100644 --- a/tqtinterface/qt4/tools/linguist/linguist/linguist_de.ts +++ b/tqtinterface/qt4/tools/linguist/linguist/linguist_de.ts @@ -50,7 +50,7 @@ <translation type="unfinished"></translation> </message> <message> - <source>This window allows you to search and tqreplace some text in the translations.</source> + <source>This window allows you to search and replace some text in the translations.</source> <translation type="unfinished"></translation> </message> <message> @@ -66,11 +66,11 @@ <translation type="unfinished"></translation> </message> <message> - <source>Click here to tqreplace the next occurrence of the text you typed in.</source> + <source>Click here to replace the next occurrence of the text you typed in.</source> <translation type="unfinished"></translation> </message> <message> - <source>Click here to tqreplace all occurrences of the text you typed in.</source> + <source>Click here to replace all occurrences of the text you typed in.</source> <translation type="unfinished"></translation> </message> <message> @@ -110,7 +110,7 @@ <translation type="unfinished"></translation> </message> <message> - <source>Click here to tqfind the next occurrence of the text you typed in.</source> + <source>Click here to find the next occurrence of the text you typed in.</source> <translation type="unfinished"></translation> </message> <message> @@ -413,7 +413,7 @@ All files (*)</source> <translation type="unfinished"></translation> </message> <message> - <source>Cannot tqfind the string '%1'.</source> + <source>Cannot find the string '%1'.</source> <translation type="unfinished"></translation> </message> <message> @@ -774,7 +774,7 @@ All files (*)</source> <translation type="unfinished"></translation> </message> <message> - <source>Search for some text in the translation source file and tqreplace it by another text.</source> + <source>Search for some text in the translation source file and replace it by another text.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/tqtinterface/qt4/tools/linguist/linguist/linguist_fr.ts b/tqtinterface/qt4/tools/linguist/linguist/linguist_fr.ts index 31e6737..2c7708b 100644 --- a/tqtinterface/qt4/tools/linguist/linguist/linguist_fr.ts +++ b/tqtinterface/qt4/tools/linguist/linguist/linguist_fr.ts @@ -50,7 +50,7 @@ <translation type="unfinished"></translation> </message> <message> - <source>This window allows you to search and tqreplace some text in the translations.</source> + <source>This window allows you to search and replace some text in the translations.</source> <translation type="unfinished"></translation> </message> <message> @@ -66,11 +66,11 @@ <translation type="unfinished"></translation> </message> <message> - <source>Click here to tqreplace the next occurrence of the text you typed in.</source> + <source>Click here to replace the next occurrence of the text you typed in.</source> <translation type="unfinished"></translation> </message> <message> - <source>Click here to tqreplace all occurrences of the text you typed in.</source> + <source>Click here to replace all occurrences of the text you typed in.</source> <translation type="unfinished"></translation> </message> <message> @@ -110,7 +110,7 @@ <translation type="unfinished"></translation> </message> <message> - <source>Click here to tqfind the next occurrence of the text you typed in.</source> + <source>Click here to find the next occurrence of the text you typed in.</source> <translation type="unfinished"></translation> </message> <message> @@ -413,7 +413,7 @@ All files (*)</source> <translation type="unfinished"></translation> </message> <message> - <source>Cannot tqfind the string '%1'.</source> + <source>Cannot find the string '%1'.</source> <translation type="unfinished"></translation> </message> <message> @@ -774,7 +774,7 @@ All files (*)</source> <translation type="unfinished"></translation> </message> <message> - <source>Search for some text in the translation source file and tqreplace it by another text.</source> + <source>Search for some text in the translation source file and replace it by another text.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/tqtinterface/qt4/tools/linguist/linguist/listviews.cpp b/tqtinterface/qt4/tools/linguist/linguist/listviews.cpp index 5c298b2..5c3c747 100644 --- a/tqtinterface/qt4/tools/linguist/linguist/listviews.cpp +++ b/tqtinterface/qt4/tools/linguist/linguist/listviews.cpp @@ -109,12 +109,12 @@ int LVI::compare( TQListViewItem *other, int column, bool ascending ) const TQString thisKey = key( column, ascending ); TQString otherKey = other->key( column, ascending ); - if ( thisKey.tqcontains('&') || otherKey.tqcontains('&') ) { + if ( thisKey.contains('&') || otherKey.contains('&') ) { TQString nicerThisKey = thisKey; TQString nicerOtherKey = otherKey; - nicerThisKey.tqreplace( "&", "" ); - nicerOtherKey.tqreplace( "&", "" ); + nicerThisKey.replace( "&", "" ); + nicerOtherKey.replace( "&", "" ); int delta = nicerThisKey.localeAwareCompare( nicerOtherKey ); if ( delta != 0 ) diff --git a/tqtinterface/qt4/tools/linguist/linguist/msgedit.cpp b/tqtinterface/qt4/tools/linguist/linguist/msgedit.cpp index 744cd16..5e29875 100644 --- a/tqtinterface/qt4/tools/linguist/linguist/msgedit.cpp +++ b/tqtinterface/qt4/tools/linguist/linguist/msgedit.cpp @@ -195,7 +195,7 @@ void ShadowWidget::paintEvent( TQPaintEvent * e ) /* EditorPage class impl. - A frame that tqcontains the source text, translated text and any + A frame that contains the source text, translated text and any source code comments and hints. */ EditorPage::EditorPage( TQWidget * tqparent, const char * name ) diff --git a/tqtinterface/qt4/tools/linguist/linguist/phrase.cpp b/tqtinterface/qt4/tools/linguist/linguist/phrase.cpp index 95b4fc2..c38e9e0 100644 --- a/tqtinterface/qt4/tools/linguist/linguist/phrase.cpp +++ b/tqtinterface/qt4/tools/linguist/linguist/phrase.cpp @@ -44,11 +44,11 @@ static TQString protect( const TQString& str ) { TQString p = str; - p.tqreplace( "&", "&" ); - p.tqreplace( "\"", """ ); - p.tqreplace( ">", ">" ); - p.tqreplace( "<", "<" ); - p.tqreplace( "'", "'" ); + p.replace( "&", "&" ); + p.replace( "\"", """ ); + p.replace( ">", ">" ); + p.replace( "<", "<" ); + p.replace( "'", "'" ); return p; } diff --git a/tqtinterface/qt4/tools/linguist/linguist/simtexth.cpp b/tqtinterface/qt4/tools/linguist/linguist/simtexth.cpp index 2d13965..9d78cf7 100644 --- a/tqtinterface/qt4/tools/linguist/linguist/simtexth.cpp +++ b/tqtinterface/qt4/tools/linguist/linguist/simtexth.cpp @@ -206,7 +206,7 @@ CandidateList similarTextHeuristicCandidates( const MetaTranslator *tor, int delta = TQABS( (int) s.length() - targetLen ); /* - Here is the score formula. A comment above tqcontains a + Here is the score formula. A comment above contains a discussion on a similar (but simpler) formula. */ int score = ( (intersection(cm, cmTarget).worth() + 1) << 10 ) / diff --git a/tqtinterface/qt4/tools/linguist/linguist/trwindow.cpp b/tqtinterface/qt4/tools/linguist/linguist/trwindow.cpp index 8ebc932..564845f 100644 --- a/tqtinterface/qt4/tools/linguist/linguist/trwindow.cpp +++ b/tqtinterface/qt4/tools/linguist/linguist/trwindow.cpp @@ -290,12 +290,12 @@ TrWindow::TrWindow() phraseBooks.setAutoDelete( TRUE ); - f = new FindDialog( FALSE, this, "tqfind", FALSE ); + f = new FindDialog( FALSE, this, "find", FALSE ); f->setCaption( tqtr("TQt Linguist") ); - h = new FindDialog( TRUE, this, "tqreplace", FALSE ); + h = new FindDialog( TRUE, this, "replace", FALSE ); h->setCaption( tqtr("TQt Linguist") ); - tqfindMatchCase = FALSE; - tqfindWhere = 0; + findMatchCase = FALSE; + findWhere = 0; foundItem = 0; foundScope = 0; foundWhere = 0; @@ -320,8 +320,8 @@ TrWindow::TrWindow() connect( me, TQT_SIGNAL(nextUnfinished()), this, TQT_SLOT(nextUnfinished()) ); connect( me, TQT_SIGNAL(focusSourceList()), this, TQT_SLOT(focusSourceList()) ); connect( me, TQT_SIGNAL(focusPhraseList()), this, TQT_SLOT(focusPhraseList()) ); - connect( f, TQT_SIGNAL(tqfindNext(const TQString&, int, bool)), - this, TQT_SLOT(tqfindNext(const TQString&, int, bool)) ); + connect( f, TQT_SIGNAL(findNext(const TQString&, int, bool)), + this, TQT_SLOT(findNext(const TQString&, int, bool)) ); TQWhatsThis::add( lv, tqtr("This panel lists the source contexts.") ); @@ -378,7 +378,7 @@ void TrWindow::openFile( const TQString& name ) srcCharsSpc = 0; for ( it = all.begin(); it != all.end(); ++it ) { tqApp->processEvents(); - ContextLVI *c = contexts.tqfind( TQString((*it).context()) ); + ContextLVI *c = contexts.find( TQString((*it).context()) ); if ( c == 0 ) { c = new ContextLVI( lv, tor.toUnicode((*it).context(), (*it).utf8()) ); @@ -434,10 +434,10 @@ void TrWindow::openFile( const TQString& name ) foundWhere = 0; foundOffset = 0; if ( lv->childCount() > 0 ) { - tqfindAct->setEnabled( TRUE ); - tqfindAgainAct->setEnabled( FALSE ); + findAct->setEnabled( TRUE ); + findAgainAct->setEnabled( FALSE ); #ifdef notyet - tqreplaceAct->setEnabled( TRUE ); + replaceAct->setEnabled( TRUE ); #endif lv->setCurrentItem( lv->firstChild() ); } @@ -493,7 +493,7 @@ void TrWindow::saveAs() void TrWindow::release() { TQString newFilename = filename; - newFilename.tqreplace( TQRegExp(".ts$"), "" ); + newFilename.replace( TQRegExp(".ts$"), "" ); newFilename += TQString( ".qm" ); newFilename = TQFileDialog::getSaveFileName( newFilename, @@ -580,7 +580,7 @@ void TrWindow::print() } } -void TrWindow::tqfind() +void TrWindow::find() { h->hide(); f->show(); @@ -588,7 +588,7 @@ void TrWindow::tqfind() f->raise(); } -void TrWindow::tqfindAgain() +void TrWindow::findAgain() { int pass = 0; int oldItemNo = itemToIndex( slv, slv->currentItem() ); @@ -685,13 +685,13 @@ void TrWindow::tqfindAgain() slv->triggerUpdate(); tqApp->beep(); TQMessageBox::warning( this, tqtr("TQt Linguist"), - TQString( tqtr("Cannot tqfind the string '%1'.") ).arg(tqfindText) ); + TQString( tqtr("Cannot find the string '%1'.") ).arg(findText) ); foundItem = 0; foundWhere = 0; foundOffset = 0; } -void TrWindow::tqreplace() +void TrWindow::replace() { f->hide(); h->show(); @@ -729,8 +729,8 @@ TQListViewItem * TrWindow::indexToItem( TQListView * view, int index ) bool TrWindow::searchItem( const TQString & searchWhat, TQListViewItem * j, TQListViewItem * k ) { - if ( (tqfindWhere & foundWhere) != 0 ) { - foundOffset = searchWhat.tqfind( tqfindText, foundOffset, tqfindMatchCase ); + if ( (findWhere & foundWhere) != 0 ) { + foundOffset = searchWhat.find( findText, foundOffset, findMatchCase ); if ( foundOffset >= 0 ) { foundItem = itemToIndex( slv, k ); foundScope = j; @@ -776,7 +776,7 @@ void TrWindow::openPhraseBook() "All files (*)"), this, "open_phrasebook", tqtr("Open Phrase Book") ); - if ( !name.isEmpty() && !phraseBookNames.tqcontains(name) ) { + if ( !name.isEmpty() && !phraseBookNames.contains(name) ) { if ( openPhraseBook(name) ) { int n = (int)(phraseBooks.at( phraseBooks.count() - 1 )->count()); statusBar()->message( tqtr("%1 phrase(s) loaded.").arg(n), @@ -958,7 +958,7 @@ void TrWindow::showNewScope( TQListViewItem *item ) // Make sure that we update the source text and translation text. Use the first message in the new scope. setCurrentMessageItem(slv->firstChild()); - // This must be explicitly called since the signal is not emitted if the context only tqcontains one item + // This must be explicitly called since the signal is not emitted if the context only contains one item showNewCurrent(slv->firstChild()); slv->viewport()->setUpdatesEnabled( upe ); slv->setUpdatesEnabled( upe ); @@ -1342,15 +1342,15 @@ void TrWindow::next() } -void TrWindow::tqfindNext( const TQString& text, int where, bool matchCase ) +void TrWindow::findNext( const TQString& text, int where, bool matchCase ) { - tqfindText = text; - if ( tqfindText.isEmpty() ) - tqfindText = TQString( "magicwordthatyoushouldavoid" ); - tqfindWhere = where; - tqfindMatchCase = matchCase; - tqfindAgainAct->setEnabled( TRUE ); - tqfindAgain(); + findText = text; + if ( findText.isEmpty() ) + findText = TQString( "magicwordthatyoushouldavoid" ); + findWhere = where; + findMatchCase = matchCase; + findAgainAct->setEnabled( TRUE ); + findAgain(); } void TrWindow::revalidate() @@ -1384,8 +1384,8 @@ void TrWindow::revalidate() TQString TrWindow::friendlyString( const TQString& str ) { TQString f = str.lower(); - f.tqreplace( TQRegExp(TQString("[.,:;!?()-]")), TQString(" ") ); - f.tqreplace( "&", TQString("") ); + f.replace( TQRegExp(TQString("[.,:;!?()-]")), TQString(" ") ); + f.replace( "&", TQString("") ); f = f.simplifyWhiteSpace(); f = f.lower(); return f; @@ -1478,16 +1478,16 @@ void TrWindow::setupMenuBar() TQString(), TQAccel::stringToKey(tqtr("Ctrl+A")) ); selectAllAct->setEnabled( FALSE ); editp->insertSeparator(); - tqfindAct = new Action( editp, tqtr("&Find..."), TQT_TQOBJECT(this), TQT_SLOT(tqfind()), + findAct = new Action( editp, tqtr("&Find..."), TQT_TQOBJECT(this), TQT_SLOT(find()), "searchfind.png", TQAccel::stringToKey(tqtr("Ctrl+F")) ); - tqfindAct->setEnabled( FALSE ); - tqfindAgainAct = new Action( editp, tqtr("Find &Next"), - TQT_TQOBJECT(this), TQT_SLOT(tqfindAgain()), TQString(), Qt::Key_F3 ); - tqfindAgainAct->setEnabled( FALSE ); + findAct->setEnabled( FALSE ); + findAgainAct = new Action( editp, tqtr("Find &Next"), + TQT_TQOBJECT(this), TQT_SLOT(findAgain()), TQString(), Qt::Key_F3 ); + findAgainAct->setEnabled( FALSE ); #ifdef notyet - tqreplaceAct = new Action( editp, tqtr("&Replace..."), TQT_TQOBJECT(this), TQT_SLOT(tqreplace()), + replaceAct = new Action( editp, tqtr("&Replace..."), TQT_TQOBJECT(this), TQT_SLOT(replace()), TQAccel::stringToKey(tqtr("Ctrl+H")) ); - tqreplaceAct->setEnabled( FALSE ); + replaceAct->setEnabled( FALSE ); #endif // Translation menu @@ -1591,12 +1591,12 @@ void TrWindow::setupMenuBar() pasteAct->setWhatsThis( tqtr("Paste the clipboard text into the" " translation.") ); selectAllAct->setWhatsThis( tqtr("Select the whole translation text.") ); - tqfindAct->setWhatsThis( tqtr("Search for some text in the translation " + findAct->setWhatsThis( tqtr("Search for some text in the translation " "source file.") ); - tqfindAgainAct->setWhatsThis( tqtr("Continue the search where it was left.") ); + findAgainAct->setWhatsThis( tqtr("Continue the search where it was left.") ); #ifdef notyet - tqreplaceAct->setWhatsThis( tqtr("Search for some text in the translation" - " source file and tqreplace it by another" + replaceAct->setWhatsThis( tqtr("Search for some text in the translation" + " source file and replace it by another" " text.") ); #endif @@ -1654,13 +1654,13 @@ void TrWindow::setupToolBars() copyAct->addToToolbar( editt, tqtr("Copy") ); pasteAct->addToToolbar( editt, tqtr("Paste") ); editt->addSeparator(); - tqfindAct->addToToolbar( editt, tqtr("Find") ); + findAct->addToToolbar( editt, tqtr("Find") ); #ifdef notyet - tqreplaceAct->addToToolbar( editt, tqtr("Replace") ); + replaceAct->addToToolbar( editt, tqtr("Replace") ); #endif // beginFromSourceAct->addToToolbar( translationst, - // tqtr("Begin from Source"), "searchtqfind" ); + // tqtr("Begin from Source"), "searchfind" ); prevAct->addToToolbar( translationst, tqtr("Prev") ); nextAct->addToToolbar( translationst, tqtr("Next") ); prevUnfinishedAct->addToToolbar( translationst, tqtr("Prev Unfinished") ); @@ -1718,7 +1718,7 @@ bool TrWindow::openPhraseBook( const TQString& name ) bool TrWindow::savePhraseBook( TQString& name, const PhraseBook& pb ) { - if ( !name.tqcontains( ".qph" ) && !name.tqcontains(".") ) + if ( !name.contains( ".qph" ) && !name.contains(".") ) name += ".qph"; if ( !pb.save(name) ) { @@ -1754,7 +1754,7 @@ void TrWindow::updatePhraseDict() TQString f = friendlyString( (*p).source() ); if ( f.length() > 0 ) { f = TQStringList::split( TQChar(' '), f ).first(); - ent = phraseDict.tqfind( f ); + ent = phraseDict.find( f ); if ( ent == 0 ) { ent = new PhraseBook; phraseDict.insert( f, ent ); @@ -1776,10 +1776,10 @@ PhraseBook TrWindow::getPhrases( const TQString& source ) PhraseBook::Iterator p; for ( w = lookupWords.begin(); w != lookupWords.end(); ++w ) { - PhraseBook *ent = phraseDict.tqfind( *w ); + PhraseBook *ent = phraseDict.find( *w ); if ( ent != 0 ) { for ( p = ent->begin(); p != ent->end(); ++p ) { - if ( f.tqfind(friendlyString((*p).source())) >= 0 ) + if ( f.find(friendlyString((*p).source())) >= 0 ) phrases.append( *p ); } } @@ -1822,11 +1822,11 @@ bool TrWindow::danger( const TQString& source, const TQString& translation, PhraseBook::Iterator p; for ( w = lookupWords.begin(); w != lookupWords.end(); ++w ) { - PhraseBook *ent = phraseDict.tqfind( *w ); + PhraseBook *ent = phraseDict.find( *w ); if ( ent != 0 ) { for ( p = ent->begin(); p != ent->end(); ++p ) { - if ( fsource.tqfind(friendlyString((*p).source())) < 0 || - ftranslation.tqfind(friendlyString((*p).target())) >= 0 ) + if ( fsource.find(friendlyString((*p).source())) < 0 || + ftranslation.find(friendlyString((*p).target())) >= 0 ) break; } if ( p == ent->end() ) { @@ -1977,7 +1977,7 @@ void TrWindow::recentFileActivated( int id ) void TrWindow::addRecentlyOpenedFile( const TQString &fn, TQStringList &lst ) { - if ( lst.tqfind( fn ) != lst.end() ) + if ( lst.find( fn ) != lst.end() ) return; if ( lst.count() >= 10 ) lst.remove( lst.begin() ); diff --git a/tqtinterface/qt4/tools/linguist/linguist/trwindow.h b/tqtinterface/qt4/tools/linguist/linguist/trwindow.h index 3e69534..142fde2 100644 --- a/tqtinterface/qt4/tools/linguist/linguist/trwindow.h +++ b/tqtinterface/qt4/tools/linguist/linguist/trwindow.h @@ -96,9 +96,9 @@ private Q_SLOTS: void saveAs(); void release(); void print(); - void tqfind(); - void tqfindAgain(); - void tqreplace(); + void find(); + void findAgain(); + void replace(); void newPhraseBook(); void openPhraseBook(); void closePhraseBook( int id ); @@ -119,7 +119,7 @@ private Q_SLOTS: void toggleFinished( TQListViewItem *item, const TQPoint& p, int column ); void prevUnfinished(); void nextUnfinished(); - void tqfindNext( const TQString& text, int where, bool matchCase ); + void findNext( const TQString& text, int where, bool matchCase ); void revalidate(); void toggleGuessing(); void focusSourceList(); @@ -179,9 +179,9 @@ private: FindDialog *f; FindDialog *h; - TQString tqfindText; - int tqfindWhere; - bool tqfindMatchCase; + TQString findText; + int findWhere; + bool findMatchCase; int foundItem; TQListViewItem *foundScope; int foundWhere; @@ -207,9 +207,9 @@ private: Action *copyAct; Action *pasteAct; Action *selectAllAct; - Action *tqfindAct; - Action *tqfindAgainAct; - Action *tqreplaceAct; + Action *findAct; + Action *findAgainAct; + Action *replaceAct; Action *newPhraseBookAct; Action *openPhraseBookAct; Action *acceleratorsAct; diff --git a/tqtinterface/qt4/tools/linguist/lrelease/main.cpp b/tqtinterface/qt4/tools/linguist/lrelease/main.cpp index a23f2ec..1f68326 100644 --- a/tqtinterface/qt4/tools/linguist/lrelease/main.cpp +++ b/tqtinterface/qt4/tools/linguist/lrelease/main.cpp @@ -65,7 +65,7 @@ static bool loadTsFile( MetaTranslator& tor, const TQString& tsFileName, bool /* verbose */ ) { TQString qmFileName = tsFileName; - qmFileName.tqreplace( TQRegExp("\\.ts$"), "" ); + qmFileName.replace( TQRegExp("\\.ts$"), "" ); qmFileName += ".qm"; bool ok = tor.load( tsFileName ); @@ -96,7 +96,7 @@ static void releaseTsFile( const TQString& tsFileName, bool verbose, MetaTranslator tor; if ( loadTsFile(tor, tsFileName, verbose) ) { TQString qmFileName = tsFileName; - qmFileName.tqreplace( TQRegExp("\\.ts$"), "" ); + qmFileName.replace( TQRegExp("\\.ts$"), "" ); qmFileName += ".qm"; releaseMetaTranslator( tor, qmFileName, verbose, stripped ); } @@ -163,7 +163,7 @@ int main( int argc, char **argv ) TQString fullText = t.read(); f.close(); - if ( fullText.tqfind(TQString("<!DOCTYPE TS>")) >= 0 ) { + if ( fullText.find(TQString("<!DOCTYPE TS>")) >= 0 ) { if ( outputFile.isEmpty() ) { releaseTsFile( argv[i], verbose, stripped ); } else { diff --git a/tqtinterface/qt4/tools/linguist/lupdate/fetchtr.cpp b/tqtinterface/qt4/tools/linguist/lupdate/fetchtr.cpp index 3d3f185..de638f7 100644 --- a/tqtinterface/qt4/tools/linguist/lupdate/fetchtr.cpp +++ b/tqtinterface/qt4/tools/linguist/lupdate/fetchtr.cpp @@ -185,7 +185,7 @@ static int getToken() break; case 'f': /* - TQTranslator::tqfindMessage() has the same parameters as + TQTranslator::findMessage() has the same parameters as TQApplication::translate(). */ if ( strcmp(yyIdent + 1, "indMessage") == 0 ) @@ -228,7 +228,7 @@ static int getToken() delta; } - The code tqcontains, indeed, two opening braces for + The code contains, indeed, two opening braces for one closing brace; yet there's no reason to panic. The solution is to remember yyBraceDepth as it was @@ -424,8 +424,8 @@ static int getToken() /* The second part of this source file is the parser. It accomplishes - a very easy task: It tqfinds all strings inside a tr() or translate() - call, and possibly tqfinds out the context of the call. It supports + a very easy task: It finds all strings inside a tr() or translate() + call, and possibly finds out the context of the call. It supports three cases: (1) the context is specified, as in FunnyDialog::tr("Hello") or translate("FunnyDialog", "Hello"); (2) the call appears within an inlined function; (3) the call @@ -545,12 +545,12 @@ static void parse( MetaTranslator *tor, const char *initialContext, } prefix = (const char *) 0; - if ( qualifiedContexts.tqcontains(context) ) + if ( qualifiedContexts.contains(context) ) context = qualifiedContexts[context]; tor->insert( MetaTranslatorMessage(context, text, com, TQString(), utf8) ); - if ( lacks_TQ_OBJECT.tqcontains(context) ) { + if ( lacks_TQ_OBJECT.contains(context) ) { qWarning( "%s:%d: Class '%s' lacks TQ_OBJECT macro", (const char *) yyFileName, yyLineNo, (const char *) context ); @@ -597,7 +597,7 @@ static void parse( MetaTranslator *tor, const char *initialContext, com = com.simplifyWhiteSpace(); if ( com.left(sizeof(MagicComment) - 1) == MagicComment ) { com.remove( 0, sizeof(MagicComment) - 1 ); - int k = com.tqfind( ' ' ); + int k = com.find( ' ' ); if ( k == -1 ) { context = com; } else { @@ -612,7 +612,7 @@ static void parse( MetaTranslator *tor, const char *initialContext, namespace". See the manual for details. */ k = 0; - while ( (k = context.tqfind("::", k)) != -1 ) { + while ( (k = context.find("::", k)) != -1 ) { qualifiedContexts.insert( context.mid(k + 2), context ); k++; } @@ -638,7 +638,7 @@ static void parse( MetaTranslator *tor, const char *initialContext, namespaces.remove( namespaces.fromLast() ); if ( yyBraceDepth == (int) namespaces.count() ) { if ( missing_TQ_OBJECT ) { - if ( needs_TQ_OBJECT.tqcontains(functionContext) ) { + if ( needs_TQ_OBJECT.contains(functionContext) ) { qWarning( "%s:%d: Class '%s' lacks TQ_OBJECT macro", (const char *) yyFileName, yyLineNo, (const char *) functionContext ); @@ -748,7 +748,7 @@ bool UiHandler::endElement( const TQString& /* namespaceURI */, const TQString& /* localName */, const TQString& qName ) { - accum.tqreplace( TQRegExp(TQString("\r\n")), "\n" ); + accum.replace( TQRegExp(TQString("\r\n")), "\n" ); if ( qName == TQString("class") ) { if ( context.isEmpty() ) diff --git a/tqtinterface/qt4/tools/linguist/lupdate/merge.cpp b/tqtinterface/qt4/tools/linguist/lupdate/merge.cpp index bc409db..f734763 100644 --- a/tqtinterface/qt4/tools/linguist/lupdate/merge.cpp +++ b/tqtinterface/qt4/tools/linguist/lupdate/merge.cpp @@ -66,7 +66,7 @@ void merge( MetaTranslator *tor, const MetaTranslator *virginTor, bool verbose ) // skip context comment if ( !TQCString((*it).sourceText()).isEmpty() ) { - if ( !virginTor->tqcontains((*it).context(), (*it).sourceText(), + if ( !virginTor->contains((*it).context(), (*it).sourceText(), (*it).comment()) ) { newType = MetaTranslatorMessage::Obsolete; if ( m.type() != MetaTranslatorMessage::Obsolete ) @@ -102,7 +102,7 @@ void merge( MetaTranslator *tor, const MetaTranslator *virginTor, bool verbose ) all = virginTor->messages(); for ( it = all.begin(); it != all.end(); ++it ) { - if ( !tor->tqcontains((*it).context(), (*it).sourceText(), + if ( !tor->contains((*it).context(), (*it).sourceText(), (*it).comment()) ) { tor->insert( *it ); if ( !TQCString((*it).sourceText()).isEmpty() ) diff --git a/tqtinterface/qt4/tools/linguist/lupdate/numberh.cpp b/tqtinterface/qt4/tools/linguist/lupdate/numberh.cpp index ba54dae..cc16014 100644 --- a/tqtinterface/qt4/tools/linguist/lupdate/numberh.cpp +++ b/tqtinterface/qt4/tools/linguist/lupdate/numberh.cpp @@ -64,7 +64,7 @@ static int numberLength( const char *s ) } /* - Returns a version of 'key' where all numbers have been tqreplaced by zeroes. If + Returns a version of 'key' where all numbers have been replaced by zeroes. If there were none, returns "". */ static TQCString zeroKey( const char *key ) @@ -97,7 +97,7 @@ static TQString translationAttempt( const TQString& oldTranslation, const char *oldSource, const char *newSource ) { - int p = zeroKey( oldSource ).tqcontains( '0' ); + int p = zeroKey( oldSource ).contains( '0' ); int oldSourceLen = tqstrlen( oldSource ); TQString attempt; TQStringList oldNumbers; @@ -134,7 +134,7 @@ static TQString translationAttempt( const TQString& oldTranslation, /* We now go over the old translation, "XeT 3.0", one letter at a time, looking for numbers found in oldNumbers. Whenever such a - number is met, it is tqreplaced with its newNumber equivalent. In + number is met, it is replaced with its newNumber equivalent. In our example, the "3.0" of "XeT 3.0" becomes "3.1". */ for ( i = 0; i < (int) oldTranslation.length(); i++ ) { @@ -147,7 +147,7 @@ static TQString translationAttempt( const TQString& oldTranslation, } /* - Let's tqfind out if the last character ended a match. We make + Let's find out if the last character ended a match. We make two passes over the data. In the first pass, we try to match only numbers that weren't matched yet; if that fails, the second pass does the trick. This is useful in some @@ -232,7 +232,7 @@ void applyNumberHeuristic( MetaTranslator *tor, bool verbose ) } for ( u = untranslated.begin(); u != untranslated.end(); ++u ) { - t = translated.tqfind( zeroKey((*u).sourceText()) ); + t = translated.find( zeroKey((*u).sourceText()) ); if ( t != translated.end() && !t.key().isEmpty() && qstrcmp((*t).sourceText(), (*u).sourceText()) != 0 ) { MetaTranslatorMessage m( *u ); diff --git a/tqtinterface/qt4/tools/linguist/lupdate/sametexth.cpp b/tqtinterface/qt4/tools/linguist/lupdate/sametexth.cpp index 456ad7d..4679917 100644 --- a/tqtinterface/qt4/tools/linguist/lupdate/sametexth.cpp +++ b/tqtinterface/qt4/tools/linguist/lupdate/sametexth.cpp @@ -64,7 +64,7 @@ void applySameTextHeuristic( MetaTranslator *tor, bool verbose ) untranslated.append( *it ); } else { TQCString key = (*it).sourceText(); - t = translated.tqfind( key ); + t = translated.find( key ); if ( t != translated.end() ) { /* The same source text is translated at least two @@ -74,7 +74,7 @@ void applySameTextHeuristic( MetaTranslator *tor, bool verbose ) translated.remove( key ); avoid.insert( key, *it ); } - } else if ( !avoid.tqcontains(key) && + } else if ( !avoid.contains(key) && !(*it).translation().isEmpty() ) { translated.insert( key, *it ); } @@ -83,7 +83,7 @@ void applySameTextHeuristic( MetaTranslator *tor, bool verbose ) for ( u = untranslated.begin(); u != untranslated.end(); ++u ) { TQCString key = (*u).sourceText(); - t = translated.tqfind( key ); + t = translated.find( key ); if ( t != translated.end() ) { MetaTranslatorMessage m( *u ); m.setTranslation( (*t).translation() ); diff --git a/tqtinterface/qt4/tools/linguist/phrasebooks/danish.qph b/tqtinterface/qt4/tools/linguist/phrasebooks/danish.qph index 7a71500..906f547 100644 --- a/tqtinterface/qt4/tools/linguist/phrasebooks/danish.qph +++ b/tqtinterface/qt4/tools/linguist/phrasebooks/danish.qph @@ -260,7 +260,7 @@ </phrase> <phrase> <source>Explore</source> - <target>Stitqfinder</target> + <target>Stifinder</target> </phrase> <phrase> <source>extended selection</source> @@ -993,7 +993,7 @@ </phrase> <phrase> <source>Windows Explorer</source> - <target>Windows Stitqfinder</target> + <target>Windows Stifinder</target> </phrase> <phrase> <source>wizard</source> diff --git a/tqtinterface/qt4/tools/linguist/qm2ts/main.cpp b/tqtinterface/qt4/tools/linguist/qm2ts/main.cpp index 71e361d..92b56d6 100644 --- a/tqtinterface/qt4/tools/linguist/qm2ts/main.cpp +++ b/tqtinterface/qt4/tools/linguist/qm2ts/main.cpp @@ -72,7 +72,7 @@ int main( int argc, char **argv ) TQTranslator tor( 0 ); if ( tor.load(argv[i], ".") ) { TQString g = argv[i]; - g.tqreplace( TQRegExp(TQString("\\.qm$")), TQString() ); + g.replace( TQRegExp(TQString("\\.qm$")), TQString() ); g += TQString( ".ts" ); if ( verbose ) diff --git a/tqtinterface/qt4/tools/linguist/qm2ts/qm2ts.1 b/tqtinterface/qt4/tools/linguist/qm2ts/qm2ts.1 index 6cdf129..e1eb472 100644 --- a/tqtinterface/qt4/tools/linguist/qm2ts/qm2ts.1 +++ b/tqtinterface/qt4/tools/linguist/qm2ts/qm2ts.1 @@ -28,7 +28,7 @@ and .B qm2ts is provided to ease porting from the old internationalization tools -.B (tqfindtr, +.B (findtr, .B mergetr and .B msg2qm) diff --git a/tqtinterface/qt4/tools/linguist/shared/metatranslator.cpp b/tqtinterface/qt4/tools/linguist/shared/metatranslator.cpp index e6cde6c..fee2a00 100644 --- a/tqtinterface/qt4/tools/linguist/shared/metatranslator.cpp +++ b/tqtinterface/qt4/tools/linguist/shared/metatranslator.cpp @@ -180,7 +180,7 @@ bool TsHandler::endElement( const TQString& /* namespaceURI */, bool TsHandler::characters( const TQString& ch ) { TQString t = ch; - t.tqreplace( "\r", "" ); + t.replace( "\r", "" ); accum += t; return TRUE; } @@ -482,8 +482,8 @@ bool MetaTranslator::release( const TQString& filename, bool verbose, sourceText, comment0). */ if ( comment.isEmpty() - || tqcontains(context, sourceText, "") - || !tor.tqfindMessage(context, sourceText, "").translation() + || contains(context, sourceText, "") + || !tor.findMessage(context, sourceText, "").translation() .isNull() ) { tor.insert( m.key() ); } else { @@ -503,20 +503,20 @@ bool MetaTranslator::release( const TQString& filename, bool verbose, return saved; } -bool MetaTranslator::tqcontains( const char *context, const char *sourceText, +bool MetaTranslator::contains( const char *context, const char *sourceText, const char *comment ) const { - return mm.tqfind( MetaTranslatorMessage(context, sourceText, comment) ) != + return mm.find( MetaTranslatorMessage(context, sourceText, comment) ) != mm.end(); } void MetaTranslator::insert( const MetaTranslatorMessage& m ) { int pos = (int)mm.count(); - TMM::Iterator n = mm.tqfind( m ); + TMM::Iterator n = mm.find( m ); if ( n != mm.end() ) pos = *n; - mm.tqreplace( m, pos ); + mm.replace( m, pos ); } void MetaTranslator::stripObsoleteMessages() diff --git a/tqtinterface/qt4/tools/linguist/shared/metatranslator.h b/tqtinterface/qt4/tools/linguist/shared/metatranslator.h index 1673d57..52b2504 100644 --- a/tqtinterface/qt4/tools/linguist/shared/metatranslator.h +++ b/tqtinterface/qt4/tools/linguist/shared/metatranslator.h @@ -89,7 +89,7 @@ public: bool release( const TQString& filename, bool verbose = FALSE, TQTranslator::SaveMode mode = TQTranslator::Stripped ) const; - bool tqcontains( const char *context, const char *sourceText, + bool contains( const char *context, const char *sourceText, const char *comment ) const; void insert( const MetaTranslatorMessage& m ); diff --git a/tqtinterface/qt4/tools/linguist/shared/proparser.cpp b/tqtinterface/qt4/tools/linguist/shared/proparser.cpp index 12af0ec..ab32500 100644 --- a/tqtinterface/qt4/tools/linguist/shared/proparser.cpp +++ b/tqtinterface/qt4/tools/linguist/shared/proparser.cpp @@ -77,7 +77,7 @@ TQMap<TQString, TQString> proFileTagMap( const TQString& text ) still need to do it after we include to make sure the included file does not have comments */ - t.tqreplace( TQRegExp(TQString("#[^\n]*\n")), TQString(" ") ); + t.replace( TQRegExp(TQString("#[^\n]*\n")), TQString(" ") ); /* Process include() commands. @@ -89,39 +89,39 @@ TQMap<TQString, TQString> proFileTagMap( const TQString& text ) while ( (i = callToInclude.search(t, i)) != -1 ) { bool doneWithVar = false; TQString fileName = callToInclude.cap(1); - TQString after = fileName.tqreplace("$$PWD", TQDir::currentDirPath()); - if (!tagMap.isEmpty() && after.tqcontains("$$")) { + TQString after = fileName.replace("$$PWD", TQDir::currentDirPath()); + if (!tagMap.isEmpty() && after.contains("$$")) { TQRegExp var( "\\$\\$[({]?([a-zA-Z0-9_]+)[)}]?" ); int ii = 0; - while ((ii = after.tqfind(var, ii)) != -1) { - if (tagMap.tqcontains(var.cap(1))) { - after.tqreplace(ii, var.cap(0).length(), tagMap[var.cap(1)]); - } else { // Couldn't tqfind it + while ((ii = after.find(var, ii)) != -1) { + if (tagMap.contains(var.cap(1))) { + after.replace(ii, var.cap(0).length(), tagMap[var.cap(1)]); + } else { // Couldn't find it doneWithVar = true; break; } } } - if (doneWithVar || !after.tqcontains("$$")) { + if (doneWithVar || !after.contains("$$")) { after = loadFile(after); TQFileInfo fi(callToInclude.cap(1)); - after.tqreplace("$$PWD", fi.dirPath()); - t.tqreplace( i, callToInclude.matchedLength(), after ); + after.replace("$$PWD", fi.dirPath()); + t.replace( i, callToInclude.matchedLength(), after ); } i += after.length(); } /* Strip comments, merge lines ending with backslash, add - spaces around '=' and '+=', tqreplace '\n' with ';', and + spaces around '=' and '+=', replace '\n' with ';', and simplify white spaces. */ - t.tqreplace( TQRegExp(TQString("#[^\n]*\n")), TQString(" ") ); - t.tqreplace( TQRegExp(TQString("\\\\[^\n\\S]*\n")), TQString(" ") ); - t.tqreplace( "=", TQString(" = ") ); - t.tqreplace( "+ =", TQString(" += ") ); - t.tqreplace( "\n", TQString(";") ); + t.replace( TQRegExp(TQString("#[^\n]*\n")), TQString(" ") ); + t.replace( TQRegExp(TQString("\\\\[^\n\\S]*\n")), TQString(" ") ); + t.replace( "=", TQString(" = ") ); + t.replace( "+ =", TQString(" += ") ); + t.replace( "\n", TQString(";") ); t = t.simplifyWhiteSpace(); /* @@ -135,7 +135,7 @@ TQMap<TQString, TQString> proFileTagMap( const TQString& text ) if ( toks.count() >= 3 && (toks[1] == TQString("=") || toks[1] == TQString("+=")) ) { TQString tag = toks.first(); - int k = tag.tqfindRev( TQChar(':') ); // as in 'unix:' + int k = tag.findRev( TQChar(':') ); // as in 'unix:' if ( k != -1 ) tag = tag.mid( k + 1 ); toks.remove( toks.begin() ); @@ -143,9 +143,9 @@ TQMap<TQString, TQString> proFileTagMap( const TQString& text ) TQString action = toks.first(); toks.remove( toks.begin() ); - if ( tagMap.tqcontains(tag) ) { + if ( tagMap.contains(tag) ) { if ( action == TQString("=") ) - tagMap.tqreplace( tag, toks.join(TQChar(' ')) ); + tagMap.replace( tag, toks.join(TQChar(' ')) ); else tagMap[tag] += TQChar( ' ' ) + toks.join( TQChar(' ') ); } else { @@ -171,11 +171,11 @@ TQMap<TQString, TQString> proFileTagMap( const TQString& text ) // skip system(); it will be handled in the next pass ++i; } else { - if ( tagMap.tqcontains(invocation) ) + if ( tagMap.contains(invocation) ) after = tagMap[invocation]; else if (invocation.lower() == "pwd") after = TQDir::currentDirPath(); - (*it).tqreplace( i, len, after ); + (*it).replace( i, len, after ); i += after.length(); } } @@ -207,7 +207,7 @@ TQMap<TQString, TQString> proFileTagMap( const TQString& text ) buff[read_in] = '\0'; after += buff; } - (*it).tqreplace( i, callToSystem.matchedLength(), after ); + (*it).replace( i, callToSystem.matchedLength(), after ); i += after.length(); } } diff --git a/tqtinterface/qt4/tools/makeqpf/main.cpp b/tqtinterface/qt4/tools/makeqpf/main.cpp index 3425549..98f548e 100644 --- a/tqtinterface/qt4/tools/makeqpf/main.cpp +++ b/tqtinterface/qt4/tools/makeqpf/main.cpp @@ -284,7 +284,7 @@ int main(int argc, char** argv) TQStringList r = TQStringList::split(',',ranges); for (TQStringList::Iterator it=r.begin(); it!=r.end(); ++it) { TQString rng = *it; - int dash = rng.tqfind('-'); + int dash = rng.find('-'); int from,to; if ( dash==0 ) { from=0; diff --git a/tqtinterface/qt4/tools/mergetr/mergetr.cpp b/tqtinterface/qt4/tools/mergetr/mergetr.cpp index c0a33b6..43ccd25 100644 --- a/tqtinterface/qt4/tools/mergetr/mergetr.cpp +++ b/tqtinterface/qt4/tools/mergetr/mergetr.cpp @@ -1,7 +1,7 @@ /********************************************************************** ** Copyright (C) 1998-2008 Trolltech ASA. All rights reserved. ** -** This is a utility program for merging tqfindtr msgfiles +** This is a utility program for merging findtr msgfiles ** ** This file may be used under the terms of the GNU General ** Public License versions 2.0 or 3.0 as published by the Free @@ -184,7 +184,7 @@ void writecomment( TQTextStream &str, const TQString &s ) int idx = 0; int len = s.length(); while ( idx < len ) { - int nl = s.tqfind( '\n', idx ); + int nl = s.find( '\n', idx ); if ( nl < 0 ) { qWarning( "writecomment: string lacks newline" ); str << "# " << s.mid( idx ) << '\n'; diff --git a/tqtinterface/qt4/tools/msg2qm/msg2qm.cpp b/tqtinterface/qt4/tools/msg2qm/msg2qm.cpp index 96e77c3..ca02cc9 100644 --- a/tqtinterface/qt4/tools/msg2qm/msg2qm.cpp +++ b/tqtinterface/qt4/tools/msg2qm/msg2qm.cpp @@ -1,7 +1,7 @@ /********************************************************************** ** Copyright (C) 1998-2008 Trolltech ASA. All rights reserved. ** -** This is a utility program for converting tqfindtr msgfiles to +** This is a utility program for converting findtr msgfiles to ** qtranslator message files ** ** This file may be used under the terms of the GNU General @@ -51,7 +51,7 @@ bool hasHandle( const TQString& line, const TQString& handle) TQString extractContents( const TQString& line ) { TQString contents; - if ( line.tqcontains('\"') < 2) + if ( line.contains('\"') < 2) return contents; int pos = 0; while ( pos < int(line.length()) && line[pos] != '\"' ) @@ -101,7 +101,7 @@ void addTranslation( TQTranslator* translator, const TQString& msgid, const TQSt if (!msgid.isNull() && !msgstr.isNull() ) { TQString scope = ""; TQString id = msgid; - int coloncolon = msgid.tqfind("::"); + int coloncolon = msgid.find("::"); if (coloncolon != -1) { scope = msgid.left( coloncolon ); id = msgid.right( msgid.length() - scope.length() - 2 ); @@ -109,7 +109,7 @@ void addTranslation( TQTranslator* translator, const TQString& msgid, const TQSt else if (defaultScope) scope = *defaultScope; - if (translator->tqcontains( scope.ascii(), id.ascii() ) ) { + if (translator->contains( scope.ascii(), id.ascii() ) ) { qWarning("Error: \"%s\" already in use", msgid.ascii() ); } else { @@ -182,7 +182,7 @@ void translate( const TQString& filename, const TQString& qmfile ) if ( pass == 0 && msgid.isEmpty() ) { // Check for the encoding. - int cpos = msgstr.tqfind( "charset=" ); + int cpos = msgstr.find( "charset=" ); if ( cpos >= 0 ) { cpos = cpos + 8; //skip "charset=" int i = cpos; diff --git a/tqtinterface/qt4/tools/qconfig/LICENSE.GPL b/tqtinterface/qt4/tools/qconfig/LICENSE.GPL index 149f4ac..3221c03 100644 --- a/tqtinterface/qt4/tools/qconfig/LICENSE.GPL +++ b/tqtinterface/qt4/tools/qconfig/LICENSE.GPL @@ -59,7 +59,7 @@ modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License applies to any program or other work which tqcontains + 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" @@ -96,7 +96,7 @@ above, provided that you also meet all of these conditions: stating that you changed the files and the date of any change. b) You must cause any work that you distribute or publish, that in - whole or in part tqcontains or is derived from the Program or any + whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. @@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following: The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source -code means all the source code for all modules it tqcontains, plus any +code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include diff --git a/tqtinterface/qt4/tools/qconfig/main.cpp b/tqtinterface/qt4/tools/qconfig/main.cpp index 22b6a8b..39ee580 100644 --- a/tqtinterface/qt4/tools/qconfig/main.cpp +++ b/tqtinterface/qt4/tools/qconfig/main.cpp @@ -438,7 +438,7 @@ void Main::loadFeatures(const TQString& filename) nextline = s.readLine(); } - int colon = line.tqfind(':'); + int colon = line.find(':'); if ( colon < 0 ) { qDebug("Cannot parse: %s",line.ascii()); } else { @@ -470,7 +470,7 @@ void Main::loadFeatures(const TQString& filename) do { TQString line = s.readLine(); - line.tqreplace(TQRegExp("# *define"),"#define"); + line.replace(TQRegExp("# *define"),"#define"); TQStringList token = TQStringList::split(TQChar(' '),line); if ( on ) { diff --git a/tqtinterface/qt4/tools/qembed/qembed.cpp b/tqtinterface/qt4/tools/qembed/qembed.cpp index 9c11bc2..763340f 100644 --- a/tqtinterface/qt4/tools/qembed/qembed.cpp +++ b/tqtinterface/qt4/tools/qembed/qembed.cpp @@ -80,7 +80,7 @@ int main( int argc, char **argv ) #ifdef TQ_WS_WIN // Since wildcards are not expanded automatically for us on Windows, we need to do // it ourselves - if ( file.tqcontains( '*' ) || file.tqcontains( '?' ) ) { + if ( file.contains( '*' ) || file.contains( '?' ) ) { TQDir d; const TQFileInfoList *fiList = d.entryInfoList( file, TQDir::Files ); TQFileInfoListIterator it(*fiList); @@ -189,10 +189,10 @@ int main( int argc, char **argv ) out << " { 0, 0, 0 }\n};\n"; out << "\n" -"static const TQByteArray& qembed_tqfindData( const char* name )\n" +"static const TQByteArray& qembed_findData( const char* name )\n" "{\n" " static TQDict<TQByteArray> dict;\n" -" TQByteArray* ba = dict.tqfind( name );\n" +" TQByteArray* ba = dict.find( name );\n" " if ( !ba ) {\n" " for ( int i = 0; embed_vec[i].data; i++ ) {\n" " if ( strcmp(embed_vec[i].name, name) == 0 ) {\n" @@ -243,10 +243,10 @@ int main( int argc, char **argv ) out << " { 0, 0, 0, 0, 0, 0, 0, 0 }\n};\n"; out << "\n" -"static const TQImage& qembed_tqfindImage( const TQString& name )\n" +"static const TQImage& qembed_findImage( const TQString& name )\n" "{\n" " static TQDict<TQImage> dict;\n" -" TQImage* img = dict.tqfind( name );\n" +" TQImage* img = dict.find( name );\n" " if ( !img ) {\n" " for ( int i = 0; embed_image_vec[i].data; i++ ) {\n" " if ( strcmp(embed_image_vec[i].name, name.latin1()) == 0 ) {\n" diff --git a/tqtinterface/qt4/tools/qtconfig/LICENSE.GPL b/tqtinterface/qt4/tools/qtconfig/LICENSE.GPL index 149f4ac..3221c03 100644 --- a/tqtinterface/qt4/tools/qtconfig/LICENSE.GPL +++ b/tqtinterface/qt4/tools/qtconfig/LICENSE.GPL @@ -59,7 +59,7 @@ modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License applies to any program or other work which tqcontains + 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" @@ -96,7 +96,7 @@ above, provided that you also meet all of these conditions: stating that you changed the files and the date of any change. b) You must cause any work that you distribute or publish, that in - whole or in part tqcontains or is derived from the Program or any + whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. @@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following: The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source -code means all the source code for all modules it tqcontains, plus any +code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include diff --git a/tqtinterface/qt4/tools/qtconfig/mainwindow.cpp b/tqtinterface/qt4/tools/qtconfig/mainwindow.cpp index 03c6e1d..42e7033 100644 --- a/tqtinterface/qt4/tools/qtconfig/mainwindow.cpp +++ b/tqtinterface/qt4/tools/qtconfig/mainwindow.cpp @@ -238,14 +238,14 @@ MainWindow::MainWindow() if (s < gstylecombo->count()) { gstylecombo->setCurrentItem(s); } else { - // no predefined style, try to tqfind the closest match + // no predefined style, try to find the closest match // class names usually contain the name of the style, so we // iterate over the items in the combobox, and use the one whose // name is contained in the classname of the style s = 0; git = gstyles.begin(); while (git != gstyles.end()) { - if (currentstyle.tqcontains(*git)) + if (currentstyle.contains(*git)) break; s++; git++; @@ -274,7 +274,7 @@ MainWindow::MainWindow() TQStringList fs2 = TQT_TQSTRINGLIST_OBJECT(TQFont::substitutions()); TQStringList::Iterator fsit = fs2.begin(); while (fsit != fs2.end()) { - if (! fs.tqcontains(*fsit)) + if (! fs.contains(*fsit)) fs += *fsit; fsit++; } @@ -318,13 +318,13 @@ MainWindow::MainWindow() libpathlistbox->clear(); libpathlistbox->insertStringList(TQApplication::libraryPaths()); - // tqfind the default family + // find the default family TQStringList::Iterator sit = families.begin(); int i = 0, possible = -1; while (sit != families.end()) { if (*sit == TQApplication::font().family()) break; - if ((*sit).tqcontains(TQApplication::font().family())) + if ((*sit).contains(TQApplication::font().family())) possible = i; i++; @@ -347,7 +347,7 @@ MainWindow::MainWindow() while (sit != styles.end()) { if (*sit == stylestring) break; - if ((*sit).tqcontains(stylestring)) + if ((*sit).contains(stylestring)) possible = i; i++; @@ -398,7 +398,7 @@ MainWindow::MainWindow() // prevent to be listed in ordinary input method list. TQStringList::Iterator imIt = inputMethodIdentifiers.begin(); while (imIt != inputMethodIdentifiers.end()) { - if ((*imIt).tqfind("imsw-") == 0) + if ((*imIt).find("imsw-") == 0) imIt = inputMethodIdentifiers.remove(imIt); else imIt++; @@ -424,7 +424,7 @@ MainWindow::MainWindow() // default input method is XIM in X11. TQString currentIM = settings.readEntry("/qt/DefaultInputMethod", "xim"); { - int index = inputMethodIdentifiers.tqfindIndex(currentIM); + int index = inputMethodIdentifiers.findIndex(currentIM); // set up Selected input method. if (0 <= index && index < inputMethodIdentifiers.count()) { inputMethodCombo->setCurrentItem(index); diff --git a/tqtinterface/qt4/tools/qvfb/LICENSE.GPL b/tqtinterface/qt4/tools/qvfb/LICENSE.GPL index 149f4ac..3221c03 100644 --- a/tqtinterface/qt4/tools/qvfb/LICENSE.GPL +++ b/tqtinterface/qt4/tools/qvfb/LICENSE.GPL @@ -59,7 +59,7 @@ modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License applies to any program or other work which tqcontains + 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" @@ -96,7 +96,7 @@ above, provided that you also meet all of these conditions: stating that you changed the files and the date of any change. b) You must cause any work that you distribute or publish, that in - whole or in part tqcontains or is derived from the Program or any + whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. @@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following: The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source -code means all the source code for all modules it tqcontains, plus any +code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include diff --git a/tqtinterface/qt4/tools/qvfb/skin.cpp b/tqtinterface/qt4/tools/qvfb/skin.cpp index da6304b..795de3a 100644 --- a/tqtinterface/qt4/tools/qvfb/skin.cpp +++ b/tqtinterface/qt4/tools/qvfb/skin.cpp @@ -128,7 +128,7 @@ void Skin::mousePressEvent( TQMouseEvent *e ) TQPoint p1( areas[i].x1, areas[i].y1 ); TQPoint p2( areas[i].x2, areas[i].y2 ); TQRect r( p1, p2 ); - if ( r.tqcontains( e->pos() ) ) { + if ( r.contains( e->pos() ) ) { buttonPressed = TRUE; buttonIndex = i; buttonCode = areas[buttonIndex].keyCode; @@ -143,7 +143,7 @@ void Skin::mousePressEvent( TQMouseEvent *e ) } } -// This is handy for tqfinding the areas to define rectangles for new skins +// This is handy for finding the areas to define rectangles for new skins // printf("Clicked in %i,%i\n", e->pos().x(), e->pos().y()); clickPos = e->pos(); } |