author | kergoth <kergoth> | 2002-11-14 22:40:52 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-11-14 22:40:52 (UTC) |
commit | ec92de66e81b145119ff15bea0ad88436eb7bd4b (patch) (side-by-side diff) | |
tree | a65e8adc4edd60d7822f75e8b574e8e97596773c /noncore/apps/oxygen | |
parent | 3f1d60609657ea69bda453f5c820a23ee5375ab8 (diff) | |
download | opie-ec92de66e81b145119ff15bea0ad88436eb7bd4b.zip opie-ec92de66e81b145119ff15bea0ad88436eb7bd4b.tar.gz opie-ec92de66e81b145119ff15bea0ad88436eb7bd4b.tar.bz2 |
namespace and include fix for uses of iostream in STL
-rw-r--r-- | noncore/apps/oxygen/kmolcalc.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/noncore/apps/oxygen/kmolcalc.cpp b/noncore/apps/oxygen/kmolcalc.cpp index 33666b1..1d41b0f 100644 --- a/noncore/apps/oxygen/kmolcalc.cpp +++ b/noncore/apps/oxygen/kmolcalc.cpp @@ -1,67 +1,67 @@ /* * kmolcalc.cpp * * Copyright (C) 2000,2001 Tomislav Gountchev <tomi@idiom.com> * Copyright (C) 2002 Carsten Niehaus <cniehaus@handhelds.org> */ /** * KMOLCALC is the calculation engine. It knows about a hashtable of user defined atomic * weights and group definitions ELSTABLE, and the currently processed formula, stored * as a list of elements and their coefficients, ELEMENTS. */ #include "kmolcalc.h" #include <qdict.h> #include <qdir.h> #include <qfile.h> #include <qpe/qpeapplication.h> -#include <iostream.h> +#include <iostream> /** * Construct a new calculator object. */ KMolCalc::KMolCalc() { elements = new ElementList; elstable = NULL; readElstable(); } KMolCalc::~KMolCalc() { delete elements; } void KMolCalc::readElstable() { weight = -1; // not calculated yet if (elstable) delete elstable; elstable = new QDict<SubUnit> (197, TRUE); elstable->setAutoDelete(TRUE); mwfile = QPEApplication::qpeDir() +"share/oxygen/kmolweights"; QFile f(mwfile); if (f.exists()) readMwfile(f); } /** * Parse a string S and construct the ElementList this->ELEMENTS, representing the * composition of S. Returns 0 if successful, or an error code (currently -1) if * parsing failed. * The elements is S must be valid element or group symbols, as stored in this->ELSTABLE. * See help files for correct formula syntax. */ QString KMolCalc::readFormula(const QString& s) { weight = -1; if (elements) delete elements; elements = new ElementList; return KMolCalc::readGroup(s, elements); } // read a formula group recursively. Called by readFormula. QString KMolCalc::readGroup(const QString& s, ElementList* els) { if (s.isEmpty()) return QString ("Enter a formula."); //ERROR int sl = s.length(); int i = 0; QString errors ("OK"); bool ok = TRUE; while (i < sl && ((s[i] <= '9' && s[i] >= '0') || s[i] == '.')) i++; |