summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:47:59 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:47:59 -0600
commitc2637a0da6d9a1c8626ca39f8451ab3b7cda487a (patch)
treebe38034f085e8be24f14f329f87a611d319e6259
parent3fd343f2c6b0545bd750b2939c74be3834b13274 (diff)
downloadtdegraphics-c2637a0da6d9a1c8626ca39f8451ab3b7cda487a.tar.gz
tdegraphics-c2637a0da6d9a1c8626ca39f8451ab3b7cda487a.zip
Rename a number of old tq methods that are no longer tq specific
-rw-r--r--kamera/kcontrol/kamera.cpp6
-rw-r--r--kamera/kcontrol/kameraconfigdialog.cpp6
-rw-r--r--kamera/kcontrol/kameradevice.cpp14
-rw-r--r--kamera/kioslave/kamera.cpp12
-rw-r--r--kcoloredit/colorselector.cpp14
-rw-r--r--kcoloredit/gradientselection.cpp10
-rw-r--r--kcoloredit/kcoloredit.h2
-rw-r--r--kcoloredit/kcoloreditdoc.cpp6
-rw-r--r--kcoloredit/kcoloreditview.cpp12
-rw-r--r--kcoloredit/kxycolorselector.cpp2
-rw-r--r--kcoloredit/kzcolorselector.cpp2
-rw-r--r--kcoloredit/loadpalettedlg.cpp2
-rw-r--r--kcoloredit/palette.cpp2
-rw-r--r--kcoloredit/palette.h2
-rw-r--r--kcoloredit/paletteview.cpp2
-rw-r--r--kcoloredit/paletteviewscrolledarea.cpp16
-rw-r--r--kcoloredit/texteditselection.cpp6
-rw-r--r--kcoloredit/texteditselection.h4
-rw-r--r--kdvi/TeXFontDefinition.cpp6
-rw-r--r--kdvi/TeXFontDefinition.h2
-rw-r--r--kdvi/TeXFont_PFB.cpp20
-rw-r--r--kdvi/TeXFont_PK.cpp16
-rw-r--r--kdvi/dviFile.cpp2
-rw-r--r--kdvi/dviRenderer.cpp22
-rw-r--r--kdvi/dviRenderer_draw.cpp4
-rw-r--r--kdvi/dviRenderer_export.cpp18
-rw-r--r--kdvi/dviRenderer_prescan.cpp50
-rw-r--r--kdvi/dviWidget.cpp2
-rw-r--r--kdvi/fontEncoding.cpp4
-rw-r--r--kdvi/fontEncoding.h2
-rw-r--r--kdvi/fontMap.cpp2
-rw-r--r--kdvi/fontMap.h2
-rw-r--r--kdvi/fontpool.cpp42
-rw-r--r--kdvi/fontprogress.cpp6
-rw-r--r--kdvi/infodialog.cpp14
-rw-r--r--kdvi/kdvi_multipage.cpp6
-rw-r--r--kdvi/main.cpp4
-rw-r--r--kdvi/optionDialogFontsWidget_base.ui2
-rw-r--r--kdvi/optionDialogSpecialWidget_base.ui4
-rw-r--r--kdvi/psgs.cpp14
-rw-r--r--kdvi/special.cpp18
-rw-r--r--kdvi/vf.cpp2
-rw-r--r--kfax/faxinput.cpp12
-rw-r--r--kfax/kfax.cpp16
-rw-r--r--kfax/kfax_printsettings.cpp2
-rw-r--r--kfax/options.cpp14
-rw-r--r--kfaxview/faxrenderer.cpp6
-rw-r--r--kfaxview/libkfaximage/kfaximage.cpp6
-rw-r--r--kfaxview/main.cpp4
-rw-r--r--kfile-plugins/dependencies/poppler-tqt/poppler-document.cc2
-rw-r--r--kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.cc2
-rw-r--r--kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.h4
-rw-r--r--kfile-plugins/dependencies/poppler-tqt/poppler-private.cc18
-rw-r--r--kfile-plugins/dependencies/poppler-tqt/poppler-private.h2
-rw-r--r--kfile-plugins/exr/kfile_exr.cpp14
-rw-r--r--kfile-plugins/gif/gif-info.12
-rw-r--r--kfile-plugins/jpeg/exif.cpp12
-rw-r--r--kfile-plugins/jpeg/kfile_jpeg.cpp2
-rw-r--r--kfile-plugins/pdf/kfile_pdf.cpp10
-rw-r--r--kfile-plugins/pnm/kfile_pnm.cpp2
-rw-r--r--kfile-plugins/ps/gscreator.cpp2
-rw-r--r--kfile-plugins/rgb/kfile_rgb.cpp4
-rw-r--r--kgamma/kcmkgamma/displaynumber.cpp2
-rw-r--r--kgamma/kcmkgamma/kgamma.cpp24
-rw-r--r--kghostview/displayoptions.cpp10
-rw-r--r--kghostview/gssettingswidget.ui2
-rw-r--r--kghostview/gssettingswidget.ui.h2
-rw-r--r--kghostview/infodialog.cpp4
-rw-r--r--kghostview/kdscerrordialog.cpp6
-rw-r--r--kghostview/kgv_miniwidget.cpp14
-rw-r--r--kghostview/kgv_view.cpp10
-rw-r--r--kghostview/kgvconfigdialog.cpp12
-rw-r--r--kghostview/kgvdocument.cpp36
-rw-r--r--kghostview/kgvfactory.cpp2
-rw-r--r--kghostview/kgvpagedecorator.cpp2
-rw-r--r--kghostview/kgvshell.cpp6
-rw-r--r--kghostview/kpswidget.cpp6
-rw-r--r--kghostview/logwindow.cpp2
-rw-r--r--kghostview/marklist.cpp4
-rw-r--r--kghostview/scrollbox.cpp6
-rw-r--r--kghostview/viewcontrol.cpp34
-rw-r--r--kiconedit/kcolorgrid.cpp8
-rw-r--r--kiconedit/kcolorgrid.h2
-rw-r--r--kiconedit/kicon.cpp10
-rw-r--r--kiconedit/kiconcolors.cpp2
-rw-r--r--kiconedit/kiconconfig.cpp24
-rw-r--r--kiconedit/kiconedit.cpp6
-rw-r--r--kiconedit/kiconedit.h2
-rw-r--r--kiconedit/kiconeditslots.cpp10
-rw-r--r--kiconedit/kicongrid.cpp10
-rw-r--r--kiconedit/knew.cpp4
-rw-r--r--kiconedit/kresize.cpp10
-rw-r--r--kiconedit/palettetoolbar.cpp18
-rw-r--r--kmrml/kmrml/algorithmdialog.cpp10
-rw-r--r--kmrml/kmrml/kcontrol/indexcleaner.cpp2
-rw-r--r--kmrml/kmrml/kcontrol/indexer.cpp4
-rw-r--r--kmrml/kmrml/kcontrol/kcmkmrml.cpp14
-rw-r--r--kmrml/kmrml/kcontrol/mainpage.cpp4
-rw-r--r--kmrml/kmrml/kcontrol/serverconfigwidget.ui4
-rw-r--r--kmrml/kmrml/lib/kmrml_config.cpp4
-rw-r--r--kmrml/kmrml/lib/kmrml_config.h2
-rw-r--r--kmrml/kmrml/lib/mrml_shared.cpp6
-rw-r--r--kmrml/kmrml/lib/mrml_shared.h4
-rw-r--r--kmrml/kmrml/mrml.cpp12
-rw-r--r--kmrml/kmrml/mrml_elements.cpp2
-rw-r--r--kmrml/kmrml/mrml_part.cpp28
-rw-r--r--kmrml/kmrml/mrml_part.h6
-rw-r--r--kmrml/kmrml/mrml_view.cpp20
-rw-r--r--kmrml/kmrml/mrml_view.h2
-rw-r--r--kmrml/kmrml/propertysheet.cpp8
-rw-r--r--kmrml/kmrml/propertysheet.h2
-rw-r--r--kmrml/kmrml/server/watcher.cpp4
-rw-r--r--kolourpaint/BUGS6
-rw-r--r--kolourpaint/kpcommandhistory.cpp10
-rw-r--r--kolourpaint/kpcommandhistory.h6
-rw-r--r--kolourpaint/kpdefs.h96
-rw-r--r--kolourpaint/kpdocument.cpp24
-rw-r--r--kolourpaint/kpdocumentmetainfo.cpp2
-rw-r--r--kolourpaint/kpdocumentsaveoptions.cpp28
-rw-r--r--kolourpaint/kpdocumentsaveoptionswidget.cpp14
-rw-r--r--kolourpaint/kpmainwindow.cpp6
-rw-r--r--kolourpaint/kpmainwindow.h2
-rw-r--r--kolourpaint/kpmainwindow_edit.cpp16
-rw-r--r--kolourpaint/kpmainwindow_settings.cpp2
-rw-r--r--kolourpaint/kpmainwindow_text.cpp2
-rw-r--r--kolourpaint/kpmainwindow_view.cpp18
-rw-r--r--kolourpaint/kpselection.cpp10
-rw-r--r--kolourpaint/kpselection.h4
-rw-r--r--kolourpaint/kpselectiondrag.cpp10
-rw-r--r--kolourpaint/kpselectiondrag.h2
-rw-r--r--kolourpaint/kpthumbnail.cpp12
-rw-r--r--kolourpaint/kptool.cpp16
-rw-r--r--kolourpaint/kptool.h2
-rw-r--r--kolourpaint/kpview.cpp4
-rw-r--r--kolourpaint/kpviewmanager.cpp4
-rw-r--r--kolourpaint/kpviewscrollablecontainer.cpp6
-rw-r--r--kolourpaint/patches/doc_resize_no_flicker.diff4
-rw-r--r--kolourpaint/pixmapfx/kpeffectbalance.cpp8
-rw-r--r--kolourpaint/pixmapfx/kpeffectblursharpen.cpp2
-rw-r--r--kolourpaint/pixmapfx/kpeffectemboss.cpp2
-rw-r--r--kolourpaint/pixmapfx/kpeffectflatten.cpp2
-rw-r--r--kolourpaint/pixmapfx/kpeffectinvert.cpp2
-rw-r--r--kolourpaint/pixmapfx/kpeffectreducecolors.cpp2
-rw-r--r--kolourpaint/pixmapfx/kpeffectsdialog.cpp20
-rw-r--r--kolourpaint/pixmapfx/kppixmapfx.cpp12
-rw-r--r--kolourpaint/tools/kptoolautocrop.cpp10
-rw-r--r--kolourpaint/tools/kptoolautocrop.h2
-rw-r--r--kolourpaint/tools/kptoolbrush.cpp2
-rw-r--r--kolourpaint/tools/kptoolpolygon.cpp4
-rw-r--r--kolourpaint/tools/kptoolpolygon.h2
-rw-r--r--kolourpaint/tools/kptoolpreviewdialog.cpp4
-rw-r--r--kolourpaint/tools/kptoolrectangle.cpp2
-rw-r--r--kolourpaint/tools/kptoolrectangle.h4
-rw-r--r--kolourpaint/tools/kptoolresizescale.cpp18
-rw-r--r--kolourpaint/tools/kptoolrotate.cpp2
-rw-r--r--kolourpaint/tools/kptoolskew.cpp2
-rw-r--r--kolourpaint/views/kpthumbnailview.cpp2
-rw-r--r--kolourpaint/widgets/kpcolorsimilaritycube.cpp10
-rw-r--r--kolourpaint/widgets/kpcolorsimilaritycube.h2
-rw-r--r--kolourpaint/widgets/kpcolorsimilaritydialog.cpp2
-rw-r--r--kolourpaint/widgets/kpcolortoolbar.cpp24
-rw-r--r--kolourpaint/widgets/kpcolortoolbar.h4
-rw-r--r--kolourpaint/widgets/kpsqueezedtextlabel.cpp6
-rw-r--r--kolourpaint/widgets/kpsqueezedtextlabel.h2
-rw-r--r--kolourpaint/widgets/kptooltoolbar.cpp6
-rw-r--r--kolourpaint/widgets/kptoolwidgetbase.cpp12
-rw-r--r--kolourpaint/widgets/kptoolwidgetbrush.cpp32
-rw-r--r--kolourpaint/widgets/kptoolwidgetbrush.h2
-rw-r--r--kolourpaint/widgets/kptoolwidgeterasersize.cpp2
-rw-r--r--kolourpaint/widgets/kptoolwidgetfillstyle.cpp2
-rw-r--r--kolourpaint/widgets/kptoolwidgetspraycansize.cpp2
-rw-r--r--kooka/CHANGES2
-rw-r--r--kooka/img_saver.cpp22
-rw-r--r--kooka/imgnamecombo.cpp6
-rw-r--r--kooka/imgprintdialog.cpp18
-rw-r--r--kooka/kadmosocr.cpp2
-rw-r--r--kooka/kocrbase.cpp10
-rw-r--r--kooka/kocrgocr.cpp2
-rw-r--r--kooka/kocrkadmos.cpp6
-rw-r--r--kooka/kocrocrad.cpp6
-rw-r--r--kooka/kooka.cpp2
-rw-r--r--kooka/kookapref.cpp18
-rw-r--r--kooka/kookaview.cpp14
-rw-r--r--kooka/kookaview.h2
-rw-r--r--kooka/ksaneocr.cpp6
-rw-r--r--kooka/ocrresedit.cpp2
-rw-r--r--kooka/ocrresedit.h2
-rw-r--r--kooka/scanpackager.cpp14
-rw-r--r--kooka/thumbview.cpp4
-rw-r--r--kpdf/conf/dlgaccessibility.ui26
-rw-r--r--kpdf/conf/dlggeneral.ui8
-rw-r--r--kpdf/conf/dlgperformance.ui16
-rw-r--r--kpdf/conf/dlgpresentation.ui4
-rw-r--r--kpdf/core/document.cpp18
-rw-r--r--kpdf/core/generator_pdf/generator_pdf.cpp26
-rw-r--r--kpdf/core/link.cpp4
-rw-r--r--kpdf/core/page.cpp6
-rw-r--r--kpdf/core/page.h2
-rw-r--r--kpdf/core/pagetransition.cpp2
-rw-r--r--kpdf/core/pagetransition.h6
-rw-r--r--kpdf/error.cpp2
-rw-r--r--kpdf/part.cpp24
-rw-r--r--kpdf/ui/minibar.cpp22
-rw-r--r--kpdf/ui/pagepainter.cpp8
-rw-r--r--kpdf/ui/pageview.cpp114
-rw-r--r--kpdf/ui/pageviewutils.cpp42
-rw-r--r--kpdf/ui/pageviewutils.h6
-rw-r--r--kpdf/ui/presentationwidget.cpp88
-rw-r--r--kpdf/ui/presentationwidget.h2
-rw-r--r--kpdf/ui/propertiesdialog.cpp24
-rw-r--r--kpdf/ui/searchwidget.cpp4
-rw-r--r--kpdf/ui/thumbnaillist.cpp12
-rw-r--r--kpdf/ui/thumbnaillist.h2
-rw-r--r--kpovmodeler/pmactions.cpp20
-rw-r--r--kpovmodeler/pmaddcommand.cpp2
-rw-r--r--kpovmodeler/pmaddcommand.h4
-rw-r--r--kpovmodeler/pmbicubicpatch.cpp12
-rw-r--r--kpovmodeler/pmbicubicpatch.h2
-rw-r--r--kpovmodeler/pmbicubicpatchedit.cpp30
-rw-r--r--kpovmodeler/pmblendmapmodifiers.cpp4
-rw-r--r--kpovmodeler/pmblendmapmodifiers.h2
-rw-r--r--kpovmodeler/pmblendmapmodifiersedit.cpp2
-rw-r--r--kpovmodeler/pmblob.cpp4
-rw-r--r--kpovmodeler/pmblob.h2
-rw-r--r--kpovmodeler/pmblobcylinder.cpp4
-rw-r--r--kpovmodeler/pmblobcylinder.h2
-rw-r--r--kpovmodeler/pmblobcylinderedit.cpp10
-rw-r--r--kpovmodeler/pmblobedit.cpp2
-rw-r--r--kpovmodeler/pmblobsphere.cpp4
-rw-r--r--kpovmodeler/pmblobsphere.h2
-rw-r--r--kpovmodeler/pmblobsphereedit.cpp16
-rw-r--r--kpovmodeler/pmboundedby.cpp4
-rw-r--r--kpovmodeler/pmboundedby.h2
-rw-r--r--kpovmodeler/pmboundedbyedit.cpp2
-rw-r--r--kpovmodeler/pmbox.cpp4
-rw-r--r--kpovmodeler/pmbox.h2
-rw-r--r--kpovmodeler/pmboxedit.cpp2
-rw-r--r--kpovmodeler/pmbumpmap.cpp4
-rw-r--r--kpovmodeler/pmbumpmap.h2
-rw-r--r--kpovmodeler/pmbumpmapedit.cpp2
-rw-r--r--kpovmodeler/pmcamera.cpp4
-rw-r--r--kpovmodeler/pmcamera.h2
-rw-r--r--kpovmodeler/pmcameraedit.cpp56
-rw-r--r--kpovmodeler/pmclippedby.cpp4
-rw-r--r--kpovmodeler/pmclippedby.h2
-rw-r--r--kpovmodeler/pmclippedbyedit.cpp2
-rw-r--r--kpovmodeler/pmcolor.cpp2
-rw-r--r--kpovmodeler/pmcoloredit.cpp2
-rw-r--r--kpovmodeler/pmcolorsettings.cpp80
-rw-r--r--kpovmodeler/pmcommand.h4
-rw-r--r--kpovmodeler/pmcomment.cpp6
-rw-r--r--kpovmodeler/pmcomment.h2
-rw-r--r--kpovmodeler/pmcommentedit.cpp2
-rw-r--r--kpovmodeler/pmcompositeobject.cpp10
-rw-r--r--kpovmodeler/pmcompositeobject.h8
-rw-r--r--kpovmodeler/pmcone.cpp4
-rw-r--r--kpovmodeler/pmcone.h2
-rw-r--r--kpovmodeler/pmconeedit.cpp10
-rw-r--r--kpovmodeler/pmcsg.cpp4
-rw-r--r--kpovmodeler/pmcsg.h2
-rw-r--r--kpovmodeler/pmcsgedit.cpp12
-rw-r--r--kpovmodeler/pmcylinder.cpp4
-rw-r--r--kpovmodeler/pmcylinder.h2
-rw-r--r--kpovmodeler/pmcylinderedit.cpp16
-rw-r--r--kpovmodeler/pmdatachangecommand.cpp2
-rw-r--r--kpovmodeler/pmdeclare.cpp10
-rw-r--r--kpovmodeler/pmdeclare.h2
-rw-r--r--kpovmodeler/pmdeclareedit.cpp16
-rw-r--r--kpovmodeler/pmdeletecommand.cpp4
-rw-r--r--kpovmodeler/pmdensity.cpp4
-rw-r--r--kpovmodeler/pmdensity.h2
-rw-r--r--kpovmodeler/pmdensityedit.cpp2
-rw-r--r--kpovmodeler/pmdetailobject.cpp4
-rw-r--r--kpovmodeler/pmdetailobject.h2
-rw-r--r--kpovmodeler/pmdetailobjectedit.cpp12
-rw-r--r--kpovmodeler/pmdialogeditbase.cpp18
-rw-r--r--kpovmodeler/pmdialogeditbase.h8
-rw-r--r--kpovmodeler/pmdialogview.cpp10
-rw-r--r--kpovmodeler/pmdisc.cpp4
-rw-r--r--kpovmodeler/pmdisc.h2
-rw-r--r--kpovmodeler/pmdiscedit.cpp16
-rw-r--r--kpovmodeler/pmdockwidget.cpp140
-rw-r--r--kpovmodeler/pmdockwidget.h22
-rw-r--r--kpovmodeler/pmdockwidget_private.cpp54
-rw-r--r--kpovmodeler/pmerrordialog.cpp2
-rw-r--r--kpovmodeler/pmfinish.cpp4
-rw-r--r--kpovmodeler/pmfinish.h2
-rw-r--r--kpovmodeler/pmfinishedit.cpp70
-rw-r--r--kpovmodeler/pmfog.cpp4
-rw-r--r--kpovmodeler/pmfog.h2
-rw-r--r--kpovmodeler/pmfogedit.cpp2
-rw-r--r--kpovmodeler/pmformulalabel.cpp16
-rw-r--r--kpovmodeler/pmformulalabel.h6
-rw-r--r--kpovmodeler/pmglobalphotons.cpp4
-rw-r--r--kpovmodeler/pmglobalphotons.h2
-rw-r--r--kpovmodeler/pmglobalphotonsedit.cpp2
-rw-r--r--kpovmodeler/pmglobalsettings.cpp4
-rw-r--r--kpovmodeler/pmglobalsettings.h2
-rw-r--r--kpovmodeler/pmglobalsettingsedit.cpp58
-rw-r--r--kpovmodeler/pmglview.cpp22
-rw-r--r--kpovmodeler/pmglview.h4
-rw-r--r--kpovmodeler/pmgraphicalobject.cpp4
-rw-r--r--kpovmodeler/pmgraphicalobject.h4
-rw-r--r--kpovmodeler/pmgraphicalobjectedit.cpp4
-rw-r--r--kpovmodeler/pmgridsettings.cpp44
-rw-r--r--kpovmodeler/pmheightfield.cpp4
-rw-r--r--kpovmodeler/pmheightfield.h2
-rw-r--r--kpovmodeler/pmheightfieldedit.cpp2
-rw-r--r--kpovmodeler/pmimagemap.cpp4
-rw-r--r--kpovmodeler/pmimagemap.h2
-rw-r--r--kpovmodeler/pmimagemapedit.cpp10
-rw-r--r--kpovmodeler/pminserterrordialog.cpp2
-rw-r--r--kpovmodeler/pminsertrulesystem.cpp24
-rw-r--r--kpovmodeler/pminsertrulesystem.h4
-rw-r--r--kpovmodeler/pminterior.cpp4
-rw-r--r--kpovmodeler/pminterior.h2
-rw-r--r--kpovmodeler/pminterioredit.cpp28
-rw-r--r--kpovmodeler/pminteriortexture.cpp4
-rw-r--r--kpovmodeler/pminteriortexture.h2
-rw-r--r--kpovmodeler/pminteriortextureedit.cpp2
-rw-r--r--kpovmodeler/pmisosurface.cpp4
-rw-r--r--kpovmodeler/pmisosurface.h2
-rw-r--r--kpovmodeler/pmisosurfaceedit.cpp4
-rw-r--r--kpovmodeler/pmjuliafractal.cpp4
-rw-r--r--kpovmodeler/pmjuliafractal.h2
-rw-r--r--kpovmodeler/pmjuliafractaledit.cpp2
-rw-r--r--kpovmodeler/pmlathe.cpp12
-rw-r--r--kpovmodeler/pmlathe.h2
-rw-r--r--kpovmodeler/pmlatheedit.cpp2
-rw-r--r--kpovmodeler/pmlayoutsettings.cpp26
-rw-r--r--kpovmodeler/pmlayoutsettings.h10
-rw-r--r--kpovmodeler/pmlibrarybrowser.cpp2
-rw-r--r--kpovmodeler/pmlibraryentrypreview.cpp14
-rw-r--r--kpovmodeler/pmlibraryhandle.cpp2
-rw-r--r--kpovmodeler/pmlibraryhandleedit.cpp4
-rw-r--r--kpovmodeler/pmlibraryiconview.cpp8
-rw-r--r--kpovmodeler/pmlibraryiconview.h2
-rw-r--r--kpovmodeler/pmlibraryobjectsearch.cpp2
-rw-r--r--kpovmodeler/pmlight.cpp4
-rw-r--r--kpovmodeler/pmlight.h2
-rw-r--r--kpovmodeler/pmlightedit.cpp2
-rw-r--r--kpovmodeler/pmlightgroup.cpp4
-rw-r--r--kpovmodeler/pmlightgroup.h2
-rw-r--r--kpovmodeler/pmlightgroupedit.cpp10
-rw-r--r--kpovmodeler/pmlineedits.cpp16
-rw-r--r--kpovmodeler/pmlinkedit.cpp10
-rw-r--r--kpovmodeler/pmlistpattern.cpp24
-rw-r--r--kpovmodeler/pmlistpattern.h12
-rw-r--r--kpovmodeler/pmlistpatternedit.cpp36
-rw-r--r--kpovmodeler/pmlookslike.cpp4
-rw-r--r--kpovmodeler/pmlookslike.h2
-rw-r--r--kpovmodeler/pmmaterial.cpp4
-rw-r--r--kpovmodeler/pmmaterial.h2
-rw-r--r--kpovmodeler/pmmaterialedit.cpp2
-rw-r--r--kpovmodeler/pmmaterialmap.cpp4
-rw-r--r--kpovmodeler/pmmaterialmap.h2
-rw-r--r--kpovmodeler/pmmaterialmapedit.cpp2
-rw-r--r--kpovmodeler/pmmatrix.cpp2
-rw-r--r--kpovmodeler/pmmedia.cpp4
-rw-r--r--kpovmodeler/pmmedia.h2
-rw-r--r--kpovmodeler/pmmediaedit.cpp2
-rw-r--r--kpovmodeler/pmmesh.cpp16
-rw-r--r--kpovmodeler/pmmesh.h2
-rw-r--r--kpovmodeler/pmmeshedit.cpp18
-rw-r--r--kpovmodeler/pmmovecommand.cpp10
-rw-r--r--kpovmodeler/pmmovecommand.h4
-rw-r--r--kpovmodeler/pmnamedobject.cpp4
-rw-r--r--kpovmodeler/pmnamedobject.h2
-rw-r--r--kpovmodeler/pmnamedobjectedit.cpp8
-rw-r--r--kpovmodeler/pmnormal.cpp4
-rw-r--r--kpovmodeler/pmnormal.h2
-rw-r--r--kpovmodeler/pmnormaledit.cpp2
-rw-r--r--kpovmodeler/pmobject.cpp14
-rw-r--r--kpovmodeler/pmobject.h22
-rw-r--r--kpovmodeler/pmobjectdrag.cpp6
-rw-r--r--kpovmodeler/pmobjectdrag.h2
-rw-r--r--kpovmodeler/pmobjectlibrarysettings.cpp16
-rw-r--r--kpovmodeler/pmobjectlink.cpp6
-rw-r--r--kpovmodeler/pmobjectlink.h2
-rw-r--r--kpovmodeler/pmobjectlinkedit.cpp2
-rw-r--r--kpovmodeler/pmobjectsettings.cpp210
-rw-r--r--kpovmodeler/pmopenglsettings.cpp10
-rw-r--r--kpovmodeler/pmoutputdevice.cpp10
-rw-r--r--kpovmodeler/pmpalettevalueedit.cpp20
-rw-r--r--kpovmodeler/pmparser.cpp26
-rw-r--r--kpovmodeler/pmparser.h4
-rw-r--r--kpovmodeler/pmpart.cpp22
-rw-r--r--kpovmodeler/pmpattern.cpp4
-rw-r--r--kpovmodeler/pmpattern.h2
-rw-r--r--kpovmodeler/pmpatternedit.cpp44
-rw-r--r--kpovmodeler/pmphotons.cpp4
-rw-r--r--kpovmodeler/pmphotons.h2
-rw-r--r--kpovmodeler/pmphotonsedit.cpp2
-rw-r--r--kpovmodeler/pmpigment.cpp4
-rw-r--r--kpovmodeler/pmpigment.h2
-rw-r--r--kpovmodeler/pmpigmentedit.cpp2
-rw-r--r--kpovmodeler/pmplane.cpp4
-rw-r--r--kpovmodeler/pmplane.h2
-rw-r--r--kpovmodeler/pmplaneedit.cpp24
-rw-r--r--kpovmodeler/pmpluginsettings.cpp18
-rw-r--r--kpovmodeler/pmpolynom.cpp4
-rw-r--r--kpovmodeler/pmpolynom.h2
-rw-r--r--kpovmodeler/pmpolynomedit.cpp6
-rw-r--r--kpovmodeler/pmpovray31serialization.cpp322
-rw-r--r--kpovmodeler/pmpovray31serialization.h150
-rw-r--r--kpovmodeler/pmpovray35serialization.cpp86
-rw-r--r--kpovmodeler/pmpovray35serialization.h44
-rw-r--r--kpovmodeler/pmpovraymatrix.cpp4
-rw-r--r--kpovmodeler/pmpovraymatrix.h2
-rw-r--r--kpovmodeler/pmpovraymatrixedit.cpp2
-rw-r--r--kpovmodeler/pmpovrayoutputwidget.cpp4
-rw-r--r--kpovmodeler/pmpovrayparser.cpp12
-rw-r--r--kpovmodeler/pmpovrayrenderwidget.cpp8
-rw-r--r--kpovmodeler/pmpovrayrenderwidget.h2
-rw-r--r--kpovmodeler/pmpovraysettings.cpp46
-rw-r--r--kpovmodeler/pmpovraywidget.cpp24
-rw-r--r--kpovmodeler/pmpovraywidget.h2
-rw-r--r--kpovmodeler/pmpreviewsettings.cpp60
-rw-r--r--kpovmodeler/pmprism.cpp8
-rw-r--r--kpovmodeler/pmprism.h2
-rw-r--r--kpovmodeler/pmprismedit.cpp8
-rw-r--r--kpovmodeler/pmprojectedthrough.cpp4
-rw-r--r--kpovmodeler/pmprojectedthrough.h2
-rw-r--r--kpovmodeler/pmprototypemanager.cpp32
-rw-r--r--kpovmodeler/pmprototypemanager.h4
-rw-r--r--kpovmodeler/pmquickcolor.cpp4
-rw-r--r--kpovmodeler/pmquickcolor.h2
-rw-r--r--kpovmodeler/pmquickcoloredit.cpp8
-rw-r--r--kpovmodeler/pmradiosity.cpp4
-rw-r--r--kpovmodeler/pmradiosity.h2
-rw-r--r--kpovmodeler/pmradiosityedit.cpp2
-rw-r--r--kpovmodeler/pmrainbow.cpp4
-rw-r--r--kpovmodeler/pmrainbow.h2
-rw-r--r--kpovmodeler/pmrainbowedit.cpp2
-rw-r--r--kpovmodeler/pmraw.cpp6
-rw-r--r--kpovmodeler/pmraw.h2
-rw-r--r--kpovmodeler/pmrawedit.cpp2
-rw-r--r--kpovmodeler/pmrendermanager.cpp16
-rw-r--r--kpovmodeler/pmrendermode.cpp18
-rw-r--r--kpovmodeler/pmrendermodesdialog.cpp2
-rw-r--r--kpovmodeler/pmrotate.cpp4
-rw-r--r--kpovmodeler/pmrotate.h2
-rw-r--r--kpovmodeler/pmrotateedit.cpp2
-rw-r--r--kpovmodeler/pmscale.cpp4
-rw-r--r--kpovmodeler/pmscale.h2
-rw-r--r--kpovmodeler/pmscaleedit.cpp2
-rw-r--r--kpovmodeler/pmscanner.cpp4
-rw-r--r--kpovmodeler/pmscene.cpp4
-rw-r--r--kpovmodeler/pmscene.h2
-rw-r--r--kpovmodeler/pmserializer.cpp4
-rw-r--r--kpovmodeler/pmsettingsdialog.cpp8
-rw-r--r--kpovmodeler/pmsettingsdialog.h2
-rw-r--r--kpovmodeler/pmshell.cpp8
-rw-r--r--kpovmodeler/pmskysphere.cpp4
-rw-r--r--kpovmodeler/pmskysphere.h2
-rw-r--r--kpovmodeler/pmskysphereedit.cpp2
-rw-r--r--kpovmodeler/pmslope.cpp4
-rw-r--r--kpovmodeler/pmslope.h2
-rw-r--r--kpovmodeler/pmslopeedit.cpp2
-rw-r--r--kpovmodeler/pmsolidcolor.cpp4
-rw-r--r--kpovmodeler/pmsolidcolor.h2
-rw-r--r--kpovmodeler/pmsolidcoloredit.cpp8
-rw-r--r--kpovmodeler/pmsolidobject.cpp4
-rw-r--r--kpovmodeler/pmsolidobject.h4
-rw-r--r--kpovmodeler/pmsolidobjectedit.cpp2
-rw-r--r--kpovmodeler/pmsor.cpp8
-rw-r--r--kpovmodeler/pmsor.h2
-rw-r--r--kpovmodeler/pmsoredit.cpp4
-rw-r--r--kpovmodeler/pmsphere.cpp4
-rw-r--r--kpovmodeler/pmsphere.h2
-rw-r--r--kpovmodeler/pmsphereedit.cpp18
-rw-r--r--kpovmodeler/pmspheresweep.cpp12
-rw-r--r--kpovmodeler/pmspheresweep.h2
-rw-r--r--kpovmodeler/pmspheresweepedit.cpp2
-rw-r--r--kpovmodeler/pmsqe.cpp4
-rw-r--r--kpovmodeler/pmsqe.h2
-rw-r--r--kpovmodeler/pmsqeedit.cpp2
-rw-r--r--kpovmodeler/pmsymboltable.cpp2
-rw-r--r--kpovmodeler/pmtext.cpp4
-rw-r--r--kpovmodeler/pmtext.h2
-rw-r--r--kpovmodeler/pmtextedit.cpp2
-rw-r--r--kpovmodeler/pmtexture.cpp4
-rw-r--r--kpovmodeler/pmtexture.h2
-rw-r--r--kpovmodeler/pmtexturebase.cpp6
-rw-r--r--kpovmodeler/pmtexturebase.h2
-rw-r--r--kpovmodeler/pmtexturebaseedit.cpp2
-rw-r--r--kpovmodeler/pmtextureedit.cpp2
-rw-r--r--kpovmodeler/pmtexturemap.cpp32
-rw-r--r--kpovmodeler/pmtexturemap.h14
-rw-r--r--kpovmodeler/pmtexturemapedit.cpp2
-rw-r--r--kpovmodeler/pmtorus.cpp4
-rw-r--r--kpovmodeler/pmtorus.h2
-rw-r--r--kpovmodeler/pmtorusedit.cpp2
-rw-r--r--kpovmodeler/pmtranslate.cpp4
-rw-r--r--kpovmodeler/pmtranslate.h2
-rw-r--r--kpovmodeler/pmtranslateedit.cpp2
-rw-r--r--kpovmodeler/pmtreeview.cpp4
-rw-r--r--kpovmodeler/pmtreeviewitem.cpp4
-rw-r--r--kpovmodeler/pmtreeviewitem.h8
-rw-r--r--kpovmodeler/pmtriangle.cpp4
-rw-r--r--kpovmodeler/pmtriangle.h2
-rw-r--r--kpovmodeler/pmtriangleedit.cpp8
-rw-r--r--kpovmodeler/pmtruetypecache.cpp2
-rw-r--r--kpovmodeler/pmunknownview.cpp6
-rw-r--r--kpovmodeler/pmvector.cpp2
-rw-r--r--kpovmodeler/pmvectoredit.cpp80
-rw-r--r--kpovmodeler/pmvectorlistedit.cpp12
-rw-r--r--kpovmodeler/pmvectorlistedit.h2
-rw-r--r--kpovmodeler/pmview.cpp8
-rw-r--r--kpovmodeler/pmviewbase.h2
-rw-r--r--kpovmodeler/pmviewlayoutmanager.cpp24
-rw-r--r--kpovmodeler/pmviewlayoutmanager.h28
-rw-r--r--kpovmodeler/pmwarp.cpp4
-rw-r--r--kpovmodeler/pmwarp.h2
-rw-r--r--kpovmodeler/pmwarpedit.cpp2
-rw-r--r--kpovmodeler/pmxmlparser.cpp2
-rw-r--r--kruler/klineal.cpp10
-rw-r--r--ksnapshot/ksnapshot.cpp8
-rw-r--r--ksnapshot/ksnapshot.h6
-rw-r--r--ksnapshot/ksnapshotwidget.ui8
-rw-r--r--ksnapshot/ksnapshotwidget.ui.h2
-rw-r--r--ksnapshot/regiongrabber.cpp16
-rw-r--r--ksnapshot/windowgrabber.cpp46
-rw-r--r--ksvg/core/CanvasItems.cpp20
-rw-r--r--ksvg/core/CanvasItems.h8
-rw-r--r--ksvg/core/KSVGCanvas.cpp18
-rw-r--r--ksvg/core/KSVGCanvas.h4
-rw-r--r--ksvg/core/KSVGReader.cc18
-rw-r--r--ksvg/data/SVGGlyphElementImpl.lut.h2
-rw-r--r--ksvg/data/SVGStylableImpl.lut.h2
-rw-r--r--ksvg/dom/SVGCircleElement.h2
-rw-r--r--ksvg/dom/SVGEllipseElement.h2
-rw-r--r--ksvg/dom/SVGLength.cc2
-rw-r--r--ksvg/dom/SVGLineElement.h2
-rw-r--r--ksvg/dom/SVGLocatable.h2
-rw-r--r--ksvg/dom/SVGPolygonElement.h4
-rw-r--r--ksvg/dom/SVGPolylineElement.h4
-rw-r--r--ksvg/dom/SVGRectElement.h6
-rw-r--r--ksvg/dom/SVGSVGElement.h2
-rw-r--r--ksvg/dom/SVGTextElement.h2
-rw-r--r--ksvg/ecma/ksvg_ecma.cpp10
-rw-r--r--ksvg/ecma/ksvg_helper.cpp4
-rw-r--r--ksvg/ecma/ksvg_window.cpp6
-rw-r--r--ksvg/impl/SVGAnimateMotionElementImpl.cc2
-rw-r--r--ksvg/impl/SVGContainerImpl.cc36
-rw-r--r--ksvg/impl/SVGContainerImpl.h2
-rw-r--r--ksvg/impl/SVGDocumentImpl.cc8
-rw-r--r--ksvg/impl/SVGEcma.cc6
-rw-r--r--ksvg/impl/SVGElementImpl.cc6
-rw-r--r--ksvg/impl/SVGEventImpl.cc10
-rw-r--r--ksvg/impl/SVGGlyphElementImpl.cc2
-rw-r--r--ksvg/impl/SVGHelperImpl.cc10
-rw-r--r--ksvg/impl/SVGImageElementImpl.cc14
-rw-r--r--ksvg/impl/SVGImageElementImpl.h2
-rw-r--r--ksvg/impl/SVGLocatableImpl.cc18
-rw-r--r--ksvg/impl/SVGMarkerElementImpl.cc12
-rw-r--r--ksvg/impl/SVGMaskElementImpl.cc38
-rw-r--r--ksvg/impl/SVGMaskElementImpl.h6
-rw-r--r--ksvg/impl/SVGPathSegArcImpl.h4
-rw-r--r--ksvg/impl/SVGPathSegCurvetoCubicImpl.h4
-rw-r--r--ksvg/impl/SVGPathSegCurvetoCubicSmoothImpl.h4
-rw-r--r--ksvg/impl/SVGPathSegCurvetoQuadraticImpl.h4
-rw-r--r--ksvg/impl/SVGPathSegCurvetoQuadraticSmoothImpl.h4
-rw-r--r--ksvg/impl/SVGPathSegLinetoHorizontalImpl.h4
-rw-r--r--ksvg/impl/SVGPathSegLinetoImpl.h4
-rw-r--r--ksvg/impl/SVGPathSegLinetoVerticalImpl.h4
-rw-r--r--ksvg/impl/SVGPathSegMovetoImpl.h4
-rw-r--r--ksvg/impl/SVGPatternElementImpl.cc12
-rw-r--r--ksvg/impl/SVGSVGElementImpl.cc32
-rw-r--r--ksvg/impl/SVGShapeImpl.cc4
-rw-r--r--ksvg/impl/SVGShapeImpl.h2
-rw-r--r--ksvg/impl/SVGStylableImpl.cc12
-rw-r--r--ksvg/impl/SVGSwitchElementImpl.cc4
-rw-r--r--ksvg/impl/SVGTimeScheduler.cc6
-rw-r--r--ksvg/impl/SVGUseElementImpl.cc32
-rw-r--r--ksvg/impl/SVGUseElementImpl.h2
-rw-r--r--ksvg/impl/SVGWindowImpl.cc6
-rw-r--r--ksvg/impl/libs/art_support/art_rgba_svp.c4
-rw-r--r--ksvg/impl/libs/libtext2path/src/Converter.cpp28
-rw-r--r--ksvg/impl/libs/libtext2path/src/Font.cpp6
-rw-r--r--ksvg/impl/libs/libtext2path/src/Glyph.cpp6
-rw-r--r--ksvg/impl/libs/libtext2path/src/Glyph.h4
-rw-r--r--ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib-drawable.c10
-rw-r--r--ksvg/plugin/backends/agg/AggCanvasItems.cpp34
-rw-r--r--ksvg/plugin/backends/agg/AggCanvasItems.h8
-rw-r--r--ksvg/plugin/backends/libart/LibartCanvas.cpp24
-rw-r--r--ksvg/plugin/backends/libart/LibartCanvasItems.cpp48
-rw-r--r--ksvg/plugin/backends/libart/LibartCanvasItems.h6
-rw-r--r--ksvg/plugin/ksvg_plugin.cpp4
-rw-r--r--ksvg/test/W3C_TESTSUITE_1.112
-rw-r--r--ksvg/test/ZVON-TEST-PASSED18
-rw-r--r--ksvg/test/ecma/bbox/bbox.js14
-rw-r--r--kuickshow/src/aboutwidget.cpp10
-rw-r--r--kuickshow/src/defaultswidget.cpp12
-rw-r--r--kuickshow/src/filecache.cpp2
-rw-r--r--kuickshow/src/filewidget.cpp4
-rw-r--r--kuickshow/src/filewidget.h2
-rw-r--r--kuickshow/src/generalwidget.cpp20
-rw-r--r--kuickshow/src/imagewindow.cpp20
-rw-r--r--kuickshow/src/imlibwidget.cpp6
-rw-r--r--kuickshow/src/kuickfile.cpp10
-rw-r--r--kuickshow/src/kuickfile.h4
-rw-r--r--kuickshow/src/kuickshow.cpp12
-rw-r--r--kuickshow/src/mainwidget.cpp2
-rw-r--r--kuickshow/src/printing.cpp40
-rw-r--r--kuickshow/src/slideshowwidget.cpp16
-rw-r--r--kview/config/kviewconfmodules.cpp8
-rw-r--r--kview/kview.cpp34
-rw-r--r--kview/kviewcanvas/config/confmodules.cpp6
-rw-r--r--kview/kviewcanvas/config/generalconfigwidget.ui12
-rw-r--r--kview/kviewcanvas/kimagecanvas.cpp4
-rw-r--r--kview/kviewcanvas/kimageholder.cpp4
-rw-r--r--kview/kviewcanvas/kimageholder.h2
-rw-r--r--kview/kviewviewer/imagesettings.cpp10
-rw-r--r--kview/kviewviewer/kviewkonqextension.cpp2
-rw-r--r--kview/kviewviewer/kviewviewer.cpp28
-rw-r--r--kview/kviewviewer/printimagesettings.ui10
-rw-r--r--kview/modules/presenter/config/kviewpresenterconfig.cpp6
-rw-r--r--kview/modules/presenter/imagelistdialog.ui6
-rw-r--r--kview/modules/presenter/kviewpresenter.cpp6
-rw-r--r--kview/modules/presenter/kviewpresenterconfmodule.cpp6
-rw-r--r--kview/modules/scale/kview_scale.cpp26
-rw-r--r--kview/modules/scale/scaledlg.cpp26
-rw-r--r--kviewshell/documentPageCache.cpp2
-rw-r--r--kviewshell/documentWidget.cpp18
-rw-r--r--kviewshell/kmultipage.cpp34
-rw-r--r--kviewshell/kmultipage.h4
-rw-r--r--kviewshell/kprintDialogPage_pageoptions.cpp6
-rw-r--r--kviewshell/kviewpart.cpp56
-rw-r--r--kviewshell/main.cpp4
-rw-r--r--kviewshell/marklist.cpp16
-rw-r--r--kviewshell/marklist.h2
-rw-r--r--kviewshell/optionDialogAccessibilityWidget.ui22
-rw-r--r--kviewshell/pageSize.cpp2
-rw-r--r--kviewshell/pageSizeDialog.cpp4
-rw-r--r--kviewshell/pageSizeWidget_base.ui2
-rw-r--r--kviewshell/pageView.cpp8
-rw-r--r--kviewshell/pageView.h4
-rw-r--r--kviewshell/plugins/djvu/djvumultipage.cpp6
-rw-r--r--kviewshell/plugins/djvu/djvurenderer.cpp16
-rw-r--r--kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.cpp4
-rw-r--r--kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions_basewidget.ui2
-rw-r--r--kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp6
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVmNav.cpp4
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVmNav.h4
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVuAnno.cpp64
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVuAnno.h16
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.cpp4
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVuErrorList.cpp14
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVuErrorList.h20
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVuFile.cpp6
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVuFile.h6
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVuImage.cpp26
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVuImage.h4
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVuPort.cpp6
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVuPort.h6
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVuText.cpp86
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVuText.h4
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVuToPS.cpp54
-rw-r--r--kviewshell/plugins/djvu/libdjvu/GBitmap.h2
-rw-r--r--kviewshell/plugins/djvu/libdjvu/GMapAreas.cpp2
-rw-r--r--kviewshell/plugins/djvu/libdjvu/GMapAreas.h32
-rw-r--r--kviewshell/plugins/djvu/libdjvu/IW44Image.cpp2
-rw-r--r--kviewshell/plugins/djvu/libdjvu/IW44Image.h2
-rw-r--r--kviewshell/plugins/djvu/libdjvu/JB2EncodeCodec.cpp114
-rw-r--r--kviewshell/plugins/djvu/libdjvu/JB2Image.cpp170
-rw-r--r--kviewshell/plugins/djvu/libdjvu/JB2Image.h170
-rw-r--r--kviewshell/plugins/djvu/libdjvu/MMRDecoder.cpp12
-rw-r--r--kviewshell/plugins/djvu/libdjvu/XMLParser.cpp20
-rw-r--r--kviewshell/renderedDocumentPagePixmap.cpp2
-rw-r--r--kviewshell/searchWidget.cpp18
-rw-r--r--kviewshell/searchWidget.h2
-rw-r--r--kviewshell/selection.cpp10
-rw-r--r--kviewshell/sizePreview.cpp2
-rw-r--r--kviewshell/zoom.cpp18
-rw-r--r--libkscan/devselector.cpp12
-rw-r--r--libkscan/dispgamma.cpp12
-rw-r--r--libkscan/dispgamma.h2
-rw-r--r--libkscan/gammadialog.cpp2
-rw-r--r--libkscan/gammadialog.h2
-rw-r--r--libkscan/img_canvas.cpp18
-rw-r--r--libkscan/img_canvas.h4
-rw-r--r--libkscan/kscandevice.cpp30
-rw-r--r--libkscan/kscandevice.h2
-rw-r--r--libkscan/kscandoc.h2
-rw-r--r--libkscan/kscanoption.cpp2
-rw-r--r--libkscan/kscanslider.cpp6
-rw-r--r--libkscan/massscandialog.cpp2
-rw-r--r--libkscan/previewer.cpp18
-rw-r--r--libkscan/previewer.h2
-rw-r--r--libkscan/scandialog.cpp18
-rw-r--r--libkscan/scanparams.cpp18
-rw-r--r--libkscan/scanparams.h2
-rw-r--r--libkscan/scansourcedialog.cpp2
-rw-r--r--libkscan/sizeindicator.cpp8
695 files changed, 3868 insertions, 3868 deletions
diff --git a/kamera/kcontrol/kamera.cpp b/kamera/kcontrol/kamera.cpp
index fe4739de..d57a7ec3 100644
--- a/kamera/kcontrol/kamera.cpp
+++ b/kamera/kcontrol/kamera.cpp
@@ -21,7 +21,7 @@
*/
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <kgenericfactory.h>
#include <ksimpleconfig.h>
@@ -96,7 +96,7 @@ void KKameraConfig::displayGPSuccessDialogue(void)
// set the kcontrol module buttons
setButtons(Help | Apply | Cancel | Ok);
- // create a tqlayout with two vertical boxes
+ // create a layout with two vertical boxes
TQVBoxLayout *topLayout = new TQVBoxLayout(this, 0, 0);
topLayout->setAutoAdd(true);
@@ -113,7 +113,7 @@ void KKameraConfig::displayGPSuccessDialogue(void)
connect(m_deviceSel, TQT_SIGNAL(selectionChanged(TQIconViewItem *)),
TQT_SLOT(slot_deviceSelected(TQIconViewItem *)));
- m_deviceSel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
+ m_deviceSel->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
// create actions
KAction *act;
diff --git a/kamera/kcontrol/kameraconfigdialog.cpp b/kamera/kcontrol/kameraconfigdialog.cpp
index 17a2c249..0cc21d44 100644
--- a/kamera/kcontrol/kameraconfigdialog.cpp
+++ b/kamera/kcontrol/kameraconfigdialog.cpp
@@ -20,7 +20,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <tqlayout.h>
+#include <layout.h>
#include <tqgrid.h>
#include <tqlabel.h>
#include <tqvgroupbox.h>
@@ -221,14 +221,14 @@ void KameraConfigDialog::appendWidget(TQWidget *parent, CameraWidget *widget)
return;
}
- // Append all this widgets tqchildren
+ // Append all this widgets children
for(int i = 0; i < gp_widget_count_children(widget); ++i) {
CameraWidget *widget_child;
gp_widget_get_child(widget, i, &widget_child);
appendWidget(newParent, widget_child);
}
- // Things that must be done after all tqchildren were added
+ // Things that must be done after all children were added
/*
switch (widget_type) {
case GP_WIDGET_SECTION:
diff --git a/kamera/kcontrol/kameradevice.cpp b/kamera/kcontrol/kameradevice.cpp
index 9ce6deae..6182eec4 100644
--- a/kamera/kcontrol/kameradevice.cpp
+++ b/kamera/kcontrol/kameradevice.cpp
@@ -20,7 +20,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <tqlayout.h>
+#include <layout.h>
#include <tqwidgetstack.h>
#include <tqvbuttongroup.h>
#include <tqvgroupbox.h>
@@ -86,7 +86,7 @@ bool KCamera::initInformation()
int index = gp_abilities_list_lookup_model(m_abilitylist, m_model.local8Bit().data());
if(index < 0) {
emit error(i18n("Description of abilities for camera %1 is not available."
- " Configuration options may be incorrect.").tqarg(m_model));
+ " Configuration options may be incorrect.").arg(m_model));
return false;
}
gp_abilities_list_get_abilities(m_abilitylist, index, &m_abilities);
@@ -282,7 +282,7 @@ KameraDeviceSelectDialog::KameraDeviceSelectDialog(TQWidget *parent, KCamera *de
TQWidget *page = new TQWidget( this );
setMainWidget(page);
- // a tqlayout with vertical boxes
+ // a layout with vertical boxes
TQHBoxLayout *topLayout = new TQHBoxLayout(page, 0, KDialog::spacingHint());
// the models list
@@ -293,7 +293,7 @@ KameraDeviceSelectDialog::KameraDeviceSelectDialog(TQWidget *parent, KCamera *de
connect(m_modelSel, TQT_SIGNAL(selectionChanged(TQListViewItem *)),
TQT_SLOT(slot_setModel(TQListViewItem *)));
// make sure listview only as wide as it needs to be
- m_modelSel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Maximum,
+ m_modelSel->setSizePolicy(TQSizePolicy(TQSizePolicy::Maximum,
TQSizePolicy::Preferred));
TQVBoxLayout *rightLayout = new TQVBoxLayout(0L, 0, KDialog::spacingHint());
@@ -347,7 +347,7 @@ KameraDeviceSelectDialog::KameraDeviceSelectDialog(TQWidget *parent, KCamera *de
for (int i = 0; i < gphoto_ports; i++) {
if (gp_port_info_list_get_info(list, i, &info) >= 0) {
if (strncmp(info.path, "serial:", 7) == 0)
- m_serialPortCombo->insertItem(TQString::tqfromLatin1(info.path).mid(7));
+ m_serialPortCombo->insertItem(TQString::fromLatin1(info.path).mid(7));
}
}
gp_port_info_list_free(list);
@@ -432,7 +432,7 @@ void KameraDeviceSelectDialog::slot_setModel(TQListViewItem *item)
int index = gp_abilities_list_lookup_model(m_device->m_abilitylist, model.local8Bit().data());
if(index < 0) {
slot_error(i18n("Description of abilities for camera %1 is not available."
- " Configuration options may be incorrect.").tqarg(model));
+ " Configuration options may be incorrect.").arg(model));
}
int result = gp_abilities_list_get_abilities(m_device->m_abilitylist, index, &abilities);
if (result == GP_OK) {
@@ -452,7 +452,7 @@ void KameraDeviceSelectDialog::slot_setModel(TQListViewItem *item)
setPortType(INDEX_USB);
} else {
slot_error(i18n("Description of abilities for camera %1 is not available."
- " Configuration options may be incorrect.").tqarg(model));
+ " Configuration options may be incorrect.").arg(model));
}
}
diff --git a/kamera/kioslave/kamera.cpp b/kamera/kioslave/kamera.cpp
index 7e8c9387..b70e9241 100644
--- a/kamera/kioslave/kamera.cpp
+++ b/kamera/kioslave/kamera.cpp
@@ -30,7 +30,7 @@
#include <errno.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <kdebug.h>
#include <kinstance.h>
@@ -55,7 +55,7 @@ extern "C"
{
KDE_EXPORT int kdemain(int argc, char **argv);
- static void frontendCameratqStatus(GPContext *context, const char *format, va_list args, void *data);
+ static void frontendCameraStatus(GPContext *context, const char *format, va_list args, void *data);
static unsigned int frontendProgressStart(
GPContext *context, float totalsize, const char *format,
va_list args, void *data
@@ -242,7 +242,7 @@ void KameraProtocol::get(const KURL &url)
#undef GPHOTO_TEXT_FILE
// emit info message
- infoMessage( i18n("Retrieving data from camera <b>%1</b>").tqarg(url.user()) );
+ infoMessage( i18n("Retrieving data from camera <b>%1</b>").arg(url.user()) );
// Note: There's no need to re-read directory for each get() anymore
gp_file_new(&m_file);
@@ -795,7 +795,7 @@ void KameraProtocol::setHost(const TQString& host, int port, const TQString& use
}
// register gphoto2 callback functions
- gp_context_set_status_func(m_context, frontendCameratqStatus, this);
+ gp_context_set_status_func(m_context, frontendCameraStatus, this);
gp_context_set_progress_funcs(m_context, frontendProgressStart, frontendProgressUpdate, NULL, this);
// gp_camera_set_message_func(m_camera, ..., this)
@@ -881,7 +881,7 @@ void KameraProtocol::translateFileToUDS(UDSEntry &udsEntry, const CameraFileInfo
if (info.file.fields & GP_FILE_INFO_TYPE) {
atom.m_uds = UDS_MIME_TYPE;
- atom.m_str = TQString::tqfromLatin1(info.file.type);
+ atom.m_str = TQString::fromLatin1(info.file.type);
udsEntry.append(atom);
}
@@ -1028,7 +1028,7 @@ unsigned int frontendProgressStart(
}
// this callback function is activated on every status message from gphoto2
-static void frontendCameratqStatus(GPContext * /*context*/, const char *format, va_list args, void *data)
+static void frontendCameraStatus(GPContext * /*context*/, const char *format, va_list args, void *data)
{
KameraProtocol *object = (KameraProtocol*)data;
char *status;
diff --git a/kcoloredit/colorselector.cpp b/kcoloredit/colorselector.cpp
index acf1fd06..117259ab 100644
--- a/kcoloredit/colorselector.cpp
+++ b/kcoloredit/colorselector.cpp
@@ -17,7 +17,7 @@
#include <math.h>
-#include <tqlayout.h>
+#include <layout.h>
/* #include <tqtabwidget.h> */
#include <tqradiobutton.h>
#include <tqlabel.h>
@@ -53,7 +53,7 @@ ColorSelector::ColorSelector(TQWidget *parent, const char *name ) : TQWidget(par
topLayout->addWidget(gradientSelection, 10);
KSeparator* hLine = new KSeparator(KSeparator::HLine, this);
topLayout->addWidget(hLine);
- TQHBoxLayout* tqlayout = new TQHBoxLayout();
+ TQHBoxLayout* layout = new TQHBoxLayout();
TextEditSelection* textEditSelection = new TextEditSelection(this);
connect(textEditSelection, TQT_SIGNAL( valueChanged(Color*) ), TQT_SLOT( slotSetColor(Color*) ));
connect(this, TQT_SIGNAL( valueChanged(Color*) ), textEditSelection, TQT_SLOT( slotSetValue(Color*) ));
@@ -88,17 +88,17 @@ ColorSelector::ColorSelector(TQWidget *parent, const char *name ) : TQWidget(par
colorChangeLayout->addStretch(10);
colorChangeLayout->addWidget(colorChangeSliderWidget);
colorChangeLayout->addStretch(10);
- tqlayout->addLayout(colorChangeLayout, 10);
+ layout->addLayout(colorChangeLayout, 10);
m_color.setComponents(RGB_MAX_COMPONENT_VALUE, RGB_MAX_COMPONENT_VALUE, RGB_MAX_COMPONENT_VALUE);
slotColorReplace();
KSeparator* vLine = new KSeparator(KSeparator::VLine, this);
- tqlayout->addWidget(vLine);
- tqlayout->addWidget(textEditSelection, 1);
+ layout->addWidget(vLine);
+ layout->addWidget(textEditSelection, 1);
colorPatch = new KColorPatch(this);
connect(colorPatch, TQT_SIGNAL( colorChanged(const TQColor&) ), TQT_SLOT( slotSetColor(const TQColor&) ));
colorPatch->setMinimumSize(80, 64);
- tqlayout->addWidget(colorPatch, 10);
- topLayout->addLayout(tqlayout);
+ layout->addWidget(colorPatch, 10);
+ topLayout->addLayout(layout);
}
ColorSelector::~ColorSelector() {
}
diff --git a/kcoloredit/gradientselection.cpp b/kcoloredit/gradientselection.cpp
index fd1b7a87..749c5464 100644
--- a/kcoloredit/gradientselection.cpp
+++ b/kcoloredit/gradientselection.cpp
@@ -15,7 +15,7 @@
* *
***************************************************************************/
-#include <tqlayout.h>
+#include <layout.h>
#include <tqframe.h>
#include <tqradiobutton.h>
#include <tqcolor.h>
@@ -26,13 +26,13 @@
GradientSelection::GradientSelection(TQWidget *parent, const char *name ) : TQWidget(parent,name) {
TQGridLayout* topLayout = new TQGridLayout(this, 2, 2, 0);
- TQHBoxLayout* tqlayout = new TQHBoxLayout(0);
- tqlayout->setMargin(3);
+ TQHBoxLayout* layout = new TQHBoxLayout(0);
+ layout->setMargin(3);
xyColorSelector = new KXYColorSelector(this);
connect(xyColorSelector, TQT_SIGNAL( valueChanged(int, int) ),
TQT_SLOT( slotXyColorSelectorPosChanged(int, int) ));
- tqlayout->addWidget(xyColorSelector);
- topLayout->addLayout(tqlayout, 0, 0);
+ layout->addWidget(xyColorSelector);
+ topLayout->addLayout(layout, 0, 0);
topLayout->setRowStretch(0, 10);
topLayout->setRowStretch(1, 0);
TQVBoxLayout* xyColorSelectorLayout = new TQVBoxLayout();
diff --git a/kcoloredit/kcoloredit.h b/kcoloredit/kcoloredit.h
index e09fd415..675cddb0 100644
--- a/kcoloredit/kcoloredit.h
+++ b/kcoloredit/kcoloredit.h
@@ -74,7 +74,7 @@ class KColorEditApp : public KMainWindow
KColorEditDoc *document() const;
protected:
- /** save general Options like all bar positions and status as well as the tqgeometry and the recent file list to the configuration
+ /** save general Options like all bar positions and status as well as the geometry and the recent file list to the configuration
* file
*/
void saveOptions();
diff --git a/kcoloredit/kcoloreditdoc.cpp b/kcoloredit/kcoloreditdoc.cpp
index 0669380b..f4c2f1e9 100644
--- a/kcoloredit/kcoloreditdoc.cpp
+++ b/kcoloredit/kcoloreditdoc.cpp
@@ -19,7 +19,7 @@
#include <tqdir.h>
#include <tqfileinfo.h>
#include <tqwidget.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
// include files for KDE
#include <klocale.h>
@@ -235,7 +235,7 @@ void KColorEditDoc::copyToClipboard(Palette& palette) {
TQString text;
TQTextOStream stream(&text);
palette.save(stream, 0, false);
- KApplication::tqclipboard()->setText(text);
+ KApplication::clipboard()->setText(text);
emit clipboardChanged();
}
@@ -260,7 +260,7 @@ void KColorEditDoc::paste() {
Palette palettePaste;
TQString text;
TQTextIStream stream(&text);
- text = KApplication::tqclipboard()->text();
+ text = KApplication::clipboard()->text();
if(palettePaste.load( stream, false )) {
m_paletteHistory.paste(paletteCursorPos(), palettePaste);
setPaletteSelection(paletteCursorPos(), paletteCursorPos() +
diff --git a/kcoloredit/kcoloreditview.cpp b/kcoloredit/kcoloreditview.cpp
index 32e61a06..89b84e6f 100644
--- a/kcoloredit/kcoloreditview.cpp
+++ b/kcoloredit/kcoloreditview.cpp
@@ -17,7 +17,7 @@
// include files for TQt
#include <tqpainter.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpushbutton.h>
#include <tqvgroupbox.h>
#include <tqlineedit.h>
@@ -43,7 +43,7 @@ KColorEditView::KColorEditView(TQWidget *parent, const char *name) : TQSplitter(
TQVBoxLayout* paletteLayout = new TQVBoxLayout(paletteViewArea);
paletteView = new PaletteView(16, 16, 2, this, paletteViewArea);
paletteLayout->addWidget(paletteView, 10);
- TQHBoxLayout* tqlayout = new TQHBoxLayout();
+ TQHBoxLayout* layout = new TQHBoxLayout();
TQVBoxLayout* addColorLayout = new TQVBoxLayout(4);
addColorLayout->setMargin(8);
TQHBoxLayout* buttonsLayout = new TQHBoxLayout(4);
@@ -70,7 +70,7 @@ KColorEditView::KColorEditView(TQWidget *parent, const char *name) : TQSplitter(
// paletteView, TQT_SLOT( slotCursorFollowsChosenColor(bool) ));
//cursorFollowsChosenColor->toggle();
paletteView->slotCursorFollowsChosenColor(true);
- tqlayout->addLayout(addColorLayout, 0);
+ layout->addLayout(addColorLayout, 0);
TQVGroupBox* colorAtCursorFrame = new TQVGroupBox(i18n("Color at Cursor"), paletteViewArea);
TQWidget* colorAtCursorFrameArea = new TQWidget(colorAtCursorFrame);
TQVBoxLayout* colorAtCursorLayout = new TQVBoxLayout(colorAtCursorFrameArea, 4);
@@ -127,10 +127,10 @@ KColorEditView::KColorEditView(TQWidget *parent, const char *name) : TQSplitter(
colorAtCursorRgbStringLayout->addWidget(colorAtCursorRgbStringValueLabel);
colorAtCursorRgbStringLayout->addStretch();
colorAtCursorLayout->addLayout(colorAtCursorRgbStringLayout);
- tqlayout->addWidget(colorAtCursorFrame, 10);
- tqlayout->addSpacing(8);
+ layout->addWidget(colorAtCursorFrame, 10);
+ layout->addSpacing(8);
paletteLayout->addSpacing(4);
- paletteLayout->addLayout(tqlayout);
+ paletteLayout->addLayout(layout);
paletteLayout->addSpacing(4);
inColorNameChanging = false;
doNotUpdateColorLabels = false;
diff --git a/kcoloredit/kxycolorselector.cpp b/kcoloredit/kxycolorselector.cpp
index 68df676d..e6c0e6ef 100644
--- a/kcoloredit/kxycolorselector.cpp
+++ b/kcoloredit/kxycolorselector.cpp
@@ -42,7 +42,7 @@ void KXYColorSelector::setType(const int type) {
void KXYColorSelector::updateContents() {
drawPalette(&pixmap);
- tqrepaint();
+ repaint();
}
void KXYColorSelector::resizeEvent(TQResizeEvent*) {
diff --git a/kcoloredit/kzcolorselector.cpp b/kcoloredit/kzcolorselector.cpp
index c705cad0..bb4a3c23 100644
--- a/kcoloredit/kzcolorselector.cpp
+++ b/kcoloredit/kzcolorselector.cpp
@@ -53,7 +53,7 @@ void KZColorSelector::setType(const int type) {
void KZColorSelector::updateContents() {
drawPalette(&pixmap);
- tqrepaint(false);
+ repaint(false);
}
void KZColorSelector::resizeEvent(TQResizeEvent*) {
diff --git a/kcoloredit/loadpalettedlg.cpp b/kcoloredit/loadpalettedlg.cpp
index 23def4d5..d7ac54aa 100644
--- a/kcoloredit/loadpalettedlg.cpp
+++ b/kcoloredit/loadpalettedlg.cpp
@@ -17,7 +17,7 @@
#include <string.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqstring.h>
#include <tqstringlist.h>
diff --git a/kcoloredit/palette.cpp b/kcoloredit/palette.cpp
index 42758b41..5745d824 100644
--- a/kcoloredit/palette.cpp
+++ b/kcoloredit/palette.cpp
@@ -17,7 +17,7 @@
#include <tqstring.h>
#include <tqstringlist.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqregexp.h>
#include <kglobal.h>
#include <kstandarddirs.h>
diff --git a/kcoloredit/palette.h b/kcoloredit/palette.h
index a363ada4..ccba9a6f 100644
--- a/kcoloredit/palette.h
+++ b/kcoloredit/palette.h
@@ -19,7 +19,7 @@
#define PALETTE_H
#include <tqstring.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqfile.h>
#include "color.h"
diff --git a/kcoloredit/paletteview.cpp b/kcoloredit/paletteview.cpp
index 52e8b4be..7d932c4f 100644
--- a/kcoloredit/paletteview.cpp
+++ b/kcoloredit/paletteview.cpp
@@ -15,7 +15,7 @@
* *
***************************************************************************/
-#include <tqlayout.h>
+#include <layout.h>
#include "kcoloreditview.h"
#include "paletteview.h"
diff --git a/kcoloredit/paletteviewscrolledarea.cpp b/kcoloredit/paletteviewscrolledarea.cpp
index 63cb3f9b..23bd280c 100644
--- a/kcoloredit/paletteviewscrolledarea.cpp
+++ b/kcoloredit/paletteviewscrolledarea.cpp
@@ -19,7 +19,7 @@
#include <tqptrlist.h>
#include <tqcolor.h>
#include <tqcursor.h>
-#include <tqbrush.h>
+#include <brush.h>
#include <tqpainter.h>
#include <tqpixmap.h>
#include <tqpen.h>
@@ -77,7 +77,7 @@ void PaletteViewScrolledArea::redraw() {
}
void PaletteViewScrolledArea::repaintPalette() {
- tqrepaint(false);
+ repaint(false);
}
void PaletteViewScrolledArea::checkSelectionAutoScroll(const int mousePosY) {
@@ -220,7 +220,7 @@ void PaletteViewScrolledArea::paintEvent(TQPaintEvent* /*event*/) {
setCellsSizes();
TQPixmap pixmap(size());
TQPainter painter;
- painter.tqbegin(TQT_TQPAINTDEVICE(&pixmap), this);
+ painter.begin(TQT_TQPAINTDEVICE(&pixmap), this);
TQFontMetrics fontMetrics = painter.fontMetrics();
int maxLineWidth;
if(viewColorNames) {
@@ -249,12 +249,12 @@ void PaletteViewScrolledArea::paintEvent(TQPaintEvent* /*event*/) {
int lastRow = (posY + height() - 1 + rowHeight - 1)/rowHeight;
if(viewColorNames)
painter.fillRect(0, 0, rowWidth, height(),
- TQBrush( TQFrame::tqpalette().active().base() ));
- TQBrush normalBackgroundBrush(TQFrame::tqpalette().active().background());
- TQBrush selectedBackgroundBrush(TQFrame::tqpalette().active().highlight());
+ TQBrush( TQFrame::palette().active().base() ));
+ TQBrush normalBackgroundBrush(TQFrame::palette().active().background());
+ TQBrush selectedBackgroundBrush(TQFrame::palette().active().highlight());
TQBrush foregroundBrush;
- TQBrush cursorBrush(TQFrame::tqpalette().active().foreground());
- TQPen backgroundPen(TQFrame::tqpalette().active().foreground());
+ TQBrush cursorBrush(TQFrame::palette().active().foreground());
+ TQPen backgroundPen(TQFrame::palette().active().foreground());
int min = selectionMin();
int max = selectionMax();
int fontAscent = fontMetrics.ascent();
diff --git a/kcoloredit/texteditselection.cpp b/kcoloredit/texteditselection.cpp
index 1b49ec6a..d32e054e 100644
--- a/kcoloredit/texteditselection.cpp
+++ b/kcoloredit/texteditselection.cpp
@@ -59,14 +59,14 @@ TextEditSelection::~TextEditSelection(){
}
void TextEditSelection::addComponent(const int index, TQLineEdit* lineEdit, const int maxValue,
- const TQString& labelString, const int row, const int column, TQGridLayout* tqlayout) {
+ const TQString& labelString, const int row, const int column, TQGridLayout* layout) {
TQLabel* label = new TQLabel(labelString, this);
lineEdit->setValidator(new TQIntValidator( 0, maxValue, TQT_TQOBJECT(lineEdit) ));
lineEditTable[index] = lineEdit;
lineEdit->setMinimumWidth(lineEdit->fontMetrics().width( TQString("8888") ));
lineEdit->setMaximumWidth(lineEdit->fontMetrics().width( TQString("8888888") ));
- tqlayout->addWidget(label, row, column*3);
- tqlayout->addWidget(lineEdit, row, column*3 + 1);
+ layout->addWidget(label, row, column*3);
+ layout->addWidget(lineEdit, row, column*3 + 1);
}
void TextEditSelection::setRgbString(const int red, const int green, const int blue) {
diff --git a/kcoloredit/texteditselection.h b/kcoloredit/texteditselection.h
index e0ef91f5..776b81f3 100644
--- a/kcoloredit/texteditselection.h
+++ b/kcoloredit/texteditselection.h
@@ -20,7 +20,7 @@
#include <tqwidget.h>
#include <tqlineedit.h>
-#include <tqlayout.h>
+#include <layout.h>
#include "color.h"
@@ -48,7 +48,7 @@ public slots:
protected:
/** Adds a component line edit */
void addComponent(const int index, TQLineEdit* lineEdit, const int maxValue, const TQString& labelString,
- const int row, const int column, TQGridLayout* tqlayout);
+ const int row, const int column, TQGridLayout* layout);
/** sets RGB string in rgbStringLineEdit */
void setRgbString(const int red, const int green, const int blue);
diff --git a/kdvi/TeXFontDefinition.cpp b/kdvi/TeXFontDefinition.cpp
index c89aa59d..49ddcaa0 100644
--- a/kdvi/TeXFontDefinition.cpp
+++ b/kdvi/TeXFontDefinition.cpp
@@ -105,7 +105,7 @@ void TeXFontDefinition::fontNameReceiver(const TQString& fname)
TQString filename_test(font_pool->getExtraSearchPath() + "/" + filename);
file = fopen( TQFile::encodeName(filename_test), "r");
if (file == 0) {
- kdError(4300) << i18n("Cannot find font %1, file %2.").tqarg(fontname).tqarg(filename) << endl;
+ kdError(4300) << i18n("Cannot find font %1, file %2.").arg(fontname).arg(filename) << endl;
return;
} else
filename = filename_test;
@@ -121,7 +121,7 @@ void TeXFontDefinition::fontNameReceiver(const TQString& fname)
font = new TeXFont_PK(this);
set_char_p = &dviRenderer::set_char;
if ((checksum != 0) && (checksum != font->checksum))
- kdWarning(4300) << i18n("Checksum mismatch for font file %1").tqarg(filename) << endl;
+ kdWarning(4300) << i18n("Checksum mismatch for font file %1").arg(filename) << endl;
fontTypeName = "TeX PK";
return;
}
@@ -169,7 +169,7 @@ void TeXFontDefinition::fontNameReceiver(const TQString& fname)
#else
// If we don't have the FreeType library, we should never have
// reached this point. Complain, and leave this font blank
- kdError(4300) << i18n("Cannot recognize format for font file %1").tqarg(filename) << endl;
+ kdError(4300) << i18n("Cannot recognize format for font file %1").arg(filename) << endl;
#endif
}
diff --git a/kdvi/TeXFontDefinition.h b/kdvi/TeXFontDefinition.h
index 9097b2cb..a059a405 100644
--- a/kdvi/TeXFontDefinition.h
+++ b/kdvi/TeXFontDefinition.h
@@ -1,6 +1,6 @@
// -*- C++ -*-
/*
- * The tqlayout of a font information block.
+ * The layout of a font information block.
* There is one of these for every loaded font or magnification thereof.
* Duplicates are eliminated: this is necessary because of possible recursion
* in virtual fonts.
diff --git a/kdvi/TeXFont_PFB.cpp b/kdvi/TeXFont_PFB.cpp
index 45c76512..d2c74e27 100644
--- a/kdvi/TeXFont_PFB.cpp
+++ b/kdvi/TeXFont_PFB.cpp
@@ -41,13 +41,13 @@ TeXFont_PFB::TeXFont_PFB(TeXFontDefinition *parent, fontEncoding *enc, double sl
int error = FT_New_Face( parent->font_pool->FreeType_library, parent->filename.local8Bit(), 0, &face );
if ( error == FT_Err_Unknown_File_Format ) {
- errorMessage = i18n("The font file %1 could be opened and read, but its font format is unsupported.").tqarg(parent->filename);
+ errorMessage = i18n("The font file %1 could be opened and read, but its font format is unsupported.").arg(parent->filename);
kdError(4300) << errorMessage << endl;
fatalErrorInFontLoading = true;
return;
} else
if ( error ) {
- errorMessage = i18n("The font file %1 is broken, or it could not be opened or read.").tqarg(parent->filename);
+ errorMessage = i18n("The font file %1 is broken, or it could not be opened or read.").arg(parent->filename);
kdError(4300) << errorMessage << endl;
fatalErrorInFontLoading = true;
return;
@@ -74,8 +74,8 @@ TeXFont_PFB::TeXFont_PFB(TeXFontDefinition *parent, fontEncoding *enc, double sl
// TeX is only able to address character codes 0-255 while
// e.g. Type1 fonts may contain several thousands of characters)
if (enc != 0) {
- parent->fullEncodingName = enc->encodingFullName.remove(TQString::tqfromLatin1( "Encoding" ));
- parent->fullEncodingName = enc->encodingFullName.remove(TQString::tqfromLatin1( "encoding" ));
+ parent->fullEncodingName = enc->encodingFullName.remove(TQString::fromLatin1( "Encoding" ));
+ parent->fullEncodingName = enc->encodingFullName.remove(TQString::fromLatin1( "encoding" ));
// An encoding vector is given for this font, i.e. an array of
// character names (such as: 'parenleft' or 'dotlessj'). We use
@@ -168,7 +168,7 @@ glyph *TeXFont_PFB::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const T
long int characterSize_in_printers_points_by_64 = (long int)((64.0*72.0*parent->scaled_size_in_DVI_units*parent->font_pool->getCMperDVIunit())/2.54 + 0.5 );
error = FT_Set_Char_Size(face, 0, characterSize_in_printers_points_by_64, res, res );
if (error) {
- TQString msg = i18n("FreeType reported an error when setting the character size for font file %1.").tqarg(parent->filename);
+ TQString msg = i18n("FreeType reported an error when setting the character size for font file %1.").arg(parent->filename);
if (errorMessage.isEmpty())
errorMessage = msg;
kdError(4300) << msg << endl;
@@ -184,7 +184,7 @@ glyph *TeXFont_PFB::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const T
error = FT_Load_Glyph(face, charMap[ch], FT_LOAD_NO_HINTING );
if (error) {
- TQString msg = i18n("FreeType is unable to load glyph #%1 from font file %2.").tqarg(ch).tqarg(parent->filename);
+ TQString msg = i18n("FreeType is unable to load glyph #%1 from font file %2.").arg(ch).arg(parent->filename);
if (errorMessage.isEmpty())
errorMessage = msg;
kdError(4300) << msg << endl;
@@ -196,7 +196,7 @@ glyph *TeXFont_PFB::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const T
// convert to an anti-aliased bitmap
error = FT_Render_Glyph( face->glyph, ft_render_mode_normal );
if (error) {
- TQString msg = i18n("FreeType is unable to render glyph #%1 from font file %2.").tqarg(ch).tqarg(parent->filename);
+ TQString msg = i18n("FreeType is unable to render glyph #%1 from font file %2.").arg(ch).arg(parent->filename);
if (errorMessage.isEmpty())
errorMessage = msg;
kdError(4300) << msg << endl;
@@ -209,8 +209,8 @@ glyph *TeXFont_PFB::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const T
if ((slot->bitmap.width == 0) || (slot->bitmap.rows == 0)) {
if (errorMessage.isEmpty())
- errorMessage = i18n("Glyph #%1 is empty.").tqarg(ch);
- kdError(4300) << i18n("Glyph #%1 from font file %2 is empty.").tqarg(ch).tqarg(parent->filename) << endl;
+ errorMessage = i18n("Glyph #%1 is empty.").arg(ch);
+ kdError(4300) << i18n("Glyph #%1 from font file %2 is empty.").arg(ch).arg(parent->filename) << endl;
g->shrunkenCharacter.resize( 15, 15 );
g->shrunkenCharacter.fill(TQColor(255, 0, 0));
g->x2 = 0;
@@ -279,7 +279,7 @@ glyph *TeXFont_PFB::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const T
if (g->dvi_advance_in_units_of_design_size_by_2e20 == 0) {
int error = FT_Load_Glyph(face, charMap[ch], FT_LOAD_NO_SCALE);
if (error) {
- TQString msg = i18n("FreeType is unable to load metric for glyph #%1 from font file %2.").tqarg(ch).tqarg(parent->filename);
+ TQString msg = i18n("FreeType is unable to load metric for glyph #%1 from font file %2.").arg(ch).arg(parent->filename);
if (errorMessage.isEmpty())
errorMessage = msg;
kdError(4300) << msg << endl;
diff --git a/kdvi/TeXFont_PK.cpp b/kdvi/TeXFont_PK.cpp
index f678df9b..e2597971 100644
--- a/kdvi/TeXFont_PK.cpp
+++ b/kdvi/TeXFont_PK.cpp
@@ -91,7 +91,7 @@ TeXFont_PK::TeXFont_PK(TeXFontDefinition *parent)
characterBitmaps[i] = 0;
file = fopen(TQFile::encodeName(parent->filename), "r");
if (file == 0)
- kdError(4300) << i18n("Cannot open font file %1.").tqarg(parent->filename) << endl;
+ kdError(4300) << i18n("Cannot open font file %1.").arg(parent->filename) << endl;
#ifdef DEBUG_PK
else
kdDebug(4300) << "TeXFont_PK::TeXFont_PK(): file opened successfully" << endl;
@@ -136,7 +136,7 @@ glyph* TeXFont_PK::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const TQ
// If the character is not defined in the PK file, mark the
// character as missing, and print an error message
if (g->addr == 0) {
- kdError(4300) << i18n("TexFont_PK::operator[]: Character %1 not defined in font %2").tqarg(ch).tqarg(parent->filename) << endl;
+ kdError(4300) << i18n("TexFont_PK::operator[]: Character %1 not defined in font %2").arg(ch).arg(parent->filename) << endl;
g->addr = -1;
return g;
}
@@ -454,7 +454,7 @@ void TeXFont_PK::PK_skip_specials()
case PK_NOOP :
break;
default :
- oops(i18n("Unexpected %1 in PK file %2").tqarg(PK_flag_byte).tqarg(parent->filename) );
+ oops(i18n("Unexpected %1 in PK file %2").arg(PK_flag_byte).arg(parent->filename) );
break;
}
}
@@ -521,7 +521,7 @@ void TeXFont_PK::read_PK_char(unsigned int ch)
w = num(fp, n);
h = num(fp, n);
if (w > 0x7fff || h > 0x7fff)
- oops(i18n("The character %1 is too large in file %2").tqarg(ch).tqarg(parent->filename));
+ oops(i18n("The character %1 is too large in file %2").arg(ch).arg(parent->filename));
characterBitmaps[ch]->w = w;
characterBitmaps[ch]->h = h;
}
@@ -626,9 +626,9 @@ void TeXFont_PK::read_PK_char(unsigned int ch)
paint_switch = 1 - paint_switch;
}
if (cp != ((TQ_UINT32 *) (characterBitmaps[ch]->bits + bytes_wide * characterBitmaps[ch]->h)))
- oops(i18n("Wrong number of bits stored: char. %1, font %2").tqarg(ch).tqarg(parent->filename));
+ oops(i18n("Wrong number of bits stored: char. %1, font %2").arg(ch).arg(parent->filename));
if (rows_left != 0 || h_bit != characterBitmaps[ch]->w)
- oops(i18n("Bad pk file (%1), too many bits").tqarg(parent->filename));
+ oops(i18n("Bad pk file (%1), too many bits").arg(parent->filename));
}
// The data in the bitmap is now in the processor's bit order,
@@ -712,9 +712,9 @@ void TeXFont_PK::read_PK_char(unsigned int ch)
paint_switch = 1 - paint_switch;
}
if (cp != ((TQ_UINT32 *) (characterBitmaps[ch]->bits + bytes_wide * characterBitmaps[ch]->h)))
- oops(i18n("Wrong number of bits stored: char. %1, font %2").tqarg(ch).tqarg(parent->filename));
+ oops(i18n("Wrong number of bits stored: char. %1, font %2").arg(ch).arg(parent->filename));
if (rows_left != 0 || h_bit != characterBitmaps[ch]->w)
- oops(i18n("Bad pk file (%1), too many bits").tqarg(parent->filename));
+ oops(i18n("Bad pk file (%1), too many bits").arg(parent->filename));
}
} // endif: big or small Endian?
}
diff --git a/kdvi/dviFile.cpp b/kdvi/dviFile.cpp
index 33dc601d..b3937265 100644
--- a/kdvi/dviFile.cpp
+++ b/kdvi/dviFile.cpp
@@ -256,7 +256,7 @@ void dvifile::prepare_pages()
while (i > 0) {
command_pointer = dvi_Data() + page_offset[i--];
if (readUINT8() != BOP) {
- errorMsg = i18n("The page %1 does not start with the BOP command.").tqarg(i+1);
+ errorMsg = i18n("The page %1 does not start with the BOP command.").arg(i+1);
return;
}
command_pointer += 10 * 4;
diff --git a/kdvi/dviRenderer.cpp b/kdvi/dviRenderer.cpp
index acb3dceb..b42135eb 100644
--- a/kdvi/dviRenderer.cpp
+++ b/kdvi/dviRenderer.cpp
@@ -15,11 +15,11 @@
#include <string.h>
#include <tqcheckbox.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
#include <tqcursor.h>
#include <tqlabel.h>
#include <tqfileinfo.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqmessagebox.h>
#include <tqpaintdevice.h>
#include <tqpainter.h>
@@ -277,7 +277,7 @@ void dviRenderer::showThatSourceInformationIsPresent()
TQLabel *label2 = new TQLabel( i18n("<qt>This DVI file contains source file information. You may click into the text with the "
"middle mouse button, and an editor will open the TeX-source file immediately.</qt>"),
contents);
- label2->setMinimumSize(label2->tqsizeHint());
+ label2->setMinimumSize(label2->sizeHint());
lay->add( label2 );
lay->addStretch(1);
TQSize extraSize = TQSize(50,30);
@@ -437,7 +437,7 @@ bool dviRenderer::setFile(const TQString &fname, const KURL &base)
if (!fi.exists() || fi.isDir()) {
KMessageBox::error( parentWidget,
i18n("<qt><strong>File error.</strong> The specified file '%1' does not exist. "
- "KDVI already tried to add the ending '.dvi'.</qt>").tqarg(filename),
+ "KDVI already tried to add the ending '.dvi'.</qt>").arg(filename),
i18n("File Error!"));
return false;
}
@@ -451,8 +451,8 @@ bool dviRenderer::setFile(const TQString &fname, const KURL &base)
KMessageBox::sorry( parentWidget,
i18n( "<qt>Could not open file <nobr><strong>%1</strong></nobr> which has "
"type <strong>%2</strong>. KDVI can only load DVI (.dvi) files.</qt>" )
- .tqarg( fname )
- .tqarg( mimetype ) );
+ .arg( fname )
+ .arg( mimetype ) );
return false;
}
@@ -462,7 +462,7 @@ bool dviRenderer::setFile(const TQString &fname, const KURL &base)
KMessageBox::sorry( parentWidget,
i18n("<qt>File corruption! KDVI had trouble interpreting your DVI file. Most "
"likely this means that the DVI file is broken.</qt>")
- .tqarg( fname ) );
+ .arg( fname ) );
return false;
}
@@ -641,7 +641,7 @@ Anchor dviRenderer::parseReference(const TQString &reference)
"line %1 in the TeX-file <strong>%2</strong>. It seems, however, that the DVI file "
"does not contain the necessary source file information. "
"We refer to the manual of KDVI for a detailed explanation on how to include this "
- "information. Press the F1 key to open the manual.</qt>").tqarg(refLineNumber).tqarg(refFileName),
+ "information. Press the F1 key to open the manual.</qt>").arg(refLineNumber).arg(refFileName),
i18n("Could Not Find Reference"));
mutex.unlock();
return Anchor();
@@ -681,7 +681,7 @@ Anchor dviRenderer::parseReference(const TQString &reference)
} else
if (anchorForRefFileFound == false)
KMessageBox::sorry(parentWidget, i18n("<qt>KDVI was not able to locate the place in the DVI file which corresponds to "
- "line %1 in the TeX-file <strong>%2</strong>.</qt>").tqarg(refLineNumber).tqarg(refFileName),
+ "line %1 in the TeX-file <strong>%2</strong>.</qt>").arg(refLineNumber).arg(refFileName),
i18n( "Could Not Find Reference" ));
else {
mutex.unlock();
@@ -735,7 +735,7 @@ void dviRenderer::handleSRCLink(const TQString &linkText, TQMouseEvent *e, Docum
{
KMessageBox::sorry(parentWidget, TQString("<qt>") +
i18n("The DVI-file refers to the TeX-file "
- "<strong>%1</strong> which could not be found.").tqarg(KShellProcess::quote(TeXfile)) +
+ "<strong>%1</strong> which could not be found.").arg(KShellProcess::quote(TeXfile)) +
TQString("</qt>"),
i18n( "Could Not Find File" ));
return;
@@ -786,7 +786,7 @@ void dviRenderer::handleSRCLink(const TQString &linkText, TQMouseEvent *e, Docum
"for inverse search, reported an error. You might wish to look at the <strong>document info "
"dialog</strong> which you will find in the File-Menu for a precise error report. The "
"manual for KDVI contains a detailed explanation how to set up your editor for use with KDVI, "
- "and a list of common problems.</qt>").tqarg(command);
+ "and a list of common problems.</qt>").arg(command);
info->clear(i18n("Starting the editor..."));
diff --git a/kdvi/dviRenderer_draw.cpp b/kdvi/dviRenderer_draw.cpp
index 2031fcd7..050396e9 100644
--- a/kdvi/dviRenderer_draw.cpp
+++ b/kdvi/dviRenderer_draw.cpp
@@ -292,7 +292,7 @@ void dviRenderer::draw_part(double current_dimconv, bool is_vfmacro)
if (FNTNUM0 <= ch && ch <= (unsigned char) (FNTNUM0 + 63)) {
currinf.fontp = currinf.fonttable->find(ch - FNTNUM0);
if (currinf.fontp == NULL) {
- errorMsg = i18n("The DVI code referred to font #%1, which was not previously defined.").tqarg(ch - FNTNUM0);
+ errorMsg = i18n("The DVI code referred to font #%1, which was not previously defined.").arg(ch - FNTNUM0);
return;
}
currinf.set_char_p = currinf.fontp->set_char_p;
@@ -567,7 +567,7 @@ void dviRenderer::draw_part(double current_dimconv, bool is_vfmacro)
break;
default:
- errorMsg = i18n("The unknown op-code %1 was encountered.").tqarg(ch);
+ errorMsg = i18n("The unknown op-code %1 was encountered.").arg(ch);
return;
} /* end switch*/
} /* end else (ch not a SETCHAR or FNTNUM) */
diff --git a/kdvi/dviRenderer_export.cpp b/kdvi/dviRenderer_export.cpp
index 110aaacb..2b4ffd65 100644
--- a/kdvi/dviRenderer_export.cpp
+++ b/kdvi/dviRenderer_export.cpp
@@ -101,7 +101,7 @@ void dviRenderer::exportPDF()
return;
TQFileInfo finfo(fileName);
if (finfo.exists()) {
- int r = KMessageBox::warningContinueCancel (parentWidget, i18n("The file %1\nexists. Do you want to overwrite that file?").tqarg(fileName),
+ int r = KMessageBox::warningContinueCancel (parentWidget, i18n("The file %1\nexists. Do you want to overwrite that file?").arg(fileName),
i18n("Overwrite File"), i18n("Overwrite"));
if (r == KMessageBox::Cancel)
return;
@@ -137,12 +137,12 @@ void dviRenderer::exportPDF()
export_errorString = i18n("<qt>The external program 'dvipdf', which was used to export the file, reported an error. "
"You might wish to look at the <strong>document info dialog</strong> which you will "
"find in the File-Menu for a precise error report.</qt>") ;
- info->clear(i18n("Export: %1 to PDF").tqarg(KShellProcess::quote(dviFile->filename)));
+ info->clear(i18n("Export: %1 to PDF").arg(KShellProcess::quote(dviFile->filename)));
proc->clearArguments();
finfo.setFile(dviFile->filename);
- *proc << TQString("cd %1; dvipdfm").tqarg(KShellProcess::quote(finfo.dirPath(true)));
- *proc << TQString("-o %1").tqarg(KShellProcess::quote(fileName));
+ *proc << TQString("cd %1; dvipdfm").arg(KShellProcess::quote(finfo.dirPath(true)));
+ *proc << TQString("-o %1").arg(KShellProcess::quote(fileName));
*proc << KShellProcess::quote(dviFile->filename);
proc->closeStdin();
if (proc->start(KProcess::NotifyOnExit, KProcess::AllOutput) == false) {
@@ -200,7 +200,7 @@ void dviRenderer::exportPS(const TQString& fname, const TQString& options, KPrin
return;
TQFileInfo finfo(fileName);
if (finfo.exists()) {
- int r = KMessageBox::warningYesNo (parentWidget, i18n("The file %1\nexists. Do you want to overwrite that file?").tqarg(fileName),
+ int r = KMessageBox::warningYesNo (parentWidget, i18n("The file %1\nexists. Do you want to overwrite that file?").arg(fileName),
i18n("Overwrite File"));
if (r == KMessageBox::No)
return;
@@ -300,17 +300,17 @@ void dviRenderer::exportPS(const TQString& fname, const TQString& options, KPrin
export_errorString = i18n("<qt>The external program 'dvips', which was used to export the file, reported an error. "
"You might wish to look at the <strong>document info dialog</strong> which you will "
"find in the File-Menu for a precise error report.</qt>") ;
- info->clear(i18n("Export: %1 to PostScript").tqarg(KShellProcess::quote(dviFile->filename)));
+ info->clear(i18n("Export: %1 to PostScript").arg(KShellProcess::quote(dviFile->filename)));
proc->clearArguments();
TQFileInfo finfo(dviFile->filename);
- *proc << TQString("cd %1; dvips").tqarg(KShellProcess::quote(finfo.dirPath(true)));
+ *proc << TQString("cd %1; dvips").arg(KShellProcess::quote(finfo.dirPath(true)));
if (printer == 0)
*proc << "-z"; // export Hyperlinks
if (options.isEmpty() == false)
*proc << options;
- *proc << TQString("%1").tqarg(KShellProcess::quote(sourceFileName));
- *proc << TQString("-o %1").tqarg(KShellProcess::quote(fileName));
+ *proc << TQString("%1").arg(KShellProcess::quote(sourceFileName));
+ *proc << TQString("-o %1").arg(KShellProcess::quote(fileName));
proc->closeStdin();
if (proc->start(KProcess::NotifyOnExit, KProcess::Stderr) == false) {
kdError(4300) << "dvips failed to start" << endl;
diff --git a/kdvi/dviRenderer_prescan.cpp b/kdvi/dviRenderer_prescan.cpp
index 7cfd2415..81a3b40f 100644
--- a/kdvi/dviRenderer_prescan.cpp
+++ b/kdvi/dviRenderer_prescan.cpp
@@ -84,7 +84,7 @@ void dviRenderer::prescan_embedPS(char *cp, TQ_UINT8 *beginningOfSpecialCommand)
TQString originalFName = EPSfilename;
- embedPS_progress->setLabel(i18n("Embedding %1").tqarg(EPSfilename));
+ embedPS_progress->setLabel(i18n("Embedding %1").arg(EPSfilename));
tqApp->processEvents();
@@ -102,7 +102,7 @@ void dviRenderer::prescan_embedPS(char *cp, TQ_UINT8 *beginningOfSpecialCommand)
for(page=0; page < dviFile->total_pages; page++)
if ((dviFile->page_offset[page] <= currentOffset) && (currentOffset <= dviFile->page_offset[page+1]))
break;
- errorMsg += i18n("Page %1: The PostScript file <strong>%2</strong> could not be found.<br>").tqarg(page+1).tqarg(originalFName);
+ errorMsg += i18n("Page %1: The PostScript file <strong>%2</strong> could not be found.<br>").arg(page+1).arg(originalFName);
embedPS_progress->progressBar()->advance(1);
tqApp->processEvents();
return;
@@ -131,13 +131,13 @@ void dviRenderer::prescan_embedPS(char *cp, TQ_UINT8 *beginningOfSpecialCommand)
int clip=include_command.find(" clip"); // -1 if clip keyword is not present, >= 0 otherwise
// Generate the PostScript commands to be included
- TQString PS = TQString("ps: @beginspecial %1 @llx %2 @lly %3 @urx %4 @ury").tqarg(llx).tqarg(lly).tqarg(urx).tqarg(ury);
+ TQString PS = TQString("ps: @beginspecial %1 @llx %2 @lly %3 @urx %4 @ury").arg(llx).arg(lly).arg(urx).arg(ury);
if (rwi != 0)
- PS.append( TQString(" %1 @rwi").tqarg(rwi) );
+ PS.append( TQString(" %1 @rwi").arg(rwi) );
if (rhi != 0)
- PS.append( TQString(" %1 @rhi").tqarg(rhi) );
+ PS.append( TQString(" %1 @rhi").arg(rhi) );
if (angle != 0)
- PS.append( TQString(" %1 @angle").tqarg(angle) );
+ PS.append( TQString(" %1 @angle").arg(angle) );
if (clip != -1)
PS.append(" @clip");
PS.append( " @setspecial\n" );
@@ -252,7 +252,7 @@ void dviRenderer::prescan_ParsePapersizeSpecial(const TQString& _cp)
dviFile->suggestedPageSize = new pageSize;
dviFile->suggestedPageSize->setPageSize(cp);
} else
- printErrorMsgForSpecials(i18n("The papersize data '%1' could not be parsed.").tqarg(cp));
+ printErrorMsgForSpecials(i18n("The papersize data '%1' could not be parsed.").arg(cp));
return;
}
@@ -297,7 +297,7 @@ void dviRenderer::prescan_ParsePSHeaderSpecial(const TQString& cp)
}
if (TQFile::exists(_file))
- PS_interface->PostScriptHeaderString->append( TQString(" (%1) run\n").tqarg(_file) );
+ PS_interface->PostScriptHeaderString->append( TQString(" (%1) run\n").arg(_file) );
}
@@ -321,7 +321,7 @@ void dviRenderer::prescan_ParsePSQuoteSpecial(const TQString& cp)
double PS_H = (currinf.data.dvi_h*300.0)/(65536*1200)-300;
double PS_V = (currinf.data.dvi_v*300.0)/1200 - 300;
- PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").tqarg(PS_H).tqarg(PS_V) );
+ PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").arg(PS_H).arg(PS_V) );
PostScriptOutPutString->append( " @beginspecial @setspecial \n" );
PostScriptOutPutString->append( cp );
PostScriptOutPutString->append( " @endspecial \n" );
@@ -375,17 +375,17 @@ void dviRenderer::prescan_ParsePSSpecial(const TQString& cp)
double PS_V = (currinf.data.dvi_v*300.0)/1200 - 300;
if (cp.find("ps::[begin]", 0, false) == 0) {
- PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").tqarg(PS_H).tqarg(PS_V) );
- PostScriptOutPutString->append( TQString(" %1\n").tqarg(cp.mid(11)) );
+ PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").arg(PS_H).arg(PS_V) );
+ PostScriptOutPutString->append( TQString(" %1\n").arg(cp.mid(11)) );
} else {
if (cp.find("ps::[end]", 0, false) == 0) {
- PostScriptOutPutString->append( TQString(" %1\n").tqarg(cp.mid(9)) );
+ PostScriptOutPutString->append( TQString(" %1\n").arg(cp.mid(9)) );
} else {
if (cp.find("ps::", 0, false) == 0) {
- PostScriptOutPutString->append( TQString(" %1\n").tqarg(cp.mid(4)) );
+ PostScriptOutPutString->append( TQString(" %1\n").arg(cp.mid(4)) );
} else {
- PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").tqarg(PS_H).tqarg(PS_V) );
- PostScriptOutPutString->append( TQString(" %1\n").tqarg(cp.mid(3)) );
+ PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").arg(PS_H).arg(PS_V) );
+ PostScriptOutPutString->append( TQString(" %1\n").arg(cp.mid(3)) );
}
}
}
@@ -459,22 +459,22 @@ void dviRenderer::prescan_ParsePSFileSpecial(const TQString& cp)
if (TQFile::exists(EPSfilename)) {
double PS_H = (currinf.data.dvi_h*300.0)/(65536*1200)-300;
double PS_V = (currinf.data.dvi_v*300.0)/1200 - 300;
- PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").tqarg(PS_H).tqarg(PS_V) );
+ PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").arg(PS_H).arg(PS_V) );
PostScriptOutPutString->append( "@beginspecial " );
- PostScriptOutPutString->append( TQString(" %1 @llx").tqarg(llx) );
- PostScriptOutPutString->append( TQString(" %1 @lly").tqarg(lly) );
- PostScriptOutPutString->append( TQString(" %1 @urx").tqarg(urx) );
- PostScriptOutPutString->append( TQString(" %1 @ury").tqarg(ury) );
+ PostScriptOutPutString->append( TQString(" %1 @llx").arg(llx) );
+ PostScriptOutPutString->append( TQString(" %1 @lly").arg(lly) );
+ PostScriptOutPutString->append( TQString(" %1 @urx").arg(urx) );
+ PostScriptOutPutString->append( TQString(" %1 @ury").arg(ury) );
if (rwi != 0)
- PostScriptOutPutString->append( TQString(" %1 @rwi").tqarg(rwi) );
+ PostScriptOutPutString->append( TQString(" %1 @rwi").arg(rwi) );
if (rhi != 0)
- PostScriptOutPutString->append( TQString(" %1 @rhi").tqarg(rhi) );
+ PostScriptOutPutString->append( TQString(" %1 @rhi").arg(rhi) );
if (angle != 0)
- PostScriptOutPutString->append( TQString(" %1 @angle").tqarg(angle) );
+ PostScriptOutPutString->append( TQString(" %1 @angle").arg(angle) );
if (clip != -1)
PostScriptOutPutString->append(" @clip");
PostScriptOutPutString->append( " @setspecial \n" );
- PostScriptOutPutString->append( TQString(" (%1) run\n").tqarg(EPSfilename) );
+ PostScriptOutPutString->append( TQString(" (%1) run\n").arg(EPSfilename) );
PostScriptOutPutString->append( "@endspecial \n" );
}
@@ -633,7 +633,7 @@ void dviRenderer::prescan(parseSpecials specialParser)
if (FNTNUM0 <= ch && ch <= (unsigned char) (FNTNUM0 + 63)) {
currinf.fontp = currinf.fonttable->find(ch - FNTNUM0);
if (currinf.fontp == NULL) {
- errorMsg = i18n("The DVI code referred to font #%1, which was not previously defined.").tqarg(ch - FNTNUM0);
+ errorMsg = i18n("The DVI code referred to font #%1, which was not previously defined.").arg(ch - FNTNUM0);
return;
}
currinf.set_char_p = currinf.fontp->set_char_p;
diff --git a/kdvi/dviWidget.cpp b/kdvi/dviWidget.cpp
index a0f43da3..ded6e6cb 100644
--- a/kdvi/dviWidget.cpp
+++ b/kdvi/dviWidget.cpp
@@ -112,7 +112,7 @@ void DVIWidget::mouseMoveEvent(TQMouseEvent* e)
if (cp[i].isDigit() == false)
break;
- emit setStatusBarText( i18n("line %1 of %2").tqarg(cp.left(i)).tqarg(cp.mid(i).simplifyWhiteSpace()) );
+ emit setStatusBarText( i18n("line %1 of %2").arg(cp.left(i)).arg(cp.mid(i).simplifyWhiteSpace()) );
return;
}
}
diff --git a/kdvi/fontEncoding.cpp b/kdvi/fontEncoding.cpp
index 62905030..9f2d4de2 100644
--- a/kdvi/fontEncoding.cpp
+++ b/kdvi/fontEncoding.cpp
@@ -36,7 +36,7 @@ fontEncoding::fontEncoding(const TQString &encName)
encFileName = encFileName.stripWhiteSpace();
if (encFileName.isEmpty()) {
- kdError(4300) << TQString("fontEncoding::fontEncoding(...): The file '%1' could not be found by kpsewhich.").tqarg(encName) << endl;
+ kdError(4300) << TQString("fontEncoding::fontEncoding(...): The file '%1' could not be found by kpsewhich.").arg(encName) << endl;
return;
}
@@ -76,7 +76,7 @@ fontEncoding::fontEncoding(const TQString &encName)
for(; i<256; i++)
glyphNameVector[i] = ".notdef";
} else {
- kdError(4300) << TQString("fontEncoding::fontEncoding(...): The file '%1' could not be opened.").tqarg(encFileName) << endl;
+ kdError(4300) << TQString("fontEncoding::fontEncoding(...): The file '%1' could not be opened.").arg(encFileName) << endl;
return;
}
diff --git a/kdvi/fontEncoding.h b/kdvi/fontEncoding.h
index 95eb4dd0..8ce0d18b 100644
--- a/kdvi/fontEncoding.h
+++ b/kdvi/fontEncoding.h
@@ -20,7 +20,7 @@
* MetaFont fonts. A DVI file referres to a MetaFont font by giving an
* at-most-8-character name, such as 'cmr10'. The DVI previewer would
* then locate the associated PK font file (e.g. cmr10.600pk), load
- * it, and retrieve the character tqshaped.
+ * it, and retrieve the character shaped.
*
* Today TeX is also used to access Type1 and TrueType fonts, which it
* was never designed to do. As in the case of MetaFont font, the DVI
diff --git a/kdvi/fontMap.cpp b/kdvi/fontMap.cpp
index 7dec6f4f..8cbe4a0e 100644
--- a/kdvi/fontMap.cpp
+++ b/kdvi/fontMap.cpp
@@ -98,7 +98,7 @@ fontMap::fontMap()
}
file.close();
} else
- kdError(4300) << TQString("fontMap::fontMap(): The file '%1' could not be opened.").tqarg(map_fileName) << endl;
+ kdError(4300) << TQString("fontMap::fontMap(): The file '%1' could not be opened.").arg(map_fileName) << endl;
#ifdef DEBUG_FONTMAP
kdDebug(4300) << "FontMap file parsed. Results:" << endl;
diff --git a/kdvi/fontMap.h b/kdvi/fontMap.h
index da80b72a..4e02f742 100644
--- a/kdvi/fontMap.h
+++ b/kdvi/fontMap.h
@@ -55,7 +55,7 @@ class fontMapEntry {
* Long time ago, when TeX was only used with MetaFont fonts, the DVI
* file would specify a font by giving an 8-character name, such as
* 'cmr10'. The DVI previewer would then locate the associated PK font
- * file, load it, and retrieve the character tqshaped. Happy times, they
+ * file, load it, and retrieve the character shaped. Happy times, they
* were.
*
* Today TeX is also used to access Type1 and TrueType fonts, which do
diff --git a/kdvi/fontpool.cpp b/kdvi/fontpool.cpp
index 8cd35df7..463d123b 100644
--- a/kdvi/fontpool.cpp
+++ b/kdvi/fontpool.cpp
@@ -187,12 +187,12 @@ TQString fontPool::status()
text.append("<table WIDTH=\"100%\" NOSAVE >");
text.append( TQString("<tr><td><b>%1</b></td> <td><b>%2</b></td> <td><b>%3</b></td> <td><b>%4</b> <td><b>%5</b></td> <td><b>%6</b></td></tr>")
- .tqarg(i18n("TeX Name"))
- .tqarg(i18n("Family"))
- .tqarg(i18n("Zoom"))
- .tqarg(i18n("Type"))
- .tqarg(i18n("Encoding"))
- .tqarg(i18n("Comment")) );
+ .arg(i18n("TeX Name"))
+ .arg(i18n("Family"))
+ .arg(i18n("Zoom"))
+ .arg(i18n("Type"))
+ .arg(i18n("Encoding"))
+ .arg(i18n("Comment")) );
TeXFontDefinition *fontp = fontList.first();
while ( fontp != 0 ) {
@@ -210,12 +210,12 @@ TQString fontPool::status()
#ifdef HAVE_FREETYPE
tmp << TQString ("<tr><td>%1</td> <td>%2</td> <td>%3%</td> <td>%4</td> <td>%5</td> <td>%6</td></tr>")
- .tqarg(fontp->fontname)
- .tqarg(fontp->getFullFontName())
- .tqarg((int)(fontp->enlargement*100 + 0.5))
- .tqarg(fontp->getFontTypeName())
- .tqarg(encoding)
- .tqarg(errMsg);
+ .arg(fontp->fontname)
+ .arg(fontp->getFullFontName())
+ .arg((int)(fontp->enlargement*100 + 0.5))
+ .arg(fontp->getFontTypeName())
+ .arg(encoding)
+ .arg(errMsg);
#endif
fontp=fontList.next();
@@ -280,7 +280,7 @@ void fontPool::locateFonts()
// present an error message to the user.
if (!areFontsLocated()) {
markFontsAsLocated();
- TQString details = TQString("<qt><p><b>PATH:</b> %1</p>%2</qt>").tqarg(getenv("PATH")).tqarg(kpsewhichOutput);
+ TQString details = TQString("<qt><p><b>PATH:</b> %1</p>%2</qt>").arg(getenv("PATH")).arg(kpsewhichOutput);
KMessageBox::detailedError( 0, i18n("<qt><p>KDVI was not able to locate all the font files "
"which are necessary to display the current DVI file. "
"Your document might be unreadable.</p></qt>"),
@@ -330,17 +330,17 @@ void fontPool::locateFonts(bool makePK, bool locateTFMonly, bool *virtualFontsFo
numFontsInJob++;
if (locateTFMonly == true)
- shellProcessCmdLine += KShellProcess::quote(TQString("%1.tfm").tqarg(fontp->fontname));
+ shellProcessCmdLine += KShellProcess::quote(TQString("%1.tfm").arg(fontp->fontname));
else {
#ifdef HAVE_FREETYPE
if (FreeType_could_be_loaded == true) {
const TQString &filename = fontsByTeXName.findFileName(fontp->fontname);
if (!filename.isEmpty())
- shellProcessCmdLine += KShellProcess::quote(TQString("%1").tqarg(filename));
+ shellProcessCmdLine += KShellProcess::quote(TQString("%1").arg(filename));
}
#endif
- shellProcessCmdLine += KShellProcess::quote(TQString("%1.vf").tqarg(fontp->fontname));
- shellProcessCmdLine += KShellProcess::quote(TQString("%1.1200pk").tqarg(fontp->fontname));
+ shellProcessCmdLine += KShellProcess::quote(TQString("%1.vf").arg(fontp->fontname));
+ shellProcessCmdLine += KShellProcess::quote(TQString("%1.1200pk").arg(fontp->fontname));
}
}
fontp=fontList.next();
@@ -363,7 +363,7 @@ void fontPool::locateFonts(bool makePK, bool locateTFMonly, bool *virtualFontsFo
"and your document might by unreadable. If this error is reproducable "
"please report the issue to the KDVI developers using the 'Help' menu.<p>" );
TQApplication::restoreOverrideCursor();
- KMessageBox::error( 0, TQString("<qt>%1%2</qt>").tqarg(importanceOfKPSEWHICH).tqarg(msg),
+ KMessageBox::error( 0, TQString("<qt>%1%2</qt>").arg(importanceOfKPSEWHICH).arg(msg),
i18n("Problem locating fonts - KDVI") );
markFontsAsLocated();
return;
@@ -399,9 +399,9 @@ void fontPool::locateFonts(bool makePK, bool locateTFMonly, bool *virtualFontsFo
"typesetting system. If TeX is not installed on your system, you could install the TeTeX distribution (www.tetex.org). "
"If you are sure that TeX is installed, please try to use the kpsewhich program from the command line to check if it "
"really works.</p>");
- TQString details = TQString("<qt><p><b>PATH:</b> %1</p>%2</qt>").tqarg(getenv("PATH")).tqarg(kpsewhichOutput);
+ TQString details = TQString("<qt><p><b>PATH:</b> %1</p>%2</qt>").arg(getenv("PATH")).arg(kpsewhichOutput);
- KMessageBox::detailedError( 0, TQString("<qt>%1%2</qt>").tqarg(importanceOfKPSEWHICH).tqarg(msg), details,
+ KMessageBox::detailedError( 0, TQString("<qt>%1%2</qt>").arg(importanceOfKPSEWHICH).arg(msg), details,
i18n("Problem locating fonts - KDVI") );
// This makes sure the we don't try to run kpsewhich again
markFontsAsLocated();
@@ -587,7 +587,7 @@ void fontPool::mf_output_receiver(KProcess *, char *buffer, int buflen)
TQString dpi = startLine.mid(secondblank+1,lastblank-secondblank-1);
progress.show();
- progress.increaseNumSteps( i18n("Currently generating %1 at %2 dpi").tqarg(fontName).tqarg(dpi) );
+ progress.increaseNumSteps( i18n("Currently generating %1 at %2 dpi").arg(fontName).arg(dpi) );
}
MetafontOutput = MetafontOutput.remove(0,numleft+1);
}
diff --git a/kdvi/fontprogress.cpp b/kdvi/fontprogress.cpp
index 24810714..d67f8bc3 100644
--- a/kdvi/fontprogress.cpp
+++ b/kdvi/fontprogress.cpp
@@ -14,7 +14,7 @@
#include <tqapplication.h>
#include <tqframe.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqvariant.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
@@ -42,7 +42,7 @@ fontProgressDialog::fontProgressDialog(const TQString& helpIndex, const TQString
TQVBox *page = makeVBoxMainWidget();
TextLabel1 = new TQLabel( label, page, "TextLabel2" );
- TextLabel1->tqsetAlignment( int( TQLabel::AlignCenter ) );
+ TextLabel1->setAlignment( int( TQLabel::AlignCenter ) );
TQWhatsThis::add( TextLabel1, whatsThis );
TQToolTip::add( TextLabel1, ttip );
@@ -55,7 +55,7 @@ fontProgressDialog::fontProgressDialog(const TQString& helpIndex, const TQString
ProgressBar1 = NULL;
TextLabel2 = new TQLabel( "", page, "TextLabel2" );
- TextLabel2->tqsetAlignment( int( TQLabel::AlignCenter ) );
+ TextLabel2->setAlignment( int( TQLabel::AlignCenter ) );
TQWhatsThis::add( TextLabel2, whatsThis );
TQToolTip::add( TextLabel2, ttip );
diff --git a/kdvi/infodialog.cpp b/kdvi/infodialog.cpp
index 97ffef6f..4ac46810 100644
--- a/kdvi/infodialog.cpp
+++ b/kdvi/infodialog.cpp
@@ -10,9 +10,9 @@
#include <klocale.h>
#include <tqfile.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqregexp.h>
-#include <tqtextview.h>
+#include <textview.h>
#include <tqtooltip.h>
#include <tqvariant.h>
#include <tqwhatsthis.h>
@@ -64,17 +64,17 @@ void infoDialog::setDVIData(dvifile *dviFile)
text = i18n("There is no DVI file loaded at the moment.");
else {
text.append("<table WIDTH=\"100%\" NOSAVE >");
- text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").tqarg(i18n("Filename")).tqarg(dviFile->filename));
+ text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").arg(i18n("Filename")).arg(dviFile->filename));
TQFile file(dviFile->filename);
if (file.exists())
- text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").tqarg(i18n("File Size")).tqarg(KIO::convertSize(file.size())));
+ text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").arg(i18n("File Size")).arg(KIO::convertSize(file.size())));
else
- text.append(TQString("<tr><td><b> </b></td> <td>%1</td></tr>").tqarg(i18n("The file does no longer exist.")));
+ text.append(TQString("<tr><td><b> </b></td> <td>%1</td></tr>").arg(i18n("The file does no longer exist.")));
text.append(TQString("<tr><td><b> </b></td> <td> </td></tr>"));
- text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").tqarg(i18n("#Pages")).tqarg(dviFile->total_pages));
- text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").tqarg(i18n("Generator/Date")).tqarg(dviFile->generatorString));
+ text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").arg(i18n("#Pages")).arg(dviFile->total_pages));
+ text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").arg(i18n("Generator/Date")).arg(dviFile->generatorString));
} // else (dviFile == NULL)
TextLabel1->setText( text );
diff --git a/kdvi/kdvi_multipage.cpp b/kdvi/kdvi_multipage.cpp
index e318a160..18a3df78 100644
--- a/kdvi/kdvi_multipage.cpp
+++ b/kdvi/kdvi_multipage.cpp
@@ -161,7 +161,7 @@ void KDVIMultiPage::slotSave()
fileName = fileName+ending;
if (TQFile(fileName).exists()) {
- int r = KMessageBox::warningContinueCancel (0, i18n("The file %1\nexists. Do you want to overwrite that file?").tqarg(fileName),
+ int r = KMessageBox::warningContinueCancel (0, i18n("The file %1\nexists. Do you want to overwrite that file?").arg(fileName),
i18n("Overwrite File"), i18n("Overwrite"));
if (r == KMessageBox::Cancel)
return;
@@ -239,7 +239,7 @@ void KDVIMultiPage::print()
// Show the printer options dialog. Return immediately if the user
// aborts.
- if (!printer->setup(parentWdg, i18n("Print %1").tqarg(m_file.section('/', -1)) ))
+ if (!printer->setup(parentWdg, i18n("Print %1").arg(m_file.section('/', -1)) ))
return;
// This funny method call is necessary for the KPrinter to return
@@ -379,7 +379,7 @@ void KDVIMultiPage::print()
dvips_options += TQString(",");
else
commaflag = 1;
- dvips_options += TQString("%1").tqarg(*it);
+ dvips_options += TQString("%1").arg(*it);
}
// Now print. For that, export the DVI-File to PostScript. Note that
diff --git a/kdvi/main.cpp b/kdvi/main.cpp
index f10501bd..af7bc928 100644
--- a/kdvi/main.cpp
+++ b/kdvi/main.cpp
@@ -77,14 +77,14 @@ int main(int argc, char** argv)
if (!url.isValid())
{
- kdError(4300) << TQString(I18N_NOOP("The URL %1 is not well-formed.")).tqarg(args->arg(0)) << endl;
+ kdError(4300) << TQString(I18N_NOOP("The URL %1 is not well-formed.")).arg(args->arg(0)) << endl;
return -1;
}
if (!url.isLocalFile())
{
kdError(4300) << TQString(I18N_NOOP("The URL %1 does not point to a local file. You can only specify local "
- "files if you are using the '--unique' option.")).tqarg(args->arg(0)) << endl;
+ "files if you are using the '--unique' option.")).arg(args->arg(0)) << endl;
return -1;
}
diff --git a/kdvi/optionDialogFontsWidget_base.ui b/kdvi/optionDialogFontsWidget_base.ui
index 766f6b98..bb7e18f4 100644
--- a/kdvi/optionDialogFontsWidget_base.ui
+++ b/kdvi/optionDialogFontsWidget_base.ui
@@ -44,7 +44,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>121</height>
diff --git a/kdvi/optionDialogSpecialWidget_base.ui b/kdvi/optionDialogSpecialWidget_base.ui
index e821d761..4610984b 100644
--- a/kdvi/optionDialogSpecialWidget_base.ui
+++ b/kdvi/optionDialogSpecialWidget_base.ui
@@ -169,7 +169,7 @@
<property name="text">
<string>What is 'inverse search'? </string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="url" stdset="0">
@@ -186,7 +186,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>390</width>
<height>21</height>
diff --git a/kdvi/psgs.cpp b/kdvi/psgs.cpp
index 9f1f925f..d7f087e4 100644
--- a/kdvi/psgs.cpp
+++ b/kdvi/psgs.cpp
@@ -211,11 +211,11 @@ void ghostscript_interface::gs_generate_graphics_file(const PageNumber& page, co
TQStringList argus;
argus << "gs";
argus << "-dSAFER" << "-dPARANOIDSAFER" << "-dDELAYSAFER" << "-dNOPAUSE" << "-dBATCH";
- argus << TQString("-sDEVICE=%1").tqarg(*gsDevice);
- argus << TQString("-sOutputFile=%1").tqarg(filename);
- argus << TQString("-sExtraIncludePath=%1").tqarg(includePath);
- argus << TQString("-g%1x%2").tqarg(pixel_page_w).tqarg(pixel_page_h); // page size in pixels
- argus << TQString("-r%1").tqarg(resolution); // resolution in dpi
+ argus << TQString("-sDEVICE=%1").arg(*gsDevice);
+ argus << TQString("-sOutputFile=%1").arg(filename);
+ argus << TQString("-sExtraIncludePath=%1").arg(includePath);
+ argus << TQString("-g%1x%2").arg(pixel_page_w).arg(pixel_page_h); // page size in pixels
+ argus << TQString("-r%1").arg(resolution); // resolution in dpi
argus << "-c" << "<< /PermitFileReading [ ExtraIncludePath ] /PermitFileWriting [] /PermitFileControl [] >> setuserparams .locksafe";
argus << "-f" << PSfile.name();
@@ -241,7 +241,7 @@ void ghostscript_interface::gs_generate_graphics_file(const PageNumber& page, co
while(proc.readln(GSoutput) != -1) {
if (GSoutput.contains("Unknown device")) {
kdDebug(4300) << TQString("The version of ghostview installed on this computer does not support "
- "the '%1' ghostview device driver.").tqarg(*gsDevice) << endl;
+ "the '%1' ghostview device driver.").arg(*gsDevice) << endl;
knownDevices.remove(gsDevice);
gsDevice = knownDevices.begin();
if (knownDevices.isEmpty())
@@ -267,7 +267,7 @@ void ghostscript_interface::gs_generate_graphics_file(const PageNumber& page, co
"drivers. Note that KDVI needs to be restarted to re-enable PostScript support."
"</p></qt>"));
else {
- kdDebug(4300) << TQString("KDVI will now try to use the '%1' device driver.").tqarg(*gsDevice) << endl;
+ kdDebug(4300) << TQString("KDVI will now try to use the '%1' device driver.").arg(*gsDevice) << endl;
gs_generate_graphics_file(page, filename, magnification);
}
return;
diff --git a/kdvi/special.cpp b/kdvi/special.cpp
index 918b7352..48c99ec8 100644
--- a/kdvi/special.cpp
+++ b/kdvi/special.cpp
@@ -222,7 +222,7 @@ void dviRenderer::color_special(const TQString& _cp)
// Take color off the stack
if (colorStack.isEmpty())
printErrorMsgForSpecials( i18n("Error in DVIfile '%1', page %2. Color pop command issued when the color stack is empty." ).
- tqarg(dviFile->filename).tqarg(current_page));
+ arg(dviFile->filename).arg(current_page));
else
colorStack.pop();
return;
@@ -308,7 +308,7 @@ void parse_special_argument(const TQString& strg, const char* argument_name, int
// Maybe we should open a dialog here.
kdError(4300) << i18n("Malformed parameter in the epsf special command.\n"
"Expected a float to follow %1 in %2")
- .tqarg(argument_name).tqarg(strg) << endl;
+ .arg(argument_name).arg(strg) << endl;
}
}
@@ -432,7 +432,7 @@ void dviRenderer::epsf_special(const TQString& cp)
foreGroundPainter->drawText (bbox, (int)(TQt::AlignCenter), EPSfilename_orig, -1);
else
foreGroundPainter->drawText (bbox, (int)(TQt::AlignCenter),
- i18n("File not found: \n %1").tqarg(EPSfilename_orig), -1);
+ i18n("File not found: \n %1").arg(EPSfilename_orig), -1);
foreGroundPainter->restore();
}
@@ -453,7 +453,7 @@ void dviRenderer::TPIC_flushPath_special()
TQPen pen(TQt::black, (int)(penWidth_in_mInch*resolutionInDPI/1000.0 + 0.5)); // Sets the pen size in milli-inches
foreGroundPainter->setPen(pen);
- foreGroundPainter->tqdrawPolyline(TPIC_path, 0, number_of_elements_in_path);
+ foreGroundPainter->drawPolyline(TPIC_path, 0, number_of_elements_in_path);
number_of_elements_in_path = 0;
}
@@ -469,12 +469,12 @@ void dviRenderer::TPIC_addPath_special(const TQString& cp)
bool ok;
float xKoord = cp_noWhiteSpace.section(' ', 0, 0).toFloat(&ok);
if (ok == false) {
- printErrorMsgForSpecials( TQString("TPIC special; cannot parse first argument in 'pn %1'.").tqarg(cp) );
+ printErrorMsgForSpecials( TQString("TPIC special; cannot parse first argument in 'pn %1'.").arg(cp) );
return;
}
float yKoord = cp_noWhiteSpace.section(' ', 1, 1).toFloat(&ok);
if (ok == false) {
- printErrorMsgForSpecials( TQString("TPIC special; cannot parse second argument in 'pn %1'.").tqarg(cp) );
+ printErrorMsgForSpecials( TQString("TPIC special; cannot parse second argument in 'pn %1'.").arg(cp) );
return;
}
@@ -502,7 +502,7 @@ void dviRenderer::TPIC_setPen_special(const TQString& cp)
bool ok;
penWidth_in_mInch = cp.stripWhiteSpace().toFloat(&ok);
if (ok == false) {
- printErrorMsgForSpecials( TQString("TPIC special; cannot parse argument in 'pn %1'.").tqarg(cp) );
+ printErrorMsgForSpecials( TQString("TPIC special; cannot parse argument in 'pn %1'.").arg(cp) );
penWidth_in_mInch = 0.0;
return;
}
@@ -700,7 +700,7 @@ void dviRenderer::applicationDoSpecial(char *cp)
foreGroundPainter->translate(-x,-y);
} else
printErrorMsgForSpecials( i18n("Error in DVIfile '%1', page %2. Could not interpret angle in text rotation special." ).
- tqarg(dviFile->filename).tqarg(current_page));
+ arg(dviFile->filename).arg(current_page));
}
// The graphicx package marks the end of rotated text with this
@@ -722,6 +722,6 @@ void dviRenderer::applicationDoSpecial(char *cp)
(strncasecmp(cp, "background", 10) == 0) )
return;
- printErrorMsgForSpecials(i18n("The special command '%1' is not implemented.").tqarg(special_command));
+ printErrorMsgForSpecials(i18n("The special command '%1' is not implemented.").arg(special_command));
return;
}
diff --git a/kdvi/vf.cpp b/kdvi/vf.cpp
index b6da55c0..6e8f7a41 100644
--- a/kdvi/vf.cpp
+++ b/kdvi/vf.cpp
@@ -177,7 +177,7 @@ void TeXFontDefinition::read_VF_index()
}
}
if (cmnd != POST)
- oops(i18n("Wrong command byte found in VF macro list: %1").tqarg(cmnd));
+ oops(i18n("Wrong command byte found in VF macro list: %1").arg(cmnd));
fclose (VF_file);
file = NULL;
diff --git a/kfax/faxinput.cpp b/kfax/faxinput.cpp
index e37e9dd7..40ae2a41 100644
--- a/kfax/faxinput.cpp
+++ b/kfax/faxinput.cpp
@@ -110,7 +110,7 @@ notetiff(const char *name)
if ((tf = fopen(name, "r")) == NULL) {
- TQString mesg = i18n("Unable to open:\n%1\n").tqarg(TQFile::decodeName(name));
+ TQString mesg = i18n("Unable to open:\n%1\n").arg(TQFile::decodeName(name));
kfaxerror(i18n("Sorry"), mesg);
return 0;
}
@@ -147,7 +147,7 @@ notetiff(const char *name)
if (fseek(tf, IFDoff, SEEK_SET) < 0) {
realbad:
- str = i18n("Invalid tiff file:\n%1\n").tqarg(TQFile::decodeName(name));
+ str = i18n("Invalid tiff file:\n%1\n").arg(TQFile::decodeName(name));
kfaxerror(i18n("Sorry"),str);
bad:
if (strips)
@@ -249,7 +249,7 @@ notetiff(const char *name)
case 279: /* StripByteCounts */
if (count != nstrips) {
str = i18n("In file %1\nStripsPerImage tag 273=%2,tag279=%3\n")
- .tqarg(TQFile::decodeName(name)).tqarg(nstrips).tqarg(count);
+ .arg(TQFile::decodeName(name)).arg(nstrips).arg(count);
kfaxerror(i18n("Message"),str);
goto realbad;
}
@@ -419,7 +419,7 @@ getstrip(struct pagenode *pn, int strip)
pn->length = pn->strips[strip].size;
}
else {
- str = i18n("Trying to expand too many strips\n%1%n").tqarg(TQFile::decodeName(pn->pathname));
+ str = i18n("Trying to expand too many strips\n%1%n").arg(TQFile::decodeName(pn->pathname));
kfaxerror(i18n("Warning"),str);
return NULL;
}
@@ -448,7 +448,7 @@ getstrip(struct pagenode *pn, int strip)
/* handle ghostscript / PC Research fax file */
if (Data[24] != 1 || Data[25] != 0){
str = i18n("Only the first page of the PC Research multipage file\n%1\nwill be shown\n")
- .tqarg(TQFile::decodeName(pn->pathname));
+ .arg(TQFile::decodeName(pn->pathname));
kfaxerror(i18n("Message"),str);
}
pn->length -= 64;
@@ -462,7 +462,7 @@ getstrip(struct pagenode *pn, int strip)
pn->height = G3count(pn, pn->expander == g32expand);
if (pn->height == 0) {
- str = i18n("No fax found in file:\n%1\n").tqarg(TQFile::decodeName(pn->pathname));
+ str = i18n("No fax found in file:\n%1\n").arg(TQFile::decodeName(pn->pathname));
kfaxerror(i18n("Sorry"),str);
errno = 0;
badfile(pn);
diff --git a/kfax/kfax.cpp b/kfax/kfax.cpp
index 1a97400c..bbc9121a 100644
--- a/kfax/kfax.cpp
+++ b/kfax/kfax.cpp
@@ -701,7 +701,7 @@ void TopLevel::print(){
printer.setFullPage( true );
printer.setUsePrinterResolution( true );
printer.setCreator( i18n("KFax") + " " KFAXVERSION );
- printer.setDocName( TQString("%1 - %2").tqarg(firstpage->name).tqarg(i18n("KFax")));
+ printer.setDocName( TQString("%1 - %2").arg(firstpage->name).arg(i18n("KFax")));
printer.setDocFileName( firstpage->name );
printer.setPageSelection( KPrinter::ApplicationSide );
printer.setMinMax( 1, pages );
@@ -792,11 +792,11 @@ void TopLevel::printIt( KPrinter &printer, TQPainter &painter )
TQSize scaledImageSize = size;
if (size.width() > maxSize.width() || size.height() > maxSize.height() ) {
// Image does not fit - scale it and print centered
- scaledImageSize.tqscale( maxSize, TQSize::ScaleMin );
+ scaledImageSize.scale( maxSize, TQSize::ScaleMin );
kdDebug() << "Image does not fit - scaling to " << maxSize << endl;
} else {
// Image does fit - print it in original size, but centered
- scaledImageSize.tqscale( size, TQSize::ScaleMin );
+ scaledImageSize.scale( size, TQSize::ScaleMin );
kdDebug() << "Image does fit - scaling to " << size << endl;
}
kdDebug() << "Final image size " << scaledImageSize << endl;
@@ -846,7 +846,7 @@ void TopLevel::openNetFile( const KURL &u)
if ( u.isLocalFile() )
{
- TQString string = i18n("Loading '%1'").tqarg(u.path());
+ TQString string = i18n("Loading '%1'").arg(u.path());
statusbar->message(string);
openadd( u.path());
statusbar->clear();
@@ -1441,17 +1441,17 @@ void TopLevel::uiUpdate(){
currentpage = pages;
}
- TQString pagestr = i18n("Page: %1 of %2").tqarg(currentpage).tqarg(pages);
+ TQString pagestr = i18n("Page: %1 of %2").arg(currentpage).arg(pages);
statusbar->changeItem(pagestr, ID_PAGE_NO);
if(Image){
- TQString wh = i18n("W: %1 H: %2").tqarg(Image->width).tqarg(Image->height);
+ TQString wh = i18n("W: %1 H: %2").arg(Image->width).arg(Image->height);
statusbar->changeItem(wh, ID_INS_OVR);
}
- TQString resolution = i18n("Res: %1").tqarg(thispage->vres?i18n("Fine"):i18n("Normal"));
- // TODO: resolution += TQString("%1x%2").tqarg(thispage->dpiX).tqarg(thispage->dpiY);
+ TQString resolution = i18n("Res: %1").arg(thispage->vres?i18n("Fine"):i18n("Normal"));
+ // TODO: resolution += TQString("%1x%2").arg(thispage->dpiX).arg(thispage->dpiY);
statusbar->changeItem(resolution, ID_GENERAL);
statusbar->changeItem(thispage->name, ID_FNAME);
diff --git a/kfax/kfax_printsettings.cpp b/kfax/kfax_printsettings.cpp
index 5382c2e5..53fc6537 100644
--- a/kfax/kfax_printsettings.cpp
+++ b/kfax/kfax_printsettings.cpp
@@ -21,7 +21,7 @@
#include <klocale.h>
#include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqwhatsthis.h>
KFAXPrintSettings::KFAXPrintSettings(TQWidget *parent, const char *name)
diff --git a/kfax/options.cpp b/kfax/options.cpp
index 053bf162..dab7325b 100644
--- a/kfax/options.cpp
+++ b/kfax/options.cpp
@@ -27,7 +27,7 @@
#include <stdio.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <klocale.h>
#include <knuminput.h>
#include <tqdir.h>
@@ -60,28 +60,28 @@ OptionsDialog::OptionsDialog( TQWidget *parent, const char *name)
bg->setColumnLayout( 0, Qt::Horizontal );
mainLayout->addWidget( bg );
- TQVBoxLayout *vbl = new TQVBoxLayout(bg->tqlayout());
+ TQVBoxLayout *vbl = new TQVBoxLayout(bg->layout());
TQHBoxLayout *hbl1 = new TQHBoxLayout();
vbl->addLayout( hbl1 );
displaylabel = new TQLabel(i18n("Display options:"), bg,"displaylabel");
- displaylabel->setFixedSize( displaylabel->tqsizeHint() );
+ displaylabel->setFixedSize( displaylabel->sizeHint() );
hbl1->addWidget( displaylabel );
landscape = new TQCheckBox(i18n("Landscape"), bg,"Landscape");
- landscape->setFixedSize( landscape->tqsizeHint() );
+ landscape->setFixedSize( landscape->sizeHint() );
hbl1->addSpacing( 10 );
hbl1->addWidget( landscape );
flip = new TQCheckBox(i18n("Upside down"), bg,"upsidedown");
- flip->setFixedSize( flip->tqsizeHint() );
+ flip->setFixedSize( flip->sizeHint() );
hbl1->addSpacing( 10 );
hbl1->addWidget( flip );
invert = new TQCheckBox(i18n("Invert"), bg,"invert");
- invert->setFixedSize( invert->tqsizeHint() );
+ invert->setFixedSize( invert->sizeHint() );
hbl1->addSpacing( 10 );
hbl1->addWidget( invert );
@@ -139,7 +139,7 @@ OptionsDialog::OptionsDialog( TQWidget *parent, const char *name)
rawgroup->setFrameStyle(TQFrame::NoFrame);
rawlabel = new TQLabel(i18n("Raw fax format:"),rawgroup,"rawlabel");
- rawlabel->setFixedSize( rawlabel->tqsizeHint() );
+ rawlabel->setFixedSize( rawlabel->sizeHint() );
hbl4->addWidget( rawlabel );
g3 = new TQRadioButton("G3",rawgroup,"g3");
diff --git a/kfaxview/faxrenderer.cpp b/kfaxview/faxrenderer.cpp
index b109c1f5..0061d673 100644
--- a/kfaxview/faxrenderer.cpp
+++ b/kfaxview/faxrenderer.cpp
@@ -136,7 +136,7 @@ bool FaxRenderer::setFile(const TQString &fname, const KURL &)
TQString filename = fi.absFilePath();
if (!fi.exists() || fi.isDir()) {
KMessageBox::error( parentWidget,
- i18n("<qt><strong>File error.</strong> The specified file '%1' does not exist.</qt>").tqarg(filename),
+ i18n("<qt><strong>File error.</strong> The specified file '%1' does not exist.</qt>").arg(filename),
i18n("File Error"));
// the return value 'false' indicates that this operation was not successful.
mutex.unlock();
@@ -157,11 +157,11 @@ bool FaxRenderer::setFile(const TQString &fname, const KURL &)
// this case gracefully.
if (fax.errorString().isEmpty())
KMessageBox::error( parentWidget,
- i18n("<qt><strong>File error.</strong> The specified file '%1' could not be loaded.</qt>").tqarg(filename),
+ i18n("<qt><strong>File error.</strong> The specified file '%1' could not be loaded.</qt>").arg(filename),
i18n("File Error"));
else
KMessageBox::detailedError( parentWidget,
- i18n("<qt><strong>File error.</strong> The specified file '%1' could not be loaded.</qt>").tqarg(filename),
+ i18n("<qt><strong>File error.</strong> The specified file '%1' could not be loaded.</qt>").arg(filename),
fax.errorString(),
i18n("File Error"));
clear();
diff --git a/kfaxview/libkfaximage/kfaximage.cpp b/kfaxview/libkfaximage/kfaximage.cpp
index 0d35f8d7..a3570209 100644
--- a/kfaxview/libkfaximage/kfaximage.cpp
+++ b/kfaxview/libkfaximage/kfaximage.cpp
@@ -41,7 +41,7 @@ static const char bigTIFF[] = "\x4d\x4d\x00\x2a";
KFaxImage::KFaxImage( const TQString &filename, TQObject *parent, const char *name )
: TQObject(parent,name)
{
- KGlobal::locale()->insertCatalogue( TQString::tqfromLatin1("libkfaximage") );
+ KGlobal::locale()->insertCatalogue( TQString::fromLatin1("libkfaximage") );
loadImage(filename);
}
@@ -327,7 +327,7 @@ KFaxImage::notetiff()
case 279: /* StripByteCounts */
if (count != nstrips) {
str = i18n("In file %1\nStripsPerImage tag 273=%2,tag279=%3\n")
- .tqarg(filename()).tqarg(nstrips).tqarg(count);
+ .arg(filename()).arg(nstrips).arg(count);
kfaxerror(str);
goto realbad;
}
@@ -403,7 +403,7 @@ KFaxImage::notetiff()
void
KFaxImage::badfile(pagenode *pn)
{
- kfaxerror(i18n("%1: Bad Fax File").tqarg(filename()));
+ kfaxerror(i18n("%1: Bad Fax File").arg(filename()));
FreeImage(pn);
}
diff --git a/kfaxview/main.cpp b/kfaxview/main.cpp
index 9227d0a0..05692315 100644
--- a/kfaxview/main.cpp
+++ b/kfaxview/main.cpp
@@ -97,14 +97,14 @@ int main(int argc, char** argv)
if (!url.isValid())
{
- kdError(4300) << TQString(I18N_NOOP("The URL %1 is not well-formed.")).tqarg(args->arg(0)) << endl;
+ kdError(4300) << TQString(I18N_NOOP("The URL %1 is not well-formed.")).arg(args->arg(0)) << endl;
return -1;
}
if (!url.isLocalFile())
{
kdError(4300) << TQString(I18N_NOOP("The URL %1 does not point to a local file. You can only specify local "
- "files if you are using the '--unique' option.")).tqarg(args->arg(0)) << endl;
+ "files if you are using the '--unique' option.")).arg(args->arg(0)) << endl;
return -1;
}
diff --git a/kfile-plugins/dependencies/poppler-tqt/poppler-document.cc b/kfile-plugins/dependencies/poppler-tqt/poppler-document.cc
index 5fe6ea28..a13fd99a 100644
--- a/kfile-plugins/dependencies/poppler-tqt/poppler-document.cc
+++ b/kfile-plugins/dependencies/poppler-tqt/poppler-document.cc
@@ -190,7 +190,7 @@ TQString Document::getInfo( const TQString & type ) const
u = s1->getChar(i) & 0xff;
++i;
}
- result += tqunicodeToTQString( &u, 1 );
+ result += unicodeToTQString( &u, 1 );
}
obj.free();
info.free();
diff --git a/kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.cc b/kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.cc
index 9998f738..cde8818d 100644
--- a/kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.cc
+++ b/kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.cc
@@ -68,7 +68,7 @@ int PageTransition::duration() const
return data->pt->getDuration();
}
-PageTransition::Alignment PageTransition::tqalignment() const
+PageTransition::Alignment PageTransition::alignment() const
{
return (Poppler::PageTransition::Alignment)data->pt->getAlignment();
}
diff --git a/kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.h b/kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.h
index f33a014c..53002ff9 100644
--- a/kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.h
+++ b/kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.h
@@ -60,7 +60,7 @@ class PageTransition {
Fade
};
- /** \brief tqalignment of the transition effect that shall be used
+ /** \brief alignment of the transition effect that shall be used
*/
// if changed remember to keep in sync with PageTransition.h enum
enum Alignment {
@@ -114,7 +114,7 @@ class PageTransition {
/**
\brief Get dimension in which the transition effect occurs.
*/
- Alignment tqalignment() const;
+ Alignment alignment() const;
/**
\brief Get direction of motion of the transition effect.
diff --git a/kfile-plugins/dependencies/poppler-tqt/poppler-private.cc b/kfile-plugins/dependencies/poppler-tqt/poppler-private.cc
index 445417a2..7e366014 100644
--- a/kfile-plugins/dependencies/poppler-tqt/poppler-private.cc
+++ b/kfile-plugins/dependencies/poppler-tqt/poppler-private.cc
@@ -31,11 +31,11 @@
namespace Poppler {
/* borrowed from kpdf */
-TQString tqunicodeToTQString(Unicode* u, int len)
+TQString unicodeToTQString(Unicode* u, int len)
{
TQString ret;
ret.setLength(len);
- TQChar* qch = (TQChar*) ret.tqunicode();
+ TQChar* qch = (TQChar*) ret.unicode();
for (;len;--len)
*qch++ = (TQChar) *u++;
return ret;
@@ -69,7 +69,7 @@ TQString UnicodeParsedString(GooString *s1)
u = s1->getChar(i) & 0xff;
++i;
}
- result += tqunicodeToTQString( &u, 1 );
+ result += unicodeToTQString( &u, 1 );
}
return result;
}
@@ -79,7 +79,7 @@ GooString *TQStringToGooString(const TQString &s)
int len = s.length();
char *cstring = (char *)gmallocn(s.length(), sizeof(char));
for (int i = 0; i < len; ++i)
- cstring[i] = s.tqat(i).tqunicode();
+ cstring[i] = s.at(i).unicode();
GooString *ret = new GooString(cstring, len);
gfree(cstring);
return ret;
@@ -98,7 +98,7 @@ void DocumentData::addTocChildren( TQDomDocument * docSyn, TQDomNode * parent, G
TQString name;
Unicode * uniChar = outlineItem->getTitle();
int titleLength = outlineItem->getTitleLength();
- name = tqunicodeToTQString(uniChar, titleLength);
+ name = unicodeToTQString(uniChar, titleLength);
if ( name.isEmpty() )
continue;
@@ -136,11 +136,11 @@ void DocumentData::addTocChildren( TQDomDocument * docSyn, TQDomNode * parent, G
}
}
- // 3. recursively descend over tqchildren
+ // 3. recursively descend over children
outlineItem->open();
- GooList * tqchildren = outlineItem->getKids();
- if ( tqchildren )
- addTocChildren( docSyn, &item, tqchildren );
+ GooList * children = outlineItem->getKids();
+ if ( children )
+ addTocChildren( docSyn, &item, children );
}
}
diff --git a/kfile-plugins/dependencies/poppler-tqt/poppler-private.h b/kfile-plugins/dependencies/poppler-tqt/poppler-private.h
index 8152ffd8..9e9e3292 100644
--- a/kfile-plugins/dependencies/poppler-tqt/poppler-private.h
+++ b/kfile-plugins/dependencies/poppler-tqt/poppler-private.h
@@ -39,7 +39,7 @@ namespace Poppler {
class DocumentData;
-TQString tqunicodeToTQString(Unicode* u, int len);
+TQString unicodeToTQString(Unicode* u, int len);
TQString UnicodeParsedString(GooString *s1);
diff --git a/kfile-plugins/exr/kfile_exr.cpp b/kfile-plugins/exr/kfile_exr.cpp
index 0a85a728..639ac0df 100644
--- a/kfile-plugins/exr/kfile_exr.cpp
+++ b/kfile-plugins/exr/kfile_exr.cpp
@@ -237,10 +237,10 @@ bool KExrPlugin::readInfo( KFileMetaInfo& info, uint what)
#endif
TQString UTCOffset;
if (utcOffset(h)>0.0) {
- UTCOffset.append(TQString("%1").tqarg(utcOffset(h)/3600, 0, 'f', 1));
+ UTCOffset.append(TQString("%1").arg(utcOffset(h)/3600, 0, 'f', 1));
UTCOffset.append(" hours behind UTC");
} else {
- UTCOffset.append(TQString("%1").tqarg(-1.0*utcOffset(h)/3600, 0, 'f', 1));
+ UTCOffset.append(TQString("%1").arg(-1.0*utcOffset(h)/3600, 0, 'f', 1));
UTCOffset.append(" hours ahead of UTC");
}
appendItem( stdgroup, "UTC Offset", UTCOffset);
@@ -264,10 +264,10 @@ bool KExrPlugin::readInfo( KFileMetaInfo& info, uint what)
if ( hasLongitude(h) ) {
TQString Longitude;
if (longitude(h)<0.0) {
- Longitude.append(TQString("%1").tqarg(-1.0*longitude(h),0,'f',3));
+ Longitude.append(TQString("%1").arg(-1.0*longitude(h),0,'f',3));
Longitude.append(" deg West");
} else {
- Longitude.append(TQString("%1").tqarg(longitude(h),0,'f',3));
+ Longitude.append(TQString("%1").arg(longitude(h),0,'f',3));
Longitude.append(" deg East");
}
appendItem( stdgroup, "Longitude", Longitude);
@@ -275,17 +275,17 @@ bool KExrPlugin::readInfo( KFileMetaInfo& info, uint what)
if ( hasLatitude(h) ) {
TQString Latitude;
if (latitude(h)<0.0) {
- Latitude.append(TQString("%1").tqarg(-1.0*latitude(h),0,'f',3));
+ Latitude.append(TQString("%1").arg(-1.0*latitude(h),0,'f',3));
Latitude.append(" deg South");
} else {
- Latitude.append(TQString("%1").tqarg(latitude(h),0,'f',3));
+ Latitude.append(TQString("%1").arg(latitude(h),0,'f',3));
Latitude.append(" deg North");
}
appendItem( stdgroup, "Latitude", Latitude );
}
if ( hasAltitude(h) ) {
double Altitude = altitude(h);
- appendItem( stdgroup, "Altitude", TQString("%1").tqarg(Altitude,0,'f',1) );
+ appendItem( stdgroup, "Altitude", TQString("%1").arg(Altitude,0,'f',1) );
}
if ( hasIsoSpeed(h) ) {
double IsoSpeed = isoSpeed(h);
diff --git a/kfile-plugins/gif/gif-info.1 b/kfile-plugins/gif/gif-info.1
index f5397472..6c36b1c4 100644
--- a/kfile-plugins/gif/gif-info.1
+++ b/kfile-plugins/gif/gif-info.1
@@ -15,7 +15,7 @@ displays information about the given gif (Graphic Interchange Format) image. If
.PP
Write a empty comment ('') to delete the comment block.
.PP
-The GIF standard allows any number of 256 byte comment blocks in an image file, but most implementations (including this one) restrict you to just one block. The GIF standard restricts comment blocks to "7 Bit ASCII", but this is widely ignored. You are welcome to store text in your own native language, and are especially encouraged to use comments in utf-8 tqunicode format.
+The GIF standard allows any number of 256 byte comment blocks in an image file, but most implementations (including this one) restrict you to just one block. The GIF standard restricts comment blocks to "7 Bit ASCII", but this is widely ignored. You are welcome to store text in your own native language, and are especially encouraged to use comments in utf-8 unicode format.
.SH "SEE ALSO"
.BR wrjpgcom (1)
diff --git a/kfile-plugins/jpeg/exif.cpp b/kfile-plugins/jpeg/exif.cpp
index 6c621477..f4803705 100644
--- a/kfile-plugins/jpeg/exif.cpp
+++ b/kfile-plugins/jpeg/exif.cpp
@@ -525,11 +525,11 @@ void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBa
switch(Tag){
case TAG_MAKE:
- ExifData::CameraMake = TQString::tqfromLatin1((const char*)ValuePtr, 31);
+ ExifData::CameraMake = TQString::fromLatin1((const char*)ValuePtr, 31);
break;
case TAG_MODEL:
- ExifData::CameraModel = TQString::tqfromLatin1((const char*)ValuePtr, 39);
+ ExifData::CameraModel = TQString::fromLatin1((const char*)ValuePtr, 39);
break;
case TAG_ORIENTATION:
@@ -537,7 +537,7 @@ void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBa
break;
case TAG_DATETIME_ORIGINAL:
- DateTime = TQString::tqfromLatin1((const char*)ValuePtr, 19);
+ DateTime = TQString::fromLatin1((const char*)ValuePtr, 19);
break;
case TAG_USERCOMMENT:
@@ -558,12 +558,12 @@ void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBa
int c;
c = (ValuePtr)[a];
if (c != '\0' && c != ' '){
- UserComment = TQString::tqfromLatin1((const char*)(a+ValuePtr), 199);
+ UserComment = TQString::fromLatin1((const char*)(a+ValuePtr), 199);
break;
}
}
}else{
- UserComment = TQString::tqfromLatin1((const char*)ValuePtr, 199);
+ UserComment = TQString::fromLatin1((const char*)ValuePtr, 199);
}
break;
@@ -803,7 +803,7 @@ void ExifData::process_EXIF(unsigned char * CharBuf, unsigned int length)
// printf("Exif section in Motorola order\n");
MotorolaOrder = 1;
}else{
- throw FatalError("Invalid Exif tqalignment marker.");
+ throw FatalError("Invalid Exif alignment marker.");
}
}
diff --git a/kfile-plugins/jpeg/kfile_jpeg.cpp b/kfile-plugins/jpeg/kfile_jpeg.cpp
index 5bbd394d..6f187c8e 100644
--- a/kfile-plugins/jpeg/kfile_jpeg.cpp
+++ b/kfile-plugins/jpeg/kfile_jpeg.cpp
@@ -178,7 +178,7 @@ bool KJpegPlugin::writeInfo( const KFileMetaInfo& info ) const
*/
/*
The jpeg standard does not regulate the contents of the COM block.
- I'm assuming the best thing to do here is write as tqunicode utf-8,
+ I'm assuming the best thing to do here is write as unicode utf-8,
which is fully backwards compatible with readers expecting ascii.
Readers expecting a national character set are out of luck...
*/
diff --git a/kfile-plugins/pdf/kfile_pdf.cpp b/kfile-plugins/pdf/kfile_pdf.cpp
index 89e46297..a3dcbde7 100644
--- a/kfile-plugins/pdf/kfile_pdf.cpp
+++ b/kfile-plugins/pdf/kfile_pdf.cpp
@@ -83,16 +83,16 @@ bool KPdfPlugin::readInfo( KFileMetaInfo& info, uint /* what */)
if (doc->isEncrypted())
{
enc = i18n("Yes (Can Print:%1 Can Copy:%2 Can Change:%3 Can Add notes:%4)")
- .tqarg(doc->okToPrint() ? i18n("Yes") : i18n("No"))
- .tqarg(doc->okToCopy() ? i18n("Yes") : i18n("No"))
- .tqarg(doc->okToChange() ? i18n("Yes") : i18n("No"))
- .tqarg(doc->okToAddNotes() ? i18n("Yes") : i18n("No"));
+ .arg(doc->okToPrint() ? i18n("Yes") : i18n("No"))
+ .arg(doc->okToCopy() ? i18n("Yes") : i18n("No"))
+ .arg(doc->okToChange() ? i18n("Yes") : i18n("No"))
+ .arg(doc->okToAddNotes() ? i18n("Yes") : i18n("No"));
}
else enc = i18n("No");
appendItem(generalGroup, "Protected", enc );
appendItem(generalGroup, "Linearized", doc->isLinearized() ? i18n("Yes") : i18n("No") );
- TQString versionString = TQString("%1").tqarg( doc->getPDFVersion(), 0, 'f', 1 );
+ TQString versionString = TQString("%1").arg( doc->getPDFVersion(), 0, 'f', 1 );
appendItem(generalGroup, "Version", versionString );
delete doc;
diff --git a/kfile-plugins/pnm/kfile_pnm.cpp b/kfile-plugins/pnm/kfile_pnm.cpp
index 6c965e65..6818626e 100644
--- a/kfile-plugins/pnm/kfile_pnm.cpp
+++ b/kfile-plugins/pnm/kfile_pnm.cpp
@@ -22,7 +22,7 @@
#include <math.h>
#include <kgenericfactory.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
static const char* formats[] = {
I18N_NOOP("plain"),
diff --git a/kfile-plugins/ps/gscreator.cpp b/kfile-plugins/ps/gscreator.cpp
index cc4edcfc..c664947b 100644
--- a/kfile-plugins/ps/gscreator.cpp
+++ b/kfile-plugins/ps/gscreator.cpp
@@ -521,7 +521,7 @@ bool GSCreator::getEPSIPreview(const TQString &path, long start, long
return false;
}
- TQString previewstr = TQString::tqfromLatin1(buf);
+ TQString previewstr = TQString::fromLatin1(buf);
free(buf);
int offset = 0;
diff --git a/kfile-plugins/rgb/kfile_rgb.cpp b/kfile-plugins/rgb/kfile_rgb.cpp
index 41bd8c28..ffcad0b5 100644
--- a/kfile-plugins/rgb/kfile_rgb.cpp
+++ b/kfile-plugins/rgb/kfile_rgb.cpp
@@ -134,7 +134,7 @@ bool KRgbPlugin::readInfo(KFileMetaInfo& info, uint /*what*/)
long compressed = file.size() - 512;
long verbatim = xsize * ysize * zsize;
appendItem(group, "Compression", i18n("Runlength Encoded")
- + TQString(", %1%").tqarg(compressed * 100.0 / verbatim, 0, 'f', 1));
+ + TQString(", %1%").arg(compressed * 100.0 / verbatim, 0, 'f', 1));
long k;
TQ_UINT32 offs;
@@ -152,7 +152,7 @@ bool KRgbPlugin::readInfo(KFileMetaInfo& info, uint /*what*/)
k += it.data();
if (k)
- appendItem(group, "SharedRows", TQString("%1%").tqarg(k * 100.0
+ appendItem(group, "SharedRows", TQString("%1%").arg(k * 100.0
/ (ysize * zsize), 0, 'f', 1));
else
appendItem(group, "SharedRows", i18n("None"));
diff --git a/kgamma/kcmkgamma/displaynumber.cpp b/kgamma/kcmkgamma/displaynumber.cpp
index 8ca9beed..dd678716 100644
--- a/kgamma/kcmkgamma/displaynumber.cpp
+++ b/kgamma/kcmkgamma/displaynumber.cpp
@@ -28,7 +28,7 @@ DisplayNumber::DisplayNumber(TQWidget *parent, int digits, \
setFrameStyle(TQFrame::Panel | TQFrame::Sunken);
setBackgroundMode(TQt::PaletteBase);
- tqsetAlignment(TQt::AlignCenter);
+ setAlignment(TQt::AlignCenter);
setFocusPolicy(TQ_NoFocus);
}
diff --git a/kgamma/kcmkgamma/kgamma.cpp b/kgamma/kcmkgamma/kgamma.cpp
index 7f28dc63..99eddbaf 100644
--- a/kgamma/kcmkgamma/kgamma.cpp
+++ b/kgamma/kcmkgamma/kgamma.cpp
@@ -20,7 +20,7 @@
#include <tqlabel.h>
#include <tqpixmap.h>
#include <tqstring.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqstringlist.h>
#include <tqdir.h>
#include <tqcheckbox.h>
@@ -157,37 +157,37 @@ void KGamma::setupUI() {
pic1->setMinimumSize(530, 171);
pic1->setBackgroundPixmap(background);
pic1->setPixmap(TQPixmap(locate("data", "kgamma/pics/greyscale.png")));
- pic1->tqsetAlignment(AlignCenter);
+ pic1->setAlignment(AlignCenter);
stack->addWidget( pic1, 0 );
TQLabel *pic2 = new TQLabel(stack);
pic2->setBackgroundPixmap(background);
pic2->setPixmap(TQPixmap(locate("data", "kgamma/pics/rgbscale.png")));
- pic2->tqsetAlignment(AlignCenter);
+ pic2->setAlignment(AlignCenter);
stack->addWidget( pic2, 1 );
TQLabel *pic3 = new TQLabel(stack);
pic3->setBackgroundPixmap(background);
pic3->setPixmap(TQPixmap(locate("data", "kgamma/pics/cmyscale.png")));
- pic3->tqsetAlignment(AlignCenter);
+ pic3->setAlignment(AlignCenter);
stack->addWidget( pic3, 2 );
TQLabel *pic4 = new TQLabel(stack);
pic4->setBackgroundPixmap(background);
pic4->setPixmap(TQPixmap(locate("data", "kgamma/pics/darkgrey.png")));
- pic4->tqsetAlignment(AlignCenter);
+ pic4->setAlignment(AlignCenter);
stack->addWidget( pic4, 3 );
TQLabel *pic5 = new TQLabel(stack);
pic5->setBackgroundPixmap(background);
pic5->setPixmap(TQPixmap(locate("data", "kgamma/pics/midgrey.png")));
- pic5->tqsetAlignment(AlignCenter);
+ pic5->setAlignment(AlignCenter);
stack->addWidget( pic5, 4 );
TQLabel *pic6 = new TQLabel(stack);
pic6->setBackgroundPixmap(background);
pic6->setPixmap(TQPixmap(locate("data", "kgamma/pics/lightgrey.png")));
- pic6->tqsetAlignment(AlignCenter);
+ pic6->setAlignment(AlignCenter);
stack->addWidget( pic6, 5 );
topLayout->addWidget(stack, 10);
@@ -264,7 +264,7 @@ void KGamma::setupUI() {
screenselect = new TQComboBox( options );
for ( int i = 0; i < ScreenCount; i++ )
- screenselect->insertItem( i18n("Screen %1").tqarg(i+1) );
+ screenselect->insertItem( i18n("Screen %1").arg(i+1) );
screenselect->setCurrentItem(currentScreen);
connect(screenselect, TQT_SIGNAL(activated(int)), TQT_SLOT(changeScreen(int)));
@@ -279,7 +279,7 @@ void KGamma::setupUI() {
TQLabel *error = new TQLabel(this);
error->setText(i18n("Gamma correction is not supported by your"
" graphics hardware or driver."));
- error->tqsetAlignment(AlignCenter);
+ error->setAlignment(AlignCenter);
topLayout->addWidget(error);
}
}
@@ -351,7 +351,7 @@ void KGamma::save() {
if ( !xf86cfgbox->isChecked() ) { //write gamma settings to the users config
for (int i = 0; i < ScreenCount; i++) {
- config->setGroup( TQString("Screen %1").tqarg(i) );
+ config->setGroup( TQString("Screen %1").arg(i) );
config->writeEntry("rgamma", rgamma[i]);
config->writeEntry("ggamma", ggamma[i]);
config->writeEntry("bgamma", bgamma[i]);
@@ -405,7 +405,7 @@ bool KGamma::loadUserSettings() {
KConfig *config = new KConfig("kgammarc");
for (int i = 0; i < ScreenCount; i++) {
- config->setGroup(TQString( "Screen %1" ).tqarg(i) );
+ config->setGroup(TQString( "Screen %1" ).arg(i) );
rgamma[i] = config->readEntry("rgamma");
ggamma[i] = config->readEntry("ggamma");
bgamma[i] = config->readEntry("bgamma");
@@ -610,7 +610,7 @@ extern "C"
for (int i = 0; i < xv._ScreenCount(); i++) {
xv.setScreen(i);
- config->setGroup( TQString("Screen %1").tqarg(i) );
+ config->setGroup( TQString("Screen %1").arg(i) );
if ((rgamma = config->readEntry("rgamma").toFloat()))
xv.setGamma(XVidExtWrap::Red, rgamma);
diff --git a/kghostview/displayoptions.cpp b/kghostview/displayoptions.cpp
index 82ef1f3a..f2e0fa4b 100644
--- a/kghostview/displayoptions.cpp
+++ b/kghostview/displayoptions.cpp
@@ -68,15 +68,15 @@ namespace {
TQString DisplayOptions::toString( const DisplayOptions& options )
{
return TQString( qformat )
- .tqarg( options.page() )
- .tqarg( options.magnification() )
- .tqarg( options.overrideOrientation() )
- .tqarg( options.overridePageMedia().utf8().data() );
+ .arg( options.page() )
+ .arg( options.magnification() )
+ .arg( options.overrideOrientation() )
+ .arg( options.overridePageMedia().utf8().data() );
}
bool DisplayOptions::fromString( DisplayOptions& out, const TQString& in )
{
- TQRegExp regex( TQString::tqfromLatin1( rformat ) );
+ TQRegExp regex( TQString::fromLatin1( rformat ) );
if ( regex.search( in ) < 0 ) return false;
out.reset();
diff --git a/kghostview/gssettingswidget.ui b/kghostview/gssettingswidget.ui
index 756f8b50..7ba9f637 100644
--- a/kghostview/gssettingswidget.ui
+++ b/kghostview/gssettingswidget.ui
@@ -46,7 +46,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>286</width>
<height>20</height>
diff --git a/kghostview/gssettingswidget.ui.h b/kghostview/gssettingswidget.ui.h
index 11f4bf63..371d6712 100644
--- a/kghostview/gssettingswidget.ui.h
+++ b/kghostview/gssettingswidget.ui.h
@@ -9,6 +9,6 @@
void GSSettingsWidget::setDetectedVersion( TQString v)
{
- mDetectedVersion->setText(mDetectedVersion->text().tqarg( v ));
+ mDetectedVersion->setText(mDetectedVersion->text().arg( v ));
}
diff --git a/kghostview/infodialog.cpp b/kghostview/infodialog.cpp
index 431a0ed7..5e480504 100644
--- a/kghostview/infodialog.cpp
+++ b/kghostview/infodialog.cpp
@@ -19,7 +19,7 @@
#include <tqframe.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqdatetime.h>
#include <tqregexp.h>
@@ -90,7 +90,7 @@ namespace {
"(?:(\\+|\\-)(\\d\\d)\'?(\\d\\d)\'?)?"
"\\)" );
if ( exp.exactMatch( dateStr ) ) {
- TQStringList list = exp.tqcapturedTexts();
+ TQStringList list = exp.capturedTexts();
TQStringList::iterator iter = list.begin();
++iter; // whole string!
#undef GET
diff --git a/kghostview/kdscerrordialog.cpp b/kghostview/kdscerrordialog.cpp
index e831cbcd..a0bbb07e 100644
--- a/kghostview/kdscerrordialog.cpp
+++ b/kghostview/kdscerrordialog.cpp
@@ -17,8 +17,8 @@
*/
#include <tqlabel.h>
-#include <tqlayout.h>
-#include <tqtextedit.h>
+#include <layout.h>
+#include <textedit.h>
#include <kdebug.h>
#include <klocale.h>
@@ -97,7 +97,7 @@ KDSCErrorHandler::Response KDSCErrorDialog::error( const KDSCError& err )
break;
}
- _lineNumberLabel->setText( i18n( "On line %1:" ).tqarg( err.lineNumber() ) );
+ _lineNumberLabel->setText( i18n( "On line %1:" ).arg( err.lineNumber() ) );
_lineLabel->setText( err.line() );
_descriptionLabel->setText( description( err.type() ) );
diff --git a/kghostview/kgv_miniwidget.cpp b/kghostview/kgv_miniwidget.cpp
index 1d38ba88..c5bbdedf 100644
--- a/kghostview/kgv_miniwidget.cpp
+++ b/kghostview/kgv_miniwidget.cpp
@@ -441,7 +441,7 @@ void KGVMiniWidget::showPage( int pagenumber )
/*
KNotifyClient::userEvent
(i18n("KGhostview cannot load the document, \"%1\".\n"
- "It appears to be broken.").tqarg( _fileName ),
+ "It appears to be broken.").arg( _fileName ),
KNotifyClient::Messagebox);
_psWidget->disableInterpreter();
_psFile=0;
@@ -486,13 +486,13 @@ void KGVMiniWidget::updateStatusBarText( int pageNumber )
else
if( !_usePageLabels || document()->format() == KGVDocument::PDF )
text = i18n( "Page %1 of %2" )
- .tqarg( pageNumber + 1 )
- .tqarg( dsc()->page_count() );
+ .arg( pageNumber + 1 )
+ .arg( dsc()->page_count() );
else
text = i18n( "Page %1 (%2 of %3)" )
- .tqarg( dsc()->page()[ _options.page() ].label )
- .tqarg( pageNumber + 1 )
- .tqarg( dsc()->page_count() );
+ .arg( dsc()->page()[ _options.page() ].label )
+ .arg( pageNumber + 1 )
+ .arg( dsc()->page_count() );
emit setStatusBarText( text );
}
@@ -534,7 +534,7 @@ void KGVMiniWidget::buildTOC()
}
}
else {
- marklist->insertItem( TQString::tqfromLatin1( "1" ), 0 );
+ marklist->insertItem( TQString::fromLatin1( "1" ), 0 );
}
}
diff --git a/kghostview/kgv_view.cpp b/kghostview/kgv_view.cpp
index e8edace1..0a7c1e06 100644
--- a/kghostview/kgv_view.cpp
+++ b/kghostview/kgv_view.cpp
@@ -20,7 +20,7 @@
#include <tqfileinfo.h>
#include <tqframe.h>
#include <tqtable.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqregexp.h>
#include <kaction.h>
@@ -264,7 +264,7 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
for ( TQValueList<double>::iterator first = mags.begin(), last = mags.end();
first != last;
++first ) {
- TQString str = TQString( "%1%" ).tqarg( KGlobal::locale()->formatNumber( *first * 100.0, 2 ));
+ TQString str = TQString( "%1%" ).arg( KGlobal::locale()->formatNumber( *first * 100.0, 2 ));
str.remove( KGlobal::locale()->decimalSymbol() + "00" );
zooms << str;
if ( *first == 1.0 ) idx = cur;
@@ -600,7 +600,7 @@ void KGVPart::updateZoomActions()
}
// Show percentage that isn't predefined
- TQString str = TQString( "%1%" ).tqarg( KGlobal::locale()->formatNumber( zoom, 2 ));
+ TQString str = TQString( "%1%" ).arg( KGlobal::locale()->formatNumber( zoom, 2 ));
str.remove( KGlobal::locale()->decimalSymbol() + "00" );
items.insert( items.at(idx), 1, str );
_zoomTo->setItems( items );
@@ -750,8 +750,8 @@ void KGVPart::slotGhostscriptError( const TQString& error )
"Below are any error messages which were received from Ghostscript "
"(<nobr><strong>%2</strong></nobr>) "
"which may help you.</qt>" )
- .tqarg( error )
- .tqarg( Configuration::interpreter() ),
+ .arg( error )
+ .arg( Configuration::interpreter() ),
true );
// The true above makes it show a "configure gs" option, but maybe we
// should trigger an auto-redetection?
diff --git a/kghostview/kgvconfigdialog.cpp b/kghostview/kgvconfigdialog.cpp
index 6159a6f2..aa821b27 100644
--- a/kghostview/kgvconfigdialog.cpp
+++ b/kghostview/kgvconfigdialog.cpp
@@ -19,7 +19,7 @@
// Add header files alphabetically
-#include <tqlayout.h>
+#include <layout.h>
#include <kconfig.h>
#include <kdebug.h>
@@ -114,13 +114,13 @@ namespace {
"which are impossible to resolve. Please upgrade to a newer version.\n"
"KGhostView will try to work with it, but it may not display any files at all.\n"
"Version %2 seems to be appropriate on your system, although newer versions will work as well." )
- .tqarg( version )
- .tqarg( recommended ) );
+ .arg( version )
+ .arg( recommended ) );
}
if ( version < TQString::number( 7.00 ) )
{
TQStringList arguments = TQStringList::split( ' ', Configuration::antialiasingArguments() );
- arguments.remove( TQString::tqfromLatin1( "-dMaxBitmap=10000000" ) );
+ arguments.remove( TQString::fromLatin1( "-dMaxBitmap=10000000" ) );
TQString antiAliasArgs = arguments.join( " " );
Configuration::setAntialiasingArguments( antiAliasArgs );
@@ -140,9 +140,9 @@ void ConfigDialog::showSettings( KGVPart* main ) {
KConfigDialog* dialog = new KConfigDialog( 0, name,
Configuration::self(), KDialogBase::IconList );
dialog->addPage( new GeneralSettingsWidget( 0, "general-settings" ),
- i18n( "General" ), TQString::tqfromLatin1( "kghostview" ) );
+ i18n( "General" ), TQString::fromLatin1( "kghostview" ) );
GSSettingsWidget *gssw = new GSSettingsWidget( 0, "gs-settings" );
- dialog->addPage( gssw, i18n( "Ghostscript\nConfiguration" ), TQString::tqfromLatin1( "pdf" ) );
+ dialog->addPage( gssw, i18n( "Ghostscript\nConfiguration" ), TQString::fromLatin1( "pdf" ) );
gssw->setDetectedVersion(Configuration::version());
diff --git a/kghostview/kgvdocument.cpp b/kghostview/kgvdocument.cpp
index 89cd7948..bcfc4d2e 100644
--- a/kghostview/kgvdocument.cpp
+++ b/kghostview/kgvdocument.cpp
@@ -98,7 +98,7 @@ void KGVDocument::doOpenFile()
KMessageBox::sorry( _part->widget(),
i18n( "<qt>Could not open <nobr><strong>%1</strong></nobr>: "
"File does not exist.</qt>" )
- .tqarg( _fileName ) );
+ .arg( _fileName ) );
emit canceled( TQString() );
return;
}
@@ -107,7 +107,7 @@ void KGVDocument::doOpenFile()
KMessageBox::sorry( _part->widget(),
i18n( "<qt>Could not open <nobr><strong>%1</strong></nobr>: "
"Permission denied.</qt>" )
- .tqarg( _fileName ) );
+ .arg( _fileName ) );
emit canceled( TQString() );
return;
}
@@ -132,7 +132,7 @@ void KGVDocument::doOpenFile()
if( _tmpDSC->status() != 0 ) {
KMessageBox::error( _part->widget(),
i18n( "Could not create temporary file: %1" )
- .tqarg( strerror( _tmpDSC->status() ) ) );
+ .arg( strerror( _tmpDSC->status() ) ) );
emit canceled( TQString() );
return;
}
@@ -159,8 +159,8 @@ void KGVDocument::doOpenFile()
"which has type <strong>%2</strong>. KGhostview can "
"only load PostScript (.ps, .eps) and Portable "
"Document Format (.pdf) files.</qt>" )
- .tqarg( _fileName )
- .tqarg( _mimetype ) );
+ .arg( _fileName )
+ .arg( _mimetype ) );
emit canceled( TQString() );
return;
}
@@ -190,7 +190,7 @@ bool KGVDocument::uncompressFile()
{
KMessageBox::error( _part->widget(),
i18n( "<qt>Could not uncompress <nobr><strong>%1</strong></nobr>.</qt>" )
- .tqarg( _fileName ) );
+ .arg( _fileName ) );
emit canceled( TQString() );
return false;
}
@@ -201,7 +201,7 @@ bool KGVDocument::uncompressFile()
{
KMessageBox::error( _part->widget(),
i18n( "Could not create temporary file: %2" )
- .tqarg( strerror( _tmpUnzipped->status() ) ) );
+ .arg( strerror( _tmpUnzipped->status() ) ) );
emit canceled( TQString() );
return false;
}
@@ -221,7 +221,7 @@ bool KGVDocument::uncompressFile()
{
KMessageBox::error( _part->widget(),
i18n( "<qt>Could not uncompress <nobr><strong>%1</strong></nobr>.</qt>" )
- .tqarg( _fileName ) );
+ .arg( _fileName ) );
emit canceled( TQString() );
return false;
}
@@ -239,7 +239,7 @@ void KGVDocument::openPDFFileContinue( bool pdf2dscResult )
{
KMessageBox::error( _part->widget(),
i18n( "<qt>Could not open file <nobr><strong>%1</strong></nobr>.</qt>" )
- .tqarg( _part->url().url() ) );
+ .arg( _part->url().url() ) );
emit canceled( TQString() );
return;
}
@@ -260,8 +260,8 @@ void KGVDocument::openPSFile(const TQString &file)
{
KMessageBox::error( _part->widget(),
i18n( "<qt>Error opening file <nobr><strong>%1</strong></nobr>: %2</qt>" )
- .tqarg( _part->url().url() )
- .tqarg( strerror( errno ) ) );
+ .arg( _part->url().url() )
+ .arg( strerror( errno ) ) );
emit canceled( "" );
return;
}
@@ -497,7 +497,7 @@ TQString KGVDocument::pageListToRange( const PageList& pageList )
if( bss == ess )
range += TQString::number( *ess );
else
- range += TQString( "%1-%2" ).tqarg( *bss ).tqarg( *ess );
+ range += TQString( "%1-%2" ).arg( *bss ).arg( *ess );
bss = it;
}
@@ -521,7 +521,7 @@ void KGVDocument::print()
printer.setOption( "kde-range",
pageListToRange( _part->markList()->markList() ) );
- if( printer.setup( _part->widget(), i18n("Print %1").tqarg(_part->url().fileName()) ) )
+ if( printer.setup( _part->widget(), i18n("Print %1").arg(_part->url().fileName()) ) )
{
KTempFile tf( TQString(), ".ps" );
if( tf.status() == 0 )
@@ -548,7 +548,7 @@ void KGVDocument::print()
{
printer.setPageSelection( KPrinter::SystemSide );
- if( printer.setup( _part->widget(), i18n("Print %1").tqarg(_part->url().fileName()) ) )
+ if( printer.setup( _part->widget(), i18n("Print %1").arg(_part->url().fileName()) ) )
printer.printFiles( _fileName );
}
}
@@ -775,13 +775,13 @@ void KGVDocument::runPdf2ps( const TQString& pdfName,
process << _interpreterPath
<< "-dNODISPLAY"
<< "-dTQUIET"
- << TQString( "-sPDFname=%1" ).tqarg( pdfName )
+ << TQString( "-sPDFname=%1" ).arg( pdfName )
<< TQString( "-sDSCnamale locale( "kghostview" );
_fallBackPageMedia = pageSizeToString(
static_cast< TQPrinter::PageSize >( locale.pageSize() ) );
_usePageLabels = false;
-e=%1" ).tqarg( dscName )
+e=%1" ).arg( dscName )
<< "pdf2dsc.ps"
<< "-c"
<< "quit";
@@ -823,8 +823,8 @@ void Pdf2dsc::run( const TQString& pdfName, const TQString& dscName )
<< "-dDELAYSAFER"
<< "-dNODISPLAY"
<< "-dTQUIET"
- << TQString( "-sPDFname=%1" ).tqarg( pdfName )
- << TQString( "-sDSCname=%1" ).tqarg( dscName )
+ << TQString( "-sPDFname=%1" ).arg( pdfName )
+ << TQString( "-sDSCname=%1" ).arg( dscName )
<< "-c"
<< "<< /PermitFileReading [ PDFname ] /PermitFileWriting [ DSCname ] /PermitFileControl [] >> setuserparams .locksafe"
<< "-f"
diff --git a/kghostview/kgvfactory.cpp b/kghostview/kgvfactory.cpp
index 0f11e563..c7024c59 100644
--- a/kghostview/kgvfactory.cpp
+++ b/kghostview/kgvfactory.cpp
@@ -64,7 +64,7 @@ KParts::Part *KGVFactory::createPartObject( TQWidget *parentWidget, const char *
*
* as we did before.
*/
- args << TQString::tqfromLatin1( className );
+ args << TQString::fromLatin1( className );
if ( !strcmp( className, "Browser/View" ) ) {
className = "KParts::ReadOnlyPart";
}
diff --git a/kghostview/kgvpagedecorator.cpp b/kghostview/kgvpagedecorator.cpp
index a549d95d..b6304c1d 100644
--- a/kghostview/kgvpagedecorator.cpp
+++ b/kghostview/kgvpagedecorator.cpp
@@ -63,7 +63,7 @@ void KGVPageDecorator::drawFrame( TQPainter* p )
if( !r.isValid() )
return;
- const TQColorGroup& cg = tqcolorGroup();
+ const TQColorGroup& cg = colorGroup();
r.moveCenter( r.center() + _shadowOffset );
qDrawPlainRect( p, r, cg.shadow(), _shadowOffset.manhattanLength() );
diff --git a/kghostview/kgvshell.cpp b/kghostview/kgvshell.cpp
index 568b209b..7f099032 100644
--- a/kghostview/kgvshell.cpp
+++ b/kghostview/kgvshell.cpp
@@ -252,7 +252,7 @@ KGVShell::openStdin()
if( _tmpFile->status() != 0 ) {
KMessageBox::error( this,
i18n( "Could not create temporary file: %1" )
- .tqarg( strerror( _tmpFile->status() ) ) );
+ .arg( strerror( _tmpFile->status() ) ) );
return;
}
@@ -269,7 +269,7 @@ KGVShell::openStdin()
if( read != 0 ) {
KMessageBox::error( this,
i18n( "Could not open standard input stream: %1" )
- .tqarg( strerror( errno ) ) );
+ .arg( strerror( errno ) ) );
return;
}
@@ -309,7 +309,7 @@ void KGVShell::slotMaximize()
void KGVShell::slotResize()
{
- resize( m_gvpart->pageView()->tqsizeHint().width(), height() );
+ resize( m_gvpart->pageView()->sizeHint().width(), height() );
}
void KGVShell::setFullScreen( bool useFullScreen )
diff --git a/kghostview/kpswidget.cpp b/kghostview/kpswidget.cpp
index c6d5d972..b5234ac6 100644
--- a/kghostview/kpswidget.cpp
+++ b/kghostview/kpswidget.cpp
@@ -333,7 +333,7 @@ void KPSWidget::setupWidget()
// Make sure the properties are updated immediately.
XSync( x11Display(), false );
- tqrepaint();
+ repaint();
_widgetDirty = false;
}
@@ -343,7 +343,7 @@ bool KPSWidget::startInterpreter()
setupWidget();
_process = new KProcess;
- if ( _doubleBuffer ) _process->setEnvironment( "GHOSTVIEW", TQString( "%1 %2" ).tqarg( winId() ).tqarg( _backgroundPixmap.handle() ) );
+ if ( _doubleBuffer ) _process->setEnvironment( "GHOSTVIEW", TQString( "%1 %2" ).arg( winId() ).arg( _backgroundPixmap.handle() ) );
else _process->setEnvironment( "GHOSTVIEW", TQString::number( winId() ) );
*_process << _ghostscriptPath.local8Bit();
@@ -420,7 +420,7 @@ void KPSWidget::slotProcessExited( KProcess* process )
{
kdDebug( 4500 ) << "KPSWidget::slotProcessExited(): looks like it was not a clean exit." << endl;
if ( process->normalExit() ) {
- emit ghostscriptError( TQString( i18n( "Exited with error code %1." ).tqarg( process->exitStatus() ) ) );
+ emit ghostscriptError( TQString( i18n( "Exited with error code %1." ).arg( process->exitStatus() ) ) );
} else {
emit ghostscriptError( TQString( i18n( "Process killed or crashed." ) ) );
}
diff --git a/kghostview/logwindow.cpp b/kghostview/logwindow.cpp
index 207e88f1..bac46ce7 100644
--- a/kghostview/logwindow.cpp
+++ b/kghostview/logwindow.cpp
@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <tqtextedit.h>
+#include <textedit.h>
#include <tqlabel.h>
#include <tqvbox.h>
diff --git a/kghostview/marklist.cpp b/kghostview/marklist.cpp
index ee91af25..259d13a1 100644
--- a/kghostview/marklist.cpp
+++ b/kghostview/marklist.cpp
@@ -21,7 +21,7 @@
#include <cassert>
#include <tqimage.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtooltip.h>
#include <tqlabel.h>
#include <tqwhatsthis.h>
@@ -81,7 +81,7 @@ void MarkListItem::setPixmap( TQPixmap thumbnail )
void MarkListItem::setSelected( bool selected )
{
if (selected)
- setPaletteBackgroundColor( TQApplication::tqpalette().active().highlight() );
+ setPaletteBackgroundColor( TQApplication::palette().active().highlight() );
else
setPaletteBackgroundColor( _backgroundColor );
}
diff --git a/kghostview/scrollbox.cpp b/kghostview/scrollbox.cpp
index 0246e893..87d68418 100644
--- a/kghostview/scrollbox.cpp
+++ b/kghostview/scrollbox.cpp
@@ -99,19 +99,19 @@ void ScrollBox::setPageSize( const TQSize& s )
{
pagesize = s;
setFixedHeight( s.height() * width() / s.width() );
- tqrepaint();
+ repaint();
}
void ScrollBox::setViewSize( const TQSize& s )
{
viewsize = s;
- tqrepaint();
+ repaint();
}
void ScrollBox::setViewPos( const TQPoint& pos )
{
viewpos = pos;
- tqrepaint();
+ repaint();
}
void ScrollBox::setThumbnail( TQPixmap img )
diff --git a/kghostview/viewcontrol.cpp b/kghostview/viewcontrol.cpp
index 8f1c8f0c..a0ec7fba 100644
--- a/kghostview/viewcontrol.cpp
+++ b/kghostview/viewcontrol.cpp
@@ -14,7 +14,7 @@
#include <tqgroupbox.h>
#include <tqlabel.h>
#include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include "viewcontrol.h"
@@ -36,7 +36,7 @@ ViewControl::ViewControl( TQWidget *parent, const char *name )
vcGroupBox = new TQGroupBox( this );
vcGroupBox->setFrameStyle( TQFrame::NoFrame );
//vcGroupBox->setTitle( i18n("Force Changes To") );
- //vcGroupBox->tqsetAlignment( 1 );
+ //vcGroupBox->setAlignment( 1 );
topLayout->addWidget( vcGroupBox, 10 );
@@ -51,7 +51,7 @@ ViewControl::ViewControl( TQWidget *parent, const char *name )
magComboBox = new TQComboBox( FALSE, vcGroupBox );
- magComboBox->setFixedHeight( magComboBox->tqsizeHint().height() );
+ magComboBox->setFixedHeight( magComboBox->sizeHint().height() );
//magComboBox->hide();
@@ -63,7 +63,7 @@ ViewControl::ViewControl( TQWidget *parent, const char *name )
mediaComboBox = new TQComboBox( FALSE, vcGroupBox );
- mediaComboBox->setFixedHeight( magComboBox->tqsizeHint().height() );
+ mediaComboBox->setFixedHeight( magComboBox->sizeHint().height() );
connect ( mediaComboBox, TQT_SIGNAL (activated (int)),
this, TQT_SLOT (slotMediaSelection (int)) );
@@ -75,7 +75,7 @@ ViewControl::ViewControl( TQWidget *parent, const char *name )
orientComboBox->insertItem(i18n("Landscape"));
orientComboBox->insertItem(i18n("Seascape"));
orientComboBox->insertItem(i18n("Upside Down"));
- orientComboBox->setFixedHeight( magComboBox->tqsizeHint().height() );
+ orientComboBox->setFixedHeight( magComboBox->sizeHint().height() );
connect ( orientComboBox, TQT_SIGNAL (activated (int)),
this, TQT_SLOT (slotOrientSelection (int)) );
@@ -85,9 +85,9 @@ ViewControl::ViewControl( TQWidget *parent, const char *name )
TQLabel* vcLabel;
vcLabel = new TQLabel( magComboBox, i18n("&Magnification"), vcGroupBox );
- vcLabel->tqsetAlignment( AlignRight | AlignVCenter | ShowPrefix );
- if ( vcLabel->tqsizeHint().width() > labelWidth )
- labelWidth = vcLabel->tqsizeHint().width();
+ vcLabel->setAlignment( AlignRight | AlignVCenter | ShowPrefix );
+ if ( vcLabel->sizeHint().width() > labelWidth )
+ labelWidth = vcLabel->sizeHint().width();
vcLabel->setMinimumWidth( labelWidth );
vcLabel->hide();
@@ -96,24 +96,24 @@ ViewControl::ViewControl( TQWidget *parent, const char *name )
vcLabel = new TQLabel( mediaComboBox, i18n("M&edia"), vcGroupBox );
- vcLabel->tqsetAlignment( AlignRight | AlignVCenter | ShowPrefix );
- if ( vcLabel->tqsizeHint().width() > labelWidth )
- labelWidth = vcLabel->tqsizeHint().width();
+ vcLabel->setAlignment( AlignRight | AlignVCenter | ShowPrefix );
+ if ( vcLabel->sizeHint().width() > labelWidth )
+ labelWidth = vcLabel->sizeHint().width();
vcLabel->setMinimumWidth( labelWidth );
grid->addWidget( vcLabel, 1, 0 );
vcLabel = new TQLabel( orientComboBox, i18n("&Orientation"), vcGroupBox );
- vcLabel->tqsetAlignment( AlignRight | AlignVCenter | ShowPrefix );
- if ( vcLabel->tqsizeHint().width() > labelWidth )
- labelWidth = vcLabel->tqsizeHint().width();
+ vcLabel->setAlignment( AlignRight | AlignVCenter | ShowPrefix );
+ if ( vcLabel->sizeHint().width() > labelWidth )
+ labelWidth = vcLabel->sizeHint().width();
vcLabel->setMinimumWidth( labelWidth );
grid->addWidget( vcLabel, 2, 0 );
- vcGroupBox->setMinimumHeight( 2*orientComboBox->tqsizeHint().height()+20 );
+ vcGroupBox->setMinimumHeight( 2*orientComboBox->sizeHint().height()+20 );
vcGroupBox->setMinimumWidth(
- 40 + labelWidth + orientComboBox->tqsizeHint().width() );
+ 40 + labelWidth + orientComboBox->sizeHint().width() );
KSeparator* sep = new KSeparator( KSeparator::HLine, this);
topLayout->addWidget( sep );
@@ -130,7 +130,7 @@ ViewControl::ViewControl( TQWidget *parent, const char *name )
connect( closebtn, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) );
- bbox->tqlayout();
+ bbox->layout();
topLayout->addWidget( bbox );
topLayout->activate();
diff --git a/kiconedit/kcolorgrid.cpp b/kiconedit/kcolorgrid.cpp
index 35fd9f3e..65d766c9 100644
--- a/kiconedit/kcolorgrid.cpp
+++ b/kiconedit/kcolorgrid.cpp
@@ -163,7 +163,7 @@ void KColorGrid::resizeEvent(TQResizeEvent *)
}
*/
-TQSize KColorGrid::tqsizeHint() const
+TQSize KColorGrid::sizeHint() const
{
return TQSize(totalwidth, totalheight);
}
@@ -293,14 +293,14 @@ void KColorGrid::setColor( int colNum, uint col, bool update )
}
//kdDebug(4640) << "KColorGrid::setColor - before updateCell" << endl;
- tqrepaint((colNum%numCols())*cellsize,(colNum/numCols())*cellsize, cellsize, cellsize);
+ repaint((colNum%numCols())*cellsize,(colNum/numCols())*cellsize, cellsize, cellsize);
//updateCell( colNum/numCols(), colNum%numCols(), false );
//kdDebug(4640) << "KColorGrid::setColor - after updateCell" << endl;
}
void KColorGrid::updateCell( int row, int col, bool )
{
- //kdDebug(4640) << "updateCell - before tqrepaint" << endl;
+ //kdDebug(4640) << "updateCell - before repaint" << endl;
TQWMatrix matrix;
TQPainter p;
p.begin( this );
@@ -330,6 +330,6 @@ void KColorGrid::setCellSize( int s )
totalheight = (numRows() * s) + 1;
resize(totalwidth, totalheight);
if ( isVisible() )
- tqrepaint(viewRect(), false);
+ repaint(viewRect(), false);
}
#include "kcolorgrid.moc"
diff --git a/kiconedit/kcolorgrid.h b/kiconedit/kcolorgrid.h
index a5e21fc7..5e466348 100644
--- a/kiconedit/kcolorgrid.h
+++ b/kiconedit/kcolorgrid.h
@@ -65,7 +65,7 @@ public:
virtual void setCellSize( int s );
virtual int cellSize() { return cellsize; }
- virtual TQSize tqsizeHint() const;
+ virtual TQSize sizeHint() const;
void setSize(const TQSize s) { setNumRows(s.height()); setNumCols(s.width()); }
diff --git a/kiconedit/kicon.cpp b/kiconedit/kicon.cpp
index f36fde00..9a4da93c 100644
--- a/kiconedit/kicon.cpp
+++ b/kiconedit/kicon.cpp
@@ -70,7 +70,7 @@ bool KIconEditIcon::open(const TQImage *image, KURL url)
if(!url.isValid()) // Giving up
{
- TQString msg = i18n("The URL: %1 \nseems to be malformed.\n").tqarg(url.url());
+ TQString msg = i18n("The URL: %1 \nseems to be malformed.\n").arg(url.url());
KMessageBox::sorry((TQWidget*)parent(), msg);
return false;
}
@@ -86,7 +86,7 @@ bool KIconEditIcon::open(const TQImage *image, KURL url)
{
if(!KIO::NetAccess::download( url, filename, (TQWidget*)parent() ))
{
- TQString msg = i18n("There was an error loading:\n%1\n").tqarg(url.prettyURL());
+ TQString msg = i18n("There was an error loading:\n%1\n").arg(url.prettyURL());
KMessageBox::error((TQWidget*)parent(), msg);
return false;
}
@@ -101,7 +101,7 @@ bool KIconEditIcon::open(const TQImage *image, KURL url)
if(!loadedOk)
{
- TQString msg = i18n("There was an error loading:\n%1\n").tqarg(url.prettyURL());
+ TQString msg = i18n("There was an error loading:\n%1\n").arg(url.prettyURL());
KMessageBox::error((TQWidget*)parent(), msg);
}
else
@@ -208,7 +208,7 @@ bool KIconEditIcon::saveAs(const TQImage *image)
{
int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(parent()),
i18n( "A file named \"%1\" already exists. "
- "Overwrite it?" ).tqarg(file),
+ "Overwrite it?" ).arg(file),
i18n( "Overwrite File?" ),
i18n( "&Overwrite" ) );
@@ -265,7 +265,7 @@ bool KIconEditIcon::save(const TQImage *image, const TQString &_filename)
}
else
{
- TQString msg = i18n("There was an error saving:\n%1\n").tqarg(str);
+ TQString msg = i18n("There was an error saving:\n%1\n").arg(str);
KMessageBox::error((TQWidget*)parent(), msg);
kdDebug(4640) << "KIconEditIcon::save - " << msg << endl;
}
diff --git a/kiconedit/kiconcolors.cpp b/kiconedit/kiconcolors.cpp
index 4393379b..8e5daf84 100644
--- a/kiconedit/kiconcolors.cpp
+++ b/kiconedit/kiconcolors.cpp
@@ -43,7 +43,7 @@ void KDrawColors::paintCell( TQPainter *painter, int row, int col )
int d = spacing();
qDrawShadePanel( painter, d, d, cellSize()-d, cellSize()-d,
- tqcolorGroup(), true, 1, &brush);
+ colorGroup(), true, 1, &brush);
if ( row * numCols() + col == selected)
painter->drawWinFocusRect( d+1, d+1, cellSize()-(2*d)+1, cellSize()-(2*d)+1 );
}
diff --git a/kiconedit/kiconconfig.cpp b/kiconedit/kiconconfig.cpp
index d5db3bde..91ad06c3 100644
--- a/kiconedit/kiconconfig.cpp
+++ b/kiconedit/kiconconfig.cpp
@@ -21,7 +21,7 @@
#include <stdlib.h>
#include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlineedit.h>
#include <tqvbox.h>
#include <tqbuttongroup.h>
@@ -49,7 +49,7 @@
static inline TQPixmap loadIcon( const char * name )
{
return KGlobal::instance()->iconLoader()
- ->loadIcon( TQString::tqfromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium );
+ ->loadIcon( TQString::fromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium );
}
KTemplateEditDlg::KTemplateEditDlg(TQWidget *parent)
@@ -60,9 +60,9 @@ KTemplateEditDlg::KTemplateEditDlg(TQWidget *parent)
TQVBoxLayout *ml = new TQVBoxLayout(frame);
TQGroupBox *grp = new TQGroupBox(i18n("Template"), frame);
grp->setColumnLayout(0, Qt::Vertical);
- grp->tqlayout()->setSpacing(spacingHint());
- grp->tqlayout()->setMargin(marginHint());
- TQGridLayout *l = new TQGridLayout(grp->tqlayout());
+ grp->layout()->setSpacing(spacingHint());
+ grp->layout()->setMargin(marginHint());
+ TQGridLayout *l = new TQGridLayout(grp->layout());
ln_name = new TQLineEdit( grp );
connect( ln_name, TQT_SIGNAL( textChanged( const TQString & ) ),
@@ -130,7 +130,7 @@ KTemplateConfig::KTemplateConfig(TQWidget *parent) : TQWidget(parent)
TQVBoxLayout* ml = new TQVBoxLayout( this );
ml->addWidget( grp );
- TQVBoxLayout* l = new TQVBoxLayout( grp->tqlayout(), KDialog::spacingHint() );
+ TQVBoxLayout* l = new TQVBoxLayout( grp->layout(), KDialog::spacingHint() );
l->addWidget( templates );
for( unsigned int i = 0; i < KIconTemplateContainer::self()->count(); i++ )
@@ -151,7 +151,7 @@ KTemplateConfig::KTemplateConfig(TQWidget *parent) : TQWidget(parent)
bbox->addStretch( 1 );
- bbox->tqlayout();
+ bbox->layout();
l->addWidget( bbox );
}
@@ -246,11 +246,11 @@ KBackgroundConfig::KBackgroundConfig( TQWidget* parent )
TQGroupBox *grp1 = new TQGroupBox( i18n( "Select Background" ), this );
grp1->setColumnLayout(0, Qt::Vertical );
- grp1->tqlayout()->setSpacing( KDialog::spacingHint() );
- grp1->tqlayout()->setMargin( KDialog::marginHint() );
+ grp1->layout()->setSpacing( KDialog::spacingHint() );
+ grp1->layout()->setMargin( KDialog::marginHint() );
mainLayout->addWidget( grp1 );
- TQGridLayout *grp1Layout = new TQGridLayout( grp1->tqlayout(), 3, 2 );
+ TQGridLayout *grp1Layout = new TQGridLayout( grp1->layout(), 3, 2 );
TQButtonGroup* btngrp = new TQButtonGroup( grp1 );
btngrp->setExclusive( true );
@@ -548,8 +548,8 @@ KIconConfig::KIconConfig(TQWidget *parent)
TQSize min(300, 400);
- if (300 < tqsizeHint().width()) { min.setWidth(tqsizeHint().width()); }
- if (400 < tqsizeHint().height()) { min.setHeight(tqsizeHint().height()); }
+ if (300 < sizeHint().width()) { min.setWidth(sizeHint().width()); }
+ if (400 < sizeHint().height()) { min.setHeight(sizeHint().height()); }
resize(min);
}
diff --git a/kiconedit/kiconedit.cpp b/kiconedit/kiconedit.cpp
index 8a4a6af1..38461262 100644
--- a/kiconedit/kiconedit.cpp
+++ b/kiconedit/kiconedit.cpp
@@ -222,10 +222,10 @@ void KIconEdit::writeConfig()
saveMainWindowSettings( config, "MainWindowSettings" );
}
-TQSize KIconEdit::tqsizeHint() const
+TQSize KIconEdit::sizeHint() const
{
if(gridview)
- return gridview->tqsizeHint();
+ return gridview->sizeHint();
else
return TQSize(-1, -1);
}
@@ -477,7 +477,7 @@ bool KIconEdit::setupStatusBar()
statusbar->insertFixedItem("99999,99999", 0, true);
statusbar->insertFixedItem("99999 x 99999", 1, true);
statusbar->insertFixedItem(" 1:999", 2, true);
- str = i18n("Colors: %1").tqarg(9999999);
+ str = i18n("Colors: %1").arg(9999999);
statusbar->insertFixedItem(str, 3, true);
statusbar->insertItem("", 4);
diff --git a/kiconedit/kiconedit.h b/kiconedit/kiconedit.h
index e912e0f7..7af10e74 100644
--- a/kiconedit/kiconedit.h
+++ b/kiconedit/kiconedit.h
@@ -65,7 +65,7 @@ public:
KIconEdit( const TQImage image, const char *name = "kiconedit");
~KIconEdit();
- virtual TQSize tqsizeHint() const;
+ virtual TQSize sizeHint() const;
static WindowList windowList;
signals:
diff --git a/kiconedit/kiconeditslots.cpp b/kiconedit/kiconeditslots.cpp
index f229b325..7d8fffd7 100644
--- a/kiconedit/kiconeditslots.cpp
+++ b/kiconedit/kiconeditslots.cpp
@@ -195,7 +195,7 @@ void KIconEdit::slotPrint()
{
KPrinter printer;
- if ( printer.setup(this, i18n("Print %1").tqarg(icon->url().section('/', -1))) )
+ if ( printer.setup(this, i18n("Print %1").arg(icon->url().section('/', -1))) )
{
int margin = 10, yPos = 0;
printer.setCreator("KDE Icon Editor");
@@ -422,13 +422,13 @@ void KIconEdit::slotUpdateZoom( int s )
void KIconEdit::slotUpdateStatusPos(int x, int y)
{
- TQString str = i18n("Status Position", "%1, %2").tqarg(x).tqarg(y);
+ TQString str = i18n("Status Position", "%1, %2").arg(x).arg(y);
statusbar->changeItem( str, 0);
}
void KIconEdit::slotUpdateStatusSize(int x, int y)
{
- TQString str = i18n("Status Size", "%1 x %2").tqarg(x).tqarg(y);
+ TQString str = i18n("Status Size", "%1 x %2").arg(x).arg(y);
statusbar->changeItem( str, 1);
}
@@ -443,13 +443,13 @@ void KIconEdit::slotUpdateStatusScaling(int s)
void KIconEdit::slotUpdateStatusColors(uint)
{
- TQString str = i18n("Colors: %1").tqarg(grid->numColors());
+ TQString str = i18n("Colors: %1").arg(grid->numColors());
statusbar->changeItem( str, 3);
}
void KIconEdit::slotUpdateStatusColors(uint n, uint *)
{
- TQString str = i18n("Colors: %1").tqarg(n);
+ TQString str = i18n("Colors: %1").arg(n);
statusbar->changeItem( str, 3);
}
diff --git a/kiconedit/kicongrid.cpp b/kiconedit/kicongrid.cpp
index b24db091..672dbdac 100644
--- a/kiconedit/kicongrid.cpp
+++ b/kiconedit/kicongrid.cpp
@@ -27,7 +27,7 @@
#include <tqwhatsthis.h>
#include <tqscrollview.h>
#include <tqbitmap.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
#include <tqdatetime.h>
#include <kiconloader.h>
@@ -1035,7 +1035,7 @@ void KIconEditGrid::load( TQImage *image)
setColor((y*numCols())+x, *l, false);
}
//kdDebug(4640) << "Row: " << y << endl;
- kapp->tqprocessEvents(200);
+ kapp->processEvents(200);
}
updateColors();
@@ -1044,7 +1044,7 @@ void KIconEditGrid::load( TQImage *image)
emit changed(pixmap());
setUpdatesEnabled(true);
emit needPainting();
- //tqrepaint(viewRect(), false);
+ //repaint(viewRect(), false);
history->clear();
}
@@ -1118,7 +1118,7 @@ TQImage KIconEditGrid::clipboardImage(bool &ok)
{
TQCString format = fileFormats.current();
TQCString type = "image/" + format.lower();
- if (kapp->tqclipboard()->data()->provides(type ) )
+ if (kapp->clipboard()->data()->provides(type ) )
{
oneIsSupported = true;
}
@@ -1379,7 +1379,7 @@ void KIconEditGrid::editPasteAsNew()
*img = tmp;
load(img);
setModified(true);
- //tqrepaint(viewRect(), false);
+ //repaint(viewRect(), false);
p = *img;
emit changed(TQPixmap(p));
diff --git a/kiconedit/knew.cpp b/kiconedit/knew.cpp
index e38d58bb..4a29fe05 100644
--- a/kiconedit/knew.cpp
+++ b/kiconedit/knew.cpp
@@ -18,7 +18,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpainter.h>
#include <tqbuttongroup.h>
#include <tqradiobutton.h>
@@ -173,7 +173,7 @@ NewSelect::NewSelect(TQWidget *parent) : TQWidget( parent )
l->addWidget( rbtempl, 1 );
//l->addWidget(rbtempl, 5, AlignLeft);
- //grp->setMinimumSize(grp->tqchildrenRect().size());
+ //grp->setMinimumSize(grp->childrenRect().size());
grp->setButton( 0 );
}
diff --git a/kiconedit/kresize.cpp b/kiconedit/kresize.cpp
index ac98e214..4e73dad9 100644
--- a/kiconedit/kresize.cpp
+++ b/kiconedit/kresize.cpp
@@ -20,7 +20,7 @@
*/
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqgroupbox.h>
#include <klocale.h>
@@ -37,18 +37,18 @@ KResizeWidget::KResizeWidget( TQWidget* parent, const char* name,
group->setColumnLayout( 0, Qt::Horizontal );
genLayout->addWidget( group );
- TQHBoxLayout* tqlayout = new TQHBoxLayout( group->tqlayout(), 6 );
+ TQHBoxLayout* layout = new TQHBoxLayout( group->layout(), 6 );
m_width = new KIntSpinBox( 1, 200, 1, 1, 10, group );
m_width->setValue( size.width() );
- tqlayout->addWidget( m_width, 1 );
+ layout->addWidget( m_width, 1 );
TQLabel* label = new TQLabel( "X", group );
- tqlayout->addWidget( label );
+ layout->addWidget( label );
m_height = new KIntSpinBox( 1, 200, 1, 1, 10, group);
m_height->setValue( size.height() );
- tqlayout->addWidget( m_height, 1 );
+ layout->addWidget( m_height, 1 );
setMinimumSize( 200, 100 );
}
diff --git a/kiconedit/palettetoolbar.cpp b/kiconedit/palettetoolbar.cpp
index 225e2439..907b447a 100644
--- a/kiconedit/palettetoolbar.cpp
+++ b/kiconedit/palettetoolbar.cpp
@@ -20,7 +20,7 @@
*/
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqwhatsthis.h>
#include <tqpainter.h>
@@ -42,7 +42,7 @@ PaletteToolBar::PaletteToolBar( TQWidget *parent, const char *name )
m_lblPreview = new TQLabel( base );
m_lblPreview->setFrameStyle( TQFrame::Panel|TQFrame::Sunken );
m_lblPreview->setFixedHeight( 64 );
- m_lblPreview->tqsetAlignment( TQt::AlignHCenter|TQt::AlignVCenter );
+ m_lblPreview->setAlignment( TQt::AlignHCenter|TQt::AlignVCenter );
TQWhatsThis::add(m_lblPreview, i18n( "Preview\n\nThis is a 1:1 preview"
" of the current icon" ) );
m_layout->addWidget( m_lblPreview );
@@ -50,31 +50,31 @@ PaletteToolBar::PaletteToolBar( TQWidget *parent, const char *name )
m_currentColorView = new TQLabel( base );
m_currentColorView->setFrameStyle( TQFrame::Panel|TQFrame::Sunken );
m_currentColorView->setFixedHeight( 24 );
- m_currentColorView->tqsetAlignment( TQt::AlignHCenter|TQt::AlignVCenter );
+ m_currentColorView->setAlignment( TQt::AlignHCenter|TQt::AlignVCenter );
TQWhatsThis::add(m_currentColorView, i18n( "Current color\n\nThis is the currently selected color" ) );
m_layout->addWidget( m_currentColorView );
- TQVBoxLayout *vtqlayout = new TQVBoxLayout( m_layout, 0 );
+ TQVBoxLayout *vlayout = new TQVBoxLayout( m_layout, 0 );
TQLabel *l = new TQLabel( i18n( "System colors:" ), base );
- vtqlayout->addWidget( l );
+ vlayout->addWidget( l );
m_sysColors = new KSysColors( base );
TQWhatsThis::add(m_sysColors, i18n( "System colors\n\nHere you can select"
" colors from the KDE icon palette" ) );
- vtqlayout->addWidget( m_sysColors );
+ vlayout->addWidget( m_sysColors );
connect( m_sysColors, TQT_SIGNAL( newColor(uint) ),
TQT_SIGNAL( newColor(uint) ) );
- vtqlayout = new TQVBoxLayout( m_layout, 0 );
+ vlayout = new TQVBoxLayout( m_layout, 0 );
l = new TQLabel( i18n( "Custom colors:" ), base );
- vtqlayout->addWidget( l );
+ vlayout->addWidget( l );
m_customColors = new KCustomColors( base );
TQWhatsThis::add(m_customColors, i18n( "Custom colors\n\nHere you can"
" build a palette of custom colors.\nDouble-click on a box to edit"
" the color" ) );
- vtqlayout->addWidget( m_customColors );
+ vlayout->addWidget( m_customColors );
connect( m_customColors, TQT_SIGNAL( newColor(uint) ),
TQT_SIGNAL( newColor(uint) ) );
diff --git a/kmrml/kmrml/algorithmdialog.cpp b/kmrml/kmrml/algorithmdialog.cpp
index 68060bb3..74eaf050 100644
--- a/kmrml/kmrml/algorithmdialog.cpp
+++ b/kmrml/kmrml/algorithmdialog.cpp
@@ -22,7 +22,7 @@
#include <tqhbox.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqscrollview.h>
#include <tqvbox.h>
#include <tqvgroupbox.h>
@@ -49,8 +49,8 @@ protected:
virtual void viewportResizeEvent(TQResizeEvent* ev)
{
TQScrollView::viewportResizeEvent(ev);
- m_frame->resize( kMax(m_frame->tqsizeHint().width(), ev->size().width()),
- kMax(m_frame->tqsizeHint().height(), ev->size().height()));
+ m_frame->resize( kMax(m_frame->sizeHint().width(), ev->size().width()),
+ kMax(m_frame->sizeHint().height(), ev->size().height()));
};
private:
@@ -71,7 +71,7 @@ AlgorithmDialog::AlgorithmDialog( const AlgorithmList& algorithms,
TQVBoxLayout *mainLayout = new TQVBoxLayout( box, 0, KDialog::spacingHint(),
"mainLayout");
- TQHBoxLayout *collectionLayout = new TQHBoxLayout( 0L, 0, 0, "coll tqlayout");
+ TQHBoxLayout *collectionLayout = new TQHBoxLayout( 0L, 0, 0, "coll layout");
collectionLayout->addWidget( new TQLabel( i18n("Collection: "), box ));
m_collectionCombo = new CollectionCombo( box, "collection combo" );
@@ -106,7 +106,7 @@ AlgorithmDialog::AlgorithmDialog( const AlgorithmList& algorithms,
mainLayout->activate();
algoHLayout->move( groupBox->x() + 10, groupBox->y() - 12 );
- box->setMinimumWidth( algoHLayout->tqsizeHint().width() +
+ box->setMinimumWidth( algoHLayout->sizeHint().width() +
4 * KDialog::spacingHint() );
}
diff --git a/kmrml/kmrml/kcontrol/indexcleaner.cpp b/kmrml/kmrml/kcontrol/indexcleaner.cpp
index 2183cc5b..c184c10c 100644
--- a/kmrml/kmrml/kcontrol/indexcleaner.cpp
+++ b/kmrml/kmrml/kcontrol/indexcleaner.cpp
@@ -78,7 +78,7 @@ void IndexCleaner::startNext()
if ( index != -1 )
cmd.replace( index, 2, TQUOTE( dir ) );
else // no %d? What else can we do?
- cmd.append( TQString::tqfromLatin1(" ") + TQUOTE( dir ) );
+ cmd.append( TQString::fromLatin1(" ") + TQUOTE( dir ) );
*m_process << cmd;
diff --git a/kmrml/kmrml/kcontrol/indexer.cpp b/kmrml/kmrml/kcontrol/indexer.cpp
index 09a83c33..3f479ee6 100644
--- a/kmrml/kmrml/kcontrol/indexer.cpp
+++ b/kmrml/kmrml/kcontrol/indexer.cpp
@@ -112,7 +112,7 @@ void Indexer::processNext()
*m_process << *it;
#endif
- emit progress( 0, i18n("<qt>Next Folder: <br><b>%1</b>").tqarg( m_currentDir ));
+ emit progress( 0, i18n("<qt>Next Folder: <br><b>%1</b>").arg( m_currentDir ));
m_process->start();
}
@@ -160,7 +160,7 @@ void Indexer::slotCanRead( KProcIO *proc )
if ( ok )
{
uint dirsLeft = m_dirs.count();
- TQString message = i18n( "<qt>Processing folder %1 of %2: <br><b>%3</b><br>File %4 of %5.</qt>").tqarg( m_dirCount - dirsLeft ).tqarg( m_dirCount).tqarg( m_currentDir ).tqarg( currentFile ).tqarg( numFiles );
+ TQString message = i18n( "<qt>Processing folder %1 of %2: <br><b>%3</b><br>File %4 of %5.</qt>").arg( m_dirCount - dirsLeft ).arg( m_dirCount).arg( m_currentDir ).arg( currentFile ).arg( numFiles );
emit progress( perc, message );
}
}
diff --git a/kmrml/kmrml/kcontrol/kcmkmrml.cpp b/kmrml/kmrml/kcontrol/kcmkmrml.cpp
index 42aaf534..3e7e91c1 100644
--- a/kmrml/kmrml/kcontrol/kcmkmrml.cpp
+++ b/kmrml/kmrml/kcontrol/kcmkmrml.cpp
@@ -17,7 +17,7 @@
*/
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <kaboutdata.h>
#include <kapplication.h>
@@ -58,11 +58,11 @@ KCMKMrml::KCMKMrml(TQWidget *parent, const char *name, const TQStringList & ):
ab->addAuthor( "Carsten Pfeiffer", 0, "pfeiffer@kde.org" );
setAboutData( ab );
- TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
- tqlayout->setSpacing( KDialog::spacingHint() );
+ TQVBoxLayout *layout = new TQVBoxLayout( this );
+ layout->setSpacing( KDialog::spacingHint() );
m_mainPage = new MainPage( this, "main page" );
- tqlayout->addWidget( m_mainPage );
+ layout->addWidget( m_mainPage );
connect( m_mainPage, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool )));
@@ -86,11 +86,11 @@ void KCMKMrml::checkGiftInstallation()
KMessageBox::error( this, errorMessage );
m_mainPage->hide();
TQLabel *errorLabel = new TQLabel( errorMessage, this );
- errorLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
+ errorLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
KURLLabel *urlLabel = new KURLLabel( "http://www.gnu.org/software/gift", TQString(), this );
- urlLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+ urlLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& )), kapp, TQT_SLOT( invokeBrowser( const TQString& )) );
- TQLayout *l = tqlayout();
+ TQLayout *l = layout();
l->addItem( new TQSpacerItem( 0, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding ) );
l->add( errorLabel );
l->add( urlLabel );
diff --git a/kmrml/kmrml/kcontrol/mainpage.cpp b/kmrml/kmrml/kcontrol/mainpage.cpp
index 84ba61a2..ca491ead 100644
--- a/kmrml/kmrml/kcontrol/mainpage.cpp
+++ b/kmrml/kmrml/kcontrol/mainpage.cpp
@@ -186,7 +186,7 @@ TQStringList MainPage::difference( const TQStringList& oldIndexDirs,
{
TQStringList result;
- TQString slash = TQString::tqfromLatin1("/");
+ TQString slash = TQString::fromLatin1("/");
TQStringList::ConstIterator oldIt = oldIndexDirs.begin();
TQString oldDir, newDir;
@@ -465,7 +465,7 @@ void MainPage::slotIndexingFinished( int returnCode )
if ( err )
syserr = TQString::fromLocal8Bit( err );
else
- syserr = i18n("Unknown error: %1").tqarg( returnCode );
+ syserr = i18n("Unknown error: %1").arg( returnCode );
}
KMessageBox::detailedError( this, i18n("An error occurred during indexing. The index might be invalid."),
diff --git a/kmrml/kmrml/kcontrol/serverconfigwidget.ui b/kmrml/kmrml/kcontrol/serverconfigwidget.ui
index e577b221..5f3a34cd 100644
--- a/kmrml/kmrml/kcontrol/serverconfigwidget.ui
+++ b/kmrml/kmrml/kcontrol/serverconfigwidget.ui
@@ -135,7 +135,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>200</width>
<height>0</height>
@@ -200,7 +200,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>16</height>
diff --git a/kmrml/kmrml/lib/kmrml_config.cpp b/kmrml/kmrml/lib/kmrml_config.cpp
index 219a36a6..ef9c4b06 100644
--- a/kmrml/kmrml/lib/kmrml_config.cpp
+++ b/kmrml/kmrml/lib/kmrml_config.cpp
@@ -18,7 +18,7 @@
#include <tqdir.h>
#include <tqfile.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include <kconfig.h>
#include <kdebug.h>
@@ -104,7 +104,7 @@ bool Config::sync()
void Config::setDefaultHost( const TQString& host )
{
m_defaultHost = host.isEmpty() ?
- TQString::tqfromLatin1(DEFAULT_HOST) : host;
+ TQString::fromLatin1(DEFAULT_HOST) : host;
m_config->setGroup( CONFIG_GROUP );
m_config->writeEntry( "Default Host", m_defaultHost );
diff --git a/kmrml/kmrml/lib/kmrml_config.h b/kmrml/kmrml/lib/kmrml_config.h
index 4e39d3bf..2208030a 100644
--- a/kmrml/kmrml/lib/kmrml_config.h
+++ b/kmrml/kmrml/lib/kmrml_config.h
@@ -108,7 +108,7 @@ namespace KMrml
TQString settingsGroup( const TQString& host ) const
{
- return TQString::tqfromLatin1( "SettingsFor: " ).append( host );
+ return TQString::fromLatin1( "SettingsFor: " ).append( host );
}
bool m_serverStartedIndividually;
diff --git a/kmrml/kmrml/lib/mrml_shared.cpp b/kmrml/kmrml/lib/mrml_shared.cpp
index 932010f6..3e7d6d95 100644
--- a/kmrml/kmrml/lib/mrml_shared.cpp
+++ b/kmrml/kmrml/lib/mrml_shared.cpp
@@ -53,7 +53,7 @@ const TQString * MrmlShared::m_element = 0L;
const TQString * MrmlShared::m_attribute = 0L;
const TQString * MrmlShared::m_attributeName = 0L;
const TQString * MrmlShared::m_attributeValue = 0L;
-const TQString * MrmlShared::m_tqchildren = 0L;
+const TQString * MrmlShared::m_children = 0L;
const TQString * MrmlShared::m_none = 0L;
const TQString * MrmlShared::m_multiSet = 0L;
@@ -141,7 +141,7 @@ void MrmlShared::init()
m_attribute = new TQString ( "attribute" ) ;
m_attributeName = new TQString ( "attribute-name" ) ;
m_attributeValue = new TQString ( "attribute-value" ) ;
- m_tqchildren = new TQString ( "tqchildren" ) ;
+ m_children = new TQString ( "children" ) ;
m_none = new TQString ( "none" ) ;
m_multiSet = new TQString ( "multi-set" ) ;
@@ -215,7 +215,7 @@ void MrmlShared::cleanup()
delete m_attribute;
delete m_attributeName;
delete m_attributeValue;
- delete m_tqchildren;
+ delete m_children;
delete m_none;
delete m_visibility;
diff --git a/kmrml/kmrml/lib/mrml_shared.h b/kmrml/kmrml/lib/mrml_shared.h
index 175d5c3c..6ed2177a 100644
--- a/kmrml/kmrml/lib/mrml_shared.h
+++ b/kmrml/kmrml/lib/mrml_shared.h
@@ -76,7 +76,7 @@ public:
static const TQString& attribute() { return *m_attribute; }
static const TQString& attributeName() { return *m_attributeName; }
static const TQString& attributeValue() { return *m_attributeValue; }
- static const TQString& tqchildren() { return *m_tqchildren; }
+ static const TQString& children() { return *m_children; }
static const TQString& none() { return *m_none; }
static const TQString& visibility() { return *m_visibility; }
@@ -139,7 +139,7 @@ private:
static const TQString * m_attribute;
static const TQString * m_attributeName;
static const TQString * m_attributeValue;
- static const TQString * m_tqchildren;
+ static const TQString * m_children;
static const TQString * m_none;
static const TQString * m_visibility;
diff --git a/kmrml/kmrml/mrml.cpp b/kmrml/kmrml/mrml.cpp
index 137c2062..a61de8f1 100644
--- a/kmrml/kmrml/mrml.cpp
+++ b/kmrml/kmrml/mrml.cpp
@@ -216,11 +216,11 @@ bool Mrml::startSession( const KURL& url )
// Wolfgang says, we shouldn't create an own session-id here, as gcc 2.95
// apparently makes problems in exception handling somehow. So we simply
// accept the server's session-id.
- TQString msg = mrmlString( TQString() ).tqarg(
+ TQString msg = mrmlString( TQString() ).arg(
"<open-session user-name=\"%1\" session-name=\"kio_mrml session\" /> \
<get-algorithms /> \
<get-collections /> \
- </mrml>" ).tqarg( user( url ));
+ </mrml>" ).arg( user( url ));
TQCString utf8 = msg.utf8();
// qDebug(":::Writing: %s", utf8.data());
@@ -240,13 +240,13 @@ TQString Mrml::mrmlString( const TQString& sessionId, const TQString& transactio
</mrml>";
if ( sessionId.isEmpty() ) // when we don't have one yet
- return msg.tqarg( "<mrml>%1" );
+ return msg.arg( "<mrml>%1" );
if ( transactionId.isNull() )
- return msg.tqarg( "<mrml session-id=\"%1\">%1" ).tqarg( sessionId );
+ return msg.arg( "<mrml session-id=\"%1\">%1" ).arg( sessionId );
else
- return msg.tqarg( "<mrml session-id=\"%1\" transaction-id=\"%1\">%1")
- .tqarg( sessionId ).tqarg( transactionId );
+ return msg.arg( "<mrml session-id=\"%1\" transaction-id=\"%1\">%1")
+ .arg( sessionId ).arg( transactionId );
}
void Mrml::emitData( const TQCString& msg )
diff --git a/kmrml/kmrml/mrml_elements.cpp b/kmrml/kmrml/mrml_elements.cpp
index 8700ed43..3fadcaba 100644
--- a/kmrml/kmrml/mrml_elements.cpp
+++ b/kmrml/kmrml/mrml_elements.cpp
@@ -28,7 +28,7 @@ using namespace KMrml;
//
// MrmlElement is currently the baseclass for Algorithm and Collection. Both
// may have a single child-element <query-paradigm-list>, with a number of
-// <query-paradigm> elements as tqchildren.
+// <query-paradigm> elements as children.
//
MrmlElement::MrmlElement( const TQDomElement& elem )
diff --git a/kmrml/kmrml/mrml_part.cpp b/kmrml/kmrml/mrml_part.cpp
index 542d3b9c..7a8967c8 100644
--- a/kmrml/kmrml/mrml_part.cpp
+++ b/kmrml/kmrml/mrml_part.cpp
@@ -153,13 +153,13 @@ MrmlPart::MrmlPart( TQWidget *parentWidget, const char * /* widgetName */,
m_algoButton = new TQPushButton( TQString(), m_panel );
m_algoButton->setPixmap( SmallIcon("configure") );
- m_algoButton->setFixedSize( m_algoButton->tqsizeHint() );
+ m_algoButton->setFixedSize( m_algoButton->sizeHint() );
connect( m_algoButton, TQT_SIGNAL( clicked() ),
TQT_SLOT( slotConfigureAlgorithm() ));
TQToolTip::add( m_algoButton, i18n("Configure algorithm") );
TQWidget *spacer = new TQWidget( m_panel );
- spacer->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
+ spacer->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
TQSizePolicy::Minimum ) );
int resultSize = config->readNumEntry( "Result-size", 20 );
@@ -172,7 +172,7 @@ MrmlPart::MrmlPart( TQWidget *parentWidget, const char * /* widgetName */,
m_startButton = new TQPushButton( TQString(), tmp );
connect( m_startButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotStartClicked() ));
- settqStatus( NeedCollection );
+ setStatus( NeedCollection );
setWidget( box );
@@ -206,7 +206,7 @@ void MrmlPart::initCollections( const TQDomElement& elem )
KMessageBox::information( widget(),
i18n("There is no image collection available\n"
"at %1.\n"), i18n("No Image Collection"));
- settqStatus( NeedCollection );
+ setStatus( NeedCollection );
}
else
m_collectionCombo->updateGeometry(); // adjust the entire grid
@@ -229,7 +229,7 @@ bool MrmlPart::openURL( const KURL& url )
m_url = url;
TQString host = url.host().isEmpty() ?
- TQString::tqfromLatin1("localhost") : url.host();
+ TQString::fromLatin1("localhost") : url.host();
m_hostCombo->setCurrentItem( host );
@@ -285,8 +285,8 @@ bool MrmlPart::openURL( const KURL& url )
== KMessageBox::Yes )
{
KApplication::tdeinitExec( "kcmshell",
- TQString::tqfromLatin1("kcmkmrml"));
- settqStatus( NeedCollection );
+ TQString::fromLatin1("kcmkmrml"));
+ setStatus( NeedCollection );
return false;
}
}
@@ -308,9 +308,9 @@ void MrmlPart::contactServer( const KURL& url )
m_job->addMetaData( MrmlShared::kio_task(), MrmlShared::kio_initialize() );
TQString host = url.host().isEmpty() ?
- TQString::tqfromLatin1("localhost") : url.host();
+ TQString::fromLatin1("localhost") : url.host();
- slotSetStatusBar( i18n("Connecting to indexing server at %1...").tqarg( host ));
+ slotSetStatusBar( i18n("Connecting to indexing server at %1...").arg( host ));
}
//
@@ -376,7 +376,7 @@ bool MrmlPart::closeURL()
m_job = 0L;
}
- settqStatus( NeedCollection );
+ setStatus( NeedCollection );
return true;
}
@@ -400,7 +400,7 @@ KIO::TransferJob * MrmlPart::transferJob( const KURL& url )
emit started( job );
emit setWindowCaption( url.prettyURL() );
- settqStatus( InProgress );
+ setStatus( InProgress );
return job;
}
@@ -423,7 +423,7 @@ void MrmlPart::slotResult( KIO::Job *job )
bool auto_random = m_view->isEmpty() && m_queryList.isEmpty();
m_random->setChecked( auto_random );
m_random->setEnabled( !auto_random );
- settqStatus( job->error() ? NeedCollection : CanSearch );
+ setStatus( job->error() ? NeedCollection : CanSearch );
if ( !job->error() && !m_queryList.isEmpty() ) {
// we have a connection and we got a list of relevant URLs to query for
@@ -495,7 +495,7 @@ void MrmlPart::parseMrml( TQDomDocument& doc )
else if ( tagName == "error" ) {
KMessageBox::information( widget(),
i18n("Server returned error:\n%1\n")
- .tqarg( elem.attribute( "message" )),
+ .arg( elem.attribute( "message" )),
i18n("Server Error") );
}
@@ -776,7 +776,7 @@ void MrmlPart::slotHostComboActivated( const TQString& host )
openURL( settings.getUrl() );
}
-void MrmlPart::settqStatus( tqStatus status )
+void MrmlPart::setStatus( Status status )
{
switch ( status )
{
diff --git a/kmrml/kmrml/mrml_part.h b/kmrml/kmrml/mrml_part.h
index 1451b833..0bfec704 100644
--- a/kmrml/kmrml/mrml_part.h
+++ b/kmrml/kmrml/mrml_part.h
@@ -57,7 +57,7 @@ class MrmlPart : public KParts::ReadOnlyPart
TQ_OBJECT
public:
- enum tqStatus { NeedCollection, CanSearch, InProgress };
+ enum Status { NeedCollection, CanSearch, InProgress };
MrmlPart( TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name, const TQStringList& args );
@@ -116,7 +116,7 @@ private:
void initHostCombo();
void enableServerDependentWidgets( bool enable );
- void settqStatus( tqStatus status );
+ void setStatus( Status status );
void contactServer( const KURL& url );
void downloadReferenceFiles( const KURL::List& downloadList );
@@ -143,7 +143,7 @@ private:
CollectionList m_collections;
AlgorithmList m_algorithms;
- tqStatus m_status;
+ Status m_status;
static uint s_sessionId;
};
diff --git a/kmrml/kmrml/mrml_view.cpp b/kmrml/kmrml/mrml_view.cpp
index d5b26117..2fed1bcb 100644
--- a/kmrml/kmrml/mrml_view.cpp
+++ b/kmrml/kmrml/mrml_view.cpp
@@ -57,7 +57,7 @@ MrmlView::MrmlView( TQWidget *parent, const char *name )
// query result image
TQLabel l( i18n( "No thumbnail available" ), 0L );
l.setFixedSize( 80, 80 );
- l.tqsetAlignment( WordBreak | AlignCenter );
+ l.setAlignment( WordBreak | AlignCenter );
// l.setFrameStyle( TQLabel::Box | TQLabel::Plain );
// l.setLineWidth( 1 );
l.setPaletteBackgroundColor( TQt::white );
@@ -176,7 +176,7 @@ void MrmlView::slotLayout()
TQPtrListIterator<MrmlViewItem> it( m_items );
for ( ; it.current(); ++it ) {
- itemWidth = TQMAX( itemWidth, it.current()->tqsizeHint().width() );
+ itemWidth = TQMAX( itemWidth, it.current()->sizeHint().width() );
}
if ( itemWidth == 0 )
@@ -202,7 +202,7 @@ void MrmlView::slotLayout()
if ( item == 0 )
rowIt = it;
- rowHeight = TQMAX( rowHeight, it.current()->tqsizeHint().height() );
+ rowHeight = TQMAX( rowHeight, it.current()->sizeHint().height() );
addChild( it.current(), margin + item * itemWidth, y );
it.current()->show();
@@ -306,11 +306,11 @@ MrmlViewItem::MrmlViewItem( const KURL& url, const KURL& thumbURL,
/*
if ( similarity > -1 )
- TQToolTip::add( this, TQString::tqfromLatin1("<qt>%1<br>%1</qt>")
- .tqarg( url )
- .tqarg(i18n("Similarity: %1").tqarg( TQString::number(similarity))));
+ TQToolTip::add( this, TQString::fromLatin1("<qt>%1<br>%1</qt>")
+ .arg( url )
+ .arg(i18n("Similarity: %1").arg( TQString::number(similarity))));
else
- TQToolTip::add( this, TQString::tqfromLatin1("<qt>%1</qt>").tqarg( url ) );
+ TQToolTip::add( this, TQString::fromLatin1("<qt>%1</qt>").arg( url ) );
*/
setMinimumSize( 130, 130 ); // ###
@@ -342,14 +342,14 @@ void MrmlViewItem::paintEvent( TQPaintEvent *e )
if ( m_similarity >= 0 ) {
TQPainter p( this );
- TQPen pen( tqcolorGroup().highlight(), 1, TQPen::SolidLine );
+ TQPen pen( colorGroup().highlight(), 1, TQPen::SolidLine );
p.setPen( pen );
int x = margin;
int y = m_combo->y() - similarityHeight - 2;
int w = (int) (similarityFullWidth * m_similarity);
int h = similarityHeight;
p.drawRect( x, y, similarityFullWidth, h );
- p.fillRect( x, y, w, h, tqcolorGroup().highlight() );
+ p.fillRect( x, y, w, h, colorGroup().highlight() );
}
}
@@ -361,7 +361,7 @@ void MrmlViewItem::resizeEvent( TQResizeEvent *e )
m_combo->move( width()/2 - m_combo->width()/2, y );
}
-TQSize MrmlViewItem::tqsizeHint() const
+TQSize MrmlViewItem::sizeHint() const
{
int w = TQMAX( TQMAX(minimumHeight(), m_combo->width()), m_pixmap.width() );
w += 2 * margin;
diff --git a/kmrml/kmrml/mrml_view.h b/kmrml/kmrml/mrml_view.h
index a9f1aad1..f73634a8 100644
--- a/kmrml/kmrml/mrml_view.h
+++ b/kmrml/kmrml/mrml_view.h
@@ -126,7 +126,7 @@ public:
void setSimilarity( double value );
- virtual TQSize tqsizeHint() const;
+ virtual TQSize sizeHint() const;
const KURL& url() const { return m_url; }
const KURL& thumbURL() const { return m_thumbURL; }
diff --git a/kmrml/kmrml/propertysheet.cpp b/kmrml/kmrml/propertysheet.cpp
index dba9d531..af913558 100644
--- a/kmrml/kmrml/propertysheet.cpp
+++ b/kmrml/kmrml/propertysheet.cpp
@@ -98,10 +98,10 @@ void PropertySheet::initFromDOM( const TQDomElement& elem )
m_minSubsetSize = toInt( elem.attribute( MrmlShared::minSubsetSize() ));
m_maxSubsetSize = toInt( elem.attribute( MrmlShared::maxSubsetSize() ));
- TQValueList<TQDomElement> tqchildren =
+ TQValueList<TQDomElement> children =
KMrml::directChildElements( elem, MrmlShared::propertySheet() );
- TQValueListConstIterator<TQDomElement> it = tqchildren.begin();
- for ( ; it != tqchildren.end(); ++it )
+ TQValueListConstIterator<TQDomElement> it = children.begin();
+ for ( ; it != children.end(); ++it )
m_subSheets.append( new PropertySheet( *it ) );
}
@@ -190,7 +190,7 @@ PropertySheet::SendType PropertySheet::getSendType( const TQString& value )
type = AttributeName;
else if ( value == MrmlShared::attributeValue() )
type = AttributeValue;
- else if ( value == MrmlShared::tqchildren() )
+ else if ( value == MrmlShared::children() )
type = Children;
else if ( value == MrmlShared::none() )
type = None;
diff --git a/kmrml/kmrml/propertysheet.h b/kmrml/kmrml/propertysheet.h
index 2e20cb85..e4759282 100644
--- a/kmrml/kmrml/propertysheet.h
+++ b/kmrml/kmrml/propertysheet.h
@@ -34,7 +34,7 @@ namespace KMrml
{
MultiSet = 1, // ??
Subset, // radio-button/combobox or listbox
- SetElement, // CheckBox -> disables/enables tqchildren?
+ SetElement, // CheckBox -> disables/enables children?
Boolean, // CheckBox
Numeric, // Slider/Spinbox
Textual, // lineedit
diff --git a/kmrml/kmrml/server/watcher.cpp b/kmrml/kmrml/server/watcher.cpp
index 70d34c14..ce569bab 100644
--- a/kmrml/kmrml/server/watcher.cpp
+++ b/kmrml/kmrml/server/watcher.cpp
@@ -146,7 +146,7 @@ void Watcher::slotProcExited( KProcess *proc )
i18n("<qt>The server with the command line"
"<br>%1<br>"
"is not available anymore. Do you want to "
- "restart it?" ).tqarg( daemon->commandline ),
+ "restart it?" ).arg( daemon->commandline ),
i18n("Service Failure"), i18n("Restart Server"), i18n("Do Not Restart") )
== KMessageBox::Yes )
{
@@ -175,7 +175,7 @@ bool Watcher::startDaemon( DaemonData *daemon )
i18n("Unable to start the server with the "
"command line"
"<br>%1<br>"
- "Try again?").tqarg( daemon->commandline ),
+ "Try again?").arg( daemon->commandline ),
i18n("Service Failure"), i18n("Try Again"), i18n("Do Not Try") )
== KMessageBox::Yes )
{
diff --git a/kolourpaint/BUGS b/kolourpaint/BUGS
index 25814d61..84f3391f 100644
--- a/kolourpaint/BUGS
+++ b/kolourpaint/BUGS
@@ -27,8 +27,8 @@ This file lists known bugs in this version that are not considered
manifestations of the current QSpinBox behaviour.
6. a) The undo history and document modified state are not updated during
- the drawing of multi-segment tqshapes (Polygon, Connected Lines,
- Curve). They are however updated after tqshapes' completion.
+ the drawing of multi-segment shapes (Polygon, Connected Lines,
+ Curve). They are however updated after shapes' completion.
b) The text and brush-like tools set the document modified flag even if
user cancels the draw operation.
@@ -37,7 +37,7 @@ This file lists known bugs in this version that are not considered
still marked as modified (because 2 commands - the create selection
and the move - were added but only one was undone).
-7. Certain tqshapes may have the wrong size (usually only a pixel off and
+7. Certain shapes may have the wrong size (usually only a pixel off and
only in extreme cases) e.g. an ellipse of height 1 always has a width 1
pixel less than it should be. This is a Qt bug.
diff --git a/kolourpaint/kpcommandhistory.cpp b/kolourpaint/kpcommandhistory.cpp
index 06948815..6849ebf4 100644
--- a/kolourpaint/kpcommandhistory.cpp
+++ b/kolourpaint/kpcommandhistory.cpp
@@ -257,13 +257,13 @@ kpCommandHistoryBase::kpCommandHistoryBase (bool doReadConfig,
: d (new kpCommandHistoryBasePrivate ())
{
m_actionUndo = new KToolBarPopupAction (undoActionText (),
- TQString::tqfromLatin1 ("undo"),
+ TQString::fromLatin1 ("undo"),
KStdAccel::shortcut (KStdAccel::Undo),
this, TQT_SLOT (undo ()),
ac, KStdAction::name (KStdAction::Undo));
m_actionRedo = new KToolBarPopupAction (redoActionText (),
- TQString::tqfromLatin1 ("redo"),
+ TQString::fromLatin1 ("redo"),
KStdAccel::shortcut (KStdAccel::Redo),
this, TQT_SLOT (redo ()),
ac, KStdAction::name (KStdAction::Redo));
@@ -763,7 +763,7 @@ void kpCommandHistoryBase::trimCommandLists ()
-m_documentRestoredPosition > (int) m_undoCommandList.size ())
{
#if DEBUG_KP_COMMAND_HISTORY
- kdDebug () << "\t\t\ttqinvalidate documentRestoredPosition" << endl;
+ kdDebug () << "\t\t\tinvalidate documentRestoredPosition" << endl;
#endif
m_documentRestoredPosition = INT_MAX;
}
@@ -911,7 +911,7 @@ void kpCommandHistory::undo ()
if (m_mainWindow && m_mainWindow->toolHasBegunShape ())
{
#if DEBUG_KP_COMMAND_HISTORY
- kdDebug () << "\thas begun tqshape - cancel draw" << endl;
+ kdDebug () << "\thas begun shape - cancel draw" << endl;
#endif
m_mainWindow->tool ()->cancelShapeInternal ();
}
@@ -928,7 +928,7 @@ void kpCommandHistory::redo ()
//
// Ignoring the request would not be intuitive for tools like
// Polygon & Polyline (where it's not always apparent to the user
- // that s/he's still drawing a tqshape even though the mouse isn't
+ // that s/he's still drawing a shape even though the mouse isn't
// down).
m_mainWindow->tool ()->cancelShapeInternal ();
}
diff --git a/kolourpaint/kpcommandhistory.h b/kolourpaint/kpcommandhistory.h
index da415663..0cc18229 100644
--- a/kolourpaint/kpcommandhistory.h
+++ b/kolourpaint/kpcommandhistory.h
@@ -222,16 +222,16 @@ private:
// Intercepts Undo/Redo requests:
//
-// If the user is currently drawing a tqshape, it cancels it.
+// If the user is currently drawing a shape, it cancels it.
// Else it passes on the Undo/Redo request to kpCommandHistoryBase.
//
// TODO: This is wrong. It won't work if the Undo action is disabled,
// for instance.
//
// Maybe the real solution is to call kpCommandHistoryBase::addCommand()
-// as _soon_ as the tqshape starts - not after it ends. But the
+// as _soon_ as the shape starts - not after it ends. But the
// trouble with this solution is that if the user Undoes/cancels
-// the tqshape s/he's currently drawing, it would replace a Redo
+// the shape s/he's currently drawing, it would replace a Redo
// slot in the history. Arguably you shouldn't be able to Redo
// something you never finished drawing.
//
diff --git a/kolourpaint/kpdefs.h b/kolourpaint/kpdefs.h
index d0343f9e..c509ae0f 100644
--- a/kolourpaint/kpdefs.h
+++ b/kolourpaint/kpdefs.h
@@ -65,71 +65,71 @@
// Settings
//
-#define kpSettingsGroupGeneral TQString::tqfromLatin1 ("General Settings")
-#define kpSettingFirstTime TQString::tqfromLatin1 ("First Time")
-#define kpSettingShowGrid TQString::tqfromLatin1 ("Show Grid")
-#define kpSettingShowPath TQString::tqfromLatin1 ("Show Path")
-#define kpSettingColorSimilarity TQString::tqfromLatin1 ("Color Similarity")
-#define kpSettingDitherOnOpen TQString::tqfromLatin1 ("Dither on Open if Screen is 15/16bpp and Image Num Colors More Than")
-#define kpSettingPrintImageCenteredOnPage TQString::tqfromLatin1 ("Print Image Centered On Page")
+#define kpSettingsGroupGeneral TQString::fromLatin1 ("General Settings")
+#define kpSettingFirstTime TQString::fromLatin1 ("First Time")
+#define kpSettingShowGrid TQString::fromLatin1 ("Show Grid")
+#define kpSettingShowPath TQString::fromLatin1 ("Show Path")
+#define kpSettingColorSimilarity TQString::fromLatin1 ("Color Similarity")
+#define kpSettingDitherOnOpen TQString::fromLatin1 ("Dither on Open if Screen is 15/16bpp and Image Num Colors More Than")
+#define kpSettingPrintImageCenteredOnPage TQString::fromLatin1 ("Print Image Centered On Page")
-#define kpSettingsGroupFileSaveAs TQString::tqfromLatin1 ("File/Save As")
-#define kpSettingsGroupFileExport TQString::tqfromLatin1 ("File/Export")
-#define kpSettingsGroupEditCopyTo TQString::tqfromLatin1 ("Edit/Copy To")
+#define kpSettingsGroupFileSaveAs TQString::fromLatin1 ("File/Save As")
+#define kpSettingsGroupFileExport TQString::fromLatin1 ("File/Export")
+#define kpSettingsGroupEditCopyTo TQString::fromLatin1 ("Edit/Copy To")
-#define kpSettingForcedMimeType TQString::tqfromLatin1 ("Forced MimeType")
-#define kpSettingForcedColorDepth TQString::tqfromLatin1 ("Forced Color Depth")
-#define kpSettingForcedDither TQString::tqfromLatin1 ("Forced Dither")
-#define kpSettingForcedQuality TQString::tqfromLatin1 ("Forced Quality")
+#define kpSettingForcedMimeType TQString::fromLatin1 ("Forced MimeType")
+#define kpSettingForcedColorDepth TQString::fromLatin1 ("Forced Color Depth")
+#define kpSettingForcedDither TQString::fromLatin1 ("Forced Dither")
+#define kpSettingForcedQuality TQString::fromLatin1 ("Forced Quality")
-#define kpSettingLastDocSize TQString::tqfromLatin1 ("Last Document Size")
+#define kpSettingLastDocSize TQString::fromLatin1 ("Last Document Size")
-#define kpSettingMoreEffectsLastEffect TQString::tqfromLatin1 ("More Effects - Last Effect")
+#define kpSettingMoreEffectsLastEffect TQString::fromLatin1 ("More Effects - Last Effect")
-#define kpSettingResizeScaleLastKeepAspect TQString::tqfromLatin1 ("Resize Scale - Last Keep Aspect")
+#define kpSettingResizeScaleLastKeepAspect TQString::fromLatin1 ("Resize Scale - Last Keep Aspect")
-#define kpSettingsGroupMimeTypeProperties TQString::tqfromLatin1 ("MimeType Properties Version 1.2-2")
-#define kpSettingMimeTypeMaximumColorDepth TQString::tqfromLatin1 ("Maximum Color Depth")
-#define kpSettingMimeTypeHasConfigurableColorDepth TQString::tqfromLatin1 ("Configurable Color Depth")
-#define kpSettingMimeTypeHasConfigurableQuality TQString::tqfromLatin1 ("Configurable Quality Setting")
+#define kpSettingsGroupMimeTypeProperties TQString::fromLatin1 ("MimeType Properties Version 1.2-2")
+#define kpSettingMimeTypeMaximumColorDepth TQString::fromLatin1 ("Maximum Color Depth")
+#define kpSettingMimeTypeHasConfigurableColorDepth TQString::fromLatin1 ("Configurable Color Depth")
+#define kpSettingMimeTypeHasConfigurableQuality TQString::fromLatin1 ("Configurable Quality Setting")
-#define kpSettingsGroupUndoRedo TQString::tqfromLatin1 ("Undo/Redo Settings")
-#define kpSettingUndoMinLimit TQString::tqfromLatin1 ("Min Limit")
-#define kpSettingUndoMaxLimit TQString::tqfromLatin1 ("Max Limit")
-#define kpSettingUndoMaxLimitSizeLimit TQString::tqfromLatin1 ("Max Limit Size Limit")
+#define kpSettingsGroupUndoRedo TQString::fromLatin1 ("Undo/Redo Settings")
+#define kpSettingUndoMinLimit TQString::fromLatin1 ("Min Limit")
+#define kpSettingUndoMaxLimit TQString::fromLatin1 ("Max Limit")
+#define kpSettingUndoMaxLimitSizeLimit TQString::fromLatin1 ("Max Limit Size Limit")
-#define kpSettingsGroupThumbnail TQString::tqfromLatin1 ("Thumbnail Settings")
-#define kpSettingThumbnailShown TQString::tqfromLatin1 ("Shown")
-#define kpSettingThumbnailGeometry TQString::tqfromLatin1 ("Geometry")
-#define kpSettingThumbnailZoomed TQString::tqfromLatin1 ("Zoomed")
-#define kpSettingThumbnailShowRectangle TQString::tqfromLatin1 ("ShowRectangle")
+#define kpSettingsGroupThumbnail TQString::fromLatin1 ("Thumbnail Settings")
+#define kpSettingThumbnailShown TQString::fromLatin1 ("Shown")
+#define kpSettingThumbnailGeometry TQString::fromLatin1 ("Geometry")
+#define kpSettingThumbnailZoomed TQString::fromLatin1 ("Zoomed")
+#define kpSettingThumbnailShowRectangle TQString::fromLatin1 ("ShowRectangle")
-#define kpSettingsGroupPreviewSave TQString::tqfromLatin1 ("Save Preview Settings")
-#define kpSettingPreviewSaveGeometry TQString::tqfromLatin1 ("Geometry")
-#define kpSettingPreviewSaveUpdateDelay TQString::tqfromLatin1 ("Update Delay")
+#define kpSettingsGroupPreviewSave TQString::fromLatin1 ("Save Preview Settings")
+#define kpSettingPreviewSaveGeometry TQString::fromLatin1 ("Geometry")
+#define kpSettingPreviewSaveUpdateDelay TQString::fromLatin1 ("Update Delay")
-#define kpSettingsGroupTools TQString::tqfromLatin1 ("Tool Settings")
-#define kpSettingLastTool TQString::tqfromLatin1 ("Last Used Tool")
-#define kpSettingToolBoxIconSize TQString::tqfromLatin1 ("Tool Box Icon Size")
+#define kpSettingsGroupTools TQString::fromLatin1 ("Tool Settings")
+#define kpSettingLastTool TQString::fromLatin1 ("Last Used Tool")
+#define kpSettingToolBoxIconSize TQString::fromLatin1 ("Tool Box Icon Size")
-#define kpSettingsGroupText TQString::tqfromLatin1 ("Text Settings")
-#define kpSettingFontFamily TQString::tqfromLatin1 ("Font Family")
-#define kpSettingFontSize TQString::tqfromLatin1 ("Font Size")
-#define kpSettingBold TQString::tqfromLatin1 ("Bold")
-#define kpSettingItalic TQString::tqfromLatin1 ("Italic")
-#define kpSettingUnderline TQString::tqfromLatin1 ("Underline")
-#define kpSettingStrikeThru TQString::tqfromLatin1 ("Strike Thru")
+#define kpSettingsGroupText TQString::fromLatin1 ("Text Settings")
+#define kpSettingFontFamily TQString::fromLatin1 ("Font Family")
+#define kpSettingFontSize TQString::fromLatin1 ("Font Size")
+#define kpSettingBold TQString::fromLatin1 ("Bold")
+#define kpSettingItalic TQString::fromLatin1 ("Italic")
+#define kpSettingUnderline TQString::fromLatin1 ("Underline")
+#define kpSettingStrikeThru TQString::fromLatin1 ("Strike Thru")
-#define kpSettingsGroupFlattenEffect TQString::tqfromLatin1 ("Flatten Effect Settings")
-#define kpSettingFlattenEffectColor1 TQString::tqfromLatin1 ("Color1")
-#define kpSettingFlattenEffectColor2 TQString::tqfromLatin1 ("Color2")
+#define kpSettingsGroupFlattenEffect TQString::fromLatin1 ("Flatten Effect Settings")
+#define kpSettingFlattenEffectColor1 TQString::fromLatin1 ("Color1")
+#define kpSettingFlattenEffectColor2 TQString::fromLatin1 ("Color2")
//
@@ -140,11 +140,11 @@
//
// This key only exists if the document does. If it exists, it can be empty.
// The URL need not point to a file that exists e.g. "kolourpaint doesnotexist.png".
-#define kpSessionSettingDocumentUrl TQString::tqfromLatin1 ("Session Document Url")
+#define kpSessionSettingDocumentUrl TQString::fromLatin1 ("Session Document Url")
// The size of a document which is not from a URL e.g. "kolourpaint doesnotexist.png".
// This key does not exist for documents from URLs.
-#define kpSessionSettingNotFromUrlDocumentSize TQString::tqfromLatin1 ("Session Not-From-Url Document Size")
+#define kpSessionSettingNotFromUrlDocumentSize TQString::fromLatin1 ("Session Not-From-Url Document Size")
#endif // __kp_defs_h__
diff --git a/kolourpaint/kpdocument.cpp b/kolourpaint/kpdocument.cpp
index fe91bfee..f9934bb4 100644
--- a/kolourpaint/kpdocument.cpp
+++ b/kolourpaint/kpdocument.cpp
@@ -35,7 +35,7 @@
#include <tqcolor.h>
#include <tqbitmap.h>
-#include <tqbrush.h>
+#include <brush.h>
#include <tqfile.h>
#include <tqimage.h>
#include <tqpixmap.h>
@@ -156,7 +156,7 @@ TQPixmap kpDocument::convertToPixmapAsLosslessAsPossible (
metaInfo->setDotsPerMeterY (image.dotsPerMeterY ());
metaInfo->setOffset (image.offset ());
- TQValueList <TQImageTextKeyLang> keyList = image.tqtextList ();
+ TQValueList <TQImageTextKeyLang> keyList = image.textList ();
for (TQValueList <TQImageTextKeyLang>::const_iterator it = keyList.begin ();
it != keyList.end ();
it++)
@@ -475,7 +475,7 @@ bool kpDocument::lossyPromptContinue (const TQPixmap &pixmap,
// low maximum colour depth
i18n ("Lossy File Format"),
KStdGuiItem::save (),
- TQString::tqfromLatin1 ("SaveInLossyMimeTypeDontAskAgain")));
+ TQString::fromLatin1 ("SaveInLossyMimeTypeDontAskAgain")));
}
else if (lossyType & kpDocumentSaveOptions::ColorDepthLow)
{
@@ -490,7 +490,7 @@ bool kpDocument::lossyPromptContinue (const TQPixmap &pixmap,
.arg (saveOptions.colorDepth ()),
i18n ("Low Color Depth"),
KStdGuiItem::save (),
- TQString::tqfromLatin1 ("SaveAtLowColorDepthDontAskAgain")));
+ TQString::fromLatin1 ("SaveAtLowColorDepthDontAskAgain")));
}
#undef TQUIT_IF_CANCEL
@@ -628,8 +628,8 @@ bool kpDocument::savePixmapToFile (const TQPixmap &pixmap,
<< ",overwritePrompt=" << overwritePrompt
<< ",lossyPrompt=" << lossyPrompt
<< ")" << endl;
- saveOptions.printDebug (TQString::tqfromLatin1 ("\tsaveOptions"));
- metaInfo.printDebug (TQString::tqfromLatin1 ("\tmetaInfo"));
+ saveOptions.printDebug (TQString::fromLatin1 ("\tsaveOptions"));
+ metaInfo.printDebug (TQString::fromLatin1 ("\tmetaInfo"));
#endif
if (overwritePrompt && KIO::NetAccess::exists (url, false/*write*/, parent))
@@ -1109,22 +1109,22 @@ void kpDocument::setSelection (const kpSelection &selection)
(selection.type () == kpSelection::Text));
// We don't change the Selection Tool if the new selection's
- // tqshape is merely different to the current tool's (e.g. rectangular
+ // shape is merely different to the current tool's (e.g. rectangular
// vs elliptical) because:
//
// 1. All image selection tools support editing selections of all the
- // different tqshapes anyway.
+ // different shapes anyway.
// 2. Suppose the user is trying out different drags of selection borders
- // and then decides to paste a differently tqshaped selection before continuing
+ // and then decides to paste a differently shaped selection before continuing
// to try out different borders. If the pasting were to switch to
- // a differently tqshaped tool, the borders drawn after the paste would
- // be using a new tqshape rather than the tqshape before the paste. This
+ // a differently shaped tool, the borders drawn after the paste would
+ // be using a new shape rather than the shape before the paste. This
// could get irritating so we don't do the switch.
//
if (m_mainWindow &&
(!m_mainWindow->toolIsASelectionTool () || isTextChanged))
{
- // Switch to the appropriately tqshaped selection tool
+ // Switch to the appropriately shaped selection tool
// _before_ we change the selection
// (all selection tool's ::end() functions nuke the current selection)
switch (selection.type ())
diff --git a/kolourpaint/kpdocumentmetainfo.cpp b/kolourpaint/kpdocumentmetainfo.cpp
index f0b9f0f0..01728efa 100644
--- a/kolourpaint/kpdocumentmetainfo.cpp
+++ b/kolourpaint/kpdocumentmetainfo.cpp
@@ -82,7 +82,7 @@ kpDocumentMetaInfo &kpDocumentMetaInfo::operator= (const kpDocumentMetaInfo &rhs
void kpDocumentMetaInfo::printDebug (const TQString &prefix) const
{
const TQString usedPrefix = !prefix.isEmpty () ?
- prefix + TQString::tqfromLatin1 (":") :
+ prefix + TQString::fromLatin1 (":") :
TQString();
kdDebug () << usedPrefix << endl;
diff --git a/kolourpaint/kpdocumentsaveoptions.cpp b/kolourpaint/kpdocumentsaveoptions.cpp
index 3c312e42..6bbb81d4 100644
--- a/kolourpaint/kpdocumentsaveoptions.cpp
+++ b/kolourpaint/kpdocumentsaveoptions.cpp
@@ -114,7 +114,7 @@ kpDocumentSaveOptions &kpDocumentSaveOptions::operator= (const kpDocumentSaveOpt
void kpDocumentSaveOptions::printDebug (const TQString &prefix) const
{
const TQString usedPrefix = !prefix.isEmpty () ?
- prefix + TQString::tqfromLatin1 (": ") :
+ prefix + TQString::fromLatin1 (": ") :
TQString();
kdDebug () << usedPrefix
@@ -246,7 +246,7 @@ bool kpDocumentSaveOptions::qualityIsInvalid () const
TQString kpDocumentSaveOptions::defaultMimeType (KConfigBase *config)
{
return config->readEntry (kpSettingForcedMimeType,
- TQString::tqfromLatin1 ("image/png"));
+ TQString::fromLatin1 ("image/png"));
}
// public static
@@ -445,19 +445,19 @@ int kpDocumentSaveOptions::mimeTypeMaximumColorDepth (const TQString &mimeType)
// SYNC: update mime info here
// Greyscale actually (unenforced since depth not set to configurable)
- defaultList << TQString::tqfromLatin1 ("image/x-eps:32");
+ defaultList << TQString::fromLatin1 ("image/x-eps:32");
- defaultList << TQString::tqfromLatin1 ("image/x-portable-bitmap:1");
+ defaultList << TQString::fromLatin1 ("image/x-portable-bitmap:1");
// Greyscale actually (unenforced since depth not set to configurable)
- defaultList << TQString::tqfromLatin1 ("image/x-portable-greymap:8");
+ defaultList << TQString::fromLatin1 ("image/x-portable-greymap:8");
- defaultList << TQString::tqfromLatin1 ("image/x-xbm:1");
+ defaultList << TQString::fromLatin1 ("image/x-xbm:1");
const TQStringList mimeTypeList = mimeTypesSupportingProperty (
kpSettingMimeTypeMaximumColorDepth, defaultList);
- const TQString mimeTypeColon = mimeType + TQString::tqfromLatin1 (":");
+ const TQString mimeTypeColon = mimeType + TQString::fromLatin1 (":");
for (TQStringList::const_iterator it = mimeTypeList.begin ();
it != mimeTypeList.end ();
it++)
@@ -488,16 +488,16 @@ bool kpDocumentSaveOptions::mimeTypeHasConfigurableColorDepth (const TQString &m
TQStringList defaultMimeTypes;
// SYNC: update mime info here
- defaultMimeTypes << TQString::tqfromLatin1 ("image/png");
- defaultMimeTypes << TQString::tqfromLatin1 ("image/x-bmp");
- defaultMimeTypes << TQString::tqfromLatin1 ("image/x-pcx");
+ defaultMimeTypes << TQString::fromLatin1 ("image/png");
+ defaultMimeTypes << TQString::fromLatin1 ("image/x-bmp");
+ defaultMimeTypes << TQString::fromLatin1 ("image/x-pcx");
// TODO: Only 1, 24 not 8; TQt only sees 32 but "file" cmd realises
// it's either 1 or 24.
- defaultMimeTypes << TQString::tqfromLatin1 ("image/x-rgb");
+ defaultMimeTypes << TQString::fromLatin1 ("image/x-rgb");
// TODO: Only 8 and 24 - no 1.
- defaultMimeTypes << TQString::tqfromLatin1 ("image/x-xpm");
+ defaultMimeTypes << TQString::fromLatin1 ("image/x-xpm");
return mimeTypeSupportsProperty (mimeType,
kpSettingMimeTypeHasConfigurableColorDepth,
@@ -517,8 +517,8 @@ bool kpDocumentSaveOptions::mimeTypeHasConfigurableQuality (const TQString &mime
TQStringList defaultMimeTypes;
// SYNC: update mime info here
- defaultMimeTypes << TQString::tqfromLatin1 ("image/jp2");
- defaultMimeTypes << TQString::tqfromLatin1 ("image/jpeg");
+ defaultMimeTypes << TQString::fromLatin1 ("image/jp2");
+ defaultMimeTypes << TQString::fromLatin1 ("image/jpeg");
return mimeTypeSupportsProperty (mimeType,
kpSettingMimeTypeHasConfigurableQuality,
diff --git a/kolourpaint/kpdocumentsaveoptionswidget.cpp b/kolourpaint/kpdocumentsaveoptionswidget.cpp
index 372743af..f08823b9 100644
--- a/kolourpaint/kpdocumentsaveoptionswidget.cpp
+++ b/kolourpaint/kpdocumentsaveoptionswidget.cpp
@@ -34,7 +34,7 @@
#include <tqbuffer.h>
#include <tqimage.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtimer.h>
#include <kcombobox.h>
@@ -712,9 +712,9 @@ void kpDocumentSaveOptionsWidget::setMode (Mode mode)
void kpDocumentSaveOptionsWidget::repaintLabels ()
{
if (mode () != Quality)
- m_colorDepthLabel->tqrepaint ();
+ m_colorDepthLabel->repaint ();
if (mode () == Quality)
- m_qualityLabel->tqrepaint ();
+ m_qualityLabel->repaint ();
}
@@ -767,7 +767,7 @@ void kpDocumentSaveOptionsWidget::showPreview (bool yes)
if (m_previewDialogLastRelativeGeometry.isEmpty ())
{
#if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET
- kdDebug () << "\tread cfg preview dialog last rel tqgeometry" << endl;
+ kdDebug () << "\tread cfg preview dialog last rel geometry" << endl;
#endif
KConfigGroupSaver cfgGroupSaver (KGlobal::config (), kpSettingsGroupPreviewSave);
KConfigBase *cfg = cfgGroupSaver.config ();
@@ -826,7 +826,7 @@ void kpDocumentSaveOptionsWidget::showPreview (bool yes)
#if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET
- kdDebug () << "\ttqgeometry after show="
+ kdDebug () << "\tgeometry after show="
<< TQRect (m_previewDialog->x (), m_previewDialog->y (),
m_previewDialog->width (), m_previewDialog->height ())
<< endl;
@@ -852,7 +852,7 @@ void kpDocumentSaveOptionsWidget::showPreview (bool yes)
cfg->sync ();
#if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET
- kdDebug () << "\tsaving preview tqgeometry "
+ kdDebug () << "\tsaving preview geometry "
<< m_previewDialogLastRelativeGeometry
<< " (TQt would have us believe "
<< kpWidgetMapper::fromGlobal (m_visualParent,
@@ -942,7 +942,7 @@ void kpDocumentSaveOptionsWidget::updatePreviewDialogLastRelativeGeometry ()
else
{
#if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET
- kdDebug () << "\tnot visible - ignoring tqgeometry" << endl;
+ kdDebug () << "\tnot visible - ignoring geometry" << endl;
#endif
}
}
diff --git a/kolourpaint/kpmainwindow.cpp b/kolourpaint/kpmainwindow.cpp
index 3b117803..439f99c4 100644
--- a/kolourpaint/kpmainwindow.cpp
+++ b/kolourpaint/kpmainwindow.cpp
@@ -157,7 +157,7 @@ void kpMainWindow::readThumbnailSettings ()
#if DEBUG_KP_MAIN_WINDOW
kdDebug () << "\t\tThumbnail Settings: shown=" << m_configThumbnailShown
- << " tqgeometry=" << m_configThumbnailGeometry
+ << " geometry=" << m_configThumbnailGeometry
<< " zoomed=" << m_configZoomedThumbnail
<< " showRectangle=" << d->m_configThumbnailShowRectangle
<< endl;
@@ -731,7 +731,7 @@ void kpMainWindow::setDocument (kpDocument *newDoc)
connect (m_document, TQT_SIGNAL (selectionIsTextChanged (bool)),
this, TQT_SLOT (slotImageMenuUpdateDueToSelection ()));
- // tqStatus bar
+ // Status bar
connect (m_document, TQT_SIGNAL (documentOpened ()),
this, TQT_SLOT (recalculateStatusBar ()));
@@ -808,7 +808,7 @@ void kpMainWindow::setDocument (kpDocument *newDoc)
#endif
slotCreateThumbnail ();
}
- // this' tqgeometry is weird ATM
+ // this' geometry is weird ATM
else
{
#if DEBUG_KP_MAIN_WINDOW
diff --git a/kolourpaint/kpmainwindow.h b/kolourpaint/kpmainwindow.h
index bd0df32b..3da1e570 100644
--- a/kolourpaint/kpmainwindow.h
+++ b/kolourpaint/kpmainwindow.h
@@ -640,7 +640,7 @@ private slots:
/*
- * tqStatus Bar
+ * Status Bar
*/
private:
diff --git a/kolourpaint/kpmainwindow_edit.cpp b/kolourpaint/kpmainwindow_edit.cpp
index e5156148..8d3cdd61 100644
--- a/kolourpaint/kpmainwindow_edit.cpp
+++ b/kolourpaint/kpmainwindow_edit.cpp
@@ -28,7 +28,7 @@
#include <kpmainwindow.h>
#include <tqapplication.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
#include <tqdatetime.h>
#include <tqfontmetrics.h>
#include <tqimage.h>
@@ -129,7 +129,7 @@ void kpMainWindow::setupEditMenuActions ()
// Paste should always be enabled, as long as there is something paste
// (independent of whether we have a document or not)
- connect (TQApplication::tqclipboard (), TQT_SIGNAL (dataChanged ()),
+ connect (TQApplication::clipboard (), TQT_SIGNAL (dataChanged ()),
TQT_TQOBJECT(this), TQT_SLOT (slotEnablePaste ()));
slotEnablePaste ();
}
@@ -223,7 +223,7 @@ void kpMainWindow::slotCopy ()
{
if (!sel.text ().isEmpty ())
{
- TQApplication::tqclipboard ()->setData (new TQTextDrag (sel.text ()),
+ TQApplication::clipboard ()->setData (new TQTextDrag (sel.text ()),
TQClipboard::Clipboard);
// SYNC: Normally, users highlight text and press CTRL+C.
@@ -243,7 +243,7 @@ void kpMainWindow::slotCopy ()
// Once we change KolourPaint to support highlighted text
// and CTRL+C to copy only the highlighted text, delete
// this code.
- TQApplication::tqclipboard ()->setData (new TQTextDrag (sel.text ()),
+ TQApplication::clipboard ()->setData (new TQTextDrag (sel.text ()),
TQClipboard::Selection);
}
}
@@ -268,7 +268,7 @@ void kpMainWindow::slotCopy ()
rawPixmap,
TQt::white)); // CONFIG
- TQApplication::tqclipboard ()->setData (new kpSelectionDrag (sel),
+ TQApplication::clipboard ()->setData (new kpSelectionDrag (sel),
TQClipboard::Clipboard);
}
@@ -288,7 +288,7 @@ static bool HasSomethingToPaste (kpMainWindow *mw)
bool hasSomething = false;
- TQMimeSource *ms = TQApplication::tqclipboard ()->data (TQClipboard::Clipboard);
+ TQMimeSource *ms = TQApplication::clipboard ()->data (TQClipboard::Clipboard);
if (ms)
{
// It's faster to test for TQTextDrag::canDecode() first due to the
@@ -311,7 +311,7 @@ static bool HasSomethingToPaste (kpMainWindow *mw)
return hasSomething;
}
-// HACK: SYNC: Non-TQt apps do not cause TQApplication::tqtqclipboard() to
+// HACK: SYNC: Non-TQt apps do not cause TQApplication::tqclipboard() to
// emit dataChanged(). We don't want to have our paste
// action disabled when we can actually paste something.
//
@@ -683,7 +683,7 @@ void kpMainWindow::slotPaste ()
// Acquire the pixmap
//
- TQMimeSource *ms = TQApplication::tqclipboard ()->data (TQClipboard::Clipboard);
+ TQMimeSource *ms = TQApplication::clipboard ()->data (TQClipboard::Clipboard);
if (!ms)
{
kdError () << "kpMainWindow::slotPaste() without mimeSource" << endl;
diff --git a/kolourpaint/kpmainwindow_settings.cpp b/kolourpaint/kpmainwindow_settings.cpp
index 9fc82440..c4f339db 100644
--- a/kolourpaint/kpmainwindow_settings.cpp
+++ b/kolourpaint/kpmainwindow_settings.cpp
@@ -195,7 +195,7 @@ void kpMainWindow::slotNewToolBarConfig ()
KMessageBox::information (this,
i18n ("You have to restart KolourPaint for these changes to take effect."),
i18n ("Toolbar Settings Changed"),
- TQString::tqfromLatin1 ("ToolBarSettingsChanged"));
+ TQString::fromLatin1 ("ToolBarSettingsChanged"));
//createGUI();
//applyMainWindowSettings (kapp->config (), autoSaveGroup ());
diff --git a/kolourpaint/kpmainwindow_text.cpp b/kolourpaint/kpmainwindow_text.cpp
index 859e33f0..44bea619 100644
--- a/kolourpaint/kpmainwindow_text.cpp
+++ b/kolourpaint/kpmainwindow_text.cpp
@@ -80,7 +80,7 @@ void kpMainWindow::readAndApplyTextSettings ()
KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
KConfigBase *cfg = cfgGroupSaver.config ();
- m_actionTextFontFamily->setFont (cfg->readEntry (kpSettingFontFamily, TQString::tqfromLatin1 ("Times")));
+ m_actionTextFontFamily->setFont (cfg->readEntry (kpSettingFontFamily, TQString::fromLatin1 ("Times")));
m_actionTextFontSize->setFontSize (cfg->readNumEntry (kpSettingFontSize, 14));
m_actionTextBold->setChecked (cfg->readBoolEntry (kpSettingBold, false));
m_actionTextItalic->setChecked (cfg->readBoolEntry (kpSettingItalic, false));
diff --git a/kolourpaint/kpmainwindow_view.cpp b/kolourpaint/kpmainwindow_view.cpp
index 8be4beb8..c90479b0 100644
--- a/kolourpaint/kpmainwindow_view.cpp
+++ b/kolourpaint/kpmainwindow_view.cpp
@@ -289,7 +289,7 @@ void kpMainWindow::zoomTo (int zoomLevel, bool centerUnderCursor)
// Ordinary flicker is better than the whole view moving
TQPainter p (m_mainView);
p.fillRect (m_mainView->rect (),
- m_scrollView->viewport ()->tqcolorGroup ().background ());
+ m_scrollView->viewport ()->colorGroup ().background ());
}
}
@@ -842,13 +842,13 @@ void kpMainWindow::slotSaveThumbnailGeometry ()
TQRect rect (m_thumbnail->x (), m_thumbnail->y (),
m_thumbnail->width (), m_thumbnail->height ());
#if DEBUG_KP_MAIN_WINDOW
- kdDebug () << "\tthumbnail relative tqgeometry=" << rect << endl;
+ kdDebug () << "\tthumbnail relative geometry=" << rect << endl;
#endif
m_configThumbnailGeometry = mapFromGlobal (rect);
#if DEBUG_KP_MAIN_WINDOW
- kdDebug () << "\tCONFIG: saving thumbnail tqgeometry "
+ kdDebug () << "\tCONFIG: saving thumbnail geometry "
<< m_configThumbnailGeometry
<< endl;
#endif
@@ -1067,11 +1067,11 @@ void kpMainWindow::updateThumbnail ()
kdDebug () << "\tcreating thumbnail" << endl;
#endif
- // Read last saved tqgeometry before creating thumbnail & friends
+ // Read last saved geometry before creating thumbnail & friends
// in case they call notifyThumbnailGeometryChanged()
TQRect thumbnailGeometry = m_configThumbnailGeometry;
#if DEBUG_KP_MAIN_WINDOW
- kdDebug () << "\t\tlast used tqgeometry=" << thumbnailGeometry << endl;
+ kdDebug () << "\t\tlast used geometry=" << thumbnailGeometry << endl;
#endif
m_thumbnail = new kpThumbnail (this, "thumbnail");
@@ -1084,9 +1084,9 @@ void kpMainWindow::updateThumbnail ()
if (!thumbnailGeometry.isEmpty () &&
TQRect (0, 0, width (), height ()).intersects (thumbnailGeometry))
{
- const TQRect tqgeometry = mapToGlobal (thumbnailGeometry);
- m_thumbnail->resize (tqgeometry.size ());
- m_thumbnail->move (tqgeometry.topLeft ());
+ const TQRect geometry = mapToGlobal (thumbnailGeometry);
+ m_thumbnail->resize (geometry.size ());
+ m_thumbnail->move (geometry.topLeft ());
}
else
{
@@ -1101,7 +1101,7 @@ void kpMainWindow::updateThumbnail ()
initialHeight);
#if DEBUG_KP_MAIN_WINDOW
- kdDebug () << "\t\tcreating tqgeometry=" << geometryRect << endl;
+ kdDebug () << "\t\tcreating geometry=" << geometryRect << endl;
#endif
geometryRect = mapToGlobal (geometryRect);
diff --git a/kolourpaint/kpselection.cpp b/kolourpaint/kpselection.cpp
index 43f81984..c5381d7d 100644
--- a/kolourpaint/kpselection.cpp
+++ b/kolourpaint/kpselection.cpp
@@ -373,7 +373,7 @@ TQBitmap kpSelection::maskForOwnType (bool nullForRectangular) const
points.detach ();
points.translate (-m_rect.x (), -m_rect.y ());
- painter.tqdrawPolygon (points, false/*even-odd algo*/);
+ painter.drawPolygon (points, false/*even-odd algo*/);
}
painter.end ();
@@ -921,7 +921,7 @@ TQString kpSelection::textForTextLines (const TQValueVector <TQString> &textLine
it != textLines_.end ();
it++)
{
- bigString += TQString::tqfromLatin1 ("\n");
+ bigString += TQString::fromLatin1 ("\n");
bigString += (*it);
}
@@ -1049,7 +1049,7 @@ int kpSelection::minimumHeightForTextStyle (const kpTextStyle &)
}
// public static
-TQSize kpSelection::tqminimumSizeForTextStyle (const kpTextStyle &textStyle)
+TQSize kpSelection::minimumSizeForTextStyle (const kpTextStyle &textStyle)
{
return TQSize (minimumWidthForTextStyle (textStyle),
minimumHeightForTextStyle (textStyle));
@@ -1061,7 +1061,7 @@ int kpSelection::preferredMinimumWidthForTextStyle (const kpTextStyle &textStyle
{
const int about15CharsWidth =
textStyle.fontMetrics ().width (
- TQString::tqfromLatin1 ("1234567890abcde"));
+ TQString::fromLatin1 ("1234567890abcde"));
const int preferredMinWidth =
TQMAX (150,
@@ -1108,7 +1108,7 @@ int kpSelection::minimumHeight () const
}
// public
-TQSize kpSelection::tqminimumSize () const
+TQSize kpSelection::minimumSize () const
{
return TQSize (minimumWidth (), minimumHeight ());
}
diff --git a/kolourpaint/kpselection.h b/kolourpaint/kpselection.h
index 24b1ba39..a227fef2 100644
--- a/kolourpaint/kpselection.h
+++ b/kolourpaint/kpselection.h
@@ -169,7 +169,7 @@ public:
// Be more robust when external enforcement fails.
static int minimumWidthForTextStyle (const kpTextStyle &);
static int minimumHeightForTextStyle (const kpTextStyle &);
- static TQSize tqminimumSizeForTextStyle (const kpTextStyle &);
+ static TQSize minimumSizeForTextStyle (const kpTextStyle &);
static int preferredMinimumWidthForTextStyle (const kpTextStyle &textStyle);
static int preferredMinimumHeightForTextStyle (const kpTextStyle &textStyle);
@@ -177,7 +177,7 @@ public:
int minimumWidth () const;
int minimumHeight () const;
- TQSize tqminimumSize () const;
+ TQSize minimumSize () const;
int textRowForPoint (const TQPoint &globalPoint) const;
int textColForPoint (const TQPoint &globalPoint) const;
diff --git a/kolourpaint/kpselectiondrag.cpp b/kolourpaint/kpselectiondrag.cpp
index 22cdeb4a..9c680abb 100644
--- a/kolourpaint/kpselectiondrag.cpp
+++ b/kolourpaint/kpselectiondrag.cpp
@@ -143,10 +143,10 @@ bool kpSelectionDrag::provides (const char *mimeType) const
}
// public virtual [base TQMimeSource]
-TQByteArray kpSelectionDrag::tqencodedData (const char *mimeType) const
+TQByteArray kpSelectionDrag::encodedData (const char *mimeType) const
{
#if DEBUG_KP_SELECTION_DRAG
- kdDebug () << "kpSelectionDrag::tqencodedData(" << mimeType << ")" << endl;
+ kdDebug () << "kpSelectionDrag::encodedData(" << mimeType << ")" << endl;
#endif
if (!mimeType)
@@ -192,7 +192,7 @@ TQByteArray kpSelectionDrag::tqencodedData (const char *mimeType) const
}
else
{
- kdError () << "kpSelectionDrag::tqencodedData(" << mimeType << ")"
+ kdError () << "kpSelectionDrag::encodedData(" << mimeType << ")"
<< " kpSelectionDrag(TQImage) could not decode data into TQImage"
<< endl;
stream << kpSelection ();
@@ -207,7 +207,7 @@ TQByteArray kpSelectionDrag::tqencodedData (const char *mimeType) const
kdDebug () << "\twant it as TQImage in TQByteArray" << endl;
#endif
- return TQImageDrag::tqencodedData (mimeType);
+ return TQImageDrag::encodedData (mimeType);
}
}
@@ -255,7 +255,7 @@ bool kpSelectionDrag::decode (const TQMimeSource *e, kpSelection &sel,
#if DEBUG_KP_SELECTION_DRAG
kdDebug () << "\tmimeSource provides selection - just return it in TQByteArray" << endl;
#endif
- TQByteArray data = e->tqencodedData (kpSelectionDrag::selectionMimeType);
+ TQByteArray data = e->encodedData (kpSelectionDrag::selectionMimeType);
TQDataStream stream (data, IO_ReadOnly);
// (no need for wali as kpSelection's by definition only support TQPixmap's)
diff --git a/kolourpaint/kpselectiondrag.h b/kolourpaint/kpselectiondrag.h
index 93473509..4ed90d7f 100644
--- a/kolourpaint/kpselectiondrag.h
+++ b/kolourpaint/kpselectiondrag.h
@@ -56,7 +56,7 @@ protected:
public:
virtual const char *format (int which = 0) const;
virtual bool provides (const char *mimeType) const;
- virtual TQByteArray tqencodedData (const char *mimeType) const;
+ virtual TQByteArray encodedData (const char *mimeType) const;
static bool canDecode (const TQMimeSource *e);
static bool decode (const TQMimeSource *e, TQImage &img);
diff --git a/kolourpaint/kpthumbnail.cpp b/kolourpaint/kpthumbnail.cpp
index 84923c1d..a1de8556 100644
--- a/kolourpaint/kpthumbnail.cpp
+++ b/kolourpaint/kpthumbnail.cpp
@@ -63,16 +63,16 @@ kpThumbnail::kpThumbnail (kpMainWindow *parent, const char *name)
}
- TQSize layoutMinimumSize = tqlayout () ? tqlayout ()->tqminimumSize () : TQSize ();
+ TQSize layoutMinimumSize = layout () ? layout ()->minimumSize () : TQSize ();
#if DEBUG_KP_THUMBNAIL
- kdDebug () << "\ttqlayout=" << tqlayout ()
- << " minSize=" << (tqlayout () ? tqlayout ()->tqminimumSize () : TQSize ()) << endl;
+ kdDebug () << "\tlayout=" << layout ()
+ << " minSize=" << (layout () ? layout ()->minimumSize () : TQSize ()) << endl;
kdDebug () << "\tboxLayout=" << boxLayout ()
- << " minSize=" << (boxLayout () ? boxLayout ()->tqminimumSize () : TQSize ())
+ << " minSize=" << (boxLayout () ? boxLayout ()->minimumSize () : TQSize ())
<< endl;
#endif
- if (tqlayout ())
- tqlayout ()->setResizeMode (TQLayout::FreeResize);
+ if (layout ())
+ layout ()->setResizeMode (TQLayout::FreeResize);
setMinimumSize (TQMAX (layoutMinimumSize.width (), 64),
TQMAX (layoutMinimumSize.height (), 64));
diff --git a/kolourpaint/kptool.cpp b/kolourpaint/kptool.cpp
index da240492..1cdb1323 100644
--- a/kolourpaint/kptool.cpp
+++ b/kolourpaint/kptool.cpp
@@ -34,10 +34,10 @@
#include <limits.h>
#include <tqapplication.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
#include <tqcursor.h>
#include <tqevent.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpainter.h>
#include <tqpixmap.h>
@@ -153,7 +153,7 @@ void kpTool::createAction ()
m_action = new kpToolAction (text (), iconName (), shortcutForKey (m_key),
this, TQT_SLOT (slotActionActivated ()),
m_mainWindow->actionCollection (), name ());
- m_action->setExclusiveGroup (TQString::tqfromLatin1 ("Tool Box Actions"));
+ m_action->setExclusiveGroup (TQString::fromLatin1 ("Tool Box Actions"));
m_action->setWhatsThis (description ());
connect (m_action, TQT_SIGNAL (toolTipChanged (const TQString &)),
@@ -744,7 +744,7 @@ void kpTool::endDrawInternal (const TQPoint &thisPoint, const TQRect &normalized
// private
void kpTool::endShapeInternal (const TQPoint &thisPoint, const TQRect &normalizedRect)
{
- endDrawInternal (thisPoint, normalizedRect, true/*end tqshape*/);
+ endDrawInternal (thisPoint, normalizedRect, true/*end shape*/);
}
// virtual
@@ -944,7 +944,7 @@ void kpTool::mousePressEvent (TQMouseEvent *e)
if (m_mainWindow && e->button () == Qt::MidButton)
{
- const TQString text = TQApplication::tqclipboard ()->text (TQClipboard::Selection);
+ const TQString text = TQApplication::clipboard ()->text (TQClipboard::Selection);
#if DEBUG_KP_TOOL && 1
kdDebug () << "\tMMB pasteText='" << text << "'" << endl;
#endif
@@ -1046,7 +1046,7 @@ void kpTool::mouseMoveEvent (TQMouseEvent *e)
<< " viewUnderCursorTQt=" << (v1 ? v1->name () : "(none)")
<< " viewUnderStartPoint=" << (v2 ? v2->name () : "(none)")
<< endl;
- kdDebug () << "\ttqfocusWidget=" << kapp->tqfocusWidget () << endl;
+ kdDebug () << "\tfocusWidget=" << kapp->focusWidget () << endl;
#endif
TQt::ButtonState buttonState = e->stateAfter ();
@@ -1154,7 +1154,7 @@ void kpTool::wheelEvent (TQWheelEvent *e)
if ((e->state () & TQt::ControlButton) == 0)
return;
- // If drawing, bye; don't care if a tqshape in progress though.
+ // If drawing, bye; don't care if a shape in progress though.
if (hasBegunDraw ())
return;
@@ -1652,7 +1652,7 @@ bool kpTool::warnIfBigImageSize (int oldWidth, int oldHeight,
text,
caption,
continueButtonText,
- TQString::tqfromLatin1 ("BigImageDontAskAgain"));
+ TQString::fromLatin1 ("BigImageDontAskAgain"));
return (accept == KMessageBox::Continue);
}
diff --git a/kolourpaint/kptool.h b/kolourpaint/kptool.h
index 03bedb0a..b5555d64 100644
--- a/kolourpaint/kptool.h
+++ b/kolourpaint/kptool.h
@@ -341,7 +341,7 @@ protected:
/*
- * User Notifications (tqStatus Bar)
+ * User Notifications (Status Bar)
*/
public:
diff --git a/kolourpaint/kpview.cpp b/kolourpaint/kpview.cpp
index 5b68a7b2..c130c0d9 100644
--- a/kolourpaint/kpview.cpp
+++ b/kolourpaint/kpview.cpp
@@ -1568,7 +1568,7 @@ void kpView::paintEventDrawSelectionResizeHandles (TQPainter *painter, const TQR
painter->setRasterOp (TQt::XorROP);
}
- TQMemArray <TQRect> rects = selResizeHandlesRegion.tqrects ();
+ TQMemArray <TQRect> rects = selResizeHandlesRegion.rects ();
for (TQMemArray <TQRect>::ConstIterator it = rects.begin ();
it != rects.end ();
it++)
@@ -1888,7 +1888,7 @@ void kpView::paintEvent (TQPaintEvent *e)
TQRegion viewRegion = clipRegion ().intersect (e->region ());
- TQMemArray <TQRect> rects = viewRegion.tqrects ();
+ TQMemArray <TQRect> rects = viewRegion.rects ();
#if DEBUG_KP_VIEW_RENDERER && 1
kdDebug () << "\t#rects = " << rects.count () << endl;
#endif
diff --git a/kolourpaint/kpviewmanager.cpp b/kolourpaint/kpviewmanager.cpp
index 3586a173..71b58a2c 100644
--- a/kolourpaint/kpviewmanager.cpp
+++ b/kolourpaint/kpviewmanager.cpp
@@ -628,7 +628,7 @@ void kpViewManager::updateView (kpView *v, const TQRect &viewRect)
if (!queueUpdates ())
{
if (fastUpdates ())
- v->tqrepaint (viewRect, false/*no erase*/);
+ v->repaint (viewRect, false/*no erase*/);
else
v->update (viewRect);
}
@@ -646,7 +646,7 @@ void kpViewManager::updateView (kpView *v, const TQRegion &viewRegion)
if (!queueUpdates ())
{
if (fastUpdates ())
- v->tqrepaint (viewRegion, false/*no erase*/);
+ v->repaint (viewRegion, false/*no erase*/);
else
v->update (viewRegion.boundingRect ());
}
diff --git a/kolourpaint/kpviewscrollablecontainer.cpp b/kolourpaint/kpviewscrollablecontainer.cpp
index e8ea5a5d..80e9d9e7 100644
--- a/kolourpaint/kpviewscrollablecontainer.cpp
+++ b/kolourpaint/kpviewscrollablecontainer.cpp
@@ -184,7 +184,7 @@ void kpGrip::updatePixmap ()
return;
TQPixmap pixmap (width (), height ());
- pixmap.fill (tqcolorGroup ().highlight ());
+ pixmap.fill (colorGroup ().highlight ());
kpPixmapFX::ensureTransparentAt (&pixmap, pixmap.rect ());
const TQRect hr = hotRect ();
#if DEBUG_KP_VIEW_SCROLLABLE_CONTAINER
@@ -663,7 +663,7 @@ void kpViewScrollableContainer::repaintWidgetAtResizeLineViewRect (
// TODO: should be "!widget->testWFlags (TQt::WRepaintNoErase)"
// but for some reason, doesn't work for viewport().
const bool erase = !dynamic_cast <kpView *> (widget);
- widget->tqrepaint (redrawWidgetRect, erase);
+ widget->repaint (redrawWidgetRect, erase);
}
}
@@ -1269,7 +1269,7 @@ bool kpViewScrollableContainer::slotDragScroll (bool *didSomething)
// Repaint newly exposed region immediately to reduce tearing
// of scrollView.
- m_view->tqrepaint (region, false/*no erase*/);
+ m_view->repaint (region, false/*no erase*/);
}
}
diff --git a/kolourpaint/patches/doc_resize_no_flicker.diff b/kolourpaint/patches/doc_resize_no_flicker.diff
index 20f4828c..3832fbff 100644
--- a/kolourpaint/patches/doc_resize_no_flicker.diff
+++ b/kolourpaint/patches/doc_resize_no_flicker.diff
@@ -147,8 +147,8 @@ diff -u -p -r1.7 kpviewscrollablecontainer.cpp
// TODO: should be "!widget->testWFlags (Qt::WRepaintNoErase)"
// but for some reason, doesn't work for viewport().
const bool erase = !dynamic_cast <kpView *> (widget);
-- widget->tqrepaint (redrawWidgetRect, erase);
-+ widget->tqrepaint (redrawWidgetRegion, erase);
+- widget->repaint (redrawWidgetRect, erase);
++ widget->repaint (redrawWidgetRegion, erase);
}
}
diff --git a/kolourpaint/pixmapfx/kpeffectbalance.cpp b/kolourpaint/pixmapfx/kpeffectbalance.cpp
index 946814d5..d66f6c91 100644
--- a/kolourpaint/pixmapfx/kpeffectbalance.cpp
+++ b/kolourpaint/pixmapfx/kpeffectbalance.cpp
@@ -35,7 +35,7 @@
#include <tqfontmetrics.h>
#include <tqimage.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpixmap.h>
#include <tqpushbutton.h>
@@ -275,9 +275,9 @@ kpEffectBalanceWidget::kpEffectBalanceWidget (bool actOnSelection,
// TODO: This is what should be shown in the m_gammaInput spinbox
m_gammaLabel = new TQLabel (this);
// TODO: This doesn't seem to be wide enough with some fonts so the
- // whole tqlayout moves when we drag the gamma slider.
+ // whole layout moves when we drag the gamma slider.
m_gammaLabel->setMinimumWidth (m_gammaLabel->fontMetrics ().width (" 10.00 "));
- m_gammaLabel->tqsetAlignment (m_gammaLabel->tqalignment () | TQt::AlignRight);
+ m_gammaLabel->setAlignment (m_gammaLabel->alignment () | TQt::AlignRight);
TQPushButton *gammaResetPushButton = new TQPushButton (i18n ("Rese&t"), this);
@@ -438,7 +438,7 @@ void kpEffectBalanceWidget::recalculateGammaLabel ()
'f'/*[-]9.9*/,
2/*precision*/) +
" ");
- m_gammaLabel->tqrepaint ();
+ m_gammaLabel->repaint ();
}
diff --git a/kolourpaint/pixmapfx/kpeffectblursharpen.cpp b/kolourpaint/pixmapfx/kpeffectblursharpen.cpp
index e1feaaa3..5d1ba4b1 100644
--- a/kolourpaint/pixmapfx/kpeffectblursharpen.cpp
+++ b/kolourpaint/pixmapfx/kpeffectblursharpen.cpp
@@ -32,7 +32,7 @@
#include <tqimage.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpixmap.h>
#include <tqpushbutton.h>
diff --git a/kolourpaint/pixmapfx/kpeffectemboss.cpp b/kolourpaint/pixmapfx/kpeffectemboss.cpp
index 0783021d..7de6a6ac 100644
--- a/kolourpaint/pixmapfx/kpeffectemboss.cpp
+++ b/kolourpaint/pixmapfx/kpeffectemboss.cpp
@@ -33,7 +33,7 @@
#include <tqcheckbox.h>
#include <tqimage.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpixmap.h>
#include <tqpushbutton.h>
diff --git a/kolourpaint/pixmapfx/kpeffectflatten.cpp b/kolourpaint/pixmapfx/kpeffectflatten.cpp
index 1768aa96..a0fd8506 100644
--- a/kolourpaint/pixmapfx/kpeffectflatten.cpp
+++ b/kolourpaint/pixmapfx/kpeffectflatten.cpp
@@ -32,7 +32,7 @@
#include <tqcheckbox.h>
#include <tqimage.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpixmap.h>
#include <tqvbox.h>
diff --git a/kolourpaint/pixmapfx/kpeffectinvert.cpp b/kolourpaint/pixmapfx/kpeffectinvert.cpp
index ad05d013..6ad04905 100644
--- a/kolourpaint/pixmapfx/kpeffectinvert.cpp
+++ b/kolourpaint/pixmapfx/kpeffectinvert.cpp
@@ -32,7 +32,7 @@
#include <tqcheckbox.h>
#include <tqimage.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpixmap.h>
#include <kdebug.h>
diff --git a/kolourpaint/pixmapfx/kpeffectreducecolors.cpp b/kolourpaint/pixmapfx/kpeffectreducecolors.cpp
index 83dd997d..0b764683 100644
--- a/kolourpaint/pixmapfx/kpeffectreducecolors.cpp
+++ b/kolourpaint/pixmapfx/kpeffectreducecolors.cpp
@@ -33,7 +33,7 @@
#include <tqbuttongroup.h>
#include <tqcheckbox.h>
#include <tqimage.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpixmap.h>
#include <tqradiobutton.h>
diff --git a/kolourpaint/pixmapfx/kpeffectsdialog.cpp b/kolourpaint/pixmapfx/kpeffectsdialog.cpp
index 098e0396..d7624775 100644
--- a/kolourpaint/pixmapfx/kpeffectsdialog.cpp
+++ b/kolourpaint/pixmapfx/kpeffectsdialog.cpp
@@ -33,7 +33,7 @@
#include <tqgroupbox.h>
#include <tqhbox.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtimer.h>
#include <kapplication.h>
@@ -255,23 +255,23 @@ void kpEffectsDialog::selectEffect (int which)
// Don't resize the preview when showing the widget:
// TODO: actually work
- TQSize previewGroupBoxMinSize = m_previewGroupBox->tqminimumSize ();
- TQSize previewGroupBoxMaxSize = m_previewGroupBox->tqmaximumSize ();
+ TQSize previewGroupBoxMinSize = m_previewGroupBox->minimumSize ();
+ TQSize previewGroupBoxMaxSize = m_previewGroupBox->maximumSize ();
TQLayout::ResizeMode previewGroupBoxResizeMode =
- m_previewGroupBox->tqlayout () ?
- m_previewGroupBox->tqlayout ()->tqresizeMode () :
+ m_previewGroupBox->layout () ?
+ m_previewGroupBox->layout ()->resizeMode () :
TQLayout::Auto;
#if DEBUG_KP_EFFECTS_DIALOG
kdDebug () << "\tpreviewGroupBox: minSize=" << previewGroupBoxMinSize
<< " maxSize=" << previewGroupBoxMaxSize
<< " size=" << m_previewGroupBox->size ()
- << " tqlayout=" << m_previewGroupBox->tqlayout ()
+ << " layout=" << m_previewGroupBox->layout ()
<< " resizeMode=" << previewGroupBoxResizeMode
<< endl;
#endif
- if (m_previewGroupBox->tqlayout ())
- m_previewGroupBox->tqlayout ()->setResizeMode (TQLayout::FreeResize);
+ if (m_previewGroupBox->layout ())
+ m_previewGroupBox->layout ()->setResizeMode (TQLayout::FreeResize);
#if DEBUG_KP_EFFECTS_DIALOG
kdDebug () << "\tafter set resizeMode, previewGroupBox.size="
<< m_previewGroupBox->size () << endl;
@@ -300,8 +300,8 @@ void kpEffectsDialog::selectEffect (int which)
kdDebug () << "\tafter set fixedSize, previewGroupBox.size="
<< m_previewGroupBox->size () << endl;
#endif
- if (m_previewGroupBox->tqlayout ())
- m_previewGroupBox->tqlayout ()->setResizeMode (previewGroupBoxResizeMode);
+ if (m_previewGroupBox->layout ())
+ m_previewGroupBox->layout ()->setResizeMode (previewGroupBoxResizeMode);
#if DEBUG_KP_EFFECTS_DIALOG
kdDebug () << "\tafter restore resizeMode, previewGroupBox.size="
<< m_previewGroupBox->size () << endl;
diff --git a/kolourpaint/pixmapfx/kppixmapfx.cpp b/kolourpaint/pixmapfx/kppixmapfx.cpp
index 5b281606..2543f962 100644
--- a/kolourpaint/pixmapfx/kppixmapfx.cpp
+++ b/kolourpaint/pixmapfx/kppixmapfx.cpp
@@ -1403,12 +1403,12 @@ static TQPixmap xForm (const TQPixmap &pm, const TQWMatrix &transformMatrix_,
painter.setWorldMatrix (transformMatrix);
#if DEBUG_KP_PIXMAP_FX && 0
kdDebug () << "\ttranslate top=" << painter.xForm (TQPoint (0, 0)) << endl;
- kdDebug () << "\tmatrix: m11=" << painter.tqworldMatrix ().m11 ()
- << " m12=" << painter.tqworldMatrix ().m12 ()
- << " m21=" << painter.tqworldMatrix ().m21 ()
- << " m22=" << painter.tqworldMatrix ().m22 ()
- << " dx=" << painter.tqworldMatrix ().dx ()
- << " dy=" << painter.tqworldMatrix ().dy ()
+ kdDebug () << "\tmatrix: m11=" << painter.worldMatrix ().m11 ()
+ << " m12=" << painter.worldMatrix ().m12 ()
+ << " m21=" << painter.worldMatrix ().m21 ()
+ << " m22=" << painter.worldMatrix ().m22 ()
+ << " dx=" << painter.worldMatrix ().dx ()
+ << " dy=" << painter.worldMatrix ().dy ()
<< endl;
#endif
painter.drawPixmap (TQPoint (0, 0), pm);
diff --git a/kolourpaint/tools/kptoolautocrop.cpp b/kolourpaint/tools/kptoolautocrop.cpp
index 41aeb398..c294b1d0 100644
--- a/kolourpaint/tools/kptoolautocrop.cpp
+++ b/kolourpaint/tools/kptoolautocrop.cpp
@@ -70,7 +70,7 @@ kpToolAutoCropBorder::kpToolAutoCropBorder (const TQPixmap *pixmapPtr,
: m_pixmapPtr (pixmapPtr),
m_processedColorSimilarity (processedColorSimilarity)
{
- tqinvalidate ();
+ invalidate ();
}
@@ -280,7 +280,7 @@ bool kpToolAutoCropBorder::exists () const
}
// public
-void kpToolAutoCropBorder::tqinvalidate ()
+void kpToolAutoCropBorder::invalidate ()
{
m_rect = TQRect ();
m_referenceColor = kpColor::invalid;
@@ -374,7 +374,7 @@ bool kpToolAutoCrop (kpMainWindow *mainWindow)
// and regression testing.
//
// TODO: e.g. When the top fills entire rect but bot doesn't we could
- // tqinvalidate top and continue autocrop.
+ // invalidate top and continue autocrop.
int numRegions = 0;
if (!leftBorder.calculate (true/*x*/, +1/*going right*/) ||
leftBorder.fillsEntirePixmap () ||
@@ -439,7 +439,7 @@ bool kpToolAutoCrop (kpMainWindow *mainWindow)
#if DEBUG_KP_TOOL_AUTO_CROP
kdDebug () << "\tignoring left border" << endl;
#endif
- leftBorder.tqinvalidate ();
+ leftBorder.invalidate ();
}
}
@@ -454,7 +454,7 @@ bool kpToolAutoCrop (kpMainWindow *mainWindow)
#if DEBUG_KP_TOOL_AUTO_CROP
kdDebug () << "\tignoring top border" << endl;
#endif
- topBorder.tqinvalidate ();
+ topBorder.invalidate ();
}
}
diff --git a/kolourpaint/tools/kptoolautocrop.h b/kolourpaint/tools/kptoolautocrop.h
index 886b4223..bb1a5d4a 100644
--- a/kolourpaint/tools/kptoolautocrop.h
+++ b/kolourpaint/tools/kptoolautocrop.h
@@ -69,7 +69,7 @@ public:
bool fillsEntirePixmap () const;
bool exists () const;
- void tqinvalidate ();
+ void invalidate ();
private:
const TQPixmap *m_pixmapPtr;
diff --git a/kolourpaint/tools/kptoolbrush.cpp b/kolourpaint/tools/kptoolbrush.cpp
index 30c68aee..a5122805 100644
--- a/kolourpaint/tools/kptoolbrush.cpp
+++ b/kolourpaint/tools/kptoolbrush.cpp
@@ -32,7 +32,7 @@
kpToolBrush::kpToolBrush (kpMainWindow *mainWindow)
: kpToolPen (kpToolPen::Brush,
i18n ("Brush"),
- i18n ("Draw using brushes of different tqshapes and sizes"),
+ i18n ("Draw using brushes of different shapes and sizes"),
TQt::Key_B,
mainWindow, "tool_brush")
{
diff --git a/kolourpaint/tools/kptoolpolygon.cpp b/kolourpaint/tools/kptoolpolygon.cpp
index eade158b..158bd339 100644
--- a/kolourpaint/tools/kptoolpolygon.cpp
+++ b/kolourpaint/tools/kptoolpolygon.cpp
@@ -35,7 +35,7 @@
#include <tqbitmap.h>
#include <tqcursor.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpainter.h>
#include <tqpoint.h>
#include <tqpushbutton.h>
@@ -479,7 +479,7 @@ void kpToolPolygon::beginDraw ()
break;
default:
- kdError () << "kpToolPolygon::beginDraw() tqshape" << endl;
+ kdError () << "kpToolPolygon::beginDraw() shape" << endl;
break;
}
}
diff --git a/kolourpaint/tools/kptoolpolygon.h b/kolourpaint/tools/kptoolpolygon.h
index 50129be3..4478157e 100644
--- a/kolourpaint/tools/kptoolpolygon.h
+++ b/kolourpaint/tools/kptoolpolygon.h
@@ -29,7 +29,7 @@
#ifndef __kptoolpolygon_h__
#define __kptoolpolygon_h__
-#include <tqbrush.h>
+#include <brush.h>
#include <tqpen.h>
#include <tqobject.h>
#include <tqpixmap.h>
diff --git a/kolourpaint/tools/kptoolpreviewdialog.cpp b/kolourpaint/tools/kptoolpreviewdialog.cpp
index 2136e02d..6212d7af 100644
--- a/kolourpaint/tools/kptoolpreviewdialog.cpp
+++ b/kolourpaint/tools/kptoolpreviewdialog.cpp
@@ -30,7 +30,7 @@
#include <kptoolpreviewdialog.h>
#include <tqapplication.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqgroupbox.h>
#include <tqlabel.h>
#include <tqpushbutton.h>
@@ -389,7 +389,7 @@ void kpToolPreviewDialog::updatePreview ()
m_previewPixmapLabel->setPixmap (previewPixmap);
// immediate update esp. for expensive previews
- m_previewPixmapLabel->tqrepaint (false/*no erase*/);
+ m_previewPixmapLabel->repaint (false/*no erase*/);
#if DEBUG_KP_TOOL_PREVIEW_DIALOG
kdDebug () << "\tafter TQLabel::setPixmap() previewPixmapLabel: w="
diff --git a/kolourpaint/tools/kptoolrectangle.cpp b/kolourpaint/tools/kptoolrectangle.cpp
index df560ea2..a0699d7b 100644
--- a/kolourpaint/tools/kptoolrectangle.cpp
+++ b/kolourpaint/tools/kptoolrectangle.cpp
@@ -108,7 +108,7 @@ static TQPixmap pixmap (const kpToolRectangle::Mode mode,
if (startPoint != endPoint)
{
#if DEBUG_KP_TOOL_RECTANGLE && 1
- kdDebug () << "\tdraw tqshape" << endl;
+ kdDebug () << "\tdraw shape" << endl;
#endif
// TODO: Rectangle of pen width 1, height 1 and width X is rendered
diff --git a/kolourpaint/tools/kptoolrectangle.h b/kolourpaint/tools/kptoolrectangle.h
index e41b5d47..dc147fc9 100644
--- a/kolourpaint/tools/kptoolrectangle.h
+++ b/kolourpaint/tools/kptoolrectangle.h
@@ -29,7 +29,7 @@
#ifndef __kptoolrectangle_h__
#define __kptoolrectangle_h__
-#include <tqbrush.h>
+#include <brush.h>
#include <tqpen.h>
#include <tqpixmap.h>
#include <tqpoint.h>
@@ -53,7 +53,7 @@ Q_OBJECT
TQ_OBJECT
public:
- // it turns out that these tqshapes are all really the same thing
+ // it turns out that these shapes are all really the same thing
// (same options, same feel) - the only real difference is the
// drawing functions (a one line change)
enum Mode {Rectangle, RoundedRectangle, Ellipse};
diff --git a/kolourpaint/tools/kptoolresizescale.cpp b/kolourpaint/tools/kptoolresizescale.cpp
index 40270e1f..3a59ed75 100644
--- a/kolourpaint/tools/kptoolresizescale.cpp
+++ b/kolourpaint/tools/kptoolresizescale.cpp
@@ -40,7 +40,7 @@
#include <tqgroupbox.h>
#include <tqhbox.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpoint.h>
#include <tqpointarray.h>
#include <tqpushbutton.h>
@@ -665,17 +665,17 @@ void kpToolResizeScaleDialog::createOperationGroupBox (TQWidget *baseWidget)
// TODO: ALT+R doesn't select the button.
m_resizeButton = new TQToolButton (m_operationGroupBox);
toolButtonSetLook (m_resizeButton,
- TQString::tqfromLatin1 ("resize"),
+ TQString::fromLatin1 ("resize"),
i18n ("&Resize"));
m_scaleButton = new TQToolButton (m_operationGroupBox);
toolButtonSetLook (m_scaleButton,
- TQString::tqfromLatin1 ("scale"),
+ TQString::fromLatin1 ("scale"),
i18n ("&Scale"));
m_smoothScaleButton = new TQToolButton (m_operationGroupBox);
toolButtonSetLook (m_smoothScaleButton,
- TQString::tqfromLatin1 ("smooth_scale"),
+ TQString::fromLatin1 ("smooth_scale"),
i18n ("S&mooth Scale"));
@@ -684,9 +684,9 @@ void kpToolResizeScaleDialog::createOperationGroupBox (TQWidget *baseWidget)
//m_smoothScaleLabel = new TQLabel (i18n ("S&mooth scale"), m_operationGroupBox);
- //m_resizeLabel->tqsetAlignment (m_resizeLabel->tqalignment () | TQt::ShowPrefix);
- //m_scaleLabel->tqsetAlignment (m_scaleLabel->tqalignment () | TQt::ShowPrefix);
- //m_smoothScaleLabel->tqsetAlignment (m_smoothScaleLabel->tqalignment () | TQt::ShowPrefix);
+ //m_resizeLabel->setAlignment (m_resizeLabel->alignment () | TQt::ShowPrefix);
+ //m_scaleLabel->setAlignment (m_scaleLabel->alignment () | TQt::ShowPrefix);
+ //m_smoothScaleLabel->setAlignment (m_smoothScaleLabel->alignment () | TQt::ShowPrefix);
TQButtonGroup *resizeScaleButtonGroup = new TQButtonGroup (baseWidget);
@@ -727,9 +727,9 @@ void kpToolResizeScaleDialog::createDimensionsGroupBox (TQWidget *baseWidget)
m_dimensionsGroupBox = new TQGroupBox (i18n ("Dimensions"), baseWidget);
TQLabel *widthLabel = new TQLabel (i18n ("Width:"), m_dimensionsGroupBox);
- widthLabel->tqsetAlignment (widthLabel->tqalignment () | TQt::AlignHCenter);
+ widthLabel->setAlignment (widthLabel->alignment () | TQt::AlignHCenter);
TQLabel *heightLabel = new TQLabel (i18n ("Height:"), m_dimensionsGroupBox);
- heightLabel->tqsetAlignment (heightLabel->tqalignment () | TQt::AlignHCenter);
+ heightLabel->setAlignment (heightLabel->alignment () | TQt::AlignHCenter);
TQLabel *originalLabel = new TQLabel (i18n ("Original:"), m_dimensionsGroupBox);
m_originalWidthInput = new KIntNumInput (
diff --git a/kolourpaint/tools/kptoolrotate.cpp b/kolourpaint/tools/kptoolrotate.cpp
index 5def33ca..4b015916 100644
--- a/kolourpaint/tools/kptoolrotate.cpp
+++ b/kolourpaint/tools/kptoolrotate.cpp
@@ -34,7 +34,7 @@
#include <tqbuttongroup.h>
#include <tqgroupbox.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpushbutton.h>
#include <tqradiobutton.h>
#include <tqwmatrix.h>
diff --git a/kolourpaint/tools/kptoolskew.cpp b/kolourpaint/tools/kptoolskew.cpp
index eec804d7..e2c0deae 100644
--- a/kolourpaint/tools/kptoolskew.cpp
+++ b/kolourpaint/tools/kptoolskew.cpp
@@ -34,7 +34,7 @@
#include <tqapplication.h>
#include <tqgroupbox.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpushbutton.h>
#include <tqwmatrix.h>
diff --git a/kolourpaint/views/kpthumbnailview.cpp b/kolourpaint/views/kpthumbnailview.cpp
index 54281ba4..970663b5 100644
--- a/kolourpaint/views/kpthumbnailview.cpp
+++ b/kolourpaint/views/kpthumbnailview.cpp
@@ -77,7 +77,7 @@ void kpThumbnailView::resizeEvent (TQResizeEvent *e)
<< endl;
#endif
- // For TQResizeEvent's, TQt already throws an entire widget tqrepaint into
+ // For TQResizeEvent's, TQt already throws an entire widget repaint into
// the event loop. So eat useless update() calls that can only slow
// things down.
// TODO: this doesn't seem to work.
diff --git a/kolourpaint/widgets/kpcolorsimilaritycube.cpp b/kolourpaint/widgets/kpcolorsimilaritycube.cpp
index b2f3441a..4d06d46e 100644
--- a/kolourpaint/widgets/kpcolorsimilaritycube.cpp
+++ b/kolourpaint/widgets/kpcolorsimilaritycube.cpp
@@ -133,12 +133,12 @@ void kpColorSimilarityCube::setColorSimilarity (double similarity)
m_colorSimilarity = similarity;
- tqrepaint (false/*no erase*/);
+ repaint (false/*no erase*/);
}
// protected virtual [base TQWidget]
-TQSize kpColorSimilarityCube::tqsizeHint () const
+TQSize kpColorSimilarityCube::sizeHint () const
{
return TQSize (52, 52);
}
@@ -247,8 +247,8 @@ void kpColorSimilarityCube::drawFace (TQPainter *p,
#if DEBUG_KP_COLOR_SIMILARITY_CUBE
kdDebug () << "\tnot enabled - making us grey" << endl;
#endif
- colors [0] = tqcolorGroup ().background ();
- colors [1] = tqcolorGroup ().background ();
+ colors [0] = colorGroup ().background ();
+ colors [1] = colorGroup ().background ();
}
#if DEBUG_KP_COLOR_SIMILARITY_CUBE
@@ -274,7 +274,7 @@ void kpColorSimilarityCube::drawContents (TQPainter *p)
TQRect cr (contentsRect ());
TQPixmap backBuffer (cr.width (), cr.height ());
- backBuffer.fill (tqcolorGroup ().background ());
+ backBuffer.fill (colorGroup ().background ());
TQPainter backBufferPainter (&backBuffer);
diff --git a/kolourpaint/widgets/kpcolorsimilaritycube.h b/kolourpaint/widgets/kpcolorsimilaritycube.h
index 0cf9f92a..a5f1db9f 100644
--- a/kolourpaint/widgets/kpcolorsimilaritycube.h
+++ b/kolourpaint/widgets/kpcolorsimilaritycube.h
@@ -55,7 +55,7 @@ public:
double colorSimilarity () const;
void setColorSimilarity (double similarity);
- virtual TQSize tqsizeHint () const;
+ virtual TQSize sizeHint () const;
protected:
TQColor color (int redOrGreenOrBlue, int baseBrightness, int similarityDirection) const;
diff --git a/kolourpaint/widgets/kpcolorsimilaritydialog.cpp b/kolourpaint/widgets/kpcolorsimilaritydialog.cpp
index d71ac501..7f0f621d 100644
--- a/kolourpaint/widgets/kpcolorsimilaritydialog.cpp
+++ b/kolourpaint/widgets/kpcolorsimilaritydialog.cpp
@@ -30,7 +30,7 @@
#include <tqgroupbox.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpushbutton.h>
#include <klocale.h>
diff --git a/kolourpaint/widgets/kpcolortoolbar.cpp b/kolourpaint/widgets/kpcolortoolbar.cpp
index cfdb6820..7510d87c 100644
--- a/kolourpaint/widgets/kpcolortoolbar.cpp
+++ b/kolourpaint/widgets/kpcolortoolbar.cpp
@@ -34,7 +34,7 @@
#include <tqbitmap.h>
#include <tqdrawutil.h>
#include <tqframe.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpainter.h>
#include <tqsize.h>
#include <tqtooltip.h>
@@ -150,7 +150,7 @@ kpColor kpDualColorButton::oldBackgroundColor () const
// public virtual [base TQWidget]
-TQSize kpDualColorButton::tqsizeHint () const
+TQSize kpDualColorButton::sizeHint () const
{
return TQSize (52, 52);
}
@@ -318,14 +318,14 @@ void kpDualColorButton::drawContents (TQPainter *p)
else
{
backBufferPainter.fillRect (m_backBuffer->rect (),
- tqcolorGroup ().color (TQColorGroup::Background));
+ colorGroup ().color (TQColorGroup::Background));
}
TQPixmap swapPixmap = UserIcon ("colorbutton_swap_16x16");
if (!isEnabled ())
{
// swapPixmap has a mask after all
- swapPixmap.fill (tqcolorGroup ().color (TQColorGroup::Dark));
+ swapPixmap.fill (colorGroup ().color (TQColorGroup::Dark));
}
backBufferPainter.drawPixmap (swapPixmapRect ().topLeft (), swapPixmap);
@@ -346,8 +346,8 @@ void kpDualColorButton::drawContents (TQPainter *p)
backBufferPainter.drawPixmap (bgRectInside, UserIcon ("color_transparent_26x26"));
}
else
- backBufferPainter.fillRect (bgRectInside, tqcolorGroup ().color (TQColorGroup::Button));
- qDrawShadePanel (&backBufferPainter, bgRect, tqcolorGroup (),
+ backBufferPainter.fillRect (bgRectInside, colorGroup ().color (TQColorGroup::Button));
+ qDrawShadePanel (&backBufferPainter, bgRect, colorGroup (),
false/*not sunken*/, 2/*lineWidth*/,
0/*never fill*/);
@@ -366,8 +366,8 @@ void kpDualColorButton::drawContents (TQPainter *p)
backBufferPainter.drawPixmap (fgRectInside, UserIcon ("color_transparent_26x26"));
}
else
- backBufferPainter.fillRect (fgRectInside, tqcolorGroup ().color (TQColorGroup::Button));
- qDrawShadePanel (&backBufferPainter, fgRect, tqcolorGroup (),
+ backBufferPainter.fillRect (fgRectInside, colorGroup ().color (TQColorGroup::Button));
+ qDrawShadePanel (&backBufferPainter, fgRect, colorGroup (),
false/*not sunken*/, 2/*lineWidth*/,
0/*never fill*/);
@@ -768,7 +768,7 @@ kpTransparentColorCell::~kpTransparentColorCell ()
// public virtual [base TQWidget]
-TQSize kpTransparentColorCell::tqsizeHint () const
+TQSize kpTransparentColorCell::sizeHint () const
{
return TQSize (m_pixmap.width () + frameWidth () * 2,
m_pixmap.height () + frameWidth () * 2);
@@ -829,7 +829,7 @@ kpColorPalette::kpColorPalette (TQWidget *parent,
#endif
m_transparentColorCell = new kpTransparentColorCell (this);
- m_transparentColorCell->tqsetSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+ m_transparentColorCell->setSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed);
connect (m_transparentColorCell, TQT_SIGNAL (foregroundColorChanged (const kpColor &)),
this, TQT_SIGNAL (foregroundColorChanged (const kpColor &)));
connect (m_transparentColorCell, TQT_SIGNAL (backgroundColorChanged (const kpColor &)),
@@ -964,7 +964,7 @@ kpColorToolBar::kpColorToolBar (const TQString &label, kpMainWindow *mainWindow,
5/*margin*/, (10 * 4)/*spacing*/);
m_dualColorButton = new kpDualColorButton (mainWindow, base);
- m_dualColorButton->tqsetSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+ m_dualColorButton->setSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed);
connect (m_dualColorButton, TQT_SIGNAL (colorsSwapped (const kpColor &, const kpColor &)),
this, TQT_SIGNAL (colorsSwapped (const kpColor &, const kpColor &)));
connect (m_dualColorButton, TQT_SIGNAL (foregroundColorChanged (const kpColor &)),
@@ -981,7 +981,7 @@ kpColorToolBar::kpColorToolBar (const TQString &label, kpMainWindow *mainWindow,
m_boxLayout->addWidget (m_colorPalette, 0/*stretch*/);
m_colorSimilarityToolBarItem = new kpColorSimilarityToolBarItem (mainWindow, base);
- m_colorSimilarityToolBarItem->tqsetSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+ m_colorSimilarityToolBarItem->setSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed);
connect (m_colorSimilarityToolBarItem, TQT_SIGNAL (colorSimilarityChanged (double, int)),
this, TQT_SIGNAL (colorSimilarityChanged (double, int)));
m_boxLayout->addWidget (m_colorSimilarityToolBarItem, 0/*stretch*/);
diff --git a/kolourpaint/widgets/kpcolortoolbar.h b/kolourpaint/widgets/kpcolortoolbar.h
index 59f13fb7..7c005441 100644
--- a/kolourpaint/widgets/kpcolortoolbar.h
+++ b/kolourpaint/widgets/kpcolortoolbar.h
@@ -91,7 +91,7 @@ public:
kpColor oldBackgroundColor () const;
public:
- virtual TQSize tqsizeHint () const;
+ virtual TQSize sizeHint () const;
protected:
TQRect swapPixmapRect () const;
@@ -163,7 +163,7 @@ public:
kpTransparentColorCell (TQWidget *parent, const char *name = 0);
virtual ~kpTransparentColorCell ();
- virtual TQSize tqsizeHint () const;
+ virtual TQSize sizeHint () const;
signals:
void transparentColorSelected (int mouseButton);
diff --git a/kolourpaint/widgets/kpsqueezedtextlabel.cpp b/kolourpaint/widgets/kpsqueezedtextlabel.cpp
index 6e7386ec..dc500b12 100644
--- a/kolourpaint/widgets/kpsqueezedtextlabel.cpp
+++ b/kolourpaint/widgets/kpsqueezedtextlabel.cpp
@@ -53,11 +53,11 @@ kpSqueezedTextLabel::kpSqueezedTextLabel (const TQString &text, TQWidget *parent
// public virtual
-TQSize kpSqueezedTextLabel::tqminimumSizeHint () const
+TQSize kpSqueezedTextLabel::minimumSizeHint () const
{
#if DEBUG_KP_STQUEEZED_TEXT_LABEL && 1
- kdDebug () << "kpSqueezedTextLabel::tqminimumSizeHint() qLabel prefers"
- << TQLabel::tqminimumSizeHint () << endl;
+ kdDebug () << "kpSqueezedTextLabel::minimumSizeHint() qLabel prefers"
+ << TQLabel::minimumSizeHint () << endl;
#endif
return TQSize (-1/*no minimum width*/, TQLabel::minimumHeight ());
}
diff --git a/kolourpaint/widgets/kpsqueezedtextlabel.h b/kolourpaint/widgets/kpsqueezedtextlabel.h
index 4697af8a..e4828b54 100644
--- a/kolourpaint/widgets/kpsqueezedtextlabel.h
+++ b/kolourpaint/widgets/kpsqueezedtextlabel.h
@@ -43,7 +43,7 @@ public:
kpSqueezedTextLabel (TQWidget *parent, const char *name = 0);
kpSqueezedTextLabel (const TQString &text, TQWidget *parent, const char *name = 0);
- virtual TQSize tqminimumSizeHint () const;
+ virtual TQSize minimumSizeHint () const;
// TODO: maybe text() should return the full text?
TQString fullText () const;
diff --git a/kolourpaint/widgets/kptooltoolbar.cpp b/kolourpaint/widgets/kptooltoolbar.cpp
index ba048d5c..c1f73ea5 100644
--- a/kolourpaint/widgets/kptooltoolbar.cpp
+++ b/kolourpaint/widgets/kptooltoolbar.cpp
@@ -32,7 +32,7 @@
#include <kptooltoolbar.h>
#include <tqbuttongroup.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqdatetime.h>
#include <tqtoolbutton.h>
#include <tqtooltip.h>
@@ -144,7 +144,7 @@ kpToolToolBar::kpToolToolBar (const TQString &label, kpMainWindow *mainWindow, i
setOrientation (orientation ());
#if DEBUG_KP_TOOL_TOOL_BAR
- kdDebug () << "kpToolToolBar::<ctor> tqlayout tool widgets msec="
+ kdDebug () << "kpToolToolBar::<ctor> layout tool widgets msec="
<< timer.elapsed () << endl;
#endif
@@ -199,7 +199,7 @@ int kpToolToolBar::defaultIconSize ()
if (m_defaultIconSize <= 0)
{
- // Adapt according to screen tqgeometry
+ // Adapt according to screen geometry
const TQRect desktopSize = KGlobalSettings::desktopGeometry (this);
#if DEBUG_KP_TOOL_TOOL_BAR
kdDebug () << "\tadapting to screen size=" << desktopSize << endl;
diff --git a/kolourpaint/widgets/kptoolwidgetbase.cpp b/kolourpaint/widgets/kptoolwidgetbase.cpp
index 3d1d3cff..18177804 100644
--- a/kolourpaint/widgets/kptoolwidgetbase.cpp
+++ b/kolourpaint/widgets/kptoolwidgetbase.cpp
@@ -175,10 +175,10 @@ TQPair <int, int> kpToolWidgetBase::defaultSelectedRowAndCol () const
KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupTools);
KConfigBase *cfg = cfgGroupSaver.config ();
- TQString nameString = TQString::tqfromLatin1 (name ());
+ TQString nameString = TQString::fromLatin1 (name ());
- row = cfg->readNumEntry (nameString + TQString::tqfromLatin1 (" Row"), -1);
- col = cfg->readNumEntry (nameString + TQString::tqfromLatin1 (" Col"), -1);
+ row = cfg->readNumEntry (nameString + TQString::fromLatin1 (" Row"), -1);
+ col = cfg->readNumEntry (nameString + TQString::fromLatin1 (" Col"), -1);
}
#if DEBUG_KP_TOOL_WIDGET_BASE
@@ -218,9 +218,9 @@ void kpToolWidgetBase::saveSelectedAsDefault () const
KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupTools);
KConfigBase *cfg = cfgGroupSaver.config ();
- TQString nameString = TQString::tqfromLatin1 (name ());
- cfg->writeEntry (nameString + TQString::tqfromLatin1 (" Row"), m_selectedRow);
- cfg->writeEntry (nameString + TQString::tqfromLatin1 (" Col"), m_selectedCol);
+ TQString nameString = TQString::fromLatin1 (name ());
+ cfg->writeEntry (nameString + TQString::fromLatin1 (" Row"), m_selectedRow);
+ cfg->writeEntry (nameString + TQString::fromLatin1 (" Col"), m_selectedCol);
cfg->sync ();
}
diff --git a/kolourpaint/widgets/kptoolwidgetbrush.cpp b/kolourpaint/widgets/kptoolwidgetbrush.cpp
index 0c583126..57986b63 100644
--- a/kolourpaint/widgets/kptoolwidgetbrush.cpp
+++ b/kolourpaint/widgets/kptoolwidgetbrush.cpp
@@ -59,7 +59,7 @@ kpToolWidgetBrush::kpToolWidgetBrush (TQWidget *parent, const char *name)
TQPixmap *pm = m_brushBitmaps;
- for (int tqshape = 0; tqshape < BRUSH_SIZE_NUM_ROWS; tqshape++)
+ for (int shape = 0; shape < BRUSH_SIZE_NUM_ROWS; shape++)
{
for (int i = 0; i < BRUSH_SIZE_NUM_COLS; i++)
{
@@ -68,7 +68,7 @@ kpToolWidgetBrush::kpToolWidgetBrush (TQWidget *parent, const char *name)
pm->resize ((w <= 0 ? width () : w),
(h <= 0 ? height () : h));
- const int s = brushSize [tqshape][i];
+ const int s = brushSize [shape][i];
TQRect rect;
if (s >= pm->width () || s >= pm->height ())
@@ -92,7 +92,7 @@ kpToolWidgetBrush::kpToolWidgetBrush (TQWidget *parent, const char *name)
painter.setBrush (TQt::black);
// sync: <brushes>
- switch (tqshape)
+ switch (shape)
{
case 0:
painter.drawEllipse (rect);
@@ -110,7 +110,7 @@ kpToolWidgetBrush::kpToolWidgetBrush (TQWidget *parent, const char *name)
painter.end ();
pm->setMask (pm->createHeuristicMask ());
- addOption (*pm, brushName (tqshape, i)/*tooltip*/);
+ addOption (*pm, brushName (shape, i)/*tooltip*/);
pm++;
}
@@ -127,38 +127,38 @@ kpToolWidgetBrush::~kpToolWidgetBrush ()
// private
-TQString kpToolWidgetBrush::brushName (int tqshape, int whichSize)
+TQString kpToolWidgetBrush::brushName (int shape, int whichSize)
{
- int s = brushSize [tqshape][whichSize];
+ int s = brushSize [shape][whichSize];
if (s == 1)
return i18n ("1x1");
- TQString tqshapeName;
+ TQString shapeName;
// sync: <brushes>
- switch (tqshape)
+ switch (shape)
{
case 0:
- tqshapeName = i18n ("Circle");
+ shapeName = i18n ("Circle");
break;
case 1:
- tqshapeName = i18n ("Square");
+ shapeName = i18n ("Square");
break;
case 2:
- // TODO: is this really the name of a tqshape? :)
- tqshapeName = i18n ("Slash");
+ // TODO: is this really the name of a shape? :)
+ shapeName = i18n ("Slash");
break;
case 3:
- // TODO: is this really the name of a tqshape? :)
- tqshapeName = i18n ("Backslash");
+ // TODO: is this really the name of a shape? :)
+ shapeName = i18n ("Backslash");
break;
}
- if (tqshapeName.isEmpty ())
+ if (shapeName.isEmpty ())
return TQString();
- return i18n ("%1x%2 %3").arg (s).arg (s).arg (tqshapeName);
+ return i18n ("%1x%2 %3").arg (s).arg (s).arg (shapeName);
}
TQPixmap kpToolWidgetBrush::brush () const
diff --git a/kolourpaint/widgets/kptoolwidgetbrush.h b/kolourpaint/widgets/kptoolwidgetbrush.h
index 0fd2f46a..c67db05e 100644
--- a/kolourpaint/widgets/kptoolwidgetbrush.h
+++ b/kolourpaint/widgets/kptoolwidgetbrush.h
@@ -43,7 +43,7 @@ public:
virtual ~kpToolWidgetBrush ();
private:
- TQString brushName (int tqshape, int whichSize);
+ TQString brushName (int shape, int whichSize);
public:
TQPixmap brush () const;
diff --git a/kolourpaint/widgets/kptoolwidgeterasersize.cpp b/kolourpaint/widgets/kptoolwidgeterasersize.cpp
index d27965a6..90167fd2 100644
--- a/kolourpaint/widgets/kptoolwidgeterasersize.cpp
+++ b/kolourpaint/widgets/kptoolwidgeterasersize.cpp
@@ -66,7 +66,7 @@ kpToolWidgetEraserSize::kpToolWidgetEraserSize (TQWidget *parent, const char *na
TQPixmap previewPixmap (s, s);
if (i < 3)
{
- // HACK: kpToolWidgetBase's tqlayout code sucks and gives uneven spacing
+ // HACK: kpToolWidgetBase's layout code sucks and gives uneven spacing
previewPixmap.resize ((width () - 4) / 3, 9);
}
diff --git a/kolourpaint/widgets/kptoolwidgetfillstyle.cpp b/kolourpaint/widgets/kptoolwidgetfillstyle.cpp
index a87714c5..f3d2cd2e 100644
--- a/kolourpaint/widgets/kptoolwidgetfillstyle.cpp
+++ b/kolourpaint/widgets/kptoolwidgetfillstyle.cpp
@@ -31,7 +31,7 @@
#include <kptoolwidgetfillstyle.h>
#include <tqbitmap.h>
-#include <tqbrush.h>
+#include <brush.h>
#include <tqpainter.h>
#include <kdebug.h>
diff --git a/kolourpaint/widgets/kptoolwidgetspraycansize.cpp b/kolourpaint/widgets/kptoolwidgetspraycansize.cpp
index 503cecd2..24569a21 100644
--- a/kolourpaint/widgets/kptoolwidgetspraycansize.cpp
+++ b/kolourpaint/widgets/kptoolwidgetspraycansize.cpp
@@ -54,7 +54,7 @@ kpToolWidgetSpraycanSize::kpToolWidgetSpraycanSize (TQWidget *parent, const char
for (int i = 0; i < int (sizeof (spraycanSizes) / sizeof (spraycanSizes [0])); i++)
{
int s = spraycanSizes [i];
- TQString iconName = TQString ("tool_spraycan_%1x%1").tqarg (s).tqarg(s);
+ TQString iconName = TQString ("tool_spraycan_%1x%1").arg (s).arg(s);
#if DEBUG_KP_TOOL_WIDGET_SPRAYCAN_SIZE
kdDebug () << "\ticonName=" << iconName << endl;
diff --git a/kooka/CHANGES b/kooka/CHANGES
index df5e72c6..9b15cab5 100644
--- a/kooka/CHANGES
+++ b/kooka/CHANGES
@@ -20,7 +20,7 @@ scanned with about 150 dpi.
via mime mechanism of KDE (KRun). OCR-Parameter get stored via KConfig.
OCR may be performed on the entire image or the selection.
-* Reworked the save assistant: New tqlayout and fully KDE2-Compliant.
+* Reworked the save assistant: New layout and fully KDE2-Compliant.
Still no new Image format help texts.
* Reworked the startup dialog: Allows to select the scan device from a
diff --git a/kooka/img_saver.cpp b/kooka/img_saver.cpp
index 847023d1..02fb957f 100644
--- a/kooka/img_saver.cpp
+++ b/kooka/img_saver.cpp
@@ -46,7 +46,7 @@
#include <kinputdialog.h>
#include <tqdir.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqfileinfo.h>
#include <tqimage.h>
#include <tqmessagebox.h>
@@ -116,7 +116,7 @@ FormatDialog::FormatDialog( TQWidget *parent, const TQString&, const char *name
Q_CHECK_PTR(l_help);
l_help->setFrameStyle( TQFrame::Panel|TQFrame::Sunken );
l_help->setText( i18n("-No format selected-" ));
- l_help->tqsetAlignment( AlignVCenter | AlignHCenter );
+ l_help->setAlignment( AlignVCenter | AlignHCenter );
l_help->setMinimumWidth(230);
// Insert Selbox for subformat
@@ -208,11 +208,11 @@ TQCString FormatDialog::getSubFormat( ) const
#include "formathelp.h"
void FormatDialog::buildHelp( void )
{
- format_help.insert( TQString::tqfromLatin1("BMP"), HELP_BMP );
- format_help.insert( TQString::tqfromLatin1("PNM"), HELP_PNM );
- format_help.insert( TQString::tqfromLatin1("JPEG"), HELP_JPG );
- format_help.insert( TQString::tqfromLatin1("JPG"), HELP_JPG );
- format_help.insert( TQString::tqfromLatin1("EPS"), HELP_EPS );
+ format_help.insert( TQString::fromLatin1("BMP"), HELP_BMP );
+ format_help.insert( TQString::fromLatin1("PNM"), HELP_PNM );
+ format_help.insert( TQString::fromLatin1("JPEG"), HELP_JPG );
+ format_help.insert( TQString::fromLatin1("JPG"), HELP_JPG );
+ format_help.insert( TQString::fromLatin1("EPS"), HELP_EPS );
}
@@ -276,14 +276,14 @@ void ImgSaver::createDir( const TQString& dir )
if( KIO::mkdir( KURL(dir)))
{
KMessageBox::sorry(0, i18n("The folder\n%1\n does not exist and could not be created;\n"
- "please check the permissions.").tqarg(dir));
+ "please check the permissions.").arg(dir));
}
}
#if 0
if( ! fi.isWritable() )
{
KMessageBox::sorry(0, i18n("The directory\n%1\n is not writeable;\nplease check the permissions.")
- .tqarg(dir));
+ .arg(dir));
}
#endif
}
@@ -766,7 +766,7 @@ bool ImgSaver::renameImage( const KURL& fromUrl, KURL& toUrl, bool askExt, TQWi
TQString s;
s = i18n("The filename you supplied has no file extension.\nShould the correct one be added automatically? ");
- s += i18n( "That would result in the new filename: %1" ).tqarg( fName);
+ s += i18n( "That would result in the new filename: %1" ).arg( fName);
result = KMessageBox::questionYesNo(overWidget, s, i18n( "Extension Missing"),
i18n("Add Extension"), i18n("Do Not Add"),
@@ -863,7 +863,7 @@ bool ImgSaver::copyImage( const KURL& fromUrl, const KURL& toUrl, TQWidget *over
TQString s;
s = i18n("The filename you supplied has no file extension.\nShould the correct one be added automatically? ");
- s += i18n( "That would result in the new filename: %1" ).tqarg( fName);
+ s += i18n( "That would result in the new filename: %1" ).arg( fName);
result = KMessageBox::questionYesNo(overWidget, s, i18n( "Extension Missing"),
i18n("Add Extension"), i18n("Do Not Add"),
diff --git a/kooka/imgnamecombo.cpp b/kooka/imgnamecombo.cpp
index 8190d5bc..833bf422 100644
--- a/kooka/imgnamecombo.cpp
+++ b/kooka/imgnamecombo.cpp
@@ -25,7 +25,7 @@
* *
***************************************************************************/
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqlistview.h>
@@ -51,7 +51,7 @@ ImageNameCombo::~ImageNameCombo()
void ImageNameCombo::slotPathRemove( KFileTreeBranch *branch, const TQString& relPath )
{
- TQString path = branch->name() + TQString::tqfromLatin1(" - ") + relPath;
+ TQString path = branch->name() + TQString::fromLatin1(" - ") + relPath;
kdDebug(28000) << "ImageNameCombo: Removing " << path << endl;
TQString select = currentText();
@@ -82,7 +82,7 @@ void ImageNameCombo::slotGalleryPathChanged( KFileTreeBranch* branch, const TQSt
{
TQString newPath;
- newPath = branch->name() + TQString::tqfromLatin1(" - ") + relativPath;
+ newPath = branch->name() + TQString::fromLatin1(" - ") + relativPath;
kdDebug( 28000) << "Inserting " << newPath << " to combobox" << endl;
diff --git a/kooka/imgprintdialog.cpp b/kooka/imgprintdialog.cpp
index e79c92df..b65df15c 100644
--- a/kooka/imgprintdialog.cpp
+++ b/kooka/imgprintdialog.cpp
@@ -31,7 +31,7 @@
#include <tqstring.h>
#include <tqmap.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqvbuttongroup.h>
#include <tqcheckbox.h>
#include <tqradiobutton.h>
@@ -53,9 +53,9 @@ ImgPrintDialog::ImgPrintDialog( KookaImage *img, TQWidget *parent, const char* n
m_ignoreSignal(false)
{
setTitle(i18n("Image Printing"));
- TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
- // tqlayout->setMargin( KDialog::marginHint() );
- // tqlayout->setSpacing( KDialog::spacingHint() );
+ TQVBoxLayout *layout = new TQVBoxLayout( this );
+ // layout->setMargin( KDialog::marginHint() );
+ // layout->setSpacing( KDialog::spacingHint() );
m_scaleRadios = new TQButtonGroup( 2, Qt::Vertical, i18n("Image Print Size"), this );
m_scaleRadios->setRadioButtonExclusive(true);
@@ -84,11 +84,11 @@ ImgPrintDialog::ImgPrintDialog( KookaImage *img, TQWidget *parent, const char* n
TQToolTip::add( m_rbFitPage, i18n("Printout uses maximum space on the selected pager. Aspect ratio is maintained."));
m_scaleRadios->insert( m_rbFitPage, ID_FIT_PAGE );
- tqlayout->addWidget( m_scaleRadios );
+ layout->addWidget( m_scaleRadios );
TQHBoxLayout *hbox = new TQHBoxLayout( this );
- tqlayout->addLayout( hbox );
+ layout->addLayout( hbox );
/** Box for Image Resolutions **/
TQVGroupBox *group1 = new TQVGroupBox( i18n("Resolutions"), this );
@@ -127,8 +127,8 @@ ImgPrintDialog::ImgPrintDialog( KookaImage *img, TQWidget *parent, const char* n
TQWidget *spaceEater = new TQWidget( this );
- spaceEater->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ));
- tqlayout->addWidget( spaceEater );
+ spaceEater->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ));
+ layout->addWidget( spaceEater );
/* Set start values */
m_rbScreen->setChecked(true);
@@ -167,7 +167,7 @@ void ImgPrintDialog::setOptions(const TQMap<TQString,TQString>& opts)
m_sizeH->setValue( help );
help = opts[OPT_SCREEN_RES].toInt();
- m_screenRes->setText(i18n( "Screen resolution: %1 dpi").tqarg(help));
+ m_screenRes->setText(i18n( "Screen resolution: %1 dpi").arg(help));
help = opts[OPT_PSGEN_DRAFT].toInt();
m_psDraft->setChecked( help == 1 );
diff --git a/kooka/kadmosocr.cpp b/kooka/kadmosocr.cpp
index 3110451f..a0ad590b 100644
--- a/kooka/kadmosocr.cpp
+++ b/kooka/kadmosocr.cpp
@@ -356,7 +356,7 @@ KADMOS_ERROR CRep::SetImage(TQImage *Image)
m_RepData.image.width = Image->width();
m_RepData.image.height = Image->height();
m_RepData.image.bitsperpixel = Image->depth();
- m_RepData.image.tqalignment = 1;
+ m_RepData.image.alignment = 1;
m_RepData.image.fillorder = FILLORDER_MSB2LSB;
// color
if( Image->depth() == 1 || (Image->numColors()==2 && Image->depth() == 8) )
diff --git a/kooka/kocrbase.cpp b/kooka/kocrbase.cpp
index 2cd5d20b..424a6fdf 100644
--- a/kooka/kocrbase.cpp
+++ b/kooka/kocrbase.cpp
@@ -24,7 +24,7 @@
* *
***************************************************************************/
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqfileinfo.h>
#include <tqtooltip.h>
@@ -129,7 +129,7 @@ void KOCRBase::imgIntro()
m_previewPix = new TQLabel( m_imgHBox );
m_previewPix->setPixmap(TQPixmap());
m_previewPix->setFixedSize(m_previewSize);
- m_previewPix->tqsetAlignment( TQt::AlignCenter );
+ m_previewPix->setAlignment( TQt::AlignCenter );
m_previewPix->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
// m_previewPix->resize(m_previewSize);
@@ -164,7 +164,7 @@ void KOCRBase::ocrIntro( )
hb_cap->setSpacing( KDialog::spacingHint());
TQLabel *imgLab = new TQLabel( hb_cap );
- imgLab->tqsetAlignment( TQt::AlignHCenter | TQt::AlignTop );
+ imgLab->setAlignment( TQt::AlignHCenter | TQt::AlignTop );
imgLab->setPixmap( pix );
pa = hb_cap;
}
@@ -188,7 +188,7 @@ void KOCRBase::spellCheckIntro()
KSpellConfig *sCfg = new KSpellConfig( m_gbSpellOpts, "SPELLCHK", m_spellConfig, false );
/* A space eater */
TQWidget *spaceEater = new TQWidget(m_spellchkPage);
- spaceEater->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ));
+ spaceEater->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ));
/* connect toggle button */
connect( m_cbWantCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slWantSpellcheck(bool)));
@@ -285,7 +285,7 @@ void KOCRBase::introduceImage( KookaImage* img)
}
}
TQWidget *spaceEater = new TQWidget( m_metaBox );
- spaceEater->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ));
+ spaceEater->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ));
m_metaBox->show();
}
diff --git a/kooka/kocrgocr.cpp b/kooka/kocrgocr.cpp
index ca913f1d..14134edd 100644
--- a/kooka/kocrgocr.cpp
+++ b/kooka/kocrgocr.cpp
@@ -26,7 +26,7 @@
/* $Id$ */
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqfileinfo.h>
#include <tqtooltip.h>
diff --git a/kooka/kocrkadmos.cpp b/kooka/kocrkadmos.cpp
index 59afa1a4..1c652651 100644
--- a/kooka/kocrkadmos.cpp
+++ b/kooka/kocrkadmos.cpp
@@ -24,7 +24,7 @@
* *
***************************************************************************/
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqfileinfo.h>
#include <tqtooltip.h>
@@ -422,14 +422,14 @@ bool KadmosDialog::getSelClassifier( TQString& path ) const
if( res && ! fi.exists() )
{
kdDebug(28000) << "Classifier file does not exist" << endl;
- path = i18n("Classifier file %1 does not exist").tqarg(classifier);
+ path = i18n("Classifier file %1 does not exist").arg(classifier);
res = false;
}
if( res && ! fi.isReadable() )
{
kdDebug(28000) << "Classifier file could not be read" << endl;
- path = i18n("Classifier file %1 is not readable").tqarg(classifier);
+ path = i18n("Classifier file %1 is not readable").arg(classifier);
res = false;
}
diff --git a/kooka/kocrocrad.cpp b/kooka/kocrocrad.cpp
index b9365767..384dbe69 100644
--- a/kooka/kocrocrad.cpp
+++ b/kooka/kocrocrad.cpp
@@ -26,7 +26,7 @@
/* $Id$ */
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqfileinfo.h>
#include <tqtooltip.h>
@@ -129,7 +129,7 @@ EngineError ocradDialog::setupGui()
else
m_ocrCmd = res;
- /** tqlayout detection button **/
+ /** layout detection button **/
conf->setGroup( CFG_GROUP_OCRAD );
int layoutDetect = conf->readNumEntry( CFG_OCRAD_LAYOUT_DETECTION, 0 );
kdDebug(28000) << "Layout detection from config: " << layoutDetect << endl;
@@ -137,7 +137,7 @@ EngineError ocradDialog::setupGui()
(void) new KSeparator( KSeparator::HLine, page);
TQHBox *hb1 = new TQHBox(page);
hb1->setSpacing( KDialog::spacingHint() );
- (void) new TQLabel( i18n("OCRAD tqlayout analysis mode: "), hb1);
+ (void) new TQLabel( i18n("OCRAD layout analysis mode: "), hb1);
m_layoutMode = new TQComboBox(hb1);
m_layoutMode->insertItem(i18n("No Layout Detection"), 0 );
m_layoutMode->insertItem(i18n("Column Detection"), 1 );
diff --git a/kooka/kooka.cpp b/kooka/kooka.cpp
index dc05a622..4750bf07 100644
--- a/kooka/kooka.cpp
+++ b/kooka/kooka.cpp
@@ -96,7 +96,7 @@ Kooka::Kooka( const TQCString& deviceToUse)
changeCaption( i18n( "KDE Scanning" ));
- setAutoSaveSettings( TQString::tqfromLatin1("General Options"),
+ setAutoSaveSettings( TQString::fromLatin1("General Options"),
true );
}
diff --git a/kooka/kookapref.cpp b/kooka/kookapref.cpp
index bebd60fa..bc467bfd 100644
--- a/kooka/kookapref.cpp
+++ b/kooka/kookapref.cpp
@@ -36,7 +36,7 @@
#include <kcolorbutton.h>
#include <kstandarddirs.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtooltip.h>
#include <tqvgroupbox.h>
#include <tqgrid.h>
@@ -149,7 +149,7 @@ void KookaPreferences::setupOCRPage()
#endif
top->addWidget( kgp );
TQWidget *spaceEater = new TQWidget( page );
- spaceEater->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ));
+ spaceEater->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ));
top->addWidget( spaceEater );
/*
@@ -180,13 +180,13 @@ KURLRequester* KookaPreferences::binaryCheckBox( TQWidget *parent, const TQStrin
{
TQHBox *hbox = new TQHBox( parent );
- (void) new TQLabel( i18n("Select the %1 binary to use:").tqarg( program ), hbox );
+ (void) new TQLabel( i18n("Select the %1 binary to use:").arg( program ), hbox );
KURLRequester* urlRequester = new KURLRequester( parent );
urlRequester->setMode( KFile::File | KFile::ExistingOnly | KFile::LocalOnly );
TQToolTip::add( urlRequester,
i18n( "Enter the path to %1, the optical-character-recognition "
- "command line tool.").tqarg(program));
+ "command line tool.").arg(program));
return urlRequester;
}
@@ -418,8 +418,8 @@ void KookaPreferences::setupThumbnailPage()
/* Frame Stuff */
int frameWidth = konf->readNumEntry( THUMB_MARGIN, 3 );
- TQColor col1 = konf->readColorEntry( MARGIN_COLOR1, &(tqcolorGroup().base()));
- TQColor col2 = konf->readColorEntry( MARGIN_COLOR2, &(tqcolorGroup().foreground()));
+ TQColor col1 = konf->readColorEntry( MARGIN_COLOR1, &(colorGroup().base()));
+ TQColor col2 = konf->readColorEntry( MARGIN_COLOR2, &(colorGroup().foreground()));
TQGrid *fGrid = new TQGrid( 2, hgb3 );
fGrid->setSpacing( 2 );
@@ -457,7 +457,7 @@ void KookaPreferences::slotApply( void )
/* ** startup options ** */
/** write the global one, to read from libkscan also */
- konf->setGroup(TQString::tqfromLatin1(GROUP_STARTUP));
+ konf->setGroup(TQString::fromLatin1(GROUP_STARTUP));
bool cbVal = !(cbShowScannerSelection->isChecked());
kdDebug(28000) << "Writing for " << STARTUP_SKIP_ASK << ": " << cbVal << endl;
konf->writeEntry( STARTUP_SKIP_ASK, cbVal, true, true ); /* global flag goes to kdeglobals */
@@ -532,8 +532,8 @@ void KookaPreferences::slotDefault( void )
m_tileSelector->setURL( KURL(bgImg) );
m_thumbWidth->setValue( 100 );
m_thumbHeight->setValue( 120 );
- TQColor col1 = TQColor( tqcolorGroup().base());
- TQColor col2 = TQColor( tqcolorGroup().foreground());
+ TQColor col1 = TQColor( colorGroup().base());
+ TQColor col2 = TQColor( colorGroup().foreground());
m_frameWidth->setValue( 3 );
m_colButt1->setColor( col1 );
diff --git a/kooka/kookaview.cpp b/kooka/kookaview.cpp
index 5586ee43..7d6c7f67 100644
--- a/kooka/kookaview.cpp
+++ b/kooka/kookaview.cpp
@@ -47,7 +47,7 @@
#endif
#include <tqlabel.h>
#include <tqpainter.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqsplitter.h>
#include <tqstrlist.h>
#include <tqpaintdevice.h>
@@ -164,7 +164,7 @@ KookaView::KookaView( KParts::DockMainWindow *parent, const TQCString& deviceToU
TQHBox *recentBox = new TQHBox( m_dockRecent );
recentBox->setMargin(KDialog::marginHint());
TQLabel *lab = new TQLabel( i18n("Gallery:"), recentBox );
- lab->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed) );
+ lab->setSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed) );
recentFolder = new ImageNameCombo( recentBox );
m_dockRecent->setWidget( recentBox );
@@ -277,7 +277,7 @@ KookaView::KookaView( KParts::DockMainWindow *parent, const TQCString& deviceToU
packager->openRoots();
- /* tqStatus Bar */
+ /* Status Bar */
KStatusBar *statBar = m_mainWindow->statusBar();
// statBar->insertItem(TQString("1"), SBAR_ZOOM, 0, true );
@@ -472,7 +472,7 @@ void KookaView::print()
printer.setUsePrinterResolution(true);
printer.addDialogPage( new ImgPrintDialog( img ));
- if( printer.setup( m_mainWindow, i18n("Print %1").tqarg(img->localFileName().section('/', -1)) ))
+ if( printer.setup( m_mainWindow, i18n("Print %1").arg(img->localFileName().section('/', -1)) ))
{
KookaPrint kookaprint( &printer );
kookaprint.printImage(img);
@@ -565,7 +565,7 @@ void KookaView::startOCR( KookaImage *img )
m_dockOCRText, TQT_SLOT( show() ));
connect( ocrFabric, TQT_SIGNAL( repaintOCRResImage( )),
- img_canvas, TQT_SLOT(tqrepaint()));
+ img_canvas, TQT_SLOT(repaint()));
connect( ocrFabric, TQT_SIGNAL( clearOCRResultText()),
m_ocrResEdit, TQT_SLOT(clear()));
@@ -842,7 +842,7 @@ void KookaView::slShowAImage( KookaImage *img )
ocrFabric->slSetImage( img );
}
- /* tqStatus Bar */
+ /* Status Bar */
KStatusBar *statBar = m_mainWindow->statusBar();
if( img_canvas )
statBar->changeItem( img_canvas->imageInfoString(), StatusImage );
@@ -913,7 +913,7 @@ void KookaView::slShowThumbnails(KFileTreeViewItem *dirKfi, bool forceRedraw )
*/
void KookaView::slStartLoading( const KURL& url )
{
- emit( signalChangeStatusbar( i18n("Loading %1" ).tqarg( url.prettyURL() ) ));
+ emit( signalChangeStatusbar( i18n("Loading %1" ).arg( url.prettyURL() ) ));
// if( m_stack->visibleWidget() != img_canvas )
// {
diff --git a/kooka/kookaview.h b/kooka/kookaview.h
index 76910cdc..a4fe3383 100644
--- a/kooka/kookaview.h
+++ b/kooka/kookaview.h
@@ -31,7 +31,7 @@
#include "kookaiface.h"
#include <kdockwidget.h>
#include <tqtabwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqimage.h>
#include <tqsplitter.h>
diff --git a/kooka/ksaneocr.cpp b/kooka/ksaneocr.cpp
index 67d0aaca..a73402b6 100644
--- a/kooka/ksaneocr.cpp
+++ b/kooka/ksaneocr.cpp
@@ -60,7 +60,7 @@
#include <tqpaintdevice.h>
#include <tqpainter.h>
#include <tqpen.h>
-#include <tqbrush.h>
+#include <brush.h>
#include <tqfileinfo.h>
/*
@@ -814,11 +814,11 @@ bool KSANEOCR::readORF( const TQString& fileName, TQString& errStr )
TQFileInfo fi( fileName );
if( ! fi.exists() ) {
error = true;
- errStr = i18n("The orf %1 does not exist.").tqarg(fileName);
+ errStr = i18n("The orf %1 does not exist.").arg(fileName);
}
if( ! error && ! fi.isReadable() ) {
error = true;
- errStr = i18n("Permission denied on file %1.").tqarg(fileName);
+ errStr = i18n("Permission denied on file %1.").arg(fileName);
}
diff --git a/kooka/ocrresedit.cpp b/kooka/ocrresedit.cpp
index f8e8f2c2..75ec21c8 100644
--- a/kooka/ocrresedit.cpp
+++ b/kooka/ocrresedit.cpp
@@ -32,7 +32,7 @@
#include <klocale.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
/* -------------------- ocrResEdit -------------------- */
diff --git a/kooka/ocrresedit.h b/kooka/ocrresedit.h
index 72517f4b..b9e7a7e0 100644
--- a/kooka/ocrresedit.h
+++ b/kooka/ocrresedit.h
@@ -27,7 +27,7 @@
#ifndef _OCR_RESEDIT_
#define _OCR_RESEDIT_
-#include <tqtextedit.h>
+#include <textedit.h>
class TQString;
class TQColor;
diff --git a/kooka/scanpackager.cpp b/kooka/scanpackager.cpp
index 9a8c9d3a..2f5da3ca 100644
--- a/kooka/scanpackager.cpp
+++ b/kooka/scanpackager.cpp
@@ -245,7 +245,7 @@ void ScanPackager::slotDecorate( KFileTreeViewItem* item )
}
/* set image size in pixels */
- TQString t = i18n( "%1 x %2" ).tqarg( img->width()).tqarg(img->height());
+ TQString t = i18n( "%1 x %2" ).arg( img->width()).arg(img->height());
item->setText( 1, t );
kdDebug( 28000) << "Image loaded and decorated!" << endl;
}
@@ -463,7 +463,7 @@ void ScanPackager::slotSelectDirectory( const TQString & dirString )
{
kdDebug(28000) << "Trying to decode directory string " << dirString << endl;
- TQString searchFor = TQString::tqfromLatin1(" - ");
+ TQString searchFor = TQString::fromLatin1(" - ");
int pos = dirString.find( searchFor );
if( pos > -1 )
@@ -600,7 +600,7 @@ void ScanPackager::loadImageForItem( KFileTreeViewItem *item )
prevItem = subImgItem;
subImgItem->setPixmap( 0, loader->loadIcon( "editcopy", KIcon::Small ));
- subImgItem->setText( 0, i18n("Sub-image %1").tqarg( i ) );
+ subImgItem->setText( 0, i18n("Sub-image %1").arg( i ) );
KookaImage *subImgImg = new KookaImage( i, img );
subImgImg->setFileItem( newKfi );
newKfi->setExtraData( (void*) this, (void*) subImgImg );
@@ -853,7 +853,7 @@ void ScanPackager::slAddImage( TQImage *img, KookaImageMeta* )
m_nextUrlToShow = lurl;
TQString s;
- /* Count amount of tqchildren of the father */
+ /* Count amount of children of the father */
TQListViewItem *paps = curr->parent();
if( curr->isDir() ) /* take only father if the is no directory */
paps = curr;
@@ -861,7 +861,7 @@ void ScanPackager::slAddImage( TQImage *img, KookaImageMeta* )
if( paps )
{
int childcount = paps->childCount();
- s = i18n("%1 images").tqarg(childcount);
+ s = i18n("%1 images").arg(childcount);
paps->setText( 1, s);
setOpen( paps, true );
}
@@ -1136,7 +1136,7 @@ void ScanPackager::slotDeleteItems( )
s = i18n("Do you really want to delete this image?\nIt cannot be restored!" );
if( item->isDir() )
{
- s = i18n("Do you really want to delete the folder %1\nand all the images inside?").tqarg("");
+ s = i18n("Do you really want to delete the folder %1\nand all the images inside?").arg("");
}
result = KMessageBox::warningContinueCancel(this, s, i18n( "Delete Collection Item"),
KStdGuiItem::del(), "AskForDeleteFiles" );
@@ -1214,7 +1214,7 @@ TQString ScanPackager::getImgName( TQString name_on_disk )
TQString s;
(void) name_on_disk;
- s = i18n("image %1").tqarg(img_counter++);
+ s = i18n("image %1").arg(img_counter++);
return( s );
}
diff --git a/kooka/thumbview.cpp b/kooka/thumbview.cpp
index a431f1ea..570459f4 100644
--- a/kooka/thumbview.cpp
+++ b/kooka/thumbview.cpp
@@ -91,14 +91,14 @@ bool ThumbView::readSettings()
bool dirty = false;
TQColor color;
- color = cfg->readColorEntry( MARGIN_COLOR1, &(tqcolorGroup().base()));
+ color = cfg->readColorEntry( MARGIN_COLOR1, &(colorGroup().base()));
if( color != m_marginColor1 )
{
dirty = true;
m_marginColor1 = color;
}
- color = cfg->readColorEntry( MARGIN_COLOR2, &(tqcolorGroup().foreground()));
+ color = cfg->readColorEntry( MARGIN_COLOR2, &(colorGroup().foreground()));
if( color != m_marginColor2 )
{
dirty = true;
diff --git a/kpdf/conf/dlgaccessibility.ui b/kpdf/conf/dlgaccessibility.ui
index 9d7b9da2..9bb5d46e 100644
--- a/kpdf/conf/dlgaccessibility.ui
+++ b/kpdf/conf/dlgaccessibility.ui
@@ -138,7 +138,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@@ -154,7 +154,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -196,7 +196,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>20</height>
@@ -215,7 +215,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<grid>
<property name="name">
@@ -234,7 +234,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>48</width>
<height>21</height>
@@ -262,7 +262,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -290,7 +290,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>48</width>
<height>21</height>
@@ -318,7 +318,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -348,7 +348,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<grid>
<property name="name">
@@ -375,7 +375,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>48</width>
<height>21</height>
@@ -392,7 +392,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -409,7 +409,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -426,7 +426,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>48</width>
<height>21</height>
diff --git a/kpdf/conf/dlggeneral.ui b/kpdf/conf/dlggeneral.ui
index b042d261..430f3dfb 100644
--- a/kpdf/conf/dlggeneral.ui
+++ b/kpdf/conf/dlggeneral.ui
@@ -32,7 +32,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<vbox>
<property name="name">
@@ -96,7 +96,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout3_2</cstring>
+ <cstring>layout3_2</cstring>
</property>
<vbox>
<property name="name">
@@ -128,7 +128,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>1</height>
@@ -149,7 +149,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kpdf/conf/dlgperformance.ui b/kpdf/conf/dlgperformance.ui
index dab4ffcc..3676c3ba 100644
--- a/kpdf/conf/dlgperformance.ui
+++ b/kpdf/conf/dlgperformance.ui
@@ -40,7 +40,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<vbox>
<property name="name">
@@ -66,7 +66,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout6_2</cstring>
+ <cstring>layout6_2</cstring>
</property>
<vbox>
<property name="name">
@@ -98,7 +98,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>1</height>
@@ -138,13 +138,13 @@
<property name="textFormat">
<enum>PlainText</enum>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<vbox>
<property name="name">
@@ -178,7 +178,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<vbox>
<property name="name">
@@ -210,7 +210,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>1</height>
@@ -231,7 +231,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>16</height>
diff --git a/kpdf/conf/dlgpresentation.ui b/kpdf/conf/dlgpresentation.ui
index 8d3a6c8c..d011c2b3 100644
--- a/kpdf/conf/dlgpresentation.ui
+++ b/kpdf/conf/dlgpresentation.ui
@@ -32,7 +32,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<grid>
<property name="name">
@@ -258,7 +258,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>1</height>
diff --git a/kpdf/core/document.cpp b/kpdf/core/document.cpp
index 2074789d..c85dcea9 100644
--- a/kpdf/core/document.cpp
+++ b/kpdf/core/document.cpp
@@ -13,7 +13,7 @@
#include <tqfile.h>
#include <tqfileinfo.h>
#include <tqimage.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqvaluevector.h>
#include <tqtimer.h>
#include <tqmap.h>
@@ -118,7 +118,7 @@ KPDFDocument::KPDFDocument(TQWidget *widget)
TQStringList::Iterator it = list.begin();
while( it != list.end() )
{
- d->kimgioMimes << KMimeType::findByPath(TQString("foo.%1").tqarg(*it), 0, true)->name();
+ d->kimgioMimes << KMimeType::findByPath(TQString("foo.%1").arg(*it), 0, true)->name();
++it;
}
}
@@ -331,7 +331,7 @@ void KPDFDocument::reparseConfig()
// reparse generator config and if something changed clear KPDFPages
if ( generator && generator->reparseConfig() )
{
- // tqinvalidate pixmaps
+ // invalidate pixmaps
TQValueVector<KPDFPage*>::iterator it = pages_vector.begin(), end = pages_vector.end();
for ( ; it != end; ++it )
(*it)->deletePixmapsAndRects();
@@ -712,7 +712,7 @@ bool KPDFDocument::searchText( int searchID, const TQString & text, bool fromSta
}
}
- // reset cursor to previous tqshape
+ // reset cursor to previous shape
TQApplication::restoreOverrideCursor();
// send page lists if found anything new
@@ -764,7 +764,7 @@ bool KPDFDocument::searchText( int searchID, const TQString & text, bool fromSta
}
}
- // reset cursor to previous tqshape
+ // reset cursor to previous shape
TQApplication::restoreOverrideCursor();
// if a match has been found..
@@ -793,7 +793,7 @@ bool KPDFDocument::searchText( int searchID, const TQString & text, bool fromSta
}
}
else if ( !noDialogs )
- KMessageBox::information( widget(), i18n("No matches found for '%1'.").tqarg( text ) );
+ KMessageBox::information( widget(), i18n("No matches found for '%1'.").arg( text ) );
}
// 3. PREVMATCH //TODO
else if ( type == PrevMatch )
@@ -865,7 +865,7 @@ bool KPDFDocument::searchText( int searchID, const TQString & text, bool fromSta
}
}
- // reset cursor to previous tqshape
+ // reset cursor to previous shape
TQApplication::restoreOverrideCursor();
// send page lists to update observers (since some filter on bookmarks)
@@ -1016,7 +1016,7 @@ void KPDFDocument::processLink( const KPDFLink * link )
KRun::run( *ptr, lst );
}
else
- KMessageBox::information( widget(), i18n( "No application found for opening file of mimetype %1." ).tqarg( mime->name() ) );
+ KMessageBox::information( widget(), i18n( "No application found for opening file of mimetype %1." ).arg( mime->name() ) );
} break;
case KPDFLink::Action: {
@@ -1067,7 +1067,7 @@ void KPDFDocument::processLink( const KPDFLink * link )
case KPDFLink::Browse: {
const KPDFLinkBrowse * browse = static_cast< const KPDFLinkBrowse * >( link );
// if the url is a mailto one, invoke mailer
- if ( browse->url().tqstartsWith( "mailto:", false ) )
+ if ( browse->url().startsWith( "mailto:", false ) )
kapp->invokeMailer( browse->url() );
else
{
diff --git a/kpdf/core/generator_pdf/generator_pdf.cpp b/kpdf/core/generator_pdf/generator_pdf.cpp
index 6550a543..65e3a55a 100644
--- a/kpdf/core/generator_pdf/generator_pdf.cpp
+++ b/kpdf/core/generator_pdf/generator_pdf.cpp
@@ -209,7 +209,7 @@ const DocumentInfo * PDFGenerator::generateDocumentInfo()
if ( pdfdoc )
{
docInfo.set( "format", i18n( "PDF v. <version>", "PDF v. %1" )
- .tqarg( TQString::number( pdfdoc->getPDFVersion() ) ), i18n( "Format" ) );
+ .arg( TQString::number( pdfdoc->getPDFVersion() ) ), i18n( "Format" ) );
docInfo.set( "encryption", pdfdoc->isEncrypted() ? i18n( "Encrypted" ) : i18n( "Unencrypted" ),
i18n("Security") );
docInfo.set( "optimization", pdfdoc->isLinearized() ? i18n( "Yes" ) : i18n( "No" ),
@@ -457,7 +457,7 @@ bool PDFGenerator::print( KPrinter& printer )
{
pstitle = m_document->currentDocument().fileName( false );
}
- // this looks non-tqunicode-safe and it is. anything other than ASCII is not specified
+ // this looks non-unicode-safe and it is. anything other than ASCII is not specified
// and some printers actually stop printing when they encounter non-ASCII characters in the
// Postscript %%Title tag
TQCString pstitle8Bit = pstitle.latin1();
@@ -528,14 +528,14 @@ static GString *TQStringToGString(const TQString &s) {
int len = s.length();
char *cstring = (char *)gmallocn(s.length(), sizeof(char));
for (int i = 0; i < len; ++i)
- cstring[i] = s.tqat(i).tqunicode();
+ cstring[i] = s.at(i).unicode();
return new GString(cstring, len);
}
-static TQString tqunicodeToTQString(Unicode* u, int len) {
+static TQString unicodeToTQString(Unicode* u, int len) {
TQString ret;
ret.setLength(len);
- TQChar* qch = (TQChar*) ret.tqunicode();
+ TQChar* qch = (TQChar*) ret.unicode();
for (;len;--len)
*qch++ = (TQChar) *u++;
return ret;
@@ -568,7 +568,7 @@ static TQString UnicodeParsedString(GString *s1) {
u = s1->getChar(i) & 0xff;
++i;
}
- result += tqunicodeToTQString( &u, 1 );
+ result += unicodeToTQString( &u, 1 );
}
return result;
}
@@ -868,7 +868,7 @@ void PDFGenerator::addSynopsisChildren( TQDomNode * parent, GList * items )
TQString name;
Unicode * uniChar = outlineItem->getTitle();
int titleLength = outlineItem->getTitleLength();
- name = tqunicodeToTQString(uniChar, titleLength);
+ name = unicodeToTQString(uniChar, titleLength);
if ( name.isEmpty() )
continue;
TQDomElement item = docSyn.createElement( name );
@@ -909,11 +909,11 @@ void PDFGenerator::addSynopsisChildren( TQDomNode * parent, GList * items )
item.setAttribute( "Open", TQVariant( (bool)outlineItem->isOpen() ).toString() );
- // 3. recursively descend over tqchildren
+ // 3. recursively descend over children
outlineItem->open();
- GList * tqchildren = outlineItem->getKids();
- if ( tqchildren )
- addSynopsisChildren( &item, tqchildren );
+ GList * children = outlineItem->getKids();
+ if ( children )
+ addSynopsisChildren( &item, children );
}
}
@@ -1017,10 +1017,10 @@ void PDFGenerator::addTransition( int pageNumber, KPDFPage * page )
switch ( pdfTransition->getAlignment() ) {
case PageTransition::Horizontal:
- transition->tqsetAlignment( KPDFPageTransition::Horizontal );
+ transition->setAlignment( KPDFPageTransition::Horizontal );
break;
case PageTransition::Vertical:
- transition->tqsetAlignment( KPDFPageTransition::Vertical );
+ transition->setAlignment( KPDFPageTransition::Vertical );
break;
}
diff --git a/kpdf/core/link.cpp b/kpdf/core/link.cpp
index a872ba60..fd4aa141 100644
--- a/kpdf/core/link.cpp
+++ b/kpdf/core/link.cpp
@@ -18,12 +18,12 @@ KPDFLink::~KPDFLink()
TQString KPDFLinkGoto::linkTip() const
{
- return m_extFileName.isEmpty() ? ( m_vp.pageNumber != -1 ? i18n( "Go to page %1" ).tqarg( m_vp.pageNumber + 1 ) : TQString() ) : i18n("Open external file");
+ return m_extFileName.isEmpty() ? ( m_vp.pageNumber != -1 ? i18n( "Go to page %1" ).arg( m_vp.pageNumber + 1 ) : TQString() ) : i18n("Open external file");
}
TQString KPDFLinkExecute::linkTip() const
{
- return i18n( "Execute '%1'..." ).tqarg( m_fileName );
+ return i18n( "Execute '%1'..." ).arg( m_fileName );
}
TQString KPDFLinkBrowse::linkTip() const
diff --git a/kpdf/core/page.cpp b/kpdf/core/page.cpp
index 269cab2e..cadaacf3 100644
--- a/kpdf/core/page.cpp
+++ b/kpdf/core/page.cpp
@@ -131,11 +131,11 @@ NormalizedRect * KPDFPage::findText( const TQString & text, bool strictCase, Nor
return 0;
// create a xpf's Unicode (unsigned int) array for the given text
- const TQChar * str = text.tqunicode();
+ const TQChar * str = text.unicode();
int len = text.length();
TQMemArray<Unicode> u(len);
for (int i = 0; i < len; ++i)
- u[i] = str[i].tqunicode();
+ u[i] = str[i].unicode();
// find out the direction of search
enum SearchDir { FromTop, NextMatch, PrevMatch } dir = lastRect ? NextMatch : FromTop;
@@ -319,7 +319,7 @@ bool NormalizedRect::intersects( double l, double t, double r, double b ) const
return (l < right) && (r > left) && (t < bottom) && (b > top);
}
-TQRect NormalizedRect::tqgeometry( int xScale, int yScale ) const
+TQRect NormalizedRect::geometry( int xScale, int yScale ) const
{
int l = (int)( left * xScale ),
t = (int)( top * yScale ),
diff --git a/kpdf/core/page.h b/kpdf/core/page.h
index 1ec5add0..2de7aceb 100644
--- a/kpdf/core/page.h
+++ b/kpdf/core/page.h
@@ -36,7 +36,7 @@ class NormalizedRect
bool intersects( const NormalizedRect & normRect ) const;
bool intersects( double l, double t, double r, double b ) const;
- TQRect tqgeometry( int xScale, int yScale ) const;
+ TQRect geometry( int xScale, int yScale ) const;
};
/**
diff --git a/kpdf/core/pagetransition.cpp b/kpdf/core/pagetransition.cpp
index 41d743c6..c43da45a 100644
--- a/kpdf/core/pagetransition.cpp
+++ b/kpdf/core/pagetransition.cpp
@@ -15,7 +15,7 @@
KPDFPageTransition::KPDFPageTransition( Type type )
: m_type( type ),
m_duration( 1 ),
- m_tqalignment(Horizontal ),
+ m_alignment(Horizontal ),
m_direction( Inward ),
m_angle( 0 ),
m_scale( 1.0 ),
diff --git a/kpdf/core/pagetransition.h b/kpdf/core/pagetransition.h
index 25280437..70792355 100644
--- a/kpdf/core/pagetransition.h
+++ b/kpdf/core/pagetransition.h
@@ -51,7 +51,7 @@ class KPDFPageTransition
inline int duration() const { return m_duration; }
// Get dimension in which the transition effect occurs.
- inline Alignment tqalignment() const { return m_tqalignment; }
+ inline Alignment alignment() const { return m_alignment; }
// Get direction of motion of the transition effect.
inline Direction direction() const { return m_direction; }
@@ -67,7 +67,7 @@ class KPDFPageTransition
inline void setType( Type type ) { m_type = type; }
inline void setDuration( int duration ) { m_duration = duration; }
- inline void tqsetAlignment( Alignment tqalignment ) { m_tqalignment = tqalignment; }
+ inline void setAlignment( Alignment alignment ) { m_alignment = alignment; }
inline void setDirection( Direction direction ) { m_direction = direction; }
inline void setAngle( int angle ) { m_angle = angle; }
inline void setScale( double scale ) { m_scale = scale; }
@@ -76,7 +76,7 @@ class KPDFPageTransition
private:
Type m_type;
int m_duration;
- Alignment m_tqalignment;
+ Alignment m_alignment;
Direction m_direction;
int m_angle;
double m_scale;
diff --git a/kpdf/error.cpp b/kpdf/error.cpp
index ca62437f..00d3581e 100644
--- a/kpdf/error.cpp
+++ b/kpdf/error.cpp
@@ -32,7 +32,7 @@ void CDECL error(int pos, char *msg, ...) {
return;
}
if (pos >= 0) {
- emsg = TQString("Error (%1): ").tqarg(pos);
+ emsg = TQString("Error (%1): ").arg(pos);
} else {
emsg = "Error: ";
}
diff --git a/kpdf/part.cpp b/kpdf/part.cpp
index eec5e95b..2afd73b5 100644
--- a/kpdf/part.cpp
+++ b/kpdf/part.cpp
@@ -25,7 +25,7 @@
#include <tqcheckbox.h>
#include <tqsplitter.h>
#include <tqpainter.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqvbox.h>
#include <tqtoolbox.h>
@@ -80,12 +80,12 @@ class PDFOptionsPage : public KPrintDialogPage
PDFOptionsPage()
{
setTitle( i18n( "PDF Options" ) );
- TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+ TQVBoxLayout *layout = new TQVBoxLayout(this);
m_forceRaster = new TQCheckBox(i18n("Force rasterization"), this);
TQToolTip::add(m_forceRaster, i18n("Rasterize into an image before printing"));
TQWhatsThis::add(m_forceRaster, i18n("Forces the rasterization of each page into an image before printing it. This usually gives somewhat worse results, but is useful when printing documents that appear to print incorrectly."));
- tqlayout->addWidget(m_forceRaster);
- tqlayout->addStretch(1);
+ layout->addWidget(m_forceRaster);
+ layout->addStretch(1);
}
void getOptions( TQMap<TQString,TQString>& opts, bool incldef = false )
@@ -151,7 +151,7 @@ Part::Part(TQWidget *parentWidget, const char *widgetName,
connect( m_document, TQT_SIGNAL( openURL(const KURL &) ), this, TQT_SLOT( openURLFromDocument(const KURL &) ) );
connect( m_document, TQT_SIGNAL( close() ), this, TQT_SLOT( close() ) );
- if (parent && parent->tqmetaObject()->slotNames(true).contains("slotQuit()"))
+ if (parent && parent->metaObject()->slotNames(true).contains("slotQuit()"))
connect( m_document, TQT_SIGNAL( quit() ), parent, TQT_SLOT( slotQuit() ) );
else
connect( m_document, TQT_SIGNAL( quit() ), this, TQT_SLOT( cannotQuit() ) );
@@ -186,7 +186,7 @@ Part::Part(TQWidget *parentWidget, const char *widgetName,
int index;
// [left toolbox: Table of Contents] | []
- // dummy wrapper with tqlayout to enable horizontal scroll bars (bug: 147233)
+ // dummy wrapper with layout to enable horizontal scroll bars (bug: 147233)
TQWidget *tocWrapper = new TQWidget(m_toolBox);
TQVBoxLayout *tocWrapperLayout = new TQVBoxLayout(tocWrapper);
m_tocFrame = new TOC( tocWrapper, m_document );
@@ -297,7 +297,7 @@ Part::Part(TQWidget *parentWidget, const char *widgetName,
m_showPresentation = new KAction( i18n("P&resentation"), "kpresenter_kpr", "Ctrl+Shift+P", this, TQT_SLOT(slotShowPresentation()), ac, "presentation");
m_showPresentation->setEnabled( false );
- // attach the actions of the tqchildren widgets too
+ // attach the actions of the children widgets too
m_pageView->setupActions( ac );
// apply configuration (both internal settings and GUI configured items)
@@ -510,7 +510,7 @@ bool Part::openURL(const KURL &url)
// these setWindowCaption calls only work for local files
if ( !b )
{
- KMessageBox::error( widget(), i18n("Could not open %1").tqarg( url.prettyURL() ) );
+ KMessageBox::error( widget(), i18n("Could not open %1").arg( url.prettyURL() ) );
emit setWindowCaption("");
}
else
@@ -806,17 +806,17 @@ void Part::slotSaveFileAs()
{
if (saveURL == url())
{
- KMessageBox::information( widget(), i18n("You are trying to overwrite \"%1\" with itself. This is not allowed. Please save it in another location.").tqarg(saveURL.filename()) );
+ KMessageBox::information( widget(), i18n("You are trying to overwrite \"%1\" with itself. This is not allowed. Please save it in another location.").arg(saveURL.filename()) );
return;
}
if ( KIO::NetAccess::exists( saveURL, false, widget() ) )
{
- if (KMessageBox::warningContinueCancel( widget(), i18n("A file named \"%1\" already exists. Are you sure you want to overwrite it?").tqarg(saveURL.filename()), TQString(), i18n("Overwrite")) != KMessageBox::Continue)
+ if (KMessageBox::warningContinueCancel( widget(), i18n("A file named \"%1\" already exists. Are you sure you want to overwrite it?").arg(saveURL.filename()), TQString(), i18n("Overwrite")) != KMessageBox::Continue)
return;
}
if ( !KIO::NetAccess::file_copy( m_file, saveURL, -1, true ) )
- KMessageBox::information( 0, i18n("File could not be saved in '%1'. Try to save it to another location.").tqarg( saveURL.prettyURL() ) );
+ KMessageBox::information( 0, i18n("File could not be saved in '%1'. Try to save it to another location.").arg( saveURL.prettyURL() ) );
}
}
@@ -939,7 +939,7 @@ void Part::slotShowMenu(const KPDFPage *page, const TQPoint &point)
KPopupMenu *popup = new KPopupMenu( widget(), "rmb popup" );
if (page)
{
- popup->insertTitle( i18n( "Page %1" ).tqarg( page->number() + 1 ) );
+ popup->insertTitle( i18n( "Page %1" ).arg( page->number() + 1 ) );
if ( page->hasBookmark() )
popup->insertItem( SmallIcon("bookmark"), i18n("Remove Bookmark"), 1 );
else
diff --git a/kpdf/ui/minibar.cpp b/kpdf/ui/minibar.cpp
index fed4602e..65a213d8 100644
--- a/kpdf/ui/minibar.cpp
+++ b/kpdf/ui/minibar.cpp
@@ -13,7 +13,7 @@
#include <tqpushbutton.h>
#include <tqlabel.h>
#include <tqlineedit.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqvalidator.h>
#include <tqpainter.h>
#include <kiconloader.h>
@@ -87,7 +87,7 @@ MiniBar::MiniBar( TQWidget * parent, KPDFDocument * document )
TQSpacerItem * spacerL = new TQSpacerItem( 20, 10, TQSizePolicy::Expanding );
horLayout->addItem( spacerL );
- // central 2r by 3c grid tqlayout that contains all components
+ // central 2r by 3c grid layout that contains all components
TQGridLayout * gridLayout = new TQGridLayout( 0, 3,5, 2,1 );
// top spacer 6x6 px
// TQSpacerItem * spacerTop = new TQSpacerItem( 6, 6, TQSizePolicy::Fixed, TQSizePolicy::Fixed );
@@ -198,7 +198,7 @@ void MiniBar::notifyViewportChanged( bool /*smoothMove*/ )
void MiniBar::resizeEvent( TQResizeEvent * e )
{
// auto-hide 'prev' and 'next' buttons if not enough space
- const TQSize & myHint = tqminimumSizeHint();
+ const TQSize & myHint = minimumSizeHint();
bool shown = m_prevButton->isVisible() && m_nextButton->isVisible();
if ( shown && e->size().width() < myHint.width() )
{
@@ -208,7 +208,7 @@ void MiniBar::resizeEvent( TQResizeEvent * e )
}
else if ( !shown )
{
- int histeresis = m_prevButton->tqsizeHint().width() * 2 + 2;
+ int histeresis = m_prevButton->sizeHint().width() * 2 + 2;
if ( e->size().width() > (myHint.width() + histeresis) )
{
m_prevButton->show();
@@ -308,17 +308,17 @@ void ProgressWidget::paintEvent( TQPaintEvent * e )
// paint rects and a separator line
TQPainter p( this );
if ( cRect.isValid() )
- p.fillRect( cRect, tqpalette().active().highlightedText() );
+ p.fillRect( cRect, palette().active().highlightedText() );
if ( fRect.isValid() )
- p.fillRect( fRect, tqpalette().active().highlight() );
+ p.fillRect( fRect, palette().active().highlight() );
if ( l && l != w )
{
- p.setPen( tqpalette().active().highlight().dark( 120 ) );
+ p.setPen( palette().active().highlight().dark( 120 ) );
int delta = TQApplication::reverseLayout() ? w - l : l;
p.drawLine( delta, 0, delta, h );
}
// draw a frame-like outline
- //p.setPen( tqpalette().active().mid() );
+ //p.setPen( palette().active().mid() );
//p.drawRect( 0,0, w, h );
}
@@ -337,7 +337,7 @@ PagesEdit::PagesEdit( MiniBar * parent )
setValidator( m_validator );
// customize text properties
- tqsetAlignment( TQt::AlignCenter );
+ setAlignment( TQt::AlignCenter );
setMaxLength( 4 );
}
@@ -372,7 +372,7 @@ void PagesEdit::focusOutEvent( TQFocusEvent * e )
{
// change background color to a dark tone
setLineWidth( 1 );
- setPaletteBackgroundColor( tqpalette().active().background().light( 105 ) );
+ setPaletteBackgroundColor( palette().active().background().light( 105 ) );
// restore text
TQLineEdit::setText( backString );
// call default handler
@@ -428,7 +428,7 @@ void HoverButton::paintEvent( TQPaintEvent * e )
else
{
TQPainter p( this );
- p.fillRect(e->rect(), parentWidget() ? parentWidget()->tqpalette().brush(TQPalette::Active, TQColorGroup::Background) : paletteBackgroundColor());
+ p.fillRect(e->rect(), parentWidget() ? parentWidget()->palette().brush(TQPalette::Active, TQColorGroup::Background) : paletteBackgroundColor());
drawButtonLabel( &p );
}
}
diff --git a/kpdf/ui/pagepainter.cpp b/kpdf/ui/pagepainter.cpp
index 21e9c37f..a4644c16 100644
--- a/kpdf/ui/pagepainter.cpp
+++ b/kpdf/ui/pagepainter.cpp
@@ -139,7 +139,7 @@ void PagePainter::paintPageOnPainter( const KPDFPage * page, int id, int flags,
{
case KpdfSettings::EnumRenderMode::Inverted:
// Invert image pixels using TQImage internal function
- backImage.tqinvertPixels(false);
+ backImage.invertPixels(false);
break;
case KpdfSettings::EnumRenderMode::Recolor:
// Recolor image using KImageEffect::flatten with dither:0
@@ -178,7 +178,7 @@ void PagePainter::paintPageOnPainter( const KPDFPage * page, int id, int flags,
for ( ; hIt != hEnd; ++hIt )
{
HighlightRect * r = *hIt;
- TQRect highlightRect = r->tqgeometry( width, height );
+ TQRect highlightRect = r->geometry( width, height );
if ( highlightRect.isValid() && highlightRect.intersects( limits ) )
{
// find out the rect to highlight on pixmap
@@ -213,7 +213,7 @@ void PagePainter::paintPageOnPainter( const KPDFPage * page, int id, int flags,
// 3. visually enchance links and images if requested
if ( enhanceLinks || enhanceImages )
{
- TQColor normalColor = TQApplication::tqpalette().active().highlight();
+ TQColor normalColor = TQApplication::palette().active().highlight();
TQColor lightColor = normalColor.light( 140 );
// enlarging limits for intersection is like growing the 'rectGeometry' below
TQRect limitsEnlarged = limits;
@@ -226,7 +226,7 @@ void PagePainter::paintPageOnPainter( const KPDFPage * page, int id, int flags,
if ( (enhanceLinks && rect->objectType() == ObjectRect::Link) ||
(enhanceImages && rect->objectType() == ObjectRect::Image) )
{
- TQRect rectGeometry = rect->tqgeometry( width, height );
+ TQRect rectGeometry = rect->geometry( width, height );
if ( rectGeometry.intersects( limitsEnlarged ) )
{
// expand rect and draw inner border
diff --git a/kpdf/ui/pageview.cpp b/kpdf/ui/pageview.cpp
index de5fad0c..157a3655 100644
--- a/kpdf/ui/pageview.cpp
+++ b/kpdf/ui/pageview.cpp
@@ -24,7 +24,7 @@
#include <tqpushbutton.h>
#include <tqtooltip.h>
#include <tqapplication.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
#include <dcopclient.h>
#include <kcursor.h>
#include <kiconloader.h>
@@ -68,7 +68,7 @@ public:
TQValueVector< PageViewItem * > items;
TQValueList< PageViewItem * > visibleItems;
- // view tqlayout (columns and continuous in Settings), zoom and mouse
+ // view layout (columns and continuous in Settings), zoom and mouse
PageView::ZoomMode zoomMode;
float zoomFactor;
int rotation;
@@ -146,8 +146,8 @@ void PageViewTip::maybeTip( const TQPoint &_p )
PageViewItem * pageItem = m_view->pickItemOnPoint( p.x(), p.y() );
if ( pageItem && m_view->d->mouseMode == PageView::MouseNormal )
{
- double nX = (double)(p.x() - pageItem->tqgeometry().left()) / (double)pageItem->width(),
- nY = (double)(p.y() - pageItem->tqgeometry().top()) / (double)pageItem->height();
+ double nX = (double)(p.x() - pageItem->geometry().left()) / (double)pageItem->width(),
+ nY = (double)(p.y() - pageItem->geometry().top()) / (double)pageItem->height();
// if over a ObjectRect (of type Link) change cursor to hand
const ObjectRect * object = pageItem->page()->hasObject( ObjectRect::Link, nX, nY );
@@ -158,8 +158,8 @@ void PageViewTip::maybeTip( const TQPoint &_p )
TQString strtip = link->linkTip();
if ( !strtip.isEmpty() )
{
- TQRect linkRect = object->tqgeometry( pageItem->width(), pageItem->height() );
- linkRect.moveBy( - m_view->contentsX() + pageItem->tqgeometry().left(), - m_view->contentsY() + pageItem->tqgeometry().top() );
+ TQRect linkRect = object->geometry( pageItem->width(), pageItem->height() );
+ linkRect.moveBy( - m_view->contentsX() + pageItem->geometry().left(), - m_view->contentsY() + pageItem->geometry().top() );
tip( linkRect, strtip );
}
}
@@ -337,7 +337,7 @@ void PageView::notifySetup( const TQValueVector< KPDFPage * > & pageSet, bool do
d->items.clear();
d->visibleItems.clear();
- // create tqchildren widgets
+ // create children widgets
TQValueVector< KPDFPage * >::const_iterator setIt = pageSet.begin(), setEnd = pageSet.end();
for ( ; setIt != setEnd; ++setIt )
d->items.push_back( new PageViewItem( *setIt ) );
@@ -392,13 +392,13 @@ void PageView::notifyViewportChanged( bool smoothMove )
return;
}
- // retqlayout in "Single Pages" mode or if a retqlayout is pending
+ // relayout in "Single Pages" mode or if a relayout is pending
d->blockPixmapsRequest = true;
if ( !KpdfSettings::viewContinuous() || d->dirtyLayout )
slotRelayoutPages();
- // restore viewport center or use default {x-center,v-top} tqalignment
- const TQRect & r = item->tqgeometry();
+ // restore viewport center or use default {x-center,v-top} alignment
+ const TQRect & r = item->geometry();
int newCenterX = r.left(),
newCenterY = r.top();
if ( vp.rePos.enabled )
@@ -462,13 +462,13 @@ void PageView::notifyPageChanged( int pageNumber, int changedFlags )
if ( changedFlags & DocumentObserver::Bookmark )
return;
- // iterate over visible items: if page(pageNumber) is one of them, tqrepaint it
+ // iterate over visible items: if page(pageNumber) is one of them, repaint it
TQValueList< PageViewItem * >::iterator iIt = d->visibleItems.begin(), iEnd = d->visibleItems.end();
for ( ; iIt != iEnd; ++iIt )
if ( (*iIt)->pageNumber() == pageNumber )
{
// update item's rectangle plus the little outline
- TQRect expandedRect = (*iIt)->tqgeometry();
+ TQRect expandedRect = (*iIt)->geometry();
expandedRect.addCoords( -1, -1, 3, 3 );
updateContents( expandedRect );
@@ -535,7 +535,7 @@ void PageView::viewportPaintEvent( TQPaintEvent * pe )
d->selectionRectColor : TQt::red;
// subdivide region into rects
- TQMemArray<TQRect> allRects = TQRegion(pe->region()).tqrects();
+ TQMemArray<TQRect> allRects = TQRegion(pe->region()).rects();
uint numRects = allRects.count();
// preprocess rects area to see if it worths or not using subdivision
@@ -592,7 +592,7 @@ void PageView::viewportPaintEvent( TQPaintEvent * pe )
TQImage blendedImage = blendedPixmap.convertToImage();
KImageEffect::blend( selBlendColor.dark(140), blendedImage, 0.2 );
// copy the blended pixmap back to its place
- pixmapPainter.tqdrawPixmap( blendRect.left(), blendRect.top(), blendedImage );
+ pixmapPainter.drawPixmap( blendRect.left(), blendRect.top(), blendedImage );
}
// draw border (red if the selection is too small)
pixmapPainter.setPen( selBlendColor );
@@ -618,7 +618,7 @@ void PageView::viewportPaintEvent( TQPaintEvent * pe )
if ( !selectionRect.isNull() && selectionRect.intersects( contentsRect ) &&
!selectionRectInternal.contains( contentsRect ) )
{
- screenPainter.setPen( tqpalette().active().highlight().dark(110) );
+ screenPainter.setPen( palette().active().highlight().dark(110) );
screenPainter.drawRect( selectionRect );
}
// 4) Layer 3: overlays
@@ -662,7 +662,7 @@ void PageView::keyPressEvent( TQKeyEvent * e )
bool found = d->document->searchText( PAGEVIEW_SEARCH_ID, d->typeAheadString, true, false,
KPDFDocument::NextMatch, true, tqRgb( 128, 255, 128 ), true );
TQString status = found ? i18n("Text found: \"%1\".") : i18n("Text not found: \"%1\".");
- d->messageWindow->display( status.tqarg(d->typeAheadString.lower()),
+ d->messageWindow->display( status.arg(d->typeAheadString.lower()),
found ? PageViewMessage::Find : PageViewMessage::Warning, 4000 );
d->findTimeoutTimer->start( 3000, true );
}
@@ -682,7 +682,7 @@ void PageView::keyPressEvent( TQKeyEvent * e )
// because it activates the accel
releaseKeyboard();
if ( d->document->continueSearch( PAGEVIEW_SEARCH_ID ) )
- d->messageWindow->display( i18n("Text found: \"%1\".").tqarg(d->typeAheadString.lower()),
+ d->messageWindow->display( i18n("Text found: \"%1\".").arg(d->typeAheadString.lower()),
PageViewMessage::Find, 3000 );
d->findTimeoutTimer->start( 3000, true );
// it is needed to grab the keyboard becase people may have Space assigned to a
@@ -847,7 +847,7 @@ void PageView::contentsMouseMoveEvent( TQMouseEvent * e )
d->zoomFactor *= ( 1.0 + ( (double)deltaY / 500.0 ) );
updateZoom( ZoomRefreshCurrent );
// uncomment following line to force a complete redraw
- viewport()->tqrepaint( false );
+ viewport()->repaint( false );
return;
}
@@ -876,7 +876,7 @@ void PageView::contentsMouseMoveEvent( TQMouseEvent * e )
{
d->aPrevAction = d->aMouseNormal;
d->aMouseSelect->activate();
- TQColor selColor = tqpalette().active().highlight().light( 120 );
+ TQColor selColor = palette().active().highlight().light( 120 );
selectionStart( e->x() + deltaX, e->y() + deltaY, selColor, false );
selectionEndPoint( e->x(), e->y() );
break;
@@ -946,7 +946,7 @@ void PageView::contentsMousePressEvent( TQMouseEvent * e )
case MouseZoom: // set first corner of the zoom rect
if ( leftButton )
- selectionStart( e->x(), e->y(), tqpalette().active().highlight(), false );
+ selectionStart( e->x(), e->y(), palette().active().highlight(), false );
else if ( rightButton )
updateZoom( ZoomOut );
break;
@@ -954,7 +954,7 @@ void PageView::contentsMousePressEvent( TQMouseEvent * e )
case MouseSelect: // set first corner of the selection rect
if ( leftButton )
{
- TQColor selColor = tqpalette().active().highlight().light( 120 );
+ TQColor selColor = palette().active().highlight().light( 120 );
selectionStart( e->x(), e->y(), selColor, false );
}
break;
@@ -1006,8 +1006,8 @@ void PageView::contentsMouseReleaseEvent( TQMouseEvent * e )
// if the mouse has not moved since the press, that's a -click-
if ( leftButton && pageItem && d->mousePressPos == e->globalPos())
{
- double nX = (double)(e->x() - pageItem->tqgeometry().left()) / (double)pageItem->width(),
- nY = (double)(e->y() - pageItem->tqgeometry().top()) / (double)pageItem->height();
+ double nX = (double)(e->x() - pageItem->geometry().left()) / (double)pageItem->width(),
+ nY = (double)(e->y() - pageItem->geometry().top()) / (double)pageItem->height();
const ObjectRect * linkRect, * imageRect;
linkRect = pageItem->page()->hasObject( ObjectRect::Link, nX, nY );
if ( linkRect )
@@ -1105,16 +1105,16 @@ void PageView::contentsMouseReleaseEvent( TQMouseEvent * e )
for ( ; iIt != iEnd; ++iIt )
{
PageViewItem * item = *iIt;
- const TQRect & tqitemRect = item->tqgeometry();
- if ( selectionRect.intersects( tqitemRect ) )
+ const TQRect & itemRect = item->geometry();
+ if ( selectionRect.intersects( itemRect ) )
{
// request the textpage if there isn't one
const KPDFPage * kpdfPage = item->page();
if ( !kpdfPage->hasSearchPage() )
d->document->requestTextPage( kpdfPage->number() );
- // grab text in the rect that intersects tqitemRect
- TQRect relativeRect = selectionRect.intersect( tqitemRect );
- relativeRect.moveBy( -tqitemRect.left(), -tqitemRect.top() );
+ // grab text in the rect that intersects itemRect
+ TQRect relativeRect = selectionRect.intersect( itemRect );
+ relativeRect.moveBy( -itemRect.left(), -itemRect.top() );
NormalizedRect normRect( relativeRect, item->width(), item->height() );
selectedText += kpdfPage->getText( normRect );
}
@@ -1131,7 +1131,7 @@ void PageView::contentsMouseReleaseEvent( TQMouseEvent * e )
if ( KpdfSettings::useKTTSD() )
menu.insertItem( SmallIcon("kttsd"), i18n( "Speak Text" ), 2 );
}
- menu.insertTitle( i18n( "Image (%1 by %2 pixels)" ).tqarg( selectionRect.width() ).tqarg( selectionRect.height() ) );
+ menu.insertTitle( i18n( "Image (%1 by %2 pixels)" ).arg( selectionRect.width() ).arg( selectionRect.height() ) );
menu.insertItem( SmallIcon("image"), i18n( "Copy to Clipboard" ), 3 );
menu.insertItem( SmallIcon("filesave"), i18n( "Save to File..." ), 4 );
int choice = menu.exec( e->globalPos() );
@@ -1147,11 +1147,11 @@ void PageView::contentsMouseReleaseEvent( TQMouseEvent * e )
if ( choice == 3 )
{
// [2] copy pixmap to clipboard
- TQClipboard *cb = TQApplication::tqclipboard();
+ TQClipboard *cb = TQApplication::clipboard();
cb->setPixmap( copyPix, TQClipboard::Clipboard );
if ( cb->supportsSelection() )
cb->setPixmap( copyPix, TQClipboard::Selection );
- d->messageWindow->display( i18n( "Image [%1x%2] copied to clipboard." ).tqarg( copyPix.width() ).tqarg( copyPix.height() ) );
+ d->messageWindow->display( i18n( "Image [%1x%2] copied to clipboard." ).arg( copyPix.width() ).arg( copyPix.height() ) );
}
else if ( choice == 4 )
{
@@ -1165,7 +1165,7 @@ void PageView::contentsMouseReleaseEvent( TQMouseEvent * e )
if ( type.isNull() )
type = "PNG";
copyPix.save( fileName, type.latin1() );
- d->messageWindow->display( i18n( "Image [%1x%2] saved to %3 file." ).tqarg( copyPix.width() ).tqarg( copyPix.height() ).tqarg( type ) );
+ d->messageWindow->display( i18n( "Image [%1x%2] saved to %3 file." ).arg( copyPix.width() ).arg( copyPix.height() ).arg( type ) );
}
}
}
@@ -1175,7 +1175,7 @@ void PageView::contentsMouseReleaseEvent( TQMouseEvent * e )
if ( choice == 1 )
{
// [1] copy text to clipboard
- TQClipboard *cb = TQApplication::tqclipboard();
+ TQClipboard *cb = TQApplication::clipboard();
cb->setText( selectedText, TQClipboard::Clipboard );
if ( cb->supportsSelection() )
cb->setText( selectedText, TQClipboard::Selection );
@@ -1194,7 +1194,7 @@ void PageView::contentsMouseReleaseEvent( TQMouseEvent * e )
TQString error;
if (KApplication::startServiceByDesktopName("kttsd", TQStringList(), &error))
{
- d->messageWindow->display( i18n("Starting KTTSD Failed: %1").tqarg(error) );
+ d->messageWindow->display( i18n("Starting KTTSD Failed: %1").arg(error) );
KpdfSettings::setUseKTTSD(false);
KpdfSettings::writeConfig();
}
@@ -1221,7 +1221,7 @@ void PageView::contentsMouseReleaseEvent( TQMouseEvent * e )
}
}
- // clear widget selection and tqinvalidate rect
+ // clear widget selection and invalidate rect
selectionClear();
// restore previous action if came from it using right button
@@ -1323,17 +1323,17 @@ void PageView::paintItems( TQPainter * p, const TQRect & contentsRect )
for ( ; iIt != iEnd; ++iIt )
{
// check if a piece of the page intersects the contents rect
- if ( !(*iIt)->tqgeometry().intersects( checkRect ) )
+ if ( !(*iIt)->geometry().intersects( checkRect ) )
continue;
PageViewItem * item = *iIt;
- TQRect pixmapGeometry = item->tqgeometry();
+ TQRect pixmapGeometry = item->geometry();
// translate the painter so we draw top-left pixmap corner in 0,0
p->save();
p->translate( pixmapGeometry.left(), pixmapGeometry.top() );
- // item pixmap and outline tqgeometry
+ // item pixmap and outline geometry
TQRect outlineGeometry = pixmapGeometry;
outlineGeometry.addCoords( -1, -1, 3, 3 );
@@ -1378,7 +1378,7 @@ void PageView::paintItems( TQPainter * p, const TQRect & contentsRect )
}
// paint with background color the unpainted area
- TQMemArray<TQRect> backRects = remainingArea.tqrects();
+ TQMemArray<TQRect> backRects = remainingArea.rects();
uint backRectsNumber = backRects.count();
for ( uint jr = 0; jr < backRectsNumber; jr++ )
p->fillRect( backRects[ jr ], TQt::gray );
@@ -1424,7 +1424,7 @@ PageViewItem * PageView::pickItemOnPoint( int x, int y )
for ( ; iIt != iEnd; ++iIt )
{
PageViewItem * i = *iIt;
- const TQRect & r = i->tqgeometry();
+ const TQRect & r = i->geometry();
if ( x < r.right() && x > r.left() && y < r.bottom() )
{
if ( y > r.top() )
@@ -1485,7 +1485,7 @@ void PageView::selectionEndPoint( int x, int y )
compoundRegion -= intersection;
}
// tassellate region with rects and enqueue paint events
- TQMemArray<TQRect> rects = compoundRegion.tqrects();
+ TQMemArray<TQRect> rects = compoundRegion.rects();
for ( uint i = 0; i < rects.count(); i++ )
updateContents( rects[i] );
}
@@ -1544,7 +1544,7 @@ void PageView::updateZoom( ZoomMode newZoomMode )
if ( newZoomMode != d->zoomMode || (newZoomMode == ZoomFixed && newFactor != d->zoomFactor ) )
{
- // rebuild tqlayout and update the whole viewport
+ // rebuild layout and update the whole viewport
d->zoomMode = newZoomMode;
d->zoomFactor = newFactor;
// be sure to block updates to document's viewport
@@ -1599,7 +1599,7 @@ void PageView::updateZoomText()
selIdx++;
TQString localValue( KGlobal::locale()->formatNumber( value * 100.0, 2 ) );
localValue.remove( KGlobal::locale()->decimalSymbol() + double_oh );
- translated << TQString( "%1%" ).tqarg( localValue );
+ translated << TQString( "%1%" ).arg( localValue );
}
d->aZoom->setItems( translated );
@@ -1619,8 +1619,8 @@ void PageView::updateCursor( const TQPoint &p )
PageViewItem * pageItem = pickItemOnPoint( p.x(), p.y() );
if ( pageItem && d->mouseMode == MouseNormal )
{
- double nX = (double)(p.x() - pageItem->tqgeometry().left()) / (double)pageItem->width(),
- nY = (double)(p.y() - pageItem->tqgeometry().top()) / (double)pageItem->height();
+ double nX = (double)(p.x() - pageItem->geometry().left()) / (double)pageItem->width(),
+ nY = (double)(p.y() - pageItem->geometry().top()) / (double)pageItem->height();
// if over a ObjectRect (of type Link) change cursor to hand
d->mouseOnRect = pageItem->page()->hasObject( ObjectRect::Link, nX, nY );
@@ -1643,7 +1643,7 @@ void PageView::doTypeAheadSearch()
bool found = d->document->searchText( PAGEVIEW_SEARCH_ID, d->typeAheadString, false, false,
KPDFDocument::NextMatch, true, tqRgb( 128, 255, 128 ), true );
TQString status = found ? i18n("Text found: \"%1\".") : i18n("Text not found: \"%1\".");
- d->messageWindow->display( status.tqarg(d->typeAheadString.lower()),
+ d->messageWindow->display( status.arg(d->typeAheadString.lower()),
found ? PageViewMessage::Find : PageViewMessage::Warning, 4000 );
d->findTimeoutTimer->start( 3000, true );
}
@@ -1677,7 +1677,7 @@ void PageView::slotRelayoutPages()
fullHeight = 0;
TQRect viewportRect( contentsX(), contentsY(), viewportWidth, viewportHeight );
- // set all items tqgeometry and resize contents. handle 'continuous' and 'single' modes separately
+ // set all items geometry and resize contents. handle 'continuous' and 'single' modes separately
if ( KpdfSettings::viewContinuous() )
{
// Here we find out column's width and row's height to compute a table
@@ -1816,11 +1816,11 @@ void PageView::slotRelayoutPages()
{
int prevX = contentsX(),
prevY = contentsY();
- const TQRect & tqgeometry = d->items[ vp.pageNumber ]->tqgeometry();
+ const TQRect & geometry = d->items[ vp.pageNumber ]->geometry();
double nX = vp.rePos.enabled ? vp.rePos.normalizedX : 0.5,
nY = vp.rePos.enabled ? vp.rePos.normalizedY : 0.0;
- center( tqgeometry.left() + ROUND( nX * (double)tqgeometry.width() ),
- tqgeometry.top() + ROUND( nY * (double)tqgeometry.height() ) );
+ center( geometry.left() + ROUND( nX * (double)geometry.width() ),
+ geometry.top() + ROUND( nY * (double)geometry.height() ) );
// center() usually moves the viewport, that requests pixmaps too.
// if that doesn't happen we have to request them by hand
if ( prevX == contentsX() && prevY == contentsY() )
@@ -1867,7 +1867,7 @@ void PageView::slotRequestVisiblePixmaps( int newLeft, int newTop )
PageViewItem * i = *iIt;
// if the item doesn't intersect the viewport, skip it
- if ( !viewportRect.intersects( i->tqgeometry() ) )
+ if ( !viewportRect.intersects( i->geometry() ) )
continue;
// add the item to the 'visible list'
@@ -1885,18 +1885,18 @@ void PageView::slotRequestVisiblePixmaps( int newLeft, int newTop )
// position between the item and the viewport center
if ( isEvent )
{
- const TQRect & tqgeometry = i->tqgeometry();
+ const TQRect & geometry = i->geometry();
// compute distance between item center and viewport center
- double distance = hypot( (tqgeometry.left() + tqgeometry.right()) / 2 - viewportCenterX,
- (tqgeometry.top() + tqgeometry.bottom()) / 2 - viewportCenterY );
+ double distance = hypot( (geometry.left() + geometry.right()) / 2 - viewportCenterX,
+ (geometry.top() + geometry.bottom()) / 2 - viewportCenterY );
if ( distance >= minDistance && nearPageNumber != -1 )
continue;
nearPageNumber = i->pageNumber();
minDistance = distance;
- if ( tqgeometry.height() > 0 && tqgeometry.width() > 0 )
+ if ( geometry.height() > 0 && geometry.width() > 0 )
{
- focusedX = ( viewportCenterX - (double)tqgeometry.left() ) / (double)tqgeometry.width();
- focusedY = ( viewportCenterY - (double)tqgeometry.top() ) / (double)tqgeometry.height();
+ focusedX = ( viewportCenterX - (double)geometry.left() ) / (double)geometry.width();
+ focusedY = ( viewportCenterY - (double)geometry.top() ) / (double)geometry.height();
}
}
}
diff --git a/kpdf/ui/pageviewutils.cpp b/kpdf/ui/pageviewutils.cpp
index a948d49c..ce657882 100644
--- a/kpdf/ui/pageviewutils.cpp
+++ b/kpdf/ui/pageviewutils.cpp
@@ -27,7 +27,7 @@ PageViewMessage::PageViewMessage( TQWidget * parent )
setFocusPolicy( TQ_NoFocus );
setBackgroundMode( NoBackground );
setPaletteBackgroundColor(kapp->palette().color(TQPalette::Active, TQColorGroup::Background));
- // if the tqlayout is LtR, we can safely place it in the right position
+ // if the layout is LtR, we can safely place it in the right position
if ( !TQApplication::reverseLayout() )
move( 10, 10 );
resize( 0, 0 );
@@ -54,7 +54,7 @@ void PageViewMessage::display( const TQString & message, Icon icon, int duration
iconXOffset = 0,
shadowOffset = 1;
- // load icon (if set) and update tqgeometry
+ // load icon (if set) and update geometry
TQPixmap symbol;
if ( icon != None )
{
@@ -84,44 +84,44 @@ void PageViewMessage::display( const TQString & message, Icon icon, int duration
width += 2 + symbol.width();
height = TQMAX( height, symbol.height() );
}
- TQRect tqgeometry( 0, 0, width + 10, height + 8 );
+ TQRect geometry( 0, 0, width + 10, height + 8 );
// resize pixmap, mask and widget
static TQBitmap mask;
- mask.resize( tqgeometry.size() );
- m_pixmap.resize( tqgeometry.size() );
- resize( tqgeometry.size() );
+ mask.resize( geometry.size() );
+ m_pixmap.resize( geometry.size() );
+ resize( geometry.size() );
// create and set transparency mask
TQPainter maskPainter( &mask);
mask.fill( TQt::black );
maskPainter.setBrush( TQt::white );
- maskPainter.drawRoundRect( tqgeometry, 1600 / tqgeometry.width(), 1600 / tqgeometry.height() );
+ maskPainter.drawRoundRect( geometry, 1600 / geometry.width(), 1600 / geometry.height() );
setMask( mask );
// draw background
TQPainter bufferPainter( &m_pixmap );
bufferPainter.setPen( TQt::black );
bufferPainter.setBrush( paletteBackgroundColor() );
- bufferPainter.drawRoundRect( tqgeometry, 1600 / tqgeometry.width(), 1600 / tqgeometry.height() );
+ bufferPainter.drawRoundRect( geometry, 1600 / geometry.width(), 1600 / geometry.height() );
// draw icon if present
if ( !symbol.isNull() )
bufferPainter.drawPixmap( 5 + iconXOffset, 4, symbol, 0, 0, symbol.width(), symbol.height() );
// draw shadow and text
- int yText = tqgeometry.height() - height / 2;
+ int yText = geometry.height() - height / 2;
bufferPainter.setPen( paletteBackgroundColor().dark( 115 ) );
bufferPainter.drawText( 5 + textXOffset + shadowOffset, yText + 1, message );
bufferPainter.setPen( foregroundColor() );
bufferPainter.drawText( 5 + textXOffset, yText, message );
- // if the tqlayout is RtL, we can move it to the right place only after we
+ // if the layout is RtL, we can move it to the right place only after we
// know how much size it will take
if ( TQApplication::reverseLayout() )
- move( parentWidget()->width() - tqgeometry.width() - 10, 10 );
+ move( parentWidget()->width() - geometry.width() - 10, 10 );
- // show widget and schedule a tqrepaint
+ // show widget and schedule a repaint
show();
update();
@@ -168,19 +168,19 @@ int PageViewItem::pageNumber() const
return m_page->number();
}
-const TQRect& PageViewItem::tqgeometry() const
+const TQRect& PageViewItem::geometry() const
{
- return m_tqgeometry;
+ return m_geometry;
}
int PageViewItem::width() const
{
- return m_tqgeometry.width();
+ return m_geometry.width();
}
int PageViewItem::height() const
{
- return m_tqgeometry.height();
+ return m_geometry.height();
}
double PageViewItem::zoomFactor() const
@@ -190,18 +190,18 @@ double PageViewItem::zoomFactor() const
void PageViewItem::setGeometry( int x, int y, int width, int height )
{
- m_tqgeometry.setRect( x, y, width, height );
+ m_geometry.setRect( x, y, width, height );
}
void PageViewItem::setWHZ( int w, int h, double z )
{
- m_tqgeometry.setWidth( w );
- m_tqgeometry.setHeight( h );
+ m_geometry.setWidth( w );
+ m_geometry.setHeight( h );
m_zoomFactor = z;
}
void PageViewItem::moveTo( int x, int y )
{
- m_tqgeometry.moveLeft( x );
- m_tqgeometry.moveTop( y );
+ m_geometry.moveLeft( x );
+ m_geometry.moveTop( y );
}
diff --git a/kpdf/ui/pageviewutils.h b/kpdf/ui/pageviewutils.h
index ceac9fe2..68c2f08b 100644
--- a/kpdf/ui/pageviewutils.h
+++ b/kpdf/ui/pageviewutils.h
@@ -23,7 +23,7 @@ class KPDFPage;
/**
* @short PageViewItem represents graphically a kpdfpage into the PageView.
*
- * It has methods for settings Item's tqgeometry and other visual properties such
+ * It has methods for settings Item's geometry and other visual properties such
* as the individual zoom factor.
*/
class PageViewItem
@@ -33,7 +33,7 @@ class PageViewItem
const KPDFPage * page() const;
int pageNumber() const;
- const TQRect& tqgeometry() const;
+ const TQRect& geometry() const;
int width() const;
int height() const;
double zoomFactor() const;
@@ -45,7 +45,7 @@ class PageViewItem
private:
const KPDFPage * m_page;
double m_zoomFactor;
- TQRect m_tqgeometry;
+ TQRect m_geometry;
};
diff --git a/kpdf/ui/presentationwidget.cpp b/kpdf/ui/presentationwidget.cpp
index 6e8f52c2..74800e88 100644
--- a/kpdf/ui/presentationwidget.cpp
+++ b/kpdf/ui/presentationwidget.cpp
@@ -43,12 +43,12 @@
#define ENABLE_PROGRESS_OVERLAY
-// a frame contains a pointer to the page object, its tqgeometry and the
+// a frame contains a pointer to the page object, its geometry and the
// transition effect to the next frame
struct PresentationFrame
{
const KPDFPage * page;
- TQRect tqgeometry;
+ TQRect geometry;
};
@@ -56,7 +56,7 @@ PresentationWidget::PresentationWidget( TQWidget * parent, KPDFDocument * doc )
: TQDialog( parent, "presentationWidget", true, WDestructiveClose | WStyle_NoBorder),
m_pressedLink( 0 ), m_handCursor( false ), m_document( doc ), m_frameIndex( -1 )
{
- // set look and tqgeometry
+ // set look and geometry
setBackgroundMode( TQt::NoBackground );
m_width = -1;
@@ -124,7 +124,7 @@ void PresentationWidget::notifySetup( const TQValueVector< KPDFPage * > & pageSe
{
PresentationFrame * frame = new PresentationFrame();
frame->page = *setIt;
- // calculate frame tqgeometry keeping constant aspect ratio
+ // calculate frame geometry keeping constant aspect ratio
float pageRatio = frame->page->ratio();
int pageWidth = m_width,
pageHeight = m_height;
@@ -132,7 +132,7 @@ void PresentationWidget::notifySetup( const TQValueVector< KPDFPage * > & pageSe
pageWidth = (int)( (float)pageHeight / pageRatio );
else
pageHeight = (int)( (float)pageWidth * pageRatio );
- frame->tqgeometry.setRect( (m_width - pageWidth) / 2,
+ frame->geometry.setRect( (m_width - pageWidth) / 2,
(m_height - pageHeight) / 2,
pageWidth, pageHeight );
// add the frame to the vector
@@ -145,11 +145,11 @@ void PresentationWidget::notifySetup( const TQValueVector< KPDFPage * > & pageSe
if ( info )
{
if ( !info->get( "title" ).isNull() )
- m_metaStrings += i18n( "Title: %1" ).tqarg( info->get( "title" ) );
+ m_metaStrings += i18n( "Title: %1" ).arg( info->get( "title" ) );
if ( !info->get( "author" ).isNull() )
- m_metaStrings += i18n( "Author: %1" ).tqarg( info->get( "author" ) );
+ m_metaStrings += i18n( "Author: %1" ).arg( info->get( "author" ) );
}
- m_metaStrings += i18n( "Pages: %1" ).tqarg( m_document->pages() );
+ m_metaStrings += i18n( "Pages: %1" ).arg( m_document->pages() );
m_metaStrings += i18n( "Click to begin" );
}
@@ -287,9 +287,9 @@ void PresentationWidget::mouseMoveEvent( TQMouseEvent * e )
else
{
// show the bar if reaching top 2 pixels
- if ( e->y() <= (tqgeometry().top() + 1) )
+ if ( e->y() <= (geometry().top() + 1) )
m_topBar->show();
- // handle "dragging the wheel" if clicking on its tqgeometry
+ // handle "dragging the wheel" if clicking on its geometry
else if ( e->state() == Qt::LeftButton && m_overlayGeometry.contains( e->pos() ) )
overlayClick( e->pos() );
}
@@ -314,7 +314,7 @@ void PresentationWidget::paintEvent( TQPaintEvent * pe )
m_topBar->alignItemRight( 1 );
m_topBar->hide();
// change topbar background color
- TQPalette p = m_topBar->tqpalette();
+ TQPalette p = m_topBar->palette();
p.setColor( TQPalette::Active, TQColorGroup::Button, TQt::gray );
p.setColor( TQPalette::Active, TQColorGroup::Background, TQt::darkGray );
m_topBar->setPalette( p );
@@ -330,12 +330,12 @@ void PresentationWidget::paintEvent( TQPaintEvent * pe )
}
// check painting rect consistancy
- TQRect r = pe->rect().intersect( tqgeometry() );
+ TQRect r = pe->rect().intersect( geometry() );
if ( r.isNull() || m_lastRenderedPixmap.isNull() )
return;
// blit the pixmap to the screen
- TQMemArray<TQRect> allRects = TQRegion(pe->region()).tqrects();
+ TQMemArray<TQRect> allRects = TQRegion(pe->region()).rects();
uint numRects = allRects.count();
for ( uint i = 0; i < numRects; i++ )
{
@@ -370,18 +370,18 @@ void PresentationWidget::paintEvent( TQPaintEvent * pe )
// </widget events>
-const KPDFLink * PresentationWidget::getLink( int x, int y, TQRect * tqgeometry ) const
+const KPDFLink * PresentationWidget::getLink( int x, int y, TQRect * geometry ) const
{
// no links on invalid pages
- if ( tqgeometry && !tqgeometry->isNull() )
- tqgeometry->setRect( 0, 0, -1, -1 );
+ if ( geometry && !geometry->isNull() )
+ geometry->setRect( 0, 0, -1, -1 );
if ( m_frameIndex < 0 || m_frameIndex >= (int)m_frames.size() )
return 0;
- // get frame, page and tqgeometry
+ // get frame, page and geometry
const PresentationFrame * frame = m_frames[ m_frameIndex ];
const KPDFPage * page = frame->page;
- const TQRect & frameGeometry = frame->tqgeometry;
+ const TQRect & frameGeometry = frame->geometry;
// compute normalized x and y
double nx = (double)(x - frameGeometry.left()) / (double)frameGeometry.width();
@@ -396,11 +396,11 @@ const KPDFLink * PresentationWidget::getLink( int x, int y, TQRect * tqgeometry
if ( !object )
return 0;
- // compute link tqgeometry if destination rect present
- if ( tqgeometry )
+ // compute link geometry if destination rect present
+ if ( geometry )
{
- *tqgeometry = object->tqgeometry( frameGeometry.width(), frameGeometry.height() );
- tqgeometry->moveBy( frameGeometry.left(), frameGeometry.top() );
+ *geometry = object->geometry( frameGeometry.width(), frameGeometry.height() );
+ geometry->moveBy( frameGeometry.left(), frameGeometry.top() );
}
// return the link pointer
@@ -416,7 +416,7 @@ void PresentationWidget::testCursorOnLink( int x, int y )
// only react on changes (in/out from a link)
if ( (link && !m_handCursor) || (!link && m_handCursor) )
{
- // change cursor tqshape
+ // change cursor shape
m_handCursor = link != 0;
setCursor( m_handCursor ? KCursor::handCursor() : KCursor::arrowCursor());
@@ -451,8 +451,8 @@ void PresentationWidget::changePage( int newPage )
// check if pixmap exists or else request it
m_frameIndex = newPage;
PresentationFrame * frame = m_frames[ m_frameIndex ];
- int pixW = frame->tqgeometry.width();
- int pixH = frame->tqgeometry.height();
+ int pixW = frame->geometry.width();
+ int pixH = frame->geometry.height();
// if pixmap not inside the KPDFPage we request it and wait for
// notifyPixmapChanged call or else we can proceed to pixmap generation
@@ -470,16 +470,16 @@ void PresentationWidget::changePage( int newPage )
if (newPage + 1 < (int)m_document->pages())
{
PresentationFrame *nextFrame = m_frames[ newPage + 1 ];
- pixW = nextFrame->tqgeometry.width();
- pixH = nextFrame->tqgeometry.height();
+ pixW = nextFrame->geometry.width();
+ pixH = nextFrame->geometry.height();
if ( !nextFrame->page->hasPixmap( PRESENTATION_ID, pixW, pixH ) )
requests.push_back( new PixmapRequest( PRESENTATION_ID, newPage + 1, pixW, pixH, PRESENTATION_PRELOAD_PRIO, true ) );
}
if (newPage - 1 >= 0)
{
PresentationFrame *prevFrame = m_frames[ newPage - 1 ];
- pixW = prevFrame->tqgeometry.width();
- pixH = prevFrame->tqgeometry.height();
+ pixW = prevFrame->geometry.width();
+ pixH = prevFrame->geometry.height();
if ( !prevFrame->page->hasPixmap( PRESENTATION_ID, pixW, pixH ) )
requests.push_back( new PixmapRequest( PRESENTATION_ID, newPage - 1, pixW, pixH, PRESENTATION_PRELOAD_PRIO, true ) );
}
@@ -595,7 +595,7 @@ void PresentationWidget::generateContentsPage( int pageNum, TQPainter & p )
PresentationFrame * frame = m_frames[ pageNum ];
// translate painter and contents rect
- TQRect geom( frame->tqgeometry );
+ TQRect geom( frame->geometry );
p.translate( geom.left(), geom.top() );
geom.moveBy( -geom.left(), -geom.top() );
@@ -605,11 +605,11 @@ void PresentationWidget::generateContentsPage( int pageNum, TQPainter & p )
&p, geom, geom.width(), geom.height() );
// restore painter
- p.translate( -frame->tqgeometry.left(), -frame->tqgeometry.top() );
+ p.translate( -frame->geometry.left(), -frame->geometry.top() );
// fill unpainted areas with background color
TQRegion unpainted( TQRect( 0, 0, m_width, m_height ) );
- TQMemArray<TQRect> rects = TQRegion(unpainted.subtract( frame->tqgeometry )).tqrects();
+ TQMemArray<TQRect> rects = TQRegion(unpainted.subtract( frame->geometry )).rects();
for ( uint i = 0; i < rects.count(); i++ )
{
const TQRect & r = rects[i];
@@ -622,7 +622,7 @@ inline int qt_div255(int x) { return (x + (x>>8) + 0x80) >> 8; }
void PresentationWidget::generateOverlay()
{
#ifdef ENABLE_PROGRESS_OVERLAY
- // calculate overlay tqgeometry and resize pixmap if needed
+ // calculate overlay geometry and resize pixmap if needed
int side = m_width / 16;
m_overlayGeometry.setRect( m_width - side - 4, 4, side, side );
if ( m_lastRenderedOverlay.width() != side )
@@ -690,9 +690,9 @@ void PresentationWidget::generateOverlay()
// generate a 2 colors pixmap using mixing shadow (made with highlight color)
// and image (made with highlightedText color)
- TQColor color = tqpalette().active().highlightedText();
+ TQColor color = palette().active().highlightedText();
int red = color.red(), green = color.green(), blue = color.blue();
- color = tqpalette().active().highlight();
+ color = palette().active().highlight();
int sRed = color.red(), sGreen = color.green(), sBlue = color.blue();
// pointers
unsigned int * data = (unsigned int *)image.bits(),
@@ -725,7 +725,7 @@ void PresentationWidget::generateOverlay()
m_lastRenderedOverlay.convertFromImage( image );
// start the autohide timer
- tqrepaint( m_overlayGeometry, false /*clear*/ ); // toggle with next line
+ repaint( m_overlayGeometry, false /*clear*/ ); // toggle with next line
//update( m_overlayGeometry );
m_overlayHideTimer->start( 2500, true );
#endif
@@ -837,14 +837,14 @@ const KPDFPageTransition PresentationWidget::defaultTransition( int type ) const
case KpdfSettings::EnumSlidesTransition::BlindsHorizontal:
{
KPDFPageTransition transition( KPDFPageTransition::Blinds );
- transition.tqsetAlignment( KPDFPageTransition::Horizontal );
+ transition.setAlignment( KPDFPageTransition::Horizontal );
return transition;
break;
}
case KpdfSettings::EnumSlidesTransition::BlindsVertical:
{
KPDFPageTransition transition( KPDFPageTransition::Blinds );
- transition.tqsetAlignment( KPDFPageTransition::Vertical );
+ transition.setAlignment( KPDFPageTransition::Vertical );
return transition;
break;
}
@@ -896,7 +896,7 @@ const KPDFPageTransition PresentationWidget::defaultTransition( int type ) const
case KpdfSettings::EnumSlidesTransition::SplitHorizontalIn:
{
KPDFPageTransition transition( KPDFPageTransition::Split );
- transition.tqsetAlignment( KPDFPageTransition::Horizontal );
+ transition.setAlignment( KPDFPageTransition::Horizontal );
transition.setDirection( KPDFPageTransition::Inward );
return transition;
break;
@@ -904,7 +904,7 @@ const KPDFPageTransition PresentationWidget::defaultTransition( int type ) const
case KpdfSettings::EnumSlidesTransition::SplitHorizontalOut:
{
KPDFPageTransition transition( KPDFPageTransition::Split );
- transition.tqsetAlignment( KPDFPageTransition::Horizontal );
+ transition.setAlignment( KPDFPageTransition::Horizontal );
transition.setDirection( KPDFPageTransition::Outward );
return transition;
break;
@@ -912,7 +912,7 @@ const KPDFPageTransition PresentationWidget::defaultTransition( int type ) const
case KpdfSettings::EnumSlidesTransition::SplitVerticalIn:
{
KPDFPageTransition transition( KPDFPageTransition::Split );
- transition.tqsetAlignment( KPDFPageTransition::Vertical );
+ transition.setAlignment( KPDFPageTransition::Vertical );
transition.setDirection( KPDFPageTransition::Inward );
return transition;
break;
@@ -920,7 +920,7 @@ const KPDFPageTransition PresentationWidget::defaultTransition( int type ) const
case KpdfSettings::EnumSlidesTransition::SplitVerticalOut:
{
KPDFPageTransition transition( KPDFPageTransition::Split );
- transition.tqsetAlignment( KPDFPageTransition::Vertical );
+ transition.setAlignment( KPDFPageTransition::Vertical );
transition.setDirection( KPDFPageTransition::Outward );
return transition;
break;
@@ -963,7 +963,7 @@ const KPDFPageTransition PresentationWidget::defaultTransition( int type ) const
/** ONLY the TRANSITIONS GENERATION function from here on **/
void PresentationWidget::initTransition( const KPDFPageTransition *transition )
{
- // if it's just a 'replace' transition, tqrepaint the screen
+ // if it's just a 'replace' transition, repaint the screen
if ( transition->type() == KPDFPageTransition::Replace )
{
update();
@@ -971,7 +971,7 @@ void PresentationWidget::initTransition( const KPDFPageTransition *transition )
}
const bool isInward = transition->direction() == KPDFPageTransition::Inward;
- const bool isHorizontal = transition->tqalignment() == KPDFPageTransition::Horizontal;
+ const bool isHorizontal = transition->alignment() == KPDFPageTransition::Horizontal;
const float totalTime = transition->duration();
m_transitionRects.clear();
diff --git a/kpdf/ui/presentationwidget.h b/kpdf/ui/presentationwidget.h
index 26db0836..000bfeaa 100644
--- a/kpdf/ui/presentationwidget.h
+++ b/kpdf/ui/presentationwidget.h
@@ -60,7 +60,7 @@ class PresentationWidget : public TQDialog, public DocumentObserver
void paintEvent( TQPaintEvent * e );
private:
- const KPDFLink * getLink( int x, int y, TQRect * tqgeometry = 0 ) const;
+ const KPDFLink * getLink( int x, int y, TQRect * geometry = 0 ) const;
void testCursorOnLink( int x, int y );
void overlayClick( const TQPoint & position );
void changePage( int newPage );
diff --git a/kpdf/ui/propertiesdialog.cpp b/kpdf/ui/propertiesdialog.cpp
index d9cee932..d3d0af60 100644
--- a/kpdf/ui/propertiesdialog.cpp
+++ b/kpdf/ui/propertiesdialog.cpp
@@ -8,7 +8,7 @@
***************************************************************************/
// qt/kde includes
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <klistview.h>
#include <klocale.h>
@@ -24,18 +24,18 @@ PropertiesDialog::PropertiesDialog(TQWidget *parent, KPDFDocument *doc)
{
// Properties
TQFrame *page = addPage(i18n("Properties"));
- TQGridLayout *tqlayout = new TQGridLayout( page, 2, 2, marginHint(), spacingHint() );
+ TQGridLayout *layout = new TQGridLayout( page, 2, 2, marginHint(), spacingHint() );
// get document info, if not present display blank data and a warning
const DocumentInfo * info = doc->documentInfo();
if ( !info ) {
- tqlayout->addWidget( new TQLabel( i18n( "No document opened." ), page ), 0, 0 );
+ layout->addWidget( new TQLabel( i18n( "No document opened." ), page ), 0, 0 );
return;
}
// mime name based on mimetype id
TQString mimeName = info->get( "mimeType" ).section( '/', -1 ).upper();
- setCaption( i18n("%1 Properties").tqarg( mimeName ) );
+ setCaption( i18n("%1 Properties").arg( mimeName ) );
TQDomElement docElement = info->documentElement();
@@ -49,11 +49,11 @@ PropertiesDialog::PropertiesDialog(TQWidget *parent, KPDFDocument *doc)
if ( titleString.isEmpty() || valueString.isEmpty() )
continue;
- // create labels and tqlayout them
- TQLabel *key = new TQLabel( i18n( "%1:" ).tqarg( titleString ), page );
+ // create labels and layout them
+ TQLabel *key = new TQLabel( i18n( "%1:" ).arg( titleString ), page );
TQLabel *value = new KSqueezedTextLabel( valueString, page );
- tqlayout->addWidget( key, row, 0, AlignRight );
- tqlayout->addWidget( value, row, 1 );
+ layout->addWidget( key, row, 0, AlignRight );
+ layout->addWidget( value, row, 1 );
row++;
// refine maximum width of 'value' labels
@@ -66,8 +66,8 @@ PropertiesDialog::PropertiesDialog(TQWidget *parent, KPDFDocument *doc)
TQLabel *key = new TQLabel( i18n( "Pages:" ), page );
TQLabel *value = new TQLabel( TQString::number( doc->pages() ), page );
- tqlayout->addWidget( key, row, 0 );
- tqlayout->addWidget( value, row, 1 );
+ layout->addWidget( key, row, 0 );
+ layout->addWidget( value, row, 1 );
}
// Fonts
@@ -82,10 +82,10 @@ PropertiesDialog::PropertiesDialog(TQWidget *parent, KPDFDocument *doc)
}
// current width: left column + right column + dialog borders
- int width = tqlayout->tqminimumSize().width() + valMaxWidth + marginHint() + spacingHint() + marginHint() + 30;
+ int width = layout->minimumSize().width() + valMaxWidth + marginHint() + spacingHint() + marginHint() + 30;
if (page2Layout)
{
- width = TQMAX( width, page2Layout->tqsizeHint().width() + marginHint() + spacingHint() + 31 );
+ width = TQMAX( width, page2Layout->sizeHint().width() + marginHint() + spacingHint() + 31 );
}
// stay inside the 2/3 of the screen width
TQRect screenContainer = KGlobalSettings::desktopGeometry( this );
diff --git a/kpdf/ui/searchwidget.cpp b/kpdf/ui/searchwidget.cpp
index 7ca3ba49..f21d8b73 100644
--- a/kpdf/ui/searchwidget.cpp
+++ b/kpdf/ui/searchwidget.cpp
@@ -79,10 +79,10 @@ void SearchWidget::clearText()
void SearchWidget::slotTextChanged( const TQString & text )
{
// if 0<length<3 set 'red' text and send a blank string to document
- TQColor color = text.length() > 0 && text.length() < 3 ? TQt::darkRed : tqpalette().active().text();
+ TQColor color = text.length() > 0 && text.length() < 3 ? TQt::darkRed : palette().active().text();
KLineEdit * lineEdit = getLined( LEDIT_ID );
lineEdit->setPaletteForegroundColor( color );
- lineEdit->setPaletteBackgroundColor( tqpalette().active().base() );
+ lineEdit->setPaletteBackgroundColor( palette().active().base() );
m_inputDelayTimer->stop();
m_inputDelayTimer->start(333, true);
}
diff --git a/kpdf/ui/thumbnaillist.cpp b/kpdf/ui/thumbnaillist.cpp
index a41869d6..6c5e2b5f 100644
--- a/kpdf/ui/thumbnaillist.cpp
+++ b/kpdf/ui/thumbnaillist.cpp
@@ -82,7 +82,7 @@ ThumbnailList::ThumbnailList( TQWidget *parent, KPDFDocument *document )
setDragAutoScroll( false );
// set contents background to the 'base' color
- viewport()->setPaletteBackgroundColor( tqpalette().active().base() );
+ viewport()->setPaletteBackgroundColor( palette().active().base() );
setFrameStyle( StyledPanel | Raised );
connect( this, TQT_SIGNAL(contentsMoving(int, int)), this, TQT_SLOT(slotRequestVisiblePixmaps(int, int)) );
@@ -199,7 +199,7 @@ void ThumbnailList::notifyPageChanged( int pageNumber, int /*changedFlags*/ )
//if ( !(changedFlags & DocumentObserver::Pixmap) )
// return;
- // iterate over visible items: if page(pageNumber) is one of them, tqrepaint it
+ // iterate over visible items: if page(pageNumber) is one of them, repaint it
TQValueList<ThumbnailWidget *>::iterator vIt = m_visibleThumbnails.begin(), vEnd = m_visibleThumbnails.end();
for ( ; vIt != vEnd; ++vIt )
if ( (*vIt)->pageNumber() == pageNumber )
@@ -362,7 +362,7 @@ void ThumbnailList::viewportResizeEvent( TQResizeEvent * e )
else if ( e->size().height() <= e->oldSize().height() )
return;
- // tqinvalidate the bookmark overlay
+ // invalidate the bookmark overlay
if ( m_bookmarkOverlay )
{
delete m_bookmarkOverlay;
@@ -495,9 +495,9 @@ void ThumbnailWidget::paintEvent( TQPaintEvent * e )
TQPainter p( this );
// draw the bottom label + highlight mark
- TQColor fillColor = m_selected ? tqpalette().active().highlight() : tqpalette().active().base();
+ TQColor fillColor = m_selected ? palette().active().highlight() : palette().active().base();
p.fillRect( 0, 0, width, height, fillColor );
- p.setPen( m_selected ? tqpalette().active().highlightedText() : tqpalette().active().text() );
+ p.setPen( m_selected ? palette().active().highlightedText() : palette().active().text() );
p.drawText( 0, m_pixmapHeight + m_margin, width, m_labelHeight, TQt::AlignCenter, TQString::number( m_labelNumber ) );
// draw page outline and pixmap
@@ -509,7 +509,7 @@ void ThumbnailWidget::paintEvent( TQPaintEvent * e )
p.setPen( isBookmarked ? TQColor( 0xFF8000 ) : TQt::black );
p.drawRect( m_margin/2 - 1, m_margin/2 - 1, m_pixmapWidth + 2, m_pixmapHeight + 2 );
// draw the clear rect
- p.setPen( isBookmarked ? TQColor( 0x804000 ) : tqpalette().active().base() );
+ p.setPen( isBookmarked ? TQColor( 0x804000 ) : palette().active().base() );
// draw the bottom and right shadow edges
if ( !isBookmarked )
{
diff --git a/kpdf/ui/thumbnaillist.h b/kpdf/ui/thumbnaillist.h
index 549ea20c..fb128045 100644
--- a/kpdf/ui/thumbnaillist.h
+++ b/kpdf/ui/thumbnaillist.h
@@ -102,7 +102,7 @@ class ThumbnailsBox : public TQVBox
{
public:
ThumbnailsBox( TQWidget * parent ) : TQVBox( parent ) {};
- TQSize tqsizeHint() const { return TQSize(); }
+ TQSize sizeHint() const { return TQSize(); }
};
/**
diff --git a/kpovmodeler/pmactions.cpp b/kpovmodeler/pmactions.cpp
index 18af4c37..0229c518 100644
--- a/kpovmodeler/pmactions.cpp
+++ b/kpovmodeler/pmactions.cpp
@@ -29,7 +29,7 @@
#include "pmdebug.h"
// Fixed widths are calculated wrong in a toolbar.
-// Fixed tqsizeHint for the combo box to return
+// Fixed sizeHint for the combo box to return
// at least the minimum size
class PMComboBox : public TQComboBox
{
@@ -39,15 +39,15 @@ public:
{
}
- virtual TQSize tqminimumSizeHint( ) const
+ virtual TQSize minimumSizeHint( ) const
{
- TQSize s = TQComboBox::tqminimumSizeHint( );
- return s.expandedTo( tqminimumSize( ) );
+ TQSize s = TQComboBox::minimumSizeHint( );
+ return s.expandedTo( minimumSize( ) );
}
- virtual TQSize tqsizeHint( ) const
+ virtual TQSize sizeHint( ) const
{
- TQSize s = TQComboBox::tqsizeHint( );
- return s.expandedTo( tqminimumSize( ) );
+ TQSize s = TQComboBox::sizeHint( );
+ return s.expandedTo( minimumSize( ) );
}
};
@@ -126,7 +126,7 @@ public:
setText( text );
}
protected:
- TQSize tqsizeHint( ) const
+ TQSize sizeHint( ) const
{
int w = fontMetrics( ).width( text( ) );
int h = fontMetrics( ).height( );
@@ -135,10 +135,10 @@ protected:
void drawButton( TQPainter* p )
{
// Draw the background
- tqstyle( ).tqdrawComplexControl( TQStyle::CC_ToolButton, p, this, rect( ), tqcolorGroup( ),
+ tqstyle( ).drawComplexControl( TQStyle::CC_ToolButton, p, this, rect( ), colorGroup( ),
TQStyle::Style_Enabled, TQStyle::SC_ToolButton );
// Draw the label
- tqstyle( ).tqdrawControl( TQStyle::CE_ToolButtonLabel, p, this, rect( ), tqcolorGroup( ),
+ tqstyle( ).drawControl( TQStyle::CE_ToolButtonLabel, p, this, rect( ), colorGroup( ),
TQStyle::Style_Enabled );
}
};
diff --git a/kpovmodeler/pmaddcommand.cpp b/kpovmodeler/pmaddcommand.cpp
index 2eb78126..b8d4ea49 100644
--- a/kpovmodeler/pmaddcommand.cpp
+++ b/kpovmodeler/pmaddcommand.cpp
@@ -27,7 +27,7 @@
#include <klocale.h>
PMAddCommand::PMAddCommand( PMObject* obj, PMObject* parent, PMObject* after )
- : PMCommand( i18n( "Add New %1" ).tqarg( obj->description( ) ) )
+ : PMCommand( i18n( "Add New %1" ).arg( obj->description( ) ) )
{
m_objects.append( obj );
m_pParent = parent;
diff --git a/kpovmodeler/pmaddcommand.h b/kpovmodeler/pmaddcommand.h
index 51beec31..97793d03 100644
--- a/kpovmodeler/pmaddcommand.h
+++ b/kpovmodeler/pmaddcommand.h
@@ -48,10 +48,10 @@ public:
/**
* Command that adds a list of new PMObjects.
*
- * The object in the list will be inserted as tqchildren of parent after
+ * The object in the list will be inserted as children of parent after
* the object after.
*
- * If after is 0, the objects will be inserted as first tqchildren.
+ * If after is 0, the objects will be inserted as first children.
*/
PMAddCommand( const PMObjectList& list, PMObject* parent, PMObject* after );
/**
diff --git a/kpovmodeler/pmbicubicpatch.cpp b/kpovmodeler/pmbicubicpatch.cpp
index dd281ceb..2c1c99dd 100644
--- a/kpovmodeler/pmbicubicpatch.cpp
+++ b/kpovmodeler/pmbicubicpatch.cpp
@@ -177,10 +177,10 @@ void PMBicubicPatch::serialize( TQDomElement& e, TQDomDocument& doc ) const
e.setAttribute( "uvEnabled", m_uvEnabled );
for( i = 0; i < 16; i++ )
- e.setAttribute( TQString( "cp%1" ).tqarg( i ), m_point[i].serializeXML( ) );
+ e.setAttribute( TQString( "cp%1" ).arg( i ), m_point[i].serializeXML( ) );
for( i = 0; i < 4; ++i )
- e.setAttribute( TQString( "uv%1" ).tqarg( i ), m_uvVectors[i].serializeXML( ) );
+ e.setAttribute( TQString( "uv%1" ).arg( i ), m_uvVectors[i].serializeXML( ) );
Base::serialize( e, doc );
}
@@ -198,7 +198,7 @@ void PMBicubicPatch::readAttributes( const PMXMLHelper& h )
for( v = 0; v < 4; v++ )
for( u = 0; u < 4; u++ )
- m_point[u+v*4] = h.vectorAttribute( TQString( "cp%1" ).tqarg( u+v*4 ),
+ m_point[u+v*4] = h.vectorAttribute( TQString( "cp%1" ).arg( u+v*4 ),
PMVector( o + s * u, 0, o + s * v ) );
m_uvVectors[0] = h.vectorAttribute( "uv0", c_defaultUVVector0 );
@@ -209,11 +209,11 @@ void PMBicubicPatch::readAttributes( const PMXMLHelper& h )
Base::readAttributes( h );
}
-PMMetaObject* PMBicubicPatch::tqmetaObject( ) const
+PMMetaObject* PMBicubicPatch::metaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "BicubicPatch", Base::tqmetaObject( ),
+ s_pMetaObject = new PMMetaObject( "BicubicPatch", Base::metaObject( ),
createNewBicubicPatch );
s_pMetaObject->addProperty(
new PMBicubicPatchProperty( "patchType", &PMBicubicPatch::setPatchType,
@@ -527,7 +527,7 @@ void PMBicubicPatch::controlPoints( PMControlPointList& list )
for( v = 0; v < 4; v++ )
for( u = 0; u < 4; u++ )
list.append( new PM3DControlPoint( m_point[u+v*4], u+v*4,
- i18n( "Point (%1, %2)" ).tqarg( u ).tqarg( v ) ) );
+ i18n( "Point (%1, %2)" ).arg( u ).arg( v ) ) );
}
void PMBicubicPatch::controlPointsChanged( PMControlPointList& list )
diff --git a/kpovmodeler/pmbicubicpatch.h b/kpovmodeler/pmbicubicpatch.h
index 54baae43..d14f7821 100644
--- a/kpovmodeler/pmbicubicpatch.h
+++ b/kpovmodeler/pmbicubicpatch.h
@@ -55,7 +55,7 @@ public:
/** */
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* tqmetaObject( ) const;
+ virtual PMMetaObject* metaObject( ) const;
/** */
virtual void cleanUp( ) const;
diff --git a/kpovmodeler/pmbicubicpatchedit.cpp b/kpovmodeler/pmbicubicpatchedit.cpp
index fe91f1e0..b31bbf44 100644
--- a/kpovmodeler/pmbicubicpatchedit.cpp
+++ b/kpovmodeler/pmbicubicpatchedit.cpp
@@ -23,7 +23,7 @@
#include "pmvectorlistedit.h"
#include "pmpart.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqcombobox.h>
#include <tqcheckbox.h>
@@ -39,32 +39,32 @@ void PMBicubicPatchEdit::createTopWidgets( )
{
Base::createTopWidgets( );
- TQHBoxLayout* tqlayout;
+ TQHBoxLayout* layout;
m_pType = new TQComboBox( false, this );
m_pType->insertItem( i18n( "Normal (type 0)" ) );
m_pType->insertItem( i18n( "Preprocessed (type 1)" ) );
- tqlayout = new TQHBoxLayout( topLayout( ) );
- tqlayout->addWidget( new TQLabel( i18n( "Type:" ), this ) );
- tqlayout->addWidget( m_pType );
- tqlayout->addStretch( 1 );
+ layout = new TQHBoxLayout( topLayout( ) );
+ layout->addWidget( new TQLabel( i18n( "Type:" ), this ) );
+ layout->addWidget( m_pType );
+ layout->addStretch( 1 );
m_pUSteps = new PMIntEdit( this );
m_pUSteps->setValidation( true, 0, false, 0 );
- tqlayout = new TQHBoxLayout( topLayout( ) );
- tqlayout->addWidget( new TQLabel( i18n( "Steps:" ) + " u", this ) );
- tqlayout->addWidget( m_pUSteps );
+ layout = new TQHBoxLayout( topLayout( ) );
+ layout->addWidget( new TQLabel( i18n( "Steps:" ) + " u", this ) );
+ layout->addWidget( m_pUSteps );
m_pVSteps = new PMIntEdit( this );
m_pVSteps->setValidation( true, 0, false, 0 );
- tqlayout->addWidget( new TQLabel( "v", this ) );
- tqlayout->addWidget( m_pVSteps );
+ layout->addWidget( new TQLabel( "v", this ) );
+ layout->addWidget( m_pVSteps );
m_pFlatness = new PMFloatEdit( this );
m_pFlatness->setValidation( true, 0.0, false, 0.0 );
- tqlayout = new TQHBoxLayout( topLayout( ) );
- tqlayout->addWidget( new TQLabel( i18n( "Flatness:" ), this ) );
- tqlayout->addWidget( m_pFlatness );
- tqlayout->addStretch( 1 );
+ layout = new TQHBoxLayout( topLayout( ) );
+ layout->addWidget( new TQLabel( i18n( "Flatness:" ), this ) );
+ layout->addWidget( m_pFlatness );
+ layout->addStretch( 1 );
topLayout( )->addWidget( new TQLabel( i18n( "Points:" ), this ) );
diff --git a/kpovmodeler/pmblendmapmodifiers.cpp b/kpovmodeler/pmblendmapmodifiers.cpp
index e28fa7fb..9d26419e 100644
--- a/kpovmodeler/pmblendmapmodifiers.cpp
+++ b/kpovmodeler/pmblendmapmodifiers.cpp
@@ -57,11 +57,11 @@ PMBlendMapModifiers::~PMBlendMapModifiers( )
{
}
-PMMetaObject* PMBlendMapModifiers::tqmetaObject( ) const
+PMMetaObject* PMBlendMapModifiers::metaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "BlendMapModifiers", Base::tqmetaObject( ),
+ s_pMetaObject = new PMMetaObject( "BlendMapModifiers", Base::metaObject( ),
createBlendMapModifiers );
s_pMetaObject->addProperty(
new PMBlendMapModifiersProperty( "frequencyEnabled", &PMBlendMapModifiers::enableFrequency,
diff --git a/kpovmodeler/pmblendmapmodifiers.h b/kpovmodeler/pmblendmapmodifiers.h
index be5a863e..ecf0bfed 100644
--- a/kpovmodeler/pmblendmapmodifiers.h
+++ b/kpovmodeler/pmblendmapmodifiers.h
@@ -57,7 +57,7 @@ public:
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* tqmetaObject( ) const;
+ virtual PMMetaObject* metaObject( ) const;
/** */
virtual void cleanUp( ) const;
diff --git a/kpovmodeler/pmblendmapmodifiersedit.cpp b/kpovmodeler/pmblendmapmodifiersedit.cpp
index fd443623..1c07bd0e 100644
--- a/kpovmodeler/pmblendmapmodifiersedit.cpp
+++ b/kpovmodeler/pmblendmapmodifiersedit.cpp
@@ -25,7 +25,7 @@
#include "pmvector.h"
#include <tqwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcombobox.h>
#include <tqlabel.h>
#include <tqlineedit.h>
diff --git a/kpovmodeler/pmblob.cpp b/kpovmodeler/pmblob.cpp
index 317c18d7..6621cadf 100644
--- a/kpovmodeler/pmblob.cpp
+++ b/kpovmodeler/pmblob.cpp
@@ -77,11 +77,11 @@ void PMBlob::readAttributes( const PMXMLHelper& h )
Base::readAttributes( h );
}
-PMMetaObject* PMBlob::tqmetaObject( ) const
+PMMetaObject* PMBlob::metaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "Blob", Base::tqmetaObject( ),
+ s_pMetaObject = new PMMetaObject( "Blob", Base::metaObject( ),
createNewBlob );
s_pMetaObject->addProperty(
new PMBlobProperty( "threshold", &PMBlob::setThreshold, &PMBlob::threshold ) );
diff --git a/kpovmodeler/pmblob.h b/kpovmodeler/pmblob.h
index 6bdbef31..2c764590 100644
--- a/kpovmodeler/pmblob.h
+++ b/kpovmodeler/pmblob.h
@@ -52,7 +52,7 @@ public:
/** */
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* tqmetaObject( ) const;
+ virtual PMMetaObject* metaObject( ) const;
/** */
virtual void cleanUp( ) const;
diff --git a/kpovmodeler/pmblobcylinder.cpp b/kpovmodeler/pmblobcylinder.cpp
index 114f4fa0..d166a6a3 100644
--- a/kpovmodeler/pmblobcylinder.cpp
+++ b/kpovmodeler/pmblobcylinder.cpp
@@ -93,11 +93,11 @@ void PMBlobCylinder::readAttributes( const PMXMLHelper& h )
Base::readAttributes( h );
}
-PMMetaObject* PMBlobCylinder::tqmetaObject( ) const
+PMMetaObject* PMBlobCylinder::metaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "BlobCylinder", Base::tqmetaObject( ),
+ s_pMetaObject = new PMMetaObject( "BlobCylinder", Base::metaObject( ),
createNewBlobCylinder );
s_pMetaObject->addProperty(
new PMBlobCylinderProperty( "end1", &PMBlobCylinder::setEnd1,
diff --git a/kpovmodeler/pmblobcylinder.h b/kpovmodeler/pmblobcylinder.h
index a07df1f6..1e9a10f1 100644
--- a/kpovmodeler/pmblobcylinder.h
+++ b/kpovmodeler/pmblobcylinder.h
@@ -57,7 +57,7 @@ public:
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* tqmetaObject( ) const;
+ virtual PMMetaObject* metaObject( ) const;
/** */
virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
diff --git a/kpovmodeler/pmblobcylinderedit.cpp b/kpovmodeler/pmblobcylinderedit.cpp
index 836d7d72..ab6fe32f 100644
--- a/kpovmodeler/pmblobcylinderedit.cpp
+++ b/kpovmodeler/pmblobcylinderedit.cpp
@@ -21,7 +21,7 @@
#include "pmvectoredit.h"
#include "pmlineedits.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <klocale.h>
#include <tqcheckbox.h>
@@ -36,7 +36,7 @@ void PMBlobCylinderEdit::createTopWidgets( )
{
Base::createTopWidgets( );
- TQHBoxLayout* tqlayout;
+ TQHBoxLayout* layout;
TQGridLayout* gl;
m_pEnd1 = new PMVectorEdit( "x", "y", "z", this );
@@ -50,13 +50,13 @@ void PMBlobCylinderEdit::createTopWidgets( )
gl->addWidget( new TQLabel( i18n( "End 2:" ), this ), 1, 0 );
gl->addWidget( m_pEnd2, 1, 1 );
- tqlayout = new TQHBoxLayout( topLayout( ) );
- gl = new TQGridLayout( tqlayout, 2, 2 );
+ layout = new TQHBoxLayout( topLayout( ) );
+ gl = new TQGridLayout( layout, 2, 2 );
gl->addWidget( new TQLabel( i18n( "Radius:" ), this ), 0, 0 );
gl->addWidget( m_pRadius, 0, 1 );
gl->addWidget( new TQLabel( i18n( "Strength:" ), this ), 1, 0 );
gl->addWidget( m_pStrength, 1, 1 );
- tqlayout->addStretch( 1 );
+ layout->addStretch( 1 );
connect( m_pEnd1, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
connect( m_pEnd2, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
diff --git a/kpovmodeler/pmblobedit.cpp b/kpovmodeler/pmblobedit.cpp
index a38d9639..2b682291 100644
--- a/kpovmodeler/pmblobedit.cpp
+++ b/kpovmodeler/pmblobedit.cpp
@@ -20,7 +20,7 @@
#include "pmblob.h"
#include "pmlineedits.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqcheckbox.h>
#include <klocale.h>
diff --git a/kpovmodeler/pmblobsphere.cpp b/kpovmodeler/pmblobsphere.cpp
index 70dcf06c..cbcd33a4 100644
--- a/kpovmodeler/pmblobsphere.cpp
+++ b/kpovmodeler/pmblobsphere.cpp
@@ -72,11 +72,11 @@ TQString PMBlobSphere::description( ) const
return i18n( "blob sphere" );
}
-PMMetaObject* PMBlobSphere::tqmetaObject( ) const
+PMMetaObject* PMBlobSphere::metaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "BlobSphere", Base::tqmetaObject( ),
+ s_pMetaObject = new PMMetaObject( "BlobSphere", Base::metaObject( ),
createNewBlobSphere );
s_pMetaObject->addProperty(
new PMBlobSphereProperty( "center", &PMBlobSphere::setCentre,
diff --git a/kpovmodeler/pmblobsphere.h b/kpovmodeler/pmblobsphere.h
index e734e399..0abe983e 100644
--- a/kpovmodeler/pmblobsphere.h
+++ b/kpovmodeler/pmblobsphere.h
@@ -55,7 +55,7 @@ public:
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* tqmetaObject( ) const;
+ virtual PMMetaObject* metaObject( ) const;
/** */
virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
diff --git a/kpovmodeler/pmblobsphereedit.cpp b/kpovmodeler/pmblobsphereedit.cpp
index 6bf37b26..3e209769 100644
--- a/kpovmodeler/pmblobsphereedit.cpp
+++ b/kpovmodeler/pmblobsphereedit.cpp
@@ -20,7 +20,7 @@
#include "pmvectoredit.h"
#include "pmlineedits.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <klocale.h>
@@ -34,23 +34,23 @@ void PMBlobSphereEdit::createTopWidgets( )
{
Base::createTopWidgets( );
- TQHBoxLayout* tqlayout;
+ TQHBoxLayout* layout;
m_pCentre = new PMVectorEdit( "x", "y", "z", this );
m_pRadius = new PMFloatEdit( this );
m_pStrength = new PMFloatEdit( this );
- tqlayout = new TQHBoxLayout( topLayout( ) );
- tqlayout->addWidget( new TQLabel( i18n( "Center:" ), this ) );
- tqlayout->addWidget( m_pCentre );
+ layout = new TQHBoxLayout( topLayout( ) );
+ layout->addWidget( new TQLabel( i18n( "Center:" ), this ) );
+ layout->addWidget( m_pCentre );
- tqlayout = new TQHBoxLayout( topLayout( ) );
- TQGridLayout* gl = new TQGridLayout( tqlayout, 2, 2 );
+ layout = new TQHBoxLayout( topLayout( ) );
+ TQGridLayout* gl = new TQGridLayout( layout, 2, 2 );
gl->addWidget( new TQLabel( i18n( "Radius:" ), this ), 0, 0 );
gl->addWidget( m_pRadius, 0, 1 );
gl->addWidget( new TQLabel( i18n( "Strength:" ), this ), 1, 0 );
gl->addWidget( m_pStrength, 1, 1 );
- tqlayout->addStretch( 1 );
+ layout->addStretch( 1 );
connect( m_pCentre, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
connect( m_pRadius, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
diff --git a/kpovmodeler/pmboundedby.cpp b/kpovmodeler/pmboundedby.cpp
index 467129e8..5cc66e55 100644
--- a/kpovmodeler/pmboundedby.cpp
+++ b/kpovmodeler/pmboundedby.cpp
@@ -40,11 +40,11 @@ PMBoundedBy::~PMBoundedBy( )
{
}
-PMMetaObject* PMBoundedBy::tqmetaObject( ) const
+PMMetaObject* PMBoundedBy::metaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "BoundedBy", Base::tqmetaObject( ),
+ s_pMetaObject = new PMMetaObject( "BoundedBy", Base::metaObject( ),
createNewBoundedBy );
s_pMetaObject->addProperty(
new PMBoundedByProperty( "clippedBy", 0, &PMBoundedBy::clippedBy ) );
diff --git a/kpovmodeler/pmboundedby.h b/kpovmodeler/pmboundedby.h
index 256dc5f5..7c88a6aa 100644
--- a/kpovmodeler/pmboundedby.h
+++ b/kpovmodeler/pmboundedby.h
@@ -49,7 +49,7 @@ public:
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* tqmetaObject( ) const;
+ virtual PMMetaObject* metaObject( ) const;
/** */
virtual void cleanUp( ) const;
diff --git a/kpovmodeler/pmboundedbyedit.cpp b/kpovmodeler/pmboundedbyedit.cpp
index 8a41fa52..aa503006 100644
--- a/kpovmodeler/pmboundedbyedit.cpp
+++ b/kpovmodeler/pmboundedbyedit.cpp
@@ -19,7 +19,7 @@
#include "pmboundedbyedit.h"
#include "pmboundedby.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <klocale.h>
diff --git a/kpovmodeler/pmbox.cpp b/kpovmodeler/pmbox.cpp
index 6ecc2c3c..155ebc68 100644
--- a/kpovmodeler/pmbox.cpp
+++ b/kpovmodeler/pmbox.cpp
@@ -76,11 +76,11 @@ void PMBox::readAttributes( const PMXMLHelper& h )
Base::readAttributes( h );
}
-PMMetaObject* PMBox::tqmetaObject( ) const
+PMMetaObject* PMBox::metaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "Box", Base::tqmetaObject( ),
+ s_pMetaObject = new PMMetaObject( "Box", Base::metaObject( ),
createNewBox );
s_pMetaObject->addProperty(
new PMBoxProperty( "corner1", &PMBox::setCorner1, &PMBox::corner1 ) );
diff --git a/kpovmodeler/pmbox.h b/kpovmodeler/pmbox.h
index 7896b779..e6abcf75 100644
--- a/kpovmodeler/pmbox.h
+++ b/kpovmodeler/pmbox.h
@@ -56,7 +56,7 @@ public:
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* tqmetaObject( ) const;
+ virtual PMMetaObject* metaObject( ) const;
/** */
virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
diff --git a/kpovmodeler/pmboxedit.cpp b/kpovmodeler/pmboxedit.cpp
index 6b6a2f2a..a4cad88d 100644
--- a/kpovmodeler/pmboxedit.cpp
+++ b/kpovmodeler/pmboxedit.cpp
@@ -20,7 +20,7 @@
#include "pmbox.h"
#include "pmvectoredit.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <klocale.h>
diff --git a/kpovmodeler/pmbumpmap.cpp b/kpovmodeler/pmbumpmap.cpp
index 5c08040f..21fb29a3 100644
--- a/kpovmodeler/pmbumpmap.cpp
+++ b/kpovmodeler/pmbumpmap.cpp
@@ -200,11 +200,11 @@ void PMBumpMap::readAttributes( const PMXMLHelper& h )
Base::readAttributes( h );
}
-PMMetaObject* PMBumpMap::tqmetaObject( ) const
+PMMetaObject* PMBumpMap::metaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "BumpMap", Base::tqmetaObject( ),
+ s_pMetaObject = new PMMetaObject( "BumpMap", Base::metaObject( ),
createNewBumpMap );
PMBitmapTypeProperty* bp = new PMBitmapTypeProperty(
diff --git a/kpovmodeler/pmbumpmap.h b/kpovmodeler/pmbumpmap.h
index ade1c1cd..ccdf5b98 100644
--- a/kpovmodeler/pmbumpmap.h
+++ b/kpovmodeler/pmbumpmap.h
@@ -72,7 +72,7 @@ public:
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* tqmetaObject( ) const;
+ virtual PMMetaObject* metaObject( ) const;
/** */
virtual void cleanUp( ) const;
diff --git a/kpovmodeler/pmbumpmapedit.cpp b/kpovmodeler/pmbumpmapedit.cpp
index 5a4bf298..30c1afb9 100644
--- a/kpovmodeler/pmbumpmapedit.cpp
+++ b/kpovmodeler/pmbumpmapedit.cpp
@@ -24,7 +24,7 @@
#include "pmvector.h"
#include <tqwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcombobox.h>
#include <tqlabel.h>
#include <tqlineedit.h>
diff --git a/kpovmodeler/pmcamera.cpp b/kpovmodeler/pmcamera.cpp
index e65b8341..ca37f751 100644
--- a/kpovmodeler/pmcamera.cpp
+++ b/kpovmodeler/pmcamera.cpp
@@ -165,11 +165,11 @@ void PMCamera::readAttributes( const PMXMLHelper& h )
Base::readAttributes( h );
}
-PMMetaObject* PMCamera::tqmetaObject( ) const
+PMMetaObject* PMCamera::metaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "Camera", Base::tqmetaObject( ),
+ s_pMetaObject = new PMMetaObject( "Camera", Base::metaObject( ),
createNewCamera );
s_pMetaObject->addProperty(
new PMCameraProperty( "location", &PMCamera::setLocation,
diff --git a/kpovmodeler/pmcamera.h b/kpovmodeler/pmcamera.h
index e0d1206e..7d385909 100644
--- a/kpovmodeler/pmcamera.h
+++ b/kpovmodeler/pmcamera.h
@@ -60,7 +60,7 @@ public:
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* tqmetaObject( ) const;
+ virtual PMMetaObject* metaObject( ) const;
/** */
virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
diff --git a/kpovmodeler/pmcameraedit.cpp b/kpovmodeler/pmcameraedit.cpp
index 23db4104..3e501cf9 100644
--- a/kpovmodeler/pmcameraedit.cpp
+++ b/kpovmodeler/pmcameraedit.cpp
@@ -21,7 +21,7 @@
#include "pmvectoredit.h"
#include "pmlineedits.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqcombobox.h>
#include <tqcheckbox.h>
@@ -40,7 +40,7 @@ void PMCameraEdit::createTopWidgets( )
{
Base::createTopWidgets( );
- TQGridLayout* tqlayout;
+ TQGridLayout* layout;
TQLabel* label;
m_pCameraType = new TQComboBox( false, this );
@@ -75,28 +75,28 @@ void PMCameraEdit::createTopWidgets( )
hl->addWidget( m_pCylinderTypeLabel );
hl->addWidget( m_pCylinderType );
- tqlayout = new TQGridLayout( topLayout( ), 7, 2 );
- tqlayout->addWidget( new TQLabel( i18n( "Location:" ), this ), 0, 0 );
- tqlayout->addWidget( m_pLocation, 0, 1 );
+ layout = new TQGridLayout( topLayout( ), 7, 2 );
+ layout->addWidget( new TQLabel( i18n( "Location:" ), this ), 0, 0 );
+ layout->addWidget( m_pLocation, 0, 1 );
- tqlayout->addWidget( new TQLabel( i18n( "Sky:" ), this ), 1, 0 );
- tqlayout->addWidget( m_pSky, 1, 1 );
+ layout->addWidget( new TQLabel( i18n( "Sky:" ), this ), 1, 0 );
+ layout->addWidget( m_pSky, 1, 1 );
- tqlayout->addWidget( new TQLabel( i18n( "Direction:" ), this ), 2, 0 );
- tqlayout->addWidget( m_pDirection, 2, 1 );
+ layout->addWidget( new TQLabel( i18n( "Direction:" ), this ), 2, 0 );
+ layout->addWidget( m_pDirection, 2, 1 );
- tqlayout->addWidget( new TQLabel( i18n( "Right:" ), this ), 3, 0 );
- tqlayout->addWidget( m_pRight, 3, 1 );
+ layout->addWidget( new TQLabel( i18n( "Right:" ), this ), 3, 0 );
+ layout->addWidget( m_pRight, 3, 1 );
- tqlayout->addWidget( new TQLabel( i18n( "Up:" ), this ), 4, 0 );
- tqlayout->addWidget( m_pUp, 4, 1 );
+ layout->addWidget( new TQLabel( i18n( "Up:" ), this ), 4, 0 );
+ layout->addWidget( m_pUp, 4, 1 );
- tqlayout->addWidget( new TQLabel( i18n( "Look at:" ), this ), 5, 0 );
- tqlayout->addWidget( m_pLookAt, 5, 1 );
+ layout->addWidget( new TQLabel( i18n( "Look at:" ), this ), 5, 0 );
+ layout->addWidget( m_pLookAt, 5, 1 );
m_pEnableAngle = new TQCheckBox( i18n( "Angle:" ), this );
- tqlayout->addWidget( m_pEnableAngle, 6, 0 );
- tqlayout->addWidget( m_pAngle, 6, 1, AlignLeft );
+ layout->addWidget( m_pEnableAngle, 6, 0 );
+ layout->addWidget( m_pAngle, 6, 1, AlignLeft );
m_pFocalBlur = new TQCheckBox( i18n( "Focal blur" ), this );
topLayout( )->addWidget( m_pFocalBlur );
@@ -116,27 +116,27 @@ void PMCameraEdit::createTopWidgets( )
m_pVariance->setValidation( true, 0, false, 0 );
m_focalWidgets.append( m_pVariance );
- tqlayout = new TQGridLayout( topLayout( ), 5, 2 );
+ layout = new TQGridLayout( topLayout( ), 5, 2 );
label = new TQLabel( i18n( "Aperture:" ), this );
m_focalWidgets.append( label );
- tqlayout->addWidget( label, 0, 0 );
- tqlayout->addWidget( m_pAperture, 0, 1 );
+ layout->addWidget( label, 0, 0 );
+ layout->addWidget( m_pAperture, 0, 1 );
label = new TQLabel( i18n( "Blur samples:" ), this );
m_focalWidgets.append( label );
- tqlayout->addWidget( label, 1, 0 );
- tqlayout->addWidget( m_pBlurSamples, 1, 1 );
+ layout->addWidget( label, 1, 0 );
+ layout->addWidget( m_pBlurSamples, 1, 1 );
label = new TQLabel( i18n( "Focal point:" ), this );
m_focalWidgets.append( label );
- tqlayout->addWidget( label, 2, 0 );
- tqlayout->addWidget( m_pFocalPoint, 2, 1 );
+ layout->addWidget( label, 2, 0 );
+ layout->addWidget( m_pFocalPoint, 2, 1 );
label = new TQLabel( i18n( "Confidence:" ), this );
m_focalWidgets.append( label );
- tqlayout->addWidget( label, 3, 0 );
- tqlayout->addWidget( m_pConfidence, 3, 1 );
+ layout->addWidget( label, 3, 0 );
+ layout->addWidget( m_pConfidence, 3, 1 );
label = new TQLabel( i18n( "Variance:" ), this );
m_focalWidgets.append( label );
- tqlayout->addWidget( label, 4, 0 );
- tqlayout->addWidget( m_pVariance, 4, 1 );
+ layout->addWidget( label, 4, 0 );
+ layout->addWidget( m_pVariance, 4, 1 );
m_pExport = new TQCheckBox( i18n( "Export to renderer" ), this );
topLayout( )->addWidget( m_pExport );
diff --git a/kpovmodeler/pmclippedby.cpp b/kpovmodeler/pmclippedby.cpp
index b1499d0c..24ea4e46 100644
--- a/kpovmodeler/pmclippedby.cpp
+++ b/kpovmodeler/pmclippedby.cpp
@@ -40,11 +40,11 @@ PMClippedBy::~PMClippedBy( )
{
}
-PMMetaObject* PMClippedBy::tqmetaObject( ) const
+PMMetaObject* PMClippedBy::metaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "ClippedBy", Base::tqmetaObject( ),
+ s_pMetaObject = new PMMetaObject( "ClippedBy", Base::metaObject( ),
createNewClippedBy );
s_pMetaObject->addProperty(
new PMClippedByProperty( "boundedBy", 0, &PMClippedBy::boundedBy ) );
diff --git a/kpovmodeler/pmclippedby.h b/kpovmodeler/pmclippedby.h
index 252a7db2..0e76e2cf 100644
--- a/kpovmodeler/pmclippedby.h
+++ b/kpovmodeler/pmclippedby.h
@@ -48,7 +48,7 @@ public:
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* tqmetaObject( ) const;
+ virtual PMMetaObject* metaObject( ) const;
/** */
virtual void cleanUp( ) const;
diff --git a/kpovmodeler/pmclippedbyedit.cpp b/kpovmodeler/pmclippedbyedit.cpp
index 8afa0285..b207a5c9 100644
--- a/kpovmodeler/pmclippedbyedit.cpp
+++ b/kpovmodeler/pmclippedbyedit.cpp
@@ -19,7 +19,7 @@
#include "pmclippedbyedit.h"
#include "pmclippedby.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <klocale.h>
diff --git a/kpovmodeler/pmcolor.cpp b/kpovmodeler/pmcolor.cpp
index 1f895861..5b279d30 100644
--- a/kpovmodeler/pmcolor.cpp
+++ b/kpovmodeler/pmcolor.cpp
@@ -22,7 +22,7 @@
#include "pmdebug.h"
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqstring.h>
PMColor::PMColor( )
diff --git a/kpovmodeler/pmcoloredit.cpp b/kpovmodeler/pmcoloredit.cpp
index f34ee47d..5abf8a40 100644
--- a/kpovmodeler/pmcoloredit.cpp
+++ b/kpovmodeler/pmcoloredit.cpp
@@ -20,7 +20,7 @@
#include <kcolorbutton.h>
#include <klocale.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcolor.h>
#include <kdialog.h>
diff --git a/kpovmodeler/pmcolorsettings.cpp b/kpovmodeler/pmcolorsettings.cpp
index e8518312..d64ced5e 100644
--- a/kpovmodeler/pmcolorsettings.cpp
+++ b/kpovmodeler/pmcolorsettings.cpp
@@ -20,7 +20,7 @@
#include "pmrendermanager.h"
#include "pmdefaults.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <kcolorbutton.h>
#include <klocale.h>
@@ -28,60 +28,60 @@
PMColorSettings::PMColorSettings( TQWidget* parent, const char* name )
: PMSettingsDialogPage( parent, name )
{
- TQHBoxLayout* htqlayout;
- TQVBoxLayout* vtqlayout;
+ TQHBoxLayout* hlayout;
+ TQVBoxLayout* vlayout;
TQGridLayout* grid;
- vtqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
- grid = new TQGridLayout( vtqlayout, 6, 3 );
+ vlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
+ grid = new TQGridLayout( vlayout, 6, 3 );
grid->addWidget( new TQLabel( i18n( "Background:" ), this ), 0, 0 );
- htqlayout = new TQHBoxLayout( );
- grid->addLayout( htqlayout, 0, 2 );
+ hlayout = new TQHBoxLayout( );
+ grid->addLayout( hlayout, 0, 2 );
m_pBackgroundColor = new KColorButton( this );
- htqlayout->addWidget( m_pBackgroundColor );
- htqlayout->addStretch( 1 );
+ hlayout->addWidget( m_pBackgroundColor );
+ hlayout->addStretch( 1 );
grid->addWidget( new TQLabel( i18n( "Wire frame:" ), this ), 1, 0 );
- htqlayout = new TQHBoxLayout( );
- grid->addLayout( htqlayout, 1, 2 );
+ hlayout = new TQHBoxLayout( );
+ grid->addLayout( hlayout, 1, 2 );
m_pGraphicalObjectsColor[0] = new KColorButton( this );
- htqlayout->addWidget( m_pGraphicalObjectsColor[0] );
- htqlayout->addWidget( new TQLabel( i18n( "Selected:" ), this ) );
+ hlayout->addWidget( m_pGraphicalObjectsColor[0] );
+ hlayout->addWidget( new TQLabel( i18n( "Selected:" ), this ) );
m_pGraphicalObjectsColor[1] = new KColorButton( this );
- htqlayout->addWidget( m_pGraphicalObjectsColor[1] );
- htqlayout->addStretch( 1 );
+ hlayout->addWidget( m_pGraphicalObjectsColor[1] );
+ hlayout->addStretch( 1 );
grid->addWidget( new TQLabel( i18n( "Control points:" ), this ), 2, 0 );
- htqlayout = new TQHBoxLayout( );
- grid->addLayout( htqlayout, 2, 2 );
+ hlayout = new TQHBoxLayout( );
+ grid->addLayout( hlayout, 2, 2 );
m_pControlPointsColor[0] = new KColorButton( this );
- htqlayout->addWidget( m_pControlPointsColor[0] );
- htqlayout->addWidget( new TQLabel( i18n( "Selected:" ), this ) );
+ hlayout->addWidget( m_pControlPointsColor[0] );
+ hlayout->addWidget( new TQLabel( i18n( "Selected:" ), this ) );
m_pControlPointsColor[1] = new KColorButton( this );
- htqlayout->addWidget( m_pControlPointsColor[1] );
- htqlayout->addStretch( 1 );
+ hlayout->addWidget( m_pControlPointsColor[1] );
+ hlayout->addStretch( 1 );
grid->addWidget( new TQLabel( i18n( "Axes:" ), this ), 3, 0 );
- htqlayout = new TQHBoxLayout( );
- grid->addLayout( htqlayout, 3, 2 );
+ hlayout = new TQHBoxLayout( );
+ grid->addLayout( hlayout, 3, 2 );
grid->addWidget( new TQLabel( "x", this ), 3, 1 );
m_pAxesColor[0] = new KColorButton( this );
- htqlayout->addWidget( m_pAxesColor[0] );
- htqlayout->addWidget( new TQLabel( "y", this ) );
+ hlayout->addWidget( m_pAxesColor[0] );
+ hlayout->addWidget( new TQLabel( "y", this ) );
m_pAxesColor[1] = new KColorButton( this );
- htqlayout->addWidget( m_pAxesColor[1] );
- htqlayout->addWidget( new TQLabel( "z", this ) );
+ hlayout->addWidget( m_pAxesColor[1] );
+ hlayout->addWidget( new TQLabel( "z", this ) );
m_pAxesColor[2] = new KColorButton( this );
- htqlayout->addWidget( m_pAxesColor[2] );
- htqlayout->addStretch( 1 );
+ hlayout->addWidget( m_pAxesColor[2] );
+ hlayout->addStretch( 1 );
grid->addWidget( new TQLabel( i18n( "Field of view:" ), this ), 4, 0 );
- htqlayout = new TQHBoxLayout( );
- grid->addLayout( htqlayout, 4, 2 );
+ hlayout = new TQHBoxLayout( );
+ grid->addLayout( hlayout, 4, 2 );
m_pFieldOfViewColor = new KColorButton( this );
- htqlayout->addWidget( m_pFieldOfViewColor );
- htqlayout->addStretch( 1 );
+ hlayout->addWidget( m_pFieldOfViewColor );
+ hlayout->addStretch( 1 );
}
void PMColorSettings::displaySettings( )
@@ -118,21 +118,21 @@ bool PMColorSettings::validateData( )
void PMColorSettings::applySettings( )
{
- bool tqrepaint = false;
+ bool repaint = false;
int i;
PMRenderManager* rm = PMRenderManager::theManager( );
if( rm->backgroundColor( ) != m_pBackgroundColor->color( ) )
{
rm->setBackgroundColor( m_pBackgroundColor->color( ) );
- tqrepaint = true;
+ repaint = true;
}
for( i = 0; i < 2; i++ )
{
if( rm->graphicalObjectColor( i ) != m_pGraphicalObjectsColor[i]->color( ) )
{
rm->setGraphicalObjectColor( i, m_pGraphicalObjectsColor[i]->color( ) );
- tqrepaint = true;
+ repaint = true;
}
}
for( i = 0; i < 2; i++ )
@@ -140,7 +140,7 @@ void PMColorSettings::applySettings( )
if( rm->controlPointColor( i ) != m_pControlPointsColor[i]->color( ) )
{
rm->setControlPointColor( i, m_pControlPointsColor[i]->color( ) );
- tqrepaint = true;
+ repaint = true;
}
}
for( i = 0; i < 3; i++ )
@@ -148,15 +148,15 @@ void PMColorSettings::applySettings( )
if( rm->axesColor( i ) != m_pAxesColor[i]->color( ) )
{
rm->setAxesColor( i, m_pAxesColor[i]->color( ) );
- tqrepaint = true;
+ repaint = true;
}
}
if( rm->fieldOfViewColor( ) != m_pFieldOfViewColor->color( ) )
{
rm->setFieldOfViewColor( m_pFieldOfViewColor->color( ) );
- tqrepaint = true;
+ repaint = true;
}
- if( tqrepaint )
+ if( repaint )
emit repaintViews( );
}
diff --git a/kpovmodeler/pmcommand.h b/kpovmodeler/pmcommand.h
index d1e53c99..5d32b9d4 100644
--- a/kpovmodeler/pmcommand.h
+++ b/kpovmodeler/pmcommand.h
@@ -42,8 +42,8 @@ class PMPart;
* PMCRemove: An object was removed. A signal with this constant has
* to be emitted _before_ the object is removed.
*
- * PMCChildren: Some tqchildren are added or removed. Do not use. Use PMCAdd and
- * PMCRemove for all tqchildrens.
+ * PMCChildren: Some children are added or removed. Do not use. Use PMCAdd and
+ * PMCRemove for all childrens.
*
* PMCData: Data (for dialog views) is changed
*
diff --git a/kpovmodeler/pmcomment.cpp b/kpovmodeler/pmcomment.cpp
index 3f659682..b2256365 100644
--- a/kpovmodeler/pmcomment.cpp
+++ b/kpovmodeler/pmcomment.cpp
@@ -22,7 +22,7 @@
#include "pmcommentedit.h"
#include "pmmemento.h"
-#include <tqtextstream.h>
+#include <textstream.h>
#include <klocale.h>
PMDefinePropertyClass( PMComment, PMCommentProperty );
@@ -108,11 +108,11 @@ void PMComment::setText( const TQString& text )
}
}
-PMMetaObject* PMComment::tqmetaObject( ) const
+PMMetaObject* PMComment::metaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "Comment", Base::tqmetaObject( ),
+ s_pMetaObject = new PMMetaObject( "Comment", Base::metaObject( ),
createNewComment );
s_pMetaObject->addProperty(
new PMCommentProperty( "text", &PMComment::setText, &PMComment::text ) );
diff --git a/kpovmodeler/pmcomment.h b/kpovmodeler/pmcomment.h
index 832863bc..d435423d 100644
--- a/kpovmodeler/pmcomment.h
+++ b/kpovmodeler/pmcomment.h
@@ -62,7 +62,7 @@ public:
virtual PMObject* copy( ) const { return new PMComment( *this ); }
/** */
- virtual PMMetaObject* tqmetaObject( ) const;
+ virtual PMMetaObject* metaObject( ) const;
/** */
virtual void cleanUp( ) const;
diff --git a/kpovmodeler/pmcommentedit.cpp b/kpovmodeler/pmcommentedit.cpp
index 92cdbfa3..ff4247fe 100644
--- a/kpovmodeler/pmcommentedit.cpp
+++ b/kpovmodeler/pmcommentedit.cpp
@@ -19,7 +19,7 @@
#include "pmcommentedit.h"
#include "pmcomment.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqmultilineedit.h>
#include <kglobalsettings.h>
diff --git a/kpovmodeler/pmcompositeobject.cpp b/kpovmodeler/pmcompositeobject.cpp
index 3699e716..d8b61e8c 100644
--- a/kpovmodeler/pmcompositeobject.cpp
+++ b/kpovmodeler/pmcompositeobject.cpp
@@ -67,10 +67,10 @@ PMCompositeObject::~PMCompositeObject( )
delete m_pViewStructure;
}
-PMMetaObject* PMCompositeObject::tqmetaObject( ) const
+PMMetaObject* PMCompositeObject::metaObject( ) const
{
if( !s_pMetaObject )
- s_pMetaObject = new PMMetaObject( "CompositeObject", Base::tqmetaObject( ) );
+ s_pMetaObject = new PMMetaObject( "CompositeObject", Base::metaObject( ) );
return s_pMetaObject;
}
@@ -84,7 +84,7 @@ void PMCompositeObject::cleanUp( ) const
Base::cleanUp( );
}
-PMObject* PMCompositeObject::tqchildAt( uint index ) const
+PMObject* PMCompositeObject::childAt( uint index ) const
{
PMObject* tmp;
uint i = 0;
@@ -136,7 +136,7 @@ bool PMCompositeObject::insertChild( PMObject* o, int i )
}
else
{
- PMObject* tmp = tqchildAt( ( uint ) ( i - 1 ) );
+ PMObject* tmp = childAt( ( uint ) ( i - 1 ) );
if( !tmp )
{
kdError( PMArea ) << "Index too big" << "\n";
@@ -272,7 +272,7 @@ bool PMCompositeObject::takeChild( PMObject* o )
bool PMCompositeObject::takeChild( uint i )
{
- PMObject* tmp = tqchildAt( i );
+ PMObject* tmp = childAt( i );
if( tmp )
return takeChild( tmp );
kdError( PMArea ) << "Index too big";
diff --git a/kpovmodeler/pmcompositeobject.h b/kpovmodeler/pmcompositeobject.h
index 50298236..350180db 100644
--- a/kpovmodeler/pmcompositeobject.h
+++ b/kpovmodeler/pmcompositeobject.h
@@ -44,12 +44,12 @@ public:
*/
PMCompositeObject( const PMCompositeObject& o );
/**
- * Deletes the object and all tqchildren.
+ * Deletes the object and all children.
*/
virtual ~PMCompositeObject( );
/** */
- virtual PMMetaObject* tqmetaObject( ) const;
+ virtual PMMetaObject* metaObject( ) const;
/** */
virtual void cleanUp( ) const;
@@ -65,7 +65,7 @@ public:
* Returns a pointer to the child object at position index,
* or null if the index is out of range.
*/
- virtual PMObject* tqchildAt( uint index ) const;
+ virtual PMObject* childAt( uint index ) const;
/**
* Returns true if the object contains the child object o
@@ -96,7 +96,7 @@ public:
*/
virtual bool appendChild( PMObject* );
/**
- * Returns the number of tqchildren.
+ * Returns the number of children.
*/
virtual int countChildren( ) const;
/**
diff --git a/kpovmodeler/pmcone.cpp b/kpovmodeler/pmcone.cpp
index 014fbc0f..c6fd719e 100644
--- a/kpovmodeler/pmcone.cpp
+++ b/kpovmodeler/pmcone.cpp
@@ -100,11 +100,11 @@ void PMCone::readAttributes( const PMXMLHelper & h )
Base::readAttributes( h );
}
-PMMetaObject* PMCone::tqmetaObject( ) const
+PMMetaObject* PMCone::metaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "Cone", Base::tqmetaObject( ),
+ s_pMetaObject = new PMMetaObject( "Cone", Base::metaObject( ),
createNewCone );
s_pMetaObject->addProperty(
new PMConeProperty( "end1", &PMCone::setEnd1, &PMCone::end1 ) );
diff --git a/kpovmodeler/pmcone.h b/kpovmodeler/pmcone.h
index 25dacfd5..c41f9325 100644
--- a/kpovmodeler/pmcone.h
+++ b/kpovmodeler/pmcone.h
@@ -62,7 +62,7 @@ public:
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* tqmetaObject( ) const;
+ virtual PMMetaObject* metaObject( ) const;
/** */
virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
diff --git a/kpovmodeler/pmconeedit.cpp b/kpovmodeler/pmconeedit.cpp
index 75a07855..401c7a4f 100644
--- a/kpovmodeler/pmconeedit.cpp
+++ b/kpovmodeler/pmconeedit.cpp
@@ -21,7 +21,7 @@
#include "pmvectoredit.h"
#include "pmlineedits.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <klocale.h>
#include <tqcheckbox.h>
@@ -36,7 +36,7 @@ void PMConeEdit::createTopWidgets( )
{
Base::createTopWidgets( );
- TQHBoxLayout* tqlayout;
+ TQHBoxLayout* layout;
TQGridLayout* gl;
m_pEnd1 = new PMVectorEdit( "x", "y", "z", this );
@@ -51,13 +51,13 @@ void PMConeEdit::createTopWidgets( )
gl->addWidget( new TQLabel( i18n( "End 2:" ), this ), 1, 0 );
gl->addWidget( m_pEnd2, 1, 1 );
- tqlayout = new TQHBoxLayout( topLayout( ) );
- gl = new TQGridLayout( tqlayout, 2, 2 );
+ layout = new TQHBoxLayout( topLayout( ) );
+ gl = new TQGridLayout( layout, 2, 2 );
gl->addWidget( new TQLabel( i18n( "Radius 1:" ), this ), 0, 0 );
gl->addWidget( m_pRadius1, 0, 1 );
gl->addWidget( new TQLabel( i18n( "Radius 2:" ), this ), 1, 0 );
gl->addWidget( m_pRadius2, 1, 1 );
- tqlayout->addStretch( 1 );
+ layout->addStretch( 1 );
topLayout( )->addWidget( m_pOpen );
diff --git a/kpovmodeler/pmcsg.cpp b/kpovmodeler/pmcsg.cpp
index 66532ac6..0ac7e58a 100644
--- a/kpovmodeler/pmcsg.cpp
+++ b/kpovmodeler/pmcsg.cpp
@@ -130,11 +130,11 @@ void PMCSG::readAttributes( const PMXMLHelper& h )
Base::readAttributes( h );
}
-PMMetaObject* PMCSG::tqmetaObject( ) const
+PMMetaObject* PMCSG::metaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "CSG", Base::tqmetaObject( ),
+ s_pMetaObject = new PMMetaObject( "CSG", Base::metaObject( ),
createNewCSG );
PMCSGTypeProperty* p = new PMCSGTypeProperty( "csgType", &PMCSG::setCSGType, &PMCSG::csgType );
p->addEnumValue( "union", CSGUnion );
diff --git a/kpovmodeler/pmcsg.h b/kpovmodeler/pmcsg.h
index 36184883..380bf0ef 100644
--- a/kpovmodeler/pmcsg.h
+++ b/kpovmodeler/pmcsg.h
@@ -62,7 +62,7 @@ public:
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* tqmetaObject( ) const;
+ virtual PMMetaObject* metaObject( ) const;
/** */
virtual void cleanUp( ) const;
diff --git a/kpovmodeler/pmcsgedit.cpp b/kpovmodeler/pmcsgedit.cpp
index 014eb09b..3ec36a84 100644
--- a/kpovmodeler/pmcsgedit.cpp
+++ b/kpovmodeler/pmcsgedit.cpp
@@ -19,7 +19,7 @@
#include "pmcsgedit.h"
#include "pmcsg.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqcombobox.h>
#include <klocale.h>
@@ -34,17 +34,17 @@ void PMCSGEdit::createTopWidgets( )
{
Base::createTopWidgets( );
- TQHBoxLayout* tqlayout;
+ TQHBoxLayout* layout;
m_pTypeCombo = new TQComboBox( false, this );
m_pTypeCombo->insertItem( i18n( "Union" ) );
m_pTypeCombo->insertItem( i18n( "Intersection" ) );
m_pTypeCombo->insertItem( i18n( "Difference" ) );
m_pTypeCombo->insertItem( i18n( "Merge" ) );
- tqlayout = new TQHBoxLayout( topLayout( ) );
- tqlayout->addWidget( new TQLabel( i18n( "Type:" ), this ) );
- tqlayout->addWidget( m_pTypeCombo );
- tqlayout->addStretch( 1 );
+ layout = new TQHBoxLayout( topLayout( ) );
+ layout->addWidget( new TQLabel( i18n( "Type:" ), this ) );
+ layout->addWidget( m_pTypeCombo );
+ layout->addStretch( 1 );
connect( m_pTypeCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotTypeSelected( int ) ) );
}
diff --git a/kpovmodeler/pmcylinder.cpp b/kpovmodeler/pmcylinder.cpp
index c449189d..358cb542 100644
--- a/kpovmodeler/pmcylinder.cpp
+++ b/kpovmodeler/pmcylinder.cpp
@@ -97,11 +97,11 @@ void PMCylinder::readAttributes( const PMXMLHelper& h )
Base::readAttributes( h );
}
-PMMetaObject* PMCylinder::tqmetaObject( ) const
+PMMetaObject* PMCylinder::metaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "Cylinder", Base::tqmetaObject( ),
+ s_pMetaObject = new PMMetaObject( "Cylinder", Base::metaObject( ),
createNewCylinder );
s_pMetaObject->addProperty(
new PMCylinderProperty( "end1", &PMCylinder::setEnd1, &PMCylinder::end1 ) );
diff --git a/kpovmodeler/pmcylinder.h b/kpovmodeler/pmcylinder.h
index cae308fe..1bd10901 100644
--- a/kpovmodeler/pmcylinder.h
+++ b/kpovmodeler/pmcylinder.h
@@ -58,7 +58,7 @@ public:
/** */
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* tqmetaObject( ) const;
+ virtual PMMetaObject* metaObject( ) const;
/** */
virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
diff --git a/kpovmodeler/pmcylinderedit.cpp b/kpovmodeler/pmcylinderedit.cpp
index b8741ae7..33da88fa 100644
--- a/kpovmodeler/pmcylinderedit.cpp
+++ b/kpovmodeler/pmcylinderedit.cpp
@@ -21,7 +21,7 @@
#include "pmvectoredit.h"
#include "pmlineedits.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <klocale.h>
#include <tqcheckbox.h>
@@ -36,7 +36,7 @@ void PMCylinderEdit::createTopWidgets( )
{
Base::createTopWidgets( );
- TQHBoxLayout* tqlayout;
+ TQHBoxLayout* layout;
TQGridLayout* gl;
m_pEnd1 = new PMVectorEdit( "x", "y", "z", this );
@@ -50,13 +50,13 @@ void PMCylinderEdit::createTopWidgets( )
gl->addWidget( new TQLabel( i18n( "End 2:" ), this ), 1, 0 );
gl->addWidget( m_pEnd2, 1, 1 );
- tqlayout = new TQHBoxLayout( topLayout( ) );
- tqlayout->addWidget( new TQLabel( i18n( "Radius:" ), this ) );
- tqlayout->addWidget( m_pRadius );
- tqlayout->addStretch( 1 );
+ layout = new TQHBoxLayout( topLayout( ) );
+ layout->addWidget( new TQLabel( i18n( "Radius:" ), this ) );
+ layout->addWidget( m_pRadius );
+ layout->addStretch( 1 );
- tqlayout = new TQHBoxLayout( topLayout( ) );
- tqlayout->addWidget( m_pOpen );
+ 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( ) ) );
diff --git a/kpovmodeler/pmdatachangecommand.cpp b/kpovmodeler/pmdatachangecommand.cpp
index 4188d253..99ac75d3 100644
--- a/kpovmodeler/pmdatachangecommand.cpp
+++ b/kpovmodeler/pmdatachangecommand.cpp
@@ -28,7 +28,7 @@ PMDataChangeCommand::PMDataChangeCommand( PMMemento* memento )
TQString text = memento->originator( )->name( );
if( text.isEmpty( ) )
text = memento->originator( )->description( );
- setText( i18n( "Change %1" ).tqarg( text ) );
+ setText( i18n( "Change %1" ).arg( text ) );
// the data is already changed when the command is created
m_executed = true;
diff --git a/kpovmodeler/pmdeclare.cpp b/kpovmodeler/pmdeclare.cpp
index 089447bc..3f290e2f 100644
--- a/kpovmodeler/pmdeclare.cpp
+++ b/kpovmodeler/pmdeclare.cpp
@@ -44,14 +44,14 @@ PMDeclare::PMDeclare( const PMDeclare& d )
{
m_id = d.m_id; // CAUTION! Duplication of the id which has to be unique
m_pDeclareType = 0; // will be set automatically in the
- // base constuctor when the tqchildren are copied
+ // base constuctor when the children are copied
}
-PMMetaObject* PMDeclare::tqmetaObject( ) const
+PMMetaObject* PMDeclare::metaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "Declare", Base::tqmetaObject( ),
+ s_pMetaObject = new PMMetaObject( "Declare", Base::metaObject( ),
createNewDeclare );
s_pMetaObject->addProperty(
new PMDeclareProperty( "id", &PMDeclare::setID, &PMDeclare::id ) );
@@ -180,9 +180,9 @@ void PMDeclare::updateDeclareType( )
if( o )
{
if( o->isA( "GraphicalObject" ) )
- type = m->tqmetaObject( "GraphicalObject" );
+ type = m->metaObject( "GraphicalObject" );
else
- type = o->tqmetaObject( );
+ type = o->metaObject( );
}
setDeclareType( type );
}
diff --git a/kpovmodeler/pmdeclare.h b/kpovmodeler/pmdeclare.h
index 69915218..89468bf4 100644
--- a/kpovmodeler/pmdeclare.h
+++ b/kpovmodeler/pmdeclare.h
@@ -55,7 +55,7 @@ public:
virtual TQString pixmap( ) const;
/** */
- virtual PMMetaObject* tqmetaObject( ) const;
+ virtual PMMetaObject* metaObject( ) const;
/** */
virtual void cleanUp( ) const;
diff --git a/kpovmodeler/pmdeclareedit.cpp b/kpovmodeler/pmdeclareedit.cpp
index 60446a53..7cf96d12 100644
--- a/kpovmodeler/pmdeclareedit.cpp
+++ b/kpovmodeler/pmdeclareedit.cpp
@@ -23,10 +23,10 @@
#include "pmscanner.h"
#include "pmobjectselect.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlineedit.h>
#include <tqlabel.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqpushbutton.h>
#include <tqlistbox.h>
@@ -44,13 +44,13 @@ void PMDeclareEdit::createTopWidgets( )
{
Base::createTopWidgets( );
- TQHBoxLayout* tqlayout = new TQHBoxLayout( topLayout( ) );
+ TQHBoxLayout* layout = new TQHBoxLayout( topLayout( ) );
m_pNameEdit = new TQLineEdit( this );
m_pNameEdit->setMaxLength( 40 );
TQLabel* label = new TQLabel( i18n( "Identifier:" ), this );
- tqlayout->addWidget( label );
- tqlayout->addWidget( m_pNameEdit );
+ layout->addWidget( label );
+ layout->addWidget( m_pNameEdit );
connect( m_pNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
TQT_SLOT( slotNameChanged( const TQString& ) ) );
@@ -67,13 +67,13 @@ void PMDeclareEdit::createBottomWidgets( )
TQT_SLOT( slotItemSelected( TQListBoxItem* ) ) );
topLayout( )->addWidget( m_pLinkedObjects, 1 );
- TQHBoxLayout* tqlayout = new TQHBoxLayout( topLayout( ) );
+ 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( ) ) );
- tqlayout->addStretch( );
- tqlayout->addWidget( m_pSelectButton );
+ layout->addStretch( );
+ layout->addWidget( m_pSelectButton );
Base::createBottomWidgets( );
}
diff --git a/kpovmodeler/pmdeletecommand.cpp b/kpovmodeler/pmdeletecommand.cpp
index 1afb81fa..2a8650f1 100644
--- a/kpovmodeler/pmdeletecommand.cpp
+++ b/kpovmodeler/pmdeletecommand.cpp
@@ -27,7 +27,7 @@
#include <tqptrdict.h>
PMDeleteCommand::PMDeleteCommand( PMObject* obj )
- : PMCommand( i18n( "Delete %1" ).tqarg( obj->name( ) ) )
+ : PMCommand( i18n( "Delete %1" ).arg( obj->name( ) ) )
{
// the scene can not be deleted!
if( obj->parent( ) )
@@ -256,7 +256,7 @@ int PMDeleteCommand::errorFlags( PMPart* )
{
m_errors.prepend( i18n( "The declare \"%1\" can't be removed "
"because of some remaining links." )
- .tqarg( decl->id( ) ) );
+ .arg( decl->id( ) ) );
PMDeleteInfo* tmp = info;
info = m_infoList.prev( );
diff --git a/kpovmodeler/pmdensity.cpp b/kpovmodeler/pmdensity.cpp
index a742d514..3935b6be 100644
--- a/kpovmodeler/pmdensity.cpp
+++ b/kpovmodeler/pmdensity.cpp
@@ -43,11 +43,11 @@ PMDensity::~PMDensity( )
{
}
-PMMetaObject* PMDensity::tqmetaObject( ) const
+PMMetaObject* PMDensity::metaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "Density", Base::tqmetaObject( ),
+ s_pMetaObject = new PMMetaObject( "Density", Base::metaObject( ),
createNewDensity );
}
return s_pMetaObject;
diff --git a/kpovmodeler/pmdensity.h b/kpovmodeler/pmdensity.h
index c194f846..b1502fe2 100644
--- a/kpovmodeler/pmdensity.h
+++ b/kpovmodeler/pmdensity.h
@@ -52,7 +52,7 @@ public:
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* tqmetaObject( ) const;
+ virtual PMMetaObject* metaObject( ) const;
/** */
virtual void cleanUp( ) const;
diff --git a/kpovmodeler/pmdensityedit.cpp b/kpovmodeler/pmdensityedit.cpp
index 407a4f80..cb36fd67 100644
--- a/kpovmodeler/pmdensityedit.cpp
+++ b/kpovmodeler/pmdensityedit.cpp
@@ -20,7 +20,7 @@
#include "pmdensity.h"
#include "pmlinkedit.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <klocale.h>
diff --git a/kpovmodeler/pmdetailobject.cpp b/kpovmodeler/pmdetailobject.cpp
index 050729a4..5abc7e22 100644
--- a/kpovmodeler/pmdetailobject.cpp
+++ b/kpovmodeler/pmdetailobject.cpp
@@ -47,11 +47,11 @@ PMDetailObject::~PMDetailObject()
{
}
-PMMetaObject* PMDetailObject::tqmetaObject( ) const
+PMMetaObject* PMDetailObject::metaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "DetailObject", Base::tqmetaObject( ) );
+ s_pMetaObject = new PMMetaObject( "DetailObject", Base::metaObject( ) );
s_pMetaObject->addProperty(
new PMDetailObjectProperty( "globalDetail", &PMDetailObject::setGlobalDetail, &PMDetailObject::globalDetail ) );
s_pMetaObject->addProperty(
diff --git a/kpovmodeler/pmdetailobject.h b/kpovmodeler/pmdetailobject.h
index 10efae07..846ef8c0 100644
--- a/kpovmodeler/pmdetailobject.h
+++ b/kpovmodeler/pmdetailobject.h
@@ -43,7 +43,7 @@ public:
virtual ~PMDetailObject();
/** */
- virtual PMMetaObject* tqmetaObject( ) const;
+ virtual PMMetaObject* metaObject( ) const;
/** */
virtual void cleanUp( ) const;
diff --git a/kpovmodeler/pmdetailobjectedit.cpp b/kpovmodeler/pmdetailobjectedit.cpp
index 09b53cbd..6baacac2 100644
--- a/kpovmodeler/pmdetailobjectedit.cpp
+++ b/kpovmodeler/pmdetailobjectedit.cpp
@@ -17,7 +17,7 @@
#include "pmdetailobjectedit.h"
#include "pmdetailobject.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcheckbox.h>
#include <tqlabel.h>
#include <tqcombobox.h>
@@ -33,7 +33,7 @@ void PMDetailObjectEdit::createTopWidgets( )
{
Base::createTopWidgets( );
- TQHBoxLayout* tqlayout = new TQHBoxLayout( topLayout( ) );
+ TQHBoxLayout* layout = new TQHBoxLayout( topLayout( ) );
m_pGlobalDetail = new TQCheckBox( i18n( "Global detail" ), this );
m_pLocalDetailLevelLabel = new TQLabel( i18n( "Detail level:" ), this );
m_pLocalDetailLevel = new TQComboBox( this );
@@ -43,10 +43,10 @@ void PMDetailObjectEdit::createTopWidgets( )
m_pLocalDetailLevel->insertItem( i18n( "High" ) );
m_pLocalDetailLevel->insertItem( i18n( "Very High" ) );
- tqlayout->addWidget( m_pGlobalDetail );
- tqlayout->addWidget( m_pLocalDetailLevelLabel );
- tqlayout->addWidget( m_pLocalDetailLevel );
- tqlayout->addStretch( );
+ layout->addWidget( m_pGlobalDetail );
+ layout->addWidget( m_pLocalDetailLevelLabel );
+ 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( ) ) );
diff --git a/kpovmodeler/pmdialogeditbase.cpp b/kpovmodeler/pmdialogeditbase.cpp
index 9b575fd8..c84982bf 100644
--- a/kpovmodeler/pmdialogeditbase.cpp
+++ b/kpovmodeler/pmdialogeditbase.cpp
@@ -18,7 +18,7 @@
#include "pmdialogeditbase.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcheckbox.h>
#include <tqpushbutton.h>
#include <tqlabel.h>
@@ -451,17 +451,17 @@ void PMDialogEditBase::slotTexturePreview( )
str << "union {\n";
if( s_showBox )
{
- str << c_boxCode.tqarg( numObjects );
+ str << c_boxCode.arg( numObjects );
numObjects++;
}
if( s_showCylinder )
{
- str << c_cylinderCode.tqarg( numObjects );
+ str << c_cylinderCode.arg( numObjects );
numObjects++;
}
if( s_showSphere )
{
- str << c_sphereCode.tqarg( numObjects );
+ str << c_sphereCode.arg( numObjects );
numObjects++;
}
@@ -495,18 +495,18 @@ void PMDialogEditBase::slotTexturePreview( )
{
c1 = PMColor( s_wallColor1 );
c2 = PMColor( s_wallColor2 );
- str << c_wallCode.tqarg( c1.serialize( true ) ).tqarg( c2.serialize( true ) );
+ str << c_wallCode.arg( c1.serialize( true ) ).arg( c2.serialize( true ) );
}
if( s_showFloor )
{
c1 = PMColor( s_floorColor1 );
c2 = PMColor( s_floorColor2 );
- str << c_floorCode.tqarg( c1.serialize( true ) ).tqarg( c2.serialize( true ) );
+ str << c_floorCode.arg( c1.serialize( true ) ).arg( c2.serialize( true ) );
}
str << c_lightCode;
str << c_cameraCode[numObjects-1];
- str << c_globalSettingsCode.tqarg( s_previewGamma );
+ str << c_globalSettingsCode.arg( s_previewGamma );
// Set the render mode
mode.setHeight( s_previewSize );
@@ -519,7 +519,7 @@ void PMDialogEditBase::slotTexturePreview( )
m_pRenderFrame->setFixedSize( s_previewSize + m_pRenderFrame->frameWidth( ) * 2,
s_previewSize + m_pRenderFrame->frameWidth( ) * 2 );
m_pRenderFrame->updateGeometry( );
- m_pTexturePreviewWidget->tqlayout( )->activate( );
+ m_pTexturePreviewWidget->layout( )->activate( );
emit sizeChanged( );
m_pOutputWidget->slotClear( );
m_pRenderWidget->render( scene, mode, m_pPart->url( ) );
@@ -540,7 +540,7 @@ void PMDialogEditBase::slotPreviewFinished( int exitStatus )
KMessageBox::error( this, i18n( "Povray exited abnormally with "
"exit code %1.\n"
"See the povray output for details." )
- .tqarg( exitStatus ) );
+ .arg( exitStatus ) );
}
else if( m_pRenderWidget->povrayOutput( ).contains( "ERROR" ) )
{
diff --git a/kpovmodeler/pmdialogeditbase.h b/kpovmodeler/pmdialogeditbase.h
index 77c37409..e2ae701a 100644
--- a/kpovmodeler/pmdialogeditbase.h
+++ b/kpovmodeler/pmdialogeditbase.h
@@ -42,7 +42,7 @@ class PMPovrayOutputWidget;
/**
* Base class for all widgets for editing object attributes.
*
- * Ensures a consistent tqlayout for all widgets. Widgets should not
+ * Ensures a consistent layout for all widgets. Widgets should not
* created within the constructor, but with the functions @ref createTopWidgets
* and @ref createBottomWidgets.
*
@@ -276,7 +276,7 @@ protected:
* of the sub class.
*
* First call the function of the base class, then create and append
- * the widgets to the top tqlayout.
+ * the widgets to the top layout.
*/
virtual void createTopWidgets( ) { };
@@ -284,7 +284,7 @@ protected:
* Create widgets here, that should be placed under the widgets
* of the sub class.
*
- * First create and append the widgets to the top tqlayout, then
+ * First create and append the widgets to the top layout, then
* call the function of the base class
*/
virtual void createBottomWidgets( );
@@ -296,7 +296,7 @@ protected:
virtual void saveContents( );
/**
- * Returns a pointer to the top tqlayout
+ * Returns a pointer to the top layout
*/
TQBoxLayout* topLayout( ) const { return m_pTopLayout; }
diff --git a/kpovmodeler/pmdialogview.cpp b/kpovmodeler/pmdialogview.cpp
index 0a7f372e..caab8731 100644
--- a/kpovmodeler/pmdialogview.cpp
+++ b/kpovmodeler/pmdialogview.cpp
@@ -33,7 +33,7 @@
#include <krun.h>
#include <kstdguiitem.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpushbutton.h>
#include <tqgroupbox.h>
#include <tqscrollview.h>
@@ -69,7 +69,7 @@ void PMDialogEditContent::calculateSize( )
int fw = lineWidth( ) * 2;
if( m_pContents )
{
- TQSize newSize = m_pContents->tqminimumSizeHint( );
+ TQSize newSize = m_pContents->minimumSizeHint( );
setVScrollBarMode( AlwaysOff );
setHScrollBarMode( AlwaysOff );
@@ -314,10 +314,10 @@ void PMDialogView::slotDataChanged( )
void PMDialogView::slotSizeChanged( )
{
- // force recalculating of the tqlayout
+ // force recalculating of the layout
if( m_pDisplayedWidget )
- if( m_pDisplayedWidget->tqlayout( ) )
- m_pDisplayedWidget->tqlayout( )->activate( );
+ if( m_pDisplayedWidget->layout( ) )
+ m_pDisplayedWidget->layout( )->activate( );
m_pHelper->calculateSize( );
}
diff --git a/kpovmodeler/pmdisc.cpp b/kpovmodeler/pmdisc.cpp
index 6f7bac55..bda89579 100644
--- a/kpovmodeler/pmdisc.cpp
+++ b/kpovmodeler/pmdisc.cpp
@@ -96,11 +96,11 @@ void PMDisc::readAttributes( const PMXMLHelper& h )
Base::readAttributes( h );
}
-PMMetaObject* PMDisc::tqmetaObject( ) const
+PMMetaObject* PMDisc::metaObject( ) const
{
if( !s_pMetaObject )
{
- s_pMetaObject = new PMMetaObject( "Disc", Base::tqmetaObject( ),
+ s_pMetaObject = new PMMetaObject( "Disc", Base::metaObject( ),
createNewDisc );
s_pMetaObject->addProperty(
new PMDiscProperty( "center", &PMDisc::setCenter, &PMDisc::center ) );
diff --git a/kpovmodeler/pmdisc.h b/kpovmodeler/pmdisc.h
index b56e2175..62201bcf 100644
--- a/kpovmodeler/pmdisc.h
+++ b/kpovmodeler/pmdisc.h
@@ -58,7 +58,7 @@ public:
/** */
virtual TQString description( ) const;
/** */
- virtual PMMetaObject* tqmetaObject( ) const;
+ virtual PMMetaObject* metaObject( ) const;
/** */
virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
diff --git a/kpovmodeler/pmdiscedit.cpp b/kpovmodeler/pmdiscedit.cpp
index e960f869..b7e0028a 100644
--- a/kpovmodeler/pmdiscedit.cpp
+++ b/kpovmodeler/pmdiscedit.cpp
@@ -21,7 +21,7 @@
#include "pmvectoredit.h"
#include "pmlineedits.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqpushbutton.h>
#include <klocale.h>
@@ -37,7 +37,7 @@ void PMDiscEdit::createTopWidgets( )
{
Base::createTopWidgets( );
- TQHBoxLayout* tqlayout;
+ TQHBoxLayout* layout;
TQGridLayout* gl;
m_pCenter = new PMVectorEdit( "x", "y", "z", this );
@@ -53,18 +53,18 @@ void PMDiscEdit::createTopWidgets( )
gl->addWidget( new TQLabel( i18n( "Normal:" ), this ), 1, 0 );
gl->addWidget( m_pNormal, 1, 1 );
- tqlayout = new TQHBoxLayout( topLayout( ) );
- gl = new TQGridLayout( tqlayout, 2, 2 );
+ layout = new TQHBoxLayout( topLayout( ) );
+ gl = new TQGridLayout( layout, 2, 2 );
gl->addWidget( new TQLabel( i18n( "Radius:" ), this ), 0, 0 );
gl->addWidget( m_pRadius, 0, 1 );
gl->addWidget( new TQLabel( i18n( "Hole radius:" ), this ), 1, 0 );
gl->addWidget( m_pHRadius, 1, 1 );
- tqlayout->addStretch( 1 );
+ layout->addStretch( 1 );
TQPushButton* nb = new TQPushButton( i18n( "Normalize" ), this );
- tqlayout = new TQHBoxLayout( topLayout( ) );
- tqlayout->addWidget( nb );
- tqlayout->addStretch( 1 );
+ layout = new TQHBoxLayout( topLayout( ) );
+ layout->addWidget( nb );
+ layout->addStretch( 1 );
connect( m_pCenter, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
connect( m_pNormal, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
diff --git a/kpovmodeler/pmdockwidget.cpp b/kpovmodeler/pmdockwidget.cpp
index 87fc37ef..8a691d1f 100644
--- a/kpovmodeler/pmdockwidget.cpp
+++ b/kpovmodeler/pmdockwidget.cpp
@@ -20,7 +20,7 @@
#include "pmdockwidget_private.h"
#include <tqapplication.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpainter.h>
#include <tqobjectlist.h>
#include <tqstrlist.h>
@@ -154,7 +154,7 @@ PMDockMainWindow::~PMDockMainWindow()
// kparts/dockmainwindow stuff
void PMDockMainWindow::createGUI( Part * part )
{
- kdDebug(1000) << TQString("DockMainWindow::createGUI for %1").tqarg(part?part->name():"0L") << endl;
+ kdDebug(1000) << TQString("DockMainWindow::createGUI for %1").arg(part?part->name():"0L") << endl;
KXMLGUIFactory *factory = guiFactory();
@@ -164,7 +164,7 @@ void PMDockMainWindow::createGUI( Part * part )
if ( d->m_activePart )
{
- kdDebug(1000) << TQString("deactivating GUI for %1").tqarg(d->m_activePart->name()) << endl;
+ kdDebug(1000) << TQString("deactivating GUI for %1").arg(d->m_activePart->name()) << endl;
GUIActivateEvent ev( false );
TQApplication::sendEvent( d->m_activePart, &ev );
@@ -337,7 +337,7 @@ void PMDockWidgetHeaderDrag::paintEvent( TQPaintEvent* )
paint.begin( this );
- tqstyle().tqdrawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), tqcolorGroup());
+ tqstyle().tqdrawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup());
paint.end();
}
@@ -350,8 +350,8 @@ PMDockWidgetAbstractHeader::PMDockWidgetAbstractHeader( PMDockWidget* parent, co
PMDockWidgetHeader::PMDockWidgetHeader( PMDockWidget* parent, const char* name )
:PMDockWidgetAbstractHeader( parent, name )
{
- tqlayout = new TQHBoxLayout( this );
- tqlayout->setResizeMode( TQLayout::Minimum );
+ layout = new TQHBoxLayout( this );
+ layout->setResizeMode( TQLayout::Minimum );
drag = new PMDockWidgetHeaderDrag( this, parent );
@@ -386,13 +386,13 @@ PMDockWidgetHeader::PMDockWidgetHeader( PMDockWidget* parent, const char* name )
toDesktopButton->setFixedSize(buttonWidth,buttonHeight);
connect( toDesktopButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(toDesktop()));
- tqlayout->addWidget( drag );
- tqlayout->addWidget( dockbackButton );
- tqlayout->addWidget( toDesktopButton );
- tqlayout->addWidget( stayButton );
- tqlayout->addWidget( closeButton );
- tqlayout->activate();
- drag->setFixedHeight( tqlayout->tqminimumSize().height() );
+ layout->addWidget( drag );
+ layout->addWidget( dockbackButton );
+ layout->addWidget( toDesktopButton );
+ layout->addWidget( stayButton );
+ layout->addWidget( closeButton );
+ layout->activate();
+ drag->setFixedHeight( layout->minimumSize().height() );
}
void PMDockWidgetHeader::setTopLevel( bool isTopLevel )
@@ -415,7 +415,7 @@ void PMDockWidgetHeader::setTopLevel( bool isTopLevel )
closeButton->show();
toDesktopButton->show();
}
- tqlayout->activate();
+ layout->activate();
updateGeometry();
}
@@ -423,20 +423,20 @@ void PMDockWidgetHeader::setDragPanel( PMDockWidgetHeaderDrag* nd )
{
if ( !nd ) return;
- delete tqlayout;
- tqlayout = new TQHBoxLayout( this );
- tqlayout->setResizeMode( TQLayout::Minimum );
+ delete layout;
+ layout = new TQHBoxLayout( this );
+ layout->setResizeMode( TQLayout::Minimum );
delete drag;
drag = nd;
- tqlayout->addWidget( drag );
- tqlayout->addWidget( dockbackButton );
- tqlayout->addWidget( toDesktopButton );
- tqlayout->addWidget( stayButton );
- tqlayout->addWidget( closeButton );
- tqlayout->activate();
- drag->setFixedHeight( tqlayout->tqminimumSize().height() );
+ layout->addWidget( drag );
+ layout->addWidget( dockbackButton );
+ layout->addWidget( toDesktopButton );
+ layout->addWidget( stayButton );
+ layout->addWidget( closeButton );
+ layout->activate();
+ drag->setFixedHeight( layout->minimumSize().height() );
}
void PMDockWidgetHeader::slotStayClicked()
@@ -459,12 +459,12 @@ void PMDockWidgetHeader::setDragEnabled(bool b)
#ifndef NO_KDE2
void PMDockWidgetHeader::saveConfig( KConfig* c )
{
- c->writeEntry( TQString("%1%2").tqarg(parent()->name()).tqarg(":stayButton"), stayButton->isOn() );
+ c->writeEntry( TQString("%1%2").arg(parent()->name()).arg(":stayButton"), stayButton->isOn() );
}
void PMDockWidgetHeader::loadConfig( KConfig* c )
{
- setDragEnabled( !c->readBoolEntry( TQString("%1%2").tqarg(parent()->name()).tqarg(":stayButton"), false ) );
+ setDragEnabled( !c->readBoolEntry( TQString("%1%2").arg(parent()->name()).arg(":stayButton"), false ) );
}
#endif
@@ -481,8 +481,8 @@ PMDockWidget::PMDockWidget( PMDockManager* dockManager, const char* name, const
d->_parent = parent;
- tqlayout = new TQVBoxLayout( this );
- tqlayout->setResizeMode( TQLayout::Minimum );
+ layout = new TQVBoxLayout( this );
+ layout->setResizeMode( TQLayout::Minimum );
manager = dockManager;
manager->childDock->append( TQT_TQOBJECT(this) );
@@ -538,15 +538,15 @@ void PMDockWidget::setHeader( PMDockWidgetAbstractHeader* h )
if ( header ){
delete header;
- delete tqlayout;
+ delete layout;
header = h;
- tqlayout = new TQVBoxLayout( this );
- tqlayout->setResizeMode( TQLayout::Minimum );
- tqlayout->addWidget( header );
+ layout = new TQVBoxLayout( this );
+ layout->setResizeMode( TQLayout::Minimum );
+ layout->addWidget( header );
setWidget( widget );
} else {
header = h;
- tqlayout->addWidget( header );
+ layout->addWidget( header );
}
}
@@ -584,7 +584,7 @@ void PMDockWidget::applyToWidget( TQWidget* s, const TQPoint& p )
}
if ( s == manager->main ){
- setGeometry( TQRect(TQPoint(0,0), manager->main->tqgeometry().size()) );
+ setGeometry( TQRect(TQPoint(0,0), manager->main->geometry().size()) );
}
if ( !s )
@@ -777,7 +777,7 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP
// MODIFICATION (Zehender):
// If DockPosition is DockLeft or DockRight, add the widget
// left or right of the target, so that a new vertical splitter
- // (a splitter with horizontal widget tqlayout :-) is created
+ // (a splitter with horizontal widget layout :-) is created
// that spawns the full height of the main view
if( ( dockPos == PMDockWidget::DockLeft ) ||
@@ -829,7 +829,7 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP
if ( !parentDock ){
// dock to a toplevel dockwidget means newDock is toplevel now
newDock->move( target->frameGeometry().topLeft() );
- newDock->resize( target->tqgeometry().size() );
+ newDock->resize( target->geometry().size() );
if ( target->isVisibleToTLW() ) newDock->show();
}
@@ -1086,13 +1086,13 @@ void PMDockWidget::setWidget( TQWidget* mw )
}
widget = mw;
- delete tqlayout;
+ delete layout;
- tqlayout = new TQVBoxLayout( this );
- tqlayout->setResizeMode( TQLayout::Minimum );
+ layout = new TQVBoxLayout( this );
+ layout->setResizeMode( TQLayout::Minimum );
- tqlayout->addWidget( header );
- tqlayout->addWidget( widget,1 );
+ layout->addWidget( header );
+ layout->addWidget( widget,1 );
}
void PMDockWidget::setDockTabName( PMDockTabGroup* tab )
@@ -1110,7 +1110,7 @@ void PMDockWidget::setDockTabName( PMDockTabGroup* tab )
tab->parentWidget()->setName( listOfName.utf8() );
tab->parentWidget()->setCaption( listOfCaption );
- tab->parentWidget()->tqrepaint( false ); // PMDockWidget->tqrepaint
+ tab->parentWidget()->repaint( false ); // PMDockWidget->repaint
if ( tab->parentWidget()->parent() )
if ( tab->parentWidget()->parent()->inherits("PMDockSplitter") )
((PMDockSplitter*)(tab->parentWidget()->parent()))->updateName();
@@ -1168,13 +1168,13 @@ void PMDockWidget::loseFormerBrotherDockWidget()
TQObject::disconnect( formerBrotherDockWidget, TQT_SIGNAL(iMBeingClosed()),
this, TQT_SLOT(loseFormerBrotherDockWidget()) );
formerBrotherDockWidget = 0L;
- tqrepaint();
+ repaint();
}
void PMDockWidget::dockBack()
{
if( formerBrotherDockWidget) {
- // search all tqchildren if it tries to dock back to a child
+ // search all children if it tries to dock back to a child
bool found = false;
TQObjectList* cl = queryList("PMDockWidget");
TQObjectListIt it( *cl );
@@ -1316,21 +1316,21 @@ void PMDockManager::activate()
bool PMDockManager::eventFilter( TQObject *obj, TQEvent *event )
{
/* This doesn't seem to fullfill any sense, other than breaking
- TQMainWindow's tqlayout all over the place
+ TQMainWindow's layout all over the place
The first child of the mainwindow is not necessarily a meaningful
content widget but in TQt3's TQMainWindow it can easily be a TQToolBar.
- In short: TQMainWindow knows how to tqlayout its tqchildren, no need to
+ In short: TQMainWindow knows how to layout its children, no need to
mess that up.
>>>>>I need this in the PMDockArea at the moment (JoWenn)
- if ( obj == main && event->type() == TQEvent::Resize && dynamic_cast<PMDockArea*>(main) && main->tqchildren() ){
+ if ( obj == main && event->type() == TQEvent::Resize && dynamic_cast<PMDockArea*>(main) && main->children() ){
#ifndef NO_KDE2
- kdDebug()<<"PMDockManager::eventFilter(): main is a PMDockArea and there are tqchildren"<<endl;
+ kdDebug()<<"PMDockManager::eventFilter(): main is a PMDockArea and there are children"<<endl;
#endif
- TQWidget* fc = (TQWidget*)main->tqchildren()->getFirst();
+ TQWidget* fc = (TQWidget*)main->children()->getFirst();
if ( fc )
- fc->setGeometry( TQRect(TQPoint(0,0), main->tqgeometry().size()) );
+ fc->setGeometry( TQRect(TQPoint(0,0), main->geometry().size()) );
}
*/
@@ -1356,7 +1356,7 @@ bool PMDockManager::eventFilter( TQObject *obj, TQEvent *event )
findChildDockWidget( curdw, *childDockWidgetList );
d->oldDragRect = TQRect();
- d->dragRect = TQRect(curdw->tqgeometry());
+ d->dragRect = TQRect(curdw->geometry());
TQPoint p = curdw->mapToGlobal(TQPoint(0,0));
d->dragRect.moveTopLeft(p);
drawDragRectangle();
@@ -1377,7 +1377,7 @@ bool PMDockManager::eventFilter( TQObject *obj, TQEvent *event )
if (d->readyToDrag) {
d->readyToDrag = false;
d->oldDragRect = TQRect();
- d->dragRect = TQRect(curdw->tqgeometry());
+ d->dragRect = TQRect(curdw->geometry());
TQPoint p = curdw->mapToGlobal(TQPoint(0,0));
d->dragRect.moveTopLeft(p);
drawDragRectangle();
@@ -1398,7 +1398,7 @@ bool PMDockManager::eventFilter( TQObject *obj, TQEvent *event )
break;
} else {
if (dropCancel && curdw) {
- d->dragRect = TQRect(curdw->tqgeometry());
+ d->dragRect = TQRect(curdw->geometry());
TQPoint p = curdw->mapToGlobal(TQPoint(0,0));
d->dragRect.moveTopLeft(p);
}else
@@ -1454,7 +1454,7 @@ PMDockWidget* PMDockManager::findDockWidgetAt( const TQPoint& pos )
return 0L;
}
#if defined(_OS_WIN32_) || defined(Q_OS_WIN32)
- p = p->tqtopLevelWidget();
+ p = p->topLevelWidget();
#endif
TQWidget* w = 0L;
findChildDockWidget( w, p, p->mapFromGlobal(pos) );
@@ -1511,7 +1511,7 @@ void PMDockManager::findChildDockWidget( TQWidget*& ww, const TQWidget* p, const
while ( it.current() ) {
if ( it.current()->isWidgetType() ) {
w = (TQWidget*)it.current();
- if ( w->isVisible() && w->tqgeometry().contains(pos) ) {
+ if ( w->isVisible() && w->geometry().contains(pos) ) {
if ( w->inherits("PMDockWidget") ) ww = w;
findChildDockWidget( ww, w, w->mapFromParent(pos) );
return;
@@ -1692,7 +1692,7 @@ static TQDomElement createStringEntry(TQDomDocument &doc, const TQString &tagNam
static TQDomElement createBoolEntry(TQDomDocument &doc, const TQString &tagName, bool b)
{
- return createStringEntry(doc, tagName, TQString::tqfromLatin1(b? "true" : "false"));
+ return createStringEntry(doc, tagName, TQString::fromLatin1(b? "true" : "false"));
}
@@ -1731,7 +1731,7 @@ static TQDomElement createListEntry(TQDomDocument &doc, const TQString &tagName,
TQStrListIterator it(list);
for (; it.current(); ++it) {
TQDomElement subel = doc.createElement(subTagName);
- subel.appendChild(doc.createTextNode(TQString::tqfromLatin1(it.current())));
+ subel.appendChild(doc.createTextNode(TQString::fromLatin1(it.current())));
el.appendChild(subel);
}
@@ -1801,7 +1801,7 @@ void PMDockManager::writeConfig(TQDomElement &base)
PMDockWidget *obj1;
while ( (obj1=(PMDockWidget*)it.current()) ) {
if ( TQT_BASE_OBJECT(obj1->parent()) == TQT_BASE_OBJECT(main) )
- mainWidgetStr = TQString::tqfromLatin1(obj1->name());
+ mainWidgetStr = TQString::fromLatin1(obj1->name());
nList.append(obj1->name());
++it;
}
@@ -1811,7 +1811,7 @@ void PMDockManager::writeConfig(TQDomElement &base)
PMDockWidget *obj = getDockWidgetFromName( nList.current() );
if (obj->isGroup && (nameList.find( obj->firstName.latin1() ) == -1
|| nameList.find(obj->lastName.latin1()) == -1)) {
- // Skip until tqchildren are saved (why?)
+ // Skip until children are saved (why?)
nList.next();
if ( !nList.current() ) nList.first();
continue;
@@ -1841,7 +1841,7 @@ void PMDockManager::writeConfig(TQDomElement &base)
groupEl = doc.createElement("dock");
}
- groupEl.appendChild(createStringEntry(doc, "name", TQString::tqfromLatin1(obj->name())));
+ groupEl.appendChild(createStringEntry(doc, "name", TQString::fromLatin1(obj->name())));
groupEl.appendChild(createBoolEntry(doc, "hasParent", obj->parent()));
if ( !obj->parent() ) {
groupEl.appendChild(createRectEntry(doc, "geometry", TQRect(main->frameGeometry().topLeft(), main->size())));
@@ -2039,7 +2039,7 @@ void PMDockManager::writeConfig( KConfig* c, TQString group )
c->writeEntry( cname+":type", "GROUP");
if ( !obj->parent() ){
c->writeEntry( cname+":parent", "___null___");
- c->writeEntry( cname+":tqgeometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) );
+ c->writeEntry( cname+":geometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) );
c->writeEntry( cname+":visible", obj->isVisible());
} else {
c->writeEntry( cname+":parent", "yes");
@@ -2070,7 +2070,7 @@ void PMDockManager::writeConfig( KConfig* c, TQString group )
c->writeEntry( cname+":type", "TAB_GROUP");
if ( !obj->parent() ){
c->writeEntry( cname+":parent", "___null___");
- c->writeEntry( cname+":tqgeometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) );
+ c->writeEntry( cname+":geometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) );
c->writeEntry( cname+":visible", obj->isVisible());
} else {
c->writeEntry( cname+":parent", "yes");
@@ -2090,7 +2090,7 @@ void PMDockManager::writeConfig( KConfig* c, TQString group )
/*************************************************************************************************/
if ( !obj->parent() ){
c->writeEntry( cname+":type", "NULL_DOCK");
- c->writeEntry( cname+":tqgeometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) );
+ c->writeEntry( cname+":geometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) );
c->writeEntry( cname+":visible", obj->isVisible());
} else {
c->writeEntry( cname+":type", "DOCK");
@@ -2200,7 +2200,7 @@ void PMDockManager::readConfig( KConfig* c, TQString group )
}
if ( type == "NULL_DOCK" || c->readEntry( oname + ":parent") == "___null___" ){
- TQRect r = c->readRectEntry( oname + ":tqgeometry" );
+ TQRect r = c->readRectEntry( oname + ":geometry" );
obj = getDockWidgetFromName( oname );
obj->applyToWidget( 0L );
obj->setGeometry(r);
@@ -2372,14 +2372,14 @@ void PMDockManager::drawDragRectangle()
PMDockMainWindow* pMain = 0L;
PMDockWidget* pTLDockWdg = 0L;
TQWidget* topWdg;
- if (pDockWdgAtRect->tqtopLevelWidget() == main) {
+ if (pDockWdgAtRect->topLevelWidget() == main) {
isOverMainWdg = true;
topWdg = pMain = (PMDockMainWindow*) main;
unclipped = pMain->testWFlags( WPaintUnclipped );
pMain->setWFlags( WPaintUnclipped );
}
else {
- topWdg = pTLDockWdg = (PMDockWidget*) pDockWdgAtRect->tqtopLevelWidget();
+ topWdg = pTLDockWdg = (PMDockWidget*) pDockWdgAtRect->topLevelWidget();
unclipped = pTLDockWdg->testWFlags( WPaintUnclipped );
pTLDockWdg->setWFlags( WPaintUnclipped );
}
@@ -2481,11 +2481,11 @@ void PMDockArea::resizeEvent(TQResizeEvent *rsize)
delete list;
#if 0
PMDockSplitter *split;
-// for (unsigned int i=0;i<tqchildren()->count();i++)
+// for (unsigned int i=0;i<children()->count();i++)
{
-// TQPtrList<TQObject> list(tqchildren());
-// TQObject *obj=((TQPtrList<TQObject*>)tqchildren())->at(i);
- TQObject *obj=tqchildren()->getFirst();
+// TQPtrList<TQObject> list(children());
+// TQObject *obj=((TQPtrList<TQObject*>)children())->at(i);
+ TQObject *obj=children()->getFirst();
if (split=dynamic_cast<PMDockSplitter*>(obj))
{
split->setGeometry( TQRect(TQPoint(0,0), size() ));
diff --git a/kpovmodeler/pmdockwidget.h b/kpovmodeler/pmdockwidget.h
index 93a323ca..ce7c7aa1 100644
--- a/kpovmodeler/pmdockwidget.h
+++ b/kpovmodeler/pmdockwidget.h
@@ -305,9 +305,9 @@ protected slots:
protected:
/**
- * A tqlayout manager for placing the embedded buttons (close and stay)
+ * A layout manager for placing the embedded buttons (close and stay)
*/
- TQHBoxLayout* tqlayout;
+ TQHBoxLayout* layout;
/**
* a little button for closing (undocking and hiding) the dockwidget
@@ -773,9 +773,9 @@ private:
TQWidget* widget;
/**
- * the tqlayout manager that takes care about proper resizing and moving the embedded widget and the header
+ * the layout manager that takes care about proper resizing and moving the embedded widget and the header
*/
- TQVBoxLayout* tqlayout;
+ TQVBoxLayout* layout;
/**
* the responsible dockmanager
@@ -855,7 +855,7 @@ public:
#ifndef NO_KDE2
/**
* Saves the current state of the dockmanager and of all controlled widgets.
- * State means here to save the tqgeometry, visibility, parents, internal object names, orientation,
+ * State means here to save the geometry, visibility, parents, internal object names, orientation,
* separator positions, dockwidget-group information, tab widget states (if it is a tab group) and
* last but not least some necessary things for recovering the dockmainwindow state.
*
@@ -872,7 +872,7 @@ public:
* (TQObject::name) in the childDock variable of
* PMDockManager. This list in turn contains all
* PMDockWidgets (according to the PMDockWidget constructor).
- * So in principle, in order to restore a window tqlayout,
+ * So in principle, in order to restore a window layout,
* one must first construct all widgets, put each of them in a
* PMDockWidget and then call readConfig(). And for all that
* to work, each widget must have a unique name.
@@ -884,11 +884,11 @@ public:
#endif
/**
- * Saves the current dock window tqlayout into a DOM tree below the given element.
+ * Saves the current dock window layout into a DOM tree below the given element.
*/
void writeConfig(TQDomElement &base);
/**
- * Reads the current dock window tqlayout from a DOM tree below the given element.
+ * Reads the current dock window layout from a DOM tree below the given element.
*/
void readConfig(TQDomElement &base);
@@ -1224,7 +1224,7 @@ public:
/**
* Constructs a dockmainwindow. It calls its base class constructor and does additional things concerning
* to the dock stuff:
- * @li information about the dock state of this' tqchildren gets initialized
+ * @li information about the dock state of this' children gets initialized
* @li a dockmanager is created...
* @li ...and gets initialized
* @li the main dockwidget is set to 0
@@ -1274,11 +1274,11 @@ public:
PMDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent = 0L, const TQString& strCaption = 0L, const TQString& strTabPageLabel = " ");
/**
- * Saves the current dock window tqlayout into a DOM tree below the given element.
+ * Saves the current dock window layout into a DOM tree below the given element.
*/
void writeDockConfig(TQDomElement &base);
/**
- * Reads the current dock window tqlayout from a DOM tree below the given element.
+ * Reads the current dock window layout from a DOM tree below the given element.
*/
void readDockConfig(TQDomElement &base);
diff --git a/kpovmodeler/pmdockwidget_private.cpp b/kpovmodeler/pmdockwidget_private.cpp
index 9c97888f..a7f45e50 100644
--- a/kpovmodeler/pmdockwidget_private.cpp
+++ b/kpovmodeler/pmdockwidget_private.cpp
@@ -69,20 +69,20 @@ void PMDockSplitter::setupMinMaxSize()
// Set the minimum and maximum sizes
int minx, maxx, miny, maxy;
if (orientation ==Qt::Horizontal) {
- miny = child0->tqminimumSize().height() + child1->tqminimumSize().height()+4;
- maxy = child0->tqmaximumSize().height() + child1->tqmaximumSize().height()+4;
- minx = (child0->tqminimumSize().width() > child1->tqminimumSize().width()) ? child0->tqminimumSize().width() : child1->tqminimumSize().width();
- maxx = (child0->tqmaximumSize().width() > child1->tqmaximumSize().width()) ? child0->tqmaximumSize().width() : child1->tqmaximumSize().width();
+ miny = child0->minimumSize().height() + child1->minimumSize().height()+4;
+ maxy = child0->maximumSize().height() + child1->maximumSize().height()+4;
+ minx = (child0->minimumSize().width() > child1->minimumSize().width()) ? child0->minimumSize().width() : child1->minimumSize().width();
+ maxx = (child0->maximumSize().width() > child1->maximumSize().width()) ? child0->maximumSize().width() : child1->maximumSize().width();
miny = (miny > 4) ? miny : 4;
maxy = (maxy < 32000) ? maxy : 32000;
minx = (minx > 2) ? minx : 2;
maxx = (maxx < 32000) ? maxx : 32000;
} else {
- minx = child0->tqminimumSize().width() + child1->tqminimumSize().width()+4;
- maxx = child0->tqmaximumSize().width() + child1->tqmaximumSize().width()+4;
- miny = (child0->tqminimumSize().height() > child1->tqminimumSize().height()) ? child0->tqminimumSize().height() : child1->tqminimumSize().height();
- maxy = (child0->tqmaximumSize().height() > child1->tqmaximumSize().height()) ? child0->tqmaximumSize().height() : child1->tqmaximumSize().height();
+ minx = child0->minimumSize().width() + child1->minimumSize().width()+4;
+ maxx = child0->maximumSize().width() + child1->maximumSize().width()+4;
+ miny = (child0->minimumSize().height() > child1->minimumSize().height()) ? child0->minimumSize().height() : child1->minimumSize().height();
+ maxy = (child0->maximumSize().height() > child1->maximumSize().height()) ? child0->maximumSize().height() : child1->maximumSize().height();
minx = (minx > 4) ? minx : 4;
maxx = (maxx < 32000) ? maxx : 32000;
@@ -143,15 +143,15 @@ int PMDockSplitter::checkValue( int position ) const
{
if (initialised){
if (orientation ==Qt::Vertical){
- if (position < (child0->tqminimumSize().width()))
- position = child0->tqminimumSize().width();
- if ((width()-4-position) < (child1->tqminimumSize().width()))
- position = width() - (child1->tqminimumSize().width()) -4;
+ if (position < (child0->minimumSize().width()))
+ position = child0->minimumSize().width();
+ if ((width()-4-position) < (child1->minimumSize().width()))
+ position = width() - (child1->minimumSize().width()) -4;
} else {
- if (position < (child0->tqminimumSize().height()))
- position = (child0->tqminimumSize().height());
- if ((height()-4-position) < (child1->tqminimumSize().height()))
- position = height() - (child1->tqminimumSize().height()) -4;
+ if (position < (child0->minimumSize().height()))
+ position = (child0->minimumSize().height());
+ if ((height()-4-position) < (child1->minimumSize().height()))
+ position = height() - (child1->minimumSize().height()) -4;
}
}
@@ -183,7 +183,7 @@ bool PMDockSplitter::eventFilter(TQObject *o, TQEvent *e)
} else {
xpos = factor * checkValue( mapFromGlobal(mev->globalPos()).y() ) / height();
resizeEvent(0);
- divider->tqrepaint(true);
+ divider->repaint(true);
}
} else {
if (!mOpaqueResize) {
@@ -192,7 +192,7 @@ bool PMDockSplitter::eventFilter(TQObject *o, TQEvent *e)
} else {
xpos = factor * checkValue( mapFromGlobal( mev->globalPos()).x() ) / width();
resizeEvent(0);
- divider->tqrepaint(true);
+ divider->repaint(true);
}
}
handled= true;
@@ -204,11 +204,11 @@ bool PMDockSplitter::eventFilter(TQObject *o, TQEvent *e)
if (orientation ==Qt::Horizontal){
xpos = factor* checkValue( mapFromGlobal(mev->globalPos()).y() ) / height();
resizeEvent(0);
- divider->tqrepaint(true);
+ divider->repaint(true);
} else {
xpos = factor* checkValue( mapFromGlobal(mev->globalPos()).x() ) / width();
resizeEvent(0);
- divider->tqrepaint(true);
+ divider->repaint(true);
}
handled= true;
break;
@@ -221,7 +221,7 @@ bool PMDockSplitter::eventFilter(TQObject *o, TQEvent *e)
bool PMDockSplitter::event( TQEvent* e )
{
if ( e->type() == TQEvent::LayoutHint ){
- // change tqchildren min/max size
+ // change children min/max size
setupMinMaxSize();
setSeparatorPos(xpos);
}
@@ -240,7 +240,7 @@ void PMDockSplitter::updateName()
TQString new_name = TQString( child0->name() ) + "," + child1->name();
parentWidget()->setName( new_name.latin1() );
parentWidget()->setCaption( child0->caption() + "," + child1->caption() );
- parentWidget()->tqrepaint( false );
+ parentWidget()->repaint( false );
((PMDockWidget*)parentWidget())->firstName = child0->name();
((PMDockWidget*)parentWidget())->lastName = child1->name();
@@ -301,7 +301,7 @@ PMDockButton_Private::~PMDockButton_Private()
void PMDockButton_Private::drawButton( TQPainter* p )
{
- p->fillRect( 0,0, width(), height(), TQBrush(tqcolorGroup().brush(TQColorGroup::Background)) );
+ p->fillRect( 0,0, width(), height(), TQBrush(colorGroup().brush(TQColorGroup::Background)) );
p->drawPixmap( (width() - pixmap()->width()) / 2, (height() - pixmap()->height()) / 2, *pixmap() );
if ( moveMouse && !isDown() ){
p->setPen( white );
@@ -309,12 +309,12 @@ void PMDockButton_Private::drawButton( TQPainter* p )
p->lineTo( 0, 0 );
p->lineTo( width() - 1, 0 );
- p->setPen( tqcolorGroup().dark() );
+ p->setPen( colorGroup().dark() );
p->lineTo( width() - 1, height() - 1 );
p->lineTo( 0, height() - 1 );
}
if ( isOn() || isDown() ){
- p->setPen( tqcolorGroup().dark() );
+ p->setPen( colorGroup().dark() );
p->moveTo( 0, height() - 1 );
p->lineTo( 0, 0 );
p->lineTo( width() - 1, 0 );
@@ -328,13 +328,13 @@ void PMDockButton_Private::drawButton( TQPainter* p )
void PMDockButton_Private::enterEvent( TQEvent * )
{
moveMouse = true;
- tqrepaint();
+ repaint();
}
void PMDockButton_Private::leaveEvent( TQEvent * )
{
moveMouse = false;
- tqrepaint();
+ repaint();
}
/*************************************************************************/
diff --git a/kpovmodeler/pmerrordialog.cpp b/kpovmodeler/pmerrordialog.cpp
index eb920fb0..b8cbf043 100644
--- a/