summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:58:01 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:58:01 -0600
commite75a964bfaab89c1ccd9530795c23556b22291cd (patch)
treeb842cea1412967a7f7ea84830231ddd93493c924
parent44bcd47cf37723ecfa8bb432403d2bea59988773 (diff)
downloadtqtinterface-e75a964bfaab89c1ccd9530795c23556b22291cd.tar.gz
tqtinterface-e75a964bfaab89c1ccd9530795c23556b22291cd.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 44bcd47cf37723ecfa8bb432403d2bea59988773.
-rw-r--r--qtinterface/CMakeLists.txt42
-rw-r--r--qtinterface/Makefile.am36
-rwxr-xr-xqtinterface/convert_qt_tqt152
-rwxr-xr-xqtinterface/convert_qt_tqt24
-rw-r--r--qtinterface/filelist.txt30
-rw-r--r--qtinterface/qt4/Qt/q3dockarea.h2
-rw-r--r--qtinterface/qt4/Qt/qboxlayout.h2
-rw-r--r--qtinterface/qt4/Qt/qformlayout.h2
-rw-r--r--qtinterface/qt4/Qt/qgridlayout.h2
-rw-r--r--qtinterface/qt4/Qt/qlayout.h2
-rw-r--r--qtinterface/qt4/Qt/qlayoutitem.h6
-rw-r--r--qtinterface/qt4/Qt/qsizepolicy.h4
-rw-r--r--qtinterface/tqbrush.cpp2
-rw-r--r--qtinterface/tqclipboard.cpp2
-rw-r--r--qtinterface/tqclipbrd.h2
-rw-r--r--qtinterface/tqlayout.cpp2
-rw-r--r--qtinterface/tqpalette.cpp2
-rw-r--r--qtinterface/tqsignalslotimp.cpp2
-rw-r--r--qtinterface/tqstylesheet.cpp2
-rw-r--r--qtinterface/tqt.h.cmake276
-rw-r--r--qtinterface/tqtextbrowser.cpp2
-rw-r--r--qtinterface/tqtextcodec.cpp2
-rw-r--r--qtinterface/tqtextcodecfactory.cpp2
-rw-r--r--qtinterface/tqtextcodecplugin.cpp2
-rw-r--r--qtinterface/tqtextedit.cpp2
-rw-r--r--qtinterface/tqtextstream.cpp2
-rw-r--r--qtinterface/tqtextview.cpp2
-rw-r--r--qtinterface/tqtstream.h4
28 files changed, 246 insertions, 246 deletions
diff --git a/qtinterface/CMakeLists.txt b/qtinterface/CMakeLists.txt
index 41ec0dd..9803386 100644
--- a/qtinterface/CMakeLists.txt
+++ b/qtinterface/CMakeLists.txt
@@ -28,14 +28,14 @@ configure_file( tqt.h.cmake tqt.h @ONLY )
install( FILES
${CMAKE_CURRENT_BINARY_DIR}/tqt.h tqtglobaldefines.h tqaccel.h tqaccessible.h
tqaction.h tqapplication.h tqasyncio.h tqbuttongroup.h tqbutton.h tqcanvas.h
- tqcdestyle.h tqcheckbox.h clipboard.h tqcolordialog.h tqcombobox.h
+ tqcdestyle.h tqcheckbox.h tqclipboard.h tqcolordialog.h tqcombobox.h
tqcommonstyle.h tqdatabrowser.h tqdatatable.h tqdataview.h tqdatetimeedit.h
tqdesktopwidget.h tqdial.h tqdialog.h tqdns.h tqdockarea.h tqdockwindow.h
tqdragobject.h tqerrormessage.h tqeventloop.h tqfiledialog.h tqfontdialog.h
tqframe.h tqftp.h tqgl.h tqgplugin.h tqgrid.h tqgridview.h tqgroupbox.h
tqguardedptr.h tqhbox.h tqhbuttongroup.h tqheader.h tqhgroupbox.h
tqhttp.h tqiconview.h tqimageformatplugin.h tqinputdialog.h tqlabel.h
- layout.h tqlcdnumber.h tqlineedit.h tqlistbox.h tqlistview.h tqlocalfs.h
+ tqlayout.h tqlcdnumber.h tqlineedit.h tqlistbox.h tqlistview.h tqlocalfs.h
tqmainwindow.h tqmenubar.h tqmessagebox.h tqmotifplusstyle.h tqmotifstyle.h
tqmultilineedit.h tqnetworkprotocol.h tqnp.h tqobjectcleanuphandler.h
tqobject.h tqplatinumstyle.h tqpopupmenu.h tqprintdialog.h tqprocess.h
@@ -44,9 +44,9 @@ install( FILES
tqsessionmanager.h tqsgistyle.h tqsignal.h tqsignalmapper.h tqsizegrip.h
tqslider.h tqsocket.h tqsocketnotifier.h tqsound.h tqspinbox.h tqsplashscreen.h
tqsplitter.h tqsqldatabase.h tqsqldriver.h tqsqldriverplugin.h tqsqlform.h
- tqsqlquery.h tqstatusbar.h tqstyle.h tqstyleplugin.h stylesheet.h tqtabbar.h
- tqtabdialog.h tqtable.h tqtabwidget.h textbrowser.h textcodecplugin.h
- textedit.h textview.h tqtimer.h tqtoolbar.h tqtoolbox.h tqtoolbutton.h
+ tqsqlquery.h tqstatusbar.h tqstyle.h tqstyleplugin.h tqstylesheet.h tqtabbar.h
+ tqtabdialog.h tqtable.h tqtabwidget.h tqtextbrowser.h tqtextcodecplugin.h
+ tqtextedit.h tqtextview.h tqtimer.h tqtoolbar.h tqtoolbox.h tqtoolbutton.h
tqtooltip.h tqtranslator.h tqurloperator.h tqvalidator.h tqvbox.h
tqvbuttongroup.h tqvgroupbox.h tqwidget.h tqwidgetplugin.h tqwidgetstack.h
tqwindowsstyle.h tqwizard.h tqworkspace.h tqapp.h tqarray.h tqassistantclient.h
@@ -61,7 +61,7 @@ install( FILES
tqscrbar.h tqsession.h tqsocknot.h tqstack.h tqtabdlg.h tqtstream.h tqvector.h
tqwidcoll.h tqwindefs.h tqwindowdefs.h tqwinexport.h tq1xcompatibility.h
tqabstractlayout.h tqasciicache.h tqasciidict.h tqasyncimageio.h tqbig5codec.h
- tqbitarray.h tqbitmap.h brush.h tqbuffer.h tqcache.h tqcleanuphandler.h
+ tqbitarray.h tqbitmap.h tqbrush.h tqbuffer.h tqcache.h tqcleanuphandler.h
tqcolor.h tqcompactstyle.h tqconnection.h tqcstring.h tqcursor.h tqdatastream.h
tqdatetime.h tqdeepcopy.h tqdict.h tqdir.h tqdom.h tqdrawutil.h tqdropsite.h
tqeditorfactory.h tqeucjpcodec.h tqeuckrcodec.h tqevent.h tqfile.h tqfileinfo.h
@@ -71,23 +71,23 @@ install( FILES
tqinterlacestyle.h tqiodevice.h tqjiscodec.h tqjpunicode.h tqkeysequence.h
tqlibrary.h tqlocale.h tqmap.h tqmemarray.h tqmenudata.h tqmetaobject.h
tqmime.h tqmovie.h tqmutex.h tqnamespace.h tqobjectdict.h tqobjectlist.h
- tqpaintdevice.h tqpaintdevicemetrics.h tqpainter.h tqpair.h palette.h tqpen.h
+ tqpaintdevice.h tqpaintdevicemetrics.h tqpainter.h tqpair.h tqpalette.h tqpen.h
tqpicture.h tqpixmapcache.h tqpixmap.h tqpngio.h tqpointarray.h tqpoint.h
tqpolygonscanner.h tqprinter.h tqptrcollection.h tqptrdict.h tqptrlist.h
tqptrqueue.h tqptrstack.h tqptrvector.h tqrect.h tqregexp.h tqregion.h
- tqrtlcodec.h tqsemaphore.h tqsettings.h tqshared.h signalslotimp.h
+ tqrtlcodec.h tqsemaphore.h tqsettings.h tqshared.h tqsignalslotimp.h
tqsimplerichtext.h tqsize.h tqsizepolicy.h tqsjiscodec.h tqsocketdevice.h
tqsortedlist.h tqsqlcursor.h tqsqleditorfactory.h tqsqlerror.h tqsqlfield.h
tqsql.h tqsqlindex.h tqsqlpropertymap.h tqsqlrecord.h tqsqlresult.h
tqsqlselectcursor.h tqstring.h tqstringlist.h tqstrlist.h tqstrvec.h
- tqstylefactory.h tqsyntaxhighlighter.h textcodecfactory.h textcodec.h
- textstream.h tqthread.h tqthreadstorage.h tqtl.h tqtsciicodec.h tqurl.h
+ tqstylefactory.h tqsyntaxhighlighter.h tqtextcodecfactory.h tqtextcodec.h
+ tqtextstream.h tqthread.h tqthreadstorage.h tqtl.h tqtsciicodec.h tqurl.h
tqurlinfo.h tqutfcodec.h tquuid.h tqvaluelist.h tqvaluestack.h tqvaluevector.h
tqvariant.h tqvfbhdr.h tqwaitcondition.h tqwhatsthis.h tqwidgetfactory.h
tqwidgetintdict.h tqwidgetlist.h tqwmatrix.h tqxml.h private/tqucomextra_p.h
- private/layoutengine_p.h private/tqinternal_p.h private/tqeffects_p.h
+ private/tqlayoutengine_p.h private/tqinternal_p.h private/tqeffects_p.h
private/tqrichtext_p.h private/tqpluginmanager_p.h private/tqcom_p.h
- private/tqucom_p.h private/tqwidgetinterface_p.h private/textengine_p.h
+ private/tqucom_p.h private/tqwidgetinterface_p.h private/tqtextengine_p.h
tqlistiterator.h
DESTINATION ${INCLUDE_INSTALL_DIR} )
@@ -140,7 +140,7 @@ tde_add_library( tqt SHARED
SOURCES
tqt.cpp tqaccel.cpp tqaccessible.cpp tqaction.cpp tqapplication.cpp
tqasyncio.cpp tqbuttongroup.cpp tqbutton.cpp tqcanvas.cpp tqcdestyle.cpp
- tqcheckbox.cpp clipboard.cpp tqcolordialog.cpp tqcombobox.cpp
+ tqcheckbox.cpp tqclipboard.cpp tqcolordialog.cpp tqcombobox.cpp
tqcommonstyle.cpp tqdatabrowser.cpp tqdatatable.cpp tqdataview.cpp
tqdatetimeedit.cpp tqdesktopwidget.cpp tqdial.cpp tqdialog.cpp tqdns.cpp
tqdockarea.cpp tqdockwindow.cpp tqdragobject.cpp tqerrormessage.cpp
@@ -148,7 +148,7 @@ tde_add_library( tqt SHARED
tqgl.cpp tqgplugin.cpp tqgrid.cpp tqgridview.cpp tqgroupbox.cpp
tqguardedptr.cpp tqhbox.cpp tqhbuttongroup.cpp tqheader.cpp
tqhgroupbox.cpp tqhttp.cpp tqiconview.cpp tqimageformatplugin.cpp
- tqinputdialog.cpp tqlabel.cpp layout.cpp tqlcdnumber.cpp tqlineedit.cpp
+ tqinputdialog.cpp tqlabel.cpp tqlayout.cpp tqlcdnumber.cpp tqlineedit.cpp
tqlistbox.cpp tqlistview.cpp tqlocalfs.cpp tqmainwindow.cpp tqmenubar.cpp
tqmessagebox.cpp tqmotifplusstyle.cpp tqmotifstyle.cpp tqmultilineedit.cpp
tqnetworkprotocol.cpp tqnp.cpp tqobjectcleanuphandler.cpp tqobject.cpp
@@ -160,14 +160,14 @@ tde_add_library( tqt SHARED
tqsocketnotifier.cpp tqsound.cpp tqspinbox.cpp tqsplashscreen.cpp
tqsplitter.cpp tqsqldatabase.cpp tqsqldriver.cpp tqsqldriverplugin.cpp
tqsqlform.cpp tqsqlquery.cpp tqstatusbar.cpp tqstyle.cpp tqstyleplugin.cpp
- stylesheet.cpp tqtabbar.cpp tqtabdialog.cpp tqtable.cpp tqtabwidget.cpp
- textbrowser.cpp textcodecplugin.cpp textedit.cpp textview.cpp
+ tqstylesheet.cpp tqtabbar.cpp tqtabdialog.cpp tqtable.cpp tqtabwidget.cpp
+ tqtextbrowser.cpp tqtextcodecplugin.cpp tqtextedit.cpp tqtextview.cpp
tqtimer.cpp tqtoolbar.cpp tqtoolbox.cpp tqtoolbutton.cpp tqtooltip.cpp
tqtranslator.cpp tqurloperator.cpp tqvalidator.cpp tqvbox.cpp
tqvbuttongroup.cpp tqvgroupbox.cpp tqwidget.cpp tqwidgetplugin.cpp
tqwidgetstack.cpp tqwindowsstyle.cpp tqwizard.cpp tqworkspace.cpp
tq1xcompatibility.cpp tqabstractlayout.cpp tqasciicache.cpp tqasciidict.cpp
- tqasyncimageio.cpp tqbig5codec.cpp tqbitarray.cpp tqbitmap.cpp brush.cpp
+ tqasyncimageio.cpp tqbig5codec.cpp tqbitarray.cpp tqbitmap.cpp tqbrush.cpp
tqbuffer.cpp tqcache.cpp tqcleanuphandler.cpp tqcolor.cpp tqcompactstyle.cpp
tqconnection.cpp tqcstring.cpp tqcursor.cpp tqdatastream.cpp tqdatetime.cpp
tqdeepcopy.cpp tqdict.cpp tqdir.cpp tqdom.cpp tqdrawutil.cpp tqdropsite.cpp
@@ -179,18 +179,18 @@ tde_add_library( tqt SHARED
tqjiscodec.h tqjpunicode.cpp tqkeysequence.cpp tqlibrary.cpp tqlocale.cpp
tqmap.cpp tqmemarray.cpp tqmenudata.cpp tqmetaobject.cpp tqmime.cpp tqmovie.cpp
tqmutex.cpp tqnamespace.cpp tqobjectdict.cpp tqobjectlist.cpp tqpaintdevice.cpp
- tqpaintdevicemetrics.cpp tqpainter.cpp tqpair.cpp palette.cpp tqpen.cpp
+ tqpaintdevicemetrics.cpp tqpainter.cpp tqpair.cpp tqpalette.cpp tqpen.cpp
tqpicture.cpp tqpixmapcache.cpp tqpixmap.cpp tqpngio.cpp tqpointarray.cpp
tqpoint.cpp tqpolygonscanner.cpp tqprinter.cpp tqptrcollection.cpp
tqptrdict.cpp tqptrlist.cpp tqptrqueue.cpp tqptrstack.cpp tqptrvector.cpp
tqrect.cpp tqregexp.cpp tqregion.cpp tqrtlcodec.cpp tqsemaphore.cpp
- tqsettings.cpp tqshared.cpp signalslotimp.cpp tqsimplerichtext.cpp tqsize.cpp
+ tqsettings.cpp tqshared.cpp tqsignalslotimp.cpp tqsimplerichtext.cpp tqsize.cpp
tqsizepolicy.cpp tqsjiscodec.cpp tqsocketdevice.cpp tqsortedlist.cpp
tqsqlcursor.cpp tqsqleditorfactory.cpp tqsqlerror.cpp tqsqlfield.cpp
tqsql.cpp tqsqlindex.cpp tqsqlpropertymap.cpp tqsqlrecord.cpp tqsqlresult.cpp
tqsqlselectcursor.cpp tqstring.cpp tqstringlist.cpp tqstrlist.cpp tqstrvec.cpp
- tqstylefactory.cpp tqsyntaxhighlighter.cpp textcodecfactory.cpp
- textcodec.cpp textstream.cpp tqthread.cpp tqthreadstorage.cpp
+ tqstylefactory.cpp tqsyntaxhighlighter.cpp tqtextcodecfactory.cpp
+ tqtextcodec.cpp tqtextstream.cpp tqthread.cpp tqthreadstorage.cpp
tqtl.cpp tqtsciicodec.cpp tqurl.cpp tqurlinfo.cpp tqutfcodec.cpp tquuid.cpp
tqvaluelist.cpp tqvaluestack.cpp tqvaluevector.cpp tqvariant.cpp tqvfbhdr.cpp
tqwaitcondition.cpp tqwhatsthis.cpp tqwidgetfactory.cpp tqwidgetintdict.cpp
diff --git a/qtinterface/Makefile.am b/qtinterface/Makefile.am
index f863946..15f51bc 100644
--- a/qtinterface/Makefile.am
+++ b/qtinterface/Makefile.am
@@ -31,28 +31,28 @@ check_PROGRAMS =
lib_LTLIBRARIES = libtqt.la
libtqt_la_SOURCES = tqt.cpp tqaccel.cpp tqaccessible.cpp tqaction.cpp tqapplication.cpp tqasyncio.cpp \
tqbuttongroup.cpp tqbutton.cpp \
-tqcanvas.cpp tqcdestyle.cpp tqcheckbox.cpp clipboard.cpp tqcolordialog.cpp tqcombobox.cpp tqcommonstyle.cpp \
+tqcanvas.cpp tqcdestyle.cpp tqcheckbox.cpp tqclipboard.cpp tqcolordialog.cpp tqcombobox.cpp tqcommonstyle.cpp \
tqdatabrowser.cpp tqdatatable.cpp tqdataview.cpp tqdatetimeedit.cpp tqdesktopwidget.cpp tqdial.cpp tqdialog.cpp tqdns.cpp tqdockarea.cpp tqdockwindow.cpp tqdragobject.cpp \
tqerrormessage.cpp tqeventloop.cpp \
tqframe.cpp tqftp.cpp tqfiledialog.cpp tqfontdialog.cpp \
tqgl.cpp tqgplugin.cpp tqgrid.cpp tqgridview.cpp tqgroupbox.cpp tqguardedptr.cpp \
tqhbox.cpp tqhbuttongroup.cpp tqheader.cpp tqhgroupbox.cpp tqhttp.cpp \
tqiconview.cpp tqimageformatplugin.cpp tqinputcontext.cpp tqinputdialog.cpp \
-tqlabel.cpp layout.cpp tqlcdnumber.cpp tqlineedit.cpp tqlistbox.cpp tqlistview.cpp tqlocalfs.cpp \
+tqlabel.cpp tqlayout.cpp tqlcdnumber.cpp tqlineedit.cpp tqlistbox.cpp tqlistview.cpp tqlocalfs.cpp \
tqmainwindow.cpp tqmenubar.cpp tqmessagebox.cpp tqmotifplusstyle.cpp tqmotifstyle.cpp tqmultilineedit.cpp \
tqnetworkprotocol.cpp tqnp.cpp \
tqobjectcleanuphandler.cpp tqobject.cpp \
tqplatinumstyle.cpp tqpopupmenu.cpp tqprintdialog.cpp tqprocess.cpp tqprogressbar.cpp tqprogressdialog.cpp tqpushbutton.cpp \
tqradiobutton.cpp tqrangecontrol.cpp \
-tqscrollbar.cpp tqscrollview.cpp tqsemimodal.cpp tqserversocket.cpp tqsessionmanager.cpp tqsgistyle.cpp tqsignal.cpp tqsignalmapper.cpp tqsizegrip.cpp tqslider.cpp tqsocket.cpp tqsocketnotifier.cpp tqsound.cpp tqspinbox.cpp tqsplashscreen.cpp tqsplitter.cpp tqsqldatabase.cpp tqsqldriver.cpp tqsqldriverplugin.cpp tqsqlform.cpp tqsqlquery.cpp tqstatusbar.cpp tqstyle.cpp tqstyleplugin.cpp stylesheet.cpp \
-tqtabbar.cpp tqtabdialog.cpp tqtable.cpp tqtabwidget.cpp textbrowser.cpp textcodecplugin.cpp textedit.cpp textview.cpp tqtimer.cpp tqtoolbar.cpp tqtoolbox.cpp tqtoolbutton.cpp tqtooltip.cpp tqtranslator.cpp \
+tqscrollbar.cpp tqscrollview.cpp tqsemimodal.cpp tqserversocket.cpp tqsessionmanager.cpp tqsgistyle.cpp tqsignal.cpp tqsignalmapper.cpp tqsizegrip.cpp tqslider.cpp tqsocket.cpp tqsocketnotifier.cpp tqsound.cpp tqspinbox.cpp tqsplashscreen.cpp tqsplitter.cpp tqsqldatabase.cpp tqsqldriver.cpp tqsqldriverplugin.cpp tqsqlform.cpp tqsqlquery.cpp tqstatusbar.cpp tqstyle.cpp tqstyleplugin.cpp tqstylesheet.cpp \
+tqtabbar.cpp tqtabdialog.cpp tqtable.cpp tqtabwidget.cpp tqtextbrowser.cpp tqtextcodecplugin.cpp tqtextedit.cpp tqtextview.cpp tqtimer.cpp tqtoolbar.cpp tqtoolbox.cpp tqtoolbutton.cpp tqtooltip.cpp tqtranslator.cpp \
tqurloperator.cpp \
tqvalidator.cpp tqvbox.cpp tqvbuttongroup.cpp tqvgroupbox.cpp \
tqwidget.cpp tqwidgetplugin.cpp tqwidgetstack.cpp tqwindowsstyle.cpp tqwizard.cpp tqworkspace.cpp \
\
tq1xcompatibility.cpp \
tqabstractlayout.cpp tqasciicache.cpp tqasciidict.cpp tqassistantclient.cpp tqasyncimageio.cpp \
-tqbig5codec.cpp tqbitarray.cpp tqbitmap.cpp brush.cpp tqbuffer.cpp \
+tqbig5codec.cpp tqbitarray.cpp tqbitmap.cpp tqbrush.cpp tqbuffer.cpp \
tqcache.cpp tqcleanuphandler.cpp tqcolor.cpp tqcompactstyle.cpp tqconnection.cpp tqcstring.cpp tqcursor.cpp \
tqdatastream.cpp tqdatetime.cpp tqdeepcopy.cpp tqdict.cpp tqdir.cpp tqdom.cpp tqdrawutil.cpp tqdropsite.cpp \
tqeditorfactory.cpp tqeucjpcodec.cpp tqeuckrcodec.cpp tqevent.cpp \
@@ -66,10 +66,10 @@ tqlibrary.cpp tqlocale.cpp \
tqmap.cpp tqmemarray.cpp tqmenudata.cpp tqmetaobject.cpp tqmime.cpp tqmovie.cpp tqmutex.cpp \
tqnamespace.cpp \
tqobjectdict.cpp tqobjectlist.cpp \
-tqpaintdevice.cpp tqpaintdevicemetrics.cpp tqpainter.cpp tqpair.cpp palette.cpp tqpen.cpp tqpicture.cpp tqpixmapcache.cpp tqpixmap.cpp tqpngio.cpp tqpointarray.cpp tqpoint.cpp tqpolygonscanner.cpp tqprinter.cpp tqptrcollection.cpp tqptrdict.cpp tqptrlist.cpp tqptrqueue.cpp tqptrstack.cpp tqptrvector.cpp \
+tqpaintdevice.cpp tqpaintdevicemetrics.cpp tqpainter.cpp tqpair.cpp tqpalette.cpp tqpen.cpp tqpicture.cpp tqpixmapcache.cpp tqpixmap.cpp tqpngio.cpp tqpointarray.cpp tqpoint.cpp tqpolygonscanner.cpp tqprinter.cpp tqptrcollection.cpp tqptrdict.cpp tqptrlist.cpp tqptrqueue.cpp tqptrstack.cpp tqptrvector.cpp \
tqrect.cpp tqregexp.cpp tqregion.cpp tqrtlcodec.cpp \
-tqsemaphore.cpp tqsettings.cpp tqshared.cpp signalslotimp.cpp tqsimplerichtext.cpp tqsize.cpp tqsizepolicy.cpp tqsjiscodec.cpp tqsocketdevice.cpp tqsortedlist.cpp tqsqlcursor.cpp tqsqleditorfactory.cpp tqsqlerror.cpp tqsqlfield.cpp tqsql.cpp tqsqlindex.cpp tqsqlpropertymap.cpp tqsqlrecord.cpp tqsqlresult.cpp tqsqlselectcursor.cpp tqstring.cpp tqstringlist.cpp tqstrlist.cpp tqstrvec.cpp tqstylefactory.cpp tqsyntaxhighlighter.cpp \
-textcodecfactory.cpp textcodec.cpp textstream.cpp tqthread.cpp tqthreadstorage.cpp tqtl.cpp tqtsciicodec.cpp \
+tqsemaphore.cpp tqsettings.cpp tqshared.cpp tqsignalslotimp.cpp tqsimplerichtext.cpp tqsize.cpp tqsizepolicy.cpp tqsjiscodec.cpp tqsocketdevice.cpp tqsortedlist.cpp tqsqlcursor.cpp tqsqleditorfactory.cpp tqsqlerror.cpp tqsqlfield.cpp tqsql.cpp tqsqlindex.cpp tqsqlpropertymap.cpp tqsqlrecord.cpp tqsqlresult.cpp tqsqlselectcursor.cpp tqstring.cpp tqstringlist.cpp tqstrlist.cpp tqstrvec.cpp tqstylefactory.cpp tqsyntaxhighlighter.cpp \
+tqtextcodecfactory.cpp tqtextcodec.cpp tqtextstream.cpp tqthread.cpp tqthreadstorage.cpp tqtl.cpp tqtsciicodec.cpp \
tqurl.cpp tqurlinfo.cpp tqutfcodec.cpp tquuid.cpp \
tqvaluelist.cpp tqvaluestack.cpp tqvaluevector.cpp tqvariant.cpp tqvfbhdr.cpp \
tqwaitcondition.cpp tqwhatsthis.cpp tqwidgetfactory.cpp tqwidgetintdict.cpp tqwidgetlist.cpp tqwmatrix.cpp \
@@ -83,21 +83,21 @@ libtqt_la_LDFLAGS = $(KDE_RPATH) -version-info 6:0:2 -no-undefined $(all_librari
include_HEADERS = tqt.h tqtglobaldefines.h tqaccel.h tqaccessible.h tqaction.h tqapplication.h tqassistantclient.h tqasyncio.h \
tqbuttongroup.h tqbutton.h \
-tqcanvas.h tqcdestyle.h tqcheckbox.h clipboard.h tqcolordialog.h tqcombobox.h tqcommonstyle.h \
+tqcanvas.h tqcdestyle.h tqcheckbox.h tqclipboard.h tqcolordialog.h tqcombobox.h tqcommonstyle.h \
tqdatabrowser.h tqdatatable.h tqdataview.h tqdatetimeedit.h tqdesktopwidget.h tqdial.h tqdialog.h tqdns.h tqdockarea.h tqdockwindow.h tqdragobject.h \
tqerrormessage.h tqeventloop.h \
tqfiledialog.h tqfontdialog.h tqframe.h tqftp.h \
tqgl.h tqgplugin.h tqgrid.h tqgridview.h tqgroupbox.h tqguardedptr.h \
tqhbox.h tqhbuttongroup.h tqheader.h tqhgroupbox.h tqhttp.h \
tqiconview.h tqimageformatplugin.h tqinputcontext.h tqinputdialog.h \
-tqlabel.h layout.h tqlcdnumber.h tqlineedit.h tqlistbox.h tqlistview.h tqlocalfs.h \
+tqlabel.h tqlayout.h tqlcdnumber.h tqlineedit.h tqlistbox.h tqlistview.h tqlocalfs.h \
tqmainwindow.h tqmenubar.h tqmessagebox.h tqmotifplusstyle.h tqmotifstyle.h tqmultilineedit.h \
tqnetworkprotocol.h tqnp.h \
tqobjectcleanuphandler.h tqobject.h \
tqplatinumstyle.h tqpopupmenu.h tqprintdialog.h tqprocess.h tqprogressbar.h tqprogressdialog.h tqpushbutton.h \
tqradiobutton.h tqrangecontrol.h \
-tqscrollbar.h tqscrollview.h tqsemimodal.h tqserversocket.h tqsessionmanager.h tqsgistyle.h tqsignal.h tqsignalmapper.h tqsizegrip.h tqslider.h tqsocket.h tqsocketnotifier.h tqsound.h tqspinbox.h tqsplashscreen.h tqsplitter.h tqsqldatabase.h tqsqldriver.h tqsqldriverplugin.h tqsqlform.h tqsqlquery.h tqstatusbar.h tqstyle.h tqstyleplugin.h stylesheet.h \
-tqtabbar.h tqtabdialog.h tqtable.h tqtabwidget.h textbrowser.h textcodecplugin.h textedit.h textview.h tqtimer.h tqtoolbar.h tqtoolbox.h tqtoolbutton.h tqtooltip.h tqtranslator.h \
+tqscrollbar.h tqscrollview.h tqsemimodal.h tqserversocket.h tqsessionmanager.h tqsgistyle.h tqsignal.h tqsignalmapper.h tqsizegrip.h tqslider.h tqsocket.h tqsocketnotifier.h tqsound.h tqspinbox.h tqsplashscreen.h tqsplitter.h tqsqldatabase.h tqsqldriver.h tqsqldriverplugin.h tqsqlform.h tqsqlquery.h tqstatusbar.h tqstyle.h tqstyleplugin.h tqstylesheet.h \
+tqtabbar.h tqtabdialog.h tqtable.h tqtabwidget.h tqtextbrowser.h tqtextcodecplugin.h tqtextedit.h tqtextview.h tqtimer.h tqtoolbar.h tqtoolbox.h tqtoolbutton.h tqtooltip.h tqtranslator.h \
tqurloperator.h \
tqvalidator.h tqvbox.h tqvbuttongroup.h tqvgroupbox.h \
tqwidget.h tqwidgetplugin.h tqwidgetstack.h tqwindowsstyle.h tqwizard.h tqworkspace.h \
@@ -106,7 +106,7 @@ tqapp.h tqarray.h tqbitarry.h tqbttngrp.h tqchkbox.h tqclipbrd.h tqcollect.h tqc
\
tq1xcompatibility.h \
tqabstractlayout.h tqasciicache.h tqasciidict.h tqasyncimageio.h \
-tqbig5codec.h tqbitarray.h tqbitmap.h brush.h tqbuffer.h \
+tqbig5codec.h tqbitarray.h tqbitmap.h tqbrush.h tqbuffer.h \
tqcache.h tqcleanuphandler.h tqcolor.h tqcompactstyle.h tqconnection.h tqcstring.h tqcursor.h \
tqdatastream.h tqdatetime.h tqdeepcopy.h tqdict.h tqdir.h tqdom.h tqdrawutil.h tqdropsite.h \
tqeditorfactory.h tqeucjpcodec.h tqeuckrcodec.h tqevent.h \
@@ -120,17 +120,17 @@ tqlibrary.h tqlocale.h \
tqmap.h tqmemarray.h tqmenudata.h tqmetaobject.h tqmime.h tqmovie.h tqmutex.h \
tqnamespace.h \
tqobjectdict.h tqobjectlist.h \
-tqpaintdevice.h tqpaintdevicemetrics.h tqpainter.h tqpair.h palette.h tqpen.h tqpicture.h tqpixmapcache.h tqpixmap.h tqpngio.h tqpointarray.h tqpoint.h tqpolygonscanner.h tqprinter.h tqptrcollection.h tqptrdict.h tqptrlist.h tqptrqueue.h tqptrstack.h tqptrvector.h \
+tqpaintdevice.h tqpaintdevicemetrics.h tqpainter.h tqpair.h tqpalette.h tqpen.h tqpicture.h tqpixmapcache.h tqpixmap.h tqpngio.h tqpointarray.h tqpoint.h tqpolygonscanner.h tqprinter.h tqptrcollection.h tqptrdict.h tqptrlist.h tqptrqueue.h tqptrstack.h tqptrvector.h \
tqrect.h tqregexp.h tqregion.h tqrtlcodec.h \
-tqsemaphore.h tqsettings.h tqshared.h signalslotimp.h tqsimplerichtext.h tqsize.h tqsizepolicy.h tqsjiscodec.h tqsocketdevice.h tqsortedlist.h tqsqlcursor.h tqsqleditorfactory.h tqsqlerror.h tqsqlfield.h tqsql.h tqsqlindex.h tqsqlpropertymap.h tqsqlrecord.h tqsqlresult.h tqsqlselectcursor.h tqstring.h tqstringlist.h tqstrlist.h tqstrvec.h tqstylefactory.h tqsyntaxhighlighter.h \
-textcodecfactory.h textcodec.h textstream.h tqthread.h tqthreadstorage.h tqtl.h tqtsciicodec.h \
+tqsemaphore.h tqsettings.h tqshared.h tqsignalslotimp.h tqsimplerichtext.h tqsize.h tqsizepolicy.h tqsjiscodec.h tqsocketdevice.h tqsortedlist.h tqsqlcursor.h tqsqleditorfactory.h tqsqlerror.h tqsqlfield.h tqsql.h tqsqlindex.h tqsqlpropertymap.h tqsqlrecord.h tqsqlresult.h tqsqlselectcursor.h tqstring.h tqstringlist.h tqstrlist.h tqstrvec.h tqstylefactory.h tqsyntaxhighlighter.h \
+tqtextcodecfactory.h tqtextcodec.h tqtextstream.h tqthread.h tqthreadstorage.h tqtl.h tqtsciicodec.h \
tqurl.h tqurlinfo.h tqutfcodec.h tquuid.h \
tqvaluelist.h tqvaluestack.h tqvaluevector.h tqvariant.h tqvfbhdr.h \
tqwaitcondition.h tqwhatsthis.h tqwidgetfactory.h tqwidgetintdict.h tqwidgetlist.h tqwmatrix.h \
tqxml.h \
\
private/tqucomextra_p.h \
-private/layoutengine_p.h \
+private/tqlayoutengine_p.h \
private/tqpluginmanager_p.h \
private/tqwidgetinterface_p.h \
private/tqcom_p.h \
@@ -138,7 +138,7 @@ private/tqucom_p.h \
private/tqinternal_p.h \
private/tqeffects_p.h \
private/tqrichtext_p.h \
-private/textengine_p.h \
+private/tqtextengine_p.h \
\
tqlistiterator.h
noinst_HEADERS =
diff --git a/qtinterface/convert_qt_tqt1 b/qtinterface/convert_qt_tqt1
index 94930d9..1b36f80 100755
--- a/qtinterface/convert_qt_tqt1
+++ b/qtinterface/convert_qt_tqt1
@@ -30,8 +30,8 @@ find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qbitarry\.h/\1tqbitarry\.h
find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qbitarry\.h/\1tqbitarry\.h/g' {} \;
find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qbitmap\.h/\1tqbitmap\.h/g' {} \;
find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qbitmap\.h/\1tqbitmap\.h/g' {} \;
-find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qbrush\.h/\1brush\.h/g' {} \;
-find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qbrush\.h/\1brush\.h/g' {} \;
+find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qbrush\.h/\1tqbrush\.h/g' {} \;
+find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qbrush\.h/\1tqbrush\.h/g' {} \;
find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qbttngrp\.h/\1tqbttngrp\.h/g' {} \;
find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qbttngrp\.h/\1tqbttngrp\.h/g' {} \;
find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qbuffer\.h/\1tqbuffer\.h/g' {} \;
@@ -52,8 +52,8 @@ find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qchkbox\.h/\1tqchkbox\.h/g
find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qchkbox\.h/\1tqchkbox\.h/g' {} \;
find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qcleanuphandler\.h/\1tqcleanuphandler\.h/g' {} \;
find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qcleanuphandler\.h/\1tqcleanuphandler\.h/g' {} \;
-find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qclipboard\.h/\1clipboard\.h/g' {} \;
-find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qclipboard\.h/\1clipboard\.h/g' {} \;
+find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qclipboard\.h/\1tqclipboard\.h/g' {} \;
+find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qclipboard\.h/\1tqclipboard\.h/g' {} \;
find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qclipbrd\.h/\1tqclipbrd\.h/g' {} \;
find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qclipbrd\.h/\1tqclipbrd\.h/g' {} \;
find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qcollect\.h/\1tqcollect\.h/g' {} \;
@@ -258,8 +258,8 @@ find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qkeysequence\.h/\1tqkeyseq
find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qkeysequence\.h/\1tqkeysequence\.h/g' {} \;
find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qlabel\.h/\1tqlabel\.h/g' {} \;
find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qlabel\.h/\1tqlabel\.h/g' {} \;
-find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qlayout\.h/\1layout\.h/g' {} \;
-find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qlayout\.h/\1layout\.h/g' {} \;
+find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qlayout\.h/\1tqlayout\.h/g' {} \;
+find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qlayout\.h/\1tqlayout\.h/g' {} \;
find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qlcdnumber\.h/\1tqlcdnumber\.h/g' {} \;
find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qlcdnumber\.h/\1tqlcdnumber\.h/g' {} \;
find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qlcdnum\.h/\1tqlcdnum\.h/g' {} \;
@@ -352,8 +352,8 @@ find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qpainter\.h/\1tqpainter\.h
find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qpainter\.h/\1tqpainter\.h/g' {} \;
find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qpair\.h/\1tqpair\.h/g' {} \;
find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qpair\.h/\1tqpair\.h/g' {} \;
-find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qpalette\.h/\1palette\.h/g' {} \;
-find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qpalette\.h/\1palette\.h/g' {} \;
+find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qpalette\.h/\1tqpalette\.h/g' {} \;
+find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qpalette\.h/\1tqpalette\.h/g' {} \;
find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qpdevmet\.h/\1tqpdevmet\.h/g' {} \;
find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qpdevmet\.h/\1tqpdevmet\.h/g' {} \;
find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qpen\.h/\1tqpen\.h/g' {} \;
@@ -458,8 +458,8 @@ find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qsignal\.h/\1tqsignal\.h/g
find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qsignal\.h/\1tqsignal\.h/g' {} \;
find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qsignalmapper\.h/\1tqsignalmapper\.h/g' {} \;
find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qsignalmapper\.h/\1tqsignalmapper\.h/g' {} \;
-find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qsignalslotimp\.h/\1signalslotimp\.h/g' {} \;
-find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qsignalslotimp\.h/\1signalslotimp\.h/g' {} \;
+find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qsignalslotimp\.h/\1tqsignalslotimp\.h/g' {} \;
+find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qsignalslotimp\.h/\1tqsignalslotimp\.h/g' {} \;
find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qsimplerichtext\.h/\1tqsimplerichtext\.h/g' {} \;
find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qsimplerichtext\.h/\1tqsimplerichtext\.h/g' {} \;
find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qsizegrip\.h/\1tqsizegrip\.h/g' {} \;
@@ -538,8 +538,8 @@ find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qstyle\.h/\1tqstyle\.h/g'
find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qstyle\.h/\1tqstyle\.h/g' {} \;
find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qstyleplugin\.h/\1tqstyleplugin\.h/g' {} \;
find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qstyleplugin\.h/\1tqstyleplugin\.h/g' {} \;
-find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qstylesheet\.h/\1stylesheet\.h/g' {} \;
-find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qstylesheet\.h/\1stylesheet\.h/g' {} \;
+find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qstylesheet\.h/\1tqstylesheet\.h/g' {} \;
+find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qstylesheet\.h/\1tqstylesheet\.h/g' {} \;
find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qsyntaxhighlighter\.h/\1tqsyntaxhighlighter\.h/g' {} \;
find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qsyntaxhighlighter\.h/\1tqsyntaxhighlighter\.h/g' {} \;
find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qtabbar\.h/\1tqtabbar\.h/g' {} \;
@@ -552,20 +552,20 @@ find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qtable\.h/\1tqtable\.h/g'
find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qtable\.h/\1tqtable\.h/g' {} \;
find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qtabwidget\.h/\1tqtabwidget\.h/g' {} \;
find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qtabwidget\.h/\1tqtabwidget\.h/g' {} \;
-find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qtextbrowser\.h/\1textbrowser\.h/g' {} \;
-find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qtextbrowser\.h/\1textbrowser\.h/g' {} \;
-find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qtextcodecfactory\.h/\1textcodecfactory\.h/g' {} \;
-find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qtextcodecfactory\.h/\1textcodecfactory\.h/g' {} \;
-find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qtextcodec\.h/\1textcodec\.h/g' {} \;
-find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qtextcodec\.h/\1textcodec\.h/g' {} \;
-find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qtextcodecplugin\.h/\1textcodecplugin\.h/g' {} \;
-find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qtextcodecplugin\.h/\1textcodecplugin\.h/g' {} \;
-find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qtextedit\.h/\1textedit\.h/g' {} \;
-find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qtextedit\.h/\1textedit\.h/g' {} \;
-find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qtextstream\.h/\1textstream\.h/g' {} \;
-find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qtextstream\.h/\1textstream\.h/g' {} \;
-find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qtextview\.h/\1textview\.h/g' {} \;
-find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qtextview\.h/\1textview\.h/g' {} \;
+find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qtextbrowser\.h/\1tqtextbrowser\.h/g' {} \;
+find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qtextbrowser\.h/\1tqtextbrowser\.h/g' {} \;
+find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qtextcodecfactory\.h/\1tqtextcodecfactory\.h/g' {} \;
+find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qtextcodecfactory\.h/\1tqtextcodecfactory\.h/g' {} \;
+find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qtextcodec\.h/\1tqtextcodec\.h/g' {} \;
+find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qtextcodec\.h/\1tqtextcodec\.h/g' {} \;
+find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qtextcodecplugin\.h/\1tqtextcodecplugin\.h/g' {} \;
+find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qtextcodecplugin\.h/\1tqtextcodecplugin\.h/g' {} \;
+find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qtextedit\.h/\1tqtextedit\.h/g' {} \;
+find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qtextedit\.h/\1tqtextedit\.h/g' {} \;
+find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qtextstream\.h/\1tqtextstream\.h/g' {} \;
+find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qtextstream\.h/\1tqtextstream\.h/g' {} \;
+find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qtextview\.h/\1tqtextview\.h/g' {} \;
+find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qtextview\.h/\1tqtextview\.h/g' {} \;
find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qt\.h/\1tqt\.h/g' {} \;
find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qt\.h/\1tqt\.h/g' {} \;
find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qthread\.h/\1tqthread\.h/g' {} \;
diff --git a/qtinterface/convert_qt_tqt2 b/qtinterface/convert_qt_tqt2
index 3c49ac9..eee091e 100755
--- a/qtinterface/convert_qt_tqt2
+++ b/qtinterface/convert_qt_tqt2
@@ -996,12 +996,12 @@ find ./ -type f -iname "*.c*" -exec sed -i 's/TQT_TQT_/TQT_/g' {} \;
find ./ -type f -iname "*.c*" -exec sed -i 's/TQT_TQT_/TQT_/g' {} \;
# Convert a few items that have changed too subtly to override in the TQT interface layer
-find ./ -type f -iname "*.c*" -exec sed -i 's/->children()/->children()/g' {} \;
+find ./ -type f -iname "*.c*" -exec sed -i 's/->children()/->tqchildren()/g' {} \;
find ./ -type f -iname "*.c*" -exec sed -i 's/access != QMetaData::/tqaccess != QMetaData::/g' {} \;
find ./ -type f -iname "*.c*" -exec sed -i 's/colorTable()/ptrColorTable()/g' {} \;
find ./ -type f -iname "*.c*" -exec sed -i 's/QStyleOption::Default/QStyleOption::TQSO_Default/g' {} \;
find ./ -type f -iname "*.c*" -exec sed -i 's/::qt_cast/tqqt_cast/g' {} \;
-find ./ -type f -iname "*.c*" -exec sed -i 's/mask()/mask()/g' {} \;
+find ./ -type f -iname "*.c*" -exec sed -i 's/mask()/tqmask()/g' {} \;
# Back out some common mistakes
find ./ -type f -iname "*.c*" -exec sed -i 's/\([_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]\)TQ/\1Q/g' {} \;
diff --git a/qtinterface/filelist.txt b/qtinterface/filelist.txt
index 1df919c..4659bf5 100644
--- a/qtinterface/filelist.txt
+++ b/qtinterface/filelist.txt
@@ -17,8 +17,8 @@ tqbig5codec.h
tqbitarray.h
tqbitarry.h
tqbitmap.h
-brush.cpp
-brush.h
+tqbrush.cpp
+tqbrush.h
tqbttngrp.h
tqbuffer.h
tqbuttongroup.h
@@ -32,7 +32,7 @@ tqcheckbox.h
tqchkbox.h
tqcleanuphandler.cpp
tqcleanuphandler.h
-clipboard.h
+tqclipboard.h
tqclipbrd.h
tqcollect.h
tqcollection.h
@@ -143,7 +143,7 @@ tqjpunicode.h
tqkeycode.h
tqkeysequence.h
tqlabel.h
-layout.h
+tqlayout.h
tqlcdnumber.h
tqlcdnum.h
tqlibrary.h
@@ -191,7 +191,7 @@ tqpaintdevicemetrics.h
tqpaintd.h
tqpainter.h
tqpair.h
-palette.h
+tqpalette.h
tqpdevmet.h
tqpen.h
tqpicture.h
@@ -248,7 +248,7 @@ tqshared.cpp
tqshared.h
tqsignal.h
tqsignalmapper.h
-signalslotimp.h
+tqsignalslotimp.h
tqsimplerichtext.cpp
tqsimplerichtext.h
tqsizegrip.h
@@ -290,8 +290,8 @@ tqstrvec.h
tqstylefactory.h
tqstyle.h
tqstyleplugin.h
-stylesheet.cpp
-stylesheet.h
+tqstylesheet.cpp
+tqstylesheet.h
tqsyntaxhighlighter.cpp
tqsyntaxhighlighter.h
tqtabbar.h
@@ -299,13 +299,13 @@ tqtabdialog.h
tqtabdlg.h
tqtable.h
tqtabwidget.h
-textbrowser.h
-textcodecfactory.h
-textcodec.h
-textcodecplugin.h
-textedit.h
-textstream.h
-textview.h
+tqtextbrowser.h
+tqtextcodecfactory.h
+tqtextcodec.h
+tqtextcodecplugin.h
+tqtextedit.h
+tqtextstream.h
+tqtextview.h
tqt.h
tqthread.cpp
tqthread.h
diff --git a/qtinterface/qt4/Qt/q3dockarea.h b/qtinterface/qt4/Qt/q3dockarea.h
index 011fcbd..c506368 100644
--- a/qtinterface/qt4/Qt/q3dockarea.h
+++ b/qtinterface/qt4/Qt/q3dockarea.h
@@ -90,7 +90,7 @@ public:
QLayoutItem *itemAt(int) const;
QLayoutItem *takeAt(int);
int count() const;
- Qt::Orientations expanding() const { return Qt::Orientations(0); }
+ Qt::Orientations expandingDirections() const { return Qt::Orientations(0); }
void invalidate();
Qt::Orientation orientation() const { return orient; }
QList<QRect> lineList() const { return lines; }
diff --git a/qtinterface/qt4/Qt/qboxlayout.h b/qtinterface/qt4/Qt/qboxlayout.h
index 45bcc8d..06ace10 100644
--- a/qtinterface/qt4/Qt/qboxlayout.h
+++ b/qtinterface/qt4/Qt/qboxlayout.h
@@ -109,7 +109,7 @@ public:
int heightForWidth(int) const;
int minimumHeightForWidth(int) const;
- Qt::Orientations expanding() const;
+ Qt::Orientations expandingDirections() const;
void invalidate();
QLayoutItem *itemAt(int) const;
QLayoutItem *takeAt(int);
diff --git a/qtinterface/qt4/Qt/qformlayout.h b/qtinterface/qt4/Qt/qformlayout.h
index 338f370..9ef1943 100644
--- a/qtinterface/qt4/Qt/qformlayout.h
+++ b/qtinterface/qt4/Qt/qformlayout.h
@@ -140,7 +140,7 @@ public:
bool hasHeightForWidth() const;
int heightForWidth(int width) const;
- Qt::Orientations expanding() const;
+ Qt::Orientations expandingDirections() const;
int count() const;
int rowCount() const;
diff --git a/qtinterface/qt4/Qt/qgridlayout.h b/qtinterface/qt4/Qt/qgridlayout.h
index a33fc2a..e906a97 100644
--- a/qtinterface/qt4/Qt/qgridlayout.h
+++ b/qtinterface/qt4/Qt/qgridlayout.h
@@ -110,7 +110,7 @@ public:
int heightForWidth(int) const;
int minimumHeightForWidth(int) const;
- Qt::Orientations expanding() const;
+ Qt::Orientations expandingDirections() const;
void invalidate();
inline void addWidget(QWidget *w) { QLayout::addWidget(w); }
diff --git a/qtinterface/qt4/Qt/qlayout.h b/qtinterface/qt4/Qt/qlayout.h
index 6713a34..5077d77 100644
--- a/qtinterface/qt4/Qt/qlayout.h
+++ b/qtinterface/qt4/Qt/qlayout.h
@@ -158,7 +158,7 @@ public:
void removeWidget(QWidget *w);
void removeItem(QLayoutItem *);
- Qt::Orientations expanding() const;
+ Qt::Orientations expandingDirections() const;
QSize minimumSize() const;
QSize maximumSize() const;
virtual void setGeometry(const QRect&);
diff --git a/qtinterface/qt4/Qt/qlayoutitem.h b/qtinterface/qt4/Qt/qlayoutitem.h
index ec4c704..f934223 100644
--- a/qtinterface/qt4/Qt/qlayoutitem.h
+++ b/qtinterface/qt4/Qt/qlayoutitem.h
@@ -69,7 +69,7 @@ public:
virtual QSize sizeHint() const = 0;
virtual QSize minimumSize() const = 0;
virtual QSize maximumSize() const = 0;
- virtual Qt::Orientations expanding() const = 0;
+ virtual Qt::Orientations expandingDirections() const = 0;
virtual void setGeometry(const QRect&) = 0;
virtual QRect geometry() const = 0;
virtual bool isEmpty() const = 0;
@@ -106,7 +106,7 @@ public:
QSize sizeHint() const;
QSize minimumSize() const;
QSize maximumSize() const;
- Qt::Orientations expanding() const;
+ Qt::Orientations expandingDirections() const;
bool isEmpty() const;
void setGeometry(const QRect&);
QRect geometry() const;
@@ -128,7 +128,7 @@ public:
QSize sizeHint() const;
QSize minimumSize() const;
QSize maximumSize() const;
- Qt::Orientations expanding() const;
+ Qt::Orientations expandingDirections() const;
bool isEmpty() const;
void setGeometry(const QRect&);
QRect geometry() const;
diff --git a/qtinterface/qt4/Qt/qsizepolicy.h b/qtinterface/qt4/Qt/qsizepolicy.h
index fffc496..76a8e75 100644
--- a/qtinterface/qt4/Qt/qsizepolicy.h
+++ b/qtinterface/qt4/Qt/qsizepolicy.h
@@ -123,7 +123,7 @@ public:
void setVerticalPolicy(Policy d) { data = (data & ~(HMask << HSize)) | (d << HSize); }
void setControlType(ControlType type);
- Qt::Orientations expanding() const {
+ Qt::Orientations expandingDirections() const {
Qt::Orientations result;
if (verticalPolicy() & ExpandFlag)
result |= Qt::Vertical;
@@ -170,7 +170,7 @@ public:
inline QT3_SUPPORT bool mayShrinkVertically() const { return verticalPolicy() & ShrinkFlag; }
inline QT3_SUPPORT bool mayGrowHorizontally() const { return horizontalPolicy() & GrowFlag; }
inline QT3_SUPPORT bool mayGrowVertically() const { return verticalPolicy() & GrowFlag; }
- inline QT3_SUPPORT Qt::Orientations expanding() const { return expanding(); }
+ inline QT3_SUPPORT Qt::Orientations expanding() const { return expandingDirections(); }
QT3_SUPPORT_CONSTRUCTOR QSizePolicy(Policy hor, Policy ver, bool hfw)
: data(hor | (ver<<HSize) | (hfw ? (1U<<2*HSize) : 0)) { }
diff --git a/qtinterface/tqbrush.cpp b/qtinterface/tqbrush.cpp
index 17be478..8619599 100644
--- a/qtinterface/tqbrush.cpp
+++ b/qtinterface/tqbrush.cpp
@@ -20,4 +20,4 @@ Boston, MA 02110-1301, USA.
*/
#include <tqt.h>
-#include <brush.h>
+#include <tqbrush.h>
diff --git a/qtinterface/tqclipboard.cpp b/qtinterface/tqclipboard.cpp
index d61aaec..2f0ac54 100644
--- a/qtinterface/tqclipboard.cpp
+++ b/qtinterface/tqclipboard.cpp
@@ -20,4 +20,4 @@ Boston, MA 02110-1301, USA.
*/
#include <tqt.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
diff --git a/qtinterface/tqclipbrd.h b/qtinterface/tqclipbrd.h
index 6b7d385..37d7a5f 100644
--- a/qtinterface/tqclipbrd.h
+++ b/qtinterface/tqclipbrd.h
@@ -26,6 +26,6 @@ Boston, MA 02110-1301, USA.
// Pull in all clipboard defines
-#include <clipboard.h>
+#include <tqclipboard.h>
#endif /* TQT_TQCLIPBRD_H */ \ No newline at end of file
diff --git a/qtinterface/tqlayout.cpp b/qtinterface/tqlayout.cpp
index db984c4..0ce6ffa 100644
--- a/qtinterface/tqlayout.cpp
+++ b/qtinterface/tqlayout.cpp
@@ -20,4 +20,4 @@ Boston, MA 02110-1301, USA.
*/
#include <tqt.h>
-#include <layout.h>
+#include <tqlayout.h>
diff --git a/qtinterface/tqpalette.cpp b/qtinterface/tqpalette.cpp
index 7ca00f7..f5b45f0 100644
--- a/qtinterface/tqpalette.cpp
+++ b/qtinterface/tqpalette.cpp
@@ -20,4 +20,4 @@ Boston, MA 02110-1301, USA.
*/
#include <tqt.h>
-#include <palette.h>
+#include <tqpalette.h>
diff --git a/qtinterface/tqsignalslotimp.cpp b/qtinterface/tqsignalslotimp.cpp
index 8f54564..8c8082d 100644
--- a/qtinterface/tqsignalslotimp.cpp
+++ b/qtinterface/tqsignalslotimp.cpp
@@ -20,4 +20,4 @@ Boston, MA 02110-1301, USA.
*/
#include <tqt.h>
-#include <signalslotimp.h>
+#include <tqsignalslotimp.h>
diff --git a/qtinterface/tqstylesheet.cpp b/qtinterface/tqstylesheet.cpp
index ce8823a..8f5c3a4 100644
--- a/qtinterface/tqstylesheet.cpp
+++ b/qtinterface/tqstylesheet.cpp
@@ -20,4 +20,4 @@ Boston, MA 02110-1301, USA.
*/
#include <tqt.h>
-#include <stylesheet.h>
+#include <tqstylesheet.h>
diff --git a/qtinterface/tqt.h.cmake b/qtinterface/tqt.h.cmake
index 7be92fa..d78190e 100644
--- a/qtinterface/tqt.h.cmake
+++ b/qtinterface/tqt.h.cmake
@@ -949,147 +949,147 @@ Boston, MA 02110-1301, USA.
#define tqGray qGray
#define tqCompress qCompress
#define tqInstallMsgHandler qInstallMsgHandler
-#define childAt childAt
-#define childrenRect childrenRect
-#define childrenRegion childrenRegion
+#define tqchildAt childAt
+#define tqchildrenRect childrenRect
+#define tqchildrenRegion childrenRegion
#define tqAppName qAppName
#define tqApp qApp
-#define CursorShape CursorShape
-#define shape shape
-#define Status Status
-#define reseStatus resetStatus
-#define metaObject metaObject
-#define find find
-#define children children
-#define findWidget findWidget
-#define findFirstVisibleItem findFirstVisibleItem
-#define findLastVisibleItem findLastVisibleItem
-#define setObjectName setObjectName
-#define setBackgroundPixmap setBackgroundPixmap
-#define setWhatsThis setWhatsThis
-#define topLevelWidget topLevelWidget
-#define parent parent
-#define mask mask
-#define focusWidget focusWidget
-#define contains contains
-#define unicode unicode
-#define unicodeUriToUri unicodeUriToUri
-#define replace replace
-#define signals signals
-#define slots slots
-#define worldMatrix worldMatrix
-#define sizeHint sizeHint
-#define minimumSize minimumSize
-#define maximumSize maximumSize
-#define geometry geometry
-#define spacerItem spacerItem
-#define layout layout
-#define setAlignment setAlignment
-#define invalidate invalidate
-#define alignment alignment
-#define device device
-#define fromLatin1 fromLatin1
-#define receivers receivers
-#define encodedData encodedData
-#define currentDate currentDate
-#define styleHint styleHint
-#define itemRect itemRect
-#define visualRect visualRect
-#define drawControl drawControl
-#define drawPolygon drawPolygon
-#define setSizePolicy setSizePolicy
-#define pixelMetric pixelMetric
-#define drawComplexControl drawComplexControl
-#define repaint repaint
-#define colorGroup colorGroup
-#define drawTextItem drawTextItem
-#define setLibraryPaths setLibraryPaths
-#define setColorGroup setColorGroup
-#define findRev findRev
-#define findProperty findProperty
-#define findSlot findSlot
-#define currentDateTime currentDateTime
-#define findItem findItem
-#define topLevelWidgets topLevelWidgets
-#define containsRef containsRef
-#define findIndex findIndex
-#define findRef findRef
-#define minimumSizeHint minimumSizeHint
-#define maximumSizeHint maximumSizeHint
-#define replaceChild replaceChild
-#define findSignal findSignal
-#define setStatus setStatus
-#define findNextRef findNextRef
-#define connectStatus connectStatus
-#define disconnectStatus disconnectStatus
-#define replacement replacement
-#define superClass superClass
-#define invertPixels invertPixels
-#define seStatus setStatus
-#define superClassName superClassName
-#define clipboard clipboard
-#define families families
-#define startsWith startsWith
-#define rects rects
-#define setFont setFont
-#define setPalette setPalette
-#define palette palette
+#define tqCursorShape CursorShape
+#define tqshape shape
+#define tqStatus Status
+#define resetqStatus resetStatus
+#define tqmetaObject metaObject
+#define tqfind find
+#define tqchildren children
+#define tqfindWidget findWidget
+#define tqfindFirstVisibleItem findFirstVisibleItem
+#define tqfindLastVisibleItem findLastVisibleItem
+#define tqsetObjectName setObjectName
+#define tqsetBackgroundPixmap setBackgroundPixmap
+#define tqsetWhatsThis setWhatsThis
+#define tqtopLevelWidget topLevelWidget
+#define tqparent parent
+#define tqmask mask
+#define tqfocusWidget focusWidget
+#define tqcontains contains
+#define tqunicode unicode
+#define tqunicodeUriToUri unicodeUriToUri
+#define tqreplace replace
+#define tqsignals signals
+#define tqslots slots
+#define tqworldMatrix worldMatrix
+#define tqsizeHint sizeHint
+#define tqminimumSize minimumSize
+#define tqmaximumSize maximumSize
+#define tqgeometry geometry
+#define tqspacerItem spacerItem
+#define tqlayout layout
+#define tqsetAlignment setAlignment
+#define tqinvalidate invalidate
+#define tqalignment alignment
+#define tqdevice device
+#define tqfromLatin1 fromLatin1
+#define tqreceivers receivers
+#define tqencodedData encodedData
+#define tqcurrentDate currentDate
+#define tqstyleHint styleHint
+#define tqitemRect itemRect
+#define tqvisualRect visualRect
+#define tqdrawControl drawControl
+#define tqdrawPolygon drawPolygon
+#define tqsetSizePolicy setSizePolicy
+#define tqpixelMetric pixelMetric
+#define tqdrawComplexControl drawComplexControl
+#define tqrepaint repaint
+#define tqcolorGroup colorGroup
+#define tqdrawTextItem drawTextItem
+#define tqsetLibraryPaths setLibraryPaths
+#define tqsetColorGroup setColorGroup
+#define tqfindRev findRev
+#define tqfindProperty findProperty
+#define tqfindSlot findSlot
+#define tqcurrentDateTime currentDateTime
+#define tqfindItem findItem
+#define tqtopLevelWidgets topLevelWidgets
+#define tqcontainsRef containsRef
+#define tqfindIndex findIndex
+#define tqfindRef findRef
+#define tqminimumSizeHint minimumSizeHint
+#define tqmaximumSizeHint maximumSizeHint
+#define tqreplaceChild replaceChild
+#define tqfindSignal findSignal
+#define settqStatus setStatus
+#define tqfindNextRef findNextRef
+#define connecttqStatus connectStatus
+#define disconnecttqStatus disconnectStatus
+#define tqreplacement replacement
+#define tqsuperClass superClass
+#define tqinvertPixels invertPixels
+#define setqStatus setStatus
+#define tqsuperClassName superClassName
+#define tqclipboard clipboard
+#define tqfamilies families
+#define tqstartsWith startsWith
+#define tqrects rects
+#define tqsetFont setFont
+#define tqsetPalette setPalette
+#define tqpalette palette
#define tqstyle style
-#define styles styles
-#define sizePolicy sizePolicy
-#define smoothSizes smoothSizes
-#define standardSizes standardSizes
-#define resize resize
-#define staticMetaObject staticMetaObject
-#define open open
-#define text text
-#define drawPolyline drawPolyline
-#define brush brush
-#define at at
-#define resizeMode resizeMode
-#define connecStatus connectStatus
-#define disconnecStatus disconnectStatus
-#define endsWith endsWith
-#define drawConvexPolygon drawConvexPolygon
-#define allWidgets allWidgets
-#define capturedTexts capturedTexts
-#define arg arg
-#define begin begin
-#define drawPixmap drawPixmap
-#define scale scale
-#define exiStatus exitStatus
-#define setNum setNum
-#define processEvents processEvents
-#define setBuffer setBuffer
-#define setVisible setVisible
-#define setUpdatesEnabled setUpdatesEnabled
-#define findExtension findExtension
-#define findHistory findHistory
-#define findNext findNext
-#define findPrev findPrev
-#define findByPath findByPath
-#define findObject findObject
-#define findServiceFor findServiceFor
-#define findByUid findByUid
-#define findByEmail findByEmail
-#define findByContent findByContent
-#define findByFileContent findByFileContent
-#define slaveStatus slaveStatus
-#define findText findText
-#define findTextNext findTextNext
-#define findBufferType findBufferType
-#define spellStatus spellStatus
-#define replacedPath replacedPath
-#define findFileType findFileType
-#define textList textList
-#define expanding expanding
-#define pointSizes pointSizes
+#define tqstyles styles
+#define tqsizePolicy sizePolicy
+#define tqsmoothSizes smoothSizes
+#define tqstandardSizes standardSizes
+#define tqresize resize
+#define tqstaticMetaObject staticMetaObject
+#define tqopen open
+#define tqtext text
+#define tqdrawPolyline drawPolyline
+#define tqbrush brush
+#define tqat at
+#define tqresizeMode resizeMode
+#define connectqStatus connectStatus
+#define disconnectqStatus disconnectStatus
+#define tqendsWith endsWith
+#define tqdrawConvexPolygon drawConvexPolygon
+#define tqallWidgets allWidgets
+#define tqcapturedTexts capturedTexts
+#define tqarg arg
+#define tqbegin begin
+#define tqdrawPixmap drawPixmap
+#define tqscale scale
+#define exitqStatus exitStatus
+#define tqsetNum setNum
+#define tqprocessEvents processEvents
+#define tqsetBufferFromCopy setBuffer
+#define tqsetVisible setVisible
+#define tqsetUpdatesEnabled setUpdatesEnabled
+#define tqfindExtension findExtension
+#define tqfindHistory findHistory
+#define tqfindNext findNext
+#define tqfindPrev findPrev
+#define tqfindByPath findByPath
+#define tqfindObject findObject
+#define tqfindServiceFor findServiceFor
+#define tqfindByUid findByUid
+#define tqfindByEmail findByEmail
+#define tqfindByContent findByContent
+#define tqfindByFileContent findByFileContent
+#define slavetqStatus slaveStatus
+#define tqfindText findText
+#define tqfindTextNext findTextNext
+#define tqfindBufferType findBufferType
+#define spelltqStatus spellStatus
+#define tqreplacedPath replacedPath
+#define tqfindFileType findFileType
+#define tqtextList textList
+#define expandingDirections expanding
+#define tqpointSizes pointSizes
#define tqdrawPrimitive drawPrimitive
-#define drawControlMask drawControlMask
+#define tqdrawControlMask drawControlMask
#define tqsizeFromContents sizeFromContents
-#define drawComplexControlMask drawComplexControlMask
+#define tqdrawComplexControlMask drawComplexControlMask
#define TQ_SETS Q_SETS
#define TQ_PROPERTY Q_PROPERTY
@@ -1112,7 +1112,7 @@ Boston, MA 02110-1301, USA.
#endif
#define tqMakePair qMakePair
-#define qt_find_obj_child qt_find_obj_child
+#define qt_tqfind_obj_child qt_find_obj_child
#define tqt_ucm_query_verification_data qt_ucm_query_verification_data
#define tqmemmove qmemmove
@@ -1312,7 +1312,7 @@ Boston, MA 02110-1301, USA.
#define setTqmaximumSize setMaximumSize
#define setTqminimumSize setMinimumSize
-#define setTqalignment setAlignment
+#define setTqalignment tqsetAlignment
#define setTqgeometry setGeometry
/* END BLOCK ONE */
@@ -1409,10 +1409,10 @@ class QUObject;
#include <tqstringlist.h>
#endif /* __cplusplus */
-#define children ptrchildren
+#define tqchildren ptrchildren
#define tqaccess access()
#define tqcolorTable ptrColorTable
-#define mask ptrmask
+#define tqmask ptrmask
#define TQSO_Default SO_Default
#define tqqt_cast qobject_cast
#define TQ_Horizontal Qt::Horizontal
diff --git a/qtinterface/tqtextbrowser.cpp b/qtinterface/tqtextbrowser.cpp
index 8937bbd..262efb4 100644
--- a/qtinterface/tqtextbrowser.cpp
+++ b/qtinterface/tqtextbrowser.cpp
@@ -20,4 +20,4 @@ Boston, MA 02110-1301, USA.
*/
#include <tqt.h>
-#include <textbrowser.h>
+#include <tqtextbrowser.h>
diff --git a/qtinterface/tqtextcodec.cpp b/qtinterface/tqtextcodec.cpp
index b3b36b8..6e047a5 100644
--- a/qtinterface/tqtextcodec.cpp
+++ b/qtinterface/tqtextcodec.cpp
@@ -20,7 +20,7 @@ Boston, MA 02110-1301, USA.
*/
#include <tqt.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
#ifdef USE_QT4
diff --git a/qtinterface/tqtextcodecfactory.cpp b/qtinterface/tqtextcodecfactory.cpp
index 074e7ab..ea81597 100644
--- a/qtinterface/tqtextcodecfactory.cpp
+++ b/qtinterface/tqtextcodecfactory.cpp
@@ -20,4 +20,4 @@ Boston, MA 02110-1301, USA.
*/
#include <tqt.h>
-#include <textcodecfactory.h>
+#include <tqtextcodecfactory.h>
diff --git a/qtinterface/tqtextcodecplugin.cpp b/qtinterface/tqtextcodecplugin.cpp
index 93f4b47..f076590 100644
--- a/qtinterface/tqtextcodecplugin.cpp
+++ b/qtinterface/tqtextcodecplugin.cpp
@@ -20,4 +20,4 @@ Boston, MA 02110-1301, USA.
*/
#include <tqt.h>
-#include <textcodecplugin.h>
+#include <tqtextcodecplugin.h>
diff --git a/qtinterface/tqtextedit.cpp b/qtinterface/tqtextedit.cpp
index b7e349e..2c80b1e 100644
--- a/qtinterface/tqtextedit.cpp
+++ b/qtinterface/tqtextedit.cpp
@@ -20,4 +20,4 @@ Boston, MA 02110-1301, USA.
*/
#include <tqt.h>
-#include <textedit.h>
+#include <tqtextedit.h>
diff --git a/qtinterface/tqtextstream.cpp b/qtinterface/tqtextstream.cpp
index f84b8c6..abc0898 100644
--- a/qtinterface/tqtextstream.cpp
+++ b/qtinterface/tqtextstream.cpp
@@ -20,4 +20,4 @@ Boston, MA 02110-1301, USA.
*/
#include <tqt.h>
-#include <textstream.h> \ No newline at end of file
+#include <tqtextstream.h> \ No newline at end of file
diff --git a/qtinterface/tqtextview.cpp b/qtinterface/tqtextview.cpp
index 2db465d..7f86067 100644
--- a/qtinterface/tqtextview.cpp
+++ b/qtinterface/tqtextview.cpp
@@ -20,4 +20,4 @@ Boston, MA 02110-1301, USA.
*/
#include <tqt.h>
-#include <textview.h>
+#include <tqtextview.h>
diff --git a/qtinterface/tqtstream.h b/qtinterface/tqtstream.h
index fde040b..a91eb2f 100644
--- a/qtinterface/tqtstream.h
+++ b/qtinterface/tqtstream.h
@@ -24,8 +24,8 @@ Boston, MA 02110-1301, USA.
#include <tqt.h>
-// Pull in textstream defines
+// Pull in tqtextstream defines
-#include <textstream.h>
+#include <tqtextstream.h>
#endif /* TQT_TQTSTREAM_H */ \ No newline at end of file