summaryrefslogtreecommitdiffstats
path: root/konsole
diff options
context:
space:
mode:
Diffstat (limited to 'konsole')
-rw-r--r--konsole/doc/VT100/Table.Codes2
-rw-r--r--konsole/doc/VT100/techref.html2
-rw-r--r--konsole/konsole/TEHistory.cpp2
-rw-r--r--konsole/konsole/TEScreen.cpp14
-rw-r--r--konsole/konsole/TEWidget.cpp168
-rw-r--r--konsole/konsole/TEWidget.h4
-rw-r--r--konsole/konsole/TEmuVt102.cpp36
-rw-r--r--konsole/konsole/TEmulation.cpp18
-rw-r--r--konsole/konsole/fontembedder.cpp12
-rw-r--r--konsole/konsole/keytrans.cpp18
-rw-r--r--konsole/konsole/konsole.cpp265
-rw-r--r--konsole/konsole/konsole_part.cpp66
-rw-r--r--konsole/konsole/konsole_part.h6
-rw-r--r--konsole/konsole/konsole_wcwidth.cpp12
-rw-r--r--konsole/konsole/konsole_wcwidth.h4
-rw-r--r--konsole/konsole/konsolebookmarkmenu.cpp4
-rw-r--r--konsole/konsole/kwrited.cpp6
-rw-r--r--konsole/konsole/kwrited.h2
-rw-r--r--konsole/konsole/linefont.h2
-rw-r--r--konsole/konsole/main.cpp18
-rw-r--r--konsole/konsole/printsettings.cpp2
-rw-r--r--konsole/konsole/printsettings.h6
-rw-r--r--konsole/konsole/schema.cpp24
-rw-r--r--konsole/konsole/schema.h6
-rw-r--r--konsole/konsole/session.cpp14
25 files changed, 357 insertions, 356 deletions
diff --git a/konsole/doc/VT100/Table.Codes b/konsole/doc/VT100/Table.Codes
index 6ece0f4bf..2f0554a0b 100644
--- a/konsole/doc/VT100/Table.Codes
+++ b/konsole/doc/VT100/Table.Codes
@@ -1070,7 +1070,7 @@ DECALN.sect Command
DECALN.code HSH|8|
DECALN.text
Causes the VT100 to fill it's screen with
- uppercase Es for screen focus and alignment.
+ uppercase Es for screen focus and tqalignment.
DECALN.table.XPS
Subcode|Emulation|Scope|Operation|Args|Meaning
N/A|VT100|scr|helpAlign||see above
diff --git a/konsole/doc/VT100/techref.html b/konsole/doc/VT100/techref.html
index 6e36f39e5..6b39bda55 100644
--- a/konsole/doc/VT100/techref.html
+++ b/konsole/doc/VT100/techref.html
@@ -2234,7 +2234,7 @@ Work is currently in progress to fix this issue.
<tr><td><p></td>
<tr><td></td>
<td colspan=6> Causes the VT100 to fill it's screen with
- uppercase Es for screen focus and alignment.
+ uppercase Es for screen focus and tqalignment.
<tr><td><p></td></tr>
<tr>
<td></td>
diff --git a/konsole/konsole/TEHistory.cpp b/konsole/konsole/TEHistory.cpp
index cbe8b199d..917fb739e 100644
--- a/konsole/konsole/TEHistory.cpp
+++ b/konsole/konsole/TEHistory.cpp
@@ -457,7 +457,7 @@ void HistoryScrollBlockArray::addCells(ca a[], int count)
size_t *pLen = new size_t;
*pLen = count;
- m_lineLengths.replace(m_blockArray.getCurrent(), pLen);
+ m_lineLengths.tqreplace(m_blockArray.getCurrent(), pLen);
}
void HistoryScrollBlockArray::addLine(bool)
diff --git a/konsole/konsole/TEScreen.cpp b/konsole/konsole/TEScreen.cpp
index 54b479844..7af02c247 100644
--- a/konsole/konsole/TEScreen.cpp
+++ b/konsole/konsole/TEScreen.cpp
@@ -783,7 +783,7 @@ void TEScreen::compose(TQString compose)
TQChar c(image[lastPos].c);
compose.prepend(c);
compose.compose();
- image[lastPos].c = compose[0].unicode();
+ image[lastPos].c = compose[0].tqunicode();
}
// Region commands -------------------------------------------------------------
@@ -1023,7 +1023,7 @@ void TEScreen::clearEntireScreen()
}
/*! fill screen with 'E'
- This is to aid screen alignment
+ This is to aid screen tqalignment
*/
void TEScreen::helpAlign()
@@ -1190,7 +1190,7 @@ TQString TEScreen::getSelText(bool preserve_line_breaks)
static TQString makeString(int *m, int d, bool stripTrailingSpaces)
{
- TQChar* qc = new QChar[d];
+ TQChar* qc = new TQChar[d];
int last_space = -1;
int j = 0;
@@ -1281,7 +1281,7 @@ void TEScreen::getSelText(bool preserve_line_breaks, TQTextStream *stream)
while (hX < eol && hX <= sel_Right % columns)
{
- Q_UINT16 c = hist->getCell(hY, hX++).c;
+ TQ_UINT16 c = hist->getCell(hY, hX++).c;
if (c)
m[d++] = c;
s++;
@@ -1293,7 +1293,7 @@ void TEScreen::getSelText(bool preserve_line_breaks, TQTextStream *stream)
}
else { // or from screen image.
if (testIsSelected((s - hist_BR) % columns, (s - hist_BR) / columns)) {
- Q_UINT16 c = image[s++ - hist_BR].c;
+ TQ_UINT16 c = image[s++ - hist_BR].c;
if (c) {
m[d++] = c;
newlineneeded = true;
@@ -1334,7 +1334,7 @@ void TEScreen::getSelText(bool preserve_line_breaks, TQTextStream *stream)
while (hX < eol)
{
- Q_UINT16 c = hist->getCell(hY, hX++).c;
+ TQ_UINT16 c = hist->getCell(hY, hX++).c;
if (c)
m[d++] = c;
s++;
@@ -1401,7 +1401,7 @@ void TEScreen::getSelText(bool preserve_line_breaks, TQTextStream *stream)
while (s <= eol)
{
- Q_UINT16 c = image[s++ - hist_BR].c;
+ TQ_UINT16 c = image[s++ - hist_BR].c;
if (c)
m[d++] = c;
}
diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp
index cb16ff497..6a97e46cd 100644
--- a/konsole/konsole/TEWidget.cpp
+++ b/konsole/konsole/TEWidget.cpp
@@ -144,7 +144,7 @@ static const ColorEntry base_color_table[TABLE_COLORS] =
void TEWidget::setDefaultBackColor(const TQColor& color)
{
defaultBgColor = color;
- if (qAlpha(blend_color) != 0xff && !backgroundPixmap())
+ if (tqAlpha(blend_color) != 0xff && !backgroundPixmap())
setBackgroundColor(getDefaultBackColor());
}
@@ -165,14 +165,14 @@ void TEWidget::setColorTable(const ColorEntry table[])
for (int i = 0; i < TABLE_COLORS; i++) color_table[i] = table[i];
const TQPixmap* pm = backgroundPixmap();
if (!pm)
- if (!argb_visual || (qAlpha(blend_color) == 0xff))
+ if (!argb_visual || (tqAlpha(blend_color) == 0xff))
setBackgroundColor(getDefaultBackColor());
else {
- float alpha = qAlpha(blend_color) / 255.;
- int pixel = qAlpha(blend_color) << 24 |
- int(qRed(blend_color) * alpha) << 16 |
- int(qGreen(blend_color) * alpha) << 8 |
- int(qBlue(blend_color) * alpha);
+ float alpha = tqAlpha(blend_color) / 255.;
+ int pixel = tqAlpha(blend_color) << 24 |
+ int(tqRed(blend_color) * alpha) << 16 |
+ int(tqGreen(blend_color) * alpha) << 8 |
+ int(tqBlue(blend_color) * alpha);
setBackgroundColor(TQColor(blend_color, pixel));
}
update();
@@ -191,14 +191,14 @@ void TEWidget::setColorTable(const ColorEntry table[])
xterm fonts have these at 0x00..0x1f.
QT's iso mapping leaves 0x00..0x7f without any changes. But the graphicals
- come in here as proper unicode characters.
+ come in here as proper tqunicode characters.
We treat non-iso10646 fonts as VT100 extended and do the requiered mapping
- from unicode to 0x00..0x1f. The remaining translation is then left to the
+ from tqunicode to 0x00..0x1f. The remaining translation is then left to the
QCodec.
*/
-static inline bool isLineChar(Q_UINT16 c) { return ((c & 0xFF80) == 0x2500);}
+static inline bool isLineChar(TQ_UINT16 c) { return ((c & 0xFF80) == 0x2500);}
// assert for i in [0..31] : vt100extended(vt100_graphics[i]) == i.
@@ -213,7 +213,7 @@ unsigned short vt100_graphics[32] =
/*
static TQChar vt100extended(TQChar c)
{
- switch (c.unicode())
+ switch (c.tqunicode())
{
case 0x25c6 : return 1;
case 0x2592 : return 2;
@@ -265,7 +265,7 @@ void TEWidget::fontChange(const TQFont &)
// "Base character width on widest ASCII character. This prevents too wide
// characters in the presence of double wide (e.g. Japanese) characters."
// Get the width from representative normal width characters
- font_w = qRound((double)fm.width(REPCHAR)/(double)strlen(REPCHAR));
+ font_w = tqRound((double)fm.width(REPCHAR)/(double)strlen(REPCHAR));
fixed_font = true;
int fw = fm.width(REPCHAR[0]);
@@ -382,7 +382,7 @@ TEWidget::TEWidget(TQWidget *parent, const char *name)
,m_cursorCol(0)
,m_isIMEdit(false)
,m_isIMSel(false)
-,blend_color(qRgba(0,0,0,0xff))
+,blend_color(tqRgba(0,0,0,0xff))
{
// The offsets are not yet calculated.
// Do not calculate these too often to be more smoothly when resizing
@@ -394,7 +394,7 @@ TEWidget::TEWidget(TQWidget *parent, const char *name)
this, TQT_SLOT(onClearSelection()) );
scrollbar = new TQScrollBar(this);
- scrollbar->setCursor( arrowCursor );
+ scrollbar->setCursor( tqarrowCursor );
connect(scrollbar, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(scrollChanged(int)));
blinkT = new TQTimer(this);
@@ -405,14 +405,14 @@ TEWidget::TEWidget(TQWidget *parent, const char *name)
setMouseMarks(true);
setColorTable(base_color_table); // init color table
- qApp->installEventFilter( this ); //FIXME: see below
+ tqApp->installEventFilter( this ); //FIXME: see below
KCursor::setAutoHideCursor( this, true );
// Init DnD ////////////////////////////////////////////////////////////////
setAcceptDrops(true); // attempt
dragInfo.state = diNone;
- setFocusPolicy( WheelFocus );
+ setFocusPolicy( TQ_WheelFocus );
// im
setInputMethodEnabled(true);
@@ -428,7 +428,7 @@ TEWidget::TEWidget(TQWidget *parent, const char *name)
// Here's a start (David)
TEWidget::~TEWidget()
{
- qApp->removeEventFilter( this );
+ tqApp->removeEventFilter( this );
if (image) free(image);
}
@@ -439,7 +439,7 @@ TEWidget::~TEWidget()
/* ------------------------------------------------------------------------- */
/**
- A table for emulating the simple (single width) unicode drawing chars.
+ A table for emulating the simple (single width) tqunicode drawing chars.
It represents the 250x - 257x glyphs. If it's zero, we can't use it.
if it's not, it's encoded as follows: imagine a 5x5 grid where the points are numbered
0 to 24 left to top, top to bottom. Each point is represented by the corresponding bit.
@@ -496,7 +496,7 @@ static void drawLineChar(TQPainter& paint, int x, int y, int w, int h, uchar cod
int ex = x + w - 1;
int ey = y + h - 1;
- Q_UINT32 toDraw = LineChars[code];
+ TQ_UINT32 toDraw = LineChars[code];
//Top lines:
if (toDraw & TopL)
@@ -576,7 +576,7 @@ void TEWidget::drawTextFixed(TQPainter &paint, int x, int y,
}
//Check for line-drawing char
- if (isLineChar(drawstr[0].unicode()))
+ if (isLineChar(drawstr[0].tqunicode()))
{
uchar code = drawstr[0].cell();
if (LineChars[code])
@@ -587,7 +587,7 @@ void TEWidget::drawTextFixed(TQPainter &paint, int x, int y,
}
}
- paint.drawText(x,y, w, font_h, Qt::AlignHCenter | Qt::DontClip, drawstr, -1);
+ paint.drawText(x,y, w, font_h, Qt::AlignHCenter | TQt::DontClip, drawstr, -1);
x += w;
}
}
@@ -614,7 +614,7 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect,
if (attr->isTransparent(color_table))
{
if (pm)
- paint.setBackgroundMode( TransparentMode );
+ paint.setBackgroundMode( Qt::TransparentMode );
if (clear || (blinking && (attr->r & RE_BLINK)))
erase(rect);
}
@@ -624,17 +624,17 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect,
attr->b == cacol(CO_DFT, colorsSwapped ? DEFAULT_FORE_COLOR : DEFAULT_BACK_COLOR) )
// draw background colors with 75% opacity
- if ( argb_visual && qAlpha(blend_color) < 0xff ) {
+ if ( argb_visual && tqAlpha(blend_color) < 0xff ) {
QRgb col = bColor.rgb();
- Q_UINT8 salpha = 192;
- Q_UINT8 dalpha = 255 - salpha;
+ TQ_UINT8 salpha = 192;
+ TQ_UINT8 dalpha = 255 - salpha;
int a, r, g, b;
- a = QMIN( (qAlpha (col) * salpha) / 255 + (qAlpha (blend_color) * dalpha) / 255, 255 );
- r = QMIN( (qRed (col) * salpha) / 255 + (qRed (blend_color) * dalpha) / 255, 255 );
- g = QMIN( (qGreen (col) * salpha) / 255 + (qGreen (blend_color) * dalpha) / 255, 255 );
- b = QMIN( (qBlue (col) * salpha) / 255 + (qBlue (blend_color) * dalpha) / 255, 255 );
+ a = QMIN( (tqAlpha (col) * salpha) / 255 + (tqAlpha (blend_color) * dalpha) / 255, 255 );
+ r = QMIN( (tqRed (col) * salpha) / 255 + (tqRed (blend_color) * dalpha) / 255, 255 );
+ g = QMIN( (tqGreen (col) * salpha) / 255 + (tqGreen (blend_color) * dalpha) / 255, 255 );
+ b = QMIN( (tqBlue (col) * salpha) / 255 + (tqBlue (blend_color) * dalpha) / 255, 255 );
col = a << 24 | r << 16 | g << 8 | b;
int pixel = a << 24 | (r * a / 255) << 16 | (g * a / 255) << 8 | (b * a / 255);
@@ -673,7 +673,7 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect,
// Paint cursor
if ((attr->r & RE_CURSOR) && !isPrinting) {
- paint.setBackgroundMode( TransparentMode );
+ paint.setBackgroundMode( Qt::TransparentMode );
int h = font_h - m_lineSpacing;
TQRect r(rect.x(),rect.y()+m_lineSpacing/2,rect.width(),h);
if (hasFocus())
@@ -695,8 +695,8 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect,
{
// ### Disabled for now, since it causes problems with characters
// that use the full width and/or height of the character cells.
- //bool shadow = ( !isPrinting && qAlpha(blend_color) < 0xff
- // && qGray( fColor.rgb() ) > 64 );
+ //bool shadow = ( !isPrinting && tqAlpha(blend_color) < 0xff
+ // && tqGray( fColor.rgb() ) > 64 );
bool shadow = false;
paint.setPen(fColor);
int x = rect.x();
@@ -747,7 +747,7 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect,
{
paint.setClipRect(rect);
// On screen we use overstrike for bold
- paint.setBackgroundMode( TransparentMode );
+ paint.setBackgroundMode( Qt::TransparentMode );
int x = rect.x()+1;
if(!fixed_font)
{
@@ -819,9 +819,9 @@ void TEWidget::setImage(const ca* const newimg, int lines, int columns)
cacol cb; // undefined
int cr = -1; // undefined
- int lins = QMIN(this->lines, QMAX(0,lines ));
- int cols = QMIN(this->columns,QMAX(0,columns));
- TQChar *disstrU = new QChar[cols];
+ int lins = TQMIN(this->lines, TQMAX(0,lines ));
+ int cols = TQMIN(this->columns,TQMAX(0,columns));
+ TQChar *disstrU = new TQChar[cols];
char *dirtyMask = (char *) malloc(cols+2);
//{ static int cnt = 0; printf("setImage %d\n",cnt++); }
@@ -830,7 +830,7 @@ void TEWidget::setImage(const ca* const newimg, int lines, int columns)
const ca* lcl = &image[y*this->columns];
const ca* const ext = &newimg[y*columns];
- // The dirty mask indicates which characters need repainting. We also
+ // The dirty mask indicates which characters need tqrepainting. We also
// mark surrounding neighbours dirty, in case the character exceeds
// its cell boundaries
memset(dirtyMask, 0, cols+2);
@@ -856,7 +856,7 @@ void TEWidget::setImage(const ca* const newimg, int lines, int columns)
// where characters exceed their cell width.
if (dirtyMask[x])
{
- Q_UINT16 c = ext[x+0].c;
+ TQ_UINT16 c = ext[x+0].c;
if ( !c )
continue;
int p = 0;
@@ -947,7 +947,7 @@ void TEWidget::setImage(const ca* const newimg, int lines, int columns)
mResizeLabel = new TQLabel(i18n("Size: XXX x XXX"), mResizeWidget);
l->addWidget(mResizeLabel, 1, AlignCenter);
mResizeWidget->setMinimumWidth(mResizeLabel->fontMetrics().width(i18n("Size: XXX x XXX"))+20);
- mResizeWidget->setMinimumHeight(mResizeLabel->sizeHint().height()+20);
+ mResizeWidget->setMinimumHeight(mResizeLabel->tqsizeHint().height()+20);
mResizeTimer = new TQTimer(this);
connect(mResizeTimer, TQT_SIGNAL(timeout()), mResizeWidget, TQT_SLOT(hide()));
}
@@ -988,7 +988,7 @@ void TEWidget::paintEvent( TQPaintEvent* pe )
TQPainter paint;
setUpdatesEnabled(false);
paint.begin( this );
- paint.setBackgroundMode( TransparentMode );
+ paint.setBackgroundMode( Qt::TransparentMode );
// Note that the actual widget size can be slightly larger
// that the image (the size is truncated towards the smaller
@@ -1065,7 +1065,7 @@ void TEWidget::print(TQPainter &paint, bool friendly, bool exact)
pm.fill();
TQPainter pm_paint;
- pm_paint.begin(&pm, this);
+ pm_paint.tqbegin(&pm, TQT_TQWIDGET(this));
paintContents(pm_paint, contentsRect(), true);
pm_paint.end();
paint.drawPixmap(0, 0, pm);
@@ -1089,15 +1089,15 @@ void TEWidget::paintContents(TQPainter &paint, const TQRect &rect, bool pm)
int tLx = tL.x();
int tLy = tL.y();
- int lux = QMIN(columns-1, QMAX(0,(rect.left() - tLx - bX ) / font_w));
- int luy = QMIN(lines-1, QMAX(0,(rect.top() - tLy - bY ) / font_h));
- int rlx = QMIN(columns-1, QMAX(0,(rect.right() - tLx - bX ) / font_w));
- int rly = QMIN(lines-1, QMAX(0,(rect.bottom() - tLy - bY ) / font_h));
+ int lux = TQMIN(columns-1, TQMAX(0,(rect.left() - tLx - bX ) / font_w));
+ int luy = TQMIN(lines-1, TQMAX(0,(rect.top() - tLy - bY ) / font_h));
+ int rlx = TQMIN(columns-1, TQMAX(0,(rect.right() - tLx - bX ) / font_w));
+ int rly = TQMIN(lines-1, TQMAX(0,(rect.bottom() - tLy - bY ) / font_h));
- TQChar *disstrU = new QChar[columns];
+ TQChar *disstrU = new TQChar[columns];
for (int y = luy; y <= rly; y++)
{
- Q_UINT16 c = image[loc(lux,y)].c;
+ TQ_UINT16 c = image[loc(lux,y)].c;
int x = lux;
if(!c && x)
x--; // Search for start of multi-col char
@@ -1152,14 +1152,14 @@ void TEWidget::blinkEvent()
{
blinking = !blinking;
isBlinkEvent = true;
- repaint(false);
+ tqrepaint(false);
isBlinkEvent = false;
}
void TEWidget::blinkCursorEvent()
{
cursorBlinking = !cursorBlinking;
- repaint(cursorRect, true);
+ tqrepaint(cursorRect, true);
}
/* ------------------------------------------------------------------------- */
@@ -1178,9 +1178,9 @@ void TEWidget::propagateSize()
if (isFixedSize)
{
setSize(columns, lines);
- TQFrame::setFixedSize(sizeHint());
- parentWidget()->adjustSize();
- parentWidget()->setFixedSize(parentWidget()->sizeHint());
+ TQFrame::setFixedSize(tqsizeHint());
+ tqparentWidget()->adjustSize();
+ tqparentWidget()->setFixedSize(tqparentWidget()->tqsizeHint());
return;
}
if (image)
@@ -1283,12 +1283,12 @@ 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()==LeftButton) ) {
+ if ( possibleTripleClick && (ev->button()==Qt::LeftButton) ) {
mouseTripleClickEvent(ev);
return;
}
- if ( !contentsRect().contains(ev->pos()) ) return;
+ if ( !contentsRect().tqcontains(ev->pos()) ) return;
TQPoint tL = contentsRect().topLeft();
int tLx = tL.x();
int tLy = tL.y();
@@ -1296,7 +1296,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() == LeftButton)
+ if ( ev->button() == Qt::LeftButton)
{
line_selection_mode = false;
word_selection_mode = false;
@@ -1333,14 +1333,14 @@ void TEWidget::mousePressEvent(TQMouseEvent* ev)
}
}
}
- else if ( ev->button() == MidButton )
+ else if ( ev->button() == Qt::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() == RightButton )
+ else if ( ev->button() == Qt::RightButton )
{
if (mouse_marks || (ev->state() & ShiftButton)) {
configureRequestPoint = TQPoint( ev->x(), ev->y() );
@@ -1354,7 +1354,7 @@ void TEWidget::mousePressEvent(TQMouseEvent* ev)
void TEWidget::mouseMoveEvent(TQMouseEvent* ev)
{
// for auto-hiding the cursor, we need mouseTracking
- if (ev->state() == NoButton ) return;
+ if (ev->state() == Qt::NoButton ) return;
if (dragInfo.state == diPending) {
// we had a mouse down, but haven't confirmed a drag yet
@@ -1378,7 +1378,7 @@ void TEWidget::mouseMoveEvent(TQMouseEvent* ev)
if (actSel == 0) return;
// don't extend selection while pasting
- if (ev->state() & MidButton) return;
+ if (ev->state() & Qt::MidButton) return;
extendSelection( ev->pos() );
}
@@ -1390,7 +1390,7 @@ void TEWidget::setSelectionEnd()
void TEWidget::extendSelection( TQPoint pos )
{
- //if ( !contentsRect().contains(ev->pos()) ) return;
+ //if ( !contentsRect().tqcontains(ev->pos()) ) return;
TQPoint tL = contentsRect().topLeft();
int tLx = tL.x();
int tLy = tL.y();
@@ -1570,7 +1570,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() == LeftButton)
+ if ( ev->button() == Qt::LeftButton)
{
emit isBusySelecting(false); // Ok.. we can breath again.
if(dragInfo.state == diPending)
@@ -1600,8 +1600,8 @@ void TEWidget::mouseReleaseEvent(TQMouseEvent* ev)
}
dragInfo.state = diNone;
}
- if ( !mouse_marks && ((ev->button() == RightButton && !(ev->state() & ShiftButton))
- || ev->button() == MidButton) ) {
+ if ( !mouse_marks && ((ev->button() == Qt::RightButton && !(ev->state() & ShiftButton))
+ || ev->button() == Qt::MidButton) ) {
TQPoint tL = contentsRect().topLeft();
int tLx = tL.x();
int tLy = tL.y();
@@ -1613,7 +1613,7 @@ void TEWidget::mouseReleaseEvent(TQMouseEvent* ev)
void TEWidget::mouseDoubleClickEvent(TQMouseEvent* ev)
{
- if ( ev->button() != LeftButton) return;
+ if ( ev->button() != Qt::LeftButton) return;
TQPoint tL = contentsRect().topLeft();
int tLx = tL.x();
@@ -1735,14 +1735,14 @@ void TEWidget::mouseTripleClickEvent(TQMouseEvent* ev)
void TEWidget::focusInEvent( TQFocusEvent * )
{
- repaint(cursorRect, true); // *do* erase area, to get rid of the
+ tqrepaint(cursorRect, true); // *do* erase area, to get rid of the
// hollow cursor rectangle.
}
void TEWidget::focusOutEvent( TQFocusEvent * )
{
- repaint(cursorRect, true); // don't erase area
+ tqrepaint(cursorRect, true); // don't erase area
}
bool TEWidget::focusNextPrevChild( bool next )
@@ -1759,7 +1759,7 @@ int TEWidget::charClass(UINT16 ch) const
TQChar qch=TQChar(ch);
if ( qch.isSpace() ) return ' ';
- if ( qch.isLetterOrNumber() || word_characters.contains(qch, false) )
+ if ( qch.isLetterOrNumber() || word_characters.tqcontains(qch, false) )
return 'a';
// Everything else is weird
@@ -1774,7 +1774,7 @@ void TEWidget::setWordCharacters(TQString wc)
void TEWidget::setMouseMarks(bool on)
{
mouse_marks = on;
- setCursor( mouse_marks ? ibeamCursor : arrowCursor );
+ setCursor( mouse_marks ? tqibeamCursor : tqarrowCursor );
}
/* ------------------------------------------------------------------------- */
@@ -1796,24 +1796,24 @@ void TEWidget::emitText(TQString text)
void TEWidget::emitSelection(bool useXselection,bool appendReturn)
// Paste Clipboard by simulating keypress events
{
- TQApplication::clipboard()->setSelectionMode( useXselection );
- TQString text = TQApplication::clipboard()->text();
+ TQApplication::tqclipboard()->setSelectionMode( useXselection );
+ TQString text = TQApplication::tqclipboard()->text();
if(appendReturn)
text.append("\r");
if ( ! text.isEmpty() )
{
- text.replace("\n", "\r");
+ text.tqreplace("\n", "\r");
TQKeyEvent e(TQEvent::KeyPress, 0,-1,0, text);
emit keyPressedSignal(&e); // expose as a big fat keypress event
emit clearSelectionSignal();
}
- TQApplication::clipboard()->setSelectionMode( false );
+ TQApplication::tqclipboard()->setSelectionMode( false );
}
void TEWidget::setSelection(const TQString& t)
{
// Disconnect signal while WE set the clipboard
- QClipboard *cb = TQApplication::clipboard();
+ TQClipboard *cb = TQApplication::tqclipboard();
TQObject::disconnect( cb, TQT_SIGNAL(selectionChanged()),
this, TQT_SLOT(onClearSelection()) );
@@ -1853,7 +1853,7 @@ void TEWidget::onClearSelection()
//FIXME: an `eventFilter' has been installed instead of a `keyPressEvent'
// due to a bug in `QT' or the ignorance of the author to prevent
-// repaint events being emitted to the screen whenever one leaves
+// tqrepaint events being emitted to the screen whenever one leaves
// or reenters the screen to/from another application.
//
// Troll says one needs to change focusInEvent() and focusOutEvent(),
@@ -1873,12 +1873,12 @@ void TEWidget::doScroll(int lines)
bool TEWidget::eventFilter( TQObject *obj, TQEvent *e )
{
if ( (e->type() == TQEvent::Accel ||
- e->type() == TQEvent::AccelAvailable ) && qApp->focusWidget() == this )
+ e->type() == TQEvent::AccelAvailable ) && tqApp->tqfocusWidget() == this )
{
- static_cast<TQKeyEvent *>( e )->ignore();
+ TQT_TQKEYEVENT( e )->ignore();
return false;
}
- if ( obj != this /* when embedded */ && obj != parent() /* when standalone */ )
+ if ( TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(this) /* when embedded */ && TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(tqparent()) /* when standalone */ )
return false; // not us
if ( e->type() == TQEvent::KeyPress )
{
@@ -1971,13 +1971,13 @@ void TEWidget::imEndEvent( TQIMEvent *e )
int tLx = tL.x();
int tLy = tL.y();
- TQRect repaintRect = TQRect( bX+tLx, bY+tLy+font_h*m_imStartLine,
+ TQRect tqrepaintRect = TQRect( bX+tLx, bY+tLy+font_h*m_imStartLine,
contentsRect().width(), contentsRect().height() );
m_imStart = 0;
m_imPreeditLength = 0;
m_isIMEdit = m_isIMSel = false;
- repaint( repaintRect, true );
+ tqrepaint( tqrepaintRect, true );
}
// Override any Ctrl+<key> accelerator when pressed with the keyboard
@@ -1986,11 +1986,11 @@ bool TEWidget::event( TQEvent *e )
{
if ( e->type() == TQEvent::AccelOverride )
{
- TQKeyEvent *ke = static_cast<TQKeyEvent *>( e );
+ TQKeyEvent *ke = TQT_TQKEYEVENT( e );
KKey key( ke );
int keyCodeQt = key.keyCodeQt();
- if ( !standalone() && (ke->state() == Qt::ControlButton) )
+ if ( !standalone() && (ke->state() == ControlButton) )
{
ke->accept();
return true;
@@ -2097,7 +2097,7 @@ void TEWidget::clearImage()
void TEWidget::calcGeometry()
{
- scrollbar->resize(TQApplication::style().pixelMetric(TQStyle::PM_ScrollBarExtent),
+ scrollbar->resize(TQApplication::tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent),
contentsRect().height());
switch(scrollLoc)
{
@@ -2170,7 +2170,7 @@ void TEWidget::setFixedSize(int cols, int lins)
TQFrame::setFixedSize(m_size);
}
-TQSize TEWidget::sizeHint() const
+TQSize TEWidget::tqsizeHint() const
{
return m_size;
}
@@ -2235,7 +2235,7 @@ void TEWidget::dropEvent(TQDropEvent* event)
TQString tmp;
if (url.isLocalFile()) {
tmp = url.path(); // local URL : remove protocol. This helps "ln" & "cd" and doesn't harm the others
- } else if ( url.protocol() == TQString::fromLatin1( "mailto" ) ) {
+ } else if ( url.protocol() == TQString::tqfromLatin1( "mailto" ) ) {
justPaste = true;
break;
} else {
diff --git a/konsole/konsole/TEWidget.h b/konsole/konsole/TEWidget.h
index 2c11eac2e..af0bef9c1 100644
--- a/konsole/konsole/TEWidget.h
+++ b/konsole/konsole/TEWidget.h
@@ -39,7 +39,7 @@ class Konsole;
class TQLabel;
class TQTimer;
-class TEWidget : public QFrame
+class TEWidget : public TQFrame
// a widget representing attributed text
{
Q_OBJECT
@@ -96,7 +96,7 @@ public:
void updateImageSize();
void setSize(int cols, int lins);
void setFixedSize(int cols, int lins);
- TQSize sizeHint() const;
+ TQSize tqsizeHint() const;
void setWordCharacters(TQString wc);
TQString wordCharacters() { return word_characters; }
diff --git a/konsole/konsole/TEmuVt102.cpp b/konsole/konsole/TEmuVt102.cpp
index 0bdb0f42c..f704297cf 100644
--- a/konsole/konsole/TEmuVt102.cpp
+++ b/konsole/konsole/TEmuVt102.cpp
@@ -307,7 +307,7 @@ void TEmuVt102::initTokenizer()
#define ESC 27
#define CNTL(c) ((c)-'@')
-// process an incoming unicode character
+// process an incoming tqunicode character
void TEmuVt102::onRcvChar(int cc)
{ int i;
@@ -382,7 +382,7 @@ void TEmuVt102::XtermHack()
for (i = 2; i < ppos && '0'<=pbuf[i] && pbuf[i]<'9' ; i++)
arg = 10*arg + (pbuf[i]-'0');
if (pbuf[i] != ';') { ReportErrorToken(); return; }
- TQChar *str = new QChar[ppos-i-2];
+ TQChar *str = new TQChar[ppos-i-2];
for (int j = 0; j < ppos-i-2; j++) str[j] = pbuf[i+1+j];
TQString unistr(str,ppos-i-2);
// arg == 1 doesn't change the title. In XTerm it only changes the icon name
@@ -939,13 +939,13 @@ void TEmuVt102::onKeyPress( TQKeyEvent* ev )
const char* txt;
int len;
bool metaspecified;
- if (keytrans->findEntry(ev->key(), encodeMode(MODE_NewLine , BITS_NewLine ) + // OLD,
- encodeMode(MODE_Ansi , BITS_Ansi ) + // OBSOLETE,
- encodeMode(MODE_AppCuKeys, BITS_AppCuKeys ) + // VT100 stuff
- encodeMode(MODE_AppScreen, BITS_AppScreen ) + // VT100 stuff
- encodeStat(ControlButton , BITS_Control ) +
- encodeStat(ShiftButton , BITS_Shift ) +
- encodeStat(AltButton , BITS_Alt ),
+ if (keytrans->findEntry(ev->key(), encodeMode(MODE_NewLine , BITS_NewLine ) + // OLD,
+ encodeMode(MODE_Ansi , BITS_Ansi ) + // OBSOLETE,
+ encodeMode(MODE_AppCuKeys , BITS_AppCuKeys ) + // VT100 stuff
+ encodeMode(MODE_AppScreen , BITS_AppScreen ) + // VT100 stuff
+ encodeStat(TQt::ControlButton , BITS_Control ) +
+ encodeStat(TQt::ShiftButton , BITS_Shift ) +
+ encodeStat(TQt::AltButton , BITS_Alt ),
&cmd, &txt, &len, &metaspecified ))
//printf("cmd: %d, %s, %d\n",cmd,txt,len);
if (connected)
@@ -963,21 +963,21 @@ void TEmuVt102::onKeyPress( TQKeyEvent* ev )
{
switch(ev->key())
{
- case Key_Down : gui->doScroll(+1); return;
- case Key_Up : gui->doScroll(-1); return;
- case Key_PageUp : gui->doScroll(-gui->Lines()/2); return;
- case Key_PageDown : gui->doScroll(gui->Lines()/2); return;
+ 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;
}
}
// revert to non-history when typing
if (scr->getHistCursor() != scr->getHistLines() && (!ev->text().isEmpty()
- || ev->key()==Key_Down || ev->key()==Key_Up || ev->key()==Key_Left || ev->key()==Key_Right
- || ev->key()==Key_PageUp || ev->key()==Key_PageDown))
+ || 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))
scr->setHistCursor(scr->getHistLines());
if (cmd==CMD_send) {
- if ((ev->state() & AltButton) && !metaspecified ) sendString("\033");
+ if ((ev->state() & TQt::AltButton) && !metaspecified ) sendString("\033");
emit sndBlock(txt,len);
return;
}
@@ -985,13 +985,13 @@ void TEmuVt102::onKeyPress( TQKeyEvent* ev )
// fall back handling
if (!ev->text().isEmpty())
{
- if (ev->state() & AltButton) sendString("\033"); // ESC, this is the ALT prefix
+ if (ev->state() & TQt::AltButton) sendString("\033"); // ESC, this is the ALT prefix
TQCString s = m_codec->fromUnicode(ev->text()); // encode for application
// FIXME: In Qt 2, TQKeyEvent::text() would return "\003" for Ctrl-C etc.
// while in Qt 3 it returns the actual key ("c" or "C") which caused
// the ControlButton to be ignored. This hack seems to work for
// latin1 locales at least. Please anyone find a clean solution (malte)
- if (ev->state() & ControlButton)
+ if (ev->state() & TQt::ControlButton)
s.fill(ev->ascii(), 1);
emit sndBlock(s.data(),s.length()); // we may well have s.length() > 1
return;
diff --git a/konsole/konsole/TEmulation.cpp b/konsole/konsole/TEmulation.cpp
index 39aeab542..e136c3c38 100644
--- a/konsole/konsole/TEmulation.cpp
+++ b/konsole/konsole/TEmulation.cpp
@@ -251,7 +251,7 @@ int TEmulation::keymapNo()
*/
void TEmulation::onRcvChar(int c)
-// process application unicode input to terminal
+// process application tqunicode input to terminal
// this is a trivial scanner
{
c &= 0xff;
@@ -284,10 +284,10 @@ void TEmulation::onKeyPress( TQKeyEvent* ev )
scr->setHistCursor(scr->getHistLines());
if (!ev->text().isEmpty())
{ // A block of text
- // Note that the text is proper unicode.
+ // Note that the text is proper tqunicode.
// We should do a conversion here, but since this
// routine will never be used, we simply emit plain ascii.
- emit sndBlock(ev->text().ascii(),ev->text().length());
+ emit sndBlock(TQString(ev->text()).ascii(),ev->text().length());
}
else if (ev->ascii()>0)
{ unsigned char c[1];
@@ -299,7 +299,7 @@ void TEmulation::onKeyPress( TQKeyEvent* ev )
// Unblocking, Byte to Unicode translation --------------------------------- --
/*
- We are doing code conversion from locale to unicode first.
+ We are doing code conversion from locale to tqunicode first.
*/
void TEmulation::onRcvBlock(const char *s, int len)
@@ -345,7 +345,7 @@ void TEmulation::onRcvBlock(const char *s, int len)
if (r[j].category() == TQChar::Mark_NonSpacing)
scr->compose(r.mid(j,1));
else
- onRcvChar(r[j].unicode());
+ onRcvChar(r[j].tqunicode());
}
i = l;
}
@@ -418,9 +418,9 @@ bool TEmulation::findTextNext( const TQString &str, bool forward, bool caseSensi
for (int i = (m_findPos==-1?0:m_findPos+1); i<(scr->getHistLines()+scr->getLines()); i++) {
string = scr->getHistoryLine(i);
if (regExp)
- pos = string.find( TQRegExp(str,caseSensitive) );
+ pos = string.tqfind( TQRegExp(str,caseSensitive) );
else
- pos = string.find(str, 0, caseSensitive);
+ pos = string.tqfind(str, 0, caseSensitive);
if(pos!=-1) {
m_findPos=i;
if(i>scr->getHistLines())
@@ -436,9 +436,9 @@ bool TEmulation::findTextNext( const TQString &str, bool forward, bool caseSensi
for(int i = (m_findPos==-1?(scr->getHistLines()+scr->getLines()):m_findPos-1); i>=0; i--) {
string = scr->getHistoryLine(i);
if (regExp)
- pos = string.find( TQRegExp(str,caseSensitive) );
+ pos = string.tqfind( TQRegExp(str,caseSensitive) );
else
- pos = string.find(str, 0, caseSensitive);
+ pos = string.tqfind(str, 0, caseSensitive);
if(pos!=-1) {
m_findPos=i;
if(i>scr->getHistLines())
diff --git a/konsole/konsole/fontembedder.cpp b/konsole/konsole/fontembedder.cpp
index dfbd88ce4..d0c17e084 100644
--- a/konsole/konsole/fontembedder.cpp
+++ b/konsole/konsole/fontembedder.cpp
@@ -26,7 +26,7 @@
using namespace std;
-static Q_UINT32 charVal(TQChar val)
+static TQ_UINT32 charVal(TQChar val)
{
if (val == ' ')
return 0;
@@ -34,13 +34,13 @@ static Q_UINT32 charVal(TQChar val)
return 1;
}
-static Q_UINT32 readGlyphLine(TQTextStream& input)
+static TQ_UINT32 readGlyphLine(TQTextStream& input)
{
TQString line = input.readLine();
while (line.length() < 5)
line += ' ';
- Q_UINT32 val = charVal(line[0]) |
+ TQ_UINT32 val = charVal(line[0]) |
(charVal(line[1]) << 1) |
(charVal(line[2]) << 2) |
(charVal(line[3]) << 3) |
@@ -48,7 +48,7 @@ static Q_UINT32 readGlyphLine(TQTextStream& input)
return val;
}
-static Q_UINT32 readGlyph(TQTextStream& input)
+static TQ_UINT32 readGlyph(TQTextStream& input)
{
return readGlyphLine(input) |
(readGlyphLine(input) << 5) |
@@ -72,7 +72,7 @@ int main(int argc, char **argv)
TQTextStream input(&inFile);
- Q_UINT32 glyphStates[128];
+ TQ_UINT32 glyphStates[128];
for (int i = 0; i < 128; ++i)
glyphStates[i] = 0; //nothing..
@@ -98,7 +98,7 @@ int main(int argc, char **argv)
//Output.
cout<<"// WARNING: Autogenerated by \"fontembedder " << argv[1] << "\".\n";
cout<<"// You probably do not want to hand-edit this!\n\n";
- cout<<"static const Q_UINT32 LineChars[] = {\n";
+ cout<<"static const TQ_UINT32 LineChars[] = {\n";
//Nicely formatted: 8 per line, 16 lines
for (int line = 0; line < 128; line += 8)
diff --git a/konsole/konsole/keytrans.cpp b/konsole/konsole/keytrans.cpp
index 36e299bc0..de35d49ff 100644
--- a/konsole/konsole/keytrans.cpp
+++ b/konsole/konsole/keytrans.cpp
@@ -90,10 +90,10 @@ KeyTrans::KeyTrans(const TQString& path)
else
{
m_id = m_path;
- int i = m_id.findRev('/');
+ int i = m_id.tqfindRev('/');
if (i > -1)
m_id = m_id.mid(i+1);
- i = m_id.findRev('.');
+ i = m_id.tqfindRev('.');
if (i > -1)
m_id = m_id.left(i);
}
@@ -360,11 +360,11 @@ void KeyTrans::readConfig()
TQCString txt =
#include "default.keytab.h"
;
- buf=new TQBuffer(txt);
+ buf=TQT_TQIODEVICE(new TQBuffer(txt));
}
else
{
- buf=new TQFile(m_path);
+ buf=TQT_TQIODEVICE(new TQFile(m_path));
};
KeytabReader ktr(m_path,*buf);
ktr.parseTo(this);
@@ -533,8 +533,8 @@ void KeyTransSymbols::defKeySyms()
defKeySym("Up", Qt::Key_Up );
defKeySym("Right", Qt::Key_Right );
defKeySym("Down", Qt::Key_Down );
- defKeySym("Prior", Qt::Key_Prior );
- defKeySym("Next", Qt::Key_Next );
+ 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 );
@@ -670,8 +670,8 @@ static TQIntDict<KeyTrans> * numb2keymap = 0L;
KeyTrans* KeyTrans::find(int numb)
{
- KeyTrans* res = numb2keymap->find(numb);
- return res ? res : numb2keymap->find(0);
+ KeyTrans* res = numb2keymap->tqfind(numb);
+ return res ? res : numb2keymap->tqfind(0);
}
KeyTrans* KeyTrans::find(const TQString &id)
@@ -683,7 +683,7 @@ KeyTrans* KeyTrans::find(const TQString &id)
return it.current();
++it;
}
- return numb2keymap->find(0);
+ return numb2keymap->tqfind(0);
}
int KeyTrans::count()
diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp
index ecef79d4a..37f53bfb6 100644
--- a/konsole/konsole/konsole.cpp
+++ b/konsole/konsole/konsole.cpp
@@ -112,6 +112,7 @@ Time to start a requirement list.
#include <dcopclient.h>
#include <kglobalsettings.h>
#include <knotifydialog.h>
+#undef B0
#include <kprinter.h>
#include <kaccelmanager.h>
#include <kurifilter.h>
@@ -279,7 +280,7 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo
KAcceleratorManager::setNoAccel( menubar );
- sessionNumberMapper = new TQSignalMapper( this );
+ sessionNumberMapper = new TQSignalMapper( TQT_TQOBJECT(this) );
connect( sessionNumberMapper, TQT_SIGNAL( mapped( int ) ),
this, TQT_SLOT( newSessionTabbar( int ) ) );
@@ -547,7 +548,7 @@ void Konsole::makeGUI()
m_moveSessionRight->plug(m_view);
m_view->insertSeparator();
- KRadioAction *ra = session2action.find(se);
+ KRadioAction *ra = session2action.tqfind(se);
if (ra!=0) ra->plug(m_view);
//bookmarks menu
@@ -582,7 +583,7 @@ void Konsole::makeGUI()
showMenubar->plug ( m_options );
// Tabbar
- selectTabbar = new KSelectAction(i18n("&Tab Bar"), 0, this,
+ selectTabbar = new KSelectAction(i18n("&Tab Bar"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotSelectTabbar()), actions, "tabbar" );
TQStringList tabbaritems;
tabbaritems << i18n("&Hide") << i18n("&Top") << i18n("&Bottom");
@@ -590,7 +591,7 @@ void Konsole::makeGUI()
selectTabbar->plug(m_options);
// Scrollbar
- selectScrollbar = new KSelectAction(i18n("Sc&rollbar"), 0, this,
+ selectScrollbar = new KSelectAction(i18n("Sc&rollbar"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotSelectScrollbar()), actions, "scrollbar" );
TQStringList scrollitems;
scrollitems << i18n("&Hide") << i18n("&Left") << i18n("&Right");
@@ -606,7 +607,7 @@ void Konsole::makeGUI()
}
// Select Bell
- selectBell = new KSelectAction(i18n("&Bell"), SmallIconSet( "bell"), 0 , this,
+ selectBell = new KSelectAction(i18n("&Bell"), SmallIconSet( "bell"), 0 , TQT_TQOBJECT(this),
TQT_SLOT(slotSelectBell()), actions, "bell");
TQStringList bellitems;
bellitems << i18n("System &Bell")
@@ -621,28 +622,28 @@ void Konsole::makeGUI()
SmallIconSet( "text" ),
actions, 0L );
m_fontsizes->insert( new KAction( i18n( "&Enlarge Font" ),
- SmallIconSet( "fontsizeup" ), 0, this,
+ SmallIconSet( "fontsizeup" ), 0, TQT_TQOBJECT(this),
TQT_SLOT( biggerFont() ), actions,
"enlarge_font" ) );
m_fontsizes->insert( new KAction( i18n( "&Shrink Font" ),
- SmallIconSet( "fontsizedown" ), 0, this,
+ SmallIconSet( "fontsizedown" ), 0, TQT_TQOBJECT(this),
TQT_SLOT( smallerFont() ), actions,
"shrink_font" ) );
m_fontsizes->insert( new KAction( i18n( "Se&lect..." ),
- SmallIconSet( "font" ), 0, this,
+ SmallIconSet( "font" ), 0, TQT_TQOBJECT(this),
TQT_SLOT( slotSelectFont() ), actions,
"select_font" ) );
if ( b_installBitmapFonts )
{
m_fontsizes->insert( new KAction( i18n( "&Install Bitmap..." ),
- SmallIconSet( "font" ), 0, this,
+ SmallIconSet( "font" ), 0, TQT_TQOBJECT(this),
TQT_SLOT( slotInstallBitmapFonts() ), actions,
"install_fonts" ) );
}
m_fontsizes->plug(m_options);
// encoding menu, start with default checked !
- selectSetEncoding = new KSelectAction( i18n( "&Encoding" ), SmallIconSet( "charset" ), 0, this, TQT_SLOT(slotSetEncoding()), actions, "set_encoding" );
+ selectSetEncoding = new KSelectAction( i18n( "&Encoding" ), SmallIconSet( "charset" ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetEncoding()), actions, "set_encoding" );
TQStringList list = KGlobal::charsets()->descriptiveEncodingNames();
list.prepend( i18n( "Default" ) );
selectSetEncoding->setItems(list);
@@ -659,7 +660,7 @@ void Konsole::makeGUI()
// Select size
if (!b_fixedSize)
{
- selectSize = new KonsoleFontSelectAction(i18n("S&ize"), 0, this,
+ selectSize = new KonsoleFontSelectAction(i18n("S&ize"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotSelectSize()), actions, "size");
TQStringList sizeitems;
sizeitems << i18n("40x15 (&Small)")
@@ -673,13 +674,13 @@ void Konsole::makeGUI()
selectSize->plug(m_options);
}
- KAction *historyType = new KAction(i18n("Hist&ory..."), "history", 0, this,
+ KAction *historyType = new KAction(i18n("Hist&ory..."), "history", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotHistoryType()), actions, "history");
historyType->plug(m_options);
m_options->insertSeparator();
- KAction *save_settings = new KAction(i18n("&Save as Default"), "filesave", 0, this,
+ KAction *save_settings = new KAction(i18n("&Save as Default"), "filesave", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotSaveSettings()), actions, "save_default");
save_settings->plug(m_options);
@@ -689,9 +690,9 @@ void Konsole::makeGUI()
m_options->insertSeparator();
- KStdAction::configureNotifications(this, TQT_SLOT(slotConfigureNotifications()), actionCollection())->plug(m_options);
- KStdAction::keyBindings(this, TQT_SLOT(slotConfigureKeys()), actionCollection())->plug(m_options);
- KAction *configure = KStdAction::preferences(this, TQT_SLOT(slotConfigure()), actions);
+ KStdAction::configureNotifications(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureNotifications()), actionCollection())->plug(m_options);
+ KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureKeys()), actionCollection())->plug(m_options);
+ KAction *configure = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actions);
configure->plug(m_options);
if (KGlobalSettings::insertTearOffHandle())
@@ -716,7 +717,7 @@ void Konsole::makeGUI()
{
updateRMBMenu(); // show menubar / exit fullscreen
- KAction* selectionEnd = new KAction(i18n("Set Selection End"), 0, this,
+ KAction* selectionEnd = new KAction(i18n("Set Selection End"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotSetSelectionEnd()), actions, "selection_end");
selectionEnd->plug(m_rightButton);
@@ -789,7 +790,7 @@ void Konsole::makeGUI()
KeyTrans* ktr = kt_map[*it];
assert( ktr );
TQString title=ktr->hdr();
- m_keytab->insertItem(title.replace('&',"&&"),ktr->numb());
+ m_keytab->insertItem(title.tqreplace('&',"&&"),ktr->numb());
}
applySettingsToGUI();
@@ -800,29 +801,29 @@ void Konsole::makeGUI()
m_tabPopupMenu = new KPopupMenu( this );
KAcceleratorManager::manage( m_tabPopupMenu );
- m_tabDetachSession= new KAction( i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, this, TQT_SLOT(slotTabDetachSession()), this );
+ m_tabDetachSession= new KAction( i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTabDetachSession()), TQT_TQOBJECT(this) );
m_tabDetachSession->plug(m_tabPopupMenu);
- m_tabPopupMenu->insertItem( i18n("&Rename Session..."), this,
+ m_tabPopupMenu->insertItem( i18n("&Rename Session..."), TQT_TQOBJECT(this),
TQT_SLOT(slotTabRenameSession()) );
m_tabPopupMenu->insertSeparator();
m_tabMonitorActivity = new KToggleAction ( i18n( "Monitor for &Activity" ),
- SmallIconSet("activity"), 0, this, TQT_SLOT( slotTabToggleMonitor() ), this );
+ SmallIconSet("activity"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotTabToggleMonitor() ), TQT_TQOBJECT(this) );
m_tabMonitorActivity->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Activity" ) ) );
m_tabMonitorActivity->plug(m_tabPopupMenu);
m_tabMonitorSilence = new KToggleAction ( i18n( "Monitor for &Silence" ),
- SmallIconSet("silence"), 0, this, TQT_SLOT( slotTabToggleMonitor() ), this );
+ SmallIconSet("silence"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotTabToggleMonitor() ), TQT_TQOBJECT(this) );
m_tabMonitorSilence->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Silence" ) ) );
m_tabMonitorSilence->plug(m_tabPopupMenu);
- m_tabMasterMode = new KToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, this,
- TQT_SLOT( slotTabToggleMasterMode() ), this);
+ m_tabMasterMode = new KToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, TQT_TQOBJECT(this),
+ TQT_SLOT( slotTabToggleMasterMode() ), TQT_TQOBJECT(this));
m_tabMasterMode->plug(m_tabPopupMenu);
m_tabPopupMenu->insertSeparator();
- m_tabPopupMenu->insertItem( SmallIconSet("colors"), i18n("Select &Tab Color..."), this, TQT_SLOT(slotTabSelectColor()) );
+ m_tabPopupMenu->insertItem( SmallIconSet("colors"), i18n("Select &Tab Color..."), TQT_TQOBJECT(this), TQT_SLOT(slotTabSelectColor()) );
m_tabPopupMenu->insertSeparator();
m_tabPopupTabsMenu = new KPopupMenu( m_tabPopupMenu );
@@ -831,7 +832,7 @@ void Konsole::makeGUI()
TQT_SLOT( activateSession( int ) ) );
m_tabPopupMenu->insertSeparator();
- m_tabPopupMenu->insertItem( SmallIcon("fileclose"), i18n("C&lose Session"), this,
+ m_tabPopupMenu->insertItem( SmallIcon("fileclose"), i18n("C&lose Session"), TQT_TQOBJECT(this),
TQT_SLOT(slotTabCloseSession()) );
if (m_options) {
@@ -840,23 +841,23 @@ void Konsole::makeGUI()
KAcceleratorManager::manage( m_tabbarPopupMenu );
selectTabbar->plug(m_tabbarPopupMenu);
- KSelectAction *viewOptions = new KSelectAction(this);
+ KSelectAction *viewOptions = new KSelectAction(TQT_TQOBJECT(this));
viewOptions->setText(i18n("Tab &Options"));
TQStringList options;
options << i18n("&Text && Icons") << i18n("Text &Only") << i18n("&Icons Only");
viewOptions->setItems(options);
viewOptions->setCurrentItem(m_tabViewMode);
viewOptions->plug(m_tabbarPopupMenu);
- connect(viewOptions, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotTabSetViewOptions(int)));
+ connect(viewOptions, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotTabSetViewOptions(int)));
slotTabSetViewOptions(m_tabViewMode);
- KToggleAction *dynamicTabHideOption = new KToggleAction ( i18n( "&Dynamic Hide" ), 0, this,
- TQT_SLOT( slotTabbarToggleDynamicHide() ), this);
+ KToggleAction *dynamicTabHideOption = new KToggleAction ( i18n( "&Dynamic Hide" ), 0, TQT_TQOBJECT(this),
+ TQT_SLOT( slotTabbarToggleDynamicHide() ), TQT_TQOBJECT(this));
dynamicTabHideOption->setChecked(b_dynamicTabHide);
dynamicTabHideOption->plug(m_tabbarPopupMenu);
KToggleAction *m_autoResizeTabs = new KToggleAction( i18n("&Auto Resize Tabs"),
- 0, this, TQT_SLOT( slotToggleAutoResizeTabs() ), this);
+ 0, TQT_TQOBJECT(this), TQT_SLOT( slotToggleAutoResizeTabs() ), TQT_TQOBJECT(this));
m_autoResizeTabs->setChecked(b_autoResizeTabs);
m_autoResizeTabs->plug(m_tabbarPopupMenu);
}
@@ -944,18 +945,18 @@ void Konsole::makeTabWidget()
bool Konsole::eventFilter( TQObject *o, TQEvent *ev )
{
- if (o == m_newSessionButton)
+ if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_newSessionButton))
{
// Popup the menu when the left mousebutton is pressed and the mouse
// is moved by a small distance.
if (ev->type() == TQEvent::MouseButtonPress)
{
- TQMouseEvent* mev = static_cast<TQMouseEvent*>(ev);
+ TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev);
m_newSessionButtonMousePressPos = mev->pos();
}
else if (ev->type() == TQEvent::MouseMove)
{
- TQMouseEvent* mev = static_cast<TQMouseEvent*>(ev);
+ TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev);
if ((mev->pos() - m_newSessionButtonMousePressPos).manhattanLength()
> KGlobalSettings::dndEventDelay())
{
@@ -965,7 +966,7 @@ bool Konsole::eventFilter( TQObject *o, TQEvent *ev )
}
else if (ev->type() == TQEvent::ContextMenu)
{
- TQMouseEvent* mev = static_cast<TQMouseEvent*>(ev);
+ TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev);
slotTabbarContextMenu(mev->globalPos());
return true;
}
@@ -1048,75 +1049,75 @@ void Konsole::makeBasicGUI()
m_shortcuts = new KActionCollection(this);
- m_copyClipboard = new KAction(i18n("&Copy"), "editcopy", 0, this,
+ m_copyClipboard = new KAction(i18n("&Copy"), "editcopy", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotCopyClipboard()), m_shortcuts, "edit_copy");
- m_pasteClipboard = new KAction(i18n("&Paste"), "editpaste", Qt::SHIFT+Qt::Key_Insert, this,
+ m_pasteClipboard = new KAction(i18n("&Paste"), "editpaste", Qt::SHIFT+Qt::Key_Insert, TQT_TQOBJECT(this),
TQT_SLOT(slotPasteClipboard()), m_shortcuts, "edit_paste");
- m_pasteSelection = new KAction(i18n("Paste Selection"), Qt::CTRL+Qt::SHIFT+Qt::Key_Insert, this,
+ m_pasteSelection = new KAction(i18n("Paste Selection"), Qt::CTRL+Qt::SHIFT+Qt::Key_Insert, TQT_TQOBJECT(this),
TQT_SLOT(slotPasteSelection()), m_shortcuts, "pasteselection");
- m_clearTerminal = new KAction(i18n("C&lear Terminal"), 0, this,
+ m_clearTerminal = new KAction(i18n("C&lear Terminal"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotClearTerminal()), m_shortcuts, "clear_terminal");
- m_resetClearTerminal = new KAction(i18n("&Reset && Clear Terminal"), 0, this,
+ m_resetClearTerminal = new KAction(i18n("&Reset && Clear Terminal"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotResetClearTerminal()), m_shortcuts, "reset_clear_terminal");
- m_findHistory = new KAction(i18n("&Find in History..."), "find", 0, this,
+ m_findHistory = new KAction(i18n("&Find in History..."), "find", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotFindHistory()), m_shortcuts, "find_history");
m_findHistory->setEnabled(b_histEnabled);
- m_findNext = new KAction(i18n("Find &Next"), "next", 0, this,
+ m_findNext = new KAction(i18n("Find &Next"), "next", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotFindNext()), m_shortcuts, "find_next");
m_findNext->setEnabled(b_histEnabled);
- m_findPrevious = new KAction(i18n("Find Pre&vious"), "previous", 0, this,
+ m_findPrevious = new KAction(i18n("Find Pre&vious"), "previous", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotFindPrevious()), m_shortcuts, "find_previous");
m_findPrevious->setEnabled( b_histEnabled );
- m_saveHistory = new KAction(i18n("S&ave History As..."), "filesaveas", 0, this,
+ m_saveHistory = new KAction(i18n("S&ave History As..."), "filesaveas", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotSaveHistory()), m_shortcuts, "save_history");
m_saveHistory->setEnabled(b_histEnabled );
- m_clearHistory = new KAction(i18n("Clear &History"), "history_clear", 0, this,
+ m_clearHistory = new KAction(i18n("Clear &History"), "history_clear", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotClearHistory()), m_shortcuts, "clear_history");
m_clearHistory->setEnabled(b_histEnabled);
m_clearAllSessionHistories = new KAction(i18n("Clear All H&istories"), "history_clear", 0,
- this, TQT_SLOT(slotClearAllSessionHistories()), m_shortcuts, "clear_all_histories");
+ TQT_TQOBJECT(this), TQT_SLOT(slotClearAllSessionHistories()), m_shortcuts, "clear_all_histories");
- m_detachSession = new KAction(i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, this,
+ m_detachSession = new KAction(i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotDetachSession()), m_shortcuts, "detach_session");
m_detachSession->setEnabled(false);
- m_renameSession = new KAction(i18n("&Rename Session..."), Qt::CTRL+Qt::ALT+Qt::Key_S, this,
+ m_renameSession = new KAction(i18n("&Rename Session..."), Qt::CTRL+Qt::ALT+Qt::Key_S, TQT_TQOBJECT(this),
TQT_SLOT(slotRenameSession()), m_shortcuts, "rename_session");
if (kapp->authorizeKAction("zmodem_upload"))
m_zmodemUpload = new KAction( i18n( "&ZModem Upload..." ),
- Qt::CTRL+Qt::ALT+Qt::Key_U, this,
+ Qt::CTRL+Qt::ALT+Qt::Key_U, TQT_TQOBJECT(this),
TQT_SLOT( slotZModemUpload() ),
m_shortcuts, "zmodem_upload" );
monitorActivity = new KToggleAction ( i18n( "Monitor for &Activity" ),
- SmallIconSet("activity"), 0, this,
+ SmallIconSet("activity"), 0, TQT_TQOBJECT(this),
TQT_SLOT( slotToggleMonitor() ), m_shortcuts, "monitor_activity" );
monitorActivity->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Activity" ) ) );
monitorSilence = new KToggleAction ( i18n( "Monitor for &Silence" ),
- SmallIconSet("silence"), 0, this,
+ SmallIconSet("silence"), 0, TQT_TQOBJECT(this),
TQT_SLOT( slotToggleMonitor() ), m_shortcuts, "monitor_silence" );
monitorSilence->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Silence" ) ) );
- masterMode = new KToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, this,
+ masterMode = new KToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, TQT_TQOBJECT(this),
TQT_SLOT( slotToggleMasterMode() ), m_shortcuts, "send_input_to_all_sessions" );
- showMenubar = new KToggleAction ( i18n( "Show &Menubar" ), "showmenu", 0, this,
+ showMenubar = new KToggleAction ( i18n( "Show &Menubar" ), "showmenu", 0, TQT_TQOBJECT(this),
TQT_SLOT( slotToggleMenubar() ), m_shortcuts, "show_menubar" );
showMenubar->setCheckedState( KGuiItem( i18n("Hide &Menubar"), "showmenu", TQString::null, TQString::null ) );
m_fullscreen = KStdAction::fullScreen(0, 0, m_shortcuts, this );
- connect( m_fullscreen,TQT_SIGNAL(toggled(bool)), this,TQT_SLOT(updateFullScreen(bool)));
+ connect( m_fullscreen,TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this),TQT_SLOT(updateFullScreen(bool)));
m_fullscreen->setChecked(b_fullscreen);
- m_saveProfile = new KAction( i18n( "Save Sessions &Profile..." ), SmallIconSet("filesaveas"), 0, this,
+ m_saveProfile = new KAction( i18n( "Save Sessions &Profile..." ), SmallIconSet("filesaveas"), 0, TQT_TQOBJECT(this),
TQT_SLOT( slotSaveSessionsProfile() ), m_shortcuts, "save_sessions_profile" );
//help menu
@@ -1125,37 +1126,37 @@ void Konsole::makeBasicGUI()
// Don't steal F1 (handbook) accel (esp. since it not visible in
// "Configure Shortcuts").
- m_closeSession = new KAction(i18n("C&lose Session"), "fileclose", 0, this,
+ m_closeSession = new KAction(i18n("C&lose Session"), "fileclose", 0, TQT_TQOBJECT(this),
TQT_SLOT(confirmCloseCurrentSession()), m_shortcuts, "close_session");
- m_print = new KAction(i18n("&Print Screen..."), "fileprint", 0, this, TQT_SLOT( slotPrint() ), m_shortcuts, "file_print");
- m_quit = new KAction(i18n("&Quit"), "exit", 0, this, TQT_SLOT( close() ), m_shortcuts, "file_quit");
+ m_print = new KAction(i18n("&Print Screen..."), "fileprint", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPrint() ), m_shortcuts, "file_print");
+ m_quit = new KAction(i18n("&Quit"), "exit", 0, TQT_TQOBJECT(this), TQT_SLOT( close() ), m_shortcuts, "file_quit");
KShortcut shortcut(Qt::CTRL+Qt::ALT+Qt::Key_N);
shortcut.append(KShortcut(Qt::CTRL+Qt::SHIFT+Qt::Key_N));
- new KAction(i18n("New Session"), shortcut, this, TQT_SLOT(newSession()), m_shortcuts, "new_session");
- new KAction(i18n("Activate Menu"), Qt::CTRL+Qt::ALT+Qt::Key_M, this, TQT_SLOT(activateMenu()), m_shortcuts, "activate_menu");
- new KAction(i18n("List Sessions"), 0, this, TQT_SLOT(listSessions()), m_shortcuts, "list_sessions");
+ new KAction(i18n("New Session"), shortcut, TQT_TQOBJECT(this), TQT_SLOT(newSession()), m_shortcuts, "new_session");
+ new KAction(i18n("Activate Menu"), Qt::CTRL+Qt::ALT+Qt::Key_M, TQT_TQOBJECT(this), TQT_SLOT(activateMenu()), m_shortcuts, "activate_menu");
+ new KAction(i18n("List Sessions"), 0, TQT_TQOBJECT(this), TQT_SLOT(listSessions()), m_shortcuts, "list_sessions");
m_moveSessionLeft = new KAction(i18n("&Move Session Left"), TQApplication::reverseLayout() ? "forward" : "back",
- TQApplication::reverseLayout() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Right : Qt::CTRL+Qt::SHIFT+Qt::Key_Left, this,
+ TQApplication::reverseLayout() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Right : Qt::CTRL+Qt::SHIFT+Qt::Key_Left, TQT_TQOBJECT(this),
TQT_SLOT(moveSessionLeft()), m_shortcuts, "move_session_left");
m_moveSessionRight = new KAction(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, this,
+ TQApplication::reverseLayout() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Left : Qt::CTRL+Qt::SHIFT+Qt::Key_Right, TQT_TQOBJECT(this),
TQT_SLOT(moveSessionRight()), m_shortcuts, "move_session_right");
new KAction(i18n("Go to Previous Session"), TQApplication::reverseLayout() ? Qt::SHIFT+Qt::Key_Right : Qt::SHIFT+Qt::Key_Left,
- this, TQT_SLOT(prevSession()), m_shortcuts, "previous_session");
+ TQT_TQOBJECT(this), TQT_SLOT(prevSession()), m_shortcuts, "previous_session");
new KAction(i18n("Go to Next Session"), TQApplication::reverseLayout() ? Qt::SHIFT+Qt::Key_Left : Qt::SHIFT+Qt::Key_Right,
- this, TQT_SLOT(nextSession()), m_shortcuts, "next_session");
+ TQT_TQOBJECT(this), TQT_SLOT(nextSession()), m_shortcuts, "next_session");
for (int i=1;i<13;i++) { // Due to 12 function keys?
- new KAction(i18n("Switch to Session %1").arg(i), 0, this, TQT_SLOT(switchToSession()), m_shortcuts, TQString().sprintf("switch_to_session_%02d", i).latin1());
+ new KAction(i18n("Switch to Session %1").tqarg(i), 0, TQT_TQOBJECT(this), TQT_SLOT(switchToSession()), m_shortcuts, TQString(TQString().sprintf("switch_to_session_%02d", i)).latin1());
}
- new KAction(i18n("Enlarge Font"), 0, this, TQT_SLOT(biggerFont()), m_shortcuts, "bigger_font");
- new KAction(i18n("Shrink Font"), 0, this, TQT_SLOT(smallerFont()), m_shortcuts, "smaller_font");
+ new KAction(i18n("Enlarge Font"), 0, TQT_TQOBJECT(this), TQT_SLOT(biggerFont()), m_shortcuts, "bigger_font");
+ new KAction(i18n("Shrink Font"), 0, TQT_TQOBJECT(this), TQT_SLOT(smallerFont()), m_shortcuts, "smaller_font");
- new KAction(i18n("Toggle Bidi"), Qt::CTRL+Qt::ALT+Qt::Key_B, this, TQT_SLOT(toggleBidi()), m_shortcuts, "toggle_bidi");
+ new KAction(i18n("Toggle Bidi"), Qt::CTRL+Qt::ALT+Qt::Key_B, TQT_TQOBJECT(this), TQT_SLOT(toggleBidi()), m_shortcuts, "toggle_bidi");
// Should we load all *.desktop files now? Required for Session shortcuts.
if ( KConfigGroup(KGlobal::config(), "General").readBoolEntry("SessionShortcutsEnabled", false) ) {
@@ -1280,7 +1281,7 @@ void Konsole::setColLin(int columns, int lines)
te->setSize(columns, lines);
adjustSize();
if (b_fixedSize)
- setFixedSize(sizeHint());
+ setFixedSize(tqsizeHint());
notifySize(columns, lines); // set menu items
}
}
@@ -1316,7 +1317,7 @@ void Konsole::slotTabContextMenu(TQWidget* _te, const TQPoint & pos)
int counter=0;
for (TESession *ses = sessions.first(); ses; ses = sessions.next()) {
TQString title=ses->Title();
- m_tabPopupTabsMenu->insertItem(SmallIcon(ses->IconName()),title.replace('&',"&&"),counter++);
+ m_tabPopupTabsMenu->insertItem(SmallIcon(ses->IconName()),title.tqreplace('&',"&&"),counter++);
}
m_tabPopupMenu->popup( pos );
@@ -1382,7 +1383,7 @@ void Konsole::slotTabSetViewOptions(int mode)
else
title = sessions.at(i)->Title();
- title=title.replace('&',"&&");
+ title=title.tqreplace('&',"&&");
switch(mode) {
case ShowIconAndText:
tabwidget->changeTab(page, icon, title);
@@ -1428,7 +1429,7 @@ void Konsole::slotSaveSessionsProfile()
TQString::null, &ok, this );
if ( ok ) {
TQString path = locateLocal( "data",
- TQString::fromLatin1( "konsole/profiles/" ) + prof,
+ TQString::tqfromLatin1( "konsole/profiles/" ) + prof,
KGlobal::instance() );
if ( TQFile::exists( path ) )
@@ -1597,9 +1598,9 @@ void Konsole::readProperties(KConfig* config, const TQString &schema, bool globa
{
n_defaultKeytab=KeyTrans::find(config->readEntry("keytab","default"))->numb(); // act. the keytab for this session
b_fullscreen = config->readBoolEntry("Fullscreen",false);
- n_scroll = QMIN(config->readUnsignedNumEntry("scrollbar",TEWidget::SCRRIGHT),2);
- n_tabbar = QMIN(config->readUnsignedNumEntry("tabbar",TabBottom),2);
- n_bell = QMIN(config->readUnsignedNumEntry("bellmode",TEWidget::BELLSYSTEM),3);
+ n_scroll = TQMIN(config->readUnsignedNumEntry("scrollbar",TEWidget::SCRRIGHT),2);
+ n_tabbar = TQMIN(config->readUnsignedNumEntry("tabbar",TabBottom),2);
+ n_bell = TQMIN(config->readUnsignedNumEntry("bellmode",TEWidget::BELLSYSTEM),3);
// Options that should be applied to all sessions /////////////
@@ -1635,7 +1636,7 @@ void Konsole::readProperties(KConfig* config, const TQString &schema, bool globa
delete rootxpms[te];
rootxpms.remove(te);
}
- pixmap_menu_activated(sch->alignment());
+ pixmap_menu_activated(sch->tqalignment());
}
te->setColorTable(sch->table()); //FIXME: set twice here to work around a bug
@@ -1874,7 +1875,7 @@ void Konsole::updateSchemaMenu()
ColorSchema* s = (ColorSchema*)colors->at(i);
assert( s );
TQString title=s->title();
- m_schema->insertItem(title.replace('&',"&&"),s->numb(),0);
+ m_schema->insertItem(title.tqreplace('&',"&&"),s->numb(),0);
}
if (te && se)
@@ -1912,7 +1913,7 @@ void Konsole::slotToggleMenubar() {
if (b_fixedSize)
{
adjustSize();
- setFixedSize(sizeHint());
+ setFixedSize(tqsizeHint());
}
if (!showMenubar->isChecked()) {
setCaption(i18n("Use the right mouse button to bring back the menu"));
@@ -1987,12 +1988,12 @@ void Konsole::slotSelectTabbar() {
/* FIXME: Still necessary ? */
TQPtrDictIterator<KRootPixmap> it(rootxpms);
for (;it.current();++it)
- it.current()->repaint(true);
+ it.current()->tqrepaint(true);
if (b_fixedSize)
{
adjustSize();
- setFixedSize(sizeHint());
+ setFixedSize(tqsizeHint());
}
}
@@ -2073,7 +2074,7 @@ void Konsole::reparseConfiguration()
disconnect( sessionNumberMapper, TQT_SIGNAL( mapped( int ) ),
this, TQT_SLOT( newSessionTabbar( int ) ) );
delete sessionNumberMapper;
- sessionNumberMapper = new TQSignalMapper( this );
+ sessionNumberMapper = new TQSignalMapper( TQT_TQOBJECT(this) );
connect( sessionNumberMapper, TQT_SIGNAL( mapped( int ) ),
this, TQT_SLOT( newSessionTabbar( int ) ) );
@@ -2218,13 +2219,13 @@ void Konsole::updateTitle(TESession* _se)
}
tabwidget->setTabIconSet(_se->widget(), iconSetForSession(_se));
TQString icon = _se->IconName();
- KRadioAction *ra = session2action.find(_se);
+ KRadioAction *ra = session2action.tqfind(_se);
if (ra && (ra->icon() != icon))
ra->setIcon(icon);
if (m_tabViewMode == ShowIconOnly)
tabwidget->changeTab( _se->widget(), TQString::null );
else if (b_matchTabWinTitle)
- tabwidget->setTabLabel( _se->widget(), _se->fullTitle().replace('&',"&&"));
+ tabwidget->setTabLabel( _se->widget(), _se->fullTitle().tqreplace('&',"&&"));
}
void Konsole::initSessionFont(TQFont font) {
@@ -2362,7 +2363,7 @@ void Konsole::enterURL(const TQString& URL, const TQString&)
KRun::shellQuote(newtext);
te->emitText("cd "+newtext+"\r");
}
- else if (URL.contains("://", true)) {
+ else if (URL.tqcontains("://", true)) {
KURL u(URL);
newtext = u.protocol();
bool isSSH = (newtext == "ssh");
@@ -2409,7 +2410,7 @@ void Konsole::sendSignal(int sn)
void Konsole::runSession(TESession* s)
{
- KRadioAction *ra = session2action.find(s);
+ KRadioAction *ra = session2action.tqfind(s);
ra->setChecked(true);
activateSession(s);
@@ -2445,10 +2446,10 @@ void Konsole::addSession(TESession* s)
s->setTitle(newTitle);
// create an action for the session
- KRadioAction *ra = new KRadioAction(newTitle.replace('&',"&&"),
+ KRadioAction *ra = new KRadioAction(newTitle.tqreplace('&',"&&"),
s->IconName(),
0,
- this,
+ TQT_TQOBJECT(this),
TQT_SLOT(activateSession()),
m_shortcuts);
ra->setExclusiveGroup("sessions");
@@ -2496,7 +2497,7 @@ void Konsole::listSessions()
m_sessionList->setKeyboardShortcutsEnabled(true);
for (TESession *ses = sessions.first(); ses; ses = sessions.next()) {
TQString title=ses->Title();
- m_sessionList->insertItem(SmallIcon(ses->IconName()),title.replace('&',"&&"),counter++);
+ m_sessionList->insertItem(SmallIcon(ses->IconName()),title.tqreplace('&',"&&"),counter++);
}
m_sessionList->adjustSize();
m_sessionList->popup(mapToGlobal(TQPoint((width()/2)-(m_sessionList->width()/2),(height()/2)-(m_sessionList->height()/2))));
@@ -2504,7 +2505,7 @@ void Konsole::listSessions()
void Konsole::switchToSession()
{
- activateSession( TQString( sender()->name() ).right( 2 ).toInt() -1 );
+ activateSession( TQString( TQT_TQOBJECT_CONST(sender())->name() ).right( 2 ).toInt() -1 );
}
void Konsole::activateSession(int position)
@@ -2561,7 +2562,7 @@ void Konsole::activateSession(TESession *s)
se->setListenToKeyPress(true);
notifySessionState(se,NOTIFYNORMAL);
// Delete the session if isn't in the session list any longer.
- if (sessions.find(se) == -1)
+ if (sessions.tqfind(se) == -1)
delete se;
}
if (se != s)
@@ -2575,16 +2576,16 @@ void Konsole::activateSession(TESession *s)
s_schema = cs->relPath();
curr_schema = cs->numb();
pmPath = cs->imagePath();
- n_render = cs->alignment();
+ n_render = cs->tqalignment();
// BR 106464 temporary fix...
// only 2 sessions opened, 2nd session viewable, right-click on 1st tab and
// select 'Detach', close original Konsole window... crash
// s is not set properly on original Konsole window
- KRadioAction *ra = session2action.find(se);
+ KRadioAction *ra = session2action.tqfind(se);
if (!ra) {
se=sessions.first(); // Get new/correct TESession
- ra = session2action.find(se);
+ ra = session2action.tqfind(se);
}
ra->setChecked(true);
@@ -2616,7 +2617,7 @@ void Konsole::activateSession(TESession *s)
if (monitorActivity) monitorActivity->setChecked( se->isMonitorActivity() );
if (monitorSilence) monitorSilence->setChecked( se->isMonitorSilence() );
masterMode->setChecked( se->isMasterMode() );
- sessions.find(se);
+ sessions.tqfind(se);
uint position=sessions.at();
if (m_moveSessionLeft) m_moveSessionLeft->setEnabled(position>0);
if (m_moveSessionRight) m_moveSessionRight->setEnabled(position<sessions.count()-1);
@@ -2757,7 +2758,7 @@ void Konsole::newSession(int i)
return;
}
- KSimpleConfig* co = no2command.find(i);
+ KSimpleConfig* co = no2command.tqfind(i);
if (co) {
newSession(co);
resetScreenSessions();
@@ -2780,7 +2781,7 @@ void Konsole::newSessionTabbar(int i)
return;
}
- KSimpleConfig* co = no2command.find(i);
+ KSimpleConfig* co = no2command.tqfind(i);
if (co) {
newSession(co);
resetScreenSessions();
@@ -3021,7 +3022,7 @@ void Konsole::doneSession(TESession* s)
if (se_previous)
activateSession(se_previous);
- KRadioAction *ra = session2action.find(s);
+ KRadioAction *ra = session2action.tqfind(s);
ra->unplug(m_view);
tabwidget->removePage( s->widget() );
if (rootxpms[s->widget()]) {
@@ -3033,7 +3034,7 @@ void Konsole::doneSession(TESession* s)
m_removeSessionButton->setEnabled(tabwidget->count()>1);
session2action.remove(s);
action2session.remove(ra);
- int sessionIndex = sessions.findRef(s);
+ int sessionIndex = sessions.tqfindRef(s);
sessions.remove(s);
delete ra; // will the toolbar die?
@@ -3050,7 +3051,7 @@ void Konsole::doneSession(TESession* s)
{
se = sessions.at(sessionIndex ? sessionIndex - 1 : 0);
- session2action.find(se)->setChecked(true);
+ session2action.tqfind(se)->setChecked(true);
//FIXME: this Timer stupidity originated from the connected
// design of Emulations. By this the newly activated
// session might get a Ctrl(D) if the session has be
@@ -3065,7 +3066,7 @@ void Konsole::doneSession(TESession* s)
close();
}
else {
- sessions.find(se);
+ sessions.tqfind(se);
uint position=sessions.at();
m_moveSessionLeft->setEnabled(position>0);
m_moveSessionRight->setEnabled(position<sessions.count()-1);
@@ -3081,7 +3082,7 @@ void Konsole::doneSession(TESession* s)
void Konsole::prevSession()
{
- sessions.find(se); sessions.prev();
+ sessions.tqfind(se); sessions.prev();
if (!sessions.current()) sessions.last();
if (sessions.current() && sessions.count() > 1)
activateSession(sessions.current());
@@ -3091,7 +3092,7 @@ void Konsole::prevSession()
void Konsole::nextSession()
{
- sessions.find(se); sessions.next();
+ sessions.tqfind(se); sessions.next();
if (!sessions.current()) sessions.first();
if (sessions.current() && sessions.count() > 1)
activateSession(sessions.current());
@@ -3104,7 +3105,7 @@ void Konsole::slotMovedTab(int from, int to)
sessions.remove(_se);
sessions.insert(to,_se);
- KRadioAction *ra = session2action.find(_se);
+ KRadioAction *ra = session2action.tqfind(_se);
ra->unplug(m_view);
ra->plug(m_view,(m_view->count()-sessions.count()+1)+to);
@@ -3119,7 +3120,7 @@ void Konsole::slotMovedTab(int from, int to)
/* Move session forward in session list if possible */
void Konsole::moveSessionLeft()
{
- sessions.find(se);
+ sessions.tqfind(se);
uint position=sessions.at();
if (position==0)
return;
@@ -3127,7 +3128,7 @@ void Konsole::moveSessionLeft()
sessions.remove(position);
sessions.insert(position-1,se);
- KRadioAction *ra = session2action.find(se);
+ KRadioAction *ra = session2action.tqfind(se);
ra->unplug(m_view);
ra->plug(m_view,(m_view->count()-sessions.count()+1)+position-1);
@@ -3138,7 +3139,7 @@ void Konsole::moveSessionLeft()
tabwidget->blockSignals(false);
TQString title = se->Title();
createSessionTab(se->widget(), iconSetForSession(se),
- title.replace('&', "&&"), position-1);
+ title.tqreplace('&', "&&"), position-1);
tabwidget->showPage(se->widget());
tabwidget->setTabColor(se->widget(),oldcolor);
@@ -3151,7 +3152,7 @@ void Konsole::moveSessionLeft()
/* Move session back in session list if possible */
void Konsole::moveSessionRight()
{
- sessions.find(se);
+ sessions.tqfind(se);
uint position=sessions.at();
if (position==sessions.count()-1)
@@ -3160,7 +3161,7 @@ void Konsole::moveSessionRight()
sessions.remove(position);
sessions.insert(position+1,se);
- KRadioAction *ra = session2action.find(se);
+ KRadioAction *ra = session2action.tqfind(se);
ra->unplug(m_view);
ra->plug(m_view,(m_view->count()-sessions.count()+1)+position+1);
@@ -3171,7 +3172,7 @@ void Konsole::moveSessionRight()
tabwidget->blockSignals(false);
TQString title = se->Title();
createSessionTab(se->widget(), iconSetForSession(se),
- title.replace('&', "&&"), position+1);
+ title.tqreplace('&', "&&"), position+1);
tabwidget->showPage(se->widget());
tabwidget->setTabColor(se->widget(),oldcolor);
@@ -3279,9 +3280,9 @@ void Konsole::notifySessionState(TESession* session, int state)
// make sure they are not larger than 16x16
if (normal.width() > 16 || normal.height() > 16)
- normal.convertFromImage(normal.convertToImage().smoothScale(16,16));
+ normal.convertFromImage(TQImage(normal.convertToImage()).smoothScale(16,16));
if (active.width() > 16 || active.height() > 16)
- active.convertFromImage(active.convertToImage().smoothScale(16,16));
+ active.convertFromImage(TQImage(active.convertToImage()).smoothScale(16,16));
TQIconSet iconset;
iconset.setPixmap(normal, TQIconSet::Small, TQIconSet::Normal);
@@ -3383,7 +3384,7 @@ void Konsole::addSessionCommand(const TQString &path)
TQString name = comment;
name.prepend("SSC_"); // Allows easy searching for Session ShortCuts
- name.replace(" ", "_");
+ name.tqreplace(" ", "_");
sl_sessionShortCuts << name;
// Is there already this shortcut?
@@ -3391,7 +3392,7 @@ void Konsole::addSessionCommand(const TQString &path)
if ( m_shortcuts->action( name.latin1() ) ) {
sessionAction = m_shortcuts->action( name.latin1() );
} else {
- sessionAction = new KAction( comment, 0, this, 0, m_shortcuts, name.latin1() );
+ sessionAction = new KAction( comment, 0, TQT_TQOBJECT(this), 0, m_shortcuts, name.latin1() );
}
connect( sessionAction, TQT_SIGNAL( activated() ), sessionNumberMapper, TQT_SLOT( map() ) );
sessionNumberMapper->setMapping( sessionAction, cmd_serial );
@@ -3433,13 +3434,13 @@ void Konsole::createSessionMenus()
TQString txt = cfg->readEntry("Name");
TQString icon = cfg->readEntry("Icon", "konsole");
insertItemSorted(m_tabbarSessionsCommands, SmallIconSet(icon),
- txt.replace('&',"&&"), SESSION_NEW_SHELL_ID );
+ txt.tqreplace('&',"&&"), SESSION_NEW_SHELL_ID );
TQString comment = cfg->readEntry("Comment");
if (comment.isEmpty())
comment=txt.prepend(i18n("New "));
insertItemSorted(m_session, SmallIconSet(icon),
- comment.replace('&',"&&"), SESSION_NEW_SHELL_ID);
+ comment.tqreplace('&',"&&"), SESSION_NEW_SHELL_ID);
m_session->insertItem(SmallIconSet("window_new"),
i18n("New &Window"), SESSION_NEW_WINDOW_ID);
m_tabbarSessionsCommands->insertItem(SmallIconSet("window_new"),
@@ -3455,12 +3456,12 @@ void Konsole::createSessionMenus()
TQString txt = (*it).readEntry("Name");
TQString icon = (*it).readEntry("Icon", "konsole");
insertItemSorted(m_tabbarSessionsCommands, SmallIconSet(icon),
- txt.replace('&',"&&"), it.currentKey() );
+ txt.tqreplace('&',"&&"), it.currentKey() );
TQString comment = (*it).readEntry("Comment");
if (comment.isEmpty())
comment=txt.prepend(i18n("New "));
insertItemSorted(m_session, SmallIconSet(icon),
- comment.replace('&',"&&"), it.currentKey());
+ comment.tqreplace('&',"&&"), it.currentKey());
}
if (m_bookmarksSession)
@@ -3483,7 +3484,7 @@ void Konsole::addScreenSession(const TQString &path, const TQString &socket)
co->writeEntry("Name", socket);
TQString txt = i18n("Screen is a program controlling screens!", "Screen at %1").arg(socket);
co->writeEntry("Comment", txt);
- co->writePathEntry("Exec", TQString::fromLatin1("SCREENDIR=%1 screen -r %2")
+ co->writePathEntry("Exec", TQString::tqfromLatin1("SCREENDIR=%1 screen -r %2")
.arg(path).arg(socket));
TQString icon = "konsole";
cmd_serial++;
@@ -3616,7 +3617,7 @@ void Konsole::setSchema(ColorSchema* s, TEWidget* tewidget)
rootxpms.insert( tewidget, new KRootPixmap(tewidget) );
rootxpms[tewidget]->setFadeEffect(s->tr_x(), TQColor(s->tr_r(), s->tr_g(), s->tr_b()));
} else {
- tewidget->setBlendColor(qRgba(s->tr_r(), s->tr_g(), s->tr_b(), int(s->tr_x() * 255)));
+ tewidget->setBlendColor(tqRgba(s->tr_r(), s->tr_g(), s->tr_b(), int(s->tr_x() * 255)));
tewidget->setErasePixmap( TQPixmap() ); // make sure any background pixmap is unset
}
} else {
@@ -3624,8 +3625,8 @@ void Konsole::setSchema(ColorSchema* s, TEWidget* tewidget)
delete rootxpms[tewidget];
rootxpms.remove(tewidget);
}
- pixmap_menu_activated(s->alignment(), tewidget);
- tewidget->setBlendColor(qRgba(0, 0, 0, 0xff));
+ pixmap_menu_activated(s->tqalignment(), tewidget);
+ tewidget->setBlendColor(tqRgba(0, 0, 0, 0xff));
}
tewidget->setColorTable(s->table());
@@ -3645,12 +3646,12 @@ void Konsole::slotDetachSession()
void Konsole::detachSession(TESession* _se) {
if (!_se) _se=se;
- KRadioAction *ra = session2action.find(_se);
+ KRadioAction *ra = session2action.tqfind(_se);
ra->unplug(m_view);
TEWidget* se_widget = _se->widget();
session2action.remove(_se);
action2session.remove(ra);
- int sessionIndex = sessions.findRef(_se);
+ int sessionIndex = sessions.tqfindRef(_se);
sessions.remove(_se);
delete ra;
@@ -3704,7 +3705,7 @@ void Konsole::detachSession(TESession* _se) {
se = se_previous;
else
se = sessions.at(sessionIndex ? sessionIndex - 1 : 0);
- session2action.find(se)->setChecked(true);
+ session2action.tqfind(se)->setChecked(true);
TQTimer::singleShot(1,this,TQT_SLOT(activateSession()));
}
@@ -3749,8 +3750,8 @@ void Konsole::attachSession(TESession* session)
}
TQString title=session->Title();
- KRadioAction *ra = new KRadioAction(title.replace('&',"&&"), session->IconName(),
- 0, this, TQT_SLOT(activateSession()), m_shortcuts);
+ KRadioAction *ra = new KRadioAction(title.tqreplace('&',"&&"), session->IconName(),
+ 0, TQT_TQOBJECT(this), TQT_SLOT(activateSession()), m_shortcuts);
ra->setExclusiveGroup("sessions");
ra->setChecked(true);
@@ -3809,9 +3810,9 @@ void Konsole::slotRenameSession() {
void Konsole::slotRenameSession(TESession* ses, const TQString &name)
{
- KRadioAction *ra = session2action.find(ses);
+ KRadioAction *ra = session2action.tqfind(ses);
TQString title=name;
- title=title.replace('&',"&&");
+ title=title.tqreplace('&',"&&");
ra->setText(title);
ra->setIcon( ses->IconName() ); // I don't know why it is needed here
if (m_tabViewMode!=ShowIconOnly)
@@ -3977,7 +3978,7 @@ void Konsole::slotOpenSelection()
m_filterData = new KURIFilterData( selectedURL );
KURIFilter::self()->filterURI( *(m_filterData) );
- m_openSelection->insertItem( SmallIconSet( m_filterData->iconName() ),i18n( "%1" ).arg(m_filterData->uri().url()), 1 );
+ m_openSelection->insertItem( SmallIconSet( m_filterData->iconName() ),i18n( "%1" ).tqarg(m_filterData->uri().url()), 1 );
connect(m_openSelection, TQT_SIGNAL(activated(int)), TQT_SLOT(slotOpenURI(int)));
}
@@ -4192,7 +4193,7 @@ void Konsole::toggleBidi()
TQPtrList<TEWidget> tes = activeTEs();
for (TEWidget *_te = tes.first(); _te; _te = tes.next()) {
_te->setBidiEnabled(b_bidiEnabled);
- _te->repaint();
+ _te->tqrepaint();
}
}
@@ -4259,7 +4260,7 @@ KonsoleFind::KonsoleFind( TQWidget *parent, const char *name, bool /*modal*/ )
void KonsoleFind::slotEditRegExp()
{
if ( m_editorDialog == 0 )
- m_editorDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString::null, this );
+ m_editorDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) );
assert( m_editorDialog );
diff --git a/konsole/konsole/konsole_part.cpp b/konsole/konsole/konsole_part.cpp
index 620a0ebdb..d4b1d4627 100644
--- a/konsole/konsole/konsole_part.cpp
+++ b/konsole/konsole/konsole_part.cpp
@@ -76,12 +76,12 @@ konsoleFactory::~konsoleFactory()
s_aboutData = 0;
}
-KParts::Part *konsoleFactory::createPartObject(TQWidget *parentWidget, const char *widgetName,
+KParts::Part *konsoleFactory::createPartObject(TQWidget *tqparentWidget, const char *widgetName,
TQObject *parent, const char *name, const char *classname,
const TQStringList&)
{
-// kdDebug(1211) << "konsoleFactory::createPart parentWidget=" << parentWidget << " parent=" << parent << endl;
- KParts::Part *obj = new konsolePart(parentWidget, widgetName, parent, name, classname);
+// kdDebug(1211) << "konsoleFactory::createPart tqparentWidget=" << tqparentWidget << " parent=" << parent << endl;
+ KParts::Part *obj = new konsolePart(tqparentWidget, widgetName, parent, name, classname);
return obj;
}
@@ -97,7 +97,7 @@ KInstance *konsoleFactory::instance()
#define DEFAULT_HISTORY_SIZE 1000
-konsolePart::konsolePart(TQWidget *_parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname)
+konsolePart::konsolePart(TQWidget *_tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname)
: KParts::ReadOnlyPart(parent, name)
,te(0)
,se(0)
@@ -120,7 +120,7 @@ konsolePart::konsolePart(TQWidget *_parentWidget, const char *widgetName, TQObje
,m_histSize(DEFAULT_HISTORY_SIZE)
,m_runningShell( false )
{
- parentWidget=_parentWidget;
+ tqparentWidget=_tqparentWidget;
setInstance(konsoleFactory::instance());
m_extension = new konsoleBrowserExtension(this);
@@ -137,10 +137,10 @@ konsolePart::konsolePart(TQWidget *_parentWidget, const char *widgetName, TQObje
const char* shell = getenv("SHELL");
if (shell == NULL || *shell == '\0') shell = "/bin/sh";
eargs.append(shell);
- te = new TEWidget(parentWidget,widgetName);
+ te = new TEWidget(tqparentWidget,widgetName);
te->setMinimumSize(150,70); // allow resizing, cause resize in TEWidget
- setWidget(te);
+ setWidget(TQT_TQWIDGET(te));
te->setFocus();
connect( te,TQT_SIGNAL(configureRequest(TEWidget*,int,int,int)),
this,TQT_SLOT(configureRequest(TEWidget*,int,int,int)) );
@@ -197,7 +197,7 @@ konsolePart::konsolePart(TQWidget *_parentWidget, const char *widgetName, TQObje
KeyTrans* ktr = kt_map[*it];
assert( ktr );
TQString title=ktr->hdr();
- m_keytab->insertItem(title.replace('&',"&&"),ktr->numb());
+ m_keytab->insertItem(title.tqreplace('&',"&&"),ktr->numb());
}
}
@@ -317,13 +317,13 @@ void konsolePart::makeGUI()
if (!kapp->authorizeKAction("konsole_rmb"))
return;
- actions = new KActionCollection( (KMainWindow*)parentWidget );
- settingsActions = new KActionCollection( (KMainWindow*)parentWidget );
+ actions = new KActionCollection( (KMainWindow*)tqparentWidget );
+ settingsActions = new KActionCollection( (KMainWindow*)tqparentWidget );
// Send Signal Menu -------------------------------------------------------------
if (kapp->authorizeKAction("send_signal"))
{
- m_signals = new KPopupMenu((KMainWindow*)parentWidget);
+ m_signals = new KPopupMenu((KMainWindow*)tqparentWidget);
m_signals->insertItem( i18n( "&Suspend Task" ) + " (STOP)", SIGSTOP);
m_signals->insertItem( i18n( "&Continue Task" ) + " (CONT)", SIGCONT);
m_signals->insertItem( i18n( "&Hangup" ) + " (HUP)", SIGHUP);
@@ -338,7 +338,7 @@ void konsolePart::makeGUI()
// Settings Menu ----------------------------------------------------------------
if (kapp->authorizeKAction("settings"))
{
- m_options = new KPopupMenu((KMainWindow*)parentWidget);
+ m_options = new KPopupMenu((KMainWindow*)tqparentWidget);
// Scrollbar
selectScrollbar = new KSelectAction(i18n("Sc&rollbar"), 0, this,
@@ -379,7 +379,7 @@ void konsolePart::makeGUI()
// Keyboard Options Menu ---------------------------------------------------
if (kapp->authorizeKAction("keyboard"))
{
- m_keytab = new KPopupMenu((KMainWindow*)parentWidget);
+ m_keytab = new KPopupMenu((KMainWindow*)tqparentWidget);
m_keytab->setCheckable(true);
connect(m_keytab, TQT_SIGNAL(activated(int)), TQT_SLOT(keytab_menu_activated(int)));
m_options->insertItem( SmallIconSet( "key_bindings" ), i18n( "&Keyboard" ), m_keytab );
@@ -388,7 +388,7 @@ void konsolePart::makeGUI()
// Schema Options Menu -----------------------------------------------------
if (kapp->authorizeKAction("schema"))
{
- m_schema = new KPopupMenu((KMainWindow*)parentWidget);
+ m_schema = new KPopupMenu((KMainWindow*)tqparentWidget);
m_schema->setCheckable(true);
connect(m_schema, TQT_SIGNAL(activated(int)), TQT_SLOT(schema_menu_activated(int)));
connect(m_schema, TQT_SIGNAL(aboutToShow()), TQT_SLOT(schema_menu_check()));
@@ -452,17 +452,17 @@ void konsolePart::makeGUI()
}
// Popup Menu -------------------------------------------------------------------
- m_popupMenu = new KPopupMenu((KMainWindow*)parentWidget);
- KAction* selectionEnd = new KAction(i18n("Set Selection End"), 0, te,
+ m_popupMenu = new KPopupMenu((KMainWindow*)tqparentWidget);
+ KAction* selectionEnd = new KAction(i18n("Set Selection End"), 0, TQT_TQOBJECT(te),
TQT_SLOT(setSelectionEnd()), actions, "selection_end");
selectionEnd->plug(m_popupMenu);
KAction *copyClipboard = new KAction(i18n("&Copy"), "editcopy", 0,
- te, TQT_SLOT(copyClipboard()), actions, "edit_copy");
+ TQT_TQOBJECT(te), TQT_SLOT(copyClipboard()), actions, "edit_copy");
copyClipboard->plug(m_popupMenu);
KAction *pasteClipboard = new KAction(i18n("&Paste"), "editpaste", 0,
- te, TQT_SLOT(pasteClipboard()), actions, "edit_paste");
+ TQT_TQOBJECT(te), TQT_SLOT(pasteClipboard()), actions, "edit_paste");
pasteClipboard->plug(m_popupMenu);
if (m_signals)
@@ -561,9 +561,9 @@ void konsolePart::readProperties()
b_framevis = config->readBoolEntry("has frame",false);
b_histEnabled = config->readBoolEntry("historyenabled",true);
- n_bell = QMIN(config->readUnsignedNumEntry("bellmode",TEWidget::BELLSYSTEM),3);
+ n_bell = TQMIN(config->readUnsignedNumEntry("bellmode",TEWidget::BELLSYSTEM),3);
n_keytab=config->readNumEntry("keytab",0); // act. the keytab for this session
- n_scroll = QMIN(config->readUnsignedNumEntry("scrollbar",TEWidget::SCRRIGHT),2);
+ n_scroll = TQMIN(config->readUnsignedNumEntry("scrollbar",TEWidget::SCRRIGHT),2);
m_histSize = config->readNumEntry("history",DEFAULT_HISTORY_SIZE);
s_word_seps= config->readEntry("wordseps",":@-./_~");
@@ -587,10 +587,10 @@ void konsolePart::readProperties()
if (sch->useTransparency()) {
if (!rootxpm)
- rootxpm = new KRootPixmap(te);
+ rootxpm = new KRootPixmap(TQT_TQWIDGET(te));
rootxpm->setFadeEffect(sch->tr_x(), TQColor(sch->tr_r(), sch->tr_g(), sch->tr_b()));
rootxpm->start();
- rootxpm->repaint(true);
+ rootxpm->tqrepaint(true);
}
else {
if (rootxpm) {
@@ -598,7 +598,7 @@ void konsolePart::readProperties()
delete rootxpm;
rootxpm=0;
}
- pixmap_menu_activated(sch->alignment());
+ pixmap_menu_activated(sch->tqalignment());
}
te->setBellMode(n_bell);
@@ -733,7 +733,7 @@ void konsolePart::updateSchemaMenu()
for (int i = 0; i < (int) colors->count(); i++) {
ColorSchema* s = (ColorSchema*)colors->at(i);
TQString title=s->title();
- m_schema->insertItem(title.replace('&',"&&"),s->numb(),0);
+ m_schema->insertItem(title.tqreplace('&',"&&"),s->numb(),0);
}
if (te && se) {
@@ -775,10 +775,10 @@ void konsolePart::setSchema(ColorSchema* s)
if (s->useTransparency()) {
if (!rootxpm)
- rootxpm = new KRootPixmap(te);
+ rootxpm = new KRootPixmap(TQT_TQWIDGET(te));
rootxpm->setFadeEffect(s->tr_x(), TQColor(s->tr_r(), s->tr_g(), s->tr_b()));
rootxpm->start();
- rootxpm->repaint(true);
+ rootxpm->tqrepaint(true);
}
else {
if (rootxpm) {
@@ -786,7 +786,7 @@ void konsolePart::setSchema(ColorSchema* s)
delete rootxpm;
rootxpm=0;
}
- pixmap_menu_activated(s->alignment());
+ pixmap_menu_activated(s->tqalignment());
}
te->setColorTable(s->table());
@@ -797,8 +797,8 @@ void konsolePart::notifySize(int /* columns */, int /* lines */)
{
ColorSchema *sch=colors->find(s_schema);
- if (sch && sch->alignment() >= 3)
- pixmap_menu_activated(sch->alignment());
+ if (sch && sch->tqalignment() >= 3)
+ pixmap_menu_activated(sch->tqalignment());
}
void konsolePart::pixmap_menu_activated(int item)
@@ -847,7 +847,7 @@ void konsolePart::pixmap_menu_activated(int item)
void konsolePart::slotHistoryType()
{
if ( ! se ) return;
- HistoryTypeDialog dlg(se->history(), m_histSize, (KMainWindow*)parentWidget);
+ HistoryTypeDialog dlg(se->history(), m_histSize, (KMainWindow*)tqparentWidget);
if (dlg.exec()) {
if (dlg.isOn()) {
if (dlg.nbLines() > 0) {
@@ -917,7 +917,7 @@ void konsolePart::slotWordSeps() {
bool ok;
TQString seps = KInputDialog::getText( i18n( "Word Connectors" ),
- i18n( "Characters other than alphanumerics considered part of a word when double clicking:" ), s_word_seps, &ok, parentWidget );
+ i18n( "Characters other than alphanumerics considered part of a word when double clicking:" ), s_word_seps, &ok, tqparentWidget );
if ( ok )
{
s_word_seps = seps;
@@ -1077,7 +1077,7 @@ bool konsolePart::setPtyFd( int master_pty )
void konsolePart::newSession()
{
if ( se ) delete se;
- se = new TESession(te, "xterm", parentWidget->winId());
+ se = new TESession(te, "xterm", tqparentWidget->winId());
connect( se,TQT_SIGNAL(done(TESession*)),
this,TQT_SLOT(doneSession(TESession*)) );
connect( se,TQT_SIGNAL(openURLRequest(const TQString &)),
@@ -1125,7 +1125,7 @@ void konsolePart::showShellInDir( const TQString& dir )
{
TQString text = dir;
KRun::shellQuote(text);
- text = TQString::fromLatin1("cd ") + text + '\n';
+ text = TQString::tqfromLatin1("cd ") + text + '\n';
te->emitText( text );
};
}
diff --git a/konsole/konsole/konsole_part.h b/konsole/konsole/konsole_part.h
index 1f65106ad..db7533178 100644
--- a/konsole/konsole/konsole_part.h
+++ b/konsole/konsole/konsole_part.h
@@ -52,7 +52,7 @@ public:
konsoleFactory();
virtual ~konsoleFactory();
- virtual KParts::Part* createPartObject(TQWidget *parentWidget = 0, const char *widgetName = 0,
+ virtual KParts::Part* createPartObject(TQWidget *tqparentWidget = 0, const char *widgetName = 0,
TQObject* parent = 0, const char* name = 0,
const char* classname = "KParts::Part",
const TQStringList &args = TQStringList());
@@ -70,7 +70,7 @@ class konsolePart: public KParts::ReadOnlyPart, public TerminalInterface, public
{
Q_OBJECT
public:
- konsolePart(TQWidget *parentWidget, const char *widgetName, TQObject * parent, const char *name, const char *classname = 0);
+ konsolePart(TQWidget *tqparentWidget, const char *widgetName, TQObject * parent, const char *name, const char *classname = 0);
virtual ~konsolePart();
signals:
@@ -140,7 +140,7 @@ signals:
bool doWriteStream( const TQByteArray& );
bool doCloseStream();
- TQWidget* parentWidget;
+ TQWidget* tqparentWidget;
TEWidget* te;
TESession* se;
ColorSchemaList* colors;
diff --git a/konsole/konsole/konsole_wcwidth.cpp b/konsole/konsole/konsole_wcwidth.cpp
index 73d7c7131..63abe8dd1 100644
--- a/konsole/konsole/konsole_wcwidth.cpp
+++ b/konsole/konsole/konsole_wcwidth.cpp
@@ -19,7 +19,7 @@ struct interval {
};
/* auxiliary function for binary search in interval table */
-static int bisearch(Q_UINT16 ucs, const struct interval *table, int max) {
+static int bisearch(TQ_UINT16 ucs, const struct interval *table, int max) {
int min = 0;
int mid;
@@ -65,11 +65,11 @@ static int bisearch(Q_UINT16 ucs, const struct interval *table, int max) {
* ISO 8859-1 and WGL4 characters, Unicode control characters,
* etc.) have a column width of 1.
*
- * This implementation assumes that Q_UINT16 characters are encoded
+ * This implementation assumes that TQ_UINT16 characters are encoded
* in ISO 10646.
*/
-int konsole_wcwidth_normal(Q_UINT16 ucs)
+int konsole_wcwidth_normal(TQ_UINT16 ucs)
{
/* sorted list of non-overlapping intervals of non-spacing characters */
static const struct interval combining[] = {
@@ -143,7 +143,7 @@ int konsole_wcwidth_normal(Q_UINT16 ucs)
* encodings who want to migrate to UCS. It is not otherwise
* recommended for general use.
*/
-int konsole_wcwidth_cjk(Q_UINT16 ucs)
+int konsole_wcwidth_cjk(TQ_UINT16 ucs)
{
/* sorted list of non-overlapping intervals of East Asian Ambiguous
* characters */
@@ -214,13 +214,13 @@ int string_width( const TQString &txt )
int w = 0;
for ( uint i = 1; i < txt.length(); ++i ) {
- w += konsole_wcwidth(txt[i].unicode());
+ w += konsole_wcwidth(txt[i].tqunicode());
}
return w;
}
-int konsole_wcwidth(Q_UINT16 ucs) {
+int konsole_wcwidth(TQ_UINT16 ucs) {
static int use_wcwidth_cjk = (getenv("KONSOLE_WCWIDTH_CJK")) ? 1: 0;
diff --git a/konsole/konsole/konsole_wcwidth.h b/konsole/konsole/konsole_wcwidth.h
index b070beb02..a7ca9ad4f 100644
--- a/konsole/konsole/konsole_wcwidth.h
+++ b/konsole/konsole/konsole_wcwidth.h
@@ -9,8 +9,8 @@
#include <tqglobal.h>
#include <tqstring.h>
-int konsole_wcwidth(Q_UINT16 ucs);
-//int konsole_wcwidth_cjk(Q_UINT16 ucs);
+int konsole_wcwidth(TQ_UINT16 ucs);
+//int konsole_wcwidth_cjk(TQ_UINT16 ucs);
int string_width( const TQString &txt );
diff --git a/konsole/konsole/konsolebookmarkmenu.cpp b/konsole/konsole/konsolebookmarkmenu.cpp
index 0686cfbf1..d9cea8293 100644
--- a/konsole/konsole/konsolebookmarkmenu.cpp
+++ b/konsole/konsole/konsolebookmarkmenu.cpp
@@ -97,7 +97,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu()
bm = parentBookmark.next(bm) )
{
TQString text = bm.text();
- text.replace( '&', "&&" );
+ text.tqreplace( '&', "&&" );
if ( !separatorInserted && m_bIsRoot) { // inserted before the first konq bookmark, to avoid the separator if no konq bookmark
m_parentMenu->insertSeparator();
separatorInserted = true;
@@ -149,7 +149,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu()
void KonsoleBookmarkMenu::slotBookmarkSelected()
{
if ( !m_pOwner ) return; // this view doesn't handle bookmarks...
- m_kOwner->openBookmarkURL( TQString::fromUtf8(sender()->name()), /* URL */
+ m_kOwner->openBookmarkURL( TQString::fromUtf8(TQT_TQOBJECT_CONST(sender())->name()), /* URL */
( (KAction *)sender() )->text() /* Title */ );
}
diff --git a/konsole/konsole/kwrited.cpp b/konsole/konsole/kwrited.cpp
index 4255c1938..9a89c6cb7 100644
--- a/konsole/konsole/kwrited.cpp
+++ b/konsole/konsole/kwrited.cpp
@@ -71,14 +71,14 @@ KWrited::KWrited() : TQTextEdit()
setMinimumWidth(pref_width);
setMinimumHeight(pref_height);
setReadOnly(true);
- setFocusPolicy(TQWidget::NoFocus);
+ setFocusPolicy(TQ_NoFocus);
setWordWrap(TQTextEdit::WidgetWidth);
- setTextFormat(Qt::PlainText);
+ setTextFormat(TQt::PlainText);
pty = new KPty();
pty->open();
pty->login(KUser().loginName().local8Bit().data(), getenv("DISPLAY"));
- TQSocketNotifier *sn = new TQSocketNotifier(pty->masterFd(), TQSocketNotifier::Read, this);
+ TQSocketNotifier *sn = new TQSocketNotifier(pty->masterFd(), TQSocketNotifier::Read, TQT_TQOBJECT(this));
connect(sn, TQT_SIGNAL(activated(int)), this, TQT_SLOT(block_in(int)));
TQString txt = i18n("KWrited - Listening on Device %1").arg(pty->ttyName());
diff --git a/konsole/konsole/kwrited.h b/konsole/konsole/kwrited.h
index 04cfca548..7c051c51a 100644
--- a/konsole/konsole/kwrited.h
+++ b/konsole/konsole/kwrited.h
@@ -28,7 +28,7 @@
class KPty;
-class KWrited : public QTextEdit
+class KWrited : public TQTextEdit
{ Q_OBJECT
public:
KWrited();
diff --git a/konsole/konsole/linefont.h b/konsole/konsole/linefont.h
index 9873c43d4..a68457023 100644
--- a/konsole/konsole/linefont.h
+++ b/konsole/konsole/linefont.h
@@ -1,7 +1,7 @@
// WARNING: Autogenerated by "fontembedder ./linefont.src".
// You probably do not want to hand-edit this!
-static const Q_UINT32 LineChars[] = {
+static const TQ_UINT32 LineChars[] = {
0x00007c00, 0x000fffe0, 0x00421084, 0x00e739ce, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00427000, 0x004e7380, 0x00e77800, 0x00ef7bc0,
0x00421c00, 0x00439ce0, 0x00e73c00, 0x00e7bde0, 0x00007084, 0x000e7384, 0x000079ce, 0x000f7bce,
diff --git a/konsole/konsole/main.cpp b/konsole/konsole/main.cpp
index 7be5e5146..9916ee82f 100644
--- a/konsole/konsole/main.cpp
+++ b/konsole/konsole/main.cpp
@@ -133,7 +133,7 @@ const char *konsole_shell(TQStrList &args)
*/
class KonsoleSessionManaged: public KSessionManaged {
public:
- bool saveState( QSessionManager&sm) {
+ bool saveState( TQSessionManager&sm) {
TQStringList restartCommand = sm.restartCommand();
if (has_noxft)
restartCommand.append("--noxft");
@@ -324,7 +324,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
TQString term = "";
if(args->isSet("tn")) {
- term=TQString::fromLatin1(args->getOption("tn"));
+ term=TQString::tqfromLatin1(args->getOption("tn"));
}
login_shell = args->isSet("ls");
@@ -375,7 +375,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
it != types.end(); ++it)
{
TQString file = *it;
- file = file.mid(file.findRev('/')+1);
+ file = file.mid(file.tqfindRev('/')+1);
if (file.endsWith(".desktop"))
file = file.left(file.length()-8);
printf("%s\n", TQFile::encodeName(file).data());
@@ -437,7 +437,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
it != profiles.end(); ++it)
{
TQString file = *it;
- file = file.mid(file.findRev('/')+1);
+ file = file.mid(file.tqfindRev('/')+1);
printf("%s\n", TQFile::encodeName(file).data());
}
return 0;
@@ -515,7 +515,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
sIcon = sessionconfig->readEntry("Icon0","konsole");
sCwd = sessionconfig->readPathEntry("Cwd0");
workDir = sessionconfig->readPathEntry("workdir");
- n_tabbar = QMIN(sessionconfig->readUnsignedNumEntry("tabbar",Konsole::TabBottom),2);
+ n_tabbar = TQMIN(sessionconfig->readUnsignedNumEntry("tabbar",Konsole::TabBottom),2);
Konsole *m = new Konsole(wname,histon,menubaron,tabbaron,frameon,scrollbaron,0/*type*/,true,n_tabbar, workDir);
m->newSession(sPgm, eargs, sTerm, sIcon, sTitle, sCwd);
@@ -558,7 +558,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
// if the -e option is passed on the command line, this overrides the program specified
// in the profile file
if ( args->isSet("e") )
- sPgm = (shell ? TQFile::decodeName(shell) : TQString::null);
+ sPgm = (shell ? TQFile::decodeName(shell) : TQString());
else
sPgm = sessionconfig->readEntry(key, shell);
@@ -614,7 +614,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
else
{
Konsole* m = new Konsole(wname,histon,menubaron,tabbaron,frameon,scrollbaron,type, false, 0, workDir);
- m->newSession((shell ? TQFile::decodeName(shell) : TQString::null), eargs, term, TQString::null, title, workDir);
+ m->newSession((shell ? TQFile::decodeName(shell) : TQString()), eargs, term, TQString(), title, workDir);
m->enableFullScripting(full_script);
m->enableFixedSize(fixed_size);
//3.8 :-(
@@ -644,13 +644,13 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
//// Temporary code, waiting for Qt to do this properly
// Delete all toplevel widgets that have WDestructiveClose
- TQWidgetList *list = TQApplication::topLevelWidgets();
+ TQWidgetList *list = TQApplication::tqtopLevelWidgets();
// remove all toplevel widgets that have a parent (i.e. they
// got WTopLevel explicitly), they'll be deleted by the parent
list->first();
while( list->current())
{
- if( list->current()->parentWidget() != NULL || !list->current()->testWFlags( Qt::WDestructiveClose ) )
+ if( list->current()->tqparentWidget() != NULL || !list->current()->testWFlags( TQt::WDestructiveClose ) )
{
list->remove();
continue;
diff --git a/konsole/konsole/printsettings.cpp b/konsole/konsole/printsettings.cpp
index f27194c14..f4924b9e8 100644
--- a/konsole/konsole/printsettings.cpp
+++ b/konsole/konsole/printsettings.cpp
@@ -38,7 +38,7 @@ PrintSettings::PrintSettings(TQWidget *parent, const char *name)
m_printheader->hide(); // Not yet implemented.
- QVBoxLayout *l0 = new TQVBoxLayout(this, 0, 10);
+ TQVBoxLayout *l0 = new TQVBoxLayout(this, 0, 10);
l0->addWidget(m_printfriendly);
l0->addWidget(m_printexact);
l0->addWidget(m_printheader);
diff --git a/konsole/konsole/printsettings.h b/konsole/konsole/printsettings.h
index 68d7b4d91..85eb89e95 100644
--- a/konsole/konsole/printsettings.h
+++ b/konsole/konsole/printsettings.h
@@ -36,9 +36,9 @@ public:
void setOptions(const TQMap<TQString,TQString>& opts);
private:
- QCheckBox *m_printfriendly;
- QCheckBox *m_printexact;
- QCheckBox *m_printheader;
+ TQCheckBox *m_printfriendly;
+ TQCheckBox *m_printexact;
+ TQCheckBox *m_printheader;
};
#endif
diff --git a/konsole/konsole/schema.cpp b/konsole/konsole/schema.cpp
index 8d85329eb..211f99b77 100644
--- a/konsole/konsole/schema.cpp
+++ b/konsole/konsole/schema.cpp
@@ -131,7 +131,7 @@ ColorSchema::ColorSchema(const TQString& pathname)
,lastRead(new TQDateTime())
{
//start with a valid time, aleXXX
- *lastRead = TQDateTime::currentDateTime();
+ *lastRead = TQDateTime::tqcurrentDateTime();
TQString fPath = pathname.startsWith("/") ? pathname : locate("data", "konsole/"+pathname);
if (fPath.isEmpty() || !TQFile::exists(fPath))
{
@@ -169,7 +169,7 @@ ColorSchema::ColorSchema(KConfig& c)
m_title = c.readEntry("Title",i18n("[no title]"));
m_imagePath = c.readEntry("ImagePath");
- m_alignment = c.readNumEntry("ImageAlignment",1);
+ m_tqalignment = c.readNumEntry("ImageAlignment",1);
m_useTransparency = c.readBoolEntry("UseTransparency",false);
m_tr_r = c.readNumEntry("TransparentR",0);
@@ -203,7 +203,7 @@ void ColorSchema::clearSchema()
}
m_title = i18n("[no title]");
m_imagePath = "";
- m_alignment = 1;
+ m_tqalignment = 1;
m_useTransparency = false;
m_tr_x = 0.0;
m_tr_r = 0;
@@ -216,7 +216,7 @@ void ColorSchema::setDefaultSchema()
m_numb = 0;
m_title = i18n("Konsole Default");
m_imagePath = ""; // background pixmap
- m_alignment = 1; // none
+ m_tqalignment = 1; // none
m_useTransparency = false; // not use pseudo-transparency by default
m_tr_r = m_tr_g = m_tr_b = 0; // just to be on the safe side
m_tr_x = 0.0;
@@ -273,7 +273,7 @@ void ColorSchema::writeConfig(const TQString& path) const
c.setGroup("SchemaGeneral");
c.writeEntry("Title",m_title);
c.writeEntry("ImagePath",m_imagePath);
- c.writeEntry("ImageAlignment",m_alignment);
+ c.writeEntry("ImageAlignment",m_tqalignment);
c.writeEntry("UseTransparency",m_useTransparency);
c.writeEntry("TransparentR",m_tr_r);
@@ -313,7 +313,7 @@ bool ColorSchema::rereadSchemaFile()
char line[100];
- *lastRead = TQDateTime::currentDateTime();
+ *lastRead = TQDateTime::tqcurrentDateTime();
while (fscanf(sysin,"%80[^\n]\n",line) > 0)
{
@@ -333,8 +333,8 @@ bool ColorSchema::rereadSchemaFile()
continue;
TQString qline(line);
- m_imagePath = locate("wallpaper", qline.mid( qline.find(" ",7)+1 ) );
- m_alignment = attr;
+ m_imagePath = locate("wallpaper", qline.mid( qline.tqfind(" ",7)+1 ) );
+ m_tqalignment = attr;
}
if (!strncmp(line,"transparency",12))
{ float rx;
@@ -388,7 +388,7 @@ bool ColorSchema::rereadSchemaFile()
if (!(0 <= fi && fi <= TABLE_COLORS)) continue;
if (!(0 <= tr && tr <= 1 )) continue;
if (!(0 <= bo && bo <= 1 )) continue;
- m_table[fi].color = kapp->palette().active().text();
+ m_table[fi].color = kapp->tqpalette().active().text();
m_table[fi].transparent = tr;
m_table[fi].bold = bo;
}
@@ -399,7 +399,7 @@ bool ColorSchema::rereadSchemaFile()
if (!(0 <= fi && fi <= TABLE_COLORS)) continue;
if (!(0 <= tr && tr <= 1 )) continue;
if (!(0 <= bo && bo <= 1 )) continue;
- m_table[fi].color = kapp->palette().active().base();
+ m_table[fi].color = kapp->tqpalette().active().base();
m_table[fi].transparent = tr;
m_table[fi].bold = bo;
}
@@ -537,7 +537,7 @@ bool ColorSchemaList::updateAllSchemaTimes(const TQDateTime& now)
for (it=list.begin(); it!=list.end(); ++it)
{
TQString filename=*it;
- int j=filename.findRev('/');
+ int j=filename.tqfindRev('/');
if (j>-1)
filename = filename.mid(8);
@@ -615,7 +615,7 @@ bool ColorSchemaList::checkSchemas()
// now.
//
//
- TQDateTime now = TQDateTime::currentDateTime();
+ TQDateTime now = TQDateTime::tqcurrentDateTime();
r = updateAllSchemaTimes(now);
diff --git a/konsole/konsole/schema.h b/konsole/konsole/schema.h
index 904767df6..0a1fb4cc1 100644
--- a/konsole/konsole/schema.h
+++ b/konsole/konsole/schema.h
@@ -150,7 +150,7 @@ protected:
int numb() {if (!m_fileRead) rereadSchemaFile();return m_numb;};
const TQString& title() {if (!m_fileRead) rereadSchemaFile();return m_title;};
const TQString& imagePath() {if (!m_fileRead) rereadSchemaFile();return m_imagePath;};
- int alignment() {if (!m_fileRead) rereadSchemaFile();return m_alignment;};
+ int tqalignment() {if (!m_fileRead) rereadSchemaFile();return m_tqalignment;};
const ColorEntry* table() {if (!m_fileRead) rereadSchemaFile();return m_table;};
bool useTransparency() {if (!m_fileRead) rereadSchemaFile();return m_useTransparency;};
double tr_x() {if (!m_fileRead) rereadSchemaFile();return m_tr_x;};
@@ -162,7 +162,7 @@ protected:
private:
int m_numb;
int m_tr_r, m_tr_g, m_tr_b;
- int m_alignment;
+ int m_tqalignment;
TQString m_title;
TQString m_imagePath;
ColorEntry m_table[TABLE_COLORS];
@@ -170,7 +170,7 @@ protected:
bool m_fileRead:1;
double m_tr_x;
TQString fRelPath; // File name of schema file
- QDateTime *lastRead; // Time last checked for updates
+ TQDateTime *lastRead; // Time last checked for updates
static int serial; // Serial number so that every
// ColorSchema has a unique number.
};
diff --git a/konsole/konsole/session.cpp b/konsole/konsole/session.cpp
index 53990af2f..3534b88c8 100644
--- a/konsole/konsole/session.cpp
+++ b/konsole/konsole/session.cpp
@@ -133,11 +133,11 @@ void TESession::ptyError()
{
// FIXME: sh->error() is always empty
if ( sh->error().isEmpty() )
- KMessageBox::error( te->topLevelWidget(),
+ KMessageBox::error( te->tqtopLevelWidget(),
i18n("Konsole is unable to open a PTY (pseudo teletype). It is likely that this is due to an incorrect configuration of the PTY devices. Konsole needs to have read/write access to the PTY devices."),
i18n("A Fatal Error Has Occurred") );
else
- KMessageBox::error(te->topLevelWidget(), sh->error());
+ KMessageBox::error(te->tqtopLevelWidget(), sh->error());
emit done(this);
}
@@ -232,7 +232,7 @@ void TESession::setUserTitle( int what, const TQString &caption )
renameSession(caption);
if (what == 31) {
cwd=caption;
- cwd=cwd.replace( TQRegExp("^~"), TQDir::homeDirPath() );
+ cwd=cwd.tqreplace( TQRegExp("^~"), TQDir::homeDirPath() );
emit openURLRequest(cwd);
}
if (what == 32) { // change icon via \033]32;Icon\007
@@ -645,7 +645,7 @@ void TESession::startZModem(const TQString &zmodem, const TQString &dir, const T
connect( sh,TQT_SIGNAL(block_in(const char*,int)), this, TQT_SLOT(zmodemRcvBlock(const char*,int)) );
connect( sh,TQT_SIGNAL(buffer_empty()), this, TQT_SLOT(zmodemContinue()));
- zmodemProgress = new ZModemDialog(te->topLevelWidget(), false,
+ zmodemProgress = new ZModemDialog(te->tqtopLevelWidget(), false,
i18n("ZModem Progress"));
connect(zmodemProgress, TQT_SIGNAL(user1Clicked()),
@@ -676,8 +676,8 @@ void TESession::zmodemStatus(KProcess *, char *data, int len)
TQCString msg(data, len+1);
while(!msg.isEmpty())
{
- int i = msg.find('\015');
- int j = msg.find('\012');
+ int i = msg.tqfind('\015');
+ int j = msg.tqfind('\012');
TQCString txt;
if ((i != -1) && ((j == -1) || (i < j)))
{
@@ -767,7 +767,7 @@ QCStringList TESession::functionsDynamic()
void TESession::onRcvBlock( const char* buf, int len )
{
em->onRcvBlock( buf, len );
- emit receivedData( TQString::fromLatin1( buf, len ) );
+ emit receivedData( TQString::tqfromLatin1( buf, len ) );
}
void TESession::print( TQPainter &paint, bool friendly, bool exact )