summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:32:48 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:32:48 -0600
commitbab171b2a7d7f36e2d5dd510df80fc8cb4a6b06f (patch)
treeebcbd8371d791d7419485d11deec88587c36aa7e
parent393fa51a38771670ecb265a99ab592e03f4ecc5c (diff)
downloadktechlab-bab171b2a7d7f36e2d5dd510df80fc8cb4a6b06f.tar.gz
ktechlab-bab171b2a7d7f36e2d5dd510df80fc8cb4a6b06f.zip
Rename a number of old tq methods that are no longer tq specific
-rw-r--r--microbe/btreebase.cpp2
-rw-r--r--microbe/btreenode.cpp2
-rw-r--r--microbe/btreenode.h2
-rw-r--r--microbe/expression.cpp2
-rw-r--r--microbe/instruction.cpp60
-rw-r--r--microbe/microbe.cpp38
-rw-r--r--microbe/microbe.h2
-rw-r--r--microbe/parser.cpp2
-rw-r--r--microbe/pic14.cpp20
-rw-r--r--microbe/traverser.cpp4
-rw-r--r--src/canvasitemparts.cpp14
-rw-r--r--src/circuitview.cpp6
-rw-r--r--src/circuitview.h2
-rw-r--r--src/cnitem.cpp14
-rw-r--r--src/cnitem.h2
-rw-r--r--src/cnitemgroup.h4
-rw-r--r--src/connector.cpp4
-rw-r--r--src/docmanager.cpp18
-rw-r--r--src/document.cpp4
-rw-r--r--src/drawparts/dptext.cpp2
-rw-r--r--src/drawparts/dptext.h2
-rw-r--r--src/drawparts/solidshape.cpp2
-rw-r--r--src/drawparts/solidshape.h2
-rw-r--r--src/electronics/component.cpp2
-rw-r--r--src/electronics/component.h4
-rw-r--r--src/electronics/components/bussplitter.cpp2
-rw-r--r--src/electronics/components/eckeypad.cpp4
-rw-r--r--src/electronics/components/ecpotentiometer.cpp2
-rw-r--r--src/electronics/components/magnitudecomparator.cpp4
-rw-r--r--src/electronics/components/matrixdisplay.cpp4
-rw-r--r--src/electronics/components/parallelportcomponent.cpp18
-rw-r--r--src/electronics/components/parallelportcomponent.h2
-rw-r--r--src/electronics/components/piccomponent.cpp8
-rw-r--r--src/electronics/components/ram.cpp18
-rw-r--r--src/electronics/components/rotoswitch.cpp4
-rw-r--r--src/electronics/components/serialportcomponent.cpp2
-rw-r--r--src/electronics/ecnode.cpp2
-rw-r--r--src/electronics/gpsimprocessor.cpp42
-rw-r--r--src/electronics/gpsimprocessor.h16
-rw-r--r--src/electronics/port.cpp16
-rw-r--r--src/electronics/port.h4
-rw-r--r--src/electronics/simulation/capacitance.cpp6
-rw-r--r--src/electronics/simulation/capacitance.h2
-rw-r--r--src/electronics/simulation/element.cpp8
-rw-r--r--src/electronics/simulation/element.h2
-rw-r--r--src/electronics/simulation/inductance.cpp6
-rw-r--r--src/electronics/simulation/inductance.h2
-rw-r--r--src/electronics/simulation/reactive.cpp6
-rw-r--r--src/electronics/simulation/reactive.h2
-rw-r--r--src/electronics/subcircuits.cpp2
-rw-r--r--src/flowcontainer.cpp12
-rw-r--r--src/flowcontainer.h2
-rw-r--r--src/flowparts/callsub.cpp2
-rw-r--r--src/flowparts/count.cpp2
-rw-r--r--src/flowparts/delay.cpp2
-rw-r--r--src/flowparts/embed.cpp2
-rw-r--r--src/flowparts/flowpart.cpp4
-rw-r--r--src/flowparts/flowpart.h6
-rw-r--r--src/flowparts/inputbutton.cpp2
-rw-r--r--src/flowparts/interrupt.cpp2
-rw-r--r--src/flowparts/keypad.cpp4
-rw-r--r--src/flowparts/pinmapping.cpp14
-rw-r--r--src/flowparts/pulse.cpp2
-rw-r--r--src/flowparts/readport.cpp2
-rw-r--r--src/flowparts/repeat.cpp2
-rw-r--r--src/flowparts/setpin.cpp2
-rw-r--r--src/flowparts/sevenseg.cpp4
-rw-r--r--src/flowparts/while.cpp2
-rw-r--r--src/flowparts/writeport.cpp2
-rw-r--r--src/gui/asmformattingwidget.ui2
-rw-r--r--src/gui/contexthelp.cpp16
-rw-r--r--src/gui/createsubprojectwidget.ui2
-rw-r--r--src/gui/doublespinbox.cpp4
-rw-r--r--src/gui/generaloptionswidget.ui6
-rw-r--r--src/gui/gpasmsettingswidget.ui8
-rw-r--r--src/gui/itemeditor.cpp14
-rw-r--r--src/gui/itemselector.cpp6
-rw-r--r--src/gui/logicwidget.ui4
-rw-r--r--src/gui/logview.cpp10
-rw-r--r--src/gui/microselectwidget.cpp6
-rw-r--r--src/gui/microsettingsdlg.cpp26
-rw-r--r--src/gui/microsettingswidget.ui4
-rw-r--r--src/gui/newfilewidget.ui10
-rw-r--r--src/gui/newpinmappingwidget.ui6
-rw-r--r--src/gui/newprojectwidget.ui2
-rw-r--r--src/gui/orientationwidget.cpp6
-rw-r--r--src/gui/oscilloscopeview.cpp4
-rw-r--r--src/gui/oscilloscopeview.h2
-rw-r--r--src/gui/oscilloscopewidget.ui20
-rw-r--r--src/gui/outputmethodwidget.ui6
-rw-r--r--src/gui/picprogrammerconfigwidget.ui6
-rw-r--r--src/gui/pieditor.cpp30
-rw-r--r--src/gui/probepositioner.cpp2
-rw-r--r--src/gui/processingoptionswidget.ui4
-rw-r--r--src/gui/programmerwidget.ui4
-rw-r--r--src/gui/projectdlgs.cpp6
-rw-r--r--src/gui/propertieslistview.cpp8
-rw-r--r--src/gui/sdccoptionswidget.ui10
-rw-r--r--src/gui/settingsdlg.cpp16
-rw-r--r--src/gui/symbolviewer.cpp2
-rw-r--r--src/icndocument.cpp6
-rw-r--r--src/item.cpp34
-rw-r--r--src/item.h20
-rw-r--r--src/itemdocument.cpp28
-rw-r--r--src/itemdocumentdata.cpp8
-rw-r--r--src/itemgroup.cpp22
-rw-r--r--src/itemgroup.h2
-rw-r--r--src/iteminterface.cpp4
-rw-r--r--src/itemlibrary.cpp2
-rw-r--r--src/itemview.cpp26
-rw-r--r--src/itemview.h6
-rw-r--r--src/katemdi.cpp28
-rw-r--r--src/ktechlab.cpp10
-rw-r--r--src/languages/flowcode.cpp4
-rw-r--r--src/languages/picprogrammer.cpp26
-rw-r--r--src/languages/processchain.cpp2
-rw-r--r--src/languages/sdcc.cpp4
-rw-r--r--src/mechanics/mechanicsgroup.cpp6
-rw-r--r--src/mechanics/mechanicsgroup.h2
-rw-r--r--src/mechanics/mechanicsitem.cpp4
-rw-r--r--src/mechanics/mechanicsitem.h4
-rw-r--r--src/node.cpp2
-rw-r--r--src/node.h2
-rw-r--r--src/picitem.cpp4
-rw-r--r--src/projectmanager.cpp76
-rw-r--r--src/projectmanager.h16
-rw-r--r--src/recentfilesaction.cpp4
-rw-r--r--src/resizeoverlay.cpp8
-rw-r--r--src/textdocument.cpp4
-rw-r--r--src/textview.cpp14
-rw-r--r--src/textview.h4
-rw-r--r--src/variablelabel.cpp4
-rw-r--r--src/view.cpp4
-rw-r--r--src/viewcontainer.cpp4
-rw-r--r--src/viewcontainer.h8
135 files changed, 562 insertions, 562 deletions
diff --git a/microbe/btreebase.cpp b/microbe/btreebase.cpp
index b45f983..02d6b6d 100644
--- a/microbe/btreebase.cpp
+++ b/microbe/btreebase.cpp
@@ -155,7 +155,7 @@ void BTreeBase::pruneTree(BTreeNode *root, bool /*conditionalRoot*/)
{
// since we can't call compileError from in this class, we have a special way of handling it:
- // Leave the tqchildren as they are, and set childOp to divbyzero
+ // Leave the children as they are, and set childOp to divbyzero
if( t.current()->childOp() == Expression::division )
{
t.current()->setChildOp(Expression::divbyzero);
diff --git a/microbe/btreenode.cpp b/microbe/btreenode.cpp
index 063dce2..27d49cc 100644
--- a/microbe/btreenode.cpp
+++ b/microbe/btreenode.cpp
@@ -38,7 +38,7 @@ BTreeNode::BTreeNode(BTreeNode *p, BTreeNode *l, BTreeNode *r)
BTreeNode::~BTreeNode()
{
- // Must not delete tqchildren as might be unlinking!!! deleteChildren();
+ // Must not delete children as might be unlinking!!! deleteChildren();
}
void BTreeNode::deleteChildren()
diff --git a/microbe/btreenode.h b/microbe/btreenode.h
index ceed185..ea39050 100644
--- a/microbe/btreenode.h
+++ b/microbe/btreenode.h
@@ -46,7 +46,7 @@ class BTreeNode
*/
// void printTree();
/**
- * Recursively delete all tqchildren of a node.
+ * Recursively delete all children of a node.
*/
void deleteChildren();
/**
diff --git a/microbe/expression.cpp b/microbe/expression.cpp
index cfa2d95..629a4f2 100644
--- a/microbe/expression.cpp
+++ b/microbe/expression.cpp
@@ -462,7 +462,7 @@ void Expression::buildTree( const TQString & unstrippedExpression, BTreeBase *tr
void Expression::doUnaryOp(Operation op, BTreeNode *node)
{
/* Note that this isn't for unary operations as such,
- rather for things that are operations that have no direct tqchildren,
+ rather for things that are operations that have no direct children,
e.g. portx.n is high, and functionname(args)*/
if ( op == pin || op == notpin )
diff --git a/microbe/instruction.cpp b/microbe/instruction.cpp
index 80a63cc..26332c0 100644
--- a/microbe/instruction.cpp
+++ b/microbe/instruction.cpp
@@ -971,14 +971,14 @@ TQString Code::generateCode( PIC14 * pic ) const
uchar reg = pic->gprStart();
TQStringList::const_iterator end = variables.end();
for ( TQStringList::const_iterator it = variables.begin(); it != end; ++it )
- code += TQString("%1\tequ\t0x%2\n").tqarg( *it ).tqarg( TQString::number( reg++, 16 ) );
+ code += TQString("%1\tequ\t0x%2\n").arg( *it ).arg( TQString::number( reg++, 16 ) );
code += "\n";
}
TQString picString = pic->minimalTypeString();
- code += TQString("list p=%1\n").tqarg( picString );
- code += TQString("include \"p%2.inc\"\n\n").tqarg( picString.lower() );
+ code += TQString("list p=%1\n").arg( picString );
+ code += TQString("include \"p%2.inc\"\n\n").arg( picString.lower() );
code += "; Config options\n";
code += " __config _WDT_OFF\n\n";
@@ -1347,7 +1347,7 @@ void Instruction::clearLinks()
//BEGIN Byte-Oriented File Register Operations
TQString Instr_addwf::code() const
{
- return TQString("addwf\t%1,%2").tqarg( m_file.name() ).tqarg( m_dest );
+ return TQString("addwf\t%1,%2").arg( m_file.name() ).arg( m_dest );
}
void Instr_addwf::generateLinksAndStates( Code::iterator current )
@@ -1400,7 +1400,7 @@ ProcessorBehaviour Instr_addwf::behaviour() const
TQString Instr_andwf::code() const
{
- return TQString("andwf\t%1,%2").tqarg( m_file.name() ).tqarg( m_dest );
+ return TQString("andwf\t%1,%2").arg( m_file.name() ).arg( m_dest );
}
void Instr_andwf::generateLinksAndStates( Code::iterator current )
@@ -1434,7 +1434,7 @@ ProcessorBehaviour Instr_andwf::behaviour() const
TQString Instr_clrf::code() const
{
- return TQString("clrf\t%1").tqarg( m_file.name() );
+ return TQString("clrf\t%1").arg( m_file.name() );
}
void Instr_clrf::generateLinksAndStates( Code::iterator current )
@@ -1468,7 +1468,7 @@ ProcessorBehaviour Instr_clrf::behaviour() const
TQString Instr_decf::code() const
{
- return TQString("decf\t%1,%2").tqarg( m_file.name() ).tqarg( m_dest );
+ return TQString("decf\t%1,%2").arg( m_file.name() ).arg( m_dest );
}
void Instr_decf::generateLinksAndStates( Code::iterator current )
@@ -1496,7 +1496,7 @@ ProcessorBehaviour Instr_decf::behaviour() const
TQString Instr_decfsz::code() const
{
- return TQString("decfsz\t%1,%2").tqarg( m_file.name() ).tqarg( m_dest );
+ return TQString("decfsz\t%1,%2").arg( m_file.name() ).arg( m_dest );
}
void Instr_decfsz::generateLinksAndStates( Code::iterator current )
@@ -1520,7 +1520,7 @@ ProcessorBehaviour Instr_decfsz::behaviour() const
TQString Instr_incf::code() const
{
- return TQString("incf\t%1,%2").tqarg( m_file.name() ).tqarg( m_dest );
+ return TQString("incf\t%1,%2").arg( m_file.name() ).arg( m_dest );
}
void Instr_incf::generateLinksAndStates( Code::iterator current )
@@ -1550,7 +1550,7 @@ ProcessorBehaviour Instr_incf::behaviour() const
TQString Instr_iorwf::code() const
{
- return TQString("iorwf\t%1,%2").tqarg( m_file.name() ).tqarg( m_dest );
+ return TQString("iorwf\t%1,%2").arg( m_file.name() ).arg( m_dest );
}
void Instr_iorwf::generateLinksAndStates( Code::iterator current )
@@ -1579,7 +1579,7 @@ ProcessorBehaviour Instr_iorwf::behaviour() const
TQString Instr_movf::code() const
{
- return TQString("movf\t%1,%2").tqarg( m_file.name() ).tqarg( m_dest );
+ return TQString("movf\t%1,%2").arg( m_file.name() ).arg( m_dest );
}
void Instr_movf::generateLinksAndStates( Code::iterator current )
@@ -1625,7 +1625,7 @@ ProcessorBehaviour Instr_movf::behaviour() const
TQString Instr_movwf::code() const
{
- return TQString("movwf\t%1").tqarg( m_file.name() );
+ return TQString("movwf\t%1").arg( m_file.name() );
}
void Instr_movwf::generateLinksAndStates( Code::iterator current )
@@ -1655,7 +1655,7 @@ ProcessorBehaviour Instr_movwf::behaviour() const
TQString Instr_rlf::code() const
{
- return TQString("rlf\t%1,%2").tqarg( m_file.name() ).tqarg( m_dest );
+ return TQString("rlf\t%1,%2").arg( m_file.name() ).arg( m_dest );
}
void Instr_rlf::generateLinksAndStates( Code::iterator current )
@@ -1686,7 +1686,7 @@ ProcessorBehaviour Instr_rlf::behaviour() const
TQString Instr_rrf::code() const
{
- return TQString("rrf\t%1,%2").tqarg( m_file.name() ).tqarg( m_dest );
+ return TQString("rrf\t%1,%2").arg( m_file.name() ).arg( m_dest );
}
void Instr_rrf::generateLinksAndStates( Code::iterator current )
@@ -1716,7 +1716,7 @@ ProcessorBehaviour Instr_rrf::behaviour() const
TQString Instr_subwf::code() const
{
- return TQString("subwf\t%1,%2").tqarg( m_file.name() ).tqarg( m_dest );
+ return TQString("subwf\t%1,%2").arg( m_file.name() ).arg( m_dest );
}
void Instr_subwf::generateLinksAndStates( Code::iterator current )
@@ -1774,7 +1774,7 @@ ProcessorBehaviour Instr_subwf::behaviour() const
TQString Instr_swapf::code() const
{
- return TQString("swapf\t%1,%2").tqarg( m_file.name() ).tqarg( m_dest );
+ return TQString("swapf\t%1,%2").arg( m_file.name() ).arg( m_dest );
}
void Instr_swapf::generateLinksAndStates( Code::iterator current )
@@ -1801,7 +1801,7 @@ ProcessorBehaviour Instr_swapf::behaviour() const
TQString Instr_xorwf::code() const
{
- return TQString("xorwf\t%1,%2").tqarg( m_file.name() ).tqarg( m_dest );
+ return TQString("xorwf\t%1,%2").arg( m_file.name() ).arg( m_dest );
}
void Instr_xorwf::generateLinksAndStates( Code::iterator current )
@@ -1833,7 +1833,7 @@ ProcessorBehaviour Instr_xorwf::behaviour() const
//BEGIN Bit-Oriented File Register Operations
TQString Instr_bcf::code() const
{
- return TQString("bcf\t\t%1,%2").tqarg( m_file.name() ).tqarg( m_bit.name() );
+ return TQString("bcf\t\t%1,%2").arg( m_file.name() ).arg( m_bit.name() );
}
void Instr_bcf::generateLinksAndStates( Code::iterator current )
@@ -1857,7 +1857,7 @@ ProcessorBehaviour Instr_bcf::behaviour() const
TQString Instr_bsf::code() const
{
- return TQString("bsf\t\t%1,%2").tqarg( m_file.name() ).tqarg( m_bit.name() );
+ return TQString("bsf\t\t%1,%2").arg( m_file.name() ).arg( m_bit.name() );
}
void Instr_bsf::generateLinksAndStates( Code::iterator current )
@@ -1880,7 +1880,7 @@ ProcessorBehaviour Instr_bsf::behaviour() const
TQString Instr_btfsc::code() const
{
- return TQString("btfsc\t%1,%2").tqarg( m_file.name() ).tqarg( m_bit.name() );
+ return TQString("btfsc\t%1,%2").arg( m_file.name() ).arg( m_bit.name() );
}
void Instr_btfsc::generateLinksAndStates( Code::iterator current )
@@ -1907,7 +1907,7 @@ ProcessorBehaviour Instr_btfsc::behaviour() const
TQString Instr_btfss::code() const
{
- return TQString("btfss\t%1,%2").tqarg( m_file.name() ).tqarg( m_bit.name() );
+ return TQString("btfss\t%1,%2").arg( m_file.name() ).arg( m_bit.name() );
}
void Instr_btfss::generateLinksAndStates( Code::iterator current )
@@ -1937,7 +1937,7 @@ ProcessorBehaviour Instr_btfss::behaviour() const
//BEGIN Literal and Control Operations
TQString Instr_addlw::code() const
{
- return TQString("addlw\t%1").tqarg( m_literal );
+ return TQString("addlw\t%1").arg( m_literal );
}
void Instr_addlw::generateLinksAndStates( Code::iterator current )
@@ -1964,7 +1964,7 @@ ProcessorBehaviour Instr_addlw::behaviour() const
TQString Instr_andlw::code() const
{
- return TQString("andlw\t%1").tqarg( m_literal );
+ return TQString("andlw\t%1").arg( m_literal );
}
void Instr_andlw::generateLinksAndStates( Code::iterator current )
@@ -1991,7 +1991,7 @@ ProcessorBehaviour Instr_andlw::behaviour() const
TQString Instr_call::code() const
{
- return TQString("call\t%1").tqarg( m_label );
+ return TQString("call\t%1").arg( m_label );
}
void Instr_call::generateLinksAndStates( Code::iterator current )
@@ -2064,7 +2064,7 @@ void Instr_call::linkReturns( Instruction * current, Instruction * returnPoint )
TQString Instr_goto::code() const
{
- return TQString("goto\t%1").tqarg( m_label );
+ return TQString("goto\t%1").arg( m_label );
}
void Instr_goto::generateLinksAndStates( Code::iterator current )
@@ -2085,7 +2085,7 @@ ProcessorBehaviour Instr_goto::behaviour() const
TQString Instr_iorlw::code() const
{
- return TQString("iorlw\t%1").tqarg( m_literal );
+ return TQString("iorlw\t%1").arg( m_literal );
}
void Instr_iorlw::generateLinksAndStates( Code::iterator current )
@@ -2112,7 +2112,7 @@ ProcessorBehaviour Instr_iorlw::behaviour() const
TQString Instr_movlw::code() const
{
- return TQString("movlw\t%1").tqarg( m_literal );
+ return TQString("movlw\t%1").arg( m_literal );
}
void Instr_movlw::generateLinksAndStates( Code::iterator current )
@@ -2153,7 +2153,7 @@ ProcessorBehaviour Instr_retfie::behaviour() const
TQString Instr_retlw::code() const
{
- return TQString("retlw\t%1").tqarg( m_literal );
+ return TQString("retlw\t%1").arg( m_literal );
}
void Instr_retlw::generateLinksAndStates( Code::iterator current )
@@ -2219,7 +2219,7 @@ ProcessorBehaviour Instr_sleep::behaviour() const
TQString Instr_sublw::code() const
{
- return TQString("sublw\t%1").tqarg( m_literal );
+ return TQString("sublw\t%1").arg( m_literal );
}
void Instr_sublw::generateLinksAndStates( Code::iterator current )
@@ -2264,7 +2264,7 @@ ProcessorBehaviour Instr_sublw::behaviour() const
TQString Instr_xorlw::code() const
{
- return TQString("xorlw\t%1").tqarg( m_literal );
+ return TQString("xorlw\t%1").arg( m_literal );
}
void Instr_xorlw::generateLinksAndStates( Code::iterator current )
diff --git a/microbe/microbe.cpp b/microbe/microbe.cpp
index 3c7dbef..8a01cc1 100644
--- a/microbe/microbe.cpp
+++ b/microbe/microbe.cpp
@@ -56,7 +56,7 @@ Microbe::Microbe()
{
for ( unsigned col = 0; col < 6; ++col )
{
- m_aliasList[ TQString("Keypad_%1_%2").tqarg(row+1).tqarg(col+1) ] = TQString::number( bv[row][col] );
+ m_aliasList[ TQString("Keypad_%1_%2").arg(row+1).arg(col+1) ] = TQString::number( bv[row][col] );
}
}
@@ -84,7 +84,7 @@ TQString Microbe::compile( const TQString & url, bool showSource, bool optimize
}
else
{
- m_errorReport += i18n("Could not open file '%1'\n").tqarg(url);
+ m_errorReport += i18n("Could not open file '%1'\n").arg(url);
return 0;
}
@@ -216,7 +216,7 @@ void Microbe::compileError( MistakeType type, const TQString & context, const So
message = i18n("Unknown statement");
break;
case InvalidPort:
- message = i18n("Port '%1' is not supported by target PIC").tqarg(context);
+ message = i18n("Port '%1' is not supported by target PIC").arg(context);
break;
case UnassignedPin:
message = i18n("Pin identifier was not followed by '='");
@@ -225,19 +225,19 @@ void Microbe::compileError( MistakeType type, const TQString & context, const So
message = i18n("Pin state can only be 'high' or 'low'");
break;
case UnassignedPort:
- message = i18n("Invalid token '%1'. Port identifier should be followed by '='").tqarg(context);
+ message = i18n("Invalid token '%1'. Port identifier should be followed by '='").arg(context);
break;
case UnexpectedStatementBeforeBracket:
message = i18n("Unexpected statement before '{'");
break;
case MismatchedBrackets:
- message = i18n("Mismatched brackets in expression '%1'").tqarg(context);
+ message = i18n("Mismatched brackets in expression '%1'").arg(context);
break;
case InvalidEquals:
message = i18n("Invalid '=' found in expression");
break;
case ReservedKeyword:
- message = i18n("Reserved keyword '%1' cannot be a variable name.").tqarg(context);
+ message = i18n("Reserved keyword '%1' cannot be a variable name.").arg(context);
break;
case ConsecutiveOperators:
message = i18n("Nothing between operators");
@@ -249,10 +249,10 @@ void Microbe::compileError( MistakeType type, const TQString & context, const So
if ( context.isEmpty() )
message = i18n("Unknown variable");
else
- message = i18n("Unknown variable '%1'").tqarg(context);
+ message = i18n("Unknown variable '%1'").arg(context);
break;
case UnopenableInclude:
- message = i18n("Could not open include file '%1'").tqarg(context);
+ message = i18n("Could not open include file '%1'").arg(context);
break;
case DivisionByZero:
message = i18n("Division by zero");
@@ -267,7 +267,7 @@ void Microbe::compileError( MistakeType type, const TQString & context, const So
message = i18n("Delay must be a positive constant value");
break;
case HighLowExpected:
- message = i18n("'high' or 'low' expected after pin expression '%1'").tqarg(context);
+ message = i18n("'high' or 'low' expected after pin expression '%1'").arg(context);
break;
case InvalidComparison:
message = i18n("Comparison operator in '%1' is not recognized");
@@ -285,7 +285,7 @@ void Microbe::compileError( MistakeType type, const TQString & context, const So
message = i18n("Extra tokens at end of line");
break;
case FixedStringExpected:
- message = i18n("Expected '%1'").tqarg(context);
+ message = i18n("Expected '%1'").arg(context);
break;
case PinListExpected:
message = i18n("Pin list expected");
@@ -300,19 +300,19 @@ void Microbe::compileError( MistakeType type, const TQString & context, const So
message = i18n("Interrupt already definied");
break;
case ReadOnlyVariable:
- message = i18n("Variable '%1' is read only").tqarg(context);
+ message = i18n("Variable '%1' is read only").arg(context);
break;
case WriteOnlyVariable:
- message = i18n("Variable '%1' is write only").tqarg(context);
+ message = i18n("Variable '%1' is write only").arg(context);
break;
case InvalidPinMapSize:
message = i18n("Invalid pin list size");
break;
case VariableRedefined:
- message = i18n("Variable '%1' is already defined").tqarg(context);
+ message = i18n("Variable '%1' is already defined").arg(context);
break;
case InvalidVariableName:
- message = i18n("'%1' is not a valid variable name").tqarg(context);
+ message = i18n("'%1' is not a valid variable name").arg(context);
break;
case VariableExpected:
message = i18n("Variable expected");
@@ -324,10 +324,10 @@ void Microbe::compileError( MistakeType type, const TQString & context, const So
m_errorReport += TQString("%1:%2:Error [%3] %4\n")
- .tqarg( sourceLine.url() )
- .tqarg( sourceLine.line()+1 )
- .tqarg( type )
- .tqarg( message );
+ .arg( sourceLine.url() )
+ .arg( sourceLine.line()+1 )
+ .arg( type )
+ .arg( message );
}
@@ -418,7 +418,7 @@ bool Microbe::isInterruptUsed( const TQString & interruptName )
TQString Microbe::dest() const
{
- return TQString("__op%1").tqarg(m_dest);
+ return TQString("__op%1").arg(m_dest);
}
diff --git a/microbe/microbe.h b/microbe/microbe.h
index c97417a..59d0bb9 100644
--- a/microbe/microbe.h
+++ b/microbe/microbe.h
@@ -156,7 +156,7 @@ class Microbe
/**
* This is for generating unique numbers for computer generated labels.
*/
- TQString uniqueLabel() { return TQString("__%1").tqarg(m_uniqueLabel++); }
+ TQString uniqueLabel() { return TQString("__%1").arg(m_uniqueLabel++); }
/**
* If alias is an alias for something then it returns that something,
* otherwise it just returns alias (which in that case is not an alias!)
diff --git a/microbe/parser.cpp b/microbe/parser.cpp
index 0e5545d..9505f58 100644
--- a/microbe/parser.cpp
+++ b/microbe/parser.cpp
@@ -212,7 +212,7 @@ Code * Parser::parse( const SourceLineList & lines )
OutputFieldMap fieldMap;
if ( (*sit).content.line() >= 0 )
- m_code->append( new Instr_sourceCode( TQString("#MSRC\t%1; %2\t%3").tqarg( (*sit).content.line() + 1 ).tqarg( (*sit).content.url() ).tqarg( (*sit).content.text() ) ));
+ m_code->append( new Instr_sourceCode( TQString("#MSRC\t%1; %2\t%3").arg( (*sit).content.line() + 1 ).arg( (*sit).content.url() ).arg( (*sit).content.text() ) ));
bool showBracesInSource = (*sit).hasBracedCode();
if ( showBracesInSource )
m_code->append(new Instr_sourceCode("{"));
diff --git a/microbe/pic14.cpp b/microbe/pic14.cpp
index c9dcf24..fc92932 100644
--- a/microbe/pic14.cpp
+++ b/microbe/pic14.cpp
@@ -70,7 +70,7 @@ PortPin PIC14::toPortPin( const TQString & portPinString )
// In form e.g. RB3
if ( portPinString.length() == 3 )
{
- port = TQString("PORT%1").tqarg( portPinString[1].upper() );
+ port = TQString("PORT%1").arg( portPinString[1].upper() );
pin = TQString( portPinString[2] ).toInt();
}
else
@@ -135,7 +135,7 @@ PIC14::Type PIC14::toType( const TQString & _text )
if ( text == "16F628" )
return P16F628;
- cerr << TQString("%1 is not a known PIC identifier\n").tqarg(_text);
+ cerr << TQString("%1 is not a known PIC identifier\n").arg(_text);
return unknown;
}
@@ -897,7 +897,7 @@ void PIC14::SsevenSegment( const Variable & pinMap )
assert( pinMap.type() == Variable::sevenSegmentType );
assert( pinMap.portPinList().size() == 7 );
- TQString subName = TQString("__output_seven_segment_%1").tqarg( pinMap.name() );
+ TQString subName = TQString("__output_seven_segment_%1").arg( pinMap.name() );
m_pCode->append( new Instr_call( subName ) );
@@ -967,7 +967,7 @@ void PIC14::SsevenSegment( const Variable & pinMap )
if ( !portOutput[port].used )
continue;
- TQString portName = TQString("PORT%1").tqarg( char('A'+port) );
+ TQString portName = TQString("PORT%1").arg( char('A'+port) );
// Save the current value of the port pins that we should not be writing to
m_pCode->append( new Instr_movf( portName, 0 ), Code::Subroutine );
@@ -977,7 +977,7 @@ void PIC14::SsevenSegment( const Variable & pinMap )
if ( overwrittenW )
m_pCode->append( new Instr_movf("__i",0), Code::Subroutine );
- m_pCode->append( new Instr_call( subName + TQString("_lookup_%1").tqarg(port) ), Code::Subroutine );
+ m_pCode->append( new Instr_call( subName + TQString("_lookup_%1").arg(port) ), Code::Subroutine );
overwrittenW = true;
// Restore the state of the pins which aren't used
@@ -996,7 +996,7 @@ void PIC14::SsevenSegment( const Variable & pinMap )
if ( !portOutput[port].used )
continue;
- m_pCode->queueLabel( subName + TQString("_lookup_%1").tqarg(port), Code::LookupTable );
+ m_pCode->queueLabel( subName + TQString("_lookup_%1").arg(port), Code::LookupTable );
m_pCode->append( new Instr_andlw(15), Code::LookupTable );
// Generate the lookup table
@@ -1020,9 +1020,9 @@ void PIC14::Skeypad( const Variable & pinMap )
assert( pinMap.type() == Variable::keypadType );
assert( pinMap.portPinList().size() >= 7 ); // 4 rows, at least 3 columns
- TQString subName = TQString("__wait_read_keypad_%1").tqarg( pinMap.name() );
- TQString waitName = TQString("__wait_keypad_%1").tqarg( pinMap.name() );
- TQString readName = TQString("__read_keypad_%1").tqarg( pinMap.name() );
+ TQString subName = TQString("__wait_read_keypad_%1").arg( pinMap.name() );
+ TQString waitName = TQString("__wait_keypad_%1").arg( pinMap.name() );
+ TQString readName = TQString("__read_keypad_%1").arg( pinMap.name() );
m_pCode->append( new Instr_call( subName ) );
@@ -1084,7 +1084,7 @@ void PIC14::Skeypad( const Variable & pinMap )
{
PortPin colPin = pinMap.portPinList()[4+col];
m_pCode->append( new Instr_btfsc( colPin.port(), TQString::number( colPin.pin() ) ), Code::Subroutine );
- m_pCode->append( new Instr_retlw( mb->alias( TQString("Keypad_%1_%2").tqarg(row+1).tqarg(col+1) ).toInt( 0, 0 ) ), Code::Subroutine );
+ m_pCode->append( new Instr_retlw( mb->alias( TQString("Keypad_%1_%2").arg(row+1).arg(col+1) ).toInt( 0, 0 ) ), Code::Subroutine );
}
// Make the low again
diff --git a/microbe/traverser.cpp b/microbe/traverser.cpp
index eb6a924..e066381 100644
--- a/microbe/traverser.cpp
+++ b/microbe/traverser.cpp
@@ -34,8 +34,8 @@ Traverser::~Traverser()
BTreeNode * Traverser::start()
{
/* To find the start we will iterate, or possibly recurse
- down the tree, each time turning down the node that has tqchildren,
- if they both have no tqchildren we have reached the end and it shouldn't
+ down the tree, each time turning down the node that has children,
+ if they both have no children we have reached the end and it shouldn't
really matter which we pick (check this algorithm) */
BTreeNode *n = m_root;
diff --git a/src/canvasitemparts.cpp b/src/canvasitemparts.cpp
index 6d20edc..67eb986 100644
--- a/src/canvasitemparts.cpp
+++ b/src/canvasitemparts.cpp
@@ -352,17 +352,17 @@ bool Button::state() const
TQRect Button::recommendedRect() const
{
- TQSize tqsizeHint = m_button->tqsizeHint();
- if ( tqsizeHint.width() < m_originalRect.width() )
- tqsizeHint.setWidth( m_originalRect.width() );
+ TQSize sizeHint = m_button->sizeHint();
+ if ( sizeHint.width() < m_originalRect.width() )
+ sizeHint.setWidth( m_originalRect.width() );
// Hmm...for now, lets just keep the recomended rect the same height as the original rect
- tqsizeHint.setHeight( m_originalRect.height() );
+ sizeHint.setHeight( m_originalRect.height() );
- int hdw = (tqsizeHint.width() - m_originalRect.width())/2;
- int hdh = (tqsizeHint.height() - m_originalRect.height())/2;
+ int hdw = (sizeHint.width() - m_originalRect.width())/2;
+ int hdh = (sizeHint.height() - m_originalRect.height())/2;
- return TQRect( m_originalRect.x()-hdw, m_originalRect.y()-hdh, tqsizeHint.width(), tqsizeHint.height() );
+ return TQRect( m_originalRect.x()-hdw, m_originalRect.y()-hdh, sizeHint.width(), sizeHint.height() );
}
diff --git a/src/circuitview.cpp b/src/circuitview.cpp
index d14573c..409296a 100644
--- a/src/circuitview.cpp
+++ b/src/circuitview.cpp
@@ -62,8 +62,8 @@ CircuitView::CircuitView( CircuitDocument * circuitDocument, ViewContainer *view
m_pViewIface = new CircuitViewIface(this);
m_statusBar->insertItem( "", ViewStatusBar::SimulationState );
- connect( Simulator::self(), TQT_SIGNAL(simulatingStateChanged(bool )), this, TQT_SLOT(slotUpdateRunningtqStatus(bool )) );
- slotUpdateRunningtqStatus( Simulator::self()->isSimulating() );
+ connect( Simulator::self(), TQT_SIGNAL(simulatingStateChanged(bool )), this, TQT_SLOT(slotUpdateRunningStatus(bool )) );
+ slotUpdateRunningStatus( Simulator::self()->isSimulating() );
}
@@ -74,7 +74,7 @@ CircuitView::~CircuitView()
}
-void CircuitView::slotUpdateRunningtqStatus( bool isRunning )
+void CircuitView::slotUpdateRunningStatus( bool isRunning )
{
m_statusBar->changeItem( isRunning ? i18n("Simulation Running") : i18n("Simulation Paused"), ViewStatusBar::SimulationState );
}
diff --git a/src/circuitview.h b/src/circuitview.h
index 162c79b..d380557 100644
--- a/src/circuitview.h
+++ b/src/circuitview.h
@@ -27,7 +27,7 @@ public:
~CircuitView();
public slots:
- virtual void slotUpdateRunningtqStatus( bool isRunning );
+ virtual void slotUpdateRunningStatus( bool isRunning );
protected:
virtual void dragEnterEvent( TQDragEnterEvent * e );
diff --git a/src/cnitem.cpp b/src/cnitem.cpp
index acf662c..b6d75c9 100644
--- a/src/cnitem.cpp
+++ b/src/cnitem.cpp
@@ -65,8 +65,8 @@ int CNItem::rtti() const
bool CNItem::preResize( TQRect sizeRect )
{
- if ( (std::abs((double)sizeRect.width()) < tqminimumSize().width()) ||
- (std::abs((double)sizeRect.height()) < tqminimumSize().height()) )
+ if ( (std::abs((double)sizeRect.width()) < minimumSize().width()) ||
+ (std::abs((double)sizeRect.height()) < minimumSize().height()) )
return false;
updateConnectorPoints(false);
@@ -84,16 +84,16 @@ void CNItem::setVisible( bool yes )
{
if (b_deleted)
{
- Item::tqsetVisible(false);
+ Item::setVisible(false);
return;
}
- Item::tqsetVisible(yes);
+ Item::setVisible(yes);
const TextMap::iterator textMapEnd = m_textMap.end();
for ( TextMap::iterator it = m_textMap.begin(); it != textMapEnd; ++it )
{
- it.data()->tqsetVisible(yes);
+ it.data()->setVisible(yes);
}
const NodeMap::iterator nodeMapEnd = m_nodeMap.end();
@@ -133,8 +133,8 @@ void CNItem::updateNodeLevels()
it.data().node->setLevel(l);
}
- const ItemList::iterator end = m_tqchildren.end();
- for ( ItemList::iterator it = m_tqchildren.begin(); it != end; ++it )
+ const ItemList::iterator end = m_children.end();
+ for ( ItemList::iterator it = m_children.begin(); it != end; ++it )
{
if ( CNItem *cnItem = dynamic_cast<CNItem*>((Item*)*it) )
cnItem->updateNodeLevels();
diff --git a/src/cnitem.h b/src/cnitem.h
index eb8f80a..04fcc62 100644
--- a/src/cnitem.h
+++ b/src/cnitem.h
@@ -165,7 +165,7 @@ protected:
* @param pos is the position that the text occupies relative to the top left corner of the CNItem.
* @param display is the actual text to be displayed.
* @param internal is used to determine the z-level of the text - whether it should be below or above the item
- * @param flags Text tqalignment flags - TQt::AlignmentFlags and TQt::TextFlags OR'd together.
+ * @param flags Text alignment flags - TQt::AlignmentFlags and TQt::TextFlags OR'd together.
*/
Text* addDisplayText( const TQString &id, const TQRect & pos, const TQString &display, bool internal = true, int flags = TQt::AlignHCenter | TQt::AlignVCenter );
void setDisplayText( const TQString &id, const TQString &display );
diff --git a/src/cnitemgroup.h b/src/cnitemgroup.h
index 25dc3ae..18c65e6 100644
--- a/src/cnitemgroup.h
+++ b/src/cnitemgroup.h
@@ -138,13 +138,13 @@ public:
/**
* Returns a list of all the Nodes in the group.
* @param excludeParented if false, then nodes that are fully contained
- * within item tqchildren will also be returned.
+ * within item children will also be returned.
*/
NodeList nodes( bool excludeParented = true ) const;
/**
* Returns a list of all the Connectors in the group.
* @param excludeParented if false, then connectors that are fully contained
- * within item tqchildren will also be returned.
+ * within item children will also be returned.
*/
ConnectorList connectors( bool excludeParented = true ) const;
/**
diff --git a/src/connector.cpp b/src/connector.cpp
index 6d64377..182a809 100644
--- a/src/connector.cpp
+++ b/src/connector.cpp
@@ -585,7 +585,7 @@ void Connector::setVisible( bool yes )
if ( !canvas() || isVisible() == yes )
return;
- TQCanvasPolygon::tqsetVisible(yes);
+ TQCanvasPolygon::setVisible(yes);
updateConnectorLines();
}
@@ -616,7 +616,7 @@ void Connector::updateConnectorLines()
item->setZ(z);
item->setPen(pen);
item->setBrush(color);
- item->tqsetVisible( isVisible() );
+ item->setVisible( isVisible() );
}
}
diff --git a/src/docmanager.cpp b/src/docmanager.cpp
index 35b1c5a..7112a6e 100644
--- a/src/docmanager.cpp
+++ b/src/docmanager.cpp
@@ -99,7 +99,7 @@ Document* DocManager::openURL( const KURL &url, ViewArea *viewArea )
TQFile file(url.path());
if ( file.open(IO_ReadOnly) == false )
{
- KMessageBox::sorry( 0l, i18n("Could not open '%1'").tqarg( url.prettyURL() ) );
+ KMessageBox::sorry( 0l, i18n("Could not open '%1'").arg( url.prettyURL() ) );
return 0l;
}
file.close();
@@ -166,7 +166,7 @@ TQString DocManager::untitledName( int type )
case Document::dt_circuit:
{
if ( m_countCircuit>1 )
- name = i18n("Untitled (Circuit %1)").tqarg(TQString::number(m_countCircuit));
+ name = i18n("Untitled (Circuit %1)").arg(TQString::number(m_countCircuit));
else
name = i18n("Untitled (Circuit)");
m_countCircuit++;
@@ -175,7 +175,7 @@ TQString DocManager::untitledName( int type )
case Document::dt_flowcode:
{
if ( m_countFlowCode>1 )
- name = i18n("Untitled (FlowCode %1)").tqarg(TQString::number(m_countFlowCode));
+ name = i18n("Untitled (FlowCode %1)").arg(TQString::number(m_countFlowCode));
else
name = i18n("Untitled (FlowCode)");
m_countFlowCode++;
@@ -184,7 +184,7 @@ TQString DocManager::untitledName( int type )
case Document::dt_mechanics:
{
if ( m_countMechanics>1 )
- name = i18n("Untitled (Mechanics %1)").tqarg(TQString::number(m_countMechanics));
+ name = i18n("Untitled (Mechanics %1)").arg(TQString::number(m_countMechanics));
else
name = i18n("Untitled (Mechanics)");
m_countMechanics++;
@@ -193,7 +193,7 @@ TQString DocManager::untitledName( int type )
default:
{
if ( m_countOther>1 )
- name = i18n("Untitled (%1)").tqarg(TQString::number(m_countOther));
+ name = i18n("Untitled (%1)").arg(TQString::number(m_countOther));
else
name = i18n("Untitled");
m_countOther++;
@@ -431,7 +431,7 @@ CircuitDocument *DocManager::openCircuitFile( const KURL &url, ViewArea *viewAre
if ( !document->openURL(url) )
{
- KMessageBox::sorry( 0l, i18n("Could not open Circuit file \"%1\"").tqarg(url.prettyURL()) );
+ KMessageBox::sorry( 0l, i18n("Could not open Circuit file \"%1\"").arg(url.prettyURL()) );
document->deleteLater();
return 0l;
}
@@ -448,7 +448,7 @@ FlowCodeDocument *DocManager::openFlowCodeFile( const KURL &url, ViewArea *viewA
if ( !document->openURL(url) )
{
- KMessageBox::sorry( 0l, i18n("Could not open FlowCode file \"%1\"").tqarg(url.prettyURL()) );
+ KMessageBox::sorry( 0l, i18n("Could not open FlowCode file \"%1\"").arg(url.prettyURL()) );
document->deleteLater();
return 0l;
}
@@ -465,7 +465,7 @@ MechanicsDocument *DocManager::openMechanicsFile( const KURL &url, ViewArea *vie
if ( !document->openURL(url) )
{
- KMessageBox::sorry( 0l, i18n("Could not open Mechanics file \"%1\"").tqarg(url.prettyURL()) );
+ KMessageBox::sorry( 0l, i18n("Could not open Mechanics file \"%1\"").arg(url.prettyURL()) );
document->deleteLater();
return 0l;
}
@@ -486,7 +486,7 @@ TextDocument *DocManager::openTextFile( const KURL &url, ViewArea *viewArea )
if ( !document->openURL(url) )
{
- KMessageBox::sorry( 0l, i18n("Could not open text file \"%1\"").tqarg(url.prettyURL()) );
+ KMessageBox::sorry( 0l, i18n("Could not open text file \"%1\"").arg(url.prettyURL()) );
document->deleteLater();
return 0l;
}
diff --git a/src/document.cpp b/src/document.cpp
index 4cd0e6e..d27ecfc 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -110,7 +110,7 @@ bool Document::getURL( const TQString &types )
if ( TQFile::exists( url.path() ) )
{
int query = KMessageBox::warningYesNo( p_ktechlab,
- i18n( "A file named \"%1\" already exists. Are you sure you want to overwrite it?" ).tqarg( url.fileName() ),
+ i18n( "A file named \"%1\" already exists. Are you sure you want to overwrite it?" ).arg( url.fileName() ),
i18n( "Overwrite File?" ),
i18n( "Overwrite" ),
KStdGuiItem::cancel() );
@@ -135,7 +135,7 @@ bool Document::fileClose()
p_ktechlab->tabWidget()->setCurrentPage( p_ktechlab->tabWidget()->indexOf(viewContainer) );
int choice = KMessageBox::warningYesNoCancel( p_ktechlab,
- i18n("The document \'%1\' has been modified.\nDo you want to save it?").tqarg(name),
+ i18n("The document \'%1\' has been modified.\nDo you want to save it?").arg(name),
i18n("Save Document?"),
i18n("Save"),
i18n("Discard") );
diff --git a/src/drawparts/dptext.cpp b/src/drawparts/dptext.cpp
index e2d1060..73bcdd9 100644
--- a/src/drawparts/dptext.cpp
+++ b/src/drawparts/dptext.cpp
@@ -97,7 +97,7 @@ void DPText::postResize()
}
-TQSize DPText::tqminimumSize() const
+TQSize DPText::minimumSize() const
{
return TQSize( 48, 24 );
}
diff --git a/src/drawparts/dptext.h b/src/drawparts/dptext.h
index 4cbc821..dc712c0 100644
--- a/src/drawparts/dptext.h
+++ b/src/drawparts/dptext.h
@@ -29,7 +29,7 @@ public:
virtual void setSelected( bool yes );
- virtual TQSize tqminimumSize() const;
+ virtual TQSize minimumSize() const;
protected:
virtual void postResize();
diff --git a/src/drawparts/solidshape.cpp b/src/drawparts/solidshape.cpp
index 1760db9..c995fa2 100644
--- a/src/drawparts/solidshape.cpp
+++ b/src/drawparts/solidshape.cpp
@@ -101,7 +101,7 @@ void DPRectangle::dataChanged()
}
-TQSize DPRectangle::tqminimumSize() const
+TQSize DPRectangle::minimumSize() const
{
int side = TQMAX(16, pen().width()+2);
return TQSize( side, side );
diff --git a/src/drawparts/solidshape.h b/src/drawparts/solidshape.h
index 02bb49e..aa8a5fe 100644
--- a/src/drawparts/solidshape.h
+++ b/src/drawparts/solidshape.h
@@ -30,7 +30,7 @@ class DPRectangle : public DrawPart
virtual void setSelected( bool yes );
- virtual TQSize tqminimumSize() const;
+ virtual TQSize minimumSize() const;
protected:
virtual void drawShape( TQPainter &p );
diff --git a/src/electronics/component.cpp b/src/electronics/component.cpp
index c05993d..4c8b797 100644
--- a/src/electronics/component.cpp
+++ b/src/electronics/component.cpp
@@ -482,7 +482,7 @@ void Component::initDIPSymbol( const TQStringList & pins, int _width )
}
-// TQString createNode( double _x, double _y, int tqshape, int orientation, const TQString &name, int type, bool isInput = true );
+// TQString createNode( double _x, double _y, int shape, int orientation, const TQString &name, int type, bool isInput = true );
void Component::init1PinLeft( int h1 )
{
diff --git a/src/electronics/component.h b/src/electronics/component.h
index 8a30315..a2b215f 100644
--- a/src/electronics/component.h
+++ b/src/electronics/component.h
@@ -244,7 +244,7 @@ class Component : public CNItem
protected:
/**
- * Convenience functionality provided for components in a port tqshape
+ * Convenience functionality provided for components in a port shape
* (such as ParallelPortComponent and SerialPortComponent).
*/
void drawPortShape( TQPainter & p );
@@ -263,7 +263,7 @@ class Component : public CNItem
void initDIP( const TQStringList & pins );
/**
* Creates the DIP symbol:
- * @li constructs rectangular tqshape
+ * @li constructs rectangular shape
* @li puts on text labels in appropriate positions from TQStringList pins
*/
void initDIPSymbol( const TQStringList & pins, int width );
diff --git a/src/electronics/components/bussplitter.cpp b/src/electronics/components/bussplitter.cpp
index 85619a4..6eb58e8 100644
--- a/src/electronics/components/bussplitter.cpp
+++ b/src/electronics/components/bussplitter.cpp
@@ -107,7 +107,7 @@ void BusSplitter::dataChanged()
TQString BusSplitter::outNodeID( unsigned node ) const
{
- return TQString("out_%1").tqarg(TQString::number(node));
+ return TQString("out_%1").arg(TQString::number(node));
}
diff --git a/src/electronics/components/eckeypad.cpp b/src/electronics/components/eckeypad.cpp
index c92a562..4a0ec7b 100644
--- a/src/electronics/components/eckeypad.cpp
+++ b/src/electronics/components/eckeypad.cpp
@@ -66,7 +66,7 @@ ECKeyPad::ECKeyPad( ICNDocument *icnDocument, bool newItem, const char *id )
v->setValue(5e-3);
for ( int i = 0; i < 4; i++ )
- createPin( 0, -32+i*24, 0, TQString("row_%1").tqarg(TQString::number(i)) );
+ createPin( 0, -32+i*24, 0, TQString("row_%1").arg(TQString::number(i)) );
m_numCols = 0;
}
@@ -79,7 +79,7 @@ ECKeyPad::~ECKeyPad()
TQString ECKeyPad::buttonID( int row, int col ) const
{
- return TQString("b_%1_%2").tqarg(TQString::number(row)).tqarg(TQString::number(col));
+ return TQString("b_%1_%2").arg(TQString::number(row)).arg(TQString::number(col));
}
diff --git a/src/electronics/components/ecpotentiometer.cpp b/src/electronics/components/ecpotentiometer.cpp
index 8f55ff5..e989c7c 100644
--- a/src/electronics/components/ecpotentiometer.cpp
+++ b/src/electronics/components/ecpotentiometer.cpp
@@ -98,7 +98,7 @@ void ECPotentiometer::drawShape( TQPainter &p )
pa[1] = TQPoint( 4, -3 );
pa[2] = TQPoint( 4, 3 );
- int space = m_pSlider->tqstyle().tqpixelMetric( TQStyle::PM_SliderSpaceAvailable, m_pSlider );
+ int space = m_pSlider->tqstyle().pixelMetric( TQStyle::PM_SliderSpaceAvailable, m_pSlider );
int base_y = _y + (( angleDegrees() == 0 || angleDegrees() == 270 ) ? 1 : -1) * int( space * m_sliderProp );
pa.translate( _x+16, base_y );
diff --git a/src/electronics/components/magnitudecomparator.cpp b/src/electronics/components/magnitudecomparator.cpp
index 3e1f8f9..bae9b12 100644
--- a/src/electronics/components/magnitudecomparator.cpp
+++ b/src/electronics/components/magnitudecomparator.cpp
@@ -119,9 +119,9 @@ void MagnitudeComparator::initPins()
for ( int i = 0; i < space; i++ )
leftPins << "";
for ( int i = 0; i < newABLogicCount; i++ )
- leftPins << TQString("A%1").tqarg( TQString::number(i) );
+ leftPins << TQString("A%1").arg( TQString::number(i) );
for ( int i = 0; i < newABLogicCount; i++ )
- leftPins << TQString("B%1").tqarg( TQString::number(i) );
+ leftPins << TQString("B%1").arg( TQString::number(i) );
for ( int i = 0; i < space; i++ )
leftPins << "";
diff --git a/src/electronics/components/matrixdisplay.cpp b/src/electronics/components/matrixdisplay.cpp
index c2a271d..4ba3dc6 100644
--- a/src/electronics/components/matrixdisplay.cpp
+++ b/src/electronics/components/matrixdisplay.cpp
@@ -223,11 +223,11 @@ void MatrixDisplay::initPins( unsigned numRows, unsigned numCols )
TQString MatrixDisplay::colPinID( int col ) const
{
- return TQString("col_%1").tqarg(TQString::number(col));
+ return TQString("col_%1").arg(TQString::number(col));
}
TQString MatrixDisplay::rowPinID( int row ) const
{
- return TQString("row_%1").tqarg(TQString::number(row));
+ return TQString("row_%1").arg(TQString::number(row));
}
diff --git a/src/electronics/components/parallelportcomponent.cpp b/src/electronics/components/parallelportcomponent.cpp
index 7a2ac55..6126c1e 100644
--- a/src/electronics/components/parallelportcomponent.cpp
+++ b/src/electronics/components/parallelportcomponent.cpp
@@ -87,7 +87,7 @@ ParallelPortComponent::ParallelPortComponent( ICNDocument *icnDocument, bool new
//BEGIN Data register
for ( int i = 0; i < 8; ++i )
{
- TQString id = TQString("D%1").tqarg(i);
+ TQString id = TQString("D%1").arg(i);
TQString name = id;
pin = createPin( -40, -80 + 16*i, 0, id );
@@ -99,20 +99,20 @@ ParallelPortComponent::ParallelPortComponent( ICNDocument *icnDocument, bool new
//END Data register
- //BEGIN tqStatus register
+ //BEGIN Status register
TQString statusNames[] = { "ERR", "ON", "PE", "ACK", "BUSY" };
// The statusIDs are referenced in the save file and must not change
TQString statusIDs[] = { "ERROR", "ONLINE", "PE", "ACK", "BUSY" };
- // Bits 0...2 in the tqStatus register are not used
+ // Bits 0...2 in the Status register are not used
for ( int i = 3; i < 8; ++i )
{
TQString id = statusIDs[i-3];
TQString name = statusNames[i-3];
// Bit 3 (pin 15) doesn't not follow the same positioning pattern as
- // the other pins in the tqStatus register.
+ // the other pins in the Status register.
if ( i == 3 )
{
pin = createPin( 40, -72, 180, id );
@@ -126,7 +126,7 @@ ParallelPortComponent::ParallelPortComponent( ICNDocument *icnDocument, bool new
m_pLogic[i+8] = createLogicOut( pin, false );
}
- //END tqStatus register
+ //END Status register
//BEGIN Control register
@@ -167,7 +167,7 @@ ParallelPortComponent::ParallelPortComponent( ICNDocument *icnDocument, bool new
// And make the rest of the pins ground
for ( int i = 0; i < 8; ++i )
{
- pin = createPin( 40, -24 + i*16, 180, TQString("GND%1").tqarg( i ) );
+ pin = createPin( 40, -24 + i*16, 180, TQString("GND%1").arg( i ) );
pin->pin()->setGroundType( Pin::gt_always );
}
#endif
@@ -200,7 +200,7 @@ void ParallelPortComponent::initPort( const TQString & port )
if ( ! m_pParallelPort->openPort( port ) )
{
- p_itemDocument->canvas()->setMessage( i18n("Could not open port %1").tqarg( port ) );
+ p_itemDocument->canvas()->setMessage( i18n("Could not open port %1").arg( port ) );
return;
}
}
@@ -228,8 +228,8 @@ void ParallelPortComponent::controlCallback( bool )
void ParallelPortComponent::stepNonLogic()
{
- uchar status = m_pParallelPort->readFromRegister( ParallelPort::tqStatus );
- // Bits 0...2 in the tqStatus register are not used
+ uchar status = m_pParallelPort->readFromRegister( ParallelPort::Status );
+ // Bits 0...2 in the Status register are not used
for ( int i = 3; i < 8; ++i )
m_pLogic[i + 8]->setHigh( status | (1 << i) );
}
diff --git a/src/electronics/components/parallelportcomponent.h b/src/electronics/components/parallelportcomponent.h
index eebc12b..bffd85d 100644
--- a/src/electronics/components/parallelportcomponent.h
+++ b/src/electronics/components/parallelportcomponent.h
@@ -40,7 +40,7 @@ class ParallelPortComponent : public CallbackClass, public Component
void dataCallback( bool );
void controlCallback( bool );
- /// Registers: { Data[0...7], tqStatus[0...5], 0[6...7], Control[0...4], 0[5...7] }
+ /// Registers: { Data[0...7], Status[0...5], 0[6...7], Control[0...4], 0[5...7] }
LogicOut * m_pLogic[24];
ParallelPort * m_pParallelPort;
diff --git a/src/electronics/components/piccomponent.cpp b/src/electronics/components/piccomponent.cpp
index 3741182..00a32c3 100644
--- a/src/electronics/components/piccomponent.cpp
+++ b/src/electronics/components/piccomponent.cpp
@@ -159,14 +159,14 @@ void PICComponent::initPIC( bool forceReload )
case GpsimProcessor::DoesntExist:
if ( newProgram == _def_PICComponent_fileName && !newProgram.isEmpty() )
break;
- KMessageBox::sorry( 0l, i18n("The file \"%1\" does not exist.").tqarg( newProgram ) );
+ KMessageBox::sorry( 0l, i18n("The file \"%1\" does not exist.").arg( newProgram ) );
m_picFile = TQString();
break;
case GpsimProcessor::IncorrectType:
if ( newProgram == _def_PICComponent_fileName && !newProgram.isEmpty() )
break;
- KMessageBox::sorry( 0L, i18n("\"%1\" is not a valid PIC program.\nThe file must exist, and the extension should be \".cod\", \".asm\", \".flowcode\", \".basic\", \".microbe\" or \".c\".\n\".hex\" is allowed, provided that there is a corresponding \".cod\" file.").tqarg(newProgram) );
+ KMessageBox::sorry( 0L, i18n("\"%1\" is not a valid PIC program.\nThe file must exist, and the extension should be \".cod\", \".asm\", \".flowcode\", \".basic\", \".microbe\" or \".c\".\n\".hex\" is allowed, provided that there is a corresponding \".cod\" file.").arg(newProgram) );
m_picFile = TQString();
break;
@@ -375,7 +375,7 @@ void PICComponent::slotCODCreationSucceeded()
delete m_pGpsim;
m_pGpsim = new GpsimProcessor(m_symbolFile);
- if ( m_pGpsim->codLoadtqStatus() == GpsimProcessor::CodSuccess )
+ if ( m_pGpsim->codLoadStatus() == GpsimProcessor::CodSuccess )
{
MicroInfo * microInfo = m_pGpsim->microInfo();
property("lastPackage")->setValue( microInfo->id() );
@@ -387,7 +387,7 @@ void PICComponent::slotCODCreationSucceeded()
else
{
- m_pGpsim->displayCodLoadtqStatus();
+ m_pGpsim->displayCodLoadStatus();
delete m_pGpsim;
m_pGpsim = 0l;
}
diff --git a/src/electronics/components/ram.cpp b/src/electronics/components/ram.cpp
index a8b259e..d0ac2b1 100644
--- a/src/electronics/components/ram.cpp
+++ b/src/electronics/components/ram.cpp
@@ -128,13 +128,13 @@ void RAM::initPins()
TQStringList leftPins; // Pins on left of IC
leftPins << "CS" << "OE" << "WE";
for ( int i = 0; i < newAddressSize; ++i )
- leftPins << TQString("A%1").tqarg( TQString::number(i) );
+ leftPins << TQString("A%1").arg( TQString::number(i) );
TQStringList rightPins; // Pins on right of IC
for ( unsigned i = newWordSize; i > 0; --i )
- rightPins << TQString("DI%1").tqarg( TQString::number(i-1) );
+ rightPins << TQString("DI%1").arg( TQString::number(i-1) );
for ( unsigned i = newWordSize; i > 0; --i )
- rightPins << TQString("DO%1").tqarg( TQString::number(i-1) );
+ rightPins << TQString("DO%1").arg( TQString::number(i-1) );
// Make pin lists of consistent sizes
for ( unsigned i = leftPins.size(); i < rightPins.size(); ++i )
@@ -177,11 +177,11 @@ void RAM::initPins()
for ( int i = oldWordSize; i < newWordSize; ++i )
{
- node = ecNodeWithID( TQString("DI%1").tqarg( TQString::number(i) ) );
+ node = ecNodeWithID( TQString("DI%1").arg( TQString::number(i) ) );
m_dataIn.insert( i, createLogicIn(node) );
m_dataIn[i]->setCallback( this, (CallbackPtr)(&RAM::inStateChanged) );
- node = ecNodeWithID( TQString("DO%1").tqarg( TQString::number(i) ) );
+ node = ecNodeWithID( TQString("DO%1").arg( TQString::number(i) ) );
m_dataOut.insert( i, createLogicOut(node, false) );
}
}
@@ -189,12 +189,12 @@ void RAM::initPins()
{
for ( int i = newWordSize; i < oldWordSize; ++i )
{
- TQString id = TQString("DO%1").tqarg( TQString::number(i) );
+ TQString id = TQString("DO%1").arg( TQString::number(i) );
removeDisplayText(id);
removeElement( m_dataIn[i], false );
removeNode(id);
- id = TQString("DI%1").tqarg( TQString::number(i) );
+ id = TQString("DI%1").arg( TQString::number(i) );
removeDisplayText(id);
removeElement( m_dataOut[i], false );
removeNode(id);
@@ -210,7 +210,7 @@ void RAM::initPins()
for ( int i = oldAddressSize; i < newAddressSize; ++i )
{
- node = ecNodeWithID( TQString("A%1").tqarg( TQString::number(i) ) );
+ node = ecNodeWithID( TQString("A%1").arg( TQString::number(i) ) );
m_address.insert( i, createLogicIn(node) );
m_address[i]->setCallback( this, (CallbackPtr)(&RAM::inStateChanged) );
}
@@ -219,7 +219,7 @@ void RAM::initPins()
{
for ( int i = newAddressSize; i < oldAddressSize; ++i )
{
- TQString id = TQString("A%1").tqarg( TQString::number(i) );
+ TQString id = TQString("A%1").arg( TQString::number(i) );
removeDisplayText(id);
removeElement( m_address[i], false );
removeNode(id);
diff --git a/src/electronics/components/rotoswitch.cpp b/src/electronics/components/rotoswitch.cpp
index ac7f1a0..738942b 100644
--- a/src/electronics/components/rotoswitch.cpp
+++ b/src/electronics/components/rotoswitch.cpp
@@ -245,7 +245,7 @@ void ECRotoSwitch::setUpSwitches()
for(int i=0; i<m_numPositions; i++)
{
SwitchPosition& sp = m_positions[i];
- TQString pinName = TQString("pin_%1").tqarg(i);
+ TQString pinName = TQString("pin_%1").arg(i);
removeNode(pinName);
removeSwitch(sp.posSwitch);
}
@@ -284,7 +284,7 @@ void ECRotoSwitch::setUpSwitches()
// kdDebug() << contactX <<", "<< contactY <<endl;
- sp.node = createPin(contactX,-contactY,sp.pinAngle,TQString("pin_%1").tqarg(i));
+ sp.node = createPin(contactX,-contactY,sp.pinAngle,TQString("pin_%1").arg(i));
sp.posSwitch = createSwitch(m_inNode, sp.node, true);
sp.isMomentary = false;//(map[i] == 'M');
m_positions.push_back(sp);
diff --git a/src/electronics/components/serialportcomponent.cpp b/src/electronics/components/serialportcomponent.cpp
index 6e6bfed..4e3a221 100644
--- a/src/electronics/components/serialportcomponent.cpp
+++ b/src/electronics/components/serialportcomponent.cpp
@@ -197,7 +197,7 @@ void SerialPortComponent::initPort( const TQString & port, unsigned baudRate )
if ( ! m_pSerialPort->openPort( port, baudRate ) )
{
- p_itemDocument->canvas()->setMessage( i18n("Could not open port %1").tqarg( port ) );
+ p_itemDocument->canvas()->setMessage( i18n("Could not open port %1").arg( port ) );
return;
}
}
diff --git a/src/electronics/ecnode.cpp b/src/electronics/ecnode.cpp
index 385b98e..77633a2 100644
--- a/src/electronics/ecnode.cpp
+++ b/src/electronics/ecnode.cpp
@@ -175,7 +175,7 @@ void ECNode::drawShape( TQPainter &p )
{
bool drawDivPoint;
TQPoint divPoint = findConnectorDivergePoint(&drawDivPoint);
- m_pinPoint->tqsetVisible(drawDivPoint);
+ m_pinPoint->setVisible(drawDivPoint);
m_pinPoint->move( divPoint.x()-1, divPoint.y()-1 );
}
diff --git a/src/electronics/gpsimprocessor.cpp b/src/electronics/gpsimprocessor.cpp
index 8ad853c..97f1195 100644
--- a/src/electronics/gpsimprocessor.cpp
+++ b/src/electronics/gpsimprocessor.cpp
@@ -29,7 +29,7 @@
#include <ktempfile.h>
#include <kstandarddirs.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqtimer.h>
#include "gpsim/cod.h"
@@ -89,7 +89,7 @@ GpsimProcessor::GpsimProcessor( TQString symbolFile, TQObject *parent )
m_bCanExecuteNextCycle = true;
m_bIsRunning = false;
m_pPicProcessor = 0l;
- m_codLoadtqStatus = CodUnknown;
+ m_codLoadStatus = CodUnknown;
m_pRegisterMemory = 0l;
m_debugMode = GpsimDebugger::AsmDebugger;
m_pDebugger[0] = m_pDebugger[1] = 0l;
@@ -101,37 +101,37 @@ GpsimProcessor::GpsimProcessor( TQString symbolFile, TQObject *parent )
switch ( (cod_errors)load_symbol_file( &tempProcessor, fileName ) )
{
case COD_SUCCESS:
- m_codLoadtqStatus = CodSuccess;
+ m_codLoadStatus = CodSuccess;
break;
case COD_FILE_NOT_FOUND:
- m_codLoadtqStatus = CodFileNotFound;
+ m_codLoadStatus = CodFileNotFound;
break;
case COD_UNRECOGNIZED_PROCESSOR:
- m_codLoadtqStatus = CodUnrecognizedProcessor;
+ m_codLoadStatus = CodUnrecognizedProcessor;
break;
case COD_FILE_NAME_TOO_LONG:
- m_codLoadtqStatus = CodFileNameTooLong;
+ m_codLoadStatus = CodFileNameTooLong;
break;
case COD_LST_NOT_FOUND:
- m_codLoadtqStatus = CodLstNotFound;
+ m_codLoadStatus = CodLstNotFound;
break;
case COD_BAD_FILE:
- m_codLoadtqStatus = CodBadFile;
+ m_codLoadStatus = CodBadFile;
break;
default:
- m_codLoadtqStatus = CodUnknown;
+ m_codLoadStatus = CodUnknown;
}
#else // GPSIM_0_21_11+
FILE * pFile = fopen( fileName, "r" );
if ( !pFile )
- m_codLoadtqStatus = CodFileUnreadable;
+ m_codLoadStatus = CodFileUnreadable;
else
- m_codLoadtqStatus = ( ProgramFileTypeList::GetList().LoadProgramFile( & tempProcessor, fileName, pFile ) ) ? CodSuccess : CodFailure;
+ m_codLoadStatus = ( ProgramFileTypeList::GetList().LoadProgramFile( & tempProcessor, fileName, pFile ) ) ? CodSuccess : CodFailure;
#endif
m_pPicProcessor = dynamic_cast<pic_processor*>(tempProcessor);
- if ( codLoadtqStatus() == CodSuccess )
+ if ( codLoadStatus() == CodSuccess )
{
m_pRegisterMemory = new RegisterSet( m_pPicProcessor );
m_pDebugger[0] = new GpsimDebugger( GpsimDebugger::AsmDebugger, this );
@@ -154,33 +154,33 @@ GpsimProcessor::~GpsimProcessor()
}
-void GpsimProcessor::displayCodLoadtqStatus( )
+void GpsimProcessor::displayCodLoadStatus( )
{
- switch (m_codLoadtqStatus)
+ switch (m_codLoadStatus)
{
case CodSuccess:
break;
case CodFileNotFound:
- KMessageBox::sorry( 0l, i18n("The cod file \"%1\" was not found.").tqarg(m_symbolFile), i18n("File Not Found") );
+ KMessageBox::sorry( 0l, i18n("The cod file \"%1\" was not found.").arg(m_symbolFile), i18n("File Not Found") );
break;
case CodUnrecognizedProcessor:
- KMessageBox::sorry( 0l, i18n("The processor for cod file \"%1\" is unrecognized.").tqarg(m_symbolFile), i18n("Unrecognized Processor") );
+ KMessageBox::sorry( 0l, i18n("The processor for cod file \"%1\" is unrecognized.").arg(m_symbolFile), i18n("Unrecognized Processor") );
break;
case CodFileNameTooLong:
- KMessageBox::sorry( 0l, i18n("The file name \"%1\" is too long.").tqarg(m_symbolFile), i18n("Filename Too Long") );
+ KMessageBox::sorry( 0l, i18n("The file name \"%1\" is too long.").arg(m_symbolFile), i18n("Filename Too Long") );
break;
case CodLstNotFound:
- KMessageBox::sorry( 0l, i18n("The lst file associated with the cod file \"%1\" was not found.").tqarg(m_symbolFile), i18n("LST File Not Found") );
+ KMessageBox::sorry( 0l, i18n("The lst file associated with the cod file \"%1\" was not found.").arg(m_symbolFile), i18n("LST File Not Found") );
break;
case CodBadFile:
- KMessageBox::sorry( 0l, i18n("The cod file \"%1\" is bad.").tqarg(m_symbolFile), i18n("Bad File") );
+ KMessageBox::sorry( 0l, i18n("The cod file \"%1\" is bad.").arg(m_symbolFile), i18n("Bad File") );
break;
case CodFileUnreadable:
- KMessageBox::sorry( 0l, i18n("The cod file \"%1\" could not be read from.").tqarg(m_symbolFile), i18n("Unreadable File") );
+ KMessageBox::sorry( 0l, i18n("The cod file \"%1\" could not be read from.").arg(m_symbolFile), i18n("Unreadable File") );
break;
case CodFailure:
case CodUnknown:
- KMessageBox::sorry( 0l, i18n("An error occured with the cod file \"%1\".").tqarg(m_symbolFile), i18n("Error") );
+ KMessageBox::sorry( 0l, i18n("An error occured with the cod file \"%1\".").arg(m_symbolFile), i18n("Error") );
break;
}
}
diff --git a/src/electronics/gpsimprocessor.h b/src/electronics/gpsimprocessor.h
index 9939be4..e2f0e4c 100644
--- a/src/electronics/gpsimprocessor.h
+++ b/src/electronics/gpsimprocessor.h
@@ -252,7 +252,7 @@ class GpsimProcessor : public TQObject
public:
/**
* Create a new gpsim processor. After calling this constructor, you
- * should always call codLoadtqStatus() to ensure that the cod file was
+ * should always call codLoadStatus() to ensure that the cod file was
* loaded successfully.
*/
GpsimProcessor( TQString symbolFile, TQObject *parent = 0 );
@@ -261,7 +261,7 @@ class GpsimProcessor : public TQObject
void setDebugMode( GpsimDebugger::Type mode ) { m_debugMode = mode; }
GpsimDebugger * currentDebugger() const { return m_pDebugger[m_debugMode]; }
- enum CodLoadtqStatus
+ enum CodLoadStatus
{
CodSuccess,
CodFileNotFound,
@@ -284,14 +284,14 @@ class GpsimProcessor : public TQObject
/**
* @return status of opening the COD file
- * @see displayCodLoadtqStatus
+ * @see displayCodLoadStatus
*/
- CodLoadtqStatus codLoadtqStatus() const { return m_codLoadtqStatus; }
+ CodLoadStatus codLoadStatus() const { return m_codLoadStatus; }
/**
- * Popups a messagebox to the user according to the CodLoadtqStatus. Will
- * only popup a messagebox if the CodLoadtqStatus wasn't CodSuccess.
+ * Popups a messagebox to the user according to the CodLoadStatus. Will
+ * only popup a messagebox if the CodLoadStatus wasn't CodSuccess.
*/
- void displayCodLoadtqStatus();
+ void displayCodLoadStatus();
/**
* Returns a list of source files for the currently running program.
*/
@@ -373,7 +373,7 @@ class GpsimProcessor : public TQObject
void emitLineReached();
pic_processor * m_pPicProcessor;
- CodLoadtqStatus m_codLoadtqStatus;
+ CodLoadStatus m_codLoadStatus;
const TQString m_symbolFile;
RegisterSet * m_pRegisterMemory;
GpsimDebugger::Type m_debugMode;
diff --git a/src/electronics/port.cpp b/src/electronics/port.cpp
index ec74bfc..8a92402 100644
--- a/src/electronics/port.cpp
+++ b/src/electronics/port.cpp
@@ -207,28 +207,28 @@ TQStringList SerialPort::ports( unsigned probeResult )
for ( int i = 0; i < 8; ++i )
{
- TQString dev = TQString("/dev/ttyS%1").tqarg(i);
+ TQString dev = TQString("/dev/ttyS%1").arg(i);
if ( probe(dev) & probeResult )
list << dev;
}
for ( unsigned i = 0; i < 8; ++i )
{
- TQString dev = TQString("/dev/tts/%1").tqarg(i);
+ TQString dev = TQString("/dev/tts/%1").arg(i);
if ( probe(dev) & probeResult )
list << dev;
}
for ( unsigned i = 0; i < 8; ++i )
{
- TQString dev = TQString("/dev/ttyUSB%1").tqarg(i);
+ TQString dev = TQString("/dev/ttyUSB%1").arg(i);
if ( probe(dev) & probeResult )
list << dev;
}
for ( unsigned i = 0; i < 8; ++i )
{
- TQString dev = TQString("/dev/usb/tts/%1").tqarg(i);
+ TQString dev = TQString("/dev/usb/tts/%1").arg(i);
if ( probe(dev) & probeResult )
list << dev;
}
@@ -277,7 +277,7 @@ void ParallelPort::reset()
{
m_file = -1;
m_reg[Data] = 0;
- m_reg[tqStatus] = 0;
+ m_reg[Status] = 0;
m_reg[Control] = 0;
m_outputPins = INPUT_MODE_BIT | IRTQ_MODE_BIT;
m_inputPins = ALWAYS_INPUT_PINS | INPUT_MODE_BIT | IRTQ_MODE_BIT;
@@ -309,7 +309,7 @@ int ParallelPort::pinState( int pins )
value |= ((readFromRegister( Data ) & ((pins & DATA_PINS) >> 0)) << 0);
if ( pins & STATUS_PINS )
- value |= ((readFromRegister( tqStatus ) & ((pins & STATUS_PINS) >> 8)) << 8);
+ value |= ((readFromRegister( Status ) & ((pins & STATUS_PINS) >> 8)) << 8);
if ( pins & CONTROL_PINS )
value |= ((readFromRegister( Control ) & ((pins & CONTROL_PINS) >> 16)) << 16);
@@ -453,14 +453,14 @@ TQStringList ParallelPort::ports( unsigned probeResult )
for ( unsigned i = 0; i < 8; ++i )
{
- TQString dev = TQString("/dev/parport%1").tqarg(i);
+ TQString dev = TQString("/dev/parport%1").arg(i);
if ( probe(dev) & probeResult )
list << dev;
}
for ( unsigned i = 0; i < 8; ++i )
{
- TQString dev = TQString("/dev/parports/%1").tqarg(i);
+ TQString dev = TQString("/dev/parports/%1").arg(i);
if ( probe(dev) & probeResult )
list << dev;
}
diff --git a/src/electronics/port.h b/src/electronics/port.h
index d51cf5d..672bdcf 100644
--- a/src/electronics/port.h
+++ b/src/electronics/port.h
@@ -120,7 +120,7 @@ class ParallelPort : public Port
DATA_PINS = PIN02 | PIN03 | PIN04 | PIN05 | PIN06
| PIN07 | PIN08 | PIN09,
- // tqStatus Register
+ // Status Register
// Offset: Base + 1
// Read only
PIN15 = 1 << 11, // Error
@@ -146,7 +146,7 @@ class ParallelPort : public Port
enum Register
{
Data = 0,
- tqStatus = 1,
+ Status = 1,
Control = 2,
};
diff --git a/src/electronics/simulation/capacitance.cpp b/src/electronics/simulation/capacitance.cpp
index c289f90..9087c7f 100644
--- a/src/electronics/simulation/capacitance.cpp
+++ b/src/electronics/simulation/capacitance.cpp
@@ -101,9 +101,9 @@ void Capacitance::time_step()
i_eq_old = i_eq_new;
}
-bool Capacitance::updatetqStatus()
+bool Capacitance::updateStatus()
{
- b_status = Reactive::updatetqStatus();
+ b_status = Reactive::updateStatus();
if ( m_method == Capacitance::m_none ) b_status = false;
return b_status;
}
@@ -111,7 +111,7 @@ bool Capacitance::updatetqStatus()
void Capacitance::setMethod( Method m )
{
m_method = m;
- updatetqStatus();
+ updateStatus();
}
diff --git a/src/electronics/simulation/capacitance.h b/src/electronics/simulation/capacitance.h
index b26899c..ccc083d 100644
--- a/src/electronics/simulation/capacitance.h
+++ b/src/electronics/simulation/capacitance.h
@@ -42,7 +42,7 @@ public:
protected:
virtual void updateCurrents();
- virtual bool updatetqStatus();
+ virtual bool updateStatus();
private:
double m_cap; // Capacitance
diff --git a/src/electronics/simulation/element.cpp b/src/electronics/simulation/element.cpp
index dbcd02d..2411897 100644
--- a/src/electronics/simulation/element.cpp
+++ b/src/electronics/simulation/element.cpp
@@ -55,7 +55,7 @@ void Element::setElementSet( ElementSet *c )
p_eSet = c;
p_A = p_eSet->matrix();
p_b = p_eSet->b();
- updatetqStatus();
+ updateStatus();
}
void Element::componentDeleted()
@@ -113,7 +113,7 @@ void Element::setCNodes( const int n0, const int n1, const int n2, const int n3
p_cnode[1] = (n1>-1)?p_eSet->cnodes()[n1]:(n1==-1?p_eSet->ground():0l);
p_cnode[2] = (n2>-1)?p_eSet->cnodes()[n2]:(n2==-1?p_eSet->ground():0l);
p_cnode[3] = (n3>-1)?p_eSet->cnodes()[n3]:(n3==-1?p_eSet->ground():0l);
- updatetqStatus();
+ updateStatus();
}
void Element::setCBranches( const int b0, const int b1, const int b2, const int b3 )
@@ -128,10 +128,10 @@ void Element::setCBranches( const int b0, const int b1, const int b2, const int
p_cbranch[1] = (b1>-1)?p_eSet->cbranches()[b1]:0l;
p_cbranch[2] = (b2>-1)?p_eSet->cbranches()[b2]:0l;
p_cbranch[3] = (b3>-1)?p_eSet->cbranches()[b3]:0l;
- updatetqStatus();
+ updateStatus();
}
-bool Element::updatetqStatus()
+bool Element::updateStatus()
{
// First, set status to false if all nodes in use are ground
b_status = false;
diff --git a/src/electronics/simulation/element.h b/src/electronics/simulation/element.h
index 7b219c9..e05de46 100644
--- a/src/electronics/simulation/element.h
+++ b/src/electronics/simulation/element.h
@@ -188,7 +188,7 @@ protected:
/**
* Update the status, returning b_status
*/
- virtual bool updatetqStatus();
+ virtual bool updateStatus();
/**
* Set by child class - the number of branches that the element uses
* Typically, this is 0, but could be 1 (e.g. independent voltage source)
diff --git a/src/electronics/simulation/inductance.cpp b/src/electronics/simulation/inductance.cpp
index 6737ab6..22c5f9e 100644
--- a/src/electronics/simulation/inductance.cpp
+++ b/src/electronics/simulation/inductance.cpp
@@ -109,9 +109,9 @@ void Inductance::time_step()
}
-bool Inductance::updatetqStatus()
+bool Inductance::updateStatus()
{
- b_status = Reactive::updatetqStatus();
+ b_status = Reactive::updateStatus();
if ( m_method == Inductance::m_none )
b_status = false;
return b_status;
@@ -121,6 +121,6 @@ bool Inductance::updatetqStatus()
void Inductance::setMethod( Method m )
{
m_method = m;
- updatetqStatus();
+ updateStatus();
}
diff --git a/src/electronics/simulation/inductance.h b/src/electronics/simulation/inductance.h
index e4bd119..46ccb09 100644
--- a/src/electronics/simulation/inductance.h
+++ b/src/electronics/simulation/inductance.h
@@ -42,7 +42,7 @@ class Inductance : public Reactive
protected:
virtual void updateCurrents();
- virtual bool updatetqStatus();
+ virtual bool updateStatus();
private:
double m_inductance; // Inductance
diff --git a/src/electronics/simulation/reactive.cpp b/src/electronics/simulation/reactive.cpp
index c753f42..83fcfd4 100644
--- a/src/electronics/simulation/reactive.cpp
+++ b/src/electronics/simulation/reactive.cpp
@@ -26,11 +26,11 @@ Reactive::~Reactive()
void Reactive::setDelta( double delta )
{
m_delta = delta;
- updatetqStatus();
+ updateStatus();
}
-bool Reactive::updatetqStatus()
+bool Reactive::updateStatus()
{
- return Element::updatetqStatus();
+ return Element::updateStatus();
}
diff --git a/src/electronics/simulation/reactive.h b/src/electronics/simulation/reactive.h
index a93459b..1142b34 100644
--- a/src/electronics/simulation/reactive.h
+++ b/src/electronics/simulation/reactive.h
@@ -34,7 +34,7 @@ public:
virtual void time_step() = 0;
protected:
- virtual bool updatetqStatus();
+ virtual bool updateStatus();
double m_delta; // Delta time interval
};
diff --git a/src/electronics/subcircuits.cpp b/src/electronics/subcircuits.cpp
index 18ff615..cd3c6c2 100644
--- a/src/electronics/subcircuits.cpp
+++ b/src/electronics/subcircuits.cpp
@@ -21,7 +21,7 @@
#include <kiconloader.h>
#include <kstandarddirs.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
Subcircuits::Subcircuits()
: TQObject()
diff --git a/src/flowcontainer.cpp b/src/flowcontainer.cpp
index 4d86d5b..22c2db8 100644
--- a/src/flowcontainer.cpp
+++ b/src/flowcontainer.cpp
@@ -101,7 +101,7 @@ void FlowContainer::createBotContainerNode()
}
-TQSize FlowContainer::tqminimumSize() const
+TQSize FlowContainer::minimumSize() const
{
return TQSize( 160, 64 );
}
@@ -165,7 +165,7 @@ void FlowContainer::childRemoved( Item *child )
FlowPart::childRemoved(child);
if (!b_expanded)
- child->tqsetVisible(true);
+ child->setVisible(true);
disconnect( this, TQT_SIGNAL(movedBy(double, double )), child, TQT_SLOT(moveBy(double, double )) );
}
@@ -374,17 +374,17 @@ void FlowContainer::updateContainedVisibility()
if (m_ext_out)
m_ext_out->setVisible( isVisible() );
- const ItemList::iterator cEnd = m_tqchildren.end();
- for ( ItemList::iterator it = m_tqchildren.begin(); it != cEnd; ++it )
+ const ItemList::iterator cEnd = m_children.end();
+ for ( ItemList::iterator it = m_children.begin(); it != cEnd; ++it )
{
if (*it)
- (*it)->tqsetVisible( isVisible() && b_expanded );
+ (*it)->setVisible( isVisible() && b_expanded );
}
m_rectangularOverlay->setVisible( isVisible() && b_expanded );
NodeGroupList hidableNodeGroups;
- p_icnDocument->getTranslatable( tqchildren(true) += GuardedItem(this), 0, 0, &hidableNodeGroups );
+ p_icnDocument->getTranslatable( children(true) += GuardedItem(this), 0, 0, &hidableNodeGroups );
NodeGroupList::iterator hngEnd = hidableNodeGroups.end();
for ( NodeGroupList::iterator it = hidableNodeGroups.begin(); it != hngEnd; ++it )
diff --git a/src/flowcontainer.h b/src/flowcontainer.h
index 8d94ac3..df38cf6 100644
--- a/src/flowcontainer.h
+++ b/src/flowcontainer.h
@@ -47,7 +47,7 @@ public:
virtual void setSelected( bool yes );
virtual void setVisible( bool yes );
- virtual TQSize tqminimumSize() const;
+ virtual TQSize minimumSize() const;
/**
* Update the visibility of items, connectors, nodes in the flowcontainer
*/
diff --git a/src/flowparts/callsub.cpp b/src/flowparts/callsub.cpp
index 09687e2..2b2d30b 100644
--- a/src/flowparts/callsub.cpp
+++ b/src/flowparts/callsub.cpp
@@ -51,7 +51,7 @@ CallSub::~CallSub()
void CallSub::dataChanged()
{
- setCaption( i18n("Call %1").tqarg(dataString("sub")) );
+ setCaption( i18n("Call %1").arg(dataString("sub")) );
}
void CallSub::generateMicrobe( FlowCode *code )
diff --git a/src/flowparts/count.cpp b/src/flowparts/count.cpp
index 2357fb8..e4bbdc3 100644
--- a/src/flowparts/count.cpp
+++ b/src/flowparts/count.cpp
@@ -58,7 +58,7 @@ Count::~Count()
void Count::dataChanged()
{
double count = dataDouble("1-length");
- setCaption( i18n("Count %1 for %2 sec").tqarg(dataString("0-trigger")).tqarg(TQString::number( count / getMultiplier(count), 'g', 3 ) + getNumberMag(count)) );
+ setCaption( i18n("Count %1 for %2 sec").arg(dataString("0-trigger")).arg(TQString::number( count / getMultiplier(count), 'g', 3 ) + getNumberMag(count)) );
}
void Count::generateMicrobe( FlowCode *code )
diff --git a/src/flowparts/delay.cpp b/src/flowparts/delay.cpp
index f31a0e9..ae85595 100644
--- a/src/flowparts/delay.cpp
+++ b/src/flowparts/delay.cpp
@@ -53,7 +53,7 @@ Delay::~Delay()
void Delay::dataChanged()
{
double delay = dataDouble("delay_length");
- setCaption( i18n("Delay for %1 sec").tqarg(TQString::number( delay / getMultiplier(delay), 'g', 3 )+getNumberMag(delay)) );
+ setCaption( i18n("Delay for %1 sec").arg(TQString::number( delay / getMultiplier(delay), 'g', 3 )+getNumberMag(delay)) );
}
void Delay::generateMicrobe( FlowCode *code )
diff --git a/src/flowparts/embed.cpp b/src/flowparts/embed.cpp
index f6bb3b2..7e5f3a3 100644
--- a/src/flowparts/embed.cpp
+++ b/src/flowparts/embed.cpp
@@ -59,7 +59,7 @@ Embed::~Embed()
void Embed::dataChanged()
{
const TQString sample = dataString("code").left(10).replace("\n"," ");
- setCaption( i18n("%1: %2...").tqarg(dataString("type")).tqarg(sample) );
+ setCaption( i18n("%1: %2...").arg(dataString("type")).arg(sample) );
}
diff --git a/src/flowparts/flowpart.cpp b/src/flowparts/flowpart.cpp
index 1ec4a6e..d19ce45 100644
--- a/src/flowparts/flowpart.cpp
+++ b/src/flowparts/flowpart.cpp
@@ -186,7 +186,7 @@ void FlowPart::initSymbol( FlowPart::FlowSymbol symbol, int width )
case FlowPart::ps_io:
{
- // define parallelogram tqshape
+ // define parallelogram shape
TQPointArray pa(4);
pa[0] = TQPoint( -(width-10)/2, -16 );
pa[1] = TQPoint( width/2, -16 );
@@ -292,7 +292,7 @@ void FlowPart::drawShape( TQPainter &p )
case FlowPart::ps_decision:
{
- // TODO Make the tqshape nice and pretty with rounded corners
+ // TODO Make the shape nice and pretty with rounded corners
CNItem::drawShape(p);
break;
}
diff --git a/src/flowparts/flowpart.h b/src/flowparts/flowpart.h
index afa20c8..9cd2553 100644
--- a/src/flowparts/flowpart.h
+++ b/src/flowparts/flowpart.h
@@ -42,8 +42,8 @@ public:
ps_call, // Call - Rectangular box with double vertical lines at either end
ps_io, // I/O - Slanter rectangular box
ps_round, // Start/End - Rounded rectangular box
- ps_decision, // Decision - Diamond tqshape
- ps_other // Custom tqshape, which is ignored by FlowPart
+ ps_decision, // Decision - Diamond shape
+ ps_other // Custom shape, which is ignored by FlowPart
};
FlowPart( ICNDocument *icnDocument, bool newItem, const TQString &id );
virtual ~FlowPart();
@@ -167,7 +167,7 @@ protected:
*/
void createAltOutput();
/**
- * Initialises a symbol, by calling setItemPoints with the tqshape
+ * Initialises a symbol, by calling setItemPoints with the shape
*/
void initSymbol( FlowPart::FlowSymbol symbol, int width = 48 );
diff --git a/src/flowparts/inputbutton.cpp b/src/flowparts/inputbutton.cpp
index a140a2a..d7c2a98 100644
--- a/src/flowparts/inputbutton.cpp
+++ b/src/flowparts/inputbutton.cpp
@@ -59,7 +59,7 @@ InputButton::~InputButton()
void InputButton::dataChanged()
{
- setCaption( i18n("Continue on %1 %2").tqarg(dataString("0-trigger")).tqarg(dataString("1-pin")) );
+ setCaption( i18n("Continue on %1 %2").arg(dataString("0-trigger")).arg(dataString("1-pin")) );
}
diff --git a/src/flowparts/interrupt.cpp b/src/flowparts/interrupt.cpp
index 14a783f..9325c33 100644
--- a/src/flowparts/interrupt.cpp
+++ b/src/flowparts/interrupt.cpp
@@ -55,7 +55,7 @@ Interrupt::~Interrupt()
void Interrupt::dataChanged()
{
- setCaption( i18n("Interrupt %1").tqarg(dataString("interrupt")) );
+ setCaption( i18n("Interrupt %1").arg(dataString("interrupt")) );
}
void Interrupt::generateMicrobe( FlowCode *code )
diff --git a/src/flowparts/keypad.cpp b/src/flowparts/keypad.cpp
index 8e49e29..47e6f30 100644
--- a/src/flowparts/keypad.cpp
+++ b/src/flowparts/keypad.cpp
@@ -55,12 +55,12 @@ Keypad::~Keypad()
void Keypad::dataChanged()
{
- setCaption( i18n("Read %1 to %2").tqarg( dataString( "keypad" ) ).tqarg( dataString( "variable" ) ) );
+ setCaption( i18n("Read %1 to %2").arg( dataString( "keypad" ) ).arg( dataString( "variable" ) ) );
}
void Keypad::generateMicrobe( FlowCode *code )
{
- code->addCode( TQString("%1 = %2").tqarg( dataString("variable") ).tqarg( dataString("keypad") ) );
+ code->addCode( TQString("%1 = %2").arg( dataString("variable") ).arg( dataString("keypad") ) );
code->addCodeBranch( outputPart("stdoutput") );
}
diff --git a/src/flowparts/pinmapping.cpp b/src/flowparts/pinmapping.cpp
index 289cbc4..46cdf04 100644
--- a/src/flowparts/pinmapping.cpp
+++ b/src/flowparts/pinmapping.cpp
@@ -26,7 +26,7 @@
#include <tqaccel.h>
#include <tqapplication.h>
#include <tqframe.h>
-#include <tqlayout.h>
+#include <layout.h>
//BEGIN class PinMapping
@@ -186,10 +186,10 @@ void PinMapDocument::init( const PinMapping & pinMapping, MicroInfo * microInfo
{
TQStringList::const_iterator it = pins.begin();
for ( unsigned row = 0; (row < 4) && (it != end); ++row, ++it )
- createConnector( m_pKeypad->childNode( TQString("row_%1").tqarg( row ) ), m_pPicComponent->childNode( *it ) );
+ createConnector( m_pKeypad->childNode( TQString("row_%1").arg( row ) ), m_pPicComponent->childNode( *it ) );
for ( unsigned col = 0; (col < keypadCols) && (it != end); ++col, ++it )
- createConnector( m_pKeypad->childNode( TQString("col_%1").tqarg( col ) ), m_pPicComponent->childNode( *it ) );
+ createConnector( m_pKeypad->childNode( TQString("col_%1").arg( col ) ), m_pPicComponent->childNode( *it ) );
}
clearHistory(); // Don't allow undoing of initial creation of stuff
@@ -255,17 +255,17 @@ PinMapping PinMapDocument::pinMapping() const
case PinMapping::Keypad_4x3:
for ( unsigned i = 0; i < 4; ++i )
- attachedIDs << TQString("row_%1").tqarg(i);
+ attachedIDs << TQString("row_%1").arg(i);
for ( unsigned i = 0; i < 3; ++i )
- attachedIDs << TQString("col_%1").tqarg(i);
+ attachedIDs << TQString("col_%1").arg(i);
attached = m_pKeypad;
break;
case PinMapping::Keypad_4x4:
for ( unsigned i = 0; i < 4; ++i )
- attachedIDs << TQString("row_%1").tqarg(i);
+ attachedIDs << TQString("row_%1").arg(i);
for ( unsigned i = 0; i < 4; ++i )
- attachedIDs << TQString("col_%1").tqarg(i);
+ attachedIDs << TQString("col_%1").arg(i);
attached = m_pKeypad;
break;
diff --git a/src/flowparts/pulse.cpp b/src/flowparts/pulse.cpp
index 86e2239..77f9dd0 100644
--- a/src/flowparts/pulse.cpp
+++ b/src/flowparts/pulse.cpp
@@ -68,7 +68,7 @@ Pulse::~Pulse()
void Pulse::dataChanged()
{
double pulse = dataDouble("0-duration");
- setCaption( i18n("Pulse %1 for %2 sec").tqarg(dataString("3-pin")).tqarg(TQString::number( pulse / getMultiplier(pulse), 'f', 1 ) + getNumberMag(pulse)) );
+ setCaption( i18n("Pulse %1 for %2 sec").arg(dataString("3-pin")).arg(TQString::number( pulse / getMultiplier(pulse), 'f', 1 ) + getNumberMag(pulse)) );
}
void Pulse::generateMicrobe( FlowCode *code )
diff --git a/src/flowparts/readport.cpp b/src/flowparts/readport.cpp
index 45623be..4385c58 100644
--- a/src/flowparts/readport.cpp
+++ b/src/flowparts/readport.cpp
@@ -58,7 +58,7 @@ ReadPort::~ReadPort()
void ReadPort::dataChanged()
{
- setCaption( i18n("Read %1 to %2").tqarg(dataString("0-port")).tqarg(dataString("1-var")) );
+ setCaption( i18n("Read %1 to %2").arg(dataString("0-port")).arg(dataString("1-var")) );
}
void ReadPort::generateMicrobe( FlowCode *code )
diff --git a/src/flowparts/repeat.cpp b/src/flowparts/repeat.cpp
index 53529ac..3dda0ae 100644
--- a/src/flowparts/repeat.cpp
+++ b/src/flowparts/repeat.cpp
@@ -62,7 +62,7 @@ Repeat::~Repeat()
void Repeat::dataChanged()
{
- setCaption( i18n("repeat until %1 %2 %3").tqarg(dataString("0var1")).tqarg(dataString("1op")).tqarg(dataString("2var2")) );
+ setCaption( i18n("repeat until %1 %2 %3").arg(dataString("0var1")).arg(dataString("1op")).arg(dataString("2var2")) );
}
void Repeat::generateMicrobe( FlowCode *code )
diff --git a/src/flowparts/setpin.cpp b/src/flowparts/setpin.cpp
index 81c29ca..be826da 100644
--- a/src/flowparts/setpin.cpp
+++ b/src/flowparts/setpin.cpp
@@ -59,7 +59,7 @@ SetPin::~SetPin()
void SetPin::dataChanged()
{
- setCaption( i18n("Set %1 %2").tqarg(dataString("pin")).tqarg(dataString("state")) );
+ setCaption( i18n("Set %1 %2").arg(dataString("pin")).arg(dataString("state")) );
}
void SetPin::generateMicrobe( FlowCode *code )
diff --git a/src/flowparts/sevenseg.cpp b/src/flowparts/sevenseg.cpp
index 1f85e19..90a4e7e 100644
--- a/src/flowparts/sevenseg.cpp
+++ b/src/flowparts/sevenseg.cpp
@@ -59,13 +59,13 @@ SevenSeg::~SevenSeg()
void SevenSeg::dataChanged()
{
- setCaption( i18n("Display %1 on %2").tqarg( dataString("expression") ).tqarg( dataString("sevenseg") ) );
+ setCaption( i18n("Display %1 on %2").arg( dataString("expression") ).arg( dataString("sevenseg") ) );
}
void SevenSeg::generateMicrobe( FlowCode *code )
{
- code->addCode( TQString("%1 = %2").tqarg( dataString("sevenseg") ).tqarg( dataString("expression") ) );
+ code->addCode( TQString("%1 = %2").arg( dataString("sevenseg") ).arg( dataString("expression") ) );
code->addCodeBranch( outputPart("stdoutput") );
}
diff --git a/src/flowparts/while.cpp b/src/flowparts/while.cpp
index ddcf981..be2189d 100644
--- a/src/flowparts/while.cpp
+++ b/src/flowparts/while.cpp
@@ -62,7 +62,7 @@ While::~While()
void While::dataChanged()
{
- setCaption( i18n("while %1 %2 %3").tqarg(dataString("0var1")).tqarg(dataString("1op")).tqarg(dataString("2var2")) );
+ setCaption( i18n("while %1 %2 %3").arg(dataString("0var1")).arg(dataString("1op")).arg(dataString("2var2")) );
}
void While::generateMicrobe( FlowCode *code )
diff --git a/src/flowparts/writeport.cpp b/src/flowparts/writeport.cpp
index 312ea01..9816f69 100644
--- a/src/flowparts/writeport.cpp
+++ b/src/flowparts/writeport.cpp
@@ -59,7 +59,7 @@ WritePort::~WritePort()
void WritePort::dataChanged()
{
- setCaption( i18n("Write %1 to %2").tqarg(dataString("0-var")).tqarg(dataString("1-port")) );
+ setCaption( i18n("Write %1 to %2").arg(dataString("0-var")).arg(dataString("1-port")) );
}
diff --git a/src/gui/asmformattingwidget.ui b/src/gui/asmformattingwidget.ui
index 1245538..db4ee05 100644
--- a/src/gui/asmformattingwidget.ui
+++ b/src/gui/asmformattingwidget.ui
@@ -185,7 +185,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>484</height>
diff --git a/src/gui/contexthelp.cpp b/src/gui/contexthelp.cpp
index f7a2432..050eecb 100644
--- a/src/gui/contexthelp.cpp
+++ b/src/gui/contexthelp.cpp
@@ -16,10 +16,10 @@
#include <klocale.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqregexp.h>
-#include <tqtextbrowser.h>
+#include <textbrowser.h>
#include <tqwhatsthis.h>
#include <assert.h>
@@ -42,18 +42,18 @@ ContextHelp::ContextHelp( KateMDI::ToolView * parent )
{
TQWhatsThis::add( this, i18n("Provides context-sensitive help relevant to the current editing being performed.") );
- TQVBoxLayout *vtqlayout = new TQVBoxLayout( this, 0, 6 );
+ TQVBoxLayout *vlayout = new TQVBoxLayout( this, 0, 6 );
m_nameLbl = new TQLabel( this, "" );
- vtqlayout->addWidget(m_nameLbl);
- vtqlayout->addSpacing(8);
+ vlayout->addWidget(m_nameLbl);
+ vlayout->addSpacing(8);
m_info = new TQTextBrowser( this, "" );
- vtqlayout->addWidget(m_info);
- m_info->tqsetSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding );
+ vlayout->addWidget(m_info);
+ m_info->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding );
TQSpacerItem *spacer3 = new TQSpacerItem( 1, 1, TQSizePolicy::Preferred, TQSizePolicy::Preferred );
- vtqlayout->addItem(spacer3);
+ vlayout->addItem(spacer3);
slotClear();
}
diff --git a/src/gui/createsubprojectwidget.ui b/src/gui/createsubprojectwidget.ui
index 2d18c06..5354bcd 100644
--- a/src/gui/createsubprojectwidget.ui
+++ b/src/gui/createsubprojectwidget.ui
@@ -81,7 +81,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/src/gui/doublespinbox.cpp b/src/gui/doublespinbox.cpp
index b994c23..4418538 100644
--- a/src/gui/doublespinbox.cpp
+++ b/src/gui/doublespinbox.cpp
@@ -40,7 +40,7 @@ DoubleSpinBox::DoubleSpinBox( double lower, double upper, double minAbs, double
m_minAbsValue = minAbs;
m_queuedSuffix = TQString();
- editor()->tqsetAlignment( TQt::AlignRight );
+ editor()->setAlignment( TQt::AlignRight );
connect( this, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(checkIfChanged()) );
TQSpinBox::setMinValue( -(1<<30) );
@@ -129,7 +129,7 @@ double DoubleSpinBox::getMult()
if ( text.length() == 0 )
return 1.0;
- if ( text.tqendsWith( m_unit, false ) )
+ if ( text.endsWith( m_unit, false ) )
text = text.remove( text.length() - m_unit.length(), m_unit.length() );
text.stripWhiteSpace();
diff --git a/src/gui/generaloptionswidget.ui b/src/gui/generaloptionswidget.ui
index 6c9cd19..729861b 100644
--- a/src/gui/generaloptionswidget.ui
+++ b/src/gui/generaloptionswidget.ui
@@ -152,7 +152,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout8_2</cstring>
+ <cstring>layout8_2</cstring>
</property>
<grid>
<property name="name">
@@ -217,7 +217,7 @@
<property name="scaledContents">
<bool>false</bool>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -233,7 +233,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
diff --git a/src/gui/gpasmsettingswidget.ui b/src/gui/gpasmsettingswidget.ui
index 2e94ebc..e8d5c32 100644
--- a/src/gui/gpasmsettingswidget.ui
+++ b/src/gui/gpasmsettingswidget.ui
@@ -87,7 +87,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -207,7 +207,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -224,7 +224,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -241,7 +241,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
diff --git a/src/gui/itemeditor.cpp b/src/gui/itemeditor.cpp
index 58b0661..4e800e5 100644
--- a/src/gui/itemeditor.cpp
+++ b/src/gui/itemeditor.cpp
@@ -17,7 +17,7 @@
#include <klocale.h>
#include <kstandarddirs.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqpushbutton.h>
#include <tqwhatsthis.h>
@@ -42,17 +42,17 @@ ItemEditor::ItemEditor( KateMDI::ToolView * parent )
{
TQWhatsThis::add( this, i18n("This allows editing of advanced properties of the selected item(s). Right click on the picture of the item to set the orientation.") );
- TQVBoxLayout *vtqlayout = new TQVBoxLayout( this, 0, 6 );
+ TQVBoxLayout *vlayout = new TQVBoxLayout( this, 0, 6 );
m_nameLbl = new TQLabel( this, "" );
- vtqlayout->addWidget(m_nameLbl);
- vtqlayout->addSpacing(8);
+ vlayout->addWidget(m_nameLbl);
+ vlayout->addSpacing(8);
propList = new PropertiesListView(this);
- vtqlayout->addWidget(propList);
+ vlayout->addWidget(propList);
TQWhatsThis::add(propList,i18n("<qt>Shows properties associated with the currently selected item(s).<p>Select a property to change its value. If multiple items are selected with different values then the property will appear greyed out, use ""Merge Properties"" to make them the same.<p>Select ""Defaults to set all properties to their default values"""));
- TQHBoxLayout *h1Layout = new TQHBoxLayout( vtqlayout, 4 );
+ TQHBoxLayout *h1Layout = new TQHBoxLayout( vlayout, 4 );
TQSpacerItem *spacer1 = new TQSpacerItem( 1, 1 );
h1Layout->addItem(spacer1);
@@ -67,7 +67,7 @@ ItemEditor::ItemEditor( KateMDI::ToolView * parent )
h1Layout->addWidget(m_mergeBtn);
// Qt::Orientation widget stuff
- TQHBoxLayout *h2Layout = new TQHBoxLayout( vtqlayout, 6 );
+ TQHBoxLayout *h2Layout = new TQHBoxLayout( vlayout, 6 );
TQSpacerItem *spacer2 = new TQSpacerItem( 1, 1 );
h2Layout->addItem(spacer2);
m_orientationWidget = new OrientationWidget(this);
diff --git a/src/gui/itemselector.cpp b/src/gui/itemselector.cpp
index 539bc40..5b4ae41 100644
--- a/src/gui/itemselector.cpp
+++ b/src/gui/itemselector.cpp
@@ -24,7 +24,7 @@
#include <klocale.h>
#include <tqdragobject.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpopupmenu.h>
#include <tqwhatsthis.h>
@@ -163,7 +163,7 @@ void ItemSelector::slotContextMenuRequested( TQListViewItem* item, const TQPoint
}
TQPopupMenu *menu = new TQPopupMenu(this);
- menu->insertItem( i18n("Remove %1").tqarg(item->text(0)), this, TQT_SLOT(slotRemoveSelectedItem()), TQt::Key_Delete );
+ menu->insertItem( i18n("Remove %1").arg(item->text(0)), this, TQT_SLOT(slotRemoveSelectedItem()), TQt::Key_Delete );
menu->popup(pos);
}
@@ -177,7 +177,7 @@ void ItemSelector::slotRemoveSelectedItem()
emit itemRemoved( item->key( 0, 0 ) );
ILVItem *parent = dynamic_cast<ILVItem*>(item->TQListViewItem::parent());
delete item;
- // Get rid of the category as well if it has no tqchildren
+ // Get rid of the category as well if it has no children
if ( parent && !parent->firstChild() )
{
m_categories.remove(parent->text(0));
diff --git a/src/gui/logicwidget.ui b/src/gui/logicwidget.ui
index 2280eb4..e57feab 100644
--- a/src/gui/logicwidget.ui
+++ b/src/gui/logicwidget.ui
@@ -239,7 +239,7 @@
These values will apply to all components, apart from the PIC, whose pins' impedances depend on the pin in use.</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -253,7 +253,7 @@ These values will apply to all components, apart from the PIC, whose pins' imped
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
diff --git a/src/gui/logview.cpp b/src/gui/logview.cpp
index 574d967..2da75a2 100644
--- a/src/gui/logview.cpp
+++ b/src/gui/logview.cpp
@@ -49,23 +49,23 @@ void LogView::addOutput( TQString text, OutputType outputType, MessageInfo messa
switch(outputType)
{
case LogView::ot_important:
- append( TQString("<font color=\"#000000\"><b>%1</b></font>").tqarg(text) );
+ append( TQString("<font color=\"#000000\"><b>%1</b></font>").arg(text) );
break;
case LogView::ot_info:
- append( TQString("<font color=\"#000000\"><i>%1</i></font>").tqarg(text) );
+ append( TQString("<font color=\"#000000\"><i>%1</i></font>").arg(text) );
break;
case LogView::ot_message:
- append( TQString("<font color=\"#000000\">%1</font>").tqarg(text) );
+ append( TQString("<font color=\"#000000\">%1</font>").arg(text) );
break;
case LogView::ot_warning:
- append( TQString("<font color=\"#666666\">%1</font>").tqarg(text) );
+ append( TQString("<font color=\"#666666\">%1</font>").arg(text) );
break;
case LogView::ot_error:
- append( TQString("<font color=\"#800000\">%1</font>").tqarg(text) );
+ append( TQString("<font color=\"#800000\">%1</font>").arg(text) );
break;
}
diff --git a/src/gui/microselectwidget.cpp b/src/gui/microselectwidget.cpp
index 59dfa33..f988a8d 100644
--- a/src/gui/microselectwidget.cpp
+++ b/src/gui/microselectwidget.cpp
@@ -17,7 +17,7 @@
#include <klocale.h>
#include <tqgroupbox.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtooltip.h>
#include <tqvariant.h>
#include <tqwhatsthis.h>
@@ -35,13 +35,13 @@ MicroSelectWidget::MicroSelectWidget( TQWidget* parent, const char* name, WFlags
m_pMicroFamilyLabel->setText( i18n("Family") );
m_pMicroFamily = new KComboBox( FALSE, this, "m_pMicroFamily" );
- m_pMicroFamily->tqsetSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred );
+ m_pMicroFamily->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred );
m_pMicroLabel = new TQLabel( this, "m_pMicroLabel" );
m_pMicroLabel->setText( i18n("Micro") );
m_pMicro = new KComboBox( FALSE, this, "m_pMicro" );
- m_pMicro->tqsetSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred );
+ m_pMicro->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred );
m_pMicro->setEditable( TRUE );
m_pMicro->setAutoCompletion(true);
updateFromAllowed();
diff --git a/src/gui/microsettingsdlg.cpp b/src/gui/microsettingsdlg.cpp
index d8d3a05..4a14626 100644
--- a/src/gui/microsettingsdlg.cpp
+++ b/src/gui/microsettingsdlg.cpp
@@ -26,7 +26,7 @@
#include <tqgroupbox.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqregexp.h>
#include <tqtable.h>
#include <tqwhatsthis.h>
@@ -69,10 +69,10 @@ MicroSettingsDlg::MicroSettingsDlg( MicroSettings * microSettings, TQWidget *par
TQGroupBox * groupBox = new TQGroupBox( *it, m_pWidget->portsGroupBox );
groupBox->setColumnLayout(0, Qt::Vertical );
- groupBox->tqlayout()->setSpacing( 6 );
- groupBox->tqlayout()->setMargin( 11 );
- TQGridLayout * groupBoxLayout = new TQGridLayout( groupBox->tqlayout() );
- groupBoxLayout->tqsetAlignment( TQt::AlignTop );
+ groupBox->layout()->setSpacing( 6 );
+ groupBox->layout()->setMargin( 11 );
+ TQGridLayout * groupBoxLayout = new TQGridLayout( groupBox->layout() );
+ groupBoxLayout->setAlignment( TQt::AlignTop );
// TODO: replace this with i18n( "the type", "Type (TRIS register):" );
groupBoxLayout->addWidget( new TQLabel( i18n("Type (TRIS register):"), groupBox ), 0, 0 );
@@ -84,8 +84,8 @@ MicroSettingsDlg::MicroSettingsDlg( MicroSettings * microSettings, TQWidget *par
m_portStateEdit[row] = new KLineEdit( portState, groupBox );
groupBoxLayout->addWidget( m_portStateEdit[row], 1, 1 );
-// (dynamic_cast<TQVBoxLayout*>(m_pWidget->portsGroupBox->tqlayout()))->insertWidget( row, groupBox );
- (dynamic_cast<TQVBoxLayout*>(m_pWidget->portsGroupBox->tqlayout()))->addWidget( groupBox );
+// (dynamic_cast<TQVBoxLayout*>(m_pWidget->portsGroupBox->layout()))->insertWidget( row, groupBox );
+ (dynamic_cast<TQVBoxLayout*>(m_pWidget->portsGroupBox->layout()))->addWidget( groupBox );
}
//END Initialize initial port settings
@@ -370,26 +370,26 @@ 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 );
+ if ( typeText.startsWith( "0x", false ) ) type = typeText.remove(0,2).toInt( &typeOk, 16 );
else if ( typeText.contains( TQRegExp("[^01]") ) ) type = typeText.toInt( &typeOk, 10 );
else type = typeText.toInt( &typeOk, 2 );
if ( !typeOk )
{
-// KMessageBox::sorry( this, i18n("Unregnised Port Type: %1").tqarg(typeText) );
+// KMessageBox::sorry( this, i18n("Unregnised Port Type: %1").arg(typeText) );
return;
}
TQString stateText = m_portStateEdit[row]->text();
bool stateOk = true;
- if ( stateText.tqstartsWith( "0x", false ) ) state = stateText.remove(0,2).toInt( &stateOk, 16 );
+ if ( stateText.startsWith( "0x", false ) ) state = stateText.remove(0,2).toInt( &stateOk, 16 );
else if ( stateText.contains( TQRegExp("[^01]") ) ) state = stateText.toInt( &stateOk, 10 );
else state = stateText.toInt( &stateOk, 2 );
if ( !stateOk )
{
-// KMessageBox::sorry( this, i18n("Unregnised Port State: %1").tqarg(stateText) );
+// KMessageBox::sorry( this, i18n("Unregnised Port State: %1").arg(stateText) );
return;
}
@@ -406,12 +406,12 @@ void MicroSettingsDlg::saveVariable( int row )
TQString valueText = m_pWidget->variables->text( row, 1 );
int value;
bool ok = true;
- if ( valueText.tqstartsWith( "0x", false ) ) value = valueText.remove(0,2).toInt( &ok, 16 );
+ if ( valueText.startsWith( "0x", false ) ) value = valueText.remove(0,2).toInt( &ok, 16 );
else value = valueText.toInt( &ok, 10 );
if (!ok)
{
- KMessageBox::sorry( this, i18n("Invalid variable value: %1").tqarg(valueText) );
+ KMessageBox::sorry( this, i18n("Invalid variable value: %1").arg(valueText) );
return;
}
diff --git a/src/gui/microsettingswidget.ui b/src/gui/microsettingswidget.ui
index 3d5ff66..9030238 100644
--- a/src/gui/microsettingswidget.ui
+++ b/src/gui/microsettingswidget.ui
@@ -96,7 +96,7 @@ Drag it to set the type (input/output).</string>
<property name="name">
<cstring>variables</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>64</height>
@@ -145,7 +145,7 @@ Drag it to set the type (input/output).</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>60</width>
<height>20</height>
diff --git a/src/gui/newfilewidget.ui b/src/gui/newfilewidget.ui
index cf33850..4f0b4dc 100644
--- a/src/gui/newfilewidget.ui
+++ b/src/gui/newfilewidget.ui
@@ -59,7 +59,7 @@ Creates a new circuit, with drag and drop editor. Real time simulation of the ci
<property name="text">
<string>File Type:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter</set>
</property>
</widget>
@@ -75,7 +75,7 @@ Creates a new circuit, with drag and drop editor. Real time simulation of the ci
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>500</width>
<height>150</height>
@@ -128,13 +128,13 @@ Creates a new circuit, with drag and drop editor. Real time simulation of the ci
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -151,7 +151,7 @@ Creates a new circuit, with drag and drop editor. Real time simulation of the ci
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>0</height>
diff --git a/src/gui/newpinmappingwidget.ui b/src/gui/newpinmappingwidget.ui
index 4972642..36a7117 100644
--- a/src/gui/newpinmappingwidget.ui
+++ b/src/gui/newpinmappingwidget.ui
@@ -64,7 +64,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -83,7 +83,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>300</width>
<height>0</height>
@@ -112,7 +112,7 @@
<property name="name">
<cstring>typeCombo</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
diff --git a/src/gui/newprojectwidget.ui b/src/gui/newprojectwidget.ui
index dc36007..b7c73b8 100644
--- a/src/gui/newprojectwidget.ui
+++ b/src/gui/newprojectwidget.ui
@@ -48,7 +48,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
diff --git a/src/gui/orientationwidget.cpp b/src/gui/orientationwidget.cpp
index 19f88c3..e46e191 100644
--- a/src/gui/orientationwidget.cpp
+++ b/src/gui/orientationwidget.cpp
@@ -19,7 +19,7 @@
#include <kstandarddirs.h>
#include <tqbitmap.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqimage.h>
#include <tqpixmap.h>
#include <tqpainter.h>
@@ -30,7 +30,7 @@ const int _size = 44;
OrientationWidget::OrientationWidget(TQWidget *parent, const char *name)
: TQWidget(parent, name)
{
- TQGridLayout *tqlayout = new TQGridLayout( this, 2, 4, 0, 4 );
+ TQGridLayout *layout = new TQGridLayout( this, 2, 4, 0, 4 );
p_activeFlowPart = 0l;
for ( int row=0; row<2; ++row )
@@ -39,7 +39,7 @@ OrientationWidget::OrientationWidget(TQWidget *parent, const char *name)
{
TQPushButton *btn = new TQPushButton(this);
m_toolBtn[row][col] = btn;
- tqlayout->addWidget( btn, row, col );
+ layout->addWidget( btn, row, col );
btn->setFixedSize( _size+6, _size+6 );
// btn->setFlat(true);
btn->setEnabled(false);
diff --git a/src/gui/oscilloscopeview.cpp b/src/gui/oscilloscopeview.cpp
index f74a822..e42af21 100644
--- a/src/gui/oscilloscopeview.cpp
+++ b/src/gui/oscilloscopeview.cpp
@@ -77,7 +77,7 @@ void OscilloscopeView::updateView()
void OscilloscopeView::updateViewTimeout()
{
b_needRedraw = true;
- tqrepaint(false);
+ repaint(false);
updateTimeLabel();
}
@@ -130,7 +130,7 @@ void OscilloscopeView::mousePressEvent( TQMouseEvent *event )
for ( uint i=0; i<5; ++i )
{
const int num = fps[i];
- fpsMenu.insertItem( i18n("%1 fps").tqarg(num), num );
+ fpsMenu.insertItem( i18n("%1 fps").arg(num), num );
fpsMenu.setItemChecked( num, num == m_fps );
}
diff --git a/src/gui/oscilloscopeview.h b/src/gui/oscilloscopeview.h
index b4e6a10..533c92e 100644
--- a/src/gui/oscilloscopeview.h
+++ b/src/gui/oscilloscopeview.h
@@ -33,7 +33,7 @@ class OscilloscopeView : public TQFrame
public slots:
/**
- * Sets the needRedraw flag to true, and then class tqrepaint
+ * Sets the needRedraw flag to true, and then class repaint
*/
void updateView();
void slotSetFrameRate( int fps );
diff --git a/src/gui/oscilloscopewidget.ui b/src/gui/oscilloscopewidget.ui
index 0a6acb9..79a98d0 100644
--- a/src/gui/oscilloscopewidget.ui
+++ b/src/gui/oscilloscopewidget.ui
@@ -27,7 +27,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="3" rowspan="2" colspan="1">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<grid>
<property name="name">
@@ -67,13 +67,13 @@
<property name="name">
<cstring>probePositioner</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>16</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>16</width>
<height>32767</height>
@@ -92,7 +92,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="1" rowspan="2" colspan="1">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<vbox>
<property name="name">
@@ -111,7 +111,7 @@
<property name="text">
<string>Zoom</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -150,7 +150,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>30</height>
@@ -164,7 +164,7 @@
<property name="text">
<string></string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -178,7 +178,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>6</height>
@@ -216,7 +216,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>6</width>
<height>6</height>
@@ -233,7 +233,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>6</width>
<height>6</height>
diff --git a/src/gui/outputmethodwidget.ui b/src/gui/outputmethodwidget.ui
index 0814591..3eee06d 100644
--- a/src/gui/outputmethodwidget.ui
+++ b/src/gui/outputmethodwidget.ui
@@ -20,7 +20,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>450</width>
<height>0</height>
@@ -115,7 +115,7 @@
<property name="name">
<cstring>m_pMicroSelect</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -132,7 +132,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>0</height>
diff --git a/src/gui/picprogrammerconfigwidget.ui b/src/gui/picprogrammerconfigwidget.ui
index 43929f9..60654f9 100644
--- a/src/gui/picprogrammerconfigwidget.ui
+++ b/src/gui/picprogrammerconfigwidget.ui
@@ -43,7 +43,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>295</width>
<height>20</height>
@@ -215,7 +215,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@@ -249,7 +249,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
diff --git a/src/gui/pieditor.cpp b/src/gui/pieditor.cpp
index 5adce57..f0daf3f 100644
--- a/src/gui/pieditor.cpp
+++ b/src/gui/pieditor.cpp
@@ -18,7 +18,7 @@
#include <klocale.h>
#include <knuminput.h>
#include <kurlrequester.h>
-#include <tqlayout.h>
+#include <layout.h>
//BEGIN class PIEditor
PIEditor::PIEditor(TQString id, Variant *data, TQWidget *parent, const char *name)
@@ -46,8 +46,8 @@ void PIEditor::valueChanged( TQVariant /*variant*/ )
PIBool::PIBool(TQString id, Variant *data, TQWidget *parent, const char *name )
: PIEditor( id, data, parent, name )
{
- TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
- tqlayout->setAutoAdd(true);
+ TQHBoxLayout *layout = new TQHBoxLayout(this);
+ layout->setAutoAdd(true);
m_comboBox = new KComboBox(this);
m_comboBox->insertItem( i18n("True"), 0 );
@@ -82,8 +82,8 @@ void PIBool::valueChanged( TQVariant /*variant*/ )
PIColor::PIColor(TQString id, Variant *data, TQWidget *parent, const char *name )
: PIEditor(id,data,parent, name)
{
- TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
- tqlayout->setAutoAdd(true);
+ TQHBoxLayout *layout = new TQHBoxLayout(this);
+ layout->setAutoAdd(true);
m_combo = new ColorCombo( (ColorCombo::ColorScheme)m_data->colorScheme(), this );
m_combo->setColor(m_data->value().toColor());
@@ -117,8 +117,8 @@ void PIColor::valueChanged( TQVariant /*variant*/ )
PIDouble::PIDouble(TQString id, Variant *data, TQWidget *parent, const char *name )
: PIEditor(id,data,parent, name)
{
- TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
- tqlayout->setAutoAdd(true);
+ TQHBoxLayout *layout = new TQHBoxLayout(this);
+ layout->setAutoAdd(true);
spin = new DoubleSpinBox(m_data->minValue(),m_data->maxValue(),m_data->minAbsValue(),m_data->value().toDouble(),m_data->unit(),this);
@@ -145,8 +145,8 @@ void PIDouble::valueChanged( TQVariant /*variant*/ )
PIFilename::PIFilename(TQString id, Variant *data, TQWidget *parent, const char *name )
: PIEditor(id,data,parent, name)
{
- TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
- tqlayout->setAutoAdd(true);
+ TQHBoxLayout *layout = new TQHBoxLayout(this);
+ layout->setAutoAdd(true);
m_combo = 0L;
if( m_data->allowed().count() == 0 )
@@ -196,8 +196,8 @@ void PIFilename::valueChanged( TQVariant /*variant*/ )
PIInt::PIInt( const TQString &id, Variant *data, TQWidget *parent, const char *name )
: PIEditor( id, data, parent, name )
{
- TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
- tqlayout->setAutoAdd(true);
+ TQHBoxLayout *layout = new TQHBoxLayout(this);
+ layout->setAutoAdd(true);
spin = new KIntSpinBox( (int)m_data->minValue(), (int)m_data->maxValue(), 1, m_data->value().toInt(), 10, this );
@@ -224,8 +224,8 @@ void PIInt::valueChanged( TQVariant /*variant*/ )
PILineEdit::PILineEdit(TQString id, Variant *data, TQWidget *parent, const char *name)
: PIEditor( id, data, parent, name)
{
- TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
- tqlayout->setAutoAdd(true);
+ TQHBoxLayout *layout = new TQHBoxLayout(this);
+ layout->setAutoAdd(true);
m_edit = new KLineEdit( m_data->value().toString() , this );
connect(m_edit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(slotEditTextChanged()));
}
@@ -251,8 +251,8 @@ void PILineEdit::valueChanged( TQVariant /*variant*/ )
PIStringCombo::PIStringCombo(TQString id, Variant *data, TQWidget *parent, const char *name)
: PIEditor( id, data, parent, name)
{
- TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
- tqlayout->setAutoAdd(true);
+ TQHBoxLayout *layout = new TQHBoxLayout(this);
+ layout->setAutoAdd(true);
m_combo = new KComboBox( this );
m_combo->insertStringList(m_data->allowed());
diff --git a/src/gui/probepositioner.cpp b/src/gui/probepositioner.cpp
index 481612c..25f7119 100644
--- a/src/gui/probepositioner.cpp
+++ b/src/gui/probepositioner.cpp
@@ -41,7 +41,7 @@ ProbePositioner::~ProbePositioner()
void ProbePositioner::forceRepaint()
{
b_needRedraw = true;
- tqrepaint(false);
+ repaint(false);
}
diff --git a/src/gui/processingoptionswidget.ui b/src/gui/processingoptionswidget.ui
index 501fd3b..658e394 100644
--- a/src/gui/processingoptionswidget.ui
+++ b/src/gui/processingoptionswidget.ui
@@ -26,7 +26,7 @@
<property name="name">
<cstring>m_pMicroSelect</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -43,7 +43,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
diff --git a/src/gui/programmerwidget.ui b/src/gui/programmerwidget.ui
index b41a05a..e9e603e 100644
--- a/src/gui/programmerwidget.ui
+++ b/src/gui/programmerwidget.ui
@@ -50,7 +50,7 @@
<property name="name">
<cstring>m_pMicroSelect</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -83,7 +83,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>0</height>
diff --git a/src/gui/projectdlgs.cpp b/src/gui/projectdlgs.cpp
index 0f3ed9d..4524bea 100644
--- a/src/gui/projectdlgs.cpp
+++ b/src/gui/projectdlgs.cpp
@@ -27,7 +27,7 @@
#include <tqcheckbox.h>
#include <tqcombobox.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
//BEGIN class NewProjectDlg
NewProjectDlg::NewProjectDlg( TQWidget * parent )
@@ -165,8 +165,8 @@ LinkerOptionsDlg::LinkerOptionsDlg( LinkerOptions * linkingOptions, TQWidget *pa
delete m_pWidget->m_pExternalLibraries;
m_pWidget->m_pExternalLibraries = new KEditListBox( i18n("Link libraries outside project"), m_pExternalLibraryRequester->customEditor(), m_pWidget );
- m_pWidget->m_pExternalLibraries->tqlayout()->setMargin(11);
- (dynamic_cast<TQGridLayout*>(m_pWidget->tqlayout()))->addMultiCellWidget( m_pWidget->m_pExternalLibraries, 7, 7, 0, 1 );
+ m_pWidget->m_pExternalLibraries->layout()->setMargin(11);
+ (dynamic_cast<TQGridLayout*>(m_pWidget->layout()))->addMultiCellWidget( m_pWidget->m_pExternalLibraries, 7, 7, 0, 1 );
#if defined(KDE_MAKE_VERSION)
# if TDE_VERSION >= KDE_MAKE_VERSION(3,4,0)
diff --git a/src/gui/propertieslistview.cpp b/src/gui/propertieslistview.cpp
index 75d21ba..e647997 100644
--- a/src/gui/propertieslistview.cpp
+++ b/src/gui/propertieslistview.cpp
@@ -191,18 +191,18 @@ void PropertiesListView::slotSelectionChanged(TQListViewItem *item)
connect(m_editor,TQT_SIGNAL(editorDataChanged(const TQString&,TQVariant)),this,TQT_SLOT(slotDataChanged(const TQString&,TQVariant)));
int x = columnWidth(0);
- int y = viewportToContents(TQPoint(0,tqitemRect(p_lastItem).y())).y();
+ int y = viewportToContents(TQPoint(0,itemRect(p_lastItem).y())).y();
addChild(m_editor,x,y);
m_editor->setFocus();
m_editor->show();
- m_editor->setGeometry(TQRect(x,y,columnWidth(1),tqitemRect(p_lastItem).height()));
+ m_editor->setGeometry(TQRect(x,y,columnWidth(1),itemRect(p_lastItem).height()));
if(p_lastItem->data()->type() == Variant::Type::FileName)
{
// The folder button in the KURLComboBox has a minimum size taller than
// the height of the ListViewItems so this is a temporary kludge to
// make it look slightly acceptable.
- m_editor->setGeometry(TQRect(x,y,columnWidth(1),tqitemRect(p_lastItem).height()+7));
+ m_editor->setGeometry(TQRect(x,y,columnWidth(1),itemRect(p_lastItem).height()+7));
}
// Active the editor as appropriate
@@ -271,7 +271,7 @@ void PropertiesListView::headerSizeChanged(int section, int /*oldSize*/, int new
// Resize the editor to the new column width
// and move it to the right place.
- TQRect rect = m_editor->tqgeometry();
+ TQRect rect = m_editor->geometry();
rect.setWidth(newSize);
rect.setX( columnWidth(0) );
m_editor->setGeometry(rect);
diff --git a/src/gui/sdccoptionswidget.ui b/src/gui/sdccoptionswidget.ui
index a8412b8..475a53b 100644
--- a/src/gui/sdccoptionswidget.ui
+++ b/src/gui/sdccoptionswidget.ui
@@ -111,7 +111,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -225,7 +225,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -397,7 +397,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -537,7 +537,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -570,7 +570,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
diff --git a/src/gui/settingsdlg.cpp b/src/gui/settingsdlg.cpp
index 72a7a07..3fd5a28 100644
--- a/src/gui/settingsdlg.cpp
+++ b/src/gui/settingsdlg.cpp
@@ -104,19 +104,19 @@ void SettingsDlg::slotUpdateRefreshRateLabel( int sliderValue )
switch(sliderValue)
{
case 0:
- m_generalOptionsWidget->refreshRateLabel->setText( i18n("Lowest (%1 FPS)").tqarg(number) );
+ m_generalOptionsWidget->refreshRateLabel->setText( i18n("Lowest (%1 FPS)").arg(number) );
break;
case 1:
- m_generalOptionsWidget->refreshRateLabel->setText( i18n("Low (%1 FPS)").tqarg(number) );
+ m_generalOptionsWidget->refreshRateLabel->setText( i18n("Low (%1 FPS)").arg(number) );
break;
case 2:
- m_generalOptionsWidget->refreshRateLabel->setText( i18n("Medium (%1 FPS)").tqarg(number) );
+ m_generalOptionsWidget->refreshRateLabel->setText( i18n("Medium (%1 FPS)").arg(number) );
break;
case 3:
- m_generalOptionsWidget->refreshRateLabel->setText( i18n("High (%1 FPS)").tqarg(number) );
+ m_generalOptionsWidget->refreshRateLabel->setText( i18n("High (%1 FPS)").arg(number) );
break;
case 4:
- m_generalOptionsWidget->refreshRateLabel->setText( i18n("Highest (%1 FPS)").tqarg(number) );
+ m_generalOptionsWidget->refreshRateLabel->setText( i18n("Highest (%1 FPS)").arg(number) );
break;
default:
m_generalOptionsWidget->refreshRateLabel->setText( i18n("Unknown value") );
@@ -141,9 +141,9 @@ void SettingsDlg::slotUpdatePicProgrammerDescription()
TQString programLocation = KStandardDirs::findExe( executable );
if ( programLocation.isNull() )
- description.prepend( i18n("<b>%1</b> cannot be found.<br>").tqarg( executable ) );
+ description.prepend( i18n("<b>%1</b> cannot be found.<br>").arg( executable ) );
else
- description.prepend( i18n("<b>%1</b> found: %2<br>").tqarg( executable ).tqarg(programLocation) );
+ description.prepend( i18n("<b>%1</b> found: %2<br>").arg( executable ).arg(programLocation) );
m_picProgrammerConfigWidget->m_pProgrammerDescription->setText( description );
m_picProgrammerConfigWidget->removeButton->setEnabled( customProgrammer );
@@ -193,7 +193,7 @@ void SettingsDlg::slotRemoveProgrammerConfig()
TQString program = combo->currentText();
- KMessageBox::ButtonCode confirm = (KMessageBox::ButtonCode)KMessageBox::warningContinueCancel( this, i18n("Remove programmer configuration \"%1\"?").tqarg(program), i18n("Remove \"%1\"").tqarg(program), i18n("Remove") );
+ KMessageBox::ButtonCode confirm = (KMessageBox::ButtonCode)KMessageBox::warningContinueCancel( this, i18n("Remove programmer configuration \"%1\"?").arg(program), i18n("Remove \"%1\"").arg(program), i18n("Remove") );
if ( confirm == KMessageBox::Cancel )
return;
diff --git a/src/gui/symbolviewer.cpp b/src/gui/symbolviewer.cpp
index 170880b..f264cd7 100644
--- a/src/gui/symbolviewer.cpp
+++ b/src/gui/symbolviewer.cpp
@@ -19,7 +19,7 @@
#include <kdebug.h>
#include <klocale.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <assert.h>
diff --git a/src/icndocument.cpp b/src/icndocument.cpp
index e78e631..8c817ed 100644
--- a/src/icndocument.cpp
+++ b/src/icndocument.cpp
@@ -25,7 +25,7 @@
#include <kapplication.h>
#include <kdebug.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
#include <tqtimer.h>
ICNDocument::ICNDocument( const TQString &caption, KTechlab *ktechlab, const char *name )
@@ -1030,7 +1030,7 @@ void ICNDocument::copy()
data.addNodes( nodeList );
data.addConnectors( connectorList );
- KApplication::tqclipboard()->setText( data.toXML(), TQClipboard::Clipboard );
+ KApplication::clipboard()->setText( data.toXML(), TQClipboard::Clipboard );
}
void ICNDocument::selectAll()
@@ -1142,7 +1142,7 @@ void ICNDocument::requestRerouteInvalidatedConnectors()
}
void ICNDocument::rerouteInvalidatedConnectors()
{
- tqApp->tqprocessEvents(300);
+ tqApp->processEvents(300);
// We only ever need to add the connector points for CNItem's when we're about to reroute...
addAllItemConnectorPoints();
diff --git a/src/item.cpp b/src/item.cpp
index 884ee17..48f2c91 100644
--- a/src/item.cpp
+++ b/src/item.cpp
@@ -17,7 +17,7 @@
#include <kdialogbase.h>
#include <ktextedit.h>
#include <tqbitarray.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtimer.h>
const int minPrefixExp = -24;
@@ -313,11 +313,11 @@ bool Item::mouseDoubleClickEvent( const EventInfo &eventInfo )
KDialogBase *dlg = new KDialogBase( 0l, "", true, v->editorCaption(), KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::User1, KDialogBase::Ok, false, KStdGuiItem::clear() );
TQFrame *frame = dlg->makeMainWidget();
- TQVBoxLayout *tqlayout = new TQVBoxLayout( frame, 0, dlg->spacingHint() );
+ TQVBoxLayout *layout = new TQVBoxLayout( frame, 0, dlg->spacingHint() );
KTextEdit *textEdit = new KTextEdit( frame );
textEdit->setTextFormat( PlainText );
textEdit->setText( v->value().toString() );
- tqlayout->addWidget( textEdit, 10 );
+ layout->addWidget( textEdit, 10 );
textEdit->setFocus();
connect( dlg, TQT_SIGNAL( user1Clicked() ), textEdit, TQT_SLOT( clear() ) );
dlg->setMinimumWidth( 600 );
@@ -381,22 +381,22 @@ int Item::level() const
}
-ItemList Item::tqchildren( bool includeGrandChildren ) const
+ItemList Item::children( bool includeGrandChildren ) const
{
if (!includeGrandChildren)
- return m_tqchildren;
+ return m_children;
- ItemList tqchildren = m_tqchildren;
- ItemList::const_iterator end = m_tqchildren.end();
- for ( ItemList::const_iterator it = m_tqchildren.begin(); it != end; ++it )
+ ItemList children = m_children;
+ ItemList::const_iterator end = m_children.end();
+ for ( ItemList::const_iterator it = m_children.begin(); it != end; ++it )
{
if (!*it)
continue;
- tqchildren += (*it)->tqchildren(true);
+ children += (*it)->children(true);
}
- return tqchildren;
+ return children;
}
@@ -417,7 +417,7 @@ void Item::addChild( Item *child )
return;
}
- m_tqchildren.append(child);
+ m_children.append(child);
connect( child, TQT_SIGNAL(removed(Item* )), this, TQT_SLOT(removeChild(Item* )) );
child->setParentItem(this);
@@ -428,10 +428,10 @@ void Item::addChild( Item *child )
void Item::removeChild( Item *child )
{
- if ( !child || !m_tqchildren.contains(child) )
+ if ( !child || !m_children.contains(child) )
return;
- m_tqchildren.remove(child);
+ m_children.remove(child);
disconnect( child, TQT_SIGNAL(removed(Item* )), this, TQT_SLOT(removeChild(Item* )) );
childRemoved(child);
@@ -441,8 +441,8 @@ void Item::removeChild( Item *child )
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 )
+ const ItemList::const_iterator end = m_children.end();
+ for ( ItemList::const_iterator it = m_children.begin(); it != end; ++it )
{
if ( (Item*)*it == item || ( !direct && (*it)->contains( item, false ) ) )
return true;
@@ -468,8 +468,8 @@ void Item::updateZ( int baseZ )
setZ(z);
- const ItemList::const_iterator end = m_tqchildren.end();
- for ( ItemList::const_iterator it = m_tqchildren.begin(); it != end; ++it )
+ const ItemList::const_iterator end = m_children.end();
+ for ( ItemList::const_iterator it = m_children.begin(); it != end; ++it )
{
if (*it)
(*it)->updateZ(baseZ+1);
diff --git a/src/item.h b/src/item.h
index 9710d93..56cf426 100644
--- a/src/item.h
+++ b/src/item.h
@@ -130,7 +130,7 @@ public:
bool isRaised() const { return m_bIsRaised; }
/**
* Sets this item to the given baseZ level, and calls this function for the
- * tqchildren with baseZ incremented by one. Reinherit this function to set
+ * children with baseZ incremented by one. Reinherit this function to set
* the Z of attached stuff (such as nodes).
*/
virtual void updateZ( int baseZ );
@@ -143,12 +143,12 @@ public:
*/
void addChild( Item *child );
/**
- * Returns the list of tqchildren.
+ * Returns the list of children.
* @param if includeGrandChildren is true then this list will also contain
- * the tqchildren's tqchildren, and so on recursively, instead of just the
- * immediate tqchildren.
+ * the children's children, and so on recursively, instead of just the
+ * immediate children.
*/
- ItemList tqchildren( bool includeGrandChildren = false ) const;
+ ItemList children( bool includeGrandChildren = false ) const;
/**
* Returns whether we have the given child as either a direct child, or as
* either a direct or indirect child
@@ -173,7 +173,7 @@ public:
* Reinherit this function if you want to determine what the minimum size is
* that this item can be resized to.
*/
- virtual TQSize tqminimumSize() const { return TQSize(0,0); }
+ virtual TQSize minimumSize() const { return TQSize(0,0); }
int offsetX() const { return m_sizeRect.x(); }
int offsetY() const { return m_sizeRect.y(); }
int width() const { return m_sizeRect.width(); }
@@ -259,17 +259,17 @@ protected slots:
protected:
/**
- * Reinherit this function if you want to do anything with tqchildren. Called
+ * Reinherit this function if you want to do anything with children. Called
* after the parent is changed, with the old parent and the new parent.
*/
virtual void reparented( Item */*oldParent*/, Item */*newParent*/ ) {};
/**
- * Reinherit this function if you want to do anything with tqchildren. Called
+ * Reinherit this function if you want to do anything with children. Called
* after a child has been added.
*/
virtual void childAdded( Item * ) {};
/**
- * Reinherit this function if you want to do anything with tqchildren. Called
+ * Reinherit this function if you want to do anything with children. Called
* after a child has been removed.
*/
virtual void childRemoved( Item * ) {};
@@ -290,7 +290,7 @@ protected:
TQString m_name, m_desc; // Name and description
TQString m_type;
GuardedItem p_parentItem; // If attached to a parent item
- ItemList m_tqchildren;
+ ItemList m_children;
TQGuardedPtr<ItemDocument> p_itemDocument;
TQPointArray m_itemPoints; // The unorientated and unsized item points
diff --git a/src/itemdocument.cpp b/src/itemdocument.cpp
index 283eb5f..c8ded12 100644
--- a/src/itemdocument.cpp
+++ b/src/itemdocument.cpp
@@ -33,7 +33,7 @@
#include <kpopupmenu.h>
#include <kprinter.h>
#include <tqcheckbox.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
#include <tqcursor.h>
#include <tqimage.h>
#include <tqpaintdevicemetrics.h>
@@ -266,7 +266,7 @@ void ItemDocument::print()
p.setClipRect( 0, 0, w, h, TQPainter::CoordPainter );
// Send off the painter for drawing
- m_canvas->tqsetBackgroundPixmap( 0 );
+ m_canvas->setBackgroundPixmap( 0 );
TQRect bounding = canvasBoundingRect();
unsigned int rows = (unsigned) std::ceil( double( bounding.height() ) / double( h ) );
@@ -406,7 +406,7 @@ void ItemDocument::cut()
void ItemDocument::paste()
{
- TQString xml = KApplication::tqclipboard()->text( TQClipboard::Clipboard );
+ TQString xml = KApplication::clipboard()->text( TQClipboard::Clipboard );
if ( xml.isEmpty() )
return;
@@ -672,7 +672,7 @@ void ItemDocument::updateBackground()
}
pm.setDefaultOptimization( TQPixmap::BestOptim );
- m_canvas->tqsetBackgroundPixmap(pm); // and the finale.
+ m_canvas->setBackgroundPixmap(pm); // and the finale.
}
@@ -820,7 +820,7 @@ void ItemDocument::exportToImage()
if ( TQFile::exists( url.path() ) )
{
- int query = KMessageBox::warningYesNo( p_ktechlab, i18n( "A file named \"%1\" already exists. " "Are you sure you want to overwrite it?" ).tqarg( url.fileName() ), i18n( "Overwrite File?" ), i18n( "Overwrite" ), KStdGuiItem::cancel() );
+ int query = KMessageBox::warningYesNo( p_ktechlab, i18n( "A file named \"%1\" already exists. " "Are you sure you want to overwrite it?" ).arg( url.fileName() ), i18n( "Overwrite File?" ), i18n( "Overwrite" ), KStdGuiItem::cancel() );
if ( query == KMessageBox::No ) return;
}
@@ -894,7 +894,7 @@ void ItemDocument::exportToImage()
TQPainter p(outputImage);
- m_canvas->tqsetBackgroundPixmap(TQPixmap());
+ m_canvas->setBackgroundPixmap(TQPixmap());
m_canvas->drawArea( saveArea, &p );
updateBackground();
@@ -924,7 +924,7 @@ void ItemDocument::exportToImage()
saveResult = dynamic_cast<TQPixmap*>(outputImage)->save( url.path(), type );
}
- //if(saveResult == true) KMessageBox::information( this, i18n("Sucessfully exported to \"%1\"").tqarg( url.filename() ), i18n("Image Export") );
+ //if(saveResult == true) KMessageBox::information( this, i18n("Sucessfully exported to \"%1\"").arg( url.filename() ), i18n("Image Export") );
//else KMessageBox::information( this, i18n("Export failed"), i18n("Image Export") );
if ( type == "SVG" )
@@ -1170,7 +1170,7 @@ void CanvasTip::display( const TQPoint &pos )
{
TQString text;
for ( unsigned i = 0; i < num; i++ )
- text += TQString(" %1: %2\n").tqarg( TQString::number(i) ).tqarg( displayText(i) );
+ text += TQString(" %1: %2\n").arg( TQString::number(i) ).arg( displayText(i) );
setText(text);
}
}
@@ -1182,10 +1182,10 @@ TQString CanvasTip::displayText( unsigned num ) const
return TQString();
return TQString(" %1%2V %3%4A ")
- .tqarg( TQString::number( m_v[num] / CNItem::getMultiplier(m_v[num]), 'g', 3 ) )
- .tqarg( CNItem::getNumberMag( m_v[num] ) )
- .tqarg( TQString::number( m_i[num] / CNItem::getMultiplier(m_i[num]), 'g', 3 ) )
- .tqarg( CNItem::getNumberMag( m_i[num] ) );
+ .arg( TQString::number( m_v[num] / CNItem::getMultiplier(m_v[num]), 'g', 3 ) )
+ .arg( CNItem::getNumberMag( m_v[num] ) )
+ .arg( TQString::number( m_i[num] / CNItem::getMultiplier(m_i[num]), 'g', 3 ) )
+ .arg( CNItem::getNumberMag( m_i[num] ) );
}
@@ -1304,9 +1304,9 @@ void Canvas::drawForeground ( TQPainter &p, const TQRect & clip )
return;
}
- p.setBrush( firstView->tqcolorGroup().background() );
+ p.setBrush( firstView->colorGroup().background() );
p.drawRoundRect( x, y, w+2*b, h+2*b, (8*200)/(w+2*b), (8*200)/(h+2*b) );
- t->draw( &p, x+b, y+b, TQRect(), firstView->tqcolorGroup() );
+ t->draw( &p, x+b, y+b, TQRect(), firstView->colorGroup() );
delete t;
}
diff --git a/src/itemdocumentdata.cpp b/src/itemdocumentdata.cpp
index f9085b8..61271f0 100644
--- a/src/itemdocumentdata.cpp
+++ b/src/itemdocumentdata.cpp
@@ -110,7 +110,7 @@ bool ItemDocumentData::loadData( const KURL &url )
TQFile file(target);
if ( !file.open( IO_ReadOnly ) )
{
- KMessageBox::sorry( 0l, i18n("Could not open %1 for reading").tqarg(target) );
+ KMessageBox::sorry( 0l, i18n("Could not open %1 for reading").arg(target) );
return false;
}
@@ -132,7 +132,7 @@ bool ItemDocumentData::fromXML( const TQString &xml )
TQString errorMessage;
if ( !doc.setContent( xml, &errorMessage ) )
{
- KMessageBox::sorry( 0l, i18n("Couldn't parse xml:\n%1").tqarg(errorMessage) );
+ KMessageBox::sorry( 0l, i18n("Couldn't parse xml:\n%1").arg(errorMessage) );
return false;
}
@@ -180,7 +180,7 @@ bool ItemDocumentData::saveData( const KURL &url )
TQFile file( url.path() );
if ( !file.open(IO_WriteOnly) )
{
- KMessageBox::sorry( 0l, i18n("Could not open '%1' for writing. Check that you have write permissions").tqarg(url.path()), i18n("Saving File") );
+ KMessageBox::sorry( 0l, i18n("Could not open '%1' for writing. Check that you have write permissions").arg(url.path()), i18n("Saving File") );
return false;
}
@@ -1001,7 +1001,7 @@ void ItemDocumentData::mergeWithDocument( ItemDocument *itemDocument, bool selec
if (item)
{
//HACK We move the item now before restoreFromItemData is called later, in case it is to be parented
- //(as we don't want to move tqchildren)...
+ //(as we don't want to move children)...
item->move( it.data().x, it.data().y );
}
}
diff --git a/src/itemgroup.cpp b/src/itemgroup.cpp
index ce22a1a..c1ab4da 100644
--- a/src/itemgroup.cpp
+++ b/src/itemgroup.cpp
@@ -52,22 +52,22 @@ ItemList ItemGroup::items( bool excludeParentedItems ) const
do
{
oldSize = items.size();
- ItemList tqchildren;
+ ItemList children;
ItemList::iterator end = parents.end();
for ( ItemList::iterator it = parents.begin(); it != end; ++it )
- tqchildren += (*it)->tqchildren();
+ children += (*it)->children();
- end = tqchildren.end();
- for ( ItemList::iterator it = tqchildren.begin(); it != end; ++it )
+ end = children.end();
+ for ( ItemList::iterator it = children.begin(); it != end; ++it )
{
- if ( tqchildren.contains(*it) > 1 )
+ if ( children.contains(*it) > 1 )
*it = 0l;
}
- tqchildren.remove((Item*)0l);
+ children.remove((Item*)0l);
- items += tqchildren;
- parents = tqchildren;
+ items += children;
+ parents = children;
}
while ( oldSize != items.size() );
@@ -148,19 +148,19 @@ void ItemGroup::registerItem( Item *item )
}
m_itemList += item;
- updateAreSametqStatus();
+ updateAreSameStatus();
}
void ItemGroup::unregisterItem( Item *item )
{
if ( m_itemList.remove(item) > 0 ) {
- updateAreSametqStatus();
+ updateAreSameStatus();
}
}
-void ItemGroup::updateAreSametqStatus()
+void ItemGroup::updateAreSameStatus()
{
b_itemsAreSameType = true;
diff --git a/src/itemgroup.h b/src/itemgroup.h
index 26bdeed..b212541 100644
--- a/src/itemgroup.h
+++ b/src/itemgroup.h
@@ -124,7 +124,7 @@ protected:
* Subclasses must call this to unregister the item with the data interface
*/
void unregisterItem( Item *item );
- void updateAreSametqStatus();
+ void updateAreSameStatus();
ItemList m_itemList;
bool b_itemsAreSameType;
diff --git a/src/iteminterface.cpp b/src/iteminterface.cpp
index 6a60ec6..9fe0527 100644
--- a/src/iteminterface.cpp
+++ b/src/iteminterface.cpp
@@ -237,7 +237,7 @@ TQWidget * ItemInterface::configWidget()
// Create new widget with the toolbar or dialog as the parent
TQWidget * configWidget = new TQWidget( parent, "tbConfigWidget" );
- configWidget->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding, 1, 1 ) );
+ configWidget->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding, 1, 1 ) );
TQHBoxLayout * configLayout = new TQHBoxLayout( configWidget );
// configLayout->setAutoAdd( true );
@@ -396,7 +396,7 @@ TQWidget * ItemInterface::configWidget()
{
TQSizePolicy p( TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed, 1, 1 );
- editWidget->tqsetSizePolicy( p );
+ editWidget->setSizePolicy( p );
editWidget->setMaximumWidth( 250 );
break;
}
diff --git a/src/itemlibrary.cpp b/src/itemlibrary.cpp
index 4d955d2..720c5c7 100644
--- a/src/itemlibrary.cpp
+++ b/src/itemlibrary.cpp
@@ -381,7 +381,7 @@ TQImage ItemLibrary::itemImage( Item *item, const uint maxSize )
p.setPen( item->pen() );
p.setBrush( item->brush() );
- // Now draw the tqshape :-)
+ // Now draw the shape :-)
const bool sel = item->isSelected();
if (sel)
{
diff --git a/src/itemview.cpp b/src/itemview.cpp
index fd2d6af..9370e1b 100644
--- a/src/itemview.cpp
+++ b/src/itemview.cpp
@@ -86,8 +86,8 @@ ItemView::ItemView( ItemDocument * itemDocument, ViewContainer *viewContainer, u
setXMLFile( "ktechlabitemviewui.rc" );
m_pUpdateStatusTmr = new TQTimer(this);
- connect( m_pUpdateStatusTmr, TQT_SIGNAL(timeout()), this, TQT_SLOT(updatetqStatus()) );
- connect( this, TQT_SIGNAL(viewUnfocused()), this, TQT_SLOT(stopUpdatingtqStatus()) );
+ connect( m_pUpdateStatusTmr, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateStatus()) );
+ connect( this, TQT_SIGNAL(viewUnfocused()), this, TQT_SLOT(stopUpdatingStatus()) );
p_itemDocument = itemDocument;
m_zoomLevel = 1.;
@@ -198,7 +198,7 @@ void ItemView::dropEvent( TQDropEvent *event )
return;
TQString text;
- TQDataStream stream( event->tqencodedData(event->format()), IO_ReadOnly );
+ TQDataStream stream( event->encodedData(event->format()), IO_ReadOnly );
stream >> text;
TQPoint position = event->pos();
@@ -278,7 +278,7 @@ void ItemView::contentsMouseMoveEvent( TQMouseEvent *e )
p_itemDocument->m_cmManager->mouseMoveEvent( EventInfo( this, e ) );
if ( !m_pUpdateStatusTmr->isActive() )
- startUpdatingtqStatus();
+ startUpdatingStatus();
}
@@ -306,7 +306,7 @@ void ItemView::contentsWheelEvent( TQWheelEvent *e )
void ItemView::dragEnterEvent( TQDragEnterEvent *event )
{
- startUpdatingtqStatus();
+ startUpdatingStatus();
KURL::List urls;
if ( KURLDrag::decode( event, urls ) )
@@ -321,14 +321,14 @@ void ItemView::dragEnterEvent( TQDragEnterEvent *event )
void ItemView::enterEvent( TQEvent * e )
{
Q_UNUSED(e);
- startUpdatingtqStatus();
+ startUpdatingStatus();
}
void ItemView::leaveEvent( TQEvent * e )
{
Q_UNUSED(e);
- stopUpdatingtqStatus();
+ stopUpdatingStatus();
// Cleanup
setCursor(TQt::ArrowCursor);
@@ -337,7 +337,7 @@ void ItemView::leaveEvent( TQEvent * e )
p_ktechlab->slotChangeStatusbar(TQString());
if ( p_itemDocument )
- p_itemDocument->m_canvasTip->tqsetVisible(false);
+ p_itemDocument->m_canvasTip->setVisible(false);
}
@@ -347,24 +347,24 @@ void ItemView::slotUpdateConfiguration()
m_CVBEditor->setEraseColor( TQt::white );
if ( m_pUpdateStatusTmr->isActive() )
- startUpdatingtqStatus();
+ startUpdatingStatus();
}
-void ItemView::startUpdatingtqStatus()
+void ItemView::startUpdatingStatus()
{
m_pUpdateStatusTmr->stop();
m_pUpdateStatusTmr->start( int(1000./KTLConfig::refreshRate()) );
}
-void ItemView::stopUpdatingtqStatus()
+void ItemView::stopUpdatingStatus()
{
m_pUpdateStatusTmr->stop();
}
-void ItemView::updatetqStatus()
+void ItemView::updateStatus()
{
TQPoint pos = (m_CVBEditor->mapFromGlobal( TQCursor::pos() ) + TQPoint( m_CVBEditor->contentsX(), m_CVBEditor->contentsY() )) / zoomLevel();
@@ -456,7 +456,7 @@ void ItemView::updatetqStatus()
if (p_ktechlab)
p_ktechlab->slotChangeStatusbar(statusbar);
- canvasTip->tqsetVisible(displayTip);
+ canvasTip->setVisible(displayTip);
}
//END class ItemView
diff --git a/src/itemview.h b/src/itemview.h
index e847ed0..3be2a2d 100644
--- a/src/itemview.h
+++ b/src/itemview.h
@@ -44,15 +44,15 @@ class ItemView : public View
void zoomIn();
void zoomOut();
void scrollToMouse( const TQPoint &pos );
- virtual void updatetqStatus();
+ virtual void updateStatus();
protected slots:
/**
* Called when the user changes the configuration.
*/
virtual void slotUpdateConfiguration();
- void startUpdatingtqStatus();
- void stopUpdatingtqStatus();
+ void startUpdatingStatus();
+ void stopUpdatingStatus();
protected:
void updateZoomActions();
diff --git a/src/katemdi.cpp b/src/katemdi.cpp
index 5378396..4c817ea 100644
--- a/src/katemdi.cpp
+++ b/src/katemdi.cpp
@@ -478,7 +478,7 @@ void Sidebar::restoreSession (KConfig *config)
{
ToolView *tv = m_toolviews[firstWrong];
- unsigned int pos = config->readUnsignedNumEntry (TQString ("Kate-MDI-ToolView-%1-Sidebar-Position").tqarg(tv->id), firstWrong);
+ unsigned int pos = config->readUnsignedNumEntry (TQString ("Kate-MDI-ToolView-%1-Sidebar-Position").arg(tv->id), firstWrong);
if (pos != firstWrong)
break;
@@ -493,7 +493,7 @@ void Sidebar::restoreSession (KConfig *config)
{
TmpToolViewSorter s;
s.tv = m_toolviews[i];
- s.pos = config->readUnsignedNumEntry (TQString ("Kate-MDI-ToolView-%1-Sidebar-Position").tqarg(m_toolviews[i]->id), i);
+ s.pos = config->readUnsignedNumEntry (TQString ("Kate-MDI-ToolView-%1-Sidebar-Position").arg(m_toolviews[i]->id), i);
toSort.push_back (s);
}
@@ -508,7 +508,7 @@ void Sidebar::restoreSession (KConfig *config)
}
// then: remove this items from the button bar
- // do this backwards, to minimize the retqlayout efforts
+ // do this backwards, to minimize the relayout efforts
for (int i=m_toolviews.size()-1; i >= (int)firstWrong; --i)
{
removeTab (m_widgetToId[m_toolviews[i]]);
@@ -536,7 +536,7 @@ void Sidebar::restoreSession (KConfig *config)
updateLastSize ();
// restore the own splitter sizes
- TQValueList<int> s = config->readIntListEntry (TQString ("Kate-MDI-Sidebar-%1-Splitter").tqarg(sidebarPosition()));
+ TQValueList<int> s = config->readIntListEntry (TQString ("Kate-MDI-Sidebar-%1-Splitter").arg(sidebarPosition()));
m_ownSplit->setSizes (s);
// show only correct toolviews, remember persistent values ;)
@@ -545,8 +545,8 @@ void Sidebar::restoreSession (KConfig *config)
{
ToolView *tv = m_toolviews[i];
- tv->persistent = config->readBoolEntry (TQString ("Kate-MDI-ToolView-%1-Persistent").tqarg(tv->id), false);
- tv->setVisible (config->readBoolEntry (TQString ("Kate-MDI-ToolView-%1-Visible").tqarg(tv->id), false));
+ tv->persistent = config->readBoolEntry (TQString ("Kate-MDI-ToolView-%1-Persistent").arg(tv->id), false);
+ tv->setVisible (config->readBoolEntry (TQString ("Kate-MDI-ToolView-%1-Visible").arg(tv->id), false));
if (!anyVis)
anyVis = tv->visible();
@@ -569,17 +569,17 @@ void Sidebar::saveSession (KConfig *config)
{
// store the own splitter sizes
TQValueList<int> s = m_ownSplit->sizes();
- config->writeEntry (TQString ("Kate-MDI-Sidebar-%1-Splitter").tqarg(sidebarPosition()), s);
+ config->writeEntry (TQString ("Kate-MDI-Sidebar-%1-Splitter").arg(sidebarPosition()), s);
// store the data about all toolviews in this sidebar ;)
for ( unsigned int i=0; i < m_toolviews.size(); ++i )
{
ToolView *tv = m_toolviews[i];
- config->writeEntry (TQString ("Kate-MDI-ToolView-%1-Position").tqarg(tv->id), tv->sidebar()->sidebarPosition());
- config->writeEntry (TQString ("Kate-MDI-ToolView-%1-Sidebar-Position").tqarg(tv->id), i);
- config->writeEntry (TQString ("Kate-MDI-ToolView-%1-Visible").tqarg(tv->id), tv->visible());
- config->writeEntry (TQString ("Kate-MDI-ToolView-%1-Persistent").tqarg(tv->id), tv->persistent);
+ config->writeEntry (TQString ("Kate-MDI-ToolView-%1-Position").arg(tv->id), tv->sidebar()->sidebarPosition());
+ config->writeEntry (TQString ("Kate-MDI-ToolView-%1-Sidebar-Position").arg(tv->id), i);
+ config->writeEntry (TQString ("Kate-MDI-ToolView-%1-Visible").arg(tv->id), tv->visible());
+ config->writeEntry (TQString ("Kate-MDI-ToolView-%1-Persistent").arg(tv->id), tv->persistent);
}
}
@@ -651,7 +651,7 @@ ToolView *MainWindow::createToolView (const TQString &identifier, KMultiTabBar::
if (m_restoreConfig && m_restoreConfig->hasGroup (m_restoreGroup))
{
m_restoreConfig->setGroup (m_restoreGroup);
- pos = (KMultiTabBar::KMultiTabBarPosition) m_restoreConfig->readNumEntry (TQString ("Kate-MDI-ToolView-%1-Position").tqarg(identifier), pos);
+ pos = (KMultiTabBar::KMultiTabBarPosition) m_restoreConfig->readNumEntry (TQString ("Kate-MDI-ToolView-%1-Position").arg(identifier), pos);
}
ToolView *v = m_sidebars[pos]->addWidget (icon, text, 0);
@@ -710,7 +710,7 @@ bool MainWindow::moveToolView (ToolView *widget, KMultiTabBar::KMultiTabBarPosit
if (m_restoreConfig && m_restoreConfig->hasGroup (m_restoreGroup))
{
m_restoreConfig->setGroup (m_restoreGroup);
- pos = (KMultiTabBar::KMultiTabBarPosition) m_restoreConfig->readNumEntry (TQString ("Kate-MDI-ToolView-%1-Position").tqarg(widget->id), pos);
+ pos = (KMultiTabBar::KMultiTabBarPosition) m_restoreConfig->readNumEntry (TQString ("Kate-MDI-ToolView-%1-Position").arg(widget->id), pos);
}
m_sidebars[pos]->addWidget (widget->icon, widget->text, widget);
@@ -803,7 +803,7 @@ void MainWindow::finishRestore ()
m_restoreConfig->setGroup (m_restoreGroup);
for ( unsigned int i=0; i < m_toolviews.size(); ++i )
{
- KMultiTabBar::KMultiTabBarPosition newPos = (KMultiTabBar::KMultiTabBarPosition) m_restoreConfig->readNumEntry (TQString ("Kate-MDI-ToolView-%1-Position").tqarg(m_toolviews[i]->id), m_toolviews[i]->sidebar()->sidebarPosition());
+ KMultiTabBar::KMultiTabBarPosition newPos = (KMultiTabBar::KMultiTabBarPosition) m_restoreConfig->readNumEntry (TQString ("Kate-MDI-ToolView-%1-Position").arg(m_toolviews[i]->id), m_toolviews[i]->sidebar()->sidebarPosition());
if (m_toolviews[i]->sidebar()->sidebarPosition() != newPos)
{
diff --git a/src/ktechlab.cpp b/src/ktechlab.cpp
index 7910c78..d73d77f 100644
--- a/src/ktechlab.cpp
+++ b/src/ktechlab.cpp
@@ -105,7 +105,7 @@ void KTechlab::show()
void KTechlab::load( const KURL & url )
{
- if ( url.url().tqendsWith( ".ktechlab", false ) )
+ if ( url.url().endsWith( ".ktechlab", false ) )
{
// This is a ktechlab project; it has to be handled separetly from a
// normal file.
@@ -293,9 +293,9 @@ void KTechlab::overlayToolBarScreenshot()
// 128 is a sanity check (widget can do strange things when being destroyed)
if ( toolsWidget && toolsWidget->height() <= 128 )
- grabRect |= toolsWidget->tqgeometry();
+ grabRect |= toolsWidget->geometry();
if ( debugWidget && debugWidget->height() <= 128 )
- grabRect |= debugWidget->tqgeometry();
+ grabRect |= debugWidget->geometry();
if ( !grabRect.isValid() )
return;
@@ -647,8 +647,8 @@ void KTechlab::saveProperties( KConfig *conf )
conf->setGroup("KateMDI");
int scnum = TQApplication::desktop()->screenNumber(parentWidget());
TQRect desk = TQApplication::desktop()->screenGeometry(scnum);
- conf->deleteEntry( TQString::tqfromLatin1("Width %1").tqarg(desk.width()) );
- conf->deleteEntry( TQString::tqfromLatin1("Height %1").tqarg(desk.height()) );
+ conf->deleteEntry( TQString::fromLatin1("Width %1").arg(desk.width()) );
+ conf->deleteEntry( TQString::fromLatin1("Height %1").arg(desk.height()) );
conf->sync();
}
diff --git a/src/languages/flowcode.cpp b/src/languages/flowcode.cpp
index 5356eab..fe575f9 100644
--- a/src/languages/flowcode.cpp
+++ b/src/languages/flowcode.cpp
@@ -173,7 +173,7 @@ TQString FlowCode::generateMicrobe( const ItemList &itemList, MicroSettings *set
continue;
if ( !startPart->outputPart( nodeMapIt.key() ) )
- outputWarning( i18n("Warning: Floating connection for %1").tqarg( startPart->id() ) );
+ outputWarning( i18n("Warning: Floating connection for %1").arg( startPart->id() ) );
}
FlowContainer * fc = dynamic_cast<FlowContainer*>((Item*)*it);
@@ -259,7 +259,7 @@ TQString FlowCode::generateMicrobe( const ItemList &itemList, MicroSettings *set
if ( type.isEmpty() )
continue;
- addCode( TQString("%1 %2 %3").tqarg( type ).tqarg( it.key() ).tqarg( it.data().pins().join(" ") ) );
+ addCode( TQString("%1 %2 %3").arg( type ).arg( it.key() ).arg( it.data().pins().join(" ") ) );
}
}
diff --git a/src/languages/picprogrammer.cpp b/src/languages/picprogrammer.cpp
index 5ef37dd..3200e99 100644
--- a/src/languages/picprogrammer.cpp
+++ b/src/languages/picprogrammer.cpp
@@ -22,7 +22,7 @@
#include <tqfile.h>
#include <kprocess.h>
#include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqdatetime.h>
#include <stdio.h>
@@ -63,7 +63,7 @@ void PicProgrammerSettings::initStaticConfigs()
m_bDoneStaticConfigsInit = true;
ProgrammerConfig config;
- config.description = i18n("Supported programmers: %1").tqarg("JuPic, PICStart Plus, Warp-13");
+ config.description = i18n("Supported programmers: %1").arg("JuPic, PICStart Plus, Warp-13");
config.description += i18n("<br>Interface: Serial Port");
config.initCommand = "";
config.readCommand = "picp %port %device -rp %file";
@@ -75,7 +75,7 @@ void PicProgrammerSettings::initStaticConfigs()
m_staticConfigs[ "PICP" ] = config;
- config.description = i18n("Supported programmers: %1").tqarg("Epic Plus");
+ config.description = i18n("Supported programmers: %1").arg("Epic Plus");
config.description += i18n("<br>Interface: Parallel Port");
config.initCommand = "odyssey init";
config.readCommand = "odyssey %device read %file";
@@ -87,7 +87,7 @@ void PicProgrammerSettings::initStaticConfigs()
m_staticConfigs[ "Odyssey" ] = config;
- config.description = i18n("Supported programmers: %1").tqarg("JDM PIC-Programmer 2, PIC-PG2C");
+ config.description = i18n("Supported programmers: %1").arg("JDM PIC-Programmer 2, PIC-PG2C");
config.description += i18n("<br>Interface: Serial Port");
config.initCommand = "";
config.readCommand = "picprog --output %file --pic %port";
@@ -98,7 +98,7 @@ void PicProgrammerSettings::initStaticConfigs()
m_staticConfigs[ "PICProg" ] = config;
- config.description = i18n("Supported programmers: %1").tqarg("Epic Plus");
+ config.description = i18n("Supported programmers: %1").arg("Epic Plus");
config.description += i18n("<br>Interface: Parallel Port");
config.initCommand = "";
config.readCommand = "dump84 --dump-all --output=%file";
@@ -109,7 +109,7 @@ void PicProgrammerSettings::initStaticConfigs()
m_staticConfigs[ "prog84" ] = config;
- config.description = i18n("Supported programmers: %1").tqarg("Kit 149, Kit 150");
+ config.description = i18n("Supported programmers: %1").arg("Kit 149, Kit 150");
config.description += i18n("<br>Interface: USB Port");
config.initCommand = "";
config.readCommand = "pp -d %device -r %file";
@@ -120,7 +120,7 @@ void PicProgrammerSettings::initStaticConfigs()
m_staticConfigs[ "PP" ] = config;
- config.description = i18n("Supported programmers: %1").tqarg("Wisp628");
+ config.description = i18n("Supported programmers: %1").arg("Wisp628");
config.description += i18n("<br>Interface: Serial Port");
config.initCommand = "";
config.readCommand = "xwisp ID %device PORT %device DUMP";
@@ -132,7 +132,7 @@ void PicProgrammerSettings::initStaticConfigs()
#if 0
- config.description = i18n("Supported programmers: %1").tqarg("Epic Plus, JDM PIC-Programmer 2, PICCOLO, PICCOLO Grande, Trivial HVP Programmer");
+ config.description = i18n("Supported programmers: %1").arg("Epic Plus, JDM PIC-Programmer 2, PICCOLO, PICCOLO Grande, Trivial HVP Programmer");
config.description += i18n("<br>Interface: Serial Port and Parallel Port");
config.initCommand = "";
config.readCommand = "";
@@ -145,7 +145,7 @@ void PicProgrammerSettings::initStaticConfigs()
config.executable = "";
- config.description = i18n("Supported programmers: %1").tqarg("Trivial LVP programmer, Trivial HVP Programmer");
+ config.description = i18n("Supported programmers: %1").arg("Trivial LVP programmer, Trivial HVP Programmer");
config.description += i18n("<br>Interface: Parallel Port");
config.initCommand = "";
config.readCommand = "";
@@ -156,7 +156,7 @@ void PicProgrammerSettings::initStaticConfigs()
m_staticConfigs[ "PicPrg2" ] = config;
- config.description = i18n("Supported programmers: %1").tqarg("El Cheapo");
+ config.description = i18n("Supported programmers: %1").arg("El Cheapo");
config.description += i18n("<br>Interface: Parallel Port");
config.initCommand = "";
config.readCommand = "";
@@ -167,7 +167,7 @@ void PicProgrammerSettings::initStaticConfigs()
m_staticConfigs[ "PP06" ] = config;
- config.description = i18n("Supported programmers: %1").tqarg("NOPPP");
+ config.description = i18n("Supported programmers: %1").arg("NOPPP");
config.description += i18n("<br>Interface: Parallel Port");
config.initCommand = "";
config.readCommand = "";
@@ -178,7 +178,7 @@ void PicProgrammerSettings::initStaticConfigs()
m_staticConfigs[ "NOPPP" ] = config;
- config.description = i18n("Supported programmers: %1").tqarg("SNOPPP");
+ config.description = i18n("Supported programmers: %1").arg("SNOPPP");
config.description += i18n("<br>Interface: Parallel Port");
config.initCommand = "";
config.readCommand = "";
@@ -232,7 +232,7 @@ void PicProgrammerSettings::save( KConfig * config )
ProgrammerConfigMap::iterator end = m_customConfigs.end();
for ( ProgrammerConfigMap::iterator it = m_customConfigs.begin(); it != end; ++it )
{
- config->setGroup( TQString("CustomProgrammer_%1").tqarg(at++) );
+ config->setGroup( TQString("CustomProgrammer_%1").arg(at++) );
config->writeEntry( "Name", it.key() );
config->writeEntry( "InitCommand", it.data().initCommand );
diff --git a/src/languages/processchain.cpp b/src/languages/processchain.cpp
index 6f5c95a..00edbb8 100644
--- a/src/languages/processchain.cpp
+++ b/src/languages/processchain.cpp
@@ -56,7 +56,7 @@ ProcessChain::ProcessChain( ProcessOptions options, KTechlab * ktechlab, const c
else
target = options.targetFile();
- LanguageManager::self()->logView()->addOutput( i18n("Building: %1").tqarg( target ), LogView::ot_important );
+ LanguageManager::self()->logView()->addOutput( i18n("Building: %1").arg( target ), LogView::ot_important );
TQTimer::singleShot( 0, this, TQT_SLOT(compile()) );
}
diff --git a/src/languages/sdcc.cpp b/src/languages/sdcc.cpp
index ea1845d..96cf54c 100644
--- a/src/languages/sdcc.cpp
+++ b/src/languages/sdcc.cpp
@@ -40,7 +40,7 @@ void SDCC::processInput( ProcessOptions options )
MicroInfo * info = MicroLibrary::self()->microInfoWithID( options.m_picID );
if (!info)
{
- outputError( i18n("Could not find PIC with ID \"%1\".").tqarg(options.m_picID) );
+ outputError( i18n("Could not find PIC with ID \"%1\".").arg(options.m_picID) );
return;
}
@@ -50,7 +50,7 @@ void SDCC::processInput( ProcessOptions options )
//BEGIN Pass custom sdcc options
-#define ARG(text,option) if ( KTLConfig::text() ) *m_languageProcess << ( TQString("--%1").tqarg(option) );
+#define ARG(text,option) if ( KTLConfig::text() ) *m_languageProcess << ( TQString("--%1").arg(option) );
// General
ARG( sDCC_nostdlib, "nostdlib" )
ARG( sDCC_nostdinc, "nostdinc" )
diff --git a/src/mechanics/mechanicsgroup.cpp b/src/mechanics/mechanicsgroup.cpp
index 900eb92..2c577c8 100644
--- a/src/mechanics/mechanicsgroup.cpp
+++ b/src/mechanics/mechanicsgroup.cpp
@@ -71,9 +71,9 @@ void MechanicsGroup::removeChildren( Item *item )
if (!item)
return;
- const ItemList tqchildren = item->tqchildren();
- const ItemList::const_iterator end = tqchildren.end();
- for ( ItemList::const_iterator it = tqchildren.begin(); it != end; ++it )
+ const ItemList children = item->children();
+ const ItemList::const_iterator end = children.end();
+ for ( ItemList::const_iterator it = children.begin(); it != end; ++it )
{
removeChildren(*it);
removeItem(*it);
diff --git a/src/mechanics/mechanicsgroup.h b/src/mechanics/mechanicsgroup.h
index 0908d66..1ea2dc5 100644
--- a/src/mechanics/mechanicsgroup.h
+++ b/src/mechanics/mechanicsgroup.h
@@ -42,7 +42,7 @@ public:
*/
void setRaised( bool isRaised );
/**
- * Removes all the tqchildren of the given item from the group
+ * Removes all the children of the given item from the group
*/
void removeChildren( Item *item );
bool addItem( Item *item );
diff --git a/src/mechanics/mechanicsitem.cpp b/src/mechanics/mechanicsitem.cpp
index 96c4adf..81340b4 100644
--- a/src/mechanics/mechanicsitem.cpp
+++ b/src/mechanics/mechanicsitem.cpp
@@ -206,8 +206,8 @@ void MechanicsItem::updateMechanicsInfoCombined()
double mass_x = 0.;
double mass_y = 0.;
- const ItemList::const_iterator end = m_tqchildren.end();
- for ( ItemList::const_iterator it = m_tqchildren.begin(); it != end; ++it )
+ const ItemList::const_iterator end = m_children.end();
+ for ( ItemList::const_iterator it = m_children.begin(); it != end; ++it )
{
MechanicsItem *child = dynamic_cast<MechanicsItem*>((Item*)*it);
if (child)
diff --git a/src/mechanics/mechanicsitem.h b/src/mechanics/mechanicsitem.h
index 3c8f7a1..712ff3c 100644
--- a/src/mechanics/mechanicsitem.h
+++ b/src/mechanics/mechanicsitem.h
@@ -158,12 +158,12 @@ public:
PositionInfo relativePosition() const { return m_relativePosition; }
/**
* Returns the mechanics info for this item (so not taking into account that
- * of attached tqchildren)
+ * of attached children)
*/
MechanicsInfo *mechanicsInfo() { return &m_mechanicsInfo; }
/**
* Returns the combined mechanics info for this item (which takes into
- * account that of attached tqchildren).
+ * account that of attached children).
*/
CombinedMechanicsInfo *mechanicsInfoCombined() { return &m_mechanicsInfoCombined; }
/**
diff --git a/src/node.cpp b/src/node.cpp
index be2e04b..6155c06 100644
--- a/src/node.cpp
+++ b/src/node.cpp
@@ -83,7 +83,7 @@ void Node::setVisible( bool yes )
if ( isVisible() == yes )
return;
- TQCanvasPolygon::tqsetVisible(yes);
+ TQCanvasPolygon::setVisible(yes);
const ConnectorList::iterator inputEnd = m_inputConnectorList.end();
for ( ConnectorList::iterator it = m_inputConnectorList.begin(); it != inputEnd; ++it )
diff --git a/src/node.h b/src/node.h
index f5e5f0b..271fdf1 100644
--- a/src/node.h
+++ b/src/node.h
@@ -177,7 +177,7 @@ public:
void removeNullConnectors();
/**
- * Draw tqshape. Note that this has to remain public.
+ * Draw shape. Note that this has to remain public.
*/
virtual void drawShape( TQPainter &p ) = 0;
diff --git a/src/picitem.cpp b/src/picitem.cpp
index 20a2f4e..c60fd5d 100644
--- a/src/picitem.cpp
+++ b/src/picitem.cpp
@@ -377,10 +377,10 @@ void PicItem::updateVisibility()
const PinItemList::iterator end = m_pinItemList.end();
for ( PinItemList::iterator it = m_pinItemList.begin(); it != end; ++it )
- (*it)->tqsetVisible(m_bExpanded);
+ (*it)->setVisible(m_bExpanded);
if ( Button * btn = button("settings") )
- btn->tqsetVisible(m_bExpanded);
+ btn->setVisible(m_bExpanded);
}
diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp
index 3a6565c..2bdca82 100644
--- a/src/projectmanager.cpp
+++ b/src/projectmanager.cpp
@@ -192,11 +192,11 @@ ProjectItem::ProjectItem( ProjectItem * parent, Type type, ProjectManager * proj
ProjectItem::~ProjectItem()
{
- m_tqchildren.remove( (ProjectItem*)0l );
- ProjectItemList::iterator end = m_tqchildren.end();
- for ( ProjectItemList::iterator it = m_tqchildren.begin(); it != end; ++it )
+ m_children.remove( (ProjectItem*)0l );
+ ProjectItemList::iterator end = m_children.end();
+ for ( ProjectItemList::iterator it = m_children.begin(); it != end; ++it )
(*it)->deleteLater();
- m_tqchildren.clear();
+ m_children.clear();
delete m_pILVItem;
m_pILVItem = 0l;
@@ -254,10 +254,10 @@ void ProjectItem::updateILVItemPixmap()
void ProjectItem::addChild( ProjectItem * child )
{
- if ( !child || m_tqchildren.contains(child) )
+ if ( !child || m_children.contains(child) )
return;
- m_tqchildren << child;
+ m_children << child;
child->setILVItem( m_pILVItem ?
new ILVItem( m_pILVItem, child->name() ) :
@@ -283,9 +283,9 @@ void ProjectItem::updateControlChildMicroIDs()
break;
}
- m_tqchildren.remove( (ProjectItem*)0l );
- ProjectItemList::iterator end = m_tqchildren.end();
- for ( ProjectItemList::iterator it = m_tqchildren.begin(); it != end; ++it )
+ m_children.remove( (ProjectItem*)0l );
+ ProjectItemList::iterator end = m_children.end();
+ for ( ProjectItemList::iterator it = m_children.begin(); it != end; ++it )
(*it)->setUseParentMicroID( control );
}
@@ -420,7 +420,7 @@ bool ProjectItem::build( ProcessOptionsList * pol )
if ( outputURL().isEmpty() )
{
- KMessageBox::sorry( 0l, i18n("Don't know how to build \"%1\" (output url is empty).").tqarg(name()) );
+ KMessageBox::sorry( 0l, i18n("Don't know how to build \"%1\" (output url is empty).").arg(name()) );
return false;
}
@@ -431,7 +431,7 @@ bool ProjectItem::build( ProcessOptionsList * pol )
ProjectItem * lib = projectInfo->findItem( projectInfo->directory() + *it );
if ( !lib )
{
- KMessageBox::sorry( 0l, i18n("Don't know how to build \"%1\" (library does not exist in project).").tqarg(*it) );
+ KMessageBox::sorry( 0l, i18n("Don't know how to build \"%1\" (library does not exist in project).").arg(*it) );
return false;
}
@@ -440,10 +440,10 @@ bool ProjectItem::build( ProcessOptionsList * pol )
}
- // Build all tqchildren
- m_tqchildren.remove( (ProjectItem*)0l );
- ProjectItemList::iterator cend = m_tqchildren.end();
- for ( ProjectItemList::iterator it = m_tqchildren.begin(); it != cend; ++it )
+ // Build all children
+ m_children.remove( (ProjectItem*)0l );
+ ProjectItemList::iterator cend = m_children.end();
+ for ( ProjectItemList::iterator it = m_children.begin(); it != cend; ++it )
{
if ( ! (*it)->build(pol) )
return false;
@@ -461,7 +461,7 @@ bool ProjectItem::build( ProcessOptionsList * pol )
switch ( outputType() )
{
case UnknownOutput:
- KMessageBox::sorry( 0l, i18n("Don't know how to build \"%1\" (unknown output type).").tqarg(name()) );
+ KMessageBox::sorry( 0l, i18n("Don't know how to build \"%1\" (unknown output type).").arg(name()) );
return false;
case ProgramOutput:
@@ -494,9 +494,9 @@ bool ProjectItem::build( ProcessOptionsList * pol )
TQStringList inputFiles;
// Link child objects
- m_tqchildren.remove( (ProjectItem*)0l );
- ProjectItemList::iterator cend = m_tqchildren.end();
- for ( ProjectItemList::iterator it = m_tqchildren.begin(); it != cend; ++it )
+ m_children.remove( (ProjectItem*)0l );
+ ProjectItemList::iterator cend = m_children.end();
+ for ( ProjectItemList::iterator it = m_children.begin(); it != cend; ++it )
inputFiles << (*it)->outputURL().path();
po.setInputFiles(inputFiles);
@@ -565,8 +565,8 @@ TQDomElement ProjectItem::toDomElement( TQDomDocument & doc, const KURL & baseUR
node.appendChild( ProcessingOptions::toDomElement( doc, baseURL ) );
- ProjectItemList::const_iterator end = m_tqchildren.end();
- for ( ProjectItemList::const_iterator it = m_tqchildren.begin(); it != end; ++it )
+ ProjectItemList::const_iterator end = m_children.end();
+ for ( ProjectItemList::const_iterator it = m_children.begin(); it != end; ++it )
{
if (*it)
node.appendChild( (*it)->toDomElement( doc, baseURL ) );
@@ -580,8 +580,8 @@ KURL::List ProjectItem::childOutputURLs( unsigned types, unsigned outputTypes )
{
KURL::List urls;
- ProjectItemList::const_iterator end = m_tqchildren.end();
- for ( ProjectItemList::const_iterator it = m_tqchildren.begin(); it != end; ++it )
+ ProjectItemList::const_iterator end = m_children.end();
+ for ( ProjectItemList::const_iterator it = m_children.begin(); it != end; ++it )
{
if (!*it)
continue;
@@ -601,8 +601,8 @@ ProjectItem * ProjectItem::findItem( const KURL & url )
if ( this->url() == url )
return this;
- ProjectItemList::const_iterator end = m_tqchildren.end();
- for ( ProjectItemList::const_iterator it = m_tqchildren.begin(); it != end; ++it )
+ ProjectItemList::const_iterator end = m_children.end();
+ for ( ProjectItemList::const_iterator it = m_children.begin(); it != end; ++it )
{
if (!*it)
continue;
@@ -622,9 +622,9 @@ bool ProjectItem::closeOpenFiles()
if ( doc && !doc->fileClose() )
return false;
- m_tqchildren.remove( (ProjectItem*)0l );
- ProjectItemList::iterator end = m_tqchildren.end();
- for ( ProjectItemList::iterator it = m_tqchildren.begin(); it != end; ++it )
+ m_children.remove( (ProjectItem*)0l );
+ ProjectItemList::iterator end = m_children.end();
+ for ( ProjectItemList::iterator it = m_children.begin(); it != end; ++it )
{
if ( !(*it)->closeOpenFiles() )
return false;
@@ -668,9 +668,9 @@ void ProjectItem::addFile( const KURL & url )
if ( url.isEmpty() )
return;
- m_tqchildren.remove( (ProjectItem*)0l );
- ProjectItemList::iterator end = m_tqchildren.end();
- for ( ProjectItemList::iterator it = m_tqchildren.begin(); it != end; ++it )
+ m_children.remove( (ProjectItem*)0l );
+ ProjectItemList::iterator end = m_children.end();
+ for ( ProjectItemList::iterator it = m_children.begin(); it != end; ++it )
{
if ( (*it)->type() == FileType && (*it)->url() == url )
return;
@@ -788,7 +788,7 @@ bool ProjectInfo::open( const KURL & url )
TQFile file(target);
if ( !file.open( IO_ReadOnly ) )
{
- KMessageBox::sorry( 0l, i18n("Could not open %1 for reading").tqarg(target) );
+ KMessageBox::sorry( 0l, i18n("Could not open %1 for reading").arg(target) );
return false;
}
@@ -805,7 +805,7 @@ bool ProjectInfo::open( const KURL & url )
TQString errorMessage;
if ( !doc.setContent( xml, &errorMessage ) )
{
- KMessageBox::sorry( 0l, i18n("Couldn't parse xml:\n%1").tqarg(errorMessage) );
+ KMessageBox::sorry( 0l, i18n("Couldn't parse xml:\n%1").arg(errorMessage) );
return false;
}
@@ -845,7 +845,7 @@ bool ProjectInfo::save()
TQFile file( m_url.path() );
if ( file.open(IO_WriteOnly) == false )
{
- KMessageBox::sorry( NULL, i18n("Project could not be saved to \"%1\"").tqarg(m_url.path()), i18n("Saving Project") );
+ KMessageBox::sorry( NULL, i18n("Project could not be saved to \"%1\"").arg(m_url.path()), i18n("Saving Project") );
return false;
}
@@ -857,9 +857,9 @@ bool ProjectInfo::save()
// root.appendChild( LinkerOptions::toDomElement(doc) );
// root.appendChild( ProcessingOptions::toDomElement(doc) );
- m_tqchildren.remove( (ProjectItem*)0l );
- ProjectItemList::const_iterator end = m_tqchildren.end();
- for ( ProjectItemList::const_iterator it = m_tqchildren.begin(); it != end; ++it )
+ m_children.remove( (ProjectItem*)0l );
+ ProjectItemList::const_iterator end = m_children.end();
+ for ( ProjectItemList::const_iterator it = m_children.begin(); it != end; ++it )
root.appendChild( (*it)->toDomElement( doc, m_url ) );
TQTextStream stream(&file);
@@ -1130,7 +1130,7 @@ void ProjectManager::slotRemoveSelected()
if ( !currentItem )
return;
- int choice = KMessageBox::questionYesNo( this, i18n("Do you really want to remove \"%1\"?").tqarg( currentItem->text(0) ), i18n("Remove Project File?"), KGuiItem(i18n("Remove")), KGuiItem(i18n("Cancel")) );
+ int choice = KMessageBox::questionYesNo( this, i18n("Do you really want to remove \"%1\"?").arg( currentItem->text(0) ), i18n("Remove Project File?"), KGuiItem(i18n("Remove")), KGuiItem(i18n("Cancel")) );
if ( choice == KMessageBox::No )
return;
diff --git a/src/projectmanager.h b/src/projectmanager.h
index 33d239b..54f873f 100644
--- a/src/projectmanager.h
+++ b/src/projectmanager.h
@@ -160,11 +160,11 @@ class ProjectItem : public TQObject, public LinkerOptions, public ProcessingOpti
void setILVItem( ILVItem * ilvItem );
/**
- * Adds the child to the list of tqchildren, and creates an ILVItem for it
+ * Adds the child to the list of children, and creates an ILVItem for it
* in the project tree view.
*/
void addChild( ProjectItem * child );
- ProjectItemList tqchildren() const { return m_tqchildren; }
+ ProjectItemList children() const { return m_children; }
void setName( const TQString & name );
TQString name() const { return m_name; }
@@ -180,12 +180,12 @@ class ProjectItem : public TQObject, public LinkerOptions, public ProcessingOpti
OutputType outputType() const;
/**
- * Returns a list of output urls of the tqchildren and their recursively
- * contained tqchildren (does not include the url for this project item).
+ * Returns a list of output urls of the children and their recursively
+ * contained children (does not include the url for this project item).
* @param types An OR'ed list of ProjectItem::Type values for the
- * tqchildren.
+ * children.
* @param outputTypes An OR'ed list of ProjectItem::OutputType values
- * for the tqchildren.
+ * for the children.
*/
KURL::List childOutputURLs( unsigned types = AllTypes, unsigned outputTypes = AllOutputs ) const;
@@ -210,7 +210,7 @@ class ProjectItem : public TQObject, public LinkerOptions, public ProcessingOpti
virtual TQString microID() const;
/**
- * Searches this item and the tqchildren for an item for the given url,
+ * Searches this item and the children for an item for the given url,
* return null if no such item could be found.
*/
ProjectItem * findItem( const KURL & url );
@@ -222,7 +222,7 @@ class ProjectItem : public TQObject, public LinkerOptions, public ProcessingOpti
KURL m_url;
TQString m_name;
- ProjectItemList m_tqchildren;
+ ProjectItemList m_children;
Type m_type;
KTechlab * p_ktechlab;
diff --git a/src/recentfilesaction.cpp b/src/recentfilesaction.cpp
index deba448..22f0d24 100644
--- a/src/recentfilesaction.cpp
+++ b/src/recentfilesaction.cpp
@@ -86,7 +86,7 @@ void RecentFilesAction::loadEntries()
// read file list
for( unsigned int i = 1 ; i <= m_maxItems ; i++ )
{
- key = TQString( "File%1" ).tqarg( i );
+ key = TQString( "File%1" ).arg( i );
value = config->readPathEntry( key );
if (!value.isNull())
@@ -116,7 +116,7 @@ void RecentFilesAction::saveEntries()
// write file list
for( unsigned int i = 1 ; i <= lst.count() ; i++ )
{
- key = TQString( "File%1" ).tqarg( i );
+ key = TQString( "File%1" ).arg( i );
value = lst[ i - 1 ];
config->writePathEntry( key, value );
}
diff --git a/src/resizeoverlay.cpp b/src/resizeoverlay.cpp
index 4b17794..3082057 100644
--- a/src/resizeoverlay.cpp
+++ b/src/resizeoverlay.cpp
@@ -45,7 +45,7 @@ void ResizeOverlay::showResizeHandles( bool show )
const ResizeHandleMap::iterator end = m_resizeHandleMap.end();
for ( ResizeHandleMap::iterator it = m_resizeHandleMap.begin(); it != end; ++it )
{
- it.data()->tqsetVisible(b_showResizeHandles && b_visible);
+ it.data()->setVisible(b_showResizeHandles && b_visible);
}
}
@@ -56,7 +56,7 @@ void ResizeOverlay::setVisible( bool visible )
const ResizeHandleMap::iterator end = m_resizeHandleMap.end();
for ( ResizeHandleMap::iterator it = m_resizeHandleMap.begin(); it != end; ++it )
{
- it.data()->tqsetVisible(b_showResizeHandles && b_visible);
+ it.data()->setVisible(b_showResizeHandles && b_visible);
}
}
@@ -345,8 +345,8 @@ TQRect RectangularOverlay::getSizeRect( bool *ok, bool *widthOk, bool *heightOk
int(m_tl->y() - p_item->y()),
width, height );
- *widthOk = sizeRect.width() >= p_item->tqminimumSize().width();
- *heightOk = sizeRect.height() >= p_item->tqminimumSize().height();
+ *widthOk = sizeRect.width() >= p_item->minimumSize().width();
+ *heightOk = sizeRect.height() >= p_item->minimumSize().height();
*ok = *widthOk && *heightOk;
return sizeRect;
diff --git a/src/textdocument.cpp b/src/textdocument.cpp
index 77cfb30..53d98e4 100644
--- a/src/textdocument.cpp
+++ b/src/textdocument.cpp
@@ -603,9 +603,9 @@ void TextDocument::slotUpdateMarksInfo()
{
if ( mark->type & Bookmark )
{
- KAction * a = new KAction( i18n("%1 - %2").tqarg( TQString::number( mark->line+1 ) ).tqarg( m_doc->textLine(mark->line) ),
+ KAction * a = new KAction( i18n("%1 - %2").arg( TQString::number( mark->line+1 ) ).arg( m_doc->textLine(mark->line) ),
0, this, TQT_SLOT(slotBookmarkRequested()), this,
- TQString("bookmark_%1").tqarg(TQString::number(mark->line).ascii()) );
+ TQString("bookmark_%1").arg(TQString::number(mark->line).ascii()) );
m_bookmarkActions.append(a);
}
}
diff --git a/src/textview.cpp b/src/textview.cpp
index fd456bc..e5c4648 100644
--- a/src/textview.cpp
+++ b/src/textview.cpp
@@ -262,7 +262,7 @@ void TextView::slotCursorPositionChanged()
uint line, column;
m_view->cursorPosition( &line, &column );
- m_statusBar->changeItem( i18n(" Line: %1 Col: %2 ").tqarg(TQString::number(line+1)).tqarg(TQString::number(column+1)), ViewStatusBar::LineCol );
+ m_statusBar->changeItem( i18n(" Line: %1 Col: %2 ").arg(TQString::number(line+1)).arg(TQString::number(column+1)), ViewStatusBar::LineCol );
slotUpdateMarksInfo();
}
@@ -369,7 +369,7 @@ void TextView::slotWordUnhovered()
//BEGIN class TextViewEventFilter
TextViewEventFilter::TextViewEventFilter( TextView * textView )
{
- m_hovertqStatus = Sleeping;
+ m_hoverStatus = Sleeping;
m_pTextView = textView;
m_lastLine = m_lastCol = -1;
@@ -410,14 +410,14 @@ bool TextViewEventFilter::eventFilter( TQObject *, TQEvent * e )
void TextViewEventFilter::hoverTimeout()
{
m_pSleepTimer->stop();
- m_hovertqStatus = Active;
+ m_hoverStatus = Active;
emit wordHoveredOver( m_lastWord, m_lastLine, m_lastCol );
}
void TextViewEventFilter::gotoSleep()
{
- m_hovertqStatus = Sleeping;
+ m_hoverStatus = Sleeping;
m_lastWord = TQString();
emit wordUnhovered();
m_pHoverTimer->stop();
@@ -441,8 +441,8 @@ void TextViewEventFilter::updateHovering( const TQString & currentWord, int line
if ( currentWord.isEmpty() )
{
- if ( m_hovertqStatus == Active )
- m_hovertqStatus = Hidden;
+ if ( m_hoverStatus == Active )
+ m_hoverStatus = Hidden;
emit wordUnhovered();
if ( !m_pSleepTimer->isActive() )
@@ -451,7 +451,7 @@ void TextViewEventFilter::updateHovering( const TQString & currentWord, int line
return;
}
- if ( m_hovertqStatus != Sleeping )
+ if ( m_hoverStatus != Sleeping )
emit wordHoveredOver( currentWord, line, col );
else
m_pHoverTimer->start( 700, true );
diff --git a/src/textview.h b/src/textview.h
index 604b52b..0523750 100644
--- a/src/textview.h
+++ b/src/textview.h
@@ -141,7 +141,7 @@ class TextViewEventFilter : public TQObject
void slotNoWordTimeout();
protected:
- enum HovertqStatus
+ enum HoverStatus
{
/**
* We are currently hovering - wordHoveredOver was emitted, and
@@ -186,7 +186,7 @@ class TextViewEventFilter : public TQObject
TQString m_lastWord;
int m_lastLine;
int m_lastCol;
- HovertqStatus m_hovertqStatus;
+ HoverStatus m_hoverStatus;
};
#endif
diff --git a/src/variablelabel.cpp b/src/variablelabel.cpp
index 4601804..0d0472c 100644
--- a/src/variablelabel.cpp
+++ b/src/variablelabel.cpp
@@ -27,7 +27,7 @@ VariableLabel::VariableLabel( TextView * parent )
setAutoMask( FALSE );
setFrameStyle( TQFrame::Plain | TQFrame::Box );
setLineWidth( 1 );
- tqsetAlignment( AlignAuto | AlignTop );
+ setAlignment( AlignAuto | AlignTop );
setIndent(0);
polish();
adjustSize();
@@ -77,7 +77,7 @@ void VariableLabel::setValue( unsigned value )
void VariableLabel::updateText()
{
if ( m_pRegisterInfo )
- setText( TQString("%1 = %2").tqarg( m_registerName ).tqarg( SymbolViewer::self()->toDisplayString( m_pRegisterInfo->value() ) ) );
+ setText( TQString("%1 = %2").arg( m_registerName ).arg( SymbolViewer::self()->toDisplayString( m_pRegisterInfo->value() ) ) );
else if ( m_value != -1 )
setText( TQString::number( m_value ) );
diff --git a/src/view.cpp b/src/view.cpp
index a5d2c20..2b03246 100644
--- a/src/view.cpp
+++ b/src/view.cpp
@@ -49,9 +49,9 @@ class KVSSBSep : public TQWidget {
void paintEvent( TQPaintEvent *e )
{
TQPainter p( this );
- p.setPen( tqcolorGroup().shadow() );
+ p.setPen( colorGroup().shadow() );
p.drawLine( e->rect().left(), 0, e->rect().right(), 0 );
- p.setPen( ((View*)parentWidget())->isFocused() ? tqcolorGroup().light() : tqcolorGroup().midlight() );
+ p.setPen( ((View*)parentWidget())->isFocused() ? colorGroup().light() : colorGroup().midlight() );
p.drawLine( e->rect().left(), 1, e->rect().right(), 1 );
}
};
diff --git a/src/viewcontainer.cpp b/src/viewcontainer.cpp
index 35635d2..c1cb36c 100644
--- a/src/viewcontainer.cpp
+++ b/src/viewcontainer.cpp
@@ -29,11 +29,11 @@ ViewContainer::ViewContainer( const TQString & caption, KTechlab * ktechlab, TQW
if (ktechlab)
connect( ktechlab, TQT_SIGNAL(needUpdateCaptions()), this, TQT_SLOT(updateCaption()) );
- TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
+ TQHBoxLayout *layout = new TQHBoxLayout(this);
m_baseViewArea = new ViewArea( this, this, 0, "viewarea_0" );
connect( m_baseViewArea, TQT_SIGNAL(destroyed(TQObject* )), this, TQT_SLOT(baseViewAreaDestroyed(TQObject* )) );
- tqlayout->addWidget(m_baseViewArea);
+ layout->addWidget(m_baseViewArea);
m_activeViewArea = 0;
b_focused = false;
diff --git a/src/viewcontainer.h b/src/viewcontainer.h
index 50458b6..94a71e6 100644
--- a/src/viewcontainer.h
+++ b/src/viewcontainer.h
@@ -68,7 +68,7 @@ public:
*/
ViewArea *createViewArea( Position position, uint id );
/**
- * Adds the given View to the main part of the tqlayout
+ * Adds the given View to the main part of the layout
*/
void setView( View *view );
/**
@@ -82,7 +82,7 @@ public:
void restoreState( KConfig *config, int id, const TQString &groupName );
/**
* Returns true if this ViewArea can save useful information as to its state
- * (i.e. it's tqchildren can save useful information about their state, or has
+ * (i.e. it's children can save useful information about their state, or has
* a view with a url in it)
*/
bool canSaveUsefulStateInfo() const;
@@ -197,7 +197,7 @@ public:
*/
void setIdUsed( int id );
/**
- * Writes the state of the View Container (tqlayout of views and view URLs)
+ * Writes the state of the View Container (layout of views and view URLs)
* to the given KConfig. Doesn't change the group - so preset it if
* needed!
*/
@@ -218,7 +218,7 @@ public:
int uniqueNewId();
/**
* Returns true if this ViewArea can save useful information as to its state
- * (i.e. it's tqchildren can save useful information about their state, or has
+ * (i.e. it's children can save useful information about their state, or has
* a view with a url in it)
*/
bool canSaveUsefulStateInfo() const;