diff --git a/knotesnetrecv.cpp b/knotesnetrecv.cpp index 3af289a..db52baf 100644 --- a/knotesnetrecv.cpp +++ b/knotesnetrecv.cpp @@ -1,144 +1,147 @@ /******************************************************************* KNotes -- Notes for the KDE project Copyright (c) 2003, Daniel Martin 2004, 2006, Michael Brade This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of the Qt library by Trolltech AS, Norway (or with modified versions of Qt that use the same license as Qt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than Qt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. *******************************************************************/ #include "knotesnetrecv.h" #include #include #include #include #include +#include #include #include #include // Maximum note size in chars we are going to accept, // to prevent "note floods". #define MAXBUFFER 4096 // Maximum time we are going to wait between data receptions, // to prevent memory and connection floods. In milliseconds. #define MAXTIME 10000 // Small buffer's size #define SBSIZE 512 KNotesNetworkReceiver::KNotesNetworkReceiver( QTcpSocket *s ) : QObject(), m_buffer( new QByteArray() ), m_sock( s ) { QString date = KGlobal::locale()->formatDateTime( QDateTime::currentDateTime(), KLocale::ShortDate, false ); // Add the remote IP or hostname and the date to the title, to help the // user guess who wrote it. m_titleAddon = QString( " [%1, %2]" ) .arg( m_sock->peerAddress().toString() ) .arg( date ); // Setup the communications connect( m_sock, SIGNAL( readyRead() ), SLOT( slotDataAvailable() ) ); connect( m_sock, SIGNAL( disconnected() ), SLOT( slotConnectionClosed() ) ); connect( m_sock, SIGNAL(error(QAbstractSocket::SocketError)), SLOT(slotError(QAbstractSocket::SocketError))); // Setup the timer m_timer = new QTimer( this ); m_timer->setSingleShot( true ); connect( m_timer, SIGNAL( timeout() ), SLOT( slotReceptionTimeout() ) ); m_timer->start( MAXTIME ); } KNotesNetworkReceiver::~KNotesNetworkReceiver() { delete m_buffer; delete m_sock; } void KNotesNetworkReceiver::slotDataAvailable() { char smallBuffer[SBSIZE]; int smallBufferLen; do { // Append to "big buffer" only if we have some space left. int curLen = m_buffer->count(); smallBufferLen = m_sock->read( smallBuffer, SBSIZE ); // Limit max transfer over buffer, to avoid overflow. smallBufferLen = qMin( smallBufferLen, MAXBUFFER - curLen ); if ( smallBufferLen > 0 ) { m_buffer->resize( curLen + smallBufferLen ); memcpy( m_buffer->data() + curLen, smallBuffer, smallBufferLen ); } } while ( smallBufferLen == SBSIZE ); // If we are overflowing, close connection. if ( m_buffer->count() == MAXBUFFER ) { m_sock->close(); } else { m_timer->start( MAXTIME ); } } void KNotesNetworkReceiver::slotReceptionTimeout() { m_sock->close(); } void KNotesNetworkReceiver::slotConnectionClosed() { + QTextCodec *codec = QTextCodec::codecForLocale(); + if ( m_timer->isActive() ) { - QString noteText = QString( *m_buffer ).trimmed(); + QString noteText = QString( codec->toUnicode( *m_buffer ) ).trimmed(); // First line is the note title or, in case of ATnotes, the id int pos = noteText.indexOf( QRegExp( "[\r\n]" ) ); QString noteTitle = noteText.left( pos ).trimmed() + m_titleAddon; noteText = noteText.mid( pos ).trimmed(); if ( !noteText.isEmpty() ) { emit sigNoteReceived( noteTitle, noteText ); } } deleteLater(); } void KNotesNetworkReceiver::slotError( QAbstractSocket::SocketError error ) { kWarning( 5500 ) <<"error type :"<< ( int ) error <<" error string : "<errorString(); } #include "knotesnetrecv.moc" diff --git a/knotesnetsend.cpp b/knotesnetsend.cpp index 7870a3d..e24b3d9 100644 --- a/knotesnetsend.cpp +++ b/knotesnetsend.cpp @@ -1,102 +1,102 @@ /******************************************************************* KNotes -- Notes for the KDE project Copyright (c) 2003, Daniel Martin 2004, 2006, Michael Brade This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of the Qt library by Trolltech AS, Norway (or with modified versions of Qt that use the same license as Qt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than Qt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. *******************************************************************/ #include "knotesnetsend.h" #include #include +#include KNotesNetworkSender::KNotesNetworkSender( QTcpSocket *socket ) : QObject(), m_socket( socket ), m_note(), m_title(), m_sender() { // QObject:: prefix needed, otherwise the KStreamSocket::connect() // method is called!!! QObject::connect( m_socket, SIGNAL( connected() ), SLOT( slotConnected() ) ); QObject::connect( m_socket, SIGNAL( error( QAbstractSocket::SocketError ) ), SLOT( slotError( ) ) ); QObject::connect( m_socket, SIGNAL( disconnected() ), SLOT( slotClosed() ) ); QObject::connect( m_socket, SIGNAL( bytesWritten( qint64 ) ), SLOT( slotWritten( qint64 ) ) ); } KNotesNetworkSender::~KNotesNetworkSender() { delete m_socket; } void KNotesNetworkSender::setSenderId( const QString &sender ) { - m_sender = sender.toAscii(); + QTextCodec *codec = QTextCodec::codecForLocale(); + m_sender = codec->fromUnicode( sender ); } void KNotesNetworkSender::setNote( const QString &title, const QString &text ) { - // TODO: support for unicode and rich text. - // Mmmmmm... how to behave with such heterogeneous environment? - // AFAIK, ATnotes does not allow UNICODE. - m_title = title.toAscii(); - m_note = text.toAscii(); + QTextCodec *codec = QTextCodec::codecForLocale(); + m_title = codec->fromUnicode( title ); + m_note = codec->fromUnicode( text ); } void KNotesNetworkSender::slotConnected() { if ( m_sender.isEmpty() ) { m_note.prepend( m_title + "\n" ); } else { m_note.prepend( m_title + " (" + m_sender + ")\n" ); } m_socket->write( m_note ); } void KNotesNetworkSender::slotWritten( qint64 ) { // If end of text reached, close connection if ( m_socket->bytesToWrite() == 0 ) { m_socket->close(); } } void KNotesNetworkSender::slotError() { KMessageBox::sorry( 0, i18n( "Communication error: %1", m_socket->errorString() ) ); slotClosed(); } void KNotesNetworkSender::slotClosed() { deleteLater(); } #include "knotesnetsend.moc"