summaryrefslogtreecommitdiffstats
path: root/kpovmodeler
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-19 19:03:33 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-19 19:03:33 +0000
commite69e8b1d09fb579316595b4e6a850e717358a8b1 (patch)
treea24fc20865f65772f530d16177520190594ffdd2 /kpovmodeler
parenteecec9afb81fdebb0f22e9da22635874c403f854 (diff)
downloadtdegraphics-e69e8b1d09fb579316595b4e6a850e717358a8b1.tar.gz
tdegraphics-e69e8b1d09fb579316595b4e6a850e717358a8b1.zip
TQt4 port kdegraphics
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1237557 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kpovmodeler')
-rw-r--r--kpovmodeler/StyleConvention8
-rw-r--r--kpovmodeler/baseinsertrules.xml144
-rw-r--r--kpovmodeler/pm2dcontrolpoint.cpp2
-rw-r--r--kpovmodeler/pmactions.cpp48
-rw-r--r--kpovmodeler/pmactions.h9
-rw-r--r--kpovmodeler/pmaddcommand.cpp20
-rw-r--r--kpovmodeler/pmaddcommand.h10
-rw-r--r--kpovmodeler/pmbicubicpatch.cpp16
-rw-r--r--kpovmodeler/pmbicubicpatch.h4
-rw-r--r--kpovmodeler/pmbicubicpatchedit.cpp32
-rw-r--r--kpovmodeler/pmbicubicpatchedit.h5
-rw-r--r--kpovmodeler/pmblendmapmodifiers.cpp8
-rw-r--r--kpovmodeler/pmblendmapmodifiers.h4
-rw-r--r--kpovmodeler/pmblendmapmodifiersedit.cpp4
-rw-r--r--kpovmodeler/pmblendmapmodifiersedit.h5
-rw-r--r--kpovmodeler/pmblob.cpp8
-rw-r--r--kpovmodeler/pmblob.h4
-rw-r--r--kpovmodeler/pmblobcylinder.cpp8
-rw-r--r--kpovmodeler/pmblobcylinder.h4
-rw-r--r--kpovmodeler/pmblobcylinderedit.cpp12
-rw-r--r--kpovmodeler/pmblobcylinderedit.h5
-rw-r--r--kpovmodeler/pmblobedit.cpp4
-rw-r--r--kpovmodeler/pmblobedit.h5
-rw-r--r--kpovmodeler/pmblobsphere.cpp8
-rw-r--r--kpovmodeler/pmblobsphere.h4
-rw-r--r--kpovmodeler/pmblobsphereedit.cpp18
-rw-r--r--kpovmodeler/pmblobsphereedit.h5
-rw-r--r--kpovmodeler/pmboundedby.cpp8
-rw-r--r--kpovmodeler/pmboundedby.h4
-rw-r--r--kpovmodeler/pmboundedbyedit.cpp4
-rw-r--r--kpovmodeler/pmboundedbyedit.h5
-rw-r--r--kpovmodeler/pmbox.cpp8
-rw-r--r--kpovmodeler/pmbox.h4
-rw-r--r--kpovmodeler/pmboxedit.cpp4
-rw-r--r--kpovmodeler/pmboxedit.h5
-rw-r--r--kpovmodeler/pmbumpmap.cpp8
-rw-r--r--kpovmodeler/pmbumpmap.h4
-rw-r--r--kpovmodeler/pmbumpmapedit.cpp6
-rw-r--r--kpovmodeler/pmbumpmapedit.h5
-rw-r--r--kpovmodeler/pmcamera.cpp8
-rw-r--r--kpovmodeler/pmcamera.h4
-rw-r--r--kpovmodeler/pmcameraedit.cpp66
-rw-r--r--kpovmodeler/pmcameraedit.h5
-rw-r--r--kpovmodeler/pmclippedby.cpp8
-rw-r--r--kpovmodeler/pmclippedby.h4
-rw-r--r--kpovmodeler/pmclippedbyedit.cpp4
-rw-r--r--kpovmodeler/pmclippedbyedit.h5
-rw-r--r--kpovmodeler/pmcolor.cpp2
-rw-r--r--kpovmodeler/pmcolor.h4
-rw-r--r--kpovmodeler/pmcoloredit.cpp6
-rw-r--r--kpovmodeler/pmcoloredit.h5
-rw-r--r--kpovmodeler/pmcolorsettings.cpp84
-rw-r--r--kpovmodeler/pmcolorsettings.h3
-rw-r--r--kpovmodeler/pmcommand.h4
-rw-r--r--kpovmodeler/pmcommandmanager.cpp8
-rw-r--r--kpovmodeler/pmcommandmanager.h3
-rw-r--r--kpovmodeler/pmcomment.cpp8
-rw-r--r--kpovmodeler/pmcomment.h4
-rw-r--r--kpovmodeler/pmcommentedit.cpp8
-rw-r--r--kpovmodeler/pmcommentedit.h5
-rw-r--r--kpovmodeler/pmcompositeobject.cpp12
-rw-r--r--kpovmodeler/pmcompositeobject.h12
-rw-r--r--kpovmodeler/pmcone.cpp8
-rw-r--r--kpovmodeler/pmcone.h4
-rw-r--r--kpovmodeler/pmconeedit.cpp12
-rw-r--r--kpovmodeler/pmconeedit.h5
-rw-r--r--kpovmodeler/pmcsg.cpp8
-rw-r--r--kpovmodeler/pmcsg.h4
-rw-r--r--kpovmodeler/pmcsgedit.cpp14
-rw-r--r--kpovmodeler/pmcsgedit.h5
-rw-r--r--kpovmodeler/pmcylinder.cpp8
-rw-r--r--kpovmodeler/pmcylinder.h4
-rw-r--r--kpovmodeler/pmcylinderedit.cpp18
-rw-r--r--kpovmodeler/pmcylinderedit.h5
-rw-r--r--kpovmodeler/pmdatachangecommand.cpp2
-rw-r--r--kpovmodeler/pmdeclare.cpp14
-rw-r--r--kpovmodeler/pmdeclare.h4
-rw-r--r--kpovmodeler/pmdeclareedit.cpp24
-rw-r--r--kpovmodeler/pmdeclareedit.h5
-rw-r--r--kpovmodeler/pmdeletecommand.cpp46
-rw-r--r--kpovmodeler/pmdeletecommand.h8
-rw-r--r--kpovmodeler/pmdensity.cpp8
-rw-r--r--kpovmodeler/pmdensity.h4
-rw-r--r--kpovmodeler/pmdensityedit.cpp4
-rw-r--r--kpovmodeler/pmdensityedit.h5
-rw-r--r--kpovmodeler/pmdetailobject.cpp4
-rw-r--r--kpovmodeler/pmdetailobject.h2
-rw-r--r--kpovmodeler/pmdetailobjectedit.cpp14
-rw-r--r--kpovmodeler/pmdetailobjectedit.h5
-rw-r--r--kpovmodeler/pmdialogeditbase.cpp34
-rw-r--r--kpovmodeler/pmdialogeditbase.h13
-rw-r--r--kpovmodeler/pmdialogview.cpp20
-rw-r--r--kpovmodeler/pmdialogview.h12
-rw-r--r--kpovmodeler/pmdisc.cpp8
-rw-r--r--kpovmodeler/pmdisc.h4
-rw-r--r--kpovmodeler/pmdiscedit.cpp18
-rw-r--r--kpovmodeler/pmdiscedit.h5
-rw-r--r--kpovmodeler/pmdockwidget.cpp514
-rw-r--r--kpovmodeler/pmdockwidget.h133
-rw-r--r--kpovmodeler/pmdockwidget_private.cpp100
-rw-r--r--kpovmodeler/pmdockwidget_private.h19
-rw-r--r--kpovmodeler/pmdocumentationmap.cpp2
-rw-r--r--kpovmodeler/pmdragwidget.cpp4
-rw-r--r--kpovmodeler/pmdragwidget.h5
-rw-r--r--kpovmodeler/pmenumproperty.cpp6
-rw-r--r--kpovmodeler/pmerrordialog.cpp10
-rw-r--r--kpovmodeler/pmerrordialog.h5
-rw-r--r--kpovmodeler/pmfactory.cpp8
-rw-r--r--kpovmodeler/pmfactory.h5
-rw-r--r--kpovmodeler/pmfiledialog.cpp12
-rw-r--r--kpovmodeler/pmfiledialog.h7
-rw-r--r--kpovmodeler/pmfinish.cpp8
-rw-r--r--kpovmodeler/pmfinish.h4
-rw-r--r--kpovmodeler/pmfinishedit.cpp72
-rw-r--r--kpovmodeler/pmfinishedit.h5
-rw-r--r--kpovmodeler/pmfog.cpp8
-rw-r--r--kpovmodeler/pmfog.h4
-rw-r--r--kpovmodeler/pmfogedit.cpp4
-rw-r--r--kpovmodeler/pmfogedit.h5
-rw-r--r--kpovmodeler/pmformulalabel.cpp30
-rw-r--r--kpovmodeler/pmformulalabel.h12
-rw-r--r--kpovmodeler/pmglobalphotons.cpp8
-rw-r--r--kpovmodeler/pmglobalphotons.h4
-rw-r--r--kpovmodeler/pmglobalphotonsedit.cpp4
-rw-r--r--kpovmodeler/pmglobalphotonsedit.h5
-rw-r--r--kpovmodeler/pmglobalsettings.cpp8
-rw-r--r--kpovmodeler/pmglobalsettings.h4
-rw-r--r--kpovmodeler/pmglobalsettingsedit.cpp60
-rw-r--r--kpovmodeler/pmglobalsettingsedit.h5
-rw-r--r--kpovmodeler/pmglview.cpp114
-rw-r--r--kpovmodeler/pmglview.h18
-rw-r--r--kpovmodeler/pmgraphicalobject.cpp4
-rw-r--r--kpovmodeler/pmgraphicalobject.h6
-rw-r--r--kpovmodeler/pmgraphicalobjectedit.cpp10
-rw-r--r--kpovmodeler/pmgraphicalobjectedit.h5
-rw-r--r--kpovmodeler/pmgridsettings.cpp48
-rw-r--r--kpovmodeler/pmgridsettings.h3
-rw-r--r--kpovmodeler/pmheightfield.cpp8
-rw-r--r--kpovmodeler/pmheightfield.h4
-rw-r--r--kpovmodeler/pmheightfieldedit.cpp6
-rw-r--r--kpovmodeler/pmheightfieldedit.h5
-rw-r--r--kpovmodeler/pmheightfieldroam.cpp6
-rw-r--r--kpovmodeler/pmimagemap.cpp8
-rw-r--r--kpovmodeler/pmimagemap.h4
-rw-r--r--kpovmodeler/pmimagemapedit.cpp22
-rw-r--r--kpovmodeler/pmimagemapedit.h5
-rw-r--r--kpovmodeler/pminserterrordialog.cpp6
-rw-r--r--kpovmodeler/pminserterrordialog.h5
-rw-r--r--kpovmodeler/pminsertpopup.cpp8
-rw-r--r--kpovmodeler/pminsertpopup.h8
-rw-r--r--kpovmodeler/pminsertrules.dtd16
-rw-r--r--kpovmodeler/pminsertrulesystem.cpp100
-rw-r--r--kpovmodeler/pminsertrulesystem.h30
-rw-r--r--kpovmodeler/pminterior.cpp8
-rw-r--r--kpovmodeler/pminterior.h4
-rw-r--r--kpovmodeler/pminterioredit.cpp30
-rw-r--r--kpovmodeler/pminterioredit.h5
-rw-r--r--kpovmodeler/pminteriortexture.cpp8
-rw-r--r--kpovmodeler/pminteriortexture.h4
-rw-r--r--kpovmodeler/pminteriortextureedit.cpp4
-rw-r--r--kpovmodeler/pminteriortextureedit.h5
-rw-r--r--kpovmodeler/pmiomanager.cpp6
-rw-r--r--kpovmodeler/pmiomanager.h2
-rw-r--r--kpovmodeler/pmisosurface.cpp8
-rw-r--r--kpovmodeler/pmisosurface.h4
-rw-r--r--kpovmodeler/pmisosurfaceedit.cpp6
-rw-r--r--kpovmodeler/pmisosurfaceedit.h5
-rw-r--r--kpovmodeler/pmjuliafractal.cpp8
-rw-r--r--kpovmodeler/pmjuliafractal.h4
-rw-r--r--kpovmodeler/pmjuliafractaledit.cpp4
-rw-r--r--kpovmodeler/pmjuliafractaledit.h5
-rw-r--r--kpovmodeler/pmlathe.cpp16
-rw-r--r--kpovmodeler/pmlathe.h4
-rw-r--r--kpovmodeler/pmlatheedit.cpp4
-rw-r--r--kpovmodeler/pmlatheedit.h5
-rw-r--r--kpovmodeler/pmlayoutsettings.cpp36
-rw-r--r--kpovmodeler/pmlayoutsettings.h13
-rw-r--r--kpovmodeler/pmlibrarybrowser.cpp8
-rw-r--r--kpovmodeler/pmlibrarybrowser.h14
-rw-r--r--kpovmodeler/pmlibraryentrypreview.cpp22
-rw-r--r--kpovmodeler/pmlibraryentrypreview.h5
-rw-r--r--kpovmodeler/pmlibraryhandle.cpp10
-rw-r--r--kpovmodeler/pmlibraryhandle.h6
-rw-r--r--kpovmodeler/pmlibraryhandleedit.cpp4
-rw-r--r--kpovmodeler/pmlibraryhandleedit.h3
-rw-r--r--kpovmodeler/pmlibraryiconview.cpp34
-rw-r--r--kpovmodeler/pmlibraryiconview.h12
-rw-r--r--kpovmodeler/pmlibrarymanager.cpp2
-rw-r--r--kpovmodeler/pmlibrarymanager.h2
-rw-r--r--kpovmodeler/pmlibraryobject.cpp6
-rw-r--r--kpovmodeler/pmlibraryobjectsearch.cpp4
-rw-r--r--kpovmodeler/pmlibraryobjectsearch.h5
-rw-r--r--kpovmodeler/pmlight.cpp8
-rw-r--r--kpovmodeler/pmlight.h4
-rw-r--r--kpovmodeler/pmlightedit.cpp4
-rw-r--r--kpovmodeler/pmlightedit.h5
-rw-r--r--kpovmodeler/pmlightgroup.cpp8
-rw-r--r--kpovmodeler/pmlightgroup.h4
-rw-r--r--kpovmodeler/pmlightgroupedit.cpp12
-rw-r--r--kpovmodeler/pmlightgroupedit.h5
-rw-r--r--kpovmodeler/pmlineedits.cpp24
-rw-r--r--kpovmodeler/pmlineedits.h10
-rw-r--r--kpovmodeler/pmlinkedit.cpp20
-rw-r--r--kpovmodeler/pmlinkedit.h15
-rw-r--r--kpovmodeler/pmlistpattern.cpp32
-rw-r--r--kpovmodeler/pmlistpattern.h16
-rw-r--r--kpovmodeler/pmlistpatternedit.cpp38
-rw-r--r--kpovmodeler/pmlistpatternedit.h5
-rw-r--r--kpovmodeler/pmlookslike.cpp8
-rw-r--r--kpovmodeler/pmlookslike.h4
-rw-r--r--kpovmodeler/pmmaterial.cpp8
-rw-r--r--kpovmodeler/pmmaterial.h4
-rw-r--r--kpovmodeler/pmmaterialedit.cpp4
-rw-r--r--kpovmodeler/pmmaterialedit.h5
-rw-r--r--kpovmodeler/pmmaterialmap.cpp8
-rw-r--r--kpovmodeler/pmmaterialmap.h4
-rw-r--r--kpovmodeler/pmmaterialmapedit.cpp6
-rw-r--r--kpovmodeler/pmmaterialmapedit.h5
-rw-r--r--kpovmodeler/pmmedia.cpp8
-rw-r--r--kpovmodeler/pmmedia.h4
-rw-r--r--kpovmodeler/pmmediaedit.cpp4
-rw-r--r--kpovmodeler/pmmediaedit.h5
-rw-r--r--kpovmodeler/pmmemento.cpp2
-rw-r--r--kpovmodeler/pmmesh.cpp20
-rw-r--r--kpovmodeler/pmmesh.h4
-rw-r--r--kpovmodeler/pmmeshedit.cpp20
-rw-r--r--kpovmodeler/pmmeshedit.h5
-rw-r--r--kpovmodeler/pmmetaobject.h2
-rw-r--r--kpovmodeler/pmmovecommand.cpp84
-rw-r--r--kpovmodeler/pmmovecommand.h10
-rw-r--r--kpovmodeler/pmnamedobject.cpp4
-rw-r--r--kpovmodeler/pmnamedobject.h2
-rw-r--r--kpovmodeler/pmnamedobjectedit.cpp10
-rw-r--r--kpovmodeler/pmnamedobjectedit.h5
-rw-r--r--kpovmodeler/pmnormal.cpp8
-rw-r--r--kpovmodeler/pmnormal.h4
-rw-r--r--kpovmodeler/pmnormaledit.cpp4
-rw-r--r--kpovmodeler/pmnormaledit.h5
-rw-r--r--kpovmodeler/pmobject.cpp22
-rw-r--r--kpovmodeler/pmobject.h44
-rw-r--r--kpovmodeler/pmobjectdrag.cpp10
-rw-r--r--kpovmodeler/pmobjectdrag.h4
-rw-r--r--kpovmodeler/pmobjectlibrarysettings.cpp18
-rw-r--r--kpovmodeler/pmobjectlibrarysettings.h3
-rw-r--r--kpovmodeler/pmobjectlink.cpp10
-rw-r--r--kpovmodeler/pmobjectlink.h4
-rw-r--r--kpovmodeler/pmobjectlinkedit.cpp4
-rw-r--r--kpovmodeler/pmobjectlinkedit.h5
-rw-r--r--kpovmodeler/pmobjectselect.cpp40
-rw-r--r--kpovmodeler/pmobjectselect.h15
-rw-r--r--kpovmodeler/pmobjectsettings.cpp214
-rw-r--r--kpovmodeler/pmobjectsettings.h3
-rw-r--r--kpovmodeler/pmopenglsettings.cpp12
-rw-r--r--kpovmodeler/pmopenglsettings.h3
-rw-r--r--kpovmodeler/pmoutputdevice.cpp8
-rw-r--r--kpovmodeler/pmpalettevalueedit.cpp22
-rw-r--r--kpovmodeler/pmpalettevalueedit.h5
-rw-r--r--kpovmodeler/pmpalettevaluememento.cpp4
-rw-r--r--kpovmodeler/pmparser.cpp72
-rw-r--r--kpovmodeler/pmparser.h18
-rw-r--r--kpovmodeler/pmpart.cpp126
-rw-r--r--kpovmodeler/pmpart.h16
-rw-r--r--kpovmodeler/pmpattern.cpp8
-rw-r--r--kpovmodeler/pmpattern.h4
-rw-r--r--kpovmodeler/pmpatternedit.cpp58
-rw-r--r--kpovmodeler/pmpatternedit.h5
-rw-r--r--kpovmodeler/pmphotons.cpp8
-rw-r--r--kpovmodeler/pmphotons.h4
-rw-r--r--kpovmodeler/pmphotonsedit.cpp6
-rw-r--r--kpovmodeler/pmphotonsedit.h5
-rw-r--r--kpovmodeler/pmpigment.cpp8
-rw-r--r--kpovmodeler/pmpigment.h4
-rw-r--r--kpovmodeler/pmpigmentedit.cpp4
-rw-r--r--kpovmodeler/pmpigmentedit.h5
-rw-r--r--kpovmodeler/pmplane.cpp8
-rw-r--r--kpovmodeler/pmplane.h4
-rw-r--r--kpovmodeler/pmplaneedit.cpp26
-rw-r--r--kpovmodeler/pmplaneedit.h5
-rw-r--r--kpovmodeler/pmpluginmanager.cpp2
-rw-r--r--kpovmodeler/pmpluginsettings.cpp28
-rw-r--r--kpovmodeler/pmpluginsettings.h3
-rw-r--r--kpovmodeler/pmpolynom.cpp8
-rw-r--r--kpovmodeler/pmpolynom.h4
-rw-r--r--kpovmodeler/pmpolynomedit.cpp8
-rw-r--r--kpovmodeler/pmpolynomedit.h5
-rw-r--r--kpovmodeler/pmpovray31serialization.cpp342
-rw-r--r--kpovmodeler/pmpovray31serialization.h150
-rw-r--r--kpovmodeler/pmpovray35serialization.cpp104
-rw-r--r--kpovmodeler/pmpovray35serialization.h44
-rw-r--r--kpovmodeler/pmpovrayformat.cpp4
-rw-r--r--kpovmodeler/pmpovraymatrix.cpp8
-rw-r--r--kpovmodeler/pmpovraymatrix.h4
-rw-r--r--kpovmodeler/pmpovraymatrixedit.cpp4
-rw-r--r--kpovmodeler/pmpovraymatrixedit.h5
-rw-r--r--kpovmodeler/pmpovrayoutputwidget.cpp8
-rw-r--r--kpovmodeler/pmpovrayoutputwidget.h3
-rw-r--r--kpovmodeler/pmpovrayparser.cpp98
-rw-r--r--kpovmodeler/pmpovrayparser.h10
-rw-r--r--kpovmodeler/pmpovrayrenderwidget.cpp22
-rw-r--r--kpovmodeler/pmpovrayrenderwidget.h5
-rw-r--r--kpovmodeler/pmpovraysettings.cpp68
-rw-r--r--kpovmodeler/pmpovraysettings.h3
-rw-r--r--kpovmodeler/pmpovraywidget.cpp30
-rw-r--r--kpovmodeler/pmpovraywidget.h5
-rw-r--r--kpovmodeler/pmpreviewsettings.cpp62
-rw-r--r--kpovmodeler/pmpreviewsettings.h3
-rw-r--r--kpovmodeler/pmprism.cpp12
-rw-r--r--kpovmodeler/pmprism.h4
-rw-r--r--kpovmodeler/pmprismedit.cpp20
-rw-r--r--kpovmodeler/pmprismedit.h5
-rw-r--r--kpovmodeler/pmprismmemento.cpp2
-rw-r--r--kpovmodeler/pmprojectedthrough.cpp8
-rw-r--r--kpovmodeler/pmprojectedthrough.h4
-rw-r--r--kpovmodeler/pmprototypemanager.cpp40
-rw-r--r--kpovmodeler/pmprototypemanager.h4
-rw-r--r--kpovmodeler/pmquickcolor.cpp8
-rw-r--r--kpovmodeler/pmquickcolor.h8
-rw-r--r--kpovmodeler/pmquickcoloredit.cpp10
-rw-r--r--kpovmodeler/pmquickcoloredit.h9
-rw-r--r--kpovmodeler/pmradiosity.cpp8
-rw-r--r--kpovmodeler/pmradiosity.h4
-rw-r--r--kpovmodeler/pmradiosityedit.cpp4
-rw-r--r--kpovmodeler/pmradiosityedit.h5
-rw-r--r--kpovmodeler/pmrainbow.cpp8
-rw-r--r--kpovmodeler/pmrainbow.h4
-rw-r--r--kpovmodeler/pmrainbowedit.cpp4
-rw-r--r--kpovmodeler/pmrainbowedit.h5
-rw-r--r--kpovmodeler/pmraw.cpp8
-rw-r--r--kpovmodeler/pmraw.h4
-rw-r--r--kpovmodeler/pmrawedit.cpp8
-rw-r--r--kpovmodeler/pmrawedit.h5
-rw-r--r--kpovmodeler/pmrecursiveobjectiterator.cpp2
-rw-r--r--kpovmodeler/pmrendermanager.cpp70
-rw-r--r--kpovmodeler/pmrendermanager.h3
-rw-r--r--kpovmodeler/pmrendermode.cpp18
-rw-r--r--kpovmodeler/pmrendermode.h2
-rw-r--r--kpovmodeler/pmrendermodesdialog.cpp8
-rw-r--r--kpovmodeler/pmrendermodesdialog.h6
-rw-r--r--kpovmodeler/pmresourcelocator.cpp6
-rw-r--r--kpovmodeler/pmrotate.cpp8
-rw-r--r--kpovmodeler/pmrotate.h4
-rw-r--r--kpovmodeler/pmrotateedit.cpp4
-rw-r--r--kpovmodeler/pmrotateedit.h5
-rw-r--r--kpovmodeler/pmscale.cpp8
-rw-r--r--kpovmodeler/pmscale.h4
-rw-r--r--kpovmodeler/pmscaleedit.cpp4
-rw-r--r--kpovmodeler/pmscaleedit.h5
-rw-r--r--kpovmodeler/pmscanner.cpp20
-rw-r--r--kpovmodeler/pmscanner.h8
-rw-r--r--kpovmodeler/pmscene.cpp4
-rw-r--r--kpovmodeler/pmscene.h4
-rw-r--r--kpovmodeler/pmserializer.cpp4
-rw-r--r--kpovmodeler/pmsettingsdialog.cpp20
-rw-r--r--kpovmodeler/pmsettingsdialog.h12
-rw-r--r--kpovmodeler/pmshell.cpp82
-rw-r--r--kpovmodeler/pmshell.h7
-rw-r--r--kpovmodeler/pmskysphere.cpp8
-rw-r--r--kpovmodeler/pmskysphere.h4
-rw-r--r--kpovmodeler/pmskysphereedit.cpp4
-rw-r--r--kpovmodeler/pmskysphereedit.h5
-rw-r--r--kpovmodeler/pmslope.cpp8
-rw-r--r--kpovmodeler/pmslope.h4
-rw-r--r--kpovmodeler/pmslopeedit.cpp4
-rw-r--r--kpovmodeler/pmslopeedit.h5
-rw-r--r--kpovmodeler/pmsolidcolor.cpp8
-rw-r--r--kpovmodeler/pmsolidcolor.h4
-rw-r--r--kpovmodeler/pmsolidcoloredit.cpp10
-rw-r--r--kpovmodeler/pmsolidcoloredit.h5
-rw-r--r--kpovmodeler/pmsolidobject.cpp4
-rw-r--r--kpovmodeler/pmsolidobject.h4
-rw-r--r--kpovmodeler/pmsolidobjectedit.cpp4
-rw-r--r--kpovmodeler/pmsolidobjectedit.h5
-rw-r--r--kpovmodeler/pmsor.cpp12
-rw-r--r--kpovmodeler/pmsor.h4
-rw-r--r--kpovmodeler/pmsoredit.cpp6
-rw-r--r--kpovmodeler/pmsoredit.h5
-rw-r--r--kpovmodeler/pmsphere.cpp8
-rw-r--r--kpovmodeler/pmsphere.h4
-rw-r--r--kpovmodeler/pmsphereedit.cpp20
-rw-r--r--kpovmodeler/pmsphereedit.h5
-rw-r--r--kpovmodeler/pmspheresweep.cpp18
-rw-r--r--kpovmodeler/pmspheresweep.h4
-rw-r--r--kpovmodeler/pmspheresweepedit.cpp4
-rw-r--r--kpovmodeler/pmspheresweepedit.h5
-rw-r--r--kpovmodeler/pmsplinememento.cpp2
-rw-r--r--kpovmodeler/pmsqe.cpp8
-rw-r--r--kpovmodeler/pmsqe.h10
-rw-r--r--kpovmodeler/pmsqeedit.cpp4
-rw-r--r--kpovmodeler/pmsqeedit.h9
-rw-r--r--kpovmodeler/pmsymboltable.cpp6
-rw-r--r--kpovmodeler/pmtext.cpp8
-rw-r--r--kpovmodeler/pmtext.h4
-rw-r--r--kpovmodeler/pmtextedit.cpp6
-rw-r--r--kpovmodeler/pmtextedit.h5
-rw-r--r--kpovmodeler/pmtexture.cpp8
-rw-r--r--kpovmodeler/pmtexture.h4
-rw-r--r--kpovmodeler/pmtexturebase.cpp6
-rw-r--r--kpovmodeler/pmtexturebase.h2
-rw-r--r--kpovmodeler/pmtexturebaseedit.cpp4
-rw-r--r--kpovmodeler/pmtexturebaseedit.h5
-rw-r--r--kpovmodeler/pmtextureedit.cpp4
-rw-r--r--kpovmodeler/pmtextureedit.h5
-rw-r--r--kpovmodeler/pmtexturemap.cpp34
-rw-r--r--kpovmodeler/pmtexturemap.h16
-rw-r--r--kpovmodeler/pmtexturemapedit.cpp4
-rw-r--r--kpovmodeler/pmtexturemapedit.h5
-rw-r--r--kpovmodeler/pmtokens.h16
-rw-r--r--kpovmodeler/pmtorus.cpp8
-rw-r--r--kpovmodeler/pmtorus.h4
-rw-r--r--kpovmodeler/pmtorusedit.cpp4
-rw-r--r--kpovmodeler/pmtorusedit.h5
-rw-r--r--kpovmodeler/pmtranslate.cpp8
-rw-r--r--kpovmodeler/pmtranslate.h4
-rw-r--r--kpovmodeler/pmtranslateedit.cpp4
-rw-r--r--kpovmodeler/pmtranslateedit.h5
-rw-r--r--kpovmodeler/pmtreeview.cpp84
-rw-r--r--kpovmodeler/pmtreeview.h13
-rw-r--r--kpovmodeler/pmtreeviewitem.cpp30
-rw-r--r--kpovmodeler/pmtreeviewitem.h32
-rw-r--r--kpovmodeler/pmtriangle.cpp8
-rw-r--r--kpovmodeler/pmtriangle.h4
-rw-r--r--kpovmodeler/pmtriangleedit.cpp10
-rw-r--r--kpovmodeler/pmtriangleedit.h5
-rw-r--r--kpovmodeler/pmtruetypecache.cpp6
-rw-r--r--kpovmodeler/pmunknownview.cpp8
-rw-r--r--kpovmodeler/pmunknownview.h2
-rw-r--r--kpovmodeler/pmvariant.cpp6
-rw-r--r--kpovmodeler/pmvector.cpp2
-rw-r--r--kpovmodeler/pmvectoredit.cpp90
-rw-r--r--kpovmodeler/pmvectoredit.h11
-rw-r--r--kpovmodeler/pmvectorlistedit.cpp32
-rw-r--r--kpovmodeler/pmvectorlistedit.h17
-rw-r--r--kpovmodeler/pmview.cpp10
-rw-r--r--kpovmodeler/pmview.h7
-rw-r--r--kpovmodeler/pmviewbase.h16
-rw-r--r--kpovmodeler/pmviewfactory.cpp10
-rw-r--r--kpovmodeler/pmviewfactory.h4
-rw-r--r--kpovmodeler/pmviewlayoutmanager.cpp38
-rw-r--r--kpovmodeler/pmviewlayoutmanager.h49
-rw-r--r--kpovmodeler/pmwarp.cpp8
-rw-r--r--kpovmodeler/pmwarp.h4
-rw-r--r--kpovmodeler/pmwarpedit.cpp6
-rw-r--r--kpovmodeler/pmwarpedit.h5
-rw-r--r--kpovmodeler/pmxmlhelper.h4
-rw-r--r--kpovmodeler/pmxmlparser.cpp6
-rw-r--r--kpovmodeler/pmxmlparser.h6
446 files changed, 3447 insertions, 3326 deletions
diff --git a/kpovmodeler/StyleConvention b/kpovmodeler/StyleConvention
index eddc404f..f4951d75 100644
--- a/kpovmodeler/StyleConvention
+++ b/kpovmodeler/StyleConvention
@@ -201,11 +201,11 @@ things are set multiple times. But it works :-)
(load-library "vc")
;;for QT
- (setq c-C++-access-key "\\<\\(signals\\|public\\|protected\\|private
- \\|public slots\\|protected slots\\|private slots\\)\\>[ \t]*:")
- ;; modify the colour of slots to match public, private, etc ...
+ (setq c-C++-access-key "\\<\\(Q_SIGNALS\\|public\\|protected\\|private
+ \\|public Q_SLOTS\\|protected Q_SLOTS\\|private Q_SLOTS\\)\\>[ \t]*:")
+ ;; modify the colour of Q_SLOTS to match public, private, etc ...
(font-lock-add-keywords 'c++-mode
- '(("\\<\\(slots\\|signals\\)\\>" . font-lock-type-face)))
+ '(("\\<\\(Q_SLOTS\\|Q_SIGNALS\\)\\>" . font-lock-type-face)))
;; make new font for rest of qt keywords
(make-face 'qt-keywords-face)
(set-face-foreground 'qt-keywords-face "green")
diff --git a/kpovmodeler/baseinsertrules.xml b/kpovmodeler/baseinsertrules.xml
index 24aa7dd5..1d6547ce 100644
--- a/kpovmodeler/baseinsertrules.xml
+++ b/kpovmodeler/baseinsertrules.xml
@@ -166,7 +166,7 @@
</rule>
<rule>
<group name="ObjectModifier"/>
- <not><parent><class name="Mesh"/></parent></not>
+ <not><tqparent><class name="Mesh"/></tqparent></not>
</rule>
</targetclass>
@@ -182,11 +182,11 @@
</rule>
<rule>
<class name="Texture"/>
- <contains><class name="Texture"/></contains>
+ <tqcontains><class name="Texture"/></tqcontains>
</rule>
<rule>
<class name="InteriorTexture"/>
- <contains><class name="InteriorTexture"/></contains>
+ <tqcontains><class name="InteriorTexture"/></tqcontains>
</rule>
</targetclass>
@@ -211,16 +211,16 @@
<class name="SolidColor"/>
<class name="ColorList"/>
<class name="DensityList"/>
- <not><contains><group name="Sum"/></contains></not>
+ <not><tqcontains><group name="Sum"/></tqcontains></not>
</rule>
<rule>
<class name="Pattern"/>
<and>
<not>
- <contains>
+ <tqcontains>
<class name="Pattern"/>
<group name="ListPattern"/>
- </contains>
+ </tqcontains>
</not>
<not><after><group name="Map"/></after></not>
<not><after><class name="Warp"/></after></not>
@@ -236,11 +236,11 @@
<group name="Map"/>
<and>
<not>
- <contains>
+ <tqcontains>
<group name="Map"/>
<group name="ListPattern"/>
<class name="SolidColor"/>
- </contains>
+ </tqcontains>
</not>
<not><before><class name="Pattern"/></before></not>
</and>
@@ -297,15 +297,15 @@
</rule>
<rule>
<class name="LooksLike"/>
- <not><contains><class name="LooksLike"/></contains></not>
+ <not><tqcontains><class name="LooksLike"/></tqcontains></not>
</rule>
<rule>
<class name="ProjectedThrough"/>
- <not><contains><class name="ProjectedThrough"/></contains></not>
+ <not><tqcontains><class name="ProjectedThrough"/></tqcontains></not>
</rule>
<rule>
<class name="Photons"/>
- <not><contains><class name="Photons"/></contains></not>
+ <not><tqcontains><class name="Photons"/></tqcontains></not>
</rule>
</targetclass>
@@ -420,9 +420,9 @@
<rule>
<class name="GraphicalObject"/>
<not>
- <contains>
+ <tqcontains>
<class name="GraphicalObject"/>
- </contains>
+ </tqcontains>
</not>
</rule>
</targetclass>
@@ -435,9 +435,9 @@
<rule>
<class name="GraphicalObject"/>
<not>
- <contains>
+ <tqcontains>
<class name="GraphicalObject"/>
- </contains>
+ </tqcontains>
</not>
</rule>
</targetclass>
@@ -450,9 +450,9 @@
<rule>
<class name="GraphicalObject"/>
<not>
- <contains>
+ <tqcontains>
<class name="GraphicalObject"/>
- </contains>
+ </tqcontains>
</not>
</rule>
</targetclass>
@@ -485,7 +485,7 @@
<rule>
<class name="BumpMap"/>
<not>
- <contains>
+ <tqcontains>
<class name="BumpMap"/>
<class name="NormalList"/>
<class name="Pattern"/>
@@ -493,31 +493,31 @@
<class name="SlopeMap"/>
<class name="Warp"/>
<class name="BlendMapModifiers"/>
- </contains>
+ </tqcontains>
</not>
</rule>
<rule>
<class name="NormalList"/>
<not>
- <contains>
+ <tqcontains>
<class name="BumpMap"/>
<class name="NormalList"/>
<class name="Pattern"/>
<class name="NormalMap"/>
<class name="SlopeMap"/>
<class name="Warp"/>
- </contains>
+ </tqcontains>
</not>
</rule>
<rule>
<class name="Pattern"/>
<and>
<not>
- <contains>
+ <tqcontains>
<class name="BumpMap"/>
<class name="NormalList"/>
<class name="Pattern"/>
- </contains>
+ </tqcontains>
</not>
<not><after><class name="NormalMap"/></after></not>
<not><after><class name="SlopeMap"/></after></not>
@@ -534,11 +534,11 @@
<class name="NormalMap"/>
<and>
<not>
- <contains>
+ <tqcontains>
<class name="BumpMap"/>
<class name="NormalMap"/>
<class name="NormalList"/>
- </contains>
+ </tqcontains>
</not>
<not><after><class name="SlopeMap"/></after></not>
<not><after><class name="BlendMapModifiers"/></after></not>
@@ -549,11 +549,11 @@
<class name="SlopeMap"/>
<and>
<not>
- <contains>
+ <tqcontains>
<class name="BumpMap"/>
<class name="SlopeMap"/>
<class name="NormalList"/>
- </contains>
+ </tqcontains>
</not>
<not><after><class name="BlendMapModifiers"/></after></not>
<not><after><group name="Transformations"/></after></not>
@@ -563,14 +563,14 @@
<rule>
<class name="BlendMapModifiers"/>
<and>
- <not><contains><class name="BlendMapModifiers"/></contains></not>
+ <not><tqcontains><class name="BlendMapModifiers"/></tqcontains></not>
<or>
<not>
- <contains>
+ <tqcontains>
<class name="BumpMap"/>
<class name="NormalMap"/>
<class name="SlopeMap"/>
- </contains>
+ </tqcontains>
</not>
<after><class name="NormalMap"/></after>
<after><class name="SlopeMap"/></after>
@@ -613,17 +613,17 @@
<rule>
<group name="Color"/>
<group name="ListPattern"/>
- <not><contains><group name="Sum"/></contains></not>
+ <not><tqcontains><group name="Sum"/></tqcontains></not>
</rule>
<rule>
<class name="Pattern"/>
<and>
<not>
- <contains>
+ <tqcontains>
<group name="Color"/>
<class name="Pattern"/>
<group name="ListPattern"/>
- </contains>
+ </tqcontains>
</not>
<not><after><group name="Map"/></after></not>
<not><after><class name="Warp"/></after></not>
@@ -639,11 +639,11 @@
<group name="Map"/>
<and>
<not>
- <contains>
+ <tqcontains>
<group name="Map"/>
<group name="ListPattern"/>
<group name="Color"/>
- </contains>
+ </tqcontains>
</not>
<not><before><class name="Pattern"/></before></not>
</and>
@@ -652,10 +652,10 @@
<class name="BlendMapModifiers"/>
<and>
<not>
- <contains>
+ <tqcontains>
<class name="BlendMapModifiers"/>
<group name="Color"/>
- </contains>
+ </tqcontains>
</not>
<not><before><group name="Map"/></before></not>
<not><before><class name="Pattern"/></before></not>
@@ -695,18 +695,18 @@
</rule>
<rule>
<class name="GlobalSettings"/>
- <not><contains><class name="GlobalSettings"/></contains></not>
+ <not><tqcontains><class name="GlobalSettings"/></tqcontains></not>
</rule>
</targetclass>
<targetclass name="GlobalSettings">
<rule>
<class name="Radiosity"/>
- <not><contains><class name="Radiosity"/></contains></not>
+ <not><tqcontains><class name="Radiosity"/></tqcontains></not>
</rule>
<rule>
<class name="GlobalPhotons"/>
- <not><contains><class name="GlobalPhotons"/></contains></not>
+ <not><tqcontains><class name="GlobalPhotons"/></tqcontains></not>
</rule>
</targetclass>
@@ -734,56 +734,56 @@
<rule>
<class name="MaterialMap"/>
<not>
- <contains>
+ <tqcontains>
<class name="TextureList"/>
<group name="SumMap"/>
<group name="SumPigment"/>
- </contains>
+ </tqcontains>
</not>
</rule>
<rule>
<class name="Pigment"/>
<not>
- <contains>
+ <tqcontains>
<class name="TextureList"/>
<group name="SumMap"/>
<class name="Pigment"/>
<class name="MaterialMap"/>
- </contains>
+ </tqcontains>
</not>
</rule>
<rule>
<class name="Normal"/>
<not>
- <contains>
+ <tqcontains>
<class name="TextureList"/>
<group name="SumMap"/>
<class name="Normal"/>
<class name="MaterialMap"/>
- </contains>
+ </tqcontains>
</not>
</rule>
<rule>
<class name="Finish"/>
<not>
- <contains>
+ <tqcontains>
<class name="TextureList"/>
<group name="SumMap"/>
<class name="Finish"/>
<class name="MaterialMap"/>
- </contains>
+ </tqcontains>
</not>
</rule>
<rule>
<class name="Pattern"/>
<and>
<not>
- <contains>
+ <tqcontains>
<class name="Pattern"/>
<class name="TextureList"/>
<group name="SumPigment"/>
<class name="MaterialMap"/>
- </contains>
+ </tqcontains>
</not>
<not><after><class name="TextureMap"/></after></not>
<not><after><class name="Warp"/></after></not>
@@ -795,12 +795,12 @@
<class name="TextureMap"/>
<and>
<not>
- <contains>
+ <tqcontains>
<class name="TextureMap"/>
<class name="TextureList"/>
<group name="SumPigment"/>
<class name="MaterialMap"/>
- </contains>
+ </tqcontains>
</not>
<not><before><class name="Pattern"/></before></not>
<not><after><class name="BlendMapModifiers"/></after></not>
@@ -809,12 +809,12 @@
<rule>
<class name="TextureList"/>
<not>
- <contains>
+ <tqcontains>
<class name="TextureList"/>
<group name="SumMap"/>
<group name="SumPigment"/>
<class name="MaterialMap"/>
- </contains>
+ </tqcontains>
</not>
</rule>
<rule>
@@ -829,10 +829,10 @@
<class name="BlendMapModifiers"/>
<and>
<not>
- <contains>
+ <tqcontains>
<class name="MaterialMap"/>
<class name="BlendMapModifiers"/>
- </contains>
+ </tqcontains>
</not>
<not><before><class name="TextureMap"/></before></not>
<not><before><class name="Pattern"/></before></not>
@@ -860,56 +860,56 @@
<rule>
<class name="MaterialMap"/>
<not>
- <contains>
+ <tqcontains>
<class name="TextureList"/>
<group name="SumMap"/>
<group name="SumPigment"/>
- </contains>
+ </tqcontains>
</not>
</rule>
<rule>
<class name="Pigment"/>
<not>
- <contains>
+ <tqcontains>
<class name="TextureList"/>
<group name="SumMap"/>
<class name="Pigment"/>
<class name="MaterialMap"/>
- </contains>
+ </tqcontains>
</not>
</rule>
<rule>
<class name="Normal"/>
<not>
- <contains>
+ <tqcontains>
<class name="TextureList"/>
<group name="SumMap"/>
<class name="Normal"/>
<class name="MaterialMap"/>
- </contains>
+ </tqcontains>
</not>
</rule>
<rule>
<class name="Finish"/>
<not>
- <contains>
+ <tqcontains>
<class name="TextureList"/>
<group name="SumMap"/>
<class name="Finish"/>
<class name="MaterialMap"/>
- </contains>
+ </tqcontains>
</not>
</rule>
<rule>
<class name="Pattern"/>
<and>
<not>
- <contains>
+ <tqcontains>
<class name="Pattern"/>
<class name="TextureList"/>
<group name="SumPigment"/>
<class name="MaterialMap"/>
- </contains>
+ </tqcontains>
</not>
<not><after><class name="TextureMap"/></after></not>
<not><after><class name="Warp"/></after></not>
@@ -921,12 +921,12 @@
<class name="TextureMap"/>
<and>
<not>
- <contains>
+ <tqcontains>
<class name="TextureMap"/>
<class name="TextureList"/>
<group name="SumPigment"/>
<class name="MaterialMap"/>
- </contains>
+ </tqcontains>
</not>
<not><before><class name="Pattern"/></before></not>
<not><after><class name="BlendMapModifiers"/></after></not>
@@ -935,12 +935,12 @@
<rule>
<class name="TextureList"/>
<not>
- <contains>
+ <tqcontains>
<class name="TextureList"/>
<group name="SumMap"/>
<group name="SumPigment"/>
<class name="MaterialMap"/>
- </contains>
+ </tqcontains>
</not>
</rule>
<rule>
@@ -955,10 +955,10 @@
<class name="BlendMapModifiers"/>
<and>
<not>
- <contains>
+ <tqcontains>
<class name="MaterialMap"/>
<class name="BlendMapModifiers"/>
- </contains>
+ </tqcontains>
</not>
<not><before><class name="TextureMap"/></before></not>
<not><before><class name="Pattern"/></before></not>
diff --git a/kpovmodeler/pm2dcontrolpoint.cpp b/kpovmodeler/pm2dcontrolpoint.cpp
index f8450715..244b106f 100644
--- a/kpovmodeler/pm2dcontrolpoint.cpp
+++ b/kpovmodeler/pm2dcontrolpoint.cpp
@@ -197,7 +197,7 @@ PMVector PM2DControlPoint::to3D( const PMVector& v ) const
void PM2DControlPoint::addLinkedPoint( PM2DControlPoint* p )
{
- if( !m_linkedPoints.containsRef( p ) )
+ if( !m_linkedPoints.tqcontainsRef( p ) )
m_linkedPoints.append( p );
}
diff --git a/kpovmodeler/pmactions.cpp b/kpovmodeler/pmactions.cpp
index 12bb479b..d13ddf06 100644
--- a/kpovmodeler/pmactions.cpp
+++ b/kpovmodeler/pmactions.cpp
@@ -29,31 +29,31 @@
#include "pmdebug.h"
// Fixed widths are calculated wrong in a toolbar.
-// Fixed sizeHint for the combo box to return
+// Fixed tqsizeHint for the combo box to return
// at least the minimum size
-class PMComboBox : public QComboBox
+class PMComboBox : public TQComboBox
{
public:
- PMComboBox( TQWidget* parent, const char* name = 0 )
- : TQComboBox( parent, name )
+ PMComboBox( TQWidget* tqparent, const char* name = 0 )
+ : TQComboBox( tqparent, name )
{
}
- virtual TQSize minimumSizeHint( ) const
+ virtual TQSize tqminimumSizeHint( ) const
{
- TQSize s = TQComboBox::minimumSizeHint( );
- return s.expandedTo( minimumSize( ) );
+ TQSize s = TQComboBox::tqminimumSizeHint( );
+ return s.expandedTo( tqminimumSize( ) );
}
- virtual TQSize sizeHint( ) const
+ virtual TQSize tqsizeHint( ) const
{
- TQSize s = TQComboBox::sizeHint( );
- return s.expandedTo( minimumSize( ) );
+ TQSize s = TQComboBox::tqsizeHint( );
+ return s.expandedTo( tqminimumSize( ) );
}
};
PMComboAction::PMComboAction( const TQString& text, int accel, const TQObject* receiver, const char* member,
- TQObject* parent, const char* name )
- : KAction( text, accel, parent, name )
+ TQObject* tqparent, const char* name )
+ : KAction( text, accel, tqparent, name )
{
m_receiver = receiver;
m_member = member;
@@ -117,16 +117,16 @@ void PMComboAction::unplug( TQWidget *w )
// Use a toolbutton instead of a label so it is styled correctly.
// copied from konq_actions.cc
-class PMToolBarLabel : public QToolButton
+class PMToolBarLabel : public TQToolButton
{
public:
- PMToolBarLabel( const TQString& text, TQWidget* parent = 0, const char* name = 0 )
- : TQToolButton( parent, name )
+ PMToolBarLabel( const TQString& text, TQWidget* tqparent = 0, const char* name = 0 )
+ : TQToolButton( tqparent, name )
{
setText( text );
}
protected:
- TQSize sizeHint( ) const
+ TQSize tqsizeHint( ) const
{
int w = fontMetrics( ).width( text( ) );
int h = fontMetrics( ).height( );
@@ -134,21 +134,17 @@ protected:
}
void drawButton( TQPainter* p )
{
-#if ( QT_VERSION >= 300 )
// Draw the background
- style( ).drawComplexControl( TQStyle::CC_ToolButton, p, this, rect( ), colorGroup( ),
+ tqstyle( ).tqdrawComplexControl( TQStyle::CC_ToolButton, p, this, rect( ), tqcolorGroup( ),
TQStyle::Style_Enabled, TQStyle::SC_ToolButton );
// Draw the label
- style( ).drawControl( TQStyle::CE_ToolButtonLabel, p, this, rect( ), colorGroup( ),
+ tqstyle( ).tqdrawControl( TQStyle::CE_ToolButtonLabel, p, this, rect( ), tqcolorGroup( ),
TQStyle::Style_Enabled );
-#else
- p->drawText( rect( ), Qt::AlignVCenter | Qt::AlignLeft, text( ) );
-#endif
}
};
-PMLabelAction::PMLabelAction( const TQString &text, TQObject *parent, const char *name )
- : KAction( text, 0, parent, name )
+PMLabelAction::PMLabelAction( const TQString &text, TQObject *tqparent, const char *name )
+ : KAction( text, 0, tqparent, name )
{
m_button = 0;
}
@@ -197,8 +193,8 @@ void PMLabelAction::unplug( TQWidget *widget )
PMSpinBoxAction::PMSpinBoxAction( const TQString& text, int accel, const TQObject* receiver, const char* member,
- TQObject* parent, const char* name )
- : KAction( text, accel, parent, name )
+ TQObject* tqparent, const char* name )
+ : KAction( text, accel, tqparent, name )
{
m_receiver = receiver;
m_member = member;
diff --git a/kpovmodeler/pmactions.h b/kpovmodeler/pmactions.h
index 6575caa8..4e058273 100644
--- a/kpovmodeler/pmactions.h
+++ b/kpovmodeler/pmactions.h
@@ -36,8 +36,9 @@ class TQToolButton;
class PMComboAction : public KAction
{
Q_OBJECT
+ TQ_OBJECT
public:
- PMComboAction( const TQString& text, int accel, const TQObject* receiver, const char* member, TQObject* parent, const char* name );
+ PMComboAction( const TQString& text, int accel, const TQObject* receiver, const char* member, TQObject* tqparent, const char* name );
~PMComboAction( );
virtual int plug( TQWidget* w, int index = -1 );
@@ -67,8 +68,9 @@ private:
class PMLabelAction : public KAction
{
Q_OBJECT
+ TQ_OBJECT
public:
- PMLabelAction( const TQString &text, TQObject *parent = 0, const char *name = 0 );
+ PMLabelAction( const TQString &text, TQObject *tqparent = 0, const char *name = 0 );
virtual int plug( TQWidget *widget, int index = -1 );
virtual void unplug( TQWidget *widget );
@@ -84,8 +86,9 @@ private:
class PMSpinBoxAction : public KAction
{
Q_OBJECT
+ TQ_OBJECT
public:
- PMSpinBoxAction( const TQString& text, int accel, const TQObject* receiver, const char* member, TQObject* parent, const char* name );
+ PMSpinBoxAction( const TQString& text, int accel, const TQObject* receiver, const char* member, TQObject* tqparent, const char* name );
~PMSpinBoxAction( );
virtual int plug( TQWidget* w, int index = -1 );
diff --git a/kpovmodeler/pmaddcommand.cpp b/kpovmodeler/pmaddcommand.cpp
index b8d4ea49..1f34e82c 100644
--- a/kpovmodeler/pmaddcommand.cpp
+++ b/kpovmodeler/pmaddcommand.cpp
@@ -26,11 +26,11 @@
#include <klocale.h>
-PMAddCommand::PMAddCommand( PMObject* obj, PMObject* parent, PMObject* after )
- : PMCommand( i18n( "Add New %1" ).arg( obj->description( ) ) )
+PMAddCommand::PMAddCommand( PMObject* obj, PMObject* tqparent, PMObject* after )
+ : PMCommand( i18n( "Add New %1" ).tqarg( obj->description( ) ) )
{
m_objects.append( obj );
- m_pParent = parent;
+ m_pParent = tqparent;
m_pAfter = after;
m_executed = false;
m_firstExecution = true;
@@ -38,12 +38,12 @@ PMAddCommand::PMAddCommand( PMObject* obj, PMObject* parent, PMObject* after )
m_pParentChangeMemento = 0;
}
-PMAddCommand::PMAddCommand( const PMObjectList& list, PMObject* parent,
+PMAddCommand::PMAddCommand( const PMObjectList& list, PMObject* tqparent,
PMObject* after )
: PMCommand( i18n( "Add Objects" ) )
{
m_objects = list;
- m_pParent = parent;
+ m_pParent = tqparent;
m_pAfter = after;
m_executed = false;
m_firstExecution = true;
@@ -116,8 +116,8 @@ void PMAddCommand::execute( PMCommandManager* theManager )
for( ; links.current( ); ++links )
{
PMObject* l = links.current( );
- if( l->parent( ) )
- l->parent( )->takeChild( l );
+ if( l->tqparent( ) )
+ l->tqparent( )->takeChild( l );
else
m_objects.removeRef( l );
m_insertErrors.append( l );
@@ -186,7 +186,7 @@ void PMAddCommand::undo( PMCommandManager* theManager )
if( decl )
{
m_links.append( lit.current( ) );
- if( !m_linkedDeclares.containsRef( decl ) )
+ if( !m_linkedDeclares.tqcontainsRef( decl ) )
m_linkedDeclares.append( decl );
}
}
@@ -204,8 +204,8 @@ void PMAddCommand::undo( PMCommandManager* theManager )
// signal has to be emitted before the item is removed
theManager->cmdObjectChanged( obj, PMCRemove );
- if( obj->parent( ) )
- obj->parent( )->takeChild( obj );
+ if( obj->tqparent( ) )
+ obj->tqparent( )->takeChild( obj );
}
if( m_pParentChangeMemento )
diff --git a/kpovmodeler/pmaddcommand.h b/kpovmodeler/pmaddcommand.h
index 97793d03..a5759ea8 100644
--- a/kpovmodeler/pmaddcommand.h
+++ b/kpovmodeler/pmaddcommand.h
@@ -38,22 +38,22 @@ public:
/**
* Command that adds a new PMObject.
*
- * The object obj will be inserted as child of parent after
+ * The object obj will be inserted as child of tqparent after
* the object after.
*
* If after is 0, the object becomes the first child.
*/
- PMAddCommand( PMObject* obj, PMObject* parent, PMObject* after );
+ PMAddCommand( PMObject* obj, PMObject* tqparent, PMObject* after );
/**
* Command that adds a list of new PMObjects.
*
- * The object in the list will be inserted as children of parent after
+ * The object in the list will be inserted as tqchildren of tqparent after
* the object after.
*
- * If after is 0, the objects will be inserted as first children.
+ * If after is 0, the objects will be inserted as first tqchildren.
*/
- PMAddCommand( const PMObjectList& list, PMObject* parent, PMObject* after );
+ PMAddCommand( const PMObjectList& list, PMObject* tqparent, PMObject* after );
/**
* Deletes the command. The inserted object will be deleted, if
the command was not executed (or undo-ed) */
diff --git a/kpovmodeler/pmbicubicpatch.cpp b/kpovmodeler/pmbicubicpatch.cpp
index 2c1c99dd..df66ec52 100644
--- a/kpovmodeler/pmbicubicpatch.cpp
+++ b/kpovmodeler/pmbicubicpatch.cpp
@@ -177,10 +177,10 @@ void PMBicubicPatch::serialize( TQDomElement& e, TQDomDocument& doc ) const
e.setAttribute( "uvEnabled", m_uvEnabled );
for( i = 0; i < 16; i++ )
- e.setAttribute( TQString( "cp%1" ).arg( i ), m_point[i].serializeXML( ) );
+ e.setAttribute( TQString( "cp%1" ).tqarg( i ), m_point[i].serializeXML( ) );
for( i = 0; i < 4; ++i )
- e.setAttribute( TQString( "uv%1" ).arg( i ), m_uvVectors[i].serializeXML( ) );
+ e.setAttribute( TQString( "uv%1" ).tqarg( i ), m_uvVectors[i].serializeXML( ) );
Base::serialize( e, doc );
}
@@ -198,7 +198,7 @@ void PMBicubicPatch::readAttributes( const PMXMLHelper& h )
for( v = 0; v < 4; v++ )
for( u = 0; u < 4; u++ )
- m_point[u+v*4] = h.vectorAttribute( TQString( "cp%1" ).arg( u+v*4 ),
+ m_point[u+v*4] = h.vectorAttribute( TQString( "cp%1" ).tqarg( u+v*4 ),
PMVector( o + s * u, 0, o + s * v ) );
m_uvVectors[0] = h.vectorAttribute( "uv0", c_defaultUVVector0 );
@@ -209,11 +209,11 @@ void PMBicubicPatch::readAttributes( const PMXMLHelper& h )
Base::readAttributes( h );
}
-PMMetaObject* PMBicubicPatch::metaObject( ) const
+PMMetaObject* PMBicubicPatch::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "BicubicPatch", Base::metaObject( ),
+ s_pMetaObject = new PMMetaObject( "BicubicPatch", Base::tqmetaObject( ),
createNewBicubicPatch );
s_pMetaObject->addProperty(
new PMBicubicPatchProperty( "patchType", &PMBicubicPatch::setPatchType,
@@ -365,9 +365,9 @@ PMVector PMBicubicPatch::uvVector( int i ) const
return PMVector( 0.0, 0.0 );
}
-PMDialogEditBase* PMBicubicPatch::editWidget( TQWidget* parent ) const
+PMDialogEditBase* PMBicubicPatch::editWidget( TQWidget* tqparent ) const
{
- return new PMBicubicPatchEdit( parent );
+ return new PMBicubicPatchEdit( tqparent );
}
void PMBicubicPatch::restoreMemento( PMMemento* s )
@@ -527,7 +527,7 @@ void PMBicubicPatch::controlPoints( PMControlPointList& list )
for( v = 0; v < 4; v++ )
for( u = 0; u < 4; u++ )
list.append( new PM3DControlPoint( m_point[u+v*4], u+v*4,
- i18n( "Point (%1, %2)" ).arg( u ).arg( v ) ) );
+ i18n( "Point (%1, %2)" ).tqarg( u ).tqarg( v ) ) );
}
void PMBicubicPatch::controlPointsChanged( PMControlPointList& list )
diff --git a/kpovmodeler/pmbicubicpatch.h b/kpovmodeler/pmbicubicpatch.h
index d14f7821..2c1a623b 100644
--- a/kpovmodeler/pmbicubicpatch.h
+++ b/kpovmodeler/pmbicubicpatch.h
@@ -55,7 +55,7 @@ public:
/** */
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void cleanUp( ) const;
@@ -66,7 +66,7 @@ public:
/**
* Returns a new @ref PMBicubicPatchEdit
*/
- virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
+ virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
/**
* Returns the name of the pixmap that is displayed in the tree view
* and dialog view
diff --git a/kpovmodeler/pmbicubicpatchedit.cpp b/kpovmodeler/pmbicubicpatchedit.cpp
index 8dff49b0..64cb3db8 100644
--- a/kpovmodeler/pmbicubicpatchedit.cpp
+++ b/kpovmodeler/pmbicubicpatchedit.cpp
@@ -29,8 +29,8 @@
#include <tqcheckbox.h>
#include <klocale.h>
-PMBicubicPatchEdit::PMBicubicPatchEdit( TQWidget* parent, const char* name )
- : Base( parent, name )
+PMBicubicPatchEdit::PMBicubicPatchEdit( TQWidget* tqparent, const char* name )
+ : Base( tqparent, name )
{
m_pDisplayedObject = 0;
}
@@ -39,32 +39,32 @@ void PMBicubicPatchEdit::createTopWidgets( )
{
Base::createTopWidgets( );
- TQHBoxLayout* layout;
+ TQHBoxLayout* tqlayout;
m_pType = new TQComboBox( false, this );
m_pType->insertItem( i18n( "Normal (type 0)" ) );
m_pType->insertItem( i18n( "Preprocessed (type 1)" ) );
- layout = new TQHBoxLayout( topLayout( ) );
- layout->addWidget( new TQLabel( i18n( "Type:" ), this ) );
- layout->addWidget( m_pType );
- layout->addStretch( 1 );
+ tqlayout = new TQHBoxLayout( topLayout( ) );
+ tqlayout->addWidget( new TQLabel( i18n( "Type:" ), this ) );
+ tqlayout->addWidget( m_pType );
+ tqlayout->addStretch( 1 );
m_pUSteps = new PMIntEdit( this );
m_pUSteps->setValidation( true, 0, false, 0 );
- layout = new TQHBoxLayout( topLayout( ) );
- layout->addWidget( new TQLabel( i18n( "Steps:" ) + " u", this ) );
- layout->addWidget( m_pUSteps );
+ tqlayout = new TQHBoxLayout( topLayout( ) );
+ tqlayout->addWidget( new TQLabel( i18n( "Steps:" ) + " u", this ) );
+ tqlayout->addWidget( m_pUSteps );
m_pVSteps = new PMIntEdit( this );
m_pVSteps->setValidation( true, 0, false, 0 );
- layout->addWidget( new TQLabel( "v", this ) );
- layout->addWidget( m_pVSteps );
+ tqlayout->addWidget( new TQLabel( "v", this ) );
+ tqlayout->addWidget( m_pVSteps );
m_pFlatness = new PMFloatEdit( this );
m_pFlatness->setValidation( true, 0.0, false, 0.0 );
- layout = new TQHBoxLayout( topLayout( ) );
- layout->addWidget( new TQLabel( i18n( "Flatness:" ), this ) );
- layout->addWidget( m_pFlatness );
- layout->addStretch( 1 );
+ tqlayout = new TQHBoxLayout( topLayout( ) );
+ tqlayout->addWidget( new TQLabel( i18n( "Flatness:" ), this ) );
+ tqlayout->addWidget( m_pFlatness );
+ tqlayout->addStretch( 1 );
topLayout( )->addWidget( new TQLabel( i18n( "Points:" ), this ) );
diff --git a/kpovmodeler/pmbicubicpatchedit.h b/kpovmodeler/pmbicubicpatchedit.h
index ac00f00a..cb27810f 100644
--- a/kpovmodeler/pmbicubicpatchedit.h
+++ b/kpovmodeler/pmbicubicpatchedit.h
@@ -39,12 +39,13 @@ class TQCheckBox;
class PMBicubicPatchEdit : public PMGraphicalObjectEdit
{
Q_OBJECT
+ TQ_OBJECT
typedef PMGraphicalObjectEdit Base;
public:
/**
- * Creates a PMBicubicPatchEdit with parent and name
+ * Creates a PMBicubicPatchEdit with tqparent and name
*/
- PMBicubicPatchEdit( TQWidget* parent, const char* name = 0 );
+ PMBicubicPatchEdit( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displayObject( PMObject* o );
diff --git a/kpovmodeler/pmblendmapmodifiers.cpp b/kpovmodeler/pmblendmapmodifiers.cpp
index 9d26419e..22511200 100644
--- a/kpovmodeler/pmblendmapmodifiers.cpp
+++ b/kpovmodeler/pmblendmapmodifiers.cpp
@@ -57,11 +57,11 @@ PMBlendMapModifiers::~PMBlendMapModifiers( )
{
}
-PMMetaObject* PMBlendMapModifiers::metaObject( ) const
+PMMetaObject* PMBlendMapModifiers::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "BlendMapModifiers", Base::metaObject( ),
+ s_pMetaObject = new PMMetaObject( "BlendMapModifiers", Base::tqmetaObject( ),
createBlendMapModifiers );
s_pMetaObject->addProperty(
new PMBlendMapModifiersProperty( "frequencyEnabled", &PMBlendMapModifiers::enableFrequency,
@@ -236,9 +236,9 @@ void PMBlendMapModifiers::setWaveFormType( PMWaveFormType c )
}
}
-PMDialogEditBase* PMBlendMapModifiers::editWidget( TQWidget* parent ) const
+PMDialogEditBase* PMBlendMapModifiers::editWidget( TQWidget* tqparent ) const
{
- return new PMBlendMapModifiersEdit( parent );
+ return new PMBlendMapModifiersEdit( tqparent );
}
void PMBlendMapModifiers::restoreMemento( PMMemento* s )
diff --git a/kpovmodeler/pmblendmapmodifiers.h b/kpovmodeler/pmblendmapmodifiers.h
index ecf0bfed..fb7d2623 100644
--- a/kpovmodeler/pmblendmapmodifiers.h
+++ b/kpovmodeler/pmblendmapmodifiers.h
@@ -57,7 +57,7 @@ public:
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void cleanUp( ) const;
@@ -69,7 +69,7 @@ public:
/**
* Returns a new @ref PMBlendMapModifiersEdit
*/
- virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
+ virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
/** */
virtual TQString pixmap( ) const { return TQString( "pmblendmapmodifiers" ); }
diff --git a/kpovmodeler/pmblendmapmodifiersedit.cpp b/kpovmodeler/pmblendmapmodifiersedit.cpp
index fd443623..b18f3eed 100644
--- a/kpovmodeler/pmblendmapmodifiersedit.cpp
+++ b/kpovmodeler/pmblendmapmodifiersedit.cpp
@@ -37,8 +37,8 @@
#include <kdialog.h>
#include <kfiledialog.h>
-PMBlendMapModifiersEdit::PMBlendMapModifiersEdit( TQWidget* parent, const char* name )
- : Base( parent, name )
+PMBlendMapModifiersEdit::PMBlendMapModifiersEdit( TQWidget* tqparent, const char* name )
+ : Base( tqparent, name )
{
m_pDisplayedObject = 0;
}
diff --git a/kpovmodeler/pmblendmapmodifiersedit.h b/kpovmodeler/pmblendmapmodifiersedit.h
index 18f3fa87..db3c764e 100644
--- a/kpovmodeler/pmblendmapmodifiersedit.h
+++ b/kpovmodeler/pmblendmapmodifiersedit.h
@@ -43,12 +43,13 @@ class TQPushButton;
class PMBlendMapModifiersEdit : public PMDialogEditBase
{
Q_OBJECT
+ TQ_OBJECT
typedef PMDialogEditBase Base;
public:
/**
- * Creates a PMBlendMapModifiersEdit with parent and name
+ * Creates a PMBlendMapModifiersEdit with tqparent and name
*/
- PMBlendMapModifiersEdit( TQWidget* parent, const char* name = 0 );
+ PMBlendMapModifiersEdit( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displayObject( PMObject* o );
diff --git a/kpovmodeler/pmblob.cpp b/kpovmodeler/pmblob.cpp
index 6621cadf..5dc5bb6c 100644
--- a/kpovmodeler/pmblob.cpp
+++ b/kpovmodeler/pmblob.cpp
@@ -77,11 +77,11 @@ void PMBlob::readAttributes( const PMXMLHelper& h )
Base::readAttributes( h );
}
-PMMetaObject* PMBlob::metaObject( ) const
+PMMetaObject* PMBlob::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "Blob", Base::metaObject( ),
+ s_pMetaObject = new PMMetaObject( "Blob", Base::tqmetaObject( ),
createNewBlob );
s_pMetaObject->addProperty(
new PMBlobProperty( "threshold", &PMBlob::setThreshold, &PMBlob::threshold ) );
@@ -139,9 +139,9 @@ void PMBlob::setHierarchy( bool h )
}
}
-PMDialogEditBase* PMBlob::editWidget( TQWidget* parent ) const
+PMDialogEditBase* PMBlob::editWidget( TQWidget* tqparent ) const
{
- return new PMBlobEdit( parent );
+ return new PMBlobEdit( tqparent );
}
void PMBlob::restoreMemento( PMMemento* s )
diff --git a/kpovmodeler/pmblob.h b/kpovmodeler/pmblob.h
index 2c764590..801e5338 100644
--- a/kpovmodeler/pmblob.h
+++ b/kpovmodeler/pmblob.h
@@ -52,7 +52,7 @@ public:
/** */
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void cleanUp( ) const;
@@ -63,7 +63,7 @@ public:
/**
* Returns a new @ref PMBlobEdit
*/
- virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
+ virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
/**
* Returns the name of the pixmap that is displayed in the tree view
* and dialog view
diff --git a/kpovmodeler/pmblobcylinder.cpp b/kpovmodeler/pmblobcylinder.cpp
index d166a6a3..217a5743 100644
--- a/kpovmodeler/pmblobcylinder.cpp
+++ b/kpovmodeler/pmblobcylinder.cpp
@@ -93,11 +93,11 @@ void PMBlobCylinder::readAttributes( const PMXMLHelper& h )
Base::readAttributes( h );
}
-PMMetaObject* PMBlobCylinder::metaObject( ) const
+PMMetaObject* PMBlobCylinder::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "BlobCylinder", Base::metaObject( ),
+ s_pMetaObject = new PMMetaObject( "BlobCylinder", Base::tqmetaObject( ),
createNewBlobCylinder );
s_pMetaObject->addProperty(
new PMBlobCylinderProperty( "end1", &PMBlobCylinder::setEnd1,
@@ -160,9 +160,9 @@ void PMBlobCylinder::setStrength( double s )
}
}
-PMDialogEditBase* PMBlobCylinder::editWidget( TQWidget* parent ) const
+PMDialogEditBase* PMBlobCylinder::editWidget( TQWidget* tqparent ) const
{
- return new PMBlobCylinderEdit( parent );
+ return new PMBlobCylinderEdit( tqparent );
}
void PMBlobCylinder::restoreMemento( PMMemento* s )
diff --git a/kpovmodeler/pmblobcylinder.h b/kpovmodeler/pmblobcylinder.h
index 1e9a10f1..8959cee9 100644
--- a/kpovmodeler/pmblobcylinder.h
+++ b/kpovmodeler/pmblobcylinder.h
@@ -57,7 +57,7 @@ public:
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
@@ -66,7 +66,7 @@ public:
/**
* Returns a new @ref PMBlobCylinderEdit
*/
- virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
+ virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
/**
* Returns the name of the pixmap that is displayed in the tree view and dialog view
*/
diff --git a/kpovmodeler/pmblobcylinderedit.cpp b/kpovmodeler/pmblobcylinderedit.cpp
index 34910df0..f3e702d0 100644
--- a/kpovmodeler/pmblobcylinderedit.cpp
+++ b/kpovmodeler/pmblobcylinderedit.cpp
@@ -26,8 +26,8 @@
#include <klocale.h>
#include <tqcheckbox.h>
-PMBlobCylinderEdit::PMBlobCylinderEdit( TQWidget* parent, const char* name )
- : Base( parent, name )
+PMBlobCylinderEdit::PMBlobCylinderEdit( TQWidget* tqparent, const char* name )
+ : Base( tqparent, name )
{
m_pDisplayedObject = 0;
}
@@ -36,7 +36,7 @@ void PMBlobCylinderEdit::createTopWidgets( )
{
Base::createTopWidgets( );
- TQHBoxLayout* layout;
+ TQHBoxLayout* tqlayout;
TQGridLayout* gl;
m_pEnd1 = new PMVectorEdit( "x", "y", "z", this );
@@ -50,13 +50,13 @@ void PMBlobCylinderEdit::createTopWidgets( )
gl->addWidget( new TQLabel( i18n( "End 2:" ), this ), 1, 0 );
gl->addWidget( m_pEnd2, 1, 1 );
- layout = new TQHBoxLayout( topLayout( ) );
- gl = new TQGridLayout( layout, 2, 2 );
+ tqlayout = new TQHBoxLayout( topLayout( ) );
+ gl = new TQGridLayout( tqlayout, 2, 2 );
gl->addWidget( new TQLabel( i18n( "Radius:" ), this ), 0, 0 );
gl->addWidget( m_pRadius, 0, 1 );
gl->addWidget( new TQLabel( i18n( "Strength:" ), this ), 1, 0 );
gl->addWidget( m_pStrength, 1, 1 );
- layout->addStretch( 1 );
+ tqlayout->addStretch( 1 );
connect( m_pEnd1, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
connect( m_pEnd2, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
diff --git a/kpovmodeler/pmblobcylinderedit.h b/kpovmodeler/pmblobcylinderedit.h
index b9ab169e..dbe24134 100644
--- a/kpovmodeler/pmblobcylinderedit.h
+++ b/kpovmodeler/pmblobcylinderedit.h
@@ -33,12 +33,13 @@ class PMBlobCylinder;
class PMBlobCylinderEdit : public PMDetailObjectEdit
{
Q_OBJECT
+ TQ_OBJECT
typedef PMDetailObjectEdit Base;
public:
/**
- * Creates a PMBlobCylinderEdit with parent and name
+ * Creates a PMBlobCylinderEdit with tqparent and name
*/
- PMBlobCylinderEdit( TQWidget* parent, const char* name = 0 );
+ PMBlobCylinderEdit( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displayObject( PMObject* o );
diff --git a/kpovmodeler/pmblobedit.cpp b/kpovmodeler/pmblobedit.cpp
index a38d9639..b7dc2034 100644
--- a/kpovmodeler/pmblobedit.cpp
+++ b/kpovmodeler/pmblobedit.cpp
@@ -25,8 +25,8 @@
#include <tqcheckbox.h>
#include <klocale.h>
-PMBlobEdit::PMBlobEdit( TQWidget* parent, const char* name )
- : Base( parent, name )
+PMBlobEdit::PMBlobEdit( TQWidget* tqparent, const char* name )
+ : Base( tqparent, name )
{
m_pDisplayedObject = 0;
}
diff --git a/kpovmodeler/pmblobedit.h b/kpovmodeler/pmblobedit.h
index 5677fb9b..bada56da 100644
--- a/kpovmodeler/pmblobedit.h
+++ b/kpovmodeler/pmblobedit.h
@@ -36,12 +36,13 @@ class TQCheckBox;
class PMBlobEdit : public PMSolidObjectEdit
{
Q_OBJECT
+ TQ_OBJECT
typedef PMSolidObjectEdit Base;
public:
/**
- * Creates a PMBlobEdit with parent and name
+ * Creates a PMBlobEdit with tqparent and name
*/
- PMBlobEdit( TQWidget* parent, const char* name = 0 );
+ PMBlobEdit( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displayObject( PMObject* o );
diff --git a/kpovmodeler/pmblobsphere.cpp b/kpovmodeler/pmblobsphere.cpp
index cbcd33a4..fc8af594 100644
--- a/kpovmodeler/pmblobsphere.cpp
+++ b/kpovmodeler/pmblobsphere.cpp
@@ -72,11 +72,11 @@ TQString PMBlobSphere::description( ) const
return i18n( "blob sphere" );
}
-PMMetaObject* PMBlobSphere::metaObject( ) const
+PMMetaObject* PMBlobSphere::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "BlobSphere", Base::metaObject( ),
+ s_pMetaObject = new PMMetaObject( "BlobSphere", Base::tqmetaObject( ),
createNewBlobSphere );
s_pMetaObject->addProperty(
new PMBlobSphereProperty( "center", &PMBlobSphere::setCentre,
@@ -107,9 +107,9 @@ void PMBlobSphere::readAttributes( const PMXMLHelper& h )
Base::readAttributes( h );
}
-PMDialogEditBase* PMBlobSphere::editWidget( TQWidget* parent ) const
+PMDialogEditBase* PMBlobSphere::editWidget( TQWidget* tqparent ) const
{
- return new PMBlobSphereEdit( parent );
+ return new PMBlobSphereEdit( tqparent );
}
void PMBlobSphere::restoreMemento( PMMemento* s )
diff --git a/kpovmodeler/pmblobsphere.h b/kpovmodeler/pmblobsphere.h
index 0abe983e..4ae57e5c 100644
--- a/kpovmodeler/pmblobsphere.h
+++ b/kpovmodeler/pmblobsphere.h
@@ -55,7 +55,7 @@ public:
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
@@ -64,7 +64,7 @@ public:
/**
* Returns a new @ref PMBlobSphereEdit
*/
- virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
+ virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
/**
* Returns the name of the pixmap that is displayed in the tree view
* and dialog view
diff --git a/kpovmodeler/pmblobsphereedit.cpp b/kpovmodeler/pmblobsphereedit.cpp
index ba4e226b..6b569b93 100644
--- a/kpovmodeler/pmblobsphereedit.cpp
+++ b/kpovmodeler/pmblobsphereedit.cpp
@@ -24,8 +24,8 @@
#include <tqlabel.h>
#include <klocale.h>
-PMBlobSphereEdit::PMBlobSphereEdit( TQWidget* parent, const char* name )
- : Base( parent, name )
+PMBlobSphereEdit::PMBlobSphereEdit( TQWidget* tqparent, const char* name )
+ : Base( tqparent, name )
{
m_pDisplayedObject = 0;
}
@@ -34,23 +34,23 @@ void PMBlobSphereEdit::createTopWidgets( )
{
Base::createTopWidgets( );
- TQHBoxLayout* layout;
+ TQHBoxLayout* tqlayout;
m_pCentre = new PMVectorEdit( "x", "y", "z", this );
m_pRadius = new PMFloatEdit( this );
m_pStrength = new PMFloatEdit( this );
- layout = new TQHBoxLayout( topLayout( ) );
- layout->addWidget( new TQLabel( i18n( "Center:" ), this ) );
- layout->addWidget( m_pCentre );
+ tqlayout = new TQHBoxLayout( topLayout( ) );
+ tqlayout->addWidget( new TQLabel( i18n( "Center:" ), this ) );
+ tqlayout->addWidget( m_pCentre );
- layout = new TQHBoxLayout( topLayout( ) );
- TQGridLayout* gl = new TQGridLayout( layout, 2, 2 );
+ tqlayout = new TQHBoxLayout( topLayout( ) );
+ TQGridLayout* gl = new TQGridLayout( tqlayout, 2, 2 );
gl->addWidget( new TQLabel( i18n( "Radius:" ), this ), 0, 0 );
gl->addWidget( m_pRadius, 0, 1 );
gl->addWidget( new TQLabel( i18n( "Strength:" ), this ), 1, 0 );
gl->addWidget( m_pStrength, 1, 1 );
- layout->addStretch( 1 );
+ tqlayout->addStretch( 1 );
connect( m_pCentre, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
connect( m_pRadius, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
diff --git a/kpovmodeler/pmblobsphereedit.h b/kpovmodeler/pmblobsphereedit.h
index 53b65ab2..d4f18058 100644
--- a/kpovmodeler/pmblobsphereedit.h
+++ b/kpovmodeler/pmblobsphereedit.h
@@ -34,12 +34,13 @@ class PMFloatEdit ;
class PMBlobSphereEdit : public PMDetailObjectEdit
{
Q_OBJECT
+ TQ_OBJECT
typedef PMDetailObjectEdit Base;
public:
/**
- * Creates a PMBlobSphereEdit with parent and name
+ * Creates a PMBlobSphereEdit with tqparent and name
*/
- PMBlobSphereEdit( TQWidget* parent, const char* name = 0 );
+ PMBlobSphereEdit( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displayObject( PMObject* o );
diff --git a/kpovmodeler/pmboundedby.cpp b/kpovmodeler/pmboundedby.cpp
index 5cc66e55..3e123d29 100644
--- a/kpovmodeler/pmboundedby.cpp
+++ b/kpovmodeler/pmboundedby.cpp
@@ -40,11 +40,11 @@ PMBoundedBy::~PMBoundedBy( )
{
}
-PMMetaObject* PMBoundedBy::metaObject( ) const
+PMMetaObject* PMBoundedBy::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "BoundedBy", Base::metaObject( ),
+ s_pMetaObject = new PMMetaObject( "BoundedBy", Base::tqmetaObject( ),
createNewBoundedBy );
s_pMetaObject->addProperty(
new PMBoundedByProperty( "clippedBy", 0, &PMBoundedBy::clippedBy ) );
@@ -91,9 +91,9 @@ void PMBoundedBy::readAttributes( const PMXMLHelper& h )
Base::readAttributes( h );
}
-PMDialogEditBase* PMBoundedBy::editWidget( TQWidget* parent ) const
+PMDialogEditBase* PMBoundedBy::editWidget( TQWidget* tqparent ) const
{
- return new PMBoundedByEdit( parent );
+ return new PMBoundedByEdit( tqparent );
}
void PMBoundedBy::childRemoved( PMObject* o )
diff --git a/kpovmodeler/pmboundedby.h b/kpovmodeler/pmboundedby.h
index 7c88a6aa..997cef0f 100644
--- a/kpovmodeler/pmboundedby.h
+++ b/kpovmodeler/pmboundedby.h
@@ -49,7 +49,7 @@ public:
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void cleanUp( ) const;
@@ -64,7 +64,7 @@ public:
/**
* Returns a new @ref PMBoundedByEdit
*/
- virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
+ virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
/**
* Returns the name of the pixmap that is displayed in the tree view
* and dialog view
diff --git a/kpovmodeler/pmboundedbyedit.cpp b/kpovmodeler/pmboundedbyedit.cpp
index 8a41fa52..db0b7b01 100644
--- a/kpovmodeler/pmboundedbyedit.cpp
+++ b/kpovmodeler/pmboundedbyedit.cpp
@@ -23,8 +23,8 @@
#include <tqlabel.h>
#include <klocale.h>
-PMBoundedByEdit::PMBoundedByEdit( TQWidget* parent, const char* name )
- : Base( parent, name )
+PMBoundedByEdit::PMBoundedByEdit( TQWidget* tqparent, const char* name )
+ : Base( tqparent, name )
{
m_pDisplayedObject = 0;
}
diff --git a/kpovmodeler/pmboundedbyedit.h b/kpovmodeler/pmboundedbyedit.h
index 53da66f2..f575fbb8 100644
--- a/kpovmodeler/pmboundedbyedit.h
+++ b/kpovmodeler/pmboundedbyedit.h
@@ -35,12 +35,13 @@ class TQLabel;
class PMBoundedByEdit : public PMDialogEditBase
{
Q_OBJECT
+ TQ_OBJECT
typedef PMDialogEditBase Base;
public:
/**
- * Creates a PMBoundedByEdit with parent and name
+ * Creates a PMBoundedByEdit with tqparent and name
*/
- PMBoundedByEdit( TQWidget* parent, const char* name = 0 );
+ PMBoundedByEdit( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displayObject( PMObject* o );
diff --git a/kpovmodeler/pmbox.cpp b/kpovmodeler/pmbox.cpp
index 155ebc68..0f2bedb3 100644
--- a/kpovmodeler/pmbox.cpp
+++ b/kpovmodeler/pmbox.cpp
@@ -76,11 +76,11 @@ void PMBox::readAttributes( const PMXMLHelper& h )
Base::readAttributes( h );
}
-PMMetaObject* PMBox::metaObject( ) const
+PMMetaObject* PMBox::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "Box", Base::metaObject( ),
+ s_pMetaObject = new PMMetaObject( "Box", Base::tqmetaObject( ),
createNewBox );
s_pMetaObject->addProperty(
new PMBoxProperty( "corner1", &PMBox::setCorner1, &PMBox::corner1 ) );
@@ -114,9 +114,9 @@ void PMBox::setCorner2( const PMVector& p )
}
}
-PMDialogEditBase* PMBox::editWidget( TQWidget* parent ) const
+PMDialogEditBase* PMBox::editWidget( TQWidget* tqparent ) const
{
- return new PMBoxEdit( parent );
+ return new PMBoxEdit( tqparent );
}
void PMBox::restoreMemento( PMMemento* s )
diff --git a/kpovmodeler/pmbox.h b/kpovmodeler/pmbox.h
index e6abcf75..bf499042 100644
--- a/kpovmodeler/pmbox.h
+++ b/kpovmodeler/pmbox.h
@@ -56,7 +56,7 @@ public:
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
@@ -65,7 +65,7 @@ public:
/**
* Returns a new @ref PMBoxEdit
*/
- virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
+ virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
/**
* Returns the name of the pixmap that is displayed in the tree view
* and dialog view
diff --git a/kpovmodeler/pmboxedit.cpp b/kpovmodeler/pmboxedit.cpp
index 6b6a2f2a..c13da80d 100644
--- a/kpovmodeler/pmboxedit.cpp
+++ b/kpovmodeler/pmboxedit.cpp
@@ -24,8 +24,8 @@
#include <tqlabel.h>
#include <klocale.h>
-PMBoxEdit::PMBoxEdit( TQWidget* parent, const char* name )
- : Base( parent, name )
+PMBoxEdit::PMBoxEdit( TQWidget* tqparent, const char* name )
+ : Base( tqparent, name )
{
m_pDisplayedObject = 0;
}
diff --git a/kpovmodeler/pmboxedit.h b/kpovmodeler/pmboxedit.h
index 7fd6fadc..f9f0bf6d 100644
--- a/kpovmodeler/pmboxedit.h
+++ b/kpovmodeler/pmboxedit.h
@@ -35,12 +35,13 @@ class PMVectorEdit;
class PMBoxEdit : public PMSolidObjectEdit
{
Q_OBJECT
+ TQ_OBJECT
typedef PMSolidObjectEdit Base;
public:
/**
- * Creates a PMBoxEdit with parent and name
+ * Creates a PMBoxEdit with tqparent and name
*/
- PMBoxEdit( TQWidget* parent, const char* name = 0 );
+ PMBoxEdit( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displayObject( PMObject* o );
diff --git a/kpovmodeler/pmbumpmap.cpp b/kpovmodeler/pmbumpmap.cpp
index 21fb29a3..ebdabab5 100644
--- a/kpovmodeler/pmbumpmap.cpp
+++ b/kpovmodeler/pmbumpmap.cpp
@@ -200,11 +200,11 @@ void PMBumpMap::readAttributes( const PMXMLHelper& h )
Base::readAttributes( h );
}
-PMMetaObject* PMBumpMap::metaObject( ) const
+PMMetaObject* PMBumpMap::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "BumpMap", Base::metaObject( ),
+ s_pMetaObject = new PMMetaObject( "BumpMap", Base::tqmetaObject( ),
createNewBumpMap );
PMBitmapTypeProperty* bp = new PMBitmapTypeProperty(
@@ -336,9 +336,9 @@ void PMBumpMap::setBumpSize( double c )
}
}
-PMDialogEditBase* PMBumpMap::editWidget( TQWidget* parent ) const
+PMDialogEditBase* PMBumpMap::editWidget( TQWidget* tqparent ) const
{
- return new PMBumpMapEdit( parent );
+ return new PMBumpMapEdit( tqparent );
}
void PMBumpMap::restoreMemento( PMMemento* s )
diff --git a/kpovmodeler/pmbumpmap.h b/kpovmodeler/pmbumpmap.h
index ccdf5b98..64fb632f 100644
--- a/kpovmodeler/pmbumpmap.h
+++ b/kpovmodeler/pmbumpmap.h
@@ -72,7 +72,7 @@ public:
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void cleanUp( ) const;
@@ -87,7 +87,7 @@ public:
/**
* Returns a new @ref PMBumpMapEdit
*/
- virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
+ virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
/**
* Gets the bitmap type
diff --git a/kpovmodeler/pmbumpmapedit.cpp b/kpovmodeler/pmbumpmapedit.cpp
index f5de7a55..011e9873 100644
--- a/kpovmodeler/pmbumpmapedit.cpp
+++ b/kpovmodeler/pmbumpmapedit.cpp
@@ -38,8 +38,8 @@
#include <kfiledialog.h>
#include <kiconloader.h>
-PMBumpMapEdit::PMBumpMapEdit( TQWidget* parent, const char* name )
- : Base( parent, name )
+PMBumpMapEdit::PMBumpMapEdit( TQWidget* tqparent, const char* name )
+ : Base( tqparent, name )
{
m_pDisplayedObject = 0;
}
@@ -307,7 +307,7 @@ void PMBumpMapEdit::slotImageFileNameChanged( const TQString& /*a*/ )
void PMBumpMapEdit::slotImageFileBrowseClicked( )
{
- TQString str = KFileDialog::getOpenFileName( TQString::null, TQString::null );
+ TQString str = KFileDialog::getOpenFileName( TQString(), TQString() );
if( !str.isEmpty() )
{
diff --git a/kpovmodeler/pmbumpmapedit.h b/kpovmodeler/pmbumpmapedit.h
index 109128d6..8404229b 100644
--- a/kpovmodeler/pmbumpmapedit.h
+++ b/kpovmodeler/pmbumpmapedit.h
@@ -45,12 +45,13 @@ class TQPushButton;
class PMBumpMapEdit : public PMDialogEditBase
{
Q_OBJECT
+ TQ_OBJECT
typedef PMDialogEditBase Base;
public:
/**
- * Creates a PMBumpMapEdit with parent and name
+ * Creates a PMBumpMapEdit with tqparent and name
*/
- PMBumpMapEdit( TQWidget* parent, const char* name = 0 );
+ PMBumpMapEdit( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displayObject( PMObject* o );
/** */
diff --git a/kpovmodeler/pmcamera.cpp b/kpovmodeler/pmcamera.cpp
index ca37f751..697628a4 100644
--- a/kpovmodeler/pmcamera.cpp
+++ b/kpovmodeler/pmcamera.cpp
@@ -165,11 +165,11 @@ void PMCamera::readAttributes( const PMXMLHelper& h )
Base::readAttributes( h );
}
-PMMetaObject* PMCamera::metaObject( ) const
+PMMetaObject* PMCamera::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "Camera", Base::metaObject( ),
+ s_pMetaObject = new PMMetaObject( "Camera", Base::tqmetaObject( ),
createNewCamera );
s_pMetaObject->addProperty(
new PMCameraProperty( "location", &PMCamera::setLocation,
@@ -443,9 +443,9 @@ void PMCamera::setExportPovray( bool ex )
}
}
-PMDialogEditBase* PMCamera::editWidget( TQWidget* parent ) const
+PMDialogEditBase* PMCamera::editWidget( TQWidget* tqparent ) const
{
- return new PMCameraEdit( parent );
+ return new PMCameraEdit( tqparent );
}
void PMCamera::restoreMemento( PMMemento* s )
diff --git a/kpovmodeler/pmcamera.h b/kpovmodeler/pmcamera.h
index 7d385909..1c93c718 100644
--- a/kpovmodeler/pmcamera.h
+++ b/kpovmodeler/pmcamera.h
@@ -60,7 +60,7 @@ public:
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
@@ -70,7 +70,7 @@ public:
/**
* Returns a new @ref PMCameraEdit
*/
- virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
+ virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
/** */
virtual TQString pixmap( ) const { return TQString( "pmcamera" ); }
diff --git a/kpovmodeler/pmcameraedit.cpp b/kpovmodeler/pmcameraedit.cpp
index 471fa19a..1376efb9 100644
--- a/kpovmodeler/pmcameraedit.cpp
+++ b/kpovmodeler/pmcameraedit.cpp
@@ -30,8 +30,8 @@
#include <kmessagebox.h>
-PMCameraEdit::PMCameraEdit( TQWidget* parent, const char* name )
- : Base( parent, name )
+PMCameraEdit::PMCameraEdit( TQWidget* tqparent, const char* name )
+ : Base( tqparent, name )
{
m_pDisplayedObject = 0;
}
@@ -40,7 +40,7 @@ void PMCameraEdit::createTopWidgets( )
{
Base::createTopWidgets( );
- TQGridLayout* layout;
+ TQGridLayout* tqlayout;
TQLabel* label;
m_pCameraType = new TQComboBox( false, this );
@@ -53,10 +53,10 @@ void PMCameraEdit::createTopWidgets( )
m_pCameraType->insertItem( i18n( "Cylinder" ) );
m_pCylinderType = new TQComboBox( false, this );
- m_pCylinderType->insertItem( i18n( "1: Vertical, Fixed Viewpoint" ) );
- m_pCylinderType->insertItem( i18n( "2: Horizontal, Fixed Viewpoint" ) );
- m_pCylinderType->insertItem( i18n( "3: Vertical, Variable Viewpoint" ) );
- m_pCylinderType->insertItem( i18n( "4: Horizontal, Variable Viewpoint" ) );
+ m_pCylinderType->insertItem( i18n( "1:Qt::Vertical, Fixed Viewpoint" ) );
+ m_pCylinderType->insertItem( i18n( "2:Qt::Horizontal, Fixed Viewpoint" ) );
+ m_pCylinderType->insertItem( i18n( "3:Qt::Vertical, Variable Viewpoint" ) );
+ m_pCylinderType->insertItem( i18n( "4:Qt::Horizontal, Variable Viewpoint" ) );
m_pLocation = new PMVectorEdit( "x", "y", "z", this );
m_pSky = new PMVectorEdit( "x", "y", "z", this );
@@ -75,28 +75,28 @@ void PMCameraEdit::createTopWidgets( )
hl->addWidget( m_pCylinderTypeLabel );
hl->addWidget( m_pCylinderType );
- layout = new TQGridLayout( topLayout( ), 7, 2 );
- layout->addWidget( new TQLabel( i18n( "Location:" ), this ), 0, 0 );
- layout->addWidget( m_pLocation, 0, 1 );
+ tqlayout = new TQGridLayout( topLayout( ), 7, 2 );
+ tqlayout->addWidget( new TQLabel( i18n( "Location:" ), this ), 0, 0 );
+ tqlayout->addWidget( m_pLocation, 0, 1 );
- layout->addWidget( new TQLabel( i18n( "Sky:" ), this ), 1, 0 );
- layout->addWidget( m_pSky, 1, 1 );
+ tqlayout->addWidget( new TQLabel( i18n( "Sky:" ), this ), 1, 0 );
+ tqlayout->addWidget( m_pSky, 1, 1 );
- layout->addWidget( new TQLabel( i18n( "Direction:" ), this ), 2, 0 );
- layout->addWidget( m_pDirection, 2, 1 );
+ tqlayout->addWidget( new TQLabel( i18n( "Direction:" ), this ), 2, 0 );
+ tqlayout->addWidget( m_pDirection, 2, 1 );
- layout->addWidget( new TQLabel( i18n( "Right:" ), this ), 3, 0 );
- layout->addWidget( m_pRight, 3, 1 );
+ tqlayout->addWidget( new TQLabel( i18n( "Right:" ), this ), 3, 0 );
+ tqlayout->addWidget( m_pRight, 3, 1 );
- layout->addWidget( new TQLabel( i18n( "Up:" ), this ), 4, 0 );
- layout->addWidget( m_pUp, 4, 1 );
+ tqlayout->addWidget( new TQLabel( i18n( "Up:" ), this ), 4, 0 );
+ tqlayout->addWidget( m_pUp, 4, 1 );
- layout->addWidget( new TQLabel( i18n( "Look at:" ), this ), 5, 0 );
- layout->addWidget( m_pLookAt, 5, 1 );
+ tqlayout->addWidget( new TQLabel( i18n( "Look at:" ), this ), 5, 0 );
+ tqlayout->addWidget( m_pLookAt, 5, 1 );
m_pEnableAngle = new TQCheckBox( i18n( "Angle:" ), this );
- layout->addWidget( m_pEnableAngle, 6, 0 );
- layout->addWidget( m_pAngle, 6, 1, AlignLeft );
+ tqlayout->addWidget( m_pEnableAngle, 6, 0 );
+ tqlayout->addWidget( m_pAngle, 6, 1, AlignLeft );
m_pFocalBlur = new TQCheckBox( i18n( "Focal blur" ), this );
topLayout( )->addWidget( m_pFocalBlur );
@@ -116,27 +116,27 @@ void PMCameraEdit::createTopWidgets( )
m_pVariance->setValidation( true, 0, false, 0 );
m_focalWidgets.append( m_pVariance );
- layout = new TQGridLayout( topLayout( ), 5, 2 );
+ tqlayout = new TQGridLayout( topLayout( ), 5, 2 );
label = new TQLabel( i18n( "Aperture:" ), this );
m_focalWidgets.append( label );
- layout->addWidget( label, 0, 0 );
- layout->addWidget( m_pAperture, 0, 1 );
+ tqlayout->addWidget( label, 0, 0 );
+ tqlayout->addWidget( m_pAperture, 0, 1 );
label = new TQLabel( i18n( "Blur samples:" ), this );
m_focalWidgets.append( label );
- layout->addWidget( label, 1, 0 );
- layout->addWidget( m_pBlurSamples, 1, 1 );
+ tqlayout->addWidget( label, 1, 0 );
+ tqlayout->addWidget( m_pBlurSamples, 1, 1 );
label = new TQLabel( i18n( "Focal point:" ), this );
m_focalWidgets.append( label );
- layout->addWidget( label, 2, 0 );
- layout->addWidget( m_pFocalPoint, 2, 1 );
+ tqlayout->addWidget( label, 2, 0 );
+ tqlayout->addWidget( m_pFocalPoint, 2, 1 );
label = new TQLabel( i18n( "Confidence:" ), this );
m_focalWidgets.append( label );
- layout->addWidget( label, 3, 0 );
- layout->addWidget( m_pConfidence, 3, 1 );
+ tqlayout->addWidget( label, 3, 0 );
+ tqlayout->addWidget( m_pConfidence, 3, 1 );
label = new TQLabel( i18n( "Variance:" ), this );
m_focalWidgets.append( label );
- layout->addWidget( label, 4, 0 );
- layout->addWidget( m_pVariance, 4, 1 );
+ tqlayout->addWidget( label, 4, 0 );
+ tqlayout->addWidget( m_pVariance, 4, 1 );
m_pExport = new TQCheckBox( i18n( "Export to renderer" ), this );
topLayout( )->addWidget( m_pExport );
diff --git a/kpovmodeler/pmcameraedit.h b/kpovmodeler/pmcameraedit.h
index a9ed5ee9..33b9c39b 100644
--- a/kpovmodeler/pmcameraedit.h
+++ b/kpovmodeler/pmcameraedit.h
@@ -41,12 +41,13 @@ class TQCheckBox;
class PMCameraEdit : public PMNamedObjectEdit
{
Q_OBJECT
+ TQ_OBJECT
typedef PMNamedObjectEdit Base;
public:
/**
- * Creates a PMCameraEdit with parent and name
+ * Creates a PMCameraEdit with tqparent and name
*/
- PMCameraEdit( TQWidget* parent, const char* name = 0 );
+ PMCameraEdit( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displayObject( PMObject* o );
diff --git a/kpovmodeler/pmclippedby.cpp b/kpovmodeler/pmclippedby.cpp
index 24ea4e46..529e0962 100644
--- a/kpovmodeler/pmclippedby.cpp
+++ b/kpovmodeler/pmclippedby.cpp
@@ -40,11 +40,11 @@ PMClippedBy::~PMClippedBy( )
{
}
-PMMetaObject* PMClippedBy::metaObject( ) const
+PMMetaObject* PMClippedBy::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "ClippedBy", Base::metaObject( ),
+ s_pMetaObject = new PMMetaObject( "ClippedBy", Base::tqmetaObject( ),
createNewClippedBy );
s_pMetaObject->addProperty(
new PMClippedByProperty( "boundedBy", 0, &PMClippedBy::boundedBy ) );
@@ -91,9 +91,9 @@ void PMClippedBy::readAttributes( const PMXMLHelper& h )
Base::readAttributes( h );
}
-PMDialogEditBase* PMClippedBy::editWidget( TQWidget* parent ) const
+PMDialogEditBase* PMClippedBy::editWidget( TQWidget* tqparent ) const
{
- return new PMClippedByEdit( parent );
+ return new PMClippedByEdit( tqparent );
}
void PMClippedBy::childRemoved( PMObject* o )
diff --git a/kpovmodeler/pmclippedby.h b/kpovmodeler/pmclippedby.h
index 0e76e2cf..6c9d21a1 100644
--- a/kpovmodeler/pmclippedby.h
+++ b/kpovmodeler/pmclippedby.h
@@ -48,7 +48,7 @@ public:
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void cleanUp( ) const;
@@ -63,7 +63,7 @@ public:
/**
* Returns a new @ref PMClippedByEdit
*/
- virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
+ virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
/**
* Returns the name of the pixmap that is displayed in the tree view
* and dialog view
diff --git a/kpovmodeler/pmclippedbyedit.cpp b/kpovmodeler/pmclippedbyedit.cpp
index 8afa0285..486b58f2 100644
--- a/kpovmodeler/pmclippedbyedit.cpp
+++ b/kpovmodeler/pmclippedbyedit.cpp
@@ -23,8 +23,8 @@
#include <tqlabel.h>
#include <klocale.h>
-PMClippedByEdit::PMClippedByEdit( TQWidget* parent, const char* name )
- : Base( parent, name )
+PMClippedByEdit::PMClippedByEdit( TQWidget* tqparent, const char* name )
+ : Base( tqparent, name )
{
m_pDisplayedObject = 0;
}
diff --git a/kpovmodeler/pmclippedbyedit.h b/kpovmodeler/pmclippedbyedit.h
index 5b22f564..9050f406 100644
--- a/kpovmodeler/pmclippedbyedit.h
+++ b/kpovmodeler/pmclippedbyedit.h
@@ -35,12 +35,13 @@ class TQLabel;
class PMClippedByEdit : public PMDialogEditBase
{
Q_OBJECT
+ TQ_OBJECT
typedef PMDialogEditBase Base;
public:
/**
- * Creates a PMClippedByEdit with parent and name
+ * Creates a PMClippedByEdit with tqparent and name
*/
- PMClippedByEdit( TQWidget* parent, const char* name = 0 );
+ PMClippedByEdit( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displayObject( PMObject* o );
diff --git a/kpovmodeler/pmcolor.cpp b/kpovmodeler/pmcolor.cpp
index cac668e7..1f895861 100644
--- a/kpovmodeler/pmcolor.cpp
+++ b/kpovmodeler/pmcolor.cpp
@@ -76,7 +76,7 @@ PMColor::PMColor( const TQColor& c )
m_colorValue[4] = 0.0;
}
-TQColor PMColor::toQColor( ) const
+TQColor PMColor::toTQColor( ) const
{
double r, g, b, max = 0;
r = red( );
diff --git a/kpovmodeler/pmcolor.h b/kpovmodeler/pmcolor.h
index 5c3c4ec8..61fd4c63 100644
--- a/kpovmodeler/pmcolor.h
+++ b/kpovmodeler/pmcolor.h
@@ -95,9 +95,9 @@ public:
double transmit( ) const { return m_colorValue[4]; }
/**
- * Returns the rgb value as QColor
+ * Returns the rgb value as TQColor
*/
- TQColor toQColor( ) const;
+ TQColor toTQColor( ) const;
/**
* Returns a string for serialization
diff --git a/kpovmodeler/pmcoloredit.cpp b/kpovmodeler/pmcoloredit.cpp
index 9695f9eb..1c282f78 100644
--- a/kpovmodeler/pmcoloredit.cpp
+++ b/kpovmodeler/pmcoloredit.cpp
@@ -24,8 +24,8 @@
#include <tqcolor.h>
#include <kdialog.h>
-PMColorEdit::PMColorEdit( bool filterAndTransmit, TQWidget* parent, const char* name )
- : TQWidget( parent, name )
+PMColorEdit::PMColorEdit( bool filterAndTransmit, TQWidget* tqparent, const char* name )
+ : TQWidget( tqparent, name )
{
m_bFilterAndTransmit = filterAndTransmit;
@@ -106,7 +106,7 @@ void PMColorEdit::updateButton( )
{
bool b = m_pButton->signalsBlocked( );
m_pButton->blockSignals( true );
- m_pButton->setColor( m_color.toQColor( ) );
+ m_pButton->setColor( m_color.toTQColor( ) );
m_pButton->blockSignals( b );
}
diff --git a/kpovmodeler/pmcoloredit.h b/kpovmodeler/pmcoloredit.h
index a4be0083..4ef27e00 100644
--- a/kpovmodeler/pmcoloredit.h
+++ b/kpovmodeler/pmcoloredit.h
@@ -34,14 +34,15 @@ class TQColor;
/**
* Edit widget for @ref PMColor
*/
-class PMColorEdit : public QWidget
+class PMColorEdit : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Creates an edit widget for rgbft colors.
*/
- PMColorEdit( bool filterAndTransmit, TQWidget* parent, const char* name = 0 );
+ PMColorEdit( bool filterAndTransmit, TQWidget* tqparent, const char* name = 0 );
/**
* Sets the displayed color
diff --git a/kpovmodeler/pmcolorsettings.cpp b/kpovmodeler/pmcolorsettings.cpp
index c0dafa37..2b444407 100644
--- a/kpovmodeler/pmcolorsettings.cpp
+++ b/kpovmodeler/pmcolorsettings.cpp
@@ -25,63 +25,63 @@
#include <kcolorbutton.h>
#include <klocale.h>
-PMColorSettings::PMColorSettings( TQWidget* parent, const char* name )
- : PMSettingsDialogPage( parent, name )
+PMColorSettings::PMColorSettings( TQWidget* tqparent, const char* name )
+ : PMSettingsDialogPage( tqparent, name )
{
- TQHBoxLayout* hlayout;
- TQVBoxLayout* vlayout;
+ TQHBoxLayout* htqlayout;
+ TQVBoxLayout* vtqlayout;
TQGridLayout* grid;
- vlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
- grid = new TQGridLayout( vlayout, 6, 3 );
+ vtqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
+ grid = new TQGridLayout( vtqlayout, 6, 3 );
grid->addWidget( new TQLabel( i18n( "Background:" ), this ), 0, 0 );
- hlayout = new TQHBoxLayout( );
- grid->addLayout( hlayout, 0, 2 );
+ htqlayout = new TQHBoxLayout( );
+ grid->addLayout( htqlayout, 0, 2 );
m_pBackgroundColor = new KColorButton( this );
- hlayout->addWidget( m_pBackgroundColor );
- hlayout->addStretch( 1 );
+ htqlayout->addWidget( m_pBackgroundColor );
+ htqlayout->addStretch( 1 );
grid->addWidget( new TQLabel( i18n( "Wire frame:" ), this ), 1, 0 );
- hlayout = new TQHBoxLayout( );
- grid->addLayout( hlayout, 1, 2 );
+ htqlayout = new TQHBoxLayout( );
+ grid->addLayout( htqlayout, 1, 2 );
m_pGraphicalObjectsColor[0] = new KColorButton( this );
- hlayout->addWidget( m_pGraphicalObjectsColor[0] );
- hlayout->addWidget( new TQLabel( i18n( "Selected:" ), this ) );
+ htqlayout->addWidget( m_pGraphicalObjectsColor[0] );
+ htqlayout->addWidget( new TQLabel( i18n( "Selected:" ), this ) );
m_pGraphicalObjectsColor[1] = new KColorButton( this );
- hlayout->addWidget( m_pGraphicalObjectsColor[1] );
- hlayout->addStretch( 1 );
+ htqlayout->addWidget( m_pGraphicalObjectsColor[1] );
+ htqlayout->addStretch( 1 );
grid->addWidget( new TQLabel( i18n( "Control points:" ), this ), 2, 0 );
- hlayout = new TQHBoxLayout( );
- grid->addLayout( hlayout, 2, 2 );
+ htqlayout = new TQHBoxLayout( );
+ grid->addLayout( htqlayout, 2, 2 );
m_pControlPointsColor[0] = new KColorButton( this );
- hlayout->addWidget( m_pControlPointsColor[0] );
- hlayout->addWidget( new TQLabel( i18n( "Selected:" ), this ) );
+ htqlayout->addWidget( m_pControlPointsColor[0] );
+ htqlayout->addWidget( new TQLabel( i18n( "Selected:" ), this ) );
m_pControlPointsColor[1] = new KColorButton( this );
- hlayout->addWidget( m_pControlPointsColor[1] );
- hlayout->addStretch( 1 );
+ htqlayout->addWidget( m_pControlPointsColor[1] );
+ htqlayout->addStretch( 1 );
grid->addWidget( new TQLabel( i18n( "Axes:" ), this ), 3, 0 );
- hlayout = new TQHBoxLayout( );
- grid->addLayout( hlayout, 3, 2 );
+ htqlayout = new TQHBoxLayout( );
+ grid->addLayout( htqlayout, 3, 2 );
grid->addWidget( new TQLabel( "x", this ), 3, 1 );
m_pAxesColor[0] = new KColorButton( this );
- hlayout->addWidget( m_pAxesColor[0] );
- hlayout->addWidget( new TQLabel( "y", this ) );
+ htqlayout->addWidget( m_pAxesColor[0] );
+ htqlayout->addWidget( new TQLabel( "y", this ) );
m_pAxesColor[1] = new KColorButton( this );
- hlayout->addWidget( m_pAxesColor[1] );
- hlayout->addWidget( new TQLabel( "z", this ) );
+ htqlayout->addWidget( m_pAxesColor[1] );
+ htqlayout->addWidget( new TQLabel( "z", this ) );
m_pAxesColor[2] = new KColorButton( this );
- hlayout->addWidget( m_pAxesColor[2] );
- hlayout->addStretch( 1 );
+ htqlayout->addWidget( m_pAxesColor[2] );
+ htqlayout->addStretch( 1 );
grid->addWidget( new TQLabel( i18n( "Field of view:" ), this ), 4, 0 );
- hlayout = new TQHBoxLayout( );
- grid->addLayout( hlayout, 4, 2 );
+ htqlayout = new TQHBoxLayout( );
+ grid->addLayout( htqlayout, 4, 2 );
m_pFieldOfViewColor = new KColorButton( this );
- hlayout->addWidget( m_pFieldOfViewColor );
- hlayout->addStretch( 1 );
+ htqlayout->addWidget( m_pFieldOfViewColor );
+ htqlayout->addStretch( 1 );
}
void PMColorSettings::displaySettings( )
@@ -118,21 +118,21 @@ bool PMColorSettings::validateData( )
void PMColorSettings::applySettings( )
{
- bool repaint = false;
+ bool tqrepaint = false;
int i;
PMRenderManager* rm = PMRenderManager::theManager( );
if( rm->backgroundColor( ) != m_pBackgroundColor->color( ) )
{
rm->setBackgroundColor( m_pBackgroundColor->color( ) );
- repaint = true;
+ tqrepaint = true;
}
for( i = 0; i < 2; i++ )
{
if( rm->graphicalObjectColor( i ) != m_pGraphicalObjectsColor[i]->color( ) )
{
rm->setGraphicalObjectColor( i, m_pGraphicalObjectsColor[i]->color( ) );
- repaint = true;
+ tqrepaint = true;
}
}
for( i = 0; i < 2; i++ )
@@ -140,7 +140,7 @@ void PMColorSettings::applySettings( )
if( rm->controlPointColor( i ) != m_pControlPointsColor[i]->color( ) )
{
rm->setControlPointColor( i, m_pControlPointsColor[i]->color( ) );
- repaint = true;
+ tqrepaint = true;
}
}
for( i = 0; i < 3; i++ )
@@ -148,16 +148,16 @@ void PMColorSettings::applySettings( )
if( rm->axesColor( i ) != m_pAxesColor[i]->color( ) )
{
rm->setAxesColor( i, m_pAxesColor[i]->color( ) );
- repaint = true;
+ tqrepaint = true;
}
}
if( rm->fieldOfViewColor( ) != m_pFieldOfViewColor->color( ) )
{
rm->setFieldOfViewColor( m_pFieldOfViewColor->color( ) );
- repaint = true;
+ tqrepaint = true;
}
- if( repaint )
- emit repaintViews( );
+ if( tqrepaint )
+ emit tqrepaintViews( );
}
#include "pmcolorsettings.moc"
diff --git a/kpovmodeler/pmcolorsettings.h b/kpovmodeler/pmcolorsettings.h
index 8b903d47..703bf6cf 100644
--- a/kpovmodeler/pmcolorsettings.h
+++ b/kpovmodeler/pmcolorsettings.h
@@ -32,11 +32,12 @@ class KColorButton;
class PMColorSettings : public PMSettingsDialogPage
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Default constructor
*/
- PMColorSettings( TQWidget* parent, const char* name = 0 );
+ PMColorSettings( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displaySettings( );
/** */
diff --git a/kpovmodeler/pmcommand.h b/kpovmodeler/pmcommand.h
index 5d32b9d4..d1e53c99 100644
--- a/kpovmodeler/pmcommand.h
+++ b/kpovmodeler/pmcommand.h
@@ -42,8 +42,8 @@ class PMPart;
* PMCRemove: An object was removed. A signal with this constant has
* to be emitted _before_ the object is removed.
*
- * PMCChildren: Some children are added or removed. Do not use. Use PMCAdd and
- * PMCRemove for all childrens.
+ * PMCChildren: Some tqchildren are added or removed. Do not use. Use PMCAdd and
+ * PMCRemove for all tqchildrens.
*
* PMCData: Data (for dialog views) is changed
*
diff --git a/kpovmodeler/pmcommandmanager.cpp b/kpovmodeler/pmcommandmanager.cpp
index f122a7a4..8e02f988 100644
--- a/kpovmodeler/pmcommandmanager.cpp
+++ b/kpovmodeler/pmcommandmanager.cpp
@@ -45,7 +45,7 @@ void PMCommandManager::execute( PMCommand* cmd )
m_commands.removeFirst( );
m_redoCommands.clear( );
- emit updateUndoRedo( cmd->text( ), TQString::null );
+ emit updateUndoRedo( cmd->text( ), TQString() );
}
void PMCommandManager::undo( )
@@ -58,7 +58,7 @@ void PMCommandManager::undo( )
m_redoCommands.append( m_commands.take( ) );
if( m_commands.isEmpty( ) )
- emit updateUndoRedo( TQString::null, last->text( ) );
+ emit updateUndoRedo( TQString(), last->text( ) );
else
emit updateUndoRedo( m_commands.last( )->text( ), last->text( ) );
}
@@ -74,7 +74,7 @@ void PMCommandManager::redo( )
m_commands.append( m_redoCommands.take( ) );
if( m_redoCommands.isEmpty( ) )
- emit updateUndoRedo( last->text( ), TQString::null );
+ emit updateUndoRedo( last->text( ), TQString() );
else
emit updateUndoRedo( last->text( ), m_redoCommands.last( )->text( ) );
}
@@ -84,7 +84,7 @@ void PMCommandManager::clear( )
{
m_redoCommands.clear( );
m_commands.clear( );
- emit updateUndoRedo( TQString::null, TQString::null );
+ emit updateUndoRedo( TQString(), TQString() );
}
void PMCommandManager::cmdObjectChanged( PMObject* obj, const int mode )
diff --git a/kpovmodeler/pmcommandmanager.h b/kpovmodeler/pmcommandmanager.h
index 5fc960d1..4a86e2d9 100644
--- a/kpovmodeler/pmcommandmanager.h
+++ b/kpovmodeler/pmcommandmanager.h
@@ -36,9 +36,10 @@ class PMPart;
* The class PMCommandManager stores stacks of commands for undo/redo
* operations.
*/
-class PMCommandManager : public QObject
+class PMCommandManager : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Creates a new PMCommandManager
diff --git a/kpovmodeler/pmcomment.cpp b/kpovmodeler/pmcomment.cpp
index 90c817fd..7d12dfbc 100644
--- a/kpovmodeler/pmcomment.cpp
+++ b/kpovmodeler/pmcomment.cpp
@@ -108,11 +108,11 @@ void PMComment::setText( const TQString& text )
}
}
-PMMetaObject* PMComment::metaObject( ) const
+PMMetaObject* PMComment::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "Comment", Base::metaObject( ),
+ s_pMetaObject = new PMMetaObject( "Comment", Base::tqmetaObject( ),
createNewComment );
s_pMetaObject->addProperty(
new PMCommentProperty( "text", &PMComment::setText, &PMComment::text ) );
@@ -143,9 +143,9 @@ void PMComment::readAttributes( const PMXMLHelper& h )
m_text = e.toText( ).data( );
}
-PMDialogEditBase* PMComment::editWidget( TQWidget* parent ) const
+PMDialogEditBase* PMComment::editWidget( TQWidget* tqparent ) const
{
- return new PMCommentEdit( parent );
+ return new PMCommentEdit( tqparent );
}
void PMComment::restoreMemento( PMMemento* s )
diff --git a/kpovmodeler/pmcomment.h b/kpovmodeler/pmcomment.h
index d435423d..64514452 100644
--- a/kpovmodeler/pmcomment.h
+++ b/kpovmodeler/pmcomment.h
@@ -62,7 +62,7 @@ public:
virtual PMObject* copy( ) const { return new PMComment( *this ); }
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void cleanUp( ) const;
@@ -75,7 +75,7 @@ public:
virtual void readAttributes( const PMXMLHelper& h );
/** */
- virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
+ virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
/** */
virtual TQString pixmap( ) const { return TQString( "pmcomment" ); }
/** */
diff --git a/kpovmodeler/pmcommentedit.cpp b/kpovmodeler/pmcommentedit.cpp
index 28e98ed3..b9f5daac 100644
--- a/kpovmodeler/pmcommentedit.cpp
+++ b/kpovmodeler/pmcommentedit.cpp
@@ -23,8 +23,8 @@
#include <tqmultilineedit.h>
#include <kglobalsettings.h>
-PMCommentEdit::PMCommentEdit( TQWidget* parent, const char* name )
- : Base( parent, name )
+PMCommentEdit::PMCommentEdit( TQWidget* tqparent, const char* name )
+ : Base( tqparent, name )
{
m_pDisplayedObject = 0;
}
@@ -34,10 +34,8 @@ void PMCommentEdit::createTopWidgets( )
Base::createTopWidgets( );
m_pEdit = new TQMultiLineEdit( this );
-#if ( QT_VERSION >= 300 )
- m_pEdit->setTextFormat( Qt::PlainText );
+ m_pEdit->setTextFormat( TQt::PlainText );
m_pEdit->setWordWrap( TQTextEdit::NoWrap );
-#endif
m_pEdit->setFont( KGlobalSettings::fixedFont( ) );
topLayout( )->addWidget( m_pEdit, 2 );
diff --git a/kpovmodeler/pmcommentedit.h b/kpovmodeler/pmcommentedit.h
index 3d3fb0c1..da44246b 100644
--- a/kpovmodeler/pmcommentedit.h
+++ b/kpovmodeler/pmcommentedit.h
@@ -35,12 +35,13 @@ class TQMultiLineEdit;
class PMCommentEdit : public PMDialogEditBase
{
Q_OBJECT
+ TQ_OBJECT
typedef PMDialogEditBase Base;
public:
/**
- * Creates a PMCommentEdit with parent and name
+ * Creates a PMCommentEdit with tqparent and name
*/
- PMCommentEdit( TQWidget* parent, const char* name = 0 );
+ PMCommentEdit( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displayObject( PMObject* o );
diff --git a/kpovmodeler/pmcompositeobject.cpp b/kpovmodeler/pmcompositeobject.cpp
index d8b61e8c..e9369ea4 100644
--- a/kpovmodeler/pmcompositeobject.cpp
+++ b/kpovmodeler/pmcompositeobject.cpp
@@ -67,10 +67,10 @@ PMCompositeObject::~PMCompositeObject( )
delete m_pViewStructure;
}
-PMMetaObject* PMCompositeObject::metaObject( ) const
+PMMetaObject* PMCompositeObject::tqmetaObject( ) const
{
if( !s_pMetaObject )
- s_pMetaObject = new PMMetaObject( "CompositeObject", Base::metaObject( ) );
+ s_pMetaObject = new PMMetaObject( "CompositeObject", Base::tqmetaObject( ) );
return s_pMetaObject;
}
@@ -84,7 +84,7 @@ void PMCompositeObject::cleanUp( ) const
Base::cleanUp( );
}
-PMObject* PMCompositeObject::childAt( uint index ) const
+PMObject* PMCompositeObject::tqchildAt( uint index ) const
{
PMObject* tmp;
uint i = 0;
@@ -96,7 +96,7 @@ PMObject* PMCompositeObject::childAt( uint index ) const
int PMCompositeObject::findChild( PMObject* o )
{
- if( o->parent( ) != this )
+ if( o->tqparent( ) != this )
return -1;
PMObject* tmp;
@@ -136,7 +136,7 @@ bool PMCompositeObject::insertChild( PMObject* o, int i )
}
else
{
- PMObject* tmp = childAt( ( uint ) ( i - 1 ) );
+ PMObject* tmp = tqchildAt( ( uint ) ( i - 1 ) );
if( !tmp )
{
kdError( PMArea ) << "Index too big" << "\n";
@@ -272,7 +272,7 @@ bool PMCompositeObject::takeChild( PMObject* o )
bool PMCompositeObject::takeChild( uint i )
{
- PMObject* tmp = childAt( i );
+ PMObject* tmp = tqchildAt( i );
if( tmp )
return takeChild( tmp );
kdError( PMArea ) << "Index too big";
diff --git a/kpovmodeler/pmcompositeobject.h b/kpovmodeler/pmcompositeobject.h
index 350180db..0d7ae6df 100644
--- a/kpovmodeler/pmcompositeobject.h
+++ b/kpovmodeler/pmcompositeobject.h
@@ -44,12 +44,12 @@ public:
*/
PMCompositeObject( const PMCompositeObject& o );
/**
- * Deletes the object and all children.
+ * Deletes the object and all tqchildren.
*/
virtual ~PMCompositeObject( );
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void cleanUp( ) const;
@@ -65,13 +65,13 @@ public:
* Returns a pointer to the child object at position index,
* or null if the index is out of range.
*/
- virtual PMObject* childAt( uint index ) const;
+ virtual PMObject* tqchildAt( uint index ) const;
/**
* Returns true if the object contains the child object o
*/
virtual bool containsChild( PMObject* o ) const
- { return ( ( PMObject* )this == o->parent( ) ); }
+ { return ( ( PMObject* )this == o->tqparent( ) ); }
/**
* Returns the index of the object or -1 if not found
*/
@@ -96,7 +96,7 @@ public:
*/
virtual bool appendChild( PMObject* );
/**
- * Returns the number of children.
+ * Returns the number of tqchildren.
*/
virtual int countChildren( ) const;
/**
@@ -135,7 +135,7 @@ public:
protected:
/**
* Adds num to the number of selected objects in this object and all
- * parent objects. num can be negative.
+ * tqparent objects. num can be negative.
*/
virtual void adjustSelectedChildren( int num );
diff --git a/kpovmodeler/pmcone.cpp b/kpovmodeler/pmcone.cpp
index c6fd719e..3a90d131 100644
--- a/kpovmodeler/pmcone.cpp
+++ b/kpovmodeler/pmcone.cpp
@@ -100,11 +100,11 @@ void PMCone::readAttributes( const PMXMLHelper & h )
Base::readAttributes( h );
}
-PMMetaObject* PMCone::metaObject( ) const
+PMMetaObject* PMCone::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "Cone", Base::metaObject( ),
+ s_pMetaObject = new PMMetaObject( "Cone", Base::tqmetaObject( ),
createNewCone );
s_pMetaObject->addProperty(
new PMConeProperty( "end1", &PMCone::setEnd1, &PMCone::end1 ) );
@@ -176,9 +176,9 @@ void PMCone::setOpen( bool op )
}
}
-PMDialogEditBase* PMCone::editWidget( TQWidget * parent ) const
+PMDialogEditBase* PMCone::editWidget( TQWidget * tqparent ) const
{
- return new PMConeEdit( parent );
+ return new PMConeEdit( tqparent );
}
void PMCone::restoreMemento( PMMemento * s )
diff --git a/kpovmodeler/pmcone.h b/kpovmodeler/pmcone.h
index c41f9325..aa452b64 100644
--- a/kpovmodeler/pmcone.h
+++ b/kpovmodeler/pmcone.h
@@ -62,7 +62,7 @@ public:
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
@@ -71,7 +71,7 @@ public:
/**
* Returns a new @ref PMConeEdit
*/
- virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
+ virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
/**
* Returns the name of the pixmap that is displayed in the tree view and dialog view
*/
diff --git a/kpovmodeler/pmconeedit.cpp b/kpovmodeler/pmconeedit.cpp
index 9969e4d7..006add43 100644
--- a/kpovmodeler/pmconeedit.cpp
+++ b/kpovmodeler/pmconeedit.cpp
@@ -26,8 +26,8 @@
#include <klocale.h>
#include <tqcheckbox.h>
-PMConeEdit::PMConeEdit( TQWidget* parent, const char* name )
- : Base( parent, name )
+PMConeEdit::PMConeEdit( TQWidget* tqparent, const char* name )
+ : Base( tqparent, name )
{
m_pDisplayedObject = 0;
}
@@ -36,7 +36,7 @@ void PMConeEdit::createTopWidgets( )
{
Base::createTopWidgets( );
- TQHBoxLayout* layout;
+ TQHBoxLayout* tqlayout;
TQGridLayout* gl;
m_pEnd1 = new PMVectorEdit( "x", "y", "z", this );
@@ -51,13 +51,13 @@ void PMConeEdit::createTopWidgets( )
gl->addWidget( new TQLabel( i18n( "End 2:" ), this ), 1, 0 );
gl->addWidget( m_pEnd2, 1, 1 );
- layout = new TQHBoxLayout( topLayout( ) );
- gl = new TQGridLayout( layout, 2, 2 );
+ tqlayout = new TQHBoxLayout( topLayout( ) );
+ gl = new TQGridLayout( tqlayout, 2, 2 );
gl->addWidget( new TQLabel( i18n( "Radius 1:" ), this ), 0, 0 );
gl->addWidget( m_pRadius1, 0, 1 );
gl->addWidget( new TQLabel( i18n( "Radius 2:" ), this ), 1, 0 );
gl->addWidget( m_pRadius2, 1, 1 );
- layout->addStretch( 1 );
+ tqlayout->addStretch( 1 );
topLayout( )->addWidget( m_pOpen );
diff --git a/kpovmodeler/pmconeedit.h b/kpovmodeler/pmconeedit.h
index f4e689fc..d5210124 100644
--- a/kpovmodeler/pmconeedit.h
+++ b/kpovmodeler/pmconeedit.h
@@ -35,12 +35,13 @@ class PMCone;
class PMConeEdit : public PMSolidObjectEdit
{
Q_OBJECT
+ TQ_OBJECT
typedef PMSolidObjectEdit Base;
public:
/**
- * Creates a PMConeEdit with parent and name
+ * Creates a PMConeEdit with tqparent and name
*/
- PMConeEdit( TQWidget* parent, const char* name = 0 );
+ PMConeEdit( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displayObject( PMObject* o );
diff --git a/kpovmodeler/pmcsg.cpp b/kpovmodeler/pmcsg.cpp
index 0ac7e58a..c8316a53 100644
--- a/kpovmodeler/pmcsg.cpp
+++ b/kpovmodeler/pmcsg.cpp
@@ -130,11 +130,11 @@ void PMCSG::readAttributes( const PMXMLHelper& h )
Base::readAttributes( h );
}
-PMMetaObject* PMCSG::metaObject( ) const
+PMMetaObject* PMCSG::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "CSG", Base::metaObject( ),
+ s_pMetaObject = new PMMetaObject( "CSG", Base::tqmetaObject( ),
createNewCSG );
PMCSGTypeProperty* p = new PMCSGTypeProperty( "csgType", &PMCSG::setCSGType, &PMCSG::csgType );
p->addEnumValue( "union", CSGUnion );
@@ -169,9 +169,9 @@ void PMCSG::setCSGType( const PMCSGType t )
}
}
-PMDialogEditBase* PMCSG::editWidget( TQWidget* parent ) const
+PMDialogEditBase* PMCSG::editWidget( TQWidget* tqparent ) const
{
- return new PMCSGEdit( parent );
+ return new PMCSGEdit( tqparent );
}
void PMCSG::restoreMemento( PMMemento* s )
diff --git a/kpovmodeler/pmcsg.h b/kpovmodeler/pmcsg.h
index 380bf0ef..3424a6c7 100644
--- a/kpovmodeler/pmcsg.h
+++ b/kpovmodeler/pmcsg.h
@@ -62,7 +62,7 @@ public:
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void cleanUp( ) const;
@@ -74,7 +74,7 @@ public:
/**
* Returns a new @ref PMCSGEdit
*/
- virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
+ virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
/**
* Returns the name of the pixmap that is displayed in the tree view
* and dialog view
diff --git a/kpovmodeler/pmcsgedit.cpp b/kpovmodeler/pmcsgedit.cpp
index 114e22f6..bdbbe3da 100644
--- a/kpovmodeler/pmcsgedit.cpp
+++ b/kpovmodeler/pmcsgedit.cpp
@@ -24,8 +24,8 @@
#include <tqcombobox.h>
#include <klocale.h>
-PMCSGEdit::PMCSGEdit( TQWidget* parent, const char* name )
- : Base( parent, name )
+PMCSGEdit::PMCSGEdit( TQWidget* tqparent, const char* name )
+ : Base( tqparent, name )
{
m_pDisplayedObject = 0;
}
@@ -34,17 +34,17 @@ void PMCSGEdit::createTopWidgets( )
{
Base::createTopWidgets( );
- TQHBoxLayout* layout;
+ TQHBoxLayout* tqlayout;
m_pTypeCombo = new TQComboBox( false, this );
m_pTypeCombo->insertItem( i18n( "Union" ) );
m_pTypeCombo->insertItem( i18n( "Intersection" ) );
m_pTypeCombo->insertItem( i18n( "Difference" ) );
m_pTypeCombo->insertItem( i18n( "Merge" ) );
- layout = new TQHBoxLayout( topLayout( ) );
- layout->addWidget( new TQLabel( i18n( "Type:" ), this ) );
- layout->addWidget( m_pTypeCombo );
- layout->addStretch( 1 );
+ tqlayout = new TQHBoxLayout( topLayout( ) );
+ tqlayout->addWidget( new TQLabel( i18n( "Type:" ), this ) );
+ tqlayout->addWidget( m_pTypeCombo );
+ tqlayout->addStretch( 1 );
connect( m_pTypeCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotTypeSelected( int ) ) );
}
diff --git a/kpovmodeler/pmcsgedit.h b/kpovmodeler/pmcsgedit.h
index d7efc75d..1ec5d205 100644
--- a/kpovmodeler/pmcsgedit.h
+++ b/kpovmodeler/pmcsgedit.h
@@ -35,12 +35,13 @@ class TQComboBox;
class PMCSGEdit : public PMSolidObjectEdit
{
Q_OBJECT
+ TQ_OBJECT
typedef PMSolidObjectEdit Base;
public:
/**
- * Creates a PMCSGEdit with parent and name
+ * Creates a PMCSGEdit with tqparent and name
*/
- PMCSGEdit( TQWidget* parent, const char* name = 0 );
+ PMCSGEdit( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displayObject( PMObject* o );
diff --git a/kpovmodeler/pmcylinder.cpp b/kpovmodeler/pmcylinder.cpp
index 358cb542..b595d6e1 100644
--- a/kpovmodeler/pmcylinder.cpp
+++ b/kpovmodeler/pmcylinder.cpp
@@ -97,11 +97,11 @@ void PMCylinder::readAttributes( const PMXMLHelper& h )
Base::readAttributes( h );
}
-PMMetaObject* PMCylinder::metaObject( ) const
+PMMetaObject* PMCylinder::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "Cylinder", Base::metaObject( ),
+ s_pMetaObject = new PMMetaObject( "Cylinder", Base::tqmetaObject( ),
createNewCylinder );
s_pMetaObject->addProperty(
new PMCylinderProperty( "end1", &PMCylinder::setEnd1, &PMCylinder::end1 ) );
@@ -160,9 +160,9 @@ void PMCylinder::setOpen( bool op )
}
}
-PMDialogEditBase* PMCylinder::editWidget( TQWidget* parent ) const
+PMDialogEditBase* PMCylinder::editWidget( TQWidget* tqparent ) const
{
- return new PMCylinderEdit( parent );
+ return new PMCylinderEdit( tqparent );
}
void PMCylinder::restoreMemento( PMMemento* s )
diff --git a/kpovmodeler/pmcylinder.h b/kpovmodeler/pmcylinder.h
index 1bd10901..66174d59 100644
--- a/kpovmodeler/pmcylinder.h
+++ b/kpovmodeler/pmcylinder.h
@@ -58,7 +58,7 @@ public:
/** */
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
@@ -67,7 +67,7 @@ public:
/**
* Returns a new @ref PMCylinderEdit
*/
- virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
+ virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
/**
* Returns the name of the pixmap that is displayed in the tree view and dialog view
*/
diff --git a/kpovmodeler/pmcylinderedit.cpp b/kpovmodeler/pmcylinderedit.cpp
index b15a0d16..b471cb29 100644
--- a/kpovmodeler/pmcylinderedit.cpp
+++ b/kpovmodeler/pmcylinderedit.cpp
@@ -26,8 +26,8 @@
#include <klocale.h>
#include <tqcheckbox.h>
-PMCylinderEdit::PMCylinderEdit( TQWidget* parent, const char* name )
- : Base( parent, name )
+PMCylinderEdit::PMCylinderEdit( TQWidget* tqparent, const char* name )
+ : Base( tqparent, name )
{
m_pDisplayedObject = 0;
}
@@ -36,7 +36,7 @@ void PMCylinderEdit::createTopWidgets( )
{
Base::createTopWidgets( );
- TQHBoxLayout* layout;
+ TQHBoxLayout* tqlayout;
TQGridLayout* gl;
m_pEnd1 = new PMVectorEdit( "x", "y", "z", this );
@@ -50,13 +50,13 @@ void PMCylinderEdit::createTopWidgets( )
gl->addWidget( new TQLabel( i18n( "End 2:" ), this ), 1, 0 );
gl->addWidget( m_pEnd2, 1, 1 );
- layout = new TQHBoxLayout( topLayout( ) );
- layout->addWidget( new TQLabel( i18n( "Radius:" ), this ) );
- layout->addWidget( m_pRadius );
- layout->addStretch( 1 );
+ tqlayout = new TQHBoxLayout( topLayout( ) );
+ tqlayout->addWidget( new TQLabel( i18n( "Radius:" ), this ) );
+ tqlayout->addWidget( m_pRadius );
+ tqlayout->addStretch( 1 );
- layout = new TQHBoxLayout( topLayout( ) );
- layout->addWidget( m_pOpen );
+ tqlayout = new TQHBoxLayout( topLayout( ) );
+ tqlayout->addWidget( m_pOpen );
connect( m_pEnd1, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
connect( m_pEnd2, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
diff --git a/kpovmodeler/pmcylinderedit.h b/kpovmodeler/pmcylinderedit.h
index 9f2c0993..9b25ec2a 100644
--- a/kpovmodeler/pmcylinderedit.h
+++ b/kpovmodeler/pmcylinderedit.h
@@ -34,12 +34,13 @@ class TQCheckBox;
class PMCylinderEdit : public PMSolidObjectEdit
{
Q_OBJECT
+ TQ_OBJECT
typedef PMSolidObjectEdit Base;
public:
/**
- * Creates a PMCylinderEdit with parent and name
+ * Creates a PMCylinderEdit with tqparent and name
*/
- PMCylinderEdit( TQWidget* parent, const char* name = 0 );
+ PMCylinderEdit( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displayObject( PMObject* o );
diff --git a/kpovmodeler/pmdatachangecommand.cpp b/kpovmodeler/pmdatachangecommand.cpp
index 99ac75d3..4188d253 100644
--- a/kpovmodeler/pmdatachangecommand.cpp
+++ b/kpovmodeler/pmdatachangecommand.cpp
@@ -28,7 +28,7 @@ PMDataChangeCommand::PMDataChangeCommand( PMMemento* memento )
TQString text = memento->originator( )->name( );
if( text.isEmpty( ) )
text = memento->originator( )->description( );
- setText( i18n( "Change %1" ).arg( text ) );
+ setText( i18n( "Change %1" ).tqarg( text ) );
// the data is already changed when the command is created
m_executed = true;
diff --git a/kpovmodeler/pmdeclare.cpp b/kpovmodeler/pmdeclare.cpp
index 3f290e2f..0fd7d115 100644
--- a/kpovmodeler/pmdeclare.cpp
+++ b/kpovmodeler/pmdeclare.cpp
@@ -44,14 +44,14 @@ PMDeclare::PMDeclare( const PMDeclare& d )
{
m_id = d.m_id; // CAUTION! Duplication of the id which has to be unique
m_pDeclareType = 0; // will be set automatically in the
- // base constuctor when the children are copied
+ // base constuctor when the tqchildren are copied
}
-PMMetaObject* PMDeclare::metaObject( ) const
+PMMetaObject* PMDeclare::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "Declare", Base::metaObject( ),
+ s_pMetaObject = new PMMetaObject( "Declare", Base::tqmetaObject( ),
createNewDeclare );
s_pMetaObject->addProperty(
new PMDeclareProperty( "id", &PMDeclare::setID, &PMDeclare::id ) );
@@ -131,9 +131,9 @@ void PMDeclare::readAttributes( const PMXMLHelper& h )
Base::readAttributes( h );
}
-PMDialogEditBase* PMDeclare::editWidget( TQWidget* parent ) const
+PMDialogEditBase* PMDeclare::editWidget( TQWidget* tqparent ) const
{
- return new PMDeclareEdit( parent );
+ return new PMDeclareEdit( tqparent );
}
void PMDeclare::setID( const TQString& newID )
@@ -180,9 +180,9 @@ void PMDeclare::updateDeclareType( )
if( o )
{
if( o->isA( "GraphicalObject" ) )
- type = m->metaObject( "GraphicalObject" );
+ type = m->tqmetaObject( "GraphicalObject" );
else
- type = o->metaObject( );
+ type = o->tqmetaObject( );
}
setDeclareType( type );
}
diff --git a/kpovmodeler/pmdeclare.h b/kpovmodeler/pmdeclare.h
index 89468bf4..05782866 100644
--- a/kpovmodeler/pmdeclare.h
+++ b/kpovmodeler/pmdeclare.h
@@ -55,7 +55,7 @@ public:
virtual TQString pixmap( ) const;
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void cleanUp( ) const;
@@ -69,7 +69,7 @@ public:
/**
* Returns a new @ref PMDeclareEdit
*/
- virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
+ virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
/**
* Returns the id of the declare
*/
diff --git a/kpovmodeler/pmdeclareedit.cpp b/kpovmodeler/pmdeclareedit.cpp
index a461d710..49ee6366 100644
--- a/kpovmodeler/pmdeclareedit.cpp
+++ b/kpovmodeler/pmdeclareedit.cpp
@@ -33,8 +33,8 @@
#include <klocale.h>
#include <kmessagebox.h>
-PMDeclareEdit::PMDeclareEdit( TQWidget* parent, const char* name )
- : Base( parent, name )
+PMDeclareEdit::PMDeclareEdit( TQWidget* tqparent, const char* name )
+ : Base( tqparent, name )
{
m_pDisplayedObject = 0;
m_pSelectedObject = 0;
@@ -44,13 +44,13 @@ void PMDeclareEdit::createTopWidgets( )
{
Base::createTopWidgets( );
- TQHBoxLayout* layout = new TQHBoxLayout( topLayout( ) );
+ TQHBoxLayout* tqlayout = new TQHBoxLayout( topLayout( ) );
m_pNameEdit = new TQLineEdit( this );
m_pNameEdit->setMaxLength( 40 );
TQLabel* label = new TQLabel( i18n( "Identifier:" ), this );
- layout->addWidget( label );
- layout->addWidget( m_pNameEdit );
+ tqlayout->addWidget( label );
+ tqlayout->addWidget( m_pNameEdit );
connect( m_pNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
TQT_SLOT( slotNameChanged( const TQString& ) ) );
@@ -67,13 +67,13 @@ void PMDeclareEdit::createBottomWidgets( )
TQT_SLOT( slotItemSelected( TQListBoxItem* ) ) );
topLayout( )->addWidget( m_pLinkedObjects, 1 );
- TQHBoxLayout* layout = new TQHBoxLayout( topLayout( ) );
+ TQHBoxLayout* tqlayout = new TQHBoxLayout( topLayout( ) );
m_pSelectButton = new TQPushButton( i18n( "Select..." ), this );
m_pSelectButton->setEnabled( false );
connect( m_pSelectButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotSelect( ) ) );
- layout->addStretch( );
- layout->addWidget( m_pSelectButton );
+ tqlayout->addStretch( );
+ tqlayout->addWidget( m_pSelectButton );
Base::createBottomWidgets( );
}
@@ -162,14 +162,14 @@ bool PMDeclareEdit::isDataValid( )
// valid identifer!
PMReservedWordDict* dict = PMScanner::reservedWords( );
- if( dict->find( text.latin1( ) ) != -1 )
+ if( dict->tqfind( text.latin1( ) ) != -1 )
{
KMessageBox::error( this, i18n( "You can't use a povray reserved word"
" as an identifier!" ), i18n( "Error" ) );
return false;
}
dict = PMScanner::directives( );
- if( dict->find( text.latin1( ) ) != -1 )
+ if( dict->tqfind( text.latin1( ) ) != -1 )
{
KMessageBox::error( this, i18n( "You can't use a povray directive"
" as an identifier!" ), i18n( "Error" ) );
@@ -178,7 +178,7 @@ bool PMDeclareEdit::isDataValid( )
// no reserved word
PMSymbolTable* st = part( )->symbolTable( );
- if( st->find( text ) )
+ if( st->tqfind( text ) )
{
KMessageBox::error( this, i18n( "Please enter a unique identifier!" ),
i18n( "Error" ) );
@@ -201,6 +201,6 @@ void PMDeclareEdit::slotItemSelected( TQListBoxItem* item )
void PMDeclareEdit::slotSelect( )
{
if( m_pSelectedObject )
- part( )->slotObjectChanged( m_pSelectedObject, PMCNewSelection, this );
+ part( )->slotObjectChanged( m_pSelectedObject, PMCNewSelection, TQT_TQOBJECT(this) );
}
#include "pmdeclareedit.moc"
diff --git a/kpovmodeler/pmdeclareedit.h b/kpovmodeler/pmdeclareedit.h
index 2a40b869..0b40eb2a 100644
--- a/kpovmodeler/pmdeclareedit.h
+++ b/kpovmodeler/pmdeclareedit.h
@@ -38,12 +38,13 @@ class TQListBoxItem;
class PMDeclareEdit : public PMDialogEditBase
{
Q_OBJECT
+ TQ_OBJECT
typedef PMDialogEditBase Base;
public:
/**
- * Creates a PMDeclareEdit with parent and name
+ * Creates a PMDeclareEdit with tqparent and name
*/
- PMDeclareEdit( TQWidget* parent, const char* name = 0 );
+ PMDeclareEdit( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displayObject( PMObject* o );
diff --git a/kpovmodeler/pmdeletecommand.cpp b/kpovmodeler/pmdeletecommand.cpp
index a4629728..663dae09 100644
--- a/kpovmodeler/pmdeletecommand.cpp
+++ b/kpovmodeler/pmdeletecommand.cpp
@@ -27,14 +27,14 @@
#include <tqptrdict.h>
PMDeleteCommand::PMDeleteCommand( PMObject* obj )
- : PMCommand( i18n( "Delete %1" ).arg( obj->name( ) ) )
+ : PMCommand( i18n( "Delete %1" ).tqarg( obj->name( ) ) )
{
// the scene can not be deleted!
- if( obj->parent( ) )
+ if( obj->tqparent( ) )
m_infoList.append( new PMDeleteInfo( obj ) );
else
{
- // object has no parent!
+ // object has no tqparent!
// top level objects can't be moved, move all child items
PMObject* tmp;
for( tmp = obj->firstChild( ); tmp; tmp = tmp->nextSibling( ) )
@@ -55,11 +55,11 @@ PMDeleteCommand::PMDeleteCommand( const PMObjectList& list )
{
obj = it.current( );
- if( obj->parent( ) )
+ if( obj->tqparent( ) )
m_infoList.append( new PMDeleteInfo( obj ) );
else
{
- // object has no parent!
+ // object has no tqparent!
// top level objects can't be moved, move all child items
PMObject* tmp;
for( tmp = obj->firstChild( ); tmp; tmp = tmp->nextSibling( ) )
@@ -91,7 +91,7 @@ void PMDeleteCommand::execute( PMCommandManager* theManager )
{
PMDeleteInfoListIterator it( m_infoList );
PMDeleteInfo* info = 0;
- PMObject* parent;
+ PMObject* tqparent;
if( !m_linksCreated )
{
@@ -105,8 +105,8 @@ void PMDeleteCommand::execute( PMCommandManager* theManager )
if( decl )
{
m_links.append( oit.current( ) );
- if( !m_linkedDeclares.containsRef( decl ) )
- m_linkedDeclares.append( decl );
+ if( !m_linkedDeclares.tqcontainsRef( decl ) )
+ m_linkedDeclares.append( decl );
}
}
}
@@ -120,23 +120,23 @@ void PMDeleteCommand::execute( PMCommandManager* theManager )
for( it.toLast( ); it.current( ); --it )
{
info = it.current( );
- parent = info->parent( );
+ tqparent = info->tqparent( );
// signal has to be emitted before the item is removed
theManager->cmdObjectChanged( info->deletedObject( ), PMCRemove );
if( m_firstExecution )
- if( parent->dataChangeOnInsertRemove( )
- && !parent->mementoCreated( ) )
- parent->createMemento( );
- parent->takeChild( info->deletedObject( ) );
+ if( tqparent->dataChangeOnInsertRemove( )
+ && !tqparent->mementoCreated( ) )
+ tqparent->createMemento( );
+ tqparent->takeChild( info->deletedObject( ) );
}
if( m_firstExecution )
{
for( it.toLast( ); it.current( ); --it )
{
- parent = it.current( )->parent( );
- if( parent->mementoCreated( ) )
- m_dataChanges.append( parent->takeMemento( ) );
+ tqparent = it.current( )->tqparent( );
+ if( tqparent->mementoCreated( ) )
+ m_dataChanges.append( tqparent->takeMemento( ) );
}
}
@@ -166,11 +166,11 @@ void PMDeleteCommand::undo( PMCommandManager* theManager )
for( ; it.current( ); ++it )
{
if( it.current( )->prevSibling( ) )
- it.current( )->parent( )
+ it.current( )->tqparent( )
->insertChildAfter( it.current( )->deletedObject( ),
it.current( )->prevSibling( ) );
else
- it.current( )->parent( )
+ it.current( )->tqparent( )
->insertChild( it.current( )->deletedObject( ), 0 );
theManager->cmdObjectChanged( it.current( )->deletedObject( ), PMCAdd );
}
@@ -230,18 +230,18 @@ int PMDeleteCommand::errorFlags( PMPart* )
{
insideSelection = false;
for( obj = links.current( ); obj && !insideSelection;
- obj = obj->parent( ) )
+ obj = obj->tqparent( ) )
{
- if( m_deletedObjects.find( obj ) )
+ if( m_deletedObjects.tqfind( obj ) )
insideSelection = true;
}
if( insideSelection )
{
bool stop = false;
- for( obj = links.current( ); obj && !stop; obj = obj->parent( ) )
+ for( obj = links.current( ); obj && !stop; obj = obj->tqparent( ) )
{
- if( m_deletedObjects.find( obj ) )
+ if( m_deletedObjects.tqfind( obj ) )
stop = true;
else
m_deletedObjects.insert( obj, new bool( true ) );
@@ -256,7 +256,7 @@ int PMDeleteCommand::errorFlags( PMPart* )
{
m_errors.prepend( i18n( "The declare \"%1\" can't be removed "
"because of some remaining links." )
- .arg( decl->id( ) ) );
+ .tqarg( decl->id( ) ) );
PMDeleteInfo* tmp = info;
info = m_infoList.prev( );
diff --git a/kpovmodeler/pmdeletecommand.h b/kpovmodeler/pmdeletecommand.h
index d11cf348..4c384e1f 100644
--- a/kpovmodeler/pmdeletecommand.h
+++ b/kpovmodeler/pmdeletecommand.h
@@ -39,12 +39,12 @@ class PMDeleteInfo
public:
/**
* Creates undo information for the object deletedObject.
- * The object has to have a parent!
+ * The object has to have a tqparent!
*/
PMDeleteInfo( PMObject* deletedObject )
{
m_pDeletedObject = deletedObject;
- m_pParent = deletedObject->parent( );
+ m_pParent = deletedObject->tqparent( );
m_pPrevSibling = deletedObject->prevSibling( );
m_insertError = false;
}
@@ -57,9 +57,9 @@ public:
*/
PMObject* deletedObject( ) const { return m_pDeletedObject; }
/**
- * Returns a pointer to the parent of the deleted object
+ * Returns a pointer to the tqparent of the deleted object
*/
- PMObject* parent( ) const { return m_pParent; }
+ PMObject* tqparent( ) const { return m_pParent; }
/**
* Returns the previous sibling of the deleted object
*/
diff --git a/kpovmodeler/pmdensity.cpp b/kpovmodeler/pmdensity.cpp
index 3935b6be..5743a5b4 100644
--- a/kpovmodeler/pmdensity.cpp
+++ b/kpovmodeler/pmdensity.cpp
@@ -43,11 +43,11 @@ PMDensity::~PMDensity( )
{
}
-PMMetaObject* PMDensity::metaObject( ) const
+PMMetaObject* PMDensity::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "Density", Base::metaObject( ),
+ s_pMetaObject = new PMMetaObject( "Density", Base::tqmetaObject( ),
createNewDensity );
}
return s_pMetaObject;
@@ -69,8 +69,8 @@ TQString PMDensity::description( ) const
}
-PMDialogEditBase* PMDensity::editWidget( TQWidget* parent ) const
+PMDialogEditBase* PMDensity::editWidget( TQWidget* tqparent ) const
{
- return new PMDensityEdit( parent );
+ return new PMDensityEdit( tqparent );
}
diff --git a/kpovmodeler/pmdensity.h b/kpovmodeler/pmdensity.h
index b1502fe2..ca32ac99 100644
--- a/kpovmodeler/pmdensity.h
+++ b/kpovmodeler/pmdensity.h
@@ -52,14 +52,14 @@ public:
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void cleanUp( ) const;
/**
* Returns a new @ref PMDensityEdit
*/
- virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
+ virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
/** */
virtual TQString pixmap( ) const { return TQString( "pmdensity" ); }
diff --git a/kpovmodeler/pmdensityedit.cpp b/kpovmodeler/pmdensityedit.cpp
index 407a4f80..8213d27c 100644
--- a/kpovmodeler/pmdensityedit.cpp
+++ b/kpovmodeler/pmdensityedit.cpp
@@ -25,8 +25,8 @@
#include <klocale.h>
-PMDensityEdit::PMDensityEdit( TQWidget* parent, const char* name )
- : Base( parent, name )
+PMDensityEdit::PMDensityEdit( TQWidget* tqparent, const char* name )
+ : Base( tqparent, name )
{
m_pDisplayedObject = 0;
}
diff --git a/kpovmodeler/pmdensityedit.h b/kpovmodeler/pmdensityedit.h
index a3963ca9..a8241117 100644
--- a/kpovmodeler/pmdensityedit.h
+++ b/kpovmodeler/pmdensityedit.h
@@ -34,12 +34,13 @@ class PMDensity;
class PMDensityEdit : public PMTextureBaseEdit
{
Q_OBJECT
+ TQ_OBJECT
typedef PMTextureBaseEdit Base;
public:
/**
- * Creates a PMDensityEdit with parent and name
+ * Creates a PMDensityEdit with tqparent and name
*/
- PMDensityEdit( TQWidget* parent, const char* name = 0 );
+ PMDensityEdit( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displayObject( PMObject* o );
diff --git a/kpovmodeler/pmdetailobject.cpp b/kpovmodeler/pmdetailobject.cpp
index 5abc7e22..050729a4 100644
--- a/kpovmodeler/pmdetailobject.cpp
+++ b/kpovmodeler/pmdetailobject.cpp
@@ -47,11 +47,11 @@ PMDetailObject::~PMDetailObject()
{
}
-PMMetaObject* PMDetailObject::metaObject( ) const
+PMMetaObject* PMDetailObject::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "DetailObject", Base::metaObject( ) );
+ s_pMetaObject = new PMMetaObject( "DetailObject", Base::tqmetaObject( ) );
s_pMetaObject->addProperty(
new PMDetailObjectProperty( "globalDetail", &PMDetailObject::setGlobalDetail, &PMDetailObject::globalDetail ) );
s_pMetaObject->addProperty(
diff --git a/kpovmodeler/pmdetailobject.h b/kpovmodeler/pmdetailobject.h
index 846ef8c0..10efae07 100644
--- a/kpovmodeler/pmdetailobject.h
+++ b/kpovmodeler/pmdetailobject.h
@@ -43,7 +43,7 @@ public:
virtual ~PMDetailObject();
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void cleanUp( ) const;
diff --git a/kpovmodeler/pmdetailobjectedit.cpp b/kpovmodeler/pmdetailobjectedit.cpp
index 661cd892..0fbd3a8a 100644
--- a/kpovmodeler/pmdetailobjectedit.cpp
+++ b/kpovmodeler/pmdetailobjectedit.cpp
@@ -23,8 +23,8 @@
#include <tqcombobox.h>
#include <klocale.h>
-PMDetailObjectEdit::PMDetailObjectEdit( TQWidget* parent, const char* name )
- : Base( parent, name )
+PMDetailObjectEdit::PMDetailObjectEdit( TQWidget* tqparent, const char* name )
+ : Base( tqparent, name )
{
m_pDisplayedObject = 0;
}
@@ -33,7 +33,7 @@ void PMDetailObjectEdit::createTopWidgets( )
{
Base::createTopWidgets( );
- TQHBoxLayout* layout = new TQHBoxLayout( topLayout( ) );
+ TQHBoxLayout* tqlayout = new TQHBoxLayout( topLayout( ) );
m_pGlobalDetail = new TQCheckBox( i18n( "Global detail" ), this );
m_pLocalDetailLevelLabel = new TQLabel( i18n( "Detail level:" ), this );
m_pLocalDetailLevel = new TQComboBox( this );
@@ -43,10 +43,10 @@ void PMDetailObjectEdit::createTopWidgets( )
m_pLocalDetailLevel->insertItem( i18n( "High" ) );
m_pLocalDetailLevel->insertItem( i18n( "Very High" ) );
- layout->addWidget( m_pGlobalDetail );
- layout->addWidget( m_pLocalDetailLevelLabel );
- layout->addWidget( m_pLocalDetailLevel );
- layout->addStretch( );
+ tqlayout->addWidget( m_pGlobalDetail );
+ tqlayout->addWidget( m_pLocalDetailLevelLabel );
+ tqlayout->addWidget( m_pLocalDetailLevel );
+ tqlayout->addStretch( );
connect( m_pGlobalDetail, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotGlobalDetailClicked( ) ) );
connect( m_pLocalDetailLevel, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( dataChanged( ) ) );
diff --git a/kpovmodeler/pmdetailobjectedit.h b/kpovmodeler/pmdetailobjectedit.h
index 74aa3a29..e6224d59 100644
--- a/kpovmodeler/pmdetailobjectedit.h
+++ b/kpovmodeler/pmdetailobjectedit.h
@@ -35,12 +35,13 @@ class TQComboBox;
class PMDetailObjectEdit : public PMNamedObjectEdit
{
Q_OBJECT
+ TQ_OBJECT
typedef PMNamedObjectEdit Base;
public:
/**
- * Creates a PMNamedObjectEdit with parent and name
+ * Creates a PMNamedObjectEdit with tqparent and name
*/
- PMDetailObjectEdit( TQWidget* parent, const char* name = 0 );
+ PMDetailObjectEdit( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displayObject( PMObject* o );
diff --git a/kpovmodeler/pmdialogeditbase.cpp b/kpovmodeler/pmdialogeditbase.cpp
index ea601be3..21430704 100644
--- a/kpovmodeler/pmdialogeditbase.cpp
+++ b/kpovmodeler/pmdialogeditbase.cpp
@@ -95,8 +95,8 @@ const TQString c_boxCode = TQString(
const TQString c_globalSettingsCode = TQString(
"global_settings { assumed_gamma %1 }\n" );
-PMDialogEditBase::PMDialogEditBase( TQWidget* parent, const char* name )
- : TQWidget( parent, name )
+PMDialogEditBase::PMDialogEditBase( TQWidget* tqparent, const char* name )
+ : TQWidget( tqparent, name )
{
m_pDisplayedObject = 0;
m_pPart = 0;
@@ -318,7 +318,7 @@ void PMDialogEditBase::findTextures( PMObject*& global, PMObject*& local ) const
global = 0;
local = 0;
- for( o = m_pDisplayedObject; o; o = o->parent( ) )
+ for( o = m_pDisplayedObject; o; o = o->tqparent( ) )
{
if( o->type( ) == "Material" || o->type( ) == "Interior" ||
o->type( ) == "Texture" || o->type( ) == "Pigment" ||
@@ -390,7 +390,7 @@ void PMDialogEditBase::slotTexturePreview( )
buffer.open( IO_WriteOnly );
TQTextStream str( &buffer );
PMPovray31Format format;
- PMSerializer* dev = format.newSerializer( &buffer );
+ PMSerializer* dev = format.newSerializer( TQT_TQIODEVICE(&buffer) );
PMRenderMode mode;
PMObjectList neededDeclares, objectsToCheck;
TQPtrDict<PMObject> objectsToSerialize( 101 );
@@ -408,8 +408,8 @@ void PMDialogEditBase::slotTexturePreview( )
{
link = rit.current( )->linkedObject( );
if( link )
- if( !neededDeclares.containsRef( link ) )
- if( !objectsToSerialize.find( link ) )
+ if( !neededDeclares.tqcontainsRef( link ) )
+ if( !objectsToSerialize.tqfind( link ) )
neededDeclares.append( link );
}
objectsToSerialize.insert( it.current( ), it.current( ) );
@@ -427,14 +427,14 @@ void PMDialogEditBase::slotTexturePreview( )
PMObject* otr = o;
// find the scene
- while( otr->parent( ) ) otr = otr->parent( );
+ while( otr->tqparent( ) ) otr = otr->tqparent( );
for( otr = otr->firstChild( ); otr && ( numDeclares > 0 );
otr = otr->nextSibling( ) )
{
if( otr->type( ) == "Declare" )
{
- if( objectsToSerialize.find( otr ) )
+ if( objectsToSerialize.tqfind( otr ) )
{
dev->serialize( otr );
numDeclares--;
@@ -451,17 +451,17 @@ void PMDialogEditBase::slotTexturePreview( )
str << "union {\n";
if( s_showBox )
{
- str << c_boxCode.arg( numObjects );
+ str << c_boxCode.tqarg( numObjects );
numObjects++;
}
if( s_showCylinder )
{
- str << c_cylinderCode.arg( numObjects );
+ str << c_cylinderCode.tqarg( numObjects );
numObjects++;
}
if( s_showSphere )
{
- str << c_sphereCode.arg( numObjects );
+ str << c_sphereCode.tqarg( numObjects );
numObjects++;
}
@@ -495,18 +495,18 @@ void PMDialogEditBase::slotTexturePreview( )
{
c1 = PMColor( s_wallColor1 );
c2 = PMColor( s_wallColor2 );
- str << c_wallCode.arg( c1.serialize( true ) ).arg( c2.serialize( true ) );
+ str << c_wallCode.tqarg( c1.serialize( true ) ).tqarg( c2.serialize( true ) );
}
if( s_showFloor )
{
c1 = PMColor( s_floorColor1 );
c2 = PMColor( s_floorColor2 );
- str << c_floorCode.arg( c1.serialize( true ) ).arg( c2.serialize( true ) );
+ str << c_floorCode.tqarg( c1.serialize( true ) ).tqarg( c2.serialize( true ) );
}
str << c_lightCode;
str << c_cameraCode[numObjects-1];
- str << c_globalSettingsCode.arg( s_previewGamma );
+ str << c_globalSettingsCode.tqarg( s_previewGamma );
// Set the render mode
mode.setHeight( s_previewSize );
@@ -519,7 +519,7 @@ void PMDialogEditBase::slotTexturePreview( )
m_pRenderFrame->setFixedSize( s_previewSize + m_pRenderFrame->frameWidth( ) * 2,
s_previewSize + m_pRenderFrame->frameWidth( ) * 2 );
m_pRenderFrame->updateGeometry( );
- m_pTexturePreviewWidget->layout( )->activate( );
+ m_pTexturePreviewWidget->tqlayout( )->activate( );
emit sizeChanged( );
m_pOutputWidget->slotClear( );
m_pRenderWidget->render( scene, mode, m_pPart->url( ) );
@@ -540,9 +540,9 @@ void PMDialogEditBase::slotPreviewFinished( int exitStatus )
KMessageBox::error( this, i18n( "Povray exited abnormally with "
"exit code %1.\n"
"See the povray output for details." )
- .arg( exitStatus ) );
+ .tqarg( exitStatus ) );
}
- else if( m_pRenderWidget->povrayOutput( ).contains( "ERROR" ) )
+ else if( m_pRenderWidget->povrayOutput( ).tqcontains( "ERROR" ) )
{
KMessageBox::error( this, i18n( "There were errors while rendering.\n"
"See the povray output for details." ) );
diff --git a/kpovmodeler/pmdialogeditbase.h b/kpovmodeler/pmdialogeditbase.h
index 6057648e..04a3dad7 100644
--- a/kpovmodeler/pmdialogeditbase.h
+++ b/kpovmodeler/pmdialogeditbase.h
@@ -42,7 +42,7 @@ class PMPovrayOutputWidget;
/**
* Base class for all widgets for editing object attributes.
*
- * Ensures a consistent layout for all widgets. Widgets should not
+ * Ensures a consistent tqlayout for all widgets. Widgets should not
* created within the constructor, but with the functions @ref createTopWidgets
* and @ref createBottomWidgets.
*
@@ -51,9 +51,10 @@ class PMPovrayOutputWidget;
* of solid objects. Subclasses like the widget for the box object add their
* object specific controls.
*/
-class PMDialogEditBase : public QWidget
+class PMDialogEditBase : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Creates a new PMDialogEditBase widget objectType is
@@ -62,7 +63,7 @@ public:
* No widgets are created within the constructor! You have to call
* @ref createWidgets after creating a new edit widget.
*/
- PMDialogEditBase( TQWidget* parent, const char* name = 0 );
+ PMDialogEditBase( TQWidget* tqparent, const char* name = 0 );
/**
* Destructor
*/
@@ -275,7 +276,7 @@ protected:
* of the sub class.
*
* First call the function of the base class, then create and append
- * the widgets to the top layout.
+ * the widgets to the top tqlayout.
*/
virtual void createTopWidgets( ) { };
@@ -283,7 +284,7 @@ protected:
* Create widgets here, that should be placed under the widgets
* of the sub class.
*
- * First create and append the widgets to the top layout, then
+ * First create and append the widgets to the top tqlayout, then
* call the function of the base class
*/
virtual void createBottomWidgets( );
@@ -295,7 +296,7 @@ protected:
virtual void saveContents( );
/**
- * Returns a pointer to the top layout
+ * Returns a pointer to the top tqlayout
*/
TQBoxLayout* topLayout( ) const { return m_pTopLayout; }
diff --git a/kpovmodeler/pmdialogview.cpp b/kpovmodeler/pmdialogview.cpp
index 243427b5..1df22c26 100644
--- a/kpovmodeler/pmdialogview.cpp
+++ b/kpovmodeler/pmdialogview.cpp
@@ -39,8 +39,8 @@
#include <tqscrollview.h>
#include <tqlabel.h>
-PMDialogEditContent::PMDialogEditContent( TQWidget* parent, const char* name )
- : TQScrollView( parent, name )
+PMDialogEditContent::PMDialogEditContent( TQWidget* tqparent, const char* name )
+ : TQScrollView( tqparent, name )
{
m_pContents = 0;
setVScrollBarMode( AlwaysOff );
@@ -69,7 +69,7 @@ void PMDialogEditContent::calculateSize( )
int fw = lineWidth( ) * 2;
if( m_pContents )
{
- TQSize newSize = m_pContents->minimumSizeHint( );
+ TQSize newSize = m_pContents->tqminimumSizeHint( );
setVScrollBarMode( AlwaysOff );
setHScrollBarMode( AlwaysOff );
@@ -111,8 +111,8 @@ void PMDialogEditContent::resizeEvent( TQResizeEvent* /* ev */ )
calculateSize( );
}
-PMDialogView::PMDialogView( PMPart* part, TQWidget* parent, const char* name )
- : PMViewBase( parent, name )
+PMDialogView::PMDialogView( PMPart* part, TQWidget* tqparent, const char* name )
+ : PMViewBase( tqparent, name )
{
m_pDisplayedWidget = 0;
m_unsavedData = false;
@@ -174,7 +174,7 @@ PMDialogView::~PMDialogView( )
void PMDialogView::slotObjectChanged( PMObject* obj, const int mode, TQObject* sender )
{
- if( sender == this )
+ if( TQT_BASE_OBJECT(sender) == TQT_BASE_OBJECT(this) )
return;
if( mode & PMCNewSelection )
{
@@ -314,10 +314,10 @@ void PMDialogView::slotDataChanged( )
void PMDialogView::slotSizeChanged( )
{
- // force recalculating of the layout
+ // force recalculating of the tqlayout
if( m_pDisplayedWidget )
- if( m_pDisplayedWidget->layout( ) )
- m_pDisplayedWidget->layout( )->activate( );
+ if( m_pDisplayedWidget->tqlayout( ) )
+ m_pDisplayedWidget->tqlayout( )->activate( );
m_pHelper->calculateSize( );
}
@@ -325,7 +325,7 @@ void PMDialogView::slotControlPointSelectionChanged( )
{
if( m_pDisplayedWidget && m_pDisplayedWidget->displayedObject( ) )
emit objectChanged( m_pDisplayedWidget->displayedObject( ),
- PMCControlPointSelection, this );
+ PMCControlPointSelection, TQT_TQOBJECT(this) );
}
void PMDialogView::displayObject( PMObject* obj, bool updateDescription )
diff --git a/kpovmodeler/pmdialogview.h b/kpovmodeler/pmdialogview.h
index 680cbbc9..0b6209c3 100644
--- a/kpovmodeler/pmdialogview.h
+++ b/kpovmodeler/pmdialogview.h
@@ -40,11 +40,12 @@ class TQLabel;
/**
* Helper class for @ref PMDialogView
*/
-class PMDialogEditContent : public QScrollView
+class PMDialogEditContent : public TQScrollView
{
Q_OBJECT
+ TQ_OBJECT
public:
- PMDialogEditContent( TQWidget* parent, const char* name = 0 );
+ PMDialogEditContent( TQWidget* tqparent, const char* name = 0 );
void setContents( TQWidget* wid );
void calculateSize( );
protected:
@@ -63,11 +64,12 @@ private:
class PMDialogView : public PMViewBase
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Creates a new PMDialogView widget
*/
- PMDialogView( PMPart* part, TQWidget* parent, const char* name = 0 );
+ PMDialogView( PMPart* part, TQWidget* tqparent, const char* name = 0 );
/**
* Deletes the widget
*/
@@ -154,9 +156,9 @@ public:
virtual TQString viewType( ) const { return TQString( "dialogview" ); }
virtual TQString description( ) const;
virtual TQString iconName( ) const { return TQString( "pmdialogview" ); }
- virtual PMViewBase* newInstance( TQWidget* parent, PMPart* part ) const
+ virtual PMViewBase* newInstance( TQWidget* tqparent, PMPart* part ) const
{
- return new PMDialogView( part, parent );
+ return new PMDialogView( part, tqparent );
}
};
diff --git a/kpovmodeler/pmdisc.cpp b/kpovmodeler/pmdisc.cpp
index bda89579..4a526288 100644
--- a/kpovmodeler/pmdisc.cpp
+++ b/kpovmodeler/pmdisc.cpp
@@ -96,11 +96,11 @@ void PMDisc::readAttributes( const PMXMLHelper& h )
Base::readAttributes( h );
}
-PMMetaObject* PMDisc::metaObject( ) const
+PMMetaObject* PMDisc::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "Disc", Base::metaObject( ),
+ s_pMetaObject = new PMMetaObject( "Disc", Base::tqmetaObject( ),
createNewDisc );
s_pMetaObject->addProperty(
new PMDiscProperty( "center", &PMDisc::setCenter, &PMDisc::center ) );
@@ -176,9 +176,9 @@ void PMDisc::setHoleRadius( double hradius )
}
}
-PMDialogEditBase* PMDisc::editWidget( TQWidget* parent ) const
+PMDialogEditBase* PMDisc::editWidget( TQWidget* tqparent ) const
{
- return new PMDiscEdit( parent );
+ return new PMDiscEdit( tqparent );
}
void PMDisc::restoreMemento( PMMemento* s )
diff --git a/kpovmodeler/pmdisc.h b/kpovmodeler/pmdisc.h
index 62201bcf..482e5e1d 100644
--- a/kpovmodeler/pmdisc.h
+++ b/kpovmodeler/pmdisc.h
@@ -58,7 +58,7 @@ public:
/** */
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
@@ -67,7 +67,7 @@ public:
/**
* Returns a new @ref PMDiscEdit
*/
- virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
+ virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
/**
* Returns the name of the pixmap that is displayed in the tree view and dialog view
*/
diff --git a/kpovmodeler/pmdiscedit.cpp b/kpovmodeler/pmdiscedit.cpp
index 0197a806..6b06207d 100644
--- a/kpovmodeler/pmdiscedit.cpp
+++ b/kpovmodeler/pmdiscedit.cpp
@@ -27,8 +27,8 @@
#include <klocale.h>
#include <kmessagebox.h>
-PMDiscEdit::PMDiscEdit( TQWidget* parent, const char* name )
- : Base( parent, name )
+PMDiscEdit::PMDiscEdit( TQWidget* tqparent, const char* name )
+ : Base( tqparent, name )
{
m_pDisplayedObject = 0;
}
@@ -37,7 +37,7 @@ void PMDiscEdit::createTopWidgets( )
{
Base::createTopWidgets( );
- TQHBoxLayout* layout;
+ TQHBoxLayout* tqlayout;
TQGridLayout* gl;
m_pCenter = new PMVectorEdit( "x", "y", "z", this );
@@ -53,18 +53,18 @@ void PMDiscEdit::createTopWidgets( )
gl->addWidget( new TQLabel( i18n( "Normal:" ), this ), 1, 0 );
gl->addWidget( m_pNormal, 1, 1 );
- layout = new TQHBoxLayout( topLayout( ) );
- gl = new TQGridLayout( layout, 2, 2 );
+ tqlayout = new TQHBoxLayout( topLayout( ) );
+ gl = new TQGridLayout( tqlayout, 2, 2 );
gl->addWidget( new TQLabel( i18n( "Radius:" ), this ), 0, 0 );
gl->addWidget( m_pRadius, 0, 1 );
gl->addWidget( new TQLabel( i18n( "Hole radius:" ), this ), 1, 0 );
gl->addWidget( m_pHRadius, 1, 1 );
- layout->addStretch( 1 );
+ tqlayout->addStretch( 1 );
TQPushButton* nb = new TQPushButton( i18n( "Normalize" ), this );
- layout = new TQHBoxLayout( topLayout( ) );
- layout->addWidget( nb );
- layout->addStretch( 1 );
+ tqlayout = new TQHBoxLayout( topLayout( ) );
+ tqlayout->addWidget( nb );
+ tqlayout->addStretch( 1 );
connect( m_pCenter, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
connect( m_pNormal, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
diff --git a/kpovmodeler/pmdiscedit.h b/kpovmodeler/pmdiscedit.h
index 5ce4d111..73466f32 100644
--- a/kpovmodeler/pmdiscedit.h
+++ b/kpovmodeler/pmdiscedit.h
@@ -33,12 +33,13 @@ class PMDisc;
class PMDiscEdit : public PMGraphicalObjectEdit
{
Q_OBJECT
+ TQ_OBJECT
typedef PMGraphicalObjectEdit Base;
public:
/**
- * Creates a PMPlaneEdit with parent and name
+ * Creates a PMPlaneEdit with tqparent and name
*/
- PMDiscEdit( TQWidget* parent, const char* name = 0 );
+ PMDiscEdit( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displayObject( PMObject* o );
diff --git a/kpovmodeler/pmdockwidget.cpp b/kpovmodeler/pmdockwidget.cpp
index 67fbc1c7..1d13712f 100644
--- a/kpovmodeler/pmdockwidget.cpp
+++ b/kpovmodeler/pmdockwidget.cpp
@@ -36,7 +36,7 @@
#include <kpopupmenu.h>
#include <kwin.h>
#include <kdebug.h>
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
#include <X11/X.h>
#include <X11/Xlib.h>
#endif
@@ -134,15 +134,15 @@ public:
*
* @author Max Judin.
*/
-PMDockMainWindow::PMDockMainWindow( TQWidget* parent, const char *name, WFlags f)
-:KMainWindow( parent, name, f )
+PMDockMainWindow::PMDockMainWindow( TQWidget* tqparent, const char *name, WFlags f)
+:KMainWindow( tqparent, name, f )
{
TQString new_name = TQString(name) + TQString("_DockManager");
dockManager = new PMDockManager( this, new_name.latin1() );
mainDockWidget = 0L;
d = new PMDockMainWindowPrivate( );
- PartBase::setPartObject( this );
+ PartBase::setPartObject( TQT_TQOBJECT(this) );
}
PMDockMainWindow::~PMDockMainWindow()
@@ -154,7 +154,7 @@ PMDockMainWindow::~PMDockMainWindow()
// kparts/dockmainwindow stuff
void PMDockMainWindow::createGUI( Part * part )
{
- kdDebug(1000) << TQString("DockMainWindow::createGUI for %1").arg(part?part->name():"0L") << endl;
+ kdDebug(1000) << TQString("DockMainWindow::createGUI for %1").tqarg(part?part->name():"0L") << endl;
KXMLGUIFactory *factory = guiFactory();
@@ -164,7 +164,7 @@ void PMDockMainWindow::createGUI( Part * part )
if ( d->m_activePart )
{
- kdDebug(1000) << TQString("deactivating GUI for %1").arg(d->m_activePart->name()) << endl;
+ kdDebug(1000) << TQString("deactivating GUI for %1").tqarg(d->m_activePart->name()) << endl;
GUIActivateEvent ev( false );
TQApplication::sendEvent( d->m_activePart, &ev );
@@ -179,7 +179,7 @@ void PMDockMainWindow::createGUI( Part * part )
if( !d->m_bShellGUIActivated )
{
- loadPlugins( this, this, KGlobal::instance() );
+ loadPlugins( TQT_TQOBJECT(this), this, KGlobal::instance() );
createShellGUI();
d->m_bShellGUIActivated = true;
}
@@ -256,7 +256,7 @@ void PMDockMainWindow::setMainDockWidget( PMDockWidget* mdw )
void PMDockMainWindow::setView( TQWidget *view )
{
if ( view->isA("PMDockWidget") ){
- if ( view->parent() != this ) ((PMDockWidget*)view)->applyToWidget( this );
+ if ( TQT_BASE_OBJECT(view->tqparent()) != TQT_BASE_OBJECT(this) ) ((PMDockWidget*)view)->applyToWidget( this );
}
#ifndef NO_KDE2
@@ -266,9 +266,9 @@ void PMDockMainWindow::setView( TQWidget *view )
#endif
}
-PMDockWidget* PMDockMainWindow::createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent, const TQString& strCaption, const TQString& strTabPageLabel)
+PMDockWidget* PMDockMainWindow::createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* tqparent, const TQString& strCaption, const TQString& strTabPageLabel)
{
- return new PMDockWidget( dockManager, name.latin1(), pixmap, parent, strCaption, strTabPageLabel );
+ return new PMDockWidget( dockManager, name.latin1(), pixmap, tqparent, strCaption, strTabPageLabel );
}
void PMDockMainWindow::makeDockVisible( PMDockWidget* dock )
@@ -319,15 +319,15 @@ void PMDockMainWindow::slotDockWidgetUndocked()
}
/*************************************************************************/
-PMDockWidgetAbstractHeaderDrag::PMDockWidgetAbstractHeaderDrag( PMDockWidgetAbstractHeader* parent, PMDockWidget* dock, const char* name )
-:TQFrame( parent, name )
+PMDockWidgetAbstractHeaderDrag::PMDockWidgetAbstractHeaderDrag( PMDockWidgetAbstractHeader* tqparent, PMDockWidget* dock, const char* name )
+:TQFrame( tqparent, name )
{
dw = dock;
installEventFilter( dock->dockManager() );
}
/*************************************************************************/
-PMDockWidgetHeaderDrag::PMDockWidgetHeaderDrag( PMDockWidgetAbstractHeader* parent, PMDockWidget* dock, const char* name )
-:PMDockWidgetAbstractHeaderDrag( parent, dock, name )
+PMDockWidgetHeaderDrag::PMDockWidgetHeaderDrag( PMDockWidgetAbstractHeader* tqparent, PMDockWidget* dock, const char* name )
+:PMDockWidgetAbstractHeaderDrag( tqparent, dock, name )
{
}
@@ -337,33 +337,33 @@ void PMDockWidgetHeaderDrag::paintEvent( TQPaintEvent* )
paint.begin( this );
- style().drawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup());
+ tqstyle().tqdrawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), tqcolorGroup());
paint.end();
}
/*************************************************************************/
-PMDockWidgetAbstractHeader::PMDockWidgetAbstractHeader( PMDockWidget* parent, const char* name )
-:TQFrame( parent, name )
+PMDockWidgetAbstractHeader::PMDockWidgetAbstractHeader( PMDockWidget* tqparent, const char* name )
+:TQFrame( tqparent, name )
{
}
/*************************************************************************/
-PMDockWidgetHeader::PMDockWidgetHeader( PMDockWidget* parent, const char* name )
-:PMDockWidgetAbstractHeader( parent, name )
+PMDockWidgetHeader::PMDockWidgetHeader( PMDockWidget* tqparent, const char* name )
+:PMDockWidgetAbstractHeader( tqparent, name )
{
- layout = new TQHBoxLayout( this );
- layout->setResizeMode( TQLayout::Minimum );
+ tqlayout = new TQHBoxLayout( this );
+ tqlayout->setResizeMode( TQLayout::Minimum );
- drag = new PMDockWidgetHeaderDrag( this, parent );
+ drag = new PMDockWidgetHeaderDrag( this, tqparent );
closeButton = new PMDockButton_Private( this, "DockCloseButton" );
closeButton->setPixmap( const_cast< const char** >(close_xpm) );
int buttonWidth = 9, buttonHeight = 9;
closeButton->setFixedSize(buttonWidth,buttonHeight);
- connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SIGNAL(headerCloseButtonClicked()));
+ connect( closeButton, TQT_SIGNAL(clicked()), tqparent, TQT_SIGNAL(headerCloseButtonClicked()));
// MODIFICATION (zehender)
// The shell will delete the widget
// undock is unnecessary
- // connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(undock()));
+ // connect( closeButton, TQT_SIGNAL(clicked()), tqparent, TQT_SLOT(undock()));
stayButton = new PMDockButton_Private( this, "DockStayButton" );
stayButton->setToggleButton( true );
@@ -375,8 +375,8 @@ PMDockWidgetHeader::PMDockWidgetHeader( PMDockWidget* parent, const char* name )
dockbackButton = new PMDockButton_Private( this, "DockbackButton" );
dockbackButton->setPixmap( const_cast< const char** >(dockback_xpm));
dockbackButton->setFixedSize(buttonWidth,buttonHeight);
- connect( dockbackButton, TQT_SIGNAL(clicked()), parent, TQT_SIGNAL(headerDockbackButtonClicked()));
- connect( dockbackButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(dockBack()));
+ connect( dockbackButton, TQT_SIGNAL(clicked()), tqparent, TQT_SIGNAL(headerDockbackButtonClicked()));
+ connect( dockbackButton, TQT_SIGNAL(clicked()), tqparent, TQT_SLOT(dockBack()));
// MODIFICATION (zehender)
// Add a button to undock the widget and dock it as top level
@@ -384,21 +384,21 @@ PMDockWidgetHeader::PMDockWidgetHeader( PMDockWidget* parent, const char* name )
toDesktopButton = new PMDockButton_Private( this, "ToDesktopButton" );
toDesktopButton->setPixmap( const_cast< const char** >(todesktop_xpm));
toDesktopButton->setFixedSize(buttonWidth,buttonHeight);
- connect( toDesktopButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(toDesktop()));
+ connect( toDesktopButton, TQT_SIGNAL(clicked()), tqparent, TQT_SLOT(toDesktop()));
- layout->addWidget( drag );
- layout->addWidget( dockbackButton );
- layout->addWidget( toDesktopButton );
- layout->addWidget( stayButton );
- layout->addWidget( closeButton );
- layout->activate();
- drag->setFixedHeight( layout->minimumSize().height() );
+ tqlayout->addWidget( drag );
+ tqlayout->addWidget( dockbackButton );
+ tqlayout->addWidget( toDesktopButton );
+ tqlayout->addWidget( stayButton );
+ tqlayout->addWidget( closeButton );
+ tqlayout->activate();
+ drag->setFixedHeight( tqlayout->tqminimumSize().height() );
}
void PMDockWidgetHeader::setTopLevel( bool isTopLevel )
{
if ( isTopLevel ){
- PMDockWidget* par = (PMDockWidget*)parent();
+ PMDockWidget* par = (PMDockWidget*)tqparent();
if( par) {
if( par->isDockBackPossible())
dockbackButton->show();
@@ -415,7 +415,7 @@ void PMDockWidgetHeader::setTopLevel( bool isTopLevel )
closeButton->show();
toDesktopButton->show();
}
- layout->activate();
+ tqlayout->activate();
updateGeometry();
}
@@ -423,20 +423,20 @@ void PMDockWidgetHeader::setDragPanel( PMDockWidgetHeaderDrag* nd )
{
if ( !nd ) return;
- delete layout;
- layout = new TQHBoxLayout( this );
- layout->setResizeMode( TQLayout::Minimum );
+ delete tqlayout;
+ tqlayout = new TQHBoxLayout( this );
+ tqlayout->setResizeMode( TQLayout::Minimum );
delete drag;
drag = nd;
- layout->addWidget( drag );
- layout->addWidget( dockbackButton );
- layout->addWidget( toDesktopButton );
- layout->addWidget( stayButton );
- layout->addWidget( closeButton );
- layout->activate();
- drag->setFixedHeight( layout->minimumSize().height() );
+ tqlayout->addWidget( drag );
+ tqlayout->addWidget( dockbackButton );
+ tqlayout->addWidget( toDesktopButton );
+ tqlayout->addWidget( stayButton );
+ tqlayout->addWidget( closeButton );
+ tqlayout->activate();
+ drag->setFixedHeight( tqlayout->tqminimumSize().height() );
}
void PMDockWidgetHeader::slotStayClicked()
@@ -459,18 +459,18 @@ void PMDockWidgetHeader::setDragEnabled(bool b)
#ifndef NO_KDE2
void PMDockWidgetHeader::saveConfig( KConfig* c )
{
- c->writeEntry( TQString("%1%2").arg(parent()->name()).arg(":stayButton"), stayButton->isOn() );
+ c->writeEntry( TQString("%1%2").tqarg(tqparent()->name()).tqarg(":stayButton"), stayButton->isOn() );
}
void PMDockWidgetHeader::loadConfig( KConfig* c )
{
- setDragEnabled( !c->readBoolEntry( TQString("%1%2").arg(parent()->name()).arg(":stayButton"), false ) );
+ setDragEnabled( !c->readBoolEntry( TQString("%1%2").tqarg(tqparent()->name()).tqarg(":stayButton"), false ) );
}
#endif
/*************************************************************************/
-PMDockWidget::PMDockWidget( PMDockManager* dockManager, const char* name, const TQPixmap &pixmap, TQWidget* parent, const TQString& strCaption, const TQString& strTabPageLabel, WFlags f)
-: TQWidget( parent, name, f )
+PMDockWidget::PMDockWidget( PMDockManager* dockManager, const char* name, const TQPixmap &pixmap, TQWidget* tqparent, const TQString& strCaption, const TQString& strTabPageLabel, WFlags f)
+: TQWidget( tqparent, name, f )
,formerBrotherDockWidget(0L)
,currentDockPos(DockNone)
,formerDockPos(DockNone)
@@ -479,13 +479,13 @@ PMDockWidget::PMDockWidget( PMDockManager* dockManager, const char* name, const
{
d = new PMDockWidgetPrivate(); // create private data
- d->_parent = parent;
+ d->_parent = tqparent;
- layout = new TQVBoxLayout( this );
- layout->setResizeMode( TQLayout::Minimum );
+ tqlayout = new TQVBoxLayout( this );
+ tqlayout->setResizeMode( TQLayout::Minimum );
manager = dockManager;
- manager->childDock->append( this );
+ manager->childDock->append( TQT_TQOBJECT(this) );
installEventFilter( manager );
header = 0L;
@@ -510,7 +510,7 @@ PMDockWidget::PMDockWidget( PMDockManager* dockManager, const char* name, const
widget = 0L;
TQObject::connect(this, TQT_SIGNAL(hasUndocked()), manager->main, TQT_SLOT(slotDockWidgetUndocked()) );
- applyToWidget( parent, TQPoint(0,0) );
+ applyToWidget( tqparent, TQPoint(0,0) );
}
void PMDockWidget::slotSetCaption( const TQString& str )
@@ -527,7 +527,7 @@ PMDockWidget::~PMDockWidget()
d->blockHasUndockedSignal = false;
}
emit iMBeingClosed();
- manager->childDock->remove( this );
+ manager->childDock->remove( TQT_TQOBJECT(this) );
delete pix;
delete d; // destroy private data
}
@@ -538,15 +538,15 @@ void PMDockWidget::setHeader( PMDockWidgetAbstractHeader* h )
if ( header ){
delete header;
- delete layout;
+ delete tqlayout;
header = h;
- layout = new TQVBoxLayout( this );
- layout->setResizeMode( TQLayout::Minimum );
- layout->addWidget( header );
+ tqlayout = new TQVBoxLayout( this );
+ tqlayout->setResizeMode( TQLayout::Minimum );
+ tqlayout->addWidget( header );
setWidget( widget );
} else {
header = h;
- layout->addWidget( header );
+ tqlayout->addWidget( header );
}
}
@@ -558,8 +558,8 @@ void PMDockWidget::setEnableDocking( int pos )
void PMDockWidget::updateHeader()
{
- if ( parent() ){
- if ( (parent() == manager->main) || isGroup || (eDocking == PMDockWidget::DockNone) ){
+ if ( tqparent() ){
+ if ( (TQT_BASE_OBJECT(tqparent()) == TQT_BASE_OBJECT(manager->main)) || isGroup || (eDocking == PMDockWidget::DockNone) ){
header->hide();
} else {
header->setTopLevel( false );
@@ -573,7 +573,7 @@ void PMDockWidget::updateHeader()
void PMDockWidget::applyToWidget( TQWidget* s, const TQPoint& p )
{
- if ( parent() != s )
+ if ( TQT_BASE_OBJECT(tqparent()) != TQT_BASE_OBJECT(s) )
{
hide();
reparent(s, 0, TQPoint(0,0), false);
@@ -584,7 +584,7 @@ void PMDockWidget::applyToWidget( TQWidget* s, const TQPoint& p )
}
if ( s == manager->main ){
- setGeometry( TQRect(TQPoint(0,0), manager->main->geometry().size()) );
+ setGeometry( TQRect(TQPoint(0,0), manager->main->tqgeometry().size()) );
}
if ( !s )
@@ -592,7 +592,7 @@ void PMDockWidget::applyToWidget( TQWidget* s, const TQPoint& p )
move(p);
#ifndef NO_KDE2
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
if (d->transient && d->_parent)
XSetTransientForHint( qt_xdisplay(), winId(), d->_parent->winId() );
@@ -608,11 +608,11 @@ void PMDockWidget::applyToWidget( TQWidget* s, const TQPoint& p )
void PMDockWidget::show()
{
- if ( parent() || manager->main->isVisible() )
- if ( !parent() ){
+ if ( tqparent() || manager->main->isVisible() )
+ if ( !tqparent() ){
emit manager->setDockDefaultPos( this );
emit setDockDefaultPos();
- if ( parent() ){
+ if ( tqparent() ){
makeDockVisible();
} else {
TQWidget::show();
@@ -627,16 +627,16 @@ void PMDockWidget::show()
void PMDockWidget::setDockWindowType (NET::WindowType windowType)
{
d->windowType = windowType;
- applyToWidget( parentWidget(), TQPoint(0,0) );
+ applyToWidget( tqparentWidget(), TQPoint(0,0) );
}
#endif
-void PMDockWidget::setDockWindowTransient (TQWidget *parent, bool transientEnabled)
+void PMDockWidget::setDockWindowTransient (TQWidget *tqparent, bool transientEnabled)
{
- d->_parent = parent;
+ d->_parent = tqparent;
d->transient = transientEnabled;
- applyToWidget( parentWidget(), TQPoint(0,0) );
+ applyToWidget( tqparentWidget(), TQPoint(0,0) );
}
bool PMDockWidget::event( TQEvent* pevent )
@@ -663,13 +663,13 @@ bool PMDockWidget::event( TQEvent* pevent )
emit manager->change();
break;
case TQEvent::CaptionChange:
- if ( parentWidget() ){
- if ( parent()->inherits("PMDockSplitter") ){
- ((PMDockSplitter*)(parent()))->updateName();
+ if ( tqparentWidget() ){
+ if ( tqparent()->inherits("PMDockSplitter") ){
+ ((PMDockSplitter*)(tqparent()))->updateName();
}
- if ( parentDockTabGroup() ){
- setDockTabName( parentDockTabGroup() );
- parentDockTabGroup()->setTabLabel( this, tabPageLabel() );
+ if ( tqparentDockTabGroup() ){
+ setDockTabName( tqparentDockTabGroup() );
+ tqparentDockTabGroup()->setTabLabel( this, tabPageLabel() );
}
}
break;
@@ -686,10 +686,10 @@ bool PMDockWidget::event( TQEvent* pevent )
}
#undef KeyPress
bool processed = TQWidget::event( pevent );
- if( pevent->type( ) == TQEvent::AccelOverride && !processed && !parent( ) ){
+ if( pevent->type( ) == TQEvent::AccelOverride && !processed && !tqparent( ) ){
// MODIFICATION (zehender)
// floating widget, post event to main window
- processed = qApp->sendEvent( manager->dockMainWidget( ), pevent );
+ processed = tqApp->sendEvent( manager->dockMainWidget( ), pevent );
}
return processed;
}
@@ -702,7 +702,7 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP
bool succes = true; // tested flag
// do not dock into a floating widget
- if( target && !target->parent( ) )
+ if( target && !target->tqparent( ) )
target = 0;
// check allowed this dock submit this operations
@@ -715,18 +715,18 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP
succes = false;
}
- if ( parent() && !parent()->inherits("PMDockSplitter") && !parentDockTabGroup() ){
+ if ( tqparent() && !tqparent()->inherits("PMDockSplitter") && !tqparentDockTabGroup() ){
succes = false;
}
// if docking to a tab group, and position is not center
- // dock to the parent of the tab group
+ // dock to the tqparent of the tab group
if( target && ( dockPos != PMDockWidget::DockCenter )
&& ( dockPos != PMDockWidget::DockNone ) )
{
- TQWidget* pdt = target->parentDockTabGroup( );
+ TQWidget* pdt = target->tqparentDockTabGroup( );
if( pdt )
- return manualDock( ( PMDockWidget* ) ( pdt->parent( ) ),
+ return manualDock( ( PMDockWidget* ) ( pdt->tqparent( ) ),
dockPos, spliPos, pos, check, tabIndex );
}
@@ -759,25 +759,25 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP
return this;
}
- PMDockTabGroup* parentTab = target->parentDockTabGroup();
- if ( parentTab ){
+ PMDockTabGroup* tqparentTab = target->tqparentDockTabGroup();
+ if ( tqparentTab ){
// add to existing TabGroup
- applyToWidget( parentTab );
- parentTab->insertTab( this, icon() ? *icon() : TQPixmap(),
+ applyToWidget( tqparentTab );
+ tqparentTab->insertTab( this, icon() ? *icon() : TQPixmap(),
tabPageLabel(), tabIndex );
- setDockTabName( parentTab );
+ setDockTabName( tqparentTab );
if( !toolTipStr.isEmpty())
- parentTab->setTabToolTip( this, toolTipStr);
+ tqparentTab->setTabToolTip( this, toolTipStr);
currentDockPos = PMDockWidget::DockCenter;
emit manager->change();
- return (PMDockWidget*)parentTab->parent();
+ return (PMDockWidget*)tqparentTab->tqparent();
}
// MODIFICATION (Zehender):
// If DockPosition is DockLeft or DockRight, add the widget
// left or right of the target, so that a new vertical splitter
- // (a splitter with horizontal widget layout :-) is created
+ // (a splitter with horizontal widget tqlayout :-) is created
// that spawns the full height of the main view
if( ( dockPos == PMDockWidget::DockLeft ) ||
@@ -792,18 +792,18 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP
{
PMDockWidget* dw = ( PMDockWidget* ) wtarget;
newTarget = dw;
- TQWidget* pw = wtarget->parentWidget( );
+ TQWidget* pw = wtarget->tqparentWidget( );
if( pw )
{
if( pw->inherits( "PMDockSplitter" ) )
{
PMDockSplitter* ds = ( PMDockSplitter* ) pw;
- if( ds->splitterOrientation( ) == Vertical )
+ if( ds->splitterOrientation( ) ==Qt::Vertical )
found = true;
}
}
}
- wtarget = wtarget->parentWidget( );
+ wtarget = wtarget->tqparentWidget( );
}
if( newTarget != target )
@@ -813,8 +813,8 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP
// END MODIFICATION
// create a new dockwidget that will contain the target and this
- TQWidget* parentDock = target->parentWidget();
- PMDockWidget* newDock = new PMDockWidget( manager, "tempName", TQPixmap(""), parentDock );
+ TQWidget* tqparentDock = target->tqparentWidget();
+ PMDockWidget* newDock = new PMDockWidget( manager, "tempName", TQPixmap(TQString("")), tqparentDock );
newDock->currentDockPos = target->currentDockPos;
if ( dockPos == PMDockWidget::DockCenter ){
@@ -824,12 +824,12 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP
}
newDock->eDocking = (target->eDocking & eDocking) & (~(int)PMDockWidget::DockCenter);
- newDock->applyToWidget( parentDock );
+ newDock->applyToWidget( tqparentDock );
- if ( !parentDock ){
+ if ( !tqparentDock ){
// dock to a toplevel dockwidget means newDock is toplevel now
newDock->move( target->frameGeometry().topLeft() );
- newDock->resize( target->geometry().size() );
+ newDock->resize( target->tqgeometry().size() );
if ( target->isVisibleToTLW() ) newDock->show();
}
@@ -874,13 +874,13 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP
// if to dock not to the center of the target dockwidget,
// dock to newDock
PMDockSplitter* panner = 0L;
- if ( dockPos == PMDockWidget::DockTop || dockPos == PMDockWidget::DockBottom ) panner = new PMDockSplitter( newDock, "_dock_split_", Horizontal, spliPos, manager->splitterHighResolution() );
- if ( dockPos == PMDockWidget::DockLeft || dockPos == PMDockWidget::DockRight ) panner = new PMDockSplitter( newDock, "_dock_split_", Vertical , spliPos, manager->splitterHighResolution() );
+ if ( dockPos == PMDockWidget::DockTop || dockPos == PMDockWidget::DockBottom ) panner = new PMDockSplitter( newDock, "_dock_split_",Qt::Horizontal, spliPos, manager->splitterHighResolution() );
+ if ( dockPos == PMDockWidget::DockLeft || dockPos == PMDockWidget::DockRight ) panner = new PMDockSplitter( newDock, "_dock_split_",Qt::Vertical , spliPos, manager->splitterHighResolution() );
newDock->setWidget( panner );
panner->setOpaqueResize(manager->splitterOpaqueResize());
panner->setKeepSize(manager->splitterKeepSize());
- panner->setFocusPolicy( NoFocus );
+ panner->setFocusPolicy( TQ_NoFocus );
target->applyToWidget( panner );
applyToWidget( panner );
target->formerDockPos = target->currentDockPos;
@@ -909,9 +909,9 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP
panner->show();
}
- if ( parentDock ){
- if ( parentDock->inherits("PMDockSplitter") ){
- PMDockSplitter* sp = (PMDockSplitter*)parentDock;
+ if ( tqparentDock ){
+ if ( tqparentDock->inherits("PMDockSplitter") ){
+ PMDockSplitter* sp = (PMDockSplitter*)tqparentDock;
sp->deactivate();
if ( sp->getFirst() == target )
sp->activate( newDock, 0L );
@@ -928,10 +928,10 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP
return newDock;
}
-PMDockTabGroup* PMDockWidget::parentDockTabGroup() const
+PMDockTabGroup* PMDockWidget::tqparentDockTabGroup() const
{
- if ( !parent() ) return 0L;
- TQWidget* candidate = parentWidget()->parentWidget();
+ if ( !tqparent() ) return 0L;
+ TQWidget* candidate = tqparentWidget()->tqparentWidget();
if ( candidate && candidate->inherits("PMDockTabGroup") ) return (PMDockTabGroup*)candidate;
return 0L;
}
@@ -948,8 +948,8 @@ void PMDockWidget::toDesktop()
void PMDockWidget::undock()
{
- TQWidget* parentW = parentWidget();
- if ( !parentW ){
+ TQWidget* tqparentW = tqparentWidget();
+ if ( !tqparentW ){
hide();
if (!d->blockHasUndockedSignal)
emit hasUndocked();
@@ -962,73 +962,73 @@ void PMDockWidget::undock()
manager->blockSignals(true);
manager->undockProcess = true;
- bool isV = parentW->isVisibleToTLW();
+ bool isV = tqparentW->isVisibleToTLW();
- PMDockTabGroup* parentTab = parentDockTabGroup();
- if ( parentTab ){
- d->index = parentTab->indexOf( this); // memorize the page position in the tab widget
- parentTab->removePage( this );
- formerBrotherDockWidget = (PMDockWidget*)parentTab->page(0);
+ PMDockTabGroup* tqparentTab = tqparentDockTabGroup();
+ if ( tqparentTab ){
+ d->index = tqparentTab->indexOf( this); // memorize the page position in the tab widget
+ tqparentTab->removePage( this );
+ formerBrotherDockWidget = (PMDockWidget*)tqparentTab->page(0);
TQObject::connect( formerBrotherDockWidget, TQT_SIGNAL(iMBeingClosed()),
this, TQT_SLOT(loseFormerBrotherDockWidget()) );
applyToWidget( 0L );
- if ( parentTab->count() == 1 ){
+ if ( tqparentTab->count() == 1 ){
// last subdock widget in the tab control
- PMDockWidget* lastTab = (PMDockWidget*)parentTab->page(0);
- parentTab->removePage( lastTab );
+ PMDockWidget* lastTab = (PMDockWidget*)tqparentTab->page(0);
+ tqparentTab->removePage( lastTab );
lastTab->applyToWidget( 0L );
- lastTab->move( parentTab->mapToGlobal(parentTab->frameGeometry().topLeft()) );
+ lastTab->move( tqparentTab->mapToGlobal(tqparentTab->frameGeometry().topLeft()) );
- // PMDockTabGroup always have a parent that is a PMDockWidget
- PMDockWidget* parentOfTab = (PMDockWidget*)parentTab->parent();
- delete parentTab; // PMDockTabGroup
+ // PMDockTabGroup always have a tqparent that is a PMDockWidget
+ PMDockWidget* tqparentOfTab = (PMDockWidget*)tqparentTab->tqparent();
+ delete tqparentTab; // PMDockTabGroup
- TQWidget* parentOfDockWidget = parentOfTab->parentWidget();
- if ( parentOfDockWidget == 0L ){
+ TQWidget* tqparentOfDockWidget = tqparentOfTab->tqparentWidget();
+ if ( tqparentOfDockWidget == 0L ){
if ( isV ) lastTab->show();
} else {
- if ( parentOfDockWidget->inherits("PMDockSplitter") ){
- PMDockSplitter* split = (PMDockSplitter*)parentOfDockWidget;
+ if ( tqparentOfDockWidget->inherits("PMDockSplitter") ){
+ PMDockSplitter* split = (PMDockSplitter*)tqparentOfDockWidget;
lastTab->applyToWidget( split );
split->deactivate();
- if ( split->getFirst() == parentOfTab ){
+ if ( split->getFirst() == tqparentOfTab ){
split->activate( lastTab );
- if ( ((PMDockWidget*)split->parent())->splitterOrientation == Vertical )
- emit ((PMDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, PMDockWidget::DockLeft );
+ if ( ((PMDockWidget*)split->tqparent())->splitterOrientation ==Qt::Vertical )
+ emit ((PMDockWidget*)split->getAnother(tqparentOfTab))->docking( tqparentOfTab, PMDockWidget::DockLeft );
else
- emit ((PMDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, PMDockWidget::DockTop );
+ emit ((PMDockWidget*)split->getAnother(tqparentOfTab))->docking( tqparentOfTab, PMDockWidget::DockTop );
} else {
split->activate( 0L, lastTab );
- if ( ((PMDockWidget*)split->parent())->splitterOrientation == Vertical )
- emit ((PMDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, PMDockWidget::DockRight );
+ if ( ((PMDockWidget*)split->tqparent())->splitterOrientation ==Qt::Vertical )
+ emit ((PMDockWidget*)split->getAnother(tqparentOfTab))->docking( tqparentOfTab, PMDockWidget::DockRight );
else
- emit ((PMDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, PMDockWidget::DockBottom );
+ emit ((PMDockWidget*)split->getAnother(tqparentOfTab))->docking( tqparentOfTab, PMDockWidget::DockBottom );
}
split->show();
} else {
- lastTab->applyToWidget( parentOfDockWidget );
+ lastTab->applyToWidget( tqparentOfDockWidget );
}
lastTab->show();
}
manager->blockSignals(false);
- emit manager->replaceDock( parentOfTab, lastTab );
- lastTab->currentDockPos = parentOfTab->currentDockPos;
- emit parentOfTab->iMBeingClosed();
+ emit manager->replaceDock( tqparentOfTab, lastTab );
+ lastTab->currentDockPos = tqparentOfTab->currentDockPos;
+ emit tqparentOfTab->iMBeingClosed();
manager->blockSignals(true);
- delete parentOfTab;
+ delete tqparentOfTab;
} else {
- setDockTabName( parentTab );
+ setDockTabName( tqparentTab );
}
} else {
/*********************************************************************************************/
- if ( parentW->inherits("PMDockSplitter") ){
- PMDockSplitter* parentSplitterOfDockWidget = (PMDockSplitter*)parentW;
- d->splitPosInPercent = parentSplitterOfDockWidget->separatorPos();
+ if ( tqparentW->inherits("PMDockSplitter") ){
+ PMDockSplitter* tqparentSplitterOfDockWidget = (PMDockSplitter*)tqparentW;
+ d->splitPosInPercent = tqparentSplitterOfDockWidget->separatorPos();
- PMDockWidget* secondWidget = (PMDockWidget*)parentSplitterOfDockWidget->getAnother( this );
- PMDockWidget* group = (PMDockWidget*)parentSplitterOfDockWidget->parentWidget();
+ PMDockWidget* secondWidget = (PMDockWidget*)tqparentSplitterOfDockWidget->getAnother( this );
+ PMDockWidget* group = (PMDockWidget*)tqparentSplitterOfDockWidget->tqparentWidget();
formerBrotherDockWidget = secondWidget;
applyToWidget( 0L );
group->hide();
@@ -1037,25 +1037,25 @@ void PMDockWidget::undock()
TQObject::connect( formerBrotherDockWidget, TQT_SIGNAL(iMBeingClosed()),
this, TQT_SLOT(loseFormerBrotherDockWidget()) );
- if ( !group->parentWidget() ){
+ if ( !group->tqparentWidget() ){
secondWidget->applyToWidget( 0L, group->frameGeometry().topLeft() );
secondWidget->resize( group->width(), group->height() );
} else {
- TQWidget* obj = group->parentWidget();
+ TQWidget* obj = group->tqparentWidget();
secondWidget->applyToWidget( obj );
if ( obj->inherits("PMDockSplitter") ){
- PMDockSplitter* parentOfGroup = (PMDockSplitter*)obj;
- parentOfGroup->deactivate();
+ PMDockSplitter* tqparentOfGroup = (PMDockSplitter*)obj;
+ tqparentOfGroup->deactivate();
- if ( parentOfGroup->getFirst() == group )
- parentOfGroup->activate( secondWidget );
+ if ( tqparentOfGroup->getFirst() == group )
+ tqparentOfGroup->activate( secondWidget );
else
- parentOfGroup->activate( 0L, secondWidget );
+ tqparentOfGroup->activate( 0L, secondWidget );
}
}
secondWidget->currentDockPos = group->currentDockPos;
secondWidget->formerDockPos = group->formerDockPos;
- delete parentSplitterOfDockWidget;
+ delete tqparentSplitterOfDockWidget;
manager->blockSignals(false);
emit manager->replaceDock( group, secondWidget );
emit group->iMBeingClosed();
@@ -1081,18 +1081,18 @@ void PMDockWidget::setWidget( TQWidget* mw )
{
if ( !mw ) return;
- if ( mw->parent() != this ){
+ if ( TQT_BASE_OBJECT(mw->tqparent()) != TQT_BASE_OBJECT(this) ){
mw->reparent(this, 0, TQPoint(0,0), false);
}
widget = mw;
- delete layout;
+ delete tqlayout;
- layout = new TQVBoxLayout( this );
- layout->setResizeMode( TQLayout::Minimum );
+ tqlayout = new TQVBoxLayout( this );
+ tqlayout->setResizeMode( TQLayout::Minimum );
- layout->addWidget( header );
- layout->addWidget( widget,1 );
+ tqlayout->addWidget( header );
+ tqlayout->addWidget( widget,1 );
}
void PMDockWidget::setDockTabName( PMDockTabGroup* tab )
@@ -1107,24 +1107,24 @@ void PMDockWidget::setDockTabName( PMDockTabGroup* tab )
listOfCaption.remove( listOfCaption.length()-1, 1 );
listOfName.remove( listOfName.length()-1, 1 );
- tab->parentWidget()->setName( listOfName.utf8() );
- tab->parentWidget()->setCaption( listOfCaption );
+ tab->tqparentWidget()->setName( listOfName.utf8() );
+ tab->tqparentWidget()->setCaption( listOfCaption );
- tab->parentWidget()->repaint( false ); // PMDockWidget->repaint
- if ( tab->parentWidget()->parent() )
- if ( tab->parentWidget()->parent()->inherits("PMDockSplitter") )
- ((PMDockSplitter*)(tab->parentWidget()->parent()))->updateName();
+ tab->tqparentWidget()->tqrepaint( false ); // PMDockWidget->tqrepaint
+ if ( tab->tqparentWidget()->tqparent() )
+ if ( tab->tqparentWidget()->tqparent()->inherits("PMDockSplitter") )
+ ((PMDockSplitter*)(tab->tqparentWidget()->tqparent()))->updateName();
}
bool PMDockWidget::mayBeHide() const
{
- bool f = (parent() != manager->main);
+ bool f = (TQT_BASE_OBJECT(tqparent()) != TQT_BASE_OBJECT(manager->main));
return ( !isGroup && !isTabGroup && f && isVisible() && ( eDocking != (int)PMDockWidget::DockNone ) );
}
bool PMDockWidget::mayBeShow() const
{
- bool f = (parent() != manager->main);
+ bool f = (TQT_BASE_OBJECT(tqparent()) != TQT_BASE_OBJECT(manager->main));
return ( !isGroup && !isTabGroup && f && !isVisible() );
}
@@ -1146,18 +1146,18 @@ void PMDockWidget::changeHideShowState()
void PMDockWidget::makeDockVisible()
{
- if ( parentDockTabGroup() ){
- parentDockTabGroup()->showPage( this );
+ if ( tqparentDockTabGroup() ){
+ tqparentDockTabGroup()->showPage( this );
}
if ( isVisible() ) return;
- TQWidget* p = parentWidget();
+ TQWidget* p = tqparentWidget();
while ( p ){
if ( !p->isVisible() )
p->show();
- p = p->parentWidget();
+ p = p->tqparentWidget();
}
- if( parent() == 0L) // is undocked
+ if( tqparent() == 0L) // is undocked
dockBack();
show();
}
@@ -1168,13 +1168,13 @@ void PMDockWidget::loseFormerBrotherDockWidget()
TQObject::disconnect( formerBrotherDockWidget, TQT_SIGNAL(iMBeingClosed()),
this, TQT_SLOT(loseFormerBrotherDockWidget()) );
formerBrotherDockWidget = 0L;
- repaint();
+ tqrepaint();
}
void PMDockWidget::dockBack()
{
if( formerBrotherDockWidget) {
- // search all children if it tries to dock back to a child
+ // search all tqchildren if it tries to dock back to a child
bool found = false;
TQObjectList* cl = queryList("PMDockWidget");
TQObjectListIt it( *cl );
@@ -1199,7 +1199,7 @@ void PMDockWidget::dockBack()
// else dockback to the dockmainwindow (default behaviour)
manualDock( ((PMDockMainWindow*)manager->main)->getMainDockWidget(), formerDockPos, d->splitPosInPercent, TQPoint(0,0), false, d->index);
formerBrotherDockWidget = 0L;
- if (parent())
+ if (tqparent())
makeDockVisible();
}
@@ -1306,7 +1306,7 @@ void PMDockManager::activate()
while ( (obj=(PMDockWidget*)it.current()) ) {
++it;
if ( obj->widget ) obj->widget->show();
- if ( !obj->parentDockTabGroup() ){
+ if ( !obj->tqparentDockTabGroup() ){
obj->show();
}
}
@@ -1316,21 +1316,21 @@ void PMDockManager::activate()
bool PMDockManager::eventFilter( TQObject *obj, TQEvent *event )
{
/* This doesn't seem to fullfill any sense, other than breaking
- QMainWindow's layout all over the place
+ TQMainWindow's tqlayout all over the place
The first child of the mainwindow is not necessarily a meaningful
- content widget but in Qt3's TQMainWindow it can easily be a TQToolBar.
- In short: TQMainWindow knows how to layout its children, no need to
+ content widget but in TQt3's TQMainWindow it can easily be a TQToolBar.
+ In short: TQMainWindow knows how to tqlayout its tqchildren, no need to
mess that up.
>>>>>I need this in the PMDockArea at the moment (JoWenn)
- if ( obj == main && event->type() == TQEvent::Resize && dynamic_cast<PMDockArea*>(main) && main->children() ){
+ if ( obj == main && event->type() == TQEvent::Resize && dynamic_cast<PMDockArea*>(main) && main->tqchildren() ){
#ifndef NO_KDE2
- kdDebug()<<"PMDockManager::eventFilter(): main is a PMDockArea and there are children"<<endl;
+ kdDebug()<<"PMDockManager::eventFilter(): main is a PMDockArea and there are tqchildren"<<endl;
#endif
- TQWidget* fc = (TQWidget*)main->children()->getFirst();
+ TQWidget* fc = (TQWidget*)main->tqchildren()->getFirst();
if ( fc )
- fc->setGeometry( TQRect(TQPoint(0,0), main->geometry().size()) );
+ fc->setGeometry( TQRect(TQPoint(0,0), main->tqgeometry().size()) );
}
*/
@@ -1343,11 +1343,11 @@ bool PMDockManager::eventFilter( TQObject *obj, TQEvent *event )
else curdw->toDesktop( );
break;
case TQEvent::MouseButtonPress:
- if ( ((TQMouseEvent*)event)->button() == LeftButton ){
+ if ( ((TQMouseEvent*)event)->button() == Qt::LeftButton ){
if ( curdw->eDocking != (int)PMDockWidget::DockNone ){
dropCancel = true;
curdw->setFocus();
- qApp->processOneEvent();
+ tqApp->processOneEvent();
currentDragWidget = curdw;
currentMoveWidget = 0L;
@@ -1356,7 +1356,7 @@ bool PMDockManager::eventFilter( TQObject *obj, TQEvent *event )
findChildDockWidget( curdw, *childDockWidgetList );
d->oldDragRect = TQRect();
- d->dragRect = TQRect(curdw->geometry());
+ d->dragRect = TQRect(curdw->tqgeometry());
TQPoint p = curdw->mapToGlobal(TQPoint(0,0));
d->dragRect.moveTopLeft(p);
drawDragRectangle();
@@ -1367,7 +1367,7 @@ bool PMDockManager::eventFilter( TQObject *obj, TQEvent *event )
}
break;
case TQEvent::MouseButtonRelease:
- if ( ((TQMouseEvent*)event)->button() == LeftButton ){
+ if ( ((TQMouseEvent*)event)->button() == Qt::LeftButton ){
if ( draging ){
if ( !dropCancel )
drop();
@@ -1377,7 +1377,7 @@ bool PMDockManager::eventFilter( TQObject *obj, TQEvent *event )
if (d->readyToDrag) {
d->readyToDrag = false;
d->oldDragRect = TQRect();
- d->dragRect = TQRect(curdw->geometry());
+ d->dragRect = TQRect(curdw->tqgeometry());
TQPoint p = curdw->mapToGlobal(TQPoint(0,0));
d->dragRect.moveTopLeft(p);
drawDragRectangle();
@@ -1398,7 +1398,7 @@ bool PMDockManager::eventFilter( TQObject *obj, TQEvent *event )
break;
} else {
if (dropCancel && curdw) {
- d->dragRect = TQRect(curdw->geometry());
+ d->dragRect = TQRect(curdw->tqgeometry());
TQPoint p = curdw->mapToGlobal(TQPoint(0,0));
d->dragRect.moveTopLeft(p);
}else
@@ -1426,7 +1426,7 @@ bool PMDockManager::eventFilter( TQObject *obj, TQEvent *event )
if (d->readyToDrag) {
d->readyToDrag = false;
}
- if ( (((TQMouseEvent*)event)->state() == LeftButton) &&
+ if ( (((TQMouseEvent*)event)->state() == Qt::LeftButton) &&
(curdw->eDocking != (int)PMDockWidget::DockNone) ) {
startDrag( curdw);
}
@@ -1454,7 +1454,7 @@ PMDockWidget* PMDockManager::findDockWidgetAt( const TQPoint& pos )
return 0L;
}
#if defined(_OS_WIN32_) || defined(Q_OS_WIN32)
- p = p->topLevelWidget();
+ p = p->tqtopLevelWidget();
#endif
TQWidget* w = 0L;
findChildDockWidget( w, p, p->mapFromGlobal(pos) );
@@ -1464,11 +1464,11 @@ PMDockWidget* PMDockManager::findDockWidgetAt( const TQPoint& pos )
}
w = p;
}
- if ( qt_find_obj_child( w, "PMDockSplitter", "_dock_split_" ) ) return 0L;
- if ( qt_find_obj_child( w, "PMDockTabGroup", "_dock_tab" ) ) return 0L;
+ if ( qt_tqfind_obj_child( TQT_TQOBJECT(w), "PMDockSplitter", "_dock_split_" ) ) return 0L;
+ if ( qt_tqfind_obj_child( TQT_TQOBJECT(w), "PMDockTabGroup", "_dock_tab" ) ) return 0L;
if (!childDockWidgetList) return 0L;
- if ( childDockWidgetList->find(w) != -1 ) return 0L;
- if ( currentDragWidget->isGroup && ((PMDockWidget*)w)->parentDockTabGroup() ) return 0L;
+ if ( childDockWidgetList->tqfind(w) != -1 ) return 0L;
+ if ( currentDragWidget->isGroup && ((PMDockWidget*)w)->tqparentDockTabGroup() ) return 0L;
PMDockWidget* www = (PMDockWidget*)w;
if ( www->dockSite( ) == (int)PMDockWidget::DockNone ) return 0L;
@@ -1503,14 +1503,15 @@ PMDockWidget* PMDockManager::findDockWidgetAt( const TQPoint& pos )
void PMDockManager::findChildDockWidget( TQWidget*& ww, const TQWidget* p, const TQPoint& pos )
{
- if ( p->children() ) {
+ TQObjectList clo = p->childrenListObject();
+ if ( !clo.isEmpty() ) {
TQWidget *w;
- TQObjectListIt it( *p->children() );
+ TQObjectListIt it( clo );
it.toLast();
while ( it.current() ) {
if ( it.current()->isWidgetType() ) {
w = (TQWidget*)it.current();
- if ( w->isVisible() && w->geometry().contains(pos) ) {
+ if ( w->isVisible() && w->tqgeometry().tqcontains(pos) ) {
if ( w->inherits("PMDockWidget") ) ww = w;
findChildDockWidget( ww, w, w->mapFromParent(pos) );
return;
@@ -1524,9 +1525,10 @@ void PMDockManager::findChildDockWidget( TQWidget*& ww, const TQWidget* p, const
void PMDockManager::findChildDockWidget( const TQWidget* p, TQWidgetList& list )
{
- if ( p->children() ) {
+ TQObjectList clo = p->childrenListObject();
+ if ( !clo.isEmpty() ) {
TQWidget *w;
- TQObjectListIt it( *p->children() );
+ TQObjectListIt it( clo );
it.toLast();
while ( it.current() ) {
if ( it.current()->isWidgetType() ) {
@@ -1547,7 +1549,7 @@ void PMDockManager::findFloatingWidgets( TQPtrList<PMDockWidget>& l )
TQObjectListIt it( *childDock );
for( ; it.current( ); ++it )
if( it.current( )->inherits( "PMDockWidget" ) &&
- !it.current( )->parent( ) )
+ !it.current( )->tqparent( ) )
l.append( ( PMDockWidget* ) it.current( ) );
}
@@ -1557,9 +1559,9 @@ void PMDockManager::startDrag( PMDockWidget* w )
|| ( w->currentDockPos == PMDockWidget::DockTop) || ( w->currentDockPos == PMDockWidget::DockBottom)) {
w->prevSideDockPosBeforeDrag = w->currentDockPos;
- if ( w->parentWidget()->inherits("PMDockSplitter") ){
- PMDockSplitter* parentSplitterOfDockWidget = (PMDockSplitter*)(w->parentWidget());
- w->d->splitPosInPercent = parentSplitterOfDockWidget->separatorPos();
+ if ( w->tqparentWidget()->inherits("PMDockSplitter") ){
+ PMDockSplitter* tqparentSplitterOfDockWidget = (PMDockSplitter*)(w->tqparentWidget());
+ w->d->splitPosInPercent = tqparentSplitterOfDockWidget->separatorPos();
}
}
@@ -1575,7 +1577,7 @@ void PMDockManager::dragMove( PMDockWidget* dw, TQPoint pos )
PMDockWidget::DockPosition oldPos = curPos;
TQSize r = dw->widget->size();
- if ( dw->parentDockTabGroup() ){
+ if ( dw->tqparentDockTabGroup() ){
curPos = PMDockWidget::DockCenter;
if ( oldPos != curPos ) {
d->dragRect.setRect( p.x()+2, p.y()+2, r.width()-4, r.height()-4 );
@@ -1586,7 +1588,7 @@ void PMDockManager::dragMove( PMDockWidget* dw, TQPoint pos )
int w = r.width() / 3;
int h = r.height() / 3;
- PMDockMainWindow* mw = ( PMDockMainWindow* ) parent( );
+ PMDockMainWindow* mw = ( PMDockMainWindow* ) tqparent( );
TQWidget* cw = mw->centralWidget( );
TQPoint cwp = cw->mapToGlobal( TQPoint( 0, 0 ) );
int cwh = cw->height( );
@@ -1658,7 +1660,7 @@ void PMDockManager::drop()
drawDragRectangle(); // only the old rect will be deleted
return;
}
- if ( !currentMoveWidget && !currentDragWidget->parent() ) {
+ if ( !currentMoveWidget && !currentDragWidget->tqparent() ) {
currentDragWidget->move( TQCursor::pos() - d->dragOffset );
}
else {
@@ -1690,7 +1692,7 @@ static TQDomElement createStringEntry(TQDomDocument &doc, const TQString &tagNam
static TQDomElement createBoolEntry(TQDomDocument &doc, const TQString &tagName, bool b)
{
- return createStringEntry(doc, tagName, TQString::fromLatin1(b? "true" : "false"));
+ return createStringEntry(doc, tagName, TQString::tqfromLatin1(b? "true" : "false"));
}
@@ -1729,7 +1731,7 @@ static TQDomElement createListEntry(TQDomDocument &doc, const TQString &tagName,
TQStrListIterator it(list);
for (; it.current(); ++it) {
TQDomElement subel = doc.createElement(subTagName);
- subel.appendChild(doc.createTextNode(TQString::fromLatin1(it.current())));
+ subel.appendChild(doc.createTextNode(TQString::tqfromLatin1(it.current())));
el.appendChild(subel);
}
@@ -1798,8 +1800,8 @@ void PMDockManager::writeConfig(TQDomElement &base)
TQObjectListIt it(*childDock);
PMDockWidget *obj1;
while ( (obj1=(PMDockWidget*)it.current()) ) {
- if ( obj1->parent() == main )
- mainWidgetStr = TQString::fromLatin1(obj1->name());
+ if ( TQT_BASE_OBJECT(obj1->tqparent()) == TQT_BASE_OBJECT(main) )
+ mainWidgetStr = TQString::tqfromLatin1(obj1->name());
nList.append(obj1->name());
++it;
}
@@ -1807,9 +1809,9 @@ void PMDockManager::writeConfig(TQDomElement &base)
nList.first();
while ( nList.current() ) {
PMDockWidget *obj = getDockWidgetFromName( nList.current() );
- if (obj->isGroup && (nameList.find( obj->firstName.latin1() ) == -1
- || nameList.find(obj->lastName.latin1()) == -1)) {
- // Skip until children are saved (why?)
+ if (obj->isGroup && (nameList.tqfind( obj->firstName.latin1() ) == -1
+ || nameList.tqfind(obj->lastName.latin1()) == -1)) {
+ // Skip until tqchildren are saved (why?)
nList.next();
if ( !nList.current() ) nList.first();
continue;
@@ -1839,9 +1841,9 @@ void PMDockManager::writeConfig(TQDomElement &base)
groupEl = doc.createElement("dock");
}
- groupEl.appendChild(createStringEntry(doc, "name", TQString::fromLatin1(obj->name())));
- groupEl.appendChild(createBoolEntry(doc, "hasParent", obj->parent()));
- if ( !obj->parent() ) {
+ groupEl.appendChild(createStringEntry(doc, "name", TQString::tqfromLatin1(obj->name())));
+ groupEl.appendChild(createBoolEntry(doc, "hasParent", obj->tqparent()));
+ if ( !obj->tqparent() ) {
groupEl.appendChild(createRectEntry(doc, "geometry", TQRect(main->frameGeometry().topLeft(), main->size())));
groupEl.appendChild(createBoolEntry(doc, "visible", obj->isVisible()));
}
@@ -1889,7 +1891,7 @@ void PMDockManager::readConfig(TQDomElement &base)
PMDockWidget *obj1;
while ( (obj1=(PMDockWidget*)it.current()) ) {
if ( !obj1->isGroup && !obj1->isTabGroup ) {
- if ( obj1->parent() )
+ if ( obj1->tqparent() )
obj1->undock();
else
obj1->hide();
@@ -1913,7 +1915,7 @@ void PMDockManager::readConfig(TQDomElement &base)
PMDockWidget *second = getDockWidgetFromName(secondName);
if (first && second) {
obj = first->manualDock(second,
- (orientation == (int)Vertical)? PMDockWidget::DockLeft : PMDockWidget::DockTop,
+ (orientation == (int)Qt::Vertical)? PMDockWidget::DockLeft : PMDockWidget::DockTop,
separatorPos);
if (obj)
obj->setName(name.latin1());
@@ -2018,7 +2020,7 @@ void PMDockManager::writeConfig( KConfig* c, TQString group )
++it;
//debug(" +Add subdock %s", obj->name());
nList.append( obj->name() );
- if ( obj->parent() == main )
+ if ( TQT_BASE_OBJECT(obj->tqparent()) == TQT_BASE_OBJECT(main) )
c->writeEntry( "Main:view", obj->name() );
}
@@ -2032,15 +2034,15 @@ void PMDockManager::writeConfig( KConfig* c, TQString group )
}
/*************************************************************************************************/
if ( obj->isGroup ){
- if ( findList.find( obj->firstName.latin1() ) != -1 && findList.find( obj->lastName.latin1() ) != -1 ){
+ if ( findList.tqfind( obj->firstName.latin1() ) != -1 && findList.tqfind( obj->lastName.latin1() ) != -1 ){
c->writeEntry( cname+":type", "GROUP");
- if ( !obj->parent() ){
- c->writeEntry( cname+":parent", "___null___");
- c->writeEntry( cname+":geometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) );
+ if ( !obj->tqparent() ){
+ c->writeEntry( cname+":tqparent", "___null___");
+ c->writeEntry( cname+":tqgeometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) );
c->writeEntry( cname+":visible", obj->isVisible());
} else {
- c->writeEntry( cname+":parent", "yes");
+ c->writeEntry( cname+":tqparent", "yes");
}
c->writeEntry( cname+":first_name", obj->firstName );
c->writeEntry( cname+":last_name", obj->lastName );
@@ -2055,9 +2057,9 @@ void PMDockManager::writeConfig( KConfig* c, TQString group )
} else {
/*************************************************************************************************/
//debug(" Skip %s", nList.current());
- //if ( findList.find( obj->firstName ) == -1 )
+ //if ( findList.tqfind( obj->firstName ) == -1 )
// debug(" ? Not found %s", obj->firstName);
- //if ( findList.find( obj->lastName ) == -1 )
+ //if ( findList.tqfind( obj->lastName ) == -1 )
// debug(" ? Not found %s", obj->lastName);
nList.next();
if ( !nList.current() ) nList.first();
@@ -2066,12 +2068,12 @@ void PMDockManager::writeConfig( KConfig* c, TQString group )
/*************************************************************************************************/
if ( obj->isTabGroup){
c->writeEntry( cname+":type", "TAB_GROUP");
- if ( !obj->parent() ){
- c->writeEntry( cname+":parent", "___null___");
- c->writeEntry( cname+":geometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) );
+ if ( !obj->tqparent() ){
+ c->writeEntry( cname+":tqparent", "___null___");
+ c->writeEntry( cname+":tqgeometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) );
c->writeEntry( cname+":visible", obj->isVisible());
} else {
- c->writeEntry( cname+":parent", "yes");
+ c->writeEntry( cname+":tqparent", "yes");
}
TQStrList list;
for ( int i = 0; i < ((PMDockTabGroup*)obj->widget)->count(); ++i )
@@ -2086,9 +2088,9 @@ void PMDockManager::writeConfig( KConfig* c, TQString group )
nList.first();
} else {
/*************************************************************************************************/
- if ( !obj->parent() ){
+ if ( !obj->tqparent() ){
c->writeEntry( cname+":type", "NULL_DOCK");
- c->writeEntry( cname+":geometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) );
+ c->writeEntry( cname+":tqgeometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) );
c->writeEntry( cname+":visible", obj->isVisible());
} else {
c->writeEntry( cname+":type", "DOCK");
@@ -2147,7 +2149,7 @@ void PMDockManager::readConfig( KConfig* c, TQString group )
++it;
if ( !obj->isGroup && !obj->isTabGroup )
{
- if ( obj->parent() ) obj->undock(); else obj->hide();
+ if ( obj->tqparent() ) obj->undock(); else obj->hide();
}
}
@@ -2163,9 +2165,9 @@ void PMDockManager::readConfig( KConfig* c, TQString group )
PMDockWidget* last = getDockWidgetFromName( c->readEntry( oname + ":last_name" ) );
int sepPos = c->readNumEntry( oname + ":sepPos" );
- Orientation p = (Orientation)c->readNumEntry( oname + ":orientation" );
+ Qt::Orientation p = (Qt::Orientation)c->readNumEntry( oname + ":orientation" );
if ( first && last ){
- obj = first->manualDock( last, ( p == Vertical ) ? PMDockWidget::DockLeft : PMDockWidget::DockTop, sepPos );
+ obj = first->manualDock( last, ( p ==Qt::Vertical ) ? PMDockWidget::DockLeft : PMDockWidget::DockTop, sepPos );
if (obj){
obj->setName( oname.latin1() );
}
@@ -2197,8 +2199,8 @@ void PMDockManager::readConfig( KConfig* c, TQString group )
obj = tabDockGroup;
}
- if ( type == "NULL_DOCK" || c->readEntry( oname + ":parent") == "___null___" ){
- TQRect r = c->readRectEntry( oname + ":geometry" );
+ if ( type == "NULL_DOCK" || c->readEntry( oname + ":tqparent") == "___null___" ){
+ TQRect r = c->readRectEntry( oname + ":tqgeometry" );
obj = getDockWidgetFromName( oname );
obj->applyToWidget( 0L );
obj->setGeometry(r);
@@ -2268,8 +2270,8 @@ PMDockWidget* PMDockManager::getDockWidgetFromName( const TQString& dockName )
PMDockWidget* autoCreate = 0L;
if ( autoCreateDock ){
- autoCreate = new PMDockWidget( this, dockName.latin1(), TQPixmap("") );
- autoCreateDock->append( autoCreate );
+ autoCreate = new PMDockWidget( this, dockName.latin1(), TQPixmap(TQString("")) );
+ autoCreateDock->append( TQT_TQOBJECT(autoCreate) );
}
return autoCreate;
}
@@ -2370,14 +2372,14 @@ void PMDockManager::drawDragRectangle()
PMDockMainWindow* pMain = 0L;
PMDockWidget* pTLDockWdg = 0L;
TQWidget* topWdg;
- if (pDockWdgAtRect->topLevelWidget() == main) {
+ if (pDockWdgAtRect->tqtopLevelWidget() == main) {
isOverMainWdg = true;
topWdg = pMain = (PMDockMainWindow*) main;
unclipped = pMain->testWFlags( WPaintUnclipped );
pMain->setWFlags( WPaintUnclipped );
}
else {
- topWdg = pTLDockWdg = (PMDockWidget*) pDockWdgAtRect->topLevelWidget();
+ topWdg = pTLDockWdg = (PMDockWidget*) pDockWdgAtRect->tqtopLevelWidget();
unclipped = pTLDockWdg->testWFlags( WPaintUnclipped );
pTLDockWdg->setWFlags( WPaintUnclipped );
}
@@ -2392,7 +2394,7 @@ void PMDockManager::drawDragRectangle()
pTLDockWdg->clearWFlags(WPaintUnclipped);
}
// draw the rectangle
- p.setRasterOp(Qt::NotXorROP);
+ p.setRasterOp(TQt::NotXorROP);
TQRect r = oldAndNewDragRect[i];
r.moveTopLeft( r.topLeft() - topWdg->mapToGlobal(TQPoint(0,0)) );
p.drawRect(r.x(), r.y(), r.width(), r.height());
@@ -2406,8 +2408,8 @@ void PMDockManager::drawDragRectangle()
#ifdef _JOWENN_EXPERIMENTAL_
-PMDockArea::PMDockArea( TQWidget* parent, const char *name)
-:TQWidget( parent, name)
+PMDockArea::PMDockArea( TQWidget* tqparent, const char *name)
+:TQWidget( tqparent, name)
{
TQString new_name = TQString(name) + TQString("_DockManager");
dockManager = new PMDockManager( this, new_name.latin1() );
@@ -2419,9 +2421,9 @@ PMDockArea::~PMDockArea()
delete dockManager;
}
-PMDockWidget* PMDockArea::createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent, const TQString& strCaption, const TQString& strTabPageLabel)
+PMDockWidget* PMDockArea::createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* tqparent, const TQString& strCaption, const TQString& strTabPageLabel)
{
- return new PMDockWidget( dockManager, name.latin1(), pixmap, parent, strCaption, strTabPageLabel );
+ return new PMDockWidget( dockManager, name.latin1(), pixmap, tqparent, strCaption, strTabPageLabel );
}
void PMDockArea::makeDockVisible( PMDockWidget* dock )
@@ -2462,7 +2464,7 @@ void PMDockArea::slotDockWidgetUndocked()
void PMDockArea::resizeEvent(TQResizeEvent *rsize)
{
TQWidget::resizeEvent(rsize);
- if (children()){
+ if (!childrenListObject().isEmpty()){
#ifndef NO_KDE2
kdDebug()<<"PMDockArea::resize"<<endl;
#endif
@@ -2479,11 +2481,11 @@ void PMDockArea::resizeEvent(TQResizeEvent *rsize)
delete list;
#if 0
PMDockSplitter *split;
-// for (unsigned int i=0;i<children()->count();i++)
+// for (unsigned int i=0;i<tqchildren()->count();i++)
{
-// TQPtrList<TQObject> list(children());
-// TQObject *obj=((TQPtrList<TQObject*>)children())->at(i);
- TQObject *obj=children()->getFirst();
+// TQPtrList<TQObject> list(tqchildren());
+// TQObject *obj=((TQPtrList<TQObject*>)tqchildren())->at(i);
+ TQObject *obj=tqchildren()->getFirst();
if (split=dynamic_cast<PMDockSplitter*>(obj))
{
split->setGeometry( TQRect(TQPoint(0,0), size() ));
@@ -2544,6 +2546,6 @@ void PMDockArea::virtual_hook( int, void* )
{ /*KMainWindow::virtual_hook( id, data );*/ }
-#ifndef NO_INCLUDE_MOCFILES // for Qt-only projects, because tmake doesn't take this name
+#ifndef NO_INCLUDE_TQMOCFILES // for TQt-only projects, because tmake doesn't take this name
#include "pmdockwidget.moc"
#endif
diff --git a/kpovmodeler/pmdockwidget.h b/kpovmodeler/pmdockwidget.h
index d6c083f2..28e85963 100644
--- a/kpovmodeler/pmdockwidget.h
+++ b/kpovmodeler/pmdockwidget.h
@@ -39,9 +39,9 @@
- PMDockWidget - IMPORTANT CLASS: the one and only dockwidget class
- PMDockManager - helper class
- PMDockMainWindow - IMPORTANT CLASS: a special KMainWindow that can have dockwidgets
- - PMDockArea - like PMDockMainWindow but inherits just QWidget
+ - PMDockArea - like PMDockMainWindow but inherits just TQWidget
- IMPORTANT Note: This file compiles also in Qt-only mode by using the NO_KDE2 precompiler definition!
+ IMPORTANT Note: This file compiles also in TQt-only mode by using the NO_KDE2 precompiler definition!
*/
/*
@@ -106,18 +106,19 @@ class TQToolBar;
*
* @author Max Judin (documentation: Falk Brettschneider).
*/
-class PMDockWidgetAbstractHeader : public QFrame
+class PMDockWidgetAbstractHeader : public TQFrame
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Constructs this.
*
- * @param parent the parent widget (usually a dockwidget)
+ * @param tqparent the tqparent widget (usually a dockwidget)
* @param name the object instance name
*/
- PMDockWidgetAbstractHeader( PMDockWidget* parent, const char* name = 0L );
+ PMDockWidgetAbstractHeader( PMDockWidget* tqparent, const char* name = 0L );
/**
* Destructs this.
@@ -155,19 +156,20 @@ private:
*
* @author Max Judin (documentation: Falk Brettschneider).
*/
-class PMDockWidgetAbstractHeaderDrag : public QFrame
+class PMDockWidgetAbstractHeaderDrag : public TQFrame
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Constructs this.
*
- * @param parent the parent widget (usually a dockwidget header)
+ * @param tqparent the tqparent widget (usually a dockwidget header)
* @param dock the dockwidget where it belongs to
* @param name the object instance name
*/
- PMDockWidgetAbstractHeaderDrag( PMDockWidgetAbstractHeader* parent,
+ PMDockWidgetAbstractHeaderDrag( PMDockWidgetAbstractHeader* tqparent,
PMDockWidget* dock, const char* name = 0L );
/**
@@ -203,16 +205,17 @@ private:
class PMDockWidgetHeaderDrag : public PMDockWidgetAbstractHeaderDrag
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Constructs this.
*
- * @param parent the parent widget (usually a dockwidget header)
+ * @param tqparent the tqparent widget (usually a dockwidget header)
* @param dock the dockwidget where it belongs to
* @param name the object instance name
*/
- PMDockWidgetHeaderDrag( PMDockWidgetAbstractHeader* parent, PMDockWidget* dock,
+ PMDockWidgetHeaderDrag( PMDockWidgetAbstractHeader* tqparent, PMDockWidget* dock,
const char* name = 0L );
/**
@@ -244,15 +247,16 @@ private:
class PMDockWidgetHeader : public PMDockWidgetAbstractHeader
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Constructs this.
*
- * @param parent the parent widget (usually a dockwidget)
+ * @param tqparent the tqparent widget (usually a dockwidget)
* @param name the object instance name
*/
- PMDockWidgetHeader( PMDockWidget* parent, const char* name = 0L );
+ PMDockWidgetHeader( PMDockWidget* tqparent, const char* name = 0L );
/**
* Destructs this.
@@ -301,9 +305,9 @@ protected slots:
protected:
/**
- * A layout manager for placing the embedded buttons (close and stay)
+ * A tqlayout manager for placing the embedded buttons (close and stay)
*/
- TQHBoxLayout* layout;
+ TQHBoxLayout* tqlayout;
/**
* a little button for closing (undocking and hiding) the dockwidget
@@ -346,15 +350,16 @@ private:
*
* @author Max Judin (documentation: Falk Brettschneider).
*/
-class EXPORT_DOCKCLASS PMDockTabGroup : public QTabWidget
+class EXPORT_DOCKCLASS PMDockTabGroup : public TQTabWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Constructs this. It just calls the method of the base class.
*/
- PMDockTabGroup( TQWidget *parent = 0, const char *name = 0 )
- :TQTabWidget( parent, name ){};
+ PMDockTabGroup( TQWidget *tqparent = 0, const char *name = 0 )
+ :TQTabWidget( tqparent, name ){};
/**
* Destructs a PMDockTabGroup.
@@ -373,7 +378,7 @@ private:
* encapsulate the actual widgets (and member of the dockwidget class
* set).
*
- * You just grip the double-lined panel, tear it off its parent
+ * You just grip the double-lined panel, tear it off its tqparent
* widget, drag it somewhere and let it loose. Depending on the
* position where you leave it, the dockwidget becomes a toplevel
* window on the desktop (floating mode) or docks to a new widget
@@ -392,7 +397,7 @@ private:
* PMDockMainWindow* mainWidget;
* ...
* PMDockWidget* dock = 0L;
- * dock = mainWidget->createDockWidget( "Any window caption", nicePixmap, 0L, i18n("window caption")); // 0L==no parent
+ * dock = mainWidget->createDockWidget( "Any window caption", nicePixmap, 0L, i18n("window caption")); // 0L==no tqparent
* TQWidget* actualWidget = new TQWidget( dock);
* dock->setWidget( actualWidget); // embed it
* dock->setToolTipString(i18n("That's me")); // available when appearing as tab page
@@ -404,9 +409,10 @@ private:
*
* @author Max Judin (documentation: Falk Brettschneider).
*/
-class EXPORT_DOCKCLASS PMDockWidget: public QWidget
+class EXPORT_DOCKCLASS PMDockWidget: public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
friend class PMDockManager;
friend class PMDockSplitter;
friend class PMDockMainWindow;
@@ -423,12 +429,12 @@ public:
* @param dockManager The responsible manager (dock helper)
* @param name Object instance name
* @param pixmap An icon (for instance shown when docked centered)
- * @param parent Parent widget
+ * @param tqparent Parent widget
* @param strCaption Title of the dockwidget window (shown when toplevel)
* @param strTabPageLabel The title of the tab page (shown when in tab page mode), if it is "", only the icon will be shown, if it is 0L, the label is set to strCaption
*/
PMDockWidget( PMDockManager* dockManager, const char* name,
- const TQPixmap &pixmap, TQWidget* parent = 0L, const TQString& strCaption = 0L,
+ const TQPixmap &pixmap, TQWidget* tqparent = 0L, const TQString& strCaption = 0L,
const TQString& strTabPageLabel = " ", WFlags f = 0);
/**
@@ -462,8 +468,8 @@ public:
*
* If the target is null, it will become a toplevel dockwidget at position pos;
* Note: Docking to another dockwidget means exactly:
- * A new parent dockwidget will be created, that replaces the target dockwidget and contains another single helper widget (tab widget or panner)
- * which contains both dockwidgets, this and the target dockwidget. So consider parent<->child relationships change completely during such actions.
+ * A new tqparent dockwidget will be created, that replaces the target dockwidget and contains another single helper widget (tab widget or panner)
+ * which contains both dockwidgets, this and the target dockwidget. So consider tqparent<->child relationships change completely during such actions.
*
* @param target The dockwidget to dock to
* @param dockPos One of the DockPositions this is going to dock to
@@ -471,7 +477,7 @@ public:
* @param pos The dock position, mainly of interest for docking to the desktop (as toplevel dockwidget)
* @param check Only for internal use;
* @param tabIndex The position index of the tab widget (when in tab page mode), -1 (default) means append
- * @return result The group dockwidget that replaces the target dockwidget and will be grandparent of target and @p this.
+ * @return result The group dockwidget that replaces the target dockwidget and will be grandtqparent of target and @p this.
*/
PMDockWidget* manualDock( PMDockWidget* target, DockPosition dockPos, int spliPos = 50, TQPoint pos = TQPoint(0,0), bool check = false, int tabIndex = -1);
@@ -500,7 +506,7 @@ public:
int dockSite() const
{
// no docking if a floating dock widget
- if( !parent( ) )
+ if( !tqparent( ) )
return 0;
return sDocking;
}
@@ -544,7 +550,7 @@ public:
* There are reasons that it's impossible:
* @li It is a (tab) group.
* @li It is already invisible ;-)
- * @li The parent of this is the @ref PMDockMainWindow.
+ * @li The tqparent of this is the @ref PMDockMainWindow.
* @li It isn't able to dock to another widget.
*/
bool mayBeHide() const;
@@ -554,7 +560,7 @@ public:
* There are reasons that it's impossible:
* @li It is a (tab) group.
* @li It is already visible ;-)
- * @li The parent of this is the @p PMDockMainWindow.
+ * @li The tqparent of this is the @p PMDockMainWindow.
*/
bool mayBeShow() const;
@@ -606,9 +612,9 @@ public:
*/
virtual void show();
/**
- * @return the parent widget of this if it inherits class PMDockTabGroup
+ * @return the tqparent widget of this if it inherits class PMDockTabGroup
*/
- PMDockTabGroup* parentDockTabGroup() const;
+ PMDockTabGroup* tqparentDockTabGroup() const;
#ifndef NO_KDE2
@@ -626,7 +632,7 @@ public:
*
* @param windowType is type of dock window
*/
- void setDockWindowTransient (TQWidget *parent, bool transientEnabled);
+ void setDockWindowTransient (TQWidget *tqparent, bool transientEnabled);
// MODIFICATION (lpassos)
/**
@@ -669,7 +675,7 @@ protected:
/**
* Checks some conditions and shows or hides the dockwidget header (drag panel).
* The header is hidden if:
- * @li the parent widget is the PMDockMainWindow
+ * @li the tqparent widget is the PMDockMainWindow
* @li this is a (tab) group dockwidget
* @li it is not able to dock to another dockwidget
*/
@@ -748,7 +754,7 @@ private:
void setDockTabName( PMDockTabGroup* g);
/**
- * Reparent to s or set this to the PMDockMainWindow's view if s is that dockmainwindow.
+ * Retqparent to s or set this to the PMDockMainWindow's view if s is that dockmainwindow.
* If s is O, simply move the widget.
*
* @param s the target widget to reparent to
@@ -767,9 +773,9 @@ private:
TQWidget* widget;
/**
- * the layout manager that takes care about proper resizing and moving the embedded widget and the header
+ * the tqlayout manager that takes care about proper resizing and moving the embedded widget and the header
*/
- TQVBoxLayout* layout;
+ TQVBoxLayout* tqlayout;
/**
* the responsible dockmanager
@@ -799,7 +805,7 @@ private:
// GROUP data
TQString firstName;
TQString lastName;
- Orientation splitterOrientation;
+ Qt::Orientation splitterOrientation;
bool isGroup;
bool isTabGroup;
@@ -821,9 +827,10 @@ private:
*
* @author Max Judin (documentation: Falk Brettschneider).
*/
-class EXPORT_DOCKCLASS PMDockManager: public QObject
+class EXPORT_DOCKCLASS PMDockManager: public TQObject
{
Q_OBJECT
+ TQ_OBJECT
friend class PMDockWidget;
friend class PMDockMainWindow;
@@ -836,7 +843,7 @@ public:
* @li Some state variables are set
*
* @param mainWindow the main window controlled by this
- * @param name the internal QOject name
+ * @param name the internal TQOject name
*/
PMDockManager( TQWidget* mainWindow, const char* name = 0L );
@@ -848,14 +855,14 @@ public:
#ifndef NO_KDE2
/**
* Saves the current state of the dockmanager and of all controlled widgets.
- * State means here to save the geometry, visibility, parents, internal object names, orientation,
+ * State means here to save the tqgeometry, visibility, tqparents, internal object names, orientation,
* separator positions, dockwidget-group information, tab widget states (if it is a tab group) and
* last but not least some necessary things for recovering the dockmainwindow state.
*
* @param c the KDE configuration saver
* @param group the name of the section in KConfig
*/
- void writeConfig( KConfig* c = 0L, TQString group = TQString::null );
+ void writeConfig( KConfig* c = 0L, TQString group = TQString() );
/**
* Like writeConfig but reads the whole stuff in.
@@ -865,7 +872,7 @@ public:
* (TQObject::name) in the childDock variable of
* PMDockManager. This list in turn contains all
* PMDockWidgets (according to the PMDockWidget constructor).
- * So in principle, in order to restore a window layout,
+ * So in principle, in order to restore a window tqlayout,
* one must first construct all widgets, put each of them in a
* PMDockWidget and then call readConfig(). And for all that
* to work, each widget must have a unique name.
@@ -873,21 +880,21 @@ public:
* @param c the KDE configuration saver
* @param group the name of the section in KConfig
*/
- void readConfig ( KConfig* c = 0L, TQString group = TQString::null );
+ void readConfig ( KConfig* c = 0L, TQString group = TQString() );
#endif
/**
- * Saves the current dock window layout into a DOM tree below the given element.
+ * Saves the current dock window tqlayout into a DOM tree below the given element.
*/
void writeConfig(TQDomElement &base);
/**
- * Reads the current dock window layout from a DOM tree below the given element.
+ * Reads the current dock window tqlayout from a DOM tree below the given element.
*/
void readConfig(TQDomElement &base);
/**
* Shows all encapsulated widgets of all controlled dockwidgets and shows all dockwidgets which are
- * parent of a dockwidget tab group.
+ * tqparent of a dockwidget tab group.
*/
void activate();
@@ -982,7 +989,7 @@ signals:
void replaceDock( PMDockWidget* oldDock, PMDockWidget* newDock );
/**
- * Signals a dockwidget without parent (toplevel) is shown.
+ * Signals a dockwidget without tqparent (toplevel) is shown.
*/
void setDockDefaultPos( PMDockWidget* );
@@ -1036,7 +1043,7 @@ private:
* Finds the TQWidget recursively at the position given as parameter
*
* @param w a variable where the method puts the TQWidget at that position (instead of a return value)
- * @param p the parent widget where the recursive search should start from
+ * @param p the tqparent widget where the recursive search should start from
* @param pos global (desktop) position of the wanted dockwidget
*/
void findChildDockWidget( TQWidget*& w, const TQWidget* p, const TQPoint& pos );
@@ -1046,7 +1053,7 @@ public:
/**
* Finds all dockwidgets which are child, grandchild and so on of p.
*
- * @param p the parent widget where the recursive search starts from
+ * @param p the tqparent widget where the recursive search starts from
* @param l the widget list that contains the search result after the return of this method
*/
void findChildDockWidget( const TQWidget* p, TQWidgetList& l);
@@ -1108,7 +1115,7 @@ private:
PMDockWidget::DockPosition curPos;
/**
- * A QList of all objects that are important for docking.
+ * A TQList of all objects that are important for docking.
* Some serve as group widgets of dockwidgets, others encapsulate normal widgets.
*/
TQObjectList* childDock;
@@ -1208,6 +1215,7 @@ private:
class EXPORT_DOCKCLASS PMDockMainWindow : public KMainWindow, virtual public PartBase
{
Q_OBJECT
+ TQ_OBJECT
friend class PMDockManager;
@@ -1216,14 +1224,14 @@ public:
/**
* Constructs a dockmainwindow. It calls its base class constructor and does additional things concerning
* to the dock stuff:
- * @li information about the dock state of this' children gets initialized
+ * @li information about the dock state of this' tqchildren gets initialized
* @li a dockmanager is created...
* @li ...and gets initialized
* @li the main dockwidget is set to 0
*
* @param name object name
*/
- PMDockMainWindow( TQWidget* parent = 0L, const char *name = 0L, WFlags f = WType_TopLevel | WDestructiveClose );
+ PMDockMainWindow( TQWidget* tqparent = 0L, const char *name = 0L, WFlags f = WType_TopLevel | WDestructiveClose );
/**
* Destructs a dockmainwindow.
@@ -1258,19 +1266,19 @@ public:
*
* @param name TQObject name (default dockwidget caption)
* @param pixmap window icon (for instance shown when docked as tabwidget entry)
- * @param parent parent widget for the new dockwidget
+ * @param tqparent tqparent widget for the new dockwidget
* @param strCaption window title (shown when toplevel)
* @param strTabPageLabel title of the tab page (visible when in tab page mode), if it is "", only the icon will be shown; if it is 0L, the label is set to strCaption
* @return a pointer to the new created dockwidget
*/
- PMDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent = 0L, const TQString& strCaption = 0L, const TQString& strTabPageLabel = " ");
+ PMDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* tqparent = 0L, const TQString& strCaption = 0L, const TQString& strTabPageLabel = " ");
/**
- * Saves the current dock window layout into a DOM tree below the given element.
+ * Saves the current dock window tqlayout into a DOM tree below the given element.
*/
void writeDockConfig(TQDomElement &base);
/**
- * Reads the current dock window layout from a DOM tree below the given element.
+ * Reads the current dock window tqlayout from a DOM tree below the given element.
*/
void readDockConfig(TQDomElement &base);
@@ -1281,7 +1289,7 @@ public:
* @param c KDE class for saving configurations
* @param group name of section to write to
*/
- void writeDockConfig( KConfig* c = 0L, TQString group = TQString::null );
+ void writeDockConfig( KConfig* c = 0L, TQString group = TQString() );
/**
* It reads the current dock state from the given section of KConfig.
@@ -1289,7 +1297,7 @@ public:
* @param c KDE class for saving configurations
* @param group name of section to read from
*/
- void readDockConfig ( KConfig* c = 0L, TQString group = TQString::null );
+ void readDockConfig ( KConfig* c = 0L, TQString group = TQString() );
#endif
/**
@@ -1409,16 +1417,17 @@ private:
/* Joseph Wenninger jowenn@kde.org Experimental (Just all KMainWindow references changed to TQWidget, otherwise nearly exactly the
same as PMDockMainWindow*/
-class EXPORT_DOCKCLASS PMDockArea : public QWidget
+class EXPORT_DOCKCLASS PMDockArea : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
friend class PMDockManager;
public:
- PMDockArea( TQWidget* parent = 0L, const char *name = 0L);
+ PMDockArea( TQWidget* tqparent = 0L, const char *name = 0L);
virtual ~PMDockArea();
@@ -1428,14 +1437,14 @@ public:
void setMainDockWidget( PMDockWidget* );
PMDockWidget* getMainDockWidget(){ return mainDockWidget; }
- PMDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent = 0L, const TQString& strCaption = 0L, const TQString& strTabPageLabel = " ");
+ PMDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* tqparent = 0L, const TQString& strCaption = 0L, const TQString& strTabPageLabel = " ");
void writeDockConfig(TQDomElement &base);
void readDockConfig(TQDomElement &base);
#ifndef NO_KDE2
- void writeDockConfig( KConfig* c = 0L, TQString group = TQString::null );
- void readDockConfig ( KConfig* c = 0L, TQString group = TQString::null );
+ void writeDockConfig( KConfig* c = 0L, TQString group = TQString() );
+ void readDockConfig ( KConfig* c = 0L, TQString group = TQString() );
#endif
diff --git a/kpovmodeler/pmdockwidget_private.cpp b/kpovmodeler/pmdockwidget_private.cpp
index 7fd72420..5a86e25a 100644
--- a/kpovmodeler/pmdockwidget_private.cpp
+++ b/kpovmodeler/pmdockwidget_private.cpp
@@ -22,8 +22,8 @@
#include <tqpainter.h>
#include <tqcursor.h>
-PMDockSplitter::PMDockSplitter(TQWidget *parent, const char *name, Orientation orient, int pos, bool highResolution)
-: TQWidget(parent, name)
+PMDockSplitter::PMDockSplitter(TQWidget *tqparent, const char *name, Qt::Orientation orient, int pos, bool highResolution)
+: TQWidget(tqparent, name)
{
divider = 0L;
child0 = 0L;
@@ -49,7 +49,7 @@ void PMDockSplitter::activate(TQWidget *c0, TQWidget *c1)
divider->setLineWidth(1);
divider->raise();
- if (orientation == Horizontal)
+ if (orientation ==Qt::Horizontal)
divider->setCursor(TQCursor(sizeVerCursor));
else
divider->setCursor(TQCursor(sizeHorCursor));
@@ -68,21 +68,21 @@ void PMDockSplitter::setupMinMaxSize()
{
// Set the minimum and maximum sizes
int minx, maxx, miny, maxy;
- if (orientation == Horizontal) {
- miny = child0->minimumSize().height() + child1->minimumSize().height()+4;
- maxy = child0->maximumSize().height() + child1->maximumSize().height()+4;
- minx = (child0->minimumSize().width() > child1->minimumSize().width()) ? child0->minimumSize().width() : child1->minimumSize().width();
- maxx = (child0->maximumSize().width() > child1->maximumSize().width()) ? child0->maximumSize().width() : child1->maximumSize().width();
+ if (orientation ==Qt::Horizontal) {
+ miny = child0->tqminimumSize().height() + child1->tqminimumSize().height()+4;
+ maxy = child0->tqmaximumSize().height() + child1->tqmaximumSize().height()+4;
+ minx = (child0->tqminimumSize().width() > child1->tqminimumSize().width()) ? child0->tqminimumSize().width() : child1->tqminimumSize().width();
+ maxx = (child0->tqmaximumSize().width() > child1->tqmaximumSize().width()) ? child0->tqmaximumSize().width() : child1->tqmaximumSize().width();
miny = (miny > 4) ? miny : 4;
maxy = (maxy < 32000) ? maxy : 32000;
minx = (minx > 2) ? minx : 2;
maxx = (maxx < 32000) ? maxx : 32000;
} else {
- minx = child0->minimumSize().width() + child1->minimumSize().width()+4;
- maxx = child0->maximumSize().width() + child1->maximumSize().width()+4;
- miny = (child0->minimumSize().height() > child1->minimumSize().height()) ? child0->minimumSize().height() : child1->minimumSize().height();
- maxy = (child0->maximumSize().height() > child1->maximumSize().height()) ? child0->maximumSize().height() : child1->maximumSize().height();
+ minx = child0->tqminimumSize().width() + child1->tqminimumSize().width()+4;
+ maxx = child0->tqmaximumSize().width() + child1->tqmaximumSize().width()+4;
+ miny = (child0->tqminimumSize().height() > child1->tqminimumSize().height()) ? child0->tqminimumSize().height() : child1->tqminimumSize().height();
+ maxy = (child0->tqmaximumSize().height() > child1->tqmaximumSize().height()) ? child0->tqmaximumSize().height() : child1->tqmaximumSize().height();
minx = (minx > 4) ? minx : 4;
maxx = (maxx < 32000) ? maxx : 32000;
@@ -118,7 +118,7 @@ void PMDockSplitter::resizeEvent(TQResizeEvent *ev)
int factor = (mHighResolution)? 10000:100;
// real resize event, recalculate xpos
if (ev && mKeepSize && isVisible()) {
- if (orientation == Horizontal) {
+ if (orientation ==Qt::Horizontal) {
if (ev->oldSize().height() != ev->size().height())
xpos = factor * checkValue( child0->height()+1 ) / height();
} else {
@@ -126,8 +126,8 @@ void PMDockSplitter::resizeEvent(TQResizeEvent *ev)
xpos = factor * checkValue( child0->width()+1 ) / width();
}
}
- int position = checkValue( (orientation == Vertical ? width() : height()) * xpos/factor );
- if (orientation == Horizontal){
+ int position = checkValue( (orientation ==Qt::Vertical ? width() : height()) * xpos/factor );
+ if (orientation ==Qt::Horizontal){
child0->setGeometry(0, 0, width(), position);
child1->setGeometry(0, position+4, width(), height()-position-4);
divider->setGeometry(0, position, width(), 4);
@@ -142,24 +142,24 @@ void PMDockSplitter::resizeEvent(TQResizeEvent *ev)
int PMDockSplitter::checkValue( int position ) const
{
if (initialised){
- if (orientation == Vertical){
- if (position < (child0->minimumSize().width()))
- position = child0->minimumSize().width();
- if ((width()-4-position) < (child1->minimumSize().width()))
- position = width() - (child1->minimumSize().width()) -4;
+ if (orientation ==Qt::Vertical){
+ if (position < (child0->tqminimumSize().width()))
+ position = child0->tqminimumSize().width();
+ if ((width()-4-position) < (child1->tqminimumSize().width()))
+ position = width() - (child1->tqminimumSize().width()) -4;
} else {
- if (position < (child0->minimumSize().height()))
- position = (child0->minimumSize().height());
- if ((height()-4-position) < (child1->minimumSize().height()))
- position = height() - (child1->minimumSize().height()) -4;
+ if (position < (child0->tqminimumSize().height()))
+ position = (child0->tqminimumSize().height());
+ if ((height()-4-position) < (child1->tqminimumSize().height()))
+ position = height() - (child1->tqminimumSize().height()) -4;
}
}
if (position < 0) position = 0;
- if ((orientation == Vertical) && (position > width()))
+ if ((orientation ==Qt::Vertical) && (position > width()))
position = width();
- if ((orientation == Horizontal) && (position > height()))
+ if ((orientation ==Qt::Horizontal) && (position > height()))
position = height();
return position;
@@ -176,14 +176,14 @@ bool PMDockSplitter::eventFilter(TQObject *o, TQEvent *e)
mev= (TQMouseEvent*)e;
child0->setUpdatesEnabled(mOpaqueResize);
child1->setUpdatesEnabled(mOpaqueResize);
- if (orientation == Horizontal) {
+ if (orientation ==Qt::Horizontal) {
if (!mOpaqueResize) {
int position = checkValue( mapFromGlobal(mev->globalPos()).y() );
divider->move( 0, position );
} else {
xpos = factor * checkValue( mapFromGlobal(mev->globalPos()).y() ) / height();
resizeEvent(0);
- divider->repaint(true);
+ divider->tqrepaint(true);
}
} else {
if (!mOpaqueResize) {
@@ -192,7 +192,7 @@ bool PMDockSplitter::eventFilter(TQObject *o, TQEvent *e)
} else {
xpos = factor * checkValue( mapFromGlobal( mev->globalPos()).x() ) / width();
resizeEvent(0);
- divider->repaint(true);
+ divider->tqrepaint(true);
}
}
handled= true;
@@ -201,14 +201,14 @@ bool PMDockSplitter::eventFilter(TQObject *o, TQEvent *e)
child0->setUpdatesEnabled(true);
child1->setUpdatesEnabled(true);
mev= (TQMouseEvent*)e;
- if (orientation == Horizontal){
+ if (orientation ==Qt::Horizontal){
xpos = factor* checkValue( mapFromGlobal(mev->globalPos()).y() ) / height();
resizeEvent(0);
- divider->repaint(true);
+ divider->tqrepaint(true);
} else {
xpos = factor* checkValue( mapFromGlobal(mev->globalPos()).x() ) / width();
resizeEvent(0);
- divider->repaint(true);
+ divider->tqrepaint(true);
}
handled= true;
break;
@@ -221,7 +221,7 @@ bool PMDockSplitter::eventFilter(TQObject *o, TQEvent *e)
bool PMDockSplitter::event( TQEvent* e )
{
if ( e->type() == TQEvent::LayoutHint ){
- // change children min/max size
+ // change tqchildren min/max size
setupMinMaxSize();
setSeparatorPos(xpos);
}
@@ -238,15 +238,15 @@ void PMDockSplitter::updateName()
if ( !initialised ) return;
TQString new_name = TQString( child0->name() ) + "," + child1->name();
- parentWidget()->setName( new_name.latin1() );
- parentWidget()->setCaption( child0->caption() + "," + child1->caption() );
- parentWidget()->repaint( false );
+ tqparentWidget()->setName( new_name.latin1() );
+ tqparentWidget()->setCaption( child0->caption() + "," + child1->caption() );
+ tqparentWidget()->tqrepaint( false );
- ((PMDockWidget*)parentWidget())->firstName = child0->name();
- ((PMDockWidget*)parentWidget())->lastName = child1->name();
- ((PMDockWidget*)parentWidget())->splitterOrientation = orientation;
+ ((PMDockWidget*)tqparentWidget())->firstName = child0->name();
+ ((PMDockWidget*)tqparentWidget())->lastName = child1->name();
+ ((PMDockWidget*)tqparentWidget())->splitterOrientation = orientation;
- TQWidget* p = parentWidget()->parentWidget();
+ TQWidget* p = tqparentWidget()->tqparentWidget();
if ( p != 0L && p->inherits("PMDockSplitter" ) )
((PMDockSplitter*)p)->updateName();
}
@@ -288,11 +288,11 @@ bool PMDockSplitter::highResolution() const
/*************************************************************************/
-PMDockButton_Private::PMDockButton_Private( TQWidget *parent, const char * name )
-:TQPushButton( parent, name )
+PMDockButton_Private::PMDockButton_Private( TQWidget *tqparent, const char * name )
+:TQPushButton( tqparent, name )
{
moveMouse = false;
- setFocusPolicy( NoFocus );
+ setFocusPolicy( TQ_NoFocus );
}
PMDockButton_Private::~PMDockButton_Private()
@@ -301,7 +301,7 @@ PMDockButton_Private::~PMDockButton_Private()
void PMDockButton_Private::drawButton( TQPainter* p )
{
- p->fillRect( 0,0, width(), height(), TQBrush(colorGroup().brush(TQColorGroup::Background)) );
+ p->fillRect( 0,0, width(), height(), TQBrush(tqcolorGroup().brush(TQColorGroup::Background)) );
p->drawPixmap( (width() - pixmap()->width()) / 2, (height() - pixmap()->height()) / 2, *pixmap() );
if ( moveMouse && !isDown() ){
p->setPen( white );
@@ -309,12 +309,12 @@ void PMDockButton_Private::drawButton( TQPainter* p )
p->lineTo( 0, 0 );
p->lineTo( width() - 1, 0 );
- p->setPen( colorGroup().dark() );
+ p->setPen( tqcolorGroup().dark() );
p->lineTo( width() - 1, height() - 1 );
p->lineTo( 0, height() - 1 );
}
if ( isOn() || isDown() ){
- p->setPen( colorGroup().dark() );
+ p->setPen( tqcolorGroup().dark() );
p->moveTo( 0, height() - 1 );
p->lineTo( 0, 0 );
p->lineTo( width() - 1, 0 );
@@ -328,13 +328,13 @@ void PMDockButton_Private::drawButton( TQPainter* p )
void PMDockButton_Private::enterEvent( TQEvent * )
{
moveMouse = true;
- repaint();
+ tqrepaint();
}
void PMDockButton_Private::leaveEvent( TQEvent * )
{
moveMouse = false;
- repaint();
+ tqrepaint();
}
/*************************************************************************/
@@ -361,12 +361,12 @@ void PMDockWidgetPrivate::slotFocusEmbeddedWidget(TQWidget* w)
{
if (w) {
TQWidget* embeddedWdg = ((PMDockWidget*)w)->getWidget();
- if (embeddedWdg && ((embeddedWdg->focusPolicy() == TQWidget::ClickFocus) || (embeddedWdg->focusPolicy() == TQWidget::StrongFocus))) {
+ if (embeddedWdg && ((embeddedWdg->focusPolicy() == TQ_ClickFocus) || (embeddedWdg->focusPolicy() == TQ_StrongFocus))) {
embeddedWdg->setFocus();
}
}
}
-#ifndef NO_INCLUDE_MOCFILES // for Qt-only projects, because tmake doesn't take this name
+#ifndef NO_INCLUDE_TQMOCFILES // for TQt-only projects, because tmake doesn't take this name
#include "pmdockwidget_private.moc"
#endif
diff --git a/kpovmodeler/pmdockwidget_private.h b/kpovmodeler/pmdockwidget_private.h
index efd8cd14..a2111a90 100644
--- a/kpovmodeler/pmdockwidget_private.h
+++ b/kpovmodeler/pmdockwidget_private.h
@@ -18,7 +18,7 @@
*/
/*
- IMPORTANT Note: This file compiles also in Qt-only mode by using the NO_KDE2 precompiler definition
+ IMPORTANT Note: This file compiles also in TQt-only mode by using the NO_KDE2 precompiler definition
*/
#ifndef KDOCKWIDGET_PRIVATE_H
@@ -39,11 +39,12 @@ class TQFrame;
*
* @author Max Judin.
*/
-class PMDockSplitter : public QWidget
+class PMDockSplitter : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
- PMDockSplitter(TQWidget *parent= 0, const char *name= 0, Orientation orient= Vertical, int pos= 50, bool highResolution=false);
+ PMDockSplitter(TQWidget *tqparent= 0, const char *name= 0, Qt::Orientation orient=Qt::Vertical, int pos= 50, bool highResolution=false);
virtual ~PMDockSplitter(){};
void activate(TQWidget *c0, TQWidget *c1 = 0L);
@@ -70,7 +71,7 @@ public:
bool highResolution() const;
// MODIFICATION (Zehender)
- Orientation splitterOrientation( ) const { return orientation; }
+ Qt::Orientation splitterOrientation( ) const { return orientation; }
protected:
int checkValue( int ) const;
@@ -80,7 +81,7 @@ private:
void setupMinMaxSize();
TQWidget *child0, *child1;
- Orientation orientation;
+ Qt::Orientation orientation;
bool initialised;
TQFrame* divider;
int xpos;
@@ -93,11 +94,12 @@ private:
*
* @author Max Judin.
*/
-class PMDockButton_Private : public QPushButton
+class PMDockButton_Private : public TQPushButton
{
Q_OBJECT
+ TQ_OBJECT
public:
- PMDockButton_Private( TQWidget *parent=0, const char *name=0 );
+ PMDockButton_Private( TQWidget *tqparent=0, const char *name=0 );
~PMDockButton_Private();
protected:
@@ -112,9 +114,10 @@ private:
/**
* additional PMDockWidget stuff (private)
*/
-class PMDockWidgetPrivate : public QObject
+class PMDockWidgetPrivate : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
PMDockWidgetPrivate();
~PMDockWidgetPrivate();
diff --git a/kpovmodeler/pmdocumentationmap.cpp b/kpovmodeler/pmdocumentationmap.cpp
index df2bf620..8fe29ce6 100644
--- a/kpovmodeler/pmdocumentationmap.cpp
+++ b/kpovmodeler/pmdocumentationmap.cpp
@@ -30,7 +30,7 @@ KStaticDeleter<PMDocumentationMap> PMDocumentationMap::s_staticDeleter;
TQString PMDocumentationVersion::documentation( const TQString& className ) const
{
- if( m_map.contains( className ) )
+ if( m_map.tqcontains( className ) )
return m_map[className];
return m_index;
}
diff --git a/kpovmodeler/pmdragwidget.cpp b/kpovmodeler/pmdragwidget.cpp
index bc097c46..7e800f72 100644
--- a/kpovmodeler/pmdragwidget.cpp
+++ b/kpovmodeler/pmdragwidget.cpp
@@ -17,8 +17,8 @@
#include "pmdragwidget.h"
-PMDragWidget::PMDragWidget( TQWidget* parent, const char* name, WFlags f )
- : TQWidget( parent, name, f )
+PMDragWidget::PMDragWidget( TQWidget* tqparent, const char* name, WFlags f )
+ : TQWidget( tqparent, name, f )
{
dragging = false;
}
diff --git a/kpovmodeler/pmdragwidget.h b/kpovmodeler/pmdragwidget.h
index 10c30e16..79efb3f6 100644
--- a/kpovmodeler/pmdragwidget.h
+++ b/kpovmodeler/pmdragwidget.h
@@ -31,11 +31,12 @@
*
* It will emit startDrag when it's time to start a drag.
*/
-class PMDragWidget : public QWidget
+class PMDragWidget : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
- PMDragWidget( TQWidget* parent = 0, const char* name = 0, WFlags f = 0 );
+ PMDragWidget( TQWidget* tqparent = 0, const char* name = 0, WFlags f = 0 );
virtual void startDrag( );
diff --git a/kpovmodeler/pmenumproperty.cpp b/kpovmodeler/pmenumproperty.cpp
index f82579ad..73a3446f 100644
--- a/kpovmodeler/pmenumproperty.cpp
+++ b/kpovmodeler/pmenumproperty.cpp
@@ -40,7 +40,7 @@ TQStringList PMEnumProperty::enumValues( ) const
bool PMEnumProperty::setProtected( PMObject* obj, const PMVariant& v )
{
- PMEnumStringValueMap::iterator it = m_stringMap.find( v.stringData( ) );
+ PMEnumStringValueMap::iterator it = m_stringMap.tqfind( v.stringData( ) );
if( it == m_stringMap.end( ) )
return false;
setEnum( obj, it.data( ) );
@@ -50,8 +50,8 @@ bool PMEnumProperty::setProtected( PMObject* obj, const PMVariant& v )
PMVariant PMEnumProperty::getProtected( const PMObject* obj )
{
int v = getEnum( obj );
- PMEnumValueStringMap::const_iterator it = m_valueMap.find( v );
+ PMEnumValueStringMap::const_iterator it = m_valueMap.tqfind( v );
if( it == m_valueMap.end( ) )
- return PMVariant( TQString::null );
+ return PMVariant( TQString() );
return it.data( );
}
diff --git a/kpovmodeler/pmerrordialog.cpp b/kpovmodeler/pmerrordialog.cpp
index eb920fb0..b8a11630 100644
--- a/kpovmodeler/pmerrordialog.cpp
+++ b/kpovmodeler/pmerrordialog.cpp
@@ -29,8 +29,8 @@
TQSize PMErrorDialog::s_size = TQSize( 150, 200 );
PMErrorDialog::PMErrorDialog( const PMMessageList& messages, int errorFlags,
- TQWidget* parent, const char* name )
- : KDialogBase( parent, name, true, i18n( "Messages" ),
+ TQWidget* tqparent, const char* name )
+ : KDialogBase( tqparent, name, true, i18n( "Messages" ),
Ok | Cancel, Cancel )
{
TQVBox* page = makeVBoxMainWidget( );
@@ -51,16 +51,16 @@ PMErrorDialog::PMErrorDialog( const PMMessageList& messages, int errorFlags,
for( ; pit.current( ); ++pit )
{
PMObject* obj = pit.current( )->linkedObject( );
- for( ; obj; obj = obj->parent( ) )
+ for( ; obj; obj = obj->tqparent( ) )
{
- TQPtrList<PMMessage>* pList = m_messageDict.find( obj );
+ TQPtrList<PMMessage>* pList = m_messageDict.tqfind( obj );
if( !pList )
{
pList = new TQPtrList<PMMessage>;
m_messageDict.insert( obj, pList );
}
pList->append( pit.current( ) );
- if( !obj->parent( ) )
+ if( !obj->tqparent( ) )
{
if( obj->type( ) != "scene" )
{
diff --git a/kpovmodeler/pmerrordialog.h b/kpovmodeler/pmerrordialog.h
index 93981eab..8310b3ad 100644
--- a/kpovmodeler/pmerrordialog.h
+++ b/kpovmodeler/pmerrordialog.h
@@ -42,9 +42,10 @@ class PMObject;
class PMErrorDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
- * Creates a modal PMErrorDialog with parent and name.
+ * Creates a modal PMErrorDialog with tqparent and name.
*
* messages is the message list. If the list contains a message of type
* FatalError, the 'Proceed" button will not be shown.
@@ -53,7 +54,7 @@ public:
* should be continued.
*/
PMErrorDialog( const PMMessageList& messages, int errorFlags,
- TQWidget* parent = 0, const char* name = 0 );
+ TQWidget* tqparent = 0, const char* name = 0 );
static void saveConfig( KConfig* cfg );
static void restoreConfig( KConfig* cfg );
diff --git a/kpovmodeler/pmfactory.cpp b/kpovmodeler/pmfactory.cpp
index 488db1ce..a9bdaee8 100644
--- a/kpovmodeler/pmfactory.cpp
+++ b/kpovmodeler/pmfactory.cpp
@@ -54,9 +54,9 @@ PMFactory::~PMFactory( )
s_aboutData = 0L;
}
-KParts::Part* PMFactory::createPartObject( TQWidget* parentWidget,
+KParts::Part* PMFactory::createPartObject( TQWidget* tqparentWidget,
const char* widgetName,
- TQObject* parent, const char* name,
+ TQObject* tqparent, const char* name,
const char* classname,
const TQStringList& /*args*/ )
{
@@ -65,8 +65,8 @@ KParts::Part* PMFactory::createPartObject( TQWidget* parentWidget,
bool readwrite = !( ( strcmp( classname, "Browser/View" ) == 0 )
|| ( strcmp( classname, "KParts::ReadOnlyPart" ) == 0 ) );
- KParts::ReadWritePart *part = new PMPart( parentWidget, widgetName,
- parent, name, readwrite );
+ KParts::ReadWritePart *part = new PMPart( tqparentWidget, widgetName,
+ tqparent, name, readwrite );
return part;
}
diff --git a/kpovmodeler/pmfactory.h b/kpovmodeler/pmfactory.h
index 56797935..ee649d84 100644
--- a/kpovmodeler/pmfactory.h
+++ b/kpovmodeler/pmfactory.h
@@ -28,13 +28,14 @@ class KInstance;
class PMFactory : public KParts::Factory
{
Q_OBJECT
+ TQ_OBJECT
public:
PMFactory( );
virtual ~PMFactory( );
- virtual KParts::Part* createPartObject( TQWidget* parentWidget,
+ virtual KParts::Part* createPartObject( TQWidget* tqparentWidget,
const char* widgetName,
- TQObject* parent, const char* name,
+ TQObject* tqparent, const char* name,
const char* classname,
const TQStringList& args );
diff --git a/kpovmodeler/pmfiledialog.cpp b/kpovmodeler/pmfiledialog.cpp
index d8da0f4d..65ad11c8 100644
--- a/kpovmodeler/pmfiledialog.cpp
+++ b/kpovmodeler/pmfiledialog.cpp
@@ -22,13 +22,13 @@
#include <kfilefiltercombo.h>
-PMFileDialog::PMFileDialog( const TQString& startDir, const TQString& filter, TQWidget* parent, const char* name, bool modal )
- : KFileDialog( startDir, filter, parent, name, modal )
+PMFileDialog::PMFileDialog( const TQString& startDir, const TQString& filter, TQWidget* tqparent, const char* name, bool modal )
+ : KFileDialog( startDir, filter, tqparent, name, modal )
{
}
-TQString PMFileDialog::getImportFileName( TQWidget* parent, PMPart* part,
+TQString PMFileDialog::getImportFileName( TQWidget* tqparent, PMPart* part,
PMIOFormat*& format )
{
PMIOManager* manager = part->ioManager( );
@@ -52,7 +52,7 @@ TQString PMFileDialog::getImportFileName( TQWidget* parent, PMPart* part,
}
}
- PMFileDialog dlg( TQString::null, filter, parent, "import file dialog", true );
+ PMFileDialog dlg( TQString(), filter, tqparent, "import file dialog", true );
dlg.setOperationMode( Opening );
dlg.setMode( KFile::File | KFile::LocalOnly );
dlg.setCaption( i18n( "Import" ) );
@@ -64,7 +64,7 @@ TQString PMFileDialog::getImportFileName( TQWidget* parent, PMPart* part,
return dlg.selectedFile( );
}
-TQString PMFileDialog::getExportFileName( TQWidget* parent, PMPart* part,
+TQString PMFileDialog::getExportFileName( TQWidget* tqparent, PMPart* part,
PMIOFormat*& format, TQString& selectedFilter )
{
PMIOManager* manager = part->ioManager( );
@@ -88,7 +88,7 @@ TQString PMFileDialog::getExportFileName( TQWidget* parent, PMPart* part,
}
}
- PMFileDialog dlg( TQString::null, filter, parent, "export file dialog", true );
+ PMFileDialog dlg( TQString(), filter, tqparent, "export file dialog", true );
dlg.setOperationMode( Saving );
dlg.setMode( KFile::File | KFile::LocalOnly );
dlg.setCaption( i18n( "Export" ) );
diff --git a/kpovmodeler/pmfiledialog.h b/kpovmodeler/pmfiledialog.h
index 7843b73d..7aa69b70 100644
--- a/kpovmodeler/pmfiledialog.h
+++ b/kpovmodeler/pmfiledialog.h
@@ -38,22 +38,23 @@ class PMPart;
class PMFileDialog : public KFileDialog
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Default constructor, use the static methods
* @ref getImportFileName or @ref getExportFileName instead
*/
- PMFileDialog( const TQString& startDir, const TQString& filter, TQWidget* parent, const char* name, bool modal );
+ PMFileDialog( const TQString& startDir, const TQString& filter, TQWidget* tqparent, const char* name, bool modal );
/**
* Opens a modal file dialog and returns a selected file and the chosen
* file format.
*/
- static TQString getImportFileName( TQWidget* parent, PMPart* part, PMIOFormat*& format );
+ static TQString getImportFileName( TQWidget* tqparent, PMPart* part, PMIOFormat*& format );
/**
* Opens a modal file dialog and returns a selected file and the chosen
* file format and filter.
*/
- static TQString getExportFileName( TQWidget* parent, PMPart* part,
+ static TQString getExportFileName( TQWidget* tqparent, PMPart* part,
PMIOFormat*& format, TQString& filter );
};
diff --git a/kpovmodeler/pmfinish.cpp b/kpovmodeler/pmfinish.cpp
index 52bd92c8..190925fb 100644
--- a/kpovmodeler/pmfinish.cpp
+++ b/kpovmodeler/pmfinish.cpp
@@ -130,11 +130,11 @@ PMFinish::~PMFinish( )
{
}
-PMMetaObject* PMFinish::metaObject( ) const
+PMMetaObject* PMFinish::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "Finish", Base::metaObject( ),
+ s_pMetaObject = new PMMetaObject( "Finish", Base::tqmetaObject( ),
createNewFinish );
s_pMetaObject->addProperty(
new PMFinishProperty( "ambientColor", &PMFinish::setAmbientColor, &PMFinish::ambientColor ) );
@@ -637,9 +637,9 @@ void PMFinish::setIridTurbulence( double c )
}
}
-PMDialogEditBase* PMFinish::editWidget( TQWidget* parent ) const
+PMDialogEditBase* PMFinish::editWidget( TQWidget* tqparent ) const
{
- return new PMFinishEdit( parent );
+ return new PMFinishEdit( tqparent );
}
void PMFinish::restoreMemento( PMMemento* s )
diff --git a/kpovmodeler/pmfinish.h b/kpovmodeler/pmfinish.h
index c12f31b1..a33f9d40 100644
--- a/kpovmodeler/pmfinish.h
+++ b/kpovmodeler/pmfinish.h
@@ -53,7 +53,7 @@ public:
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void cleanUp( ) const;
@@ -65,7 +65,7 @@ public:
/**
* Returns a new @ref PMFinishEdit
*/
- virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
+ virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
/** */
virtual TQString pixmap( ) const { return TQString( "pmfinish" ); }
diff --git a/kpovmodeler/pmfinishedit.cpp b/kpovmodeler/pmfinishedit.cpp
index 38766f94..997fe901 100644
--- a/kpovmodeler/pmfinishedit.cpp
+++ b/kpovmodeler/pmfinishedit.cpp
@@ -29,8 +29,8 @@
#include <kdialog.h>
-PMFinishEdit::PMFinishEdit( TQWidget* parent, const char* name )
- : Base( parent, name )
+PMFinishEdit::PMFinishEdit( TQWidget* tqparent, const char* name )
+ : Base( tqparent, name )
{
m_pDisplayedObject = 0;
}
@@ -42,80 +42,80 @@ void PMFinishEdit::createTopWidgets( )
Base::createTopWidgets( );
hl = new TQHBoxLayout( topLayout( ) );
- TQGridLayout* layout = new TQGridLayout( hl, 2, 2 );
+ TQGridLayout* tqlayout = new TQGridLayout( hl, 2, 2 );
m_pEnableAmbientEdit = new TQCheckBox( i18n( "Ambient color" ), this );
m_pAmbientColorLabel = new TQLabel( i18n( "Color:" ), this );
m_pAmbientColorEdit = new PMColorEdit( true, this );
- layout->addMultiCellWidget( m_pEnableAmbientEdit, 0, 0, 0, 1 );
- layout->addWidget( m_pAmbientColorLabel, 1, 0, AlignTop );
- layout->addWidget( m_pAmbientColorEdit, 1, 1 );
+ tqlayout->addMultiCellWidget( m_pEnableAmbientEdit, 0, 0, 0, 1 );
+ tqlayout->addWidget( m_pAmbientColorLabel, 1, 0, AlignTop );
+ tqlayout->addWidget( m_pAmbientColorEdit, 1, 1 );
hl->addStretch( 1 );
hl = new TQHBoxLayout( topLayout( ) );
- layout = new TQGridLayout( hl, 4, 2 );
+ tqlayout = new TQGridLayout( hl, 4, 2 );
m_pEnableDiffuseEdit = new TQCheckBox( i18n( "Diffuse:" ), this );
m_pDiffuseEdit = new PMFloatEdit( this );
- layout->addWidget( m_pEnableDiffuseEdit, 0, 0 );
- layout->addWidget( m_pDiffuseEdit, 0, 1 );
+ tqlayout->addWidget( m_pEnableDiffuseEdit, 0, 0 );
+ tqlayout->addWidget( m_pDiffuseEdit, 0, 1 );
m_pEnableBrillianceEdit = new TQCheckBox( i18n( "Brilliance:" ), this );
m_pBrillianceEdit = new PMFloatEdit( this );
- layout->addWidget( m_pEnableBrillianceEdit, 1, 0 );
- layout->addWidget( m_pBrillianceEdit, 1, 1 );
+ tqlayout->addWidget( m_pEnableBrillianceEdit, 1, 0 );
+ tqlayout->addWidget( m_pBrillianceEdit, 1, 1 );
m_pEnableCrandEdit = new TQCheckBox( i18n( "Crand:" ), this );
m_pCrandEdit = new PMFloatEdit( this );
- layout->addWidget( m_pEnableCrandEdit, 2, 0 );
- layout->addWidget( m_pCrandEdit, 2, 1 );
+ tqlayout->addWidget( m_pEnableCrandEdit, 2, 0 );
+ tqlayout->addWidget( m_pCrandEdit, 2, 1 );
m_pConserveEnergyEdit = new TQCheckBox(
i18n( "Conserve energy for reflection" ), this );
- layout->addMultiCellWidget( m_pConserveEnergyEdit, 3, 3, 0, 1 );
+ tqlayout->addMultiCellWidget( m_pConserveEnergyEdit, 3, 3, 0, 1 );
hl->addStretch( 1 );
hl = new TQHBoxLayout( topLayout( ) );
- layout = new TQGridLayout( hl, 2, 2 );
+ tqlayout = new TQGridLayout( hl, 2, 2 );
m_pEnablePhongEdit = new TQCheckBox( i18n( "Phong:" ), this );
m_pPhongEdit = new PMFloatEdit( this );
m_pEnablePhongSizeEdit = new TQCheckBox( i18n( "Phong size:" ), this );
m_pPhongSizeEdit = new PMFloatEdit( this );
- layout->addWidget( m_pEnablePhongEdit, 0, 0 );
- layout->addWidget( m_pPhongEdit, 0, 1 );
- layout->addWidget( m_pEnablePhongSizeEdit, 1, 0 );
- layout->addWidget( m_pPhongSizeEdit, 1, 1 );
+ tqlayout->addWidget( m_pEnablePhongEdit, 0, 0 );
+ tqlayout->addWidget( m_pPhongEdit, 0, 1 );
+ tqlayout->addWidget( m_pEnablePhongSizeEdit, 1, 0 );
+ tqlayout->addWidget( m_pPhongSizeEdit, 1, 1 );
hl->addStretch( 1 );
hl = new TQHBoxLayout( topLayout( ) );
- layout = new TQGridLayout( hl, 3, 2 );
+ tqlayout = new TQGridLayout( hl, 3, 2 );
m_pEnableSpecularEdit = new TQCheckBox( i18n( "Specular:" ), this );
m_pSpecularEdit = new PMFloatEdit( this );
- layout->addWidget( m_pEnableSpecularEdit, 0, 0 );
- layout->addWidget( m_pSpecularEdit, 0, 1 );
+ tqlayout->addWidget( m_pEnableSpecularEdit, 0, 0 );
+ tqlayout->addWidget( m_pSpecularEdit, 0, 1 );
m_pEnableRoughnessEdit = new TQCheckBox( i18n( "Roughness:" ), this );
m_pRoughnessEdit = new PMFloatEdit( this );
- layout->addWidget( m_pEnableRoughnessEdit, 1, 0 );
- layout->addWidget( m_pRoughnessEdit, 1, 1 );
+ tqlayout->addWidget( m_pEnableRoughnessEdit, 1, 0 );
+ tqlayout->addWidget( m_pRoughnessEdit, 1, 1 );
m_pEnableMetallicEdit = new TQCheckBox( i18n( "Metallic:" ), this );
m_pMetallicEdit = new PMFloatEdit( this );
- layout->addWidget( m_pEnableMetallicEdit, 2, 0 );
- layout->addWidget( m_pMetallicEdit, 2, 1 );
+ tqlayout->addWidget( m_pEnableMetallicEdit, 2, 0 );
+ tqlayout->addWidget( m_pMetallicEdit, 2, 1 );
hl->addStretch( 1 );
hl = new TQHBoxLayout( topLayout( ) );
- layout = new TQGridLayout( hl, 6, 2 );
+ tqlayout = new TQGridLayout( hl, 6, 2 );
m_pIridEdit = new TQCheckBox( i18n( "Iridiscence" ), this );
- layout->addMultiCellWidget( m_pIridEdit, 0, 0, 0, 1 );
+ tqlayout->addMultiCellWidget( m_pIridEdit, 0, 0, 0, 1 );
m_pIridAmountLabel = new TQLabel( i18n( "Amount:" ), this );
m_pIridAmountEdit = new PMFloatEdit( this );
- layout->addWidget( m_pIridAmountLabel, 1, 0 );
- layout->addWidget( m_pIridAmountEdit, 1, 1 );
+ tqlayout->addWidget( m_pIridAmountLabel, 1, 0 );
+ tqlayout->addWidget( m_pIridAmountEdit, 1, 1 );
m_pIridThicknessLabel = new TQLabel( i18n( "Thickness:" ), this );
m_pIridThicknessEdit = new PMFloatEdit( this );
- layout->addWidget( m_pIridThicknessLabel, 2, 0 );
- layout->addWidget( m_pIridThicknessEdit, 2, 1 );
+ tqlayout->addWidget( m_pIridThicknessLabel, 2, 0 );
+ tqlayout->addWidget( m_pIridThicknessEdit, 2, 1 );
m_pIridTurbulenceEdit = new PMFloatEdit( this );
m_pIridTurbulenceLabel = new TQLabel( i18n( "Turbulence:" ), this );
- layout->addWidget( m_pIridTurbulenceLabel, 3, 0 );
- layout->addWidget( m_pIridTurbulenceEdit, 3, 1 );
+ tqlayout->addWidget( m_pIridTurbulenceLabel, 3, 0 );
+ tqlayout->addWidget( m_pIridTurbulenceEdit, 3, 1 );
m_pEnableReflectionEdit = new TQCheckBox( i18n( "Reflection" ), this );
- layout->addMultiCellWidget( m_pEnableReflectionEdit, 4, 4, 0, 1 );
+ tqlayout->addMultiCellWidget( m_pEnableReflectionEdit, 4, 4, 0, 1 );
hl->addStretch( 1 );
m_pReflectionWidget = new TQWidget( this );
@@ -151,7 +151,7 @@ void PMFinishEdit::createTopWidgets( )
gl->addWidget( m_pEnableRefMetallicEdit, 3, 0 );
gl->addWidget( m_pReflectionMetallicEdit, 3, 1 );
vl->addStretch( 1 );
- layout->addMultiCellWidget( m_pReflectionWidget, 5, 5, 0, 1 );
+ tqlayout->addMultiCellWidget( m_pReflectionWidget, 5, 5, 0, 1 );
connect( m_pAmbientColorEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
diff --git a/kpovmodeler/pmfinishedit.h b/kpovmodeler/pmfinishedit.h
index e72aef73..9d37ce14 100644
--- a/kpovmodeler/pmfinishedit.h
+++ b/kpovmodeler/pmfinishedit.h
@@ -39,12 +39,13 @@ class TQWidget;
class PMFinishEdit : public PMTextureBaseEdit
{
Q_OBJECT
+ TQ_OBJECT
typedef PMTextureBaseEdit Base;
public:
/**
- * Creates a PMFinishEdit with parent and name
+ * Creates a PMFinishEdit with tqparent and name
*/
- PMFinishEdit( TQWidget* parent, const char* name = 0 );
+ PMFinishEdit( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displayObject( PMObject* o );
diff --git a/kpovmodeler/pmfog.cpp b/kpovmodeler/pmfog.cpp
index 6af4a2cb..1ece2757 100644
--- a/kpovmodeler/pmfog.cpp
+++ b/kpovmodeler/pmfog.cpp
@@ -81,11 +81,11 @@ PMFog::~PMFog( )
{
}
-PMMetaObject* PMFog::metaObject( ) const
+PMMetaObject* PMFog::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "Fog", Base::metaObject( ),
+ s_pMetaObject = new PMMetaObject( "Fog", Base::tqmetaObject( ),
createNewFog );
s_pMetaObject->addProperty(
new PMFogProperty( "fogType", &PMFog::setFogType, &PMFog::fogType ) );
@@ -284,9 +284,9 @@ void PMFog::setUp( const PMVector& c )
}
}
-PMDialogEditBase* PMFog::editWidget( TQWidget* parent ) const
+PMDialogEditBase* PMFog::editWidget( TQWidget* tqparent ) const
{
- return new PMFogEdit( parent );
+ return new PMFogEdit( tqparent );
}
void PMFog::restoreMemento( PMMemento* s )
diff --git a/kpovmodeler/pmfog.h b/kpovmodeler/pmfog.h
index fc6d7095..2eac23a8 100644
--- a/kpovmodeler/pmfog.h
+++ b/kpovmodeler/pmfog.h
@@ -54,7 +54,7 @@ public:
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void cleanUp( ) const;
@@ -66,7 +66,7 @@ public:
/**
* Returns a new @ref PMFogEdit
*/
- virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
+ virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
/** */
virtual TQString pixmap( ) const { return TQString( "pmfog" ); }
diff --git a/kpovmodeler/pmfogedit.cpp b/kpovmodeler/pmfogedit.cpp
index ec9880c1..d993ad3f 100644
--- a/kpovmodeler/pmfogedit.cpp
+++ b/kpovmodeler/pmfogedit.cpp
@@ -30,8 +30,8 @@
#include <kmessagebox.h>
#include <kdialog.h>
-PMFogEdit::PMFogEdit( TQWidget* parent, const char* name )
- : Base( parent, name )
+PMFogEdit::PMFogEdit( TQWidget* tqparent, const char* name )
+ : Base( tqparent, name )
{
m_pDisplayedObject = 0;
}
diff --git a/kpovmodeler/pmfogedit.h b/kpovmodeler/pmfogedit.h
index 5a33cf95..3331f167 100644
--- a/kpovmodeler/pmfogedit.h
+++ b/kpovmodeler/pmfogedit.h
@@ -42,12 +42,13 @@ class TQLabel;
class PMFogEdit : public PMTextureBaseEdit
{
Q_OBJECT
+ TQ_OBJECT
typedef PMTextureBaseEdit Base;
public:
/**
- * Creates a PMFogEdit with parent and name
+ * Creates a PMFogEdit with tqparent and name
*/
- PMFogEdit( TQWidget* parent, const char* name = 0 );
+ PMFogEdit( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displayObject( PMObject* o );
diff --git a/kpovmodeler/pmformulalabel.cpp b/kpovmodeler/pmformulalabel.cpp
index 71ba62b6..1f1ffbf9 100644
--- a/kpovmodeler/pmformulalabel.cpp
+++ b/kpovmodeler/pmformulalabel.cpp
@@ -46,8 +46,8 @@ TQString PMFormulaLabel::s_digit[10] =
TQString PMFormulaLabel::s_nullString = TQString( "= 0" );
-PMFormulaLabel::PMFormulaLabel( const PMPolynomExponents& exp, TQWidget* parent, const char* name )
- : TQWidget( parent, name )
+PMFormulaLabel::PMFormulaLabel( const PMPolynomExponents& exp, TQWidget* tqparent, const char* name )
+ : TQWidget( tqparent, name )
{
m_exponents[0] = exp.exponent( 0 );
m_exponents[1] = exp.exponent( 1 );
@@ -56,8 +56,8 @@ PMFormulaLabel::PMFormulaLabel( const PMPolynomExponents& exp, TQWidget* parent,
calculateSizeHint( );
}
-PMFormulaLabel::PMFormulaLabel( int x, int y, int z, TQWidget* parent, const char* name )
- : TQWidget( parent, name )
+PMFormulaLabel::PMFormulaLabel( int x, int y, int z, TQWidget* tqparent, const char* name )
+ : TQWidget( tqparent, name )
{
m_exponents[0] = x;
m_exponents[1] = y;
@@ -78,13 +78,13 @@ void PMFormulaLabel::drawContents( TQPainter* p )
int sum = m_exponents[0] + m_exponents[1] + m_exponents[2];
if( sum == 0 )
- p->drawText( cr, Qt::AlignVCenter | Qt::AlignLeft, s_nullString );
+ p->drawText( cr, TQt::AlignVCenter | TQt::AlignLeft, s_nullString );
else
{
// draw dot
int center = ( cr.top( ) + cr.bottom( ) ) / 2;
int rad = c_dotSize / 2;
- p->setBrush( TQBrush( colorGroup( ).text( ) ) );
+ p->setBrush( TQBrush( tqcolorGroup( ).text( ) ) );
p->drawEllipse( cr.left( ), center - rad, c_dotSize, c_dotSize );
cr.setLeft( cr.left( ) + c_dotSize + c_indent );
@@ -98,13 +98,13 @@ void PMFormulaLabel::drawContents( TQPainter* p )
if( m_exponents[i] > 0 )
{
- p->drawText( cr, Qt::AlignVCenter | Qt::AlignLeft, s_xyz[i] );
+ p->drawText( cr, TQt::AlignVCenter | TQt::AlignLeft, s_xyz[i] );
cr.setLeft( cr.left( ) + m1.width( s_xyz[i] ) );
if( m_exponents[i] > 1 )
{
cr.setBottom( cr.bottom( ) - up );
p->setFont( f2 );
- p->drawText( cr, Qt::AlignVCenter | Qt::AlignLeft,
+ p->drawText( cr, TQt::AlignVCenter | TQt::AlignLeft,
s_digit[m_exponents[i]] );
cr.setLeft( cr.left( ) + m2.width( s_digit[m_exponents[i]] ) + 1 );
cr.setBottom( cr.bottom( ) + up );
@@ -131,7 +131,7 @@ void PMFormulaLabel::calculateSizeHint( )
TQFontMetrics m1( font( ) );
if( sum == 0 )
- m_sizeHint.setWidth( m1.width( s_nullString ) );
+ m_tqsizeHint.setWidth( m1.width( s_nullString ) );
else
{
TQFontMetrics m2( exponentFont( ) );
@@ -146,19 +146,19 @@ void PMFormulaLabel::calculateSizeHint( )
width += m2.width( s_digit[m_exponents[i]] ) + 1;
}
}
- m_sizeHint.setWidth( width );
+ m_tqsizeHint.setWidth( width );
}
- m_sizeHint.setHeight( m1.height( ) + 7 );
+ m_tqsizeHint.setHeight( m1.height( ) + 7 );
}
-TQSize PMFormulaLabel::sizeHint( ) const
+TQSize PMFormulaLabel::tqsizeHint( ) const
{
- return minimumSizeHint( );
+ return tqminimumSizeHint( );
}
-TQSize PMFormulaLabel::minimumSizeHint( ) const
+TQSize PMFormulaLabel::tqminimumSizeHint( ) const
{
- return m_sizeHint;
+ return m_tqsizeHint;
}
void PMFormulaLabel::fontChange( const TQFont& )
diff --git a/kpovmodeler/pmformulalabel.h b/kpovmodeler/pmformulalabel.h
index ee2cace5..bac843d2 100644
--- a/kpovmodeler/pmformulalabel.h
+++ b/kpovmodeler/pmformulalabel.h
@@ -31,23 +31,23 @@ class PMPolynomExponents;
* TQLabel with a rich text to display a polynom for the quadric,
* cubic, quartic and polynom objects.
*/
-class PMFormulaLabel : public QWidget
+class PMFormulaLabel : public TQWidget
{
public:
/**
* Displays the exponents of the @ref PMPolynomExponents
*/
- PMFormulaLabel( const PMPolynomExponents& exp, TQWidget* parent, const char* name = 0 );
+ PMFormulaLabel( const PMPolynomExponents& exp, TQWidget* tqparent, const char* name = 0 );
/**
* Displays the given exponents
*/
- PMFormulaLabel( int x, int y, int z, TQWidget* parent, const char* name = 0 );
+ PMFormulaLabel( int x, int y, int z, TQWidget* tqparent, const char* name = 0 );
/**
* Destructor
*/
~PMFormulaLabel( );
- virtual TQSize sizeHint( ) const;
- virtual TQSize minimumSizeHint( ) const;
+ virtual TQSize tqsizeHint( ) const;
+ virtual TQSize tqminimumSizeHint( ) const;
protected:
virtual void drawContents( TQPainter* p );
@@ -58,7 +58,7 @@ private:
TQFont exponentFont( ) const;
void calculateSizeHint( );
- TQSize m_sizeHint;
+ TQSize m_tqsizeHint;
int m_exponents[3];
static TQString s_xyz[3];
diff --git a/kpovmodeler/pmglobalphotons.cpp b/kpovmodeler/pmglobalphotons.cpp
index ddf32258..78834bf0 100644
--- a/kpovmodeler/pmglobalphotons.cpp
+++ b/kpovmodeler/pmglobalphotons.cpp
@@ -101,11 +101,11 @@ PMGlobalPhotons::~PMGlobalPhotons( )
{
}
-PMMetaObject* PMGlobalPhotons::metaObject( ) const
+PMMetaObject* PMGlobalPhotons::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "GlobalPhotons", Base::metaObject( ),
+ s_pMetaObject = new PMMetaObject( "GlobalPhotons", Base::tqmetaObject( ),
createNewGlobalPhotons );
PMNumberProperty* p1 = new PMNumberProperty( "numberType",
@@ -437,9 +437,9 @@ void PMGlobalPhotons::setRadiusMediaMulti( double rmm )
}
}
-PMDialogEditBase* PMGlobalPhotons::editWidget( TQWidget* parent ) const
+PMDialogEditBase* PMGlobalPhotons::editWidget( TQWidget* tqparent ) const
{
- return new PMGlobalPhotonsEdit( parent );
+ return new PMGlobalPhotonsEdit( tqparent );
}
void PMGlobalPhotons::restoreMemento( PMMemento* s )
diff --git a/kpovmodeler/pmglobalphotons.h b/kpovmodeler/pmglobalphotons.h
index 549e6efc..ad50b5a9 100644
--- a/kpovmodeler/pmglobalphotons.h
+++ b/kpovmodeler/pmglobalphotons.h
@@ -55,7 +55,7 @@ public:
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void cleanUp( ) const;
@@ -67,7 +67,7 @@ public:
/**
* Returns a new @ref PMGlobalPhotonsEdit
*/
- virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
+ virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
/**
* Returns the name of the pixmap that is displayed in the tree view
* and dialog view
diff --git a/kpovmodeler/pmglobalphotonsedit.cpp b/kpovmodeler/pmglobalphotonsedit.cpp
index 5a4a5572..01c6479e 100644
--- a/kpovmodeler/pmglobalphotonsedit.cpp
+++ b/kpovmodeler/pmglobalphotonsedit.cpp
@@ -29,8 +29,8 @@
#include <kmessagebox.h>
-PMGlobalPhotonsEdit::PMGlobalPhotonsEdit( TQWidget* parent, const char* name )
- : Base( parent, name )
+PMGlobalPhotonsEdit::PMGlobalPhotonsEdit( TQWidget* tqparent, const char* name )
+ : Base( tqparent, name )
{
m_pDisplayedObject = 0;
}
diff --git a/kpovmodeler/pmglobalphotonsedit.h b/kpovmodeler/pmglobalphotonsedit.h
index e2ae8f7b..61db154f 100644
--- a/kpovmodeler/pmglobalphotonsedit.h
+++ b/kpovmodeler/pmglobalphotonsedit.h
@@ -38,12 +38,13 @@ class TQCheckBox;
class PMGlobalPhotonsEdit : public PMDialogEditBase
{
Q_OBJECT
+ TQ_OBJECT
typedef PMDialogEditBase Base;
public:
/**
- * Creates a PMGlobalPhotonsEdit with parent and name
+ * Creates a PMGlobalPhotonsEdit with tqparent and name
*/
- PMGlobalPhotonsEdit( TQWidget* parent, const char* name = 0 );
+ PMGlobalPhotonsEdit( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displayObject( PMObject* o );
diff --git a/kpovmodeler/pmglobalsettings.cpp b/kpovmodeler/pmglobalsettings.cpp
index efa7db36..739c45ff 100644
--- a/kpovmodeler/pmglobalsettings.cpp
+++ b/kpovmodeler/pmglobalsettings.cpp
@@ -104,11 +104,11 @@ PMGlobalSettings::~PMGlobalSettings( )
{
}
-PMMetaObject* PMGlobalSettings::metaObject( ) const
+PMMetaObject* PMGlobalSettings::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "GlobalSettings", Base::metaObject( ),
+ s_pMetaObject = new PMMetaObject( "GlobalSettings", Base::tqmetaObject( ),
createNewGlobalSettings );
s_pMetaObject->addProperty(
new PMGlobalSettingsProperty( "adcBailout", &PMGlobalSettings::setAdcBailout, &PMGlobalSettings::adcBailout ) );
@@ -432,9 +432,9 @@ void PMGlobalSettings::setRecursionLimit( int c )
}
}
-PMDialogEditBase* PMGlobalSettings::editWidget( TQWidget* parent ) const
+PMDialogEditBase* PMGlobalSettings::editWidget( TQWidget* tqparent ) const
{
- return new PMGlobalSettingsEdit( parent );
+ return new PMGlobalSettingsEdit( tqparent );
}
void PMGlobalSettings::restoreMemento( PMMemento* s )
diff --git a/kpovmodeler/pmglobalsettings.h b/kpovmodeler/pmglobalsettings.h
index a95f86d7..b254afe0 100644
--- a/kpovmodeler/pmglobalsettings.h
+++ b/kpovmodeler/pmglobalsettings.h
@@ -56,7 +56,7 @@ public:
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void cleanUp( ) const;
@@ -68,7 +68,7 @@ public:
/**
* Returns a new @ref PMGlobalSettingsEdit
*/
- virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
+ virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
/**
* Returns the name of the pixmap that is displayed in the tree view
* and dialog view
diff --git a/kpovmodeler/pmglobalsettingsedit.cpp b/kpovmodeler/pmglobalsettingsedit.cpp
index 7c8eddad..8e47e845 100644
--- a/kpovmodeler/pmglobalsettingsedit.cpp
+++ b/kpovmodeler/pmglobalsettingsedit.cpp
@@ -29,8 +29,8 @@
#include <kdialog.h>
#include <kmessagebox.h>
-PMGlobalSettingsEdit::PMGlobalSettingsEdit( TQWidget* parent, const char* name )
- : Base( parent, name )
+PMGlobalSettingsEdit::PMGlobalSettingsEdit( TQWidget* tqparent, const char* name )
+ : Base( tqparent, name )
{
m_pDisplayedObject = 0;
}
@@ -74,26 +74,26 @@ void PMGlobalSettingsEdit::createTopWidgets( )
hl->addStretch( 1 );
hl = new TQHBoxLayout( topLayout( ) );
- TQGridLayout* layout = new TQGridLayout( hl, 4, 2 );
+ TQGridLayout* tqlayout = new TQGridLayout( hl, 4, 2 );
lbl = new TQLabel( i18n( "Maximum intersections:" ), this );
m_pMaxIntersectionsEdit = new PMIntEdit( this );
- layout->addWidget( lbl, 0, 0 );
- layout->addWidget( m_pMaxIntersectionsEdit, 0, 1 );
+ tqlayout->addWidget( lbl, 0, 0 );
+ tqlayout->addWidget( m_pMaxIntersectionsEdit, 0, 1 );
lbl = new TQLabel( i18n( "Maximum trace level:" ), this );
m_pMaxTraceLevelEdit = new PMIntEdit( this );
- layout->addWidget( lbl, 1, 0 );
- layout->addWidget( m_pMaxTraceLevelEdit, 1, 1 );
+ tqlayout->addWidget( lbl, 1, 0 );
+ tqlayout->addWidget( m_pMaxTraceLevelEdit, 1, 1 );
lbl = new TQLabel( i18n( "Number of waves:" ), this );
m_pNumberWavesEdit = new PMIntEdit( this );
- layout->addWidget( lbl, 2, 0 );
- layout->addWidget( m_pNumberWavesEdit, 2, 1 );
+ tqlayout->addWidget( lbl, 2, 0 );
+ tqlayout->addWidget( m_pNumberWavesEdit, 2, 1 );
lbl = new TQLabel( i18n( "Noise generator:" ), this );
m_pNoiseGeneratorEdit = new TQComboBox( false, this );
m_pNoiseGeneratorEdit->insertItem( i18n( "Original" ) );
m_pNoiseGeneratorEdit->insertItem( i18n( "Range Corrected" ) );
m_pNoiseGeneratorEdit->insertItem( i18n( "Perlin" ) );
- layout->addWidget( lbl, 3, 0 );
- layout->addWidget( m_pNoiseGeneratorEdit, 3, 1 );
+ tqlayout->addWidget( lbl, 3, 0 );
+ tqlayout->addWidget( m_pNoiseGeneratorEdit, 3, 1 );
hl->addStretch( 1 );
m_pRadiosityEdit = new TQCheckBox( i18n( "Radiosity (Povray 3.1)" ), this );
@@ -101,43 +101,43 @@ void PMGlobalSettingsEdit::createTopWidgets( )
m_pRadiosityWidget = new TQWidget( this );
hl = new TQHBoxLayout( m_pRadiosityWidget, 0, KDialog::spacingHint( ) );
- layout = new TQGridLayout( hl, 7, 2 );
+ tqlayout = new TQGridLayout( hl, 7, 2 );
lbl = new TQLabel( i18n( "Brightness:" ), m_pRadiosityWidget );
m_pBrightnessEdit = new PMFloatEdit( m_pRadiosityWidget );
- layout->addWidget( lbl, 0, 0 );
- layout->addWidget( m_pBrightnessEdit, 0, 1 );
+ tqlayout->addWidget( lbl, 0, 0 );
+ tqlayout->addWidget( m_pBrightnessEdit, 0, 1 );
lbl = new TQLabel( i18n( "Count:" ), m_pRadiosityWidget );
m_pCountEdit = new PMIntEdit( m_pRadiosityWidget );
- layout->addWidget( lbl, 1, 0 );
- layout->addWidget( m_pCountEdit, 1, 1 );
+ tqlayout->addWidget( lbl, 1, 0 );
+ tqlayout->addWidget( m_pCountEdit, 1, 1 );
lbl = new TQLabel( i18n( "Maximum distance:" ), m_pRadiosityWidget );
m_pDistanceMaximumEdit = new PMFloatEdit( m_pRadiosityWidget );
- layout->addWidget( lbl, 2, 0 );
- layout->addWidget( m_pDistanceMaximumEdit, 2, 1 );
+ tqlayout->addWidget( lbl, 2, 0 );
+ tqlayout->addWidget( m_pDistanceMaximumEdit, 2, 1 );
lbl = new TQLabel( i18n( "Error boundary:" ), m_pRadiosityWidget );
m_pErrorBoundEdit = new PMFloatEdit( m_pRadiosityWidget );
- layout->addWidget( lbl, 3, 0 );
- layout->addWidget( m_pErrorBoundEdit, 3, 1 );
+ tqlayout->addWidget( lbl, 3, 0 );
+ tqlayout->addWidget( m_pErrorBoundEdit, 3, 1 );
lbl = new TQLabel( i18n( "Gray threshold:" ), m_pRadiosityWidget );
m_pGrayThresholdEdit = new PMFloatEdit( m_pRadiosityWidget );
- layout->addWidget( lbl, 4, 0 );
- layout->addWidget( m_pGrayThresholdEdit, 4, 1 );
+ tqlayout->addWidget( lbl, 4, 0 );
+ tqlayout->addWidget( m_pGrayThresholdEdit, 4, 1 );
lbl = new TQLabel( i18n( "Low error factor:" ), m_pRadiosityWidget );
m_pLowErrorFactorEdit = new PMFloatEdit( m_pRadiosityWidget );
- layout->addWidget( lbl, 5, 0 );
- layout->addWidget( m_pLowErrorFactorEdit, 5, 1 );
+ tqlayout->addWidget( lbl, 5, 0 );
+ tqlayout->addWidget( m_pLowErrorFactorEdit, 5, 1 );
lbl = new TQLabel( i18n( "Minimum reuse:" ), m_pRadiosityWidget );
m_pMinimumReuseEdit = new PMFloatEdit( m_pRadiosityWidget );
- layout->addWidget( lbl, 6, 0 );
- layout->addWidget( m_pMinimumReuseEdit, 6, 1 );
+ tqlayout->addWidget( lbl, 6, 0 );
+ tqlayout->addWidget( m_pMinimumReuseEdit, 6, 1 );
lbl = new TQLabel( i18n( "Nearest count:" ), m_pRadiosityWidget );
m_pNearestCountEdit = new PMIntEdit( m_pRadiosityWidget );
- layout->addWidget( lbl, 7, 0 );
- layout->addWidget( m_pNearestCountEdit, 7, 1 );
+ tqlayout->addWidget( lbl, 7, 0 );
+ tqlayout->addWidget( m_pNearestCountEdit, 7, 1 );
lbl = new TQLabel( i18n( "Recursion limit:" ), m_pRadiosityWidget );
m_pRecursionLimitEdit = new PMIntEdit( m_pRadiosityWidget );
- layout->addWidget( lbl, 8, 0 );
- layout->addWidget( m_pRecursionLimitEdit, 8, 1 );
+ tqlayout->addWidget( lbl, 8, 0 );
+ tqlayout->addWidget( m_pRecursionLimitEdit, 8, 1 );
hl->addStretch( 1 );
topLayout( )->addWidget( m_pRadiosityWidget );
diff --git a/kpovmodeler/pmglobalsettingsedit.h b/kpovmodeler/pmglobalsettingsedit.h
index df0f99b0..fbe8623d 100644
--- a/kpovmodeler/pmglobalsettingsedit.h
+++ b/kpovmodeler/pmglobalsettingsedit.h
@@ -39,12 +39,13 @@ class TQComboBox;
class PMGlobalSettingsEdit : public PMDialogEditBase
{
Q_OBJECT
+ TQ_OBJECT
typedef PMDialogEditBase Base;
public:
/**
- * Creates a PMGlobalSettingsEdit with parent and name
+ * Creates a PMGlobalSettingsEdit with tqparent and name
*/
- PMGlobalSettingsEdit( TQWidget* parent, const char* name = 0 );
+ PMGlobalSettingsEdit( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displayObject( PMObject* o );
diff --git a/kpovmodeler/pmglview.cpp b/kpovmodeler/pmglview.cpp
index e4a53088..823e3c19 100644
--- a/kpovmodeler/pmglview.cpp
+++ b/kpovmodeler/pmglview.cpp
@@ -106,8 +106,8 @@ bool PMGLView::s_bDirect = true;
PMGLView::PMGLView( PMPart* part, PMViewType t,
- TQWidget* parent, const char* name, WFlags f )
- : PMViewBase( parent, name, f | Qt::WWinOwnDC | Qt::WRepaintNoErase )
+ TQWidget* tqparent, const char* name, WFlags f )
+ : PMViewBase( tqparent, name, f | TQt::WWinOwnDC | TQt::WRepaintNoErase )
{
m_pPart = part;
m_type = t;
@@ -143,7 +143,7 @@ PMGLView::PMGLView( PMPart* part, PMViewType t,
initializeGL( );
setMouseTracking( true );
- setFocusPolicy( WheelFocus );
+ setFocusPolicy( TQ_WheelFocus );
PMRenderManager* rm = PMRenderManager::theManager( );
rm->viewCreated( );
@@ -312,7 +312,7 @@ void PMGLView::initializeGL( )
Window p;
p = RootWindow( display, vi->screen );
- TQWidget* pw = parentWidget( );
+ TQWidget* pw = tqparentWidget( );
if( pw )
p = pw->winId( );
@@ -326,7 +326,7 @@ void PMGLView::initializeGL( )
Window* colorMapWindows = 0;
Window* newWindows = 0;
int num;
- if( XGetWMColormapWindows( display, topLevelWidget( )->winId( ),
+ if( XGetWMColormapWindows( display, tqtopLevelWidget( )->winId( ),
&colorMapWindows, &num ) )
{
// create a new list and append the new window
@@ -354,10 +354,10 @@ void PMGLView::initializeGL( )
newWindows = new Window[1];
newWindows[0] = w;
}
- // tell Qt to use this window
+ // tell TQt to use this window
create( w );
- XSetWMColormapWindows( display, topLevelWidget( )->winId( ),
+ XSetWMColormapWindows( display, tqtopLevelWidget( )->winId( ),
newWindows, num );
delete[] newWindows;
@@ -367,7 +367,7 @@ void PMGLView::initializeGL( )
{
TQVBoxLayout* topLayout = new TQVBoxLayout( this );
TQLabel* label = new TQLabel( i18n( "No OpenGL support" ), this );
- label->setAlignment( Qt::AlignCenter );
+ label->tqsetAlignment( TQt::AlignCenter );
topLayout->addWidget( label );
}
@@ -406,7 +406,7 @@ void PMGLView::setScale( double scale )
if( m_dScale > 0 )
{
m_dScale = scale;
- invalidateProjection( );
+ tqinvalidateProjection( );
}
else
kdError( PMArea ) << "Scale <= 0 in PMGLView::setScale\n";
@@ -415,26 +415,26 @@ void PMGLView::setScale( double scale )
void PMGLView::setTranslationX( double d )
{
m_dTransX = d;
- invalidateProjection( );
+ tqinvalidateProjection( );
}
void PMGLView::setTranslationY( double d )
{
m_dTransY = d;
- invalidateProjection( );
+ tqinvalidateProjection( );
}
void PMGLView::resizeEvent( TQResizeEvent* )
{
- invalidateProjection( );
+ tqinvalidateProjection( );
}
void PMGLView::paintEvent( TQPaintEvent* )
{
- repaint( );
+ tqrepaint( );
}
-void PMGLView::invalidateProjection( bool graphicalChange /*= true*/ )
+void PMGLView::tqinvalidateProjection( bool graphicalChange /*= true*/ )
{
m_viewTransformation = PMMatrix::identity( );
@@ -480,7 +480,7 @@ void PMGLView::invalidateProjection( bool graphicalChange /*= true*/ )
recalculateControlPointPosition( );
}
m_projectionUpToDate = false;
- repaint( graphicalChange );
+ tqrepaint( graphicalChange );
}
void PMGLView::enableTranslateMode( bool yes )
@@ -507,7 +507,7 @@ void PMGLView::mousePressEvent( TQMouseEvent* e )
{
if( m_bScaleMode || m_bTranslateMode )
{
- if( ( e->button( ) & LeftButton ) && ( e->state( ) == 0 ) )
+ if( ( e->button( ) & Qt::LeftButton ) && ( e->state( ) == 0 ) )
{
m_bMousePressed = true;
m_mousePos = e->pos( );
@@ -517,7 +517,7 @@ void PMGLView::mousePressEvent( TQMouseEvent* e )
}
else if( m_type != PMViewCamera )
{
- if( ( e->button( ) & LeftButton ) && m_bInverseValid
+ if( ( e->button( ) & Qt::LeftButton ) && m_bInverseValid
&& m_pActiveObject )
{
if( m_pUnderMouse )
@@ -578,7 +578,7 @@ void PMGLView::mousePressEvent( TQMouseEvent* e )
if( !( m_bGraphicalChangeMode || m_bMousePressed ) )
{
- if( ( e->button( ) == RightButton ) && ( e->state( ) == 0 ) )
+ if( ( e->button( ) == Qt::RightButton ) && ( e->state( ) == 0 ) )
{
m_contextClickPosition = PMVector( screenToInternalX( e->x( ) ),
screenToInternalY( e->y( ) ) );
@@ -599,7 +599,7 @@ void PMGLView::mousePressEvent( TQMouseEvent* e )
}
}
- if( e->button( ) == MidButton )
+ if( e->button( ) == Qt::MidButton )
{
m_bMidMousePressed = true;
m_mousePos = e->pos( );
@@ -677,7 +677,7 @@ void PMGLView::mouseReleaseEvent( TQMouseEvent* e )
m_autoScrollTimer.stop( );
}
- if( e->button( ) & TQEvent::MidButton )
+ if( e->button( ) & Qt::MidButton )
m_bMidMousePressed = false;
m_bSelectUnderMouse = false;
@@ -698,14 +698,14 @@ void PMGLView::mouseMoveEvent( TQMouseEvent* e )
m_dTransX += m_scaleIntX * c;
m_dTransY += m_scaleIntY * c;
m_dScale *= s;
- invalidateProjection( );
+ tqinvalidateProjection( );
}
}
else if( m_bTranslateMode )
{
m_dTransX += ( e->x( ) - m_mousePos.x( ) ) / m_dScale;
m_dTransY -= ( e->y( ) - m_mousePos.y( ) ) / m_dScale;
- invalidateProjection( );
+ tqinvalidateProjection( );
}
m_mousePos = e->pos( );
}
@@ -713,7 +713,7 @@ void PMGLView::mouseMoveEvent( TQMouseEvent* e )
{
m_dTransX += ( e->x( ) - m_mousePos.x( ) ) / m_dScale;
m_dTransY -= ( e->y( ) - m_mousePos.y( ) ) / m_dScale;
- invalidateProjection( );
+ tqinvalidateProjection( );
m_mousePos = e->pos( );
}
@@ -799,7 +799,7 @@ void PMGLView::wheelEvent( TQWheelEvent* e )
m_dTransX += deltaX * c;
m_dTransY += deltaY * c;
m_dScale *= s;
- invalidateProjection( );
+ tqinvalidateProjection( );
}
}
@@ -858,7 +858,7 @@ void PMGLView::keyPressEvent( TQKeyEvent* e )
accept = false;
if( accept )
- invalidateProjection( );
+ tqinvalidateProjection( );
else
e->ignore( );
}
@@ -885,7 +885,7 @@ void PMGLView::slotAutoScroll( )
m_dTransX += pixels * m_autoScrollDirectionX / m_dScale;
m_dTransY -= pixels * m_autoScrollDirectionY / m_dScale;
- invalidateProjection( );
+ tqinvalidateProjection( );
if( m_bGraphicalChangeMode )
if( m_bMultipleSelectionMode )
@@ -900,7 +900,7 @@ void PMGLView::slotAutoScroll( )
if( m_bGraphicalChangeMode )
graphicalChange( mapFromGlobal( TQCursor::pos( ) ) );
else
- repaint( );
+ tqrepaint( );
m_lastAutoScrollUpdate = now;
}
@@ -955,12 +955,12 @@ void PMGLView::graphicalChange( const TQPoint& mousePos )
m_pActiveObject->controlPointsChangedList( m_controlPoints, changedObjects );
if( changedObjects.isEmpty( ) )
- emit objectChanged( m_pActiveObject, PMCGraphicalChange, this );
+ emit objectChanged( m_pActiveObject, PMCGraphicalChange, TQT_TQOBJECT(this) );
else
{
PMObjectListIterator it( changedObjects );
for( ; it.current( ); ++it )
- emit objectChanged( it.current( ), PMCGraphicalChange, this );
+ emit objectChanged( it.current( ), PMCGraphicalChange, TQT_TQOBJECT(this) );
}
}
@@ -1064,7 +1064,7 @@ PMVector PMGLView::mousePosition( PMControlPoint* cp, int x, int y )
result[1] = screenToInternalY( y );
if( cp )
{
- index = m_controlPoints.findRef( cp );
+ index = m_controlPoints.tqfindRef( cp );
if( index >= 0 )
{
p = m_controlPointsPosition.at( ( uint ) index );
@@ -1101,7 +1101,7 @@ void PMGLView::setType( PMViewType t )
if( m_type != t )
m_viewTransformation = PMMatrix::identity( );
m_type = t;
- invalidateProjection( );
+ tqinvalidateProjection( );
emit viewTypeChanged( viewTypeAsString( t ) );
}
@@ -1109,7 +1109,7 @@ void PMGLView::setType( PMViewType t )
void PMGLView::setCamera( PMCamera* c )
{
m_pCamera = c;
- invalidateProjection( );
+ tqinvalidateProjection( );
}
void PMGLView::slotRefresh( )
@@ -1118,7 +1118,7 @@ void PMGLView::slotRefresh( )
if( !m_pCamera )
setCamera( m_pPart->firstCamera( ) );
- repaint( );
+ tqrepaint( );
}
void PMGLView::slotClear( )
@@ -1135,7 +1135,7 @@ void PMGLView::slotClear( )
void PMGLView::slotActiveRenderModeChanged( )
{
if( ( m_type == PMViewCamera ) && m_pCamera )
- invalidateProjection( );
+ tqinvalidateProjection( );
}
void PMGLView::slotStopRendering( )
@@ -1176,13 +1176,13 @@ void PMGLView::slotObjectChanged( PMObject* obj, const int mode,
{
if( obj->type( ) == "Camera" )
if( m_pCamera == ( PMCamera* ) obj )
- invalidateProjection( );
+ tqinvalidateProjection( );
- if( obj->parent( ) )
- if( obj->parent( )->type( ) == "Camera" )
- if( m_pCamera == ( PMCamera* ) obj->parent( ) )
+ if( obj->tqparent( ) )
+ if( obj->tqparent( )->type( ) == "Camera" )
+ if( m_pCamera == ( PMCamera* ) obj->tqparent( ) )
if( obj->hasTransformationMatrix( ) )
- invalidateProjection( );
+ tqinvalidateProjection( );
}
redraw = true;
@@ -1209,11 +1209,11 @@ void PMGLView::slotObjectChanged( PMObject* obj, const int mode,
if( obj->type( ) == "Camera" )
if( !m_pCamera )
setCamera( ( PMCamera* ) obj );
- if( obj->parent( ) )
- if( obj->parent( )->type( ) == "Camera" )
- if( m_pCamera == ( PMCamera* ) obj->parent( ) )
+ if( obj->tqparent( ) )
+ if( obj->tqparent( )->type( ) == "Camera" )
+ if( m_pCamera == ( PMCamera* ) obj->tqparent( ) )
if( obj->hasTransformationMatrix( ) )
- invalidateProjection( );
+ tqinvalidateProjection( );
}
redraw = true;
}
@@ -1225,11 +1225,11 @@ void PMGLView::slotObjectChanged( PMObject* obj, const int mode,
setCamera( 0 );
if( m_type == PMGLView::PMViewCamera )
- if( obj->parent( ) )
- if( obj->parent( )->type( ) == "Camera" )
- if( m_pCamera == ( PMCamera* ) obj->parent( ) )
+ if( obj->tqparent( ) )
+ if( obj->tqparent( )->type( ) == "Camera" )
+ if( m_pCamera == ( PMCamera* ) obj->tqparent( ) )
if( obj->hasTransformationMatrix( ) )
- invalidateProjection( );
+ tqinvalidateProjection( );
redraw = true;
}
@@ -1238,10 +1238,10 @@ void PMGLView::slotObjectChanged( PMObject* obj, const int mode,
redraw = true;
if( redraw )
- repaint( sender == this );
+ tqrepaint( TQT_BASE_OBJECT(sender) == TQT_BASE_OBJECT(this) );
}
-void PMGLView::repaint( bool graphicalChange )
+void PMGLView::tqrepaint( bool graphicalChange )
{
if( isValid( ) )
{
@@ -1296,7 +1296,7 @@ PMObject* PMGLView::topLevelRenderingObject( PMObject* o ) const
else if( obj->isA( "Scene" ) || obj->isA( "Declare" ) )
stop = true;
else
- obj = obj->parent( );
+ obj = obj->tqparent( );
}
while( !stop );
}
@@ -1353,7 +1353,7 @@ void PMGLView::selectControlPoint( PMControlPoint* cp, bool select, bool deselec
}
if( selectionChanged )
- emit objectChanged( m_pActiveObject, PMCControlPointSelection, this );
+ emit objectChanged( m_pActiveObject, PMCControlPointSelection, TQT_TQOBJECT(this) );
}
void PMGLView::startSelection( )
@@ -1652,7 +1652,7 @@ void PMGLView::slotControlPoint( int id )
PMControlPointListIterator cit( m_controlPoints );
for( ; cit.current( ); ++cit )
cit.current( )->setSelected( p == cit.current( ) );
- emit objectChanged( m_pActiveObject, PMCControlPointSelection, this );
+ emit objectChanged( m_pActiveObject, PMCControlPointSelection, TQT_TQOBJECT(this) );
}
}
@@ -1754,16 +1754,16 @@ TQString PMGLViewFactory::description( PMViewOptions* vo ) const
if( vo && vo->viewType( ) == "glview" )
{
PMGLViewOptions* o = ( PMGLViewOptions* ) vo;
- return i18n( "3D View (%1)" ).arg(
+ return i18n( "3D View (%1)" ).tqarg(
PMGLView::viewTypeAsString( o->glViewType( ) ) );
}
return description( );
}
-PMViewOptionsWidget* PMGLViewFactory::newOptionsWidget( TQWidget* parent,
+PMViewOptionsWidget* PMGLViewFactory::newOptionsWidget( TQWidget* tqparent,
PMViewOptions* o )
{
- return new PMGLViewOptionsWidget( parent, o );
+ return new PMGLViewOptionsWidget( tqparent, o );
}
PMViewOptions* PMGLViewFactory::newOptionsInstance( ) const
@@ -1772,9 +1772,9 @@ PMViewOptions* PMGLViewFactory::newOptionsInstance( ) const
return o;
}
-PMGLViewOptionsWidget::PMGLViewOptionsWidget( TQWidget* parent,
+PMGLViewOptionsWidget::PMGLViewOptionsWidget( TQWidget* tqparent,
PMViewOptions* o )
- : PMViewOptionsWidget( parent )
+ : PMViewOptionsWidget( tqparent )
{
m_pOptions = ( PMGLViewOptions* ) o;
diff --git a/kpovmodeler/pmglview.h b/kpovmodeler/pmglview.h
index 521d6911..48537b20 100644
--- a/kpovmodeler/pmglview.h
+++ b/kpovmodeler/pmglview.h
@@ -51,6 +51,7 @@ class TQComboBox;
class PMGLView : public PMViewBase
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Type of the view
@@ -61,7 +62,7 @@ public:
* Constructor
*/
PMGLView( PMPart* part, PMViewType t,
- TQWidget* parent = 0, const char* name = 0, WFlags f = 0 );
+ TQWidget* tqparent = 0, const char* name = 0, WFlags f = 0 );
/**
* Destructor
*/
@@ -335,7 +336,7 @@ private:
/**
* Repaints the view
*/
- void repaint( bool graphicalChange = false );
+ void tqrepaint( bool graphicalChange = false );
/**
* Starts a graphical change
*/
@@ -350,9 +351,9 @@ private:
*/
void selectControlPoint( PMControlPoint* cp, bool select, bool deselectOthers = true );
/**
- * Invalidates the projection and repaints the view
+ * Invalidates the projection and tqrepaints the view
*/
- void invalidateProjection( bool graphicaChange = false );
+ void tqinvalidateProjection( bool graphicaChange = false );
/**
* Starts multiple selection mode
@@ -558,25 +559,26 @@ public:
virtual TQString description( ) const;
virtual TQString description( PMViewOptions* ) const;
virtual TQString iconName( ) const { return TQString( "pmglview" ); }
- virtual PMViewBase* newInstance( TQWidget* parent, PMPart* part ) const
+ virtual PMViewBase* newInstance( TQWidget* tqparent, PMPart* part ) const
{
- return new PMGLView( part, PMGLView::PMViewPosX, parent );
+ return new PMGLView( part, PMGLView::PMViewPosX, tqparent );
}
virtual PMViewOptions* newOptionsInstance( ) const;
virtual PMViewOptionsWidget* newOptionsWidget( TQWidget*, PMViewOptions* );
};
/**
- * Configuration widget for the view layout settings dialog
+ * Configuration widget for the view tqlayout settings dialog
*/
class PMGLViewOptionsWidget : public PMViewOptionsWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Default constructor
*/
- PMGLViewOptionsWidget( TQWidget* parent, PMViewOptions* o );
+ PMGLViewOptionsWidget( TQWidget* tqparent, PMViewOptions* o );
protected slots:
void slotGLViewTypeChanged( int );
diff --git a/kpovmodeler/pmgraphicalobject.cpp b/kpovmodeler/pmgraphicalobject.cpp
index c60c40cb..59ace7cf 100644
--- a/kpovmodeler/pmgraphicalobject.cpp
+++ b/kpovmodeler/pmgraphicalobject.cpp
@@ -60,11 +60,11 @@ PMGraphicalObject::~PMGraphicalObject( )
{
}
-PMMetaObject* PMGraphicalObject::metaObject( ) const
+PMMetaObject* PMGraphicalObject::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "GraphicalObject", Base::metaObject( ) );
+ s_pMetaObject = new PMMetaObject( "GraphicalObject", Base::tqmetaObject( ) );
s_pMetaObject->addProperty(
new PMGraphicalObjectProperty( "noShadow", &PMGraphicalObject::setNoShadow,
&PMGraphicalObject::noShadow ) );
diff --git a/kpovmodeler/pmgraphicalobject.h b/kpovmodeler/pmgraphicalobject.h
index 399e351d..662f7682 100644
--- a/kpovmodeler/pmgraphicalobject.h
+++ b/kpovmodeler/pmgraphicalobject.h
@@ -46,12 +46,12 @@ public:
*/
PMGraphicalObject( const PMGraphicalObject& o );
/**
- * Deletes the object and all children
+ * Deletes the object and all tqchildren
*/
virtual ~PMGraphicalObject( );
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void cleanUp( ) const;
@@ -101,7 +101,7 @@ public:
*/
void setVisibilityLevel( int level );
/**
- * Returns true if the visibility level is relative to the objects parent
+ * Returns true if the visibility level is relative to the objects tqparent
*/
bool isVisibilityLevelRelative( ) const { return m_relativeVisibility; }
/**
diff --git a/kpovmodeler/pmgraphicalobjectedit.cpp b/kpovmodeler/pmgraphicalobjectedit.cpp
index c623c51f..106fbc2a 100644
--- a/kpovmodeler/pmgraphicalobjectedit.cpp
+++ b/kpovmodeler/pmgraphicalobjectedit.cpp
@@ -28,8 +28,8 @@
const int c_minValue = -1000;
const int c_maxValue = 1000;
-PMGraphicalObjectEdit::PMGraphicalObjectEdit( TQWidget* parent, const char* name )
- : Base( parent, name )
+PMGraphicalObjectEdit::PMGraphicalObjectEdit( TQWidget* tqparent, const char* name )
+ : Base( tqparent, name )
{
m_pDisplayedObject = 0;
}
@@ -143,7 +143,7 @@ void PMGraphicalObjectEdit::slotLevelChanged( int )
void PMGraphicalObjectEdit::recalculateResultingVisibility( )
{
- PMObject* o = m_pDisplayedObject->parent( );
+ PMObject* o = m_pDisplayedObject->tqparent( );
PMGraphicalObject* go = 0;
int level = 0;
bool absoluteFound = false;
@@ -152,7 +152,7 @@ void PMGraphicalObjectEdit::recalculateResultingVisibility( )
if( !m_pRelativeVisibility->isChecked( ) )
absoluteFound = true;
- for( ; o && !absoluteFound; o = o->parent( ) )
+ for( ; o && !absoluteFound; o = o->tqparent( ) )
{
if( o->isA( "GraphicalObject" ) )
{
@@ -162,7 +162,7 @@ void PMGraphicalObjectEdit::recalculateResultingVisibility( )
absoluteFound = true;
}
}
- m_pResultingVisibility->setText( TQString( "(%1)" ).arg( level ) );
+ m_pResultingVisibility->setText( TQString( "(%1)" ).tqarg( level ) );
}
#include "pmgraphicalobjectedit.moc"
diff --git a/kpovmodeler/pmgraphicalobjectedit.h b/kpovmodeler/pmgraphicalobjectedit.h
index 29f53a0f..36758f63 100644
--- a/kpovmodeler/pmgraphicalobjectedit.h
+++ b/kpovmodeler/pmgraphicalobjectedit.h
@@ -37,12 +37,13 @@ class TQLabel;
class PMGraphicalObjectEdit : public PMDetailObjectEdit
{
Q_OBJECT
+ TQ_OBJECT
typedef PMDetailObjectEdit Base;
public:
/**
- * Creates a PMGraphicalObjectEdit with parent and name
+ * Creates a PMGraphicalObjectEdit with tqparent and name
*/
- PMGraphicalObjectEdit( TQWidget* parent, const char* name = 0 );
+ PMGraphicalObjectEdit( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displayObject( PMObject* o );
diff --git a/kpovmodeler/pmgridsettings.cpp b/kpovmodeler/pmgridsettings.cpp
index 04bdbdd3..60803cd9 100644
--- a/kpovmodeler/pmgridsettings.cpp
+++ b/kpovmodeler/pmgridsettings.cpp
@@ -28,41 +28,41 @@
#include <kcolorbutton.h>
#include <klocale.h>
-PMGridSettings::PMGridSettings( TQWidget* parent, const char* name )
- : PMSettingsDialogPage( parent, name )
+PMGridSettings::PMGridSettings( TQWidget* tqparent, const char* name )
+ : PMSettingsDialogPage( tqparent, name )
{
- TQHBoxLayout* hlayout;
- TQVBoxLayout* vlayout;
+ TQHBoxLayout* htqlayout;
+ TQVBoxLayout* vtqlayout;
TQVBoxLayout* gvl;
TQGridLayout* grid;
TQGroupBox* gb;
- vlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
+ vtqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
gb = new TQGroupBox( i18n( "Displayed Grid" ), this );
- vlayout->addWidget( gb );
+ vtqlayout->addWidget( gb );
gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) );
gvl->addSpacing( 10 );
- hlayout = new TQHBoxLayout( gvl );
- hlayout->addWidget( new TQLabel( i18n( "Color:" ), gb ) );
+ htqlayout = new TQHBoxLayout( gvl );
+ htqlayout->addWidget( new TQLabel( i18n( "Color:" ), gb ) );
m_pGridColor = new KColorButton( gb );
- hlayout->addWidget( m_pGridColor );
- hlayout->addStretch( 1 );
+ htqlayout->addWidget( m_pGridColor );
+ htqlayout->addStretch( 1 );
- hlayout = new TQHBoxLayout( gvl );
- hlayout->addWidget( new TQLabel( i18n( "Distance:" ), gb ) );
+ htqlayout = new TQHBoxLayout( gvl );
+ htqlayout->addWidget( new TQLabel( i18n( "Distance:" ), gb ) );
m_pGridDistance = new PMIntEdit( gb );
m_pGridDistance->setValidation( true, 20, false, 0 );
- hlayout->addWidget( m_pGridDistance );
- hlayout->addStretch( 1 );
+ htqlayout->addWidget( m_pGridDistance );
+ htqlayout->addStretch( 1 );
gb = new TQGroupBox( i18n( "Control Point Grid" ), this );
- vlayout->addWidget( gb );
+ vtqlayout->addWidget( gb );
gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) );
gvl->addSpacing( 10 );
- hlayout = new TQHBoxLayout( gvl );
- grid = new TQGridLayout( hlayout, 3, 2 );
+ htqlayout = new TQHBoxLayout( gvl );
+ grid = new TQGridLayout( htqlayout, 3, 2 );
grid->addWidget( new TQLabel( i18n( "2D/3D movement:" ), gb ), 0, 0 );
m_pMoveGrid = new PMFloatEdit( gb );
m_pMoveGrid->setValidation( true, 0.001, true, 100 );
@@ -78,9 +78,9 @@ PMGridSettings::PMGridSettings( TQWidget* parent, const char* name )
m_pRotateGrid->setValidation( true, 0.001, true, 180 );
grid->addWidget( m_pRotateGrid, 2, 1 );
- hlayout->addStretch( 1 );
+ htqlayout->addStretch( 1 );
- vlayout->addStretch( 1 );
+ vtqlayout->addStretch( 1 );
}
void PMGridSettings::displaySettings( )
@@ -133,23 +133,23 @@ bool PMGridSettings::validateData( )
void PMGridSettings::applySettings( )
{
- bool repaint = false;
+ bool tqrepaint = false;
PMRenderManager* rm = PMRenderManager::theManager( );
if( rm->gridColor( ) != m_pGridColor->color( ) )
{
rm->setGridColor( m_pGridColor->color( ) );
- repaint = true;
+ tqrepaint = true;
}
if( rm->gridDistance( ) != m_pGridDistance->value( ) )
{
rm->setGridDistance( m_pGridDistance->value( ) );
- repaint = true;
+ tqrepaint = true;
}
PMControlPoint::setMoveGrid( m_pMoveGrid->value( ) );
PMControlPoint::setScaleGrid( m_pScaleGrid->value( ) );
PMControlPoint::setRotateGrid( m_pRotateGrid->value( ) );
- if( repaint )
- emit repaintViews( );
+ if( tqrepaint )
+ emit tqrepaintViews( );
}
#include "pmgridsettings.moc"
diff --git a/kpovmodeler/pmgridsettings.h b/kpovmodeler/pmgridsettings.h
index 214f3af3..20b4f01e 100644
--- a/kpovmodeler/pmgridsettings.h
+++ b/kpovmodeler/pmgridsettings.h
@@ -34,11 +34,12 @@ class PMFloatEdit;
class PMGridSettings : public PMSettingsDialogPage
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Default constructor
*/
- PMGridSettings( TQWidget* parent, const char* name = 0 );
+ PMGridSettings( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displaySettings( );
/** */
diff --git a/kpovmodeler/pmheightfield.cpp b/kpovmodeler/pmheightfield.cpp
index 6806437a..654cd43c 100644
--- a/kpovmodeler/pmheightfield.cpp
+++ b/kpovmodeler/pmheightfield.cpp
@@ -107,11 +107,11 @@ void PMHeightField::readAttributes( const PMXMLHelper& h )
Base::readAttributes( h );
}
-PMMetaObject* PMHeightField::metaObject( ) const
+PMMetaObject* PMHeightField::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "HeightField", Base::metaObject( ),
+ s_pMetaObject = new PMMetaObject( "HeightField", Base::tqmetaObject( ),
createNewHeightField );
s_pMetaObject->addProperty(
new PMHeightFieldProperty( "fileName", &PMHeightField::setFileName, &PMHeightField::fileName ) );
@@ -200,9 +200,9 @@ void PMHeightField::setWaterLevel( double wl )
}
}
-PMDialogEditBase* PMHeightField::editWidget( TQWidget* parent ) const
+PMDialogEditBase* PMHeightField::editWidget( TQWidget* tqparent ) const
{
- return new PMHeightFieldEdit( parent );
+ return new PMHeightFieldEdit( tqparent );
}
void PMHeightField::restoreMemento( PMMemento* s )
diff --git a/kpovmodeler/pmheightfield.h b/kpovmodeler/pmheightfield.h
index 443226ba..62afe95b 100644
--- a/kpovmodeler/pmheightfield.h
+++ b/kpovmodeler/pmheightfield.h
@@ -60,7 +60,7 @@ public:
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
@@ -69,7 +69,7 @@ public:
/**
* Returns a new @ref PMHeightFieldEdit
*/
- virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
+ virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
/**
* Returns the name of the pixmap that is displayed in the tree view
* and dialog view
diff --git a/kpovmodeler/pmheightfieldedit.cpp b/kpovmodeler/pmheightfieldedit.cpp
index 5f9346f0..b3de59fa 100644
--- a/kpovmodeler/pmheightfieldedit.cpp
+++ b/kpovmodeler/pmheightfieldedit.cpp
@@ -31,8 +31,8 @@
#include <kiconloader.h>
#include <kfiledialog.h>
-PMHeightFieldEdit::PMHeightFieldEdit( TQWidget* parent, const char* name )
- : Base( parent, name )
+PMHeightFieldEdit::PMHeightFieldEdit( TQWidget* tqparent, const char* name )
+ : Base( tqparent, name )
{
m_pDisplayedObject = 0;
}
@@ -189,7 +189,7 @@ void PMHeightFieldEdit::slotFileNameChanged( const TQString& )
void PMHeightFieldEdit::slotFileNameClicked( )
{
- TQString str = KFileDialog::getOpenFileName( TQString::null, TQString::null );
+ TQString str = KFileDialog::getOpenFileName( TQString(), TQString() );
if( !str.isEmpty() )
{
diff --git a/kpovmodeler/pmheightfieldedit.h b/kpovmodeler/pmheightfieldedit.h
index 8a32aa00..2b97b03a 100644
--- a/kpovmodeler/pmheightfieldedit.h
+++ b/kpovmodeler/pmheightfieldedit.h
@@ -39,12 +39,13 @@ class TQPushButton;
class PMHeightFieldEdit : public PMSolidObjectEdit
{
Q_OBJECT
+ TQ_OBJECT
typedef PMSolidObjectEdit Base;
public:
/**
- * Creates a PMHeightFieldEdit with parent and name
+ * Creates a PMHeightFieldEdit with tqparent and name
*/
- PMHeightFieldEdit( TQWidget* parent, const char* name = 0 );
+ PMHeightFieldEdit( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displayObject( PMObject* o );
diff --git a/kpovmodeler/pmheightfieldroam.cpp b/kpovmodeler/pmheightfieldroam.cpp
index d4809aac..87856155 100644
--- a/kpovmodeler/pmheightfieldroam.cpp
+++ b/kpovmodeler/pmheightfieldroam.cpp
@@ -180,7 +180,7 @@ bool PMHeightFieldROAM::imageToData(const TQString &fileName)
colourIndex = false;
else
{
- scaledMap = scaledMap.convertDepthWithPalette( 8, mapFile.colorTable( ), 256 );
+ scaledMap = scaledMap.convertDepthWithPalette( 8, mapFile.tqcolorTable( ), 256 );
colourIndex = true;
}
@@ -191,8 +191,8 @@ bool PMHeightFieldROAM::imageToData(const TQString &fileName)
if ( colourIndex )
setHeight( x, y2, scaledMap.pixelIndex( x, y ) * 256 );
else
- setHeight( x, y2, ( 256 * qRed( scaledMap.pixel( x, y ) ) ) +
- qGreen( scaledMap.pixel( x, y ) ) );
+ setHeight( x, y2, ( 256 * tqRed( scaledMap.pixel( x, y ) ) ) +
+ tqGreen( scaledMap.pixel( x, y ) ) );
}
}
diff --git a/kpovmodeler/pmimagemap.cpp b/kpovmodeler/pmimagemap.cpp
index 5f28c49a..2040de46 100644
--- a/kpovmodeler/pmimagemap.cpp
+++ b/kpovmodeler/pmimagemap.cpp
@@ -275,11 +275,11 @@ void PMImageMap::readAttributes( const PMXMLHelper& h )
Base::readAttributes( h );
}
-PMMetaObject* PMImageMap::metaObject( ) const
+PMMetaObject* PMImageMap::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "ImageMap", Base::metaObject( ),
+ s_pMetaObject = new PMMetaObject( "ImageMap", Base::tqmetaObject( ),
createNewImageMap );
PMBitmapTypeProperty* bp = new PMBitmapTypeProperty(
@@ -459,9 +459,9 @@ void PMImageMap::setTransmits( const TQValueList<PMPaletteValue>& c )
}
}
-PMDialogEditBase* PMImageMap::editWidget( TQWidget* parent ) const
+PMDialogEditBase* PMImageMap::editWidget( TQWidget* tqparent ) const
{
- return new PMImageMapEdit( parent );
+ return new PMImageMapEdit( tqparent );
}
void PMImageMap::restoreMemento( PMMemento* s )
diff --git a/kpovmodeler/pmimagemap.h b/kpovmodeler/pmimagemap.h
index 3a43d949..859fb5f3 100644
--- a/kpovmodeler/pmimagemap.h
+++ b/kpovmodeler/pmimagemap.h
@@ -71,7 +71,7 @@ public:
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void cleanUp( ) const;
@@ -86,7 +86,7 @@ public:
/**
* Returns a new @ref PMImageMapEdit
*/
- virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
+ virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
/**
* Gets the bitmap type
diff --git a/kpovmodeler/pmimagemapedit.cpp b/kpovmodeler/pmimagemapedit.cpp
index 09d5eb0a..5e322d95 100644
--- a/kpovmodeler/pmimagemapedit.cpp
+++ b/kpovmodeler/pmimagemapedit.cpp
@@ -38,8 +38,8 @@
#include <kfiledialog.h>
#include <kiconloader.h>
-PMImageMapEdit::PMImageMapEdit( TQWidget* parent, const char* name )
- : Base( parent, name )
+PMImageMapEdit::PMImageMapEdit( TQWidget* tqparent, const char* name )
+ : Base( tqparent, name )
{
m_pDisplayedObject = 0;
}
@@ -247,8 +247,8 @@ void PMImageMapEdit::displayPaletteEntries( const TQValueList<PMPaletteValue>& f
TQPixmap removeButtonPixmap = SmallIcon( "pmremovepoint" );
// First let's deal with the filter entries...
- if( m_pFiltersWidget->layout( ) )
- delete m_pFiltersWidget->layout( );
+ if( m_pFiltersWidget->tqlayout( ) )
+ delete m_pFiltersWidget->tqlayout( );
m_filterEntries.setAutoDelete( true );
m_filterAddButtons.setAutoDelete( true );
@@ -313,8 +313,8 @@ void PMImageMapEdit::displayPaletteEntries( const TQValueList<PMPaletteValue>& f
m_transmitRemoveButtons.setAutoDelete( false );
// recreate the entry edits
- if( m_pTransmitsWidget->layout( ) )
- delete m_pTransmitsWidget->layout( );
+ if( m_pTransmitsWidget->tqlayout( ) )
+ delete m_pTransmitsWidget->tqlayout( );
gl = new TQGridLayout( m_pTransmitsWidget, ntransmits + 1, 3, 0, KDialog::spacingHint( ) );
@@ -475,7 +475,7 @@ void PMImageMapEdit::slotImageFileNameChanged( const TQString& /*a*/ )
void PMImageMapEdit::slotImageFileBrowseClicked( )
{
- TQString str = KFileDialog::getOpenFileName( TQString::null, TQString::null );
+ TQString str = KFileDialog::getOpenFileName( TQString(), TQString() );
if( !str.isEmpty() )
{
@@ -535,7 +535,7 @@ void PMImageMapEdit::slotAddFilterEntry( )
if( button )
{
- int index = m_filterAddButtons.findRef( button );
+ int index = m_filterAddButtons.tqfindRef( button );
if( index >= 0 )
{
entriesFilters = filters( );
@@ -561,7 +561,7 @@ void PMImageMapEdit::slotRemoveFilterEntry( )
if( button )
{
- int index = m_filterRemoveButtons.findRef( button );
+ int index = m_filterRemoveButtons.tqfindRef( button );
if( index >= 0 )
{
entriesFilters = filters( );
@@ -583,7 +583,7 @@ void PMImageMapEdit::slotAddTransmitEntry( )
if( button )
{
- int index = m_transmitAddButtons.findRef( button );
+ int index = m_transmitAddButtons.tqfindRef( button );
if( index >= 0 )
{
entriesTransmits = transmits( );
@@ -609,7 +609,7 @@ void PMImageMapEdit::slotRemoveTransmitEntry( )
if( button )
{
- int index = m_transmitRemoveButtons.findRef( button );
+ int index = m_transmitRemoveButtons.tqfindRef( button );
if( index >= 0 )
{
entriesTransmits = transmits( );
diff --git a/kpovmodeler/pmimagemapedit.h b/kpovmodeler/pmimagemapedit.h
index 49ce3d8c..4b5d4b2e 100644
--- a/kpovmodeler/pmimagemapedit.h
+++ b/kpovmodeler/pmimagemapedit.h
@@ -45,12 +45,13 @@ class TQPushButton;
class PMImageMapEdit : public PMDialogEditBase
{
Q_OBJECT
+ TQ_OBJECT
typedef PMDialogEditBase Base;
public:
/**
- * Creates a PMImageMapEdit with parent and name
+ * Creates a PMImageMapEdit with tqparent and name
*/
- PMImageMapEdit( TQWidget* parent, const char* name = 0 );
+ PMImageMapEdit( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displayObject( PMObject* o );
diff --git a/kpovmodeler/pminserterrordialog.cpp b/kpovmodeler/pminserterrordialog.cpp
index 9dd7867a..65d1c66d 100644
--- a/kpovmodeler/pminserterrordialog.cpp
+++ b/kpovmodeler/pminserterrordialog.cpp
@@ -25,13 +25,13 @@
PMInsertErrorDialog::PMInsertErrorDialog(
int numObj, int numErrors,
const TQStringList& details,
- TQWidget* parent /*= 0*/, const char* name /*= 0*/ )
- : KDialogBase( parent, name, true, i18n( "Insert Errors" ),
+ TQWidget* tqparent /*= 0*/, const char* name /*= 0*/ )
+ : KDialogBase( tqparent, name, true, i18n( "Insert Errors" ),
Help | Ok | User1, Ok, false, i18n( "Details" ) )
{
TQVBox* page = makeVBoxMainWidget( );
new TQLabel( i18n( "%1 of %2 objects couldn't be inserted." )
- .arg( numErrors ).arg( numObj ), page );
+ .tqarg( numErrors ).tqarg( numObj ), page );
m_pDetailsLabel = new TQLabel( i18n( "Objects not inserted:" ), page );
m_pDetailsLabel->hide( );
diff --git a/kpovmodeler/pminserterrordialog.h b/kpovmodeler/pminserterrordialog.h
index 9a2c1d2e..09eb32dd 100644
--- a/kpovmodeler/pminserterrordialog.h
+++ b/kpovmodeler/pminserterrordialog.h
@@ -36,13 +36,14 @@ class TQLabel;
class PMInsertErrorDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
- * Creates a modal PMInsertErrorDialog with parent and name.
+ * Creates a modal PMInsertErrorDialog with tqparent and name.
*/
PMInsertErrorDialog( int NumberOfObjects, int NumberOfInsertErrors,
const TQStringList& details,
- TQWidget* parent = 0, const char* name = 0 );
+ TQWidget* tqparent = 0, const char* name = 0 );
protected slots:
void slotUser1( );
diff --git a/kpovmodeler/pminsertpopup.cpp b/kpovmodeler/pminsertpopup.cpp
index 0f8ffb23..addab3cf 100644
--- a/kpovmodeler/pminsertpopup.cpp
+++ b/kpovmodeler/pminsertpopup.cpp
@@ -21,11 +21,11 @@
#include <kiconloader.h>
#include <tqcursor.h>
-PMInsertPopup::PMInsertPopup( TQWidget* parent, bool multipleObjects,
+PMInsertPopup::PMInsertPopup( TQWidget* tqparent, bool multipleObjects,
int items, bool canInsertAllAsFirstChildren,
bool canInsertAllAsLastChildren,
bool canInsertAllAsSiblings, const char* name )
- : KPopupMenu( parent, name )
+ : KPopupMenu( tqparent, name )
{
TQString itemText;
if( multipleObjects )
@@ -71,13 +71,13 @@ PMInsertPopup::PMInsertPopup( TQWidget* parent, bool multipleObjects,
}
}
-int PMInsertPopup::choosePlace( TQWidget* parent, bool multipleObjects,
+int PMInsertPopup::choosePlace( TQWidget* tqparent, bool multipleObjects,
int items, bool canInsertAllAsFirstChildren,
bool canInsertAllAsLastChildren,
bool canInsertAllAsSiblings )
{
int result;
- PMInsertPopup* popup = new PMInsertPopup( parent, multipleObjects, items,
+ PMInsertPopup* popup = new PMInsertPopup( tqparent, multipleObjects, items,
canInsertAllAsFirstChildren,
canInsertAllAsLastChildren,
canInsertAllAsSiblings );
diff --git a/kpovmodeler/pminsertpopup.h b/kpovmodeler/pminsertpopup.h
index 09aa796a..3ec3ecd3 100644
--- a/kpovmodeler/pminsertpopup.h
+++ b/kpovmodeler/pminsertpopup.h
@@ -39,13 +39,13 @@ public:
/**
* Creates a popup menu
*
- * @param parent The parent widget
+ * @param tqparent The tqparent widget
* @param multipleObjects True if more than one object will be inserted
* @param items Which items to display. Can be a bitwise combination
* of PMIFirstChild, PMILastChild, PMISibling.
* @param name Internal name of the popup menu
*/
- PMInsertPopup( TQWidget* parent, bool multipleObjects,
+ PMInsertPopup( TQWidget* tqparent, bool multipleObjects,
int items = PMIFirstChild | PMILastChild | PMISibling,
bool canInsertAllAsFirstChildren = true,
bool canInsertAllAsLastChildren = true,
@@ -59,7 +59,7 @@ public:
/**
* Popups a PMInsertPopup menu
*
- * @param parent The parent widget
+ * @param tqparent The tqparent widget
* @param multipleObjects True if more than one object will be inserted
* @param items Which items to display. Can be a bitwise combination
* of PMIFirstChild, PMILastChild, PMISibling.
@@ -70,7 +70,7 @@ public:
*
* Returns the selected item or 0 if no item was selected.
*/
- static int choosePlace( TQWidget* parent, bool multipleObjects,
+ static int choosePlace( TQWidget* tqparent, bool multipleObjects,
int items = PMIFirstChild | PMILastChild
| PMISibling,
bool canInsertAllAsFirstChildren = true,
diff --git a/kpovmodeler/pminsertrules.dtd b/kpovmodeler/pminsertrules.dtd
index a3c2128c..4b9a46d7 100644
--- a/kpovmodeler/pminsertrules.dtd
+++ b/kpovmodeler/pminsertrules.dtd
@@ -39,23 +39,23 @@
Insert a list of groups and classes (the object classes that can be inserted)
and one condition. If the condition is omitted,
the classes can allways be inserted. -->
-<!ELEMENT rule ((group | class)+, (and | or | not | before | after | contains
+<!ELEMENT rule ((group | class)+, (and | or | not | before | after | tqcontains
| greater | less | equal)?)>
<!-- Simple negation. Insert one condition -->
-<!ELEMENT not (and | or | before | after | contains | greater | less | equal)>
+<!ELEMENT not (and | or | before | after | tqcontains | greater | less | equal)>
<!-- Logical and. Insert any number of conditions -->
-<!ELEMENT and (and | or | not | before | after | contains | greater | less | equal)+>
+<!ELEMENT and (and | or | not | before | after | tqcontains | greater | less | equal)+>
<!-- Logical or. Insert any number of conditions -->
-<!ELEMENT or (and | or | not | before | after | contains | greater | less | equal)+>
+<!ELEMENT or (and | or | not | before | after | tqcontains | greater | less | equal)+>
-<!-- Condition. Value is true if the object already contains
+<!-- Condition. Value is true if the object already tqcontains
objects of the given class or group before the insert point. -->
<!ELEMENT before (class | group)>
-<!-- Condition. Value is true if the object already contains
+<!-- Condition. Value is true if the object already tqcontains
objects of the given class or group after the insert point. -->
<!ELEMENT after (class | group)>
@@ -71,9 +71,9 @@
is less than the second. -->
<!ELEMENT less ((property | count | const), (property | count | const))>
-<!-- Condition. Value is true if the object contains
+<!-- Condition. Value is true if the object tqcontains
objects of the given classes and groups. -->
-<!ELEMENT contains (group | class)+>
+<!ELEMENT tqcontains (group | class)+>
<!-- Value. Value is the class property of the object, where the
diff --git a/kpovmodeler/pminsertrulesystem.cpp b/kpovmodeler/pminsertrulesystem.cpp
index 3c601df7..4e2b79c3 100644
--- a/kpovmodeler/pminsertrulesystem.cpp
+++ b/kpovmodeler/pminsertrulesystem.cpp
@@ -136,7 +136,7 @@ bool isCondition( TQDomElement& e )
{
return( e.tagName( ) == "not" || e.tagName( ) == "and" ||
e.tagName( ) == "or" || e.tagName( ) == "before" ||
- e.tagName( ) == "after" || e.tagName( ) == "contains" ||
+ e.tagName( ) == "after" || e.tagName( ) == "tqcontains" ||
e.tagName( ) == "greater" || e.tagName( ) == "less" ||
e.tagName( ) == "equal" );
}
@@ -168,7 +168,7 @@ PMRuleCondition* newCondition( TQDomElement& e,
return new PMRuleBefore( e, globalGroups, localGroups );
if( e.tagName( ) == "after" )
return new PMRuleAfter( e, globalGroups, localGroups );
- if( e.tagName( ) == "contains" )
+ if( e.tagName( ) == "tqcontains" )
return new PMRuleContains( e, globalGroups, localGroups );
if( e.tagName( ) == "greater" )
return new PMRuleGreater( e, globalGroups, localGroups );
@@ -181,15 +181,15 @@ PMRuleCondition* newCondition( TQDomElement& e,
PMRuleBase::~PMRuleBase( )
{
- m_children.setAutoDelete( true );
- m_children.clear( );
+ m_tqchildren.setAutoDelete( true );
+ m_tqchildren.clear( );
}
void PMRuleBase::countChild( const TQString& className, bool afterInsertPoint )
{
countChildProtected( className, afterInsertPoint );
- TQPtrListIterator<PMRuleBase> it( m_children );
+ TQPtrListIterator<PMRuleBase> it( m_tqchildren );
for( ; it.current( ); ++it )
it.current( )->countChild( className, afterInsertPoint );
}
@@ -198,7 +198,7 @@ void PMRuleBase::reset( )
{
resetProtected( );
- TQPtrListIterator<PMRuleBase> it( m_children );
+ TQPtrListIterator<PMRuleBase> it( m_tqchildren );
for( ; it.current( ); ++it )
it.current( )->reset( );
}
@@ -302,7 +302,7 @@ PMRuleNot::PMRuleNot( TQDomElement& e,
if( isCondition( me ) )
{
m_pChild = newCondition( me, globalGroups, localGroups );
- m_children.append( m_pChild );
+ m_tqchildren.append( m_pChild );
}
}
m = m.nextSibling( );
@@ -330,7 +330,7 @@ PMRuleAnd::PMRuleAnd( TQDomElement& e,
if( isCondition( me ) )
{
PMRuleCondition* c = newCondition( me, globalGroups, localGroups );
- m_children.append( c );
+ m_tqchildren.append( c );
m_conditions.append( c );
}
}
@@ -361,7 +361,7 @@ PMRuleOr::PMRuleOr( TQDomElement& e,
if( isCondition( me ) )
{
PMRuleCondition* c = newCondition( me, globalGroups, localGroups );
- m_children.append( c );
+ m_tqchildren.append( c );
m_conditions.append( c );
}
}
@@ -383,7 +383,7 @@ PMRuleBefore::PMRuleBefore( TQDomElement& e,
TQPtrList<PMRuleDefineGroup>& localGroups )
: PMRuleCondition( )
{
- m_contains = false;
+ m_tqcontains = false;
TQDomNode m = e.firstChild( );
while( !m.isNull( ) )
{
@@ -405,23 +405,23 @@ PMRuleBefore::~PMRuleBefore( )
bool PMRuleBefore::evaluate( const PMObject* )
{
- return m_contains;
+ return m_tqcontains;
}
void PMRuleBefore::countChildProtected( const TQString& className,
bool afterInsertPoint )
{
- if( afterInsertPoint && !m_contains )
+ if( afterInsertPoint && !m_tqcontains )
{
TQPtrListIterator<PMRuleCategory> it( m_categories );
- for( ; it.current( ) && !m_contains; ++it )
- m_contains = it.current( )->matches( className );
+ for( ; it.current( ) && !m_tqcontains; ++it )
+ m_tqcontains = it.current( )->matches( className );
}
}
void PMRuleBefore::resetProtected( )
{
- m_contains = false;
+ m_tqcontains = false;
}
PMRuleAfter::PMRuleAfter( TQDomElement& e,
@@ -429,7 +429,7 @@ PMRuleAfter::PMRuleAfter( TQDomElement& e,
TQPtrList<PMRuleDefineGroup>& localGroups )
: PMRuleCondition( )
{
- m_contains = false;
+ m_tqcontains = false;
TQDomNode m = e.firstChild( );
while( !m.isNull( ) )
{
@@ -451,23 +451,23 @@ PMRuleAfter::~PMRuleAfter( )
bool PMRuleAfter::evaluate( const PMObject* )
{
- return m_contains;
+ return m_tqcontains;
}
void PMRuleAfter::countChildProtected( const TQString& className,
bool afterInsertPoint )
{
- if( !afterInsertPoint && !m_contains )
+ if( !afterInsertPoint && !m_tqcontains )
{
TQPtrListIterator<PMRuleCategory> it( m_categories );
- for( ; it.current( ) && !m_contains; ++it )
- m_contains = it.current( )->matches( className );
+ for( ; it.current( ) && !m_tqcontains; ++it )
+ m_tqcontains = it.current( )->matches( className );
}
}
void PMRuleAfter::resetProtected( )
{
- m_contains = false;
+ m_tqcontains = false;
}
PMRuleContains::PMRuleContains( TQDomElement& e,
@@ -475,7 +475,7 @@ PMRuleContains::PMRuleContains( TQDomElement& e,
TQPtrList<PMRuleDefineGroup>& localGroups )
: PMRuleCondition( )
{
- m_contains = false;
+ m_tqcontains = false;
TQDomNode m = e.firstChild( );
while( !m.isNull( ) )
{
@@ -497,22 +497,22 @@ PMRuleContains::~PMRuleContains( )
bool PMRuleContains::evaluate( const PMObject* )
{
- return m_contains;
+ return m_tqcontains;
}
void PMRuleContains::countChildProtected( const TQString& className, bool )
{
- if( !m_contains )
+ if( !m_tqcontains )
{
TQPtrListIterator<PMRuleCategory> it( m_categories );
- for( ; it.current( ) && !m_contains; ++it )
- m_contains = it.current( )->matches( className );
+ for( ; it.current( ) && !m_tqcontains; ++it )
+ m_tqcontains = it.current( )->matches( className );
}
}
void PMRuleContains::resetProtected( )
{
- m_contains = false;
+ m_tqcontains = false;
}
PMRuleCompare::PMRuleCompare( TQDomElement& e,
@@ -533,7 +533,7 @@ PMRuleCompare::PMRuleCompare( TQDomElement& e,
if( isValue( me ) )
{
m_pValue[i] = newValue( me, globalGroups, localGroups );
- m_children.append( m_pValue[i] );
+ m_tqchildren.append( m_pValue[i] );
i++;
}
}
@@ -745,7 +745,7 @@ PMRule::PMRule( TQDomElement& e,
else if( isCondition( me ) )
{
m_pCondition = newCondition( me, globalGroups, localGroups );
- m_children.append( m_pCondition );
+ m_tqchildren.append( m_pCondition );
}
}
m = m.nextSibling( );
@@ -767,12 +767,12 @@ bool PMRule::matches( const TQString& className )
return m;
}
-bool PMRule::evaluate( const PMObject* parent )
+bool PMRule::evaluate( const PMObject* tqparent )
{
if( !m_pCondition )
return true;
else
- return m_pCondition->evaluate( parent );
+ return m_pCondition->evaluate( tqparent );
}
PMRuleTargetClass::PMRuleTargetClass( TQDomElement& e,
@@ -829,7 +829,7 @@ PMInsertRuleSystem::~PMInsertRuleSystem( )
void PMInsertRuleSystem::loadRules( const TQString& fileName )
{
PMRuleClass::s_pPrototypeManager = m_pPart->prototypeManager( );
- if( m_loadedFiles.find( fileName ) != m_loadedFiles.end( ) )
+ if( m_loadedFiles.tqfind( fileName ) != m_loadedFiles.end( ) )
return;
m_loadedFiles.push_back( fileName );
@@ -877,7 +877,7 @@ void PMInsertRuleSystem::loadRules( const TQString& fileName )
PMRuleTargetClass* target = 0;
if( !m_rulesDict.isEmpty( ) )
- target = m_rulesDict.find( className );
+ target = m_rulesDict.tqfind( className );
if( target )
target->appendRules( ce, m_groups );
@@ -897,7 +897,7 @@ void PMInsertRuleSystem::loadRules( const TQString& fileName )
PMRuleClass::s_pPrototypeManager = 0;
}
-bool PMInsertRuleSystem::canInsert( const PMObject* parentObject,
+bool PMInsertRuleSystem::canInsert( const PMObject* tqparentObject,
const TQString& className,
const PMObject* after,
const PMObjectList* objectsBetween )
@@ -905,10 +905,10 @@ bool PMInsertRuleSystem::canInsert( const PMObject* parentObject,
bool possible = false;
// find rules for target class
- PMMetaObject* meta = parentObject->metaObject( );
+ PMMetaObject* meta = tqparentObject->tqmetaObject( );
for( ; meta && !possible; meta = meta->superClass( ) )
{
- PMRuleTargetClass* tc = m_rulesDict.find( meta->className( ) );
+ PMRuleTargetClass* tc = m_rulesDict.tqfind( meta->className( ) );
if( tc )
{
// check the exception list
@@ -917,7 +917,7 @@ bool PMInsertRuleSystem::canInsert( const PMObject* parentObject,
TQStringList::ConstIterator it;
for( it = exceptions.begin( );
it != exceptions.end( ) && !exceptionFound; ++it )
- if( parentObject->isA( *it ) )
+ if( tqparentObject->isA( *it ) )
exceptionFound = true;
if( !exceptionFound )
@@ -935,7 +935,7 @@ bool PMInsertRuleSystem::canInsert( const PMObject* parentObject,
// count already inserted child objects
bool afterInsertPoint = false;
- PMObject* o = parentObject->firstChild( );
+ PMObject* o = tqparentObject->firstChild( );
if( !after )
afterInsertPoint = true;
for( ; o; o = o->nextSibling( ) )
@@ -952,7 +952,7 @@ bool PMInsertRuleSystem::canInsert( const PMObject* parentObject,
}
// evaluate condition value
- possible = rule->evaluate( parentObject );
+ possible = rule->evaluate( tqparentObject );
}
}
}
@@ -962,15 +962,15 @@ bool PMInsertRuleSystem::canInsert( const PMObject* parentObject,
return possible;
}
-bool PMInsertRuleSystem::canInsert( const PMObject* parentObject,
+bool PMInsertRuleSystem::canInsert( const PMObject* tqparentObject,
const PMObject* object,
const PMObject* after,
const PMObjectList* objectsBetween )
{
- return canInsert( parentObject, object->type( ), after, objectsBetween );
+ return canInsert( tqparentObject, object->type( ), after, objectsBetween );
}
-int PMInsertRuleSystem::canInsert( const PMObject* parentObject,
+int PMInsertRuleSystem::canInsert( const PMObject* tqparentObject,
const PMObjectList& list,
const PMObject* after )
{
@@ -978,17 +978,17 @@ int PMInsertRuleSystem::canInsert( const PMObject* parentObject,
TQStringList classes;
for( ; it.current( ); ++it )
classes.append( it.current( )->type( ) );
- return canInsert( parentObject, classes, after );
+ return canInsert( tqparentObject, classes, after );
}
-int PMInsertRuleSystem::canInsert( const PMObject* parentObject,
+int PMInsertRuleSystem::canInsert( const PMObject* tqparentObject,
const TQStringList& list,
const PMObject* after )
{
if( list.size( ) == 1 )
{
// more efficient
- if( canInsert( parentObject, list.first( ), after ) )
+ if( canInsert( tqparentObject, list.first( ), after ) )
return 1;
else
return 0;
@@ -996,17 +996,17 @@ int PMInsertRuleSystem::canInsert( const PMObject* parentObject,
// find rules for target class
TQPtrList<PMRuleTargetClass> targetClassList;
- PMMetaObject* meta = parentObject->metaObject( );
+ PMMetaObject* meta = tqparentObject->tqmetaObject( );
for( ; meta; meta = meta->superClass( ) )
{
- PMRuleTargetClass* tc = m_rulesDict.find( meta->className( ) );
+ PMRuleTargetClass* tc = m_rulesDict.tqfind( meta->className( ) );
if( tc )
targetClassList.append( tc );
}
if( targetClassList.isEmpty( ) )
return 0; // not rules found
- // count already inserted children
+ // count already inserted tqchildren
TQPtrListIterator<PMRuleTargetClass> tit( targetClassList );
for( ; tit.current( ); ++tit ) // ... for all target classes
{
@@ -1015,7 +1015,7 @@ int PMInsertRuleSystem::canInsert( const PMObject* parentObject,
{
rit.current( )->reset( );
bool afterInsertPoint = false;
- PMObject* o = parentObject->firstChild( );
+ PMObject* o = tqparentObject->firstChild( );
if( !after )
afterInsertPoint = true;
for( ; o; o = o->nextSibling( ) )
@@ -1041,7 +1041,7 @@ int PMInsertRuleSystem::canInsert( const PMObject* parentObject,
{
PMRule* rule = rit.current( );
if( rule->matches( *oit ) )
- possible = rule->evaluate( parentObject );
+ possible = rule->evaluate( tqparentObject );
}
}
if( possible )
diff --git a/kpovmodeler/pminsertrulesystem.h b/kpovmodeler/pminsertrulesystem.h
index 69f78deb..c280bcc2 100644
--- a/kpovmodeler/pminsertrulesystem.h
+++ b/kpovmodeler/pminsertrulesystem.h
@@ -154,7 +154,7 @@ public:
*/
TQPtrListIterator<PMRuleBase> childIterator( ) const
{
- return TQPtrListIterator<PMRuleBase>( m_children );
+ return TQPtrListIterator<PMRuleBase>( m_tqchildren );
}
protected:
/**
@@ -170,7 +170,7 @@ protected:
/**
* Add all child nodes to this list.
*/
- TQPtrList<PMRuleBase> m_children;
+ TQPtrList<PMRuleBase> m_tqchildren;
};
/**
@@ -344,7 +344,7 @@ private:
};
/**
- * Condition. Value is true if the object already contains
+ * Condition. Value is true if the object already tqcontains
* objects of certaint classes before the insert point.
*/
class PMRuleBefore : public PMRuleCondition
@@ -371,11 +371,11 @@ protected:
virtual void resetProtected( );
private:
TQPtrList<PMRuleCategory> m_categories;
- bool m_contains;
+ bool m_tqcontains;
};
/**
- * Condition. Value is true if the object already contains
+ * Condition. Value is true if the object already tqcontains
* objects of certaint classes after the insert point.
*/
class PMRuleAfter : public PMRuleCondition
@@ -402,11 +402,11 @@ protected:
virtual void resetProtected( );
private:
TQPtrList<PMRuleCategory> m_categories;
- bool m_contains;
+ bool m_tqcontains;
};
/**
- * Condition. Value is true if the object already contains
+ * Condition. Value is true if the object already tqcontains
* objects of certaint classes.
*/
class PMRuleContains : public PMRuleCondition
@@ -433,7 +433,7 @@ protected:
virtual void resetProtected( );
private:
TQPtrList<PMRuleCategory> m_categories;
- bool m_contains;
+ bool m_tqcontains;
};
/**
@@ -535,7 +535,7 @@ public:
/**
* Returns the conditions value.
*/
- bool evaluate( const PMObject* parent );
+ bool evaluate( const PMObject* tqparent );
private:
TQPtrList<PMRuleCategory> m_categories;
@@ -561,7 +561,7 @@ public:
~PMRuleTargetClass( );
/**
- * Reads rules and groups from the QDomELement and appends
+ * Reads rules and groups from the TQDomELement and appends
* them to the local ones.
*/
void appendRules( TQDomElement& e, TQPtrList<PMRuleDefineGroup>& globalGroups );
@@ -624,7 +624,7 @@ public:
* The parser uses the third parameter for top level objects. These objects
* have to be treated as if they are inserted after the object after.
*/
- bool canInsert( const PMObject* parentObject, const TQString& className,
+ bool canInsert( const PMObject* tqparentObject, const TQString& className,
const PMObject* after, const PMObjectList* objectsBetween = 0 );
/**
@@ -634,20 +634,20 @@ public:
* The parser uses the third parameter for top level objects. These objects
* have to be treated as if they are inserted after the object after.
*
- * Same as canInsert( parentObject, object->class( ), after, objectsBetween )
+ * Same as canInsert( tqparentObject, object->class( ), after, objectsBetween )
*/
- bool canInsert( const PMObject* parentObject, const PMObject* object,
+ bool canInsert( const PMObject* tqparentObject, const PMObject* object,
const PMObject* after, const PMObjectList* objectsBetween = 0 );
/**
* Returns the number of objects that can be inserted at that position
*/
- int canInsert( const PMObject* parentObject, const PMObjectList& list,
+ int canInsert( const PMObject* tqparentObject, const PMObjectList& list,
const PMObject* after );
/**
* Returns the number of objects that can be inserted at that position
*/
- int canInsert( const PMObject* parentObject, const TQStringList& listOfClasses,
+ int canInsert( const PMObject* tqparentObject, const TQStringList& listOfClasses,
const PMObject* after );
/**
* Returns a pointer to the part
diff --git a/kpovmodeler/pminterior.cpp b/kpovmodeler/pminterior.cpp
index 53a69f79..b435ff29 100644
--- a/kpovmodeler/pminterior.cpp
+++ b/kpovmodeler/pminterior.cpp
@@ -76,11 +76,11 @@ PMInterior::~PMInterior( )
{
}
-PMMetaObject* PMInterior::metaObject( ) const
+PMMetaObject* PMInterior::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "Interior", Base::metaObject( ),
+ s_pMetaObject = new PMMetaObject( "Interior", Base::tqmetaObject( ),
createNewInterior );
s_pMetaObject->addProperty(
new PMInteriorProperty( "ior", &PMInterior::setIor, &PMInterior::ior ) );
@@ -281,9 +281,9 @@ void PMInterior::enableFadePower( bool c )
}
}
-PMDialogEditBase* PMInterior::editWidget( TQWidget* parent ) const
+PMDialogEditBase* PMInterior::editWidget( TQWidget* tqparent ) const
{
- return new PMInteriorEdit( parent );
+ return new PMInteriorEdit( tqparent );
}
void PMInterior::restoreMemento( PMMemento* s )
diff --git a/kpovmodeler/pminterior.h b/kpovmodeler/pminterior.h
index 8e3c9172..234ad932 100644
--- a/kpovmodeler/pminterior.h
+++ b/kpovmodeler/pminterior.h
@@ -53,7 +53,7 @@ public:
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void cleanUp( ) const;
@@ -65,7 +65,7 @@ public:
/**
* Returns a new @ref PMInteriorEdit
*/
- virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
+ virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
/** */
virtual TQString pixmap( ) const { return TQString( "pminterior" ); }
diff --git a/kpovmodeler/pminterioredit.cpp b/kpovmodeler/pminterioredit.cpp
index 4b8b2381..0149b01a 100644
--- a/kpovmodeler/pminterioredit.cpp
+++ b/kpovmodeler/pminterioredit.cpp
@@ -27,8 +27,8 @@
#include <klocale.h>
-PMInteriorEdit::PMInteriorEdit( TQWidget* parent, const char* name )
- : Base( parent, name )
+PMInteriorEdit::PMInteriorEdit( TQWidget* tqparent, const char* name )
+ : Base( tqparent, name )
{
m_pDisplayedObject = 0;
}
@@ -38,33 +38,33 @@ void PMInteriorEdit::createTopWidgets( )
Base::createTopWidgets( );
TQHBoxLayout* hl = new TQHBoxLayout( topLayout( ) );
- TQGridLayout* layout = new TQGridLayout( hl ,17 ,6);
+ TQGridLayout* tqlayout = new TQGridLayout( hl ,17 ,6);
m_pEnableIorEdit = new TQCheckBox( i18n( "Refraction:" ), this );
m_pIorEdit = new PMFloatEdit( this );
- layout->addWidget( m_pEnableIorEdit, 0, 0 );
- layout->addWidget( m_pIorEdit, 0, 1 );
+ tqlayout->addWidget( m_pEnableIorEdit, 0, 0 );
+ tqlayout->addWidget( m_pIorEdit, 0, 1 );
m_pEnableCausticsEdit = new TQCheckBox( i18n( "Caustics:" ), this );
m_pCausticsEdit = new PMFloatEdit( this );
- layout->addWidget( m_pEnableCausticsEdit, 1, 0 );
- layout->addWidget( m_pCausticsEdit, 1, 1 );
+ tqlayout->addWidget( m_pEnableCausticsEdit, 1, 0 );
+ tqlayout->addWidget( m_pCausticsEdit, 1, 1 );
m_pEnableDispersionEdit = new TQCheckBox( i18n( "Dispersion:" ), this );
m_pDispersionEdit = new PMFloatEdit( this );
m_pDispersionEdit->setValidation( true, 0, false, 0 );
- layout->addWidget( m_pEnableDispersionEdit, 2, 0 );
- layout->addWidget( m_pDispersionEdit, 2, 1 );
+ tqlayout->addWidget( m_pEnableDispersionEdit, 2, 0 );
+ tqlayout->addWidget( m_pDispersionEdit, 2, 1 );
m_pEnableDispSamplesEdit = new TQCheckBox( i18n( "Dispersion samples:" ), this );
m_pDispSamplesEdit = new PMIntEdit( this );
m_pDispSamplesEdit->setValidation( true, 2, false, 0 );
- layout->addWidget( m_pEnableDispSamplesEdit, 3, 0 );
- layout->addWidget( m_pDispSamplesEdit, 3, 1 );
+ tqlayout->addWidget( m_pEnableDispSamplesEdit, 3, 0 );
+ tqlayout->addWidget( m_pDispSamplesEdit, 3, 1 );
m_pEnableFadeDistanceEdit = new TQCheckBox( i18n( "Fade distance:" ), this );
m_pFadeDistanceEdit = new PMFloatEdit( this );
- layout->addWidget( m_pEnableFadeDistanceEdit, 4, 0 );
- layout->addWidget( m_pFadeDistanceEdit, 4, 1 );
+ tqlayout->addWidget( m_pEnableFadeDistanceEdit, 4, 0 );
+ tqlayout->addWidget( m_pFadeDistanceEdit, 4, 1 );
m_pEnableFadePowerEdit = new TQCheckBox( i18n( "Fade power:" ), this );
m_pFadePowerEdit = new PMFloatEdit( this );
- layout->addWidget( m_pEnableFadePowerEdit, 5, 0 );
- layout->addWidget( m_pFadePowerEdit, 5, 1 );
+ tqlayout->addWidget( m_pEnableFadePowerEdit, 5, 0 );
+ tqlayout->addWidget( m_pFadePowerEdit, 5, 1 );
hl->addStretch( 1 );
connect( m_pIorEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
diff --git a/kpovmodeler/pminterioredit.h b/kpovmodeler/pminterioredit.h
index d8512d5e..9c4c438a 100644
--- a/kpovmodeler/pminterioredit.h
+++ b/kpovmodeler/pminterioredit.h
@@ -39,12 +39,13 @@ class TQLabel;
class PMInteriorEdit : public PMTextureBaseEdit
{
Q_OBJECT
+ TQ_OBJECT
typedef PMTextureBaseEdit Base;
public:
/**
- * Creates a PMInteriorEdit with parent and name
+ * Creates a PMInteriorEdit with tqparent and name
*/
- PMInteriorEdit( TQWidget* parent, const char* name = 0 );
+ PMInteriorEdit( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displayObject( PMObject* o );
diff --git a/kpovmodeler/pminteriortexture.cpp b/kpovmodeler/pminteriortexture.cpp
index 92950050..3633b2a8 100644
--- a/kpovmodeler/pminteriortexture.cpp
+++ b/kpovmodeler/pminteriortexture.cpp
@@ -43,11 +43,11 @@ PMInteriorTexture::~PMInteriorTexture( )
{
}
-PMMetaObject* PMInteriorTexture::metaObject( ) const
+PMMetaObject* PMInteriorTexture::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "InteriorTexture", Base::metaObject( ),
+ s_pMetaObject = new PMMetaObject( "InteriorTexture", Base::tqmetaObject( ),
createNewInteriorTexture );
}
return s_pMetaObject;
@@ -68,8 +68,8 @@ TQString PMInteriorTexture::description( ) const
return i18n( "interior texture" );
}
-PMDialogEditBase* PMInteriorTexture::editWidget( TQWidget* parent ) const
+PMDialogEditBase* PMInteriorTexture::editWidget( TQWidget* tqparent ) const
{
- return new PMInteriorTextureEdit( parent );
+ return new PMInteriorTextureEdit( tqparent );
}
diff --git a/kpovmodeler/pminteriortexture.h b/kpovmodeler/pminteriortexture.h
index 0711b5c9..1f84b512 100644
--- a/kpovmodeler/pminteriortexture.h
+++ b/kpovmodeler/pminteriortexture.h
@@ -52,14 +52,14 @@ public:
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void cleanUp( ) const;
/**
* Returns a new @ref PMTextureEdit
*/
- virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
+ virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
/** */
virtual TQString pixmap( ) const { return TQString( "pminteriortexture" ); }
diff --git a/kpovmodeler/pminteriortextureedit.cpp b/kpovmodeler/pminteriortextureedit.cpp
index 73f1e7e9..b13d3f7d 100644
--- a/kpovmodeler/pminteriortextureedit.cpp
+++ b/kpovmodeler/pminteriortextureedit.cpp
@@ -25,8 +25,8 @@
#include <klocale.h>
-PMInteriorTextureEdit::PMInteriorTextureEdit( TQWidget* parent, const char* name )
- : Base( parent, name )
+PMInteriorTextureEdit::PMInteriorTextureEdit( TQWidget* tqparent, const char* name )
+ : Base( tqparent, name )
{
m_pDisplayedObject = 0;
}
diff --git a/kpovmodeler/pminteriortextureedit.h b/kpovmodeler/pminteriortextureedit.h
index ab46142d..a576c926 100644
--- a/kpovmodeler/pminteriortextureedit.h
+++ b/kpovmodeler/pminteriortextureedit.h
@@ -34,12 +34,13 @@ class PMInteriorTexture;
class PMInteriorTextureEdit : public PMTextureBaseEdit
{
Q_OBJECT
+ TQ_OBJECT
typedef PMTextureBaseEdit Base;
public:
/**
- * Creates a PMTextureEdit with parent and name
+ * Creates a PMTextureEdit with tqparent and name
*/
- PMInteriorTextureEdit( TQWidget* parent, const char* name = 0 );
+ PMInteriorTextureEdit( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displayObject( PMObject* o );
diff --git a/kpovmodeler/pmiomanager.cpp b/kpovmodeler/pmiomanager.cpp
index 946f2bc5..14aab5f5 100644
--- a/kpovmodeler/pmiomanager.cpp
+++ b/kpovmodeler/pmiomanager.cpp
@@ -47,9 +47,9 @@ void PMIOManager::addFormat( PMIOFormat* format )
{
if( !format )
return;
- if( !m_formats.containsRef( format ) )
+ if( !m_formats.tqcontainsRef( format ) )
{
- if( !m_dict.find( format->name( ) ) )
+ if( !m_dict.tqfind( format->name( ) ) )
{
m_formats.append( format );
m_dict.insert( format->name( ), format );
@@ -73,7 +73,7 @@ void PMIOManager::removeFormat( const TQString& name )
PMIOFormat* PMIOManager::format( const TQString& name ) const
{
- return m_dict.find( name );
+ return m_dict.tqfind( name );
}
PMIOFormat* PMIOManager::formatForMimeType( const TQString& mime ) const
diff --git a/kpovmodeler/pmiomanager.h b/kpovmodeler/pmiomanager.h
index f167068f..b4df4fad 100644
--- a/kpovmodeler/pmiomanager.h
+++ b/kpovmodeler/pmiomanager.h
@@ -118,7 +118,7 @@ public:
*/
virtual TQString mimeType( ) const
{
- return TQString::null;
+ return TQString();
}
/**
* Returns a list of patterns for the import file dialog
diff --git a/kpovmodeler/pmisosurface.cpp b/kpovmodeler/pmisosurface.cpp
index c32c0683..94c28886 100644
--- a/kpovmodeler/pmisosurface.cpp
+++ b/kpovmodeler/pmisosurface.cpp
@@ -157,11 +157,11 @@ void PMIsoSurface::readAttributes( const PMXMLHelper& h )
Base::readAttributes( h );
}
-PMMetaObject* PMIsoSurface::metaObject( ) const
+PMMetaObject* PMIsoSurface::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "IsoSurface", Base::metaObject( ),
+ s_pMetaObject = new PMMetaObject( "IsoSurface", Base::tqmetaObject( ),
createNewIsoSurface );
// TODO
/*
@@ -333,9 +333,9 @@ void PMIsoSurface::setAllIntersections( bool yes )
}
}
-PMDialogEditBase* PMIsoSurface::editWidget( TQWidget* parent ) const
+PMDialogEditBase* PMIsoSurface::editWidget( TQWidget* tqparent ) const
{
- return new PMIsoSurfaceEdit( parent );
+ return new PMIsoSurfaceEdit( tqparent );
}
void PMIsoSurface::restoreMemento( PMMemento* s )
diff --git a/kpovmodeler/pmisosurface.h b/kpovmodeler/pmisosurface.h
index 2a2fb358..298f7b26 100644
--- a/kpovmodeler/pmisosurface.h
+++ b/kpovmodeler/pmisosurface.h
@@ -60,7 +60,7 @@ public:
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
@@ -69,7 +69,7 @@ public:
/**
* Returns a new @ref PMIsoSurfaceEdit
*/
- virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
+ virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
/**
* Returns the name of the pixmap that is displayed in the tree view
* and dialog view
diff --git a/kpovmodeler/pmisosurfaceedit.cpp b/kpovmodeler/pmisosurfaceedit.cpp
index 752331b6..69338bcb 100644
--- a/kpovmodeler/pmisosurfaceedit.cpp
+++ b/kpovmodeler/pmisosurfaceedit.cpp
@@ -28,8 +28,8 @@
#include <tqcheckbox.h>
#include <klocale.h>
-PMIsoSurfaceEdit::PMIsoSurfaceEdit( TQWidget* parent, const char* name )
- : Base( parent, name )
+PMIsoSurfaceEdit::PMIsoSurfaceEdit( TQWidget* tqparent, const char* name )
+ : Base( tqparent, name )
{
m_pDisplayedObject = 0;
}
@@ -96,7 +96,7 @@ void PMIsoSurfaceEdit::createTopWidgets( )
hl->addWidget( new TQLabel( i18n( "Values:" ), this ) );
for( i = 0; i < 3; i++ )
{
- hl->addWidget( new TQLabel( TQString( "P%1" ).arg( i ), this ) );
+ hl->addWidget( new TQLabel( TQString( "P%1" ).tqarg( i ), this ) );
hl->addWidget( m_pEvaluateValue[i] );
}
diff --git a/kpovmodeler/pmisosurfaceedit.h b/kpovmodeler/pmisosurfaceedit.h
index 09798c0d..c0a1dda4 100644
--- a/kpovmodeler/pmisosurfaceedit.h
+++ b/kpovmodeler/pmisosurfaceedit.h
@@ -41,12 +41,13 @@ class TQLineEdit;
class PMIsoSurfaceEdit : public PMSolidObjectEdit
{
Q_OBJECT
+ TQ_OBJECT
typedef PMSolidObjectEdit Base;
public:
/**
- * Creates a PMIsoSurfaceEdit with parent and name
+ * Creates a PMIsoSurfaceEdit with tqparent and name
*/
- PMIsoSurfaceEdit( TQWidget* parent, const char* name = 0 );
+ PMIsoSurfaceEdit( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displayObject( PMObject* o );
diff --git a/kpovmodeler/pmjuliafractal.cpp b/kpovmodeler/pmjuliafractal.cpp
index 5929a058..5a665606 100644
--- a/kpovmodeler/pmjuliafractal.cpp
+++ b/kpovmodeler/pmjuliafractal.cpp
@@ -112,11 +112,11 @@ void PMJuliaFractal::readAttributes( const PMXMLHelper& h )
Base::readAttributes( h );
}
-PMMetaObject* PMJuliaFractal::metaObject( ) const
+PMMetaObject* PMJuliaFractal::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "JuliaFractal", Base::metaObject( ),
+ s_pMetaObject = new PMMetaObject( "JuliaFractal", Base::tqmetaObject( ),
createNewJuliaFractal );
s_pMetaObject->addProperty(
new PMJuliaFractalProperty( "juliaParameter", &PMJuliaFractal::setJuliaParameter,
@@ -272,9 +272,9 @@ void PMJuliaFractal::setExponent( const PMVector& e )
}
}
-PMDialogEditBase* PMJuliaFractal::editWidget( TQWidget* parent ) const
+PMDialogEditBase* PMJuliaFractal::editWidget( TQWidget* tqparent ) const
{
- return new PMJuliaFractalEdit( parent );
+ return new PMJuliaFractalEdit( tqparent );
}
void PMJuliaFractal::restoreMemento( PMMemento* s )
diff --git a/kpovmodeler/pmjuliafractal.h b/kpovmodeler/pmjuliafractal.h
index 1a113aa4..c57df549 100644
--- a/kpovmodeler/pmjuliafractal.h
+++ b/kpovmodeler/pmjuliafractal.h
@@ -61,7 +61,7 @@ public:
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void cleanUp( ) const;
@@ -72,7 +72,7 @@ public:
/**
* Returns a new @ref PMJuliaFractalEdit
*/
- virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
+ virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
/**
* Returns the name of the pixmap that is displayed in the tree view
* and dialog view
diff --git a/kpovmodeler/pmjuliafractaledit.cpp b/kpovmodeler/pmjuliafractaledit.cpp
index 4f595b0e..d0b79e59 100644
--- a/kpovmodeler/pmjuliafractaledit.cpp
+++ b/kpovmodeler/pmjuliafractaledit.cpp
@@ -27,8 +27,8 @@
#include <klocale.h>
#include <kmessagebox.h>
-PMJuliaFractalEdit::PMJuliaFractalEdit( TQWidget* parent, const char* name )
- : Base( parent, name )
+PMJuliaFractalEdit::PMJuliaFractalEdit( TQWidget* tqparent, const char* name )
+ : Base( tqparent, name )
{
m_pDisplayedObject = 0;
}
diff --git a/kpovmodeler/pmjuliafractaledit.h b/kpovmodeler/pmjuliafractaledit.h
index f2acb8f3..21be7989 100644
--- a/kpovmodeler/pmjuliafractaledit.h
+++ b/kpovmodeler/pmjuliafractaledit.h
@@ -39,12 +39,13 @@ class TQLabel;
class PMJuliaFractalEdit : public PMSolidObjectEdit
{
Q_OBJECT
+ TQ_OBJECT
typedef PMSolidObjectEdit Base;
public:
/**
- * Creates a PMJuliaFractalEdit with parent and name
+ * Creates a PMJuliaFractalEdit with tqparent and name
*/
- PMJuliaFractalEdit( TQWidget* parent, const char* name = 0 );
+ PMJuliaFractalEdit( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displayObject( PMObject* o );
diff --git a/kpovmodeler/pmlathe.cpp b/kpovmodeler/pmlathe.cpp
index 9f6a00ff..4418559a 100644
--- a/kpovmodeler/pmlathe.cpp
+++ b/kpovmodeler/pmlathe.cpp
@@ -198,11 +198,11 @@ void PMLathe::readAttributes( const PMXMLHelper& h )
Base::readAttributes( h );
}
-PMMetaObject* PMLathe::metaObject( ) const
+PMMetaObject* PMLathe::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "Lathe", Base::metaObject( ),
+ s_pMetaObject = new PMMetaObject( "Lathe", Base::tqmetaObject( ),
createNewLathe );
s_pMetaObject->addProperty(
new PMLatheProperty( "sturm", &PMLathe::setSturm, &PMLathe::sturm ) );
@@ -261,9 +261,9 @@ void PMLathe::setPoints( const TQValueList<PMVector>& points )
}
}
-PMDialogEditBase* PMLathe::editWidget( TQWidget* parent ) const
+PMDialogEditBase* PMLathe::editWidget( TQWidget* tqparent ) const
{
- return new PMLatheEdit( parent );
+ return new PMLatheEdit( tqparent );
}
void PMLathe::createMemento( )
@@ -549,10 +549,10 @@ void PMLathe::controlPoints( PMControlPointList& list )
lastPoint = cp;
if( d == 0 )
cp = new PM2DControlPoint( *it, PM2DControlPoint::PM2DXY, i,
- i18n( "Point %1 (xy)" ).arg( i + 1 ) );
+ i18n( "Point %1 (xy)" ).tqarg( i + 1 ) );
else
cp = new PM2DControlPoint( *it, PM2DControlPoint::PM2DZY, i,
- i18n( "Point %1 (xy)" ).arg( i + 1 ) );
+ i18n( "Point %1 (xy)" ).tqarg( i + 1 ) );
if( i == 0 )
firstPoint = cp;
@@ -573,10 +573,10 @@ void PMLathe::controlPoints( PMControlPointList& list )
int imod4 = i % 4;
if( d == 0 )
cp = new PM2DControlPoint( *it, PM2DControlPoint::PM2DXY, i,
- i18n( "Point %1 (xy)" ).arg( i + 1 ) );
+ i18n( "Point %1 (xy)" ).tqarg( i + 1 ) );
else
cp = new PM2DControlPoint( *it, PM2DControlPoint::PM2DZY, i,
- i18n( "Point %1 (xy)" ).arg( i + 1 ) );
+ i18n( "Point %1 (xy)" ).tqarg( i + 1 ) );
switch( imod4 )
{
case 0:
diff --git a/kpovmodeler/pmlathe.h b/kpovmodeler/pmlathe.h
index 20fa55b3..d2e0648f 100644
--- a/kpovmodeler/pmlathe.h
+++ b/kpovmodeler/pmlathe.h
@@ -63,7 +63,7 @@ public:
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void cleanUp( ) const;
@@ -74,7 +74,7 @@ public:
/**
* Returns a new @ref PMLatheEdit
*/
- virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
+ virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
/**
* Returns the name of the pixmap that is displayed in the tree view
* and dialog view
diff --git a/kpovmodeler/pmlatheedit.cpp b/kpovmodeler/pmlatheedit.cpp
index e90a4397..c048d095 100644
--- a/kpovmodeler/pmlatheedit.cpp
+++ b/kpovmodeler/pmlatheedit.cpp
@@ -33,8 +33,8 @@
#include <kiconloader.h>
#include <kmessagebox.h>
-PMLatheEdit::PMLatheEdit( TQWidget* parent, const char* name )
- : Base( parent, name )
+PMLatheEdit::PMLatheEdit( TQWidget* tqparent, const char* name )
+ : Base( tqparent, name )
{
m_pDisplayedObject = 0;
}
diff --git a/kpovmodeler/pmlatheedit.h b/kpovmodeler/pmlatheedit.h
index 92e92950..c33a9711 100644
--- a/kpovmodeler/pmlatheedit.h
+++ b/kpovmodeler/pmlatheedit.h
@@ -43,12 +43,13 @@ class TQLabel;
class PMLatheEdit : public PMSolidObjectEdit
{
Q_OBJECT
+ TQ_OBJECT
typedef PMSolidObjectEdit Base;
public:
/**
- * Creates a PMLatheEdit with parent and name
+ * Creates a PMLatheEdit with tqparent and name
*/
- PMLatheEdit( TQWidget* parent, const char* name = 0 );
+ PMLatheEdit( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displayObject( PMObject* o );
diff --git a/kpovmodeler/pmlayoutsettings.cpp b/kpovmodeler/pmlayoutsettings.cpp
index 1e20e326..acafe593 100644
--- a/kpovmodeler/pmlayoutsettings.cpp
+++ b/kpovmodeler/pmlayoutsettings.cpp
@@ -31,11 +31,11 @@
#include <klocale.h>
#include <kmessagebox.h>
-PMLayoutSettings::PMLayoutSettings( TQWidget* parent, const char* name )
- : PMSettingsDialogPage( parent, name )
+PMLayoutSettings::PMLayoutSettings( TQWidget* tqparent, const char* name )
+ : PMSettingsDialogPage( tqparent, name )
{
- TQHBoxLayout* hlayout;
- TQVBoxLayout* vlayout;
+ TQHBoxLayout* htqlayout;
+ TQVBoxLayout* vtqlayout;
TQVBoxLayout* gvl;
TQGridLayout* grid;
TQGroupBox* gb;
@@ -43,16 +43,16 @@ PMLayoutSettings::PMLayoutSettings( TQWidget* parent, const char* name )
TQHBoxLayout* ghe;
TQVBoxLayout* gvle;
- vlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
+ vtqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
- hlayout = new TQHBoxLayout( vlayout );
- hlayout->addWidget( new TQLabel( i18n( "Default view layout:" ), this ) );
+ htqlayout = new TQHBoxLayout( vtqlayout );
+ htqlayout->addWidget( new TQLabel( i18n( "Default view tqlayout:" ), this ) );
m_pDefaultLayout = new TQComboBox( this );
- hlayout->addWidget( m_pDefaultLayout, 1 );
- hlayout->addStretch( 1 );
+ htqlayout->addWidget( m_pDefaultLayout, 1 );
+ htqlayout->addStretch( 1 );
gb = new TQGroupBox( i18n( "Available View Layouts" ), this );
- vlayout->addWidget( gb );
+ vtqlayout->addWidget( gb );
gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) );
gvl->addSpacing( 10 );
@@ -180,13 +180,13 @@ PMLayoutSettings::PMLayoutSettings( TQWidget* parent, const char* name )
ghl->addStretch( 1 );
- vlayout->addStretch( 1 );
+ vtqlayout->addStretch( 1 );
}
void PMLayoutSettings::displaySettings( )
{
PMViewLayoutManager* m = PMViewLayoutManager::theManager( );
- m_viewLayouts = m->layouts( );
+ m_viewLayouts = m->tqlayouts( );
m_currentViewLayout = m_viewLayouts.begin( );
m_defaultViewLayout = m_viewLayouts.begin( );
for( ; ( m_defaultViewLayout != m_viewLayouts.end( ) ) &&
@@ -210,7 +210,7 @@ bool PMLayoutSettings::validateData( )
if( ( *lit ).name( ).isEmpty( ) )
{
emit showMe( );
- KMessageBox::error( this, i18n( "View layouts may not have empty names." ),
+ KMessageBox::error( this, i18n( "View tqlayouts may not have empty names." ),
i18n( "Error" ) );
return false;
}
@@ -220,7 +220,7 @@ bool PMLayoutSettings::validateData( )
if( ( *eit ).dockPosition( ) != PMDockWidget::DockRight )
{
emit showMe( );
- KMessageBox::error( this, i18n( "The docking position of the first view layout entry has to be 'New Column'." ),
+ KMessageBox::error( this, i18n( "The docking position of the first view tqlayout entry has to be 'New Column'." ),
i18n( "Error" ) );
return false;
}
@@ -262,7 +262,7 @@ void PMLayoutSettings::slotAddLayout( )
new_name = i18n( "Unnamed" );
str.setNum( i );
- while( m_pViewLayouts->findItem( new_name, Qt::ExactMatch ) )
+ while( m_pViewLayouts->tqfindItem( new_name, TQt::ExactMatch ) )
{
new_name = i18n( "Unnamed" ) + str;
i++;
@@ -275,7 +275,7 @@ void PMLayoutSettings::slotAddLayout( )
m_currentViewLayout++;
m_viewLayouts.insert( m_currentViewLayout, l );
displayLayoutList( );
- m_pViewLayouts->setCurrentItem( m_pViewLayouts->findItem( new_name, Qt::ExactMatch ) );
+ m_pViewLayouts->setCurrentItem( m_pViewLayouts->tqfindItem( new_name, TQt::ExactMatch ) );
m_pRemoveLayout->setEnabled( true );
}
@@ -720,8 +720,8 @@ void PMLayoutSettings::slotMoveDownViewEntryClicked( )
void PMLayoutSettings::displayCustomOptions( )
{
// delete an old widget
- if( m_pCustomOptionsHolder->layout( ) )
- delete m_pCustomOptionsHolder->layout( );
+ if( m_pCustomOptionsHolder->tqlayout( ) )
+ delete m_pCustomOptionsHolder->tqlayout( );
if( m_pCustomOptionsWidget )
{
delete m_pCustomOptionsWidget;
diff --git a/kpovmodeler/pmlayoutsettings.h b/kpovmodeler/pmlayoutsettings.h
index 9671d38a..a7c8401c 100644
--- a/kpovmodeler/pmlayoutsettings.h
+++ b/kpovmodeler/pmlayoutsettings.h
@@ -35,16 +35,17 @@ class TQPushButton;
class TQLabel;
/**
- * View layout configuration dialog page
+ * View tqlayout configuration dialog page
*/
class PMLayoutSettings : public PMSettingsDialogPage
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Default constructor
*/
- PMLayoutSettings( TQWidget* parent, const char* name = 0 );
+ PMLayoutSettings( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displaySettings( );
/** */
@@ -56,19 +57,19 @@ public:
protected slots:
/**
- * Called when the browse add layout button is clicked
+ * Called when the browse add tqlayout button is clicked
*/
void slotAddLayout( );
/**
- * Called when the remove layout button is clicked
+ * Called when the remove tqlayout button is clicked
*/
void slotRemoveLayout( );
/**
- * Called when the selected layout changes
+ * Called when the selected tqlayout changes
*/
void slotLayoutSelected( int i );
/**
- * Called when the layout name changes
+ * Called when the tqlayout name changes
*/
void slotLayoutNameChanged( const TQString& text );
/**
diff --git a/kpovmodeler/pmlibrarybrowser.cpp b/kpovmodeler/pmlibrarybrowser.cpp
index bc7e1af7..6ccfb077 100644
--- a/kpovmodeler/pmlibrarybrowser.cpp
+++ b/kpovmodeler/pmlibrarybrowser.cpp
@@ -47,9 +47,9 @@
// ************** PMLibraryBrowser **************************
-PMLibraryBrowserView::PMLibraryBrowserView( PMPart* /*part*/, TQWidget* parent /*= 0*/,
+PMLibraryBrowserView::PMLibraryBrowserView( PMPart* /*part*/, TQWidget* tqparent /*= 0*/,
const char* name /*=0*/ )
- : PMViewBase( parent, name )
+ : PMViewBase( tqparent, name )
{
TQHBoxLayout* hl = new TQHBoxLayout( this );
PMLibraryBrowserViewWidget* tv = new PMLibraryBrowserViewWidget( this );
@@ -61,8 +61,8 @@ TQString PMLibraryBrowserView::description( ) const
return i18n( "Library View" );
}
-PMLibraryBrowserViewWidget::PMLibraryBrowserViewWidget( TQWidget* parent, const char* name )
- : TQWidget( parent, name )
+PMLibraryBrowserViewWidget::PMLibraryBrowserViewWidget( TQWidget* tqparent, const char* name )
+ : TQWidget( tqparent, name )
{
setCaption( i18n( "Library Objects" ) );
diff --git a/kpovmodeler/pmlibrarybrowser.h b/kpovmodeler/pmlibrarybrowser.h
index b7a2d881..7c8a1899 100644
--- a/kpovmodeler/pmlibrarybrowser.h
+++ b/kpovmodeler/pmlibrarybrowser.h
@@ -40,7 +40,7 @@ class PMLibraryHandle;
class PMPart;
namespace KIO{ class Job; }
-typedef TQDict<TQString> QStringDict;
+typedef TQDict<TQString> TQStringDict;
/**
* Wrapper class for the treeview/dock widget
@@ -48,11 +48,12 @@ typedef TQDict<TQString> QStringDict;
class PMLibraryBrowserView : public PMViewBase
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Default constructor
*/
- PMLibraryBrowserView( PMPart* part, TQWidget* parent, const char* name = 0 );
+ PMLibraryBrowserView( PMPart* part, TQWidget* tqparent, const char* name = 0 );
/** */
virtual TQString viewType( ) const { return TQString( "librarybrowserview" ); }
@@ -63,11 +64,12 @@ public:
/**
* This class provides a non-modal dialog to browse the available libraries.
*/
-class PMLibraryBrowserViewWidget: public QWidget
+class PMLibraryBrowserViewWidget: public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
- PMLibraryBrowserViewWidget( TQWidget *parent, const char* name = NULL );
+ PMLibraryBrowserViewWidget( TQWidget *tqparent, const char* name = NULL );
private slots:
void resizeEvent( TQResizeEvent* ev );
@@ -110,9 +112,9 @@ public:
virtual TQString viewType( ) const { return TQString( "librarybrowserview" ); }
virtual TQString description( ) const;
virtual TQString iconName( ) const { return TQString( "pmlibrarybrowserview" ); }
- virtual PMViewBase* newInstance( TQWidget* parent, PMPart* part ) const
+ virtual PMViewBase* newInstance( TQWidget* tqparent, PMPart* part ) const
{
- return new PMLibraryBrowserView( part, parent );
+ return new PMLibraryBrowserView( part, tqparent );
}
};
diff --git a/kpovmodeler/pmlibraryentrypreview.cpp b/kpovmodeler/pmlibraryentrypreview.cpp
index 4fbde752..c2d90cdd 100644
--- a/kpovmodeler/pmlibraryentrypreview.cpp
+++ b/kpovmodeler/pmlibraryentrypreview.cpp
@@ -39,8 +39,8 @@
#include <kmessagebox.h>
#include <kfiledialog.h>
-PMLibraryEntryPreview::PMLibraryEntryPreview( TQWidget* parent ) :
- TQWidget( parent )
+PMLibraryEntryPreview::PMLibraryEntryPreview( TQWidget* tqparent ) :
+ TQWidget( tqparent )
{
setAcceptDrops( true );
m_pPart = new PMPart( this, "treeview", NULL, "part", false, true );
@@ -59,25 +59,25 @@ PMLibraryEntryPreview::PMLibraryEntryPreview( TQWidget* parent ) :
gl->setColStretch( 1, 1 );
TQLabel* lbl = new TQLabel( i18n( "Name: " ), this );
m_pName = new TQLineEdit( this );
- m_pName->setAlignment( Qt::AlignLeft );
+ m_pName->tqsetAlignment( TQt::AlignLeft );
m_pName->setReadOnly( true );
gl->addWidget( lbl, 0, 0 );
gl->addWidget( m_pName, 0, 1 );
lbl = new TQLabel( i18n( "Description:" ), this );
- lbl->setAlignment( Qt::AlignTop );
+ lbl->tqsetAlignment( TQt::AlignTop );
m_pDescription = new TQMultiLineEdit( this );
- m_pDescription->setAlignment( Qt::AlignTop | Qt::AlignLeft |
- Qt::WordBreak | Qt::DontClip );
+ m_pDescription->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft |
+ TQt::WordBreak | TQt::DontClip );
m_pDescription->setReadOnly( true );
gl->addWidget( lbl, 1, 0 );
gl->addWidget( m_pDescription, 1, 1 );
m_pKeywordsLabel = new TQLabel( i18n( "Keywords:" ), this );
- m_pKeywordsLabel->setAlignment( Qt::AlignTop );
+ m_pKeywordsLabel->tqsetAlignment( TQt::AlignTop );
m_pKeywords = new TQMultiLineEdit( this );
- m_pKeywords->setAlignment( Qt::AlignTop | Qt::AlignLeft |
- Qt::WordBreak | Qt::DontClip );
+ m_pKeywords->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft |
+ TQt::WordBreak | TQt::DontClip );
m_pKeywords->setReadOnly( true );
gl->addWidget( m_pKeywordsLabel, 2, 0 );
gl->addWidget( m_pKeywords, 2, 1 );
@@ -243,7 +243,7 @@ void PMLibraryEntryPreview::slotTextChanged( const TQString& /* s */)
void PMLibraryEntryPreview::slotPreviewClicked( )
{
- KFileDialog dlg( TQString::null, "", NULL, "", false );
+ KFileDialog dlg( TQString(), "", NULL, "", false );
dlg.setFilter( "image/jpeg image/gif image/tiff image/png image/x-bmp" );
if( dlg.exec( ) == TQDialog::Accepted )
@@ -302,7 +302,7 @@ bool PMLibraryEntryPreview::saveIfNeeded( bool forceSave )
// Add them to the object to save.
PMObjectDrag drag( m_pPart, sortedList );
- objToSave.setObjects( drag.encodedData( "application/x-kpovmodeler" ) );
+ objToSave.setObjects( drag.tqencodedData( "application/x-kpovmodeler" ) );
// Add the preview image
objToSave.setPreview( m_image.copy( ) );
diff --git a/kpovmodeler/pmlibraryentrypreview.h b/kpovmodeler/pmlibraryentrypreview.h
index 18736458..35ef5d52 100644
--- a/kpovmodeler/pmlibraryentrypreview.h
+++ b/kpovmodeler/pmlibraryentrypreview.h
@@ -39,12 +39,13 @@ class PMTreeView;
/**
* Preview widget for Library Objects and sub Libs.
*/
-class PMLibraryEntryPreview: public QWidget
+class PMLibraryEntryPreview: public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
/** Constructor */
- PMLibraryEntryPreview( TQWidget *parent );
+ PMLibraryEntryPreview( TQWidget *tqparent );
/** Destructor */
~PMLibraryEntryPreview( );
diff --git a/kpovmodeler/pmlibraryhandle.cpp b/kpovmodeler/pmlibraryhandle.cpp
index 8ba0f387..e22a37f2 100644
--- a/kpovmodeler/pmlibraryhandle.cpp
+++ b/kpovmodeler/pmlibraryhandle.cpp
@@ -302,7 +302,7 @@ PMLibraryHandle::PMResult PMLibraryHandle::createNewSubLibrary( const TQString /
if( m_readOnly )
return PMLibraryHandle::ReadOnlyLib;
- if( m_libraries.find( subLibName ) )
+ if( m_libraries.tqfind( subLibName ) )
return PMLibraryHandle::ExistingDir;
s = s+ "/libXXXXXX";
@@ -353,25 +353,25 @@ PMLibraryHandle::PMResult PMLibraryHandle::deleteSubLibrary( const TQString& sub
return PMLibraryHandle::NotInLib;
}
-PMLibraryHandle::PMResult PMLibraryHandle::changeParentLibrary( const TQString& parentPath )
+PMLibraryHandle::PMResult PMLibraryHandle::changeParentLibrary( const TQString& tqparentPath )
{
if( m_readOnly )
return PMLibraryHandle::ReadOnlyLib;
- TQString newPath = parentPath + "/" + m_path.section( '/', -1 );
+ TQString newPath = tqparentPath + "/" + m_path.section( '/', -1 );
PMLibraryHandle::EntryIterator itr( m_libraries );
for( ; itr.current( ); ++itr )
{
PMLibraryHandle lib = PMLibraryHandle( *itr.current( ) );
lib.changeParentLibrary( newPath );
- m_libraries.replace( itr.currentKey( ), new TQString( newPath + "/" + lib.path( ) ) );
+ m_libraries.tqreplace( itr.currentKey( ), new TQString( newPath + "/" + lib.path( ) ) );
}
PMLibraryHandle::EntryIterator objItr( m_objects );
for( ; objItr.current( ); ++objItr )
{
TQString test = newPath + "/" + objItr.current( )->section( '/', -1 );
- m_objects.replace( objItr.currentKey( ), new TQString( newPath + "/" + objItr.current( )->section( '/', -1 ) ) );
+ m_objects.tqreplace( objItr.currentKey( ), new TQString( newPath + "/" + objItr.current( )->section( '/', -1 ) ) );
}
saveLibraryInfo( );
diff --git a/kpovmodeler/pmlibraryhandle.h b/kpovmodeler/pmlibraryhandle.h
index 353b7b53..2263407e 100644
--- a/kpovmodeler/pmlibraryhandle.h
+++ b/kpovmodeler/pmlibraryhandle.h
@@ -180,11 +180,11 @@ public:
bool isSubLibrary( ) const { return m_subLibrary; }
/**
- * Changes the parent library if this is a sub library
- * @param parentPath The new parent path for this library
+ * Changes the tqparent library if this is a sub library
+ * @param tqparentPath The new tqparent path for this library
* @return PMLibraryHandle::Ok if successful or the reason for failure
*/
- PMLibraryHandle::PMResult changeParentLibrary( const TQString& parentPath );
+ PMLibraryHandle::PMResult changeParentLibrary( const TQString& tqparentPath );
private:
diff --git a/kpovmodeler/pmlibraryhandleedit.cpp b/kpovmodeler/pmlibraryhandleedit.cpp
index e991af6e..d29c1c1f 100644
--- a/kpovmodeler/pmlibraryhandleedit.cpp
+++ b/kpovmodeler/pmlibraryhandleedit.cpp
@@ -36,8 +36,8 @@
TQSize PMLibraryHandleEdit::s_size = TQSize( 600, 400 );
-PMLibraryHandleEdit::PMLibraryHandleEdit( PMLibraryHandle* lib, TQWidget* parent, const char* name )
- : KDialogBase( parent, name, true, i18n( "Create Library" ),
+PMLibraryHandleEdit::PMLibraryHandleEdit( PMLibraryHandle* lib, TQWidget* tqparent, const char* name )
+ : KDialogBase( tqparent, name, true, i18n( "Create Library" ),
Ok | Cancel, Ok )
{
m_pLibrary = lib;
diff --git a/kpovmodeler/pmlibraryhandleedit.h b/kpovmodeler/pmlibraryhandleedit.h
index d57b8e5e..77e3f0bd 100644
--- a/kpovmodeler/pmlibraryhandleedit.h
+++ b/kpovmodeler/pmlibraryhandleedit.h
@@ -37,12 +37,13 @@ class PMLibraryHandle;
class PMLibraryHandleEdit: public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Construct a dialog to edit the properties of lib. The library will be
* modified only if Ok is pressed.
*/
- PMLibraryHandleEdit( PMLibraryHandle* lib, TQWidget *parent = NULL, const char* name = NULL );
+ PMLibraryHandleEdit( PMLibraryHandle* lib, TQWidget *tqparent = NULL, const char* name = NULL );
static void saveConfig( KConfig* cfg );
static void restoreConfig( KConfig* cfg );
diff --git a/kpovmodeler/pmlibraryiconview.cpp b/kpovmodeler/pmlibraryiconview.cpp
index d2588dca..03fd15c5 100644
--- a/kpovmodeler/pmlibraryiconview.cpp
+++ b/kpovmodeler/pmlibraryiconview.cpp
@@ -50,11 +50,11 @@ const char* PMLibraryIconDrag::format( int i ) const
}
}
-TQByteArray PMLibraryIconDrag::encodedData( const char* mime ) const
+TQByteArray PMLibraryIconDrag::tqencodedData( const char* mime ) const
{
TQByteArray a;
if ( TQString( mime ) == "application/x-qiconlist" )
- a = TQIconDrag::encodedData( mime );
+ a = TQIconDrag::tqencodedData( mime );
else if ( TQString( mime ) == "text/sublib-list" )
{
TQString s , l;
@@ -80,7 +80,7 @@ bool PMLibraryIconDrag::canDecode( TQMimeSource* e )
bool PMLibraryIconDrag::decode( TQMimeSource* e, TQStringList& strList, TQValueList<bool>& subLibList )
{
- TQByteArray a = e->encodedData( "text/sublib-list" );
+ TQByteArray a = e->tqencodedData( "text/sublib-list" );
if( a.isEmpty( ) )
return false;
@@ -104,8 +104,8 @@ void PMLibraryIconDrag::append( const TQIconDragItem &item, const TQRect &pr,
m_subLibs.append( isSubLibrary );
}
-PMLibraryIconView::PMLibraryIconView( TQWidget* parent, const char* name )
- : KIconView( parent, name )
+PMLibraryIconView::PMLibraryIconView( TQWidget* tqparent, const char* name )
+ : KIconView( tqparent, name )
{
m_pLibrary = NULL;
m_pCurrentLibrary = NULL;
@@ -192,15 +192,15 @@ TQDragObject* PMLibraryIconView::dragObject( )
return drag;
}
-PMLibraryIconViewItem::PMLibraryIconViewItem( TQIconView *parent, const TQString &text, const TQString& path, bool isSubLibrary )
- : KIconViewItem( parent, text )
+PMLibraryIconViewItem::PMLibraryIconViewItem( TQIconView *tqparent, const TQString &text, const TQString& path, bool isSubLibrary )
+ : KIconViewItem( tqparent, text )
{
m_path = path;
m_isSubLibrary = isSubLibrary;
}
-PMLibraryIconViewItem::PMLibraryIconViewItem( TQIconView *parent, const TQString &text, const TQImage& image, const TQString& path, bool isSubLibrary )
- : KIconViewItem( parent, text, image )
+PMLibraryIconViewItem::PMLibraryIconViewItem( TQIconView *tqparent, const TQString &text, const TQImage& image, const TQString& path, bool isSubLibrary )
+ : KIconViewItem( tqparent, text, image )
{
m_path = path;
m_isSubLibrary = isSubLibrary;
@@ -220,10 +220,10 @@ void PMLibraryIconViewItem::dropped( TQDropEvent *e, const TQValueList<TQIconDra
TQValueList<bool> subLibList;
if( m_isSubLibrary && PMLibraryIconDrag::decode( e, pathList, subLibList ) )
{
- PMLibraryIconView* source = static_cast<PMLibraryIconView*>( e->source( )->parentWidget( ) );
- PMLibraryHandle* parentLib = source->library( );
+ PMLibraryIconView* source = static_cast<PMLibraryIconView*>( e->source( )->tqparentWidget( ) );
+ PMLibraryHandle* tqparentLib = source->library( );
PMLibraryHandle newParentLib = PMLibraryHandle( m_path );
- if ( parentLib->isReadOnly() || newParentLib.isReadOnly() )
+ if ( tqparentLib->isReadOnly() || newParentLib.isReadOnly() )
{
e->ignore();
return;
@@ -238,7 +238,7 @@ void PMLibraryIconViewItem::dropped( TQDropEvent *e, const TQValueList<TQIconDra
if( subLibList[i] )
{
TQString newpath = newPath( path, true );
- if( parentLib->deleteSubLibrary( path ) == PMLibraryHandle::Ok )
+ if( tqparentLib->deleteSubLibrary( path ) == PMLibraryHandle::Ok )
{
PMLibraryHandle lib = PMLibraryHandle( path );
if( newParentLib.addSubLibrary( newpath, lib.name() ) == PMLibraryHandle::Ok )
@@ -249,7 +249,7 @@ void PMLibraryIconViewItem::dropped( TQDropEvent *e, const TQValueList<TQIconDra
else
{
success = false;
- parentLib->addSubLibrary( path, lib.name( ) );
+ tqparentLib->addSubLibrary( path, lib.name( ) );
}
}
else
@@ -258,7 +258,7 @@ void PMLibraryIconViewItem::dropped( TQDropEvent *e, const TQValueList<TQIconDra
else
{
TQString newpath = newPath( path, false );
- if( parentLib->deleteObject( path ) == PMLibraryHandle::Ok )
+ if( tqparentLib->deleteObject( path ) == PMLibraryHandle::Ok )
{
PMLibraryObject obj = PMLibraryObject( path );
if( newParentLib.addObject( newpath, obj.name() ) == PMLibraryHandle::Ok )
@@ -268,7 +268,7 @@ void PMLibraryIconViewItem::dropped( TQDropEvent *e, const TQValueList<TQIconDra
else
{
success = false;
- parentLib->addObject( path, obj.name( ) );
+ tqparentLib->addObject( path, obj.name( ) );
}
}
else
@@ -277,7 +277,7 @@ void PMLibraryIconViewItem::dropped( TQDropEvent *e, const TQValueList<TQIconDra
if( !success )
{
- KMessageBox::error( 0, i18n( "Error moving \"%1\" to \"%2\"" ).arg( path ).arg( m_path ) );
+ KMessageBox::error( 0, i18n( "Error moving \"%1\" to \"%2\"" ).tqarg( path ).tqarg( m_path ) );
e->ignore( );
return;
}
diff --git a/kpovmodeler/pmlibraryiconview.h b/kpovmodeler/pmlibraryiconview.h
index 87b90ffb..84d4f5b0 100644
--- a/kpovmodeler/pmlibraryiconview.h
+++ b/kpovmodeler/pmlibraryiconview.h
@@ -30,9 +30,10 @@ class PMLibraryHandle;
/**
* This class is the drag and drop object for the icon view
*/
-class PMLibraryIconDrag : public QIconDrag
+class PMLibraryIconDrag : public TQIconDrag
{
Q_OBJECT
+ TQ_OBJECT
public:
/** Constructor */
PMLibraryIconDrag( TQWidget * dragSource, const char* name = 0 ) : TQIconDrag( dragSource, name ) {}
@@ -40,7 +41,7 @@ public:
/** @return The ith format, or NULL. */
const char* format( int i ) const;
/** @return The encoded payload of this object, in the specified MIME format. */
- TQByteArray encodedData( const char* mime ) const;
+ TQByteArray tqencodedData( const char* mime ) const;
/** @return True if the information in e can be decoded */
static bool canDecode( TQMimeSource* e );
/**
@@ -62,8 +63,9 @@ private:
class PMLibraryIconView: public KIconView
{
Q_OBJECT
+ TQ_OBJECT
public:
- PMLibraryIconView( TQWidget *parent, const char* name = NULL );
+ PMLibraryIconView( TQWidget *tqparent, const char* name = NULL );
/**
* Set the library base path
@@ -99,8 +101,8 @@ private:
class PMLibraryIconViewItem: public KIconViewItem
{
public:
- PMLibraryIconViewItem( TQIconView *parent, const TQString& text, const TQString& path, bool isSubLibrary );
- PMLibraryIconViewItem( TQIconView *parent, const TQString& text, const TQImage& image, const TQString& path, bool isSubLibrary );
+ PMLibraryIconViewItem( TQIconView *tqparent, const TQString& text, const TQString& path, bool isSubLibrary );
+ PMLibraryIconViewItem( TQIconView *tqparent, const TQString& text, const TQImage& image, const TQString& path, bool isSubLibrary );
/** Get the path of the entry */
TQString path( ) const { return m_path; }
diff --git a/kpovmodeler/pmlibrarymanager.cpp b/kpovmodeler/pmlibrarymanager.cpp
index 9683064a..0e4b17dd 100644
--- a/kpovmodeler/pmlibrarymanager.cpp
+++ b/kpovmodeler/pmlibrarymanager.cpp
@@ -88,7 +88,7 @@ void PMLibraryManager::scanLibraries( )
{
TQDir curDir( *i );
curDir.setFilter( TQDir::Dirs );
- QFileInfoListIterator it( *( curDir.entryInfoList( ) ) );
+ TQFileInfoListIterator it( *( curDir.entryInfoList( ) ) );
// For each sub directory
TQFileInfo* fi;
diff --git a/kpovmodeler/pmlibrarymanager.h b/kpovmodeler/pmlibrarymanager.h
index 1ced4d0b..698f3f49 100644
--- a/kpovmodeler/pmlibrarymanager.h
+++ b/kpovmodeler/pmlibrarymanager.h
@@ -72,7 +72,7 @@ public:
/**
* Refreshes the list of libraries.
- * WARNING: This function invalidates all previously given PMLibraryHandle pointers
+ * WARNING: This function tqinvalidates all previously given PMLibraryHandle pointers
*/
void refresh( );
diff --git a/kpovmodeler/pmlibraryobject.cpp b/kpovmodeler/pmlibraryobject.cpp
index d89edbec..95a7c29d 100644
--- a/kpovmodeler/pmlibraryobject.cpp
+++ b/kpovmodeler/pmlibraryobject.cpp
@@ -40,9 +40,9 @@ PMLibraryObject::PMLibraryObject( )
m_preview = NULL;
m_objects = NULL;
m_data = NULL;
- m_name = TQString::null;
- m_description = TQString::null;
- m_keywords = TQString::null;
+ m_name = TQString();
+ m_description = TQString();
+ m_keywords = TQString();
}
PMLibraryObject::PMLibraryObject( KURL u )
diff --git a/kpovmodeler/pmlibraryobjectsearch.cpp b/kpovmodeler/pmlibraryobjectsearch.cpp
index 30e5be5c..9df12dac 100644
--- a/kpovmodeler/pmlibraryobjectsearch.cpp
+++ b/kpovmodeler/pmlibraryobjectsearch.cpp
@@ -34,8 +34,8 @@
#include <kdialog.h>
#include <klistview.h>
-PMLibraryObjectSearch::PMLibraryObjectSearch( TQWidget* parent ) :
- TQWidget( parent, "" )
+PMLibraryObjectSearch::PMLibraryObjectSearch( TQWidget* tqparent ) :
+ TQWidget( tqparent, "" )
{
setMinimumSize( 780, 300 );
setMaximumSize( 800, 400 );
diff --git a/kpovmodeler/pmlibraryobjectsearch.h b/kpovmodeler/pmlibraryobjectsearch.h
index 55d44233..318735e4 100644
--- a/kpovmodeler/pmlibraryobjectsearch.h
+++ b/kpovmodeler/pmlibraryobjectsearch.h
@@ -36,11 +36,12 @@ class KListView;
* It also provides drag. If the user doesn't have a clear idea
* where the objects he wants are, this is the dialog to use.
*/
-class PMLibraryObjectSearch: public QWidget
+class PMLibraryObjectSearch: public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
- PMLibraryObjectSearch( TQWidget *parent );
+ PMLibraryObjectSearch( TQWidget *tqparent );
private slots:
void slotSearchButtonPressed( );
diff --git a/kpovmodeler/pmlight.cpp b/kpovmodeler/pmlight.cpp
index 554a09c2..0bf2f005 100644
--- a/kpovmodeler/pmlight.cpp
+++ b/kpovmodeler/pmlight.cpp
@@ -268,11 +268,11 @@ void PMLight::readAttributes( const PMXMLHelper& h )
Base::readAttributes( h );
}
-PMMetaObject* PMLight::metaObject( ) const
+PMMetaObject* PMLight::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "Light", Base::metaObject( ),
+ s_pMetaObject = new PMMetaObject( "Light", Base::tqmetaObject( ),
createNewLight );
PMTypeProperty* p = new PMTypeProperty( "lightType", &PMLight::setLightType,
&PMLight::lightType );
@@ -564,9 +564,9 @@ void PMLight::setMediaAttenuation( bool y )
}
}
-PMDialogEditBase* PMLight::editWidget( TQWidget* parent ) const
+PMDialogEditBase* PMLight::editWidget( TQWidget* tqparent ) const
{
- return new PMLightEdit( parent );
+ return new PMLightEdit( tqparent );
}
void PMLight::restoreMemento( PMMemento* s )
diff --git a/kpovmodeler/pmlight.h b/kpovmodeler/pmlight.h
index 4fafb2b0..4ceb0268 100644
--- a/kpovmodeler/pmlight.h
+++ b/kpovmodeler/pmlight.h
@@ -59,7 +59,7 @@ public:
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
@@ -69,7 +69,7 @@ public:
/**
* Returns a new @ref PMLightEdit
*/
- virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
+ virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
/**
* Returns the name of the pixmap that is displayed in the tree view
* and dialog view
diff --git a/kpovmodeler/pmlightedit.cpp b/kpovmodeler/pmlightedit.cpp
index e652d0a2..70625c00 100644
--- a/kpovmodeler/pmlightedit.cpp
+++ b/kpovmodeler/pmlightedit.cpp
@@ -29,8 +29,8 @@
#include <klocale.h>
-PMLightEdit::PMLightEdit( TQWidget* parent, const char* name )
- : Base( parent, name )
+PMLightEdit::PMLightEdit( TQWidget* tqparent, const char* name )
+ : Base( tqparent, name )
{
m_pDisplayedObject = 0;
}
diff --git a/kpovmodeler/pmlightedit.h b/kpovmodeler/pmlightedit.h
index 62451ed3..75b56530 100644
--- a/kpovmodeler/pmlightedit.h
+++ b/kpovmodeler/pmlightedit.h
@@ -41,12 +41,13 @@ class TQCheckBox;
class PMLightEdit : public PMNamedObjectEdit
{
Q_OBJECT
+ TQ_OBJECT
typedef PMNamedObjectEdit Base;
public:
/**
- * Creates a PMLightEdit with parent and name
+ * Creates a PMLightEdit with tqparent and name
*/
- PMLightEdit( TQWidget* parent, const char* name = 0 );
+ PMLightEdit( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displayObject( PMObject* o );
diff --git a/kpovmodeler/pmlightgroup.cpp b/kpovmodeler/pmlightgroup.cpp
index acf655e4..af46e823 100644
--- a/kpovmodeler/pmlightgroup.cpp
+++ b/kpovmodeler/pmlightgroup.cpp
@@ -69,11 +69,11 @@ void PMLightGroup::readAttributes( const PMXMLHelper& h )
Base::readAttributes( h );
}
-PMMetaObject* PMLightGroup::metaObject( ) const
+PMMetaObject* PMLightGroup::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "LightGroup", Base::metaObject( ),
+ s_pMetaObject = new PMMetaObject( "LightGroup", Base::tqmetaObject( ),
createNewLightGroup );
s_pMetaObject->addProperty( new PMLightGroupProperty( "globalLights",
@@ -103,9 +103,9 @@ void PMLightGroup::setGlobalLights( bool gl )
}
}
-PMDialogEditBase* PMLightGroup::editWidget( TQWidget* parent ) const
+PMDialogEditBase* PMLightGroup::editWidget( TQWidget* tqparent ) const
{
- return new PMLightGroupEdit( parent );
+ return new PMLightGroupEdit( tqparent );
}
void PMLightGroup::restoreMemento( PMMemento* s )
diff --git a/kpovmodeler/pmlightgroup.h b/kpovmodeler/pmlightgroup.h
index 9fdf8d6b..9c9de8b3 100644
--- a/kpovmodeler/pmlightgroup.h
+++ b/kpovmodeler/pmlightgroup.h
@@ -54,7 +54,7 @@ public:
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void cleanUp( ) const;
@@ -66,7 +66,7 @@ public:
/**
* Returns a new @ref PMLightGroupEdit
*/
- virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
+ virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
/**
* Returns the name of the pixmap that is displayed in the tree view
* and dialog view
diff --git a/kpovmodeler/pmlightgroupedit.cpp b/kpovmodeler/pmlightgroupedit.cpp
index c1e21024..87f35ff0 100644
--- a/kpovmodeler/pmlightgroupedit.cpp
+++ b/kpovmodeler/pmlightgroupedit.cpp
@@ -24,8 +24,8 @@
#include <tqcheckbox.h>
#include <klocale.h>
-PMLightGroupEdit::PMLightGroupEdit( TQWidget* parent, const char* name )
- : Base( parent, name )
+PMLightGroupEdit::PMLightGroupEdit( TQWidget* tqparent, const char* name )
+ : Base( tqparent, name )
{
m_pDisplayedObject = 0;
}
@@ -34,12 +34,12 @@ void PMLightGroupEdit::createTopWidgets( )
{
Base::createTopWidgets( );
- TQHBoxLayout* layout;
+ TQHBoxLayout* tqlayout;
m_pGlobalLights = new TQCheckBox( i18n( "Global lights" ), this );
- layout = new TQHBoxLayout( topLayout( ) );
- layout->addWidget( m_pGlobalLights );
- layout->addStretch( 1 );
+ tqlayout = new TQHBoxLayout( topLayout( ) );
+ tqlayout->addWidget( m_pGlobalLights );
+ tqlayout->addStretch( 1 );
connect( m_pGlobalLights, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
}
diff --git a/kpovmodeler/pmlightgroupedit.h b/kpovmodeler/pmlightgroupedit.h
index fa090f97..8b1216fd 100644
--- a/kpovmodeler/pmlightgroupedit.h
+++ b/kpovmodeler/pmlightgroupedit.h
@@ -35,12 +35,13 @@ class TQCheckBox;
class PMLightGroupEdit : public PMSolidObjectEdit
{
Q_OBJECT
+ TQ_OBJECT
typedef PMSolidObjectEdit Base;
public:
/**
- * Creates a PMLightGroupEdit with parent and name
+ * Creates a PMLightGroupEdit with tqparent and name
*/
- PMLightGroupEdit( TQWidget* parent, const char* name = 0 );
+ PMLightGroupEdit( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displayObject( PMObject* o );
diff --git a/kpovmodeler/pmlineedits.cpp b/kpovmodeler/pmlineedits.cpp
index 19391338..e6e350b6 100644
--- a/kpovmodeler/pmlineedits.cpp
+++ b/kpovmodeler/pmlineedits.cpp
@@ -19,8 +19,8 @@
#include <kmessagebox.h>
#include <klocale.h>
-PMFloatEdit::PMFloatEdit( TQWidget* parent, const char* name /*= 0*/ )
- : TQLineEdit( parent, name )
+PMFloatEdit::PMFloatEdit( TQWidget* tqparent, const char* name /*= 0*/ )
+ : TQLineEdit( tqparent, name )
{
m_bCheckLower = false;
m_bCheckUpper = false;
@@ -67,28 +67,28 @@ bool PMFloatEdit::isDataValid( )
if( m_bCheckLower && m_bCheckUpper )
KMessageBox::error( this, i18n( "Please enter a float value "
"between %1 and %2" )
- .arg( m_lowerValue ).arg( m_upperValue ),
+ .tqarg( m_lowerValue ).tqarg( m_upperValue ),
i18n( "Error" ) );
else if( m_bCheckLower )
{
if( m_lowerOp == OpGreaterEqual )
KMessageBox::error( this, i18n( "Please enter a float value "
- ">= %1" ).arg( m_lowerValue ),
+ ">= %1" ).tqarg( m_lowerValue ),
i18n( "Error" ) );
else
KMessageBox::error( this, i18n( "Please enter a float value "
- "> %1" ).arg( m_lowerValue ),
+ "> %1" ).tqarg( m_lowerValue ),
i18n( "Error" ) );
}
else
{
if( m_upperOp == OpLessEqual )
KMessageBox::error( this, i18n( "Please enter a float value "
- "<= %1" ).arg( m_upperValue ),
+ "<= %1" ).tqarg( m_upperValue ),
i18n( "Error" ) );
else
KMessageBox::error( this, i18n( "Please enter a float value "
- "< %1" ).arg( m_upperValue ),
+ "< %1" ).tqarg( m_upperValue ),
i18n( "Error" ) );
}
}
@@ -129,8 +129,8 @@ void PMFloatEdit::slotEditTextChanged( const TQString& /*t*/ )
-PMIntEdit::PMIntEdit( TQWidget* parent, const char* name /*= 0*/ )
- : TQLineEdit( parent, name )
+PMIntEdit::PMIntEdit( TQWidget* tqparent, const char* name /*= 0*/ )
+ : TQLineEdit( tqparent, name )
{
m_bCheckLower = false;
m_bCheckUpper = false;
@@ -183,15 +183,15 @@ bool PMIntEdit::isDataValid( )
if( m_bCheckLower && m_bCheckUpper )
KMessageBox::error( this, i18n( "Please enter an integer value "
"between %1 and %2" )
- .arg( m_lowerValue ).arg( m_upperValue ),
+ .tqarg( m_lowerValue ).tqarg( m_upperValue ),
i18n( "Error" ) );
else if( m_bCheckLower )
KMessageBox::error( this, i18n( "Please enter an integer value "
- ">= %1" ).arg( m_lowerValue ),
+ ">= %1" ).tqarg( m_lowerValue ),
i18n( "Error" ) );
else
KMessageBox::error( this, i18n( "Please enter an integer value "
- "<= %1" ).arg( m_upperValue ),
+ "<= %1" ).tqarg( m_upperValue ),
i18n( "Error" ) );
}
}
diff --git a/kpovmodeler/pmlineedits.h b/kpovmodeler/pmlineedits.h
index 43256818..0db5619e 100644
--- a/kpovmodeler/pmlineedits.h
+++ b/kpovmodeler/pmlineedits.h
@@ -29,16 +29,17 @@
* Lineedit for float input
*/
-class PMFloatEdit : public QLineEdit
+class PMFloatEdit : public TQLineEdit
{
Q_OBJECT
+ TQ_OBJECT
public:
enum ValidationOp { OpGreater, OpGreaterEqual,
OpLess, OpLessEqual };
/**
* Simple constructor
*/
- PMFloatEdit( TQWidget* parent, const char* name = 0 );
+ PMFloatEdit( TQWidget* tqparent, const char* name = 0 );
/**
* Sets the validation for the lineedit.
*
@@ -87,14 +88,15 @@ private:
* Lineedit for int input
*/
-class PMIntEdit : public QLineEdit
+class PMIntEdit : public TQLineEdit
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Simple constructor
*/
- PMIntEdit( TQWidget* parent, const char* name = 0 );
+ PMIntEdit( TQWidget* tqparent, const char* name = 0 );
/**
* Sets the validation for the lineedit.
*
diff --git a/kpovmodeler/pmlinkedit.cpp b/kpovmodeler/pmlinkedit.cpp
index 8ebca5c6..2114c5fa 100644
--- a/kpovmodeler/pmlinkedit.cpp
+++ b/kpovmodeler/pmlinkedit.cpp
@@ -28,23 +28,23 @@
#include "pmobjectselect.h"
PMLinkEdit::PMLinkEdit( const TQString& declareType,
- TQWidget* parent, const char* name )
- : TQWidget( parent, name )
+ TQWidget* tqparent, const char* name )
+ : TQWidget( tqparent, name )
{
m_declareTypes.append( declareType );
init( );
}
PMLinkEdit::PMLinkEdit( const TQStringList& declareTypes,
- TQWidget* parent, const char* name )
- : TQWidget( parent, name )
+ TQWidget* tqparent, const char* name )
+ : TQWidget( tqparent, name )
{
m_declareTypes = declareTypes;
init( );
}
-PMLinkEdit::PMLinkEdit( TQWidget* parent, const char* name )
- : TQWidget( parent, name )
+PMLinkEdit::PMLinkEdit( TQWidget* tqparent, const char* name )
+ : TQWidget( tqparent, name )
{
init( );
}
@@ -64,12 +64,12 @@ void PMLinkEdit::init( )
m_pIDEdit->setReadOnly( true );
grid->addWidget( m_pIDEdit, 0, 1 );
- TQHBoxLayout* layout = new TQHBoxLayout( );
- grid->addLayout( layout, 1, 1 );
+ TQHBoxLayout* tqlayout = new TQHBoxLayout( );
+ grid->addLayout( tqlayout, 1, 1 );
m_pSelectButton = new TQPushButton( i18n( "Select..." ), this );
- layout->addWidget( m_pSelectButton );
+ tqlayout->addWidget( m_pSelectButton );
m_pClearButton = new KPushButton( KStdGuiItem::clear(), this );
- layout->addWidget( m_pClearButton );
+ tqlayout->addWidget( m_pClearButton );
connect( m_pSelectButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotSelectClicked( ) ) );
connect( m_pClearButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotClearClicked( ) ) );
diff --git a/kpovmodeler/pmlinkedit.h b/kpovmodeler/pmlinkedit.h
index 4462393c..935d8940 100644
--- a/kpovmodeler/pmlinkedit.h
+++ b/kpovmodeler/pmlinkedit.h
@@ -31,26 +31,27 @@ class TQPushButton;
/**
* Edit widget for links with a TQLineEdit, a select and a clear button.
*/
-class PMLinkEdit : public QWidget
+class PMLinkEdit : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
- * Creates a link edit widget with parent and name.
+ * Creates a link edit widget with tqparent and name.
*
* Allows the selection of declares of type declareType.
*/
- PMLinkEdit( const TQString& declareType, TQWidget* parent, const char* name = 0 );
+ PMLinkEdit( const TQString& declareType, TQWidget* tqparent, const char* name = 0 );
/**
- * Creates a link edit widget with parent and name.
+ * Creates a link edit widget with tqparent and name.
*
* Allows the selection of declares of type declares.
*/
- PMLinkEdit( const TQStringList& declares, TQWidget* parent, const char* name = 0 );
+ PMLinkEdit( const TQStringList& declares, TQWidget* tqparent, const char* name = 0 );
/**
- * Creates a link edit widget with parent and name.
+ * Creates a link edit widget with tqparent and name.
*/
- PMLinkEdit( TQWidget* parent, const char* name = 0 );
+ PMLinkEdit( TQWidget* tqparent, const char* name = 0 );
/**
* Sets the displayed object and displays the link
diff --git a/kpovmodeler/pmlistpattern.cpp b/kpovmodeler/pmlistpattern.cpp
index 721369d2..5a7a3f1f 100644
--- a/kpovmodeler/pmlistpattern.cpp
+++ b/kpovmodeler/pmlistpattern.cpp
@@ -114,11 +114,11 @@ void PMListPattern::readAttributes( const PMXMLHelper& h )
Base::readAttributes( h );
}
-PMMetaObject* PMListPattern::metaObject( ) const
+PMMetaObject* PMListPattern::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "ListPattern", Base::metaObject( ) );
+ s_pMetaObject = new PMMetaObject( "ListPattern", Base::tqmetaObject( ) );
PMListTypeProperty* p = new PMListTypeProperty(
"listType", &PMListPattern::setListType,
@@ -178,9 +178,9 @@ void PMListPattern::setMortar( double n )
}
}
-PMDialogEditBase* PMListPattern::editWidget( TQWidget* parent ) const
+PMDialogEditBase* PMListPattern::editWidget( TQWidget* tqparent ) const
{
- return new PMListPatternEdit( parent );
+ return new PMListPatternEdit( tqparent );
}
void PMListPattern::restoreMemento( PMMemento* s )
@@ -228,11 +228,11 @@ PMTextureList::~PMTextureList( )
{
}
-PMMetaObject* PMTextureList::metaObject( ) const
+PMMetaObject* PMTextureList::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "TextureList", Base::metaObject( ),
+ s_pMetaObject = new PMMetaObject( "TextureList", Base::tqmetaObject( ),
createNewTextureList );
}
return s_pMetaObject;
@@ -267,11 +267,11 @@ PMPigmentList::~PMPigmentList( )
{
}
-PMMetaObject* PMPigmentList::metaObject( ) const
+PMMetaObject* PMPigmentList::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "PigmentList", Base::metaObject( ),
+ s_pMetaObject = new PMMetaObject( "PigmentList", Base::tqmetaObject( ),
createNewPigmentList );
}
return s_pMetaObject;
@@ -306,11 +306,11 @@ PMColorList::~PMColorList( )
{
}
-PMMetaObject* PMColorList::metaObject( ) const
+PMMetaObject* PMColorList::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "ColorList", Base::metaObject( ),
+ s_pMetaObject = new PMMetaObject( "ColorList", Base::tqmetaObject( ),
createNewColorList );
}
return s_pMetaObject;
@@ -345,11 +345,11 @@ PMDensityList::~PMDensityList( )
{
}
-PMMetaObject* PMDensityList::metaObject( ) const
+PMMetaObject* PMDensityList::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "DensityList", Base::metaObject( ),
+ s_pMetaObject = new PMMetaObject( "DensityList", Base::tqmetaObject( ),
createNewDensityList );
}
return s_pMetaObject;
@@ -388,11 +388,11 @@ PMNormalList::~PMNormalList( )
{
}
-PMMetaObject* PMNormalList::metaObject( ) const
+PMMetaObject* PMNormalList::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "NormalList", Base::metaObject( ),
+ s_pMetaObject = new PMMetaObject( "NormalList", Base::tqmetaObject( ),
createNewNormalList );
s_pMetaObject->addProperty(
new PMNormalListProperty( "depth", &PMNormalList::setDepth,
@@ -462,8 +462,8 @@ void PMNormalList::readAttributes( const PMXMLHelper& h )
Base::readAttributes( h );
}
-PMDialogEditBase* PMNormalList::editWidget( TQWidget* parent ) const
+PMDialogEditBase* PMNormalList::editWidget( TQWidget* tqparent ) const
{
- return new PMListPatternEdit( parent );
+ return new PMListPatternEdit( tqparent );
}
diff --git a/kpovmodeler/pmlistpattern.h b/kpovmodeler/pmlistpattern.h
index 6716dadb..6c8a26a1 100644
--- a/kpovmodeler/pmlistpattern.h
+++ b/kpovmodeler/pmlistpattern.h
@@ -57,7 +57,7 @@ public:
*/
virtual TQString listObjectType( ) const = 0;
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void cleanUp( ) const;
@@ -69,7 +69,7 @@ public:
/**
* Returns a new @ref PMListPatternEdit
*/
- virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
+ virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
/**
* Returns the color list type
@@ -150,7 +150,7 @@ public:
virtual TQString listObjectType( ) const { return TQString( "Texture" ); }
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void cleanUp( ) const;
@@ -189,7 +189,7 @@ public:
virtual TQString listObjectType( ) const { return TQString( "Pigment" ); }
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void cleanUp( ) const;
@@ -228,7 +228,7 @@ public:
virtual TQString listObjectType( ) const { return TQString( "SolidColor" ); }
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void cleanUp( ) const;
@@ -267,7 +267,7 @@ public:
virtual TQString listObjectType( ) const { return TQString( "Density" ); }
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void cleanUp( ) const;
@@ -306,14 +306,14 @@ public:
virtual TQString listObjectType( ) const { return TQString( "Normal" ); }
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void cleanUp( ) const;
/**
* Returns a new @ref PMListPatternEdit
*/
- virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
+ virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
/** */
virtual TQString pixmap( ) const { return TQString( "pmnormallist" ); }
diff --git a/kpovmodeler/pmlistpatternedit.cpp b/kpovmodeler/pmlistpatternedit.cpp
index dec87cb7..240d87d2 100644
--- a/kpovmodeler/pmlistpatternedit.cpp
+++ b/kpovmodeler/pmlistpatternedit.cpp
@@ -31,8 +31,8 @@
#include <kmessagebox.h>
-PMListPatternEdit::PMListPatternEdit( TQWidget* parent, const char* name )
- : Base( parent, name )
+PMListPatternEdit::PMListPatternEdit( TQWidget* tqparent, const char* name )
+ : Base( tqparent, name )
{
m_pDisplayedObject = 0;
}
@@ -41,39 +41,39 @@ void PMListPatternEdit::createTopWidgets( )
{
Base::createTopWidgets( );
- TQVBoxLayout* vlayout = new TQVBoxLayout( topLayout( ) );
+ TQVBoxLayout* vtqlayout = new TQVBoxLayout( topLayout( ) );
/* Field for Pattern List type */
- TQHBoxLayout* layout = new TQHBoxLayout( vlayout );
+ TQHBoxLayout* tqlayout = new TQHBoxLayout( vtqlayout );
TQLabel* label = new TQLabel( i18n( "Type:" ), this );
m_pTypeCombo = new TQComboBox( false, this );
m_pTypeCombo->insertItem( i18n( "Checkers" ) );
m_pTypeCombo->insertItem( i18n( "Brick" ) );
m_pTypeCombo->insertItem( i18n( "Hexagon" ) );
- layout->addWidget( label, 0, AlignTop );
- layout->addWidget( m_pTypeCombo );
- layout->addStretch( 1 );
+ tqlayout->addWidget( label, 0, AlignTop );
+ tqlayout->addWidget( m_pTypeCombo );
+ tqlayout->addStretch( 1 );
/* The depth field */
- layout = new TQHBoxLayout( vlayout );
+ tqlayout = new TQHBoxLayout( vtqlayout );
m_pDepthLabel = new TQLabel( i18n( "Depth:" ), this );
m_pDepth = new PMFloatEdit( this );
- layout->addWidget( m_pDepthLabel );
- layout->addWidget( m_pDepth );
- layout->addStretch( 1 );
+ tqlayout->addWidget( m_pDepthLabel );
+ tqlayout->addWidget( m_pDepth );
+ tqlayout->addStretch( 1 );
/* The brick information */
- TQHBoxLayout* bricklayout = new TQHBoxLayout( vlayout );
+ TQHBoxLayout* bricklayout = new TQHBoxLayout( vtqlayout );
m_pBrickSizeLabel = new TQLabel( i18n( "Brick size:" ), this );
m_pBrickSize = new PMVectorEdit( "x", "y", "z", this );
bricklayout->addWidget( m_pBrickSizeLabel );
bricklayout->addWidget( m_pBrickSize );
- layout = new TQHBoxLayout( vlayout );
+ tqlayout = new TQHBoxLayout( vtqlayout );
m_pMortarLabel = new TQLabel( i18n( "Mortar:" ), this );
m_pMortar = new PMFloatEdit( this );
- layout->addWidget( m_pMortarLabel );
- layout->addWidget( m_pMortar );
- layout->addStretch( 1 );
+ tqlayout->addWidget( m_pMortarLabel );
+ tqlayout->addWidget( m_pMortar );
+ tqlayout->addStretch( 1 );
/* connect all signals to slots/signals */
connect( m_pBrickSize, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
@@ -161,7 +161,7 @@ void PMListPatternEdit::saveContents( )
bool PMListPatternEdit::isDataValid( )
{
- int children = 0;
+ int tqchildren = 0;
PMObject* o;
if( !m_pBrickSize->isDataValid( ) )
@@ -172,13 +172,13 @@ bool PMListPatternEdit::isDataValid( )
// count child objects
for( o = m_pDisplayedObject->firstChild( ); o; o = o->nextSibling( ) )
if( o->type( ) == m_pDisplayedObject->listObjectType( ) )
- children++;
+ tqchildren++;
switch( m_pTypeCombo->currentItem( ) )
{
case 0:
case 1:
- if( children > 2 )
+ if( tqchildren > 2 )
{
KMessageBox::error( this, i18n( "You can have at most two child"
" items for that list type!" ),
diff --git a/kpovmodeler/pmlistpatternedit.h b/kpovmodeler/pmlistpatternedit.h
index 703a5944..4e80e4d8 100644
--- a/kpovmodeler/pmlistpatternedit.h
+++ b/kpovmodeler/pmlistpatternedit.h
@@ -38,12 +38,13 @@ class TQLabel;
class PMListPatternEdit : public PMDialogEditBase
{
Q_OBJECT
+ TQ_OBJECT
typedef PMDialogEditBase Base;
public:
/**
- * Creates a PMListPatternEdit with parent and name
+ * Creates a PMListPatternEdit with tqparent and name
*/
- PMListPatternEdit( TQWidget* parent, const char* name = 0 );
+ PMListPatternEdit( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displayObject( PMObject* o );
diff --git a/kpovmodeler/pmlookslike.cpp b/kpovmodeler/pmlookslike.cpp
index 270292e2..2717c531 100644
--- a/kpovmodeler/pmlookslike.cpp
+++ b/kpovmodeler/pmlookslike.cpp
@@ -49,11 +49,11 @@ TQString PMLooksLike::description( ) const
return i18n( "looks like" );
}
-PMMetaObject* PMLooksLike::metaObject( ) const
+PMMetaObject* PMLooksLike::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "LooksLike", Base::metaObject( ),
+ s_pMetaObject = new PMMetaObject( "LooksLike", Base::tqmetaObject( ),
createNewLooksLike );
// no properties
}
@@ -80,9 +80,9 @@ void PMLooksLike::readAttributes( const PMXMLHelper& h )
Base::readAttributes( h );
}
-PMDialogEditBase* PMLooksLike::editWidget( TQWidget* parent ) const
+PMDialogEditBase* PMLooksLike::editWidget( TQWidget* tqparent ) const
{
- return new PMNamedObjectEdit( parent );
+ return new PMNamedObjectEdit( tqparent );
}
void PMLooksLike::restoreMemento( PMMemento* s )
diff --git a/kpovmodeler/pmlookslike.h b/kpovmodeler/pmlookslike.h
index 4a191422..30127a6a 100644
--- a/kpovmodeler/pmlookslike.h
+++ b/kpovmodeler/pmlookslike.h
@@ -53,7 +53,7 @@ public:
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void cleanUp( ) const;
@@ -64,7 +64,7 @@ public:
/**
* Returns a new @ref PMLooksLikeEdit
*/
- virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
+ virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
/**
* Returns the name of the pixmap that is displayed in the tree view
* and dialog view
diff --git a/kpovmodeler/pmmaterial.cpp b/kpovmodeler/pmmaterial.cpp
index 66f11f94..8eb8866f 100644
--- a/kpovmodeler/pmmaterial.cpp
+++ b/kpovmodeler/pmmaterial.cpp
@@ -43,11 +43,11 @@ PMMaterial::~PMMaterial( )
{
}
-PMMetaObject* PMMaterial::metaObject( ) const
+PMMetaObject* PMMaterial::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "Material", Base::metaObject( ),
+ s_pMetaObject = new PMMetaObject( "Material", Base::tqmetaObject( ),
createNewMaterial );
}
return s_pMetaObject;
@@ -68,8 +68,8 @@ TQString PMMaterial::description( ) const
return i18n( "material" );
}
-PMDialogEditBase* PMMaterial::editWidget( TQWidget* parent ) const
+PMDialogEditBase* PMMaterial::editWidget( TQWidget* tqparent ) const
{
- return new PMMaterialEdit( parent );
+ return new PMMaterialEdit( tqparent );
}
diff --git a/kpovmodeler/pmmaterial.h b/kpovmodeler/pmmaterial.h
index 7e790be4..6e092aed 100644
--- a/kpovmodeler/pmmaterial.h
+++ b/kpovmodeler/pmmaterial.h
@@ -52,14 +52,14 @@ public:
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void cleanUp( ) const;
/**
* Returns a new @ref PMMaterialEdit
*/
- virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
+ virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
/** */
virtual TQString pixmap( ) const { return TQString( "pmmaterial" ); }
diff --git a/kpovmodeler/pmmaterialedit.cpp b/kpovmodeler/pmmaterialedit.cpp
index f03fcd43..4500e947 100644
--- a/kpovmodeler/pmmaterialedit.cpp
+++ b/kpovmodeler/pmmaterialedit.cpp
@@ -25,8 +25,8 @@
#include <klocale.h>
-PMMaterialEdit::PMMaterialEdit( TQWidget* parent, const char* name )
- : Base( parent, name )
+PMMaterialEdit::PMMaterialEdit( TQWidget* tqparent, const char* name )
+ : Base( tqparent, name )
{
m_pDisplayedObject = 0;
}
diff --git a/kpovmodeler/pmmaterialedit.h b/kpovmodeler/pmmaterialedit.h
index d9d6cf8f..0671d3a7 100644
--- a/kpovmodeler/pmmaterialedit.h
+++ b/kpovmodeler/pmmaterialedit.h
@@ -34,12 +34,13 @@ class PMMaterial;
class PMMaterialEdit : public PMTextureBaseEdit
{
Q_OBJECT
+ TQ_OBJECT
typedef PMTextureBaseEdit Base;
public:
/**
- * Creates a PMMaterialEdit with parent and name
+ * Creates a PMMaterialEdit with tqparent and name
*/
- PMMaterialEdit( TQWidget* parent, const char* name = 0 );
+ PMMaterialEdit( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displayObject( PMObject* o );
diff --git a/kpovmodeler/pmmaterialmap.cpp b/kpovmodeler/pmmaterialmap.cpp
index 28b2c849..faffd857 100644
--- a/kpovmodeler/pmmaterialmap.cpp
+++ b/kpovmodeler/pmmaterialmap.cpp
@@ -186,11 +186,11 @@ void PMMaterialMap::readAttributes( const PMXMLHelper& h )
Base::readAttributes( h );
}
-PMMetaObject* PMMaterialMap::metaObject( ) const
+PMMetaObject* PMMaterialMap::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "MaterialMap", Base::metaObject( ),
+ s_pMetaObject = new PMMetaObject( "MaterialMap", Base::tqmetaObject( ),
createNewMaterialMap );
PMBitmapTypeProperty* bp = new PMBitmapTypeProperty(
@@ -296,9 +296,9 @@ void PMMaterialMap::enableOnce( bool c )
}
}
-PMDialogEditBase* PMMaterialMap::editWidget( TQWidget* parent ) const
+PMDialogEditBase* PMMaterialMap::editWidget( TQWidget* tqparent ) const
{
- return new PMMaterialMapEdit( parent );
+ return new PMMaterialMapEdit( tqparent );
}
void PMMaterialMap::restoreMemento( PMMemento* s )
diff --git a/kpovmodeler/pmmaterialmap.h b/kpovmodeler/pmmaterialmap.h
index 6377c7bd..6f810274 100644
--- a/kpovmodeler/pmmaterialmap.h
+++ b/kpovmodeler/pmmaterialmap.h
@@ -72,7 +72,7 @@ public:
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void cleanUp( ) const;
@@ -87,7 +87,7 @@ public:
/**
* Returns a new @ref PMMaterialMapEdit
*/
- virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
+ virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
/**
* Gets the bitmap type
diff --git a/kpovmodeler/pmmaterialmapedit.cpp b/kpovmodeler/pmmaterialmapedit.cpp
index 03d28146..93c61405 100644
--- a/kpovmodeler/pmmaterialmapedit.cpp
+++ b/kpovmodeler/pmmaterialmapedit.cpp
@@ -38,8 +38,8 @@
#include <kfiledialog.h>
#include <kiconloader.h>
-PMMaterialMapEdit::PMMaterialMapEdit( TQWidget* parent, const char* name )
- : Base( parent, name )
+PMMaterialMapEdit::PMMaterialMapEdit( TQWidget* tqparent, const char* name )
+ : Base( tqparent, name )
{
m_pDisplayedObject = 0;
}
@@ -287,7 +287,7 @@ void PMMaterialMapEdit::slotImageFileNameChanged( const TQString& /*a*/ )
void PMMaterialMapEdit::slotImageFileBrowseClicked( )
{
- TQString str = KFileDialog::getOpenFileName( TQString::null, TQString::null );
+ TQString str = KFileDialog::getOpenFileName( TQString(), TQString() );
if( !str.isEmpty() )
{
diff --git a/kpovmodeler/pmmaterialmapedit.h b/kpovmodeler/pmmaterialmapedit.h
index e10f3dfb..e1d4e9f3 100644
--- a/kpovmodeler/pmmaterialmapedit.h
+++ b/kpovmodeler/pmmaterialmapedit.h
@@ -42,12 +42,13 @@ class TQPushButton;
class PMMaterialMapEdit : public PMDialogEditBase
{
Q_OBJECT
+ TQ_OBJECT
typedef PMDialogEditBase Base;
public:
/**
- * Creates a PMMaterialMapEdit with parent and name
+ * Creates a PMMaterialMapEdit with tqparent and name
*/
- PMMaterialMapEdit( TQWidget* parent, const char* name = 0 );
+ PMMaterialMapEdit( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displayObject( PMObject* o );
/** */
diff --git a/kpovmodeler/pmmedia.cpp b/kpovmodeler/pmmedia.cpp
index c5e32d6e..b149b84d 100644
--- a/kpovmodeler/pmmedia.cpp
+++ b/kpovmodeler/pmmedia.cpp
@@ -97,11 +97,11 @@ PMMedia::~PMMedia( )
{
}
-PMMetaObject* PMMedia::metaObject( ) const
+PMMetaObject* PMMedia::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "Media", Base::metaObject( ),
+ s_pMetaObject = new PMMetaObject( "Media", Base::tqmetaObject( ),
createNewMedia );
s_pMetaObject->addProperty(
new PMMediaProperty( "method", &PMMedia::setMethod, &PMMedia::method ) );
@@ -399,9 +399,9 @@ void PMMedia::enableScattering( bool c )
}
}
-PMDialogEditBase* PMMedia::editWidget( TQWidget* parent ) const
+PMDialogEditBase* PMMedia::editWidget( TQWidget* tqparent ) const
{
- return new PMMediaEdit( parent );
+ return new PMMediaEdit( tqparent );
}
void PMMedia::restoreMemento( PMMemento* s )
diff --git a/kpovmodeler/pmmedia.h b/kpovmodeler/pmmedia.h
index 4836bf37..e984bebd 100644
--- a/kpovmodeler/pmmedia.h
+++ b/kpovmodeler/pmmedia.h
@@ -53,7 +53,7 @@ public:
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void cleanUp( ) const;
@@ -65,7 +65,7 @@ public:
/**
* Returns a new @ref PMMediaEdit
*/
- virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
+ virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
/** */
virtual TQString pixmap( ) const { return TQString( "pmmedia" ); }
diff --git a/kpovmodeler/pmmediaedit.cpp b/kpovmodeler/pmmediaedit.cpp
index f89f7d10..0f63b009 100644
--- a/kpovmodeler/pmmediaedit.cpp
+++ b/kpovmodeler/pmmediaedit.cpp
@@ -29,8 +29,8 @@
#include <kmessagebox.h>
#include <kdialog.h>
-PMMediaEdit::PMMediaEdit( TQWidget* parent, const char* name )
- : Base( parent, name )
+PMMediaEdit::PMMediaEdit( TQWidget* tqparent, const char* name )
+ : Base( tqparent, name )
{
m_pDisplayedObject = 0;
}
diff --git a/kpovmodeler/pmmediaedit.h b/kpovmodeler/pmmediaedit.h
index 6e481a87..021a5b77 100644
--- a/kpovmodeler/pmmediaedit.h
+++ b/kpovmodeler/pmmediaedit.h
@@ -40,12 +40,13 @@ class TQComboBox;
class PMMediaEdit : public PMTextureBaseEdit
{
Q_OBJECT
+ TQ_OBJECT
typedef PMTextureBaseEdit Base;
public:
/**
- * Creates a PMMediaEdit with parent and name
+ * Creates a PMMediaEdit with tqparent and name
*/
- PMMediaEdit( TQWidget* parent, const char* name = 0 );
+ PMMediaEdit( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displayObject( PMObject* o );
diff --git a/kpovmodeler/pmmemento.cpp b/kpovmodeler/pmmemento.cpp
index f417e575..a5c53648 100644
--- a/kpovmodeler/pmmemento.cpp
+++ b/kpovmodeler/pmmemento.cpp
@@ -187,7 +187,7 @@ TQString PMMemento::oldID( ) const
{
if( m_pIDData )
return m_pIDData->stringData( );
- return TQString::null;
+ return TQString();
}
void PMMemento::addChangedObject( PMObject* obj, int mode )
diff --git a/kpovmodeler/pmmesh.cpp b/kpovmodeler/pmmesh.cpp
index d143edf4..a56ea635 100644
--- a/kpovmodeler/pmmesh.cpp
+++ b/kpovmodeler/pmmesh.cpp
@@ -133,11 +133,11 @@ void PMMesh::readAttributes( const PMXMLHelper& h )
Base::readAttributes( h );
}
-PMMetaObject* PMMesh::metaObject( ) const
+PMMetaObject* PMMesh::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "Mesh", Base::metaObject( ), createNewMesh );
+ s_pMetaObject = new PMMetaObject( "Mesh", Base::tqmetaObject( ), createNewMesh );
s_pMetaObject->addProperty(
new PMMeshProperty( "hierarchy", &PMMesh::setHierarchy, &PMMesh::hierarchy ) );
@@ -189,9 +189,9 @@ void PMMesh::setInsideVector( const PMVector& iv )
}
}
-PMDialogEditBase* PMMesh::editWidget( TQWidget* parent ) const
+PMDialogEditBase* PMMesh::editWidget( TQWidget* tqparent ) const
{
- return new PMMeshEdit( parent );
+ return new PMMeshEdit( tqparent );
}
void PMMesh::createMemento( )
@@ -236,7 +236,7 @@ void PMMesh::restoreMemento( PMMemento* s )
TQPtrList<PMMemento> list = m->triangleMementos( );
TQPtrListIterator<PMMemento> Itr( list );
for ( int i = 0; i < numChildren && ( tm = Itr.current( ) ) != 0; ++i, ++Itr )
- childAt( i )->restoreMemento( tm );
+ tqchildAt( i )->restoreMemento( tm );
}
Base::restoreMemento( s );
@@ -259,10 +259,10 @@ void PMMesh::controlPoints( PMControlPointList& list )
m_pointToPointList.clear( );
for ( unsigned i = 0; i < numChildren; ++i )
{
- if ( childAt( i )->isA( "Triangle" ) )
+ if ( tqchildAt( i )->isA( "Triangle" ) )
{
- obj = ( PMTriangle * ) childAt( i );
+ obj = ( PMTriangle * ) tqchildAt( i );
ptp.object = obj;
for ( unsigned j = 0; j < 3; ++j )
{
@@ -353,9 +353,9 @@ void PMMesh::controlPointsChangedList( PMControlPointList& list, PMObjectList& o
for ( int i = 0; i < numChildren && validTriangles; ++i )
{
- if ( childAt( i )->isA( "Triangle" ) )
+ if ( tqchildAt( i )->isA( "Triangle" ) )
{
- obj = ( PMTriangle* )childAt( i );
+ obj = ( PMTriangle* )tqchildAt( i );
obj->createMemento( );
objList.append( obj );
validNormal = false;
@@ -538,7 +538,7 @@ void PMMesh::controlPointsChangedList( PMControlPointList& list, PMObjectList& o
{
if ( ( tm = mementoList.getLast( ) ) )
{
- childAt( j )->restoreMemento( tm );
+ tqchildAt( j )->restoreMemento( tm );
delete tm;
mementoList.removeLast( );
}
diff --git a/kpovmodeler/pmmesh.h b/kpovmodeler/pmmesh.h
index a6fe0089..74155060 100644
--- a/kpovmodeler/pmmesh.h
+++ b/kpovmodeler/pmmesh.h
@@ -56,7 +56,7 @@ public:
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void cleanUp( ) const;
@@ -68,7 +68,7 @@ public:
/**
* Returns a new @ref PMMeshEdit
*/
- virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
+ virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
/**
* Returns the name of the pixmap that is displayed in the tree view
* and dialog view
diff --git a/kpovmodeler/pmmeshedit.cpp b/kpovmodeler/pmmeshedit.cpp
index 6ddf9679..09285268 100644
--- a/kpovmodeler/pmmeshedit.cpp
+++ b/kpovmodeler/pmmeshedit.cpp
@@ -25,8 +25,8 @@
#include <klocale.h>
-PMMeshEdit::PMMeshEdit( TQWidget* parent, const char* name )
- : Base( parent, name )
+PMMeshEdit::PMMeshEdit( TQWidget* tqparent, const char* name )
+ : Base( tqparent, name )
{
m_pDisplayedObject = 0;
}
@@ -35,17 +35,17 @@ void PMMeshEdit::createTopWidgets( )
{
Base::createTopWidgets( );
- TQHBoxLayout* layout;
+ TQHBoxLayout* tqlayout;
m_pHierarchy = new TQCheckBox( i18n( "Hierarchy" ), this );
m_pEnableInsideVector = new TQCheckBox( i18n( "Inside vector:" ), this );
m_pInsideVector = new PMVectorEdit( "x", "y", "z", this );
- layout = new TQHBoxLayout( topLayout( ) );
- layout->addWidget( m_pHierarchy );
- layout->addStretch( 1 );
- layout = new TQHBoxLayout( topLayout( ) );
- layout->addWidget( m_pEnableInsideVector );
- layout->addWidget( m_pInsideVector );
- layout->addStretch( 1 );
+ tqlayout = new TQHBoxLayout( topLayout( ) );
+ tqlayout->addWidget( m_pHierarchy );
+ tqlayout->addStretch( 1 );
+ tqlayout = new TQHBoxLayout( topLayout( ) );
+ tqlayout->addWidget( m_pEnableInsideVector );
+ tqlayout->addWidget( m_pInsideVector );
+ tqlayout->addStretch( 1 );
connect( m_pHierarchy, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
connect( m_pEnableInsideVector, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotInsideVectorClicked( ) ) );
diff --git a/kpovmodeler/pmmeshedit.h b/kpovmodeler/pmmeshedit.h
index dc4dc4ae..e9d71054 100644
--- a/kpovmodeler/pmmeshedit.h
+++ b/kpovmodeler/pmmeshedit.h
@@ -36,12 +36,13 @@ class PMVectorEdit;
class PMMeshEdit : public PMSolidObjectEdit
{
Q_OBJECT
+ TQ_OBJECT
typedef PMSolidObjectEdit Base;
public:
/**
- * Creates a PMMeshEdit with parent and name
+ * Creates a PMMeshEdit with tqparent and name
*/
- PMMeshEdit( TQWidget* parent, const char* name = 0 );
+ PMMeshEdit( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displayObject( PMObject* o );
diff --git a/kpovmodeler/pmmetaobject.h b/kpovmodeler/pmmetaobject.h
index 95822fc9..a0b3ce90 100644
--- a/kpovmodeler/pmmetaobject.h
+++ b/kpovmodeler/pmmetaobject.h
@@ -402,7 +402,7 @@ public:
*/
PMPropertyBase* property( const TQString& name ) const
{
- return m_propertiesDict.find( name );
+ return m_propertiesDict.tqfind( name );
}
private:
diff --git a/kpovmodeler/pmmovecommand.cpp b/kpovmodeler/pmmovecommand.cpp
index bb75b0e4..e45a8bf3 100644
--- a/kpovmodeler/pmmovecommand.cpp
+++ b/kpovmodeler/pmmovecommand.cpp
@@ -29,19 +29,19 @@
#include <klocale.h>
#include <tqptrdict.h>
-PMMoveCommand::PMMoveCommand( PMObject* obj, PMObject* parent, PMObject* after )
- : PMCommand( i18n( "Move %1" ).arg( obj->description( ) ) )
+PMMoveCommand::PMMoveCommand( PMObject* obj, PMObject* tqparent, PMObject* after )
+ : PMCommand( i18n( "Move %1" ).tqarg( obj->description( ) ) )
{
- m_pParent = parent;
+ m_pParent = tqparent;
m_pAfter = after;
- if( obj->parent( ) )
+ if( obj->tqparent( ) )
{
m_infoList.append( new PMDeleteInfo( obj ) );
}
else
{
- // object has no parent!
+ // object has no tqparent!
// top level objects can't be moved, move all child items
PMObject* tmp;
for( tmp = obj->firstChild( ); tmp; tmp = tmp->nextSibling( ) )
@@ -52,7 +52,7 @@ PMMoveCommand::PMMoveCommand( PMObject* obj, PMObject* parent, PMObject* after )
m_firstExecution = true;
}
-PMMoveCommand::PMMoveCommand( const PMObjectList& list, PMObject* parent,
+PMMoveCommand::PMMoveCommand( const PMObjectList& list, PMObject* tqparent,
PMObject* after )
: PMCommand( i18n( "Move Objects" ) )
{
@@ -60,11 +60,11 @@ PMMoveCommand::PMMoveCommand( const PMObjectList& list, PMObject* parent,
for( ; it.current( ); ++it )
{
- if( it.current( )->parent( ) )
+ if( it.current( )->tqparent( ) )
m_infoList.append( new PMDeleteInfo( it.current( ) ) );
else
{
- // object has no parent!
+ // object has no tqparent!
// top level objects can't be moved, move all child items
PMObject* tmp;
for( tmp = it.current( )->firstChild( ); tmp; tmp = tmp->nextSibling( ) )
@@ -72,7 +72,7 @@ PMMoveCommand::PMMoveCommand( const PMObjectList& list, PMObject* parent,
}
}
- m_pParent = parent;
+ m_pParent = tqparent;
m_pAfter = after;
m_executed = false;
m_firstExecution = true;
@@ -97,19 +97,19 @@ void PMMoveCommand::execute( PMCommandManager* theManager )
PMObject* obj;
bool error = false;
PMDeleteInfo* info = 0;
- PMObject* parent;
+ PMObject* tqparent;
for( it.toLast( ); it.current( ); --it )
{
info = it.current( );
- parent = info->parent( );
+ tqparent = info->tqparent( );
// signal has to be emitted before the item is removed
theManager->cmdObjectChanged( info->deletedObject( ), PMCRemove );
if( m_firstExecution )
- if( parent->dataChangeOnInsertRemove( )
- && !parent->mementoCreated( ) )
- parent->createMemento( );
- parent->takeChild( info->deletedObject( ) );
+ if( tqparent->dataChangeOnInsertRemove( )
+ && !tqparent->mementoCreated( ) )
+ tqparent->createMemento( );
+ tqparent->takeChild( info->deletedObject( ) );
}
// insert at new position
@@ -165,10 +165,10 @@ void PMMoveCommand::execute( PMCommandManager* theManager )
for( it.toLast( ); it.current( ); --it )
{
info = it.current( );
- parent = info->parent( );
+ tqparent = info->tqparent( );
- if( parent->mementoCreated( ) )
- m_dataChanges.append( parent->takeMemento( ) );
+ if( tqparent->mementoCreated( ) )
+ m_dataChanges.append( tqparent->takeMemento( ) );
}
}
@@ -197,18 +197,18 @@ void PMMoveCommand::undo( PMCommandManager* theManager )
// signal has to be emitted before the item is removed
obj = it.current( )->deletedObject( );
theManager->cmdObjectChanged( obj, PMCRemove );
- if( obj->parent( ) )
- obj->parent( )->takeChild( obj );
+ if( obj->tqparent( ) )
+ obj->tqparent( )->takeChild( obj );
}
for( it.toFirst( ); it.current( ); ++it )
{
obj = it.current( )->deletedObject( );
if( it.current( )->prevSibling( ) )
- it.current( )->parent( )
+ it.current( )->tqparent( )
->insertChildAfter( obj, it.current( )->prevSibling( ) );
else
- it.current( )->parent( )->insertChild( obj, 0 );
+ it.current( )->tqparent( )->insertChild( obj, 0 );
theManager->cmdObjectChanged( obj, PMCAdd );
}
@@ -279,18 +279,18 @@ int PMMoveCommand::errorFlags( PMPart* )
{
insideSelection = false;
for( obj = links.current( ); obj && !insideSelection;
- obj = obj->parent( ) )
+ obj = obj->tqparent( ) )
{
- if( deletedObjects.find( obj ) )
+ if( deletedObjects.tqfind( obj ) )
insideSelection = true;
}
if( insideSelection )
{
bool stop = false;
- for( obj = links.current( ); obj && !stop; obj = obj->parent( ) )
+ for( obj = links.current( ); obj && !stop; obj = obj->tqparent( ) )
{
- if( deletedObjects.find( obj ) )
+ if( deletedObjects.tqfind( obj ) )
stop = true;
else
deletedObjects.insert( obj, new bool( true ) );
@@ -305,17 +305,17 @@ int PMMoveCommand::errorFlags( PMPart* )
if( m_pAfter )
{
// insert point is not the first item
- // find the top level parent item
+ // find the top level tqparent item
stop = false;
obj = links.current( );
do
{
- if( obj->parent( ) )
+ if( obj->tqparent( ) )
{
- if( obj->parent( )->type( ) == "Scene" )
+ if( obj->tqparent( )->type( ) == "Scene" )
stop = true;
else
- obj = obj->parent( );
+ obj = obj->tqparent( );
}
else
stop = true; // error
@@ -325,9 +325,9 @@ int PMMoveCommand::errorFlags( PMPart* )
PMObject* topParent = obj;
// check if insert point is before the top level
- // parent object
+ // tqparent object
- if( !objectsAfterInsertPosition.find( obj ) )
+ if( !objectsAfterInsertPosition.tqfind( obj ) )
{
stop = false;
obj = obj->prevSibling( );
@@ -335,7 +335,7 @@ int PMMoveCommand::errorFlags( PMPart* )
{
if( obj == m_pAfter )
stop = true;
- else if( objectsAfterInsertPosition.find( obj ) )
+ else if( objectsAfterInsertPosition.tqfind( obj ) )
stop = true;
else
obj = obj->prevSibling( );
@@ -356,10 +356,10 @@ int PMMoveCommand::errorFlags( PMPart* )
{
if( declareInsertError )
m_errors.prepend( i18n( "Can't insert the declare \"%1\" at that point." )
- .arg( decl->id( ) ) );
+ .tqarg( decl->id( ) ) );
else
m_errors.prepend( i18n( "The declare \"%1\" can't be moved behind linked objects." )
- .arg( decl->id( ) ) );
+ .tqarg( decl->id( ) ) );
PMDeleteInfo* tmp = info;
info = m_infoList.prev( );
@@ -383,12 +383,12 @@ int PMMoveCommand::errorFlags( PMPart* )
obj = m_pParent;
do
{
- if( obj->parent( ) )
+ if( obj->tqparent( ) )
{
- if( obj->parent( )->type( ) == "Scene" )
+ if( obj->tqparent( )->type( ) == "Scene" )
stop = true;
else
- obj = obj->parent( );
+ obj = obj->tqparent( );
}
else
stop = true; // error
@@ -419,13 +419,13 @@ int PMMoveCommand::errorFlags( PMPart* )
if( linked )
{
- if( !deletedObjects.find( linked ) )
+ if( !deletedObjects.tqfind( linked ) )
{
// Object is linked to a declare and the declare
// will not be moved.
// Check, if the insert point is after the declare
- if( !declaresBeforeInsertPosition.find( linked ) )
+ if( !declaresBeforeInsertPosition.tqfind( linked ) )
ok = false;
}
}
@@ -450,8 +450,8 @@ int PMMoveCommand::errorFlags( PMPart* )
"contains a link to the declare \"%3\" "
"and the insert point is not after "
"the declare." )
- .arg( obj->description( ) ).arg( name )
- .arg( decl->id( ) ) );
+ .tqarg( obj->description( ) ).tqarg( name )
+ .tqarg( decl->id( ) ) );
}
else
kdError( PMArea ) << "linked is 0 in PMMoveCommand::errorFlags\n";
diff --git a/kpovmodeler/pmmovecommand.h b/kpovmodeler/pmmovecommand.h
index 5aac246d..188d721c 100644
--- a/kpovmodeler/pmmovecommand.h
+++ b/kpovmodeler/pmmovecommand.h
@@ -39,23 +39,23 @@ public:
/**
* Command that moves one PMObject.
*
- * The object obj will be inserted as child of parent after
+ * The object obj will be inserted as child of tqparent after
* the object after.
*
* If after is 0, the object becomes the first child.
*/
- PMMoveCommand( PMObject* obj, PMObject* parent, PMObject* after );
+ PMMoveCommand( PMObject* obj, PMObject* tqparent, PMObject* after );
/**
* Command that moves a list of new PMObjects.
* The objects don't have to be siblings of each other.
*
- * The object in the list will be inserted as children of parent after
+ * The object in the list will be inserted as tqchildren of tqparent after
* the object after.
*
- * If after is 0, the objects will be inserted as first children.
+ * If after is 0, the objects will be inserted as first tqchildren.
*/
- PMMoveCommand( const PMObjectList& list, PMObject* parent, PMObject* after );
+ PMMoveCommand( const PMObjectList& list, PMObject* tqparent, PMObject* after );
/**
* Deletes the command.
*/
diff --git a/kpovmodeler/pmnamedobject.cpp b/kpovmodeler/pmnamedobject.cpp
index 72553cd4..70f2bc5a 100644
--- a/kpovmodeler/pmnamedobject.cpp
+++ b/kpovmodeler/pmnamedobject.cpp
@@ -39,11 +39,11 @@ PMNamedObject::~PMNamedObject( )
{
}
-PMMetaObject* PMNamedObject::metaObject( ) const
+PMMetaObject* PMNamedObject::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "NamedObject", Base::metaObject( ) );
+ s_pMetaObject = new PMMetaObject( "NamedObject", Base::tqmetaObject( ) );
s_pMetaObject->addProperty(
new PMNamedObjectProperty( "name", &PMNamedObject::setName, &PMNamedObject::name ) );
}
diff --git a/kpovmodeler/pmnamedobject.h b/kpovmodeler/pmnamedobject.h
index 8b7b0b62..02ee7eb4 100644
--- a/kpovmodeler/pmnamedobject.h
+++ b/kpovmodeler/pmnamedobject.h
@@ -48,7 +48,7 @@ public:
~PMNamedObject( );
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void cleanUp( ) const;
diff --git a/kpovmodeler/pmnamedobjectedit.cpp b/kpovmodeler/pmnamedobjectedit.cpp
index 8f590982..afcbe0d6 100644
--- a/kpovmodeler/pmnamedobjectedit.cpp
+++ b/kpovmodeler/pmnamedobjectedit.cpp
@@ -24,8 +24,8 @@
#include <tqlabel.h>
#include <klocale.h>
-PMNamedObjectEdit::PMNamedObjectEdit( TQWidget* parent, const char* name )
- : Base( parent, name )
+PMNamedObjectEdit::PMNamedObjectEdit( TQWidget* tqparent, const char* name )
+ : Base( tqparent, name )
{
m_pDisplayedObject = 0;
}
@@ -34,12 +34,12 @@ void PMNamedObjectEdit::createTopWidgets( )
{
Base::createTopWidgets( );
- TQHBoxLayout* layout = new TQHBoxLayout( topLayout( ) );
+ TQHBoxLayout* tqlayout = new TQHBoxLayout( topLayout( ) );
m_pNameEdit = new TQLineEdit( this );
TQLabel* label = new TQLabel( i18n( "Name:" ), this );
- layout->addWidget( label );
- layout->addWidget( m_pNameEdit );
+ tqlayout->addWidget( label );
+ tqlayout->addWidget( m_pNameEdit );
connect( m_pNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
TQT_SLOT( slotNameChanged( const TQString& ) ) );
diff --git a/kpovmodeler/pmnamedobjectedit.h b/kpovmodeler/pmnamedobjectedit.h
index dcf8cb07..ce7c8024 100644
--- a/kpovmodeler/pmnamedobjectedit.h
+++ b/kpovmodeler/pmnamedobjectedit.h
@@ -35,12 +35,13 @@ class TQLineEdit;
class PMNamedObjectEdit : public PMDialogEditBase
{
Q_OBJECT
+ TQ_OBJECT
typedef PMDialogEditBase Base;
public:
/**
- * Creates a PMNamedObjectEdit with parent and name
+ * Creates a PMNamedObjectEdit with tqparent and name
*/
- PMNamedObjectEdit( TQWidget* parent, const char* name = 0 );
+ PMNamedObjectEdit( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displayObject( PMObject* o );
diff --git a/kpovmodeler/pmnormal.cpp b/kpovmodeler/pmnormal.cpp
index 722a8fc4..c2afe835 100644
--- a/kpovmodeler/pmnormal.cpp
+++ b/kpovmodeler/pmnormal.cpp
@@ -58,11 +58,11 @@ PMNormal::~PMNormal( )
{
}
-PMMetaObject* PMNormal::metaObject( ) const
+PMMetaObject* PMNormal::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "Normal", Base::metaObject( ),
+ s_pMetaObject = new PMMetaObject( "Normal", Base::tqmetaObject( ),
createNewNormal );
s_pMetaObject->addProperty(
new PMNormProperty( "bumpSize", &PMNormal::setBumpSize, &PMNormal::bumpSize ) );
@@ -109,9 +109,9 @@ void PMNormal::readAttributes( const PMXMLHelper& h )
m_uvMapping = h.boolAttribute( "uv_mapping", false );
}
-PMDialogEditBase* PMNormal::editWidget( TQWidget* parent ) const
+PMDialogEditBase* PMNormal::editWidget( TQWidget* tqparent ) const
{
- return new PMNormalEdit( parent );
+ return new PMNormalEdit( tqparent );
}
void PMNormal::enableBumpSize( bool c )
diff --git a/kpovmodeler/pmnormal.h b/kpovmodeler/pmnormal.h
index c798d039..2294b1fc 100644
--- a/kpovmodeler/pmnormal.h
+++ b/kpovmodeler/pmnormal.h
@@ -52,7 +52,7 @@ public:
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void cleanUp( ) const;
@@ -64,7 +64,7 @@ public:
/**
* Returns a new @ref PMNormalEdit
*/
- virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
+ virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
/** */
virtual TQString pixmap( ) const { return TQString( "pmnormal" ); }
diff --git a/kpovmodeler/pmnormaledit.cpp b/kpovmodeler/pmnormaledit.cpp
index 68d6f1f3..5d5c6eee 100644
--- a/kpovmodeler/pmnormaledit.cpp
+++ b/kpovmodeler/pmnormaledit.cpp
@@ -27,8 +27,8 @@
#include <klocale.h>
-PMNormalEdit::PMNormalEdit( TQWidget* parent, const char* name )
- : Base( parent, name )
+PMNormalEdit::PMNormalEdit( TQWidget* tqparent, const char* name )
+ : Base( tqparent, name )
{
m_pDisplayedObject = 0;
}
diff --git a/kpovmodeler/pmnormaledit.h b/kpovmodeler/pmnormaledit.h
index 72ca9d12..f3fa45b7 100644
--- a/kpovmodeler/pmnormaledit.h
+++ b/kpovmodeler/pmnormaledit.h
@@ -36,12 +36,13 @@ class PMFloatEdit;
class PMNormalEdit : public PMTextureBaseEdit
{
Q_OBJECT
+ TQ_OBJECT
typedef PMTextureBaseEdit Base;
public:
/**
- * Creates a PMNormalEdit with parent and name
+ * Creates a PMNormalEdit with tqparent and name
*/
- PMNormalEdit( TQWidget* parent, const char* name = 0 );
+ PMNormalEdit( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displayObject( PMObject* o );
diff --git a/kpovmodeler/pmobject.cpp b/kpovmodeler/pmobject.cpp
index 94907482..71424eaf 100644
--- a/kpovmodeler/pmobject.cpp
+++ b/kpovmodeler/pmobject.cpp
@@ -57,7 +57,7 @@ PMObject::~PMObject( )
{
}
-PMMetaObject* PMObject::metaObject( ) const
+PMMetaObject* PMObject::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
@@ -72,7 +72,7 @@ PMMetaObject* PMObject::metaObject( ) const
PMObject* PMObject::newObject( ) const
{
- return metaObject( )->newObject( m_pPart );
+ return tqmetaObject( )->newObject( m_pPart );
}
bool PMObject::insertChildAfter( PMObject*, PMObject* )
@@ -142,9 +142,9 @@ bool PMObject::takeChild( uint )
return false;
}
-PMDialogEditBase* PMObject::editWidget( TQWidget* parent ) const
+PMDialogEditBase* PMObject::editWidget( TQWidget* tqparent ) const
{
- return new PMDialogEditBase( parent );
+ return new PMDialogEditBase( tqparent );
// return 0;
}
@@ -177,7 +177,7 @@ PMMatrix PMObject::transformedWith( ) const
else if( o->nextSibling( ) )
o = o->nextSibling( );
else
- o = o->parent( );
+ o = o->tqparent( );
while( o )
{
@@ -187,7 +187,7 @@ PMMatrix PMObject::transformedWith( ) const
if( o->nextSibling( ) )
o = o->nextSibling( );
else
- o = o->parent( );
+ o = o->tqparent( );
}
return result;
@@ -215,7 +215,7 @@ void PMObject::cleanUp( ) const
bool PMObject::setProperty( const TQString& name, const PMVariant& v )
{
- PMPropertyBase* p = metaObject( )->property( name );
+ PMPropertyBase* p = tqmetaObject( )->property( name );
if( !p )
return false;
return p->setProperty( this, v );
@@ -224,7 +224,7 @@ bool PMObject::setProperty( const TQString& name, const PMVariant& v )
TQStringList PMObject::properties( ) const
{
TQStringList lst;
- PMPropertyIterator it = metaObject( )->properties( );
+ PMPropertyIterator it = tqmetaObject( )->properties( );
for( ; it.current( ); ++it )
lst.append( it.current( )->name( ) );
@@ -234,7 +234,7 @@ TQStringList PMObject::properties( ) const
PMVariant PMObject::property( const TQString& name ) const
{
- PMPropertyBase* p = metaObject( )->property( name );
+ PMPropertyBase* p = tqmetaObject( )->property( name );
if( !p )
return PMVariant( );
return p->getProperty( this );
@@ -244,12 +244,12 @@ bool PMObject::isA( const TQString& className ) const
{
if( !m_pPart )
return false;
- return m_pPart->prototypeManager( )->isA( metaObject( ), className );
+ return m_pPart->prototypeManager( )->isA( tqmetaObject( ), className );
}
TQString PMObject::type( ) const
{
- return metaObject( )->className( );
+ return tqmetaObject( )->className( );
}
bool PMObject::canInsert( const TQString& className, const PMObject* after,
diff --git a/kpovmodeler/pmobject.h b/kpovmodeler/pmobject.h
index fcf67466..1275f3d9 100644
--- a/kpovmodeler/pmobject.h
+++ b/kpovmodeler/pmobject.h
@@ -54,22 +54,22 @@ typedef TQPtrListIterator<PMObject> PMObjectListIterator;
* Used pattern: Composite
*
* All list/child functionality is disabled in this class. Objects that
- * can have children has to be inherited from @ref PMCompositeObject.
+ * can have tqchildren has to be inherited from @ref PMCompositeObject.
*/
class PMObject
{
friend class PMCompositeObject;
public:
/**
- * Creates an empty PMObject without parent.
+ * Creates an empty PMObject without tqparent.
*/
PMObject( PMPart* part );
/**
- * Copy constructor. All object pointers (parent, siblings) are set to 0!
+ * Copy constructor. All object pointers (tqparent, siblings) are set to 0!
*/
PMObject( const PMObject& o );
/**
- * Deletes the object and all children.
+ * Deletes the object and all tqchildren.
*/
virtual ~PMObject( );
@@ -85,7 +85,7 @@ public:
/**
* Returns the meta object for the class
*/
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/**
* Returns true if the object is of type t or inherits the object
@@ -110,7 +110,7 @@ public:
* Returns the name of the object. This is the name that helps
* the user to identify a object (like "south wall", "floor" ...)
*/
- virtual TQString name( ) const { return TQString::null; }
+ virtual TQString name( ) const { return TQString(); }
/**
* Returns true if the object can have a name
*/
@@ -121,9 +121,9 @@ public:
virtual bool exportPovray( ) const { return true; }
/**
- * Returns a pointer to the parent object.
+ * Returns a pointer to the tqparent object.
*/
- PMObject* parent( ) const { return m_pParent; }
+ PMObject* tqparent( ) const { return m_pParent; }
/**
* Returns a pointer to the corresponding part
*/
@@ -157,7 +157,7 @@ public:
int canInsert( const TQStringList& classes, const PMObject* after ) const;
/**
- * Returns true if an insert or remove operation of children will
+ * Returns true if an insert or remove operation of tqchildren will
* change data inside this class
*/
virtual bool dataChangeOnInsertRemove( ) const { return false; }
@@ -174,7 +174,7 @@ public:
* Returns a pointer to the child object at position index,
* or null if the index is out of range.
*/
- virtual PMObject* childAt( uint ) const { return 0; }
+ virtual PMObject* tqchildAt( uint ) const { return 0; }
/**
* Returns the next sibling of that item
*/
@@ -219,7 +219,7 @@ public:
return false;
}
/**
- * Returns the number of children. 0 in this class
+ * Returns the number of tqchildren. 0 in this class
*/
virtual int countChildren( ) const { return 0; }
/**
@@ -235,12 +235,12 @@ public:
/**
* Called when a child was removed. For classes that have to be informed
- * when children are removed
+ * when tqchildren are removed
*/
virtual void childRemoved( PMObject* ) { };
/**
* Called when a child was added. For classes that have to be informed
- * when children are added
+ * when tqchildren are added
*/
virtual void childAdded( PMObject* ) { };
@@ -302,7 +302,7 @@ public:
* not only this object.
*
* If you leave the list empty, only this object was changed.
- * If you add children or other objects to the list, add this object
+ * If you add tqchildren or other objects to the list, add this object
* to the list, too, if it was changed!
*
* IMPORTANT: When you change additional objects, make sure that
@@ -356,7 +356,7 @@ public:
*/
virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const = 0;
/**
- * Reads the attributes from the QDomElement
+ * Reads the attributes from the TQDomElement
*/
virtual void readAttributes( const PMXMLHelper& h );
@@ -385,7 +385,7 @@ public:
void setSelected( bool s );
/**
* Returns true if this item can be selected. An item cannot be selected
- * if a parent object is selected
+ * if a tqparent object is selected
*/
bool isSelectable( );
/**
@@ -402,7 +402,7 @@ public:
*/
bool isReadOnly( ) const;
/**
- * Makes this object read only, if yes == true. All children will
+ * Makes this object read only, if yes == true. All tqchildren will
* be read only, too
*/
void setReadOnly( bool yes = true ) { m_readOnly = yes; }
@@ -411,9 +411,9 @@ public:
* Creates a new edit widget that can display this object and
* returns a pointer to it.
*
- * The widget will be created as a child of parent.
+ * The widget will be created as a child of tqparent.
*/
- virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
+ virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
/**
* Returns the name of the pixmap that is displayed in the tree view
* and dialog view
@@ -470,7 +470,7 @@ public:
protected:
/**
* Adds num to the number of selected objects in this object and all
- * parent objects. num can be negative.
+ * tqparent objects. num can be negative.
*/
virtual void adjustSelectedChildren( int /*num*/ ) { };
/**
@@ -479,7 +479,7 @@ protected:
PMMemento* m_pMemento;
private:
/**
- * Pointer to the parent object. 0 if the object has no parent.
+ * Pointer to the tqparent object. 0 if the object has no tqparent.
*/
PMObject* m_pParent;
/**
@@ -495,7 +495,7 @@ private:
*/
bool m_selected;
/**
- * true if this object is read only. All children will be read only, too
+ * true if this object is read only. All tqchildren will be read only, too
*/
bool m_readOnly;
/**
diff --git a/kpovmodeler/pmobjectdrag.cpp b/kpovmodeler/pmobjectdrag.cpp
index cd1ee6da..879bbc1c 100644
--- a/kpovmodeler/pmobjectdrag.cpp
+++ b/kpovmodeler/pmobjectdrag.cpp
@@ -73,7 +73,7 @@ PMObjectDrag::PMObjectDrag( PMPart* part, PMObject* object, TQWidget* dragSource
TQBuffer buffer( data );
buffer.open( IO_WriteOnly );
- PMSerializer* ser = it.current( )->newSerializer( &buffer );
+ PMSerializer* ser = it.current( )->newSerializer( TQT_TQIODEVICE(&buffer) );
if( ser )
{
@@ -143,7 +143,7 @@ PMObjectDrag::PMObjectDrag( PMPart* part, const PMObjectList& objList, TQWidget*
TQBuffer buffer( data );
buffer.open( IO_WriteOnly );
- PMSerializer* ser = fit.current( )->newSerializer( &buffer );
+ PMSerializer* ser = fit.current( )->newSerializer( TQT_TQIODEVICE(&buffer) );
if( ser )
{
@@ -170,7 +170,7 @@ PMObjectDrag::~PMObjectDrag( )
{
}
-TQByteArray PMObjectDrag::encodedData( const char* format ) const
+TQByteArray PMObjectDrag::tqencodedData( const char* format ) const
{
TQValueList<TQByteArray>::ConstIterator dit;
TQStringList::ConstIterator sit;
@@ -211,7 +211,7 @@ bool PMObjectDrag::canDecode( const TQMimeSource* e, PMPart* part )
PMParser* PMObjectDrag::newParser( const TQMimeSource* e, PMPart* part )
{
if( e->provides( c_kpmDocumentMimeFormat ) )
- return new PMXMLParser( part, e->encodedData( c_kpmDocumentMimeFormat ) );
+ return new PMXMLParser( part, e->tqencodedData( c_kpmDocumentMimeFormat ) );
const TQPtrList<PMIOFormat>& formats = part->ioManager( )->formats( );
TQPtrListIterator<PMIOFormat> fit( formats );
@@ -221,7 +221,7 @@ PMParser* PMObjectDrag::newParser( const TQMimeSource* e, PMPart* part )
TQString str = f->mimeType( );
const char* lat = str.latin1( );
if( f->services( ) & PMIOFormat::Import && e->provides( lat ) )
- return f->newParser( part, e->encodedData( lat ) );
+ return f->newParser( part, e->tqencodedData( lat ) );
}
return 0;
diff --git a/kpovmodeler/pmobjectdrag.h b/kpovmodeler/pmobjectdrag.h
index 757eae8d..a02b4401 100644
--- a/kpovmodeler/pmobjectdrag.h
+++ b/kpovmodeler/pmobjectdrag.h
@@ -31,7 +31,7 @@ class PMPart;
* Supports drag/drop and copy/paste of kpovmodeler objects
*/
-class PMObjectDrag : public QDragObject
+class PMObjectDrag : public TQDragObject
{
public:
/**
@@ -56,7 +56,7 @@ public:
* Returns the encoded payload of this object, in the
* specified MIME format.
*/
- virtual TQByteArray encodedData( const char* ) const;
+ virtual TQByteArray tqencodedData( const char* ) const;
/**
* Returns the ith format, or NULL.
*/
diff --git a/kpovmodeler/pmobjectlibrarysettings.cpp b/kpovmodeler/pmobjectlibrarysettings.cpp
index 47a38435..d57e5949 100644
--- a/kpovmodeler/pmobjectlibrarysettings.cpp
+++ b/kpovmodeler/pmobjectlibrarysettings.cpp
@@ -33,19 +33,19 @@
#include <kmessagebox.h>
#include <kstandarddirs.h>
-PMObjectLibrarySettings::PMObjectLibrarySettings( TQWidget* parent, const char* name )
- : PMSettingsDialogPage( parent, name )
+PMObjectLibrarySettings::PMObjectLibrarySettings( TQWidget* tqparent, const char* name )
+ : PMSettingsDialogPage( tqparent, name )
{
- TQVBoxLayout* vlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
+ TQVBoxLayout* vtqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
TQGroupBox* gb = new TQGroupBox( i18n( "Libraries" ), this );
- vlayout->addWidget( gb );
+ vtqlayout->addWidget( gb );
- TQHBoxLayout* hlayout = new TQHBoxLayout( gb, KDialog::marginHint( ) + 5, KDialog::spacingHint( ) );
+ TQHBoxLayout* htqlayout = new TQHBoxLayout( gb, KDialog::marginHint( ) + 5, KDialog::spacingHint( ) );
m_pObjectLibraries = new TQListBox( gb );
connect( m_pObjectLibraries, TQT_SIGNAL( selectionChanged( ) ), TQT_SLOT( slotObjectLibraryChanged( ) ) );
- hlayout->addWidget( m_pObjectLibraries );
- TQVBoxLayout* gvl = new TQVBoxLayout( hlayout );
+ htqlayout->addWidget( m_pObjectLibraries );
+ TQVBoxLayout* gvl = new TQVBoxLayout( htqlayout );
m_pCreateObjectLibrary = new TQPushButton( i18n( "Create..." ), gb );
connect( m_pCreateObjectLibrary, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotCreateObjectLibrary( ) ) );
gvl->addWidget( m_pCreateObjectLibrary );
@@ -77,9 +77,9 @@ PMObjectLibrarySettings::PMObjectLibrarySettings( TQWidget* parent, const char*
grid->addWidget( m_pLibraryDescription, 2, 1 );
grid->addMultiCellWidget( m_pReadOnlyText, 3, 3, 0, 1 );
grid->setColStretch( 1, 1 );
- vlayout->addWidget( gb );
+ vtqlayout->addWidget( gb );
- vlayout->addStretch( 1 );
+ vtqlayout->addStretch( 1 );
}
void PMObjectLibrarySettings::displaySettings( )
diff --git a/kpovmodeler/pmobjectlibrarysettings.h b/kpovmodeler/pmobjectlibrarysettings.h
index f4e7f854..dd9d30ce 100644
--- a/kpovmodeler/pmobjectlibrarysettings.h
+++ b/kpovmodeler/pmobjectlibrarysettings.h
@@ -35,11 +35,12 @@ class TQListBox;
class PMObjectLibrarySettings : public PMSettingsDialogPage
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Default constructor
*/
- PMObjectLibrarySettings( TQWidget* parent, const char* name = 0 );
+ PMObjectLibrarySettings( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displaySettings( );
/** */
diff --git a/kpovmodeler/pmobjectlink.cpp b/kpovmodeler/pmobjectlink.cpp
index 559d3fe4..b6add85b 100644
--- a/kpovmodeler/pmobjectlink.cpp
+++ b/kpovmodeler/pmobjectlink.cpp
@@ -58,11 +58,11 @@ TQString PMObjectLink::description( ) const
return i18n( "object link" );
}
-PMMetaObject* PMObjectLink::metaObject( ) const
+PMMetaObject* PMObjectLink::tqmetaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "ObjectLink", Base::metaObject( ),
+ s_pMetaObject = new PMMetaObject( "ObjectLink", Base::tqmetaObject( ),
createNewObjectLink );
s_pMetaObject->addProperty(
new PMObjectLinkProperty( "linkedObject", &PMObjectLink::setLinkedObjectProperty,
@@ -161,15 +161,15 @@ void PMObjectLink::readAttributes( const PMXMLHelper& h )
}
else
h.parser( )->printError( i18n( "Declare \"%1\" has wrong type." )
- .arg( id ) );
+ .tqarg( id ) );
}
}
Base::readAttributes( h );
}
-PMDialogEditBase* PMObjectLink::editWidget( TQWidget* parent ) const
+PMDialogEditBase* PMObjectLink::editWidget( TQWidget* tqparent ) const
{
- return new PMObjectLinkEdit( parent );
+ return new PMObjectLinkEdit( tqparent );
}
void PMObjectLink::restoreMemento( PMMemento* s )
diff --git a/kpovmodeler/pmobjectlink.h b/kpovmodeler/pmobjectlink.h
index 8ec7b474..dce54498 100644
--- a/kpovmodeler/pmobjectlink.h
+++ b/kpovmodeler/pmobjectlink.h
@@ -53,7 +53,7 @@ public:
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* metaObject( ) const;
+ virtual PMMetaObject* tqmetaObject( ) const;
/** */
virtual void cleanUp( ) const;
@@ -80,7 +80,7 @@ public:
/**
* Returns a new @ref PMObjectLinkEdit
*/
- virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
+ virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
/** */
virtual TQString pixmap( ) const { return TQString( "pmobjectlink" ); }
diff --git a/kpovmodeler/pmobjectlinkedit.cpp b/kpovmodeler/pmobjectlinkedit.cpp
index 98aead0c..c2ddf61b 100644
--- a/kpovmodeler/pmobjectlinkedit.cpp
+++ b/kpovmodeler/pmobjectlinkedit.cpp
@@ -24,8 +24,8 @@
#include <tqlayout.h>
-PMObjectLinkEdit::PMObjectLinkEdit( TQWidget* parent, const char* name )
- : Base( parent, name )
+PMObjectLinkEdit::PMObjectLinkEdit( TQWidget* tqparent, const char* name )
+ : Base( tqparent, name )
{
m_pDisplayedObject = 0;
}
diff --git a/kpovmodeler/pmobjectlinkedit.h b/kpovmodeler/pmobjectlinkedit.h
index fd1ce86b..82ed645d 100644
--- a/kpovmodeler/pmobjectlinkedit.h
+++ b/kpovmodeler/pmobjectlinkedit.h
@@ -35,12 +35,13 @@ class PMLinkEdit;
class PMObjectLinkEdit : public PMSolidObjectEdit
{
Q_OBJECT
+ TQ_OBJECT
typedef PMSolidObjectEdit Base;
public:
/**
- * Creates a PMObjectLinkEdit with parent and name
+ * Creates a PMObjectLinkEdit with tqparent and name
*/
- PMObjectLinkEdit( TQWidget* parent, const char* name = 0 );
+ PMObjectLinkEdit( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displayObject( PMObject* o );
diff --git a/kpovmodeler/pmobjectselect.cpp b/kpovmodeler/pmobjectselect.cpp
index fcfbb3f5..5469c487 100644
--- a/kpovmodeler/pmobjectselect.cpp
+++ b/kpovmodeler/pmobjectselect.cpp
@@ -84,8 +84,8 @@ PMListBoxObject::~PMListBoxObject( )
TQSize PMObjectSelect::s_size = TQSize( 200, 300 );
-PMObjectSelect::PMObjectSelect( TQWidget* parent, const char* name, bool modal )
- : KDialogBase( parent, name, modal, i18n( "Choose Object" ), Ok | Cancel )
+PMObjectSelect::PMObjectSelect( TQWidget* tqparent, const char* name, bool modal )
+ : KDialogBase( tqparent, name, modal, i18n( "Choose Object" ), Ok | Cancel )
{
m_pSelectedObject = 0;
m_pListBox = new TQListBox( this );
@@ -110,7 +110,7 @@ void PMObjectSelect::addObject( PMObject* obj )
}
int PMObjectSelect::selectObject( PMObject* link, const TQString& t,
- PMObject* & obj, TQWidget* parent )
+ PMObject* & obj, TQWidget* tqparent )
{
PMObject* last = link;
PMObject* scene;
@@ -119,7 +119,7 @@ int PMObjectSelect::selectObject( PMObject* link, const TQString& t,
do
{
- scene = last->parent( );
+ scene = last->tqparent( );
if( scene )
{
if( scene->type( ) == "Scene" )
@@ -129,7 +129,7 @@ int PMObjectSelect::selectObject( PMObject* link, const TQString& t,
found = true;
}
else
- last = last->parent( );
+ last = last->tqparent( );
}
else
stop = true;
@@ -138,7 +138,7 @@ int PMObjectSelect::selectObject( PMObject* link, const TQString& t,
if( found )
{
- PMObjectSelect s( parent );
+ PMObjectSelect s( tqparent );
PMObject* o = scene->firstChild( );
bool l = false;
@@ -167,7 +167,7 @@ int PMObjectSelect::selectObject( PMObject* link, const TQString& t,
int PMObjectSelect::selectObject( PMObject* link,
const TQStringList& t,
- PMObject* & obj, TQWidget* parent )
+ PMObject* & obj, TQWidget* tqparent )
{
PMObject* last = link;
PMObject* scene;
@@ -176,7 +176,7 @@ int PMObjectSelect::selectObject( PMObject* link,
do
{
- scene = last->parent( );
+ scene = last->tqparent( );
if( scene )
{
if( scene->type( ) == "Scene" )
@@ -186,7 +186,7 @@ int PMObjectSelect::selectObject( PMObject* link,
found = true;
}
else
- last = last->parent( );
+ last = last->tqparent( );
}
else
stop = true;
@@ -195,14 +195,14 @@ int PMObjectSelect::selectObject( PMObject* link,
if( found )
{
- PMObjectSelect s( parent );
+ PMObjectSelect s( tqparent );
PMObject* o = scene->firstChild( );
bool l = false;
while( o && !l && last )
{
- if( t.findIndex( o->type( ) ) >= 0 )
+ if( t.tqfindIndex( o->type( ) ) >= 0 )
s.m_pListBox->insertItem( new PMListBoxObject( o ) );
if( o == last )
@@ -223,7 +223,7 @@ int PMObjectSelect::selectObject( PMObject* link,
}
int PMObjectSelect::selectDeclare( PMObject* link, const TQString& declareType,
- PMObject* & obj, TQWidget* parent )
+ PMObject* & obj, TQWidget* tqparent )
{
PMObject* last = link;
PMObject* scene;
@@ -232,7 +232,7 @@ int PMObjectSelect::selectDeclare( PMObject* link, const TQString& declareType,
do
{
- scene = last->parent( );
+ scene = last->tqparent( );
if( scene )
{
if( scene->type( ) == "Scene" )
@@ -242,7 +242,7 @@ int PMObjectSelect::selectDeclare( PMObject* link, const TQString& declareType,
found = true;
}
else
- last = last->parent( );
+ last = last->tqparent( );
}
else
stop = true;
@@ -251,7 +251,7 @@ int PMObjectSelect::selectDeclare( PMObject* link, const TQString& declareType,
if( found )
{
- PMObjectSelect s( parent );
+ PMObjectSelect s( tqparent );
PMObject* o = scene->firstChild( );
PMDeclare* decl;
@@ -285,7 +285,7 @@ int PMObjectSelect::selectDeclare( PMObject* link, const TQString& declareType,
}
int PMObjectSelect::selectDeclare( PMObject* link, const TQStringList& declareTypes,
- PMObject* & obj, TQWidget* parent )
+ PMObject* & obj, TQWidget* tqparent )
{
PMObject* last = link;
PMObject* scene;
@@ -294,7 +294,7 @@ int PMObjectSelect::selectDeclare( PMObject* link, const TQStringList& declareTy
do
{
- scene = last->parent( );
+ scene = last->tqparent( );
if( scene )
{
if( scene->type( ) == "Scene" )
@@ -304,7 +304,7 @@ int PMObjectSelect::selectDeclare( PMObject* link, const TQStringList& declareTy
found = true;
}
else
- last = last->parent( );
+ last = last->tqparent( );
}
else
stop = true;
@@ -313,7 +313,7 @@ int PMObjectSelect::selectDeclare( PMObject* link, const TQStringList& declareTy
if( found )
{
- PMObjectSelect s( parent );
+ PMObjectSelect s( tqparent );
PMObject* o = scene->firstChild( );
PMDeclare* decl;
@@ -325,7 +325,7 @@ int PMObjectSelect::selectDeclare( PMObject* link, const TQStringList& declareTy
if( o->type( ) == "Declare" )
{
decl = ( PMDeclare* ) o;
- if( declareTypes.findIndex( decl->declareType( ) ) >= 0 )
+ if( declareTypes.tqfindIndex( decl->declareType( ) ) >= 0 )
s.m_pListBox->insertItem( new PMListBoxObject( o ) );
}
diff --git a/kpovmodeler/pmobjectselect.h b/kpovmodeler/pmobjectselect.h
index 46d39d21..c8604eb4 100644
--- a/kpovmodeler/pmobjectselect.h
+++ b/kpovmodeler/pmobjectselect.h
@@ -34,7 +34,7 @@
/**
* TQListBoxItem for @ref PMObject
*/
-class PMListBoxObject : public QListBoxPixmap
+class PMListBoxObject : public TQListBoxPixmap
{
public:
/**
@@ -84,11 +84,12 @@ private:
class PMObjectSelect : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
- * Creates a selection widget with parent and name
+ * Creates a selection widget with tqparent and name
*/
- PMObjectSelect( TQWidget* parent = 0, const char* name = 0,
+ PMObjectSelect( TQWidget* tqparent = 0, const char* name = 0,
bool modal = true );
/**
* Deletes the dialog
@@ -112,13 +113,13 @@ public:
* Only objects above the object link are listed.
*/
static int selectObject( PMObject* link, const TQString& t, PMObject* & obj,
- TQWidget* parent = 0 );
+ TQWidget* tqparent = 0 );
static int selectObject( PMObject* link, const TQStringList& t,
- PMObject* & obj, TQWidget* parent = 0 );
+ PMObject* & obj, TQWidget* tqparent = 0 );
static int selectDeclare( PMObject* link, const TQString& declareType,
- PMObject* & obj, TQWidget* parent = 0 );
+ PMObject* & obj, TQWidget* tqparent = 0 );
static int selectDeclare( PMObject* link, const TQStringList& dt,
- PMObject* & obj, TQWidget* parent = 0 );
+ PMObject* & obj, TQWidget* tqparent = 0 );
protected slots:
void slotHighlighted( TQListBoxItem* lbi );
diff --git a/kpovmodeler/pmobjectsettings.cpp b/kpovmodeler/pmobjectsettings.cpp
index 411b0a49..50cc1356 100644
--- a/kpovmodeler/pmobjectsettings.cpp
+++ b/kpovmodeler/pmobjectsettings.cpp
@@ -44,191 +44,191 @@
#include <klocale.h>
-PMObjectSettings::PMObjectSettings( TQWidget* parent, const char* name )
- : PMSettingsDialogPage( parent, name )
+PMObjectSettings::PMObjectSettings( TQWidget* tqparent, const char* name )
+ : PMSettingsDialogPage( tqparent, name )
{
- TQHBoxLayout* hlayout;
- TQVBoxLayout* vlayout;
+ TQHBoxLayout* htqlayout;
+ TQVBoxLayout* vtqlayout;
TQVBoxLayout* gvl;
TQGridLayout* grid;
TQGroupBox* gb;
- vlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
+ vtqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
gb = new TQGroupBox( i18n( "Subdivisions" ), this );
- vlayout->addWidget( gb );
+ vtqlayout->addWidget( gb );
gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) );
gvl->addSpacing( 10 );
grid = new TQGridLayout( gvl, 13, 3 );
grid->addWidget( new TQLabel( i18n( "Sphere:" ), gb ), 0, 0 );
- hlayout = new TQHBoxLayout( );
- grid->addLayout( hlayout, 0, 2 );
+ htqlayout = new TQHBoxLayout( );
+ grid->addLayout( htqlayout, 0, 2 );
grid->addWidget( new TQLabel( "u", gb ), 0, 1 );
m_pSphereUSteps = new PMIntEdit( gb );
- hlayout->addWidget( m_pSphereUSteps );
+ htqlayout->addWidget( m_pSphereUSteps );
m_pSphereUSteps->setValidation( true, 2, true, 32 );
- hlayout->addWidget( new TQLabel( "v", gb ) );
+ htqlayout->addWidget( new TQLabel( "v", gb ) );
m_pSphereVSteps = new PMIntEdit( gb );
- hlayout->addWidget( m_pSphereVSteps );
+ htqlayout->addWidget( m_pSphereVSteps );
m_pSphereVSteps->setValidation( true, 4, true, 64 );
- hlayout->addStretch( 1 );
+ htqlayout->addStretch( 1 );
grid->addWidget( new TQLabel( i18n( "Cylinder:" ), gb ), 1, 0 );
- hlayout = new TQHBoxLayout( );
- grid->addLayout( hlayout, 1, 2 );
+ htqlayout = new TQHBoxLayout( );
+ grid->addLayout( htqlayout, 1, 2 );
m_pCylinderSteps = new PMIntEdit( gb );
- hlayout->addWidget( m_pCylinderSteps );
+ htqlayout->addWidget( m_pCylinderSteps );
m_pCylinderSteps->setValidation( true, 4, true, 64 );
- hlayout->addStretch( 1 );
+ htqlayout->addStretch( 1 );
grid->addWidget( new TQLabel( i18n( "Cone:" ), gb ), 2, 0 );
- hlayout = new TQHBoxLayout( );
- grid->addLayout( hlayout, 2, 2 );
+ htqlayout = new TQHBoxLayout( );
+ grid->addLayout( htqlayout, 2, 2 );
m_pConeSteps = new PMIntEdit( gb );
- hlayout->addWidget( m_pConeSteps );
+ htqlayout->addWidget( m_pConeSteps );
m_pConeSteps->setValidation( true, 4, true, 64 );
- hlayout->addStretch( 1 );
+ htqlayout->addStretch( 1 );
grid->addWidget( new TQLabel( i18n( "Torus:" ), gb ), 3, 0 );
- hlayout = new TQHBoxLayout( );
- grid->addLayout( hlayout, 3, 2 );
+ htqlayout = new TQHBoxLayout( );
+ grid->addLayout( htqlayout, 3, 2 );
grid->addWidget( new TQLabel( "u", gb ), 3, 1 );
m_pTorusUSteps = new PMIntEdit( gb );
- hlayout->addWidget( m_pTorusUSteps );
+ htqlayout->addWidget( m_pTorusUSteps );
m_pTorusUSteps->setValidation( true, 2, true, 16 );
- hlayout->addWidget( new TQLabel( "v", gb ) );
+ htqlayout->addWidget( new TQLabel( "v", gb ) );
m_pTorusVSteps = new PMIntEdit( gb );
- hlayout->addWidget( m_pTorusVSteps );
+ htqlayout->addWidget( m_pTorusVSteps );
m_pTorusVSteps->setValidation( true, 4, true, 64 );
- hlayout->addStretch( 1 );
+ htqlayout->addStretch( 1 );
grid->addWidget( new TQLabel( i18n( "Disc:" ), gb ), 4, 0 );
- hlayout = new TQHBoxLayout( );
- grid->addLayout( hlayout, 4, 2 );
+ htqlayout = new TQHBoxLayout( );
+ grid->addLayout( htqlayout, 4, 2 );
m_pDiscSteps = new PMIntEdit( gb );
- hlayout->addWidget( m_pDiscSteps );
+ htqlayout->addWidget( m_pDiscSteps );
m_pDiscSteps->setValidation( true, 4, true, 64 );
- hlayout->addStretch( 1 );
+ htqlayout->addStretch( 1 );
grid->addWidget( new TQLabel( i18n( "Blob sphere:" ), gb ), 5, 0 );
- hlayout = new TQHBoxLayout( );
- grid->addLayout( hlayout, 5, 2 );
+ htqlayout = new TQHBoxLayout( );
+ grid->addLayout( htqlayout, 5, 2 );
grid->addWidget( new TQLabel( "u", gb ), 5, 1 );
m_pBlobSphereUSteps = new PMIntEdit( gb );
- hlayout->addWidget( m_pBlobSphereUSteps );
+ htqlayout->addWidget( m_pBlobSphereUSteps );
m_pBlobSphereUSteps->setValidation( true, 2, true, 32 );
- hlayout->addWidget( new TQLabel( "v", gb ) );
+ htqlayout->addWidget( new TQLabel( "v", gb ) );
m_pBlobSphereVSteps = new PMIntEdit( gb );
- hlayout->addWidget( m_pBlobSphereVSteps );
+ htqlayout->addWidget( m_pBlobSphereVSteps );
m_pBlobSphereVSteps->setValidation( true, 4, true, 64 );
- hlayout->addStretch( 1 );
+ htqlayout->addStretch( 1 );
grid->addWidget( new TQLabel( i18n( "Blob cylinder:" ), gb ), 6, 0 );
- hlayout = new TQHBoxLayout( );
- grid->addLayout( hlayout, 6, 2 );
+ htqlayout = new TQHBoxLayout( );
+ grid->addLayout( htqlayout, 6, 2 );
grid->addWidget( new TQLabel( "u", gb ), 6, 1 );
m_pBlobCylinderUSteps = new PMIntEdit( gb );
- hlayout->addWidget( m_pBlobCylinderUSteps );
+ htqlayout->addWidget( m_pBlobCylinderUSteps );
m_pBlobCylinderUSteps->setValidation( true, 2, true, 32 );
- hlayout->addWidget( new TQLabel( "v", gb ) );
+ htqlayout->addWidget( new TQLabel( "v", gb ) );
m_pBlobCylinderVSteps = new PMIntEdit( gb );
- hlayout->addWidget( m_pBlobCylinderVSteps );
+ htqlayout->addWidget( m_pBlobCylinderVSteps );
m_pBlobCylinderVSteps->setValidation( true, 4, true, 64 );
- hlayout->addStretch( 1 );
+ htqlayout->addStretch( 1 );
grid->addWidget( new TQLabel( i18n( "Lathe:" ), gb ), 7, 0 );
- hlayout = new TQHBoxLayout( );
- grid->addLayout( hlayout, 7, 2 );
+ htqlayout = new TQHBoxLayout( );
+ grid->addLayout( htqlayout, 7, 2 );
grid->addWidget( new TQLabel( "u", gb ), 7, 1 );
m_pLatheUSteps = new PMIntEdit( gb );
- hlayout->addWidget( m_pLatheUSteps );
+ htqlayout->addWidget( m_pLatheUSteps );
m_pLatheUSteps->setValidation( true, 1, true, 16 );
- hlayout->addWidget( new TQLabel( "v", gb ) );
+ htqlayout->addWidget( new TQLabel( "v", gb ) );
m_pLatheRSteps = new PMIntEdit( gb );
- hlayout->addWidget( m_pLatheRSteps );
+ htqlayout->addWidget( m_pLatheRSteps );
m_pLatheRSteps->setValidation( true, 4, true, 64 );
- hlayout->addStretch( 1 );
+ htqlayout->addStretch( 1 );
grid->addWidget( new TQLabel( i18n( "Surface of revolution:" ), gb ), 8, 0 );
- hlayout = new TQHBoxLayout( );
- grid->addLayout( hlayout, 8, 2 );
+ htqlayout = new TQHBoxLayout( );
+ grid->addLayout( htqlayout, 8, 2 );
grid->addWidget( new TQLabel( "u", gb ), 8, 1 );
m_pSorUSteps = new PMIntEdit( gb );
- hlayout->addWidget( m_pSorUSteps );
+ htqlayout->addWidget( m_pSorUSteps );
m_pSorUSteps->setValidation( true, 1, true, 16 );
- hlayout->addWidget( new TQLabel( "v", gb ) );
+ htqlayout->addWidget( new TQLabel( "v", gb ) );
m_pSorRSteps = new PMIntEdit( gb );
- hlayout->addWidget( m_pSorRSteps );
+ htqlayout->addWidget( m_pSorRSteps );
m_pSorRSteps->setValidation( true, 4, true, 64 );
- hlayout->addStretch( 1 );
+ htqlayout->addStretch( 1 );
grid->addWidget( new TQLabel( i18n( "Prism:" ), gb ), 9, 0 );
- hlayout = new TQHBoxLayout( );
- grid->addLayout( hlayout, 9, 2 );
+ htqlayout = new TQHBoxLayout( );
+ grid->addLayout( htqlayout, 9, 2 );
m_pPrismSteps = new PMIntEdit( gb );
- hlayout->addWidget( m_pPrismSteps );
+ htqlayout->addWidget( m_pPrismSteps );
m_pPrismSteps->setValidation( true, 1, true, 16 );
- hlayout->addStretch( 1 );
+ htqlayout->addStretch( 1 );
grid->addWidget( new TQLabel( i18n( "Superquadric ellipsoid:" ), gb ), 10, 0 );
- hlayout = new TQHBoxLayout( );
- grid->addLayout( hlayout, 10, 2 );
+ htqlayout = new TQHBoxLayout( );
+ grid->addLayout( htqlayout, 10, 2 );
grid->addWidget( new TQLabel( "u", gb ), 10, 1 );
m_pSqeUSteps = new PMIntEdit( gb );
- hlayout->addWidget( m_pSqeUSteps );
+ htqlayout->addWidget( m_pSqeUSteps );
m_pSqeUSteps->setValidation( true, 2, true, 8 );
- hlayout->addWidget( new TQLabel( "v", gb ) );
+ htqlayout->addWidget( new TQLabel( "v", gb ) );
m_pSqeVSteps = new PMIntEdit( gb );
- hlayout->addWidget( m_pSqeVSteps );
+ htqlayout->addWidget( m_pSqeVSteps );
m_pSqeVSteps->setValidation( true, 2, true, 8 );
- hlayout->addStretch( 1 );
+ htqlayout->addStretch( 1 );
grid->addWidget( new TQLabel( i18n( "Sphere sweep:" ), gb ), 11, 0 );
- hlayout = new TQHBoxLayout( );
- grid->addLayout( hlayout, 11, 2 );
+ htqlayout = new TQHBoxLayout( );
+ grid->addLayout( htqlayout, 11, 2 );
grid->addWidget( new TQLabel( "r", gb ), 11, 1 );
m_pSphereSweepRSteps = new PMIntEdit( gb );
- hlayout->addWidget( m_pSphereSweepRSteps );
+ htqlayout->addWidget( m_pSphereSweepRSteps );
m_pSphereSweepRSteps->setValidation( true, 4, true, 64 );
- hlayout->addWidget( new TQLabel( "s", gb ) );
+ htqlayout->addWidget( new TQLabel( "s", gb ) );
m_pSphereSweepSSteps = new PMIntEdit( gb );
- hlayout->addWidget( m_pSphereSweepSSteps );
+ htqlayout->addWidget( m_pSphereSweepSSteps );
m_pSphereSweepSSteps->setValidation( true, 1, true, 16 );
- hlayout->addStretch( 1 );
+ htqlayout->addStretch( 1 );
grid->addWidget( new TQLabel( i18n( "Heightfield:" ), gb ), 12, 0 );
- hlayout = new TQHBoxLayout( );
- grid->addLayout( hlayout, 12, 2 );
+ htqlayout = new TQHBoxLayout( );
+ grid->addLayout( htqlayout, 12, 2 );
m_pHeightFieldVariance = new PMIntEdit( gb );
- hlayout->addWidget( m_pHeightFieldVariance );
+ htqlayout->addWidget( m_pHeightFieldVariance );
m_pHeightFieldVariance->setValidation( true, 1, true, 16 );
- hlayout->addStretch( 1 );
+ htqlayout->addStretch( 1 );
gb = new TQGroupBox( i18n( "Sizes" ), this );
- vlayout->addWidget( gb );
+ vtqlayout->addWidget( gb );
gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) );
gvl->addSpacing( 10 );
grid = new TQGridLayout( gvl, 1, 2 );
grid->addWidget( new TQLabel( i18n( "Plane:" ), gb ), 0, 0 );
- hlayout = new TQHBoxLayout( );
- grid->addLayout( hlayout, 0, 1 );
+ htqlayout = new TQHBoxLayout( );
+ grid->addLayout( htqlayout, 0, 1 );
m_pPlaneSize = new PMFloatEdit( gb );
- hlayout->addWidget( m_pPlaneSize );
+ htqlayout->addWidget( m_pPlaneSize );
m_pPlaneSize->setValidation( true, 0.1, false, 0.0 );
- hlayout->addStretch( 1 );
+ htqlayout->addStretch( 1 );
gb = new TQGroupBox( i18n( "Camera Views" ), this );
- vlayout->addWidget( gb );
+ vtqlayout->addWidget( gb );
gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) );
gvl->addSpacing( 10 );
m_pHighDetailCameraViews = new TQCheckBox( i18n( "High detail for enhanced projections" ), gb );
gvl->addWidget( m_pHighDetailCameraViews );
- vlayout->addStretch( 1 );
+ vtqlayout->addStretch( 1 );
}
void PMObjectSettings::displaySettings( )
@@ -425,126 +425,126 @@ bool PMObjectSettings::validateData( )
void PMObjectSettings::applySettings( )
{
- bool repaint = false;
+ bool tqrepaint = false;
PMRenderManager* rm = PMRenderManager::theManager( );
if( rm->highDetailCameraViews( ) != m_pHighDetailCameraViews->isChecked( ) )
{
rm->setHighDetailCameraViews( m_pHighDetailCameraViews->isChecked( ) );
- repaint = true;
+ tqrepaint = true;
}
if( PMSphere::uSteps( ) != m_pSphereUSteps->value( ) )
{
PMSphere::setUSteps( m_pSphereUSteps->value( ) );
- repaint = true;
+ tqrepaint = true;
}
if( PMSphere::vSteps( ) != m_pSphereVSteps->value( ) )
{
PMSphere::setVSteps( m_pSphereVSteps->value( ) );
- repaint = true;
+ tqrepaint = true;
}
if( PMCylinder::steps( ) != m_pCylinderSteps->value( ) )
{
PMCylinder::setSteps( m_pCylinderSteps->value( ) );
- repaint = true;
+ tqrepaint = true;
}
if( PMCone::steps( ) != m_pConeSteps->value( ) )
{
PMCone::setSteps( m_pConeSteps->value( ) );
- repaint = true;
+ tqrepaint = true;
}
if( PMTorus::uSteps( ) != m_pTorusUSteps->value( ) )
{
PMTorus::setUSteps( m_pTorusUSteps->value( ) );
- repaint = true;
+ tqrepaint = true;
}
if( PMTorus::vSteps( ) != m_pTorusVSteps->value( ) )
{
PMTorus::setVSteps( m_pTorusVSteps->value( ) );
- repaint = true;
+ tqrepaint = true;
}
if( PMDisc::steps( ) != m_pDiscSteps->value( ) )
{
PMDisc::setSteps( m_pDiscSteps->value( ) );
- repaint = true;
+ tqrepaint = true;
}
if( PMBlobSphere::uSteps( ) != m_pBlobSphereUSteps->value( ) )
{
PMBlobSphere::setUSteps( m_pBlobSphereUSteps->value( ) );
- repaint = true;
+ tqrepaint = true;
}
if( PMBlobSphere::vSteps( ) != m_pBlobSphereVSteps->value( ) )
{
PMBlobSphere::setVSteps( m_pBlobSphereVSteps->value( ) );
- repaint = true;
+ tqrepaint = true;
}
if( PMBlobCylinder::uSteps( ) != m_pBlobCylinderUSteps->value( ) )
{
PMBlobCylinder::setUSteps( m_pBlobCylinderUSteps->value( ) );
- repaint = true;
+ tqrepaint = true;
}
if( PMBlobCylinder::vSteps( ) != m_pBlobCylinderVSteps->value( ) )
{
PMBlobCylinder::setVSteps( m_pBlobCylinderVSteps->value( ) );
- repaint = true;
+ tqrepaint = true;
}
if( PMPlane::planeSize( ) != m_pPlaneSize->value( ) )
{
PMPlane::setPlaneSize( m_pPlaneSize->value( ) );
- repaint = true;
+ tqrepaint = true;
}
if( PMLathe::sSteps( ) != m_pLatheUSteps->value( ) )
{
PMLathe::setSSteps( m_pLatheUSteps->value( ) );
- repaint = true;
+ tqrepaint = true;
}
if( PMLathe::rSteps( ) != m_pLatheRSteps->value( ) )
{
PMLathe::setRSteps( m_pLatheRSteps->value( ) );
- repaint = true;
+ tqrepaint = true;
}
if( PMSurfaceOfRevolution::sSteps( ) != m_pSorUSteps->value( ) )
{
PMSurfaceOfRevolution::setSSteps( m_pSorUSteps->value( ) );
- repaint = true;
+ tqrepaint = true;
}
if( PMSurfaceOfRevolution::rSteps( ) != m_pSorRSteps->value( ) )
{
PMSurfaceOfRevolution::setRSteps( m_pSorRSteps->value( ) );
- repaint = true;
+ tqrepaint = true;
}
if( PMPrism::sSteps( ) != m_pPrismSteps->value( ) )
{
PMPrism::setSSteps( m_pPrismSteps->value( ) );
- repaint = true;
+ tqrepaint = true;
}
if( PMSuperquadricEllipsoid::uSteps( ) != m_pSqeUSteps->value( ) )
{
PMSuperquadricEllipsoid::setUSteps( m_pSqeUSteps->value( ) );
- repaint = true;
+ tqrepaint = true;
}
if( PMSuperquadricEllipsoid::vSteps( ) != m_pSqeVSteps->value( ) )
{
PMSuperquadricEllipsoid::setVSteps( m_pSqeVSteps->value( ) );
- repaint = true;
+ tqrepaint = true;
}
if( PMSphereSweep::rSteps( ) != m_pSphereSweepRSteps->value( ) )
{
PMSphereSweep::setRSteps( m_pSphereSweepRSteps->value( ) );
- repaint = true;
+ tqrepaint = true;
}
if( PMSphereSweep::sSteps( ) != m_pSphereSweepSSteps->value( ) )
{
PMSphereSweep::setSSteps( m_pSphereSweepSSteps->value( ) );
- repaint = true;
+ tqrepaint = true;
}
if( PMHeightField::variance( ) != m_pHeightFieldVariance->value( ) )
{
PMHeightField::setVariance( m_pHeightFieldVariance->value( ) );
- repaint = true;
+ tqrepaint = true;
}
- if( repaint )
- emit repaintViews( );
+ if( tqrepaint )
+ emit tqrepaintViews( );
}
#include "pmobjectsettings.moc"
diff --git a/kpovmodeler/pmobjectsettings.h b/kpovmodeler/pmobjectsettings.h
index 426ee47d..216b2c2f 100644
--- a/kpovmodeler/pmobjectsettings.h
+++ b/kpovmodeler/pmobjectsettings.h
@@ -34,11 +34,12 @@ class TQCheckBox;
class PMObjectSettings : public PMSettingsDialogPage
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Default constructor
*/
- PMObjectSettings( TQWidget* parent, const char* name = 0 );
+ PMObjectSettings( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displaySettings( );
/** */
diff --git a/kpovmodeler/pmopenglsettings.cpp b/kpovmodeler/pmopenglsettings.cpp
index 9c125c32..0b76abdc 100644
--- a/kpovmodeler/pmopenglsettings.cpp
+++ b/kpovmodeler/pmopenglsettings.cpp
@@ -25,15 +25,15 @@
#include <tqlabel.h>
#include <klocale.h>
-PMOpenGLSettings::PMOpenGLSettings( TQWidget* parent, const char* name )
- : PMSettingsDialogPage( parent, name )
+PMOpenGLSettings::PMOpenGLSettings( TQWidget* tqparent, const char* name )
+ : PMSettingsDialogPage( tqparent, name )
{
- TQVBoxLayout* vlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
+ TQVBoxLayout* vtqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
m_pDirect = new TQCheckBox( i18n( "Direct rendering" ), this );
- vlayout->addWidget( new TQLabel( i18n( "Changes take only effect after a restart!" ), this ) );
- vlayout->addWidget( m_pDirect );
- vlayout->addStretch( 1 );
+ vtqlayout->addWidget( new TQLabel( i18n( "Changes take only effect after a restart!" ), this ) );
+ vtqlayout->addWidget( m_pDirect );
+ vtqlayout->addStretch( 1 );
}
void PMOpenGLSettings::displaySettings( )
diff --git a/kpovmodeler/pmopenglsettings.h b/kpovmodeler/pmopenglsettings.h
index 424265f7..265cc056 100644
--- a/kpovmodeler/pmopenglsettings.h
+++ b/kpovmodeler/pmopenglsettings.h
@@ -32,11 +32,12 @@ class TQCheckBox;
class PMOpenGLSettings : public PMSettingsDialogPage
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Default constructor
*/
- PMOpenGLSettings( TQWidget* parent, const char* name = 0 );
+ PMOpenGLSettings( TQWidget* tqparent, const char* name = 0 );
/** */
virtual void displaySettings( );
/** */
diff --git a/kpovmodeler/pmoutputdevice.cpp b/kpovmodeler/pmoutputdevice.cpp
index abad0e36..1ee91b52 100644
--- a/kpovmodeler/pmoutputdevice.cpp
+++ b/kpovmodeler/pmoutputdevice.cpp
@@ -55,22 +55,22 @@ void PMOutputDevice::callSerialization( const PMObject* o, const PMMetaObject* m
info->call( o, mo, this );
else
{
- if( mo == o->metaObject( ) )
+ if( mo == o->tqmetaObject( ) )
{
printError( i18n( "The object \"%1\" doesn't support %2." )
- .arg( o->description( ) ).arg( description( ) ) );
+ .tqarg( o->description( ) ).tqarg( description( ) ) );
}
else
{
printError( i18n( "The class \"%1\" doesn't support %2." )
- .arg( o->description( ) ).arg( mo->className( ) ) );
+ .tqarg( o->description( ) ).tqarg( mo->className( ) ) );
}
}
}
void PMOutputDevice::serialize( PMObject* o )
{
- callSerialization( o, o->metaObject( ) );
+ callSerialization( o, o->tqmetaObject( ) );
}
void PMOutputDevice::close( )
diff --git a/kpovmodeler/pmpalettevalueedit.cpp b/kpovmodeler/pmpalettevalueedit.cpp
index ca029887..b81caa78 100644
--- a/kpovmodeler/pmpalettevalueedit.cpp
+++ b/kpovmodeler/pmpalettevalueedit.cpp
@@ -35,25 +35,25 @@
#include <kdialog.h>
#include <kfiledialog.h>
-PMPaletteValueEdit::PMPaletteValueEdit( TQWidget* parent, const char* name )
- : TQWidget( parent, name )
+PMPaletteValueEdit::PMPaletteValueEdit( TQWidget* tqparent, const char* name )
+ : TQWidget( tqparent, name )
{
TQLabel* lbl;
- TQHBoxLayout* layout;
+ TQHBoxLayout* tqlayout;
m_pIndexEdit = new PMIntEdit( this );
m_pValueEdit = new PMFloatEdit( this );
- layout = new TQHBoxLayout( this );
+ tqlayout = new TQHBoxLayout( this );
lbl = new TQLabel( i18n( "Index" ), this );
- layout->addWidget( lbl );
- layout->addSpacing( KDialog::spacingHint( ) );
- layout->addWidget( m_pIndexEdit );
- layout->addSpacing( KDialog::spacingHint( ) );
+ tqlayout->addWidget( lbl );
+ tqlayout->addSpacing( KDialog::spacingHint( ) );
+ tqlayout->addWidget( m_pIndexEdit );
+ tqlayout->addSpacing( KDialog::spacingHint( ) );
lbl = new TQLabel( i18n( "Value" ), this );
- layout->addWidget( lbl );
- layout->addSpacing( KDialog::spacingHint( ) );
- layout->addWidget( m_pValueEdit );
+ tqlayout->addWidget( lbl );
+ tqlayout->addSpacing( KDialog::spacingHint( ) );
+ tqlayout->addWidget( m_pValueEdit );
connect( m_pIndexEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
connect( m_pValueEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
diff --git a/kpovmodeler/pmpalettevalueedit.h b/kpovmodeler/pmpalettevalueedit.h
index c2375de5..86e7cc0c 100644
--- a/kpovmodeler/pmpalettevalueedit.h
+++ b/kpovmodeler/pmpalettevalueedit.h
@@ -32,12 +32,13 @@ class PMIntEdit;
/**
* Dialog edit class for @ref PMPaletteValue.
*/
-class PMPaletteValueEdit: public QWidget
+class PMPaletteValueEdit: public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
/** */
- PMPaletteValueEdit( TQWidget* parent, const char* name = 0 );
+ PMPaletteValueEdit( TQWidget* tqparent, const char* name = 0 );
/** */
void setIndex( int idx );
/** */
diff --git a/kpovmodeler/pmpalettevaluememento.cpp b/kpovmodeler/pmpalettevaluememento.cpp
index f683068c..e3417b39 100644
--- a/kpovmodeler/pmpalettevaluememento.cpp
+++ b/kpovmodeler/pmpalettevaluememento.cpp
@@ -33,7 +33,7 @@ void PMPaletteValueMemento::setFilterPaletteValues( const TQValueList<PMPaletteV
{
if( !m_bFilterPaletteValuesSaved )
{
- // Direct assignment does not work with Qt 2.3.x
+ // Direct assignment does not work with TQt 2.3.x
// The list will be changed later in a graphical
// change because TQValueList::detach( ) is called
// too late!
@@ -60,7 +60,7 @@ void PMPaletteValueMemento::setTransmitPaletteValues( const TQValueList<PMPalett
{
if( !m_bTransmitPaletteValuesSaved )
{
- // Direct assignment does not work with Qt 2.3.x
+ // Direct assignment does not work with TQt 2.3.x
// The list will be changed later in a graphical
// change because TQValueList::detach( ) is called
// too late!
diff --git a/kpovmodeler/pmparser.cpp b/kpovmodeler/pmparser.cpp
index dfe37a6d..2c027314 100644
--- a/kpovmodeler/pmparser.cpp
+++ b/kpovmodeler/pmparser.cpp
@@ -48,7 +48,7 @@ PMParser::PMParser( PMPart* part, const TQByteArray& array )
m_pPart = part;
TQBuffer* buffer = new TQBuffer( array );
buffer->open( IO_ReadOnly );
- m_pDevice = buffer;
+ m_pDevice = TQT_TQIODEVICE(buffer);
m_bDeviceCreated = true;
init( );
@@ -107,7 +107,7 @@ void PMParser::printMessage( const PMPMessage messageNum )
void PMParser::printMessage( const TQString& type, const TQString& msg )
{
if( m_lineNum >= 0 )
- m_messages += PMMessage( i18n( "Line %1: " ).arg( m_lineNum ) + type + ": " + msg );
+ m_messages += PMMessage( i18n( "Line %1: " ).tqarg( m_lineNum ) + type + ": " + msg );
else
m_messages += PMMessage( type + ": " + msg );
}
@@ -122,7 +122,7 @@ void PMParser::printError( const TQString& msg )
else if( m_errors == s_maxErrors )
{
m_messages += PMMessage( i18n( "Maximum of %1 errors reached." )
- .arg( s_maxErrors ) );
+ .tqarg( s_maxErrors ) );
m_errors++;
}
}
@@ -137,7 +137,7 @@ void PMParser::printWarning( const TQString& msg )
else if( m_warnings == s_maxWarnings )
{
m_messages += PMMessage( i18n( "Maximum of %1 warnings reached." )
- .arg( s_maxWarnings ) );
+ .tqarg( s_maxWarnings ) );
m_warnings++;
}
}
@@ -145,18 +145,18 @@ void PMParser::printWarning( const TQString& msg )
void PMParser::printExpected( const char c, const char* sValue )
{
printError( i18n( "'%1' expected, found token '%2' instead." )
- .arg( c ).arg( sValue ) );
+ .tqarg( c ).tqarg( sValue ) );
}
void PMParser::printExpected( const TQString& str, const char* sValue )
{
printError( i18n( "'%1' expected, found token '%2' instead." )
- .arg( str ).arg( sValue ) );
+ .tqarg( str ).tqarg( sValue ) );
}
void PMParser::printUnexpected( const TQString& str )
{
- printError( i18n( "Unexpected token '%1'." ).arg( str ) );
+ printError( i18n( "Unexpected token '%1'." ).tqarg( str ) );
}
void PMParser::printInfo( const TQString& msg )
@@ -177,18 +177,18 @@ int PMParser::errorFlags( ) const
}
-void PMParser::parse( PMObjectList* list, PMObject* parent,
+void PMParser::parse( PMObjectList* list, PMObject* tqparent,
PMObject* after )
{
m_pResultList = list;
- m_pTopParent = parent;
+ m_pTopParent = tqparent;
m_pAfter = after;
// find first item, that can be a declare and can be used as link
// for parsed objects.
- if( parent )
+ if( tqparent )
{
- if( parent->type( ) == "Scene" )
+ if( tqparent->type( ) == "Scene" )
{
if( after )
m_pNextCheckDeclare = after;
@@ -197,19 +197,19 @@ void PMParser::parse( PMObjectList* list, PMObject* parent,
}
else
{
- PMObject* obj = parent;
+ PMObject* obj = tqparent;
bool stop = false;
- // go to parents, until the parent is the scene
+ // go to tqparents, until the tqparent is the scene
// (declares can only be inserted as top level objects)
do
{
- if( obj->parent( ) )
+ if( obj->tqparent( ) )
{
- if( obj->parent( )->type( ) == "Scene" )
+ if( obj->tqparent( )->type( ) == "Scene" )
stop = true;
else
- obj = obj->parent( );
+ obj = obj->tqparent( );
}
else
{
@@ -219,7 +219,7 @@ void PMParser::parse( PMObjectList* list, PMObject* parent,
}
while( obj && !stop );
- // now obj is the top level parent of the object, where parsed objects
+ // now obj is the top level tqparent of the object, where parsed objects
// will be inserted
if( obj )
m_pNextCheckDeclare = obj->prevSibling( );
@@ -240,22 +240,22 @@ void PMParser::parse( PMObjectList* list, PMObject* parent,
setFatalError( );
}
-bool PMParser::insertChild( PMObject* child, PMObject* parent )
+bool PMParser::insertChild( PMObject* child, PMObject* tqparent )
{
bool inserted = false;
- if( parent )
+ if( tqparent )
{
- if( parent->canInsert( child, parent->lastChild( ) ) )
+ if( tqparent->canInsert( child, tqparent->lastChild( ) ) )
{
- parent->appendChild( child );
+ tqparent->appendChild( child );
inserted = true;
}
else
{
printError( i18n( "Can't insert %1 into %2." )
- .arg( child->description( ) )
- .arg( parent->description( ) ) );
+ .tqarg( child->description( ) )
+ .tqarg( tqparent->description( ) ) );
}
}
else
@@ -270,8 +270,8 @@ bool PMParser::insertChild( PMObject* child, PMObject* parent )
else
{
printError( i18n( "Can't insert %1 into %2." )
- .arg( child->description( ) )
- .arg( m_pTopParent->description( ) ) );
+ .tqarg( child->description( ) )
+ .tqarg( m_pTopParent->description( ) ) );
}
}
else
@@ -304,9 +304,9 @@ bool PMParser::insertChild( PMObject* child, PMObject* parent )
void PMParser::checkID( PMDeclare* decl )
{
PMSymbolTable* st = m_pPart->symbolTable( );
- PMSymbol* s = m_pLocalST.find( decl->id( ) );
+ PMSymbol* s = m_pLocalST.tqfind( decl->id( ) );
if( !s )
- s = st->find( decl->id( ) );
+ s = st->tqfind( decl->id( ) );
if( s )
{
@@ -336,7 +336,7 @@ void PMParser::checkID( PMDeclare* decl )
void PMParser::checkID( const TQString& id, const PMValue& v )
{
PMSymbolTable* st = m_pPart->symbolTable( );
- PMSymbol* s = m_pLocalST.find( id );
+ PMSymbol* s = m_pLocalST.tqfind( id );
if( s )
{
@@ -374,19 +374,19 @@ PMDeclare* PMParser::checkLink( const TQString& id )
bool ok = false;
// is object declared?
- PMSymbol* s = m_pLocalST.find( id );
+ PMSymbol* s = m_pLocalST.tqfind( id );
if( !s )
- s = t->find( id );
+ s = t->tqfind( id );
if( !s )
- printError( i18n( "Undefined object \"%1\"." ).arg( id ) );
+ printError( i18n( "Undefined object \"%1\"." ).tqarg( id ) );
else if( s->type( ) != PMSymbol::Object )
- printError( i18n( "Undefined object \"%1\"." ).arg( id ) );
+ printError( i18n( "Undefined object \"%1\"." ).tqarg( id ) );
else
{
// the object is declared
// is the id already in m_okDeclares
- bool* lok = m_okDeclares.find( id );
+ bool* lok = m_okDeclares.tqfind( id );
if( lok )
ok = true;
else
@@ -409,7 +409,7 @@ PMDeclare* PMParser::checkLink( const TQString& id )
if( !ok )
printError( i18n( "Object \"%1\" is undefined at that point." )
- .arg( id ) );
+ .tqarg( id ) );
}
if( ok )
@@ -425,9 +425,9 @@ PMDeclare* PMParser::checkLink( const TQString& id )
PMSymbol* PMParser::getSymbol( const TQString& id ) const
{
- PMSymbol* s = m_pLocalST.find( id );
+ PMSymbol* s = m_pLocalST.tqfind( id );
if( !s )
- s = m_pPart->symbolTable( )->find( id );
+ s = m_pPart->symbolTable( )->tqfind( id );
return s;
}
diff --git a/kpovmodeler/pmparser.h b/kpovmodeler/pmparser.h
index e72cbd60..3c48bb49 100644
--- a/kpovmodeler/pmparser.h
+++ b/kpovmodeler/pmparser.h
@@ -81,13 +81,13 @@ public:
*
* Appends all parsed objects to the list.
*
- * parent is the object where the parsed objects will be inserted as
- * children behind the object after. These parameters are used to check
+ * tqparent is the object where the parsed objects will be inserted as
+ * tqchildren behind the object after. These parameters are used to check
* the consistency of declares and links.
*
- * Set parent and after to 0 if and only if a document is parsed/opened.
+ * Set tqparent and after to 0 if and only if a document is parsed/opened.
*/
- void parse( PMObjectList* list, PMObject* parent,
+ void parse( PMObjectList* list, PMObject* tqparent,
PMObject* after );
/**
@@ -196,12 +196,12 @@ public:
*/
PMSymbol* getSymbol( const TQString& id ) const;
/**
- * Tries to insert obj as child of parent. If parent is 0, the object
+ * Tries to insert obj as child of tqparent. If tqparent is 0, the object
* will be inserted in the list of top level objects.
*
* Returns true if the object could be inserted.
*/
- bool insertChild( PMObject* obj, PMObject* parent );
+ bool insertChild( PMObject* obj, PMObject* tqparent );
protected:
/**
@@ -217,8 +217,8 @@ protected:
*/
PMPart* m_pPart;
/**
- * parent object where the parsed top level objects
- * will be inserted _later_ (not from the parser) as children
+ * tqparent object where the parsed top level objects
+ * will be inserted _later_ (not from the parser) as tqchildren
*/
const PMObject* m_pTopParent;
const PMObject* m_pAfter;
@@ -227,7 +227,7 @@ protected:
*/
PMObjectList* m_pResultList;
/**
- * The QIODevice
+ * The TQIODevice
*/
TQIODevice* m_pDevice;
/**
diff --git a/kpovmodeler/pmpart.cpp b/kpovmodeler/pmpart.cpp
index fe0f58b4..db94f33e 100644
--- a/kpovmodeler/pmpart.cpp
+++ b/kpovmodeler/pmpart.cpp
@@ -99,11 +99,11 @@ TQTime PMDebugTime;
//#define KPM_WITH_OBJECT_LIBRARY
-PMPart::PMPart( TQWidget* parentWidget, const char* widgetName,
- TQObject* parent, const char* name, bool readwrite,
+PMPart::PMPart( TQWidget* tqparentWidget, const char* widgetName,
+ TQObject* tqparent, const char* name, bool readwrite,
PMShell* shell )
: DCOPObject( "PMPartIface" ),
- KParts::ReadWritePart( parent, name ),
+ KParts::ReadWritePart( tqparent, name ),
m_commandManager( this )
{
setPluginLoadingMode( LoadPlugins );
@@ -141,11 +141,11 @@ PMPart::PMPart( TQWidget* parentWidget, const char* widgetName,
initActions( );
initDocument( );
- initView( parentWidget, widgetName );
+ initView( tqparentWidget, widgetName );
restoreConfig( instance( )->config( ) );
- connect( qApp->clipboard( ), TQT_SIGNAL( dataChanged( ) ),
+ connect( tqApp->tqclipboard( ), TQT_SIGNAL( dataChanged( ) ),
TQT_SLOT( slotClipboardDataChanged( ) ) );
slotClipboardDataChanged( );
connect( &m_commandManager, TQT_SIGNAL( updateUndoRedo( const TQString&, const TQString& ) ),
@@ -161,11 +161,11 @@ PMPart::PMPart( TQWidget* parentWidget, const char* widgetName,
slotObjectChanged( m_pScene, PMCNewSelection, this );
}
-PMPart::PMPart( TQWidget* /*parentWidget*/, const char* /*widgetName*/,
- TQObject* parent, const char* name, bool readwrite,
+PMPart::PMPart( TQWidget* /*tqparentWidget*/, const char* /*widgetName*/,
+ TQObject* tqparent, const char* name, bool readwrite,
bool /*onlyCutPaste*/, PMShell* shell )
: DCOPObject( "LibraryBrowserIface" ),
- KParts::ReadWritePart( parent, name ),
+ KParts::ReadWritePart( tqparent, name ),
m_commandManager( this )
{
setPluginLoadingMode( LoadPlugins );
@@ -227,7 +227,7 @@ void PMPart::initCopyPasteActions( )
m_pPasteAction = KStdAction::paste( this, TQT_SLOT( slotEditPaste( ) ), actionCollection( ) );
m_pDeleteAction =
- new KAction( i18n( "Delete" ), "edittrash", Qt::Key_Delete,
+ new KAction( i18n( "Delete" ), "edittrash", TQt::Key_Delete,
this, TQT_SLOT( slotEditDelete( ) ),
actionCollection( ), "edit_delete" );
@@ -662,8 +662,8 @@ void PMPart::updateNewObjectActions( )
bool readWriteParent = false;
if( m_pActiveObject )
- if( m_pActiveObject->parent( ) )
- if( !m_pActiveObject->parent( )->isReadOnly( ) )
+ if( m_pActiveObject->tqparent( ) )
+ if( !m_pActiveObject->tqparent( )->isReadOnly( ) )
readWriteParent = true;
for( ; it.current( ); ++it )
@@ -685,7 +685,7 @@ void PMPart::updateNewObjectActions( )
enable = m_pActiveObject->canInsert( insertName, m_pActiveObject->lastChild( ) );
if( !enable )
if( readWriteParent )
- enable |= m_pActiveObject->parent( )->canInsert( insertName, m_pActiveObject );
+ enable |= m_pActiveObject->tqparent( )->canInsert( insertName, m_pActiveObject );
}
else
enable = false;
@@ -701,7 +701,7 @@ void PMPart::updateNewObjectActions( )
enable = m_pActiveObject->canInsert( TQString( "CSG" ), m_pActiveObject->lastChild( ) );
if( !enable )
if( readWriteParent )
- enable = m_pActiveObject->parent( )->canInsert( TQString( "CSG" ), m_pActiveObject );
+ enable = m_pActiveObject->tqparent( )->canInsert( TQString( "CSG" ), m_pActiveObject );
}
else
enable = false;
@@ -725,13 +725,13 @@ void PMPart::initDocument( )
newDocument( );
}
-void PMPart::initView( TQWidget* parent, const char* name )
+void PMPart::initView( TQWidget* tqparent, const char* name )
{
if( !m_pShell )
{
// a part inside konqueror
- // simple layout
- m_pView = new PMView( this, parent, name );
+ // simple tqlayout
+ m_pView = new PMView( this, tqparent, name );
m_pView->show( );
setWidget( m_pView );
}
@@ -951,7 +951,7 @@ bool PMPart::exportPovray( const KURL& url )
if( ok )
{
PMPovray35Format format;
- PMSerializer* dev = format.newSerializer( file );
+ PMSerializer* dev = format.newSerializer( TQT_TQIODEVICE(file) );
dev->serialize( m_pScene );
delete dev;
@@ -995,7 +995,7 @@ TQString PMPart::activeObjectName( )
result = tmpObj->type( ) + "/" + result;
// go up in the scene
- tmpObj = tmpObj->parent( );
+ tmpObj = tmpObj->tqparent( );
idx = 0;
}
@@ -1023,7 +1023,7 @@ bool PMPart::setActiveObject( const TQString& name )
tmpObj = activeObject( );
// get the first element
- pos = objPath.find( '/' );
+ pos = objPath.tqfind( '/' );
if( pos != -1 )
{
pathElem = objPath.mid( 0, pos );
@@ -1032,7 +1032,7 @@ bool PMPart::setActiveObject( const TQString& name )
else
{
pathElem = objPath;
- objPath = TQString::null;
+ objPath = TQString();
}
while( !pathElem.isNull( ) )
@@ -1040,17 +1040,17 @@ bool PMPart::setActiveObject( const TQString& name )
if( !pathElem.isEmpty( ) )
{
// Special treatment for brackets
- firstBracket = pathElem.find( '[' );
+ firstBracket = pathElem.tqfind( '[' );
if( firstBracket != -1 )
{
- lastBracket = pathElem.findRev( ']' );
+ lastBracket = pathElem.tqfindRev( ']' );
objIndex = pathElem.mid( firstBracket + 1, lastBracket - firstBracket - 1).toInt( );
pathElem = pathElem.left( firstBracket );
}
else
objIndex = 0;
- // Iterate the children for this element. We stop when there are no more siblings
+ // Iterate the tqchildren for this element. We stop when there are no more siblings
// or the object is of the correct type and it's index count is also correct
siblingIndex = 0;
tmpSibling = tmpObj->firstChild( );
@@ -1070,7 +1070,7 @@ bool PMPart::setActiveObject( const TQString& name )
}
// Get the next element
- pos = objPath.find( '/' );
+ pos = objPath.tqfind( '/' );
if( pos != -1 )
{
pathElem = objPath.mid( 0, pos );
@@ -1079,7 +1079,7 @@ bool PMPart::setActiveObject( const TQString& name )
else
{
pathElem = objPath;
- objPath = TQString::null;
+ objPath = TQString();
}
}
if( tmpObj )
@@ -1240,9 +1240,9 @@ int PMPart::whereToInsert( PMObject* obj, const PMObjectList& list )
}
}
- if( obj->parent( ) )
+ if( obj->tqparent( ) )
{
- PMObject* p = obj->parent( );
+ PMObject* p = obj->tqparent( );
if( !p->isReadOnly( ) )
{
canInsertAsSibling = p->canInsert( list, obj );
@@ -1301,9 +1301,9 @@ int PMPart::whereToInsert( PMObject* obj, const TQStringList& list )
}
}
- if( obj->parent( ) )
+ if( obj->tqparent( ) )
{
- PMObject* p = obj->parent( );
+ PMObject* p = obj->tqparent( );
if( !p->isReadOnly( ) )
{
canInsertAsSibling = p->canInsert( list, obj );
@@ -1336,7 +1336,7 @@ int PMPart::whereToInsert( PMObject* obj )
int insertAs = 0;
int insertPossibilities = 0;
- if( obj->parent( ) )
+ if( obj->tqparent( ) )
{
insertAs |= PMInsertPopup::PMISibling;
insertPossibilities++;
@@ -1369,14 +1369,14 @@ void PMPart::slotFileImport( )
TQFile file( fileName );
if( file.open( IO_ReadOnly ) )
{
- PMParser* newParser = selectedFormat->newParser( this, &file );
+ PMParser* newParser = selectedFormat->newParser( this, TQT_TQIODEVICE(&file) );
if( newParser )
{
if( m_pActiveObject )
- insertFromParser( i18n( "Import %1" ).arg( selectedFormat->description( ) ),
+ insertFromParser( i18n( "Import %1" ).tqarg( selectedFormat->description( ) ),
newParser, m_pActiveObject );
else
- insertFromParser( i18n( "Import %1" ).arg( selectedFormat->description( ) ),
+ insertFromParser( i18n( "Import %1" ).tqarg( selectedFormat->description( ) ),
newParser, m_pScene );
delete newParser;
}
@@ -1404,7 +1404,7 @@ void PMPart::slotFileExport( )
TQBuffer buffer( baData );
buffer.open( IO_WriteOnly );
- PMSerializer* newSer = selectedFormat->newSerializer( &buffer );
+ PMSerializer* newSer = selectedFormat->newSerializer( TQT_TQIODEVICE(&buffer) );
if( newSer )
{
newSer->serialize( m_pScene );
@@ -1450,7 +1450,7 @@ void PMPart::slotEditCut( )
if( sortedList.count( ) > 0 )
{
- TQApplication::clipboard( )->setData( new PMObjectDrag( this, sortedList ) );
+ TQApplication::tqclipboard( )->setData( new PMObjectDrag( this, sortedList ) );
removeSelection( i18n( "Cut" ) );
}
@@ -1472,7 +1472,7 @@ void PMPart::slotEditCopy( )
const PMObjectList& sortedList = selectedObjects( );
if( sortedList.count( ) > 0 )
- TQApplication::clipboard( )->setData( new PMObjectDrag( this, sortedList ) );
+ TQApplication::tqclipboard( )->setData( new PMObjectDrag( this, sortedList ) );
emit setStatusBarText( "" );
}
@@ -1513,7 +1513,7 @@ bool PMPart::dragMoveSelectionTo( PMObject* obj )
command = new PMMoveCommand( sortedList, obj, hlp );
break;
case PMInsertPopup::PMISibling:
- command = new PMMoveCommand( sortedList, obj->parent( ), obj );
+ command = new PMMoveCommand( sortedList, obj->tqparent( ), obj );
break;
}
}
@@ -1549,7 +1549,7 @@ void PMPart::slotEditPaste( )
{
emit setStatusBarText( i18n( "Inserting clipboard contents..." ) );
- pasteOrDrop( i18n( "Paste" ), qApp->clipboard( )->data( ),
+ pasteOrDrop( i18n( "Paste" ), tqApp->tqclipboard( )->data( ),
m_pActiveObject );
emit setStatusBarText( "" );
@@ -1600,30 +1600,30 @@ bool PMPart::insertFromParser( const TQString& type, PMParser* parser,
if( success && insertAs )
{
- PMObject* parent = 0;
+ PMObject* tqparent = 0;
PMObject* after = 0;
switch( insertAs )
{
case PMInsertPopup::PMIFirstChild:
- parent = obj;
+ tqparent = obj;
after = 0;
break;
case PMInsertPopup::PMILastChild:
- parent = obj;
+ tqparent = obj;
after = obj->lastChild( );
break;
case PMInsertPopup::PMISibling:
- parent = obj->parent( );
+ tqparent = obj->tqparent( );
after = obj;
break;
default:
- parent = obj;
+ tqparent = obj;
after = 0;
break;
}
- parser->parse( &list, parent, after );
+ parser->parse( &list, tqparent, after );
success = !( parser->warnings( ) || parser->errors( ) );
if( !success )
@@ -1639,7 +1639,7 @@ bool PMPart::insertFromParser( const TQString& type, PMParser* parser,
if( success )
{
// parsing was successful
- command = new PMAddCommand( list, parent, after );
+ command = new PMAddCommand( list, tqparent, after );
command->setText( type );
success = executeCommand( command );
@@ -1850,8 +1850,8 @@ void PMPart::slotObjectChanged( PMObject* obj, const int m,
if( mode & PMCRemove )
{
- if( obj->parent( ) )
- if( obj->parent( ) == m_pActiveObject )
+ if( obj->tqparent( ) )
+ if( obj->tqparent( ) == m_pActiveObject )
m_updateNewObjectActions = true;
if( m_pNewSelection == obj )
{
@@ -1859,12 +1859,12 @@ void PMPart::slotObjectChanged( PMObject* obj, const int m,
m_pNewSelection = obj->nextSibling( );
else if( obj->prevSibling( ) )
m_pNewSelection = obj->nextSibling( );
- else if( obj->parent( ) )
- m_pNewSelection = obj->parent( );
+ else if( obj->tqparent( ) )
+ m_pNewSelection = obj->tqparent( );
else
m_pNewSelection = 0;
}
- if( m_selectedObjects.containsRef( obj ) )
+ if( m_selectedObjects.tqcontainsRef( obj ) )
{
m_selectedObjects.removeRef( obj );
if( m_selectedObjects.isEmpty( ) )
@@ -1873,8 +1873,8 @@ void PMPart::slotObjectChanged( PMObject* obj, const int m,
m_pNewSelection = obj->nextSibling( );
else if( obj->prevSibling( ) )
m_pNewSelection = obj->prevSibling( );
- else if( obj->parent( ) )
- m_pNewSelection = obj->parent( );
+ else if( obj->tqparent( ) )
+ m_pNewSelection = obj->tqparent( );
else
m_pNewSelection = 0;
}
@@ -1903,7 +1903,7 @@ void PMPart::slotObjectChanged( PMObject* obj, const int m,
if( obj->isA( "Declare" ) )
{
PMDeclare* decl = ( PMDeclare* ) obj;
- PMSymbol* s = m_pSymbolTable->find( decl->id( ) );
+ PMSymbol* s = m_pSymbolTable->tqfind( decl->id( ) );
if( !s )
m_pSymbolTable->insert( decl->id( ),
new PMSymbol( decl->id( ), decl ) );
@@ -1911,8 +1911,8 @@ void PMPart::slotObjectChanged( PMObject* obj, const int m,
if( obj->type( ) == "Camera" )
m_bCameraListUpToDate = false;
}
- if( obj->parent( ) )
- if( obj->parent( ) == m_pActiveObject )
+ if( obj->tqparent( ) )
+ if( obj->tqparent( ) == m_pActiveObject )
m_updateNewObjectActions = true;
m_numAddedObjects++;
}
@@ -1977,7 +1977,7 @@ void PMPart::slotIDChanged( PMObject* obj, const TQString& oldID )
if( obj->isA( "Declare" ) )
{
PMDeclare* d = ( PMDeclare* ) obj;
- PMSymbol* s = m_pSymbolTable->find( oldID );
+ PMSymbol* s = m_pSymbolTable->tqfind( oldID );
if( s )
{
if( s->type( ) == PMSymbol::Object )
@@ -2028,7 +2028,7 @@ void PMPart::slotNewObject( PMObject* newObject, int insertAs )
break;
case PMInsertPopup::PMISibling:
command = new PMAddCommand( list,
- m_pActiveObject->parent( ),
+ m_pActiveObject->tqparent( ),
m_pActiveObject );
break;
default:
@@ -2508,7 +2508,7 @@ void PMPart::slotClipboardDataChanged( )
{
if( isReadWrite( ) )
{
- m_canDecode = PMObjectDrag::canDecode( qApp->clipboard( )->data( ), this );
+ m_canDecode = PMObjectDrag::canDecode( tqApp->tqclipboard( )->data( ), this );
m_pPasteAction->setEnabled( m_canDecode && m_pActiveObject );
}
else
@@ -2525,8 +2525,8 @@ void PMPart::clearSelection( )
m_pNewSelection = it.current( )->nextSibling( );
else if( it.current( )->prevSibling( ) )
m_pNewSelection = it.current( )->prevSibling( );
- else if( it.current( )->parent( ) )
- m_pNewSelection = it.current( )->parent( );
+ else if( it.current( )->tqparent( ) )
+ m_pNewSelection = it.current( )->tqparent( );
for( ; it.current( ); ++it )
{
@@ -2537,8 +2537,8 @@ void PMPart::clearSelection( )
m_pNewSelection = it.current( )->nextSibling( );
else if( it.current( )->prevSibling( ) )
m_pNewSelection = it.current( )->prevSibling( );
- else if( it.current( )->parent( ) )
- m_pNewSelection = it.current( )->parent( );
+ else if( it.current( )->tqparent( ) )
+ m_pNewSelection = it.current( )->tqparent( );
}
}
}
@@ -2713,7 +2713,7 @@ void PMPart::slotRender( )
TQBuffer buffer( a );
buffer.open( IO_WriteOnly );
PMPovray35Format format;
- PMSerializer* dev = format.newSerializer( &buffer );
+ PMSerializer* dev = format.newSerializer( TQT_TQIODEVICE(&buffer) );
dev->serialize( m_pScene );
delete dev;
diff --git a/kpovmodeler/pmpart.h b/kpovmodeler/pmpart.h
index e1b36b46..0fe3bd22 100644
--- a/kpovmodeler/pmpart.h
+++ b/kpovmodeler/pmpart.h
@@ -70,21 +70,22 @@ class KProcess;
class PMPart : public KParts::ReadWritePart, virtual public PMPartIface
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* construtor of PMPart, calls all init functions to create the
* application.
*/
- PMPart( TQWidget* parentWidget, const char* widgetName,
- TQObject* parent, const char* name, bool readWrite,
+ PMPart( TQWidget* tqparentWidget, const char* widgetName,
+ TQObject* tqparent, const char* name, bool readWrite,
PMShell* shell = 0 );
/**
* construtor of PMPart, calls all init functions to create the
* application. It does not create the main widget.
*/
- PMPart( TQWidget* parentWidget, const char* widgetName,
- TQObject* parent, const char* name, bool readWrite,
+ PMPart( TQWidget* tqparentWidget, const char* widgetName,
+ TQObject* tqparent, const char* name, bool readWrite,
bool onlyCutPaste, PMShell* shell = 0 );
/**
@@ -770,7 +771,7 @@ protected:
* creates the widget of the part instance and sets
* it as the view
*/
- void initView( TQWidget* parent, const char* name );
+ void initView( TQWidget* tqparent, const char* name );
/**
* initializes the documents contents
*/
@@ -1025,10 +1026,11 @@ private:
class PMBrowserExtension : public KParts::BrowserExtension
{
Q_OBJECT
+ TQ_OBJECT
friend class PMPart;
public:
- PMBrowserExtension( PMPart* parent )
- : KParts::BrowserExtension( parent, "PMBrowserExtension" )
+ PMBrowserExtension( PMPart* tqparent )
+ : KParts::BrowserExtension( tqparent, "PMBrowserExtension" )
{
KGlobal::locale()->insertCatalogue("kpovmodeler");
}
diff --git a/kpovmodeler/pmpattern.cpp b/kpovmodeler/pmpattern.cpp
index 2d60e9ce..bafbedda 100644
--- a/kpovmodeler/pmpattern.cpp
+++ b/kpovmodeler/pmpattern.cpp
@@ -453,11 +453,11 @@ void PMPattern::readAttributes( const PMXMLHelper& h )
Base::readAttributes( h );
}
-PMMetaObject* PMPattern::metaObject( ) const
+PMMetaObject* PMPattern::tqmetaObject( ) const