Browse Source

Rename obsolete tq methods to standard names

tags/r14.0.0
Timothy Pearson 8 years ago
parent
commit
1180237ab3
100 changed files with 391 additions and 391 deletions
  1. +1
    -1
      KDE2PORTING.html
  2. +1
    -1
      dcop/client/dcop.cpp
  3. +1
    -1
      dcop/client/dcopfind.cpp
  4. +3
    -3
      kate/part/kateautoindent.cpp
  5. +8
    -8
      kate/part/katebuffer.cpp
  6. +1
    -1
      kate/part/katecmds.cpp
  7. +1
    -1
      kate/part/katecmds.h
  8. +4
    -4
      kate/part/katedocument.cpp
  9. +3
    -3
      kate/part/katehighlight.cpp
  10. +1
    -1
      kate/part/katejscript.cpp
  11. +7
    -7
      kate/part/katerenderer.cpp
  12. +22
    -22
      kate/part/katetextline.cpp
  13. +3
    -3
      kate/part/katetextline.h
  14. +2
    -2
      kate/part/kateview.cpp
  15. +2
    -2
      kate/part/kateviewhelpers.cpp
  16. +12
    -12
      kate/part/kateviewinternal.cpp
  17. +4
    -4
      kate/part/test_regression.cpp
  18. +5
    -5
      kdoctools/kio_help.cpp
  19. +1
    -1
      kdoctools/kio_help.h
  20. +1
    -1
      kdoctools/xslt.cpp
  21. +1
    -1
      khtml/DESIGN.html
  22. +1
    -1
      khtml/css/css_renderstyledeclarationimpl.cpp
  23. +1
    -1
      khtml/css/csshelper.cpp
  24. +4
    -4
      khtml/css/cssparser.cpp
  25. +2
    -2
      khtml/css/cssproperties.c
  26. +13
    -13
      khtml/css/cssstyleselector.cpp
  27. +6
    -6
      khtml/css/html4.css
  28. +3
    -3
      khtml/dom/css_extensions.cpp
  29. +3
    -3
      khtml/dom/css_extensions.h
  30. +9
    -9
      khtml/dom/dom_string.cpp
  31. +1
    -1
      khtml/dom/dom_string.h
  32. +2
    -2
      khtml/ecma/kjs_binding.cpp
  33. +10
    -10
      khtml/ecma/kjs_debugwin.cpp
  34. +1
    -1
      khtml/ecma/kjs_navigator.cpp
  35. +1
    -1
      khtml/ecma/kjs_window.cpp
  36. +1
    -1
      khtml/html/html_documentimpl.cpp
  37. +5
    -5
      khtml/html/html_elementimpl.cpp
  38. +2
    -2
      khtml/html/html_formimpl.cpp
  39. +2
    -2
      khtml/html/html_imageimpl.cpp
  40. +13
    -13
      khtml/html/htmltokenizer.cpp
  41. +2
    -2
      khtml/html/htmltokenizer.h
  42. +5
    -5
      khtml/khtml_caret.cpp
  43. +2
    -2
      khtml/khtml_caret_p.h
  44. +13
    -13
      khtml/khtml_ext.cpp
  45. +6
    -6
      khtml/khtml_part.cpp
  46. +5
    -5
      khtml/khtmlview.cpp
  47. +3
    -3
      khtml/misc/stringit.h
  48. +12
    -12
      khtml/rendering/bidi.cpp
  49. +4
    -4
      khtml/rendering/break_lines.h
  50. +1
    -1
      khtml/rendering/font.cpp
  51. +1
    -1
      khtml/rendering/render_block.cpp
  52. +1
    -1
      khtml/rendering/render_box.cpp
  53. +1
    -1
      khtml/rendering/render_canvas.cpp
  54. +9
    -9
      khtml/rendering/render_form.cpp
  55. +1
    -1
      khtml/rendering/render_generated.cpp
  56. +1
    -1
      khtml/rendering/render_image.cpp
  57. +3
    -3
      khtml/rendering/render_layer.cpp
  58. +1
    -1
      khtml/rendering/render_style.cpp
  59. +4
    -4
      khtml/rendering/render_style.h
  60. +3
    -3
      khtml/rendering/render_text.cpp
  61. +1
    -1
      khtml/rendering/render_text.h
  62. +4
    -4
      khtml/test_regression.cpp
  63. +11
    -11
      khtml/xml/dom2_eventsimpl.cpp
  64. +1
    -1
      khtml/xml/dom_docimpl.cpp
  65. +1
    -1
      khtml/xml/dom_docimpl.h
  66. +1
    -1
      khtml/xml/dom_elementimpl.cpp
  67. +1
    -1
      khtml/xml/dom_nodeimpl.cpp
  68. +6
    -6
      khtml/xml/dom_stringimpl.cpp
  69. +1
    -1
      khtml/xml/dom_stringimpl.h
  70. +7
    -7
      khtml/xml/xml_tokenizer.cpp
  71. +1
    -1
      khtml/xml/xml_tokenizer.h
  72. +2
    -2
      kio/bookmarks/kbookmarkmenu.cc
  73. +3
    -3
      kio/kfile/kicondialog.cpp
  74. +2
    -2
      kio/kfile/kopenwith.cpp
  75. +15
    -15
      kio/kfile/kpropertiesdialog.cpp
  76. +1
    -1
      kio/kio/dataprotocol.cpp
  77. +2
    -2
      kio/kio/krun.cpp
  78. +7
    -7
      kio/kio/paste.cpp
  79. +1
    -1
      kio/kio/pastedialog.cpp
  80. +17
    -17
      kio/misc/kntlm/kntlm.cpp
  81. +2
    -2
      kio/misc/kntlm/kntlm.h
  82. +1
    -1
      kio/misc/kpac/script.cpp
  83. +1
    -1
      kjs/lexer.cpp
  84. +1
    -1
      kjs/lexer.h
  85. +5
    -5
      kjs/regexp.cpp
  86. +1
    -1
      kjs/regexp_object.cpp
  87. +3
    -3
      kjs/ustring.cpp
  88. +3
    -3
      kjs/ustring.h
  89. +12
    -12
      kmdi/kmdichildfrm.cpp
  90. +2
    -2
      kmdi/kmditaskbar.cpp
  91. +1
    -1
      kparts/browserextension.cpp
  92. +4
    -4
      kresources/configpage.cpp
  93. +5
    -5
      krsync/rsyncconfigdialog.cpp
  94. +1
    -1
      kspell2/plugins/ispell/ispell_checker.h
  95. +1
    -1
      kspell2/plugins/ispell/makedent.cpp
  96. +3
    -3
      kstyles/asteroid/asteroid.cpp
  97. +2
    -2
      kstyles/highcolor/highcolor.cpp
  98. +5
    -5
      kstyles/keramik/keramik.cpp
  99. +8
    -8
      kstyles/kthemestyle/kthemebase.cpp
  100. +3
    -3
      kstyles/kthemestyle/kthemestyle.cpp

+ 1
- 1
KDE2PORTING.html View File

@@ -189,7 +189,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
to klocale-&gt;translate with i18n.<P>

The return value of i18n is also no longer a const char*,
but a tqunicode TQString.<P>
but a unicode TQString.<P>

<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>



+ 1
- 1
dcop/client/dcop.cpp View File

@@ -158,7 +158,7 @@ void queryFunctions( const char* app, const char* obj )

int callFunction( const char* app, const char* obj, const char* func, const QCStringList args )
{
TQString f = func; // Qt is better with tqunicode strings, so use one.
TQString f = func; // Qt is better with unicode strings, so use one.
int left = f.find( '(' );
int right = f.find( ')' );



+ 1
- 1
dcop/client/dcopfind.cpp View File

@@ -40,7 +40,7 @@ static bool bLaunchApp = 0;

bool findObject( const char* app, const char* obj, const char* func, QCStringList args )
{
TQString f = func; // Qt is better with tqunicode strings, so use one.
TQString f = func; // Qt is better with unicode strings, so use one.
int left = f.find( '(' );
int right = f.find( ')' );



+ 3
- 3
kate/part/kateautoindent.cpp View File

@@ -1411,7 +1411,7 @@ void KateXmlIndent::getLineInfo (uint line, uint &prevIndent, int &numTags,
uint pos, len = text.length();
bool seenOpen = false;
for(pos = 0; pos < len; ++pos) {
int ch = text.at(pos).tqunicode();
int ch = text.at(pos).unicode();
switch(ch) {
case '<':
seenOpen = true;
@@ -1467,11 +1467,11 @@ void KateXmlIndent::getLineInfo (uint line, uint &prevIndent, int &numTags,
if(unclosedTag) {
// find the start of the next attribute, so we can align with it
do {
lastCh = text.at(++attrCol).tqunicode();
lastCh = text.at(++attrCol).unicode();
}while(lastCh && lastCh != ' ' && lastCh != '\t');

while(lastCh == ' ' || lastCh == '\t') {
lastCh = text.at(++attrCol).tqunicode();
lastCh = text.at(++attrCol).unicode();
}

attrCol = prevLine->cursorX(attrCol, tabWidth);


+ 8
- 8
kate/part/katebuffer.cpp View File

@@ -172,10 +172,10 @@ class KateFileLoader
// should spaces be ignored at end of line?
inline bool removeTrailingSpaces () const { return m_removeTrailingSpaces; }

// internal tqunicode data array
inline const TQChar *tqunicode () const { return m_text.tqunicode(); }
// internal unicode data array
inline const TQChar *unicode () const { return m_text.unicode(); }

// read a line, return length + offset in tqunicode data
// read a line, return length + offset in unicode data
void readLine (uint &offset, uint &length)
{
length = 0;
@@ -543,7 +543,7 @@ bool KateBuffer::canEncode ()

kdDebug(13020) << "ENC NAME: " << codec->name() << endl;

// hardcode some tqunicode encodings which can encode all chars
// hardcode some unicode encodings which can encode all chars
if ((TQString(codec->name()) == "UTF-8") || (TQString(codec->name()) == "ISO-10646-UCS-2"))
return true;

@@ -1353,14 +1353,14 @@ void KateBufBlock::fillBlock (KateFileLoader *stream)
{
uint offset = 0, length = 0;
stream->readLine(offset, length);
const TQChar *tqunicodeData = stream->tqunicode () + offset;
const TQChar *unicodeData = stream->unicode () + offset;

// strip spaces at end of line
if ( stream->removeTrailingSpaces() )
{
while (length > 0)
{
if (tqunicodeData[length-1].isSpace())
if (unicodeData[length-1].isSpace())
--length;
else
break;
@@ -1391,13 +1391,13 @@ void KateBufBlock::fillBlock (KateFileLoader *stream)
memcpy(buf+pos, (char *) &length, sizeof(uint));
pos += sizeof(uint);

memcpy(buf+pos, (char *) tqunicodeData, sizeof(TQChar)*length);
memcpy(buf+pos, (char *) unicodeData, sizeof(TQChar)*length);
pos += sizeof(TQChar)*length;
}
else
{
KateTextLine::Ptr textLine = new KateTextLine ();
textLine->insertText (0, length, tqunicodeData);
textLine->insertText (0, length, unicodeData);
m_stringList.push_back (textLine);
}



+ 1
- 1
kate/part/katecmds.cpp View File

@@ -578,7 +578,7 @@ bool KateCommands::Character::exec (Kate::View *view, const TQString &_cmd, TQSt
view->insertText(TQString(buf));
}
else
{ // do the tqunicode thing
{ // do the unicode thing
TQChar c(number);
view->insertText(TQString(&c, 1));
}


+ 1
- 1
kate/part/katecmds.h View File

@@ -119,7 +119,7 @@ class SedReplace : public Kate::Command
};

/**
* insert a tqunicode or ascii character
* insert a unicode or ascii character
* base 9+1: 1234
* hex: 0x1234 or x1234
* octal: 01231


+ 4
- 4
kate/part/katedocument.cpp View File

@@ -1187,7 +1187,7 @@ bool KateDocument::editInsertText ( uint line, uint col, const TQString &str )

editAddUndo (KateUndoGroup::editInsertText, line, col, s.length(), s);

l->insertText (col, s.length(), s.tqunicode());
l->insertText (col, s.length(), s.unicode());
// removeTrailingSpace(line); // ### nessecary?

m_buffer->changeLine(line);
@@ -1410,7 +1410,7 @@ bool KateDocument::editInsertLine ( uint line, const TQString &s )
removeTrailingSpace( line ); // old line

KateTextLine::Ptr tl = new KateTextLine();
tl->insertText (0, s.length(), s.tqunicode(), 0);
tl->insertText (0, s.length(), s.unicode(), 0);
m_buffer->insertLine(line, tl);
m_buffer->changeLine(line);

@@ -2589,7 +2589,7 @@ bool KateDocument::saveFile()
//
if (!m_buffer->canEncode ()
&& (KMessageBox::warningContinueCancel(0,
i18n("The selected encoding cannot encode every tqunicode character in this document. Do you really want to save it? There could be some data lost."),i18n("Possible Data Loss"),i18n("Save Nevertheless")) != KMessageBox::Continue))
i18n("The selected encoding cannot encode every unicode character in this document. Do you really want to save it? There could be some data lost."),i18n("Possible Data Loss"),i18n("Save Nevertheless")) != KMessageBox::Continue))
{
return false;
}
@@ -3227,7 +3227,7 @@ void KateDocument::del( KateView *view, const KateTextCursor& c )

void KateDocument::paste ( KateView* view )
{
TQString s = TQApplication::tqclipboard()->text();
TQString s = TQApplication::clipboard()->text();

if (s.isEmpty())
return;


+ 3
- 3
kate/part/katehighlight.cpp View File

@@ -65,10 +65,10 @@ static const int KATE_DYNAMIC_CONTEXTS_RESET_DELAY = 30 * 1000;

inline bool kateInsideString (const TQString &str, TQChar ch)
{
const TQChar *tqunicode = str.tqunicode();
const TQChar *unicode = str.unicode();
const uint len = str.length();
for (uint i=0; i < len; i++)
if (tqunicode[i] == ch)
if (unicode[i] == ch)
return true;

return false;
@@ -661,7 +661,7 @@ int KateHlKeyword::checkHgl(const TQString& text, int offset, int len)

if (wordLen < minLen) return 0;

if ( dict[wordLen] && dict[wordLen]->find(TQConstString(text.tqunicode() + offset, wordLen).string()) )
if ( dict[wordLen] && dict[wordLen]->find(TQConstString(text.unicode() + offset, wordLen).string()) )
return offset2;

return 0;


+ 1
- 1
kate/part/katejscript.cpp View File

@@ -62,7 +62,7 @@ UString::UString(const TQString &d)
{
unsigned int len = d.length();
UChar *dat = new UChar[len];
memcpy(dat, d.tqunicode(), len * sizeof(UChar));
memcpy(dat, d.unicode(), len * sizeof(UChar));
rep = UString::Rep::create(dat, len);
}



+ 7
- 7
kate/part/katerenderer.cpp View File

@@ -745,7 +745,7 @@ uint KateRenderer::textWidth(const KateTextLine::Ptr &textLine, int cursorCol)

KateFontStruct *fs = config()->fontStruct();

const TQChar *tqunicode = textLine->text();
const TQChar *unicode = textLine->text();
const TQString &textString = textLine->string();

int x = 0;
@@ -763,7 +763,7 @@ uint KateRenderer::textWidth(const KateTextLine::Ptr &textLine, int cursorCol)

x += width;

if (z < len && tqunicode[z] == TQChar('\t'))
if (z < len && unicode[z] == TQChar('\t'))
x -= x % width;
}

@@ -787,7 +787,7 @@ uint KateRenderer::textWidth(const KateTextLine::Ptr &textLine, uint startcol, u
*needWrap = false;

const uint len = textLine->length();
const TQChar *tqunicode = textLine->text();
const TQChar *unicode = textLine->text();
const TQString &textString = textLine->string();

uint z = startcol;
@@ -800,10 +800,10 @@ uint KateRenderer::textWidth(const KateTextLine::Ptr &textLine, uint startcol, u

// How should tabs be treated when they word-wrap on a print-out?
// if startcol != 0, this messes up (then again, word wrapping messes up anyway)
if (tqunicode[z] == TQChar('\t'))
if (unicode[z] == TQChar('\t'))
x -= x % width;

if (tqunicode[z].isSpace())
if (unicode[z].isSpace())
{
lastWhiteSpace = z+1;
lastWhiteSpaceX = x;
@@ -887,7 +887,7 @@ uint KateRenderer::textWidth( KateTextCursor &cursor, int xPos, uint startCol)
if (!textLine) return 0;

const uint len = textLine->length();
const TQChar *tqunicode = textLine->text();
const TQChar *unicode = textLine->text();
const TQString &textString = textLine->string();

x = oldX = 0;
@@ -906,7 +906,7 @@ uint KateRenderer::textWidth( KateTextCursor &cursor, int xPos, uint startCol)

x += width;

if (z < len && tqunicode[z] == TQChar('\t'))
if (z < len && unicode[z] == TQChar('\t'))
x -= x % width;

z++;


+ 22
- 22
kate/part/katetextline.cpp View File

@@ -110,11 +110,11 @@ void KateTextLine::truncate(uint newLen)
int KateTextLine::nextNonSpaceChar(uint pos) const
{
const uint len = m_text.length();
const TQChar *tqunicode = m_text.tqunicode();
const TQChar *unicode = m_text.unicode();

for(uint i = pos; i < len; i++)
{
if(!tqunicode[i].isSpace())
if(!unicode[i].isSpace())
return i;
}

@@ -128,11 +128,11 @@ int KateTextLine::previousNonSpaceChar(uint pos) const
if (pos >= (uint)len)
pos = len - 1;

const TQChar *tqunicode = m_text.tqunicode();
const TQChar *unicode = m_text.unicode();

for(int i = pos; i >= 0; i--)
{
if(!tqunicode[i].isSpace())
if(!unicode[i].isSpace())
return i;
}

@@ -152,20 +152,20 @@ int KateTextLine::lastChar() const
const TQChar *KateTextLine::firstNonSpace() const
{
int first = firstChar();
return (first > -1) ? ((TQChar*)m_text.tqunicode())+first : m_text.tqunicode();
return (first > -1) ? ((TQChar*)m_text.unicode())+first : m_text.unicode();
}

uint KateTextLine::indentDepth (uint tabwidth) const
{
uint d = 0;
const uint len = m_text.length();
const TQChar *tqunicode = m_text.tqunicode();
const TQChar *unicode = m_text.unicode();

for(uint i = 0; i < len; i++)
{
if(tqunicode[i].isSpace())
if(unicode[i].isSpace())
{
if (tqunicode[i] == TQChar('\t'))
if (unicode[i] == TQChar('\t'))
d += tabwidth - (d % tabwidth);
else
d++;
@@ -189,11 +189,11 @@ bool KateTextLine::stringAtPos(uint pos, const TQString& match) const
// overflow again which (pos+matchlen > len) does not catch; see bugs #129263 and #129580
Q_ASSERT(pos < len);

const TQChar *tqunicode = m_text.tqunicode();
const TQChar *matchUnicode = match.tqunicode();
const TQChar *unicode = m_text.unicode();
const TQChar *matchUnicode = match.unicode();

for (uint i=0; i < matchlen; i++)
if (tqunicode[i+pos] != matchUnicode[i])
if (unicode[i+pos] != matchUnicode[i])
return false;

return true;
@@ -206,11 +206,11 @@ bool KateTextLine::startingWith(const TQString& match) const
if (matchlen > m_text.length())
return false;

const TQChar *tqunicode = m_text.tqunicode();
const TQChar *matchUnicode = match.tqunicode();
const TQChar *unicode = m_text.unicode();
const TQChar *matchUnicode = match.unicode();

for (uint i=0; i < matchlen; i++)
if (tqunicode[i] != matchUnicode[i])
if (unicode[i] != matchUnicode[i])
return false;

return true;
@@ -223,12 +223,12 @@ bool KateTextLine::endingWith(const TQString& match) const
if (matchlen > m_text.length())
return false;

const TQChar *tqunicode = m_text.tqunicode();
const TQChar *matchUnicode = match.tqunicode();
const TQChar *unicode = m_text.unicode();
const TQChar *matchUnicode = match.unicode();

uint start = m_text.length() - matchlen;
for (uint i=0; i < matchlen; i++)
if (tqunicode[start+i] != matchUnicode[i])
if (unicode[start+i] != matchUnicode[i])
return false;

return true;
@@ -239,11 +239,11 @@ int KateTextLine::cursorX(uint pos, uint tabChars) const
uint x = 0;

const uint n = kMin (pos, (uint)m_text.length());
const TQChar *tqunicode = m_text.tqunicode();
const TQChar *unicode = m_text.unicode();

for ( uint z = 0; z < n; z++)
{
if (tqunicode[z] == TQChar('\t'))
if (unicode[z] == TQChar('\t'))
x += tabChars - (x % tabChars);
else
x++;
@@ -257,11 +257,11 @@ uint KateTextLine::lengthWithTabs (uint tabChars) const
{
uint x = 0;
const uint len = m_text.length();
const TQChar *tqunicode = m_text.tqunicode();
const TQChar *unicode = m_text.unicode();

for ( uint z = 0; z < len; z++)
{
if (tqunicode[z] == TQChar('\t'))
if (unicode[z] == TQChar('\t'))
x += tabChars - (x % tabChars);
else
x++;
@@ -346,7 +346,7 @@ char *KateTextLine::dump (char *buf, bool withHighlighting) const
memcpy(buf, &l, sizeof(uint));
buf += sizeof(uint);

memcpy(buf, (char *) m_text.tqunicode(), sizeof(TQChar)*l);
memcpy(buf, (char *) m_text.unicode(), sizeof(TQChar)*l);
buf += sizeof(TQChar) * l;

if (!withHighlighting)


+ 3
- 3
kate/part/katetextline.h View File

@@ -145,10 +145,10 @@ class KateTextLine : public KShared
inline TQChar getChar (uint pos) const { return m_text[pos]; }

/**
* Gets the text as a tqunicode representation
* Gets the text as a unicode representation
* @return text of this line as TQChar array
*/
inline const TQChar *text() const { return m_text.tqunicode(); }
inline const TQChar *text() const { return m_text.unicode(); }

/**
* Highlighting array
@@ -419,7 +419,7 @@ class KateTextLine : public KShared
*/
private:
/**
* text of line as tqunicode
* text of line as unicode
*/
TQString m_text;



+ 2
- 2
kate/part/kateview.cpp View File

@@ -1613,7 +1613,7 @@ void KateView::copy() const
if (!hasSelection())
return;

TQApplication::tqclipboard()->setText(selection ());
TQApplication::clipboard()->setText(selection ());
}

void KateView::copyHTML()
@@ -1629,7 +1629,7 @@ void KateView::copyHTML()
drag->addDragObject( htmltextdrag);
drag->addDragObject( new TQTextDrag( selection()));

TQApplication::tqclipboard()->setData(drag);
TQApplication::clipboard()->setData(drag);
}

TQString KateView::selectionAsHtml()


+ 2
- 2
kate/part/kateviewhelpers.cpp View File

@@ -795,10 +795,10 @@ int KateIconBorder::lineNumberWidth() const
int width = m_lineNumbersOn ? ((int)log10((double)(m_view->doc()->numLines())) + 1) * m_maxCharWidth + 4 : 0;

if (m_view->dynWordWrap() && m_dynWrapIndicatorsOn) {
width = kMax(tqstyle().scrollBarExtent().width() + 4, width);
width = kMax(style().scrollBarExtent().width() + 4, width);

if (m_cachedLNWidth != width || m_oldBackgroundColor != m_view->renderer()->config()->iconBarColor()) {
int w = tqstyle().scrollBarExtent().width();
int w = style().scrollBarExtent().width();
int h = m_view->renderer()->config()->fontMetrics()->height();

TQSize newSize(w, h);


+ 12
- 12
kate/part/kateviewinternal.cpp View File

@@ -106,7 +106,7 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc)

// bottom corner box
m_dummy = new TQWidget(m_view);
m_dummy->setFixedHeight(tqstyle().scrollBarExtent().width());
m_dummy->setFixedHeight(style().scrollBarExtent().width());

if (m_view->dynWordWrap())
m_dummy->hide();
@@ -425,7 +425,7 @@ void KateViewInternal::scrollPos(KateTextCursor& c, bool force, bool calledExter
updateView(false, viewLinesScrolled);

int scrollHeight = -(viewLinesScrolled * (int)m_view->renderer()->fontHeight());
int scrollbarWidth = tqstyle().scrollBarExtent().width();
int scrollbarWidth = style().scrollBarExtent().width();

//
// updates are for working around the scrollbar leaving blocks in the view
@@ -2649,9 +2649,9 @@ void KateViewInternal::keyReleaseEvent( TQKeyEvent* e )

if (m_selChangedByUser)
{
TQApplication::tqclipboard()->setSelectionMode( true );
TQApplication::clipboard()->setSelectionMode( true );
m_view->copy();
TQApplication::tqclipboard()->setSelectionMode( false );
TQApplication::clipboard()->setSelectionMode( false );

m_selChangedByUser = false;
}
@@ -2711,9 +2711,9 @@ void KateViewInternal::mousePressEvent( TQMouseEvent* e )
m_view->selectLine( cursor );
}

TQApplication::tqclipboard()->setSelectionMode( true );
TQApplication::clipboard()->setSelectionMode( true );
m_view->copy();
TQApplication::tqclipboard()->setSelectionMode( false );
TQApplication::clipboard()->setSelectionMode( false );

// Keep the line at the select anchor selected during further
// mouse selection
@@ -2889,9 +2889,9 @@ void KateViewInternal::mouseDoubleClickEvent(TQMouseEvent *e)
// Move cursor to end (or beginning) of selected word
if (m_view->hasSelection())
{
TQApplication::tqclipboard()->setSelectionMode( true );
TQApplication::clipboard()->setSelectionMode( true );
m_view->copy();
TQApplication::tqclipboard()->setSelectionMode( false );
TQApplication::clipboard()->setSelectionMode( false );

// Shift+DC before the "cached" word should move the cursor to the
// beginning of the selection, not the end
@@ -2933,9 +2933,9 @@ void KateViewInternal::mouseReleaseEvent( TQMouseEvent* e )

if (m_selChangedByUser)
{
TQApplication::tqclipboard()->setSelectionMode( true );
TQApplication::clipboard()->setSelectionMode( true );
m_view->copy();
TQApplication::tqclipboard()->setSelectionMode( false );
TQApplication::clipboard()->setSelectionMode( false );
// Set cursor to edge of selection... which edge depends on what
// "direction" the selection was made in
if ( m_view->selectStart < selectAnchor )
@@ -2961,9 +2961,9 @@ void KateViewInternal::mouseReleaseEvent( TQMouseEvent* e )

if( m_doc->isReadWrite() )
{
TQApplication::tqclipboard()->setSelectionMode( true );
TQApplication::clipboard()->setSelectionMode( true );
m_view->paste ();
TQApplication::tqclipboard()->setSelectionMode( false );
TQApplication::clipboard()->setSelectionMode( false );
}

e->accept ();


+ 4
- 4
kate/part/test_regression.cpp View File

@@ -871,8 +871,8 @@ static TQString makeRelativePath(const TQString &base, const TQString &path)
pos++;
int newpos = absBase.find('/', pos);
if (newpos == -1) newpos = absBase.length();
TQConstString cmpPathComp(absPath.tqunicode() + pos, newpos - pos);
TQConstString cmpBaseComp(absBase.tqunicode() + pos, newpos - pos);
TQConstString cmpPathComp(absPath.unicode() + pos, newpos - pos);
TQConstString cmpBaseComp(absBase.unicode() + pos, newpos - pos);
// kdDebug() << "cmpPathComp: \"" << cmpPathComp.string() << "\"" << endl;
// kdDebug() << "cmpBaseComp: \"" << cmpBaseComp.string() << "\"" << endl;
// kdDebug() << "pos: " << pos << " newpos: " << newpos << endl;
@@ -886,8 +886,8 @@ static TQString makeRelativePath(const TQString &base, const TQString &path)

TQString rel;
{
TQConstString relBase(absBase.tqunicode() + basepos, absBase.length() - basepos);
TQConstString relPath(absPath.tqunicode() + pathpos, absPath.length() - pathpos);
TQConstString relBase(absBase.unicode() + basepos, absBase.length() - basepos);
TQConstString relPath(absPath.unicode() + pathpos, absPath.length() - pathpos);
// generate as many .. as there are path elements in relBase
if (relBase.string().length() > 0) {
for (int i = relBase.string().contains('/'); i > 0; --i)


+ 5
- 5
kdoctools/kio_help.cpp View File

@@ -112,7 +112,7 @@ TQString HelpProtocol::lookupFile(const TQString &fname,
}
else
{
tqunicodeError( i18n("There is no documentation available for %1." ).arg(path) );
unicodeError( i18n("There is no documentation available for %1." ).arg(path) );
finished();
return TQString::null;
}
@@ -123,7 +123,7 @@ TQString HelpProtocol::lookupFile(const TQString &fname,
}


void HelpProtocol::tqunicodeError( const TQString &t )
void HelpProtocol::unicodeError( const TQString &t )
{
data(fromUnicode( TQString(
"<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=%1\"></head>\n"
@@ -215,7 +215,7 @@ void HelpProtocol::get( const KURL& url )
kdDebug( 7119 ) << "parsed " << mParsed.length() << endl;

if (mParsed.isEmpty()) {
tqunicodeError( i18n( "The requested help file could not be parsed:<br>%1" ).arg( file ) );
unicodeError( i18n( "The requested help file could not be parsed:<br>%1" ).arg( file ) );
} else {
int pos1 = mParsed.find( "charset=" );
if ( pos1 > 0 ) {
@@ -248,7 +248,7 @@ void HelpProtocol::get( const KURL& url )
kdDebug( 7119 ) << "parsed " << mParsed.length() << endl;

if (mParsed.isEmpty()) {
tqunicodeError( i18n( "The requested help file could not be parsed:<br>%1" ).arg( file ) );
unicodeError( i18n( "The requested help file could not be parsed:<br>%1" ).arg( file ) );
} else {
TQString query = url.query(), anchor;

@@ -316,7 +316,7 @@ void HelpProtocol::emitFile( const KURL& url )
return;
}

tqunicodeError( i18n("Could not find filename %1 in %2.").arg(filename).arg( url.url() ) );
unicodeError( i18n("Could not find filename %1 in %2.").arg(filename).arg( url.url() ) );
return;
}



+ 1
- 1
kdoctools/kio_help.h View File

@@ -37,7 +37,7 @@ private:
TQString lookupFile(const TQString &fname, const TQString &query,
bool &redirect);

void tqunicodeError( const TQString &t );
void unicodeError( const TQString &t );

TQString mParsed;
bool mGhelp;


+ 1
- 1
kdoctools/xslt.cpp View File

@@ -336,7 +336,7 @@ TQCString fromUnicode( const TQString &data )
buffer_len += test.length();
} else {
TQString res;
res.sprintf( "&#%d;", TQChar(part.at( i )).tqunicode() );
res.sprintf( "&#%d;", TQChar(part.at( i )).unicode() );
test = locale->fromUnicode( res );
if (buffer_len + test.length() + 1 > sizeof(buffer))
break;


+ 1
- 1
khtml/DESIGN.html View File

@@ -291,7 +291,7 @@ that defines the DTD to use for HTML (used mainly in the parser).
<dd>Java related stuff.
<dt><a href="misc/">misc:</a>
<dd>Some misc stuff needed in khtml. Contains the image loader, some misc definitions and the
decoder class that converts the incoming stream to tqunicode.
decoder class that converts the incoming stream to unicode.
<dt><a href="rendering">rendering:</a>
<dd>Everything thats related to bringing a DOM tree with CSS declarations to the screen. Contains
the definition of the objects used in the rendering tree, the layouting code, and the RenderStyle objects.


+ 1
- 1
khtml/css/css_renderstyledeclarationimpl.cpp View File

@@ -930,7 +930,7 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
case CSS_PROP_TOP:
return getPositionOffsetValue(renderer, CSS_PROP_TOP);
case CSS_PROP_UNICODE_BIDI:
switch (style->tqunicodeBidi()) {
switch (style->unicodeBidi()) {
case UBNormal:
return new CSSPrimitiveValueImpl(CSS_VAL_NORMAL);
case Embed:


+ 1
- 1
khtml/css/csshelper.cpp View File

@@ -78,7 +78,7 @@ DOMString khtml::parseURL(const DOMString &url)

int nl = 0;
for(int k = o; k < o+l; k++)
if(i->s[k].tqunicode() > '\r')
if(i->s[k].unicode() > '\r')
j->s[nl++] = i->s[k];

j->l = nl;


+ 4
- 4
khtml/css/cssparser.cpp View File

@@ -166,7 +166,7 @@ void CSSParser::parseSheet( CSSStyleSheetImpl *sheet, const DOMString &string )

int length = string.length() + 3;
data = (unsigned short *)malloc( length *sizeof( unsigned short ) );
memcpy( data, string.tqunicode(), string.length()*sizeof( unsigned short) );
memcpy( data, string.unicode(), string.length()*sizeof( unsigned short) );

#ifdef CSS_DEBUG
kdDebug( 6080 ) << ">>>>>>> start parsing style sheet" << endl;
@@ -190,7 +190,7 @@ CSSRuleImpl *CSSParser::parseRule( DOM::CSSStyleSheetImpl *sheet, const DOM::DOM
data = (unsigned short *)malloc( length *sizeof( unsigned short ) );
for ( unsigned int i = 0; i < strlen(khtml_rule); i++ )
data[i] = khtml_rule[i];
memcpy( data + strlen( khtml_rule ), string.tqunicode(), string.length()*sizeof( unsigned short) );
memcpy( data + strlen( khtml_rule ), string.unicode(), string.length()*sizeof( unsigned short) );
// qDebug("parse string = '%s'", TQConstString( (const TQChar *)data, length ).string().latin1() );
data[length-4] = '}';

@@ -218,7 +218,7 @@ bool CSSParser::parseValue( DOM::CSSStyleDeclarationImpl *declaration, int _id,
data = (unsigned short *)malloc( length *sizeof( unsigned short ) );
for ( unsigned int i = 0; i < strlen(khtml_value); i++ )
data[i] = khtml_value[i];
memcpy( data + strlen( khtml_value ), string.tqunicode(), string.length()*sizeof( unsigned short) );
memcpy( data + strlen( khtml_value ), string.unicode(), string.length()*sizeof( unsigned short) );
data[length-4] = '}';
// qDebug("parse string = '%s'", TQConstString( (const TQChar *)data, length ).string().latin1() );

@@ -260,7 +260,7 @@ bool CSSParser::parseDeclaration( DOM::CSSStyleDeclarationImpl *declaration, con
data = (unsigned short *)malloc( length *sizeof( unsigned short ) );
for ( unsigned int i = 0; i < strlen(khtml_decls); i++ )
data[i] = khtml_decls[i];
memcpy( data + strlen( khtml_decls ), string.tqunicode(), string.length()*sizeof( unsigned short) );
memcpy( data + strlen( khtml_decls ), string.unicode(), string.length()*sizeof( unsigned short) );
data[length-4] = '}';

nonCSSHint = _nonCSSHint;


+ 2
- 2
khtml/css/cssproperties.c View File

@@ -281,7 +281,7 @@ findProp (register const char *str, register unsigned int len)
#line 102 "cssproperties.gperf"
{"text-align", CSS_PROP_TEXT_ALIGN},
#line 109 "cssproperties.gperf"
{"tqunicode-bidi", CSS_PROP_UNICODE_BIDI},
{"unicode-bidi", CSS_PROP_UNICODE_BIDI},
#line 82 "cssproperties.gperf"
{"outline-color", CSS_PROP_OUTLINE_COLOR},
#line 60 "cssproperties.gperf"
@@ -632,7 +632,7 @@ static const char * const propertyList[] = {
"text-shadow",
"text-transform",
"top",
"tqunicode-bidi",
"unicode-bidi",
"vertical-align",
"visibility",
"white-space",


+ 13
- 13
khtml/css/cssstyleselector.cpp View File

@@ -871,7 +871,7 @@ static PseudoState checkPseudoState( const CSSStyleSelector::Encodedurl& encoded
if( attr.isNull() ) {
return PseudoNone;
}
TQConstString cu(attr.tqunicode(), attr.length());
TQConstString cu(attr.unicode(), attr.length());
TQString u = cu.string();
if ( !u.contains("://") ) {
if ( u[0] == '/' )
@@ -1165,8 +1165,8 @@ bool CSSStyleSelector::checkSimpleSelector(DOM::CSSSelector *sel, DOM::ElementIm
// else the value is longer and can be a list
if ( sel->match == CSSSelector::Class && !e->hasClassList() ) return false;

TQChar* sel_uc = sel->value.tqunicode();
TQChar* val_uc = value->tqunicode();
TQChar* sel_uc = sel->value.unicode();
TQChar* val_uc = value->unicode();

TQConstString sel_str(sel_uc, sel_len);
TQConstString val_str(val_uc, val_len);
@@ -1187,29 +1187,29 @@ bool CSSStyleSelector::checkSimpleSelector(DOM::CSSSelector *sel, DOM::ElementIm
case CSSSelector::Contain:
{
//kdDebug( 6080 ) << "checking for contains match" << endl;
TQConstString val_str(value->tqunicode(), value->length());
TQConstString sel_str(sel->value.tqunicode(), sel->value.length());
TQConstString val_str(value->unicode(), value->length());
TQConstString sel_str(sel->value.unicode(), sel->value.length());
return val_str.string().contains(sel_str.string(), caseSensitive);
}
case CSSSelector::Begin:
{
//kdDebug( 6080 ) << "checking for beginswith match" << endl;
TQConstString val_str(value->tqunicode(), value->length());
TQConstString sel_str(sel->value.tqunicode(), sel->value.length());
TQConstString val_str(value->unicode(), value->length());
TQConstString sel_str(sel->value.unicode(), sel->value.length());
return val_str.string().startsWith(sel_str.string(), caseSensitive);
}
case CSSSelector::End:
{
//kdDebug( 6080 ) << "checking for endswith match" << endl;
TQConstString val_str(value->tqunicode(), value->length());
TQConstString sel_str(sel->value.tqunicode(), sel->value.length());
TQConstString val_str(value->unicode(), value->length());
TQConstString sel_str(sel->value.unicode(), sel->value.length());
return val_str.string().endsWith(sel_str.string(), caseSensitive);
}
case CSSSelector::Hyphen:
{
//kdDebug( 6080 ) << "checking for hyphen match" << endl;
TQConstString val_str(value->tqunicode(), value->length());
TQConstString sel_str(sel->value.tqunicode(), sel->value.length());
TQConstString val_str(value->unicode(), value->length());
TQConstString sel_str(sel->value.unicode(), sel->value.length());
const TQString& str = val_str.string();
const TQString& selStr = sel_str.string();
if(str.length() < selStr.length()) return false;
@@ -2079,7 +2079,7 @@ static TQColor colorForCSSValue( int css_value )
KConfig bckgrConfig("kdesktoprc", true, false); // No multi-screen support
bckgrConfig.setGroup("Desktop0");
// Desktop background.
return bckgrConfig.readColorEntry("Color1", &tqApp->tqpalette().disabled().background());
return bckgrConfig.readColorEntry("Color1", &tqApp->palette().disabled().background());
}
return TQColor();
}
@@ -2597,7 +2597,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
}

case CSS_PROP_UNICODE_BIDI: {
HANDLE_INHERIT_AND_INITIAL(tqunicodeBidi, UnicodeBidi)
HANDLE_INHERIT_AND_INITIAL(unicodeBidi, UnicodeBidi)
if(!primitiveValue) break;
switch (primitiveValue->getIdent()) {
case CSS_VAL_NORMAL:


+ 6
- 6
khtml/css/html4.css View File

@@ -486,27 +486,27 @@ a:visited:active { color: red; outline: 1px dotted invert; }

bdo[dir="ltr"] {
direction: ltr;
tqunicode-bidi: bidi-override;
unicode-bidi: bidi-override;
}

bdo[dir="rtl"] {
direction: rtl;
tqunicode-bidi: bidi-override;
unicode-bidi: bidi-override;
}

/* ### this selector seems to be still broken ...
*[dir="ltr"] { direction: ltr; tqunicode-bidi: embed }
*[dir="rtl"] { direction: rtl; tqunicode-bidi: embed }
*[dir="ltr"] { direction: ltr; unicode-bidi: embed }
*[dir="rtl"] { direction: rtl; unicode-bidi: embed }
*/

/* elements that are block-level in html4 */
/* ### don't support tqunicode-bidi at the moment
/* ### don't support unicode-bidi at the moment
address, blockquote, body, dd, div, dl, dt, fieldset,
form, frame, frameset, h1, h2, h3, h4, h5, h6, iframe,
noscript, noframes, object, ol, p, ul, applet, center,
dir, hr, menu, pre, li, table, tr, thead, tbody, tfoot,
col, colgroup, td, th, caption
{ tqunicode-bidi: embed }
{ unicode-bidi: embed }
*/

/* end bidi settings */


+ 3
- 3
khtml/dom/css_extensions.cpp View File

@@ -1881,15 +1881,15 @@ void CSS2Properties::setTop( const DOMString &value )
if(impl) ((ElementImpl *)impl)->setAttribute("top", value);
}

DOMString CSS2Properties::tqunicodeBidi() const
DOMString CSS2Properties::unicodeBidi() const
{
if(!impl) return 0;
return ((ElementImpl *)impl)->getAttribute("tqunicodeBidi");
return ((ElementImpl *)impl)->getAttribute("unicodeBidi");
}

void CSS2Properties::setUnicodeBidi( const DOMString &value )
{
if(impl) ((ElementImpl *)impl)->setAttribute("tqunicodeBidi", value);
if(impl) ((ElementImpl *)impl)->setAttribute("unicodeBidi", value);
}

DOMString CSS2Properties::verticalAlign() const


+ 3
- 3
khtml/dom/css_extensions.h View File

@@ -2516,13 +2516,13 @@ public:
/**
* See the <a
* href="http://www.w3.org/TR/REC-CSS2/visuren.html#propdef-tqunicode-bidi">
* tqunicode-bidi property definition </a> in CSS2.
* unicode-bidi property definition </a> in CSS2.
*
*/
DOM::DOMString tqunicodeBidi() const;
DOM::DOMString unicodeBidi() const;

/**
* see tqunicodeBidi
* see unicodeBidi
*/
void setUnicodeBidi( const DOM::DOMString & );



+ 9
- 9
khtml/dom/dom_string.cpp View File

@@ -39,7 +39,7 @@ DOMString::DOMString(const TQString &str)
return;
}

impl = new DOMStringImpl( str.tqunicode(), str.length() );
impl = new DOMStringImpl( str.unicode(), str.length() );
impl->ref();
}

@@ -193,10 +193,10 @@ bool DOMString::percentage(int &_percentage) const
return true;
}

TQChar *DOMString::tqunicode() const
TQChar *DOMString::unicode() const
{
if(!impl) return 0;
return impl->tqunicode();
return impl->unicode();
}

TQString DOMString::string() const
@@ -225,8 +225,8 @@ bool DOM::strcasecmp( const DOMString &as, const DOMString &bs )
{
if ( as.length() != bs.length() ) return true;

const TQChar *a = as.tqunicode();
const TQChar *b = bs.tqunicode();
const TQChar *a = as.unicode();
const TQChar *b = bs.unicode();
if ( a == b ) return false;
if ( !( a && b ) ) return true;
int l = as.length();
@@ -239,7 +239,7 @@ bool DOM::strcasecmp( const DOMString &as, const DOMString &bs )

bool DOM::strcasecmp( const DOMString &as, const char* bs )
{
const TQChar *a = as.tqunicode();
const TQChar *a = as.unicode();
int l = as.length();
if ( !bs ) return ( l != 0 );
while ( l-- ) {
@@ -265,7 +265,7 @@ bool DOM::operator==( const DOMString &a, const DOMString &b )

if( l != b.length() ) return false;

if(!memcmp(a.tqunicode(), b.tqunicode(), l*sizeof(TQChar)))
if(!memcmp(a.unicode(), b.unicode(), l*sizeof(TQChar)))
return true;
return false;
}
@@ -276,7 +276,7 @@ bool DOM::operator==( const DOMString &a, const TQString &b )

if( l != b.length() ) return false;

if(!memcmp(a.tqunicode(), b.tqunicode(), l*sizeof(TQChar)))
if(!memcmp(a.unicode(), b.unicode(), l*sizeof(TQChar)))
return true;
return false;
}
@@ -291,7 +291,7 @@ bool DOM::operator==( const DOMString &a, const char *b )
const TQChar *aptr = aimpl->s;
while ( alen-- ) {
unsigned char c = *b++;
if ( !c || ( *aptr++ ).tqunicode() != c )
if ( !c || ( *aptr++ ).unicode() != c )
return false;
}
}


+ 1
- 1
khtml/dom/dom_string.h View File

@@ -97,7 +97,7 @@ public:
*/
DOMString upper() const;

TQChar *tqunicode() const;
TQChar *unicode() const;
TQString string() const;

int toInt() const;


+ 2
- 2
khtml/ecma/kjs_binding.cpp View File

@@ -261,7 +261,7 @@ UString::UString(const TQString &d)
{
unsigned int len = d.length();
UChar *dat = new UChar[len];
memcpy(dat, d.tqunicode(), len * sizeof(UChar));
memcpy(dat, d.unicode(), len * sizeof(UChar));
rep = UString::Rep::create(dat, len);
}

@@ -277,7 +277,7 @@ UString::UString(const DOM::DOMString &d)

unsigned int len = d.length();
UChar *dat = new UChar[len];
memcpy(dat, d.tqunicode(), len * sizeof(UChar));
memcpy(dat, d.unicode(), len * sizeof(UChar));
rep = UString::Rep::create(dat, len);
}



+ 10
- 10
khtml/ecma/kjs_debugwin.cpp View File

@@ -107,7 +107,7 @@ void SourceDisplay::setSource(SourceFile *sourceFile)
}

TQString code = sourceFile->getCode();
const TQChar *chars = code.tqunicode();
const TQChar *chars = code.unicode();
uint len = code.length();
TQChar newLine('\n');
TQChar cr('\r');
@@ -182,7 +182,7 @@ void SourceDisplay::showEvent(TQShowEvent *)
void SourceDisplay::drawContents(TQPainter *p, int clipx, int clipy, int clipw, int cliph)
{
if (!m_sourceFile) {
p->fillRect(clipx,clipy,clipw,cliph,tqpalette().active().base());
p->fillRect(clipx,clipy,clipw,cliph,palette().active().base());
return;
}

@@ -207,9 +207,9 @@ void SourceDisplay::drawContents(TQPainter *p, int clipx, int clipy, int clipw,
TQString linenoStr = TQString().sprintf("%d",lineno+1);


p->fillRect(0,height*lineno,linenoWidth,height,tqpalette().active().mid());
p->fillRect(0,height*lineno,linenoWidth,height,palette().active().mid());

p->setPen(tqpalette().active().text());
p->setPen(palette().active().text());
p->drawText(0,height*lineno,linenoWidth,height,Qt::AlignRight,linenoStr);

TQColor bgColor;
@@ -220,13 +220,13 @@ void SourceDisplay::drawContents(TQPainter *p, int clipx, int clipy, int clipw,
textColor = tqpalette().active().highlightedText();
}
else if (m_debugWin->haveBreakpoint(m_sourceFile,lineno+1,lineno+1)) {
bgColor = tqpalette().active().text();
textColor = tqpalette().active().base();
bgColor = palette().active().text();
textColor = palette().active().base();
p->drawPixmap(2,height*lineno+height/2-m_breakpointIcon.height()/2,m_breakpointIcon);
}
else {
bgColor = tqpalette().active().base();
textColor = tqpalette().active().text();
bgColor = palette().active().base();
textColor = palette().active().text();
}

p->fillRect(linenoWidth,height*lineno,right-linenoWidth,height,bgColor);
@@ -236,10 +236,10 @@ void SourceDisplay::drawContents(TQPainter *p, int clipx, int clipy, int clipw,
}

int remainingTop = height*(lastLine+1);
p->fillRect(0,remainingTop,linenoWidth,bottom-remainingTop,tqpalette().active().mid());
p->fillRect(0,remainingTop,linenoWidth,bottom-remainingTop,palette().active().mid());

p->fillRect(linenoWidth,remainingTop,
right-linenoWidth,bottom-remainingTop,tqpalette().active().base());
right-linenoWidth,bottom-remainingTop,palette().active().base());
}

//-------------------------------------------------------------------------


+ 1
- 1
khtml/ecma/kjs_navigator.cpp View File

@@ -223,7 +223,7 @@ Value Navigator::getValueProperty(ExecState *exec, int token) const
case ProductSub:
{
int ix = userAgent.find("Gecko");
if (ix >= 0 && userAgent.length() >= (uint)ix+14 && userAgent.tqunicode()[ix+5] == TQChar('/') &&
if (ix >= 0 && userAgent.length() >= (uint)ix+14 && userAgent.unicode()[ix+5] == TQChar('/') &&
userAgent.find(TQRegExp("\\d{8}"), ix+6) == ix+6)
{
// We have Gecko/<productSub> in the UA string


+ 1
- 1
khtml/ecma/kjs_window.cpp View File

@@ -1639,7 +1639,7 @@ Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString
if (winargs.height < 100)
winargs.height = 100;
} else if (key == "width") {
winargs.width = (int)val.toFloat() + 2*tqApp->tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ) + 2;
winargs.width = (int)val.toFloat() + 2*tqApp->style().pixelMetric( TQStyle::PM_DefaultFrameWidth ) + 2;
if (winargs.width > screen.width()) // should actually check workspace
winargs.width = screen.width();
if (winargs.width < 100)


+ 1
- 1
khtml/html/html_documentimpl.cpp View File

@@ -235,7 +235,7 @@ HTMLMapElementImpl* HTMLDocumentImpl::getMap(const DOMString& _url)
TQString s;
int pos = url.find('#');
//kdDebug(0) << "map pos of #:" << pos << endl;
s = TQString(_url.tqunicode() + pos + 1, _url.length() - pos - 1);
s = TQString(_url.unicode() + pos + 1, _url.length() - pos - 1);

TQMapConstIterator<TQString,HTMLMapElementImpl*> it = mapMap.find(s);



+ 5
- 5
khtml/html/html_elementimpl.cpp View File

@@ -176,7 +176,7 @@ void HTMLElementImpl::parseAttribute(AttributeImpl *attr)
case ATTR_CLASS:
if (attr->val()) {
DOMString v = attr->value();
const TQChar* s = v.tqunicode();
const TQChar* s = v.unicode();
int l = v.length();
while( l && !s->isSpace() )
l--,s++;
@@ -354,11 +354,11 @@ static inline bool isHexDigit( const TQChar &c ) {

static inline int toHex( const TQChar &c ) {
return ( (c >= TQChar('0') && c <= TQChar('9'))
? (c.tqunicode() - '0')
? (c.unicode() - '0')
: ( ( c >= TQChar('a') && c <= TQChar('f') )
? (c.tqunicode() - 'a' + 10)
? (c.unicode() - 'a' + 10)
: ( ( c >= TQChar('A') && c <= TQChar('F') )
? (c.tqunicode() - 'A' + 10)
? (c.unicode() - 'A' + 10)
: -1 ) ) );
}

@@ -457,7 +457,7 @@ DOMString HTMLElementImpl::innerHTML() const
TQString result; //Use TQString to accumulate since DOMString is poor for appends
for (NodeImpl *child = firstChild(); child != NULL; child = child->nextSibling()) {
DOMString kid = child->toString();
result += TQConstString(kid.tqunicode(), kid.length()).string();
result += TQConstString(kid.unicode(), kid.length()).string();
}
return result;
}


+ 2
- 2
khtml/html/html_formimpl.cpp View File

@@ -193,7 +193,7 @@ inline static TQString escapeUnencodeable(const TQTextCodec* codec, const TQStri
enc_string.append(c);
else {
TQString ampersandEscape;
ampersandEscape.sprintf("&#%u;", c.tqunicode());
ampersandEscape.sprintf("&#%u;", c.unicode());
enc_string.append(ampersandEscape);
}
}
@@ -2762,7 +2762,7 @@ static TQString expandLF(const TQString& s)
for(unsigned pos = 0; pos < len; pos++)
{
TQChar c = s.at(pos);
switch(c.tqunicode())
switch(c.unicode())
{
case '\n':
r[pos2++] = '\r';


+ 2
- 2
khtml/html/html_imageimpl.cpp View File

@@ -418,8 +418,8 @@ void HTMLMapElementImpl::parseAttribute(AttributeImpl *attr)
case ATTR_NAME:
{
DOMString s = attr->value();
if(*s.tqunicode() == '#')
name = TQString(s.tqunicode()+1, s.length()-1).lower();
if(*s.unicode() == '#')
name = TQString(s.unicode()+1, s.length()-1).lower();
else
name = s.string().lower();
// ### make this work for XML documents, e.g. in case of <html:map...>


+ 13
- 13
khtml/html/htmltokenizer.cpp View File

@@ -89,7 +89,7 @@ static const char titleEnd [] = "</title";
#define fixUpChar(x)
#else
#define fixUpChar(x) \
switch ((x).tqunicode()) \
switch ((x).unicode()) \
{ \
case 0x80: (x) = 0x20ac; break; \
case 0x82: (x) = 0x201a; break; \
@@ -471,7 +471,7 @@ void HTMLTokenizer::parseComment(TokenizerString &src)

if (strict)
{
if (src->tqunicode() == '-') {
if (src->unicode() == '-') {
delimiterCount++;
if (delimiterCount == 2) {
delimiterCount = 0;
@@ -482,7 +482,7 @@ void HTMLTokenizer::parseComment(TokenizerString &src)
delimiterCount = 0;
}

if ((!strict || canClose) && src->tqunicode() == '>')
if ((!strict || canClose) && src->unicode() == '>')
{
bool handleBrokenComments = brokenComments && !( script || style );
bool scriptEnd=false;
@@ -521,7 +521,7 @@ void HTMLTokenizer::parseServer(TokenizerString &src)
checkScriptBuffer(src.length());
while ( !src.isEmpty() ) {
scriptCode[ scriptCodeSize++ ] = *src;
if (src->tqunicode() == '>' &&
if (src->unicode() == '>' &&
scriptCodeSize > 1 && scriptCode[scriptCodeSize-2] == '%') {
++src;
server = false;
@@ -607,7 +607,7 @@ void HTMLTokenizer::parseEntity(TokenizerString &src, TQChar *&dest, bool start)

while( !src.isEmpty() )
{
ushort cc = src->tqunicode();
ushort cc = src->unicode();
switch(Entity) {
case NoEntity:
return;
@@ -639,7 +639,7 @@ void HTMLTokenizer::parseEntity(TokenizerString &src, TQChar *&dest, bool start)

case Hexadecimal:
{
int uc = EntityChar.tqunicode();
int uc = EntityChar.unicode();
int ll = kMin<uint>(src.length(), 8);
while(ll--) {
TQChar csrc(src->lower());
@@ -658,7 +658,7 @@ void HTMLTokenizer::parseEntity(TokenizerString &src, TQChar *&dest, bool start)
}
case Decimal:
{
int uc = EntityChar.tqunicode();
int uc = EntityChar.unicode();
int ll = kMin(src.length(), 9-cBufferPos);
while(ll--) {
cc = src->cell();
@@ -718,7 +718,7 @@ void HTMLTokenizer::parseEntity(TokenizerString &src, TQChar *&dest, bool start)
}
case SearchSemicolon:
#ifdef TOKEN_DEBUG
kdDebug( 6036 ) << "ENTITY " << EntityChar.tqunicode() << endl;
kdDebug( 6036 ) << "ENTITY " << EntityChar.unicode() << endl;
#endif
fixUpChar(EntityChar);

@@ -956,7 +956,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src)
ushort curchar;
bool atespace = false;
while(!src.isEmpty()) {
curchar = src->tqunicode();
curchar = src->unicode();
if(curchar > ' ') {
if(curchar == '=') {
#ifdef TOKEN_DEBUG
@@ -988,7 +988,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src)
{
ushort curchar;
while(!src.isEmpty()) {
curchar = src->tqunicode();
curchar = src->unicode();
if(curchar > ' ') {
if(( curchar == '\'' || curchar == '\"' )) {
tquote = curchar == '\"' ? DoubleQuote : SingleQuote;
@@ -1012,7 +1012,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src)
while(!src.isEmpty()) {
checkBuffer();

curchar = src->tqunicode();
curchar = src->unicode();
if(curchar <= '\'' && !src.escaped()) {
// ### attributes like '&{blaa....};' are supposed to be treated as jscript.
if ( curchar == '&' )
@@ -1050,7 +1050,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src)
ushort curchar;
while(!src.isEmpty()) {
checkBuffer();
curchar = src->tqunicode();
curchar = src->unicode();
if(curchar <= '>' && !src.escaped()) {
// parse Entities
if ( curchar == '&' )
@@ -1351,7 +1351,7 @@ void HTMLTokenizer::write( const TokenizerString &str, bool appendData )
// do we need to enlarge the buffer?
checkBuffer();

ushort cc = src->tqunicode();
ushort cc = src->unicode();

if (skipLF && (cc != '\n'))
skipLF = false;


+ 2
- 2
khtml/html/htmltokenizer.h View File

@@ -76,8 +76,8 @@ namespace khtml {
{
DOMStringImpl *value = 0;
NodeImpl::Id tid = 0;
if(buffer->tqunicode()) {
tid = buffer->tqunicode();
if(buffer->unicode()) {
tid = buffer->unicode();
value = v.implementation();
}
else if ( !attrName.isEmpty() && attrName != "/" ) {


+ 5
- 5
khtml/khtml_caret.cpp View File

@@ -1749,7 +1749,7 @@ void EditableCharacterIterator::initFirstChar()
if (_offset == box->maxOffset())
peekNext();
else if (b && !box->isOutside() && b->isInlineTextBox())
_char = static_cast<RenderText *>(b->object())->str->s[_offset].tqunicode();
_char = static_cast<RenderText *>(b->object())->str->s[_offset].unicode();
else
_char = -1;
}
@@ -1849,7 +1849,7 @@ kdDebug(6200) << "_offset " << _offset << endl;
readchar:
// get character
if (b && !box->isOutside() && b->isInlineTextBox() && _offset < b->maxOffset())
_char = static_cast<RenderText *>(b->object())->str->s[_offset].tqunicode();
_char = static_cast<RenderText *>(b->object())->str->s[_offset].unicode();
else
_char = -1;
}/*end if*/
@@ -1887,7 +1887,7 @@ kdDebug(6200) << "_offset == minofs: " << _offset << " == " << minofs << endl;
// _peekNext = b;
// get character
if (b && !box->isOutside() && b->isInlineTextBox())
_char = static_cast<RenderText *>(b->object())->text()[_offset].tqunicode();
_char = static_cast<RenderText *>(b->object())->text()[_offset].unicode();
else
_char = -1;

@@ -1990,9 +1990,9 @@ kdDebug(6200) << "_offset: " << _offset << " _peekNext: " << _peekNext << endl;
#endif
// get character
if (_peekNext && _offset >= box->maxOffset() && _peekNext->isInlineTextBox())
_char = static_cast<RenderText *>(_peekNext->object())->text()[_peekNext->minOffset()].tqunicode();
_char = static_cast<RenderText *>(_peekNext->object())->text()[_peekNext->minOffset()].unicode();
else if (b && _offset < b->maxOffset() && b->isInlineTextBox())
_char = static_cast<RenderText *>(b->object())->text()[_offset].tqunicode();
_char = static_cast<RenderText *>(b->object())->text()[_offset].unicode();
else
_char = -1;
}/*end if*/


+ 2
- 2
khtml/khtml_caret_p.h View File

@@ -1034,7 +1034,7 @@ public:
*/
int chr() const { return _char; }

/** returns the current character as a tqunicode symbol, substituting
/** returns the current character as a unicode symbol, substituting
* a blank for a non-text node.
*/
TQChar operator *() const { return TQChar(_char >= 0 ? _char : ' '); }
@@ -1089,7 +1089,7 @@ protected:
CaretBox *box = *copy;
InlineBox *b = box->inlineBox();
if (b && !box->isOutside() && b->isInlineTextBox())
_char = static_cast<RenderText *>(b->object())->str->s[b->minOffset()].tqunicode();
_char = static_cast<RenderText *>(b->object())->str->s[b->minOffset()].unicode();
else
_char = -1;
}


+ 13
- 13
khtml/khtml_ext.cpp View File

@@ -112,7 +112,7 @@ void KHTMLPartBrowserExtension::editableWidgetFocused( TQWidget *widget )

if ( !m_connectedToClipboard && m_editableFormWidget )
{
connect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ),
connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ),
this, TQT_SLOT( updateEditActions() ) );

if ( m_editableFormWidget->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) || m_editableFormWidget->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) )
@@ -135,7 +135,7 @@ void KHTMLPartBrowserExtension::editableWidgetBlurred( TQWidget * /*widget*/ )

if ( m_connectedToClipboard )
{
disconnect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ),
disconnect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ),
this, TQT_SLOT( updateEditActions() ) );

if ( oldWidget )
@@ -223,7 +223,7 @@ void KHTMLPartBrowserExtension::copy()
text.replace( TQChar( 0xa0 ), ' ' );


TQClipboard *cb = TQApplication::tqclipboard();
TQClipboard *cb = TQApplication::clipboard();
disconnect( cb, TQT_SIGNAL( selectionChanged() ), m_part, TQT_SLOT( slotClearSelection() ) );
#ifndef QT_NO_MIMECLIPBOARD
TQString htmltext;
@@ -335,10 +335,10 @@ void KHTMLPartBrowserExtension::updateEditActions()

// ### duplicated from KonqMainWindow::slotClipboardDataChanged
#ifndef QT_NO_MIMECLIPBOARD // Handle minimalized versions of Qt Embedded
TQMimeSource *data = TQApplication::tqclipboard()->data();
TQMimeSource *data = TQApplication::clipboard()->data();
enableAction( "paste", data->provides( "text/plain" ) );
#else
TQString data=TQApplication::tqclipboard()->text();
TQString data=TQApplication::clipboard()->text();
enableAction( "paste", data.contains("://"));
#endif
bool hasSelection = false;
@@ -715,10 +715,10 @@ void KHTMLPopupGUIClient::slotCopyLinkLocation()
// Set it in both the mouse selection and in the clipboard
KURL::List lst;
lst.append( safeURL );
TQApplication::tqclipboard()->setData( new KURLDrag( lst ), TQClipboard::Clipboard );
TQApplication::tqclipboard()->setData( new KURLDrag( lst ), TQClipboard::Selection );
TQApplication::clipboard()->setData( new KURLDrag( lst ), TQClipboard::Clipboard );
TQApplication::clipboard()->setData( new KURLDrag( lst ), TQClipboard::Selection );
#else
TQApplication::tqclipboard()->setText( safeURL.url() ); //FIXME(E): Handle multiple entries
TQApplication::clipboard()->setText( safeURL.url() ); //FIXME(E): Handle multiple entries
#endif
}

@@ -741,8 +741,8 @@ void KHTMLPopupGUIClient::slotCopyImage()
drag->addDragObject( new KURLDrag(lst, d->m_khtml->view(), "Image URL") );

// Set it in both the mouse selection and in the clipboard
TQApplication::tqclipboard()->setData( drag, TQClipboard::Clipboard );
TQApplication::tqclipboard()->setData( new KURLDrag(lst), TQClipboard::Selection );
TQApplication::clipboard()->setData( drag, TQClipboard::Clipboard );
TQApplication::clipboard()->setData( new KURLDrag(lst), TQClipboard::Selection );
#else
kdDebug() << "slotCopyImage called when the clipboard does not support this. This should not be possible." << endl;
#endif
@@ -756,10 +756,10 @@ void KHTMLPopupGUIClient::slotCopyImageLocation()
// Set it in both the mouse selection and in the clipboard
KURL::List lst;
lst.append( safeURL );
TQApplication::tqclipboard()->setData( new KURLDrag( lst ), TQClipboard::Clipboard );
TQApplication::tqclipboard()->setData( new KURLDrag( lst ), TQClipboard::Selection );
TQApplication::clipboard()->setData( new KURLDrag( lst ), TQClipboard::Clipboard );
TQApplication::clipboard()->setData( new KURLDrag( lst ), TQClipboard::Selection );
#else
TQApplication::tqclipboard()->setText( safeURL.url() ); //FIXME(E): Handle multiple entries
TQApplication::clipboard()->setText( safeURL.url() ); //FIXME(E): Handle multiple entries
#endif
}



+ 6
- 6
khtml/khtml_part.cpp View File

@@ -1480,7 +1480,7 @@ void KHTMLPart::clear()
d->m_startOffset = 0;
d->m_endOffset = 0;
#ifndef QT_NO_CLIPBOARD
connect( kapp->tqclipboard(), TQT_SIGNAL( selectionChanged()), TQT_SLOT( slotClearSelection()));
connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), TQT_SLOT( slotClearSelection()));
#endif

d->m_jobPercent = 0;
@@ -3005,7 +3005,7 @@ void KHTMLPart::findText()

// The lineedit of the dialog would make khtml lose its selection, otherwise
#ifndef QT_NO_CLIPBOARD
disconnect( kapp->tqclipboard(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotClearSelection()) );
disconnect( kapp->clipboard(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotClearSelection()) );
#endif

// Now show the dialog in which the user can choose options.
@@ -3036,7 +3036,7 @@ void KHTMLPart::findText( const TQString &str, long options, TQWidget *parent, K
return;

#ifndef QT_NO_CLIPBOARD
connect( kapp->tqclipboard(), TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotClearSelection()) );
connect( kapp->clipboard(), TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotClearSelection()) );
#endif

// Create the KFind object
@@ -6610,9 +6610,9 @@ void KHTMLPart::khtmlMouseReleaseEvent( khtml::MouseReleaseEvent *event )
#ifndef QT_NO_CLIPBOARD
TQString text = selectedText();
text.replace(TQChar(0xa0), ' ');
disconnect( kapp->tqclipboard(), TQT_SIGNAL( selectionChanged()), this, TQT_SLOT( slotClearSelection()));
kapp->tqclipboard()->setText(text,TQClipboard::Selection);
connect( kapp->tqclipboard(), TQT_SIGNAL( selectionChanged()), TQT_SLOT( slotClearSelection()));
disconnect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), this, TQT_SLOT( slotClearSelection()));
kapp->clipboard()->setText(text,TQClipboard::Selection);
connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), TQT_SLOT( slotClearSelection()));
#endif
//kdDebug( 6000 ) << "selectedText = " << text << endl;
emitSelectionChanged();


+ 5
- 5
khtml/khtmlview.cpp View File

@@ -662,7 +662,7 @@ void KHTMLView::drawContents( TQPainter *p, int ex, int ey, int ew, int eh )

//kdDebug( 6000 ) << "drawContents this="<< this <<" x=" << ex << ",y=" << ey << ",w=" << ew << ",h=" << eh << endl;
if(!m_part || !m_part->xmlDocImpl() || !m_part->xmlDocImpl()->renderer()) {
p->fillRect(ex, ey, ew, eh, tqpalette().active().brush(TQColorGroup::Base));
p->fillRect(ex, ey, ew, eh, palette().active().brush(TQColorGroup::Base));
return;
} else if ( d->complete && static_cast<RenderCanvas*>(m_part->xmlDocImpl()->renderer())->needsLayout() ) {
// an external update request happens while we have a layout scheduled
@@ -726,7 +726,7 @@ void KHTMLView::drawContents( TQPainter *p, int ex, int ey, int ew, int eh )
d->vertPaintBuffer->resize(10, visibleHeight());
d->tp->begin(d->vertPaintBuffer);
d->tp->translate(-ex, -ey);
d->tp->fillRect(ex, ey, ew, eh, tqpalette().active().brush(TQColorGroup::Base));
d->tp->fillRect(ex, ey, ew, eh, palette().active().brush(TQColorGroup::Base));
m_part->xmlDocImpl()->renderer()->layer()->paint(d->tp, TQRect(ex, ey, ew, eh));
d->tp->end();
p->drawPixmap(ex, ey, *d->vertPaintBuffer, 0, 0, ew, eh);
@@ -740,7 +740,7 @@ void KHTMLView::drawContents( TQPainter *p, int ex, int ey, int ew, int eh )
int ph = eh-py < PAINT_BUFFER_HEIGHT ? eh-py : PAINT_BUFFER_HEIGHT;
d->tp->begin(d->paintBuffer);
d->tp->translate(-ex, -ey-py);
d->tp->fillRect(ex, ey+py, ew, ph, tqpalette().active().brush(TQColorGroup::Base));
d->tp->fillRect(ex, ey+py, ew, ph, palette().active().brush(TQColorGroup::Base));
m_part->xmlDocImpl()->renderer()->layer()->paint(d->tp, TQRect(ex, ey+py, ew, ph));
d->tp->end();

@@ -756,7 +756,7 @@ static int cnt=0;
kdDebug() << "[" << ++cnt << "]" << " clip region: " << pr << endl;
// p->setClipRegion(TQRect(0,0,ew,eh));
// p->translate(-ex, -ey);
p->fillRect(ex, ey, ew, eh, tqpalette().active().brush(TQColorGroup::Base));
p->fillRect(ex, ey, ew, eh, palette().active().brush(TQColorGroup::Base));
m_part->xmlDocImpl()->renderer()->layer()->paint(p, pr);
#endif // DEBUG_NO_PAINT_BUFFER

@@ -4430,7 +4430,7 @@ void KHTMLView::placeCaretOnChar(CaretBox *hintBox)
d->m_caretViewContext->origX = d->m_caretViewContext->x;
d->scrollBarMoved = false;
#if DEBUG_CARETMODE > 3
//if (caretNode->isTextNode()) kdDebug(6200) << "text[0] = " << (int)*((TextImpl *)caretNode)->data().tqunicode() << " text :\"" << ((TextImpl *)caretNode)->data().string() << "\"" << endl;
//if (caretNode->isTextNode()) kdDebug(6200) << "text[0] = " << (int)*((TextImpl *)caretNode)->data().unicode() << " text :\"" << ((TextImpl *)caretNode)->data().string() << "\"" << endl;
#endif
ensureNodeHasFocus(m_part->d->caretNode().handle());
caretOn();


+ 3
- 3
khtml/misc/stringit.h View File

@@ -46,7 +46,7 @@ public:
DOMStringIt(TQChar *str, uint len)
{ s = str, l = len; lines = 0; }
DOMStringIt(const TQString &str)
{ s = str.tqunicode(); l = str.length(); lines = 0; }
{ s = str.unicode(); l = str.length(); lines = 0; }

DOMStringIt *operator++()
{
@@ -85,13 +85,13 @@ class TokenizerSubstring
friend class TokenizerString;
public:
TokenizerSubstring() : m_length(0), m_current(0) {}
TokenizerSubstring(const TQString &str) : m_string(str), m_length(str.length()), m_current(m_length == 0 ? 0 : str.tqunicode()) {}
TokenizerSubstring(const TQString &str) : m_string(str), m_length(str.length()), m_current(m_length == 0 ? 0 : str.unicode()) {}
TokenizerSubstring(const TQChar *str, int length) : m_length(length), m_current(length == 0 ? 0 : str) {}

void clear() { m_length = 0; m_current = 0; }

void appendTo(TQString &str) const {
if (m_string.tqunicode() == m_current) {
if (m_string.unicode() == m_current) {
if (str.isEmpty())
str = m_string;
else


+ 12
- 12
khtml/rendering/bidi.cpp View File

@@ -242,7 +242,7 @@ static inline RenderObject *Bidinext(RenderObject *par, RenderObject *current, B
if (!oldEndOfInline && !current->isFloating() && !current->isReplaced() && !current->isPositioned()) {
next = current->firstChild();
if ( next && adjustEmbedding ) {
EUnicodeBidi ub = next->style()->tqunicodeBidi();
EUnicodeBidi ub = next->style()->unicodeBidi();
if ( ub != UBNormal && !emptyRun ) {
EDirection dir = next->style()->direction();
TQChar::Direction d = ( ub == Embed ? ( dir == RTL ? TQChar::DirRLE : TQChar::DirLRE )
@@ -261,7 +261,7 @@ static inline RenderObject *Bidinext(RenderObject *par, RenderObject *current, B
while (current && current != par) {
next = current->nextSibling();
if (next) break;
if ( adjustEmbedding && current->style()->tqunicodeBidi() != UBNormal && !emptyRun ) {
if ( adjustEmbedding && current->style()->unicodeBidi() != UBNormal && !emptyRun ) {
embed( TQChar::DirPDF, bidi );
}
current = current->parent();
@@ -454,7 +454,7 @@ static void checkMidpoints(BidiIterator& lBreak, BidiState &bidi)
// Don't shave a character off the endpoint if it was from a soft hyphen.
RenderText* textObj = static_cast<RenderText*>(endpoint.obj);
if (endpoint.pos+1 < textObj->length() &&
textObj->text()[endpoint.pos+1].tqunicode() == SOFT_HYPHEN)
textObj->text()[endpoint.pos+1].unicode() == SOFT_HYPHEN)
return;
}
endpoint.pos--;
@@ -1241,7 +1241,7 @@ void RenderBlock::bidiReorderLine(const BidiIterator &start, const BidiIterator
}

// this causes the operator ++ to open and close embedding levels as needed
// for the CSS tqunicode-bidi property
// for the CSS unicode-bidi property
adjustEmbedding = true;
bidi.current.increment( bidi );
adjustEmbedding = false;
@@ -1611,11 +1611,11 @@ BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start, BidiState &bidi
// be skipped.
while (!start.atEnd() && (start.obj->isInlineFlow() || (!start.obj->style()->preserveWS() && !start.obj->isBR() &&
#ifndef QT_NO_UNICODETABLES
( (start.current().tqunicode() == (ushort)0x0020) || // ASCII space
(start.current().tqunicode() == (ushort)0x0009) || // ASCII tab
(start.current().tqunicode() == (ushort)0x000A) || // ASCII line feed
(start.current().tqunicode() == (ushort)0x000C) || // ASCII form feed
(start.current().tqunicode() == (ushort)0x200B) || // Zero-width space
( (start.current().unicode() == (ushort)0x0020) || // ASCII space
(start.current().unicode() == (ushort)0x0009) || // ASCII tab
(start.current().unicode() == (ushort)0x000A) || // ASCII line feed
(start.current().unicode() == (ushort)0x000C) || // ASCII form feed
(start.current().unicode() == (ushort)0x200B) || // Zero-width space
start.obj->isFloatingOrPositioned() )
#else
( start.current() == ' ' || start.current() == '\n' || start.obj->isFloatingOrPositioned() )
@@ -1824,7 +1824,7 @@ BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start, BidiState &bidi
isLineEmpty = false;

// Check for soft hyphens. Go ahead and ignore them.
if (c.tqunicode() == SOFT_HYPHEN && pos > 0) {
if (c.unicode() == SOFT_HYPHEN && pos > 0) {
nextIsSoftBreakable = true;
if (!ignoringSpaces) {
// Ignore soft hyphens
@@ -1911,7 +1911,7 @@ BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start, BidiState &bidi
lBreak.endOfInline = false;
}
goto end;
} else if ( (pos > 1 && str[pos-1].tqunicode() == SOFT_HYPHEN) )
} else if ( (pos > 1 && str[pos-1].unicode() == SOFT_HYPHEN) )
// Subtract the width of the soft hyphen out since we fit on a line.
tmpW -= t->width(pos-1, 1, f);
}
@@ -2189,7 +2189,7 @@ BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start, BidiState &bidi
// For soft hyphens on line breaks, we have to chop out the midpoints that made us
// ignore the hyphen so that it will render at the end of the line.
TQChar c = static_cast<RenderText*>(lBreak.obj)->text()[lBreak.pos-1];
if (c.tqunicode() == SOFT_HYPHEN)
if (c.unicode() == SOFT_HYPHEN)
chopMidpointsAt(lBreak.obj, lBreak.pos-2);
}



+ 4
- 4
khtml/rendering/break_lines.h View File

@@ -6,7 +6,7 @@
namespace khtml {

/*
array of tqunicode codes where breaking shouldn't occur.
array of unicode codes where breaking shouldn't occur.
(in sorted order because of using with binary search)
these are currently for Japanese, though simply adding
Korean, Chinese ones should work as well
@@ -122,7 +122,7 @@ namespace khtml {
inline bool isBreakable( const TQChar *str, const int pos, int len )
{
const TQChar *c = str+pos;
unsigned short ch = c->tqunicode();
unsigned short ch = c->unicode();
if ( ch > 0xff ) {
// not latin1, need to do more sophisticated checks for asian fonts
unsigned char row = c->row();
@@ -147,8 +147,8 @@ namespace khtml {
return false;

// do binary search in dontbreak[]
return break_bsearch(dontbreakbefore, c->tqunicode()) &&
break_bsearch(dontbreakafter, (str+(pos-1))->tqunicode());
return break_bsearch(dontbreakbefore, c->unicode()) &&
break_bsearch(dontbreakafter, (str+(pos-1))->unicode());
} else // no asian font
return c->isSpace();
} else {


+ 1
- 1
khtml/rendering/font.cpp View File

@@ -293,7 +293,7 @@ int Font::width( TQChar *chs, int, int pos, int len, int start, int end, int toA
const TQString qstr = cstr.string();
if ( scFont ) {
const TQString upper = qstr.upper();
const TQChar *uc = qstr.tqunicode();
const TQChar *uc = qstr.unicode();
const TQFontMetrics sc_fm( *scFont );
for ( int i = 0; i < len; ++i ) {
if ( (uc+i)->category() == TQChar::Letter_Lowercase )


+ 1
- 1
khtml/rendering/render_block.cpp View File

@@ -881,7 +881,7 @@ static inline bool isAnonymousWhitespace( RenderObject* o ) {
return false;
RenderObject *fc = o->firstChild();
return fc && fc == o->lastChild() && fc->isText() && static_cast<RenderText *>(fc)->stringLength() == 1 &&
static_cast<RenderText *>(fc)->text()[0].tqunicode() == ' ';
static_cast<RenderText *>(fc)->text()[0].unicode() == ' ';
}

RenderObject* RenderBlock::handleCompactChild(RenderObject* child, CompactInfo& compactInfo, const MarginInfo& marginInfo, bool& handled)


+ 1
- 1
khtml/rendering/render_box.cpp View File

@@ -346,7 +346,7 @@ void RenderBox::paintRootBoxDecorations(PaintInfo& paintInfo, int _tx, int _ty)
}

if( !bgColor.isValid() && canvas()->view())
bgColor = canvas()->view()->tqpalette().active().color(TQColorGroup::Base);
bgColor = canvas()->view()->palette().active().color(TQColorGroup::Base);

int w = width();
int h = height();


+ 1
- 1
khtml/rendering/render_canvas.cpp View File

@@ -329,7 +329,7 @@ void RenderCanvas::paintBoxDecorations(PaintInfo& paintInfo, int /*_tx*/, int /*
if ((firstChild() && firstChild()->style()->visibility() == VISIBLE) || !view())
return;

paintInfo.p->fillRect(paintInfo.r, view()->tqpalette().active().color(TQColorGroup::Base));