[Lsb-messages] /var/www/bzr/lsb/devel/devchk r2290: more stamping out of Qt3 references (bug 3547)

[Mats Wichmann]

------------------------------------------------------------
revno: 2290
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: devchk
timestamp: Tue 2012-05-22 08:45:13 -0600
message:
  more stamping out of Qt3 references (bug 3547)
removed:
  ts/devchk/qsize.C
  ts/devchk/qthread.C
modified:
  ts/devchk/hdrchk.c
  ts/devchk/hdrchk_tet.h
  ts/devchk/makefile
  ts/devchk/testdefs.h
-------------- next part --------------
=== modified file 'ts/devchk/hdrchk.c'
--- a/ts/devchk/hdrchk.c	2012-04-26 14:57:22 +0000
+++ b/ts/devchk/hdrchk.c	2012-05-22 14:45:13 +0000
@@ -716,8 +716,6 @@
 tcnt+=QtSvg_qsvgwidget();
 tcnt+=QtXml_qdom();
 tcnt+=QtXml_qxml();
-tcnt+=qsize();
-tcnt+=qthread();
 Msg("Total Tests: %d\n", tcnt );
 }
 #endif

=== modified file 'ts/devchk/hdrchk_tet.h'
--- a/ts/devchk/hdrchk_tet.h	2012-04-26 14:57:22 +0000
+++ b/ts/devchk/hdrchk_tet.h	2012-05-22 14:45:13 +0000
@@ -656,7 +656,5 @@
 	{ QtSvg_qsvgwidget, 646 },
 	{ QtXml_qdom, 647 },
 	{ QtXml_qxml, 648 },
-	{ qsize, 649 },
-	{ qthread, 650 },
 	{ NULL, 0 }
 };

=== modified file 'ts/devchk/makefile'
--- a/ts/devchk/makefile	2012-05-22 12:59:09 +0000
+++ b/ts/devchk/makefile	2012-05-22 14:45:13 +0000
@@ -647,9 +647,7 @@
 	QtSvg_qsvgrenderer.o \
 	QtSvg_qsvgwidget.o \
 	QtXml_qdom.o \
-	QtXml_qxml.o \
-	qsize.o \
-	qthread.o 
+	QtXml_qxml.o 
 
 ifdef TET_ROOT
 LIBDIR = $(TET_ROOT)/lib/tet3

=== removed file 'ts/devchk/qsize.C'
--- a/ts/devchk/qsize.C	2011-12-08 09:18:09 +0000
+++ b/ts/devchk/qsize.C	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-/*
- * Test of qsize
- */
-#include "hdrchk.h"
-#include "qsize.h"
-
-
-extern "C" {
-#ifdef TET_TEST
-void qsize();
-#else
-int qsize();
-#endif
-}
-
-
-#ifdef TET_TEST
-void qsize()
-{
-#else
-int qsize()
-{
-#endif
-int cnt=0;
-int pcnt=0;
-#ifdef TET_TEST
-//int pcnt=0
-#endif
-
-
-Msg("Checking qsize types\n");
-#define TYPE QSize
-Msg("Arch-specific values for QSize (20322) seem to be equal\n");
-Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'4.0',NULL,0,NULL);\n",1,20322,0);
-#if defined __i386__
-CheckTypeSize(TYPE, 8, 20322, 2, '4.0', NULL, 0, NULL)
-#elif defined __ia64__
-CheckTypeSize(TYPE, 8, 20322, 3, '4.0', NULL, 0, NULL)
-#elif defined __powerpc__ && !defined __powerpc64__
-CheckTypeSize(TYPE, 8, 20322, 6, '4.0', NULL, 0, NULL)
-#elif defined __powerpc64__
-CheckTypeSize(TYPE, 8, 20322, 9, '4.0', NULL, 0, NULL)
-#elif defined __s390__ && !defined __s390x__
-CheckTypeSize(TYPE, 8, 20322, 10, '4.0', NULL, 0, NULL)
-#elif defined __x86_64__
-CheckTypeSize(TYPE, 8, 20322, 11, '4.0', NULL, 0, NULL)
-#elif defined __s390x__
-CheckTypeSize(TYPE, 8, 20322, 12, '4.0', NULL, 0, NULL)
-#else
-Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'4.0',NULL,0,NULL);\n",architecture,20322,?);
-#endif
-#undef TYPE
-
-
-#ifdef TET_TEST
-if (pcnt == cnt )
-    tet_result(TET_PASS);
-else
-    tet_result(TET_FAIL);
-return;
-#else
-Msg("%d tests passed out of %d tests in qsize types\n\n",pcnt,cnt);
-return cnt;
-#endif
-
-}

=== removed file 'ts/devchk/qthread.C'
--- a/ts/devchk/qthread.C	2011-12-08 09:18:09 +0000
+++ b/ts/devchk/qthread.C	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-/*
- * Test of qthread
- */
-#include "hdrchk.h"
-#include "qthread.h"
-
-
-extern "C" {
-#ifdef TET_TEST
-void qthread();
-#else
-int qthread();
-#endif
-}
-
-
-#ifdef TET_TEST
-void qthread()
-{
-#else
-int qthread()
-{
-#endif
-int cnt=0;
-int pcnt=0;
-#ifdef TET_TEST
-//int pcnt=0
-#endif
-
-
-Msg("Checking qthread types\n");
-#define TYPE QThread
-#undef TYPE
-
-
-#ifdef TET_TEST
-if (pcnt == cnt )
-    tet_result(TET_PASS);
-else
-    tet_result(TET_FAIL);
-return;
-#else
-Msg("%d tests passed out of %d tests in qthread types\n\n",pcnt,cnt);
-return cnt;
-#endif
-
-}

=== modified file 'ts/devchk/testdefs.h'
--- a/ts/devchk/testdefs.h	2012-04-26 14:57:22 +0000
+++ b/ts/devchk/testdefs.h	2012-05-22 14:45:13 +0000
@@ -646,5 +646,3 @@
 extern void QtSvg_qsvgwidget();
 extern void QtXml_qdom();
 extern void QtXml_qxml();
-extern void qsize();
-extern void qthread();