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

List:       kde-commits
Subject:    KDE/kdepim/akonadi/libakonadi
From:       Tobias Koenig <tokoe () kde ! org>
Date:       2008-02-19 21:10:57
Message-ID: 1203455457.676176.4658.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 777162 by tokoe:

Reverting back to KLocalSocket until QLocalSocket is fixed


 M  +24 -6     session.cpp  
 M  +10 -2     session_p.h  


--- trunk/KDE/kdepim/akonadi/libakonadi/session.cpp #777161:777162
@@ -32,7 +32,12 @@
 #include <QtCore/QThreadStorage>
 #include <QtCore/QTimer>
 
-#include <QtNetwork/QLocalSocket>
+#ifdef Q_OS_WIN
+#include <QtNetwork/QHostAddress>
+#include <QtNetwork/QTcpSocket>
+#else
+#include <klocalsocket.h>
+#endif
 
 #define PIPELINE_LENGTH 2
 
@@ -49,12 +54,21 @@
 void SessionPrivate::reconnect()
 {
   // should be checking connection method and value validity
-  if ( socket->state() != QLocalSocket::ConnectedState &&
-       socket->state() != QLocalSocket::ConnectingState ) {
+#ifdef Q_OS_WIN
+  if ( socket->state() != QAbstractSocket::ConnectedState &&
+       socket->state() != QAbstractSocket::ConnectingState ) {
+    const QString address = mConnectionSettings->value( QLatin1String( \
"Data/Address" ), QHostAddress(QHostAddress::LocalHost).toString() ).toString(); +    \
const int port = mConnectionSettings->value( QLatin1String( "Data/Port" ), 4444 \
).toInt(); +    socket->connectToHost( QHostAddress(address), port );
+  }
+#else
+  if ( socket->state() != QAbstractSocket::ConnectedState &&
+       socket->state() != QAbstractSocket::ConnectingState ) {
     const QString defaultSocketDir = XdgBaseDirs::saveDir( "data", QLatin1String( \
                "akonadi" ) );
     const QString path = mConnectionSettings->value( QLatin1String( "Data/UnixPath" \
                ), defaultSocketDir + QLatin1String( "/akonadiserver.socket" ) \
                ).toString();
-    socket->connectToServer( path );
+    socket->connectToPath( path );
   }
+#endif
 }
 
 void SessionPrivate::socketError()
@@ -189,9 +203,13 @@
   d->mConnectionSettings = new QSettings( connectionConfigFile, QSettings::IniFormat \
);  
   // should check connection method
-  d->socket = new QLocalSocket( this );
+#ifdef Q_OS_WIN
+  d->socket = new QTcpSocket( this );
+#else
+  d->socket = new KLocalSocket( this );
+#endif
   connect( d->socket, SIGNAL(disconnected()), SLOT(socketError()) );
-  connect( d->socket, SIGNAL(error(QLocalSocket::LocalSocketError)), \
SLOT(socketError()) ); +  connect( d->socket, \
SIGNAL(error(QAbstractSocket::SocketError)), SLOT(socketError()) );  connect( \
d->socket, SIGNAL(readyRead()), SLOT(dataReceived()) );  d->reconnect();
 }
--- trunk/KDE/kdepim/akonadi/libakonadi/session_p.h #777161:777162
@@ -27,7 +27,11 @@
 #include <QtCore/QSettings>
 #include <QtCore/QThreadStorage>
 
-class QLocalSocket;
+#ifdef Q_OS_WIN
+class QTcpSocket;
+#else
+class KLocalSocket;
+#endif
 
 namespace Akonadi {
 
@@ -59,7 +63,11 @@
     Session *mParent;
     QByteArray sessionId;
     QSettings *mConnectionSettings;
-    QLocalSocket* socket;
+#ifdef Q_OS_WIN
+    QTcpSocket* socket;
+#else
+    KLocalSocket* socket;
+#endif
     bool connected;
     int nextTag;
 


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