rendered paste bodyIndex: src/application.cpp===================================================================--- src/application.cpp (revision 921937)+++ src/application.cpp (working copy)@@ -62,7 +62,7 @@ KonversationApplication::~KonversationApplication() {- kDebug() << k_funcinfo << endl;+ kDebug(); Server::_stashRates(); Preferences::self()->writeConfig(); saveOptions(false);Index: src/dcc/transfersend.cpp===================================================================--- src/dcc/transfersend.cpp (revision 921937)+++ src/dcc/transfersend.cpp (working copy)@@ -53,7 +53,7 @@ DccTransferSend::DccTransferSend(QObject* parent) : DccTransfer( DccTransfer::Send, parent ) {- kDebug() << "DccTransferSend::DccTransferSend()" << endl;+ kDebug(); m_serverSocket = 0; m_sendSocket = 0;@@ -73,7 +73,7 @@ void DccTransferSend::cleanUp() {- kDebug() << "DccTransferSend::cleanUp()" << endl;+ kDebug(); stopConnectionTimer(); finishTransferLogger(); if ( !m_tmpFile.isEmpty() )@@ -132,7 +132,7 @@ bool DccTransferSend::queue() {- kDebug() << "DccTransferSend::queue()" << endl;+ kDebug(); if ( getStatus() != Configuring ) return false;@@ -166,13 +166,13 @@ ifr.ifr_addr.sa_family = AF_INET; if ( ioctl( sock, SIOCGIFADDR, &ifr ) >= 0 ) m_ownIp = inet_ntoa( ( (struct sockaddr_in *)&ifr.ifr_addr )->sin_addr );- kDebug() << "Falling back to IPv4 address " << m_ownIp << endl;+ kDebug() << "Falling back to IPv4 address " << m_ownIp; #endif } } m_fastSend = Preferences::self()->dccFastSend();- kDebug() << "DccTransferSend::DccTransferSend(): Fast DCC send: " << m_fastSend << endl;+ kDebug() << "Fast DCC send: " << m_fastSend; //Check the file exists if ( !KIO::NetAccess::exists( m_fileURL, true, NULL ) )@@ -186,7 +186,7 @@ if ( !KIO::NetAccess::download( m_fileURL, m_tmpFile, NULL ) ) { failed( i18n( "Could not retrieve \"%1\"", m_fileURL.prettyUrl() ) );- kDebug() << "DccTransferSend::DccTransferSend(): KIO::NetAccess::download() failed. reason: " << KIO::NetAccess::lastErrorString() << endl;+ kDebug() << "KIO::NetAccess::download() failed. reason: " << KIO::NetAccess::lastErrorString(); return false; } @@ -222,7 +222,7 @@ void DccTransferSend::abort() // public slot {- kDebug() << "DccTransferSend::abort()" << endl;+ kDebug(); setStatus( Aborted ); cleanUp();@@ -231,7 +231,7 @@ void DccTransferSend::start() // public slot {- kDebug() << "DccTransferSend::start()" << endl;+ kDebug(); if ( getStatus() != Queued ) return;@@ -241,7 +241,7 @@ Server* server = KonversationApplication::instance()->getConnectionManager()->getServerByConnectionId( m_connectionId ); if ( !server ) {- kDebug() << "DccTransferSend::start(): could not retrieve the instance of Server. Connection id: " << m_connectionId << endl;+ kDebug() << "could not retrieve the instance of Server. Connection id: " << m_connectionId; failed( i18n( "Could not send a DCC SEND request to the partner via the IRC server." ) ); return; }@@ -249,7 +249,7 @@ if ( !m_reverse ) { // Normal DCC SEND- kDebug() << "DccTransferSend::start(): normal DCC SEND" << endl;+ kDebug() << "normal DCC SEND"; // Set up server socket QString failedReason;@@ -270,7 +270,7 @@ // Get own port number m_ownPort = QString::number( DccCommon::getServerSocketPort( m_serverSocket ) ); - kDebug() << "DccTransferSend::start(): own Address=" << m_ownIp << ":" << m_ownPort << endl;+ kDebug() << "Own Address=" << m_ownIp << ":" << m_ownPort; startConnectionTimer( Preferences::self()->dccSendTimeout() ); @@ -279,13 +279,13 @@ else { // Passive DCC SEND- kDebug() << "DccTransferSend::start(): passive DCC SEND" << endl;+ kDebug() << "Passive DCC SEND"; int tokenNumber = KonversationApplication::instance()->getDccTransferManager()->generateReverseTokenNumber(); // TODO: should we append a letter "T" to this token? m_reverseToken = QString::number( tokenNumber ); - kDebug() << "DccTransferSend::start(): passive DCC key(token): " << m_reverseToken << endl;+ kDebug() << "Passive DCC key(token): " << m_reverseToken; server->dccPassiveSendRequest( m_partnerNick, m_fileName, getNumericalIpText( m_ownIp ), m_fileSize, m_reverseToken ); }@@ -314,7 +314,7 @@ // public bool DccTransferSend::setResume( unsigned long position ) {- kDebug() << "DccTransferSend::setResume(): position=" << position << endl;+ kDebug() << "Position=" << position; if ( getStatus() > WaitingRemote ) return false;@@ -331,7 +331,7 @@ { // Normal DCC - kDebug() << "DccTransferSend::acceptClient()" << endl;+ kDebug(); stopConnectionTimer(); @@ -377,7 +377,7 @@ void DccTransferSend::writeData() // slot {- //kDebug() << "DccTransferSend::writeData()" << endl;+ //kDebug(); if ( !m_fastSend ) { m_sendSocket->enableWrite( false );@@ -391,7 +391,7 @@ if ( (KIO::fileoffset_t)m_fileSize <= m_transferringPosition ) { Q_ASSERT( (KIO::fileoffset_t)m_fileSize == m_transferringPosition );- kDebug() << "DccTransferSend::writeData(): Done." << endl;+ kDebug() << "Done."; m_sendSocket->enableWrite( false ); // there is no need to call this function anymore } }@@ -399,7 +399,7 @@ void DccTransferSend::getAck() // slot {- //kDebug() << "DccTransferSend::getAck()" << endl;+ //kDebug(); if ( !m_fastSend && m_transferringPosition < (KIO::fileoffset_t)m_fileSize ) { m_sendSocket->enableWrite( true );@@ -412,7 +412,7 @@ pos = intel( pos ); if ( pos == m_fileSize ) {- kDebug() << "DccTransferSend::getAck(): Received final ACK." << endl;+ kDebug() << "Received final ACK."; finishTransferLogger(); setStatus( Done ); cleanUp();@@ -424,13 +424,13 @@ void DccTransferSend::slotGotSocketError( int errorCode ) {- kDebug() << "DccTransferSend::slotGotSocketError(): code = " << errorCode << " string = " << m_serverSocket->errorString() << endl;+ kDebug() << "code = " << errorCode << " string = " << m_serverSocket->errorString(); failed( i18n( "Socket error: %1", m_serverSocket->errorString() ) ); } void DccTransferSend::startConnectionTimer( int sec ) {- kDebug() << "DccTransferSend::startConnectionTimer()"<< endl;+ kDebug(); stopConnectionTimer(); m_connectionTimer->start(sec*1000); }@@ -439,14 +439,14 @@ { if ( m_connectionTimer->isActive() ) {- kDebug() << "DccTransferSend::stopConnectionTimer(): stop" << endl;+ kDebug() << "stop"; m_connectionTimer->stop(); } } void DccTransferSend::slotConnectionTimeout() // slot {- kDebug() << "DccTransferSend::slotConnectionTimeout()" << endl;+ kDebug(); failed( i18n( "Timed out" ) ); } @@ -457,12 +457,12 @@ void DccTransferSend::slotServerSocketClosed() {- kDebug() << "DccTransferSend::slotServerSocketClosed()" << endl;+ kDebug(); } void DccTransferSend::slotSendSocketClosed() {- kDebug() << "DccTransferSend::slotSendSocketClosed()" << endl;+ kDebug(); finishTransferLogger(); if ( getStatus() == Transferring && m_transferringPosition < (KIO::fileoffset_t)m_fileSize ) failed( i18n( "Remote user disconnected" ) );Index: src/dcc/dcccommon.cpp===================================================================--- src/dcc/dcccommon.cpp (revision 921937)+++ src/dcc/dcccommon.cpp (working copy)@@ -66,7 +66,7 @@ ownIp = server->getOwnIpByNetworkInterface(); } - kDebug() << "DccCommon::getOwnIp(): " << ownIp << endl;+ kDebug() << ownIp; return ownIp; } Index: src/dcc/transferrecv.cpp===================================================================--- src/dcc/transferrecv.cpp (revision 921937)+++ src/dcc/transferrecv.cpp (working copy)@@ -63,7 +63,7 @@ DccTransferRecv::DccTransferRecv(QObject* parent) : DccTransfer( DccTransfer::Receive, parent ) {- kDebug() << "DccTransferRecv::DccTransferRecv()" << endl;+ kDebug(); m_serverSocket = 0; m_recvSocket = 0;@@ -92,7 +92,7 @@ void DccTransferRecv::cleanUp() {- kDebug() << "DccTransferRecv::cleanUp()" << endl;+ kDebug(); stopConnectionTimer(); finishTransferLogger();@@ -167,7 +167,7 @@ bool DccTransferRecv::queue() {- kDebug() << "DccTransferRecv::queue()" << endl;+ kDebug(); if ( getStatus() != Configuring ) return false;@@ -234,7 +234,7 @@ void DccTransferRecv::abort() // public slot {- kDebug() << "DccTransferRecv::abort()" << endl;+ kDebug(); if(m_writeCacheHandler) {@@ -248,7 +248,7 @@ void DccTransferRecv::start() // public slot {- kDebug() << "DccTransferRecv::start() [BEGIN]" << endl;+ kDebug() << "[BEGIN]"; if ( getStatus() != Queued ) return;@@ -257,15 +257,15 @@ prepareLocalKio( false, false ); - kDebug() << "DccTransferRecv::start() [END]" << endl;+ kDebug() << "[END]"; } void DccTransferRecv::prepareLocalKio( bool overwrite, bool resume, KIO::fileoffset_t startPosition /* = 0 */ ) {- kDebug() << "DccTransferRecv::prepareLocalKio()" << endl+ kDebug() << "DccTransferRecv::prepareLocalKio(): URL: " << m_fileURL << endl << "DccTransferRecv::prepareLocalKio(): Overwrite: " << overwrite << endl- << "DccTransferRecv::prepareLocalKio(): Resume: " << resume << " (Position: " << QString::number( startPosition ) << ")" << endl;+ << "DccTransferRecv::prepareLocalKio(): Resume: " << resume << " (Position: " << QString::number( startPosition ) << ")"; m_resumed = resume; m_transferringPosition = startPosition;@@ -289,7 +289,7 @@ if ( !transferJob ) {- kDebug() << "DccTransferRecv::prepareLocalKio(): KIO::put() returned NULL. what happened?" << endl;+ kDebug() << "KIO::put() returned NULL. what happened?"; failed( i18n( "Could not create a KIO instance" ) ); return; }@@ -347,8 +347,8 @@ void DccTransferRecv::slotLocalCanResume( KIO::Job* job, KIO::filesize_t size ) {- kDebug() << "DccTransferRecv::slotLocalCanResume() [BEGIN]" << endl- << "DccTransferRecv::slotLocalCanResume(): size: " << QString::number( size ) << endl;+ kDebug() << "[BEGIN]" << endl+ << "size: " << QString::number( size ); if ( size != 0 ) {@@ -382,12 +382,12 @@ } } - kDebug() << "DccTransferRecv::slotLocalCanResume() [END]" << endl;+ kDebug() << "[END]"; } void DccTransferRecv::slotLocalGotResult( KJob* job ) {- kDebug() << "DccTransferRecv::slotLocalGotResult() [BEGIN]" << endl;+ kDebug() << "[BEGIN]"; KIO::TransferJob* transferJob = static_cast<KIO::TransferJob*>( job ); disconnect( transferJob, 0, 0, 0 );@@ -396,7 +396,7 @@ { case 0: // no error kDebug() << "DccTransferRecv::slotLocalGotResult(): job->error() returned 0." << endl- << "DccTransferRecv::slotLocalGotResult(): Why was I called in spite of no error?" << endl;+ << "DccTransferRecv::slotLocalGotResult(): Why was I called in spite of no error?"; break; case KIO::ERR_FILE_ALREADY_EXIST: askAndPrepareLocalKio( i18n( "<b>The file already exists.</b><br>"@@ -415,12 +415,12 @@ DccResumeDialog::RA_Rename ); } - kDebug() << "DccTransferRecv::slotLocalGotResult() [END]" << endl;+ kDebug() << "[END]"; } void DccTransferRecv::slotLocalReady( KIO::Job* job ) {- kDebug() << "DccTransferRecv::slotLocalReady()" << endl;+ kDebug(); KIO::TransferJob* transferJob = static_cast<KIO::TransferJob*>( job ); @@ -467,19 +467,19 @@ void DccTransferRecv::requestResume() {- kDebug() << "DccTransferRecv::requestResume()" << endl;+ kDebug(); setStatus( WaitingRemote, i18n( "Waiting for remote host's acceptance" ) ); startConnectionTimer( 30 ); - kDebug() << "DccTransferRecv::requestResume(): requesting resume for " << m_partnerNick << " file " << m_fileName << " partner " << m_partnerPort << endl;+ kDebug() << "Requesting resume for " << m_partnerNick << " file " << m_fileName << " partner " << m_partnerPort; //TODO m_filename could have been sanitized - will this effect this? Server* server = KonversationApplication::instance()->getConnectionManager()->getServerByConnectionId( m_connectionId ); if ( !server ) {- kDebug() << "DccTransferSend::start(): could not retrieve the instance of Server. Connection id: " << m_connectionId << endl;+ kDebug() << "Could not retrieve the instance of Server. Connection id: " << m_connectionId; failed( i18n( "Could not send DCC RECV resume request to the partner via the IRC server." ) ); return; }@@ -490,15 +490,15 @@ // public slot void DccTransferRecv::startResume( unsigned long position ) {- kDebug() << "DccTransferRecv::startResume(): position: " << position << endl;+ kDebug() << "Position:" << position; stopConnectionTimer(); if ( (unsigned long)m_transferringPosition != position ) {- kDebug() << "DccTransferRecv::startResume(): remote responsed an unexpected position" << endl+ kDebug() << "DccTransferRecv::startResume(): remote responsed an unexpected position"<< endl << "DccTransferRecv::startResume(): expected: " << QString::number( m_transferringPosition ) << endl- << "DccTransferRecv::startResume(): remote response: " << position << endl;+ << "DccTransferRecv::startResume(): remote response: " << position; failed( i18n( "Unexpected response from remote host" ) ); return; }@@ -508,7 +508,7 @@ void DccTransferRecv::connectToSendServer() {- kDebug() << "DccTransferRecv::connectToSendServer()" << endl;+ kDebug(); // connect to sender @@ -527,7 +527,7 @@ connect( m_recvSocket, SIGNAL( connected( const KNetwork::KResolverEntry& ) ), this, SLOT( startReceiving() ) ); connect( m_recvSocket, SIGNAL( gotError( int ) ), this, SLOT( connectionFailed( int ) ) ); - kDebug() << "DccTransferRecv::connectToServer(): attempting to connect to " << m_partnerIp << ":" << m_partnerPort << endl;+ kDebug() << "Attempting to connect to " << m_partnerIp << ":" << m_partnerPort; m_recvSocket->connect(); }@@ -578,7 +578,7 @@ void DccTransferRecv::startReceiving() {- kDebug() << "DccTransferRecv::startReceiving()" << endl;+ kDebug(); m_recvSocket->setBlocking( false ); // asynchronous mode @@ -599,13 +599,13 @@ // slot void DccTransferRecv::connectionFailed( int errorCode ) {- kDebug() << "DccTransferRecv::connectionFailed(): code = " << errorCode << ", string = " << m_recvSocket->errorString() << endl;+ kDebug() << "Code = " << errorCode << ", string = " << m_recvSocket->errorString(); failed( i18n( "Connection failure: %1", m_recvSocket->errorString() ) ); } void DccTransferRecv::readData() // slot {- //kDebug() << "readData()" << endl;+ //kDebug() << "readData()"; int actual = m_recvSocket->read( m_buffer, m_bufferSize ); if ( actual > 0 ) {@@ -619,14 +619,14 @@ void DccTransferRecv::sendAck() // slot {- //kDebug() << "sendAck()" << endl;+ //kDebug() << "sendAck()"; KIO::fileoffset_t pos = intel( m_transferringPosition ); m_recvSocket->enableWrite( false ); m_recvSocket->write( (char*)&pos, 4 ); if ( m_transferringPosition == (KIO::fileoffset_t)m_fileSize ) {- kDebug() << "DccTransferRecv::sendAck(): Sent final ACK." << endl;+ kDebug() << "Sent final ACK."; m_recvSocket->enableRead( false ); disconnect( m_recvSocket, 0, 0, 0 ); finishTransferLogger();@@ -634,14 +634,14 @@ } else if ( m_transferringPosition > (KIO::fileoffset_t)m_fileSize ) {- kDebug() << "DccTransferRecv::sendAck(): the remote host sent larger data than expected: " << QString::number( m_transferringPosition ) << endl;+ kDebug() << "The remote host sent larger data than expected: " << QString::number( m_transferringPosition ); failed( i18n( "Transferring error" ) ); } } void DccTransferRecv::slotLocalWriteDone() // <-WriteCacheHandler::done() {- kDebug() << "DccTransferRecv::slotLocalWriteDone()" << endl;+ kDebug(); setStatus( Done ); cleanUp(); emit done( this );@@ -650,14 +650,14 @@ // <- WriteCacheHandler::gotError() void DccTransferRecv::slotLocalGotWriteError( const QString& errorString ) {- kDebug() << "DccTransferRecv::slotLocalGotWriteError()" << endl;+ kDebug(); failed( i18n( "KIO error: %1", errorString ) ); } void DccTransferRecv::startConnectionTimer( int sec ) { stopConnectionTimer();- kDebug() << "DccTransferRecv::startConnectionTimer()" << endl;+ kDebug(); m_connectionTimer->start( sec*1000 ); } @@ -666,13 +666,13 @@ if ( m_connectionTimer->isActive() ) { m_connectionTimer->stop();- kDebug() << "DccTransferRecv::stopConnectionTimer(): stop" << endl;+ kDebug(); } } void DccTransferRecv::connectionTimeout() // slot {- kDebug() << "DccTransferRecv::connectionTimeout()" << endl;+ kDebug(); failed( i18n( "Timed out" ) ); } @@ -736,7 +736,7 @@ m_writeReady = false; m_transferJob->sendAsyncData( m_cacheList.front() );- //kDebug() << "DTRWriteCacheHandler::write(): wrote " << m_cacheList.front().size() << " bytes." << endl;+ //kDebug() << "wrote " << m_cacheList.front().size() << " bytes."; m_cacheList.pop_front(); return true;@@ -744,11 +744,11 @@ void DccTransferRecvWriteCacheHandler::close() // public {- kDebug() << "DTRWriteCacheHandler::close()" << endl;+ kDebug(); write( true ); // write once if kio is ready to write m_transferJob->setAsyncDataEnabled( m_writeAsyncMode = false );- kDebug() << "DTRWriteCacheHandler::close(): switched to synchronized mode." << endl;- kDebug() << "DTRWriteCacheHandler::close(): flushing... (remaining caches: " << m_cacheList.count() << ")" << endl;+ kDebug() << "switched to synchronized mode.";+ kDebug() << "flushing... (remaining caches: " << m_cacheList.count() << ")"; } void DccTransferRecvWriteCacheHandler::closeNow() // public@@ -777,13 +777,13 @@ // once we write everything in cache, the file is complete. // This function will be called once more after this last data is written. data = m_cacheList.front();- kDebug() << "DccTransferRecvWriteCacheHandler::slotKIODataReq(): will write " << m_cacheList.front().size() << " bytes." << endl;+ kDebug() << "will write " << m_cacheList.front().size() << " bytes."; m_cacheList.pop_front(); } else { // finally, no data left to write or read.- kDebug() << "DTRWriteCacheHandler::slotKIODataReq(): flushing done." << endl;+ kDebug() << "flushing done."; m_transferJob = 0; emit done(); // -> DccTransferRecv::slotLocalWriteDone() }Index: src/dcc/transfermanager.cpp===================================================================--- src/dcc/transfermanager.cpp (revision 921937)+++ src/dcc/transfermanager.cpp (working copy)@@ -69,7 +69,7 @@ (*it)->isResumed() ) { transfer = (*it);- kDebug() << "DccTransferManager::resumeDownload(): filename match: " << fileName << ", claimed port: " << ownPort << ", item port: " << transfer->getOwnPort() << endl;+ kDebug() << "Filename match: " << fileName << ", claimed port: " << ownPort << ", item port: " << transfer->getOwnPort(); // the port number can be changed behind NAT, so we pick an item which only the filename is correspondent in that case. if ( transfer->getOwnPort() == ownPort ) {@@ -99,7 +99,7 @@ !(*it)->isResumed() ) { transfer = (*it);- kDebug() << "DccTransferManager::resumeUpload(): filename match: " << fileName << ", claimed port: " << ownPort << ", item port: " << transfer->getOwnPort() << endl;+ kDebug() << "Filename match: " << fileName << ", claimed port: " << ownPort << ", item port: " << transfer->getOwnPort(); // the port number can be changed behind NAT, so we pick an item which only the filename is correspondent in that case. if ( transfer->getOwnPort() == ownPort ) {@@ -116,7 +116,7 @@ DccTransferSend* DccTransferManager::startReverseSending( int connectionId, const QString& partnerNick, const QString& fileName, const QString& partnerHost, const QString& partnerPort, unsigned long fileSize, const QString& token ) {- kDebug() << "DccTransferManager::startReverseSending(): server group ID: " << connectionId << ", partner: " << partnerNick << ", filename: " << fileName << ", partner IP: " << partnerHost << ", parnter port: " << partnerPort << ", filesize: " << fileSize << ", token: " << token << endl;+ kDebug() << "Server group ID: " << connectionId << ", partner: " << partnerNick << ", filename: " << fileName << ", partner IP: " << partnerHost << ", parnter port: " << partnerPort << ", filesize: " << fileSize << ", token: " << token; DccTransferSend* transfer = 0; // find applicable one@@ -191,7 +191,7 @@ void DccTransferManager::slotTransferStatusChanged( DccTransfer* item, int newStatus, int oldStatus ) {- kDebug() << "DccTransferManager::slotTransferStatusChanged(): " << oldStatus << " -> " << newStatus << " " << item->getFileName() << " (" << item->getType() << ")" << endl;+ kDebug() << oldStatus << " -> " << newStatus << " " << item->getFileName() << " (" << item->getType() << ")"; if ( newStatus == DccTransfer::Queued ) emit newTransferQueued( item );Index: src/dcc/transferpanelitem.cpp===================================================================--- src/dcc/transferpanelitem.cpp (revision 921937)+++ src/dcc/transferpanelitem.cpp (working copy)@@ -60,7 +60,7 @@ DccTransferPanelItem::~DccTransferPanelItem() {- kDebug() << "DccTransferPanelItem::~DccTransferPanelItem()" << endl;+ kDebug(); stopAutoViewUpdate(); delete m_progressBar; if ( m_isTransferInstanceBackup )@@ -258,7 +258,7 @@ void DccTransferPanelItem::backupTransferInfo( DccTransfer* transfer ) {- kDebug() << "DccTransferPanelItem::backupTransferInfo()" << endl;+ kDebug(); // instances of DccTransfer are deleted immediately after the transfer is done // so we need to make a backup of DccTransfer. Index: src/dcc/transfer.cpp===================================================================--- src/dcc/transfer.cpp (revision 921937)+++ src/dcc/transfer.cpp (working copy)@@ -24,7 +24,7 @@ DccTransfer::DccTransfer( DccType dccType, QObject* parent ) : QObject(parent) {- kDebug() << "DccTransfer::DccTransfer()" << endl;+ kDebug(); m_type = dccType; @@ -50,7 +50,7 @@ DccTransfer::~DccTransfer() {- kDebug() << "DccTransfer::~DccTransfer()" << endl;+ kDebug(); delete[] m_buffer; m_loggerTimer.stop(); }@@ -102,7 +102,7 @@ bool DccTransfer::queue() {- kDebug() << "DccTransfer::queue()" << endl;+ kDebug(); if ( getStatus() != Configuring ) return false; Index: src/viewer/ircview.cpp===================================================================--- src/viewer/ircview.cpp (revision 921937)+++ src/viewer/ircview.cpp (working copy)@@ -937,7 +937,7 @@ QStringList cmdAndArgs = KShell::splitArgs(cmd); *proc << cmdAndArgs; // This code will also work, but starts an extra shell process.- // kdDebug() << "IRCView::urlClickSlot(): cmd = " << cmd << endl;+ // kdDebug() << "cmd = " << cmd; // *proc << cmd; // proc->setUseShell(true); proc->startDetached();Index: src/viewer/chatwindow.cpp===================================================================--- src/viewer/chatwindow.cpp (revision 921937)+++ src/viewer/chatwindow.cpp (working copy)@@ -99,7 +99,7 @@ { if (!newServer) {- kDebug("ChatWindow::setServer(0)!") << endl;+ kDebug() << "ChatWindow::setServer(0)!"; } else {@@ -110,7 +110,7 @@ if(getType() != ChannelList) { if(textView) textView->setServer(newServer);- else kDebug() << "ChatWindow::setServer(): textView==0!" << endl;+ else kDebug() << "textView==0!"; } emit serverOnline(m_server->isConnected());Index: src/config/preferences.cpp===================================================================--- src/config/preferences.cpp (revision 921937)+++ src/config/preferences.cpp (working copy)@@ -34,7 +34,6 @@ #include <qregexp.h> #include <qfileinfo.h> //Added by qt3to4:-#include <Q3ValueList> #include <Q3PtrList> @@ -411,8 +410,8 @@ const IdentityPtr Preferences::identityByName(const QString& name) {- Q3ValueList<IdentityPtr> identities = identityList();- Q3ValueList<IdentityPtr>::iterator it = identities.begin();+ QList<IdentityPtr> identities = identityList();+ QList<IdentityPtr>::iterator it = identities.begin(); while(it != identities.end()) {@@ -430,8 +429,8 @@ const IdentityPtr Preferences::identityById(int id) {- Q3ValueList<IdentityPtr> identList = identityList();- for(Q3ValueList<IdentityPtr>::iterator it = identList.begin(); it != identList.end(); ++it)+ QList<IdentityPtr> identList = identityList();+ for(QList<IdentityPtr>::iterator it = identList.begin(); it != identList.end(); ++it) { if((*it)->id() == id) {@@ -576,7 +575,7 @@ self()->mChannelEncodingsMap[serverGroupId][channel.toLower()]=encoding; } -const Q3ValueList<int> Preferences::channelEncodingsServerGroupIdList()+const QList<int> Preferences::channelEncodingsServerGroupIdList() { return self()->mChannelEncodingsMap.keys(); }Index: src/irc/serverison.cpp===================================================================--- src/irc/serverison.cpp (revision 921937)+++ src/irc/serverison.cpp (working copy)@@ -207,7 +207,7 @@ // When user changes preferences and has nick watching turned on, rebuild notify list. void ServerISON::slotServerGroupsChanged() {- kDebug() << "ServerISON::slotServerGroupsChanged" << endl;+ kDebug(); m_ISONList_invalid = true; } Index: src/irc/query.cpp===================================================================--- src/irc/query.cpp (revision 921937)+++ src/irc/query.cpp (working copy)@@ -467,7 +467,7 @@ break; default:- kDebug() << "Query::popup(): Popup id " << id << " does not belong to me!" << endl;+ kDebug() << "Popup id " << id << " does not belong to me!"; break; } Index: src/irc/outputfilter.cpp===================================================================--- src/irc/outputfilter.cpp (revision 921937)+++ src/irc/outputfilter.cpp (working copy)@@ -1093,7 +1093,7 @@ // If remove failed, try to add it instead if(!Preferences::addNotify(serverGroupId, list[index])) {- kDebug() << "OutputFilter::parseNotify(): Adding failed!" << endl;+ kDebug() << "Adding failed!"; } } } // endforIndex: src/irc/server.cpp===================================================================--- src/irc/server.cpp (revision 921937)+++ src/irc/server.cpp (working copy)@@ -138,7 +138,7 @@ Server::~Server() { //send queued messages- kDebug() << "Server::~Server(" << getServerName() << ")" << endl;+ kDebug() << "Server::~Server(" << getServerName() << ")"; // Delete helper object. delete m_serverISON;@@ -185,7 +185,7 @@ emit destroyed(m_connectionId); - kDebug() << "~Server done" << endl;+ kDebug() << "~Server done"; } //... so called to match the ChatWindow derivatives.@@ -423,7 +423,7 @@ m_inputFilter.reset(); } else- kDebug() << "connectToIRCServer() called while already connected: This should never happen." << endl;+ kDebug() << "connectToIRCServer() called while already connected: This should never happen."; } /*@@ -566,7 +566,7 @@ void Server::broken(QAbstractSocket::SocketError state) {- kDebug() << "Connection broken " << m_socket->errorString() << "!" << endl;+ kDebug() << "Connection broken " << m_socket->errorString() << "!"; m_socket->blockSignals(true); @@ -708,7 +708,7 @@ if (res.error() == QHostInfo::NoError && !res.addresses().isEmpty()) m_ownIpByWelcome = res.addresses().first().toString(); else- kDebug() << "Server::gotOwnResolvedHostByWelcome(): Got error: " << res.errorString() << endl;+ kDebug() << "Got error: " << res.errorString(); } void Server::quitServer()@@ -1478,7 +1478,7 @@ void Server::closeChannel(const QString& name) {- kDebug() << "Server::closeChannel(" << name << ")" << endl;+ kDebug() << "Server::closeChannel(" << name << ")"; Channel* channelToClose = getChannelByName(name); if(channelToClose)@@ -1635,7 +1635,7 @@ { if (transfer->getConnectionId() == connectionId() ) {- kDebug() << "Server::slotNewDccTranfserItemQueued(): connecting slots for " << transfer->getFileName() << " [" << transfer->getType() << "]" << endl;+ kDebug() << "connecting slots for " << transfer->getFileName() << " [" << transfer->getType() << "]"; if ( transfer->getType() == DccTransfer::Receive ) { connect( transfer, SIGNAL( done( DccTransfer* ) ), this, SLOT( dccGetDone( DccTransfer* ) ) );@@ -2013,14 +2013,14 @@ /* if(parameter.isEmpty()) {- kDebug() << "in updateChannelMode, a nick with no-name has had their mode '" << mode << "' changed to (" <<plus << ") in channel '" << channelName << "' by " << updater << ". How this happened, I have no idea. Please report this message to irc #konversation if you want to be helpful." << endl << "Ignoring the error and continuing." << endl;+ kDebug() << "in updateChannelMode, a nick with no-name has had their mode '" << mode << "' changed to (" <<plus << ") in channel '" << channelName << "' by " << updater << ". How this happened, I have no idea. Please report this message to irc #konversation if you want to be helpful." << endl << "Ignoring the error and continuing."; //this will get their attention.- kDebug() << kBacktrace() << endl;+ kDebug() << kBacktrace(); } else {- kDebug() << "in updateChannelMode, could not find updatee nick " << parameter << " for channel " << channelName << endl;- kDebug() << "This could indicate an obscure race condition that is safely being handled (like the mode of someone changed and they quit almost simulatanously, or it could indicate an internal error." << endl;+ kDebug() << "in updateChannelMode, could not find updatee nick " << parameter << " for channel " << channelName;+ kDebug() << "This could indicate an obscure race condition that is safely being handled (like the mode of someone changed and they quit almost simulatanously, or it could indicate an internal error."; } */ //TODO Do we need to add this nick?@@ -2507,7 +2507,7 @@ } else {- kDebug() << "server::renameNickInfo() was called for newname='" << newname << "' but nickInfo is null" << endl;+ kDebug() << "server::renameNickInfo() was called for newname='" << newname << "' but nickInfo is null"; } } @@ -2602,7 +2602,7 @@ { if(nickname.isEmpty() || newNick.isEmpty()) {- kDebug() << "server::renameNick called with empty strings! Trying to rename '" << nickname << "' to '" << newNick << "'" << endl;+ kDebug() << "server::renameNick called with empty strings! Trying to rename '" << nickname << "' to '" << newNick << "'"; return; } @@ -2620,7 +2620,7 @@ if(!nickInfo) {- kDebug() << "server::renameNick called for nickname '" << nickname << "' to '" << newNick << "' but getNickInfo('" << nickname << "') returned no results." << endl;+ kDebug() << "server::renameNick called for nickname '" << nickname << "' to '" << newNick << "' but getNickInfo('" << nickname << "') returned no results."; } else {@@ -2667,7 +2667,7 @@ if ( res.error() == QHostInfo::NoError && !res.addresses().isEmpty() ) m_ownIpByUserhost = res.addresses().first().toString(); else- kDebug() << "Server::gotOwnResolvedHostByUserhost(): Got error: " << res.errorString() << endl;+ kDebug() << "Got error: " << res.errorString(); } void Server::appendServerMessageToChannel(const QString& channel,const QString& type,const QString& message)@@ -3276,7 +3276,7 @@ { m_currentLag = m_lagTime.elapsed(); emit tooLongLag(this, m_currentLag);- // kDebug() << "Current lag: " << currentLag << endl;+ // kDebug() << "Current lag: " << currentLag; if (m_currentLag > (Preferences::self()->maximumLagTime() * 1000)) m_socket->close();Index: src/irc/sslsocket.cpp===================================================================--- src/irc/sslsocket.cpp (revision 921937)+++ src/irc/sslsocket.cpp (working copy)@@ -123,7 +123,7 @@ } else {- kError() << "SSL not functional!" << endl;+ kError() << "SSL not functional!"; emit sslFailure(i18n("The functionality to connect to servers using encrypted SSL communications is not available to Konversation because OpenSSL support was not enabled at compile time. You will need to get new version of KDE that has SSL support.")); close(); }@@ -326,7 +326,7 @@ break; } default:- kDebug() << "SSL error in cert code." << endl;+ kDebug() << "SSL error in cert code."; break; } }@@ -351,8 +351,7 @@ << "| Subject: " << d->kssl->peerInfo().getPeerCertificate().getSubject() << endl << "| Issuer: " << d->kssl->peerInfo().getPeerCertificate().getIssuer() << endl << "| Validation: " << (int) validation << endl- << "+-----------------------------------------------"- << endl;+ << "+-----------------------------------------------"; */ return rc; }Index: src/irc/ircqueue.cpp===================================================================--- src/irc/ircqueue.cpp (revision 921937)+++ src/irc/ircqueue.cpp (working copy)@@ -78,7 +78,7 @@ IRCQueue::~IRCQueue() {- kDebug() << "~IRCQueue" << endl;+ kDebug(); } QString IRCQueue::pop()Index: src/irc/inputfilter.cpp===================================================================--- src/irc/inputfilter.cpp (revision 921937)+++ src/irc/inputfilter.cpp (working copy)@@ -648,7 +648,7 @@ } else if(command=="error :closing link:") {- kDebug() << "link closed" << endl;+ kDebug() << "link closed"; } else if(command=="pong") {@@ -774,7 +774,7 @@ } else {- //kDebug() << "Ignored server-capability: " << property << " with value '" << value << "'" << endl;+ //kDebug() << "Ignored server-capability: " << property << " with value '" << value << "'"; } } // endfor break;@@ -897,7 +897,7 @@ } else {- kDebug() << "Hmm seems something is broken... can't get to the names!" << endl;+ kDebug() << "Hmm seems something is broken... can't get to the names!"; } // send list to channel@@ -1300,17 +1300,15 @@ else { // whoRequestList seems to be broken.- kDebug() << "InputFilter::parseServerCommand(): RPL_ENDOFWHO: malformed ENDOFWHO. retrieved: "- << parameterList[1] << " expected: " << whoRequestList.front()- << endl;+ kDebug() << "RPL_ENDOFWHO: malformed ENDOFWHO. retrieved: "+ << parameterList[1] << " expected: " << whoRequestList.front(); whoRequestList.clear(); } } else {- kDebug() << "InputFilter::parseServerCommand(): RPL_ENDOFWHO: unexpected ENDOFWHO. retrieved: "- << parameterList[1]- << endl;+ kDebug() << "RPL_ENDOFWHO: unexpected ENDOFWHO. retrieved: "+ << parameterList[1]; } emit endOfWho(parameterList[1]);@@ -1817,8 +1815,7 @@ if(parameter.isEmpty()) // XXX Check this to ensure the braces are in the correct place { kDebug() << "in updateChannelMode. sourceNick: '" << sourceNick << "' parameterlist: '"- << parameterList.join(", ") << "'"- << endl;+ << parameterList.join(", ") << "'"; } server->updateChannelMode(sourceNick,parameterList[0],mode,plus,parameter); }@@ -1870,9 +1867,8 @@ automaticRequest[command][name.toLower()] += (yes) ? 1 : -1; if(automaticRequest[command][name.toLower()]<0) {- kDebug() << "InputFilter::automaticRequest( " << command << ", " << name- << " ) was negative! Resetting!"- << endl;+ kDebug() << "( " << command << ", " << name+ << " ) was negative! Resetting!"; automaticRequest[command][name.toLower()]=0; } }Index: src/irc/channel.cpp===================================================================--- src/irc/channel.cpp (revision 921937)+++ src/irc/channel.cpp (working copy)@@ -384,15 +384,15 @@ Channel::~Channel() {- kDebug() << "Channel::~Channel(" << getName() << ")" << endl;+ kDebug() << "(" << getName() << ")"; // Purge nickname list purgeNicks();- kDebug() << "nicks purged" << endl;+ kDebug() << "nicks purged"; // Unlink this channel from channel list m_server->removeChannel(this);- kDebug() << "Channel removed." << endl;+ kDebug() << "Channel removed."; } @@ -544,7 +544,7 @@ break; } case Konversation::AddressbookSub:- kDebug() << "sub called" << endl;+ kDebug() << "sub called"; break; case Konversation::GiveOp: pattern="MODE %c +o %u";Index: src/irc/servergroupsettings.h===================================================================--- src/irc/servergroupsettings.h (revision 921937)+++ src/irc/servergroupsettings.h (working copy)@@ -55,8 +55,8 @@ class ServerGroupSettings; typedef KSharedPtr<ServerGroupSettings> ServerGroupSettingsPtr;- typedef Q3ValueList<ServerGroupSettingsPtr> ServerGroupList;- typedef Q3ValueList<ServerSettings> ServerList;+ typedef QList<ServerGroupSettingsPtr> ServerGroupList;+ typedef QList<ServerSettings> ServerList; typedef QList<ChannelSettings> ChannelList; class ServerGroupSettings : public KSharedIndex: src/irc/channelnick.cpp===================================================================--- src/irc/channelnick.cpp (revision 921937)+++ src/irc/channelnick.cpp (working copy)@@ -223,7 +223,7 @@ tooltip << "<tr><td><b>" << i18n("Mode") << ": </b></td><td>" << modes.join(", ") << "</td></tr>"; } tooltip << "</table></qt>";- //kDebug() << strTooltip << endl;+ //kDebug() << strTooltip ; //if(!dirty) return QString(); return strTooltip; }Index: src/dbus.cpp===================================================================--- src/dbus.cpp (revision 921937)+++ src/dbus.cpp (working copy)@@ -38,7 +38,7 @@ void DBus::raw(const QString& server,const QString& command) {- kDebug() << "DBus::raw()" << endl;+ kDebug(); // send raw IRC protocol data emit dcopRaw(server,command); }@@ -107,7 +107,7 @@ // TODO: this just masks a greater problem - Server::addQuery will return a query for '' --argonel // TODO: other DCOP calls need argument checking too --argonel if (server.isEmpty() || target.isEmpty() || command.isEmpty())- kDebug() << "DBus::say() requires 3 arguments." << endl;+ kDebug() << "DBus::say() requires 3 arguments."; else { command.replace('\n',"\\n");@@ -123,19 +123,19 @@ void DBus::info(const QString& string) {- kDebug() << "DBus::info()" << endl;+ kDebug(); emit dcopInfo(string); } void DBus::debug(const QString& string) {- kDebug() << "DBus::debug()" << endl;+ kDebug(); emit dcopInfo(QString("Debug: %1").arg(string)); } void DBus::error(const QString& string) {- kDebug() << "DBus::error()" << endl;+ kDebug(); emit dcopInfo(QString("Error: %1").arg(string)); } Index: src/common.cpp===================================================================--- src/common.cpp (revision 921937)+++ src/common.cpp (working copy)@@ -162,7 +162,7 @@ filteredLine.replace('&', "&"); filteredLine.replace("\x0b", "&"); - // kDebug() << "Took (msecs) : " << timer.elapsed() << " for " << filteredLine << endl;+ // kDebug() << "Took (msecs) : " << timer.elapsed() << " for " << filteredLine; return filteredLine; }Index: src/konsolepanel.cpp===================================================================--- src/konsolepanel.cpp (revision 921937)+++ src/konsolepanel.cpp (working copy)@@ -45,7 +45,7 @@ KonsolePanel::~KonsolePanel() {- kDebug() << "KonsolePanel::~KonsolePanel()" << endl;+ kDebug(); if ( k_part ) { // make sure to prevent partDestroyed() signals from being sentIndex: src/urlcatcher.cpp===================================================================--- src/urlcatcher.cpp (revision 921937)+++ src/urlcatcher.cpp (working copy)@@ -151,7 +151,7 @@ QStringList cmdAndArgs = KShell::splitArgs(cmd); *proc << cmdAndArgs; // This code will also work, but starts an extra shell process.- // kDebug() << "UrlCatcher::openUrl(): cmd = " << cmd << endl;+ // kDebug() "cmd = " << cmd; // *proc << cmd; // proc->setUseShell(true); proc->startDetached();Index: src/settingsdialog.cpp===================================================================--- src/settingsdialog.cpp (revision 921937)+++ src/settingsdialog.cpp (working copy)@@ -183,14 +183,14 @@ { // this is for the non KConfigXT parts to tell us, if the user actually changed // something or went back to the old settings-// kDebug() << "KonviSettingsDialog::modifiedSlot()" << endl;+// kDebug(); m_modified = false; foreach (KonviSettingsPage *page, m_pages) { if (page->hasChanged()) { m_modified = true;-// kDebug() << "KonviSettingsDialog::modifiedSlot(): modified!" << endl;+// kDebug() << "modified!"; break; } }Index: src/linkaddressbook/addressbook.cpp===================================================================--- src/linkaddressbook/addressbook.cpp (revision 921937)+++ src/linkaddressbook/addressbook.cpp (working copy)@@ -100,7 +100,7 @@ { if(uid.isEmpty()) {- kDebug() << "Addressbook::presenceString() called with an empty uid" << endl;+ kDebug() << "Called with an empty uid"; return QString("Error"); } switch( presenceStatus(uid))@@ -127,7 +127,7 @@ { if(uid.isEmpty()) {- kDebug() << "Addressbook::canReceiveFiles() called with empty uid" << endl;+ kDebug() << "Called with empty uid"; return false; } int presence = presenceStatus(uid);@@ -138,7 +138,7 @@ { if(uid.isEmpty()) {- kDebug() << "Addressbook::canRespond called with empty uid" << endl;+ kDebug() << "Called with empty uid"; return false; } //this should return false if they are offline.@@ -150,7 +150,7 @@ { if(contactId.isEmpty()) {- kDebug() << "Addressbook::locate called with empty contactId" << endl;+ kDebug() << "Called with empty contactId"; return QString(); } if(protocol != "messaging/irc")@@ -181,7 +181,7 @@ break; default: //error- kDebug() << "Unknown status " << uid << endl;+ kDebug() << "Unknown status " << uid; return QPixmap(); } @@ -192,7 +192,7 @@ { if(uid.isEmpty()) {- kDebug() << "Addressbook::contact called with empty uid" << endl;+ kDebug() << "Called with empty uid"; return QString(); } QString context;@@ -244,7 +244,7 @@ void Addressbook::messageNewContact( const QString &contactId, const QString &/*protocol*/ ) { if(contactId.isEmpty() ) {- kDebug() << "Addressbook::messageNewContact called with empty contactid" << endl;+ kDebug() << "Called with empty contactid"; focusAndShowErrorMessage(i18n("Another KDE application tried to use Konversation for instant messaging, but did not specify any contact to send the message to. This is probably a bug in the other application.")); return; }@@ -259,7 +259,7 @@ { if(uid.isEmpty()) {- kDebug() << "Addressbook::chatWithContact called with empty uid" << endl;+ kDebug() << "Called with empty uid"; focusAndShowErrorMessage(i18n("Another KDE application tried to use Konversation for instant messaging, but did not specify any contact to send the message to. This is probably a bug in the other application.")); return; }@@ -320,18 +320,18 @@ if(uid.isEmpty()) { //This warning below is annoying. FIXME - disabled because it's too verbose- // kDebug() << "Addressbook::emitContactPresenceChanged was called with empty uid" << endl;+ // kDebug() << "Addressbook::emitContactPresenceChanged was called with empty uid"; return; } emit contactPresenceChanged(uid, QString::fromLatin1("org.kde.konversation"), presence);- // kDebug() << "Presence changed for uid " << uid << " to " << presence << endl;+ // kDebug() << "Presence changed for uid " << uid << " to " << presence; } void Addressbook::emitContactPresenceChanged(const QString &uid) { if(uid.isEmpty()) {- kDebug() << "Addressbook::emitContactPresenceChanged was called with empty uid" << endl;+ kDebug() << "Called with empty uid"; return; }; Index: src/linkaddressbook/addressbook_base.cpp===================================================================--- src/linkaddressbook/addressbook_base.cpp (revision 921937)+++ src/linkaddressbook/addressbook_base.cpp (working copy)@@ -183,7 +183,7 @@ void AddressbookBase::unassociateNick(KABC::Addressee &addressee, const QString &ircnick, const QString &servername, const QString &servergroup) { - kDebug() << "in unassociatenick for '" << ircnick << endl;+ kDebug() << "in unassociatenick for '" << ircnick; if(ircnick.isEmpty()) return; QString lnick = ircnick.toLower();@@ -198,11 +198,11 @@ // like johnflux, johnflux@freenode, or johnflux@irc.kde.org except with the unicode // separator char 0xe120 instead of the @ - kDebug() << "nick" << ircnick<< endl;+ kDebug() << "nick" << ircnick; bool changed = false; if(addressee.isEmpty()) {- kDebug() << "Ignoring unassociation command for empty addressee for nick " << ircnick << endl;+ kDebug() << "Ignoring unassociation command for empty addressee for nick " << ircnick; } QString lit; QStringList addresses = addressee.custom("messaging/irc", "All").split(QChar(0xE000), QString::SkipEmptyParts);@@ -283,7 +283,7 @@ //emit error return false; }- kDebug() << "gotTicketSuccessfully" << endl;+ kDebug() << "gotTicketSuccessfully"; return true; } void AddressbookBase::releaseTicket()@@ -301,7 +301,7 @@ m_ticket = NULL; return false; }- kDebug() << "saveTicket() was successful" << endl;+ kDebug() << "saveTicket() was successful"; m_ticket= NULL; emit addresseesChanged(); return true;@@ -330,7 +330,7 @@ return false; } }- kDebug() << "Save was successful" << endl;+ kDebug() << "Save was successful"; m_ticket = NULL; emit addresseesChanged(); return true;@@ -388,7 +388,7 @@ KProcess *proc = new KProcess; *proc << "kaddressbook"; *proc << "--editor-only" << "--uid" << uid;- kDebug() << "running kaddressbook --editor-only --uid " << uid << endl;+ kDebug() << "running kaddressbook --editor-only --uid " << uid; if(!proc->startDetached()) { KMessageBox::error(0, i18n("Could not run your addressbook program (kaddressbook). This is most likely because it is not installed. Please install the 'kdepim' packages."));@@ -410,7 +410,7 @@ bool AddressbookBase::runEmailProgram(const QString &mailtoaddress) { KRun *proc = new KRun(KUrl(QString("mailto:") + KStringHandler::from8Bit(mailtoaddress.ascii())),0);- kDebug() << "Sending email to " << mailtoaddress << endl;+ kDebug() << "Sending email to " << mailtoaddress; if(proc->hasError()) { KMessageBox::error(0, i18n("Could not run your email program. This is possibly because one is not installed. To install the KDE email program (kmail) please install the 'kdepim' packages."));Index: CMakeLists.txt===================================================================--- CMakeLists.txt (revision 921937)+++ CMakeLists.txt (working copy)@@ -13,7 +13,7 @@ include(MacroLibrary) include(CheckIncludeFile) -add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)+#add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS) add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) remove_definitions(-DKDE_DEPRECATED_WARNINGS)