--- kcontrol/kfontinst/kfontinst/Encodings.cpp.orig Tue Apr 16 10:10:26 2002 +++ kcontrol/kfontinst/kfontinst/Encodings.cpp Tue Apr 16 10:10:56 2002 @@ -628,14 +628,14 @@ const T8Bit *data8=NULL; const T16Bit *data16=NULL; - of << (its8BitList.count() - itsNumBuiltin)+its16BitList.count() << std::endl; + of << (its8BitList.count() - itsNumBuiltin)+its16BitList.count() << endl; for(data8=first8Bit(); data8; data8=next8Bit()) if(!isBuiltin(*data8)) - of << data8->name.local8Bit() << " " << data8->file.local8Bit() << std::endl; + of << data8->name.local8Bit() << " " << data8->file.local8Bit() << endl; for(data16=first16Bit(); data16; data16=next16Bit()) - of << data16->name.local8Bit() << " " << data16->file.local8Bit() << std::endl; + of << data16->name.local8Bit() << " " << data16->file.local8Bit() << endl; of.close(); status=true; --- kcontrol/kfontinst/kfontinst/AfmCreator.cpp.orig Tue Apr 16 10:14:13 2002 +++ kcontrol/kfontinst/kfontinst/AfmCreator.cpp Tue Apr 16 10:14:30 2002 @@ -216,7 +216,7 @@ // readKerningAndComposite(fName, kerning, composite, enc); // Must do this before we overwrite the file below... - ofstream afm(afmName.local8Bit()); + ::ofstream afm(afmName.local8Bit()); if(afm) { @@ -325,7 +325,7 @@ // Return the 'kfontinst' encoding of the AFM file... // QString enc; - ifstream f(afm.local8Bit()); + ::ifstream f(afm.local8Bit()); if(f) { @@ -372,7 +372,7 @@ { if(CFontEngine::isAType1(font.local8Bit())) { - ifstream f(CMisc::afmName(font).local8Bit()); + ::ifstream f(CMisc::afmName(font).local8Bit()); if(f) {