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

List:       kde-commits
Subject:    kdebindings/qtjava
From:       Richard Dale <Richard_Dale () tipitina ! demon ! co ! uk>
Date:       2004-06-06 8:45:46
Message-ID: 20040606084546.A73A5126E9 () office ! kde ! org
[Download RAW message or body]

CVS commit by rdale: 


* When a java null is passed as a QString argument, it was converted to (QString*)0L. 
  Null java strings are now converted to (QString*)&QString::null.
  Fixes crash reported by Maik Schulz when passing a null to KURLRequesterDlg.getURL()


  M +6 -0      ChangeLog   1.74
  M +1 -1      javalib/qtjava/QtSupport.cpp   1.33


--- kdebindings/qtjava/ChangeLog  #1.73:1.74
@@ -1,2 +1,8 @@
+2004-06-06  Richard Dale  <Richard_Dale@tipitina.demon.co.uk>
+
+        * When a java null is passed as a QString argument, it was converted to (QString*)0L. 
+          Null java strings are now converted to (QString*)&QString::null.
+          Fixes crash reported by Maik Schulz when passing a null to KURLRequesterDlg.getURL()
+
 2004-04-03  Richard Dale  <Richard_Dale@tipitina.demon.co.uk>
 

--- kdebindings/qtjava/javalib/qtjava/QtSupport.cpp  #1.32:1.33
@@ -1010,5 +1010,5 @@ QtSupport::toQString(JNIEnv * env, jstri
 
         if (str == 0L) {
-                return 0L;
+                return (QString*) &QString::null;
         }
 


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