Update tqt3 on Debian and Ubuntu to handle new header names

6 files changed, 342 insertions, 342 deletions

diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-compat-headers.install b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-compat-headers.install
index 3adacbd90..bdab50e98 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-compat-headers.install
+++ b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-compat-headers.install
@@ -1,54 +1,54 @@
-usr/include/tqt3/q1xcompatibility.h
-usr/include/tqt3/qapp.h
-usr/include/tqt3/qarray.h
-usr/include/tqt3/qbitarry.h
-usr/include/tqt3/qbttngrp.h
-usr/include/tqt3/qchkbox.h
-usr/include/tqt3/qclipbrd.h
-usr/include/tqt3/qcollect.h
-usr/include/tqt3/qcollection.h
-usr/include/tqt3/qcombo.h
-usr/include/tqt3/qconnect.h
-usr/include/tqt3/qdatetm.h
-usr/include/tqt3/qdrawutl.h
-usr/include/tqt3/qdstream.h
-usr/include/tqt3/qfiledef.h
-usr/include/tqt3/qfiledlg.h
-usr/include/tqt3/qfileinf.h
-usr/include/tqt3/qfontinf.h
-usr/include/tqt3/qfontmet.h
-usr/include/tqt3/qgrpbox.h
-usr/include/tqt3/qintcach.h
-usr/include/tqt3/qiodev.h
-usr/include/tqt3/qlcdnum.h
-usr/include/tqt3/qlined.h
-usr/include/tqt3/qlist.h
-usr/include/tqt3/qmenudta.h
-usr/include/tqt3/qmetaobj.h
-usr/include/tqt3/qmlined.h
-usr/include/tqt3/qmsgbox.h
-usr/include/tqt3/qmultilinedit.h
-usr/include/tqt3/qobjcoll.h
-usr/include/tqt3/qobjdefs.h
-usr/include/tqt3/qpaintd.h
-usr/include/tqt3/qpaintdc.h
-usr/include/tqt3/qpdevmet.h
-usr/include/tqt3/qpmcache.h
-usr/include/tqt3/qpntarry.h
-usr/include/tqt3/qpopmenu.h
-usr/include/tqt3/qprndlg.h
-usr/include/tqt3/qprogbar.h
-usr/include/tqt3/qprogdlg.h
-usr/include/tqt3/qpsprn.h
-usr/include/tqt3/qpushbt.h
-usr/include/tqt3/qqueue.h
-usr/include/tqt3/qradiobt.h
-usr/include/tqt3/qrangect.h
-usr/include/tqt3/qscrbar.h
-usr/include/tqt3/qsocknot.h
-usr/include/tqt3/qstack.h
-usr/include/tqt3/qtabdlg.h
-usr/include/tqt3/qtstream.h
-usr/include/tqt3/qvector.h
-usr/include/tqt3/qwidcoll.h
-usr/include/tqt3/qwindefs.h
+usr/include/tqt3/ntq1xcompatibility.h
+usr/include/tqt3/ntqapp.h
+usr/include/tqt3/ntqarray.h
+usr/include/tqt3/ntqbitarry.h
+usr/include/tqt3/ntqbttngrp.h
+usr/include/tqt3/ntqchkbox.h
+usr/include/tqt3/ntqclipbrd.h
+usr/include/tqt3/ntqcollect.h
+usr/include/tqt3/ntqcollection.h
+usr/include/tqt3/ntqcombo.h
+usr/include/tqt3/ntqconnect.h
+usr/include/tqt3/ntqdatetm.h
+usr/include/tqt3/ntqdrawutl.h
+usr/include/tqt3/ntqdstream.h
+usr/include/tqt3/ntqfiledef.h
+usr/include/tqt3/ntqfiledlg.h
+usr/include/tqt3/ntqfileinf.h
+usr/include/tqt3/ntqfontinf.h
+usr/include/tqt3/ntqfontmet.h
+usr/include/tqt3/ntqgrpbox.h
+usr/include/tqt3/ntqintcach.h
+usr/include/tqt3/ntqiodev.h
+usr/include/tqt3/ntqlcdnum.h
+usr/include/tqt3/ntqlined.h
+usr/include/tqt3/ntqlist.h
+usr/include/tqt3/ntqmenudta.h
+usr/include/tqt3/ntqmetaobj.h
+usr/include/tqt3/ntqmlined.h
+usr/include/tqt3/ntqmsgbox.h
+usr/include/tqt3/ntqmultilinedit.h
+usr/include/tqt3/ntqobjcoll.h
+usr/include/tqt3/ntqobjdefs.h
+usr/include/tqt3/ntqpaintd.h
+usr/include/tqt3/ntqpaintdc.h
+usr/include/tqt3/ntqpdevmet.h
+usr/include/tqt3/ntqpmcache.h
+usr/include/tqt3/ntqpntarry.h
+usr/include/tqt3/ntqpopmenu.h
+usr/include/tqt3/ntqprndlg.h
+usr/include/tqt3/ntqprogbar.h
+usr/include/tqt3/ntqprogdlg.h
+usr/include/tqt3/ntqpsprn.h
+usr/include/tqt3/ntqpushbt.h
+usr/include/tqt3/ntqqueue.h
+usr/include/tqt3/ntqradiobt.h
+usr/include/tqt3/ntqrangect.h
+usr/include/tqt3/ntqscrbar.h
+usr/include/tqt3/ntqsocknot.h
+usr/include/tqt3/ntqstack.h
+usr/include/tqt3/ntqtabdlg.h
+usr/include/tqt3/ntqtstream.h
+usr/include/tqt3/ntqvector.h
+usr/include/tqt3/ntqwidcoll.h
+usr/include/tqt3/ntqwindefs.h
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-headers.install b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-headers.install
index b08596ee9..32d3bb87d 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-headers.install
+++ b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-headers.install
@@ -1,271 +1,271 @@
 usr/include/tqt3/private/*
-usr/include/tqt3/qabstractlayout.h
-usr/include/tqt3/qaccel.h
-usr/include/tqt3/qaccessible.h
-usr/include/tqt3/qaction.h
-usr/include/tqt3/qapplication.h
-usr/include/tqt3/qasciicache.h
-usr/include/tqt3/qasciidict.h
-usr/include/tqt3/qasyncimageio.h
-usr/include/tqt3/qasyncio.h
-usr/include/tqt3/qbig5codec.h
-usr/include/tqt3/qbitarray.h
-usr/include/tqt3/qbitmap.h
-usr/include/tqt3/qbrush.h
-usr/include/tqt3/qbuffer.h
-usr/include/tqt3/qbutton.h
-usr/include/tqt3/qbuttongroup.h
-usr/include/tqt3/qcache.h
-usr/include/tqt3/qcanvas.h
-usr/include/tqt3/qcdestyle.h
-usr/include/tqt3/qcheckbox.h
-usr/include/tqt3/qcleanuphandler.h
-usr/include/tqt3/qclipboard.h
-usr/include/tqt3/qcolor.h
-usr/include/tqt3/qcolordialog.h
-usr/include/tqt3/qcombobox.h
-usr/include/tqt3/qcommonstyle.h
-usr/include/tqt3/qcompactstyle.h
-usr/include/tqt3/qconnection.h
-usr/include/tqt3/qcstring.h
-usr/include/tqt3/qcursor.h
-usr/include/tqt3/qdatabrowser.h
-usr/include/tqt3/qdatastream.h
-usr/include/tqt3/qdatatable.h
-usr/include/tqt3/qdataview.h
-usr/include/tqt3/qdatetime.h
-usr/include/tqt3/qdatetimeedit.h
-usr/include/tqt3/qdeepcopy.h
-usr/include/tqt3/qdesktopwidget.h
-usr/include/tqt3/qdial.h
-usr/include/tqt3/qdialog.h
-usr/include/tqt3/qdict.h
-usr/include/tqt3/qdir.h
-usr/include/tqt3/qdns.h
-usr/include/tqt3/qdockarea.h
-usr/include/tqt3/qdockwindow.h
-usr/include/tqt3/qdom.h
-usr/include/tqt3/qdragobject.h
-usr/include/tqt3/qdrawutil.h
-usr/include/tqt3/qdropsite.h
-usr/include/tqt3/qeditorfactory.h
-usr/include/tqt3/qerrormessage.h
-usr/include/tqt3/qeucjpcodec.h
-usr/include/tqt3/qeuckrcodec.h
-usr/include/tqt3/qevent.h
-usr/include/tqt3/qeventloop.h
-usr/include/tqt3/qfeatures.h
-usr/include/tqt3/qfile.h
-usr/include/tqt3/qfiledialog.h
-usr/include/tqt3/qfileinfo.h
-usr/include/tqt3/qfocusdata.h
-usr/include/tqt3/qfont.h
-usr/include/tqt3/qfontdatabase.h
-usr/include/tqt3/qfontdialog.h
-usr/include/tqt3/qfontinfo.h
-usr/include/tqt3/qfontmetrics.h
-usr/include/tqt3/qframe.h
-usr/include/tqt3/qftp.h
-usr/include/tqt3/qgarray.h
-usr/include/tqt3/qgb18030codec.h
-usr/include/tqt3/qgbkcodec.h
-usr/include/tqt3/qgcache.h
-usr/include/tqt3/qgdict.h
-usr/include/tqt3/qgeneric.h
-usr/include/tqt3/qgif.h
-usr/include/tqt3/qglist.h
-usr/include/tqt3/qglobal.h
-usr/include/tqt3/qgplugin.h
-usr/include/tqt3/qgrid.h
-usr/include/tqt3/qgridview.h
-usr/include/tqt3/qgroupbox.h
-usr/include/tqt3/qguardedptr.h
-usr/include/tqt3/qgvector.h
-usr/include/tqt3/qhbox.h
-usr/include/tqt3/qhbuttongroup.h
-usr/include/tqt3/qheader.h
-usr/include/tqt3/qhgroupbox.h
-usr/include/tqt3/qhostaddress.h
-usr/include/tqt3/qhttp.h
-usr/include/tqt3/qiconset.h
-usr/include/tqt3/qiconview.h
-usr/include/tqt3/qimage.h
-usr/include/tqt3/qimageformatplugin.h
-usr/include/tqt3/qinputdialog.h
-usr/include/tqt3/qintcache.h
-usr/include/tqt3/qintdict.h
-usr/include/tqt3/qinterlacestyle.h
-usr/include/tqt3/qiodevice.h
-usr/include/tqt3/qjiscodec.h
-usr/include/tqt3/qjpegio.h
-usr/include/tqt3/qjpunicode.h
-usr/include/tqt3/qkeycode.h
-usr/include/tqt3/qkeysequence.h
-usr/include/tqt3/qlabel.h
-usr/include/tqt3/qlayout.h
-usr/include/tqt3/qlcdnumber.h
-usr/include/tqt3/qlibrary.h
-usr/include/tqt3/qlineedit.h
-usr/include/tqt3/qlistbox.h
-usr/include/tqt3/qlistview.h
-usr/include/tqt3/qlocale.h
-usr/include/tqt3/qlocalfs.h
-usr/include/tqt3/qmainwindow.h
-usr/include/tqt3/qmap.h
-usr/include/tqt3/qmemarray.h
-usr/include/tqt3/qmenubar.h
-usr/include/tqt3/qmenudata.h
-usr/include/tqt3/qmessagebox.h
-usr/include/tqt3/qmetaobject.h
-usr/include/tqt3/qmime.h
-usr/include/tqt3/qmngio.h
-usr/include/tqt3/qmotifstyle.h
-usr/include/tqt3/qmotifplusstyle.h
-usr/include/tqt3/qmovie.h
-usr/include/tqt3/qmultilineedit.h
-usr/include/tqt3/qmutex.h
-usr/include/tqt3/qnamespace.h
-usr/include/tqt3/qnetwork.h
-usr/include/tqt3/qnetworkprotocol.h
-usr/include/tqt3/qnp.h
-usr/include/tqt3/qobject.h
-usr/include/tqt3/qobjectcleanuphandler.h
-usr/include/tqt3/qobjectdefs.h
-usr/include/tqt3/qobjectdict.h
-usr/include/tqt3/qobjectlist.h
-usr/include/tqt3/qpaintdevice.h
-usr/include/tqt3/qpaintdevicedefs.h
-usr/include/tqt3/qpaintdevicemetrics.h
-usr/include/tqt3/qpainter.h
-usr/include/tqt3/qpair.h
-usr/include/tqt3/qpalette.h
-usr/include/tqt3/qpen.h
-usr/include/tqt3/qpicture.h
-usr/include/tqt3/qpixmap.h
-usr/include/tqt3/qpixmapcache.h
-usr/include/tqt3/qplatinumstyle.h
-usr/include/tqt3/qpngio.h
-usr/include/tqt3/qpoint.h
-usr/include/tqt3/qpointarray.h
-usr/include/tqt3/qpolygonscanner.h
-usr/include/tqt3/qpopupmenu.h
-usr/include/tqt3/qprintdialog.h
-usr/include/tqt3/qprinter.h
-usr/include/tqt3/qprocess.h
-usr/include/tqt3/qprogressbar.h
-usr/include/tqt3/qprogressdialog.h
-usr/include/tqt3/qptrcollection.h
-usr/include/tqt3/qptrdict.h
-usr/include/tqt3/qptrlist.h
-usr/include/tqt3/qptrqueue.h
-usr/include/tqt3/qptrstack.h
-usr/include/tqt3/qptrvector.h
-usr/include/tqt3/qpushbutton.h
-usr/include/tqt3/qradiobutton.h
-usr/include/tqt3/qrangecontrol.h
-usr/include/tqt3/qrect.h
-usr/include/tqt3/qregexp.h
-usr/include/tqt3/qregion.h
-usr/include/tqt3/qrtlcodec.h
-usr/include/tqt3/qscrollbar.h
-usr/include/tqt3/qscrollview.h
-usr/include/tqt3/qsemaphore.h
-usr/include/tqt3/qsemimodal.h
-usr/include/tqt3/qserversocket.h
-usr/include/tqt3/qsession.h
-usr/include/tqt3/qsessionmanager.h
-usr/include/tqt3/qsettings.h
-usr/include/tqt3/qsgistyle.h
-usr/include/tqt3/qshared.h
-usr/include/tqt3/qsignal.h
-usr/include/tqt3/qsignalmapper.h
-usr/include/tqt3/qsignalslotimp.h
-usr/include/tqt3/qsimplerichtext.h
-usr/include/tqt3/qsize.h
-usr/include/tqt3/qsizegrip.h
-usr/include/tqt3/qsizepolicy.h
-usr/include/tqt3/qsjiscodec.h
-usr/include/tqt3/qslider.h
-usr/include/tqt3/qsocket.h
-usr/include/tqt3/qsocketdevice.h
-usr/include/tqt3/qsocketnotifier.h
-usr/include/tqt3/qsortedlist.h
-usr/include/tqt3/qsound.h
-usr/include/tqt3/qspinbox.h
-usr/include/tqt3/qsplashscreen.h
-usr/include/tqt3/qsplitter.h
-usr/include/tqt3/qsql.h
-usr/include/tqt3/qsqlcursor.h
-usr/include/tqt3/qsqldatabase.h
-usr/include/tqt3/qsqldriver.h
-usr/include/tqt3/qsqldriverplugin.h
-usr/include/tqt3/qsqleditorfactory.h
-usr/include/tqt3/qsqlerror.h
-usr/include/tqt3/qsqlfield.h
-usr/include/tqt3/qsqlform.h
-usr/include/tqt3/qsqlindex.h
-usr/include/tqt3/qsqlpropertymap.h
-usr/include/tqt3/qsqlquery.h
-usr/include/tqt3/qsqlrecord.h
-usr/include/tqt3/qsqlresult.h
-usr/include/tqt3/qsqlselectcursor.h
-usr/include/tqt3/qstatusbar.h
-usr/include/tqt3/qstring.h
-usr/include/tqt3/qstringlist.h
-usr/include/tqt3/qstrlist.h
-usr/include/tqt3/qstrvec.h
-usr/include/tqt3/qstyle.h
-usr/include/tqt3/qstylefactory.h
-usr/include/tqt3/qstyleplugin.h
-usr/include/tqt3/qstylesheet.h
-usr/include/tqt3/qsyntaxhighlighter.h
-usr/include/tqt3/qt.h
-usr/include/tqt3/qtabbar.h
-usr/include/tqt3/qtabdialog.h
-usr/include/tqt3/qtable.h
-usr/include/tqt3/qtabwidget.h
-usr/include/tqt3/qtextbrowser.h
-usr/include/tqt3/qtextcodec.h
-usr/include/tqt3/qtextcodecfactory.h
-usr/include/tqt3/qtextcodecplugin.h
-usr/include/tqt3/qtextedit.h
-usr/include/tqt3/qtextstream.h
-usr/include/tqt3/qtextview.h
-usr/include/tqt3/qthread.h
-usr/include/tqt3/qthreadstorage.h
-usr/include/tqt3/qtimer.h
-usr/include/tqt3/qtl.h
-usr/include/tqt3/qtoolbar.h
-usr/include/tqt3/qtoolbox.h
-usr/include/tqt3/qtoolbutton.h
-usr/include/tqt3/qtooltip.h
-usr/include/tqt3/qtranslator.h
-usr/include/tqt3/qtsciicodec.h
-usr/include/tqt3/qurl.h
-usr/include/tqt3/qurlinfo.h
-usr/include/tqt3/qurloperator.h
-usr/include/tqt3/qutfcodec.h
-usr/include/tqt3/quuid.h
-usr/include/tqt3/qvalidator.h
-usr/include/tqt3/qvaluelist.h
-usr/include/tqt3/qvaluestack.h
-usr/include/tqt3/qvaluevector.h
-usr/include/tqt3/qvariant.h
-usr/include/tqt3/qvbox.h
-usr/include/tqt3/qvbuttongroup.h
-usr/include/tqt3/qvfbhdr.h
-usr/include/tqt3/qvgroupbox.h
-usr/include/tqt3/qwaitcondition.h
-usr/include/tqt3/qwhatsthis.h
-usr/include/tqt3/qwidget.h
-usr/include/tqt3/qwidgetintdict.h
-usr/include/tqt3/qwidgetlist.h
-usr/include/tqt3/qwidgetplugin.h
-usr/include/tqt3/qwidgetstack.h
-usr/include/tqt3/qwindowdefs.h
-usr/include/tqt3/qwindowsstyle.h
-usr/include/tqt3/qwinexport.h
-usr/include/tqt3/qwizard.h
-usr/include/tqt3/qwmatrix.h
-usr/include/tqt3/qworkspace.h
-usr/include/tqt3/qxml.h
+usr/include/tqt3/ntqabstractlayout.h
+usr/include/tqt3/ntqaccel.h
+usr/include/tqt3/ntqaccessible.h
+usr/include/tqt3/ntqaction.h
+usr/include/tqt3/ntqapplication.h
+usr/include/tqt3/ntqasciicache.h
+usr/include/tqt3/ntqasciidict.h
+usr/include/tqt3/ntqasyncimageio.h
+usr/include/tqt3/ntqasyncio.h
+usr/include/tqt3/ntqbig5codec.h
+usr/include/tqt3/ntqbitarray.h
+usr/include/tqt3/ntqbitmap.h
+usr/include/tqt3/ntqbrush.h
+usr/include/tqt3/ntqbuffer.h
+usr/include/tqt3/ntqbutton.h
+usr/include/tqt3/ntqbuttongroup.h
+usr/include/tqt3/ntqcache.h
+usr/include/tqt3/ntqcanvas.h
+usr/include/tqt3/ntqcdestyle.h
+usr/include/tqt3/ntqcheckbox.h
+usr/include/tqt3/ntqcleanuphandler.h
+usr/include/tqt3/ntqclipboard.h
+usr/include/tqt3/ntqcolor.h
+usr/include/tqt3/ntqcolordialog.h
+usr/include/tqt3/ntqcombobox.h
+usr/include/tqt3/ntqcommonstyle.h
+usr/include/tqt3/ntqcompactstyle.h
+usr/include/tqt3/ntqconnection.h
+usr/include/tqt3/ntqcstring.h
+usr/include/tqt3/ntqcursor.h
+usr/include/tqt3/ntqdatabrowser.h
+usr/include/tqt3/ntqdatastream.h
+usr/include/tqt3/ntqdatatable.h
+usr/include/tqt3/ntqdataview.h
+usr/include/tqt3/ntqdatetime.h
+usr/include/tqt3/ntqdatetimeedit.h
+usr/include/tqt3/ntqdeepcopy.h
+usr/include/tqt3/ntqdesktopwidget.h
+usr/include/tqt3/ntqdial.h
+usr/include/tqt3/ntqdialog.h
+usr/include/tqt3/ntqdict.h
+usr/include/tqt3/ntqdir.h
+usr/include/tqt3/ntqdns.h
+usr/include/tqt3/ntqdockarea.h
+usr/include/tqt3/ntqdockwindow.h
+usr/include/tqt3/ntqdom.h
+usr/include/tqt3/ntqdragobject.h
+usr/include/tqt3/ntqdrawutil.h
+usr/include/tqt3/ntqdropsite.h
+usr/include/tqt3/ntqeditorfactory.h
+usr/include/tqt3/ntqerrormessage.h
+usr/include/tqt3/ntqeucjpcodec.h
+usr/include/tqt3/ntqeuckrcodec.h
+usr/include/tqt3/ntqevent.h
+usr/include/tqt3/ntqeventloop.h
+usr/include/tqt3/ntqfeatures.h
+usr/include/tqt3/ntqfile.h
+usr/include/tqt3/ntqfiledialog.h
+usr/include/tqt3/ntqfileinfo.h
+usr/include/tqt3/ntqfocusdata.h
+usr/include/tqt3/ntqfont.h
+usr/include/tqt3/ntqfontdatabase.h
+usr/include/tqt3/ntqfontdialog.h
+usr/include/tqt3/ntqfontinfo.h
+usr/include/tqt3/ntqfontmetrics.h
+usr/include/tqt3/ntqframe.h
+usr/include/tqt3/ntqftp.h
+usr/include/tqt3/ntqgarray.h
+usr/include/tqt3/ntqgb18030codec.h
+usr/include/tqt3/ntqgbkcodec.h
+usr/include/tqt3/ntqgcache.h
+usr/include/tqt3/ntqgdict.h
+usr/include/tqt3/ntqgeneric.h
+usr/include/tqt3/ntqgif.h
+usr/include/tqt3/ntqglist.h
+usr/include/tqt3/ntqglobal.h
+usr/include/tqt3/ntqgplugin.h
+usr/include/tqt3/ntqgrid.h
+usr/include/tqt3/ntqgridview.h
+usr/include/tqt3/ntqgroupbox.h
+usr/include/tqt3/ntqguardedptr.h
+usr/include/tqt3/ntqgvector.h
+usr/include/tqt3/ntqhbox.h
+usr/include/tqt3/ntqhbuttongroup.h
+usr/include/tqt3/ntqheader.h
+usr/include/tqt3/ntqhgroupbox.h
+usr/include/tqt3/ntqhostaddress.h
+usr/include/tqt3/ntqhttp.h
+usr/include/tqt3/ntqiconset.h
+usr/include/tqt3/ntqiconview.h
+usr/include/tqt3/ntqimage.h
+usr/include/tqt3/ntqimageformatplugin.h
+usr/include/tqt3/ntqinputdialog.h
+usr/include/tqt3/ntqintcache.h
+usr/include/tqt3/ntqintdict.h
+usr/include/tqt3/ntqinterlacestyle.h
+usr/include/tqt3/ntqiodevice.h
+usr/include/tqt3/ntqjiscodec.h
+usr/include/tqt3/ntqjpegio.h
+usr/include/tqt3/ntqjpunicode.h
+usr/include/tqt3/ntqkeycode.h
+usr/include/tqt3/ntqkeysequence.h
+usr/include/tqt3/ntqlabel.h
+usr/include/tqt3/ntqlayout.h
+usr/include/tqt3/ntqlcdnumber.h
+usr/include/tqt3/ntqlibrary.h
+usr/include/tqt3/ntqlineedit.h
+usr/include/tqt3/ntqlistbox.h
+usr/include/tqt3/ntqlistview.h
+usr/include/tqt3/ntqlocale.h
+usr/include/tqt3/ntqlocalfs.h
+usr/include/tqt3/ntqmainwindow.h
+usr/include/tqt3/ntqmap.h
+usr/include/tqt3/ntqmemarray.h
+usr/include/tqt3/ntqmenubar.h
+usr/include/tqt3/ntqmenudata.h
+usr/include/tqt3/ntqmessagebox.h
+usr/include/tqt3/ntqmetaobject.h
+usr/include/tqt3/ntqmime.h
+usr/include/tqt3/ntqmngio.h
+usr/include/tqt3/ntqmotifstyle.h
+usr/include/tqt3/ntqmotifplusstyle.h
+usr/include/tqt3/ntqmovie.h
+usr/include/tqt3/ntqmultilineedit.h
+usr/include/tqt3/ntqmutex.h
+usr/include/tqt3/ntqnamespace.h
+usr/include/tqt3/ntqnetwork.h
+usr/include/tqt3/ntqnetworkprotocol.h
+usr/include/tqt3/ntqnp.h
+usr/include/tqt3/ntqobject.h
+usr/include/tqt3/ntqobjectcleanuphandler.h
+usr/include/tqt3/ntqobjectdefs.h
+usr/include/tqt3/ntqobjectdict.h
+usr/include/tqt3/ntqobjectlist.h
+usr/include/tqt3/ntqpaintdevice.h
+usr/include/tqt3/ntqpaintdevicedefs.h
+usr/include/tqt3/ntqpaintdevicemetrics.h
+usr/include/tqt3/ntqpainter.h
+usr/include/tqt3/ntqpair.h
+usr/include/tqt3/ntqpalette.h
+usr/include/tqt3/ntqpen.h
+usr/include/tqt3/ntqpicture.h
+usr/include/tqt3/ntqpixmap.h
+usr/include/tqt3/ntqpixmapcache.h
+usr/include/tqt3/ntqplatinumstyle.h
+usr/include/tqt3/ntqpngio.h
+usr/include/tqt3/ntqpoint.h
+usr/include/tqt3/ntqpointarray.h
+usr/include/tqt3/ntqpolygonscanner.h
+usr/include/tqt3/ntqpopupmenu.h
+usr/include/tqt3/ntqprintdialog.h
+usr/include/tqt3/ntqprinter.h
+usr/include/tqt3/ntqprocess.h
+usr/include/tqt3/ntqprogressbar.h
+usr/include/tqt3/ntqprogressdialog.h
+usr/include/tqt3/ntqptrcollection.h
+usr/include/tqt3/ntqptrdict.h
+usr/include/tqt3/ntqptrlist.h
+usr/include/tqt3/ntqptrqueue.h
+usr/include/tqt3/ntqptrstack.h
+usr/include/tqt3/ntqptrvector.h
+usr/include/tqt3/ntqpushbutton.h
+usr/include/tqt3/ntqradiobutton.h
+usr/include/tqt3/ntqrangecontrol.h
+usr/include/tqt3/ntqrect.h
+usr/include/tqt3/ntqregexp.h
+usr/include/tqt3/ntqregion.h
+usr/include/tqt3/ntqrtlcodec.h
+usr/include/tqt3/ntqscrollbar.h
+usr/include/tqt3/ntqscrollview.h
+usr/include/tqt3/ntqsemaphore.h
+usr/include/tqt3/ntqsemimodal.h
+usr/include/tqt3/ntqserversocket.h
+usr/include/tqt3/ntqsession.h
+usr/include/tqt3/ntqsessionmanager.h
+usr/include/tqt3/ntqsettings.h
+usr/include/tqt3/ntqsgistyle.h
+usr/include/tqt3/ntqshared.h
+usr/include/tqt3/ntqsignal.h
+usr/include/tqt3/ntqsignalmapper.h
+usr/include/tqt3/ntqsignalslotimp.h
+usr/include/tqt3/ntqsimplerichtext.h
+usr/include/tqt3/ntqsize.h
+usr/include/tqt3/ntqsizegrip.h
+usr/include/tqt3/ntqsizepolicy.h
+usr/include/tqt3/ntqsjiscodec.h
+usr/include/tqt3/ntqslider.h
+usr/include/tqt3/ntqsocket.h
+usr/include/tqt3/ntqsocketdevice.h
+usr/include/tqt3/ntqsocketnotifier.h
+usr/include/tqt3/ntqsortedlist.h
+usr/include/tqt3/ntqsound.h
+usr/include/tqt3/ntqspinbox.h
+usr/include/tqt3/ntqsplashscreen.h
+usr/include/tqt3/ntqsplitter.h
+usr/include/tqt3/ntqsql.h
+usr/include/tqt3/ntqsqlcursor.h
+usr/include/tqt3/ntqsqldatabase.h
+usr/include/tqt3/ntqsqldriver.h
+usr/include/tqt3/ntqsqldriverplugin.h
+usr/include/tqt3/ntqsqleditorfactory.h
+usr/include/tqt3/ntqsqlerror.h
+usr/include/tqt3/ntqsqlfield.h
+usr/include/tqt3/ntqsqlform.h
+usr/include/tqt3/ntqsqlindex.h
+usr/include/tqt3/ntqsqlpropertymap.h
+usr/include/tqt3/ntqsqlquery.h
+usr/include/tqt3/ntqsqlrecord.h
+usr/include/tqt3/ntqsqlresult.h
+usr/include/tqt3/ntqsqlselectcursor.h
+usr/include/tqt3/ntqstatusbar.h
+usr/include/tqt3/ntqstring.h
+usr/include/tqt3/ntqstringlist.h
+usr/include/tqt3/ntqstrlist.h
+usr/include/tqt3/ntqstrvec.h
+usr/include/tqt3/ntqstyle.h
+usr/include/tqt3/ntqstylefactory.h
+usr/include/tqt3/ntqstyleplugin.h
+usr/include/tqt3/ntqstylesheet.h
+usr/include/tqt3/ntqsyntaxhighlighter.h
+usr/include/tqt3/ntqt.h
+usr/include/tqt3/ntqtabbar.h
+usr/include/tqt3/ntqtabdialog.h
+usr/include/tqt3/ntqtable.h
+usr/include/tqt3/ntqtabwidget.h
+usr/include/tqt3/ntqtextbrowser.h
+usr/include/tqt3/ntqtextcodec.h
+usr/include/tqt3/ntqtextcodecfactory.h
+usr/include/tqt3/ntqtextcodecplugin.h
+usr/include/tqt3/ntqtextedit.h
+usr/include/tqt3/ntqtextstream.h
+usr/include/tqt3/ntqtextview.h
+usr/include/tqt3/ntqthread.h
+usr/include/tqt3/ntqthreadstorage.h
+usr/include/tqt3/ntqtimer.h
+usr/include/tqt3/ntqtl.h
+usr/include/tqt3/ntqtoolbar.h
+usr/include/tqt3/ntqtoolbox.h
+usr/include/tqt3/ntqtoolbutton.h
+usr/include/tqt3/ntqtooltip.h
+usr/include/tqt3/ntqtranslator.h
+usr/include/tqt3/ntqtsciicodec.h
+usr/include/tqt3/ntqurl.h
+usr/include/tqt3/ntqurlinfo.h
+usr/include/tqt3/ntqurloperator.h
+usr/include/tqt3/ntqutfcodec.h
+usr/include/tqt3/ntquuid.h
+usr/include/tqt3/ntqvalidator.h
+usr/include/tqt3/ntqvaluelist.h
+usr/include/tqt3/ntqvaluestack.h
+usr/include/tqt3/ntqvaluevector.h
+usr/include/tqt3/ntqvariant.h
+usr/include/tqt3/ntqvbox.h
+usr/include/tqt3/ntqvbuttongroup.h
+usr/include/tqt3/ntqvfbhdr.h
+usr/include/tqt3/ntqvgroupbox.h
+usr/include/tqt3/ntqwaitcondition.h
+usr/include/tqt3/ntqwhatsthis.h
+usr/include/tqt3/ntqwidget.h
+usr/include/tqt3/ntqwidgetintdict.h
+usr/include/tqt3/ntqwidgetlist.h
+usr/include/tqt3/ntqwidgetplugin.h
+usr/include/tqt3/ntqwidgetstack.h
+usr/include/tqt3/ntqwindowdefs.h
+usr/include/tqt3/ntqwindowsstyle.h
+usr/include/tqt3/ntqwinexport.h
+usr/include/tqt3/ntqwizard.h
+usr/include/tqt3/ntqwmatrix.h
+usr/include/tqt3/ntqworkspace.h
+usr/include/tqt3/ntqxml.h
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-dev.install b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-dev.install
index 43ee1dce7..e846fb59e 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-dev.install
+++ b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-dev.install
@@ -4,6 +4,6 @@ usr/lib/libtqt-mt.so
 usr/lib/libtqui.prl
 usr/lib/libtqui.so
 usr/lib/pkgconfig/tqt-mt.pc
-usr/include/tqt3/qgl.h
-usr/include/tqt3/qglcolormap.h
-usr/include/tqt3/qwidgetfactory.h
+usr/include/tqt3/ntqgl.h
+usr/include/tqt3/ntqglcolormap.h
+usr/include/tqt3/ntqwidgetfactory.h
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/maintain/build-examples.sh b/ubuntu/maverick/dependencies/tqt3/debian/maintain/build-examples.sh
index 25da9bf59..ad98ad5be 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/maintain/build-examples.sh
+++ b/ubuntu/maverick/dependencies/tqt3/debian/maintain/build-examples.sh
@@ -7,7 +7,7 @@ export QTDIR=/usr/share/tqt3
 cp /usr/share/tqt3/.qmake.cache ./.qmake.cache
 
 # Now compile the examples. The themes example
-# won't work since qconfig.h is not really correct with the
+# won't work since ntqconfig.h is not really correct with the
 # ifdef's for the QT_NO_xyz_STYLE, so we use make -k to continue
 cd examples; qmake -o Makefile examples.pro; make -k
 
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/rules b/ubuntu/maverick/dependencies/tqt3/debian/rules
index be33513fd..047a93868 100755
--- a/ubuntu/maverick/dependencies/tqt3/debian/rules
+++ b/ubuntu/maverick/dependencies/tqt3/debian/rules
@@ -127,10 +127,10 @@ libqt-thread-stamp: $(QUILT_STAMPFN)
 
 	echo yes | ./configure $(CONFIGURE_OPTS)
 
-	rm -rf include/qinputcontext.h include/qinputcontextfactory.h include/qinputcontextplugin.h
-	ln -s ../src/kernel/qinputcontext.h include/qinputcontext.h
-	ln -s ../src/inputmethod/qinputcontextfactory.h include/qinputcontextfactory.h
-	ln -s ../src/inputmethod/qinputcontextplugin.h include/qinputcontextplugin.h
+	rm -rf include/ntqinputcontext.h include/ntqinputcontextfactory.h include/ntqinputcontextplugin.h
+	ln -s ../src/kernel/ntqinputcontext.h include/ntqinputcontext.h
+	ln -s ../src/inputmethod/ntqinputcontextfactory.h include/ntqinputcontextfactory.h
+	ln -s ../src/inputmethod/ntqinputcontextplugin.h include/ntqinputcontextplugin.h
 
 	# proceed
 	$(MAKE) sub-src sub-plugins sub-tools
@@ -157,13 +157,13 @@ libqt-thread-stamp: $(QUILT_STAMPFN)
 	install -d $(P_QTMTDEV)/usr/share/tqt3/
 	cat .qmake.cache | sed "s#$(QTDIR)#/usr/share/tqt3#g" > $(P_QTMTDEV)/usr/share/tqt3/.qmake.cache
 
-	# install qconfig.h for the mt
-	install -m 644 -D include/qconfig.h $(P_QTMTDEV)/usr/include/tqt3/qconfig.h
-	install -m 644 -D include/qmodules.h $(P_QTMTDEV)/usr/include/tqt3/qmodules.h
+	# install ntqconfig.h for the mt
+	install -m 644 -D include/ntqconfig.h $(P_QTMTDEV)/usr/include/tqt3/ntqconfig.h
+	install -m 644 -D include/ntqmodules.h $(P_QTMTDEV)/usr/include/tqt3/ntqmodules.h
 
-	install -m 644 -D include/qinputcontext.h $(P_HEADERS)/usr/include/tqt3/qinputcontext.h
-	install -m 644 -D include/qinputcontextfactory.h $(P_HEADERS)/usr/include/tqt3/qinputcontextfactory.h
-	install -m 644 -D include/qinputcontextplugin.h $(P_HEADERS)/usr/include/tqt3/qinputcontextplugin.h
+	install -m 644 -D include/ntqinputcontext.h $(P_HEADERS)/usr/include/tqt3/ntqinputcontext.h
+	install -m 644 -D include/ntqinputcontextfactory.h $(P_HEADERS)/usr/include/tqt3/ntqinputcontextfactory.h
+	install -m 644 -D include/ntqinputcontextplugin.h $(P_HEADERS)/usr/include/tqt3/ntqinputcontextplugin.h
 
 	touch libqt-thread-stamp
 
@@ -188,14 +188,14 @@ clean: unpatch
 
 	-rm -rf .qmake.cache src/.qmake.internal.cache tools/designer/designer/.qmake.internal.cache qmake/GNUmakefile \
 		config.status bin/moc bin/qmake src/moc/*.o mkspecs/default lib/lib* `pwd`/debian/doc $(TMP_INSTALL) \
-		src/tools/qconfig.cpp include/qconfig.h include/qmodules.h plugins/accessibleqtwidgets.prl \
+		src/tools/qconfig.cpp include/ntqconfig.h include/ntqmodules.h plugins/accessibleqtwidgets.prl \
 		config.tests/unix/ipv6/ipv6test config.tests/unix/ipv6/ipv6test.o config.tests/unix/ptrsize/ptrsizetest.o \
 		config.tests/unix/ptrsize/ptrsizetest config.tests/unix/endian/endiantest.o \
 		config.tests/unix/endian/endiantest lib/tqt-mt.pc extensions/nsplugin/examples/trivial/libtrivial.prl \
 		extensions/nsplugin/examples/grapher/libgrapher.prl bin/designer
 
 	rm -f qmake/*o
-	rm -rf include/qinputcontext.h include/qinputcontextfactory.h include/qinputcontextplugin.h
+	rm -rf include/ntqinputcontext.h include/ntqinputcontextfactory.h include/ntqinputcontextplugin.h
 	rm -f src/.obj/debug-shared-mt/*o plugins/src/inputmethods/imsw-multi/.obj/debug-shared-mt/*o plugins/inputmethods/*so
 	rm -f plugins/src/inputmethods/imsw-none/.obj/debug-shared-mt/*o plugins/src/inputmethods/simple/.obj/debug-shared-mt/*o plugins/src/inputmethods/xim/.obj/debug-shared-mt/*o
 
@@ -227,7 +227,7 @@ install: build
 	install -d $(P_DOC)/usr/share/tqt3/doc/html/
 	for a in `cd $(TMP_INSTALL)/usr/share/tqt3/doc/html/ && find`; do cp $(TMP_INSTALL)/usr/share/tqt3/doc/html/"$$a" $(P_DOC)/usr/share/tqt3/doc/html/; done
 	#typo bugfix
-	sed -i -e 's/reveives/receives/' $(P_DOC)/usr/share/tqt3/doc/html/qwidget.html
+	sed -i -e 's/reveives/receives/' $(P_DOC)/usr/share/tqt3/doc/html/ntqwidget.html
 
 	## build designer package documentation
 	# tqt3-designer
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-apps-dev.install b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-apps-dev.install
index b69f266ef..a8f4abfa7 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-apps-dev.install
+++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-apps-dev.install
@@ -4,4 +4,4 @@ usr/lib/libdesignercore.prl
 usr/lib/libdesignercore.a
 usr/lib/libqassistantclient.prl
 usr/lib/libqassistantclient.a
-usr/include/tqt3/qassistantclient.h
+usr/include/tqt3/ntqassistantclient.h