diff options
| author | Fritz Elfert <felfert@to.com> | 2003-02-05 07:59:09 +0000 |
|---|---|---|
| committer | Fritz Elfert <felfert@to.com> | 2003-02-05 07:59:09 +0000 |
| commit | f0c047e1f40ee2214fe1f73dc3bdc6b0f6de5d85 (patch) | |
| tree | 166bf2df5ca4fc40904af30a56a0de88683baf8d /kde2/plugins | |
| parent | 27ba222abbf3137eef49e31ac521de01d39c8088 (diff) | |
| download | plptools-f0c047e1f40ee2214fe1f73dc3bdc6b0f6de5d85.tar.gz plptools-f0c047e1f40ee2214fe1f73dc3bdc6b0f6de5d85.tar.bz2 plptools-f0c047e1f40ee2214fe1f73dc3bdc6b0f6de5d85.zip | |
- Changes for compiling with gcc 3.2
Diffstat (limited to 'kde2/plugins')
| -rw-r--r-- | kde2/plugins/plpprops.cc | 14 | ||||
| -rw-r--r-- | kde2/plugins/plppropsFactory.cc | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/kde2/plugins/plpprops.cc b/kde2/plugins/plpprops.cc index 065eaa4..47563e3 100644 --- a/kde2/plugins/plpprops.cc +++ b/kde2/plugins/plpprops.cc @@ -40,7 +40,7 @@ #include <qwhatsthis.h> #include <qpushbutton.h> -#include <strstream> +#include <sstream> #include <iomanip> #ifdef ENABLE_NLS @@ -937,9 +937,9 @@ void PlpMachinePage::slotJobData(KIO::Job *job, const QByteArray &data) { d->machType->setText(KGlobal::locale()->translate(d->mi.machineType)); d->machName->setText(QString(d->mi.machineName)); // ??! None of QString's formatting methods knows about long long. - ostrstream s; + ostringstream s; s << hex << setw(16) << d->mi.machineUID << '\0'; - d->machUID->setText(QString(s.str())); + d->machUID->setText(QString(s.str().c_str())); d->machLang->setText(KGlobal::locale()->translate(d->mi.uiLanguage)); d->dispGeo->setText(QString("%1x%2").arg( d->mi.displayWidth).arg(d->mi.displayHeight)); @@ -980,9 +980,9 @@ void PlpMachinePage::slotJobData(KIO::Job *job, const QByteArray &data) { d->machDST->setText((d->mi.tz.dst_zones & PsiTime::PSI_TZ_HOME) ? i18n("yes") : i18n("no")); - ostrstream mbs; + ostringstream mbs; mbs << d->mi.mainBatteryUsedTime << '\0'; - d->mbattUsage->setText(QString(mbs.str())); + d->mbattUsage->setText(QString(mbs.str().c_str())); pt.setPsiTime(&d->mi.mainBatteryInsertionTime); dt.setTime_t(pt.getTime()); d->mbattChanged->setText(KGlobal::locale()->formatDateTime(dt, false)); @@ -1010,9 +1010,9 @@ void PlpMachinePage::slotJobData(KIO::Job *job, const QByteArray &data) { QString("%1 mV").arg(KGlobal::locale()->formatNumber( d->mi.backupBatteryMaxVoltage, 0))); - ostrstream bbs; + ostringstream bbs; bbs << d->mi.externalPowerUsedTime << '\0'; - d->epowerUsage->setText(QString(bbs.str())); + d->epowerUsage->setText(QString(bbs.str().c_str())); d->epowerSupplied->setText( d->mi.externalPower ? i18n("Yes") : i18n("No")); } diff --git a/kde2/plugins/plppropsFactory.cc b/kde2/plugins/plppropsFactory.cc index e9b6219..2eb8002 100644 --- a/kde2/plugins/plppropsFactory.cc +++ b/kde2/plugins/plppropsFactory.cc @@ -5,7 +5,7 @@ #include "plppropsFactory.h" #include "plpprops.h" -#include <stream.h> +#include <iostream> #include <kdebug.h> #include <klocale.h> |