From deac2ca49faed824fe83066080714eb6d653615b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:13:01 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- tdeui/keditcl1.cpp | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'tdeui/keditcl1.cpp') diff --git a/tdeui/keditcl1.cpp b/tdeui/keditcl1.cpp index 5b4c21883..69bdc8aab 100644 --- a/tdeui/keditcl1.cpp +++ b/tdeui/keditcl1.cpp @@ -466,48 +466,48 @@ void KEdit::keyPressEvent ( TQKeyEvent *e) killing = false; - if ( KStdAccel::copy().contains( key ) ) + if ( TDEStdAccel::copy().contains( key ) ) copy(); else if ( isReadOnly() ) TQMultiLineEdit::keyPressEvent( e ); // If this is an unmodified printable key, send it directly to TQMultiLineEdit. else if ( !(key.keyCodeQt() & (CTRL | ALT)) && !e->text().isEmpty() && TQString(e->text()).unicode()->isPrint() ) TQMultiLineEdit::keyPressEvent( e ); - else if ( KStdAccel::paste().contains( key ) ) { + else if ( TDEStdAccel::paste().contains( key ) ) { paste(); setModified(true); slotCursorPositionChanged(); } - else if ( KStdAccel::cut().contains( key ) ) { + else if ( TDEStdAccel::cut().contains( key ) ) { cut(); setModified(true); slotCursorPositionChanged(); } - else if ( KStdAccel::undo().contains( key ) ) { + else if ( TDEStdAccel::undo().contains( key ) ) { undo(); setModified(true); slotCursorPositionChanged(); } - else if ( KStdAccel::redo().contains( key ) ) { + else if ( TDEStdAccel::redo().contains( key ) ) { redo(); setModified(true); slotCursorPositionChanged(); } - else if ( KStdAccel::deleteWordBack().contains( key ) ) { + else if ( TDEStdAccel::deleteWordBack().contains( key ) ) { moveCursor(MoveWordBackward, true); if (hasSelectedText()) del(); setModified(true); slotCursorPositionChanged(); } - else if ( KStdAccel::deleteWordForward().contains( key ) ) { + else if ( TDEStdAccel::deleteWordForward().contains( key ) ) { moveCursor(MoveWordForward, true); if (hasSelectedText()) del(); setModified(true); slotCursorPositionChanged(); } - else if ( KStdAccel::backwardWord().contains( key ) ) { + else if ( TDEStdAccel::backwardWord().contains( key ) ) { CursorAction action = MoveWordBackward; int para, index; getCursorPosition( ¶, & index ); @@ -516,7 +516,7 @@ void KEdit::keyPressEvent ( TQKeyEvent *e) moveCursor(action, false ); slotCursorPositionChanged(); } - else if ( KStdAccel::forwardWord().contains( key ) ) { + else if ( TDEStdAccel::forwardWord().contains( key ) ) { CursorAction action = MoveWordForward; int para, index; getCursorPosition( ¶, & index ); @@ -525,27 +525,27 @@ void KEdit::keyPressEvent ( TQKeyEvent *e) moveCursor( action, false ); slotCursorPositionChanged(); } - else if ( KStdAccel::next().contains( key ) ) { + else if ( TDEStdAccel::next().contains( key ) ) { moveCursor( MovePgDown, false ); slotCursorPositionChanged(); } - else if ( KStdAccel::prior().contains( key ) ) { + else if ( TDEStdAccel::prior().contains( key ) ) { moveCursor( MovePgUp, false ); slotCursorPositionChanged(); } - else if ( KStdAccel::home().contains( key ) ) { + else if ( TDEStdAccel::home().contains( key ) ) { moveCursor( MoveHome, false ); slotCursorPositionChanged(); } - else if ( KStdAccel::end().contains( key ) ) { + else if ( TDEStdAccel::end().contains( key ) ) { moveCursor( MoveEnd, false ); slotCursorPositionChanged(); } - else if ( KStdAccel::beginningOfLine().contains( key ) ) { + else if ( TDEStdAccel::beginningOfLine().contains( key ) ) { moveCursor( MoveLineStart, false); slotCursorPositionChanged(); } - else if ( KStdAccel::endOfLine().contains( key ) ) { + else if ( TDEStdAccel::endOfLine().contains( key ) ) { moveCursor( MoveLineEnd, false); slotCursorPositionChanged(); } @@ -567,7 +567,7 @@ void KEdit::installRBPopup(TQPopupMenu *p) { void KEdit::selectFont(){ TQFont font = this->font(); - KFontDialog::getFont(font); + TDEFontDialog::getFont(font); this->setFont(font); } -- cgit v1.2.1 From d1e0cc99a202cef3306b90b8839a6726e89f201e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 23:21:04 -0600 Subject: Rename many classes and header files to avoid conflicts with KDE4 --- tdeui/keditcl1.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tdeui/keditcl1.cpp') diff --git a/tdeui/keditcl1.cpp b/tdeui/keditcl1.cpp index 69bdc8aab..baff8db25 100644 --- a/tdeui/keditcl1.cpp +++ b/tdeui/keditcl1.cpp @@ -28,10 +28,10 @@ #include #include #include -#include +#include #include #include -#include +#include #include #include "keditcl.h" -- cgit v1.2.1 From 8bd62a3b0d3b362b783a273e2460811392485bbd Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 14 Feb 2013 17:17:18 -0600 Subject: Rename common header files for consistency with class renaming --- tdeui/keditcl1.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tdeui/keditcl1.cpp') diff --git a/tdeui/keditcl1.cpp b/tdeui/keditcl1.cpp index baff8db25..37cee99fb 100644 --- a/tdeui/keditcl1.cpp +++ b/tdeui/keditcl1.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include -- cgit v1.2.1 From ed99a30644c19b0a3cf0d2147243532df4daa16b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 15 Feb 2013 21:57:54 -0600 Subject: Rename additional header files to avoid conflicts with KDE4 --- tdeui/keditcl1.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tdeui/keditcl1.cpp') diff --git a/tdeui/keditcl1.cpp b/tdeui/keditcl1.cpp index 37cee99fb..a550a7af1 100644 --- a/tdeui/keditcl1.cpp +++ b/tdeui/keditcl1.cpp @@ -29,8 +29,8 @@ #include #include #include -#include -#include +#include +#include #include #include -- cgit v1.2.1