--- koffice-1.2.1/filters/kspread/qpro/libqpro/src/formula.cc.orig 2001-06-27 04:43:31.000000000 -0400 +++ koffice-1.2.1/filters/kspread/qpro/libqpro/src/formula.cc 2003-08-22 11:10:24.000000000 -0400 @@ -1,7 +1,7 @@ #include -#include -#include +#include +#include #include @@ -474,7 +474,7 @@ QpFormula::floatFuncReal(const char*) { QP_INT64 lFloat; - ostrstream lNum; + std::ostrstream lNum; cFormula >> lFloat; @@ -489,7 +489,7 @@ QpFormula::intFuncReal(const char*) { QP_INT16 lInt; - ostrstream lNum; + std::ostrstream lNum; cFormula >> lInt; --- koffice-1.2.1/filters/kspread/qpro/libqpro/src/record.cc.orig 2001-08-04 11:40:25.000000000 -0400 +++ koffice-1.2.1/filters/kspread/qpro/libqpro/src/record.cc 2003-08-22 11:13:04.000000000 -0400 @@ -2,7 +2,7 @@ #include -#include +#include #include #include @@ -10,7 +10,7 @@ // ----------------------------------------------------------------------- #include -#include +#include void Charout(ostream& pOut, unsigned char pChar) @@ -32,7 +32,7 @@ int Hexout(char* pChar, int pLen) { - ostrstream* lOStr = new ostrstream; + std::ostrstream* lOStr = new std::ostrstream; while( pLen ) { @@ -57,7 +57,7 @@ cerr << lOStr->rdbuf() << endl; delete lOStr; - lOStr = new ostrstream; + lOStr = new std::ostrstream; } delete lOStr; @@ -200,7 +200,7 @@ { //??? cope with relative/absolute references - strstream lOut(pText, 20, ios::out); // ??? ard coded len + std::strstream lOut(pText, 20, ios::out); // ??? ard coded len int lPageRelative = pRow & 0x8000; int lColRelative = pRow & 0x4000; int lRowRelative = pRow & 0x2000; --- koffice-1.2.1/filters/kspread/qpro/libqpro/src/stream.cc.orig 2001-08-04 11:40:25.000000000 -0400 +++ koffice-1.2.1/filters/kspread/qpro/libqpro/src/stream.cc 2003-08-22 11:13:55.000000000 -0400 @@ -31,7 +31,7 @@ #else #include #include -#include +#include // For IRIX namespace std {} @@ -60,7 +60,7 @@ , cOffset(0L) , cStreamBuf(0) { - cStreamBuf = new strstreambuf (pBuffer, pLen); + cStreamBuf = new std::strstreambuf (pBuffer, pLen); cIn = new istream(cStreamBuf); } --- koffice-1.2.1/filters/kspread/qpro/qproimport.cc.orig 2002-04-17 07:54:03.000000000 -0400 +++ koffice-1.2.1/filters/kspread/qpro/qproimport.cc 2003-08-22 11:04:05.000000000 -0400 @@ -18,7 +18,7 @@ Boston, MA 02111-1307, USA. */ -#include +#include #include #include