[Lsb-messages] /var/www/bzr/lsb/4.0/azov-qt4-tests r22: Backport fixes for bugs 3273 and 3034 from devel

[Stew Benedict]

------------------------------------------------------------
revno: 22
committer: Stew Benedict <stewb at linux-foundation.org>
branch nick: azov-qt4-tests
timestamp: Wed 2012-03-14 10:31:07 -0400
message:
  Backport fixes for bugs 3273 and 3034 from devel
modified:
  LSB_Toolkit_Qt-t2c/Qt4_Core_Functions-t2c/src/Qt4_Core_Functions/Qt4_Core_Functions.t2c
  LSB_Toolkit_Qt-t2c/Qt4_Input_Output-t2c/src/QFileInfo/QFileInfo.t2c
-------------- next part --------------
=== modified file 'LSB_Toolkit_Qt-t2c/Qt4_Core_Functions-t2c/src/Qt4_Core_Functions/Qt4_Core_Functions.t2c'
--- a/LSB_Toolkit_Qt-t2c/Qt4_Core_Functions-t2c/src/Qt4_Core_Functions/Qt4_Core_Functions.t2c	2009-03-05 15:33:50 +0000
+++ b/LSB_Toolkit_Qt-t2c/Qt4_Core_Functions-t2c/src/Qt4_Core_Functions/Qt4_Core_Functions.t2c	2012-03-14 14:31:07 +0000
@@ -37,7 +37,6 @@
 // qstrdup(char const*)
 // qvsnprintf(char*, unsigned long, char const*, __va_list_tag*)
 // qstrncpy(char*, char const*, unsigned int)
-// qt_check_pointer(char const*, int)
 // qt_error_string(int)
 // qCritical(char const*, ...)
 // qHash(QByteArray const&)
@@ -1396,43 +1395,6 @@
 
 <BLOCK>
 <TARGETS>
-    qt_check_pointer(char const*, int)
-</TARGETS>
-
-<DEFINE>
-#define PAR_0    <%0%>
-#define PAR_1    <%1%>
-</DEFINE>
-
-<CODE>
-
-    //PREAMBLE
-    #ifdef Q_WS_X11
-    bool useGUI = getenv( "DISPLAY" ) != 0;
-    #else
-    bool useGUI = TRUE;
-    #endif
-    int app_argc = 1;
-    char* app_argv[2]={"", NULL};
-    QApplication::setColorSpec(QApplication::ManyColor);
-    QApplication* app = new QApplication(app_argc, app_argv, useGUI);
-
-    //TARGET INTERFACE
-    qt_check_pointer(PAR_0, PAR_1);
-
-    //FINALIZATION
-    QTimer::singleShot(100, app, SLOT(quit()));
-    app->exec();
-</CODE>
-
-<PURPOSE>
-"Test"
-10
-</PURPOSE>
-</BLOCK>
-
-<BLOCK>
-<TARGETS>
     qt_error_string(int)
 </TARGETS>
 

=== modified file 'LSB_Toolkit_Qt-t2c/Qt4_Input_Output-t2c/src/QFileInfo/QFileInfo.t2c'
--- a/LSB_Toolkit_Qt-t2c/Qt4_Input_Output-t2c/src/QFileInfo/QFileInfo.t2c	2009-03-05 15:33:50 +0000
+++ b/LSB_Toolkit_Qt-t2c/Qt4_Input_Output-t2c/src/QFileInfo/QFileInfo.t2c	2012-03-14 14:31:07 +0000
@@ -1900,8 +1900,8 @@
     Return = Obj.readLink();
     //CHECK RETURN VALUE
     REQ("readLink.01",
-    "CONSTRAINT FOR RETURN FAILED: '$0==QString::null'",
-    Return==QString::null);
+    "CONSTRAINT FOR RETURN FAILED: '$0.isEmpty()'",
+    Return.isEmpty());
 
     //FINALIZATION
     QTimer::singleShot(100, app, SLOT(quit()));