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

List:       kde-commits
Subject:    KDE/kdenetwork/kopete/protocols/groupwise
From:       Christian Ehrlicher <Ch.Ehrlicher () gmx ! de>
Date:       2008-12-07 17:55:32
Message-ID: 1228672532.571454.19751.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 894030 by chehrlic:

Q3ValueList<> --> QList<>

 M  +6 -6      gwaccount.cpp  
 M  +3 -4      gwaccount.h  
 M  +1 -1      gwmessagemanager.cpp  


--- trunk/KDE/kdenetwork/kopete/protocols/groupwise/gwaccount.cpp #894029:894030
@@ -196,8 +196,8 @@
 GroupWiseChatSession * GroupWiseAccount::findChatSessionByGuid( const \
GroupWise::ConferenceGuid & guid )  {
 	GroupWiseChatSession * chatSession = 0;
-	Q3ValueList<GroupWiseChatSession *>::ConstIterator it;
-	for ( it = m_chatSessions.begin(); it != m_chatSessions.end(); ++it )
+	QList<GroupWiseChatSession *>::ConstIterator it;
+	for ( it = m_chatSessions.constBegin(); it != m_chatSessions.constEnd(); ++it )
 	{
 		if ( (*it)->guid() == guid )
 		{
@@ -1164,7 +1164,7 @@
 	// record, in a folderitem, their display names and groupwise object id
 	// Set object id to 0 if not found - they do not exist on the server
 	bool topLevel = false;
-	Q3ValueList< FolderItem > folders;
+	QList< FolderItem > folders;
 	foreach ( Kopete::Group *group, parentContact->groups() )
 	{
 		if ( group->type() == Kopete::Group::TopLevel ) // no need to create it on the \
server @@ -1443,7 +1443,7 @@
 	kDebug() << "unregistering message manager:" << sess->guid();
 	if( isConnected () )
 		m_client->leaveConference( sess->guid() );
-	m_chatSessions.remove( sess );
+	m_chatSessions.removeAll( sess );
 	kDebug() << "m_chatSessions now contains:" << m_chatSessions.count() << " \
managers";  Kopete::ContactPtrList members = sess->members();
 	foreach( Kopete::Contact * contact, members )
@@ -1506,8 +1506,8 @@
 {
 	kDebug() << " for: " << accountId()
 		<< " containing: " << m_chatSessions.count() << " managers " << endl;
-	Q3ValueList<GroupWiseChatSession *>::ConstIterator it;
-	for ( it = m_chatSessions.begin() ; it != m_chatSessions.end(); ++it )
+	QList<GroupWiseChatSession *>::ConstIterator it;
+	for ( it = m_chatSessions.constBegin() ; it != m_chatSessions.constEnd(); ++it )
 		kDebug() << "guid: " << (*it)->guid();
 }
 
--- trunk/KDE/kdenetwork/kopete/protocols/groupwise/gwaccount.h #894029:894030
@@ -22,7 +22,8 @@
 #ifndef GW_ACCOUNT_H
 #define GW_ACCOUNT_H
 
-#include <QtCrypto>
+#include <QtCore/QList>
+#include <QtCrypto/QtCrypto>
 
 #include <kaction.h>
 
@@ -32,8 +33,6 @@
 #include "gwerror.h"
 
 #include <kopetepasswordedaccount.h>
-//Added by qt3to4:
-#include <Q3ValueList>
 
 class KActionMenu;
 
@@ -346,7 +345,7 @@
 
 	QString m_password;
 	QString m_initialReason;
-	Q3ValueList<GroupWiseChatSession*> m_chatSessions;
+	QList<GroupWiseChatSession*> m_chatSessions;
 	bool m_dontSync;
 	GWContactList * m_serverListModel;
 };
--- trunk/KDE/kdenetwork/kopete/protocols/groupwise/gwmessagemanager.cpp \
#894029:894030 @@ -387,7 +387,7 @@
 void GroupWiseChatSession::slotSearchedForUsers()
 {
 	// create an item for each result, in the block list
-	Q3ValueList< ContactDetails > selected = m_search->selectedResults();
+	QList< ContactDetails > selected = m_search->selectedResults();
 	if ( selected.count() )
 	{
 		QWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( \
view(false)->mainWidget()->topLevelWidget() ) :


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