This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing.
commit ff98348b3a4be60672862ae343be2ecb881d8936 Author: Mike Gabriel <mike.gabr...@das-netzwerkteam.de> Date: Sat Nov 10 03:36:21 2018 +0100 simplelocalsocket.cpp: Stop using deprecated QString::toAscii() function (replace it by toLatin1()). --- debian/changelog | 2 ++ main.cpp | 10 +++++----- sharetray.cpp | 2 +- simplelocalsocket.cpp | 5 ++--- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0ffeb0f..7be2bc9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium * New upstream version (3.1.1.5): - Drop KDevelop configuration files. - x2godesktopsharing.pro: Define TARGET as x2godesktopsharing. + - simplelocalsocket.cpp: Stop using deprecated QString::toAscii() function + (replace it by toLatin1()). -- X2Go Release Manager <git-ad...@x2go.org> Wed, 15 Nov 2017 22:00:53 +0100 diff --git a/main.cpp b/main.cpp index 4ae271d..d33a0ec 100644 --- a/main.cpp +++ b/main.cpp @@ -48,7 +48,7 @@ void client ( const QStringList & cmd ) } cerr<<"starting x2godesktopsharing in client mode, cmd: "<< - cmd.join(" ").toAscii().data() <<std::endl; + cmd.join(" ").toLatin1().data() <<std::endl; QString dispname=params[2]; // QString socketName=QDir::tempPath() +"/x2godesktopsharing_@"+ @@ -60,14 +60,14 @@ void client ( const QStringList & cmd ) { QString message="Unable to connect: " +socketName; cout<<"DENY"; - cerr<<message.toAscii().data() <<endl; + cerr<<message.toLatin1().data() <<endl; return; } - sock.write ( cmd.join(" ").toAscii().data(),cmd.join(" ").toAscii().length() ); + sock.write ( cmd.join(" ").toLatin1().data(),cmd.join(" ").toLatin1().length() ); if ( !sock.waitForReadyRead() ) { cout<<"DENY"; - cerr<<"Cannot write to socket: "<<socketName.toAscii().data() <<endl; + cerr<<"Cannot write to socket: "<<socketName.toLatin1().data() <<endl; return;; } char buffer[256]; @@ -75,7 +75,7 @@ void client ( const QStringList & cmd ) if ( read<=0 ) { cout<<"DENY"; - cerr<<"Cannot read from socket: " <<socketName.toAscii().data() <<endl; + cerr<<"Cannot read from socket: " <<socketName.toLatin1().data() <<endl; return; } buffer[read]=0; diff --git a/sharetray.cpp b/sharetray.cpp index 722d306..0a9acfe 100644 --- a/sharetray.cpp +++ b/sharetray.cpp @@ -345,7 +345,7 @@ void ShareTray::slotStartSharing() if ( serverSocket->listen ( socketFname ) ) { - chown ( socketFname.toAscii(),getuid(),getgrnam ( "x2godesktopsharing" )->gr_gid ); + chown ( socketFname.toLatin1(),getuid(),getgrnam ( "x2godesktopsharing" )->gr_gid ); QFile::setPermissions ( socketFname, QFile::ReadOwner|QFile::WriteOwner|QFile::ReadGroup|QFile::WriteGroup ); connect ( serverSocket,SIGNAL ( newConnection() ), diff --git a/simplelocalsocket.cpp b/simplelocalsocket.cpp index de71d42..d8e6f00 100644 --- a/simplelocalsocket.cpp +++ b/simplelocalsocket.cpp @@ -53,9 +53,8 @@ void SimpleLocalSocket::slotReadFromSocket() socket->state()==QLocalSocket::ConnectedState&& socket->openMode()!=QIODevice::NotOpen) { - int len; - len=socket->write(answer.toAscii().data(), - answer.toAscii().length()); + socket->write(answer.toLatin1().data(), + answer.toLatin1().length()); QTimer::singleShot ( 10000, this, SLOT ( closeSocket() ) ); } } -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git _______________________________________________ x2go-commits mailing list x2go-commits@lists.x2go.org https://lists.x2go.org/listinfo/x2go-commits