diff options
Diffstat (limited to 'lib')
30 files changed, 70 insertions, 70 deletions
diff --git a/lib/antlr/antlr/AST.hpp b/lib/antlr/antlr/AST.hpp index b14b123b..b01a60a9 100644 --- a/lib/antlr/antlr/AST.hpp +++ b/lib/antlr/antlr/AST.hpp @@ -63,10 +63,10 @@ public: /// Add a node to the end of the child list for this node virtual void addChild(RefAST c) = 0; - /// Get the number of tqchildren. Returns 0 if the node is a leaf + /// Get the number of children. Returns 0 if the node is a leaf virtual size_t getNumberOfChildren() const = 0; - /// Get the first child of this node; null if no tqchildren + /// Get the first child of this node; null if no children virtual RefAST getFirstChild() const = 0; /// Get the next sibling in line after this one virtual RefAST getNextSibling() const = 0; diff --git a/lib/antlr/antlr/ASTFactory.hpp b/lib/antlr/antlr/ASTFactory.hpp index 0fb78dc1..968ab6c5 100644 --- a/lib/antlr/antlr/ASTFactory.hpp +++ b/lib/antlr/antlr/ASTFactory.hpp @@ -86,7 +86,7 @@ public: RefAST dupTree(RefAST t); /** Make a tree from a list of nodes. The first element in the * array is the root. If the root is null, then the tree is - * a simple list not a tree. Handles null tqchildren nodes correctly. + * a simple list not a tree. Handles null children nodes correctly. * For example, make(a, b, null, c) yields tree (a b c). make(null,a,b) * yields tree (nil a b). */ diff --git a/lib/antlr/antlr/BaseAST.hpp b/lib/antlr/antlr/BaseAST.hpp index 3a88db32..1bfc4e56 100644 --- a/lib/antlr/antlr/BaseAST.hpp +++ b/lib/antlr/antlr/BaseAST.hpp @@ -96,7 +96,7 @@ public: */ virtual size_t getNumberOfChildren() const; - /// Get the first child of this node; null if no tqchildren + /// Get the first child of this node; null if no children virtual RefAST getFirstChild() const { return RefAST(down); @@ -118,7 +118,7 @@ public: return 0; } - /// Remove all tqchildren + /// Remove all children virtual void removeChildren() { down = static_cast<BaseAST*>(static_cast<AST*>(nullAST)); diff --git a/lib/antlr/src/ASTFactory.cpp b/lib/antlr/src/ASTFactory.cpp index a255ca10..98ce6b7a 100644 --- a/lib/antlr/src/ASTFactory.cpp +++ b/lib/antlr/src/ASTFactory.cpp @@ -217,7 +217,7 @@ RefAST ASTFactory::dupList(RefAST t) RefAST ASTFactory::dupTree(RefAST t) { RefAST result = dup(t); // make copy of root - // copy all tqchildren of root. + // copy all children of root. if( t ) result->setFirstChild( dupList(t->getFirstChild()) ); return result; @@ -225,7 +225,7 @@ RefAST ASTFactory::dupTree(RefAST t) /** Make a tree from a list of nodes. The first element in the * array is the root. If the root is null, then the tree is - * a simple list not a tree. Handles null tqchildren nodes correctly. + * a simple list not a tree. Handles null children nodes correctly. * For example, make(a, b, null, c) yields tree (a b c). make(null,a,b) * yields tree (nil a b). */ @@ -240,7 +240,7 @@ RefAST ASTFactory::make(ANTLR_USE_NAMESPACE(std)vector<RefAST>& nodes) if( root ) root->setFirstChild(RefAST(nullASTptr)); // don't leave any old pointers set - // link in tqchildren; + // link in children; for( unsigned int i = 1; i < nodes.size(); i++ ) { if ( nodes[i] == 0 ) // ignore null nodes @@ -336,7 +336,7 @@ void ASTFactory::loadChildren( ANTLR_USE_NAMESPACE(std)istream& infile, { char ch; - for(;;) // for all tqchildren of this node.... + for(;;) // for all children of this node.... { eatwhite(infile); @@ -438,7 +438,7 @@ RefAST ASTFactory::LoadAST( ANTLR_USE_NAMESPACE(std)istream& infile ) infile.get(ch); // now if we have a '/' here it's a single node. If it's a '>' we get - // a tree with tqchildren + // a tree with children if( ch == '/' ) { diff --git a/lib/antlr/src/BaseAST.cpp b/lib/antlr/src/BaseAST.cpp index 17d8de68..f10f1e16 100644 --- a/lib/antlr/src/BaseAST.cpp +++ b/lib/antlr/src/BaseAST.cpp @@ -47,7 +47,7 @@ void BaseAST::doWorkForFindAll( (!partialMatch && sibling->equalsTree(target)) ) { v.push_back(sibling); } - // regardless of match or not, check any tqchildren for matches + // regardless of match or not, check any children for matches if ( sibling->getFirstChild() ) { RefBaseAST(sibling->getFirstChild())->doWorkForFindAll(v, target, partialMatch); } @@ -70,7 +70,7 @@ bool BaseAST::equalsList(RefAST t) const // as a quick optimization, check roots first. if (!sibling->equals(t)) return false; - // if roots match, do full list match test on tqchildren. + // if roots match, do full list match test on children. if (sibling->getFirstChild()) { if (!sibling->getFirstChild()->equalsList(t->getFirstChild())) return false; @@ -103,7 +103,7 @@ bool BaseAST::equalsListPartial(RefAST sub) const // as a quick optimization, check roots first. if (!sibling->equals(sub)) return false; - // if roots match, do partial list match test on tqchildren. + // if roots match, do partial list match test on children. if (sibling->getFirstChild()) if (!sibling->getFirstChild()->equalsListPartial(sub->getFirstChild())) return false; @@ -125,7 +125,7 @@ bool BaseAST::equalsTree(RefAST t) const // check roots first if (!equals(t)) return false; - // if roots match, do full list match test on tqchildren. + // if roots match, do full list match test on children. if (getFirstChild()) { if (!getFirstChild()->equalsList(t->getFirstChild())) return false; @@ -149,7 +149,7 @@ bool BaseAST::equalsTreePartial(RefAST sub) const // check roots first if (!equals(sub)) return false; - // if roots match, do full list partial match test on tqchildren. + // if roots match, do full list partial match test on children. if (getFirstChild()) if (!getFirstChild()->equalsListPartial(sub->getFirstChild())) return false; @@ -256,7 +256,7 @@ void BaseAST::toStream( ANTLR_USE_NAMESPACE(std)ostream& out ) const if( need_close_tag ) { - // got tqchildren so write them... + // got children so write them... if( node->getFirstChild() != 0 ) node->getFirstChild()->toStream( out ); diff --git a/lib/cppparser/ast.cpp b/lib/cppparser/ast.cpp index 847c0201..8d22a10c 100644 --- a/lib/cppparser/ast.cpp +++ b/lib/cppparser/ast.cpp @@ -136,7 +136,7 @@ AST::AST() m_endLine( 0 ), m_endColumn( 0 ) { #ifndef CPPPARSER_NO_CHILDREN - m_tqchildren.setAutoDelete( false ); + m_children.setAutoDelete( false ); #endif } @@ -196,12 +196,12 @@ void AST::setParent( AST* parent ) #ifndef CPPPARSER_NO_CHILDREN void AST::appendChild( AST* child ) { - m_tqchildren.append( child ); + m_children.append( child ); } void AST::removeChild( AST* child ) { - m_tqchildren.remove( child ); + m_children.remove( child ); } #endif diff --git a/lib/cppparser/ast.h b/lib/cppparser/ast.h index 3e53a285..c11fffeb 100644 --- a/lib/cppparser/ast.h +++ b/lib/cppparser/ast.h @@ -263,7 +263,7 @@ public: void getEndPosition( int* line, int* col ) const; #ifndef CPPPARSER_NO_CHILDREN - TQPtrList<AST> tqchildren() { return m_tqchildren; } + TQPtrList<AST> children() { return m_children; } void appendChild( AST* child ); void removeChild( AST* child ); #endif @@ -292,7 +292,7 @@ private: int m_endLine, m_endColumn; Slice m_slice; #ifndef CPPPARSER_NO_CHILDREN - TQPtrList<AST> m_tqchildren; + TQPtrList<AST> m_children; #endif private: diff --git a/lib/cppparser/driver.cpp b/lib/cppparser/driver.cpp index da170fa1..1c936a43 100644 --- a/lib/cppparser/driver.cpp +++ b/lib/cppparser/driver.cpp @@ -383,7 +383,7 @@ void Driver::addDependence( const TQString & fileName, const Dependence & dep ) m_currentParsedFile->addIncludeFile( file, 0, dep.second == Dep_Local ); if ( !TQFile::exists( file ) ) { - Problem p( i18n( "Could not find include file %1" ).tqarg( dep.first ), + Problem p( i18n( "Could not find include file %1" ).arg( dep.first ), lexer ? lexer->currentLine() : -1, lexer ? lexer->currentColumn() : -1, Problem::Level_Warning ); addProblem( fileName, p ); diff --git a/lib/cppparser/lexer.cpp b/lib/cppparser/lexer.cpp index 3f325f58..d5f11872 100644 --- a/lib/cppparser/lexer.cpp +++ b/lib/cppparser/lexer.cpp @@ -386,7 +386,7 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline ) TQString tokText = tok.text(); HashedString str = (tok == Token_identifier && d->hasBind(tokText)) ? d->apply( tokText ) : tokText; if( str == ide ){ - //Problem p( i18n("unsafe use of macro '%1', macro is ignored").tqarg(ide.str()), m_currentLine, m_currentColumn, Problem::Level_Warning ); + //Problem p( i18n("unsafe use of macro '%1', macro is ignored").arg(ide.str()), m_currentLine, m_currentColumn, Problem::Level_Warning ); //m_driver->addProblem( m_driver->currentFileName(), p ); m_driver->removeMacro( ide ); // str = TQString(); diff --git a/lib/cppparser/parser.cpp b/lib/cppparser/parser.cpp index 84ada9b2..f8245131 100644 --- a/lib/cppparser/parser.cpp +++ b/lib/cppparser/parser.cpp @@ -37,7 +37,7 @@ using namespace std; { \ const Token& token = lex->lookAhead( 0 ); \ if( token != tk ){ \ - reportError( i18n("'%1' expected found '%2'").tqarg(descr).tqarg(token.text()) ); \ + reportError( i18n("'%1' expected found '%2'").arg(descr).arg(token.text()) ); \ return false; \ } \ nextToken(); \ @@ -47,7 +47,7 @@ using namespace std; { \ const Token& token = lex->lookAhead( 0 ); \ if( token != tk ){ \ - reportError( i18n("'%1' expected found '%2'").tqarg(descr).tqarg(token.text()) ); \ + reportError( i18n("'%1' expected found '%2'").arg(descr).arg(token.text()) ); \ } \ else \ nextToken(); \ @@ -139,7 +139,7 @@ bool Parser::reportError( const Error& err ) if( s.isEmpty() ) s = i18n( "<eof>" ); - m_driver->addProblem( m_driver->currentFileName(), Problem(err.text.tqarg(s), line, col) ); + m_driver->addProblem( m_driver->currentFileName(), Problem(err.text.arg(s), line, col) ); } return true; diff --git a/lib/interfaces/extensions/kdevversioncontrol.h b/lib/interfaces/extensions/kdevversioncontrol.h index 1e3a5d6c..994651e5 100644 --- a/lib/interfaces/extensions/kdevversioncontrol.h +++ b/lib/interfaces/extensions/kdevversioncontrol.h @@ -210,7 +210,7 @@ public: @param dirPath The (relative to project directory) directory which status you are asking for. @param callerData The pointer to some data you want the provider will return to you when it has done. - @param recursive If false, retrieve information only for dirPath's immediate tqchildren. + @param recursive If false, retrieve information only for dirPath's immediate children. @param checkRepos If true, contact remote repository and augment repository's status. If false, retrieve only for local modification information. @return true if the request has been successfully started, false otherwise.*/ diff --git a/lib/interfaces/kdevplugincontroller.cpp b/lib/interfaces/kdevplugincontroller.cpp index d2459d17..686fd1ce 100644 --- a/lib/interfaces/kdevplugincontroller.cpp +++ b/lib/interfaces/kdevplugincontroller.cpp @@ -28,7 +28,7 @@ KTrader::OfferList KDevPluginController::query(const TQString &serviceType, const TQString &constraint) { return KTrader::self()->query(serviceType, - TQString("%1 and [X-KDevelop-Version] == %2").tqarg(constraint).tqarg(KDEVELOP_PLUGIN_VERSION)); + TQString("%1 and [X-KDevelop-Version] == %2").arg(constraint).arg(KDEVELOP_PLUGIN_VERSION)); } KTrader::OfferList KDevPluginController::queryPlugins(const TQString &constraint) diff --git a/lib/interfaces/kdevplugininfo.cpp b/lib/interfaces/kdevplugininfo.cpp index 613c759d..daa64c2b 100644 --- a/lib/interfaces/kdevplugininfo.cpp +++ b/lib/interfaces/kdevplugininfo.cpp @@ -149,7 +149,7 @@ TQString KDevPluginInfo::bugsEmailAddress() const TQVariant KDevPluginInfo::property(const TQString &name) const { - KTrader::OfferList offers = KDevPluginController::queryPlugins(TQString("Name='%1'").tqarg(d->m_pluginName)); + KTrader::OfferList offers = KDevPluginController::queryPlugins(TQString("Name='%1'").arg(d->m_pluginName)); if (offers.count() == 1) return offers.first()->property(name); return TQVariant(); @@ -162,7 +162,7 @@ TQVariant KDevPluginInfo::operator [](const TQString &name) const TQStringList KDevPluginInfo::propertyNames( ) const { - KTrader::OfferList offers = KDevPluginController::queryPlugins(TQString("Name='%1'").tqarg(d->m_pluginName)); + KTrader::OfferList offers = KDevPluginController::queryPlugins(TQString("Name='%1'").arg(d->m_pluginName)); if (offers.count() == 1) return offers.first()->propertyNames(); return TQStringList(); diff --git a/lib/util/domutil.cpp b/lib/util/domutil.cpp index a8f036e6..43f8d95a 100644 --- a/lib/util/domutil.cpp +++ b/lib/util/domutil.cpp @@ -260,18 +260,18 @@ TQDomElement DomUtil::elementByPathExt(TQDomDocument &doc, const TQString &paths { DomPath dompath = resolvPathStringExt(pathstring); TQDomElement elem = doc.documentElement(); - TQDomNodeList tqchildren; + TQDomNodeList children; TQDomElement nextElem = elem; for (unsigned int j=0; j<dompath.count(); j++) { - tqchildren = nextElem.childNodes(); + children = nextElem.childNodes(); DomPathElement dompathelement= dompath[j]; bool wrongchild = false; int matchCount = 0; - for (unsigned int i=0; i<tqchildren.count(); i++) + for (unsigned int i=0; i<children.count(); i++) { wrongchild = false; - TQDomElement child = tqchildren.item(i).toElement(); + TQDomElement child = children.item(i).toElement(); TQString tag = child.tagName(); tag = dompathelement.tagName; if (child.tagName() == dompathelement.tagName) @@ -339,10 +339,10 @@ bool DomUtil::removeTextNodes(TQDomDocument doc,TQString pathExt) TQDomElement elem = elementByPathExt(doc,pathExt); if (elem.isNull()) return false; - TQDomNodeList tqchildren = elem.childNodes(); - for (unsigned int i=0;i<tqchildren.count();i++) - if (tqchildren.item(i).isText()) - elem.removeChild(tqchildren.item(i)); + TQDomNodeList children = elem.childNodes(); + for (unsigned int i=0;i<children.count();i++) + if (children.item(i).isText()) + elem.removeChild(children.item(i)); return true; } diff --git a/lib/util/domutil.h b/lib/util/domutil.h index db9cd184..e5614d49 100644 --- a/lib/util/domutil.h +++ b/lib/util/domutil.h @@ -168,7 +168,7 @@ public: Retrieve an element specified with extended path examples: - - 1: "widget|class=TQDialog/property|name=tqgeometry" + - 1: "widget|class=TQDialog/property|name=geometry" or "widget|class=TQDialog/property||1" - 2: "widget/property|name=caption/string" or "widget/property||2/string" diff --git a/lib/util/execcommand.cpp b/lib/util/execcommand.cpp index 9692b29e..fbcd070a 100644 --- a/lib/util/execcommand.cpp +++ b/lib/util/execcommand.cpp @@ -49,7 +49,7 @@ ExecCommand::ExecCommand( const TQString& executable, const TQStringList& args, bool ok = proc->start( KProcess::NotifyOnExit, KProcess::AllOutput ); if ( !ok ) { - KMessageBox::error( 0, i18n("Could not invoke \"%1\". Please make sure it is installed correctly").tqarg( executable ), + KMessageBox::error( 0, i18n("Could not invoke \"%1\". Please make sure it is installed correctly").arg( executable ), i18n("Error Invoking Command") ); emit finished( TQString(), TQString() ); @@ -57,7 +57,7 @@ ExecCommand::ExecCommand( const TQString& executable, const TQStringList& args, } else { progressDlg = new KProgressDialog( 0, 0, i18n("Command running..."), - i18n("Please wait until the \"%1\" command finishes.").tqarg( executable ), false ); + i18n("Please wait until the \"%1\" command finishes.").arg( executable ), false ); connect( progressDlg, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(cancelClicked()) ); } diff --git a/lib/util/kscriptactionmanager.cpp b/lib/util/kscriptactionmanager.cpp index 3c906902..ffc3a536 100644 --- a/lib/util/kscriptactionmanager.cpp +++ b/lib/util/kscriptactionmanager.cpp @@ -95,7 +95,7 @@ void KScriptAction::activate( ) } else { - KMessageBox::sorry(0, i18n("Unable to get KScript Runner for type \"%1\".").tqarg(m_scriptType), i18n("KScript Error")); + KMessageBox::sorry(0, i18n("Unable to get KScript Runner for type \"%1\".").arg(m_scriptType), i18n("KScript Error")); kdDebug() << "Query string: " << scriptTypeQuery << endl; return; } diff --git a/lib/widgets/fancylistviewitem.cpp b/lib/widgets/fancylistviewitem.cpp index 26677de6..6ff099e4 100644 --- a/lib/widgets/fancylistviewitem.cpp +++ b/lib/widgets/fancylistviewitem.cpp @@ -129,7 +129,7 @@ void FancyListViewItem::paintCell( TQPainter *painter, const TQColorGroup &cg, else if ( align & AlignTop ) yo = 0; -// respect horizontal tqalignment when there is no text for an item. +// respect horizontal alignment when there is no text for an item. if ( t.isEmpty() ) { if ( align & AlignRight ) xo = width - 2 * marg - iconWidth; diff --git a/lib/widgets/flagboxes.cpp b/lib/widgets/flagboxes.cpp index 000b5169..9905685f 100644 --- a/lib/widgets/flagboxes.cpp +++ b/lib/widgets/flagboxes.cpp @@ -624,7 +624,7 @@ void FlagSpinEdit::setText( const TQString text ) TQString FlagSpinEdit::text( ) { - return TQString("%1").tqarg(spb->value()); + return TQString("%1").arg(spb->value()); } TQString FlagSpinEdit::flags( ) diff --git a/lib/widgets/processwidget.cpp b/lib/widgets/processwidget.cpp index 704bb9ce..56321450 100644 --- a/lib/widgets/processwidget.cpp +++ b/lib/widgets/processwidget.cpp @@ -227,7 +227,7 @@ void ProcessWidget::childFinished(bool normal, int status) if (normal) { if (status) { - s = i18n("*** Exited with status: %1 ***").tqarg(status); + s = i18n("*** Exited with status: %1 ***").arg(status); t = ProcessListBoxItem::Error; } else { s = i18n("*** Exited normally ***"); diff --git a/lib/widgets/propeditor/pdoublenuminput.cpp b/lib/widgets/propeditor/pdoublenuminput.cpp index 753af410..99b0151e 100644 --- a/lib/widgets/propeditor/pdoublenuminput.cpp +++ b/lib/widgets/propeditor/pdoublenuminput.cpp @@ -78,7 +78,7 @@ void PDoubleNumInput::updateProperty(double val) void PDoubleNumInput::updateProperty(int val) { #ifdef PURE_QT - TQString format = TQString("%.%1f").tqarg( m_edit->digits() ); + TQString format = TQString("%.%1f").arg( m_edit->digits() ); TQString strVal = TQString().sprintf(format.latin1(), (val/(float)pow(m_edit->digits(),10)) ); emit propertyChanged(m_property, TQVariant(strVal)); diff --git a/lib/widgets/propeditor/pfontbutton.cpp b/lib/widgets/propeditor/pfontbutton.cpp index 82a96e9c..67c86995 100644 --- a/lib/widgets/propeditor/pfontbutton.cpp +++ b/lib/widgets/propeditor/pfontbutton.cpp @@ -61,7 +61,7 @@ void PFontButton::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, fi.family() + (fi.bold() ? i18n(" Bold") : TQString("")) + (fi.italic() ? i18n(" Italic") : TQString("")) + - " " + TQString("%1").tqarg(fi.pointSize()) ); + " " + TQString("%1").arg(fi.pointSize()) ); } void PFontButton::setValue(const TQVariant& value, bool emitChange) diff --git a/lib/widgets/propeditor/ppointedit.cpp b/lib/widgets/propeditor/ppointedit.cpp index 64a823a9..d02d9dcc 100644 --- a/lib/widgets/propeditor/ppointedit.cpp +++ b/lib/widgets/propeditor/ppointedit.cpp @@ -45,13 +45,13 @@ void PPointEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& p->setPen(TQt::NoPen); p->setBrush(cg.background()); p->drawRect(r); - p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("[ %1, %2 ]").tqarg(value.toPoint().x()).tqarg(value.toPoint().y())); + p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("[ %1, %2 ]").arg(value.toPoint().x()).arg(value.toPoint().y())); } void PPointEdit::setValue(const TQVariant& value, bool emitChange) { m_value = value; - m_edit->setText(TQString("[ %1, %2 ]").tqarg(value.toPoint().x()).tqarg(value.toPoint().y())); + m_edit->setText(TQString("[ %1, %2 ]").arg(value.toPoint().x()).arg(value.toPoint().y())); if (emitChange) emit propertyChanged(m_property, value); diff --git a/lib/widgets/propeditor/prectedit.cpp b/lib/widgets/propeditor/prectedit.cpp index dbc35ae5..6be2da82 100644 --- a/lib/widgets/propeditor/prectedit.cpp +++ b/lib/widgets/propeditor/prectedit.cpp @@ -45,13 +45,13 @@ void PRectEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r p->setPen(TQt::NoPen); p->setBrush(cg.background()); p->drawRect(r); - p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("[ %1, %2, %3, %4 ]").tqarg(value.toRect().x()).tqarg(value.toRect().y()).tqarg(value.toRect().width()).tqarg(value.toRect().height())); + p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("[ %1, %2, %3, %4 ]").arg(value.toRect().x()).arg(value.toRect().y()).arg(value.toRect().width()).arg(value.toRect().height())); } void PRectEdit::setValue(const TQVariant& value, bool emitChange) { m_value = value; - m_edit->setText(TQString("[ %1, %2, %3, %4 ]").tqarg(value.toRect().x()).tqarg(value.toRect().y()).tqarg(value.toRect().width()).tqarg(value.toRect().height())); + m_edit->setText(TQString("[ %1, %2, %3, %4 ]").arg(value.toRect().x()).arg(value.toRect().y()).arg(value.toRect().width()).arg(value.toRect().height())); if (emitChange) emit propertyChanged(m_property, value); diff --git a/lib/widgets/propeditor/propertyeditor.cpp b/lib/widgets/propeditor/propertyeditor.cpp index 4c5c8b16..a1bd9406 100644 --- a/lib/widgets/propeditor/propertyeditor.cpp +++ b/lib/widgets/propeditor/propertyeditor.cpp @@ -270,7 +270,7 @@ void PropertyEditor::addChildProperties(PropertyItem *parent) machine(prop); } -// qWarning("seeking tqchildren: count: %d", prop->details.count()); +// qWarning("seeking children: count: %d", prop->details.count()); parent->setOpen(true); for (TQValueList<ChildProperty>::iterator it = prop->details.begin(); it != prop->details.end(); ++it) @@ -301,7 +301,7 @@ void PropertyEditor::propertyValueChanged(Property *property) m_currentEditWidget->setValue(property->value(), false); else { -// tqrepaint all items +// repaint all items TQListViewItemIterator it(this); while (it.current()) { @@ -386,7 +386,7 @@ void PropertyEditor::placeEditor(PropertyItem *item) m_currentEditLayout->addWidget(editor, 0, 0); m_currentEditLayout->addWidget(m_undoButton, 0, 1); m_currentEditArea->resize(r.size()); -// m_currentEditLayout->tqinvalidate(); +// m_currentEditLayout->invalidate(); moveChild(m_currentEditArea, r.x(), r.y()); m_currentEditWidget = editor; } diff --git a/lib/widgets/propeditor/psizeedit.cpp b/lib/widgets/propeditor/psizeedit.cpp index c4d28402..a39bd9fd 100644 --- a/lib/widgets/propeditor/psizeedit.cpp +++ b/lib/widgets/propeditor/psizeedit.cpp @@ -46,13 +46,13 @@ void PSizeEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r p->setPen(TQt::NoPen); p->setBrush(cg.background()); p->drawRect(r); - p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("[ %1, %2 ]").tqarg(value.toSize().width()).tqarg(value.toSize().height())); + p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("[ %1, %2 ]").arg(value.toSize().width()).arg(value.toSize().height())); } void PSizeEdit::setValue(const TQVariant& value, bool emitChange) { m_value = value; - m_edit->setText(TQString("[ %1, %2 ]").tqarg(value.toSize().width()).tqarg(value.toSize().height())); + m_edit->setText(TQString("[ %1, %2 ]").arg(value.toSize().width()).arg(value.toSize().height())); if (emitChange) emit propertyChanged(m_property, value); diff --git a/lib/widgets/propeditor/psizepolicyedit.cpp b/lib/widgets/propeditor/psizepolicyedit.cpp index d9ec7869..652fc616 100644 --- a/lib/widgets/propeditor/psizepolicyedit.cpp +++ b/lib/widgets/propeditor/psizepolicyedit.cpp @@ -47,13 +47,13 @@ void PSizePolicyEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQR p->setPen(TQt::NoPen); p->setBrush(cg.background()); p->drawRect(r); - p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("%1/%2/%3/%4").tqarg(findValueDescription(value.toSizePolicy().horData())).tqarg(findValueDescription(value.toSizePolicy().verData())).tqarg(value.toSizePolicy().horStretch()).tqarg(value.toSizePolicy().verStretch())); + p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("%1/%2/%3/%4").arg(findValueDescription(value.toSizePolicy().horData())).arg(findValueDescription(value.toSizePolicy().verData())).arg(value.toSizePolicy().horStretch()).arg(value.toSizePolicy().verStretch())); } void PSizePolicyEdit::setValue(const TQVariant& value, bool emitChange) { m_value = value; - m_edit->setText(TQString("%1/%2/%3/%4").tqarg(findValueDescription(value.toSizePolicy().horData())).tqarg(findValueDescription(value.toSizePolicy().verData())).tqarg(value.toSizePolicy().horStretch()).tqarg(value.toSizePolicy().verStretch())); + m_edit->setText(TQString("%1/%2/%3/%4").arg(findValueDescription(value.toSizePolicy().horData())).arg(findValueDescription(value.toSizePolicy().verData())).arg(value.toSizePolicy().horStretch()).arg(value.toSizePolicy().verStretch())); if (emitChange) emit propertyChanged(m_property, value); diff --git a/lib/widgets/propeditor/psymbolcombo.cpp b/lib/widgets/propeditor/psymbolcombo.cpp index 6116ca8c..6000d96a 100644 --- a/lib/widgets/propeditor/psymbolcombo.cpp +++ b/lib/widgets/propeditor/psymbolcombo.cpp @@ -58,7 +58,7 @@ PSymbolCombo::PSymbolCombo(MultiProperty *property, TQWidget *parent, const char TQVariant PSymbolCombo::value() const { if (!(m_edit->text().isNull())) - return TQVariant(TQString("%1").tqarg(m_edit->text().tqat(0).tqunicode())); + return TQVariant(TQString("%1").arg(m_edit->text().at(0).tqunicode())); else return TQVariant(0); } @@ -109,7 +109,7 @@ void PSymbolCombo::selectChar() void PSymbolCombo::updateProperty(const TQString& val) { - emit propertyChanged(m_property, TQVariant(TQString("%1").tqarg(val.tqat(0).tqunicode()))); + emit propertyChanged(m_property, TQVariant(TQString("%1").arg(val.at(0).tqunicode()))); } void PSymbolCombo::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value) diff --git a/lib/widgets/propeditor/qfloatinput.cpp b/lib/widgets/propeditor/qfloatinput.cpp index 1922ea6a..f2fefed8 100644 --- a/lib/widgets/propeditor/qfloatinput.cpp +++ b/lib/widgets/propeditor/qfloatinput.cpp @@ -38,7 +38,7 @@ TQFloatInput::TQFloatInput( int min, int max, float step, int digits, TQString TQFloatInput::mapValueToText( int value ) { - TQString format = TQString("%.%1f").tqarg( m_digits ); + TQString format = TQString("%.%1f").arg( m_digits ); return TQString().sprintf(format.latin1(), (value/(float)pow(m_digits,10)) ); } diff --git a/lib/widgets/qcomboview.cpp b/lib/widgets/qcomboview.cpp index 99ce12e4..4db96f46 100644 --- a/lib/widgets/qcomboview.cpp +++ b/lib/widgets/qcomboview.cpp @@ -88,7 +88,7 @@ void QComboViewData::updateLinedGeometry() const TQPixmap *pix = combo->currentItem() ? combo->currentItem()->pixmap(0) : 0; if ( pix && pix->width() < r.width() ) r.setLeft( r.left() + pix->width() + 4 ); - if ( r != ed->tqgeometry() ) + if ( r != ed->geometry() ) ed->setGeometry( r ); } @@ -269,7 +269,7 @@ void QComboView::setAutoResize( bool enable ) reimp This implementation caches the size hint to avoid resizing when - the contents change dynamically. To tqinvalidate the cached value + the contents change dynamically. To invalidate the cached value call setFont(). */ TQSize QComboView::sizeHint() const @@ -385,7 +385,7 @@ void QComboView::setPalette( const TQPalette &palette ) void QComboView::setFont( const TQFont &font ) { - d->sizeHint = TQSize(); // tqinvalidate size hint + d->sizeHint = TQSize(); // invalidate size hint TQWidget::setFont( font ); d->listView()->setFont( font ); if (d->ed) @@ -489,7 +489,7 @@ void QComboView::mousePressEvent( TQMouseEvent *e ) if ( arrowRect.contains( e->pos() ) ) { d->arrowPressed = TRUE; d->arrowDown = TRUE; - tqrepaint( FALSE ); + repaint( FALSE ); } TQTimer::singleShot( 200, this, TQT_SLOT(internalClickTimeout())); d->shortClick = TRUE; @@ -808,7 +808,7 @@ void QComboView::popDownListView() d->listView()->setCurrentItem( d->current ); if ( d->arrowDown ) { d->arrowDown = FALSE; - tqrepaint( FALSE ); + repaint( FALSE ); } d->poppedUp = FALSE; } @@ -908,12 +908,12 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event ) if ( arrowRect.contains( comboPos ) ) { if ( !d->arrowDown ) { d->arrowDown = TRUE; - tqrepaint( FALSE ); + repaint( FALSE ); } } else { if ( d->arrowDown ) { d->arrowDown = FALSE; - tqrepaint( FALSE ); + repaint( FALSE ); } } } @@ -948,7 +948,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event ) d->arrowPressed = FALSE; if ( d->arrowDown ) { d->arrowDown = FALSE; - tqrepaint( FALSE ); + repaint( FALSE ); } } } @@ -1333,7 +1333,7 @@ bool QComboView::autoCompletion() const */ void QComboView::styleChange( TQStyle& s ) { - d->sizeHint = TQSize(); // tqinvalidate size hint... + d->sizeHint = TQSize(); // invalidate size hint... if ( d->ed ) d->updateLinedGeometry(); TQWidget::styleChange( s ); |