7 files changed, 31 insertions, 23 deletions
diff --git a/kde2/kioslave/kio_plp.cpp b/kde2/kioslave/kio_plp.cpp
index 3e5981f..fb0a54a 100644
--- a/kde2/kioslave/kio_plp.cpp
+++ b/kde2/kioslave/kio_plp.cpp
@@ -24,13 +24,12 @@
 #include <config.h>
 #endif
 
-#include "kio_plp.h"
+#include <rfsvfactory.h>
+#include <rpcsfactory.h>
+#include <bufferarray.h>
 
 #include <iomanip>
-#include <stdio.h>
-#include <pwd.h>
-#include <grp.h>
-#include <sys/stat.h>
+#include <string>
 
 #include <qfile.h>
 #include <qregexp.h>
@@ -41,11 +40,12 @@
 #include <klocale.h>
 #include <kconfig.h>
 
-#include <rfsvfactory.h>
-#include <rpcsfactory.h>
-#include <bufferarray.h>
+#include "kio_plp.h"
 
-#include <string>
+#include <stdio.h>
+#include <pwd.h>
+#include <grp.h>
+#include <sys/stat.h>
 
 using namespace KIO;
 
@@ -1107,7 +1107,7 @@ special(const QByteArray &a) {
 	    char drv;
 
 	    stream >> param;
-	    cout << "p='" << param << "'" << endl;
+	    kdDebug(PLP_DEBUGAREA) << "p='" << param << "'" << endl;
 	    if (param.isEmpty()) {
 		error(ERR_MALFORMED_URL, i18n("(empty)"));
 		return;
diff --git a/kde2/klipsi/toplevel.cpp b/kde2/klipsi/toplevel.cpp
index 6f92e5a..d310515 100644
--- a/kde2/klipsi/toplevel.cpp
+++ b/kde2/klipsi/toplevel.cpp
@@ -40,10 +40,14 @@
 
 #include <psibitmap.h>
 
+#include <iostream>
+
 #define QUIT_ITEM    50
 #define ABOUT_ITEM    51
 #define CLIPFILE "C:/System/Data/Clpboard.cbd"
 
+using namespace std;
+
 TopLevel::TopLevel()
   : KMainWindow(0)
 {
diff --git a/kde2/kpsion/kpsion.cpp b/kde2/kpsion/kpsion.cpp
index 3a162b5..161c715 100644
--- a/kde2/kpsion/kpsion.cpp
+++ b/kde2/kpsion/kpsion.cpp
@@ -55,8 +55,12 @@
 #include <bufferarray.h>
 #include <psiprocess.h>
 
+#include <iostream>
+
 #define STID_CONNECTION 1
 
+using namespace std;
+
 KPsionMainWindow::KPsionMainWindow()
     : KMainWindow() {
     setupActions();
diff --git a/kde2/kpsion/kpsion.h b/kde2/kpsion/kpsion.h
index 00423e5..925b09d 100644
--- a/kde2/kpsion/kpsion.h
+++ b/kde2/kpsion/kpsion.h
@@ -23,6 +23,10 @@
 #ifndef _KPSION_H_
 #define _KPSION_H_
 
+#include <rfsv.h>
+#include <rpcs.h>
+#include <ppsocket.h>
+
 // get KDE_VERSION
 #include <kapplication.h>
 
@@ -35,10 +39,6 @@
 #include <kiconview.h>
 #include <kdialogbase.h>
 
-#include <rfsv.h>
-#include <rpcs.h>
-#include <ppsocket.h>
-
 typedef QMap<char,QString> driveMap;
 typedef QMap<QString,QString> psionMap;
 
diff --git a/kde2/kpsion/kpsionconfig.cpp b/kde2/kpsion/kpsionconfig.cpp
index 3896a80..c4991e9 100644
--- a/kde2/kpsion/kpsionconfig.cpp
+++ b/kde2/kpsion/kpsionconfig.cpp
@@ -26,7 +26,7 @@
 #include <klocale.h>
 #include <kstddirs.h>
 
-#include <iostream.h>
+#include <iostream>
 
 KPsionConfig::KPsionConfig() {
     optionNames.insert(OPT_BACKUPDIR, QString("Settings/BackupDir"));
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>