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

List:       kde-commits
Subject:    KDE/kdelibs/khtml/java
From:       Heng Liu <liucougar () gmail ! com>
Date:       2006-03-20 17:17:31
Message-ID: 1142875051.192695.14434.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 520739 by liucougar:

m_button to QString

 M  +4 -4      kjavaappletserver.cpp  
 M  +2 -2      kjavaappletserver.h  


--- trunk/KDE/kdelibs/khtml/java/kjavaappletserver.cpp #520738:520739
@@ -647,7 +647,7 @@
             if (KSSL::doesSSLWork() && !d->kssl)
                 d->kssl = new KSSL;
             QStringList sl;
-            QByteArray answer( "invalid" );
+            QString answer( "invalid" );
 
             if (!d->kssl) {
                 answer = "nossl";
@@ -714,7 +714,7 @@
                         answer = PermissionDialog( qApp->activeWindow() ).exec( text, args[0] );
                 }
             }
-            sl.push_front( QString(answer) );
+            sl.push_front( answer );
             sl.push_front( QString::number(ID_num) );
             process->send( KJAS_SECURITY_CONFIRM, sl );
             return;
@@ -812,7 +812,7 @@
     : QObject(parent), m_button("no")
 {}
 
-QByteArray PermissionDialog::exec( const QString & cert, const QString & perm ) {
+QString PermissionDialog::exec( const QString & cert, const QString & perm ) {
     QPointer<QDialog> dialog = new QDialog( static_cast<QWidget*>(parent()) );
 
     dialog->setObjectName("PermissionDialog");
@@ -871,7 +871,7 @@
 
 void PermissionDialog::clicked()
 {
-    m_button = sender()->objectName().toUtf8();
+    m_button = sender()->objectName();
     static_cast<const QWidget*>(sender())->parentWidget()->close();
 }
 
--- trunk/KDE/kdelibs/khtml/java/kjavaappletserver.h #520738:520739
@@ -169,13 +169,13 @@
     PermissionDialog( QWidget* );
     ~PermissionDialog();
 
-    QByteArray exec( const QString & cert, const QString & perm );
+    QString exec( const QString & cert, const QString & perm );
 
 private Q_SLOTS:
      void clicked();
 
 private:
-    QByteArray m_button;
+    QString m_button;
 };
 
 #endif // KJAVAAPPLETSERVER_H
[prev in list] [next in list] [prev in thread] [next in thread]