[cp-patches] FYI: Include assert.h in Qt peers

[Dalibor Topic]

Hi all,

while I was working on the build machinery for Qt peers, I noticed that 
they needed assert.h in various class files to build with classpath's 
jni.h so I added those with the attached patch.

cheers,
dalibor topic

2005-08-15  Dalibor Topic  <address@hidden>

        * native/jni/qt-peer/mainqtthread.cpp,
        native/jni/qt-peer/qmatrix.cpp,
        native/jni/qt-peer/qpainterpath.cpp,
        native/jni/qt-peer/qpen.cpp,
        native/jni/qt-peer/qtbuttonpeer.cpp,
        native/jni/qt-peer/qtcanvaspeer.cpp,
        native/jni/qt-peer/qtcheckboxpeer.cpp,
        native/jni/qt-peer/qtchoicepeer.cpp,
        native/jni/qt-peer/qtcomponentpeer.cpp,
        native/jni/qt-peer/qtdialogpeer.cpp,
        native/jni/qt-peer/qtfiledialogpeer.cpp,
        native/jni/qt-peer/qtfontmetrics.cpp,
        native/jni/qt-peer/qtfontpeer.cpp,
        native/jni/qt-peer/qtframepeer.cpp,
        native/jni/qt-peer/qtgraphics.cpp,
        native/jni/qt-peer/qtimage.cpp,
        native/jni/qt-peer/qtlabelpeer.cpp,
        native/jni/qt-peer/qtlistpeer.cpp,
        native/jni/qt-peer/qtmenubarpeer.cpp,
        native/jni/qt-peer/qtmenucomponentpeer.cpp,
        native/jni/qt-peer/qtmenuitempeer.cpp,
        native/jni/qt-peer/qtmenupeer.cpp,
        native/jni/qt-peer/qtpanelpeer.cpp,
        native/jni/qt-peer/qtpopupmenupeer.cpp,
        native/jni/qt-peer/qtscreendevice.cpp,
        native/jni/qt-peer/qtscrollbarpeer.cpp,
        native/jni/qt-peer/qtscrollpanepeer.cpp,
        native/jni/qt-peer/qttextareapeer.cpp,
        native/jni/qt-peer/qttextfieldpeer.cpp,
        native/jni/qt-peer/qtvolatileimage.cpp,
        native/jni/qt-peer/qtwindowpeer.cpp:
        Include <assert.h>.

Common subdirectories: native/jni/qt-peer/CVS and 
../kaffe/libraries/clib/awt/classpath-qt/CVS
diff -u native/jni/qt-peer/mainqtthread.cpp 
../kaffe/libraries/clib/awt/classpath-qt/mainqtthread.cpp
--- native/jni/qt-peer/mainqtthread.cpp 2005-08-11 19:06:48.000000000 +0200
+++ ../kaffe/libraries/clib/awt/classpath-qt/mainqtthread.cpp   2005-08-13 
17:43:07.000000000 +0200
@@ -35,6 +35,7 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+#include <assert.h>
 #include <jni.h>
 #include <QApplication>
 #include <QThread>
Only in ../kaffe/libraries/clib/awt/classpath-qt/: Makefile.am
Only in ../kaffe/libraries/clib/awt/classpath-qt/: Makefile.in
diff -u native/jni/qt-peer/qmatrix.cpp 
../kaffe/libraries/clib/awt/classpath-qt/qmatrix.cpp
--- native/jni/qt-peer/qmatrix.cpp      2005-08-11 19:06:48.000000000 +0200
+++ ../kaffe/libraries/clib/awt/classpath-qt/qmatrix.cpp        2005-08-13 
17:43:07.000000000 +0200
@@ -35,6 +35,7 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+#include <assert.h>
 #include <QMatrix>
 #include <gnu_java_awt_peer_qt_QMatrix.h>
 #include "nativewrapper.h"
diff -u native/jni/qt-peer/qpainterpath.cpp 
../kaffe/libraries/clib/awt/classpath-qt/qpainterpath.cpp
--- native/jni/qt-peer/qpainterpath.cpp 2005-08-11 19:06:48.000000000 +0200
+++ ../kaffe/libraries/clib/awt/classpath-qt/qpainterpath.cpp   2005-08-13 
17:43:07.000000000 +0200
@@ -35,6 +35,7 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+#include <assert.h>
 #include <QPainterPath>
 #include <gnu_java_awt_peer_qt_QPainterPath.h>
 #include "nativewrapper.h"
diff -u native/jni/qt-peer/qpen.cpp 
../kaffe/libraries/clib/awt/classpath-qt/qpen.cpp
--- native/jni/qt-peer/qpen.cpp 2005-08-11 19:06:48.000000000 +0200
+++ ../kaffe/libraries/clib/awt/classpath-qt/qpen.cpp   2005-08-13 
17:43:07.000000000 +0200
@@ -35,6 +35,7 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+#include <assert.h>
 #include <QColor>
 #include <QPen>
 #include <gnu_java_awt_peer_qt_QPen.h>
diff -u native/jni/qt-peer/qtbuttonpeer.cpp 
../kaffe/libraries/clib/awt/classpath-qt/qtbuttonpeer.cpp
--- native/jni/qt-peer/qtbuttonpeer.cpp 2005-08-11 19:06:48.000000000 +0200
+++ ../kaffe/libraries/clib/awt/classpath-qt/qtbuttonpeer.cpp   2005-08-13 
17:43:07.000000000 +0200
@@ -35,6 +35,7 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+#include <assert.h>
 #include <QMainWindow>
 #include <QPushButton>
 #include <QFont>
diff -u native/jni/qt-peer/qtcanvaspeer.cpp 
../kaffe/libraries/clib/awt/classpath-qt/qtcanvaspeer.cpp
--- native/jni/qt-peer/qtcanvaspeer.cpp 2005-08-11 19:06:48.000000000 +0200
+++ ../kaffe/libraries/clib/awt/classpath-qt/qtcanvaspeer.cpp   2005-08-13 
17:43:07.000000000 +0200
@@ -35,6 +35,7 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+#include <assert.h>
 #include <QMainWindow>
 #include <QWidget>
 #include <gnu_java_awt_peer_qt_QtCanvasPeer.h>
diff -u native/jni/qt-peer/qtcheckboxpeer.cpp 
../kaffe/libraries/clib/awt/classpath-qt/qtcheckboxpeer.cpp
--- native/jni/qt-peer/qtcheckboxpeer.cpp       2005-08-11 19:06:48.000000000 
+0200
+++ ../kaffe/libraries/clib/awt/classpath-qt/qtcheckboxpeer.cpp 2005-08-13 
17:43:07.000000000 +0200
@@ -35,6 +35,7 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+#include <assert.h>
 #include <QAbstractButton>
 #include <QCheckBox>
 #include <QRadioButton>
diff -u native/jni/qt-peer/qtchoicepeer.cpp 
../kaffe/libraries/clib/awt/classpath-qt/qtchoicepeer.cpp
--- native/jni/qt-peer/qtchoicepeer.cpp 2005-08-11 19:06:48.000000000 +0200
+++ ../kaffe/libraries/clib/awt/classpath-qt/qtchoicepeer.cpp   2005-08-13 
17:43:07.000000000 +0200
@@ -35,6 +35,7 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+#include <assert.h>
 #include <QComboBox>
 #include <gnu_java_awt_peer_qt_QtChoicePeer.h>
 #include "qtcomponent.h"
diff -u native/jni/qt-peer/qtcomponentpeer.cpp 
../kaffe/libraries/clib/awt/classpath-qt/qtcomponentpeer.cpp
--- native/jni/qt-peer/qtcomponentpeer.cpp      2005-08-11 19:06:48.000000000 
+0200
+++ ../kaffe/libraries/clib/awt/classpath-qt/qtcomponentpeer.cpp        
2005-08-13 17:43:07.000000000 +0200
@@ -35,6 +35,7 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+#include <assert.h>
 #include <QApplication>
 #include <QDesktopWidget>
 #include <QShowEvent>
diff -u native/jni/qt-peer/qtdialogpeer.cpp 
../kaffe/libraries/clib/awt/classpath-qt/qtdialogpeer.cpp
--- native/jni/qt-peer/qtdialogpeer.cpp 2005-08-11 19:06:48.000000000 +0200
+++ ../kaffe/libraries/clib/awt/classpath-qt/qtdialogpeer.cpp   2005-08-13 
17:43:07.000000000 +0200
@@ -35,6 +35,7 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+#include <assert.h>
 #include <qdialog.h>
 #include <gnu_java_awt_peer_qt_QtDialogPeer.h>
 #include "qtcomponent.h"
diff -u native/jni/qt-peer/qtfiledialogpeer.cpp 
../kaffe/libraries/clib/awt/classpath-qt/qtfiledialogpeer.cpp
--- native/jni/qt-peer/qtfiledialogpeer.cpp     2005-08-11 19:06:48.000000000 
+0200
+++ ../kaffe/libraries/clib/awt/classpath-qt/qtfiledialogpeer.cpp       
2005-08-13 17:43:07.000000000 +0200
@@ -35,6 +35,7 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+#include <assert.h>
 #include <QFileDialog>
 #include <QDialog>
 #include <gnu_java_awt_peer_qt_QtFileDialogPeer.h>
diff -u native/jni/qt-peer/qtfontmetrics.cpp 
../kaffe/libraries/clib/awt/classpath-qt/qtfontmetrics.cpp
--- native/jni/qt-peer/qtfontmetrics.cpp        2005-08-11 19:06:48.000000000 
+0200
+++ ../kaffe/libraries/clib/awt/classpath-qt/qtfontmetrics.cpp  2005-08-13 
17:43:07.000000000 +0200
@@ -35,6 +35,7 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+#include <assert.h>
 #include <QChar>
 #include <QFont>
 #include <QFontMetrics>
diff -u native/jni/qt-peer/qtfontpeer.cpp 
../kaffe/libraries/clib/awt/classpath-qt/qtfontpeer.cpp
--- native/jni/qt-peer/qtfontpeer.cpp   2005-08-11 19:06:48.000000000 +0200
+++ ../kaffe/libraries/clib/awt/classpath-qt/qtfontpeer.cpp     2005-08-13 
17:43:07.000000000 +0200
@@ -35,6 +35,7 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+#include <assert.h>
 #include <QFont>
 #include <QString>
 #include <gnu_java_awt_peer_qt_QtFontPeer.h>
diff -u native/jni/qt-peer/qtframepeer.cpp 
../kaffe/libraries/clib/awt/classpath-qt/qtframepeer.cpp
--- native/jni/qt-peer/qtframepeer.cpp  2005-08-11 19:06:48.000000000 +0200
+++ ../kaffe/libraries/clib/awt/classpath-qt/qtframepeer.cpp    2005-08-13 
17:43:07.000000000 +0200
@@ -35,6 +35,7 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+#include <assert.h>
 #include <QApplication>
 #include <QMainWindow>
 #include <QMenuBar>
diff -u native/jni/qt-peer/qtgraphics.cpp 
../kaffe/libraries/clib/awt/classpath-qt/qtgraphics.cpp
--- native/jni/qt-peer/qtgraphics.cpp   2005-08-11 19:06:48.000000000 +0200
+++ ../kaffe/libraries/clib/awt/classpath-qt/qtgraphics.cpp     2005-08-13 
17:43:07.000000000 +0200
@@ -35,6 +35,7 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+#include <assert.h>
 #include <jni.h>
 #include <QPainter>
 #include <QBrush>
diff -u native/jni/qt-peer/qtimage.cpp 
../kaffe/libraries/clib/awt/classpath-qt/qtimage.cpp
--- native/jni/qt-peer/qtimage.cpp      2005-08-11 19:06:48.000000000 +0200
+++ ../kaffe/libraries/clib/awt/classpath-qt/qtimage.cpp        2005-08-13 
17:43:07.000000000 +0200
@@ -35,6 +35,7 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+#include <assert.h>
 #include <QImage>
 #include <QColor>
 #include <QMatrix>
diff -u native/jni/qt-peer/qtlabelpeer.cpp 
../kaffe/libraries/clib/awt/classpath-qt/qtlabelpeer.cpp
--- native/jni/qt-peer/qtlabelpeer.cpp  2005-08-11 19:06:48.000000000 +0200
+++ ../kaffe/libraries/clib/awt/classpath-qt/qtlabelpeer.cpp    2005-08-13 
17:43:07.000000000 +0200
@@ -35,6 +35,7 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+#include <assert.h>
 #include <QLabel>
 #include <QString>
 #include <gnu_java_awt_peer_qt_QtLabelPeer.h>
diff -u native/jni/qt-peer/qtlistpeer.cpp 
../kaffe/libraries/clib/awt/classpath-qt/qtlistpeer.cpp
--- native/jni/qt-peer/qtlistpeer.cpp   2005-08-11 19:06:48.000000000 +0200
+++ ../kaffe/libraries/clib/awt/classpath-qt/qtlistpeer.cpp     2005-08-13 
17:43:07.000000000 +0200
@@ -35,6 +35,7 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+#include <assert.h>
 #include <QWidget>
 #include <QListWidget>
 #include <gnu_java_awt_peer_qt_QtListPeer.h>
diff -u native/jni/qt-peer/qtmenubarpeer.cpp 
../kaffe/libraries/clib/awt/classpath-qt/qtmenubarpeer.cpp
--- native/jni/qt-peer/qtmenubarpeer.cpp        2005-08-11 19:06:48.000000000 
+0200
+++ ../kaffe/libraries/clib/awt/classpath-qt/qtmenubarpeer.cpp  2005-08-13 
17:43:07.000000000 +0200
@@ -35,6 +35,7 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+#include <assert.h>
 #include <QMenuBar>
 #include <QToolBar>
 #include <QMenu>
diff -u native/jni/qt-peer/qtmenucomponentpeer.cpp 
../kaffe/libraries/clib/awt/classpath-qt/qtmenucomponentpeer.cpp
--- native/jni/qt-peer/qtmenucomponentpeer.cpp  2005-08-11 19:06:48.000000000 
+0200
+++ ../kaffe/libraries/clib/awt/classpath-qt/qtmenucomponentpeer.cpp    
2005-08-13 17:43:07.000000000 +0200
@@ -35,6 +35,7 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+#include <assert.h>
 #include <QWidget>
 #include <gnu_java_awt_peer_qt_QtMenuComponentPeer.h>
 #include "nativewrapper.h"
diff -u native/jni/qt-peer/qtmenuitempeer.cpp 
../kaffe/libraries/clib/awt/classpath-qt/qtmenuitempeer.cpp
--- native/jni/qt-peer/qtmenuitempeer.cpp       2005-08-11 19:06:48.000000000 
+0200
+++ ../kaffe/libraries/clib/awt/classpath-qt/qtmenuitempeer.cpp 2005-08-13 
17:43:07.000000000 +0200
@@ -35,6 +35,7 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+#include <assert.h>
 #include <QMenu>
 #include <QAction>
 #include <QThread>
diff -u native/jni/qt-peer/qtmenupeer.cpp 
../kaffe/libraries/clib/awt/classpath-qt/qtmenupeer.cpp
--- native/jni/qt-peer/qtmenupeer.cpp   2005-08-11 19:06:48.000000000 +0200
+++ ../kaffe/libraries/clib/awt/classpath-qt/qtmenupeer.cpp     2005-08-13 
17:43:07.000000000 +0200
@@ -35,6 +35,7 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+#include <assert.h>
 #include <QMenu>
 #include <gnu_java_awt_peer_qt_QtMenuPeer.h>
 #include "nativewrapper.h"
diff -u native/jni/qt-peer/qtpanelpeer.cpp 
../kaffe/libraries/clib/awt/classpath-qt/qtpanelpeer.cpp
--- native/jni/qt-peer/qtpanelpeer.cpp  2005-08-11 19:06:48.000000000 +0200
+++ ../kaffe/libraries/clib/awt/classpath-qt/qtpanelpeer.cpp    2005-08-13 
17:43:07.000000000 +0200
@@ -35,6 +35,7 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+#include <assert.h>
 #include <qwidget.h>
 #include <gnu_java_awt_peer_qt_QtPanelPeer.h>
 #include "qtcomponent.h"
diff -u native/jni/qt-peer/qtpopupmenupeer.cpp 
../kaffe/libraries/clib/awt/classpath-qt/qtpopupmenupeer.cpp
--- native/jni/qt-peer/qtpopupmenupeer.cpp      2005-08-11 19:06:48.000000000 
+0200
+++ ../kaffe/libraries/clib/awt/classpath-qt/qtpopupmenupeer.cpp        
2005-08-13 17:43:07.000000000 +0200
@@ -35,6 +35,7 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+#include <assert.h>
 #include <QMenu>
 #include <QPoint>
 #include <QWidget>
diff -u native/jni/qt-peer/qtscreendevice.cpp 
../kaffe/libraries/clib/awt/classpath-qt/qtscreendevice.cpp
--- native/jni/qt-peer/qtscreendevice.cpp       2005-08-11 19:06:48.000000000 
+0200
+++ ../kaffe/libraries/clib/awt/classpath-qt/qtscreendevice.cpp 2005-08-13 
17:43:07.000000000 +0200
@@ -35,6 +35,7 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+#include <assert.h>
 #include <QApplication>
 #include <QDesktopWidget>
 #include <gnu_java_awt_peer_qt_QtScreenDevice.h>
diff -u native/jni/qt-peer/qtscrollbarpeer.cpp 
../kaffe/libraries/clib/awt/classpath-qt/qtscrollbarpeer.cpp
--- native/jni/qt-peer/qtscrollbarpeer.cpp      2005-08-11 19:06:48.000000000 
+0200
+++ ../kaffe/libraries/clib/awt/classpath-qt/qtscrollbarpeer.cpp        
2005-08-13 17:43:07.000000000 +0200
@@ -35,6 +35,7 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+#include <assert.h>
 #include <QScrollBar>
 #include <gnu_java_awt_peer_qt_QtScrollbarPeer.h>
 #include "keybindings.h"
diff -u native/jni/qt-peer/qtscrollpanepeer.cpp 
../kaffe/libraries/clib/awt/classpath-qt/qtscrollpanepeer.cpp
--- native/jni/qt-peer/qtscrollpanepeer.cpp     2005-08-11 19:06:48.000000000 
+0200
+++ ../kaffe/libraries/clib/awt/classpath-qt/qtscrollpanepeer.cpp       
2005-08-13 17:43:07.000000000 +0200
@@ -35,6 +35,7 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+#include <assert.h>
 #include <QScrollArea>
 #include <QScrollBar>
 #include <gnu_java_awt_peer_qt_QtScrollPanePeer.h>
diff -u native/jni/qt-peer/qttextareapeer.cpp 
../kaffe/libraries/clib/awt/classpath-qt/qttextareapeer.cpp
--- native/jni/qt-peer/qttextareapeer.cpp       2005-08-11 19:06:48.000000000 
+0200
+++ ../kaffe/libraries/clib/awt/classpath-qt/qttextareapeer.cpp 2005-08-13 
17:43:07.000000000 +0200
@@ -35,6 +35,7 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+#include <assert.h>
 #include <time.h>
 #include <QTextEdit>
 #include <QTextCursor>
diff -u native/jni/qt-peer/qttextfieldpeer.cpp 
../kaffe/libraries/clib/awt/classpath-qt/qttextfieldpeer.cpp
--- native/jni/qt-peer/qttextfieldpeer.cpp      2005-08-11 19:06:48.000000000 
+0200
+++ ../kaffe/libraries/clib/awt/classpath-qt/qttextfieldpeer.cpp        
2005-08-13 17:43:07.000000000 +0200
@@ -35,6 +35,7 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+#include <assert.h>
 #include <QLineEdit>
 #include <QWidget>
 #include <gnu_java_awt_peer_qt_QtTextFieldPeer.h>
diff -u native/jni/qt-peer/qtvolatileimage.cpp 
../kaffe/libraries/clib/awt/classpath-qt/qtvolatileimage.cpp
--- native/jni/qt-peer/qtvolatileimage.cpp      2005-08-11 19:06:48.000000000 
+0200
+++ ../kaffe/libraries/clib/awt/classpath-qt/qtvolatileimage.cpp        
2005-08-13 17:43:07.000000000 +0200
@@ -35,6 +35,7 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+#include <assert.h>
 #include <QImage>
 #include <QColor>
 #include <QMatrix>
diff -u native/jni/qt-peer/qtwindowpeer.cpp 
../kaffe/libraries/clib/awt/classpath-qt/qtwindowpeer.cpp
--- native/jni/qt-peer/qtwindowpeer.cpp 2005-08-11 19:06:48.000000000 +0200
+++ ../kaffe/libraries/clib/awt/classpath-qt/qtwindowpeer.cpp   2005-08-13 
17:43:07.000000000 +0200
@@ -35,6 +35,7 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+#include <assert.h>
 #include <QWidget>
 #include <qstyle.h>
 #include <gnu_java_awt_peer_qt_QtWindowPeer.h>