summaryrefslogtreecommitdiffstats
path: root/kpovmodeler
diff options
context:
space:
mode:
Diffstat (limited to 'kpovmodeler')
-rw-r--r--kpovmodeler/CMakeL10n.txt6
-rw-r--r--kpovmodeler/CMakeLists.txt10
-rw-r--r--kpovmodeler/ConfigureChecks.cmake9
-rw-r--r--kpovmodeler/StyleConvention14
-rw-r--r--kpovmodeler/kpovmodeler.desktop46
-rw-r--r--kpovmodeler/pm2dcontrolpoint.h1
-rw-r--r--kpovmodeler/pm3dcontrolpoint.h1
-rw-r--r--kpovmodeler/pmactions.cpp12
-rw-r--r--kpovmodeler/pmactions.h7
-rw-r--r--kpovmodeler/pmaddcommand.h1
-rw-r--r--kpovmodeler/pmallcommands.h1
-rw-r--r--kpovmodeler/pmalledits.h1
-rw-r--r--kpovmodeler/pmallobjects.h1
-rw-r--r--kpovmodeler/pmbicubicpatch.h1
-rw-r--r--kpovmodeler/pmbicubicpatchedit.cpp18
-rw-r--r--kpovmodeler/pmbicubicpatchedit.h3
-rw-r--r--kpovmodeler/pmblendmapmodifiers.h1
-rw-r--r--kpovmodeler/pmblendmapmodifiersedit.cpp14
-rw-r--r--kpovmodeler/pmblendmapmodifiersedit.h3
-rw-r--r--kpovmodeler/pmblob.h1
-rw-r--r--kpovmodeler/pmblobcylinder.h1
-rw-r--r--kpovmodeler/pmblobcylinderedit.cpp8
-rw-r--r--kpovmodeler/pmblobcylinderedit.h3
-rw-r--r--kpovmodeler/pmblobedit.cpp6
-rw-r--r--kpovmodeler/pmblobedit.h3
-rw-r--r--kpovmodeler/pmblobsphere.h1
-rw-r--r--kpovmodeler/pmblobsphereedit.cpp6
-rw-r--r--kpovmodeler/pmblobsphereedit.h2
-rw-r--r--kpovmodeler/pmboundedby.h1
-rw-r--r--kpovmodeler/pmboundedbyedit.h3
-rw-r--r--kpovmodeler/pmbox.h1
-rw-r--r--kpovmodeler/pmboxedit.cpp4
-rw-r--r--kpovmodeler/pmboxedit.h3
-rw-r--r--kpovmodeler/pmbumpmap.h1
-rw-r--r--kpovmodeler/pmbumpmapedit.cpp16
-rw-r--r--kpovmodeler/pmbumpmapedit.h3
-rw-r--r--kpovmodeler/pmcamera.h1
-rw-r--r--kpovmodeler/pmcameraedit.cpp50
-rw-r--r--kpovmodeler/pmcameraedit.h3
-rw-r--r--kpovmodeler/pmclippedby.h1
-rw-r--r--kpovmodeler/pmclippedbyedit.h3
-rw-r--r--kpovmodeler/pmcolor.h1
-rw-r--r--kpovmodeler/pmcoloredit.cpp14
-rw-r--r--kpovmodeler/pmcoloredit.h3
-rw-r--r--kpovmodeler/pmcolorsettings.h2
-rw-r--r--kpovmodeler/pmcommand.h1
-rw-r--r--kpovmodeler/pmcommandmanager.h3
-rw-r--r--kpovmodeler/pmcomment.h1
-rw-r--r--kpovmodeler/pmcommentedit.cpp2
-rw-r--r--kpovmodeler/pmcommentedit.h3
-rw-r--r--kpovmodeler/pmcompositeobject.h1
-rw-r--r--kpovmodeler/pmcone.h1
-rw-r--r--kpovmodeler/pmconeedit.cpp10
-rw-r--r--kpovmodeler/pmconeedit.h3
-rw-r--r--kpovmodeler/pmcontrolpoint.h1
-rw-r--r--kpovmodeler/pmcsg.h1
-rw-r--r--kpovmodeler/pmcsgedit.cpp2
-rw-r--r--kpovmodeler/pmcsgedit.h3
-rw-r--r--kpovmodeler/pmcylinder.h1
-rw-r--r--kpovmodeler/pmcylinderedit.cpp8
-rw-r--r--kpovmodeler/pmcylinderedit.h3
-rw-r--r--kpovmodeler/pmdatachangecommand.h1
-rw-r--r--kpovmodeler/pmdebug.h1
-rw-r--r--kpovmodeler/pmdeclare.h1
-rw-r--r--kpovmodeler/pmdeclareedit.cpp12
-rw-r--r--kpovmodeler/pmdeclareedit.h3
-rw-r--r--kpovmodeler/pmdeletecommand.h1
-rw-r--r--kpovmodeler/pmdensity.h1
-rw-r--r--kpovmodeler/pmdensityedit.h3
-rw-r--r--kpovmodeler/pmdetailobject.h1
-rw-r--r--kpovmodeler/pmdetailobjectedit.cpp4
-rw-r--r--kpovmodeler/pmdetailobjectedit.h3
-rw-r--r--kpovmodeler/pmdialogeditbase.cpp22
-rw-r--r--kpovmodeler/pmdialogeditbase.h3
-rw-r--r--kpovmodeler/pmdialogview.cpp42
-rw-r--r--kpovmodeler/pmdialogview.h5
-rw-r--r--kpovmodeler/pmdisc.h1
-rw-r--r--kpovmodeler/pmdiscedit.cpp10
-rw-r--r--kpovmodeler/pmdiscedit.h3
-rw-r--r--kpovmodeler/pmdistancecontrolpoint.h1
-rw-r--r--kpovmodeler/pmdockwidget.cpp112
-rw-r--r--kpovmodeler/pmdockwidget.h20
-rw-r--r--kpovmodeler/pmdockwidget_private.cpp26
-rw-r--r--kpovmodeler/pmdockwidget_private.h12
-rw-r--r--kpovmodeler/pmdocumentationmap.h1
-rw-r--r--kpovmodeler/pmdragwidget.h2
-rw-r--r--kpovmodeler/pmenumproperty.h1
-rw-r--r--kpovmodeler/pmerrordialog.h3
-rw-r--r--kpovmodeler/pmerrorflags.h1
-rw-r--r--kpovmodeler/pmface.h1
-rw-r--r--kpovmodeler/pmfactory.h3
-rw-r--r--kpovmodeler/pmfiledialog.h2
-rw-r--r--kpovmodeler/pmfinish.h1
-rw-r--r--kpovmodeler/pmfinishedit.cpp68
-rw-r--r--kpovmodeler/pmfinishedit.h3
-rw-r--r--kpovmodeler/pmfog.h1
-rw-r--r--kpovmodeler/pmfogedit.cpp24
-rw-r--r--kpovmodeler/pmfogedit.h3
-rw-r--r--kpovmodeler/pmglobalphotons.h1
-rw-r--r--kpovmodeler/pmglobalphotonsedit.cpp44
-rw-r--r--kpovmodeler/pmglobalphotonsedit.h3
-rw-r--r--kpovmodeler/pmglobalsettings.h1
-rw-r--r--kpovmodeler/pmglobalsettingsedit.cpp38
-rw-r--r--kpovmodeler/pmglobalsettingsedit.h3
-rw-r--r--kpovmodeler/pmglview.cpp90
-rw-r--r--kpovmodeler/pmglview.h5
-rw-r--r--kpovmodeler/pmgraphicalobject.h1
-rw-r--r--kpovmodeler/pmgraphicalobjectedit.cpp18
-rw-r--r--kpovmodeler/pmgraphicalobjectedit.h3
-rw-r--r--kpovmodeler/pmgridsettings.h2
-rw-r--r--kpovmodeler/pmheightfield.h1
-rw-r--r--kpovmodeler/pmheightfieldedit.cpp18
-rw-r--r--kpovmodeler/pmheightfieldedit.h3
-rw-r--r--kpovmodeler/pmheightfieldroam.cpp2
-rw-r--r--kpovmodeler/pmheightfieldroam.h1
-rw-r--r--kpovmodeler/pmimagemap.h1
-rw-r--r--kpovmodeler/pmimagemapedit.cpp36
-rw-r--r--kpovmodeler/pmimagemapedit.h3
-rw-r--r--kpovmodeler/pminserterrordialog.h3
-rw-r--r--kpovmodeler/pminsertpopup.h1
-rw-r--r--kpovmodeler/pminsertrulesystem.h1
-rw-r--r--kpovmodeler/pminterior.h1
-rw-r--r--kpovmodeler/pminterioredit.cpp24
-rw-r--r--kpovmodeler/pminterioredit.h3
-rw-r--r--kpovmodeler/pminteriortexture.h1
-rw-r--r--kpovmodeler/pminteriortextureedit.h3
-rw-r--r--kpovmodeler/pmisosurface.h1
-rw-r--r--kpovmodeler/pmisosurfaceedit.cpp36
-rw-r--r--kpovmodeler/pmisosurfaceedit.h3
-rw-r--r--kpovmodeler/pmjuliafractal.h1
-rw-r--r--kpovmodeler/pmjuliafractaledit.cpp20
-rw-r--r--kpovmodeler/pmjuliafractaledit.h3
-rw-r--r--kpovmodeler/pmlathe.h1
-rw-r--r--kpovmodeler/pmlatheedit.cpp18
-rw-r--r--kpovmodeler/pmlatheedit.h3
-rw-r--r--kpovmodeler/pmlayoutsettings.cpp60
-rw-r--r--kpovmodeler/pmlayoutsettings.h2
-rw-r--r--kpovmodeler/pmlibrarybrowser.cpp38
-rw-r--r--kpovmodeler/pmlibrarybrowser.h5
-rw-r--r--kpovmodeler/pmlibraryentrypreview.cpp24
-rw-r--r--kpovmodeler/pmlibraryentrypreview.h3
-rw-r--r--kpovmodeler/pmlibraryhandle.h1
-rw-r--r--kpovmodeler/pmlibraryhandleedit.cpp8
-rw-r--r--kpovmodeler/pmlibraryhandleedit.h3
-rw-r--r--kpovmodeler/pmlibraryiconview.cpp1
-rw-r--r--kpovmodeler/pmlibraryiconview.h5
-rw-r--r--kpovmodeler/pmlibrarymanager.h1
-rw-r--r--kpovmodeler/pmlibraryobject.cpp1
-rw-r--r--kpovmodeler/pmlibraryobject.h1
-rw-r--r--kpovmodeler/pmlibraryobjectsearch.cpp2
-rw-r--r--kpovmodeler/pmlibraryobjectsearch.h3
-rw-r--r--kpovmodeler/pmlight.h1
-rw-r--r--kpovmodeler/pmlightedit.cpp54
-rw-r--r--kpovmodeler/pmlightedit.h3
-rw-r--r--kpovmodeler/pmlightgroup.h1
-rw-r--r--kpovmodeler/pmlightgroupedit.cpp2
-rw-r--r--kpovmodeler/pmlightgroupedit.h3
-rw-r--r--kpovmodeler/pmline.h1
-rw-r--r--kpovmodeler/pmlineedits.cpp8
-rw-r--r--kpovmodeler/pmlineedits.h5
-rw-r--r--kpovmodeler/pmlinkedit.cpp4
-rw-r--r--kpovmodeler/pmlinkedit.h2
-rw-r--r--kpovmodeler/pmlistpattern.h1
-rw-r--r--kpovmodeler/pmlistpatternedit.cpp8
-rw-r--r--kpovmodeler/pmlistpatternedit.h3
-rw-r--r--kpovmodeler/pmlookslike.h1
-rw-r--r--kpovmodeler/pmmapmemento.h1
-rw-r--r--kpovmodeler/pmmaterial.h1
-rw-r--r--kpovmodeler/pmmaterialedit.h3
-rw-r--r--kpovmodeler/pmmaterialmap.h1
-rw-r--r--kpovmodeler/pmmaterialmapedit.cpp12
-rw-r--r--kpovmodeler/pmmaterialmapedit.h3
-rw-r--r--kpovmodeler/pmmath.h1
-rw-r--r--kpovmodeler/pmmatrix.h1
-rw-r--r--kpovmodeler/pmmedia.h1
-rw-r--r--kpovmodeler/pmmediaedit.cpp36
-rw-r--r--kpovmodeler/pmmediaedit.h3
-rw-r--r--kpovmodeler/pmmemento.h1
-rw-r--r--kpovmodeler/pmmesh.h1
-rw-r--r--kpovmodeler/pmmeshedit.cpp6
-rw-r--r--kpovmodeler/pmmeshedit.h3
-rw-r--r--kpovmodeler/pmmessage.h1
-rw-r--r--kpovmodeler/pmmetaobject.h1
-rw-r--r--kpovmodeler/pmmovecommand.h1
-rw-r--r--kpovmodeler/pmnamedobject.h1
-rw-r--r--kpovmodeler/pmnamedobjectedit.cpp4
-rw-r--r--kpovmodeler/pmnamedobjectedit.h3
-rw-r--r--kpovmodeler/pmnormal.h1
-rw-r--r--kpovmodeler/pmnormaledit.cpp8
-rw-r--r--kpovmodeler/pmnormaledit.h3
-rw-r--r--kpovmodeler/pmobject.h1
-rw-r--r--kpovmodeler/pmobjectaction.h1
-rw-r--r--kpovmodeler/pmobjectdrag.cpp4
-rw-r--r--kpovmodeler/pmobjectdrag.h1
-rw-r--r--kpovmodeler/pmobjectlibrarysettings.cpp10
-rw-r--r--kpovmodeler/pmobjectlibrarysettings.h2
-rw-r--r--kpovmodeler/pmobjectlink.h1
-rw-r--r--kpovmodeler/pmobjectlinkedit.cpp2
-rw-r--r--kpovmodeler/pmobjectlinkedit.h3
-rw-r--r--kpovmodeler/pmobjectselect.cpp8
-rw-r--r--kpovmodeler/pmobjectselect.h3
-rw-r--r--kpovmodeler/pmobjectsettings.h2
-rw-r--r--kpovmodeler/pmopenglsettings.h2
-rw-r--r--kpovmodeler/pmoutputdevice.h1
-rw-r--r--kpovmodeler/pmpalettevalue.h1
-rw-r--r--kpovmodeler/pmpalettevalueedit.cpp4
-rw-r--r--kpovmodeler/pmpalettevalueedit.h3
-rw-r--r--kpovmodeler/pmpalettevaluememento.h1
-rw-r--r--kpovmodeler/pmparser.cpp2
-rw-r--r--kpovmodeler/pmparser.h1
-rw-r--r--kpovmodeler/pmpart.cpp226
-rw-r--r--kpovmodeler/pmpart.h5
-rw-r--r--kpovmodeler/pmpartiface.h1
-rw-r--r--kpovmodeler/pmpattern.h1
-rw-r--r--kpovmodeler/pmpatternedit.cpp72
-rw-r--r--kpovmodeler/pmpatternedit.h3
-rw-r--r--kpovmodeler/pmphotons.h1
-rw-r--r--kpovmodeler/pmphotonsedit.cpp14
-rw-r--r--kpovmodeler/pmphotonsedit.h3
-rw-r--r--kpovmodeler/pmpigment.h1
-rw-r--r--kpovmodeler/pmpigmentedit.cpp2
-rw-r--r--kpovmodeler/pmpigmentedit.h3
-rw-r--r--kpovmodeler/pmplane.h1
-rw-r--r--kpovmodeler/pmplaneedit.cpp6
-rw-r--r--kpovmodeler/pmplaneedit.h3
-rw-r--r--kpovmodeler/pmplanenormalcontrolpoint.h1
-rw-r--r--kpovmodeler/pmpluginsettings.cpp6
-rw-r--r--kpovmodeler/pmpluginsettings.h2
-rw-r--r--kpovmodeler/pmpoint.h1
-rw-r--r--kpovmodeler/pmpolynom.h1
-rw-r--r--kpovmodeler/pmpolynomedit.cpp6
-rw-r--r--kpovmodeler/pmpolynomedit.h3
-rw-r--r--kpovmodeler/pmpolynomexponents.h1
-rw-r--r--kpovmodeler/pmpovraymatrix.h1
-rw-r--r--kpovmodeler/pmpovraymatrixedit.cpp2
-rw-r--r--kpovmodeler/pmpovraymatrixedit.h3
-rw-r--r--kpovmodeler/pmpovrayoutputwidget.cpp2
-rw-r--r--kpovmodeler/pmpovrayoutputwidget.h3
-rw-r--r--kpovmodeler/pmpovrayparser.h1
-rw-r--r--kpovmodeler/pmpovrayrenderwidget.cpp12
-rw-r--r--kpovmodeler/pmpovrayrenderwidget.h2
-rw-r--r--kpovmodeler/pmpovraysettings.cpp28
-rw-r--r--kpovmodeler/pmpovraysettings.h2
-rw-r--r--kpovmodeler/pmpovraywidget.cpp36
-rw-r--r--kpovmodeler/pmpovraywidget.h2
-rw-r--r--kpovmodeler/pmpreviewsettings.h2
-rw-r--r--kpovmodeler/pmprism.h1
-rw-r--r--kpovmodeler/pmprismedit.cpp34
-rw-r--r--kpovmodeler/pmprismedit.h3
-rw-r--r--kpovmodeler/pmprismmemento.h1
-rw-r--r--kpovmodeler/pmprojectedthrough.h1
-rw-r--r--kpovmodeler/pmprototypemanager.h1
-rw-r--r--kpovmodeler/pmquickcolor.h1
-rw-r--r--kpovmodeler/pmquickcoloredit.cpp2
-rw-r--r--kpovmodeler/pmquickcoloredit.h3
-rw-r--r--kpovmodeler/pmradiosity.h1
-rw-r--r--kpovmodeler/pmradiosityedit.cpp30
-rw-r--r--kpovmodeler/pmradiosityedit.h3
-rw-r--r--kpovmodeler/pmrainbow.h1
-rw-r--r--kpovmodeler/pmrainbowedit.cpp32
-rw-r--r--kpovmodeler/pmrainbowedit.h3
-rw-r--r--kpovmodeler/pmraw.h1
-rw-r--r--kpovmodeler/pmrawedit.cpp2
-rw-r--r--kpovmodeler/pmrawedit.h3
-rw-r--r--kpovmodeler/pmrecursiveobjectiterator.h1
-rw-r--r--kpovmodeler/pmrendermanager.h3
-rw-r--r--kpovmodeler/pmrendermode.cpp8
-rw-r--r--kpovmodeler/pmrendermode.h5
-rw-r--r--kpovmodeler/pmrendermodesdialog.cpp65
-rw-r--r--kpovmodeler/pmrendermodesdialog.h6
-rw-r--r--kpovmodeler/pmresourcelocator.h1
-rw-r--r--kpovmodeler/pmrotate.h1
-rw-r--r--kpovmodeler/pmrotatecontrolpoint.h1
-rw-r--r--kpovmodeler/pmrotateedit.cpp2
-rw-r--r--kpovmodeler/pmrotateedit.h3
-rw-r--r--kpovmodeler/pmscale.h1
-rw-r--r--kpovmodeler/pmscalecontrolpoint.h1
-rw-r--r--kpovmodeler/pmscaleedit.cpp2
-rw-r--r--kpovmodeler/pmscaleedit.h3
-rw-r--r--kpovmodeler/pmscanner.h1
-rw-r--r--kpovmodeler/pmscene.h1
-rw-r--r--kpovmodeler/pmserializer.h1
-rw-r--r--kpovmodeler/pmsettingsdialog.cpp6
-rw-r--r--kpovmodeler/pmsettingsdialog.h5
-rw-r--r--kpovmodeler/pmshell.cpp118
-rw-r--r--kpovmodeler/pmshell.h3
-rw-r--r--kpovmodeler/pmskysphere.h1
-rw-r--r--kpovmodeler/pmskysphereedit.h3
-rw-r--r--kpovmodeler/pmslope.h1
-rw-r--r--kpovmodeler/pmslopeedit.cpp4
-rw-r--r--kpovmodeler/pmslopeedit.h3
-rw-r--r--kpovmodeler/pmsolidcolor.h1
-rw-r--r--kpovmodeler/pmsolidcoloredit.cpp2
-rw-r--r--kpovmodeler/pmsolidcoloredit.h3
-rw-r--r--kpovmodeler/pmsolidobject.h1
-rw-r--r--kpovmodeler/pmsolidobjectedit.cpp4
-rw-r--r--kpovmodeler/pmsolidobjectedit.h3
-rw-r--r--kpovmodeler/pmsor.h1
-rw-r--r--kpovmodeler/pmsorcontrolpoint.h1
-rw-r--r--kpovmodeler/pmsoredit.cpp16
-rw-r--r--kpovmodeler/pmsoredit.h3
-rw-r--r--kpovmodeler/pmsorsegment.cpp1
-rw-r--r--kpovmodeler/pmsorsegment.h1
-rw-r--r--kpovmodeler/pmsphere.h1
-rw-r--r--kpovmodeler/pmsphereedit.cpp4
-rw-r--r--kpovmodeler/pmsphereedit.h2
-rw-r--r--kpovmodeler/pmspheresweep.h1
-rw-r--r--kpovmodeler/pmspheresweepedit.cpp18
-rw-r--r--kpovmodeler/pmspheresweepedit.h3
-rw-r--r--kpovmodeler/pmsplinememento.h1
-rw-r--r--kpovmodeler/pmsplinesegment.cpp1
-rw-r--r--kpovmodeler/pmsplinesegment.h1
-rw-r--r--kpovmodeler/pmsqe.h1
-rw-r--r--kpovmodeler/pmsqeedit.cpp4
-rw-r--r--kpovmodeler/pmsqeedit.h3
-rw-r--r--kpovmodeler/pmsymboltable.h1
-rw-r--r--kpovmodeler/pmtext.h1
-rw-r--r--kpovmodeler/pmtextedit.cpp20
-rw-r--r--kpovmodeler/pmtextedit.h3
-rw-r--r--kpovmodeler/pmtexture.h1
-rw-r--r--kpovmodeler/pmtexturebase.h1
-rw-r--r--kpovmodeler/pmtexturebaseedit.cpp2
-rw-r--r--kpovmodeler/pmtexturebaseedit.h3
-rw-r--r--kpovmodeler/pmtextureedit.cpp2
-rw-r--r--kpovmodeler/pmtextureedit.h3
-rw-r--r--kpovmodeler/pmtexturemap.h1
-rw-r--r--kpovmodeler/pmtexturemapedit.cpp2
-rw-r--r--kpovmodeler/pmtexturemapedit.h3
-rw-r--r--kpovmodeler/pmtokens.h1
-rw-r--r--kpovmodeler/pmtorusedit.cpp6
-rw-r--r--kpovmodeler/pmtorusedit.h2
-rw-r--r--kpovmodeler/pmtranslate.h1
-rw-r--r--kpovmodeler/pmtranslatecontrolpoint.h1
-rw-r--r--kpovmodeler/pmtranslateedit.cpp2
-rw-r--r--kpovmodeler/pmtranslateedit.h3
-rw-r--r--kpovmodeler/pmtreeview.cpp38
-rw-r--r--kpovmodeler/pmtreeview.h3
-rw-r--r--kpovmodeler/pmtreeviewitem.h1
-rw-r--r--kpovmodeler/pmtriangle.h1
-rw-r--r--kpovmodeler/pmtriangleedit.cpp22
-rw-r--r--kpovmodeler/pmtriangleedit.h3
-rw-r--r--kpovmodeler/pmtruetypecache.h1
-rw-r--r--kpovmodeler/pmvalue.h1
-rw-r--r--kpovmodeler/pmvariant.h1
-rw-r--r--kpovmodeler/pmvector.h1
-rw-r--r--kpovmodeler/pmvectorcontrolpoint.h1
-rw-r--r--kpovmodeler/pmvectoredit.cpp12
-rw-r--r--kpovmodeler/pmvectoredit.h3
-rw-r--r--kpovmodeler/pmvectorlistedit.cpp6
-rw-r--r--kpovmodeler/pmvectorlistedit.h3
-rw-r--r--kpovmodeler/pmview.cpp4
-rw-r--r--kpovmodeler/pmview.h3
-rw-r--r--kpovmodeler/pmviewbase.h4
-rw-r--r--kpovmodeler/pmviewlayoutmanager.cpp10
-rw-r--r--kpovmodeler/pmviewlayoutmanager.h3
-rw-r--r--kpovmodeler/pmviewstructure.h1
-rw-r--r--kpovmodeler/pmwarp.h1
-rw-r--r--kpovmodeler/pmwarpedit.cpp36
-rw-r--r--kpovmodeler/pmwarpedit.h3
-rw-r--r--kpovmodeler/pmxmlhelper.h1
-rw-r--r--kpovmodeler/pmxmlparser.h1
361 files changed, 1186 insertions, 1485 deletions
diff --git a/kpovmodeler/CMakeL10n.txt b/kpovmodeler/CMakeL10n.txt
index 084877a7..f85ad75d 100644
--- a/kpovmodeler/CMakeL10n.txt
+++ b/kpovmodeler/CMakeL10n.txt
@@ -1,3 +1,9 @@
##### create translation templates ##############
tde_l10n_create_template( "kpovmodeler" )
+
+tde_l10n_create_template(
+ CATALOG "desktop_files/kpovmodeler.desktop/"
+ SOURCES kpovmodeler.desktop
+ DESTINATION "${CMAKE_SOURCE_DIR}/translations"
+)
diff --git a/kpovmodeler/CMakeLists.txt b/kpovmodeler/CMakeLists.txt
index 1ab30fc0..b589117f 100644
--- a/kpovmodeler/CMakeLists.txt
+++ b/kpovmodeler/CMakeLists.txt
@@ -19,7 +19,7 @@ include_directories(
${CMAKE_BINARY_DIR}
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
- ${GLU_INCLUDE_DIRS}
+ ${OPENGL_INCLUDE_DIRS}
${FREETYPE_INCLUDE_DIRS}
)
@@ -32,9 +32,7 @@ link_directories(
tde_install_icons( kpovmodeler_doc kpovmodeler )
-install( FILES
- kpovmodeler.desktop
- DESTINATION ${XDG_APPS_INSTALL_DIR} )
+tde_create_translated_desktop( kpovmodeler.desktop )
install( FILES
kpovmodelershell.rc kpovmodelerui.rc kpovmodelerbrowser.rc
@@ -114,14 +112,14 @@ tde_add_library( kpovmodeler SHARED AUTOMOC
pmlibraryiconview.cpp pmlibraryobjectsearch.cpp pmpluginmanager.cpp
pmpartiface.skel
VERSION 0.0.0
- LINK tdeparts-shared ${GLU_LIBRARIES} ${XMU_LIBRARIES}
+ LINK tdeparts-shared ${OPENGL_LIBRARIES} ${XMU_LIBRARIES} ${FREETYPE_LIBRARIES}
DESTINATION ${LIB_INSTALL_DIR}
)
##### libkpovmodelerpart (module) ###############
-configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_dummy_cpp.cmake dummy.cpp COPYONLY )
+configure_file( ${TDE_CMAKE_TEMPLATES}/tde_dummy_cpp.cmake dummy.cpp COPYONLY )
tde_add_kpart( libkpovmodelerpart AUTOMOC
SOURCES dummy.cpp
diff --git a/kpovmodeler/ConfigureChecks.cmake b/kpovmodeler/ConfigureChecks.cmake
index f4fdd1c0..a55045d4 100644
--- a/kpovmodeler/ConfigureChecks.cmake
+++ b/kpovmodeler/ConfigureChecks.cmake
@@ -10,13 +10,14 @@
#################################################
# glu
-pkg_search_module( GLU glu )
-if( NOT GLU_FOUND )
+set( OpenGL_GL_PREFERENCE LEGACY )
+find_package( OpenGL )
+if( NOT OPENGL_FOUND )
check_include_file ( GL/glu.h HAVE_GLU )
if( NOT HAVE_GLU )
- tde_message_fatal( "glu is required, but was not found on your system" )
+ tde_message_fatal( "OpenGL (glu) is required, but was not found on your system" )
endif ( )
- set( GLU_LIBRARIES "-lGL -lGLU" )
+ set( OPENGL_LIBRARIES "-lGL -lGLU" )
endif( )
diff --git a/kpovmodeler/StyleConvention b/kpovmodeler/StyleConvention
index 8c68d5fe..8199c913 100644
--- a/kpovmodeler/StyleConvention
+++ b/kpovmodeler/StyleConvention
@@ -69,7 +69,7 @@ Put type modifiers behind the type, not before the variable name.
Example:
-const QString& type;
+const TQString& type;
PMObject* obj;
@@ -201,19 +201,19 @@ things are set multiple times. But it works :-)
(load-library "vc")
;;for QT
- (set 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 ...
+ (set 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 ...
(font-lock-add-keywords 'c++-mode
- '(("\\<\\(Q_SLOTS\\|Q_SIGNALS\\)\\>" . font-lock-type-face)))
+ '(("\\<\\(slots\\|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")
;; qt keywords
(font-lock-add-keywords 'c++-mode
- '(("\\<Q_OBJECT\\>" . 'qt-keywords-face)))
+ '(("\\<TQ_OBJECT\\>" . 'qt-keywords-face)))
(font-lock-add-keywords 'c++-mode
- '(("\\<SIGNAL\\|SLOT\\>" . 'qt-keywords-face)))
+ '(("\\<TQ_SIGNAL\\|TQ_SLOT\\>" . 'qt-keywords-face)))
(font-lock-add-keywords 'c++-mode
'(("\\<Q[A-Z][A-Za-z]*" . 'qt-keywords-face)))
)
diff --git a/kpovmodeler/kpovmodeler.desktop b/kpovmodeler/kpovmodeler.desktop
index d22ca795..2f3d10a3 100644
--- a/kpovmodeler/kpovmodeler.desktop
+++ b/kpovmodeler/kpovmodeler.desktop
@@ -4,53 +4,7 @@ Exec=kpovmodeler -caption "%c" %i %m %f
Icon=kpovmodeler
MimeType=application/x-kpovmodeler;
Name=KPovModeler
-Name[eo]=KPovModelilo
-Name[es]=Modelador Povray
-Name[he]=מעצב Povray
-Name[nb]=KPov-modellerer
-Name[ne]=केडीई पोभ मोडेलर
-Name[nn]=KPov-modellering
-Name[sv]=Kpovmodeler
GenericName=Povray Modeler
-GenericName[ca]=Modelador Povray
-GenericName[cs]=Modelář Povray
-GenericName[cy]=Modelydd Povray
-GenericName[da]=Povray-modellering
-GenericName[de]=Povray-Modellierer
-GenericName[en_GB]=Povray Modeller
-GenericName[eo]=Povray-modelilo
-GenericName[es]=Modelador Povray
-GenericName[et]=Povray modelleerija
-GenericName[eu]=Povray modelatzailea
-GenericName[fa]=سازندۀ مدل Povray
-GenericName[fi]=Povray-mallintaja
-GenericName[fr]=Modeleur Povray
-GenericName[gl]=Modelador Povray
-GenericName[he]=מעצב Povray
-GenericName[hu]=Povray-modellező
-GenericName[is]=Povray hönnuður
-GenericName[it]=Modellatore per Povray
-GenericName[ja]=Povray モデラー
-GenericName[kk]=Povray үлгілеу
-GenericName[km]=កម្មវិធី​ធ្វើ​ម៉ូដែល Povray
-GenericName[ms]=Pemodel Povray
-GenericName[nb]=Povray-modellerer
-GenericName[nds]=Povray-Modellmaker
-GenericName[ne]=पोभ्रे मोडेलर
-GenericName[nn]=Povray-modellering
-GenericName[pl]=Modeler Povray
-GenericName[pt]=Modelador de Povray
-GenericName[pt_BR]=Modelador Povray
-GenericName[ro]=Modelator Povray
-GenericName[ru]=Редактор Povray
-GenericName[sl]=Modelirnik Povray
-GenericName[sr]=Моделар за Povray
-GenericName[sr@Latn]=Modelar za Povray
-GenericName[sv]=Modellering med Povray
-GenericName[ta]=பாவ்ரே மாடுல்லர்
-GenericName[tr]=Povray Modelleyici
-GenericName[zh_CN]=Povray 建模器
-GenericName[zh_HK]=Povray 建模器
Path=
X-TDE-ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart,Browser/View,KPovModeler/Document
Terminal=false
diff --git a/kpovmodeler/pm2dcontrolpoint.h b/kpovmodeler/pm2dcontrolpoint.h
index 40b26d85..b81328b9 100644
--- a/kpovmodeler/pm2dcontrolpoint.h
+++ b/kpovmodeler/pm2dcontrolpoint.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pm3dcontrolpoint.h b/kpovmodeler/pm3dcontrolpoint.h
index 3af82a28..e21be11f 100644
--- a/kpovmodeler/pm3dcontrolpoint.h
+++ b/kpovmodeler/pm3dcontrolpoint.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmactions.cpp b/kpovmodeler/pmactions.cpp
index 31ef2aac..e7f93b6f 100644
--- a/kpovmodeler/pmactions.cpp
+++ b/kpovmodeler/pmactions.cpp
@@ -82,11 +82,11 @@ int PMComboAction::plug( TQWidget* w, int index )
toolBar->insertWidget( id, m_minWidth > 0 ? m_minWidth : 300,
comboBox, index );
- connect( comboBox, TQT_SIGNAL( activated( int ) ), m_receiver, m_member );
+ connect( comboBox, TQ_SIGNAL( activated( int ) ), m_receiver, m_member );
addContainer( toolBar, id );
- connect( toolBar, TQT_SIGNAL( destroyed( ) ), this, TQT_SLOT( slotDestroyed( ) ) );
+ connect( toolBar, TQ_SIGNAL( destroyed( ) ), this, TQ_SLOT( slotDestroyed( ) ) );
//toolBar->setItemAutoSized( id, true );
@@ -116,7 +116,7 @@ void PMComboAction::unplug( TQWidget *w )
// Use a toolbutton instead of a label so it is styled correctly.
-// copied from konq_actions.cc
+// copied from konq_actions.cpp
class PMToolBarLabel : public TQToolButton
{
public:
@@ -164,7 +164,7 @@ int PMLabelAction::plug( TQWidget *widget, int index )
addContainer( tb, id );
- connect( tb, TQT_SIGNAL( destroyed( ) ), this, TQT_SLOT( slotDestroyed( ) ) );
+ connect( tb, TQ_SIGNAL( destroyed( ) ), this, TQ_SLOT( slotDestroyed( ) ) );
return containerCount( ) - 1;
}
@@ -216,11 +216,11 @@ int PMSpinBoxAction::plug( TQWidget* w, int index )
TQSpinBox* spinBox = new TQSpinBox( -1000, 1000, 1, w );
toolBar->insertWidget( id, 70, spinBox, index );
- connect( spinBox, TQT_SIGNAL( valueChanged( int ) ), m_receiver, m_member );
+ connect( spinBox, TQ_SIGNAL( valueChanged( int ) ), m_receiver, m_member );
addContainer( toolBar, id );
- connect( toolBar, TQT_SIGNAL( destroyed( ) ), this, TQT_SLOT( slotDestroyed( ) ) );
+ connect( toolBar, TQ_SIGNAL( destroyed( ) ), this, TQ_SLOT( slotDestroyed( ) ) );
//toolBar->setItemAutoSized( id, false );
m_spinBox = spinBox;
diff --git a/kpovmodeler/pmactions.h b/kpovmodeler/pmactions.h
index 7e4a4f68..e33e4480 100644
--- a/kpovmodeler/pmactions.h
+++ b/kpovmodeler/pmactions.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -35,7 +34,7 @@ class TQToolButton;
*/
class PMComboAction : public TDEAction
{
- Q_OBJECT
+ TQ_OBJECT
public:
PMComboAction( const TQString& text, int accel, const TQObject* receiver, const char* member, TQObject* parent, const char* name );
@@ -67,7 +66,7 @@ private:
*/
class PMLabelAction : public TDEAction
{
- Q_OBJECT
+ TQ_OBJECT
public:
PMLabelAction( const TQString &text, TQObject *parent = 0, const char *name = 0 );
@@ -85,7 +84,7 @@ private:
*/
class PMSpinBoxAction : public TDEAction
{
- Q_OBJECT
+ TQ_OBJECT
public:
PMSpinBoxAction( const TQString& text, int accel, const TQObject* receiver, const char* member, TQObject* parent, const char* name );
diff --git a/kpovmodeler/pmaddcommand.h b/kpovmodeler/pmaddcommand.h
index 97793d03..d84a495c 100644
--- a/kpovmodeler/pmaddcommand.h
+++ b/kpovmodeler/pmaddcommand.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmallcommands.h b/kpovmodeler/pmallcommands.h
index 014b5a04..b3a5fb25 100644
--- a/kpovmodeler/pmallcommands.h
+++ b/kpovmodeler/pmallcommands.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmalledits.h b/kpovmodeler/pmalledits.h
index e1ee4a5a..c237d337 100644
--- a/kpovmodeler/pmalledits.h
+++ b/kpovmodeler/pmalledits.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmallobjects.h b/kpovmodeler/pmallobjects.h
index 3a02107c..94e93538 100644
--- a/kpovmodeler/pmallobjects.h
+++ b/kpovmodeler/pmallobjects.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmbicubicpatch.h b/kpovmodeler/pmbicubicpatch.h
index d14f7821..b2fbe7f1 100644
--- a/kpovmodeler/pmbicubicpatch.h
+++ b/kpovmodeler/pmbicubicpatch.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmbicubicpatchedit.cpp b/kpovmodeler/pmbicubicpatchedit.cpp
index e3a46e36..295467a9 100644
--- a/kpovmodeler/pmbicubicpatchedit.cpp
+++ b/kpovmodeler/pmbicubicpatchedit.cpp
@@ -78,15 +78,15 @@ void PMBicubicPatchEdit::createTopWidgets( )
m_pUVVectors->setSize( 4 );
topLayout( )->addWidget( m_pUVVectors );
- connect( m_pType, TQT_SIGNAL( highlighted( int ) ), TQT_SLOT( slotTypeSelected( int ) ) );
- connect( m_pUSteps, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pVSteps, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pFlatness, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pPoints, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pPoints, TQT_SIGNAL( selectionChanged( ) ),
- TQT_SLOT( slotSelectionChanged( ) ) );
- connect( m_pUVEnabled, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotUVEnabledClicked( ) ) );
- connect( m_pUVVectors, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pType, TQ_SIGNAL( highlighted( int ) ), TQ_SLOT( slotTypeSelected( int ) ) );
+ connect( m_pUSteps, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pVSteps, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pFlatness, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pPoints, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pPoints, TQ_SIGNAL( selectionChanged( ) ),
+ TQ_SLOT( slotSelectionChanged( ) ) );
+ connect( m_pUVEnabled, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotUVEnabledClicked( ) ) );
+ connect( m_pUVVectors, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
}
void PMBicubicPatchEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmbicubicpatchedit.h b/kpovmodeler/pmbicubicpatchedit.h
index 36a564b5..08c3abf9 100644
--- a/kpovmodeler/pmbicubicpatchedit.h
+++ b/kpovmodeler/pmbicubicpatchedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -38,7 +37,7 @@ class TQCheckBox;
*/
class PMBicubicPatchEdit : public PMGraphicalObjectEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMGraphicalObjectEdit Base;
public:
diff --git a/kpovmodeler/pmblendmapmodifiers.h b/kpovmodeler/pmblendmapmodifiers.h
index ecf0bfed..9713e00f 100644
--- a/kpovmodeler/pmblendmapmodifiers.h
+++ b/kpovmodeler/pmblendmapmodifiers.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmblendmapmodifiersedit.cpp b/kpovmodeler/pmblendmapmodifiersedit.cpp
index b523925d..ec73f538 100644
--- a/kpovmodeler/pmblendmapmodifiersedit.cpp
+++ b/kpovmodeler/pmblendmapmodifiersedit.cpp
@@ -83,13 +83,13 @@ void PMBlendMapModifiersEdit::createTopWidgets( )
hl->addWidget( m_pWaveExponentEdit );
hl->addStretch( 1 );
- connect( m_pEnableFrequencyEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotFrequencyClicked( ) ) );
- connect( m_pFrequencyEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pEnablePhaseEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotPhaseClicked( ) ) );
- connect( m_pPhaseEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pEnableWaveFormEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotWaveFormClicked( ) ) );
- connect( m_pWaveExponentEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pWaveTypeCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotTypeComboChanged( int ) ) );
+ connect( m_pEnableFrequencyEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotFrequencyClicked( ) ) );
+ connect( m_pFrequencyEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pEnablePhaseEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotPhaseClicked( ) ) );
+ connect( m_pPhaseEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pEnableWaveFormEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotWaveFormClicked( ) ) );
+ connect( m_pWaveExponentEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pWaveTypeCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotTypeComboChanged( int ) ) );
}
void PMBlendMapModifiersEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmblendmapmodifiersedit.h b/kpovmodeler/pmblendmapmodifiersedit.h
index aa99913b..c0d8e687 100644
--- a/kpovmodeler/pmblendmapmodifiersedit.h
+++ b/kpovmodeler/pmblendmapmodifiersedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -42,7 +41,7 @@ class TQPushButton;
*/
class PMBlendMapModifiersEdit : public PMDialogEditBase
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMDialogEditBase Base;
public:
diff --git a/kpovmodeler/pmblob.h b/kpovmodeler/pmblob.h
index 2c764590..7dd049ca 100644
--- a/kpovmodeler/pmblob.h
+++ b/kpovmodeler/pmblob.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmblobcylinder.h b/kpovmodeler/pmblobcylinder.h
index 1e9a10f1..0ea26f1a 100644
--- a/kpovmodeler/pmblobcylinder.h
+++ b/kpovmodeler/pmblobcylinder.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmblobcylinderedit.cpp b/kpovmodeler/pmblobcylinderedit.cpp
index 2a88096f..7ebb45b6 100644
--- a/kpovmodeler/pmblobcylinderedit.cpp
+++ b/kpovmodeler/pmblobcylinderedit.cpp
@@ -58,10 +58,10 @@ void PMBlobCylinderEdit::createTopWidgets( )
gl->addWidget( m_pStrength, 1, 1 );
layout->addStretch( 1 );
- connect( m_pEnd1, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pEnd2, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pRadius, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pStrength, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pEnd1, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pEnd2, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pRadius, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pStrength, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
}
void PMBlobCylinderEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmblobcylinderedit.h b/kpovmodeler/pmblobcylinderedit.h
index 35a8eff1..79a2ed79 100644
--- a/kpovmodeler/pmblobcylinderedit.h
+++ b/kpovmodeler/pmblobcylinderedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -32,7 +31,7 @@ class PMBlobCylinder;
class PMBlobCylinderEdit : public PMDetailObjectEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMDetailObjectEdit Base;
public:
diff --git a/kpovmodeler/pmblobedit.cpp b/kpovmodeler/pmblobedit.cpp
index 93ec707f..86231ed3 100644
--- a/kpovmodeler/pmblobedit.cpp
+++ b/kpovmodeler/pmblobedit.cpp
@@ -49,9 +49,9 @@ void PMBlobEdit::createTopWidgets( )
m_pHierarchy = new TQCheckBox( i18n( "Hierarchy" ), this );
topLayout( )->addWidget( m_pHierarchy );
- connect( m_pThreshold, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pHierarchy, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pSturm, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pThreshold, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pHierarchy, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pSturm, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) );
}
void PMBlobEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmblobedit.h b/kpovmodeler/pmblobedit.h
index f7a3e72c..b75319c4 100644
--- a/kpovmodeler/pmblobedit.h
+++ b/kpovmodeler/pmblobedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -35,7 +34,7 @@ class TQCheckBox;
*/
class PMBlobEdit : public PMSolidObjectEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMSolidObjectEdit Base;
public:
diff --git a/kpovmodeler/pmblobsphere.h b/kpovmodeler/pmblobsphere.h
index 0abe983e..59486152 100644
--- a/kpovmodeler/pmblobsphere.h
+++ b/kpovmodeler/pmblobsphere.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmblobsphereedit.cpp b/kpovmodeler/pmblobsphereedit.cpp
index 0d79d8ff..2cddef03 100644
--- a/kpovmodeler/pmblobsphereedit.cpp
+++ b/kpovmodeler/pmblobsphereedit.cpp
@@ -52,9 +52,9 @@ void PMBlobSphereEdit::createTopWidgets( )
gl->addWidget( m_pStrength, 1, 1 );
layout->addStretch( 1 );
- connect( m_pCentre, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pRadius, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pStrength, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pCentre, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pRadius, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pStrength, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
}
void PMBlobSphereEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmblobsphereedit.h b/kpovmodeler/pmblobsphereedit.h
index 86a58c85..7108e9b0 100644
--- a/kpovmodeler/pmblobsphereedit.h
+++ b/kpovmodeler/pmblobsphereedit.h
@@ -33,7 +33,7 @@ class PMFloatEdit ;
*/
class PMBlobSphereEdit : public PMDetailObjectEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMDetailObjectEdit Base;
public:
diff --git a/kpovmodeler/pmboundedby.h b/kpovmodeler/pmboundedby.h
index 7c88a6aa..ed9f7cc7 100644
--- a/kpovmodeler/pmboundedby.h
+++ b/kpovmodeler/pmboundedby.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmboundedbyedit.h b/kpovmodeler/pmboundedbyedit.h
index a7b5b406..90a969c4 100644
--- a/kpovmodeler/pmboundedbyedit.h
+++ b/kpovmodeler/pmboundedbyedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -34,7 +33,7 @@ class TQLabel;
*/
class PMBoundedByEdit : public PMDialogEditBase
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMDialogEditBase Base;
public:
diff --git a/kpovmodeler/pmbox.h b/kpovmodeler/pmbox.h
index e6abcf75..cb019280 100644
--- a/kpovmodeler/pmbox.h
+++ b/kpovmodeler/pmbox.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmboxedit.cpp b/kpovmodeler/pmboxedit.cpp
index 91c09f53..203f8e7a 100644
--- a/kpovmodeler/pmboxedit.cpp
+++ b/kpovmodeler/pmboxedit.cpp
@@ -43,8 +43,8 @@ void PMBoxEdit::createTopWidgets( )
gl->addWidget( new TQLabel( i18n( "Corner 2:" ), this ), 1, 0 );
gl->addWidget( m_pCorner2, 1, 1 );
- connect( m_pCorner1, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pCorner2, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pCorner1, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pCorner2, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
}
void PMBoxEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmboxedit.h b/kpovmodeler/pmboxedit.h
index 6c09849b..9491d168 100644
--- a/kpovmodeler/pmboxedit.h
+++ b/kpovmodeler/pmboxedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -34,7 +33,7 @@ class PMVectorEdit;
*/
class PMBoxEdit : public PMSolidObjectEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMSolidObjectEdit Base;
public:
diff --git a/kpovmodeler/pmbumpmap.h b/kpovmodeler/pmbumpmap.h
index ccdf5b98..f0a31f57 100644
--- a/kpovmodeler/pmbumpmap.h
+++ b/kpovmodeler/pmbumpmap.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmbumpmapedit.cpp b/kpovmodeler/pmbumpmapedit.cpp
index 6b0b81d5..fcf93c42 100644
--- a/kpovmodeler/pmbumpmapedit.cpp
+++ b/kpovmodeler/pmbumpmapedit.cpp
@@ -110,14 +110,14 @@ void PMBumpMapEdit::createTopWidgets( )
hl->addWidget( m_pBumpSizeEdit );
hl->addStretch( 1 );
- connect( m_pImageFileTypeEdit, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotImageFileTypeChanged( int ) ) );
- connect( m_pMapTypeEdit, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotMapTypeChanged( int ) ) );
- connect( m_pInterpolateTypeEdit, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotInterpolateTypeChanged( int ) ) );
- connect( m_pImageFileNameBrowse, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotImageFileBrowseClicked( ) ) );
- connect( m_pImageFileNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotImageFileNameChanged( const TQString& ) ) );
- connect( m_pOnceEdit, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pUseIndexEdit, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pBumpSizeEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pImageFileTypeEdit, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotImageFileTypeChanged( int ) ) );
+ connect( m_pMapTypeEdit, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotMapTypeChanged( int ) ) );
+ connect( m_pInterpolateTypeEdit, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotInterpolateTypeChanged( int ) ) );
+ connect( m_pImageFileNameBrowse, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotImageFileBrowseClicked( ) ) );
+ connect( m_pImageFileNameEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotImageFileNameChanged( const TQString& ) ) );
+ connect( m_pOnceEdit, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pUseIndexEdit, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pBumpSizeEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
}
void PMBumpMapEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmbumpmapedit.h b/kpovmodeler/pmbumpmapedit.h
index c68ec4f3..bc274ddf 100644
--- a/kpovmodeler/pmbumpmapedit.h
+++ b/kpovmodeler/pmbumpmapedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -44,7 +43,7 @@ class TQPushButton;
*/
class PMBumpMapEdit : public PMDialogEditBase
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMDialogEditBase Base;
public:
diff --git a/kpovmodeler/pmcamera.h b/kpovmodeler/pmcamera.h
index 7d385909..bbb0be36 100644
--- a/kpovmodeler/pmcamera.h
+++ b/kpovmodeler/pmcamera.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmcameraedit.cpp b/kpovmodeler/pmcameraedit.cpp
index 047d074e..9adceba0 100644
--- a/kpovmodeler/pmcameraedit.cpp
+++ b/kpovmodeler/pmcameraedit.cpp
@@ -141,29 +141,29 @@ void PMCameraEdit::createTopWidgets( )
m_pExport = new TQCheckBox( i18n( "Export to renderer" ), this );
topLayout( )->addWidget( m_pExport );
- connect( m_pLocation, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pDirection, TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotDirectionChanged( ) ) );
- connect( m_pRight, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pRight, TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotRightChanged( ) ) );
- connect( m_pUp, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pSky, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pLookAt, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pEnableAngle, TQT_SIGNAL( toggled( bool ) ),
- TQT_SLOT( slotAngleToggled( bool ) ) );
- connect( m_pAngle, TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotAngleChanged( ) ) );
- connect( m_pCameraType, TQT_SIGNAL( activated( int ) ),
- TQT_SLOT( slotCameraTypeActivated( int ) ) );
- connect( m_pCylinderType, TQT_SIGNAL( activated( int ) ),
- TQT_SLOT( slotCylinderTypeActivated( int ) ) );
-
- connect( m_pFocalBlur, TQT_SIGNAL( toggled( bool ) ),
- TQT_SLOT( slotFocalBlurToggled( bool ) ) );
- connect( m_pAperture, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pBlurSamples, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pFocalPoint, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pVariance, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pConfidence, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pExport, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pLocation, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pDirection, TQ_SIGNAL( dataChanged( ) ), TQ_SLOT( slotDirectionChanged( ) ) );
+ connect( m_pRight, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pRight, TQ_SIGNAL( dataChanged( ) ), TQ_SLOT( slotRightChanged( ) ) );
+ connect( m_pUp, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pSky, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pLookAt, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pEnableAngle, TQ_SIGNAL( toggled( bool ) ),
+ TQ_SLOT( slotAngleToggled( bool ) ) );
+ connect( m_pAngle, TQ_SIGNAL( dataChanged( ) ), TQ_SLOT( slotAngleChanged( ) ) );
+ connect( m_pCameraType, TQ_SIGNAL( activated( int ) ),
+ TQ_SLOT( slotCameraTypeActivated( int ) ) );
+ connect( m_pCylinderType, TQ_SIGNAL( activated( int ) ),
+ TQ_SLOT( slotCylinderTypeActivated( int ) ) );
+
+ connect( m_pFocalBlur, TQ_SIGNAL( toggled( bool ) ),
+ TQ_SLOT( slotFocalBlurToggled( bool ) ) );
+ connect( m_pAperture, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pBlurSamples, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pFocalPoint, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pVariance, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pConfidence, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pExport, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) );
}
void PMCameraEdit::displayObject( PMObject* o )
@@ -385,9 +385,9 @@ void PMCameraEdit::slotAngleChanged( )
if( ( m_pCameraType->currentItem( ) == 0 ) && m_pEnableAngle->isChecked( ) )
{
// Only change direction's value in perspective and with an enabled angle
- disconnect( m_pDirection, TQT_SIGNAL( dataChanged( ) ), 0, 0 );
+ disconnect( m_pDirection, TQ_SIGNAL( dataChanged( ) ), 0, 0 );
m_pDirection->setVector( 0.5 * m_pRight->vector( ) / tan( 2 * deg2Rad( m_pAngle->value( ) ) ) );
- connect( m_pDirection, TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotDirectionChanged( ) ) );
+ connect( m_pDirection, TQ_SIGNAL( dataChanged( ) ), TQ_SLOT( slotDirectionChanged( ) ) );
}
*/
emit dataChanged( );
diff --git a/kpovmodeler/pmcameraedit.h b/kpovmodeler/pmcameraedit.h
index 1cc794d1..6928062a 100644
--- a/kpovmodeler/pmcameraedit.h
+++ b/kpovmodeler/pmcameraedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -40,7 +39,7 @@ class TQCheckBox;
*/
class PMCameraEdit : public PMNamedObjectEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMNamedObjectEdit Base;
public:
diff --git a/kpovmodeler/pmclippedby.h b/kpovmodeler/pmclippedby.h
index 0e76e2cf..ce6a7440 100644
--- a/kpovmodeler/pmclippedby.h
+++ b/kpovmodeler/pmclippedby.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmclippedbyedit.h b/kpovmodeler/pmclippedbyedit.h
index ac9d8a4c..da85e720 100644
--- a/kpovmodeler/pmclippedbyedit.h
+++ b/kpovmodeler/pmclippedbyedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -34,7 +33,7 @@ class TQLabel;
*/
class PMClippedByEdit : public PMDialogEditBase
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMDialogEditBase Base;
public:
diff --git a/kpovmodeler/pmcolor.h b/kpovmodeler/pmcolor.h
index 61fd4c63..fec07729 100644
--- a/kpovmodeler/pmcolor.h
+++ b/kpovmodeler/pmcolor.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmcoloredit.cpp b/kpovmodeler/pmcoloredit.cpp
index 0a12dc23..9db543c7 100644
--- a/kpovmodeler/pmcoloredit.cpp
+++ b/kpovmodeler/pmcoloredit.cpp
@@ -63,16 +63,16 @@ PMColorEdit::PMColorEdit( bool filterAndTransmit, TQWidget* parent, const char*
l->addWidget( m_edits[4] );
}
- connect( m_edits[0], TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotEditChanged( ) ) );
- connect( m_edits[1], TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotEditChanged( ) ) );
- connect( m_edits[2], TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotEditChanged( ) ) );
+ connect( m_edits[0], TQ_SIGNAL( dataChanged( ) ), TQ_SLOT( slotEditChanged( ) ) );
+ connect( m_edits[1], TQ_SIGNAL( dataChanged( ) ), TQ_SLOT( slotEditChanged( ) ) );
+ connect( m_edits[2], TQ_SIGNAL( dataChanged( ) ), TQ_SLOT( slotEditChanged( ) ) );
if( filterAndTransmit )
{
- connect( m_edits[3], TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotEditChanged( ) ) );
- connect( m_edits[4], TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotEditChanged( ) ) );
+ connect( m_edits[3], TQ_SIGNAL( dataChanged( ) ), TQ_SLOT( slotEditChanged( ) ) );
+ connect( m_edits[4], TQ_SIGNAL( dataChanged( ) ), TQ_SLOT( slotEditChanged( ) ) );
}
- connect( m_pButton, TQT_SIGNAL( changed( const TQColor& ) ),
- TQT_SLOT( slotColorChanged( const TQColor& ) ) );
+ connect( m_pButton, TQ_SIGNAL( changed( const TQColor& ) ),
+ TQ_SLOT( slotColorChanged( const TQColor& ) ) );
}
void PMColorEdit::setColor( const PMColor& c )
diff --git a/kpovmodeler/pmcoloredit.h b/kpovmodeler/pmcoloredit.h
index 3c501be6..4f7fa8d5 100644
--- a/kpovmodeler/pmcoloredit.h
+++ b/kpovmodeler/pmcoloredit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -36,7 +35,7 @@ class TQColor;
*/
class PMColorEdit : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kpovmodeler/pmcolorsettings.h b/kpovmodeler/pmcolorsettings.h
index d3dbb902..43e8254d 100644
--- a/kpovmodeler/pmcolorsettings.h
+++ b/kpovmodeler/pmcolorsettings.h
@@ -31,7 +31,7 @@ class KColorButton;
*/
class PMColorSettings : public PMSettingsDialogPage
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kpovmodeler/pmcommand.h b/kpovmodeler/pmcommand.h
index 5d32b9d4..baf38edf 100644
--- a/kpovmodeler/pmcommand.h
+++ b/kpovmodeler/pmcommand.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmcommandmanager.h b/kpovmodeler/pmcommandmanager.h
index 841c3060..7f2cbdf2 100644
--- a/kpovmodeler/pmcommandmanager.h
+++ b/kpovmodeler/pmcommandmanager.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -38,7 +37,7 @@ class PMPart;
*/
class PMCommandManager : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kpovmodeler/pmcomment.h b/kpovmodeler/pmcomment.h
index d435423d..022c28f1 100644
--- a/kpovmodeler/pmcomment.h
+++ b/kpovmodeler/pmcomment.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmcommentedit.cpp b/kpovmodeler/pmcommentedit.cpp
index e57f9cea..d8b36525 100644
--- a/kpovmodeler/pmcommentedit.cpp
+++ b/kpovmodeler/pmcommentedit.cpp
@@ -39,7 +39,7 @@ void PMCommentEdit::createTopWidgets( )
m_pEdit->setFont( TDEGlobalSettings::fixedFont( ) );
topLayout( )->addWidget( m_pEdit, 2 );
- connect( m_pEdit, TQT_SIGNAL( textChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pEdit, TQ_SIGNAL( textChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
}
void PMCommentEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmcommentedit.h b/kpovmodeler/pmcommentedit.h
index 5230c495..f0849e04 100644
--- a/kpovmodeler/pmcommentedit.h
+++ b/kpovmodeler/pmcommentedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -34,7 +33,7 @@ class TQMultiLineEdit;
*/
class PMCommentEdit : public PMDialogEditBase
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMDialogEditBase Base;
public:
diff --git a/kpovmodeler/pmcompositeobject.h b/kpovmodeler/pmcompositeobject.h
index 350180db..2b7dd108 100644
--- a/kpovmodeler/pmcompositeobject.h
+++ b/kpovmodeler/pmcompositeobject.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmcone.h b/kpovmodeler/pmcone.h
index c41f9325..110d4995 100644
--- a/kpovmodeler/pmcone.h
+++ b/kpovmodeler/pmcone.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmconeedit.cpp b/kpovmodeler/pmconeedit.cpp
index c02b2d40..532bcc51 100644
--- a/kpovmodeler/pmconeedit.cpp
+++ b/kpovmodeler/pmconeedit.cpp
@@ -61,11 +61,11 @@ void PMConeEdit::createTopWidgets( )
topLayout( )->addWidget( m_pOpen );
- connect( m_pEnd1, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pEnd2, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pRadius1, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pRadius2, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pOpen, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pEnd1, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pEnd2, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pRadius1, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pRadius2, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pOpen, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) );
}
void PMConeEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmconeedit.h b/kpovmodeler/pmconeedit.h
index 2ec979ff..5b4d09b5 100644
--- a/kpovmodeler/pmconeedit.h
+++ b/kpovmodeler/pmconeedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -34,7 +33,7 @@ class PMCone;
class PMConeEdit : public PMSolidObjectEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMSolidObjectEdit Base;
public:
diff --git a/kpovmodeler/pmcontrolpoint.h b/kpovmodeler/pmcontrolpoint.h
index a891bb9c..d21c654f 100644
--- a/kpovmodeler/pmcontrolpoint.h
+++ b/kpovmodeler/pmcontrolpoint.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmcsg.h b/kpovmodeler/pmcsg.h
index 380bf0ef..0b07c98d 100644
--- a/kpovmodeler/pmcsg.h
+++ b/kpovmodeler/pmcsg.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmcsgedit.cpp b/kpovmodeler/pmcsgedit.cpp
index cf7757b2..f14e52c3 100644
--- a/kpovmodeler/pmcsgedit.cpp
+++ b/kpovmodeler/pmcsgedit.cpp
@@ -46,7 +46,7 @@ void PMCSGEdit::createTopWidgets( )
layout->addWidget( m_pTypeCombo );
layout->addStretch( 1 );
- connect( m_pTypeCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotTypeSelected( int ) ) );
+ connect( m_pTypeCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotTypeSelected( int ) ) );
}
void PMCSGEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmcsgedit.h b/kpovmodeler/pmcsgedit.h
index bd8b315a..0cf700fc 100644
--- a/kpovmodeler/pmcsgedit.h
+++ b/kpovmodeler/pmcsgedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -34,7 +33,7 @@ class TQComboBox;
*/
class PMCSGEdit : public PMSolidObjectEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMSolidObjectEdit Base;
public:
diff --git a/kpovmodeler/pmcylinder.h b/kpovmodeler/pmcylinder.h
index 1bd10901..f12b6e9b 100644
--- a/kpovmodeler/pmcylinder.h
+++ b/kpovmodeler/pmcylinder.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmcylinderedit.cpp b/kpovmodeler/pmcylinderedit.cpp
index 63be4505..cab7ee87 100644
--- a/kpovmodeler/pmcylinderedit.cpp
+++ b/kpovmodeler/pmcylinderedit.cpp
@@ -58,10 +58,10 @@ void PMCylinderEdit::createTopWidgets( )
layout = new TQHBoxLayout( topLayout( ) );
layout->addWidget( m_pOpen );
- connect( m_pEnd1, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pEnd2, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pRadius, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pOpen, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pEnd1, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pEnd2, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pRadius, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pOpen, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) );
}
void PMCylinderEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmcylinderedit.h b/kpovmodeler/pmcylinderedit.h
index 10d9a758..62585782 100644
--- a/kpovmodeler/pmcylinderedit.h
+++ b/kpovmodeler/pmcylinderedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -33,7 +32,7 @@ class TQCheckBox;
class PMCylinderEdit : public PMSolidObjectEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMSolidObjectEdit Base;
public:
diff --git a/kpovmodeler/pmdatachangecommand.h b/kpovmodeler/pmdatachangecommand.h
index 878e0f4f..fc7df5a9 100644
--- a/kpovmodeler/pmdatachangecommand.h
+++ b/kpovmodeler/pmdatachangecommand.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmdebug.h b/kpovmodeler/pmdebug.h
index 692bcd60..5bf84b18 100644
--- a/kpovmodeler/pmdebug.h
+++ b/kpovmodeler/pmdebug.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmdeclare.h b/kpovmodeler/pmdeclare.h
index 89468bf4..b29fd844 100644
--- a/kpovmodeler/pmdeclare.h
+++ b/kpovmodeler/pmdeclare.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmdeclareedit.cpp b/kpovmodeler/pmdeclareedit.cpp
index e0b3bab5..fedaef2f 100644
--- a/kpovmodeler/pmdeclareedit.cpp
+++ b/kpovmodeler/pmdeclareedit.cpp
@@ -52,8 +52,8 @@ void PMDeclareEdit::createTopWidgets( )
layout->addWidget( label );
layout->addWidget( m_pNameEdit );
- connect( m_pNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( slotNameChanged( const TQString& ) ) );
+ connect( m_pNameEdit, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( slotNameChanged( const TQString& ) ) );
}
void PMDeclareEdit::createBottomWidgets( )
@@ -63,15 +63,15 @@ void PMDeclareEdit::createBottomWidgets( )
m_pLinkedObjects = new TQListBox( this );
m_pLinkedObjects->setMinimumHeight( 100 );
- connect( m_pLinkedObjects, TQT_SIGNAL( highlighted( TQListBoxItem* ) ),
- TQT_SLOT( slotItemSelected( TQListBoxItem* ) ) );
+ connect( m_pLinkedObjects, TQ_SIGNAL( highlighted( TQListBoxItem* ) ),
+ TQ_SLOT( slotItemSelected( TQListBoxItem* ) ) );
topLayout( )->addWidget( m_pLinkedObjects, 1 );
TQHBoxLayout* layout = new TQHBoxLayout( topLayout( ) );
m_pSelectButton = new TQPushButton( i18n( "Select..." ), this );
m_pSelectButton->setEnabled( false );
- connect( m_pSelectButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotSelect( ) ) );
+ connect( m_pSelectButton, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotSelect( ) ) );
layout->addStretch( );
layout->addWidget( m_pSelectButton );
@@ -201,6 +201,6 @@ void PMDeclareEdit::slotItemSelected( TQListBoxItem* item )
void PMDeclareEdit::slotSelect( )
{
if( m_pSelectedObject )
- part( )->slotObjectChanged( m_pSelectedObject, PMCNewSelection, TQT_TQOBJECT(this) );
+ part( )->slotObjectChanged( m_pSelectedObject, PMCNewSelection, this );
}
#include "pmdeclareedit.moc"
diff --git a/kpovmodeler/pmdeclareedit.h b/kpovmodeler/pmdeclareedit.h
index 70f18c39..5d4326e0 100644
--- a/kpovmodeler/pmdeclareedit.h
+++ b/kpovmodeler/pmdeclareedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -37,7 +36,7 @@ class TQListBoxItem;
*/
class PMDeclareEdit : public PMDialogEditBase
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMDialogEditBase Base;
public:
diff --git a/kpovmodeler/pmdeletecommand.h b/kpovmodeler/pmdeletecommand.h
index d11cf348..ef042a9a 100644
--- a/kpovmodeler/pmdeletecommand.h
+++ b/kpovmodeler/pmdeletecommand.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmdensity.h b/kpovmodeler/pmdensity.h
index b1502fe2..dea51201 100644
--- a/kpovmodeler/pmdensity.h
+++ b/kpovmodeler/pmdensity.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmdensityedit.h b/kpovmodeler/pmdensityedit.h
index 561497d1..003b74f7 100644
--- a/kpovmodeler/pmdensityedit.h
+++ b/kpovmodeler/pmdensityedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -33,7 +32,7 @@ class PMDensity;
*/
class PMDensityEdit : public PMTextureBaseEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMTextureBaseEdit Base;
public:
diff --git a/kpovmodeler/pmdetailobject.h b/kpovmodeler/pmdetailobject.h
index 846ef8c0..122441e9 100644
--- a/kpovmodeler/pmdetailobject.h
+++ b/kpovmodeler/pmdetailobject.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmdetailobjectedit.cpp b/kpovmodeler/pmdetailobjectedit.cpp
index c2c1fdeb..01737f62 100644
--- a/kpovmodeler/pmdetailobjectedit.cpp
+++ b/kpovmodeler/pmdetailobjectedit.cpp
@@ -48,8 +48,8 @@ void PMDetailObjectEdit::createTopWidgets( )
layout->addWidget( m_pLocalDetailLevel );
layout->addStretch( );
- connect( m_pGlobalDetail, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotGlobalDetailClicked( ) ) );
- connect( m_pLocalDetailLevel, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pGlobalDetail, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotGlobalDetailClicked( ) ) );
+ connect( m_pLocalDetailLevel, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( dataChanged( ) ) );
}
void PMDetailObjectEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmdetailobjectedit.h b/kpovmodeler/pmdetailobjectedit.h
index d7410cf3..5f2568f5 100644
--- a/kpovmodeler/pmdetailobjectedit.h
+++ b/kpovmodeler/pmdetailobjectedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -34,7 +33,7 @@ class TQComboBox;
*/
class PMDetailObjectEdit : public PMNamedObjectEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMNamedObjectEdit Base;
public:
diff --git a/kpovmodeler/pmdialogeditbase.cpp b/kpovmodeler/pmdialogeditbase.cpp
index 45b5c828..75a95e82 100644
--- a/kpovmodeler/pmdialogeditbase.cpp
+++ b/kpovmodeler/pmdialogeditbase.cpp
@@ -178,28 +178,28 @@ void PMDialogEditBase::displayObject( PMObject* o )
vl->addWidget( m_pRenderFrame );
m_pRenderWidget = new PMPovrayRenderWidget( m_pRenderFrame );
- connect( m_pRenderWidget, TQT_SIGNAL( finished( int ) ),
- TQT_SLOT( slotPreviewFinished( int ) ) );
+ connect( m_pRenderWidget, TQ_SIGNAL( finished( int ) ),
+ TQ_SLOT( slotPreviewFinished( int ) ) );
m_pPreviewLocalBox = new TQCheckBox( i18n( "local" ), m_pTexturePreviewWidget );
m_pPreviewLocalBox->setChecked( s_previewLocal );
- connect( m_pPreviewLocalBox, TQT_SIGNAL( toggled( bool ) ),
- TQT_SLOT( slotPreviewLocal( bool ) ) );
+ connect( m_pPreviewLocalBox, TQ_SIGNAL( toggled( bool ) ),
+ TQ_SLOT( slotPreviewLocal( bool ) ) );
vl->addWidget( m_pPreviewLocalBox );
TQHBoxLayout* hl = new TQHBoxLayout( vl );
m_pPreviewButton = new TQPushButton( i18n( "&Preview" ), m_pTexturePreviewWidget );
hl->addWidget( m_pPreviewButton );
- connect( m_pPreviewButton, TQT_SIGNAL( clicked( ) ),
- TQT_SLOT( slotTexturePreview( ) ) );
+ connect( m_pPreviewButton, TQ_SIGNAL( clicked( ) ),
+ TQ_SLOT( slotTexturePreview( ) ) );
m_pOutputButton = new TQPushButton( i18n( "Povray Output" ), m_pTexturePreviewWidget );
hl->addWidget( m_pOutputButton );
- connect( m_pOutputButton, TQT_SIGNAL( clicked( ) ),
- TQT_SLOT( slotPovrayOutput( ) ) );
+ connect( m_pOutputButton, TQ_SIGNAL( clicked( ) ),
+ TQ_SLOT( slotPovrayOutput( ) ) );
hl->addStretch( 1 );
m_pOutputWidget = new PMPovrayOutputWidget( );
- connect( m_pRenderWidget, TQT_SIGNAL( povrayMessage( const TQString& ) ),
- m_pOutputWidget, TQT_SLOT( slotText( const TQString& ) ) );
+ connect( m_pRenderWidget, TQ_SIGNAL( povrayMessage( const TQString& ) ),
+ m_pOutputWidget, TQ_SLOT( slotText( const TQString& ) ) );
}
m_pTexturePreviewWidget->show( );
@@ -390,7 +390,7 @@ void PMDialogEditBase::slotTexturePreview( )
buffer.open( IO_WriteOnly );
TQTextStream str( &buffer );
PMPovray31Format format;
- PMSerializer* dev = format.newSerializer( TQT_TQIODEVICE(&buffer) );
+ PMSerializer* dev = format.newSerializer( &buffer );
PMRenderMode mode;
PMObjectList neededDeclares, objectsToCheck;
TQPtrDict<PMObject> objectsToSerialize( 101 );
diff --git a/kpovmodeler/pmdialogeditbase.h b/kpovmodeler/pmdialogeditbase.h
index e7835740..33dbf307 100644
--- a/kpovmodeler/pmdialogeditbase.h
+++ b/kpovmodeler/pmdialogeditbase.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -53,7 +52,7 @@ class PMPovrayOutputWidget;
*/
class PMDialogEditBase : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kpovmodeler/pmdialogview.cpp b/kpovmodeler/pmdialogview.cpp
index ef106343..88a5c603 100644
--- a/kpovmodeler/pmdialogview.cpp
+++ b/kpovmodeler/pmdialogview.cpp
@@ -136,31 +136,31 @@ PMDialogView::PMDialogView( PMPart* part, TQWidget* parent, const char* name )
TQHBoxLayout* buttonLayout = new TQHBoxLayout( m_pLayout );
m_pHelpButton = new KPushButton( KStdGuiItem::help(), this );
buttonLayout->addWidget( m_pHelpButton );
- connect( m_pHelpButton, TQT_SIGNAL( clicked( ) ), this, TQT_SLOT( slotHelp( ) ) );
+ connect( m_pHelpButton, TQ_SIGNAL( clicked( ) ), this, TQ_SLOT( slotHelp( ) ) );
m_pHelpButton->setEnabled( false );
m_pApplyButton = new KPushButton( KStdGuiItem::apply(), this );
buttonLayout->addWidget( m_pApplyButton );
- connect( m_pApplyButton, TQT_SIGNAL( clicked( ) ), this, TQT_SLOT( slotApply( ) ) );
+ connect( m_pApplyButton, TQ_SIGNAL( clicked( ) ), this, TQ_SLOT( slotApply( ) ) );
m_pApplyButton->setEnabled( false );
buttonLayout->addStretch( );
m_pCancelButton = new KPushButton( KStdGuiItem::cancel(), this );
buttonLayout->addWidget( m_pCancelButton );
- connect( m_pCancelButton, TQT_SIGNAL( clicked( ) ), this, TQT_SLOT( slotCancel( ) ) );
+ connect( m_pCancelButton, TQ_SIGNAL( clicked( ) ), this, TQ_SLOT( slotCancel( ) ) );
m_pCancelButton->setEnabled( false );
m_pLayout->activate( );
- connect( part, TQT_SIGNAL( refresh( ) ), TQT_SLOT( slotRefresh( ) ) );
- connect( part, TQT_SIGNAL( objectChanged( PMObject*, const int, TQObject* ) ),
- TQT_SLOT( slotObjectChanged( PMObject*, const int, TQObject* ) ) );
- connect( part, TQT_SIGNAL( clear( ) ), TQT_SLOT( slotClear( ) ) );
- connect( part, TQT_SIGNAL( aboutToRender( ) ), TQT_SLOT( slotAboutToRender( ) ) );
- connect( part, TQT_SIGNAL( aboutToSave( ) ), TQT_SLOT( slotAboutToRender( ) ) );
- connect( this, TQT_SIGNAL( objectChanged( PMObject*, const int, TQObject* ) ),
- part, TQT_SLOT( slotObjectChanged( PMObject*, const int, TQObject* ) ) );
+ connect( part, TQ_SIGNAL( refresh( ) ), TQ_SLOT( slotRefresh( ) ) );
+ connect( part, TQ_SIGNAL( objectChanged( PMObject*, const int, TQObject* ) ),
+ TQ_SLOT( slotObjectChanged( PMObject*, const int, TQObject* ) ) );
+ connect( part, TQ_SIGNAL( clear( ) ), TQ_SLOT( slotClear( ) ) );
+ connect( part, TQ_SIGNAL( aboutToRender( ) ), TQ_SLOT( slotAboutToRender( ) ) );
+ connect( part, TQ_SIGNAL( aboutToSave( ) ), TQ_SLOT( slotAboutToRender( ) ) );
+ connect( this, TQ_SIGNAL( objectChanged( PMObject*, const int, TQObject* ) ),
+ part, TQ_SLOT( slotObjectChanged( PMObject*, const int, TQObject* ) ) );
displayObject( m_pPart->activeObject( ) );
}
@@ -174,7 +174,7 @@ PMDialogView::~PMDialogView( )
void PMDialogView::slotObjectChanged( PMObject* obj, const int mode, TQObject* sender )
{
- if( TQT_BASE_OBJECT(sender) == TQT_BASE_OBJECT(this) )
+ if( sender == this )
return;
if( mode & PMCNewSelection )
{
@@ -325,7 +325,7 @@ void PMDialogView::slotControlPointSelectionChanged( )
{
if( m_pDisplayedWidget && m_pDisplayedWidget->displayedObject( ) )
emit objectChanged( m_pDisplayedWidget->displayedObject( ),
- PMCControlPointSelection, TQT_TQOBJECT(this) );
+ PMCControlPointSelection, this );
}
void PMDialogView::displayObject( PMObject* obj, bool updateDescription )
@@ -371,15 +371,15 @@ void PMDialogView::displayObject( PMObject* obj, bool updateDescription )
if( m_pDisplayedWidget )
{
- connect( m_pDisplayedWidget, TQT_SIGNAL( dataChanged( ) ),
- this, TQT_SLOT( slotDataChanged( ) ) );
- connect( m_pDisplayedWidget, TQT_SIGNAL( sizeChanged( ) ),
- this, TQT_SLOT( slotSizeChanged( ) ) );
- connect( m_pDisplayedWidget, TQT_SIGNAL( aboutToRender( ) ),
- this, TQT_SLOT( slotAboutToRender( ) ) );
+ connect( m_pDisplayedWidget, TQ_SIGNAL( dataChanged( ) ),
+ this, TQ_SLOT( slotDataChanged( ) ) );
+ connect( m_pDisplayedWidget, TQ_SIGNAL( sizeChanged( ) ),
+ this, TQ_SLOT( slotSizeChanged( ) ) );
+ connect( m_pDisplayedWidget, TQ_SIGNAL( aboutToRender( ) ),
+ this, TQ_SLOT( slotAboutToRender( ) ) );
connect( m_pDisplayedWidget,
- TQT_SIGNAL( controlPointSelectionChanged( ) ),
- TQT_SLOT( slotControlPointSelectionChanged( ) ) );
+ TQ_SIGNAL( controlPointSelectionChanged( ) ),
+ TQ_SLOT( slotControlPointSelectionChanged( ) ) );
}
}
diff --git a/kpovmodeler/pmdialogview.h b/kpovmodeler/pmdialogview.h
index baeaca94..8e7331f9 100644
--- a/kpovmodeler/pmdialogview.h
+++ b/kpovmodeler/pmdialogview.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -42,7 +41,7 @@ class TQLabel;
*/
class PMDialogEditContent : public TQScrollView
{
- Q_OBJECT
+ TQ_OBJECT
public:
PMDialogEditContent( TQWidget* parent, const char* name = 0 );
@@ -63,7 +62,7 @@ private:
*/
class PMDialogView : public PMViewBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kpovmodeler/pmdisc.h b/kpovmodeler/pmdisc.h
index 62201bcf..909bbeb9 100644
--- a/kpovmodeler/pmdisc.h
+++ b/kpovmodeler/pmdisc.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmdiscedit.cpp b/kpovmodeler/pmdiscedit.cpp
index b41d8106..7f441477 100644
--- a/kpovmodeler/pmdiscedit.cpp
+++ b/kpovmodeler/pmdiscedit.cpp
@@ -66,11 +66,11 @@ void PMDiscEdit::createTopWidgets( )
layout->addWidget( nb );
layout->addStretch( 1 );
- connect( m_pCenter, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pNormal, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pRadius, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pHRadius, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( nb, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotNormalize( ) ) );
+ connect( m_pCenter, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pNormal, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pRadius, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pHRadius, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( nb, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotNormalize( ) ) );
}
void PMDiscEdit::slotNormalize( )
diff --git a/kpovmodeler/pmdiscedit.h b/kpovmodeler/pmdiscedit.h
index b4227bd1..7cb71f54 100644
--- a/kpovmodeler/pmdiscedit.h
+++ b/kpovmodeler/pmdiscedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -32,7 +31,7 @@ class PMDisc;
class PMDiscEdit : public PMGraphicalObjectEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMGraphicalObjectEdit Base;
public:
diff --git a/kpovmodeler/pmdistancecontrolpoint.h b/kpovmodeler/pmdistancecontrolpoint.h
index afc39fbd..f1dae25f 100644
--- a/kpovmodeler/pmdistancecontrolpoint.h
+++ b/kpovmodeler/pmdistancecontrolpoint.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmdockwidget.cpp b/kpovmodeler/pmdockwidget.cpp
index 7c0775ef..2f93ffbe 100644
--- a/kpovmodeler/pmdockwidget.cpp
+++ b/kpovmodeler/pmdockwidget.cpp
@@ -142,7 +142,7 @@ PMDockMainWindow::PMDockMainWindow( TQWidget* parent, const char *name, WFlags f
mainDockWidget = 0L;
d = new PMDockMainWindowPrivate( );
- PartBase::setPartObject( TQT_TQOBJECT(this) );
+ PartBase::setPartObject( this );
}
PMDockMainWindow::~PMDockMainWindow()
@@ -171,15 +171,15 @@ void PMDockMainWindow::createGUI( Part * part )
factory->removeClient( d->m_activePart );
- disconnect( d->m_activePart, TQT_SIGNAL( setWindowCaption( const TQString & ) ),
- this, TQT_SLOT( setCaption( const TQString & ) ) );
- disconnect( d->m_activePart, TQT_SIGNAL( setStatusBarText( const TQString & ) ),
- this, TQT_SLOT( slotSetStatusBarText( const TQString & ) ) );
+ disconnect( d->m_activePart, TQ_SIGNAL( setWindowCaption( const TQString & ) ),
+ this, TQ_SLOT( setCaption( const TQString & ) ) );
+ disconnect( d->m_activePart, TQ_SIGNAL( setStatusBarText( const TQString & ) ),
+ this, TQ_SLOT( slotSetStatusBarText( const TQString & ) ) );
}
if( !d->m_bShellGUIActivated )
{
- loadPlugins( TQT_TQOBJECT(this), this, TDEGlobal::instance() );
+ loadPlugins( this, this, TDEGlobal::instance() );
createShellGUI();
d->m_bShellGUIActivated = true;
}
@@ -187,10 +187,10 @@ void PMDockMainWindow::createGUI( Part * part )
if ( part )
{
// do this before sending the activate event
- connect( part, TQT_SIGNAL( setWindowCaption( const TQString & ) ),
- this, TQT_SLOT( setCaption( const TQString & ) ) );
- connect( part, TQT_SIGNAL( setStatusBarText( const TQString & ) ),
- this, TQT_SLOT( slotSetStatusBarText( const TQString & ) ) );
+ connect( part, TQ_SIGNAL( setWindowCaption( const TQString & ) ),
+ this, TQ_SLOT( setCaption( const TQString & ) ) );
+ connect( part, TQ_SIGNAL( setStatusBarText( const TQString & ) ),
+ this, TQ_SLOT( slotSetStatusBarText( const TQString & ) ) );
factory->addClient( part );
@@ -256,7 +256,7 @@ void PMDockMainWindow::setMainDockWidget( PMDockWidget* mdw )
void PMDockMainWindow::setView( TQWidget *view )
{
if ( view->isA("PMDockWidget") ){
- if ( TQT_BASE_OBJECT(view->parent()) != TQT_BASE_OBJECT(this) ) ((PMDockWidget*)view)->applyToWidget( this );
+ if ( view->parent() != this ) ((PMDockWidget*)view)->applyToWidget( this );
}
#ifndef NO_KDE2
@@ -337,7 +337,7 @@ void PMDockWidgetHeaderDrag::paintEvent( TQPaintEvent* )
paint.begin( this );
- style().tqdrawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup());
+ style().drawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup());
paint.end();
}
@@ -359,24 +359,24 @@ PMDockWidgetHeader::PMDockWidgetHeader( PMDockWidget* parent, const char* name )
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, TQ_SIGNAL(clicked()), parent, TQ_SIGNAL(headerCloseButtonClicked()));
// MODIFICATION (zehender)
// The shell will delete the widget
// undock is unnecessary
- // connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(undock()));
+ // connect( closeButton, TQ_SIGNAL(clicked()), parent, TQ_SLOT(undock()));
stayButton = new PMDockButton_Private( this, "DockStayButton" );
stayButton->setToggleButton( true );
stayButton->setPixmap( const_cast< const char** >(not_close_xpm) );
stayButton->setFixedSize(buttonWidth,buttonHeight);
- connect( stayButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStayClicked()));
+ connect( stayButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStayClicked()));
stayButton->hide( );
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, TQ_SIGNAL(clicked()), parent, TQ_SIGNAL(headerDockbackButtonClicked()));
+ connect( dockbackButton, TQ_SIGNAL(clicked()), parent, TQ_SLOT(dockBack()));
// MODIFICATION (zehender)
// Add a button to undock the widget and dock it as top level
@@ -384,7 +384,7 @@ 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, TQ_SIGNAL(clicked()), parent, TQ_SLOT(toDesktop()));
layout->addWidget( drag );
layout->addWidget( dockbackButton );
@@ -485,7 +485,7 @@ PMDockWidget::PMDockWidget( PMDockManager* dockManager, const char* name, const
layout->setResizeMode( TQLayout::Minimum );
manager = dockManager;
- manager->childDock->append( TQT_TQOBJECT(this) );
+ manager->childDock->append( this );
installEventFilter( manager );
header = 0L;
@@ -509,7 +509,7 @@ PMDockWidget::PMDockWidget( PMDockManager* dockManager, const char* name, const
setIcon( pixmap);
widget = 0L;
- TQObject::connect(this, TQT_SIGNAL(hasUndocked()), manager->main, TQT_SLOT(slotDockWidgetUndocked()) );
+ TQObject::connect(this, TQ_SIGNAL(hasUndocked()), manager->main, TQ_SLOT(slotDockWidgetUndocked()) );
applyToWidget( parent, TQPoint(0,0) );
}
@@ -527,7 +527,7 @@ PMDockWidget::~PMDockWidget()
d->blockHasUndockedSignal = false;
}
emit iMBeingClosed();
- manager->childDock->remove( TQT_TQOBJECT(this) );
+ manager->childDock->remove( this );
delete pix;
delete d; // destroy private data
}
@@ -559,7 +559,7 @@ void PMDockWidget::setEnableDocking( int pos )
void PMDockWidget::updateHeader()
{
if ( parent() ){
- if ( (TQT_BASE_OBJECT(parent()) == TQT_BASE_OBJECT(manager->main)) || isGroup || (eDocking == PMDockWidget::DockNone) ){
+ if ( (parent() == 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 ( TQT_BASE_OBJECT(parent()) != TQT_BASE_OBJECT(s) )
+ if ( parent() != s )
{
hide();
reparent(s, 0, TQPoint(0,0), false);
@@ -798,7 +798,7 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP
if( pw->inherits( "PMDockSplitter" ) )
{
PMDockSplitter* ds = ( PMDockSplitter* ) pw;
- if( ds->splitterOrientation( ) ==Qt::Vertical )
+ if( ds->splitterOrientation( ) ==TQt::Vertical )
found = true;
}
}
@@ -837,8 +837,8 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP
if( target->formerBrotherDockWidget != 0L) {
newDock->formerBrotherDockWidget = target->formerBrotherDockWidget;
if( formerBrotherDockWidget != 0L)
- TQObject::connect( newDock->formerBrotherDockWidget, TQT_SIGNAL(iMBeingClosed()),
- newDock, TQT_SLOT(loseFormerBrotherDockWidget()) );
+ TQObject::connect( newDock->formerBrotherDockWidget, TQ_SIGNAL(iMBeingClosed()),
+ newDock, TQ_SLOT(loseFormerBrotherDockWidget()) );
target->loseFormerBrotherDockWidget();
}
newDock->formerDockPos = target->formerDockPos;
@@ -846,7 +846,7 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP
if ( dockPos == PMDockWidget::DockCenter )
{
PMDockTabGroup* tab = new PMDockTabGroup( newDock, "_dock_tab");
- TQObject::connect(tab, TQT_SIGNAL(currentChanged(TQWidget*)), d, TQT_SLOT(slotFocusEmbeddedWidget(TQWidget*)));
+ TQObject::connect(tab, TQ_SIGNAL(currentChanged(TQWidget*)), d, TQ_SLOT(slotFocusEmbeddedWidget(TQWidget*)));
newDock->setWidget( tab );
target->applyToWidget( tab );
@@ -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_",Qt::Horizontal, spliPos, manager->splitterHighResolution() );
- if ( dockPos == PMDockWidget::DockLeft || dockPos == PMDockWidget::DockRight ) panner = new PMDockSplitter( newDock, "_dock_split_",Qt::Vertical , spliPos, manager->splitterHighResolution() );
+ if ( dockPos == PMDockWidget::DockTop || dockPos == PMDockWidget::DockBottom ) panner = new PMDockSplitter( newDock, "_dock_split_",TQt::Horizontal, spliPos, manager->splitterHighResolution() );
+ if ( dockPos == PMDockWidget::DockLeft || dockPos == PMDockWidget::DockRight ) panner = new PMDockSplitter( newDock, "_dock_split_",TQt::Vertical , spliPos, manager->splitterHighResolution() );
newDock->setWidget( panner );
panner->setOpaqueResize(manager->splitterOpaqueResize());
panner->setKeepSize(manager->splitterKeepSize());
- panner->setFocusPolicy( TQ_NoFocus );
+ panner->setFocusPolicy( TQWidget::NoFocus );
target->applyToWidget( panner );
applyToWidget( panner );
target->formerDockPos = target->currentDockPos;
@@ -969,8 +969,8 @@ void PMDockWidget::undock()
d->index = parentTab->indexOf( this); // memorize the page position in the tab widget
parentTab->removePage( this );
formerBrotherDockWidget = (PMDockWidget*)parentTab->page(0);
- TQObject::connect( formerBrotherDockWidget, TQT_SIGNAL(iMBeingClosed()),
- this, TQT_SLOT(loseFormerBrotherDockWidget()) );
+ TQObject::connect( formerBrotherDockWidget, TQ_SIGNAL(iMBeingClosed()),
+ this, TQ_SLOT(loseFormerBrotherDockWidget()) );
applyToWidget( 0L );
if ( parentTab->count() == 1 ){
@@ -994,13 +994,13 @@ void PMDockWidget::undock()
split->deactivate();
if ( split->getFirst() == parentOfTab ){
split->activate( lastTab );
- if ( ((PMDockWidget*)split->parent())->splitterOrientation ==Qt::Vertical )
+ if ( ((PMDockWidget*)split->parent())->splitterOrientation ==TQt::Vertical )
emit ((PMDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, PMDockWidget::DockLeft );
else
emit ((PMDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, PMDockWidget::DockTop );
} else {
split->activate( 0L, lastTab );
- if ( ((PMDockWidget*)split->parent())->splitterOrientation ==Qt::Vertical )
+ if ( ((PMDockWidget*)split->parent())->splitterOrientation ==TQt::Vertical )
emit ((PMDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, PMDockWidget::DockRight );
else
emit ((PMDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, PMDockWidget::DockBottom );
@@ -1034,8 +1034,8 @@ void PMDockWidget::undock()
group->hide();
if( formerBrotherDockWidget != 0L)
- TQObject::connect( formerBrotherDockWidget, TQT_SIGNAL(iMBeingClosed()),
- this, TQT_SLOT(loseFormerBrotherDockWidget()) );
+ TQObject::connect( formerBrotherDockWidget, TQ_SIGNAL(iMBeingClosed()),
+ this, TQ_SLOT(loseFormerBrotherDockWidget()) );
if ( !group->parentWidget() ){
secondWidget->applyToWidget( 0L, group->frameGeometry().topLeft() );
@@ -1081,7 +1081,7 @@ void PMDockWidget::setWidget( TQWidget* mw )
{
if ( !mw ) return;
- if ( TQT_BASE_OBJECT(mw->parent()) != TQT_BASE_OBJECT(this) ){
+ if ( mw->parent() != this ){
mw->reparent(this, 0, TQPoint(0,0), false);
}
@@ -1118,13 +1118,13 @@ void PMDockWidget::setDockTabName( PMDockTabGroup* tab )
bool PMDockWidget::mayBeHide() const
{
- bool f = (TQT_BASE_OBJECT(parent()) != TQT_BASE_OBJECT(manager->main));
+ bool f = (parent() != manager->main);
return ( !isGroup && !isTabGroup && f && isVisible() && ( eDocking != (int)PMDockWidget::DockNone ) );
}
bool PMDockWidget::mayBeShow() const
{
- bool f = (TQT_BASE_OBJECT(parent()) != TQT_BASE_OBJECT(manager->main));
+ bool f = (parent() != manager->main);
return ( !isGroup && !isTabGroup && f && !isVisible() );
}
@@ -1165,8 +1165,8 @@ void PMDockWidget::makeDockVisible()
void PMDockWidget::loseFormerBrotherDockWidget()
{
if( formerBrotherDockWidget != 0L)
- TQObject::disconnect( formerBrotherDockWidget, TQT_SIGNAL(iMBeingClosed()),
- this, TQT_SLOT(loseFormerBrotherDockWidget()) );
+ TQObject::disconnect( formerBrotherDockWidget, TQ_SIGNAL(iMBeingClosed()),
+ this, TQ_SLOT(loseFormerBrotherDockWidget()) );
formerBrotherDockWidget = 0L;
repaint();
}
@@ -1276,8 +1276,8 @@ PMDockManager::PMDockManager( TQWidget* mainWindow , const char* name )
menu = new TQPopupMenu();
#endif
- connect( menu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotMenuPopup()) );
- connect( menu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotMenuActivated(int)) );
+ connect( menu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotMenuPopup()) );
+ connect( menu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotMenuActivated(int)) );
childDock = new TQObjectList();
childDock->setAutoDelete( false );
@@ -1310,7 +1310,7 @@ void PMDockManager::activate()
obj->show();
}
}
- if ( !main->inherits(TQDIALOG_OBJECT_NAME_STRING) ) main->show();
+ if ( !main->inherits("TQDialog") ) main->show();
}
bool PMDockManager::eventFilter( TQObject *obj, TQEvent *event )
@@ -1343,7 +1343,7 @@ bool PMDockManager::eventFilter( TQObject *obj, TQEvent *event )
else curdw->toDesktop( );
break;
case TQEvent::MouseButtonPress:
- if ( ((TQMouseEvent*)event)->button() == Qt::LeftButton ){
+ if ( ((TQMouseEvent*)event)->button() == TQt::LeftButton ){
if ( curdw->eDocking != (int)PMDockWidget::DockNone ){
dropCancel = true;
curdw->setFocus();
@@ -1367,7 +1367,7 @@ bool PMDockManager::eventFilter( TQObject *obj, TQEvent *event )
}
break;
case TQEvent::MouseButtonRelease:
- if ( ((TQMouseEvent*)event)->button() == Qt::LeftButton ){
+ if ( ((TQMouseEvent*)event)->button() == TQt::LeftButton ){
if ( draging ){
if ( !dropCancel )
drop();
@@ -1426,7 +1426,7 @@ bool PMDockManager::eventFilter( TQObject *obj, TQEvent *event )
if (d->readyToDrag) {
d->readyToDrag = false;
}
- if ( (((TQMouseEvent*)event)->state() == Qt::LeftButton) &&
+ if ( (((TQMouseEvent*)event)->state() == TQt::LeftButton) &&
(curdw->eDocking != (int)PMDockWidget::DockNone) ) {
startDrag( curdw);
}
@@ -1464,8 +1464,8 @@ PMDockWidget* PMDockManager::findDockWidgetAt( const TQPoint& pos )
}
w = p;
}
- if ( tqt_find_obj_child( TQT_TQOBJECT(w), "PMDockSplitter", "_dock_split_" ) ) return 0L;
- if ( tqt_find_obj_child( TQT_TQOBJECT(w), "PMDockTabGroup", "_dock_tab" ) ) return 0L;
+ if ( tqt_find_obj_child( w, "PMDockSplitter", "_dock_split_" ) ) return 0L;
+ if ( tqt_find_obj_child( 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;
@@ -1800,7 +1800,7 @@ void PMDockManager::writeConfig(TQDomElement &base)
TQObjectListIt it(*childDock);
PMDockWidget *obj1;
while ( (obj1=(PMDockWidget*)it.current()) ) {
- if ( TQT_BASE_OBJECT(obj1->parent()) == TQT_BASE_OBJECT(main) )
+ if ( obj1->parent() == main )
mainWidgetStr = TQString::fromLatin1(obj1->name());
nList.append(obj1->name());
++it;
@@ -1915,7 +1915,7 @@ void PMDockManager::readConfig(TQDomElement &base)
PMDockWidget *second = getDockWidgetFromName(secondName);
if (first && second) {
obj = first->manualDock(second,
- (orientation == (int)Qt::Vertical)? PMDockWidget::DockLeft : PMDockWidget::DockTop,
+ (orientation == (int)TQt::Vertical)? PMDockWidget::DockLeft : PMDockWidget::DockTop,
separatorPos);
if (obj)
obj->setName(name.latin1());
@@ -2020,7 +2020,7 @@ void PMDockManager::writeConfig( TDEConfig* c, TQString group )
++it;
//debug(" +Add subdock %s", obj->name());
nList.append( obj->name() );
- if ( TQT_BASE_OBJECT(obj->parent()) == TQT_BASE_OBJECT(main) )
+ if ( obj->parent() == main )
c->writeEntry( "Main:view", obj->name() );
}
@@ -2165,9 +2165,9 @@ void PMDockManager::readConfig( TDEConfig* c, TQString group )
PMDockWidget* last = getDockWidgetFromName( c->readEntry( oname + ":last_name" ) );
int sepPos = c->readNumEntry( oname + ":sepPos" );
- Qt::Orientation p = (Qt::Orientation)c->readNumEntry( oname + ":orientation" );
+ TQt::Orientation p = (TQt::Orientation)c->readNumEntry( oname + ":orientation" );
if ( first && last ){
- obj = first->manualDock( last, ( p ==Qt::Vertical ) ? PMDockWidget::DockLeft : PMDockWidget::DockTop, sepPos );
+ obj = first->manualDock( last, ( p ==TQt::Vertical ) ? PMDockWidget::DockLeft : PMDockWidget::DockTop, sepPos );
if (obj){
obj->setName( oname.latin1() );
}
@@ -2271,7 +2271,7 @@ PMDockWidget* PMDockManager::getDockWidgetFromName( const TQString& dockName )
PMDockWidget* autoCreate = 0L;
if ( autoCreateDock ){
autoCreate = new PMDockWidget( this, dockName.latin1(), TQPixmap(TQString("")) );
- autoCreateDock->append( TQT_TQOBJECT(autoCreate) );
+ autoCreateDock->append( autoCreate );
}
return autoCreate;
}
@@ -2468,7 +2468,7 @@ void PMDockArea::resizeEvent(TQResizeEvent *rsize)
#ifndef NO_KDE2
kdDebug()<<"PMDockArea::resize"<<endl;
#endif
- TQObjectList *list=queryList(TQWIDGET_OBJECT_NAME_STRING,0,false);
+ TQObjectList *list=queryList("TQWidget",0,false);
TQObjectListIt it( *list ); // iterate over the buttons
TQObject *obj;
diff --git a/kpovmodeler/pmdockwidget.h b/kpovmodeler/pmdockwidget.h
index d1ebc1de..d65c5aa7 100644
--- a/kpovmodeler/pmdockwidget.h
+++ b/kpovmodeler/pmdockwidget.h
@@ -108,7 +108,7 @@ class TQToolBar;
*/
class PMDockWidgetAbstractHeader : public TQFrame
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -158,7 +158,7 @@ private:
*/
class PMDockWidgetAbstractHeaderDrag : public TQFrame
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -204,7 +204,7 @@ private:
*/
class PMDockWidgetHeaderDrag : public PMDockWidgetAbstractHeaderDrag
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -246,7 +246,7 @@ private:
*/
class PMDockWidgetHeader : public PMDockWidgetAbstractHeader
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -352,7 +352,7 @@ private:
*/
class EXPORT_DOCKCLASS PMDockTabGroup : public TQTabWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
@@ -411,7 +411,7 @@ private:
*/
class EXPORT_DOCKCLASS PMDockWidget: public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
friend class PMDockManager;
friend class PMDockSplitter;
@@ -805,7 +805,7 @@ private:
// GROUP data
TQString firstName;
TQString lastName;
- Qt::Orientation splitterOrientation;
+ TQt::Orientation splitterOrientation;
bool isGroup;
bool isTabGroup;
@@ -829,7 +829,7 @@ private:
*/
class EXPORT_DOCKCLASS PMDockManager: public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
friend class PMDockWidget;
friend class PMDockMainWindow;
@@ -1214,7 +1214,7 @@ private:
*/
class EXPORT_DOCKCLASS PMDockMainWindow : public TDEMainWindow, virtual public PartBase
{
- Q_OBJECT
+ TQ_OBJECT
friend class PMDockManager;
@@ -1419,7 +1419,7 @@ same as PMDockMainWindow*/
class EXPORT_DOCKCLASS PMDockArea : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
friend class PMDockManager;
diff --git a/kpovmodeler/pmdockwidget_private.cpp b/kpovmodeler/pmdockwidget_private.cpp
index dff656d7..60a06867 100644
--- a/kpovmodeler/pmdockwidget_private.cpp
+++ b/kpovmodeler/pmdockwidget_private.cpp
@@ -22,7 +22,7 @@
#include <tqpainter.h>
#include <tqcursor.h>
-PMDockSplitter::PMDockSplitter(TQWidget *parent, const char *name, Qt::Orientation orient, int pos, bool highResolution)
+PMDockSplitter::PMDockSplitter(TQWidget *parent, const char *name, TQt::Orientation orient, int pos, bool highResolution)
: TQWidget(parent, name)
{
divider = 0L;
@@ -49,7 +49,7 @@ void PMDockSplitter::activate(TQWidget *c0, TQWidget *c1)
divider->setLineWidth(1);
divider->raise();
- if (orientation ==Qt::Horizontal)
+ if (orientation ==TQt::Horizontal)
divider->setCursor(TQCursor(sizeVerCursor));
else
divider->setCursor(TQCursor(sizeHorCursor));
@@ -68,7 +68,7 @@ void PMDockSplitter::setupMinMaxSize()
{
// Set the minimum and maximum sizes
int minx, maxx, miny, maxy;
- if (orientation ==Qt::Horizontal) {
+ if (orientation ==TQt::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();
@@ -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 ==Qt::Horizontal) {
+ if (orientation ==TQt::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 ==Qt::Vertical ? width() : height()) * xpos/factor );
- if (orientation ==Qt::Horizontal){
+ int position = checkValue( (orientation ==TQt::Vertical ? width() : height()) * xpos/factor );
+ if (orientation ==TQt::Horizontal){
child0->setGeometry(0, 0, width(), position);
child1->setGeometry(0, position+4, width(), height()-position-4);
divider->setGeometry(0, position, width(), 4);
@@ -142,7 +142,7 @@ void PMDockSplitter::resizeEvent(TQResizeEvent *ev)
int PMDockSplitter::checkValue( int position ) const
{
if (initialised){
- if (orientation ==Qt::Vertical){
+ if (orientation ==TQt::Vertical){
if (position < (child0->minimumSize().width()))
position = child0->minimumSize().width();
if ((width()-4-position) < (child1->minimumSize().width()))
@@ -157,9 +157,9 @@ int PMDockSplitter::checkValue( int position ) const
if (position < 0) position = 0;
- if ((orientation ==Qt::Vertical) && (position > width()))
+ if ((orientation ==TQt::Vertical) && (position > width()))
position = width();
- if ((orientation ==Qt::Horizontal) && (position > height()))
+ if ((orientation ==TQt::Horizontal) && (position > height()))
position = height();
return position;
@@ -176,7 +176,7 @@ bool PMDockSplitter::eventFilter(TQObject *o, TQEvent *e)
mev= (TQMouseEvent*)e;
child0->setUpdatesEnabled(mOpaqueResize);
child1->setUpdatesEnabled(mOpaqueResize);
- if (orientation ==Qt::Horizontal) {
+ if (orientation ==TQt::Horizontal) {
if (!mOpaqueResize) {
int position = checkValue( mapFromGlobal(mev->globalPos()).y() );
divider->move( 0, position );
@@ -201,7 +201,7 @@ bool PMDockSplitter::eventFilter(TQObject *o, TQEvent *e)
child0->setUpdatesEnabled(true);
child1->setUpdatesEnabled(true);
mev= (TQMouseEvent*)e;
- if (orientation ==Qt::Horizontal){
+ if (orientation ==TQt::Horizontal){
xpos = factor* checkValue( mapFromGlobal(mev->globalPos()).y() ) / height();
resizeEvent(0);
divider->repaint(true);
@@ -292,7 +292,7 @@ PMDockButton_Private::PMDockButton_Private( TQWidget *parent, const char * name
:TQPushButton( parent, name )
{
moveMouse = false;
- setFocusPolicy( TQ_NoFocus );
+ setFocusPolicy( TQWidget::NoFocus );
}
PMDockButton_Private::~PMDockButton_Private()
@@ -361,7 +361,7 @@ void PMDockWidgetPrivate::slotFocusEmbeddedWidget(TQWidget* w)
{
if (w) {
TQWidget* embeddedWdg = ((PMDockWidget*)w)->getWidget();
- if (embeddedWdg && ((embeddedWdg->focusPolicy() == TQ_ClickFocus) || (embeddedWdg->focusPolicy() == TQ_StrongFocus))) {
+ if (embeddedWdg && ((embeddedWdg->focusPolicy() == TQWidget::ClickFocus) || (embeddedWdg->focusPolicy() == TQWidget::StrongFocus))) {
embeddedWdg->setFocus();
}
}
diff --git a/kpovmodeler/pmdockwidget_private.h b/kpovmodeler/pmdockwidget_private.h
index 1b3253aa..b9f9f06d 100644
--- a/kpovmodeler/pmdockwidget_private.h
+++ b/kpovmodeler/pmdockwidget_private.h
@@ -41,10 +41,10 @@ class TQFrame;
*/
class PMDockSplitter : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
- PMDockSplitter(TQWidget *parent= 0, const char *name= 0, Qt::Orientation orient=Qt::Vertical, int pos= 50, bool highResolution=false);
+ PMDockSplitter(TQWidget *parent= 0, const char *name= 0, TQt::Orientation orient=TQt::Vertical, int pos= 50, bool highResolution=false);
virtual ~PMDockSplitter(){};
void activate(TQWidget *c0, TQWidget *c1 = 0L);
@@ -71,7 +71,7 @@ public:
bool highResolution() const;
// MODIFICATION (Zehender)
- Qt::Orientation splitterOrientation( ) const { return orientation; }
+ TQt::Orientation splitterOrientation( ) const { return orientation; }
protected:
int checkValue( int ) const;
@@ -81,7 +81,7 @@ private:
void setupMinMaxSize();
TQWidget *child0, *child1;
- Qt::Orientation orientation;
+ TQt::Orientation orientation;
bool initialised;
TQFrame* divider;
int xpos;
@@ -96,7 +96,7 @@ private:
*/
class PMDockButton_Private : public TQPushButton
{
- Q_OBJECT
+ TQ_OBJECT
public:
PMDockButton_Private( TQWidget *parent=0, const char *name=0 );
@@ -116,7 +116,7 @@ private:
*/
class PMDockWidgetPrivate : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
PMDockWidgetPrivate();
diff --git a/kpovmodeler/pmdocumentationmap.h b/kpovmodeler/pmdocumentationmap.h
index 6a982972..8588c6a0 100644
--- a/kpovmodeler/pmdocumentationmap.h
+++ b/kpovmodeler/pmdocumentationmap.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmdragwidget.h b/kpovmodeler/pmdragwidget.h
index cd54b773..34881db6 100644
--- a/kpovmodeler/pmdragwidget.h
+++ b/kpovmodeler/pmdragwidget.h
@@ -33,7 +33,7 @@
*/
class PMDragWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
PMDragWidget( TQWidget* parent = 0, const char* name = 0, WFlags f = 0 );
diff --git a/kpovmodeler/pmenumproperty.h b/kpovmodeler/pmenumproperty.h
index 0de2efb3..73178609 100644
--- a/kpovmodeler/pmenumproperty.h
+++ b/kpovmodeler/pmenumproperty.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmerrordialog.h b/kpovmodeler/pmerrordialog.h
index 971ef114..be871378 100644
--- a/kpovmodeler/pmerrordialog.h
+++ b/kpovmodeler/pmerrordialog.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -41,7 +40,7 @@ class PMObject;
*/
class PMErrorDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kpovmodeler/pmerrorflags.h b/kpovmodeler/pmerrorflags.h
index ce604c9b..ba39502a 100644
--- a/kpovmodeler/pmerrorflags.h
+++ b/kpovmodeler/pmerrorflags.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmface.h b/kpovmodeler/pmface.h
index a93a4636..105482d6 100644
--- a/kpovmodeler/pmface.h
+++ b/kpovmodeler/pmface.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmfactory.h b/kpovmodeler/pmfactory.h
index 77821f1b..fcd74778 100644
--- a/kpovmodeler/pmfactory.h
+++ b/kpovmodeler/pmfactory.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -27,7 +26,7 @@ class TDEInstance;
class PMFactory : public KParts::Factory
{
- Q_OBJECT
+ TQ_OBJECT
public:
PMFactory( );
diff --git a/kpovmodeler/pmfiledialog.h b/kpovmodeler/pmfiledialog.h
index 454cf1f8..e028d3c5 100644
--- a/kpovmodeler/pmfiledialog.h
+++ b/kpovmodeler/pmfiledialog.h
@@ -37,7 +37,7 @@ class PMPart;
*/
class PMFileDialog : public KFileDialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kpovmodeler/pmfinish.h b/kpovmodeler/pmfinish.h
index c12f31b1..743e0000 100644
--- a/kpovmodeler/pmfinish.h
+++ b/kpovmodeler/pmfinish.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmfinishedit.cpp b/kpovmodeler/pmfinishedit.cpp
index 6a60510f..9b80138e 100644
--- a/kpovmodeler/pmfinishedit.cpp
+++ b/kpovmodeler/pmfinishedit.cpp
@@ -154,41 +154,41 @@ void PMFinishEdit::createTopWidgets( )
layout->addMultiCellWidget( m_pReflectionWidget, 5, 5, 0, 1 );
- connect( m_pAmbientColorEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pDiffuseEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pBrillianceEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pCrandEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pConserveEnergyEdit, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pPhongEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pPhongSizeEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pMetallicEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pSpecularEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pRoughnessEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pIridAmountEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pIridThicknessEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pIridTurbulenceEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pIridEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotIridClicked( ) ) );
- connect( m_pReflectionColorEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pReflectionMinColorEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pReflectionFresnelEdit, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pReflectionFalloffEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pReflectionExponentEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pReflectionMetallicEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pAmbientColorEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pDiffuseEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pBrillianceEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pCrandEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pConserveEnergyEdit, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pPhongEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pPhongSizeEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pMetallicEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pSpecularEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pRoughnessEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pIridAmountEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pIridThicknessEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pIridTurbulenceEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pIridEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotIridClicked( ) ) );
+ connect( m_pReflectionColorEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pReflectionMinColorEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pReflectionFresnelEdit, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pReflectionFalloffEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pReflectionExponentEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pReflectionMetallicEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
- connect( m_pEnableAmbientEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAmbientClicked( ) ) );
- connect( m_pEnablePhongEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotPhongClicked( ) ) );
- connect( m_pEnablePhongSizeEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotPhongSizeClicked( ) ) );
- connect( m_pEnableDiffuseEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotDiffuseClicked( ) ) );
- connect( m_pEnableBrillianceEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotBrillianceClicked( ) ) );
- connect( m_pEnableCrandEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotCrandClicked( ) ) );
- connect( m_pEnableSpecularEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotSpecularClicked( ) ) );
- connect( m_pEnableRoughnessEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotRoughnessClicked( ) ) );
- connect( m_pEnableMetallicEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotMetallicClicked( ) ) );
- connect( m_pEnableReflectionEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotReflectionClicked( ) ) );
- connect( m_pEnableReflectionMinEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotReflectionMinClicked( ) ) );
- connect( m_pEnableRefFalloffEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotRefFalloffClicked( ) ) );
- connect( m_pEnableRefExponentEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotRefExponentClicked( ) ) );
- connect( m_pEnableRefMetallicEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotRefMetallicClicked( ) ) );
+ connect( m_pEnableAmbientEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotAmbientClicked( ) ) );
+ connect( m_pEnablePhongEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotPhongClicked( ) ) );
+ connect( m_pEnablePhongSizeEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotPhongSizeClicked( ) ) );
+ connect( m_pEnableDiffuseEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotDiffuseClicked( ) ) );
+ connect( m_pEnableBrillianceEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotBrillianceClicked( ) ) );
+ connect( m_pEnableCrandEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotCrandClicked( ) ) );
+ connect( m_pEnableSpecularEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotSpecularClicked( ) ) );
+ connect( m_pEnableRoughnessEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotRoughnessClicked( ) ) );
+ connect( m_pEnableMetallicEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotMetallicClicked( ) ) );
+ connect( m_pEnableReflectionEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotReflectionClicked( ) ) );
+ connect( m_pEnableReflectionMinEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotReflectionMinClicked( ) ) );
+ connect( m_pEnableRefFalloffEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotRefFalloffClicked( ) ) );
+ connect( m_pEnableRefExponentEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotRefExponentClicked( ) ) );
+ connect( m_pEnableRefMetallicEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotRefMetallicClicked( ) ) );
}
void PMFinishEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmfinishedit.h b/kpovmodeler/pmfinishedit.h
index 75605c51..3f7f2e5e 100644
--- a/kpovmodeler/pmfinishedit.h
+++ b/kpovmodeler/pmfinishedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -38,7 +37,7 @@ class TQWidget;
*/
class PMFinishEdit : public PMTextureBaseEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMTextureBaseEdit Base;
public:
diff --git a/kpovmodeler/pmfog.h b/kpovmodeler/pmfog.h
index fc6d7095..fc71d0cf 100644
--- a/kpovmodeler/pmfog.h
+++ b/kpovmodeler/pmfog.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmfogedit.cpp b/kpovmodeler/pmfogedit.cpp
index f6c15c1f..51db5cb4 100644
--- a/kpovmodeler/pmfogedit.cpp
+++ b/kpovmodeler/pmfogedit.cpp
@@ -118,18 +118,18 @@ void PMFogEdit::createTopWidgets( )
hl->addWidget( m_pUpLabel );
hl->addWidget( m_pUp );
- connect( m_pFogTypeEdit, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotFogTypeChanged( int ) ) );
- connect( m_pDistance, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pColor, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pTurbulenceCheck, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotTurbulenceClicked( ) ) );
- connect( m_pTurbulenceVector, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pOctaves, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pOmega, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pLambda, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pDepth, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pFogOffset, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pFogAlt, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pUp, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pFogTypeEdit, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotFogTypeChanged( int ) ) );
+ connect( m_pDistance, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pColor, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pTurbulenceCheck, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotTurbulenceClicked( ) ) );
+ connect( m_pTurbulenceVector, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pOctaves, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pOmega, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pLambda, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pDepth, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pFogOffset, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pFogAlt, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pUp, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
}
void PMFogEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmfogedit.h b/kpovmodeler/pmfogedit.h
index c6809ef7..34c68a2f 100644
--- a/kpovmodeler/pmfogedit.h
+++ b/kpovmodeler/pmfogedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -41,7 +40,7 @@ class TQLabel;
*/
class PMFogEdit : public PMTextureBaseEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMTextureBaseEdit Base;
public:
diff --git a/kpovmodeler/pmglobalphotons.h b/kpovmodeler/pmglobalphotons.h
index 549e6efc..dd453d58 100644
--- a/kpovmodeler/pmglobalphotons.h
+++ b/kpovmodeler/pmglobalphotons.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmglobalphotonsedit.cpp b/kpovmodeler/pmglobalphotonsedit.cpp
index a65c9def..b8922fc9 100644
--- a/kpovmodeler/pmglobalphotonsedit.cpp
+++ b/kpovmodeler/pmglobalphotonsedit.cpp
@@ -158,28 +158,28 @@ void PMGlobalPhotonsEdit::createTopWidgets( )
m_pRadiusMediaMulti->setValidation( true, 0, false, 0 );
gl->addWidget( m_pRadiusMediaMulti, 2, 4 );
- connect( m_pNumberType, TQT_SIGNAL( activated( int ) ),
- TQT_SLOT( slotNumberTypeActivated( int ) ) );
- connect( m_pSpacing, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pCount, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pGatherMin, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pGatherMax, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pMediaMaxSteps, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pMediaFactor, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pJitter, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pMaxTraceLevelGlobal, TQT_SIGNAL( clicked( ) ),
- TQT_SLOT( slotMaxTraceLevelGlobalClicked( ) ) );
- connect( m_pMaxTraceLevel, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pAdcBailoutGlobal, TQT_SIGNAL( clicked( ) ),
- TQT_SLOT( slotAdcBailoutGlobalClicked( ) ) );
- connect( m_pAdcBailout, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pAutostop, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pExpandIncrease, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL ( dataChanged( ) ) );
- connect( m_pExpandMin, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL ( dataChanged( ) ) );
- connect( m_pRadiusGather, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL ( dataChanged( ) ) );
- connect( m_pRadiusGatherMulti, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL ( dataChanged( ) ) );
- connect( m_pRadiusMedia, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL ( dataChanged( ) ) );
- connect( m_pRadiusMediaMulti, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL ( dataChanged( ) ) );
+ connect( m_pNumberType, TQ_SIGNAL( activated( int ) ),
+ TQ_SLOT( slotNumberTypeActivated( int ) ) );
+ connect( m_pSpacing, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pCount, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pGatherMin, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pGatherMax, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pMediaMaxSteps, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pMediaFactor, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pJitter, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pMaxTraceLevelGlobal, TQ_SIGNAL( clicked( ) ),
+ TQ_SLOT( slotMaxTraceLevelGlobalClicked( ) ) );
+ connect( m_pMaxTraceLevel, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pAdcBailoutGlobal, TQ_SIGNAL( clicked( ) ),
+ TQ_SLOT( slotAdcBailoutGlobalClicked( ) ) );
+ connect( m_pAdcBailout, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pAutostop, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pExpandIncrease, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL ( dataChanged( ) ) );
+ connect( m_pExpandMin, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL ( dataChanged( ) ) );
+ connect( m_pRadiusGather, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL ( dataChanged( ) ) );
+ connect( m_pRadiusGatherMulti, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL ( dataChanged( ) ) );
+ connect( m_pRadiusMedia, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL ( dataChanged( ) ) );
+ connect( m_pRadiusMediaMulti, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL ( dataChanged( ) ) );
}
void PMGlobalPhotonsEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmglobalphotonsedit.h b/kpovmodeler/pmglobalphotonsedit.h
index d5e8c955..8992dfd8 100644
--- a/kpovmodeler/pmglobalphotonsedit.h
+++ b/kpovmodeler/pmglobalphotonsedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -37,7 +36,7 @@ class TQCheckBox;
*/
class PMGlobalPhotonsEdit : public PMDialogEditBase
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMDialogEditBase Base;
public:
diff --git a/kpovmodeler/pmglobalsettings.h b/kpovmodeler/pmglobalsettings.h
index a95f86d7..fa856aa2 100644
--- a/kpovmodeler/pmglobalsettings.h
+++ b/kpovmodeler/pmglobalsettings.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmglobalsettingsedit.cpp b/kpovmodeler/pmglobalsettingsedit.cpp
index d2c7779c..bb42dc03 100644
--- a/kpovmodeler/pmglobalsettingsedit.cpp
+++ b/kpovmodeler/pmglobalsettingsedit.cpp
@@ -142,25 +142,25 @@ void PMGlobalSettingsEdit::createTopWidgets( )
topLayout( )->addWidget( m_pRadiosityWidget );
- connect( m_pAdcBailoutEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pAmbientLightEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pAssumedGammaEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pHfGray16Edit, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pIridWaveLengthEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pMaxIntersectionsEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pMaxTraceLevelEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pNumberWavesEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pNoiseGeneratorEdit, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pRadiosityEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotRadiosityClicked( ) ) );
- connect( m_pBrightnessEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pCountEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pDistanceMaximumEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pErrorBoundEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pGrayThresholdEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pLowErrorFactorEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pMinimumReuseEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pNearestCountEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pRecursionLimitEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pAdcBailoutEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pAmbientLightEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pAssumedGammaEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pHfGray16Edit, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pIridWaveLengthEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pMaxIntersectionsEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pMaxTraceLevelEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pNumberWavesEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pNoiseGeneratorEdit, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pRadiosityEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotRadiosityClicked( ) ) );
+ connect( m_pBrightnessEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pCountEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pDistanceMaximumEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pErrorBoundEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pGrayThresholdEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pLowErrorFactorEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pMinimumReuseEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pNearestCountEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pRecursionLimitEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
}
void PMGlobalSettingsEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmglobalsettingsedit.h b/kpovmodeler/pmglobalsettingsedit.h
index 938debad..6de780d2 100644
--- a/kpovmodeler/pmglobalsettingsedit.h
+++ b/kpovmodeler/pmglobalsettingsedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -38,7 +37,7 @@ class TQComboBox;
*/
class PMGlobalSettingsEdit : public PMDialogEditBase
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMDialogEditBase Base;
public:
diff --git a/kpovmodeler/pmglview.cpp b/kpovmodeler/pmglview.cpp
index 1114e3d7..23e170da 100644
--- a/kpovmodeler/pmglview.cpp
+++ b/kpovmodeler/pmglview.cpp
@@ -143,40 +143,40 @@ PMGLView::PMGLView( PMPart* part, PMViewType t,
initializeGL( );
setMouseTracking( true );
- setFocusPolicy( TQ_WheelFocus );
+ setFocusPolicy( TQWidget::WheelFocus );
PMRenderManager* rm = PMRenderManager::theManager( );
rm->viewCreated( );
setMinimumSize( 50, 50 );
- connect( part, TQT_SIGNAL( refresh( ) ), TQT_SLOT( slotRefresh( ) ) );
- connect( part, TQT_SIGNAL( clear( ) ), TQT_SLOT( slotClear( ) ) );
+ connect( part, TQ_SIGNAL( refresh( ) ), TQ_SLOT( slotRefresh( ) ) );
+ connect( part, TQ_SIGNAL( clear( ) ), TQ_SLOT( slotClear( ) ) );
- connect( this, TQT_SIGNAL( objectChanged( PMObject*, const int, TQObject* ) ),
- part, TQT_SLOT( slotObjectChanged( PMObject*, const int, TQObject* ) ) );
- connect( part, TQT_SIGNAL( objectChanged( PMObject*, const int, TQObject* ) ),
- TQT_SLOT( slotObjectChanged( PMObject*, const int, TQObject* ) ) );
+ connect( this, TQ_SIGNAL( objectChanged( PMObject*, const int, TQObject* ) ),
+ part, TQ_SLOT( slotObjectChanged( PMObject*, const int, TQObject* ) ) );
+ connect( part, TQ_SIGNAL( objectChanged( PMObject*, const int, TQObject* ) ),
+ TQ_SLOT( slotObjectChanged( PMObject*, const int, TQObject* ) ) );
- connect( part, TQT_SIGNAL( activeRenderModeChanged( ) ),
- TQT_SLOT( slotActiveRenderModeChanged( ) ) );
+ connect( part, TQ_SIGNAL( activeRenderModeChanged( ) ),
+ TQ_SLOT( slotActiveRenderModeChanged( ) ) );
- connect( &m_startTimer, TQT_SIGNAL( timeout( ) ),
- TQT_SLOT( slotMouseChangeTimer( ) ) );
- connect( &m_autoScrollTimer, TQT_SIGNAL( timeout( ) ),
- TQT_SLOT( slotAutoScroll( ) ) );
+ connect( &m_startTimer, TQ_SIGNAL( timeout( ) ),
+ TQ_SLOT( slotMouseChangeTimer( ) ) );
+ connect( &m_autoScrollTimer, TQ_SIGNAL( timeout( ) ),
+ TQ_SLOT( slotAutoScroll( ) ) );
- connect( rm, TQT_SIGNAL( renderingStarted( PMGLView* ) ),
- TQT_SLOT( slotRenderingStarted( PMGLView* ) ) );
- connect( rm, TQT_SIGNAL( aboutToUpdate( PMGLView* ) ),
- TQT_SLOT( slotAboutToUpdate( PMGLView* ) ) );
- connect( rm, TQT_SIGNAL( renderingFinished( PMGLView* ) ),
- TQT_SLOT( slotRenderingFinished( PMGLView* ) ) );
- connect( rm, TQT_SIGNAL( renderingSettingsChanged( ) ),
- TQT_SLOT( slotRefresh( ) ) );
+ connect( rm, TQ_SIGNAL( renderingStarted( PMGLView* ) ),
+ TQ_SLOT( slotRenderingStarted( PMGLView* ) ) );
+ connect( rm, TQ_SIGNAL( aboutToUpdate( PMGLView* ) ),
+ TQ_SLOT( slotAboutToUpdate( PMGLView* ) ) );
+ connect( rm, TQ_SIGNAL( renderingFinished( PMGLView* ) ),
+ TQ_SLOT( slotRenderingFinished( PMGLView* ) ) );
+ connect( rm, TQ_SIGNAL( renderingSettingsChanged( ) ),
+ TQ_SLOT( slotRefresh( ) ) );
- connect( this, TQT_SIGNAL( controlPointMessage( const TQString& ) ),
- m_pPart, TQT_SIGNAL( controlPointMessage( const TQString& ) ) );
+ connect( this, TQ_SIGNAL( controlPointMessage( const TQString& ) ),
+ m_pPart, TQ_SIGNAL( controlPointMessage( const TQString& ) ) );
updateControlPoints( );
}
@@ -507,7 +507,7 @@ void PMGLView::mousePressEvent( TQMouseEvent* e )
{
if( m_bScaleMode || m_bTranslateMode )
{
- if( ( e->button( ) & Qt::LeftButton ) && ( e->state( ) == 0 ) )
+ if( ( e->button( ) & TQt::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( ) & Qt::LeftButton ) && m_bInverseValid
+ if( ( e->button( ) & TQt::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( ) == Qt::RightButton ) && ( e->state( ) == 0 ) )
+ if( ( e->button( ) == TQt::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( ) == Qt::MidButton )
+ if( e->button( ) == TQt::MidButton )
{
m_bMidMousePressed = true;
m_mousePos = e->pos( );
@@ -677,7 +677,7 @@ void PMGLView::mouseReleaseEvent( TQMouseEvent* e )
m_autoScrollTimer.stop( );
}
- if( e->button( ) & Qt::MidButton )
+ if( e->button( ) & TQt::MidButton )
m_bMidMousePressed = false;
m_bSelectUnderMouse = false;
@@ -955,12 +955,12 @@ void PMGLView::graphicalChange( const TQPoint& mousePos )
m_pActiveObject->controlPointsChangedList( m_controlPoints, changedObjects );
if( changedObjects.isEmpty( ) )
- emit objectChanged( m_pActiveObject, PMCGraphicalChange, TQT_TQOBJECT(this) );
+ emit objectChanged( m_pActiveObject, PMCGraphicalChange, this );
else
{
PMObjectListIterator it( changedObjects );
for( ; it.current( ); ++it )
- emit objectChanged( it.current( ), PMCGraphicalChange, TQT_TQOBJECT(this) );
+ emit objectChanged( it.current( ), PMCGraphicalChange, this );
}
}
@@ -1238,7 +1238,7 @@ void PMGLView::slotObjectChanged( PMObject* obj, const int mode,
redraw = true;
if( redraw )
- repaint( TQT_BASE_OBJECT(sender) == TQT_BASE_OBJECT(this) );
+ repaint( sender == this );
}
void PMGLView::repaint( bool graphicalChange )
@@ -1353,7 +1353,7 @@ void PMGLView::selectControlPoint( PMControlPoint* cp, bool select, bool deselec
}
if( selectionChanged )
- emit objectChanged( m_pActiveObject, PMCControlPointSelection, TQT_TQOBJECT(this) );
+ emit objectChanged( m_pActiveObject, PMCControlPointSelection, this );
}
void PMGLView::startSelection( )
@@ -1537,12 +1537,12 @@ void PMGLView::restoreConfig( TDEConfig* /*cfg*/ )
void PMGLView::contextMenu( )
{
TQPopupMenu* m = new TQPopupMenu( );
- m->insertItem( i18n( "Left View" ), this, TQT_SLOT( slotSetTypePosX( ) ) );
- m->insertItem( i18n( "Right View" ), this, TQT_SLOT( slotSetTypeNegX( ) ) );
- m->insertItem( i18n( "Top View" ), this, TQT_SLOT( slotSetTypeNegY( ) ) );
- m->insertItem( i18n( "Bottom View" ), this, TQT_SLOT( slotSetTypePosY( ) ) );
- m->insertItem( i18n( "Front View" ), this, TQT_SLOT( slotSetTypePosZ( ) ) );
- m->insertItem( i18n( "Back View" ), this, TQT_SLOT( slotSetTypeNegZ( ) ) );
+ m->insertItem( i18n( "Left View" ), this, TQ_SLOT( slotSetTypePosX( ) ) );
+ m->insertItem( i18n( "Right View" ), this, TQ_SLOT( slotSetTypeNegX( ) ) );
+ m->insertItem( i18n( "Top View" ), this, TQ_SLOT( slotSetTypeNegY( ) ) );
+ m->insertItem( i18n( "Bottom View" ), this, TQ_SLOT( slotSetTypePosY( ) ) );
+ m->insertItem( i18n( "Front View" ), this, TQ_SLOT( slotSetTypePosZ( ) ) );
+ m->insertItem( i18n( "Back View" ), this, TQ_SLOT( slotSetTypeNegZ( ) ) );
TQPopupMenu* cm = new TQPopupMenu( m );
TQPtrListIterator<PMCamera> it = m_pPart->cameras( );
@@ -1560,13 +1560,13 @@ void PMGLView::contextMenu( )
cm->insertItem( name, cnr );
}
}
- connect( cm, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotCameraView( int ) ) );
+ connect( cm, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotCameraView( int ) ) );
m->insertItem( SmallIconSet( "pmcamera" ), i18n( "Camera" ), cm );
m->insertSeparator( );
- m->insertItem( i18n( "Snap to Grid" ), this, TQT_SLOT( slotSnapToGrid( ) ) );
+ m->insertItem( i18n( "Snap to Grid" ), this, TQ_SLOT( slotSnapToGrid( ) ) );
m_objectActions.clear( );
if( m_pActiveObject )
{
@@ -1583,7 +1583,7 @@ void PMGLView::contextMenu( )
}
}
}
- connect( m, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotObjectAction( int ) ) );
+ connect( m, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotObjectAction( int ) ) );
m->insertSeparator( );
@@ -1598,7 +1598,7 @@ void PMGLView::contextMenu( )
for( ; pit.current( ); ++pit, ++cnr )
menu->insertItem( pit.current( )->description( ), cnr );
}
- connect( menu, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotControlPoint( int ) ) );
+ connect( menu, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotControlPoint( int ) ) );
m->insertItem( i18n( "Control Points" ), menu );
@@ -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, TQT_TQOBJECT(this) );
+ emit objectChanged( m_pActiveObject, PMCControlPointSelection, this );
}
}
@@ -1816,8 +1816,8 @@ PMGLViewOptionsWidget::PMGLViewOptionsWidget( TQWidget* parent,
break;
}
- connect( m_pGLViewType, TQT_SIGNAL( activated( int ) ),
- TQT_SLOT( slotGLViewTypeChanged( int ) ) );
+ connect( m_pGLViewType, TQ_SIGNAL( activated( int ) ),
+ TQ_SLOT( slotGLViewTypeChanged( int ) ) );
hl->addWidget( m_pGLViewType );
}
diff --git a/kpovmodeler/pmglview.h b/kpovmodeler/pmglview.h
index 1ecc9ad9..dfc7437d 100644
--- a/kpovmodeler/pmglview.h
+++ b/kpovmodeler/pmglview.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -50,7 +49,7 @@ class TQComboBox;
*/
class PMGLView : public PMViewBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
@@ -572,7 +571,7 @@ public:
*/
class PMGLViewOptionsWidget : public PMViewOptionsWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kpovmodeler/pmgraphicalobject.h b/kpovmodeler/pmgraphicalobject.h
index 399e351d..d067bc64 100644
--- a/kpovmodeler/pmgraphicalobject.h
+++ b/kpovmodeler/pmgraphicalobject.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmgraphicalobjectedit.cpp b/kpovmodeler/pmgraphicalobjectedit.cpp
index 0db70b77..b0ab7e55 100644
--- a/kpovmodeler/pmgraphicalobjectedit.cpp
+++ b/kpovmodeler/pmgraphicalobjectedit.cpp
@@ -59,15 +59,15 @@ void PMGraphicalObjectEdit::createBottomWidgets( )
hl->addWidget( m_pRelativeVisibility );
hl->addStretch( 1 );
- connect( m_pNoShadowButton, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pNoImageButton, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pNoReflectionButton, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pDoubleIlluminateButton, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pRelativeVisibility, TQT_SIGNAL( clicked( ) ),
- TQT_SLOT( slotRelativeChanged( ) ) );
- connect( m_pVisibilityLevel, TQT_SIGNAL( valueChanged( int ) ),
- TQT_SLOT( slotLevelChanged( int ) ) );
- connect( m_pExport, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pNoShadowButton, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pNoImageButton, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pNoReflectionButton, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pDoubleIlluminateButton, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pRelativeVisibility, TQ_SIGNAL( clicked( ) ),
+ TQ_SLOT( slotRelativeChanged( ) ) );
+ connect( m_pVisibilityLevel, TQ_SIGNAL( valueChanged( int ) ),
+ TQ_SLOT( slotLevelChanged( int ) ) );
+ connect( m_pExport, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) );
Base::createBottomWidgets( );
diff --git a/kpovmodeler/pmgraphicalobjectedit.h b/kpovmodeler/pmgraphicalobjectedit.h
index 9f216a2a..c3a92e18 100644
--- a/kpovmodeler/pmgraphicalobjectedit.h
+++ b/kpovmodeler/pmgraphicalobjectedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -36,7 +35,7 @@ class TQLabel;
*/
class PMGraphicalObjectEdit : public PMDetailObjectEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMDetailObjectEdit Base;
public:
diff --git a/kpovmodeler/pmgridsettings.h b/kpovmodeler/pmgridsettings.h
index bd04dab7..b5d9cce8 100644
--- a/kpovmodeler/pmgridsettings.h
+++ b/kpovmodeler/pmgridsettings.h
@@ -33,7 +33,7 @@ class PMFloatEdit;
*/
class PMGridSettings : public PMSettingsDialogPage
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kpovmodeler/pmheightfield.h b/kpovmodeler/pmheightfield.h
index 443226ba..86f1a838 100644
--- a/kpovmodeler/pmheightfield.h
+++ b/kpovmodeler/pmheightfield.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmheightfieldedit.cpp b/kpovmodeler/pmheightfieldedit.cpp
index e51f4881..fcdf0309 100644
--- a/kpovmodeler/pmheightfieldedit.cpp
+++ b/kpovmodeler/pmheightfieldedit.cpp
@@ -75,15 +75,15 @@ void PMHeightFieldEdit::createTopWidgets( )
m_pSmooth = new TQCheckBox( i18n( "Smooth" ), this );
topLayout( )->addWidget( m_pSmooth );
- connect( m_pHeightFieldType, TQT_SIGNAL( activated( int ) ),
- TQT_SLOT( slotTypeChanged( int ) ) );
- connect( m_pFileName, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( slotFileNameChanged( const TQString& ) ) );
- connect( m_pChooseFileName, TQT_SIGNAL( clicked( ) ),
- TQT_SLOT( slotFileNameClicked( ) ) );
- connect( m_pWaterLevel, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pHierarchy, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pSmooth, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pHeightFieldType, TQ_SIGNAL( activated( int ) ),
+ TQ_SLOT( slotTypeChanged( int ) ) );
+ connect( m_pFileName, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( slotFileNameChanged( const TQString& ) ) );
+ connect( m_pChooseFileName, TQ_SIGNAL( clicked( ) ),
+ TQ_SLOT( slotFileNameClicked( ) ) );
+ connect( m_pWaterLevel, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pHierarchy, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pSmooth, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) );
}
void PMHeightFieldEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmheightfieldedit.h b/kpovmodeler/pmheightfieldedit.h
index b719b607..40f6468c 100644
--- a/kpovmodeler/pmheightfieldedit.h
+++ b/kpovmodeler/pmheightfieldedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -38,7 +37,7 @@ class TQPushButton;
*/
class PMHeightFieldEdit : public PMSolidObjectEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMSolidObjectEdit Base;
public:
diff --git a/kpovmodeler/pmheightfieldroam.cpp b/kpovmodeler/pmheightfieldroam.cpp
index 87856155..5b55b65e 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.tqcolorTable( ), 256 );
+ scaledMap = scaledMap.convertDepthWithPalette( 8, mapFile.colorTable( ), 256 );
colourIndex = true;
}
diff --git a/kpovmodeler/pmheightfieldroam.h b/kpovmodeler/pmheightfieldroam.h
index 3f21c630..bd224d58 100644
--- a/kpovmodeler/pmheightfieldroam.h
+++ b/kpovmodeler/pmheightfieldroam.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmimagemap.h b/kpovmodeler/pmimagemap.h
index 3a43d949..5ff47071 100644
--- a/kpovmodeler/pmimagemap.h
+++ b/kpovmodeler/pmimagemap.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmimagemapedit.cpp b/kpovmodeler/pmimagemapedit.cpp
index 53010095..4d9debf0 100644
--- a/kpovmodeler/pmimagemapedit.cpp
+++ b/kpovmodeler/pmimagemapedit.cpp
@@ -111,16 +111,16 @@ void PMImageMapEdit::createTopWidgets( )
hl->addWidget( lbl );
hl->addWidget( m_pMapTypeEdit );
- connect( m_pImageFileTypeEdit, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotImageFileTypeChanged( int ) ) );
- connect( m_pMapTypeEdit, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotMapTypeChanged( int ) ) );
- connect( m_pInterpolateTypeEdit, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotInterpolateTypeChanged( int ) ) );
- connect( m_pImageFileNameBrowse, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotImageFileBrowseClicked( ) ) );
- connect( m_pImageFileNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotImageFileNameChanged( const TQString& ) ) );
- connect( m_pEnableFilterAllEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotFilterAllClicked( ) ) );
- connect( m_pEnableTransmitAllEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotTransmitAllClicked( ) ) );
- connect( m_pFilterAllEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pTransmitAllEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pOnceEdit, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pImageFileTypeEdit, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotImageFileTypeChanged( int ) ) );
+ connect( m_pMapTypeEdit, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotMapTypeChanged( int ) ) );
+ connect( m_pInterpolateTypeEdit, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotInterpolateTypeChanged( int ) ) );
+ connect( m_pImageFileNameBrowse, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotImageFileBrowseClicked( ) ) );
+ connect( m_pImageFileNameEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotImageFileNameChanged( const TQString& ) ) );
+ connect( m_pEnableFilterAllEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotFilterAllClicked( ) ) );
+ connect( m_pEnableTransmitAllEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotTransmitAllClicked( ) ) );
+ connect( m_pFilterAllEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pTransmitAllEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pOnceEdit, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) );
}
void PMImageMapEdit::createBottomWidgets( )
@@ -265,7 +265,7 @@ void PMImageMapEdit::displayPaletteEntries( const TQValueList<PMPaletteValue>& f
button = new TQPushButton( m_pFiltersWidget );
button->setPixmap( addButtonPixmap );
m_filterAddButtons.append( button );
- connect( button, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAddFilterEntry( ) ) );
+ connect( button, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotAddFilterEntry( ) ) );
gl->addWidget( button, 0, 1 );
button->show( );
button->setEnabled( !readOnly );
@@ -275,7 +275,7 @@ void PMImageMapEdit::displayPaletteEntries( const TQValueList<PMPaletteValue>& f
{
edit = new PMPaletteValueEdit( m_pFiltersWidget );
m_filterEntries.append( edit );
- connect( edit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( edit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
gl->addWidget( edit, i+1, 0 );
edit->setIndex( filters[ i ].index( ) );
edit->setValue( filters[ i ].value( ) );
@@ -285,7 +285,7 @@ void PMImageMapEdit::displayPaletteEntries( const TQValueList<PMPaletteValue>& f
button = new TQPushButton( m_pFiltersWidget );
button->setPixmap( addButtonPixmap );
m_filterAddButtons.append( button );
- connect( button, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAddFilterEntry( ) ) );
+ connect( button, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotAddFilterEntry( ) ) );
gl->addWidget( button, i+1, 1 );
button->show( );
button->setEnabled( !readOnly );
@@ -294,7 +294,7 @@ void PMImageMapEdit::displayPaletteEntries( const TQValueList<PMPaletteValue>& f
button = new TQPushButton( m_pFiltersWidget );
button->setPixmap( removeButtonPixmap );
m_filterRemoveButtons.append( button );
- connect( button, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotRemoveFilterEntry( ) ) );
+ connect( button, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotRemoveFilterEntry( ) ) );
gl->addWidget( button, i+1, 2 );
button->show( );
button->setEnabled( !readOnly );
@@ -321,7 +321,7 @@ void PMImageMapEdit::displayPaletteEntries( const TQValueList<PMPaletteValue>& f
button = new TQPushButton( m_pTransmitsWidget );
button->setPixmap( addButtonPixmap );
m_transmitAddButtons.append( button );
- connect( button, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAddTransmitEntry( ) ) );
+ connect( button, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotAddTransmitEntry( ) ) );
gl->addWidget( button, 0, 1 );
button->show( );
button->setEnabled( !readOnly );
@@ -331,7 +331,7 @@ void PMImageMapEdit::displayPaletteEntries( const TQValueList<PMPaletteValue>& f
{
edit = new PMPaletteValueEdit( m_pTransmitsWidget );
m_transmitEntries.append( edit );
- connect( edit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( edit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
gl->addWidget( edit, i+1, 0 );
edit->setIndex( transmits[ i ].index( ) );
edit->setValue( transmits[ i ].value( ) );
@@ -341,7 +341,7 @@ void PMImageMapEdit::displayPaletteEntries( const TQValueList<PMPaletteValue>& f
button = new TQPushButton( m_pTransmitsWidget );
button->setPixmap( addButtonPixmap );
m_transmitAddButtons.append( button );
- connect( button, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAddTransmitEntry( ) ) );
+ connect( button, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotAddTransmitEntry( ) ) );
gl->addWidget( button, i+1, 1 );
button->show( );
button->setEnabled( !readOnly );
@@ -350,7 +350,7 @@ void PMImageMapEdit::displayPaletteEntries( const TQValueList<PMPaletteValue>& f
button = new TQPushButton( m_pTransmitsWidget );
button->setPixmap( removeButtonPixmap );
m_transmitRemoveButtons.append( button );
- connect( button, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotRemoveTransmitEntry( ) ) );
+ connect( button, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotRemoveTransmitEntry( ) ) );
gl->addWidget( button, i+1, 2 );
button->show( );
button->setEnabled( !readOnly );
diff --git a/kpovmodeler/pmimagemapedit.h b/kpovmodeler/pmimagemapedit.h
index fc7ffada..4b527d92 100644
--- a/kpovmodeler/pmimagemapedit.h
+++ b/kpovmodeler/pmimagemapedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -44,7 +43,7 @@ class TQPushButton;
*/
class PMImageMapEdit : public PMDialogEditBase
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMDialogEditBase Base;
public:
diff --git a/kpovmodeler/pminserterrordialog.h b/kpovmodeler/pminserterrordialog.h
index a4aacd6c..9e016b3b 100644
--- a/kpovmodeler/pminserterrordialog.h
+++ b/kpovmodeler/pminserterrordialog.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -35,7 +34,7 @@ class TQLabel;
during the execution of a command */
class PMInsertErrorDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kpovmodeler/pminsertpopup.h b/kpovmodeler/pminsertpopup.h
index b9242611..552ae845 100644
--- a/kpovmodeler/pminsertpopup.h
+++ b/kpovmodeler/pminsertpopup.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pminsertrulesystem.h b/kpovmodeler/pminsertrulesystem.h
index 80ecb525..d6d6142d 100644
--- a/kpovmodeler/pminsertrulesystem.h
+++ b/kpovmodeler/pminsertrulesystem.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pminterior.h b/kpovmodeler/pminterior.h
index 8e3c9172..ea8a771d 100644
--- a/kpovmodeler/pminterior.h
+++ b/kpovmodeler/pminterior.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pminterioredit.cpp b/kpovmodeler/pminterioredit.cpp
index c4c792d1..a2c99a0a 100644
--- a/kpovmodeler/pminterioredit.cpp
+++ b/kpovmodeler/pminterioredit.cpp
@@ -67,18 +67,18 @@ void PMInteriorEdit::createTopWidgets( )
layout->addWidget( m_pFadePowerEdit, 5, 1 );
hl->addStretch( 1 );
- connect( m_pIorEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pCausticsEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pDispersionEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pDispSamplesEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL ( dataChanged( ) ) );
- connect( m_pFadeDistanceEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pFadePowerEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pEnableIorEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotIorClicked( ) ) );
- connect( m_pEnableCausticsEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotCausticsClicked( ) ) );
- connect( m_pEnableDispersionEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotDispersionClicked( ) ) );
- connect( m_pEnableDispSamplesEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotDispSamplesClicked( ) ) );
- connect( m_pEnableFadeDistanceEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotFadeDistanceClicked( ) ) );
- connect( m_pEnableFadePowerEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotFadePowerClicked( ) ) );
+ connect( m_pIorEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pCausticsEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pDispersionEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pDispSamplesEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL ( dataChanged( ) ) );
+ connect( m_pFadeDistanceEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pFadePowerEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pEnableIorEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotIorClicked( ) ) );
+ connect( m_pEnableCausticsEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotCausticsClicked( ) ) );
+ connect( m_pEnableDispersionEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotDispersionClicked( ) ) );
+ connect( m_pEnableDispSamplesEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotDispSamplesClicked( ) ) );
+ connect( m_pEnableFadeDistanceEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotFadeDistanceClicked( ) ) );
+ connect( m_pEnableFadePowerEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotFadePowerClicked( ) ) );
}
void PMInteriorEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pminterioredit.h b/kpovmodeler/pminterioredit.h
index f1940b0f..a71aaa62 100644
--- a/kpovmodeler/pminterioredit.h
+++ b/kpovmodeler/pminterioredit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -38,7 +37,7 @@ class TQLabel;
*/
class PMInteriorEdit : public PMTextureBaseEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMTextureBaseEdit Base;
public:
diff --git a/kpovmodeler/pminteriortexture.h b/kpovmodeler/pminteriortexture.h
index 0711b5c9..3a606228 100644
--- a/kpovmodeler/pminteriortexture.h
+++ b/kpovmodeler/pminteriortexture.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pminteriortextureedit.h b/kpovmodeler/pminteriortextureedit.h
index a9803145..fff7ebff 100644
--- a/kpovmodeler/pminteriortextureedit.h
+++ b/kpovmodeler/pminteriortextureedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -33,7 +32,7 @@ class PMInteriorTexture;
*/
class PMInteriorTextureEdit : public PMTextureBaseEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMTextureBaseEdit Base;
public:
diff --git a/kpovmodeler/pmisosurface.h b/kpovmodeler/pmisosurface.h
index 2a2fb358..a9830b66 100644
--- a/kpovmodeler/pmisosurface.h
+++ b/kpovmodeler/pmisosurface.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmisosurfaceedit.cpp b/kpovmodeler/pmisosurfaceedit.cpp
index 60c501ea..14acdacf 100644
--- a/kpovmodeler/pmisosurfaceedit.cpp
+++ b/kpovmodeler/pmisosurfaceedit.cpp
@@ -106,25 +106,25 @@ void PMIsoSurfaceEdit::createTopWidgets( )
topLayout( )->addWidget( m_pAllIntersections );
topLayout( )->addWidget( m_pOpen );
- connect( m_pFunction, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( textChanged( const TQString& ) ) );
- connect( m_pContainedBy, TQT_SIGNAL( activated( int ) ),
- TQT_SLOT( currentChanged( int ) ) );
- connect( m_pCorner1, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pCorner2, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pCenter, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pRadius, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pThreshold, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pAccuracy, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pMaxGradient, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pEvaluate, TQT_SIGNAL( toggled( bool ) ),
- TQT_SLOT( evaluateToggled( bool ) ) );
- connect( m_pMaxTrace, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pFunction, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( textChanged( const TQString& ) ) );
+ connect( m_pContainedBy, TQ_SIGNAL( activated( int ) ),
+ TQ_SLOT( currentChanged( int ) ) );
+ connect( m_pCorner1, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pCorner2, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pCenter, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pRadius, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pThreshold, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pAccuracy, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pMaxGradient, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pEvaluate, TQ_SIGNAL( toggled( bool ) ),
+ TQ_SLOT( evaluateToggled( bool ) ) );
+ connect( m_pMaxTrace, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
for( i = 0; i < 3; i++ )
- connect( m_pEvaluateValue[i], TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pOpen, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( toggled( bool ) ) );
- connect( m_pAllIntersections, TQT_SIGNAL( toggled( bool ) ),
- TQT_SLOT( allToggled( bool ) ) );
+ connect( m_pEvaluateValue[i], TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pOpen, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( toggled( bool ) ) );
+ connect( m_pAllIntersections, TQ_SIGNAL( toggled( bool ) ),
+ TQ_SLOT( allToggled( bool ) ) );
}
void PMIsoSurfaceEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmisosurfaceedit.h b/kpovmodeler/pmisosurfaceedit.h
index e6410d21..8c16749d 100644
--- a/kpovmodeler/pmisosurfaceedit.h
+++ b/kpovmodeler/pmisosurfaceedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -40,7 +39,7 @@ class TQLineEdit;
*/
class PMIsoSurfaceEdit : public PMSolidObjectEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMSolidObjectEdit Base;
public:
diff --git a/kpovmodeler/pmjuliafractal.h b/kpovmodeler/pmjuliafractal.h
index 1a113aa4..7f2eb0a5 100644
--- a/kpovmodeler/pmjuliafractal.h
+++ b/kpovmodeler/pmjuliafractal.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmjuliafractaledit.cpp b/kpovmodeler/pmjuliafractaledit.cpp
index 373bbf0c..d6079d33 100644
--- a/kpovmodeler/pmjuliafractaledit.cpp
+++ b/kpovmodeler/pmjuliafractaledit.cpp
@@ -105,16 +105,16 @@ void PMJuliaFractalEdit::createTopWidgets( )
hl->addWidget( m_pSliceDistance );
hl->addStretch( 1 );
- connect( m_pJuliaParameter, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pAlgebraType, TQT_SIGNAL( activated( int ) ),
- TQT_SLOT( slotAlgebraTypeSelected( int ) ) );
- connect( m_pFunctionType, TQT_SIGNAL( activated( int ) ),
- TQT_SLOT( slotFunctionTypeSelected( int ) ) );
- connect( m_pExponents, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pMaxIterations, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pPrecision, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pSliceNormal, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pSliceDistance, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pJuliaParameter, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pAlgebraType, TQ_SIGNAL( activated( int ) ),
+ TQ_SLOT( slotAlgebraTypeSelected( int ) ) );
+ connect( m_pFunctionType, TQ_SIGNAL( activated( int ) ),
+ TQ_SLOT( slotFunctionTypeSelected( int ) ) );
+ connect( m_pExponents, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pMaxIterations, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pPrecision, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pSliceNormal, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pSliceDistance, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
}
void PMJuliaFractalEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmjuliafractaledit.h b/kpovmodeler/pmjuliafractaledit.h
index 3d68fcdf..a0ca8393 100644
--- a/kpovmodeler/pmjuliafractaledit.h
+++ b/kpovmodeler/pmjuliafractaledit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -38,7 +37,7 @@ class TQLabel;
*/
class PMJuliaFractalEdit : public PMSolidObjectEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMSolidObjectEdit Base;
public:
diff --git a/kpovmodeler/pmlathe.h b/kpovmodeler/pmlathe.h
index 20fa55b3..93bb2024 100644
--- a/kpovmodeler/pmlathe.h
+++ b/kpovmodeler/pmlathe.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmlatheedit.cpp b/kpovmodeler/pmlatheedit.cpp
index 1e1879f1..ed58d98d 100644
--- a/kpovmodeler/pmlatheedit.cpp
+++ b/kpovmodeler/pmlatheedit.cpp
@@ -53,8 +53,8 @@ void PMLatheEdit::createTopWidgets( )
hl->addWidget( m_pSplineType );
hl->addStretch( 1 );
- connect( m_pSplineType, TQT_SIGNAL( activated( int ) ),
- TQT_SLOT( slotTypeChanged( int ) ) );
+ connect( m_pSplineType, TQ_SIGNAL( activated( int ) ),
+ TQ_SLOT( slotTypeChanged( int ) ) );
}
void PMLatheEdit::createBottomWidgets( )
@@ -62,9 +62,9 @@ void PMLatheEdit::createBottomWidgets( )
topLayout( )->addWidget( new TQLabel( i18n( "Spline points:" ), this ) );
m_pPoints = new PMVectorListEdit( "u", "v", this );
- connect( m_pPoints, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pPoints, TQT_SIGNAL( selectionChanged( ) ),
- TQT_SLOT( slotSelectionChanged( ) ) );
+ connect( m_pPoints, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pPoints, TQ_SIGNAL( selectionChanged( ) ),
+ TQ_SLOT( slotSelectionChanged( ) ) );
TQHBoxLayout* hl = new TQHBoxLayout( topLayout( ) );
hl->addWidget( m_pPoints, 2 );
@@ -74,9 +74,9 @@ void PMLatheEdit::createBottomWidgets( )
m_pAddBelow->setPixmap( SmallIcon( "pmaddpoint" ) );
m_pRemove = new TQPushButton( this );
m_pRemove->setPixmap( SmallIcon( "pmremovepoint" ) );
- connect( m_pAddAbove, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAddPointAbove( ) ) );
- connect( m_pAddBelow, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAddPointBelow( ) ) );
- connect( m_pRemove, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotRemovePoint( ) ) );
+ connect( m_pAddAbove, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotAddPointAbove( ) ) );
+ connect( m_pAddBelow, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotAddPointBelow( ) ) );
+ connect( m_pRemove, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotRemovePoint( ) ) );
TQVBoxLayout* bl = new TQVBoxLayout( hl );
bl->addWidget( m_pAddAbove );
@@ -86,7 +86,7 @@ void PMLatheEdit::createBottomWidgets( )
m_pSturm = new TQCheckBox( i18n( "Sturm" ), this );
topLayout( )->addWidget( m_pSturm );
- connect( m_pSturm, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pSturm, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) );
Base::createBottomWidgets( );
}
diff --git a/kpovmodeler/pmlatheedit.h b/kpovmodeler/pmlatheedit.h
index f86b55ee..ae5152a5 100644
--- a/kpovmodeler/pmlatheedit.h
+++ b/kpovmodeler/pmlatheedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -42,7 +41,7 @@ class TQLabel;
*/
class PMLatheEdit : public PMSolidObjectEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMSolidObjectEdit Base;
public:
diff --git a/kpovmodeler/pmlayoutsettings.cpp b/kpovmodeler/pmlayoutsettings.cpp
index 5e719ac9..d9ce8068 100644
--- a/kpovmodeler/pmlayoutsettings.cpp
+++ b/kpovmodeler/pmlayoutsettings.cpp
@@ -58,14 +58,14 @@ PMLayoutSettings::PMLayoutSettings( TQWidget* parent, const char* name )
grid = new TQGridLayout( gvl, 3, 2 );
m_pViewLayouts = new TQListBox( gb );
- connect( m_pViewLayouts, TQT_SIGNAL( highlighted( int ) ),
- TQT_SLOT( slotLayoutSelected( int ) ) );
+ connect( m_pViewLayouts, TQ_SIGNAL( highlighted( int ) ),
+ TQ_SLOT( slotLayoutSelected( int ) ) );
grid->addMultiCellWidget( m_pViewLayouts, 0, 2, 0, 0 );
m_pAddLayout = new TQPushButton( i18n( "Add" ), gb );
- connect( m_pAddLayout, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAddLayout( ) ) );
+ connect( m_pAddLayout, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotAddLayout( ) ) );
grid->addWidget( m_pAddLayout, 0, 1 );
m_pRemoveLayout = new TQPushButton( i18n( "Remove" ), gb );
- connect( m_pRemoveLayout, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotRemoveLayout( ) ) );
+ connect( m_pRemoveLayout, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotRemoveLayout( ) ) );
grid->addWidget( m_pRemoveLayout, 1, 1 );
grid->setRowStretch( 2, 1 );
@@ -76,8 +76,8 @@ PMLayoutSettings::PMLayoutSettings( TQWidget* parent, const char* name )
ghe = new TQHBoxLayout( gvle );
ghe->addWidget( new TQLabel( i18n( "Name:" ), gbe ) );
m_pViewLayoutName = new TQLineEdit( gbe );
- connect( m_pViewLayoutName, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( slotLayoutNameChanged( const TQString& ) ) );
+ connect( m_pViewLayoutName, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( slotLayoutNameChanged( const TQString& ) ) );
ghe->addWidget( m_pViewLayoutName );
grid = new TQGridLayout( gvle, 4, 2 );
m_pViewEntries = new TQListView( gbe );
@@ -87,21 +87,21 @@ PMLayoutSettings::PMLayoutSettings( TQWidget* parent, const char* name )
m_pViewEntries->addColumn( i18n( "Position" ) );
m_pViewEntries->setSorting( -1 );
m_pViewEntries->setMaximumHeight( 150 );
- connect( m_pViewEntries, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ),
- TQT_SLOT( slotViewEntrySelected( TQListViewItem* ) ) );
+ connect( m_pViewEntries, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ),
+ TQ_SLOT( slotViewEntrySelected( TQListViewItem* ) ) );
grid->addMultiCellWidget( m_pViewEntries, 0, 3, 0, 0 );
m_pAddEntry = new TQPushButton( i18n( "Add" ), gbe );
- connect( m_pAddEntry, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAddViewEntryClicked( ) ) );
+ connect( m_pAddEntry, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotAddViewEntryClicked( ) ) );
grid->addWidget( m_pAddEntry, 0, 1 );
m_pRemoveEntry = new TQPushButton( i18n( "Remove" ), gbe );
- connect( m_pRemoveEntry, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotRemoveViewEntryClicked( ) ) );
+ connect( m_pRemoveEntry, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotRemoveViewEntryClicked( ) ) );
grid->addWidget( m_pRemoveEntry, 1, 1 );
/* //TODO
m_pMoveUpEntry = new TQPushButton( i18n( "Move Up" ), gbe );
- connect( m_pMoveUpEntry, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotMoveUpViewEntryClicked( ) ) );
+ connect( m_pMoveUpEntry, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotMoveUpViewEntryClicked( ) ) );
grid->addWidget( m_pMoveUpEntry, 2, 1 );
m_pMoveDownEntry = new TQPushButton( i18n( "Move Down" ), gbe );
- connect( m_pMoveDownEntry, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotMoveDownViewEntryClicked( ) ) );
+ connect( m_pMoveDownEntry, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotMoveDownViewEntryClicked( ) ) );
grid->addWidget( m_pMoveDownEntry, 3, 1 );
*/
@@ -122,26 +122,26 @@ PMLayoutSettings::PMLayoutSettings( TQWidget* parent, const char* name )
for( ; *it; ++it )
m_pViewTypeEdit->insertItem( ( *it )->description( ) );
- connect( m_pViewTypeEdit, TQT_SIGNAL( activated( int ) ),
- TQT_SLOT( slotViewTypeChanged( int ) ) );
+ connect( m_pViewTypeEdit, TQ_SIGNAL( activated( int ) ),
+ TQ_SLOT( slotViewTypeChanged( int ) ) );
grid->addWidget( m_pViewTypeEdit, 0, 1 );
m_pDockPositionEdit = new TQComboBox( gbe );
m_pDockPositionEdit->insertItem( i18n( "New Column" ) );
m_pDockPositionEdit->insertItem( i18n( "Below" ) );
m_pDockPositionEdit->insertItem( i18n( "Tabbed" ) );
m_pDockPositionEdit->insertItem( i18n( "Floating" ) );
- connect( m_pDockPositionEdit, TQT_SIGNAL( activated( int ) ),
- TQT_SLOT( slotDockPositionChanged( int ) ) );
+ connect( m_pDockPositionEdit, TQ_SIGNAL( activated( int ) ),
+ TQ_SLOT( slotDockPositionChanged( int ) ) );
grid->addWidget( m_pDockPositionEdit, 2, 1 );
m_pColumnWidthEdit = new PMIntEdit( gbe );
- connect( m_pColumnWidthEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( slotColumnWidthChanged( const TQString& ) ) );
+ connect( m_pColumnWidthEdit, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( slotColumnWidthChanged( const TQString& ) ) );
grid->addWidget( m_pColumnWidthEdit, 3, 1 );
m_pViewHeightEdit = new PMIntEdit( gbe );
- connect( m_pViewHeightEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( slotViewHeightChanged( const TQString& ) ) );
+ connect( m_pViewHeightEdit, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( slotViewHeightChanged( const TQString& ) ) );
grid->addWidget( m_pViewHeightEdit, 4, 1 );
m_pFloatingWidthLabel = new TQLabel( i18n( "Width:" ), gbe );
@@ -154,17 +154,17 @@ PMLayoutSettings::PMLayoutSettings( TQWidget* parent, const char* name )
grid->addWidget( m_pFloatingPosYLabel, 6, 2 );
m_pFloatingWidth = new PMIntEdit( gbe );
- connect( m_pFloatingWidth, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( slotFloatingWidthChanged( const TQString& ) ) );
+ connect( m_pFloatingWidth, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( slotFloatingWidthChanged( const TQString& ) ) );
m_pFloatingHeight = new PMIntEdit( gbe );
- connect( m_pFloatingHeight, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( slotFloatingHeightChanged( const TQString& ) ) );
+ connect( m_pFloatingHeight, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( slotFloatingHeightChanged( const TQString& ) ) );
m_pFloatingPosX = new PMIntEdit( gbe );
- connect( m_pFloatingPosX, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( slotFloatingPosXChanged( const TQString& ) ) );
+ connect( m_pFloatingPosX, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( slotFloatingPosXChanged( const TQString& ) ) );
m_pFloatingPosY = new PMIntEdit( gbe );
- connect( m_pFloatingPosY, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( slotFloatingPosYChanged( const TQString& ) ) );
+ connect( m_pFloatingPosY, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( slotFloatingPosYChanged( const TQString& ) ) );
grid->addWidget( m_pFloatingWidth, 5, 1 );
grid->addWidget( m_pFloatingHeight, 5, 3 );
grid->addWidget( m_pFloatingPosX, 6, 1 );
@@ -741,8 +741,8 @@ void PMLayoutSettings::displayCustomOptions( )
( *m_currentViewEntry ).customOptions( ) );
if( m_pCustomOptionsWidget )
{
- connect( m_pCustomOptionsWidget, TQT_SIGNAL( viewTypeDescriptionChanged( ) ),
- TQT_SLOT( slotViewTypeDescriptionChanged( ) ) );
+ connect( m_pCustomOptionsWidget, TQ_SIGNAL( viewTypeDescriptionChanged( ) ),
+ TQ_SLOT( slotViewTypeDescriptionChanged( ) ) );
TQHBoxLayout* hl = new TQHBoxLayout( m_pCustomOptionsHolder,
0, KDialog::spacingHint( ) );
hl->addWidget( m_pCustomOptionsWidget );
diff --git a/kpovmodeler/pmlayoutsettings.h b/kpovmodeler/pmlayoutsettings.h
index ea25cb45..5b92fba2 100644
--- a/kpovmodeler/pmlayoutsettings.h
+++ b/kpovmodeler/pmlayoutsettings.h
@@ -39,7 +39,7 @@ class TQLabel;
*/
class PMLayoutSettings : public PMSettingsDialogPage
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kpovmodeler/pmlibrarybrowser.cpp b/kpovmodeler/pmlibrarybrowser.cpp
index 4df00a8d..15627940 100644
--- a/kpovmodeler/pmlibrarybrowser.cpp
+++ b/kpovmodeler/pmlibrarybrowser.cpp
@@ -98,17 +98,17 @@ PMLibraryBrowserViewWidget::PMLibraryBrowserViewWidget( TQWidget* parent, const
vl->addWidget( splitv, 99 );
// Connect all the objects
- connect( m_pUpButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotUpButtonClicked( ) ) );
- connect( m_pNewSubLibraryButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotNewSubLibraryClicked( ) ) );
- connect( m_pNewObjectButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotNewObjectClicked( ) ) );
- connect( m_pDeleteObjectButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotDeleteClicked( ) ) );
- connect( m_pLibraryComboBox, TQT_SIGNAL( highlighted( const TQString& ) ),
- TQT_SLOT( slotPathSelected( const TQString& ) ) );
- connect( m_pLibraryIconView, TQT_SIGNAL( selectionChanged( TQIconViewItem* ) ),
- TQT_SLOT( slotSelectionChanged( TQIconViewItem* ) ) );
- connect( m_pLibraryIconView, TQT_SIGNAL( executed( TQIconViewItem* ) ),
- TQT_SLOT( slotSelectionExecuted( TQIconViewItem* ) ) );
- connect( m_pLibraryEntryPreview, TQT_SIGNAL( objectChanged( ) ), TQT_SLOT( slotIconViewRefresh( ) ) );
+ connect( m_pUpButton, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotUpButtonClicked( ) ) );
+ connect( m_pNewSubLibraryButton, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotNewSubLibraryClicked( ) ) );
+ connect( m_pNewObjectButton, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotNewObjectClicked( ) ) );
+ connect( m_pDeleteObjectButton, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotDeleteClicked( ) ) );
+ connect( m_pLibraryComboBox, TQ_SIGNAL( highlighted( const TQString& ) ),
+ TQ_SLOT( slotPathSelected( const TQString& ) ) );
+ connect( m_pLibraryIconView, TQ_SIGNAL( selectionChanged( TQIconViewItem* ) ),
+ TQ_SLOT( slotSelectionChanged( TQIconViewItem* ) ) );
+ connect( m_pLibraryIconView, TQ_SIGNAL( executed( TQIconViewItem* ) ),
+ TQ_SLOT( slotSelectionExecuted( TQIconViewItem* ) ) );
+ connect( m_pLibraryEntryPreview, TQ_SIGNAL( objectChanged( ) ), TQ_SLOT( slotIconViewRefresh( ) ) );
// Set the selected library
slotPathSelected( m_pLibraryComboBox->currentText( ) );
@@ -161,14 +161,14 @@ void PMLibraryBrowserViewWidget::slotSelectionChanged( TQIconViewItem* item )
if( sel->isSubLibrary( ) )
{
if( m_pLibraryEntryPreview->saveIfNeeded( ) )
- TQTimer::singleShot( 100, this, TQT_SLOT( slotIconViewRefresh( ) ) );
+ TQTimer::singleShot( 100, this, TQ_SLOT( slotIconViewRefresh( ) ) );
else
m_pLibraryEntryPreview->showPreview( sel->path( ), m_topLibraryReadOnly, true );
}
else
{
if( m_pLibraryEntryPreview->saveIfNeeded( ) )
- TQTimer::singleShot( 100, this, TQT_SLOT( slotIconViewRefresh( ) ) );
+ TQTimer::singleShot( 100, this, TQ_SLOT( slotIconViewRefresh( ) ) );
else
m_pLibraryEntryPreview->showPreview( sel->path( ), m_topLibraryReadOnly, false );
}
@@ -184,14 +184,14 @@ void PMLibraryBrowserViewWidget::slotSelectionExecuted( TQIconViewItem* item )
// It's a sub library
m_pFutureLibrary = new PMLibraryHandle( sel->path( ) );
m_pLibraryEntryPreview->clearPreview( );
- TQTimer::singleShot( 100, this, TQT_SLOT( slotIconViewSetLibrary( ) ) );
+ TQTimer::singleShot( 100, this, TQ_SLOT( slotIconViewSetLibrary( ) ) );
m_pUpButton->setEnabled( true );
}
else
{
// It's an object
if( m_pLibraryEntryPreview->saveIfNeeded( ) )
- TQTimer::singleShot( 100, this, TQT_SLOT( slotIconViewRefresh( ) ) );
+ TQTimer::singleShot( 100, this, TQ_SLOT( slotIconViewRefresh( ) ) );
else
m_pLibraryEntryPreview->showPreview( sel->path( ), m_topLibraryReadOnly, false );
}
@@ -206,7 +206,7 @@ void PMLibraryBrowserViewWidget::slotUpButtonClicked( )
m_pFutureLibrary = new PMLibraryHandle( pathManipulator.path( ) );
if( !m_pFutureLibrary->isSubLibrary( ) )
m_pUpButton->setEnabled( false );
- TQTimer::singleShot( 100, this, TQT_SLOT( slotIconViewSetLibrary( ) ) );
+ TQTimer::singleShot( 100, this, TQ_SLOT( slotIconViewSetLibrary( ) ) );
// Release the current Library
delete m_pCurrentLibrary;
@@ -228,7 +228,7 @@ void PMLibraryBrowserViewWidget::slotDeleteClicked( )
case PMLibraryHandle::Ok:
{
TDEIO::Job *job = TDEIO::del( sel->path() );
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), TQT_SLOT( slotJobResult( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), TQ_SLOT( slotJobResult( TDEIO::Job * ) ) );
}
break;
case PMLibraryHandle::ReadOnlyLib:
@@ -250,7 +250,7 @@ void PMLibraryBrowserViewWidget::slotNewObjectClicked( )
switch( m_pCurrentLibrary->createNewObject( ) )
{
case PMLibraryHandle::Ok:
- TQTimer::singleShot( 100, this, TQT_SLOT( slotIconViewRefresh( ) ) );
+ TQTimer::singleShot( 100, this, TQ_SLOT( slotIconViewRefresh( ) ) );
break;
case PMLibraryHandle::ReadOnlyLib:
KMessageBox::error( this, i18n( "This library is read only." ), i18n( "Error" ) );
@@ -293,7 +293,7 @@ void PMLibraryBrowserViewWidget::slotJobResult( TDEIO::Job * job )
{
if( job->error( ) )
job->showErrorDialog( this );
- TQTimer::singleShot( 100, this, TQT_SLOT( slotIconViewRefresh( ) ) );
+ TQTimer::singleShot( 100, this, TQ_SLOT( slotIconViewRefresh( ) ) );
}
TQString PMLibraryBrowserViewFactory::description( ) const
diff --git a/kpovmodeler/pmlibrarybrowser.h b/kpovmodeler/pmlibrarybrowser.h
index b5e8fe7e..b1fbc91d 100644
--- a/kpovmodeler/pmlibrarybrowser.h
+++ b/kpovmodeler/pmlibrarybrowser.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -47,7 +46,7 @@ typedef TQDict<TQString> TQStringDict;
*/
class PMLibraryBrowserView : public PMViewBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
@@ -66,7 +65,7 @@ public:
*/
class PMLibraryBrowserViewWidget: public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
PMLibraryBrowserViewWidget( TQWidget *parent, const char* name = NULL );
diff --git a/kpovmodeler/pmlibraryentrypreview.cpp b/kpovmodeler/pmlibraryentrypreview.cpp
index 75256512..162fc789 100644
--- a/kpovmodeler/pmlibraryentrypreview.cpp
+++ b/kpovmodeler/pmlibraryentrypreview.cpp
@@ -103,18 +103,18 @@ PMLibraryEntryPreview::PMLibraryEntryPreview( TQWidget* parent ) :
m_pCancelChanges->setEnabled( false );
hl->addWidget( m_pCancelChanges );
- connect( m_pName, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( slotTextChanged( const TQString& ) ) );
- connect( m_pDescription, TQT_SIGNAL( textChanged( ) ),
- TQT_SLOT( slotTextChanged( ) ) );
- connect( m_pKeywords, TQT_SIGNAL( textChanged( ) ),
- TQT_SLOT( slotTextChanged( ) ) );
- connect( m_pSetPreviewImageButton, TQT_SIGNAL( clicked( ) ),
- TQT_SLOT( slotPreviewClicked( ) ) );
- connect( m_pPart, TQT_SIGNAL( modified( ) ),
- TQT_SLOT( slotTextChanged( ) ) );
- connect( m_pApplyChanges, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotApplyClicked( ) ) );
- connect( m_pCancelChanges, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotCancelClicked( ) ) );
+ connect( m_pName, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( slotTextChanged( const TQString& ) ) );
+ connect( m_pDescription, TQ_SIGNAL( textChanged( ) ),
+ TQ_SLOT( slotTextChanged( ) ) );
+ connect( m_pKeywords, TQ_SIGNAL( textChanged( ) ),
+ TQ_SLOT( slotTextChanged( ) ) );
+ connect( m_pSetPreviewImageButton, TQ_SIGNAL( clicked( ) ),
+ TQ_SLOT( slotPreviewClicked( ) ) );
+ connect( m_pPart, TQ_SIGNAL( modified( ) ),
+ TQ_SLOT( slotTextChanged( ) ) );
+ connect( m_pApplyChanges, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotApplyClicked( ) ) );
+ connect( m_pCancelChanges, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotCancelClicked( ) ) );
vl->addStretch( 1 );
}
diff --git a/kpovmodeler/pmlibraryentrypreview.h b/kpovmodeler/pmlibraryentrypreview.h
index a6e334ac..5d07fa40 100644
--- a/kpovmodeler/pmlibraryentrypreview.h
+++ b/kpovmodeler/pmlibraryentrypreview.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -41,7 +40,7 @@ class PMTreeView;
*/
class PMLibraryEntryPreview: public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
/** Constructor */
diff --git a/kpovmodeler/pmlibraryhandle.h b/kpovmodeler/pmlibraryhandle.h
index 353b7b53..4a8da4e3 100644
--- a/kpovmodeler/pmlibraryhandle.h
+++ b/kpovmodeler/pmlibraryhandle.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmlibraryhandleedit.cpp b/kpovmodeler/pmlibraryhandleedit.cpp
index 8a0febc8..2080b7b9 100644
--- a/kpovmodeler/pmlibraryhandleedit.cpp
+++ b/kpovmodeler/pmlibraryhandleedit.cpp
@@ -75,10 +75,10 @@ PMLibraryHandleEdit::PMLibraryHandleEdit( PMLibraryHandle* lib, TQWidget* parent
m_pReadOnlyEdit->setChecked( !lib->isReadOnly( ) );
// Setup the signals
- connect( m_pNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotEditsChanged( const TQString& ) ) );
- connect( m_pAuthorEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotEditsChanged( const TQString& ) ) );
- connect( m_pDescriptionEdit, TQT_SIGNAL( textChanged( ) ), TQT_SLOT( slotDescriptionChanged( ) ) );
- connect( m_pReadOnlyEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotReadOnlyChanged( ) ) );
+ connect( m_pNameEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotEditsChanged( const TQString& ) ) );
+ connect( m_pAuthorEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotEditsChanged( const TQString& ) ) );
+ connect( m_pDescriptionEdit, TQ_SIGNAL( textChanged( ) ), TQ_SLOT( slotDescriptionChanged( ) ) );
+ connect( m_pReadOnlyEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotReadOnlyChanged( ) ) );
// On startup you can only cancel
enableButtonOK( false );
diff --git a/kpovmodeler/pmlibraryhandleedit.h b/kpovmodeler/pmlibraryhandleedit.h
index d17387d5..aa3ed470 100644
--- a/kpovmodeler/pmlibraryhandleedit.h
+++ b/kpovmodeler/pmlibraryhandleedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -36,7 +35,7 @@ class PMLibraryHandle;
*/
class PMLibraryHandleEdit: public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kpovmodeler/pmlibraryiconview.cpp b/kpovmodeler/pmlibraryiconview.cpp
index 1f953225..fcaead42 100644
--- a/kpovmodeler/pmlibraryiconview.cpp
+++ b/kpovmodeler/pmlibraryiconview.cpp
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmlibraryiconview.h b/kpovmodeler/pmlibraryiconview.h
index 823fedcc..6077c9e4 100644
--- a/kpovmodeler/pmlibraryiconview.h
+++ b/kpovmodeler/pmlibraryiconview.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -32,7 +31,7 @@ class PMLibraryHandle;
*/
class PMLibraryIconDrag : public TQIconDrag
{
- Q_OBJECT
+ TQ_OBJECT
public:
/** Constructor */
@@ -62,7 +61,7 @@ private:
*/
class PMLibraryIconView: public TDEIconView
{
- Q_OBJECT
+ TQ_OBJECT
public:
PMLibraryIconView( TQWidget *parent, const char* name = NULL );
diff --git a/kpovmodeler/pmlibrarymanager.h b/kpovmodeler/pmlibrarymanager.h
index 6c2fe7bd..d3e0ac95 100644
--- a/kpovmodeler/pmlibrarymanager.h
+++ b/kpovmodeler/pmlibrarymanager.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmlibraryobject.cpp b/kpovmodeler/pmlibraryobject.cpp
index 95a7c29d..a1c1ff27 100644
--- a/kpovmodeler/pmlibraryobject.cpp
+++ b/kpovmodeler/pmlibraryobject.cpp
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmlibraryobject.h b/kpovmodeler/pmlibraryobject.h
index 070b5c99..633bbc85 100644
--- a/kpovmodeler/pmlibraryobject.h
+++ b/kpovmodeler/pmlibraryobject.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmlibraryobjectsearch.cpp b/kpovmodeler/pmlibraryobjectsearch.cpp
index e3fee426..1684d73c 100644
--- a/kpovmodeler/pmlibraryobjectsearch.cpp
+++ b/kpovmodeler/pmlibraryobjectsearch.cpp
@@ -70,7 +70,7 @@ PMLibraryObjectSearch::PMLibraryObjectSearch( TQWidget* parent ) :
vl->addWidget( frame );
// Connect signals and slots
- connect( m_pSearchButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotSearchButtonPressed( ) ) );
+ connect( m_pSearchButton, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotSearchButtonPressed( ) ) );
}
void PMLibraryObjectSearch::slotSearchButtonPressed( )
diff --git a/kpovmodeler/pmlibraryobjectsearch.h b/kpovmodeler/pmlibraryobjectsearch.h
index 35b29ed2..06430216 100644
--- a/kpovmodeler/pmlibraryobjectsearch.h
+++ b/kpovmodeler/pmlibraryobjectsearch.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -38,7 +37,7 @@ class TDEListView;
*/
class PMLibraryObjectSearch: public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
PMLibraryObjectSearch( TQWidget *parent );
diff --git a/kpovmodeler/pmlight.h b/kpovmodeler/pmlight.h
index 4fafb2b0..6fbd5993 100644
--- a/kpovmodeler/pmlight.h
+++ b/kpovmodeler/pmlight.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmlightedit.cpp b/kpovmodeler/pmlightedit.cpp
index 7448c48b..ccf5846f 100644
--- a/kpovmodeler/pmlightedit.cpp
+++ b/kpovmodeler/pmlightedit.cpp
@@ -160,33 +160,33 @@ void PMLightEdit::createTopWidgets( )
topLayout( )->addWidget( m_pMediaInteraction );
topLayout( )->addWidget( m_pMediaAttenuation );
- connect( m_pLocation, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pColor, TQT_SIGNAL( dataChanged( ) ),
- TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pType, TQT_SIGNAL( activated( int ) ),
- TQT_SLOT( slotTypeActivated( int ) ) );
- connect( m_pRadius, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pFalloff, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pTightness, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pPointAt, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pParallel, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pAreaLight, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAreaClicked( ) ) );
- connect( m_pAreaType, TQT_SIGNAL( activated ( int ) ), TQT_SLOT( slotOrientCheck( ) ) );
- connect( m_pAxis1, TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotOrientCheck( ) ) );
- connect( m_pAxis2, TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotOrientCheck( ) ) );
- connect( m_pSize1, TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotOrientCheck( ) ) );
- connect( m_pSize2, TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotOrientCheck( ) ) );
- connect( m_pAdaptive, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pOrient, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pJitter, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pFading, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotFadingClicked( ) ) );
- connect( m_pFadeDistance, TQT_SIGNAL( dataChanged( ) ),
- TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pFadePower, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pMediaInteraction, TQT_SIGNAL( clicked( ) ),
- TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pMediaAttenuation, TQT_SIGNAL( clicked( ) ),
- TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pLocation, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pColor, TQ_SIGNAL( dataChanged( ) ),
+ TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pType, TQ_SIGNAL( activated( int ) ),
+ TQ_SLOT( slotTypeActivated( int ) ) );
+ connect( m_pRadius, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pFalloff, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pTightness, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pPointAt, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pParallel, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pAreaLight, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotAreaClicked( ) ) );
+ connect( m_pAreaType, TQ_SIGNAL( activated ( int ) ), TQ_SLOT( slotOrientCheck( ) ) );
+ connect( m_pAxis1, TQ_SIGNAL( dataChanged( ) ), TQ_SLOT( slotOrientCheck( ) ) );
+ connect( m_pAxis2, TQ_SIGNAL( dataChanged( ) ), TQ_SLOT( slotOrientCheck( ) ) );
+ connect( m_pSize1, TQ_SIGNAL( dataChanged( ) ), TQ_SLOT( slotOrientCheck( ) ) );
+ connect( m_pSize2, TQ_SIGNAL( dataChanged( ) ), TQ_SLOT( slotOrientCheck( ) ) );
+ connect( m_pAdaptive, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pOrient, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pJitter, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pFading, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotFadingClicked( ) ) );
+ connect( m_pFadeDistance, TQ_SIGNAL( dataChanged( ) ),
+ TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pFadePower, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pMediaInteraction, TQ_SIGNAL( clicked( ) ),
+ TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pMediaAttenuation, TQ_SIGNAL( clicked( ) ),
+ TQ_SIGNAL( dataChanged( ) ) );
}
void PMLightEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmlightedit.h b/kpovmodeler/pmlightedit.h
index 797e4e80..90c75bca 100644
--- a/kpovmodeler/pmlightedit.h
+++ b/kpovmodeler/pmlightedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -40,7 +39,7 @@ class TQCheckBox;
*/
class PMLightEdit : public PMNamedObjectEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMNamedObjectEdit Base;
public:
diff --git a/kpovmodeler/pmlightgroup.h b/kpovmodeler/pmlightgroup.h
index 9fdf8d6b..4cb938a8 100644
--- a/kpovmodeler/pmlightgroup.h
+++ b/kpovmodeler/pmlightgroup.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmlightgroupedit.cpp b/kpovmodeler/pmlightgroupedit.cpp
index 5f66c54b..e9cc6a3c 100644
--- a/kpovmodeler/pmlightgroupedit.cpp
+++ b/kpovmodeler/pmlightgroupedit.cpp
@@ -41,7 +41,7 @@ void PMLightGroupEdit::createTopWidgets( )
layout->addWidget( m_pGlobalLights );
layout->addStretch( 1 );
- connect( m_pGlobalLights, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pGlobalLights, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) );
}
void PMLightGroupEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmlightgroupedit.h b/kpovmodeler/pmlightgroupedit.h
index a19fe083..daa37cce 100644
--- a/kpovmodeler/pmlightgroupedit.h
+++ b/kpovmodeler/pmlightgroupedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -34,7 +33,7 @@ class TQCheckBox;
*/
class PMLightGroupEdit : public PMSolidObjectEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMSolidObjectEdit Base;
public:
diff --git a/kpovmodeler/pmline.h b/kpovmodeler/pmline.h
index c20b9355..bbd55a6a 100644
--- a/kpovmodeler/pmline.h
+++ b/kpovmodeler/pmline.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmlineedits.cpp b/kpovmodeler/pmlineedits.cpp
index d64f5aaa..9e14ce33 100644
--- a/kpovmodeler/pmlineedits.cpp
+++ b/kpovmodeler/pmlineedits.cpp
@@ -29,8 +29,8 @@ PMFloatEdit::PMFloatEdit( TQWidget* parent, const char* name /*= 0*/ )
m_lowerOp = OpGreaterEqual;
m_upperOp = OpLessEqual;
- connect( this, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( slotEditTextChanged( const TQString& ) ) );
+ connect( this, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( slotEditTextChanged( const TQString& ) ) );
}
void PMFloatEdit::setValidation( bool checkLower, double lowerValue,
@@ -137,8 +137,8 @@ PMIntEdit::PMIntEdit( TQWidget* parent, const char* name /*= 0*/ )
m_lowerValue = 0;
m_upperValue = 0;
- connect( this, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( slotEditTextChanged( const TQString& ) ) );
+ connect( this, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( slotEditTextChanged( const TQString& ) ) );
}
void PMIntEdit::setValidation( bool checkLower, int lowerValue,
diff --git a/kpovmodeler/pmlineedits.h b/kpovmodeler/pmlineedits.h
index 8b210c0d..4d267a63 100644
--- a/kpovmodeler/pmlineedits.h
+++ b/kpovmodeler/pmlineedits.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -31,7 +30,7 @@
class PMFloatEdit : public TQLineEdit
{
- Q_OBJECT
+ TQ_OBJECT
public:
enum ValidationOp { OpGreater, OpGreaterEqual,
@@ -90,7 +89,7 @@ private:
class PMIntEdit : public TQLineEdit
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kpovmodeler/pmlinkedit.cpp b/kpovmodeler/pmlinkedit.cpp
index c2418f3b..6ea0f532 100644
--- a/kpovmodeler/pmlinkedit.cpp
+++ b/kpovmodeler/pmlinkedit.cpp
@@ -71,8 +71,8 @@ void PMLinkEdit::init( )
m_pClearButton = new KPushButton( KStdGuiItem::clear(), this );
layout->addWidget( m_pClearButton );
- connect( m_pSelectButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotSelectClicked( ) ) );
- connect( m_pClearButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotClearClicked( ) ) );
+ connect( m_pSelectButton, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotSelectClicked( ) ) );
+ connect( m_pClearButton, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotClearClicked( ) ) );
}
void PMLinkEdit::setDisplayedObject( PMObject* obj )
diff --git a/kpovmodeler/pmlinkedit.h b/kpovmodeler/pmlinkedit.h
index 1602653e..8a030b90 100644
--- a/kpovmodeler/pmlinkedit.h
+++ b/kpovmodeler/pmlinkedit.h
@@ -33,7 +33,7 @@ class TQPushButton;
*/
class PMLinkEdit : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kpovmodeler/pmlistpattern.h b/kpovmodeler/pmlistpattern.h
index 6716dadb..4e1b78f3 100644
--- a/kpovmodeler/pmlistpattern.h
+++ b/kpovmodeler/pmlistpattern.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmlistpatternedit.cpp b/kpovmodeler/pmlistpatternedit.cpp
index 10c0fd24..32ec5fc9 100644
--- a/kpovmodeler/pmlistpatternedit.cpp
+++ b/kpovmodeler/pmlistpatternedit.cpp
@@ -76,10 +76,10 @@ void PMListPatternEdit::createTopWidgets( )
layout->addStretch( 1 );
/* connect all signals to slots/signals */
- connect( m_pBrickSize, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pTypeCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotComboChanged( int ) ) );
- connect( m_pMortar, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pDepth, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pBrickSize, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pTypeCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotComboChanged( int ) ) );
+ connect( m_pMortar, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pDepth, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
}
void PMListPatternEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmlistpatternedit.h b/kpovmodeler/pmlistpatternedit.h
index cbade808..6a520374 100644
--- a/kpovmodeler/pmlistpatternedit.h
+++ b/kpovmodeler/pmlistpatternedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -37,7 +36,7 @@ class TQLabel;
*/
class PMListPatternEdit : public PMDialogEditBase
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMDialogEditBase Base;
public:
diff --git a/kpovmodeler/pmlookslike.h b/kpovmodeler/pmlookslike.h
index 4a191422..edebac4d 100644
--- a/kpovmodeler/pmlookslike.h
+++ b/kpovmodeler/pmlookslike.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmmapmemento.h b/kpovmodeler/pmmapmemento.h
index 73dc8ce7..1f5631d5 100644
--- a/kpovmodeler/pmmapmemento.h
+++ b/kpovmodeler/pmmapmemento.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmmaterial.h b/kpovmodeler/pmmaterial.h
index 7e790be4..cad65246 100644
--- a/kpovmodeler/pmmaterial.h
+++ b/kpovmodeler/pmmaterial.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmmaterialedit.h b/kpovmodeler/pmmaterialedit.h
index 580a0663..b3be698e 100644
--- a/kpovmodeler/pmmaterialedit.h
+++ b/kpovmodeler/pmmaterialedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -33,7 +32,7 @@ class PMMaterial;
*/
class PMMaterialEdit : public PMTextureBaseEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMTextureBaseEdit Base;
public:
diff --git a/kpovmodeler/pmmaterialmap.h b/kpovmodeler/pmmaterialmap.h
index 6377c7bd..06367c0c 100644
--- a/kpovmodeler/pmmaterialmap.h
+++ b/kpovmodeler/pmmaterialmap.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmmaterialmapedit.cpp b/kpovmodeler/pmmaterialmapedit.cpp
index 672ae9d1..e46dafd1 100644
--- a/kpovmodeler/pmmaterialmapedit.cpp
+++ b/kpovmodeler/pmmaterialmapedit.cpp
@@ -100,12 +100,12 @@ void PMMaterialMapEdit::createTopWidgets( )
hl->addWidget( m_pMapTypeEdit );
hl->addStretch( 1 );
- connect( m_pImageFileTypeEdit, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotImageFileTypeChanged( int ) ) );
- connect( m_pMapTypeEdit, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotMapTypeChanged( int ) ) );
- connect( m_pInterpolateTypeEdit, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotInterpolateTypeChanged( int ) ) );
- connect( m_pImageFileNameBrowse, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotImageFileBrowseClicked( ) ) );
- connect( m_pImageFileNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotImageFileNameChanged( const TQString& ) ) );
- connect( m_pOnceEdit, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pImageFileTypeEdit, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotImageFileTypeChanged( int ) ) );
+ connect( m_pMapTypeEdit, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotMapTypeChanged( int ) ) );
+ connect( m_pInterpolateTypeEdit, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotInterpolateTypeChanged( int ) ) );
+ connect( m_pImageFileNameBrowse, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotImageFileBrowseClicked( ) ) );
+ connect( m_pImageFileNameEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotImageFileNameChanged( const TQString& ) ) );
+ connect( m_pOnceEdit, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) );
}
void PMMaterialMapEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmmaterialmapedit.h b/kpovmodeler/pmmaterialmapedit.h
index a39c9991..a6bba01a 100644
--- a/kpovmodeler/pmmaterialmapedit.h
+++ b/kpovmodeler/pmmaterialmapedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -41,7 +40,7 @@ class TQPushButton;
*/
class PMMaterialMapEdit : public PMDialogEditBase
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMDialogEditBase Base;
public:
diff --git a/kpovmodeler/pmmath.h b/kpovmodeler/pmmath.h
index 520b8b6d..fcfb6e71 100644
--- a/kpovmodeler/pmmath.h
+++ b/kpovmodeler/pmmath.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmmatrix.h b/kpovmodeler/pmmatrix.h
index a3691602..3471ab1c 100644
--- a/kpovmodeler/pmmatrix.h
+++ b/kpovmodeler/pmmatrix.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmmedia.h b/kpovmodeler/pmmedia.h
index 4836bf37..77c287c5 100644
--- a/kpovmodeler/pmmedia.h
+++ b/kpovmodeler/pmmedia.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmmediaedit.cpp b/kpovmodeler/pmmediaedit.cpp
index 75d99688..fed701c7 100644
--- a/kpovmodeler/pmmediaedit.cpp
+++ b/kpovmodeler/pmmediaedit.cpp
@@ -148,24 +148,24 @@ void PMMediaEdit::createTopWidgets( )
hl->addStretch( 1 );
topLayout( )->addWidget( m_pScatteringWidget );
- connect( m_pMethodEdit, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotMethodChanged( int ) ) );
- connect( m_pIntervalsEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pSamplesMinEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pSamplesMaxEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pConfidenceEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pVarianceEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pRatioEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pAALevelEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pAAThresholdEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pAbsorptionEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pEmissionEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pEnableAbsorptionEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAbsorptionClicked( ) ) );
- connect( m_pEnableEmissionEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotEmissionClicked( ) ) );
- connect( m_pEnableScatteringEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotScatteringClicked( ) ) );
- connect( m_pScatteringTypeEdit, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotScatteringTypeChanged( int ) ) );
- connect( m_pScatteringColorEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pScatteringEccentricityEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pScatteringExtinctionEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pMethodEdit, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotMethodChanged( int ) ) );
+ connect( m_pIntervalsEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pSamplesMinEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pSamplesMaxEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pConfidenceEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pVarianceEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pRatioEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pAALevelEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pAAThresholdEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pAbsorptionEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pEmissionEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pEnableAbsorptionEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotAbsorptionClicked( ) ) );
+ connect( m_pEnableEmissionEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotEmissionClicked( ) ) );
+ connect( m_pEnableScatteringEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotScatteringClicked( ) ) );
+ connect( m_pScatteringTypeEdit, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotScatteringTypeChanged( int ) ) );
+ connect( m_pScatteringColorEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pScatteringEccentricityEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pScatteringExtinctionEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
}
void PMMediaEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmmediaedit.h b/kpovmodeler/pmmediaedit.h
index a55095b8..cef8d415 100644
--- a/kpovmodeler/pmmediaedit.h
+++ b/kpovmodeler/pmmediaedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -39,7 +38,7 @@ class TQComboBox;
*/
class PMMediaEdit : public PMTextureBaseEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMTextureBaseEdit Base;
public:
diff --git a/kpovmodeler/pmmemento.h b/kpovmodeler/pmmemento.h
index cdbab2d2..2041c0e1 100644
--- a/kpovmodeler/pmmemento.h
+++ b/kpovmodeler/pmmemento.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmmesh.h b/kpovmodeler/pmmesh.h
index a6fe0089..8600454a 100644
--- a/kpovmodeler/pmmesh.h
+++ b/kpovmodeler/pmmesh.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmmeshedit.cpp b/kpovmodeler/pmmeshedit.cpp
index 4bab8877..bb9acc62 100644
--- a/kpovmodeler/pmmeshedit.cpp
+++ b/kpovmodeler/pmmeshedit.cpp
@@ -47,9 +47,9 @@ void PMMeshEdit::createTopWidgets( )
layout->addWidget( m_pInsideVector );
layout->addStretch( 1 );
- connect( m_pHierarchy, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pEnableInsideVector, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotInsideVectorClicked( ) ) );
- connect( m_pInsideVector, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pHierarchy, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pEnableInsideVector, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotInsideVectorClicked( ) ) );
+ connect( m_pInsideVector, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
}
void PMMeshEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmmeshedit.h b/kpovmodeler/pmmeshedit.h
index f79ce651..106211d5 100644
--- a/kpovmodeler/pmmeshedit.h
+++ b/kpovmodeler/pmmeshedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -35,7 +34,7 @@ class PMVectorEdit;
*/
class PMMeshEdit : public PMSolidObjectEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMSolidObjectEdit Base;
public:
diff --git a/kpovmodeler/pmmessage.h b/kpovmodeler/pmmessage.h
index 86404104..973013ad 100644
--- a/kpovmodeler/pmmessage.h
+++ b/kpovmodeler/pmmessage.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmmetaobject.h b/kpovmodeler/pmmetaobject.h
index 95822fc9..844053f9 100644
--- a/kpovmodeler/pmmetaobject.h
+++ b/kpovmodeler/pmmetaobject.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmmovecommand.h b/kpovmodeler/pmmovecommand.h
index 5aac246d..ab13dabb 100644
--- a/kpovmodeler/pmmovecommand.h
+++ b/kpovmodeler/pmmovecommand.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmnamedobject.h b/kpovmodeler/pmnamedobject.h
index 8b7b0b62..4ec4b6f8 100644
--- a/kpovmodeler/pmnamedobject.h
+++ b/kpovmodeler/pmnamedobject.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmnamedobjectedit.cpp b/kpovmodeler/pmnamedobjectedit.cpp
index 07107dd0..3702939b 100644
--- a/kpovmodeler/pmnamedobjectedit.cpp
+++ b/kpovmodeler/pmnamedobjectedit.cpp
@@ -41,8 +41,8 @@ void PMNamedObjectEdit::createTopWidgets( )
layout->addWidget( label );
layout->addWidget( m_pNameEdit );
- connect( m_pNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( slotNameChanged( const TQString& ) ) );
+ connect( m_pNameEdit, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( slotNameChanged( const TQString& ) ) );
}
void PMNamedObjectEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmnamedobjectedit.h b/kpovmodeler/pmnamedobjectedit.h
index 2877659f..7b5c6110 100644
--- a/kpovmodeler/pmnamedobjectedit.h
+++ b/kpovmodeler/pmnamedobjectedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -34,7 +33,7 @@ class TQLineEdit;
*/
class PMNamedObjectEdit : public PMDialogEditBase
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMDialogEditBase Base;
public:
diff --git a/kpovmodeler/pmnormal.h b/kpovmodeler/pmnormal.h
index c798d039..123f088e 100644
--- a/kpovmodeler/pmnormal.h
+++ b/kpovmodeler/pmnormal.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmnormaledit.cpp b/kpovmodeler/pmnormaledit.cpp
index 92a9d46d..550c1288 100644
--- a/kpovmodeler/pmnormaledit.cpp
+++ b/kpovmodeler/pmnormaledit.cpp
@@ -56,10 +56,10 @@ void PMNormalEdit::createTopWidgets( )
m_pUVMapping = new TQCheckBox( i18n( "UV mapping" ), this );
topLayout( )->addWidget( m_pUVMapping );
- connect( m_pBumpSizeCheck, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotBumpSizeClicked( )) );
- connect( m_pBumpSizeEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( )) );
- connect( m_pAccuracy, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pUVMapping, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pBumpSizeCheck, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotBumpSizeClicked( )) );
+ connect( m_pBumpSizeEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( )) );
+ connect( m_pAccuracy, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pUVMapping, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) );
}
void PMNormalEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmnormaledit.h b/kpovmodeler/pmnormaledit.h
index 9092ad08..9fb3bbbb 100644
--- a/kpovmodeler/pmnormaledit.h
+++ b/kpovmodeler/pmnormaledit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -35,7 +34,7 @@ class PMFloatEdit;
*/
class PMNormalEdit : public PMTextureBaseEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMTextureBaseEdit Base;
public:
diff --git a/kpovmodeler/pmobject.h b/kpovmodeler/pmobject.h
index 3f454ab5..4b19b13b 100644
--- a/kpovmodeler/pmobject.h
+++ b/kpovmodeler/pmobject.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmobjectaction.h b/kpovmodeler/pmobjectaction.h
index d270db9f..0a42b805 100644
--- a/kpovmodeler/pmobjectaction.h
+++ b/kpovmodeler/pmobjectaction.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmobjectdrag.cpp b/kpovmodeler/pmobjectdrag.cpp
index 23631df0..cd1ee6da 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( TQT_TQIODEVICE(&buffer) );
+ PMSerializer* ser = it.current( )->newSerializer( &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( TQT_TQIODEVICE(&buffer) );
+ PMSerializer* ser = fit.current( )->newSerializer( &buffer );
if( ser )
{
diff --git a/kpovmodeler/pmobjectdrag.h b/kpovmodeler/pmobjectdrag.h
index 4a6db4b9..175fcf97 100644
--- a/kpovmodeler/pmobjectdrag.h
+++ b/kpovmodeler/pmobjectdrag.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmobjectlibrarysettings.cpp b/kpovmodeler/pmobjectlibrarysettings.cpp
index 822f18f1..4f245ccc 100644
--- a/kpovmodeler/pmobjectlibrarysettings.cpp
+++ b/kpovmodeler/pmobjectlibrarysettings.cpp
@@ -43,20 +43,20 @@ PMObjectLibrarySettings::PMObjectLibrarySettings( TQWidget* parent, const char*
TQHBoxLayout* hlayout = new TQHBoxLayout( gb, KDialog::marginHint( ) + 5, KDialog::spacingHint( ) );
m_pObjectLibraries = new TQListBox( gb );
- connect( m_pObjectLibraries, TQT_SIGNAL( selectionChanged( ) ), TQT_SLOT( slotObjectLibraryChanged( ) ) );
+ connect( m_pObjectLibraries, TQ_SIGNAL( selectionChanged( ) ), TQ_SLOT( slotObjectLibraryChanged( ) ) );
hlayout->addWidget( m_pObjectLibraries );
TQVBoxLayout* gvl = new TQVBoxLayout( hlayout );
m_pCreateObjectLibrary = new TQPushButton( i18n( "Create..." ), gb );
- connect( m_pCreateObjectLibrary, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotCreateObjectLibrary( ) ) );
+ connect( m_pCreateObjectLibrary, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotCreateObjectLibrary( ) ) );
gvl->addWidget( m_pCreateObjectLibrary );
m_pRemoveObjectLibrary = new TQPushButton( i18n( "Remove" ), gb );
- connect( m_pRemoveObjectLibrary, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotRemoveObjectLibrary( ) ) );
+ connect( m_pRemoveObjectLibrary, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotRemoveObjectLibrary( ) ) );
gvl->addWidget( m_pRemoveObjectLibrary );
m_pImportObjectLibrary = new TQPushButton( i18n( "Import" ), gb );
- connect( m_pImportObjectLibrary, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotImportObjectLibrary( ) ) );
+ connect( m_pImportObjectLibrary, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotImportObjectLibrary( ) ) );
gvl->addWidget( m_pImportObjectLibrary );
m_pModifyObjectLibrary = new TQPushButton( i18n( "Properties" ), gb );
- connect( m_pModifyObjectLibrary, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotModifyObjectLibrary( ) ) );
+ connect( m_pModifyObjectLibrary, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotModifyObjectLibrary( ) ) );
gvl->addWidget( m_pModifyObjectLibrary );
gvl->addStretch( 1 );
diff --git a/kpovmodeler/pmobjectlibrarysettings.h b/kpovmodeler/pmobjectlibrarysettings.h
index 884902e2..68e1e6c8 100644
--- a/kpovmodeler/pmobjectlibrarysettings.h
+++ b/kpovmodeler/pmobjectlibrarysettings.h
@@ -34,7 +34,7 @@ class TQListBox;
*/
class PMObjectLibrarySettings : public PMSettingsDialogPage
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kpovmodeler/pmobjectlink.h b/kpovmodeler/pmobjectlink.h
index 8ec7b474..3eb0c3e8 100644
--- a/kpovmodeler/pmobjectlink.h
+++ b/kpovmodeler/pmobjectlink.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmobjectlinkedit.cpp b/kpovmodeler/pmobjectlinkedit.cpp
index 98aead0c..2aac5cfe 100644
--- a/kpovmodeler/pmobjectlinkedit.cpp
+++ b/kpovmodeler/pmobjectlinkedit.cpp
@@ -40,7 +40,7 @@ void PMObjectLinkEdit::createTopWidgets( )
l.append( "Light" );
m_pLinkEdit->setLinkPossibilities( l );
topLayout( )->addWidget( m_pLinkEdit );
- connect( m_pLinkEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pLinkEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
}
void PMObjectLinkEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmobjectlinkedit.h b/kpovmodeler/pmobjectlinkedit.h
index 1eb6a6c9..fea6b9c4 100644
--- a/kpovmodeler/pmobjectlinkedit.h
+++ b/kpovmodeler/pmobjectlinkedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -34,7 +33,7 @@ class PMLinkEdit;
*/
class PMObjectLinkEdit : public PMSolidObjectEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMSolidObjectEdit Base;
public:
diff --git a/kpovmodeler/pmobjectselect.cpp b/kpovmodeler/pmobjectselect.cpp
index dd5e4892..64c7d7de 100644
--- a/kpovmodeler/pmobjectselect.cpp
+++ b/kpovmodeler/pmobjectselect.cpp
@@ -92,10 +92,10 @@ PMObjectSelect::PMObjectSelect( TQWidget* parent, const char* name, bool modal )
setMainWidget( m_pListBox );
setInitialSize( s_size );
- connect( m_pListBox, TQT_SIGNAL( highlighted( TQListBoxItem* ) ),
- TQT_SLOT( slotHighlighted( TQListBoxItem* ) ) );
- connect( m_pListBox, TQT_SIGNAL( selected( TQListBoxItem* ) ),
- TQT_SLOT( slotSelected( TQListBoxItem* ) ) );
+ connect( m_pListBox, TQ_SIGNAL( highlighted( TQListBoxItem* ) ),
+ TQ_SLOT( slotHighlighted( TQListBoxItem* ) ) );
+ connect( m_pListBox, TQ_SIGNAL( selected( TQListBoxItem* ) ),
+ TQ_SLOT( slotSelected( TQListBoxItem* ) ) );
enableButtonOK( false );
}
diff --git a/kpovmodeler/pmobjectselect.h b/kpovmodeler/pmobjectselect.h
index 1f905ff8..eb2e00a5 100644
--- a/kpovmodeler/pmobjectselect.h
+++ b/kpovmodeler/pmobjectselect.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -83,7 +82,7 @@ private:
*/
class PMObjectSelect : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kpovmodeler/pmobjectsettings.h b/kpovmodeler/pmobjectsettings.h
index fed22d81..29bfbf18 100644
--- a/kpovmodeler/pmobjectsettings.h
+++ b/kpovmodeler/pmobjectsettings.h
@@ -33,7 +33,7 @@ class TQCheckBox;
*/
class PMObjectSettings : public PMSettingsDialogPage
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kpovmodeler/pmopenglsettings.h b/kpovmodeler/pmopenglsettings.h
index 32cad3f5..42f7b494 100644
--- a/kpovmodeler/pmopenglsettings.h
+++ b/kpovmodeler/pmopenglsettings.h
@@ -31,7 +31,7 @@ class TQCheckBox;
*/
class PMOpenGLSettings : public PMSettingsDialogPage
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kpovmodeler/pmoutputdevice.h b/kpovmodeler/pmoutputdevice.h
index 41bad2e5..fa09bd67 100644
--- a/kpovmodeler/pmoutputdevice.h
+++ b/kpovmodeler/pmoutputdevice.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmpalettevalue.h b/kpovmodeler/pmpalettevalue.h
index 44d443f4..b90f7076 100644
--- a/kpovmodeler/pmpalettevalue.h
+++ b/kpovmodeler/pmpalettevalue.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmpalettevalueedit.cpp b/kpovmodeler/pmpalettevalueedit.cpp
index d8cd0e24..1a9f8de2 100644
--- a/kpovmodeler/pmpalettevalueedit.cpp
+++ b/kpovmodeler/pmpalettevalueedit.cpp
@@ -55,8 +55,8 @@ PMPaletteValueEdit::PMPaletteValueEdit( TQWidget* parent, const char* name )
layout->addSpacing( KDialog::spacingHint( ) );
layout->addWidget( m_pValueEdit );
- connect( m_pIndexEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pValueEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pIndexEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pValueEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
}
void PMPaletteValueEdit::setIndex( int idx )
diff --git a/kpovmodeler/pmpalettevalueedit.h b/kpovmodeler/pmpalettevalueedit.h
index 19fdddeb..cf024461 100644
--- a/kpovmodeler/pmpalettevalueedit.h
+++ b/kpovmodeler/pmpalettevalueedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -34,7 +33,7 @@ class PMIntEdit;
*/
class PMPaletteValueEdit: public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
/** */
diff --git a/kpovmodeler/pmpalettevaluememento.h b/kpovmodeler/pmpalettevaluememento.h
index 8741b80c..75e0cc08 100644
--- a/kpovmodeler/pmpalettevaluememento.h
+++ b/kpovmodeler/pmpalettevaluememento.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmparser.cpp b/kpovmodeler/pmparser.cpp
index ef921734..4a5f64b0 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 = TQT_TQIODEVICE(buffer);
+ m_pDevice = buffer;
m_bDeviceCreated = true;
init( );
diff --git a/kpovmodeler/pmparser.h b/kpovmodeler/pmparser.h
index 6d75abe6..041c1f4f 100644
--- a/kpovmodeler/pmparser.h
+++ b/kpovmodeler/pmparser.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmpart.cpp b/kpovmodeler/pmpart.cpp
index 8198a9d7..494fc683 100644
--- a/kpovmodeler/pmpart.cpp
+++ b/kpovmodeler/pmpart.cpp
@@ -145,15 +145,15 @@ PMPart::PMPart( TQWidget* parentWidget, const char* widgetName,
restoreConfig( instance( )->config( ) );
- connect( tqApp->clipboard( ), TQT_SIGNAL( dataChanged( ) ),
- TQT_SLOT( slotClipboardDataChanged( ) ) );
+ connect( tqApp->clipboard( ), TQ_SIGNAL( dataChanged( ) ),
+ TQ_SLOT( slotClipboardDataChanged( ) ) );
slotClipboardDataChanged( );
- connect( &m_commandManager, TQT_SIGNAL( updateUndoRedo( const TQString&, const TQString& ) ),
- TQT_SLOT( slotUpdateUndoRedo( const TQString&, const TQString& ) ) );
- connect( &m_commandManager, TQT_SIGNAL( objectChanged( PMObject*, const int, TQObject* ) ),
- TQT_SLOT( slotObjectChanged( PMObject*, const int, TQObject* ) ) );
- connect( &m_commandManager, TQT_SIGNAL( idChanged( PMObject*, const TQString& ) ),
- TQT_SLOT( slotIDChanged( PMObject*, const TQString& ) ) );
+ connect( &m_commandManager, TQ_SIGNAL( updateUndoRedo( const TQString&, const TQString& ) ),
+ TQ_SLOT( slotUpdateUndoRedo( const TQString&, const TQString& ) ) );
+ connect( &m_commandManager, TQ_SIGNAL( objectChanged( PMObject*, const int, TQObject* ) ),
+ TQ_SLOT( slotObjectChanged( PMObject*, const int, TQObject* ) ) );
+ connect( &m_commandManager, TQ_SIGNAL( idChanged( PMObject*, const TQString& ) ),
+ TQ_SLOT( slotIDChanged( PMObject*, const TQString& ) ) );
PMPluginManager::theManager( )->registerPart( this );
@@ -202,8 +202,8 @@ PMPart::PMPart( TQWidget* /*parentWidget*/, const char* /*widgetName*/,
initCopyPasteActions( );
- connect( &m_commandManager, TQT_SIGNAL( objectChanged( PMObject*, const int, TQObject* ) ),
- TQT_SLOT( slotObjectChanged( PMObject*, const int, TQObject* ) ) );
+ connect( &m_commandManager, TQ_SIGNAL( objectChanged( PMObject*, const int, TQObject* ) ),
+ TQ_SLOT( slotObjectChanged( PMObject*, const int, TQObject* ) ) );
PMPluginManager::theManager( )->registerPart( this );
@@ -222,13 +222,13 @@ PMPart::~PMPart( )
void PMPart::initCopyPasteActions( )
{
// setup edit menu
- m_pCutAction = KStdAction::cut( this, TQT_SLOT( slotEditCut( ) ), actionCollection( ) );
- m_pCopyAction = KStdAction::copy( this, TQT_SLOT( slotEditCopy( ) ), actionCollection( ) );
- m_pPasteAction = KStdAction::paste( this, TQT_SLOT( slotEditPaste( ) ), actionCollection( ) );
+ m_pCutAction = KStdAction::cut( this, TQ_SLOT( slotEditCut( ) ), actionCollection( ) );
+ m_pCopyAction = KStdAction::copy( this, TQ_SLOT( slotEditCopy( ) ), actionCollection( ) );
+ m_pPasteAction = KStdAction::paste( this, TQ_SLOT( slotEditPaste( ) ), actionCollection( ) );
m_pDeleteAction =
new TDEAction( i18n( "Delete" ), "edittrash", TQt::Key_Delete,
- this, TQT_SLOT( slotEditDelete( ) ),
+ this, TQ_SLOT( slotEditDelete( ) ),
actionCollection( ), "edit_delete" );
m_pCutAction->setEnabled( false );
@@ -242,32 +242,32 @@ void PMPart::initActions( )
{
// file menu
m_pImportAction = new TDEAction( i18n( "Import..." ), 0, this,
- TQT_SLOT( slotFileImport( ) ), actionCollection( ),
+ TQ_SLOT( slotFileImport( ) ), actionCollection( ),
"file_import" );
m_pExportAction = new TDEAction( i18n( "&Export..." ), 0, this,
- TQT_SLOT( slotFileExport( ) ), actionCollection( ),
+ TQ_SLOT( slotFileExport( ) ), actionCollection( ),
"file_export" );
initCopyPasteActions( );
m_onlyCopyPaste = false;
- m_pRenderComboAction = new PMComboAction( i18n( "Render Modes" ), 0, this, TQT_SLOT( slotRenderMode( int ) ),
+ m_pRenderComboAction = new PMComboAction( i18n( "Render Modes" ), 0, this, TQ_SLOT( slotRenderMode( int ) ),
actionCollection( ), "view_render_combo" );
m_pRenderComboAction->setMinimumWidth( 250 );
- connect( m_pRenderComboAction, TQT_SIGNAL( plugged( ) ),
- TQT_SLOT( slotRenderModeActionPlugged( ) ) );
- m_pRenderAction = new TDEAction( i18n( "Render" ), "pmrender", 0, this, TQT_SLOT( slotRender( ) ),
+ connect( m_pRenderComboAction, TQ_SIGNAL( plugged( ) ),
+ TQ_SLOT( slotRenderModeActionPlugged( ) ) );
+ m_pRenderAction = new TDEAction( i18n( "Render" ), "pmrender", 0, this, TQ_SLOT( slotRender( ) ),
actionCollection( ), "view_render" );
- m_pRenderSettingsAction = new TDEAction( i18n( "Render Modes..." ), "pmrendersettings", 0, this, TQT_SLOT( slotRenderSettings( ) ),
+ m_pRenderSettingsAction = new TDEAction( i18n( "Render Modes..." ), "pmrendersettings", 0, this, TQ_SLOT( slotRenderSettings( ) ),
actionCollection( ), "view_render_settings" );
- m_pViewRenderWindowAction = new TDEAction( i18n( "Render Window" ), 0, this, TQT_SLOT( slotViewRenderWindow( ) ),
+ m_pViewRenderWindowAction = new TDEAction( i18n( "Render Window" ), 0, this, TQ_SLOT( slotViewRenderWindow( ) ),
actionCollection( ), "view_render_window" );
m_pVisibilityLabelAction = new PMLabelAction( i18n( "Visibility level:" ) + TQString( " " ), actionCollection( ), "view_visibility_label" );
m_pVisibilityLevelAction = new PMSpinBoxAction( i18n( "Visibility Level" ),
- 0, this, TQT_SLOT( slotVisibilityLevelChanged( int ) ),
+ 0, this, TQ_SLOT( slotVisibilityLevelChanged( int ) ),
actionCollection( ), "view_visibility_level" );
- connect( m_pVisibilityLevelAction, TQT_SIGNAL( plugged( ) ),
- TQT_SLOT( slotVisibilityActionPlugged( ) ) );
+ connect( m_pVisibilityLevelAction, TQ_SIGNAL( plugged( ) ),
+ TQ_SLOT( slotVisibilityActionPlugged( ) ) );
m_pGlobalDetailLabelAction = new PMLabelAction( i18n( "Global detail:" ) + TQString( " " ), actionCollection( ), "global_detail_label" );
m_pGlobalDetailAction = new TDESelectAction( i18n("Global Detail Level"), TDEShortcut(), actionCollection(), "global_detail_level" );
@@ -278,275 +278,275 @@ void PMPart::initActions( )
strList.append( i18n( "High" ) );
strList.append( i18n( "Very High" ) );
m_pGlobalDetailAction->setItems( strList );
- connect( m_pGlobalDetailAction, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotGlobalDetailLevelChanged( int ) ) );
+ connect( m_pGlobalDetailAction, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotGlobalDetailLevelChanged( int ) ) );
// new objects
if( isReadWrite( ) )
{
- m_pNewGlobalSettingsAction = new TDEAction( i18n( "Global Settings" ), "pmglobalsettings", 0, this, TQT_SLOT( slotNewGlobalSettings( ) ),
+ m_pNewGlobalSettingsAction = new TDEAction( i18n( "Global Settings" ), "pmglobalsettings", 0, this, TQ_SLOT( slotNewGlobalSettings( ) ),
actionCollection( ), "new_globalsettings" );
m_readWriteActions.append( m_pNewGlobalSettingsAction );
- m_pNewSkySphereAction = new TDEAction( i18n( "Sky Sphere" ), "pmskysphere", 0, this, TQT_SLOT( slotNewSkySphere( ) ),
+ m_pNewSkySphereAction = new TDEAction( i18n( "Sky Sphere" ), "pmskysphere", 0, this, TQ_SLOT( slotNewSkySphere( ) ),
actionCollection( ), "new_skysphere" );
m_readWriteActions.append( m_pNewSkySphereAction );
- m_pNewRainbowAction = new TDEAction( i18n( "Rainbow" ), "pmrainbow", 0, this, TQT_SLOT( slotNewRainbow( ) ),
+ m_pNewRainbowAction = new TDEAction( i18n( "Rainbow" ), "pmrainbow", 0, this, TQ_SLOT( slotNewRainbow( ) ),
actionCollection( ), "new_rainbow" );
m_readWriteActions.append( m_pNewRainbowAction );
- m_pNewFogAction = new TDEAction( i18n( "Fog" ), "pmfog", 0, this, TQT_SLOT( slotNewFog( ) ),
+ m_pNewFogAction = new TDEAction( i18n( "Fog" ), "pmfog", 0, this, TQ_SLOT( slotNewFog( ) ),
actionCollection( ), "new_fog" );
m_readWriteActions.append( m_pNewFogAction );
- m_pNewInteriorAction = new TDEAction( i18n( "Interior" ), "pminterior", 0, this, TQT_SLOT( slotNewInterior( ) ),
+ m_pNewInteriorAction = new TDEAction( i18n( "Interior" ), "pminterior", 0, this, TQ_SLOT( slotNewInterior( ) ),
actionCollection( ), "new_interior" );
m_readWriteActions.append( m_pNewInteriorAction );
- m_pNewMediaAction = new TDEAction( i18n( "Media" ), "pmmedia", 0, this, TQT_SLOT( slotNewMedia( ) ),
+ m_pNewMediaAction = new TDEAction( i18n( "Media" ), "pmmedia", 0, this, TQ_SLOT( slotNewMedia( ) ),
actionCollection( ), "new_media" );
m_readWriteActions.append( m_pNewMediaAction );
- m_pNewDensityAction = new TDEAction( i18n( "Density" ), "pmdensity", 0, this, TQT_SLOT( slotNewDensity( ) ),
+ m_pNewDensityAction = new TDEAction( i18n( "Density" ), "pmdensity", 0, this, TQ_SLOT( slotNewDensity( ) ),
actionCollection( ), "new_density" );
m_readWriteActions.append( m_pNewDensityAction );
- m_pNewMaterialAction = new TDEAction( i18n( "Material" ), "pmmaterial", 0, this, TQT_SLOT( slotNewMaterial( ) ),
+ m_pNewMaterialAction = new TDEAction( i18n( "Material" ), "pmmaterial", 0, this, TQ_SLOT( slotNewMaterial( ) ),
actionCollection( ), "new_material" );
m_readWriteActions.append( m_pNewMaterialAction );
- m_pNewBoxAction = new TDEAction( i18n( "Box" ), "pmbox", 0, this, TQT_SLOT( slotNewBox( ) ),
+ m_pNewBoxAction = new TDEAction( i18n( "Box" ), "pmbox", 0, this, TQ_SLOT( slotNewBox( ) ),
actionCollection( ), "new_box" );
m_readWriteActions.append( m_pNewBoxAction );
- m_pNewSphereAction = new TDEAction( i18n( "Sphere" ), "pmsphere", 0, this, TQT_SLOT( slotNewSphere( ) ),
+ m_pNewSphereAction = new TDEAction( i18n( "Sphere" ), "pmsphere", 0, this, TQ_SLOT( slotNewSphere( ) ),
actionCollection( ), "new_sphere" );
m_readWriteActions.append( m_pNewSphereAction );
- m_pNewCylinderAction = new TDEAction( i18n( "Cylinder" ), "pmcylinder", 0, this, TQT_SLOT( slotNewCylinder( ) ),
+ m_pNewCylinderAction = new TDEAction( i18n( "Cylinder" ), "pmcylinder", 0, this, TQ_SLOT( slotNewCylinder( ) ),
actionCollection( ), "new_cylinder" );
m_readWriteActions.append( m_pNewCylinderAction );
- m_pNewConeAction = new TDEAction( i18n( "Cone" ), "pmcone", 0, this, TQT_SLOT( slotNewCone( ) ),
+ m_pNewConeAction = new TDEAction( i18n( "Cone" ), "pmcone", 0, this, TQ_SLOT( slotNewCone( ) ),
actionCollection( ), "new_cone" );
m_readWriteActions.append( m_pNewConeAction );
- m_pNewTorusAction = new TDEAction( i18n( "Torus" ), "pmtorus", 0, this, TQT_SLOT( slotNewTorus( ) ),
+ m_pNewTorusAction = new TDEAction( i18n( "Torus" ), "pmtorus", 0, this, TQ_SLOT( slotNewTorus( ) ),
actionCollection( ), "new_torus" );
m_readWriteActions.append( m_pNewTorusAction );
- m_pNewLatheAction = new TDEAction( i18n( "Lathe" ), "pmlathe", 0, this, TQT_SLOT( slotNewLathe( ) ),
+ m_pNewLatheAction = new TDEAction( i18n( "Lathe" ), "pmlathe", 0, this, TQ_SLOT( slotNewLathe( ) ),
actionCollection( ), "new_lathe" );
m_readWriteActions.append( m_pNewLatheAction );
- m_pNewPrismAction = new TDEAction( i18n( "Prism" ), "pmprism", 0, this, TQT_SLOT( slotNewPrism( ) ),
+ m_pNewPrismAction = new TDEAction( i18n( "Prism" ), "pmprism", 0, this, TQ_SLOT( slotNewPrism( ) ),
actionCollection( ), "new_prism" );
m_readWriteActions.append( m_pNewPrismAction );
- m_pNewSurfaceOfRevolutionAction = new TDEAction( i18n( "Surface of Revolution" ), "pmsor", 0, this, TQT_SLOT( slotNewSurfaceOfRevolution( ) ),
+ m_pNewSurfaceOfRevolutionAction = new TDEAction( i18n( "Surface of Revolution" ), "pmsor", 0, this, TQ_SLOT( slotNewSurfaceOfRevolution( ) ),
actionCollection( ), "new_surfaceofrevolution" );
m_readWriteActions.append( m_pNewSurfaceOfRevolutionAction );
- m_pNewSuperquadricEllipsoidAction = new TDEAction( i18n( "Superquadric Ellipsoid" ), "pmsqe", 0, this, TQT_SLOT( slotNewSuperquadricEllipsoid( ) ),
+ m_pNewSuperquadricEllipsoidAction = new TDEAction( i18n( "Superquadric Ellipsoid" ), "pmsqe", 0, this, TQ_SLOT( slotNewSuperquadricEllipsoid( ) ),
actionCollection( ), "new_superquadricellipsoid" );
m_readWriteActions.append( m_pNewSuperquadricEllipsoidAction );
- m_pNewJuliaFractalAction = new TDEAction( i18n( "Julia Fractal" ), "pmjuliafractal", 0, this, TQT_SLOT( slotNewJuliaFractal( ) ),
+ m_pNewJuliaFractalAction = new TDEAction( i18n( "Julia Fractal" ), "pmjuliafractal", 0, this, TQ_SLOT( slotNewJuliaFractal( ) ),
actionCollection( ), "new_juliafractal" );
m_readWriteActions.append( m_pNewJuliaFractalAction );
- m_pNewHeightFieldAction = new TDEAction( i18n( "Height Field" ), "pmheightfield", 0, this, TQT_SLOT( slotNewHeightField( ) ),
+ m_pNewHeightFieldAction = new TDEAction( i18n( "Height Field" ), "pmheightfield", 0, this, TQ_SLOT( slotNewHeightField( ) ),
actionCollection( ), "new_heightfield" );
m_readWriteActions.append( m_pNewHeightFieldAction );
- m_pNewTextAction = new TDEAction( i18n( "Text" ), "pmtext", 0, this, TQT_SLOT( slotNewText( ) ),
+ m_pNewTextAction = new TDEAction( i18n( "Text" ), "pmtext", 0, this, TQ_SLOT( slotNewText( ) ),
actionCollection( ), "new_text" );
m_readWriteActions.append( m_pNewTextAction );
- m_pNewBlobAction = new TDEAction( i18n( "Blob" ), "pmblob", 0, this, TQT_SLOT( slotNewBlob( ) ),
+ m_pNewBlobAction = new TDEAction( i18n( "Blob" ), "pmblob", 0, this, TQ_SLOT( slotNewBlob( ) ),
actionCollection( ), "new_blob" );
m_readWriteActions.append( m_pNewBlobAction );
- m_pNewBlobSphereAction = new TDEAction( i18n( "Blob Sphere" ), "pmblobsphere", 0, this, TQT_SLOT( slotNewBlobSphere( ) ),
+ m_pNewBlobSphereAction = new TDEAction( i18n( "Blob Sphere" ), "pmblobsphere", 0, this, TQ_SLOT( slotNewBlobSphere( ) ),
actionCollection( ), "new_blobsphere" );
m_readWriteActions.append( m_pNewBlobSphereAction );
- m_pNewBlobCylinderAction = new TDEAction( i18n( "Blob Cylinder" ), "pmblobcylinder", 0, this, TQT_SLOT( slotNewBlobCylinder( ) ),
+ m_pNewBlobCylinderAction = new TDEAction( i18n( "Blob Cylinder" ), "pmblobcylinder", 0, this, TQ_SLOT( slotNewBlobCylinder( ) ),
actionCollection( ), "new_blobcylinder" );
m_readWriteActions.append( m_pNewBlobCylinderAction );
- m_pNewPlaneAction = new TDEAction( i18n( "Plane" ), "pmplane", 0, this, TQT_SLOT( slotNewPlane( ) ),
+ m_pNewPlaneAction = new TDEAction( i18n( "Plane" ), "pmplane", 0, this, TQ_SLOT( slotNewPlane( ) ),
actionCollection( ), "new_plane" );
m_readWriteActions.append( m_pNewPlaneAction );
- m_pNewPolynomAction = new TDEAction( i18n( "Polynom" ), "pmpolynom", 0, this, TQT_SLOT( slotNewPolynom( ) ),
+ m_pNewPolynomAction = new TDEAction( i18n( "Polynom" ), "pmpolynom", 0, this, TQ_SLOT( slotNewPolynom( ) ),
actionCollection( ), "new_polynom" );
m_readWriteActions.append( m_pNewPolynomAction );
- m_pNewDeclareAction = new TDEAction( i18n( "Declaration" ), "pmdeclare", 0, this, TQT_SLOT( slotNewDeclare( ) ),
+ m_pNewDeclareAction = new TDEAction( i18n( "Declaration" ), "pmdeclare", 0, this, TQ_SLOT( slotNewDeclare( ) ),
actionCollection( ), "new_declare" );
m_readWriteActions.append( m_pNewDeclareAction );
- m_pNewObjectLinkAction = new TDEAction( i18n( "Object Link" ), "pmobjectlink", 0, this, TQT_SLOT( slotNewObjectLink( ) ),
+ m_pNewObjectLinkAction = new TDEAction( i18n( "Object Link" ), "pmobjectlink", 0, this, TQ_SLOT( slotNewObjectLink( ) ),
actionCollection( ), "new_objectlink" );
m_readWriteActions.append( m_pNewObjectLinkAction );
- m_pNewUnionAction = new TDEAction( i18n( "Union" ), "pmunion", 0, this, TQT_SLOT( slotNewUnion( ) ),
+ m_pNewUnionAction = new TDEAction( i18n( "Union" ), "pmunion", 0, this, TQ_SLOT( slotNewUnion( ) ),
actionCollection( ), "new_union" );
m_readWriteActions.append( m_pNewUnionAction );
- m_pNewIntersectionAction = new TDEAction( i18n( "Intersection" ), "pmintersection", 0, this, TQT_SLOT( slotNewIntersection( ) ),
+ m_pNewIntersectionAction = new TDEAction( i18n( "Intersection" ), "pmintersection", 0, this, TQ_SLOT( slotNewIntersection( ) ),
actionCollection( ), "new_intersection" );
m_readWriteActions.append( m_pNewIntersectionAction );
- m_pNewDifferenceAction = new TDEAction( i18n( "Difference" ), "pmdifference", 0, this, TQT_SLOT( slotNewDifference( ) ),
+ m_pNewDifferenceAction = new TDEAction( i18n( "Difference" ), "pmdifference", 0, this, TQ_SLOT( slotNewDifference( ) ),
actionCollection( ), "new_difference" );
m_readWriteActions.append( m_pNewDifferenceAction );
- m_pNewMergeAction = new TDEAction( i18n( "Merge" ), "pmmerge", 0, this, TQT_SLOT( slotNewMerge( ) ),
+ m_pNewMergeAction = new TDEAction( i18n( "Merge" ), "pmmerge", 0, this, TQ_SLOT( slotNewMerge( ) ),
actionCollection( ), "new_merge" );
m_readWriteActions.append( m_pNewMergeAction );
- m_pNewBoundedByAction = new TDEAction( i18n( "Bounded By" ), "pmboundedby", 0, this, TQT_SLOT( slotNewBoundedBy( ) ),
+ m_pNewBoundedByAction = new TDEAction( i18n( "Bounded By" ), "pmboundedby", 0, this, TQ_SLOT( slotNewBoundedBy( ) ),
actionCollection( ), "new_boundedby" );
m_readWriteActions.append( m_pNewBoundedByAction );
- m_pNewClippedByAction = new TDEAction( i18n( "Clipped By" ), "pmclippedby", 0, this, TQT_SLOT( slotNewClippedBy( ) ),
+ m_pNewClippedByAction = new TDEAction( i18n( "Clipped By" ), "pmclippedby", 0, this, TQ_SLOT( slotNewClippedBy( ) ),
actionCollection( ), "new_clippedby" );
m_readWriteActions.append( m_pNewClippedByAction );
- m_pNewLightAction = new TDEAction( i18n( "Light" ), "pmlight", 0, this, TQT_SLOT( slotNewLight( ) ),
+ m_pNewLightAction = new TDEAction( i18n( "Light" ), "pmlight", 0, this, TQ_SLOT( slotNewLight( ) ),
actionCollection( ), "new_light" );
m_readWriteActions.append( m_pNewLightAction );
- m_pNewLooksLikeAction = new TDEAction( i18n( "Looks Like" ), "pmlookslike", 0, this, TQT_SLOT( slotNewLooksLike( ) ),
+ m_pNewLooksLikeAction = new TDEAction( i18n( "Looks Like" ), "pmlookslike", 0, this, TQ_SLOT( slotNewLooksLike( ) ),
actionCollection( ), "new_lookslike" );
m_readWriteActions.append( m_pNewLooksLikeAction );
- m_pNewProjectedThroughAction = new TDEAction( i18n( "Projected Through" ), "pmprojectedthrough", 0, this, TQT_SLOT( slotNewProjectedThrough( ) ),
+ m_pNewProjectedThroughAction = new TDEAction( i18n( "Projected Through" ), "pmprojectedthrough", 0, this, TQ_SLOT( slotNewProjectedThrough( ) ),
actionCollection( ), "new_projectedthrough" );
m_readWriteActions.append( m_pNewProjectedThroughAction );
- m_pNewBicubicPatchAction = new TDEAction( i18n( "Bicubic Patch" ), "pmbicubicpatch", 0, this, TQT_SLOT( slotNewBicubicPatch( ) ),
+ m_pNewBicubicPatchAction = new TDEAction( i18n( "Bicubic Patch" ), "pmbicubicpatch", 0, this, TQ_SLOT( slotNewBicubicPatch( ) ),
actionCollection( ), "new_bicubicpatch" );
m_readWriteActions.append( m_pNewBicubicPatchAction );
- m_pNewDiscAction = new TDEAction( i18n( "Disc" ), "pmdisc", 0, this, TQT_SLOT( slotNewDisc( ) ),
+ m_pNewDiscAction = new TDEAction( i18n( "Disc" ), "pmdisc", 0, this, TQ_SLOT( slotNewDisc( ) ),
actionCollection( ), "new_disc" );
m_readWriteActions.append( m_pNewDiscAction );
- m_pNewTriangleAction = new TDEAction( i18n( "Triangle" ), "pmtriangle", 0, this, TQT_SLOT( slotNewTriangle( ) ),
+ m_pNewTriangleAction = new TDEAction( i18n( "Triangle" ), "pmtriangle", 0, this, TQ_SLOT( slotNewTriangle( ) ),
actionCollection( ), "new_triangle" );
m_readWriteActions.append( m_pNewTriangleAction );
- m_pNewCameraAction = new TDEAction( i18n( "Camera" ), "pmcamera", 0, this, TQT_SLOT( slotNewCamera( ) ),
+ m_pNewCameraAction = new TDEAction( i18n( "Camera" ), "pmcamera", 0, this, TQ_SLOT( slotNewCamera( ) ),
actionCollection( ), "new_camera" );
m_readWriteActions.append( m_pNewCameraAction );
- m_pNewTextureAction = new TDEAction( i18n( "Texture" ), "pmtexture", 0, this, TQT_SLOT( slotNewTexture( ) ),
+ m_pNewTextureAction = new TDEAction( i18n( "Texture" ), "pmtexture", 0, this, TQ_SLOT( slotNewTexture( ) ),
actionCollection( ), "new_texture" );
m_readWriteActions.append( m_pNewTextureAction );
- m_pNewPigmentAction = new TDEAction( i18n( "Pigment" ), "pmpigment", 0, this, TQT_SLOT( slotNewPigment( ) ),
+ m_pNewPigmentAction = new TDEAction( i18n( "Pigment" ), "pmpigment", 0, this, TQ_SLOT( slotNewPigment( ) ),
actionCollection( ), "new_pigment" );
m_readWriteActions.append( m_pNewPigmentAction );
- m_pNewNormalAction = new TDEAction( i18n( "Normal" ), "pmnormal", 0, this, TQT_SLOT( slotNewNormal( ) ),
+ m_pNewNormalAction = new TDEAction( i18n( "Normal" ), "pmnormal", 0, this, TQ_SLOT( slotNewNormal( ) ),
actionCollection( ), "new_normal" );
m_readWriteActions.append( m_pNewNormalAction );
- m_pNewSolidColorAction = new TDEAction( i18n( "Solid Color" ), "pmsolidcolor", 0, this, TQT_SLOT( slotNewSolidColor( ) ),
+ m_pNewSolidColorAction = new TDEAction( i18n( "Solid Color" ), "pmsolidcolor", 0, this, TQ_SLOT( slotNewSolidColor( ) ),
actionCollection( ), "new_solidcolor" );
m_readWriteActions.append( m_pNewSolidColorAction );
- m_pNewTextureListAction = new TDEAction( i18n( "Texture List" ), "pmtexturelist", 0, this, TQT_SLOT( slotNewTextureList( ) ),
+ m_pNewTextureListAction = new TDEAction( i18n( "Texture List" ), "pmtexturelist", 0, this, TQ_SLOT( slotNewTextureList( ) ),
actionCollection( ), "new_texturelist" );
m_readWriteActions.append( m_pNewTextureListAction );
- m_pNewColorListAction = new TDEAction( i18n( "Color List" ), "pmcolorlist", 0, this, TQT_SLOT( slotNewColorList( ) ),
+ m_pNewColorListAction = new TDEAction( i18n( "Color List" ), "pmcolorlist", 0, this, TQ_SLOT( slotNewColorList( ) ),
actionCollection( ), "new_colorlist" );
m_readWriteActions.append( m_pNewColorListAction );
- m_pNewPigmentListAction = new TDEAction( i18n( "Pigment List" ), "pmpigmentlist", 0, this, TQT_SLOT( slotNewPigmentList( ) ),
+ m_pNewPigmentListAction = new TDEAction( i18n( "Pigment List" ), "pmpigmentlist", 0, this, TQ_SLOT( slotNewPigmentList( ) ),
actionCollection( ), "new_pigmentlist" );
m_readWriteActions.append( m_pNewPigmentListAction );
- m_pNewNormalListAction = new TDEAction( i18n( "Normal List" ), "pmnormallist", 0, this, TQT_SLOT( slotNewNormalList( ) ),
+ m_pNewNormalListAction = new TDEAction( i18n( "Normal List" ), "pmnormallist", 0, this, TQ_SLOT( slotNewNormalList( ) ),
actionCollection( ), "new_normallist" );
m_readWriteActions.append( m_pNewNormalListAction );
- m_pNewDensityListAction = new TDEAction( i18n( "Density List" ), "pmdensitylist", 0, this, TQT_SLOT( slotNewDensityList( ) ),
+ m_pNewDensityListAction = new TDEAction( i18n( "Density List" ), "pmdensitylist", 0, this, TQ_SLOT( slotNewDensityList( ) ),
actionCollection( ), "new_densitylist" );
m_readWriteActions.append( m_pNewDensityListAction );
- m_pNewFinishAction = new TDEAction( i18n( "Finish" ), "pmfinish", 0, this, TQT_SLOT( slotNewFinish( ) ),
+ m_pNewFinishAction = new TDEAction( i18n( "Finish" ), "pmfinish", 0, this, TQ_SLOT( slotNewFinish( ) ),
actionCollection( ), "new_finish" );
m_readWriteActions.append( m_pNewFinishAction );
- m_pNewPatternAction = new TDEAction( i18n( "Pattern" ), "pmpattern", 0, this, TQT_SLOT( slotNewPattern( ) ),
+ m_pNewPatternAction = new TDEAction( i18n( "Pattern" ), "pmpattern", 0, this, TQ_SLOT( slotNewPattern( ) ),
actionCollection( ), "new_pattern" );
m_readWriteActions.append( m_pNewPatternAction );
- m_pNewBlendMapModifiersAction = new TDEAction( i18n( "Blend Map Modifiers" ), "pmblendmapmodifiers", 0, this, TQT_SLOT( slotNewBlendMapModifiers( ) ),
+ m_pNewBlendMapModifiersAction = new TDEAction( i18n( "Blend Map Modifiers" ), "pmblendmapmodifiers", 0, this, TQ_SLOT( slotNewBlendMapModifiers( ) ),
actionCollection( ), "new_blendmapmodifiers" );
m_readWriteActions.append( m_pNewBlendMapModifiersAction );
- m_pNewTextureMapAction = new TDEAction( i18n( "Texture Map" ), "pmtexturemap", 0, this, TQT_SLOT( slotNewTextureMap( ) ),
+ m_pNewTextureMapAction = new TDEAction( i18n( "Texture Map" ), "pmtexturemap", 0, this, TQ_SLOT( slotNewTextureMap( ) ),
actionCollection( ), "new_texturemap" );
m_readWriteActions.append( m_pNewTextureMapAction );
- m_pNewMaterialMapAction = new TDEAction( i18n( "Material Map" ), "pmmaterialmap", 0, this, TQT_SLOT( slotNewMaterialMap( ) ),
+ m_pNewMaterialMapAction = new TDEAction( i18n( "Material Map" ), "pmmaterialmap", 0, this, TQ_SLOT( slotNewMaterialMap( ) ),
actionCollection( ), "new_materialmap" );
m_readWriteActions.append( m_pNewMaterialMapAction );
- m_pNewPigmentMapAction = new TDEAction( i18n( "Pigment Map" ), "pmpigmentmap", 0, this, TQT_SLOT( slotNewPigmentMap( ) ),
+ m_pNewPigmentMapAction = new TDEAction( i18n( "Pigment Map" ), "pmpigmentmap", 0, this, TQ_SLOT( slotNewPigmentMap( ) ),
actionCollection( ), "new_pigmentmap" );
m_readWriteActions.append( m_pNewPigmentMapAction );
- m_pNewColorMapAction = new TDEAction( i18n( "Color Map" ), "pmcolormap", 0, this, TQT_SLOT( slotNewColorMap( ) ),
+ m_pNewColorMapAction = new TDEAction( i18n( "Color Map" ), "pmcolormap", 0, this, TQ_SLOT( slotNewColorMap( ) ),
actionCollection( ), "new_colormap" );
m_readWriteActions.append( m_pNewColorMapAction );
- m_pNewNormalMapAction = new TDEAction( i18n( "Normal Map" ), "pmnormalmap", 0, this, TQT_SLOT( slotNewNormalMap( ) ),
+ m_pNewNormalMapAction = new TDEAction( i18n( "Normal Map" ), "pmnormalmap", 0, this, TQ_SLOT( slotNewNormalMap( ) ),
actionCollection( ), "new_normalmap" );
m_readWriteActions.append( m_pNewNormalMapAction );
- m_pNewBumpMapAction = new TDEAction( i18n( "Bump Map" ), "pmbumpmap", 0, this, TQT_SLOT( slotNewBumpMap( ) ),
+ m_pNewBumpMapAction = new TDEAction( i18n( "Bump Map" ), "pmbumpmap", 0, this, TQ_SLOT( slotNewBumpMap( ) ),
actionCollection( ), "new_bumpmap" );
m_readWriteActions.append( m_pNewBumpMapAction );
- m_pNewSlopeMapAction = new TDEAction( i18n( "Slope Map" ), "pmslopemap", 0, this, TQT_SLOT( slotNewSlopeMap( ) ),
+ m_pNewSlopeMapAction = new TDEAction( i18n( "Slope Map" ), "pmslopemap", 0, this, TQ_SLOT( slotNewSlopeMap( ) ),
actionCollection( ), "new_slopemap" );
m_readWriteActions.append( m_pNewSlopeMapAction );
- m_pNewDensityMapAction = new TDEAction( i18n( "Density Map" ), "pmdensitymap", 0, this, TQT_SLOT( slotNewDensityMap( ) ),
+ m_pNewDensityMapAction = new TDEAction( i18n( "Density Map" ), "pmdensitymap", 0, this, TQ_SLOT( slotNewDensityMap( ) ),
actionCollection( ), "new_densitymap" );
m_readWriteActions.append( m_pNewDensityMapAction );
- m_pNewSlopeAction = new TDEAction( i18n( "Slope" ), "pmslope", 0, this, TQT_SLOT( slotNewSlope( ) ),
+ m_pNewSlopeAction = new TDEAction( i18n( "Slope" ), "pmslope", 0, this, TQ_SLOT( slotNewSlope( ) ),
actionCollection( ), "new_slope" );
m_readWriteActions.append( m_pNewSlopeAction );
- m_pNewWarpAction = new TDEAction( i18n( "Warp" ), "pmwarp", 0, this, TQT_SLOT( slotNewWarp( ) ),
+ m_pNewWarpAction = new TDEAction( i18n( "Warp" ), "pmwarp", 0, this, TQ_SLOT( slotNewWarp( ) ),
actionCollection( ), "new_warp" );
m_readWriteActions.append( m_pNewWarpAction );
- m_pNewImageMapAction = new TDEAction( i18n( "Image Map" ), "pmimagemap", 0, this, TQT_SLOT( slotNewImageMap( ) ),
+ m_pNewImageMapAction = new TDEAction( i18n( "Image Map" ), "pmimagemap", 0, this, TQ_SLOT( slotNewImageMap( ) ),
actionCollection( ), "new_imagemap" );
m_readWriteActions.append( m_pNewImageMapAction );
- m_pNewQuickColorAction = new TDEAction( i18n( "QuickColor" ), "pmquickcolor", 0, this, TQT_SLOT( slotNewQuickColor( ) ),
+ m_pNewQuickColorAction = new TDEAction( i18n( "QuickColor" ), "pmquickcolor", 0, this, TQ_SLOT( slotNewQuickColor( ) ),
actionCollection( ), "new_quickcolor" );
m_readWriteActions.append( m_pNewQuickColorAction );
- m_pNewTranslateAction = new TDEAction( i18n( "Translate" ), "pmtranslate", 0, this, TQT_SLOT( slotNewTranslate( ) ),
+ m_pNewTranslateAction = new TDEAction( i18n( "Translate" ), "pmtranslate", 0, this, TQ_SLOT( slotNewTranslate( ) ),
actionCollection( ), "new_translate" );
m_readWriteActions.append( m_pNewTranslateAction );
- m_pNewScaleAction = new TDEAction( i18n( "Scale" ), "pmscale", 0, this, TQT_SLOT( slotNewScale( ) ),
+ m_pNewScaleAction = new TDEAction( i18n( "Scale" ), "pmscale", 0, this, TQ_SLOT( slotNewScale( ) ),
actionCollection( ), "new_scale" );
m_readWriteActions.append( m_pNewScaleAction );
- m_pNewRotateAction = new TDEAction( i18n( "Rotate" ), "pmrotate", 0, this, TQT_SLOT( slotNewRotate( ) ),
+ m_pNewRotateAction = new TDEAction( i18n( "Rotate" ), "pmrotate", 0, this, TQ_SLOT( slotNewRotate( ) ),
actionCollection( ), "new_rotate" );
m_readWriteActions.append( m_pNewRotateAction );
- m_pNewMatrixAction = new TDEAction( i18n( "Matrix" ), "pmmatrix", 0, this, TQT_SLOT( slotNewMatrix( ) ),
+ m_pNewMatrixAction = new TDEAction( i18n( "Matrix" ), "pmmatrix", 0, this, TQ_SLOT( slotNewMatrix( ) ),
actionCollection( ), "new_povraymatrix" );
m_readWriteActions.append( m_pNewMatrixAction );
- m_pNewCommentAction = new TDEAction( i18n( "Comment" ), "pmcomment", 0, this, TQT_SLOT( slotNewComment( ) ),
+ m_pNewCommentAction = new TDEAction( i18n( "Comment" ), "pmcomment", 0, this, TQ_SLOT( slotNewComment( ) ),
actionCollection( ), "new_comment" );
m_readWriteActions.append( m_pNewCommentAction );
- m_pNewRawAction = new TDEAction( i18n( "Raw Povray" ), "pmraw", 0, this, TQT_SLOT( slotNewRaw( ) ),
+ m_pNewRawAction = new TDEAction( i18n( "Raw Povray" ), "pmraw", 0, this, TQ_SLOT( slotNewRaw( ) ),
actionCollection( ), "new_raw" );
m_readWriteActions.append( m_pNewRawAction );
// POV-Ray 3.5 objects
- m_pNewIsoSurfaceAction = new TDEAction( i18n( "Iso Surface" ), "pmisosurface", 0, this, TQT_SLOT( slotNewIsoSurface( ) ),
+ m_pNewIsoSurfaceAction = new TDEAction( i18n( "Iso Surface" ), "pmisosurface", 0, this, TQ_SLOT( slotNewIsoSurface( ) ),
actionCollection( ), "new_isosurface" );
m_readWriteActions.append( m_pNewIsoSurfaceAction );
- m_pNewRadiosityAction = new TDEAction( i18n( "Radiosity" ), "pmradiosity", 0, this, TQT_SLOT( slotNewRadiosity( ) ),
+ m_pNewRadiosityAction = new TDEAction( i18n( "Radiosity" ), "pmradiosity", 0, this, TQ_SLOT( slotNewRadiosity( ) ),
actionCollection( ), "new_radiosity" );
m_readWriteActions.append( m_pNewRadiosityAction );
- m_pNewGlobalPhotonsAction = new TDEAction( i18n( "Global Photons" ), "pmglobalphotons", 0, this, TQT_SLOT( slotNewGlobalPhotons( ) ),
+ m_pNewGlobalPhotonsAction = new TDEAction( i18n( "Global Photons" ), "pmglobalphotons", 0, this, TQ_SLOT( slotNewGlobalPhotons( ) ),
actionCollection( ), "new_globalphotons" );
m_readWriteActions.append( m_pNewGlobalPhotonsAction );
- m_pNewPhotonsAction = new TDEAction( i18n( "Photons" ), "pmphotons", 0, this, TQT_SLOT( slotNewPhotons( ) ),
+ m_pNewPhotonsAction = new TDEAction( i18n( "Photons" ), "pmphotons", 0, this, TQ_SLOT( slotNewPhotons( ) ),
actionCollection( ), "new_photons" );
m_readWriteActions.append( m_pNewPhotonsAction );
- m_pNewLightGroupAction = new TDEAction( i18n( "Light Group" ), "pmlightgroup", 0, this, TQT_SLOT( slotNewLightGroup( ) ),
+ m_pNewLightGroupAction = new TDEAction( i18n( "Light Group" ), "pmlightgroup", 0, this, TQ_SLOT( slotNewLightGroup( ) ),
actionCollection( ), "new_lightgroup" );
m_readWriteActions.append( m_pNewLightGroupAction );
- m_pNewInteriorTextureAction = new TDEAction( i18n( "Interior Texture" ), "pminteriortexture", 0, this, TQT_SLOT( slotNewInteriorTexture( ) ),
+ m_pNewInteriorTextureAction = new TDEAction( i18n( "Interior Texture" ), "pminteriortexture", 0, this, TQ_SLOT( slotNewInteriorTexture( ) ),
actionCollection( ), "new_interiortexture" );
m_readWriteActions.append( m_pNewInteriorTextureAction );
- m_pNewSphereSweepAction = new TDEAction( i18n( "Sphere Sweep" ), "pmspheresweep", 0, this, TQT_SLOT( slotNewSphereSweep( ) ),
+ m_pNewSphereSweepAction = new TDEAction( i18n( "Sphere Sweep" ), "pmspheresweep", 0, this, TQ_SLOT( slotNewSphereSweep( ) ),
actionCollection( ), "new_spheresweep" );
m_readWriteActions.append( m_pNewSphereSweepAction );
- m_pNewMeshAction = new TDEAction( i18n( "Mesh" ), "pmmesh", 0, this, TQT_SLOT( slotNewMesh( ) ),
+ m_pNewMeshAction = new TDEAction( i18n( "Mesh" ), "pmmesh", 0, this, TQ_SLOT( slotNewMesh( ) ),
actionCollection( ), "new_mesh" );
m_readWriteActions.append( m_pNewMeshAction );
#ifdef KPM_WITH_OBJECT_LIBRARY
- m_pSearchLibraryObjectAction = new TDEAction( i18n( "Search Object" ), "pmsearchlibrary", 0, this, TQT_SLOT( slotSearchLibraryObject( ) ),
+ m_pSearchLibraryObjectAction = new TDEAction( i18n( "Search Object" ), "pmsearchlibrary", 0, this, TQ_SLOT( slotSearchLibraryObject( ) ),
actionCollection( ), "search_library_object" );
m_readWriteActions.append( m_pSearchLibraryObjectAction );
#endif
- m_pUndoAction = KStdAction::undo( this, TQT_SLOT( slotEditUndo( ) ), actionCollection( ) );
- m_pRedoAction = KStdAction::redo( this, TQT_SLOT( slotEditRedo( ) ), actionCollection( ) );
+ m_pUndoAction = KStdAction::undo( this, TQ_SLOT( slotEditUndo( ) ), actionCollection( ) );
+ m_pRedoAction = KStdAction::redo( this, TQ_SLOT( slotEditRedo( ) ), actionCollection( ) );
m_pUndoAction->setEnabled( false );
m_pRedoAction->setEnabled( false );
}
@@ -951,7 +951,7 @@ bool PMPart::exportPovray( const KURL& url )
if( ok )
{
PMPovray35Format format;
- PMSerializer* dev = format.newSerializer( TQT_TQIODEVICE(file) );
+ PMSerializer* dev = format.newSerializer( file );
dev->serialize( m_pScene );
delete dev;
@@ -1369,7 +1369,7 @@ void PMPart::slotFileImport( )
TQFile file( fileName );
if( file.open( IO_ReadOnly ) )
{
- PMParser* newParser = selectedFormat->newParser( this, TQT_TQIODEVICE(&file) );
+ PMParser* newParser = selectedFormat->newParser( this, &file );
if( newParser )
{
if( m_pActiveObject )
@@ -1404,7 +1404,7 @@ void PMPart::slotFileExport( )
TQBuffer buffer( baData );
buffer.open( IO_WriteOnly );
- PMSerializer* newSer = selectedFormat->newSerializer( TQT_TQIODEVICE(&buffer) );
+ PMSerializer* newSer = selectedFormat->newSerializer( &buffer );
if( newSer )
{
newSer->serialize( m_pScene );
@@ -2713,7 +2713,7 @@ void PMPart::slotRender( )
TQBuffer buffer( a );
buffer.open( IO_WriteOnly );
PMPovray35Format format;
- PMSerializer* dev = format.newSerializer( TQT_TQIODEVICE(&buffer) );
+ PMSerializer* dev = format.newSerializer( &buffer );
dev->serialize( m_pScene );
delete dev;
@@ -2783,8 +2783,8 @@ void PMPart::updateRenderModes( )
void PMPart::slotRenderModeActionPlugged( )
{
updateRenderModes( );
-// connect( m_pRenderComboAction->combo( ), TQT_SIGNAL( activated( int ) ),
-// TQT_SLOT( slotRenderMode( int ) ) );
+// connect( m_pRenderComboAction->combo( ), TQ_SIGNAL( activated( int ) ),
+// TQ_SLOT( slotRenderMode( int ) ) );
}
void PMPart::slotVisibilityLevelChanged( int l )
diff --git a/kpovmodeler/pmpart.h b/kpovmodeler/pmpart.h
index e8926874..65d1494d 100644
--- a/kpovmodeler/pmpart.h
+++ b/kpovmodeler/pmpart.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -69,7 +68,7 @@ class TDEProcess;
*/
class PMPart : public KParts::ReadWritePart, virtual public PMPartIface
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
@@ -1025,7 +1024,7 @@ private:
class PMBrowserExtension : public KParts::BrowserExtension
{
- Q_OBJECT
+ TQ_OBJECT
friend class PMPart;
public:
diff --git a/kpovmodeler/pmpartiface.h b/kpovmodeler/pmpartiface.h
index 744b85ca..4e860dd1 100644
--- a/kpovmodeler/pmpartiface.h
+++ b/kpovmodeler/pmpartiface.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmpattern.h b/kpovmodeler/pmpattern.h
index 7dcf9cff..9afe93b8 100644
--- a/kpovmodeler/pmpattern.h
+++ b/kpovmodeler/pmpattern.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmpatternedit.cpp b/kpovmodeler/pmpatternedit.cpp
index 8281bd5b..a07fb683 100644
--- a/kpovmodeler/pmpatternedit.cpp
+++ b/kpovmodeler/pmpatternedit.cpp
@@ -284,52 +284,52 @@ void PMPatternEdit::createTopWidgets( )
topLayout( )->addWidget( m_pTurbulenceWidget );
/* connect all signals to slots/signals */
- connect( m_pTypeCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotComboChanged( int ) ) );
+ connect( m_pTypeCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotComboChanged( int ) ) );
- connect( m_pAgateTurbulenceEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pAgateTurbulenceEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
- connect( m_pCrackleForm, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pCrackleMetric, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pCrackleOffset, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pCrackleSolid, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pCrackleForm, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pCrackleMetric, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pCrackleOffset, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pCrackleSolid, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) );
- connect( m_pDensityInterpolate, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pDensityFile, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pDensityFileBrowse, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotDensityFileBrowseClicked( ) ) );
+ connect( m_pDensityInterpolate, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pDensityFile, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pDensityFileBrowse, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotDensityFileBrowseClicked( ) ) );
- connect( m_pGradientEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pGradientEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
- connect( m_pJuliaComplex, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pFractalMagnet, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotFractalMagnetClicked( ) ) );
- connect( m_pFractalMagnetType, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pMaxIterationsEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pFractalExponent, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pFractalExtType, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pFractalExtFactor, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pFractalIntType, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pFractalIntFactor, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pJuliaComplex, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pFractalMagnet, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotFractalMagnetClicked( ) ) );
+ connect( m_pFractalMagnetType, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pMaxIterationsEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pFractalExponent, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pFractalExtType, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pFractalExtFactor, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pFractalIntType, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pFractalIntFactor, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
- connect( m_pQuiltControl0Edit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pQuiltControl1Edit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pQuiltControl0Edit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pQuiltControl1Edit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
- connect( m_pSlopeDirection, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pSlopeLoSlope, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pSlopeHiSlope, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pSlopeAltFlag, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotSlopeAltFlagClicked( ) ) );
- connect( m_pSlopeAltitude, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pSlopeLoAlt, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pSlopeHiAlt, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pSlopeDirection, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pSlopeLoSlope, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pSlopeHiSlope, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pSlopeAltFlag, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotSlopeAltFlagClicked( ) ) );
+ connect( m_pSlopeAltitude, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pSlopeLoAlt, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pSlopeHiAlt, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
- connect( m_pSpiralNumberEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pSpiralNumberEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
- connect( m_pNoiseGenerator, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pNoiseGenerator, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( dataChanged( ) ) );
- connect( m_pEnableTurbulenceEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotTurbulenceClicked( ) ) );
- connect( m_pValueVectorEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pOctavesEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pOmegaEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pLambdaEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pDepthEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pEnableTurbulenceEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotTurbulenceClicked( ) ) );
+ connect( m_pValueVectorEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pOctavesEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pOmegaEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pLambdaEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pDepthEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
}
void PMPatternEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmpatternedit.h b/kpovmodeler/pmpatternedit.h
index e76fe572..ec7f1928 100644
--- a/kpovmodeler/pmpatternedit.h
+++ b/kpovmodeler/pmpatternedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -44,7 +43,7 @@ class TQPushButton;
*/
class PMPatternEdit : public PMDialogEditBase
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMDialogEditBase Base;
public:
diff --git a/kpovmodeler/pmphotons.h b/kpovmodeler/pmphotons.h
index a28041f5..58c92ede 100644
--- a/kpovmodeler/pmphotons.h
+++ b/kpovmodeler/pmphotons.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmphotonsedit.cpp b/kpovmodeler/pmphotonsedit.cpp
index 612800f9..c2f55826 100644
--- a/kpovmodeler/pmphotonsedit.cpp
+++ b/kpovmodeler/pmphotonsedit.cpp
@@ -68,13 +68,13 @@ void PMPhotonsEdit::createTopWidgets( )
gl->addWidget( m_pPassThrough, 1, 1 );
gl->addWidget( m_pAreaLight, 1, 0 );
- connect( m_pTarget, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotTargetClicked( ) ) );
- connect( m_pSpacingMulti, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pRefraction, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pReflection, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pCollect, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pPassThrough, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pAreaLight, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pTarget, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotTargetClicked( ) ) );
+ connect( m_pSpacingMulti, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pRefraction, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pReflection, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pCollect, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pPassThrough, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pAreaLight, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) );
}
void PMPhotonsEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmphotonsedit.h b/kpovmodeler/pmphotonsedit.h
index cac0ae1c..e449d087 100644
--- a/kpovmodeler/pmphotonsedit.h
+++ b/kpovmodeler/pmphotonsedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -36,7 +35,7 @@ class TQLabel;
*/
class PMPhotonsEdit : public PMDialogEditBase
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMDialogEditBase Base;
public:
diff --git a/kpovmodeler/pmpigment.h b/kpovmodeler/pmpigment.h
index b520ad27..5c69abab 100644
--- a/kpovmodeler/pmpigment.h
+++ b/kpovmodeler/pmpigment.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmpigmentedit.cpp b/kpovmodeler/pmpigmentedit.cpp
index e7318830..3abdf7ca 100644
--- a/kpovmodeler/pmpigmentedit.cpp
+++ b/kpovmodeler/pmpigmentedit.cpp
@@ -37,7 +37,7 @@ void PMPigmentEdit::createTopWidgets()
m_pUVMapping = new TQCheckBox( i18n( "UV mapping" ), this );
topLayout( )->addWidget( m_pUVMapping );
- connect( m_pUVMapping, TQT_SIGNAL( clicked() ), TQT_SIGNAL( dataChanged() ) );
+ connect( m_pUVMapping, TQ_SIGNAL( clicked() ), TQ_SIGNAL( dataChanged() ) );
}
void PMPigmentEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmpigmentedit.h b/kpovmodeler/pmpigmentedit.h
index 1a76c998..186ddd67 100644
--- a/kpovmodeler/pmpigmentedit.h
+++ b/kpovmodeler/pmpigmentedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -34,7 +33,7 @@ class TQCheckBox;
*/
class PMPigmentEdit : public PMTextureBaseEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMTextureBaseEdit Base;
public:
diff --git a/kpovmodeler/pmplane.h b/kpovmodeler/pmplane.h
index d5321dd8..e4356fd0 100644
--- a/kpovmodeler/pmplane.h
+++ b/kpovmodeler/pmplane.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmplaneedit.cpp b/kpovmodeler/pmplaneedit.cpp
index ada9c3f3..830e82ae 100644
--- a/kpovmodeler/pmplaneedit.cpp
+++ b/kpovmodeler/pmplaneedit.cpp
@@ -57,9 +57,9 @@ void PMPlaneEdit::createTopWidgets( )
layout->addWidget( nb );
layout->addStretch( 1 );
- connect( m_pNormal, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pDistance, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( nb, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotNormalize( ) ) );
+ connect( m_pNormal, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pDistance, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( nb, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotNormalize( ) ) );
}
void PMPlaneEdit::slotNormalize( )
diff --git a/kpovmodeler/pmplaneedit.h b/kpovmodeler/pmplaneedit.h
index 232cfbb1..0cd139ae 100644
--- a/kpovmodeler/pmplaneedit.h
+++ b/kpovmodeler/pmplaneedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -33,7 +32,7 @@ class TQCheckBox;
class PMPlaneEdit : public PMSolidObjectEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMSolidObjectEdit Base;
public:
diff --git a/kpovmodeler/pmplanenormalcontrolpoint.h b/kpovmodeler/pmplanenormalcontrolpoint.h
index ccff2000..590b520e 100644
--- a/kpovmodeler/pmplanenormalcontrolpoint.h
+++ b/kpovmodeler/pmplanenormalcontrolpoint.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmpluginsettings.cpp b/kpovmodeler/pmpluginsettings.cpp
index 0d06000c..9a2d162b 100644
--- a/kpovmodeler/pmpluginsettings.cpp
+++ b/kpovmodeler/pmpluginsettings.cpp
@@ -63,8 +63,8 @@ PMPluginSettings::PMPluginSettings( TQWidget* parent, const char* name )
gvl->addSpacing( 10 );
m_pPluginsList = new TQListView( gb );
- connect( m_pPluginsList, TQT_SIGNAL( selectionChanged( ) ),
- TQT_SLOT( slotSelectionChanged( ) ) );
+ connect( m_pPluginsList, TQ_SIGNAL( selectionChanged( ) ),
+ TQ_SLOT( slotSelectionChanged( ) ) );
m_pPluginsList->addColumn( i18n( "Name" ) );
m_pPluginsList->addColumn( i18n( "Description" ) );
m_pPluginsList->addColumn( i18n( "Status" ) );
@@ -73,7 +73,7 @@ PMPluginSettings::PMPluginSettings( TQWidget* parent, const char* name )
TQHBoxLayout* hl = new TQHBoxLayout( gvl );
m_pToggle = new TQPushButton( i18n( "Load" ), gb );
m_pToggle->setEnabled( false );
- connect( m_pToggle, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotToggle( ) ) );
+ connect( m_pToggle, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotToggle( ) ) );
hl->addWidget( m_pToggle );
hl->addStretch( 1 );
diff --git a/kpovmodeler/pmpluginsettings.h b/kpovmodeler/pmpluginsettings.h
index d3227d9d..69653cbc 100644
--- a/kpovmodeler/pmpluginsettings.h
+++ b/kpovmodeler/pmpluginsettings.h
@@ -33,7 +33,7 @@ class TQPushButton;
*/
class PMPluginSettings : public PMSettingsDialogPage
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kpovmodeler/pmpoint.h b/kpovmodeler/pmpoint.h
index 553358ab..45a89e4e 100644
--- a/kpovmodeler/pmpoint.h
+++ b/kpovmodeler/pmpoint.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmpolynom.h b/kpovmodeler/pmpolynom.h
index 65a9ad20..49070fef 100644
--- a/kpovmodeler/pmpolynom.h
+++ b/kpovmodeler/pmpolynom.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmpolynomedit.cpp b/kpovmodeler/pmpolynomedit.cpp
index e0e3a24c..90dd15c6 100644
--- a/kpovmodeler/pmpolynomedit.cpp
+++ b/kpovmodeler/pmpolynomedit.cpp
@@ -46,14 +46,14 @@ void PMPolynomEdit::createTopWidgets( )
m_pOrder = new TQSpinBox( 2, 7, 1, this );
hl->addWidget( m_pOrder );
hl->addStretch( 1 );
- connect( m_pOrder, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotOrderChanged( int ) ) );
+ connect( m_pOrder, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotOrderChanged( int ) ) );
topLayout( )->addWidget( new TQLabel( i18n( "Formula:" ), this ) );
m_pPolyWidget = new TQWidget( this );
topLayout( )->addWidget( m_pPolyWidget );
m_pSturm = new TQCheckBox( i18n( "Sturm" ), this );
topLayout( )->addWidget( m_pSturm );
- connect( m_pSturm, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pSturm, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) );
}
void PMPolynomEdit::displayObject( PMObject* o )
@@ -135,7 +135,7 @@ void PMPolynomEdit::displayCoefficients( const PMVector& co, int cOrder,
}
edit = new PMFloatEdit( m_pPolyWidget );
- connect( edit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( edit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
m_edits.append( edit );
gl->addWidget( edit, row, col + 1 );
edit->show( );
diff --git a/kpovmodeler/pmpolynomedit.h b/kpovmodeler/pmpolynomedit.h
index 36e67db1..56810c3d 100644
--- a/kpovmodeler/pmpolynomedit.h
+++ b/kpovmodeler/pmpolynomedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -38,7 +37,7 @@ class TQCheckBox;
*/
class PMPolynomEdit : public PMSolidObjectEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMSolidObjectEdit Base;
public:
diff --git a/kpovmodeler/pmpolynomexponents.h b/kpovmodeler/pmpolynomexponents.h
index cd2b39b6..de410d0c 100644
--- a/kpovmodeler/pmpolynomexponents.h
+++ b/kpovmodeler/pmpolynomexponents.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmpovraymatrix.h b/kpovmodeler/pmpovraymatrix.h
index c4e0d886..c0be489c 100644
--- a/kpovmodeler/pmpovraymatrix.h
+++ b/kpovmodeler/pmpovraymatrix.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmpovraymatrixedit.cpp b/kpovmodeler/pmpovraymatrixedit.cpp
index e7a41368..dadf5210 100644
--- a/kpovmodeler/pmpovraymatrixedit.cpp
+++ b/kpovmodeler/pmpovraymatrixedit.cpp
@@ -41,7 +41,7 @@ void PMPovrayMatrixEdit::createTopWidgets( )
for( i = 0; i < 12; i++ )
{
m_pValue[i] = new PMFloatEdit( this );
- connect( m_pValue[i], TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pValue[i], TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
}
for( r = 0; r < 4; r++ )
diff --git a/kpovmodeler/pmpovraymatrixedit.h b/kpovmodeler/pmpovraymatrixedit.h
index b87a338a..8d264efe 100644
--- a/kpovmodeler/pmpovraymatrixedit.h
+++ b/kpovmodeler/pmpovraymatrixedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -34,7 +33,7 @@ class PMFloatEdit;
*/
class PMPovrayMatrixEdit : public PMDialogEditBase
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMDialogEditBase Base;
public:
diff --git a/kpovmodeler/pmpovrayoutputwidget.cpp b/kpovmodeler/pmpovrayoutputwidget.cpp
index 2154cce4..6186cc62 100644
--- a/kpovmodeler/pmpovrayoutputwidget.cpp
+++ b/kpovmodeler/pmpovrayoutputwidget.cpp
@@ -46,7 +46,7 @@ PMPovrayOutputWidget::PMPovrayOutputWidget( TQWidget* parent, const char* name )
TQPushButton* closeButton = new KPushButton( KStdGuiItem::close(), this );
buttonLayout->addWidget( closeButton );
closeButton->setDefault( true );
- connect( closeButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( hide( ) ) );
+ connect( closeButton, TQ_SIGNAL( clicked( ) ), TQ_SLOT( hide( ) ) );
setCaption( i18n( "Povray Output" ) );
resize( s_size );
diff --git a/kpovmodeler/pmpovrayoutputwidget.h b/kpovmodeler/pmpovrayoutputwidget.h
index 7e4c3ffb..abaf8960 100644
--- a/kpovmodeler/pmpovrayoutputwidget.h
+++ b/kpovmodeler/pmpovrayoutputwidget.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -33,7 +32,7 @@ class TDEConfig;
*/
class PMPovrayOutputWidget : public KDialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kpovmodeler/pmpovrayparser.h b/kpovmodeler/pmpovrayparser.h
index 9ad714d2..b2c5d0bf 100644
--- a/kpovmodeler/pmpovrayparser.h
+++ b/kpovmodeler/pmpovrayparser.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmpovrayrenderwidget.cpp b/kpovmodeler/pmpovrayrenderwidget.cpp
index cc5564d4..0c33490c 100644
--- a/kpovmodeler/pmpovrayrenderwidget.cpp
+++ b/kpovmodeler/pmpovrayrenderwidget.cpp
@@ -87,12 +87,12 @@ bool PMPovrayRenderWidget::render( const TQByteArray& scene,
m_pTempFile->close( );
m_pProcess = new TDEProcess( );
- connect( m_pProcess, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ),
- TQT_SLOT( slotPovrayImage( TDEProcess*, char*, int ) ) );
- connect( m_pProcess, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ),
- TQT_SLOT( slotPovrayMessage( TDEProcess*, char*, int ) ) );
- connect( m_pProcess, TQT_SIGNAL( processExited( TDEProcess* ) ),
- TQT_SLOT( slotRenderingFinished( TDEProcess* ) ) );
+ connect( m_pProcess, TQ_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ),
+ TQ_SLOT( slotPovrayImage( TDEProcess*, char*, int ) ) );
+ connect( m_pProcess, TQ_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ),
+ TQ_SLOT( slotPovrayMessage( TDEProcess*, char*, int ) ) );
+ connect( m_pProcess, TQ_SIGNAL( processExited( TDEProcess* ) ),
+ TQ_SLOT( slotRenderingFinished( TDEProcess* ) ) );
*m_pProcess << s_povrayCommand;
diff --git a/kpovmodeler/pmpovrayrenderwidget.h b/kpovmodeler/pmpovrayrenderwidget.h
index 0e3a7786..a0868311 100644
--- a/kpovmodeler/pmpovrayrenderwidget.h
+++ b/kpovmodeler/pmpovrayrenderwidget.h
@@ -42,7 +42,7 @@ class KTempFile;
*/
class PMPovrayRenderWidget : public PMDragWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kpovmodeler/pmpovraysettings.cpp b/kpovmodeler/pmpovraysettings.cpp
index f3955b78..e9cf41cf 100644
--- a/kpovmodeler/pmpovraysettings.cpp
+++ b/kpovmodeler/pmpovraysettings.cpp
@@ -56,8 +56,8 @@ PMPovraySettings::PMPovraySettings( TQWidget* parent, const char* name )
hlayout->addWidget( m_pPovrayCommand );
m_pBrowsePovrayCommand = new TQPushButton( gb );
m_pBrowsePovrayCommand->setPixmap( SmallIcon( "document-open" ) );
- connect( m_pBrowsePovrayCommand, TQT_SIGNAL( clicked( ) ),
- TQT_SLOT( slotBrowsePovrayCommand( ) ) );
+ connect( m_pBrowsePovrayCommand, TQ_SIGNAL( clicked( ) ),
+ TQ_SLOT( slotBrowsePovrayCommand( ) ) );
hlayout->addWidget( m_pBrowsePovrayCommand );
vlayout->addWidget( gb );
@@ -70,8 +70,8 @@ PMPovraySettings::PMPovraySettings( TQWidget* parent, const char* name )
hlayout->addWidget( m_pDocumentationPath );
m_pBrowseDocumentationPath = new TQPushButton( gb );
m_pBrowseDocumentationPath->setPixmap( SmallIcon( "document-open" ) );
- connect( m_pBrowseDocumentationPath, TQT_SIGNAL( clicked( ) ),
- TQT_SLOT( slotBrowsePovrayDocumentation( ) ) );
+ connect( m_pBrowseDocumentationPath, TQ_SIGNAL( clicked( ) ),
+ TQ_SLOT( slotBrowsePovrayDocumentation( ) ) );
hlayout->addWidget( m_pBrowseDocumentationPath );
vlayout->addWidget( gb );
hlayout = new TQHBoxLayout( gvl );
@@ -89,28 +89,28 @@ PMPovraySettings::PMPovraySettings( TQWidget* parent, const char* name )
gvl->addSpacing( 10 );
hlayout = new TQHBoxLayout( gvl );
m_pLibraryPaths = new TQListBox( gb );
- connect( m_pLibraryPaths, TQT_SIGNAL( highlighted( int ) ),
- TQT_SLOT( slotPathSelected( int ) ) );
+ connect( m_pLibraryPaths, TQ_SIGNAL( highlighted( int ) ),
+ TQ_SLOT( slotPathSelected( int ) ) );
hlayout->addWidget( m_pLibraryPaths );
TQVBoxLayout* bl = new TQVBoxLayout( hlayout );
m_pAddLibraryPath = new TQPushButton( i18n( "Add..." ), gb );
- connect( m_pAddLibraryPath, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAddPath( ) ) );
+ connect( m_pAddLibraryPath, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotAddPath( ) ) );
bl->addWidget( m_pAddLibraryPath );
m_pRemoveLibraryPath = new TQPushButton( i18n( "Remove" ), gb );
- connect( m_pRemoveLibraryPath, TQT_SIGNAL( clicked( ) ),
- TQT_SLOT( slotRemovePath( ) ) );
+ connect( m_pRemoveLibraryPath, TQ_SIGNAL( clicked( ) ),
+ TQ_SLOT( slotRemovePath( ) ) );
bl->addWidget( m_pRemoveLibraryPath );
m_pChangeLibraryPath = new TQPushButton( i18n( "Edit..." ), gb );
- connect( m_pChangeLibraryPath, TQT_SIGNAL( clicked( ) ),
- TQT_SLOT( slotEditPath( ) ) );
+ connect( m_pChangeLibraryPath, TQ_SIGNAL( clicked( ) ),
+ TQ_SLOT( slotEditPath( ) ) );
bl->addWidget( m_pChangeLibraryPath );
m_pLibraryPathUp = new TQPushButton( i18n( "Up" ), gb );
- connect( m_pLibraryPathUp, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotPathUp( ) ) );
+ connect( m_pLibraryPathUp, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotPathUp( ) ) );
bl->addWidget( m_pLibraryPathUp );
m_pLibraryPathDown = new TQPushButton( i18n( "Down" ), gb );
- connect( m_pLibraryPathDown, TQT_SIGNAL( clicked( ) ),
- TQT_SLOT( slotPathDown( ) ) );
+ connect( m_pLibraryPathDown, TQ_SIGNAL( clicked( ) ),
+ TQ_SLOT( slotPathDown( ) ) );
bl->addWidget( m_pLibraryPathDown );
bl->addStretch( 1 );
vlayout->addWidget( gb );
diff --git a/kpovmodeler/pmpovraysettings.h b/kpovmodeler/pmpovraysettings.h
index a0175e17..28229d80 100644
--- a/kpovmodeler/pmpovraysettings.h
+++ b/kpovmodeler/pmpovraysettings.h
@@ -34,7 +34,7 @@ class TQListBox;
*/
class PMPovraySettings : public PMSettingsDialogPage
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kpovmodeler/pmpovraywidget.cpp b/kpovmodeler/pmpovraywidget.cpp
index ac1162c2..99c81742 100644
--- a/kpovmodeler/pmpovraywidget.cpp
+++ b/kpovmodeler/pmpovraywidget.cpp
@@ -85,25 +85,25 @@ PMPovrayWidget::PMPovrayWidget( TQWidget* parent, const char* name )
TQPushButton* closeButton = new KPushButton( KStdGuiItem::close(), this );
buttonLayout->addWidget( closeButton );
- connect( m_pRenderWidget, TQT_SIGNAL( finished( int ) ),
- TQT_SLOT( slotRenderingFinished( int ) ) );
- connect( m_pRenderWidget, TQT_SIGNAL( progress( int ) ),
- TQT_SLOT( slotProgress( int ) ) );
- connect( m_pRenderWidget, TQT_SIGNAL( lineFinished( int ) ),
- TQT_SLOT( slotLineFinished( int ) ) );
-
- connect( m_pStopButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotStop( ) ) );
- connect( m_pSuspendButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotSuspend( ) ) );
- connect( m_pResumeButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotResume( ) ) );
- connect( m_pSaveButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotSave( ) ) );
- connect( closeButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotClose( ) ) );
- connect( m_pPovrayOutputButton, TQT_SIGNAL( clicked( ) ),
- TQT_SLOT( slotPovrayOutput( ) ) );
+ connect( m_pRenderWidget, TQ_SIGNAL( finished( int ) ),
+ TQ_SLOT( slotRenderingFinished( int ) ) );
+ connect( m_pRenderWidget, TQ_SIGNAL( progress( int ) ),
+ TQ_SLOT( slotProgress( int ) ) );
+ connect( m_pRenderWidget, TQ_SIGNAL( lineFinished( int ) ),
+ TQ_SLOT( slotLineFinished( int ) ) );
+
+ connect( m_pStopButton, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotStop( ) ) );
+ connect( m_pSuspendButton, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotSuspend( ) ) );
+ connect( m_pResumeButton, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotResume( ) ) );
+ connect( m_pSaveButton, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotSave( ) ) );
+ connect( closeButton, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotClose( ) ) );
+ connect( m_pPovrayOutputButton, TQ_SIGNAL( clicked( ) ),
+ TQ_SLOT( slotPovrayOutput( ) ) );
m_bRunning = false;
m_pProgressTimer = new TQTimer( this );
- connect( m_pProgressTimer, TQT_SIGNAL( timeout( ) ),
- TQT_SLOT( slotUpdateSpeed( ) ) );
+ connect( m_pProgressTimer, TQ_SIGNAL( timeout( ) ),
+ TQ_SLOT( slotUpdateSpeed( ) ) );
setCaption( i18n( "Render Window" ) );
@@ -111,8 +111,8 @@ PMPovrayWidget::PMPovrayWidget( TQWidget* parent, const char* name )
m_stopped = false;
m_pPovrayOutputWidget = new PMPovrayOutputWidget( );
- connect( m_pRenderWidget, TQT_SIGNAL( povrayMessage( const TQString& ) ),
- m_pPovrayOutputWidget, TQT_SLOT( slotText( const TQString& ) ) );
+ connect( m_pRenderWidget, TQ_SIGNAL( povrayMessage( const TQString& ) ),
+ m_pPovrayOutputWidget, TQ_SLOT( slotText( const TQString& ) ) );
}
PMPovrayWidget::~PMPovrayWidget( )
diff --git a/kpovmodeler/pmpovraywidget.h b/kpovmodeler/pmpovraywidget.h
index 816e353a..408753f8 100644
--- a/kpovmodeler/pmpovraywidget.h
+++ b/kpovmodeler/pmpovraywidget.h
@@ -41,7 +41,7 @@ class KURL;
*/
class PMPovrayWidget : public KDialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kpovmodeler/pmpreviewsettings.h b/kpovmodeler/pmpreviewsettings.h
index dc48f902..b8e1940b 100644
--- a/kpovmodeler/pmpreviewsettings.h
+++ b/kpovmodeler/pmpreviewsettings.h
@@ -34,7 +34,7 @@ class KColorButton;
*/
class PMPreviewSettings : public PMSettingsDialogPage
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kpovmodeler/pmprism.h b/kpovmodeler/pmprism.h
index a22fb748..9389843c 100644
--- a/kpovmodeler/pmprism.h
+++ b/kpovmodeler/pmprism.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmprismedit.cpp b/kpovmodeler/pmprismedit.cpp
index 04a2df94..a8cb9ce1 100644
--- a/kpovmodeler/pmprismedit.cpp
+++ b/kpovmodeler/pmprismedit.cpp
@@ -65,22 +65,22 @@ void PMPrismEdit::createTopWidgets( )
m_pSweepType->insertItem( i18n( "Conic Sweep" ) );
hl->addWidget( m_pSweepType );
- connect( m_pSplineType, TQT_SIGNAL( activated( int ) ),
- TQT_SLOT( slotTypeChanged( int ) ) );
- connect( m_pSweepType, TQT_SIGNAL( activated( int ) ),
- TQT_SLOT( slotSweepChanged( int ) ) );
+ connect( m_pSplineType, TQ_SIGNAL( activated( int ) ),
+ TQ_SLOT( slotTypeChanged( int ) ) );
+ connect( m_pSweepType, TQ_SIGNAL( activated( int ) ),
+ TQ_SLOT( slotSweepChanged( int ) ) );
hl = new TQHBoxLayout( topLayout( ) );
TQGridLayout* gl = new TQGridLayout( hl, 2, 2 );
gl->addWidget( new TQLabel( i18n( "Height 1:" ), this ), 0, 0 );
m_pHeight1 = new PMFloatEdit( this );
gl->addWidget( m_pHeight1, 0, 1 );
- connect( m_pHeight1, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pHeight1, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
gl->addWidget( new TQLabel( i18n( "Height 2:" ), this ), 1, 0 );
m_pHeight2 = new PMFloatEdit( this );
gl->addWidget( m_pHeight2, 1, 1 );
- connect( m_pHeight2, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pHeight2, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
hl->addStretch( 1 );
}
@@ -92,8 +92,8 @@ void PMPrismEdit::createBottomWidgets( )
topLayout( )->addWidget( m_pOpen );
m_pSturm = new TQCheckBox( i18n( "Sturm" ), this );
topLayout( )->addWidget( m_pSturm );
- connect( m_pSturm, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pOpen, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pSturm, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pOpen, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) );
Base::createBottomWidgets( );
}
@@ -216,7 +216,7 @@ void PMPrismEdit::createEdits( const TQValueList< TQValueList<PMVector> >& sp )
button = new TQPushButton( m_pEditWidget );
button->setPixmap( addPrismPixmap );
m_subPrismAddButtons.append( button );
- connect( button, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAddSubPrism( ) ) );
+ connect( button, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotAddSubPrism( ) ) );
hl->addWidget( button );
button->show( );
TQToolTip::add( button, i18n( "Add sub prism" ) );
@@ -224,7 +224,7 @@ void PMPrismEdit::createEdits( const TQValueList< TQValueList<PMVector> >& sp )
button = new TQPushButton( m_pEditWidget );
button->setPixmap( removePixmap );
m_subPrismRemoveButtons.append( button );
- connect( button, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotRemoveSubPrism( ) ) );
+ connect( button, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotRemoveSubPrism( ) ) );
hl->addWidget( button );
button->show( );
if( sp.size( ) < 2 )
@@ -235,9 +235,9 @@ void PMPrismEdit::createEdits( const TQValueList< TQValueList<PMVector> >& sp )
vle = new PMVectorListEdit( "x", "z", m_pEditWidget );
m_points.append( vle );
- connect( vle, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( vle, TQT_SIGNAL( selectionChanged( ) ),
- TQT_SLOT( slotSelectionChanged( ) ) );
+ connect( vle, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( vle, TQ_SIGNAL( selectionChanged( ) ),
+ TQ_SLOT( slotSelectionChanged( ) ) );
hl->addWidget( vle, 2 );
vle->show( );
@@ -245,19 +245,19 @@ void PMPrismEdit::createEdits( const TQValueList< TQValueList<PMVector> >& sp )
button = new TQPushButton( m_pEditWidget );
button->setPixmap( SmallIcon( "pmaddpointabove" ) );
- connect( button, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAddPointAbove( ) ) );
+ connect( button, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotAddPointAbove( ) ) );
m_addAboveButtons.append( button );
button->show( );
vl->addWidget( button );
button = new TQPushButton( m_pEditWidget );
button->setPixmap( SmallIcon( "pmaddpoint" ) );
- connect( button, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAddPointBelow( ) ) );
+ connect( button, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotAddPointBelow( ) ) );
m_addBelowButtons.append( button );
button->show( );
vl->addWidget( button );
button = new TQPushButton( m_pEditWidget );
button->setPixmap( SmallIcon( "pmremovepoint" ) );
- connect( button, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotRemovePoint( ) ) );
+ connect( button, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotRemovePoint( ) ) );
m_removeButtons.append( button );
button->show( );
vl->addWidget( button );
@@ -277,7 +277,7 @@ void PMPrismEdit::createEdits( const TQValueList< TQValueList<PMVector> >& sp )
button = new TQPushButton( m_pEditWidget );
button->setPixmap( addPrismPixmap );
m_subPrismAddButtons.append( button );
- connect( button, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAddSubPrism( ) ) );
+ connect( button, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotAddSubPrism( ) ) );
hl->addWidget( button );
button->show( );
TQToolTip::add( button, i18n( "Append sub prism" ) );
diff --git a/kpovmodeler/pmprismedit.h b/kpovmodeler/pmprismedit.h
index e54ece6d..78f9bb5a 100644
--- a/kpovmodeler/pmprismedit.h
+++ b/kpovmodeler/pmprismedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -44,7 +43,7 @@ class TQLabel;
*/
class PMPrismEdit : public PMSolidObjectEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMSolidObjectEdit Base;
public:
diff --git a/kpovmodeler/pmprismmemento.h b/kpovmodeler/pmprismmemento.h
index 13adf608..7a714d87 100644
--- a/kpovmodeler/pmprismmemento.h
+++ b/kpovmodeler/pmprismmemento.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmprojectedthrough.h b/kpovmodeler/pmprojectedthrough.h
index 4212097f..54eae507 100644
--- a/kpovmodeler/pmprojectedthrough.h
+++ b/kpovmodeler/pmprojectedthrough.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmprototypemanager.h b/kpovmodeler/pmprototypemanager.h
index bade9e29..a0ead7ae 100644
--- a/kpovmodeler/pmprototypemanager.h
+++ b/kpovmodeler/pmprototypemanager.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmquickcolor.h b/kpovmodeler/pmquickcolor.h
index 84a3afb5..cb92dcff 100644
--- a/kpovmodeler/pmquickcolor.h
+++ b/kpovmodeler/pmquickcolor.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmquickcoloredit.cpp b/kpovmodeler/pmquickcoloredit.cpp
index ba54311e..840f135c 100644
--- a/kpovmodeler/pmquickcoloredit.cpp
+++ b/kpovmodeler/pmquickcoloredit.cpp
@@ -41,7 +41,7 @@ void PMQuickColorEdit::createTopWidgets( )
layout->addWidget( new TQLabel( i18n( "Color:" ), this ), 0, AlignTop );
layout->addWidget( m_pColorEdit );
- connect( m_pColorEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pColorEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
}
void PMQuickColorEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmquickcoloredit.h b/kpovmodeler/pmquickcoloredit.h
index 2dca5a5f..d3122fe4 100644
--- a/kpovmodeler/pmquickcoloredit.h
+++ b/kpovmodeler/pmquickcoloredit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -36,7 +35,7 @@ class PMColorEdit;
*/
class PMQuickColorEdit : public PMDialogEditBase
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMDialogEditBase Base;
public:
diff --git a/kpovmodeler/pmradiosity.h b/kpovmodeler/pmradiosity.h
index c56ccec2..e6f0cff8 100644
--- a/kpovmodeler/pmradiosity.h
+++ b/kpovmodeler/pmradiosity.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmradiosityedit.cpp b/kpovmodeler/pmradiosityedit.cpp
index 670c2c04..7697949d 100644
--- a/kpovmodeler/pmradiosityedit.cpp
+++ b/kpovmodeler/pmradiosityedit.cpp
@@ -128,21 +128,21 @@ void PMRadiosityEdit::createTopWidgets( )
hl->addStretch( 1 );
- connect( m_pAdcBailout, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pAlwaysSample, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pBrightness, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pCount, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pErrorBound, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pGrayThreshold, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pLowErrorFactor, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pMaxSample, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pMedia, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pMinimumReuse, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pNearestCount, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pNormal, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pPretraceStart, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pPretraceEnd, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pRecursionLimit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pAdcBailout, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pAlwaysSample, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pBrightness, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pCount, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pErrorBound, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pGrayThreshold, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pLowErrorFactor, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pMaxSample, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pMedia, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pMinimumReuse, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pNearestCount, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pNormal, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pPretraceStart, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pPretraceEnd, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pRecursionLimit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
}
void PMRadiosityEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmradiosityedit.h b/kpovmodeler/pmradiosityedit.h
index d360c4d8..c7a5fb6e 100644
--- a/kpovmodeler/pmradiosityedit.h
+++ b/kpovmodeler/pmradiosityedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -36,7 +35,7 @@ class TQCheckBox;
*/
class PMRadiosityEdit : public PMDialogEditBase
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMDialogEditBase Base;
public:
diff --git a/kpovmodeler/pmrainbow.h b/kpovmodeler/pmrainbow.h
index 64dae5d7..de56dee8 100644
--- a/kpovmodeler/pmrainbow.h
+++ b/kpovmodeler/pmrainbow.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmrainbowedit.cpp b/kpovmodeler/pmrainbowedit.cpp
index a347e442..4448c140 100644
--- a/kpovmodeler/pmrainbowedit.cpp
+++ b/kpovmodeler/pmrainbowedit.cpp
@@ -92,22 +92,22 @@ void PMRainbowEdit::createTopWidgets( )
gl->addWidget( m_pFalloffAngleEdit, 1, 1 );
hl->addStretch( 1 );
- connect( m_pDirectionEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pAngleEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pWidthEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pDistanceEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pJitterEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pUpEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pArcAngleEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pFalloffAngleEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pEnableDirectionEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotDirectionClicked( ) ) );
- connect( m_pEnableAngleEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAngleClicked( ) ) );
- connect( m_pEnableWidthEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotWidthClicked( ) ) );
- connect( m_pEnableDistanceEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotDistanceClicked( ) ) );
- connect( m_pEnableJitterEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotJitterClicked( ) ) );
- connect( m_pEnableUpEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotUpClicked( ) ) );
- connect( m_pEnableArcAngleEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotArcAngleClicked( ) ) );
- connect( m_pEnableFalloffAngleEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotFalloffAngleClicked( ) ) );
+ connect( m_pDirectionEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pAngleEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pWidthEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pDistanceEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pJitterEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pUpEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pArcAngleEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pFalloffAngleEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pEnableDirectionEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotDirectionClicked( ) ) );
+ connect( m_pEnableAngleEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotAngleClicked( ) ) );
+ connect( m_pEnableWidthEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotWidthClicked( ) ) );
+ connect( m_pEnableDistanceEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotDistanceClicked( ) ) );
+ connect( m_pEnableJitterEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotJitterClicked( ) ) );
+ connect( m_pEnableUpEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotUpClicked( ) ) );
+ connect( m_pEnableArcAngleEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotArcAngleClicked( ) ) );
+ connect( m_pEnableFalloffAngleEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotFalloffAngleClicked( ) ) );
}
void PMRainbowEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmrainbowedit.h b/kpovmodeler/pmrainbowedit.h
index 35313545..3c54e3fe 100644
--- a/kpovmodeler/pmrainbowedit.h
+++ b/kpovmodeler/pmrainbowedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -37,7 +36,7 @@ class TQLabel;
*/
class PMRainbowEdit : public PMTextureBaseEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMTextureBaseEdit Base;
public:
diff --git a/kpovmodeler/pmraw.h b/kpovmodeler/pmraw.h
index 11c28ad2..1d23371f 100644
--- a/kpovmodeler/pmraw.h
+++ b/kpovmodeler/pmraw.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmrawedit.cpp b/kpovmodeler/pmrawedit.cpp
index f1d88516..f431d89a 100644
--- a/kpovmodeler/pmrawedit.cpp
+++ b/kpovmodeler/pmrawedit.cpp
@@ -42,7 +42,7 @@ void PMRawEdit::createTopWidgets( )
m_pEdit->setFont( TDEGlobalSettings::fixedFont( ) );
topLayout( )->addWidget( m_pEdit, 2 );
- connect( m_pEdit, TQT_SIGNAL( textChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pEdit, TQ_SIGNAL( textChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
}
void PMRawEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmrawedit.h b/kpovmodeler/pmrawedit.h
index d4bbf5f0..5dd5df3e 100644
--- a/kpovmodeler/pmrawedit.h
+++ b/kpovmodeler/pmrawedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -34,7 +33,7 @@ class TQMultiLineEdit;
*/
class PMRawEdit : public PMNamedObjectEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMNamedObjectEdit Base;
public:
diff --git a/kpovmodeler/pmrecursiveobjectiterator.h b/kpovmodeler/pmrecursiveobjectiterator.h
index aafeaad3..d6a99783 100644
--- a/kpovmodeler/pmrecursiveobjectiterator.h
+++ b/kpovmodeler/pmrecursiveobjectiterator.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmrendermanager.h b/kpovmodeler/pmrendermanager.h
index 8305de19..20db3442 100644
--- a/kpovmodeler/pmrendermanager.h
+++ b/kpovmodeler/pmrendermanager.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -95,7 +94,7 @@ typedef TQPtrListIterator<PMRenderTask> PMRenderTaskListIterator;
*/
class PMRenderManager : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kpovmodeler/pmrendermode.cpp b/kpovmodeler/pmrendermode.cpp
index b2a752f8..9da4f2ac 100644
--- a/kpovmodeler/pmrendermode.cpp
+++ b/kpovmodeler/pmrendermode.cpp
@@ -39,8 +39,6 @@ void PMRenderMode::init( )
m_quality = 9;
- m_radiosity = false;
-
m_antialiasing = false;
m_samplingMethod = AntialiasingNonRecursive;
m_antialiasThreshold = 0.3;
@@ -67,7 +65,6 @@ PMRenderMode::PMRenderMode( const TQDomElement& e )
m_startRow = hlp.doubleAttribute( "start_row", m_startRow );
m_endRow = hlp.doubleAttribute( "end_row", m_endRow );
m_quality = hlp.intAttribute( "quality", m_quality );
- m_radiosity = hlp.boolAttribute( "radiosity", m_radiosity );
m_antialiasing = hlp.boolAttribute( "antialiasing", m_antialiasing );
m_samplingMethod = hlp.intAttribute( "sampling_method", m_samplingMethod );
m_antialiasThreshold = hlp.doubleAttribute( "aa_threshold", m_antialiasThreshold );
@@ -88,7 +85,6 @@ void PMRenderMode::serialize( TQDomElement& e ) const
e.setAttribute( "start_column", m_startColumn );
e.setAttribute( "end_column", m_endColumn );
e.setAttribute( "quality", m_quality );
- e.setAttribute( "radiosity", m_radiosity );
e.setAttribute( "antialiasing", m_antialiasing );
e.setAttribute( "sampling_method", m_samplingMethod );
e.setAttribute( "aa_threshold", m_antialiasThreshold );
@@ -187,10 +183,6 @@ TQStringList PMRenderMode::commandLineSwitches( ) const
cl.append( tmp );
}
cl.append( TQString( "+Q%1" ).arg( m_quality ) );
- if( m_radiosity )
- cl.append( TQString( "+QR" ) );
- else
- cl.append( TQString( "-QR" ) );
if( m_antialiasing )
{
diff --git a/kpovmodeler/pmrendermode.h b/kpovmodeler/pmrendermode.h
index f4037906..aa819a7f 100644
--- a/kpovmodeler/pmrendermode.h
+++ b/kpovmodeler/pmrendermode.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -72,9 +71,6 @@ public:
void setQuality( int quality );
int quality( ) const { return m_quality; }
-
- void setRadiosity( bool on ) { m_radiosity = on; }
- bool radiosity( ) const { return m_radiosity; }
void setAntialiasing( bool on ) { m_antialiasing = on; }
bool antialiasing( ) const { return m_antialiasing; }
@@ -111,7 +107,6 @@ private:
double m_startRow, m_endRow, m_startColumn, m_endColumn;
int m_quality;
- bool m_radiosity;
bool m_antialiasing;
int m_samplingMethod;
double m_antialiasThreshold;
diff --git a/kpovmodeler/pmrendermodesdialog.cpp b/kpovmodeler/pmrendermodesdialog.cpp
index 1452e606..9c1b9c78 100644
--- a/kpovmodeler/pmrendermodesdialog.cpp
+++ b/kpovmodeler/pmrendermodesdialog.cpp
@@ -50,20 +50,20 @@ PMRenderModesDialog::PMRenderModesDialog( PMRenderModeList* modes, TQWidget* par
TQVBox* mainPage = makeVBoxMainWidget( );
m_pListBox = new TQListBox( mainPage );
- connect( m_pListBox, TQT_SIGNAL( highlighted( int ) ), TQT_SLOT( slotModeSelected( int ) ) );
+ connect( m_pListBox, TQ_SIGNAL( highlighted( int ) ), TQ_SLOT( slotModeSelected( int ) ) );
TQHBox* buttons = new TQHBox( mainPage );
buttons->setSpacing( KDialog::spacingHint( ) );
m_pAddButton = new TQPushButton( i18n( "Add" ), buttons );
- connect( m_pAddButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAdd( ) ) );
+ connect( m_pAddButton, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotAdd( ) ) );
m_pRemoveButton = new TQPushButton( i18n( "Remove" ), buttons );
- connect( m_pRemoveButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotRemove( ) ) );
+ connect( m_pRemoveButton, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotRemove( ) ) );
m_pEditButton = new TQPushButton( i18n( "Edit..." ), buttons );
- connect( m_pEditButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotEdit( ) ) );
+ connect( m_pEditButton, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotEdit( ) ) );
m_pUpButton = new TQPushButton( i18n( "Up" ), buttons );
- connect( m_pUpButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotUp( ) ) );
+ connect( m_pUpButton, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotUp( ) ) );
m_pDownButton = new TQPushButton( i18n( "Down" ), buttons );
- connect( m_pDownButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotDown( ) ) );
+ connect( m_pDownButton, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotDown( ) ) );
m_pRemoveButton->setEnabled( false );
m_pUpButton->setEnabled( false );
@@ -73,7 +73,7 @@ PMRenderModesDialog::PMRenderModesDialog( PMRenderModeList* modes, TQWidget* par
resize( s_size );
displayList( );
- connect( m_pListBox, TQT_SIGNAL( doubleClicked ( TQListBoxItem *) ), this, TQT_SLOT(slotEdit( ) ) );
+ connect( m_pListBox, TQ_SIGNAL( doubleClicked ( TQListBoxItem *) ), this, TQ_SLOT(slotEdit( ) ) );
}
void PMRenderModesDialog::slotChanged( )
@@ -222,22 +222,21 @@ void PMRenderModesDialog::slotOk( )
TQSize PMRenderModeDialog::s_size = TQSize( 300, 200 );
-const int numQuality = 9;
+const int numQuality = 7;
const char* qualityString[numQuality] =
{
I18N_NOOP( "0, 1: Quick colors, full ambient lighting only" ),
I18N_NOOP( "2, 3: Show specified diffuse and ambient light" ),
I18N_NOOP( "4: Render shadows, but no extended lights" ),
I18N_NOOP( "5: Render shadows, including extended lights" ),
- I18N_NOOP( "6, 7: Compute texture patterns" ),
+ I18N_NOOP( "6, 7: Compute texture patterns, compute photons" ),
I18N_NOOP( "8: Compute reflected, refracted, and transmitted rays" ),
- I18N_NOOP( "9: Compute media" ),
- I18N_NOOP( "10: Compute radiosity but no media" ),
- I18N_NOOP( "11: Compute radiosity and media" )
+ I18N_NOOP( "9, 10, 11: Compute media, radiosity and subsurface light transport" )
+
};
-const int c_qualityToIndex[12] = { 0, 0, 1, 1, 2, 3, 4, 4, 5, 6, 7, 8 };
-const int c_indexToQuality[numQuality] = { 0, 2, 4, 5, 6, 8, 9, 10, 11 };
+const int c_qualityToIndex[12] = { 0, 0, 1, 1, 2, 3, 4, 4, 5, 6, 6, 6 };
+const int c_indexToQuality[numQuality] = { 0, 2, 4, 5, 6, 8, 9};
PMRenderModeDialog::PMRenderModeDialog( PMRenderMode* mode, TQWidget* parent, const char* name )
: KDialogBase( parent, name, true, i18n( "Render Modes" ),
@@ -347,9 +346,6 @@ PMRenderModeDialog::PMRenderModeDialog( PMRenderMode* mode, TQWidget* parent, co
aaHelpLayout->addStretch( 1 );
- m_pRadiosityBox = new TQCheckBox( i18n( "Radiosity" ), tab );
- tabLayout->addWidget( m_pRadiosityBox );
-
tabLayout->addStretch( 1 );
// output options tab
@@ -371,23 +367,22 @@ PMRenderModeDialog::PMRenderModeDialog( PMRenderMode* mode, TQWidget* parent, co
enableButtonOK( false );
// connect signals
- connect( m_pDescriptionEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotTextChanged( const TQString& ) ) );
- connect( m_pHeightEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotChanged( ) ) );
- connect( m_pWidthEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotChanged( ) ) );
- connect( m_pSubsectionBox, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotSubsectionToggled( bool ) ) );
- connect( m_pStartRowEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotChanged( ) ) );
- connect( m_pEndRowEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotChanged( ) ) );
- connect( m_pStartColumnEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotChanged( ) ) );
- connect( m_pEndColumnEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotChanged( ) ) );
- connect( m_pQualityCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotActivated( int ) ) );
- connect( m_pRadiosityBox, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotChanged( ) ) );
- connect( m_pAntialiasingBox, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotAntialiasingToggled( bool ) ) );
- connect( m_pSamplingCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotActivated( int ) ) );
- connect( m_pThresholdEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotChanged( ) ) );
- connect( m_pJitterBox, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotJitterToggled( bool ) ) );
- connect( m_pJitterAmountEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotChanged( ) ) );
- connect( m_pAntialiasDepthEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotChanged( ) ) );
- connect( m_pAlphaBox, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotToggled( bool ) ) );
+ connect( m_pDescriptionEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotTextChanged( const TQString& ) ) );
+ connect( m_pHeightEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SLOT( slotChanged( ) ) );
+ connect( m_pWidthEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SLOT( slotChanged( ) ) );
+ connect( m_pSubsectionBox, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( slotSubsectionToggled( bool ) ) );
+ connect( m_pStartRowEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SLOT( slotChanged( ) ) );
+ connect( m_pEndRowEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SLOT( slotChanged( ) ) );
+ connect( m_pStartColumnEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SLOT( slotChanged( ) ) );
+ connect( m_pEndColumnEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SLOT( slotChanged( ) ) );
+ connect( m_pQualityCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotActivated( int ) ) );
+ connect( m_pAntialiasingBox, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( slotAntialiasingToggled( bool ) ) );
+ connect( m_pSamplingCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotActivated( int ) ) );
+ connect( m_pThresholdEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SLOT( slotChanged( ) ) );
+ connect( m_pJitterBox, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( slotJitterToggled( bool ) ) );
+ connect( m_pJitterAmountEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SLOT( slotChanged( ) ) );
+ connect( m_pAntialiasDepthEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SLOT( slotChanged( ) ) );
+ connect( m_pAlphaBox, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( slotToggled( bool ) ) );
}
void PMRenderModeDialog::saveConfig( TDEConfig* cfg )
@@ -425,7 +420,6 @@ bool PMRenderModeDialog::saveChanges( )
m_pMode->setEndColumn( m_pEndColumnEdit->value( ) );
}
m_pMode->setQuality( indexToQuality( m_pQualityCombo->currentItem( ) ) );
- m_pMode->setRadiosity( m_pRadiosityBox->isChecked( ) );
m_pMode->setAntialiasing( m_pAntialiasingBox->isChecked( ) );
if( m_pAntialiasingBox->isChecked( ) )
{
@@ -509,7 +503,6 @@ void PMRenderModeDialog::displayMode( )
m_pStartColumnEdit->setValue( m_pMode->startColumn( ) );
m_pEndColumnEdit->setValue( m_pMode->endColumn( ) );
m_pQualityCombo->setCurrentItem( qualityToIndex( m_pMode->quality( ) ) );
- m_pRadiosityBox->setChecked( m_pMode->radiosity( ) );
m_pAntialiasingBox->setChecked( m_pMode->antialiasing( ) );
enableAntialiasing( m_pMode->antialiasing( ) );
m_pSamplingCombo->setCurrentItem( m_pMode->samplingMethod( ) );
diff --git a/kpovmodeler/pmrendermodesdialog.h b/kpovmodeler/pmrendermodesdialog.h
index 6688b01c..9cb20744 100644
--- a/kpovmodeler/pmrendermodesdialog.h
+++ b/kpovmodeler/pmrendermodesdialog.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -38,7 +37,7 @@ class PMFloatEdit;
*/
class PMRenderModesDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
@@ -107,7 +106,7 @@ private:
*/
class PMRenderModeDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
@@ -165,7 +164,6 @@ private:
PMFloatEdit* m_pEndColumnEdit;
// quality
TQComboBox* m_pQualityCombo;
- TQCheckBox* m_pRadiosityBox;
TQCheckBox* m_pAntialiasingBox;
TQComboBox* m_pSamplingCombo;
PMFloatEdit* m_pThresholdEdit;
diff --git a/kpovmodeler/pmresourcelocator.h b/kpovmodeler/pmresourcelocator.h
index 1c016114..17414347 100644
--- a/kpovmodeler/pmresourcelocator.h
+++ b/kpovmodeler/pmresourcelocator.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmrotate.h b/kpovmodeler/pmrotate.h
index 4ecc6d9a..de6701e2 100644
--- a/kpovmodeler/pmrotate.h
+++ b/kpovmodeler/pmrotate.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmrotatecontrolpoint.h b/kpovmodeler/pmrotatecontrolpoint.h
index 1918eec4..79d3408c 100644
--- a/kpovmodeler/pmrotatecontrolpoint.h
+++ b/kpovmodeler/pmrotatecontrolpoint.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmrotateedit.cpp b/kpovmodeler/pmrotateedit.cpp
index d0d366d4..342d1887 100644
--- a/kpovmodeler/pmrotateedit.cpp
+++ b/kpovmodeler/pmrotateedit.cpp
@@ -37,7 +37,7 @@ void PMRotateEdit::createTopWidgets( )
m_pVector = new PMVectorEdit( "x", "y", "z", this );
topLayout( )->addWidget( m_pVector );
- connect( m_pVector, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pVector, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
}
void PMRotateEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmrotateedit.h b/kpovmodeler/pmrotateedit.h
index 601b130f..b4ed696a 100644
--- a/kpovmodeler/pmrotateedit.h
+++ b/kpovmodeler/pmrotateedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -34,7 +33,7 @@ class PMVectorEdit;
*/
class PMRotateEdit : public PMDialogEditBase
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMDialogEditBase Base;
public:
diff --git a/kpovmodeler/pmscale.h b/kpovmodeler/pmscale.h
index 72821041..d461edba 100644
--- a/kpovmodeler/pmscale.h
+++ b/kpovmodeler/pmscale.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmscalecontrolpoint.h b/kpovmodeler/pmscalecontrolpoint.h
index 5cb4a091..de1571b8 100644
--- a/kpovmodeler/pmscalecontrolpoint.h
+++ b/kpovmodeler/pmscalecontrolpoint.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmscaleedit.cpp b/kpovmodeler/pmscaleedit.cpp
index 4e94dcf2..8d0dc25b 100644
--- a/kpovmodeler/pmscaleedit.cpp
+++ b/kpovmodeler/pmscaleedit.cpp
@@ -37,7 +37,7 @@ void PMScaleEdit::createTopWidgets( )
m_pVector = new PMVectorEdit( "x", "y", "z", this );
topLayout( )->addWidget( m_pVector );
- connect( m_pVector, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pVector, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
}
void PMScaleEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmscaleedit.h b/kpovmodeler/pmscaleedit.h
index 763366e0..18956361 100644
--- a/kpovmodeler/pmscaleedit.h
+++ b/kpovmodeler/pmscaleedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -34,7 +33,7 @@ class PMVectorEdit;
*/
class PMScaleEdit : public PMDialogEditBase
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMDialogEditBase Base;
public:
diff --git a/kpovmodeler/pmscanner.h b/kpovmodeler/pmscanner.h
index 43c8aef3..2a59fdf6 100644
--- a/kpovmodeler/pmscanner.h
+++ b/kpovmodeler/pmscanner.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmscene.h b/kpovmodeler/pmscene.h
index ed7cf227..ad6f16dd 100644
--- a/kpovmodeler/pmscene.h
+++ b/kpovmodeler/pmscene.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmserializer.h b/kpovmodeler/pmserializer.h
index 4c579364..6ba921df 100644
--- a/kpovmodeler/pmserializer.h
+++ b/kpovmodeler/pmserializer.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmsettingsdialog.cpp b/kpovmodeler/pmsettingsdialog.cpp
index 08f0cb3c..2b092c4a 100644
--- a/kpovmodeler/pmsettingsdialog.cpp
+++ b/kpovmodeler/pmsettingsdialog.cpp
@@ -229,8 +229,8 @@ void PMSettingsDialog::registerPage( TQWidget* topPage,
else
{
m_pages.push_back( PMRegisteredSettingsPage( topPage, page, i ) );
- connect( page, TQT_SIGNAL( repaintViews( ) ), TQT_SLOT( slotRepaint( ) ) );
- connect( page, TQT_SIGNAL( showMe( ) ), TQT_SLOT( slotShowPage( ) ) );
+ connect( page, TQ_SIGNAL( repaintViews( ) ), TQ_SLOT( slotRepaint( ) ) );
+ connect( page, TQ_SIGNAL( showMe( ) ), TQ_SLOT( slotShowPage( ) ) );
}
}
@@ -241,7 +241,7 @@ void PMSettingsDialog::slotRepaint( )
void PMSettingsDialog::slotShowPage( )
{
- const TQObject* w = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender( )));
+ const TQObject* w = sender( );
if( w )
{
int index = findPage( ( const PMSettingsDialogPage* ) w );
diff --git a/kpovmodeler/pmsettingsdialog.h b/kpovmodeler/pmsettingsdialog.h
index bc4a60da..ad4f5119 100644
--- a/kpovmodeler/pmsettingsdialog.h
+++ b/kpovmodeler/pmsettingsdialog.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -51,7 +50,7 @@ class PMViewLayoutEntry;
*/
class PMSettingsDialogPage : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
@@ -126,7 +125,7 @@ public:
*/
class PMSettingsDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kpovmodeler/pmshell.cpp b/kpovmodeler/pmshell.cpp
index 7b96e066..2932eccc 100644
--- a/kpovmodeler/pmshell.cpp
+++ b/kpovmodeler/pmshell.cpp
@@ -52,7 +52,7 @@ PMShell::PMShell( const KURL& url )
setPluginLoadingMode( DoNotLoadPlugins );
setInstance( PMFactory::instance( ), false );
- m_pPart = new PMPart( this, "part", TQT_TQOBJECT(this), "part", true, this );
+ m_pPart = new PMPart( this, "part", this, "part", true, this );
m_pPart->setReadWrite( ); // read-write mode
m_viewNumber = 0;
m_objectsToDelete.setAutoDelete( true );
@@ -81,9 +81,9 @@ PMShell::PMShell( const KURL& url )
openURL( url );
setCaption( url.prettyURL( ) );
- connect( m_pPart, TQT_SIGNAL( modified( ) ), TQT_SLOT( slotModified( ) ) );
- connect( m_pPart, TQT_SIGNAL( controlPointMessage( const TQString& ) ),
- TQT_SLOT( slotControlPointMsg( const TQString& ) ) );
+ connect( m_pPart, TQ_SIGNAL( modified( ) ), TQ_SLOT( slotModified( ) ) );
+ connect( m_pPart, TQ_SIGNAL( controlPointMessage( const TQString& ) ),
+ TQ_SLOT( slotControlPointMsg( const TQString& ) ) );
}
PMShell::~PMShell( )
@@ -95,67 +95,67 @@ void PMShell::setupActions( )
// m_helpMenu = new KHelpMenu( this, PMFactory::aboutData( ), true,
// actionCollection( ) );
- KStdAction::openNew( TQT_TQOBJECT(this), TQT_SLOT( slotFileNew( ) ), actionCollection( ) );
- KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotFileOpen( ) ), actionCollection( ) );
- m_pRecent = KStdAction::openRecent( TQT_TQOBJECT(this), TQT_SLOT( slotOpenRecent( const KURL& ) ),
+ KStdAction::openNew( this, TQ_SLOT( slotFileNew( ) ), actionCollection( ) );
+ KStdAction::open( this, TQ_SLOT( slotFileOpen( ) ), actionCollection( ) );
+ m_pRecent = KStdAction::openRecent( this, TQ_SLOT( slotOpenRecent( const KURL& ) ),
actionCollection( ) );
- KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT( slotFileSave( ) ), actionCollection( ) );
- KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT( slotFileSaveAs( ) ), actionCollection( ) );
+ KStdAction::save( this, TQ_SLOT( slotFileSave( ) ), actionCollection( ) );
+ KStdAction::saveAs( this, TQ_SLOT( slotFileSaveAs( ) ), actionCollection( ) );
- KStdAction::revert( TQT_TQOBJECT(this), TQT_SLOT( slotFileRevert( ) ), actionCollection( ) );
- KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( slotFilePrint( ) ), actionCollection( ) );
+ KStdAction::revert( this, TQ_SLOT( slotFileRevert( ) ), actionCollection( ) );
+ KStdAction::print( this, TQ_SLOT( slotFilePrint( ) ), actionCollection( ) );
- KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( slotFileClose( ) ), actionCollection( ) );
- KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close( ) ), actionCollection( ) );
+ KStdAction::close( this, TQ_SLOT( slotFileClose( ) ), actionCollection( ) );
+ KStdAction::quit( this, TQ_SLOT( close( ) ), actionCollection( ) );
- m_pPathAction = new TDEToggleAction( i18n( "Show &Path" ), 0, TQT_TQOBJECT(this),
- TQT_SLOT( slotShowPath( ) ), actionCollection( ),
+ m_pPathAction = new TDEToggleAction( i18n( "Show &Path" ), 0, this,
+ TQ_SLOT( slotShowPath( ) ), actionCollection( ),
"options_show_path" );
m_pPathAction->setCheckedState(i18n("Hide &Path"));
- m_pStatusbarAction = KStdAction::showStatusbar( TQT_TQOBJECT(this), TQT_SLOT( slotShowStatusbar( ) ),
+ m_pStatusbarAction = KStdAction::showStatusbar( this, TQ_SLOT( slotShowStatusbar( ) ),
actionCollection( ) );
- KStdAction::saveOptions( TQT_TQOBJECT(this), TQT_SLOT( saveOptions( ) ), actionCollection( ) );
+ KStdAction::saveOptions( this, TQ_SLOT( saveOptions( ) ), actionCollection( ) );
- KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureKeys( ) ),
+ KStdAction::keyBindings( this, TQ_SLOT( slotConfigureKeys( ) ),
actionCollection( ) );
- KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureToolbars( ) ),
+ KStdAction::configureToolbars( this, TQ_SLOT( slotConfigureToolbars( ) ),
actionCollection( ) );
- KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT( slotSettings( ) ), actionCollection( ) );
+ KStdAction::preferences( this, TQ_SLOT( slotSettings( ) ), actionCollection( ) );
- m_pNewTopViewAction = new TDEAction( i18n( "New Top View" ), 0, TQT_TQOBJECT(this),
- TQT_SLOT( slotNewTopView( ) ),
+ m_pNewTopViewAction = new TDEAction( i18n( "New Top View" ), 0, this,
+ TQ_SLOT( slotNewTopView( ) ),
actionCollection( ), "view_new_topview" );
- m_pNewBottomViewAction = new TDEAction( i18n( "New Bottom View" ), 0, TQT_TQOBJECT(this),
- TQT_SLOT( slotNewBottomView( ) ),
+ m_pNewBottomViewAction = new TDEAction( i18n( "New Bottom View" ), 0, this,
+ TQ_SLOT( slotNewBottomView( ) ),
actionCollection( ), "view_new_bottomview" );
- m_pNewLeftViewAction = new TDEAction( i18n( "New Left View" ), 0, TQT_TQOBJECT(this),
- TQT_SLOT( slotNewLeftView( ) ),
+ m_pNewLeftViewAction = new TDEAction( i18n( "New Left View" ), 0, this,
+ TQ_SLOT( slotNewLeftView( ) ),
actionCollection( ), "view_new_leftview" );
- m_pNewRightViewAction = new TDEAction( i18n( "New Right View" ), 0, TQT_TQOBJECT(this),
- TQT_SLOT( slotNewRightView( ) ),
+ m_pNewRightViewAction = new TDEAction( i18n( "New Right View" ), 0, this,
+ TQ_SLOT( slotNewRightView( ) ),
actionCollection( ), "view_new_rightview" );
- m_pNewFrontViewAction = new TDEAction( i18n( "New Front View" ), 0, TQT_TQOBJECT(this),
- TQT_SLOT( slotNewFrontView( ) ),
+ m_pNewFrontViewAction = new TDEAction( i18n( "New Front View" ), 0, this,
+ TQ_SLOT( slotNewFrontView( ) ),
actionCollection( ), "view_new_frontview" );
- m_pNewBackViewAction = new TDEAction( i18n( "New Back View" ), 0, TQT_TQOBJECT(this),
- TQT_SLOT( slotNewBackView( ) ),
+ m_pNewBackViewAction = new TDEAction( i18n( "New Back View" ), 0, this,
+ TQ_SLOT( slotNewBackView( ) ),
actionCollection( ), "view_new_back_view" );
- m_pNewCameraViewAction = new TDEAction( i18n( "New Camera View" ), 0, TQT_TQOBJECT(this),
- TQT_SLOT( slotNewCameraView( ) ),
+ m_pNewCameraViewAction = new TDEAction( i18n( "New Camera View" ), 0, this,
+ TQ_SLOT( slotNewCameraView( ) ),
actionCollection( ), "view_new_cameraview" );
- m_pNewTreeViewAction = new TDEAction( i18n( "New Object Tree" ), 0, TQT_TQOBJECT(this),
- TQT_SLOT( slotNewTreeView( ) ), actionCollection( ),
+ m_pNewTreeViewAction = new TDEAction( i18n( "New Object Tree" ), 0, this,
+ TQ_SLOT( slotNewTreeView( ) ), actionCollection( ),
"view_new_treeview" );
- m_pNewDialogViewAction = new TDEAction( i18n( "New Properties View" ), 0, TQT_TQOBJECT(this),
- TQT_SLOT( slotNewDialogView( ) ), actionCollection( ),
+ m_pNewDialogViewAction = new TDEAction( i18n( "New Properties View" ), 0, this,
+ TQ_SLOT( slotNewDialogView( ) ), actionCollection( ),
"view_new_dialogview" );
#ifdef KPM_WITH_OBJECT_LIBRARY
- m_pNewLibraryBrowserAction = new TDEAction( i18n( "New Library Browser" ), 0, TQT_TQOBJECT(this),
- TQT_SLOT( slotNewLibraryBrowserView( ) ), actionCollection( ),
+ m_pNewLibraryBrowserAction = new TDEAction( i18n( "New Library Browser" ), 0, this,
+ TQ_SLOT( slotNewLibraryBrowserView( ) ), actionCollection( ),
"view_new_librarybrowser" );
#endif
@@ -163,12 +163,12 @@ void PMShell::setupActions( )
m_pViewLayoutsAction = new TDEActionMenu( i18n( "View Layouts" ),
actionCollection( ), "view_layouts_menu" );
TDEPopupMenu* menu = m_pViewLayoutsAction->popupMenu( );
- connect( menu, TQT_SIGNAL( aboutToShow( ) ), TQT_SLOT( slotViewsMenuAboutToShow( ) ) );
+ connect( menu, TQ_SIGNAL( aboutToShow( ) ), TQ_SLOT( slotViewsMenuAboutToShow( ) ) );
PMViewLayoutManager::theManager( )->fillPopupMenu( menu );
- connect( menu, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotSelectedLayout( int ) ) );
+ connect( menu, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotSelectedLayout( int ) ) );
- m_pSaveViewLayoutAction = new TDEAction( i18n( "Save View Layout..." ), 0, TQT_TQOBJECT(this),
- TQT_SLOT( slotSaveViewLayout( ) ),
+ m_pSaveViewLayoutAction = new TDEAction( i18n( "Save View Layout..." ), 0, this,
+ TQ_SLOT( slotSaveViewLayout( ) ),
actionCollection( ), "save_view_layout" );
}
@@ -214,8 +214,8 @@ PMDockWidget* PMShell::createView( const TQString& t, PMViewOptions* o,
}
dock->setWidget( contents );
- connect( dock, TQT_SIGNAL( headerCloseButtonClicked( ) ),
- TQT_SLOT( slotDockWidgetClosed( ) ) );
+ connect( dock, TQ_SIGNAL( headerCloseButtonClicked( ) ),
+ TQ_SLOT( slotDockWidgetClosed( ) ) );
if( initPosition )
{
@@ -238,8 +238,8 @@ PMDockWidget* PMShell::createTreeView( )
PMTreeView* tv = new PMTreeView( m_pPart, dock );
dock->setWidget( tv );
- connect( dock, TQT_SIGNAL( headerCloseButtonClicked( ) ),
- TQT_SLOT( slotDockWidgetClosed( ) ) );
+ connect( dock, TQ_SIGNAL( headerCloseButtonClicked( ) ),
+ TQ_SLOT( slotDockWidgetClosed( ) ) );
return dock;
}
@@ -255,8 +255,8 @@ PMDockWidget* PMShell::createDialogView( )
PMDialogView* dv = new PMDialogView( m_pPart, dock );
dock->setWidget( dv );
- connect( dock, TQT_SIGNAL( headerCloseButtonClicked( ) ),
- TQT_SLOT( slotDockWidgetClosed( ) ) );
+ connect( dock, TQ_SIGNAL( headerCloseButtonClicked( ) ),
+ TQ_SLOT( slotDockWidgetClosed( ) ) );
return dock;
}
@@ -271,12 +271,12 @@ PMDockWidget* PMShell::create3DView( PMGLView::PMViewType t )
dock->setDockSite( PMDockWidget::DockFullSite );
PMGLView* vgl = new PMGLView( m_pPart, t, dock );
dock->setWidget( vgl );
- connect( vgl, TQT_SIGNAL( viewTypeChanged( const TQString& ) ),
- dock, TQT_SLOT( slotSetCaption( const TQString& ) ) );
+ connect( vgl, TQ_SIGNAL( viewTypeChanged( const TQString& ) ),
+ dock, TQ_SLOT( slotSetCaption( const TQString& ) ) );
dock->slotSetCaption( PMGLView::viewTypeAsString( t ) );
- connect( dock, TQT_SIGNAL( headerCloseButtonClicked( ) ),
- TQT_SLOT( slotDockWidgetClosed( ) ) );
+ connect( dock, TQ_SIGNAL( headerCloseButtonClicked( ) ),
+ TQ_SLOT( slotDockWidgetClosed( ) ) );
return dock;
}
@@ -341,13 +341,13 @@ void PMShell::slotNewLibraryBrowserView( )
void PMShell::slotDockWidgetClosed( )
{
- const TQObject* o = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender( )));
+ const TQObject* o = sender( );
if( o && o->inherits( "PMDockWidget" ) )
{
if( m_objectsToDelete.containsRef( o ) == 0 )
{
m_objectsToDelete.append( o );
- TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( slotDeleteClosedObjects( ) ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( slotDeleteClosedObjects( ) ) );
}
}
}
@@ -377,7 +377,7 @@ void PMShell::openURL( const KURL& url )
void PMShell::slotOpenRecent( const KURL& url )
{
m_openRecentURL = url;
- TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( slotOpenRecentTimer( ) ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( slotOpenRecentTimer( ) ) );
}
void PMShell::slotOpenRecentTimer( )
@@ -533,8 +533,8 @@ void PMShell::slotConfigureToolbars( )
{
saveMainWindowSettings( TDEGlobal::config( ), "Appearance" );
KEditToolbar dlg( factory( ) );
- connect( &dlg, TQT_SIGNAL( newToolbarConfig( ) ),
- this, TQT_SLOT( slotNewToolbarConfig( ) ) );
+ connect( &dlg, TQ_SIGNAL( newToolbarConfig( ) ),
+ this, TQ_SLOT( slotNewToolbarConfig( ) ) );
dlg.exec( );
}
diff --git a/kpovmodeler/pmshell.h b/kpovmodeler/pmshell.h
index 8e354706..026e6d36 100644
--- a/kpovmodeler/pmshell.h
+++ b/kpovmodeler/pmshell.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -42,7 +41,7 @@ class PMViewOptions;
*/
class PMShell : public PMDockMainWindow
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kpovmodeler/pmskysphere.h b/kpovmodeler/pmskysphere.h
index 116af543..1c2b3373 100644
--- a/kpovmodeler/pmskysphere.h
+++ b/kpovmodeler/pmskysphere.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmskysphereedit.h b/kpovmodeler/pmskysphereedit.h
index a6dc757e..6b1ad377 100644
--- a/kpovmodeler/pmskysphereedit.h
+++ b/kpovmodeler/pmskysphereedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -33,7 +32,7 @@ class PMSkySphere;
*/
class PMSkySphereEdit : public PMTextureBaseEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMTextureBaseEdit Base;
public:
diff --git a/kpovmodeler/pmslope.h b/kpovmodeler/pmslope.h
index eb860373..b0605c52 100644
--- a/kpovmodeler/pmslope.h
+++ b/kpovmodeler/pmslope.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmslopeedit.cpp b/kpovmodeler/pmslopeedit.cpp
index 16930e02..356393f0 100644
--- a/kpovmodeler/pmslopeedit.cpp
+++ b/kpovmodeler/pmslopeedit.cpp
@@ -54,8 +54,8 @@ void PMSlopeEdit::createTopWidgets( )
gl->addWidget( m_pSlopeEdit, 1, 1 );
hl->addStretch( 1 );
- connect( m_pHeightEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pSlopeEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pHeightEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pSlopeEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
}
void PMSlopeEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmslopeedit.h b/kpovmodeler/pmslopeedit.h
index e20eae1b..c0e71842 100644
--- a/kpovmodeler/pmslopeedit.h
+++ b/kpovmodeler/pmslopeedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -39,7 +38,7 @@ class TQLabel;
*/
class PMSlopeEdit : public PMDialogEditBase
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMDialogEditBase Base;
public:
diff --git a/kpovmodeler/pmsolidcolor.h b/kpovmodeler/pmsolidcolor.h
index 225a3a5b..b7c5053e 100644
--- a/kpovmodeler/pmsolidcolor.h
+++ b/kpovmodeler/pmsolidcolor.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmsolidcoloredit.cpp b/kpovmodeler/pmsolidcoloredit.cpp
index 52e27f73..dd62cd07 100644
--- a/kpovmodeler/pmsolidcoloredit.cpp
+++ b/kpovmodeler/pmsolidcoloredit.cpp
@@ -42,7 +42,7 @@ void PMSolidColorEdit::createTopWidgets( )
layout->addWidget( label, 0, AlignTop );
layout->addWidget( m_pColorEdit );
- connect( m_pColorEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pColorEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
}
void PMSolidColorEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmsolidcoloredit.h b/kpovmodeler/pmsolidcoloredit.h
index a0f3091b..76fd0933 100644
--- a/kpovmodeler/pmsolidcoloredit.h
+++ b/kpovmodeler/pmsolidcoloredit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -34,7 +33,7 @@ class PMColorEdit;
*/
class PMSolidColorEdit : public PMDialogEditBase
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMDialogEditBase Base;
public:
diff --git a/kpovmodeler/pmsolidobject.h b/kpovmodeler/pmsolidobject.h
index be2d2f5c..0eeba0fc 100644
--- a/kpovmodeler/pmsolidobject.h
+++ b/kpovmodeler/pmsolidobject.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmsolidobjectedit.cpp b/kpovmodeler/pmsolidobjectedit.cpp
index 98c4c7ca..ea379081 100644
--- a/kpovmodeler/pmsolidobjectedit.cpp
+++ b/kpovmodeler/pmsolidobjectedit.cpp
@@ -39,8 +39,8 @@ void PMSolidObjectEdit::createBottomWidgets( )
topLayout( )->addWidget( m_pInverseButton );
topLayout( )->addWidget( m_pHollowButton );
- connect( m_pHollowButton, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pInverseButton, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pHollowButton, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pInverseButton, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) );
Base::createBottomWidgets( );
}
diff --git a/kpovmodeler/pmsolidobjectedit.h b/kpovmodeler/pmsolidobjectedit.h
index b5e8439a..54698469 100644
--- a/kpovmodeler/pmsolidobjectedit.h
+++ b/kpovmodeler/pmsolidobjectedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -34,7 +33,7 @@ class TQCheckBox;
*/
class PMSolidObjectEdit : public PMGraphicalObjectEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMGraphicalObjectEdit Base;
public:
diff --git a/kpovmodeler/pmsor.h b/kpovmodeler/pmsor.h
index 46db677e..62af1f05 100644
--- a/kpovmodeler/pmsor.h
+++ b/kpovmodeler/pmsor.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmsorcontrolpoint.h b/kpovmodeler/pmsorcontrolpoint.h
index f25ddde5..7f34d256 100644
--- a/kpovmodeler/pmsorcontrolpoint.h
+++ b/kpovmodeler/pmsorcontrolpoint.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmsoredit.cpp b/kpovmodeler/pmsoredit.cpp
index 03179ea2..e6afdb96 100644
--- a/kpovmodeler/pmsoredit.cpp
+++ b/kpovmodeler/pmsoredit.cpp
@@ -43,9 +43,9 @@ void PMSurfaceOfRevolutionEdit::createBottomWidgets( )
topLayout( )->addWidget( new TQLabel( i18n( "Spline points:" ), this ) );
m_pPoints = new PMVectorListEdit( "u", "v", this );
- connect( m_pPoints, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pPoints, TQT_SIGNAL( selectionChanged( ) ),
- TQT_SLOT( slotSelectionChanged( ) ) );
+ connect( m_pPoints, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pPoints, TQ_SIGNAL( selectionChanged( ) ),
+ TQ_SLOT( slotSelectionChanged( ) ) );
TQHBoxLayout* hl = new TQHBoxLayout( topLayout( ) );
hl->addWidget( m_pPoints, 2 );
@@ -55,9 +55,9 @@ void PMSurfaceOfRevolutionEdit::createBottomWidgets( )
m_pAddBelow->setPixmap( SmallIcon( "pmaddpoint" ) );
m_pRemove = new TQPushButton( this );
m_pRemove->setPixmap( SmallIcon( "pmremovepoint" ) );
- connect( m_pAddAbove, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAddPointAbove( ) ) );
- connect( m_pAddBelow, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAddPointBelow( ) ) );
- connect( m_pRemove, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotRemovePoint( ) ) );
+ connect( m_pAddAbove, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotAddPointAbove( ) ) );
+ connect( m_pAddBelow, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotAddPointBelow( ) ) );
+ connect( m_pRemove, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotRemovePoint( ) ) );
TQVBoxLayout* bl = new TQVBoxLayout( hl );
bl->addWidget( m_pAddAbove );
@@ -67,10 +67,10 @@ void PMSurfaceOfRevolutionEdit::createBottomWidgets( )
m_pOpen = new TQCheckBox( i18n( "type of the object", "Open" ), this );
topLayout( )->addWidget( m_pOpen );
- connect( m_pOpen, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pOpen, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) );
m_pSturm = new TQCheckBox( i18n( "Sturm" ), this );
topLayout( )->addWidget( m_pSturm );
- connect( m_pSturm, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pSturm, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) );
Base::createBottomWidgets( );
}
diff --git a/kpovmodeler/pmsoredit.h b/kpovmodeler/pmsoredit.h
index 8b54c08f..d803567b 100644
--- a/kpovmodeler/pmsoredit.h
+++ b/kpovmodeler/pmsoredit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -42,7 +41,7 @@ class PMVectorListEdit;
*/
class PMSurfaceOfRevolutionEdit : public PMSolidObjectEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMSolidObjectEdit Base;
public:
diff --git a/kpovmodeler/pmsorsegment.cpp b/kpovmodeler/pmsorsegment.cpp
index 966beb2b..7c651c50 100644
--- a/kpovmodeler/pmsorsegment.cpp
+++ b/kpovmodeler/pmsorsegment.cpp
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmsorsegment.h b/kpovmodeler/pmsorsegment.h
index f0c5a2ea..40e61071 100644
--- a/kpovmodeler/pmsorsegment.h
+++ b/kpovmodeler/pmsorsegment.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmsphere.h b/kpovmodeler/pmsphere.h
index 984bc6d6..9194e667 100644
--- a/kpovmodeler/pmsphere.h
+++ b/kpovmodeler/pmsphere.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
pmsphere.h - description
diff --git a/kpovmodeler/pmsphereedit.cpp b/kpovmodeler/pmsphereedit.cpp
index 31406d5e..5dbc1a16 100644
--- a/kpovmodeler/pmsphereedit.cpp
+++ b/kpovmodeler/pmsphereedit.cpp
@@ -50,8 +50,8 @@ void PMSphereEdit::createTopWidgets( )
layout->addWidget( m_pRadius );
layout->addStretch( 1 );
- connect( m_pCentre, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pRadius, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pCentre, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pRadius, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
}
void PMSphereEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmsphereedit.h b/kpovmodeler/pmsphereedit.h
index 04db9599..a35740cb 100644
--- a/kpovmodeler/pmsphereedit.h
+++ b/kpovmodeler/pmsphereedit.h
@@ -35,7 +35,7 @@ class PMFloatEdit ;
*/
class PMSphereEdit : public PMSolidObjectEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMSolidObjectEdit Base;
public:
diff --git a/kpovmodeler/pmspheresweep.h b/kpovmodeler/pmspheresweep.h
index b28d69a5..5559fdfb 100644
--- a/kpovmodeler/pmspheresweep.h
+++ b/kpovmodeler/pmspheresweep.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmspheresweepedit.cpp b/kpovmodeler/pmspheresweepedit.cpp
index 06ae4ec1..92656913 100644
--- a/kpovmodeler/pmspheresweepedit.cpp
+++ b/kpovmodeler/pmspheresweepedit.cpp
@@ -53,8 +53,8 @@ void PMSphereSweepEdit::createTopWidgets( )
hl->addWidget( m_pSplineType );
hl->addStretch( 1 );
- connect( m_pSplineType, TQT_SIGNAL( activated( int ) ),
- TQT_SLOT( slotTypeChanged( int ) ) );
+ connect( m_pSplineType, TQ_SIGNAL( activated( int ) ),
+ TQ_SLOT( slotTypeChanged( int ) ) );
}
void PMSphereSweepEdit::createBottomWidgets( )
@@ -62,9 +62,9 @@ void PMSphereSweepEdit::createBottomWidgets( )
topLayout( )->addWidget( new TQLabel( i18n( "Spheres:" ), this ) );
m_pPoints = new PMVectorListEdit( "x", "y", "z", "r", this );
- connect( m_pPoints, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pPoints, TQT_SIGNAL( selectionChanged( ) ),
- TQT_SLOT( slotSelectionChanged( ) ) );
+ connect( m_pPoints, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pPoints, TQ_SIGNAL( selectionChanged( ) ),
+ TQ_SLOT( slotSelectionChanged( ) ) );
TQHBoxLayout* hl = new TQHBoxLayout( topLayout( ) );
hl->addWidget( m_pPoints, 2 );
@@ -74,9 +74,9 @@ void PMSphereSweepEdit::createBottomWidgets( )
m_pAddBelow->setPixmap( SmallIcon( "pmaddpoint" ) );
m_pRemove = new TQPushButton( this );
m_pRemove->setPixmap( SmallIcon( "pmremovepoint" ) );
- connect( m_pAddAbove, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAddPointAbove( ) ) );
- connect( m_pAddBelow, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAddPointBelow( ) ) );
- connect( m_pRemove, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotRemovePoint( ) ) );
+ connect( m_pAddAbove, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotAddPointAbove( ) ) );
+ connect( m_pAddBelow, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotAddPointBelow( ) ) );
+ connect( m_pRemove, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotRemovePoint( ) ) );
TQVBoxLayout* bl = new TQVBoxLayout( hl );
bl->addWidget( m_pAddAbove );
@@ -89,7 +89,7 @@ void PMSphereSweepEdit::createBottomWidgets( )
m_pTolerance = new PMFloatEdit( this );
m_pTolerance->setValidation( true, 0, false, 0 );
hl->addWidget( m_pTolerance );
- connect( m_pTolerance, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pTolerance, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
Base::createBottomWidgets( );
}
diff --git a/kpovmodeler/pmspheresweepedit.h b/kpovmodeler/pmspheresweepedit.h
index ba9bb50b..22811538 100644
--- a/kpovmodeler/pmspheresweepedit.h
+++ b/kpovmodeler/pmspheresweepedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -43,7 +42,7 @@ class TQLabel;
*/
class PMSphereSweepEdit : public PMSolidObjectEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMSolidObjectEdit Base;
public:
diff --git a/kpovmodeler/pmsplinememento.h b/kpovmodeler/pmsplinememento.h
index 4436e60c..95f175a6 100644
--- a/kpovmodeler/pmsplinememento.h
+++ b/kpovmodeler/pmsplinememento.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmsplinesegment.cpp b/kpovmodeler/pmsplinesegment.cpp
index dbbc6b18..d62b9b2d 100644
--- a/kpovmodeler/pmsplinesegment.cpp
+++ b/kpovmodeler/pmsplinesegment.cpp
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmsplinesegment.h b/kpovmodeler/pmsplinesegment.h
index c45b0a2e..5a12d03c 100644
--- a/kpovmodeler/pmsplinesegment.h
+++ b/kpovmodeler/pmsplinesegment.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmsqe.h b/kpovmodeler/pmsqe.h
index acc4e030..57a70221 100644
--- a/kpovmodeler/pmsqe.h
+++ b/kpovmodeler/pmsqe.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmsqeedit.cpp b/kpovmodeler/pmsqeedit.cpp
index f802b22f..5ac86ca5 100644
--- a/kpovmodeler/pmsqeedit.cpp
+++ b/kpovmodeler/pmsqeedit.cpp
@@ -49,8 +49,8 @@ void PMSuperquadricEllipsoidEdit::createTopWidgets( )
gl->addWidget( m_pValueN, 1, 1 );
hl->addStretch( 1 );
- connect( m_pValueE, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pValueN, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pValueE, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pValueN, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
}
void PMSuperquadricEllipsoidEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmsqeedit.h b/kpovmodeler/pmsqeedit.h
index 7d2db4e1..abcad372 100644
--- a/kpovmodeler/pmsqeedit.h
+++ b/kpovmodeler/pmsqeedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -34,7 +33,7 @@ class PMFloatEdit;
*/
class PMSuperquadricEllipsoidEdit : public PMSolidObjectEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMSolidObjectEdit Base;
public:
diff --git a/kpovmodeler/pmsymboltable.h b/kpovmodeler/pmsymboltable.h
index 481a2916..8802a7d0 100644
--- a/kpovmodeler/pmsymboltable.h
+++ b/kpovmodeler/pmsymboltable.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmtext.h b/kpovmodeler/pmtext.h
index 7ab4aff7..b9578b09 100644
--- a/kpovmodeler/pmtext.h
+++ b/kpovmodeler/pmtext.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmtextedit.cpp b/kpovmodeler/pmtextedit.cpp
index 7bf7a3ae..a7c065aa 100644
--- a/kpovmodeler/pmtextedit.cpp
+++ b/kpovmodeler/pmtextedit.cpp
@@ -63,16 +63,16 @@ void PMTextEdit::createTopWidgets( )
m_pOffset = new PMVectorEdit( "x", "y", this );
hl->addWidget( m_pOffset );
- connect( m_pFont, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( slotTextChanged( const TQString& ) ) );
- connect( m_pChooseFont, TQT_SIGNAL( clicked( ) ),
- TQT_SLOT( slotChooseFont( ) ) );
- connect( m_pText, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( slotTextChanged( const TQString& ) ) );
- connect( m_pThickness, TQT_SIGNAL( dataChanged( ) ),
- TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pOffset, TQT_SIGNAL( dataChanged( ) ),
- TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pFont, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( slotTextChanged( const TQString& ) ) );
+ connect( m_pChooseFont, TQ_SIGNAL( clicked( ) ),
+ TQ_SLOT( slotChooseFont( ) ) );
+ connect( m_pText, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( slotTextChanged( const TQString& ) ) );
+ connect( m_pThickness, TQ_SIGNAL( dataChanged( ) ),
+ TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pOffset, TQ_SIGNAL( dataChanged( ) ),
+ TQ_SIGNAL( dataChanged( ) ) );
}
void PMTextEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmtextedit.h b/kpovmodeler/pmtextedit.h
index 734f76ac..8b2b285c 100644
--- a/kpovmodeler/pmtextedit.h
+++ b/kpovmodeler/pmtextedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -37,7 +36,7 @@ class TQPushButton;
*/
class PMTextEdit : public PMSolidObjectEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMSolidObjectEdit Base;
public:
diff --git a/kpovmodeler/pmtexture.h b/kpovmodeler/pmtexture.h
index b2675b11..1c26000f 100644
--- a/kpovmodeler/pmtexture.h
+++ b/kpovmodeler/pmtexture.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmtexturebase.h b/kpovmodeler/pmtexturebase.h
index a3ecdc0a..6e70ac85 100644
--- a/kpovmodeler/pmtexturebase.h
+++ b/kpovmodeler/pmtexturebase.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmtexturebaseedit.cpp b/kpovmodeler/pmtexturebaseedit.cpp
index ad68341d..16537e7b 100644
--- a/kpovmodeler/pmtexturebaseedit.cpp
+++ b/kpovmodeler/pmtexturebaseedit.cpp
@@ -37,7 +37,7 @@ void PMTextureBaseEdit::createTopWidgets( )
Base::createTopWidgets( );
m_pLinkEdit = new PMLinkEdit( this );
topLayout( )->addWidget( m_pLinkEdit );
- connect( m_pLinkEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pLinkEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
}
diff --git a/kpovmodeler/pmtexturebaseedit.h b/kpovmodeler/pmtexturebaseedit.h
index 653bcb56..c1d1f066 100644
--- a/kpovmodeler/pmtexturebaseedit.h
+++ b/kpovmodeler/pmtexturebaseedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -34,7 +33,7 @@ class PMLinkEdit;
*/
class PMTextureBaseEdit : public PMNamedObjectEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMNamedObjectEdit Base;
public:
diff --git a/kpovmodeler/pmtextureedit.cpp b/kpovmodeler/pmtextureedit.cpp
index 59ae2908..cdc62c93 100644
--- a/kpovmodeler/pmtextureedit.cpp
+++ b/kpovmodeler/pmtextureedit.cpp
@@ -37,7 +37,7 @@ void PMTextureEdit::createTopWidgets()
m_pUVMapping = new TQCheckBox( i18n( "UV mapping" ), this );
topLayout( )->addWidget( m_pUVMapping );
- connect( m_pUVMapping, TQT_SIGNAL( clicked() ), TQT_SIGNAL( dataChanged() ) );
+ connect( m_pUVMapping, TQ_SIGNAL( clicked() ), TQ_SIGNAL( dataChanged() ) );
}
void PMTextureEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmtextureedit.h b/kpovmodeler/pmtextureedit.h
index 6252dc78..66580b11 100644
--- a/kpovmodeler/pmtextureedit.h
+++ b/kpovmodeler/pmtextureedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -34,7 +33,7 @@ class TQCheckBox;
*/
class PMTextureEdit : public PMTextureBaseEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMTextureBaseEdit Base;
public:
diff --git a/kpovmodeler/pmtexturemap.h b/kpovmodeler/pmtexturemap.h
index 6a7b020d..a1fffe75 100644
--- a/kpovmodeler/pmtexturemap.h
+++ b/kpovmodeler/pmtexturemap.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmtexturemapedit.cpp b/kpovmodeler/pmtexturemapedit.cpp
index ad5545d8..6eb277dd 100644
--- a/kpovmodeler/pmtexturemapedit.cpp
+++ b/kpovmodeler/pmtexturemapedit.cpp
@@ -78,7 +78,7 @@ void PMTextureMapEdit::displayObject( PMObject* o )
edit->setValue( *vit );
edit->setValidation( true, 0.0, true, 1.0 );
edit->setReadOnly( readOnly );
- connect( edit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( edit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
}
m_numValues++;
}
diff --git a/kpovmodeler/pmtexturemapedit.h b/kpovmodeler/pmtexturemapedit.h
index cc95816f..ff14d727 100644
--- a/kpovmodeler/pmtexturemapedit.h
+++ b/kpovmodeler/pmtexturemapedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -38,7 +37,7 @@ class TQLabel;
*/
class PMTextureMapEdit : public PMTextureBaseEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMTextureBaseEdit Base;
public:
diff --git a/kpovmodeler/pmtokens.h b/kpovmodeler/pmtokens.h
index 21b4b34b..a5b777d8 100644
--- a/kpovmodeler/pmtokens.h
+++ b/kpovmodeler/pmtokens.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmtorusedit.cpp b/kpovmodeler/pmtorusedit.cpp
index 596297bf..37a63484 100644
--- a/kpovmodeler/pmtorusedit.cpp
+++ b/kpovmodeler/pmtorusedit.cpp
@@ -54,9 +54,9 @@ void PMTorusEdit::createTopWidgets( )
topLayout( )->addWidget( m_pSturm );
- connect( m_pMinorRadius, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pMajorRadius, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pSturm, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pMinorRadius, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pMajorRadius, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pSturm, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) );
}
void PMTorusEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmtorusedit.h b/kpovmodeler/pmtorusedit.h
index aac8050b..b6ec6499 100644
--- a/kpovmodeler/pmtorusedit.h
+++ b/kpovmodeler/pmtorusedit.h
@@ -34,7 +34,7 @@ class TQCheckBox;
*/
class PMTorusEdit : public PMSolidObjectEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMSolidObjectEdit Base;
public:
diff --git a/kpovmodeler/pmtranslate.h b/kpovmodeler/pmtranslate.h
index d1272bf6..44c36c40 100644
--- a/kpovmodeler/pmtranslate.h
+++ b/kpovmodeler/pmtranslate.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmtranslatecontrolpoint.h b/kpovmodeler/pmtranslatecontrolpoint.h
index 292e8a67..d2474f14 100644
--- a/kpovmodeler/pmtranslatecontrolpoint.h
+++ b/kpovmodeler/pmtranslatecontrolpoint.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmtranslateedit.cpp b/kpovmodeler/pmtranslateedit.cpp
index 51c5cdbe..33a9a1ba 100644
--- a/kpovmodeler/pmtranslateedit.cpp
+++ b/kpovmodeler/pmtranslateedit.cpp
@@ -37,7 +37,7 @@ void PMTranslateEdit::createTopWidgets( )
m_pVector = new PMVectorEdit( "x", "y", "z", this );
topLayout( )->addWidget( m_pVector );
- connect( m_pVector, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pVector, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
}
void PMTranslateEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmtranslateedit.h b/kpovmodeler/pmtranslateedit.h
index 5795f6f7..19b018d8 100644
--- a/kpovmodeler/pmtranslateedit.h
+++ b/kpovmodeler/pmtranslateedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -34,7 +33,7 @@ class PMVectorEdit;
*/
class PMTranslateEdit : public PMDialogEditBase
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMDialogEditBase Base;
public:
diff --git a/kpovmodeler/pmtreeview.cpp b/kpovmodeler/pmtreeview.cpp
index 7ac1ca76..99499d83 100644
--- a/kpovmodeler/pmtreeview.cpp
+++ b/kpovmodeler/pmtreeview.cpp
@@ -75,16 +75,16 @@ PMTreeView::PMTreeView( PMPart* part, TQWidget* parent /*= 0*/,
viewport( )->setAcceptDrops( true );
viewport( )->setMouseTracking( true );
- viewport( )->setFocusPolicy( TQ_WheelFocus );
- setFocusPolicy( TQ_WheelFocus );
+ viewport( )->setFocusPolicy( TQWidget::WheelFocus );
+ setFocusPolicy( TQWidget::WheelFocus );
setAcceptDrops( true );
- connect( part, TQT_SIGNAL( refresh( ) ), TQT_SLOT( slotRefresh( ) ) );
- connect( part, TQT_SIGNAL( objectChanged( PMObject*, const int, TQObject* ) ),
- TQT_SLOT( slotObjectChanged( PMObject*, const int, TQObject* ) ) );
- connect( part, TQT_SIGNAL( clear( ) ), TQT_SLOT( slotClear( ) ) );
- connect( this, TQT_SIGNAL( objectChanged( PMObject*, const int, TQObject* ) ),
- part, TQT_SLOT( slotObjectChanged( PMObject*, const int, TQObject* ) ) );
+ connect( part, TQ_SIGNAL( refresh( ) ), TQ_SLOT( slotRefresh( ) ) );
+ connect( part, TQ_SIGNAL( objectChanged( PMObject*, const int, TQObject* ) ),
+ TQ_SLOT( slotObjectChanged( PMObject*, const int, TQObject* ) ) );
+ connect( part, TQ_SIGNAL( clear( ) ), TQ_SLOT( slotClear( ) ) );
+ connect( this, TQ_SIGNAL( objectChanged( PMObject*, const int, TQObject* ) ),
+ part, TQ_SLOT( slotObjectChanged( PMObject*, const int, TQObject* ) ) );
slotRefresh( );
}
@@ -101,7 +101,7 @@ void PMTreeView::slotObjectChanged( PMObject* obj, const int mode,
bool as = m_acceptSelect;
m_acceptSelect = true;
- if( TQT_BASE_OBJECT(sender) != TQT_BASE_OBJECT(this) )
+ if( sender != this )
{
if( ( mode & PMCAdd ) && !( mode & PMCInsertError ) )
{
@@ -361,7 +361,7 @@ void PMTreeView::contentsMousePressEvent( TQMouseEvent * e )
if( m_selectionCleared )
{
- emit objectChanged( 0, PMCNewSelection, TQT_TQOBJECT(this) );
+ emit objectChanged( 0, PMCNewSelection, this );
specialAction = true;
}
else if( m_itemSelected || m_itemDeselected )
@@ -378,7 +378,7 @@ void PMTreeView::contentsMousePressEvent( TQMouseEvent * e )
m_pLastSelected->setSelected( true );
emit objectChanged( m_pLastSelected->object( ), PMCNewSelection,
- TQT_TQOBJECT(this) );
+ this );
}
else
{
@@ -407,7 +407,7 @@ void PMTreeView::contentsMousePressEvent( TQMouseEvent * e )
{
tmp->setSelected( true );
emit objectChanged( (( PMTreeViewItem* ) tmp)->object( ),
- PMCSelected, TQT_TQOBJECT(this) );
+ PMCSelected, this );
if( tmp == m_pLastSelected )
break;
}
@@ -418,7 +418,7 @@ void PMTreeView::contentsMousePressEvent( TQMouseEvent * e )
{
tmp->setSelected( true );
emit objectChanged( (( PMTreeViewItem* ) tmp)->object( ),
- PMCSelected, TQT_TQOBJECT(this) );
+ PMCSelected, this );
if( tmp == oldCurrent )
break;
}
@@ -436,12 +436,12 @@ void PMTreeView::contentsMousePressEvent( TQMouseEvent * e )
if( m_itemSelected )
{
if( m_pLastSelected->object( )->isSelectable( ) )
- emit objectChanged( m_pLastSelected->object( ), PMCSelected, TQT_TQOBJECT(this) );
+ emit objectChanged( m_pLastSelected->object( ), PMCSelected, this );
else
m_pLastSelected->setSelected( false );
}
else if( m_itemDeselected )
- emit objectChanged( m_pLastSelected->object( ), PMCDeselected, TQT_TQOBJECT(this) );
+ emit objectChanged( m_pLastSelected->object( ), PMCDeselected, this );
}
m_acceptSelect = false;
}
@@ -472,7 +472,7 @@ void PMTreeView::viewportMousePressEvent( TQMouseEvent* e )
TQPoint p = e->pos( );
- if( e->button( ) & Qt::RightButton )
+ if( e->button( ) & TQt::RightButton )
{
if( m_pPart->factory( ) )
{
@@ -497,7 +497,7 @@ void PMTreeView::viewportMousePressEvent( TQMouseEvent* e )
if( item )
{
- if( e->button( ) == Qt::LeftButton || e->button( ) == Qt::MidButton )
+ if( e->button( ) == TQt::LeftButton || e->button( ) == TQt::MidButton )
{
m_pressed = true;
m_pressedPos = e->pos( );
@@ -526,7 +526,7 @@ void PMTreeView::viewportMouseReleaseEvent( TQMouseEvent* e )
m_pLastSelected->setSelected( true );
m_acceptSelect = false;
- emit objectChanged( m_pLastSelected->object( ), PMCNewSelection, TQT_TQOBJECT(this) );
+ emit objectChanged( m_pLastSelected->object( ), PMCNewSelection, this );
}
}
}
@@ -769,7 +769,7 @@ void PMTreeView::keyPressEvent( TQKeyEvent* e )
m_acceptSelect = false;
emit objectChanged( ( ( PMTreeViewItem* ) newSelection )->object( ),
- PMCNewSelection, TQT_TQOBJECT(this) );
+ PMCNewSelection, this );
}
if( deleteItem && m_pPart->isReadWrite( ) )
diff --git a/kpovmodeler/pmtreeview.h b/kpovmodeler/pmtreeview.h
index a1ace80d..8589ec6d 100644
--- a/kpovmodeler/pmtreeview.h
+++ b/kpovmodeler/pmtreeview.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -54,7 +53,7 @@ public:
*/
class PMTreeView : public TQListView
{
- Q_OBJECT
+ TQ_OBJECT
friend class PMTreeViewItem;
public:
diff --git a/kpovmodeler/pmtreeviewitem.h b/kpovmodeler/pmtreeviewitem.h
index 4ec2b44e..020775a8 100644
--- a/kpovmodeler/pmtreeviewitem.h
+++ b/kpovmodeler/pmtreeviewitem.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmtriangle.h b/kpovmodeler/pmtriangle.h
index e2ef3026..d78c2e6c 100644
--- a/kpovmodeler/pmtriangle.h
+++ b/kpovmodeler/pmtriangle.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmtriangleedit.cpp b/kpovmodeler/pmtriangleedit.cpp
index 64c554c0..e1143fd7 100644
--- a/kpovmodeler/pmtriangleedit.cpp
+++ b/kpovmodeler/pmtriangleedit.cpp
@@ -42,13 +42,13 @@ void PMTriangleEdit::createTopWidgets( )
TQHBoxLayout *hl = new TQHBoxLayout( topLayout( ) );
m_pSmooth = new TQCheckBox( i18n( "Smooth" ), this );
hl->addWidget( m_pSmooth );
- connect( m_pSmooth, TQT_SIGNAL( toggled( bool ) ),
- TQT_SLOT( slotSmoothChecked( bool ) ) );
+ connect( m_pSmooth, TQ_SIGNAL( toggled( bool ) ),
+ TQ_SLOT( slotSmoothChecked( bool ) ) );
m_pUVEnabled = new TQCheckBox( i18n( "UV vectors" ), this );
hl->addWidget( m_pUVEnabled );
- connect( m_pUVEnabled, TQT_SIGNAL( toggled( bool ) ),
- TQT_SLOT( slotUVVectorsChecked( bool ) ) );
+ connect( m_pUVEnabled, TQ_SIGNAL( toggled( bool ) ),
+ TQ_SLOT( slotUVVectorsChecked( bool ) ) );
TQGridLayout* gl = new TQGridLayout( topLayout( ), 9, 2 );
@@ -58,28 +58,28 @@ void PMTriangleEdit::createTopWidgets( )
gl->addWidget( new TQLabel( i18n( "Point %1:" ).arg( i+1 ), this ),
i * 3, 0 );
gl->addWidget( m_pPoint[i], i * 3, 1 );
- connect( m_pPoint[i], TQT_SIGNAL( dataChanged( ) ),
- TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pPoint[i], TQ_SIGNAL( dataChanged( ) ),
+ TQ_SIGNAL( dataChanged( ) ) );
m_pNormal[i] = new PMVectorEdit( "x", "y", "z", this );
m_pNormalLabel[i] = new TQLabel( i18n( "Normal %1:" ).arg( i+1 ), this );
gl->addWidget( m_pNormalLabel[i], i * 3 + 1, 0 );
gl->addWidget( m_pNormal[i], i * 3 + 1, 1 );
- connect( m_pNormal[i], TQT_SIGNAL( dataChanged( ) ),
- TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pNormal[i], TQ_SIGNAL( dataChanged( ) ),
+ TQ_SIGNAL( dataChanged( ) ) );
m_pUVVector[i] = new PMVectorEdit( "u", "v", this );
m_pUVVectorLabel[i] = new TQLabel( i18n( "UV vector %1:" ).arg( i+1 ), this );
gl->addWidget( m_pUVVectorLabel[i], i * 3 + 2, 0 );
gl->addWidget( m_pUVVector[i], i * 3 + 2, 1 );
- connect( m_pUVVector[i], TQT_SIGNAL( dataChanged( ) ),
- TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pUVVector[i], TQ_SIGNAL( dataChanged( ) ),
+ TQ_SIGNAL( dataChanged( ) ) );
}
hl = new TQHBoxLayout( topLayout( ) );
m_pMirror = new TQPushButton( i18n( "Invert Normal Vectors" ), this );
hl->addWidget( m_pMirror );
hl->addStretch( 1 );
- connect( m_pMirror, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotInvertNormals( ) ) );
+ connect( m_pMirror, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotInvertNormals( ) ) );
}
void PMTriangleEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmtriangleedit.h b/kpovmodeler/pmtriangleedit.h
index b584cbe7..fdf21e10 100644
--- a/kpovmodeler/pmtriangleedit.h
+++ b/kpovmodeler/pmtriangleedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -37,7 +36,7 @@ class TQPushButton;
*/
class PMTriangleEdit : public PMGraphicalObjectEdit
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMGraphicalObjectEdit Base;
public:
diff --git a/kpovmodeler/pmtruetypecache.h b/kpovmodeler/pmtruetypecache.h
index 342597b0..c128f7f2 100644
--- a/kpovmodeler/pmtruetypecache.h
+++ b/kpovmodeler/pmtruetypecache.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmvalue.h b/kpovmodeler/pmvalue.h
index 3d2ecb02..628d6689 100644
--- a/kpovmodeler/pmvalue.h
+++ b/kpovmodeler/pmvalue.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmvariant.h b/kpovmodeler/pmvariant.h
index e6bcdee9..c4b0f33d 100644
--- a/kpovmodeler/pmvariant.h
+++ b/kpovmodeler/pmvariant.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmvector.h b/kpovmodeler/pmvector.h
index f5e885a5..c2238de8 100644
--- a/kpovmodeler/pmvector.h
+++ b/kpovmodeler/pmvector.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmvectorcontrolpoint.h b/kpovmodeler/pmvectorcontrolpoint.h
index 1aca3088..51a7b216 100644
--- a/kpovmodeler/pmvectorcontrolpoint.h
+++ b/kpovmodeler/pmvectorcontrolpoint.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmvectoredit.cpp b/kpovmodeler/pmvectoredit.cpp
index 017fae9c..e80f8d7b 100644
--- a/kpovmodeler/pmvectoredit.cpp
+++ b/kpovmodeler/pmvectoredit.cpp
@@ -39,8 +39,8 @@ PMVectorEdit::PMVectorEdit( const TQString& descriptionX,
for( i = 0; i < 2; i++ )
{
m_edits.insert( i, new TQLineEdit( this ) );
- connect( m_edits[i], TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( slotTextChanged( const TQString& ) ) );
+ connect( m_edits[i], TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( slotTextChanged( const TQString& ) ) );
}
layout = new TQHBoxLayout( this );
@@ -77,8 +77,8 @@ PMVectorEdit::PMVectorEdit( const TQString& descriptionX,
for( i = 0; i < 3; i++ )
{
m_edits.insert( i, new TQLineEdit( this ) );
- connect( m_edits[i], TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( slotTextChanged( const TQString& ) ) );
+ connect( m_edits[i], TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( slotTextChanged( const TQString& ) ) );
}
layout = new TQHBoxLayout( this );
@@ -125,8 +125,8 @@ PMVectorEdit::PMVectorEdit( const TQString& descriptionA,
for( i = 0; i < 4; i++ )
{
m_edits.insert( i, new TQLineEdit( this ) );
- connect( m_edits[i], TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( slotTextChanged( const TQString& ) ) );
+ connect( m_edits[i], TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( slotTextChanged( const TQString& ) ) );
}
layout = new TQHBoxLayout( this );
diff --git a/kpovmodeler/pmvectoredit.h b/kpovmodeler/pmvectoredit.h
index f68d8276..2c2d6ca4 100644
--- a/kpovmodeler/pmvectoredit.h
+++ b/kpovmodeler/pmvectoredit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -34,7 +33,7 @@
*/
class PMVectorEdit : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kpovmodeler/pmvectorlistedit.cpp b/kpovmodeler/pmvectorlistedit.cpp
index 0fa5ded9..69402ade 100644
--- a/kpovmodeler/pmvectorlistedit.cpp
+++ b/kpovmodeler/pmvectorlistedit.cpp
@@ -119,8 +119,8 @@ void PMVectorListEdit::init( int dimensions )
setSelectionMode( TQTable::MultiRow );
for( i = 0; i < m_dimension; ++i )
setColumnStretchable( i, true );
- connect( this, TQT_SIGNAL( valueChanged( int, int ) ),
- TQT_SLOT( slotTextChanged( int, int ) ) );
+ connect( this, TQ_SIGNAL( valueChanged( int, int ) ),
+ TQ_SLOT( slotTextChanged( int, int ) ) );
setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
}
@@ -345,7 +345,7 @@ bool PMVectorListEdit::eventFilter( TQObject* o, TQEvent* e )
if( e->type( ) == TQEvent::Wheel && parent( ) )
return TQApplication::sendEvent( parent( ), e );
if( e->type( ) == TQEvent::MouseButtonPress
- && ( ( TQMouseEvent* ) e )->button( ) == Qt::RightButton )
+ && ( ( TQMouseEvent* ) e )->button( ) == TQt::RightButton )
{
bool b = TQTable::eventFilter( o, e );
emit showContextMenu( );
diff --git a/kpovmodeler/pmvectorlistedit.h b/kpovmodeler/pmvectorlistedit.h
index 3ba132d1..8064b778 100644
--- a/kpovmodeler/pmvectorlistedit.h
+++ b/kpovmodeler/pmvectorlistedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -56,7 +55,7 @@ private:
*/
class PMVectorListEdit : public TQTable
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kpovmodeler/pmview.cpp b/kpovmodeler/pmview.cpp
index e9ec01d1..8ede8ab1 100644
--- a/kpovmodeler/pmview.cpp
+++ b/kpovmodeler/pmview.cpp
@@ -40,8 +40,8 @@ PMView::PMView( PMPart* part, TQWidget* parent, const char* name )
setBackgroundMode( PaletteBase );
TQVBoxLayout* layout = new TQVBoxLayout( this );
- m_pMainSplitter = new TQSplitter( Qt::Horizontal, this, "MainSplitter" );
- m_pTreeEditSplitter = new TQSplitter( Qt::Vertical, m_pMainSplitter,
+ m_pMainSplitter = new TQSplitter( TQt::Horizontal, this, "MainSplitter" );
+ m_pTreeEditSplitter = new TQSplitter( TQt::Vertical, m_pMainSplitter,
"TreeEditSplitter" );
diff --git a/kpovmodeler/pmview.h b/kpovmodeler/pmview.h
index 72a9d98f..5e43f9d9 100644
--- a/kpovmodeler/pmview.h
+++ b/kpovmodeler/pmview.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -38,7 +37,7 @@ class TDEConfig;
*/
class PMView : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kpovmodeler/pmviewbase.h b/kpovmodeler/pmviewbase.h
index 6cb92b09..a6ce739c 100644
--- a/kpovmodeler/pmviewbase.h
+++ b/kpovmodeler/pmviewbase.h
@@ -64,7 +64,7 @@ public:
*/
class PMViewOptionsWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
@@ -90,7 +90,7 @@ signals:
*/
class PMViewBase : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kpovmodeler/pmviewlayoutmanager.cpp b/kpovmodeler/pmviewlayoutmanager.cpp
index a3eb400b..a61646db 100644
--- a/kpovmodeler/pmviewlayoutmanager.cpp
+++ b/kpovmodeler/pmviewlayoutmanager.cpp
@@ -520,7 +520,7 @@ void PMViewLayout::recursiveExtractColumns(
if( w->inherits( "PMDockSplitter" ) )
{
PMDockSplitter* sp = ( PMDockSplitter* ) w;
- if( sp->splitterOrientation( ) == Qt::Vertical )
+ if( sp->splitterOrientation( ) == TQt::Vertical )
{
colStart = false;
// vertical splitter, split up the current column
@@ -884,13 +884,13 @@ PMSaveViewLayoutDialog::PMSaveViewLayoutDialog( PMShell* parent,
m_pLayoutName = new TQLineEdit( w );
vl->addWidget( m_pLayoutName );
- connect( m_pLayoutName, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( slotNameChanged( const TQString& ) ) );
+ connect( m_pLayoutName, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( slotNameChanged( const TQString& ) ) );
TQListBox* lb = new TQListBox( w );
vl->addWidget( lb );
- connect( lb, TQT_SIGNAL( highlighted( const TQString& ) ),
- TQT_SLOT( slotNameSelected( const TQString& ) ) );
+ connect( lb, TQ_SIGNAL( highlighted( const TQString& ) ),
+ TQ_SLOT( slotNameSelected( const TQString& ) ) );
lb->insertStringList( PMViewLayoutManager::theManager( )
->availableLayouts( ) );
diff --git a/kpovmodeler/pmviewlayoutmanager.h b/kpovmodeler/pmviewlayoutmanager.h
index bef34168..a88e7303 100644
--- a/kpovmodeler/pmviewlayoutmanager.h
+++ b/kpovmodeler/pmviewlayoutmanager.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -290,7 +289,7 @@ private:
class PMSaveViewLayoutDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
PMSaveViewLayoutDialog( PMShell* parent, const char* name = 0 );
diff --git a/kpovmodeler/pmviewstructure.h b/kpovmodeler/pmviewstructure.h
index 5356466b..39b8829a 100644
--- a/kpovmodeler/pmviewstructure.h
+++ b/kpovmodeler/pmviewstructure.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmwarp.h b/kpovmodeler/pmwarp.h
index 6b50f498..903f0bee 100644
--- a/kpovmodeler/pmwarp.h
+++ b/kpovmodeler/pmwarp.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmwarpedit.cpp b/kpovmodeler/pmwarpedit.cpp
index ebca9664..d1c96f9c 100644
--- a/kpovmodeler/pmwarpedit.cpp
+++ b/kpovmodeler/pmwarpedit.cpp
@@ -162,24 +162,24 @@ void PMWarpEdit::createTopWidgets( )
vl->addWidget( m_pTurbulenceWidget );
vl->addWidget( m_pMappingWidget );
- connect( m_pWarpTypeEdit, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotComboChanged( int ) ) );
- connect( m_pDirectionEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pOffsetEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pFlipEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pLocationEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pRadiusEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pStrengthEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pFalloffEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pInverseEdit, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pRepeatEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pTurbulenceEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pValueVectorEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pOctavesEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pOmegaEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pLambdaEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pOrientationEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pDistExpEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
- connect( m_pMajorRadiusEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
+ connect( m_pWarpTypeEdit, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotComboChanged( int ) ) );
+ connect( m_pDirectionEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pOffsetEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pFlipEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pLocationEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pRadiusEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pStrengthEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pFalloffEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pInverseEdit, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pRepeatEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pTurbulenceEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pValueVectorEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pOctavesEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pOmegaEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pLambdaEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pOrientationEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pDistExpEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
+ connect( m_pMajorRadiusEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) );
}
void PMWarpEdit::displayObject( PMObject* o )
diff --git a/kpovmodeler/pmwarpedit.h b/kpovmodeler/pmwarpedit.h
index 4f23d2bf..0838cb39 100644
--- a/kpovmodeler/pmwarpedit.h
+++ b/kpovmodeler/pmwarpedit.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
@@ -39,7 +38,7 @@ class TQLabel;
*/
class PMWarpEdit : public PMDialogEditBase
{
- Q_OBJECT
+ TQ_OBJECT
typedef PMDialogEditBase Base;
public:
diff --git a/kpovmodeler/pmxmlhelper.h b/kpovmodeler/pmxmlhelper.h
index 87304fae..49763612 100644
--- a/kpovmodeler/pmxmlhelper.h
+++ b/kpovmodeler/pmxmlhelper.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description
diff --git a/kpovmodeler/pmxmlparser.h b/kpovmodeler/pmxmlparser.h
index 2ff8f351..4a1b105c 100644
--- a/kpovmodeler/pmxmlparser.h
+++ b/kpovmodeler/pmxmlparser.h
@@ -1,4 +1,3 @@
-//-*-C++-*-
/*
**************************************************************************
description