Menu
▾
▴
[KMess-commits] SF.net SVN: kmess:[4838] branches/kmess/network-library/kmess/src
|
From: <sif...@us...> - 2009-05-16 19:32:46
|
Revision: 4838
http://kmess.svn.sourceforge.net/kmess/?rev=4838&view=rev
Author: sifcenter
Date: 2009-05-16 19:32:38 +0000 (Sat, 16 May 2009)
Log Message:
-----------
polished the ChatInformation class: removed one useless method.
Modified Paths:
--------------
branches/kmess/network-library/kmess/src/chat/chatmaster.cpp
branches/kmess/network-library/kmess/src/kmesstest.cpp
branches/kmess/network-library/kmess/src/network/chatinformation.cpp
branches/kmess/network-library/kmess/src/network/chatinformation.h
branches/kmess/network-library/kmess/src/network/msnchallengehandler.cpp
branches/kmess/network-library/kmess/src/network/msnnotificationconnection.cpp
Modified: branches/kmess/network-library/kmess/src/chat/chatmaster.cpp
===================================================================
--- branches/kmess/network-library/kmess/src/chat/chatmaster.cpp 2009-05-16 17:31:10 UTC (rev 4837)
+++ branches/kmess/network-library/kmess/src/chat/chatmaster.cpp 2009-05-16 19:32:38 UTC (rev 4838)
@@ -936,7 +936,7 @@
{
// Create a new offline switchboard connection to deliver the message. It can be converted to an
// online switchboard one if needed.
- switchboard = startSwitchboard( ChatInformation( 0, handle, "", 0, "", "", ChatInformation::CONNECTION_OFFLINE ) );
+ switchboard = startSwitchboard( ChatInformation( handle, "", 0, "", "", ChatInformation::CONNECTION_OFFLINE ) );
if( switchboard == 0 )
{
#ifdef KMESSDEBUG_CHATMASTER
Modified: branches/kmess/network-library/kmess/src/kmesstest.cpp
===================================================================
--- branches/kmess/network-library/kmess/src/kmesstest.cpp 2009-05-16 17:31:10 UTC (rev 4837)
+++ branches/kmess/network-library/kmess/src/kmesstest.cpp 2009-05-16 19:32:38 UTC (rev 4838)
@@ -199,7 +199,7 @@
MsnSwitchboardConnection *sb2 = new MsnSwitchboardConnection();
sb2 = kmess_->chatMaster_->createSwitchboardConnection( sb2, "con...@km..." );
// kmess_->chatMaster_->switchboardConnections_.append( sb2 );
- ChatInformation chatInfo2( kmess_->msnNotificationConnection_, "con...@km...", "127.0.0.1", 1234, "5678.8765", "-1", ChatInformation::CONNECTION_CHAT );
+ ChatInformation chatInfo2( "con...@km...", "127.0.0.1", 1234, "5678.8765", "-1", ChatInformation::CONNECTION_CHAT );
sb2->initialize( "con...@km..." );
sb2->start( chatInfo2 );
sb2->contactJoined( "con...@km...", "Contact 7", 0 );
@@ -212,7 +212,7 @@
{
MsnSwitchboardConnection *sb1 = new MsnSwitchboardConnection();
kmess_->chatMaster_->switchboardConnections_.append( sb1 );
- ChatInformation chatInfo1( kmess_->msnNotificationConnection_, "con...@km...", -1, ChatInformation::CONNECTION_OFFLINE );
+ ChatInformation chatInfo1( "con...@km...", -1, ChatInformation::CONNECTION_OFFLINE );
sb1->initialize( "con...@km..." );
sb1->start( chatInfo1 );
@@ -224,7 +224,7 @@
if( 0 )
{
MsnSwitchboardConnection *sb3 = new MsnSwitchboardConnection();
- ChatInformation chatInfo3( kmess_->msnNotificationConnection_, "con...@km...", "127.0.0.1", 1234, "5678.8765", "-1", ChatInformation::CONNECTION_OFFLINE );
+ ChatInformation chatInfo3( "con...@km...", "127.0.0.1", 1234, "5678.8765", "-1", ChatInformation::CONNECTION_OFFLINE );
sb3->initialize( "con...@km..." );
sb3->start( chatInfo3 );
kmess_->chatMaster_->switchboardConnections_.append( sb3 );
@@ -250,7 +250,7 @@
MsnSwitchboardConnection *sb4 = new MsnSwitchboardConnection();
sb4 = kmess_->chatMaster_->createSwitchboardConnection( sb4, "con...@km..." );
// kmess_->chatMaster_->switchboardConnections_.append( sb4 );
- ChatInformation chatInfo4( kmess_->msnNotificationConnection_, "con...@km...", "127.0.0.1", 1234, "5678.8765", "-1", ChatInformation::CONNECTION_CHAT );
+ ChatInformation chatInfo4( "con...@km...", "127.0.0.1", 1234, "5678.8765", "-1", ChatInformation::CONNECTION_CHAT );
sb4->initialize( "con...@km..." );
sb4->start( chatInfo4 );
sb4->contactJoined( "con...@km...", "Contact 7", 0 );
Modified: branches/kmess/network-library/kmess/src/network/chatinformation.cpp
===================================================================
--- branches/kmess/network-library/kmess/src/network/chatinformation.cpp 2009-05-16 17:31:10 UTC (rev 4837)
+++ branches/kmess/network-library/kmess/src/network/chatinformation.cpp 2009-05-16 19:32:38 UTC (rev 4838)
@@ -22,11 +22,9 @@
// The constructor for a user-started chat
-ChatInformation::ChatInformation( MsnNotificationConnection *parent, const QString& handle,
- int transactionId, ConnectionType type )
+ChatInformation::ChatInformation( const QString& handle, int transactionId, ConnectionType type )
: connectionType_(type)
, contactHandle_(handle)
- , notificationConnection_(parent)
, port_(0)
, requestTime_( QDateTime::currentDateTime().toTime_t() )
, transactionId_(transactionId)
@@ -37,15 +35,13 @@
// The constructor for a contact-started chat
-ChatInformation::ChatInformation( MsnNotificationConnection *parent, const QString& handle,
- const QString &ip, quint16 port, const QString &authorization, const QString &chatId,
- ConnectionType type )
+ChatInformation::ChatInformation( const QString& handle, const QString &ip, quint16 port, const QString &authorization,
+ const QString &chatId, ConnectionType type )
: authorization_(authorization)
, chatId_(chatId)
, connectionType_(type)
, contactHandle_(handle)
, ip_(ip)
- , notificationConnection_(parent)
, port_(port)
, requestTime_( QDateTime::currentDateTime().toTime_t() )
, transactionId_(0)
@@ -94,16 +90,8 @@
-// Return the notification connection that spawned this object
-MsnNotificationConnection * ChatInformation::getNotificationConnection() const
-{
- return notificationConnection_;
-}
-
-
-
// Return the switchboard server port
-quint16 ChatInformation::getPort() const
+const quint16& ChatInformation::getPort() const
{
return port_;
}
Modified: branches/kmess/network-library/kmess/src/network/chatinformation.h
===================================================================
--- branches/kmess/network-library/kmess/src/network/chatinformation.h 2009-05-16 17:31:10 UTC (rev 4837)
+++ branches/kmess/network-library/kmess/src/network/chatinformation.h 2009-05-16 19:32:38 UTC (rev 4838)
@@ -21,12 +21,7 @@
#include <QString>
-// Forward declarations
-class ContactList;
-class MsnNotificationConnection;
-
-
/**
* The container for switchboard connections information.
*
@@ -52,12 +47,10 @@
public:
// The constructor for a user-started chat
- ChatInformation( MsnNotificationConnection *parent, const QString& handle,
- int transactionId, ConnectionType type );
+ ChatInformation( const QString& handle, int transactionId, ConnectionType type );
// The constructor for a contact-started chat
- ChatInformation( MsnNotificationConnection *parent, const QString& handle,
- const QString &ip, quint16 port, const QString &authorization,
- const QString &chatId, ConnectionType type );
+ ChatInformation( const QString& handle, const QString &ip, quint16 port,
+ const QString &authorization, const QString &chatId, ConnectionType type );
// The destructor
~ChatInformation();
// Return the switchboard authorization
@@ -68,10 +61,8 @@
const QString& getContactHandle() const;
// Return the switchboard server ip
const QString& getIp() const;
- // Return the notification connection that spawned this object
- MsnNotificationConnection *getNotificationConnection() const;
// Return the switchboard server port
- quint16 getPort() const;
+ const quint16& getPort() const;
// Return the time of when the SB transfer request has been sent
int getTime() const;
// Return the transaction ID used in the "XFR" command.
@@ -95,8 +86,6 @@
QString contactHandle_;
// The switchboard server's ip
QString ip_;
- // The notification connection that spawned this object
- MsnNotificationConnection *notificationConnection_;
// The switchboard server's port
quint16 port_;
// The time when the SB transfer request was issued to the notification server
Modified: branches/kmess/network-library/kmess/src/network/msnchallengehandler.cpp
===================================================================
--- branches/kmess/network-library/kmess/src/network/msnchallengehandler.cpp 2009-05-16 17:31:10 UTC (rev 4837)
+++ branches/kmess/network-library/kmess/src/network/msnchallengehandler.cpp 2009-05-16 19:32:38 UTC (rev 4838)
@@ -49,7 +49,6 @@
MSNChallengeHandler::~MSNChallengeHandler()
{
-
}
Modified: branches/kmess/network-library/kmess/src/network/msnnotificationconnection.cpp
===================================================================
--- branches/kmess/network-library/kmess/src/network/msnnotificationconnection.cpp 2009-05-16 17:31:10 UTC (rev 4837)
+++ branches/kmess/network-library/kmess/src/network/msnnotificationconnection.cpp 2009-05-16 19:32:38 UTC (rev 4838)
@@ -1198,7 +1198,7 @@
#endif
// Send connection information object
- ChatInformation chatInformation( this, handle, server, port, auth, chatId, ChatInformation::CONNECTION_BACKGROUND );
+ ChatInformation chatInformation( handle, server, port, auth, chatId, ChatInformation::CONNECTION_BACKGROUND );
emit startSwitchboard( chatInformation );
}
@@ -2469,7 +2469,7 @@
// Open directly fake switchboards for offline contacts
if( type == ChatInformation::CONNECTION_OFFLINE )
{
- const ChatInformation* offlineChatInfo = new ChatInformation( this, handle, -1, type );
+ const ChatInformation* offlineChatInfo = new ChatInformation( handle, -1, type );
emit startSwitchboard( *offlineChatInfo );
return;
}
@@ -2478,7 +2478,7 @@
int transactionId = sendCommand( "XFR", "SB" );
// Store the pending request information so the return value can be handled.
- openRequests_.append( new ChatInformation( this, handle, transactionId, type ) );
+ openRequests_.append( new ChatInformation( handle, transactionId, type ) );
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|