summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-19 19:03:33 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-19 19:03:33 +0000
commite69e8b1d09fb579316595b4e6a850e717358a8b1 (patch)
treea24fc20865f65772f530d16177520190594ffdd2
parenteecec9afb81fdebb0f22e9da22635874c403f854 (diff)
downloadtdegraphics-e69e8b1d09fb579316595b4e6a850e717358a8b1.tar.gz
tdegraphics-e69e8b1d09fb579316595b4e6a850e717358a8b1.zip
TQt4 port kdegraphics
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1237557 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--kamera/kcontrol/kamera.cpp50
-rw-r--r--kamera/kcontrol/kamera.h3
-rw-r--r--kamera/kcontrol/kameraconfigdialog.cpp36
-rw-r--r--kamera/kcontrol/kameraconfigdialog.h5
-rw-r--r--kamera/kcontrol/kameradevice.cpp28
-rw-r--r--kamera/kcontrol/kameradevice.h6
-rw-r--r--kamera/kioslave/kamera.cpp16
-rw-r--r--kcoloredit/colorselector.cpp16
-rw-r--r--kcoloredit/colorselector.h3
-rw-r--r--kcoloredit/editablestreamhistory.h4
-rw-r--r--kcoloredit/gradientselection.cpp16
-rw-r--r--kcoloredit/gradientselection.h3
-rw-r--r--kcoloredit/imageselection.cpp2
-rw-r--r--kcoloredit/imageselection.h3
-rw-r--r--kcoloredit/kcolorchooser.cpp4
-rw-r--r--kcoloredit/kcoloredit.cpp30
-rw-r--r--kcoloredit/kcoloredit.h5
-rw-r--r--kcoloredit/kcoloreditdoc.cpp18
-rw-r--r--kcoloredit/kcoloreditdoc.h7
-rw-r--r--kcoloredit/kcoloreditview.cpp20
-rw-r--r--kcoloredit/kcoloreditview.h7
-rw-r--r--kcoloredit/kxycolorselector.cpp44
-rw-r--r--kcoloredit/kxycolorselector.h3
-rw-r--r--kcoloredit/kzcolorselector.cpp42
-rw-r--r--kcoloredit/kzcolorselector.h3
-rw-r--r--kcoloredit/loadpalettedlg.cpp6
-rw-r--r--kcoloredit/loadpalettedlg.h3
-rw-r--r--kcoloredit/palette.cpp8
-rw-r--r--kcoloredit/paletteview.cpp6
-rw-r--r--kcoloredit/paletteview.h5
-rw-r--r--kcoloredit/paletteviewscrolledarea.cpp24
-rw-r--r--kcoloredit/paletteviewscrolledarea.h9
-rw-r--r--kcoloredit/texteditselection.cpp10
-rw-r--r--kcoloredit/texteditselection.h5
-rw-r--r--kcoloredit/textselection.cpp2
-rw-r--r--kdvi/TeXFont.h10
-rw-r--r--kdvi/TeXFontDefinition.cpp16
-rw-r--r--kdvi/TeXFontDefinition.h14
-rw-r--r--kdvi/TeXFont_PFB.cpp64
-rw-r--r--kdvi/TeXFont_PFB.h6
-rw-r--r--kdvi/TeXFont_PK.cpp106
-rw-r--r--kdvi/TeXFont_PK.h4
-rw-r--r--kdvi/TeXFont_TFM.cpp24
-rw-r--r--kdvi/TeXFont_TFM.h10
-rw-r--r--kdvi/bigEndianByteReader.cpp28
-rw-r--r--kdvi/bigEndianByteReader.h16
-rw-r--r--kdvi/dviFile.cpp44
-rw-r--r--kdvi/dviFile.h28
-rw-r--r--kdvi/dviPageCache.h1
-rw-r--r--kdvi/dviRenderer.cpp110
-rw-r--r--kdvi/dviRenderer.h27
-rw-r--r--kdvi/dviRenderer_draw.cpp26
-rw-r--r--kdvi/dviRenderer_export.cpp74
-rw-r--r--kdvi/dviRenderer_prescan.cpp132
-rw-r--r--kdvi/dviWidget.cpp14
-rw-r--r--kdvi/dviWidget.h3
-rw-r--r--kdvi/dvisourcesplitter.cpp4
-rw-r--r--kdvi/dvisourcesplitter.h4
-rw-r--r--kdvi/examples/dvistd0.dvibin141240 -> 141242 bytes
-rw-r--r--kdvi/fontEncoding.cpp4
-rw-r--r--kdvi/fontEncoding.h4
-rw-r--r--kdvi/fontEncodingPool.cpp2
-rw-r--r--kdvi/fontMap.cpp22
-rw-r--r--kdvi/fontMap.h10
-rw-r--r--kdvi/fontpool.cpp82
-rw-r--r--kdvi/fontpool.h11
-rw-r--r--kdvi/fontprogress.cpp14
-rw-r--r--kdvi/fontprogress.h5
-rw-r--r--kdvi/glyph.h6
-rw-r--r--kdvi/infodialog.cpp32
-rw-r--r--kdvi/infodialog.h3
-rw-r--r--kdvi/kdvi_multipage.cpp26
-rw-r--r--kdvi/kdvi_multipage.h3
-rw-r--r--kdvi/main.cpp6
-rw-r--r--kdvi/optionDialogFontsWidget.cpp6
-rw-r--r--kdvi/optionDialogFontsWidget.h3
-rw-r--r--kdvi/optionDialogFontsWidget_base.ui14
-rw-r--r--kdvi/optionDialogSpecialWidget.cpp6
-rw-r--r--kdvi/optionDialogSpecialWidget.h3
-rw-r--r--kdvi/optionDialogSpecialWidget_base.ui20
-rw-r--r--kdvi/prebookmark.h6
-rw-r--r--kdvi/psgs.cpp66
-rw-r--r--kdvi/psgs.h3
-rw-r--r--kdvi/psheader.txt6
-rw-r--r--kdvi/renderedDviPagePixmap.h1
-rw-r--r--kdvi/special.cpp60
-rw-r--r--kdvi/vf.cpp16
-rw-r--r--kfax/faxinput.cpp14
-rw-r--r--kfax/kfax.cpp116
-rw-r--r--kfax/kfax.h5
-rw-r--r--kfax/kfax_printsettings.cpp4
-rw-r--r--kfax/kfax_printsettings.h9
-rw-r--r--kfax/options.cpp18
-rw-r--r--kfax/options.h7
-rw-r--r--kfaxview/faxmultipage.cpp4
-rw-r--r--kfaxview/faxmultipage.h3
-rw-r--r--kfaxview/faxrenderer.cpp20
-rw-r--r--kfaxview/faxrenderer.h3
-rw-r--r--kfaxview/libkfaximage/faxexpand.h4
-rw-r--r--kfaxview/libkfaximage/kfaximage.cpp28
-rw-r--r--kfaxview/libkfaximage/kfaximage.h5
-rw-r--r--kfaxview/main.cpp6
-rw-r--r--kfile-plugins/RETURNED_ITEMS2
-rw-r--r--kfile-plugins/bmp/kfile_bmp.cpp6
-rw-r--r--kfile-plugins/bmp/kfile_bmp.h3
-rw-r--r--kfile-plugins/configure.in.bot14
-rw-r--r--kfile-plugins/dds/kfile_dds.cpp34
-rw-r--r--kfile-plugins/dds/kfile_dds.h3
-rw-r--r--kfile-plugins/dvi/kfile_dvi.cpp16
-rw-r--r--kfile-plugins/dvi/kfile_dvi.h3
-rw-r--r--kfile-plugins/exr/kfile_exr.cpp22
-rw-r--r--kfile-plugins/exr/kfile_exr.h3
-rw-r--r--kfile-plugins/gif/gif-info.12
-rw-r--r--kfile-plugins/gif/kfile_gif.cpp12
-rw-r--r--kfile-plugins/gif/kfile_gif.h3
-rw-r--r--kfile-plugins/ico/kfile_ico.cpp6
-rw-r--r--kfile-plugins/ico/kfile_ico.h3
-rw-r--r--kfile-plugins/jpeg/exif.cpp20
-rw-r--r--kfile-plugins/jpeg/kfile_jpeg.cpp30
-rw-r--r--kfile-plugins/jpeg/kfile_jpeg.h5
-rw-r--r--kfile-plugins/pcx/kfile_pcx.cpp4
-rw-r--r--kfile-plugins/pcx/kfile_pcx.h43
-rw-r--r--kfile-plugins/pdf/Makefile.am1
-rw-r--r--kfile-plugins/pdf/kfile_pdf.cpp14
-rw-r--r--kfile-plugins/pdf/kfile_pdf.h3
-rw-r--r--kfile-plugins/pdf/poppler-qt/poppler-document.cc54
-rw-r--r--kfile-plugins/pdf/poppler-qt/poppler-fontinfo.cc6
-rw-r--r--kfile-plugins/pdf/poppler-qt/poppler-link-qt3.h40
-rw-r--r--kfile-plugins/pdf/poppler-qt/poppler-link.cc52
-rw-r--r--kfile-plugins/pdf/poppler-qt/poppler-page-transition.cc2
-rw-r--r--kfile-plugins/pdf/poppler-qt/poppler-page-transition.h4
-rw-r--r--kfile-plugins/pdf/poppler-qt/poppler-page.cc48
-rw-r--r--kfile-plugins/pdf/poppler-qt/poppler-private.cc44
-rw-r--r--kfile-plugins/pdf/poppler-qt/poppler-private.h10
-rw-r--r--kfile-plugins/pdf/poppler-qt/poppler-qt.h72
-rw-r--r--kfile-plugins/pdf/poppler-qt/test-poppler-qt.cpp38
-rw-r--r--kfile-plugins/png/kfile_png.cpp4
-rw-r--r--kfile-plugins/png/kfile_png.h3
-rw-r--r--kfile-plugins/pnm/kfile_pnm.cpp4
-rw-r--r--kfile-plugins/pnm/kfile_pnm.h3
-rw-r--r--kfile-plugins/ps/gscreator.cpp12
-rw-r--r--kfile-plugins/ps/kfile_ps.cpp4
-rw-r--r--kfile-plugins/ps/kfile_ps.h3
-rw-r--r--kfile-plugins/raw/kcamerarawplugin.cpp4
-rw-r--r--kfile-plugins/raw/kcamerarawplugin.h3
-rw-r--r--kfile-plugins/raw/parse.c2
-rw-r--r--kfile-plugins/rgb/kfile_rgb.cpp56
-rw-r--r--kfile-plugins/rgb/kfile_rgb.h5
-rw-r--r--kfile-plugins/tga/kfile_tga.cpp6
-rw-r--r--kfile-plugins/tga/kfile_tga.h3
-rw-r--r--kfile-plugins/tiff/kfile_tiff.cpp8
-rw-r--r--kfile-plugins/tiff/kfile_tiff.h3
-rw-r--r--kfile-plugins/xbm/kfile_xbm.cpp6
-rw-r--r--kfile-plugins/xbm/kfile_xbm.h3
-rw-r--r--kfile-plugins/xpm/kfile_xpm.cpp6
-rw-r--r--kfile-plugins/xpm/kfile_xpm.h3
-rw-r--r--kgamma/configure.in.in2
-rw-r--r--kgamma/kcmkgamma/displaynumber.cpp10
-rw-r--r--kgamma/kcmkgamma/displaynumber.h3
-rw-r--r--kgamma/kcmkgamma/gammactrl.cpp6
-rw-r--r--kgamma/kcmkgamma/gammactrl.h3
-rw-r--r--kgamma/kcmkgamma/kgamma.cpp34
-rw-r--r--kgamma/kcmkgamma/kgamma.h3
-rw-r--r--kgamma/xf86gammacfg/Makefile.am1
-rw-r--r--kghostview/displayoptions.cpp12
-rw-r--r--kghostview/displayoptions.h6
-rw-r--r--kghostview/dscparse/dscparse.cpp26
-rw-r--r--kghostview/dscparse/dscparse.h14
-rw-r--r--kghostview/dscparse/dscparse_adapter.cpp2
-rw-r--r--kghostview/dscparse/dscparse_adapter.h12
-rw-r--r--kghostview/fullscreenfilter.cpp18
-rw-r--r--kghostview/fullscreenfilter.h5
-rw-r--r--kghostview/generalsettingswidget.ui20
-rw-r--r--kghostview/generalsettingswidget.ui.h2
-rw-r--r--kghostview/gssettingswidget.ui28
-rw-r--r--kghostview/gssettingswidget.ui.h4
-rw-r--r--kghostview/infodialog.cpp6
-rw-r--r--kghostview/infodialog.h3
-rw-r--r--kghostview/kdscerrordialog.cpp6
-rw-r--r--kghostview/kdscerrordialog.h3
-rw-r--r--kghostview/kgv_miniwidget.cpp22
-rw-r--r--kghostview/kgv_miniwidget.h3
-rw-r--r--kghostview/kgv_view.cpp68
-rw-r--r--kghostview/kgv_view.h11
-rw-r--r--kghostview/kgvconfigdialog.cpp12
-rw-r--r--kghostview/kgvdocument.cpp62
-rw-r--r--kghostview/kgvdocument.h10
-rw-r--r--kghostview/kgvfactory.cpp10
-rw-r--r--kghostview/kgvfactory.h4
-rw-r--r--kghostview/kgvmainwidget.cpp4
-rw-r--r--kghostview/kgvmainwidget.h5
-rw-r--r--kghostview/kgvpagedecorator.cpp6
-rw-r--r--kghostview/kgvpagedecorator.h8
-rw-r--r--kghostview/kgvpageview.cpp24
-rw-r--r--kghostview/kgvpageview.h5
-rw-r--r--kghostview/kgvshell.cpp26
-rw-r--r--kghostview/kgvshell.h1
-rw-r--r--kghostview/kpswidget.cpp18
-rw-r--r--kghostview/kpswidget.h5
-rw-r--r--kghostview/logwindow.cpp8
-rw-r--r--kghostview/logwindow.h3
-rw-r--r--kghostview/marklist.cpp25
-rw-r--r--kghostview/marklist.h12
-rw-r--r--kghostview/scrollbox.cpp29
-rw-r--r--kghostview/scrollbox.h5
-rw-r--r--kghostview/thumbnailservice.cpp8
-rw-r--r--kghostview/thumbnailservice.h3
-rw-r--r--kghostview/viewcontrol.cpp40
-rw-r--r--kghostview/viewcontrol.h5
-rw-r--r--kiconedit/kcolorgrid.cpp26
-rw-r--r--kiconedit/kcolorgrid.h9
-rw-r--r--kiconedit/kicon.cpp32
-rw-r--r--kiconedit/kicon.h5
-rw-r--r--kiconedit/kiconcolors.cpp12
-rw-r--r--kiconedit/kiconcolors.h9
-rw-r--r--kiconedit/kiconconfig.cpp46
-rw-r--r--kiconedit/kiconconfig.h17
-rw-r--r--kiconedit/kiconedit.cpp94
-rw-r--r--kiconedit/kiconedit.h3
-rw-r--r--kiconedit/kiconeditslots.cpp18
-rw-r--r--kiconedit/kicongrid.cpp188
-rw-r--r--kiconedit/kicongrid.h12
-rw-r--r--kiconedit/knew.cpp18
-rw-r--r--kiconedit/knew.h16
-rw-r--r--kiconedit/kresize.cpp16
-rw-r--r--kiconedit/kresize.h8
-rw-r--r--kiconedit/palettetoolbar.cpp54
-rw-r--r--kiconedit/palettetoolbar.h5
-rw-r--r--kiconedit/properties.h2
-rw-r--r--kmrml/kmrml.spec6
-rw-r--r--kmrml/kmrml/algorithmcombo.cpp6
-rw-r--r--kmrml/kmrml/algorithmcombo.h3
-rw-r--r--kmrml/kmrml/algorithmdialog.cpp18
-rw-r--r--kmrml/kmrml/algorithmdialog.h3
-rw-r--r--kmrml/kmrml/browser.cpp6
-rw-r--r--kmrml/kmrml/browser.h3
-rw-r--r--kmrml/kmrml/collectioncombo.cpp4
-rw-r--r--kmrml/kmrml/collectioncombo.h3
-rw-r--r--kmrml/kmrml/kcontrol/indexcleaner.cpp14
-rw-r--r--kmrml/kmrml/kcontrol/indexcleaner.h5
-rw-r--r--kmrml/kmrml/kcontrol/indexer.cpp22
-rw-r--r--kmrml/kmrml/kcontrol/indexer.h5
-rw-r--r--kmrml/kmrml/kcontrol/indextest.h3
-rw-r--r--kmrml/kmrml/kcontrol/kcmkmrml.cpp18
-rw-r--r--kmrml/kmrml/kcontrol/kcmkmrml.h3
-rw-r--r--kmrml/kmrml/kcontrol/mainpage.cpp18
-rw-r--r--kmrml/kmrml/kcontrol/mainpage.h5
-rw-r--r--kmrml/kmrml/kcontrol/serverconfigwidget.ui34
-rw-r--r--kmrml/kmrml/lib/kmrml_config.cpp34
-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/lib/mrml_utils.h2
-rw-r--r--kmrml/kmrml/lib/watcher_stub.cpp2
-rw-r--r--kmrml/kmrml/loader.cpp4
-rw-r--r--kmrml/kmrml/loader.h3
-rw-r--r--kmrml/kmrml/mrml.cpp14
-rw-r--r--kmrml/kmrml/mrml.h2
-rw-r--r--kmrml/kmrml/mrml_creator.cpp4
-rw-r--r--kmrml/kmrml/mrml_creator.h4
-rw-r--r--kmrml/kmrml/mrml_elements.cpp18
-rw-r--r--kmrml/kmrml/mrml_elements.h6
-rw-r--r--kmrml/kmrml/mrml_part.cpp68
-rw-r--r--kmrml/kmrml/mrml_part.h18
-rw-r--r--kmrml/kmrml/mrml_view.cpp54
-rw-r--r--kmrml/kmrml/mrml_view.h16
-rw-r--r--kmrml/kmrml/propertysheet.cpp10
-rw-r--r--kmrml/kmrml/propertysheet.h6
-rw-r--r--kmrml/kmrml/propertywidgets.cpp20
-rw-r--r--kmrml/kmrml/propertywidgets.h25
-rw-r--r--kmrml/kmrml/server/watcher.cpp16
-rw-r--r--kmrml/kmrml/server/watcher.h1
-rw-r--r--kolourpaint/BUGS6
-rw-r--r--kolourpaint/cursors/kpcursorlightcross.cpp24
-rw-r--r--kolourpaint/kolourpaint.cpp2
-rw-r--r--kolourpaint/kpcolor.cpp52
-rw-r--r--kolourpaint/kpcolor.h16
-rw-r--r--kolourpaint/kpcommandhistory.cpp12
-rw-r--r--kolourpaint/kpcommandhistory.h10
-rw-r--r--kolourpaint/kpdefs.h98
-rw-r--r--kolourpaint/kpdocument.cpp148
-rw-r--r--kolourpaint/kpdocument.h13
-rw-r--r--kolourpaint/kpdocumentmetainfo.cpp10
-rw-r--r--kolourpaint/kpdocumentsaveoptions.cpp38
-rw-r--r--kolourpaint/kpdocumentsaveoptions.h4
-rw-r--r--kolourpaint/kpdocumentsaveoptionswidget.cpp70
-rw-r--r--kolourpaint/kpdocumentsaveoptionswidget.h14
-rw-r--r--kolourpaint/kpmainwindow.cpp34
-rw-r--r--kolourpaint/kpmainwindow.h5
-rw-r--r--kolourpaint/kpmainwindow_edit.cpp88
-rw-r--r--kolourpaint/kpmainwindow_file.cpp80
-rw-r--r--kolourpaint/kpmainwindow_help.cpp8
-rw-r--r--kolourpaint/kpmainwindow_image.cpp42
-rw-r--r--kolourpaint/kpmainwindow_settings.cpp16
-rw-r--r--kolourpaint/kpmainwindow_statusbar.cpp20
-rw-r--r--kolourpaint/kpmainwindow_text.cpp14
-rw-r--r--kolourpaint/kpmainwindow_tools.cpp18
-rw-r--r--kolourpaint/kpmainwindow_view.cpp76
-rw-r--r--kolourpaint/kpselection.cpp140
-rw-r--r--kolourpaint/kpselection.h13
-rw-r--r--kolourpaint/kpselectiondrag.cpp24
-rw-r--r--kolourpaint/kpselectiondrag.h5
-rw-r--r--kolourpaint/kpselectiontransparency.cpp4
-rw-r--r--kolourpaint/kpsinglekeytriggersaction.cpp4
-rw-r--r--kolourpaint/kpsinglekeytriggersaction.h3
-rw-r--r--kolourpaint/kptemppixmap.h2
-rw-r--r--kolourpaint/kpthumbnail.cpp60
-rw-r--r--kolourpaint/kpthumbnail.h5
-rw-r--r--kolourpaint/kptool.cpp126
-rw-r--r--kolourpaint/kptool.h11
-rw-r--r--kolourpaint/kpview.cpp170
-rw-r--r--kolourpaint/kpview.h29
-rw-r--r--kolourpaint/kpviewmanager.cpp16
-rw-r--r--kolourpaint/kpviewmanager.h13
-rw-r--r--kolourpaint/kpviewscrollablecontainer.cpp134
-rw-r--r--kolourpaint/kpviewscrollablecontainer.h16
-rw-r--r--kolourpaint/patches/doc_resize_no_flicker.diff44
-rw-r--r--kolourpaint/pixmapfx/kpcoloreffect.cpp10
-rw-r--r--kolourpaint/pixmapfx/kpcoloreffect.h5
-rw-r--r--kolourpaint/pixmapfx/kpeffectbalance.cpp58
-rw-r--r--kolourpaint/pixmapfx/kpeffectbalance.h3
-rw-r--r--kolourpaint/pixmapfx/kpeffectblursharpen.cpp22
-rw-r--r--kolourpaint/pixmapfx/kpeffectblursharpen.h3
-rw-r--r--kolourpaint/pixmapfx/kpeffectemboss.cpp18
-rw-r--r--kolourpaint/pixmapfx/kpeffectemboss.h3
-rw-r--r--kolourpaint/pixmapfx/kpeffectflatten.cpp8
-rw-r--r--kolourpaint/pixmapfx/kpeffectflatten.h3
-rw-r--r--kolourpaint/pixmapfx/kpeffectinvert.cpp20
-rw-r--r--kolourpaint/pixmapfx/kpeffectinvert.h3
-rw-r--r--kolourpaint/pixmapfx/kpeffectreducecolors.cpp20
-rw-r--r--kolourpaint/pixmapfx/kpeffectreducecolors.h5
-rw-r--r--kolourpaint/pixmapfx/kpeffectsdialog.cpp30
-rw-r--r--kolourpaint/pixmapfx/kpeffectsdialog.h3
-rw-r--r--kolourpaint/pixmapfx/kpfloodfill.cpp30
-rw-r--r--kolourpaint/pixmapfx/kppixmapfx.cpp222
-rw-r--r--kolourpaint/pixmapfx/kppixmapfx.h36
-rw-r--r--kolourpaint/tools/kptoolaction.cpp4
-rw-r--r--kolourpaint/tools/kptoolaction.h3
-rw-r--r--kolourpaint/tools/kptoolairspray.cpp28
-rw-r--r--kolourpaint/tools/kptoolairspray.h1
-rw-r--r--kolourpaint/tools/kptoolautocrop.cpp64
-rw-r--r--kolourpaint/tools/kptoolautocrop.h2
-rw-r--r--kolourpaint/tools/kptoolbrush.cpp4
-rw-r--r--kolourpaint/tools/kptoolbrush.h1
-rw-r--r--kolourpaint/tools/kptoolclear.cpp2
-rw-r--r--kolourpaint/tools/kptoolcolorpicker.cpp2
-rw-r--r--kolourpaint/tools/kptoolcolorpicker.h1
-rw-r--r--kolourpaint/tools/kptoolcolorwasher.cpp2
-rw-r--r--kolourpaint/tools/kptoolcolorwasher.h1
-rw-r--r--kolourpaint/tools/kptoolconverttograyscale.cpp2
-rw-r--r--kolourpaint/tools/kptoolcrop.cpp10
-rw-r--r--kolourpaint/tools/kptoolcurve.cpp2
-rw-r--r--kolourpaint/tools/kptoolcurve.h1
-rw-r--r--kolourpaint/tools/kptoolellipse.cpp2
-rw-r--r--kolourpaint/tools/kptoolellipse.h1
-rw-r--r--kolourpaint/tools/kptoolellipticalselection.cpp2
-rw-r--r--kolourpaint/tools/kptooleraser.cpp2
-rw-r--r--kolourpaint/tools/kptooleraser.h3
-rw-r--r--kolourpaint/tools/kptoolflip.cpp8
-rw-r--r--kolourpaint/tools/kptoolflip.h3
-rw-r--r--kolourpaint/tools/kptoolfloodfill.cpp4
-rw-r--r--kolourpaint/tools/kptoolfloodfill.h1
-rw-r--r--kolourpaint/tools/kptoolfreeformselection.cpp2
-rw-r--r--kolourpaint/tools/kptoolline.cpp2
-rw-r--r--kolourpaint/tools/kptoolline.h1
-rw-r--r--kolourpaint/tools/kptoolpen.cpp136
-rw-r--r--kolourpaint/tools/kptoolpen.h5
-rw-r--r--kolourpaint/tools/kptoolpolygon.cpp90
-rw-r--r--kolourpaint/tools/kptoolpolygon.h1
-rw-r--r--kolourpaint/tools/kptoolpolyline.cpp2
-rw-r--r--kolourpaint/tools/kptoolpolyline.h1
-rw-r--r--kolourpaint/tools/kptoolpreviewdialog.cpp30
-rw-r--r--kolourpaint/tools/kptoolpreviewdialog.h5
-rw-r--r--kolourpaint/tools/kptoolrectangle.cpp114
-rw-r--r--kolourpaint/tools/kptoolrectangle.h15
-rw-r--r--kolourpaint/tools/kptoolrectselection.cpp2
-rw-r--r--kolourpaint/tools/kptoolresizescale.cpp52
-rw-r--r--kolourpaint/tools/kptoolresizescale.h1
-rw-r--r--kolourpaint/tools/kptoolrotate.cpp12
-rw-r--r--kolourpaint/tools/kptoolrotate.h3
-rw-r--r--kolourpaint/tools/kptoolroundedrectangle.cpp2
-rw-r--r--kolourpaint/tools/kptoolroundedrectangle.h1
-rw-r--r--kolourpaint/tools/kptoolselection.cpp66
-rw-r--r--kolourpaint/tools/kptoolselection.h2
-rw-r--r--kolourpaint/tools/kptoolskew.cpp8
-rw-r--r--kolourpaint/tools/kptoolskew.h3
-rw-r--r--kolourpaint/tools/kptooltext.cpp46
-rw-r--r--kolourpaint/tools/kptooltext.h1
-rw-r--r--kolourpaint/views/kpthumbnailview.cpp6
-rw-r--r--kolourpaint/views/kpthumbnailview.h5
-rw-r--r--kolourpaint/views/kpunzoomedthumbnailview.cpp16
-rw-r--r--kolourpaint/views/kpunzoomedthumbnailview.h5
-rw-r--r--kolourpaint/views/kpzoomedthumbnailview.cpp8
-rw-r--r--kolourpaint/views/kpzoomedthumbnailview.h5
-rw-r--r--kolourpaint/views/kpzoomedview.cpp4
-rw-r--r--kolourpaint/views/kpzoomedview.h3
-rw-r--r--kolourpaint/widgets/kpcolorsimilaritycube.cpp32
-rw-r--r--kolourpaint/widgets/kpcolorsimilaritycube.h6
-rw-r--r--kolourpaint/widgets/kpcolorsimilaritydialog.cpp8
-rw-r--r--kolourpaint/widgets/kpcolorsimilaritydialog.h3
-rw-r--r--kolourpaint/widgets/kpcolortoolbar.cpp114
-rw-r--r--kolourpaint/widgets/kpcolortoolbar.h26
-rw-r--r--kolourpaint/widgets/kpresizesignallinglabel.cpp10
-rw-r--r--kolourpaint/widgets/kpresizesignallinglabel.h7
-rw-r--r--kolourpaint/widgets/kpsqueezedtextlabel.cpp48
-rw-r--r--kolourpaint/widgets/kpsqueezedtextlabel.h9
-rw-r--r--kolourpaint/widgets/kptooltoolbar.cpp16
-rw-r--r--kolourpaint/widgets/kptooltoolbar.h1
-rw-r--r--kolourpaint/widgets/kptoolwidgetbase.cpp36
-rw-r--r--kolourpaint/widgets/kptoolwidgetbase.h13
-rw-r--r--kolourpaint/widgets/kptoolwidgetbrush.cpp44
-rw-r--r--kolourpaint/widgets/kptoolwidgetbrush.h5
-rw-r--r--kolourpaint/widgets/kptoolwidgeterasersize.cpp38
-rw-r--r--kolourpaint/widgets/kptoolwidgeterasersize.h3
-rw-r--r--kolourpaint/widgets/kptoolwidgetfillstyle.cpp40
-rw-r--r--kolourpaint/widgets/kptoolwidgetfillstyle.h7
-rw-r--r--kolourpaint/widgets/kptoolwidgetlinewidth.cpp22
-rw-r--r--kolourpaint/widgets/kptoolwidgetlinewidth.h3
-rw-r--r--kolourpaint/widgets/kptoolwidgetopaqueortransparent.cpp4
-rw-r--r--kolourpaint/widgets/kptoolwidgetopaqueortransparent.h3
-rw-r--r--kolourpaint/widgets/kptoolwidgetspraycansize.cpp20
-rw-r--r--kolourpaint/widgets/kptoolwidgetspraycansize.h3
-rw-r--r--kooka/CHANGES2
-rw-r--r--kooka/dwmenuaction.cpp8
-rw-r--r--kooka/dwmenuaction.h9
-rw-r--r--kooka/formathelp.h4
-rw-r--r--kooka/imageselectline.cpp8
-rw-r--r--kooka/imageselectline.h9
-rw-r--r--kooka/img_saver.cpp42
-rw-r--r--kooka/img_saver.h14
-rw-r--r--kooka/imgnamecombo.cpp16
-rw-r--r--kooka/imgnamecombo.h5
-rw-r--r--kooka/imgprintdialog.cpp24
-rw-r--r--kooka/imgprintdialog.h7
-rw-r--r--kooka/kadmosocr.cpp10
-rw-r--r--kooka/kadmosocr.h7
-rw-r--r--kooka/kocrbase.cpp20
-rw-r--r--kooka/kocrbase.h7
-rw-r--r--kooka/kocrgocr.cpp10
-rw-r--r--kooka/kocrgocr.h5
-rw-r--r--kooka/kocrkadmos.cpp20
-rw-r--r--kooka/kocrkadmos.h7
-rw-r--r--kooka/kocrocrad.cpp22
-rw-r--r--kooka/kocrocrad.h9
-rw-r--r--kooka/kooka.cpp52
-rw-r--r--kooka/kooka.h7
-rw-r--r--kooka/kookaimage.cpp20
-rw-r--r--kooka/kookaimage.h16
-rw-r--r--kooka/kookaimagemeta.cpp4
-rw-r--r--kooka/kookaimagemeta.h4
-rw-r--r--kooka/kookapref.cpp34
-rw-r--r--kooka/kookapref.h5
-rw-r--r--kooka/kookaprint.cpp18
-rw-r--r--kooka/kookaprint.h7
-rw-r--r--kooka/kookarc30
-rw-r--r--kooka/kookaview.cpp52
-rw-r--r--kooka/kookaview.h9
-rw-r--r--kooka/ksaneocr.cpp40
-rw-r--r--kooka/ksaneocr.h11
-rw-r--r--kooka/main.cpp8
-rw-r--r--kooka/ocrresedit.cpp16
-rw-r--r--kooka/ocrresedit.h9
-rw-r--r--kooka/ocrword.cpp10
-rw-r--r--kooka/ocrword.h6
-rw-r--r--kooka/resource.h6
-rw-r--r--kooka/scanpackager.cpp42
-rw-r--r--kooka/scanpackager.h9
-rw-r--r--kooka/thumbview.cpp16
-rw-r--r--kooka/thumbview.h7
-rw-r--r--kooka/thumbviewitem.cpp8
-rw-r--r--kooka/thumbviewitem.h6
-rw-r--r--kpdf/conf/dlgaccessibility.ui68
-rw-r--r--kpdf/conf/dlggeneral.ui34
-rw-r--r--kpdf/conf/dlggeneral.ui.h2
-rw-r--r--kpdf/conf/dlgperformance.ui52
-rw-r--r--kpdf/conf/dlgpresentation.ui46
-rw-r--r--kpdf/conf/preferencesdialog.cpp4
-rw-r--r--kpdf/conf/preferencesdialog.h2
-rw-r--r--kpdf/configure.in.in3
-rw-r--r--kpdf/core/document.cpp44
-rw-r--r--kpdf/core/document.h7
-rw-r--r--kpdf/core/generator.h2
-rw-r--r--kpdf/core/generator_pdf/generator_pdf.cpp58
-rw-r--r--kpdf/core/generator_pdf/generator_pdf.h4
-rw-r--r--kpdf/core/generator_pdf/gp_outputdev.cpp8
-rw-r--r--kpdf/core/generator_pdf/gp_outputdev.h4
-rw-r--r--kpdf/core/link.cpp6
-rw-r--r--kpdf/core/link.h2
-rw-r--r--kpdf/core/page.cpp20
-rw-r--r--kpdf/core/page.h4
-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.cpp76
-rw-r--r--kpdf/part.h8
-rw-r--r--kpdf/shell/shell.cpp16
-rw-r--r--kpdf/shell/shell.h1
-rw-r--r--kpdf/ui/minibar.cpp60
-rw-r--r--kpdf/ui/minibar.h3
-rw-r--r--kpdf/ui/pagepainter.cpp30
-rw-r--r--kpdf/ui/pageview.cpp254
-rw-r--r--kpdf/ui/pageview.h7
-rw-r--r--kpdf/ui/pageviewutils.cpp66
-rw-r--r--kpdf/ui/pageviewutils.h10
-rw-r--r--kpdf/ui/presentationwidget.cpp156
-rw-r--r--kpdf/ui/presentationwidget.h5
-rw-r--r--kpdf/ui/propertiesdialog.cpp30
-rw-r--r--kpdf/ui/propertiesdialog.h2
-rw-r--r--kpdf/ui/searchwidget.cpp20
-rw-r--r--kpdf/ui/searchwidget.h5
-rw-r--r--kpdf/ui/thumbnaillist.cpp40
-rw-r--r--kpdf/ui/thumbnaillist.h11
-rw-r--r--kpdf/ui/toc.cpp20
-rw-r--r--kpdf/ui/toc.h5
-rw-r--r--kpdf/xpdf/xpdf/GlobalParams.cc2
-rw-r--r--kpovmodeler/StyleConvention8
-rw-r--r--kpovmodeler/baseinsertrules.xml144
-rw-r--r--kpovmodeler/pm2dcontrolpoint.cpp2
-rw-r--r--kpovmodeler/pmactions.cpp48
-rw-r--r--kpovmodeler/pmactions.h9
-rw-r--r--kpovmodeler/pmaddcommand.cpp20
-rw-r--r--kpovmodeler/pmaddcommand.h10
-rw-r--r--kpovmodeler/pmbicubicpatch.cpp16
-rw-r--r--kpovmodeler/pmbicubicpatch.h4
-rw-r--r--kpovmodeler/pmbicubicpatchedit.cpp32
-rw-r--r--kpovmodeler/pmbicubicpatchedit.h5
-rw-r--r--kpovmodeler/pmblendmapmodifiers.cpp8
-rw-r--r--kpovmodeler/pmblendmapmodifiers.h4
-rw-r--r--kpovmodeler/pmblendmapmodifiersedit.cpp4
-rw-r--r--kpovmodeler/pmblendmapmodifiersedit.h5
-rw-r--r--kpovmodeler/pmblob.cpp8
-rw-r--r--kpovmodeler/pmblob.h4
-rw-r--r--kpovmodeler/pmblobcylinder.cpp8
-rw-r--r--kpovmodeler/pmblobcylinder.h4
-rw-r--r--kpovmodeler/pmblobcylinderedit.cpp12
-rw-r--r--kpovmodeler/pmblobcylinderedit.h5
-rw-r--r--kpovmodeler/pmblobedit.cpp4
-rw-r--r--kpovmodeler/pmblobedit.h5
-rw-r--r--kpovmodeler/pmblobsphere.cpp8
-rw-r--r--kpovmodeler/pmblobsphere.h4
-rw-r--r--kpovmodeler/pmblobsphereedit.cpp18
-rw-r--r--kpovmodeler/pmblobsphereedit.h5
-rw-r--r--kpovmodeler/pmboundedby.cpp8
-rw-r--r--kpovmodeler/pmboundedby.h4
-rw-r--r--kpovmodeler/pmboundedbyedit.cpp4
-rw-r--r--kpovmodeler/pmboundedbyedit.h5
-rw-r--r--kpovmodeler/pmbox.cpp8
-rw-r--r--kpovmodeler/pmbox.h4
-rw-r--r--kpovmodeler/pmboxedit.cpp4
-rw-r--r--kpovmodeler/pmboxedit.h5
-rw-r--r--kpovmodeler/pmbumpmap.cpp8
-rw-r--r--kpovmodeler/pmbumpmap.h4
-rw-r--r--kpovmodeler/pmbumpmapedit.cpp6
-rw-r--r--kpovmodeler/pmbumpmapedit.h5
-rw-r--r--kpovmodeler/pmcamera.cpp8
-rw-r--r--kpovmodeler/pmcamera.h4
-rw-r--r--kpovmodeler/pmcameraedit.cpp66
-rw-r--r--kpovmodeler/pmcameraedit.h5
-rw-r--r--kpovmodeler/pmclippedby.cpp8
-rw-r--r--kpovmodeler/pmclippedby.h4
-rw-r--r--kpovmodeler/pmclippedbyedit.cpp4
-rw-r--r--kpovmodeler/pmclippedbyedit.h5
-rw-r--r--kpovmodeler/pmcolor.cpp2
-rw-r--r--kpovmodeler/pmcolor.h4
-rw-r--r--kpovmodeler/pmcoloredit.cpp6
-rw-r--r--kpovmodeler/pmcoloredit.h5
-rw-r--r--kpovmodeler/pmcolorsettings.cpp84
-rw-r--r--kpovmodeler/pmcolorsettings.h3
-rw-r--r--kpovmodeler/pmcommand.h4
-rw-r--r--kpovmodeler/pmcommandmanager.cpp8
-rw-r--r--kpovmodeler/pmcommandmanager.h3
-rw-r--r--kpovmodeler/pmcomment.cpp8
-rw-r--r--kpovmodeler/pmcomment.h4
-rw-r--r--kpovmodeler/pmcommentedit.cpp8
-rw-r--r--kpovmodeler/pmcommentedit.h5
-rw-r--r--kpovmodeler/pmcompositeobject.cpp12
-rw-r--r--kpovmodeler/pmcompositeobject.h12
-rw-r--r--kpovmodeler/pmcone.cpp8
-rw-r--r--kpovmodeler/pmcone.h4
-rw-r--r--kpovmodeler/pmconeedit.cpp12
-rw-r--r--kpovmodeler/pmconeedit.h5
-rw-r--r--kpovmodeler/pmcsg.cpp8
-rw-r--r--kpovmodeler/pmcsg.h4
-rw-r--r--kpovmodeler/pmcsgedit.cpp14
-rw-r--r--kpovmodeler/pmcsgedit.h5
-rw-r--r--kpovmodeler/pmcylinder.cpp8
-rw-r--r--kpovmodeler/pmcylinder.h4
-rw-r--r--kpovmodeler/pmcylinderedit.cpp18
-rw-r--r--kpovmodeler/pmcylinderedit.h5
-rw-r--r--kpovmodeler/pmdatachangecommand.cpp2
-rw-r--r--kpovmodeler/pmdeclare.cpp14
-rw-r--r--kpovmodeler/pmdeclare.h4
-rw-r--r--kpovmodeler/pmdeclareedit.cpp24
-rw-r--r--kpovmodeler/pmdeclareedit.h5
-rw-r--r--kpovmodeler/pmdeletecommand.cpp46
-rw-r--r--kpovmodeler/pmdeletecommand.h8
-rw-r--r--kpovmodeler/pmdensity.cpp8
-rw-r--r--kpovmodeler/pmdensity.h4
-rw-r--r--kpovmodeler/pmdensityedit.cpp4
-rw-r--r--kpovmodeler/pmdensityedit.h5
-rw-r--r--kpovmodeler/pmdetailobject.cpp4
-rw-r--r--kpovmodeler/pmdetailobject.h2
-rw-r--r--kpovmodeler/pmdetailobjectedit.cpp14
-rw-r--r--kpovmodeler/pmdetailobjectedit.h5
-rw-r--r--kpovmodeler/pmdialogeditbase.cpp34
-rw-r--r--kpovmodeler/pmdialogeditbase.h13
-rw-r--r--kpovmodeler/pmdialogview.cpp20
-rw-r--r--kpovmodeler/pmdialogview.h12
-rw-r--r--kpovmodeler/pmdisc.cpp8
-rw-r--r--kpovmodeler/pmdisc.h4
-rw-r--r--kpovmodeler/pmdiscedit.cpp18
-rw-r--r--kpovmodeler/pmdiscedit.h5
-rw-r--r--kpovmodeler/pmdockwidget.cpp514
-rw-r--r--kpovmodeler/pmdockwidget.h133
-rw-r--r--kpovmodeler/pmdockwidget_private.cpp100
-rw-r--r--kpovmodeler/pmdockwidget_private.h19
-rw-r--r--kpovmodeler/pmdocumentationmap.cpp2
-rw-r--r--kpovmodeler/pmdragwidget.cpp4
-rw-r--r--kpovmodeler/pmdragwidget.h5
-rw-r--r--kpovmodeler/pmenumproperty.cpp6
-rw-r--r--kpovmodeler/pmerrordialog.cpp10
-rw-r--r--kpovmodeler/pmerrordialog.h5
-rw-r--r--kpovmodeler/pmfactory.cpp8
-rw-r--r--kpovmodeler/pmfactory.h5
-rw-r--r--kpovmodeler/pmfiledialog.cpp12
-rw-r--r--kpovmodeler/pmfiledialog.h7
-rw-r--r--kpovmodeler/pmfinish.cpp8
-rw-r--r--kpovmodeler/pmfinish.h4
-rw-r--r--kpovmodeler/pmfinishedit.cpp72
-rw-r--r--kpovmodeler/pmfinishedit.h5
-rw-r--r--kpovmodeler/pmfog.cpp8
-rw-r--r--kpovmodeler/pmfog.h4
-rw-r--r--kpovmodeler/pmfogedit.cpp4
-rw-r--r--kpovmodeler/pmfogedit.h5
-rw-r--r--kpovmodeler/pmformulalabel.cpp30
-rw-r--r--kpovmodeler/pmformulalabel.h12
-rw-r--r--kpovmodeler/pmglobalphotons.cpp8
-rw-r--r--kpovmodeler/pmglobalphotons.h4
-rw-r--r--kpovmodeler/pmglobalphotonsedit.cpp4
-rw-r--r--kpovmodeler/pmglobalphotonsedit.h5
-rw-r--r--kpovmodeler/pmglobalsettings.cpp8
-rw-r--r--kpovmodeler/pmglobalsettings.h4
-rw-r--r--kpovmodeler/pmglobalsettingsedit.cpp60
-rw-r--r--kpovmodeler/pmglobalsettingsedit.h5
-rw-r--r--kpovmodeler/pmglview.cpp114
-rw-r--r--kpovmodeler/pmglview.h18
-rw-r--r--kpovmodeler/pmgraphicalobject.cpp4
-rw-r--r--kpovmodeler/pmgraphicalobject.h6
-rw-r--r--kpovmodeler/pmgraphicalobjectedit.cpp10
-rw-r--r--kpovmodeler/pmgraphicalobjectedit.h5
-rw-r--r--kpovmodeler/pmgridsettings.cpp48
-rw-r--r--kpovmodeler/pmgridsettings.h3
-rw-r--r--kpovmodeler/pmheightfield.cpp8
-rw-r--r--kpovmodeler/pmheightfield.h4
-rw-r--r--kpovmodeler/pmheightfieldedit.cpp6
-rw-r--r--kpovmodeler/pmheightfieldedit.h5
-rw-r--r--kpovmodeler/pmheightfieldroam.cpp6
-rw-r--r--kpovmodeler/pmimagemap.cpp8
-rw-r--r--kpovmodeler/pmimagemap.h4
-rw-r--r--kpovmodeler/pmimagemapedit.cpp22
-rw-r--r--kpovmodeler/pmimagemapedit.h5
-rw-r--r--kpovmodeler/pminserterrordialog.cpp6
-rw-r--r--kpovmodeler/pminserterrordialog.h5
-rw-r--r--kpovmodeler/pminsertpopup.cpp8
-rw-r--r--kpovmodeler/pminsertpopup.h8
-rw-r--r--kpovmodeler/pminsertrules.dtd16
-rw-r--r--kpovmodeler/pminsertrulesystem.cpp100
-rw-r--r--kpovmodeler/pminsertrulesystem.h30
-rw-r--r--kpovmodeler/pminterior.cpp8
-rw-r--r--kpovmodeler/pminterior.h4
-rw-r--r--kpovmodeler/pminterioredit.cpp30
-rw-r--r--kpovmodeler/pminterioredit.h5
-rw-r--r--kpovmodeler/pminteriortexture.cpp8
-rw-r--r--kpovmodeler/pminteriortexture.h4
-rw-r--r--kpovmodeler/pminteriortextureedit.cpp4
-rw-r--r--kpovmodeler/pminteriortextureedit.h5
-rw-r--r--kpovmodeler/pmiomanager.cpp6
-rw-r--r--kpovmodeler/pmiomanager.h2
-rw-r--r--kpovmodeler/pmisosurface.cpp8
-rw-r--r--kpovmodeler/pmisosurface.h4
-rw-r--r--kpovmodeler/pmisosurfaceedit.cpp6
-rw-r--r--kpovmodeler/pmisosurfaceedit.h5
-rw-r--r--kpovmodeler/pmjuliafractal.cpp8
-rw-r--r--kpovmodeler/pmjuliafractal.h4
-rw-r--r--kpovmodeler/pmjuliafractaledit.cpp4
-rw-r--r--kpovmodeler/pmjuliafractaledit.h5
-rw-r--r--kpovmodeler/pmlathe.cpp16
-rw-r--r--kpovmodeler/pmlathe.h4
-rw-r--r--kpovmodeler/pmlatheedit.cpp4
-rw-r--r--kpovmodeler/pmlatheedit.h5
-rw-r--r--kpovmodeler/pmlayoutsettings.cpp36
-rw-r--r--kpovmodeler/pmlayoutsettings.h13
-rw-r--r--kpovmodeler/pmlibrarybrowser.cpp8
-rw-r--r--kpovmodeler/pmlibrarybrowser.h14
-rw-r--r--kpovmodeler/pmlibraryentrypreview.cpp22
-rw-r--r--kpovmodeler/pmlibraryentrypreview.h5
-rw-r--r--kpovmodeler/pmlibraryhandle.cpp10
-rw-r--r--kpovmodeler/pmlibraryhandle.h6
-rw-r--r--kpovmodeler/pmlibraryhandleedit.cpp4
-rw-r--r--kpovmodeler/pmlibraryhandleedit.h3
-rw-r--r--kpovmodeler/pmlibraryiconview.cpp34
-rw-r--r--kpovmodeler/pmlibraryiconview.h12
-rw-r--r--kpovmodeler/pmlibrarymanager.cpp2
-rw-r--r--kpovmodeler/pmlibrarymanager.h2
-rw-r--r--kpovmodeler/pmlibraryobject.cpp6
-rw-r--r--kpovmodeler/pmlibraryobjectsearch.cpp4
-rw-r--r--kpovmodeler/pmlibraryobjectsearch.h5
-rw-r--r--kpovmodeler/pmlight.cpp8
-rw-r--r--kpovmodeler/pmlight.h4
-rw-r--r--kpovmodeler/pmlightedit.cpp4
-rw-r--r--kpovmodeler/pmlightedit.h5
-rw-r--r--kpovmodeler/pmlightgroup.cpp8
-rw-r--r--kpovmodeler/pmlightgroup.h4
-rw-r--r--kpovmodeler/pmlightgroupedit.cpp12
-rw-r--r--kpovmodeler/pmlightgroupedit.h5
-rw-r--r--kpovmodeler/pmlineedits.cpp24
-rw-r--r--kpovmodeler/pmlineedits.h10
-rw-r--r--kpovmodeler/pmlinkedit.cpp20
-rw-r--r--kpovmodeler/pmlinkedit.h15
-rw-r--r--kpovmodeler/pmlistpattern.cpp32
-rw-r--r--kpovmodeler/pmlistpattern.h16
-rw-r--r--kpovmodeler/pmlistpatternedit.cpp38
-rw-r--r--kpovmodeler/pmlistpatternedit.h5
-rw-r--r--kpovmodeler/pmlookslike.cpp8
-rw-r--r--kpovmodeler/pmlookslike.h4
-rw-r--r--kpovmodeler/pmmaterial.cpp8
-rw-r--r--kpovmodeler/pmmaterial.h4
-rw-r--r--kpovmodeler/pmmaterialedit.cpp4
-rw-r--r--kpovmodeler/pmmaterialedit.h5
-rw-r--r--kpovmodeler/pmmaterialmap.cpp8
-rw-r--r--kpovmodeler/pmmaterialmap.h4
-rw-r--r--kpovmodeler/pmmaterialmapedit.cpp6
-rw-r--r--kpovmodeler/pmmaterialmapedit.h5
-rw-r--r--kpovmodeler/pmmedia.cpp8
-rw-r--r--kpovmodeler/pmmedia.h4
-rw-r--r--kpovmodeler/pmmediaedit.cpp4
-rw-r--r--kpovmodeler/pmmediaedit.h5
-rw-r--r--kpovmodeler/pmmemento.cpp2
-rw-r--r--kpovmodeler/pmmesh.cpp20
-rw-r--r--kpovmodeler/pmmesh.h4
-rw-r--r--kpovmodeler/pmmeshedit.cpp20
-rw-r--r--kpovmodeler/pmmeshedit.h5
-rw-r--r--kpovmodeler/pmmetaobject.h2
-rw-r--r--kpovmodeler/pmmovecommand.cpp84
-rw-r--r--kpovmodeler/pmmovecommand.h10
-rw-r--r--kpovmodeler/pmnamedobject.cpp4
-rw-r--r--kpovmodeler/pmnamedobject.h2
-rw-r--r--kpovmodeler/pmnamedobjectedit.cpp10
-rw-r--r--kpovmodeler/pmnamedobjectedit.h5
-rw-r--r--kpovmodeler/pmnormal.cpp8
-rw-r--r--kpovmodeler/pmnormal.h4
-rw-r--r--kpovmodeler/pmnormaledit.cpp4
-rw-r--r--kpovmodeler/pmnormaledit.h5
-rw-r--r--kpovmodeler/pmobject.cpp22
-rw-r--r--kpovmodeler/pmobject.h44
-rw-r--r--kpovmodeler/pmobjectdrag.cpp10
-rw-r--r--kpovmodeler/pmobjectdrag.h4
-rw-r--r--kpovmodeler/pmobjectlibrarysettings.cpp18
-rw-r--r--kpovmodeler/pmobjectlibrarysettings.h3
-rw-r--r--kpovmodeler/pmobjectlink.cpp10
-rw-r--r--kpovmodeler/pmobjectlink.h4
-rw-r--r--kpovmodeler/pmobjectlinkedit.cpp4
-rw-r--r--kpovmodeler/pmobjectlinkedit.h5
-rw-r--r--kpovmodeler/pmobjectselect.cpp40
-rw-r--r--kpovmodeler/pmobjectselect.h15
-rw-r--r--kpovmodeler/pmobjectsettings.cpp214
-rw-r--r--kpovmodeler/pmobjectsettings.h3
-rw-r--r--kpovmodeler/pmopenglsettings.cpp12
-rw-r--r--kpovmodeler/pmopenglsettings.h3
-rw-r--r--kpovmodeler/pmoutputdevice.cpp8
-rw-r--r--kpovmodeler/pmpalettevalueedit.cpp22
-rw-r--r--kpovmodeler/pmpalettevalueedit.h5
-rw-r--r--kpovmodeler/pmpalettevaluememento.cpp4
-rw-r--r--kpovmodeler/pmparser.cpp72
-rw-r--r--kpovmodeler/pmparser.h18
-rw-r--r--kpovmodeler/pmpart.cpp126
-rw-r--r--kpovmodeler/pmpart.h16
-rw-r--r--kpovmodeler/pmpattern.cpp8
-rw-r--r--kpovmodeler/pmpattern.h4
-rw-r--r--kpovmodeler/pmpatternedit.cpp58
-rw-r--r--kpovmodeler/pmpatternedit.h5
-rw-r--r--kpovmodeler/pmphotons.cpp8
-rw-r--r--kpovmodeler/pmphotons.h4
-rw-r--r--kpovmodeler/pmphotonsedit.cpp6
-rw-r--r--kpovmodeler/pmphotonsedit.h5
-rw-r--r--kpovmodeler/pmpigment.cpp8
-rw-r--r--kpovmodeler/pmpigment.h4
-rw-r--r--kpovmodeler/pmpigmentedit.cpp4
-rw-r--r--kpovmodeler/pmpigmentedit.h5
-rw-r--r--kpovmodeler/pmplane.cpp8
-rw-r--r--kpovmodeler/pmplane.h4
-rw-r--r--kpovmodeler/pmplaneedit.cpp26
-rw-r--r--kpovmodeler/pmplaneedit.h5
-rw-r--r--kpovmodeler/pmpluginmanager.cpp2
-rw-r--r--kpovmodeler/pmpluginsettings.cpp28
-rw-r--r--kpovmodeler/pmpluginsettings.h3
-rw-r--r--kpovmodeler/pmpolynom.cpp8
-rw-r--r--kpovmodeler/pmpolynom.h4
-rw-r--r--kpovmodeler/pmpolynomedit.cpp8
-rw-r--r--kpovmodeler/pmpolynomedit.h5
-rw-r--r--kpovmodeler/pmpovray31serialization.cpp342
-rw-r--r--kpovmodeler/pmpovray31serialization.h150
-rw-r--r--kpovmodeler/pmpovray35serialization.cpp104
-rw-r--r--kpovmodeler/pmpovray35serialization.h44
-rw-r--r--kpovmodeler/pmpovrayformat.cpp4
-rw-r--r--kpovmodeler/pmpovraymatrix.cpp8
-rw-r--r--kpovmodeler/pmpovraymatrix.h4
-rw-r--r--kpovmodeler/pmpovraymatrixedit.cpp4
-rw-r--r--kpovmodeler/pmpovraymatrixedit.h5
-rw-r--r--kpovmodeler/pmpovrayoutputwidget.cpp8
-rw-r--r--kpovmodeler/pmpovrayoutputwidget.h3
-rw-r--r--kpovmodeler/pmpovrayparser.cpp98
-rw-r--r--kpovmodeler/pmpovrayparser.h10
-rw-r--r--kpovmodeler/pmpovrayrenderwidget.cpp22
-rw-r--r--kpovmodeler/pmpovrayrenderwidget.h5
-rw-r--r--kpovmodeler/pmpovraysettings.cpp68
-rw-r--r--kpovmodeler/pmpovraysettings.h3
-rw-r--r--kpovmodeler/pmpovraywidget.cpp30
-rw-r--r--kpovmodeler/pmpovraywidget.h5
-rw-r--r--kpovmodeler/pmpreviewsettings.cpp62
-rw-r--r--kpovmodeler/pmpreviewsettings.h3
-rw-r--r--kpovmodeler/pmprism.cpp12
-rw-r--r--kpovmodeler/pmprism.h4
-rw-r--r--kpovmodeler/pmprismedit.cpp20
-rw-r--r--kpovmodeler/pmprismedit.h5
-rw-r--r--kpovmodeler/pmprismmemento.cpp2
-rw-r--r--kpovmodeler/pmprojectedthrough.cpp8
-rw-r--r--kpovmodeler/pmprojectedthrough.h4
-rw-r--r--kpovmodeler/pmprototypemanager.cpp40
-rw-r--r--kpovmodeler/pmprototypemanager.h4
-rw-r--r--kpovmodeler/pmquickcolor.cpp8
-rw-r--r--kpovmodeler/pmquickcolor.h8
-rw-r--r--kpovmodeler/pmquickcoloredit.cpp10
-rw-r--r--kpovmodeler/pmquickcoloredit.h9
-rw-r--r--kpovmodeler/pmradiosity.cpp8
-rw-r--r--kpovmodeler/pmradiosity.h4
-rw-r--r--kpovmodeler/pmradiosityedit.cpp4
-rw-r--r--kpovmodeler/pmradiosityedit.h5
-rw-r--r--kpovmodeler/pmrainbow.cpp8
-rw-r--r--kpovmodeler/pmrainbow.h4
-rw-r--r--kpovmodeler/pmrainbowedit.cpp4
-rw-r--r--kpovmodeler/pmrainbowedit.h5
-rw-r--r--kpovmodeler/pmraw.cpp8
-rw-r--r--kpovmodeler/pmraw.h4
-rw-r--r--kpovmodeler/pmrawedit.cpp8
-rw-r--r--kpovmodeler/pmrawedit.h5
-rw-r--r--kpovmodeler/pmrecursiveobjectiterator.cpp2
-rw-r--r--kpovmodeler/pmrendermanager.cpp70
-rw-r--r--kpovmodeler/pmrendermanager.h3
-rw-r--r--kpovmodeler/pmrendermode.cpp18
-rw-r--r--kpovmodeler/pmrendermode.h2
-rw-r--r--kpovmodeler/pmrendermodesdialog.cpp8
-rw-r--r--kpovmodeler/pmrendermodesdialog.h6
-rw-r--r--kpovmodeler/pmresourcelocator.cpp6
-rw-r--r--kpovmodeler/pmrotate.cpp8
-rw-r--r--kpovmodeler/pmrotate.h4
-rw-r--r--kpovmodeler/pmrotateedit.cpp4
-rw-r--r--kpovmodeler/pmrotateedit.h5
-rw-r--r--kpovmodeler/pmscale.cpp8
-rw-r--r--kpovmodeler/pmscale.h4
-rw-r--r--kpovmodeler/pmscaleedit.cpp4
-rw-r--r--kpovmodeler/pmscaleedit.h5
-rw-r--r--kpovmodeler/pmscanner.cpp20
-rw-r--r--kpovmodeler/pmscanner.h8
-rw-r--r--kpovmodeler/pmscene.cpp4
-rw-r--r--kpovmodeler/pmscene.h4
-rw-r--r--kpovmodeler/pmserializer.cpp4
-rw-r--r--kpovmodeler/pmsettingsdialog.cpp20
-rw-r--r--kpovmodeler/pmsettingsdialog.h12
-rw-r--r--kpovmodeler/pmshell.cpp82
-rw-r--r--kpovmodeler/pmshell.h7
-rw-r--r--kpovmodeler/pmskysphere.cpp8
-rw-r--r--kpovmodeler/pmskysphere.h4
-rw-r--r--kpovmodeler/pmskysphereedit.cpp4
-rw-r--r--kpovmodeler/pmskysphereedit.h5
-rw-r--r--kpovmodeler/pmslope.cpp8
-rw-r--r--kpovmodeler/pmslope.h4
-rw-r--r--kpovmodeler/pmslopeedit.cpp4
-rw-r--r--kpovmodeler/pmslopeedit.h5
-rw-r--r--kpovmodeler/pmsolidcolor.cpp8
-rw-r--r--kpovmodeler/pmsolidcolor.h4
-rw-r--r--kpovmodeler/pmsolidcoloredit.cpp10
-rw-r--r--kpovmodeler/pmsolidcoloredit.h5
-rw-r--r--kpovmodeler/pmsolidobject.cpp4
-rw-r--r--kpovmodeler/pmsolidobject.h4
-rw-r--r--kpovmodeler/pmsolidobjectedit.cpp4
-rw-r--r--kpovmodeler/pmsolidobjectedit.h5
-rw-r--r--kpovmodeler/pmsor.cpp12
-rw-r--r--kpovmodeler/pmsor.h4
-rw-r--r--kpovmodeler/pmsoredit.cpp6
-rw-r--r--kpovmodeler/pmsoredit.h5
-rw-r--r--kpovmodeler/pmsphere.cpp8
-rw-r--r--kpovmodeler/pmsphere.h4
-rw-r--r--kpovmodeler/pmsphereedit.cpp20
-rw-r--r--kpovmodeler/pmsphereedit.h5
-rw-r--r--kpovmodeler/pmspheresweep.cpp18
-rw-r--r--kpovmodeler/pmspheresweep.h4
-rw-r--r--kpovmodeler/pmspheresweepedit.cpp4
-rw-r--r--kpovmodeler/pmspheresweepedit.h5
-rw-r--r--kpovmodeler/pmsplinememento.cpp2
-rw-r--r--kpovmodeler/pmsqe.cpp8
-rw-r--r--kpovmodeler/pmsqe.h10
-rw-r--r--kpovmodeler/pmsqeedit.cpp4
-rw-r--r--kpovmodeler/pmsqeedit.h9
-rw-r--r--kpovmodeler/pmsymboltable.cpp6
-rw-r--r--kpovmodeler/pmtext.cpp8
-rw-r--r--kpovmodeler/pmtext.h4
-rw-r--r--kpovmodeler/pmtextedit.cpp6
-rw-r--r--kpovmodeler/pmtextedit.h5
-rw-r--r--kpovmodeler/pmtexture.cpp8
-rw-r--r--kpovmodeler/pmtexture.h4
-rw-r--r--kpovmodeler/pmtexturebase.cpp6
-rw-r--r--kpovmodeler/pmtexturebase.h2
-rw-r--r--kpovmodeler/pmtexturebaseedit.cpp4
-rw-r--r--kpovmodeler/pmtexturebaseedit.h5
-rw-r--r--kpovmodeler/pmtextureedit.cpp4
-rw-r--r--kpovmodeler/pmtextureedit.h5
-rw-r--r--kpovmodeler/pmtexturemap.cpp34
-rw-r--r--kpovmodeler/pmtexturemap.h16
-rw-r--r--kpovmodeler/pmtexturemapedit.cpp4
-rw-r--r--kpovmodeler/pmtexturemapedit.h5
-rw-r--r--kpovmodeler/pmtokens.h16
-rw-r--r--kpovmodeler/pmtorus.cpp8
-rw-r--r--kpovmodeler/pmtorus.h4
-rw-r--r--kpovmodeler/pmtorusedit.cpp4
-rw-r--r--kpovmodeler/pmtorusedit.h5
-rw-r--r--kpovmodeler/pmtranslate.cpp8
-rw-r--r--kpovmodeler/pmtranslate.h4
-rw-r--r--kpovmodeler/pmtranslateedit.cpp4
-rw-r--r--kpovmodeler/pmtranslateedit.h5
-rw-r--r--kpovmodeler/pmtreeview.cpp84
-rw-r--r--kpovmodeler/pmtreeview.h13
-rw-r--r--kpovmodeler/pmtreeviewitem.cpp30
-rw-r--r--kpovmodeler/pmtreeviewitem.h32
-rw-r--r--kpovmodeler/pmtriangle.cpp8
-rw-r--r--kpovmodeler/pmtriangle.h4
-rw-r--r--kpovmodeler/pmtriangleedit.cpp10
-rw-r--r--kpovmodeler/pmtriangleedit.h5
-rw-r--r--kpovmodeler/pmtruetypecache.cpp6
-rw-r--r--kpovmodeler/pmunknownview.cpp8
-rw-r--r--kpovmodeler/pmunknownview.h2
-rw-r--r--kpovmodeler/pmvariant.cpp6
-rw-r--r--kpovmodeler/pmvector.cpp2
-rw-r--r--kpovmodeler/pmvectoredit.cpp90
-rw-r--r--kpovmodeler/pmvectoredit.h11
-rw-r--r--kpovmodeler/pmvectorlistedit.cpp32
-rw-r--r--kpovmodeler/pmvectorlistedit.h17
-rw-r--r--kpovmodeler/pmview.cpp10
-rw-r--r--kpovmodeler/pmview.h7
-rw-r--r--kpovmodeler/pmviewbase.h16
-rw-r--r--kpovmodeler/pmviewfactory.cpp10
-rw-r--r--kpovmodeler/pmviewfactory.h4
-rw-r--r--kpovmodeler/pmviewlayoutmanager.cpp38
-rw-r--r--kpovmodeler/pmviewlayoutmanager.h49
-rw-r--r--kpovmodeler/pmwarp.cpp8
-rw-r--r--kpovmodeler/pmwarp.h4
-rw-r--r--kpovmodeler/pmwarpedit.cpp6
-rw-r--r--kpovmodeler/pmwarpedit.h5
-rw-r--r--kpovmodeler/pmxmlhelper.h4
-rw-r--r--kpovmodeler/pmxmlparser.cpp6
-rw-r--r--kpovmodeler/pmxmlparser.h6
-rw-r--r--kruler/klineal.cpp26
-rw-r--r--kruler/klineal.h3
-rw-r--r--ksnapshot/ksnapshot.cpp64
-rw-r--r--ksnapshot/ksnapshot.h24
-rw-r--r--ksnapshot/ksnapshotwidget.ui38
-rw-r--r--ksnapshot/ksnapshotwidget.ui.h8
-rw-r--r--ksnapshot/regiongrabber.cpp22
-rw-r--r--ksnapshot/regiongrabber.h7
-rw-r--r--ksnapshot/windowgrabber.cpp98
-rw-r--r--ksnapshot/windowgrabber.h3
-rw-r--r--ksvg/configure.in.in2
-rw-r--r--ksvg/core/CanvasFactory.cpp2
-rw-r--r--ksvg/core/CanvasItems.cpp32
-rw-r--r--ksvg/core/CanvasItems.h8
-rw-r--r--ksvg/core/KSVGCanvas.cpp86
-rw-r--r--ksvg/core/KSVGCanvas.h7
-rw-r--r--ksvg/core/KSVGHelper.h4
-rw-r--r--ksvg/core/KSVGLoader.cpp18
-rw-r--r--ksvg/core/KSVGLoader.h3
-rw-r--r--ksvg/core/KSVGReader.cc52
-rw-r--r--ksvg/core/KSVGReader.h3
-rw-r--r--ksvg/data/SVGEcma.lut.h4
-rw-r--r--ksvg/data/SVGGlyphElementImpl.lut.h2
-rw-r--r--ksvg/data/SVGMaskElementImpl.lut.h4
-rw-r--r--ksvg/data/SVGPathSegImpl.lut.h16
-rw-r--r--ksvg/data/SVGStylableImpl.lut.h4
-rw-r--r--ksvg/dom/SVGCircleElement.h2
-rw-r--r--ksvg/dom/SVGElementInstance.cc4
-rw-r--r--ksvg/dom/SVGElementInstance.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.h4
-rw-r--r--ksvg/dom/SVGMaskElement.cc8
-rw-r--r--ksvg/dom/SVGMaskElement.h4
-rw-r--r--ksvg/dom/SVGPathSeg.h8
-rw-r--r--ksvg/dom/SVGPolygonElement.h6
-rw-r--r--ksvg/dom/SVGPolylineElement.h6
-rw-r--r--ksvg/dom/SVGRectElement.h6
-rw-r--r--ksvg/dom/SVGSVGElement.h10
-rw-r--r--ksvg/dom/SVGTextElement.h6
-rw-r--r--ksvg/ecma/ksvg_ecma.cpp18
-rw-r--r--ksvg/ecma/ksvg_helper.cpp4
-rw-r--r--ksvg/ecma/ksvg_lookup.h22
-rw-r--r--ksvg/ecma/ksvg_window.cpp40
-rw-r--r--ksvg/ecma/ksvg_window.h17
-rw-r--r--ksvg/impl/LRUCache.h12
-rw-r--r--ksvg/impl/SVGAnimateElementImpl.cc2
-rw-r--r--ksvg/impl/SVGAnimateMotionElementImpl.cc2
-rw-r--r--ksvg/impl/SVGAnimateTransformElementImpl.cc4
-rw-r--r--ksvg/impl/SVGAnimatedPointsImpl.cc8
-rw-r--r--ksvg/impl/SVGAnimationElementImpl.cc38
-rw-r--r--ksvg/impl/SVGColorImpl.cc4
-rw-r--r--ksvg/impl/SVGColorProfileElementImpl.cc12
-rw-r--r--ksvg/impl/SVGColorProfileElementImpl.h2
-rw-r--r--ksvg/impl/SVGContainerImpl.cc36
-rw-r--r--ksvg/impl/SVGContainerImpl.h2
-rw-r--r--ksvg/impl/SVGDocumentImpl.cc22
-rw-r--r--ksvg/impl/SVGDocumentImpl.h5
-rw-r--r--ksvg/impl/SVGEcma.cc30
-rw-r--r--ksvg/impl/SVGElementImpl.cc14
-rw-r--r--ksvg/impl/SVGElementInstanceImpl.cc2
-rw-r--r--ksvg/impl/SVGElementInstanceImpl.h2
-rw-r--r--ksvg/impl/SVGEventImpl.cc106
-rw-r--r--ksvg/impl/SVGFitToViewBoxImpl.cc2
-rw-r--r--ksvg/impl/SVGGlyphElementImpl.cc4
-rw-r--r--ksvg/impl/SVGHelperImpl.cc10
-rw-r--r--ksvg/impl/SVGImageElementImpl.cc18
-rw-r--r--ksvg/impl/SVGImageElementImpl.h3
-rw-r--r--ksvg/impl/SVGLangSpaceImpl.cc12
-rw-r--r--ksvg/impl/SVGLengthImpl.cc12
-rw-r--r--ksvg/impl/SVGLocatableImpl.cc26
-rw-r--r--ksvg/impl/SVGLocatableImpl.h6
-rw-r--r--ksvg/impl/SVGMarkerElementImpl.cc12
-rw-r--r--ksvg/impl/SVGMaskElementImpl.cc156
-rw-r--r--ksvg/impl/SVGMaskElementImpl.h26
-rw-r--r--ksvg/impl/SVGPathElementImpl.cc8
-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.h8
-rw-r--r--ksvg/impl/SVGPathSegCurvetoQuadraticSmoothImpl.h8
-rw-r--r--ksvg/impl/SVGPathSegImpl.cc8
-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.cc16
-rw-r--r--ksvg/impl/SVGSVGElementImpl.cc42
-rw-r--r--ksvg/impl/SVGSVGElementImpl.h2
-rw-r--r--ksvg/impl/SVGScriptElementImpl.cc2
-rw-r--r--ksvg/impl/SVGScriptElementImpl.h1
-rw-r--r--ksvg/impl/SVGShapeImpl.cc10
-rw-r--r--ksvg/impl/SVGShapeImpl.h2
-rw-r--r--ksvg/impl/SVGStylableImpl.cc210
-rw-r--r--ksvg/impl/SVGStylableImpl.h6
-rw-r--r--ksvg/impl/SVGSwitchElementImpl.cc4
-rw-r--r--ksvg/impl/SVGTextContentElementImpl.cc2
-rw-r--r--ksvg/impl/SVGTextContentElementImpl.h2
-rw-r--r--ksvg/impl/SVGTextElementImpl.cc2
-rw-r--r--ksvg/impl/SVGTextPathElementImpl.cc4
-rw-r--r--ksvg/impl/SVGTextPathElementImpl.h2
-rw-r--r--ksvg/impl/SVGTimeScheduler.cc8
-rw-r--r--ksvg/impl/SVGTimeScheduler.h3
-rw-r--r--ksvg/impl/SVGTransformableImpl.cc16
-rw-r--r--ksvg/impl/SVGURIReferenceImpl.cc10
-rw-r--r--ksvg/impl/SVGUnitConverter.h4
-rw-r--r--ksvg/impl/SVGUseElementImpl.cc52
-rw-r--r--ksvg/impl/SVGUseElementImpl.h2
-rw-r--r--ksvg/impl/SVGWindowImpl.cc4
-rw-r--r--ksvg/impl/generateddata.cpp2
-rw-r--r--ksvg/impl/libs/art_support/art_misc.c110
-rw-r--r--ksvg/impl/libs/art_support/art_misc.h4
-rw-r--r--ksvg/impl/libs/art_support/art_rgba_svp.c58
-rw-r--r--ksvg/impl/libs/art_support/art_rgba_svp.h6
-rw-r--r--ksvg/impl/libs/libtext2path/libtext2path.spec4
-rw-r--r--ksvg/impl/libs/libtext2path/src/Cache.h2
-rw-r--r--ksvg/impl/libs/libtext2path/src/Converter.cpp36
-rw-r--r--ksvg/impl/libs/libtext2path/src/Font.cpp6
-rw-r--r--ksvg/impl/libs/libtext2path/src/Glyph.cpp9
-rw-r--r--ksvg/impl/libs/libtext2path/src/Glyph.h6
-rw-r--r--ksvg/impl/libs/libtext2path/src/QtUnicode.cpp12
-rw-r--r--ksvg/impl/libs/libtext2path/src/QtUnicode.h4
-rw-r--r--ksvg/impl/libs/libtext2path/src/myboost/shared_ptr.hpp2
-rw-r--r--ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib-drawable.c14
-rw-r--r--ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.h4
-rw-r--r--ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlibrgb.c2
-rw-r--r--ksvg/impl/svgpathparser.cc2
-rw-r--r--ksvg/plugin/backends/agg/AggCanvasFactory.h2
-rw-r--r--ksvg/plugin/backends/agg/AggCanvasItems.cpp36
-rw-r--r--ksvg/plugin/backends/agg/AggCanvasItems.h10
-rw-r--r--ksvg/plugin/backends/libart/LibartCanvas.cpp50
-rw-r--r--ksvg/plugin/backends/libart/LibartCanvas.h2
-rw-r--r--ksvg/plugin/backends/libart/LibartCanvasFactory.h2
-rw-r--r--ksvg/plugin/backends/libart/LibartCanvasItems.cpp142
-rw-r--r--ksvg/plugin/backends/libart/LibartCanvasItems.h20
-rw-r--r--ksvg/plugin/ksvg_factory.cpp10
-rw-r--r--ksvg/plugin/ksvg_factory.h8
-rw-r--r--ksvg/plugin/ksvg_plugin.cpp14
-rw-r--r--ksvg/plugin/ksvg_plugin.h3
-rw-r--r--ksvg/plugin/ksvg_widget.cpp28
-rw-r--r--ksvg/plugin/ksvg_widget.h5
-rw-r--r--ksvg/plugin/svgcreator.cpp4
-rw-r--r--ksvg/plugin/svgcreator.h1
-rwxr-xr-xksvg/scripts/check_hashtablesize.pl12
-rwxr-xr-xksvg/scripts/generate.pl2
-rw-r--r--ksvg/test/W3C_TESTSUITE_1.126
-rw-r--r--ksvg/test/ZVON-TEST-PASSED36
-rw-r--r--ksvg/test/ecma/bbox/bbox.js14
-rw-r--r--ksvg/test/external/SVGTestWidget.cc20
-rw-r--r--ksvg/test/external/SVGTestWidget.h3
-rw-r--r--ksvg/test/external/printnodetest.h3
-rw-r--r--kuickshow/kuickshow.spec6
-rw-r--r--kuickshow/src/aboutwidget.cpp18
-rw-r--r--kuickshow/src/aboutwidget.h5
-rw-r--r--kuickshow/src/defaultswidget.cpp14
-rw-r--r--kuickshow/src/defaultswidget.h5
-rw-r--r--kuickshow/src/filecache.cpp6
-rw-r--r--kuickshow/src/filecache.h2
-rw-r--r--kuickshow/src/filefinder.cpp8
-rw-r--r--kuickshow/src/filefinder.h3
-rw-r--r--kuickshow/src/filewidget.cpp20
-rw-r--r--kuickshow/src/filewidget.h5
-rw-r--r--kuickshow/src/generalwidget.cpp22
-rw-r--r--kuickshow/src/generalwidget.h5
-rw-r--r--kuickshow/src/imagewindow.cpp114
-rw-r--r--kuickshow/src/imagewindow.h7
-rw-r--r--kuickshow/src/imlibwidget.cpp50
-rw-r--r--kuickshow/src/imlibwidget.h24
-rw-r--r--kuickshow/src/kuickconfigdlg.cpp4
-rw-r--r--kuickshow/src/kuickconfigdlg.h3
-rw-r--r--kuickshow/src/kuickdata.cpp4
-rw-r--r--kuickshow/src/kuickfile.cpp18
-rw-r--r--kuickshow/src/kuickfile.h7
-rw-r--r--kuickshow/src/kuickimage.cpp62
-rw-r--r--kuickshow/src/kuickimage.h7
-rw-r--r--kuickshow/src/kuickshow.cpp60
-rw-r--r--kuickshow/src/kuickshow.h7
-rw-r--r--kuickshow/src/kurlwidget.cpp4
-rw-r--r--kuickshow/src/kurlwidget.h1
-rw-r--r--kuickshow/src/mainwidget.cpp6
-rw-r--r--kuickshow/src/mainwidget.h5
-rw-r--r--kuickshow/src/printing.cpp58
-rw-r--r--kuickshow/src/printing.h7
-rw-r--r--kuickshow/src/slideshowwidget.cpp18
-rw-r--r--kuickshow/src/slideshowwidget.h5
-rw-r--r--kview/config/kviewconfmodules.cpp10
-rw-r--r--kview/config/kviewconfmodules.h3
-rw-r--r--kview/config/plugins/kviewpluginsconfig.cpp6
-rw-r--r--kview/config/plugins/kviewpluginsconfig.h3
-rw-r--r--kview/kimageviewer/canvas.h6
-rw-r--r--kview/kimageviewer/viewer.cpp4
-rw-r--r--kview/kimageviewer/viewer.h3
-rw-r--r--kview/kview.cpp72
-rw-r--r--kview/kview.h1
-rw-r--r--kview/kviewcanvas/config/confmodules.cpp8
-rw-r--r--kview/kviewcanvas/config/confmodules.h3
-rw-r--r--kview/kviewcanvas/config/defaults.h2
-rw-r--r--kview/kviewcanvas/config/generalconfigwidget.ui34
-rw-r--r--kview/kviewcanvas/kimagecanvas.cpp20
-rw-r--r--kview/kviewcanvas/kimagecanvas.h3
-rw-r--r--kview/kviewcanvas/kimageholder.cpp32
-rw-r--r--kview/kviewcanvas/kimageholder.h7
-rw-r--r--kview/kviewcanvas/test/test.cpp2
-rw-r--r--kview/kviewcanvas/test/test.h1
-rw-r--r--kview/kviewviewer/config/kviewviewerpluginsconfig.cpp6
-rw-r--r--kview/kviewviewer/config/kviewviewerpluginsconfig.h3
-rw-r--r--kview/kviewviewer/imagesettings.cpp12
-rw-r--r--kview/kviewviewer/imagesettings.h3
-rw-r--r--kview/kviewviewer/kviewkonqextension.cpp10
-rw-r--r--kview/kviewviewer/kviewkonqextension.h3
-rw-r--r--kview/kviewviewer/kviewviewer.cpp64
-rw-r--r--kview/kviewviewer/kviewviewer.h5
-rw-r--r--kview/kviewviewer/printimagesettings.ui38
-rw-r--r--kview/kviewviewer/test/test.h1
-rw-r--r--kview/modules/browser/kviewbrowser.cpp8
-rw-r--r--kview/modules/browser/kviewbrowser.h3
-rw-r--r--kview/modules/effects/kvieweffects.cpp6
-rw-r--r--kview/modules/effects/kvieweffects.h3
-rw-r--r--kview/modules/presenter/config/kviewpresenterconfig.cpp8
-rw-r--r--kview/modules/presenter/config/kviewpresenterconfig.h3
-rw-r--r--kview/modules/presenter/imagelistdialog.ui22
-rw-r--r--kview/modules/presenter/imagelistdialog.ui.h2
-rw-r--r--kview/modules/presenter/imagelistitem.cpp12
-rw-r--r--kview/modules/presenter/imagelistitem.h2
-rw-r--r--kview/modules/presenter/kviewpresenter.cpp42
-rw-r--r--kview/modules/presenter/kviewpresenter.h3
-rw-r--r--kview/modules/presenter/kviewpresenterconfmodule.cpp8
-rw-r--r--kview/modules/presenter/kviewpresenterconfmodule.h3
-rw-r--r--kview/modules/scale/kfloatspinbox.cpp8
-rw-r--r--kview/modules/scale/kfloatspinbox.h5
-rw-r--r--kview/modules/scale/kview_scale.cpp42
-rw-r--r--kview/modules/scale/kview_scale.h3
-rw-r--r--kview/modules/scale/scaledlg.cpp42
-rw-r--r--kview/modules/scale/scaledlg.h5
-rw-r--r--kview/modules/scanner/kviewscanner.cpp6
-rw-r--r--kview/modules/scanner/kviewscanner.h3
-rw-r--r--kview/modules/template/kviewtemplate.cpp6
-rw-r--r--kview/modules/template/kviewtemplate.h3
-rw-r--r--kview/photobook/photobook.cpp28
-rw-r--r--kview/photobook/photobook.h17
-rw-r--r--kviewshell/anchor.h2
-rw-r--r--kviewshell/documentPageCache.cpp8
-rw-r--r--kviewshell/documentPageCache.h5
-rw-r--r--kviewshell/documentRenderer.cpp4
-rw-r--r--kviewshell/documentRenderer.h17
-rw-r--r--kviewshell/documentWidget.cpp64
-rw-r--r--kviewshell/documentWidget.h13
-rw-r--r--kviewshell/emptyRenderer.cpp4
-rw-r--r--kviewshell/emptyRenderer.h3
-rw-r--r--kviewshell/empty_multipage.cpp4
-rw-r--r--kviewshell/empty_multipage.h5
-rw-r--r--kviewshell/history.cpp4
-rw-r--r--kviewshell/history.h11
-rw-r--r--kviewshell/hyperlink.h4
-rw-r--r--kviewshell/kmultipage.cpp142
-rw-r--r--kviewshell/kmultipage.h23
-rw-r--r--kviewshell/kprintDialogPage_pageoptions.cpp8
-rw-r--r--kviewshell/kprintDialogPage_pageoptions.h2
-rw-r--r--kviewshell/kviewpart.cpp160
-rw-r--r--kviewshell/kviewpart.h6
-rw-r--r--kviewshell/kviewpart_iface.h5
-rw-r--r--kviewshell/kviewshell.cpp24
-rw-r--r--kviewshell/kviewshell.h3
-rw-r--r--kviewshell/main.cpp6
-rw-r--r--kviewshell/marklist.cpp56
-rw-r--r--kviewshell/marklist.h19
-rw-r--r--kviewshell/optionDialogAccessibilityWidget.ui60
-rw-r--r--kviewshell/optionDialogGUIWidget_base.ui20
-rw-r--r--kviewshell/pageNumber.h16
-rw-r--r--kviewshell/pageSize.cpp12
-rw-r--r--kviewshell/pageSize.h7
-rw-r--r--kviewshell/pageSizeDialog.cpp6
-rw-r--r--kviewshell/pageSizeDialog.h3
-rw-r--r--kviewshell/pageSizeWidget.cpp16
-rw-r--r--kviewshell/pageSizeWidget.h3
-rw-r--r--kviewshell/pageSizeWidget_base.ui24
-rw-r--r--kviewshell/pageView.cpp102
-rw-r--r--kviewshell/pageView.h23
-rw-r--r--kviewshell/plugins/djvu/djvumultipage.cpp30
-rw-r--r--kviewshell/plugins/djvu/djvumultipage.h3
-rw-r--r--kviewshell/plugins/djvu/djvurenderer.cpp62
-rw-r--r--kviewshell/plugins/djvu/djvurenderer.h5
-rw-r--r--kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.cpp6
-rw-r--r--kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.h2
-rw-r--r--kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions_basewidget.ui14
-rw-r--r--kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp8
-rw-r--r--kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.h2
-rw-r--r--kviewshell/plugins/djvu/libdjvu/Arrays.cpp2
-rw-r--r--kviewshell/plugins/djvu/libdjvu/Arrays.h2
-rw-r--r--kviewshell/plugins/djvu/libdjvu/BSEncodeByteStream.cpp16
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DataPool.cpp14
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DataPool.h2
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVmDir.cpp28
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVmDir0.cpp2
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVmDoc.cpp24
-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.cpp126
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.h2
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVuDocument.cpp14
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVuDocument.h2
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVuDumpHelper.cpp2
-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.cpp40
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVuFile.h12
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVuGlobal.cpp18
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVuGlobal.h2
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVuImage.cpp40
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVuImage.h18
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVuMessage.cpp12
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVuMessageLite.cpp10
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVuNavDir.cpp6
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVuPalette.cpp14
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVuPalette.h12
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVuPort.cpp48
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVuPort.h22
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVuText.cpp128
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVuText.h20
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVuToPS.cpp92
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVuToPS.h4
-rw-r--r--kviewshell/plugins/djvu/libdjvu/GBitmap.cpp28
-rw-r--r--kviewshell/plugins/djvu/libdjvu/GBitmap.h4
-rw-r--r--kviewshell/plugins/djvu/libdjvu/GContainer.cpp2
-rw-r--r--kviewshell/plugins/djvu/libdjvu/GContainer.h16
-rw-r--r--kviewshell/plugins/djvu/libdjvu/GIFFManager.cpp42
-rw-r--r--kviewshell/plugins/djvu/libdjvu/GIFFManager.h14
-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/GOS.cpp6
-rw-r--r--kviewshell/plugins/djvu/libdjvu/GPixmap.h4
-rw-r--r--kviewshell/plugins/djvu/libdjvu/GRect.cpp2
-rw-r--r--kviewshell/plugins/djvu/libdjvu/GRect.h10
-rw-r--r--kviewshell/plugins/djvu/libdjvu/GSmartPointer.cpp2
-rw-r--r--kviewshell/plugins/djvu/libdjvu/GSmartPointer.h2
-rw-r--r--kviewshell/plugins/djvu/libdjvu/GString.cpp10
-rw-r--r--kviewshell/plugins/djvu/libdjvu/GString.h16
-rw-r--r--kviewshell/plugins/djvu/libdjvu/GThreads.cpp26
-rw-r--r--kviewshell/plugins/djvu/libdjvu/GThreads.h58
-rw-r--r--kviewshell/plugins/djvu/libdjvu/GURL.h2
-rw-r--r--kviewshell/plugins/djvu/libdjvu/IFFByteStream.cpp2
-rw-r--r--kviewshell/plugins/djvu/libdjvu/IW44EncodeCodec.cpp90
-rw-r--r--kviewshell/plugins/djvu/libdjvu/IW44Image.cpp4
-rw-r--r--kviewshell/plugins/djvu/libdjvu/IW44Image.h22
-rw-r--r--kviewshell/plugins/djvu/libdjvu/JB2EncodeCodec.cpp138
-rw-r--r--kviewshell/plugins/djvu/libdjvu/JB2Image.cpp192
-rw-r--r--kviewshell/plugins/djvu/libdjvu/JB2Image.h188
-rw-r--r--kviewshell/plugins/djvu/libdjvu/MMRDecoder.cpp16
-rw-r--r--kviewshell/plugins/djvu/libdjvu/MMRDecoder.h4
-rw-r--r--kviewshell/plugins/djvu/libdjvu/XMLParser.cpp130
-rw-r--r--kviewshell/plugins/djvu/libdjvu/XMLTags.cpp6
-rw-r--r--kviewshell/plugins/djvu/libdjvu/XMLTags.h6
-rw-r--r--kviewshell/plugins/djvu/libdjvu/ZPCodec.h4
-rw-r--r--kviewshell/plugins/djvu/libdjvu/configure.in.in9
-rw-r--r--kviewshell/plugins/djvu/pageRangeWidget.cpp2
-rw-r--r--kviewshell/plugins/djvu/pageRangeWidget.h7
-rw-r--r--kviewshell/plugins/djvu/pageRangeWidget_base.ui8
-rw-r--r--kviewshell/renderedDocumentPage.cpp14
-rw-r--r--kviewshell/renderedDocumentPage.h9
-rw-r--r--kviewshell/renderedDocumentPagePixmap.cpp6
-rw-r--r--kviewshell/renderedDocumentPagePixmap.h3
-rw-r--r--kviewshell/searchWidget.cpp26
-rw-r--r--kviewshell/searchWidget.h7
-rw-r--r--kviewshell/selection.cpp16
-rw-r--r--kviewshell/selection.h10
-rw-r--r--kviewshell/simplePageSize.cpp6
-rw-r--r--kviewshell/simplePageSize.h4
-rw-r--r--kviewshell/sizePreview.cpp14
-rw-r--r--kviewshell/sizePreview.h5
-rw-r--r--kviewshell/tableOfContents.cpp18
-rw-r--r--kviewshell/tableOfContents.h9
-rw-r--r--kviewshell/units.cpp2
-rw-r--r--kviewshell/zoom.cpp18
-rw-r--r--kviewshell/zoom.h3
-rw-r--r--libkscan/COPYING.LIB4
-rw-r--r--libkscan/devselector.cpp22
-rw-r--r--libkscan/devselector.h5
-rw-r--r--libkscan/dispgamma.cpp14
-rw-r--r--libkscan/dispgamma.h5
-rw-r--r--libkscan/gammadialog.cpp6
-rw-r--r--libkscan/gammadialog.h7
-rw-r--r--libkscan/img_canvas.cpp34
-rw-r--r--libkscan/img_canvas.h21
-rw-r--r--libkscan/imgscaledialog.cpp6
-rw-r--r--libkscan/imgscaledialog.h5
-rw-r--r--libkscan/kgammatable.h9
-rw-r--r--libkscan/kscandevice.cpp82
-rw-r--r--libkscan/kscandevice.h25
-rw-r--r--libkscan/kscandoc.h2
-rw-r--r--libkscan/kscanoption.cpp36
-rw-r--r--libkscan/kscanoption.h15
-rw-r--r--libkscan/kscanoptset.cpp4
-rw-r--r--libkscan/kscanslider.cpp30
-rw-r--r--libkscan/kscanslider.h37
-rw-r--r--libkscan/massscandialog.cpp4
-rw-r--r--libkscan/massscandialog.h5
-rw-r--r--libkscan/previewer.cpp28
-rw-r--r--libkscan/previewer.h7
-rw-r--r--libkscan/scandialog.cpp38
-rw-r--r--libkscan/scandialog.h7
-rw-r--r--libkscan/scanparams.cpp42
-rw-r--r--libkscan/scanparams.h11
-rw-r--r--libkscan/scansourcedialog.cpp4
-rw-r--r--libkscan/scansourcedialog.h3
-rw-r--r--libkscan/sizeindicator.cpp10
-rw-r--r--libkscan/sizeindicator.h7
1370 files changed, 12296 insertions, 11863 deletions
diff --git a/kamera/kcontrol/kamera.cpp b/kamera/kcontrol/kamera.cpp
index 97338181..50d7fc12 100644
--- a/kamera/kcontrol/kamera.cpp
+++ b/kamera/kcontrol/kamera.cpp
@@ -48,8 +48,8 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kamera, KKameraConfigFactory( "kcmkamera" ) )
KKameraConfig *KKameraConfig::m_instance = NULL;
-KKameraConfig::KKameraConfig(TQWidget *parent, const char *name, const TQStringList &)
- : KCModule(KKameraConfigFactory::instance(), parent, name)
+KKameraConfig::KKameraConfig(TQWidget *tqparent, const char *name, const TQStringList &)
+ : KCModule(KKameraConfigFactory::instance(), tqparent, name)
{
m_devicePopup = new KPopupMenu(this);
m_actions = new KActionCollection(this);
@@ -96,7 +96,7 @@ void KKameraConfig::displayGPSuccessDialogue(void)
// set the kcontrol module buttons
setButtons(Help | Apply | Cancel | Ok);
- // create a layout with two vertical boxes
+ // create a tqlayout with two vertical boxes
TQVBoxLayout *topLayout = new TQVBoxLayout(this, 0, 0);
topLayout->setAutoAdd(true);
@@ -113,29 +113,29 @@ void KKameraConfig::displayGPSuccessDialogue(void)
connect(m_deviceSel, TQT_SIGNAL(selectionChanged(TQIconViewItem *)),
TQT_SLOT(slot_deviceSelected(TQIconViewItem *)));
- m_deviceSel->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
+ m_deviceSel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
// create actions
KAction *act;
- act = new KAction(i18n("Add"), "camera", 0, this, TQT_SLOT(slot_addCamera()), m_actions, "camera_add");
+ act = new KAction(i18n("Add"), "camera", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_addCamera()), m_actions, "camera_add");
act->setWhatsThis(i18n("Click this button to add a new camera."));
act->plug(m_toolbar);
m_toolbar->insertLineSeparator();
- act = new KAction(i18n("Test"), "camera_test", 0, this, TQT_SLOT(slot_testCamera()), m_actions, "camera_test");
+ act = new KAction(i18n("Test"), "camera_test", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_testCamera()), m_actions, "camera_test");
act->setWhatsThis(i18n("Click this button to remove the selected camera from the list."));
act->plug(m_toolbar);
- act = new KAction(i18n("Remove"), "edittrash", 0, this, TQT_SLOT(slot_removeCamera()), m_actions, "camera_remove");
+ act = new KAction(i18n("Remove"), "edittrash", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_removeCamera()), m_actions, "camera_remove");
act->setWhatsThis(i18n("Click this button to remove the selected camera from the list."));
act->plug(m_toolbar);
- act = new KAction(i18n("Configure..."), "configure", 0, this, TQT_SLOT(slot_configureCamera()), m_actions, "camera_configure");
+ act = new KAction(i18n("Configure..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_configureCamera()), m_actions, "camera_configure");
act->setWhatsThis(i18n("Click this button to change the configuration of the selected camera.<br><br>The availability of this feature and the contents of the Configuration dialog depend on the camera model."));
act->plug(m_toolbar);
- act = new KAction(i18n("Information"), "hwinfo", 0, this, TQT_SLOT(slot_cameraSummary()), m_actions, "camera_summary");
+ act = new KAction(i18n("Information"), "hwinfo", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_cameraSummary()), m_actions, "camera_summary");
act->setWhatsThis(i18n("Click this button to view a summary of the current status of the selected camera.<br><br>The availability of this feature and the contents of the Configuration dialog depend on the camera model."));
act->plug(m_toolbar);
m_toolbar->insertLineSeparator();
- act = new KAction(i18n("Cancel"), "stop", 0, this, TQT_SLOT(slot_cancelOperation()), m_actions, "camera_cancel");
+ act = new KAction(i18n("Cancel"), "stop", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_cancelOperation()), m_actions, "camera_cancel");
act->setWhatsThis(i18n("Click this button to cancel the current camera operation."));
act->setEnabled(false);
act->plug(m_toolbar);
@@ -184,7 +184,7 @@ void KKameraConfig::load(bool useDefaults )
for (it = groupList.begin(); it != groupList.end(); it++) {
if (*it != "<default>") {
m_config->setGroup(*it);
- if (m_config->readEntry("Path").contains("usb:"))
+ if (m_config->readEntry("Path").tqcontains("usb:"))
continue;
kcamera = new KCamera(*it,m_config->readEntry("Path"));
@@ -218,7 +218,7 @@ void KKameraConfig::load(bool useDefaults )
if (!strcmp(value,"usb:"))
names[model] = value;
}
- if (ports.contains("usb:") && names[ports["usb:"]]!="usb:")
+ if (ports.tqcontains("usb:") && names[ports["usb:"]]!="usb:")
ports.remove("usb:");
TQMap<TQString,TQString>::iterator portit;
@@ -256,7 +256,7 @@ void KKameraConfig::afterCameraOperation(void)
// if we're regaining control after a Cancel...
if (m_cancelPending) {
- qApp->restoreOverrideCursor();
+ tqApp->restoreOverrideCursor();
m_cancelPending = false;
}
@@ -268,23 +268,23 @@ void KKameraConfig::afterCameraOperation(void)
TQString KKameraConfig::suggestName(const TQString &name)
{
TQString new_name = name;
- new_name.replace("/", ""); // we cannot have a slash in a URI's host
+ new_name.tqreplace("/", ""); // we cannot have a slash in a URI's host
- if (!m_devices.contains(new_name)) return new_name;
+ if (!m_devices.tqcontains(new_name)) return new_name;
// try new names with a number appended until we find a free one
int i = 1;
while (i++ < 0xffff) {
new_name = name + " (" + TQString::number(i) + ")";
- if (!m_devices.contains(new_name)) return new_name;
+ if (!m_devices.tqcontains(new_name)) return new_name;
}
- return TQString::null;
+ return TQString();
}
void KKameraConfig::slot_addCamera()
{
- KCamera *m_device = new KCamera(TQString::null,TQString::null);
+ KCamera *m_device = new KCamera(TQString(),TQString());
connect(m_device, TQT_SIGNAL(error(const TQString &)), TQT_SLOT(slot_error(const TQString &)));
connect(m_device, TQT_SIGNAL(error(const TQString &, const TQString &)), TQT_SLOT(slot_error(const TQString &, const TQString &)));
KameraDeviceSelectDialog dialog(this, m_device);
@@ -302,7 +302,7 @@ void KKameraConfig::slot_addCamera()
void KKameraConfig::slot_removeCamera()
{
TQString name = m_deviceSel->currentItem()->text();
- if (m_devices.contains(name)) {
+ if (m_devices.tqcontains(name)) {
KCamera *m_device = m_devices[name];
m_devices.remove(name);
delete m_device;
@@ -317,7 +317,7 @@ void KKameraConfig::slot_testCamera()
beforeCameraOperation();
TQString name = m_deviceSel->currentItem()->text();
- if (m_devices.contains(name)) {
+ if (m_devices.tqcontains(name)) {
KCamera *m_device = m_devices[name];
if (m_device->test())
KMessageBox::information(this, i18n("Camera test was successful."));
@@ -329,7 +329,7 @@ void KKameraConfig::slot_testCamera()
void KKameraConfig::slot_configureCamera()
{
TQString name = m_deviceSel->currentItem()->text();
- if (m_devices.contains(name)) {
+ if (m_devices.tqcontains(name)) {
KCamera *m_device = m_devices[name];
m_device->configure();
}
@@ -339,7 +339,7 @@ void KKameraConfig::slot_cameraSummary()
{
TQString summary;
TQString name = m_deviceSel->currentItem()->text();
- if (m_devices.contains(name)) {
+ if (m_devices.tqcontains(name)) {
KCamera *m_device = m_devices[name];
summary = m_device->summary();
if (!summary.isNull()) {
@@ -354,7 +354,7 @@ void KKameraConfig::slot_cancelOperation()
// Prevent the user from keeping clicking Cancel
m_actions->action("camera_cancel")->setEnabled(false);
// and indicate that the click on Cancel did have some effect
- qApp->setOverrideCursor(Qt::WaitCursor);
+ tqApp->setOverrideCursor(TQt::WaitCursor);
}
void KKameraConfig::slot_deviceMenu(TQIconViewItem *item, const TQPoint &point)
@@ -381,7 +381,7 @@ void KKameraConfig::cbGPIdle(GPContext * /*context*/, void * /*data*/)
{
/*KKameraConfig *self( reinterpret_cast<KKameraConfig*>(data) );*/
- qApp->processEvents();
+ tqApp->processEvents();
}
GPContextFeedback KKameraConfig::cbGPCancel(GPContext * /*context*/, void *data)
@@ -390,7 +390,7 @@ GPContextFeedback KKameraConfig::cbGPCancel(GPContext * /*context*/, void *data)
// Since in practice no camera driver supports idle callbacks yet,
// we'll use the cancel callback as opportunity to process events
- qApp->processEvents();
+ tqApp->processEvents();
// If a cancel request is pending, ask gphoto to cancel
if (self->m_cancelPending)
diff --git a/kamera/kcontrol/kamera.h b/kamera/kcontrol/kamera.h
index 6e66d642..537522f6 100644
--- a/kamera/kcontrol/kamera.h
+++ b/kamera/kcontrol/kamera.h
@@ -47,10 +47,11 @@ class KPopupMenu;
class KKameraConfig : public KCModule
{
Q_OBJECT
+ TQ_OBJECT
friend class KameraDeviceSelectDialog;
public:
- KKameraConfig(TQWidget *parent, const char *name, const TQStringList &);
+ KKameraConfig(TQWidget *tqparent, const char *name, const TQStringList &);
virtual ~KKameraConfig();
// KCModule interface methods
diff --git a/kamera/kcontrol/kameraconfigdialog.cpp b/kamera/kcontrol/kameraconfigdialog.cpp
index 124ea991..914e17ab 100644
--- a/kamera/kcontrol/kameraconfigdialog.cpp
+++ b/kamera/kcontrol/kameraconfigdialog.cpp
@@ -42,9 +42,9 @@
KameraConfigDialog::KameraConfigDialog(Camera */*camera*/,
CameraWidget *widget,
- TQWidget *parent,
+ TQWidget *tqparent,
const char *name) :
-KDialogBase(parent, name, true, TQString::null, Ok|Cancel, Ok ),
+KDialogBase(tqparent, name, true, TQString(), Ok|Cancel, Ok ),
m_widgetRoot(widget)
{
TQFrame *main = makeMainWidget();
@@ -56,9 +56,9 @@ m_widgetRoot(widget)
appendWidget(main, widget);
}
-void KameraConfigDialog::appendWidget(TQWidget *parent, CameraWidget *widget)
+void KameraConfigDialog::appendWidget(TQWidget *tqparent, CameraWidget *widget)
{
- TQWidget *newParent = parent;
+ TQWidget *newParent = tqparent;
CameraWidgetType widget_type;
const char *widget_name;
@@ -74,7 +74,7 @@ void KameraConfigDialog::appendWidget(TQWidget *parent, CameraWidget *widget)
TQString whats_this = TQString::fromLocal8Bit(widget_info); // gphoto2 doesn't seem to have any standard for i18n
- // Add this widget to parent
+ // Add this widget to tqparent
switch(widget_type) {
case GP_WIDGET_WINDOW:
{
@@ -85,7 +85,7 @@ void KameraConfigDialog::appendWidget(TQWidget *parent, CameraWidget *widget)
case GP_WIDGET_SECTION:
{
if (!m_tabWidget)
- m_tabWidget = new TQTabWidget(parent);
+ m_tabWidget = new TQTabWidget(tqparent);
TQWidget *tab = new TQWidget(m_tabWidget);
// widgets are to be aligned vertically in the tab
TQVBoxLayout *tabLayout = new TQVBoxLayout(tab, marginHint(),
@@ -104,7 +104,7 @@ void KameraConfigDialog::appendWidget(TQWidget *parent, CameraWidget *widget)
{
gp_widget_get_value(widget, &widget_value_string);
- TQGrid *grid = new TQGrid(2, Horizontal, parent);
+ TQGrid *grid = new TQGrid(2,Qt::Horizontal, tqparent);
grid->setSpacing(spacingHint());
new TQLabel(TQString::fromLocal8Bit( widget_label )+":", grid);
TQLineEdit *lineEdit = new TQLineEdit(widget_value_string, grid);
@@ -123,13 +123,13 @@ void KameraConfigDialog::appendWidget(TQWidget *parent, CameraWidget *widget)
gp_widget_get_range(widget, &widget_low, &widget_high, &widget_increment);
gp_widget_get_value(widget, &widget_value_float);
- TQGroupBox *groupBox = new TQVGroupBox(widget_label, parent);
+ TQGroupBox *groupBox = new TQVGroupBox(widget_label, tqparent);
TQSlider *slider = new TQSlider(
( int )widget_low,
( int )widget_high,
( int )widget_increment,
( int )widget_value_float,
- TQSlider::Horizontal,
+ Qt::Horizontal,
groupBox );
m_wmap.insert(widget, slider);
@@ -142,7 +142,7 @@ void KameraConfigDialog::appendWidget(TQWidget *parent, CameraWidget *widget)
{
gp_widget_get_value(widget, &widget_value_int);
- TQCheckBox *checkBox = new TQCheckBox(widget_label, parent);
+ TQCheckBox *checkBox = new TQCheckBox(widget_label, tqparent);
checkBox->setChecked(widget_value_int);
m_wmap.insert(widget, checkBox);
@@ -160,9 +160,9 @@ void KameraConfigDialog::appendWidget(TQWidget *parent, CameraWidget *widget)
// for less than 5 options, align them horizontally
TQButtonGroup *buttonGroup;
if (count > 4)
- buttonGroup = new TQVButtonGroup(widget_label, parent);
+ buttonGroup = new TQVButtonGroup(widget_label, tqparent);
else
- buttonGroup = new TQHButtonGroup(widget_label, parent);
+ buttonGroup = new TQHButtonGroup(widget_label, tqparent);
for(int i = 0; i < count; ++i) {
const char *widget_choice;
@@ -183,7 +183,7 @@ void KameraConfigDialog::appendWidget(TQWidget *parent, CameraWidget *widget)
{
gp_widget_get_value(widget, &widget_value_string);
- TQComboBox *comboBox = new TQComboBox(FALSE, parent);
+ TQComboBox *comboBox = new TQComboBox(FALSE, tqparent);
comboBox->clear();
for(int i = 0; i < gp_widget_count_choices(widget); ++i) {
const char *widget_choice;
@@ -206,14 +206,14 @@ void KameraConfigDialog::appendWidget(TQWidget *parent, CameraWidget *widget)
// I can't see a way of implementing this. Since there is
// no way of telling which button sent you a signal, we
// can't map to the appropriate widget->callback
- new TQLabel(i18n("Button (not supported by KControl)"), parent);
+ new TQLabel(i18n("Button (not supported by KControl)"), tqparent);
break;
}
case GP_WIDGET_DATE:
{
// TODO
- new TQLabel(i18n("Date (not supported by KControl)"), parent);
+ new TQLabel(i18n("Date (not supported by KControl)"), tqparent);
break;
}
@@ -221,14 +221,14 @@ void KameraConfigDialog::appendWidget(TQWidget *parent, CameraWidget *widget)
return;
}
- // Append all this widgets children
+ // Append all this widgets tqchildren
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 children were added
+ // Things that must be done after all tqchildren were added
/*
switch (widget_type) {
case GP_WIDGET_SECTION:
@@ -309,7 +309,7 @@ void KameraConfigDialog::updateWidgetValue(CameraWidget *widget)
void KameraConfigDialog::slotOk()
{
- // Copy Qt widget values into CameraWidget hierarchy
+ // Copy TQt widget values into CameraWidget hierarchy
updateWidgetValue(m_widgetRoot);
// 'ok' dialog
diff --git a/kamera/kcontrol/kameraconfigdialog.h b/kamera/kcontrol/kameraconfigdialog.h
index 575f4aad..d02a6ed1 100644
--- a/kamera/kcontrol/kameraconfigdialog.h
+++ b/kamera/kcontrol/kameraconfigdialog.h
@@ -34,15 +34,16 @@ extern "C" {
class KameraConfigDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
KameraConfigDialog(Camera *camera, CameraWidget *widget,
- TQWidget *parent = 0, const char *name = 0);
+ TQWidget *tqparent = 0, const char *name = 0);
private slots:
void slotOk();
private:
- void appendWidget(TQWidget *parent, CameraWidget *widget);
+ void appendWidget(TQWidget *tqparent, CameraWidget *widget);
void updateWidgetValue(CameraWidget *widget);
TQMap<CameraWidget *, TQWidget *> m_wmap;
diff --git a/kamera/kcontrol/kameradevice.cpp b/kamera/kcontrol/kameradevice.cpp
index 9492934b..2e8e45e2 100644
--- a/kamera/kcontrol/kameradevice.cpp
+++ b/kamera/kcontrol/kameradevice.cpp
@@ -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.").arg(m_model));
+ " Configuration options may be incorrect.").tqarg(m_model));
return false;
}
gp_abilities_list_get_abilities(m_abilitylist, index, &m_abilities);
@@ -197,7 +197,7 @@ void KCamera::load(KConfig *config)
m_model = config->readEntry("Model");
if (m_path.isNull())
m_path = config->readEntry("Path");
- invalidateCamera();
+ tqinvalidateCamera();
}
void KCamera::save(KConfig *config)
@@ -209,7 +209,7 @@ void KCamera::save(KConfig *config)
TQString KCamera::portName()
{
- TQString port = m_path.left(m_path.find(":")).lower();
+ TQString port = m_path.left(m_path.tqfind(":")).lower();
if (port == "serial") return i18n("Serial");
if (port == "usb") return i18n("USB");
return i18n("Unknown port");
@@ -223,17 +223,17 @@ void KCamera::setName(const TQString &name)
void KCamera::setModel(const TQString &model)
{
m_model = model;
- invalidateCamera();
+ tqinvalidateCamera();
initInformation();
}
void KCamera::setPath(const TQString &path)
{
m_path = path;
- invalidateCamera();
+ tqinvalidateCamera();
}
-void KCamera::invalidateCamera()
+void KCamera::tqinvalidateCamera()
{
if (m_camera) {
gp_camera_free(m_camera);
@@ -270,8 +270,8 @@ CameraAbilities KCamera::abilities()
// ---------- KameraSelectCamera ------------
-KameraDeviceSelectDialog::KameraDeviceSelectDialog(TQWidget *parent, KCamera *device)
- : KDialogBase(parent, "kkameradeviceselect", true, i18n("Select Camera Device"), Ok | Cancel, Ok, true)
+KameraDeviceSelectDialog::KameraDeviceSelectDialog(TQWidget *tqparent, KCamera *device)
+ : KDialogBase(tqparent, "kkameradeviceselect", true, i18n("Select Camera Device"), Ok | Cancel, Ok, true)
{
m_device = device;
connect(m_device, TQT_SIGNAL(error(const TQString &)),
@@ -282,7 +282,7 @@ KameraDeviceSelectDialog::KameraDeviceSelectDialog(TQWidget *parent, KCamera *de
TQWidget *page = new TQWidget( this );
setMainWidget(page);
- // a layout with vertical boxes
+ // a tqlayout 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->setSizePolicy(TQSizePolicy(TQSizePolicy::Maximum,
+ m_modelSel->tqsetSizePolicy(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::fromLatin1(info.path).mid(7));
+ m_serialPortCombo->insertItem(TQString::tqfromLatin1(info.path).mid(7));
}
}
gp_port_info_list_free(list);
@@ -403,7 +403,7 @@ void KameraDeviceSelectDialog::save()
void KameraDeviceSelectDialog::load()
{
TQString path = m_device->path();
- TQString port = path.left(path.find(":")).lower();
+ TQString port = path.left(path.tqfind(":")).lower();
if (port == "serial") setPortType(INDEX_SERIAL);
if (port == "usb") setPortType(INDEX_USB);
@@ -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.").arg(model));
+ " Configuration options may be incorrect.").tqarg(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.").arg(model));
+ " Configuration options may be incorrect.").tqarg(model));
}
}
diff --git a/kamera/kcontrol/kameradevice.h b/kamera/kcontrol/kameradevice.h
index 34594f4e..4b8205b7 100644
--- a/kamera/kcontrol/kameradevice.h
+++ b/kamera/kcontrol/kameradevice.h
@@ -40,10 +40,11 @@ class TQRadioButton;
class KCamera : public TQObject {
friend class KameraDeviceSelectDialog;
Q_OBJECT
+ TQ_OBJECT
public:
KCamera(const TQString &name, const TQString &path);
~KCamera();
- void invalidateCamera();
+ void tqinvalidateCamera();
bool configure();
void load(KConfig *m_config);
void save(KConfig *m_config);
@@ -88,8 +89,9 @@ protected:
class KameraDeviceSelectDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- KameraDeviceSelectDialog(TQWidget *parent, KCamera *device);
+ KameraDeviceSelectDialog(TQWidget *tqparent, KCamera *device);
void save();
void load();
protected slots:
diff --git a/kamera/kioslave/kamera.cpp b/kamera/kioslave/kamera.cpp
index 5aefd632..05917e3c 100644
--- a/kamera/kioslave/kamera.cpp
+++ b/kamera/kioslave/kamera.cpp
@@ -55,7 +55,7 @@ extern "C"
{
KDE_EXPORT int kdemain(int argc, char **argv);
- static void frontendCameraStatus(GPContext *context, const char *format, va_list args, void *data);
+ static void frontendCameratqStatus(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>").arg(url.user()) );
+ infoMessage( i18n("Retrieving data from camera <b>%1</b>").tqarg(url.user()) );
// Note: There's no need to re-read directory for each get() anymore
gp_file_new(&m_file);
@@ -574,7 +574,7 @@ void KameraProtocol::listDir(const KURL &url)
gp_list_free (list);
/* Avoid duplicated entry for usb: and usb:001,042 entries. */
- if (ports.contains("usb:") && names[ports["usb:"]]!="usb:")
+ if (ports.tqcontains("usb:") && names[ports["usb:"]]!="usb:")
ports.remove("usb:");
for (it = groupList.begin(); it != groupList.end(); it++) {
@@ -606,7 +606,7 @@ void KameraProtocol::listDir(const KURL &url)
xurl.setProtocol("camera");
xurl.setUser(*it);
/* Avoid setting usb:xxx,yyy. */
- if (m_cfgPath.contains("usb:")>0) {
+ if (m_cfgPath.tqcontains("usb:")>0) {
names[*it] = "usb:";
xurl.setHost("usb:");
} else {
@@ -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, frontendCameraStatus, this);
+ gp_context_set_status_func(m_context, frontendCameratqStatus, 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::fromLatin1(info.file.type);
+ atom.m_str = TQString::tqfromLatin1(info.file.type);
udsEntry.append(atom);
}
@@ -890,7 +890,7 @@ void KameraProtocol::translateFileToUDS(UDSEntry &udsEntry, const CameraFileInfo
atom.m_long = 0;
atom.m_long |= (info.file.permissions & GP_FILE_PERM_READ) ? (S_IRUSR | S_IRGRP | S_IROTH) : 0;
// we cannot represent individual FP_FILE_PERM_DELETE permission in the Unix access scheme
- // since the parent directory's write permission defines that
+ // since the tqparent directory's write permission defines that
udsEntry.append(atom);
} else {
// basic permissions, in case the camera doesn't provide permissions info
@@ -1028,7 +1028,7 @@ unsigned int frontendProgressStart(
}
// this callback function is activated on every status message from gphoto2
-static void frontendCameraStatus(GPContext * /*context*/, const char *format, va_list args, void *data)
+static void frontendCameratqStatus(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 50288313..af209147 100644
--- a/kcoloredit/colorselector.cpp
+++ b/kcoloredit/colorselector.cpp
@@ -30,7 +30,7 @@
#include "texteditselection.h"
#include "colorselector.h"
-ColorSelector::ColorSelector(TQWidget *parent, const char *name ) : TQWidget(parent, name) {
+ColorSelector::ColorSelector(TQWidget *tqparent, const char *name ) : TQWidget(tqparent, name) {
fComponentsMode = false;
TQVBoxLayout* topLayout = new TQVBoxLayout(this, 4);
/*
@@ -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* layout = new TQHBoxLayout();
+ TQHBoxLayout* tqlayout = 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*) ));
@@ -73,7 +73,7 @@ ColorSelector::ColorSelector(TQWidget *parent, const char *name ) : TQWidget(par
TQVBoxLayout* colorChangeSliderLayout = new TQVBoxLayout(colorChangeSliderWidget, 1);
colorChangeSliderLayout->setMargin(0);
TQSlider* colorChangeSlider = new TQSlider(0, MAX_COLOR_CHANGE_VALUE,
- MAX_COLOR_CHANGE_VALUE/4, colorChangeValue, TQSlider::Horizontal, colorChangeSliderWidget);
+ MAX_COLOR_CHANGE_VALUE/4, colorChangeValue, Qt::Horizontal, colorChangeSliderWidget);
colorChangeSlider->setTickInterval(colorChangeSlider->pageStep());
colorChangeSlider->setTickmarks(TQSlider::Above);
connect(colorChangeSlider, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotColorChangeValueChanged(int) ));
@@ -88,17 +88,17 @@ ColorSelector::ColorSelector(TQWidget *parent, const char *name ) : TQWidget(par
colorChangeLayout->addStretch(10);
colorChangeLayout->addWidget(colorChangeSliderWidget);
colorChangeLayout->addStretch(10);
- layout->addLayout(colorChangeLayout, 10);
+ tqlayout->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);
- layout->addWidget(vLine);
- layout->addWidget(textEditSelection, 1);
+ tqlayout->addWidget(vLine);
+ tqlayout->addWidget(textEditSelection, 1);
colorPatch = new KColorPatch(this);
connect(colorPatch, TQT_SIGNAL( colorChanged(const TQColor&) ), TQT_SLOT( slotSetColor(const TQColor&) ));
colorPatch->setMinimumSize(80, 64);
- layout->addWidget(colorPatch, 10);
- topLayout->addLayout(layout);
+ tqlayout->addWidget(colorPatch, 10);
+ topLayout->addLayout(tqlayout);
}
ColorSelector::~ColorSelector() {
}
diff --git a/kcoloredit/colorselector.h b/kcoloredit/colorselector.h
index 72d62ef6..5c3d9b62 100644
--- a/kcoloredit/colorselector.h
+++ b/kcoloredit/colorselector.h
@@ -31,10 +31,11 @@
*/
class ColorSelector : public TQWidget {
Q_OBJECT
+ TQ_OBJECT
public:
/** constructs a color selector widget */
- ColorSelector(TQWidget *parent=0, const char *name=0);
+ ColorSelector(TQWidget *tqparent=0, const char *name=0);
~ColorSelector();
/** @return the selected color */
const Color& color();
diff --git a/kcoloredit/editablestreamhistory.h b/kcoloredit/editablestreamhistory.h
index 9fe59d99..20233e33 100644
--- a/kcoloredit/editablestreamhistory.h
+++ b/kcoloredit/editablestreamhistory.h
@@ -37,7 +37,7 @@ public:
/** Pastes a stream at index. Uses undo/redo history */
void paste(const int index, EDITABLE_STREAM& pasteStream);
/** Replaces a stream at index. Uses undo/redo history */
- void replace(const int index, EDITABLE_STREAM& replaceStream);
+ void tqreplace(const int index, EDITABLE_STREAM& replaceStream);
/** @return Whether undo possible */
bool undoPossible();
/** @return Whether redo possible */
@@ -76,7 +76,7 @@ template <class EDITABLE_STREAM> void
}
template <class EDITABLE_STREAM> void
- EditableStreamHistory<EDITABLE_STREAM>::replace(const int index, EDITABLE_STREAM& replaceStream) {
+ EditableStreamHistory<EDITABLE_STREAM>::tqreplace(const int index, EDITABLE_STREAM& replaceStream) {
m_editableStream->cut(index, replaceStream.length());
m_editableStream->paste(index, replaceStream);
}
diff --git a/kcoloredit/gradientselection.cpp b/kcoloredit/gradientselection.cpp
index f75547c1..72dd02cd 100644
--- a/kcoloredit/gradientselection.cpp
+++ b/kcoloredit/gradientselection.cpp
@@ -24,15 +24,15 @@
#include "main.h"
#include "gradientselection.h"
-GradientSelection::GradientSelection(TQWidget *parent, const char *name ) : TQWidget(parent,name) {
+GradientSelection::GradientSelection(TQWidget *tqparent, const char *name ) : TQWidget(tqparent,name) {
TQGridLayout* topLayout = new TQGridLayout(this, 2, 2, 0);
- TQHBoxLayout* layout = new TQHBoxLayout(0);
- layout->setMargin(3);
+ TQHBoxLayout* tqlayout = new TQHBoxLayout(0);
+ tqlayout->setMargin(3);
xyColorSelector = new KXYColorSelector(this);
connect(xyColorSelector, TQT_SIGNAL( valueChanged(int, int) ),
TQT_SLOT( slotXyColorSelectorPosChanged(int, int) ));
- layout->addWidget(xyColorSelector);
- topLayout->addLayout(layout, 0, 0);
+ tqlayout->addWidget(xyColorSelector);
+ topLayout->addLayout(tqlayout, 0, 0);
topLayout->setRowStretch(0, 10);
topLayout->setRowStretch(1, 0);
TQVBoxLayout* xyColorSelectorLayout = new TQVBoxLayout();
@@ -54,7 +54,7 @@ GradientSelection::GradientSelection(TQWidget *parent, const char *name ) : TQWi
xyColorSelectorLayout->addLayout(buttonsLayout);
xyColorSelectorLayout->addSpacing(2);
topLayout->addLayout(xyColorSelectorLayout, 1, 0);
- zColorSelector = new KZColorSelector(KZColorSelector::Vertical, this);
+ zColorSelector = new KZColorSelector(Qt::Vertical, this);
connect(zColorSelector, TQT_SIGNAL( valueChanged(int) ),
TQT_SLOT( slotZColorSelectorPosChanged(int) ));
zColorSelector->setFixedWidth(36);
@@ -218,7 +218,7 @@ void GradientSelection::slotXyColorSelectorPosChanged(int x, int y) {
}
void GradientSelection::slotZColorSelectorPosChanged(int y) {
- bool repaintZColorSelector = false;
+ bool tqrepaintZColorSelector = false;
switch(zColorSelectorComponentIndex) {
case H_COMPONENT:
hComponent = y;
@@ -237,7 +237,7 @@ void GradientSelection::slotZColorSelectorPosChanged(int y) {
rgbColor.setHsv(hComponent, sComponent, vComponent);
color.setComponents(rgbColor.red(), rgbColor.green(), rgbColor.blue());
updateXyColorSelector(false);
- if(repaintZColorSelector)
+ if(tqrepaintZColorSelector)
updateZColorSelector();
emit valueChanged(&color);
}
diff --git a/kcoloredit/gradientselection.h b/kcoloredit/gradientselection.h
index 0197f706..e3e58d1c 100644
--- a/kcoloredit/gradientselection.h
+++ b/kcoloredit/gradientselection.h
@@ -32,10 +32,11 @@
*/
class GradientSelection : public TQWidget {
Q_OBJECT
+ TQ_OBJECT
public:
/** Constructs the widget */
- GradientSelection(TQWidget *parent=0, const char *name=0);
+ GradientSelection(TQWidget *tqparent=0, const char *name=0);
~GradientSelection();
/** Enables or disables the color synchronize button */
void enableSynchronizeColorButton(bool enable);
diff --git a/kcoloredit/imageselection.cpp b/kcoloredit/imageselection.cpp
index b6d47c47..a82bdfdb 100644
--- a/kcoloredit/imageselection.cpp
+++ b/kcoloredit/imageselection.cpp
@@ -17,7 +17,7 @@
#include "imageselection.h"
-ImageSelection::ImageSelection(TQWidget *parent, const char *name ) : TQWidget(parent,name) {
+ImageSelection::ImageSelection(TQWidget *tqparent, const char *name ) : TQWidget(tqparent,name) {
}
ImageSelection::~ImageSelection(){
}
diff --git a/kcoloredit/imageselection.h b/kcoloredit/imageselection.h
index dd6a9364..a773cdcc 100644
--- a/kcoloredit/imageselection.h
+++ b/kcoloredit/imageselection.h
@@ -27,10 +27,11 @@
*/
class ImageSelection : public TQWidget {
Q_OBJECT
+ TQ_OBJECT
public:
/** constructs the widget */
- ImageSelection(TQWidget *parent=0, const char *name=0);
+ ImageSelection(TQWidget *tqparent=0, const char *name=0);
~ImageSelection();
signals:
diff --git a/kcoloredit/kcolorchooser.cpp b/kcoloredit/kcolorchooser.cpp
index cbd5292b..455e9e16 100644
--- a/kcoloredit/kcolorchooser.cpp
+++ b/kcoloredit/kcolorchooser.cpp
@@ -55,7 +55,7 @@ int main(int argc, char *argv[])
KColorDialog dlg;
- dlg.setColor(Qt::blue); // Just a color
+ dlg.setColor(TQt::blue); // Just a color
app.connect(&dlg, TQT_SIGNAL(finished()), TQT_SLOT(quit()));
@@ -65,6 +65,6 @@ int main(int argc, char *argv[])
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
const TQColor c = dlg.color();
if ( args->isSet("print") && c.isValid() ) {
- std::cout << c.name().utf8().data() << std::endl;
+ std::cout << TQString(c.name()).utf8().data() << std::endl;
}
}
diff --git a/kcoloredit/kcoloredit.cpp b/kcoloredit/kcoloredit.cpp
index 9b093722..5b0dffb9 100644
--- a/kcoloredit/kcoloredit.cpp
+++ b/kcoloredit/kcoloredit.cpp
@@ -64,39 +64,39 @@ KColorEditApp::~KColorEditApp() {
void KColorEditApp::initActions()
{
// File actiojns
- KStdAction::openNew( this, TQT_SLOT( slotFileNew() ), actionCollection() );
- KStdAction::open( this, TQT_SLOT( slotFileOpen() ), actionCollection() );
- KStdAction::saveAs( this, TQT_SLOT( slotFileSaveAs() ), actionCollection() );
- KStdAction::close( this, TQT_SLOT( slotClose() ), actionCollection() );
- KStdAction::quit( this, TQT_SLOT( slotQuit() ), actionCollection() );
- m_actSave = KStdAction::save( this, TQT_SLOT( slotFileSave() ),
+ KStdAction::openNew( TQT_TQOBJECT(this), TQT_SLOT( slotFileNew() ), actionCollection() );
+ KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotFileOpen() ), actionCollection() );
+ KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT( slotFileSaveAs() ), actionCollection() );
+ KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( slotClose() ), actionCollection() );
+ KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotQuit() ), actionCollection() );
+ m_actSave = KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT( slotFileSave() ),
actionCollection() );
- m_actRecent = KStdAction::openRecent( this,
+ m_actRecent = KStdAction::openRecent( TQT_TQOBJECT(this),
TQT_SLOT( slotFileOpenRecent( const KURL& ) ), actionCollection() );
( void ) new KAction( i18n("New &Window"), kapp->miniIcon(), KShortcut(),
- this, TQT_SLOT( slotFileNewWindow() ), actionCollection(),
+ TQT_TQOBJECT(this), TQT_SLOT( slotFileNewWindow() ), actionCollection(),
"file_new_window" );
// Edit actions
- m_actCut = KStdAction::cut( this, TQT_SLOT( slotEditCut() ),
+ m_actCut = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT( slotEditCut() ),
actionCollection() );
- m_actCopy = KStdAction::copy( this, TQT_SLOT( slotEditCopy() ),
+ m_actCopy = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( slotEditCopy() ),
actionCollection() );
- m_actPaste = KStdAction::paste( this, TQT_SLOT( slotEditPaste() ),
+ m_actPaste = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotEditPaste() ),
actionCollection() );
m_actPaste->setEnabled( false );
// Color Menu
- m_actNames = new KToggleAction( i18n("Show &Color Names"), KShortcut(), this,
+ m_actNames = new KToggleAction( i18n("Show &Color Names"), KShortcut(), TQT_TQOBJECT(this),
TQT_SLOT( slotViewColorNames() ), actionCollection(),
"color_view_names" );
m_actNames->setCheckedState(i18n("Hide &Color Names"));
- m_actPalette = new KAction( i18n("From &Palette"), KShortcut(), this,
+ m_actPalette = new KAction( i18n("From &Palette"), KShortcut(), TQT_TQOBJECT(this),
TQT_SLOT( slotColorFromPalette() ), actionCollection(),
"color_from_palette" );
- ( void ) new KAction( i18n("From &Screen"), KShortcut(), this,
+ ( void ) new KAction( i18n("From &Screen"), KShortcut(), TQT_TQOBJECT(this),
TQT_SLOT( slotColorFromScreen() ), actionCollection(),
"color_from_screen" );
}
@@ -104,7 +104,7 @@ void KColorEditApp::initActions()
void KColorEditApp::initStatusBar()
{
statusBar()->insertItem(i18n("Ready."), ID_STATUS_MSG, 1);
- statusBar()->setItemAlignment( ID_STATUS_MSG, Qt::AlignLeft );
+ statusBar()->setItemAlignment( ID_STATUS_MSG, TQt::AlignLeft );
}
void KColorEditApp::initDocument()
diff --git a/kcoloredit/kcoloredit.h b/kcoloredit/kcoloredit.h
index e30fff18..e09fd415 100644
--- a/kcoloredit/kcoloredit.h
+++ b/kcoloredit/kcoloredit.h
@@ -21,7 +21,7 @@
#include <config.h>
-// include files for Qt
+// include files for TQt
#include <tqevent.h>
#include <tqstringlist.h>
@@ -54,6 +54,7 @@ class KColorEditView;
class KColorEditApp : public KMainWindow
{
Q_OBJECT
+ TQ_OBJECT
friend class KColorEditView;
@@ -73,7 +74,7 @@ class KColorEditApp : public KMainWindow
KColorEditDoc *document() const;
protected:
- /** save general Options like all bar positions and status as well as the geometry and the recent file list to the configuration
+ /** save general Options like all bar positions and status as well as the tqgeometry and the recent file list to the configuration
* file
*/
void saveOptions();
diff --git a/kcoloredit/kcoloreditdoc.cpp b/kcoloredit/kcoloreditdoc.cpp
index ea9a0433..ed9094e5 100644
--- a/kcoloredit/kcoloreditdoc.cpp
+++ b/kcoloredit/kcoloreditdoc.cpp
@@ -15,7 +15,7 @@
* *
***************************************************************************/
-// include files for Qt
+// include files for TQt
#include <tqdir.h>
#include <tqfileinfo.h>
#include <tqwidget.h>
@@ -31,7 +31,7 @@
#include "kcoloreditview.h"
#include "resource.h"
-KColorEditDoc::KColorEditDoc(TQWidget *parent, const char *name) : TQObject(parent, name),
+KColorEditDoc::KColorEditDoc(TQWidget *tqparent, const char *name) : TQObject(tqparent, name),
m_palette(), m_paletteHistory(&m_palette, 0) {
m_pViewList = new TQPtrList<KColorEditView>();
m_pViewList->setAutoDelete(true);
@@ -106,10 +106,10 @@ bool KColorEditDoc::saveModified()
if(m_modified)
{
- KColorEditApp *window=(KColorEditApp *) parent();
+ KColorEditApp *window=(KColorEditApp *) tqparent();
int want_save = KMessageBox::warningYesNoCancel(window,
i18n("The current file has been modified.\n"
- "Do you want to save it?"), TQString::null, KStdGuiItem::save(), i18n("Do Not Save"));
+ "Do you want to save it?"), TQString(), KStdGuiItem::save(), i18n("Do Not Save"));
switch(want_save)
{
case KMessageBox::Yes:
@@ -175,7 +175,7 @@ bool KColorEditDoc::openDocument(const TQString& filename) {
setPaletteCursorPos(m_palette.length());
setPaletteSelection(0, 0);
slotRedrawAllViews(0, true);
- KColorEditApp *window=(KColorEditApp*)parent();
+ KColorEditApp *window=(KColorEditApp*)tqparent();
window->setCaption(m_title);
}
return true;
@@ -235,7 +235,7 @@ void KColorEditDoc::copyToClipboard(Palette& palette) {
TQString text;
TQTextOStream stream(&text);
palette.save(stream, 0, false);
- KApplication::clipboard()->setText(text);
+ KApplication::tqclipboard()->setText(text);
emit clipboardChanged();
}
@@ -260,7 +260,7 @@ void KColorEditDoc::paste() {
Palette palettePaste;
TQString text;
TQTextIStream stream(&text);
- text = KApplication::clipboard()->text();
+ text = KApplication::tqclipboard()->text();
if(palettePaste.load( stream, false )) {
m_paletteHistory.paste(paletteCursorPos(), palettePaste);
setPaletteSelection(paletteCursorPos(), paletteCursorPos() +
@@ -281,11 +281,11 @@ void KColorEditDoc::insert(int index, const Color& color) {
slotRedrawAllViews(0);
}
-void KColorEditDoc::replace(int index, const Color& color) {
+void KColorEditDoc::tqreplace(int index, const Color& color) {
Palette paletteReplace;
Color* replaceColor = new Color(color);
paletteReplace.append(replaceColor);
- m_paletteHistory.replace(index, paletteReplace);
+ m_paletteHistory.tqreplace(index, paletteReplace);
setPaletteSelection(0, 0);
setModified(true);
slotRedrawAllViews(0);
diff --git a/kcoloredit/kcoloreditdoc.h b/kcoloredit/kcoloreditdoc.h
index 03d5ce70..108e05fe 100644
--- a/kcoloredit/kcoloreditdoc.h
+++ b/kcoloredit/kcoloreditdoc.h
@@ -44,13 +44,14 @@ class KColorEditView;
* @author Source Framework Automatically Generated by KDevelop, (c) The KDevelop Team.
* @version KDevelop version 0.4 code generation
*/
-class KColorEditDoc : public QObject
+class KColorEditDoc : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
/** Constructor for the fileclass of the application */
- KColorEditDoc(TQWidget *parent, const char *name=0);
+ KColorEditDoc(TQWidget *tqparent, const char *name=0);
/** Destructor for the fileclass of the application */
~KColorEditDoc();
@@ -111,7 +112,7 @@ class KColorEditDoc : public QObject
/** Inserts a color at index */
void insert(int index, const Color& color);
/** Replaces a color at index */
- void replace(int index, const Color& color);
+ void tqreplace(int index, const Color& color);
protected:
/** Sets an error string if an IO operation was unsuccesfull */
diff --git a/kcoloredit/kcoloreditview.cpp b/kcoloredit/kcoloreditview.cpp
index 10484fe8..1abfd861 100644
--- a/kcoloredit/kcoloreditview.cpp
+++ b/kcoloredit/kcoloreditview.cpp
@@ -15,7 +15,7 @@
* *
***************************************************************************/
-// include files for Qt
+// include files for TQt
#include <tqpainter.h>
#include <tqlayout.h>
#include <tqpushbutton.h>
@@ -35,7 +35,7 @@
#include "kcoloredit.h"
#include "palette.h"
-KColorEditView::KColorEditView(TQWidget *parent, const char *name) : TQSplitter(parent, name) {
+KColorEditView::KColorEditView(TQWidget *tqparent, const char *name) : TQSplitter(tqparent, name) {
colorSelector = new ColorSelector(this);
colorSelector->slotSetColor(
Color( RGB_MAX_COMPONENT_VALUE, RGB_MAX_COMPONENT_VALUE, RGB_MAX_COMPONENT_VALUE, "" ));
@@ -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* layout = new TQHBoxLayout();
+ TQHBoxLayout* tqlayout = 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);
- layout->addLayout(addColorLayout, 0);
+ tqlayout->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);
- layout->addWidget(colorAtCursorFrame, 10);
- layout->addSpacing(8);
+ tqlayout->addWidget(colorAtCursorFrame, 10);
+ tqlayout->addSpacing(8);
paletteLayout->addSpacing(4);
- paletteLayout->addLayout(layout);
+ paletteLayout->addLayout(tqlayout);
paletteLayout->addSpacing(4);
inColorNameChanging = false;
doNotUpdateColorLabels = false;
@@ -145,7 +145,7 @@ void KColorEditView::setColorAtCursorComponentValueLabelSizes(TQLabel* const lab
}
KColorEditDoc *KColorEditView::document() const {
- KColorEditApp *theApp=(KColorEditApp *) parentWidget();
+ KColorEditApp *theApp=(KColorEditApp *) tqparentWidget();
return theApp->document();
}
@@ -234,7 +234,7 @@ void KColorEditView::slotAddColor() {
case REPLACE_COLOR:
if(index < palette->length())
- document()->replace(index, color);
+ document()->tqreplace(index, color);
else
document()->insert(index, color);
break;
@@ -274,7 +274,7 @@ void KColorEditView::slotSetColorName(const TQString& name) {
palette->color(cursorPos)->component(Color::BLUE_INDEX),
name);
doNotUpdateColorLabels = true;
- document()->replace(cursorPos, newColor);
+ document()->tqreplace(cursorPos, newColor);
doNotUpdateColorLabels = false;
}
}
diff --git a/kcoloredit/kcoloreditview.h b/kcoloredit/kcoloreditview.h
index 0bc2a569..1ede4427 100644
--- a/kcoloredit/kcoloreditview.h
+++ b/kcoloredit/kcoloreditview.h
@@ -22,7 +22,7 @@
#include <config.h>
#endif
-// include files for Qt
+// include files for TQt
#include <tqsplitter.h>
#include <tqcheckbox.h>
#include <tqlabel.h>
@@ -43,14 +43,15 @@ class KColorEditDoc;
*/
class KColorEditView : public TQSplitter {
Q_OBJECT
+ TQ_OBJECT
public:
/** Constructor for the main view */
- KColorEditView(TQWidget *parent = 0, const char *name = 0);
+ KColorEditView(TQWidget *tqparent = 0, const char *name = 0);
/** Destructor for the main view */
~KColorEditView();
- /** returns a pointer to the document connected to the view instance. Mind that this method requires a KColorEditApp instance as a parent
+ /** returns a pointer to the document connected to the view instance. Mind that this method requires a KColorEditApp instance as a tqparent
* widget to get to the window document pointer by calling the KColorEditApp::getDocument() method.
*
* @see KColorEditApp#getDocument
diff --git a/kcoloredit/kxycolorselector.cpp b/kcoloredit/kxycolorselector.cpp
index 4a717c5e..bcd58f00 100644
--- a/kcoloredit/kxycolorselector.cpp
+++ b/kcoloredit/kxycolorselector.cpp
@@ -23,7 +23,7 @@
#include "kxycolorselector.h"
-KXYColorSelector::KXYColorSelector(TQWidget *parent, const char *name) : KXYSelector(parent,name) {
+KXYColorSelector::KXYColorSelector(TQWidget *tqparent, const char *name) : KXYSelector(tqparent,name) {
setBackgroundMode(NoBackground);
setRange(0, 0, COMPONENT_SELECTION_RESOLUTION - 1, COMPONENT_SELECTION_RESOLUTION - 1);
setType(TYPE_NONE);
@@ -42,7 +42,7 @@ void KXYColorSelector::setType(const int type) {
void KXYColorSelector::updateContents() {
drawPalette(&pixmap);
- repaint();
+ tqrepaint();
}
void KXYColorSelector::resizeEvent(TQResizeEvent*) {
@@ -70,9 +70,9 @@ void KXYColorSelector::drawCursor(TQPainter* painter, int x, int y) {
TQColor cursorColor;
if(( 2*color.red() + 4*color.green() + 1*color.blue() )*1.0/
( 2*255 + 4*255 + 1*255 ) > 0.65)
- cursorColor = Qt::black;
+ cursorColor = TQt::black;
else
- cursorColor = Qt::white;
+ cursorColor = TQt::white;
painter->setPen(TQPen( cursorColor ));
const int lineBegin = 2;
const int lineEnd = 6;
@@ -132,25 +132,25 @@ void KXYColorSelector::setColor(TQColor* const color, const int x, const int y)
}
TQColor* KXYColorSelector::standardColorsPalette() {
- TQColor* palette = new QColor[STANDARD_PALETTE_SIZE];
+ TQColor* palette = new TQColor[STANDARD_PALETTE_SIZE];
int i = 0;
- palette[i++] = Qt::red;
- palette[i++] = Qt::green;
- palette[i++] = Qt::blue;
- palette[i++] = Qt::cyan;
- palette[i++] = Qt::magenta;
- palette[i++] = Qt::yellow;
- palette[i++] = Qt::darkRed;
- palette[i++] = Qt::darkGreen;
- palette[i++] = Qt::darkBlue;
- palette[i++] = Qt::darkCyan;
- palette[i++] = Qt::darkMagenta;
- palette[i++] = Qt::darkYellow;
- palette[i++] = Qt::white;
- palette[i++] = Qt::lightGray;
- palette[i++] = Qt::gray;
- palette[i++] = Qt::darkGray;
- palette[i++] = Qt::black;
+ palette[i++] = TQt::red;
+ palette[i++] = TQt::green;
+ palette[i++] = TQt::blue;
+ palette[i++] = TQt::cyan;
+ palette[i++] = TQt::magenta;
+ palette[i++] = TQt::yellow;
+ palette[i++] = TQt::darkRed;
+ palette[i++] = TQt::darkGreen;
+ palette[i++] = TQt::darkBlue;
+ palette[i++] = TQt::darkCyan;
+ palette[i++] = TQt::darkMagenta;
+ palette[i++] = TQt::darkYellow;
+ palette[i++] = TQt::white;
+ palette[i++] = TQt::lightGray;
+ palette[i++] = TQt::gray;
+ palette[i++] = TQt::darkGray;
+ palette[i++] = TQt::black;
return palette;
}
diff --git a/kcoloredit/kxycolorselector.h b/kcoloredit/kxycolorselector.h
index 6225d74f..263a39f3 100644
--- a/kcoloredit/kxycolorselector.h
+++ b/kcoloredit/kxycolorselector.h
@@ -28,6 +28,7 @@
*/
class KXYColorSelector : public KXYSelector {
Q_OBJECT
+ TQ_OBJECT
public:
/** The types of the selector. They specify a color component subset */
@@ -46,7 +47,7 @@ public:
/** Constructs a two-dimensional color component selector widget,
* with a type TYPE_NONE and ranges 0 .. MAX_COLOR_COMPONENT_VALUE
*/
- KXYColorSelector(TQWidget *parent=0, const char *name=0);
+ KXYColorSelector(TQWidget *tqparent=0, const char *name=0);
~KXYColorSelector();
/** Set the type of the selector */
void setType(const int type);
diff --git a/kcoloredit/kzcolorselector.cpp b/kcoloredit/kzcolorselector.cpp
index b00991a2..b0f7914a 100644
--- a/kcoloredit/kzcolorselector.cpp
+++ b/kcoloredit/kzcolorselector.cpp
@@ -23,8 +23,8 @@
#include "main.h"
#include "kzcolorselector.h"
-KZColorSelector::KZColorSelector(Orientation o, TQWidget *parent, const char *name) :
- KSelector(o, parent, name) {
+KZColorSelector::KZColorSelector(Qt::Orientation o, TQWidget *tqparent, const char *name) :
+ KSelector(o, tqparent, name) {
baseColorH = -1;
baseColorS = 0;
baseColorV = 0;
@@ -53,7 +53,7 @@ void KZColorSelector::setType(const int type) {
void KZColorSelector::updateContents() {
drawPalette(&pixmap);
- repaint(false);
+ tqrepaint(false);
}
void KZColorSelector::resizeEvent(TQResizeEvent*) {
@@ -119,25 +119,25 @@ void KZColorSelector::setColor(TQColor* const color, const int y) {
}
TQColor* KZColorSelector::getStandardColorsPalette() {
- TQColor* palette = new QColor[( int )STANDARD_PALETTE_SIZE];
+ TQColor* palette = new TQColor[( int )STANDARD_PALETTE_SIZE];
int i = 0;
- palette[i++] = Qt::red;
- palette[i++] = Qt::green;
- palette[i++] = Qt::blue;
- palette[i++] = Qt::cyan;
- palette[i++] = Qt::magenta;
- palette[i++] = Qt::yellow;
- palette[i++] = Qt::darkRed;
- palette[i++] = Qt::darkGreen;
- palette[i++] = Qt::darkBlue;
- palette[i++] = Qt::darkCyan;
- palette[i++] = Qt::darkMagenta;
- palette[i++] = Qt::darkYellow;
- palette[i++] = Qt::white;
- palette[i++] = Qt::lightGray;
- palette[i++] = Qt::gray;
- palette[i++] = Qt::darkGray;
- palette[i++] = Qt::black;
+ palette[i++] = TQt::red;
+ palette[i++] = TQt::green;
+ palette[i++] = TQt::blue;
+ palette[i++] = TQt::cyan;
+ palette[i++] = TQt::magenta;
+ palette[i++] = TQt::yellow;
+ palette[i++] = TQt::darkRed;
+ palette[i++] = TQt::darkGreen;
+ palette[i++] = TQt::darkBlue;
+ palette[i++] = TQt::darkCyan;
+ palette[i++] = TQt::darkMagenta;
+ palette[i++] = TQt::darkYellow;
+ palette[i++] = TQt::white;
+ palette[i++] = TQt::lightGray;
+ palette[i++] = TQt::gray;
+ palette[i++] = TQt::darkGray;
+ palette[i++] = TQt::black;
return palette;
}
diff --git a/kcoloredit/kzcolorselector.h b/kcoloredit/kzcolorselector.h
index 60e32f0a..f226d744 100644
--- a/kcoloredit/kzcolorselector.h
+++ b/kcoloredit/kzcolorselector.h
@@ -29,6 +29,7 @@
*/
class KZColorSelector : public KSelector {
Q_OBJECT
+ TQ_OBJECT
public:
/** Selector type constants */
@@ -37,7 +38,7 @@ public:
TYPE_V = 2 };
/** Constructs the widget */
- KZColorSelector(Orientation o, TQWidget *parent=0, const char *name=0);
+ KZColorSelector(Qt::Orientation o, TQWidget *tqparent=0, const char *name=0);
~KZColorSelector();
/** Sets the selector type */
void setType(const int type);
diff --git a/kcoloredit/loadpalettedlg.cpp b/kcoloredit/loadpalettedlg.cpp
index 23def4d5..a5e298ce 100644
--- a/kcoloredit/loadpalettedlg.cpp
+++ b/kcoloredit/loadpalettedlg.cpp
@@ -31,8 +31,8 @@
#include "palette.h"
#include "loadpalettedlg.h"
-LoadPaletteDlg::LoadPaletteDlg(TQWidget *parent, const char *name)
- : KDialogBase(parent, name, true, i18n( "Load Palette" ),
+LoadPaletteDlg::LoadPaletteDlg(TQWidget *tqparent, const char *name)
+ : KDialogBase(tqparent, name, true, i18n( "Load Palette" ),
Ok|Cancel, Ok, true) {
fileName = "";
TQWidget *mainWidget = new TQWidget( this );
@@ -45,7 +45,7 @@ LoadPaletteDlg::LoadPaletteDlg(TQWidget *parent, const char *name)
TQStringList palettesList = Palette::kdePalettes();
for(TQStringList::Iterator palette = palettesList.begin();
palette != palettesList.end(); ++palette) {
- bool prepend = (*palette).contains( "colors/Custom_Colors" );
+ bool prepend = (*palette).tqcontains( "colors/Custom_Colors" );
TQString fileName = locate("config", (*palette));
if(prepend) {
palettesFileNames.prepend(fileName);
diff --git a/kcoloredit/loadpalettedlg.h b/kcoloredit/loadpalettedlg.h
index f7dd50cb..7e71e2f5 100644
--- a/kcoloredit/loadpalettedlg.h
+++ b/kcoloredit/loadpalettedlg.h
@@ -27,11 +27,12 @@
*/
class LoadPaletteDlg : public KDialogBase {
Q_OBJECT
+ TQ_OBJECT
public:
/** constructs the dialog
*/
- LoadPaletteDlg(TQWidget *parent = 0, const char *name = 0);
+ LoadPaletteDlg(TQWidget *tqparent = 0, const char *name = 0);
~LoadPaletteDlg();
/** @return the fetched file name
*/
diff --git a/kcoloredit/palette.cpp b/kcoloredit/palette.cpp
index 42758b41..6f830278 100644
--- a/kcoloredit/palette.cpp
+++ b/kcoloredit/palette.cpp
@@ -108,14 +108,14 @@ bool Palette::load(TQTextStream& stream, bool loadName /* = true */) {
int lineNum = 0;
while (!stream.atEnd()) {
TQString string = stream.readLine().append(' ');
- if(string.find( TQRegExp("[^\\s]") ) == -1 ||
+ if(string.tqfind( TQRegExp("[^\\s]") ) == -1 ||
string.stripWhiteSpace().at( 0 ) == '#' ||
( loadName && lineNum == 0 )) {
if(loadName && lineNum == 0)
setName(string.stripWhiteSpace());
} else {
Color* newColor = new Color();
- int position = string.find(TQRegExp( "[^\\s]" ));
+ int position = string.tqfind(TQRegExp( "[^\\s]" ));
for(int componentIndex = 0; componentIndex < Color::COMPONENTS_NUM;
++componentIndex) {
if(position == -1) {
@@ -123,7 +123,7 @@ bool Palette::load(TQTextStream& stream, bool loadName /* = true */) {
result = false;
break;
}
- int endPosition = string.find(TQRegExp( "\\s" ), position);
+ int endPosition = string.tqfind(TQRegExp( "\\s" ), position);
if(endPosition == -1) {
m_errorString = i18n("Invalid format");
result = false;
@@ -139,7 +139,7 @@ bool Palette::load(TQTextStream& stream, bool loadName /* = true */) {
break;
}
newColor->setComponent(componentIndex, componentValue);
- position = string.find(TQRegExp( "[^\\s]" ), endPosition);
+ position = string.tqfind(TQRegExp( "[^\\s]" ), endPosition);
}
if(!result) {
delete newColor;
diff --git a/kcoloredit/paletteview.cpp b/kcoloredit/paletteview.cpp
index 6648d88b..d62ec43f 100644
--- a/kcoloredit/paletteview.cpp
+++ b/kcoloredit/paletteview.cpp
@@ -21,8 +21,8 @@
#include "paletteview.h"
PaletteView::PaletteView(const int defaultCellWidth, const int defaultCellHeight, const int cellSpacing,
- KColorEditView* view, TQWidget *parent, const char *name) :
- TQFrame(parent, name, TQWidget::WResizeNoErase*0) {
+ KColorEditView* view, TQWidget *tqparent, const char *name) :
+ TQFrame(tqparent, name, TQWidget::WResizeNoErase*0) {
setFrameStyle(StyledPanel|Sunken);
setLineWidth(2);
TQGridLayout* topLayout = new TQGridLayout(this, 2, 2);
@@ -32,7 +32,7 @@ PaletteView::PaletteView(const int defaultCellWidth, const int defaultCellHeight
topLayout->setColStretch(0, 10);
topLayout->setColStretch(1, 0);
scrollBar = new TQScrollBar(this);
- hScrollBar = new TQScrollBar(0, 1, 1, 1, 0, TQScrollBar::Horizontal, this);
+ hScrollBar = new TQScrollBar(0, 1, 1, 1, 0, Qt::Horizontal, this);
scrolledArea = new PaletteViewScrolledArea(defaultCellWidth,
defaultCellHeight, cellSpacing, scrollBar, hScrollBar, view, this);
connect(scrollBar, TQT_SIGNAL( valueChanged(int) ),
diff --git a/kcoloredit/paletteview.h b/kcoloredit/paletteview.h
index 9501de40..cc1e56b8 100644
--- a/kcoloredit/paletteview.h
+++ b/kcoloredit/paletteview.h
@@ -26,18 +26,19 @@
class KColorEditView;
/** This is a Palette class view widget.
- * Its parent is KColorEditView
+ * Its tqparent is KColorEditView
* @author Artur Rataj
*/
class PaletteView : public TQFrame {
Q_OBJECT
+ TQ_OBJECT
public:
/** Constructs a palette view widget, with a default cells sizes and spacing.
* The effective cell sizes may be adjusted to fit the widget sizes.
*/
PaletteView(const int defaultCellWidth, const int defaultCellHeight, const int cellSpacing,
- KColorEditView* view, TQWidget *parent = 0, const char *name=0);
+ KColorEditView* view, TQWidget *tqparent = 0, const char *name=0);
~PaletteView();
/** Calls redraw() in scrolledArea */
void redraw();
diff --git a/kcoloredit/paletteviewscrolledarea.cpp b/kcoloredit/paletteviewscrolledarea.cpp
index 0b4f0ec4..e6d26a20 100644
--- a/kcoloredit/paletteviewscrolledarea.cpp
+++ b/kcoloredit/paletteviewscrolledarea.cpp
@@ -38,8 +38,8 @@
PaletteViewScrolledArea::PaletteViewScrolledArea(const int defaultCellWidth,
const int defaultCellHeight, const int cellSpacing, TQScrollBar* scrollBar,
- TQScrollBar* hScrollBar, KColorEditView* view, TQWidget* parent, const char* name)
- : TQFrame(parent, name) {
+ TQScrollBar* hScrollBar, KColorEditView* view, TQWidget* tqparent, const char* name)
+ : TQFrame(tqparent, name) {
this->defaultCellWidth = defaultCellWidth;
this->defaultCellHeight = defaultCellHeight;
this->cellSpacing = cellSpacing;
@@ -73,11 +73,11 @@ void PaletteViewScrolledArea::slotViewColorNames(bool viewColorNames) {
void PaletteViewScrolledArea::redraw() {
//setCellsSizes();
- repaintPalette();
+ tqrepaintPalette();
}
-void PaletteViewScrolledArea::repaintPalette() {
- repaint(false);
+void PaletteViewScrolledArea::tqrepaintPalette() {
+ tqrepaint(false);
}
void PaletteViewScrolledArea::checkSelectionAutoScroll(const int mousePosY) {
@@ -106,7 +106,7 @@ void PaletteViewScrolledArea::slotScrollTimeout() {
else
setSelection(selectionEnd, selectionBegin);
checkSelectionAutoScroll(cursorPoint.y());
- repaintPalette();
+ tqrepaintPalette();
}
}
@@ -220,7 +220,7 @@ void PaletteViewScrolledArea::paintEvent(TQPaintEvent* /*event*/) {
setCellsSizes();
TQPixmap pixmap(size());
TQPainter painter;
- painter.begin(&pixmap, this);
+ painter.tqbegin(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::palette().active().base() ));
- TQBrush normalBackgroundBrush(TQFrame::palette().active().background());
- TQBrush selectedBackgroundBrush(TQFrame::palette().active().highlight());
+ TQBrush( TQFrame::tqpalette().active().base() ));
+ TQBrush normalBackgroundBrush(TQFrame::tqpalette().active().background());
+ TQBrush selectedBackgroundBrush(TQFrame::tqpalette().active().highlight());
TQBrush foregroundBrush;
- TQBrush cursorBrush(TQFrame::palette().active().foreground());
- TQPen backgroundPen(TQFrame::palette().active().foreground());
+ TQBrush cursorBrush(TQFrame::tqpalette().active().foreground());
+ TQPen backgroundPen(TQFrame::tqpalette().active().foreground());
int min = selectionMin();
int max = selectionMax();
int fontAscent = fontMetrics.ascent();
diff --git a/kcoloredit/paletteviewscrolledarea.h b/kcoloredit/paletteviewscrolledarea.h
index db39e454..8e69a354 100644
--- a/kcoloredit/paletteviewscrolledarea.h
+++ b/kcoloredit/paletteviewscrolledarea.h
@@ -33,15 +33,16 @@ class TQScrollBar;
*/
class PaletteViewScrolledArea : public TQFrame {
Q_OBJECT
+ TQ_OBJECT
public:
/** Constructs the widget */
PaletteViewScrolledArea(const int defaultCellWidth, const int defaultCellHeight,
const int cellSpacing, TQScrollBar* scrollBar,
TQScrollBar* hScrollBar, KColorEditView* view,
- TQWidget* parent = 0, const char* name = 0);
+ TQWidget* tqparent = 0, const char* name = 0);
~PaletteViewScrolledArea();
- /** Sets cells sizes and then calls repaintPalette() */
+ /** Sets cells sizes and then calls tqrepaintPalette() */
void redraw();
public slots:
@@ -105,8 +106,8 @@ protected:
* visible area width
*/
void setCellsSizes();
- /** repaints the palette */
- void repaintPalette();
+ /** tqrepaints the palette */
+ void tqrepaintPalette();
/** @return A color index at a given position, -1 if none */
int colorIndex(const TQPoint& point) const;
/** @return A color at a given position */
diff --git a/kcoloredit/texteditselection.cpp b/kcoloredit/texteditselection.cpp
index 4b1d6a56..bf00ab3d 100644
--- a/kcoloredit/texteditselection.cpp
+++ b/kcoloredit/texteditselection.cpp
@@ -24,7 +24,7 @@
#include "main.h"
#include "texteditselection.h"
-TextEditSelection::TextEditSelection(TQWidget *parent, const char *name ) : TQWidget(parent,name) {
+TextEditSelection::TextEditSelection(TQWidget *tqparent, const char *name ) : TQWidget(tqparent,name) {
inChangingComponents = false;
TQVBoxLayout* topLayout = new TQVBoxLayout(this, 4);
TQGridLayout* componentsLayout = new TQGridLayout(3, 5, 2);
@@ -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* layout) {
+ const TQString& labelString, const int row, const int column, TQGridLayout* tqlayout) {
TQLabel* label = new TQLabel(labelString, this);
- lineEdit->setValidator(new TQIntValidator( 0, maxValue, lineEdit ));
+ 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") ));
- layout->addWidget(label, row, column*3);
- layout->addWidget(lineEdit, row, column*3 + 1);
+ tqlayout->addWidget(label, row, column*3);
+ tqlayout->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 e140a5dc..67a299a1 100644
--- a/kcoloredit/texteditselection.h
+++ b/kcoloredit/texteditselection.h
@@ -30,10 +30,11 @@
*/
class TextEditSelection : public TQWidget {
Q_OBJECT
+ TQ_OBJECT
public:
/** Constructs the widget */
- TextEditSelection(TQWidget *parent=0, const char *name=0);
+ TextEditSelection(TQWidget *tqparent=0, const char *name=0);
~TextEditSelection();
signals:
@@ -47,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* layout);
+ const int row, const int column, TQGridLayout* tqlayout);
/** sets RGB string in rgbStringLineEdit */
void setRgbString(const int red, const int green, const int blue);
diff --git a/kcoloredit/textselection.cpp b/kcoloredit/textselection.cpp
index f916d48f..ae15650d 100644
--- a/kcoloredit/textselection.cpp
+++ b/kcoloredit/textselection.cpp
@@ -17,7 +17,7 @@
#include "textselection.h"
-TextSelection::TextSelection(TQWidget *parent, const char *name ) : TQWidget(parent,name) {
+TextSelection::TextSelection(TQWidget *tqparent, const char *name ) : TQWidget(tqparent,name) {
}
TextSelection::~TextSelection(){
diff --git a/kdvi/TeXFont.h b/kdvi/TeXFont.h
index d3ee51af..518c0d0f 100644
--- a/kdvi/TeXFont.h
+++ b/kdvi/TeXFont.h
@@ -17,8 +17,8 @@ class TeXFont {
public:
TeXFont(TeXFontDefinition *_parent)
{
- parent = _parent;
- errorMessage = TQString::null;
+ tqparent = _parent;
+ errorMessage = TQString();
};
virtual ~TeXFont();
@@ -29,12 +29,12 @@ class TeXFont {
glyphtable[i].shrunkenCharacter.resize(0, 0);
};
- virtual glyph* getGlyph(Q_UINT16 character, bool generateCharacterPixmap=false, const TQColor& color=Qt::black) = 0;
+ virtual glyph* getGlyph(TQ_UINT16 character, bool generateCharacterPixmap=false, const TQColor& color=TQt::black) = 0;
// Checksum of the font. Used e.g. by PK fonts. This field is filled
// in by the constructor, or set to 0.0, if the font format does not
// contain checksums.
- Q_UINT32 checksum;
+ TQ_UINT32 checksum;
// If the font or if some glyphs could not be loaded, error messages
// will be put here.
@@ -42,7 +42,7 @@ class TeXFont {
protected:
glyph glyphtable[TeXFontDefinition::max_num_of_chars_in_font];
- TeXFontDefinition *parent;
+ TeXFontDefinition *tqparent;
};
#endif
diff --git a/kdvi/TeXFontDefinition.cpp b/kdvi/TeXFontDefinition.cpp
index 03dd1b72..c89aa59d 100644
--- a/kdvi/TeXFontDefinition.cpp
+++ b/kdvi/TeXFontDefinition.cpp
@@ -31,7 +31,7 @@ extern const int MFResolutions[];
// #define DEBUG_FONT
-TeXFontDefinition::TeXFontDefinition(TQString nfontname, double _displayResolution_in_dpi, Q_UINT32 chk, Q_INT32 _scaled_size_in_DVI_units,
+TeXFontDefinition::TeXFontDefinition(TQString nfontname, double _displayResolution_in_dpi, TQ_UINT32 chk, TQ_INT32 _scaled_size_in_DVI_units,
class fontPool *pool, double _enlargement)
{
#ifdef DEBUG_FONT
@@ -46,7 +46,7 @@ TeXFontDefinition::TeXFontDefinition(TQString nfontname, double _displayResoluti
checksum = chk;
flags = TeXFontDefinition::FONT_IN_USE;
file = 0;
- filename = TQString::null;
+ filename = TQString();
scaled_size_in_DVI_units = _scaled_size_in_DVI_units;
macrotable = 0;
@@ -93,8 +93,8 @@ void TeXFontDefinition::fontNameReceiver(const TQString& fname)
flags |= TeXFontDefinition::FONT_LOADED;
filename = fname;
#ifdef HAVE_FREETYPE
- fullFontName = TQString::null;
- fullEncodingName = TQString::null;
+ fullFontName = TQString();
+ fullEncodingName = TQString();
#endif
file = fopen(TQFile::encodeName(filename), "r");
@@ -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.").arg(fontname).arg(filename) << endl;
+ kdError(4300) << i18n("Cannot find font %1, file %2.").tqarg(fontname).tqarg(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").arg(filename) << endl;
+ kdWarning(4300) << i18n("Checksum mismatch for font file %1").tqarg(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").arg(filename) << endl;
+ kdError(4300) << i18n("Cannot recognize format for font file %1").tqarg(filename) << endl;
#endif
}
@@ -195,7 +195,7 @@ void TeXFontDefinition::reset()
vf_table.clear();
}
- filename = TQString::null;
+ filename = TQString();
flags = TeXFontDefinition::FONT_IN_USE;
set_char_p = &dviRenderer::set_empty_char;
}
diff --git a/kdvi/TeXFontDefinition.h b/kdvi/TeXFontDefinition.h
index d64e6d59..9097b2cb 100644
--- a/kdvi/TeXFontDefinition.h
+++ b/kdvi/TeXFontDefinition.h
@@ -1,6 +1,6 @@
// -*- C++ -*-
/*
- * The layout of a font information block.
+ * The tqlayout 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.
@@ -35,7 +35,7 @@ class macro {
unsigned char *pos; /* address of first byte of macro */
unsigned char *end; /* address of last+1 byte */
- Q_INT32 dvi_advance_in_units_of_design_size_by_2e20; /* DVI units to move reference point */
+ TQ_INT32 dvi_advance_in_units_of_design_size_by_2e20; /* DVI units to move reference point */
bool free_me; // if memory at pos should be returned on destruction
};
@@ -56,7 +56,7 @@ class TeXFontDefinition {
};
- TeXFontDefinition(TQString nfontname, double _displayResolution_in_dpi, Q_UINT32 chk, Q_INT32 _scaled_size_in_DVI_units,
+ TeXFontDefinition(TQString nfontname, double _displayResolution_in_dpi, TQ_UINT32 chk, TQ_INT32 _scaled_size_in_DVI_units,
class fontPool *pool, double _enlargement);
~TeXFontDefinition();
@@ -74,7 +74,7 @@ class TeXFontDefinition {
TQString fontname; // name of font, such as "cmr10"
unsigned char flags; // flags byte (see values below)
double enlargement;
- Q_INT32 scaled_size_in_DVI_units; // Scaled size from the font definition command; in DVI units
+ TQ_INT32 scaled_size_in_DVI_units; // Scaled size from the font definition command; in DVI units
set_char_proc set_char_p; // proc used to set char
// Resolution of the display device (resolution will usually be
@@ -100,20 +100,20 @@ class TeXFontDefinition {
/** For FREETYPE fonts, which use a map file, this field will
contain the full name of the font (e.g. 'Computer Modern'). If
the name does not exist, or cannot be found, this field will be
- TQString::null. Only subclasses of TeXFont should write into this
+ TQString(). Only subclasses of TeXFont should write into this
field. */
TQString fullFontName;
/** For FREETYPE fonts, which use a map file, this field will
contain the full name of the font encoding (e.g. 'TexBase1'). If
the encoding name does not exist, or cannot be found, this field
- will be TQString::null. Only subclasses of TeXFont should write
+ will be TQString(). Only subclasses of TeXFont should write
into this field. */
TQString fullEncodingName;
#endif
private:
- Q_UINT32 checksum;
+ TQ_UINT32 checksum;
/** This will be set to a human-readable description of the font,
e.g. "virtual" or "TeX PK", or "Type 1" */
diff --git a/kdvi/TeXFont_PFB.cpp b/kdvi/TeXFont_PFB.cpp
index 2b3883fe..a017259d 100644
--- a/kdvi/TeXFont_PFB.cpp
+++ b/kdvi/TeXFont_PFB.cpp
@@ -26,28 +26,28 @@
//#define DEBUG_PFB 1
-TeXFont_PFB::TeXFont_PFB(TeXFontDefinition *parent, fontEncoding *enc, double slant)
- : TeXFont(parent)
+TeXFont_PFB::TeXFont_PFB(TeXFontDefinition *tqparent, fontEncoding *enc, double slant)
+ : TeXFont(tqparent)
{
#ifdef DEBUG_PFB
if (enc != 0)
- kdDebug(4300) << "TeXFont_PFB::TeXFont_PFB( parent=" << parent << ", encoding=" << enc->encodingFullName << " )" << endl;
+ kdDebug(4300) << "TeXFont_PFB::TeXFont_PFB( tqparent=" << tqparent << ", encoding=" << enc->encodingFullName << " )" << endl;
else
- kdDebug(4300) << "TeXFont_PFB::TeXFont_PFB( parent=" << parent << ", encoding=0 )" << endl;
+ kdDebug(4300) << "TeXFont_PFB::TeXFont_PFB( tqparent=" << tqparent << ", encoding=0 )" << endl;
#endif
fatalErrorInFontLoading = false;
- int error = FT_New_Face( parent->font_pool->FreeType_library, parent->filename.local8Bit(), 0, &face );
+ int error = FT_New_Face( tqparent->font_pool->FreeType_library, tqparent->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.").arg(parent->filename);
+ errorMessage = i18n("The font file %1 could be opened and read, but its font format is unsupported.").tqarg(tqparent->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.").arg(parent->filename);
+ errorMessage = i18n("The font file %1 is broken, or it could not be opened or read.").tqarg(tqparent->filename);
kdError(4300) << errorMessage << endl;
fatalErrorInFontLoading = true;
return;
@@ -66,7 +66,7 @@ TeXFont_PFB::TeXFont_PFB(TeXFontDefinition *parent, fontEncoding *enc, double sl
}
if (face->family_name != 0)
- parent->fullFontName = face->family_name;
+ tqparent->fullFontName = face->family_name;
// Finally, we need to set up the charMap array, which maps TeX
// character codes to glyph indices in the font. (Remark: the
@@ -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::fromLatin1( "Encoding" ));
- parent->fullEncodingName = enc->encodingFullName.remove(TQString::fromLatin1( "encoding" ));
+ tqparent->fullEncodingName = enc->encodingFullName.remove(TQString::tqfromLatin1( "Encoding" ));
+ tqparent->fullEncodingName = enc->encodingFullName.remove(TQString::tqfromLatin1( "encoding" ));
// An encoding vector is given for this font, i.e. an array of
// character names (such as: 'parenleft' or 'dotlessj'). We use
@@ -138,7 +138,7 @@ TeXFont_PFB::~TeXFont_PFB()
}
-glyph *TeXFont_PFB::getGlyph(Q_UINT16 ch, bool generateCharacterPixmap, const TQColor& color)
+glyph *TeXFont_PFB::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const TQColor& color)
{
#ifdef DEBUG_PFB
kdDebug(4300) << "TeXFont_PFB::getGlyph( ch=" << ch << ", '" << (char)(ch) << "', generateCharacterPixmap=" << generateCharacterPixmap << " )" << endl;
@@ -159,16 +159,16 @@ glyph *TeXFont_PFB::getGlyph(Q_UINT16 ch, bool generateCharacterPixmap, const TQ
if ((generateCharacterPixmap == true) && ((g->shrunkenCharacter.isNull()) || (color != g->color)) ) {
int error;
- unsigned int res = (unsigned int)(parent->displayResolution_in_dpi/parent->enlargement +0.5);
+ unsigned int res = (unsigned int)(tqparent->displayResolution_in_dpi/tqparent->enlargement +0.5);
g->color = color;
// Character height in 1/64th of points (reminder: 1 pt = 1/72 inch)
// Only approximate, may vary from file to file!!!! @@@@@
- 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 );
+ long int characterSize_in_printers_points_by_64 = (long int)((64.0*72.0*tqparent->scaled_size_in_DVI_units*tqparent->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.").arg(parent->filename);
+ TQString msg = i18n("FreeType reported an error when setting the character size for font file %1.").tqarg(tqparent->filename);
if (errorMessage.isEmpty())
errorMessage = msg;
kdError(4300) << msg << endl;
@@ -178,13 +178,13 @@ glyph *TeXFont_PFB::getGlyph(Q_UINT16 ch, bool generateCharacterPixmap, const TQ
}
// load glyph image into the slot and erase the previous one
- if (parent->font_pool->getUseFontHints() == true)
+ if (tqparent->font_pool->getUseFontHints() == true)
error = FT_Load_Glyph(face, charMap[ch], FT_LOAD_DEFAULT );
else
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.").arg(ch).arg(parent->filename);
+ TQString msg = i18n("FreeType is unable to load glyph #%1 from font file %2.").tqarg(ch).tqarg(tqparent->filename);
if (errorMessage.isEmpty())
errorMessage = msg;
kdError(4300) << msg << endl;
@@ -196,7 +196,7 @@ glyph *TeXFont_PFB::getGlyph(Q_UINT16 ch, bool generateCharacterPixmap, const TQ
// 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.").arg(ch).arg(parent->filename);
+ TQString msg = i18n("FreeType is unable to render glyph #%1 from font file %2.").tqarg(ch).tqarg(tqparent->filename);
if (errorMessage.isEmpty())
errorMessage = msg;
kdError(4300) << msg << endl;
@@ -209,8 +209,8 @@ glyph *TeXFont_PFB::getGlyph(Q_UINT16 ch, bool generateCharacterPixmap, const TQ
if ((slot->bitmap.width == 0) || (slot->bitmap.rows == 0)) {
if (errorMessage.isEmpty())
- 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;
+ errorMessage = i18n("Glyph #%1 is empty.").tqarg(ch);
+ kdError(4300) << i18n("Glyph #%1 from font file %2 is empty.").tqarg(ch).tqarg(tqparent->filename) << endl;
g->shrunkenCharacter.resize( 15, 15 );
g->shrunkenCharacter.fill(TQColor(255, 0, 0));
g->x2 = 0;
@@ -219,9 +219,9 @@ glyph *TeXFont_PFB::getGlyph(Q_UINT16 ch, bool generateCharacterPixmap, const TQ
TQImage imgi(slot->bitmap.width, slot->bitmap.rows, 32);
imgi.setAlphaBuffer(true);
- // Do QPixmaps fully support the alpha channel? If yes, we use
+ // Do TQPixmaps fully support the alpha channel? If yes, we use
// that. Otherwise, use other routines as a fallback
- if (parent->font_pool->QPixmapSupportsAlpha) {
+ if (tqparent->font_pool->TQPixmapSupportsAlpha) {
// If the alpha channel is properly supported, we set the
// character glyph to a colored rectangle, and define the
// character outline only using the alpha channel. That
@@ -239,7 +239,7 @@ glyph *TeXFont_PFB::getGlyph(Q_UINT16 ch, bool generateCharacterPixmap, const TQ
}
} else {
// If the alpha channel is not supported... QT seems to turn
- // the alpha channel into a crude bitmap which is used to mask
+ // the alpha channel into a crude bitmap which is used to tqmask
// the resulting TQPixmap. In this case, we define the
// character outline using the image data, and use the alpha
// channel only to store "maximally opaque" or "completely
@@ -248,18 +248,18 @@ glyph *TeXFont_PFB::getGlyph(Q_UINT16 ch, bool generateCharacterPixmap, const TQ
// quality is still sufficient for most purposes. One notable
// exception is output from the gftodvi program, which will be
// partially unreadable.
- Q_UINT16 rInv = 0xFF - color.red();
- Q_UINT16 gInv = 0xFF - color.green();
- Q_UINT16 bInv = 0xFF - color.blue();
+ TQ_UINT16 rInv = 0xFF - color.red();
+ TQ_UINT16 gInv = 0xFF - color.green();
+ TQ_UINT16 bInv = 0xFF - color.blue();
- for(Q_UINT16 y=0; y<slot->bitmap.rows; y++) {
- Q_UINT8 *srcScanLine = slot->bitmap.buffer + y*slot->bitmap.pitch;
+ for(TQ_UINT16 y=0; y<slot->bitmap.rows; y++) {
+ TQ_UINT8 *srcScanLine = slot->bitmap.buffer + y*slot->bitmap.pitch;
unsigned int *destScanLine = (unsigned int *)imgi.scanLine(y);
- for(Q_UINT16 col=0; col<slot->bitmap.width; col++) {
- Q_UINT16 data = *srcScanLine;
+ for(TQ_UINT16 col=0; col<slot->bitmap.width; col++) {
+ TQ_UINT16 data = *srcScanLine;
// The value stored in "data" now has the following meaning:
// data = 0 -> white; data = 0xff -> use "color"
- *destScanLine = qRgba(0xFF - (rInv*data + 0x7F) / 0xFF,
+ *destScanLine = tqRgba(0xFF - (rInv*data + 0x7F) / 0xFF,
0xFF - (gInv*data + 0x7F) / 0xFF,
0xFF - (bInv*data + 0x7F) / 0xFF,
(data > 0x03) ? 0xff : 0x00);
@@ -279,13 +279,13 @@ glyph *TeXFont_PFB::getGlyph(Q_UINT16 ch, bool generateCharacterPixmap, const TQ
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.").arg(ch).arg(parent->filename);
+ TQString msg = i18n("FreeType is unable to load metric for glyph #%1 from font file %2.").tqarg(ch).tqarg(tqparent->filename);
if (errorMessage.isEmpty())
errorMessage = msg;
kdError(4300) << msg << endl;
g->dvi_advance_in_units_of_design_size_by_2e20 = 1;
}
- g->dvi_advance_in_units_of_design_size_by_2e20 = (Q_INT32)(((Q_INT64)(1<<20) * (Q_INT64)face->glyph->metrics.horiAdvance) / (Q_INT64)face->units_per_EM);
+ g->dvi_advance_in_units_of_design_size_by_2e20 = (TQ_INT32)(((TQ_INT64)(1<<20) * (TQ_INT64)face->glyph->metrics.horiAdvance) / (TQ_INT64)face->units_per_EM);
}
return g;
diff --git a/kdvi/TeXFont_PFB.h b/kdvi/TeXFont_PFB.h
index 4e2d8122..45d94be4 100644
--- a/kdvi/TeXFont_PFB.h
+++ b/kdvi/TeXFont_PFB.h
@@ -23,15 +23,15 @@ class glyph;
class TeXFont_PFB : public TeXFont {
public:
- TeXFont_PFB(TeXFontDefinition *parent, fontEncoding *enc=0, double slant=0.0 );
+ TeXFont_PFB(TeXFontDefinition *tqparent, fontEncoding *enc=0, double slant=0.0 );
~TeXFont_PFB();
- glyph* getGlyph(Q_UINT16 character, bool generateCharacterPixmap=false, const TQColor& color=Qt::black);
+ glyph* getGlyph(TQ_UINT16 character, bool generateCharacterPixmap=false, const TQColor& color=TQt::black);
private:
FT_Face face;
bool fatalErrorInFontLoading;
- Q_UINT16 charMap[256];
+ TQ_UINT16 charMap[256];
// This matrix is used internally to describes the slant, if
// nonzero. Otherwise, this is undefined.
diff --git a/kdvi/TeXFont_PK.cpp b/kdvi/TeXFont_PK.cpp
index 7e1ce60d..562c40f9 100644
--- a/kdvi/TeXFont_PK.cpp
+++ b/kdvi/TeXFont_PK.cpp
@@ -80,18 +80,18 @@ extern void oops(TQString message);
-TeXFont_PK::TeXFont_PK(TeXFontDefinition *parent)
- : TeXFont(parent)
+TeXFont_PK::TeXFont_PK(TeXFontDefinition *tqparent)
+ : TeXFont(tqparent)
{
#ifdef DEBUG_PK
- kdDebug(4300) << "TeXFont_PK::TeXFont_PK( parent=" << parent << ")" << endl;
+ kdDebug(4300) << "TeXFont_PK::TeXFont_PK( tqparent=" << tqparent << ")" << endl;
#endif
for(unsigned int i=0; i<TeXFontDefinition::max_num_of_chars_in_font; i++)
characterBitmaps[i] = 0;
- file = fopen(TQFile::encodeName(parent->filename), "r");
+ file = fopen(TQFile::encodeName(tqparent->filename), "r");
if (file == 0)
- kdError(4300) << i18n("Cannot open font file %1.").arg(parent->filename) << endl;
+ kdError(4300) << i18n("Cannot open font file %1.").tqarg(tqparent->filename) << endl;
#ifdef DEBUG_PK
else
kdDebug(4300) << "TeXFont_PK::TeXFont_PK(): file opened successfully" << endl;
@@ -116,7 +116,7 @@ TeXFont_PK::~TeXFont_PK()
}
-glyph* TeXFont_PK::getGlyph(Q_UINT16 ch, bool generateCharacterPixmap, const TQColor& color)
+glyph* TeXFont_PK::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const TQColor& color)
{
#ifdef DEBUG_PK
kdDebug(4300) << "TeXFont_PK::getGlyph( ch=" << ch << ", generateCharacterPixmap=" << generateCharacterPixmap << " )" << endl;
@@ -136,7 +136,7 @@ glyph* TeXFont_PK::getGlyph(Q_UINT16 ch, bool generateCharacterPixmap, const TQC
// 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").arg(ch).arg(parent->filename) << endl;
+ kdError(4300) << i18n("TexFont_PK::operator[]: Character %1 not defined in font %2").tqarg(ch).tqarg(tqparent->filename) << endl;
g->addr = -1;
return g;
}
@@ -163,7 +163,7 @@ glyph* TeXFont_PK::getGlyph(Q_UINT16 ch, bool generateCharacterPixmap, const TQC
((g->shrunkenCharacter.isNull()) || (color != g->color)) &&
(characterBitmaps[ch]->w != 0)) {
g->color = color;
- double shrinkFactor = 1200 / parent->displayResolution_in_dpi;
+ double shrinkFactor = 1200 / tqparent->displayResolution_in_dpi;
// All is fine? Then we rescale the bitmap in order to produce the
// required pixmap. Rescaling a character, however, is an art
@@ -209,10 +209,10 @@ glyph* TeXFont_PK::getGlyph(Q_UINT16 ch, bool generateCharacterPixmap, const TQC
// Turn the image into 8 bit
TQByteArray translated(characterBitmaps[ch]->w * characterBitmaps[ch]->h);
- Q_UINT8 *data = (Q_UINT8 *)translated.data();
+ TQ_UINT8 *data = (TQ_UINT8 *)translated.data();
for(int x=0; x<characterBitmaps[ch]->w; x++)
for(int y=0; y<characterBitmaps[ch]->h; y++) {
- Q_UINT8 bit = *(characterBitmaps[ch]->bits + characterBitmaps[ch]->bytes_wide*y + (x >> 3));
+ TQ_UINT8 bit = *(characterBitmaps[ch]->bits + characterBitmaps[ch]->bytes_wide*y + (x >> 3));
bit = bit >> (x & 7);
bit = bit & 1;
data[characterBitmaps[ch]->w*y + x] = bit;
@@ -220,7 +220,7 @@ glyph* TeXFont_PK::getGlyph(Q_UINT16 ch, bool generateCharacterPixmap, const TQC
// Now shrink the image. We shrink the X-direction first
TQByteArray xshrunk(shrunk_width*characterBitmaps[ch]->h);
- Q_UINT8 *xdata = (Q_UINT8 *)xshrunk.data();
+ TQ_UINT8 *xdata = (TQ_UINT8 *)xshrunk.data();
// Do the shrinking. The pixel (x,y) that we want to calculate
// corresponds to the line segment from
@@ -231,7 +231,7 @@ glyph* TeXFont_PK::getGlyph(Q_UINT16 ch, bool generateCharacterPixmap, const TQC
for(int y=0; y<characterBitmaps[ch]->h; y++)
for(int x=0; x<shrunk_width; x++) {
- Q_UINT32 value = 0;
+ TQ_UINT32 value = 0;
double destStartX = shrinkFactor*x+srcXTrans;
double destEndX = shrinkFactor*(x+1)+srcXTrans;
for(int srcX=(int)ceil(destStartX); srcX<floor(destEndX); srcX++)
@@ -239,19 +239,19 @@ glyph* TeXFont_PK::getGlyph(Q_UINT16 ch, bool generateCharacterPixmap, const TQC
value += data[characterBitmaps[ch]->w*y + srcX] * 255;
if (destStartX >= 0.0)
- value += (Q_UINT32) (255.0*(ceil(destStartX)-destStartX) * data[characterBitmaps[ch]->w*y + (int)floor(destStartX)]);
+ value += (TQ_UINT32) (255.0*(ceil(destStartX)-destStartX) * data[characterBitmaps[ch]->w*y + (int)floor(destStartX)]);
if (floor(destEndX) < characterBitmaps[ch]->w)
- value += (Q_UINT32) (255.0*(destEndX-floor(destEndX)) * data[characterBitmaps[ch]->w*y + (int)floor(destEndX)]);
+ value += (TQ_UINT32) (255.0*(destEndX-floor(destEndX)) * data[characterBitmaps[ch]->w*y + (int)floor(destEndX)]);
xdata[shrunk_width*y + x] = (int)(value/shrinkFactor + 0.5);
}
// Now shrink the Y-direction
TQByteArray xyshrunk(shrunk_width*shrunk_height);
- Q_UINT8 *xydata = (Q_UINT8 *)xyshrunk.data();
+ TQ_UINT8 *xydata = (TQ_UINT8 *)xyshrunk.data();
for(int x=0; x<shrunk_width; x++)
for(int y=0; y<shrunk_height; y++) {
- Q_UINT32 value = 0;
+ TQ_UINT32 value = 0;
double destStartY = shrinkFactor*y+srcYTrans;
double destEndY = shrinkFactor*(y+1)+srcYTrans;
for(int srcY=(int)ceil(destStartY); srcY<floor(destEndY); srcY++)
@@ -259,31 +259,31 @@ glyph* TeXFont_PK::getGlyph(Q_UINT16 ch, bool generateCharacterPixmap, const TQC
value += xdata[shrunk_width*srcY + x];
if (destStartY >= 0.0)
- value += (Q_UINT32) ((ceil(destStartY)-destStartY) * xdata[shrunk_width*(int)floor(destStartY) + x]);
+ value += (TQ_UINT32) ((ceil(destStartY)-destStartY) * xdata[shrunk_width*(int)floor(destStartY) + x]);
if (floor(destEndY) < characterBitmaps[ch]->h)
- value += (Q_UINT32) ((destEndY-floor(destEndY)) * xdata[shrunk_width*(int)floor(destEndY) + x]);
+ value += (TQ_UINT32) ((destEndY-floor(destEndY)) * xdata[shrunk_width*(int)floor(destEndY) + x]);
xydata[shrunk_width*y + x] = (int)(value/shrinkFactor);
}
TQImage im32(shrunk_width, shrunk_height, 32);
im32.setAlphaBuffer(true);
- // Do QPixmaps fully support the alpha channel? If yes, we use
+ // Do TQPixmaps fully support the alpha channel? If yes, we use
// that. Otherwise, use other routines as a fallback
- if (parent->font_pool->QPixmapSupportsAlpha) {
+ if (tqparent->font_pool->TQPixmapSupportsAlpha) {
// If the alpha channel is properly supported, we set the
// character glyph to a colored rectangle, and define the
// character outline only using the alpha channel. That ensures
// good quality rendering for overlapping characters.
- im32.fill(qRgb(color.red(), color.green(), color.blue()));
- for(Q_UINT16 y=0; y<shrunk_height; y++) {
- Q_UINT8 *destScanLine = (Q_UINT8 *)im32.scanLine(y);
- for(Q_UINT16 col=0; col<shrunk_width; col++)
+ im32.fill(tqRgb(color.red(), color.green(), color.blue()));
+ for(TQ_UINT16 y=0; y<shrunk_height; y++) {
+ TQ_UINT8 *destScanLine = (TQ_UINT8 *)im32.scanLine(y);
+ for(TQ_UINT16 col=0; col<shrunk_width; col++)
destScanLine[4*col+3] = xydata[shrunk_width*y + col];
}
} else {
// If the alpha channel is not supported... QT seems to turn the
- // alpha channel into a crude bitmap which is used to mask the
+ // alpha channel into a crude bitmap which is used to tqmask the
// resulting TQPixmap. In this case, we define the character
// outline using the image data, and use the alpha channel only
// to store "maximally opaque" or "completely transparent"
@@ -291,18 +291,18 @@ glyph* TeXFont_PK::getGlyph(Q_UINT16 ch, bool generateCharacterPixmap, const TQC
// are no longer correctly drawn, but quality is still
// sufficient for most purposes. One notable exception is output
// from the gftodvi program, which will be partially unreadable.
- Q_UINT16 rInv = 0xFF - color.red();
- Q_UINT16 gInv = 0xFF - color.green();
- Q_UINT16 bInv = 0xFF - color.blue();
+ TQ_UINT16 rInv = 0xFF - color.red();
+ TQ_UINT16 gInv = 0xFF - color.green();
+ TQ_UINT16 bInv = 0xFF - color.blue();
- Q_UINT8 *srcScanLine = xydata;
- for(Q_UINT16 y=0; y<shrunk_height; y++) {
+ TQ_UINT8 *srcScanLine = xydata;
+ for(TQ_UINT16 y=0; y<shrunk_height; y++) {
unsigned int *destScanLine = (unsigned int *)im32.scanLine(y);
- for(Q_UINT16 col=0; col<shrunk_width; col++) {
- Q_UINT16 data = *srcScanLine;
+ for(TQ_UINT16 col=0; col<shrunk_width; col++) {
+ TQ_UINT16 data = *srcScanLine;
// The value stored in "data" now has the following meaning:
// data = 0 -> white; data = 0xff -> use "color"
- *destScanLine = qRgba(0xFF - (rInv*data + 0x7F) / 0xFF,
+ *destScanLine = tqRgba(0xFF - (rInv*data + 0x7F) / 0xFF,
0xFF - (gInv*data + 0x7F) / 0xFF,
0xFF - (bInv*data + 0x7F) / 0xFF,
(data > 0x03) ? 0xff : 0x00);
@@ -320,8 +320,8 @@ glyph* TeXFont_PK::getGlyph(Q_UINT16 ch, bool generateCharacterPixmap, const TQC
-#define ADD(a, b) ((Q_UINT32 *) (((char *) a) + b))
-#define SUB(a, b) ((Q_UINT32 *) (((char *) a) - b))
+#define ADD(a, b) ((TQ_UINT32 *) (((char *) a) + b))
+#define SUB(a, b) ((TQ_UINT32 *) (((char *) a) - b))
@@ -347,7 +347,7 @@ static const uchar bitflip[256] = {
15, 143, 79, 207, 47, 175, 111, 239, 31, 159, 95, 223, 63, 191, 127, 255
};
-static Q_UINT32 bit_masks[33] = {
+static TQ_UINT32 bit_tqmasks[33] = {
0x0, 0x1, 0x3, 0x7,
0xf, 0x1f, 0x3f, 0x7f,
0xff, 0x1ff, 0x3ff, 0x7ff,
@@ -454,7 +454,7 @@ void TeXFont_PK::PK_skip_specials()
case PK_NOOP :
break;
default :
- oops(i18n("Unexpected %1 in PK file %2").arg(PK_flag_byte).arg(parent->filename) );
+ oops(i18n("Unexpected %1 in PK file %2").tqarg(PK_flag_byte).tqarg(tqparent->filename) );
break;
}
}
@@ -477,11 +477,11 @@ void TeXFont_PK::read_PK_char(unsigned int ch)
int n;
int row_bit_pos;
bool paint_switch;
- Q_UINT32 *cp;
+ TQ_UINT32 *cp;
register struct glyph *g;
register FILE *fp = file;
long fpwidth;
- Q_UINT32 word = 0;
+ TQ_UINT32 word = 0;
int word_weight, bytes_wide;
int rows_left, h_bit, count;
@@ -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").arg(ch).arg(parent->filename));
+ oops(i18n("The character %1 is too large in file %2").tqarg(ch).tqarg(tqparent->filename));
characterBitmaps[ch]->w = w;
characterBitmaps[ch]->h = h;
}
@@ -537,7 +537,7 @@ void TeXFont_PK::read_PK_char(unsigned int ch)
characterBitmaps[ch]->bits = new char[size != 0 ? size : 1];
}
- cp = (Q_UINT32 *) characterBitmaps[ch]->bits;
+ cp = (TQ_UINT32 *) characterBitmaps[ch]->bits;
/*
* read character data into *cp
@@ -595,12 +595,12 @@ void TeXFont_PK::read_PK_char(unsigned int ch)
h_bit -= count;
word_weight -= count;
if (paint_switch)
- word |= bit_masks[count] << word_weight;
+ word |= bit_tqmasks[count] << word_weight;
count = 0;
} else
if (count >= h_bit && h_bit <= word_weight) {
if (paint_switch)
- word |= bit_masks[h_bit] << (word_weight - h_bit);
+ word |= bit_tqmasks[h_bit] << (word_weight - h_bit);
*cp++ = word;
/* "output" row(s) */
for (i = PK_repeat_count * bytes_wide / 4; i > 0; --i) {
@@ -615,7 +615,7 @@ void TeXFont_PK::read_PK_char(unsigned int ch)
h_bit = characterBitmaps[ch]->w;
} else {
if (paint_switch)
- word |= bit_masks[word_weight];
+ word |= bit_tqmasks[word_weight];
*cp++ = word;
word = 0;
count -= word_weight;
@@ -625,10 +625,10 @@ void TeXFont_PK::read_PK_char(unsigned int ch)
}
paint_switch = 1 - paint_switch;
}
- if (cp != ((Q_UINT32 *) (characterBitmaps[ch]->bits + bytes_wide * characterBitmaps[ch]->h)))
- oops(i18n("Wrong number of bits stored: char. %1, font %2").arg(ch).arg(parent->filename));
+ 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(tqparent->filename));
if (rows_left != 0 || h_bit != characterBitmaps[ch]->w)
- oops(i18n("Bad pk file (%1), too many bits").arg(parent->filename));
+ oops(i18n("Bad pk file (%1), too many bits").tqarg(tqparent->filename));
}
// The data in the bitmap is now in the processor's bit order,
@@ -679,14 +679,14 @@ void TeXFont_PK::read_PK_char(unsigned int ch)
while (count > 0) {
if (count < word_weight && count < h_bit) {
if (paint_switch)
- word |= bit_masks[count] << (32 - word_weight);
+ word |= bit_tqmasks[count] << (32 - word_weight);
h_bit -= count;
word_weight -= count;
count = 0;
} else
if (count >= h_bit && h_bit <= word_weight) {
if (paint_switch)
- word |= bit_masks[h_bit] << (32 - word_weight);
+ word |= bit_tqmasks[h_bit] << (32 - word_weight);
*cp++ = word;
/* "output" row(s) */
for (i = PK_repeat_count * bytes_wide / 4; i > 0; --i) {
@@ -701,7 +701,7 @@ void TeXFont_PK::read_PK_char(unsigned int ch)
h_bit = characterBitmaps[ch]->w;
} else {
if (paint_switch)
- word |= bit_masks[word_weight] << (32 - word_weight);
+ word |= bit_tqmasks[word_weight] << (32 - word_weight);
*cp++ = word;
word = 0;
count -= word_weight;
@@ -711,10 +711,10 @@ void TeXFont_PK::read_PK_char(unsigned int ch)
}
paint_switch = 1 - paint_switch;
}
- if (cp != ((Q_UINT32 *) (characterBitmaps[ch]->bits + bytes_wide * characterBitmaps[ch]->h)))
- oops(i18n("Wrong number of bits stored: char. %1, font %2").arg(ch).arg(parent->filename));
+ 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(tqparent->filename));
if (rows_left != 0 || h_bit != characterBitmaps[ch]->w)
- oops(i18n("Bad pk file (%1), too many bits").arg(parent->filename));
+ oops(i18n("Bad pk file (%1), too many bits").tqarg(tqparent->filename));
}
} // endif: big or small Endian?
}
diff --git a/kdvi/TeXFont_PK.h b/kdvi/TeXFont_PK.h
index 80a0c0e1..68935d16 100644
--- a/kdvi/TeXFont_PK.h
+++ b/kdvi/TeXFont_PK.h
@@ -9,10 +9,10 @@ class glyph;
class TeXFont_PK : public TeXFont {
public:
- TeXFont_PK(TeXFontDefinition *parent);
+ TeXFont_PK(TeXFontDefinition *tqparent);
~TeXFont_PK();
- glyph* getGlyph(Q_UINT16 character, bool generateCharacterPixmap=false, const TQColor& color=Qt::black);
+ glyph* getGlyph(TQ_UINT16 character, bool generateCharacterPixmap=false, const TQColor& color=TQt::black);
private:
FILE *file; // open font file or NULL
diff --git a/kdvi/TeXFont_TFM.cpp b/kdvi/TeXFont_TFM.cpp
index c8268f01..ebd1b7f5 100644
--- a/kdvi/TeXFont_TFM.cpp
+++ b/kdvi/TeXFont_TFM.cpp
@@ -21,14 +21,14 @@
//#define DEBUG_TFM
-TeXFont_TFM::TeXFont_TFM(TeXFontDefinition *parent)
- : TeXFont(parent)
+TeXFont_TFM::TeXFont_TFM(TeXFontDefinition *tqparent)
+ : TeXFont(tqparent)
{
#ifdef DEBUG_TFM
- kdDebug(4300) << "TeXFont_TFM::TeXFont_TFM( parent=" << parent << " )" << endl;
+ kdDebug(4300) << "TeXFont_TFM::TeXFont_TFM( tqparent=" << tqparent << " )" << endl;
#endif
- TQFile file( parent->filename );
+ TQFile file( tqparent->filename );
if ( !file.open( IO_ReadOnly ) ) {
kdError(4300) << "TeXFont_TFM::TeXFont_TFM(): Could not read TFM file" << endl;
return;
@@ -37,7 +37,7 @@ TeXFont_TFM::TeXFont_TFM(TeXFontDefinition *parent)
// Data from the very beginning of the TFM file, as specified in
// "The DVI Driver Standard, Level 0", section D.2.1
- Q_UINT16 lf, lh, bc, ec, nw, nh, nd;
+ TQ_UINT16 lf, lh, bc, ec, nw, nh, nd;
stream >> lf >> lh >> bc >> ec >> nw >> nh >> nd;
#ifdef DEBUG_TFM
kdDebug(4300) << "lf= " << lf << endl
@@ -49,7 +49,7 @@ TeXFont_TFM::TeXFont_TFM(TeXFontDefinition *parent)
<< "nd= " << nd << endl;
#endif
if ((bc > ec) || (ec >= TeXFontDefinition::max_num_of_chars_in_font)) {
- kdError(4300) << "TeXFont_TFM::TeXFont_TFM( filename=" << parent->filename << " ): The font has an invalid bc and ec entries." << endl;
+ kdError(4300) << "TeXFont_TFM::TeXFont_TFM( filename=" << tqparent->filename << " ): The font has an invalid bc and ec entries." << endl;
file.close();
return;
}
@@ -94,10 +94,10 @@ TeXFont_TFM::TeXFont_TFM(TeXFontDefinition *parent)
for(unsigned int characterCode=bc; characterCode<ec; characterCode++) {
glyph *g = glyphtable+characterCode;
- Q_UINT8 byte;
+ TQ_UINT8 byte;
stream >> byte;
if (byte >= nw)
- kdError(4300) << "TeXFont_TFM::TeXFont_TFM( filename=" << parent->filename << " ): The font has an invalid Char-Info table." << endl;
+ kdError(4300) << "TeXFont_TFM::TeXFont_TFM( filename=" << tqparent->filename << " ): The font has an invalid Char-Info table." << endl;
else {
characterWidth_in_units_of_design_size[characterCode] = widthTable_in_units_of_design_size[byte];
g->dvi_advance_in_units_of_design_size_by_2e20 = widthTable_in_units_of_design_size[byte].value;
@@ -106,7 +106,7 @@ TeXFont_TFM::TeXFont_TFM(TeXFontDefinition *parent)
stream >> byte;
byte = byte >> 4;
if (byte >= nh)
- kdError(4300) << "TeXFont_TFM::TeXFont_TFM( filename=" << parent->filename << " ): The font has an invalid Char-Info table." << endl;
+ kdError(4300) << "TeXFont_TFM::TeXFont_TFM( filename=" << tqparent->filename << " ): The font has an invalid Char-Info table." << endl;
else
characterHeight_in_units_of_design_size[characterCode] = heightTable_in_units_of_design_size[byte];
@@ -122,7 +122,7 @@ TeXFont_TFM::~TeXFont_TFM()
}
-glyph *TeXFont_TFM::getGlyph(Q_UINT16 characterCode, bool generateCharacterPixmap, const TQColor& color)
+glyph *TeXFont_TFM::getGlyph(TQ_UINT16 characterCode, bool generateCharacterPixmap, const TQColor& color)
{
#ifdef DEBUG_TFM
kdDebug(4300) << "TeXFont_TFM::getGlyph( ch=" << ch << ", generateCharacterPixmap=" << generateCharacterPixmap << " )" << endl;
@@ -139,10 +139,10 @@ glyph *TeXFont_TFM::getGlyph(Q_UINT16 characterCode, bool generateCharacterPixma
if ((generateCharacterPixmap == true) && ((g->shrunkenCharacter.isNull()) || (color != g->color)) ) {
g->color = color;
- Q_UINT16 pixelWidth = (Q_UINT16)(parent->displayResolution_in_dpi *
+ TQ_UINT16 pixelWidth = (TQ_UINT16)(tqparent->displayResolution_in_dpi *
design_size_in_TeX_points.toDouble() *
characterWidth_in_units_of_design_size[characterCode].toDouble() * 100.0/7227.0 + 0.5);
- Q_UINT16 pixelHeight = (Q_UINT16)(parent->displayResolution_in_dpi *
+ TQ_UINT16 pixelHeight = (TQ_UINT16)(tqparent->displayResolution_in_dpi *
design_size_in_TeX_points.toDouble() *
characterHeight_in_units_of_design_size[characterCode].toDouble() * 100.0/7227.0 + 0.5);
diff --git a/kdvi/TeXFont_TFM.h b/kdvi/TeXFont_TFM.h
index 737c8bed..9a3639e0 100644
--- a/kdvi/TeXFont_TFM.h
+++ b/kdvi/TeXFont_TFM.h
@@ -14,19 +14,19 @@
class fix_word {
public:
- void fromINT32(Q_INT32 val) {value = val;}
- void fromDouble(double val) {value = (Q_INT32)(val * (1<<20) + 0.5);}
+ void fromINT32(TQ_INT32 val) {value = val;}
+ void fromDouble(double val) {value = (TQ_INT32)(val * (1<<20) + 0.5);}
double toDouble() {return (double(value)) / (double(1<<20));}
- Q_INT32 value;
+ TQ_INT32 value;
};
class TeXFont_TFM : public TeXFont {
public:
- TeXFont_TFM(TeXFontDefinition *parent);
+ TeXFont_TFM(TeXFontDefinition *tqparent);
~TeXFont_TFM();
- glyph* getGlyph(Q_UINT16 character, bool generateCharacterPixmap=false, const TQColor& color=Qt::black);
+ glyph* getGlyph(TQ_UINT16 character, bool generateCharacterPixmap=false, const TQColor& color=TQt::black);
private:
fix_word characterWidth_in_units_of_design_size[256];
diff --git a/kdvi/bigEndianByteReader.cpp b/kdvi/bigEndianByteReader.cpp
index 63d11f83..aa55bdd8 100644
--- a/kdvi/bigEndianByteReader.cpp
+++ b/kdvi/bigEndianByteReader.cpp
@@ -14,7 +14,7 @@
//#define DEBUG_ENDIANREADER
-Q_UINT8 bigEndianByteReader::readUINT8()
+TQ_UINT8 bigEndianByteReader::readUINT8()
{
// This check saveguards us against segmentation fault. It is also
// necessary for virtual fonts, which do not end whith EOP.
@@ -30,27 +30,27 @@ Q_UINT8 bigEndianByteReader::readUINT8()
return *(command_pointer++);
}
-Q_UINT16 bigEndianByteReader::readUINT16()
+TQ_UINT16 bigEndianByteReader::readUINT16()
{
// This check saveguards us against segmentation fault. It is also
// necessary for virtual fonts, which do not end whith EOP.
if (command_pointer >= end_pointer)
return EOP;
- Q_UINT16 a;
+ TQ_UINT16 a;
a = *(command_pointer++);
a = (a << 8) | *(command_pointer++);
return a;
}
-Q_UINT32 bigEndianByteReader::readUINT32()
+TQ_UINT32 bigEndianByteReader::readUINT32()
{
// This check saveguards us against segmentation fault. It is also
// necessary for virtual fonts, which do not end whith EOP.
if (command_pointer >= end_pointer)
return EOP;
- Q_UINT32 a;
+ TQ_UINT32 a;
a = *(command_pointer++);
a = (a << 8) | *(command_pointer++);
a = (a << 8) | *(command_pointer++);
@@ -58,33 +58,33 @@ Q_UINT32 bigEndianByteReader::readUINT32()
return a;
}
-void bigEndianByteReader::writeUINT32(Q_UINT32 a)
+void bigEndianByteReader::writeUINT32(TQ_UINT32 a)
{
// This check saveguards us against segmentation fault. It is also
// necessary for virtual fonts, which do not end whith EOP.
if (command_pointer >= end_pointer)
return;
- command_pointer[3] = (Q_UINT8)(a & 0xFF);
+ command_pointer[3] = (TQ_UINT8)(a & 0xFF);
a = a >> 8;
- command_pointer[2] = (Q_UINT8)(a & 0xFF);
+ command_pointer[2] = (TQ_UINT8)(a & 0xFF);
a = a >> 8;
- command_pointer[1] = (Q_UINT8)(a & 0xFF);
+ command_pointer[1] = (TQ_UINT8)(a & 0xFF);
a = a >> 8;
- command_pointer[0] = (Q_UINT8)(a & 0xFF);
+ command_pointer[0] = (TQ_UINT8)(a & 0xFF);
command_pointer += 4;
return;
}
-Q_UINT32 bigEndianByteReader::readUINT(Q_UINT8 size)
+TQ_UINT32 bigEndianByteReader::readUINT(TQ_UINT8 size)
{
// This check saveguards us against segmentation fault. It is also
// necessary for virtual fonts, which do not end whith EOP.
if (command_pointer >= end_pointer)
return EOP;
- Q_UINT32 a = 0;
+ TQ_UINT32 a = 0;
while (size > 0) {
a = (a << 8) + *(command_pointer++);
size--;
@@ -92,14 +92,14 @@ Q_UINT32 bigEndianByteReader::readUINT(Q_UINT8 size)
return a;
}
-Q_INT32 bigEndianByteReader::readINT(Q_UINT8 length)
+TQ_INT32 bigEndianByteReader::readINT(TQ_UINT8 length)
{
// This check saveguards us against segmentation fault. It is also
// necessary for virtual fonts, which do not end whith EOP.
if (command_pointer >= end_pointer)
return EOP;
- Q_INT32 a = *(command_pointer++);
+ TQ_INT32 a = *(command_pointer++);
if (a & 0x80)
a -= 0x100;
diff --git a/kdvi/bigEndianByteReader.h b/kdvi/bigEndianByteReader.h
index 06ef1b13..269d97d1 100644
--- a/kdvi/bigEndianByteReader.h
+++ b/kdvi/bigEndianByteReader.h
@@ -24,38 +24,38 @@ class bigEndianByteReader {
public:
/** Set this pointer to the location where the number resides which
you want to read. */
- Q_UINT8 * command_pointer;
+ TQ_UINT8 * command_pointer;
/** This pointer marks the end of the memory area where bytes can be
read. It should point to the first byte which CANNOT be
read. The idea is to have a safety net which protects us against
SEGFAULTs. This is also used in virtual fonts, where the macro
does not have an EOP command at the end of the macro. */
- Q_UINT8 * end_pointer;
+ TQ_UINT8 * end_pointer;
/** If command_pointer >= end_pointer, this method return EOP (=140)
and exists. Otherwise, the method returns the unsigned byte
and increases the command_pointer by one. */
- Q_UINT8 readUINT8();
+ TQ_UINT8 readUINT8();
/** Similar to the method above, only that the method reads a big
endian 2-byte word and increases the pointer by two. */
- Q_UINT16 readUINT16();
+ TQ_UINT16 readUINT16();
/** Similar to the method above, only that the method reads a big
endian 4-byte word and increases the pointer by four. */
- Q_UINT32 readUINT32();
+ TQ_UINT32 readUINT32();
- void writeUINT32(Q_UINT32 a);
+ void writeUINT32(TQ_UINT32 a);
/** Similar to the method above, only that the method reads a big
endian number of length size, where 1 <= size <= 4. Note that
the value 3 is allowed (and is acually used in DVI files)!!! */
- Q_UINT32 readUINT(Q_UINT8 size);
+ TQ_UINT32 readUINT(TQ_UINT8 size);
/** Similar to the method above, only that the method reads a SIGNED
number */
- Q_INT32 readINT(Q_UINT8);
+ TQ_INT32 readINT(TQ_UINT8);
};
diff --git a/kdvi/dviFile.cpp b/kdvi/dviFile.cpp
index 336507db..db365482 100644
--- a/kdvi/dviFile.cpp
+++ b/kdvi/dviFile.cpp
@@ -71,7 +71,7 @@ extern "C" {
dvifile::dvifile(const dvifile *old, fontPool *fp)
{
- errorMsg = TQString::null;
+ errorMsg = TQString();
errorCounter = 0;
page_offset = 0;
suggestedPageSize = 0;
@@ -107,7 +107,7 @@ void dvifile::process_preamble()
{
command_pointer = dvi_Data();
- Q_UINT8 magic_number = readUINT8();
+ TQ_UINT8 magic_number = readUINT8();
if (magic_number != PRE) {
errorMsg = i18n("The DVI file does not start with the preamble.");
return;
@@ -124,8 +124,8 @@ void dvifile::process_preamble()
how many centimeters there are in one TeX unit, as explained in
section A.3 of the DVI driver standard, Level 0, published by
the TUG DVI driver standards committee. */
- Q_UINT32 numerator = readUINT32();
- Q_UINT32 denominator = readUINT32();
+ TQ_UINT32 numerator = readUINT32();
+ TQ_UINT32 denominator = readUINT32();
_magnification = readUINT32();
cmPerDVIunit = (double(numerator) / double(denominator)) * (double(_magnification) / 1000.0) * (1.0 / 1e5);
@@ -165,7 +165,7 @@ void dvifile::find_postamble()
void dvifile::read_postamble()
{
- Q_UINT8 magic_byte = readUINT8();
+ TQ_UINT8 magic_byte = readUINT8();
if (magic_byte != POST) {
errorMsg = i18n("The postamble does not begin with the POST command.");
return;
@@ -181,17 +181,17 @@ void dvifile::read_postamble()
total_pages = readUINT16();
// As a next step, read the font definitions.
- Q_UINT8 cmnd = readUINT8();
+ TQ_UINT8 cmnd = readUINT8();
while (cmnd >= FNTDEF1 && cmnd <= FNTDEF4) {
- Q_UINT32 TeXnumber = readUINT(cmnd-FNTDEF1+1);
- Q_UINT32 checksum = readUINT32(); // Checksum of the font, as found by TeX in the TFM file
+ TQ_UINT32 TeXnumber = readUINT(cmnd-FNTDEF1+1);
+ TQ_UINT32 checksum = readUINT32(); // Checksum of the font, as found by TeX in the TFM file
// Read scale and design factor, and the name of the font. All
// these are explained in section A.4 of the DVI driver standard,
// Level 0, published by the TUG DVI driver standards committee
- Q_UINT32 scale = readUINT32();
- Q_UINT32 design = readUINT32();
- Q_UINT16 len = readUINT8() + readUINT8(); // Length of the font name, including the directory name
+ TQ_UINT32 scale = readUINT32();
+ TQ_UINT32 design = readUINT32();
+ TQ_UINT16 len = readUINT8() + readUINT8(); // Length of the font name, including the directory name
char *fontname = new char[len + 1];
strncpy(fontname, (char *)command_pointer, len );
fontname[len] = '\0';
@@ -248,7 +248,7 @@ void dvifile::prepare_pages()
page_offset[total_pages] = beginning_of_postamble;
- Q_UINT16 i = total_pages-1;
+ TQ_UINT16 i = total_pages-1;
page_offset[i] = last_page_offset;
// Follow back pointers through pages in the DVI file, storing the
@@ -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.").arg(i+1);
+ errorMsg = i18n("The page %1 does not start with the BOP command.").tqarg(i+1);
return;
}
command_pointer += 10 * 4;
@@ -273,7 +273,7 @@ dvifile::dvifile(const TQString& fname, fontPool* pool)
kdDebug(4300) << "init_dvi_file: " << fname << endl;
#endif
- errorMsg = TQString::null;
+ errorMsg = TQString();
errorCounter = 0;
page_offset = 0;
suggestedPageSize = 0;
@@ -340,10 +340,10 @@ void dvifile::renumber()
bool bigEndian;
qSysInfo (&wordSize, &bigEndian);
- for(Q_UINT32 i=1; i<=total_pages; i++) {
- Q_UINT8 *ptr = dviData.data() + page_offset[i-1]+1;
- Q_UINT8 *num = (Q_UINT8 *)&i;
- for(Q_UINT8 j=0; j<4; j++)
+ for(TQ_UINT32 i=1; i<=total_pages; i++) {
+ TQ_UINT8 *ptr = dviData.data() + page_offset[i-1]+1;
+ TQ_UINT8 *num = (TQ_UINT8 *)&i;
+ for(TQ_UINT8 j=0; j<4; j++)
if (bigEndian) {
*(ptr++) = num[0];
*(ptr++) = num[1];
@@ -362,14 +362,14 @@ void dvifile::renumber()
TQString dvifile::convertPDFtoPS(const TQString &PDFFilename)
{
// Check if the PDFFile is known
- TQMap<TQString, TQString>::Iterator it = convertedFiles.find(PDFFilename);
+ TQMap<TQString, TQString>::Iterator it = convertedFiles.tqfind(PDFFilename);
if (it != convertedFiles.end()) {
// PDF-File is known. Good.
return it.data();
}
// Get the name of a temporary file
- KTempFile tmpfile(TQString::null, ".ps");
+ KTempFile tmpfile(TQString(), ".ps");
TQString convertedFileName = tmpfile.name();
tmpfile.close();
tmpfile.unlink();
@@ -378,9 +378,9 @@ TQString dvifile::convertPDFtoPS(const TQString &PDFFilename)
KProcIO proc;
proc << "pdf2ps" << PDFFilename << convertedFileName;
if (proc.start(KProcess::Block) == false)
- convertedFileName = TQString::null; // Indicates that conversion failed, won't try again.
+ convertedFileName = TQString(); // Indicates that conversion failed, won't try again.
if (!TQFile::exists(convertedFileName))
- convertedFileName = TQString::null; // Indicates that conversion failed, won't try again.
+ convertedFileName = TQString(); // Indicates that conversion failed, won't try again.
// Save name of converted file to buffer, so PDF file won't be
// converted again, and files can be deleted when *this is
diff --git a/kdvi/dviFile.h b/kdvi/dviFile.h
index 59ffe65c..b82d19de 100644
--- a/kdvi/dviFile.h
+++ b/kdvi/dviFile.h
@@ -35,15 +35,15 @@ class dvifile : public bigEndianByteReader
fontPool * font_pool;
TQString filename;
TQString generatorString;
- Q_UINT16 total_pages;
- TQMemArray<Q_UINT32> page_offset;
+ TQ_UINT16 total_pages;
+ TQMemArray<TQ_UINT32> page_offset;
/** Saves the DVI file. Returns true on success. */
bool saveAs(const TQString &filename);
// Returns a pointer to the DVI file's data, or 0 if no data has yet
// been allocated.
- Q_UINT8 * dvi_Data() {return dviData.data();}
+ TQ_UINT8 * dvi_Data() {return dviData.data();}
TQIODevice::Offset size_of_file;
TQString errorMsg;
@@ -51,14 +51,14 @@ class dvifile : public bigEndianByteReader
/** This field is set to zero when the DVI file is constructed, and
will be modified during the prescan phase (at this time the
prescan code still resides in the dviRenderer class) */
- Q_UINT16 numberOfExternalPSFiles;
+ TQ_UINT16 numberOfExternalPSFiles;
/** This field is set to zero when the DVI file is constructed, and
will be modified during the prescan phase (at this time the
prescan code still resides in the dviRenderer class) */
- Q_UINT16 numberOfExternalNONPSFiles;
+ TQ_UINT16 numberOfExternalNONPSFiles;
- Q_UINT32 beginning_of_postamble;
+ TQ_UINT32 beginning_of_postamble;
/** This flag is set to "true" during the construction of the
dvifile, and is never changed afterwards by the dvifile
@@ -76,20 +76,20 @@ class dvifile : public bigEndianByteReader
/** Returns the magnification of the DVI file, as described in the
DVI Standard. */
- Q_UINT32 getMagnification() const {return _magnification;}
+ TQ_UINT32 getMagnification() const {return _magnification;}
/** This member is set to zero on construction and can be used by
other software to count error messages that were printed when
the DVI-file was processed. Suggested application: limit the
number of error messages to, say, 25. */
- Q_UINT8 errorCounter;
+ TQ_UINT8 errorCounter;
/** Papersize information read from the dvi-File */
pageSize *suggestedPageSize;
/** Sets new DVI data; all old data is erased. EXPERIMENTAL, use
with care. */
- void setNewData(const TQMemArray<Q_UINT8>& newData) {dviData = newData;}
+ void setNewData(const TQMemArray<TQ_UINT8>& newData) {dviData = newData;}
/** Page numbers that appear in a DVI document need not be
ordered. Worse, page numbers need not be unique. This method
@@ -112,7 +112,7 @@ class dvifile : public bigEndianByteReader
name, the method will then NOT convert the file, but simply return
the name from the buffer
- @returns The name of the PS file, or TQString::null on failure.
+ @returns The name of the PS file, or TQString() on failure.
*/
TQString convertPDFtoPS(const TQString &PDFFilename);
@@ -129,19 +129,19 @@ class dvifile : public bigEndianByteReader
/** Offset in DVI file of last page, set in read_postamble(). */
- Q_UINT32 last_page_offset;
- Q_UINT32 _magnification;
+ TQ_UINT32 last_page_offset;
+ TQ_UINT32 _magnification;
double cmPerDVIunit;
- TQMemArray<Q_UINT8> dviData;
+ TQMemArray<TQ_UINT8> dviData;
/** Map of filenames for converted PDF files
This map contains names of PDF files that were converted to
PostScript. The key is the name of the PDF file, the data the name
- of the associated PS file, or TQString::null, if the file could not
+ of the associated PS file, or TQString(), if the file could not
be converted. The PS files are deleted when the DVI-file is
destructed. */
TQMap<TQString, TQString> convertedFiles;
diff --git a/kdvi/dviPageCache.h b/kdvi/dviPageCache.h
index a28052c5..41a1c173 100644
--- a/kdvi/dviPageCache.h
+++ b/kdvi/dviPageCache.h
@@ -27,6 +27,7 @@
class DVIPageCache : public DocumentPageCache
{
Q_OBJECT
+ TQ_OBJECT
public:
DVIPageCache();
diff --git a/kdvi/dviRenderer.cpp b/kdvi/dviRenderer.cpp
index 2e0b0512..5133b2ab 100644
--- a/kdvi/dviRenderer.cpp
+++ b/kdvi/dviRenderer.cpp
@@ -71,7 +71,7 @@ dviRenderer::dviRenderer(TQWidget *par)
: DocumentRenderer(par), info(new infoDialog(par))
{
#ifdef DEBUG_DVIRENDERER
- kdDebug(4300) << "dviRenderer( parent=" << par << " )" << endl;
+ kdDebug(4300) << "dviRenderer( tqparent=" << par << " )" << endl;
#endif
// initialize the dvi machinery
@@ -79,7 +79,7 @@ dviRenderer::dviRenderer(TQWidget *par)
connect(&font_pool, TQT_SIGNAL( setStatusBarText( const TQString& ) ), this, TQT_SIGNAL( setStatusBarText( const TQString& ) ) );
- parentWidget = par;
+ tqparentWidget = par;
shrinkfactor = 3;
current_page = 0;
resolutionInDPI = 0.0;
@@ -193,12 +193,12 @@ void dviRenderer::drawPage(double resolution, RenderedDocumentPage *page)
// Reset colors
colorStack.clear();
- globalColor = Qt::black;
+ globalColor = TQt::black;
TQApplication::setOverrideCursor( waitCursor );
foreGroundPainter = page->getPainter();
if (foreGroundPainter != 0) {
- errorMsg = TQString::null;
+ errorMsg = TQString();
draw_page();
page->returnPainter(foreGroundPainter);
}
@@ -206,11 +206,11 @@ void dviRenderer::drawPage(double resolution, RenderedDocumentPage *page)
page->isEmpty = false;
if (errorMsg.isEmpty() != true) {
- KMessageBox::detailedError(parentWidget,
+ KMessageBox::detailedError(tqparentWidget,
i18n("<qt><strong>File corruption!</strong> KDVI had trouble interpreting your DVI file. Most "
"likely this means that the DVI file is broken.</qt>"),
errorMsg, i18n("DVI File Error"));
- errorMsg = TQString::null;
+ errorMsg = TQString();
currentlyDrawnPage = 0;
mutex.unlock();
return;
@@ -260,7 +260,7 @@ void dviRenderer::showThatSourceInformationIsPresent()
if (showMsg) {
KDialogBase *dialog= new KDialogBase(i18n("KDVI: Information"), KDialogBase::Yes, KDialogBase::Yes, KDialogBase::Yes,
- parentWidget, "information", true, true,KStdGuiItem::ok() );
+ tqparentWidget, "information", true, true,KStdGuiItem::ok() );
TQVBox *topcontents = new TQVBox (dialog);
topcontents->setSpacing(KDialog::spacingHint()*2);
@@ -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->sizeHint());
+ label2->setMinimumSize(label2->tqsizeHint());
lay->add( label2 );
lay->addStretch(1);
TQSize extraSize = TQSize(50,30);
@@ -311,8 +311,8 @@ void dviRenderer::embedPostScript()
if (!dviFile)
return;
- embedPS_progress = new KProgressDialog(parentWidget, "embedPSProgressDialog",
- i18n("Embedding PostScript Files"), TQString::null, true);
+ embedPS_progress = new KProgressDialog(tqparentWidget, "embedPSProgressDialog",
+ i18n("Embedding PostScript Files"), TQString(), true);
if (!embedPS_progress)
return;
embedPS_progress->setAllowCancel(false);
@@ -323,8 +323,8 @@ void dviRenderer::embedPostScript()
embedPS_numOfProgressedFiles = 0;
- Q_UINT16 currPageSav = current_page;
- errorMsg = TQString::null;
+ TQ_UINT16 currPageSav = current_page;
+ errorMsg = TQString();
for(current_page=0; current_page < dviFile->total_pages; current_page++) {
if (current_page < dviFile->total_pages) {
command_pointer = dviFile->dvi_Data() + dviFile->page_offset[current_page];
@@ -342,12 +342,12 @@ void dviRenderer::embedPostScript()
if (!errorMsg.isEmpty()) {
errorMsg = "<qt>" + errorMsg + "</qt>";
- KMessageBox::detailedError(parentWidget, "<qt>" + i18n("Not all PostScript files could be embedded into your document.") + "</qt>", errorMsg);
- errorMsg = TQString::null;
+ KMessageBox::detailedError(tqparentWidget, "<qt>" + i18n("Not all PostScript files could be embedded into your document.") + "</qt>", errorMsg);
+ errorMsg = TQString();
} else
- KMessageBox::information(parentWidget, "<qt>" + i18n("All external PostScript files were embedded into your document. You "
+ KMessageBox::information(tqparentWidget, "<qt>" + i18n("All external PostScript files were embedded into your document. You "
"will probably want to save the DVI file now.") + "</qt>",
- TQString::null, "embeddingDone");
+ TQString(), "embeddingDone");
// Prescan phase starts here
#ifdef PERFORMANCE_MEASUREMENT
@@ -435,9 +435,9 @@ bool dviRenderer::setFile(const TQString &fname, const KURL &base)
// Make sure the file actually exists.
if (!fi.exists() || fi.isDir()) {
- KMessageBox::error( parentWidget,
+ KMessageBox::error( tqparentWidget,
i18n("<qt><strong>File error.</strong> The specified file '%1' does not exist. "
- "KDVI already tried to add the ending '.dvi'.</qt>").arg(filename),
+ "KDVI already tried to add the ending '.dvi'.</qt>").tqarg(filename),
i18n("File Error!"));
return false;
}
@@ -448,21 +448,21 @@ bool dviRenderer::setFile(const TQString &fname, const KURL &base)
// the multipage.
TQString mimetype( KMimeMagic::self()->findFileType( fname )->mimeType() );
if (mimetype != "application/x-dvi") {
- KMessageBox::sorry( parentWidget,
+ KMessageBox::sorry( tqparentWidget,
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>" )
- .arg( fname )
- .arg( mimetype ) );
+ .tqarg( fname )
+ .tqarg( mimetype ) );
return false;
}
// Check if the file is a valid DVI file.
if (!isValidFile(filename))
{
- KMessageBox::sorry( parentWidget,
+ KMessageBox::sorry( tqparentWidget,
i18n("<qt>File corruption! KDVI had trouble interpreting your DVI file. Most "
"likely this means that the DVI file is broken.</qt>")
- .arg( fname ) );
+ .tqarg( fname ) );
return false;
}
@@ -477,7 +477,7 @@ bool dviRenderer::setFile(const TQString &fname, const KURL &base)
if ((dviFile_new->dvi_Data() == NULL)||(dviFile_new->errorMsg.isEmpty() != true)) {
TQApplication::restoreOverrideCursor();
if (dviFile_new->errorMsg.isEmpty() != true)
- KMessageBox::detailedError(parentWidget,
+ KMessageBox::detailedError(tqparentWidget,
i18n("<qt>File corruption! KDVI had trouble interpreting your DVI file. Most "
"likely this means that the DVI file is broken.</qt>"),
dviFile_new->errorMsg, i18n("DVI File Error"));
@@ -507,7 +507,7 @@ bool dviRenderer::setFile(const TQString &fname, const KURL &base)
TQString includePath;
if (!baseURL.isLocalFile()) {
includePath = filename;
- includePath.truncate(includePath.findRev('/'));
+ includePath.truncate(includePath.tqfindRev('/'));
}
PS_interface->setIncludePath(includePath);
@@ -538,7 +538,7 @@ bool dviRenderer::setFile(const TQString &fname, const KURL &base)
preScanTimer.start();
#endif
dviFile->numberOfExternalPSFiles = 0;
- Q_UINT16 currPageSav = current_page;
+ TQ_UINT16 currPageSav = current_page;
prebookmarks.clear();
for(current_page=0; current_page < dviFile->total_pages; current_page++) {
@@ -629,19 +629,19 @@ Anchor dviRenderer::parseReference(const TQString &reference)
// points to line number 1111 in the file "Filename". KDVI then
// looks for source specials of the form "src:xxxxFilename", and
// tries to find the special with the biggest xxxx
- if (reference.find("src:",0,false) == 0) {
+ if (reference.tqfind("src:",0,false) == 0) {
// Extract the file name and the numeral part from the reference string
DVI_SourceFileSplitter splitter(reference, dviFile->filename);
- Q_UINT32 refLineNumber = splitter.line();
+ TQ_UINT32 refLineNumber = splitter.line();
TQString refFileName = splitter.filePath();
if (sourceHyperLinkAnchors.isEmpty()) {
- KMessageBox::sorry(parentWidget, i18n("<qt>You have asked KDVI to locate the place in the DVI file which corresponds to "
+ KMessageBox::sorry(tqparentWidget, i18n("<qt>You have asked KDVI to locate the place in the DVI file which corresponds to "
"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>").arg(refLineNumber).arg(refFileName),
+ "information. Press the F1 key to open the manual.</qt>").tqarg(refLineNumber).tqarg(refFileName),
i18n("Could Not Find Reference"));
mutex.unlock();
return Anchor();
@@ -651,7 +651,7 @@ Anchor dviRenderer::parseReference(const TQString &reference)
// whose line number is the biggest among those that are smaller
// than the refLineNumber. That way, the position in the DVI file
// which is highlighted is always a little further up than the
- // position in the editor, e.g. if the DVI file contains
+ // position in the editor, e.g. if the DVI file tqcontains
// positional information at the beginning of every paragraph,
// KDVI jumps to the beginning of the paragraph that the cursor is
// in, and never to the next paragraph. If source file anchors for
@@ -680,8 +680,8 @@ Anchor dviRenderer::parseReference(const TQString &reference)
return Anchor(bestMatch->page, bestMatch->distance_from_top);
} 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>").arg(refLineNumber).arg(refFileName),
+ KMessageBox::sorry(tqparentWidget, 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),
i18n( "Could Not Find Reference" ));
else {
mutex.unlock();
@@ -715,7 +715,7 @@ void dviRenderer::setResolution(double resolution_in_DPI)
void dviRenderer::clearStatusBar()
{
- emit setStatusBarText( TQString::null );
+ emit setStatusBarText( TQString() );
}
@@ -733,9 +733,9 @@ void dviRenderer::handleSRCLink(const TQString &linkText, TQMouseEvent *e, Docum
TQString TeXfile = splitter.filePath();
if ( ! splitter.fileExists() )
{
- KMessageBox::sorry(parentWidget, TQString("<qt>") +
+ KMessageBox::sorry(tqparentWidget, TQString("<qt>") +
i18n("The DVI-file refers to the TeX-file "
- "<strong>%1</strong> which could not be found.").arg(KShellProcess::quote(TeXfile)) +
+ "<strong>%1</strong> which could not be found.").tqarg(KShellProcess::quote(TeXfile)) +
TQString("</qt>"),
i18n( "Could Not Find File" ));
return;
@@ -743,7 +743,7 @@ void dviRenderer::handleSRCLink(const TQString &linkText, TQMouseEvent *e, Docum
TQString command = editorCommand;
if (command.isEmpty() == true) {
- int r = KMessageBox::warningContinueCancel(parentWidget, TQString("<qt>") +
+ int r = KMessageBox::warningContinueCancel(tqparentWidget, TQString("<qt>") +
i18n("You have not yet specified an editor for inverse search. "
"Please choose your favorite editor in the "
"<strong>DVI options dialog</strong> "
@@ -756,7 +756,7 @@ void dviRenderer::handleSRCLink(const TQString &linkText, TQMouseEvent *e, Docum
else
return;
}
- command = command.replace( "%l", TQString::number(splitter.line()) ).replace( "%f", KShellProcess::quote(TeXfile) );
+ command = command.tqreplace( "%l", TQString::number(splitter.line()) ).tqreplace( "%f", KShellProcess::quote(TeXfile) );
#ifdef DEBUG_SPECIAL
kdDebug(4300) << "Calling program: " << command << endl;
@@ -767,8 +767,8 @@ void dviRenderer::handleSRCLink(const TQString &linkText, TQMouseEvent *e, Docum
// henceforth dimiss the output of the older programm. "If it
// hasn't failed until now, we don't care."
if (proc != 0) {
- qApp->disconnect(proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), 0, 0);
- qApp->disconnect(proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), 0, 0);
+ tqApp->disconnect(proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), 0, 0);
+ tqApp->disconnect(proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), 0, 0);
proc = 0;
}
@@ -778,15 +778,15 @@ void dviRenderer::handleSRCLink(const TQString &linkText, TQMouseEvent *e, Docum
kdError(4300) << "Could not allocate ShellProcess for the editor command." << endl;
return;
}
- qApp->connect(proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), this, TQT_SLOT(dvips_output_receiver(KProcess *, char *, int)));
- qApp->connect(proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), this, TQT_SLOT(dvips_output_receiver(KProcess *, char *, int)));
- qApp->connect(proc, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(editorCommand_terminated(KProcess *)));
+ tqApp->connect(proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), this, TQT_SLOT(dvips_output_receiver(KProcess *, char *, int)));
+ tqApp->connect(proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), this, TQT_SLOT(dvips_output_receiver(KProcess *, char *, int)));
+ tqApp->connect(proc, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(editorCommand_terminated(KProcess *)));
// Merge the editor-specific editor message here.
export_errorString = i18n("<qt>The external program<br><br><tt><strong>%1</strong></tt><br/><br/>which was used to call the editor "
"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>").arg(command);
+ "and a list of common problems.</qt>").tqarg(command);
info->clear(i18n("Starting the editor..."));
@@ -804,33 +804,33 @@ void dviRenderer::handleSRCLink(const TQString &linkText, TQMouseEvent *e, Docum
}
-TQString dviRenderer::PDFencodingToQString(const TQString& _pdfstring)
+TQString dviRenderer::PDFencodingToTQString(const TQString& _pdfstring)
{
// This method locates special PDF characters in a string and
// replaces them by UTF8. See Section 3.2.3 of the PDF reference
// guide for information.
TQString pdfstring = _pdfstring;
- pdfstring = pdfstring.replace("\\n", "\n");
- pdfstring = pdfstring.replace("\\r", "\n");
- pdfstring = pdfstring.replace("\\t", "\t");
- pdfstring = pdfstring.replace("\\f", "\f");
- pdfstring = pdfstring.replace("\\(", "(");
- pdfstring = pdfstring.replace("\\)", ")");
- pdfstring = pdfstring.replace("\\\\", "\\");
+ pdfstring = pdfstring.tqreplace("\\n", "\n");
+ pdfstring = pdfstring.tqreplace("\\r", "\n");
+ pdfstring = pdfstring.tqreplace("\\t", "\t");
+ pdfstring = pdfstring.tqreplace("\\f", "\f");
+ pdfstring = pdfstring.tqreplace("\\(", "(");
+ pdfstring = pdfstring.tqreplace("\\)", ")");
+ pdfstring = pdfstring.tqreplace("\\\\", "\\");
// Now replace octal character codes with the characters they encode
int pos;
TQRegExp rx( "(\\\\)(\\d\\d\\d)" ); // matches "\xyz" where x,y,z are numbers
while((pos = rx.search( pdfstring )) != -1) {
- pdfstring = pdfstring.replace(pos, 4, TQChar(rx.cap(2).toInt(0,8)));
+ pdfstring = pdfstring.tqreplace(pos, 4, TQChar(rx.cap(2).toInt(0,8)));
}
rx.setPattern( "(\\\\)(\\d\\d)" ); // matches "\xy" where x,y are numbers
while((pos = rx.search( pdfstring )) != -1) {
- pdfstring = pdfstring.replace(pos, 3, TQChar(rx.cap(2).toInt(0,8)));
+ pdfstring = pdfstring.tqreplace(pos, 3, TQChar(rx.cap(2).toInt(0,8)));
}
rx.setPattern( "(\\\\)(\\d)" ); // matches "\x" where x is a number
while((pos = rx.search( pdfstring )) != -1) {
- pdfstring = pdfstring.replace(pos, 4, TQChar(rx.cap(2).toInt(0,8)));
+ pdfstring = pdfstring.tqreplace(pos, 4, TQChar(rx.cap(2).toInt(0,8)));
}
return pdfstring;
}
diff --git a/kdvi/dviRenderer.h b/kdvi/dviRenderer.h
index 863a2786..6d71b1ed 100644
--- a/kdvi/dviRenderer.h
+++ b/kdvi/dviRenderer.h
@@ -41,13 +41,13 @@ extern const int MFResolutions[];
class DVI_SourceFileAnchor {
public:
DVI_SourceFileAnchor() {}
- DVI_SourceFileAnchor(const TQString& name, Q_UINT32 ln, Q_UINT32 pg, const Length& _distance_from_top)
+ DVI_SourceFileAnchor(const TQString& name, TQ_UINT32 ln, TQ_UINT32 pg, const Length& _distance_from_top)
: fileName(name), line(ln), page(pg),
distance_from_top(_distance_from_top) {}
TQString fileName;
- Q_UINT32 line;
- Q_UINT32 page;
+ TQ_UINT32 line;
+ TQ_UINT32 page;
Length distance_from_top;
};
@@ -69,7 +69,7 @@ struct framedata {
/* this information is saved when using virtual fonts */
typedef void (dviRenderer::*set_char_proc)(unsigned int, unsigned int);
-typedef void (dviRenderer::*parseSpecials)(char *, Q_UINT8 *);
+typedef void (dviRenderer::*parseSpecials)(char *, TQ_UINT8 *);
struct drawinf {
struct framedata data;
@@ -85,9 +85,10 @@ struct drawinf {
class dviRenderer : public DocumentRenderer, bigEndianByteReader
{
Q_OBJECT
+ TQ_OBJECT
public:
- dviRenderer(TQWidget *parent);
+ dviRenderer(TQWidget *tqparent);
~dviRenderer();
virtual bool setFile(const TQString &fname, const KURL &base);
@@ -127,7 +128,7 @@ public:
void draw_page();
public slots:
- void exportPS(const TQString& fname = TQString::null, const TQString& options = TQString::null, KPrinter* printer = 0);
+ void exportPS(const TQString& fname = TQString(), const TQString& options = TQString(), KPrinter* printer = 0);
void exportPDF();
void showInfo();
@@ -136,7 +137,7 @@ public slots:
void embedPostScript();
void abortExternalProgramm();
- /** simply emits "setStatusBarText( TQString::null )". This is used
+ /** simply emits "setStatusBarText( TQString() )". This is used
in dviRenderer::mouseMoveEvent(), see the explanation there. */
void clearStatusBar();
@@ -179,7 +180,7 @@ private:
/* This method locates special PDF characters in a string and
replaces them by UTF8. See Section 3.2.3 of the PDF reference
guide for information */
- TQString PDFencodingToQString(const TQString& pdfstring);
+ TQString PDFencodingToTQString(const TQString& pdfstring);
void setResolution(double resolution_in_DPI);
@@ -190,9 +191,9 @@ private:
// @@@ explanation
void prescan(parseSpecials specialParser);
- void prescan_embedPS(char *cp, Q_UINT8 *);
- void prescan_removePageSizeInfo(char *cp, Q_UINT8 *);
- void prescan_parseSpecials(char *cp, Q_UINT8 *);
+ void prescan_embedPS(char *cp, TQ_UINT8 *);
+ void prescan_removePageSizeInfo(char *cp, TQ_UINT8 *);
+ void prescan_parseSpecials(char *cp, TQ_UINT8 *);
void prescan_ParsePapersizeSpecial(const TQString& cp);
void prescan_ParseBackgroundSpecial(const TQString& cp);
void prescan_ParseHTMLAnchorSpecial(const TQString& cp);
@@ -211,7 +212,7 @@ private:
/** Utility fields used by the embedPostScript method*/
KProgressDialog *embedPS_progress;
- Q_UINT16 embedPS_numOfProgressedFiles;
+ TQ_UINT16 embedPS_numOfProgressedFiles;
/** Shrink factor. Units are not quite clear */
double shrinkfactor;
@@ -291,7 +292,7 @@ private:
/** Data required for handling TPIC specials */
float penWidth_in_mInch;
TQPointArray TPIC_path;
- Q_UINT16 number_of_elements_in_path;
+ TQ_UINT16 number_of_elements_in_path;
struct drawinf currinf;
RenderedDocumentPage* currentlyDrawnPage;
diff --git a/kdvi/dviRenderer_draw.cpp b/kdvi/dviRenderer_draw.cpp
index 6983c372..af79b09a 100644
--- a/kdvi/dviRenderer_draw.cpp
+++ b/kdvi/dviRenderer_draw.cpp
@@ -235,8 +235,8 @@ void dviRenderer::set_vf_char(unsigned int cmd, unsigned int ch)
currinf.fonttable = &(currinf.fontp->vf_table);
currinf._virtual = currinf.fontp;
- Q_UINT8 *command_ptr_sav = command_pointer;
- Q_UINT8 *end_ptr_sav = end_pointer;
+ TQ_UINT8 *command_ptr_sav = command_pointer;
+ TQ_UINT8 *end_ptr_sav = end_pointer;
command_pointer = m->pos;
end_pointer = m->end;
draw_part(currinf.fontp->scaled_size_in_DVI_units*(dviFile->getCmPerDVIunit() * 1200.0 / 2.54)/16.0, true);
@@ -278,8 +278,8 @@ void dviRenderer::draw_part(double current_dimconv, bool is_vfmacro)
kdDebug(4300) << "draw_part" << endl;
#endif
- Q_INT32 RRtmp=0, WWtmp=0, XXtmp=0, YYtmp=0, ZZtmp=0;
- Q_UINT8 ch;
+ TQ_INT32 RRtmp=0, WWtmp=0, XXtmp=0, YYtmp=0, ZZtmp=0;
+ TQ_UINT8 ch;
currinf.fontp = NULL;
currinf.set_char_p = &dviRenderer::set_no_char;
@@ -290,14 +290,14 @@ void dviRenderer::draw_part(double current_dimconv, bool is_vfmacro)
(this->*currinf.set_char_p)(ch, ch);
} else
if (FNTNUM0 <= ch && ch <= (unsigned char) (FNTNUM0 + 63)) {
- currinf.fontp = currinf.fonttable->find(ch - FNTNUM0);
+ currinf.fontp = currinf.fonttable->tqfind(ch - FNTNUM0);
if (currinf.fontp == NULL) {
- errorMsg = i18n("The DVI code referred to font #%1, which was not previously defined.").arg(ch - FNTNUM0);
+ errorMsg = i18n("The DVI code referred to font #%1, which was not previously defined.").tqarg(ch - FNTNUM0);
return;
}
currinf.set_char_p = currinf.fontp->set_char_p;
} else {
- Q_INT32 a, b;
+ TQ_INT32 a, b;
switch (ch) {
case SET1:
@@ -453,7 +453,7 @@ void dviRenderer::draw_part(double current_dimconv, bool is_vfmacro)
case DOWN3:
case DOWN4:
{
- Q_INT32 DDtmp = readINT(ch - DOWN1 + 1);
+ TQ_INT32 DDtmp = readINT(ch - DOWN1 + 1);
if ((is_vfmacro == false) &&
(currinf.fontp != 0) &&
(abs(DDtmp) >= 5*(currinf.fontp->scaled_size_in_DVI_units/6)) &&
@@ -511,7 +511,7 @@ void dviRenderer::draw_part(double current_dimconv, bool is_vfmacro)
case FNT1:
case FNT2:
case FNT3:
- currinf.fontp = currinf.fonttable->find(readUINT(ch - FNT1 + 1));
+ currinf.fontp = currinf.fonttable->tqfind(readUINT(ch - FNT1 + 1));
if (currinf.fontp == NULL) {
errorMsg = i18n("The DVI code referred to a font which was not previously defined.");
return;
@@ -520,7 +520,7 @@ void dviRenderer::draw_part(double current_dimconv, bool is_vfmacro)
break;
case FNT4:
- currinf.fontp = currinf.fonttable->find(readINT(ch - FNT1 + 1));
+ currinf.fontp = currinf.fonttable->tqfind(readINT(ch - FNT1 + 1));
if (currinf.fontp == NULL) {
errorMsg = i18n("The DVI code referred to a font which was not previously defined.");
return;
@@ -553,8 +553,8 @@ void dviRenderer::draw_part(double current_dimconv, bool is_vfmacro)
case FNTDEF4:
command_pointer += 12 + ch - FNTDEF1 + 1;
{
- Q_UINT8 tempa = readUINT8();
- Q_UINT8 tempb = readUINT8();
+ TQ_UINT8 tempa = readUINT8();
+ TQ_UINT8 tempb = readUINT8();
command_pointer += tempa + tempb;
}
break;
@@ -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.").arg(ch);
+ errorMsg = i18n("The unknown op-code %1 was encountered.").tqarg(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 7b875b45..2e862803 100644
--- a/kdvi/dviRenderer_export.cpp
+++ b/kdvi/dviRenderer_export.cpp
@@ -61,8 +61,8 @@ void dviRenderer::exportPDF()
// has been called meanwhile. See also the exportPS method.
if (proc != 0) {
// Make sure all further output of the programm is ignored
- qApp->disconnect(proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), 0, 0);
- qApp->disconnect(proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), 0, 0);
+ tqApp->disconnect(proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), 0, 0);
+ tqApp->disconnect(proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), 0, 0);
proc = 0;
}
@@ -94,33 +94,33 @@ void dviRenderer::exportPDF()
// Generate a suggestion for a reasonable file name
TQString suggestedName = dviFile->filename;
- suggestedName = suggestedName.left(suggestedName.find(".")) + ".pdf";
+ suggestedName = suggestedName.left(suggestedName.tqfind(".")) + ".pdf";
- TQString fileName = KFileDialog::getSaveFileName(suggestedName, i18n("*.pdf|Portable Document Format (*.pdf)"), parentWidget, i18n("Export File As"));
+ TQString fileName = KFileDialog::getSaveFileName(suggestedName, i18n("*.pdf|Portable Document Format (*.pdf)"), tqparentWidget, i18n("Export File As"));
if (fileName.isEmpty())
return;
TQFileInfo finfo(fileName);
if (finfo.exists()) {
- int r = KMessageBox::warningContinueCancel (parentWidget, i18n("The file %1\nexists. Do you want to overwrite that file?").arg(fileName),
+ int r = KMessageBox::warningContinueCancel (tqparentWidget, i18n("The file %1\nexists. Do you want to overwrite that file?").tqarg(fileName),
i18n("Overwrite File"), i18n("Overwrite"));
if (r == KMessageBox::Cancel)
return;
}
// Initialize the progress dialog
- progress = new fontProgressDialog( TQString::null,
+ progress = new fontProgressDialog( TQString(),
i18n("Using dvipdfm to export the file to PDF"),
- TQString::null,
+ TQString(),
i18n("KDVI is currently using the external program 'dvipdfm' to "
"convert your DVI-file to PDF. Sometimes that can take "
"a while because dvipdfm needs to generate its own bitmap fonts "
"Please be patient."),
i18n("Waiting for dvipdfm to finish..."),
- parentWidget, i18n("dvipdfm progress dialog"), false );
+ tqparentWidget, i18n("dvipdfm progress dialog"), false );
if (progress != 0) {
progress->TextLabel2->setText( i18n("Please be patient") );
progress->setTotalSteps( dviFile->total_pages );
- qApp->connect(progress, TQT_SIGNAL(finished()), this, TQT_SLOT(abortExternalProgramm()));
+ tqApp->connect(progress, TQT_SIGNAL(finished()), this, TQT_SLOT(abortExternalProgramm()));
}
proc = new KShellProcess();
@@ -128,21 +128,21 @@ void dviRenderer::exportPDF()
kdError(4300) << "Could not allocate ShellProcess for the dvipdfm command." << endl;
return;
}
- qApp->disconnect( this, TQT_SIGNAL(mySignal()), 0, 0 );
+ tqApp->disconnect( this, TQT_SIGNAL(mySignal()), 0, 0 );
- qApp->connect(proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), this, TQT_SLOT(dvips_output_receiver(KProcess *, char *, int)));
- qApp->connect(proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), this, TQT_SLOT(dvips_output_receiver(KProcess *, char *, int)));
- qApp->connect(proc, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(dvips_terminated(KProcess *)));
+ tqApp->connect(proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), this, TQT_SLOT(dvips_output_receiver(KProcess *, char *, int)));
+ tqApp->connect(proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), this, TQT_SLOT(dvips_output_receiver(KProcess *, char *, int)));
+ tqApp->connect(proc, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(dvips_terminated(KProcess *)));
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").arg(KShellProcess::quote(dviFile->filename)));
+ info->clear(i18n("Export: %1 to PDF").tqarg(KShellProcess::quote(dviFile->filename)));
proc->clearArguments();
finfo.setFile(dviFile->filename);
- *proc << TQString("cd %1; dvipdfm").arg(KShellProcess::quote(finfo.dirPath(true)));
- *proc << TQString("-o %1").arg(KShellProcess::quote(fileName));
+ *proc << TQString("cd %1; dvipdfm").tqarg(KShellProcess::quote(finfo.dirPath(true)));
+ *proc << TQString("-o %1").tqarg(KShellProcess::quote(fileName));
*proc << KShellProcess::quote(dviFile->filename);
proc->closeStdin();
if (proc->start(KProcess::NotifyOnExit, KProcess::AllOutput) == false) {
@@ -167,8 +167,8 @@ void dviRenderer::exportPS(const TQString& fname, const TQString& options, KPrin
// enough to ignore the exit status of the editor if another command
// has been called meanwhile. See also the exportPDF method.
if (proc != 0) {
- qApp->disconnect(proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), 0, 0);
- qApp->disconnect(proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), 0, 0);
+ tqApp->disconnect(proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), 0, 0);
+ tqApp->disconnect(proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), 0, 0);
proc = 0;
}
@@ -177,7 +177,7 @@ void dviRenderer::exportPS(const TQString& fname, const TQString& options, KPrin
return;
if (dviFile->numberOfExternalNONPSFiles != 0) {
- KMessageBox::sorry( parentWidget,
+ KMessageBox::sorry( tqparentWidget,
i18n("<qt><P>This DVI file refers to external graphic files which are not in PostScript format, and cannot be handled by the "
"<strong>dvips</strong> program that KDVI uses interally to print or to export to PostScript. The functionality that "
"you require is therefore unavailable in this version of KDVI.</p>"
@@ -193,14 +193,14 @@ void dviRenderer::exportPS(const TQString& fname, const TQString& options, KPrin
if (fname.isEmpty()) {
// Generate a suggestion for a reasonable file name
TQString suggestedName = dviFile->filename;
- suggestedName = suggestedName.left(suggestedName.find(".")) + ".ps";
+ suggestedName = suggestedName.left(suggestedName.tqfind(".")) + ".ps";
- fileName = KFileDialog::getSaveFileName(suggestedName, i18n("*.ps|PostScript (*.ps)"), parentWidget, i18n("Export File As"));
+ fileName = KFileDialog::getSaveFileName(suggestedName, i18n("*.ps|PostScript (*.ps)"), tqparentWidget, i18n("Export File As"));
if (fileName.isEmpty())
return;
TQFileInfo finfo(fileName);
if (finfo.exists()) {
- int r = KMessageBox::warningYesNo (parentWidget, i18n("The file %1\nexists. Do you want to overwrite that file?").arg(fileName),
+ int r = KMessageBox::warningYesNo (tqparentWidget, i18n("The file %1\nexists. Do you want to overwrite that file?").tqarg(fileName),
i18n("Overwrite File"));
if (r == KMessageBox::No)
return;
@@ -211,19 +211,19 @@ void dviRenderer::exportPS(const TQString& fname, const TQString& options, KPrin
export_printer = printer;
// Initialize the progress dialog
- progress = new fontProgressDialog( TQString::null,
+ progress = new fontProgressDialog( TQString(),
i18n("Using dvips to export the file to PostScript"),
- TQString::null,
+ TQString(),
i18n("KDVI is currently using the external program 'dvips' to "
"convert your DVI-file to PostScript. Sometimes that can take "
"a while because dvips needs to generate its own bitmap fonts "
"Please be patient."),
i18n("Waiting for dvips to finish..."),
- parentWidget, i18n("dvips progress dialog"), false );
+ tqparentWidget, i18n("dvips progress dialog"), false );
if (progress != 0) {
progress->TextLabel2->setText( i18n("Please be patient") );
progress->setTotalSteps( dviFile->total_pages );
- qApp->connect(progress, TQT_SIGNAL(finished()), this, TQT_SLOT(abortExternalProgramm()));
+ tqApp->connect(progress, TQT_SIGNAL(finished()), this, TQT_SLOT(abortExternalProgramm()));
}
// There is a major problem with dvips, at least 5.86 and lower: the
@@ -263,10 +263,10 @@ void dviRenderer::exportPS(const TQString& fname, const TQString& options, KPrin
newFile.renumber();
// Remove any page size information from the file
- Q_UINT16 currPageSav = current_page;
+ TQ_UINT16 currPageSav = current_page;
dvifile *dvsav = dviFile;
dviFile = &newFile;
- errorMsg = TQString::null;
+ errorMsg = TQString();
for(current_page=0; current_page < newFile.total_pages; current_page++) {
@@ -294,23 +294,23 @@ void dviRenderer::exportPS(const TQString& fname, const TQString& options, KPrin
return;
}
- qApp->connect(proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), this, TQT_SLOT(dvips_output_receiver(KProcess *, char *, int)));
- qApp->connect(proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), this, TQT_SLOT(dvips_output_receiver(KProcess *, char *, int)));
- qApp->connect(proc, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(dvips_terminated(KProcess *)));
+ tqApp->connect(proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), this, TQT_SLOT(dvips_output_receiver(KProcess *, char *, int)));
+ tqApp->connect(proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), this, TQT_SLOT(dvips_output_receiver(KProcess *, char *, int)));
+ tqApp->connect(proc, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(dvips_terminated(KProcess *)));
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").arg(KShellProcess::quote(dviFile->filename)));
+ info->clear(i18n("Export: %1 to PostScript").tqarg(KShellProcess::quote(dviFile->filename)));
proc->clearArguments();
TQFileInfo finfo(dviFile->filename);
- *proc << TQString("cd %1; dvips").arg(KShellProcess::quote(finfo.dirPath(true)));
+ *proc << TQString("cd %1; dvips").tqarg(KShellProcess::quote(finfo.dirPath(true)));
if (printer == 0)
*proc << "-z"; // export Hyperlinks
if (options.isEmpty() == false)
*proc << options;
- *proc << TQString("%1").arg(KShellProcess::quote(sourceFileName));
- *proc << TQString("-o %1").arg(KShellProcess::quote(fileName));
+ *proc << TQString("%1").tqarg(KShellProcess::quote(sourceFileName));
+ *proc << TQString("-o %1").tqarg(KShellProcess::quote(fileName));
proc->closeStdin();
if (proc->start(KProcess::NotifyOnExit, KProcess::Stderr) == false) {
kdError(4300) << "dvips failed to start" << endl;
@@ -341,7 +341,7 @@ void dviRenderer::dvips_terminated(KProcess *sproc)
// export_errorString, does not correspond to sproc. In that case,
// we ingore the return status silently.
if ((proc == sproc) && (sproc->normalExit() == true) && (sproc->exitStatus() != 0))
- KMessageBox::error( parentWidget, export_errorString );
+ KMessageBox::error( tqparentWidget, export_errorString );
if (export_printer != 0)
export_printer->printFiles( TQStringList(export_fileName), true );
@@ -359,7 +359,7 @@ void dviRenderer::editorCommand_terminated(KProcess *sproc)
// export_errorString, does not correspond to sproc. In that case,
// we ingore the return status silently.
if ((proc == sproc) && (sproc->normalExit() == true) && (sproc->exitStatus() != 0))
- KMessageBox::error( parentWidget, export_errorString );
+ KMessageBox::error( tqparentWidget, export_errorString );
// Let's hope that this is not all too nasty... killing a
// KShellProcess from a slot that was called from the KShellProcess
diff --git a/kdvi/dviRenderer_prescan.cpp b/kdvi/dviRenderer_prescan.cpp
index d0c35bbd..5ed49ebc 100644
--- a/kdvi/dviRenderer_prescan.cpp
+++ b/kdvi/dviRenderer_prescan.cpp
@@ -40,7 +40,7 @@ extern void parse_special_argument(const TQString& strg, const char* argument_na
//#define DEBUG_PRESCAN
-void dviRenderer::prescan_embedPS(char *cp, Q_UINT8 *beginningOfSpecialCommand)
+void dviRenderer::prescan_embedPS(char *cp, TQ_UINT8 *beginningOfSpecialCommand)
{
#ifdef DEBUG_PRESCAN
kdDebug(4300) << "dviRenderer::prescan_embedPS( cp = " << cp << " ) " << endl;
@@ -60,7 +60,7 @@ void dviRenderer::prescan_embedPS(char *cp, Q_UINT8 *beginningOfSpecialCommand)
// (already the simplifyWhiteSpace() above is wrong). If you have
// files like this, go away.
TQString EPSfilename = include_command;
- EPSfilename.truncate(EPSfilename.find(' '));
+ EPSfilename.truncate(EPSfilename.tqfind(' '));
// Strip enclosing quotation marks which are included by some LaTeX
// macro packages (but not by others). This probably means that
@@ -84,8 +84,8 @@ void dviRenderer::prescan_embedPS(char *cp, Q_UINT8 *beginningOfSpecialCommand)
TQString originalFName = EPSfilename;
- embedPS_progress->setLabel(i18n("Embedding %1").arg(EPSfilename));
- qApp->processEvents();
+ embedPS_progress->setLabel(i18n("Embedding %1").tqarg(EPSfilename));
+ tqApp->processEvents();
// Now locate the Gfx file on the hard disk...
@@ -97,14 +97,14 @@ void dviRenderer::prescan_embedPS(char *cp, Q_UINT8 *beginningOfSpecialCommand)
if (!TQFile::exists(EPSfilename)) {
// Find the number of the page
- Q_UINT32 currentOffset = beginningOfSpecialCommand - dviFile->dvi_Data();
- Q_UINT16 page;
+ TQ_UINT32 currentOffset = beginningOfSpecialCommand - dviFile->dvi_Data();
+ TQ_UINT16 page;
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>").arg(page+1).arg(originalFName);
+ errorMsg += i18n("Page %1: The PostScript file <strong>%2</strong> could not be found.<br>").tqarg(page+1).tqarg(originalFName);
embedPS_progress->progressBar()->advance(1);
- qApp->processEvents();
+ tqApp->processEvents();
return;
}
@@ -118,7 +118,7 @@ void dviRenderer::prescan_embedPS(char *cp, Q_UINT8 *beginningOfSpecialCommand)
int angle = 0;
// just to avoid ambiguities; the filename could contain keywords
- include_command = include_command.mid(include_command.find(' '));
+ include_command = include_command.mid(include_command.tqfind(' '));
parse_special_argument(include_command, "llx=", &llx);
parse_special_argument(include_command, "lly=", &lly);
@@ -128,16 +128,16 @@ void dviRenderer::prescan_embedPS(char *cp, Q_UINT8 *beginningOfSpecialCommand)
parse_special_argument(include_command, "rhi=", &rhi);
parse_special_argument(include_command, "angle=", &angle);
- int clip=include_command.find(" clip"); // -1 if clip keyword is not present, >= 0 otherwise
+ int clip=include_command.tqfind(" 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").arg(llx).arg(lly).arg(urx).arg(ury);
+ TQString PS = TQString("ps: @beginspecial %1 @llx %2 @lly %3 @urx %4 @ury").tqarg(llx).tqarg(lly).tqarg(urx).tqarg(ury);
if (rwi != 0)
- PS.append( TQString(" %1 @rwi").arg(rwi) );
+ PS.append( TQString(" %1 @rwi").tqarg(rwi) );
if (rhi != 0)
- PS.append( TQString(" %1 @rhi").arg(rhi) );
+ PS.append( TQString(" %1 @rhi").tqarg(rhi) );
if (angle != 0)
- PS.append( TQString(" %1 @angle").arg(angle) );
+ PS.append( TQString(" %1 @angle").tqarg(angle) );
if (clip != -1)
PS.append(" @clip");
PS.append( " @setspecial\n" );
@@ -156,13 +156,13 @@ void dviRenderer::prescan_embedPS(char *cp, Q_UINT8 *beginningOfSpecialCommand)
_isModified = true;
- Q_UINT32 lengthOfOldSpecial = command_pointer - beginningOfSpecialCommand;
- Q_UINT32 lengthOfNewSpecial = PS.length()+5;
+ TQ_UINT32 lengthOfOldSpecial = command_pointer - beginningOfSpecialCommand;
+ TQ_UINT32 lengthOfNewSpecial = PS.length()+5;
- TQMemArray<Q_UINT8> newDVI(dviFile->size_of_file + lengthOfNewSpecial-lengthOfOldSpecial);
+ TQMemArray<TQ_UINT8> newDVI(dviFile->size_of_file + lengthOfNewSpecial-lengthOfOldSpecial);
- Q_UINT8 *commandPtrSav = command_pointer;
- Q_UINT8 *endPtrSav = end_pointer;
+ TQ_UINT8 *commandPtrSav = command_pointer;
+ TQ_UINT8 *endPtrSav = end_pointer;
end_pointer = newDVI.data() + dviFile->size_of_file + lengthOfNewSpecial-lengthOfOldSpecial;
memcpy(newDVI.data(), dviFile->dvi_Data(), beginningOfSpecialCommand-dviFile->dvi_Data());
command_pointer = newDVI.data()+(beginningOfSpecialCommand-dviFile->dvi_Data());
@@ -176,12 +176,12 @@ void dviRenderer::prescan_embedPS(char *cp, Q_UINT8 *beginningOfSpecialCommand)
// Adjust page pointers in the DVI file
dviFile->size_of_file = dviFile->size_of_file + lengthOfNewSpecial-lengthOfOldSpecial;
end_pointer = newDVI.data() + dviFile->size_of_file;
- Q_UINT32 currentOffset = beginningOfSpecialCommand-dviFile->dvi_Data();
- for(Q_UINT16 i=0; i < dviFile->total_pages; i++) {
+ TQ_UINT32 currentOffset = beginningOfSpecialCommand-dviFile->dvi_Data();
+ for(TQ_UINT16 i=0; i < dviFile->total_pages; i++) {
if (dviFile->page_offset[i] > currentOffset) {
dviFile->page_offset[i] = dviFile->page_offset[i] + lengthOfNewSpecial-lengthOfOldSpecial;
command_pointer = dviFile->page_offset[i] + newDVI.data() + 4*10 + 1;
- Q_UINT32 a = readUINT32();
+ TQ_UINT32 a = readUINT32();
if (a > currentOffset) {
a = a + lengthOfNewSpecial-lengthOfOldSpecial;
command_pointer = dviFile->page_offset[i] + newDVI.data() + 4*10 + 1;
@@ -195,7 +195,7 @@ void dviRenderer::prescan_embedPS(char *cp, Q_UINT8 *beginningOfSpecialCommand)
dviFile->page_offset[dviFile->total_pages] = dviFile->beginning_of_postamble;
command_pointer = newDVI.data() + dviFile->beginning_of_postamble + 1;
- Q_UINT32 a = readUINT32();
+ TQ_UINT32 a = readUINT32();
if (a > currentOffset) {
a = a + lengthOfNewSpecial - lengthOfOldSpecial;
command_pointer = newDVI.data() + dviFile->beginning_of_postamble + 1;
@@ -219,12 +219,12 @@ void dviRenderer::prescan_embedPS(char *cp, Q_UINT8 *beginningOfSpecialCommand)
dviFile->setNewData(newDVI);
embedPS_progress->progressBar()->advance(1);
- qApp->processEvents();
+ tqApp->processEvents();
return;
}
-void dviRenderer::prescan_removePageSizeInfo(char *cp, Q_UINT8 *beginningOfSpecialCommand)
+void dviRenderer::prescan_removePageSizeInfo(char *cp, TQ_UINT8 *beginningOfSpecialCommand)
{
#ifdef DEBUG_PRESCAN
kdDebug(4300) << "dviRenderer::prescan_embedPS( cp = " << cp << " ) " << endl;
@@ -234,7 +234,7 @@ void dviRenderer::prescan_removePageSizeInfo(char *cp, Q_UINT8 *beginningOfSpeci
if (strncasecmp(cp, "papersize=", 10) != 0)
return;
- for (Q_UINT8 *ptr=beginningOfSpecialCommand; ptr<command_pointer; ptr++)
+ for (TQ_UINT8 *ptr=beginningOfSpecialCommand; ptr<command_pointer; ptr++)
*ptr = NOP;
}
@@ -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.").arg(cp));
+ printErrorMsgForSpecials(i18n("The papersize data '%1' could not be parsed.").tqarg(cp));
return;
}
@@ -262,7 +262,7 @@ void dviRenderer::prescan_ParseBackgroundSpecial(const TQString& cp)
{
TQColor col = parseColorSpecification(cp.stripWhiteSpace());
if (col.isValid())
- for(Q_UINT16 page=current_page; page < dviFile->total_pages; page++)
+ for(TQ_UINT16 page=current_page; page < dviFile->total_pages; page++)
PS_interface->setBackgroundColor(page, col);
return;
}
@@ -271,7 +271,7 @@ void dviRenderer::prescan_ParseBackgroundSpecial(const TQString& cp)
void dviRenderer::prescan_ParseHTMLAnchorSpecial(const TQString& _cp)
{
TQString cp = _cp;
- cp.truncate(cp.find('"'));
+ cp.truncate(cp.tqfind('"'));
Length l;
l.setLength_in_inch(currinf.data.dvi_v/(resolutionInDPI*shrinkfactor));
anchorList[cp] = Anchor(current_page+1, l);
@@ -297,7 +297,7 @@ void dviRenderer::prescan_ParsePSHeaderSpecial(const TQString& cp)
}
if (TQFile::exists(_file))
- PS_interface->PostScriptHeaderString->append( TQString(" (%1) run\n").arg(_file) );
+ PS_interface->PostScriptHeaderString->append( TQString(" (%1) run\n").tqarg(_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").arg(PS_H).arg(PS_V) );
+ PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").tqarg(PS_H).tqarg(PS_V) );
PostScriptOutPutString->append( " @beginspecial @setspecial \n" );
PostScriptOutPutString->append( cp );
PostScriptOutPutString->append( " @endspecial \n" );
@@ -355,15 +355,15 @@ void dviRenderer::prescan_ParsePSSpecial(const TQString& cp)
if (cp.startsWith("ps:SDict begin /product where{pop product(Distiller)"))
return; // hyperref tries to work around Distiller bug
if (cp.startsWith("ps:SDict begin [") && cp.endsWith(" pdfmark end")) { // hyperref definition of link/anchor/bookmark/etc
- if (cp.contains("/DEST")) { // The PostScript code defines an anchor
+ if (cp.tqcontains("/DEST")) { // The PostScript code defines an anchor
TQString anchorName = cp.section('(', 1, 1).section(')', 0, 0);
Length l;
l.setLength_in_inch(currinf.data.dvi_v/(resolutionInDPI*shrinkfactor));
anchorList[anchorName] = Anchor(current_page+1, l);
}
// The PostScript code defines a bookmark
- if (cp.contains("/Dest") && cp.contains("/Title"))
- prebookmarks.append(PreBookmark(PDFencodingToQString(cp.section('(', 2, 2).section(')', 0, 0)),
+ if (cp.tqcontains("/Dest") && cp.tqcontains("/Title"))
+ prebookmarks.append(PreBookmark(PDFencodingToTQString(cp.section('(', 2, 2).section(')', 0, 0)),
cp.section('(', 1, 1).section(')', 0, 0),
cp.section('-', 1, 1).section(' ', 0, 0).toUInt()
));
@@ -374,18 +374,18 @@ void dviRenderer::prescan_ParsePSSpecial(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;
- if (cp.find("ps::[begin]", 0, false) == 0) {
- PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").arg(PS_H).arg(PS_V) );
- PostScriptOutPutString->append( TQString(" %1\n").arg(cp.mid(11)) );
+ if (cp.tqfind("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)) );
} else {
- if (cp.find("ps::[end]", 0, false) == 0) {
- PostScriptOutPutString->append( TQString(" %1\n").arg(cp.mid(9)) );
+ if (cp.tqfind("ps::[end]", 0, false) == 0) {
+ PostScriptOutPutString->append( TQString(" %1\n").tqarg(cp.mid(9)) );
} else {
- if (cp.find("ps::", 0, false) == 0) {
- PostScriptOutPutString->append( TQString(" %1\n").arg(cp.mid(4)) );
+ if (cp.tqfind("ps::", 0, false) == 0) {
+ PostScriptOutPutString->append( TQString(" %1\n").tqarg(cp.mid(4)) );
} else {
- PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").arg(PS_H).arg(PS_V) );
- PostScriptOutPutString->append( TQString(" %1\n").arg(cp.mid(3)) );
+ PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").tqarg(PS_H).tqarg(PS_V) );
+ PostScriptOutPutString->append( TQString(" %1\n").tqarg(cp.mid(3)) );
}
}
}
@@ -406,7 +406,7 @@ void dviRenderer::prescan_ParsePSFileSpecial(const TQString& cp)
// (already the simplifyWhiteSpace() above is wrong). If you have
// files like this, go away.
TQString EPSfilename = include_command;
- EPSfilename.truncate(EPSfilename.find(' '));
+ EPSfilename.truncate(EPSfilename.tqfind(' '));
// Strip enclosing quotation marks which are included by some LaTeX
// macro packages (but not by others). This probably means that
@@ -444,7 +444,7 @@ void dviRenderer::prescan_ParsePSFileSpecial(const TQString& cp)
int angle = 0;
// just to avoid ambiguities; the filename could contain keywords
- include_command = include_command.mid(include_command.find(' '));
+ include_command = include_command.mid(include_command.tqfind(' '));
parse_special_argument(include_command, "llx=", &llx);
parse_special_argument(include_command, "lly=", &lly);
@@ -454,27 +454,27 @@ void dviRenderer::prescan_ParsePSFileSpecial(const TQString& cp)
parse_special_argument(include_command, "rhi=", &rhi);
parse_special_argument(include_command, "angle=", &angle);
- int clip=include_command.find(" clip"); // -1 if clip keyword is not present, >= 0 otherwise
+ int clip=include_command.tqfind(" clip"); // -1 if clip keyword is not present, >= 0 otherwise
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").arg(PS_H).arg(PS_V) );
+ PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").tqarg(PS_H).tqarg(PS_V) );
PostScriptOutPutString->append( "@beginspecial " );
- 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) );
+ 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) );
if (rwi != 0)
- PostScriptOutPutString->append( TQString(" %1 @rwi").arg(rwi) );
+ PostScriptOutPutString->append( TQString(" %1 @rwi").tqarg(rwi) );
if (rhi != 0)
- PostScriptOutPutString->append( TQString(" %1 @rhi").arg(rhi) );
+ PostScriptOutPutString->append( TQString(" %1 @rhi").tqarg(rhi) );
if (angle != 0)
- PostScriptOutPutString->append( TQString(" %1 @angle").arg(angle) );
+ PostScriptOutPutString->append( TQString(" %1 @angle").tqarg(angle) );
if (clip != -1)
PostScriptOutPutString->append(" @clip");
PostScriptOutPutString->append( " @setspecial \n" );
- PostScriptOutPutString->append( TQString(" (%1) run\n").arg(EPSfilename) );
+ PostScriptOutPutString->append( TQString(" (%1) run\n").tqarg(EPSfilename) );
PostScriptOutPutString->append( "@endspecial \n" );
}
@@ -490,11 +490,11 @@ void dviRenderer::prescan_ParseSourceSpecial(const TQString& cp)
// "src:123file.tex" to positions in the DVI file
// extract the file name and the numeral part from the string
- Q_UINT32 j;
+ TQ_UINT32 j;
for(j=0;j<cp.length();j++)
if (!cp.at(j).isNumber())
break;
- Q_UINT32 sourceLineNumber = cp.left(j).toUInt();
+ TQ_UINT32 sourceLineNumber = cp.left(j).toUInt();
TQFileInfo fi1(dviFile->filename);
TQString sourceFileName = TQFileInfo(fi1.dir(), cp.mid(j).stripWhiteSpace()).absFilePath();
Length l;
@@ -504,7 +504,7 @@ void dviRenderer::prescan_ParseSourceSpecial(const TQString& cp)
}
-void dviRenderer::prescan_parseSpecials(char *cp, Q_UINT8 *)
+void dviRenderer::prescan_parseSpecials(char *cp, TQ_UINT8 *)
{
TQString special_command(cp);
@@ -613,8 +613,8 @@ void dviRenderer::prescan(parseSpecials specialParser)
if (resolutionInDPI == 0.0)
setResolution(100);
- Q_INT32 RRtmp=0, WWtmp=0, XXtmp=0, YYtmp=0, ZZtmp=0;
- Q_UINT8 ch;
+ TQ_INT32 RRtmp=0, WWtmp=0, XXtmp=0, YYtmp=0, ZZtmp=0;
+ TQ_UINT8 ch;
double fontPixelPerDVIunit = dviFile->getCmPerDVIunit() * 1200.0/2.54;
stack.clear();
@@ -631,9 +631,9 @@ void dviRenderer::prescan(parseSpecials specialParser)
}
if (FNTNUM0 <= ch && ch <= (unsigned char) (FNTNUM0 + 63)) {
- currinf.fontp = currinf.fonttable->find(ch - FNTNUM0);
+ currinf.fontp = currinf.fonttable->tqfind(ch - FNTNUM0);
if (currinf.fontp == NULL) {
- errorMsg = i18n("The DVI code referred to font #%1, which was not previously defined.").arg(ch - FNTNUM0);
+ errorMsg = i18n("The DVI code referred to font #%1, which was not previously defined.").tqarg(ch - FNTNUM0);
return;
}
currinf.set_char_p = currinf.fontp->set_char_p;
@@ -641,7 +641,7 @@ void dviRenderer::prescan(parseSpecials specialParser)
}
- Q_INT32 a, b;
+ TQ_INT32 a, b;
switch (ch) {
case SET1:
@@ -718,7 +718,7 @@ void dviRenderer::prescan(parseSpecials specialParser)
case DOWN3:
case DOWN4:
{
- Q_INT32 DDtmp = readINT(ch - DOWN1 + 1);
+ TQ_INT32 DDtmp = readINT(ch - DOWN1 + 1);
currinf.data.dvi_v += ((long) (DDtmp * 65536.0*fontPixelPerDVIunit))/65536;
currinf.data.pxl_v = int(currinf.data.dvi_v/shrinkfactor);
}
@@ -750,7 +750,7 @@ void dviRenderer::prescan(parseSpecials specialParser)
case FNT2:
case FNT3:
case FNT4:
- currinf.fontp = currinf.fonttable->find(readUINT(ch - FNT1 + 1));
+ currinf.fontp = currinf.fonttable->tqfind(readUINT(ch - FNT1 + 1));
if (currinf.fontp == NULL)
return;
currinf.set_char_p = currinf.fontp->set_char_p;
@@ -761,7 +761,7 @@ void dviRenderer::prescan(parseSpecials specialParser)
case XXX3:
case XXX4:
{
- Q_UINT8 *beginningOfSpecialCommand = command_pointer-1;
+ TQ_UINT8 *beginningOfSpecialCommand = command_pointer-1;
a = readUINT(ch - XXX1 + 1);
if (a > 0) {
char *cmd = new char[a+1];
diff --git a/kdvi/dviWidget.cpp b/kdvi/dviWidget.cpp
index ddcac8e6..321f0f57 100644
--- a/kdvi/dviWidget.cpp
+++ b/kdvi/dviWidget.cpp
@@ -22,8 +22,8 @@
#include "renderedDviPagePixmap.h"
#include "selection.h"
-DVIWidget::DVIWidget(TQWidget* parent, PageView* sv, DocumentPageCache* cache, const char* name)
- : DocumentWidget(parent, sv, cache, name)
+DVIWidget::DVIWidget(TQWidget* tqparent, PageView* sv, DocumentPageCache* cache, const char* name)
+ : DocumentWidget(tqparent, sv, cache, name)
{
}
@@ -45,7 +45,7 @@ void DVIWidget::mousePressEvent(TQMouseEvent* e)
// Check if the mouse is pressed on a source-hyperlink
// source hyperlinks can be invoked with the Middle Mousebutton or alternatively
// with Control+Left Mousebutton
- if ((e->button() == MidButton || (e->button() == LeftButton && (e->state() & ControlButton)))
+ if ((e->button() == Qt::MidButton || (e->button() == Qt::LeftButton && (e->state() & ControlButton)))
&& (pageData->sourceHyperLinkList.size() > 0))
{
int minIndex = 0;
@@ -53,7 +53,7 @@ void DVIWidget::mousePressEvent(TQMouseEvent* e)
for(unsigned int i=0; i<pageData->sourceHyperLinkList.size(); i++)
{
- if (pageData->sourceHyperLinkList[i].box.contains(e->pos()))
+ if (pageData->sourceHyperLinkList[i].box.tqcontains(e->pos()))
{
emit(SRCLink(pageData->sourceHyperLinkList[i].linkText, e, this));
e->accept();
@@ -74,7 +74,7 @@ void DVIWidget::mousePressEvent(TQMouseEvent* e)
e->accept();
}
- // Call implementation from parent
+ // Call implementation from tqparent
DocumentWidget::mousePressEvent(e);
}
@@ -99,7 +99,7 @@ void DVIWidget::mouseMoveEvent(TQMouseEvent* e)
// Check if the cursor hovers over a sourceHyperlink.
for(unsigned int i=0; i<pageData->sourceHyperLinkList.size(); i++) {
- if (pageData->sourceHyperLinkList[i].box.contains(e->pos())) {
+ if (pageData->sourceHyperLinkList[i].box.tqcontains(e->pos())) {
clearStatusBarTimer.stop();
// The macro-package srcltx gives a special like "src:99 test.tex"
@@ -112,7 +112,7 @@ void DVIWidget::mouseMoveEvent(TQMouseEvent* e)
if (cp[i].isDigit() == false)
break;
- emit setStatusBarText( i18n("line %1 of %2").arg(cp.left(i)).arg(cp.mid(i).simplifyWhiteSpace()) );
+ emit setStatusBarText( i18n("line %1 of %2").tqarg(cp.left(i)).tqarg(cp.mid(i).simplifyWhiteSpace()) );
return;
}
}
diff --git a/kdvi/dviWidget.h b/kdvi/dviWidget.h
index 5867b39e..864bb526 100644
--- a/kdvi/dviWidget.h
+++ b/kdvi/dviWidget.h
@@ -23,9 +23,10 @@ class textSelection;
class DVIWidget : public DocumentWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
- DVIWidget(TQWidget* parent, PageView* sv, DocumentPageCache* cache, const char* name);
+ DVIWidget(TQWidget* tqparent, PageView* sv, DocumentPageCache* cache, const char* name);
signals:
void SRCLink(const TQString&, TQMouseEvent* e, DocumentWidget*);
diff --git a/kdvi/dvisourcesplitter.cpp b/kdvi/dvisourcesplitter.cpp
index e0d17aa1..baa0269a 100644
--- a/kdvi/dvisourcesplitter.cpp
+++ b/kdvi/dvisourcesplitter.cpp
@@ -31,7 +31,7 @@ DVI_SourceFileSplitter::DVI_SourceFileSplitter(const TQString &srclink, const TQ
if ( filepart.left(4) == "src:" ) filepart = srclink.mid(4);
//split first
- Q_UINT32 max = filepart.length(), i = 0;
+ TQ_UINT32 max = filepart.length(), i = 0;
for(i=0; i<max; ++i) if ( !filepart[i].isDigit()) break;
linepart = filepart.left(i);
filepart = filepart.mid(i);
@@ -62,7 +62,7 @@ DVI_SourceFileSplitter::DVI_SourceFileSplitter(const TQString &srclink, const TQ
{
TQFileInfo tempInfo(m_fileInfo);
TQString tempFileName = tempInfo.fileName();
- Q_UINT32 index, maxindex = linepart.length();
+ TQ_UINT32 index, maxindex = linepart.length();
bool found = false;
for ( index = 1; index < maxindex; ++index)
{
diff --git a/kdvi/dvisourcesplitter.h b/kdvi/dvisourcesplitter.h
index 5253ce4a..35b84e7a 100644
--- a/kdvi/dvisourcesplitter.h
+++ b/kdvi/dvisourcesplitter.h
@@ -24,11 +24,11 @@ public:
TQString filePath() { return m_fileInfo.absFilePath(); }
bool fileExists() { return m_fileInfo.exists(); }
- Q_UINT32 line() { return m_line; }
+ TQ_UINT32 line() { return m_line; }
private:
TQFileInfo m_fileInfo;
- Q_UINT32 m_line;
+ TQ_UINT32 m_line;
bool m_exists;
};
#endif
diff --git a/kdvi/examples/dvistd0.dvi b/kdvi/examples/dvistd0.dvi
index ef73e604..654b617b 100644
--- a/kdvi/examples/dvistd0.dvi
+++ b/kdvi/examples/dvistd0.dvi
Binary files differ
diff --git a/kdvi/fontEncoding.cpp b/kdvi/fontEncoding.cpp
index 9f2d4de2..62905030 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.").arg(encName) << endl;
+ kdError(4300) << TQString("fontEncoding::fontEncoding(...): The file '%1' could not be found by kpsewhich.").tqarg(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.").arg(encFileName) << endl;
+ kdError(4300) << TQString("fontEncoding::fontEncoding(...): The file '%1' could not be opened.").tqarg(encFileName) << endl;
return;
}
diff --git a/kdvi/fontEncoding.h b/kdvi/fontEncoding.h
index 8ce0d18b..b70cfdc5 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 shaped.
+ * it, and retrieve the character tqshaped.
*
* 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
@@ -48,7 +48,7 @@
* a different name and with a different encoding ---the map file
* (fontMap.h) can probably see to that.
*
- * Summing up: this class contains 256 glyph names read from an
+ * Summing up: this class tqcontains 256 glyph names read from an
* encoding file during the construction of this class.
*
* @author Stefan Kebekus <kebekus@kde.org>
diff --git a/kdvi/fontEncodingPool.cpp b/kdvi/fontEncodingPool.cpp
index 59b38167..4c00256f 100644
--- a/kdvi/fontEncodingPool.cpp
+++ b/kdvi/fontEncodingPool.cpp
@@ -18,7 +18,7 @@ fontEncodingPool::fontEncodingPool()
fontEncoding *fontEncodingPool::findByName(const TQString &name)
{
- fontEncoding *ptr = dictionary.find( name );
+ fontEncoding *ptr = dictionary.tqfind( name );
if (ptr == 0) {
ptr = new fontEncoding(name);
diff --git a/kdvi/fontMap.cpp b/kdvi/fontMap.cpp
index 66d230d7..b285018b 100644
--- a/kdvi/fontMap.cpp
+++ b/kdvi/fontMap.cpp
@@ -26,7 +26,7 @@ fontMap::fontMap()
// has, like kdvi (and unlike dvips), no built-in fonts.
// Finding ps2pk.map is not easy. In teTeX < 3.0, the kpsewhich
- // program REQUIRES the option "--format=dvips config". In teTeX =
+ // program RETQUIRES the option "--format=dvips config". In teTeX =
// 3.0, the option "--format=map" MUST be used. Since there is no
// way to give both options at the same time, there is seemingly no
// other way than to try both options one after another. We use the
@@ -78,7 +78,7 @@ fontMap::fontMap()
encodingName = encodingName.mid(1);
double slant = 0.0;
- int i = line.find("SlantFont");
+ int i = line.tqfind("SlantFont");
if (i >= 0) {
bool ok;
slant = line.left(i).section(' ', -1, -1 ,TQString::SectionSkipEmpty).toDouble(&ok);
@@ -94,11 +94,11 @@ fontMap::fontMap()
if (encodingName.endsWith(".enc"))
entry.fontEncoding = encodingName;
else
- entry.fontEncoding = TQString::null;
+ entry.fontEncoding = TQString();
}
file.close();
} else
- kdError(4300) << TQString("fontMap::fontMap(): The file '%1' could not be opened.").arg(map_fileName) << endl;
+ kdError(4300) << TQString("fontMap::fontMap(): The file '%1' could not be opened.").tqarg(map_fileName) << endl;
#ifdef DEBUG_FONTMAP
kdDebug(4300) << "FontMap file parsed. Results:" << endl;
@@ -115,40 +115,40 @@ fontMap::fontMap()
const TQString &fontMap::findFileName(const TQString &TeXName)
{
- TQMap<TQString, fontMapEntry>::Iterator it = fontMapEntries.find(TeXName);
+ TQMap<TQString, fontMapEntry>::Iterator it = fontMapEntries.tqfind(TeXName);
if (it != fontMapEntries.end())
return it.data().fontFileName;
else
- return TQString::null;
+ return TQString();
}
const TQString &fontMap::findFontName(const TQString &TeXName)
{
- TQMap<TQString, fontMapEntry>::Iterator it = fontMapEntries.find(TeXName);
+ TQMap<TQString, fontMapEntry>::Iterator it = fontMapEntries.tqfind(TeXName);
if (it != fontMapEntries.end())
return it.data().fullFontName;
else
- return TQString::null;
+ return TQString();
}
const TQString &fontMap::findEncoding(const TQString &TeXName)
{
- TQMap<TQString, fontMapEntry>::Iterator it = fontMapEntries.find(TeXName);
+ TQMap<TQString, fontMapEntry>::Iterator it = fontMapEntries.tqfind(TeXName);
if (it != fontMapEntries.end())
return it.data().fontEncoding;
else
- return TQString::null;
+ return TQString();
}
double fontMap::findSlant(const TQString &TeXName)
{
- TQMap<TQString, fontMapEntry>::Iterator it = fontMapEntries.find(TeXName);
+ TQMap<TQString, fontMapEntry>::Iterator it = fontMapEntries.tqfind(TeXName);
if (it != fontMapEntries.end())
return it.data().slant;
diff --git a/kdvi/fontMap.h b/kdvi/fontMap.h
index 3e0177a8..6a719ea6 100644
--- a/kdvi/fontMap.h
+++ b/kdvi/fontMap.h
@@ -13,7 +13,7 @@
#include <tqstring.h>
/**
- * This class represents one line of a font map file, and contains
+ * This class represents one line of a font map file, and tqcontains
* three pieces of information about a font: its file name, the full
* name of the font, and the encoding.
*
@@ -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 shaped. Happy times, they
+ * file, load it, and retrieve the character tqshaped. Happy times, they
* were.
*
* Today TeX is also used to access Type1 and TrueType fonts, which do
@@ -92,17 +92,17 @@ class fontMap {
/** find the name of a font file (e.g. 'ubkd8a.pfb') from a TeX font
name (e.g. 'rpbkd'). This method return a reference to
- TQString::null if the font could not be found. */
+ TQString() if the font could not be found. */
const TQString &findFileName(const TQString &TeXName);
/** find the name of a font (e.g. 'URWBookmanL-DemiBold') from a TeX
font name (e.g. 'rpbkd'). This method return a reference to
- TQString::null if the font could not be found. */
+ TQString() if the font could not be found. */
const TQString &findFontName(const TQString &TeXName);
/** find the name of an encoding file for a font (e.g. '8r') from a
TeX font name (e.g. 'rpbkd'). This method return a reference to
- TQString::null if the font could not be found. */
+ TQString() if the font could not be found. */
const TQString &findEncoding(const TQString &TeXName);
/** This method finds the slant of a font. Returns 0.0 if no slant
diff --git a/kdvi/fontpool.cpp b/kdvi/fontpool.cpp
index fecd2b0b..32b75afd 100644
--- a/kdvi/fontpool.cpp
+++ b/kdvi/fontpool.cpp
@@ -46,7 +46,7 @@ fontPool::fontPool()
i18n( "KDVI is currently generating bitmap fonts..." ),
i18n( "Aborts the font generation. Don't do this." ),
i18n( "KDVI is currently generating bitmap fonts which are needed to display your document. "
- "For this, KDVI uses a number of external programs, such as MetaFont. You can find "
+ "For this, KDVI uses a number of external programs, such as MetaFont. You can tqfind "
"the output of these programs later in the document info dialog." ),
i18n( "KDVI is generating fonts. Please wait." ),
0 )
@@ -60,7 +60,7 @@ fontPool::fontPool()
displayResolution_in_dpi = 100.0; // A not-too-bad-default
useFontHints = true;
CMperDVIunit = 0;
- extraSearchPath = TQString::null;
+ extraSearchPath = TQString();
fontList.setAutoDelete(true);
@@ -77,30 +77,30 @@ fontPool::fontPool()
// pixmaps. Experiments show that --depending of the configuration
// of QT at compile and runtime or the availability of the XFt
// extension, alpha channels are either supported, or silently
- // converted to 1-bit masks.
+ // converted to 1-bit tqmasks.
TQImage start(1, 1, 32); // Generate a 1x1 image, black with alpha=0x10
start.setAlphaBuffer(true);
- Q_UINT32 *destScanLine = (Q_UINT32 *)start.scanLine(0);
+ TQ_UINT32 *destScanLine = (TQ_UINT32 *)start.scanLine(0);
*destScanLine = 0x80000000;
TQPixmap intermediate(start);
TQPixmap dest(1,1);
- dest.fill(Qt::white);
+ dest.fill(TQt::white);
TQPainter paint( &dest );
paint.drawPixmap(0, 0, intermediate);
paint.end();
start = dest.convertToImage().convertDepth(32);
- Q_UINT8 result = *(start.scanLine(0)) & 0xff;
+ TQ_UINT8 result = *(start.scanLine(0)) & 0xff;
if ((result == 0xff) || (result == 0x00)) {
#ifdef DEBUG_FONTPOOL
kdDebug(4300) << "fontPool::fontPool(): TQPixmap does not support the alpha channel" << endl;
#endif
- QPixmapSupportsAlpha = false;
+ TQPixmapSupportsAlpha = false;
} else {
#ifdef DEBUG_FONTPOOL
kdDebug(4300) << "fontPool::fontPool(): TQPixmap supports the alpha channel" << endl;
#endif
- QPixmapSupportsAlpha = true;
+ TQPixmapSupportsAlpha = true;
}
}
@@ -137,7 +137,7 @@ void fontPool::setParameters( bool _useFontHints )
}
-TeXFontDefinition* fontPool::appendx(const TQString& fontname, Q_UINT32 checksum, Q_UINT32 scale, double enlargement)
+TeXFontDefinition* fontPool::appendx(const TQString& fontname, TQ_UINT32 checksum, TQ_UINT32 scale, double enlargement)
{
// Reuse font if possible: check if a font with that name and
// natural resolution is already in the fontpool, and use that, if
@@ -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>")
- .arg(i18n("TeX Name"))
- .arg(i18n("Family"))
- .arg(i18n("Zoom"))
- .arg(i18n("Type"))
- .arg(i18n("Encoding"))
- .arg(i18n("Comment")) );
+ .tqarg(i18n("TeX Name"))
+ .tqarg(i18n("Family"))
+ .tqarg(i18n("Zoom"))
+ .tqarg(i18n("Type"))
+ .tqarg(i18n("Encoding"))
+ .tqarg(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>")
- .arg(fontp->fontname)
- .arg(fontp->getFullFontName())
- .arg((int)(fontp->enlargement*100 + 0.5))
- .arg(fontp->getFontTypeName())
- .arg(encoding)
- .arg(errMsg);
+ .tqarg(fontp->fontname)
+ .tqarg(fontp->getFullFontName())
+ .tqarg((int)(fontp->enlargement*100 + 0.5))
+ .tqarg(fontp->getFontTypeName())
+ .tqarg(encoding)
+ .tqarg(errMsg);
#endif
fontp=fontList.next();
@@ -252,7 +252,7 @@ bool fontPool::areFontsLocated()
void fontPool::locateFonts()
{
- kpsewhichOutput = TQString::null;
+ kpsewhichOutput = TQString();
// First, we try and find those fonts which exist on disk
// already. If virtual fonts are found, they will add new fonts to
@@ -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>").arg(getenv("PATH")).arg(kpsewhichOutput);
+ TQString details = TQString("<qt><p><b>PATH:</b> %1</p>%2</qt>").tqarg(getenv("PATH")).tqarg(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>"),
@@ -304,7 +304,7 @@ void fontPool::locateFonts(bool makePK, bool locateTFMonly, bool *virtualFontsFo
// If PK fonts are generated, the kpsewhich command will re-route
// the output of MetaFont into its stderr. Here we make sure this
// output is intercepted and parsed.
- qApp->connect(&kpsewhichIO, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)),
+ tqApp->connect(&kpsewhichIO, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)),
this, TQT_SLOT(mf_output_receiver(KProcess *, char *, int)));
@@ -323,24 +323,24 @@ void fontPool::locateFonts(bool makePK, bool locateTFMonly, bool *virtualFontsFo
shellProcessCmdLine += "--no-mktex pk";
// Names of fonts that shall be located
- Q_UINT16 numFontsInJob = 0;
+ TQ_UINT16 numFontsInJob = 0;
TeXFontDefinition *fontp = fontList.first();
while ( fontp != 0 ) {
if (!fontp->isLocated()) {
numFontsInJob++;
if (locateTFMonly == true)
- shellProcessCmdLine += KShellProcess::quote(TQString("%1.tfm").arg(fontp->fontname));
+ shellProcessCmdLine += KShellProcess::quote(TQString("%1.tfm").tqarg(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").arg(filename));
+ shellProcessCmdLine += KShellProcess::quote(TQString("%1").tqarg(filename));
}
#endif
- shellProcessCmdLine += KShellProcess::quote(TQString("%1.vf").arg(fontp->fontname));
- shellProcessCmdLine += KShellProcess::quote(TQString("%1.1200pk").arg(fontp->fontname));
+ shellProcessCmdLine += KShellProcess::quote(TQString("%1.vf").tqarg(fontp->fontname));
+ shellProcessCmdLine += KShellProcess::quote(TQString("%1.1200pk").tqarg(fontp->fontname));
}
}
fontp=fontList.next();
@@ -352,7 +352,7 @@ void fontPool::locateFonts(bool makePK, bool locateTFMonly, bool *virtualFontsFo
progress.setTotalSteps(numFontsInJob, &kpsewhichIO);
// Now run... kpsewhich. In case of error, kick up a fuss.
- MetafontOutput = TQString::null;
+ MetafontOutput = TQString();
kpsewhichOutput += "<p><b>"+shellProcessCmdLine.join(" ")+"</b></p>";
kpsewhichIO << shellProcessCmdLine;
TQString importanceOfKPSEWHICH = i18n("<p>KDVI relies on the <b>kpsewhich</b> program to locate font files "
@@ -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>").arg(importanceOfKPSEWHICH).arg(msg),
+ KMessageBox::error( 0, TQString("<qt>%1%2</qt>").tqarg(importanceOfKPSEWHICH).tqarg(msg),
i18n("Problem locating fonts - KDVI") );
markFontsAsLocated();
return;
@@ -374,7 +374,7 @@ void fontPool::locateFonts(bool makePK, bool locateTFMonly, bool *virtualFontsFo
// updated. This is important, e.g. for the progress dialog that is
// shown when PK fonts are generated by MetaFont.
while(kpsewhichIO.wait(1) == false)
- qApp->processEvents();
+ tqApp->processEvents();
progress.hide();
// Handle fatal errors.
@@ -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>").arg(getenv("PATH")).arg(kpsewhichOutput);
+ TQString details = TQString("<qt><p><b>PATH:</b> %1</p>%2</qt>").tqarg(getenv("PATH")).tqarg(kpsewhichOutput);
- KMessageBox::detailedError( 0, TQString("<qt>%1%2</qt>").arg(importanceOfKPSEWHICH).arg(msg), details,
+ KMessageBox::detailedError( 0, TQString("<qt>%1%2</qt>").tqarg(importanceOfKPSEWHICH).tqarg(msg), details,
i18n("Problem locating fonts - KDVI") );
// This makes sure the we don't try to run kpsewhich again
markFontsAsLocated();
@@ -558,36 +558,36 @@ void fontPool::mf_output_receiver(KProcess *, char *buffer, int buflen)
// We'd like to print only full lines of text.
int numleft;
bool show_prog = false;
- while( (numleft = MetafontOutput.find('\n')) != -1) {
+ while( (numleft = MetafontOutput.tqfind('\n')) != -1) {
TQString line = MetafontOutput.left(numleft+1);
#ifdef DEBUG_FONTPOOL
kdDebug(4300) << "MF OUTPUT RECEIVED: " << line;
#endif
// Search for a line which marks the beginning of a MetaFont run
// and show the progress dialog at the end of this method.
- if (line.find("kpathsea:") == 0)
+ if (line.tqfind("kpathsea:") == 0)
show_prog = true;
// If the Output of the kpsewhich program contains a line starting
// with "kpathsea:", this means that a new MetaFont-run has been
// started. We filter these lines out and update the display
// accordingly.
- int startlineindex = line.find("kpathsea:");
+ int startlineindex = line.tqfind("kpathsea:");
if (startlineindex != -1) {
- int endstartline = line.find("\n",startlineindex);
+ int endstartline = line.tqfind("\n",startlineindex);
TQString startLine = line.mid(startlineindex,endstartline-startlineindex);
// The last word in the startline is the name of the font which we
// are generating. The second-to-last word is the resolution in
// dots per inch. Display this info in the text label below the
// progress bar.
- int lastblank = startLine.findRev(' ');
+ int lastblank = startLine.tqfindRev(' ');
TQString fontName = startLine.mid(lastblank+1);
- int secondblank = startLine.findRev(' ',lastblank-1);
+ int secondblank = startLine.tqfindRev(' ',lastblank-1);
TQString dpi = startLine.mid(secondblank+1,lastblank-secondblank-1);
progress.show();
- progress.increaseNumSteps( i18n("Currently generating %1 at %2 dpi").arg(fontName).arg(dpi) );
+ progress.increaseNumSteps( i18n("Currently generating %1 at %2 dpi").tqarg(fontName).tqarg(dpi) );
}
MetafontOutput = MetafontOutput.remove(0,numleft+1);
}
diff --git a/kdvi/fontpool.h b/kdvi/fontpool.h
index 3edcaffe..753f95e1 100644
--- a/kdvi/fontpool.h
+++ b/kdvi/fontpool.h
@@ -38,6 +38,7 @@ class KShellProcess;
class fontPool : public TQObject {
Q_OBJECT
+ TQ_OBJECT
public:
// Default constructor.
@@ -78,7 +79,7 @@ public:
// called. Since this is done using a concurrently running process,
// there is no guarantee that the loading is already performed when
// the method returns.
- TeXFontDefinition* appendx(const TQString& fontname, Q_UINT32 checksum, Q_UINT32 scale, double enlargement);
+ TeXFontDefinition* appendx(const TQString& fontname, TQ_UINT32 checksum, TQ_UINT32 scale, double enlargement);
// Returns a string in a very basic HTML format which describes the
// fonts in the pool.
@@ -124,10 +125,10 @@ public:
channel of pixmaps. Experiments show that --depending of the
configuration of QT at compile and runtime or the availability
of the XFt extension, alpha channels are either supported, or
- silently converted to 1-bit masks. The redering routines in the
+ silently converted to 1-bit tqmasks. The redering routines in the
TeXFont implementation use this flag to choose the apropriate
drawing routines for the different setups. */
- bool QPixmapSupportsAlpha;
+ bool TQPixmapSupportsAlpha;
signals:
/** Passed through to the top-level kpart. */
@@ -178,13 +179,13 @@ private:
void locateFonts(bool makePK, bool locateTFMonly, bool *virtualFontsFound=0);
// This TQString is used internally by the mf_output_receiver()
- // method. This string is set to TQString::null in locateFonts(bool,
+ // method. This string is set to TQString() in locateFonts(bool,
// bool, bool *). Values are set and read by the
// mf_output_receiver(...) method
TQString MetafontOutput;
// This TQString is used to collect the output of kpsewhich and
- // MetaFont. The string is set to TQString::null in the
+ // MetaFont. The string is set to TQString() in the
// locateFonts()-method, and content is gathered by the
// mf_output_receiver(). This string is used by locateFonts() and
// locateFonts(bool, bool, bool *) to display error messages.
diff --git a/kdvi/fontprogress.cpp b/kdvi/fontprogress.cpp
index e5e34270..19fe63cd 100644
--- a/kdvi/fontprogress.cpp
+++ b/kdvi/fontprogress.cpp
@@ -22,11 +22,11 @@
#include <tqvbox.h>
/*
- * Constructs a fontProgressDialog which is a child of 'parent', with the
+ * Constructs a fontProgressDialog which is a child of 'tqparent', with the
* name 'name' and widget flags set to 'f'
*/
-fontProgressDialog::fontProgressDialog(const TQString& helpIndex, const TQString& label, const TQString& abortTip, const TQString& whatsThis, const TQString& ttip, TQWidget* parent, const TQString& name, bool progressbar)
- : KDialogBase( parent, "Font Generation Progress Dialog", true, name, Cancel, Cancel, true )
+fontProgressDialog::fontProgressDialog(const TQString& helpIndex, const TQString& label, const TQString& abortTip, const TQString& whatsThis, const TQString& ttip, TQWidget* tqparent, const TQString& name, bool progressbar)
+ : KDialogBase( tqparent, "Font Generation Progress Dialog", true, name, Cancel, Cancel, true )
{
setCursor( TQCursor( 3 ) );
@@ -42,7 +42,7 @@ fontProgressDialog::fontProgressDialog(const TQString& helpIndex, const TQString
TQVBox *page = makeVBoxMainWidget();
TextLabel1 = new TQLabel( label, page, "TextLabel2" );
- TextLabel1->setAlignment( int( TQLabel::AlignCenter ) );
+ TextLabel1->tqsetAlignment( int( TQLabel::AlignCenter ) );
TQWhatsThis::add( TextLabel1, whatsThis );
TQToolTip::add( TextLabel1, ttip );
@@ -55,13 +55,13 @@ fontProgressDialog::fontProgressDialog(const TQString& helpIndex, const TQString
ProgressBar1 = NULL;
TextLabel2 = new TQLabel( "", page, "TextLabel2" );
- TextLabel2->setAlignment( int( TQLabel::AlignCenter ) );
+ TextLabel2->tqsetAlignment( int( TQLabel::AlignCenter ) );
TQWhatsThis::add( TextLabel2, whatsThis );
TQToolTip::add( TextLabel2, ttip );
progress = 0;
procIO = 0;
- qApp->connect(this, TQT_SIGNAL(finished()), this, TQT_SLOT(killProcIO()));
+ tqApp->connect(this, TQT_SIGNAL(finished()), this, TQT_SLOT(killProcIO()));
}
@@ -71,7 +71,7 @@ fontProgressDialog::fontProgressDialog(const TQString& helpIndex, const TQString
fontProgressDialog::~fontProgressDialog()
{
- // no need to delete child widgets, Qt does it all for us
+ // no need to delete child widgets, TQt does it all for us
}
diff --git a/kdvi/fontprogress.h b/kdvi/fontprogress.h
index 6f4267cc..6c19520c 100644
--- a/kdvi/fontprogress.h
+++ b/kdvi/fontprogress.h
@@ -31,10 +31,11 @@ class TQLabel;
class fontProgressDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
fontProgressDialog( const TQString& helpIndex, const TQString& label, const TQString& abortTip, const TQString& whatsThis, const TQString& ttip,
- TQWidget* parent = 0, const TQString &name = 0, bool progressbar=true );
+ TQWidget* tqparent = 0, const TQString &name = 0, bool progressbar=true );
~fontProgressDialog();
/** The number of steps already done is increased, the text received
@@ -43,7 +44,7 @@ public:
/** Used to initialize the progress bar. If the argument proc is
non-zero, the associated process will be killed when the "abort"
- button is pressed. The FontProgress uses a QGuarderPtr
+ button is pressed. The FontProgress uses a TQGuarderPtr
internally, so it is save to delete the KProcIO anytime. */
void setTotalSteps(int, KProcIO *proc=0);
diff --git a/kdvi/glyph.h b/kdvi/glyph.h
index 65f86327..2265c6df 100644
--- a/kdvi/glyph.h
+++ b/kdvi/glyph.h
@@ -8,8 +8,8 @@
struct bitmap {
- Q_UINT16 w, h; /* width and height in pixels */
- Q_UINT16 bytes_wide; /* scan-line width in bytes */
+ TQ_UINT16 w, h; /* width and height in pixels */
+ TQ_UINT16 bytes_wide; /* scan-line width in bytes */
char *bits; /* pointer to the bits */
};
@@ -24,7 +24,7 @@ class glyph {
TQColor color;
// DVI units to move reference point
- Q_INT32 dvi_advance_in_units_of_design_size_by_2e20;
+ TQ_INT32 dvi_advance_in_units_of_design_size_by_2e20;
// x and y offset in pixels
short x, y;
diff --git a/kdvi/infodialog.cpp b/kdvi/infodialog.cpp
index 91de53d3..b287a390 100644
--- a/kdvi/infodialog.cpp
+++ b/kdvi/infodialog.cpp
@@ -21,8 +21,8 @@
#include "fontpool.h"
#include "infodialog.h"
-infoDialog::infoDialog( TQWidget* parent )
- : KDialogBase( Tabbed, i18n("Document Info"), Ok, Ok, parent, "Document Info", false, false)
+infoDialog::infoDialog( TQWidget* tqparent )
+ : KDialogBase( Tabbed, i18n("Document Info"), Ok, Ok, tqparent, "Document Info", false, false)
{
TQFrame *page1 = addPage( i18n("DVI File") );
TQVBoxLayout *topLayout1 = new TQVBoxLayout( page1, 0, 6 );
@@ -51,8 +51,8 @@ infoDialog::infoDialog( TQWidget* parent )
topLayout3->addWidget( TextLabel3 );
MFOutputReceived = false;
- headline = TQString::null;
- pool = TQString::null;
+ headline = TQString();
+ pool = TQString();
}
@@ -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>").arg(i18n("Filename")).arg(dviFile->filename));
+ text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").tqarg(i18n("Filename")).tqarg(dviFile->filename));
TQFile file(dviFile->filename);
if (file.exists())
- text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").arg(i18n("File Size")).arg(KIO::convertSize(file.size())));
+ text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").tqarg(i18n("File Size")).tqarg(KIO::convertSize(file.size())));
else
- 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>%1</td></tr>").tqarg(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>").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));
+ 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));
} // else (dviFile == NULL)
TextLabel1->setText( text );
@@ -89,17 +89,17 @@ void infoDialog::setFontInfo(fontPool *fp)
void infoDialog::outputReceiver(const TQString& _op)
{
TQString op = _op;
- op = op.replace( TQRegExp("<"), "&lt;" );
+ op = op.tqreplace( TQRegExp("<"), "&lt;" );
if (MFOutputReceived == false) {
TextLabel3->setText("<b>"+headline+"</b><br>");
- headline = TQString::null;
+ headline = TQString();
}
// It seems that the TQTextView wants that we append only full lines.
// We see to that.
pool = pool+op;
- int idx = pool.findRev("\n");
+ int idx = pool.tqfindRev("\n");
while(idx != -1) {
TQString line = pool.left(idx);
@@ -108,9 +108,9 @@ void infoDialog::outputReceiver(const TQString& _op)
// If the Output of the kpsewhich program contains a line starting
// with "kpathsea:", this means that a new MetaFont-run has been
// started. We filter these lines out and print them in boldface.
- int startlineindex = line.find("kpathsea:");
+ int startlineindex = line.tqfind("kpathsea:");
if (startlineindex != -1) {
- int endstartline = line.find("\n",startlineindex);
+ int endstartline = line.tqfind("\n",startlineindex);
TQString startLine = line.mid(startlineindex,endstartline-startlineindex);
if (MFOutputReceived)
TextLabel3->append("<hr>\n<b>"+startLine+"</b>");
@@ -119,7 +119,7 @@ void infoDialog::outputReceiver(const TQString& _op)
TextLabel3->append(line.mid(endstartline));
} else
TextLabel3->append(line);
- idx = pool.findRev("\n");
+ idx = pool.tqfindRev("\n");
}
MFOutputReceived = true;
@@ -128,7 +128,7 @@ void infoDialog::outputReceiver(const TQString& _op)
void infoDialog::clear(const TQString& op)
{
headline = op;
- pool = TQString::null;
+ pool = TQString();
MFOutputReceived = false;
}
#include "infodialog.moc"
diff --git a/kdvi/infodialog.h b/kdvi/infodialog.h
index 8b3ea7d2..d7f37e56 100644
--- a/kdvi/infodialog.h
+++ b/kdvi/infodialog.h
@@ -20,9 +20,10 @@ class TQWidget;
class infoDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- infoDialog( TQWidget* parent = 0 );
+ infoDialog( TQWidget* tqparent = 0 );
/** This method is used to set the data coming from the DVI
file. Note that 0 is a permissible argument, that just means:
diff --git a/kdvi/kdvi_multipage.cpp b/kdvi/kdvi_multipage.cpp
index 8a7b1f59..b1995b88 100644
--- a/kdvi/kdvi_multipage.cpp
+++ b/kdvi/kdvi_multipage.cpp
@@ -49,9 +49,9 @@ K_EXPORT_COMPONENT_FACTORY(kdvipart, KDVIMultiPageFactory)
-KDVIMultiPage::KDVIMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *parent,
+KDVIMultiPage::KDVIMultiPage(TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent,
const char *name, const TQStringList& args)
- : KMultiPage(parentWidget, widgetName, parent, name), DVIRenderer(parentWidget)
+ : KMultiPage(tqparentWidget, widgetName, tqparent, name), DVIRenderer(tqparentWidget)
{
Q_UNUSED(args);
#ifdef PERFORMANCE_MEASUREMENT
@@ -141,27 +141,27 @@ void KDVIMultiPage::slotSave()
// Try to guess the proper ending...
TQString formats;
TQString ending;
- int rindex = m_file.findRev(".");
+ int rindex = m_file.tqfindRev(".");
if (rindex == -1) {
- ending = TQString::null;
- formats = TQString::null;
+ ending = TQString();
+ formats = TQString();
} else {
ending = m_file.mid(rindex); // e.g. ".dvi"
formats = fileFormats().grep(ending).join("\n");
}
- TQString fileName = KFileDialog::getSaveFileName(TQString::null, formats, 0, i18n("Save File As"));
+ TQString fileName = KFileDialog::getSaveFileName(TQString(), formats, 0, i18n("Save File As"));
if (fileName.isEmpty())
return;
// Add the ending to the filename. I hope the user likes it that
// way.
- if (!ending.isEmpty() && fileName.find(ending) == -1)
+ if (!ending.isEmpty() && fileName.tqfind(ending) == -1)
fileName = fileName+ending;
if (TQFile(fileName).exists()) {
- int r = KMessageBox::warningContinueCancel (0, i18n("The file %1\nexists. Do you want to overwrite that file?").arg(fileName),
+ int r = KMessageBox::warningContinueCancel (0, i18n("The file %1\nexists. Do you want to overwrite that file?").tqarg(fileName),
i18n("Overwrite File"), i18n("Overwrite"));
if (r == KMessageBox::Cancel)
return;
@@ -213,7 +213,7 @@ void KDVIMultiPage::addConfigDialogs(KConfigDialog* configDialog)
void KDVIMultiPage::preferencesChanged()
{
- // Call method from parent class
+ // Call method from tqparent class
KMultiPage::preferencesChanged();
#ifdef KDVI_MULTIPAGE_DEBUG
kdDebug(4300) << "preferencesChanged" << endl;
@@ -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").arg(m_file.section('/', -1)) ))
+ if (!printer->setup(tqparentWdg, i18n("Print %1").tqarg(m_file.section('/', -1)) ))
return;
// This funny method call is necessary for the KPrinter to return
@@ -256,7 +256,7 @@ void KDVIMultiPage::print()
// Turn the results of the options requestor into a list arguments
// which are used by dvips.
- TQString dvips_options = TQString::null;
+ TQString dvips_options = TQString();
// Print in reverse order.
if ( printer->pageOrder() == KPrinter::LastPageFirst )
dvips_options += "-r ";
@@ -365,7 +365,7 @@ void KDVIMultiPage::print()
default:
break;
}
- // Orientation
+ // Qt::Orientation
if ( printer->orientation() == KPrinter::Landscape )
dvips_options += "-t landscape ";
@@ -379,7 +379,7 @@ void KDVIMultiPage::print()
dvips_options += TQString(",");
else
commaflag = 1;
- dvips_options += TQString("%1").arg(*it);
+ dvips_options += TQString("%1").tqarg(*it);
}
// Now print. For that, export the DVI-File to PostScript. Note that
diff --git a/kdvi/kdvi_multipage.h b/kdvi/kdvi_multipage.h
index c3e60aea..cbc7d125 100644
--- a/kdvi/kdvi_multipage.h
+++ b/kdvi/kdvi_multipage.h
@@ -12,9 +12,10 @@ class KPrinter;
class KDVIMultiPage : public KMultiPage
{
Q_OBJECT
+ TQ_OBJECT
public:
- KDVIMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *parent,
+ KDVIMultiPage(TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent,
const char *name, const TQStringList& args = TQStringList());
virtual ~KDVIMultiPage();
diff --git a/kdvi/main.cpp b/kdvi/main.cpp
index af7bc928..50221ebe 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.")).arg(args->arg(0)) << endl;
+ kdError(4300) << TQString(I18N_NOOP("The URL %1 is not well-formed.")).tqarg(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.")).arg(args->arg(0)) << endl;
+ "files if you are using the '--unique' option.")).tqarg(args->arg(0)) << endl;
return -1;
}
@@ -98,7 +98,7 @@ int main(int argc, char** argv)
QCStringList apps = app.dcopClient()->registeredApplications();
for ( QCStringList::Iterator it = apps.begin(); it != apps.end(); ++it )
{
- if ((*it).find("kviewshell") == 0)
+ if ((*it).tqfind("kviewshell") == 0)
{
TQByteArray data, replyData;
TQCString replyType;
diff --git a/kdvi/optionDialogFontsWidget.cpp b/kdvi/optionDialogFontsWidget.cpp
index 14a72ee2..60a52c66 100644
--- a/kdvi/optionDialogFontsWidget.cpp
+++ b/kdvi/optionDialogFontsWidget.cpp
@@ -21,10 +21,10 @@
#include "optionDialogFontsWidget.h"
-// Constructs a optionDialogWidget_base which is a child of 'parent', with
+// Constructs a optionDialogWidget_base which is a child of 'tqparent', with
// the name 'name' and widget flags set to 'f'.
-optionDialogFontsWidget::optionDialogFontsWidget( TQWidget* parent, const char* name, WFlags fl )
- : optionDialogFontsWidget_base( parent, name, fl )
+optionDialogFontsWidget::optionDialogFontsWidget( TQWidget* tqparent, const char* name, WFlags fl )
+ : optionDialogFontsWidget_base( tqparent, name, fl )
{
#ifndef HAVE_FREETYPE
kcfg_UseType1Fonts->setChecked(false);
diff --git a/kdvi/optionDialogFontsWidget.h b/kdvi/optionDialogFontsWidget.h
index f7ad740f..ce8c85f3 100644
--- a/kdvi/optionDialogFontsWidget.h
+++ b/kdvi/optionDialogFontsWidget.h
@@ -15,9 +15,10 @@
class optionDialogFontsWidget : public optionDialogFontsWidget_base
{
Q_OBJECT
+ TQ_OBJECT
public:
- optionDialogFontsWidget( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+ optionDialogFontsWidget( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
~optionDialogFontsWidget();
};
diff --git a/kdvi/optionDialogFontsWidget_base.ui b/kdvi/optionDialogFontsWidget_base.ui
index da4ca601..22f7a119 100644
--- a/kdvi/optionDialogFontsWidget_base.ui
+++ b/kdvi/optionDialogFontsWidget_base.ui
@@ -1,7 +1,7 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>optionDialogFontsWidget_base</class>
<author>Stefan Kebekus</author>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>optionDialogFontsWidget_base</cstring>
</property>
@@ -20,7 +20,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_UseFontHints</cstring>
</property>
@@ -44,7 +44,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>31</width>
<height>121</height>
@@ -56,9 +56,9 @@
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<slots>
+<Q_SLOTS>
<slot>buttonGroup1_clicked(int)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>
diff --git a/kdvi/optionDialogSpecialWidget.cpp b/kdvi/optionDialogSpecialWidget.cpp
index 1b61e4a5..6c27b019 100644
--- a/kdvi/optionDialogSpecialWidget.cpp
+++ b/kdvi/optionDialogSpecialWidget.cpp
@@ -23,10 +23,10 @@
#include "prefs.h"
-// Constructs a optionDialogWidget_base which is a child of 'parent', with
+// Constructs a optionDialogWidget_base which is a child of 'tqparent', with
// the name 'name' and widget flags set to 'f'.
-optionDialogSpecialWidget::optionDialogSpecialWidget( TQWidget* parent, const char* name, WFlags fl )
- : optionDialogSpecialWidget_base( parent, name, fl )
+optionDialogSpecialWidget::optionDialogSpecialWidget( TQWidget* tqparent, const char* name, WFlags fl )
+ : optionDialogSpecialWidget_base( tqparent, name, fl )
{
// Set up the list of known and supported editors
editorNameString += i18n("User-Defined Editor");
diff --git a/kdvi/optionDialogSpecialWidget.h b/kdvi/optionDialogSpecialWidget.h
index 0bdca8dd..42c16c27 100644
--- a/kdvi/optionDialogSpecialWidget.h
+++ b/kdvi/optionDialogSpecialWidget.h
@@ -15,9 +15,10 @@
class optionDialogSpecialWidget : public optionDialogSpecialWidget_base
{
Q_OBJECT
+ TQ_OBJECT
public:
- optionDialogSpecialWidget( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+ optionDialogSpecialWidget( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
~optionDialogSpecialWidget();
public slots:
diff --git a/kdvi/optionDialogSpecialWidget_base.ui b/kdvi/optionDialogSpecialWidget_base.ui
index 7aa36a26..62cb4f6d 100644
--- a/kdvi/optionDialogSpecialWidget_base.ui
+++ b/kdvi/optionDialogSpecialWidget_base.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>optionDialogSpecialWidget_base</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>optionDialogSpecialWidget_base</cstring>
</property>
@@ -19,7 +19,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_ShowPS</cstring>
</property>
@@ -33,7 +33,7 @@
<string>Some DVI files contain PostScript graphics. If enabled, KDVI will use the Ghostview PostScript interpreter to display these. You probably want to enable this option, unless you have a DVI-file whose PostScript part is broken, or too large for your machine.</string>
</property>
</widget>
- <widget class="QButtonGroup">
+ <widget class="TQButtonGroup">
<property name="name">
<cstring>buttonGroup3</cstring>
</property>
@@ -64,7 +64,7 @@
&lt;p&gt;Check the KDVI manual to see how to prepare DVI files which support the inverse search.&lt;/p&gt;</string>
</property>
</widget>
- <widget class="QLabel" row="2" column="0">
+ <widget class="TQLabel" row="2" column="0">
<property name="name">
<cstring>textLabel3</cstring>
</property>
@@ -80,7 +80,7 @@
<string>Description:</string>
</property>
</widget>
- <widget class="QLabel" row="3" column="0">
+ <widget class="TQLabel" row="3" column="0">
<property name="name">
<cstring>textLabel4</cstring>
</property>
@@ -96,7 +96,7 @@
<string>Shell command:</string>
</property>
</widget>
- <widget class="QLabel" row="2" column="1" rowspan="1" colspan="2">
+ <widget class="TQLabel" row="2" column="1" rowspan="1" colspan="2">
<property name="name">
<cstring>editorDescription</cstring>
</property>
@@ -138,7 +138,7 @@
<string>If you are using inverse search, KDVI uses this command line to start the editor. The field '%f' is replaced with the filename, and '%l' is replaced with the line number.</string>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel2</cstring>
</property>
@@ -169,7 +169,7 @@
<property name="text">
<string>What is 'inverse search'? </string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="url" stdset="0">
@@ -186,7 +186,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>390</width>
<height>21</height>
@@ -199,7 +199,7 @@
</widget>
<customwidgets>
</customwidgets>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcombobox.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/kdvi/prebookmark.h b/kdvi/prebookmark.h
index ef637a60..412652b9 100644
--- a/kdvi/prebookmark.h
+++ b/kdvi/prebookmark.h
@@ -34,8 +34,8 @@ the DVI prescan routines.
class PreBookmark
{
public:
- PreBookmark(const TQString& t, const TQString& a, Q_UINT16 n) {title=t; anchorName=a; noOfChildren=n;}
- PreBookmark() {title=TQString::null; anchorName=TQString::null; noOfChildren=0;}
+ PreBookmark(const TQString& t, const TQString& a, TQ_UINT16 n) {title=t; anchorName=a; noOfChildren=n;}
+ PreBookmark() {title=TQString(); anchorName=TQString(); noOfChildren=0;}
// Title of the bookmark
TQString title;
@@ -44,7 +44,7 @@ class PreBookmark
TQString anchorName;
// Number of subordinate bookmarks
- Q_UINT16 noOfChildren;
+ TQ_UINT16 noOfChildren;
};
#endif
diff --git a/kdvi/psgs.cpp b/kdvi/psgs.cpp
index 2c745a7c..31f9bfdc 100644
--- a/kdvi/psgs.cpp
+++ b/kdvi/psgs.cpp
@@ -28,8 +28,8 @@ extern const char psheader[];
pageInfo::pageInfo(const TQString& _PostScriptString) {
PostScriptString = new TQString(_PostScriptString);
- background = Qt::white;
- permanentBackground = Qt::white;
+ background = TQt::white;
+ permanentBackground = TQt::white;
}
@@ -64,14 +64,14 @@ void ghostscript_interface::setPostScript(const PageNumber& page, const TQString
kdDebug(4300) << "ghostscript_interface::setPostScript( " << page << ", ... )" << endl;
#endif
- if (pageList.find(page) == 0) {
+ if (pageList.tqfind(page) == 0) {
pageInfo *info = new pageInfo(PostScript);
// Check if dict is big enough
if (pageList.count() > pageList.size() -2)
pageList.resize(pageList.size()*2);
pageList.insert(page, info);
} else
- *(pageList.find(page)->PostScriptString) = PostScript;
+ *(pageList.tqfind(page)->PostScriptString) = PostScript;
}
@@ -88,8 +88,8 @@ void ghostscript_interface::setBackgroundColor(const PageNumber& page, const TQC
kdDebug(4300) << "ghostscript_interface::setBackgroundColor( " << page << ", " << background_color << " )" << endl;
#endif
- if (pageList.find(page) == 0) {
- pageInfo *info = new pageInfo(TQString::null);
+ if (pageList.tqfind(page) == 0) {
+ pageInfo *info = new pageInfo(TQString());
info->background = background_color;
if (permanent)
info->permanentBackground = background_color;
@@ -98,9 +98,9 @@ void ghostscript_interface::setBackgroundColor(const PageNumber& page, const TQC
pageList.resize(pageList.size()*2);
pageList.insert(page, info);
} else {
- pageList.find(page)->background = background_color;
+ pageList.tqfind(page)->background = background_color;
if (permanent)
- pageList.find(page)->permanentBackground = background_color;
+ pageList.tqfind(page)->permanentBackground = background_color;
}
}
@@ -109,10 +109,10 @@ void ghostscript_interface::restoreBackgroundColor(const PageNumber& page)
#ifdef DEBUG_PSGS
kdDebug(4300) << "ghostscript_interface::restoreBackgroundColor( " << page << " )" << endl;
#endif
- if (pageList.find(page) == 0)
+ if (pageList.tqfind(page) == 0)
return;
- pageInfo *info = pageList.find(page);
+ pageInfo *info = pageList.tqfind(page);
info->background = info->permanentBackground;
}
@@ -124,10 +124,10 @@ TQColor ghostscript_interface::getBackgroundColor(const PageNumber& page) const
kdDebug(4300) << "ghostscript_interface::getBackgroundColor( " << page << " )" << endl;
#endif
- if (pageList.find(page) == 0)
- return Qt::white;
+ if (pageList.tqfind(page) == 0)
+ return TQt::white;
else
- return pageList.find(page)->background;
+ return pageList.tqfind(page)->background;
}
@@ -151,11 +151,11 @@ void ghostscript_interface::gs_generate_graphics_file(const PageNumber& page, co
emit(setStatusBarText(i18n("Generating PostScript graphics...")));
- pageInfo *info = pageList.find(page);
+ pageInfo *info = pageList.tqfind(page);
// Generate a PNG-file
// Step 1: Write the PostScriptString to a File
- KTempFile PSfile(TQString::null,".ps");
+ KTempFile PSfile(TQString(),".ps");
TQTextStream& os = *PSfile.textStream();
os << "%!PS-Adobe-2.0\n"
@@ -165,18 +165,18 @@ void ghostscript_interface::gs_generate_graphics_file(const PageNumber& page, co
<< "%%PageOrder: Ascend\n"
// HSize and VSize in 1/72 inch
<< "%%BoundingBox: 0 0 "
- << (Q_INT32)(72*(pixel_page_w/resolution)) << ' '
- << (Q_INT32)(72*(pixel_page_h/resolution)) << '\n'
+ << (TQ_INT32)(72*(pixel_page_w/resolution)) << ' '
+ << (TQ_INT32)(72*(pixel_page_h/resolution)) << '\n'
<< "%%EndComments\n"
<< "%!\n"
<< psheader
<< "TeXDict begin "
// HSize in (1/(65781.76*72))inch
- << (Q_INT32)(72*65781*(pixel_page_w/resolution)) << ' '
+ << (TQ_INT32)(72*65781*(pixel_page_w/resolution)) << ' '
// VSize in (1/(65781.76*72))inch
- << (Q_INT32)(72*65781*(pixel_page_h/resolution)) << ' '
+ << (TQ_INT32)(72*65781*(pixel_page_h/resolution)) << ' '
// Magnification
- << (Q_INT32)(magnification)
+ << (TQ_INT32)(magnification)
// dpi and vdpi
<< " 300 300"
// Name
@@ -189,7 +189,7 @@ void ghostscript_interface::gs_generate_graphics_file(const PageNumber& page, co
if (PostScriptHeaderString->latin1() != NULL)
os << PostScriptHeaderString->latin1();
- if (info->background != Qt::white) {
+ if (info->background != TQt::white) {
TQString colorCommand = TQString("gsave %1 %2 %3 setrgbcolor clippath fill grestore\n").
arg(info->background.red()/255.0).
arg(info->background.green()/255.0).
@@ -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").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 << 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 << "-c" << "<< /PermitFileReading [ ExtraIncludePath ] /PermitFileWriting [] /PermitFileControl [] >> setuserparams .locksafe";
argus << "-f" << PSfile.name();
@@ -239,9 +239,9 @@ void ghostscript_interface::gs_generate_graphics_file(const PageNumber& page, co
// ghostscript. If so, try again with another device.
TQString GSoutput;
while(proc.readln(GSoutput) != -1) {
- if (GSoutput.contains("Unknown device")) {
+ if (GSoutput.tqcontains("Unknown device")) {
kdDebug(4300) << TQString("The version of ghostview installed on this computer does not support "
- "the '%1' ghostview device driver.").arg(*gsDevice) << endl;
+ "the '%1' ghostview device driver.").tqarg(*gsDevice) << endl;
knownDevices.remove(gsDevice);
gsDevice = knownDevices.begin();
if (knownDevices.isEmpty())
@@ -267,14 +267,14 @@ 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.").arg(*gsDevice) << endl;
+ kdDebug(4300) << TQString("KDVI will now try to use the '%1' device driver.").tqarg(*gsDevice) << endl;
gs_generate_graphics_file(page, filename, magnification);
}
return;
}
}
}
- emit(setStatusBarText(TQString::null));
+ emit(setStatusBarText(TQString()));
}
@@ -293,7 +293,7 @@ void ghostscript_interface::graphics(const PageNumber& page, double dpi, long ma
pixel_page_w = paint->viewport().width();
pixel_page_h = paint->viewport().height();
- pageInfo *info = pageList.find(page);
+ pageInfo *info = pageList.tqfind(page);
// No PostScript? Then return immediately.
if ((info == 0) || (info->PostScriptString->isEmpty())) {
@@ -303,7 +303,7 @@ void ghostscript_interface::graphics(const PageNumber& page, double dpi, long ma
return;
}
- KTempFile gfxFile(TQString::null, ".png");
+ KTempFile gfxFile(TQString(), ".png");
gfxFile.setAutoDelete(1);
gfxFile.close(); // we are want the filename, not the file
@@ -317,7 +317,7 @@ void ghostscript_interface::graphics(const PageNumber& page, double dpi, long ma
TQString ghostscript_interface::locateEPSfile(const TQString &filename, const KURL &base)
{
- // If the base URL indicates that the DVI file is local, try to find
+ // If the base URL indicates that the DVI file is local, try to tqfind
// the graphics file in the directory where the DVI file resides
if (base.isLocalFile()) {
TQString path = base.path(); // -> "/bar/foo.dvi"
diff --git a/kdvi/psgs.h b/kdvi/psgs.h
index c1062f13..01b5aa96 100644
--- a/kdvi/psgs.h
+++ b/kdvi/psgs.h
@@ -34,6 +34,7 @@ public:
class ghostscript_interface : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
ghostscript_interface();
@@ -62,7 +63,7 @@ public:
void graphics(const PageNumber& page, double dpi, long magnification, TQPainter* paint);
// Returns the background color for a certain page. If no color was
- // set, Qt::white is returned.
+ // set, TQt::white is returned.
TQColor getBackgroundColor(const PageNumber& page) const;
TQString *PostScriptHeaderString;
diff --git a/kdvi/psheader.txt b/kdvi/psheader.txt
index f5e543d1..244e4a3b 100644
--- a/kdvi/psheader.txt
+++ b/kdvi/psheader.txt
@@ -21,7 +21,7 @@ B/Cdx{Cd A length 1 sub get}B/Ci{Cd A type/stringtype ne{ctr get/ctr ctr
1 roll S A/base get 2 index get S/BitMaps get S get/Cd X pop/ctr 0 N Cdx
0 Cx Cy Ch sub Cx Cw add Cy setcachedevice Cw Ch true[1 0 0 -1 -.1 Cx
sub Cy .1 sub]/id Ci N/rw Cw 7 add 8 idiv string N/rc 0 N/gp 0 N/cp 0 N{
-rc 0 ne{rc 1 sub/rc X rw}{G}ifelse}imagemask restore}B/G{{id gp get/gp
+rc 0 ne{rc 1 sub/rc X rw}{G}ifelse}imagetqmask restore}B/G{{id gp get/gp
gp 1 add N A 18 mod S 18 idiv pl S get exec}loop}B/adv{cp add/cp X}B
/chg{rw cp id gp 4 index getinterval putinterval A gp add/gp X adv}B/nd{
/cp 0 N rw exit}B/lsh{rw cp 2 copy get A 0 eq{pop 1}{A 255 eq{pop 254}{
@@ -45,9 +45,9 @@ index cvrs cvn put}for pop 65781.76 div/vsize X 65781.76 div/hsize X}N
/Ry X/Rx X V}B statusdict begin/product where{pop false[(Display)(NeXT)
(LaserWriter 16/600)]{A length product length le{A length product exch 0
exch getinterval eq{pop true exit}if}{pop}ifelse}forall}{false}ifelse
-end{{gsave TR -.1 .1 TR 1 1 scale Rx Ry false RMat{BDot}imagemask
+end{{gsave TR -.1 .1 TR 1 1 scale Rx Ry false RMat{BDot}imagetqmask
grestore}}{{gsave TR -.1 .1 TR Rx Ry scale 1 1 false RMat{BDot}
-imagemask grestore}}ifelse B/QV{gsave newpath transform round exch round
+imagetqmask grestore}}ifelse B/QV{gsave newpath transform round exch round
exch itransform moveto Rx 0 rlineto 0 Ry neg rlineto Rx neg 0 rlineto
fill grestore}B/a{moveto}B/delta 0 N/tail{A/delta X 0 rmoveto}B/M{S p
delta add tail}B/b{S p tail}B/c{-4 M}B/d{-3 M}B/e{-2 M}B/f{-1 M}B/g{0 M}
diff --git a/kdvi/renderedDviPagePixmap.h b/kdvi/renderedDviPagePixmap.h
index c618806b..9abff270 100644
--- a/kdvi/renderedDviPagePixmap.h
+++ b/kdvi/renderedDviPagePixmap.h
@@ -30,6 +30,7 @@
class RenderedDviPagePixmap : public RenderedDocumentPagePixmap
{
Q_OBJECT
+ TQ_OBJECT
public:
RenderedDviPagePixmap();
diff --git a/kdvi/special.cpp b/kdvi/special.cpp
index 9f7eeb3d..94a7a5ca 100644
--- a/kdvi/special.cpp
+++ b/kdvi/special.cpp
@@ -120,7 +120,7 @@ TQColor dviRenderer::parseColorSpecification(const TQString& colorSpec)
TQString specType = colorSpec.section(' ', 0, 0);
- if (specType.find("rgb", false) == 0) {
+ if (specType.tqfind("rgb", false) == 0) {
bool ok;
double r = colorSpec.section(' ', 1, 1).toDouble(&ok);
@@ -138,7 +138,7 @@ TQColor dviRenderer::parseColorSpecification(const TQString& colorSpec)
return TQColor((int)(r*255.0+0.5), (int)(g*255.0+0.5), (int)(b*255.0+0.5));
}
- if (specType.find("hsb", false) == 0) {
+ if (specType.tqfind("hsb", false) == 0) {
bool ok;
double h = colorSpec.section(' ', 1, 1).toDouble(&ok);
@@ -156,7 +156,7 @@ TQColor dviRenderer::parseColorSpecification(const TQString& colorSpec)
return TQColor((int)(h*359.0+0.5), (int)(s*255.0+0.5), (int)(b*255.0+0.5), TQColor::Hsv);
}
- if (specType.find("cmyk", false) == 0) {
+ if (specType.tqfind("cmyk", false) == 0) {
bool ok;
double c = colorSpec.section(' ', 1, 1).toDouble(&ok);
@@ -189,7 +189,7 @@ TQColor dviRenderer::parseColorSpecification(const TQString& colorSpec)
return TQColor((int)(r*255.0+0.5), (int)(g*255.0+0.5), (int)(b*255.0+0.5));
}
- if (specType.find("gray", false) == 0) {
+ if (specType.tqfind("gray", false) == 0) {
bool ok;
double g = colorSpec.section(' ', 1, 1).toDouble(&ok);
@@ -200,7 +200,7 @@ TQColor dviRenderer::parseColorSpecification(const TQString& colorSpec)
}
// Check if the color is one of the known named colors.
- TQMap<TQString, TQColor>::Iterator f = namedColors.find(specType);
+ TQMap<TQString, TQColor>::Iterator f = namedColors.tqfind(specType);
if (f != namedColors.end())
return *f;
@@ -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." ).
- arg(dviFile->filename).arg(current_page));
+ tqarg(dviFile->filename).tqarg(current_page));
else
colorStack.pop();
return;
@@ -235,7 +235,7 @@ void dviRenderer::color_special(const TQString& _cp)
if (col.isValid())
colorStack.push(col);
else
- colorStack.push(Qt::black);
+ colorStack.push(TQt::black);
return;
}
@@ -246,7 +246,7 @@ void dviRenderer::color_special(const TQString& _cp)
if (col.isValid())
globalColor = col;
else
- globalColor = Qt::black;
+ globalColor = TQt::black;
return;
}
@@ -254,7 +254,7 @@ void dviRenderer::color_special(const TQString& _cp)
void dviRenderer::html_href_special(const TQString& _cp)
{
TQString cp = _cp;
- cp.truncate(cp.find('"'));
+ cp.truncate(cp.tqfind('"'));
#ifdef DEBUG_SPECIAL
kdDebug(4300) << "HTML-special, href " << cp.latin1() << endl;
@@ -292,10 +292,10 @@ void dviRenderer::source_special(const TQString& cp)
void parse_special_argument(const TQString& strg, const char* argument_name, int* variable)
{
- int index = strg.find(argument_name);
+ int index = strg.tqfind(argument_name);
if (index >= 0) {
TQString tmp = strg.mid(index + strlen(argument_name));
- index = tmp.find(' ');
+ index = tmp.tqfind(' ');
if (index >= 0)
tmp.truncate(index);
@@ -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")
- .arg(argument_name).arg(strg) << endl;
+ .tqarg(argument_name).tqarg(strg) << endl;
}
}
@@ -327,7 +327,7 @@ void dviRenderer::epsf_special(const TQString& cp)
// (already the simplifyWhiteSpace() above is wrong). If you have
// files like this, go away.
TQString EPSfilename_orig = include_command;
- EPSfilename_orig.truncate(EPSfilename_orig.find(' '));
+ EPSfilename_orig.truncate(EPSfilename_orig.tqfind(' '));
// Strip enclosing quotation marks which are included by some LaTeX
// macro packages (but not by others). This probably means that
@@ -348,7 +348,7 @@ void dviRenderer::epsf_special(const TQString& cp)
int angle = 0;
// just to avoid ambiguities; the filename could contain keywords
- include_command = include_command.mid(include_command.find(' '));
+ include_command = include_command.mid(include_command.tqfind(' '));
parse_special_argument(include_command, "llx=", &llx);
parse_special_argument(include_command, "lly=", &lly);
@@ -420,19 +420,19 @@ void dviRenderer::epsf_special(const TQString& cp)
foreGroundPainter->save();
if (TQFile::exists(EPSfilename))
- foreGroundPainter->setBrush(Qt::lightGray);
+ foreGroundPainter->setBrush(TQt::lightGray);
else
- foreGroundPainter->setBrush(Qt::red);
- foreGroundPainter->setPen(Qt::black);
+ foreGroundPainter->setBrush(TQt::red);
+ foreGroundPainter->setPen(TQt::black);
foreGroundPainter->drawRoundRect(bbox, 2, 2);
TQFont f = foreGroundPainter->font();
f.setPointSize(8);
foreGroundPainter->setFont(f);
if (TQFile::exists(EPSfilename))
- foreGroundPainter->drawText (bbox, (int)(Qt::AlignCenter), EPSfilename_orig, -1);
+ foreGroundPainter->drawText (bbox, (int)(TQt::AlignCenter), EPSfilename_orig, -1);
else
- foreGroundPainter->drawText (bbox, (int)(Qt::AlignCenter),
- i18n("File not found: \n %1").arg(EPSfilename_orig), -1);
+ foreGroundPainter->drawText (bbox, (int)(TQt::AlignCenter),
+ i18n("File not found: \n %1").tqarg(EPSfilename_orig), -1);
foreGroundPainter->restore();
}
@@ -451,9 +451,9 @@ void dviRenderer::TPIC_flushPath_special()
return;
}
- TQPen pen(Qt::black, (int)(penWidth_in_mInch*resolutionInDPI/1000.0 + 0.5)); // Sets the pen size in milli-inches
+ TQPen pen(TQt::black, (int)(penWidth_in_mInch*resolutionInDPI/1000.0 + 0.5)); // Sets the pen size in milli-inches
foreGroundPainter->setPen(pen);
- foreGroundPainter->drawPolyline(TPIC_path, 0, number_of_elements_in_path);
+ foreGroundPainter->tqdrawPolyline(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'.").arg(cp) );
+ printErrorMsgForSpecials( TQString("TPIC special; cannot parse first argument in 'pn %1'.").tqarg(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'.").arg(cp) );
+ printErrorMsgForSpecials( TQString("TPIC special; cannot parse second argument in 'pn %1'.").tqarg(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'.").arg(cp) );
+ printErrorMsgForSpecials( TQString("TPIC special; cannot parse argument in 'pn %1'.").tqarg(cp) );
penWidth_in_mInch = 0.0;
return;
}
@@ -650,11 +650,11 @@ void dviRenderer::applicationDoSpecial(char *cp)
// line break is encountered)
if (special_command.startsWith("ps:SDict begin [") && special_command.endsWith(" pdfmark end")) {
if (!currentlyDrawnPage->hyperLinkList.isEmpty()) {
- // Parse the PostScript literal text string inside parentheses
+ // Parse the PostScript literal text string inside tqparentheses
// and store it into 'targetName'. The scanner works
// according to "PostScript language reference, third edition"
// - Sec. 3.2.2. The specification is implemented completely:
- // balanced parentheses and all escape sequences are
+ // balanced tqparentheses and all escape sequences are
// considered.
TQString tmpTargetName = special_command.section('(', 1);
TQString targetName;
@@ -670,7 +670,7 @@ void dviRenderer::applicationDoSpecial(char *cp)
break;
targetName += tmpTargetName[i];
}
- targetName = PDFencodingToQString(targetName);
+ targetName = PDFencodingToTQString(targetName);
TQValueVector<Hyperlink>::iterator it;
for( it = currentlyDrawnPage->hyperLinkList.begin(); it != currentlyDrawnPage->hyperLinkList.end(); ++it )
@@ -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." ).
- arg(dviFile->filename).arg(current_page));
+ tqarg(dviFile->filename).tqarg(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.").arg(special_command));
+ printErrorMsgForSpecials(i18n("The special command '%1' is not implemented.").tqarg(special_command));
return;
}
diff --git a/kdvi/vf.cpp b/kdvi/vf.cpp
index 679aa9e0..b6da55c0 100644
--- a/kdvi/vf.cpp
+++ b/kdvi/vf.cpp
@@ -80,7 +80,7 @@ void TeXFontDefinition::read_VF_index()
#endif
// Read preamble.
fseek(VF_file, (long) one(VF_file), 1); /* skip comment */
- Q_UINT32 file_checksum = four(VF_file);
+ TQ_UINT32 file_checksum = four(VF_file);
if (file_checksum && checksum && file_checksum != checksum)
kdError(4300) << i18n("Checksum mismatch") << "(dvi = " << checksum << "u, vf = " << file_checksum <<
@@ -91,11 +91,11 @@ void TeXFontDefinition::read_VF_index()
first_font = NULL;
while ((cmnd = one(VF_file)) >= FNTDEF1 && cmnd <= FNTDEF4) {
int TeXnumber = num(VF_file, (int) cmnd - FNTDEF1 + 1);
- Q_UINT32 checksum = four(VF_file);
- Q_UINT32 scale = four(VF_file);
- Q_UINT32 design = four(VF_file);
+ TQ_UINT32 checksum = four(VF_file);
+ TQ_UINT32 scale = four(VF_file);
+ TQ_UINT32 design = four(VF_file);
Q_UNUSED(design);
- Q_UINT16 len = one(VF_file) + one(VF_file); /* sequence point in the middle */
+ TQ_UINT16 len = one(VF_file) + one(VF_file); /* sequence point in the middle */
char *fontname = new char[len + 1];
fread(fontname, sizeof(char), len, VF_file);
fontname[len] = '\0';
@@ -111,8 +111,8 @@ void TeXFontDefinition::read_VF_index()
// imposes. One obtains the enlargement by dividing 2^20.
double enlargement_factor = double(scale)/(1<<20) * enlargement;
- // TeXFontDefinition *newfontp = font_pool->appendx(fontname, checksum, (Q_UINT32)(scaled_size_in_DVI_units*enlargement_factor), enlargement_factor);
- TeXFontDefinition *newfontp = font_pool->appendx(fontname, checksum, (Q_UINT32)((double(scale)/(1<<20))*scaled_size_in_DVI_units), enlargement_factor);
+ // TeXFontDefinition *newfontp = font_pool->appendx(fontname, checksum, (TQ_UINT32)(scaled_size_in_DVI_units*enlargement_factor), enlargement_factor);
+ TeXFontDefinition *newfontp = font_pool->appendx(fontname, checksum, (TQ_UINT32)((double(scale)/(1<<20))*scaled_size_in_DVI_units), enlargement_factor);
// Insert font in dictionary and make sure the dictionary is big
// enough.
@@ -177,7 +177,7 @@ void TeXFontDefinition::read_VF_index()
}
}
if (cmnd != POST)
- oops(i18n("Wrong command byte found in VF macro list: %1").arg(cmnd));
+ oops(i18n("Wrong command byte found in VF macro list: %1").tqarg(cmnd));
fclose (VF_file);
file = NULL;
diff --git a/kfax/faxinput.cpp b/kfax/faxinput.cpp
index 47fdfa26..e37e9dd7 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").arg(TQFile::decodeName(name));
+ TQString mesg = i18n("Unable to open:\n%1\n").tqarg(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").arg(TQFile::decodeName(name));
+ str = i18n("Invalid tiff file:\n%1\n").tqarg(TQFile::decodeName(name));
kfaxerror(i18n("Sorry"),str);
bad:
if (strips)
@@ -215,7 +215,7 @@ notetiff(const char *name)
get2(buf, endian) : get4(buf, endian);
}
break;
- case 274: /* Orientation */
+ case 274: /* Qt::Orientation */
switch(value) {
default: /* row0 at top, col0 at left */
orient = 0;
@@ -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")
- .arg(TQFile::decodeName(name)).arg(nstrips).arg(count);
+ .tqarg(TQFile::decodeName(name)).tqarg(nstrips).tqarg(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").arg(TQFile::decodeName(pn->pathname));
+ str = i18n("Trying to expand too many strips\n%1%n").tqarg(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")
- .arg(TQFile::decodeName(pn->pathname));
+ .tqarg(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").arg(TQFile::decodeName(pn->pathname));
+ str = i18n("No fax found in file:\n%1\n").tqarg(TQFile::decodeName(pn->pathname));
kfaxerror(i18n("Sorry"),str);
errno = 0;
badfile(pn);
diff --git a/kfax/kfax.cpp b/kfax/kfax.cpp
index 8a29f92c..3a3e0b9f 100644
--- a/kfax/kfax.cpp
+++ b/kfax/kfax.cpp
@@ -208,15 +208,15 @@ TopLevel::TopLevel (TQWidget *, const char *name)
qtwin = faxqtwin->winId();
faxqtwin->setFrameStyle(TQFrame::Panel | TQFrame::Sunken);
- // Create a Vertical scroll bar
+ // Create aQt::Vertical scroll bar
- vsb = new TQScrollBar( TQScrollBar::Vertical,faxqtwin,"scrollBar" );
+ vsb = new TQScrollBar( Qt::Vertical,faxqtwin,"scrollBar" );
vsb->hide();
connect( vsb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(scrollVert(int)) );
- // Create a Horizontal scroll bar
+ // Create aQt::Horizontal scroll bar
- hsb = new TQScrollBar( TQScrollBar::Horizontal,faxqtwin,"scrollBar" );
+ hsb = new TQScrollBar( Qt::Horizontal,faxqtwin,"scrollBar" );
connect( hsb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(scrollHorz(int)) );
hsb->hide();
@@ -235,43 +235,43 @@ TopLevel::~TopLevel()
void TopLevel::setupMenuBar()
{
// File menu
- KStdAction::open( this, TQT_SLOT( faxOpen() ), actionCollection() );
- actRecent = KStdAction::openRecent( this, TQT_SLOT( faxOpen( const KURL & ) ),
+ KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( faxOpen() ), actionCollection() );
+ actRecent = KStdAction::openRecent( TQT_TQOBJECT(this), TQT_SLOT( faxOpen( const KURL & ) ),
actionCollection() );
- actSave = KStdAction::save( this, TQT_SLOT( faxSave() ), actionCollection() );
- actSaveAs = KStdAction::saveAs( this, TQT_SLOT( faxSaveAs() ),
+ actSave = KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT( faxSave() ), actionCollection() );
+ actSaveAs = KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT( faxSaveAs() ),
actionCollection() );
- actPrint = KStdAction::print( this, TQT_SLOT( print() ), actionCollection() );
- KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() );
- actAdd = new KAction( i18n( "A&dd..." ), "filenew", KShortcut(), this,
+ actPrint = KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( print() ), actionCollection() );
+ KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() );
+ actAdd = new KAction( i18n( "A&dd..." ), "filenew", KShortcut(), TQT_TQOBJECT(this),
TQT_SLOT( faxAdd() ), actionCollection(), "file_add_fax" );
actRecent->setMaxItems( 5 );
// View Menu
- actSize = KStdAction::actualSize( this, TQT_SLOT( actualSize() ),
+ actSize = KStdAction::actualSize( TQT_TQOBJECT(this), TQT_SLOT( actualSize() ),
actionCollection() );
- actZoomIn = KStdAction::zoomIn( this, TQT_SLOT( zoomin() ), actionCollection() );
- actZoomOut = KStdAction::zoomOut( this, TQT_SLOT( zoomout() ),
+ actZoomIn = KStdAction::zoomIn( TQT_TQOBJECT(this), TQT_SLOT( zoomin() ), actionCollection() );
+ actZoomOut = KStdAction::zoomOut( TQT_TQOBJECT(this), TQT_SLOT( zoomout() ),
actionCollection() );
- actRotate = new KAction( i18n( "&Rotate Page" ), "rotate", KShortcut(), this,
+ actRotate = new KAction( i18n( "&Rotate Page" ), "rotate", KShortcut(), TQT_TQOBJECT(this),
TQT_SLOT( rotatePage() ), actionCollection(), "view_rotate" );
- actMirror = new KAction( i18n( "Mirror Page" ), KShortcut(), this,
+ actMirror = new KAction( i18n( "Mirror Page" ), KShortcut(), TQT_TQOBJECT(this),
TQT_SLOT( mirrorPage() ), actionCollection(), "view_mirror" );
- actFlip = new KAction( i18n( "&Flip Page" ), KShortcut(), this,
+ actFlip = new KAction( i18n( "&Flip Page" ), KShortcut(), TQT_TQOBJECT(this),
TQT_SLOT( flipPage() ), actionCollection(), "view_flip" );
// Go menu
- actNext = KStdAction::next( this, TQT_SLOT( nextPage() ), actionCollection() );
- actPrev = KStdAction::prior( this, TQT_SLOT( prevPage() ), actionCollection() );
- actFirst = KStdAction::firstPage( this, TQT_SLOT( firstPage() ),
+ actNext = KStdAction::next( TQT_TQOBJECT(this), TQT_SLOT( nextPage() ), actionCollection() );
+ actPrev = KStdAction::prior( TQT_TQOBJECT(this), TQT_SLOT( prevPage() ), actionCollection() );
+ actFirst = KStdAction::firstPage( TQT_TQOBJECT(this), TQT_SLOT( firstPage() ),
actionCollection() );
- actLast = KStdAction::lastPage( this, TQT_SLOT( lastPage() ),
+ actLast = KStdAction::lastPage( TQT_TQOBJECT(this), TQT_SLOT( lastPage() ),
actionCollection() );
// Settings menu
- KStdAction::preferences( this, TQT_SLOT( faxoptions() ), actionCollection() );
+ KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT( faxoptions() ), actionCollection() );
}
void TopLevel::setupStatusBar()
@@ -282,14 +282,14 @@ void TopLevel::setupStatusBar()
statusbar->insertFixedItem(i18n("Res: XXXXX"), ID_GENERAL);
statusbar->insertFixedItem(i18n("Type: XXXXXXX"), ID_TYPE);
statusbar->insertFixedItem(i18n("Page: XX of XX"), ID_PAGE_NO);
- statusbar->insertItem(TQString::null, ID_FNAME, 1);
+ statusbar->insertItem(TQString(), ID_FNAME, 1);
statusbar->setItemAlignment( ID_FNAME, AlignLeft );
- statusbar->changeItem(TQString::null, ID_INS_OVR);
- statusbar->changeItem(TQString::null, ID_GENERAL);
- statusbar->changeItem(TQString::null, ID_TYPE);
- statusbar->changeItem(TQString::null, ID_PAGE_NO);
- statusbar->changeItem(TQString::null, ID_FNAME);
+ statusbar->changeItem(TQString(), ID_INS_OVR);
+ statusbar->changeItem(TQString(), ID_GENERAL);
+ statusbar->changeItem(TQString(), ID_TYPE);
+ statusbar->changeItem(TQString(), ID_PAGE_NO);
+ statusbar->changeItem(TQString(), ID_FNAME);
}
void TopLevel::readSettings()
@@ -378,7 +378,7 @@ void TopLevel::writeSettings()
void TopLevel::faxOpen()
{
- KURL url = KFileDialog::getOpenURL(TQString::null, KFAX_FILETYPES);
+ KURL url = KFileDialog::getOpenURL(TQString(), KFAX_FILETYPES);
faxOpen( url );
@@ -400,7 +400,7 @@ void TopLevel::faxOpen( const KURL & url )
void TopLevel::faxAdd()
{
- KURL url = KFileDialog::getOpenURL(TQString::null, KFAX_FILETYPES);
+ KURL url = KFileDialog::getOpenURL(TQString(), KFAX_FILETYPES);
faxAdd( url );
@@ -424,7 +424,7 @@ void TopLevel::faxSave()
void TopLevel::faxSaveAs()
{
- fileURL = KFileDialog::getSaveURL(TQString::null, KFAX_FILETYPES);
+ fileURL = KFileDialog::getSaveURL(TQString(), KFAX_FILETYPES);
if (fileURL.isEmpty())
return;
@@ -654,13 +654,13 @@ void TopLevel::resizeView()
}
if(Image){
- hsb->setRange(0,QMAX(0,Image->width - qwindow_width));
+ hsb->setRange(0,TQMAX(0,Image->width - qwindow_width));
hsb->setSteps(5,qwindow_width/2);
- // printf("hsb range: %d\n",QMAX(0,Image->width - qwindow_width));
- vsb->setRange(0,QMAX(0,Image->height - qwindow_height));
+ // printf("hsb range: %d\n",TQMAX(0,Image->width - qwindow_width));
+ vsb->setRange(0,TQMAX(0,Image->height - qwindow_height));
vsb->setSteps(5,qwindow_height/2);
- // printf("vsb range: %d\n",QMAX(0,Image->height - qwindow_height));
- // printf("vsb QMIN %d vdb QMAX %d\n",vsb->QMINValue(),vsb->QMAXValue());
+ // printf("vsb range: %d\n",TQMAX(0,Image->height - qwindow_height));
+ // printf("vsb TQMIN %d vdb TQMAX %d\n",vsb->TQMINValue(),vsb->TQMAXValue());
}
@@ -701,7 +701,7 @@ void TopLevel::print(){
printer.setFullPage( true );
printer.setUsePrinterResolution( true );
printer.setCreator( i18n("KFax") + " " KFAXVERSION );
- printer.setDocName( TQString("%1 - %2").arg(firstpage->name).arg(i18n("KFax")));
+ printer.setDocName( TQString("%1 - %2").tqarg(firstpage->name).tqarg(i18n("KFax")));
printer.setDocFileName( firstpage->name );
printer.setPageSelection( KPrinter::ApplicationSide );
printer.setMinMax( 1, pages );
@@ -735,7 +735,7 @@ void TopLevel::printIt( KPrinter &printer, TQPainter &painter )
++currentpage;
// should this page be printed ?
- if (printer.pageList().findIndex(currentpage) < 0)
+ if (printer.pageList().tqfindIndex(currentpage) < 0)
continue;
XImage *Image = Pimage(pn);
@@ -745,11 +745,11 @@ void TopLevel::printIt( KPrinter &printer, TQPainter &painter )
// byte-swapping the image
TQByteArray bytes( Image->height*Image->bytes_per_line );
for (int y=Image->height-1; y>=0; --y) {
- Q_UINT32 offset = y*Image->bytes_per_line;
- Q_UINT32 *source = (Q_UINT32 *) (Image->data + offset);
- Q_UINT32 *dest = (Q_UINT32 *) (bytes.data() + offset);
+ TQ_UINT32 offset = y*Image->bytes_per_line;
+ TQ_UINT32 *source = (TQ_UINT32 *) (Image->data + offset);
+ TQ_UINT32 *dest = (TQ_UINT32 *) (bytes.data() + offset);
for (int x=(Image->bytes_per_line/4)-1; x>=0; --x) {
- Q_UINT32 dv = 0, sv = *source;
+ TQ_UINT32 dv = 0, sv = *source;
for (int bit=32; bit>0; --bit) {
dv <<= 1;
dv |= sv&1;
@@ -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.scale( maxSize, TQSize::ScaleMin );
+ scaledImageSize.tqscale( maxSize, TQSize::ScaleMin );
kdDebug() << "Image does not fit - scaling to " << maxSize << endl;
} else {
// Image does fit - print it in original size, but centered
- scaledImageSize.scale( size, TQSize::ScaleMin );
+ scaledImageSize.tqscale( 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'").arg(u.path());
+ TQString string = i18n("Loading '%1'").tqarg(u.path());
statusbar->message(string);
openadd( u.path());
statusbar->clear();
@@ -854,7 +854,7 @@ void TopLevel::openNetFile( const KURL &u)
else
{
statusbar->message(i18n("Downloading..."));
- TQString tmpFile = TQString::null;
+ TQString tmpFile = TQString();
if ( KIO::NetAccess::download( u, tmpFile, this ) )
{
openadd( tmpFile );
@@ -1382,7 +1382,7 @@ void TopLevel::faxClose()
vsb->hide();
hsb->hide();
- fileURL = TQString::null;
+ fileURL = TQString();
updateActions();
}
@@ -1441,17 +1441,17 @@ void TopLevel::uiUpdate(){
currentpage = pages;
}
- TQString pagestr = i18n("Page: %1 of %2").arg(currentpage).arg(pages);
+ TQString pagestr = i18n("Page: %1 of %2").tqarg(currentpage).tqarg(pages);
statusbar->changeItem(pagestr, ID_PAGE_NO);
if(Image){
- TQString wh = i18n("W: %1 H: %2").arg(Image->width).arg(Image->height);
+ TQString wh = i18n("W: %1 H: %2").tqarg(Image->width).tqarg(Image->height);
statusbar->changeItem(wh, ID_INS_OVR);
}
- TQString resolution = i18n("Res: %1").arg(thispage->vres?i18n("Fine"):i18n("Normal"));
- // TODO: resolution += TQString("%1x%2").arg(thispage->dpiX).arg(thispage->dpiY);
+ TQString resolution = i18n("Res: %1").tqarg(thispage->vres?i18n("Fine"):i18n("Normal"));
+ // TODO: resolution += TQString("%1x%2").tqarg(thispage->dpiX).tqarg(thispage->dpiY);
statusbar->changeItem(resolution, ID_GENERAL);
statusbar->changeItem(thispage->name, ID_FNAME);
@@ -1528,16 +1528,16 @@ void TopLevel::putImage()
has a sunken frame and I need to offset by 1 pixel to the right and
one pixel down so that I don't paint my fax into the border of the frame*/
- XResizeWindow(qtdisplay,Win,QMIN(qwindow_width -1,Image->width ),
- QMIN(qwindow_height -1,Image->height ));
+ XResizeWindow(qtdisplay,Win,TQMIN(qwindow_width -1,Image->width ),
+ TQMIN(qwindow_height -1,Image->height ));
XPutImage(qtdisplay, Win, PaintGC, Image,
- QMAX(xpos - qwindow_width/2,0), QMAX(ypos - qwindow_height/2,0),
- 0, 0, QMIN(qwindow_width -1,Image->width) ,
- QMIN(qwindow_height -1,Image->height) );
+ TQMAX(xpos - qwindow_width/2,0), TQMAX(ypos - qwindow_height/2,0),
+ 0, 0, TQMIN(qwindow_width -1,Image->width) ,
+ TQMIN(qwindow_height -1,Image->height) );
- vsb->setValue(QMAX(ypos - qwindow_height/2,0));
- hsb->setValue(QMAX(xpos - qwindow_width/2,0));
+ vsb->setValue(TQMAX(ypos - qwindow_height/2,0));
+ hsb->setValue(TQMAX(xpos - qwindow_width/2,0));
XFlush(qtdisplay);
}
diff --git a/kfax/kfax.h b/kfax/kfax.h
index 99ad9940..5319a254 100644
--- a/kfax/kfax.h
+++ b/kfax/kfax.h
@@ -2,7 +2,7 @@
$Id$
- Requires the Qt widget libraries, available at no cost at
+ Requires the TQt widget libraries, available at no cost at
http://www.troll.no
Copyright (C) 1997 Bernd Johannes Wuebben
@@ -54,11 +54,12 @@ public:
class TopLevel : public KMainWindow
{
Q_OBJECT
+ TQ_OBJECT
public:
- TopLevel( TQWidget *parent=0, const char *name=0 );
+ TopLevel( TQWidget *tqparent=0, const char *name=0 );
~TopLevel();
void openNetFile( const KURL& _url);
diff --git a/kfax/kfax_printsettings.cpp b/kfax/kfax_printsettings.cpp
index 5382c2e5..3ddae4ab 100644
--- a/kfax/kfax_printsettings.cpp
+++ b/kfax/kfax_printsettings.cpp
@@ -24,8 +24,8 @@
#include <tqlayout.h>
#include <tqwhatsthis.h>
-KFAXPrintSettings::KFAXPrintSettings(TQWidget *parent, const char *name)
-: KPrintDialogPage(parent, name)
+KFAXPrintSettings::KFAXPrintSettings(TQWidget *tqparent, const char *name)
+: KPrintDialogPage(tqparent, name)
{
TQString whatsThisScaleFullPage = i18n( "<qt>"
"<p><strong>'Ignore Paper Margins'</strong></p>"
diff --git a/kfax/kfax_printsettings.h b/kfax/kfax_printsettings.h
index 3213b7d2..ea37fa0a 100644
--- a/kfax/kfax_printsettings.h
+++ b/kfax/kfax_printsettings.h
@@ -31,17 +31,18 @@ class TQCheckBox;
class KFAXPrintSettings : public KPrintDialogPage
{
Q_OBJECT
+ TQ_OBJECT
public:
- KFAXPrintSettings(TQWidget *parent = 0, const char *name = 0);
+ KFAXPrintSettings(TQWidget *tqparent = 0, const char *name = 0);
~KFAXPrintSettings();
void getOptions(TQMap<TQString,TQString>& opts, bool incldef = false);
void setOptions(const TQMap<TQString,TQString>& opts);
private:
- QCheckBox *m_scaleFullPage;
- QCheckBox *m_center_horz;
- QCheckBox *m_center_vert;
+ TQCheckBox *m_scaleFullPage;
+ TQCheckBox *m_center_horz;
+ TQCheckBox *m_center_vert;
};
#endif
diff --git a/kfax/options.cpp b/kfax/options.cpp
index b692b28d..f1490989 100644
--- a/kfax/options.cpp
+++ b/kfax/options.cpp
@@ -1,7 +1,7 @@
/*
$Id$
- Requires the Qt widget libraries, available at no cost at
+ Requires the TQt widget libraries, available at no cost at
http://www.troll.no
Copyright (C) 1996 Bernd Johannes Wuebben
@@ -48,8 +48,8 @@
#include "kfax.h"
#include "options.h"
-OptionsDialog::OptionsDialog( TQWidget *parent, const char *name)
- : KDialogBase( parent, name, true, i18n("Configure"), Ok|Cancel)
+OptionsDialog::OptionsDialog( TQWidget *tqparent, const char *name)
+ : KDialogBase( tqparent, name, true, i18n("Configure"), Ok|Cancel)
{
TQWidget *mainWidget = new TQWidget(this);
setMainWidget(mainWidget);
@@ -60,28 +60,28 @@ OptionsDialog::OptionsDialog( TQWidget *parent, const char *name)
bg->setColumnLayout( 0, Qt::Horizontal );
mainLayout->addWidget( bg );
- TQVBoxLayout *vbl = new TQVBoxLayout(bg->layout());
+ TQVBoxLayout *vbl = new TQVBoxLayout(bg->tqlayout());
TQHBoxLayout *hbl1 = new TQHBoxLayout();
vbl->addLayout( hbl1 );
displaylabel = new TQLabel(i18n("Display options:"), bg,"displaylabel");
- displaylabel->setFixedSize( displaylabel->sizeHint() );
+ displaylabel->setFixedSize( displaylabel->tqsizeHint() );
hbl1->addWidget( displaylabel );
landscape = new TQCheckBox(i18n("Landscape"), bg,"Landscape");
- landscape->setFixedSize( landscape->sizeHint() );
+ landscape->setFixedSize( landscape->tqsizeHint() );
hbl1->addSpacing( 10 );
hbl1->addWidget( landscape );
flip = new TQCheckBox(i18n("Upside down"), bg,"upsidedown");
- flip->setFixedSize( flip->sizeHint() );
+ flip->setFixedSize( flip->tqsizeHint() );
hbl1->addSpacing( 10 );
hbl1->addWidget( flip );
invert = new TQCheckBox(i18n("Invert"), bg,"invert");
- invert->setFixedSize( invert->sizeHint() );
+ invert->setFixedSize( invert->tqsizeHint() );
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->sizeHint() );
+ rawlabel->setFixedSize( rawlabel->tqsizeHint() );
hbl4->addWidget( rawlabel );
g3 = new TQRadioButton("G3",rawgroup,"g3");
diff --git a/kfax/options.h b/kfax/options.h
index 693616e4..96c2a500 100644
--- a/kfax/options.h
+++ b/kfax/options.h
@@ -58,9 +58,10 @@ class KIntNumInput;
class OptionsDialog : public KDialogBase {
Q_OBJECT
+ TQ_OBJECT
public:
- OptionsDialog( TQWidget *parent = 0, const char *name = 0);
+ OptionsDialog( TQWidget *tqparent = 0, const char *name = 0);
struct optionsinfo* getInfo();
void setWidgets(struct optionsinfo *oi);
@@ -76,13 +77,13 @@ public slots:
private:
- QGroupBox *bg;
+ TQGroupBox *bg;
TQLabel *reslabel;
TQButtonGroup *resgroup;
TQRadioButton *fine;
TQRadioButton *resauto;
TQRadioButton *normal;
- QLabel *displaylabel;
+ TQLabel *displaylabel;
TQButtonGroup *displaygroup;
TQCheckBox *landscape;
TQCheckBox *geomauto;
diff --git a/kfaxview/faxmultipage.cpp b/kfaxview/faxmultipage.cpp
index 44c1e273..2362d281 100644
--- a/kfaxview/faxmultipage.cpp
+++ b/kfaxview/faxmultipage.cpp
@@ -31,9 +31,9 @@ typedef KParts::GenericFactory<FaxMultiPage> FaxMultiPageFactory;
K_EXPORT_COMPONENT_FACTORY(kfaxviewpart, FaxMultiPageFactory)
-FaxMultiPage::FaxMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *parent,
+FaxMultiPage::FaxMultiPage(TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent,
const char *name, const TQStringList&)
- : KMultiPage(parentWidget, widgetName, parent, name), faxRenderer(parentWidget)
+ : KMultiPage(tqparentWidget, widgetName, tqparent, name), faxRenderer(tqparentWidget)
{
/* This is kparts wizardry that cannot be understood by man. Simply
change the names to match your implementation. */
diff --git a/kfaxview/faxmultipage.h b/kfaxview/faxmultipage.h
index 65a7fa25..71e24b72 100644
--- a/kfaxview/faxmultipage.h
+++ b/kfaxview/faxmultipage.h
@@ -81,6 +81,7 @@ does only the minimal initialization required.
class FaxMultiPage : public KMultiPage
{
Q_OBJECT
+ TQ_OBJECT
public:
/** Constructor
@@ -89,7 +90,7 @@ public:
kmultipage. Please have a look at the constructor's source code to
see how to adjust this for your implementation.
*/
- FaxMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *parent,
+ FaxMultiPage(TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent,
const char *name, const TQStringList& args = TQStringList());
/** Destructor
diff --git a/kfaxview/faxrenderer.cpp b/kfaxview/faxrenderer.cpp
index 3e597863..ec21ca06 100644
--- a/kfaxview/faxrenderer.cpp
+++ b/kfaxview/faxrenderer.cpp
@@ -36,7 +36,7 @@ FaxRenderer::FaxRenderer(TQWidget* par)
: DocumentRenderer(par)
{
#ifdef KF_DEBUG
- kdError() << "FaxRenderer( parent=" << par << " )" << endl;
+ kdError() << "FaxRenderer( tqparent=" << par << " )" << endl;
#endif
}
@@ -96,8 +96,8 @@ void FaxRenderer::drawPage(double resolution, RenderedDocumentPage* page)
// problems occur if KViewShell required a shrunken version of
// the page, e.g. to print multiple pages on one sheet of paper.
- int width_in_pixel = qRound(resolution * psize.width().getLength_in_inch());
- int height_in_pixel = qRound(resolution * psize.height().getLength_in_inch());
+ int width_in_pixel = tqRound(resolution * psize.width().getLength_in_inch());
+ int height_in_pixel = tqRound(resolution * psize.height().getLength_in_inch());
img = img.smoothScale(width_in_pixel, height_in_pixel);
foreGroundPaint->drawImage(0, 0, img);
@@ -135,8 +135,8 @@ bool FaxRenderer::setFile(const TQString &fname, const KURL &)
TQFileInfo fi(fname);
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>").arg(filename),
+ KMessageBox::error( tqparentWidget,
+ i18n("<qt><strong>File error.</strong> The specified file '%1' does not exist.</qt>").tqarg(filename),
i18n("File Error"));
// the return value 'false' indicates that this operation was not successful.
mutex.unlock();
@@ -156,12 +156,12 @@ bool FaxRenderer::setFile(const TQString &fname, const KURL &)
// leaving an error message in fax.errorString(). We try to handle
// 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>").arg(filename),
+ KMessageBox::error( tqparentWidget,
+ i18n("<qt><strong>File error.</strong> The specified file '%1' could not be loaded.</qt>").tqarg(filename),
i18n("File Error"));
else
- KMessageBox::detailedError( parentWidget,
- i18n("<qt><strong>File error.</strong> The specified file '%1' could not be loaded.</qt>").arg(filename),
+ KMessageBox::detailedError( tqparentWidget,
+ i18n("<qt><strong>File error.</strong> The specified file '%1' could not be loaded.</qt>").tqarg(filename),
fax.errorString(),
i18n("File Error"));
clear();
@@ -178,7 +178,7 @@ bool FaxRenderer::setFile(const TQString &fname, const KURL &)
Length w,h;
if (numPages != 0) {
- for(Q_UINT16 pg=0; pg < numPages; pg++) {
+ for(TQ_UINT16 pg=0; pg < numPages; pg++) {
TQSize pageSize = fax.page_size(pg);
TQPoint dpi = fax.page_dpi(pg);
double dpix = dpi.x();
diff --git a/kfaxview/faxrenderer.h b/kfaxview/faxrenderer.h
index e83f6ff4..d7022b61 100644
--- a/kfaxview/faxrenderer.h
+++ b/kfaxview/faxrenderer.h
@@ -39,6 +39,7 @@ implements only the necessary methods setFile() and drawPage().
class FaxRenderer : public DocumentRenderer
{
Q_OBJECT
+ TQ_OBJECT
public:
/** Default constructor
@@ -46,7 +47,7 @@ public:
This constructor simply prints a message (if debugging is
enabled) and calls the default constructor.
*/
- FaxRenderer(TQWidget* parent);
+ FaxRenderer(TQWidget* tqparent);
/** Destructor
diff --git a/kfaxview/libkfaximage/faxexpand.h b/kfaxview/libkfaximage/faxexpand.h
index 736779bd..72819e23 100644
--- a/kfaxview/libkfaximage/faxexpand.h
+++ b/kfaxview/libkfaximage/faxexpand.h
@@ -27,8 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
#include <tqglobal.h>
#include <tqimage.h>
-#define t32bits Q_UINT32
-#define t16bits Q_UINT16
+#define t32bits TQ_UINT32
+#define t16bits TQ_UINT16
typedef t16bits pixnum;
diff --git a/kfaxview/libkfaximage/kfaximage.cpp b/kfaxview/libkfaximage/kfaximage.cpp
index c0efb624..ea0d4943 100644
--- a/kfaxview/libkfaximage/kfaximage.cpp
+++ b/kfaxview/libkfaximage/kfaximage.cpp
@@ -38,10 +38,10 @@ static const char FAXMAGIC[] = "\000PC Research, Inc\000\000\000\000\000\000";
static const char littleTIFF[] = "\x49\x49\x2a\x00";
static const char bigTIFF[] = "\x4d\x4d\x00\x2a";
-KFaxImage::KFaxImage( const TQString &filename, TQObject *parent, const char *name )
- : TQObject(parent,name)
+KFaxImage::KFaxImage( const TQString &filename, TQObject *tqparent, const char *name )
+ : TQObject(tqparent,name)
{
- KGlobal::locale()->insertCatalogue( TQString::fromLatin1("libkfaximage") );
+ KGlobal::locale()->insertCatalogue( TQString::tqfromLatin1("libkfaximage") );
loadImage(filename);
}
@@ -53,7 +53,7 @@ bool KFaxImage::loadImage( const TQString &filename )
reset();
m_filename = filename;
- m_errorString = TQString::null;
+ m_errorString = TQString();
if (m_filename.isEmpty())
return false;
@@ -126,9 +126,9 @@ pagenode *KFaxImage::AppendImageNode(int type)
bool KFaxImage::NewImage(pagenode *pn, int w, int h)
{
pn->image = TQImage( w, h, 1, 2, TQImage::systemByteOrder() );
- pn->image.setColor(0, qRgb(255,255,255));
- pn->image.setColor(1, qRgb(0,0,0));
- pn->data = (Q_UINT16*) pn->image.bits();
+ pn->image.setColor(0, tqRgb(255,255,255));
+ pn->image.setColor(1, tqRgb(0,0,0));
+ pn->data = (TQ_UINT16*) pn->image.bits();
pn->bytes_per_line = pn->image.bytesPerLine();
pn->dpi = KFAX_DPI_FINE;
@@ -293,7 +293,7 @@ KFaxImage::notetiff()
get2(buf, endian) : get4(buf, endian);
}
break;
- case 274: /* Orientation */
+ case 274: /* Qt::Orientation */
switch(value) {
default: /* row0 at top, col0 at left */
orient = 0;
@@ -327,7 +327,7 @@ KFaxImage::notetiff()
case 279: /* StripByteCounts */
if (count != nstrips) {
str = i18n("In file %1\nStripsPerImage tag 273=%2,tag279=%3\n")
- .arg(filename()).arg(nstrips).arg(count);
+ .tqarg(filename()).tqarg(nstrips).tqarg(count);
kfaxerror(str);
goto realbad;
}
@@ -403,7 +403,7 @@ KFaxImage::notetiff()
void
KFaxImage::badfile(pagenode *pn)
{
- kfaxerror(i18n("%1: Bad Fax File").arg(filename()));
+ kfaxerror(i18n("%1: Bad Fax File").tqarg(filename()));
FreeImage(pn);
}
@@ -636,12 +636,12 @@ KFaxImage::GetImage(pagenode *pn)
}
// byte-swapping the image on little endian machines
-#if defined(Q_BYTE_ORDER) && (Q_BYTE_ORDER == Q_LITTLE_ENDIAN)
+#if defined(Q_BYTE_ORDER) && (Q_BYTE_ORDER == TQ_LITTLE_ENDIAN)
for (int y=pn->image.height()-1; y>=0; --y) {
- Q_UINT32 *source = (Q_UINT32 *) pn->image.scanLine(y);
- Q_UINT32 *dest = source;
+ TQ_UINT32 *source = (TQ_UINT32 *) pn->image.scanLine(y);
+ TQ_UINT32 *dest = source;
for (int x=(pn->bytes_per_line/4)-1; x>=0; --x) {
- Q_UINT32 dv = 0, sv = *source;
+ TQ_UINT32 dv = 0, sv = *source;
for (int bit=32; bit>0; --bit) {
dv <<= 1;
dv |= sv&1;
diff --git a/kfaxview/libkfaximage/kfaximage.h b/kfaxview/libkfaximage/kfaximage.h
index c0d61cb6..52dd7736 100644
--- a/kfaxview/libkfaximage/kfaximage.h
+++ b/kfaxview/libkfaximage/kfaximage.h
@@ -50,9 +50,10 @@ class pagenode;
#define KFAX_DPI_SUPERFINE TQPoint(406,392)
-class KDE_EXPORT KFaxImage : public QObject
+class KDE_EXPORT KFaxImage : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
@@ -63,7 +64,7 @@ public:
* @see: numPages
*/
- KFaxImage( const TQString &filename = TQString::null, TQObject *parent = 0, const char *name = 0 );
+ KFaxImage( const TQString &filename = TQString(), TQObject *tqparent = 0, const char *name = 0 );
/**
* Destructor
diff --git a/kfaxview/main.cpp b/kfaxview/main.cpp
index 05692315..cacb24a0 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.")).arg(args->arg(0)) << endl;
+ kdError(4300) << TQString(I18N_NOOP("The URL %1 is not well-formed.")).tqarg(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.")).arg(args->arg(0)) << endl;
+ "files if you are using the '--unique' option.")).tqarg(args->arg(0)) << endl;
return -1;
}
@@ -118,7 +118,7 @@ int main(int argc, char** argv)
QCStringList apps = app.dcopClient()->registeredApplications();
for ( QCStringList::Iterator it = apps.begin(); it != apps.end(); ++it )
{
- if ((*it).find("kviewshell") == 0)
+ if ((*it).tqfind("kviewshell") == 0)
{
TQByteArray data, replyData;
TQCString replyType;
diff --git a/kfile-plugins/RETURNED_ITEMS b/kfile-plugins/RETURNED_ITEMS
index 593d466a..70a3b519 100644
--- a/kfile-plugins/RETURNED_ITEMS
+++ b/kfile-plugins/RETURNED_ITEMS
@@ -50,7 +50,7 @@ String Camera make
String Camera model
String Date/time
Size Dimensions Width x Height in pixels
-int Orientation 1 - "The 0th row is at the visual top of the image,
+int Qt::Orientation 1 - "The 0th row is at the visual top of the image,
and the 0th column is the visual left-hand side."
2 - "The 0th row is at the visual top of the image,
and the 0th column is the visual right-hand side."
diff --git a/kfile-plugins/bmp/kfile_bmp.cpp b/kfile-plugins/bmp/kfile_bmp.cpp
index 790161a6..a682da7c 100644
--- a/kfile-plugins/bmp/kfile_bmp.cpp
+++ b/kfile-plugins/bmp/kfile_bmp.cpp
@@ -43,10 +43,10 @@ typedef KGenericFactory<KBmpPlugin> BmpFactory;
K_EXPORT_COMPONENT_FACTORY(kfile_bmp, BmpFactory( "kfile_bmp" ))
-KBmpPlugin::KBmpPlugin(TQObject *parent, const char *name,
+KBmpPlugin::KBmpPlugin(TQObject *tqparent, const char *name,
const TQStringList &args)
- : KFilePlugin(parent, name, args)
+ : KFilePlugin(tqparent, name, args)
{
KFileMimeTypeInfo* info = addMimeTypeInfo( "image/x-bmp" );
@@ -83,7 +83,7 @@ bool KBmpPlugin::readInfo( KFileMetaInfo& info, uint what)
if (!file.open(IO_ReadOnly))
{
- kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()) << endl;
+ kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()).data() << endl;
return false;
}
diff --git a/kfile-plugins/bmp/kfile_bmp.h b/kfile-plugins/bmp/kfile_bmp.h
index f34e3e86..c2c5c007 100644
--- a/kfile-plugins/bmp/kfile_bmp.h
+++ b/kfile-plugins/bmp/kfile_bmp.h
@@ -27,9 +27,10 @@ class TQStringList;
class KBmpPlugin: public KFilePlugin
{
Q_OBJECT
+ TQ_OBJECT
public:
- KBmpPlugin( TQObject *parent, const char *name, const TQStringList& args );
+ KBmpPlugin( TQObject *tqparent, const char *name, const TQStringList& args );
virtual bool readInfo( KFileMetaInfo& info, uint what);
};
diff --git a/kfile-plugins/configure.in.bot b/kfile-plugins/configure.in.bot
index 47308e8b..f03bc711 100644
--- a/kfile-plugins/configure.in.bot
+++ b/kfile-plugins/configure.in.bot
@@ -7,13 +7,13 @@ if test -z "$LIBTIFF"; then
all_tests=bad
fi
-if test -z "$POPPLER_LIBS"; then
- echo ""
- echo "You're missing poppler. The additional info plugin for PDF files"
- echo "files won't be compiled without poppler >= 0.3.1."
- echo "You can download poppler from http://poppler.freedesktop.org/"
- echo ""
-fi
+#if test -z "$POPPLER_LIBS"; then
+# echo ""
+# echo "You're missing poppler. The additional info plugin for PDF files"
+# echo "files won't be compiled without poppler >= 0.3.1."
+# echo "You can download poppler from http://poppler.freedesktop.org/"
+# echo ""
+#fi
if test "$EXRSTATUS" = "no"; then
echo ""
diff --git a/kfile-plugins/dds/kfile_dds.cpp b/kfile-plugins/dds/kfile_dds.cpp
index f8c3346e..17321e13 100644
--- a/kfile-plugins/dds/kfile_dds.cpp
+++ b/kfile-plugins/dds/kfile_dds.cpp
@@ -1,5 +1,5 @@
/* This file is part of the KDE project
- * Copyright (C) 2002 Ignacio Casta˝o <castano@ludicon.com>
+ * Copyright (C) 2002 Ignacio Casta´┐Żo <castano@ludicon.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public
@@ -35,9 +35,9 @@
typedef KGenericFactory<KDdsPlugin> DdsFactory;
-typedef Q_UINT32 uint;
-typedef Q_UINT16 ushort;
-typedef Q_UINT8 uchar;
+typedef TQ_UINT32 uint;
+typedef TQ_UINT16 ushort;
+typedef TQ_UINT8 uchar;
namespace { // Private.
@@ -90,10 +90,10 @@ namespace { // Private.
uint flags;
uint fourcc;
uint bitcount;
- uint rmask;
- uint gmask;
- uint bmask;
- uint amask;
+ uint rtqmask;
+ uint gtqmask;
+ uint btqmask;
+ uint atqmask;
};
TQDataStream & operator>> ( TQDataStream & s, DDSPixelFormat & pf )
@@ -102,10 +102,10 @@ namespace { // Private.
s >> pf.flags;
s >> pf.fourcc;
s >> pf.bitcount;
- s >> pf.rmask;
- s >> pf.gmask;
- s >> pf.bmask;
- s >> pf.amask;
+ s >> pf.rtqmask;
+ s >> pf.gtqmask;
+ s >> pf.btqmask;
+ s >> pf.atqmask;
return s;
}
@@ -182,8 +182,8 @@ namespace { // Private.
K_EXPORT_COMPONENT_FACTORY(kfile_dds, DdsFactory( "kfile_dds" ))
// Constructor, init mime type info.
-KDdsPlugin::KDdsPlugin(TQObject *parent, const char *name, const TQStringList &args) :
- KFilePlugin(parent, name, args)
+KDdsPlugin::KDdsPlugin(TQObject *tqparent, const char *name, const TQStringList &args) :
+ KFilePlugin(tqparent, name, args)
{
KFileMimeTypeInfo * info = addMimeTypeInfo( "image/x-dds" );
@@ -216,7 +216,7 @@ bool KDdsPlugin::readInfo( KFileMetaInfo& info, uint /*what*/)
TQFile file(info.path());
if (!file.open(IO_ReadOnly)) {
- kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()) << endl;
+ kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()).data() << endl;
return false;
}
@@ -227,7 +227,7 @@ bool KDdsPlugin::readInfo( KFileMe