summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--microbe/expression.cpp16
-rw-r--r--microbe/instruction.cpp14
-rw-r--r--microbe/instruction.h2
-rw-r--r--microbe/microbe.cpp6
-rw-r--r--microbe/optimizer.cpp2
-rw-r--r--microbe/parser.cpp26
-rw-r--r--microbe/pic14.cpp2
-rw-r--r--src/asmformatter.cpp8
-rw-r--r--src/canvasmanipulator.cpp6
-rw-r--r--src/circuitdocument.cpp6
-rw-r--r--src/circuitdocument.h12
-rw-r--r--src/ciwidgetmgr.cpp16
-rw-r--r--src/cnitem.cpp14
-rw-r--r--src/cnitemgroup.cpp20
-rw-r--r--src/cnitemgroup.h2
-rw-r--r--src/debugmanager.cpp2
-rw-r--r--src/docmanager.cpp6
-rw-r--r--src/document.cpp2
-rw-r--r--src/drawparts/drawpart.cpp2
-rw-r--r--src/electronics/components/multiinputgate.cpp2
-rw-r--r--src/electronics/components/piccomponent.cpp6
-rw-r--r--src/electronics/components/ram.cpp2
-rw-r--r--src/electronics/gpsimprocessor.cpp30
-rw-r--r--src/electronics/pin.cpp14
-rw-r--r--src/electronics/simulation/circuit.cpp12
-rw-r--r--src/electronics/simulation/circuit.h2
-rw-r--r--src/electronics/simulation/elementset.cpp2
-rw-r--r--src/filemetainfo.cpp2
-rw-r--r--src/flowcodedocument.cpp4
-rw-r--r--src/flowparts/embed.cpp2
-rw-r--r--src/flowparts/flowpart.cpp14
-rw-r--r--src/flowparts/pinmapping.cpp4
-rw-r--r--src/gui/contexthelp.cpp4
-rw-r--r--src/gui/doublespinbox.cpp2
-rw-r--r--src/gui/itemselector.cpp14
-rw-r--r--src/gui/logview.cpp12
-rw-r--r--src/gui/microsettingsdlg.cpp6
-rw-r--r--src/gui/newfiledlg.cpp14
-rw-r--r--src/gui/oscilloscope.cpp4
-rw-r--r--src/gui/projectdlgs.cpp2
-rw-r--r--src/gui/settingsdlg.cpp2
-rw-r--r--src/icndocument.cpp24
-rw-r--r--src/item.cpp18
-rw-r--r--src/item.h2
-rw-r--r--src/itemdocument.cpp10
-rw-r--r--src/itemdocumentdata.cpp10
-rw-r--r--src/itemgroup.cpp8
-rw-r--r--src/itemgroup.h2
-rw-r--r--src/iteminterface.cpp22
-rw-r--r--src/itemlibrary.cpp6
-rw-r--r--src/katemdi.cpp6
-rw-r--r--src/ktechlab.cpp6
-rw-r--r--src/languages/asmparser.cpp8
-rw-r--r--src/languages/externallanguage.cpp2
-rw-r--r--src/languages/flowcode.cpp12
-rw-r--r--src/languages/gpasm.cpp4
-rw-r--r--src/languages/gpdasm.cpp10
-rw-r--r--src/languages/gplib.cpp10
-rw-r--r--src/languages/gplink.cpp10
-rw-r--r--src/languages/language.cpp8
-rw-r--r--src/languages/microbe.cpp8
-rw-r--r--src/languages/picprogrammer.cpp12
-rw-r--r--src/mechanics/mechanicsdocument.cpp4
-rw-r--r--src/mechanics/mechanicsgroup.cpp14
-rw-r--r--src/mechanics/mechanicsgroup.h2
-rw-r--r--src/mechanics/mechanicssimulation.cpp2
-rw-r--r--src/micro/micropackage.cpp4
-rw-r--r--src/microsettings.cpp14
-rw-r--r--src/node.cpp8
-rw-r--r--src/nodegroup.cpp24
-rw-r--r--src/nodegroup.h2
-rw-r--r--src/projectmanager.cpp6
-rw-r--r--src/resizeoverlay.cpp6
-rw-r--r--src/simulator.cpp2
-rw-r--r--src/textdocument.cpp2
-rw-r--r--src/textview.cpp2
-rw-r--r--src/variant.cpp4
-rw-r--r--src/viewcontainer.cpp28
78 files changed, 321 insertions, 321 deletions
diff --git a/microbe/expression.cpp b/microbe/expression.cpp
index 33a70f2..cfa2d95 100644
--- a/microbe/expression.cpp
+++ b/microbe/expression.cpp
@@ -493,12 +493,12 @@ void Expression::compileExpression( const TQString & expression )
void Expression::compileConditional( const TQString & expression, Code * ifCode, Code * elseCode )
{
- if( expression.tqcontains(TQRegExp("=>|=<|=!")) )
+ if( expression.contains(TQRegExp("=>|=<|=!")) )
{
mistake( Microbe::InvalidComparison, expression );
return;
}
- if( expression.tqcontains(TQRegExp("[^=><!][=][^=]")))
+ if( expression.contains(TQRegExp("[^=><!][=][^=]")))
{
mistake( Microbe::InvalidEquals );
return;
@@ -716,7 +716,7 @@ void Expression::expressionValue( TQString expr, BTreeBase */*tree*/, BTreeNode
}
// Check for the most common mistake ever!
- if(expr.tqcontains("="))
+ if(expr.contains("="))
mistake( Microbe::InvalidEquals );
// Check for reserved keywords
if(expr=="to"||expr=="step"||expr=="then")
@@ -726,7 +726,7 @@ void Expression::expressionValue( TQString expr, BTreeBase */*tree*/, BTreeNode
// both indicating a Mistake.
if(expr.isEmpty())
mistake( Microbe::ConsecutiveOperators );
- else if(expr.tqcontains(TQRegExp("\\s")) && t!= extpin)
+ else if(expr.contains(TQRegExp("\\s")) && t!= extpin)
mistake( Microbe::MissingOperator );
if( t == variable && !mb->isVariableKnown(expr) && !m_pic->isValidPort( expr ) && !m_pic->isValidTris( expr ) )
@@ -750,11 +750,11 @@ void Expression::expressionValue( TQString expr, BTreeBase */*tree*/, BTreeNode
if( t == extpin )
{
bool NOT;
- int i = expr.tqfind("is");
+ int i = expr.find("is");
if(i > 0)
{
- NOT = expr.tqcontains("low");
- if(!expr.tqcontains("high") && !expr.tqcontains("low"))
+ NOT = expr.contains("low");
+ if(!expr.contains("high") && !expr.contains("low"))
mistake( Microbe::HighLowExpected, expr );
expr = expr.left(i-1);
}
@@ -796,7 +796,7 @@ ExprType Expression::expressionType( const TQString & expression )
if ( value != -1 )
return number;
- if( expression.tqcontains('.') )
+ if( expression.contains('.') )
return extpin;
if ( mb->variable( expression ).type() == Variable::keypadType )
diff --git a/microbe/instruction.cpp b/microbe/instruction.cpp
index b05423c..5e41fc8 100644
--- a/microbe/instruction.cpp
+++ b/microbe/instruction.cpp
@@ -780,7 +780,7 @@ uchar & RegisterDepends::reg( const Register & reg )
return status;
// If we don't already have the register, we need to reset it first
- if ( !m_registers.tqcontains( reg.name() ) )
+ if ( !m_registers.contains( reg.name() ) )
m_registers[ reg ] = 0xff;
return m_registers[ reg ];
@@ -905,7 +905,7 @@ Instruction * Code::instruction( const TQString & label ) const
InstructionList::const_iterator end = m_instructionLists[i].end();
for ( InstructionList::const_iterator it = m_instructionLists[i].begin(); it != end; ++it )
{
- if ( (*it)->labels().tqcontains( label ) )
+ if ( (*it)->labels().contains( label ) )
return *it;
}
}
@@ -913,7 +913,7 @@ Instruction * Code::instruction( const TQString & label ) const
}
-Code::iterator Code::tqfind( Instruction * instruction )
+Code::iterator Code::find( Instruction * instruction )
{
iterator e = end();
iterator i = begin();
@@ -1020,7 +1020,7 @@ TQStringList Code::findVariables() const
continue;
TQString alias = (*i)->file().name();
- if ( !variables.tqcontains( alias ) )
+ if ( !variables.contains( alias ) )
variables << alias;
}
@@ -1304,7 +1304,7 @@ void Instruction::makeLabelOutputLink( const TQString & label )
void Instruction::addInputLink( Instruction * instruction )
{
// Don't forget that a link to ourself is valid!
- if ( !instruction || m_inputLinks.tqcontains( instruction ) )
+ if ( !instruction || m_inputLinks.contains( instruction ) )
return;
m_inputLinks << instruction;
@@ -1315,7 +1315,7 @@ void Instruction::addInputLink( Instruction * instruction )
void Instruction::addOutputLink( Instruction * instruction )
{
// Don't forget that a link to ourself is valid!
- if ( !instruction || m_outputLinks.tqcontains( instruction ) )
+ if ( !instruction || m_outputLinks.contains( instruction ) )
return;
m_outputLinks << instruction;
@@ -2035,7 +2035,7 @@ void Instr_call::linkReturns( Instruction * current, Instruction * returnPoint )
{
// Jump over the call instruction to its return point,
// which will be the instruction after current.
- current = *(++m_pCode->tqfind( current ));
+ current = *(++m_pCode->find( current ));
continue;
}
diff --git a/microbe/instruction.h b/microbe/instruction.h
index 595dd16..ce5a6f3 100644
--- a/microbe/instruction.h
+++ b/microbe/instruction.h
@@ -512,7 +512,7 @@ class Code
* @return an iterator to the current instruction, or end if it wasn't
* found.
*/
- iterator tqfind( Instruction * instruction );
+ iterator find( Instruction * instruction );
/**
* Removes the Instruction (regardless of position).
* @warning You should always use only this function to remove an
diff --git a/microbe/microbe.cpp b/microbe/microbe.cpp
index 847dc88..3c7dbef 100644
--- a/microbe/microbe.cpp
+++ b/microbe/microbe.cpp
@@ -394,7 +394,7 @@ TQString Microbe::alias( const TQString & alias ) const
{
// If the string is an alias, return the real string,
// otherwise just return the alias as that is the real string.
- AliasMap::const_iterator it = m_aliasList.tqfind(alias);
+ AliasMap::const_iterator it = m_aliasList.find(alias);
if ( it != m_aliasList.constEnd() )
return it.data();
return alias;
@@ -404,7 +404,7 @@ TQString Microbe::alias( const TQString & alias ) const
void Microbe::setInterruptUsed(const TQString &interruptName)
{
// Don't add it again if it is already in the list
- if ( m_usedInterrupts.tqcontains( interruptName ) )
+ if ( m_usedInterrupts.contains( interruptName ) )
return;
m_usedInterrupts.append(interruptName);
}
@@ -412,7 +412,7 @@ void Microbe::setInterruptUsed(const TQString &interruptName)
bool Microbe::isInterruptUsed( const TQString & interruptName )
{
- return m_usedInterrupts.tqcontains( interruptName );
+ return m_usedInterrupts.contains( interruptName );
}
diff --git a/microbe/optimizer.cpp b/microbe/optimizer.cpp
index 7b8d059..03e3110 100644
--- a/microbe/optimizer.cpp
+++ b/microbe/optimizer.cpp
@@ -160,7 +160,7 @@ bool Optimizer::pruneInstructions()
TQStringList::iterator labelsEnd = labels.end();
for ( TQStringList::iterator labelsIt = labels.begin(); labelsIt != labelsEnd; )
{
- if ( !referencedLabels.tqcontains( *labelsIt ) )
+ if ( !referencedLabels.contains( *labelsIt ) )
{
labelsIt = labels.erase( labelsIt );
removed = true;
diff --git a/microbe/parser.cpp b/microbe/parser.cpp
index 0bf3fea..0e5545d 100644
--- a/microbe/parser.cpp
+++ b/microbe/parser.cpp
@@ -203,7 +203,7 @@ Code * Parser::parse( const SourceLineList & lines )
TQString command; // e.g. "delay", "for", "subroutine", "increment", etc
{
- int spacepos = line.tqfind(' ');
+ int spacepos = line.find(' ');
if ( spacepos >= 0 )
command = line.left( spacepos );
else
@@ -218,7 +218,7 @@ Code * Parser::parse( const SourceLineList & lines )
m_code->append(new Instr_sourceCode("{"));
// Use the first token in the line to look up the statement type
- DefinitionMap::Iterator dmit = m_definitionMap.tqfind(command);
+ DefinitionMap::Iterator dmit = m_definitionMap.find(command);
if(dmit == m_definitionMap.end())
{
if( !processAssignment( (*sit).text() ) )
@@ -269,7 +269,7 @@ Code * Parser::parse( const SourceLineList & lines )
case (Field::Variable):
case (Field::Name):
{
- newPosition = line.tqfind( ' ', position );
+ newPosition = line.find( ' ', position );
if(position == newPosition)
{
newPosition = -1;
@@ -303,12 +303,12 @@ Code * Parser::parse( const SourceLineList & lines )
{
nextField = (*it);
if(nextField.type() == Field::FixedString)
- newPosition = line.tqfind(TQRegExp("\\b" + nextField.string() + "\\b"));
+ newPosition = line.find(TQRegExp("\\b" + nextField.string() + "\\b"));
// Although code is not neccessarily braced, after an expression it is the only
// sensilbe way to have it.
else if(nextField.type() == Field::Code)
{
- newPosition = line.tqfind("{");
+ newPosition = line.find("{");
if(newPosition == -1) newPosition = line.length() + 1;
}
else if(nextField.type() == Field::Newline)
@@ -367,7 +367,7 @@ Code * Parser::parse( const SourceLineList & lines )
case (Field::FixedString):
{
// Is the string found, and is it starting in the right place?
- int stringPosition = line.tqfind(TQRegExp("\\b"+field.string()+"\\b"));
+ int stringPosition = line.find(TQRegExp("\\b"+field.string()+"\\b"));
if( stringPosition != position || stringPosition == -1 )
{
if( !field.compulsory() )
@@ -402,7 +402,7 @@ Code * Parser::parse( const SourceLineList & lines )
if( nextField.type() == Field::FixedString )
{
nextStatement = *(++StatementList::Iterator(sit));
- newPosition = nextStatement.text().tqfind(TQRegExp("\\b" + nextField.string() + "\\b"));
+ newPosition = nextStatement.text().find(TQRegExp("\\b" + nextField.string() + "\\b"));
if(newPosition != 0)
{
// If the next field is optional just carry on as nothing happened,
@@ -476,7 +476,7 @@ bool Parser::processAssignment(const TQString &line)
// Look for port variables first.
- if ( firstToken.tqcontains(".") )
+ if ( firstToken.contains(".") )
{
PortPin portPin = m_pPic->toPortPin( firstToken );
@@ -502,14 +502,14 @@ bool Parser::processAssignment(const TQString &line)
if ( tokens[1] != "=" )
mistake( Microbe::UnassignedPort, tokens[1] );
- Expression( m_pPic, mb, m_currentSourceLine, false ).compileExpression(line.mid(line.tqfind("=")+1));
+ Expression( m_pPic, mb, m_currentSourceLine, false ).compileExpression(line.mid(line.find("=")+1));
m_pPic->saveResultToVar( firstToken );
}
else if ( m_pPic->isValidTris( firstToken ) )
{
if( tokens[1] == "=" )
{
- Expression( m_pPic, mb, m_currentSourceLine, false ).compileExpression(line.mid(line.tqfind("=")+1));
+ Expression( m_pPic, mb, m_currentSourceLine, false ).compileExpression(line.mid(line.find("=")+1));
m_pPic->Stristate(firstToken);
}
}
@@ -529,7 +529,7 @@ bool Parser::processAssignment(const TQString &line)
// hasn't been defined yet.
mb->addVariable( Variable( Variable::charType, firstToken ) );
- Expression( m_pPic, mb, m_currentSourceLine, false ).compileExpression(line.mid(line.tqfind("=")+1));
+ Expression( m_pPic, mb, m_currentSourceLine, false ).compileExpression(line.mid(line.find("=")+1));
Variable v = mb->variable( firstToken );
switch ( v.type() )
@@ -676,7 +676,7 @@ void Parser::processStatement( const TQString & name, const OutputFieldMap & fie
stepPositive = true;
}
- TQString variable = fieldMap["initExpression"].string().mid(0,fieldMap["initExpression"].string().tqfind("=")).stripWhiteSpace();
+ TQString variable = fieldMap["initExpression"].string().mid(0,fieldMap["initExpression"].string().find("=")).stripWhiteSpace();
TQString endExpr = variable+ " <= " + fieldMap["toExpression"].string().stripWhiteSpace();
if( fieldMap["stepExpression"].found() )
@@ -1027,7 +1027,7 @@ OutputField::OutputField( const TQString & string/*, int lineNumber*/ )
{
// only cope with 'sane' strings a.t.m.
// e.g. include "filename.extenstion"
- TQString filename = (*sit).content.mid( (*sit).content.tqfind("\"") ).stripWhiteSpace();
+ TQString filename = (*sit).content.mid( (*sit).content.find("\"") ).stripWhiteSpace();
// don't strip whitespace from within quotes as you
// can have filenames composed entirely of spaces (kind of weird)...
// remove quotes.
diff --git a/microbe/pic14.cpp b/microbe/pic14.cpp
index 548d4de..c9dcf24 100644
--- a/microbe/pic14.cpp
+++ b/microbe/pic14.cpp
@@ -75,7 +75,7 @@ PortPin PIC14::toPortPin( const TQString & portPinString )
}
else
{
- int dotpos = portPinString.tqfind(".");
+ int dotpos = portPinString.find(".");
if ( dotpos == -1 )
return PortPin();
diff --git a/src/asmformatter.cpp b/src/asmformatter.cpp
index 2dc1c79..bb72996 100644
--- a/src/asmformatter.cpp
+++ b/src/asmformatter.cpp
@@ -16,7 +16,7 @@
static TQString extractComment( const TQString & line )
{
- int pos = line.tqfind( ';' );
+ int pos = line.find( ';' );
if ( pos == -1 )
return "";
@@ -191,9 +191,9 @@ InstructionParts::InstructionParts( TQString line )
continue;
}
- if ( PicAsm12bit::self()->operandList().tqcontains( (*it).upper() )
- || PicAsm14bit::self()->operandList().tqcontains( (*it).upper() )
- || PicAsm16bit::self()->operandList().tqcontains( (*it).upper() ) )
+ if ( PicAsm12bit::self()->operandList().contains( (*it).upper() )
+ || PicAsm14bit::self()->operandList().contains( (*it).upper() )
+ || PicAsm16bit::self()->operandList().contains( (*it).upper() ) )
{
m_operand = *it;
foundOperand = true;
diff --git a/src/canvasmanipulator.cpp b/src/canvasmanipulator.cpp
index eb4bd90..cdf3fce 100644
--- a/src/canvasmanipulator.cpp
+++ b/src/canvasmanipulator.cpp
@@ -71,7 +71,7 @@ CMManager::~CMManager()
void CMManager::addManipulatorInfo( ManipulatorInfo *eventInfo )
{
- if ( eventInfo && !m_manipulatorInfoList.tqcontains(eventInfo) ) {
+ if ( eventInfo && !m_manipulatorInfoList.contains(eventInfo) ) {
m_manipulatorInfoList.prepend(eventInfo);
}
}
@@ -961,7 +961,7 @@ bool CMItemMove::mousePressedInitial( const EventInfo &eventInfo )
return true;
- if ( !p_selectList->tqcontains(item) )
+ if ( !p_selectList->contains(item) )
{
if (!eventInfo.ctrlPressed)
p_itemDocument->unselectAll();
@@ -1255,7 +1255,7 @@ bool CMMechItemMove::mousePressedInitial( const EventInfo &eventInfo )
mechItem->setParentItem(0l);
}
}
- else if ( !p_selectList->tqcontains(mechItem) )
+ else if ( !p_selectList->contains(mechItem) )
{
if (!eventInfo.ctrlPressed)
p_mechanicsDocument->unselectAll();
diff --git a/src/circuitdocument.cpp b/src/circuitdocument.cpp
index dfdf4cb..bd9ea39 100644
--- a/src/circuitdocument.cpp
+++ b/src/circuitdocument.cpp
@@ -295,7 +295,7 @@ void CircuitDocument::componentAdded( Item * item )
// We don't attach the component to the Simulator just yet, as the
// Component's vtable is not yet fully constructed, and so Simulator can't
// tell whether or not it is a logic component
- if ( !m_toSimulateList.tqcontains(component) )
+ if ( !m_toSimulateList.contains(component) )
m_toSimulateList << component;
}
@@ -512,7 +512,7 @@ void CircuitDocument::getPartition( Pin *pin, PinList *pinList, PinList *unassig
unassignedPins->remove(pin);
- if ( pinList->tqcontains(pin) )
+ if ( pinList->contains(pin) )
return;
pinList->append(pin);
@@ -608,7 +608,7 @@ void CircuitDocument::recursivePinAdd( Pin *pin, Circuitoid *circuitoid, PinList
if ( pin->eqId() != -1 )
unassignedPins->remove(pin);
- if ( circuitoid->tqcontains(pin) )
+ if ( circuitoid->contains(pin) )
return;
circuitoid->addPin(pin);
diff --git a/src/circuitdocument.h b/src/circuitdocument.h
index 76db48c..ed874bd 100644
--- a/src/circuitdocument.h
+++ b/src/circuitdocument.h
@@ -39,13 +39,13 @@ typedef TQValueList<TQGuardedPtr<Wire> > WireList;
class Circuitoid
{
public:
- bool tqcontains( Pin *node ) { return pinList.tqcontains(node); }
- bool tqcontains( Wire *con ) { return wireList.tqcontains(con); }
- bool tqcontains( Element *ele ) { return elementList.tqcontains(ele); }
+ bool contains( Pin *node ) { return pinList.contains(node); }
+ bool contains( Wire *con ) { return wireList.contains(con); }
+ bool contains( Element *ele ) { return elementList.contains(ele); }
- void addPin( Pin *node ) { if (node && !tqcontains(node)) pinList += node; }
- void addWire( Wire *con ) { if (con && !tqcontains(con)) wireList += con; }
- void addElement( Element *ele ) { if (ele && !tqcontains(ele)) elementList += ele; }
+ void addPin( Pin *node ) { if (node && !contains(node)) pinList += node; }
+ void addWire( Wire *con ) { if (con && !contains(con)) wireList += con; }
+ void addElement( Element *ele ) { if (ele && !contains(ele)) elementList += ele; }
WireList wireList;
PinList pinList;
diff --git a/src/ciwidgetmgr.cpp b/src/ciwidgetmgr.cpp
index e12caac..b159de6 100644
--- a/src/ciwidgetmgr.cpp
+++ b/src/ciwidgetmgr.cpp
@@ -53,7 +53,7 @@ void CIWidgetMgr::setDrawWidgets( bool draw )
Widget *CIWidgetMgr::widgetWithID( const TQString &id ) const
{
- WidgetMap::const_iterator it = m_widgetMap.tqfind(id);
+ WidgetMap::const_iterator it = m_widgetMap.find(id);
if ( it == m_widgetMap.end() )
return 0l;
else return it.data();
@@ -100,7 +100,7 @@ void CIWidgetMgr::drawWidgets( TQPainter &p )
void CIWidgetMgr::removeWidget( const TQString & id )
{
- if ( !m_widgetMap.tqcontains(id) )
+ if ( !m_widgetMap.contains(id) )
return;
delete m_widgetMap[id];
@@ -115,7 +115,7 @@ Button* CIWidgetMgr::addButton( const TQString &id, const TQRect & pos, const TQ
Button *button = new Button( id, p_cnItem, toggle, pos, p_canvas );
(dynamic_cast<TQButton*>(button->widget()))->setText(display);
- it = m_widgetMap.tqfind(id);
+ it = m_widgetMap.find(id);
if ( it == m_widgetMap.end() )
{
m_widgetMap[id] = button;
@@ -139,7 +139,7 @@ Button* CIWidgetMgr::addButton( const TQString &id, const TQRect & pos, TQPixmap
Button *button = new Button( id, p_cnItem, toggle, pos, p_canvas );
button->setPixmap(pixmap);
- it = m_widgetMap.tqfind(id);
+ it = m_widgetMap.find(id);
if ( it == m_widgetMap.end() )
{
m_widgetMap[id] = button;
@@ -167,7 +167,7 @@ Slider* CIWidgetMgr::addSlider( const TQString &id, int minValue, int maxValue,
qslider->setValue(value);
slider->setOrientation(orientation);
- WidgetMap::iterator it = m_widgetMap.tqfind(id);
+ WidgetMap::iterator it = m_widgetMap.find(id);
if ( it == m_widgetMap.end() )
{
m_widgetMap[id] = slider;
@@ -191,7 +191,7 @@ bool CIWidgetMgr::mousePressEvent( const EventInfo &info )
const WidgetMap::iterator widgetMapEnd = m_widgetMap.end();
for ( WidgetMap::iterator it = m_widgetMap.begin(); it != widgetMapEnd; ++it )
{
- if ( it.data()->rect().tqcontains(info.pos) )
+ if ( it.data()->rect().contains(info.pos) )
{
it.data()->mousePressEvent(e);
if (e->isAccepted())
@@ -229,7 +229,7 @@ bool CIWidgetMgr::mouseDoubleClickEvent( const EventInfo &info )
const WidgetMap::iterator widgetMapEnd = m_widgetMap.end();
for ( WidgetMap::iterator it = m_widgetMap.begin(); it != widgetMapEnd; ++it )
{
- if ( it.data()->rect().tqcontains(info.pos) )
+ if ( it.data()->rect().contains(info.pos) )
{
it.data()->mouseDoubleClickEvent(e);
if (e->isAccepted())
@@ -270,7 +270,7 @@ bool CIWidgetMgr::wheelEvent( const EventInfo &info )
const WidgetMap::iterator widgetMapEnd = m_widgetMap.end();
for ( WidgetMap::iterator it = m_widgetMap.begin(); it != widgetMapEnd; ++it )
{
- if ( it.data()->rect().tqcontains(info.pos) )
+ if ( it.data()->rect().contains(info.pos) )
{
it.data()->wheelEvent(e);
if (e->isAccepted())
diff --git a/src/cnitem.cpp b/src/cnitem.cpp
index 02e7881..acf662c 100644
--- a/src/cnitem.cpp
+++ b/src/cnitem.cpp
@@ -156,7 +156,7 @@ ConnectorList CNItem::connectorList()
ConnectorList::iterator end = nodeList.end();
for ( ConnectorList::iterator it = nodeList.begin(); it != end; ++it )
{
- if ( *it && !list.tqcontains(*it) )
+ if ( *it && !list.contains(*it) )
{
list.append(*it);
}
@@ -165,7 +165,7 @@ ConnectorList CNItem::connectorList()
end = nodeList.end();
for ( ConnectorList::iterator it = nodeList.begin(); it != end; ++it )
{
- if ( *it && !list.tqcontains(*it) )
+ if ( *it && !list.contains(*it) )
{
list.append(*it);
}
@@ -286,7 +286,7 @@ Node* CNItem::createNode( double _x, double _y, int orientation, const TQString
bool CNItem::removeNode( const TQString &name )
{
- NodeMap::iterator it = m_nodeMap.tqfind(name);
+ NodeMap::iterator it = m_nodeMap.find(name);
if ( it == m_nodeMap.end() ) {
return false;
}
@@ -574,7 +574,7 @@ void CNItem::updateConnectorPoints( bool add )
Text* CNItem::addDisplayText( const TQString &id, const TQRect & pos, const TQString &display, bool internal, int flags )
{
Text *text = 0l;
- TextMap::iterator it = m_textMap.tqfind(id);
+ TextMap::iterator it = m_textMap.find(id);
if ( it != m_textMap.end() )
{
// kdWarning() << "CNItem::addDisplayText: removing old text"<<endl;
@@ -596,7 +596,7 @@ Text* CNItem::addDisplayText( const TQString &id, const TQRect & pos, const TQSt
void CNItem::setDisplayText( const TQString &id, const TQString &display )
{
- TextMap::iterator it = m_textMap.tqfind(id);
+ TextMap::iterator it = m_textMap.find(id);
if ( it == m_textMap.end() )
{
kdError() << "CNItem::setDisplayText: Could not find text with id \""<<id<<"\""<<endl;
@@ -609,7 +609,7 @@ void CNItem::setDisplayText( const TQString &id, const TQString &display )
void CNItem::removeDisplayText( const TQString &id )
{
- TextMap::iterator it = m_textMap.tqfind(id);
+ TextMap::iterator it = m_textMap.find(id);
if ( it == m_textMap.end() )
{
// kdError() << "CNItem::removeDisplayText: Could not find text with id \""<<id<<"\""<<endl;
@@ -623,7 +623,7 @@ void CNItem::removeDisplayText( const TQString &id )
TQString CNItem::nodeId( const TQString &internalNodeId )
{
- NodeMap::iterator it = m_nodeMap.tqfind(internalNodeId);
+ NodeMap::iterator it = m_nodeMap.find(internalNodeId);
if ( it == m_nodeMap.end() ) return "";
else return it.data().id;
}
diff --git a/src/cnitemgroup.cpp b/src/cnitemgroup.cpp
index 9d8030f..7252c91 100644
--- a/src/cnitemgroup.cpp
+++ b/src/cnitemgroup.cpp
@@ -38,7 +38,7 @@ bool CNItemGroup::addItem( Item *item )
// of the list as the most recently added item if some
// the previous activeCNItem is removed
- if ( !item || !item->canvas() || m_itemList.tqcontains(item) || !item->isMovable() )
+ if ( !item || !item->canvas() || m_itemList.contains(item) || !item->isMovable() )
return false;
if ( m_currentLevel != -1 && item->level() > m_currentLevel )
@@ -59,7 +59,7 @@ bool CNItemGroup::addItem( Item *item )
bool CNItemGroup::addNode( Node *node )
{
- if ( !node || m_nodeList.tqcontains(node) || node->isChildNode() )
+ if ( !node || m_nodeList.contains(node) || node->isChildNode() )
return false;
m_nodeList.prepend(node);
node->setSelected(true);
@@ -71,7 +71,7 @@ bool CNItemGroup::addNode( Node *node )
bool CNItemGroup::addConnector( Connector *con )
{
- if ( !con || m_connectorList.tqcontains(con) )
+ if ( !con || m_connectorList.contains(con) )
return false;
m_connectorList.prepend(con);
con->setSelected(true);
@@ -184,7 +184,7 @@ void CNItemGroup::setItems( TQCanvasItemList list )
void CNItemGroup::removeItem( Item *item )
{
- if ( !item || !m_itemList.tqcontains(item) )
+ if ( !item || !m_itemList.contains(item) )
return;
unregisterItem(item);
if ( m_activeItem == item )
@@ -198,7 +198,7 @@ void CNItemGroup::removeItem( Item *item )
void CNItemGroup::removeNode( Node *node )
{
- if ( !node || !m_nodeList.tqcontains(node) )
+ if ( !node || !m_nodeList.contains(node) )
return;
m_nodeList.remove(node);
node->setSelected(false);
@@ -209,7 +209,7 @@ void CNItemGroup::removeNode( Node *node )
void CNItemGroup::removeConnector( Connector *con )
{
- if ( !con || !m_connectorList.tqcontains(con) ) return;
+ if ( !con || !m_connectorList.contains(con) ) return;
m_connectorList.remove(con);
con->setSelected(false);
updateInfo();
@@ -257,7 +257,7 @@ NodeList CNItemGroup::nodes( bool excludeParented ) const
NodeList::const_iterator internalEnd = internal.end();
for ( NodeList::const_iterator intIt = internal.begin(); intIt != internalEnd; ++intIt )
{
- if ( *intIt && !nodeList.tqcontains(*intIt) )
+ if ( *intIt && !nodeList.contains(*intIt) )
nodeList << *intIt;
}
}
@@ -279,7 +279,7 @@ ConnectorList CNItemGroup::connectors( bool excludeParented ) const
ConnectorList::iterator tcEnd = translatableConnectors.end();
for ( ConnectorList::iterator it = translatableConnectors.begin(); it != tcEnd; ++it )
{
- if ( *it && !connectorList.tqcontains(*it) )
+ if ( *it && !connectorList.contains(*it) )
connectorList << *it;
}
@@ -294,7 +294,7 @@ ConnectorList CNItemGroup::connectors( bool excludeParented ) const
ConnectorList::const_iterator connectedEnd = connected.end();
for ( ConnectorList::const_iterator conIt = connected.begin(); conIt != connectedEnd; ++conIt )
{
- if ( *conIt && !connectorList.tqcontains(*conIt) )
+ if ( *conIt && !connectorList.contains(*conIt) )
connectorList << *conIt;
}
}
@@ -304,7 +304,7 @@ ConnectorList CNItemGroup::connectors( bool excludeParented ) const
}
-bool CNItemGroup::tqcontains( TQCanvasItem *qcanvasItem ) const
+bool CNItemGroup::contains( TQCanvasItem *qcanvasItem ) const
{
if (!qcanvasItem)
return false;
diff --git a/src/cnitemgroup.h b/src/cnitemgroup.h
index 397b637..25dc3ae 100644
--- a/src/cnitemgroup.h
+++ b/src/cnitemgroup.h
@@ -86,7 +86,7 @@ public:
/**
* Returns true if the TQCanvasItem passed is contained in the group
*/
- virtual bool tqcontains( TQCanvasItem *qcanvasItem ) const;
+ virtual bool contains( TQCanvasItem *qcanvasItem ) const;
/**
* Returns the number of Nodes in the CanvasGroup
*/
diff --git a/src/debugmanager.cpp b/src/debugmanager.cpp
index f33c6dc..5350b7c 100644
--- a/src/debugmanager.cpp
+++ b/src/debugmanager.cpp
@@ -72,7 +72,7 @@ void DebugManager::urlOpened( TextDocument * td )
GpsimProcessorList::iterator end = m_processors.end();
for ( GpsimProcessorList::iterator it = m_processors.begin(); it != end; ++it )
{
- if ( !(*it)->sourceFileList().tqcontains( td->url().path() ) )
+ if ( !(*it)->sourceFileList().contains( td->url().path() ) )
continue;
(*it)->setDebugMode( (td->guessedCodeType() == TextDocument::ct_asm) ? GpsimDebugger::AsmDebugger : GpsimDebugger::HLLDebugger );
diff --git a/src/docmanager.cpp b/src/docmanager.cpp
index facedac..35b1c5a 100644
--- a/src/docmanager.cpp
+++ b/src/docmanager.cpp
@@ -119,7 +119,7 @@ Document* DocManager::openURL( const KURL &url, ViewArea *viewArea )
}
TQString fileName = url.fileName();
- TQString extension = fileName.right( fileName.length() - fileName.tqfindRev('.') );
+ TQString extension = fileName.right( fileName.length() - fileName.findRev('.') );
if ( extension == ".circuit" )
return openCircuitFile( url, viewArea );
@@ -207,7 +207,7 @@ TQString DocManager::untitledName( int type )
Document *DocManager::findDocument( const KURL &url ) const
{
// First, look in the associated documents
- if ( m_associatedDocuments.tqcontains(url) )
+ if ( m_associatedDocuments.contains(url) )
return m_associatedDocuments[url];
// Not found, so look in the known documents
@@ -254,7 +254,7 @@ void DocManager::removeDocumentAssociations( Document *document )
void DocManager::handleNewDocument( Document *document, ViewArea *viewArea )
{
- if ( !document || m_documentList.tqcontains(document) )
+ if ( !document || m_documentList.contains(document) )
return;
m_documentList.append(document);
diff --git a/src/document.cpp b/src/document.cpp
index 0610af1..4cd0e6e 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -50,7 +50,7 @@ Document::~Document()
void Document::handleNewView( View *view )
{
- if ( !view || m_viewList.tqcontains(view) )
+ if ( !view || m_viewList.contains(view) )
return;
m_viewList.append(view);
diff --git a/src/drawparts/drawpart.cpp b/src/drawparts/drawpart.cpp
index d16e669..8e5d803 100644
--- a/src/drawparts/drawpart.cpp
+++ b/src/drawparts/drawpart.cpp
@@ -130,7 +130,7 @@ void DrawPart::restoreFromItemData( const ItemData &itemData )
const TQStringMap::const_iterator stringEnd = itemData.dataString.end();
for ( TQStringMap::const_iterator it = itemData.dataString.begin(); it != stringEnd; ++it )
{
- VariantDataMap::iterator vit = m_variantData.tqfind(it.key());
+ VariantDataMap::iterator vit = m_variantData.find(it.key());
if ( vit == m_variantData.end() )
continue;
diff --git a/src/electronics/components/multiinputgate.cpp b/src/electronics/components/multiinputgate.cpp
index 7ebd6ce..c06d982 100644
--- a/src/electronics/components/multiinputgate.cpp
+++ b/src/electronics/components/multiinputgate.cpp
@@ -114,7 +114,7 @@ void MultiInputGate::updateInputs( int newNum )
void MultiInputGate::updateAttachedPositioning()
{
// Check that our ndoes have been created before we attempt to use them
- if ( !m_nodeMap.tqcontains("p1") || !m_nodeMap.tqcontains("in"+TQString::number(m_numInputs-1)) )
+ if ( !m_nodeMap.contains("p1") || !m_nodeMap.contains("in"+TQString::number(m_numInputs-1)) )
return;
int _x = offsetX()+8;
diff --git a/src/electronics/components/piccomponent.cpp b/src/electronics/components/piccomponent.cpp
index 5bfda22..3741182 100644
--- a/src/electronics/components/piccomponent.cpp
+++ b/src/electronics/components/piccomponent.cpp
@@ -205,7 +205,7 @@ void PICComponent::initPackage( MicroInfo * microInfo )
const TQStringList::iterator allPinIDsEnd = allPinIDs.end();
for ( TQStringList::iterator it = allPinIDs.begin(); it != allPinIDsEnd; ++it )
{
- if ( !ioPinIDs.tqcontains(*it) )
+ if ( !ioPinIDs.contains(*it) )
*it = "";
}
//END Get pin IDs
@@ -226,7 +226,7 @@ void PICComponent::initPackage( MicroInfo * microInfo )
const NodeMap::iterator nodeMapEnd = nodeMapCopy.end();
for ( NodeMap::iterator it = nodeMapCopy.begin(); it != nodeMapEnd; ++it )
{
- if ( !ioPinIDs.tqcontains(it.key()) )
+ if ( !ioPinIDs.contains(it.key()) )
removeNode( it.key() );
}
@@ -301,7 +301,7 @@ void PICComponent::slotUpdateFileList()
for ( TQStringList::iterator it = preFileList.begin(); it != end; ++it )
{
TQString file = KURL(*it).path();
- if ( (file.endsWith(".flowcode") || file.endsWith(".asm") || file.endsWith(".cod") || file.endsWith(".basic") || file.endsWith(".microbe") ) && !fileList.tqcontains(file) ) {
+ if ( (file.endsWith(".flowcode") || file.endsWith(".asm") || file.endsWith(".cod") || file.endsWith(".basic") || file.endsWith(".microbe") ) && !fileList.contains(file) ) {
fileList.append(file);
}
}
diff --git a/src/electronics/components/ram.cpp b/src/electronics/components/ram.cpp
index 8c20736..a8b259e 100644
--- a/src/electronics/components/ram.cpp
+++ b/src/electronics/components/ram.cpp
@@ -37,7 +37,7 @@ RAM::RAM( ICNDocument *icnDocument, bool newItem, const char *id )
: Component( icnDocument, newItem, id ? id : "ram" )
{
m_name = i18n("RAM");
- m_desc = i18n("This RAM stores data as a collection of words; each of which tqcontains <i>word size</i> bits of data.<br><br>To read data, set the CS (<i>chip select</i>) and the OE (<i>output enable</i>) pins high, and select the word using the address pins <i>A*</i>. The word is outputted on the data-out pins: <i>DO*</i>.<br><br>To write data, set the CS (<i>chip select</i>) and the WE (<i>write enable</i>) pins high, and select the address to write to with the <i>A*</i> pins. Write to the selected word using the data-in pins: <i>DI*</i>.<br><br>The <i>Address Size</i> is the number of bits that determine an address; so the total number of words stored will be 2^<sup><i>Address Size</i></sup>.");
+ m_desc = i18n("This RAM stores data as a collection of words; each of which contains <i>word size</i> bits of data.<br><br>To read data, set the CS (<i>chip select</i>) and the OE (<i>output enable</i>) pins high, and select the word using the address pins <i>A*</i>. The word is outputted on the data-out pins: <i>DO*</i>.<br><br>To write data, set the CS (<i>chip select</i>) and the WE (<i>write enable</i>) pins high, and select the address to write to with the <i>A*</i> pins. Write to the selected word using the data-in pins: <i>DI*</i>.<br><br>The <i>Address Size</i> is the number of bits that determine an address; so the total number of words stored will be 2^<sup><i>Address Size</i></sup>.");
m_data = 0l;
m_pCS = 0l;
diff --git a/src/electronics/gpsimprocessor.cpp b/src/electronics/gpsimprocessor.cpp
index efa3d88..704aacf 100644
--- a/src/electronics/gpsimprocessor.cpp
+++ b/src/electronics/gpsimprocessor.cpp
@@ -62,7 +62,7 @@ function will remove the duplicated directory path (by searching for a "//").
*/
TQString sanitizeGpsimFile( TQString file )
{
- int pos = file.tqfind("//");
+ int pos = file.find("//");
if ( pos != -1 )
{
file.remove( 0, pos + 1 );
@@ -304,7 +304,7 @@ GpsimProcessor::ProgramFileValidity GpsimProcessor::isValidProgramFile( const TQ
if ( !KStandardDirs::exists(programFile) )
return DoesntExist;
- TQString extension = programFile.right( programFile.length() - programFile.tqfindRev('.') - 1 ).lower();
+ TQString extension = programFile.right( programFile.length() - programFile.findRev('.') - 1 ).lower();
if ( extension == "flowcode" ||
extension == "asm" ||
@@ -313,7 +313,7 @@ GpsimProcessor::ProgramFileValidity GpsimProcessor::isValidProgramFile( const TQ
extension == "c" )
return Valid;
- if ( extension == "hex" && TQFile::exists( TQString(programFile).tqreplace(".hex",".cod") ) )
+ if ( extension == "hex" && TQFile::exists( TQString(programFile).replace(".hex",".cod") ) )
return Valid;
return IncorrectType;
@@ -325,7 +325,7 @@ TQString GpsimProcessor::generateSymbolFile( const TQString &fileName, TQObject
if ( !isValidProgramFile(fileName) )
return TQString();
- TQString extension = fileName.right( fileName.length() - fileName.tqfindRev('.') - 1 ).lower();
+ TQString extension = fileName.right( fileName.length() - fileName.findRev('.') - 1 ).lower();
if ( extension == "cod" )
{
@@ -336,13 +336,13 @@ TQString GpsimProcessor::generateSymbolFile( const TQString &fileName, TQObject
{
TQTimer::singleShot( 0, receiver, successMember );
// We've already checked for the existance of the ".cod" file in GpsimProcessor::isValidProgramFile
- return TQString(fileName).tqreplace(".hex",".cod");
+ return TQString(fileName).replace(".hex",".cod");
}
else if ( extension == "basic" || extension == "microbe" )
{
compileMicrobe( fileName, receiver, successMember, failMember );
- return TQString(fileName).tqreplace( "."+extension, ".cod" );
+ return TQString(fileName).replace( "."+extension, ".cod" );
}
else if ( extension == "flowcode" )
{
@@ -364,13 +364,13 @@ TQString GpsimProcessor::generateSymbolFile( const TQString &fileName, TQObject
connect( pc, TQT_SIGNAL(failed()), receiver, failMember );
}
- return TQString(hexFile).tqreplace( ".hex", ".cod" );
+ return TQString(hexFile).replace( ".hex", ".cod" );
}
else if ( extension == "asm" )
{
ProcessOptions o;
o.b_addToProject = false;
- o.setTargetFile( TQString(fileName).tqreplace(".asm",".hex"));
+ o.setTargetFile( TQString(fileName).replace(".asm",".hex"));
o.setInputFiles(fileName);
o.setMethod( ProcessOptions::Method::Forget );
o.setProcessPath( ProcessOptions::ProcessPath::path( ProcessOptions::guessMediaType(fileName), ProcessOptions::ProcessPath::Program ) );
@@ -384,13 +384,13 @@ TQString GpsimProcessor::generateSymbolFile( const TQString &fileName, TQObject
connect( pc, TQT_SIGNAL(failed()), receiver, failMember );
}
- return TQString(fileName).tqreplace(".asm",".cod");
+ return TQString(fileName).replace(".asm",".cod");
}
else if ( extension == "c" )
{
ProcessOptions o;
o.b_addToProject = false;
- o.setTargetFile( TQString(fileName).tqreplace(".c",".hex"));
+ o.setTargetFile( TQString(fileName).replace(".c",".hex"));
o.setInputFiles(fileName);
o.setMethod( ProcessOptions::Method::Forget );
o.setProcessPath( ProcessOptions::ProcessPath::C_Program );
@@ -404,7 +404,7 @@ TQString GpsimProcessor::generateSymbolFile( const TQString &fileName, TQObject
connect( pc, TQT_SIGNAL(failed()), receiver, failMember );
}
- return TQString(fileName).tqreplace(".c",".cod");
+ return TQString(fileName).replace(".c",".cod");
}
if ( failMember )
@@ -417,7 +417,7 @@ void GpsimProcessor::compileMicrobe( const TQString &filename, TQObject *receive
{
ProcessOptions o;
o.b_addToProject = false;
- o.setTargetFile( TQString(filename).tqreplace(".microbe",".hex") );
+ o.setTargetFile( TQString(filename).replace(".microbe",".hex") );
o.setInputFiles(filename);
o.setMethod( ProcessOptions::Method::Forget );
o.setProcessPath( ProcessOptions::ProcessPath::Microbe_Program );
@@ -506,7 +506,7 @@ void GpsimDebugger::associateLine( const TQString & sourceFile, int sourceLine,
SourceLine hllSource = SourceLine( sourceFile, sourceLine );
SourceLine asmSource = SourceLine( assemblyFile, assemblyLine );
- if ( m_sourceLineMap.tqcontains(asmSource) )
+ if ( m_sourceLineMap.contains(asmSource) )
{
kdWarning() << k_funcinfo << "Already have an association for assembly (\""<<assemblyFile<<"\","<<assemblyLine<<")"<<endl;
return;
@@ -600,7 +600,7 @@ void GpsimDebugger::setBreakpoints( const TQString & path, const IntList & lines
if ( !dl || dl->fileName() != path )
continue;
- dl->setBreakpoint( lines.tqcontains( dl->line() ) );
+ dl->setBreakpoint( lines.contains( dl->line() ) );
}
}
@@ -758,7 +758,7 @@ RegisterInfo * RegisterSet::fromAddress( unsigned address )
RegisterInfo * RegisterSet::fromName( const TQString & name )
{
// First try the name as case sensitive, then as case insensitive.
- if ( m_nameToRegisterMap.tqcontains( name ) )
+ if ( m_nameToRegisterMap.contains( name ) )
return m_nameToRegisterMap[ name ];
TQString nameLower = name.lower();
diff --git a/src/electronics/pin.cpp b/src/electronics/pin.cpp
index f9a08d8..f3cdc0c 100644
--- a/src/electronics/pin.cpp
+++ b/src/electronics/pin.cpp
@@ -70,7 +70,7 @@ void Pin::setSwitchConnected( Pin * pin, bool isConnected )
if (isConnected)
{
- if ( !m_switchConnectedPins.tqcontains(pin) )
+ if ( !m_switchConnectedPins.contains(pin) )
m_switchConnectedPins.append(pin);
}
else
@@ -80,14 +80,14 @@ void Pin::setSwitchConnected( Pin * pin, bool isConnected )
void Pin::addCircuitDependentPin( Pin * pin )
{
- if ( pin && !m_circuitDependentPins.tqcontains(pin) )
+ if ( pin && !m_circuitDependentPins.contains(pin) )
m_circuitDependentPins.append(pin);
}
void Pin::addGroundDependentPin( Pin * pin )
{
- if ( pin && !m_groundDependentPins.tqcontains(pin) )
+ if ( pin && !m_groundDependentPins.contains(pin) )
m_groundDependentPins.append(pin);
}
@@ -101,7 +101,7 @@ void Pin::removeDependentPins()
void Pin::addElement( Element * e )
{
- if ( !e || m_elementList.tqcontains(e) )
+ if ( !e || m_elementList.contains(e) )
return;
m_elementList.append(e);
}
@@ -115,7 +115,7 @@ void Pin::removeElement( Element * e )
void Pin::addSwitch( Switch * sw )
{
- if ( !sw || m_switchList.tqcontains( sw ) )
+ if ( !sw || m_switchList.contains( sw ) )
return;
m_switchList << sw;
}
@@ -129,14 +129,14 @@ void Pin::removeSwitch( Switch * sw )
void Pin::addInputWire( Wire * wire )
{
- if ( wire && !m_inputWireList.tqcontains(wire) )
+ if ( wire && !m_inputWireList.contains(wire) )
m_inputWireList << wire;
}
void Pin::addOutputWire( Wire * wire )
{
- if ( wire && !m_outputWireList.tqcontains(wire) )
+ if ( wire && !m_outputWireList.contains(wire) )
m_outputWireList << wire;
}
diff --git a/src/electronics/simulation/circuit.cpp b/src/electronics/simulation/circuit.cpp
index c138a7a..c152756 100644
--- a/src/electronics/simulation/circuit.cpp
+++ b/src/electronics/simulation/circuit.cpp
@@ -50,19 +50,19 @@ Circuit::~Circuit()
void Circuit::addPin( Pin *node )
{
- if ( m_pinList.tqcontains(node) ) return;
+ if ( m_pinList.contains(node) ) return;
m_pinList.append(node);
}
void Circuit::addElement( Element *element )
{
- if ( m_elementList.tqcontains(element) ) return;
+ if ( m_elementList.contains(element) ) return;
m_elementList.append(element);
}
-bool Circuit::tqcontains( Pin *node )
+bool Circuit::contains( Pin *node )
{
- return m_pinList.tqcontains(node);
+ return m_pinList.contains(node);
}
@@ -427,7 +427,7 @@ void Circuit::createMatrixMap()
bool Circuit::recursivePinAdd( Pin *node, PinList *unassignedNodes, PinList *associated, PinList *nodes )
{
- if ( !unassignedNodes->tqcontains(node) )
+ if ( !unassignedNodes->contains(node) )
return false;
unassignedNodes->remove(node);
@@ -437,7 +437,7 @@ bool Circuit::recursivePinAdd( Pin *node, PinList *unassignedNodes, PinList *ass
const PinList::const_iterator dEnd = circuitDependentPins.end();
for ( PinList::const_iterator it = circuitDependentPins.begin(); it != dEnd; ++it )
{
- if ( !associated->tqcontains(*it) )
+ if ( !associated->contains(*it) )
associated->append(*it);
}
diff --git a/src/electronics/simulation/circuit.h b/src/electronics/simulation/circuit.h
index 82c1f34..8c275a5 100644
--- a/src/electronics/simulation/circuit.h
+++ b/src/electronics/simulation/circuit.h
@@ -60,7 +60,7 @@ class Circuit
void addPin( Pin *node );
void addElement( Element *element );
- bool tqcontains( Pin *node );
+ bool contains( Pin *node );
bool containsNonLinear() const { return m_elementSet->containsNonLinear(); }
void init();
diff --git a/src/electronics/simulation/elementset.cpp b/src/electronics/simulation/elementset.cpp
index 8a0adc9..25057c2 100644
--- a/src/electronics/simulation/elementset.cpp
+++ b/src/electronics/simulation/elementset.cpp
@@ -87,7 +87,7 @@ void ElementSet::setCacheInvalidated()
void ElementSet::addElement( Element *e )
{
- if ( !e || m_elementList.tqcontains(e) ) return;
+ if ( !e || m_elementList.contains(e) ) return;
e->setElementSet(this);
m_elementList.append(e);
if ( e->isNonLinear() )
diff --git a/src/filemetainfo.cpp b/src/filemetainfo.cpp
index 7c3c630..df3fcff 100644
--- a/src/filemetainfo.cpp
+++ b/src/filemetainfo.cpp
@@ -153,7 +153,7 @@ void FileMetaInfo::grabMetaInfo( const KURL & url, OutputMethodDlg * dlg )
void FileMetaInfo::initializeFromMetaInfo( const KURL & url, OutputMethodDlg * dlg )
{
- if ( !dlg || url.isEmpty() || !m_metaInfoMap.tqcontains(url) )
+ if ( !dlg || url.isEmpty() || !m_metaInfoMap.contains(url) )
return;
OutputMethodInfo::Method::Type method = m_metaInfoMap[url].outputMethodInfo().method();
diff --git a/src/flowcodedocument.cpp b/src/flowcodedocument.cpp
index e8d7512..efe0a94 100644
--- a/src/flowcodedocument.cpp
+++ b/src/flowcodedocument.cpp
@@ -271,7 +271,7 @@ void FlowCodeDocument::varNameChanged( const TQString &newValue, const TQString
// Decrease the old variable count
// If none are left after, remove it from microsettings
- StringIntMap::iterator it = m_varNames.tqfind(oldValue);
+ StringIntMap::iterator it = m_varNames.find(oldValue);
if ( it != m_varNames.end() )
{
--(it.data());
@@ -286,7 +286,7 @@ void FlowCodeDocument::varNameChanged( const TQString &newValue, const TQString
// Add the new variable to a count, tell microsettings about it if it is new
if ( !newValue.isEmpty() )
{
- it = m_varNames.tqfind(newValue);
+ it = m_varNames.find(newValue);
if ( it != m_varNames.end() ) {
++it.data();
} else {
diff --git a/src/flowparts/embed.cpp b/src/flowparts/embed.cpp
index f858747..f6bb3b2 100644
--- a/src/flowparts/embed.cpp
+++ b/src/flowparts/embed.cpp
@@ -58,7 +58,7 @@ Embed::~Embed()
void Embed::dataChanged()
{
- const TQString sample = dataString("code").left(10).tqreplace("\n"," ");
+ const TQString sample = dataString("code").left(10).replace("\n"," ");
setCaption( i18n("%1: %2...").tqarg(dataString("type")).tqarg(sample) );
}
diff --git a/src/flowparts/flowpart.cpp b/src/flowparts/flowpart.cpp
index 69d42a4..5adb3b5 100644
--- a/src/flowparts/flowpart.cpp
+++ b/src/flowparts/flowpart.cpp
@@ -403,7 +403,7 @@ FlowPart* FlowPart::endPart( TQStringList ids, FlowPartList *previousParts )
const bool createdList = (!previousParts);
if (createdList) {
previousParts = new FlowPartList;
- } else if ( previousParts->tqcontains(this) ) {
+ } else if ( previousParts->contains(this) ) {
return 0l;
}
previousParts->append(this);
@@ -426,7 +426,7 @@ FlowPart* FlowPart::endPart( TQStringList ids, FlowPartList *previousParts )
FlowPart *part = outputPart(*it);
while (part)
{
- if ( !validParts.tqcontains(part) )
+ if ( !validParts.contains(part) )
{
validParts.append(part);
// if ( part->level() >= level() ) {
@@ -462,7 +462,7 @@ FlowPart* FlowPart::endPart( TQStringList ids, FlowPartList *previousParts )
bool ok = true;
for ( ValidPartsList::iterator vplit = validPartsList.begin(); vplit != vplEnd; ++vplit )
{
- if ( !(*vplit).tqcontains(*it) ) ok = false;
+ if ( !(*vplit).contains(*it) ) ok = false;
}
if (ok) return *it;
}
@@ -591,14 +591,14 @@ void FlowPart::slotUpdateFlowPartVariables()
else if ( v->type() == Variant::Type::SevenSegment )
{
v->setAllowed( sevenSegMaps );
- if ( !sevenSegMaps.isEmpty() && !sevenSegMaps.tqcontains( v->value().toString() ) )
+ if ( !sevenSegMaps.isEmpty() && !sevenSegMaps.contains( v->value().toString() ) )
v->setValue( sevenSegMaps.first() );
}
else if ( v->type() == Variant::Type::KeyPad )
{
v->setAllowed( keyPadMaps );
- if ( !keyPadMaps.isEmpty() && !keyPadMaps.tqcontains( v->value().toString() ) )
+ if ( !keyPadMaps.isEmpty() && !keyPadMaps.contains( v->value().toString() ) )
v->setValue( keyPadMaps.first() );
}
}
@@ -665,8 +665,8 @@ void FlowPart::updateAttachedPositioning( )
NodeInfo * stdOutputInfo = m_stdOutput ? &m_nodeMap["stdoutput"] : 0;
NodeInfo * altOutputInfo = m_altOutput ? &m_nodeMap["altoutput"] : 0l;
- Text *outputTrueText = m_textMap.tqcontains("output_true") ? m_textMap["output_true"] : 0l;
- Text *outputFalseText = m_textMap.tqcontains("output_false") ? m_textMap["output_false"] : 0l;
+ Text *outputTrueText = m_textMap.contains("output_true") ? m_textMap["output_true"] : 0l;
+ Text *outputFalseText = m_textMap.contains("output_false") ? m_textMap["output_false"] : 0l;
if ( stdOutputInfo && outputTrueText )
outputTrueText->setOriginalRect( textPos[ nodeDirToPos( (Node::node_dir)stdOutputInfo->orientation ) ] );
diff --git a/src/flowparts/pinmapping.cpp b/src/flowparts/pinmapping.cpp
index b00b2b3..ee1c8b8 100644
--- a/src/flowparts/pinmapping.cpp
+++ b/src/flowparts/pinmapping.cpp
@@ -360,7 +360,7 @@ void PIC_IC::initPackage( MicroInfo * microInfo )
const TQStringList::iterator allPinIDsEnd = allPinIDs.end();
for ( TQStringList::iterator it = allPinIDs.begin(); it != allPinIDsEnd; ++it )
{
- if ( !ioPinIDs.tqcontains(*it) )
+ if ( !ioPinIDs.contains(*it) )
*it = "";
}
//END Get pin IDs
@@ -378,7 +378,7 @@ void PIC_IC::initPackage( MicroInfo * microInfo )
const NodeMap::iterator nodeMapEnd = nodeMapCopy.end();
for ( NodeMap::iterator it = nodeMapCopy.begin(); it != nodeMapEnd; ++it )
{
- if ( !ioPinIDs.tqcontains(it.key()) )
+ if ( !ioPinIDs.contains(it.key()) )
removeNode( it.key() );
}
//END Remove old stuff
diff --git a/src/gui/contexthelp.cpp b/src/gui/contexthelp.cpp
index dacd1b9..e10c30d 100644
--- a/src/gui/contexthelp.cpp
+++ b/src/gui/contexthelp.cpp
@@ -100,8 +100,8 @@ void ContextHelp::setContextHelp(const TQString& name, const TQString& help)
void ContextHelp::parseInfo( TQString &info )
{
- info.tqreplace("<example>","<br><br><b>Example:</b><blockquote>");
- info.tqreplace("</example>","</blockquote>");
+ info.replace("<example>","<br><br><b>Example:</b><blockquote>");
+ info.replace("</example>","</blockquote>");
}
#include "contexthelp.moc"
diff --git a/src/gui/doublespinbox.cpp b/src/gui/doublespinbox.cpp
index fb5efa4..6a384ed 100644
--- a/src/gui/doublespinbox.cpp
+++ b/src/gui/doublespinbox.cpp
@@ -123,7 +123,7 @@ double DoubleSpinBox::getMult()
if ( nsSuffix.isEmpty() )
text.append( m_queuedSuffix );
else
- text.tqreplace( nsSuffix, m_queuedSuffix );
+ text.replace( nsSuffix, m_queuedSuffix );
}
if ( text.length() == 0 )
diff --git a/src/gui/itemselector.cpp b/src/gui/itemselector.cpp
index 32ff6da..38db8f3 100644
--- a/src/gui/itemselector.cpp
+++ b/src/gui/itemselector.cpp
@@ -88,14 +88,14 @@ void ItemSelector::addItem( const TQString & caption, const TQString & id, const
{
category.remove(0,1);
TQString cat;
- category.tqreplace( "\\/", "|" );
- int pos = category.tqfind('/');
+ category.replace( "\\/", "|" );
+ int pos = category.find('/');
if ( pos == -1 ) cat = category;
else cat = category.left( pos );
- cat.tqreplace( "|", "/" );
+ cat.replace( "|", "/" );
- if ( m_categories.tqfindIndex(cat) == -1 )
+ if ( m_categories.findIndex(cat) == -1 )
{
m_categories.append(cat);
@@ -112,11 +112,11 @@ void ItemSelector::addItem( const TQString & caption, const TQString & id, const
}
else
{
- parentItem = (ILVItem*)tqfindItem( cat, 0 );
+ parentItem = (ILVItem*)findItem( cat, 0 );
}
category.remove( 0, pos );
- } while ( category.tqcontains('/') );
+ } while ( category.contains('/') );
if ( !parentItem )
{
@@ -139,7 +139,7 @@ void ItemSelector::writeOpenStates()
const TQStringList::iterator end = m_categories.end();
for ( TQStringList::iterator it = m_categories.begin(); it != end; ++it )
{
- TQListViewItem *item = tqfindItem( *it, 0 );
+ TQListViewItem *item = findItem( *it, 0 );
if (item) {
config->writeEntry( *it+"IsOpen", item->isOpen() );
}
diff --git a/src/gui/logview.cpp b/src/gui/logview.cpp
index 690b593..a158049 100644
--- a/src/gui/logview.cpp
+++ b/src/gui/logview.cpp
@@ -83,17 +83,17 @@ void LogView::slotParaClicked( int para, int /*pos*/ )
void LogView::tidyText( TQString &t )
{
- t.tqreplace( "&", "&amp;" );
- t.tqreplace( "<", "&lt;" );
- t.tqreplace( ">", "&gt;" );
+ t.replace( "&", "&amp;" );
+ t.replace( "<", "&lt;" );
+ t.replace( ">", "&gt;" );
}
void LogView::untidyText( TQString &t )
{
- t.tqreplace( "&lt;", "<" );
- t.tqreplace( "&gt;", ">" );
- t.tqreplace( "&amp;", "&" );
+ t.replace( "&lt;", "<" );
+ t.replace( "&gt;", ">" );
+ t.replace( "&amp;", "&" );
}
diff --git a/src/gui/microsettingsdlg.cpp b/src/gui/microsettingsdlg.cpp
index 78b585d..0b61cc5 100644
--- a/src/gui/microsettingsdlg.cpp
+++ b/src/gui/microsettingsdlg.cpp
@@ -176,7 +176,7 @@ void MicroSettingsDlg::reject()
TQValidator::State MicroSettingsDlg::validatePinMapName( TQString & name ) const
{
- name.tqreplace( ' ', '_' );
+ name.replace( ' ', '_' );
if ( name.isEmpty() )
return TQValidator::Intermediate;
@@ -371,7 +371,7 @@ void MicroSettingsDlg::savePort( int row )
TQString typeText = m_portTypeEdit[row]->text();
bool typeOk = true;
if ( typeText.tqstartsWith( "0x", false ) ) type = typeText.remove(0,2).toInt( &typeOk, 16 );
- else if ( typeText.tqcontains( TQRegExp("[^01]") ) ) type = typeText.toInt( &typeOk, 10 );
+ else if ( typeText.contains( TQRegExp("[^01]") ) ) type = typeText.toInt( &typeOk, 10 );
else type = typeText.toInt( &typeOk, 2 );
if ( !typeOk )
@@ -384,7 +384,7 @@ void MicroSettingsDlg::savePort( int row )
TQString stateText = m_portStateEdit[row]->text();
bool stateOk = true;
if ( stateText.tqstartsWith( "0x", false ) ) state = stateText.remove(0,2).toInt( &stateOk, 16 );
- else if ( stateText.tqcontains( TQRegExp("[^01]") ) ) state = stateText.toInt( &stateOk, 10 );
+ else if ( stateText.contains( TQRegExp("[^01]") ) ) state = stateText.toInt( &stateOk, 10 );
else state = stateText.toInt( &stateOk, 2 );
if ( !stateOk )
diff --git a/src/gui/newfiledlg.cpp b/src/gui/newfiledlg.cpp
index 8342976..79c35dd 100644
--- a/src/gui/newfiledlg.cpp
+++ b/src/gui/newfiledlg.cpp
@@ -93,28 +93,28 @@ void NewFileDlg::accept()
const TQString fileText = m_pNewFileWidget->typeIconView->currentItem()->text();
- if ( fileText.tqcontains(".flowcode") )
+ if ( fileText.contains(".flowcode") )
m_fileType = Document::dt_flowcode;
- else if ( fileText.tqcontains(".circuit") )
+ else if ( fileText.contains(".circuit") )
m_fileType = Document::dt_circuit;
- else if ( fileText.tqcontains(".mechanics") )
+ else if ( fileText.contains(".mechanics") )
m_fileType = Document::dt_mechanics;
- else if ( fileText.tqcontains(".asm") )
+ else if ( fileText.contains(".asm") )
{
m_fileType = Document::dt_text;
m_codeType = TextDocument::ct_asm;
}
- else if ( fileText.tqcontains(".basic") || fileText.tqcontains(".microbe") )
+ else if ( fileText.contains(".basic") || fileText.contains(".microbe") )
{
m_fileType = Document::dt_text;
m_codeType = TextDocument::ct_microbe;
}
- else if (fileText.tqcontains(".c") )
+ else if (fileText.contains(".c") )
{
m_fileType = Document::dt_text;
m_codeType = TextDocument::ct_c;
@@ -138,7 +138,7 @@ void NewFileDlg::reject()
void NewFileDlg::fileTypeChanged( TQIconViewItem *item )
{
m_pNewFileWidget->m_pMicroSelect->setEnabled(
- item->text().tqcontains(".flowcode") );
+ item->text().contains(".flowcode") );
}
diff --git a/src/gui/oscilloscope.cpp b/src/gui/oscilloscope.cpp
index 50d1346..24495ab 100644
--- a/src/gui/oscilloscope.cpp
+++ b/src/gui/oscilloscope.cpp
@@ -189,7 +189,7 @@ ProbeData * Oscilloscope::registerProbe( Probe * probe )
void Oscilloscope::unregisterProbe( int id )
{
- ProbeDataMap::iterator it = m_probeDataMap.tqfind(id);
+ ProbeDataMap::iterator it = m_probeDataMap.find(id);
if ( it == m_probeDataMap.end() )
return;
@@ -211,7 +211,7 @@ void Oscilloscope::unregisterProbe( int id )
ProbeData * Oscilloscope::probeData( int id ) const
{
- const ProbeDataMap::const_iterator bit = m_probeDataMap.tqfind(id);
+ const ProbeDataMap::const_iterator bit = m_probeDataMap.find(id);
if ( bit != m_probeDataMap.end() )
return bit.data();
diff --git a/src/gui/projectdlgs.cpp b/src/gui/projectdlgs.cpp
index 1cb560f..287b8c5 100644
--- a/src/gui/projectdlgs.cpp
+++ b/src/gui/projectdlgs.cpp
@@ -157,7 +157,7 @@ LinkerOptionsDlg::LinkerOptionsDlg( LinkerOptions * linkingOptions, TQWidget *tq
{
TQString relativeURL = KURL::relativeURL( pi->url(), *it );
TQCheckListItem * item = new TQCheckListItem( m_pWidget->m_pInternalLibraries, relativeURL, TQCheckListItem::CheckBox );
- item->setOn( linkedInternal.tqcontains(relativeURL) );
+ item->setOn( linkedInternal.contains(relativeURL) );
}
m_pExternalLibraryRequester = new KURLRequester( 0l );
diff --git a/src/gui/settingsdlg.cpp b/src/gui/settingsdlg.cpp
index 641a9d2..5d9511e 100644
--- a/src/gui/settingsdlg.cpp
+++ b/src/gui/settingsdlg.cpp
@@ -212,7 +212,7 @@ class NameValidator : public TQValidator
}
virtual State validate( TQString & input, int & ) const {
- return (input.isEmpty() || m_unallowed.tqcontains( input.lower() )) ? Intermediate : Acceptable;
+ return (input.isEmpty() || m_unallowed.contains( input.lower() )) ? Intermediate : Acceptable;
}
protected:
diff --git a/src/icndocument.cpp b/src/icndocument.cpp
index b98d5c2..2fd4986 100644
--- a/src/icndocument.cpp
+++ b/src/icndocument.cpp
@@ -141,7 +141,7 @@ FlowContainer *ICNDocument::flowContainer( const TQPoint &pos )
{
if ( FlowContainer *container = dynamic_cast<FlowContainer*>(*it) )
{
- if ( container->level() > currentLevel && !m_selectList->tqcontains(container) )
+ if ( container->level() > currentLevel && !m_selectList->contains(container) )
{
currentLevel = container->level();
flowContainer = container;
@@ -553,7 +553,7 @@ NodeGroup* ICNDocument::createNodeGroup( Node *node )
const GuardedNodeGroupList::iterator end = m_nodeGroupList.end();
for ( GuardedNodeGroupList::iterator it = m_nodeGroupList.begin(); it != end; ++it )
{
- if ( *it && (*it)->tqcontains(node) ) {
+ if ( *it && (*it)->contains(node) ) {
return *it;
}
}
@@ -575,7 +575,7 @@ bool ICNDocument::deleteNodeGroup( Node *node )
const GuardedNodeGroupList::iterator end = m_nodeGroupList.end();
for ( GuardedNodeGroupList::iterator it = m_nodeGroupList.begin(); it != end; ++it )
{
- if ( *it && (*it)->tqcontains(node) )
+ if ( *it && (*it)->contains(node) )
{
delete *it;
m_nodeGroupList.remove(it);
@@ -662,7 +662,7 @@ void ICNDocument::getTranslatable( const ItemList & itemList, ConnectorList * fi
const ConnectorList::iterator clEnd = conList.end();
for ( ConnectorList::iterator clit = conList.begin(); clit != clEnd; ++clit )
{
- ConnectorMap::iterator cit = fixedConnectorMap.tqfind(*clit);
+ ConnectorMap::iterator cit = fixedConnectorMap.find(*clit);
if ( cit != fixedConnectorMap.end() ) {
cit.data()++;
} else {
@@ -719,7 +719,7 @@ void ICNDocument::getTranslatable( const ItemList & itemList, ConnectorList * fi
{
translatableConnectors->append( const_cast<Connector*>(it.key()) );
}
- else if ( !fixedNGConnectors.tqcontains(it.key()) && !fixedConnectors->tqcontains(it.key()) )
+ else if ( !fixedNGConnectors.contains(it.key()) && !fixedConnectors->contains(it.key()) )
{
fixedConnectors->append(it.key());
}
@@ -781,7 +781,7 @@ TQPoint ICNDocument::gridSnap( const TQPoint &pos )
void ICNDocument::appendDeleteList( TQCanvasItem *qcanvasItem )
{
- if ( !qcanvasItem || m_itemDeleteList.tqfindIndex(qcanvasItem) != -1 ) {
+ if ( !qcanvasItem || m_itemDeleteList.findIndex(qcanvasItem) != -1 ) {
return;
}
@@ -818,7 +818,7 @@ void ICNDocument::flushDeleteList()
TQCanvasItemList::iterator end = m_itemDeleteList.end();
for ( TQCanvasItemList::iterator it = m_itemDeleteList.begin(); it != end; ++it )
{
- if ( *it && m_itemDeleteList.tqcontains(*it) > 1 ) {
+ if ( *it && m_itemDeleteList.contains(*it) > 1 ) {
*it = 0l;
}
}
@@ -1199,10 +1199,10 @@ void ICNDocument::rerouteInvalidatedConnectors()
{
NodeGroup *nodeGroup = connector->nodeGroup();
- if ( !nodeGroup && !connectorRerouteList.tqcontains(connector) )
+ if ( !nodeGroup && !connectorRerouteList.contains(connector) )
connectorRerouteList.append(connector);
- else if ( nodeGroup && !nodeGroupRerouteList.tqcontains(nodeGroup) )
+ else if ( nodeGroup && !nodeGroupRerouteList.contains(nodeGroup) )
nodeGroupRerouteList.append(nodeGroup);
}
}
@@ -1303,7 +1303,7 @@ ConnectorList ICNDocument::getCommonConnectors( const ItemList &list )
for ( ConnectorList::iterator it = connectorList.begin(); it != connectorListEnd; ++it )
{
Connector *con = *it;
- if ( !con || !nodeList.tqcontains(con->startNode()) || !nodeList.tqcontains(con->endNode()) ) {
+ if ( !con || !nodeList.contains(con->startNode()) || !nodeList.contains(con->endNode()) ) {
*it = 0l;
}
}
@@ -1328,7 +1328,7 @@ NodeList ICNDocument::getCommonNodes( const ItemList &list )
{
Node *node = it.data().node;
- if ( !nodeList.tqcontains(node) ) {
+ if ( !nodeList.contains(node) ) {
nodeList += node;
}
@@ -1340,7 +1340,7 @@ NodeList ICNDocument::getCommonNodes( const ItemList &list )
for ( NodeList::iterator it = intNodeList.begin(); it != intNodeListEnd; ++it )
{
Node *intNode = *it;
- if ( !nodeList.tqcontains(intNode) ) {
+ if ( !nodeList.contains(intNode) ) {
nodeList += intNode;
}
}
diff --git a/src/item.cpp b/src/item.cpp
index e2cd3b0..2e7d578 100644
--- a/src/item.cpp
+++ b/src/item.cpp
@@ -359,7 +359,7 @@ void Item::setParentItem( Item *newParentItem )
if (newParentItem)
{
- if ( newParentItem->tqcontains(this) );
+ if ( newParentItem->contains(this) );
// kdError() << k_funcinfo << "Already a child of " << newParentItem << endl;
else
{
@@ -405,13 +405,13 @@ void Item::addChild( Item *child )
if ( !child )
return;
- if ( child->tqcontains(this) )
+ if ( child->contains(this) )
{
// kdError() << k_funcinfo << "Attempting to add a child to this item that is already a tqparent of this item. Incest results in stack overflow." << endl;
return;
}
- if ( tqcontains( child, true ) )
+ if ( contains( child, true ) )
{
// kdError() << k_funcinfo << "Already have child " << child << endl;
return;
@@ -428,7 +428,7 @@ void Item::addChild( Item *child )
void Item::removeChild( Item *child )
{
- if ( !child || !m_tqchildren.tqcontains(child) )
+ if ( !child || !m_tqchildren.contains(child) )
return;
m_tqchildren.remove(child);
@@ -439,12 +439,12 @@ void Item::removeChild( Item *child )
}
-bool Item::tqcontains( Item *item, bool direct ) const
+bool Item::contains( Item *item, bool direct ) const
{
const ItemList::const_iterator end = m_tqchildren.end();
for ( ItemList::const_iterator it = m_tqchildren.begin(); it != end; ++it )
{
- if ( (Item*)*it == item || ( !direct && (*it)->tqcontains( item, false ) ) )
+ if ( (Item*)*it == item || ( !direct && (*it)->contains( item, false ) ) )
return true;
}
return false;
@@ -559,7 +559,7 @@ TQColor Item::dataColor( const TQString & id ) const
Variant * Item::createProperty( const TQString & id, Variant::Type::Value type )
{
- if ( !m_variantData.tqcontains(id) )
+ if ( !m_variantData.contains(id) )
{
m_variantData[id] = new Variant(type);
if (m_bDoneCreation)
@@ -572,7 +572,7 @@ Variant * Item::createProperty( const TQString & id, Variant::Type::Value type )
Variant * Item::property( const TQString & id ) const
{
- if ( m_variantData.tqcontains(id) )
+ if ( m_variantData.contains(id) )
return m_variantData[id];
kdError() << k_funcinfo << " No such property with id " << id << endl;
@@ -582,7 +582,7 @@ Variant * Item::property( const TQString & id ) const
bool Item::hasProperty( const TQString & id ) const
{
- return m_variantData.tqcontains(id);
+ return m_variantData.contains(id);
}
diff --git a/src/item.h b/src/item.h
index 3807e6d..8198204 100644
--- a/src/item.h
+++ b/src/item.h
@@ -153,7 +153,7 @@ public:
* Returns whether we have the given child as either a direct child, or as
* either a direct or indirect child
*/
- bool tqcontains( Item *item, bool direct = false ) const;
+ bool contains( Item *item, bool direct = false ) const;
/**
* Calls prePresize with the bounds, and if that returns true, sets
* m_sizeRect to the given rect, and then calls postResize.
diff --git a/src/itemdocument.cpp b/src/itemdocument.cpp
index 215b88a..1742094 100644
--- a/src/itemdocument.cpp
+++ b/src/itemdocument.cpp
@@ -447,7 +447,7 @@ void ItemDocument::select( TQCanvasItem * item )
{
if (!item)
return;
- item->setSelected( selectList()->tqcontains( item ) || selectList()->addTQCanvasItem( item ) );
+ item->setSelected( selectList()->contains( item ) || selectList()->addTQCanvasItem( item ) );
}
@@ -533,7 +533,7 @@ void ItemDocument::distributeVertically( )
bool ItemDocument::registerUID( const TQString &UID )
{
- if ( m_idList.tqfindIndex(UID) == -1 )
+ if ( m_idList.findIndex(UID) == -1 )
{
m_idList.append(UID);
return true;
@@ -553,7 +553,7 @@ TQString ItemDocument::generateUID( TQString name )
{
name.remove( TQRegExp("__.*") ); // Change 'node__13' to 'node', for example
TQString idAttempt = name;
-// if ( idAttempt.tqfind("__") != -1 ) idAttempt.truncate( idAttempt.tqfind("__") );
+// if ( idAttempt.find("__") != -1 ) idAttempt.truncate( idAttempt.find("__") );
while ( !registerUID(idAttempt) ) { idAttempt = name + "__" + TQString::number(m_nextIdNum++); }
return idAttempt;
@@ -969,7 +969,7 @@ void ItemDocument::raiseZ( const ItemList & itemList )
Item * previousData = (previous == m_zOrder.end()) ? 0l : previous.data();
Item * currentData = it.data();
- if ( currentData && previousData && itemList.tqcontains(currentData) && !itemList.tqcontains(previousData) )
+ if ( currentData && previousData && itemList.contains(currentData) && !itemList.contains(previousData) )
{
previous.data() = currentData;
it.data() = previousData;
@@ -1003,7 +1003,7 @@ void ItemDocument::lowerZ( const ItemList & itemList )
Item * previousData = previous.data();
Item * currentData = it.data();
- if ( currentData && previousData && itemList.tqcontains(currentData) && !itemList.tqcontains(previousData) )
+ if ( currentData && previousData && itemList.contains(currentData) && !itemList.contains(previousData) )
{
previous.data() = currentData;
it.data() = previousData;
diff --git a/src/itemdocumentdata.cpp b/src/itemdocumentdata.cpp
index 8981980..a28f93e 100644
--- a/src/itemdocumentdata.cpp
+++ b/src/itemdocumentdata.cpp
@@ -793,7 +793,7 @@ void ItemDocumentData::generateUniqueIDs( ItemDocument *itemDocument )
const ItemDataMap::iterator end = m_itemDataMap.end();
for ( ItemDataMap::iterator it = m_itemDataMap.begin(); it != end; ++it )
{
- if ( !replaced.tqcontains( it.key() ) )
+ if ( !replaced.contains( it.key() ) )
replaced[it.key()] = itemDocument->generateUID(it.key());
newItemDataMap[replaced[it.key()]] = it.data();
@@ -803,7 +803,7 @@ void ItemDocumentData::generateUniqueIDs( ItemDocument *itemDocument )
const NodeDataMap::iterator end = m_nodeDataMap.end();
for ( NodeDataMap::iterator it = m_nodeDataMap.begin(); it != end; ++it )
{
- if ( !replaced.tqcontains( it.key() ) )
+ if ( !replaced.contains( it.key() ) )
replaced[it.key()] = itemDocument->generateUID(it.key());
newNodeDataMap[replaced[it.key()]] = it.data();
@@ -813,7 +813,7 @@ void ItemDocumentData::generateUniqueIDs( ItemDocument *itemDocument )
const ConnectorDataMap::iterator end = m_connectorDataMap.end();
for ( ConnectorDataMap::iterator it = m_connectorDataMap.begin(); it != end; ++it )
{
- if ( !replaced.tqcontains( it.key() ) )
+ if ( !replaced.contains( it.key() ) )
replaced[it.key()] = itemDocument->generateUID(it.key());
newConnectorDataMap[replaced[it.key()]] = it.data();
@@ -1281,13 +1281,13 @@ void SubcircuitData::initECSubcircuit( ECSubcircuit * ecSubcircuit )
const ConnectorDataMap::iterator connectorEnd = m_connectorDataMap.end();
for ( ConnectorDataMap::iterator it = m_connectorDataMap.begin(); it != connectorEnd; ++it )
{
- if ( it.data().startNodeIsChild && nodeMap.tqcontains(it.data().startNodeParent ) )
+ if ( it.data().startNodeIsChild && nodeMap.contains(it.data().startNodeParent ) )
{
it.data().startNodeCId = TQString::number( nodeMap[it.data().startNodeParent] );
it.data().startNodeParent = ecSubcircuit->id();
}
- if ( it.data().endNodeIsChild && nodeMap.tqcontains(it.data().endNodeParent ) )
+ if ( it.data().endNodeIsChild && nodeMap.contains(it.data().endNodeParent ) )
{
it.data().endNodeCId = TQString::number( nodeMap[it.data().endNodeParent] );
it.data().endNodeParent = ecSubcircuit->id();
diff --git a/src/itemgroup.cpp b/src/itemgroup.cpp
index d6d6fb2..ce22a1a 100644
--- a/src/itemgroup.cpp
+++ b/src/itemgroup.cpp
@@ -61,7 +61,7 @@ ItemList ItemGroup::items( bool excludeParentedItems ) const
end = tqchildren.end();
for ( ItemList::iterator it = tqchildren.begin(); it != end; ++it )
{
- if ( tqchildren.tqcontains(*it) > 1 )
+ if ( tqchildren.contains(*it) > 1 )
*it = 0l;
}
tqchildren.remove((Item*)0l);
@@ -143,7 +143,7 @@ bool ItemGroup::itemsHaveDefaultData() const
void ItemGroup::registerItem( Item *item )
{
- if ( !item || m_itemList.tqcontains(item) ) {
+ if ( !item || m_itemList.contains(item) ) {
return;
}
@@ -169,7 +169,7 @@ void ItemGroup::updateAreSametqStatus()
}
TQString activeId = (*m_itemList.begin())->id();
- int discardIndex = activeId.tqfindRev("__");
+ int discardIndex = activeId.findRev("__");
if ( discardIndex != -1 ) activeId.truncate(discardIndex);
const ItemList::iterator end = m_itemList.end();
@@ -178,7 +178,7 @@ void ItemGroup::updateAreSametqStatus()
if (*it)
{
TQString id = (*it)->id();
- discardIndex = id.tqfindRev("__");
+ discardIndex = id.findRev("__");
if ( discardIndex != -1 ) id.truncate(discardIndex);
if ( id != activeId )
{
diff --git a/src/itemgroup.h b/src/itemgroup.h
index bc6654f..26bdeed 100644
--- a/src/itemgroup.h
+++ b/src/itemgroup.h
@@ -49,7 +49,7 @@ public:
virtual bool addTQCanvasItem( TQCanvasItem *qcanvasItem ) = 0;
virtual void setItems( TQCanvasItemList list ) = 0;
virtual void removeTQCanvasItem( TQCanvasItem *qcanvasItem ) = 0;
- virtual bool tqcontains( TQCanvasItem *qcanvasItem ) const = 0;
+ virtual bool contains( TQCanvasItem *qcanvasItem ) const = 0;
virtual uint count() const = 0;
bool isEmpty() const { return (count() == 0); }
virtual void mergeGroup( ItemGroup *group ) = 0;
diff --git a/src/iteminterface.cpp b/src/iteminterface.cpp
index c1b3521..78bc7b0 100644
--- a/src/iteminterface.cpp
+++ b/src/iteminterface.cpp
@@ -271,7 +271,7 @@ TQWidget * ItemInterface::configWidget()
case Variant::Type::SevenSegment:
{
TQString value = vait.data()->value().toString();
- if ( !value.isEmpty() && !vait.data()->allowed().tqcontains(value) )
+ if ( !value.isEmpty() && !vait.data()->allowed().contains(value) )
vait.data()->appendAllowed(value);
const TQStringList allowed = vait.data()->allowed();
@@ -294,7 +294,7 @@ TQWidget * ItemInterface::configWidget()
case Variant::Type::FileName:
{
TQString value = vait.data()->value().toString();
- if ( !vait.data()->allowed().tqcontains(value) )
+ if ( !vait.data()->allowed().contains(value) )
vait.data()->appendAllowed(value);
const TQStringList allowed = vait.data()->allowed();
@@ -476,7 +476,7 @@ void ItemInterface::tbDataChanged()
const DoubleSpinBoxMap::iterator m_doubleSpinBoxMapEnd = m_doubleSpinBoxMap.end();
for ( DoubleSpinBoxMap::iterator sbit = m_doubleSpinBoxMap.begin(); sbit != m_doubleSpinBoxMapEnd; ++sbit )
{
-// VariantDataMap::iterator vait = variantData.tqfind(sbit.key());
+// VariantDataMap::iterator vait = variantData.find(sbit.key());
slotSetData( sbit.key(), sbit.data()->value() );
}
@@ -517,7 +517,7 @@ void ItemInterface::slotSetData( const TQString &id, TQVariant value )
VariantDataMap * variantMap = (*itemList.begin())->variantMap();
- VariantDataMap::iterator it = variantMap->tqfind(id);
+ VariantDataMap::iterator it = variantMap->find(id);
if ( it == variantMap->end() )
return;
@@ -529,13 +529,13 @@ void ItemInterface::slotSetData( const TQString &id, TQVariant value )
{
case Variant::Type::String:
{
- KLineEditMap::iterator mit = m_stringLineEditMap.tqfind(id);
+ KLineEditMap::iterator mit = m_stringLineEditMap.find(id);
if ( mit != m_stringLineEditMap.end() ) mit.data()->setText( it.data()->value().toString() );
break;
}
case Variant::Type::FileName:
{
- KURLReqMap::iterator mit = m_stringURLReqMap.tqfind(id);
+ KURLReqMap::iterator mit = m_stringURLReqMap.find(id);
if ( mit != m_stringURLReqMap.end() ) mit.data()->setURL( it.data()->value().toString() );
break;
}
@@ -549,13 +549,13 @@ void ItemInterface::slotSetData( const TQString &id, TQVariant value )
case Variant::Type::SevenSegment:
case Variant::Type::KeyPad:
{
- KComboBoxMap::iterator mit = m_stringComboBoxMap.tqfind(id);
+ KComboBoxMap::iterator mit = m_stringComboBoxMap.find(id);
if ( mit != m_stringComboBoxMap.end() ) mit.data()->setCurrentItem( it.data()->value().toString() );
break;
}
case Variant::Type::Int:
{
- IntSpinBoxMap::iterator mit = m_intSpinBoxMap.tqfind(id);
+ IntSpinBoxMap::iterator mit = m_intSpinBoxMap.find(id);
if ( mit != m_intSpinBoxMap.end() ) {
KIntSpinBox *sb = mit.data();
sb->setValue( it.data()->value().toInt() );
@@ -564,7 +564,7 @@ void ItemInterface::slotSetData( const TQString &id, TQVariant value )
}
case Variant::Type::Double:
{
- DoubleSpinBoxMap::iterator mit = m_doubleSpinBoxMap.tqfind(id);
+ DoubleSpinBoxMap::iterator mit = m_doubleSpinBoxMap.find(id);
if ( mit != m_doubleSpinBoxMap.end() ) {
DoubleSpinBox *sb = mit.data();
sb->setValue( it.data()->value().toDouble() );
@@ -573,13 +573,13 @@ void ItemInterface::slotSetData( const TQString &id, TQVariant value )
}
case Variant::Type::Color:
{
- ColorComboMap::iterator mit = m_colorComboMap.tqfind(id);
+ ColorComboMap::iterator mit = m_colorComboMap.find(id);
if ( mit != m_colorComboMap.end() ) mit.data()->setColor( it.data()->value().toColor() );
break;
}
case Variant::Type::Bool:
{
- TQCheckBoxMap::iterator mit = m_boolCheckMap.tqfind(id);
+ TQCheckBoxMap::iterator mit = m_boolCheckMap.find(id);
if ( mit != m_boolCheckMap.end() ) mit.data()->setChecked( it.data()->value().toBool() );
break;
}
diff --git a/src/itemlibrary.cpp b/src/itemlibrary.cpp
index 6451e6b..67a1a86 100644
--- a/src/itemlibrary.cpp
+++ b/src/itemlibrary.cpp
@@ -315,7 +315,7 @@ Item *ItemLibrary::createItem( const TQString &id, ItemDocument *itemDocument, b
LibraryItemList::iterator it = m_items.begin();
for ( ; it != end; ++it )
{
- if ( (*it)->allIDs().tqcontains(id) )
+ if ( (*it)->allIDs().contains(id) )
{
item = (*it)->createItemFnPtr()( itemDocument, newItem, newId );
item->m_type = (*it)->activeID();
@@ -359,7 +359,7 @@ TQImage ItemLibrary::itemImage( Item *item, const uint maxSize )
const bool cache = ((bound.width()*bound.height()) > (int)maxSize);
TQString type;
- if ( cache && m_imageMap.tqcontains(item->type()) )
+ if ( cache && m_imageMap.contains(item->type()) )
return m_imageMap[item->type()];
// Create pixmap big enough to contain CNItem and surrounding nodes
@@ -467,7 +467,7 @@ TQPixmap ItemLibrary::itemIconFull( const TQString &id )
LibraryItemList::iterator end = m_items.end();
for ( LibraryItemList::iterator it = m_items.begin(); it != end; ++it )
{
- if ( *it && (*it)->allIDs().tqcontains(id) )
+ if ( *it && (*it)->allIDs().contains(id) )
{
return (*it)->iconFull();
}
diff --git a/src/katemdi.cpp b/src/katemdi.cpp
index e641744..01abfd3 100644
--- a/src/katemdi.cpp
+++ b/src/katemdi.cpp
@@ -276,7 +276,7 @@ ToolView *Sidebar::addWidget (const TQPixmap &icon, const TQString &text, ToolVi
bool Sidebar::removeWidget (ToolView *widget)
{
- if (!m_widgetToId.tqcontains(widget))
+ if (!m_widgetToId.contains(widget))
return false;
removeTab(m_widgetToId[widget]);
@@ -306,7 +306,7 @@ bool Sidebar::removeWidget (ToolView *widget)
bool Sidebar::showWidget (ToolView *widget)
{
- if (!m_widgetToId.tqcontains(widget))
+ if (!m_widgetToId.contains(widget))
return false;
// hide other non-persistent views
@@ -331,7 +331,7 @@ bool Sidebar::showWidget (ToolView *widget)
bool Sidebar::hideWidget (ToolView *widget)
{
- if (!m_widgetToId.tqcontains(widget))
+ if (!m_widgetToId.contains(widget))
return false;
bool anyVis = false;
diff --git a/src/ktechlab.cpp b/src/ktechlab.cpp
index c3ec9f7..3da09c1 100644
--- a/src/ktechlab.cpp
+++ b/src/ktechlab.cpp
@@ -227,7 +227,7 @@ void KTechlab::setupToolDocks()
void KTechlab::addWindow( ViewContainer * vc )
{
- if ( vc && !m_viewContainerList.tqcontains(vc) )
+ if ( vc && !m_viewContainerList.contains(vc) )
{
m_viewContainerList << vc;
connect( vc, TQT_SIGNAL(destroyed(TQObject* )), TQT_TQOBJECT(this), TQT_SLOT(slotViewContainerDestroyed(TQObject* )) );
@@ -330,7 +330,7 @@ void KTechlab::hideToolBarOverlay()
void KTechlab::addNoRemoveGUIClient( KXMLGUIClient * client )
{
- if ( client && !m_noRemoveGUIClients.tqcontains( client ) )
+ if ( client && !m_noRemoveGUIClients.contains( client ) )
m_noRemoveGUIClients << client;
}
@@ -342,7 +342,7 @@ void KTechlab::removeGUIClients()
TQPtrList<KXMLGUIClient> clients = factory()->clients();
for ( KXMLGUIClient * client = clients.first(); client; client = clients.next() )
{
- if ( client && client != this && !m_noRemoveGUIClients.tqcontains( client ) )
+ if ( client && client != this && !m_noRemoveGUIClients.contains( client ) )
clientsToRemove << client;
}
diff --git a/src/languages/asmparser.cpp b/src/languages/asmparser.cpp
index 94b01c0..90c26d7 100644
--- a/src/languages/asmparser.cpp
+++ b/src/languages/asmparser.cpp
@@ -52,12 +52,12 @@ bool AsmParser::parse( GpsimDebugger * debugger )
{
TQString col0 = line.section( TQRegExp("[; ]"), 0, 0 );
col0 = col0.stripWhiteSpace();
- if ( nonAbsoluteOps.tqcontains(col0) )
+ if ( nonAbsoluteOps.contains(col0) )
m_type = Relocatable;
}
if ( !m_bContainsRadix )
{
- if ( line.tqcontains( TQRegExp("^RADIX[\\s]*") ) || line.tqcontains( TQRegExp("^radix[\\s]*") ) )
+ if ( line.contains( TQRegExp("^RADIX[\\s]*") ) || line.contains( TQRegExp("^radix[\\s]*") ) )
m_bContainsRadix = true;
}
if ( m_picID.isEmpty() )
@@ -81,7 +81,7 @@ bool AsmParser::parse( GpsimDebugger * debugger )
// Assembly file produced (by sdcc) from C, line is in format:
// ;#CSRC\t[file-name] [file-line]
// The filename can contain spaces.
- int fileLineAt = line.tqfindRev(" ");
+ int fileLineAt = line.findRev(" ");
if ( fileLineAt == -1 )
kdWarning() << k_funcinfo << "Syntax error in line \"" << line << "\" while looking for file-line" << endl;
@@ -117,7 +117,7 @@ bool AsmParser::parse( GpsimDebugger * debugger )
else
{
const TQString lineAndFile = lineParts[1];
- int lineFileSplit = lineAndFile.tqfind("; ");
+ int lineFileSplit = lineAndFile.find("; ");
if ( lineFileSplit == -1 )
kdDebug() << k_funcinfo << "Could not find file / line split in \""<<lineAndFile<<"\""<<endl;
else
diff --git a/src/languages/externallanguage.cpp b/src/languages/externallanguage.cpp
index 233c639..784bf0f 100644
--- a/src/languages/externallanguage.cpp
+++ b/src/languages/externallanguage.cpp
@@ -151,7 +151,7 @@ void ExternalLanguage::displayProcessCommand()
for ( TQValueList<TQCString>::const_iterator it = arguments.begin(); it != end; ++it )
{
- if ( (*it).isEmpty() || (*it).tqcontains( TQRegExp("[\\s]") ) )
+ if ( (*it).isEmpty() || (*it).contains( TQRegExp("[\\s]") ) )
quotedArguments << KProcess::quote( *it );
else
quotedArguments << *it;
diff --git a/src/languages/flowcode.cpp b/src/languages/flowcode.cpp
index b557c59..a1c664d 100644
--- a/src/languages/flowcode.cpp
+++ b/src/languages/flowcode.cpp
@@ -96,7 +96,7 @@ void FlowCode::addCode( const TQString& code )
bool FlowCode::isValidBranch( FlowPart *flowPart )
{
- return flowPart && (flowPart->level() >= m_curLevel) && !m_stopParts.tqcontains(flowPart);
+ return flowPart && (flowPart->level() >= m_curLevel) && !m_stopParts.contains(flowPart);
}
void FlowCode::addCodeBranch( FlowPart * flowPart )
@@ -107,7 +107,7 @@ void FlowCode::addCodeBranch( FlowPart * flowPart )
if ( !isValidBranch(flowPart) )
return;
- if ( m_addedParts.tqcontains(flowPart) )
+ if ( m_addedParts.contains(flowPart) )
{
const TQString labelName = genLabel(flowPart->id());
addCode( "goto "+labelName );
@@ -145,7 +145,7 @@ void FlowCode::removeStopPart( FlowPart *part )
// We only want to remove one instance of the FlowPart, in case it has been
// used as a StopPart for more than one FlowPart
- FlowPartList::iterator it = m_stopParts.tqfind(part);
+ FlowPartList::iterator it = m_stopParts.find(part);
if ( it != m_stopParts.end() ) m_stopParts.remove(it);
}
@@ -278,7 +278,7 @@ TQString FlowCode::generateMicrobe( const ItemList &itemList, MicroSettings *set
if ( portType != (1<<pinCount)-1 )
{
TQString name = *it;
- name.tqreplace("PORT","TRIS");
+ name.replace("PORT","TRIS");
addCode( name+" = "+TQString::number(portType) );
}
}
@@ -319,7 +319,7 @@ void FlowCode::tidyCode()
const TQStringList::iterator end = m_labels.end();
for ( TQStringList::iterator it = m_labels.begin(); it != end; ++it )
{
- if ( !m_gotos.tqcontains(*it) ) m_code.remove(*it+':');
+ if ( !m_gotos.contains(*it) ) m_code.remove(*it+':');
}
@@ -444,7 +444,7 @@ void FlowCode::tidyCode()
void FlowCode::addSubroutine( FlowPart *part )
{
- if ( !part || m_subroutines.tqcontains(part) || part->parentItem() || !dynamic_cast<FlowContainer*>(part) ) return;
+ if ( !part || m_subroutines.contains(part) || part->parentItem() || !dynamic_cast<FlowContainer*>(part) ) return;
m_subroutines.append(part);
}
diff --git a/src/languages/gpasm.cpp b/src/languages/gpasm.cpp
index 33cb892..4020b60 100644
--- a/src/languages/gpasm.cpp
+++ b/src/languages/gpasm.cpp
@@ -126,13 +126,13 @@ void Gpasm::processInput( ProcessOptions options )
bool Gpasm::isError( const TQString &message ) const
{
- return message.tqcontains( "Error", false );
+ return message.contains( "Error", false );
}
bool Gpasm::isWarning( const TQString &message ) const
{
- return message.tqcontains( "Warning", false );
+ return message.contains( "Warning", false );
}
diff --git a/src/languages/gpdasm.cpp b/src/languages/gpdasm.cpp
index ea98221..e0a7b9e 100644
--- a/src/languages/gpdasm.cpp
+++ b/src/languages/gpdasm.cpp
@@ -77,13 +77,13 @@ bool Gpdasm::processExited( bool successfully )
bool Gpdasm::isError( const TQString &message ) const
{
- return (message.tqfind( "error", -1, false ) != -1);
+ return (message.find( "error", -1, false ) != -1);
}
bool Gpdasm::isWarning( const TQString &message ) const
{
- return (message.tqfind( "warning", -1, false ) != -1);
+ return (message.find( "warning", -1, false ) != -1);
}
@@ -92,18 +92,18 @@ MessageInfo Gpdasm::extractMessageInfo( const TQString &text )
if ( text.length()<5 || !text.startsWith("/") )
return MessageInfo();
- const int index = text.tqfind( ".asm", 0, false )+4;
+ const int index = text.find( ".asm", 0, false )+4;
if ( index == -1+4 )
return MessageInfo();
const TQString fileName = text.left(index);
// Extra line number
const TQString message = text.right(text.length()-index);
- const int linePos = message.tqfind( TQRegExp(":[\\d]+") );
+ const int linePos = message.find( TQRegExp(":[\\d]+") );
int line = -1;
if ( linePos != -1 )
{
- const int linePosEnd = message.tqfind( ':', linePos+1 );
+ const int linePosEnd = message.find( ':', linePos+1 );
if ( linePosEnd != -1 )
{
const TQString number = message.mid( linePos+1, linePosEnd-linePos-1 ).stripWhiteSpace();
diff --git a/src/languages/gplib.cpp b/src/languages/gplib.cpp
index 46e6a76..919efee 100644
--- a/src/languages/gplib.cpp
+++ b/src/languages/gplib.cpp
@@ -55,13 +55,13 @@ void Gplib::processInput( ProcessOptions options )
bool Gplib::isError( const TQString &message ) const
{
- return message.tqcontains( "Error", false );
+ return message.contains( "Error", false );
}
bool Gplib::isWarning( const TQString &message ) const
{
- return message.tqcontains( "Warning", false );
+ return message.contains( "Warning", false );
}
@@ -71,18 +71,18 @@ MessageInfo Gplib::extractMessageInfo( const TQString &text )
if ( text.length()<5 || !text.startsWith("/") )
return MessageInfo();
- const int index = text.tqfind( ".asm", 0, false )+4;
+ const int index = text.find( ".asm", 0, false )+4;
if ( index == -1+4 )
return MessageInfo();
const TQString fileName = text.left(index);
// Extra line number
const TQString message = text.right(text.length()-index);
- const int linePos = message.tqfind( TQRegExp(":[\\d]+") );
+ const int linePos = message.find( TQRegExp(":[\\d]+") );
int line = -1;
if ( linePos != -1 )
{
- const int linePosEnd = message.tqfind( ':', linePos+1 );
+ const int linePosEnd = message.find( ':', linePos+1 );
if ( linePosEnd != -1 )
{
const TQString number = message.mid( linePos+1, linePosEnd-linePos-1 ).stripWhiteSpace();
diff --git a/src/languages/gplink.cpp b/src/languages/gplink.cpp
index 9b1859c..7055fa2 100644
--- a/src/languages/gplink.cpp
+++ b/src/languages/gplink.cpp
@@ -86,13 +86,13 @@ void Gplink::processInput( ProcessOptions options )
bool Gplink::isError( const TQString &message ) const
{
- return message.tqcontains( "Error", false );
+ return message.contains( "Error", false );
}
bool Gplink::isWarning( const TQString &message ) const
{
- return message.tqcontains( "Warning", false );
+ return message.contains( "Warning", false );
}
@@ -102,18 +102,18 @@ MessageInfo Gplink::extractMessageInfo( const TQString &text )
if ( text.length()<5 || !text.startsWith("/") )
return MessageInfo();
- const int index = text.tqfind( ".asm", 0, false )+4;
+ const int index = text.find( ".asm", 0, false )+4;
if ( index == -1+4 )
return MessageInfo();
const TQString fileName = text.left(index);
// Extra line number
const TQString message = text.right(text.length()-index);
- const int linePos = message.tqfind( TQRegExp(":[\\d]+") );
+ const int linePos = message.find( TQRegExp(":[\\d]+") );
int line = -1;
if ( linePos != -1 )
{
- const int linePosEnd = message.tqfind( ':', linePos+1 );
+ const int linePosEnd = message.find( ':', linePos+1 );
if ( linePosEnd != -1 )
{
const TQString number = message.mid( linePos+1, linePosEnd-linePos-1 ).stripWhiteSpace();
diff --git a/src/languages/language.cpp b/src/languages/language.cpp
index f98d580..e2c4c7a 100644
--- a/src/languages/language.cpp
+++ b/src/languages/language.cpp
@@ -101,18 +101,18 @@ MessageInfo Language::extractMessageInfo( const TQString &text )
if ( !text.startsWith("/") )
return MessageInfo();
- const int index = text.tqfind( ":", 0, false );
+ const int index = text.find( ":", 0, false );
if ( index == -1 )
return MessageInfo();
const TQString fileName = text.left(index);
// Extra line number
const TQString message = text.right(text.length()-index);
- const int linePos = message.tqfind( TQRegExp(":[\\d]+") );
+ const int linePos = message.find( TQRegExp(":[\\d]+") );
int line = -1;
if ( linePos != -1 )
{
- const int linePosEnd = message.tqfind( ':', linePos+1 );
+ const int linePosEnd = message.find( ':', linePos+1 );
if ( linePosEnd != -1 )
{
const TQString number = message.mid( linePos+1, linePosEnd-linePos-1 ).stripWhiteSpace();
@@ -234,7 +234,7 @@ void ProcessOptions::setTargetFile( const TQString &file )
ProcessOptions::ProcessPath::MediaType ProcessOptions::guessMediaType( const TQString & url )
{
- TQString extension = url.right( url.length() - url.tqfindRev('.') - 1 );
+ TQString extension = url.right( url.length() - url.findRev('.') - 1 );
extension = extension.lower();
if ( extension == "asm" )
diff --git a/src/languages/microbe.cpp b/src/languages/microbe.cpp
index b7c7f8b..00cf1ed 100644
--- a/src/languages/microbe.cpp
+++ b/src/languages/microbe.cpp
@@ -40,9 +40,9 @@ Microbe::Microbe( ProcessChain *processChain, KTechlab *tqparent )
if ( !line.isEmpty() )
{
bool ok;
- const int pos = line.left( line.tqfind("#") ).toInt(&ok);
+ const int pos = line.left( line.find("#") ).toInt(&ok);
if (ok) {
- m_errorMessages[pos] = line.right(line.length()-line.tqfind("#"));
+ m_errorMessages[pos] = line.right(line.length()-line.find("#"));
} else {
kdError() << k_funcinfo << "Error parsing Microbe error-message file"<<endl;
}
@@ -83,12 +83,12 @@ void Microbe::processInput( ProcessOptions options )
bool Microbe::isError( const TQString &message ) const
{
- return message.tqcontains( "Error", false );
+ return message.contains( "Error", false );
}
bool Microbe::isWarning( const TQString &message ) const
{
- return message.tqcontains( "Warning", false );
+ return message.contains( "Warning", false );
}
diff --git a/src/languages/picprogrammer.cpp b/src/languages/picprogrammer.cpp
index 882622e..3c4e38d 100644
--- a/src/languages/picprogrammer.cpp
+++ b/src/languages/picprogrammer.cpp
@@ -375,7 +375,7 @@ void PicProgrammer::processInput( ProcessOptions options )
settings.load( kapp->config() );
TQString program = options.m_program;
- if ( !settings.configNames( true ).tqcontains( program.lower() ) )
+ if ( !settings.configNames( true ).contains( program.lower() ) )
{
kdError() << k_funcinfo << "Invalid program" << endl;
finish( false );
@@ -385,9 +385,9 @@ void PicProgrammer::processInput( ProcessOptions options )
ProgrammerConfig config = settings.config( program );
TQString command = config.writeCommand;
- command.tqreplace( "%port", options.m_port );
- command.tqreplace( "%device", TQString( options.m_picID ).remove("P") );
- command.tqreplace( "%file", KProcess::quote( options.inputFiles().first() ) );
+ command.replace( "%port", options.m_port );
+ command.replace( "%device", TQString( options.m_picID ).remove("P") );
+ command.replace( "%file", KProcess::quote( options.inputFiles().first() ) );
m_languageProcess->setUseShell( true );
*m_languageProcess << command;
@@ -403,13 +403,13 @@ void PicProgrammer::processInput( ProcessOptions options )
bool PicProgrammer::isError( const TQString &message ) const
{
- return message.tqcontains( "Error", false );
+ return message.contains( "Error", false );
}
bool PicProgrammer::isWarning( const TQString &message ) const
{
- return message.tqcontains( "Warning", false );
+ return message.contains( "Warning", false );
}
diff --git a/src/mechanics/mechanicsdocument.cpp b/src/mechanics/mechanicsdocument.cpp
index f11d421..98542ef 100644
--- a/src/mechanics/mechanicsdocument.cpp
+++ b/src/mechanics/mechanicsdocument.cpp
@@ -139,7 +139,7 @@ bool MechanicsDocument::registerItem( TQCanvasItem *qcanvasItem )
void MechanicsDocument::appendDeleteList( TQCanvasItem *qcanvasItem )
{
MechanicsItem *mechItem = dynamic_cast<MechanicsItem*>(qcanvasItem);
- if ( !mechItem || m_itemDeleteList.tqcontains(mechItem) ) {
+ if ( !mechItem || m_itemDeleteList.contains(mechItem) ) {
return;
}
@@ -159,7 +159,7 @@ void MechanicsDocument::flushDeleteList()
ItemList::iterator end = m_itemDeleteList.end();
for ( ItemList::iterator it = m_itemDeleteList.begin(); it != end; ++it )
{
- if ( *it && m_itemDeleteList.tqcontains(*it) > 1 )
+ if ( *it && m_itemDeleteList.contains(*it) > 1 )
*it = 0l;
}
m_itemDeleteList.remove(TQGuardedPtr<Item>(0l));
diff --git a/src/mechanics/mechanicsgroup.cpp b/src/mechanics/mechanicsgroup.cpp
index 32f1748..40b0c8a 100644
--- a/src/mechanics/mechanicsgroup.cpp
+++ b/src/mechanics/mechanicsgroup.cpp
@@ -26,7 +26,7 @@ MechanicsGroup::~MechanicsGroup()
bool MechanicsGroup::addItem( Item *item )
{
- if ( !item || !item->canvas() || m_itemList.tqcontains(item) ) {
+ if ( !item || !item->canvas() || m_itemList.contains(item) ) {
return false;
}
@@ -34,7 +34,7 @@ bool MechanicsGroup::addItem( Item *item )
Item *tqparent = item->parentItem();
while (tqparent)
{
- if ( m_itemList.tqcontains(tqparent) )
+ if ( m_itemList.contains(tqparent) )
return false;
tqparent = tqparent->parentItem();
}
@@ -52,7 +52,7 @@ bool MechanicsGroup::addItem( Item *item )
bool MechanicsGroup::removeItem( Item *item )
{
- if ( !item || !m_itemList.tqcontains(item) ) {
+ if ( !item || !m_itemList.contains(item) ) {
return false;
}
unregisterItem(item);
@@ -134,7 +134,7 @@ MechanicsItemList MechanicsGroup::toplevelMechItemList() const
MechanicsItem* tqparent = *it;
while (tqparent)
{
- if ( !tqparent->parentItem() && !toplevel.tqcontains(tqparent) )
+ if ( !tqparent->parentItem() && !toplevel.contains(tqparent) )
toplevel.append(tqparent);
tqparent = dynamic_cast<MechanicsItem*>(tqparent->parentItem());
@@ -162,9 +162,9 @@ bool MechanicsGroup::addTQCanvasItem( TQCanvasItem* item )
return addItem( dynamic_cast<Item*>(item) );
}
-bool MechanicsGroup::tqcontains(TQCanvasItem* item) const
+bool MechanicsGroup::contains(TQCanvasItem* item) const
{
- return m_itemList.tqcontains(dynamic_cast<Item*>(item));
+ return m_itemList.contains(dynamic_cast<Item*>(item));
}
@@ -214,7 +214,7 @@ void MechanicsGroup::setItems(TQCanvasItemList list)
const ItemList::iterator end = m_itemList.end();
for ( ItemList::iterator it = m_itemList.begin(); it != end; ++it )
{
- if ( !list.tqcontains(*it) ) {
+ if ( !list.contains(*it) ) {
removeList.append(*it);
}
}
diff --git a/src/mechanics/mechanicsgroup.h b/src/mechanics/mechanicsgroup.h
index c3ca347..0908d66 100644
--- a/src/mechanics/mechanicsgroup.h
+++ b/src/mechanics/mechanicsgroup.h
@@ -48,7 +48,7 @@ public:
bool addItem( Item *item );
bool removeItem( Item *item );
virtual bool addTQCanvasItem(TQCanvasItem* item);
- virtual bool tqcontains(TQCanvasItem* item) const;
+ virtual bool contains(TQCanvasItem* item) const;
virtual uint count() const { return itemCount(); }
virtual void deleteAllItems();
virtual void mergeGroup(ItemGroup* group);
diff --git a/src/mechanics/mechanicssimulation.cpp b/src/mechanics/mechanicssimulation.cpp
index 15900d3..8ec5e2f 100644
--- a/src/mechanics/mechanicssimulation.cpp
+++ b/src/mechanics/mechanicssimulation.cpp
@@ -51,7 +51,7 @@ RigidBody::~RigidBody()
bool RigidBody::addMechanicsItem( MechanicsItem *item )
{
- if ( !item || m_mechanicsItemList.tqcontains(item) )
+ if ( !item || m_mechanicsItemList.contains(item) )
return false;
m_mechanicsItemList.append(item);
diff --git a/src/micro/micropackage.cpp b/src/micro/micropackage.cpp
index a5e8809..7dac344 100644
--- a/src/micro/micropackage.cpp
+++ b/src/micro/micropackage.cpp
@@ -40,12 +40,12 @@ MicroPackage::~MicroPackage()
void MicroPackage::assignPin( int pinPosition, PicPin::pin_type type, const TQString& pinID, const TQString& portName, int portPosition )
{
- if ( m_picPinMap.tqfind(pinPosition) != m_picPinMap.end() )
+ if ( m_picPinMap.find(pinPosition) != m_picPinMap.end() )
{
kdError() << "PicDevice::assignBidirPin: Attempting to reset pin "<<pinPosition<<endl;
return;
}
- if ( !m_portNames.tqcontains(portName) && !portName.isEmpty() )
+ if ( !m_portNames.contains(portName) && !portName.isEmpty() )
{
m_portNames.append(portName);
m_portNames.sort();
diff --git a/src/microsettings.cpp b/src/microsettings.cpp
index 6790582..f10ca72 100644
--- a/src/microsettings.cpp
+++ b/src/microsettings.cpp
@@ -136,7 +136,7 @@ PinSettings* MicroSettings::pinWithID( const TQString &id )
int MicroSettings::portState( const TQString &port )
{
- if ( microInfo()->package()->portNames().tqfindIndex(port) == -1 ) return -1;
+ if ( microInfo()->package()->portNames().findIndex(port) == -1 ) return -1;
int pinPower = 1;
int num = 0;
@@ -157,7 +157,7 @@ int MicroSettings::portState( const TQString &port )
int MicroSettings::portType( const TQString &port )
{
- if ( microInfo()->package()->portNames().tqfindIndex(port) == -1 ) return -1;
+ if ( microInfo()->package()->portNames().findIndex(port) == -1 ) return -1;
int pinPower = 1;
int num = 0;
@@ -177,7 +177,7 @@ int MicroSettings::portType( const TQString &port )
void MicroSettings::setPortState( const TQString &port, int state )
{
- PortList::iterator plit = m_ports.tqfind(port);
+ PortList::iterator plit = m_ports.find(port);
if ( plit == m_ports.end() ) return;
const PinSettingsList::iterator plitEnd = plit.data().end();
@@ -192,7 +192,7 @@ void MicroSettings::setPortState( const TQString &port, int state )
void MicroSettings::setPortType( const TQString &port, int type )
{
- PortList::iterator plit = m_ports.tqfind(port);
+ PortList::iterator plit = m_ports.find(port);
if ( plit == m_ports.end() ) return;
const PinSettingsList::iterator plitEnd = plit.data().end();
@@ -254,7 +254,7 @@ void MicroSettings::restoreFromMicroData( const MicroData &microData )
void MicroSettings::setVariable( const TQString &name, TQVariant value, bool permanent )
{
if ( name.isNull() ) return;
- VariableMap::iterator it = m_variableMap.tqfind(name);
+ VariableMap::iterator it = m_variableMap.find(name);
if ( it != m_variableMap.end() )
{
it.data().setValue(value);
@@ -287,7 +287,7 @@ TQStringList MicroSettings::variableNames()
VariableInfo* MicroSettings::variableInfo( const TQString &name )
{
if ( name.isNull() ) return 0l;
- VariableMap::iterator it = m_variableMap.tqfind(name);
+ VariableMap::iterator it = m_variableMap.find(name);
if ( it != m_variableMap.end() ) {
return &(it.data());
} else {
@@ -299,7 +299,7 @@ VariableInfo* MicroSettings::variableInfo( const TQString &name )
bool MicroSettings::deleteVariable( const TQString &name )
{
if ( name.isNull() ) return false;
- VariableMap::iterator it = m_variableMap.tqfind(name);
+ VariableMap::iterator it = m_variableMap.find(name);
if ( it != m_variableMap.end() )
{
m_variableMap.erase(it);
diff --git a/src/node.cpp b/src/node.cpp
index 4aa3ebe..8e38b02 100644
--- a/src/node.cpp
+++ b/src/node.cpp
@@ -130,7 +130,7 @@ bool Node::isConnected( Node *node, NodeList *checkedNodes )
if (firstNode)
checkedNodes = new NodeList();
- else if ( checkedNodes->tqcontains(this) )
+ else if ( checkedNodes->contains(this) )
return false;
@@ -387,7 +387,7 @@ bool Node::handleNewConnector( Connector * connector )
if (!connector)
return false;
- if ( m_inputConnectorList.tqcontains(connector) || m_outputConnectorList.tqcontains(connector) )
+ if ( m_inputConnectorList.contains(connector) || m_outputConnectorList.contains(connector) )
{
kdWarning() << k_funcinfo << " Already have connector = " << connector << endl;
return false;
@@ -423,14 +423,14 @@ void Node::removeConnector( Connector *connector )
ConnectorList::iterator it;
- it = m_inputConnectorList.tqfind(connector);
+ it = m_inputConnectorList.find(connector);
if ( it != m_inputConnectorList.end() )
{
(*it)->removeConnector();
(*it) = 0L;
}
- it = m_outputConnectorList.tqfind(connector);
+ it = m_outputConnectorList.find(connector);
if ( it != m_outputConnectorList.end() )
{
(*it)->removeConnector();
diff --git a/src/nodegroup.cpp b/src/nodegroup.cpp
index 903a20f..aaea114 100644
--- a/src/nodegroup.cpp
+++ b/src/nodegroup.cpp
@@ -60,7 +60,7 @@ void NodeGroup::setVisible( bool visible )
void NodeGroup::addNode( Node *node, bool checkSurrouding )
{
- if ( !node || node->isChildNode() || m_nodeList.tqcontains(node) ) {
+ if ( !node || node->isChildNode() || m_nodeList.contains(node) ) {
return;
}
@@ -209,7 +209,7 @@ IntList NodeGroup::findRoute( IntList used, int currentNode, int endNode, bool *
}
*success = false;
- if ( !used.tqcontains(currentNode) ) {
+ if ( !used.contains(currentNode) ) {
used.append(currentNode);
}
@@ -221,7 +221,7 @@ IntList NodeGroup::findRoute( IntList used, int currentNode, int endNode, bool *
const uint n = m_nodeList.size()+m_extNodeList.size();
for ( uint i=0; i<n; ++i )
{
- if ( b_routedMap[i*n+currentNode] && !used.tqcontains(i) )
+ if ( b_routedMap[i*n+currentNode] && !used.contains(i) )
{
IntList il = findRoute( used, i, endNode, success );
if (*success) {
@@ -247,7 +247,7 @@ Connector* NodeGroup::findCommonConnector( Node *n1, Node *n2 )
const ConnectorList::iterator end = n1Con.end();
for ( ConnectorList::iterator it = n1Con.begin(); it != end; ++it )
{
- if ( n2Con.tqcontains(*it) ) {
+ if ( n2Con.contains(*it) ) {
return *it;
}
}
@@ -346,13 +346,13 @@ bool NodeGroup::canRoute( Node *n1, Node *n2 )
IntList reachable;
getReachable( &reachable, getNodePos(n1) );
- return reachable.tqcontains(getNodePos(n2));
+ return reachable.contains(getNodePos(n2));
}
void NodeGroup::getReachable( IntList *reachable, int node )
{
- if ( !reachable || reachable->tqcontains(node) ) {
+ if ( !reachable || reachable->contains(node) ) {
return;
}
reachable->append(node);
@@ -402,7 +402,7 @@ void NodeGroup::removeRoutedNodes( NodeList *nodes, Node *n1, Node *n2 )
const NodeList::iterator end = nodes->end();
for ( NodeList::iterator it = nodes->begin(); it != end; ++it )
{
- if ( nodes->tqcontains(*it) > 1 ) {
+ if ( nodes->contains(*it) > 1 ) {
*it = 0l;
}
}
@@ -442,11 +442,11 @@ int NodeGroup::getNodePos( Node *n )
if (!n) {
return -1;
}
- int pos = m_nodeList.tqfindIndex(n);
+ int pos = m_nodeList.findIndex(n);
if ( pos != -1 ) {
return pos;
}
- pos = m_extNodeList.tqfindIndex(n);
+ pos = m_extNodeList.findIndex(n);
if ( pos != -1 ) {
return pos+m_nodeList.size();
}
@@ -511,7 +511,7 @@ void NodeGroup::init()
{
Connector *con = *conIt;
addExtNode(con->startNode());
- if ( !m_conList.tqcontains(con) ) {
+ if ( !m_conList.contains(con) ) {
m_conList += con;
con->setNodeGroup(this);
}
@@ -523,7 +523,7 @@ void NodeGroup::init()
{
Connector *con = *conIt;
addExtNode(con->endNode());
- if ( !m_conList.tqcontains(con) ) {
+ if ( !m_conList.contains(con) ) {
m_conList += con;
con->setNodeGroup(this);
}
@@ -562,7 +562,7 @@ void NodeGroup::connectorRemoved( Connector *connector )
void NodeGroup::addExtNode( Node *node )
{
- if ( !m_extNodeList.tqcontains(node) && !m_nodeList.tqcontains(node) )
+ if ( !m_extNodeList.contains(node) && !m_nodeList.contains(node) )
{
m_extNodeList.append(node);
node->setNodeGroup(this);
diff --git a/src/nodegroup.h b/src/nodegroup.h
index acdd055..26521ab 100644
--- a/src/nodegroup.h
+++ b/src/nodegroup.h
@@ -66,7 +66,7 @@ public:
/**
* @returns true if node is an internal node to this group
*/
- bool tqcontains( Node *node ) const { return m_nodeList.tqcontains(node); }
+ bool contains( Node *node ) const { return m_nodeList.contains(node); }
/**
* Reroute the NodeGroup. This function should only ever be called by
* ICNDocument::rerouteInvalidatedConnectors(), as it is important that
diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp
index ad6a32a..884a8e9 100644
--- a/src/projectmanager.cpp
+++ b/src/projectmanager.cpp
@@ -254,7 +254,7 @@ void ProjectItem::updateILVItemPixmap()
void ProjectItem::addChild( ProjectItem * child )
{
- if ( !child || m_tqchildren.tqcontains(child) )
+ if ( !child || m_tqchildren.contains(child) )
return;
m_tqchildren << child;
@@ -336,8 +336,8 @@ void ProjectItem::setURL( const KURL & url )
if ( !newExtension.isEmpty() )
{
const TQString fileName = url.url();
- TQString extension = fileName.right( fileName.length() - fileName.tqfindRev('.') );
- setOutputURL( TQString(fileName).tqreplace( extension, newExtension ) );
+ TQString extension = fileName.right( fileName.length() - fileName.findRev('.') );
+ setOutputURL( TQString(fileName).replace( extension, newExtension ) );
}
}
diff --git a/src/resizeoverlay.cpp b/src/resizeoverlay.cpp
index c3ad8ef..a34aeb8 100644
--- a/src/resizeoverlay.cpp
+++ b/src/resizeoverlay.cpp
@@ -63,7 +63,7 @@ void ResizeOverlay::setVisible( bool visible )
ResizeHandle *ResizeOverlay::createResizeHandle( int id, ResizeHandle::DrawType drawType, int xsnap, int ysnap )
{
- ResizeHandleMap::iterator it = m_resizeHandleMap.tqfind(id);
+ ResizeHandleMap::iterator it = m_resizeHandleMap.find(id);
if ( it != m_resizeHandleMap.end() )
return it.data();
@@ -76,7 +76,7 @@ ResizeHandle *ResizeOverlay::createResizeHandle( int id, ResizeHandle::DrawType
void ResizeOverlay::removeResizeHandle( int id )
{
- ResizeHandleMap::iterator it = m_resizeHandleMap.tqfind(id);
+ ResizeHandleMap::iterator it = m_resizeHandleMap.find(id);
if ( it == m_resizeHandleMap.end() )
return;
@@ -89,7 +89,7 @@ void ResizeOverlay::removeResizeHandle( int id )
ResizeHandle *ResizeOverlay::resizeHandle( int id )
{
- ResizeHandleMap::iterator it = m_resizeHandleMap.tqfind(id);
+ ResizeHandleMap::iterator it = m_resizeHandleMap.find(id);
if ( it != m_resizeHandleMap.end() )
return it.data();
return 0l;
diff --git a/src/simulator.cpp b/src/simulator.cpp
index bc6ab55..fda2e3c 100644
--- a/src/simulator.cpp
+++ b/src/simulator.cpp
@@ -247,7 +247,7 @@ void Simulator::createLogicChain( LogicOut * logicOut, const LogicInList & logic
addChangedLogic(logicOut);
logicOut->setCanAddChanged(false);
- if ( !m_logicChainStarts.tqcontains( logicOut ) )
+ if ( !m_logicChainStarts.contains( logicOut ) )
m_logicChainStarts << logicOut;
}
diff --git a/src/textdocument.cpp b/src/textdocument.cpp
index 41caf94..628cfb6 100644
--- a/src/textdocument.cpp
+++ b/src/textdocument.cpp
@@ -231,7 +231,7 @@ void TextDocument::guessScheme( bool allowDisable )
{
// And specific file actions depending on the current type of file
TQString fileName = url().fileName();
- TQString extension = fileName.right( fileName.length() - fileName.tqfindRev('.') - 1 );
+ TQString extension = fileName.right( fileName.length() - fileName.findRev('.') - 1 );
if ( extension == "asm" || extension == "src" || extension == "inc" )
slotInitLanguage(ct_asm);
diff --git a/src/textview.cpp b/src/textview.cpp
index 0bca8a8..fd456bc 100644
--- a/src/textview.cpp
+++ b/src/textview.cpp
@@ -323,7 +323,7 @@ void TextView::slotWordHoveredOver( const TQString & word, int line, int col )
// Find out if the word that we are hovering over is the operand data
KTextEditor::EditInterface * e = (KTextEditor::EditInterface*)textDocument()->kateDocument()->qt_cast("KTextEditor::EditInterface");
InstructionParts parts( e->textLine( unsigned(line) ) );
- if ( !parts.operandData().tqcontains( word ) )
+ if ( !parts.operandData().contains( word ) )
return;
if ( RegisterInfo * info = gpsim->registerMemory()->fromName( word ) )
diff --git a/src/variant.cpp b/src/variant.cpp
index 940eb6e..bfeafa9 100644
--- a/src/variant.cpp
+++ b/src/variant.cpp
@@ -47,7 +47,7 @@ void Variant::setType( Type::Value type )
void Variant::appendAllowed(TQString string)
{
- if ( !m_allowed.tqcontains(string) ) {
+ if ( !m_allowed.contains(string) ) {
m_allowed.append(string);
}
}
@@ -61,7 +61,7 @@ void Variant::setAllowed(TQStringList stringList)
const TQStringList::iterator end = stringList.end();
for ( TQStringList::iterator it = stringList.begin(); it != end; ++it )
{
- if ( !m_allowed.tqcontains(*it) ) {
+ if ( !m_allowed.contains(*it) ) {
m_allowed.append(*it);
}
}
diff --git a/src/viewcontainer.cpp b/src/viewcontainer.cpp
index 9242562..a06c95a 100644
--- a/src/viewcontainer.cpp
+++ b/src/viewcontainer.cpp
@@ -124,7 +124,7 @@ View *ViewContainer::view( uint id ) const
ViewArea *ViewContainer::viewArea( uint id ) const
{
- if ( !m_viewAreaMap.tqcontains(id) )
+ if ( !m_viewAreaMap.contains(id) )
return 0l;
return m_viewAreaMap[id];
@@ -211,7 +211,7 @@ void ViewContainer::setViewAreaRemoved( uint id )
if (b_deleted)
return;
- ViewAreaMap::iterator it = m_viewAreaMap.tqfind(id);
+ ViewAreaMap::iterator it = m_viewAreaMap.find(id);
if ( it == m_viewAreaMap.end() )
return;
@@ -501,13 +501,13 @@ void ViewArea::saveState( KConfig *config )
{
config->writeEntry( orientationKey(m_id), (orientation() == Qt::Horizontal) ? "LeftRight" : "TopBottom" );
- TQValueList<int> tqcontains;
+ TQValueList<int> contains;
if (va1Ok)
- tqcontains << p_viewArea1->id();
+ contains << p_viewArea1->id();
if (va2Ok)
- tqcontains << p_viewArea2->id();
+ contains << p_viewArea2->id();
- config->writeEntry( containsKey(m_id), tqcontains );
+ config->writeEntry( containsKey(m_id), contains );
if (va1Ok)
p_viewArea1->saveState(config);
if (va2Ok)
@@ -549,25 +549,25 @@ void ViewArea::restoreState( KConfig *config, int id, const TQString &groupName
if ( config->hasKey( containsKey(m_id) ) )
{
typedef TQValueList<int> IntList;
- IntList tqcontains = config->readIntListEntry( containsKey(m_id) );
+ IntList contains = config->readIntListEntry( containsKey(m_id) );
- if ( tqcontains.isEmpty() || tqcontains.size() > 2 )
- kdError() << k_funcinfo << "Contained list has wrong size of " << tqcontains.size() << endl;
+ if ( contains.isEmpty() || contains.size() > 2 )
+ kdError() << k_funcinfo << "Contained list has wrong size of " << contains.size() << endl;
else
{
- if ( tqcontains.size() >= 1 )
+ if ( contains.size() >= 1 )
{
- int viewArea1Id = tqcontains[0];
+ int viewArea1Id = contains[0];
p_viewArea1 = new ViewArea( this, p_viewContainer, viewArea1Id, (const char*)("viewarea_"+TQString::number(viewArea1Id)) );
connect( p_viewArea1, TQT_SIGNAL(destroyed(TQObject* )), this, TQT_SLOT(viewAreaDestroyed(TQObject* )) );
p_viewArea1->restoreState( config, viewArea1Id, groupName );
p_viewArea1->show();
}
- if ( tqcontains.size() >= 2 )
+ if ( contains.size() >= 2 )
{
- int viewArea2Id = tqcontains[1];
+ int viewArea2Id = contains[1];
p_viewArea2 = new ViewArea( this, p_viewContainer, viewArea2Id, (const char*)("viewarea_"+TQString::number(viewArea2Id)) );
connect( p_viewArea2, TQT_SIGNAL(destroyed(TQObject* )), this, TQT_SLOT(viewAreaDestroyed(TQObject* )) );
p_viewArea2->restoreState( config, viewArea2Id, groupName );
@@ -591,7 +591,7 @@ TQString ViewArea::fileKey( int id )
}
TQString ViewArea::containsKey( int id )
{
- return TQString("ViewArea ") + TQString::number(id) + TQString(" tqcontains");
+ return TQString("ViewArea ") + TQString::number(id) + TQString(" contains");
}
TQString ViewArea::orientationKey( int id )
{