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

List:       kde-commits
Subject:    KDE/kdebase/kdesu/kdesu
From:       Dave Rowe <dave () roweware ! com>
Date:       2005-11-08 0:29:18
Message-ID: 1131409758.501841.14469.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 478821 by drowe:

--qt3support

 M  +8 -10     kdesu.cpp  
 M  +2 -3      sudlg.cpp  
 M  +3 -4      sudlg.h  


--- trunk/KDE/kdebase/kdesu/kdesu/kdesu.cpp #478820:478821
@@ -24,8 +24,6 @@
 #include <qglobal.h>
 #include <qfile.h>
 #include <qdir.h>
-//Added by qt3to4:
-#include <Q3CString>
 
 #include <dcopclient.h>
 
@@ -71,9 +69,9 @@
 };
 
 
-Q3CString dcopNetworkId()
+QByteArray dcopNetworkId()
 {
-    Q3CString result;
+    QByteArray result;
     result.resize(1025);
     QFile file(DCOPClient::dcopServerFile());
     if (!file.open(QIODevice::ReadOnly))
@@ -162,8 +160,8 @@
 	prompt = false;
 
     // Get target uid
-    Q3CString user = args->getOption("u");
-    Q3CString auth_user = user;
+    QByteArray user = args->getOption("u");
+    QByteArray auth_user = user;
     struct passwd *pw = getpwnam(user);
     if (pw == 0L)
     {
@@ -276,7 +274,7 @@
     bool new_dcop = args->isSet("newdcop");
 
     QList<QByteArray> env;
-    Q3CString options;
+    QByteArray options;
     env << ( "DESKTOP_STARTUP_ID=" + kapp->startupId());
     
     if (pw->pw_uid)
@@ -295,11 +293,11 @@
     }
 
     KUser u;
-    env << (Q3CString) ("KDESU_USER=" + u.loginName().local8Bit());
+    env << (QByteArray) ("KDESU_USER=" + u.loginName().local8Bit());
     
     if (!new_dcop)
     {
-        Q3CString ksycoca = "KDESYCOCA="+QFile::encodeName(locateLocal("cache", "ksycoca"));
+        QByteArray ksycoca = "KDESYCOCA="+QFile::encodeName(locateLocal("cache", "ksycoca"));
         env << ksycoca;
 
         options += "xf"; // X-only, dcop forwarding enabled.
@@ -349,7 +347,7 @@
     }
 
     // Start the dialog
-    Q3CString password;
+    QByteArray password;
     if (needpw)
     {
         KStartupInfoId id;
--- trunk/KDE/kdebase/kdesu/kdesu/sudlg.cpp #478820:478821
@@ -5,16 +5,15 @@
  */
 
 #include <qstring.h>
-//Added by qt3to4:
-#include <Q3CString>
 #include <klocale.h>
 #include <kmessagebox.h>
+#include <QByteArray>
 
 #include <kdesu/su.h>
 #include "sudlg.h"
 
 
-KDEsuDialog::KDEsuDialog(Q3CString user, Q3CString auth_user, bool enableKeep, const QString& icon)
+KDEsuDialog::KDEsuDialog(QByteArray user, QByteArray auth_user, bool enableKeep, const QString& icon)
     : KPasswordDialog(Password, enableKeep, User1, icon)
 {
     m_User = auth_user;
--- trunk/KDE/kdebase/kdesu/kdesu/sudlg.h #478820:478821
@@ -8,8 +8,7 @@
 #define __SuDlg_h_Included__
 
 #include <kpassdlg.h>
-//Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 class KDEsuDialog
     : public KPasswordDialog
@@ -17,7 +16,7 @@
     Q_OBJECT
 
 public:
-    KDEsuDialog(Q3CString user, Q3CString auth_user, bool enableKeep, const QString& icon );
+    KDEsuDialog(QByteArray user, QByteArray auth_user, bool enableKeep, const QString& icon );
     ~KDEsuDialog();
 
     enum ResultCodes { AsUser = 10 };
@@ -27,7 +26,7 @@
     void slotUser1();
     
 private:
-    Q3CString m_User;
+    QByteArray m_User;
 };
     
 
[prev in list] [next in list] [prev in thread] [next in thread]