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

List:       kde-commits
Subject:    kdenetwork/kopete/protocols/oscar
From:       Martijn Klingens <klingens () kde ! org>
Date:       2003-12-13 11:30:48
[Download RAW message or body]

CVS commit by mklingens: 

The second of the 4 patches approved by Will to clean up Oscar's use of the
outdated AIMBuddy* classes from Kit. This will not magically solve bug
61223 as I don't know the actual protocol at all, but it will hopefully
help those who do to make the required changes more easily.

All patches have been posted on kopete-devel already.

Patch 2: Remove the aimbuddylist.h from all .h files and using forward
         declares instead. This makes sure the code is not used unless
         there's an explicit #include in the .cpp file, making grepping
         easier and also speeding up compilation a bit.


  M +1 -0      oscaraccount.cpp   1.86
  M +1 -0      oscarcontact.cpp   1.134
  M +1 -0      aim/aimcontact.cpp   1.42
  M +2 -0      oscarsocket/oscarsocket.cpp   1.149
  M +4 -1      oscarsocket/oscarsocket.h   1.94


--- kdenetwork/kopete/protocols/oscar/oscaraccount.cpp  #1.85:1.86
@@ -18,4 +18,5 @@
 #include "oscaraccount.h"
 #include "aim.h"
+#include "aimbuddylist.h"
 
 #include "kopeteprotocol.h"

--- kdenetwork/kopete/protocols/oscar/oscarcontact.cpp  #1.133:1.134
@@ -39,4 +39,5 @@
 
 #include "aim.h"
+#include "aimbuddylist.h"
 #include "oscarsocket.h"
 #include "oscaraccount.h"

--- kdenetwork/kopete/protocols/oscar/oscarsocket/oscarsocket.cpp  #1.148:1.149
@@ -32,4 +32,6 @@
 #include <kextsock.h>
 
+#include "aimbuddylist.h"
+
 // ---------------------------------------------------------------------------------------
 

--- kdenetwork/kopete/protocols/oscar/oscarsocket/oscarsocket.h  #1.93:1.94
@@ -21,5 +21,4 @@
 #include "oscardirectconnection.h"
 #include "ssidata.h"
-#include "aimbuddylist.h"
 #include "oncomingsocket.h"
 #include "oscarsocket.icq.h"
@@ -32,4 +31,6 @@
 
 //class KFileItem;
+class AIMBuddyList;
+class AIMBuddy;
 class OscarAccount;
 class OscarContact;

--- kdenetwork/kopete/protocols/oscar/aim/aimcontact.cpp  #1.41:1.42
@@ -23,4 +23,5 @@
 #include "kopeteaway.h"
 #include "kopetemessagemanager.h"
+#include "aimbuddylist.h"
 #include "aimprotocol.h"
 #include "aimcontact.h"


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