[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdepim/libkdepim
From:       Marc Mutz <Marc.Mutz () uni-bielefeld ! de>
Date:       2004-06-01 16:10:19
Message-ID: 20040601161019.B2044126E9 () office ! kde ! org
[Download RAW message or body]

CVS commit by mutz: 

Trying to find a way to break neither gcc 2.95, nor gcc 3.3...


  M +4 -4      identity.cpp   1.78
  M +10 -10    identity.h   1.30


--- kdepim/libkdepim/identity.cpp  #1.77:1.78
@@ -211,5 +211,5 @@ void Signature::writeConfig( KConfigBase
 }
 
-QDataStream & operator<<( QDataStream & stream, const KPIM::Signature & sig ) {
+QDataStream & KPIM::operator<<( QDataStream & stream, const KPIM::Signature & sig ) {
   return stream << static_cast<Q_UINT8>(sig.mType)
                 << sig.mUrl
@@ -217,5 +217,5 @@ QDataStream & operator<<( QDataStream & 
 }
 
-QDataStream & operator>>( QDataStream & stream, KPIM::Signature & sig ) {
+QDataStream & KPIM::operator>>( QDataStream & stream, KPIM::Signature & sig ) {
     Q_UINT8 s;
     stream >> s
@@ -328,5 +328,5 @@ void Identity::writeConfig( KConfigBase 
 }
 
-QDataStream & operator<<( QDataStream & stream, const KPIM::Identity & i ) {
+QDataStream & KPIM::operator<<( QDataStream & stream, const KPIM::Identity & i ) {
   return stream << static_cast<Q_UINT32>(i.uoid())
                 << i.identityName()
@@ -349,5 +349,5 @@ QDataStream & operator<<( QDataStream & 
 }
 
-QDataStream & operator>>( QDataStream & stream, KPIM::Identity & i ) {
+QDataStream & KPIM::operator>>( QDataStream & stream, KPIM::Identity & i ) {
   Q_UINT32 uoid;
   QString format;

--- kdepim/libkdepim/identity.h  #1.29:1.30
@@ -25,10 +25,4 @@ class IdentityList;
 class QDataStream;
 
-QDataStream & operator<<( QDataStream & stream, const KPIM::Signature & sig );
-QDataStream & operator>>( QDataStream & stream, KPIM::Signature & sig );
-
-QDataStream & operator<<( QDataStream & stream, const KPIM::Identity & ident );
-QDataStream & operator>>( QDataStream & stream, KPIM::Identity & ident );
-
 namespace KPIM {
 
@@ -40,6 +34,6 @@ class Signature {
   friend class Identity;
 
-  friend QDataStream & ::operator<<( QDataStream & stream, const Signature & sig );
-  friend QDataStream & ::operator>>( QDataStream & stream, Signature & sig );
+  friend QDataStream & KPIM::operator<<( QDataStream & stream, const Signature & sig );
+  friend QDataStream & KPIM::operator>>( QDataStream & stream, Signature & sig );
 
 public:
@@ -99,6 +93,6 @@ class Identity
   friend class IdentityManager;
 
-  friend QDataStream & ::operator<<( QDataStream & stream, const Identity & ident );
-  friend QDataStream & ::operator>>( QDataStream & stream, Identity & ident );
+  friend QDataStream & KPIM::operator<<( QDataStream & stream, const Identity & ident );
+  friend QDataStream & KPIM::operator>>( QDataStream & stream, Identity & ident );
 
 public:
@@ -300,4 +294,10 @@ protected:
 };
 
+QDataStream & operator<<( QDataStream & stream, const KPIM::Signature & sig );
+QDataStream & operator>>( QDataStream & stream, KPIM::Signature & sig );
+
+QDataStream & operator<<( QDataStream & stream, const KPIM::Identity & ident );
+QDataStream & operator>>( QDataStream & stream, KPIM::Identity & ident );
+
 } // namespace KPIM
 


[prev in list] [next in list] [prev in thread] [next in thread]