[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-10 9:58:52
Message-ID: 20050410095852.4A226495 () office ! kde ! org
[Download RAW message or body]

CVS commit by ogoffart: 

Remove some FIXME


  M +3 -2      kopeteaccountmanager.cpp   1.67
  M +0 -5      kopetecontact.cpp   1.234
  M +5 -11     kopetecontactlist.cpp   1.143
  M +1 -1      kopetegroup.cpp   1.47
  M +1 -1      kopetemessage.cpp   1.184


--- kdenetwork/kopete/libkopete/kopeteaccountmanager.cpp  #1.66:1.67
@@ -151,6 +151,7 @@ void AccountManager::setOnlineStatus( ui
 QColor AccountManager::guessColor( Protocol *protocol ) const
 {
-        // FIXME: Use a different algoritm. It should check if the color is really \
                not
-        //        used - Olivier
+        // In a perfect wold, we should check if the color is actually not used by \
the account. +        // Anyway, this is not really required,  It would be a \
difficult job for about nothing more. +        //   -- Olivier
         int protocolCount = 0;
 

--- kdenetwork/kopete/libkopete/kopetecontact.cpp  #1.233:1.234
@@ -187,9 +187,4 @@ void Contact::slotAddContact()
 KPopupMenu* Contact::popupMenu( ChatSession *manager )
 {
-        // FIXME:
-        // This should perhaps be KActionCollection * Contact::contactActions()
-        // to avoid passing around KPopupMenu's (Jason)
-        //
-
         // Build the menu
         KPopupMenu *menu = new KPopupMenu();

--- kdenetwork/kopete/libkopete/kopetecontactlist.cpp  #1.142:1.143
@@ -170,17 +170,11 @@ MetaContact *ContactList::findMetaContac
 MetaContact* ContactList::findMetaContactByContactId( const QString &contactId ) \
const  {
-        QPtrListIterator<MetaContact> it( d->contacts );
-        //FIXME: This loop isn't very efficient
-                // maybe it's more efficient to loop accounts and use the \
Account::Contact  QDict  -Olivier +        QPtrList<Account> \
acts=AccountManager::self()->accounts(); +        QPtrListIterator<Account> it( acts \
);  for ( ; it.current(); ++it )
         {
-                QPtrList<Contact> cl = it.current()->contacts();
-                QPtrListIterator<Contact> kcit ( cl );
-
-                for ( ; kcit.current(); ++kcit )
-                {
-                        if ( kcit.current()->contactId() == contactId )
-                                return kcit.current()->metaContact();
-                }
+                Contact *c=(*it)->contacts()[contactId];
+                if(c && c->metaContact())
+                        return c->metaContact();
         }
         return 0L;

--- kdenetwork/kopete/libkopete/kopetegroup.cpp  #1.46:1.47
@@ -220,5 +220,5 @@ bool Group::fromXML( const QDomElement &
         }
 
-        //FIXME: this workaround allows to save data for the top-level group
+        //this allows to save data for the top-level group in the top-level group
         return ( d->type == Normal );
 }

--- kdenetwork/kopete/libkopete/kopetemessage.cpp  #1.183:1.184
@@ -519,5 +519,5 @@ QDomElement Message::contactNode( QDomDo
         contactNode.appendChild( metacontactNameNode );
 
-        // FIXME: protocol() returns NULL here in the style preview in appearance \
config. +        // protocol() returns NULL here in the style preview in appearance \
                config.
         // this isn't the right place to work around it, since contacts should never \
have  // no protocol, but it works for now.


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