Compare commits

...

80 Commits

Author SHA1 Message Date
Slávek Banko 4fce7d2c29
Remove cmake submodule since it has now been replaced by cmake-trinity dependency. 7 months ago
TDE Gitea 57bef1f1a9 Reset submodule main/applications/ktechlab/cmake to latest HEAD 8 months ago
TDE Gitea 37f3008377 Reset submodule main/applications/ktechlab/cmake to latest HEAD 11 months ago
TDE Gitea 8b4320d0ab Reset submodule main/applications/ktechlab/cmake to latest HEAD 12 months ago
TDE Gitea 92e1a25b54 Reset submodule main/applications/ktechlab/cmake to latest HEAD 12 months ago
TDE Gitea 5ada28a044 Reset submodule main/applications/ktechlab/admin to latest HEAD 12 months ago
TDE Gitea 8036759121 Reset submodule main/applications/ktechlab/cmake to latest HEAD 1 year ago
TDE Gitea 9e6bc70aeb Reset submodule main/applications/ktechlab/cmake to latest HEAD 1 year ago
TDE Gitea a14ac8fb0f Reset submodule main/applications/ktechlab/admin to latest HEAD 1 year ago
TDE Gitea 4f04d10e27 Reset submodule main/applications/ktechlab/cmake to latest HEAD 1 year ago
TDE Gitea 3ab28be8a7 Reset submodule main/applications/ktechlab/admin to latest HEAD 1 year ago
TDE Gitea d280883f9b Reset submodule main/applications/ktechlab/cmake to latest HEAD 1 year ago
TDE Gitea 244bee5016 Reset submodule main/applications/ktechlab/admin to latest HEAD 1 year ago
TDE Gitea 2f34e6590a Reset submodule main/applications/ktechlab/cmake to latest HEAD 1 year ago
TDE Gitea 129dc1cd78 Reset submodule main/applications/ktechlab/admin to latest HEAD 1 year ago
TDE Gitea c71c1f89b9 Reset submodule main/applications/ktechlab/cmake to latest HEAD 1 year ago
TDE Gitea 05825ed20b Reset submodule main/applications/ktechlab/cmake to latest HEAD 2 years ago
TDE Gitea 8591543405 Reset submodule main/applications/ktechlab/cmake to latest HEAD 2 years ago
TDE Gitea c63c7fe54b Reset submodule main/applications/ktechlab/admin to latest HEAD 2 years ago
TDE Gitea f91e0849bd Reset submodule main/applications/ktechlab/cmake to latest HEAD 2 years ago
TDE Gitea c681dd3653 Reset submodule main/applications/ktechlab/cmake to latest HEAD 2 years ago
TDE Gitea 074c5496d5 Reset submodule main/applications/ktechlab/cmake to latest HEAD 2 years ago
TDE Gitea e352803577 Reset submodule main/applications/ktechlab/cmake to latest HEAD 2 years ago
TDE Gitea 6fe9f5d3a5 Reset submodule main/applications/ktechlab/admin to latest HEAD 2 years ago
TDE Gitea c891ccf347 Reset submodule main/applications/ktechlab/cmake to latest HEAD 2 years ago
TDE Gitea b36b16eac6 Reset submodule main/applications/ktechlab/cmake to latest HEAD 2 years ago
TDE Gitea 2d6b8d24c1 Reset submodule main/applications/ktechlab/cmake to latest HEAD 2 years ago
TDE Gitea 8913d16e7d Reset submodule main/applications/ktechlab/cmake to latest HEAD 2 years ago
TDE Gitea 22272315b3 Reset submodule main/applications/ktechlab/cmake to latest HEAD 2 years ago
TDE Gitea b2f40e2dc6 Reset submodule main/applications/ktechlab/cmake to latest HEAD 2 years ago
TDE Gitea b767915af2 Reset submodule main/applications/ktechlab/cmake to latest HEAD 2 years ago
TDE Gitea 686f131ddc Reset submodule main/applications/ktechlab/cmake to latest HEAD 2 years ago
TDE Gitea 550e0e6822 Reset submodule main/applications/ktechlab/cmake to latest HEAD 2 years ago
Slávek Banko 66362b162a
Switch all submodules to https. 2 years ago
TDE Gitea 76f762d3cb Reset submodule main/applications/ktechlab/cmake to latest HEAD 3 years ago
TDE Gitea cab33b6ba1 Reset submodule main/applications/ktechlab/cmake to latest HEAD 3 years ago
TDE Gitea efb2ac5b1d Reset submodule main/applications/ktechlab/cmake to latest HEAD 3 years ago
TDE Gitea a9b10078dd Reset submodule main/applications/ktechlab/cmake to latest HEAD 3 years ago
TDE Gitea 3234521fda Reset submodule main/applications/ktechlab/admin to latest HEAD 3 years ago
TDE Gitea 58cedfce86 Reset submodule main/applications/ktechlab/cmake to latest HEAD 3 years ago
TDE Gitea f6b9ce959b Reset submodule main/applications/ktechlab/cmake to latest HEAD 3 years ago
TDE Gitea e44fb17456 Reset submodule main/applications/ktechlab/cmake to latest HEAD 3 years ago
TDE Gitea 37599d2e9e Reset submodule main/applications/ktechlab/cmake to latest HEAD 3 years ago
TDE Gitea 1b06d9421d Reset submodule main/applications/ktechlab/cmake to latest HEAD 3 years ago
TDE Gitea c1870990be Reset submodule main/applications/ktechlab/cmake to latest HEAD 3 years ago
TDE Gitea 8874e60d95 Reset submodule main/applications/ktechlab/admin to latest HEAD 3 years ago
TDE Gitea 4ef4a4fcd5 Reset submodule main/applications/ktechlab/cmake to latest HEAD 3 years ago
TDE Gitea 04f392c10d Reset submodule main/applications/ktechlab/cmake to latest HEAD 3 years ago
TDE Gitea d109764b77 Reset submodule main/applications/ktechlab/admin to latest HEAD 3 years ago
Slávek Banko 5ca286f2bc Reset submodule main/applications/ktechlab/admin to latest HEAD 4 years ago
Slávek Banko 8653e7eeae Reset submodule main/applications/ktechlab/admin to latest HEAD 4 years ago
Slávek Banko e610716522 Reset submodule main/applications/ktechlab/admin to latest HEAD 4 years ago
Slávek Banko 3e7337d2ab Reset submodule main/applications/ktechlab/cmake to latest HEAD 5 years ago
Slávek Banko af99269d41 Reset submodule main/applications/ktechlab/admin to latest HEAD 6 years ago
Slávek Banko 3b044b9c1b Reset submodule main/applications/ktechlab/cmake to latest HEAD 6 years ago
Slávek Banko 080158ef54 Reset submodule main/applications/ktechlab/admin to latest HEAD 6 years ago
Slávek Banko 075b6b537e Reset submodule main/applications/ktechlab/admin to latest HEAD 9 years ago
Slávek Banko 6d25ddd469 Reset submodule main/applications/ktechlab/admin to latest HEAD 9 years ago
Slávek Banko 322e38cdb4 Fix crash when component is added to the circuit 9 years ago
Slávek Banko 6f8853d29e Reset submodule main/applications/ktechlab/cmake to latest HEAD 9 years ago
Slávek Banko f11909068d Reset submodule main/applications/ktechlab/cmake to latest HEAD 9 years ago
Darrell Anderson 4319c010e8 Fix references to user profile directory. 9 years ago
Slávek Banko ef5499ef52 Reset submodule main/applications/ktechlab/cmake to latest HEAD 9 years ago
Slávek Banko 5653cb78a6 Reset submodule main/applications/ktechlab/cmake to latest HEAD 9 years ago
Slávek Banko 42d6c96789 Reset submodule main/applications/ktechlab/admin to latest HEAD 9 years ago
Slávek Banko 6e7dccfe5f Fix build without gpsim 9 years ago
Slávek Banko 84097910a7 Reset submodule main/applications/ktechlab/cmake to latest HEAD 9 years ago
Slávek Banko 76906a6eda Reset submodule main/applications/ktechlab/cmake to latest HEAD 9 years ago
Slávek Banko 07f7130d8a Reset submodule main/applications/ktechlab/admin to latest HEAD 9 years ago
Slávek Banko 0bf151be88 Update final HTML install path so all modules are consistent. 9 years ago
Darrell Anderson 6cf32770a9 Update HTML install path references. 10 years ago
Slávek Banko 5b9788efa8 Update autotools for new DSO linkage style 10 years ago
Timothy Pearson 8c42137774 Rename obsolete tq methods to standard names 10 years ago
Timothy Pearson 91ef45e89e Remove additional unneeded tq method conversions 10 years ago
Timothy Pearson e72829f3fa Rename old tq methods that no longer need a unique name 10 years ago
Timothy Pearson 0e831bb9c4 Fix FTBFS 10 years ago
Timothy Pearson 42992ffe42 Fix FTBFS with a bit of a hack around gpsim 10 years ago
Timothy Pearson 522839f942 Fix linker flags 10 years ago
Timothy Pearson 700fb3e4a9 Fix FTBFS on oneiric 10 years ago
Slávek Banko dc19b93fdf Add common directories 10 years ago
  1. 3
      .gitmodules
  2. 6
      acinclude.m4
  3. 6
      aclocal.m4
  4. 1
      admin
  5. 2
      configure.in
  6. 2
      configure.in.in
  7. 4
      icons/pics/Makefile.am
  8. 2
      microbe/btreebase.cpp
  9. 2
      microbe/btreenode.cpp
  10. 2
      microbe/btreenode.h
  11. 2
      microbe/expression.cpp
  12. 60
      microbe/instruction.cpp
  13. 38
      microbe/microbe.cpp
  14. 2
      microbe/microbe.h
  15. 2
      microbe/parser.cpp
  16. 20
      microbe/pic14.cpp
  17. 4
      microbe/traverser.cpp
  18. 4
      src/Makefile.am
  19. 14
      src/canvasitemparts.cpp
  20. 6
      src/circuitview.cpp
  21. 2
      src/circuitview.h
  22. 14
      src/cnitem.cpp
  23. 2
      src/cnitem.h
  24. 4
      src/cnitemgroup.h
  25. 4
      src/connector.cpp
  26. 6
      src/core/main.cpp
  27. 18
      src/docmanager.cpp
  28. 4
      src/document.cpp
  29. 2
      src/drawparts/dptext.cpp
  30. 2
      src/drawparts/dptext.h
  31. 2
      src/drawparts/solidshape.cpp
  32. 2
      src/drawparts/solidshape.h
  33. 2
      src/electronics/component.cpp
  34. 4
      src/electronics/component.h
  35. 2
      src/electronics/components/bussplitter.cpp
  36. 4
      src/electronics/components/eckeypad.cpp
  37. 2
      src/electronics/components/ecpotentiometer.cpp
  38. 4
      src/electronics/components/magnitudecomparator.cpp
  39. 4
      src/electronics/components/matrixdisplay.cpp
  40. 18
      src/electronics/components/parallelportcomponent.cpp
  41. 2
      src/electronics/components/parallelportcomponent.h
  42. 8
      src/electronics/components/piccomponent.cpp
  43. 18
      src/electronics/components/ram.cpp
  44. 4
      src/electronics/components/rotoswitch.cpp
  45. 2
      src/electronics/components/serialportcomponent.cpp
  46. 2
      src/electronics/ecnode.cpp
  47. 40
      src/electronics/gpsimprocessor.cpp
  48. 16
      src/electronics/gpsimprocessor.h
  49. 16
      src/electronics/port.cpp
  50. 4
      src/electronics/port.h
  51. 6
      src/electronics/simulation/capacitance.cpp
  52. 2
      src/electronics/simulation/capacitance.h
  53. 8
      src/electronics/simulation/element.cpp
  54. 2
      src/electronics/simulation/element.h
  55. 6
      src/electronics/simulation/inductance.cpp
  56. 2
      src/electronics/simulation/inductance.h
  57. 2
      src/electronics/simulation/matrix.cpp
  58. 6
      src/electronics/simulation/reactive.cpp
  59. 2
      src/electronics/simulation/reactive.h
  60. 2
      src/electronics/subcircuits.h
  61. 12
      src/flowcontainer.cpp
  62. 2
      src/flowcontainer.h
  63. 2
      src/flowparts/callsub.cpp
  64. 2
      src/flowparts/count.cpp
  65. 2
      src/flowparts/delay.cpp
  66. 2
      src/flowparts/embed.cpp
  67. 4
      src/flowparts/flowpart.cpp
  68. 6
      src/flowparts/flowpart.h
  69. 2
      src/flowparts/inputbutton.cpp
  70. 2
      src/flowparts/interrupt.cpp
  71. 4
      src/flowparts/keypad.cpp
  72. 12
      src/flowparts/pinmapping.cpp
  73. 2
      src/flowparts/pulse.cpp
  74. 2
      src/flowparts/readport.cpp
  75. 2
      src/flowparts/repeat.cpp
  76. 2
      src/flowparts/setpin.cpp
  77. 4
      src/flowparts/sevenseg.cpp
  78. 2
      src/flowparts/while.cpp
  79. 2
      src/flowparts/writeport.cpp
  80. 2
      src/gui/asmformattingwidget.ui
  81. 12
      src/gui/contexthelp.cpp
  82. 2
      src/gui/createsubprojectwidget.ui
  83. 4
      src/gui/doublespinbox.cpp
  84. 6
      src/gui/generaloptionswidget.ui
  85. 8
      src/gui/gpasmsettingswidget.ui
  86. 12
      src/gui/itemeditor.cpp
  87. 4
      src/gui/itemselector.cpp
  88. 4
      src/gui/logicwidget.ui
  89. 10
      src/gui/logview.cpp
  90. 4
      src/gui/microselectwidget.cpp
  91. 24
      src/gui/microsettingsdlg.cpp
  92. 4
      src/gui/microsettingswidget.ui
  93. 10
      src/gui/newfilewidget.ui
  94. 6
      src/gui/newpinmappingwidget.ui
  95. 2
      src/gui/newprojectwidget.ui
  96. 4
      src/gui/orientationwidget.cpp
  97. 4
      src/gui/oscilloscopeview.cpp
  98. 2
      src/gui/oscilloscopeview.h
  99. 20
      src/gui/oscilloscopewidget.ui
  100. 6
      src/gui/outputmethodwidget.ui
  101. 6
      src/gui/picprogrammerconfigwidget.ui
  102. 28
      src/gui/pieditor.cpp
  103. 2
      src/gui/probepositioner.cpp
  104. 4
      src/gui/processingoptionswidget.ui
  105. 4
      src/gui/programmerwidget.ui
  106. 4
      src/gui/projectdlgs.cpp
  107. 8
      src/gui/propertieslistview.cpp
  108. 10
      src/gui/sdccoptionswidget.ui
  109. 16
      src/gui/settingsdlg.cpp
  110. 4
      src/icndocument.cpp
  111. 32
      src/item.cpp
  112. 20
      src/item.h
  113. 26
      src/itemdocument.cpp
  114. 8
      src/itemdocumentdata.cpp
  115. 22
      src/itemgroup.cpp
  116. 2
      src/itemgroup.h
  117. 4
      src/iteminterface.cpp
  118. 2
      src/itemlibrary.cpp
  119. 26
      src/itemview.cpp
  120. 6
      src/itemview.h
  121. 28
      src/katemdi.cpp
  122. 10
      src/ktechlab.cpp
  123. 4
      src/languages/flowcode.cpp
  124. 24
      src/languages/picprogrammer.cpp
  125. 2
      src/languages/processchain.cpp
  126. 4
      src/languages/sdcc.cpp
  127. 6
      src/mechanics/mechanicsgroup.cpp
  128. 2
      src/mechanics/mechanicsgroup.h
  129. 4
      src/mechanics/mechanicsitem.cpp
  130. 4
      src/mechanics/mechanicsitem.h
  131. 2
      src/node.cpp
  132. 2
      src/node.h
  133. 4
      src/picitem.cpp
  134. 76
      src/projectmanager.cpp
  135. 16
      src/projectmanager.h
  136. 4
      src/recentfilesaction.cpp
  137. 8
      src/resizeoverlay.cpp
  138. 4
      src/textdocument.cpp
  139. 14
      src/textview.cpp
  140. 4
      src/textview.h
  141. 4
      src/variablelabel.cpp
  142. 4
      src/view.cpp
  143. 4
      src/viewcontainer.cpp
  144. 8
      src/viewcontainer.h

3
.gitmodules

@ -0,0 +1,3 @@
[submodule "admin"]
path = admin
url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin

6
acinclude.m4

@ -430,12 +430,12 @@ if test "$1" = "default"; then
if test -z "$kde_htmldir"; then
if test -f /etc/debian_version; then
if dpkg -s kdelibs4 | grep Status | grep not-installed 2>&1 >/dev/null; then
kde_htmldir='\${prefix}/share/doc/HTML';
kde_htmldir='\${prefix}/share/doc/tde/HTML';
else
kde_htmldir='\${prefix}/share/doc/kde/HTML'
kde_htmldir='\${prefix}/share/doc/tde/HTML'
fi
else
kde_htmldir='\${prefix}/share/doc/HTML'
kde_htmldir='\${prefix}/share/doc/tde/HTML'
fi
fi

6
aclocal.m4

@ -442,12 +442,12 @@ if test "$1" = "default"; then
if test -z "$kde_htmldir"; then
if test -f /etc/debian_version; then
if dpkg -s kdelibs4 | grep Status | grep not-installed 2>&1 >/dev/null; then
kde_htmldir='\${prefix}/share/doc/HTML';
kde_htmldir='\${prefix}/share/doc/tde/HTML';
else
kde_htmldir='\${prefix}/share/doc/kde/HTML'
kde_htmldir='\${prefix}/share/doc/tde/HTML'
fi
else
kde_htmldir='\${prefix}/share/doc/HTML'
kde_htmldir='\${prefix}/share/doc/tde/HTML'
fi
fi

1
admin

@ -0,0 +1 @@
Subproject commit 5bf424d9d8a3a8c3a894d6540ae164a42d2c25a5

2
configure.in

@ -167,7 +167,7 @@ if test x$have_gpsim_0_21_4 == xyes || test x$have_gpsim_0_21_11 == xyes || test
for LIBREADLINE in "-lreadline" "-lreadline $LIBCURSES" "-lreadline -ltermcap" "-lreadline -lncurses" "-lreadline -lcurses"
do
LIBS="$ac_save_LIBS $LIBREADLINE"
LIB_GPSIM="$LIBREADLINE -lgpsim -lgpsim_eXdbm -lgpsimcli"
LIB_GPSIM="$LIBREADLINE -lgpsim -lgpsim_eXdbm -lgpsimcli -lgpsimgui"
AC_TRY_RUN([
/* program */
#include <stdio.h>

2
configure.in.in

@ -102,7 +102,7 @@ if test x$have_gpsim_0_21_4 == xyes || test x$have_gpsim_0_21_11 == xyes || test
for LIBREADLINE in "-lreadline" "-lreadline $LIBCURSES" "-lreadline -ltermcap" "-lreadline -lncurses" "-lreadline -lcurses"
do
LIBS="$ac_save_LIBS $LIBREADLINE"
LIB_GPSIM="$LIBREADLINE -lgpsim -lgpsim_eXdbm -lgpsimcli"
LIB_GPSIM="$LIBREADLINE -lgpsim -lgpsim_eXdbm -lgpsimcli -lgpsimgui"
AC_TRY_RUN([
/* program */
#include <stdio.h>

4
icons/pics/Makefile.am

@ -7,8 +7,8 @@ ktlicon_DATA = and.png cell.png logic_input.png logic_output.png nand.png \
spdt.png spst.png keypad.png opamp.png xnor.png circuit.png flowcode.png \
delay.png interrupt.png pinread.png pinwrite.png portread.png portwrite.png \
repeat.png while.png for.png assignment.png branch.png delay.png embed.png end.png \
for.png interrupt.png pinread.png pinwrite.png portread.png portwrite.png \
repeat.png start.png sub.png subcall.png unary.png while.png item.png ic1.png \
interrupt.png pinread.png pinwrite.png portread.png portwrite.png \
repeat.png start.png sub.png subcall.png unary.png item.png ic1.png \
ic2.png ic3.png voltagesignal.png currentsignal.png clockinput.png cccs.png \
ccvs.png vcvs.png vccs.png mechanics.png buffer.png external_connection.png \
logicprobe.png potentiometer.png resistordip.png bidirled.png project_library.png \

2
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);

2
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()

2
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();
/**

2
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 )

60
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 )

38
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);
}

2
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!)

2
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("{"));

20
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

4
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;

4
src/Makefile.am

@ -11,7 +11,7 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/drawparts \
-I$(top_srcdir)/src/languages -I$(top_srcdir)/src/mechanics -I$(top_srcdir)/src/micro $(all_includes)
# the library search path.
ktechlab_LDFLAGS = -module $(all_libraries) $(KDE_RPATH)
ktechlab_LDFLAGS = -module $(all_libraries) $(KDE_RPATH) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lDCOP $(LIB_KPARTS) $(LIB_GPSIM)
# the libraries to link against.
ktechlab_LDADD = $(top_builddir)/src/gui/libgui.la \
@ -19,7 +19,7 @@ ktechlab_LDADD = $(top_builddir)/src/gui/libgui.la \
$(top_builddir)/src/mechanics/libmechanics.la $(top_builddir)/src/electronics/libelectronics.la \
$(top_builddir)/src/electronics/simulation/libelements.la $(top_builddir)/src/electronics/components/libcomponents.la \
$(top_builddir)/src/languages/liblanguages.la $(top_builddir)/src/drawparts/libdrawparts.la \
$(top_builddir)/src/core/libcore.la -lkutils $(LIB_GPSIM) -lktexteditor $(LIB_KFILE) $(LIB_KDEPRINT)
$(top_builddir)/src/core/libcore.la -lkutils -lktexteditor $(LIB_KFILE) $(LIB_KDEPRINT) $(LIB_QT) $(LIB_GPSIM)
# which sources should be compiled for ktechlab
ktechlab_SOURCES = ktechlab.cpp node.cpp connector.cpp itemlibrary.cpp \

14
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() );
}

6
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 );
}

2
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 );

14
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();

2
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 );

4
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;
/**

4
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() );
}
}

6
src/core/main.cpp

@ -56,3 +56,9 @@ int main(int argc, char **argv)
args->clear(); // Free up some memory
return app.exec();
}
void exit_gpsim(int ret)
{
printf("gpsim attempted to call exit_gpsim(%d), ***IGNORING***\n", ret);
// exit(ret);
}

18
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;
}

4
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") );

2
src/drawparts/dptext.cpp

@ -97,7 +97,7 @@ void DPText::postResize()
}
TQSize DPText::tqminimumSize() const
TQSize DPText::minimumSize() const
{
return TQSize( 48, 24 );
}

2
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();

2
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 );