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

List:       kde-commits
Subject:    kdeextragear-2/konversation/konversation
From:       Shintaro Matsuoka <shin () shoegazed ! org>
Date:       2004-10-13 14:56:48
Message-ID: 20041013145648.997FA16CEB () office ! kde ! org
[Download RAW message or body]

CVS commit by shin: 

remove a foolish condition


  M +4 -9      dcctransfer.cpp   1.82


--- kdeextragear-2/konversation/konversation/dcctransfer.cpp  #1.81:1.82
@@ -402,13 +402,8 @@ unsigned long DccTransfer::getCPS() cons
 QString DccTransfer::getSenderAddressPrettyText() const
 {
-  if( m_dccType == Send && ( !m_ownIp.isEmpty() || m_ownPort.isEmpty() ) )
-    return QString( "%1:%2" )
-             .arg( !m_ownIp.isEmpty() ? m_ownIp : QString( "?" ) )
-             .arg( !m_ownPort.isEmpty() ? m_ownPort : QString( "?" ) );
-  if( m_dccType == Receive && ( !m_partnerIp.isEmpty() || m_partnerPort.isEmpty() ) )
-    return QString( "%1:%2" )
-             .arg( !m_partnerIp.isEmpty() ? m_partnerIp : QString( "?" ) )
-             .arg( !m_partnerPort.isEmpty() ? m_partnerPort : QString( "?" ) );
-  return QString::null;
+  if( m_dccType == Send )
+    return QString( "%1:%2" ).arg( m_ownIp ).arg( m_ownPort );
+  else
+    return QString( "%1:%2" ).arg( m_partnerIp ).arg( m_partnerPort );
 }
 


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