diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-07-28 15:50:52 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-08-04 14:53:35 +0200 |
| commit | 5ae82a06c308960c66757b0a956500b05b83f002 (patch) | |
| tree | e73bef929c230d306f377880042ce09894812ccd /tools/designer/editor/completion.cpp | |
| parent | e9fed234b762ffe73037d70bf29ce90ea7ab8d37 (diff) | |
| download | qt3-3.5.13.1.tar.gz qt3-3.5.13.1.zip | |
Fix build warningsv3.5.13.1
Thanks to Bruce Sass for the patch!
(cherry picked from commit ebcb1d80bf517aceb69778e1e9f67e5f4da8c484)
Diffstat (limited to 'tools/designer/editor/completion.cpp')
| -rw-r--r-- | tools/designer/editor/completion.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tools/designer/editor/completion.cpp b/tools/designer/editor/completion.cpp index 9ab09fa..0473d06 100644 --- a/tools/designer/editor/completion.cpp +++ b/tools/designer/editor/completion.cpp @@ -363,8 +363,8 @@ bool EditorCompletion::eventFilter( QObject *o, QEvent *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( QObject *o, QEvent *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( QObject *o, QEvent *e ) return TRUE; } } - if ( o == functionLabel || ::qt_cast<Editor*>(o) && functionLabel->isVisible() ) { + if ( o == functionLabel || ( ::qt_cast<Editor*>(o) && functionLabel->isVisible() ) ) { if ( e->type() == QEvent::KeyPress ) { QKeyEvent *ke = (QKeyEvent*)e; if ( ke->key() == Key_Escape ) { |