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

List:       kde-commits
Subject:    proko2: kdepim/kresources/kolab
From:       David Faure <faure () kde ! org>
Date:       2004-08-17 17:10:28
Message-ID: 20040817171028.0327C1D1C () office ! kde ! org
[Download RAW message or body]

CVS commit by faure: 

s/producer-id/product-id/, more consistent with e.g. ical.
s/invitationSent/invitation-sent/ (typo)


  M +1 -1      kabc/contact.cpp   1.1.2.29
  M +1 -1      kabc/contact.h   1.1.2.21
  M +3 -3      kcal/incidence.cpp   1.1.2.11
  M +1 -1      kcal/incidence.h   1.1.2.7
  M +1 -1      kcal/journal.cpp   1.1.2.7
  M +1 -1      kcal/journal.h   1.1.2.5
  M +1 -1      knotes/note.cpp   1.1.2.10
  M +1 -1      knotes/note.h   1.1.2.7
  M +3 -1      shared/kolabbase.cpp   1.1.2.18
  M +2 -2      shared/kolabbase.h   1.1.2.11


--- kdepim/kresources/kolab/kabc/contact.cpp  #1.1.2.28:1.1.2.29
@@ -1104,5 +1104,5 @@ QByteArray Kolab::Contact::loadSoundFrom
 }
 
-QString Kolab::Contact::producerID() const
+QString Kolab::Contact::productID() const
 {
   // TODO: When KAB has the version number in a header file, don't hardcode

--- kdepim/kresources/kolab/kabc/contact.h  #1.1.2.20:1.1.2.21
@@ -218,5 +218,5 @@ private:
   QByteArray loadSoundFromAddressee( const KABC::Sound& sound );
 
-  QString producerID() const;
+  QString productID() const;
 
   QString mGivenName;

--- kdepim/kresources/kolab/kcal/incidence.cpp  #1.1.2.10:1.1.2.11
@@ -165,5 +165,5 @@ bool Incidence::loadAttendeeAttribute( Q
         // sets it to true. This means the default setting is true.
         attendee.requestResponse = ( e.text().lower() != "false" );
-      else if ( tagName == "invitationSent" )
+      else if ( tagName == "invitation-sent" )
         // Like above, only this defaults to false
         attendee.invitationSent = ( e.text().lower() != "true" );
@@ -190,5 +190,5 @@ void Incidence::saveAttendeeAttribute( Q
   writeString( e, "request-response",
                ( attendee.requestResponse ? "true" : "false" ) );
-  writeString( e, "invitationSent",
+  writeString( e, "invitation-sent",
                ( attendee.invitationSent ? "true" : "false" ) );
   writeString( e, "role", attendee.role );
@@ -624,5 +624,5 @@ void Incidence::saveTo( KCal::Incidence*
 }
 
-QString Incidence::producerID() const
+QString Incidence::productID() const
 {
   return QString( "KOrganizer " ) + korgVersion + ", Kolab resource";

--- kdepim/kresources/kolab/kcal/incidence.h  #1.1.2.6:1.1.2.7
@@ -123,5 +123,5 @@ protected:
   void saveRecurrence( QDomElement& element ) const;
 
-  QString producerID() const;
+  QString productID() const;
 
   QString mSummary;

--- kdepim/kresources/kolab/kcal/journal.cpp  #1.1.2.6:1.1.2.7
@@ -178,5 +178,5 @@ void Journal::setFields( const KCal::Jou
 }
 
-QString Journal::producerID() const
+QString Journal::productID() const
 {
   return QString( "KOrganizer " ) + korgVersion + ", Kolab resource";

--- kdepim/kresources/kolab/kcal/journal.h  #1.1.2.4:1.1.2.5
@@ -92,5 +92,5 @@ protected:
   void setFields( const KCal::Journal* );
 
-  QString producerID() const;
+  QString productID() const;
 
   QString mSummary;

--- kdepim/kresources/kolab/knotes/note.cpp  #1.1.2.9:1.1.2.10
@@ -183,5 +183,5 @@ void Note::saveTo( KCal::Journal* journa
 }
 
-QString Note::producerID() const
+QString Note::productID() const
 {
   return QString( "KNotes %s, Kolab resource" ).arg( "KNOTES_VERSION" );

--- kdepim/kresources/kolab/knotes/note.h  #1.1.2.6:1.1.2.7
@@ -96,5 +96,5 @@ protected:
   void saveTo( KCal::Incidence* ) const;
 
-  QString producerID() const;
+  QString productID() const;
 
   QString mSummary;

--- kdepim/kresources/kolab/shared/kolabbase.cpp  #1.1.2.17:1.1.2.18
@@ -264,4 +264,6 @@ bool KolabBase::loadAttribute( QDomEleme
   else if ( tagName == "sensitivity" )
     setSensitivity( stringToSensitivity( element.text() ) );
+  else if ( tagName == "product-id" )
+    return true; // ignore this field
   else
     return false;
@@ -273,5 +275,5 @@ bool KolabBase::loadAttribute( QDomEleme
 bool KolabBase::saveAttributes( QDomElement& element ) const
 {
-  writeString( element, "producer-id", producerID() );
+  writeString( element, "product-id", productID() );
   writeString( element, "uid", uid() );
   writeString( element, "body", body() );

--- kdepim/kresources/kolab/shared/kolabbase.h  #1.1.2.10:1.1.2.11
@@ -142,6 +142,6 @@ protected:
   virtual bool saveAttributes( QDomElement& ) const;
 
-  // Return the producer ID
-  virtual QString producerID() const = 0;
+  // Return the product ID
+  virtual QString productID() const = 0;
 
   // Write a string tag


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