diff options
Diffstat (limited to 'experimental/tqtinterface/qt4/tools/assistant')
16 files changed, 112 insertions, 112 deletions
diff --git a/experimental/tqtinterface/qt4/tools/assistant/LICENSE.GPL b/experimental/tqtinterface/qt4/tools/assistant/LICENSE.GPL index 149f4aca2..3221c0305 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/LICENSE.GPL +++ b/experimental/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/experimental/tqtinterface/qt4/tools/assistant/assistant_de.ts b/experimental/tqtinterface/qt4/tools/assistant/assistant_de.ts index ed4c9949b..15b0b971a 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/assistant_de.ts +++ b/experimental/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/experimental/tqtinterface/qt4/tools/assistant/book/assistant.leaf b/experimental/tqtinterface/qt4/tools/assistant/book/assistant.leaf index e978b030f..57bab4c2a 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/book/assistant.leaf +++ b/experimental/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/experimental/tqtinterface/qt4/tools/assistant/config.cpp b/experimental/tqtinterface/qt4/tools/assistant/config.cpp index 56ac84874..1cbccbc1d 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/config.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/tools/assistant/docuparser.cpp b/experimental/tqtinterface/qt4/tools/assistant/docuparser.cpp index f1c2f0131..a64fb4737 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/docuparser.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/tools/assistant/finddialog.ui b/experimental/tqtinterface/qt4/tools/assistant/finddialog.ui index 56fd582f0..c34ceae10 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/finddialog.ui +++ b/experimental/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/experimental/tqtinterface/qt4/tools/assistant/finddialog.ui.h b/experimental/tqtinterface/qt4/tools/assistant/finddialog.ui.h index dc103932b..9204cd799 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/finddialog.ui.h +++ b/experimental/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/experimental/tqtinterface/qt4/tools/assistant/helpdialog.ui b/experimental/tqtinterface/qt4/tools/assistant/helpdialog.ui index 3f615725b..e81008fa5 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/helpdialog.ui +++ b/experimental/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/experimental/tqtinterface/qt4/tools/assistant/helpdialogimpl.cpp b/experimental/tqtinterface/qt4/tools/assistant/helpdialogimpl.cpp index b608d5144..8c2e0df4b 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/helpdialogimpl.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/tools/assistant/helpwindow.cpp b/experimental/tqtinterface/qt4/tools/assistant/helpwindow.cpp index 7a5702862..25d774dc6 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/helpwindow.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/tools/assistant/index.cpp b/experimental/tqtinterface/qt4/tools/assistant/index.cpp index 41e582ff0..7ed1a4f91 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/index.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/tools/assistant/main.cpp b/experimental/tqtinterface/qt4/tools/assistant/main.cpp index 42b5819a2..8b60a9e79 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/main.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/tools/assistant/mainwindow.ui b/experimental/tqtinterface/qt4/tools/assistant/mainwindow.ui index d3dbdab03..3074838fe 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/mainwindow.ui +++ b/experimental/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/experimental/tqtinterface/qt4/tools/assistant/mainwindow.ui.h b/experimental/tqtinterface/qt4/tools/assistant/mainwindow.ui.h index cb079aa5d..68fcb95c7 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/mainwindow.ui.h +++ b/experimental/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/experimental/tqtinterface/qt4/tools/assistant/profile.h b/experimental/tqtinterface/qt4/tools/assistant/profile.h index f8482c76b..91b090436 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/profile.h +++ b/experimental/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/experimental/tqtinterface/qt4/tools/assistant/topicchooserimpl.cpp b/experimental/tqtinterface/qt4/tools/assistant/topicchooserimpl.cpp index 4cad976ae..daeedc5ea 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/topicchooserimpl.cpp +++ b/experimental/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 ]; } |