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

List:       kde-commits
Subject:    kdenetwork/kopete/protocols/msn
From:       Martijn Klingens <klingens () kde ! org>
Date:       2003-08-29 10:37:47
[Download RAW message or body]

CVS commit by mklingens: 

Hmm, does kdenetwork turn off automatic conversions from QString to
char* completely? Even MSN didn't compile and I expect I'll need to fix
some other plugins too.

Anyway, I think it's good, as it even unconvered weird logic.

    void myFunction( QString foo )
    {
        if( foo );

It certainly builds, and even works, but is certainly flawed code to rely
on the converted pointer being non-NULL.


  M +1 -1      msnaccount.cpp   1.40
  M +5 -6      msnnotifysocket.cpp   1.111


--- kdenetwork/kopete/protocols/msn/msnaccount.cpp  #1.39:1.40
@@ -933,5 +933,5 @@ void MSNAccount::slotCreateChat( const Q
                 KGlobal::config()->setGroup( "MSN" );
                 bool notifyNewChat = KGlobal::config()->readBoolEntry( "NotifyNewChat", false );
-                if ( ID && notifyNewChat )
+                if ( !ID.isEmpty() && notifyNewChat )
                 {
                         //this temporary message should open the window if they not exist

--- kdenetwork/kopete/protocols/msn/msnnotifysocket.cpp  #1.110:1.111
@@ -374,5 +374,5 @@ void MSNNotifySocket::parseCommand( cons
         {
                 kdDebug(14140) << "Sending final Authentication" << endl;
-                KMD5 context( data.section( ' ', 0, 0 ) + "Q1P7W2E4J9R8U3S5" );
+                KMD5 context( ( data.section( ' ', 0, 0 ) + "Q1P7W2E4J9R8U3S5" ).utf8() );
                 sendCommand( "QRY", "msmsgs@msnmsgr.com", true,
                         context.hexDigest());
@@ -451,11 +451,10 @@ void MSNNotifySocket::parseCommand( cons
                 time_t actualTime;
                 time(&actualTime);
-                QString sl=QString::number(  (unsigned long)actualTime - m_loginTime.toULong()   );
-
-                QString md5this(m_MSPAuth+sl+m_password);
-                KMD5 md5(md5this);
+                QString sl = QString::number( ( unsigned long ) actualTime - m_loginTime.toULong() );
 
+                QString md5this( m_MSPAuth + sl + m_password );
+                KMD5 md5( md5this.utf8() );
 
-                QString hotmailRequest ="<html>\n"
+                QString hotmailRequest = "<html>\n"
                         "<head>\n"
                                 "<noscript>\n"


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

Configure | About | News | Add a list | Sponsored by KoreLogic