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

List:       kde-commits
Subject:    KDE/kdelibs/kdesu
From:       Benjamin Reed <ranger () befunk ! com>
Date:       2006-01-28 21:05:18
Message-ID: 1138482318.557716.14172.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 503347 by reed:

fix for kdesu/kdesu_pty.cpp:157: error: 'class QByteArray' has no member named \
'sprintf' (I hope, still new to this :)


 M  +6 -5      kdesu_pty.cpp  
 M  +1 -1      kdesu_pty.h  


--- trunk/KDE/kdelibs/kdesu/kdesu_pty.cpp #503346:503347
@@ -36,6 +36,7 @@
 #endif
 
 #include <qglobal.h>
+#include <QFile>
 
 #include <kdebug.h>
 #include <kstandarddirs.h>
@@ -156,9 +157,9 @@
 	{
 	    ptyname.sprintf("/dev/pty%c%c", *c1, *c2);
 	    ttyname.sprintf("/dev/tty%c%c", *c1, *c2);
-	    if (access(ptyname, F_OK) < 0)
+	    if (access(QFile::encodeName(ptyname), F_OK) < 0)
 		goto linux_out;
-	    ptyfd = open(ptyname, O_RDWR);
+	    ptyfd = open(QFile::encodeName(ptyname), O_RDWR);
 	    if (ptyfd >= 0)
 		return ptyfd;
 	}
@@ -171,9 +172,9 @@
     {
 	ptyname.sprintf("/dev/ptyp%d", i);
 	ttyname.sprintf("/dev/ttyp%d", i);
-	if (access(ptyname, F_OK) < 0)
+	if (access(QFile::encodeName(ptyname), F_OK) < 0)
 	    break;
-	ptyfd = open(ptyname, O_RDWR);
+	ptyfd = open(QFile::encodeName(ptyname), O_RDWR);
 	if (ptyfd >= 0)
 	    return ptyfd;
     }
@@ -294,6 +295,6 @@
     if (ptyfd < 0)
 	return 0;
 
-    return ttyname;
+    return QFile::encodeName(ttyname);
 }
 
--- trunk/KDE/kdelibs/kdesu/kdesu_pty.h #503346:503347
@@ -60,7 +60,7 @@
 private:
 
     int ptyfd;
-    QByteArray ptyname, ttyname;
+    QString ptyname, ttyname;
 
     class PTYPrivate;
     PTYPrivate *d;


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