- gcc3 related fixes for KDE stuff

5 files changed, 7 insertions, 5 deletions

diff --git a/kde2/kioslave/kio_plp.cpp b/kde2/kioslave/kio_plp.cpp
index bb9a723..3e5981f 100644
--- a/kde2/kioslave/kio_plp.cpp
+++ b/kde2/kioslave/kio_plp.cpp
@@ -298,7 +298,7 @@ openConnection() {
 	    if ((devbits & 1) != 0) {
 		PlpDrive drive;
 		if (plpRfsv->devinfo('A' + i, drive) == rfsv::E_PSI_GEN_NONE) {
-		    string vname = drive.getName();
+		    std::string vname = drive.getName();
 		    QString name;
 
 		    if (!vname.empty())
@@ -1124,7 +1124,7 @@ special(const QByteArray &a) {
 		return;
 	    }
 
-	    string mtype;
+	    std::string mtype;
 	    drive.getMediaType(mtype);
 
 	    // DriveLetter
diff --git a/kde2/kpsion/kpsion.cpp b/kde2/kpsion/kpsion.cpp
index 34bff9d..64bffd8 100644
--- a/kde2/kpsion/kpsion.cpp
+++ b/kde2/kpsion/kpsion.cpp
@@ -343,7 +343,7 @@ queryPsion() {
 		return;
 	    }
 	    machineUID = 0;
-	    string oi = "";
+	    std::string oi = "";
 	    while (!b.empty()) {
 		oi += b.pop().getString();
 		oi += "\n";
diff --git a/kde2/kpsion/kpsionbackuplistview.cpp b/kde2/kpsion/kpsionbackuplistview.cpp
index 54fac61..f8b5f77 100644
--- a/kde2/kpsion/kpsionbackuplistview.cpp
+++ b/kde2/kpsion/kpsionbackuplistview.cpp
@@ -40,7 +40,7 @@
 #include <qdir.h>
 
 class KPsionCheckListItem::KPsionCheckListItemMetaData {
-    friend KPsionCheckListItem;
+    friend class KPsionCheckListItem;
 
 private:
     KPsionCheckListItemMetaData();
diff --git a/kde2/kpsion/kpsionbackuplistview.h b/kde2/kpsion/kpsionbackuplistview.h
index 8d364fc..5da193a 100644
--- a/kde2/kpsion/kpsionbackuplistview.h
+++ b/kde2/kpsion/kpsionbackuplistview.h
@@ -43,7 +43,7 @@ typedef struct {
     QString name;
 } indexData_t;
 
-typedef vector<indexData_t> indexDataList_t;
+typedef std::vector<indexData_t> indexDataList_t;
 
 class KPsionCheckListItem : public QObject, public QCheckListItem {
     Q_OBJECT
diff --git a/kde2/plugins/plpprops.cc b/kde2/plugins/plpprops.cc
index db601c6..065eaa4 100644
--- a/kde2/plugins/plpprops.cc
+++ b/kde2/plugins/plpprops.cc
@@ -66,6 +66,8 @@ static inline const char *N_(const char *t) { return t; }
 #define KIO_ARGS QByteArray packedArgs; \
 QDataStream stream( packedArgs, IO_WriteOnly ); stream
 
+using namespace std;
+
 class PlpPropsPlugin::PlpPropsPluginPrivate {
 public:
     PlpPropsPluginPrivate() { }