-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() | |||
931 | QTimer::singleShot( 10, this , SLOT ( discardClient())); | 931 | QTimer::singleShot( 10, this , SLOT ( discardClient())); |
932 | return ; | 932 | return ; |
933 | 933 | ||
934 | } | 934 | } |
935 | mSyncActionDialog->setCaption( i18n("Sending file...") ); | 935 | mSyncActionDialog->setCaption( i18n("Sending file...") ); |
936 | QTextStream ts( &file ); | 936 | QTextStream ts( &file ); |
937 | ts.setCodec( QTextCodec::codecForName("utf8") ); | 937 | ts.setEncoding( QTextStream::Latin1 ); |
938 | |||
938 | QTextStream os( mSocket ); | 939 | QTextStream os( mSocket ); |
939 | os.setCodec( QTextCodec::codecForName("utf8") ); | 940 | os.setEncoding( QTextStream::Latin1 ); |
940 | //os.setEncoding( QTextStream::UnicodeUTF8 ); | ||
941 | while ( ! ts.atEnd() ) { | 941 | while ( ! ts.atEnd() ) { |
942 | os << ts.readLine() << "\n"; | 942 | os << ts.readLine() << "\n"; |
943 | } | 943 | } |
944 | //os << ts.read(); | 944 | //os << ts.read(); |
945 | file.close(); | 945 | file.close(); |
946 | mSyncActionDialog->setCaption( i18n("Waiting for synced file...") ); | 946 | mSyncActionDialog->setCaption( i18n("Waiting for synced file...") ); |
@@ -987,13 +987,13 @@ void KServerSocket::readBackFileFromSocket() | |||
987 | return ; | 987 | return ; |
988 | 988 | ||
989 | } | 989 | } |
990 | 990 | ||
991 | // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1)); | 991 | // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1)); |
992 | QTextStream ts ( &file ); | 992 | QTextStream ts ( &file ); |
993 | ts.setCodec( QTextCodec::codecForName("utf8") ); | 993 | ts.setEncoding( QTextStream::Latin1 ); |
994 | mSyncActionDialog->setCaption( i18n("Writing file to disk...") ); | 994 | mSyncActionDialog->setCaption( i18n("Writing file to disk...") ); |
995 | ts << piFileString; | 995 | ts << piFileString; |
996 | mSocket->close(); | 996 | mSocket->close(); |
997 | if ( mSocket->state() == QSocket::Idle ) | 997 | if ( mSocket->state() == QSocket::Idle ) |
998 | QTimer::singleShot( 10, this , SLOT ( discardClient())); | 998 | QTimer::singleShot( 10, this , SLOT ( discardClient())); |
999 | file.close(); | 999 | file.close(); |
@@ -1025,13 +1025,13 @@ void KCommandSocket::readFile( QString fn ) | |||
1025 | } | 1025 | } |
1026 | mFileString = ""; | 1026 | mFileString = ""; |
1027 | mFileName = fn; | 1027 | mFileName = fn; |
1028 | mFirst = true; | 1028 | mFirst = true; |
1029 | mSocket->connectToHost( mHost, mPort ); | 1029 | mSocket->connectToHost( mHost, mPort ); |
1030 | QTextStream os( mSocket ); | 1030 | QTextStream os( mSocket ); |
1031 | os.setEncoding( QTextStream::UnicodeUTF8 ); | 1031 | os.setEncoding( QTextStream::Latin1 ); |
1032 | os << "GET " << mPassWord << "\r\n"; | 1032 | os << "GET " << mPassWord << "\r\n"; |
1033 | mTimerSocket->start( 10000 ); | 1033 | mTimerSocket->start( 10000 ); |
1034 | } | 1034 | } |
1035 | 1035 | ||
1036 | void KCommandSocket::writeFile( QString fileName ) | 1036 | void KCommandSocket::writeFile( QString fileName ) |
1037 | { | 1037 | { |
@@ -1051,15 +1051,15 @@ void KCommandSocket::writeFileToSocket() | |||
1051 | mSocket->close(); | 1051 | mSocket->close(); |
1052 | if ( mSocket->state() == QSocket::Idle ) | 1052 | if ( mSocket->state() == QSocket::Idle ) |
1053 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); | 1053 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); |
1054 | return ; | 1054 | return ; |
1055 | } | 1055 | } |
1056 | QTextStream ts2( &file2 ); | 1056 | QTextStream ts2( &file2 ); |
1057 | ts2.setCodec( QTextCodec::codecForName("utf8") ); | 1057 | ts2.setEncoding( QTextStream::Latin1 ); |
1058 | QTextStream os2( mSocket ); | 1058 | QTextStream os2( mSocket ); |
1059 | os2.setCodec( QTextCodec::codecForName("utf8") ); | 1059 | os2.setEncoding( QTextStream::Latin1 ); |
1060 | os2 << "PUT " << mPassWord << "\r\n";; | 1060 | os2 << "PUT " << mPassWord << "\r\n";; |
1061 | while ( ! ts2.atEnd() ) { | 1061 | while ( ! ts2.atEnd() ) { |
1062 | os2 << ts2.readLine() << "\n"; | 1062 | os2 << ts2.readLine() << "\n"; |
1063 | } | 1063 | } |
1064 | mRetVal= successW; | 1064 | mRetVal= successW; |
1065 | file2.close(); | 1065 | file2.close(); |
@@ -1072,13 +1072,13 @@ void KCommandSocket::sendStop() | |||
1072 | if ( !mSocket ) { | 1072 | if ( !mSocket ) { |
1073 | mSocket = new QSocket( this ); | 1073 | mSocket = new QSocket( this ); |
1074 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); | 1074 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); |
1075 | } | 1075 | } |
1076 | mSocket->connectToHost( mHost, mPort ); | 1076 | mSocket->connectToHost( mHost, mPort ); |
1077 | QTextStream os2( mSocket ); | 1077 | QTextStream os2( mSocket ); |
1078 | os2.setCodec( QTextCodec::codecForName("utf8") ); | 1078 | os2.setEncoding( QTextStream::Latin1 ); |
1079 | os2 << "STOP\r\n"; | 1079 | os2 << "STOP\r\n"; |
1080 | mSocket->close(); | 1080 | mSocket->close(); |
1081 | if ( mSocket->state() == QSocket::Idle ) | 1081 | if ( mSocket->state() == QSocket::Idle ) |
1082 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); | 1082 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); |
1083 | } | 1083 | } |
1084 | 1084 | ||
@@ -1117,13 +1117,13 @@ void KCommandSocket::readFileFromSocket() | |||
1117 | deleteSocket(); | 1117 | deleteSocket(); |
1118 | return ; | 1118 | return ; |
1119 | 1119 | ||
1120 | } | 1120 | } |
1121 | // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1)); | 1121 | // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1)); |
1122 | QTextStream ts ( &file ); | 1122 | QTextStream ts ( &file ); |
1123 | ts.setCodec( QTextCodec::codecForName("utf8") ); | 1123 | ts.setEncoding( QTextStream::Latin1 ); |
1124 | ts << mFileString; | 1124 | ts << mFileString; |
1125 | file.close(); | 1125 | file.close(); |
1126 | mFileString = ""; | 1126 | mFileString = ""; |
1127 | mRetVal = successR; | 1127 | mRetVal = successR; |
1128 | mSocket->close(); | 1128 | mSocket->close(); |
1129 | // if state is not idle, deleteSocket(); is called via | 1129 | // if state is not idle, deleteSocket(); is called via |