632 files changed, 319 insertions, 319 deletions

diff --git a/qtjava/javalib/qtjava/Makefile.am b/qtjava/javalib/qtjava/Makefile.am
index 34aaaf27..fa62f0c7 100644
--- a/qtjava/javalib/qtjava/Makefile.am
+++ b/qtjava/javalib/qtjava/Makefile.am
@@ -9,16 +9,16 @@ jnilocdir = $(libdir)/jni
 
 AM_LDFLAGS = 
 
-libqtjava_la_SOURCES = QSyntaxHighlighter.cpp QToolBox.cpp QSplashScreen.cpp QSpinWidget.cpp QHttpResponseHeader.cpp QHttpRequestHeader.cpp QHttpHeader.cpp QEventLoop.cpp QGLWidget.cpp QGLFormat.cpp QGLContext.cpp QGL.cpp QGb18030Codec.cpp QXmlSimpleReader.cpp QXmlReader.cpp QXmlParseException.cpp QXmlNamespaceSupport.cpp QXmlLocator.cpp QXmlLexicalHandler.cpp QXmlInputSource.cpp QXmlErrorHandler.cpp QXmlEntityResolver.cpp QXmlDTDHandler.cpp QXmlDefaultHandler.cpp QXmlDeclHandler.cpp QXmlContentHandler.cpp QXmlAttributes.cpp QWorkspace.cpp QWMatrix.cpp QWizard.cpp QWidgetStack.cpp QWidgetItem.cpp QWidget.cpp QWheelEvent.cpp QWhatsThis.cpp QVGroupBox.cpp QVButtonGroup.cpp QVBoxLayout.cpp QVBox.cpp QVariant.cpp QValidator.cpp QUuid.cpp QUtf8Codec.cpp QUtf16Codec.cpp QUrlOperator.cpp QUrlInfo.cpp QUrl.cpp QUriDrag.cpp QTsciiCodec.cpp QTranslatorMessage.cpp QTranslator.cpp QToolTipGroup.cpp QToolTip.cpp QToolButton.cpp QToolBar.cpp qtjava.cpp QTimerEvent.cpp QTimer.cpp QTimeEdit.cpp QTextView.cpp QTextStream.cpp QTextOStream.cpp QTextIStream.cpp QTextEncoder.cpp QTextEdit.cpp QTextDrag.cpp QTextDecoder.cpp QTextCodec.cpp QTextBrowser.cpp QTabWidget.cpp QTabletEvent.cpp QTableSelection.cpp QTableItem.cpp QTable.cpp QTabDialog.cpp QTabBar.cpp QTab.cpp Qt.cpp QStyleOption.cpp QStyleSheetItem.cpp QStyleSheet.cpp QStyleFactory.cpp QStyle.cpp QStoredDrag.cpp QStatusBar.cpp QSqlResult.cpp QSqlRecord.cpp QSqlQuery.cpp QSqlPropertyMap.cpp QSqlIndex.cpp QSqlForm.cpp QSqlFieldInfo.cpp QSqlField.cpp QSqlError.cpp QSqlEditorFactory.cpp QSqlDriver.cpp QSqlDatabase.cpp QSqlCursor.cpp QSql.cpp QSplitter.cpp QSpinBox.cpp QSpacerItem.cpp QSound.cpp QSocketNotifier.cpp QSocketDevice.cpp QSocket.cpp QSlider.cpp QSjisCodec.cpp QSizePolicy.cpp QSizeGrip.cpp QSize.cpp QSimpleRichText.cpp QSignalMapper.cpp QSignal.cpp QShowEvent.cpp QSettings.cpp QSessionManager.cpp QServerSocket.cpp QSemiModal.cpp QScrollView.cpp QScrollBar.cpp QResizeEvent.cpp QRegion.cpp QRegExpValidator.cpp QRegExp.cpp QRect.cpp QRangeControl.cpp QRadioButton.cpp QPushButton.cpp QProgressDialog.cpp QProgressBar.cpp QProcess.cpp QPrinter.cpp QPrintDialog.cpp QPopupMenu.cpp QPolygonScanner.cpp QPointArray.cpp QPoint.cpp QPixmap.cpp QPicture.cpp QPen.cpp QPalette.cpp QPaintEvent.cpp QPainter.cpp QPaintDeviceMetrics.cpp QPaintDevice.cpp QObjectCleanupHandler.cpp QObject.cpp QNetworkProtocol.cpp QNetworkOperation.cpp QMultiLineEdit.cpp QMovie.cpp QMoveEvent.cpp QMouseEvent.cpp QMimeSourceFactory.cpp QMimeSource.cpp QMetaProperty.cpp QMetaObject.cpp QMetaEnum.cpp QMetaData.cpp QMessageBox.cpp QMenuItem.cpp QMenuData.cpp QMenuBar.cpp QMainWindow.cpp QLocalFs.cpp QListViewItem.cpp QListView.cpp QListBoxText.cpp QListBoxPixmap.cpp QListBoxItem.cpp QListBox.cpp QLineEdit.cpp QLibrary.cpp QLCDNumber.cpp QLayoutItem.cpp QLayout.cpp QLabel.cpp QKeySequence.cpp QKeyEvent.cpp QJpUnicodeConv.cpp QJisCodec.cpp QIODeviceSource.cpp QIODevice.cpp QIntValidator.cpp QInputDialog.cpp QIMEvent.cpp QImageIO.cpp QImageFormatType.cpp QImageFormat.cpp QImageDrag.cpp QImageDecoder.cpp QImageConsumer.cpp QImage.cpp QIconViewItem.cpp QIconView.cpp QIconSet.cpp QIconDragItem.cpp QIconDrag.cpp QHttp.cpp QHostAddress.cpp QHideEvent.cpp QHGroupBox.cpp QHebrewCodec.cpp QHeader.cpp QHButtonGroup.cpp QHBoxLayout.cpp QHBox.cpp QGroupBox.cpp QGridView.cpp QGridLayout.cpp QGrid.cpp QFtp.cpp QFrame.cpp QFontMetrics.cpp QFontInfo.cpp QFontDialog.cpp QFontDatabase.cpp QFont.cpp QFocusEvent.cpp QFocusData.cpp QFilePreview.cpp QFileInfo.cpp QFileIconProvider.cpp QFileDialog.cpp QFile.cpp QEvent.cpp QEucKrCodec.cpp QEucJpCodec.cpp QErrorMessage.cpp QEditorFactory.cpp QDropSite.cpp QDropEvent.cpp QDragResponseEvent.cpp QDragObject.cpp QDragMoveEvent.cpp QDragManager.cpp QDragLeaveEvent.cpp QDragEnterEvent.cpp QDoubleValidator.cpp QDomText.cpp QDomProcessingInstruction.cpp QDomNotation.cpp QDomNode.cpp QDomNamedNodeMap.cpp QDomImplementation.cpp QDomEntityReference.cpp QDomEntity.cpp QDomElement.cpp QDomDocumentType.cpp QDomDocumentFragment.cpp QDomDocument.cpp QDomComment.cpp QDomCharacterData.cpp QDomCDATASection.cpp QDomAttr.cpp QDockWindow.cpp QDockArea.cpp QDir.cpp QDialog.cpp QDial.cpp QDesktopWidget.cpp QDateTimeEditBase.cpp QDateTimeEdit.cpp QDateEdit.cpp QDataView.cpp QDataTable.cpp QDataStream.cpp QDataSource.cpp QDataSink.cpp QDataPump.cpp QDataBrowser.cpp QCustomMenuItem.cpp QCustomEvent.cpp QCursor.cpp QContextMenuEvent.cpp QComboTableItem.cpp QComboBox.cpp QColorGroup.cpp QColorDrag.cpp QColorDialog.cpp QColor.cpp QCloseEvent.cpp QClipboard.cpp QClassInfo.cpp QChildEvent.cpp QCheckTableItem.cpp QCheckListItem.cpp QCheckBox.cpp QCanvasView.cpp QCanvasText.cpp QCanvasSprite.cpp QCanvasSpline.cpp QCanvasRectangle.cpp QCanvasPolygonalItem.cpp QCanvasPolygon.cpp QCanvasPixmapArray.cpp QCanvasPixmap.cpp QCanvasLine.cpp QCanvasItem.cpp QCanvasEllipse.cpp QCanvas.cpp QButtonGroup.cpp QButton.cpp QBuffer.cpp QBrush.cpp QBoxLayout.cpp QBitmap.cpp QAuServer.cpp QAsyncIO.cpp QApplication.cpp QActionGroup.cpp QAction.cpp QAccel.cpp
+libqtjava_la_SOURCES = TQSyntaxHighlighter.cpp TQToolBox.cpp TQSplashScreen.cpp TQSpinWidget.cpp TQHttpResponseHeader.cpp TQHttpRequestHeader.cpp TQHttpHeader.cpp TQEventLoop.cpp TQGLWidget.cpp TQGLFormat.cpp TQGLContext.cpp TQGL.cpp TQGb18030Codec.cpp TQXmlSimpleReader.cpp TQXmlReader.cpp TQXmlParseException.cpp TQXmlNamespaceSupport.cpp TQXmlLocator.cpp TQXmlLexicalHandler.cpp TQXmlInputSource.cpp TQXmlErrorHandler.cpp TQXmlEntityResolver.cpp TQXmlDTDHandler.cpp TQXmlDefaultHandler.cpp TQXmlDeclHandler.cpp TQXmlContentHandler.cpp TQXmlAttributes.cpp TQWorkspace.cpp TQWMatrix.cpp TQWizard.cpp TQWidgetStack.cpp TQWidgetItem.cpp TQWidget.cpp TQWheelEvent.cpp TQWhatsThis.cpp TQVGroupBox.cpp TQVButtonGroup.cpp TQVBoxLayout.cpp TQVBox.cpp TQVariant.cpp TQValidator.cpp TQUuid.cpp TQUtf8Codec.cpp TQUtf16Codec.cpp TQUrlOperator.cpp TQUrlInfo.cpp TQUrl.cpp TQUriDrag.cpp TQTsciiCodec.cpp TQTranslatorMessage.cpp TQTranslator.cpp TQToolTipGroup.cpp TQToolTip.cpp TQToolButton.cpp TQToolBar.cpp qtjava.cpp TQTimerEvent.cpp TQTimer.cpp TQTimeEdit.cpp TQTextView.cpp TQTextStream.cpp TQTextOStream.cpp TQTextIStream.cpp TQTextEncoder.cpp TQTextEdit.cpp TQTextDrag.cpp TQTextDecoder.cpp TQTextCodec.cpp TQTextBrowser.cpp TQTabWidget.cpp TQTabletEvent.cpp TQTableSelection.cpp TQTableItem.cpp TQTable.cpp TQTabDialog.cpp TQTabBar.cpp TQTab.cpp Qt.cpp TQStyleOption.cpp TQStyleSheetItem.cpp TQStyleSheet.cpp TQStyleFactory.cpp TQStyle.cpp TQStoredDrag.cpp TQStatusBar.cpp TQSqlResult.cpp TQSqlRecord.cpp TQSqlQuery.cpp TQSqlPropertyMap.cpp TQSqlIndex.cpp TQSqlForm.cpp TQSqlFieldInfo.cpp TQSqlField.cpp TQSqlError.cpp TQSqlEditorFactory.cpp TQSqlDriver.cpp TQSqlDatabase.cpp TQSqlCursor.cpp TQSql.cpp TQSplitter.cpp TQSpinBox.cpp TQSpacerItem.cpp TQSound.cpp TQSocketNotifier.cpp TQSocketDevice.cpp TQSocket.cpp TQSlider.cpp TQSjisCodec.cpp TQSizePolicy.cpp TQSizeGrip.cpp TQSize.cpp TQSimpleRichText.cpp TQSignalMapper.cpp TQSignal.cpp TQShowEvent.cpp TQSettings.cpp TQSessionManager.cpp TQServerSocket.cpp TQSemiModal.cpp TQScrollView.cpp TQScrollBar.cpp TQResizeEvent.cpp TQRegion.cpp TQRegExpValidator.cpp TQRegExp.cpp TQRect.cpp TQRangeControl.cpp TQRadioButton.cpp TQPushButton.cpp TQProgressDialog.cpp TQProgressBar.cpp TQProcess.cpp TQPrinter.cpp TQPrintDialog.cpp TQPopupMenu.cpp TQPolygonScanner.cpp TQPointArray.cpp TQPoint.cpp TQPixmap.cpp TQPicture.cpp TQPen.cpp TQPalette.cpp TQPaintEvent.cpp TQPainter.cpp TQPaintDeviceMetrics.cpp TQPaintDevice.cpp TQObjectCleanupHandler.cpp TQObject.cpp TQNetworkProtocol.cpp TQNetworkOperation.cpp TQMultiLineEdit.cpp TQMovie.cpp TQMoveEvent.cpp TQMouseEvent.cpp TQMimeSourceFactory.cpp TQMimeSource.cpp TQMetaProperty.cpp TQMetaObject.cpp TQMetaEnum.cpp TQMetaData.cpp TQMessageBox.cpp TQMenuItem.cpp TQMenuData.cpp TQMenuBar.cpp TQMainWindow.cpp TQLocalFs.cpp TQListViewItem.cpp TQListView.cpp TQListBoxText.cpp TQListBoxPixmap.cpp TQListBoxItem.cpp TQListBox.cpp TQLineEdit.cpp TQLibrary.cpp TQLCDNumber.cpp TQLayoutItem.cpp TQLayout.cpp TQLabel.cpp TQKeySequence.cpp TQKeyEvent.cpp TQJpUnicodeConv.cpp TQJisCodec.cpp TQIODeviceSource.cpp TQIODevice.cpp TQIntValidator.cpp TQInputDialog.cpp TQIMEvent.cpp TQImageIO.cpp TQImageFormatType.cpp TQImageFormat.cpp TQImageDrag.cpp TQImageDecoder.cpp TQImageConsumer.cpp TQImage.cpp TQIconViewItem.cpp TQIconView.cpp TQIconSet.cpp TQIconDragItem.cpp TQIconDrag.cpp TQHttp.cpp TQHostAddress.cpp TQHideEvent.cpp TQHGroupBox.cpp TQHebrewCodec.cpp TQHeader.cpp TQHButtonGroup.cpp TQHBoxLayout.cpp TQHBox.cpp TQGroupBox.cpp TQGridView.cpp TQGridLayout.cpp TQGrid.cpp TQFtp.cpp TQFrame.cpp TQFontMetrics.cpp TQFontInfo.cpp TQFontDialog.cpp TQFontDatabase.cpp TQFont.cpp TQFocusEvent.cpp TQFocusData.cpp TQFilePreview.cpp TQFileInfo.cpp TQFileIconProvider.cpp TQFileDialog.cpp TQFile.cpp TQEvent.cpp TQEucKrCodec.cpp TQEucJpCodec.cpp TQErrorMessage.cpp TQEditorFactory.cpp TQDropSite.cpp TQDropEvent.cpp TQDragResponseEvent.cpp TQDragObject.cpp TQDragMoveEvent.cpp TQDragManager.cpp TQDragLeaveEvent.cpp TQDragEnterEvent.cpp TQDoubleValidator.cpp TQDomText.cpp TQDomProcessingInstruction.cpp TQDomNotation.cpp TQDomNode.cpp TQDomNamedNodeMap.cpp TQDomImplementation.cpp TQDomEntityReference.cpp TQDomEntity.cpp TQDomElement.cpp TQDomDocumentType.cpp TQDomDocumentFragment.cpp TQDomDocument.cpp TQDomComment.cpp TQDomCharacterData.cpp TQDomCDATASection.cpp TQDomAttr.cpp TQDockWindow.cpp TQDockArea.cpp TQDir.cpp TQDialog.cpp TQDial.cpp TQDesktopWidget.cpp TQDateTimeEditBase.cpp TQDateTimeEdit.cpp TQDateEdit.cpp TQDataView.cpp TQDataTable.cpp TQDataStream.cpp TQDataSource.cpp TQDataSink.cpp TQDataPump.cpp TQDataBrowser.cpp TQCustomMenuItem.cpp TQCustomEvent.cpp TQCursor.cpp TQContextMenuEvent.cpp TQComboTableItem.cpp TQComboBox.cpp TQColorGroup.cpp TQColorDrag.cpp TQColorDialog.cpp TQColor.cpp TQCloseEvent.cpp TQClipboard.cpp TQClassInfo.cpp TQChildEvent.cpp TQCheckTableItem.cpp TQCheckListItem.cpp TQCheckBox.cpp TQCanvasView.cpp TQCanvasText.cpp TQCanvasSprite.cpp TQCanvasSpline.cpp TQCanvasRectangle.cpp TQCanvasPolygonalItem.cpp TQCanvasPolygon.cpp TQCanvasPixmapArray.cpp TQCanvasPixmap.cpp TQCanvasLine.cpp TQCanvasItem.cpp TQCanvasEllipse.cpp TQCanvas.cpp TQButtonGroup.cpp TQButton.cpp TQBuffer.cpp TQBrush.cpp TQBoxLayout.cpp TQBitmap.cpp TQAuServer.cpp TQAsyncIO.cpp TQApplication.cpp TQActionGroup.cpp TQAction.cpp TQAccel.cpp
 KDE_OPTIONS = qtonly
 
 
-EXTRA_DIST = JavaSlot.cpp JavaSlot.h QAccel.cpp QAccel.h QAction.cpp QAction.h QActionGroup.cpp QActionGroup.h QApplication.cpp QApplication.h QAsyncIO.cpp QAsyncIO.h QAuServer.cpp QAuServer.h QBitmap.cpp QBitmap.h QBoxLayout.cpp QBoxLayout.h QBrush.cpp QBrush.h QBuffer.cpp QBuffer.h QButton.cpp QButton.h QButtonGroup.cpp QButtonGroup.h QCanvas.cpp QCanvas.h QCanvasEllipse.cpp QCanvasEllipse.h QCanvasItem.cpp QCanvasItem.h QCanvasLine.cpp QCanvasLine.h QCanvasPixmap.cpp QCanvasPixmap.h QCanvasPixmapArray.cpp QCanvasPixmapArray.h QCanvasPolygon.cpp QCanvasPolygon.h QCanvasPolygonalItem.cpp QCanvasPolygonalItem.h QCanvasRectangle.cpp QCanvasRectangle.h QCanvasSpline.cpp QCanvasSpline.h QCanvasSprite.cpp QCanvasSprite.h QCanvasText.cpp QCanvasText.h QCanvasView.cpp QCanvasView.h QCheckBox.cpp QCheckBox.h QCheckListItem.cpp QCheckListItem.h QCheckTableItem.cpp QCheckTableItem.h QChildEvent.cpp QChildEvent.h QClassInfo.cpp QClassInfo.h QClipboard.cpp QClipboard.h QCloseEvent.cpp QCloseEvent.h QColor.cpp QColor.h QColorDialog.cpp QColorDialog.h QColorDrag.cpp QColorDrag.h QColorGroup.cpp QColorGroup.h QComboBox.cpp QComboBox.h QComboTableItem.cpp QComboTableItem.h QContextMenuEvent.cpp QContextMenuEvent.h QCursor.cpp QCursor.h QCustomEvent.cpp QCustomEvent.h QCustomMenuItem.cpp QCustomMenuItem.h QDataBrowser.cpp QDataBrowser.h QDataPump.cpp QDataPump.h QDataSink.cpp QDataSink.h QDataSource.cpp QDataSource.h QDataStream.cpp QDataStream.h QDataTable.cpp QDataTable.h QDataView.cpp QDataView.h QDateEdit.cpp QDateEdit.h QDateTimeEdit.cpp QDateTimeEdit.h QDateTimeEditBase.cpp QDateTimeEditBase.h QDesktopWidget.cpp QDesktopWidget.h QDial.cpp QDial.h QDialog.cpp QDialog.h QDir.cpp QDir.h QDockArea.cpp QDockArea.h QDockWindow.cpp QDockWindow.h QDomAttr.cpp QDomAttr.h QDomCDATASection.cpp QDomCDATASection.h QDomCharacterData.cpp QDomCharacterData.h QDomComment.cpp QDomComment.h QDomDocument.cpp QDomDocument.h QDomDocumentFragment.cpp QDomDocumentFragment.h QDomDocumentType.cpp QDomDocumentType.h QDomElement.cpp QDomElement.h QDomEntity.cpp QDomEntity.h QDomEntityReference.cpp QDomEntityReference.h QDomImplementation.cpp QDomImplementation.h QDomNamedNodeMap.cpp QDomNamedNodeMap.h QDomNode.cpp QDomNode.h QDomNotation.cpp QDomNotation.h QDomProcessingInstruction.cpp QDomProcessingInstruction.h QDomText.cpp QDomText.h QDoubleValidator.cpp QDoubleValidator.h QDragEnterEvent.cpp QDragEnterEvent.h QDragLeaveEvent.cpp QDragLeaveEvent.h QDragManager.cpp QDragManager.h QDragMoveEvent.cpp QDragMoveEvent.h QDragObject.cpp QDragObject.h QDragResponseEvent.cpp QDragResponseEvent.h QDropEvent.cpp QDropEvent.h QDropSite.cpp QDropSite.h QEditorFactory.cpp QEditorFactory.h QErrorMessage.cpp QErrorMessage.h QEucJpCodec.cpp QEucJpCodec.h QEucKrCodec.cpp QEucKrCodec.h QEvent.cpp QEvent.h QFile.cpp QFile.h QFileDialog.cpp QFileDialog.h QFileIconProvider.cpp QFileIconProvider.h QFileInfo.cpp QFileInfo.h QFilePreview.cpp QFilePreview.h QFocusData.cpp QFocusData.h QFocusEvent.cpp QFocusEvent.h QFont.cpp QFont.h QFontDatabase.cpp QFontDatabase.h QFontDialog.cpp QFontDialog.h QFontInfo.cpp QFontInfo.h QFontMetrics.cpp QFontMetrics.h QFrame.cpp QFrame.h QFtp.cpp QFtp.h QGrid.cpp QGrid.h QGridLayout.cpp QGridLayout.h QGridView.cpp QGridView.h QGroupBox.cpp QGroupBox.h QHBox.cpp QHBox.h QHBoxLayout.cpp QHBoxLayout.h QHButtonGroup.cpp QHButtonGroup.h QHeader.cpp QHeader.h QHebrewCodec.cpp QHebrewCodec.h QHGroupBox.cpp QHGroupBox.h QHideEvent.cpp QHideEvent.h QHostAddress.cpp QHostAddress.h QHttp.cpp QHttp.h QIconDrag.cpp QIconDrag.h QIconDragItem.cpp QIconDragItem.h QIconSet.cpp QIconSet.h QIconView.cpp QIconView.h QIconViewItem.cpp QIconViewItem.h QImage.cpp QImage.h QImageConsumer.cpp QImageConsumer.h QImageDecoder.cpp QImageDecoder.h QImageDrag.cpp QImageDrag.h QImageFormat.cpp QImageFormat.h QImageFormatType.cpp QImageFormatType.h QImageIO.cpp QImageIO.h QIMEvent.cpp QIMEvent.h QInputDialog.cpp QInputDialog.h QIntValidator.cpp QIntValidator.h QIODevice.cpp QIODevice.h QIODeviceSource.cpp QIODeviceSource.h QJisCodec.cpp QJisCodec.h QJpUnicodeConv.cpp QJpUnicodeConv.h QKeyEvent.cpp QKeyEvent.h QKeySequence.cpp QKeySequence.h QLabel.cpp QLabel.h QLayout.cpp QLayout.h QLayoutItem.cpp QLayoutItem.h QLCDNumber.cpp QLCDNumber.h QLibrary.cpp QLibrary.h QLineEdit.cpp QLineEdit.h QListBox.cpp QListBox.h QListBoxItem.cpp QListBoxItem.h QListBoxPixmap.cpp QListBoxPixmap.h QListBoxText.cpp QListBoxText.h QListView.cpp QListView.h QListViewItem.cpp QListViewItem.h QLocalFs.cpp QLocalFs.h QMainWindow.cpp QMainWindow.h QMenuBar.cpp QMenuBar.h QMenuData.cpp QMenuData.h QMenuItem.cpp QMenuItem.h QMessageBox.cpp QMessageBox.h QMetaData.cpp QMetaData.h QMetaEnum.cpp QMetaEnum.h QMetaObject.cpp QMetaObject.h QMetaProperty.cpp QMetaProperty.h QMimeSource.cpp QMimeSource.h QMimeSourceFactory.cpp QMimeSourceFactory.h QMouseEvent.cpp QMouseEvent.h QMoveEvent.cpp QMoveEvent.h QMovie.cpp QMovie.h QMultiLineEdit.cpp QMultiLineEdit.h QNetworkOperation.cpp QNetworkOperation.h QNetworkProtocol.cpp QNetworkProtocol.h QObject.cpp QObject.h QObjectCleanupHandler.cpp QObjectCleanupHandler.h QPaintDevice.cpp QPaintDevice.h QPaintDeviceMetrics.cpp QPaintDeviceMetrics.h QPainter.cpp QPainter.h QPaintEvent.cpp QPaintEvent.h QPalette.cpp QPalette.h QPen.cpp QPen.h QPicture.cpp QPicture.h QPixmap.cpp QPixmap.h QPoint.cpp QPoint.h QPointArray.cpp QPointArray.h QPolygonScanner.cpp QPolygonScanner.h QPopupMenu.cpp QPopupMenu.h QPrintDialog.cpp QPrintDialog.h QPrinter.cpp QPrinter.h QProcess.cpp QProcess.h QProgressBar.cpp QProgressBar.h QProgressDialog.cpp QProgressDialog.h QPushButton.cpp QPushButton.h QRadioButton.cpp QRadioButton.h QRangeControl.cpp QRangeControl.h QRect.cpp QRect.h QRegExp.cpp QRegExp.h QRegExpValidator.cpp QRegExpValidator.h QRegion.cpp QRegion.h QResizeEvent.cpp QResizeEvent.h QScrollBar.cpp QScrollBar.h QScrollView.cpp QScrollView.h QSemiModal.cpp QSemiModal.h QServerSocket.cpp QServerSocket.h QSessionManager.cpp QSessionManager.h QSettings.cpp QSettings.h QShowEvent.cpp QShowEvent.h QSignal.cpp QSignal.h QSignalMapper.cpp QSignalMapper.h QSimpleRichText.cpp QSimpleRichText.h QSize.cpp QSize.h QSizeGrip.cpp QSizeGrip.h QSizePolicy.cpp QSizePolicy.h QSjisCodec.cpp QSjisCodec.h QSlider.cpp QSlider.h QSocket.cpp QSocket.h QSocketDevice.cpp QSocketDevice.h QSocketNotifier.cpp QSocketNotifier.h QSound.cpp QSound.h QSpacerItem.cpp QSpacerItem.h QSpinBox.cpp QSpinBox.h QSplitter.cpp QSplitter.h QSql.cpp QSql.h QSqlCursor.cpp QSqlCursor.h QSqlDatabase.cpp QSqlDatabase.h QSqlDriver.cpp QSqlDriver.h QSqlEditorFactory.cpp QSqlEditorFactory.h QSqlError.cpp QSqlError.h QSqlFieldInfo.cpp QSqlFieldInfo.h QSqlField.cpp QSqlField.h QSqlForm.cpp QSqlForm.h QSqlIndex.cpp QSqlIndex.h QSqlPropertyMap.cpp QSqlPropertyMap.h QSqlQuery.cpp QSqlQuery.h QSqlRecord.cpp QSqlRecord.h QSqlResult.cpp QSqlResult.h QStatusBar.cpp QStatusBar.h QStoredDrag.cpp QStoredDrag.h QStyle.cpp QStyle.h QStyleOption.cpp QStyleOption.h QStyleFactory.cpp QStyleFactory.h QStyleSheet.cpp QStyleSheet.h QStyleSheetItem.cpp QStyleSheetItem.h Qt.cpp Qt.h QTab.cpp QTab.h QTabBar.cpp QTabBar.h QTabDialog.cpp QTabDialog.h QTable.cpp QTable.h QTableItem.cpp QTableItem.h QTableSelection.cpp QTableSelection.h QTabletEvent.cpp QTabletEvent.h QTabWidget.cpp QTabWidget.h QTextBrowser.cpp QTextBrowser.h QTextCodec.cpp QTextCodec.h QTextDecoder.cpp QTextDecoder.h QTextDrag.cpp QTextDrag.h QTextEdit.cpp QTextEdit.h QTextEncoder.cpp QTextEncoder.h QTextIStream.cpp QTextIStream.h QTextOStream.cpp QTextOStream.h QTextStream.cpp QTextStream.h QTextView.cpp QTextView.h QTimeEdit.cpp QTimeEdit.h QTimer.cpp QTimer.h QTimerEvent.cpp QTimerEvent.h qtjava.cpp qtjava.h QToolBar.cpp QToolBar.h QToolButton.cpp QToolButton.h QToolTip.cpp QToolTip.h QToolTipGroup.cpp QToolTipGroup.h QTranslator.cpp QTranslator.h QTranslatorMessage.cpp QTranslatorMessage.h QTsciiCodec.cpp QTsciiCodec.h QtSupport.cpp QUriDrag.cpp QUriDrag.h QUrl.cpp QUrl.h QUrlInfo.cpp QUrlInfo.h QUrlOperator.cpp QUrlOperator.h QUtf16Codec.cpp QUtf16Codec.h QUtf8Codec.cpp QUtf8Codec.h QUuid.cpp QUuid.h QValidator.cpp QValidator.h QVariant.cpp QVariant.h QVBox.cpp QVBox.h QVBoxLayout.cpp QVBoxLayout.h QVButtonGroup.cpp QVButtonGroup.h QVGroupBox.cpp QVGroupBox.h QWhatsThis.cpp QWhatsThis.h QWheelEvent.cpp QWheelEvent.h QWidget.cpp QWidget.h QWidgetItem.cpp QWidgetItem.h QWidgetStack.cpp QWidgetStack.h QWizard.cpp QWizard.h QWMatrix.cpp QWMatrix.h QWorkspace.cpp QWorkspace.h QXmlAttributes.cpp QXmlAttributes.h QXmlContentHandler.cpp QXmlContentHandler.h QXmlDeclHandler.cpp QXmlDeclHandler.h QXmlDefaultHandler.cpp QXmlDefaultHandler.h QXmlDTDHandler.cpp QXmlDTDHandler.h QXmlEntityResolver.cpp QXmlEntityResolver.h QXmlErrorHandler.cpp QXmlErrorHandler.h QXmlInputSource.cpp QXmlInputSource.h QXmlLexicalHandler.cpp QXmlLexicalHandler.h QXmlLocator.cpp QXmlLocator.h QXmlNamespaceSupport.cpp QXmlNamespaceSupport.h QXmlParseException.cpp QXmlParseException.h QXmlReader.cpp QXmlReader.h QXmlSimpleReader.cpp QXmlSimpleReader.h QGb18030Codec.cpp QGb18030Codec.h QGLWidget.cpp QGLFormat.cpp QGLContext.cpp QGL.cpp QGLWidget.h QGLFormat.h QGLContext.h QGL.h QEventLoop.cpp QHttpHeader.cpp QHttpRequestHeader.cpp QHttpResponseHeader.cpp QSpinWidget.cpp QSplashScreen.cpp QToolBox.cpp QEventLoop.h QHttpHeader.h QHttpRequestHeader.h QSpinWidget.h QSplashScreen.h QToolBox.h QHttpResponseHeader.h QtSupport.h QSyntaxHighlighter.cpp QSyntaxHighlighter.h 
+EXTRA_DIST = JavaSlot.cpp JavaSlot.h TQAccel.cpp TQAccel.h TQAction.cpp TQAction.h TQActionGroup.cpp TQActionGroup.h TQApplication.cpp TQApplication.h TQAsyncIO.cpp TQAsyncIO.h TQAuServer.cpp TQAuServer.h TQBitmap.cpp TQBitmap.h TQBoxLayout.cpp TQBoxLayout.h TQBrush.cpp TQBrush.h TQBuffer.cpp TQBuffer.h TQButton.cpp TQButton.h TQButtonGroup.cpp TQButtonGroup.h TQCanvas.cpp TQCanvas.h TQCanvasEllipse.cpp TQCanvasEllipse.h TQCanvasItem.cpp TQCanvasItem.h TQCanvasLine.cpp TQCanvasLine.h TQCanvasPixmap.cpp TQCanvasPixmap.h TQCanvasPixmapArray.cpp TQCanvasPixmapArray.h TQCanvasPolygon.cpp TQCanvasPolygon.h TQCanvasPolygonalItem.cpp TQCanvasPolygonalItem.h TQCanvasRectangle.cpp TQCanvasRectangle.h TQCanvasSpline.cpp TQCanvasSpline.h TQCanvasSprite.cpp TQCanvasSprite.h TQCanvasText.cpp TQCanvasText.h TQCanvasView.cpp TQCanvasView.h TQCheckBox.cpp TQCheckBox.h TQCheckListItem.cpp TQCheckListItem.h TQCheckTableItem.cpp TQCheckTableItem.h TQChildEvent.cpp TQChildEvent.h TQClassInfo.cpp TQClassInfo.h TQClipboard.cpp TQClipboard.h TQCloseEvent.cpp TQCloseEvent.h TQColor.cpp TQColor.h TQColorDialog.cpp TQColorDialog.h TQColorDrag.cpp TQColorDrag.h TQColorGroup.cpp TQColorGroup.h TQComboBox.cpp TQComboBox.h TQComboTableItem.cpp TQComboTableItem.h TQContextMenuEvent.cpp TQContextMenuEvent.h TQCursor.cpp TQCursor.h TQCustomEvent.cpp TQCustomEvent.h TQCustomMenuItem.cpp TQCustomMenuItem.h TQDataBrowser.cpp TQDataBrowser.h TQDataPump.cpp TQDataPump.h TQDataSink.cpp TQDataSink.h TQDataSource.cpp TQDataSource.h TQDataStream.cpp TQDataStream.h TQDataTable.cpp TQDataTable.h TQDataView.cpp TQDataView.h TQDateEdit.cpp TQDateEdit.h TQDateTimeEdit.cpp TQDateTimeEdit.h TQDateTimeEditBase.cpp TQDateTimeEditBase.h TQDesktopWidget.cpp TQDesktopWidget.h TQDial.cpp TQDial.h TQDialog.cpp TQDialog.h TQDir.cpp TQDir.h TQDockArea.cpp TQDockArea.h TQDockWindow.cpp TQDockWindow.h TQDomAttr.cpp TQDomAttr.h TQDomCDATASection.cpp TQDomCDATASection.h TQDomCharacterData.cpp TQDomCharacterData.h TQDomComment.cpp TQDomComment.h TQDomDocument.cpp TQDomDocument.h TQDomDocumentFragment.cpp TQDomDocumentFragment.h TQDomDocumentType.cpp TQDomDocumentType.h TQDomElement.cpp TQDomElement.h TQDomEntity.cpp TQDomEntity.h TQDomEntityReference.cpp TQDomEntityReference.h TQDomImplementation.cpp TQDomImplementation.h TQDomNamedNodeMap.cpp TQDomNamedNodeMap.h TQDomNode.cpp TQDomNode.h TQDomNotation.cpp TQDomNotation.h TQDomProcessingInstruction.cpp TQDomProcessingInstruction.h TQDomText.cpp TQDomText.h TQDoubleValidator.cpp TQDoubleValidator.h TQDragEnterEvent.cpp TQDragEnterEvent.h TQDragLeaveEvent.cpp TQDragLeaveEvent.h TQDragManager.cpp TQDragManager.h TQDragMoveEvent.cpp TQDragMoveEvent.h TQDragObject.cpp TQDragObject.h TQDragResponseEvent.cpp TQDragResponseEvent.h TQDropEvent.cpp TQDropEvent.h TQDropSite.cpp TQDropSite.h TQEditorFactory.cpp TQEditorFactory.h TQErrorMessage.cpp TQErrorMessage.h TQEucJpCodec.cpp TQEucJpCodec.h TQEucKrCodec.cpp TQEucKrCodec.h TQEvent.cpp TQEvent.h TQFile.cpp TQFile.h TQFileDialog.cpp TQFileDialog.h TQFileIconProvider.cpp TQFileIconProvider.h TQFileInfo.cpp TQFileInfo.h TQFilePreview.cpp TQFilePreview.h TQFocusData.cpp TQFocusData.h TQFocusEvent.cpp TQFocusEvent.h TQFont.cpp TQFont.h TQFontDatabase.cpp TQFontDatabase.h TQFontDialog.cpp TQFontDialog.h TQFontInfo.cpp TQFontInfo.h TQFontMetrics.cpp TQFontMetrics.h TQFrame.cpp TQFrame.h TQFtp.cpp TQFtp.h TQGrid.cpp TQGrid.h TQGridLayout.cpp TQGridLayout.h TQGridView.cpp TQGridView.h TQGroupBox.cpp TQGroupBox.h TQHBox.cpp TQHBox.h TQHBoxLayout.cpp TQHBoxLayout.h TQHButtonGroup.cpp TQHButtonGroup.h TQHeader.cpp TQHeader.h TQHebrewCodec.cpp TQHebrewCodec.h TQHGroupBox.cpp TQHGroupBox.h TQHideEvent.cpp TQHideEvent.h TQHostAddress.cpp TQHostAddress.h TQHttp.cpp TQHttp.h TQIconDrag.cpp TQIconDrag.h TQIconDragItem.cpp TQIconDragItem.h TQIconSet.cpp TQIconSet.h TQIconView.cpp TQIconView.h TQIconViewItem.cpp TQIconViewItem.h TQImage.cpp TQImage.h TQImageConsumer.cpp TQImageConsumer.h TQImageDecoder.cpp TQImageDecoder.h TQImageDrag.cpp TQImageDrag.h TQImageFormat.cpp TQImageFormat.h TQImageFormatType.cpp TQImageFormatType.h TQImageIO.cpp TQImageIO.h TQIMEvent.cpp TQIMEvent.h TQInputDialog.cpp TQInputDialog.h TQIntValidator.cpp TQIntValidator.h TQIODevice.cpp TQIODevice.h TQIODeviceSource.cpp TQIODeviceSource.h TQJisCodec.cpp TQJisCodec.h TQJpUnicodeConv.cpp TQJpUnicodeConv.h TQKeyEvent.cpp TQKeyEvent.h TQKeySequence.cpp TQKeySequence.h TQLabel.cpp TQLabel.h TQLayout.cpp TQLayout.h TQLayoutItem.cpp TQLayoutItem.h TQLCDNumber.cpp TQLCDNumber.h TQLibrary.cpp TQLibrary.h TQLineEdit.cpp TQLineEdit.h TQListBox.cpp TQListBox.h TQListBoxItem.cpp TQListBoxItem.h TQListBoxPixmap.cpp TQListBoxPixmap.h TQListBoxText.cpp TQListBoxText.h TQListView.cpp TQListView.h TQListViewItem.cpp TQListViewItem.h TQLocalFs.cpp TQLocalFs.h TQMainWindow.cpp TQMainWindow.h TQMenuBar.cpp TQMenuBar.h TQMenuData.cpp TQMenuData.h TQMenuItem.cpp TQMenuItem.h TQMessageBox.cpp TQMessageBox.h TQMetaData.cpp TQMetaData.h TQMetaEnum.cpp TQMetaEnum.h TQMetaObject.cpp TQMetaObject.h TQMetaProperty.cpp TQMetaProperty.h TQMimeSource.cpp TQMimeSource.h TQMimeSourceFactory.cpp TQMimeSourceFactory.h TQMouseEvent.cpp TQMouseEvent.h TQMoveEvent.cpp TQMoveEvent.h TQMovie.cpp TQMovie.h TQMultiLineEdit.cpp TQMultiLineEdit.h TQNetworkOperation.cpp TQNetworkOperation.h TQNetworkProtocol.cpp TQNetworkProtocol.h TQObject.cpp TQObject.h TQObjectCleanupHandler.cpp TQObjectCleanupHandler.h TQPaintDevice.cpp TQPaintDevice.h TQPaintDeviceMetrics.cpp TQPaintDeviceMetrics.h TQPainter.cpp TQPainter.h TQPaintEvent.cpp TQPaintEvent.h TQPalette.cpp TQPalette.h TQPen.cpp TQPen.h TQPicture.cpp TQPicture.h TQPixmap.cpp TQPixmap.h TQPoint.cpp TQPoint.h TQPointArray.cpp TQPointArray.h TQPolygonScanner.cpp TQPolygonScanner.h TQPopupMenu.cpp TQPopupMenu.h TQPrintDialog.cpp TQPrintDialog.h TQPrinter.cpp TQPrinter.h TQProcess.cpp TQProcess.h TQProgressBar.cpp TQProgressBar.h TQProgressDialog.cpp TQProgressDialog.h TQPushButton.cpp TQPushButton.h TQRadioButton.cpp TQRadioButton.h TQRangeControl.cpp TQRangeControl.h TQRect.cpp TQRect.h TQRegExp.cpp TQRegExp.h TQRegExpValidator.cpp TQRegExpValidator.h TQRegion.cpp TQRegion.h TQResizeEvent.cpp TQResizeEvent.h TQScrollBar.cpp TQScrollBar.h TQScrollView.cpp TQScrollView.h TQSemiModal.cpp TQSemiModal.h TQServerSocket.cpp TQServerSocket.h TQSessionManager.cpp TQSessionManager.h TQSettings.cpp TQSettings.h TQShowEvent.cpp TQShowEvent.h TQSignal.cpp TQSignal.h TQSignalMapper.cpp TQSignalMapper.h TQSimpleRichText.cpp TQSimpleRichText.h TQSize.cpp TQSize.h TQSizeGrip.cpp TQSizeGrip.h TQSizePolicy.cpp TQSizePolicy.h TQSjisCodec.cpp TQSjisCodec.h TQSlider.cpp TQSlider.h TQSocket.cpp TQSocket.h TQSocketDevice.cpp TQSocketDevice.h TQSocketNotifier.cpp TQSocketNotifier.h TQSound.cpp TQSound.h TQSpacerItem.cpp TQSpacerItem.h TQSpinBox.cpp TQSpinBox.h TQSplitter.cpp TQSplitter.h TQSql.cpp TQSql.h TQSqlCursor.cpp TQSqlCursor.h TQSqlDatabase.cpp TQSqlDatabase.h TQSqlDriver.cpp TQSqlDriver.h TQSqlEditorFactory.cpp TQSqlEditorFactory.h TQSqlError.cpp TQSqlError.h TQSqlFieldInfo.cpp TQSqlFieldInfo.h TQSqlField.cpp TQSqlField.h TQSqlForm.cpp TQSqlForm.h TQSqlIndex.cpp TQSqlIndex.h TQSqlPropertyMap.cpp TQSqlPropertyMap.h TQSqlQuery.cpp TQSqlQuery.h TQSqlRecord.cpp TQSqlRecord.h TQSqlResult.cpp TQSqlResult.h TQStatusBar.cpp TQStatusBar.h TQStoredDrag.cpp TQStoredDrag.h TQStyle.cpp TQStyle.h TQStyleOption.cpp TQStyleOption.h TQStyleFactory.cpp TQStyleFactory.h TQStyleSheet.cpp TQStyleSheet.h TQStyleSheetItem.cpp TQStyleSheetItem.h Qt.cpp Qt.h TQTab.cpp TQTab.h TQTabBar.cpp TQTabBar.h TQTabDialog.cpp TQTabDialog.h TQTable.cpp TQTable.h TQTableItem.cpp TQTableItem.h TQTableSelection.cpp TQTableSelection.h TQTabletEvent.cpp TQTabletEvent.h TQTabWidget.cpp TQTabWidget.h TQTextBrowser.cpp TQTextBrowser.h TQTextCodec.cpp TQTextCodec.h TQTextDecoder.cpp TQTextDecoder.h TQTextDrag.cpp TQTextDrag.h TQTextEdit.cpp TQTextEdit.h TQTextEncoder.cpp TQTextEncoder.h TQTextIStream.cpp TQTextIStream.h TQTextOStream.cpp TQTextOStream.h TQTextStream.cpp TQTextStream.h TQTextView.cpp TQTextView.h TQTimeEdit.cpp TQTimeEdit.h TQTimer.cpp TQTimer.h TQTimerEvent.cpp TQTimerEvent.h qtjava.cpp qtjava.h TQToolBar.cpp TQToolBar.h TQToolButton.cpp TQToolButton.h TQToolTip.cpp TQToolTip.h TQToolTipGroup.cpp TQToolTipGroup.h TQTranslator.cpp TQTranslator.h TQTranslatorMessage.cpp TQTranslatorMessage.h TQTsciiCodec.cpp TQTsciiCodec.h QtSupport.cpp TQUriDrag.cpp TQUriDrag.h TQUrl.cpp TQUrl.h TQUrlInfo.cpp TQUrlInfo.h TQUrlOperator.cpp TQUrlOperator.h TQUtf16Codec.cpp TQUtf16Codec.h TQUtf8Codec.cpp TQUtf8Codec.h TQUuid.cpp TQUuid.h TQValidator.cpp TQValidator.h TQVariant.cpp TQVariant.h TQVBox.cpp TQVBox.h TQVBoxLayout.cpp TQVBoxLayout.h TQVButtonGroup.cpp TQVButtonGroup.h TQVGroupBox.cpp TQVGroupBox.h TQWhatsThis.cpp TQWhatsThis.h TQWheelEvent.cpp TQWheelEvent.h TQWidget.cpp TQWidget.h TQWidgetItem.cpp TQWidgetItem.h TQWidgetStack.cpp TQWidgetStack.h TQWizard.cpp TQWizard.h TQWMatrix.cpp TQWMatrix.h TQWorkspace.cpp TQWorkspace.h TQXmlAttributes.cpp TQXmlAttributes.h TQXmlContentHandler.cpp TQXmlContentHandler.h TQXmlDeclHandler.cpp TQXmlDeclHandler.h TQXmlDefaultHandler.cpp TQXmlDefaultHandler.h TQXmlDTDHandler.cpp TQXmlDTDHandler.h TQXmlEntityResolver.cpp TQXmlEntityResolver.h TQXmlErrorHandler.cpp TQXmlErrorHandler.h TQXmlInputSource.cpp TQXmlInputSource.h TQXmlLexicalHandler.cpp TQXmlLexicalHandler.h TQXmlLocator.cpp TQXmlLocator.h TQXmlNamespaceSupport.cpp TQXmlNamespaceSupport.h TQXmlParseException.cpp TQXmlParseException.h TQXmlReader.cpp TQXmlReader.h TQXmlSimpleReader.cpp TQXmlSimpleReader.h TQGb18030Codec.cpp TQGb18030Codec.h TQGLWidget.cpp TQGLFormat.cpp TQGLContext.cpp TQGL.cpp TQGLWidget.h TQGLFormat.h TQGLContext.h TQGL.h TQEventLoop.cpp TQHttpHeader.cpp TQHttpRequestHeader.cpp TQHttpResponseHeader.cpp TQSpinWidget.cpp TQSplashScreen.cpp TQToolBox.cpp TQEventLoop.h TQHttpHeader.h TQHttpRequestHeader.h TQSpinWidget.h TQSplashScreen.h TQToolBox.h TQHttpResponseHeader.h QtSupport.h TQSyntaxHighlighter.cpp TQSyntaxHighlighter.h 
 
 ####### tdevelop will overwrite this part!!! (end)############
 
 # We don't use these, since they depend on Qt having GL support.
-# GL_SOURCES = QGLWidget.cpp QGLFormat.cpp QGLContext.cpp QGL.cpp
+# GL_SOURCES = TQGLWidget.cpp TQGLFormat.cpp TQGLContext.cpp TQGL.cpp
 
 INCLUDES = -I$(srcdir)/.. $(jni_includes) $(all_includes)
 
diff --git a/qtjava/javalib/qtjava/QtSupport.cpp b/qtjava/javalib/qtjava/QtSupport.cpp
index 9bc668ef..1ffe58b9 100644
--- a/qtjava/javalib/qtjava/QtSupport.cpp
+++ b/qtjava/javalib/qtjava/QtSupport.cpp
@@ -22,7 +22,7 @@
 #include <tqmetaobject.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QObject.h>
+#include <qtjava/TQObject.h>
 #include <qtjava/JavaSlot.h>
 
 static JavaVM *	_jvm;
diff --git a/qtjava/javalib/qtjava/QAccel.cpp b/qtjava/javalib/qtjava/TQAccel.cpp
index 5e53be03..13011808 100644
--- a/qtjava/javalib/qtjava/QAccel.cpp
+++ b/qtjava/javalib/qtjava/TQAccel.cpp
@@ -4,7 +4,7 @@
 #include <tqkeysequence.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QAccel.h>
+#include <qtjava/TQAccel.h>
 
 class TQAccelJBridge : public TQAccel
 {
diff --git a/qtjava/javalib/qtjava/QAccel.h b/qtjava/javalib/qtjava/TQAccel.h
index 3d27f3ac..3d27f3ac 100644
--- a/qtjava/javalib/qtjava/QAccel.h
+++ b/qtjava/javalib/qtjava/TQAccel.h
diff --git a/qtjava/javalib/qtjava/QAction.cpp b/qtjava/javalib/qtjava/TQAction.cpp
index b13c96ec..91751c48 100644
--- a/qtjava/javalib/qtjava/QAction.cpp
+++ b/qtjava/javalib/qtjava/TQAction.cpp
@@ -5,7 +5,7 @@
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QAction.h>
+#include <qtjava/TQAction.h>
 
 class TQActionJBridge : public TQAction
 {
diff --git a/qtjava/javalib/qtjava/QAction.h b/qtjava/javalib/qtjava/TQAction.h
index 2980b90b..2980b90b 100644
--- a/qtjava/javalib/qtjava/QAction.h
+++ b/qtjava/javalib/qtjava/TQAction.h
diff --git a/qtjava/javalib/qtjava/QActionGroup.cpp b/qtjava/javalib/qtjava/TQActionGroup.cpp
index 0aada7c7..754736e6 100644
--- a/qtjava/javalib/qtjava/QActionGroup.cpp
+++ b/qtjava/javalib/qtjava/TQActionGroup.cpp
@@ -4,7 +4,7 @@
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QActionGroup.h>
+#include <qtjava/TQActionGroup.h>
 
 class TQActionGroupJBridge : public TQActionGroup
 {
diff --git a/qtjava/javalib/qtjava/QActionGroup.h b/qtjava/javalib/qtjava/TQActionGroup.h
index 3f9a122a..3f9a122a 100644
--- a/qtjava/javalib/qtjava/QActionGroup.h
+++ b/qtjava/javalib/qtjava/TQActionGroup.h
diff --git a/qtjava/javalib/qtjava/QApplication.cpp b/qtjava/javalib/qtjava/TQApplication.cpp
index 8c374ebd..85dddeee 100644
--- a/qtjava/javalib/qtjava/QApplication.cpp
+++ b/qtjava/javalib/qtjava/TQApplication.cpp
@@ -14,7 +14,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QApplication.h>
+#include <qtjava/TQApplication.h>
 
 class TQApplicationJBridge : public TQApplication
 {
diff --git a/qtjava/javalib/qtjava/QApplication.h b/qtjava/javalib/qtjava/TQApplication.h
index 3b659e8f..3b659e8f 100644
--- a/qtjava/javalib/qtjava/QApplication.h
+++ b/qtjava/javalib/qtjava/TQApplication.h
diff --git a/qtjava/javalib/qtjava/QAsyncIO.cpp b/qtjava/javalib/qtjava/TQAsyncIO.cpp
index ed439ccc..20d64641 100644
--- a/qtjava/javalib/qtjava/QAsyncIO.cpp
+++ b/qtjava/javalib/qtjava/TQAsyncIO.cpp
@@ -2,7 +2,7 @@
 #include <tqasyncio.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QAsyncIO.h>
+#include <qtjava/TQAsyncIO.h>
 
 class TQAsyncIOJBridge : public TQAsyncIO
 {
diff --git a/qtjava/javalib/qtjava/QAsyncIO.h b/qtjava/javalib/qtjava/TQAsyncIO.h
index bce6ce27..bce6ce27 100644
--- a/qtjava/javalib/qtjava/QAsyncIO.h
+++ b/qtjava/javalib/qtjava/TQAsyncIO.h
diff --git a/qtjava/javalib/qtjava/QAuServer.cpp b/qtjava/javalib/qtjava/TQAuServer.cpp
index 851f2a27..8b320fb6 100644
--- a/qtjava/javalib/qtjava/QAuServer.cpp
+++ b/qtjava/javalib/qtjava/TQAuServer.cpp
@@ -3,7 +3,7 @@
 #include <tqsound.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QAuServer.h>
+#include <qtjava/TQAuServer.h>
 
 JNIEXPORT jstring JNICALL
 Java_org_kde_qt_QAuServer_className(JNIEnv* env, jobject obj)
diff --git a/qtjava/javalib/qtjava/QAuServer.h b/qtjava/javalib/qtjava/TQAuServer.h
index 164b0262..164b0262 100644
--- a/qtjava/javalib/qtjava/QAuServer.h
+++ b/qtjava/javalib/qtjava/TQAuServer.h
diff --git a/qtjava/javalib/qtjava/QBig5Codec.cpp b/qtjava/javalib/qtjava/TQBig5Codec.cpp
index 1b92acf2..28d70b81 100644
--- a/qtjava/javalib/qtjava/QBig5Codec.cpp
+++ b/qtjava/javalib/qtjava/TQBig5Codec.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QBig5Codec.h>
+#include <qtjava/TQBig5Codec.h>
 
 class TQBig5CodecJBridge : public TQBig5Codec
 {
diff --git a/qtjava/javalib/qtjava/QBig5Codec.h b/qtjava/javalib/qtjava/TQBig5Codec.h
index 4b912a1c..4b912a1c 100644
--- a/qtjava/javalib/qtjava/QBig5Codec.h
+++ b/qtjava/javalib/qtjava/TQBig5Codec.h
diff --git a/qtjava/javalib/qtjava/QBitmap.cpp b/qtjava/javalib/qtjava/TQBitmap.cpp
index 70288fa0..38f9e130 100644
--- a/qtjava/javalib/qtjava/QBitmap.cpp
+++ b/qtjava/javalib/qtjava/TQBitmap.cpp
@@ -6,7 +6,7 @@
 #include <tqwmatrix.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QBitmap.h>
+#include <qtjava/TQBitmap.h>
 
 class TQBitmapJBridge : public TQBitmap
 {
diff --git a/qtjava/javalib/qtjava/QBitmap.h b/qtjava/javalib/qtjava/TQBitmap.h
index e20bba15..e20bba15 100644
--- a/qtjava/javalib/qtjava/QBitmap.h
+++ b/qtjava/javalib/qtjava/TQBitmap.h
diff --git a/qtjava/javalib/qtjava/QBoxLayout.cpp b/qtjava/javalib/qtjava/TQBoxLayout.cpp
index 64f38b3e..ccd4f3ce 100644
--- a/qtjava/javalib/qtjava/QBoxLayout.cpp
+++ b/qtjava/javalib/qtjava/TQBoxLayout.cpp
@@ -6,7 +6,7 @@
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QBoxLayout.h>
+#include <qtjava/TQBoxLayout.h>
 
 class TQBoxLayoutJBridge : public TQBoxLayout
 {
diff --git a/qtjava/javalib/qtjava/QBoxLayout.h b/qtjava/javalib/qtjava/TQBoxLayout.h
index b29d6b7e..b29d6b7e 100644
--- a/qtjava/javalib/qtjava/QBoxLayout.h
+++ b/qtjava/javalib/qtjava/TQBoxLayout.h
diff --git a/qtjava/javalib/qtjava/QBrush.cpp b/qtjava/javalib/qtjava/TQBrush.cpp
index a0efe85b..5afc1645 100644
--- a/qtjava/javalib/qtjava/QBrush.cpp
+++ b/qtjava/javalib/qtjava/TQBrush.cpp
@@ -5,7 +5,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QBrush.h>
+#include <qtjava/TQBrush.h>
 
 class TQBrushJBridge : public TQBrush
 {
diff --git a/qtjava/javalib/qtjava/QBrush.h b/qtjava/javalib/qtjava/TQBrush.h
index ad802b80..ad802b80 100644
--- a/qtjava/javalib/qtjava/QBrush.h
+++ b/qtjava/javalib/qtjava/TQBrush.h
diff --git a/qtjava/javalib/qtjava/QBuffer.cpp b/qtjava/javalib/qtjava/TQBuffer.cpp
index 980fc279..9dbb918d 100644
--- a/qtjava/javalib/qtjava/QBuffer.cpp
+++ b/qtjava/javalib/qtjava/TQBuffer.cpp
@@ -5,7 +5,7 @@
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QBuffer.h>
+#include <qtjava/TQBuffer.h>
 
 class TQBufferJBridge : public TQBuffer
 {
diff --git a/qtjava/javalib/qtjava/QBuffer.h b/qtjava/javalib/qtjava/TQBuffer.h
index 8b4ee52f..8b4ee52f 100644
--- a/qtjava/javalib/qtjava/QBuffer.h
+++ b/qtjava/javalib/qtjava/TQBuffer.h
diff --git a/qtjava/javalib/qtjava/QButton.cpp b/qtjava/javalib/qtjava/TQButton.cpp
index 863d57c9..08f48a53 100644
--- a/qtjava/javalib/qtjava/QButton.cpp
+++ b/qtjava/javalib/qtjava/TQButton.cpp
@@ -7,7 +7,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QButton.h>
+#include <qtjava/TQButton.h>
 
 class TQButtonJBridge : public TQButton
 {
diff --git a/qtjava/javalib/qtjava/QButton.h b/qtjava/javalib/qtjava/TQButton.h
index 1cf59815..1cf59815 100644
--- a/qtjava/javalib/qtjava/QButton.h
+++ b/qtjava/javalib/qtjava/TQButton.h
diff --git a/qtjava/javalib/qtjava/QButtonGroup.cpp b/qtjava/javalib/qtjava/TQButtonGroup.cpp
index e405c1fd..77f6393c 100644
--- a/qtjava/javalib/qtjava/QButtonGroup.cpp
+++ b/qtjava/javalib/qtjava/TQButtonGroup.cpp
@@ -4,7 +4,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QButtonGroup.h>
+#include <qtjava/TQButtonGroup.h>
 
 class TQButtonGroupJBridge : public TQButtonGroup
 {
diff --git a/qtjava/javalib/qtjava/QButtonGroup.h b/qtjava/javalib/qtjava/TQButtonGroup.h
index 6871226a..6871226a 100644
--- a/qtjava/javalib/qtjava/QButtonGroup.h
+++ b/qtjava/javalib/qtjava/TQButtonGroup.h
diff --git a/qtjava/javalib/qtjava/QCanvas.cpp b/qtjava/javalib/qtjava/TQCanvas.cpp
index b1d2ae36..8e7d5772 100644
--- a/qtjava/javalib/qtjava/QCanvas.cpp
+++ b/qtjava/javalib/qtjava/TQCanvas.cpp
@@ -10,7 +10,7 @@
 #include <tqcolor.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QCanvas.h>
+#include <qtjava/TQCanvas.h>
 
 class TQCanvasJBridge : public TQCanvas
 {
diff --git a/qtjava/javalib/qtjava/QCanvas.h b/qtjava/javalib/qtjava/TQCanvas.h
index c8fd79fd..c8fd79fd 100644
--- a/qtjava/javalib/qtjava/QCanvas.h
+++ b/qtjava/javalib/qtjava/TQCanvas.h
diff --git a/qtjava/javalib/qtjava/QCanvasEllipse.cpp b/qtjava/javalib/qtjava/TQCanvasEllipse.cpp
index 2e695fef..a01beeb3 100644
--- a/qtjava/javalib/qtjava/QCanvasEllipse.cpp
+++ b/qtjava/javalib/qtjava/TQCanvasEllipse.cpp
@@ -4,7 +4,7 @@
 #include <tqpainter.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QCanvasEllipse.h>
+#include <qtjava/TQCanvasEllipse.h>
 
 class TQCanvasEllipseJBridge : public TQCanvasEllipse
 {
diff --git a/qtjava/javalib/qtjava/QCanvasEllipse.h b/qtjava/javalib/qtjava/TQCanvasEllipse.h
index d8f6f5ac..d8f6f5ac 100644
--- a/qtjava/javalib/qtjava/QCanvasEllipse.h
+++ b/qtjava/javalib/qtjava/TQCanvasEllipse.h
diff --git a/qtjava/javalib/qtjava/QCanvasItem.cpp b/qtjava/javalib/qtjava/TQCanvasItem.cpp
index 6fb22d6a..822a887f 100644
--- a/qtjava/javalib/qtjava/QCanvasItem.cpp
+++ b/qtjava/javalib/qtjava/TQCanvasItem.cpp
@@ -4,7 +4,7 @@
 #include <tqpainter.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QCanvasItem.h>
+#include <qtjava/TQCanvasItem.h>
 
 JNIEXPORT jboolean JNICALL
 Java_org_kde_qt_QCanvasItem_active(JNIEnv* env, jobject obj)
diff --git a/qtjava/javalib/qtjava/QCanvasItem.h b/qtjava/javalib/qtjava/TQCanvasItem.h
index 65642bed..65642bed 100644
--- a/qtjava/javalib/qtjava/QCanvasItem.h
+++ b/qtjava/javalib/qtjava/TQCanvasItem.h
diff --git a/qtjava/javalib/qtjava/QCanvasLine.cpp b/qtjava/javalib/qtjava/TQCanvasLine.cpp
index ed91d6bb..ce51bb2a 100644
--- a/qtjava/javalib/qtjava/QCanvasLine.cpp
+++ b/qtjava/javalib/qtjava/TQCanvasLine.cpp
@@ -6,7 +6,7 @@
 #include <tqpen.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QCanvasLine.h>
+#include <qtjava/TQCanvasLine.h>
 
 class TQCanvasLineJBridge : public TQCanvasLine
 {
diff --git a/qtjava/javalib/qtjava/QCanvasLine.h b/qtjava/javalib/qtjava/TQCanvasLine.h
index c3401b02..c3401b02 100644
--- a/qtjava/javalib/qtjava/QCanvasLine.h
+++ b/qtjava/javalib/qtjava/TQCanvasLine.h
diff --git a/qtjava/javalib/qtjava/QCanvasPixmap.cpp b/qtjava/javalib/qtjava/TQCanvasPixmap.cpp
index 786aa416..fa2499e6 100644
--- a/qtjava/javalib/qtjava/QCanvasPixmap.cpp
+++ b/qtjava/javalib/qtjava/TQCanvasPixmap.cpp
@@ -6,7 +6,7 @@
 #include <tqcanvas.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QCanvasPixmap.h>
+#include <qtjava/TQCanvasPixmap.h>
 
 class TQCanvasPixmapJBridge : public TQCanvasPixmap
 {
diff --git a/qtjava/javalib/qtjava/QCanvasPixmap.h b/qtjava/javalib/qtjava/TQCanvasPixmap.h
index 87196204..87196204 100644
--- a/qtjava/javalib/qtjava/QCanvasPixmap.h
+++ b/qtjava/javalib/qtjava/TQCanvasPixmap.h
diff --git a/qtjava/javalib/qtjava/QCanvasPixmapArray.cpp b/qtjava/javalib/qtjava/TQCanvasPixmapArray.cpp
index 35d11541..48fa2870 100644
--- a/qtjava/javalib/qtjava/QCanvasPixmapArray.cpp
+++ b/qtjava/javalib/qtjava/TQCanvasPixmapArray.cpp
@@ -4,7 +4,7 @@
 #include <tqpointarray.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QCanvasPixmapArray.h>
+#include <qtjava/TQCanvasPixmapArray.h>
 
 class TQCanvasPixmapArrayJBridge : public TQCanvasPixmapArray
 {
diff --git a/qtjava/javalib/qtjava/QCanvasPixmapArray.h b/qtjava/javalib/qtjava/TQCanvasPixmapArray.h
index 2ec6be3e..2ec6be3e 100644
--- a/qtjava/javalib/qtjava/QCanvasPixmapArray.h
+++ b/qtjava/javalib/qtjava/TQCanvasPixmapArray.h
diff --git a/qtjava/javalib/qtjava/QCanvasPolygon.cpp b/qtjava/javalib/qtjava/TQCanvasPolygon.cpp
index 445d9916..2f4479d0 100644
--- a/qtjava/javalib/qtjava/QCanvasPolygon.cpp
+++ b/qtjava/javalib/qtjava/TQCanvasPolygon.cpp
@@ -4,7 +4,7 @@
 #include <tqpainter.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QCanvasPolygon.h>
+#include <qtjava/TQCanvasPolygon.h>
 
 class TQCanvasPolygonJBridge : public TQCanvasPolygon
 {
diff --git a/qtjava/javalib/qtjava/QCanvasPolygon.h b/qtjava/javalib/qtjava/TQCanvasPolygon.h
index 01acb3e7..01acb3e7 100644
--- a/qtjava/javalib/qtjava/QCanvasPolygon.h
+++ b/qtjava/javalib/qtjava/TQCanvasPolygon.h
diff --git a/qtjava/javalib/qtjava/QCanvasPolygonalItem.cpp b/qtjava/javalib/qtjava/TQCanvasPolygonalItem.cpp
index 97718db2..59307c27 100644
--- a/qtjava/javalib/qtjava/QCanvasPolygonalItem.cpp
+++ b/qtjava/javalib/qtjava/TQCanvasPolygonalItem.cpp
@@ -6,7 +6,7 @@
 #include <tqpen.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QCanvasPolygonalItem.h>
+#include <qtjava/TQCanvasPolygonalItem.h>
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QCanvasPolygonalItem_areaPointsAdvanced(JNIEnv* env, jobject obj)
diff --git a/qtjava/javalib/qtjava/QCanvasPolygonalItem.h b/qtjava/javalib/qtjava/TQCanvasPolygonalItem.h
index 2c71ca0e..2c71ca0e 100644
--- a/qtjava/javalib/qtjava/QCanvasPolygonalItem.h
+++ b/qtjava/javalib/qtjava/TQCanvasPolygonalItem.h
diff --git a/qtjava/javalib/qtjava/QCanvasRectangle.cpp b/qtjava/javalib/qtjava/TQCanvasRectangle.cpp
index 8a2abbbe..5c11bc82 100644
--- a/qtjava/javalib/qtjava/QCanvasRectangle.cpp
+++ b/qtjava/javalib/qtjava/TQCanvasRectangle.cpp
@@ -6,7 +6,7 @@
 #include <tqpainter.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QCanvasRectangle.h>
+#include <qtjava/TQCanvasRectangle.h>
 
 class TQCanvasRectangleJBridge : public TQCanvasRectangle
 {
diff --git a/qtjava/javalib/qtjava/QCanvasRectangle.h b/qtjava/javalib/qtjava/TQCanvasRectangle.h
index d59cff4f..d59cff4f 100644
--- a/qtjava/javalib/qtjava/QCanvasRectangle.h
+++ b/qtjava/javalib/qtjava/TQCanvasRectangle.h
diff --git a/qtjava/javalib/qtjava/QCanvasSpline.cpp b/qtjava/javalib/qtjava/TQCanvasSpline.cpp
index 917c7022..c73223d9 100644
--- a/qtjava/javalib/qtjava/QCanvasSpline.cpp
+++ b/qtjava/javalib/qtjava/TQCanvasSpline.cpp
@@ -3,7 +3,7 @@
 #include <tqpointarray.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QCanvasSpline.h>
+#include <qtjava/TQCanvasSpline.h>
 
 class TQCanvasSplineJBridge : public TQCanvasSpline
 {
diff --git a/qtjava/javalib/qtjava/QCanvasSpline.h b/qtjava/javalib/qtjava/TQCanvasSpline.h
index 244e03b9..244e03b9 100644
--- a/qtjava/javalib/qtjava/QCanvasSpline.h
+++ b/qtjava/javalib/qtjava/TQCanvasSpline.h
diff --git a/qtjava/javalib/qtjava/QCanvasSprite.cpp b/qtjava/javalib/qtjava/TQCanvasSprite.cpp
index 621c538f..2955c86d 100644
--- a/qtjava/javalib/qtjava/QCanvasSprite.cpp
+++ b/qtjava/javalib/qtjava/TQCanvasSprite.cpp
@@ -4,7 +4,7 @@
 #include <tqpainter.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QCanvasSprite.h>
+#include <qtjava/TQCanvasSprite.h>
 
 class TQCanvasSpriteJBridge : public TQCanvasSprite
 {
diff --git a/qtjava/javalib/qtjava/QCanvasSprite.h b/qtjava/javalib/qtjava/TQCanvasSprite.h
index 53aeb2f8..53aeb2f8 100644
--- a/qtjava/javalib/qtjava/QCanvasSprite.h
+++ b/qtjava/javalib/qtjava/TQCanvasSprite.h
diff --git a/qtjava/javalib/qtjava/QCanvasText.cpp b/qtjava/javalib/qtjava/TQCanvasText.cpp
index a48c2854..01269da9 100644
--- a/qtjava/javalib/qtjava/QCanvasText.cpp
+++ b/qtjava/javalib/qtjava/TQCanvasText.cpp
@@ -7,7 +7,7 @@
 #include <tqcolor.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QCanvasText.h>
+#include <qtjava/TQCanvasText.h>
 
 class TQCanvasTextJBridge : public TQCanvasText
 {
diff --git a/qtjava/javalib/qtjava/QCanvasText.h b/qtjava/javalib/qtjava/TQCanvasText.h
index e37e542c..e37e542c 100644
--- a/qtjava/javalib/qtjava/QCanvasText.h
+++ b/qtjava/javalib/qtjava/TQCanvasText.h
diff --git a/qtjava/javalib/qtjava/QCanvasView.cpp b/qtjava/javalib/qtjava/TQCanvasView.cpp
index 005dfa9f..91bd9b8a 100644
--- a/qtjava/javalib/qtjava/QCanvasView.cpp
+++ b/qtjava/javalib/qtjava/TQCanvasView.cpp
@@ -6,7 +6,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QCanvasView.h>
+#include <qtjava/TQCanvasView.h>
 
 class TQCanvasViewJBridge : public TQCanvasView
 {
diff --git a/qtjava/javalib/qtjava/QCanvasView.h b/qtjava/javalib/qtjava/TQCanvasView.h
index cd509a9f..cd509a9f 100644
--- a/qtjava/javalib/qtjava/QCanvasView.h
+++ b/qtjava/javalib/qtjava/TQCanvasView.h
diff --git a/qtjava/javalib/qtjava/QCheckBox.cpp b/qtjava/javalib/qtjava/TQCheckBox.cpp
index 9948d3c0..8e6e1f0c 100644
--- a/qtjava/javalib/qtjava/QCheckBox.cpp
+++ b/qtjava/javalib/qtjava/TQCheckBox.cpp
@@ -5,7 +5,7 @@
 #include <tqpoint.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QCheckBox.h>
+#include <qtjava/TQCheckBox.h>
 
 class TQCheckBoxJBridge : public TQCheckBox
 {
diff --git a/qtjava/javalib/qtjava/QCheckBox.h b/qtjava/javalib/qtjava/TQCheckBox.h
index e690ba59..e690ba59 100644
--- a/qtjava/javalib/qtjava/QCheckBox.h
+++ b/qtjava/javalib/qtjava/TQCheckBox.h
diff --git a/qtjava/javalib/qtjava/QCheckListItem.cpp b/qtjava/javalib/qtjava/TQCheckListItem.cpp
index ebdbc80d..08f8ec75 100644
--- a/qtjava/javalib/qtjava/QCheckListItem.cpp
+++ b/qtjava/javalib/qtjava/TQCheckListItem.cpp
@@ -7,7 +7,7 @@
 #include <tqpalette.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QCheckListItem.h>
+#include <qtjava/TQCheckListItem.h>
 
 class TQCheckListItemJBridge : public TQCheckListItem
 {
diff --git a/qtjava/javalib/qtjava/QCheckListItem.h b/qtjava/javalib/qtjava/TQCheckListItem.h
index 5a56080c..5a56080c 100644
--- a/qtjava/javalib/qtjava/QCheckListItem.h
+++ b/qtjava/javalib/qtjava/TQCheckListItem.h
diff --git a/qtjava/javalib/qtjava/QCheckTableItem.cpp b/qtjava/javalib/qtjava/TQCheckTableItem.cpp
index 9455be99..26da3e80 100644
--- a/qtjava/javalib/qtjava/QCheckTableItem.cpp
+++ b/qtjava/javalib/qtjava/TQCheckTableItem.cpp
@@ -6,7 +6,7 @@
 #include <tqpalette.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QCheckTableItem.h>
+#include <qtjava/TQCheckTableItem.h>
 
 class TQCheckTableItemJBridge : public TQCheckTableItem
 {
diff --git a/qtjava/javalib/qtjava/QCheckTableItem.h b/qtjava/javalib/qtjava/TQCheckTableItem.h
index 303192ec..303192ec 100644
--- a/qtjava/javalib/qtjava/QCheckTableItem.h
+++ b/qtjava/javalib/qtjava/TQCheckTableItem.h
diff --git a/qtjava/javalib/qtjava/QChildEvent.cpp b/qtjava/javalib/qtjava/TQChildEvent.cpp
index 77674f8a..f67f5727 100644
--- a/qtjava/javalib/qtjava/QChildEvent.cpp
+++ b/qtjava/javalib/qtjava/TQChildEvent.cpp
@@ -2,7 +2,7 @@
 #include <tqevent.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QChildEvent.h>
+#include <qtjava/TQChildEvent.h>
 
 class TQChildEventJBridge : public TQChildEvent
 {
diff --git a/qtjava/javalib/qtjava/QChildEvent.h b/qtjava/javalib/qtjava/TQChildEvent.h
index f54e60f5..f54e60f5 100644
--- a/qtjava/javalib/qtjava/QChildEvent.h
+++ b/qtjava/javalib/qtjava/TQChildEvent.h
diff --git a/qtjava/javalib/qtjava/QClassInfo.cpp b/qtjava/javalib/qtjava/TQClassInfo.cpp
index 5d64c167..7cf9a0ad 100644
--- a/qtjava/javalib/qtjava/QClassInfo.cpp
+++ b/qtjava/javalib/qtjava/TQClassInfo.cpp
@@ -2,7 +2,7 @@
 #include <tqmetaobject.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QClassInfo.h>
+#include <qtjava/TQClassInfo.h>
 
 class TQClassInfoJBridge : public TQClassInfo
 {
diff --git a/qtjava/javalib/qtjava/QClassInfo.h b/qtjava/javalib/qtjava/TQClassInfo.h
index 919fa9e0..919fa9e0 100644
--- a/qtjava/javalib/qtjava/QClassInfo.h
+++ b/qtjava/javalib/qtjava/TQClassInfo.h
diff --git a/qtjava/javalib/qtjava/QClipboard.cpp b/qtjava/javalib/qtjava/TQClipboard.cpp
index f376d2c9..b390c9ea 100644
--- a/qtjava/javalib/qtjava/QClipboard.cpp
+++ b/qtjava/javalib/qtjava/TQClipboard.cpp
@@ -6,7 +6,7 @@
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QClipboard.h>
+#include <qtjava/TQClipboard.h>
 
 JNIEXPORT jstring JNICALL
 Java_org_kde_qt_QClipboard_className(JNIEnv* env, jobject obj)
diff --git a/qtjava/javalib/qtjava/QClipboard.h b/qtjava/javalib/qtjava/TQClipboard.h
index c3bb9f9a..c3bb9f9a 100644
--- a/qtjava/javalib/qtjava/QClipboard.h
+++ b/qtjava/javalib/qtjava/TQClipboard.h
diff --git a/qtjava/javalib/qtjava/QCloseEvent.cpp b/qtjava/javalib/qtjava/TQCloseEvent.cpp
index d23dd9d9..08566ce8 100644
--- a/qtjava/javalib/qtjava/QCloseEvent.cpp
+++ b/qtjava/javalib/qtjava/TQCloseEvent.cpp
@@ -2,7 +2,7 @@
 #include <tqevent.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QCloseEvent.h>
+#include <qtjava/TQCloseEvent.h>
 
 class TQCloseEventJBridge : public TQCloseEvent
 {
diff --git a/qtjava/javalib/qtjava/QCloseEvent.h b/qtjava/javalib/qtjava/TQCloseEvent.h
index 391b75e3..391b75e3 100644
--- a/qtjava/javalib/qtjava/QCloseEvent.h
+++ b/qtjava/javalib/qtjava/TQCloseEvent.h
diff --git a/qtjava/javalib/qtjava/QColor.cpp b/qtjava/javalib/qtjava/TQColor.cpp
index 2ed1b3bf..d6866fbf 100644
--- a/qtjava/javalib/qtjava/QColor.cpp
+++ b/qtjava/javalib/qtjava/TQColor.cpp
@@ -5,7 +5,7 @@
 #include <tqcolor.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QColor.h>
+#include <qtjava/TQColor.h>
 
 class TQColorJBridge : public TQColor
 {
diff --git a/qtjava/javalib/qtjava/QColor.h b/qtjava/javalib/qtjava/TQColor.h
index c5a2e803..c5a2e803 100644
--- a/qtjava/javalib/qtjava/QColor.h
+++ b/qtjava/javalib/qtjava/TQColor.h
diff --git a/qtjava/javalib/qtjava/QColorDialog.cpp b/qtjava/javalib/qtjava/TQColorDialog.cpp
index 9a6bf5af..8f3cfad0 100644
--- a/qtjava/javalib/qtjava/QColorDialog.cpp
+++ b/qtjava/javalib/qtjava/TQColorDialog.cpp
@@ -5,7 +5,7 @@
 #include <tqcolor.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QColorDialog.h>
+#include <qtjava/TQColorDialog.h>
 
 JNIEXPORT jstring JNICALL
 Java_org_kde_qt_QColorDialog_className(JNIEnv* env, jobject obj)
diff --git a/qtjava/javalib/qtjava/QColorDialog.h b/qtjava/javalib/qtjava/TQColorDialog.h
index 0b4786af..0b4786af 100644
--- a/qtjava/javalib/qtjava/QColorDialog.h
+++ b/qtjava/javalib/qtjava/TQColorDialog.h
diff --git a/qtjava/javalib/qtjava/QColorDrag.cpp b/qtjava/javalib/qtjava/TQColorDrag.cpp
index 291c5043..932721ef 100644
--- a/qtjava/javalib/qtjava/QColorDrag.cpp
+++ b/qtjava/javalib/qtjava/TQColorDrag.cpp
@@ -4,7 +4,7 @@
 #include <tqcolor.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QColorDrag.h>
+#include <qtjava/TQColorDrag.h>
 
 class TQColorDragJBridge : public TQColorDrag
 {
diff --git a/qtjava/javalib/qtjava/QColorDrag.h b/qtjava/javalib/qtjava/TQColorDrag.h
index 6ee7d7c2..6ee7d7c2 100644
--- a/qtjava/javalib/qtjava/QColorDrag.h
+++ b/qtjava/javalib/qtjava/TQColorDrag.h
diff --git a/qtjava/javalib/qtjava/QColorGroup.cpp b/qtjava/javalib/qtjava/TQColorGroup.cpp
index 7e6d445c..66c9e966 100644
--- a/qtjava/javalib/qtjava/QColorGroup.cpp
+++ b/qtjava/javalib/qtjava/TQColorGroup.cpp
@@ -4,7 +4,7 @@
 #include <tqpalette.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QColorGroup.h>
+#include <qtjava/TQColorGroup.h>
 
 class TQColorGroupJBridge : public TQColorGroup
 {
diff --git a/qtjava/javalib/qtjava/QColorGroup.h b/qtjava/javalib/qtjava/TQColorGroup.h
index 8a53ddcc..8a53ddcc 100644
--- a/qtjava/javalib/qtjava/QColorGroup.h
+++ b/qtjava/javalib/qtjava/TQColorGroup.h
diff --git a/qtjava/javalib/qtjava/QComboBox.cpp b/qtjava/javalib/qtjava/TQComboBox.cpp
index 957e5063..4a0dc900 100644
--- a/qtjava/javalib/qtjava/QComboBox.cpp
+++ b/qtjava/javalib/qtjava/TQComboBox.cpp
@@ -10,7 +10,7 @@
 #include <tqpalette.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QComboBox.h>
+#include <qtjava/TQComboBox.h>
 
 class TQComboBoxJBridge : public TQComboBox
 {
diff --git a/qtjava/javalib/qtjava/QComboBox.h b/qtjava/javalib/qtjava/TQComboBox.h
index 62472515..62472515 100644
--- a/qtjava/javalib/qtjava/QComboBox.h
+++ b/qtjava/javalib/qtjava/TQComboBox.h
diff --git a/qtjava/javalib/qtjava/QComboTableItem.cpp b/qtjava/javalib/qtjava/TQComboTableItem.cpp
index 8216ae93..6a0d9280 100644
--- a/qtjava/javalib/qtjava/QComboTableItem.cpp
+++ b/qtjava/javalib/qtjava/TQComboTableItem.cpp
@@ -7,7 +7,7 @@
 #include <tqpalette.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QComboTableItem.h>
+#include <qtjava/TQComboTableItem.h>
 
 class TQComboTableItemJBridge : public TQComboTableItem
 {
diff --git a/qtjava/javalib/qtjava/QComboTableItem.h b/qtjava/javalib/qtjava/TQComboTableItem.h
index efeaaa72..efeaaa72 100644
--- a/qtjava/javalib/qtjava/QComboTableItem.h
+++ b/qtjava/javalib/qtjava/TQComboTableItem.h
diff --git a/qtjava/javalib/qtjava/QContextMenuEvent.cpp b/qtjava/javalib/qtjava/TQContextMenuEvent.cpp
index eff5efc0..bded20c7 100644
--- a/qtjava/javalib/qtjava/QContextMenuEvent.cpp
+++ b/qtjava/javalib/qtjava/TQContextMenuEvent.cpp
@@ -4,7 +4,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QContextMenuEvent.h>
+#include <qtjava/TQContextMenuEvent.h>
 
 class TQContextMenuEventJBridge : public TQContextMenuEvent
 {
diff --git a/qtjava/javalib/qtjava/QContextMenuEvent.h b/qtjava/javalib/qtjava/TQContextMenuEvent.h
index a36d0c2f..a36d0c2f 100644
--- a/qtjava/javalib/qtjava/QContextMenuEvent.h
+++ b/qtjava/javalib/qtjava/TQContextMenuEvent.h
diff --git a/qtjava/javalib/qtjava/QCursor.cpp b/qtjava/javalib/qtjava/TQCursor.cpp
index 8c2040db..2e04f3be 100644
--- a/qtjava/javalib/qtjava/QCursor.cpp
+++ b/qtjava/javalib/qtjava/TQCursor.cpp
@@ -5,7 +5,7 @@
 #include <tqpoint.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QCursor.h>
+#include <qtjava/TQCursor.h>
 
 class TQCursorJBridge : public TQCursor
 {
diff --git a/qtjava/javalib/qtjava/QCursor.h b/qtjava/javalib/qtjava/TQCursor.h
index 53fed8cd..53fed8cd 100644
--- a/qtjava/javalib/qtjava/QCursor.h
+++ b/qtjava/javalib/qtjava/TQCursor.h
diff --git a/qtjava/javalib/qtjava/QCustomEvent.cpp b/qtjava/javalib/qtjava/TQCustomEvent.cpp
index 523180f4..a583b8d0 100644
--- a/qtjava/javalib/qtjava/QCustomEvent.cpp
+++ b/qtjava/javalib/qtjava/TQCustomEvent.cpp
@@ -2,7 +2,7 @@
 #include <tqevent.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QCustomEvent.h>
+#include <qtjava/TQCustomEvent.h>
 
 class TQCustomEventJBridge : public TQCustomEvent
 {
diff --git a/qtjava/javalib/qtjava/QCustomEvent.h b/qtjava/javalib/qtjava/TQCustomEvent.h
index c58bb6b8..c58bb6b8 100644
--- a/qtjava/javalib/qtjava/QCustomEvent.h
+++ b/qtjava/javalib/qtjava/TQCustomEvent.h
diff --git a/qtjava/javalib/qtjava/QCustomMenuItem.cpp b/qtjava/javalib/qtjava/TQCustomMenuItem.cpp
index 282197a1..9f869f98 100644
--- a/qtjava/javalib/qtjava/QCustomMenuItem.cpp
+++ b/qtjava/javalib/qtjava/TQCustomMenuItem.cpp
@@ -5,7 +5,7 @@
 #include <tqpalette.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QCustomMenuItem.h>
+#include <qtjava/TQCustomMenuItem.h>
 
 JNIEXPORT jboolean JNICALL
 Java_org_kde_qt_QCustomMenuItem_fullSpan(JNIEnv* env, jobject obj)
diff --git a/qtjava/javalib/qtjava/QCustomMenuItem.h b/qtjava/javalib/qtjava/TQCustomMenuItem.h
index 2be7a2d8..2be7a2d8 100644
--- a/qtjava/javalib/qtjava/QCustomMenuItem.h
+++ b/qtjava/javalib/qtjava/TQCustomMenuItem.h
diff --git a/qtjava/javalib/qtjava/QDataBrowser.cpp b/qtjava/javalib/qtjava/TQDataBrowser.cpp
index 8baa2541..181cc568 100644
--- a/qtjava/javalib/qtjava/QDataBrowser.cpp
+++ b/qtjava/javalib/qtjava/TQDataBrowser.cpp
@@ -9,7 +9,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QDataBrowser.h>
+#include <qtjava/TQDataBrowser.h>
 
 class TQDataBrowserJBridge : public TQDataBrowser
 {
diff --git a/qtjava/javalib/qtjava/QDataBrowser.h b/qtjava/javalib/qtjava/TQDataBrowser.h
index c7bc63f9..c7bc63f9 100644
--- a/qtjava/javalib/qtjava/QDataBrowser.h
+++ b/qtjava/javalib/qtjava/TQDataBrowser.h
diff --git a/qtjava/javalib/qtjava/QDataPump.cpp b/qtjava/javalib/qtjava/TQDataPump.cpp
index 325c84cc..fb3306f8 100644
--- a/qtjava/javalib/qtjava/QDataPump.cpp
+++ b/qtjava/javalib/qtjava/TQDataPump.cpp
@@ -3,7 +3,7 @@
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QDataPump.h>
+#include <qtjava/TQDataPump.h>
 
 class TQDataPumpJBridge : public TQDataPump
 {
diff --git a/qtjava/javalib/qtjava/QDataPump.h b/qtjava/javalib/qtjava/TQDataPump.h
index a64ba76f..a64ba76f 100644
--- a/qtjava/javalib/qtjava/QDataPump.h
+++ b/qtjava/javalib/qtjava/TQDataPump.h
diff --git a/qtjava/javalib/qtjava/QDataSink.cpp b/qtjava/javalib/qtjava/TQDataSink.cpp
index d8eca7a4..69bce061 100644
--- a/qtjava/javalib/qtjava/QDataSink.cpp
+++ b/qtjava/javalib/qtjava/TQDataSink.cpp
@@ -2,7 +2,7 @@
 #include <tqasyncio.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QDataSink.h>
+#include <qtjava/TQDataSink.h>
 
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QDataSink_eof(JNIEnv* env, jobject obj)
diff --git a/qtjava/javalib/qtjava/QDataSink.h b/qtjava/javalib/qtjava/TQDataSink.h
index fb790663..fb790663 100644
--- a/qtjava/javalib/qtjava/QDataSink.h
+++ b/qtjava/javalib/qtjava/TQDataSink.h
diff --git a/qtjava/javalib/qtjava/QDataSource.cpp b/qtjava/javalib/qtjava/TQDataSource.cpp
index c223a85b..01b8d05d 100644
--- a/qtjava/javalib/qtjava/QDataSource.cpp
+++ b/qtjava/javalib/qtjava/TQDataSource.cpp
@@ -2,7 +2,7 @@
 #include <tqasyncio.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QDataSource.h>
+#include <qtjava/TQDataSource.h>
 
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QDataSource_enableRewind(JNIEnv* env, jobject obj, jboolean arg1)
diff --git a/qtjava/javalib/qtjava/QDataSource.h b/qtjava/javalib/qtjava/TQDataSource.h
index 43bc1a45..43bc1a45 100644
--- a/qtjava/javalib/qtjava/QDataSource.h
+++ b/qtjava/javalib/qtjava/TQDataSource.h
diff --git a/qtjava/javalib/qtjava/QDataStream.cpp b/qtjava/javalib/qtjava/TQDataStream.cpp
index 1775dec1..ff875824 100644
--- a/qtjava/javalib/qtjava/QDataStream.cpp
+++ b/qtjava/javalib/qtjava/TQDataStream.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QDataStream.h>
+#include <qtjava/TQDataStream.h>
 
 class TQDataStreamJBridge : public TQDataStream
 {
diff --git a/qtjava/javalib/qtjava/QDataStream.h b/qtjava/javalib/qtjava/TQDataStream.h
index fcb96ead..fcb96ead 100644
--- a/qtjava/javalib/qtjava/QDataStream.h
+++ b/qtjava/javalib/qtjava/TQDataStream.h
diff --git a/qtjava/javalib/qtjava/QDataTable.cpp b/qtjava/javalib/qtjava/TQDataTable.cpp
index f5a66410..88068513 100644
--- a/qtjava/javalib/qtjava/QDataTable.cpp
+++ b/qtjava/javalib/qtjava/TQDataTable.cpp
@@ -13,7 +13,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QDataTable.h>
+#include <qtjava/TQDataTable.h>
 
 class TQDataTableJBridge : public TQDataTable
 {
diff --git a/qtjava/javalib/qtjava/QDataTable.h b/qtjava/javalib/qtjava/TQDataTable.h
index 3871bcca..3871bcca 100644
--- a/qtjava/javalib/qtjava/QDataTable.h
+++ b/qtjava/javalib/qtjava/TQDataTable.h
diff --git a/qtjava/javalib/qtjava/QDataView.cpp b/qtjava/javalib/qtjava/TQDataView.cpp
index fd9c33f8..d28f0e6f 100644
--- a/qtjava/javalib/qtjava/QDataView.cpp
+++ b/qtjava/javalib/qtjava/TQDataView.cpp
@@ -4,7 +4,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QDataView.h>
+#include <qtjava/TQDataView.h>
 
 class TQDataViewJBridge : public TQDataView
 {
diff --git a/qtjava/javalib/qtjava/QDataView.h b/qtjava/javalib/qtjava/TQDataView.h
index 4cfa063c..4cfa063c 100644
--- a/qtjava/javalib/qtjava/QDataView.h
+++ b/qtjava/javalib/qtjava/TQDataView.h
diff --git a/qtjava/javalib/qtjava/QDateEdit.cpp b/qtjava/javalib/qtjava/TQDateEdit.cpp
index a09db222..bcb46402 100644
--- a/qtjava/javalib/qtjava/QDateEdit.cpp
+++ b/qtjava/javalib/qtjava/TQDateEdit.cpp
@@ -5,7 +5,7 @@
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QDateEdit.h>
+#include <qtjava/TQDateEdit.h>
 
 class TQDateEditJBridge : public TQDateEdit
 {
diff --git a/qtjava/javalib/qtjava/QDateEdit.h b/qtjava/javalib/qtjava/TQDateEdit.h
index f1f1d29c..f1f1d29c 100644
--- a/qtjava/javalib/qtjava/QDateEdit.h
+++ b/qtjava/javalib/qtjava/TQDateEdit.h
diff --git a/qtjava/javalib/qtjava/QDateTimeEdit.cpp b/qtjava/javalib/qtjava/TQDateTimeEdit.cpp
index 981862bd..3c68d35a 100644
--- a/qtjava/javalib/qtjava/QDateTimeEdit.cpp
+++ b/qtjava/javalib/qtjava/TQDateTimeEdit.cpp
@@ -5,7 +5,7 @@
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QDateTimeEdit.h>
+#include <qtjava/TQDateTimeEdit.h>
 
 class TQDateTimeEditJBridge : public TQDateTimeEdit
 {
diff --git a/qtjava/javalib/qtjava/QDateTimeEdit.h b/qtjava/javalib/qtjava/TQDateTimeEdit.h
index b314823b..b314823b 100644
--- a/qtjava/javalib/qtjava/QDateTimeEdit.h
+++ b/qtjava/javalib/qtjava/TQDateTimeEdit.h
diff --git a/qtjava/javalib/qtjava/QDateTimeEditBase.cpp b/qtjava/javalib/qtjava/TQDateTimeEditBase.cpp
index 7a0179b2..3a3257bf 100644
--- a/qtjava/javalib/qtjava/QDateTimeEditBase.cpp
+++ b/qtjava/javalib/qtjava/TQDateTimeEditBase.cpp
@@ -3,7 +3,7 @@
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QDateTimeEditBase.h>
+#include <qtjava/TQDateTimeEditBase.h>
 
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QDateTimeEditBase_addNumber(JNIEnv* env, jobject obj, jint sec, jint num)
diff --git a/qtjava/javalib/qtjava/QDateTimeEditBase.h b/qtjava/javalib/qtjava/TQDateTimeEditBase.h
index 1798cb65..1798cb65 100644
--- a/qtjava/javalib/qtjava/QDateTimeEditBase.h
+++ b/qtjava/javalib/qtjava/TQDateTimeEditBase.h
diff --git a/qtjava/javalib/qtjava/QDesktopWidget.cpp b/qtjava/javalib/qtjava/TQDesktopWidget.cpp
index af204271..0c263a62 100644
--- a/qtjava/javalib/qtjava/QDesktopWidget.cpp
+++ b/qtjava/javalib/qtjava/TQDesktopWidget.cpp
@@ -5,7 +5,7 @@
 #include <tqdesktopwidget.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QDesktopWidget.h>
+#include <qtjava/TQDesktopWidget.h>
 
 class TQDesktopWidgetJBridge : public TQDesktopWidget
 {
diff --git a/qtjava/javalib/qtjava/QDesktopWidget.h b/qtjava/javalib/qtjava/TQDesktopWidget.h
index ca030054..ca030054 100644
--- a/qtjava/javalib/qtjava/QDesktopWidget.h
+++ b/qtjava/javalib/qtjava/TQDesktopWidget.h
diff --git a/qtjava/javalib/qtjava/QDial.cpp b/qtjava/javalib/qtjava/TQDial.cpp
index 0a402961..96011df8 100644
--- a/qtjava/javalib/qtjava/QDial.cpp
+++ b/qtjava/javalib/qtjava/TQDial.cpp
@@ -6,7 +6,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QDial.h>
+#include <qtjava/TQDial.h>
 
 class TQDialJBridge : public TQDial
 {
diff --git a/qtjava/javalib/qtjava/QDial.h b/qtjava/javalib/qtjava/TQDial.h
index 8110ad02..8110ad02 100644
--- a/qtjava/javalib/qtjava/QDial.h
+++ b/qtjava/javalib/qtjava/TQDial.h
diff --git a/qtjava/javalib/qtjava/QDialog.cpp b/qtjava/javalib/qtjava/TQDialog.cpp
index e712df78..a8ef984e 100644
--- a/qtjava/javalib/qtjava/QDialog.cpp
+++ b/qtjava/javalib/qtjava/TQDialog.cpp
@@ -7,7 +7,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QDialog.h>
+#include <qtjava/TQDialog.h>
 
 class TQDialogJBridge : public TQDialog
 {
diff --git a/qtjava/javalib/qtjava/QDialog.h b/qtjava/javalib/qtjava/TQDialog.h
index abfb688e..abfb688e 100644
--- a/qtjava/javalib/qtjava/QDialog.h
+++ b/qtjava/javalib/qtjava/TQDialog.h
diff --git a/qtjava/javalib/qtjava/QDir.cpp b/qtjava/javalib/qtjava/TQDir.cpp
index 5ac8e868..6b3c26c2 100644
--- a/qtjava/javalib/qtjava/QDir.cpp
+++ b/qtjava/javalib/qtjava/TQDir.cpp
@@ -5,7 +5,7 @@
 #include <tqstringlist.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QDir.h>
+#include <qtjava/TQDir.h>
 
 class TQDirJBridge : public TQDir
 {
diff --git a/qtjava/javalib/qtjava/QDir.h b/qtjava/javalib/qtjava/TQDir.h
index 590e34e5..590e34e5 100644
--- a/qtjava/javalib/qtjava/QDir.h
+++ b/qtjava/javalib/qtjava/TQDir.h
diff --git a/qtjava/javalib/qtjava/QDockArea.cpp b/qtjava/javalib/qtjava/TQDockArea.cpp
index 4adf7b93..57c9ce82 100644
--- a/qtjava/javalib/qtjava/QDockArea.cpp
+++ b/qtjava/javalib/qtjava/TQDockArea.cpp
@@ -6,7 +6,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QDockArea.h>
+#include <qtjava/TQDockArea.h>
 
 class TQDockAreaJBridge : public TQDockArea
 {
diff --git a/qtjava/javalib/qtjava/QDockArea.h b/qtjava/javalib/qtjava/TQDockArea.h
index 4bea61df..4bea61df 100644
--- a/qtjava/javalib/qtjava/QDockArea.h
+++ b/qtjava/javalib/qtjava/TQDockArea.h
diff --git a/qtjava/javalib/qtjava/QDockWindow.cpp b/qtjava/javalib/qtjava/TQDockWindow.cpp
index 3157dc68..b2ec3c79 100644
--- a/qtjava/javalib/qtjava/QDockWindow.cpp
+++ b/qtjava/javalib/qtjava/TQDockWindow.cpp
@@ -5,7 +5,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QDockWindow.h>
+#include <qtjava/TQDockWindow.h>
 
 class TQDockWindowJBridge : public TQDockWindow
 {
diff --git a/qtjava/javalib/qtjava/QDockWindow.h b/qtjava/javalib/qtjava/TQDockWindow.h
index db5aaf97..db5aaf97 100644
--- a/qtjava/javalib/qtjava/QDockWindow.h
+++ b/qtjava/javalib/qtjava/TQDockWindow.h
diff --git a/qtjava/javalib/qtjava/QDomAttr.cpp b/qtjava/javalib/qtjava/TQDomAttr.cpp
index fe6adebb..8ea13346 100644
--- a/qtjava/javalib/qtjava/QDomAttr.cpp
+++ b/qtjava/javalib/qtjava/TQDomAttr.cpp
@@ -3,7 +3,7 @@
 #include <tqdom.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QDomAttr.h>
+#include <qtjava/TQDomAttr.h>
 
 class TQDomAttrJBridge : public TQDomAttr
 {
diff --git a/qtjava/javalib/qtjava/QDomAttr.h b/qtjava/javalib/qtjava/TQDomAttr.h
index d9f46a1d..d9f46a1d 100644
--- a/qtjava/javalib/qtjava/QDomAttr.h
+++ b/qtjava/javalib/qtjava/TQDomAttr.h
diff --git a/qtjava/javalib/qtjava/QDomCDATASection.cpp b/qtjava/javalib/qtjava/TQDomCDATASection.cpp
index cd91d938..c92280ca 100644
--- a/qtjava/javalib/qtjava/QDomCDATASection.cpp
+++ b/qtjava/javalib/qtjava/TQDomCDATASection.cpp
@@ -2,7 +2,7 @@
 #include <tqdom.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QDomCDATASection.h>
+#include <qtjava/TQDomCDATASection.h>
 
 class TQDomCDATASectionJBridge : public TQDomCDATASection
 {
diff --git a/qtjava/javalib/qtjava/QDomCDATASection.h b/qtjava/javalib/qtjava/TQDomCDATASection.h
index e40acbe0..e40acbe0 100644
--- a/qtjava/javalib/qtjava/QDomCDATASection.h
+++ b/qtjava/javalib/qtjava/TQDomCDATASection.h
diff --git a/qtjava/javalib/qtjava/QDomCharacterData.cpp b/qtjava/javalib/qtjava/TQDomCharacterData.cpp
index ddd06e11..a0dce4e7 100644
--- a/qtjava/javalib/qtjava/QDomCharacterData.cpp
+++ b/qtjava/javalib/qtjava/TQDomCharacterData.cpp
@@ -3,7 +3,7 @@
 #include <tqdom.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QDomCharacterData.h>
+#include <qtjava/TQDomCharacterData.h>
 
 class TQDomCharacterDataJBridge : public TQDomCharacterData
 {
diff --git a/qtjava/javalib/qtjava/QDomCharacterData.h b/qtjava/javalib/qtjava/TQDomCharacterData.h
index 3f30a37f..3f30a37f 100644
--- a/qtjava/javalib/qtjava/QDomCharacterData.h
+++ b/qtjava/javalib/qtjava/TQDomCharacterData.h
diff --git a/qtjava/javalib/qtjava/QDomComment.cpp b/qtjava/javalib/qtjava/TQDomComment.cpp
index aaa1a0b7..ad66b3db 100644
--- a/qtjava/javalib/qtjava/QDomComment.cpp
+++ b/qtjava/javalib/qtjava/TQDomComment.cpp
@@ -2,7 +2,7 @@
 #include <tqdom.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QDomComment.h>
+#include <qtjava/TQDomComment.h>
 
 class TQDomCommentJBridge : public TQDomComment
 {
diff --git a/qtjava/javalib/qtjava/QDomComment.h b/qtjava/javalib/qtjava/TQDomComment.h
index cb3cc6e3..cb3cc6e3 100644
--- a/qtjava/javalib/qtjava/QDomComment.h
+++ b/qtjava/javalib/qtjava/TQDomComment.h
diff --git a/qtjava/javalib/qtjava/QDomDocument.cpp b/qtjava/javalib/qtjava/TQDomDocument.cpp
index b7029571..76ff1d87 100644
--- a/qtjava/javalib/qtjava/QDomDocument.cpp
+++ b/qtjava/javalib/qtjava/TQDomDocument.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QDomDocument.h>
+#include <qtjava/TQDomDocument.h>
 
 class TQDomDocumentJBridge : public TQDomDocument
 {
diff --git a/qtjava/javalib/qtjava/QDomDocument.h b/qtjava/javalib/qtjava/TQDomDocument.h
index 26e2d697..26e2d697 100644
--- a/qtjava/javalib/qtjava/QDomDocument.h
+++ b/qtjava/javalib/qtjava/TQDomDocument.h
diff --git a/qtjava/javalib/qtjava/QDomDocumentFragment.cpp b/qtjava/javalib/qtjava/TQDomDocumentFragment.cpp
index 53d0f49b..364e626b 100644
--- a/qtjava/javalib/qtjava/QDomDocumentFragment.cpp
+++ b/qtjava/javalib/qtjava/TQDomDocumentFragment.cpp
@@ -2,7 +2,7 @@
 #include <tqdom.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QDomDocumentFragment.h>
+#include <qtjava/TQDomDocumentFragment.h>
 
 class TQDomDocumentFragmentJBridge : public TQDomDocumentFragment
 {
diff --git a/qtjava/javalib/qtjava/QDomDocumentFragment.h b/qtjava/javalib/qtjava/TQDomDocumentFragment.h
index 4d1e8c29..4d1e8c29 100644
--- a/qtjava/javalib/qtjava/QDomDocumentFragment.h
+++ b/qtjava/javalib/qtjava/TQDomDocumentFragment.h
diff --git a/qtjava/javalib/qtjava/QDomDocumentType.cpp b/qtjava/javalib/qtjava/TQDomDocumentType.cpp
index b87be7f6..3a0846e0 100644
--- a/qtjava/javalib/qtjava/QDomDocumentType.cpp
+++ b/qtjava/javalib/qtjava/TQDomDocumentType.cpp
@@ -3,7 +3,7 @@
 #include <tqdom.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QDomDocumentType.h>
+#include <qtjava/TQDomDocumentType.h>
 
 class TQDomDocumentTypeJBridge : public TQDomDocumentType
 {
diff --git a/qtjava/javalib/qtjava/QDomDocumentType.h b/qtjava/javalib/qtjava/TQDomDocumentType.h
index 388bd5ec..388bd5ec 100644
--- a/qtjava/javalib/qtjava/QDomDocumentType.h
+++ b/qtjava/javalib/qtjava/TQDomDocumentType.h
diff --git a/qtjava/javalib/qtjava/QDomElement.cpp b/qtjava/javalib/qtjava/TQDomElement.cpp
index c71d9d7c..fd81bb98 100644
--- a/qtjava/javalib/qtjava/QDomElement.cpp
+++ b/qtjava/javalib/qtjava/TQDomElement.cpp
@@ -3,7 +3,7 @@
 #include <tqdom.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QDomElement.h>
+#include <qtjava/TQDomElement.h>
 
 class TQDomElementJBridge : public TQDomElement
 {
diff --git a/qtjava/javalib/qtjava/QDomElement.h b/qtjava/javalib/qtjava/TQDomElement.h
index dfdd53ae..dfdd53ae 100644
--- a/qtjava/javalib/qtjava/QDomElement.h
+++ b/qtjava/javalib/qtjava/TQDomElement.h
diff --git a/qtjava/javalib/qtjava/QDomEntity.cpp b/qtjava/javalib/qtjava/TQDomEntity.cpp
index 1e6b1714..f2d99d52 100644
--- a/qtjava/javalib/qtjava/QDomEntity.cpp
+++ b/qtjava/javalib/qtjava/TQDomEntity.cpp
@@ -3,7 +3,7 @@
 #include <tqdom.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QDomEntity.h>
+#include <qtjava/TQDomEntity.h>
 
 class TQDomEntityJBridge : public TQDomEntity
 {
diff --git a/qtjava/javalib/qtjava/QDomEntity.h b/qtjava/javalib/qtjava/TQDomEntity.h
index c652b815..c652b815 100644
--- a/qtjava/javalib/qtjava/QDomEntity.h
+++ b/qtjava/javalib/qtjava/TQDomEntity.h
diff --git a/qtjava/javalib/qtjava/QDomEntityReference.cpp b/qtjava/javalib/qtjava/TQDomEntityReference.cpp
index 06d6140c..edaea6b9 100644
--- a/qtjava/javalib/qtjava/QDomEntityReference.cpp
+++ b/qtjava/javalib/qtjava/TQDomEntityReference.cpp
@@ -2,7 +2,7 @@
 #include <tqdom.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QDomEntityReference.h>
+#include <qtjava/TQDomEntityReference.h>
 
 class TQDomEntityReferenceJBridge : public TQDomEntityReference
 {
diff --git a/qtjava/javalib/qtjava/QDomEntityReference.h b/qtjava/javalib/qtjava/TQDomEntityReference.h
index 7d52365e..7d52365e 100644
--- a/qtjava/javalib/qtjava/QDomEntityReference.h
+++ b/qtjava/javalib/qtjava/TQDomEntityReference.h
diff --git a/qtjava/javalib/qtjava/QDomImplementation.cpp b/qtjava/javalib/qtjava/TQDomImplementation.cpp
index 036c2d86..1705b6c1 100644
--- a/qtjava/javalib/qtjava/QDomImplementation.cpp
+++ b/qtjava/javalib/qtjava/TQDomImplementation.cpp
@@ -3,7 +3,7 @@
 #include <tqdom.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QDomImplementation.h>
+#include <qtjava/TQDomImplementation.h>
 
 class TQDomImplementationJBridge : public TQDomImplementation
 {
diff --git a/qtjava/javalib/qtjava/QDomImplementation.h b/qtjava/javalib/qtjava/TQDomImplementation.h
index 7e75e34c..7e75e34c 100644
--- a/qtjava/javalib/qtjava/QDomImplementation.h
+++ b/qtjava/javalib/qtjava/TQDomImplementation.h
diff --git a/qtjava/javalib/qtjava/QDomNamedNodeMap.cpp b/qtjava/javalib/qtjava/TQDomNamedNodeMap.cpp
index 02add5e0..e212185d 100644
--- a/qtjava/javalib/qtjava/QDomNamedNodeMap.cpp
+++ b/qtjava/javalib/qtjava/TQDomNamedNodeMap.cpp
@@ -3,7 +3,7 @@
 #include <tqdom.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QDomNamedNodeMap.h>
+#include <qtjava/TQDomNamedNodeMap.h>
 
 class TQDomNamedNodeMapJBridge : public TQDomNamedNodeMap
 {
diff --git a/qtjava/javalib/qtjava/QDomNamedNodeMap.h b/qtjava/javalib/qtjava/TQDomNamedNodeMap.h
index 4e9961fc..4e9961fc 100644
--- a/qtjava/javalib/qtjava/QDomNamedNodeMap.h
+++ b/qtjava/javalib/qtjava/TQDomNamedNodeMap.h
diff --git a/qtjava/javalib/qtjava/QDomNode.cpp b/qtjava/javalib/qtjava/TQDomNode.cpp
index 3db89d9b..108d592e 100644
--- a/qtjava/javalib/qtjava/QDomNode.cpp
+++ b/qtjava/javalib/qtjava/TQDomNode.cpp
@@ -4,7 +4,7 @@
 #include <tqdom.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QDomNode.h>
+#include <qtjava/TQDomNode.h>
 
 class TQDomNodeJBridge : public TQDomNode
 {
diff --git a/qtjava/javalib/qtjava/QDomNode.h b/qtjava/javalib/qtjava/TQDomNode.h
index b64ccab7..b64ccab7 100644
--- a/qtjava/javalib/qtjava/QDomNode.h
+++ b/qtjava/javalib/qtjava/TQDomNode.h
diff --git a/qtjava/javalib/qtjava/QDomNotation.cpp b/qtjava/javalib/qtjava/TQDomNotation.cpp
index 73c5fb53..5cd9aa88 100644
--- a/qtjava/javalib/qtjava/QDomNotation.cpp
+++ b/qtjava/javalib/qtjava/TQDomNotation.cpp
@@ -3,7 +3,7 @@
 #include <tqdom.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QDomNotation.h>
+#include <qtjava/TQDomNotation.h>
 
 class TQDomNotationJBridge : public TQDomNotation
 {
diff --git a/qtjava/javalib/qtjava/QDomNotation.h b/qtjava/javalib/qtjava/TQDomNotation.h
index db826a79..db826a79 100644
--- a/qtjava/javalib/qtjava/QDomNotation.h
+++ b/qtjava/javalib/qtjava/TQDomNotation.h
diff --git a/qtjava/javalib/qtjava/QDomProcessingInstruction.cpp b/qtjava/javalib/qtjava/TQDomProcessingInstruction.cpp
index 7d244d52..5f93236a 100644
--- a/qtjava/javalib/qtjava/QDomProcessingInstruction.cpp
+++ b/qtjava/javalib/qtjava/TQDomProcessingInstruction.cpp
@@ -3,7 +3,7 @@
 #include <tqdom.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QDomProcessingInstruction.h>
+#include <qtjava/TQDomProcessingInstruction.h>
 
 class TQDomProcessingInstructionJBridge : public TQDomProcessingInstruction
 {
diff --git a/qtjava/javalib/qtjava/QDomProcessingInstruction.h b/qtjava/javalib/qtjava/TQDomProcessingInstruction.h
index 3b2e475f..3b2e475f 100644
--- a/qtjava/javalib/qtjava/QDomProcessingInstruction.h
+++ b/qtjava/javalib/qtjava/TQDomProcessingInstruction.h
diff --git a/qtjava/javalib/qtjava/QDomText.cpp b/qtjava/javalib/qtjava/TQDomText.cpp
index ea2fc240..7128c2c5 100644
--- a/qtjava/javalib/qtjava/QDomText.cpp
+++ b/qtjava/javalib/qtjava/TQDomText.cpp
@@ -2,7 +2,7 @@
 #include <tqdom.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QDomText.h>
+#include <qtjava/TQDomText.h>
 
 class TQDomTextJBridge : public TQDomText
 {
diff --git a/qtjava/javalib/qtjava/QDomText.h b/qtjava/javalib/qtjava/TQDomText.h
index 903d5d2a..903d5d2a 100644
--- a/qtjava/javalib/qtjava/QDomText.h
+++ b/qtjava/javalib/qtjava/TQDomText.h
diff --git a/qtjava/javalib/qtjava/QDoubleValidator.cpp b/qtjava/javalib/qtjava/TQDoubleValidator.cpp
index 287366d9..61f3e3f7 100644
--- a/qtjava/javalib/qtjava/QDoubleValidator.cpp
+++ b/qtjava/javalib/qtjava/TQDoubleValidator.cpp
@@ -3,7 +3,7 @@
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QDoubleValidator.h>
+#include <qtjava/TQDoubleValidator.h>
 
 class TQDoubleValidatorJBridge : public TQDoubleValidator
 {
diff --git a/qtjava/javalib/qtjava/QDoubleValidator.h b/qtjava/javalib/qtjava/TQDoubleValidator.h
index bd2c370c..bd2c370c 100644
--- a/qtjava/javalib/qtjava/QDoubleValidator.h
+++ b/qtjava/javalib/qtjava/TQDoubleValidator.h
diff --git a/qtjava/javalib/qtjava/QDragEnterEvent.cpp b/qtjava/javalib/qtjava/TQDragEnterEvent.cpp
index 1e4ee6a0..ddc9410e 100644
--- a/qtjava/javalib/qtjava/QDragEnterEvent.cpp
+++ b/qtjava/javalib/qtjava/TQDragEnterEvent.cpp
@@ -3,7 +3,7 @@
 #include <tqpoint.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QDragEnterEvent.h>
+#include <qtjava/TQDragEnterEvent.h>
 
 class TQDragEnterEventJBridge : public TQDragEnterEvent
 {
diff --git a/qtjava/javalib/qtjava/QDragEnterEvent.h b/qtjava/javalib/qtjava/TQDragEnterEvent.h
index 379e6c0b..379e6c0b 100644
--- a/qtjava/javalib/qtjava/QDragEnterEvent.h
+++ b/qtjava/javalib/qtjava/TQDragEnterEvent.h
diff --git a/qtjava/javalib/qtjava/QDragLeaveEvent.cpp b/qtjava/javalib/qtjava/TQDragLeaveEvent.cpp
index 2775fc21..cd0c3731 100644
--- a/qtjava/javalib/qtjava/QDragLeaveEvent.cpp
+++ b/qtjava/javalib/qtjava/TQDragLeaveEvent.cpp
@@ -2,7 +2,7 @@
 #include <tqevent.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QDragLeaveEvent.h>
+#include <qtjava/TQDragLeaveEvent.h>
 
 class TQDragLeaveEventJBridge : public TQDragLeaveEvent
 {
diff --git a/qtjava/javalib/qtjava/QDragLeaveEvent.h b/qtjava/javalib/qtjava/TQDragLeaveEvent.h
index 823be5d8..823be5d8 100644
--- a/qtjava/javalib/qtjava/QDragLeaveEvent.h
+++ b/qtjava/javalib/qtjava/TQDragLeaveEvent.h
diff --git a/qtjava/javalib/qtjava/QDragManager.cpp b/qtjava/javalib/qtjava/TQDragManager.cpp
index 4386914a..80917818 100644
--- a/qtjava/javalib/qtjava/QDragManager.cpp
+++ b/qtjava/javalib/qtjava/TQDragManager.cpp
@@ -3,7 +3,7 @@
 #include <tqdragobject.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QDragManager.h>
+#include <qtjava/TQDragManager.h>
 
 JNIEXPORT jstring JNICALL
 Java_org_kde_qt_QDragManager_className(JNIEnv* env, jobject obj)
diff --git a/qtjava/javalib/qtjava/QDragManager.h b/qtjava/javalib/qtjava/TQDragManager.h
index 2673f61e..2673f61e 100644
--- a/qtjava/javalib/qtjava/QDragManager.h
+++ b/qtjava/javalib/qtjava/TQDragManager.h
diff --git a/qtjava/javalib/qtjava/QDragMoveEvent.cpp b/qtjava/javalib/qtjava/TQDragMoveEvent.cpp
index 0b3ba4bf..3457917b 100644
--- a/qtjava/javalib/qtjava/QDragMoveEvent.cpp
+++ b/qtjava/javalib/qtjava/TQDragMoveEvent.cpp
@@ -4,7 +4,7 @@
 #include <tqpoint.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QDragMoveEvent.h>
+#include <qtjava/TQDragMoveEvent.h>
 
 class TQDragMoveEventJBridge : public TQDragMoveEvent
 {
diff --git a/qtjava/javalib/qtjava/QDragMoveEvent.h b/qtjava/javalib/qtjava/TQDragMoveEvent.h
index 676f77ae..676f77ae 100644
--- a/qtjava/javalib/qtjava/QDragMoveEvent.h
+++ b/qtjava/javalib/qtjava/TQDragMoveEvent.h
diff --git a/qtjava/javalib/qtjava/QDragObject.cpp b/qtjava/javalib/qtjava/TQDragObject.cpp
index 3b65e95a..43a0254c 100644
--- a/qtjava/javalib/qtjava/QDragObject.cpp
+++ b/qtjava/javalib/qtjava/TQDragObject.cpp
@@ -7,7 +7,7 @@
 #include <tqmime.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QDragObject.h>
+#include <qtjava/TQDragObject.h>
 
 JNIEXPORT jstring JNICALL
 Java_org_kde_qt_QDragObject_className(JNIEnv* env, jobject obj)
diff --git a/qtjava/javalib/qtjava/QDragObject.h b/qtjava/javalib/qtjava/TQDragObject.h
index 633197e3..633197e3 100644
--- a/qtjava/javalib/qtjava/QDragObject.h
+++ b/qtjava/javalib/qtjava/TQDragObject.h
diff --git a/qtjava/javalib/qtjava/QDragResponseEvent.cpp b/qtjava/javalib/qtjava/TQDragResponseEvent.cpp
index cdc489b3..db156950 100644
--- a/qtjava/javalib/qtjava/QDragResponseEvent.cpp
+++ b/qtjava/javalib/qtjava/TQDragResponseEvent.cpp
@@ -2,7 +2,7 @@
 #include <tqevent.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QDragResponseEvent.h>
+#include <qtjava/TQDragResponseEvent.h>
 
 class TQDragResponseEventJBridge : public TQDragResponseEvent
 {
diff --git a/qtjava/javalib/qtjava/QDragResponseEvent.h b/qtjava/javalib/qtjava/TQDragResponseEvent.h
index 0489ce68..0489ce68 100644
--- a/qtjava/javalib/qtjava/QDragResponseEvent.h
+++ b/qtjava/javalib/qtjava/TQDragResponseEvent.h
diff --git a/qtjava/javalib/qtjava/QDropEvent.cpp b/qtjava/javalib/qtjava/TQDropEvent.cpp
index bf1fe5c5..24443f5a 100644
--- a/qtjava/javalib/qtjava/QDropEvent.cpp
+++ b/qtjava/javalib/qtjava/TQDropEvent.cpp
@@ -5,7 +5,7 @@
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QDropEvent.h>
+#include <qtjava/TQDropEvent.h>
 
 class TQDropEventJBridge : public TQDropEvent
 {
diff --git a/qtjava/javalib/qtjava/QDropEvent.h b/qtjava/javalib/qtjava/TQDropEvent.h
index 5a1bf3a9..5a1bf3a9 100644
--- a/qtjava/javalib/qtjava/QDropEvent.h
+++ b/qtjava/javalib/qtjava/TQDropEvent.h
diff --git a/qtjava/javalib/qtjava/QDropSite.cpp b/qtjava/javalib/qtjava/TQDropSite.cpp
index 9d905584..d4313bc0 100644
--- a/qtjava/javalib/qtjava/QDropSite.cpp
+++ b/qtjava/javalib/qtjava/TQDropSite.cpp
@@ -2,7 +2,7 @@
 #include <tqdropsite.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QDropSite.h>
+#include <qtjava/TQDropSite.h>
 
 class TQDropSiteJBridge : public TQDropSite
 {
diff --git a/qtjava/javalib/qtjava/QDropSite.h b/qtjava/javalib/qtjava/TQDropSite.h
index 9c97ed82..9c97ed82 100644
--- a/qtjava/javalib/qtjava/QDropSite.h
+++ b/qtjava/javalib/qtjava/TQDropSite.h
diff --git a/qtjava/javalib/qtjava/QEditorFactory.cpp b/qtjava/javalib/qtjava/TQEditorFactory.cpp
index 6ac00129..7de9ca86 100644
--- a/qtjava/javalib/qtjava/QEditorFactory.cpp
+++ b/qtjava/javalib/qtjava/TQEditorFactory.cpp
@@ -3,7 +3,7 @@
 #include <tqvariant.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QEditorFactory.h>
+#include <qtjava/TQEditorFactory.h>
 
 class TQEditorFactoryJBridge : public TQEditorFactory
 {
diff --git a/qtjava/javalib/qtjava/QEditorFactory.h b/qtjava/javalib/qtjava/TQEditorFactory.h
index d33984c8..d33984c8 100644
--- a/qtjava/javalib/qtjava/QEditorFactory.h
+++ b/qtjava/javalib/qtjava/TQEditorFactory.h
diff --git a/qtjava/javalib/qtjava/QErrorMessage.cpp b/qtjava/javalib/qtjava/TQErrorMessage.cpp
index 7b762e93..f0de500e 100644
--- a/qtjava/javalib/qtjava/QErrorMessage.cpp
+++ b/qtjava/javalib/qtjava/TQErrorMessage.cpp
@@ -3,7 +3,7 @@
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QErrorMessage.h>
+#include <qtjava/TQErrorMessage.h>
 
 class TQErrorMessageJBridge : public TQErrorMessage
 {
diff --git a/qtjava/javalib/qtjava/QErrorMessage.h b/qtjava/javalib/qtjava/TQErrorMessage.h
index de180772..de180772 100644
--- a/qtjava/javalib/qtjava/QErrorMessage.h
+++ b/qtjava/javalib/qtjava/TQErrorMessage.h
diff --git a/qtjava/javalib/qtjava/QEucJpCodec.cpp b/qtjava/javalib/qtjava/TQEucJpCodec.cpp
index df359341..6c7e7e96 100644
--- a/qtjava/javalib/qtjava/QEucJpCodec.cpp
+++ b/qtjava/javalib/qtjava/TQEucJpCodec.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QEucJpCodec.h>
+#include <qtjava/TQEucJpCodec.h>
 
 class TQEucJpCodecJBridge : public TQEucJpCodec
 {
diff --git a/qtjava/javalib/qtjava/QEucJpCodec.h b/qtjava/javalib/qtjava/TQEucJpCodec.h
index 0c0450b1..0c0450b1 100644
--- a/qtjava/javalib/qtjava/QEucJpCodec.h
+++ b/qtjava/javalib/qtjava/TQEucJpCodec.h
diff --git a/qtjava/javalib/qtjava/QEucKrCodec.cpp b/qtjava/javalib/qtjava/TQEucKrCodec.cpp
index d1728e0a..1f6c6cf5 100644
--- a/qtjava/javalib/qtjava/QEucKrCodec.cpp
+++ b/qtjava/javalib/qtjava/TQEucKrCodec.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QEucKrCodec.h>
+#include <qtjava/TQEucKrCodec.h>
 
 class TQEucKrCodecJBridge : public TQEucKrCodec
 {
diff --git a/qtjava/javalib/qtjava/QEucKrCodec.h b/qtjava/javalib/qtjava/TQEucKrCodec.h
index 5e90eefb..5e90eefb 100644
--- a/qtjava/javalib/qtjava/QEucKrCodec.h
+++ b/qtjava/javalib/qtjava/TQEucKrCodec.h
diff --git a/qtjava/javalib/qtjava/QEvent.cpp b/qtjava/javalib/qtjava/TQEvent.cpp
index 9a5a52c5..43c40add 100644
--- a/qtjava/javalib/qtjava/QEvent.cpp
+++ b/qtjava/javalib/qtjava/TQEvent.cpp
@@ -2,7 +2,7 @@
 #include <tqevent.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QEvent.h>
+#include <qtjava/TQEvent.h>
 
 class TQEventJBridge : public TQEvent
 {
diff --git a/qtjava/javalib/qtjava/QEvent.h b/qtjava/javalib/qtjava/TQEvent.h
index 59001558..59001558 100644
--- a/qtjava/javalib/qtjava/QEvent.h
+++ b/qtjava/javalib/qtjava/TQEvent.h
diff --git a/qtjava/javalib/qtjava/QEventLoop.cpp b/qtjava/javalib/qtjava/TQEventLoop.cpp
index 36dcdfc1..cde628c6 100644
--- a/qtjava/javalib/qtjava/QEventLoop.cpp
+++ b/qtjava/javalib/qtjava/TQEventLoop.cpp
@@ -3,7 +3,7 @@
 #include <tqeventloop.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QEventLoop.h>
+#include <qtjava/TQEventLoop.h>
 
 class TQEventLoopJBridge : public TQEventLoop
 {
diff --git a/qtjava/javalib/qtjava/QEventLoop.h b/qtjava/javalib/qtjava/TQEventLoop.h
index 70f1a640..70f1a640 100644
--- a/qtjava/javalib/qtjava/QEventLoop.h
+++ b/qtjava/javalib/qtjava/TQEventLoop.h
diff --git a/qtjava/javalib/qtjava/QFile.cpp b/qtjava/javalib/qtjava/TQFile.cpp
index 61662a60..b1197d90 100644
--- a/qtjava/javalib/qtjava/QFile.cpp
+++ b/qtjava/javalib/qtjava/TQFile.cpp
@@ -6,7 +6,7 @@
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QFile.h>
+#include <qtjava/TQFile.h>
 
 class TQFileJBridge : public TQFile
 {
diff --git a/qtjava/javalib/qtjava/QFile.h b/qtjava/javalib/qtjava/TQFile.h
index cdc67db6..cdc67db6 100644
--- a/qtjava/javalib/qtjava/QFile.h
+++ b/qtjava/javalib/qtjava/TQFile.h
diff --git a/qtjava/javalib/qtjava/QFileDialog.cpp b/qtjava/javalib/qtjava/TQFileDialog.cpp
index 7532624c..2751510c 100644
--- a/qtjava/javalib/qtjava/QFileDialog.cpp
+++ b/qtjava/javalib/qtjava/TQFileDialog.cpp
@@ -7,7 +7,7 @@
 #include <tqurloperator.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QFileDialog.h>
+#include <qtjava/TQFileDialog.h>
 
 class TQFileDialogJBridge : public TQFileDialog
 {
diff --git a/qtjava/javalib/qtjava/QFileDialog.h b/qtjava/javalib/qtjava/TQFileDialog.h
index f70a4c00..f70a4c00 100644
--- a/qtjava/javalib/qtjava/QFileDialog.h
+++ b/qtjava/javalib/qtjava/TQFileDialog.h
diff --git a/qtjava/javalib/qtjava/QFileIconProvider.cpp b/qtjava/javalib/qtjava/TQFileIconProvider.cpp
index 531bb93f..73491ca2 100644
--- a/qtjava/javalib/qtjava/QFileIconProvider.cpp
+++ b/qtjava/javalib/qtjava/TQFileIconProvider.cpp
@@ -4,7 +4,7 @@
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QFileIconProvider.h>
+#include <qtjava/TQFileIconProvider.h>
 
 class TQFileIconProviderJBridge : public TQFileIconProvider
 {
diff --git a/qtjava/javalib/qtjava/QFileIconProvider.h b/qtjava/javalib/qtjava/TQFileIconProvider.h
index dd5e9c80..dd5e9c80 100644
--- a/qtjava/javalib/qtjava/QFileIconProvider.h
+++ b/qtjava/javalib/qtjava/TQFileIconProvider.h
diff --git a/qtjava/javalib/qtjava/QFileInfo.cpp b/qtjava/javalib/qtjava/TQFileInfo.cpp
index b846c4c6..53f43a0d 100644
--- a/qtjava/javalib/qtjava/QFileInfo.cpp
+++ b/qtjava/javalib/qtjava/TQFileInfo.cpp
@@ -7,7 +7,7 @@
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QFileInfo.h>
+#include <qtjava/TQFileInfo.h>
 
 class TQFileInfoJBridge : public TQFileInfo
 {
diff --git a/qtjava/javalib/qtjava/QFileInfo.h b/qtjava/javalib/qtjava/TQFileInfo.h
index 8c6c5538..8c6c5538 100644
--- a/qtjava/javalib/qtjava/QFileInfo.h
+++ b/qtjava/javalib/qtjava/TQFileInfo.h
diff --git a/qtjava/javalib/qtjava/QFilePreview.cpp b/qtjava/javalib/qtjava/TQFilePreview.cpp
index c0a9cc00..7a277c20 100644
--- a/qtjava/javalib/qtjava/QFilePreview.cpp
+++ b/qtjava/javalib/qtjava/TQFilePreview.cpp
@@ -3,7 +3,7 @@
 #include <tqurl.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QFilePreview.h>
+#include <qtjava/TQFilePreview.h>
 
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QFilePreview_previewUrl(JNIEnv* env, jobject obj, jobject url)
diff --git a/qtjava/javalib/qtjava/QFilePreview.h b/qtjava/javalib/qtjava/TQFilePreview.h
index c5f189e2..c5f189e2 100644
--- a/qtjava/javalib/qtjava/QFilePreview.h
+++ b/qtjava/javalib/qtjava/TQFilePreview.h
diff --git a/qtjava/javalib/qtjava/QFocusData.cpp b/qtjava/javalib/qtjava/TQFocusData.cpp
index 61822bc3..1c4c6775 100644
--- a/qtjava/javalib/qtjava/QFocusData.cpp
+++ b/qtjava/javalib/qtjava/TQFocusData.cpp
@@ -2,7 +2,7 @@
 #include <tqfocusdata.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QFocusData.h>
+#include <qtjava/TQFocusData.h>
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QFocusData_count(JNIEnv* env, jobject obj)
diff --git a/qtjava/javalib/qtjava/QFocusData.h b/qtjava/javalib/qtjava/TQFocusData.h
index 977b96ad..977b96ad 100644
--- a/qtjava/javalib/qtjava/QFocusData.h
+++ b/qtjava/javalib/qtjava/TQFocusData.h
diff --git a/qtjava/javalib/qtjava/QFocusEvent.cpp b/qtjava/javalib/qtjava/TQFocusEvent.cpp
index d54fd1ef..3cfb1213 100644
--- a/qtjava/javalib/qtjava/QFocusEvent.cpp
+++ b/qtjava/javalib/qtjava/TQFocusEvent.cpp
@@ -2,7 +2,7 @@
 #include <tqevent.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QFocusEvent.h>
+#include <qtjava/TQFocusEvent.h>
 
 class TQFocusEventJBridge : public TQFocusEvent
 {
diff --git a/qtjava/javalib/qtjava/QFocusEvent.h b/qtjava/javalib/qtjava/TQFocusEvent.h
index 821aba71..821aba71 100644
--- a/qtjava/javalib/qtjava/QFocusEvent.h
+++ b/qtjava/javalib/qtjava/TQFocusEvent.h
diff --git a/qtjava/javalib/qtjava/QFont.cpp b/qtjava/javalib/qtjava/TQFont.cpp
index 7515cd3b..ebff1907 100644
--- a/qtjava/javalib/qtjava/QFont.cpp
+++ b/qtjava/javalib/qtjava/TQFont.cpp
@@ -4,7 +4,7 @@
 #include <tqstringlist.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QFont.h>
+#include <qtjava/TQFont.h>
 
 class TQFontJBridge : public TQFont
 {
diff --git a/qtjava/javalib/qtjava/QFont.h b/qtjava/javalib/qtjava/TQFont.h
index 688f995f..688f995f 100644
--- a/qtjava/javalib/qtjava/QFont.h
+++ b/qtjava/javalib/qtjava/TQFont.h
diff --git a/qtjava/javalib/qtjava/QFontDatabase.cpp b/qtjava/javalib/qtjava/TQFontDatabase.cpp
index 8c168820..0c43423d 100644
--- a/qtjava/javalib/qtjava/QFontDatabase.cpp
+++ b/qtjava/javalib/qtjava/TQFontDatabase.cpp
@@ -5,7 +5,7 @@
 #include <tqstringlist.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QFontDatabase.h>
+#include <qtjava/TQFontDatabase.h>
 
 class TQFontDatabaseJBridge : public TQFontDatabase
 {
diff --git a/qtjava/javalib/qtjava/QFontDatabase.h b/qtjava/javalib/qtjava/TQFontDatabase.h
index ff5a87f9..ff5a87f9 100644
--- a/qtjava/javalib/qtjava/QFontDatabase.h
+++ b/qtjava/javalib/qtjava/TQFontDatabase.h
diff --git a/qtjava/javalib/qtjava/QFontDialog.cpp b/qtjava/javalib/qtjava/TQFontDialog.cpp
index 50878146..e6cd8c1d 100644
--- a/qtjava/javalib/qtjava/QFontDialog.cpp
+++ b/qtjava/javalib/qtjava/TQFontDialog.cpp
@@ -4,7 +4,7 @@
 #include <tqfontdialog.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QFontDialog.h>
+#include <qtjava/TQFontDialog.h>
 
 JNIEXPORT jstring JNICALL
 Java_org_kde_qt_QFontDialog_className(JNIEnv* env, jobject obj)
diff --git a/qtjava/javalib/qtjava/QFontDialog.h b/qtjava/javalib/qtjava/TQFontDialog.h
index b6b86905..b6b86905 100644
--- a/qtjava/javalib/qtjava/QFontDialog.h
+++ b/qtjava/javalib/qtjava/TQFontDialog.h
diff --git a/qtjava/javalib/qtjava/QFontInfo.cpp b/qtjava/javalib/qtjava/TQFontInfo.cpp
index fc2aa545..c9ae9ed9 100644
--- a/qtjava/javalib/qtjava/QFontInfo.cpp
+++ b/qtjava/javalib/qtjava/TQFontInfo.cpp
@@ -4,7 +4,7 @@
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QFontInfo.h>
+#include <qtjava/TQFontInfo.h>
 
 class TQFontInfoJBridge : public TQFontInfo
 {
diff --git a/qtjava/javalib/qtjava/QFontInfo.h b/qtjava/javalib/qtjava/TQFontInfo.h
index 393ea5da..393ea5da 100644
--- a/qtjava/javalib/qtjava/QFontInfo.h
+++ b/qtjava/javalib/qtjava/TQFontInfo.h
diff --git a/qtjava/javalib/qtjava/QFontMetrics.cpp b/qtjava/javalib/qtjava/TQFontMetrics.cpp
index 60102fc0..b439e1d0 100644
--- a/qtjava/javalib/qtjava/QFontMetrics.cpp
+++ b/qtjava/javalib/qtjava/TQFontMetrics.cpp
@@ -6,7 +6,7 @@
 #include <tqfontmetrics.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QFontMetrics.h>
+#include <qtjava/TQFontMetrics.h>
 
 class TQFontMetricsJBridge : public TQFontMetrics
 {
diff --git a/qtjava/javalib/qtjava/QFontMetrics.h b/qtjava/javalib/qtjava/TQFontMetrics.h
index 4cc76b89..4cc76b89 100644
--- a/qtjava/javalib/qtjava/QFontMetrics.h
+++ b/qtjava/javalib/qtjava/TQFontMetrics.h
diff --git a/qtjava/javalib/qtjava/QFrame.cpp b/qtjava/javalib/qtjava/TQFrame.cpp
index 3f122e44..ead8f8c5 100644
--- a/qtjava/javalib/qtjava/QFrame.cpp
+++ b/qtjava/javalib/qtjava/TQFrame.cpp
@@ -7,7 +7,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QFrame.h>
+#include <qtjava/TQFrame.h>
 
 class TQFrameJBridge : public TQFrame
 {
diff --git a/qtjava/javalib/qtjava/QFrame.h b/qtjava/javalib/qtjava/TQFrame.h
index 3c23f764..3c23f764 100644
--- a/qtjava/javalib/qtjava/QFrame.h
+++ b/qtjava/javalib/qtjava/TQFrame.h
diff --git a/qtjava/javalib/qtjava/QFtp.cpp b/qtjava/javalib/qtjava/TQFtp.cpp
index 0c952832..2837636e 100644
--- a/qtjava/javalib/qtjava/QFtp.cpp
+++ b/qtjava/javalib/qtjava/TQFtp.cpp
@@ -6,7 +6,7 @@
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QFtp.h>
+#include <qtjava/TQFtp.h>
 
 class TQFtpJBridge : public TQFtp
 {
diff --git a/qtjava/javalib/qtjava/QFtp.h b/qtjava/javalib/qtjava/TQFtp.h
index 50459e07..50459e07 100644
--- a/qtjava/javalib/qtjava/QFtp.h
+++ b/qtjava/javalib/qtjava/TQFtp.h
diff --git a/qtjava/javalib/qtjava/QGL.cpp b/qtjava/javalib/qtjava/TQGL.cpp
index 76f8b5b5..0fa234ff 100644
--- a/qtjava/javalib/qtjava/QGL.cpp
+++ b/qtjava/javalib/qtjava/TQGL.cpp
@@ -2,7 +2,7 @@
 #include <tqgl.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QGL.h>
+#include <qtjava/TQGL.h>
 
 class TQGLJBridge : public TQGL
 {
diff --git a/qtjava/javalib/qtjava/QGL.h b/qtjava/javalib/qtjava/TQGL.h
index e707487a..e707487a 100644
--- a/qtjava/javalib/qtjava/QGL.h
+++ b/qtjava/javalib/qtjava/TQGL.h
diff --git a/qtjava/javalib/qtjava/QGLColormap.cpp b/qtjava/javalib/qtjava/TQGLColormap.cpp
index 390c45ed..e6eae5af 100644
--- a/qtjava/javalib/qtjava/QGLColormap.cpp
+++ b/qtjava/javalib/qtjava/TQGLColormap.cpp
@@ -4,7 +4,7 @@
 #include <tqcolor.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QGLColormap.h>
+#include <qtjava/TQGLColormap.h>
 
 class TQGLColormapJBridge : public TQGLColormap
 {
diff --git a/qtjava/javalib/qtjava/QGLColormap.h b/qtjava/javalib/qtjava/TQGLColormap.h
index 8cb40a57..8cb40a57 100644
--- a/qtjava/javalib/qtjava/QGLColormap.h
+++ b/qtjava/javalib/qtjava/TQGLColormap.h
diff --git a/qtjava/javalib/qtjava/QGLContext.cpp b/qtjava/javalib/qtjava/TQGLContext.cpp
index 55986c0e..d118df0e 100644
--- a/qtjava/javalib/qtjava/QGLContext.cpp
+++ b/qtjava/javalib/qtjava/TQGLContext.cpp
@@ -4,7 +4,7 @@
 #include <tqcolor.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QGLContext.h>
+#include <qtjava/TQGLContext.h>
 
 class TQGLContextJBridge : public TQGLContext
 {
diff --git a/qtjava/javalib/qtjava/QGLContext.h b/qtjava/javalib/qtjava/TQGLContext.h
index 7923d775..7923d775 100644
--- a/qtjava/javalib/qtjava/QGLContext.h
+++ b/qtjava/javalib/qtjava/TQGLContext.h
diff --git a/qtjava/javalib/qtjava/QGLFormat.cpp b/qtjava/javalib/qtjava/TQGLFormat.cpp
index a97012b9..0eca2948 100644
--- a/qtjava/javalib/qtjava/QGLFormat.cpp
+++ b/qtjava/javalib/qtjava/TQGLFormat.cpp
@@ -2,7 +2,7 @@
 #include <tqgl.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QGLFormat.h>
+#include <qtjava/TQGLFormat.h>
 
 class TQGLFormatJBridge : public TQGLFormat
 {
diff --git a/qtjava/javalib/qtjava/QGLFormat.h b/qtjava/javalib/qtjava/TQGLFormat.h
index f580d9a9..f580d9a9 100644
--- a/qtjava/javalib/qtjava/QGLFormat.h
+++ b/qtjava/javalib/qtjava/TQGLFormat.h
diff --git a/qtjava/javalib/qtjava/QGLWidget.cpp b/qtjava/javalib/qtjava/TQGLWidget.cpp
index 53225c68..12662bbf 100644
--- a/qtjava/javalib/qtjava/QGLWidget.cpp
+++ b/qtjava/javalib/qtjava/TQGLWidget.cpp
@@ -10,7 +10,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QGLWidget.h>
+#include <qtjava/TQGLWidget.h>
 
 class TQGLWidgetJBridge : public TQGLWidget
 {
diff --git a/qtjava/javalib/qtjava/QGLWidget.h b/qtjava/javalib/qtjava/TQGLWidget.h
index 76f5f2e3..76f5f2e3 100644
--- a/qtjava/javalib/qtjava/QGLWidget.h
+++ b/qtjava/javalib/qtjava/TQGLWidget.h
diff --git a/qtjava/javalib/qtjava/QGb18030Codec.cpp b/qtjava/javalib/qtjava/TQGb18030Codec.cpp
index a7297d4e..1f2330cf 100644
--- a/qtjava/javalib/qtjava/QGb18030Codec.cpp
+++ b/qtjava/javalib/qtjava/TQGb18030Codec.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QGb18030Codec.h>
+#include <qtjava/TQGb18030Codec.h>
 
 class TQGb18030CodecJBridge : public TQGb18030Codec
 {
diff --git a/qtjava/javalib/qtjava/QGb18030Codec.h b/qtjava/javalib/qtjava/TQGb18030Codec.h
index acda2716..acda2716 100644
--- a/qtjava/javalib/qtjava/QGb18030Codec.h
+++ b/qtjava/javalib/qtjava/TQGb18030Codec.h
diff --git a/qtjava/javalib/qtjava/QGrid.cpp b/qtjava/javalib/qtjava/TQGrid.cpp
index 487d1185..3dd728d4 100644
--- a/qtjava/javalib/qtjava/QGrid.cpp
+++ b/qtjava/javalib/qtjava/TQGrid.cpp
@@ -5,7 +5,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QGrid.h>
+#include <qtjava/TQGrid.h>
 
 class TQGridJBridge : public TQGrid
 {
diff --git a/qtjava/javalib/qtjava/QGrid.h b/qtjava/javalib/qtjava/TQGrid.h
index 949fb9fe..949fb9fe 100644
--- a/qtjava/javalib/qtjava/QGrid.h
+++ b/qtjava/javalib/qtjava/TQGrid.h
diff --git a/qtjava/javalib/qtjava/QGridLayout.cpp b/qtjava/javalib/qtjava/TQGridLayout.cpp
index 5937679a..74a6d7b3 100644
--- a/qtjava/javalib/qtjava/QGridLayout.cpp
+++ b/qtjava/javalib/qtjava/TQGridLayout.cpp
@@ -6,7 +6,7 @@
 #include <tqsize.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QGridLayout.h>
+#include <qtjava/TQGridLayout.h>
 
 class TQGridLayoutJBridge : public TQGridLayout
 {
diff --git a/qtjava/javalib/qtjava/QGridLayout.h b/qtjava/javalib/qtjava/TQGridLayout.h
index d0b4d387..d0b4d387 100644
--- a/qtjava/javalib/qtjava/QGridLayout.h
+++ b/qtjava/javalib/qtjava/TQGridLayout.h
diff --git a/qtjava/javalib/qtjava/QGridView.cpp b/qtjava/javalib/qtjava/TQGridView.cpp
index 70d108c2..2e24a93d 100644
--- a/qtjava/javalib/qtjava/QGridView.cpp
+++ b/qtjava/javalib/qtjava/TQGridView.cpp
@@ -6,7 +6,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QGridView.h>
+#include <qtjava/TQGridView.h>
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QGridView_cellGeometry(JNIEnv* env, jobject obj, jint row, jint column)
diff --git a/qtjava/javalib/qtjava/QGridView.h b/qtjava/javalib/qtjava/TQGridView.h
index 710c0083..710c0083 100644
--- a/qtjava/javalib/qtjava/QGridView.h
+++ b/qtjava/javalib/qtjava/TQGridView.h
diff --git a/qtjava/javalib/qtjava/QGroupBox.cpp b/qtjava/javalib/qtjava/TQGroupBox.cpp
index 8006b47e..52e506e6 100644
--- a/qtjava/javalib/qtjava/QGroupBox.cpp
+++ b/qtjava/javalib/qtjava/TQGroupBox.cpp
@@ -6,7 +6,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QGroupBox.h>
+#include <qtjava/TQGroupBox.h>
 
 class TQGroupBoxJBridge : public TQGroupBox
 {
diff --git a/qtjava/javalib/qtjava/QGroupBox.h b/qtjava/javalib/qtjava/TQGroupBox.h
index 657b741d..657b741d 100644
--- a/qtjava/javalib/qtjava/QGroupBox.h
+++ b/qtjava/javalib/qtjava/TQGroupBox.h
diff --git a/qtjava/javalib/qtjava/QHBox.cpp b/qtjava/javalib/qtjava/TQHBox.cpp
index 3faf9220..e73fb5eb 100644
--- a/qtjava/javalib/qtjava/QHBox.cpp
+++ b/qtjava/javalib/qtjava/TQHBox.cpp
@@ -5,7 +5,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QHBox.h>
+#include <qtjava/TQHBox.h>
 
 class TQHBoxJBridge : public TQHBox
 {
diff --git a/qtjava/javalib/qtjava/QHBox.h b/qtjava/javalib/qtjava/TQHBox.h
index b9baf4b6..b9baf4b6 100644
--- a/qtjava/javalib/qtjava/QHBox.h
+++ b/qtjava/javalib/qtjava/TQHBox.h
diff --git a/qtjava/javalib/qtjava/QHBoxLayout.cpp b/qtjava/javalib/qtjava/TQHBoxLayout.cpp
index 768f0f7b..54587967 100644
--- a/qtjava/javalib/qtjava/QHBoxLayout.cpp
+++ b/qtjava/javalib/qtjava/TQHBoxLayout.cpp
@@ -3,7 +3,7 @@
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QHBoxLayout.h>
+#include <qtjava/TQHBoxLayout.h>
 
 class TQHBoxLayoutJBridge : public TQHBoxLayout
 {
diff --git a/qtjava/javalib/qtjava/QHBoxLayout.h b/qtjava/javalib/qtjava/TQHBoxLayout.h
index 14b11710..14b11710 100644
--- a/qtjava/javalib/qtjava/QHBoxLayout.h
+++ b/qtjava/javalib/qtjava/TQHBoxLayout.h
diff --git a/qtjava/javalib/qtjava/QHButtonGroup.cpp b/qtjava/javalib/qtjava/TQHButtonGroup.cpp
index 05707925..57b5822f 100644
--- a/qtjava/javalib/qtjava/QHButtonGroup.cpp
+++ b/qtjava/javalib/qtjava/TQHButtonGroup.cpp
@@ -3,7 +3,7 @@
 #include <tqhbuttongroup.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QHButtonGroup.h>
+#include <qtjava/TQHButtonGroup.h>
 
 class TQHButtonGroupJBridge : public TQHButtonGroup
 {
diff --git a/qtjava/javalib/qtjava/QHButtonGroup.h b/qtjava/javalib/qtjava/TQHButtonGroup.h
index c255883c..c255883c 100644
--- a/qtjava/javalib/qtjava/QHButtonGroup.h
+++ b/qtjava/javalib/qtjava/TQHButtonGroup.h
diff --git a/qtjava/javalib/qtjava/QHGroupBox.cpp b/qtjava/javalib/qtjava/TQHGroupBox.cpp
index 18fdf458..32c7bd51 100644
--- a/qtjava/javalib/qtjava/QHGroupBox.cpp
+++ b/qtjava/javalib/qtjava/TQHGroupBox.cpp
@@ -3,7 +3,7 @@
 #include <tqhgroupbox.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QHGroupBox.h>
+#include <qtjava/TQHGroupBox.h>
 
 class TQHGroupBoxJBridge : public TQHGroupBox
 {
diff --git a/qtjava/javalib/qtjava/QHGroupBox.h b/qtjava/javalib/qtjava/TQHGroupBox.h
index 90176eb4..90176eb4 100644
--- a/qtjava/javalib/qtjava/QHGroupBox.h
+++ b/qtjava/javalib/qtjava/TQHGroupBox.h
diff --git a/qtjava/javalib/qtjava/QHeader.cpp b/qtjava/javalib/qtjava/TQHeader.cpp
index 3de82560..a8ab9cf7 100644
--- a/qtjava/javalib/qtjava/QHeader.cpp
+++ b/qtjava/javalib/qtjava/TQHeader.cpp
@@ -8,7 +8,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QHeader.h>
+#include <qtjava/TQHeader.h>
 
 class TQHeaderJBridge : public TQHeader
 {
diff --git a/qtjava/javalib/qtjava/QHeader.h b/qtjava/javalib/qtjava/TQHeader.h
index 383cce7d..383cce7d 100644
--- a/qtjava/javalib/qtjava/QHeader.h
+++ b/qtjava/javalib/qtjava/TQHeader.h
diff --git a/qtjava/javalib/qtjava/QHebrewCodec.cpp b/qtjava/javalib/qtjava/TQHebrewCodec.cpp
index 55bce54d..ee69172a 100644
--- a/qtjava/javalib/qtjava/QHebrewCodec.cpp
+++ b/qtjava/javalib/qtjava/TQHebrewCodec.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QHebrewCodec.h>
+#include <qtjava/TQHebrewCodec.h>
 
 class TQHebrewCodecJBridge : public TQHebrewCodec
 {
diff --git a/qtjava/javalib/qtjava/QHebrewCodec.h b/qtjava/javalib/qtjava/TQHebrewCodec.h
index 22e56f0d..22e56f0d 100644
--- a/qtjava/javalib/qtjava/QHebrewCodec.h
+++ b/qtjava/javalib/qtjava/TQHebrewCodec.h
diff --git a/qtjava/javalib/qtjava/QHideEvent.cpp b/qtjava/javalib/qtjava/TQHideEvent.cpp
index fb50a566..2040fa24 100644
--- a/qtjava/javalib/qtjava/QHideEvent.cpp
+++ b/qtjava/javalib/qtjava/TQHideEvent.cpp
@@ -2,7 +2,7 @@
 #include <tqevent.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QHideEvent.h>
+#include <qtjava/TQHideEvent.h>
 
 class TQHideEventJBridge : public TQHideEvent
 {
diff --git a/qtjava/javalib/qtjava/QHideEvent.h b/qtjava/javalib/qtjava/TQHideEvent.h
index ccfeb444..ccfeb444 100644
--- a/qtjava/javalib/qtjava/QHideEvent.h
+++ b/qtjava/javalib/qtjava/TQHideEvent.h
diff --git a/qtjava/javalib/qtjava/QHostAddress.cpp b/qtjava/javalib/qtjava/TQHostAddress.cpp
index ed928e32..7608891e 100644
--- a/qtjava/javalib/qtjava/QHostAddress.cpp
+++ b/qtjava/javalib/qtjava/TQHostAddress.cpp
@@ -4,7 +4,7 @@
 #include <tqhostaddress.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QHostAddress.h>
+#include <qtjava/TQHostAddress.h>
 
 class TQHostAddressJBridge : public TQHostAddress
 {
diff --git a/qtjava/javalib/qtjava/QHostAddress.h b/qtjava/javalib/qtjava/TQHostAddress.h
index 3752497c..3752497c 100644
--- a/qtjava/javalib/qtjava/QHostAddress.h
+++ b/qtjava/javalib/qtjava/TQHostAddress.h
diff --git a/qtjava/javalib/qtjava/QHttp.cpp b/qtjava/javalib/qtjava/TQHttp.cpp
index 8530e508..4b0f00bb 100644
--- a/qtjava/javalib/qtjava/QHttp.cpp
+++ b/qtjava/javalib/qtjava/TQHttp.cpp
@@ -5,7 +5,7 @@
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QHttp.h>
+#include <qtjava/TQHttp.h>
 
 class TQHttpJBridge : public TQHttp
 {
diff --git a/qtjava/javalib/qtjava/QHttp.h b/qtjava/javalib/qtjava/TQHttp.h
index ab475917..ab475917 100644
--- a/qtjava/javalib/qtjava/QHttp.h
+++ b/qtjava/javalib/qtjava/TQHttp.h
diff --git a/qtjava/javalib/qtjava/QHttpHeader.cpp b/qtjava/javalib/qtjava/TQHttpHeader.cpp
index 4a058486..92e2b44e 100644
--- a/qtjava/javalib/qtjava/QHttpHeader.cpp
+++ b/qtjava/javalib/qtjava/TQHttpHeader.cpp
@@ -4,7 +4,7 @@
 #include <tqhttp.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QHttpHeader.h>
+#include <qtjava/TQHttpHeader.h>
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QHttpHeader_contentLength(JNIEnv* env, jobject obj)
diff --git a/qtjava/javalib/qtjava/QHttpHeader.h b/qtjava/javalib/qtjava/TQHttpHeader.h
index 76117776..76117776 100644
--- a/qtjava/javalib/qtjava/QHttpHeader.h
+++ b/qtjava/javalib/qtjava/TQHttpHeader.h
diff --git a/qtjava/javalib/qtjava/QHttpRequestHeader.cpp b/qtjava/javalib/qtjava/TQHttpRequestHeader.cpp
index e2ab3b71..7e095b46 100644
--- a/qtjava/javalib/qtjava/QHttpRequestHeader.cpp
+++ b/qtjava/javalib/qtjava/TQHttpRequestHeader.cpp
@@ -3,7 +3,7 @@
 #include <tqhttp.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QHttpRequestHeader.h>
+#include <qtjava/TQHttpRequestHeader.h>
 
 class TQHttpRequestHeaderJBridge : public TQHttpRequestHeader
 {
diff --git a/qtjava/javalib/qtjava/QHttpRequestHeader.h b/qtjava/javalib/qtjava/TQHttpRequestHeader.h
index dafdbd76..dafdbd76 100644
--- a/qtjava/javalib/qtjava/QHttpRequestHeader.h
+++ b/qtjava/javalib/qtjava/TQHttpRequestHeader.h
diff --git a/qtjava/javalib/qtjava/QHttpResponseHeader.cpp b/qtjava/javalib/qtjava/TQHttpResponseHeader.cpp
index 12228986..2cc85cd4 100644
--- a/qtjava/javalib/qtjava/QHttpResponseHeader.cpp
+++ b/qtjava/javalib/qtjava/TQHttpResponseHeader.cpp
@@ -3,7 +3,7 @@
 #include <tqhttp.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QHttpResponseHeader.h>
+#include <qtjava/TQHttpResponseHeader.h>
 
 class TQHttpResponseHeaderJBridge : public TQHttpResponseHeader
 {
diff --git a/qtjava/javalib/qtjava/QHttpResponseHeader.h b/qtjava/javalib/qtjava/TQHttpResponseHeader.h
index a0e3e874..a0e3e874 100644
--- a/qtjava/javalib/qtjava/QHttpResponseHeader.h
+++ b/qtjava/javalib/qtjava/TQHttpResponseHeader.h
diff --git a/qtjava/javalib/qtjava/QIMEvent.cpp b/qtjava/javalib/qtjava/TQIMEvent.cpp
index 314ffdfb..fb14b5ee 100644
--- a/qtjava/javalib/qtjava/QIMEvent.cpp
+++ b/qtjava/javalib/qtjava/TQIMEvent.cpp
@@ -3,7 +3,7 @@
 #include <tqevent.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QIMEvent.h>
+#include <qtjava/TQIMEvent.h>
 
 class TQIMEventJBridge : public TQIMEvent
 {
diff --git a/qtjava/javalib/qtjava/QIMEvent.h b/qtjava/javalib/qtjava/TQIMEvent.h
index 17971a80..17971a80 100644
--- a/qtjava/javalib/qtjava/QIMEvent.h
+++ b/qtjava/javalib/qtjava/TQIMEvent.h
diff --git a/qtjava/javalib/qtjava/QIODevice.cpp b/qtjava/javalib/qtjava/TQIODevice.cpp
index 5cf1d55e..d3e766b5 100644
--- a/qtjava/javalib/qtjava/QIODevice.cpp
+++ b/qtjava/javalib/qtjava/TQIODevice.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QIODevice.h>
+#include <qtjava/TQIODevice.h>
 
 JNIEXPORT jboolean JNICALL
 Java_org_kde_qt_QIODevice_atEnd(JNIEnv* env, jobject obj)
diff --git a/qtjava/javalib/qtjava/QIODevice.h b/qtjava/javalib/qtjava/TQIODevice.h
index 81e0ac58..81e0ac58 100644
--- a/qtjava/javalib/qtjava/QIODevice.h
+++ b/qtjava/javalib/qtjava/TQIODevice.h
diff --git a/qtjava/javalib/qtjava/QIODeviceSource.cpp b/qtjava/javalib/qtjava/TQIODeviceSource.cpp
index 2aa62db1..9044fb59 100644
--- a/qtjava/javalib/qtjava/QIODeviceSource.cpp
+++ b/qtjava/javalib/qtjava/TQIODeviceSource.cpp
@@ -2,7 +2,7 @@
 #include <tqasyncio.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QIODeviceSource.h>
+#include <qtjava/TQIODeviceSource.h>
 
 class TQIODeviceSourceJBridge : public TQIODeviceSource
 {
diff --git a/qtjava/javalib/qtjava/QIODeviceSource.h b/qtjava/javalib/qtjava/TQIODeviceSource.h
index 4b895d39..4b895d39 100644
--- a/qtjava/javalib/qtjava/QIODeviceSource.h
+++ b/qtjava/javalib/qtjava/TQIODeviceSource.h
diff --git a/qtjava/javalib/qtjava/QIconDrag.cpp b/qtjava/javalib/qtjava/TQIconDrag.cpp
index 1bdef2ed..63bf8b7d 100644
--- a/qtjava/javalib/qtjava/QIconDrag.cpp
+++ b/qtjava/javalib/qtjava/TQIconDrag.cpp
@@ -5,7 +5,7 @@
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QIconDrag.h>
+#include <qtjava/TQIconDrag.h>
 
 class TQIconDragJBridge : public TQIconDrag
 {
diff --git a/qtjava/javalib/qtjava/QIconDrag.h b/qtjava/javalib/qtjava/TQIconDrag.h
index bb54c434..bb54c434 100644
--- a/qtjava/javalib/qtjava/QIconDrag.h
+++ b/qtjava/javalib/qtjava/TQIconDrag.h
diff --git a/qtjava/javalib/qtjava/QIconDragItem.cpp b/qtjava/javalib/qtjava/TQIconDragItem.cpp
index bc5de913..0598c181 100644
--- a/qtjava/javalib/qtjava/QIconDragItem.cpp
+++ b/qtjava/javalib/qtjava/TQIconDragItem.cpp
@@ -3,7 +3,7 @@
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QIconDragItem.h>
+#include <qtjava/TQIconDragItem.h>
 
 class TQIconDragItemJBridge : public TQIconDragItem
 {
diff --git a/qtjava/javalib/qtjava/QIconDragItem.h b/qtjava/javalib/qtjava/TQIconDragItem.h
index 3b36034a..3b36034a 100644
--- a/qtjava/javalib/qtjava/QIconDragItem.h
+++ b/qtjava/javalib/qtjava/TQIconDragItem.h
diff --git a/qtjava/javalib/qtjava/QIconSet.cpp b/qtjava/javalib/qtjava/TQIconSet.cpp
index f99013ca..5aadbfca 100644
--- a/qtjava/javalib/qtjava/QIconSet.cpp
+++ b/qtjava/javalib/qtjava/TQIconSet.cpp
@@ -5,7 +5,7 @@
 #include <tqiconset.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QIconSet.h>
+#include <qtjava/TQIconSet.h>
 
 class TQIconSetJBridge : public TQIconSet
 {
diff --git a/qtjava/javalib/qtjava/QIconSet.h b/qtjava/javalib/qtjava/TQIconSet.h
index 9773ceab..9773ceab 100644
--- a/qtjava/javalib/qtjava/QIconSet.h
+++ b/qtjava/javalib/qtjava/TQIconSet.h
diff --git a/qtjava/javalib/qtjava/QIconView.cpp b/qtjava/javalib/qtjava/TQIconView.cpp
index 7ca57c6f..6917393b 100644
--- a/qtjava/javalib/qtjava/QIconView.cpp
+++ b/qtjava/javalib/qtjava/TQIconView.cpp
@@ -11,7 +11,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QIconView.h>
+#include <qtjava/TQIconView.h>
 
 class TQIconViewJBridge : public TQIconView
 {
diff --git a/qtjava/javalib/qtjava/QIconView.h b/qtjava/javalib/qtjava/TQIconView.h
index fd0457ef..fd0457ef 100644
--- a/qtjava/javalib/qtjava/QIconView.h
+++ b/qtjava/javalib/qtjava/TQIconView.h
diff --git a/qtjava/javalib/qtjava/QIconViewItem.cpp b/qtjava/javalib/qtjava/TQIconViewItem.cpp
index 3b1cd0bc..55b57d3e 100644
--- a/qtjava/javalib/qtjava/QIconViewItem.cpp
+++ b/qtjava/javalib/qtjava/TQIconViewItem.cpp
@@ -9,7 +9,7 @@
 #include <tqpixmap.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QIconViewItem.h>
+#include <qtjava/TQIconViewItem.h>
 
 class TQIconViewItemJBridge : public TQIconViewItem
 {
diff --git a/qtjava/javalib/qtjava/QIconViewItem.h b/qtjava/javalib/qtjava/TQIconViewItem.h
index 29f428d0..29f428d0 100644
--- a/qtjava/javalib/qtjava/QIconViewItem.h
+++ b/qtjava/javalib/qtjava/TQIconViewItem.h
diff --git a/qtjava/javalib/qtjava/QImage.cpp b/qtjava/javalib/qtjava/TQImage.cpp
index ac79373b..32cf21e6 100644
--- a/qtjava/javalib/qtjava/QImage.cpp
+++ b/qtjava/javalib/qtjava/TQImage.cpp
@@ -11,7 +11,7 @@
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QImage.h>
+#include <qtjava/TQImage.h>
 
 class TQImageJBridge : public TQImage
 {
diff --git a/qtjava/javalib/qtjava/QImage.h b/qtjava/javalib/qtjava/TQImage.h
index 47b73253..47b73253 100644
--- a/qtjava/javalib/qtjava/QImage.h
+++ b/qtjava/javalib/qtjava/TQImage.h
diff --git a/qtjava/javalib/qtjava/QImageConsumer.cpp b/qtjava/javalib/qtjava/TQImageConsumer.cpp
index 495c99ab..2db2fc3a 100644
--- a/qtjava/javalib/qtjava/QImageConsumer.cpp
+++ b/qtjava/javalib/qtjava/TQImageConsumer.cpp
@@ -4,7 +4,7 @@
 #include <tqasyncimageio.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QImageConsumer.h>
+#include <qtjava/TQImageConsumer.h>
 
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QImageConsumer_changed(JNIEnv* env, jobject obj, jobject arg1)
diff --git a/qtjava/javalib/qtjava/QImageConsumer.h b/qtjava/javalib/qtjava/TQImageConsumer.h
index cb071fdd..cb071fdd 100644
--- a/qtjava/javalib/qtjava/QImageConsumer.h
+++ b/qtjava/javalib/qtjava/TQImageConsumer.h
diff --git a/qtjava/javalib/qtjava/QImageDecoder.cpp b/qtjava/javalib/qtjava/TQImageDecoder.cpp
index b1d981d5..6495e7c5 100644
--- a/qtjava/javalib/qtjava/QImageDecoder.cpp
+++ b/qtjava/javalib/qtjava/TQImageDecoder.cpp
@@ -4,7 +4,7 @@
 #include <tqimage.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QImageDecoder.h>
+#include <qtjava/TQImageDecoder.h>
 
 class TQImageDecoderJBridge : public TQImageDecoder
 {
diff --git a/qtjava/javalib/qtjava/QImageDecoder.h b/qtjava/javalib/qtjava/TQImageDecoder.h
index f7921501..f7921501 100644
--- a/qtjava/javalib/qtjava/QImageDecoder.h
+++ b/qtjava/javalib/qtjava/TQImageDecoder.h
diff --git a/qtjava/javalib/qtjava/QImageDrag.cpp b/qtjava/javalib/qtjava/TQImageDrag.cpp
index 4aa4e8d8..5c7ef8e7 100644
--- a/qtjava/javalib/qtjava/QImageDrag.cpp
+++ b/qtjava/javalib/qtjava/TQImageDrag.cpp
@@ -6,7 +6,7 @@
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QImageDrag.h>
+#include <qtjava/TQImageDrag.h>
 
 class TQImageDragJBridge : public TQImageDrag
 {
diff --git a/qtjava/javalib/qtjava/QImageDrag.h b/qtjava/javalib/qtjava/TQImageDrag.h
index 5fd18d6f..5fd18d6f 100644
--- a/qtjava/javalib/qtjava/QImageDrag.h
+++ b/qtjava/javalib/qtjava/TQImageDrag.h
diff --git a/qtjava/javalib/qtjava/QImageFormat.cpp b/qtjava/javalib/qtjava/TQImageFormat.cpp
index e26a7523..08e93dcc 100644
--- a/qtjava/javalib/qtjava/QImageFormat.cpp
+++ b/qtjava/javalib/qtjava/TQImageFormat.cpp
@@ -3,7 +3,7 @@
 #include <tqimage.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QImageFormat.h>
+#include <qtjava/TQImageFormat.h>
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QImageFormat_decode(JNIEnv* env, jobject obj, jobject img, jobject consumer, jcharArray buffer, jint length)
diff --git a/qtjava/javalib/qtjava/QImageFormat.h b/qtjava/javalib/qtjava/TQImageFormat.h
index 70deaa98..70deaa98 100644
--- a/qtjava/javalib/qtjava/QImageFormat.h
+++ b/qtjava/javalib/qtjava/TQImageFormat.h
diff --git a/qtjava/javalib/qtjava/QImageFormatType.cpp b/qtjava/javalib/qtjava/TQImageFormatType.cpp
index e41d4f6d..8fe5385b 100644
--- a/qtjava/javalib/qtjava/QImageFormatType.cpp
+++ b/qtjava/javalib/qtjava/TQImageFormatType.cpp
@@ -2,7 +2,7 @@
 #include <tqasyncimageio.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QImageFormatType.h>
+#include <qtjava/TQImageFormatType.h>
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QImageFormatType_decoderFor(JNIEnv* env, jobject obj, jcharArray buffer, jint length)
diff --git a/qtjava/javalib/qtjava/QImageFormatType.h b/qtjava/javalib/qtjava/TQImageFormatType.h
index 11b91e26..11b91e26 100644
--- a/qtjava/javalib/qtjava/QImageFormatType.h
+++ b/qtjava/javalib/qtjava/TQImageFormatType.h
diff --git a/qtjava/javalib/qtjava/QImageIO.cpp b/qtjava/javalib/qtjava/TQImageIO.cpp
index 95c8fb73..b7b63d85 100644
--- a/qtjava/javalib/qtjava/QImageIO.cpp
+++ b/qtjava/javalib/qtjava/TQImageIO.cpp
@@ -4,7 +4,7 @@
 #include <tqimage.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QImageIO.h>
+#include <qtjava/TQImageIO.h>
 
 class TQImageIOJBridge : public TQImageIO
 {
diff --git a/qtjava/javalib/qtjava/QImageIO.h b/qtjava/javalib/qtjava/TQImageIO.h
index 2fc79d2e..2fc79d2e 100644
--- a/qtjava/javalib/qtjava/QImageIO.h
+++ b/qtjava/javalib/qtjava/TQImageIO.h
diff --git a/qtjava/javalib/qtjava/QImageTextKeyLang.cpp b/qtjava/javalib/qtjava/TQImageTextKeyLang.cpp
index f4fed913..8ee2e40d 100644
--- a/qtjava/javalib/qtjava/QImageTextKeyLang.cpp
+++ b/qtjava/javalib/qtjava/TQImageTextKeyLang.cpp
@@ -2,7 +2,7 @@
 #include <tqimage.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QImageTextKeyLang.h>
+#include <qtjava/TQImageTextKeyLang.h>
 
 class TQImageTextKeyLangJBridge : public TQImageTextKeyLang
 {
diff --git a/qtjava/javalib/qtjava/QImageTextKeyLang.h b/qtjava/javalib/qtjava/TQImageTextKeyLang.h
index b0f0b9be..b0f0b9be 100644
--- a/qtjava/javalib/qtjava/QImageTextKeyLang.h
+++ b/qtjava/javalib/qtjava/TQImageTextKeyLang.h
diff --git a/qtjava/javalib/qtjava/QInputDialog.cpp b/qtjava/javalib/qtjava/TQInputDialog.cpp
index 481e1c79..3de34b42 100644
--- a/qtjava/javalib/qtjava/QInputDialog.cpp
+++ b/qtjava/javalib/qtjava/TQInputDialog.cpp
@@ -5,7 +5,7 @@
 #include <tqinputdialog.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QInputDialog.h>
+#include <qtjava/TQInputDialog.h>
 
 JNIEXPORT jstring JNICALL
 Java_org_kde_qt_QInputDialog_className(JNIEnv* env, jobject obj)
diff --git a/qtjava/javalib/qtjava/QInputDialog.h b/qtjava/javalib/qtjava/TQInputDialog.h
index 2050c763..2050c763 100644
--- a/qtjava/javalib/qtjava/QInputDialog.h
+++ b/qtjava/javalib/qtjava/TQInputDialog.h
diff --git a/qtjava/javalib/qtjava/QIntValidator.cpp b/qtjava/javalib/qtjava/TQIntValidator.cpp
index 840aecd8..5a02a5a8 100644
--- a/qtjava/javalib/qtjava/QIntValidator.cpp
+++ b/qtjava/javalib/qtjava/TQIntValidator.cpp
@@ -3,7 +3,7 @@
 #include <tqvalidator.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QIntValidator.h>
+#include <qtjava/TQIntValidator.h>
 
 class TQIntValidatorJBridge : public TQIntValidator
 {
diff --git a/qtjava/javalib/qtjava/QIntValidator.h b/qtjava/javalib/qtjava/TQIntValidator.h
index c0c7d630..c0c7d630 100644
--- a/qtjava/javalib/qtjava/QIntValidator.h
+++ b/qtjava/javalib/qtjava/TQIntValidator.h
diff --git a/qtjava/javalib/qtjava/QJisCodec.cpp b/qtjava/javalib/qtjava/TQJisCodec.cpp
index 4b411871..be351398 100644
--- a/qtjava/javalib/qtjava/QJisCodec.cpp
+++ b/qtjava/javalib/qtjava/TQJisCodec.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QJisCodec.h>
+#include <qtjava/TQJisCodec.h>
 
 class TQJisCodecJBridge : public TQJisCodec
 {
diff --git a/qtjava/javalib/qtjava/QJisCodec.h b/qtjava/javalib/qtjava/TQJisCodec.h
index 36d29fd2..36d29fd2 100644
--- a/qtjava/javalib/qtjava/QJisCodec.h
+++ b/qtjava/javalib/qtjava/TQJisCodec.h
diff --git a/qtjava/javalib/qtjava/QJpUnicodeConv.cpp b/qtjava/javalib/qtjava/TQJpUnicodeConv.cpp
index ad8d43fc..5db2583c 100644
--- a/qtjava/javalib/qtjava/QJpUnicodeConv.cpp
+++ b/qtjava/javalib/qtjava/TQJpUnicodeConv.cpp
@@ -2,7 +2,7 @@
 #include <tqjpunicode.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QJpUnicodeConv.h>
+#include <qtjava/TQJpUnicodeConv.h>
 
 class TQJpUnicodeConvJBridge : public TQJpUnicodeConv
 {
diff --git a/qtjava/javalib/qtjava/QJpUnicodeConv.h b/qtjava/javalib/qtjava/TQJpUnicodeConv.h
index 77c6cb94..77c6cb94 100644
--- a/qtjava/javalib/qtjava/QJpUnicodeConv.h
+++ b/qtjava/javalib/qtjava/TQJpUnicodeConv.h
diff --git a/qtjava/javalib/qtjava/QKeyEvent.cpp b/qtjava/javalib/qtjava/TQKeyEvent.cpp
index 4da782d5..7ecdd3af 100644
--- a/qtjava/javalib/qtjava/QKeyEvent.cpp
+++ b/qtjava/javalib/qtjava/TQKeyEvent.cpp
@@ -4,7 +4,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QKeyEvent.h>
+#include <qtjava/TQKeyEvent.h>
 
 class TQKeyEventJBridge : public TQKeyEvent
 {
diff --git a/qtjava/javalib/qtjava/QKeyEvent.h b/qtjava/javalib/qtjava/TQKeyEvent.h
index e0f25e7f..e0f25e7f 100644
--- a/qtjava/javalib/qtjava/QKeyEvent.h
+++ b/qtjava/javalib/qtjava/TQKeyEvent.h
diff --git a/qtjava/javalib/qtjava/QKeySequence.cpp b/qtjava/javalib/qtjava/TQKeySequence.cpp
index d7844a67..b71135eb 100644
--- a/qtjava/javalib/qtjava/QKeySequence.cpp
+++ b/qtjava/javalib/qtjava/TQKeySequence.cpp
@@ -4,7 +4,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QKeySequence.h>
+#include <qtjava/TQKeySequence.h>
 
 class TQKeySequenceJBridge : public TQKeySequence
 {
diff --git a/qtjava/javalib/qtjava/QKeySequence.h b/qtjava/javalib/qtjava/TQKeySequence.h
index ec48c817..ec48c817 100644
--- a/qtjava/javalib/qtjava/QKeySequence.h
+++ b/qtjava/javalib/qtjava/TQKeySequence.h
diff --git a/qtjava/javalib/qtjava/QLCDNumber.cpp b/qtjava/javalib/qtjava/TQLCDNumber.cpp
index cc473117..5c99bb01 100644
--- a/qtjava/javalib/qtjava/QLCDNumber.cpp
+++ b/qtjava/javalib/qtjava/TQLCDNumber.cpp
@@ -4,7 +4,7 @@
 #include <tqsize.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QLCDNumber.h>
+#include <qtjava/TQLCDNumber.h>
 
 class TQLCDNumberJBridge : public TQLCDNumber
 {
diff --git a/qtjava/javalib/qtjava/QLCDNumber.h b/qtjava/javalib/qtjava/TQLCDNumber.h
index 7b46b78f..7b46b78f 100644
--- a/qtjava/javalib/qtjava/QLCDNumber.h
+++ b/qtjava/javalib/qtjava/TQLCDNumber.h
diff --git a/qtjava/javalib/qtjava/QLabel.cpp b/qtjava/javalib/qtjava/TQLabel.cpp
index 121d88ef..7ba67972 100644
--- a/qtjava/javalib/qtjava/QLabel.cpp
+++ b/qtjava/javalib/qtjava/TQLabel.cpp
@@ -9,7 +9,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QLabel.h>
+#include <qtjava/TQLabel.h>
 
 class TQLabelJBridge : public TQLabel
 {
diff --git a/qtjava/javalib/qtjava/QLabel.h b/qtjava/javalib/qtjava/TQLabel.h
index c14cb429..c14cb429 100644
--- a/qtjava/javalib/qtjava/QLabel.h
+++ b/qtjava/javalib/qtjava/TQLabel.h
diff --git a/qtjava/javalib/qtjava/QLayout.cpp b/qtjava/javalib/qtjava/TQLayout.cpp
index 60b1e409..5d219272 100644
--- a/qtjava/javalib/qtjava/QLayout.cpp
+++ b/qtjava/javalib/qtjava/TQLayout.cpp
@@ -6,7 +6,7 @@
 #include <tqsize.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QLayout.h>
+#include <qtjava/TQLayout.h>
 
 JNIEXPORT jboolean JNICALL
 Java_org_kde_qt_QLayout_activate(JNIEnv* env, jobject obj)
diff --git a/qtjava/javalib/qtjava/QLayout.h b/qtjava/javalib/qtjava/TQLayout.h
index d6db25ce..d6db25ce 100644
--- a/qtjava/javalib/qtjava/QLayout.h
+++ b/qtjava/javalib/qtjava/TQLayout.h
diff --git a/qtjava/javalib/qtjava/QLayoutItem.cpp b/qtjava/javalib/qtjava/TQLayoutItem.cpp
index d5e61b0e..499a3ac9 100644
--- a/qtjava/javalib/qtjava/QLayoutItem.cpp
+++ b/qtjava/javalib/qtjava/TQLayoutItem.cpp
@@ -5,7 +5,7 @@
 #include <tqsize.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QLayoutItem.h>
+#include <qtjava/TQLayoutItem.h>
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QLayoutItem_alignment(JNIEnv* env, jobject obj)
diff --git a/qtjava/javalib/qtjava/QLayoutItem.h b/qtjava/javalib/qtjava/TQLayoutItem.h
index 31f21f9b..31f21f9b 100644
--- a/qtjava/javalib/qtjava/QLayoutItem.h
+++ b/qtjava/javalib/qtjava/TQLayoutItem.h
diff --git a/qtjava/javalib/qtjava/QLibrary.cpp b/qtjava/javalib/qtjava/TQLibrary.cpp
index 43ef6f4f..2b087f8a 100644
--- a/qtjava/javalib/qtjava/QLibrary.cpp
+++ b/qtjava/javalib/qtjava/TQLibrary.cpp
@@ -3,7 +3,7 @@
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QLibrary.h>
+#include <qtjava/TQLibrary.h>
 
 class TQLibraryJBridge : public TQLibrary
 {
diff --git a/qtjava/javalib/qtjava/QLibrary.h b/qtjava/javalib/qtjava/TQLibrary.h
index 9c53f676..9c53f676 100644
--- a/qtjava/javalib/qtjava/QLibrary.h
+++ b/qtjava/javalib/qtjava/TQLibrary.h
diff --git a/qtjava/javalib/qtjava/QLineEdit.cpp b/qtjava/javalib/qtjava/TQLineEdit.cpp
index ca73e0a1..5995598c 100644
--- a/qtjava/javalib/qtjava/QLineEdit.cpp
+++ b/qtjava/javalib/qtjava/TQLineEdit.cpp
@@ -6,7 +6,7 @@
 #include <tqfont.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QLineEdit.h>
+#include <qtjava/TQLineEdit.h>
 
 class TQLineEditJBridge : public TQLineEdit
 {
diff --git a/qtjava/javalib/qtjava/QLineEdit.h b/qtjava/javalib/qtjava/TQLineEdit.h
index 63aad0e7..63aad0e7 100644
--- a/qtjava/javalib/qtjava/QLineEdit.h
+++ b/qtjava/javalib/qtjava/TQLineEdit.h
diff --git a/qtjava/javalib/qtjava/QListBox.cpp b/qtjava/javalib/qtjava/TQListBox.cpp
index 4efe5465..ee3f7e56 100644
--- a/qtjava/javalib/qtjava/QListBox.cpp
+++ b/qtjava/javalib/qtjava/TQListBox.cpp
@@ -11,7 +11,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QListBox.h>
+#include <qtjava/TQListBox.h>
 
 class TQListBoxJBridge : public TQListBox
 {
diff --git a/qtjava/javalib/qtjava/QListBox.h b/qtjava/javalib/qtjava/TQListBox.h
index f04e9b9b..f04e9b9b 100644
--- a/qtjava/javalib/qtjava/QListBox.h
+++ b/qtjava/javalib/qtjava/TQListBox.h
diff --git a/qtjava/javalib/qtjava/QListBoxItem.cpp b/qtjava/javalib/qtjava/TQListBoxItem.cpp
index 97297c91..7e61ab20 100644
--- a/qtjava/javalib/qtjava/QListBoxItem.cpp
+++ b/qtjava/javalib/qtjava/TQListBoxItem.cpp
@@ -3,7 +3,7 @@
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QListBoxItem.h>
+#include <qtjava/TQListBoxItem.h>
 
 JNIEXPORT jboolean JNICALL
 Java_org_kde_qt_QListBoxItem_current(JNIEnv* env, jobject obj)
diff --git a/qtjava/javalib/qtjava/QListBoxItem.h b/qtjava/javalib/qtjava/TQListBoxItem.h
index dd489260..dd489260 100644
--- a/qtjava/javalib/qtjava/QListBoxItem.h
+++ b/qtjava/javalib/qtjava/TQListBoxItem.h
diff --git a/qtjava/javalib/qtjava/QListBoxPixmap.cpp b/qtjava/javalib/qtjava/TQListBoxPixmap.cpp
index d575736a..e86d327f 100644
--- a/qtjava/javalib/qtjava/QListBoxPixmap.cpp
+++ b/qtjava/javalib/qtjava/TQListBoxPixmap.cpp
@@ -4,7 +4,7 @@
 #include <tqpixmap.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QListBoxPixmap.h>
+#include <qtjava/TQListBoxPixmap.h>
 
 class TQListBoxPixmapJBridge : public TQListBoxPixmap
 {
diff --git a/qtjava/javalib/qtjava/QListBoxPixmap.h b/qtjava/javalib/qtjava/TQListBoxPixmap.h
index 90b2381c..90b2381c 100644
--- a/qtjava/javalib/qtjava/QListBoxPixmap.h
+++ b/qtjava/javalib/qtjava/TQListBoxPixmap.h
diff --git a/qtjava/javalib/qtjava/QListBoxText.cpp b/qtjava/javalib/qtjava/TQListBoxText.cpp
index b89a8dfd..6f3e42e0 100644
--- a/qtjava/javalib/qtjava/QListBoxText.cpp
+++ b/qtjava/javalib/qtjava/TQListBoxText.cpp
@@ -3,7 +3,7 @@
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QListBoxText.h>
+#include <qtjava/TQListBoxText.h>
 
 class TQListBoxTextJBridge : public TQListBoxText
 {
diff --git a/qtjava/javalib/qtjava/QListBoxText.h b/qtjava/javalib/qtjava/TQListBoxText.h
index f4ec0e86..f4ec0e86 100644
--- a/qtjava/javalib/qtjava/QListBoxText.h
+++ b/qtjava/javalib/qtjava/TQListBoxText.h
diff --git a/qtjava/javalib/qtjava/QListView.cpp b/qtjava/javalib/qtjava/TQListView.cpp
index 847f5e78..9e3e693a 100644
--- a/qtjava/javalib/qtjava/QListView.cpp
+++ b/qtjava/javalib/qtjava/TQListView.cpp
@@ -11,7 +11,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QListView.h>
+#include <qtjava/TQListView.h>
 
 class TQListViewJBridge : public TQListView
 {
diff --git a/qtjava/javalib/qtjava/QListView.h b/qtjava/javalib/qtjava/TQListView.h
index a496e645..a496e645 100644
--- a/qtjava/javalib/qtjava/QListView.h
+++ b/qtjava/javalib/qtjava/TQListView.h
diff --git a/qtjava/javalib/qtjava/QListViewItem.cpp b/qtjava/javalib/qtjava/TQListViewItem.cpp
index 6fe9e4ab..33857c08 100644
--- a/qtjava/javalib/qtjava/QListViewItem.cpp
+++ b/qtjava/javalib/qtjava/TQListViewItem.cpp
@@ -8,7 +8,7 @@
 #include <tqpixmap.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QListViewItem.h>
+#include <qtjava/TQListViewItem.h>
 
 class TQListViewItemJBridge : public TQListViewItem
 {
diff --git a/qtjava/javalib/qtjava/QListViewItem.h b/qtjava/javalib/qtjava/TQListViewItem.h
index 69fe48c4..69fe48c4 100644
--- a/qtjava/javalib/qtjava/QListViewItem.h
+++ b/qtjava/javalib/qtjava/TQListViewItem.h
diff --git a/qtjava/javalib/qtjava/QLocalFs.cpp b/qtjava/javalib/qtjava/TQLocalFs.cpp
index 9a46d453..01554281 100644
--- a/qtjava/javalib/qtjava/QLocalFs.cpp
+++ b/qtjava/javalib/qtjava/TQLocalFs.cpp
@@ -3,7 +3,7 @@
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QLocalFs.h>
+#include <qtjava/TQLocalFs.h>
 
 class TQLocalFsJBridge : public TQLocalFs
 {
diff --git a/qtjava/javalib/qtjava/QLocalFs.h b/qtjava/javalib/qtjava/TQLocalFs.h
index 0fcc5211..0fcc5211 100644
--- a/qtjava/javalib/qtjava/QLocalFs.h
+++ b/qtjava/javalib/qtjava/TQLocalFs.h
diff --git a/qtjava/javalib/qtjava/QMainWindow.cpp b/qtjava/javalib/qtjava/TQMainWindow.cpp
index 85be774a..a22988c0 100644
--- a/qtjava/javalib/qtjava/QMainWindow.cpp
+++ b/qtjava/javalib/qtjava/TQMainWindow.cpp
@@ -7,7 +7,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QMainWindow.h>
+#include <qtjava/TQMainWindow.h>
 
 class TQMainWindowJBridge : public TQMainWindow
 {
diff --git a/qtjava/javalib/qtjava/QMainWindow.h b/qtjava/javalib/qtjava/TQMainWindow.h
index 0cde5479..0cde5479 100644
--- a/qtjava/javalib/qtjava/QMainWindow.h
+++ b/qtjava/javalib/qtjava/TQMainWindow.h
diff --git a/qtjava/javalib/qtjava/QMenuBar.cpp b/qtjava/javalib/qtjava/TQMenuBar.cpp
index 3a2fb258..cc59a9ce 100644
--- a/qtjava/javalib/qtjava/QMenuBar.cpp
+++ b/qtjava/javalib/qtjava/TQMenuBar.cpp
@@ -13,7 +13,7 @@
 
 #include <qtjava/QtSupport.h>
 #include <qtjava/JavaSlot.h>
-#include <qtjava/QMenuBar.h>
+#include <qtjava/TQMenuBar.h>
 
 class TQMenuBarJBridge : public TQMenuBar
 {
diff --git a/qtjava/javalib/qtjava/QMenuBar.h b/qtjava/javalib/qtjava/TQMenuBar.h
index 41cb59c7..41cb59c7 100644
--- a/qtjava/javalib/qtjava/QMenuBar.h
+++ b/qtjava/javalib/qtjava/TQMenuBar.h
diff --git a/qtjava/javalib/qtjava/QMenuData.cpp b/qtjava/javalib/qtjava/TQMenuData.cpp
index fd1076a4..fac770cf 100644
--- a/qtjava/javalib/qtjava/QMenuData.cpp
+++ b/qtjava/javalib/qtjava/TQMenuData.cpp
@@ -7,7 +7,7 @@
 
 #include <qtjava/QtSupport.h>
 #include <qtjava/JavaSlot.h>
-#include <qtjava/QMenuData.h>
+#include <qtjava/TQMenuData.h>
 
 class TQMenuDataJBridge : public TQMenuData
 {
diff --git a/qtjava/javalib/qtjava/QMenuData.h b/qtjava/javalib/qtjava/TQMenuData.h
index 7217ca9c..7217ca9c 100644
--- a/qtjava/javalib/qtjava/QMenuData.h
+++ b/qtjava/javalib/qtjava/TQMenuData.h
diff --git a/qtjava/javalib/qtjava/QMenuItem.cpp b/qtjava/javalib/qtjava/TQMenuItem.cpp
index 7a403a02..056dc823 100644
--- a/qtjava/javalib/qtjava/QMenuItem.cpp
+++ b/qtjava/javalib/qtjava/TQMenuItem.cpp
@@ -4,7 +4,7 @@
 #include <tqkeysequence.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QMenuItem.h>
+#include <qtjava/TQMenuItem.h>
 
 class TQMenuItemJBridge : public TQMenuItem
 {
diff --git a/qtjava/javalib/qtjava/QMenuItem.h b/qtjava/javalib/qtjava/TQMenuItem.h
index 29417086..29417086 100644
--- a/qtjava/javalib/qtjava/QMenuItem.h
+++ b/qtjava/javalib/qtjava/TQMenuItem.h
diff --git a/qtjava/javalib/qtjava/QMessageBox.cpp b/qtjava/javalib/qtjava/TQMessageBox.cpp
index 0316cc87..f1f4493a 100644
--- a/qtjava/javalib/qtjava/QMessageBox.cpp
+++ b/qtjava/javalib/qtjava/TQMessageBox.cpp
@@ -6,7 +6,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QMessageBox.h>
+#include <qtjava/TQMessageBox.h>
 
 class TQMessageBoxJBridge : public TQMessageBox
 {
diff --git a/qtjava/javalib/qtjava/QMessageBox.h b/qtjava/javalib/qtjava/TQMessageBox.h
index b97e2ddc..b97e2ddc 100644
--- a/qtjava/javalib/qtjava/QMessageBox.h
+++ b/qtjava/javalib/qtjava/TQMessageBox.h
diff --git a/qtjava/javalib/qtjava/QMetaData.cpp b/qtjava/javalib/qtjava/TQMetaData.cpp
index cb66c162..dc1cda96 100644
--- a/qtjava/javalib/qtjava/QMetaData.cpp
+++ b/qtjava/javalib/qtjava/TQMetaData.cpp
@@ -2,7 +2,7 @@
 #include <tqmetaobject.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QMetaData.h>
+#include <qtjava/TQMetaData.h>
 
 class TQMetaDataJBridge : public TQMetaData
 {
diff --git a/qtjava/javalib/qtjava/QMetaData.h b/qtjava/javalib/qtjava/TQMetaData.h
index b913671a..b913671a 100644
--- a/qtjava/javalib/qtjava/QMetaData.h
+++ b/qtjava/javalib/qtjava/TQMetaData.h
diff --git a/qtjava/javalib/qtjava/QMetaEnum.cpp b/qtjava/javalib/qtjava/TQMetaEnum.cpp
index c85a6b85..63578d51 100644
--- a/qtjava/javalib/qtjava/QMetaEnum.cpp
+++ b/qtjava/javalib/qtjava/TQMetaEnum.cpp
@@ -2,7 +2,7 @@
 #include <tqmetaobject.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QMetaEnum.h>
+#include <qtjava/TQMetaEnum.h>
 
 class TQMetaEnumJBridge : public TQMetaEnum
 {
diff --git a/qtjava/javalib/qtjava/QMetaEnum.h b/qtjava/javalib/qtjava/TQMetaEnum.h
index 97ace9ba..97ace9ba 100644
--- a/qtjava/javalib/qtjava/QMetaEnum.h
+++ b/qtjava/javalib/qtjava/TQMetaEnum.h
diff --git a/qtjava/javalib/qtjava/QMetaObject.cpp b/qtjava/javalib/qtjava/TQMetaObject.cpp
index 1a7d04b0..308f7c58 100644
--- a/qtjava/javalib/qtjava/QMetaObject.cpp
+++ b/qtjava/javalib/qtjava/TQMetaObject.cpp
@@ -3,7 +3,7 @@
 #include <tqmetaobject.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QMetaObject.h>
+#include <qtjava/TQMetaObject.h>
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QMetaObject_classInfo__I(JNIEnv* env, jobject obj, jint index)
diff --git a/qtjava/javalib/qtjava/QMetaObject.h b/qtjava/javalib/qtjava/TQMetaObject.h
index c0e2f91c..c0e2f91c 100644
--- a/qtjava/javalib/qtjava/QMetaObject.h
+++ b/qtjava/javalib/qtjava/TQMetaObject.h
diff --git a/qtjava/javalib/qtjava/QMetaProperty.cpp b/qtjava/javalib/qtjava/TQMetaProperty.cpp
index e4c8f194..e335efcd 100644
--- a/qtjava/javalib/qtjava/QMetaProperty.cpp
+++ b/qtjava/javalib/qtjava/TQMetaProperty.cpp
@@ -3,7 +3,7 @@
 #include <tqmetaobject.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QMetaProperty.h>
+#include <qtjava/TQMetaProperty.h>
 
 class TQMetaPropertyJBridge : public TQMetaProperty
 {
diff --git a/qtjava/javalib/qtjava/QMetaProperty.h b/qtjava/javalib/qtjava/TQMetaProperty.h
index 6132a20c..6132a20c 100644
--- a/qtjava/javalib/qtjava/QMetaProperty.h
+++ b/qtjava/javalib/qtjava/TQMetaProperty.h
diff --git a/qtjava/javalib/qtjava/QMimeSource.cpp b/qtjava/javalib/qtjava/TQMimeSource.cpp
index 10f828b4..e5a57b4e 100644
--- a/qtjava/javalib/qtjava/QMimeSource.cpp
+++ b/qtjava/javalib/qtjava/TQMimeSource.cpp
@@ -3,7 +3,7 @@
 #include <tqmime.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QMimeSource.h>
+#include <qtjava/TQMimeSource.h>
 
 JNIEXPORT jbyteArray JNICALL
 Java_org_kde_qt_QMimeSource_encodedData(JNIEnv* env, jobject obj, jstring arg1)
diff --git a/qtjava/javalib/qtjava/QMimeSource.h b/qtjava/javalib/qtjava/TQMimeSource.h
index 4fa18d40..4fa18d40 100644
--- a/qtjava/javalib/qtjava/QMimeSource.h
+++ b/qtjava/javalib/qtjava/TQMimeSource.h
diff --git a/qtjava/javalib/qtjava/QMimeSourceFactory.cpp b/qtjava/javalib/qtjava/TQMimeSourceFactory.cpp
index 521f9067..c6526a6d 100644
--- a/qtjava/javalib/qtjava/QMimeSourceFactory.cpp
+++ b/qtjava/javalib/qtjava/TQMimeSourceFactory.cpp
@@ -6,7 +6,7 @@
 #include <tqmime.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QMimeSourceFactory.h>
+#include <qtjava/TQMimeSourceFactory.h>
 
 class TQMimeSourceFactoryJBridge : public TQMimeSourceFactory
 {
diff --git a/qtjava/javalib/qtjava/QMimeSourceFactory.h b/qtjava/javalib/qtjava/TQMimeSourceFactory.h
index eee55198..eee55198 100644
--- a/qtjava/javalib/qtjava/QMimeSourceFactory.h
+++ b/qtjava/javalib/qtjava/TQMimeSourceFactory.h
diff --git a/qtjava/javalib/qtjava/QMouseEvent.cpp b/qtjava/javalib/qtjava/TQMouseEvent.cpp
index 437256e8..47917cf6 100644
--- a/qtjava/javalib/qtjava/QMouseEvent.cpp
+++ b/qtjava/javalib/qtjava/TQMouseEvent.cpp
@@ -4,7 +4,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QMouseEvent.h>
+#include <qtjava/TQMouseEvent.h>
 
 class TQMouseEventJBridge : public TQMouseEvent
 {
diff --git a/qtjava/javalib/qtjava/QMouseEvent.h b/qtjava/javalib/qtjava/TQMouseEvent.h
index 6b6d9233..6b6d9233 100644
--- a/qtjava/javalib/qtjava/QMouseEvent.h
+++ b/qtjava/javalib/qtjava/TQMouseEvent.h
diff --git a/qtjava/javalib/qtjava/QMoveEvent.cpp b/qtjava/javalib/qtjava/TQMoveEvent.cpp
index fb509f2d..250b3aef 100644
--- a/qtjava/javalib/qtjava/QMoveEvent.cpp
+++ b/qtjava/javalib/qtjava/TQMoveEvent.cpp
@@ -3,7 +3,7 @@
 #include <tqevent.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QMoveEvent.h>
+#include <qtjava/TQMoveEvent.h>
 
 class TQMoveEventJBridge : public TQMoveEvent
 {
diff --git a/qtjava/javalib/qtjava/QMoveEvent.h b/qtjava/javalib/qtjava/TQMoveEvent.h
index 9dab5a9a..9dab5a9a 100644
--- a/qtjava/javalib/qtjava/QMoveEvent.h
+++ b/qtjava/javalib/qtjava/TQMoveEvent.h
diff --git a/qtjava/javalib/qtjava/QMovie.cpp b/qtjava/javalib/qtjava/TQMovie.cpp
index 23d4497b..ff5bc1aa 100644
--- a/qtjava/javalib/qtjava/QMovie.cpp
+++ b/qtjava/javalib/qtjava/TQMovie.cpp
@@ -8,7 +8,7 @@
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QMovie.h>
+#include <qtjava/TQMovie.h>
 
 class TQMovieJBridge : public TQMovie
 {
diff --git a/qtjava/javalib/qtjava/QMovie.h b/qtjava/javalib/qtjava/TQMovie.h
index 317f6caf..317f6caf 100644
--- a/qtjava/javalib/qtjava/QMovie.h
+++ b/qtjava/javalib/qtjava/TQMovie.h
diff --git a/qtjava/javalib/qtjava/QMultiLineEdit.cpp b/qtjava/javalib/qtjava/TQMultiLineEdit.cpp
index 255e32f3..d224d076 100644
--- a/qtjava/javalib/qtjava/QMultiLineEdit.cpp
+++ b/qtjava/javalib/qtjava/TQMultiLineEdit.cpp
@@ -4,7 +4,7 @@
 #include <tqmultilineedit.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QMultiLineEdit.h>
+#include <qtjava/TQMultiLineEdit.h>
 
 class TQMultiLineEditJBridge : public TQMultiLineEdit
 {
diff --git a/qtjava/javalib/qtjava/QMultiLineEdit.h b/qtjava/javalib/qtjava/TQMultiLineEdit.h
index 536bf85c..536bf85c 100644
--- a/qtjava/javalib/qtjava/QMultiLineEdit.h
+++ b/qtjava/javalib/qtjava/TQMultiLineEdit.h
diff --git a/qtjava/javalib/qtjava/QNetworkOperation.cpp b/qtjava/javalib/qtjava/TQNetworkOperation.cpp
index 05479bfe..9d02b5de 100644
--- a/qtjava/javalib/qtjava/QNetworkOperation.cpp
+++ b/qtjava/javalib/qtjava/TQNetworkOperation.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QNetworkOperation.h>
+#include <qtjava/TQNetworkOperation.h>
 
 class TQNetworkOperationJBridge : public TQNetworkOperation
 {
diff --git a/qtjava/javalib/qtjava/QNetworkOperation.h b/qtjava/javalib/qtjava/TQNetworkOperation.h
index d0c5dc2b..d0c5dc2b 100644
--- a/qtjava/javalib/qtjava/QNetworkOperation.h
+++ b/qtjava/javalib/qtjava/TQNetworkOperation.h
diff --git a/qtjava/javalib/qtjava/QNetworkProtocol.cpp b/qtjava/javalib/qtjava/TQNetworkProtocol.cpp
index e4b86565..e08e7f53 100644
--- a/qtjava/javalib/qtjava/QNetworkProtocol.cpp
+++ b/qtjava/javalib/qtjava/TQNetworkProtocol.cpp
@@ -5,7 +5,7 @@
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QNetworkProtocol.h>
+#include <qtjava/TQNetworkProtocol.h>
 
 class TQNetworkProtocolJBridge : public TQNetworkProtocol
 {
diff --git a/qtjava/javalib/qtjava/QNetworkProtocol.h b/qtjava/javalib/qtjava/TQNetworkProtocol.h
index 56da473a..56da473a 100644
--- a/qtjava/javalib/qtjava/QNetworkProtocol.h
+++ b/qtjava/javalib/qtjava/TQNetworkProtocol.h
diff --git a/qtjava/javalib/qtjava/QObject.cpp b/qtjava/javalib/qtjava/TQObject.cpp
index ff232a2b..c2d9a33c 100644
--- a/qtjava/javalib/qtjava/QObject.cpp
+++ b/qtjava/javalib/qtjava/TQObject.cpp
@@ -5,7 +5,7 @@
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QObject.h>
+#include <qtjava/TQObject.h>
 
 class TQObjectJBridge : public TQObject
 {
diff --git a/qtjava/javalib/qtjava/QObject.h b/qtjava/javalib/qtjava/TQObject.h
index f87c9299..f87c9299 100644
--- a/qtjava/javalib/qtjava/QObject.h
+++ b/qtjava/javalib/qtjava/TQObject.h
diff --git a/qtjava/javalib/qtjava/QObjectCleanupHandler.cpp b/qtjava/javalib/qtjava/TQObjectCleanupHandler.cpp
index 8e6cd3f7..b00d2b1e 100644
--- a/qtjava/javalib/qtjava/QObjectCleanupHandler.cpp
+++ b/qtjava/javalib/qtjava/TQObjectCleanupHandler.cpp
@@ -3,7 +3,7 @@
 #include <tqobjectcleanuphandler.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QObjectCleanupHandler.h>
+#include <qtjava/TQObjectCleanupHandler.h>
 
 class TQObjectCleanupHandlerJBridge : public TQObjectCleanupHandler
 {
diff --git a/qtjava/javalib/qtjava/QObjectCleanupHandler.h b/qtjava/javalib/qtjava/TQObjectCleanupHandler.h
index 066b3c88..066b3c88 100644
--- a/qtjava/javalib/qtjava/QObjectCleanupHandler.h
+++ b/qtjava/javalib/qtjava/TQObjectCleanupHandler.h
diff --git a/qtjava/javalib/qtjava/QPaintDevice.cpp b/qtjava/javalib/qtjava/TQPaintDevice.cpp
index 60a8e8ec..ba7f3ace 100644
--- a/qtjava/javalib/qtjava/QPaintDevice.cpp
+++ b/qtjava/javalib/qtjava/TQPaintDevice.cpp
@@ -2,7 +2,7 @@
 #include <tqpaintdevice.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QPaintDevice.h>
+#include <qtjava/TQPaintDevice.h>
 
 class TQPaintDeviceJBridge : public TQPaintDevice
 {
diff --git a/qtjava/javalib/qtjava/QPaintDevice.h b/qtjava/javalib/qtjava/TQPaintDevice.h
index baf6abea..baf6abea 100644
--- a/qtjava/javalib/qtjava/QPaintDevice.h
+++ b/qtjava/javalib/qtjava/TQPaintDevice.h
diff --git a/qtjava/javalib/qtjava/QPaintDeviceMetrics.cpp b/qtjava/javalib/qtjava/TQPaintDeviceMetrics.cpp
index 82e152e5..a0358e1b 100644
--- a/qtjava/javalib/qtjava/QPaintDeviceMetrics.cpp
+++ b/qtjava/javalib/qtjava/TQPaintDeviceMetrics.cpp
@@ -2,7 +2,7 @@
 #include <tqpaintdevicemetrics.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QPaintDeviceMetrics.h>
+#include <qtjava/TQPaintDeviceMetrics.h>
 
 class TQPaintDeviceMetricsJBridge : public TQPaintDeviceMetrics
 {
diff --git a/qtjava/javalib/qtjava/QPaintDeviceMetrics.h b/qtjava/javalib/qtjava/TQPaintDeviceMetrics.h
index fcbf8278..fcbf8278 100644
--- a/qtjava/javalib/qtjava/QPaintDeviceMetrics.h
+++ b/qtjava/javalib/qtjava/TQPaintDeviceMetrics.h
diff --git a/qtjava/javalib/qtjava/QPaintEvent.cpp b/qtjava/javalib/qtjava/TQPaintEvent.cpp
index cc2cdacb..5549988d 100644
--- a/qtjava/javalib/qtjava/QPaintEvent.cpp
+++ b/qtjava/javalib/qtjava/TQPaintEvent.cpp
@@ -4,7 +4,7 @@
 #include <tqevent.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QPaintEvent.h>
+#include <qtjava/TQPaintEvent.h>
 
 class TQPaintEventJBridge : public TQPaintEvent
 {
diff --git a/qtjava/javalib/qtjava/QPaintEvent.h b/qtjava/javalib/qtjava/TQPaintEvent.h
index e0002747..e0002747 100644
--- a/qtjava/javalib/qtjava/QPaintEvent.h
+++ b/qtjava/javalib/qtjava/TQPaintEvent.h
diff --git a/qtjava/javalib/qtjava/QPainter.cpp b/qtjava/javalib/qtjava/TQPainter.cpp
index 7cfc164c..d85341ad 100644
--- a/qtjava/javalib/qtjava/QPainter.cpp
+++ b/qtjava/javalib/qtjava/TQPainter.cpp
@@ -18,7 +18,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QPainter.h>
+#include <qtjava/TQPainter.h>
 
 class TQPainterJBridge : public TQPainter
 {
diff --git a/qtjava/javalib/qtjava/QPainter.h b/qtjava/javalib/qtjava/TQPainter.h
index 54120f50..54120f50 100644
--- a/qtjava/javalib/qtjava/QPainter.h
+++ b/qtjava/javalib/qtjava/TQPainter.h
diff --git a/qtjava/javalib/qtjava/QPalette.cpp b/qtjava/javalib/qtjava/TQPalette.cpp
index 7a6cd7d3..cdb7d59f 100644
--- a/qtjava/javalib/qtjava/QPalette.cpp
+++ b/qtjava/javalib/qtjava/TQPalette.cpp
@@ -5,7 +5,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QPalette.h>
+#include <qtjava/TQPalette.h>
 
 class TQPaletteJBridge : public TQPalette
 {
diff --git a/qtjava/javalib/qtjava/QPalette.h b/qtjava/javalib/qtjava/TQPalette.h
index 4417a42a..4417a42a 100644
--- a/qtjava/javalib/qtjava/QPalette.h
+++ b/qtjava/javalib/qtjava/TQPalette.h
diff --git a/qtjava/javalib/qtjava/QPen.cpp b/qtjava/javalib/qtjava/TQPen.cpp
index c2d55bf7..4e0cd296 100644
--- a/qtjava/javalib/qtjava/QPen.cpp
+++ b/qtjava/javalib/qtjava/TQPen.cpp
@@ -4,7 +4,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QPen.h>
+#include <qtjava/TQPen.h>
 
 class TQPenJBridge : public TQPen
 {
diff --git a/qtjava/javalib/qtjava/QPen.h b/qtjava/javalib/qtjava/TQPen.h
index 37ad104b..37ad104b 100644
--- a/qtjava/javalib/qtjava/QPen.h
+++ b/qtjava/javalib/qtjava/TQPen.h
diff --git a/qtjava/javalib/qtjava/QPicture.cpp b/qtjava/javalib/qtjava/TQPicture.cpp
index 02d04b84..8afb0f1c 100644
--- a/qtjava/javalib/qtjava/QPicture.cpp
+++ b/qtjava/javalib/qtjava/TQPicture.cpp
@@ -4,7 +4,7 @@
 #include <tqpicture.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QPicture.h>
+#include <qtjava/TQPicture.h>
 
 class TQPictureJBridge : public TQPicture
 {
diff --git a/qtjava/javalib/qtjava/QPicture.h b/qtjava/javalib/qtjava/TQPicture.h
index a78c76d2..a78c76d2 100644
--- a/qtjava/javalib/qtjava/QPicture.h
+++ b/qtjava/javalib/qtjava/TQPicture.h
diff --git a/qtjava/javalib/qtjava/QPixmap.cpp b/qtjava/javalib/qtjava/TQPixmap.cpp
index 76f9c7bb..effd28e0 100644
--- a/qtjava/javalib/qtjava/QPixmap.cpp
+++ b/qtjava/javalib/qtjava/TQPixmap.cpp
@@ -12,7 +12,7 @@
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QPixmap.h>
+#include <qtjava/TQPixmap.h>
 
 class TQPixmapJBridge : public TQPixmap
 {
diff --git a/qtjava/javalib/qtjava/QPixmap.h b/qtjava/javalib/qtjava/TQPixmap.h
index a18774fd..a18774fd 100644
--- a/qtjava/javalib/qtjava/QPixmap.h
+++ b/qtjava/javalib/qtjava/TQPixmap.h
diff --git a/qtjava/javalib/qtjava/QPoint.cpp b/qtjava/javalib/qtjava/TQPoint.cpp
index 4a991371..37dfd7c2 100644
--- a/qtjava/javalib/qtjava/QPoint.cpp
+++ b/qtjava/javalib/qtjava/TQPoint.cpp
@@ -3,7 +3,7 @@
 #include <tqwindowdefs.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QPoint.h>
+#include <qtjava/TQPoint.h>
 
 class TQPointJBridge : public TQPoint
 {
diff --git a/qtjava/javalib/qtjava/QPoint.h b/qtjava/javalib/qtjava/TQPoint.h
index bc6b0c85..bc6b0c85 100644
--- a/qtjava/javalib/qtjava/QPoint.h
+++ b/qtjava/javalib/qtjava/TQPoint.h
diff --git a/qtjava/javalib/qtjava/QPointArray.cpp b/qtjava/javalib/qtjava/TQPointArray.cpp
index d33dbca9..02ef6875 100644
--- a/qtjava/javalib/qtjava/QPointArray.cpp
+++ b/qtjava/javalib/qtjava/TQPointArray.cpp
@@ -5,7 +5,7 @@
 #include <tqpointarray.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QPointArray.h>
+#include <qtjava/TQPointArray.h>
 
 class TQPointArrayJBridge : public TQPointArray
 {
diff --git a/qtjava/javalib/qtjava/QPointArray.h b/qtjava/javalib/qtjava/TQPointArray.h
index ab84eacb..ab84eacb 100644
--- a/qtjava/javalib/qtjava/QPointArray.h
+++ b/qtjava/javalib/qtjava/TQPointArray.h
diff --git a/qtjava/javalib/qtjava/QPolygonScanner.cpp b/qtjava/javalib/qtjava/TQPolygonScanner.cpp
index 8fb9827c..a90c7e52 100644
--- a/qtjava/javalib/qtjava/QPolygonScanner.cpp
+++ b/qtjava/javalib/qtjava/TQPolygonScanner.cpp
@@ -3,7 +3,7 @@
 #include <tqpointarray.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QPolygonScanner.h>
+#include <qtjava/TQPolygonScanner.h>
 
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QPolygonScanner_processSpans(JNIEnv* env, jobject obj, jint n, jobject point, jintArray width)
diff --git a/qtjava/javalib/qtjava/QPolygonScanner.h b/qtjava/javalib/qtjava/TQPolygonScanner.h
index ab20ddc2..ab20ddc2 100644
--- a/qtjava/javalib/qtjava/QPolygonScanner.h
+++ b/qtjava/javalib/qtjava/TQPolygonScanner.h
diff --git a/qtjava/javalib/qtjava/QPopupMenu.cpp b/qtjava/javalib/qtjava/TQPopupMenu.cpp
index 71c114ca..0dcfa14f 100644
--- a/qtjava/javalib/qtjava/QPopupMenu.cpp
+++ b/qtjava/javalib/qtjava/TQPopupMenu.cpp
@@ -13,7 +13,7 @@
 
 #include <qtjava/QtSupport.h>
 #include <qtjava/JavaSlot.h>
-#include <qtjava/QPopupMenu.h>
+#include <qtjava/TQPopupMenu.h>
 
 class TQPopupMenuJBridge : public TQPopupMenu
 {
diff --git a/qtjava/javalib/qtjava/QPopupMenu.h b/qtjava/javalib/qtjava/TQPopupMenu.h
index 1412a8f6..1412a8f6 100644
--- a/qtjava/javalib/qtjava/QPopupMenu.h
+++ b/qtjava/javalib/qtjava/TQPopupMenu.h
diff --git a/qtjava/javalib/qtjava/QPrintDialog.cpp b/qtjava/javalib/qtjava/TQPrintDialog.cpp
index 08b888ef..0e0218ee 100644
--- a/qtjava/javalib/qtjava/QPrintDialog.cpp
+++ b/qtjava/javalib/qtjava/TQPrintDialog.cpp
@@ -3,7 +3,7 @@
 #include <tqprintdialog.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QPrintDialog.h>
+#include <qtjava/TQPrintDialog.h>
 
 class TQPrintDialogJBridge : public TQPrintDialog
 {
diff --git a/qtjava/javalib/qtjava/QPrintDialog.h b/qtjava/javalib/qtjava/TQPrintDialog.h
index 4a8866bc..4a8866bc 100644
--- a/qtjava/javalib/qtjava/QPrintDialog.h
+++ b/qtjava/javalib/qtjava/TQPrintDialog.h
diff --git a/qtjava/javalib/qtjava/QPrinter.cpp b/qtjava/javalib/qtjava/TQPrinter.cpp
index 684b0bbe..6f19beb8 100644
--- a/qtjava/javalib/qtjava/QPrinter.cpp
+++ b/qtjava/javalib/qtjava/TQPrinter.cpp
@@ -4,7 +4,7 @@
 #include <tqprinter.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QPrinter.h>
+#include <qtjava/TQPrinter.h>
 
 class TQPrinterJBridge : public TQPrinter
 {
diff --git a/qtjava/javalib/qtjava/QPrinter.h b/qtjava/javalib/qtjava/TQPrinter.h
index 1a711b02..1a711b02 100644
--- a/qtjava/javalib/qtjava/QPrinter.h
+++ b/qtjava/javalib/qtjava/TQPrinter.h
diff --git a/qtjava/javalib/qtjava/QProcess.cpp b/qtjava/javalib/qtjava/TQProcess.cpp
index 62f8774b..7ee3049f 100644
--- a/qtjava/javalib/qtjava/QProcess.cpp
+++ b/qtjava/javalib/qtjava/TQProcess.cpp
@@ -6,7 +6,7 @@
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QProcess.h>
+#include <qtjava/TQProcess.h>
 
 class TQProcessJBridge : public TQProcess
 {
diff --git a/qtjava/javalib/qtjava/QProcess.h b/qtjava/javalib/qtjava/TQProcess.h
index 990c66d6..990c66d6 100644
--- a/qtjava/javalib/qtjava/QProcess.h
+++ b/qtjava/javalib/qtjava/TQProcess.h
diff --git a/qtjava/javalib/qtjava/QProgressBar.cpp b/qtjava/javalib/qtjava/TQProgressBar.cpp
index caaf18d4..633f13d1 100644
--- a/qtjava/javalib/qtjava/QProgressBar.cpp
+++ b/qtjava/javalib/qtjava/TQProgressBar.cpp
@@ -6,7 +6,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QProgressBar.h>
+#include <qtjava/TQProgressBar.h>
 
 class TQProgressBarJBridge : public TQProgressBar
 {
diff --git a/qtjava/javalib/qtjava/QProgressBar.h b/qtjava/javalib/qtjava/TQProgressBar.h
index 2c4b6090..2c4b6090 100644
--- a/qtjava/javalib/qtjava/QProgressBar.h
+++ b/qtjava/javalib/qtjava/TQProgressBar.h
diff --git a/qtjava/javalib/qtjava/QProgressDialog.cpp b/qtjava/javalib/qtjava/TQProgressDialog.cpp
index 48b82910..23084022 100644
--- a/qtjava/javalib/qtjava/QProgressDialog.cpp
+++ b/qtjava/javalib/qtjava/TQProgressDialog.cpp
@@ -6,7 +6,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QProgressDialog.h>
+#include <qtjava/TQProgressDialog.h>
 
 class TQProgressDialogJBridge : public TQProgressDialog
 {
diff --git a/qtjava/javalib/qtjava/QProgressDialog.h b/qtjava/javalib/qtjava/TQProgressDialog.h
index 79daba7d..79daba7d 100644
--- a/qtjava/javalib/qtjava/QProgressDialog.h
+++ b/qtjava/javalib/qtjava/TQProgressDialog.h
diff --git a/qtjava/javalib/qtjava/QPushButton.cpp b/qtjava/javalib/qtjava/TQPushButton.cpp
index 9ce29f1e..9e6e07cc 100644
--- a/qtjava/javalib/qtjava/QPushButton.cpp
+++ b/qtjava/javalib/qtjava/TQPushButton.cpp
@@ -7,7 +7,7 @@
 #include <tqiconset.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QPushButton.h>
+#include <qtjava/TQPushButton.h>
 
 class TQPushButtonJBridge : public TQPushButton
 {
diff --git a/qtjava/javalib/qtjava/QPushButton.h b/qtjava/javalib/qtjava/TQPushButton.h
index 52cbc5fc..52cbc5fc 100644
--- a/qtjava/javalib/qtjava/QPushButton.h
+++ b/qtjava/javalib/qtjava/TQPushButton.h
diff --git a/qtjava/javalib/qtjava/QRadioButton.cpp b/qtjava/javalib/qtjava/TQRadioButton.cpp
index aad456ae..dd126d81 100644
--- a/qtjava/javalib/qtjava/QRadioButton.cpp
+++ b/qtjava/javalib/qtjava/TQRadioButton.cpp
@@ -5,7 +5,7 @@
 #include <tqsize.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QRadioButton.h>
+#include <qtjava/TQRadioButton.h>
 
 class TQRadioButtonJBridge : public TQRadioButton
 {
diff --git a/qtjava/javalib/qtjava/QRadioButton.h b/qtjava/javalib/qtjava/TQRadioButton.h
index 9118d2da..9118d2da 100644
--- a/qtjava/javalib/qtjava/QRadioButton.h
+++ b/qtjava/javalib/qtjava/TQRadioButton.h
diff --git a/qtjava/javalib/qtjava/QRangeControl.cpp b/qtjava/javalib/qtjava/TQRangeControl.cpp
index fae1e5f8..f2f2b99e 100644
--- a/qtjava/javalib/qtjava/QRangeControl.cpp
+++ b/qtjava/javalib/qtjava/TQRangeControl.cpp
@@ -2,7 +2,7 @@
 #include <tqrangecontrol.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QRangeControl.h>
+#include <qtjava/TQRangeControl.h>
 
 class TQRangeControlJBridge : public TQRangeControl
 {
diff --git a/qtjava/javalib/qtjava/QRangeControl.h b/qtjava/javalib/qtjava/TQRangeControl.h
index fb15b2d9..fb15b2d9 100644
--- a/qtjava/javalib/qtjava/QRangeControl.h
+++ b/qtjava/javalib/qtjava/TQRangeControl.h
diff --git a/qtjava/javalib/qtjava/QRect.cpp b/qtjava/javalib/qtjava/TQRect.cpp
index 9c681365..af5a0165 100644
--- a/qtjava/javalib/qtjava/QRect.cpp
+++ b/qtjava/javalib/qtjava/TQRect.cpp
@@ -5,7 +5,7 @@
 #include <tqwindowdefs.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QRect.h>
+#include <qtjava/TQRect.h>
 
 class TQRectJBridge : public TQRect
 {
diff --git a/qtjava/javalib/qtjava/QRect.h b/qtjava/javalib/qtjava/TQRect.h
index 63d57c3e..63d57c3e 100644
--- a/qtjava/javalib/qtjava/QRect.h
+++ b/qtjava/javalib/qtjava/TQRect.h
diff --git a/qtjava/javalib/qtjava/QRegExp.cpp b/qtjava/javalib/qtjava/TQRegExp.cpp
index dbdc938e..1555b0dc 100644
--- a/qtjava/javalib/qtjava/QRegExp.cpp
+++ b/qtjava/javalib/qtjava/TQRegExp.cpp
@@ -4,7 +4,7 @@
 #include <tqstringlist.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QRegExp.h>
+#include <qtjava/TQRegExp.h>
 
 class TQRegExpJBridge : public TQRegExp
 {
diff --git a/qtjava/javalib/qtjava/QRegExp.h b/qtjava/javalib/qtjava/TQRegExp.h
index 813093ea..813093ea 100644
--- a/qtjava/javalib/qtjava/QRegExp.h
+++ b/qtjava/javalib/qtjava/TQRegExp.h
diff --git a/qtjava/javalib/qtjava/QRegExpValidator.cpp b/qtjava/javalib/qtjava/TQRegExpValidator.cpp
index 91b1fbc1..4fd011e9 100644
--- a/qtjava/javalib/qtjava/QRegExpValidator.cpp
+++ b/qtjava/javalib/qtjava/TQRegExpValidator.cpp
@@ -4,7 +4,7 @@
 #include <tqvalidator.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QRegExpValidator.h>
+#include <qtjava/TQRegExpValidator.h>
 
 class TQRegExpValidatorJBridge : public TQRegExpValidator
 {
diff --git a/qtjava/javalib/qtjava/QRegExpValidator.h b/qtjava/javalib/qtjava/TQRegExpValidator.h
index 5d2ba2e6..5d2ba2e6 100644
--- a/qtjava/javalib/qtjava/QRegExpValidator.h
+++ b/qtjava/javalib/qtjava/TQRegExpValidator.h
diff --git a/qtjava/javalib/qtjava/QRegion.cpp b/qtjava/javalib/qtjava/TQRegion.cpp
index d81cade7..a17e0ed1 100644
--- a/qtjava/javalib/qtjava/QRegion.cpp
+++ b/qtjava/javalib/qtjava/TQRegion.cpp
@@ -6,7 +6,7 @@
 #include <tqpointarray.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QRegion.h>
+#include <qtjava/TQRegion.h>
 
 class TQRegionJBridge : public TQRegion
 {
diff --git a/qtjava/javalib/qtjava/QRegion.h b/qtjava/javalib/qtjava/TQRegion.h
index dcb9281e..dcb9281e 100644
--- a/qtjava/javalib/qtjava/QRegion.h
+++ b/qtjava/javalib/qtjava/TQRegion.h
diff --git a/qtjava/javalib/qtjava/QResizeEvent.cpp b/qtjava/javalib/qtjava/TQResizeEvent.cpp
index dca68e82..6ce39e87 100644
--- a/qtjava/javalib/qtjava/QResizeEvent.cpp
+++ b/qtjava/javalib/qtjava/TQResizeEvent.cpp
@@ -3,7 +3,7 @@
 #include <tqevent.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QResizeEvent.h>
+#include <qtjava/TQResizeEvent.h>
 
 class TQResizeEventJBridge : public TQResizeEvent
 {
diff --git a/qtjava/javalib/qtjava/QResizeEvent.h b/qtjava/javalib/qtjava/TQResizeEvent.h
index 18cae2c9..18cae2c9 100644
--- a/qtjava/javalib/qtjava/QResizeEvent.h
+++ b/qtjava/javalib/qtjava/TQResizeEvent.h
diff --git a/qtjava/javalib/qtjava/QScrollBar.cpp b/qtjava/javalib/qtjava/TQScrollBar.cpp
index be9231be..c56a3453 100644
--- a/qtjava/javalib/qtjava/QScrollBar.cpp
+++ b/qtjava/javalib/qtjava/TQScrollBar.cpp
@@ -10,7 +10,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QScrollBar.h>
+#include <qtjava/TQScrollBar.h>
 
 class TQScrollBarJBridge : public TQScrollBar
 {
diff --git a/qtjava/javalib/qtjava/QScrollBar.h b/qtjava/javalib/qtjava/TQScrollBar.h
index f73a9022..f73a9022 100644
--- a/qtjava/javalib/qtjava/QScrollBar.h
+++ b/qtjava/javalib/qtjava/TQScrollBar.h
diff --git a/qtjava/javalib/qtjava/QScrollView.cpp b/qtjava/javalib/qtjava/TQScrollView.cpp
index 70c13715..cd0e42eb 100644
--- a/qtjava/javalib/qtjava/QScrollView.cpp
+++ b/qtjava/javalib/qtjava/TQScrollView.cpp
@@ -10,7 +10,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QScrollView.h>
+#include <qtjava/TQScrollView.h>
 
 class TQScrollViewJBridge : public TQScrollView
 {
diff --git a/qtjava/javalib/qtjava/QScrollView.h b/qtjava/javalib/qtjava/TQScrollView.h
index 50d78b9c..50d78b9c 100644
--- a/qtjava/javalib/qtjava/QScrollView.h
+++ b/qtjava/javalib/qtjava/TQScrollView.h
diff --git a/qtjava/javalib/qtjava/QSemiModal.cpp b/qtjava/javalib/qtjava/TQSemiModal.cpp
index 3a1bc268..7aa057b4 100644
--- a/qtjava/javalib/qtjava/QSemiModal.cpp
+++ b/qtjava/javalib/qtjava/TQSemiModal.cpp
@@ -4,7 +4,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QSemiModal.h>
+#include <qtjava/TQSemiModal.h>
 
 class TQSemiModalJBridge : public TQSemiModal
 {
diff --git a/qtjava/javalib/qtjava/QSemiModal.h b/qtjava/javalib/qtjava/TQSemiModal.h
index 7ee8f0ff..7ee8f0ff 100644
--- a/qtjava/javalib/qtjava/QSemiModal.h
+++ b/qtjava/javalib/qtjava/TQSemiModal.h
diff --git a/qtjava/javalib/qtjava/QServerSocket.cpp b/qtjava/javalib/qtjava/TQServerSocket.cpp
index 95b8153e..b404513f 100644
--- a/qtjava/javalib/qtjava/QServerSocket.cpp
+++ b/qtjava/javalib/qtjava/TQServerSocket.cpp
@@ -5,7 +5,7 @@
 #include <tqhostaddress.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QServerSocket.h>
+#include <qtjava/TQServerSocket.h>
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QServerSocket_address(JNIEnv* env, jobject obj)
diff --git a/qtjava/javalib/qtjava/QServerSocket.h b/qtjava/javalib/qtjava/TQServerSocket.h
index 8aa59456..8aa59456 100644
--- a/qtjava/javalib/qtjava/QServerSocket.h
+++ b/qtjava/javalib/qtjava/TQServerSocket.h
diff --git a/qtjava/javalib/qtjava/QSessionManager.cpp b/qtjava/javalib/qtjava/TQSessionManager.cpp
index b4181004..848f2e64 100644
--- a/qtjava/javalib/qtjava/QSessionManager.cpp
+++ b/qtjava/javalib/qtjava/TQSessionManager.cpp
@@ -4,7 +4,7 @@
 #include <tqsessionmanager.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QSessionManager.h>
+#include <qtjava/TQSessionManager.h>
 
 JNIEXPORT jboolean JNICALL
 Java_org_kde_qt_QSessionManager_allowsErrorInteraction(JNIEnv* env, jobject obj)
diff --git a/qtjava/javalib/qtjava/QSessionManager.h b/qtjava/javalib/qtjava/TQSessionManager.h
index 5ef8ebdd..5ef8ebdd 100644
--- a/qtjava/javalib/qtjava/QSessionManager.h
+++ b/qtjava/javalib/qtjava/TQSessionManager.h
diff --git a/qtjava/javalib/qtjava/QSettings.cpp b/qtjava/javalib/qtjava/TQSettings.cpp
index b09c9bde..1a77c4e2 100644
--- a/qtjava/javalib/qtjava/QSettings.cpp
+++ b/qtjava/javalib/qtjava/TQSettings.cpp
@@ -4,7 +4,7 @@
 #include <tqsettings.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QSettings.h>
+#include <qtjava/TQSettings.h>
 
 class TQSettingsJBridge : public TQSettings
 {
diff --git a/qtjava/javalib/qtjava/QSettings.h b/qtjava/javalib/qtjava/TQSettings.h
index 3d8d60f8..3d8d60f8 100644
--- a/qtjava/javalib/qtjava/QSettings.h
+++ b/qtjava/javalib/qtjava/TQSettings.h
diff --git a/qtjava/javalib/qtjava/QShowEvent.cpp b/qtjava/javalib/qtjava/TQShowEvent.cpp
index 496af94f..4b8da75d 100644
--- a/qtjava/javalib/qtjava/QShowEvent.cpp
+++ b/qtjava/javalib/qtjava/TQShowEvent.cpp
@@ -2,7 +2,7 @@
 #include <tqevent.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QShowEvent.h>
+#include <qtjava/TQShowEvent.h>
 
 class TQShowEventJBridge : public TQShowEvent
 {
diff --git a/qtjava/javalib/qtjava/QShowEvent.h b/qtjava/javalib/qtjava/TQShowEvent.h
index a4297714..a4297714 100644
--- a/qtjava/javalib/qtjava/QShowEvent.h
+++ b/qtjava/javalib/qtjava/TQShowEvent.h
diff --git a/qtjava/javalib/qtjava/QSignal.cpp b/qtjava/javalib/qtjava/TQSignal.cpp
index b5141f3e..05479ab8 100644
--- a/qtjava/javalib/qtjava/QSignal.cpp
+++ b/qtjava/javalib/qtjava/TQSignal.cpp
@@ -4,7 +4,7 @@
 #include <tqvariant.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QSignal.h>
+#include <qtjava/TQSignal.h>
 
 class TQSignalJBridge : public TQSignal
 {
diff --git a/qtjava/javalib/qtjava/QSignal.h b/qtjava/javalib/qtjava/TQSignal.h
index d74ca10c..d74ca10c 100644
--- a/qtjava/javalib/qtjava/QSignal.h
+++ b/qtjava/javalib/qtjava/TQSignal.h
diff --git a/qtjava/javalib/qtjava/QSignalMapper.cpp b/qtjava/javalib/qtjava/TQSignalMapper.cpp
index b415b76a..5e57cb1d 100644
--- a/qtjava/javalib/qtjava/QSignalMapper.cpp
+++ b/qtjava/javalib/qtjava/TQSignalMapper.cpp
@@ -3,7 +3,7 @@
 #include <tqsignalmapper.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QSignalMapper.h>
+#include <qtjava/TQSignalMapper.h>
 
 class TQSignalMapperJBridge : public TQSignalMapper
 {
diff --git a/qtjava/javalib/qtjava/QSignalMapper.h b/qtjava/javalib/qtjava/TQSignalMapper.h
index 833e86ee..833e86ee 100644
--- a/qtjava/javalib/qtjava/QSignalMapper.h
+++ b/qtjava/javalib/qtjava/TQSignalMapper.h
diff --git a/qtjava/javalib/qtjava/QSimpleRichText.cpp b/qtjava/javalib/qtjava/TQSimpleRichText.cpp
index 619056bb..13026fba 100644
--- a/qtjava/javalib/qtjava/QSimpleRichText.cpp
+++ b/qtjava/javalib/qtjava/TQSimpleRichText.cpp
@@ -9,7 +9,7 @@
 #include <tqcolor.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QSimpleRichText.h>
+#include <qtjava/TQSimpleRichText.h>
 
 class TQSimpleRichTextJBridge : public TQSimpleRichText
 {
diff --git a/qtjava/javalib/qtjava/QSimpleRichText.h b/qtjava/javalib/qtjava/TQSimpleRichText.h
index c54b1fd7..c54b1fd7 100644
--- a/qtjava/javalib/qtjava/QSimpleRichText.h
+++ b/qtjava/javalib/qtjava/TQSimpleRichText.h
diff --git a/qtjava/javalib/qtjava/QSize.cpp b/qtjava/javalib/qtjava/TQSize.cpp
index 55b2b84b..ee8400e5 100644
--- a/qtjava/javalib/qtjava/QSize.cpp
+++ b/qtjava/javalib/qtjava/TQSize.cpp
@@ -3,7 +3,7 @@
 #include <tqwindowdefs.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QSize.h>
+#include <qtjava/TQSize.h>
 
 class TQSizeJBridge : public TQSize
 {
diff --git a/qtjava/javalib/qtjava/QSize.h b/qtjava/javalib/qtjava/TQSize.h
index 2ccc4a9d..2ccc4a9d 100644
--- a/qtjava/javalib/qtjava/QSize.h
+++ b/qtjava/javalib/qtjava/TQSize.h
diff --git a/qtjava/javalib/qtjava/QSizeGrip.cpp b/qtjava/javalib/qtjava/TQSizeGrip.cpp
index 96e48a4a..b764c7db 100644
--- a/qtjava/javalib/qtjava/QSizeGrip.cpp
+++ b/qtjava/javalib/qtjava/TQSizeGrip.cpp
@@ -4,7 +4,7 @@
 #include <tqsizegrip.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QSizeGrip.h>
+#include <qtjava/TQSizeGrip.h>
 
 class TQSizeGripJBridge : public TQSizeGrip
 {
diff --git a/qtjava/javalib/qtjava/QSizeGrip.h b/qtjava/javalib/qtjava/TQSizeGrip.h
index c7325b6b..c7325b6b 100644
--- a/qtjava/javalib/qtjava/QSizeGrip.h
+++ b/qtjava/javalib/qtjava/TQSizeGrip.h
diff --git a/qtjava/javalib/qtjava/QSizePolicy.cpp b/qtjava/javalib/qtjava/TQSizePolicy.cpp
index 003527bf..d2b491a9 100644
--- a/qtjava/javalib/qtjava/QSizePolicy.cpp
+++ b/qtjava/javalib/qtjava/TQSizePolicy.cpp
@@ -2,7 +2,7 @@
 #include <tqsizepolicy.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QSizePolicy.h>
+#include <qtjava/TQSizePolicy.h>
 
 class TQSizePolicyJBridge : public TQSizePolicy
 {
diff --git a/qtjava/javalib/qtjava/QSizePolicy.h b/qtjava/javalib/qtjava/TQSizePolicy.h
index 07e346e5..07e346e5 100644
--- a/qtjava/javalib/qtjava/QSizePolicy.h
+++ b/qtjava/javalib/qtjava/TQSizePolicy.h
diff --git a/qtjava/javalib/qtjava/QSjisCodec.cpp b/qtjava/javalib/qtjava/TQSjisCodec.cpp
index 90cb47fd..5443d2f0 100644
--- a/qtjava/javalib/qtjava/QSjisCodec.cpp
+++ b/qtjava/javalib/qtjava/TQSjisCodec.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QSjisCodec.h>
+#include <qtjava/TQSjisCodec.h>
 
 class TQSjisCodecJBridge : public TQSjisCodec
 {
diff --git a/qtjava/javalib/qtjava/QSjisCodec.h b/qtjava/javalib/qtjava/TQSjisCodec.h
index 660086c9..660086c9 100644
--- a/qtjava/javalib/qtjava/QSjisCodec.h
+++ b/qtjava/javalib/qtjava/TQSjisCodec.h
diff --git a/qtjava/javalib/qtjava/QSlider.cpp b/qtjava/javalib/qtjava/TQSlider.cpp
index cacc99ec..f96f435e 100644
--- a/qtjava/javalib/qtjava/QSlider.cpp
+++ b/qtjava/javalib/qtjava/TQSlider.cpp
@@ -10,7 +10,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QSlider.h>
+#include <qtjava/TQSlider.h>
 
 class TQSliderJBridge : public TQSlider
 {
diff --git a/qtjava/javalib/qtjava/QSlider.h b/qtjava/javalib/qtjava/TQSlider.h
index 193a0060..193a0060 100644
--- a/qtjava/javalib/qtjava/QSlider.h
+++ b/qtjava/javalib/qtjava/TQSlider.h
diff --git a/qtjava/javalib/qtjava/QSocket.cpp b/qtjava/javalib/qtjava/TQSocket.cpp
index 96274858..49b505bb 100644
--- a/qtjava/javalib/qtjava/QSocket.cpp
+++ b/qtjava/javalib/qtjava/TQSocket.cpp
@@ -7,7 +7,7 @@
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QSocket.h>
+#include <qtjava/TQSocket.h>
 
 class TQSocketJBridge : public TQSocket
 {
diff --git a/qtjava/javalib/qtjava/QSocket.h b/qtjava/javalib/qtjava/TQSocket.h
index d7cbad9f..d7cbad9f 100644
--- a/qtjava/javalib/qtjava/QSocket.h
+++ b/qtjava/javalib/qtjava/TQSocket.h
diff --git a/qtjava/javalib/qtjava/QSocketDevice.cpp b/qtjava/javalib/qtjava/TQSocketDevice.cpp
index 8fecb9ea..72fc9c25 100644
--- a/qtjava/javalib/qtjava/QSocketDevice.cpp
+++ b/qtjava/javalib/qtjava/TQSocketDevice.cpp
@@ -5,7 +5,7 @@
 #include <tqhostaddress.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QSocketDevice.h>
+#include <qtjava/TQSocketDevice.h>
 
 class TQSocketDeviceJBridge : public TQSocketDevice
 {
diff --git a/qtjava/javalib/qtjava/QSocketDevice.h b/qtjava/javalib/qtjava/TQSocketDevice.h
index 2c95ddb4..2c95ddb4 100644
--- a/qtjava/javalib/qtjava/QSocketDevice.h
+++ b/qtjava/javalib/qtjava/TQSocketDevice.h
diff --git a/qtjava/javalib/qtjava/QSocketNotifier.cpp b/qtjava/javalib/qtjava/TQSocketNotifier.cpp
index 90054113..d0d67a9c 100644
--- a/qtjava/javalib/qtjava/QSocketNotifier.cpp
+++ b/qtjava/javalib/qtjava/TQSocketNotifier.cpp
@@ -3,7 +3,7 @@
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QSocketNotifier.h>
+#include <qtjava/TQSocketNotifier.h>
 
 class TQSocketNotifierJBridge : public TQSocketNotifier
 {
diff --git a/qtjava/javalib/qtjava/QSocketNotifier.h b/qtjava/javalib/qtjava/TQSocketNotifier.h
index 88e592d2..88e592d2 100644
--- a/qtjava/javalib/qtjava/QSocketNotifier.h
+++ b/qtjava/javalib/qtjava/TQSocketNotifier.h
diff --git a/qtjava/javalib/qtjava/QSound.cpp b/qtjava/javalib/qtjava/TQSound.cpp
index a80ac3ba..814464b3 100644
--- a/qtjava/javalib/qtjava/QSound.cpp
+++ b/qtjava/javalib/qtjava/TQSound.cpp
@@ -3,7 +3,7 @@
 #include <tqsound.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QSound.h>
+#include <qtjava/TQSound.h>
 
 class TQSoundJBridge : public TQSound
 {
diff --git a/qtjava/javalib/qtjava/QSound.h b/qtjava/javalib/qtjava/TQSound.h
index e9d608b1..e9d608b1 100644
--- a/qtjava/javalib/qtjava/QSound.h
+++ b/qtjava/javalib/qtjava/TQSound.h
diff --git a/qtjava/javalib/qtjava/QSpacerItem.cpp b/qtjava/javalib/qtjava/TQSpacerItem.cpp
index 8250ae7b..ec8ab0df 100644
--- a/qtjava/javalib/qtjava/QSpacerItem.cpp
+++ b/qtjava/javalib/qtjava/TQSpacerItem.cpp
@@ -5,7 +5,7 @@
 #include <tqsize.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QSpacerItem.h>
+#include <qtjava/TQSpacerItem.h>
 
 class TQSpacerItemJBridge : public TQSpacerItem
 {
diff --git a/qtjava/javalib/qtjava/QSpacerItem.h b/qtjava/javalib/qtjava/TQSpacerItem.h
index cce9726e..cce9726e 100644
--- a/qtjava/javalib/qtjava/QSpacerItem.h
+++ b/qtjava/javalib/qtjava/TQSpacerItem.h
diff --git a/qtjava/javalib/qtjava/QSpinBox.cpp b/qtjava/javalib/qtjava/TQSpinBox.cpp
index d4489a07..537024eb 100644
--- a/qtjava/javalib/qtjava/QSpinBox.cpp
+++ b/qtjava/javalib/qtjava/TQSpinBox.cpp
@@ -7,7 +7,7 @@
 #include <tqsize.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QSpinBox.h>
+#include <qtjava/TQSpinBox.h>
 
 class TQSpinBoxJBridge : public TQSpinBox
 {
diff --git a/qtjava/javalib/qtjava/QSpinBox.h b/qtjava/javalib/qtjava/TQSpinBox.h
index d5e25ccd..d5e25ccd 100644
--- a/qtjava/javalib/qtjava/QSpinBox.h
+++ b/qtjava/javalib/qtjava/TQSpinBox.h
diff --git a/qtjava/javalib/qtjava/QSpinWidget.cpp b/qtjava/javalib/qtjava/TQSpinWidget.cpp
index 336ce5e4..4f662b77 100644
--- a/qtjava/javalib/qtjava/QSpinWidget.cpp
+++ b/qtjava/javalib/qtjava/TQSpinWidget.cpp
@@ -5,7 +5,7 @@
 #include <tqrangecontrol.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QSpinWidget.h>
+#include <qtjava/TQSpinWidget.h>
 
 class TQSpinWidgetJBridge : public TQSpinWidget
 {
diff --git a/qtjava/javalib/qtjava/QSpinWidget.h b/qtjava/javalib/qtjava/TQSpinWidget.h
index 2f84c994..2f84c994 100644
--- a/qtjava/javalib/qtjava/QSpinWidget.h
+++ b/qtjava/javalib/qtjava/TQSpinWidget.h
diff --git a/qtjava/javalib/qtjava/QSplashScreen.cpp b/qtjava/javalib/qtjava/TQSplashScreen.cpp
index bd7fda8e..6368186a 100644
--- a/qtjava/javalib/qtjava/QSplashScreen.cpp
+++ b/qtjava/javalib/qtjava/TQSplashScreen.cpp
@@ -6,7 +6,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QSplashScreen.h>
+#include <qtjava/TQSplashScreen.h>
 
 class TQSplashScreenJBridge : public TQSplashScreen
 {
diff --git a/qtjava/javalib/qtjava/QSplashScreen.h b/qtjava/javalib/qtjava/TQSplashScreen.h
index 9ac015e7..9ac015e7 100644
--- a/qtjava/javalib/qtjava/QSplashScreen.h
+++ b/qtjava/javalib/qtjava/TQSplashScreen.h
diff --git a/qtjava/javalib/qtjava/QSplitter.cpp b/qtjava/javalib/qtjava/TQSplitter.cpp
index 48e468bb..aa6443e3 100644
--- a/qtjava/javalib/qtjava/QSplitter.cpp
+++ b/qtjava/javalib/qtjava/TQSplitter.cpp
@@ -7,7 +7,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QSplitter.h>
+#include <qtjava/TQSplitter.h>
 
 class TQSplitterJBridge : public TQSplitter
 {
diff --git a/qtjava/javalib/qtjava/QSplitter.h b/qtjava/javalib/qtjava/TQSplitter.h
index cf31a7c7..cf31a7c7 100644
--- a/qtjava/javalib/qtjava/QSplitter.h
+++ b/qtjava/javalib/qtjava/TQSplitter.h
diff --git a/qtjava/javalib/qtjava/QSql.cpp b/qtjava/javalib/qtjava/TQSql.cpp
index 35e6cc22..38c5eba9 100644
--- a/qtjava/javalib/qtjava/QSql.cpp
+++ b/qtjava/javalib/qtjava/TQSql.cpp
@@ -2,7 +2,7 @@
 #include <tqsql.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QSql.h>
+#include <qtjava/TQSql.h>
 
 class TQSqlJBridge : public TQSql
 {
diff --git a/qtjava/javalib/qtjava/QSql.h b/qtjava/javalib/qtjava/TQSql.h
index c03c0fd6..c03c0fd6 100644
--- a/qtjava/javalib/qtjava/QSql.h
+++ b/qtjava/javalib/qtjava/TQSql.h
diff --git a/qtjava/javalib/qtjava/QSqlCursor.cpp b/qtjava/javalib/qtjava/TQSqlCursor.cpp
index dc020b70..2772895c 100644
--- a/qtjava/javalib/qtjava/QSqlCursor.cpp
+++ b/qtjava/javalib/qtjava/TQSqlCursor.cpp
@@ -10,7 +10,7 @@
 #include <tqsqlquery.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QSqlCursor.h>
+#include <qtjava/TQSqlCursor.h>
 
 class TQSqlCursorJBridge : public TQSqlCursor
 {
diff --git a/qtjava/javalib/qtjava/QSqlCursor.h b/qtjava/javalib/qtjava/TQSqlCursor.h
index 89cf9c19..89cf9c19 100644
--- a/qtjava/javalib/qtjava/QSqlCursor.h
+++ b/qtjava/javalib/qtjava/TQSqlCursor.h
diff --git a/qtjava/javalib/qtjava/QSqlDatabase.cpp b/qtjava/javalib/qtjava/TQSqlDatabase.cpp
index d2a59275..22e87343 100644
--- a/qtjava/javalib/qtjava/QSqlDatabase.cpp
+++ b/qtjava/javalib/qtjava/TQSqlDatabase.cpp
@@ -9,7 +9,7 @@
 #include <tqsqlquery.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QSqlDatabase.h>
+#include <qtjava/TQSqlDatabase.h>
 
 class TQSqlDatabaseJBridge : public TQSqlDatabase
 {
diff --git a/qtjava/javalib/qtjava/QSqlDatabase.h b/qtjava/javalib/qtjava/TQSqlDatabase.h
index e36b4cdb..e36b4cdb 100644
--- a/qtjava/javalib/qtjava/QSqlDatabase.h
+++ b/qtjava/javalib/qtjava/TQSqlDatabase.h
diff --git a/qtjava/javalib/qtjava/QSqlDriver.cpp b/qtjava/javalib/qtjava/TQSqlDriver.cpp
index be9ceee1..0348ad10 100644
--- a/qtjava/javalib/qtjava/QSqlDriver.cpp
+++ b/qtjava/javalib/qtjava/TQSqlDriver.cpp
@@ -8,7 +8,7 @@
 #include <tqsqlquery.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QSqlDriver.h>
+#include <qtjava/TQSqlDriver.h>
 
 JNIEXPORT jboolean JNICALL
 Java_org_kde_qt_QSqlDriver_beginTransaction(JNIEnv* env, jobject obj)
diff --git a/qtjava/javalib/qtjava/QSqlDriver.h b/qtjava/javalib/qtjava/TQSqlDriver.h
index a5b65426..a5b65426 100644
--- a/qtjava/javalib/qtjava/QSqlDriver.h
+++ b/qtjava/javalib/qtjava/TQSqlDriver.h
diff --git a/qtjava/javalib/qtjava/QSqlEditorFactory.cpp b/qtjava/javalib/qtjava/TQSqlEditorFactory.cpp
index fd15499c..c6f6ae1a 100644
--- a/qtjava/javalib/qtjava/QSqlEditorFactory.cpp
+++ b/qtjava/javalib/qtjava/TQSqlEditorFactory.cpp
@@ -3,7 +3,7 @@
 #include <tqsqleditorfactory.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QSqlEditorFactory.h>
+#include <qtjava/TQSqlEditorFactory.h>
 
 class TQSqlEditorFactoryJBridge : public TQSqlEditorFactory
 {
diff --git a/qtjava/javalib/qtjava/QSqlEditorFactory.h b/qtjava/javalib/qtjava/TQSqlEditorFactory.h
index 2d21e22c..2d21e22c 100644
--- a/qtjava/javalib/qtjava/QSqlEditorFactory.h
+++ b/qtjava/javalib/qtjava/TQSqlEditorFactory.h
diff --git a/qtjava/javalib/qtjava/QSqlError.cpp b/qtjava/javalib/qtjava/TQSqlError.cpp
index b8a34399..9cad370a 100644
--- a/qtjava/javalib/qtjava/QSqlError.cpp
+++ b/qtjava/javalib/qtjava/TQSqlError.cpp
@@ -3,7 +3,7 @@
 #include <tqsqlerror.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QSqlError.h>
+#include <qtjava/TQSqlError.h>
 
 class TQSqlErrorJBridge : public TQSqlError
 {
diff --git a/qtjava/javalib/qtjava/QSqlError.h b/qtjava/javalib/qtjava/TQSqlError.h
index 3b236201..3b236201 100644
--- a/qtjava/javalib/qtjava/QSqlError.h
+++ b/qtjava/javalib/qtjava/TQSqlError.h
diff --git a/qtjava/javalib/qtjava/QSqlField.cpp b/qtjava/javalib/qtjava/TQSqlField.cpp
index 3f388f1f..c339a75f 100644
--- a/qtjava/javalib/qtjava/QSqlField.cpp
+++ b/qtjava/javalib/qtjava/TQSqlField.cpp
@@ -4,7 +4,7 @@
 #include <tqvariant.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QSqlField.h>
+#include <qtjava/TQSqlField.h>
 
 class TQSqlFieldJBridge : public TQSqlField
 {
diff --git a/qtjava/javalib/qtjava/QSqlField.h b/qtjava/javalib/qtjava/TQSqlField.h
index 2e6da3da..2e6da3da 100644
--- a/qtjava/javalib/qtjava/QSqlField.h
+++ b/qtjava/javalib/qtjava/TQSqlField.h
diff --git a/qtjava/javalib/qtjava/QSqlFieldInfo.cpp b/qtjava/javalib/qtjava/TQSqlFieldInfo.cpp
index b3ce74df..670fa519 100644
--- a/qtjava/javalib/qtjava/QSqlFieldInfo.cpp
+++ b/qtjava/javalib/qtjava/TQSqlFieldInfo.cpp
@@ -4,7 +4,7 @@
 #include <tqvariant.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QSqlFieldInfo.h>
+#include <qtjava/TQSqlFieldInfo.h>
 
 class TQSqlFieldInfoJBridge : public TQSqlFieldInfo
 {
diff --git a/qtjava/javalib/qtjava/QSqlFieldInfo.h b/qtjava/javalib/qtjava/TQSqlFieldInfo.h
index f2f88df3..f2f88df3 100644
--- a/qtjava/javalib/qtjava/QSqlFieldInfo.h
+++ b/qtjava/javalib/qtjava/TQSqlFieldInfo.h
diff --git a/qtjava/javalib/qtjava/QSqlForm.cpp b/qtjava/javalib/qtjava/TQSqlForm.cpp
index bafbb30d..896bc06a 100644
--- a/qtjava/javalib/qtjava/QSqlForm.cpp
+++ b/qtjava/javalib/qtjava/TQSqlForm.cpp
@@ -3,7 +3,7 @@
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QSqlForm.h>
+#include <qtjava/TQSqlForm.h>
 
 class TQSqlFormJBridge : public TQSqlForm
 {
diff --git a/qtjava/javalib/qtjava/QSqlForm.h b/qtjava/javalib/qtjava/TQSqlForm.h
index beb90a0c..beb90a0c 100644
--- a/qtjava/javalib/qtjava/QSqlForm.h
+++ b/qtjava/javalib/qtjava/TQSqlForm.h
diff --git a/qtjava/javalib/qtjava/QSqlIndex.cpp b/qtjava/javalib/qtjava/TQSqlIndex.cpp
index 5fbf290b..e0660023 100644
--- a/qtjava/javalib/qtjava/QSqlIndex.cpp
+++ b/qtjava/javalib/qtjava/TQSqlIndex.cpp
@@ -5,7 +5,7 @@
 #include <tqsqlfield.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QSqlIndex.h>
+#include <qtjava/TQSqlIndex.h>
 
 class TQSqlIndexJBridge : public TQSqlIndex
 {
diff --git a/qtjava/javalib/qtjava/QSqlIndex.h b/qtjava/javalib/qtjava/TQSqlIndex.h
index 0abe585a..0abe585a 100644
--- a/qtjava/javalib/qtjava/QSqlIndex.h
+++ b/qtjava/javalib/qtjava/TQSqlIndex.h
diff --git a/qtjava/javalib/qtjava/QSqlPropertyMap.cpp b/qtjava/javalib/qtjava/TQSqlPropertyMap.cpp
index 75668367..c3bad6e8 100644
--- a/qtjava/javalib/qtjava/QSqlPropertyMap.cpp
+++ b/qtjava/javalib/qtjava/TQSqlPropertyMap.cpp
@@ -4,7 +4,7 @@
 #include <tqsqlpropertymap.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QSqlPropertyMap.h>
+#include <qtjava/TQSqlPropertyMap.h>
 
 class TQSqlPropertyMapJBridge : public TQSqlPropertyMap
 {
diff --git a/qtjava/javalib/qtjava/QSqlPropertyMap.h b/qtjava/javalib/qtjava/TQSqlPropertyMap.h
index 944b566b..944b566b 100644
--- a/qtjava/javalib/qtjava/QSqlPropertyMap.h
+++ b/qtjava/javalib/qtjava/TQSqlPropertyMap.h
diff --git a/qtjava/javalib/qtjava/QSqlQuery.cpp b/qtjava/javalib/qtjava/TQSqlQuery.cpp
index 370cecf8..0ab1f738 100644
--- a/qtjava/javalib/qtjava/QSqlQuery.cpp
+++ b/qtjava/javalib/qtjava/TQSqlQuery.cpp
@@ -6,7 +6,7 @@
 #include <tqsqlquery.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QSqlQuery.h>
+#include <qtjava/TQSqlQuery.h>
 
 class TQSqlQueryJBridge : public TQSqlQuery
 {
diff --git a/qtjava/javalib/qtjava/QSqlQuery.h b/qtjava/javalib/qtjava/TQSqlQuery.h
index 13acb74d..13acb74d 100644
--- a/qtjava/javalib/qtjava/QSqlQuery.h
+++ b/qtjava/javalib/qtjava/TQSqlQuery.h
diff --git a/qtjava/javalib/qtjava/QSqlRecord.cpp b/qtjava/javalib/qtjava/TQSqlRecord.cpp
index 31897bd1..10b1fdc2 100644
--- a/qtjava/javalib/qtjava/QSqlRecord.cpp
+++ b/qtjava/javalib/qtjava/TQSqlRecord.cpp
@@ -6,7 +6,7 @@
 #include <tqvariant.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QSqlRecord.h>
+#include <qtjava/TQSqlRecord.h>
 
 class TQSqlRecordJBridge : public TQSqlRecord
 {
diff --git a/qtjava/javalib/qtjava/QSqlRecord.h b/qtjava/javalib/qtjava/TQSqlRecord.h
index a7c3fc21..a7c3fc21 100644
--- a/qtjava/javalib/qtjava/QSqlRecord.h
+++ b/qtjava/javalib/qtjava/TQSqlRecord.h
diff --git a/qtjava/javalib/qtjava/QSqlResult.cpp b/qtjava/javalib/qtjava/TQSqlResult.cpp
index 0304fec2..04ed9140 100644
--- a/qtjava/javalib/qtjava/QSqlResult.cpp
+++ b/qtjava/javalib/qtjava/TQSqlResult.cpp
@@ -2,5 +2,5 @@
 #include <tqsqlresult.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QSqlResult.h>
+#include <qtjava/TQSqlResult.h>
 
diff --git a/qtjava/javalib/qtjava/QSqlResult.h b/qtjava/javalib/qtjava/TQSqlResult.h
index 1e30e23c..1e30e23c 100644
--- a/qtjava/javalib/qtjava/QSqlResult.h
+++ b/qtjava/javalib/qtjava/TQSqlResult.h
diff --git a/qtjava/javalib/qtjava/QStatusBar.cpp b/qtjava/javalib/qtjava/TQStatusBar.cpp
index e6f8e038..b90a8792 100644
--- a/qtjava/javalib/qtjava/QStatusBar.cpp
+++ b/qtjava/javalib/qtjava/TQStatusBar.cpp
@@ -3,7 +3,7 @@
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QStatusBar.h>
+#include <qtjava/TQStatusBar.h>
 
 class TQStatusBarJBridge : public TQStatusBar
 {
diff --git a/qtjava/javalib/qtjava/QStatusBar.h b/qtjava/javalib/qtjava/TQStatusBar.h
index 3ae80233..3ae80233 100644
--- a/qtjava/javalib/qtjava/QStatusBar.h
+++ b/qtjava/javalib/qtjava/TQStatusBar.h
diff --git a/qtjava/javalib/qtjava/QStoredDrag.cpp b/qtjava/javalib/qtjava/TQStoredDrag.cpp
index 78822239..b5664e1b 100644
--- a/qtjava/javalib/qtjava/QStoredDrag.cpp
+++ b/qtjava/javalib/qtjava/TQStoredDrag.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QStoredDrag.h>
+#include <qtjava/TQStoredDrag.h>
 
 class TQStoredDragJBridge : public TQStoredDrag
 {
diff --git a/qtjava/javalib/qtjava/QStoredDrag.h b/qtjava/javalib/qtjava/TQStoredDrag.h
index 253cb968..253cb968 100644
--- a/qtjava/javalib/qtjava/QStoredDrag.h
+++ b/qtjava/javalib/qtjava/TQStoredDrag.h
diff --git a/qtjava/javalib/qtjava/QStyle.cpp b/qtjava/javalib/qtjava/TQStyle.cpp
index 9ef32015..836fde0d 100644
--- a/qtjava/javalib/qtjava/QStyle.cpp
+++ b/qtjava/javalib/qtjava/TQStyle.cpp
@@ -8,7 +8,7 @@
 #include <tqpixmap.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QStyle.h>
+#include <qtjava/TQStyle.h>
 
 JNIEXPORT jstring JNICALL
 Java_org_kde_qt_QStyle_className(JNIEnv* env, jobject obj)
diff --git a/qtjava/javalib/qtjava/QStyle.h b/qtjava/javalib/qtjava/TQStyle.h
index da58571f..da58571f 100644
--- a/qtjava/javalib/qtjava/QStyle.h
+++ b/qtjava/javalib/qtjava/TQStyle.h
diff --git a/qtjava/javalib/qtjava/QStyleFactory.cpp b/qtjava/javalib/qtjava/TQStyleFactory.cpp
index 98b45aa7..232d27a3 100644
--- a/qtjava/javalib/qtjava/QStyleFactory.cpp
+++ b/qtjava/javalib/qtjava/TQStyleFactory.cpp
@@ -4,7 +4,7 @@
 #include <tqstringlist.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QStyleFactory.h>
+#include <qtjava/TQStyleFactory.h>
 
 class TQStyleFactoryJBridge : public TQStyleFactory
 {
diff --git a/qtjava/javalib/qtjava/QStyleFactory.h b/qtjava/javalib/qtjava/TQStyleFactory.h
index 5079ac3d..5079ac3d 100644
--- a/qtjava/javalib/qtjava/QStyleFactory.h
+++ b/qtjava/javalib/qtjava/TQStyleFactory.h
diff --git a/qtjava/javalib/qtjava/QStyleOption.cpp b/qtjava/javalib/qtjava/TQStyleOption.cpp
index 8b5d42cb..8c821bc7 100644
--- a/qtjava/javalib/qtjava/QStyleOption.cpp
+++ b/qtjava/javalib/qtjava/TQStyleOption.cpp
@@ -5,7 +5,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QStyleOption.h>
+#include <qtjava/TQStyleOption.h>
 
 class TQStyleOptionJBridge : public TQStyleOption
 {
diff --git a/qtjava/javalib/qtjava/QStyleOption.h b/qtjava/javalib/qtjava/TQStyleOption.h
index 4bdd25ca..4bdd25ca 100644
--- a/qtjava/javalib/qtjava/QStyleOption.h
+++ b/qtjava/javalib/qtjava/TQStyleOption.h
diff --git a/qtjava/javalib/qtjava/QStyleSheet.cpp b/qtjava/javalib/qtjava/TQStyleSheet.cpp
index db34a950..9afa5cfe 100644
--- a/qtjava/javalib/qtjava/QStyleSheet.cpp
+++ b/qtjava/javalib/qtjava/TQStyleSheet.cpp
@@ -5,7 +5,7 @@
 #include <tqmime.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QStyleSheet.h>
+#include <qtjava/TQStyleSheet.h>
 
 class TQStyleSheetJBridge : public TQStyleSheet
 {
diff --git a/qtjava/javalib/qtjava/QStyleSheet.h b/qtjava/javalib/qtjava/TQStyleSheet.h
index ea60cc16..ea60cc16 100644
--- a/qtjava/javalib/qtjava/QStyleSheet.h
+++ b/qtjava/javalib/qtjava/TQStyleSheet.h
diff --git a/qtjava/javalib/qtjava/QStyleSheetItem.cpp b/qtjava/javalib/qtjava/TQStyleSheetItem.cpp
index 005d0879..95ff6d7f 100644
--- a/qtjava/javalib/qtjava/QStyleSheetItem.cpp
+++ b/qtjava/javalib/qtjava/TQStyleSheetItem.cpp
@@ -4,7 +4,7 @@
 #include <tqcolor.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QStyleSheetItem.h>
+#include <qtjava/TQStyleSheetItem.h>
 
 class TQStyleSheetItemJBridge : public TQStyleSheetItem
 {
diff --git a/qtjava/javalib/qtjava/QStyleSheetItem.h b/qtjava/javalib/qtjava/TQStyleSheetItem.h
index d5110810..d5110810 100644
--- a/qtjava/javalib/qtjava/QStyleSheetItem.h
+++ b/qtjava/javalib/qtjava/TQStyleSheetItem.h
diff --git a/qtjava/javalib/qtjava/QSyntaxHighlighter.cpp b/qtjava/javalib/qtjava/TQSyntaxHighlighter.cpp
index a476d838..ff5cf216 100644
--- a/qtjava/javalib/qtjava/QSyntaxHighlighter.cpp
+++ b/qtjava/javalib/qtjava/TQSyntaxHighlighter.cpp
@@ -5,7 +5,7 @@
 #include <tqcolor.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QSyntaxHighlighter.h>
+#include <qtjava/TQSyntaxHighlighter.h>
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QSyntaxHighlighter_currentParagraph(JNIEnv* env, jobject obj)
diff --git a/qtjava/javalib/qtjava/QSyntaxHighlighter.h b/qtjava/javalib/qtjava/TQSyntaxHighlighter.h
index f14047c1..f14047c1 100644
--- a/qtjava/javalib/qtjava/QSyntaxHighlighter.h
+++ b/qtjava/javalib/qtjava/TQSyntaxHighlighter.h
diff --git a/qtjava/javalib/qtjava/QTab.cpp b/qtjava/javalib/qtjava/TQTab.cpp
index f685497b..0f481b14 100644
--- a/qtjava/javalib/qtjava/QTab.cpp
+++ b/qtjava/javalib/qtjava/TQTab.cpp
@@ -5,7 +5,7 @@
 #include <tqiconset.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QTab.h>
+#include <qtjava/TQTab.h>
 
 class TQTabJBridge : public TQTab
 {
diff --git a/qtjava/javalib/qtjava/QTab.h b/qtjava/javalib/qtjava/TQTab.h
index 0491aa4b..0491aa4b 100644
--- a/qtjava/javalib/qtjava/QTab.h
+++ b/qtjava/javalib/qtjava/TQTab.h
diff --git a/qtjava/javalib/qtjava/QTabBar.cpp b/qtjava/javalib/qtjava/TQTabBar.cpp
index 929e0b76..5147e34f 100644
--- a/qtjava/javalib/qtjava/QTabBar.cpp
+++ b/qtjava/javalib/qtjava/TQTabBar.cpp
@@ -8,7 +8,7 @@
 #include <tqfont.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QTabBar.h>
+#include <qtjava/TQTabBar.h>
 
 class TQTabBarJBridge : public TQTabBar
 {
diff --git a/qtjava/javalib/qtjava/QTabBar.h b/qtjava/javalib/qtjava/TQTabBar.h
index bf21b353..bf21b353 100644
--- a/qtjava/javalib/qtjava/QTabBar.h
+++ b/qtjava/javalib/qtjava/TQTabBar.h
diff --git a/qtjava/javalib/qtjava/QTabDialog.cpp b/qtjava/javalib/qtjava/TQTabDialog.cpp
index 940296f2..ed140d99 100644
--- a/qtjava/javalib/qtjava/QTabDialog.cpp
+++ b/qtjava/javalib/qtjava/TQTabDialog.cpp
@@ -7,7 +7,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QTabDialog.h>
+#include <qtjava/TQTabDialog.h>
 
 class TQTabDialogJBridge : public TQTabDialog
 {
diff --git a/qtjava/javalib/qtjava/QTabDialog.h b/qtjava/javalib/qtjava/TQTabDialog.h
index 7b3b7625..7b3b7625 100644
--- a/qtjava/javalib/qtjava/QTabDialog.h
+++ b/qtjava/javalib/qtjava/TQTabDialog.h
diff --git a/qtjava/javalib/qtjava/QTabWidget.cpp b/qtjava/javalib/qtjava/TQTabWidget.cpp
index a610cdc7..273314f7 100644
--- a/qtjava/javalib/qtjava/QTabWidget.cpp
+++ b/qtjava/javalib/qtjava/TQTabWidget.cpp
@@ -7,7 +7,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QTabWidget.h>
+#include <qtjava/TQTabWidget.h>
 
 class TQTabWidgetJBridge : public TQTabWidget
 {
diff --git a/qtjava/javalib/qtjava/QTabWidget.h b/qtjava/javalib/qtjava/TQTabWidget.h
index ba0e7434..ba0e7434 100644
--- a/qtjava/javalib/qtjava/QTabWidget.h
+++ b/qtjava/javalib/qtjava/TQTabWidget.h
diff --git a/qtjava/javalib/qtjava/QTable.cpp b/qtjava/javalib/qtjava/TQTable.cpp
index 4f096f76..dc74d32a 100644
--- a/qtjava/javalib/qtjava/QTable.cpp
+++ b/qtjava/javalib/qtjava/TQTable.cpp
@@ -9,7 +9,7 @@
 #include <tqpixmap.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QTable.h>
+#include <qtjava/TQTable.h>
 
 class TQTableJBridge : public TQTable
 {
diff --git a/qtjava/javalib/qtjava/QTable.h b/qtjava/javalib/qtjava/TQTable.h
index 9e67642e..9e67642e 100644
--- a/qtjava/javalib/qtjava/QTable.h
+++ b/qtjava/javalib/qtjava/TQTable.h
diff --git a/qtjava/javalib/qtjava/QTableItem.cpp b/qtjava/javalib/qtjava/TQTableItem.cpp
index b5615c5b..60dfa7d8 100644
--- a/qtjava/javalib/qtjava/QTableItem.cpp
+++ b/qtjava/javalib/qtjava/TQTableItem.cpp
@@ -7,7 +7,7 @@
 #include <tqpixmap.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QTableItem.h>
+#include <qtjava/TQTableItem.h>
 
 class TQTableItemJBridge : public TQTableItem
 {
diff --git a/qtjava/javalib/qtjava/QTableItem.h b/qtjava/javalib/qtjava/TQTableItem.h
index 8ea9e4bd..8ea9e4bd 100644
--- a/qtjava/javalib/qtjava/QTableItem.h
+++ b/qtjava/javalib/qtjava/TQTableItem.h
diff --git a/qtjava/javalib/qtjava/QTableSelection.cpp b/qtjava/javalib/qtjava/TQTableSelection.cpp
index 4fd2064a..fea05cc1 100644
--- a/qtjava/javalib/qtjava/QTableSelection.cpp
+++ b/qtjava/javalib/qtjava/TQTableSelection.cpp
@@ -2,7 +2,7 @@
 #include <tqtable.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QTableSelection.h>
+#include <qtjava/TQTableSelection.h>
 
 class TQTableSelectionJBridge : public TQTableSelection
 {
diff --git a/qtjava/javalib/qtjava/QTableSelection.h b/qtjava/javalib/qtjava/TQTableSelection.h
index e4cfd3e8..e4cfd3e8 100644
--- a/qtjava/javalib/qtjava/QTableSelection.h
+++ b/qtjava/javalib/qtjava/TQTableSelection.h
diff --git a/qtjava/javalib/qtjava/QTabletEvent.cpp b/qtjava/javalib/qtjava/TQTabletEvent.cpp
index 2a5069a8..8ce09c92 100644
--- a/qtjava/javalib/qtjava/QTabletEvent.cpp
+++ b/qtjava/javalib/qtjava/TQTabletEvent.cpp
@@ -3,7 +3,7 @@
 #include <tqevent.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QTabletEvent.h>
+#include <qtjava/TQTabletEvent.h>
 
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QTabletEvent_accept(JNIEnv* env, jobject obj)
diff --git a/qtjava/javalib/qtjava/QTabletEvent.h b/qtjava/javalib/qtjava/TQTabletEvent.h
index 490660ad..490660ad 100644
--- a/qtjava/javalib/qtjava/QTabletEvent.h
+++ b/qtjava/javalib/qtjava/TQTabletEvent.h
diff --git a/qtjava/javalib/qtjava/QTextBrowser.cpp b/qtjava/javalib/qtjava/TQTextBrowser.cpp
index e6faa3f4..544977a7 100644
--- a/qtjava/javalib/qtjava/QTextBrowser.cpp
+++ b/qtjava/javalib/qtjava/TQTextBrowser.cpp
@@ -3,7 +3,7 @@
 #include <tqtextbrowser.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QTextBrowser.h>
+#include <qtjava/TQTextBrowser.h>
 
 class TQTextBrowserJBridge : public TQTextBrowser
 {
diff --git a/qtjava/javalib/qtjava/QTextBrowser.h b/qtjava/javalib/qtjava/TQTextBrowser.h
index 43a62f15..43a62f15 100644
--- a/qtjava/javalib/qtjava/QTextBrowser.h
+++ b/qtjava/javalib/qtjava/TQTextBrowser.h
diff --git a/qtjava/javalib/qtjava/QTextCodec.cpp b/qtjava/javalib/qtjava/TQTextCodec.cpp
index 888f1171..ae9b384b 100644
--- a/qtjava/javalib/qtjava/QTextCodec.cpp
+++ b/qtjava/javalib/qtjava/TQTextCodec.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QTextCodec.h>
+#include <qtjava/TQTextCodec.h>
 
 JNIEXPORT jboolean JNICALL
 Java_org_kde_qt_QTextCodec_canEncode__C(JNIEnv* env, jobject obj, jchar arg1)
diff --git a/qtjava/javalib/qtjava/QTextCodec.h b/qtjava/javalib/qtjava/TQTextCodec.h
index 78091798..78091798 100644
--- a/qtjava/javalib/qtjava/QTextCodec.h
+++ b/qtjava/javalib/qtjava/TQTextCodec.h
diff --git a/qtjava/javalib/qtjava/QTextDecoder.cpp b/qtjava/javalib/qtjava/TQTextDecoder.cpp
index 8fa70b6d..63339de3 100644
--- a/qtjava/javalib/qtjava/QTextDecoder.cpp
+++ b/qtjava/javalib/qtjava/TQTextDecoder.cpp
@@ -3,7 +3,7 @@
 #include <tqtextcodec.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QTextDecoder.h>
+#include <qtjava/TQTextDecoder.h>
 
 JNIEXPORT jstring JNICALL
 Java_org_kde_qt_QTextDecoder_toUnicode(JNIEnv* env, jobject obj, jstring chars, jint len)
diff --git a/qtjava/javalib/qtjava/QTextDecoder.h b/qtjava/javalib/qtjava/TQTextDecoder.h
index f91bb8d4..f91bb8d4 100644
--- a/qtjava/javalib/qtjava/QTextDecoder.h
+++ b/qtjava/javalib/qtjava/TQTextDecoder.h
diff --git a/qtjava/javalib/qtjava/QTextDrag.cpp b/qtjava/javalib/qtjava/TQTextDrag.cpp
index 1eed4172..585cbd77 100644
--- a/qtjava/javalib/qtjava/QTextDrag.cpp
+++ b/qtjava/javalib/qtjava/TQTextDrag.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QTextDrag.h>
+#include <qtjava/TQTextDrag.h>
 
 class TQTextDragJBridge : public TQTextDrag
 {
diff --git a/qtjava/javalib/qtjava/QTextDrag.h b/qtjava/javalib/qtjava/TQTextDrag.h
index bb369b4a..bb369b4a 100644
--- a/qtjava/javalib/qtjava/QTextDrag.h
+++ b/qtjava/javalib/qtjava/TQTextDrag.h
diff --git a/qtjava/javalib/qtjava/QTextEdit.cpp b/qtjava/javalib/qtjava/TQTextEdit.cpp
index 46cdeffa..56ae8149 100644
--- a/qtjava/javalib/qtjava/QTextEdit.cpp
+++ b/qtjava/javalib/qtjava/TQTextEdit.cpp
@@ -13,7 +13,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QTextEdit.h>
+#include <qtjava/TQTextEdit.h>
 
 class TQTextEditJBridge : public TQTextEdit
 {
diff --git a/qtjava/javalib/qtjava/QTextEdit.h b/qtjava/javalib/qtjava/TQTextEdit.h
index 36b34653..36b34653 100644
--- a/qtjava/javalib/qtjava/QTextEdit.h
+++ b/qtjava/javalib/qtjava/TQTextEdit.h
diff --git a/qtjava/javalib/qtjava/QTextEncoder.cpp b/qtjava/javalib/qtjava/TQTextEncoder.cpp
index e1f96a90..1fe136ce 100644
--- a/qtjava/javalib/qtjava/QTextEncoder.cpp
+++ b/qtjava/javalib/qtjava/TQTextEncoder.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QTextEncoder.h>
+#include <qtjava/TQTextEncoder.h>
 
 JNIEXPORT jstring JNICALL
 Java_org_kde_qt_QTextEncoder_fromUnicode(JNIEnv* env, jobject obj, jstring uc, jintArray lenInOut)
diff --git a/qtjava/javalib/qtjava/QTextEncoder.h b/qtjava/javalib/qtjava/TQTextEncoder.h
index 82fc6498..82fc6498 100644
--- a/qtjava/javalib/qtjava/QTextEncoder.h
+++ b/qtjava/javalib/qtjava/TQTextEncoder.h
diff --git a/qtjava/javalib/qtjava/QTextIStream.cpp b/qtjava/javalib/qtjava/TQTextIStream.cpp
index af035412..6348ea45 100644
--- a/qtjava/javalib/qtjava/QTextIStream.cpp
+++ b/qtjava/javalib/qtjava/TQTextIStream.cpp
@@ -3,7 +3,7 @@
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QTextIStream.h>
+#include <qtjava/TQTextIStream.h>
 
 class TQTextIStreamJBridge : public TQTextIStream
 {
diff --git a/qtjava/javalib/qtjava/QTextIStream.h b/qtjava/javalib/qtjava/TQTextIStream.h
index 5f327dc6..5f327dc6 100644
--- a/qtjava/javalib/qtjava/QTextIStream.h
+++ b/qtjava/javalib/qtjava/TQTextIStream.h
diff --git a/qtjava/javalib/qtjava/QTextOStream.cpp b/qtjava/javalib/qtjava/TQTextOStream.cpp
index eb00d7bc..9d1dad60 100644
--- a/qtjava/javalib/qtjava/QTextOStream.cpp
+++ b/qtjava/javalib/qtjava/TQTextOStream.cpp
@@ -3,7 +3,7 @@
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QTextOStream.h>
+#include <qtjava/TQTextOStream.h>
 
 class TQTextOStreamJBridge : public TQTextOStream
 {
diff --git a/qtjava/javalib/qtjava/QTextOStream.h b/qtjava/javalib/qtjava/TQTextOStream.h
index 07742679..07742679 100644
--- a/qtjava/javalib/qtjava/QTextOStream.h
+++ b/qtjava/javalib/qtjava/TQTextOStream.h
diff --git a/qtjava/javalib/qtjava/QTextStream.cpp b/qtjava/javalib/qtjava/TQTextStream.cpp
index 9d014437..d7ef6b29 100644
--- a/qtjava/javalib/qtjava/QTextStream.cpp
+++ b/qtjava/javalib/qtjava/TQTextStream.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QTextStream.h>
+#include <qtjava/TQTextStream.h>
 
 class TQTextStreamJBridge : public TQTextStream
 {
diff --git a/qtjava/javalib/qtjava/QTextStream.h b/qtjava/javalib/qtjava/TQTextStream.h
index a243951d..a243951d 100644
--- a/qtjava/javalib/qtjava/QTextStream.h
+++ b/qtjava/javalib/qtjava/TQTextStream.h
diff --git a/qtjava/javalib/qtjava/QTextView.cpp b/qtjava/javalib/qtjava/TQTextView.cpp
index 2c37349d..da6c858a 100644
--- a/qtjava/javalib/qtjava/QTextView.cpp
+++ b/qtjava/javalib/qtjava/TQTextView.cpp
@@ -3,7 +3,7 @@
 #include <tqtextview.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QTextView.h>
+#include <qtjava/TQTextView.h>
 
 class TQTextViewJBridge : public TQTextView
 {
diff --git a/qtjava/javalib/qtjava/QTextView.h b/qtjava/javalib/qtjava/TQTextView.h
index 9912cff2..9912cff2 100644
--- a/qtjava/javalib/qtjava/QTextView.h
+++ b/qtjava/javalib/qtjava/TQTextView.h
diff --git a/qtjava/javalib/qtjava/QTimeEdit.cpp b/qtjava/javalib/qtjava/TQTimeEdit.cpp
index 32ea6fbc..279b768a 100644
--- a/qtjava/javalib/qtjava/QTimeEdit.cpp
+++ b/qtjava/javalib/qtjava/TQTimeEdit.cpp
@@ -5,7 +5,7 @@
 #include <tqdatetimeedit.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QTimeEdit.h>
+#include <qtjava/TQTimeEdit.h>
 
 class TQTimeEditJBridge : public TQTimeEdit
 {
diff --git a/qtjava/javalib/qtjava/QTimeEdit.h b/qtjava/javalib/qtjava/TQTimeEdit.h
index 8ec8cda8..8ec8cda8 100644
--- a/qtjava/javalib/qtjava/QTimeEdit.h
+++ b/qtjava/javalib/qtjava/TQTimeEdit.h
diff --git a/qtjava/javalib/qtjava/QTimer.cpp b/qtjava/javalib/qtjava/TQTimer.cpp
index 09dd98ac..019fe614 100644
--- a/qtjava/javalib/qtjava/QTimer.cpp
+++ b/qtjava/javalib/qtjava/TQTimer.cpp
@@ -3,7 +3,7 @@
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QTimer.h>
+#include <qtjava/TQTimer.h>
 
 class TQTimerJBridge : public TQTimer
 {
diff --git a/qtjava/javalib/qtjava/QTimer.h b/qtjava/javalib/qtjava/TQTimer.h
index 0202ab36..0202ab36 100644
--- a/qtjava/javalib/qtjava/QTimer.h
+++ b/qtjava/javalib/qtjava/TQTimer.h
diff --git a/qtjava/javalib/qtjava/QTimerEvent.cpp b/qtjava/javalib/qtjava/TQTimerEvent.cpp
index 2a597353..aadd9ae2 100644
--- a/qtjava/javalib/qtjava/QTimerEvent.cpp
+++ b/qtjava/javalib/qtjava/TQTimerEvent.cpp
@@ -2,7 +2,7 @@
 #include <tqevent.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QTimerEvent.h>
+#include <qtjava/TQTimerEvent.h>
 
 class TQTimerEventJBridge : public TQTimerEvent
 {
diff --git a/qtjava/javalib/qtjava/QTimerEvent.h b/qtjava/javalib/qtjava/TQTimerEvent.h
index 61030922..61030922 100644
--- a/qtjava/javalib/qtjava/QTimerEvent.h
+++ b/qtjava/javalib/qtjava/TQTimerEvent.h
diff --git a/qtjava/javalib/qtjava/QToolBar.cpp b/qtjava/javalib/qtjava/TQToolBar.cpp
index ee814fee..2c6e841a 100644
--- a/qtjava/javalib/qtjava/QToolBar.cpp
+++ b/qtjava/javalib/qtjava/TQToolBar.cpp
@@ -6,7 +6,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QToolBar.h>
+#include <qtjava/TQToolBar.h>
 
 class TQToolBarJBridge : public TQToolBar
 {
diff --git a/qtjava/javalib/qtjava/QToolBar.h b/qtjava/javalib/qtjava/TQToolBar.h
index 5103f9e6..5103f9e6 100644
--- a/qtjava/javalib/qtjava/QToolBar.h
+++ b/qtjava/javalib/qtjava/TQToolBar.h
diff --git a/qtjava/javalib/qtjava/QToolBox.cpp b/qtjava/javalib/qtjava/TQToolBox.cpp
index 11a6f3c1..7cb8d25b 100644
--- a/qtjava/javalib/qtjava/QToolBox.cpp
+++ b/qtjava/javalib/qtjava/TQToolBox.cpp
@@ -6,7 +6,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QToolBox.h>
+#include <qtjava/TQToolBox.h>
 
 class TQToolBoxJBridge : public TQToolBox
 {
diff --git a/qtjava/javalib/qtjava/QToolBox.h b/qtjava/javalib/qtjava/TQToolBox.h
index da974a02..da974a02 100644
--- a/qtjava/javalib/qtjava/QToolBox.h
+++ b/qtjava/javalib/qtjava/TQToolBox.h
diff --git a/qtjava/javalib/qtjava/QToolButton.cpp b/qtjava/javalib/qtjava/TQToolButton.cpp
index 5f83e7c2..c4cb619a 100644
--- a/qtjava/javalib/qtjava/QToolButton.cpp
+++ b/qtjava/javalib/qtjava/TQToolButton.cpp
@@ -7,7 +7,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QToolButton.h>
+#include <qtjava/TQToolButton.h>
 
 class TQToolButtonJBridge : public TQToolButton
 {
diff --git a/qtjava/javalib/qtjava/QToolButton.h b/qtjava/javalib/qtjava/TQToolButton.h
index a9926a48..a9926a48 100644
--- a/qtjava/javalib/qtjava/QToolButton.h
+++ b/qtjava/javalib/qtjava/TQToolButton.h
diff --git a/qtjava/javalib/qtjava/QToolTip.cpp b/qtjava/javalib/qtjava/TQToolTip.cpp
index 1babfe73..79d95bc3 100644
--- a/qtjava/javalib/qtjava/QToolTip.cpp
+++ b/qtjava/javalib/qtjava/TQToolTip.cpp
@@ -7,7 +7,7 @@
 #include <tqfont.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QToolTip.h>
+#include <qtjava/TQToolTip.h>
 
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QToolTip_add__Lorg_kde_qt_QWidget_2Ljava_lang_String_2(JNIEnv* env, jclass cls, jobject arg1, jstring arg2)
diff --git a/qtjava/javalib/qtjava/QToolTip.h b/qtjava/javalib/qtjava/TQToolTip.h
index 37e92df3..37e92df3 100644
--- a/qtjava/javalib/qtjava/QToolTip.h
+++ b/qtjava/javalib/qtjava/TQToolTip.h
diff --git a/qtjava/javalib/qtjava/QToolTipGroup.cpp b/qtjava/javalib/qtjava/TQToolTipGroup.cpp
index 81a76319..25df71a7 100644
--- a/qtjava/javalib/qtjava/QToolTipGroup.cpp
+++ b/qtjava/javalib/qtjava/TQToolTipGroup.cpp
@@ -3,7 +3,7 @@
 #include <tqtooltip.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QToolTipGroup.h>
+#include <qtjava/TQToolTipGroup.h>
 
 class TQToolTipGroupJBridge : public TQToolTipGroup
 {
diff --git a/qtjava/javalib/qtjava/QToolTipGroup.h b/qtjava/javalib/qtjava/TQToolTipGroup.h
index 3f9e9084..3f9e9084 100644
--- a/qtjava/javalib/qtjava/QToolTipGroup.h
+++ b/qtjava/javalib/qtjava/TQToolTipGroup.h
diff --git a/qtjava/javalib/qtjava/QTranslator.cpp b/qtjava/javalib/qtjava/TQTranslator.cpp
index d86fe15a..3e4f43e1 100644
--- a/qtjava/javalib/qtjava/QTranslator.cpp
+++ b/qtjava/javalib/qtjava/TQTranslator.cpp
@@ -3,7 +3,7 @@
 #include <tqtranslator.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QTranslator.h>
+#include <qtjava/TQTranslator.h>
 
 class TQTranslatorJBridge : public TQTranslator
 {
diff --git a/qtjava/javalib/qtjava/QTranslator.h b/qtjava/javalib/qtjava/TQTranslator.h
index 65e4363d..65e4363d 100644
--- a/qtjava/javalib/qtjava/QTranslator.h
+++ b/qtjava/javalib/qtjava/TQTranslator.h
diff --git a/qtjava/javalib/qtjava/QTranslatorMessage.cpp b/qtjava/javalib/qtjava/TQTranslatorMessage.cpp
index a147ddb5..33074aa9 100644
--- a/qtjava/javalib/qtjava/QTranslatorMessage.cpp
+++ b/qtjava/javalib/qtjava/TQTranslatorMessage.cpp
@@ -4,7 +4,7 @@
 #include <tqtranslator.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QTranslatorMessage.h>
+#include <qtjava/TQTranslatorMessage.h>
 
 class TQTranslatorMessageJBridge : public TQTranslatorMessage
 {
diff --git a/qtjava/javalib/qtjava/QTranslatorMessage.h b/qtjava/javalib/qtjava/TQTranslatorMessage.h
index 8a8087f1..8a8087f1 100644
--- a/qtjava/javalib/qtjava/QTranslatorMessage.h
+++ b/qtjava/javalib/qtjava/TQTranslatorMessage.h
diff --git a/qtjava/javalib/qtjava/QTsciiCodec.cpp b/qtjava/javalib/qtjava/TQTsciiCodec.cpp
index 969ce853..130859b5 100644
--- a/qtjava/javalib/qtjava/QTsciiCodec.cpp
+++ b/qtjava/javalib/qtjava/TQTsciiCodec.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QTsciiCodec.h>
+#include <qtjava/TQTsciiCodec.h>
 
 class TQTsciiCodecJBridge : public TQTsciiCodec
 {
diff --git a/qtjava/javalib/qtjava/QTsciiCodec.h b/qtjava/javalib/qtjava/TQTsciiCodec.h
index 761c1865..761c1865 100644
--- a/qtjava/javalib/qtjava/QTsciiCodec.h
+++ b/qtjava/javalib/qtjava/TQTsciiCodec.h
diff --git a/qtjava/javalib/qtjava/QUriDrag.cpp b/qtjava/javalib/qtjava/TQUriDrag.cpp
index d542f9b1..ddd40ec6 100644
--- a/qtjava/javalib/qtjava/QUriDrag.cpp
+++ b/qtjava/javalib/qtjava/TQUriDrag.cpp
@@ -6,7 +6,7 @@
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QUriDrag.h>
+#include <qtjava/TQUriDrag.h>
 
 class TQUriDragJBridge : public TQUriDrag
 {
diff --git a/qtjava/javalib/qtjava/QUriDrag.h b/qtjava/javalib/qtjava/TQUriDrag.h
index 28ea2fce..28ea2fce 100644
--- a/qtjava/javalib/qtjava/QUriDrag.h
+++ b/qtjava/javalib/qtjava/TQUriDrag.h
diff --git a/qtjava/javalib/qtjava/QUrl.cpp b/qtjava/javalib/qtjava/TQUrl.cpp
index 38b7eacc..7d3080ab 100644
--- a/qtjava/javalib/qtjava/QUrl.cpp
+++ b/qtjava/javalib/qtjava/TQUrl.cpp
@@ -3,7 +3,7 @@
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QUrl.h>
+#include <qtjava/TQUrl.h>
 
 class TQUrlJBridge : public TQUrl
 {
diff --git a/qtjava/javalib/qtjava/QUrl.h b/qtjava/javalib/qtjava/TQUrl.h
index aeff6f65..aeff6f65 100644
--- a/qtjava/javalib/qtjava/QUrl.h
+++ b/qtjava/javalib/qtjava/TQUrl.h
diff --git a/qtjava/javalib/qtjava/QUrlInfo.cpp b/qtjava/javalib/qtjava/TQUrlInfo.cpp
index af13e1b1..13ea0acc 100644
--- a/qtjava/javalib/qtjava/QUrlInfo.cpp
+++ b/qtjava/javalib/qtjava/TQUrlInfo.cpp
@@ -7,7 +7,7 @@
 #include <tqurlinfo.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QUrlInfo.h>
+#include <qtjava/TQUrlInfo.h>
 
 class TQUrlInfoJBridge : public TQUrlInfo
 {
diff --git a/qtjava/javalib/qtjava/QUrlInfo.h b/qtjava/javalib/qtjava/TQUrlInfo.h
index 93469280..93469280 100644
--- a/qtjava/javalib/qtjava/QUrlInfo.h
+++ b/qtjava/javalib/qtjava/TQUrlInfo.h
diff --git a/qtjava/javalib/qtjava/QUrlOperator.cpp b/qtjava/javalib/qtjava/TQUrlOperator.cpp
index bab6f91b..894e424f 100644
--- a/qtjava/javalib/qtjava/QUrlOperator.cpp
+++ b/qtjava/javalib/qtjava/TQUrlOperator.cpp
@@ -7,7 +7,7 @@
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QUrlOperator.h>
+#include <qtjava/TQUrlOperator.h>
 
 class TQUrlOperatorJBridge : public TQUrlOperator
 {
diff --git a/qtjava/javalib/qtjava/QUrlOperator.h b/qtjava/javalib/qtjava/TQUrlOperator.h
index 2abaeea3..2abaeea3 100644
--- a/qtjava/javalib/qtjava/QUrlOperator.h
+++ b/qtjava/javalib/qtjava/TQUrlOperator.h
diff --git a/qtjava/javalib/qtjava/QUtf16Codec.cpp b/qtjava/javalib/qtjava/TQUtf16Codec.cpp
index ee66b222..58cee66a 100644
--- a/qtjava/javalib/qtjava/QUtf16Codec.cpp
+++ b/qtjava/javalib/qtjava/TQUtf16Codec.cpp
@@ -2,7 +2,7 @@
 #include <tqutfcodec.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QUtf16Codec.h>
+#include <qtjava/TQUtf16Codec.h>
 
 class TQUtf16CodecJBridge : public TQUtf16Codec
 {
diff --git a/qtjava/javalib/qtjava/QUtf16Codec.h b/qtjava/javalib/qtjava/TQUtf16Codec.h
index 8161a5a6..8161a5a6 100644
--- a/qtjava/javalib/qtjava/QUtf16Codec.h
+++ b/qtjava/javalib/qtjava/TQUtf16Codec.h
diff --git a/qtjava/javalib/qtjava/QUtf8Codec.cpp b/qtjava/javalib/qtjava/TQUtf8Codec.cpp
index 60328b72..f05a01e7 100644
--- a/qtjava/javalib/qtjava/QUtf8Codec.cpp
+++ b/qtjava/javalib/qtjava/TQUtf8Codec.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QUtf8Codec.h>
+#include <qtjava/TQUtf8Codec.h>
 
 class TQUtf8CodecJBridge : public TQUtf8Codec
 {
diff --git a/qtjava/javalib/qtjava/QUtf8Codec.h b/qtjava/javalib/qtjava/TQUtf8Codec.h
index 5234d5a0..5234d5a0 100644
--- a/qtjava/javalib/qtjava/QUtf8Codec.h
+++ b/qtjava/javalib/qtjava/TQUtf8Codec.h
diff --git a/qtjava/javalib/qtjava/QUuid.cpp b/qtjava/javalib/qtjava/TQUuid.cpp
index 8b71bcd1..d00f5b4d 100644
--- a/qtjava/javalib/qtjava/QUuid.cpp
+++ b/qtjava/javalib/qtjava/TQUuid.cpp
@@ -3,7 +3,7 @@
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QUuid.h>
+#include <qtjava/TQUuid.h>
 
 class TQUuidJBridge : public TQUuid
 {
diff --git a/qtjava/javalib/qtjava/QUuid.h b/qtjava/javalib/qtjava/TQUuid.h
index fd3e8410..fd3e8410 100644
--- a/qtjava/javalib/qtjava/QUuid.h
+++ b/qtjava/javalib/qtjava/TQUuid.h
diff --git a/qtjava/javalib/qtjava/QVBox.cpp b/qtjava/javalib/qtjava/TQVBox.cpp
index 4f5aa43b..e9eb4d78 100644
--- a/qtjava/javalib/qtjava/QVBox.cpp
+++ b/qtjava/javalib/qtjava/TQVBox.cpp
@@ -4,7 +4,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QVBox.h>
+#include <qtjava/TQVBox.h>
 
 class TQVBoxJBridge : public TQVBox
 {
diff --git a/qtjava/javalib/qtjava/QVBox.h b/qtjava/javalib/qtjava/TQVBox.h
index e934b47e..e934b47e 100644
--- a/qtjava/javalib/qtjava/QVBox.h
+++ b/qtjava/javalib/qtjava/TQVBox.h
diff --git a/qtjava/javalib/qtjava/QVBoxLayout.cpp b/qtjava/javalib/qtjava/TQVBoxLayout.cpp
index d53b1552..e4172991 100644
--- a/qtjava/javalib/qtjava/QVBoxLayout.cpp
+++ b/qtjava/javalib/qtjava/TQVBoxLayout.cpp
@@ -3,7 +3,7 @@
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QVBoxLayout.h>
+#include <qtjava/TQVBoxLayout.h>
 
 class TQVBoxLayoutJBridge : public TQVBoxLayout
 {
diff --git a/qtjava/javalib/qtjava/QVBoxLayout.h b/qtjava/javalib/qtjava/TQVBoxLayout.h
index 48eba4b6..48eba4b6 100644
--- a/qtjava/javalib/qtjava/QVBoxLayout.h
+++ b/qtjava/javalib/qtjava/TQVBoxLayout.h
diff --git a/qtjava/javalib/qtjava/QVButtonGroup.cpp b/qtjava/javalib/qtjava/TQVButtonGroup.cpp
index 80acb5f3..fc6166ff 100644
--- a/qtjava/javalib/qtjava/QVButtonGroup.cpp
+++ b/qtjava/javalib/qtjava/TQVButtonGroup.cpp
@@ -3,7 +3,7 @@
 #include <tqvbuttongroup.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QVButtonGroup.h>
+#include <qtjava/TQVButtonGroup.h>
 
 class TQVButtonGroupJBridge : public TQVButtonGroup
 {
diff --git a/qtjava/javalib/qtjava/QVButtonGroup.h b/qtjava/javalib/qtjava/TQVButtonGroup.h
index bded593d..bded593d 100644
--- a/qtjava/javalib/qtjava/QVButtonGroup.h
+++ b/qtjava/javalib/qtjava/TQVButtonGroup.h
diff --git a/qtjava/javalib/qtjava/QVGroupBox.cpp b/qtjava/javalib/qtjava/TQVGroupBox.cpp
index 811f6c47..c3896342 100644
--- a/qtjava/javalib/qtjava/QVGroupBox.cpp
+++ b/qtjava/javalib/qtjava/TQVGroupBox.cpp
@@ -3,7 +3,7 @@
 #include <tqvgroupbox.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QVGroupBox.h>
+#include <qtjava/TQVGroupBox.h>
 
 class TQVGroupBoxJBridge : public TQVGroupBox
 {
diff --git a/qtjava/javalib/qtjava/QVGroupBox.h b/qtjava/javalib/qtjava/TQVGroupBox.h
index 24e25f0d..24e25f0d 100644
--- a/qtjava/javalib/qtjava/QVGroupBox.h
+++ b/qtjava/javalib/qtjava/TQVGroupBox.h
diff --git a/qtjava/javalib/qtjava/QValidator.cpp b/qtjava/javalib/qtjava/TQValidator.cpp
index 11a9bb9d..3748eabf 100644
--- a/qtjava/javalib/qtjava/QValidator.cpp
+++ b/qtjava/javalib/qtjava/TQValidator.cpp
@@ -3,7 +3,7 @@
 #include <tqvalidator.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QValidator.h>
+#include <qtjava/TQValidator.h>
 
 class TQValidatorJBridge : public TQValidator
 {
diff --git a/qtjava/javalib/qtjava/QValidator.h b/qtjava/javalib/qtjava/TQValidator.h
index 5ebb5560..5ebb5560 100644
--- a/qtjava/javalib/qtjava/QValidator.h
+++ b/qtjava/javalib/qtjava/TQValidator.h
diff --git a/qtjava/javalib/qtjava/QVariant.cpp b/qtjava/javalib/qtjava/TQVariant.cpp
index 3085df54..4c713dc7 100644
--- a/qtjava/javalib/qtjava/QVariant.cpp
+++ b/qtjava/javalib/qtjava/TQVariant.cpp
@@ -26,7 +26,7 @@
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QVariant.h>
+#include <qtjava/TQVariant.h>
 
 class TQVariantJBridge : public TQVariant
 {
diff --git a/qtjava/javalib/qtjava/QVariant.h b/qtjava/javalib/qtjava/TQVariant.h
index 1860debd..1860debd 100644
--- a/qtjava/javalib/qtjava/QVariant.h
+++ b/qtjava/javalib/qtjava/TQVariant.h
diff --git a/qtjava/javalib/qtjava/QWMatrix.cpp b/qtjava/javalib/qtjava/TQWMatrix.cpp
index bc3762bc..1f61e0f9 100644
--- a/qtjava/javalib/qtjava/QWMatrix.cpp
+++ b/qtjava/javalib/qtjava/TQWMatrix.cpp
@@ -6,7 +6,7 @@
 #include <tqpointarray.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QWMatrix.h>
+#include <qtjava/TQWMatrix.h>
 
 class TQWMatrixJBridge : public TQWMatrix
 {
diff --git a/qtjava/javalib/qtjava/QWMatrix.h b/qtjava/javalib/qtjava/TQWMatrix.h
index e05351cc..e05351cc 100644
--- a/qtjava/javalib/qtjava/QWMatrix.h
+++ b/qtjava/javalib/qtjava/TQWMatrix.h
diff --git a/qtjava/javalib/qtjava/QWhatsThis.cpp b/qtjava/javalib/qtjava/TQWhatsThis.cpp
index 09cbc41a..3095edbb 100644
--- a/qtjava/javalib/qtjava/QWhatsThis.cpp
+++ b/qtjava/javalib/qtjava/TQWhatsThis.cpp
@@ -5,7 +5,7 @@
 #include <tqfont.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QWhatsThis.h>
+#include <qtjava/TQWhatsThis.h>
 
 class TQWhatsThisJBridge : public TQWhatsThis
 {
diff --git a/qtjava/javalib/qtjava/QWhatsThis.h b/qtjava/javalib/qtjava/TQWhatsThis.h
index 82aaf893..82aaf893 100644
--- a/qtjava/javalib/qtjava/QWhatsThis.h
+++ b/qtjava/javalib/qtjava/TQWhatsThis.h
diff --git a/qtjava/javalib/qtjava/QWheelEvent.cpp b/qtjava/javalib/qtjava/TQWheelEvent.cpp
index e086238c..43a74450 100644
--- a/qtjava/javalib/qtjava/QWheelEvent.cpp
+++ b/qtjava/javalib/qtjava/TQWheelEvent.cpp
@@ -4,7 +4,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QWheelEvent.h>
+#include <qtjava/TQWheelEvent.h>
 
 class TQWheelEventJBridge : public TQWheelEvent
 {
diff --git a/qtjava/javalib/qtjava/QWheelEvent.h b/qtjava/javalib/qtjava/TQWheelEvent.h
index 9b26af45..9b26af45 100644
--- a/qtjava/javalib/qtjava/QWheelEvent.h
+++ b/qtjava/javalib/qtjava/TQWheelEvent.h
diff --git a/qtjava/javalib/qtjava/QWidget.cpp b/qtjava/javalib/qtjava/TQWidget.cpp
index e37bf4a9..7b14d140 100644
--- a/qtjava/javalib/qtjava/QWidget.cpp
+++ b/qtjava/javalib/qtjava/TQWidget.cpp
@@ -20,7 +20,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QWidget.h>
+#include <qtjava/TQWidget.h>
 
 class TQWidgetJBridge : public TQWidget
 {
diff --git a/qtjava/javalib/qtjava/QWidget.h b/qtjava/javalib/qtjava/TQWidget.h
index ecde511d..ecde511d 100644
--- a/qtjava/javalib/qtjava/QWidget.h
+++ b/qtjava/javalib/qtjava/TQWidget.h
diff --git a/qtjava/javalib/qtjava/QWidgetItem.cpp b/qtjava/javalib/qtjava/TQWidgetItem.cpp
index beb5a7f6..4dc2fcc4 100644
--- a/qtjava/javalib/qtjava/QWidgetItem.cpp
+++ b/qtjava/javalib/qtjava/TQWidgetItem.cpp
@@ -5,7 +5,7 @@
 #include <tqsize.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QWidgetItem.h>
+#include <qtjava/TQWidgetItem.h>
 
 class TQWidgetItemJBridge : public TQWidgetItem
 {
diff --git a/qtjava/javalib/qtjava/QWidgetItem.h b/qtjava/javalib/qtjava/TQWidgetItem.h
index 5729cecd..5729cecd 100644
--- a/qtjava/javalib/qtjava/QWidgetItem.h
+++ b/qtjava/javalib/qtjava/TQWidgetItem.h
diff --git a/qtjava/javalib/qtjava/QWidgetStack.cpp b/qtjava/javalib/qtjava/TQWidgetStack.cpp
index 178a78b8..2f3f07bf 100644
--- a/qtjava/javalib/qtjava/QWidgetStack.cpp
+++ b/qtjava/javalib/qtjava/TQWidgetStack.cpp
@@ -6,7 +6,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QWidgetStack.h>
+#include <qtjava/TQWidgetStack.h>
 
 class TQWidgetStackJBridge : public TQWidgetStack
 {
diff --git a/qtjava/javalib/qtjava/QWidgetStack.h b/qtjava/javalib/qtjava/TQWidgetStack.h
index 7e783e56..7e783e56 100644
--- a/qtjava/javalib/qtjava/QWidgetStack.h
+++ b/qtjava/javalib/qtjava/TQWidgetStack.h
diff --git a/qtjava/javalib/qtjava/QWizard.cpp b/qtjava/javalib/qtjava/TQWizard.cpp
index df972f64..6b83e296 100644
--- a/qtjava/javalib/qtjava/QWizard.cpp
+++ b/qtjava/javalib/qtjava/TQWizard.cpp
@@ -5,7 +5,7 @@
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QWizard.h>
+#include <qtjava/TQWizard.h>
 
 class TQWizardJBridge : public TQWizard
 {
diff --git a/qtjava/javalib/qtjava/QWizard.h b/qtjava/javalib/qtjava/TQWizard.h
index c4b7ef8b..c4b7ef8b 100644
--- a/qtjava/javalib/qtjava/QWizard.h
+++ b/qtjava/javalib/qtjava/TQWizard.h
diff --git a/qtjava/javalib/qtjava/QWorkspace.cpp b/qtjava/javalib/qtjava/TQWorkspace.cpp
index c1676464..14c30d94 100644
--- a/qtjava/javalib/qtjava/QWorkspace.cpp
+++ b/qtjava/javalib/qtjava/TQWorkspace.cpp
@@ -8,7 +8,7 @@
 #include <tqcolor.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QWorkspace.h>
+#include <qtjava/TQWorkspace.h>
 
 class TQWorkspaceJBridge : public TQWorkspace
 {
diff --git a/qtjava/javalib/qtjava/QWorkspace.h b/qtjava/javalib/qtjava/TQWorkspace.h
index 3a88baac..3a88baac 100644
--- a/qtjava/javalib/qtjava/QWorkspace.h
+++ b/qtjava/javalib/qtjava/TQWorkspace.h
diff --git a/qtjava/javalib/qtjava/QXmlAttributes.cpp b/qtjava/javalib/qtjava/TQXmlAttributes.cpp
index d760ba3f..b82a26c0 100644
--- a/qtjava/javalib/qtjava/QXmlAttributes.cpp
+++ b/qtjava/javalib/qtjava/TQXmlAttributes.cpp
@@ -3,7 +3,7 @@
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QXmlAttributes.h>
+#include <qtjava/TQXmlAttributes.h>
 
 class TQXmlAttributesJBridge : public TQXmlAttributes
 {
diff --git a/qtjava/javalib/qtjava/QXmlAttributes.h b/qtjava/javalib/qtjava/TQXmlAttributes.h
index d29d02f5..d29d02f5 100644
--- a/qtjava/javalib/qtjava/QXmlAttributes.h
+++ b/qtjava/javalib/qtjava/TQXmlAttributes.h
diff --git a/qtjava/javalib/qtjava/QXmlContentHandler.cpp b/qtjava/javalib/qtjava/TQXmlContentHandler.cpp
index 2cef80a7..fb8aa035 100644
--- a/qtjava/javalib/qtjava/QXmlContentHandler.cpp
+++ b/qtjava/javalib/qtjava/TQXmlContentHandler.cpp
@@ -3,7 +3,7 @@
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QXmlContentHandler.h>
+#include <qtjava/TQXmlContentHandler.h>
 
 JNIEXPORT jboolean JNICALL
 Java_org_kde_qt_QXmlContentHandler_characters(JNIEnv* env, jobject obj, jstring ch)
diff --git a/qtjava/javalib/qtjava/QXmlContentHandler.h b/qtjava/javalib/qtjava/TQXmlContentHandler.h
index 76bbf0d4..76bbf0d4 100644
--- a/qtjava/javalib/qtjava/QXmlContentHandler.h
+++ b/qtjava/javalib/qtjava/TQXmlContentHandler.h
diff --git a/qtjava/javalib/qtjava/QXmlDTDHandler.cpp b/qtjava/javalib/qtjava/TQXmlDTDHandler.cpp
index a174731b..e78aa84d 100644
--- a/qtjava/javalib/qtjava/QXmlDTDHandler.cpp
+++ b/qtjava/javalib/qtjava/TQXmlDTDHandler.cpp
@@ -3,7 +3,7 @@
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QXmlDTDHandler.h>
+#include <qtjava/TQXmlDTDHandler.h>
 
 JNIEXPORT jstring JNICALL
 Java_org_kde_qt_QXmlDTDHandler_errorString(JNIEnv* env, jobject obj)
diff --git a/qtjava/javalib/qtjava/QXmlDTDHandler.h b/qtjava/javalib/qtjava/TQXmlDTDHandler.h
index 1538707a..1538707a 100644
--- a/qtjava/javalib/qtjava/QXmlDTDHandler.h
+++ b/qtjava/javalib/qtjava/TQXmlDTDHandler.h
diff --git a/qtjava/javalib/qtjava/QXmlDeclHandler.cpp b/qtjava/javalib/qtjava/TQXmlDeclHandler.cpp
index 1abc52eb..78f82ae4 100644
--- a/qtjava/javalib/qtjava/QXmlDeclHandler.cpp
+++ b/qtjava/javalib/qtjava/TQXmlDeclHandler.cpp
@@ -3,7 +3,7 @@
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QXmlDeclHandler.h>
+#include <qtjava/TQXmlDeclHandler.h>
 
 JNIEXPORT jboolean JNICALL
 Java_org_kde_qt_QXmlDeclHandler_attributeDecl(JNIEnv* env, jobject obj, jstring eName, jstring aName, jstring type, jstring valueDefault, jstring value)
diff --git a/qtjava/javalib/qtjava/QXmlDeclHandler.h b/qtjava/javalib/qtjava/TQXmlDeclHandler.h
index d09b6816..d09b6816 100644
--- a/qtjava/javalib/qtjava/QXmlDeclHandler.h
+++ b/qtjava/javalib/qtjava/TQXmlDeclHandler.h
diff --git a/qtjava/javalib/qtjava/QXmlDefaultHandler.cpp b/qtjava/javalib/qtjava/TQXmlDefaultHandler.cpp
index 27dc8d04..0fcaf934 100644
--- a/qtjava/javalib/qtjava/QXmlDefaultHandler.cpp
+++ b/qtjava/javalib/qtjava/TQXmlDefaultHandler.cpp
@@ -3,7 +3,7 @@
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QXmlDefaultHandler.h>
+#include <qtjava/TQXmlDefaultHandler.h>
 
 class TQXmlDefaultHandlerJBridge : public TQXmlDefaultHandler
 {
diff --git a/qtjava/javalib/qtjava/QXmlDefaultHandler.h b/qtjava/javalib/qtjava/TQXmlDefaultHandler.h
index b00a996d..b00a996d 100644
--- a/qtjava/javalib/qtjava/QXmlDefaultHandler.h
+++ b/qtjava/javalib/qtjava/TQXmlDefaultHandler.h
diff --git a/qtjava/javalib/qtjava/QXmlEntityResolver.cpp b/qtjava/javalib/qtjava/TQXmlEntityResolver.cpp
index 018baa20..07e6abd4 100644
--- a/qtjava/javalib/qtjava/QXmlEntityResolver.cpp
+++ b/qtjava/javalib/qtjava/TQXmlEntityResolver.cpp
@@ -3,7 +3,7 @@
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QXmlEntityResolver.h>
+#include <qtjava/TQXmlEntityResolver.h>
 
 JNIEXPORT jstring JNICALL
 Java_org_kde_qt_QXmlEntityResolver_errorString(JNIEnv* env, jobject obj)
diff --git a/qtjava/javalib/qtjava/QXmlEntityResolver.h b/qtjava/javalib/qtjava/TQXmlEntityResolver.h
index 4ecd2e67..4ecd2e67 100644
--- a/qtjava/javalib/qtjava/QXmlEntityResolver.h
+++ b/qtjava/javalib/qtjava/TQXmlEntityResolver.h
diff --git a/qtjava/javalib/qtjava/QXmlErrorHandler.cpp b/qtjava/javalib/qtjava/TQXmlErrorHandler.cpp
index cbdb26e0..187a5d09 100644
--- a/qtjava/javalib/qtjava/QXmlErrorHandler.cpp
+++ b/qtjava/javalib/qtjava/TQXmlErrorHandler.cpp
@@ -3,7 +3,7 @@
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QXmlErrorHandler.h>
+#include <qtjava/TQXmlErrorHandler.h>
 
 JNIEXPORT jstring JNICALL
 Java_org_kde_qt_QXmlErrorHandler_errorString(JNIEnv* env, jobject obj)
diff --git a/qtjava/javalib/qtjava/QXmlErrorHandler.h b/qtjava/javalib/qtjava/TQXmlErrorHandler.h
index b5d078cc..b5d078cc 100644
--- a/qtjava/javalib/qtjava/QXmlErrorHandler.h
+++ b/qtjava/javalib/qtjava/TQXmlErrorHandler.h
diff --git a/qtjava/javalib/qtjava/QXmlInputSource.cpp b/qtjava/javalib/qtjava/TQXmlInputSource.cpp
index 1d822f5f..2ed62091 100644
--- a/qtjava/javalib/qtjava/QXmlInputSource.cpp
+++ b/qtjava/javalib/qtjava/TQXmlInputSource.cpp
@@ -6,7 +6,7 @@
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QXmlInputSource.h>
+#include <qtjava/TQXmlInputSource.h>
 
 class TQXmlInputSourceJBridge : public TQXmlInputSource
 {
diff --git a/qtjava/javalib/qtjava/QXmlInputSource.h b/qtjava/javalib/qtjava/TQXmlInputSource.h
index 068a4add..068a4add 100644
--- a/qtjava/javalib/qtjava/QXmlInputSource.h
+++ b/qtjava/javalib/qtjava/TQXmlInputSource.h
diff --git a/qtjava/javalib/qtjava/QXmlLexicalHandler.cpp b/qtjava/javalib/qtjava/TQXmlLexicalHandler.cpp
index 8f0f92bd..bc3f69f8 100644
--- a/qtjava/javalib/qtjava/QXmlLexicalHandler.cpp
+++ b/qtjava/javalib/qtjava/TQXmlLexicalHandler.cpp
@@ -3,7 +3,7 @@
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QXmlLexicalHandler.h>
+#include <qtjava/TQXmlLexicalHandler.h>
 
 JNIEXPORT jboolean JNICALL
 Java_org_kde_qt_QXmlLexicalHandler_comment(JNIEnv* env, jobject obj, jstring ch)
diff --git a/qtjava/javalib/qtjava/QXmlLexicalHandler.h b/qtjava/javalib/qtjava/TQXmlLexicalHandler.h
index 17966236..17966236 100644
--- a/qtjava/javalib/qtjava/QXmlLexicalHandler.h
+++ b/qtjava/javalib/qtjava/TQXmlLexicalHandler.h
diff --git a/qtjava/javalib/qtjava/QXmlLocator.cpp b/qtjava/javalib/qtjava/TQXmlLocator.cpp
index 89d6691f..32b84334 100644
--- a/qtjava/javalib/qtjava/QXmlLocator.cpp
+++ b/qtjava/javalib/qtjava/TQXmlLocator.cpp
@@ -2,7 +2,7 @@
 #include <tqxml.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QXmlLocator.h>
+#include <qtjava/TQXmlLocator.h>
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QXmlLocator_columnNumber(JNIEnv* env, jobject obj)
diff --git a/qtjava/javalib/qtjava/QXmlLocator.h b/qtjava/javalib/qtjava/TQXmlLocator.h
index b82c7f8c..b82c7f8c 100644
--- a/qtjava/javalib/qtjava/QXmlLocator.h
+++ b/qtjava/javalib/qtjava/TQXmlLocator.h
diff --git a/qtjava/javalib/qtjava/QXmlNamespaceSupport.cpp b/qtjava/javalib/qtjava/TQXmlNamespaceSupport.cpp
index a4594b47..10da6e6d 100644
--- a/qtjava/javalib/qtjava/QXmlNamespaceSupport.cpp
+++ b/qtjava/javalib/qtjava/TQXmlNamespaceSupport.cpp
@@ -4,7 +4,7 @@
 #include <tqstringlist.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QXmlNamespaceSupport.h>
+#include <qtjava/TQXmlNamespaceSupport.h>
 
 class TQXmlNamespaceSupportJBridge : public TQXmlNamespaceSupport
 {
diff --git a/qtjava/javalib/qtjava/QXmlNamespaceSupport.h b/qtjava/javalib/qtjava/TQXmlNamespaceSupport.h
index b692e287..b692e287 100644
--- a/qtjava/javalib/qtjava/QXmlNamespaceSupport.h
+++ b/qtjava/javalib/qtjava/TQXmlNamespaceSupport.h
diff --git a/qtjava/javalib/qtjava/QXmlParseException.cpp b/qtjava/javalib/qtjava/TQXmlParseException.cpp
index 32f9cee4..a10ec15f 100644
--- a/qtjava/javalib/qtjava/QXmlParseException.cpp
+++ b/qtjava/javalib/qtjava/TQXmlParseException.cpp
@@ -3,7 +3,7 @@
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QXmlParseException.h>
+#include <qtjava/TQXmlParseException.h>
 
 class TQXmlParseExceptionJBridge : public TQXmlParseException
 {
diff --git a/qtjava/javalib/qtjava/QXmlParseException.h b/qtjava/javalib/qtjava/TQXmlParseException.h
index 79dcf2ab..79dcf2ab 100644
--- a/qtjava/javalib/qtjava/QXmlParseException.h
+++ b/qtjava/javalib/qtjava/TQXmlParseException.h
diff --git a/qtjava/javalib/qtjava/QXmlReader.cpp b/qtjava/javalib/qtjava/TQXmlReader.cpp
index af6bee5e..99752c2e 100644
--- a/qtjava/javalib/qtjava/QXmlReader.cpp
+++ b/qtjava/javalib/qtjava/TQXmlReader.cpp
@@ -3,7 +3,7 @@
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QXmlReader.h>
+#include <qtjava/TQXmlReader.h>
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QXmlReader_DTDHandler(JNIEnv* env, jobject obj)
diff --git a/qtjava/javalib/qtjava/QXmlReader.h b/qtjava/javalib/qtjava/TQXmlReader.h
index 29ff2498..29ff2498 100644
--- a/qtjava/javalib/qtjava/QXmlReader.h
+++ b/qtjava/javalib/qtjava/TQXmlReader.h
diff --git a/qtjava/javalib/qtjava/QXmlSimpleReader.cpp b/qtjava/javalib/qtjava/TQXmlSimpleReader.cpp
index 3bde8b74..c6307e52 100644
--- a/qtjava/javalib/qtjava/QXmlSimpleReader.cpp
+++ b/qtjava/javalib/qtjava/TQXmlSimpleReader.cpp
@@ -3,7 +3,7 @@
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QXmlSimpleReader.h>
+#include <qtjava/TQXmlSimpleReader.h>
 
 class TQXmlSimpleReaderJBridge : public TQXmlSimpleReader
 {
diff --git a/qtjava/javalib/qtjava/QXmlSimpleReader.h b/qtjava/javalib/qtjava/TQXmlSimpleReader.h
index 63874703..63874703 100644
--- a/qtjava/javalib/qtjava/QXmlSimpleReader.h
+++ b/qtjava/javalib/qtjava/TQXmlSimpleReader.h