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

List:       kde-commits
Subject:    kdenetwork/kopete/libkopete
From:       Olivier Goffart <ogoffart () kde ! org>
Date:       2005-04-04 17:15:21
Message-ID: 20050404171521.52E2B63E () office ! kde ! org
[Download RAW message or body]

CVS commit by ogoffart: 

Change cack the return value of Account::addContact from bool to MetaContact
I need it in the contactAdded dialog i'm about to commit.


  M +3 -3      kopeteaccount.cpp   1.141
  M +2 -3      kopeteaccount.h   1.89


--- kdenetwork/kopete/libkopete/kopeteaccount.cpp  #1.140:1.141
@@ -221,5 +221,5 @@ const QDict<Contact>& Account::contacts(
 
 
-bool Account::addContact( const QString &contactId, const QString &displayName , \
Group *group, AddMode mode  ) +Kopete::MetaContact* Account::addContact( const \
QString &contactId, const QString &displayName , Group *group, AddMode mode  )  {
 
@@ -280,10 +280,10 @@ bool Account::addContact( const QString 
                 {
                         delete parentContact;
-                        return false;
+                        return 0L;
                 }
         }
 
         ContactList::self()->addMetaContact( parentContact );
-        return true;
+        return parentContact;
 }
 

--- kdenetwork/kopete/libkopete/kopeteaccount.h  #1.88:1.89
@@ -249,8 +249,7 @@ public:
          * @param group the group to add the created metacontact to, or 0 for the \
                top-level group.
          * @param mode the mode used to add the contact. Use DontChangeKABC when \
                deserializing.
-         * @return @c true if creation of the contact succeeded or the contact was \
                already in the list,
-         *         @c false otherwise.
+         * @return the new created metacontact or 0L if the operation failed
          */
-        bool addContact( const QString &contactId, const QString &displayName = \
QString::null, Group *group = 0, AddMode mode = DontChangeKABC ) ; +        \
MetaContact* addContact( const QString &contactId, const QString &displayName = \
QString::null, Group *group = 0, AddMode mode = DontChangeKABC ) ;  
         /**


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