diff options
Diffstat (limited to 'kate/part')
41 files changed, 231 insertions, 231 deletions
diff --git a/kate/part/katearbitraryhighlight.h b/kate/part/katearbitraryhighlight.h index 4dd5a362b..10086ec7f 100644 --- a/kate/part/katearbitraryhighlight.h +++ b/kate/part/katearbitraryhighlight.h @@ -57,7 +57,7 @@ public: * - identical highlight for whole list * - signals for view movement */ -class KateArbitraryHighlight : public QObject +class KateArbitraryHighlight : public TQObject { Q_OBJECT diff --git a/kate/part/kateautoindent.cpp b/kate/part/kateautoindent.cpp index ed9a6169b..aed42bbab 100644 --- a/kate/part/kateautoindent.cpp +++ b/kate/part/kateautoindent.cpp @@ -224,55 +224,55 @@ void KateNormalIndent::updateConfig () for (uint i=0; i<items.count(); i++) { TQString name = items.at(i)->name; - if (name.find("Comment") != -1 && commentAttrib == 255) + if (name.tqfind("Comment") != -1 && commentAttrib == 255) { commentAttrib = i; } - else if (name.find("Region Marker") != -1 && regionAttrib == 255) + else if (name.tqfind("Region Marker") != -1 && regionAttrib == 255) { regionAttrib = i; } - else if (name.find("Symbol") != -1 && symbolAttrib == 255) + else if (name.tqfind("Symbol") != -1 && symbolAttrib == 255) { symbolAttrib = i; } - else if (name.find("Alert") != -1) + else if (name.tqfind("Alert") != -1) { alertAttrib = i; } - else if (name.find("Comment") != -1 && commentAttrib != 255 && doxyCommentAttrib == 255) + else if (name.tqfind("Comment") != -1 && commentAttrib != 255 && doxyCommentAttrib == 255) { doxyCommentAttrib = i; } - else if (name.find("Tags") != -1 && tagAttrib == 255) + else if (name.tqfind("Tags") != -1 && tagAttrib == 255) { tagAttrib = i; } - else if (name.find("Word") != -1 && wordAttrib == 255) + else if (name.tqfind("Word") != -1 && wordAttrib == 255) { wordAttrib = i; } - else if (name.find("Keyword") != -1 && keywordAttrib == 255) + else if (name.tqfind("Keyword") != -1 && keywordAttrib == 255) { keywordAttrib = i; } - else if (name.find("Normal") != -1 && normalAttrib == 255) + else if (name.tqfind("Normal") != -1 && normalAttrib == 255) { normalAttrib = i; } - else if (name.find("Extensions") != -1 && extensionAttrib == 255) + else if (name.tqfind("Extensions") != -1 && extensionAttrib == 255) { extensionAttrib = i; } - else if (name.find("Preprocessor") != -1 && preprocessorAttrib == 255) + else if (name.tqfind("Preprocessor") != -1 && preprocessorAttrib == 255) { preprocessorAttrib = i; } - else if (name.find("String") != -1 && stringAttrib == 255) + else if (name.tqfind("String") != -1 && stringAttrib == 255) { stringAttrib = i; } - else if (name.find("Char") != -1 && charAttrib == 255) + else if (name.tqfind("Char") != -1 && charAttrib == 255) { charAttrib = i; } @@ -583,7 +583,7 @@ bool KateCSmartIndent::handleDoxygen (KateDocCursor &begin) if (last <= 0 || !(justAfterDoxygen = textLine->stringAtPos(last-1, "*/"))) insideDoxygen = true; if (justAfterDoxygen) - justAfterDoxygen &= textLine->string().find("/**") < 0; + justAfterDoxygen &= textLine->string().tqfind("/**") < 0; while (textLine->attribute(first) != doxyCommentAttrib && first <= textLine->lastChar()) first++; if (textLine->stringAtPos(first, "//")) @@ -700,7 +700,7 @@ static inline bool colonPermitsReindent(const KateNormalIndent &indenter, { const TQString txt = line->string(0,curCol); // do we have any significant preceding colon? - for (int pos = 0; (pos = txt.find(':', pos)) >= 0; pos++) { + for (int pos = 0; (pos = txt.tqfind(':', pos)) >= 0; pos++) { if (line->attribute(pos) == indenter.symbolAttrib) // yes, it has already contributed to this line's indentation, don't // indent again @@ -722,7 +722,7 @@ void KateCSmartIndent::processChar(TQChar c) static const TQString triggers("}{)/:#n"); static const TQString firstTriggers("}{)/:#"); static const TQString lastTriggers(":n"); - if (triggers.find(c) < 0) + if (triggers.tqfind(c) < 0) return; KateView *view = doc->activeView(); @@ -748,7 +748,7 @@ void KateCSmartIndent::processChar(TQChar c) if (c == 'n') { - if (firstChar != '#' || textLine->string(curCol-5, 5) != TQString::fromLatin1("regio")) + if (firstChar != '#' || textLine->string(curCol-5, 5) != TQString::tqfromLatin1("regio")) return; } @@ -775,8 +775,8 @@ void KateCSmartIndent::processChar(TQChar c) // of the line const TQChar lastChar = textLine->getChar(textLine->lastChar()); int pos; - if (((c == firstChar && firstTriggers.find(firstChar) >= 0) - || (c == lastChar && lastTriggers.find(lastChar) >= 0)) + if (((c == firstChar && firstTriggers.tqfind(firstChar) >= 0) + || (c == lastChar && lastTriggers.tqfind(lastChar) >= 0)) && (c != ':' || colonPermitsReindent(*this, textLine, curCol))) processLine(begin); } @@ -1176,7 +1176,7 @@ uint KateCSmartIndent::findOpeningComment(KateDocCursor &start) { KateTextLine::Ptr textLine = doc->plainKateTextLine(cur.line()); - int pos = textLine->string().find("/*", false); + int pos = textLine->string().tqfind("/*", false); if (pos >= 0) { KateDocCursor temp(cur.line(), pos, doc); @@ -1359,7 +1359,7 @@ void KateXmlIndent::processChar (TQChar c) // only alter lines that start with a close element KateView *view = doc->activeView(); TQString text = doc->plainKateTextLine(view->cursorLine())->string(); - if(text.find(startsWithCloseTag) == -1) return; + if(text.tqfind(startsWithCloseTag) == -1) return; // process it processLine(view->cursorLine()); @@ -1404,14 +1404,14 @@ void KateXmlIndent::getLineInfo (uint line, uint &prevIndent, int &numTags, // <a> // </a> <!-- indentation *already* decreased --> // requires that we discount the </a> from the number of closed tags - if(text.find(startsWithCloseTag) != -1) ++numTags; + if(text.tqfind(startsWithCloseTag) != -1) ++numTags; // count the number of open and close tags int lastCh = 0; uint pos, len = text.length(); bool seenOpen = false; for(pos = 0; pos < len; ++pos) { - int ch = text.at(pos).unicode(); + int ch = text.at(pos).tqunicode(); switch(ch) { case '<': seenOpen = true; @@ -1445,10 +1445,10 @@ void KateXmlIndent::getLineInfo (uint line, uint &prevIndent, int &numTags, for(uint backLine = line; backLine; ) { // find first line with an open tag KateTextLine::Ptr x = doc->plainKateTextLine(--backLine); - if(x->string().find('<') == -1) continue; + if(x->string().tqfind('<') == -1) continue; // recalculate the indent - if(x->string().find(unclosedDoctype) != -1) --numTags; + if(x->string().tqfind(unclosedDoctype) != -1) --numTags; getLineInfo(backLine, prevIndent, numTags, attrCol, unclosedTag); break; } @@ -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).unicode(); + lastCh = text.at(++attrCol).tqunicode(); }while(lastCh && lastCh != ' ' && lastCh != '\t'); while(lastCh == ' ' || lastCh == '\t') { - lastCh = text.at(++attrCol).unicode(); + lastCh = text.at(++attrCol).tqunicode(); } attrCol = prevLine->cursorX(attrCol, tabWidth); @@ -1499,7 +1499,7 @@ uint KateXmlIndent::processLine (uint line) if(indent < 0) indent = 0; // unindent lines that start with a close tag - if(kateLine->string().find(startsWithCloseTag) != -1) { + if(kateLine->string().tqfind(startsWithCloseTag) != -1) { indent -= indentWidth; } if(indent < 0) indent = 0; @@ -1760,7 +1760,7 @@ int KateCSAndSIndent::lastNonCommentChar( const KateDocCursor &line ) // find a possible start-of-comment int p = -2; // so the first find starts at position 0 - do p = str.find( "//", p + 2 ); + do p = str.tqfind( "//", p + 2 ); while ( p >= 0 && textLine->attribute(p) != commentAttrib && textLine->attribute(p) != doxyCommentAttrib ); // no // found? use whole string @@ -1917,8 +1917,8 @@ TQString KateCSAndSIndent::calcIndent (const KateDocCursor &begin) // if the line starts with # (but isn't a c# region thingy), no indentation at all. if( currLineFirst >= 0 && currLine->getChar(currLineFirst) == '#' ) { - if( !currLine->stringAtPos( currLineFirst+1, TQString::fromLatin1("region") ) && - !currLine->stringAtPos( currLineFirst+1, TQString::fromLatin1("endregion") ) ) + if( !currLine->stringAtPos( currLineFirst+1, TQString::tqfromLatin1("region") ) && + !currLine->stringAtPos( currLineFirst+1, TQString::tqfromLatin1("endregion") ) ) return TQString::null; } @@ -1974,10 +1974,10 @@ TQString KateCSAndSIndent::calcIndent (const KateDocCursor &begin) { #define ARRLEN( array ) ( sizeof(array)/sizeof(array[0]) ) for( uint n = 0; n < ARRLEN(scopeKeywords); ++n ) - if( textLine->stringAtPos(pos, TQString::fromLatin1(scopeKeywords[n]) ) ) + if( textLine->stringAtPos(pos, TQString::tqfromLatin1(scopeKeywords[n]) ) ) return calcIndentAfterKeyword( begin, cur, pos, false ); for( uint n = 0; n < ARRLEN(blockScopeKeywords); ++n ) - if( textLine->stringAtPos(pos, TQString::fromLatin1(blockScopeKeywords[n]) ) ) + if( textLine->stringAtPos(pos, TQString::tqfromLatin1(blockScopeKeywords[n]) ) ) return calcIndentAfterKeyword( begin, cur, pos, true ); #undef ARRLEN } @@ -2070,7 +2070,7 @@ TQString KateCSAndSIndent::calcIndentInBrace(const KateDocCursor &indentCursor, // beginning 'namespace'. that's 99% of usage, I'd guess. { if( braceFirst >= 0 && braceLine->attribute(braceFirst) == keywordAttrib && - braceLine->stringAtPos( braceFirst, TQString::fromLatin1( "namespace" ) ) ) + braceLine->stringAtPos( braceFirst, TQString::tqfromLatin1( "namespace" ) ) ) return continuationIndent(indentCursor) + whitespaceToOpenBrace; if( braceCursor.line() > 0 ) @@ -2078,7 +2078,7 @@ TQString KateCSAndSIndent::calcIndentInBrace(const KateDocCursor &indentCursor, KateTextLine::Ptr prevLine = doc->plainKateTextLine(braceCursor.line() - 1); int firstPrev = prevLine->firstChar(); if( firstPrev >= 0 && prevLine->attribute(firstPrev) == keywordAttrib && - prevLine->stringAtPos( firstPrev, TQString::fromLatin1( "namespace" ) ) ) + prevLine->stringAtPos( firstPrev, TQString::tqfromLatin1( "namespace" ) ) ) return continuationIndent(indentCursor) + whitespaceToOpenBrace; } } @@ -2112,7 +2112,7 @@ void KateCSAndSIndent::processChar(TQChar c) { // 'n' trigger is for c# regions. static const TQString triggers("}{)]/:;#n"); - if (triggers.find(c) == -1) + if (triggers.tqfind(c) == -1) return; // for historic reasons, processChar doesn't get a cursor diff --git a/kate/part/kateautoindent.h b/kate/part/kateautoindent.h index 7ff1a93d2..6c0d15d45 100644 --- a/kate/part/kateautoindent.h +++ b/kate/part/kateautoindent.h @@ -41,7 +41,7 @@ class KateDocument; * - Return @p true in @p KateAutoIndent::hasConfigPage() for the * corresponding indenter id. */ -class IndenterConfigPage : public QWidget +class IndenterConfigPage : public TQWidget { Q_OBJECT @@ -67,7 +67,7 @@ class IndenterConfigPage : public QWidget * This baseclass is a real dummy, does nothing beside remembering the document it belongs too, * only to have the object around */ -class KateAutoIndent : public QObject +class KateAutoIndent : public TQObject { Q_OBJECT diff --git a/kate/part/katebookmarks.cpp b/kate/part/katebookmarks.cpp index ac1ee73d9..a6de77841 100644 --- a/kate/part/katebookmarks.cpp +++ b/kate/part/katebookmarks.cpp @@ -176,7 +176,7 @@ void KateBookmarks::insertBookmarks( TQPopupMenu& menu ) { sortArray[i] = (*it)->line; ssort( sortArray, i ); - idx = sortArray.find( (*it)->line ) + 3; + idx = sortArray.tqfind( (*it)->line ) + 3; } menu.insertItem( diff --git a/kate/part/katebookmarks.h b/kate/part/katebookmarks.h index 88e90ae4f..63928800e 100644 --- a/kate/part/katebookmarks.h +++ b/kate/part/katebookmarks.h @@ -35,7 +35,7 @@ class KActionCollection; class TQPopupMenu; class TQMenuData; -class KateBookmarks : public QObject +class KateBookmarks : public TQObject { Q_OBJECT diff --git a/kate/part/katebuffer.cpp b/kate/part/katebuffer.cpp index 74a9ba59e..e62efcf39 100644 --- a/kate/part/katebuffer.cpp +++ b/kate/part/katebuffer.cpp @@ -46,7 +46,7 @@ * loader block size, load 256 kb at once per default * if file size is smaller, fall back to file size */ -static const Q_ULONG KATE_FILE_LOADER_BS = 256 * 1024; +static const TQ_ULONG KATE_FILE_LOADER_BS = 256 * 1024; /** * KATE_AVG_BLOCK_SIZE is in characters ! @@ -54,8 +54,8 @@ static const Q_ULONG KATE_FILE_LOADER_BS = 256 * 1024; * block will max contain around BLOCK_SIZE chars or * BLOCK_LINES lines (after load, later that won't be tracked) */ -static const Q_ULONG KATE_AVG_BLOCK_SIZE = 2048 * 80; -static const Q_ULONG KATE_MAX_BLOCK_LINES = 2048; +static const TQ_ULONG KATE_AVG_BLOCK_SIZE = 2048 * 80; +static const TQ_ULONG KATE_MAX_BLOCK_LINES = 2048; /** * hl will look at the next KATE_HL_LOOKAHEAD lines @@ -172,10 +172,10 @@ class KateFileLoader // should spaces be ignored at end of line? inline bool removeTrailingSpaces () const { return m_removeTrailingSpaces; } - // internal unicode data array - inline const TQChar *unicode () const { return m_text.unicode(); } + // internal tqunicode data array + inline const TQChar *tqunicode () const { return m_text.tqunicode(); } - // read a line, return length + offset in unicode data + // read a line, return length + offset in tqunicode 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 unicode encodings which can encode all chars + // hardcode some tqunicode encodings which can encode all chars if ((TQString(codec->name()) == "UTF-8") || (TQString(codec->name()) == "ISO-10646-UCS-2")) return true; @@ -849,7 +849,7 @@ void KateBuffer::setTabWidth (uint w) m_tabWidth = w; if (m_highlight && m_highlight->foldingIndentationSensitive()) - invalidateHighlighting(); + tqinvalidateHighlighting(); } } @@ -860,12 +860,12 @@ void KateBuffer::setHighlight(uint hlMode) // aha, hl will change if (h != m_highlight) { - bool invalidate = !h->noHighlighting(); + bool tqinvalidate = !h->noHighlighting(); if (m_highlight) { m_highlight->release(); - invalidate = true; + tqinvalidate = true; } h->use(); @@ -880,8 +880,8 @@ void KateBuffer::setHighlight(uint hlMode) m_highlight = h; - if (invalidate) - invalidateHighlighting(); + if (tqinvalidate) + tqinvalidateHighlighting(); // inform the document that the hl was really changed // needed to update attributes and more ;) @@ -889,7 +889,7 @@ void KateBuffer::setHighlight(uint hlMode) } } -void KateBuffer::invalidateHighlighting() +void KateBuffer::tqinvalidateHighlighting() { m_lineHighlightedMax = 0; m_lineHighlighted = 0; @@ -949,7 +949,7 @@ void KateBuffer::addIndentBasedFoldingInformation(TQMemArray<uint> &foldingList, } } -bool KateBuffer::doHighlight (KateBufBlock *buf, uint startLine, uint endLine, bool invalidate) +bool KateBuffer::doHighlight (KateBufBlock *buf, uint startLine, uint endLine, bool tqinvalidate) { // no hl around, no stuff to do if (!m_highlight) @@ -971,13 +971,13 @@ bool KateBuffer::doHighlight (KateBufBlock *buf, uint startLine, uint endLine, b //kdDebug (13020) << "HL UNTIL LINE: " << m_lineHighlighted << " MAX: " << m_lineHighlightedMax << endl; //kdDebug (13020) << "HL DYN COUNT: " << KateHlManager::self()->countDynamicCtxs() << " MAX: " << m_maxDynamicContexts << endl; - // see if there are too many dynamic contexts; if yes, invalidate HL of all documents + // see if there are too many dynamic contexts; if yes, tqinvalidate HL of all documents if (KateHlManager::self()->countDynamicCtxs() >= m_maxDynamicContexts) { { if (KateHlManager::self()->resetDynamicCtxs()) { - kdDebug (13020) << "HL invalidated - too many dynamic contexts ( >= " << m_maxDynamicContexts << ")" << endl; + kdDebug (13020) << "HL tqinvalidated - too many dynamic contexts ( >= " << m_maxDynamicContexts << ")" << endl; // avoid recursive invalidation KateHlManager::self()->setForceNoDCReset(true); @@ -1240,7 +1240,7 @@ bool KateBuffer::doHighlight (KateBufBlock *buf, uint startLine, uint endLine, b buf->markDirty (); // tag the changed lines ! - if (invalidate) + if (tqinvalidate) emit tagLines (startLine, current_line + buf->startLine()); // emit that we have changed the folding @@ -1353,14 +1353,14 @@ void KateBufBlock::fillBlock (KateFileLoader *stream) { uint offset = 0, length = 0; stream->readLine(offset, length); - const TQChar *unicodeData = stream->unicode () + offset; + const TQChar *tqunicodeData = stream->tqunicode () + offset; // strip spaces at end of line if ( stream->removeTrailingSpaces() ) { while (length > 0) { - if (unicodeData[length-1].isSpace()) + if (tqunicodeData[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 *) unicodeData, sizeof(TQChar)*length); + memcpy(buf+pos, (char *) tqunicodeData, sizeof(TQChar)*length); pos += sizeof(TQChar)*length; } else { KateTextLine::Ptr textLine = new KateTextLine (); - textLine->insertText (0, length, unicodeData); + textLine->insertText (0, length, tqunicodeData); m_stringList.push_back (textLine); } diff --git a/kate/part/katebuffer.h b/kate/part/katebuffer.h index 602571c53..43430ec2c 100644 --- a/kate/part/katebuffer.h +++ b/kate/part/katebuffer.h @@ -116,7 +116,7 @@ class KateBufBlock void removeLine(uint i); /** - * mark this block as dirty, will invalidate the swap data + * mark this block as dirty, will tqinvalidate the swap data * insert/removeLine will mark the block dirty itself */ void markDirty (); @@ -338,7 +338,7 @@ class KateBufBlockList * @author Waldo Bastian <bastian@kde.org> * @author Christoph Cullmann <cullmann@kde.org> */ -class KateBuffer : public QObject +class KateBuffer : public TQObject { Q_OBJECT @@ -591,7 +591,7 @@ class KateBuffer : public QObject /** * Invalidate highlighting of whole buffer. */ - void invalidateHighlighting(); + void tqinvalidateHighlighting(); KateCodeFoldingTree *foldingTree () { return &m_regionTree; }; @@ -611,7 +611,7 @@ class KateBuffer : public QObject * @returns true when the highlighting in the next block needs to be updated, * false otherwise. */ - bool doHighlight (KateBufBlock *buf, uint from, uint to, bool invalidate); + bool doHighlight (KateBufBlock *buf, uint from, uint to, bool tqinvalidate); signals: /** diff --git a/kate/part/katecmds.cpp b/kate/part/katecmds.cpp index b64b5414e..27dd22a82 100644 --- a/kate/part/katecmds.cpp +++ b/kate/part/katecmds.cpp @@ -303,7 +303,7 @@ static void replace(TQString &s, const TQString &needle, const TQString &with) int pos=0; while (1) { - pos=s.find(needle, pos); + pos=s.tqfind(needle, pos); if (pos==-1) break; s.replace(pos, needle.length(), with); pos+=with.length(); @@ -578,7 +578,7 @@ bool KateCommands::Character::exec (Kate::View *view, const TQString &_cmd, TQSt view->insertText(TQString(buf)); } else - { // do the unicode thing + { // do the tqunicode thing TQChar c(number); view->insertText(TQString(&c, 1)); } @@ -593,10 +593,10 @@ bool KateCommands::Date::exec (Kate::View *view, const TQString &cmd, TQString & if (cmd.left(4) != "date") return false; - if (TQDateTime::currentDateTime().toString(cmd.mid(5, cmd.length()-5)).length() > 0) - view->insertText(TQDateTime::currentDateTime().toString(cmd.mid(5, cmd.length()-5))); + if (TQDateTime::tqcurrentDateTime().toString(cmd.mid(5, cmd.length()-5)).length() > 0) + view->insertText(TQDateTime::tqcurrentDateTime().toString(cmd.mid(5, cmd.length()-5))); else - view->insertText(TQDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss")); + view->insertText(TQDateTime::tqcurrentDateTime().toString("yyyy-MM-dd hh:mm:ss")); return true; } diff --git a/kate/part/katecmds.h b/kate/part/katecmds.h index 55c8d807b..e55e2ac8b 100644 --- a/kate/part/katecmds.h +++ b/kate/part/katecmds.h @@ -119,7 +119,7 @@ class SedReplace : public Kate::Command }; /** - * insert a unicode or ascii character + * insert a tqunicode or ascii character * base 9+1: 1234 * hex: 0x1234 or x1234 * octal: 01231 diff --git a/kate/part/katecodecompletion.cpp b/kate/part/katecodecompletion.cpp index cee99f9d4..e7f11b994 100644 --- a/kate/part/katecodecompletion.cpp +++ b/kate/part/katecodecompletion.cpp @@ -47,7 +47,7 @@ /** * This class is used as the codecompletion listbox. It can be resized according to its contents, - * therfor the needed size is provided by sizeHint(); + * therfor the needed size is provided by tqsizeHint(); *@short Listbox showing codecompletion *@author Jonas B. Jacobi <j.jacobi@gmx.de> */ @@ -61,7 +61,7 @@ class KateCCListBox : public QListBox { } - TQSize sizeHint() const + TQSize tqsizeHint() const { int count = this->count(); int height = 20; @@ -124,7 +124,7 @@ KateCodeCompletion::KateCodeCompletion( KateView* view ) m_completionListBox->installEventFilter( this ); - m_completionPopup->resize(m_completionListBox->sizeHint() + TQSize(2,2)); + m_completionPopup->resize(m_completionListBox->tqsizeHint() + TQSize(2,2)); m_completionPopup->installEventFilter( this ); m_completionPopup->setFocusProxy( m_view->m_viewInternal ); @@ -305,7 +305,7 @@ void KateCodeCompletion::updateBox( bool ) } kdDebug(13035)<<"KateCodeCompletion::updateBox: Resizing widget"<<endl; - m_completionPopup->resize(m_completionListBox->sizeHint() + TQSize(2,2)); + m_completionPopup->resize(m_completionListBox->tqsizeHint() + TQSize(2,2)); TQPoint p = m_view->mapToGlobal( m_view->cursorCoordinates() ); int x = p.x(); int y = p.y() ; @@ -384,7 +384,7 @@ void KateCodeCompletion::showComment() m_completionListBox->ensureCurrentVisible(); finalPoint.setY( - m_completionListBox->viewport()->mapToGlobal(m_completionListBox->itemRect( + m_completionListBox->viewport()->mapToGlobal(m_completionListBox->tqitemRect( m_completionListBox->item(m_completionListBox->currentItem())).topLeft()).y()); m_commentLabel->move(finalPoint); diff --git a/kate/part/katecodecompletion.h b/kate/part/katecodecompletion.h index 34d620599..a8c4e5afe 100644 --- a/kate/part/katecodecompletion.h +++ b/kate/part/katecodecompletion.h @@ -44,7 +44,7 @@ class KateCCListBox; class TQLayout; class TQVBox; -class KateCodeCompletionCommentLabel : public QLabel +class KateCodeCompletionCommentLabel : public TQLabel { Q_OBJECT @@ -57,14 +57,14 @@ class KateCodeCompletionCommentLabel : public QLabel setAutoMask( false ); setFrameStyle( TQFrame::Plain | TQFrame::Box ); setLineWidth( 1 ); - setAlignment( AlignAuto | AlignTop ); + tqsetAlignment( AlignAuto | AlignTop ); polish(); setText(text); adjustSize(); } }; -class KateCodeCompletion : public QObject +class KateCodeCompletion : public TQObject { Q_OBJECT @@ -114,7 +114,7 @@ class KateCodeCompletion : public QObject KateCodeCompletionCommentLabel* m_commentLabel; }; -class KateArgHint: public QFrame +class KateArgHint: public TQFrame { Q_OBJECT diff --git a/kate/part/katecodefoldinghelpers.h b/kate/part/katecodefoldinghelpers.h index bea6a096c..7feee384e 100644 --- a/kate/part/katecodefoldinghelpers.h +++ b/kate/part/katecodefoldinghelpers.h @@ -113,7 +113,7 @@ class KateCodeFoldingNode TQMemArray<KateCodeFoldingNode*> m_children; }; -class KateCodeFoldingTree : public QObject +class KateCodeFoldingTree : public TQObject { friend class KateCodeFoldingNode; diff --git a/kate/part/kateconfig.cpp b/kate/part/kateconfig.cpp index 4b3c2f52b..3158f32db 100644 --- a/kate/part/kateconfig.cpp +++ b/kate/part/kateconfig.cpp @@ -422,7 +422,7 @@ TQTextCodec *KateDocumentConfig::codec () if (m_encodingSet || isGlobal()) { if (m_encoding.isEmpty() && isGlobal()) - return KGlobal::charsets()->codecForName (TQString::fromLatin1(KGlobal::locale()->encoding())); + return KGlobal::charsets()->codecForName (TQString::tqfromLatin1(KGlobal::locale()->encoding())); else if (m_encoding.isEmpty()) return s_global->codec (); else diff --git a/kate/part/katecursor.h b/kate/part/katecursor.h index c155abba4..1b1a5322a 100644 --- a/kate/part/katecursor.h +++ b/kate/part/katecursor.h @@ -61,7 +61,7 @@ class KateTextCursor } #ifndef Q_WS_WIN //not needed - friend void qSwap(KateTextCursor & c1, KateTextCursor & c2) { + friend void tqSwap(KateTextCursor & c1, KateTextCursor & c2) { KateTextCursor tmp = c1; c1 = c2; c2 = tmp; @@ -200,7 +200,7 @@ class KateTextRange : public KateRange inline void normalize() { if( m_start > m_end ) - qSwap(m_start, m_end); + tqSwap(m_start, m_end); } protected: diff --git a/kate/part/katedialogs.cpp b/kate/part/katedialogs.cpp index d3a481856..366085c83 100644 --- a/kate/part/katedialogs.cpp +++ b/kate/part/katedialogs.cpp @@ -712,7 +712,7 @@ KateViewDefaultsConfig::KateViewDefaultsConfig(TQWidget *parent) "you to set a maximum width of the screen, as a percentage, after which " "dynamically wrapped lines will no longer be vertically aligned. For " "example, at 50%, lines whose indentation levels are deeper than 50% of " - "the width of the screen will not have vertical alignment applied to " + "the width of the screen will not have vertical tqalignment applied to " "subsequent wrapped lines.</p>")); TQWhatsThis::add(m_line,i18n( "If this option is checked, every new view will display line numbers " @@ -1388,10 +1388,10 @@ void KateHlConfigPage::hlChanged(int z) return; } - if ( !hlDataDict.find( z ) ) + if ( !hlDataDict.tqfind( z ) ) hlDataDict.insert( z, hl->getData() ); - hlData = hlDataDict.find( z ); + hlData = hlDataDict.tqfind( z ); wildcards->setText(hlData->wildcards); mimetypes->setText(hlData->mimetypes); priority->setValue(hlData->priority); diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp index fe5e22b1d..e32636cb8 100644 --- a/kate/part/katedocument.cpp +++ b/kate/part/katedocument.cpp @@ -91,7 +91,7 @@ class KatePartPluginItem // KateDocument Constructor // KateDocument::KateDocument ( bool bSingleViewMode, bool bBrowserView, - bool bReadOnly, TQWidget *parentWidget, + bool bReadOnly, TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name) : Kate::Document(parent, name), m_plugins (KateFactory::self()->plugins().count()), @@ -214,7 +214,7 @@ KateDocument::KateDocument ( bool bSingleViewMode, bool bBrowserView, // if single view mode, like in the konqui embedding, create a default view ;) if ( m_bSingleViewMode ) { - KTextEditor::View *view = createView( parentWidget, widgetName ); + KTextEditor::View *view = createView( tqparentWidget, widgetName ); insertChildClient( view ); view->show(); setWidget( view ); @@ -1176,7 +1176,7 @@ bool KateDocument::editInsertText ( uint line, uint col, const TQString &str ) uint tw = config()->tabWidth(); int pos = 0; uint l = 0; - while ( (pos = s.find('\t')) > -1 ) + while ( (pos = s.tqfind('\t')) > -1 ) { l = tw - ( (col + pos)%tw ); s.replace( pos, 1, TQString().fill( ' ', l ) ); @@ -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.unicode()); + l->insertText (col, s.length(), s.tqunicode()); // 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.unicode(), 0); + tl->insertText (0, s.length(), s.tqunicode(), 0); m_buffer->insertLine(line, tl); m_buffer->changeLine(line); @@ -2050,7 +2050,7 @@ void KateDocument::clearMark( uint line ) emit marksChanged(); delete mark; tagLines( line, line ); - repaintViews(true); + tqrepaintViews(true); } void KateDocument::addMark( uint line, uint markType ) @@ -2087,7 +2087,7 @@ void KateDocument::addMark( uint line, uint markType ) emit marksChanged(); tagLines( line, line ); - repaintViews(true); + tqrepaintViews(true); } void KateDocument::removeMark( uint line, uint markType ) @@ -2119,7 +2119,7 @@ void KateDocument::removeMark( uint line, uint markType ) emit marksChanged(); tagLines( line, line ); - repaintViews(true); + tqrepaintViews(true); } TQPtrList<KTextEditor::Mark> KateDocument::marks() @@ -2146,7 +2146,7 @@ void KateDocument::clearMarks() m_marks.clear(); emit marksChanged(); - repaintViews(true); + tqrepaintViews(true); } void KateDocument::setPixmap( MarkInterface::MarkTypes type, const TQPixmap& pixmap ) @@ -2316,7 +2316,7 @@ bool KateDocument::openURL( const KURL &url ) w = m_views.first(); if (w) - m_job->setWindow (w->topLevelWidget()); + m_job->setWindow (w->tqtopLevelWidget()); emit started( m_job ); @@ -2395,7 +2395,7 @@ bool KateDocument::openFile(KIO::Job * job) // service type magic to get encoding right // TQString serviceType = m_extension->urlArgs().serviceType.simplifyWhiteSpace(); - int pos = serviceType.find(';'); + int pos = serviceType.tqfind(';'); if (pos != -1) setEncoding (serviceType.mid(pos+1)); @@ -2589,7 +2589,7 @@ bool KateDocument::saveFile() // if (!m_buffer->canEncode () && (KMessageBox::warningContinueCancel(0, - 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)) + 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)) { return false; } @@ -2872,7 +2872,7 @@ void KateDocument::makeAttribs(bool needInvalidate) m_views.at(z)->renderer()->updateAttributes (); if (needInvalidate) - m_buffer->invalidateHighlighting(); + m_buffer->tqinvalidateHighlighting(); tagAll (); } @@ -3195,7 +3195,7 @@ void KateDocument::backspace( KateView *view, const KateTextCursor& c ) if (!textLine) return; - if (config()->wordWrap() && textLine->endingWith(TQString::fromLatin1(" "))) + if (config()->wordWrap() && textLine->endingWith(TQString::tqfromLatin1(" "))) { // gg: in hard wordwrap mode, backspace must also eat the trailing space removeText (line-1, textLine->length()-1, line, 0); @@ -4112,10 +4112,10 @@ void KateDocument::tagLines(KateTextCursor start, KateTextCursor end) m_views.at(z)->tagLines(start, end, true); } -void KateDocument::repaintViews(bool paintOnlyDirty) +void KateDocument::tqrepaintViews(bool paintOnlyDirty) { for (uint z = 0; z < m_views.count(); z++) - m_views.at(z)->repaintText(paintOnlyDirty); + m_views.at(z)->tqrepaintText(paintOnlyDirty); } void KateDocument::tagAll() @@ -4634,7 +4634,7 @@ void KateDocument::readVariableLine( TQString t, bool onlyViewAndRenderer ) { // simple check first, no regex // no kate inside, no vars, simple... - if (t.find("kate") < 0) + if (t.tqfind("kate") < 0) return; // found vars, if any diff --git a/kate/part/katedocument.h b/kate/part/katedocument.h index 46e9e87f8..37d9b24e9 100644 --- a/kate/part/katedocument.h +++ b/kate/part/katedocument.h @@ -91,7 +91,7 @@ class KateDocument : public Kate::Document, public: KateDocument (bool bSingleViewMode=false, bool bBrowserView=false, bool bReadOnly=false, - TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject * = 0, const char * = 0); + TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject * = 0, const char * = 0); ~KateDocument (); bool closeURL(); @@ -608,7 +608,7 @@ class KateDocument : public Kate::Document, void setConfigFlags (uint flags); // Repaint all of all of the views - void repaintViews(bool paintOnlyDirty = true); + void tqrepaintViews(bool paintOnlyDirty = true); inline KateHighlighting *highlight () { return m_buffer->highlight(); } diff --git a/kate/part/katefactory.cpp b/kate/part/katefactory.cpp index 64bde8718..9bd00bfbc 100644 --- a/kate/part/katefactory.cpp +++ b/kate/part/katefactory.cpp @@ -48,7 +48,7 @@ class KateFactoryPublic : public KParts::Factory public: /** * reimplemented create object method - * @param parentWidget parent widget + * @param tqparentWidget parent widget * @param widgetName widget name * @param parent TQObject parent * @param name object name @@ -56,9 +56,9 @@ class KateFactoryPublic : public KParts::Factory * @param args additional arguments * @return constructed part object */ - KParts::Part *createPartObject ( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args ) + KParts::Part *createPartObject ( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args ) { - return KateFactory::self()->createPartObject (parentWidget, widgetName, parent, name, classname, args); + return KateFactory::self()->createPartObject (tqparentWidget, widgetName, parent, name, classname, args); } }; @@ -206,14 +206,14 @@ KateFactory *KateFactory::self () return s_self; } -KParts::Part *KateFactory::createPartObject ( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *_classname, const TQStringList & ) +KParts::Part *KateFactory::createPartObject ( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *_classname, const TQStringList & ) { TQCString classname( _classname ); bool bWantSingleView = ( classname != "KTextEditor::Document" && classname != "Kate::Document" ); bool bWantBrowserView = ( classname == "Browser/View" ); bool bWantReadOnly = (bWantBrowserView || ( classname == "KParts::ReadOnlyPart" )); - KParts::ReadWritePart *part = new KateDocument (bWantSingleView, bWantBrowserView, bWantReadOnly, parentWidget, widgetName, parent, name); + KParts::ReadWritePart *part = new KateDocument (bWantSingleView, bWantBrowserView, bWantReadOnly, tqparentWidget, widgetName, parent, name); part->setReadWrite( !bWantReadOnly ); return part; diff --git a/kate/part/katefactory.h b/kate/part/katefactory.h index 0fd939ce3..4c1ce0706 100644 --- a/kate/part/katefactory.h +++ b/kate/part/katefactory.h @@ -71,7 +71,7 @@ class KateFactory /** * reimplemented create object method - * @param parentWidget parent widget + * @param tqparentWidget parent widget * @param widgetName widget name * @param parent TQObject parent * @param name object name @@ -79,7 +79,7 @@ class KateFactory * @param args additional arguments * @return constructed part object */ - KParts::Part *createPartObject ( TQWidget *parentWidget, const char *widgetName, + KParts::Part *createPartObject ( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args ); diff --git a/kate/part/katefont.h b/kate/part/katefont.h index 1ab3b3463..f9e0c1d83 100644 --- a/kate/part/katefont.h +++ b/kate/part/katefont.h @@ -29,7 +29,7 @@ // KateFontMetrics implementation // -class KateFontMetrics : public QFontMetrics +class KateFontMetrics : public TQFontMetrics { public: KateFontMetrics(const TQFont& f); diff --git a/kate/part/katehighlight.cpp b/kate/part/katehighlight.cpp index 50c941c15..a18267f3b 100644 --- a/kate/part/katehighlight.cpp +++ b/kate/part/katehighlight.cpp @@ -65,10 +65,10 @@ static const int KATE_DYNAMIC_CONTEXTS_RESET_DELAY = 30 * 1000; inline bool kateInsideString (const TQString &str, TQChar ch) { - const TQChar *unicode = str.unicode(); + const TQChar *tqunicode = str.tqunicode(); const uint len = str.length(); for (uint i=0; i < len; i++) - if (unicode[i] == ch) + if (tqunicode[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.unicode() + offset, wordLen).string()) ) + if ( dict[wordLen] && dict[wordLen]->find(TQConstString(text.tqunicode() + offset, wordLen).string()) ) return offset2; return 0; @@ -2088,14 +2088,14 @@ TQString KateHighlighting::hlKeyForAttrib( int i ) const bool KateHighlighting::isInWord( TQChar c, int attrib ) const { - return m_additionalData[ hlKeyForAttrib( attrib ) ]->deliminator.find(c) < 0 + return m_additionalData[ hlKeyForAttrib( attrib ) ]->deliminator.tqfind(c) < 0 && !c.isSpace() && c != '"' && c != '\''; } bool KateHighlighting::canBreakAt( TQChar c, int attrib ) const { static const TQString& sq = KGlobal::staticQString("\"'"); - return (m_additionalData[ hlKeyForAttrib( attrib ) ]->wordWrapDeliminator.find(c) != -1) && (sq.find(c) == -1); + return (m_additionalData[ hlKeyForAttrib( attrib ) ]->wordWrapDeliminator.tqfind(c) != -1) && (sq.tqfind(c) == -1); } signed char KateHighlighting::commentRegion(int attr) const { @@ -2367,7 +2367,7 @@ int KateHighlighting::getIdFromString(TQStringList *ContextNameList, TQString tm else if ( tmpLineEndContext.contains("##")) { - int o = tmpLineEndContext.find("##"); + int o = tmpLineEndContext.tqfind("##"); // FIXME at least with 'foo##bar'-style contexts the rules are picked up // but the default attribute is not TQString tmp=tmpLineEndContext.mid(o+2); @@ -2477,7 +2477,7 @@ void KateHighlighting::makeContextList() kdDebug(13010)<<"Looking up context0 for ruleset "<<incCtx<<endl; incCtx = incCtx.left(incCtx.length()-1); //try to find the context0 id for a given unresolvedReference - KateEmbeddedHlInfos::const_iterator hlIt=embeddedHls.find(incCtx); + KateEmbeddedHlInfos::const_iterator hlIt=embeddedHls.tqfind(incCtx); if (hlIt!=embeddedHls.end()) *(unresIt.key())=hlIt.data().context0; } @@ -2765,7 +2765,7 @@ int KateHighlighting::addToContextList(const TQString &ident, int ctx0) // only context refernces of type Name, ##Name, and Subname##Name are allowed if (incCtx.startsWith("##") || (!incCtx.startsWith("#"))) { - int incCtxi = incCtx.find("##"); + int incCtxi = incCtx.tqfind("##"); //#stay, #pop is not interesting here if (incCtxi >= 0) { diff --git a/kate/part/katehighlight.h b/kate/part/katehighlight.h index b42fccb62..8bdc73b39 100644 --- a/kate/part/katehighlight.h +++ b/kate/part/katehighlight.h @@ -213,7 +213,7 @@ class KateHighlighting inline bool noHighlighting () const { return noHl; }; - // be carefull: all documents hl should be invalidated after calling this method! + // be carefull: all documents hl should be tqinvalidated after calling this method! void dropDynamicContexts(); TQString indentation () { return m_indentation; } @@ -338,7 +338,7 @@ class KateHighlighting inline bool allowsFolding(){return folding;} }; -class KateHlManager : public QObject +class KateHlManager : public TQObject { Q_OBJECT @@ -357,7 +357,7 @@ class KateHlManager : public QObject int detectHighlighting (class KateDocument *doc); - int findHl(KateHighlighting *h) {return hlList.find(h);} + int findHl(KateHighlighting *h) {return hlList.tqfind(h);} TQString identifierForName(const TQString&); // methodes to get the default style count + names @@ -377,7 +377,7 @@ class KateHlManager : public QObject uint countDynamicCtxs() { return dynamicCtxsCount; }; void setForceNoDCReset(bool b) { forceNoDCReset = b; }; - // be carefull: all documents hl should be invalidated after having successfully called this method! + // be carefull: all documents hl should be tqinvalidated after having successfully called this method! bool resetDynamicCtxs(); signals: diff --git a/kate/part/katejscript.cpp b/kate/part/katejscript.cpp index 75f5fc513..a9efac0e9 100644 --- a/kate/part/katejscript.cpp +++ b/kate/part/katejscript.cpp @@ -62,7 +62,7 @@ UString::UString(const TQString &d) { unsigned int len = d.length(); UChar *dat = new UChar[len]; - memcpy(dat, d.unicode(), len * sizeof(UChar)); + memcpy(dat, d.tqunicode(), len * sizeof(UChar)); rep = UString::Rep::create(dat, len); } diff --git a/kate/part/kateprinter.cpp b/kate/part/kateprinter.cpp index e0dbdc728..f0f73aad0 100644 --- a/kate/part/kateprinter.cpp +++ b/kate/part/kateprinter.cpp @@ -184,7 +184,7 @@ bool KatePrinter::print (KateDocument *doc) // This retrieves all tags, ued or not, but // none of theese operations should be expensive, // and searcing each tag in the format strings is avoided. - TQDateTime dt = TQDateTime::currentDateTime(); + TQDateTime dt = TQDateTime::tqcurrentDateTime(); TQMap<TQString,TQString> tags; KUser u (KUser::UseRealUserID); @@ -425,7 +425,7 @@ bool KatePrinter::print (KateDocument *doc) for (int i=0; i<3; i++) { s = headerTagList[i]; - if (s.find("%p") != -1) s.replace("%p", TQString::number(currentPage)); + if (s.tqfind("%p") != -1) s.replace("%p", TQString::number(currentPage)); paint.drawText(marg, 0, headerWidth-(marg*2), headerHeight, align, s); align = valign|(i == 0 ? Qt::AlignHCenter : Qt::AlignRight); } @@ -453,7 +453,7 @@ bool KatePrinter::print (KateDocument *doc) for (int i=0; i<3; i++) { s = footerTagList[i]; - if (s.find("%p") != -1) s.replace("%p", TQString::number(currentPage)); + if (s.tqfind("%p") != -1) s.replace("%p", TQString::number(currentPage)); paint.drawText(marg, maxHeight+innerMargin, headerWidth-(marg*2), footerHeight, align, s); align = Qt::AlignVCenter|(i == 0 ? Qt::AlignHCenter : Qt::AlignRight); } diff --git a/kate/part/katerenderer.cpp b/kate/part/katerenderer.cpp index 265a98282..59b237f57 100644 --- a/kate/part/katerenderer.cpp +++ b/kate/part/katerenderer.cpp @@ -537,13 +537,13 @@ void KateRenderer::paintTextLine(TQPainter& paint, const KateLineRange* range, i if (isIMSel && !isTab) { // input method selection - fillColor = m_view->colorGroup().color(TQColorGroup::Foreground); + fillColor = m_view->tqcolorGroup().color(TQColorGroup::Foreground); } else if (isIMEdit && !isTab) { // XIM support // input method edit area - const TQColorGroup& cg = m_view->colorGroup(); + const TQColorGroup& cg = m_view->tqcolorGroup(); int h1, s1, v1, h2, s2, v2; cg.color( TQColorGroup::Base ).hsv( &h1, &s1, &v1 ); cg.color( TQColorGroup::Background ).hsv( &h2, &s2, &v2 ); @@ -576,7 +576,7 @@ void KateRenderer::paintTextLine(TQPainter& paint, const KateLineRange* range, i if (isIMSel && paintBackground && !isTab) { paint.save(); - paint.setPen( m_view->colorGroup().color( TQColorGroup::BrightText ) ); + paint.setPen( m_view->tqcolorGroup().color( TQColorGroup::BrightText ) ); } // Draw indentation markers. @@ -745,7 +745,7 @@ uint KateRenderer::textWidth(const KateTextLine::Ptr &textLine, int cursorCol) KateFontStruct *fs = config()->fontStruct(); - const TQChar *unicode = textLine->text(); + const TQChar *tqunicode = 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 && unicode[z] == TQChar('\t')) + if (z < len && tqunicode[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 *unicode = textLine->text(); + const TQChar *tqunicode = 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 (unicode[z] == TQChar('\t')) + if (tqunicode[z] == TQChar('\t')) x -= x % width; - if (unicode[z].isSpace()) + if (tqunicode[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 *unicode = textLine->text(); + const TQChar *tqunicode = 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 && unicode[z] == TQChar('\t')) + if (z < len && tqunicode[z] == TQChar('\t')) x -= x % width; z++; diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp index 6e73a9f75..76e187c8c 100644 --- a/kate/part/kateschema.cpp +++ b/kate/part/kateschema.cpp @@ -281,19 +281,19 @@ KateSchemaConfigColorTab::KateSchemaConfigColorTab( TQWidget *parent, const char b = new TQHBox (gbTextArea); b->setSpacing(KDialog::spacingHint()); label = new TQLabel( i18n("Normal text:"), b); - label->setAlignment( AlignLeft|AlignVCenter); + label->tqsetAlignment( AlignLeft|AlignVCenter); m_back = new KColorButton(b); b = new TQHBox (gbTextArea); b->setSpacing(KDialog::spacingHint()); label = new TQLabel( i18n("Selected text:"), b); - label->setAlignment( AlignLeft|AlignVCenter); + label->tqsetAlignment( AlignLeft|AlignVCenter); m_selected = new KColorButton(b); b = new TQHBox (gbTextArea); b->setSpacing(KDialog::spacingHint()); label = new TQLabel( i18n("Current line:"), b); - label->setAlignment( AlignLeft|AlignVCenter); + label->tqsetAlignment( AlignLeft|AlignVCenter); m_current = new KColorButton(b); // Markers from kdelibs/interfaces/ktextinterface/markinterface.h @@ -319,31 +319,31 @@ KateSchemaConfigColorTab::KateSchemaConfigColorTab( TQWidget *parent, const char b = new TQHBox (gbBorder); b->setSpacing(KDialog::spacingHint()); label = new TQLabel( i18n("Left border background:"), b); - label->setAlignment( AlignLeft|AlignVCenter); + label->tqsetAlignment( AlignLeft|AlignVCenter); m_iconborder = new KColorButton(b); b = new TQHBox (gbBorder); b->setSpacing(KDialog::spacingHint()); label = new TQLabel( i18n("Line numbers:"), b); - label->setAlignment( AlignLeft|AlignVCenter); + label->tqsetAlignment( AlignLeft|AlignVCenter); m_linenumber = new KColorButton(b); b = new TQHBox (gbBorder); b->setSpacing(KDialog::spacingHint()); label = new TQLabel( i18n("Bracket highlight:"), b); - label->setAlignment( AlignLeft|AlignVCenter); + label->tqsetAlignment( AlignLeft|AlignVCenter); m_bracket = new KColorButton(b); b = new TQHBox (gbBorder); b->setSpacing(KDialog::spacingHint()); label = new TQLabel( i18n("Word wrap markers:"), b); - label->setAlignment( AlignLeft|AlignVCenter); + label->tqsetAlignment( AlignLeft|AlignVCenter); m_wwmarker = new KColorButton(b); b = new TQHBox (gbBorder); b->setSpacing(KDialog::spacingHint()); label = new TQLabel( i18n("Tab markers:"), b); - label->setAlignment( AlignLeft|AlignVCenter); + label->tqsetAlignment( AlignLeft|AlignVCenter); m_tmarker = new KColorButton(b); blay->addWidget(gbBorder); @@ -351,7 +351,7 @@ KateSchemaConfigColorTab::KateSchemaConfigColorTab( TQWidget *parent, const char blay->addStretch(); // connect signal changed(); changed is emitted by a ColorButton change! - connect( this, TQT_SIGNAL( changed() ), parent->parentWidget(), TQT_SLOT( slotChanged() ) ); + connect( this, TQT_SIGNAL( changed() ), parent->tqparentWidget(), TQT_SLOT( slotChanged() ) ); // TQWhatsThis help TQWhatsThis::add(m_back, i18n("<p>Sets the background color of the editing area.</p>")); @@ -545,7 +545,7 @@ KateSchemaConfigFontTab::KateSchemaConfigFontTab( TQWidget *parent, const char * m_fontchooser->enableColumn(KFontChooser::StyleList, false); grid->addWidget( m_fontchooser, 0, 0); - connect (this, TQT_SIGNAL( changed()), parent->parentWidget(), TQT_SLOT (slotChanged())); + connect (this, TQT_SIGNAL( changed()), parent->tqparentWidget(), TQT_SLOT (slotChanged())); m_schema = -1; } @@ -599,7 +599,7 @@ KateSchemaConfigFontColorTab::KateSchemaConfigFontColorTab( TQWidget *parent, co m_defaultStyles = new KateStyleListView( this, false ); grid->addWidget( m_defaultStyles, 0, 0); - connect (m_defaultStyles, TQT_SIGNAL (changed()), parent->parentWidget(), TQT_SLOT (slotChanged())); + connect (m_defaultStyles, TQT_SIGNAL (changed()), parent->tqparentWidget(), TQT_SLOT (slotChanged())); TQWhatsThis::add( m_defaultStyles, i18n( "This list displays the default styles for the current schema and " @@ -716,7 +716,7 @@ KateSchemaConfigHighlightTab::KateSchemaConfigHighlightTab( TQWidget *parent, co "to edit from the popup menu.<p>You can unset the Background and Selected " "Background colors from the context menu when appropriate.") ); - connect (m_styles, TQT_SIGNAL (changed()), parent->parentWidget(), TQT_SLOT (slotChanged())); + connect (m_styles, TQT_SIGNAL (changed()), parent->tqparentWidget(), TQT_SLOT (slotChanged())); } KateSchemaConfigHighlightTab::~KateSchemaConfigHighlightTab() @@ -783,12 +783,12 @@ void KateSchemaConfigHighlightTab::schemaChanged (uint schema) // All stylenames have their language mode prefixed, e.g. HTML:Comment // split them and put them into nice substructures. - int c = itemData->name.find(':'); + int c = itemData->name.tqfind(':'); if ( c > 0 ) { TQString prefix = itemData->name.left(c); TQString name = itemData->name.mid(c+1); - KateStyleListCaption *parent = prefixes.find( prefix ); + KateStyleListCaption *parent = prefixes.tqfind( prefix ); if ( ! parent ) { parent = new KateStyleListCaption( m_styles, prefix ); @@ -1088,9 +1088,9 @@ void KateStyleListView::showPopupMenu( KateStyleListItem *i, const TQPoint &glob TQPixmap scl(16,16); scl.fill( i->style()->selectedTextColor() ); TQPixmap bgcl(16,16); - bgcl.fill( i->style()->itemSet(KateAttribute::BGColor) ? i->style()->bgColor() : viewport()->colorGroup().base() ); + bgcl.fill( i->style()->itemSet(KateAttribute::BGColor) ? i->style()->bgColor() : viewport()->tqcolorGroup().base() ); TQPixmap sbgcl(16,16); - sbgcl.fill( i->style()->itemSet(KateAttribute::SelectedBGColor) ? i->style()->selectedBGColor() : viewport()->colorGroup().base() ); + sbgcl.fill( i->style()->itemSet(KateAttribute::SelectedBGColor) ? i->style()->selectedBGColor() : viewport()->tqcolorGroup().base() ); if ( showtitle ) m.insertTitle( i->contextName(), KateStyleListItem::ContextName ); @@ -1156,7 +1156,7 @@ void KateStyleListView::slotMousePressed(int btn, TQListViewItem* i, const TQPoi if ( dynamic_cast<KateStyleListItem*>(i) ) { if ( btn == Qt::LeftButton && c > 0 ) { // map pos to item/column and call KateStyleListItem::activate(col, pos) - ((KateStyleListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, itemRect(i).top() ) ); + ((KateStyleListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, tqitemRect(i).top() ) ); } } } @@ -1357,7 +1357,7 @@ void KateStyleListItem::toggleDefStyle() delete is; is = new KateAttribute( *ds ); updateStyle(); - repaint(); + tqrepaint(); } } @@ -1441,7 +1441,7 @@ void KateStyleListItem::setColor( int column ) break; } - repaint(); + tqrepaint(); } void KateStyleListItem::unsetColor( int c ) @@ -1465,7 +1465,7 @@ void KateStyleListItem::paintCell( TQPainter *p, const TQColorGroup& /*cg*/, int Q_ASSERT( lv ); //### // use a private color group and set the text/highlighted text colors - TQColorGroup mcg = lv->viewport()->colorGroup(); + TQColorGroup mcg = lv->viewport()->tqcolorGroup(); if ( col ) // col 0 is drawn by the superclass method p->fillRect( 0, 0, width, height(), TQBrush( mcg.base() ) ); @@ -1492,7 +1492,7 @@ void KateStyleListItem::paintCell( TQPainter *p, const TQColorGroup& /*cg*/, int } TQFont f ( ((KateStyleListView*)lv)->docfont ); p->setFont( is->font(f) ); - // FIXME - repainting when text is cropped, and the column is enlarged is buggy. + // FIXME - tqrepainting when text is cropped, and the column is enlarged is buggy. // Maybe I need painting the string myself :( // (wilbert) it depends on the font used TQListViewItem::paintCell( p, mcg, col, width, align ); @@ -1602,7 +1602,7 @@ void KateStyleListCaption::paintCell( TQPainter *p, const TQColorGroup& /*cg*/, Q_ASSERT( lv ); //### // use the same colorgroup as the other items in the viewport - TQColorGroup mcg = lv->viewport()->colorGroup(); + TQColorGroup mcg = lv->viewport()->tqcolorGroup(); TQListViewItem::paintCell( p, mcg, col, width, align ); } diff --git a/kate/part/kateschema.h b/kate/part/kateschema.h index 38b15a054..4afd26255 100644 --- a/kate/part/kateschema.h +++ b/kate/part/kateschema.h @@ -125,7 +125,7 @@ class KateViewSchemaAction : public KActionMenu popup menu and a slot to edit a style using the keyboard. Added by anders, jan 23 2002. */ -class KateStyleListView : public QListView +class KateStyleListView : public TQListView { Q_OBJECT @@ -160,7 +160,7 @@ class KateStyleListView : public QListView TQFont docfont; }; -class KateSchemaConfigColorTab : public QWidget +class KateSchemaConfigColorTab : public TQWidget { Q_OBJECT @@ -198,7 +198,7 @@ class KateSchemaConfigColorTab : public QWidget void schemaChanged( int newSchema ); signals: - void changed(); // connected to parentWidget()->parentWidget() TQT_SLOT(slotChanged) + void changed(); // connected to tqparentWidget()->tqparentWidget() TQT_SLOT(slotChanged) protected slots: void slotMarkerColorChanged(const TQColor&); @@ -207,7 +207,7 @@ class KateSchemaConfigColorTab : public QWidget typedef TQMap<int,TQFont> FontMap; // ### remove it -class KateSchemaConfigFontTab : public QWidget +class KateSchemaConfigFontTab : public TQWidget { Q_OBJECT @@ -223,7 +223,7 @@ class KateSchemaConfigFontTab : public QWidget void schemaChanged( int newSchema ); signals: - void changed(); // connected to parentWidget()->parentWidget() TQT_SLOT(slotChanged) + void changed(); // connected to tqparentWidget()->tqparentWidget() TQT_SLOT(slotChanged) private: class KFontChooser *m_fontchooser; @@ -234,7 +234,7 @@ class KateSchemaConfigFontTab : public QWidget void slotFontSelected( const TQFont &font ); }; -class KateSchemaConfigFontColorTab : public QWidget +class KateSchemaConfigFontColorTab : public TQWidget { Q_OBJECT @@ -254,7 +254,7 @@ class KateSchemaConfigFontColorTab : public QWidget TQIntDict<KateAttributeList> m_defaultStyleLists; }; -class KateSchemaConfigHighlightTab : public QWidget +class KateSchemaConfigHighlightTab : public TQWidget { Q_OBJECT diff --git a/kate/part/katesearch.cpp b/kate/part/katesearch.cpp index 742b57a3f..4a64af975 100644 --- a/kate/part/katesearch.cpp +++ b/kate/part/katesearch.cpp @@ -81,7 +81,7 @@ void KateSearch::createActions( KActionCollection* ac ) void KateSearch::addToList( TQStringList& list, const TQString& s ) { if( list.count() > 0 ) { - TQStringList::Iterator it = list.find( s ); + TQStringList::Iterator it = list.tqfind( s ); if( *it != 0L ) list.remove( it ); if( list.count() >= 16 ) @@ -110,7 +110,7 @@ void KateSearch::find() } delete findDialog; - m_view->repaintText (); + m_view->tqrepaintText (); } void KateSearch::find( const TQString &pattern, long flags, bool add, bool shownotfound ) @@ -851,7 +851,7 @@ bool SearchCommand::exec(class Kate::View *view, const TQString &cmd, TQString & // Else, it's just one or two (space separated) words TQRegExp re_rep2("replace(?::([bceprsw]*))?\\s+(\\S+)(.*)"); #define unbackslash(s) p=0;\ -while ( (p = pattern.find( '\\' + delim, p )) > -1 )\ +while ( (p = pattern.tqfind( '\\' + delim, p )) > -1 )\ {\ if ( !p || pattern[p-1] != '\\' )\ pattern.remove( p, 1 );\ diff --git a/kate/part/katesearch.h b/kate/part/katesearch.h index ebf228dcd..bec9eb51a 100644 --- a/kate/part/katesearch.h +++ b/kate/part/katesearch.h @@ -39,7 +39,7 @@ class KateSuperRangeList; class KActionCollection; -class KateSearch : public QObject +class KateSearch : public TQObject { Q_OBJECT diff --git a/kate/part/katespell.h b/kate/part/katespell.h index f376ece49..870a88194 100644 --- a/kate/part/katespell.h +++ b/kate/part/katespell.h @@ -30,7 +30,7 @@ class KateView; class KAction; class KSpell; -class KateSpell : public QObject +class KateSpell : public TQObject { Q_OBJECT diff --git a/kate/part/katesyntaxdocument.h b/kate/part/katesyntaxdocument.h index 93deb731d..6599c05cd 100644 --- a/kate/part/katesyntaxdocument.h +++ b/kate/part/katesyntaxdocument.h @@ -61,7 +61,7 @@ class KateSyntaxContextData /** * Store and manage the information about Syntax Highlighting. */ -class KateSyntaxDocument : public QDomDocument +class KateSyntaxDocument : public TQDomDocument { public: /** diff --git a/kate/part/katetextline.cpp b/kate/part/katetextline.cpp index e64b928c7..1d6fcf452 100644 --- a/kate/part/katetextline.cpp +++ b/kate/part/katetextline.cpp @@ -110,11 +110,11 @@ void KateTextLine::truncate(uint newLen) int KateTextLine::nextNonSpaceChar(uint pos) const { const uint len = m_text.length(); - const TQChar *unicode = m_text.unicode(); + const TQChar *tqunicode = m_text.tqunicode(); for(uint i = pos; i < len; i++) { - if(!unicode[i].isSpace()) + if(!tqunicode[i].isSpace()) return i; } @@ -128,11 +128,11 @@ int KateTextLine::previousNonSpaceChar(uint pos) const if (pos >= (uint)len) pos = len - 1; - const TQChar *unicode = m_text.unicode(); + const TQChar *tqunicode = m_text.tqunicode(); for(int i = pos; i >= 0; i--) { - if(!unicode[i].isSpace()) + if(!tqunicode[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.unicode())+first : m_text.unicode(); + return (first > -1) ? ((TQChar*)m_text.tqunicode())+first : m_text.tqunicode(); } uint KateTextLine::indentDepth (uint tabwidth) const { uint d = 0; const uint len = m_text.length(); - const TQChar *unicode = m_text.unicode(); + const TQChar *tqunicode = m_text.tqunicode(); for(uint i = 0; i < len; i++) { - if(unicode[i].isSpace()) + if(tqunicode[i].isSpace()) { - if (unicode[i] == TQChar('\t')) + if (tqunicode[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 *unicode = m_text.unicode(); - const TQChar *matchUnicode = match.unicode(); + const TQChar *tqunicode = m_text.tqunicode(); + const TQChar *matchUnicode = match.tqunicode(); for (uint i=0; i < matchlen; i++) - if (unicode[i+pos] != matchUnicode[i]) + if (tqunicode[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 *unicode = m_text.unicode(); - const TQChar *matchUnicode = match.unicode(); + const TQChar *tqunicode = m_text.tqunicode(); + const TQChar *matchUnicode = match.tqunicode(); for (uint i=0; i < matchlen; i++) - if (unicode[i] != matchUnicode[i]) + if (tqunicode[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 *unicode = m_text.unicode(); - const TQChar *matchUnicode = match.unicode(); + const TQChar *tqunicode = m_text.tqunicode(); + const TQChar *matchUnicode = match.tqunicode(); uint start = m_text.length() - matchlen; for (uint i=0; i < matchlen; i++) - if (unicode[start+i] != matchUnicode[i]) + if (tqunicode[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, m_text.length()); - const TQChar *unicode = m_text.unicode(); + const TQChar *tqunicode = m_text.tqunicode(); for ( uint z = 0; z < n; z++) { - if (unicode[z] == TQChar('\t')) + if (tqunicode[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 *unicode = m_text.unicode(); + const TQChar *tqunicode = m_text.tqunicode(); for ( uint z = 0; z < len; z++) { - if (unicode[z] == TQChar('\t')) + if (tqunicode[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.unicode(), sizeof(TQChar)*l); + memcpy(buf, (char *) m_text.tqunicode(), sizeof(TQChar)*l); buf += sizeof(TQChar) * l; if (!withHighlighting) diff --git a/kate/part/katetextline.h b/kate/part/katetextline.h index 3922d04d0..84df82908 100644 --- a/kate/part/katetextline.h +++ b/kate/part/katetextline.h @@ -145,10 +145,10 @@ class KateTextLine : public KShared inline TQChar getChar (uint pos) const { return m_text[pos]; } /** - * Gets the text as a unicode representation + * Gets the text as a tqunicode representation * @return text of this line as TQChar array */ - inline const TQChar *text() const { return m_text.unicode(); } + inline const TQChar *text() const { return m_text.tqunicode(); } /** * Highlighting array @@ -419,7 +419,7 @@ class KateTextLine : public KShared */ private: /** - * text of line as unicode + * text of line as tqunicode */ TQString m_text; diff --git a/kate/part/kateview.cpp b/kate/part/kateview.cpp index 7840e79d5..c486a6d82 100644 --- a/kate/part/kateview.cpp +++ b/kate/part/kateview.cpp @@ -793,7 +793,7 @@ void KateView::contextMenuEvent( TQContextMenuEvent *ev ) if ( !m_doc || !m_doc->browserExtension() ) return; emit m_doc->browserExtension()->popupMenu( /*this, */ev->globalPos(), m_doc->url(), - TQString::fromLatin1( "text/plain" ) ); + TQString::tqfromLatin1( "text/plain" ) ); ev->accept(); } @@ -1233,11 +1233,11 @@ void KateView::updateRendererConfig() // update the text area m_viewInternal->updateView (true); - m_viewInternal->repaint (); + m_viewInternal->tqrepaint (); // update the left border right, for example linenumbers m_viewInternal->leftBorder->updateFont(); - m_viewInternal->leftBorder->repaint (); + m_viewInternal->leftBorder->tqrepaint (); // @@ showIndentLines is not cached anymore. // m_renderer->setShowIndentLines (m_renderer->config()->showIndentationLines()); @@ -1305,7 +1305,7 @@ void KateView::clear () m_viewInternal->clear (); } -void KateView::repaintText (bool paintOnlyDirty) +void KateView::tqrepaintText (bool paintOnlyDirty) { m_viewInternal->paintText(0,0,m_viewInternal->width(),m_viewInternal->height(), paintOnlyDirty); } @@ -1360,7 +1360,7 @@ bool KateView::setSelection( const KateTextCursor& start, const KateTextCursor& tagSelection(oldSelectStart, oldSelectEnd); - repaintText(true); + tqrepaintText(true); emit selectionChanged (); emit m_doc->selectionChanged (); @@ -1405,7 +1405,7 @@ bool KateView::clearSelection(bool redraw, bool finishedChangingSelection) oldSelectEnd = selectEnd; if (redraw) - repaintText(true); + tqrepaintText(true); if (finishedChangingSelection) { @@ -1596,7 +1596,7 @@ void KateView::paste() { m_doc->paste( this ); emit selectionChanged(); - m_viewInternal->repaint(); + m_viewInternal->tqrepaint(); } void KateView::cut() diff --git a/kate/part/kateview.h b/kate/part/kateview.h index aa428096d..0f62fe440 100644 --- a/kate/part/kateview.h +++ b/kate/part/kateview.h @@ -270,7 +270,7 @@ class KateView : public Kate::View, void clear (); - void repaintText (bool paintOnlyDirty = false); + void tqrepaintText (bool paintOnlyDirty = false); void updateView (bool changed = false); //END diff --git a/kate/part/kateviewhelpers.cpp b/kate/part/kateviewhelpers.cpp index da88676bc..b379773bf 100644 --- a/kate/part/kateviewhelpers.cpp +++ b/kate/part/kateviewhelpers.cpp @@ -244,7 +244,7 @@ class KateCmdLnWhatsThis : public QWhatsThis Kate::Command *cmd = KateCmd::self()->queryCommand( name ); if ( cmd ) { - if ( cmd->help( (Kate::View*)m_parent->parentWidget(), name, s ) ) + if ( cmd->help( (Kate::View*)m_parent->tqparentWidget(), name, s ) ) return beg + name + mid + s + end; else return beg + name + mid + i18n("No help for '%1'").arg( name ) + end; @@ -380,7 +380,7 @@ void KateCmdLine::slotReturnPressed ( const TQString& text ) void KateCmdLine::hideMe () // unless i have focus ;) { - if ( isVisibleTo(parentWidget()) && ! hasFocus() ) { + if ( isVisibleTo(tqparentWidget()) && ! hasFocus() ) { m_view->toggleCmdLine (); } } @@ -697,7 +697,7 @@ KateIconBorder::KateIconBorder ( KateViewInternal* internalView, TQWidget *paren , m_cachedLNWidth( 0 ) , m_maxCharWidth( 0 ) { - setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) ); + tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) ); setBackgroundMode( NoBackground ); @@ -757,7 +757,7 @@ void KateIconBorder::setFoldingMarkersOn( bool enable ) TQTimer::singleShot( 0, this, TQT_SLOT(update()) ); } -TQSize KateIconBorder::sizeHint() const +TQSize KateIconBorder::tqsizeHint() const { int w = 0; @@ -866,7 +866,7 @@ void KateIconBorder::paintBorder (int /*x*/, int y, int /*width*/, int height) { // we went from n0 ->n9 lines or vice verca // this causes an extra updateGeometry() first time the line numbers - // are displayed, but sizeHint() is supposed to be const so we can't set + // are displayed, but tqsizeHint() is supposed to be const so we can't set // the cached value there. m_cachedLNWidth = lnWidth; m_oldBackgroundColor = m_view->renderer()->config()->iconBarColor(); diff --git a/kate/part/kateviewhelpers.h b/kate/part/kateviewhelpers.h index 8e3fa94b3..b17db996e 100644 --- a/kate/part/kateviewhelpers.h +++ b/kate/part/kateviewhelpers.h @@ -45,7 +45,7 @@ namespace Kate { * * Also, it adds some usefull indicators on the scrollbar. */ -class KateScrollBar : public QScrollBar +class KateScrollBar : public TQScrollBar { Q_OBJECT @@ -119,7 +119,7 @@ class KateCmdLine : public KLineEdit class KateCmdLnWhatsThis *m_help; }; -class KateIconBorder : public QWidget +class KateIconBorder : public TQWidget { Q_OBJECT @@ -127,7 +127,7 @@ class KateIconBorder : public QWidget KateIconBorder( KateViewInternal* internalView, TQWidget *parent ); // VERY IMPORTANT ;) - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; void updateFont(); int lineNumberWidth() const; diff --git a/kate/part/kateviewinternal.cpp b/kate/part/kateviewinternal.cpp index 77f98643d..569397f05 100644 --- a/kate/part/kateviewinternal.cpp +++ b/kate/part/kateviewinternal.cpp @@ -89,7 +89,7 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc) // cursor cursor.setMoveOnInsert (true); - // invalidate selStartCached, or keyb selection is screwed initially + // tqinvalidate selStartCached, or keyb selection is screwed initially selStartCached.setLine( -1 ); // // scrollbar for lines @@ -2759,7 +2759,7 @@ void KateViewInternal::mousePressEvent( TQMouseEvent* e ) } else { - selStartCached.setLine( -1 ); // invalidate + selStartCached.setLine( -1 ); // tqinvalidate } if( !( e->state() & Qt::ShiftButton ) && isTargetSelected( e->pos() ) ) diff --git a/kate/part/kateviewinternal.h b/kate/part/kateviewinternal.h index 9b0a940be..8e7b3a896 100644 --- a/kate/part/kateviewinternal.h +++ b/kate/part/kateviewinternal.h @@ -49,7 +49,7 @@ enum Bias right = 1 }; -class KateViewInternal : public QWidget +class KateViewInternal : public TQWidget { Q_OBJECT @@ -221,7 +221,7 @@ class KateViewInternal : public QWidget int scrollX; int scrollY; - Qt::CursorShape m_mouseCursor; + Qt::tqCursorShape m_mouseCursor; KateSuperCursor cursor; KateTextCursor displayCursor; diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp index e3f9f52e6..9fee1654b 100644 --- a/kate/part/test_regression.cpp +++ b/kate/part/test_regression.cpp @@ -515,7 +515,7 @@ int main(int argc, char *argv[]) KateDocument *part = new KateDocument(/*bSingleViewMode*/true, /*bBrowserView*/false, /*bReadOnly*/false, - /*parentWidget*/toplevel, + /*tqparentWidget*/toplevel, /*widgetName*/"testkate"); part->readConfig(&cfg); @@ -869,10 +869,10 @@ static TQString makeRelativePath(const TQString &base, const TQString &path) int pos = 0; do { pos++; - int newpos = absBase.find('/', pos); + int newpos = absBase.tqfind('/', pos); if (newpos == -1) newpos = absBase.length(); - TQConstString cmpPathComp(absPath.unicode() + pos, newpos - pos); - TQConstString cmpBaseComp(absBase.unicode() + pos, newpos - pos); + TQConstString cmpPathComp(absPath.tqunicode() + pos, newpos - pos); + TQConstString cmpBaseComp(absBase.tqunicode() + 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.unicode() + basepos, absBase.length() - basepos); - TQConstString relPath(absPath.unicode() + pathpos, absPath.length() - pathpos); + TQConstString relBase(absBase.tqunicode() + basepos, absBase.length() - basepos); + TQConstString relPath(absPath.tqunicode() + 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) @@ -935,7 +935,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures ) if ( failures & ResultFailure ) { domDiff += "<pre>"; - FILE *pipe = popen( TQString::fromLatin1( "diff -u baseline/%1-result %3/%2-result" ) + FILE *pipe = popen( TQString::tqfromLatin1( "diff -u baseline/%1-result %3/%2-result" ) .arg ( test, test, relOutputDir ).latin1(), "r" ); TQTextIStream *is = new TQTextIStream( pipe ); for ( int line = 0; line < 100 && !is->eof(); ++line ) { @@ -1026,7 +1026,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures ) void RegressionTest::testStaticFile(const TQString & filename, const TQStringList &commands) { - qApp->mainWidget()->resize( 800, 600); // restore size + tqApp->mainWidget()->resize( 800, 600); // restore size // Set arguments KParts::URLArgs args; @@ -1334,7 +1334,7 @@ bool RegressionTest::svnIgnored( const TQString &filename ) void RegressionTest::resizeTopLevelWidget( int w, int h ) { - qApp->mainWidget()->resize( w, h ); + tqApp->mainWidget()->resize( w, h ); // Since we're not visible, this doesn't have an immediate effect, TQWidget posts the event TQApplication::sendPostedEvents( 0, TQEvent::Resize ); } diff --git a/kate/part/test_regression.h b/kate/part/test_regression.h index ee4f8fdfa..0bc717714 100644 --- a/kate/part/test_regression.h +++ b/kate/part/test_regression.h @@ -160,7 +160,7 @@ class OutputFunction : public KJS::ObjectImp /** * @internal */ -class RegressionTest : public QObject +class RegressionTest : public TQObject { Q_OBJECT public: |