diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 03:45:53 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 03:45:53 +0000 |
commit | 10308be19ef7fa44699562cc75946e7ea1fdf6b9 (patch) | |
tree | 4bc444c00a79e88105f2cfce5b6209994c413ca0 /kdeui/klineedit.cpp | |
parent | 307136d8eef0ba133b78ceee8e901138d4c996a1 (diff) | |
download | tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.tar.gz tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.zip |
Revert automated changes
Sorry guys, they are just not ready for prime time
Work will continue as always
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdeui/klineedit.cpp')
-rw-r--r-- | kdeui/klineedit.cpp | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/kdeui/klineedit.cpp b/kdeui/klineedit.cpp index 01b50d7c9..f89f4cf25 100644 --- a/kdeui/klineedit.cpp +++ b/kdeui/klineedit.cpp @@ -441,17 +441,17 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) { KKey key( e ); - if ( KStdAccel::copy().tqcontains( key ) ) + if ( KStdAccel::copy().contains( key ) ) { copy(); return; } - else if ( KStdAccel::paste().tqcontains( key ) ) + else if ( KStdAccel::paste().contains( key ) ) { paste(); return; } - else if ( KStdAccel::pasteSelection().tqcontains( key ) ) + else if ( KStdAccel::pasteSelection().contains( key ) ) { TQString text = TQApplication::clipboard()->text( QClipboard::Selection); insert( text ); @@ -459,22 +459,22 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) return; } - else if ( KStdAccel::cut().tqcontains( key ) ) + else if ( KStdAccel::cut().contains( key ) ) { cut(); return; } - else if ( KStdAccel::undo().tqcontains( key ) ) + else if ( KStdAccel::undo().contains( key ) ) { undo(); return; } - else if ( KStdAccel::redo().tqcontains( key ) ) + else if ( KStdAccel::redo().contains( key ) ) { redo(); return; } - else if ( KStdAccel::deleteWordBack().tqcontains( key ) ) + else if ( KStdAccel::deleteWordBack().contains( key ) ) { cursorWordBackward(true); if ( hasSelectedText() ) @@ -483,7 +483,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) e->accept(); return; } - else if ( KStdAccel::deleteWordForward().tqcontains( key ) ) + else if ( KStdAccel::deleteWordForward().contains( key ) ) { // Workaround for QT bug where cursorWordForward(true); @@ -493,25 +493,25 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) e->accept(); return; } - else if ( KStdAccel::backwardWord().tqcontains( key ) ) + else if ( KStdAccel::backwardWord().contains( key ) ) { cursorWordBackward(false); e->accept(); return; } - else if ( KStdAccel::forwardWord().tqcontains( key ) ) + else if ( KStdAccel::forwardWord().contains( key ) ) { cursorWordForward(false); e->accept(); return; } - else if ( KStdAccel::beginningOfLine().tqcontains( key ) ) + else if ( KStdAccel::beginningOfLine().contains( key ) ) { home(false); e->accept(); return; } - else if ( KStdAccel::endOfLine().tqcontains( key ) ) + else if ( KStdAccel::endOfLine().contains( key ) ) { end(false); e->accept(); @@ -575,7 +575,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) mode == KGlobalSettings::CompletionMan) && noModifier ) { TQString keycode = e->text(); - if ( !keycode.isEmpty() && (keycode.tqunicode()->isPrint() || + if ( !keycode.isEmpty() && (keycode.unicode()->isPrint() || e->key() == Key_Backspace || e->key() == Key_Delete ) ) { bool hasUserSelection=d->userSelection; @@ -658,7 +658,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) // as if there was no selection. After processing the key event, we // can set the new autocompletion again. if (hadSelection && !hasUserSelection && start>cPos && - ( (!keycode.isEmpty() && keycode.tqunicode()->isPrint()) || + ( (!keycode.isEmpty() && keycode.unicode()->isPrint()) || e->key() == Key_Backspace || e->key() == Key_Delete ) ) { del(); @@ -679,7 +679,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) int len = txt.length(); if ( txt != old_txt && len/* && ( cursorPosition() == len || force )*/ && - ( (!keycode.isEmpty() && keycode.tqunicode()->isPrint()) || + ( (!keycode.isEmpty() && keycode.unicode()->isPrint()) || e->key() == Key_Backspace || e->key() == Key_Delete) ) { if ( e->key() == Key_Backspace ) @@ -729,7 +729,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) else cut = keys[TextCompletion]; - if ( cut.tqcontains( key ) ) + if ( cut.contains( key ) ) { // Emit completion if the completion mode is CompletionShell // and the cursor is at the end of the string. @@ -758,7 +758,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) else cut = keys[PrevCompletionMatch]; - if ( cut.tqcontains( key ) ) + if ( cut.contains( key ) ) { if ( emitSignals() ) emit textRotation( KCompletionBase::PrevCompletionMatch ); @@ -773,7 +773,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) else cut = keys[NextCompletionMatch]; - if ( cut.tqcontains( key ) ) + if ( cut.contains( key ) ) { if ( emitSignals() ) emit textRotation( KCompletionBase::NextCompletionMatch ); @@ -792,7 +792,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) else cut = keys[SubstringCompletion]; - if ( cut.tqcontains( key ) ) + if ( cut.contains( key ) ) { if ( emitSignals() ) emit substringCompletion( text() ); @@ -1134,7 +1134,7 @@ bool KLineEdit::overrideAccel (const TQKeyEvent* e) else scKey = keys[TextCompletion]; - if (scKey.tqcontains( key )) + if (scKey.contains( key )) return true; if (keys[NextCompletionMatch].isNull()) @@ -1142,7 +1142,7 @@ bool KLineEdit::overrideAccel (const TQKeyEvent* e) else scKey = keys[NextCompletionMatch]; - if (scKey.tqcontains( key )) + if (scKey.contains( key )) return true; if (keys[PrevCompletionMatch].isNull()) @@ -1150,31 +1150,31 @@ bool KLineEdit::overrideAccel (const TQKeyEvent* e) else scKey = keys[PrevCompletionMatch]; - if (scKey.tqcontains( key )) + if (scKey.contains( key )) return true; // Override all the text manupilation accelerators... - if ( KStdAccel::copy().tqcontains( key ) ) + if ( KStdAccel::copy().contains( key ) ) return true; - else if ( KStdAccel::paste().tqcontains( key ) ) + else if ( KStdAccel::paste().contains( key ) ) return true; - else if ( KStdAccel::cut().tqcontains( key ) ) + else if ( KStdAccel::cut().contains( key ) ) return true; - else if ( KStdAccel::undo().tqcontains( key ) ) + else if ( KStdAccel::undo().contains( key ) ) return true; - else if ( KStdAccel::redo().tqcontains( key ) ) + else if ( KStdAccel::redo().contains( key ) ) return true; - else if (KStdAccel::deleteWordBack().tqcontains( key )) + else if (KStdAccel::deleteWordBack().contains( key )) return true; - else if (KStdAccel::deleteWordForward().tqcontains( key )) + else if (KStdAccel::deleteWordForward().contains( key )) return true; - else if (KStdAccel::forwardWord().tqcontains( key )) + else if (KStdAccel::forwardWord().contains( key )) return true; - else if (KStdAccel::backwardWord().tqcontains( key )) + else if (KStdAccel::backwardWord().contains( key )) return true; - else if (KStdAccel::beginningOfLine().tqcontains( key )) + else if (KStdAccel::beginningOfLine().contains( key )) return true; - else if (KStdAccel::endOfLine().tqcontains( key )) + else if (KStdAccel::endOfLine().contains( key )) return true; if (d->completionBox && d->completionBox->isVisible ()) @@ -1219,7 +1219,7 @@ void KLineEdit::setCompletedItems( const TQStringList& items, bool autoSuggest ) bool wasSelected = d->completionBox->isSelected( d->completionBox->currentItem() ); const TQString currentSelection = d->completionBox->currentText(); d->completionBox->setItems( items ); - TQListBoxItem* item = d->completionBox->tqfindItem( currentSelection, Qt::ExactMatch ); + TQListBoxItem* item = d->completionBox->findItem( currentSelection, Qt::ExactMatch ); // If no item is selected, that means the listbox hasn't been manipulated by the user yet, // because it's not possible otherwise to have no selected item. In such case make // always the first item current and unselected, so that the current item doesn't jump. @@ -1246,7 +1246,7 @@ void KLineEdit::setCompletedItems( const TQStringList& items, bool autoSuggest ) if ( d->autoSuggest && autoSuggest ) { - int index = items.first().tqfind( txt ); + int index = items.first().find( txt ); TQString newText = items.first().mid( index ); setUserSelection(false); setCompletedText(newText,true); |