diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
| commit | d8762de95349dc6edaa34db9bf699b367c1af6b1 (patch) | |
| tree | 8c76a6ab8e4e92d13196cb11ddab2d0fb64ec680 /kalzium | |
| parent | 03458c4e2ca2e92deafe078d0e09e1acd4c4765f (diff) | |
| download | tdeedu-d8762de95349dc6edaa34db9bf699b367c1af6b1.tar.gz tdeedu-d8762de95349dc6edaa34db9bf699b367c1af6b1.zip | |
rename the following methods:
tqfind find
tqreplace replace
tqcontains contains
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kalzium')
| -rw-r--r-- | kalzium/src/element.cpp | 4 | ||||
| -rw-r--r-- | kalzium/src/eqchemview.cpp | 4 | ||||
| -rw-r--r-- | kalzium/src/kalziumutils.cpp | 2 | ||||
| -rw-r--r-- | kalzium/src/orbitswidget.cpp | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/kalzium/src/element.cpp b/kalzium/src/element.cpp index 687f0ad8..f85023c0 100644 --- a/kalzium/src/element.cpp +++ b/kalzium/src/element.cpp @@ -68,8 +68,8 @@ TQString Element::parsedOrbits( bool canBeEmpty ) TQString orbits = m_orbits; TQRegExp rxs("([a-z])([0-9]+)"); TQRegExp rxb("([a-z]{2}) ",false); - orbits.tqreplace(rxs,"\\1<sup>\\2</sup>"); //superscript around electron number - orbits.tqreplace(rxb,"<b>\\1</b> "); //bold around element symbols + orbits.replace(rxs,"\\1<sup>\\2</sup>"); //superscript around electron number + orbits.replace(rxb,"<b>\\1</b> "); //bold around element symbols return orbits; } diff --git a/kalzium/src/eqchemview.cpp b/kalzium/src/eqchemview.cpp index 00cf1af4..4b5f6baf 100644 --- a/kalzium/src/eqchemview.cpp +++ b/kalzium/src/eqchemview.cpp @@ -89,8 +89,8 @@ void eqchemView::clear() void eqchemView::compute() { TQString equation( m_eqedit->text() ); - equation.tqreplace("+", "+"); - equation.tqreplace("->", " -> "); + equation.replace("+", "+"); + equation.replace("->", " -> "); equation.append(" "); equation.prepend(" "); diff --git a/kalzium/src/kalziumutils.cpp b/kalzium/src/kalziumutils.cpp index f7ed9d09..38dd9786 100644 --- a/kalzium/src/kalziumutils.cpp +++ b/kalzium/src/kalziumutils.cpp @@ -38,7 +38,7 @@ int KalziumUtils::maxSize( const TQString& string, const TQRect& rect, TQFont fo r = p->boundingRect( TQRect(), TQt::AlignAuto, string ); r.moveBy( rect.left(), rect.top() ); - if ( rect.tqcontains( r ) ) + if ( rect.contains( r ) ) goodSizeFound = true; else size--; diff --git a/kalzium/src/orbitswidget.cpp b/kalzium/src/orbitswidget.cpp index 35e74bf7..a3811958 100644 --- a/kalzium/src/orbitswidget.cpp +++ b/kalzium/src/orbitswidget.cpp @@ -162,20 +162,20 @@ void OrbitsWidget::getNumberOfOrbits() int cut = 0; bool cont = true; - if ( !o.tqcontains( rxb ) ) //only true for H and He + if ( !o.contains( rxb ) ) //only true for H and He numOfElectrons.append( o.toInt() ); else //every other element { while ( cont ) { - pos = o.tqfind( rxb ); + pos = o.find( rxb ); cut = o.length()-pos-1; numOfElectrons.append(o.left( pos ).toInt()); o = o.right( cut ); num++; - if ( !o.tqcontains( rxb ) ) + if ( !o.contains( rxb ) ) { numOfElectrons.append( o.toInt() ); cont = false; |