summaryrefslogtreecommitdiffstats
path: root/tqtinterface/qt4/tools/designer/editor
diff options
context:
space:
mode:
Diffstat (limited to 'tqtinterface/qt4/tools/designer/editor')
-rw-r--r--tqtinterface/qt4/tools/designer/editor/arghintwidget.cpp2
-rw-r--r--tqtinterface/qt4/tools/designer/editor/browser.cpp4
-rw-r--r--tqtinterface/qt4/tools/designer/editor/browser.h2
-rw-r--r--tqtinterface/qt4/tools/designer/editor/cindent.cpp2
-rw-r--r--tqtinterface/qt4/tools/designer/editor/completion.cpp16
-rw-r--r--tqtinterface/qt4/tools/designer/editor/preferences.ui.h2
-rw-r--r--tqtinterface/qt4/tools/designer/editor/viewmanager.cpp2
-rw-r--r--tqtinterface/qt4/tools/designer/editor/yyindent.cpp42
8 files changed, 36 insertions, 36 deletions
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;":