| -rw-r--r-- | libkdepim/ksyncmanager.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index a663427..28af135 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp @@ -931,16 +931,16 @@ void KServerSocket::send_file() QTimer::singleShot( 10, this , SLOT ( discardClient())); return ; } mSyncActionDialog->setCaption( i18n("Sending file...") ); QTextStream ts( &file ); - ts.setCodec( QTextCodec::codecForName("utf8") ); + ts.setEncoding( QTextStream::Latin1 ); + QTextStream os( mSocket ); - os.setCodec( QTextCodec::codecForName("utf8") ); - //os.setEncoding( QTextStream::UnicodeUTF8 ); + os.setEncoding( QTextStream::Latin1 ); while ( ! ts.atEnd() ) { os << ts.readLine() << "\n"; } //os << ts.read(); file.close(); mSyncActionDialog->setCaption( i18n("Waiting for synced file...") ); @@ -987,13 +987,13 @@ void KServerSocket::readBackFileFromSocket() return ; } // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1)); QTextStream ts ( &file ); - ts.setCodec( QTextCodec::codecForName("utf8") ); + ts.setEncoding( QTextStream::Latin1 ); mSyncActionDialog->setCaption( i18n("Writing file to disk...") ); ts << piFileString; mSocket->close(); if ( mSocket->state() == QSocket::Idle ) QTimer::singleShot( 10, this , SLOT ( discardClient())); file.close(); @@ -1025,13 +1025,13 @@ void KCommandSocket::readFile( QString fn ) } mFileString = ""; mFileName = fn; mFirst = true; mSocket->connectToHost( mHost, mPort ); QTextStream os( mSocket ); - os.setEncoding( QTextStream::UnicodeUTF8 ); + os.setEncoding( QTextStream::Latin1 ); os << "GET " << mPassWord << "\r\n"; mTimerSocket->start( 10000 ); } void KCommandSocket::writeFile( QString fileName ) { @@ -1051,15 +1051,15 @@ void KCommandSocket::writeFileToSocket() mSocket->close(); if ( mSocket->state() == QSocket::Idle ) QTimer::singleShot( 10, this , SLOT ( deleteSocket())); return ; } QTextStream ts2( &file2 ); - ts2.setCodec( QTextCodec::codecForName("utf8") ); + ts2.setEncoding( QTextStream::Latin1 ); QTextStream os2( mSocket ); - os2.setCodec( QTextCodec::codecForName("utf8") ); + os2.setEncoding( QTextStream::Latin1 ); os2 << "PUT " << mPassWord << "\r\n";; while ( ! ts2.atEnd() ) { os2 << ts2.readLine() << "\n"; } mRetVal= successW; file2.close(); @@ -1072,13 +1072,13 @@ void KCommandSocket::sendStop() if ( !mSocket ) { mSocket = new QSocket( this ); connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); } mSocket->connectToHost( mHost, mPort ); QTextStream os2( mSocket ); - os2.setCodec( QTextCodec::codecForName("utf8") ); + os2.setEncoding( QTextStream::Latin1 ); os2 << "STOP\r\n"; mSocket->close(); if ( mSocket->state() == QSocket::Idle ) QTimer::singleShot( 10, this , SLOT ( deleteSocket())); } @@ -1117,13 +1117,13 @@ void KCommandSocket::readFileFromSocket() deleteSocket(); return ; } // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1)); QTextStream ts ( &file ); - ts.setCodec( QTextCodec::codecForName("utf8") ); + ts.setEncoding( QTextStream::Latin1 ); ts << mFileString; file.close(); mFileString = ""; mRetVal = successR; mSocket->close(); // if state is not idle, deleteSocket(); is called via |