diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-07-28 15:51:58 -0500 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-07-28 15:51:58 -0500 |
commit | fe7969ef886d7287fa959929ddd33fbad8407884 (patch) | |
tree | 589aacc109d27561a5188bb46bce27c78bad8f5b /tools/designer/editor | |
parent | dba8a853b65e5707e48450e5085e0ff0513b4203 (diff) | |
download | tqt3-fe7969ef886d7287fa959929ddd33fbad8407884.tar.gz tqt3-fe7969ef886d7287fa959929ddd33fbad8407884.zip |
Automated update from Qt3
Diffstat (limited to 'tools/designer/editor')
-rw-r--r-- | tools/designer/editor/completion.cpp | 14 | ||||
-rw-r--r-- | tools/designer/editor/parenmatcher.cpp | 12 |
2 files changed, 13 insertions, 13 deletions
diff --git a/tools/designer/editor/completion.cpp b/tools/designer/editor/completion.cpp index ecd1e73be..77499c8d2 100644 --- a/tools/designer/editor/completion.cpp +++ b/tools/designer/editor/completion.cpp @@ -363,8 +363,8 @@ bool EditorCompletion::eventFilter( TQObject *o, TQEvent *e ) } } - if ( ke->text().length() && !( ke->state() & AltButton ) && - ( !ke->ascii() || ke->ascii() >= 32 ) || + if ( ( ke->text().length() && !( ke->state() & AltButton ) && + ( !ke->ascii() || ke->ascii() >= 32 ) ) || ( ke->text() == "\t" && !( ke->state() & ControlButton ) ) ) { if ( ke->key() == Key_Tab ) { if ( curEditor->textCursor()->index() == 0 && @@ -372,13 +372,13 @@ bool EditorCompletion::eventFilter( TQObject *o, TQEvent *e ) return FALSE; if ( doCompletion() ) return TRUE; - } else if ( ke->key() == Key_Period && + } else if ( ( ke->key() == Key_Period && ( curEditor->textCursor()->index() == 0 || - curEditor->textCursor()->paragraph()->at( curEditor->textCursor()->index() - 1 )->c != '.' ) + curEditor->textCursor()->paragraph()->at( curEditor->textCursor()->index() - 1 )->c != '.' ) ) || - ke->key() == Key_Greater && + ( ke->key() == Key_Greater && curEditor->textCursor()->index() > 0 && - curEditor->textCursor()->paragraph()->at( curEditor->textCursor()->index() - 1 )->c == '-' ) { + curEditor->textCursor()->paragraph()->at( curEditor->textCursor()->index() - 1 )->c == '-' ) ) { doObjectCompletion(); } else { if ( !doArgumentHint( ke->text() == "(" ) ) @@ -423,7 +423,7 @@ bool EditorCompletion::eventFilter( TQObject *o, TQEvent *e ) return TRUE; } } - if ( o == functionLabel || ::tqt_cast<Editor*>(o) && functionLabel->isVisible() ) { + if ( o == functionLabel || ( ::tqt_cast<Editor*>(o) && functionLabel->isVisible() ) ) { if ( e->type() == TQEvent::KeyPress ) { TQKeyEvent *ke = (TQKeyEvent*)e; if ( ke->key() == Key_Escape ) { diff --git a/tools/designer/editor/parenmatcher.cpp b/tools/designer/editor/parenmatcher.cpp index 8cd6ffcb9..ddc4b8838 100644 --- a/tools/designer/editor/parenmatcher.cpp +++ b/tools/designer/editor/parenmatcher.cpp @@ -120,9 +120,9 @@ bool ParenMatcher::checkOpenParen( TQTextCursor *cursor ) } int id = Match; - if ( c == '{' && closedParen.chr != '}' || - c == '(' && closedParen.chr != ')' || - c == '[' && closedParen.chr != ']' ) + if ( ( c == '{' && closedParen.chr != '}' ) || + ( c == '(' && closedParen.chr != ')' ) || + ( c == '[' && closedParen.chr != ']' ) ) id = Mismatch; cursor->document()->setSelectionStart( id, *cursor ); int tidx = cursor->index(); @@ -194,9 +194,9 @@ bool ParenMatcher::checkClosedParen( TQTextCursor *cursor ) } int id = Match; - if ( c == '}' && openParen.chr != '{' || - c == ')' && openParen.chr != '(' || - c == ']' && openParen.chr != '[' ) + if ( ( c == '}' && openParen.chr != '{' ) || + ( c == ')' && openParen.chr != '(' ) || + ( c == ']' && openParen.chr != '[' ) ) id = Mismatch; cursor->document()->setSelectionStart( id, *cursor ); int tidx = cursor->index(); |