diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-11 04:44:41 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-11 04:44:41 +0000 |
commit | a374efce3a207b39514be3c52264091400ce297e (patch) | |
tree | 77bdf654b55826d4f59b53a5621310206bcaead1 /kalzium/src/spectrum.cpp | |
parent | f81a494f3957d5cf38c787973415597941934727 (diff) | |
download | tdeedu-a374efce3a207b39514be3c52264091400ce297e.tar.gz tdeedu-a374efce3a207b39514be3c52264091400ce297e.zip |
TQt4 port kdeedu
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1236073 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kalzium/src/spectrum.cpp')
-rw-r--r-- | kalzium/src/spectrum.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/kalzium/src/spectrum.cpp b/kalzium/src/spectrum.cpp index dc8abb01..45c62180 100644 --- a/kalzium/src/spectrum.cpp +++ b/kalzium/src/spectrum.cpp @@ -97,7 +97,7 @@ void Spectrum::adjustIntensities() double curInt = ( ( double )( *it ).intensity ); double newInt = max*1000/curInt; - ( *it ).intensity = qRound( newInt ); + ( *it ).intensity = tqRound( newInt ); } } @@ -130,17 +130,17 @@ TQString Spectrum::bandsAsHtml() for (;it!=itEnd;++it) { html += TQString( "<tr>" ) - + "<td>" + i18n( "Wavelength: %1 nm" ).arg( ( *it ).wavelength ) + "</td>" - + "<td>" + i18n( "Intensity: %1" ).arg( ( *it ).intensity ) + "</td>" - + "<td>" + i18n( "Probability: %1 10<sup>8</sup>s<sup>-1</sup>" ).arg( ( *it ).aki ) + "</td>" - + "<td>" + i18n( "Energy 1: %1" ).arg( ( *it ).energy1 ) + "</td>" - + "<td>" + i18n( "Energy 2: %1" ).arg( ( *it ).energy2 ) + "</td>" - + "<td>" + i18n( "Electron Configuration 1: %1" ).arg( ( *it ).electronconfig1 ) + "</td>" - + "<td>" + i18n( "Electron Configuration 2: %1" ).arg( ( *it ).electronconfig2 ) + "</td>" - + "<td>" + i18n( "Term 1: %1" ).arg( ( *it ).term1 ) + "</td>" - + "<td>" + i18n( "Term 2: %1" ).arg( ( *it ).term2 ) + "</td>" - + "<td>" + i18n( "J 1: %1" ).arg( ( *it ).J1 ) + "</td>" - + "<td>" + i18n( "J 2: %1" ).arg( ( *it ).J2 ) + "</td>" + + "<td>" + i18n( "Wavelength: %1 nm" ).tqarg( ( *it ).wavelength ) + "</td>" + + "<td>" + i18n( "Intensity: %1" ).tqarg( ( *it ).intensity ) + "</td>" + + "<td>" + i18n( "Probability: %1 10<sup>8</sup>s<sup>-1</sup>" ).tqarg( ( *it ).aki ) + "</td>" + + "<td>" + i18n( "Energy 1: %1" ).tqarg( ( *it ).energy1 ) + "</td>" + + "<td>" + i18n( "Energy 2: %1" ).tqarg( ( *it ).energy2 ) + "</td>" + + "<td>" + i18n( "Electron Configuration 1: %1" ).tqarg( ( *it ).electronconfig1 ) + "</td>" + + "<td>" + i18n( "Electron Configuration 2: %1" ).tqarg( ( *it ).electronconfig2 ) + "</td>" + + "<td>" + i18n( "Term 1: %1" ).tqarg( ( *it ).term1 ) + "</td>" + + "<td>" + i18n( "Term 2: %1" ).tqarg( ( *it ).term2 ) + "</td>" + + "<td>" + i18n( "J 1: %1" ).tqarg( ( *it ).J1 ) + "</td>" + + "<td>" + i18n( "J 2: %1" ).tqarg( ( *it ).J2 ) + "</td>" + "</tr>\n"; } |