diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-11-13 21:03:36 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-11-14 12:59:42 +0900 |
commit | a49b0e2c531c81e420dc103b5130e2fa8643f46d (patch) | |
tree | 42ee6213b300c2366208f6c122bee39845b5a89c /konsole | |
parent | 36eda89f538b610db9dbda129d7c8e81089caf1a (diff) | |
download | tdebase-a49b0e2c531c81e420dc103b5130e2fa8643f46d.tar.gz tdebase-a49b0e2c531c81e420dc103b5130e2fa8643f46d.zip |
Replace Qt with TQt
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit b965cbac5b21345e9dfc768a7e4f660ffa4aa72f)
Diffstat (limited to 'konsole')
-rw-r--r-- | konsole/konsole/TEWidget.cpp | 42 | ||||
-rw-r--r-- | konsole/konsole/TEmuVt102.cpp | 14 | ||||
-rw-r--r-- | konsole/konsole/keytrans.cpp | 266 | ||||
-rw-r--r-- | konsole/konsole/konsole.cpp | 30 | ||||
-rw-r--r-- | konsole/other/README.KeyTab | 2 | ||||
-rw-r--r-- | konsole/other/linux.keytab | 2 | ||||
-rw-r--r-- | konsole/other/solaris.keytab | 2 | ||||
-rw-r--r-- | konsole/other/vt100.keytab | 2 | ||||
-rw-r--r-- | konsole/other/vt420pc.keytab | 2 |
9 files changed, 181 insertions, 181 deletions
diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp index 3d22c4bd2..fb6d951ce 100644 --- a/konsole/konsole/TEWidget.cpp +++ b/konsole/konsole/TEWidget.cpp @@ -607,7 +607,7 @@ void TEWidget::drawTextFixed(TQPainter &paint, int x, int y, } } - paint.drawText(x,y, w, font_h, Qt::AlignHCenter | TQt::DontClip, drawstr, -1); + paint.drawText(x,y, w, font_h, TQt::AlignHCenter | TQt::DontClip, drawstr, -1); x += w; } } @@ -621,7 +621,7 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect, TQString& str, const ca *attr, bool pm, bool clear) { int a = font_a + m_lineSpacing / 2; - TQColor fColor = printerFriendly ? Qt::black : attr->f.color(color_table); + TQColor fColor = printerFriendly ? TQt::black : attr->f.color(color_table); TQColor bColor = attr->b.color(color_table); TQString drawstr; @@ -634,7 +634,7 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect, if (attr->isTransparent(color_table)) { if (pm) - paint.setBackgroundMode( Qt::TransparentMode ); + paint.setBackgroundMode( TQt::TransparentMode ); if (clear || (blinking && (attr->r & RE_BLINK))) { erase(rect); } @@ -676,7 +676,7 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect, tmpRect.setWidth( tmpRect.width() + font_w ); } - paint.fillRect( tmpRect, Qt::darkCyan ); // currently use hard code color + paint.fillRect( tmpRect, TQt::darkCyan ); // currently use hard code color } if ( m_isIMSel && !tmpStr.isEmpty() ) { // imput method selection background color @@ -691,13 +691,13 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect, tmpRect.setWidth( tmpRect.width() + font_w ); } - paint.fillRect( tmpRect, Qt::darkGray ); // currently use hard code color + paint.fillRect( tmpRect, TQt::darkGray ); // currently use hard code color } } // Paint cursor if ((attr->r & RE_CURSOR) && !isPrinting) { - paint.setBackgroundMode( Qt::TransparentMode ); + paint.setBackgroundMode( TQt::TransparentMode ); int h = font_h - m_lineSpacing; TQRect r(rect.x(),rect.y()+m_lineSpacing/2,rect.width(),h); if (hasFocus()) @@ -740,7 +740,7 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect, int y = rect.y(); // top of rect if ( shadow ) { - paint.setPen( Qt::black ); + paint.setPen( TQt::black ); drawTextFixed(paint, x+1, y+1, str, attr); paint.setPen(fColor); } @@ -753,7 +753,7 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect, int y = rect.y()+a; // baseline if ( shadow ) { - paint.setPen( Qt::black ); + paint.setPen( TQt::black ); paint.drawText(x+1,y+1, str, -1, bidiEnabled ? TQPainter::Auto : TQPainter::LTR ); paint.setPen(fColor); } @@ -771,7 +771,7 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect, { paint.setClipRect(rect); // On screen we use overstrike for bold - paint.setBackgroundMode( Qt::TransparentMode ); + paint.setBackgroundMode( TQt::TransparentMode ); int x = rect.x()+1; if(!fixed_font) { @@ -1016,7 +1016,7 @@ void TEWidget::paintEvent( TQPaintEvent* pe ) TQPainter paint; setUpdatesEnabled(false); paint.begin( this ); - paint.setBackgroundMode( Qt::TransparentMode ); + paint.setBackgroundMode( TQt::TransparentMode ); // Note that the actual widget size can be slightly larger // that the image (the size is truncated towards the smaller @@ -1311,7 +1311,7 @@ void TEWidget::mousePressEvent(TQMouseEvent* ev) { //printf("press [%d,%d] %d\n",ev->x()/font_w,ev->y()/font_h,ev->button()); - if ( possibleTripleClick && (ev->button()==Qt::LeftButton) ) { + if ( possibleTripleClick && (ev->button()==TQt::LeftButton) ) { mouseTripleClickEvent(ev); return; } @@ -1324,7 +1324,7 @@ void TEWidget::mousePressEvent(TQMouseEvent* ev) TQPoint pos = TQPoint((ev->x()-tLx-bX+(font_w/2))/font_w,(ev->y()-tLy-bY)/font_h); //printf("press top left [%d,%d] by=%d\n",tLx,tLy, bY); - if ( ev->button() == Qt::LeftButton) + if ( ev->button() == TQt::LeftButton) { line_selection_mode = false; word_selection_mode = false; @@ -1361,14 +1361,14 @@ void TEWidget::mousePressEvent(TQMouseEvent* ev) } } } - else if ( ev->button() == Qt::MidButton ) + else if ( ev->button() == TQt::MidButton ) { if ( mouse_marks || (!mouse_marks && (ev->state() & ShiftButton)) ) emitSelection(true,ev->state() & ControlButton); else emit mouseSignal( 1, (ev->x()-tLx-bX)/font_w +1, (ev->y()-tLy-bY)/font_h +1 +scrollbar->value() -scrollbar->maxValue() ); } - else if ( ev->button() == Qt::RightButton ) + else if ( ev->button() == TQt::RightButton ) { if (mouse_marks || (ev->state() & ShiftButton)) { configureRequestPoint = TQPoint( ev->x(), ev->y() ); @@ -1382,7 +1382,7 @@ void TEWidget::mousePressEvent(TQMouseEvent* ev) void TEWidget::mouseMoveEvent(TQMouseEvent* ev) { // for auto-hiding the cursor, we need mouseTracking - if (ev->state() == Qt::NoButton ) return; + if (ev->state() == TQt::NoButton ) return; if (dragInfo.state == diPending) { // we had a mouse down, but haven't confirmed a drag yet @@ -1406,7 +1406,7 @@ void TEWidget::mouseMoveEvent(TQMouseEvent* ev) if (actSel == 0) return; // don't extend selection while pasting - if (ev->state() & Qt::MidButton) return; + if (ev->state() & TQt::MidButton) return; extendSelection( ev->pos() ); } @@ -1600,7 +1600,7 @@ void TEWidget::extendSelection( TQPoint pos ) void TEWidget::mouseReleaseEvent(TQMouseEvent* ev) { //printf("release [%d,%d] %d\n",ev->x()/font_w,ev->y()/font_h,ev->button()); - if ( ev->button() == Qt::LeftButton) + if ( ev->button() == TQt::LeftButton) { emit isBusySelecting(false); // Ok.. we can breath again. if(dragInfo.state == diPending) @@ -1630,8 +1630,8 @@ void TEWidget::mouseReleaseEvent(TQMouseEvent* ev) } dragInfo.state = diNone; } - if ( !mouse_marks && ((ev->button() == Qt::RightButton && !(ev->state() & ShiftButton)) - || ev->button() == Qt::MidButton) ) { + if ( !mouse_marks && ((ev->button() == TQt::RightButton && !(ev->state() & ShiftButton)) + || ev->button() == TQt::MidButton) ) { TQPoint tL = contentsRect().topLeft(); int tLx = tL.x(); int tLy = tL.y(); @@ -1643,7 +1643,7 @@ void TEWidget::mouseReleaseEvent(TQMouseEvent* ev) void TEWidget::mouseDoubleClickEvent(TQMouseEvent* ev) { - if ( ev->button() != Qt::LeftButton) return; + if ( ev->button() != TQt::LeftButton) return; TQPoint tL = contentsRect().topLeft(); int tLx = tL.x(); @@ -1701,7 +1701,7 @@ void TEWidget::mouseDoubleClickEvent(TQMouseEvent* ev) void TEWidget::wheelEvent( TQWheelEvent* ev ) { - if (ev->orientation() != Qt::Vertical) + if (ev->orientation() != TQt::Vertical) return; if (ev->state() & ControlButton) { diff --git a/konsole/konsole/TEmuVt102.cpp b/konsole/konsole/TEmuVt102.cpp index fb38b6e18..a9c026fea 100644 --- a/konsole/konsole/TEmuVt102.cpp +++ b/konsole/konsole/TEmuVt102.cpp @@ -967,17 +967,17 @@ void TEmuVt102::doKeyPress( TQKeyEvent* ev ) { switch(ev->key()) { - case Qt::Key_Down : gui->doScroll(+1); return; - case Qt::Key_Up : gui->doScroll(-1); return; - case Qt::Key_PageUp : gui->doScroll(-gui->Lines()/2); return; - case Qt::Key_PageDown : gui->doScroll(gui->Lines()/2); return; + case TQt::Key_Down : gui->doScroll(+1); return; + case TQt::Key_Up : gui->doScroll(-1); return; + case TQt::Key_PageUp : gui->doScroll(-gui->Lines()/2); return; + case TQt::Key_PageDown : gui->doScroll(gui->Lines()/2); return; } } // revert to non-history when typing if (scr->getHistCursor() != scr->getHistLines() && (!ev->text().isEmpty() - || ev->key()==Qt::Key_Down || ev->key()==Qt::Key_Up || ev->key()==Qt::Key_Left || ev->key()==Qt::Key_Right - || ev->key()==Qt::Key_PageUp || ev->key()==Qt::Key_PageDown)) + || ev->key()==TQt::Key_Down || ev->key()==TQt::Key_Up || ev->key()==TQt::Key_Left || ev->key()==TQt::Key_Right + || ev->key()==TQt::Key_PageUp || ev->key()==TQt::Key_PageDown)) scr->setHistCursor(scr->getHistLines()); if (cmd==CMD_send) @@ -1231,7 +1231,7 @@ char TEmuVt102::getErase() int len; bool metaspecified; - if (keytrans->findEntry(Qt::Key_Backspace, 0, &cmd, &txt, &len, + if (keytrans->findEntry(TQt::Key_Backspace, 0, &cmd, &txt, &len, &metaspecified) && (cmd==CMD_send) && (len == 1)) return txt[0]; diff --git a/konsole/konsole/keytrans.cpp b/konsole/konsole/keytrans.cpp index 3712bb0da..a28801a06 100644 --- a/konsole/konsole/keytrans.cpp +++ b/konsole/konsole/keytrans.cpp @@ -519,143 +519,143 @@ void KeyTransSymbols::defModSyms() void KeyTransSymbols::defKeySyms() { // Grey keys - defKeySym("Escape", Qt::Key_Escape ); - defKeySym("Tab", Qt::Key_Tab ); - defKeySym("Backtab", Qt::Key_Backtab ); - defKeySym("Backspace", Qt::Key_Backspace ); - defKeySym("Return", Qt::Key_Return ); - defKeySym("Enter", Qt::Key_Enter ); - defKeySym("Insert", Qt::Key_Insert ); - defKeySym("Delete", Qt::Key_Delete ); - defKeySym("Pause", Qt::Key_Pause ); - defKeySym("Print", Qt::Key_Print ); - defKeySym("SysReq", Qt::Key_SysReq ); - defKeySym("Home", Qt::Key_Home ); - defKeySym("End", Qt::Key_End ); - defKeySym("Left", Qt::Key_Left ); - defKeySym("Up", Qt::Key_Up ); - defKeySym("Right", Qt::Key_Right ); - defKeySym("Down", Qt::Key_Down ); + defKeySym("Escape", TQt::Key_Escape ); + defKeySym("Tab", TQt::Key_Tab ); + defKeySym("Backtab", TQt::Key_Backtab ); + defKeySym("Backspace", TQt::Key_Backspace ); + defKeySym("Return", TQt::Key_Return ); + defKeySym("Enter", TQt::Key_Enter ); + defKeySym("Insert", TQt::Key_Insert ); + defKeySym("Delete", TQt::Key_Delete ); + defKeySym("Pause", TQt::Key_Pause ); + defKeySym("Print", TQt::Key_Print ); + defKeySym("SysReq", TQt::Key_SysReq ); + defKeySym("Home", TQt::Key_Home ); + defKeySym("End", TQt::Key_End ); + defKeySym("Left", TQt::Key_Left ); + defKeySym("Up", TQt::Key_Up ); + defKeySym("Right", TQt::Key_Right ); + defKeySym("Down", TQt::Key_Down ); defKeySym("Prior", TQt::Key_Prior ); defKeySym("Next", TQt::Key_Next ); - defKeySym("Shift", Qt::Key_Shift ); - defKeySym("Control", Qt::Key_Control ); - defKeySym("Meta", Qt::Key_Meta ); - defKeySym("Alt", Qt::Key_Alt ); - defKeySym("CapsLock", Qt::Key_CapsLock ); - defKeySym("NumLock", Qt::Key_NumLock ); - defKeySym("ScrollLock", Qt::Key_ScrollLock ); - defKeySym("F1", Qt::Key_F1 ); - defKeySym("F2", Qt::Key_F2 ); - defKeySym("F3", Qt::Key_F3 ); - defKeySym("F4", Qt::Key_F4 ); - defKeySym("F5", Qt::Key_F5 ); - defKeySym("F6", Qt::Key_F6 ); - defKeySym("F7", Qt::Key_F7 ); - defKeySym("F8", Qt::Key_F8 ); - defKeySym("F9", Qt::Key_F9 ); - defKeySym("F10", Qt::Key_F10 ); - defKeySym("F11", Qt::Key_F11 ); - defKeySym("F12", Qt::Key_F12 ); - defKeySym("F13", Qt::Key_F13 ); - defKeySym("F14", Qt::Key_F14 ); - defKeySym("F15", Qt::Key_F15 ); - defKeySym("F16", Qt::Key_F16 ); - defKeySym("F17", Qt::Key_F17 ); - defKeySym("F18", Qt::Key_F18 ); - defKeySym("F19", Qt::Key_F19 ); - defKeySym("F20", Qt::Key_F20 ); - defKeySym("F21", Qt::Key_F21 ); - defKeySym("F22", Qt::Key_F22 ); - defKeySym("F23", Qt::Key_F23 ); - defKeySym("F24", Qt::Key_F24 ); - defKeySym("F25", Qt::Key_F25 ); - defKeySym("F26", Qt::Key_F26 ); - defKeySym("F27", Qt::Key_F27 ); - defKeySym("F28", Qt::Key_F28 ); - defKeySym("F29", Qt::Key_F29 ); - defKeySym("F30", Qt::Key_F30 ); - defKeySym("F31", Qt::Key_F31 ); - defKeySym("F32", Qt::Key_F32 ); - defKeySym("F33", Qt::Key_F33 ); - defKeySym("F34", Qt::Key_F34 ); - defKeySym("F35", Qt::Key_F35 ); - defKeySym("Super_L", Qt::Key_Super_L ); - defKeySym("Super_R", Qt::Key_Super_R ); - defKeySym("Menu", Qt::Key_Menu ); - defKeySym("Hyper_L", Qt::Key_Hyper_L ); - defKeySym("Hyper_R", Qt::Key_Hyper_R ); + defKeySym("Shift", TQt::Key_Shift ); + defKeySym("Control", TQt::Key_Control ); + defKeySym("Meta", TQt::Key_Meta ); + defKeySym("Alt", TQt::Key_Alt ); + defKeySym("CapsLock", TQt::Key_CapsLock ); + defKeySym("NumLock", TQt::Key_NumLock ); + defKeySym("ScrollLock", TQt::Key_ScrollLock ); + defKeySym("F1", TQt::Key_F1 ); + defKeySym("F2", TQt::Key_F2 ); + defKeySym("F3", TQt::Key_F3 ); + defKeySym("F4", TQt::Key_F4 ); + defKeySym("F5", TQt::Key_F5 ); + defKeySym("F6", TQt::Key_F6 ); + defKeySym("F7", TQt::Key_F7 ); + defKeySym("F8", TQt::Key_F8 ); + defKeySym("F9", TQt::Key_F9 ); + defKeySym("F10", TQt::Key_F10 ); + defKeySym("F11", TQt::Key_F11 ); + defKeySym("F12", TQt::Key_F12 ); + defKeySym("F13", TQt::Key_F13 ); + defKeySym("F14", TQt::Key_F14 ); + defKeySym("F15", TQt::Key_F15 ); + defKeySym("F16", TQt::Key_F16 ); + defKeySym("F17", TQt::Key_F17 ); + defKeySym("F18", TQt::Key_F18 ); + defKeySym("F19", TQt::Key_F19 ); + defKeySym("F20", TQt::Key_F20 ); + defKeySym("F21", TQt::Key_F21 ); + defKeySym("F22", TQt::Key_F22 ); + defKeySym("F23", TQt::Key_F23 ); + defKeySym("F24", TQt::Key_F24 ); + defKeySym("F25", TQt::Key_F25 ); + defKeySym("F26", TQt::Key_F26 ); + defKeySym("F27", TQt::Key_F27 ); + defKeySym("F28", TQt::Key_F28 ); + defKeySym("F29", TQt::Key_F29 ); + defKeySym("F30", TQt::Key_F30 ); + defKeySym("F31", TQt::Key_F31 ); + defKeySym("F32", TQt::Key_F32 ); + defKeySym("F33", TQt::Key_F33 ); + defKeySym("F34", TQt::Key_F34 ); + defKeySym("F35", TQt::Key_F35 ); + defKeySym("Super_L", TQt::Key_Super_L ); + defKeySym("Super_R", TQt::Key_Super_R ); + defKeySym("Menu", TQt::Key_Menu ); + defKeySym("Hyper_L", TQt::Key_Hyper_L ); + defKeySym("Hyper_R", TQt::Key_Hyper_R ); // Regular keys - defKeySym("Space", Qt::Key_Space ); - defKeySym("Exclam", Qt::Key_Exclam ); - defKeySym("QuoteDbl", Qt::Key_QuoteDbl ); - defKeySym("NumberSign", Qt::Key_NumberSign ); - defKeySym("Dollar", Qt::Key_Dollar ); - defKeySym("Percent", Qt::Key_Percent ); - defKeySym("Ampersand", Qt::Key_Ampersand ); - defKeySym("Apostrophe", Qt::Key_Apostrophe ); - defKeySym("ParenLeft", Qt::Key_ParenLeft ); - defKeySym("ParenRight", Qt::Key_ParenRight ); - defKeySym("Asterisk", Qt::Key_Asterisk ); - defKeySym("Plus", Qt::Key_Plus ); - defKeySym("Comma", Qt::Key_Comma ); - defKeySym("Minus", Qt::Key_Minus ); - defKeySym("Period", Qt::Key_Period ); - defKeySym("Slash", Qt::Key_Slash ); - defKeySym("0", Qt::Key_0 ); - defKeySym("1", Qt::Key_1 ); - defKeySym("2", Qt::Key_2 ); - defKeySym("3", Qt::Key_3 ); - defKeySym("4", Qt::Key_4 ); - defKeySym("5", Qt::Key_5 ); - defKeySym("6", Qt::Key_6 ); - defKeySym("7", Qt::Key_7 ); - defKeySym("8", Qt::Key_8 ); - defKeySym("9", Qt::Key_9 ); - defKeySym("Colon", Qt::Key_Colon ); - defKeySym("Semicolon", Qt::Key_Semicolon ); - defKeySym("Less", Qt::Key_Less ); - defKeySym("Equal", Qt::Key_Equal ); - defKeySym("Greater", Qt::Key_Greater ); - defKeySym("Question", Qt::Key_Question ); - defKeySym("At", Qt::Key_At ); - defKeySym("A", Qt::Key_A ); - defKeySym("B", Qt::Key_B ); - defKeySym("C", Qt::Key_C ); - defKeySym("D", Qt::Key_D ); - defKeySym("E", Qt::Key_E ); - defKeySym("F", Qt::Key_F ); - defKeySym("G", Qt::Key_G ); - defKeySym("H", Qt::Key_H ); - defKeySym("I", Qt::Key_I ); - defKeySym("J", Qt::Key_J ); - defKeySym("K", Qt::Key_K ); - defKeySym("L", Qt::Key_L ); - defKeySym("M", Qt::Key_M ); - defKeySym("N", Qt::Key_N ); - defKeySym("O", Qt::Key_O ); - defKeySym("P", Qt::Key_P ); - defKeySym("Q", Qt::Key_Q ); - defKeySym("R", Qt::Key_R ); - defKeySym("S", Qt::Key_S ); - defKeySym("T", Qt::Key_T ); - defKeySym("U", Qt::Key_U ); - defKeySym("V", Qt::Key_V ); - defKeySym("W", Qt::Key_W ); - defKeySym("X", Qt::Key_X ); - defKeySym("Y", Qt::Key_Y ); - defKeySym("Z", Qt::Key_Z ); - defKeySym("BracketLeft", Qt::Key_BracketLeft ); - defKeySym("Backslash", Qt::Key_Backslash ); - defKeySym("BracketRight", Qt::Key_BracketRight); - defKeySym("AsciiCircum", Qt::Key_AsciiCircum ); - defKeySym("Underscore", Qt::Key_Underscore ); - defKeySym("QuoteLeft", Qt::Key_QuoteLeft ); - defKeySym("BraceLeft", Qt::Key_BraceLeft ); - defKeySym("Bar", Qt::Key_Bar ); - defKeySym("BraceRight", Qt::Key_BraceRight ); - defKeySym("AsciiTilde", Qt::Key_AsciiTilde ); + defKeySym("Space", TQt::Key_Space ); + defKeySym("Exclam", TQt::Key_Exclam ); + defKeySym("QuoteDbl", TQt::Key_QuoteDbl ); + defKeySym("NumberSign", TQt::Key_NumberSign ); + defKeySym("Dollar", TQt::Key_Dollar ); + defKeySym("Percent", TQt::Key_Percent ); + defKeySym("Ampersand", TQt::Key_Ampersand ); + defKeySym("Apostrophe", TQt::Key_Apostrophe ); + defKeySym("ParenLeft", TQt::Key_ParenLeft ); + defKeySym("ParenRight", TQt::Key_ParenRight ); + defKeySym("Asterisk", TQt::Key_Asterisk ); + defKeySym("Plus", TQt::Key_Plus ); + defKeySym("Comma", TQt::Key_Comma ); + defKeySym("Minus", TQt::Key_Minus ); + defKeySym("Period", TQt::Key_Period ); + defKeySym("Slash", TQt::Key_Slash ); + defKeySym("0", TQt::Key_0 ); + defKeySym("1", TQt::Key_1 ); + defKeySym("2", TQt::Key_2 ); + defKeySym("3", TQt::Key_3 ); + defKeySym("4", TQt::Key_4 ); + defKeySym("5", TQt::Key_5 ); + defKeySym("6", TQt::Key_6 ); + defKeySym("7", TQt::Key_7 ); + defKeySym("8", TQt::Key_8 ); + defKeySym("9", TQt::Key_9 ); + defKeySym("Colon", TQt::Key_Colon ); + defKeySym("Semicolon", TQt::Key_Semicolon ); + defKeySym("Less", TQt::Key_Less ); + defKeySym("Equal", TQt::Key_Equal ); + defKeySym("Greater", TQt::Key_Greater ); + defKeySym("Question", TQt::Key_Question ); + defKeySym("At", TQt::Key_At ); + defKeySym("A", TQt::Key_A ); + defKeySym("B", TQt::Key_B ); + defKeySym("C", TQt::Key_C ); + defKeySym("D", TQt::Key_D ); + defKeySym("E", TQt::Key_E ); + defKeySym("F", TQt::Key_F ); + defKeySym("G", TQt::Key_G ); + defKeySym("H", TQt::Key_H ); + defKeySym("I", TQt::Key_I ); + defKeySym("J", TQt::Key_J ); + defKeySym("K", TQt::Key_K ); + defKeySym("L", TQt::Key_L ); + defKeySym("M", TQt::Key_M ); + defKeySym("N", TQt::Key_N ); + defKeySym("O", TQt::Key_O ); + defKeySym("P", TQt::Key_P ); + defKeySym("Q", TQt::Key_Q ); + defKeySym("R", TQt::Key_R ); + defKeySym("S", TQt::Key_S ); + defKeySym("T", TQt::Key_T ); + defKeySym("U", TQt::Key_U ); + defKeySym("V", TQt::Key_V ); + defKeySym("W", TQt::Key_W ); + defKeySym("X", TQt::Key_X ); + defKeySym("Y", TQt::Key_Y ); + defKeySym("Z", TQt::Key_Z ); + defKeySym("BracketLeft", TQt::Key_BracketLeft ); + defKeySym("Backslash", TQt::Key_Backslash ); + defKeySym("BracketRight", TQt::Key_BracketRight); + defKeySym("AsciiCircum", TQt::Key_AsciiCircum ); + defKeySym("Underscore", TQt::Key_Underscore ); + defKeySym("QuoteLeft", TQt::Key_QuoteLeft ); + defKeySym("BraceLeft", TQt::Key_BraceLeft ); + defKeySym("Bar", TQt::Key_Bar ); + defKeySym("BraceRight", TQt::Key_BraceRight ); + defKeySym("AsciiTilde", TQt::Key_AsciiTilde ); } KeyTransSymbols::KeyTransSymbols() diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp index 815b4f5a0..d41f30181 100644 --- a/konsole/konsole/konsole.cpp +++ b/konsole/konsole/konsole.cpp @@ -848,14 +848,14 @@ void Konsole::makeGUI() if (!m_moveSessionLeft) { m_moveSessionLeft = new TDEAction(i18n("&Move Session Left"), TQApplication::reverseLayout() ? "forward" : "back", - TQApplication::reverseLayout() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Right : Qt::CTRL+Qt::SHIFT+Qt::Key_Left, TQT_TQOBJECT(this), + TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Right : TQt::CTRL+TQt::SHIFT+TQt::Key_Left, TQT_TQOBJECT(this), TQT_SLOT(moveSessionLeft()), m_shortcuts, "move_session_left"); } m_moveSessionLeft->plug(m_tabPopupMenu); if (!m_moveSessionRight) { m_moveSessionRight = new TDEAction(i18n("M&ove Session Right"), TQApplication::reverseLayout() ? "back" : "forward", - TQApplication::reverseLayout() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Left : Qt::CTRL+Qt::SHIFT+Qt::Key_Right, TQT_TQOBJECT(this), + TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Left : TQt::CTRL+TQt::SHIFT+TQt::Key_Right, TQT_TQOBJECT(this), TQT_SLOT(moveSessionRight()), m_shortcuts, "move_session_right"); } m_moveSessionRight->plug(m_tabPopupMenu); @@ -1091,9 +1091,9 @@ void Konsole::makeBasicGUI() m_copyClipboard = new TDEAction(i18n("&Copy"), "edit-copy", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCopyClipboard()), m_shortcuts, "edit_copy"); - m_pasteClipboard = new TDEAction(i18n("&Paste"), "edit-paste", Qt::SHIFT+Qt::Key_Insert, TQT_TQOBJECT(this), + m_pasteClipboard = new TDEAction(i18n("&Paste"), "edit-paste", TQt::SHIFT+TQt::Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotPasteClipboard()), m_shortcuts, "edit_paste"); - m_pasteSelection = new TDEAction(i18n("Paste Selection"), Qt::CTRL+Qt::SHIFT+Qt::Key_Insert, TQT_TQOBJECT(this), + m_pasteSelection = new TDEAction(i18n("Paste Selection"), TQt::CTRL+TQt::SHIFT+TQt::Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotPasteSelection()), m_shortcuts, "pasteselection"); m_clearTerminal = new TDEAction(i18n("C&lear Terminal"), 0, TQT_TQOBJECT(this), @@ -1130,12 +1130,12 @@ void Konsole::makeBasicGUI() } m_detachSession->setEnabled(false); - m_renameSession = new TDEAction(i18n("&Rename Session..."), Qt::CTRL+Qt::SHIFT+Qt::Key_R, TQT_TQOBJECT(this), + m_renameSession = new TDEAction(i18n("&Rename Session..."), TQt::CTRL+TQt::SHIFT+TQt::Key_R, TQT_TQOBJECT(this), TQT_SLOT(slotRenameSession()), m_shortcuts, "rename_session"); if (kapp->authorizeTDEAction("zmodem_upload")) m_zmodemUpload = new TDEAction( i18n( "&ZModem Upload..." ), - Qt::CTRL+Qt::ALT+Qt::Key_U, TQT_TQOBJECT(this), + TQt::CTRL+TQt::ALT+TQt::Key_U, TQT_TQOBJECT(this), TQT_SLOT( slotZModemUpload() ), m_shortcuts, "zmodem_upload" ); @@ -1152,7 +1152,7 @@ void Konsole::makeBasicGUI() masterMode = new TDEToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, TQT_TQOBJECT(this), TQT_SLOT( slotToggleMasterMode() ), m_shortcuts, "send_input_to_all_sessions" ); - showMenubar = new TDEToggleAction ( i18n( "Show &Menubar" ), "showmenu", Qt::CTRL+Qt::SHIFT+Qt::ALT+Qt::Key_M, TQT_TQOBJECT(this), + showMenubar = new TDEToggleAction ( i18n( "Show &Menubar" ), "showmenu", TQt::CTRL+TQt::SHIFT+TQt::ALT+TQt::Key_M, TQT_TQOBJECT(this), TQT_SLOT( slotToggleMenubar() ), m_shortcuts, "show_menubar" ); showMenubar->setCheckedState( KGuiItem( i18n("Hide &Menubar"), "showmenu", TQString::null, TQString::null ) ); @@ -1174,28 +1174,28 @@ void Konsole::makeBasicGUI() m_print = new TDEAction(i18n("&Print Screen..."), "document-print", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPrint() ), m_shortcuts, "file_print"); m_quit = new TDEAction(i18n("&Quit"), "system-log-out", 0, TQT_TQOBJECT(this), TQT_SLOT( close() ), m_shortcuts, "file_quit"); - TDEShortcut shortcut(Qt::CTRL+Qt::ALT+Qt::Key_N); - shortcut.append(TDEShortcut(Qt::CTRL+Qt::SHIFT+Qt::Key_N)); + TDEShortcut shortcut(TQt::CTRL+TQt::ALT+TQt::Key_N); + shortcut.append(TDEShortcut(TQt::CTRL+TQt::SHIFT+TQt::Key_N)); new TDEAction(i18n("New Session"), shortcut, TQT_TQOBJECT(this), TQT_SLOT(newSession()), m_shortcuts, "new_session"); - new TDEAction(i18n("Activate Menu"), Qt::CTRL+Qt::ALT+Qt::Key_M, TQT_TQOBJECT(this), TQT_SLOT(activateMenu()), m_shortcuts, "activate_menu"); + new TDEAction(i18n("Activate Menu"), TQt::CTRL+TQt::ALT+TQt::Key_M, TQT_TQOBJECT(this), TQT_SLOT(activateMenu()), m_shortcuts, "activate_menu"); new TDEAction(i18n("List Sessions"), 0, TQT_TQOBJECT(this), TQT_SLOT(listSessions()), m_shortcuts, "list_sessions"); if (!m_moveSessionLeft) { m_moveSessionLeft = new TDEAction(i18n("&Move Session Left"), TQApplication::reverseLayout() ? "forward" : "back", - TQApplication::reverseLayout() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Right : Qt::CTRL+Qt::SHIFT+Qt::Key_Left, TQT_TQOBJECT(this), + TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Right : TQt::CTRL+TQt::SHIFT+TQt::Key_Left, TQT_TQOBJECT(this), TQT_SLOT(moveSessionLeft()), m_shortcuts, "move_session_left"); } if (!m_moveSessionRight) { m_moveSessionRight = new TDEAction(i18n("M&ove Session Right"), TQApplication::reverseLayout() ? "back" : "forward", - TQApplication::reverseLayout() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Left : Qt::CTRL+Qt::SHIFT+Qt::Key_Right, TQT_TQOBJECT(this), + TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Left : TQt::CTRL+TQt::SHIFT+TQt::Key_Right, TQT_TQOBJECT(this), TQT_SLOT(moveSessionRight()), m_shortcuts, "move_session_right"); } - new TDEAction(i18n("Go to Previous Session"), TQApplication::reverseLayout() ? Qt::SHIFT+Qt::Key_Right : Qt::SHIFT+Qt::Key_Left, + new TDEAction(i18n("Go to Previous Session"), TQApplication::reverseLayout() ? TQt::SHIFT+TQt::Key_Right : TQt::SHIFT+TQt::Key_Left, TQT_TQOBJECT(this), TQT_SLOT(prevSession()), m_shortcuts, "previous_session"); - new TDEAction(i18n("Go to Next Session"), TQApplication::reverseLayout() ? Qt::SHIFT+Qt::Key_Left : Qt::SHIFT+Qt::Key_Right, + new TDEAction(i18n("Go to Next Session"), TQApplication::reverseLayout() ? TQt::SHIFT+TQt::Key_Left : TQt::SHIFT+TQt::Key_Right, TQT_TQOBJECT(this), TQT_SLOT(nextSession()), m_shortcuts, "next_session"); for (int i=1;i<13;i++) { // Due to 12 function keys? @@ -1205,7 +1205,7 @@ void Konsole::makeBasicGUI() new TDEAction(i18n("Enlarge Font"), 0, TQT_TQOBJECT(this), TQT_SLOT(biggerFont()), m_shortcuts, "bigger_font"); new TDEAction(i18n("Shrink Font"), 0, TQT_TQOBJECT(this), TQT_SLOT(smallerFont()), m_shortcuts, "smaller_font"); - new TDEAction(i18n("Toggle Bidi"), Qt::CTRL+Qt::ALT+Qt::Key_B, TQT_TQOBJECT(this), TQT_SLOT(toggleBidi()), m_shortcuts, "toggle_bidi"); + new TDEAction(i18n("Toggle Bidi"), TQt::CTRL+TQt::ALT+TQt::Key_B, TQT_TQOBJECT(this), TQT_SLOT(toggleBidi()), m_shortcuts, "toggle_bidi"); // Should we load all *.desktop files now? Required for Session shortcuts. if ( TDEConfigGroup(TDEGlobal::config(), "General").readBoolEntry("SessionShortcutsEnabled", false) ) { diff --git a/konsole/other/README.KeyTab b/konsole/other/README.KeyTab index 75d6cfd79..4e23851bb 100644 --- a/konsole/other/README.KeyTab +++ b/konsole/other/README.KeyTab @@ -14,7 +14,7 @@ The syntax is that each entry has the form : "key" Keyname { ("+"|"-") Modename } ":" (String|Operation) Keynames are those defined in <qnamespace.h> with the -"Qt::Key_" prefix removed. +"TQt::Key_" prefix removed. Mode names are: diff --git a/konsole/other/linux.keytab b/konsole/other/linux.keytab index d5149c3c8..aafbdd97f 100644 --- a/konsole/other/linux.keytab +++ b/konsole/other/linux.keytab @@ -15,7 +15,7 @@ keyboard "linux console" # "key" Keyname { ("+"|"-") Modename } ":" (String|Operation) # # Keynames are those defined in <qnamespace.h> with the -# "Qt::Key_" removed. (We'd better insert the list here) +# "TQt::Key_" removed. (We'd better insert the list here) # # Mode names are : # diff --git a/konsole/other/solaris.keytab b/konsole/other/solaris.keytab index cb0626be9..e671cb13b 100644 --- a/konsole/other/solaris.keytab +++ b/konsole/other/solaris.keytab @@ -13,7 +13,7 @@ keyboard "Solaris" # "key" Keyname { ("+"|"-") Modename } ":" (String|Operation) # # Keynames are those defined in <qnamespace.h> with the -# "Qt::Key_" removed. (We'd better insert the list here) +# "TQt::Key_" removed. (We'd better insert the list here) # # Mode names are : # diff --git a/konsole/other/vt100.keytab b/konsole/other/vt100.keytab index dec49baac..fa57934bc 100644 --- a/konsole/other/vt100.keytab +++ b/konsole/other/vt100.keytab @@ -14,7 +14,7 @@ keyboard "vt100 (historical)" # "key" Keyname { ("+"|"-") Modename } ":" (String|Operation) # # Keynames are those defined in <qnamespace.h> with the -# "Qt::Key_" removed. (We'd better insert the list here) +# "TQt::Key_" removed. (We'd better insert the list here) # # Mode names are : # diff --git a/konsole/other/vt420pc.keytab b/konsole/other/vt420pc.keytab index d132797b1..376ce8d13 100644 --- a/konsole/other/vt420pc.keytab +++ b/konsole/other/vt420pc.keytab @@ -29,7 +29,7 @@ keyboard "VT420PC" # "key" Keyname { ("+"|"-") Modename } ":" (String|Operation) # # Keynames are those defined in <qnamespace.h> with the -# "Qt::Key_" removed. (We'd better insert the list here) +# "TQt::Key_" removed. (We'd better insert the list here) # # Mode names are : # |