summaryrefslogtreecommitdiffstats
path: root/konsole
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-21 14:19:21 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-21 14:19:21 -0600
commitb492b550f35c84160958775c14ea7037c5b12181 (patch)
tree536b2c14f3f66ed88c75941c38f6b2de56b024ed /konsole
parentf64397c82fa94371ab4a64af28c4d0029f4cd93f (diff)
downloadtdebase-b492b550f35c84160958775c14ea7037c5b12181.tar.gz
tdebase-b492b550f35c84160958775c14ea7037c5b12181.zip
Rename obsolete tq methods to standard names
Diffstat (limited to 'konsole')
-rw-r--r--konsole/konsole/TEScreen.cpp2
-rw-r--r--konsole/konsole/TEWidget.cpp24
-rw-r--r--konsole/konsole/TEmuVt102.cpp2
-rw-r--r--konsole/konsole/TEmulation.cpp10
-rw-r--r--konsole/konsole/konsole_wcwidth.cpp2
-rw-r--r--konsole/konsole/schema.cpp4
6 files changed, 22 insertions, 22 deletions
diff --git a/konsole/konsole/TEScreen.cpp b/konsole/konsole/TEScreen.cpp
index e6355a90e..2c6f9f42d 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].tqunicode();
+ image[lastPos].c = compose[0].unicode();
}
// Region commands -------------------------------------------------------------
diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp
index 73aa29fee..f8bef39bd 100644
--- a/konsole/konsole/TEWidget.cpp
+++ b/konsole/konsole/TEWidget.cpp
@@ -193,10 +193,10 @@ 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 tqunicode characters.
+ come in here as proper unicode characters.
We treat non-iso10646 fonts as VT100 extended and do the requiered mapping
- from tqunicode to 0x00..0x1f. The remaining translation is then left to the
+ from unicode to 0x00..0x1f. The remaining translation is then left to the
QCodec.
*/
@@ -215,7 +215,7 @@ unsigned short vt100_graphics[32] =
/*
static TQChar vt100extended(TQChar c)
{
- switch (c.tqunicode())
+ switch (c.unicode())
{
case 0x25c6 : return 1;
case 0x2592 : return 2;
@@ -391,7 +391,7 @@ TEWidget::TEWidget(TQWidget *parent, const char *name)
// konsole in opaque mode.
bY = bX = 1;
- cb = TQApplication::tqclipboard();
+ cb = TQApplication::clipboard();
TQObject::connect( (TQObject*)cb, TQT_SIGNAL(selectionChanged()),
this, TQT_SLOT(onClearSelection()) );
@@ -441,7 +441,7 @@ TEWidget::~TEWidget()
/* ------------------------------------------------------------------------- */
/**
- A table for emulating the simple (single width) tqunicode drawing chars.
+ A table for emulating the simple (single width) unicode 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.
@@ -578,7 +578,7 @@ void TEWidget::drawTextFixed(TQPainter &paint, int x, int y,
}
//Check for line-drawing char
- if (isLineChar(drawstr[0].tqunicode()))
+ if (isLineChar(drawstr[0].unicode()))
{
uchar code = drawstr[0].cell();
if (LineChars[code])
@@ -1803,8 +1803,8 @@ void TEWidget::emitText(TQString text)
void TEWidget::emitSelection(bool useXselection,bool appendReturn)
// Paste Clipboard by simulating keypress events
{
- TQApplication::tqclipboard()->setSelectionMode( useXselection );
- TQString text = TQApplication::tqclipboard()->text();
+ TQApplication::clipboard()->setSelectionMode( useXselection );
+ TQString text = TQApplication::clipboard()->text();
if(appendReturn)
text.append("\r");
if ( ! text.isEmpty() )
@@ -1814,13 +1814,13 @@ void TEWidget::emitSelection(bool useXselection,bool appendReturn)
emit keyPressedSignal(&e); // expose as a big fat keypress event
emit clearSelectionSignal();
}
- TQApplication::tqclipboard()->setSelectionMode( false );
+ TQApplication::clipboard()->setSelectionMode( false );
}
void TEWidget::setSelection(const TQString& t)
{
// Disconnect signal while WE set the clipboard
- TQClipboard *cb = TQApplication::tqclipboard();
+ TQClipboard *cb = TQApplication::clipboard();
TQObject::disconnect( cb, TQT_SIGNAL(selectionChanged()),
this, TQT_SLOT(onClearSelection()) );
@@ -2104,7 +2104,7 @@ void TEWidget::clearImage()
void TEWidget::calcGeometry()
{
- scrollbar->resize(TQApplication::tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent),
+ scrollbar->resize(TQApplication::style().pixelMetric(TQStyle::PM_ScrollBarExtent),
contentsRect().height());
switch(scrollLoc)
{
@@ -2268,7 +2268,7 @@ void TEWidget::dropEvent(TQDropEvent* event)
void TEWidget::doDrag()
{
dragInfo.state = diDragging;
- dragInfo.dragObject = new TQTextDrag(TQApplication::tqclipboard()->text(TQClipboard::Selection), this);
+ dragInfo.dragObject = new TQTextDrag(TQApplication::clipboard()->text(TQClipboard::Selection), this);
dragInfo.dragObject->dragCopy();
// Don't delete the TQTextDrag object. Qt will delete it when it's done with it.
}
diff --git a/konsole/konsole/TEmuVt102.cpp b/konsole/konsole/TEmuVt102.cpp
index f704297cf..e8ee73b64 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 tqunicode character
+// process an incoming unicode character
void TEmuVt102::onRcvChar(int cc)
{ int i;
diff --git a/konsole/konsole/TEmulation.cpp b/konsole/konsole/TEmulation.cpp
index 7b7e1c5f4..939139d03 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 tqunicode input to terminal
+// process application unicode input to terminal
// this is a trivial scanner
{
c &= 0xff;
@@ -284,7 +284,7 @@ void TEmulation::onKeyPress( TQKeyEvent* ev )
scr->setHistCursor(scr->getHistLines());
if (!ev->text().isEmpty())
{ // A block of text
- // Note that the text is proper tqunicode.
+ // Note that the text is proper unicode.
// We should do a conversion here, but since this
// routine will never be used, we simply emit plain ascii.
emit sndBlock(TQString(ev->text()).ascii(),ev->text().length());
@@ -299,7 +299,7 @@ void TEmulation::onKeyPress( TQKeyEvent* ev )
// Unblocking, Byte to Unicode translation --------------------------------- --
/*
- We are doing code conversion from locale to tqunicode first.
+ We are doing code conversion from locale to unicode 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].tqunicode());
+ onRcvChar(r[j].unicode());
}
i = l;
}
@@ -392,7 +392,7 @@ void TEmulation::clearSelection() {
void TEmulation::copySelection() {
if (!connected) return;
TQString t = scr->getSelText(true);
- TQApplication::tqclipboard()->setText(t);
+ TQApplication::clipboard()->setText(t);
}
TQString TEmulation::getSelection() {
diff --git a/konsole/konsole/konsole_wcwidth.cpp b/konsole/konsole/konsole_wcwidth.cpp
index 63abe8dd1..098cd16d4 100644
--- a/konsole/konsole/konsole_wcwidth.cpp
+++ b/konsole/konsole/konsole_wcwidth.cpp
@@ -214,7 +214,7 @@ int string_width( const TQString &txt )
int w = 0;
for ( uint i = 1; i < txt.length(); ++i ) {
- w += konsole_wcwidth(txt[i].tqunicode());
+ w += konsole_wcwidth(txt[i].unicode());
}
return w;
}
diff --git a/konsole/konsole/schema.cpp b/konsole/konsole/schema.cpp
index eaf2ea7a8..8d85329eb 100644
--- a/konsole/konsole/schema.cpp
+++ b/konsole/konsole/schema.cpp
@@ -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->tqpalette().active().text();
+ m_table[fi].color = kapp->palette().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->tqpalette().active().base();
+ m_table[fi].color = kapp->palette().active().base();
m_table[fi].transparent = tr;
m_table[fi].bold = bo;
}