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

List:       kde-commits
Subject:    KDE/kdenetwork/kopete/protocols/jabber
From:       Christian Ehrlicher <Ch.Ehrlicher () gmx ! de>
Date:       2007-02-21 19:00:34
Message-ID: 1172084434.322347.28441.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 636050 by chehrlic:

remove one q3ptrlist
warnings--

 M  +5 -0      CMakeLists.txt  
 M  +5 -2      jabbercontact.cpp  
 M  +1 -1      jabbercontact.h  
 M  +0 -2      ui/dlgjabbersendraw.cpp  
 M  +2 -2      ui/jabberregisteraccount.cpp  


--- trunk/KDE/kdenetwork/kopete/protocols/jabber/CMakeLists.txt #636049:636050
@@ -3,6 +3,11 @@
 add_subdirectory( icons ) 
 add_subdirectory( libiris ) 
 
+# we can't use KDE_FULL_TEMPLATE_EXPORT_INSTANTIATION because libiris is an external lib
+if(MSVC)
+  add_definitions(-DIRIS_FULL_TEMPLATE_EXPORT_INSTANTIATION)
+endif(MSVC)
+
 message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: skipped subdir $(JINGLE)")
 include_directories( 
 ${KOPETE_INCLUDES} 
--- trunk/KDE/kdenetwork/kopete/protocols/jabber/jabbercontact.cpp #636049:636050
@@ -801,7 +801,7 @@
 
 	JabberChatSession *manager = static_cast<JabberChatSession *>(sender);
 
-	mManagers.remove ( mManagers.find ( manager ) );
+	mManagers.removeAll ( manager );
 
 }
 
@@ -862,8 +862,11 @@
 	 */
 	if ( !resource.isEmpty () )
 	{
-		for ( JabberChatSession *mManager = mManagers.first (); mManager; mManager = mManagers.next () )
+		QList<JabberChatSession*>::iterator it = mManagers.begin();
+		QList<JabberChatSession*>::iterator end = mManagers.end();
+		for ( ; it != end ; ++it )
 		{
+			JabberChatSession *mManager = *it;
 			if ( mManager->resource().isEmpty () || ( mManager->resource () == resource ) )
 			{
 				// we found a matching manager, return this one
--- trunk/KDE/kdenetwork/kopete/protocols/jabber/jabbercontact.h #636049:636050
@@ -238,7 +238,7 @@
 	 * The casts in manager() and slotChatSessionDeleted()
 	 * are thus legal.
 	 */
-	Q3PtrList<JabberChatSession> mManagers;
+	QList<JabberChatSession*> mManagers;
 
 	/**
 	 * Indicates whether the vCard is currently
--- trunk/KDE/kdenetwork/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp #636049:636050
@@ -18,9 +18,7 @@
 
 #include "dlgjabbersendraw.h"
 
-#include <q3combobox.h>
 #include <qpushbutton.h>
-#include <q3textedit.h>
 #include <kdebug.h>
 #include "jabberclient.h"
 
--- trunk/KDE/kdenetwork/kopete/protocols/jabber/ui/jabberregisteraccount.cpp #636049:636050
@@ -128,8 +128,8 @@
 void JabberRegisterAccount::validateData ()
 {
 
-	int valid = true;
-	int passwordHighlight = false;
+	bool valid = true;
+	bool passwordHighlight = false;
 
 	if ( mMainWidget->leServer->text().isEmpty () )
 	{
[prev in list] [next in list] [prev in thread] [next in thread]