[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 18:34:11
Message-ID: 1228674851.103233.22490.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 894044 by chehrlic:
Q3ValueList<> --> QList<>
M +3 -3 libgroupwise/chatroommanager.cpp
M +13 -13 libgroupwise/tasks/conferencetask.cpp
M +2 -3 libgroupwise/tasks/conferencetask.h
M +0 -2 libgroupwise/tasks/createcontacttask.cpp
M +2 -3 libgroupwise/tasks/pollsearchresultstask.cpp
M +2 -2 libgroupwise/tasks/pollsearchresultstask.h
M +0 -2 libgroupwise/tasks/searchchattask.cpp
M +5 -6 libgroupwise/tasks/updatecontacttask.cpp
M +2 -3 libgroupwise/tasks/updatecontacttask.h
M +1 -4 ui/gwaddcontactpage.h
M +8 -10 ui/gwprivacydialog.cpp
--- trunk/KDE/kdenetwork/kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp \
#894043:894044 @@ -65,9 +65,9 @@
if ( m_replace )
m_rooms.clear();
- Q3ValueList<ChatroomSearchResult> roomsFound = sct->results();
- Q3ValueList<ChatroomSearchResult>::Iterator it = roomsFound.begin();
- const Q3ValueList<ChatroomSearchResult>::Iterator end = roomsFound.end();
+ const QList<ChatroomSearchResult> roomsFound = sct->results();
+ QList<ChatroomSearchResult>::ConstIterator it = roomsFound.begin();
+ QList<ChatroomSearchResult>::ConstIterator end = roomsFound.end();
for ( ; it != end; ++it )
{
GroupWise::Chatroom c( *it );
--- trunk/KDE/kdenetwork/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp \
#894043:894044 @@ -172,41 +172,41 @@
client()->debug( "ConferenceTask::slotReceiveUserDetails()" );
// dequeue any events which are deliverable now we have these details
- Q3ValueListIterator< ConferenceEvent > end = m_pendingEvents.end();
- Q3ValueListIterator< ConferenceEvent > it = m_pendingEvents.begin();
+ QList< ConferenceEvent >::Iterator end = m_pendingEvents.end();
+ QList< ConferenceEvent >::Iterator it = m_pendingEvents.begin();
while ( it != end )
{
- Q3ValueListIterator< ConferenceEvent > current = it;
- ++it;
// if the details relate to event, try again to handle it
- if ( details.dn == (*current).user )
+ if ( details.dn == (*it).user )
{
- client()->debug( QString( " - got details for event involving %1" ).arg( \
(*current).user ) );
- switch ( (*current).type )
+ client()->debug( QString( " - got details for event involving %1" ).arg( \
(*it).user ) ); + switch ( (*it).type )
{
case GroupWise::ConferenceJoined:
client()->debug( "ConferenceJoined" );
- emit joined( *current );
+ emit joined( *it );
break;
case GroupWise::ReceiveMessage:
client()->debug( "ReceiveMessage" );
- emit message( *current );
+ emit message( *it );
break;
case GroupWise::ConferenceInvite:
client()->debug( "ConferenceInvite" );
- emit invited( *current );
+ emit invited( *it );
break;
case GroupWise::ConferenceInviteNotify:
client()->debug( "ConferenceInviteNotify" );
- emit otherInvited( *current );
+ emit otherInvited( *it );
break;
default:
client()->debug( "Queued an event while waiting for more data, but did not \
write a handler for the dequeue!" ); }
- m_pendingEvents.remove( current );
+ it = m_pendingEvents.erase( it );
client()->debug( QString( "Event handled - now %1 pending events" ).arg
( (uint)m_pendingEvents.count() ) );
- }
+ } else {
+ ++it;
+ }
}
}
--- trunk/KDE/kdenetwork/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.h \
#894043:894044 @@ -23,8 +23,7 @@
#include "gwerror.h"
#include "eventtask.h"
-//Added by qt3to4:
-#include <Q3ValueList>
+#include <QtCore/QList>
/**
* This Task is responsible for handling all conference related events, and \
signalling them up to @ref GroupWiseAccount @@ -70,7 +69,7 @@
void dumpConferenceEvent( ConferenceEvent & evt );
private:
// A list of events which are waiting for more data from the server before they can \
be exposed to the client
- Q3ValueList< ConferenceEvent > m_pendingEvents;
+ QList< ConferenceEvent > m_pendingEvents;
};
#endif
--- trunk/KDE/kdenetwork/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp \
#894043:894044 @@ -23,8 +23,6 @@
#include "createcontactinstancetask.h"
#include "createcontacttask.h"
-//Added by qt3to4:
-#include <Q3ValueList>
CreateContactTask::CreateContactTask(Task* parent): Task(parent)
{
--- trunk/KDE/kdenetwork/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp \
#894043:894044 @@ -25,8 +25,7 @@
#include "logintask.h"
#include "pollsearchresultstask.h"
-//Added by qt3to4:
-#include <Q3ValueList>
+#include <QtCore/QList>
using namespace GroupWise;
@@ -100,7 +99,7 @@
return true;
}
-Q3ValueList< GroupWise::ContactDetails > PollSearchResultsTask::results()
+QList< GroupWise::ContactDetails > PollSearchResultsTask::results()
{
return m_results;
}
--- trunk/KDE/kdenetwork/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h \
#894043:894044 @@ -42,11 +42,11 @@
void poll( const QString & queryHandle);
bool take( Transfer * transfer );
int queryStatus();
- Q3ValueList< GroupWise::ContactDetails > results();
+ QList< GroupWise::ContactDetails > results();
GroupWise::ContactDetails extractUserDetails( Field::FieldList & fields );
private:
int m_queryStatus;
- Q3ValueList< GroupWise::ContactDetails > m_results;
+ QList< GroupWise::ContactDetails > m_results;
};
#endif
--- trunk/KDE/kdenetwork/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp \
#894043:894044 @@ -20,8 +20,6 @@
#include <qdatetime.h>
#include <qtimer.h>
-//Added by qt3to4:
-#include <Q3ValueList>
#include "client.h"
#include "gwerror.h"
--- trunk/KDE/kdenetwork/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.cpp \
#894043:894044 @@ -21,8 +21,7 @@
#include "gwfield.h"
#include "updatecontacttask.h"
-//Added by qt3to4:
-#include <Q3ValueList>
+#include <QtCore/QList>
using namespace GroupWise;
@@ -40,13 +39,13 @@
return m_name;
}
-void UpdateContactTask::renameContact( const QString & newName, const \
Q3ValueList<ContactItem> & contactInstances ) +void UpdateContactTask::renameContact( \
const QString & newName, const QList<ContactItem> & contactInstances ) {
m_name = newName;
// build a list of delete, add fields that removes each instance on the server and \
then readds it with the new name Field::FieldList lst;
- const Q3ValueList<ContactItem>::ConstIterator end = contactInstances.end();
- for( Q3ValueList<ContactItem>::ConstIterator it = contactInstances.begin(); it != \
end; ++it ) + const QList<ContactItem>::ConstIterator end = contactInstances.end();
+ for( QList<ContactItem>::ConstIterator it = contactInstances.begin(); it != end; \
++it ) {
Field::FieldList contactFields;
contactFields.append( new Field::SingleField( Field::NM_A_SZ_OBJECT_ID, 0, \
NMFIELD_TYPE_UTF8, (*it).id ) ); @@ -59,7 +58,7 @@
lst.append(
new Field::MultiField( Field::NM_A_FA_CONTACT, NMFIELD_METHOD_DELETE, 0, \
NMFIELD_TYPE_ARRAY, contactFields ) ); }
- for( Q3ValueList<ContactItem>::ConstIterator it = contactInstances.begin(); it != \
end; ++it ) + for( QList<ContactItem>::ConstIterator it = contactInstances.begin(); \
it != end; ++it ) {
Field::FieldList contactFields;
contactFields.append( new Field::SingleField( Field::NM_A_SZ_OBJECT_ID, 0, \
NMFIELD_TYPE_UTF8, (*it).id ) );
--- trunk/KDE/kdenetwork/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.h \
#894043:894044 @@ -25,8 +25,7 @@
#include "libgroupwise_export.h"
#include "updateitemtask.h"
-//Added by qt3to4:
-#include <Q3ValueList>
+#include <QtCore/QList>
/**
* Renames a contact on the server
@@ -38,7 +37,7 @@
public:
UpdateContactTask(Task* parent);
~UpdateContactTask();
- void renameContact( const QString& newName, const \
Q3ValueList<GroupWise::ContactItem> & contactInstances ); + void renameContact( const \
QString& newName, const QList<GroupWise::ContactItem> & contactInstances ); QString \
displayName(); private:
QString m_name;
--- trunk/KDE/kdenetwork/kopete/protocols/groupwise/ui/gwaddcontactpage.h \
#894043:894044 @@ -26,9 +26,7 @@
#include "gwerror.h"
#include <addcontactpage.h>
-//Added by qt3to4:
-#include <QLabel>
-#include <Q3ValueList>
+#include <QtGui/QLabel>
class QLabel;
namespace Kopete { class Account; }
@@ -60,7 +58,6 @@
private slots:
void searchResult(bool valid);
protected:
- Q3ValueList< GroupWise::ContactDetails > m_searchResults;
unsigned char searchOperation( int comboIndex );
GroupWiseAccount * m_account;
GroupWiseAddUI * m_gwAddUI;
--- trunk/KDE/kdenetwork/kopete/protocols/groupwise/ui/gwprivacydialog.cpp \
#894043:894044 @@ -17,15 +17,13 @@
*************************************************************************
*/
-#include <qlabel.h>
#include <q3listbox.h>
-#include <qpushbutton.h>
-#include <qstringlist.h>
-#include <QPainter>
#include <q3listview.h>
-//Added by qt3to4:
-#include <QPixmap>
-#include <Q3ValueList>
+#include <QtCore/QStringList>
+#include <QtCore/QList>
+#include <QtGui/QPainter>
+#include <QtGui/QPixmap>
+#include <QtGui/QLabel>
#include <kdebug.h>
#include <kiconloader.h>
@@ -202,9 +200,9 @@
void GroupWisePrivacyDialog::slotSearchedForUsers()
{
// create an item for each result, in the block list
- Q3ValueList< ContactDetails > selected = m_search->selectedResults();
- Q3ValueList< ContactDetails >::Iterator it = selected.begin();
- const Q3ValueList< ContactDetails >::Iterator end = selected.end();
+ QList< ContactDetails > selected = m_search->selectedResults();
+ QList< ContactDetails >::Iterator it = selected.begin();
+ const QList< ContactDetails >::Iterator end = selected.end();
QPixmap icon = m_account->protocol()->groupwiseAvailable.iconFor( m_account, 16 );
for ( ; it != end; ++it )
{
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic