From 23bfbfff2de55c72029349cc312adac29cf09809 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: rename the following methods: tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/digikam@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- digikam/digikam/album.cpp | 28 +- digikam/digikam/album.h | 12 +- digikam/digikam/albumdb.cpp | 6 +- digikam/digikam/albumdb.h | 6 +- digikam/digikam/albumfolderview.cpp | 116 ++++---- digikam/digikam/albumfolderview.h | 2 +- digikam/digikam/albumiconitem.cpp | 6 +- digikam/digikam/albumiconitem.h | 2 +- digikam/digikam/albumiconview.cpp | 10 +- digikam/digikam/albumiconview.h | 2 +- digikam/digikam/albumiconviewfilter.cpp | 4 +- digikam/digikam/albumiconviewfilter.h | 2 +- digikam/digikam/albummanager.cpp | 58 ++-- digikam/digikam/albummanager.h | 18 +- digikam/digikam/albumpropsedit.cpp | 4 +- digikam/digikam/albumpropsedit.h | 2 +- digikam/digikam/albumwidgetstack.cpp | 4 +- digikam/digikam/albumwidgetstack.h | 2 +- digikam/digikam/cameralist.cpp | 4 +- digikam/digikam/cameralist.h | 2 +- digikam/digikam/datefolderview.cpp | 22 +- digikam/digikam/datefolderview.h | 2 +- digikam/digikam/dcopiface.cpp | 4 +- digikam/digikam/dcopiface.h | 4 +- digikam/digikam/digikamfirstrun.cpp | 4 +- digikam/digikam/digikamfirstrun.h | 2 +- digikam/digikam/digikamview.cpp | 88 +++--- digikam/digikam/digikamview.h | 2 +- digikam/digikam/firstrun.cpp | 4 +- digikam/digikam/firstrun.h | 2 +- digikam/digikam/folderitem.cpp | 16 +- digikam/digikam/folderitem.h | 8 +- digikam/digikam/folderview.cpp | 4 +- digikam/digikam/folderview.h | 2 +- digikam/digikam/icongroupitem.cpp | 6 +- digikam/digikam/icongroupitem.h | 2 +- digikam/digikam/iconitem.cpp | 4 +- digikam/digikam/iconitem.h | 2 +- digikam/digikam/iconview.cpp | 4 +- digikam/digikam/iconview.h | 2 +- digikam/digikam/imagepreviewview.cpp | 18 +- digikam/digikam/imagepreviewview.h | 2 +- digikam/digikam/kdateedit.cpp | 8 +- digikam/digikam/kdateedit.h | 2 +- digikam/digikam/kdatepickerpopup.cpp | 4 +- digikam/digikam/kdatepickerpopup.h | 4 +- digikam/digikam/kdatetimeedit.cpp | 4 +- digikam/digikam/kdatetimeedit.h | 4 +- digikam/digikam/kipiinterface.cpp | 4 +- digikam/digikam/kipiinterface.h | 2 +- digikam/digikam/mediaplayerview.cpp | 4 +- digikam/digikam/mediaplayerview.h | 2 +- digikam/digikam/mimefilter.cpp | 4 +- digikam/digikam/mimefilter.h | 2 +- digikam/digikam/monthwidget.cpp | 4 +- digikam/digikam/monthwidget.h | 2 +- digikam/digikam/ratingfilter.cpp | 6 +- digikam/digikam/ratingfilter.h | 2 +- digikam/digikam/ratingpopupmenu.cpp | 10 +- digikam/digikam/ratingpopupmenu.h | 2 +- digikam/digikam/ratingwidget.cpp | 4 +- digikam/digikam/ratingwidget.h | 2 +- digikam/digikam/searchadvanceddialog.cpp | 4 +- digikam/digikam/searchadvanceddialog.h | 4 +- digikam/digikam/searchfolderview.cpp | 10 +- digikam/digikam/searchfolderview.h | 2 +- digikam/digikam/searchquickdialog.cpp | 4 +- digikam/digikam/searchquickdialog.h | 4 +- digikam/digikam/searchresultsview.cpp | 4 +- digikam/digikam/searchresultsview.h | 2 +- digikam/digikam/searchwidgets.cpp | 14 +- digikam/digikam/searchwidgets.h | 12 +- digikam/digikam/tageditdlg.cpp | 26 +- digikam/digikam/tageditdlg.h | 10 +- digikam/digikam/tagfilterview.cpp | 54 ++-- digikam/digikam/tagfilterview.h | 2 +- digikam/digikam/tagfolderview.cpp | 60 ++-- digikam/digikam/tagfolderview.h | 2 +- digikam/digikam/tagspopupmenu.cpp | 12 +- digikam/digikam/timelinefolderview.cpp | 10 +- digikam/digikam/timelinefolderview.h | 2 +- digikam/digikam/timelineview.cpp | 4 +- digikam/digikam/timelineview.h | 2 +- digikam/digikam/timelinewidget.cpp | 4 +- digikam/digikam/timelinewidget.h | 2 +- digikam/digikam/welcomepageview.cpp | 4 +- digikam/digikam/welcomepageview.h | 2 +- digikam/imageplugins/adjustcurves/adjustcurves.cpp | 4 +- digikam/imageplugins/adjustcurves/adjustcurves.h | 2 +- .../imageplugins/adjustcurves/adjustcurvestool.cpp | 4 +- .../imageplugins/adjustcurves/adjustcurvestool.h | 2 +- .../adjustcurves/imageplugin_adjustcurves.cpp | 4 +- .../adjustcurves/imageplugin_adjustcurves.h | 2 +- digikam/imageplugins/adjustlevels/adjustlevels.cpp | 6 +- digikam/imageplugins/adjustlevels/adjustlevels.h | 2 +- .../imageplugins/adjustlevels/adjustlevelstool.cpp | 6 +- .../imageplugins/adjustlevels/adjustlevelstool.h | 2 +- .../adjustlevels/imageplugin_adjustlevels.cpp | 4 +- .../adjustlevels/imageplugin_adjustlevels.h | 2 +- .../imageplugins/antivignetting/antivignetting.cpp | 4 +- .../imageplugins/antivignetting/antivignetting.h | 2 +- .../antivignetting/antivignettingtool.cpp | 8 +- .../antivignetting/antivignettingtool.h | 2 +- .../antivignetting/imageeffect_antivignetting.cpp | 8 +- .../antivignetting/imageeffect_antivignetting.h | 2 +- .../antivignetting/imageplugin_antivignetting.cpp | 4 +- .../antivignetting/imageplugin_antivignetting.h | 2 +- digikam/imageplugins/blurfx/blurfx.cpp | 4 +- digikam/imageplugins/blurfx/blurfx.h | 2 +- digikam/imageplugins/blurfx/blurfxtool.cpp | 4 +- digikam/imageplugins/blurfx/blurfxtool.h | 2 +- digikam/imageplugins/blurfx/imageeffect_blurfx.cpp | 4 +- digikam/imageplugins/blurfx/imageeffect_blurfx.h | 2 +- digikam/imageplugins/blurfx/imageplugin_blurfx.cpp | 4 +- digikam/imageplugins/blurfx/imageplugin_blurfx.h | 2 +- digikam/imageplugins/border/border.cpp | 8 +- digikam/imageplugins/border/border.h | 4 +- digikam/imageplugins/border/bordertool.cpp | 4 +- digikam/imageplugins/border/bordertool.h | 2 +- digikam/imageplugins/border/imageeffect_border.cpp | 4 +- digikam/imageplugins/border/imageeffect_border.h | 2 +- digikam/imageplugins/border/imageplugin_border.cpp | 4 +- digikam/imageplugins/border/imageplugin_border.h | 2 +- digikam/imageplugins/channelmixer/channelmixer.cpp | 4 +- digikam/imageplugins/channelmixer/channelmixer.h | 2 +- .../imageplugins/channelmixer/channelmixertool.cpp | 4 +- .../imageplugins/channelmixer/channelmixertool.h | 2 +- .../channelmixer/imageplugin_channelmixer.cpp | 4 +- .../channelmixer/imageplugin_channelmixer.h | 2 +- digikam/imageplugins/charcoal/charcoal.cpp | 4 +- digikam/imageplugins/charcoal/charcoal.h | 2 +- digikam/imageplugins/charcoal/charcoaltool.cpp | 4 +- digikam/imageplugins/charcoal/charcoaltool.h | 2 +- .../imageplugins/charcoal/imageeffect_charcoal.cpp | 4 +- .../imageplugins/charcoal/imageeffect_charcoal.h | 2 +- .../imageplugins/charcoal/imageplugin_charcoal.cpp | 4 +- .../imageplugins/charcoal/imageplugin_charcoal.h | 2 +- digikam/imageplugins/colorfx/colorfxtool.cpp | 4 +- digikam/imageplugins/colorfx/colorfxtool.h | 2 +- .../imageplugins/colorfx/imageeffect_colorfx.cpp | 4 +- digikam/imageplugins/colorfx/imageeffect_colorfx.h | 2 +- .../imageplugins/colorfx/imageplugin_colorfx.cpp | 4 +- digikam/imageplugins/colorfx/imageplugin_colorfx.h | 2 +- .../imageplugins/coreplugin/autocorrectiontool.cpp | 4 +- .../imageplugins/coreplugin/autocorrectiontool.h | 2 +- digikam/imageplugins/coreplugin/bcgtool.cpp | 4 +- digikam/imageplugins/coreplugin/bcgtool.h | 2 +- digikam/imageplugins/coreplugin/blurtool.cpp | 4 +- digikam/imageplugins/coreplugin/blurtool.h | 2 +- digikam/imageplugins/coreplugin/bwsepiatool.cpp | 6 +- digikam/imageplugins/coreplugin/bwsepiatool.h | 2 +- digikam/imageplugins/coreplugin/hsl/hsltool.cpp | 4 +- digikam/imageplugins/coreplugin/hsl/hsltool.h | 2 +- .../coreplugin/hsl/hspreviewwidget.cpp | 4 +- .../imageplugins/coreplugin/hsl/hspreviewwidget.h | 2 +- .../coreplugin/hsl/imageeffect_hsl.cpp | 4 +- .../imageplugins/coreplugin/hsl/imageeffect_hsl.h | 2 +- digikam/imageplugins/coreplugin/iccprooftool.cpp | 4 +- digikam/imageplugins/coreplugin/iccprooftool.h | 2 +- .../coreplugin/imageeffect_autocorrection.cpp | 4 +- .../coreplugin/imageeffect_autocorrection.h | 2 +- .../imageplugins/coreplugin/imageeffect_bcg.cpp | 4 +- digikam/imageplugins/coreplugin/imageeffect_bcg.h | 2 +- .../imageplugins/coreplugin/imageeffect_blur.cpp | 4 +- digikam/imageplugins/coreplugin/imageeffect_blur.h | 2 +- .../coreplugin/imageeffect_bwsepia.cpp | 6 +- .../imageplugins/coreplugin/imageeffect_bwsepia.h | 2 +- .../coreplugin/imageeffect_iccproof.cpp | 4 +- .../imageplugins/coreplugin/imageeffect_iccproof.h | 2 +- .../imageplugins/coreplugin/imageeffect_redeye.cpp | 42 +-- .../imageplugins/coreplugin/imageeffect_redeye.h | 6 +- .../imageplugins/coreplugin/imageeffect_rgb.cpp | 4 +- digikam/imageplugins/coreplugin/imageeffect_rgb.h | 2 +- .../imageplugins/coreplugin/imageplugin_core.cpp | 4 +- digikam/imageplugins/coreplugin/imageplugin_core.h | 2 +- .../coreplugin/ratiocrop/imageeffect_ratiocrop.cpp | 4 +- .../coreplugin/ratiocrop/imageeffect_ratiocrop.h | 2 +- .../coreplugin/ratiocrop/imageselectionwidget.cpp | 4 +- .../coreplugin/ratiocrop/imageselectionwidget.h | 2 +- .../coreplugin/ratiocrop/ratiocroptool.cpp | 4 +- .../coreplugin/ratiocrop/ratiocroptool.h | 2 +- digikam/imageplugins/coreplugin/redeyetool.cpp | 42 +-- digikam/imageplugins/coreplugin/redeyetool.h | 6 +- digikam/imageplugins/coreplugin/rgbtool.cpp | 4 +- digikam/imageplugins/coreplugin/rgbtool.h | 2 +- .../coreplugin/sharpnesseditor/clapack/err.c | 4 +- .../sharpnesseditor/imageeffect_sharpen.cpp | 6 +- .../sharpnesseditor/imageeffect_sharpen.h | 2 +- .../coreplugin/sharpnesseditor/refocus.cpp | 4 +- .../coreplugin/sharpnesseditor/refocus.h | 2 +- .../coreplugin/sharpnesseditor/sharpentool.cpp | 6 +- .../coreplugin/sharpnesseditor/sharpentool.h | 2 +- .../coreplugin/sharpnesseditor/unsharp.cpp | 4 +- .../coreplugin/sharpnesseditor/unsharp.h | 2 +- digikam/imageplugins/distortionfx/distortionfx.cpp | 4 +- digikam/imageplugins/distortionfx/distortionfx.h | 2 +- .../imageplugins/distortionfx/distortionfxtool.cpp | 4 +- .../imageplugins/distortionfx/distortionfxtool.h | 2 +- .../distortionfx/imageeffect_distortionfx.cpp | 4 +- .../distortionfx/imageeffect_distortionfx.h | 2 +- .../distortionfx/imageplugin_distortionfx.cpp | 4 +- .../distortionfx/imageplugin_distortionfx.h | 2 +- digikam/imageplugins/emboss/emboss.cpp | 4 +- digikam/imageplugins/emboss/emboss.h | 2 +- digikam/imageplugins/emboss/embosstool.cpp | 4 +- digikam/imageplugins/emboss/embosstool.h | 2 +- digikam/imageplugins/emboss/imageeffect_emboss.cpp | 4 +- digikam/imageplugins/emboss/imageeffect_emboss.h | 2 +- digikam/imageplugins/emboss/imageplugin_emboss.cpp | 4 +- digikam/imageplugins/emboss/imageplugin_emboss.h | 2 +- digikam/imageplugins/filmgrain/filmgrain.cpp | 18 +- digikam/imageplugins/filmgrain/filmgrain.h | 2 +- digikam/imageplugins/filmgrain/filmgraintool.cpp | 4 +- digikam/imageplugins/filmgrain/filmgraintool.h | 2 +- .../filmgrain/imageeffect_filmgrain.cpp | 4 +- .../imageplugins/filmgrain/imageeffect_filmgrain.h | 2 +- .../filmgrain/imageplugin_filmgrain.cpp | 4 +- .../imageplugins/filmgrain/imageplugin_filmgrain.h | 2 +- digikam/imageplugins/freerotation/freerotation.cpp | 4 +- digikam/imageplugins/freerotation/freerotation.h | 2 +- .../imageplugins/freerotation/freerotationtool.cpp | 4 +- .../imageplugins/freerotation/freerotationtool.h | 2 +- .../freerotation/imageeffect_freerotation.cpp | 4 +- .../freerotation/imageeffect_freerotation.h | 2 +- .../freerotation/imageplugin_freerotation.cpp | 4 +- .../freerotation/imageplugin_freerotation.h | 2 +- .../imageplugins/hotpixels/blackframelistview.cpp | 14 +- .../imageplugins/hotpixels/blackframelistview.h | 4 +- .../imageplugins/hotpixels/blackframeparser.cpp | 4 +- digikam/imageplugins/hotpixels/blackframeparser.h | 2 +- digikam/imageplugins/hotpixels/hotpixelfixer.cpp | 4 +- digikam/imageplugins/hotpixels/hotpixelfixer.h | 2 +- digikam/imageplugins/hotpixels/hotpixelstool.cpp | 4 +- digikam/imageplugins/hotpixels/hotpixelstool.h | 2 +- .../hotpixels/imageeffect_hotpixels.cpp | 4 +- .../imageplugins/hotpixels/imageeffect_hotpixels.h | 2 +- .../hotpixels/imageplugin_hotpixels.cpp | 4 +- .../imageplugins/hotpixels/imageplugin_hotpixels.h | 2 +- .../imageplugins/infrared/imageeffect_infrared.cpp | 4 +- .../imageplugins/infrared/imageeffect_infrared.h | 2 +- .../imageplugins/infrared/imageplugin_infrared.cpp | 4 +- .../imageplugins/infrared/imageplugin_infrared.h | 2 +- digikam/imageplugins/infrared/infrared.cpp | 22 +- digikam/imageplugins/infrared/infrared.h | 2 +- digikam/imageplugins/infrared/infraredtool.cpp | 4 +- digikam/imageplugins/infrared/infraredtool.h | 2 +- .../inpainting/imageeffect_inpainting.cpp | 20 +- .../inpainting/imageeffect_inpainting.h | 4 +- .../inpainting/imageplugin_inpainting.cpp | 4 +- .../inpainting/imageplugin_inpainting.h | 2 +- digikam/imageplugins/inpainting/inpaintingtool.cpp | 12 +- digikam/imageplugins/inpainting/inpaintingtool.h | 4 +- .../imageplugins/inserttext/fontchooserwidget.cpp | 4 +- .../imageplugins/inserttext/fontchooserwidget.h | 2 +- .../inserttext/imageeffect_inserttext.cpp | 4 +- .../inserttext/imageeffect_inserttext.h | 2 +- .../inserttext/imageplugin_inserttext.cpp | 4 +- .../inserttext/imageplugin_inserttext.h | 2 +- digikam/imageplugins/inserttext/inserttexttool.cpp | 4 +- digikam/imageplugins/inserttext/inserttexttool.h | 2 +- .../imageplugins/inserttext/inserttextwidget.cpp | 4 +- digikam/imageplugins/inserttext/inserttextwidget.h | 2 +- .../lensdistortion/imageeffect_lensdistortion.cpp | 4 +- .../lensdistortion/imageeffect_lensdistortion.h | 2 +- .../lensdistortion/imageplugin_lensdistortion.cpp | 4 +- .../lensdistortion/imageplugin_lensdistortion.h | 2 +- .../imageplugins/lensdistortion/lensdistortion.cpp | 4 +- .../imageplugins/lensdistortion/lensdistortion.h | 2 +- .../lensdistortion/lensdistortiontool.cpp | 4 +- .../lensdistortion/lensdistortiontool.h | 2 +- .../noisereduction/imageeffect_noisereduction.cpp | 4 +- .../noisereduction/imageeffect_noisereduction.h | 2 +- .../noisereduction/imageplugin_noisereduction.cpp | 4 +- .../noisereduction/imageplugin_noisereduction.h | 2 +- .../imageplugins/noisereduction/noisereduction.cpp | 4 +- .../imageplugins/noisereduction/noisereduction.h | 2 +- .../noisereduction/noisereductiontool.cpp | 4 +- .../noisereduction/noisereductiontool.h | 2 +- .../imageplugins/oilpaint/imageeffect_oilpaint.cpp | 4 +- .../imageplugins/oilpaint/imageeffect_oilpaint.h | 2 +- .../imageplugins/oilpaint/imageplugin_oilpaint.cpp | 4 +- .../imageplugins/oilpaint/imageplugin_oilpaint.h | 2 +- digikam/imageplugins/oilpaint/oilpaint.cpp | 4 +- digikam/imageplugins/oilpaint/oilpaint.h | 2 +- digikam/imageplugins/oilpaint/oilpainttool.cpp | 4 +- digikam/imageplugins/oilpaint/oilpainttool.h | 2 +- .../perspective/imageeffect_perspective.cpp | 4 +- .../perspective/imageeffect_perspective.h | 2 +- .../perspective/imageplugin_perspective.cpp | 4 +- .../perspective/imageplugin_perspective.h | 2 +- .../imageplugins/perspective/perspectivetool.cpp | 4 +- digikam/imageplugins/perspective/perspectivetool.h | 2 +- .../imageplugins/perspective/perspectivewidget.cpp | 4 +- .../imageplugins/perspective/perspectivewidget.h | 2 +- .../imageplugins/raindrop/imageeffect_raindrop.cpp | 4 +- .../imageplugins/raindrop/imageeffect_raindrop.h | 2 +- .../imageplugins/raindrop/imageplugin_raindrop.cpp | 4 +- .../imageplugins/raindrop/imageplugin_raindrop.h | 2 +- digikam/imageplugins/raindrop/raindrop.cpp | 4 +- digikam/imageplugins/raindrop/raindrop.h | 2 +- digikam/imageplugins/raindrop/raindroptool.cpp | 4 +- digikam/imageplugins/raindrop/raindroptool.h | 2 +- .../restoration/imageeffect_restoration.cpp | 4 +- .../restoration/imageeffect_restoration.h | 2 +- .../restoration/imageplugin_restoration.cpp | 4 +- .../restoration/imageplugin_restoration.h | 2 +- .../imageplugins/restoration/restorationtool.cpp | 4 +- digikam/imageplugins/restoration/restorationtool.h | 2 +- .../sheartool/imageeffect_sheartool.cpp | 4 +- .../imageplugins/sheartool/imageeffect_sheartool.h | 2 +- .../sheartool/imageplugin_sheartool.cpp | 4 +- .../imageplugins/sheartool/imageplugin_sheartool.h | 2 +- digikam/imageplugins/sheartool/shear.cpp | 4 +- digikam/imageplugins/sheartool/shear.h | 2 +- digikam/imageplugins/sheartool/sheartool.cpp | 4 +- digikam/imageplugins/sheartool/sheartool.h | 2 +- .../imageplugins/superimpose/dirselectwidget.cpp | 8 +- digikam/imageplugins/superimpose/dirselectwidget.h | 4 +- .../superimpose/imageeffect_superimpose.cpp | 4 +- .../superimpose/imageeffect_superimpose.h | 2 +- .../superimpose/imageplugin_superimpose.cpp | 4 +- .../superimpose/imageplugin_superimpose.h | 2 +- .../imageplugins/superimpose/superimposetool.cpp | 4 +- digikam/imageplugins/superimpose/superimposetool.h | 2 +- .../imageplugins/superimpose/superimposewidget.cpp | 4 +- .../imageplugins/superimpose/superimposewidget.h | 2 +- .../imageplugins/texture/imageeffect_texture.cpp | 4 +- digikam/imageplugins/texture/imageeffect_texture.h | 2 +- .../imageplugins/texture/imageplugin_texture.cpp | 4 +- digikam/imageplugins/texture/imageplugin_texture.h | 2 +- digikam/imageplugins/texture/texture.cpp | 4 +- digikam/imageplugins/texture/texture.h | 2 +- digikam/imageplugins/texture/texturetool.cpp | 4 +- digikam/imageplugins/texture/texturetool.h | 2 +- .../whitebalance/imageeffect_whitebalance.cpp | 4 +- .../whitebalance/imageeffect_whitebalance.h | 2 +- .../whitebalance/imageplugin_whitebalance.cpp | 4 +- .../whitebalance/imageplugin_whitebalance.h | 2 +- .../imageplugins/whitebalance/whitebalancetool.cpp | 4 +- .../imageplugins/whitebalance/whitebalancetool.h | 2 +- digikam/kioslave/digikamalbums.cpp | 12 +- digikam/kioslave/digikamtags.cpp | 2 +- digikam/libs/dialogs/ctrlpaneldlg.cpp | 10 +- digikam/libs/dialogs/ctrlpaneldlg.h | 2 +- digikam/libs/dialogs/deletedialog.cpp | 8 +- digikam/libs/dialogs/deletedialog.h | 4 +- digikam/libs/dialogs/dprogressdlg.cpp | 4 +- digikam/libs/dialogs/dprogressdlg.h | 2 +- digikam/libs/dialogs/iccprofileinfodlg.cpp | 4 +- digikam/libs/dialogs/iccprofileinfodlg.h | 2 +- digikam/libs/dialogs/imagedialog.cpp | 16 +- digikam/libs/dialogs/imagedialog.h | 8 +- digikam/libs/dialogs/imagedlgbase.cpp | 10 +- digikam/libs/dialogs/imagedlgbase.h | 2 +- digikam/libs/dialogs/imageguidedlg.cpp | 10 +- digikam/libs/dialogs/imageguidedlg.h | 2 +- digikam/libs/dialogs/rawcameradlg.cpp | 4 +- digikam/libs/dialogs/rawcameradlg.h | 2 +- digikam/libs/dimg/dimg.h | 2 +- digikam/libs/dimg/filters/dimggaussianblur.cpp | 4 +- digikam/libs/dimg/filters/dimggaussianblur.h | 2 +- digikam/libs/dimg/filters/dimgimagefilters.cpp | 26 +- digikam/libs/dimg/filters/dimgsharpen.cpp | 4 +- digikam/libs/dimg/filters/dimgsharpen.h | 2 +- digikam/libs/dimg/filters/dimgthreadedfilter.cpp | 8 +- digikam/libs/dimg/filters/dimgthreadedfilter.h | 14 +- digikam/libs/dimg/loaders/jp2ksettings.cpp | 4 +- digikam/libs/dimg/loaders/jp2ksettings.h | 2 +- digikam/libs/dimg/loaders/jpegsettings.cpp | 4 +- digikam/libs/dimg/loaders/jpegsettings.h | 2 +- digikam/libs/dimg/loaders/pngsettings.cpp | 4 +- digikam/libs/dimg/loaders/pngsettings.h | 2 +- digikam/libs/dimg/loaders/tiffsettings.cpp | 4 +- digikam/libs/dimg/loaders/tiffsettings.h | 2 +- digikam/libs/greycstoration/CImg.h | 316 ++++++++++----------- digikam/libs/greycstoration/greycstoration.h | 34 +-- .../libs/greycstoration/greycstorationiface.cpp | 30 +- digikam/libs/greycstoration/greycstorationiface.h | 2 +- .../libs/greycstoration/greycstorationwidget.cpp | 22 +- digikam/libs/greycstoration/greycstorationwidget.h | 2 +- digikam/libs/histogram/imagehistogram.cpp | 30 +- digikam/libs/histogram/imagehistogram.h | 6 +- .../imageproperties/cameraitempropertiestab.cpp | 4 +- .../libs/imageproperties/cameraitempropertiestab.h | 2 +- digikam/libs/imageproperties/imagedescedittab.cpp | 36 +-- digikam/libs/imageproperties/imagedescedittab.h | 2 +- .../imageproperties/imagepropertiescolorstab.cpp | 4 +- .../imageproperties/imagepropertiescolorstab.h | 2 +- .../imageproperties/imagepropertiesmetadatatab.cpp | 4 +- .../imageproperties/imagepropertiesmetadatatab.h | 2 +- .../imageproperties/imagepropertiessidebar.cpp | 10 +- .../libs/imageproperties/imagepropertiessidebar.h | 2 +- .../imagepropertiessidebarcamgui.cpp | 8 +- .../imageproperties/imagepropertiessidebarcamgui.h | 2 +- .../imageproperties/imagepropertiessidebardb.cpp | 8 +- .../imageproperties/imagepropertiessidebardb.h | 2 +- .../libs/imageproperties/imagepropertiestab.cpp | 4 +- digikam/libs/imageproperties/imagepropertiestab.h | 2 +- digikam/libs/imageproperties/navigatebartab.cpp | 6 +- digikam/libs/imageproperties/navigatebartab.h | 4 +- digikam/libs/imageproperties/navigatebarwidget.cpp | 4 +- digikam/libs/imageproperties/navigatebarwidget.h | 2 +- digikam/libs/imageproperties/talbumlistview.cpp | 20 +- digikam/libs/imageproperties/talbumlistview.h | 6 +- digikam/libs/lprof/cmspcoll.cpp | 10 +- digikam/libs/thumbbar/thumbbar.cpp | 8 +- digikam/libs/thumbbar/thumbbar.h | 4 +- .../libs/widgets/common/colorgradientwidget.cpp | 4 +- digikam/libs/widgets/common/colorgradientwidget.h | 2 +- digikam/libs/widgets/common/curveswidget.cpp | 8 +- digikam/libs/widgets/common/curveswidget.h | 4 +- digikam/libs/widgets/common/dcursortracker.cpp | 10 +- digikam/libs/widgets/common/dcursortracker.h | 4 +- digikam/libs/widgets/common/dlogoaction.cpp | 4 +- digikam/libs/widgets/common/dlogoaction.h | 2 +- digikam/libs/widgets/common/dpopupmenu.cpp | 4 +- digikam/libs/widgets/common/dpopupmenu.h | 2 +- digikam/libs/widgets/common/filesaveoptionsbox.cpp | 4 +- digikam/libs/widgets/common/filesaveoptionsbox.h | 2 +- digikam/libs/widgets/common/histogramwidget.cpp | 12 +- digikam/libs/widgets/common/histogramwidget.h | 6 +- digikam/libs/widgets/common/paniconwidget.cpp | 4 +- digikam/libs/widgets/common/paniconwidget.h | 2 +- digikam/libs/widgets/common/previewwidget.cpp | 4 +- digikam/libs/widgets/common/previewwidget.h | 2 +- digikam/libs/widgets/common/searchtextbar.cpp | 8 +- digikam/libs/widgets/common/searchtextbar.h | 4 +- digikam/libs/widgets/common/sidebar.cpp | 6 +- digikam/libs/widgets/common/sidebar.h | 4 +- digikam/libs/widgets/common/squeezedcombobox.cpp | 8 +- digikam/libs/widgets/common/squeezedcombobox.h | 10 +- digikam/libs/widgets/common/statusled.cpp | 4 +- digikam/libs/widgets/common/statusled.h | 2 +- digikam/libs/widgets/common/statusnavigatebar.cpp | 4 +- digikam/libs/widgets/common/statusnavigatebar.h | 2 +- digikam/libs/widgets/common/statusprogressbar.cpp | 4 +- digikam/libs/widgets/common/statusprogressbar.h | 2 +- digikam/libs/widgets/common/statuszoombar.cpp | 8 +- digikam/libs/widgets/common/statuszoombar.h | 4 +- .../libs/widgets/iccprofiles/cietonguewidget.cpp | 4 +- digikam/libs/widgets/iccprofiles/cietonguewidget.h | 2 +- .../libs/widgets/iccprofiles/iccpreviewwidget.cpp | 4 +- .../libs/widgets/iccprofiles/iccpreviewwidget.h | 2 +- .../libs/widgets/iccprofiles/iccprofilewidget.cpp | 4 +- .../libs/widgets/iccprofiles/iccprofilewidget.h | 2 +- .../libs/widgets/imageplugins/imageguidewidget.cpp | 4 +- .../libs/widgets/imageplugins/imageguidewidget.h | 2 +- .../libs/widgets/imageplugins/imagepanelwidget.cpp | 4 +- .../libs/widgets/imageplugins/imagepanelwidget.h | 2 +- .../widgets/imageplugins/imagepaniconwidget.cpp | 4 +- .../libs/widgets/imageplugins/imagepaniconwidget.h | 2 +- .../widgets/imageplugins/imagepannelwidget.cpp | 4 +- .../libs/widgets/imageplugins/imagepannelwidget.h | 2 +- .../widgets/imageplugins/imageregionwidget.cpp | 4 +- .../libs/widgets/imageplugins/imageregionwidget.h | 2 +- digikam/libs/widgets/imageplugins/imagewidget.cpp | 4 +- digikam/libs/widgets/imageplugins/imagewidget.h | 2 +- digikam/libs/widgets/metadata/exifwidget.cpp | 4 +- digikam/libs/widgets/metadata/exifwidget.h | 2 +- digikam/libs/widgets/metadata/gpswidget.cpp | 4 +- digikam/libs/widgets/metadata/gpswidget.h | 2 +- digikam/libs/widgets/metadata/iptcwidget.cpp | 4 +- digikam/libs/widgets/metadata/iptcwidget.h | 2 +- digikam/libs/widgets/metadata/makernotewidget.cpp | 4 +- digikam/libs/widgets/metadata/makernotewidget.h | 2 +- .../libs/widgets/metadata/mdkeylistviewitem.cpp | 4 +- digikam/libs/widgets/metadata/mdkeylistviewitem.h | 2 +- digikam/libs/widgets/metadata/metadatalistview.cpp | 6 +- digikam/libs/widgets/metadata/metadatalistview.h | 2 +- .../libs/widgets/metadata/metadatalistviewitem.cpp | 4 +- .../libs/widgets/metadata/metadatalistviewitem.h | 2 +- digikam/libs/widgets/metadata/metadatawidget.cpp | 4 +- digikam/libs/widgets/metadata/metadatawidget.h | 2 +- digikam/libs/widgets/metadata/worldmapwidget.cpp | 4 +- digikam/libs/widgets/metadata/worldmapwidget.h | 2 +- digikam/project/NEWS.0.9.0 | 4 +- digikam/project/NEWS.0.9.4 | 6 +- digikam/showfoto/setup/setup.cpp | 4 +- digikam/showfoto/setup/setup.h | 2 +- digikam/showfoto/setup/setupeditor.cpp | 14 +- digikam/showfoto/setup/setupeditor.h | 2 +- digikam/showfoto/setup/setuptooltip.cpp | 12 +- digikam/showfoto/setup/setuptooltip.h | 2 +- digikam/themedesigner/themediconitem.cpp | 4 +- digikam/themedesigner/themediconitem.h | 2 +- digikam/themedesigner/themediconview.cpp | 4 +- digikam/themedesigner/themediconview.h | 2 +- .../utilities/batch/batchalbumssyncmetadata.cpp | 4 +- digikam/utilities/batch/batchalbumssyncmetadata.h | 2 +- digikam/utilities/batch/batchsyncmetadata.cpp | 8 +- digikam/utilities/batch/batchsyncmetadata.h | 4 +- digikam/utilities/batch/batchthumbsgenerator.cpp | 4 +- digikam/utilities/batch/batchthumbsgenerator.h | 2 +- digikam/utilities/cameragui/albumselectdialog.cpp | 24 +- digikam/utilities/cameragui/albumselectdialog.h | 4 +- digikam/utilities/cameragui/animwidget.cpp | 4 +- digikam/utilities/cameragui/animwidget.h | 2 +- digikam/utilities/cameragui/cameracontroller.cpp | 70 ++--- digikam/utilities/cameragui/cameracontroller.h | 2 +- digikam/utilities/cameragui/camerafolderdialog.cpp | 4 +- digikam/utilities/cameragui/camerafolderdialog.h | 2 +- digikam/utilities/cameragui/camerafolderitem.cpp | 8 +- digikam/utilities/cameragui/camerafolderitem.h | 4 +- digikam/utilities/cameragui/camerafolderview.cpp | 6 +- digikam/utilities/cameragui/camerafolderview.h | 2 +- digikam/utilities/cameragui/cameraiconitem.cpp | 4 +- digikam/utilities/cameragui/cameraiconitem.h | 2 +- digikam/utilities/cameragui/cameraiconview.cpp | 4 +- digikam/utilities/cameragui/cameraiconview.h | 2 +- digikam/utilities/cameragui/camerainfodialog.cpp | 4 +- digikam/utilities/cameragui/camerainfodialog.h | 2 +- digikam/utilities/cameragui/cameraui.cpp | 10 +- digikam/utilities/cameragui/cameraui.h | 2 +- digikam/utilities/cameragui/freespacewidget.cpp | 4 +- digikam/utilities/cameragui/freespacewidget.h | 2 +- digikam/utilities/cameragui/renamecustomizer.cpp | 4 +- digikam/utilities/cameragui/renamecustomizer.h | 2 +- digikam/utilities/imageeditor/canvas/canvas.cpp | 12 +- digikam/utilities/imageeditor/canvas/canvas.h | 2 +- .../imageeditor/canvas/colorcorrectiondlg.cpp | 6 +- .../imageeditor/canvas/colorcorrectiondlg.h | 2 +- .../utilities/imageeditor/canvas/dimginterface.cpp | 40 +-- .../utilities/imageeditor/canvas/dimginterface.h | 2 +- .../utilities/imageeditor/canvas/imageplugin.cpp | 4 +- digikam/utilities/imageeditor/canvas/imageplugin.h | 2 +- .../imageeditor/canvas/imagepluginloader.cpp | 4 +- .../imageeditor/canvas/imagepluginloader.h | 2 +- .../imageeditor/editor/editorstackview.cpp | 4 +- .../utilities/imageeditor/editor/editorstackview.h | 2 +- .../utilities/imageeditor/editor/editortool.cpp | 8 +- digikam/utilities/imageeditor/editor/editortool.h | 4 +- .../imageeditor/editor/editortoolsettings.cpp | 4 +- .../imageeditor/editor/editortoolsettings.h | 2 +- .../utilities/imageeditor/editor/imageiface.cpp | 6 +- .../utilities/imageeditor/rawimport/rawimport.cpp | 4 +- .../utilities/imageeditor/rawimport/rawimport.h | 2 +- .../imageeditor/rawimport/rawpostprocessing.cpp | 4 +- .../imageeditor/rawimport/rawpostprocessing.h | 2 +- .../utilities/imageeditor/rawimport/rawpreview.cpp | 4 +- .../utilities/imageeditor/rawimport/rawpreview.h | 2 +- .../imageeditor/rawimport/rawsettingsbox.cpp | 4 +- .../imageeditor/rawimport/rawsettingsbox.h | 2 +- digikam/utilities/imageeditor/tools/imageprint.cpp | 12 +- digikam/utilities/imageeditor/tools/imageprint.h | 2 +- .../utilities/imageeditor/tools/imageresize.cpp | 20 +- digikam/utilities/imageeditor/tools/imageresize.h | 2 +- digikam/utilities/lighttable/lighttablebar.cpp | 8 +- digikam/utilities/lighttable/lighttablebar.h | 4 +- digikam/utilities/lighttable/lighttablepreview.cpp | 4 +- digikam/utilities/lighttable/lighttablepreview.h | 2 +- digikam/utilities/lighttable/lighttableview.cpp | 4 +- digikam/utilities/lighttable/lighttableview.h | 2 +- digikam/utilities/scripts/digitaglinktree | 8 +- digikam/utilities/scripts/digitaglinktree.1 | 2 +- digikam/utilities/setup/cameraselection.cpp | 4 +- digikam/utilities/setup/cameraselection.h | 2 +- digikam/utilities/setup/setup.cpp | 4 +- digikam/utilities/setup/setup.h | 2 +- digikam/utilities/setup/setupcamera.cpp | 6 +- digikam/utilities/setup/setupcamera.h | 2 +- digikam/utilities/setup/setupcollections.cpp | 6 +- digikam/utilities/setup/setupcollections.h | 2 +- digikam/utilities/setup/setupdcraw.cpp | 8 +- digikam/utilities/setup/setupdcraw.h | 2 +- digikam/utilities/setup/setupeditor.cpp | 10 +- digikam/utilities/setup/setupeditor.h | 2 +- digikam/utilities/setup/setupgeneral.cpp | 12 +- digikam/utilities/setup/setupgeneral.h | 2 +- digikam/utilities/setup/setupicc.cpp | 14 +- digikam/utilities/setup/setupicc.h | 2 +- digikam/utilities/setup/setupidentity.cpp | 12 +- digikam/utilities/setup/setupidentity.h | 2 +- digikam/utilities/setup/setupiofiles.cpp | 20 +- digikam/utilities/setup/setupiofiles.h | 2 +- digikam/utilities/setup/setuplighttable.cpp | 8 +- digikam/utilities/setup/setuplighttable.h | 2 +- digikam/utilities/setup/setupmetadata.cpp | 14 +- digikam/utilities/setup/setupmetadata.h | 2 +- digikam/utilities/setup/setupmime.cpp | 14 +- digikam/utilities/setup/setupmime.h | 2 +- digikam/utilities/setup/setupmisc.cpp | 6 +- digikam/utilities/setup/setupmisc.h | 2 +- digikam/utilities/setup/setupplugins.cpp | 10 +- digikam/utilities/setup/setupplugins.h | 2 +- digikam/utilities/setup/setupslideshow.cpp | 24 +- digikam/utilities/setup/setupslideshow.h | 2 +- digikam/utilities/setup/setuptooltip.cpp | 14 +- digikam/utilities/setup/setuptooltip.h | 2 +- digikam/utilities/slideshow/toolbar.cpp | 4 +- digikam/utilities/slideshow/toolbar.h | 2 +- 590 files changed, 1753 insertions(+), 1753 deletions(-) diff --git a/digikam/digikam/album.cpp b/digikam/digikam/album.cpp index 203bfbc1..11402d3c 100644 --- a/digikam/digikam/album.cpp +++ b/digikam/digikam/album.cpp @@ -56,16 +56,16 @@ Album::~Album() clear(); } -void Album::setParent(Album* tqparent) +void Album::setParent(Album* parent) { - if (tqparent) + if (parent) { - m_parent = tqparent; - tqparent->insertChild(this); + m_parent = parent; + parent->insertChild(this); } } -Album* Album::tqparent() const +Album* Album::parent() const { return m_parent; } @@ -234,7 +234,7 @@ bool Album::isAncestorOf(Album* album) const val = true; break; } - a = a->tqparent(); + a = a->parent(); } return val; } @@ -299,9 +299,9 @@ TQString PAlbum::url() const { return "/"; } - else if (tqparent()) + else if (parent()) { - u = ((PAlbum*)tqparent())->url(); + u = ((PAlbum*)parent())->url(); if (!u.endsWith("/")) u += '/'; } @@ -366,10 +366,10 @@ TQString TAlbum::tagPath(bool leadingSlash) const TQString u; - if (tqparent()) + if (parent()) { - u = ((TAlbum*)tqparent())->tagPath(leadingSlash); - if (!tqparent()->isRoot()) + u = ((TAlbum*)parent())->tagPath(leadingSlash); + if (!parent()->isRoot()) u += '/'; } @@ -393,9 +393,9 @@ KURL TAlbum::kurl() const { url.setPath("/"); } - else if (tqparent()) + else if (parent()) { - TAlbum *p = static_cast(tqparent()); + TAlbum *p = static_cast(parent()); url.setPath(p->kurl().path(1)); url.addPath(TQString::number(id())); } @@ -511,7 +511,7 @@ AlbumIterator& AlbumIterator::operator++() { while ( (album = m_current->next()) == 0 ) { - m_current = m_current->tqparent(); + m_current = m_current->parent(); if ( m_current == m_root ) { diff --git a/digikam/digikam/album.h b/digikam/digikam/album.h index ed5b1ec4..50960bc1 100644 --- a/digikam/digikam/album.h +++ b/digikam/digikam/album.h @@ -77,9 +77,9 @@ public: void clear(); /** - * @return the tqparent album for this album + * @return the parent album for this album */ - Album* tqparent() const; + Album* parent() const; /** * @return the first child of this album or 0 if no tqchildren @@ -157,7 +157,7 @@ public: bool isRoot() const; /** - * @return true if the @p album is in the tqparent hierarchy + * @return true if the @p album is in the parent hierarchy * * @param album Album to check whether it belongs in the child * hierarchy @@ -232,11 +232,11 @@ protected: /** * @internal use only * - * Set the tqparent of the album + * Set the parent of the album * - * @param tqparent set the tqparent album of album to @p tqparent + * @param parent set the parent album of album to @p parent */ - void setParent(Album* tqparent); + void setParent(Album* parent); /** * @internal use only diff --git a/digikam/digikam/albumdb.cpp b/digikam/digikam/albumdb.cpp index e0adbf2b..153eaa6a 100644 --- a/digikam/digikam/albumdb.cpp +++ b/digikam/digikam/albumdb.cpp @@ -1138,7 +1138,7 @@ IntList AlbumDB::getTagsFromTagPaths(const TQStringList &keywordsList, bool crea parentTag != currentTagsList.end(); ++parentTag ) { // check if name is the same, and if ID is identical - // to the tqparent ID we got from the child tag + // to the parent ID we got from the child tag if ( (*parentTag).id == parentID && (*parentTag).name == (*parentTagName) ) { @@ -1191,14 +1191,14 @@ IntList AlbumDB::getTagsFromTagPaths(const TQStringList &keywordsList, bool crea { tagID = 0; - // if the tqparent tag did not exist, we need not check if the child exists + // if the parent tag did not exist, we need not check if the child exists if (parentTagExisted) { for (TagInfo::List::iterator tag = currentTagsList.begin(); tag != currentTagsList.end(); ++tag ) { // find the tag with tag name according to tagHierarchy, - // and tqparent ID identical to the ID of the tag we found in + // and parent ID identical to the ID of the tag we found in // the previous run. if ((*tag).name == (*tagName) && (*tag).pid == parentTagID) { diff --git a/digikam/digikam/albumdb.h b/digikam/digikam/albumdb.h index 438f9f7d..9115684a 100644 --- a/digikam/digikam/albumdb.h +++ b/digikam/digikam/albumdb.h @@ -162,8 +162,8 @@ public: void deleteAlbum(int albumID); /** - * Adds a new tag to the database with given name, icon and tqparent id. - * @param parentTagID the id of the tag which will become the new tags tqparent + * Adds a new tag to the database with given name, icon and parent id. + * @param parentTagID the id of the tag which will become the new tags parent * @param name the name of the tag * @param iconKDE the name of the icon file (this is filename which kde * iconloader can load up) @@ -200,7 +200,7 @@ public: TQString getTagIcon(int tagID); /** - * Set the tqparent tagid for the tag. This is equivalent to reparenting + * Set the parent tagid for the tag. This is equivalent to reparenting * the tag * @param tagID the id of the tag * @param newParentTagID the new parentid for the tag diff --git a/digikam/digikam/albumfolderview.cpp b/digikam/digikam/albumfolderview.cpp index e390939c..a14e66e5 100644 --- a/digikam/digikam/albumfolderview.cpp +++ b/digikam/digikam/albumfolderview.cpp @@ -88,11 +88,11 @@ class AlbumFolderViewItem : public FolderItem public: - AlbumFolderViewItem(TQListView *tqparent, PAlbum *album); - AlbumFolderViewItem(TQListViewItem *tqparent, PAlbum *album); + AlbumFolderViewItem(TQListView *parent, PAlbum *album); + AlbumFolderViewItem(TQListViewItem *parent, PAlbum *album); // special group item (collection/dates) - AlbumFolderViewItem(TQListViewItem* tqparent, const TQString& name, + AlbumFolderViewItem(TQListViewItem* parent, const TQString& name, int year, int month); PAlbum* album() const; @@ -115,8 +115,8 @@ private: PAlbum *m_album; }; -AlbumFolderViewItem::AlbumFolderViewItem(TQListView *tqparent, PAlbum *album) - : FolderItem(tqparent, album->title()) +AlbumFolderViewItem::AlbumFolderViewItem(TQListView *parent, PAlbum *album) + : FolderItem(parent, album->title()) { setDragEnabled(true); m_album = album; @@ -124,8 +124,8 @@ AlbumFolderViewItem::AlbumFolderViewItem(TQListView *tqparent, PAlbum *album) m_count = 0; } -AlbumFolderViewItem::AlbumFolderViewItem(TQListViewItem *tqparent, PAlbum *album) - : FolderItem(tqparent, album->title()) +AlbumFolderViewItem::AlbumFolderViewItem(TQListViewItem *parent, PAlbum *album) + : FolderItem(parent, album->title()) { setDragEnabled(true); m_album = album; @@ -134,9 +134,9 @@ AlbumFolderViewItem::AlbumFolderViewItem(TQListViewItem *tqparent, PAlbum *album } // special group item (collection/dates) -AlbumFolderViewItem::AlbumFolderViewItem(TQListViewItem* tqparent, const TQString& name, +AlbumFolderViewItem::AlbumFolderViewItem(TQListViewItem* parent, const TQString& name, int year, int month) - : FolderItem(tqparent, name, true) + : FolderItem(parent, name, true) { m_album = 0; m_year = year; @@ -150,7 +150,7 @@ void AlbumFolderViewItem::refresh() if (!m_album) return; if (AlbumSettings::instance()->getShowFolderTreeViewItemsCount() && - dynamic_cast(tqparent())) + dynamic_cast(parent())) { if (isOpen()) setText(0, TQString("%1 (%2)").tqarg(m_album->title()).tqarg(m_count)); @@ -258,8 +258,8 @@ public: TQValueList groupItems; }; -AlbumFolderView::AlbumFolderView(TQWidget *tqparent) - : FolderView(tqparent, "AlbumFolderView") +AlbumFolderView::AlbumFolderView(TQWidget *parent) + : FolderView(parent, "AlbumFolderView") { d = new AlbumFolderViewPriv(); d->albumMan = AlbumManager::instance(); @@ -344,16 +344,16 @@ void AlbumFolderView::slotTextFolderFilterChanged(const TQString& filter) if (!match) { // check if any of the parents match the search - Album* tqparent = palbum->tqparent(); - while (tqparent && !tqparent->isRoot()) + Album* parent = palbum->parent(); + while (parent && !parent->isRoot()) { - if (tqparent->title().lower().contains(search)) + if (parent->title().lower().contains(search)) { match = true; break; } - tqparent = tqparent->tqparent(); + parent = parent->parent(); } } @@ -408,16 +408,16 @@ void AlbumFolderView::slotAlbumAdded(Album *album) return; bool failed; - AlbumFolderViewItem* tqparent = findParent(palbum, failed); + AlbumFolderViewItem* parent = findParent(palbum, failed); if (failed) { - DWarning() << k_funcinfo << " Failed to find Album tqparent " + DWarning() << k_funcinfo << " Failed to find Album parent " << palbum->url() << endl; return; } AlbumFolderViewItem *item; - if (!tqparent) + if (!parent) { // root album item = new AlbumFolderViewItem(this, palbum); @@ -426,7 +426,7 @@ void AlbumFolderView::slotAlbumAdded(Album *album) } else { - item = new AlbumFolderViewItem(tqparent, palbum); + item = new AlbumFolderViewItem(parent, palbum); palbum->setExtraData(this, item); } @@ -448,7 +448,7 @@ void AlbumFolderView::slotAlbumDeleted(Album *album) AlbumFolderViewItem* item = (AlbumFolderViewItem*) palbum->extraData(this); if(item) { - AlbumFolderViewItem *itemParent = dynamic_cast(item->tqparent()); + AlbumFolderViewItem *itemParent = dynamic_cast(item->parent()); if(itemParent) itemParent->takeItem(item); @@ -469,8 +469,8 @@ void AlbumFolderView::slotAlbumRenamed(Album *album) AlbumFolderViewItem* item = (AlbumFolderViewItem*) palbum->extraData(this); if(item) item->refresh(); - if (item->tqparent()) - item->tqparent()->sort(); + if (item->parent()) + item->parent()->sort(); } void AlbumFolderView::slotAlbumsCleared() @@ -596,7 +596,7 @@ void AlbumFolderView::slotContextMenu(TQListViewItem *listitem, const TQPoint &, } // Root folder only shows "New Album..." - if(item && item->tqparent()) + if(item && item->parent()) { popmenu.insertItem(SmallIcon("pencil"), i18n("Rename..."), 14); popmenu.insertItem(SmallIcon("albumfolder-properties"), i18n("Album Properties..."), 11); @@ -740,14 +740,14 @@ void AlbumFolderView::albumNew(AlbumFolderViewItem *item) return; } - PAlbum *tqparent; + PAlbum *parent; if(!item) - tqparent = d->albumMan->findPAlbum(0); + parent = d->albumMan->findPAlbum(0); else - tqparent = item->album(); + parent = item->album(); - if (!tqparent) + if (!parent) return; TQString title; @@ -756,7 +756,7 @@ void AlbumFolderView::albumNew(AlbumFolderViewItem *item) TQDate date; TQStringList albumCollections; - if(!AlbumPropsEdit::createNew(tqparent, title, comments, date, collection, + if(!AlbumPropsEdit::createNew(parent, title, comments, date, collection, albumCollections)) return; @@ -768,7 +768,7 @@ void AlbumFolderView::albumNew(AlbumFolderViewItem *item) } TQString errMsg; - PAlbum* album = d->albumMan->createPAlbum(tqparent, title, comments, + PAlbum* album = d->albumMan->createPAlbum(parent, title, comments, date, collection, errMsg); if (!album) { @@ -985,7 +985,7 @@ bool AlbumFolderView::acceptDrop(const TQDropEvent *e) const if(itemDrag == itemDrop) return false; - // Dragging a tqparent on its child makes no sense + // Dragging a parent on its child makes no sense if(itemDrag && itemDrag->album()->isAncestorOf(itemDrop->album())) return false; @@ -1009,7 +1009,7 @@ bool AlbumFolderView::acceptDrop(const TQDropEvent *e) const } } - if(itemDrop && !itemDrop->tqparent()) + if(itemDrop && !itemDrop->parent()) { // Do not allow drop images on album root return false; @@ -1367,20 +1367,20 @@ void AlbumFolderView::albumImportFolder() return; } - PAlbum* tqparent = 0; + PAlbum* parent = 0; if(selectedItem()) { AlbumFolderViewItem *folderItem = dynamic_cast(selectedItem()); Album *album = folderItem->album(); if (album && album->type() == Album::PHYSICAL) { - tqparent = dynamic_cast(album); + parent = dynamic_cast(album); } } - if(!tqparent) - tqparent = dynamic_cast(d->albumMan->findPAlbum(0)); + if(!parent) + parent = dynamic_cast(d->albumMan->findPAlbum(0)); - TQString libraryPath = tqparent->folderPath(); + TQString libraryPath = parent->folderPath(); KFileDialog dlg(TQString(), "inode/directory", this, "importFolder", true); dlg.setCaption(i18n("Select folders to import")); @@ -1392,7 +1392,7 @@ void AlbumFolderView::albumImportFolder() if(urls.empty()) return; - KIO::Job* job = DIO::copy(urls, tqparent->kurl()); + KIO::Job* job = DIO::copy(urls, parent->kurl()); connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotDIOResult(KIO::Job *))); } @@ -1441,16 +1441,16 @@ AlbumFolderViewItem* AlbumFolderView::findParent(PAlbum* album, bool& failed) AlbumFolderViewItem* AlbumFolderView::findParentByFolder(PAlbum* album, bool& failed) { - AlbumFolderViewItem* tqparent = - (AlbumFolderViewItem*) album->tqparent()->extraData(this); - if (!tqparent) + AlbumFolderViewItem* parent = + (AlbumFolderViewItem*) album->parent()->extraData(this); + if (!parent) { failed = true; return 0; } failed = false; - return tqparent; + return parent; } AlbumFolderViewItem* AlbumFolderView::findParentByCollection(PAlbum* album, bool& failed) @@ -1461,7 +1461,7 @@ AlbumFolderViewItem* AlbumFolderView::findParentByCollection(PAlbum* album, bool if (collection.isEmpty() || !collectionList.contains(collection)) collection = i18n("Uncategorized Albums"); - AlbumFolderViewItem* tqparent = 0; + AlbumFolderViewItem* parent = 0; for (TQValueList::iterator it=d->groupItems.begin(); it != d->groupItems.end(); ++it) @@ -1469,20 +1469,20 @@ AlbumFolderViewItem* AlbumFolderView::findParentByCollection(PAlbum* album, bool AlbumFolderViewItem* groupItem = *it; if (groupItem->text(0) == collection) { - tqparent = groupItem; + parent = groupItem; break; } } - // Need to create a new tqparent item - if (!tqparent) + // Need to create a new parent item + if (!parent) { - tqparent = new AlbumFolderViewItem(firstChild(), collection, 0, 0); - d->groupItems.append(tqparent); + parent = new AlbumFolderViewItem(firstChild(), collection, 0, 0); + d->groupItems.append(parent); } failed = false; - return tqparent; + return parent; } AlbumFolderViewItem* AlbumFolderView::findParentByDate(PAlbum* album, bool& failed) @@ -1492,7 +1492,7 @@ AlbumFolderViewItem* AlbumFolderView::findParentByDate(PAlbum* album, bool& fail TQString timeString = TQString::number(date.year()) + ", " + KGlobal::locale()->calendar()->monthName(date, false); - AlbumFolderViewItem* tqparent = 0; + AlbumFolderViewItem* parent = 0; for (TQValueList::iterator it=d->groupItems.begin(); it != d->groupItems.end(); ++it) @@ -1500,21 +1500,21 @@ AlbumFolderViewItem* AlbumFolderView::findParentByDate(PAlbum* album, bool& fail AlbumFolderViewItem* groupItem = *it; if (groupItem->text(0) == timeString) { - tqparent = groupItem; + parent = groupItem; break; } } - // Need to create a new tqparent item - if (!tqparent) + // Need to create a new parent item + if (!parent) { - tqparent = new AlbumFolderViewItem(firstChild(), timeString, + parent = new AlbumFolderViewItem(firstChild(), timeString, date.year(), date.month()); - d->groupItems.append(tqparent); + d->groupItems.append(parent); } failed = false; - return tqparent; + return parent; } void AlbumFolderView::resort() @@ -1552,7 +1552,7 @@ void AlbumFolderView::reparentItem(AlbumFolderViewItem* folderItem) if (!album || album->isRoot()) return; - AlbumFolderViewItem* oldParent = dynamic_cast(folderItem->tqparent()); + AlbumFolderViewItem* oldParent = dynamic_cast(folderItem->parent()); bool failed; AlbumFolderViewItem* newParent = findParent(album, failed); @@ -1567,7 +1567,7 @@ void AlbumFolderView::reparentItem(AlbumFolderViewItem* folderItem) else removeItem(folderItem); - // insert into new tqparent + // insert into new parent if (newParent) newParent->insertItem(folderItem); else diff --git a/digikam/digikam/albumfolderview.h b/digikam/digikam/albumfolderview.h index 08a10d7e..0328a19f 100644 --- a/digikam/digikam/albumfolderview.h +++ b/digikam/digikam/albumfolderview.h @@ -54,7 +54,7 @@ class AlbumFolderView : public FolderView public: - AlbumFolderView(TQWidget *tqparent); + AlbumFolderView(TQWidget *parent); ~AlbumFolderView(); void albumImportFolder(); diff --git a/digikam/digikam/albumiconitem.cpp b/digikam/digikam/albumiconitem.cpp index 11d160b7..538bd6df 100644 --- a/digikam/digikam/albumiconitem.cpp +++ b/digikam/digikam/albumiconitem.cpp @@ -80,11 +80,11 @@ static void dateToString(const TQDateTime& datetime, TQString& str) str = KGlobal::locale()->formatDateTime(datetime, true, false); } -AlbumIconItem::AlbumIconItem(IconGroupItem* tqparent, ImageInfo* info) - : IconItem(tqparent) +AlbumIconItem::AlbumIconItem(IconGroupItem* parent, ImageInfo* info) + : IconItem(parent) { d = new AlbumIconItemPriv; - d->view = (AlbumIconView*) tqparent->iconView(); + d->view = (AlbumIconView*) parent->iconView(); d->info = info; } diff --git a/digikam/digikam/albumiconitem.h b/digikam/digikam/albumiconitem.h index be3c5ba6..1f743b60 100644 --- a/digikam/digikam/albumiconitem.h +++ b/digikam/digikam/albumiconitem.h @@ -48,7 +48,7 @@ class AlbumIconItem : public IconItem public: - AlbumIconItem(IconGroupItem* tqparent, ImageInfo* info); + AlbumIconItem(IconGroupItem* parent, ImageInfo* info); ~AlbumIconItem(); ImageInfo* imageInfo() const; diff --git a/digikam/digikam/albumiconview.cpp b/digikam/digikam/albumiconview.cpp index c35f6786..e597c8ab 100644 --- a/digikam/digikam/albumiconview.cpp +++ b/digikam/digikam/albumiconview.cpp @@ -191,8 +191,8 @@ public: AlbumFileTip *toolTip; }; -AlbumIconView::AlbumIconView(TQWidget* tqparent) - : IconView(tqparent) +AlbumIconView::AlbumIconView(TQWidget* parent) + : IconView(parent) { d = new AlbumIconViewPrivate; d->init(); @@ -778,14 +778,14 @@ void AlbumIconView::slotRightButtonClicked(IconItem *item, const TQPoint& pos) case 20: // goto album { - // send a signal to the tqparent widget (digikamview.cpp) + // send a signal to the parent widget (digikamview.cpp) emit signalGotoAlbumAndItem(iconItem); break; } case 21: // goto date { - // send a signal to the tqparent widget (digikamview.cpp) + // send a signal to the parent widget (digikamview.cpp) emit signalGotoDateAndItem(iconItem); break; } @@ -2216,7 +2216,7 @@ void AlbumIconView::slotAlbumModified() void AlbumIconView::slotGotoTag(int tagID) { - // send a signal to the tqparent widget (digikamview.cpp) to change + // send a signal to the parent widget (digikamview.cpp) to change // to Tag view and the corresponding item emit signalGotoTagAndItem(tagID); diff --git a/digikam/digikam/albumiconview.h b/digikam/digikam/albumiconview.h index f1b99aef..3ef33042 100644 --- a/digikam/digikam/albumiconview.h +++ b/digikam/digikam/albumiconview.h @@ -67,7 +67,7 @@ class AlbumIconView : public IconView, public: - AlbumIconView(TQWidget* tqparent); + AlbumIconView(TQWidget* parent); ~AlbumIconView(); void setAlbum(Album* album); diff --git a/digikam/digikam/albumiconviewfilter.cpp b/digikam/digikam/albumiconviewfilter.cpp index 32e16fd1..7eaac19b 100644 --- a/digikam/digikam/albumiconviewfilter.cpp +++ b/digikam/digikam/albumiconviewfilter.cpp @@ -66,8 +66,8 @@ public: RatingFilter *ratingFilter; }; -AlbumIconViewFilter::AlbumIconViewFilter(TQWidget* tqparent) - : TQHBox(tqparent) +AlbumIconViewFilter::AlbumIconViewFilter(TQWidget* parent) + : TQHBox(parent) { d = new AlbumIconViewFilterPriv; diff --git a/digikam/digikam/albumiconviewfilter.h b/digikam/digikam/albumiconviewfilter.h index 16ce7141..92396d31 100644 --- a/digikam/digikam/albumiconviewfilter.h +++ b/digikam/digikam/albumiconviewfilter.h @@ -48,7 +48,7 @@ class AlbumIconViewFilter : public TQHBox public: - AlbumIconViewFilter(TQWidget* tqparent); + AlbumIconViewFilter(TQWidget* parent); ~AlbumIconViewFilter(); void readSettings(); diff --git a/digikam/digikam/albummanager.cpp b/digikam/digikam/albummanager.cpp index f164c92f..4933f0ae 100644 --- a/digikam/digikam/albummanager.cpp +++ b/digikam/digikam/albummanager.cpp @@ -471,7 +471,7 @@ void AlbumManager::scanPAlbums() // this might look like there is memory leak here, since removePAlbum // doesn't delete albums and looks like child Albums don't get deleted. - // But when the tqparent album gets deleted, the tqchildren are also deleted. + // But when the parent album gets deleted, the tqchildren are also deleted. PAlbum* album = d->pAlbumDict.find(it.key()); if (!album) @@ -493,13 +493,13 @@ void AlbumManager::scanPAlbums() KURL u; u.setPath(info.url); TQString name = u.fileName(); - // Get its tqparent + // Get its parent TQString purl = u.upURL().path(-1); - PAlbum* tqparent = d->pAlbumDict.find(purl); - if (!tqparent) + PAlbum* parent = d->pAlbumDict.find(purl); + if (!parent) { - DWarning() << k_funcinfo << "Could not find tqparent with url: " + DWarning() << k_funcinfo << "Could not find parent with url: " << purl << " for: " << info.url << endl; continue; } @@ -511,7 +511,7 @@ void AlbumManager::scanPAlbums() album->m_date = info.date; album->m_icon = info.icon; - album->setParent(tqparent); + album->setParent(parent); d->dirWatch->addDir(album->folderPath()); insertPAlbum(album); @@ -573,7 +573,7 @@ void AlbumManager::scanTAlbums() TagInfo::List tList = d->db->scanTags(); // sort the list. needed because we want the tags can be read in any order, - // but we want to make sure that we are ensure to find the tqparent TAlbum + // but we want to make sure that we are ensure to find the parent TAlbum // for a new TAlbum { @@ -603,14 +603,14 @@ void AlbumManager::scanTAlbums() if (album->m_id == 0) continue; - TAlbum* tqparent = tagDict.find(album->m_pid); - if (tqparent) + TAlbum* parent = tagDict.find(album->m_pid); + if (parent) { - album->setParent(tqparent); + album->setParent(parent); } else { - DWarning() << "Failed to find tqparent tag for tag " + DWarning() << "Failed to find parent tag for tag " << iter.current()->m_title << " with pid " << iter.current()->m_pid << endl; @@ -643,26 +643,26 @@ void AlbumManager::scanTAlbums() if (tmap.contains(info.id)) continue; - // Its a new album. Find the tqparent of the album + // Its a new album. Find the parent of the album TagMap::iterator iter = tmap.find(info.pid); if (iter == tmap.end()) { - DWarning() << "Failed to find tqparent tag for tag " + DWarning() << "Failed to find parent tag for tag " << info.name << " with pid " << info.pid << endl; continue; } - TAlbum* tqparent = iter.data(); + TAlbum* parent = iter.data(); // Create the new TAlbum TAlbum* album = new TAlbum(info.name, info.id, false); album->m_icon = info.icon; - album->setParent(tqparent); + album->setParent(parent); insertTAlbum(album); - // also insert it in the map we are doing lookup of tqparent tags + // also insert it in the map we are doing lookup of parent tags tmap.insert(info.id, album); } @@ -917,16 +917,16 @@ TAlbum* AlbumManager::findTAlbum(const TQString &tagPath) const } -PAlbum* AlbumManager::createPAlbum(PAlbum* tqparent, +PAlbum* AlbumManager::createPAlbum(PAlbum* parent, const TQString& name, const TQString& caption, const TQDate& date, const TQString& collection, TQString& errMsg) { - if (!tqparent) + if (!parent) { - errMsg = i18n("No tqparent found for album."); + errMsg = i18n("No parent found for album."); return 0; } @@ -944,7 +944,7 @@ PAlbum* AlbumManager::createPAlbum(PAlbum* tqparent, } // first check if we have another album with the same name - Album *child = tqparent->m_firstChild; + Album *child = parent->m_firstChild; while (child) { if (child->title() == name) @@ -955,7 +955,7 @@ PAlbum* AlbumManager::createPAlbum(PAlbum* tqparent, child = child->m_next; } - TQString path = tqparent->folderPath(); + TQString path = parent->folderPath(); path += '/' + name; path = TQDir::cleanDirPath(path); @@ -992,7 +992,7 @@ PAlbum* AlbumManager::createPAlbum(PAlbum* tqparent, album->m_collection = collection; album->m_date = date; - album->setParent(tqparent); + album->setParent(parent); d->dirWatch->addDir(album->folderPath()); @@ -1105,12 +1105,12 @@ bool AlbumManager::updatePAlbumIcon(PAlbum *album, TQ_LLONG iconID, TQString& er return true; } -TAlbum* AlbumManager::createTAlbum(TAlbum* tqparent, const TQString& name, +TAlbum* AlbumManager::createTAlbum(TAlbum* parent, const TQString& name, const TQString& iconkde, TQString& errMsg) { - if (!tqparent) + if (!parent) { - errMsg = i18n("No tqparent found for tag"); + errMsg = i18n("No parent found for tag"); return 0; } @@ -1128,7 +1128,7 @@ TAlbum* AlbumManager::createTAlbum(TAlbum* tqparent, const TQString& name, } // first check if we have another album with the same name - Album *child = tqparent->m_firstChild; + Album *child = parent->m_firstChild; while (child) { if (child->title() == name) @@ -1139,7 +1139,7 @@ TAlbum* AlbumManager::createTAlbum(TAlbum* tqparent, const TQString& name, child = child->m_next; } - int id = d->db->addTag(tqparent->id(), name, iconkde, 0); + int id = d->db->addTag(parent->id(), name, iconkde, 0); if (id == -1) { errMsg = i18n("Failed to add tag to database"); @@ -1148,7 +1148,7 @@ TAlbum* AlbumManager::createTAlbum(TAlbum* tqparent, const TQString& name, TAlbum *album = new TAlbum(name, id, false); album->m_icon = iconkde; - album->setParent(tqparent); + album->setParent(parent); insertTAlbum(album); @@ -1263,7 +1263,7 @@ bool AlbumManager::moveTAlbum(TAlbum* album, TAlbum *newParent, TQString &errMsg } d->db->setTagParentID(album->id(), newParent->id()); - album->tqparent()->removeChild(album); + album->parent()->removeChild(album); album->setParent(newParent); emit signalTAlbumMoved(album, newParent); diff --git a/digikam/digikam/albummanager.h b/digikam/digikam/albummanager.h index 63c7e03c..354fe87f 100644 --- a/digikam/digikam/albummanager.h +++ b/digikam/digikam/albummanager.h @@ -237,14 +237,14 @@ public: */ //@{ /** - * Create a new PAlbum with supplied properties as a child of the tqparent + * Create a new PAlbum with supplied properties as a child of the parent * This is equivalent to creating a new folder on the disk with supplied - * name in the tqparent's folder path. Also the supplied attributes are written + * name in the parent's folder path. Also the supplied attributes are written * out to the database * \note the signalAlbumAdded will be fired before this function returns. Its * recommended to connect to that signal to get notification of new album added * @return the newly created PAlbum or 0 if it fails - * @param tqparent the tqparent album under which to create the new Album + * @param parent the parent album under which to create the new Album * @param name the name of the new album * @param caption the caption for the new album * @param date the date for the new album @@ -252,7 +252,7 @@ public: * @param errMsg this will contain the error message describing why the * operation failed */ - PAlbum* createPAlbum(PAlbum* tqparent, const TQString& name, + PAlbum* createPAlbum(PAlbum* parent, const TQString& name, const TQString& caption, const TQDate& date, const TQString& collection, TQString& errMsg); @@ -285,19 +285,19 @@ public: */ //@{ /** - * Create a new TAlbum with supplied properties as a child of the tqparent + * Create a new TAlbum with supplied properties as a child of the parent * The tag is added to the database * \note the signalAlbumAdded will be fired before this function returns. Its * recommended to connect to that signal to get notification of new album added * @return the newly created TAlbum or 0 if it fails - * @param tqparent the tqparent album under which to create the new Album + * @param parent the parent album under which to create the new Album * @param name the name of the new album * @param iconkde the iconkde for the new album (this is a filename which * kde iconloader can load up * @param errMsg this will contain the error message describing why the * operation failed */ - TAlbum* createTAlbum(TAlbum* tqparent, const TQString& name, + TAlbum* createTAlbum(TAlbum* parent, const TQString& name, const TQString& iconkde, TQString& errMsg); /** @@ -332,8 +332,8 @@ public: bool renameTAlbum(TAlbum* album, const TQString& name, TQString& errMsg); /** - * Move a TAlbum to a new tqparent. - * This updates the tag tqparent ID in the database + * Move a TAlbum to a new parent. + * This updates the tag parent ID in the database * @return true if the operation succeeds, false otherwise * @param album the Album which should be moved * @param newParent the Parent Album to which album should be moved diff --git a/digikam/digikam/albumpropsedit.cpp b/digikam/digikam/albumpropsedit.cpp index 3c0d32bf..ba755ac6 100644 --- a/digikam/digikam/albumpropsedit.cpp +++ b/digikam/digikam/albumpropsedit.cpp @@ -306,14 +306,14 @@ bool AlbumPropsEdit::editProps(PAlbum *album, TQString& title, return ok; } -bool AlbumPropsEdit::createNew(PAlbum *tqparent, +bool AlbumPropsEdit::createNew(PAlbum *parent, TQString& title, TQString& comments, TQDate& date, TQString& collection, TQStringList& albumCollections) { - AlbumPropsEdit dlg(tqparent, true); + AlbumPropsEdit dlg(parent, true); bool ok = dlg.exec() == TQDialog::Accepted; diff --git a/digikam/digikam/albumpropsedit.h b/digikam/digikam/albumpropsedit.h index 072a653a..a7fe0c9b 100644 --- a/digikam/digikam/albumpropsedit.h +++ b/digikam/digikam/albumpropsedit.h @@ -65,7 +65,7 @@ public: TQString& collection, TQStringList& albumCollections); - static bool createNew(PAlbum *tqparent, + static bool createNew(PAlbum *parent, TQString& title, TQString& comments, TQDate& date, diff --git a/digikam/digikam/albumwidgetstack.cpp b/digikam/digikam/albumwidgetstack.cpp index 8ab349ee..1b8865b9 100644 --- a/digikam/digikam/albumwidgetstack.cpp +++ b/digikam/digikam/albumwidgetstack.cpp @@ -66,8 +66,8 @@ public: MediaPlayerView *mediaPlayerView; }; -AlbumWidgetStack::AlbumWidgetStack(TQWidget *tqparent) - : TQWidgetStack(tqparent, 0, TQt::WDestructiveClose) +AlbumWidgetStack::AlbumWidgetStack(TQWidget *parent) + : TQWidgetStack(parent, 0, TQt::WDestructiveClose) { d = new AlbumWidgetStackPriv; diff --git a/digikam/digikam/albumwidgetstack.h b/digikam/digikam/albumwidgetstack.h index 77b039d7..7970fe25 100644 --- a/digikam/digikam/albumwidgetstack.h +++ b/digikam/digikam/albumwidgetstack.h @@ -62,7 +62,7 @@ public: public: - AlbumWidgetStack(TQWidget *tqparent=0); + AlbumWidgetStack(TQWidget *parent=0); ~AlbumWidgetStack(); AlbumIconView *albumIconView(); diff --git a/digikam/digikam/cameralist.cpp b/digikam/digikam/cameralist.cpp index 0c2edf2b..16c9e097 100644 --- a/digikam/digikam/cameralist.cpp +++ b/digikam/digikam/cameralist.cpp @@ -62,8 +62,8 @@ public: TQString file; }; -CameraList::CameraList(TQObject *tqparent, const TQString& file) - : TQObject(tqparent) +CameraList::CameraList(TQObject *parent, const TQString& file) + : TQObject(parent) { d = new CameraListPrivate; d->clist.setAutoDelete(true); diff --git a/digikam/digikam/cameralist.h b/digikam/digikam/cameralist.h index 0a8b7e73..71cfc6fa 100644 --- a/digikam/digikam/cameralist.h +++ b/digikam/digikam/cameralist.h @@ -45,7 +45,7 @@ class CameraList : public TQObject public: - CameraList(TQObject *tqparent, const TQString& file); + CameraList(TQObject *parent, const TQString& file); ~CameraList(); bool load(); diff --git a/digikam/digikam/datefolderview.cpp b/digikam/digikam/datefolderview.cpp index b5c1d45d..ef2a6a04 100644 --- a/digikam/digikam/datefolderview.cpp +++ b/digikam/digikam/datefolderview.cpp @@ -63,8 +63,8 @@ class DateFolderItem : public FolderItem public: - DateFolderItem(TQListView* tqparent, DAlbum* album); - DateFolderItem(TQListViewItem* tqparent, DAlbum* album); + DateFolderItem(TQListView* parent, DAlbum* album); + DateFolderItem(TQListViewItem* parent, DAlbum* album); ~DateFolderItem(); @@ -88,8 +88,8 @@ private: DAlbum *m_album; }; -DateFolderItem::DateFolderItem(TQListView* tqparent, DAlbum* album) - : FolderItem(tqparent, TQString(), true) +DateFolderItem::DateFolderItem(TQListView* parent, DAlbum* album) + : FolderItem(parent, TQString(), true) { m_count = 0; m_album = album; @@ -97,8 +97,8 @@ DateFolderItem::DateFolderItem(TQListView* tqparent, DAlbum* album) setText(0, m_name); } -DateFolderItem::DateFolderItem(TQListViewItem* tqparent, DAlbum* album) - : FolderItem(tqparent, TQString()) +DateFolderItem::DateFolderItem(TQListViewItem* parent, DAlbum* album) + : FolderItem(parent, TQString()) { m_count = 0; m_album = album; @@ -184,8 +184,8 @@ public: MonthWidget *monthview; }; -DateFolderView::DateFolderView(TQWidget* tqparent) - : TQVBox(tqparent, "DateFolderView") +DateFolderView::DateFolderView(TQWidget* parent) + : TQVBox(parent, "DateFolderView") { d = new DateFolderViewPriv; d->listview = new FolderView(this, "DateListView"); @@ -260,11 +260,11 @@ void DateFolderView::slotAlbumAdded(Album* a) } TQString yr = TQString::number(date.year()); - TQListViewItem* tqparent = findRootItemByYear(yr); + TQListViewItem* parent = findRootItemByYear(yr); - if (tqparent) + if (parent) { - DateFolderItem* item = new DateFolderItem(tqparent, album); + DateFolderItem* item = new DateFolderItem(parent, album); item->setPixmap(0, SmallIcon("date", AlbumSettings::instance()->getDefaultTreeIconSize())); album->setExtraData(this, item); } diff --git a/digikam/digikam/datefolderview.h b/digikam/digikam/datefolderview.h index b06c8576..837ad7ee 100644 --- a/digikam/digikam/datefolderview.h +++ b/digikam/digikam/datefolderview.h @@ -49,7 +49,7 @@ class DateFolderView : public TQVBox public: - DateFolderView(TQWidget* tqparent); + DateFolderView(TQWidget* parent); ~DateFolderView(); void setActive(bool val); diff --git a/digikam/digikam/dcopiface.cpp b/digikam/digikam/dcopiface.cpp index bd7f6b43..49f051d9 100644 --- a/digikam/digikam/dcopiface.cpp +++ b/digikam/digikam/dcopiface.cpp @@ -29,8 +29,8 @@ namespace Digikam { -DCOPIface::DCOPIface(TQObject *tqparent, const char *name) - : TQObject(tqparent, name), DCOPObject(name) +DCOPIface::DCOPIface(TQObject *parent, const char *name) + : TQObject(parent, name), DCOPObject(name) { } diff --git a/digikam/digikam/dcopiface.h b/digikam/digikam/dcopiface.h index b959c3a6..11ab4ab9 100644 --- a/digikam/digikam/dcopiface.h +++ b/digikam/digikam/dcopiface.h @@ -51,10 +51,10 @@ public: /** * Standard constructor. - * @param tqparent Parent object reference, passed to @ref TQObject constructor + * @param parent Parent object reference, passed to @ref TQObject constructor * @param name Specifis the name of the object, passed to @ref TQObject constructor */ - DCOPIface(TQObject *tqparent = 0, const char *name = 0); + DCOPIface(TQObject *parent = 0, const char *name = 0); /** * Standard destructor diff --git a/digikam/digikam/digikamfirstrun.cpp b/digikam/digikam/digikamfirstrun.cpp index 807a4504..602c14c4 100644 --- a/digikam/digikam/digikamfirstrun.cpp +++ b/digikam/digikam/digikamfirstrun.cpp @@ -72,9 +72,9 @@ namespace Digikam using namespace std; -DigikamFirstRun::DigikamFirstRun(KConfig* config, TQWidget* tqparent, +DigikamFirstRun::DigikamFirstRun(KConfig* config, TQWidget* parent, const char* name, bool modal, WFlags fl) - : KDialogBase(tqparent, name, modal, i18n( "Album Library Path" ), + : KDialogBase(parent, name, modal, i18n( "Album Library Path" ), Help|Ok|Cancel, Ok, true ) { diff --git a/digikam/digikam/digikamfirstrun.h b/digikam/digikam/digikamfirstrun.h index b796e855..d9a94919 100644 --- a/digikam/digikam/digikamfirstrun.h +++ b/digikam/digikam/digikamfirstrun.h @@ -48,7 +48,7 @@ class DIGIKAM_EXPORT DigikamFirstRun : public KDialogBase public: - DigikamFirstRun(KConfig* config, TQWidget* tqparent = 0, const char* name = 0, + DigikamFirstRun(KConfig* config, TQWidget* parent = 0, const char* name = 0, bool modal = true, WFlags fl = WDestructiveClose); ~DigikamFirstRun(); diff --git a/digikam/digikam/digikamview.cpp b/digikam/digikam/digikamview.cpp index cbc0ba1e..61f0e281 100644 --- a/digikam/digikam/digikamview.cpp +++ b/digikam/digikam/digikamview.cpp @@ -104,7 +104,7 @@ public: searchSearchBar = 0; tagFilterSearchBar = 0; splitter = 0; - tqparent = 0; + parent = 0; iconView = 0; folderView = 0; albumManager = 0; @@ -145,7 +145,7 @@ public: SearchTextBar *searchSearchBar; SearchTextBar *tagFilterSearchBar; - DigikamApp *tqparent; + DigikamApp *parent; AlbumIconView *iconView; AlbumFolderView *folderView; @@ -163,11 +163,11 @@ public: TagFilterView *tagFilterView; }; -DigikamView::DigikamView(TQWidget *tqparent) - : TQHBox(tqparent) +DigikamView::DigikamView(TQWidget *parent) + : TQHBox(parent) { d = new DigikamViewPriv; - d->tqparent = static_cast(tqparent); + d->parent = static_cast(parent); d->albumManager = AlbumManager::instance(); d->leftSideBar = new Sidebar(this, "Digikam Left Sidebar", Sidebar::Left); @@ -270,37 +270,37 @@ void DigikamView::setupConnections() { // -- DigikamApp connections ---------------------------------- - connect(d->tqparent, TQT_SIGNAL(signalEscapePressed()), + connect(d->parent, TQT_SIGNAL(signalEscapePressed()), this, TQT_SLOT(slotEscapePreview())); - connect(d->tqparent, TQT_SIGNAL(signalEscapePressed()), + connect(d->parent, TQT_SIGNAL(signalEscapePressed()), d->albumWidgetStack, TQT_SLOT(slotEscapePreview())); - connect(d->tqparent, TQT_SIGNAL(signalNextItem()), + connect(d->parent, TQT_SIGNAL(signalNextItem()), this, TQT_SLOT(slotNextItem())); - connect(d->tqparent, TQT_SIGNAL(signalPrevItem()), + connect(d->parent, TQT_SIGNAL(signalPrevItem()), this, TQT_SLOT(slotPrevItem())); - connect(d->tqparent, TQT_SIGNAL(signalFirstItem()), + connect(d->parent, TQT_SIGNAL(signalFirstItem()), this, TQT_SLOT(slotFirstItem())); - connect(d->tqparent, TQT_SIGNAL(signalLastItem()), + connect(d->parent, TQT_SIGNAL(signalLastItem()), this, TQT_SLOT(slotLastItem())); - connect(d->tqparent, TQT_SIGNAL(signalCopyAlbumItemsSelection()), + connect(d->parent, TQT_SIGNAL(signalCopyAlbumItemsSelection()), d->iconView, TQT_SLOT(slotCopy())); - connect(d->tqparent, TQT_SIGNAL(signalPasteAlbumItemsSelection()), + connect(d->parent, TQT_SIGNAL(signalPasteAlbumItemsSelection()), d->iconView, TQT_SLOT(slotPaste())); connect(this, TQT_SIGNAL(signalProgressBarMode(int, const TQString&)), - d->tqparent, TQT_SLOT(slotProgressBarMode(int, const TQString&))); + d->parent, TQT_SLOT(slotProgressBarMode(int, const TQString&))); connect(this, TQT_SIGNAL(signalProgressValue(int)), - d->tqparent, TQT_SLOT(slotProgressValue(int))); + d->parent, TQT_SLOT(slotProgressValue(int))); - connect(d->tqparent, TQT_SIGNAL(signalCancelButtonPressed()), + connect(d->parent, TQT_SIGNAL(signalCancelButtonPressed()), this, TQT_SLOT(slotCancelSlideShow())); // -- AlbumManager connections -------------------------------- @@ -356,10 +356,10 @@ void DigikamView::setupConnections() d->iconView, TQT_SLOT(slotAlbumModified())); connect(d->iconView, TQT_SIGNAL(signalProgressBarMode(int, const TQString&)), - d->tqparent, TQT_SLOT(slotProgressBarMode(int, const TQString&))); + d->parent, TQT_SLOT(slotProgressBarMode(int, const TQString&))); connect(d->iconView, TQT_SIGNAL(signalProgressValue(int)), - d->tqparent, TQT_SLOT(slotProgressValue(int))); + d->parent, TQT_SLOT(slotProgressValue(int))); // -- Sidebar Connections ------------------------------------- @@ -382,24 +382,24 @@ void DigikamView::setupConnections() d->rightSideBar, TQT_SLOT(slotNoCurrentItem())); connect(d->rightSideBar, TQT_SIGNAL(signalProgressBarMode(int, const TQString&)), - d->tqparent, TQT_SLOT(slotProgressBarMode(int, const TQString&))); + d->parent, TQT_SLOT(slotProgressBarMode(int, const TQString&))); connect(d->rightSideBar, TQT_SIGNAL(signalProgressValue(int)), - d->tqparent, TQT_SLOT(slotProgressValue(int))); + d->parent, TQT_SLOT(slotProgressValue(int))); connect(d->tagFilterView, TQT_SIGNAL(signalProgressBarMode(int, const TQString&)), - d->tqparent, TQT_SLOT(slotProgressBarMode(int, const TQString&))); + d->parent, TQT_SLOT(slotProgressBarMode(int, const TQString&))); connect(d->tagFilterView, TQT_SIGNAL(signalProgressValue(int)), - d->tqparent, TQT_SLOT(slotProgressValue(int))); + d->parent, TQT_SLOT(slotProgressValue(int))); connect(d->tagFolderView, TQT_SIGNAL(signalProgressBarMode(int, const TQString&)), - d->tqparent, TQT_SLOT(slotProgressBarMode(int, const TQString&))); + d->parent, TQT_SLOT(slotProgressBarMode(int, const TQString&))); connect(d->tagFolderView, TQT_SIGNAL(signalProgressValue(int)), - d->tqparent, TQT_SLOT(slotProgressValue(int))); + d->parent, TQT_SLOT(slotProgressValue(int))); - connect(d->tqparent, TQT_SIGNAL(signalResetTagFilters()), + connect(d->parent, TQT_SIGNAL(signalResetTagFilters()), d->tagFilterView, TQT_SLOT(slotResetTagFilters())); // -- Filter Bars Connections --------------------------------- @@ -820,16 +820,16 @@ void DigikamView::changeAlbumFromHistory(Album *album, TQWidget *widget) d->leftSideBar->setActiveTab(widget); - d->tqparent->enableAlbumBackwardHistory(!d->albumHistory->isBackwardEmpty()); - d->tqparent->enableAlbumForwardHistory(!d->albumHistory->isForwardEmpty()); + d->parent->enableAlbumBackwardHistory(!d->albumHistory->isBackwardEmpty()); + d->parent->enableAlbumForwardHistory(!d->albumHistory->isForwardEmpty()); } } void DigikamView::clearHistory() { d->albumHistory->clearHistory(); - d->tqparent->enableAlbumBackwardHistory(false); - d->tqparent->enableAlbumForwardHistory(false); + d->parent->enableAlbumBackwardHistory(false); + d->parent->enableAlbumForwardHistory(false); } void DigikamView::getBackwardHistory(TQStringList &titles) @@ -854,8 +854,8 @@ void DigikamView::slotSelectAlbum(const KURL &) AlbumFolderItem_Deprecated *item; item = static_cast(album->getViewItem()); mFolderView_Deprecated->setSelected(item); - d->tqparent->enableAlbumBackwardHistory(!d->albumHistory->isBackwardEmpty()); - d->tqparent->enableAlbumForwardHistory(!d->albumHistory->isForwardEmpty()); + d->parent->enableAlbumBackwardHistory(!d->albumHistory->isBackwardEmpty()); + d->parent->enableAlbumForwardHistory(!d->albumHistory->isForwardEmpty()); } */ } @@ -954,8 +954,8 @@ void DigikamView::slotAlbumSelected(Album* album) } d->albumHistory->addAlbum(album, d->leftSideBar->getActiveTab()); - d->tqparent->enableAlbumBackwardHistory(!d->albumHistory->isBackwardEmpty()); - d->tqparent->enableAlbumForwardHistory(!d->albumHistory->isForwardEmpty()); + d->parent->enableAlbumBackwardHistory(!d->albumHistory->isBackwardEmpty()); + d->parent->enableAlbumForwardHistory(!d->albumHistory->isForwardEmpty()); d->iconView->setAlbum(album); if (album->isRoot()) @@ -1080,25 +1080,25 @@ void DigikamView::toggleZoomActions() { if (d->albumWidgetStack->previewMode() == AlbumWidgetStack::PreviewImageMode) { - d->tqparent->enableZoomMinusAction(true); - d->tqparent->enableZoomPlusAction(true); + d->parent->enableZoomMinusAction(true); + d->parent->enableZoomPlusAction(true); if (d->albumWidgetStack->maxZoom()) - d->tqparent->enableZoomPlusAction(false); + d->parent->enableZoomPlusAction(false); if (d->albumWidgetStack->minZoom()) - d->tqparent->enableZoomMinusAction(false); + d->parent->enableZoomMinusAction(false); } else if (d->albumWidgetStack->previewMode() == AlbumWidgetStack::PreviewAlbumMode) { - d->tqparent->enableZoomMinusAction(true); - d->tqparent->enableZoomPlusAction(true); + d->parent->enableZoomMinusAction(true); + d->parent->enableZoomPlusAction(true); if (d->thumbSize >= ThumbnailSize::Huge) - d->tqparent->enableZoomPlusAction(false); + d->parent->enableZoomPlusAction(false); if (d->thumbSize <= ThumbnailSize::Small) - d->tqparent->enableZoomMinusAction(false); + d->parent->enableZoomMinusAction(false); } } @@ -1175,15 +1175,15 @@ void DigikamView::slotAlbumSyncPicturesMetadata() BatchSyncMetadata *syncMetadata = new BatchSyncMetadata(TQT_TQOBJECT(this), album); connect(syncMetadata, TQT_SIGNAL(signalProgressBarMode(int, const TQString&)), - d->tqparent, TQT_SLOT(slotProgressBarMode(int, const TQString&))); + d->parent, TQT_SLOT(slotProgressBarMode(int, const TQString&))); connect(syncMetadata, TQT_SIGNAL(signalProgressValue(int)), - d->tqparent, TQT_SLOT(slotProgressValue(int))); + d->parent, TQT_SLOT(slotProgressValue(int))); connect(syncMetadata, TQT_SIGNAL(signalComplete()), this, TQT_SLOT(slotAlbumSyncPicturesMetadataDone())); - connect(d->tqparent, TQT_SIGNAL(signalCancelButtonPressed()), + connect(d->parent, TQT_SIGNAL(signalCancelButtonPressed()), syncMetadata, TQT_SLOT(slotAbort())); syncMetadata->parseAlbum(); diff --git a/digikam/digikam/digikamview.h b/digikam/digikam/digikamview.h index 3e57ea69..982013b1 100644 --- a/digikam/digikam/digikamview.h +++ b/digikam/digikam/digikamview.h @@ -51,7 +51,7 @@ class DigikamView : public TQHBox public: - DigikamView(TQWidget *tqparent); + DigikamView(TQWidget *parent); ~DigikamView(); void applySettings(); diff --git a/digikam/digikam/firstrun.cpp b/digikam/digikam/firstrun.cpp index d471e737..f354d017 100644 --- a/digikam/digikam/firstrun.cpp +++ b/digikam/digikam/firstrun.cpp @@ -44,8 +44,8 @@ namespace Digikam { -FirstRunWidget::FirstRunWidget( TQWidget* tqparent ) - : TQWidget( tqparent ) +FirstRunWidget::FirstRunWidget( TQWidget* parent ) + : TQWidget( parent ) { setName( "FirstRunWidget" ); TQVBoxLayout *vtqlayout = new TQVBoxLayout( this, 0, 6 ); diff --git a/digikam/digikam/firstrun.h b/digikam/digikam/firstrun.h index cff54ced..90ca3403 100644 --- a/digikam/digikam/firstrun.h +++ b/digikam/digikam/firstrun.h @@ -46,7 +46,7 @@ class DIGIKAM_EXPORT FirstRunWidget : public TQWidget public: - FirstRunWidget( TQWidget* tqparent = 0 ); + FirstRunWidget( TQWidget* parent = 0 ); ~FirstRunWidget(); public: diff --git a/digikam/digikam/folderitem.cpp b/digikam/digikam/folderitem.cpp index ed7ba610..d6585293 100644 --- a/digikam/digikam/folderitem.cpp +++ b/digikam/digikam/folderitem.cpp @@ -40,15 +40,15 @@ namespace Digikam { -FolderItem::FolderItem(TQListView* tqparent, const TQString& text, bool special) - : TQListViewItem(tqparent, text) +FolderItem::FolderItem(TQListView* parent, const TQString& text, bool special) + : TQListViewItem(parent, text) { m_special = special; m_focus = false; } -FolderItem::FolderItem(TQListViewItem* tqparent, const TQString& text, bool special) - : TQListViewItem(tqparent, text) +FolderItem::FolderItem(TQListViewItem* parent, const TQString& text, bool special) + : TQListViewItem(parent, text) { m_special = special; m_focus = false; @@ -147,16 +147,16 @@ int FolderItem::id() const // ------------------------------------------------------------------------------------ -FolderCheckListItem::FolderCheckListItem(TQListView* tqparent, const TQString& text, +FolderCheckListItem::FolderCheckListItem(TQListView* parent, const TQString& text, TQCheckListItem::Type tt) - : TQCheckListItem(tqparent, text, tt) + : TQCheckListItem(parent, text, tt) { m_focus = false; } -FolderCheckListItem::FolderCheckListItem(TQListViewItem* tqparent, const TQString& text, +FolderCheckListItem::FolderCheckListItem(TQListViewItem* parent, const TQString& text, TQCheckListItem::Type tt) - : TQCheckListItem(tqparent, text, tt) + : TQCheckListItem(parent, text, tt) { m_focus = false; } diff --git a/digikam/digikam/folderitem.h b/digikam/digikam/folderitem.h index 4966a4b7..e99189a8 100644 --- a/digikam/digikam/folderitem.h +++ b/digikam/digikam/folderitem.h @@ -40,8 +40,8 @@ class DIGIKAM_EXPORT FolderItem : public TQListViewItem { public: - FolderItem(TQListView* tqparent, const TQString& text, bool special=false); - FolderItem(TQListViewItem* tqparent, const TQString& text, bool special=false); + FolderItem(TQListView* parent, const TQString& text, bool special=false); + FolderItem(TQListViewItem* parent, const TQString& text, bool special=false); virtual ~FolderItem(); @@ -67,9 +67,9 @@ class FolderCheckListItem : public TQCheckListItem { public: - FolderCheckListItem(TQListView* tqparent, const TQString& text, + FolderCheckListItem(TQListView* parent, const TQString& text, TQCheckListItem::Type tt); - FolderCheckListItem(TQListViewItem* tqparent, const TQString& text, + FolderCheckListItem(TQListViewItem* parent, const TQString& text, TQCheckListItem::Type tt); virtual ~FolderCheckListItem(); diff --git a/digikam/digikam/folderview.cpp b/digikam/digikam/folderview.cpp index b8ef84d1..2a3c152c 100644 --- a/digikam/digikam/folderview.cpp +++ b/digikam/digikam/folderview.cpp @@ -77,8 +77,8 @@ public: //----------------------------------------------------------------------------- -FolderView::FolderView(TQWidget *tqparent, const char *name) - : TQListView(tqparent, name) +FolderView::FolderView(TQWidget *parent, const char *name) + : TQListView(parent, name) { d = new FolderViewPriv; diff --git a/digikam/digikam/folderview.h b/digikam/digikam/folderview.h index 15a98f86..ebc6f29d 100644 --- a/digikam/digikam/folderview.h +++ b/digikam/digikam/folderview.h @@ -72,7 +72,7 @@ public: OmitRoot }; - FolderView(TQWidget *tqparent, const char *name = "FolderView"); + FolderView(TQWidget *parent, const char *name = "FolderView"); virtual ~FolderView(); void setActive(bool val); diff --git a/digikam/digikam/icongroupitem.cpp b/digikam/digikam/icongroupitem.cpp index 218017bc..51d91bc4 100644 --- a/digikam/digikam/icongroupitem.cpp +++ b/digikam/digikam/icongroupitem.cpp @@ -68,14 +68,14 @@ public: }; }; -IconGroupItem::IconGroupItem(IconView* tqparent) +IconGroupItem::IconGroupItem(IconView* parent) { d = new IconGroupItemPriv; - d->view = tqparent; + d->view = parent; m_next = 0; m_prev = 0; - tqparent->insertGroup(this); + parent->insertGroup(this); } IconGroupItem::~IconGroupItem() diff --git a/digikam/digikam/icongroupitem.h b/digikam/digikam/icongroupitem.h index e7e550fa..8a960a1f 100644 --- a/digikam/digikam/icongroupitem.h +++ b/digikam/digikam/icongroupitem.h @@ -45,7 +45,7 @@ class DIGIKAM_EXPORT IconGroupItem public: - IconGroupItem(IconView* tqparent); + IconGroupItem(IconView* parent); virtual ~IconGroupItem(); IconView* iconView() const; diff --git a/digikam/digikam/iconitem.cpp b/digikam/digikam/iconitem.cpp index 6a5d97cf..fb7ff2ea 100644 --- a/digikam/digikam/iconitem.cpp +++ b/digikam/digikam/iconitem.cpp @@ -35,8 +35,8 @@ namespace Digikam { -IconItem::IconItem(IconGroupItem* tqparent) - : m_group(tqparent) +IconItem::IconItem(IconGroupItem* parent) + : m_group(parent) { m_next = 0; m_prev = 0; diff --git a/digikam/digikam/iconitem.h b/digikam/digikam/iconitem.h index 69337090..6a3e1edd 100644 --- a/digikam/digikam/iconitem.h +++ b/digikam/digikam/iconitem.h @@ -46,7 +46,7 @@ class DIGIKAM_EXPORT IconItem public: - IconItem(IconGroupItem* tqparent); + IconItem(IconGroupItem* parent); virtual ~IconItem(); IconItem* nextItem() const; diff --git a/digikam/digikam/iconview.cpp b/digikam/digikam/iconview.cpp index 7c7b0357..d4e1eb83 100644 --- a/digikam/digikam/iconview.cpp +++ b/digikam/digikam/iconview.cpp @@ -133,8 +133,8 @@ public: }; }; -IconView::IconView(TQWidget* tqparent, const char* name) - : TQScrollView(tqparent, name, TQt::WStaticContents|TQt::WNoAutoErase) +IconView::IconView(TQWidget* parent, const char* name) + : TQScrollView(parent, name, TQt::WStaticContents|TQt::WNoAutoErase) { viewport()->setBackgroundMode(TQt::NoBackground); viewport()->setFocusProxy(this); diff --git a/digikam/digikam/iconview.h b/digikam/digikam/iconview.h index 1cdf9d88..f3ca3e2e 100644 --- a/digikam/digikam/iconview.h +++ b/digikam/digikam/iconview.h @@ -53,7 +53,7 @@ class DIGIKAM_EXPORT IconView : public TQScrollView public: - IconView(TQWidget* tqparent=0, const char* name=0); + IconView(TQWidget* parent=0, const char* name=0); virtual ~IconView(); IconGroupItem* firstGroup() const; diff --git a/digikam/digikam/imagepreviewview.cpp b/digikam/digikam/imagepreviewview.cpp index 305d5491..cbbf85c7 100644 --- a/digikam/digikam/imagepreviewview.cpp +++ b/digikam/digikam/imagepreviewview.cpp @@ -88,7 +88,7 @@ public: previewThread = 0; previewPreloadThread = 0; imageInfo = 0; - tqparent = 0; + parent = 0; hasPrev = false; hasNext = false; loadFullImageSize = false; @@ -121,14 +121,14 @@ public: PreviewLoadThread *previewThread; PreviewLoadThread *previewPreloadThread; - AlbumWidgetStack *tqparent; + AlbumWidgetStack *parent; }; -ImagePreviewView::ImagePreviewView(AlbumWidgetStack *tqparent) - : PreviewWidget(tqparent) +ImagePreviewView::ImagePreviewView(AlbumWidgetStack *parent) + : PreviewWidget(parent) { d = new ImagePreviewViewPriv; - d->tqparent = tqparent; + d->parent = parent; // get preview size from screen size, but limit from VGA to WTQXGA d->previewSize = TQMAX(KApplication::desktop()->height(), @@ -252,7 +252,7 @@ void ImagePreviewView::slotGotImagePreview(const LoadingDescription &description if (preview.isNull()) { - d->tqparent->setPreviewMode(AlbumWidgetStack::PreviewImageMode); + d->parent->setPreviewMode(AlbumWidgetStack::PreviewImageMode); TQPixmap pix(visibleWidth(), visibleHeight()); pix.fill(ThemeEngine::instance()->baseColor()); TQPainter p(&pix); @@ -265,7 +265,7 @@ void ImagePreviewView::slotGotImagePreview(const LoadingDescription &description p.end(); // three copies - but the image is small setImage(DImg(pix.convertToImage())); - d->tqparent->previewLoaded(); + d->parent->previewLoaded(); emit signalPreviewLoaded(false); } else @@ -273,9 +273,9 @@ void ImagePreviewView::slotGotImagePreview(const LoadingDescription &description DImg img(preview); if (AlbumSettings::instance()->getExifRotate()) d->previewThread->exifRotate(img, description.filePath); - d->tqparent->setPreviewMode(AlbumWidgetStack::PreviewImageMode); + d->parent->setPreviewMode(AlbumWidgetStack::PreviewImageMode); setImage(img); - d->tqparent->previewLoaded(); + d->parent->previewLoaded(); emit signalPreviewLoaded(true); } diff --git a/digikam/digikam/imagepreviewview.h b/digikam/digikam/imagepreviewview.h index bc67301c..40cf1971 100644 --- a/digikam/digikam/imagepreviewview.h +++ b/digikam/digikam/imagepreviewview.h @@ -53,7 +53,7 @@ Q_OBJECT public: - ImagePreviewView(AlbumWidgetStack *tqparent=0); + ImagePreviewView(AlbumWidgetStack *parent=0); ~ImagePreviewView(); void setLoadFullImageSize(bool b); diff --git a/digikam/digikam/kdateedit.cpp b/digikam/digikam/kdateedit.cpp index 6df09f21..868bef6b 100644 --- a/digikam/digikam/kdateedit.cpp +++ b/digikam/digikam/kdateedit.cpp @@ -46,8 +46,8 @@ namespace Digikam class DateValidator : public TQValidator { public: - DateValidator( const TQStringList &keywords, TQWidget* tqparent, const char* name = 0 ) - : TQValidator( TQT_TQOBJECT(tqparent), name ), mKeywords( keywords ) + DateValidator( const TQStringList &keywords, TQWidget* parent, const char* name = 0 ) + : TQValidator( TQT_TQOBJECT(parent), name ), mKeywords( keywords ) {} virtual State validate( TQString &str, int& ) const @@ -73,8 +73,8 @@ class DateValidator : public TQValidator TQStringList mKeywords; }; -KDateEdit::KDateEdit( TQWidget *tqparent, const char *name ) - : TQComboBox( true, tqparent, name ), +KDateEdit::KDateEdit( TQWidget *parent, const char *name ) + : TQComboBox( true, parent, name ), mReadOnly( false ), mDiscardNextMousePress( false ) { diff --git a/digikam/digikam/kdateedit.h b/digikam/digikam/kdateedit.h index 3395dc85..d0640f9f 100644 --- a/digikam/digikam/kdateedit.h +++ b/digikam/digikam/kdateedit.h @@ -60,7 +60,7 @@ class KDateEdit : public TQComboBox public: - KDateEdit( TQWidget *tqparent = 0, const char *name = 0 ); + KDateEdit( TQWidget *parent = 0, const char *name = 0 ); virtual ~KDateEdit(); /** diff --git a/digikam/digikam/kdatepickerpopup.cpp b/digikam/digikam/kdatepickerpopup.cpp index 47e87fca..dcf0bc04 100644 --- a/digikam/digikam/kdatepickerpopup.cpp +++ b/digikam/digikam/kdatepickerpopup.cpp @@ -40,9 +40,9 @@ namespace Digikam { -KDatePickerPopup::KDatePickerPopup(int items, const TQDate &date, TQWidget *tqparent, +KDatePickerPopup::KDatePickerPopup(int items, const TQDate &date, TQWidget *parent, const char *name) - : TQPopupMenu( tqparent, name ) + : TQPopupMenu( parent, name ) { mItems = items; mDatePicker = new KDatePicker( this ); diff --git a/digikam/digikam/kdatepickerpopup.h b/digikam/digikam/kdatepickerpopup.h index c2b3330e..0ab5145a 100644 --- a/digikam/digikam/kdatepickerpopup.h +++ b/digikam/digikam/kdatepickerpopup.h @@ -72,11 +72,11 @@ public: @param items List of all desirable items, separated with a bitwise OR. @param date Initial date of datepicker-widget. - @param tqparent The object's tqparent. + @param parent The object's parent. @param name The object's name. */ KDatePickerPopup(int items = 2, const TQDate &date = TQDate::tqcurrentDate(), - TQWidget *tqparent = 0, const char *name = 0); + TQWidget *parent = 0, const char *name = 0); /** @return A pointer to the private variable mDatePicker, an instance of diff --git a/digikam/digikam/kdatetimeedit.cpp b/digikam/digikam/kdatetimeedit.cpp index 54978924..fed7cee8 100644 --- a/digikam/digikam/kdatetimeedit.cpp +++ b/digikam/digikam/kdatetimeedit.cpp @@ -34,8 +34,8 @@ namespace Digikam { -KDateTimeEdit::KDateTimeEdit(TQWidget *tqparent, const char *name) - : TQHBox(tqparent, name) +KDateTimeEdit::KDateTimeEdit(TQWidget *parent, const char *name) + : TQHBox(parent, name) { m_datePopUp = new KDateEdit(this, "datepopup"); m_timePopUp = new TQTimeEdit(TQTime::currentTime(), this); diff --git a/digikam/digikam/kdatetimeedit.h b/digikam/digikam/kdatetimeedit.h index 33923297..bc84a861 100644 --- a/digikam/digikam/kdatetimeedit.h +++ b/digikam/digikam/kdatetimeedit.h @@ -55,10 +55,10 @@ public: /** * constructor - * @param tqparent the tqparent widget + * @param parent the parent widget * @param name the name of the widget */ - KDateTimeEdit(TQWidget *tqparent, const char *name); + KDateTimeEdit(TQWidget *parent, const char *name); /** * destructor diff --git a/digikam/digikam/kipiinterface.cpp b/digikam/digikam/kipiinterface.cpp index f679f0cb..50396581 100644 --- a/digikam/digikam/kipiinterface.cpp +++ b/digikam/digikam/kipiinterface.cpp @@ -538,8 +538,8 @@ bool DigikamImageCollection::operator==(ImageCollectionShared& imgCollection) //-- LibKipi interface ----------------------------------------------------------- -DigikamKipiInterface::DigikamKipiInterface( TQObject *tqparent, const char *name) - : KIPI::Interface( tqparent, name ) +DigikamKipiInterface::DigikamKipiInterface( TQObject *parent, const char *name) + : KIPI::Interface( parent, name ) { albumManager_ = AlbumManager::instance(); albumDB_ = albumManager_->albumDB(); diff --git a/digikam/digikam/kipiinterface.h b/digikam/digikam/kipiinterface.h index 930fbaac..b2ac7fab 100644 --- a/digikam/digikam/kipiinterface.h +++ b/digikam/digikam/kipiinterface.h @@ -158,7 +158,7 @@ class DigikamKipiInterface : public KIPI::Interface public: - DigikamKipiInterface( TQObject *tqparent, const char *name=0); + DigikamKipiInterface( TQObject *parent, const char *name=0); ~DigikamKipiInterface(); virtual KIPI::ImageCollection currentAlbum(); diff --git a/digikam/digikam/mediaplayerview.cpp b/digikam/digikam/mediaplayerview.cpp index 5ebe8e92..25a9a690 100644 --- a/digikam/digikam/mediaplayerview.cpp +++ b/digikam/digikam/mediaplayerview.cpp @@ -76,8 +76,8 @@ public: KParts::ReadOnlyPart *mediaPlayerPart; }; -MediaPlayerView::MediaPlayerView(TQWidget *tqparent) - : TQWidgetStack(tqparent, 0, TQt::WDestructiveClose) +MediaPlayerView::MediaPlayerView(TQWidget *parent) + : TQWidgetStack(parent, 0, TQt::WDestructiveClose) { d = new MediaPlayerViewPriv; diff --git a/digikam/digikam/mediaplayerview.h b/digikam/digikam/mediaplayerview.h index 90ada61a..13b17d14 100644 --- a/digikam/digikam/mediaplayerview.h +++ b/digikam/digikam/mediaplayerview.h @@ -48,7 +48,7 @@ Q_OBJECT public: - MediaPlayerView(TQWidget *tqparent=0); + MediaPlayerView(TQWidget *parent=0); ~MediaPlayerView(); void setMediaPlayerFromUrl(const KURL& url); diff --git a/digikam/digikam/mimefilter.cpp b/digikam/digikam/mimefilter.cpp index e794725d..35696e45 100644 --- a/digikam/digikam/mimefilter.cpp +++ b/digikam/digikam/mimefilter.cpp @@ -49,8 +49,8 @@ public: } }; -MimeFilter::MimeFilter(TQWidget* tqparent) - : TQComboBox(tqparent) +MimeFilter::MimeFilter(TQWidget* parent) + : TQComboBox(parent) { d = new MimeFilterPriv; insertItem( i18n("All Files"), AllFiles ); diff --git a/digikam/digikam/mimefilter.h b/digikam/digikam/mimefilter.h index 74e13500..62857440 100644 --- a/digikam/digikam/mimefilter.h +++ b/digikam/digikam/mimefilter.h @@ -55,7 +55,7 @@ public: public: - MimeFilter(TQWidget* tqparent); + MimeFilter(TQWidget* parent); ~MimeFilter(); void setMimeFilter(int filter); diff --git a/digikam/digikam/monthwidget.cpp b/digikam/digikam/monthwidget.cpp index 99b4b245..171e8ca9 100644 --- a/digikam/digikam/monthwidget.cpp +++ b/digikam/digikam/monthwidget.cpp @@ -77,8 +77,8 @@ public: struct Month days[42]; }; -MonthWidget::MonthWidget(TQWidget* tqparent) - : TQFrame(tqparent, 0, TQt::WNoAutoErase) +MonthWidget::MonthWidget(TQWidget* parent) + : TQFrame(parent, 0, TQt::WNoAutoErase) { d = new MonthWidgetPriv; init(); diff --git a/digikam/digikam/monthwidget.h b/digikam/digikam/monthwidget.h index a0bd353f..0333050c 100644 --- a/digikam/digikam/monthwidget.h +++ b/digikam/digikam/monthwidget.h @@ -44,7 +44,7 @@ class MonthWidget : public TQFrame public: - MonthWidget(TQWidget* tqparent); + MonthWidget(TQWidget* parent); ~MonthWidget(); void setYearMonth(int year, int month); diff --git a/digikam/digikam/ratingfilter.cpp b/digikam/digikam/ratingfilter.cpp index b1521aff..f9f6d8b5 100644 --- a/digikam/digikam/ratingfilter.cpp +++ b/digikam/digikam/ratingfilter.cpp @@ -68,8 +68,8 @@ public: AlbumLister::RatingCondition filterCond; }; -RatingFilter::RatingFilter(TQWidget* tqparent) - : RatingWidget(tqparent) +RatingFilter::RatingFilter(TQWidget* parent) + : RatingWidget(parent) { d = new RatingFilterPriv; @@ -81,7 +81,7 @@ RatingFilter::RatingFilter(TQWidget* tqparent) "albums contents. Use contextual pop-up menu to " "set rating filter condition.")); - // To dispatch signal from tqparent widget with filter condition. + // To dispatch signal from parent widget with filter condition. connect(this, TQT_SIGNAL(signalRatingChanged(int)), this, TQT_SLOT(slotRatingChanged())); } diff --git a/digikam/digikam/ratingfilter.h b/digikam/digikam/ratingfilter.h index 5fb467e6..6333bba5 100644 --- a/digikam/digikam/ratingfilter.h +++ b/digikam/digikam/ratingfilter.h @@ -42,7 +42,7 @@ class RatingFilter : public RatingWidget public: - RatingFilter(TQWidget* tqparent); + RatingFilter(TQWidget* parent); ~RatingFilter(); void setRatingFilterCondition(AlbumLister::RatingCondition cond); diff --git a/digikam/digikam/ratingpopupmenu.cpp b/digikam/digikam/ratingpopupmenu.cpp index 4b6f7453..86261a4d 100644 --- a/digikam/digikam/ratingpopupmenu.cpp +++ b/digikam/digikam/ratingpopupmenu.cpp @@ -44,8 +44,8 @@ namespace Digikam { -RatingPopupMenu::RatingPopupMenu(TQWidget* tqparent) - : TQPopupMenu(tqparent) +RatingPopupMenu::RatingPopupMenu(TQWidget* parent) + : TQPopupMenu(parent) { KGlobal::dirs()->addResourceType("digikam_rating", KGlobal::dirs()->kde_default("data") + "digikam/data"); TQString ratingPixPath = KGlobal::dirs()->findResourceDir("digikam_rating", "rating.png"); @@ -60,8 +60,8 @@ RatingPopupMenu::RatingPopupMenu(TQWidget* tqparent) { TQPixmap pix(starbm.width() * 5, starbm.height()); pix.fill(ThemeEngine::instance()->textSpecialRegColor()); - TQBitmap tqmask(starbm.width() * 5, starbm.height()); - TQPainter painter(&tqmask); + TQBitmap mask(starbm.width() * 5, starbm.height()); + TQPainter painter(&mask); painter.drawTiledPixmap(0, 0, i*starbm.width(), pix.height(), starbm); @@ -69,7 +69,7 @@ RatingPopupMenu::RatingPopupMenu(TQWidget* tqparent) 5*starbm.width()-i*starbm.width(), pix.height(), clearbm); painter.end(); - pix.setMask(tqmask); + pix.setMask(mask); insertItem(pix, i); } } diff --git a/digikam/digikam/ratingpopupmenu.h b/digikam/digikam/ratingpopupmenu.h index 0ed8a463..8623e269 100644 --- a/digikam/digikam/ratingpopupmenu.h +++ b/digikam/digikam/ratingpopupmenu.h @@ -40,7 +40,7 @@ class RatingPopupMenu : public TQPopupMenu public: - RatingPopupMenu(TQWidget* tqparent=0); + RatingPopupMenu(TQWidget* parent=0); ~RatingPopupMenu(); }; diff --git a/digikam/digikam/ratingwidget.cpp b/digikam/digikam/ratingwidget.cpp index b3c8e641..46c011ea 100644 --- a/digikam/digikam/ratingwidget.cpp +++ b/digikam/digikam/ratingwidget.cpp @@ -61,8 +61,8 @@ public: TQPixmap regPixmap; }; -RatingWidget::RatingWidget(TQWidget* tqparent) - : TQWidget(tqparent) +RatingWidget::RatingWidget(TQWidget* parent) + : TQWidget(parent) { d = new RatingWidgetPriv; diff --git a/digikam/digikam/ratingwidget.h b/digikam/digikam/ratingwidget.h index 81e24cbb..9841632b 100644 --- a/digikam/digikam/ratingwidget.h +++ b/digikam/digikam/ratingwidget.h @@ -41,7 +41,7 @@ class RatingWidget : public TQWidget public: - RatingWidget(TQWidget* tqparent); + RatingWidget(TQWidget* parent); virtual ~RatingWidget(); void setRating(int val); diff --git a/digikam/digikam/searchadvanceddialog.cpp b/digikam/digikam/searchadvanceddialog.cpp index 225f63cf..e7af5257 100644 --- a/digikam/digikam/searchadvanceddialog.cpp +++ b/digikam/digikam/searchadvanceddialog.cpp @@ -90,8 +90,8 @@ public: SearchResultsView *resultsView; }; -SearchAdvancedDialog::SearchAdvancedDialog(TQWidget* tqparent, KURL& url) - : KDialogBase(tqparent, 0, true, i18n("Advanced Search"), +SearchAdvancedDialog::SearchAdvancedDialog(TQWidget* parent, KURL& url) + : KDialogBase(parent, 0, true, i18n("Advanced Search"), Help|Ok|Cancel, Ok, true), m_url(url) { d = new SearchAdvancedDialogPriv; diff --git a/digikam/digikam/searchadvanceddialog.h b/digikam/digikam/searchadvanceddialog.h index 9a3a29ac..3ae5704a 100644 --- a/digikam/digikam/searchadvanceddialog.h +++ b/digikam/digikam/searchadvanceddialog.h @@ -57,10 +57,10 @@ public: /** * Constructor - * @param tqparent tqparent window + * @param parent parent window * @param url holds the url for the search */ - SearchAdvancedDialog(TQWidget* tqparent, KURL& url); + SearchAdvancedDialog(TQWidget* parent, KURL& url); /** * Destructor diff --git a/digikam/digikam/searchfolderview.cpp b/digikam/digikam/searchfolderview.cpp index 5ba8c414..a481e1e3 100644 --- a/digikam/digikam/searchfolderview.cpp +++ b/digikam/digikam/searchfolderview.cpp @@ -64,11 +64,11 @@ class SearchFolderItem : public FolderItem public: - SearchFolderItem(TQListView* tqparent, SAlbum* album) - : FolderItem(tqparent, album->title()), + SearchFolderItem(TQListView* parent, SAlbum* album) + : FolderItem(parent, album->title()), m_album(album) { - m_album->setExtraData(tqparent, this); + m_album->setExtraData(parent, this); } ~SearchFolderItem() @@ -102,8 +102,8 @@ private: SAlbum *m_album; }; -SearchFolderView::SearchFolderView(TQWidget* tqparent) - : FolderView(tqparent, "SearchFolderView") +SearchFolderView::SearchFolderView(TQWidget* parent) + : FolderView(parent, "SearchFolderView") { addColumn(i18n("My Searches")); setResizeMode(TQListView::LastColumn); diff --git a/digikam/digikam/searchfolderview.h b/digikam/digikam/searchfolderview.h index 91f095c2..309c1005 100644 --- a/digikam/digikam/searchfolderview.h +++ b/digikam/digikam/searchfolderview.h @@ -42,7 +42,7 @@ class SearchFolderView : public FolderView public: - SearchFolderView(TQWidget* tqparent); + SearchFolderView(TQWidget* parent); ~SearchFolderView(); void quickSearchNew(); diff --git a/digikam/digikam/searchquickdialog.cpp b/digikam/digikam/searchquickdialog.cpp index 17757552..1d2b7727 100644 --- a/digikam/digikam/searchquickdialog.cpp +++ b/digikam/digikam/searchquickdialog.cpp @@ -71,9 +71,9 @@ public: SearchResultsView *resultsView; }; -SearchQuickDialog::SearchQuickDialog(TQWidget* tqparent, KURL& url) +SearchQuickDialog::SearchQuickDialog(TQWidget* parent, KURL& url) : KDialogBase(Plain, i18n("Quick Search"), Help|Ok|Cancel, Ok, - tqparent, 0, true, true), m_url(url) + parent, 0, true, true), m_url(url) { d = new SearchQuickDialogPriv; d->timer = new TQTimer(this); diff --git a/digikam/digikam/searchquickdialog.h b/digikam/digikam/searchquickdialog.h index dff2e4cc..113694e8 100644 --- a/digikam/digikam/searchquickdialog.h +++ b/digikam/digikam/searchquickdialog.h @@ -57,10 +57,10 @@ public: /** * Constructor - * @param tqparent tqparent window + * @param parent parent window * @param url holds the url for the search */ - SearchQuickDialog(TQWidget* tqparent, KURL& url); + SearchQuickDialog(TQWidget* parent, KURL& url); /** * Destructor */ diff --git a/digikam/digikam/searchresultsview.cpp b/digikam/digikam/searchresultsview.cpp index 8d360623..b0edda2d 100644 --- a/digikam/digikam/searchresultsview.cpp +++ b/digikam/digikam/searchresultsview.cpp @@ -66,8 +66,8 @@ public: KIO::TransferJob* listJob; }; -SearchResultsView::SearchResultsView(TQWidget* tqparent) - : TQIconView(tqparent) +SearchResultsView::SearchResultsView(TQWidget* parent) + : TQIconView(parent) { d = new SearchResultsViewPriv; d->libraryPath = AlbumManager::instance()->getLibraryPath(); diff --git a/digikam/digikam/searchresultsview.h b/digikam/digikam/searchresultsview.h index b109d853..ef535108 100644 --- a/digikam/digikam/searchresultsview.h +++ b/digikam/digikam/searchresultsview.h @@ -56,7 +56,7 @@ class SearchResultsView : public TQIconView public: - SearchResultsView(TQWidget* tqparent); + SearchResultsView(TQWidget* parent); ~SearchResultsView(); void openURL(const KURL& url); diff --git a/digikam/digikam/searchwidgets.cpp b/digikam/digikam/searchwidgets.cpp index 2cb23ab9..6e2a00b6 100644 --- a/digikam/digikam/searchwidgets.cpp +++ b/digikam/digikam/searchwidgets.cpp @@ -111,9 +111,9 @@ RuleOpTable[] = { I18N_NOOP("Equals"), "EQ", SearchAdvancedRule::RATING }, }; -SearchRuleLabel::SearchRuleLabel(const TQString& text, TQWidget *tqparent, +SearchRuleLabel::SearchRuleLabel(const TQString& text, TQWidget *parent, const char *name, WFlags f ) - : TQLabel(text, tqparent, name, f) + : TQLabel(text, parent, name, f) { } @@ -122,10 +122,10 @@ void SearchRuleLabel::mouseDoubleClickEvent( TQMouseEvent * e ) emit signalDoubleClick( e ); } -SearchAdvancedRule::SearchAdvancedRule(TQWidget* tqparent, SearchAdvancedRule::Option option) +SearchAdvancedRule::SearchAdvancedRule(TQWidget* parent, SearchAdvancedRule::Option option) : SearchAdvancedBase(SearchAdvancedBase::RULE) { - m_box = new TQVBox(tqparent); + m_box = new TQVBox(parent); m_box->tqlayout()->setSpacing( KDialog::spacingHint() ); m_box->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); @@ -514,10 +514,10 @@ void SearchAdvancedRule::removeCheck() m_check = 0; } -SearchAdvancedGroup::SearchAdvancedGroup(TQWidget* tqparent) +SearchAdvancedGroup::SearchAdvancedGroup(TQWidget* parent) : SearchAdvancedBase(SearchAdvancedBase::GROUP) { - m_box = new TQHBox(tqparent); + m_box = new TQHBox(parent); m_box->tqlayout()->setSpacing(KDialog::spacingHint()); m_groupbox = new TQVGroupBox(m_box); m_check = new TQCheckBox(m_box); @@ -574,7 +574,7 @@ void SearchAdvancedGroup::removeRules() } rule->addCheck(); - rule->widget()->reparent((TQWidget*)m_box->tqparent(), TQPoint(0,0)); + rule->widget()->reparent((TQWidget*)m_box->parent(), TQPoint(0,0)); rule->widget()->show(); } diff --git a/digikam/digikam/searchwidgets.h b/digikam/digikam/searchwidgets.h index c501a6ff..288db6f0 100644 --- a/digikam/digikam/searchwidgets.h +++ b/digikam/digikam/searchwidgets.h @@ -60,12 +60,12 @@ public: /** Constructor. See for more info the TQLabel clas. * @param text Text of the label - * @param tqparent The tqparent widget + * @param parent The parent widget * @param name The name * @param f WFlags */ SearchRuleLabel(const TQString & text, - TQWidget * tqparent, + TQWidget * parent, const char * name=0, WFlags f=0 ); @@ -201,11 +201,11 @@ class SearchAdvancedRule : public SearchAdvancedBase public: /** * Constructor - * @param tqparent The tqparent + * @param parent The parent * @param option Holds the Option of the rule, see the enum. * */ - SearchAdvancedRule(TQWidget* tqparent, Option option); + SearchAdvancedRule(TQWidget* parent, Option option); /** * destructor @@ -332,9 +332,9 @@ class SearchAdvancedGroup : public SearchAdvancedBase public: /** * Constructor - * @param tqparent the tqparent + * @param parent the parent */ - SearchAdvancedGroup(TQWidget* tqparent); + SearchAdvancedGroup(TQWidget* parent); /** * Destructor diff --git a/digikam/digikam/tageditdlg.cpp b/digikam/digikam/tageditdlg.cpp index 323c42c8..9b56126a 100644 --- a/digikam/digikam/tageditdlg.cpp +++ b/digikam/digikam/tageditdlg.cpp @@ -54,7 +54,7 @@ class TagsListCreationErrorDialog : public KDialogBase public: - TagsListCreationErrorDialog(TQWidget* tqparent, const TQMap& errMap); + TagsListCreationErrorDialog(TQWidget* parent, const TQMap& errMap); ~TagsListCreationErrorDialog(){}; }; @@ -87,8 +87,8 @@ public: SearchTextBar *titleEdit; }; -TagEditDlg::TagEditDlg(TQWidget *tqparent, TAlbum* album, bool create) - : KDialogBase(tqparent, 0, true, 0, Help|Ok|Cancel, Ok, true) +TagEditDlg::TagEditDlg(TQWidget *parent, TAlbum* album, bool create) + : KDialogBase(parent, 0, true, 0, Help|Ok|Cancel, Ok, true) { d = new TagEditDlgPriv; d->mainRootAlbum = album; @@ -127,7 +127,7 @@ TagEditDlg::TagEditDlg(TQWidget *tqparent, TAlbum* album, bool create) "Ex.: \"Country/City/Paris\"" "
  • ',' can be used to create more than one tags hierarchy at the same time.
    " "Ex.: \"City/Paris, Monument/Notre-Dame\"
    • " - "
  • If a tag hierarchy starts with '/', root tag album is used as tqparent.

    • " + "
  • If a tag hierarchy starts with '/', root tag album is used as parent.

    • " )); if (d->create) @@ -152,7 +152,7 @@ TagEditDlg::TagEditDlg(TQWidget *tqparent, TAlbum* album, bool create) d->iconButton->setFixedSize(40, 40); iconTextLabel->setBuddy(d->iconButton); - // In create mode, by default assign the icon of the tqparent (if not root) to this new tag. + // In create mode, by default assign the icon of the parent (if not root) to this new tag. if (d->create && !d->mainRootAlbum->isRoot()) d->icon = d->mainRootAlbum->icon(); else @@ -262,9 +262,9 @@ void TagEditDlg::slotTitleChanged(const TQString& newtitle) enableButtonOK(!newtitle.isEmpty()); } -bool TagEditDlg::tagEdit(TQWidget *tqparent, TAlbum* album, TQString& title, TQString& icon) +bool TagEditDlg::tagEdit(TQWidget *parent, TAlbum* album, TQString& title, TQString& icon) { - TagEditDlg dlg(tqparent, album); + TagEditDlg dlg(parent, album); bool valRet = dlg.exec(); if (valRet == TQDialog::Accepted) @@ -276,9 +276,9 @@ bool TagEditDlg::tagEdit(TQWidget *tqparent, TAlbum* album, TQString& title, TQS return valRet; } -bool TagEditDlg::tagCreate(TQWidget *tqparent, TAlbum* album, TQString& title, TQString& icon) +bool TagEditDlg::tagCreate(TQWidget *parent, TAlbum* album, TQString& title, TQString& icon) { - TagEditDlg dlg(tqparent, album, true); + TagEditDlg dlg(parent, album, true); bool valRet = dlg.exec(); if (valRet == TQDialog::Accepted) @@ -366,19 +366,19 @@ AlbumList TagEditDlg::createTAlbum(TAlbum *mainRootAlbum, const TQString& tagStr return createdTagsList; } -void TagEditDlg::showtagsListCreationError(TQWidget* tqparent, const TQMap& errMap) +void TagEditDlg::showtagsListCreationError(TQWidget* parent, const TQMap& errMap) { if (!errMap.isEmpty()) { - TagsListCreationErrorDialog dlg(tqparent, errMap); + TagsListCreationErrorDialog dlg(parent, errMap); dlg.exec(); } } // ------------------------------------------------------------------------------ -TagsListCreationErrorDialog::TagsListCreationErrorDialog(TQWidget* tqparent, const TQMap& errMap) - : KDialogBase(tqparent, 0, true, 0, Help|Ok, Ok, false) +TagsListCreationErrorDialog::TagsListCreationErrorDialog(TQWidget* parent, const TQMap& errMap) + : KDialogBase(parent, 0, true, 0, Help|Ok, Ok, false) { setHelp("tagscreation.anchor", "digikam"); setCaption(i18n("Tag creation Error")); diff --git a/digikam/digikam/tageditdlg.h b/digikam/digikam/tageditdlg.h index 18aada08..61327f59 100644 --- a/digikam/digikam/tageditdlg.h +++ b/digikam/digikam/tageditdlg.h @@ -49,26 +49,26 @@ class TagEditDlg : public KDialogBase public: - TagEditDlg(TQWidget *tqparent, TAlbum* album, bool create=false); + TagEditDlg(TQWidget *parent, TAlbum* album, bool create=false); ~TagEditDlg(); TQString title() const; TQString icon() const; - static bool tagEdit(TQWidget *tqparent, TAlbum* album, TQString& title, TQString& icon); - static bool tagCreate(TQWidget *tqparent, TAlbum* album, TQString& title, TQString& icon); + static bool tagEdit(TQWidget *parent, TAlbum* album, TQString& title, TQString& icon); + static bool tagCreate(TQWidget *parent, TAlbum* album, TQString& title, TQString& icon); /** Create a list of new Tag album using a list of tags hierarchies separated by ",". A hierarchy of tags is a string path of tags name separated by "/". If a hierarchy start by "/" or if mainRootAlbum is null, it will be created from - root tag album, else it will be created from mainRootAlbum as tqparent album. + root tag album, else it will be created from mainRootAlbum as parent album. 'errMap' is Map of TAlbum path and error message if tag creation failed. Return the list of created Albums. */ static AlbumList createTAlbum(TAlbum *mainRootAlbum, const TQString& tagStr, const TQString& icon, TQMap& errMap); - static void showtagsListCreationError(TQWidget* tqparent, const TQMap& errMap); + static void showtagsListCreationError(TQWidget* parent, const TQMap& errMap); private slots: diff --git a/digikam/digikam/tagfilterview.cpp b/digikam/digikam/tagfilterview.cpp index be8a7104..962a61de 100644 --- a/digikam/digikam/tagfilterview.cpp +++ b/digikam/digikam/tagfilterview.cpp @@ -78,8 +78,8 @@ class TagFilterViewItem : public FolderCheckListItem public: - TagFilterViewItem(TQListView* tqparent, TAlbum* tag, bool untagged=false); - TagFilterViewItem(TQListViewItem* tqparent, TAlbum* tag); + TagFilterViewItem(TQListView* parent, TAlbum* tag, bool untagged=false); + TagFilterViewItem(TQListViewItem* parent, TAlbum* tag); TAlbum* album() const; int id() const; @@ -104,8 +104,8 @@ private: TAlbum *m_album; }; -TagFilterViewItem::TagFilterViewItem(TQListView* tqparent, TAlbum* album, bool untagged) - : FolderCheckListItem(tqparent, album ? album->title() : i18n("Not Tagged"), +TagFilterViewItem::TagFilterViewItem(TQListView* parent, TAlbum* album, bool untagged) + : FolderCheckListItem(parent, album ? album->title() : i18n("Not Tagged"), TQCheckListItem::CheckBox/*Controller*/) { m_album = album; @@ -117,8 +117,8 @@ TagFilterViewItem::TagFilterViewItem(TQListView* tqparent, TAlbum* album, bool u m_album->setExtraData(listView(), this); } -TagFilterViewItem::TagFilterViewItem(TQListViewItem* tqparent, TAlbum* album) - : FolderCheckListItem(tqparent, album->title(), +TagFilterViewItem::TagFilterViewItem(TQListViewItem* parent, TAlbum* album) + : FolderCheckListItem(parent, album->title(), TQCheckListItem::CheckBox/*Controller*/) { m_album = album; @@ -270,8 +270,8 @@ public: AlbumLister::MatchingCondition matchingCond; }; -TagFilterView::TagFilterView(TQWidget* tqparent) - : FolderView(tqparent, "TagFilterView") +TagFilterView::TagFilterView(TQWidget* parent) + : FolderView(parent, "TagFilterView") { d = new TagFilterViewPrivate; d->timer = new TQTimer(this); @@ -378,16 +378,16 @@ void TagFilterView::slotTextTagFilterChanged(const TQString& filter) if (!match) { // check if any of the parents match the search - Album* tqparent = talbum->tqparent(); - while (tqparent && !tqparent->isRoot()) + Album* parent = talbum->parent(); + while (parent && !parent->isRoot()) { - if (tqparent->title().lower().contains(search)) + if (parent->title().lower().contains(search)) { match = true; break; } - tqparent = tqparent->tqparent(); + parent = parent->parent(); } } @@ -498,7 +498,7 @@ bool TagFilterView::acceptDrop(const TQDropEvent *e) const if(itemDrag == itemDrop) return false; - // Dragging a tqparent on its child makes no sense + // Dragging a parent on its child makes no sense if(itemDrag && itemDrag->album()->isAncestorOf(itemDrop->album())) return false; @@ -511,7 +511,7 @@ bool TagFilterView::acceptDrop(const TQDropEvent *e) const if (tag) { - if (tag->tqparent()) + if (tag->parent()) { // Only other possibility is image items being dropped // And allow this only if there is a Tag to be dropped @@ -680,21 +680,21 @@ void TagFilterView::slotTagAdded(Album* album) if (!tag) return; - if (tag->tqparent()->isRoot()) + if (tag->parent()->isRoot()) { new TagFilterViewItem(this, tag); } else { - TagFilterViewItem* tqparent = (TagFilterViewItem*)(tag->tqparent()->extraData(this)); - if (!tqparent) + TagFilterViewItem* parent = (TagFilterViewItem*)(tag->parent()->extraData(this)); + if (!parent) { - DWarning() << k_funcinfo << " Failed to find tqparent for Tag " + DWarning() << k_funcinfo << " Failed to find parent for Tag " << tag->tagPath() << endl; return; } - new TagFilterViewItem(tqparent, tag); + new TagFilterViewItem(parent, tag); } setTagThumbnail(tag); @@ -723,9 +723,9 @@ void TagFilterView::slotTagMoved(TAlbum* tag, TAlbum* newParent) if (!item) return; - if (item->tqparent()) + if (item->parent()) { - TQListViewItem* oldPItem = item->tqparent(); + TQListViewItem* oldPItem = item->parent(); oldPItem->takeItem(item); TagFilterViewItem* newPItem = (TagFilterViewItem*)(newParent->extraData(this)); @@ -1122,24 +1122,24 @@ void TagFilterView::slotABCContextMenu() void TagFilterView::tagNew(TagFilterViewItem* item, const TQString& _title, const TQString& _icon) { - TAlbum *tqparent; + TAlbum *parent; TQString title = _title; TQString icon = _icon; AlbumManager *man = AlbumManager::instance(); if (!item) - tqparent = man->findTAlbum(0); + parent = man->findTAlbum(0); else - tqparent = item->album(); + parent = item->album(); if (title.isNull()) { - if (!TagEditDlg::tagCreate(TQT_TQWIDGET(kapp->activeWindow()), tqparent, title, icon)) + if (!TagEditDlg::tagCreate(TQT_TQWIDGET(kapp->activeWindow()), parent, title, icon)) return; } TQMap errMap; - AlbumList tList = TagEditDlg::createTAlbum(tqparent, title, icon, errMap); + AlbumList tList = TagEditDlg::createTAlbum(parent, title, icon, errMap); TagEditDlg::showtagsListCreationError(TQT_TQWIDGET(kapp->activeWindow()), errMap); for (AlbumList::iterator it = tList.begin(); it != tList.end(); ++it) @@ -1297,7 +1297,7 @@ void TagFilterView::toggleParentTags(TagFilterViewItem* tItem, bool b) Album *a = dynamic_cast(item->album()); if (a) { - if (a == album->tqparent()) + if (a == album->parent()) { item->setOn(b); toggleParentTags(item, b); diff --git a/digikam/digikam/tagfilterview.h b/digikam/digikam/tagfilterview.h index 34579f18..409cd8cf 100644 --- a/digikam/digikam/tagfilterview.h +++ b/digikam/digikam/tagfilterview.h @@ -54,7 +54,7 @@ public: public: - TagFilterView(TQWidget* tqparent); + TagFilterView(TQWidget* parent); ~TagFilterView(); void stateChanged(TagFilterViewItem*); diff --git a/digikam/digikam/tagfolderview.cpp b/digikam/digikam/tagfolderview.cpp index 5ed65991..f5be7dc4 100644 --- a/digikam/digikam/tagfolderview.cpp +++ b/digikam/digikam/tagfolderview.cpp @@ -74,8 +74,8 @@ class TagFolderViewItem : public FolderItem public: - TagFolderViewItem(TQListView *tqparent, TAlbum *album); - TagFolderViewItem(TQListViewItem *tqparent, TAlbum *album); + TagFolderViewItem(TQListView *parent, TAlbum *album); + TagFolderViewItem(TQListViewItem *parent, TAlbum *album); TAlbum* album() const; int id() const; @@ -91,16 +91,16 @@ private: TAlbum *m_album; }; -TagFolderViewItem::TagFolderViewItem(TQListView *tqparent, TAlbum *album) - : FolderItem(tqparent, album->title()) +TagFolderViewItem::TagFolderViewItem(TQListView *parent, TAlbum *album) + : FolderItem(parent, album->title()) { setDragEnabled(true); m_album = album; m_count = 0; } -TagFolderViewItem::TagFolderViewItem(TQListViewItem *tqparent, TAlbum *album) - : FolderItem(tqparent, album->title()) +TagFolderViewItem::TagFolderViewItem(TQListViewItem *parent, TAlbum *album) + : FolderItem(parent, album->title()) { setDragEnabled(true); m_album = album; @@ -112,7 +112,7 @@ void TagFolderViewItem::refresh() if (!m_album) return; if (AlbumSettings::instance()->getShowFolderTreeViewItemsCount() && - dynamic_cast(tqparent())) + dynamic_cast(parent())) { if (isOpen()) setText(0, TQString("%1 (%2)").tqarg(m_album->title()).tqarg(m_count)); @@ -181,8 +181,8 @@ public: AlbumManager *albumMan; }; -TagFolderView::TagFolderView(TQWidget *tqparent) - : FolderView(tqparent, "TagFolderView") +TagFolderView::TagFolderView(TQWidget *parent) + : FolderView(parent, "TagFolderView") { d = new TagFolderViewPriv(); d->albumMan = AlbumManager::instance(); @@ -268,16 +268,16 @@ void TagFolderView::slotTextTagFilterChanged(const TQString& filter) if (!match) { // check if any of the parents match the search - Album* tqparent = talbum->tqparent(); - while (tqparent && !tqparent->isRoot()) + Album* parent = talbum->parent(); + while (parent && !parent->isRoot()) { - if (tqparent->title().lower().contains(search)) + if (parent->title().lower().contains(search)) { match = true; break; } - tqparent = tqparent->tqparent(); + parent = parent->parent(); } } @@ -342,17 +342,17 @@ void TagFolderView::slotAlbumAdded(Album *album) } else { - TagFolderViewItem *tqparent = - (TagFolderViewItem*)tag->tqparent()->extraData(this); + TagFolderViewItem *parent = + (TagFolderViewItem*)tag->parent()->extraData(this); - if (!tqparent) + if (!parent) { - DWarning() << k_funcinfo << " Failed to find tqparent for Tag " + DWarning() << k_funcinfo << " Failed to find parent for Tag " << tag->title() << endl; return; } - item = new TagFolderViewItem(tqparent, tag); + item = new TagFolderViewItem(parent, tag); tag->setExtraData(this, item); } @@ -371,7 +371,7 @@ void TagFolderView::slotAlbumDeleted(Album *album) TagFolderViewItem *item = (TagFolderViewItem*)album->extraData(this); if(item) { - TagFolderViewItem *itemParent = dynamic_cast(item->tqparent()); + TagFolderViewItem *itemParent = dynamic_cast(item->parent()); if(itemParent) itemParent->takeItem(item); @@ -396,9 +396,9 @@ void TagFolderView::slotAlbumMoved(TAlbum* tag, TAlbum* newParent) if (!item) return; - if (item->tqparent()) + if (item->parent()) { - TQListViewItem* oldPItem = item->tqparent(); + TQListViewItem* oldPItem = item->parent(); oldPItem->takeItem(item); } else @@ -543,7 +543,7 @@ void TagFolderView::slotContextMenu(TQListViewItem *item, const TQPoint &, int) popmenu.insertItem(SmallIcon("tag-new"), i18n("New Tag..."), 10); popmenu.insertItem(SmallIcon("tag-addressbook"), i18n("Create Tag From AddressBook"), d->ABCMenu); - if(tag && tag->tqparent()) + if(tag && tag->parent()) { popmenu.insertItem(SmallIcon("tag-properties"), i18n("Edit Tag Properties..."), 11); popmenu.insertItem(SmallIcon("tag-reset"), i18n("Reset Tag Icon"), 13); @@ -626,21 +626,21 @@ void TagFolderView::tagNew( TagFolderViewItem *item, const TQString& _title, con { TQString title = _title; TQString icon = _icon; - TAlbum *tqparent; + TAlbum *parent; if(!item) - tqparent = d->albumMan->findTAlbum(0); + parent = d->albumMan->findTAlbum(0); else - tqparent = item->album(); + parent = item->album(); if (title.isNull()) { - if(!TagEditDlg::tagCreate(TQT_TQWIDGET(kapp->activeWindow()), tqparent, title, icon)) + if(!TagEditDlg::tagCreate(TQT_TQWIDGET(kapp->activeWindow()), parent, title, icon)) return; } TQMap errMap; - AlbumList tList = TagEditDlg::createTAlbum(tqparent, title, icon, errMap); + AlbumList tList = TagEditDlg::createTAlbum(parent, title, icon, errMap); TagEditDlg::showtagsListCreationError(TQT_TQWIDGET(kapp->activeWindow()), errMap); for (AlbumList::iterator it = tList.begin(); it != tList.end(); ++it) @@ -764,7 +764,7 @@ TQDragObject* TagFolderView::dragObject() if(!item) return 0; - if(!item->tqparent()) + if(!item->parent()) return 0; TagDrag *t = new TagDrag(item->album()->id(), this); @@ -789,14 +789,14 @@ bool TagFolderView::acceptDrop(const TQDropEvent *e) const if(itemDrag == itemDrop) return false; - // Dragging a tqparent on its child makes no sense + // Dragging a parent on its child makes no sense if(itemDrag && itemDrag->album()->isAncestorOf(itemDrop->album())) return false; return true; } - if (ItemDrag::canDecode(e) && itemDrop && itemDrop->tqparent()) + if (ItemDrag::canDecode(e) && itemDrop && itemDrop->parent()) { // Only other possibility is image items being dropped // And allow this only if there is a Tag to be dropped diff --git a/digikam/digikam/tagfolderview.h b/digikam/digikam/tagfolderview.h index c79ec179..eab8f8f9 100644 --- a/digikam/digikam/tagfolderview.h +++ b/digikam/digikam/tagfolderview.h @@ -48,7 +48,7 @@ class TagFolderView : public FolderView public: - TagFolderView(TQWidget *tqparent); + TagFolderView(TQWidget *parent); ~TagFolderView(); void tagNew(); diff --git a/digikam/digikam/tagspopupmenu.cpp b/digikam/digikam/tagspopupmenu.cpp index bb1aa6e3..72b1602d 100644 --- a/digikam/digikam/tagspopupmenu.cpp +++ b/digikam/digikam/tagspopupmenu.cpp @@ -238,11 +238,11 @@ void TagsPopupMenu::slotAboutToShow() TAlbum* album = man->findTAlbum(*it); if (album) { - Album* a = album->tqparent(); + Album* a = album->parent(); while (a) { tList.append(a->id()); - a = a->tqparent(); + a = a->parent(); } } } @@ -337,8 +337,8 @@ void TagsPopupMenu::slotActivated(int id) int tagID = id - ADDTAGID; AlbumManager* man = AlbumManager::instance(); - TAlbum* tqparent = man->findTAlbum(tagID); - if (!tqparent) + TAlbum* parent = man->findTAlbum(tagID); + if (!parent) { DWarning() << "Failed to find album with id " << tagID << endl; @@ -346,11 +346,11 @@ void TagsPopupMenu::slotActivated(int id) } TQString title, icon; - if (!TagEditDlg::tagCreate(TQT_TQWIDGET(kapp->activeWindow()), tqparent, title, icon)) + if (!TagEditDlg::tagCreate(TQT_TQWIDGET(kapp->activeWindow()), parent, title, icon)) return; TQMap errMap; - AlbumList tList = TagEditDlg::createTAlbum(tqparent, title, icon, errMap); + AlbumList tList = TagEditDlg::createTAlbum(parent, title, icon, errMap); TagEditDlg::showtagsListCreationError(TQT_TQWIDGET(kapp->activeWindow()), errMap); for (AlbumList::iterator it = tList.begin(); it != tList.end(); ++it) diff --git a/digikam/digikam/timelinefolderview.cpp b/digikam/digikam/timelinefolderview.cpp index e1ffca42..a896e320 100644 --- a/digikam/digikam/timelinefolderview.cpp +++ b/digikam/digikam/timelinefolderview.cpp @@ -54,11 +54,11 @@ class TimeLineFolderItem : public FolderItem public: - TimeLineFolderItem(TQListView* tqparent, SAlbum* album) - : FolderItem(tqparent, album->title()), + TimeLineFolderItem(TQListView* parent, SAlbum* album) + : FolderItem(parent, album->title()), m_album(album) { - m_album->setExtraData(tqparent, this); + m_album->setExtraData(parent, this); } ~TimeLineFolderItem() @@ -89,8 +89,8 @@ private: SAlbum *m_album; }; -TimeLineFolderView::TimeLineFolderView(TQWidget* tqparent) - : FolderView(tqparent, "TimeLineFolderView") +TimeLineFolderView::TimeLineFolderView(TQWidget* parent) + : FolderView(parent, "TimeLineFolderView") { m_currentTimeLineSearchName = TQString("_Current_Time_Line_Search_"); addColumn(i18n("My Date Searches")); diff --git a/digikam/digikam/timelinefolderview.h b/digikam/digikam/timelinefolderview.h index 528945c3..076486d7 100644 --- a/digikam/digikam/timelinefolderview.h +++ b/digikam/digikam/timelinefolderview.h @@ -42,7 +42,7 @@ class TimeLineFolderView : public FolderView public: - TimeLineFolderView(TQWidget* tqparent); + TimeLineFolderView(TQWidget* parent); ~TimeLineFolderView(); void searchDelete(SAlbum* album); diff --git a/digikam/digikam/timelineview.cpp b/digikam/digikam/timelineview.cpp index cfc379dc..a352b8a9 100644 --- a/digikam/digikam/timelineview.cpp +++ b/digikam/digikam/timelineview.cpp @@ -113,8 +113,8 @@ public: TimeLineFolderView *timeLineFolderView; }; -TimeLineView::TimeLineView(TQWidget *tqparent) - : TQWidget(tqparent, 0, TQt::WDestructiveClose) +TimeLineView::TimeLineView(TQWidget *parent) + : TQWidget(parent, 0, TQt::WDestructiveClose) { d = new TimeLineViewPriv; d->timer = new TQTimer(this); diff --git a/digikam/digikam/timelineview.h b/digikam/digikam/timelineview.h index 22954f04..f93bff8b 100644 --- a/digikam/digikam/timelineview.h +++ b/digikam/digikam/timelineview.h @@ -45,7 +45,7 @@ class TimeLineView : public TQWidget public: - TimeLineView(TQWidget *tqparent=0); + TimeLineView(TQWidget *parent=0); ~TimeLineView(); TimeLineFolderView *folderView() const; diff --git a/digikam/digikam/timelinewidget.cpp b/digikam/digikam/timelinewidget.cpp index 2a0e7b9f..1c33527e 100644 --- a/digikam/digikam/timelinewidget.cpp +++ b/digikam/digikam/timelinewidget.cpp @@ -111,8 +111,8 @@ public: TimeLineWidget::ScaleMode scaleMode; }; -TimeLineWidget::TimeLineWidget(TQWidget *tqparent) - : TQWidget(tqparent, 0, TQt::WDestructiveClose) +TimeLineWidget::TimeLineWidget(TQWidget *parent) + : TQWidget(parent, 0, TQt::WDestructiveClose) { d = new TimeLineWidgetPriv; setBackgroundMode(TQt::NoBackground); diff --git a/digikam/digikam/timelinewidget.h b/digikam/digikam/timelinewidget.h index c88c1849..fa235456 100644 --- a/digikam/digikam/timelinewidget.h +++ b/digikam/digikam/timelinewidget.h @@ -72,7 +72,7 @@ public: public: - TimeLineWidget(TQWidget *tqparent=0); + TimeLineWidget(TQWidget *parent=0); ~TimeLineWidget(); void setTimeUnit(TimeUnit timeUnit); diff --git a/digikam/digikam/welcomepageview.cpp b/digikam/digikam/welcomepageview.cpp index 1b644183..44917b5e 100644 --- a/digikam/digikam/welcomepageview.cpp +++ b/digikam/digikam/welcomepageview.cpp @@ -47,8 +47,8 @@ namespace Digikam { -WelcomePageView::WelcomePageView(TQWidget* tqparent) - : KHTMLPart(tqparent) +WelcomePageView::WelcomePageView(TQWidget* parent) + : KHTMLPart(parent) { widget()->setFocusPolicy(TQ_WheelFocus); // Let's better be paranoid and disable plugins (it defaults to enabled): diff --git a/digikam/digikam/welcomepageview.h b/digikam/digikam/welcomepageview.h index 627533f3..641b3249 100644 --- a/digikam/digikam/welcomepageview.h +++ b/digikam/digikam/welcomepageview.h @@ -47,7 +47,7 @@ class DIGIKAM_EXPORT WelcomePageView : public KHTMLPart public: - WelcomePageView(TQWidget* tqparent); + WelcomePageView(TQWidget* parent); ~WelcomePageView(); private: diff --git a/digikam/imageplugins/adjustcurves/adjustcurves.cpp b/digikam/imageplugins/adjustcurves/adjustcurves.cpp index 02a65ed5..ed8aeab5 100644 --- a/digikam/imageplugins/adjustcurves/adjustcurves.cpp +++ b/digikam/imageplugins/adjustcurves/adjustcurves.cpp @@ -80,8 +80,8 @@ namespace DigikamAdjustCurvesImagesPlugin { -AdjustCurveDialog::AdjustCurveDialog(TQWidget* tqparent) - : Digikam::ImageDlgBase(tqparent, i18n("Adjust Color Curves"), "adjustcurves", true, false) +AdjustCurveDialog::AdjustCurveDialog(TQWidget* parent) + : Digikam::ImageDlgBase(parent, i18n("Adjust Color Curves"), "adjustcurves", true, false) { m_destinationPreviewData = 0L; diff --git a/digikam/imageplugins/adjustcurves/adjustcurves.h b/digikam/imageplugins/adjustcurves/adjustcurves.h index 7879312e..5d6b6f87 100644 --- a/digikam/imageplugins/adjustcurves/adjustcurves.h +++ b/digikam/imageplugins/adjustcurves/adjustcurves.h @@ -54,7 +54,7 @@ class AdjustCurveDialog : public Digikam::ImageDlgBase public: - AdjustCurveDialog(TQWidget *tqparent); + AdjustCurveDialog(TQWidget *parent); ~AdjustCurveDialog(); private: diff --git a/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp b/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp index fed5e241..d1190738 100644 --- a/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp +++ b/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp @@ -85,8 +85,8 @@ using namespace Digikam; namespace DigikamAdjustCurvesImagesPlugin { -AdjustCurvesTool::AdjustCurvesTool(TQObject* tqparent) - : EditorTool(tqparent) +AdjustCurvesTool::AdjustCurvesTool(TQObject* parent) + : EditorTool(parent) { m_destinationPreviewData = 0; diff --git a/digikam/imageplugins/adjustcurves/adjustcurvestool.h b/digikam/imageplugins/adjustcurves/adjustcurvestool.h index 37f2c36e..2832e74f 100644 --- a/digikam/imageplugins/adjustcurves/adjustcurvestool.h +++ b/digikam/imageplugins/adjustcurves/adjustcurvestool.h @@ -55,7 +55,7 @@ class AdjustCurvesTool : public Digikam::EditorTool public: - AdjustCurvesTool(TQObject *tqparent); + AdjustCurvesTool(TQObject *parent); ~AdjustCurvesTool(); private: diff --git a/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.cpp b/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.cpp index 08485606..722e453c 100644 --- a/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.cpp +++ b/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.cpp @@ -41,8 +41,8 @@ using namespace DigikamAdjustCurvesImagesPlugin; K_EXPORT_COMPONENT_FACTORY( digikamimageplugin_adjustcurves, KGenericFactory("digikamimageplugin_adjustcurves")); -ImagePlugin_AdjustCurves::ImagePlugin_AdjustCurves(TQObject *tqparent, const char*, const TQStringList&) - : Digikam::ImagePlugin(tqparent, "ImagePlugin_AdjustCurves") +ImagePlugin_AdjustCurves::ImagePlugin_AdjustCurves(TQObject *parent, const char*, const TQStringList&) + : Digikam::ImagePlugin(parent, "ImagePlugin_AdjustCurves") { m_curvesAction = new KAction(i18n("Curves Adjust..."), "adjustcurves", CTRL+SHIFT+Key_M, // NOTE: Photoshop 7 use CTRL+M (but it's used in KDE to toogle menu bar). diff --git a/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.h b/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.h index d78637d7..47e6bf69 100644 --- a/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.h +++ b/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.h @@ -38,7 +38,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_AdjustCurves : public Digikam::Imag public: - ImagePlugin_AdjustCurves(TQObject *tqparent, const char* name, + ImagePlugin_AdjustCurves(TQObject *parent, const char* name, const TQStringList &args); ~ImagePlugin_AdjustCurves(); diff --git a/digikam/imageplugins/adjustlevels/adjustlevels.cpp b/digikam/imageplugins/adjustlevels/adjustlevels.cpp index 3b0a4d94..c827e35d 100644 --- a/digikam/imageplugins/adjustlevels/adjustlevels.cpp +++ b/digikam/imageplugins/adjustlevels/adjustlevels.cpp @@ -78,8 +78,8 @@ namespace DigikamAdjustLevelsImagesPlugin { -AdjustLevelDialog::AdjustLevelDialog(TQWidget* tqparent) - : Digikam::ImageDlgBase(tqparent, i18n("Adjust Color Levels"), +AdjustLevelDialog::AdjustLevelDialog(TQWidget* parent) + : Digikam::ImageDlgBase(parent, i18n("Adjust Color Levels"), "adjustlevels", true, false) { m_destinationPreviewData = 0L; @@ -899,7 +899,7 @@ bool AdjustLevelDialog::eventFilter(TQObject *obj, TQEvent *ev) } else { - // pass the event on to the tqparent class + // pass the event on to the parent class return KDialogBase::eventFilter(obj, ev); } } diff --git a/digikam/imageplugins/adjustlevels/adjustlevels.h b/digikam/imageplugins/adjustlevels/adjustlevels.h index 2ccfef65..19351455 100644 --- a/digikam/imageplugins/adjustlevels/adjustlevels.h +++ b/digikam/imageplugins/adjustlevels/adjustlevels.h @@ -55,7 +55,7 @@ class AdjustLevelDialog : public Digikam::ImageDlgBase public: - AdjustLevelDialog(TQWidget *tqparent); + AdjustLevelDialog(TQWidget *parent); ~AdjustLevelDialog(); private: diff --git a/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp b/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp index c8365959..68c79c20 100644 --- a/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp +++ b/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp @@ -85,8 +85,8 @@ using namespace Digikam; namespace DigikamAdjustLevelsImagesPlugin { -AdjustLevelsTool::AdjustLevelsTool(TQObject* tqparent) - : EditorTool(tqparent) +AdjustLevelsTool::AdjustLevelsTool(TQObject* parent) + : EditorTool(parent) { m_destinationPreviewData = 0; @@ -881,7 +881,7 @@ bool AdjustLevelsTool::eventFilter(TQObject *obj, TQEvent *ev) } else { - // pass the event on to the tqparent class + // pass the event on to the parent class return EditorTool::eventFilter(obj, ev); } } diff --git a/digikam/imageplugins/adjustlevels/adjustlevelstool.h b/digikam/imageplugins/adjustlevels/adjustlevelstool.h index 2a301e28..c51729c4 100644 --- a/digikam/imageplugins/adjustlevels/adjustlevelstool.h +++ b/digikam/imageplugins/adjustlevels/adjustlevelstool.h @@ -59,7 +59,7 @@ class AdjustLevelsTool : public Digikam::EditorTool public: - AdjustLevelsTool(TQObject *tqparent); + AdjustLevelsTool(TQObject *parent); ~AdjustLevelsTool(); private: diff --git a/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.cpp b/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.cpp index 7485f72e..d9a4cae6 100644 --- a/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.cpp +++ b/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.cpp @@ -41,9 +41,9 @@ using namespace DigikamAdjustLevelsImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_adjustlevels, KGenericFactory("digikamimageplugin_adjustlevels")) -ImagePlugin_AdjustLevels::ImagePlugin_AdjustLevels(TQObject *tqparent, const char*, +ImagePlugin_AdjustLevels::ImagePlugin_AdjustLevels(TQObject *parent, const char*, const TQStringList &) - : Digikam::ImagePlugin(tqparent, "ImagePlugin_AdjustLevels") + : Digikam::ImagePlugin(parent, "ImagePlugin_AdjustLevels") { m_levelsAction = new KAction(i18n("Levels Adjust..."), "adjustlevels", CTRL+Key_L, // NOTE: Photoshop 7 use CTRL+L. diff --git a/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.h b/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.h index e1515049..d8236f8b 100644 --- a/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.h +++ b/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.h @@ -38,7 +38,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_AdjustLevels : public Digikam::Imag public: - ImagePlugin_AdjustLevels(TQObject *tqparent, const char* name, + ImagePlugin_AdjustLevels(TQObject *parent, const char* name, const TQStringList &args); ~ImagePlugin_AdjustLevels(); diff --git a/digikam/imageplugins/antivignetting/antivignetting.cpp b/digikam/imageplugins/antivignetting/antivignetting.cpp index d5cdb237..dec0a9ea 100644 --- a/digikam/imageplugins/antivignetting/antivignetting.cpp +++ b/digikam/imageplugins/antivignetting/antivignetting.cpp @@ -40,9 +40,9 @@ namespace DigikamAntiVignettingImagesPlugin { -AntiVignetting::AntiVignetting(Digikam::DImg *orgImage, TQObject *tqparent, double density, +AntiVignetting::AntiVignetting(Digikam::DImg *orgImage, TQObject *parent, double density, double power, double radius, int xshift, int yshift, bool normalize) - : Digikam::DImgThreadedFilter(orgImage, tqparent, "AntiVignetting") + : Digikam::DImgThreadedFilter(orgImage, parent, "AntiVignetting") { m_density = density; m_power = power; diff --git a/digikam/imageplugins/antivignetting/antivignetting.h b/digikam/imageplugins/antivignetting/antivignetting.h index e167d299..f5311da0 100644 --- a/digikam/imageplugins/antivignetting/antivignetting.h +++ b/digikam/imageplugins/antivignetting/antivignetting.h @@ -36,7 +36,7 @@ class AntiVignetting : public Digikam::DImgThreadedFilter public: - AntiVignetting(Digikam::DImg *orgImage, TQObject *tqparent=0, double density=2.0, + AntiVignetting(Digikam::DImg *orgImage, TQObject *parent=0, double density=2.0, double power=1.0, double radius=1.0, int xshift=0, int yshift=0, bool normalize=true); ~AntiVignetting(){}; diff --git a/digikam/imageplugins/antivignetting/antivignettingtool.cpp b/digikam/imageplugins/antivignetting/antivignettingtool.cpp index 6e851e82..f6fafe63 100644 --- a/digikam/imageplugins/antivignetting/antivignettingtool.cpp +++ b/digikam/imageplugins/antivignetting/antivignettingtool.cpp @@ -66,8 +66,8 @@ using namespace Digikam; namespace DigikamAntiVignettingImagesPlugin { -AntiVignettingTool::AntiVignettingTool(TQObject* tqparent) - : EditorToolThreaded(tqparent) +AntiVignettingTool::AntiVignettingTool(TQObject* parent) + : EditorToolThreaded(parent) { setName("antivignettings"); setToolName(i18n("Vignetting Correction")); @@ -88,7 +88,7 @@ AntiVignettingTool::AntiVignettingTool(TQObject* tqparent) m_maskPreviewLabel = new TQLabel( m_gboxSettings->plainPage() ); m_maskPreviewLabel->tqsetAlignment ( TQt::AlignHCenter | TQt::AlignVCenter ); TQWhatsThis::add( m_maskPreviewLabel, i18n("

    You can see here a thumbnail preview of the anti-vignetting " - "tqmask applied to the image.") ); + "mask applied to the image.") ); // ------------------------------------------------------------- @@ -297,7 +297,7 @@ void AntiVignettingTool::prepareEffect() TQSize ps(orgWidth, orgHeight); ps.scale( TQSize(120, 120), TQSize::ScaleMin ); - // Calc tqmask preview. + // Calc mask preview. DImg preview(ps.width(), ps.height(), false); memset(preview.bits(), 255, preview.numBytes()); AntiVignetting maskPreview(&preview, 0L, d, p, r, 0, 0, false); diff --git a/digikam/imageplugins/antivignetting/antivignettingtool.h b/digikam/imageplugins/antivignetting/antivignettingtool.h index 87b0b91b..311535fc 100644 --- a/digikam/imageplugins/antivignetting/antivignettingtool.h +++ b/digikam/imageplugins/antivignetting/antivignettingtool.h @@ -53,7 +53,7 @@ class AntiVignettingTool : public Digikam::EditorToolThreaded public: - AntiVignettingTool(TQObject *tqparent); + AntiVignettingTool(TQObject *parent); ~AntiVignettingTool(); private slots: diff --git a/digikam/imageplugins/antivignetting/imageeffect_antivignetting.cpp b/digikam/imageplugins/antivignetting/imageeffect_antivignetting.cpp index 0584a71c..364ad8bf 100644 --- a/digikam/imageplugins/antivignetting/imageeffect_antivignetting.cpp +++ b/digikam/imageplugins/antivignetting/imageeffect_antivignetting.cpp @@ -59,8 +59,8 @@ namespace DigikamAntiVignettingImagesPlugin { -ImageEffect_AntiVignetting::ImageEffect_AntiVignetting(TQWidget* tqparent) - : Digikam::ImageGuideDlg(tqparent, i18n("Vignetting Correction"), +ImageEffect_AntiVignetting::ImageEffect_AntiVignetting(TQWidget* parent) + : Digikam::ImageGuideDlg(parent, i18n("Vignetting Correction"), "antivignettings", false, true, false, Digikam::ImageGuideWidget::HVGuideMode, 0, true) { @@ -91,7 +91,7 @@ ImageEffect_AntiVignetting::ImageEffect_AntiVignetting(TQWidget* tqparent) m_maskPreviewLabel = new TQLabel( gboxSettings ); m_maskPreviewLabel->tqsetAlignment ( TQt::AlignHCenter | TQt::AlignVCenter ); TQWhatsThis::add( m_maskPreviewLabel, i18n("

    You can see here a thumbnail preview of the anti-vignetting " - "tqmask applied to the image.") ); + "mask applied to the image.") ); gridSettings->addMultiCellWidget(m_maskPreviewLabel, 0, 0, 0, 2); // ------------------------------------------------------------- @@ -295,7 +295,7 @@ void ImageEffect_AntiVignetting::prepareEffect() TQSize ps(orgWidth, orgHeight); ps.scale( TQSize(120, 120), TQSize::ScaleMin ); - // Calc tqmask preview. + // Calc mask preview. Digikam::DImg preview(ps.width(), ps.height(), false); memset(preview.bits(), 255, preview.numBytes()); AntiVignetting maskPreview(&preview, 0L, d, p, r, 0, 0, false); diff --git a/digikam/imageplugins/antivignetting/imageeffect_antivignetting.h b/digikam/imageplugins/antivignetting/imageeffect_antivignetting.h index 0300635b..f69f7dff 100644 --- a/digikam/imageplugins/antivignetting/imageeffect_antivignetting.h +++ b/digikam/imageplugins/antivignetting/imageeffect_antivignetting.h @@ -44,7 +44,7 @@ class ImageEffect_AntiVignetting : public Digikam::ImageGuideDlg public: - ImageEffect_AntiVignetting(TQWidget *tqparent); + ImageEffect_AntiVignetting(TQWidget *parent); ~ImageEffect_AntiVignetting(); private slots: diff --git a/digikam/imageplugins/antivignetting/imageplugin_antivignetting.cpp b/digikam/imageplugins/antivignetting/imageplugin_antivignetting.cpp index d0b16da9..2c3f6937 100644 --- a/digikam/imageplugins/antivignetting/imageplugin_antivignetting.cpp +++ b/digikam/imageplugins/antivignetting/imageplugin_antivignetting.cpp @@ -42,8 +42,8 @@ using namespace DigikamAntiVignettingImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_antivignetting, KGenericFactory("digikamimageplugin_antivignetting")); -ImagePlugin_AntiVignetting::ImagePlugin_AntiVignetting(TQObject *tqparent, const char*, const TQStringList &) - : Digikam::ImagePlugin(tqparent, "ImagePlugin_AntiVignetting") +ImagePlugin_AntiVignetting::ImagePlugin_AntiVignetting(TQObject *parent, const char*, const TQStringList &) + : Digikam::ImagePlugin(parent, "ImagePlugin_AntiVignetting") { m_antivignettingAction = new KAction(i18n("Vignetting Correction..."), "antivignetting", 0, this, TQT_SLOT(slotAntiVignetting()), diff --git a/digikam/imageplugins/antivignetting/imageplugin_antivignetting.h b/digikam/imageplugins/antivignetting/imageplugin_antivignetting.h index aeb1ee31..b7c79e31 100644 --- a/digikam/imageplugins/antivignetting/imageplugin_antivignetting.h +++ b/digikam/imageplugins/antivignetting/imageplugin_antivignetting.h @@ -39,7 +39,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_AntiVignetting : public Digikam::Im public: - ImagePlugin_AntiVignetting(TQObject *tqparent, const char* name, + ImagePlugin_AntiVignetting(TQObject *parent, const char* name, const TQStringList &args); ~ImagePlugin_AntiVignetting(); diff --git a/digikam/imageplugins/blurfx/blurfx.cpp b/digikam/imageplugins/blurfx/blurfx.cpp index 428bdcc2..a299fcc6 100644 --- a/digikam/imageplugins/blurfx/blurfx.cpp +++ b/digikam/imageplugins/blurfx/blurfx.cpp @@ -47,8 +47,8 @@ namespace DigikamBlurFXImagesPlugin { -BlurFX::BlurFX(Digikam::DImg *orgImage, TQObject *tqparent, int blurFXType, int distance, int level) - : Digikam::DImgThreadedFilter(orgImage, tqparent, "BlurFX") +BlurFX::BlurFX(Digikam::DImg *orgImage, TQObject *parent, int blurFXType, int distance, int level) + : Digikam::DImgThreadedFilter(orgImage, parent, "BlurFX") { m_blurFXType = blurFXType; m_distance = distance; diff --git a/digikam/imageplugins/blurfx/blurfx.h b/digikam/imageplugins/blurfx/blurfx.h index 52579a7e..4a4397b4 100644 --- a/digikam/imageplugins/blurfx/blurfx.h +++ b/digikam/imageplugins/blurfx/blurfx.h @@ -40,7 +40,7 @@ class BlurFX : public Digikam::DImgThreadedFilter public: - BlurFX(Digikam::DImg *orgImage, TQObject *tqparent=0, int blurFXType=ZoomBlur, + BlurFX(Digikam::DImg *orgImage, TQObject *parent=0, int blurFXType=ZoomBlur, int distance=100, int level=45); ~BlurFX(){}; diff --git a/digikam/imageplugins/blurfx/blurfxtool.cpp b/digikam/imageplugins/blurfx/blurfxtool.cpp index e630ec99..0f6aa41c 100644 --- a/digikam/imageplugins/blurfx/blurfxtool.cpp +++ b/digikam/imageplugins/blurfx/blurfxtool.cpp @@ -61,8 +61,8 @@ using namespace Digikam; namespace DigikamBlurFXImagesPlugin { -BlurFXTool::BlurFXTool(TQObject* tqparent) - : EditorToolThreaded(tqparent) +BlurFXTool::BlurFXTool(TQObject* parent) + : EditorToolThreaded(parent) { setName("blurfx"); setToolName(i18n("Blur FX")); diff --git a/digikam/imageplugins/blurfx/blurfxtool.h b/digikam/imageplugins/blurfx/blurfxtool.h index c0ae01dd..10fc08f1 100644 --- a/digikam/imageplugins/blurfx/blurfxtool.h +++ b/digikam/imageplugins/blurfx/blurfxtool.h @@ -53,7 +53,7 @@ class BlurFXTool : public Digikam::EditorToolThreaded public: - BlurFXTool(TQObject *tqparent); + BlurFXTool(TQObject *parent); ~BlurFXTool(); private slots: diff --git a/digikam/imageplugins/blurfx/imageeffect_blurfx.cpp b/digikam/imageplugins/blurfx/imageeffect_blurfx.cpp index 9241a3f4..0c6bbf2c 100644 --- a/digikam/imageplugins/blurfx/imageeffect_blurfx.cpp +++ b/digikam/imageplugins/blurfx/imageeffect_blurfx.cpp @@ -53,8 +53,8 @@ namespace DigikamBlurFXImagesPlugin { -ImageEffect_BlurFX::ImageEffect_BlurFX(TQWidget* tqparent) - : Digikam::CtrlPanelDlg(tqparent, i18n("Apply Blurring Special Effect to Photograph"), +ImageEffect_BlurFX::ImageEffect_BlurFX(TQWidget* parent) + : Digikam::CtrlPanelDlg(parent, i18n("Apply Blurring Special Effect to Photograph"), "blurfx", false, false, true, Digikam::ImagePannelWidget::SeparateViewAll) { diff --git a/digikam/imageplugins/blurfx/imageeffect_blurfx.h b/digikam/imageplugins/blurfx/imageeffect_blurfx.h index 4f094a8b..b4651142 100644 --- a/digikam/imageplugins/blurfx/imageeffect_blurfx.h +++ b/digikam/imageplugins/blurfx/imageeffect_blurfx.h @@ -44,7 +44,7 @@ class ImageEffect_BlurFX : public Digikam::CtrlPanelDlg public: - ImageEffect_BlurFX(TQWidget *tqparent); + ImageEffect_BlurFX(TQWidget *parent); ~ImageEffect_BlurFX(); private slots: diff --git a/digikam/imageplugins/blurfx/imageplugin_blurfx.cpp b/digikam/imageplugins/blurfx/imageplugin_blurfx.cpp index fcab5126..5d8a1016 100644 --- a/digikam/imageplugins/blurfx/imageplugin_blurfx.cpp +++ b/digikam/imageplugins/blurfx/imageplugin_blurfx.cpp @@ -42,8 +42,8 @@ using namespace DigikamBlurFXImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_blurfx, KGenericFactory("digikamimageplugin_blurfx")); -ImagePlugin_BlurFX::ImagePlugin_BlurFX(TQObject *tqparent, const char*, const TQStringList &) - : Digikam::ImagePlugin(tqparent, "ImagePlugin_BlurFX") +ImagePlugin_BlurFX::ImagePlugin_BlurFX(TQObject *parent, const char*, const TQStringList &) + : Digikam::ImagePlugin(parent, "ImagePlugin_BlurFX") { m_blurfxAction = new KAction(i18n("Blur Effects..."), "blurfx", 0, this, TQT_SLOT(slotBlurFX()), diff --git a/digikam/imageplugins/blurfx/imageplugin_blurfx.h b/digikam/imageplugins/blurfx/imageplugin_blurfx.h index d13eba87..fb90bd00 100644 --- a/digikam/imageplugins/blurfx/imageplugin_blurfx.h +++ b/digikam/imageplugins/blurfx/imageplugin_blurfx.h @@ -38,7 +38,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_BlurFX : public Digikam::ImagePlugi public: - ImagePlugin_BlurFX(TQObject *tqparent, const char* name, + ImagePlugin_BlurFX(TQObject *parent, const char* name, const TQStringList &args); ~ImagePlugin_BlurFX(); diff --git a/digikam/imageplugins/border/border.cpp b/digikam/imageplugins/border/border.cpp index 4049b57a..00726f58 100644 --- a/digikam/imageplugins/border/border.cpp +++ b/digikam/imageplugins/border/border.cpp @@ -42,7 +42,7 @@ namespace DigikamBorderImagesPlugin { -Border::Border(Digikam::DImg *image, TQObject *tqparent, int orgWidth, int orgHeight, +Border::Border(Digikam::DImg *image, TQObject *parent, int orgWidth, int orgHeight, TQString borderPath, int borderType, float borderPercent, Digikam::DColor solidColor, Digikam::DColor niepceBorderColor, @@ -51,7 +51,7 @@ Border::Border(Digikam::DImg *image, TQObject *tqparent, int orgWidth, int orgHe Digikam::DColor bevelLowerRightColor, Digikam::DColor decorativeFirstColor, Digikam::DColor decorativeSecondColor) - : Digikam::DImgThreadedFilter(image, tqparent, "Border") + : Digikam::DImgThreadedFilter(image, parent, "Border") { m_orgWidth = orgWidth; m_orgHeight = orgHeight; @@ -78,7 +78,7 @@ Border::Border(Digikam::DImg *image, TQObject *tqparent, int orgWidth, int orgHe initFilter(); } -Border::Border(Digikam::DImg *orgImage, TQObject *tqparent, int orgWidth, int orgHeight, +Border::Border(Digikam::DImg *orgImage, TQObject *parent, int orgWidth, int orgHeight, TQString borderPath, int borderType, int borderWidth1, int borderWidth2, int borderWidth3, int borderWidth4, Digikam::DColor solidColor, @@ -88,7 +88,7 @@ Border::Border(Digikam::DImg *orgImage, TQObject *tqparent, int orgWidth, int or Digikam::DColor bevelLowerRightColor, Digikam::DColor decorativeFirstColor, Digikam::DColor decorativeSecondColor) - : Digikam::DImgThreadedFilter(orgImage, tqparent, "Border") + : Digikam::DImgThreadedFilter(orgImage, parent, "Border") { m_orgWidth = orgWidth; m_orgHeight = orgHeight; diff --git a/digikam/imageplugins/border/border.h b/digikam/imageplugins/border/border.h index f85b2a9b..b213e27a 100644 --- a/digikam/imageplugins/border/border.h +++ b/digikam/imageplugins/border/border.h @@ -69,7 +69,7 @@ public: public: /** Constructor using settings to preserve aspect ratio of image. */ - Border(Digikam::DImg *orgImage, TQObject *tqparent=0, int orgWidth=0, int orgHeight=0, + Border(Digikam::DImg *orgImage, TQObject *parent=0, int orgWidth=0, int orgHeight=0, TQString borderPath=TQString(), int borderType=SolidBorder, float borderPercent=0.1, Digikam::DColor solidColor = Digikam::DColor(), Digikam::DColor niepceBorderColor = Digikam::DColor(), @@ -80,7 +80,7 @@ public: Digikam::DColor decorativeSecondColor = Digikam::DColor()); /** Constructor using settings to not-preserve aspect ratio of image. */ - Border(Digikam::DImg *orgImage, TQObject *tqparent=0, int orgWidth=0, int orgHeight=0, + Border(Digikam::DImg *orgImage, TQObject *parent=0, int orgWidth=0, int orgHeight=0, TQString borderPath=TQString(), int borderType=SolidBorder, int borderWidth1=100, int borderWidth2=20, int borderWidth3=20, int borderWidth4=10, Digikam::DColor solidColor = Digikam::DColor(), diff --git a/digikam/imageplugins/border/bordertool.cpp b/digikam/imageplugins/border/bordertool.cpp index e37176b7..5f3d40ed 100644 --- a/digikam/imageplugins/border/bordertool.cpp +++ b/digikam/imageplugins/border/bordertool.cpp @@ -63,8 +63,8 @@ using namespace Digikam; namespace DigikamBorderImagesPlugin { -BorderTool::BorderTool(TQObject* tqparent) - : EditorToolThreaded(tqparent) +BorderTool::BorderTool(TQObject* parent) + : EditorToolThreaded(parent) { setName("border"); setToolName(i18n("Add Border")); diff --git a/digikam/imageplugins/border/bordertool.h b/digikam/imageplugins/border/bordertool.h index f63144eb..f691ceeb 100644 --- a/digikam/imageplugins/border/bordertool.h +++ b/digikam/imageplugins/border/bordertool.h @@ -62,7 +62,7 @@ class BorderTool : public Digikam::EditorToolThreaded public: - BorderTool(TQObject *tqparent); + BorderTool(TQObject *parent); ~BorderTool(); private: diff --git a/digikam/imageplugins/border/imageeffect_border.cpp b/digikam/imageplugins/border/imageeffect_border.cpp index 2e8dc7a4..a2963e43 100644 --- a/digikam/imageplugins/border/imageeffect_border.cpp +++ b/digikam/imageplugins/border/imageeffect_border.cpp @@ -56,8 +56,8 @@ namespace DigikamBorderImagesPlugin { -ImageEffect_Border::ImageEffect_Border(TQWidget* tqparent) - : Digikam::ImageGuideDlg(tqparent, i18n("Add Border Around Photograph"), +ImageEffect_Border::ImageEffect_Border(TQWidget* parent) + : Digikam::ImageGuideDlg(parent, i18n("Add Border Around Photograph"), "border", false, false, false, Digikam::ImageGuideWidget::HVGuideMode) { diff --git a/digikam/imageplugins/border/imageeffect_border.h b/digikam/imageplugins/border/imageeffect_border.h index 19c9529e..02afe213 100644 --- a/digikam/imageplugins/border/imageeffect_border.h +++ b/digikam/imageplugins/border/imageeffect_border.h @@ -52,7 +52,7 @@ class ImageEffect_Border : public Digikam::ImageGuideDlg public: - ImageEffect_Border(TQWidget *tqparent); + ImageEffect_Border(TQWidget *parent); ~ImageEffect_Border(); private: diff --git a/digikam/imageplugins/border/imageplugin_border.cpp b/digikam/imageplugins/border/imageplugin_border.cpp index 1d0f2e92..0732b096 100644 --- a/digikam/imageplugins/border/imageplugin_border.cpp +++ b/digikam/imageplugins/border/imageplugin_border.cpp @@ -42,8 +42,8 @@ using namespace DigikamBorderImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_border, KGenericFactory("digikamimageplugin_border")); -ImagePlugin_Border::ImagePlugin_Border(TQObject *tqparent, const char*, const TQStringList &) - : Digikam::ImagePlugin(tqparent, "ImagePlugin_Border") +ImagePlugin_Border::ImagePlugin_Border(TQObject *parent, const char*, const TQStringList &) + : Digikam::ImagePlugin(parent, "ImagePlugin_Border") { m_borderAction = new KAction(i18n("Add Border..."), "bordertool", 0, diff --git a/digikam/imageplugins/border/imageplugin_border.h b/digikam/imageplugins/border/imageplugin_border.h index 567b3de4..715b1efb 100644 --- a/digikam/imageplugins/border/imageplugin_border.h +++ b/digikam/imageplugins/border/imageplugin_border.h @@ -39,7 +39,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_Border : public Digikam::ImagePlugi public: - ImagePlugin_Border(TQObject *tqparent, const char* name, + ImagePlugin_Border(TQObject *parent, const char* name, const TQStringList &args); ~ImagePlugin_Border(); diff --git a/digikam/imageplugins/channelmixer/channelmixer.cpp b/digikam/imageplugins/channelmixer/channelmixer.cpp index ca85b300..ca40bb09 100644 --- a/digikam/imageplugins/channelmixer/channelmixer.cpp +++ b/digikam/imageplugins/channelmixer/channelmixer.cpp @@ -88,8 +88,8 @@ namespace DigikamChannelMixerImagesPlugin { -ChannelMixerDialog::ChannelMixerDialog(TQWidget* tqparent) - : Digikam::ImageDlgBase(tqparent, i18n("Color Channel Mixer"), +ChannelMixerDialog::ChannelMixerDialog(TQWidget* parent) + : Digikam::ImageDlgBase(parent, i18n("Color Channel Mixer"), "channelmixer", true, false) { m_destinationPreviewData = 0L; diff --git a/digikam/imageplugins/channelmixer/channelmixer.h b/digikam/imageplugins/channelmixer/channelmixer.h index fe863ee3..06477e45 100644 --- a/digikam/imageplugins/channelmixer/channelmixer.h +++ b/digikam/imageplugins/channelmixer/channelmixer.h @@ -53,7 +53,7 @@ class ChannelMixerDialog : public Digikam::ImageDlgBase public: - ChannelMixerDialog(TQWidget *tqparent); + ChannelMixerDialog(TQWidget *parent); ~ChannelMixerDialog(); private: diff --git a/digikam/imageplugins/channelmixer/channelmixertool.cpp b/digikam/imageplugins/channelmixer/channelmixertool.cpp index 845b93a8..b1d63a4b 100644 --- a/digikam/imageplugins/channelmixer/channelmixertool.cpp +++ b/digikam/imageplugins/channelmixer/channelmixertool.cpp @@ -91,8 +91,8 @@ using namespace Digikam; namespace DigikamChannelMixerImagesPlugin { -ChannelMixerTool::ChannelMixerTool(TQObject* tqparent) - : EditorTool(tqparent) +ChannelMixerTool::ChannelMixerTool(TQObject* parent) + : EditorTool(parent) { m_destinationPreviewData = 0; diff --git a/digikam/imageplugins/channelmixer/channelmixertool.h b/digikam/imageplugins/channelmixer/channelmixertool.h index 213f168a..dcfbd734 100644 --- a/digikam/imageplugins/channelmixer/channelmixertool.h +++ b/digikam/imageplugins/channelmixer/channelmixertool.h @@ -56,7 +56,7 @@ class ChannelMixerTool : public Digikam::EditorTool public: - ChannelMixerTool(TQObject *tqparent); + ChannelMixerTool(TQObject *parent); ~ChannelMixerTool(); private: diff --git a/digikam/imageplugins/channelmixer/imageplugin_channelmixer.cpp b/digikam/imageplugins/channelmixer/imageplugin_channelmixer.cpp index f109d70b..054437fa 100644 --- a/digikam/imageplugins/channelmixer/imageplugin_channelmixer.cpp +++ b/digikam/imageplugins/channelmixer/imageplugin_channelmixer.cpp @@ -41,9 +41,9 @@ using namespace DigikamChannelMixerImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_channelmixer, KGenericFactory("digikamimageplugin_channelmixer")) -ImagePlugin_ChannelMixer::ImagePlugin_ChannelMixer(TQObject *tqparent, const char*, +ImagePlugin_ChannelMixer::ImagePlugin_ChannelMixer(TQObject *parent, const char*, const TQStringList &) - : Digikam::ImagePlugin(tqparent, "ImagePlugin_ChannelMixer") + : Digikam::ImagePlugin(parent, "ImagePlugin_ChannelMixer") { m_channelMixerAction = new KAction(i18n("Channel Mixer..."), "channelmixer", CTRL+Key_H, diff --git a/digikam/imageplugins/channelmixer/imageplugin_channelmixer.h b/digikam/imageplugins/channelmixer/imageplugin_channelmixer.h index a717084b..6819f0be 100644 --- a/digikam/imageplugins/channelmixer/imageplugin_channelmixer.h +++ b/digikam/imageplugins/channelmixer/imageplugin_channelmixer.h @@ -38,7 +38,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_ChannelMixer : public Digikam::Imag public: - ImagePlugin_ChannelMixer(TQObject *tqparent, const char* name, + ImagePlugin_ChannelMixer(TQObject *parent, const char* name, const TQStringList &args); ~ImagePlugin_ChannelMixer(); diff --git a/digikam/imageplugins/charcoal/charcoal.cpp b/digikam/imageplugins/charcoal/charcoal.cpp index 9c271fd2..20eef609 100644 --- a/digikam/imageplugins/charcoal/charcoal.cpp +++ b/digikam/imageplugins/charcoal/charcoal.cpp @@ -42,8 +42,8 @@ namespace DigikamCharcoalImagesPlugin { -Charcoal::Charcoal(Digikam::DImg *orgImage, TQObject *tqparent, double pencil, double smooth) - : Digikam::DImgThreadedFilter(orgImage, tqparent, "Charcoal") +Charcoal::Charcoal(Digikam::DImg *orgImage, TQObject *parent, double pencil, double smooth) + : Digikam::DImgThreadedFilter(orgImage, parent, "Charcoal") { m_pencil = pencil; m_smooth = smooth; diff --git a/digikam/imageplugins/charcoal/charcoal.h b/digikam/imageplugins/charcoal/charcoal.h index 8139b609..2088ccc4 100644 --- a/digikam/imageplugins/charcoal/charcoal.h +++ b/digikam/imageplugins/charcoal/charcoal.h @@ -36,7 +36,7 @@ class Charcoal : public Digikam::DImgThreadedFilter public: - Charcoal(Digikam::DImg *orgImage, TQObject *tqparent=0, double pencil=5.0, double smooth=10.0); + Charcoal(Digikam::DImg *orgImage, TQObject *parent=0, double pencil=5.0, double smooth=10.0); ~Charcoal(){}; private: diff --git a/digikam/imageplugins/charcoal/charcoaltool.cpp b/digikam/imageplugins/charcoal/charcoaltool.cpp index a9d77ff3..712c252f 100644 --- a/digikam/imageplugins/charcoal/charcoaltool.cpp +++ b/digikam/imageplugins/charcoal/charcoaltool.cpp @@ -59,8 +59,8 @@ using namespace Digikam; namespace DigikamCharcoalImagesPlugin { -CharcoalTool::CharcoalTool(TQObject* tqparent) - : EditorToolThreaded(tqparent) +CharcoalTool::CharcoalTool(TQObject* parent) + : EditorToolThreaded(parent) { setName("charcoal"); setToolName(i18n("Charcoal")); diff --git a/digikam/imageplugins/charcoal/charcoaltool.h b/digikam/imageplugins/charcoal/charcoaltool.h index 3accf241..82be670a 100644 --- a/digikam/imageplugins/charcoal/charcoaltool.h +++ b/digikam/imageplugins/charcoal/charcoaltool.h @@ -50,7 +50,7 @@ class CharcoalTool : public Digikam::EditorToolThreaded public: - CharcoalTool(TQObject* tqparent); + CharcoalTool(TQObject* parent); ~CharcoalTool(); private slots: diff --git a/digikam/imageplugins/charcoal/imageeffect_charcoal.cpp b/digikam/imageplugins/charcoal/imageeffect_charcoal.cpp index 475e726b..cbfd0467 100644 --- a/digikam/imageplugins/charcoal/imageeffect_charcoal.cpp +++ b/digikam/imageplugins/charcoal/imageeffect_charcoal.cpp @@ -52,8 +52,8 @@ namespace DigikamCharcoalImagesPlugin { -ImageEffect_Charcoal::ImageEffect_Charcoal(TQWidget* tqparent) - : Digikam::CtrlPanelDlg(tqparent, i18n("Charcoal Drawing"), +ImageEffect_Charcoal::ImageEffect_Charcoal(TQWidget* parent) + : Digikam::CtrlPanelDlg(parent, i18n("Charcoal Drawing"), "charcoal", false, false, true, Digikam::ImagePannelWidget::SeparateViewAll) { diff --git a/digikam/imageplugins/charcoal/imageeffect_charcoal.h b/digikam/imageplugins/charcoal/imageeffect_charcoal.h index 473120f9..5cefc62e 100644 --- a/digikam/imageplugins/charcoal/imageeffect_charcoal.h +++ b/digikam/imageplugins/charcoal/imageeffect_charcoal.h @@ -41,7 +41,7 @@ class ImageEffect_Charcoal : public Digikam::CtrlPanelDlg public: - ImageEffect_Charcoal(TQWidget* tqparent); + ImageEffect_Charcoal(TQWidget* parent); ~ImageEffect_Charcoal(); private slots: diff --git a/digikam/imageplugins/charcoal/imageplugin_charcoal.cpp b/digikam/imageplugins/charcoal/imageplugin_charcoal.cpp index 5e0514c9..b2f637ba 100644 --- a/digikam/imageplugins/charcoal/imageplugin_charcoal.cpp +++ b/digikam/imageplugins/charcoal/imageplugin_charcoal.cpp @@ -43,9 +43,9 @@ using namespace DigikamCharcoalImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_charcoal, KGenericFactory("digikamimageplugin_charcoal")); -ImagePlugin_Charcoal::ImagePlugin_Charcoal(TQObject *tqparent, const char*, +ImagePlugin_Charcoal::ImagePlugin_Charcoal(TQObject *parent, const char*, const TQStringList &) - : Digikam::ImagePlugin(tqparent, "ImagePlugin_Charcoal") + : Digikam::ImagePlugin(parent, "ImagePlugin_Charcoal") { m_charcoalAction = new KAction(i18n("Charcoal Drawing..."), "charcoaltool", 0, this, TQT_SLOT(slotCharcoal()), diff --git a/digikam/imageplugins/charcoal/imageplugin_charcoal.h b/digikam/imageplugins/charcoal/imageplugin_charcoal.h index d7999437..5b018585 100644 --- a/digikam/imageplugins/charcoal/imageplugin_charcoal.h +++ b/digikam/imageplugins/charcoal/imageplugin_charcoal.h @@ -39,7 +39,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_Charcoal : public Digikam::ImagePlu public: - ImagePlugin_Charcoal(TQObject *tqparent, const char* name, + ImagePlugin_Charcoal(TQObject *parent, const char* name, const TQStringList &args); ~ImagePlugin_Charcoal(); diff --git a/digikam/imageplugins/colorfx/colorfxtool.cpp b/digikam/imageplugins/colorfx/colorfxtool.cpp index a0f81f36..7be43586 100644 --- a/digikam/imageplugins/colorfx/colorfxtool.cpp +++ b/digikam/imageplugins/colorfx/colorfxtool.cpp @@ -76,8 +76,8 @@ using namespace Digikam; namespace DigikamColorFXImagesPlugin { -ColorFXTool::ColorFXTool(TQObject* tqparent) - : EditorTool(tqparent) +ColorFXTool::ColorFXTool(TQObject* parent) + : EditorTool(parent) { setName("coloreffects"); setToolName(i18n("Color Effects")); diff --git a/digikam/imageplugins/colorfx/colorfxtool.h b/digikam/imageplugins/colorfx/colorfxtool.h index 4feeba6a..65e18edf 100644 --- a/digikam/imageplugins/colorfx/colorfxtool.h +++ b/digikam/imageplugins/colorfx/colorfxtool.h @@ -58,7 +58,7 @@ class ColorFXTool : public Digikam::EditorTool public: - ColorFXTool(TQObject *tqparent); + ColorFXTool(TQObject *parent); ~ColorFXTool(); private: diff --git a/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp b/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp index 59637c34..17eadbfc 100644 --- a/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp +++ b/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp @@ -68,8 +68,8 @@ namespace DigikamColorFXImagesPlugin { -ImageEffect_ColorFX::ImageEffect_ColorFX(TQWidget* tqparent) - : Digikam::ImageDlgBase(tqparent, +ImageEffect_ColorFX::ImageEffect_ColorFX(TQWidget* parent) + : Digikam::ImageDlgBase(parent, i18n("Apply Color Special Effects to Photograph"), "coloreffect", false, false) { diff --git a/digikam/imageplugins/colorfx/imageeffect_colorfx.h b/digikam/imageplugins/colorfx/imageeffect_colorfx.h index 3f83f820..65d11a2f 100644 --- a/digikam/imageplugins/colorfx/imageeffect_colorfx.h +++ b/digikam/imageplugins/colorfx/imageeffect_colorfx.h @@ -54,7 +54,7 @@ class ImageEffect_ColorFX : public Digikam::ImageDlgBase public: - ImageEffect_ColorFX(TQWidget *tqparent); + ImageEffect_ColorFX(TQWidget *parent); ~ImageEffect_ColorFX(); private: diff --git a/digikam/imageplugins/colorfx/imageplugin_colorfx.cpp b/digikam/imageplugins/colorfx/imageplugin_colorfx.cpp index 2e081816..b45b41d5 100644 --- a/digikam/imageplugins/colorfx/imageplugin_colorfx.cpp +++ b/digikam/imageplugins/colorfx/imageplugin_colorfx.cpp @@ -44,8 +44,8 @@ using namespace DigikamColorFXImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_colorfx, KGenericFactory("digikamimageplugin_colorfx")); -ImagePlugin_ColorFX::ImagePlugin_ColorFX(TQObject *tqparent, const char*, const TQStringList &) - : Digikam::ImagePlugin(tqparent, "ImagePlugin_ColorFX") +ImagePlugin_ColorFX::ImagePlugin_ColorFX(TQObject *parent, const char*, const TQStringList &) + : Digikam::ImagePlugin(parent, "ImagePlugin_ColorFX") { m_solarizeAction = new KAction(i18n("Color Effects..."), "colorfx", 0, this, TQT_SLOT(slotColorFX()), diff --git a/digikam/imageplugins/colorfx/imageplugin_colorfx.h b/digikam/imageplugins/colorfx/imageplugin_colorfx.h index 8b4896db..a65ea4f7 100644 --- a/digikam/imageplugins/colorfx/imageplugin_colorfx.h +++ b/digikam/imageplugins/colorfx/imageplugin_colorfx.h @@ -40,7 +40,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_ColorFX : public Digikam::ImagePlug public: - ImagePlugin_ColorFX(TQObject *tqparent, const char* name, const TQStringList &args); + ImagePlugin_ColorFX(TQObject *parent, const char* name, const TQStringList &args); ~ImagePlugin_ColorFX(); void setEnabledActions(bool enable); diff --git a/digikam/imageplugins/coreplugin/autocorrectiontool.cpp b/digikam/imageplugins/coreplugin/autocorrectiontool.cpp index 252505fc..3928cf36 100644 --- a/digikam/imageplugins/coreplugin/autocorrectiontool.cpp +++ b/digikam/imageplugins/coreplugin/autocorrectiontool.cpp @@ -72,8 +72,8 @@ using namespace Digikam; namespace DigikamImagesPluginCore { -AutoCorrectionTool::AutoCorrectionTool(TQObject* tqparent) - : EditorTool(tqparent) +AutoCorrectionTool::AutoCorrectionTool(TQObject* parent) + : EditorTool(parent) { setName("autocorrection"); setToolName(i18n("Auto-Correction")); diff --git a/digikam/imageplugins/coreplugin/autocorrectiontool.h b/digikam/imageplugins/coreplugin/autocorrectiontool.h index 60c9214e..301a1a1c 100644 --- a/digikam/imageplugins/coreplugin/autocorrectiontool.h +++ b/digikam/imageplugins/coreplugin/autocorrectiontool.h @@ -56,7 +56,7 @@ class AutoCorrectionTool : public Digikam::EditorTool public: - AutoCorrectionTool(TQObject *tqparent); + AutoCorrectionTool(TQObject *parent); ~AutoCorrectionTool(); protected: diff --git a/digikam/imageplugins/coreplugin/bcgtool.cpp b/digikam/imageplugins/coreplugin/bcgtool.cpp index 993bcdee..dd944ac9 100644 --- a/digikam/imageplugins/coreplugin/bcgtool.cpp +++ b/digikam/imageplugins/coreplugin/bcgtool.cpp @@ -74,8 +74,8 @@ using namespace Digikam; namespace DigikamImagesPluginCore { -BCGTool::BCGTool(TQObject* tqparent) - : EditorTool(tqparent) +BCGTool::BCGTool(TQObject* parent) + : EditorTool(parent) { setName("bcgadjust"); setToolName(i18n("Brightness / Contrast / Gamma")); diff --git a/digikam/imageplugins/coreplugin/bcgtool.h b/digikam/imageplugins/coreplugin/bcgtool.h index 81900940..d0d38a14 100644 --- a/digikam/imageplugins/coreplugin/bcgtool.h +++ b/digikam/imageplugins/coreplugin/bcgtool.h @@ -58,7 +58,7 @@ class BCGTool : public Digikam::EditorTool public: - BCGTool(TQObject *tqparent); + BCGTool(TQObject *parent); ~BCGTool(); private slots: diff --git a/digikam/imageplugins/coreplugin/blurtool.cpp b/digikam/imageplugins/coreplugin/blurtool.cpp index cc7ff53c..d9a9d446 100644 --- a/digikam/imageplugins/coreplugin/blurtool.cpp +++ b/digikam/imageplugins/coreplugin/blurtool.cpp @@ -59,8 +59,8 @@ using namespace Digikam; namespace DigikamImagesPluginCore { -BlurTool::BlurTool(TQObject* tqparent) - : EditorToolThreaded(tqparent) +BlurTool::BlurTool(TQObject* parent) + : EditorToolThreaded(parent) { setName("gaussianblur"); setToolName(i18n("Blur")); diff --git a/digikam/imageplugins/coreplugin/blurtool.h b/digikam/imageplugins/coreplugin/blurtool.h index 9552f20e..8eee564a 100644 --- a/digikam/imageplugins/coreplugin/blurtool.h +++ b/digikam/imageplugins/coreplugin/blurtool.h @@ -49,7 +49,7 @@ class BlurTool : public Digikam::EditorToolThreaded public: - BlurTool(TQObject *tqparent); + BlurTool(TQObject *parent); ~BlurTool(); private slots: diff --git a/digikam/imageplugins/coreplugin/bwsepiatool.cpp b/digikam/imageplugins/coreplugin/bwsepiatool.cpp index 7d4b67a0..3e7a3e6a 100644 --- a/digikam/imageplugins/coreplugin/bwsepiatool.cpp +++ b/digikam/imageplugins/coreplugin/bwsepiatool.cpp @@ -158,8 +158,8 @@ const TQPixmap* ListBoxBWPreviewItem::pixmap() const // ----------------------------------------------------------------------------------- -BWSepiaTool::BWSepiaTool(TQObject* tqparent) - : EditorTool(tqparent) +BWSepiaTool::BWSepiaTool(TQObject* parent) + : EditorTool(parent) { setName("convertbw"); setToolName(i18n("Black && White")); @@ -840,7 +840,7 @@ void BWSepiaTool::finalRendering() void BWSepiaTool::blackAndWhiteConversion(uchar *data, int w, int h, bool sb, int type) { - // Value to multiply RGB 8 bits component of tqmask used by changeTonality() method. + // Value to multiply RGB 8 bits component of mask used by changeTonality() method. int mul = sb ? 255 : 1; DImgImageFilters filter; double strength = 1.0 + ((double)m_strengthInput->value() - 1.0) * (1.0 / 3.0); diff --git a/digikam/imageplugins/coreplugin/bwsepiatool.h b/digikam/imageplugins/coreplugin/bwsepiatool.h index cd8cde4e..a6168c43 100644 --- a/digikam/imageplugins/coreplugin/bwsepiatool.h +++ b/digikam/imageplugins/coreplugin/bwsepiatool.h @@ -68,7 +68,7 @@ class BWSepiaTool : public Digikam::EditorTool public: - BWSepiaTool(TQObject *tqparent); + BWSepiaTool(TQObject *parent); ~BWSepiaTool(); friend class PreviewPixmapFactory; diff --git a/digikam/imageplugins/coreplugin/hsl/hsltool.cpp b/digikam/imageplugins/coreplugin/hsl/hsltool.cpp index 40bc6a75..b3f610f0 100644 --- a/digikam/imageplugins/coreplugin/hsl/hsltool.cpp +++ b/digikam/imageplugins/coreplugin/hsl/hsltool.cpp @@ -75,8 +75,8 @@ using namespace Digikam; namespace DigikamImagesPluginCore { -HSLTool::HSLTool(TQObject* tqparent) - : EditorTool(tqparent) +HSLTool::HSLTool(TQObject* parent) + : EditorTool(parent) { setName("adjusthsl"); setToolName(i18n("Hue / Saturation / Lightness")); diff --git a/digikam/imageplugins/coreplugin/hsl/hsltool.h b/digikam/imageplugins/coreplugin/hsl/hsltool.h index 29b0207b..f0796e36 100644 --- a/digikam/imageplugins/coreplugin/hsl/hsltool.h +++ b/digikam/imageplugins/coreplugin/hsl/hsltool.h @@ -60,7 +60,7 @@ class HSLTool : public Digikam::EditorTool public: - HSLTool(TQObject *tqparent); + HSLTool(TQObject *parent); ~HSLTool(); private slots: diff --git a/digikam/imageplugins/coreplugin/hsl/hspreviewwidget.cpp b/digikam/imageplugins/coreplugin/hsl/hspreviewwidget.cpp index bbfb1b3a..3dc46f27 100644 --- a/digikam/imageplugins/coreplugin/hsl/hspreviewwidget.cpp +++ b/digikam/imageplugins/coreplugin/hsl/hspreviewwidget.cpp @@ -63,8 +63,8 @@ public: TQPixmap pixmap; }; -HSPreviewWidget::HSPreviewWidget(TQWidget *tqparent, int xBorder) - : TQWidget(tqparent, 0, TQt::WDestructiveClose) +HSPreviewWidget::HSPreviewWidget(TQWidget *parent, int xBorder) + : TQWidget(parent, 0, TQt::WDestructiveClose) { d = new HSPreviewWidgetPrivate; d->xBorder = xBorder; diff --git a/digikam/imageplugins/coreplugin/hsl/hspreviewwidget.h b/digikam/imageplugins/coreplugin/hsl/hspreviewwidget.h index 2fed9c9a..42ce3b65 100644 --- a/digikam/imageplugins/coreplugin/hsl/hspreviewwidget.h +++ b/digikam/imageplugins/coreplugin/hsl/hspreviewwidget.h @@ -40,7 +40,7 @@ class HSPreviewWidget : public TQWidget public: - HSPreviewWidget(TQWidget *tqparent=0, int xBorder=0); + HSPreviewWidget(TQWidget *parent=0, int xBorder=0); ~HSPreviewWidget(); void setHS(double hue, double sat); diff --git a/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp b/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp index 6cd1161a..28cce254 100644 --- a/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp +++ b/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp @@ -68,8 +68,8 @@ namespace DigikamImagesPluginCore { -ImageEffect_HSL::ImageEffect_HSL(TQWidget* tqparent) - : Digikam::ImageDlgBase(tqparent, i18n("Hue/Saturation/Lightness"), "hsladjust", false) +ImageEffect_HSL::ImageEffect_HSL(TQWidget* parent) + : Digikam::ImageDlgBase(parent, i18n("Hue/Saturation/Lightness"), "hsladjust", false) { m_destinationPreviewData = 0L; setHelp("hsladjusttool.anchor", "digikam"); diff --git a/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.h b/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.h index 75966080..544954c7 100644 --- a/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.h +++ b/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.h @@ -54,7 +54,7 @@ class ImageEffect_HSL : public Digikam::ImageDlgBase public: - ImageEffect_HSL(TQWidget *tqparent); + ImageEffect_HSL(TQWidget *parent); ~ImageEffect_HSL(); private slots: diff --git a/digikam/imageplugins/coreplugin/iccprooftool.cpp b/digikam/imageplugins/coreplugin/iccprooftool.cpp index acdacd8f..373896db 100644 --- a/digikam/imageplugins/coreplugin/iccprooftool.cpp +++ b/digikam/imageplugins/coreplugin/iccprooftool.cpp @@ -96,8 +96,8 @@ using namespace Digikam; namespace DigikamImagesPluginCore { -ICCProofTool::ICCProofTool(TQObject* tqparent) - : EditorTool(tqparent) +ICCProofTool::ICCProofTool(TQObject* parent) + : EditorTool(parent) { setName("colormanagement"); setToolName(i18n("Color Management")); diff --git a/digikam/imageplugins/coreplugin/iccprooftool.h b/digikam/imageplugins/coreplugin/iccprooftool.h index 0481fc8e..1d1f4a8b 100644 --- a/digikam/imageplugins/coreplugin/iccprooftool.h +++ b/digikam/imageplugins/coreplugin/iccprooftool.h @@ -68,7 +68,7 @@ class ICCProofTool : public Digikam::EditorTool public: - ICCProofTool(TQObject* tqparent); + ICCProofTool(TQObject* parent); ~ICCProofTool(); protected: diff --git a/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp b/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp index 7842d545..ba1a7323 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp @@ -71,8 +71,8 @@ namespace DigikamImagesPluginCore { -ImageEffect_AutoCorrection::ImageEffect_AutoCorrection(TQWidget* tqparent) - : Digikam::ImageDlgBase(tqparent, i18n("Auto Color Correction"), +ImageEffect_AutoCorrection::ImageEffect_AutoCorrection(TQWidget* parent) + : Digikam::ImageDlgBase(parent, i18n("Auto Color Correction"), "autocorrection", false), m_destinationPreviewData(0L) { setHelp("autocolorcorrectiontool.anchor", "digikam"); diff --git a/digikam/imageplugins/coreplugin/imageeffect_autocorrection.h b/digikam/imageplugins/coreplugin/imageeffect_autocorrection.h index 638930eb..ef81c95f 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_autocorrection.h +++ b/digikam/imageplugins/coreplugin/imageeffect_autocorrection.h @@ -56,7 +56,7 @@ class ImageEffect_AutoCorrection : public Digikam::ImageDlgBase public: - ImageEffect_AutoCorrection(TQWidget *tqparent); + ImageEffect_AutoCorrection(TQWidget *parent); ~ImageEffect_AutoCorrection(); protected: diff --git a/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp b/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp index e523e995..ee4e293c 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp @@ -67,8 +67,8 @@ namespace DigikamImagesPluginCore { -ImageEffect_BCG::ImageEffect_BCG(TQWidget* tqparent) - : Digikam::ImageDlgBase(tqparent, i18n("Brightness Contrast Gamma Adjustments"), +ImageEffect_BCG::ImageEffect_BCG(TQWidget* parent) + : Digikam::ImageDlgBase(parent, i18n("Brightness Contrast Gamma Adjustments"), "bcgadjust", false) { m_destinationPreviewData = 0L; diff --git a/digikam/imageplugins/coreplugin/imageeffect_bcg.h b/digikam/imageplugins/coreplugin/imageeffect_bcg.h index 165bb6f7..0a1e4d66 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_bcg.h +++ b/digikam/imageplugins/coreplugin/imageeffect_bcg.h @@ -55,7 +55,7 @@ class ImageEffect_BCG : public Digikam::ImageDlgBase public: - ImageEffect_BCG(TQWidget *tqparent); + ImageEffect_BCG(TQWidget *parent); ~ImageEffect_BCG(); private slots: diff --git a/digikam/imageplugins/coreplugin/imageeffect_blur.cpp b/digikam/imageplugins/coreplugin/imageeffect_blur.cpp index e90fc8b6..233dc46e 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_blur.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_blur.cpp @@ -50,8 +50,8 @@ namespace DigikamImagesPluginCore { -ImageEffect_Blur::ImageEffect_Blur(TQWidget* tqparent) - : Digikam::CtrlPanelDlg(tqparent, i18n("Apply Gaussian Blur on Photograph"), +ImageEffect_Blur::ImageEffect_Blur(TQWidget* parent) + : Digikam::CtrlPanelDlg(parent, i18n("Apply Gaussian Blur on Photograph"), "gaussianblur", false, true, true) { setHelp("blursharpentool.anchor", "digikam"); diff --git a/digikam/imageplugins/coreplugin/imageeffect_blur.h b/digikam/imageplugins/coreplugin/imageeffect_blur.h index a2383d7c..ce4cac4a 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_blur.h +++ b/digikam/imageplugins/coreplugin/imageeffect_blur.h @@ -40,7 +40,7 @@ class ImageEffect_Blur : public Digikam::CtrlPanelDlg public: - ImageEffect_Blur(TQWidget *tqparent); + ImageEffect_Blur(TQWidget *parent); ~ImageEffect_Blur(); private slots: diff --git a/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp b/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp index 0b4c4f82..2dcff0b2 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp @@ -151,8 +151,8 @@ const TQPixmap* ListBoxBWPreviewItem::pixmap() const // ----------------------------------------------------------------------------------- -ImageEffect_BWSepia::ImageEffect_BWSepia(TQWidget* tqparent) - : Digikam::ImageDlgBase(tqparent, i18n("Convert to Black & White"), +ImageEffect_BWSepia::ImageEffect_BWSepia(TQWidget* parent) + : Digikam::ImageDlgBase(parent, i18n("Convert to Black & White"), "convertbw", true, false), m_destinationPreviewData(0L), m_channelCB(0), @@ -846,7 +846,7 @@ void ImageEffect_BWSepia::finalRendering() void ImageEffect_BWSepia::blackAndWhiteConversion(uchar *data, int w, int h, bool sb, int type) { - // Value to multiply RGB 8 bits component of tqmask used by changeTonality() method. + // Value to multiply RGB 8 bits component of mask used by changeTonality() method. int mul = sb ? 255 : 1; Digikam::DImgImageFilters filter; double strength = 1.0 + ((double)m_strengthInput->value() - 1.0) * (1.0 / 3.0); diff --git a/digikam/imageplugins/coreplugin/imageeffect_bwsepia.h b/digikam/imageplugins/coreplugin/imageeffect_bwsepia.h index 5a31f0db..5ec7f547 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_bwsepia.h +++ b/digikam/imageplugins/coreplugin/imageeffect_bwsepia.h @@ -64,7 +64,7 @@ class ImageEffect_BWSepia : public Digikam::ImageDlgBase public: - ImageEffect_BWSepia(TQWidget *tqparent); + ImageEffect_BWSepia(TQWidget *parent); ~ImageEffect_BWSepia(); friend class PreviewPixmapFactory; diff --git a/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp b/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp index bc0908d7..a1dd583c 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp @@ -89,8 +89,8 @@ namespace DigikamImagesPluginCore { -ImageEffect_ICCProof::ImageEffect_ICCProof(TQWidget* tqparent) - : Digikam::ImageDlgBase(tqparent,i18n("Color Management"), +ImageEffect_ICCProof::ImageEffect_ICCProof(TQWidget* parent) + : Digikam::ImageDlgBase(parent,i18n("Color Management"), "colormanagement", true, false) { m_destinationPreviewData = 0; diff --git a/digikam/imageplugins/coreplugin/imageeffect_iccproof.h b/digikam/imageplugins/coreplugin/imageeffect_iccproof.h index d5fc5e2a..8b605793 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_iccproof.h +++ b/digikam/imageplugins/coreplugin/imageeffect_iccproof.h @@ -64,7 +64,7 @@ class ImageEffect_ICCProof : public Digikam::ImageDlgBase public: - ImageEffect_ICCProof(TQWidget* tqparent); + ImageEffect_ICCProof(TQWidget* parent); ~ImageEffect_ICCProof(); protected: diff --git a/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp b/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp index 9a4c4353..230ae63a 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp @@ -68,8 +68,8 @@ namespace DigikamImagesPluginCore { -ImageEffect_RedEye::ImageEffect_RedEye(TQWidget* tqparent) - : Digikam::ImageDlgBase(tqparent, i18n("Red Eye Reduction"), "redeye", false) +ImageEffect_RedEye::ImageEffect_RedEye(TQWidget* parent) + : Digikam::ImageDlgBase(parent, i18n("Red Eye Reduction"), "redeye", false) { m_destinationPreviewData = 0; setHelp("redeyecorrectiontool.anchor", "digikam"); @@ -394,10 +394,10 @@ void ImageEffect_RedEye::finalRendering() void ImageEffect_RedEye::redEyeFilter(Digikam::DImg& selection) { - Digikam::DImg tqmask(selection.width(), selection.height(), selection.sixteenBit(), true, + Digikam::DImg mask(selection.width(), selection.height(), selection.sixteenBit(), true, selection.bits(), true); - selection = tqmask.copy(); + selection = mask.copy(); float redThreshold = m_redThreshold->value()/10.0; int hue = m_HSSelector->xValue(); int sat = m_HSSelector->yValue(); @@ -437,12 +437,12 @@ void ImageEffect_RedEye::redEyeFilter(Digikam::DImg& selection) green_norm *= coloring.green() / level; blue_norm *= coloring.blue() / level; - // Perform a red color pixels detection in selection image and create a correction tqmask using an alpha channel. + // Perform a red color pixels detection in selection image and create a correction mask using an alpha channel. if (!selection.sixteenBit()) // 8 bits image. { uchar* ptr = selection.bits(); - uchar* mptr = tqmask.bits(); + uchar* mptr = mask.bits(); uchar r, g, b, r1, g1, b1; for (uint i = 0 ; i < selection.width() * selection.height() ; i++) @@ -479,7 +479,7 @@ void ImageEffect_RedEye::redEyeFilter(Digikam::DImg& selection) else // 16 bits image. { unsigned short* ptr = (unsigned short*)selection.bits(); - unsigned short* mptr = (unsigned short*)tqmask.bits(); + unsigned short* mptr = (unsigned short*)mask.bits(); unsigned short r, g, b, r1, g1, b1; for (uint i = 0 ; i < selection.width() * selection.height() ; i++) @@ -514,19 +514,19 @@ void ImageEffect_RedEye::redEyeFilter(Digikam::DImg& selection) } } - // Now, we will blur only the transparency pixels from the tqmask. + // Now, we will blur only the transparency pixels from the mask. - Digikam::DImg tqmask2 = tqmask.copy(); + Digikam::DImg mask2 = mask.copy(); Digikam::DImgImageFilters filter; - filter.gaussianBlurImage(tqmask2.bits(), tqmask2.width(), tqmask2.height(), - tqmask2.sixteenBit(), m_smoothLevel->value()); + filter.gaussianBlurImage(mask2.bits(), mask2.width(), mask2.height(), + mask2.sixteenBit(), m_smoothLevel->value()); if (!selection.sixteenBit()) // 8 bits image. { - uchar* mptr = tqmask.bits(); - uchar* mptr2 = tqmask2.bits(); + uchar* mptr = mask.bits(); + uchar* mptr2 = mask2.bits(); - for (uint i = 0 ; i < tqmask2.width() * tqmask2.height() ; i++) + for (uint i = 0 ; i < mask2.width() * mask2.height() ; i++) { if (mptr2[3] < 255) { @@ -542,10 +542,10 @@ void ImageEffect_RedEye::redEyeFilter(Digikam::DImg& selection) } else // 16 bits image. { - unsigned short* mptr = (unsigned short*)tqmask.bits(); - unsigned short* mptr2 = (unsigned short*)tqmask2.bits(); + unsigned short* mptr = (unsigned short*)mask.bits(); + unsigned short* mptr2 = (unsigned short*)mask2.bits(); - for (uint i = 0 ; i < tqmask2.width() * tqmask2.height() ; i++) + for (uint i = 0 ; i < mask2.width() * mask2.height() ; i++) { if (mptr2[3] < 65535) { @@ -560,14 +560,14 @@ void ImageEffect_RedEye::redEyeFilter(Digikam::DImg& selection) } } - // - Perform pixels blending using alpha channel between the tqmask and the selection. + // - Perform pixels blending using alpha channel between the mask and the selection. Digikam::DColorComposer *composer = Digikam::DColorComposer::getComposer(Digikam::DColorComposer::PorterDuffSrcOver); - // NOTE: 'tqmask' is the Source image, 'selection' is the Destination image. + // NOTE: 'mask' is the Source image, 'selection' is the Destination image. - selection.bitBlendImage(composer, &tqmask, - 0, 0, tqmask.width(), tqmask.height(), + selection.bitBlendImage(composer, &mask, + 0, 0, mask.width(), mask.height(), 0, 0); } diff --git a/digikam/imageplugins/coreplugin/imageeffect_redeye.h b/digikam/imageplugins/coreplugin/imageeffect_redeye.h index e015ef2b..bc6607f8 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_redeye.h +++ b/digikam/imageplugins/coreplugin/imageeffect_redeye.h @@ -58,8 +58,8 @@ class RedEyePassivePopup : public KPassivePopup { public: - RedEyePassivePopup(TQWidget* tqparent) - : KPassivePopup(tqparent), m_parent(tqparent) + RedEyePassivePopup(TQWidget* parent) + : KPassivePopup(parent), m_parent(parent) { } @@ -84,7 +84,7 @@ class ImageEffect_RedEye : public Digikam::ImageDlgBase public: - ImageEffect_RedEye(TQWidget *tqparent); + ImageEffect_RedEye(TQWidget *parent); ~ImageEffect_RedEye(); private slots: diff --git a/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp b/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp index b57dfb25..f8364789 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp @@ -66,8 +66,8 @@ namespace DigikamImagesPluginCore { -ImageEffect_RGB::ImageEffect_RGB(TQWidget* tqparent) - : Digikam::ImageDlgBase(tqparent, i18n("Color Balance"), "colorbalance", false) +ImageEffect_RGB::ImageEffect_RGB(TQWidget* parent) + : Digikam::ImageDlgBase(parent, i18n("Color Balance"), "colorbalance", false) { m_destinationPreviewData = 0L; setHelp("colorbalancetool.anchor", "digikam"); diff --git a/digikam/imageplugins/coreplugin/imageeffect_rgb.h b/digikam/imageplugins/coreplugin/imageeffect_rgb.h index 23e4bd94..3410d65c 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_rgb.h +++ b/digikam/imageplugins/coreplugin/imageeffect_rgb.h @@ -52,7 +52,7 @@ class ImageEffect_RGB : public Digikam::ImageDlgBase public: - ImageEffect_RGB(TQWidget *tqparent); + ImageEffect_RGB(TQWidget *parent); ~ImageEffect_RGB(); private: diff --git a/digikam/imageplugins/coreplugin/imageplugin_core.cpp b/digikam/imageplugins/coreplugin/imageplugin_core.cpp index 9fcc6a95..ba131af7 100644 --- a/digikam/imageplugins/coreplugin/imageplugin_core.cpp +++ b/digikam/imageplugins/coreplugin/imageplugin_core.cpp @@ -59,8 +59,8 @@ using namespace Digikam; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_core, KGenericFactory("digikam")); -ImagePlugin_Core::ImagePlugin_Core(TQObject *tqparent, const char*, const TQStringList&) - : ImagePlugin(tqparent, "ImagePlugin_Core") +ImagePlugin_Core::ImagePlugin_Core(TQObject *parent, const char*, const TQStringList&) + : ImagePlugin(parent, "ImagePlugin_Core") { //------------------------------- // Fix and Colors menu actions diff --git a/digikam/imageplugins/coreplugin/imageplugin_core.h b/digikam/imageplugins/coreplugin/imageplugin_core.h index eeb88eee..67363d60 100644 --- a/digikam/imageplugins/coreplugin/imageplugin_core.h +++ b/digikam/imageplugins/coreplugin/imageplugin_core.h @@ -39,7 +39,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_Core : public Digikam::ImagePlugin public: - ImagePlugin_Core(TQObject *tqparent, const char* name, const TQStringList &args); + ImagePlugin_Core(TQObject *parent, const char* name, const TQStringList &args); ~ImagePlugin_Core(); void setEnabledSelectionActions(bool enable); diff --git a/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp b/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp index 10d3d7bd..553cf869 100644 --- a/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp +++ b/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp @@ -61,8 +61,8 @@ namespace DigikamImagesPluginCore { -ImageEffect_RatioCrop::ImageEffect_RatioCrop(TQWidget* tqparent) - : Digikam::ImageDlgBase(tqparent, i18n("Aspect Ratio Crop & Composition Guide"), +ImageEffect_RatioCrop::ImageEffect_RatioCrop(TQWidget* parent) + : Digikam::ImageDlgBase(parent, i18n("Aspect Ratio Crop & Composition Guide"), "aspectratiocrop", false) { setHelp("ratiocroptool.anchor", "digikam"); diff --git a/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.h b/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.h index 3851b76d..fb09e66a 100644 --- a/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.h +++ b/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.h @@ -52,7 +52,7 @@ class ImageEffect_RatioCrop : public Digikam::ImageDlgBase public: - ImageEffect_RatioCrop(TQWidget *tqparent); + ImageEffect_RatioCrop(TQWidget *parent); ~ImageEffect_RatioCrop(); private: diff --git a/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp b/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp index 6a9d95e7..c87ef44c 100644 --- a/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp +++ b/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp @@ -139,10 +139,10 @@ public: Digikam::ImageIface *iface; }; -ImageSelectionWidget::ImageSelectionWidget(int w, int h, TQWidget *tqparent, +ImageSelectionWidget::ImageSelectionWidget(int w, int h, TQWidget *parent, int widthRatioValue, int heightRatioValue, int aspectRatioType, int orient, int guideLinesType) - : TQWidget(tqparent, 0, TQt::WDestructiveClose) + : TQWidget(parent, 0, TQt::WDestructiveClose) { d = new ImageSelectionWidgetPriv; d->currentAspectRatioType = aspectRatioType; diff --git a/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.h b/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.h index 34c88556..154ae65c 100644 --- a/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.h +++ b/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.h @@ -90,7 +90,7 @@ public: public: - ImageSelectionWidget(int width, int height, TQWidget *tqparent=0, + ImageSelectionWidget(int width, int height, TQWidget *parent=0, int widthRatioValue=1, int heightRatioValue=1, int aspectRatio=RATIO01X01, int orient=Landscape, int guideLinesType=GuideNone); diff --git a/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp b/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp index 9eb5922e..f8a2e383 100644 --- a/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp +++ b/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp @@ -71,8 +71,8 @@ using namespace Digikam; namespace DigikamImagesPluginCore { -RatioCropTool::RatioCropTool(TQObject* tqparent) - : EditorTool(tqparent) +RatioCropTool::RatioCropTool(TQObject* parent) + : EditorTool(parent) { setName("aspectratiocrop"); setToolName(i18n("Aspect Ratio Crop")); diff --git a/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.h b/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.h index d7625b12..f3ff2878 100644 --- a/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.h +++ b/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.h @@ -54,7 +54,7 @@ class RatioCropTool : public Digikam::EditorTool public: - RatioCropTool(TQObject *tqparent); + RatioCropTool(TQObject *parent); ~RatioCropTool(); private: diff --git a/digikam/imageplugins/coreplugin/redeyetool.cpp b/digikam/imageplugins/coreplugin/redeyetool.cpp index b9438b97..563d776e 100644 --- a/digikam/imageplugins/coreplugin/redeyetool.cpp +++ b/digikam/imageplugins/coreplugin/redeyetool.cpp @@ -76,8 +76,8 @@ using namespace Digikam; namespace DigikamImagesPluginCore { -RedEyeTool::RedEyeTool(TQObject* tqparent) - : EditorTool(tqparent) +RedEyeTool::RedEyeTool(TQObject* parent) + : EditorTool(parent) { setName("redeye"); setToolName(i18n("Red Eye")); @@ -407,10 +407,10 @@ void RedEyeTool::finalRendering() void RedEyeTool::redEyeFilter(DImg& selection) { - DImg tqmask(selection.width(), selection.height(), selection.sixteenBit(), true, + DImg mask(selection.width(), selection.height(), selection.sixteenBit(), true, selection.bits(), true); - selection = tqmask.copy(); + selection = mask.copy(); float redThreshold = m_redThreshold->value()/10.0; int hue = m_HSSelector->xValue(); int sat = m_HSSelector->yValue(); @@ -450,12 +450,12 @@ void RedEyeTool::redEyeFilter(DImg& selection) green_norm *= coloring.green() / level; blue_norm *= coloring.blue() / level; - // Perform a red color pixels detection in selection image and create a correction tqmask using an alpha channel. + // Perform a red color pixels detection in selection image and create a correction mask using an alpha channel. if (!selection.sixteenBit()) // 8 bits image. { uchar* ptr = selection.bits(); - uchar* mptr = tqmask.bits(); + uchar* mptr = mask.bits(); uchar r, g, b, r1, g1, b1; for (uint i = 0 ; i < selection.width() * selection.height() ; i++) @@ -492,7 +492,7 @@ void RedEyeTool::redEyeFilter(DImg& selection) else // 16 bits image. { unsigned short* ptr = (unsigned short*)selection.bits(); - unsigned short* mptr = (unsigned short*)tqmask.bits(); + unsigned short* mptr = (unsigned short*)mask.bits(); unsigned short r, g, b, r1, g1, b1; for (uint i = 0 ; i < selection.width() * selection.height() ; i++) @@ -527,19 +527,19 @@ void RedEyeTool::redEyeFilter(DImg& selection) } } - // Now, we will blur only the transparency pixels from the tqmask. + // Now, we will blur only the transparency pixels from the mask. - DImg tqmask2 = tqmask.copy(); + DImg mask2 = mask.copy(); DImgImageFilters filter; - filter.gaussianBlurImage(tqmask2.bits(), tqmask2.width(), tqmask2.height(), - tqmask2.sixteenBit(), m_smoothLevel->value()); + filter.gaussianBlurImage(mask2.bits(), mask2.width(), mask2.height(), + mask2.sixteenBit(), m_smoothLevel->value()); if (!selection.sixteenBit()) // 8 bits image. { - uchar* mptr = tqmask.bits(); - uchar* mptr2 = tqmask2.bits(); + uchar* mptr = mask.bits(); + uchar* mptr2 = mask2.bits(); - for (uint i = 0 ; i < tqmask2.width() * tqmask2.height() ; i++) + for (uint i = 0 ; i < mask2.width() * mask2.height() ; i++) { if (mptr2[3] < 255) { @@ -555,10 +555,10 @@ void RedEyeTool::redEyeFilter(DImg& selection) } else // 16 bits image. { - unsigned short* mptr = (unsigned short*)tqmask.bits(); - unsigned short* mptr2 = (unsigned short*)tqmask2.bits(); + unsigned short* mptr = (unsigned short*)mask.bits(); + unsigned short* mptr2 = (unsigned short*)mask2.bits(); - for (uint i = 0 ; i < tqmask2.width() * tqmask2.height() ; i++) + for (uint i = 0 ; i < mask2.width() * mask2.height() ; i++) { if (mptr2[3] < 65535) { @@ -573,14 +573,14 @@ void RedEyeTool::redEyeFilter(DImg& selection) } } - // - Perform pixels blending using alpha channel between the tqmask and the selection. + // - Perform pixels blending using alpha channel between the mask and the selection. DColorComposer *composer = DColorComposer::getComposer(DColorComposer::PorterDuffSrcOver); - // NOTE: 'tqmask' is the Source image, 'selection' is the Destination image. + // NOTE: 'mask' is the Source image, 'selection' is the Destination image. - selection.bitBlendImage(composer, &tqmask, - 0, 0, tqmask.width(), tqmask.height(), + selection.bitBlendImage(composer, &mask, + 0, 0, mask.width(), mask.height(), 0, 0); } diff --git a/digikam/imageplugins/coreplugin/redeyetool.h b/digikam/imageplugins/coreplugin/redeyetool.h index b1d85ae1..1487a171 100644 --- a/digikam/imageplugins/coreplugin/redeyetool.h +++ b/digikam/imageplugins/coreplugin/redeyetool.h @@ -62,8 +62,8 @@ class RedEyePassivePopup : public KPassivePopup { public: - RedEyePassivePopup(TQWidget* tqparent) - : KPassivePopup(tqparent), m_parent(tqparent) + RedEyePassivePopup(TQWidget* parent) + : KPassivePopup(parent), m_parent(parent) { } @@ -88,7 +88,7 @@ class RedEyeTool : public Digikam::EditorTool public: - RedEyeTool(TQObject *tqparent); + RedEyeTool(TQObject *parent); ~RedEyeTool(); private slots: diff --git a/digikam/imageplugins/coreplugin/rgbtool.cpp b/digikam/imageplugins/coreplugin/rgbtool.cpp index 545409ec..df69f9d7 100644 --- a/digikam/imageplugins/coreplugin/rgbtool.cpp +++ b/digikam/imageplugins/coreplugin/rgbtool.cpp @@ -73,8 +73,8 @@ using namespace Digikam; namespace DigikamImagesPluginCore { -RGBTool::RGBTool(TQObject* tqparent) - : EditorTool(tqparent) +RGBTool::RGBTool(TQObject* parent) + : EditorTool(parent) { setName("colorbalance"); setToolName(i18n("Color Balance")); diff --git a/digikam/imageplugins/coreplugin/rgbtool.h b/digikam/imageplugins/coreplugin/rgbtool.h index 7031ad48..526811d1 100644 --- a/digikam/imageplugins/coreplugin/rgbtool.h +++ b/digikam/imageplugins/coreplugin/rgbtool.h @@ -56,7 +56,7 @@ class RGBTool : public Digikam::EditorTool public: - RGBTool(TQObject *tqparent); + RGBTool(TQObject *parent); ~RGBTool(); private: diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/err.c b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/err.c index 265f089d..de6f2cc8 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/err.c +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/err.c @@ -150,13 +150,13 @@ f__fatal(int n, char *s) else fprintf(stderr,"%s: %s\n",s,F_err[n-100]); if (f__curunit) { - fprintf(stderr,"aptqparent state: unit %d ", + fprintf(stderr,"apparent state: unit %d ", (int)(f__curunit-f__units)); fprintf(stderr, f__curunit->ufnm ? "named %s\n" : "(unnamed)\n", f__curunit->ufnm); } else - fprintf(stderr,"aptqparent state: internal I/O\n"); + fprintf(stderr,"apparent state: internal I/O\n"); if (f__fmtbuf) fprintf(stderr,"last format: %s\n",f__fmtbuf); fprintf(stderr,"lately %s %s %s %s",f__reading?"reading":"writing", diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp b/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp index 17adbe08..360eb913 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp @@ -62,8 +62,8 @@ namespace DigikamImagesPluginCore { -ImageEffect_Sharpen::ImageEffect_Sharpen(TQWidget* tqparent) - : Digikam::CtrlPanelDlg(tqparent, i18n("Sharpening Photograph"), "sharpen", +ImageEffect_Sharpen::ImageEffect_Sharpen(TQWidget* parent) + : Digikam::CtrlPanelDlg(parent, i18n("Sharpening Photograph"), "sharpen", true, true, true) { setHelp("blursharpentool.anchor", "digikam"); @@ -77,7 +77,7 @@ ImageEffect_Sharpen::ImageEffect_Sharpen(TQWidget* tqparent) m_sharpMethod = new TQComboBox( false, gboxSettings ); m_sharpMethod->insertItem( i18n("Simple sharp") ); - m_sharpMethod->insertItem( i18n("Unsharp tqmask") ); + m_sharpMethod->insertItem( i18n("Unsharp mask") ); m_sharpMethod->insertItem( i18n("Refocus") ); TQWhatsThis::add( m_sharpMethod, i18n("

    Select the sharpening method to apply to the image.")); diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.h b/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.h index e6c73589..b4d2e743 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.h +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.h @@ -49,7 +49,7 @@ class ImageEffect_Sharpen : public Digikam::CtrlPanelDlg public: - ImageEffect_Sharpen(TQWidget *tqparent); + ImageEffect_Sharpen(TQWidget *parent); ~ImageEffect_Sharpen(); private slots: diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/refocus.cpp b/digikam/imageplugins/coreplugin/sharpnesseditor/refocus.cpp index 4198ba20..7e99d663 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/refocus.cpp +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/refocus.cpp @@ -37,9 +37,9 @@ namespace DigikamImagesPluginCore { -Refocus::Refocus(Digikam::DImg *orgImage, TQObject *tqparent, int matrixSize, double radius, +Refocus::Refocus(Digikam::DImg *orgImage, TQObject *parent, int matrixSize, double radius, double gauss, double correlation, double noise) - : Digikam::DImgThreadedFilter(orgImage, tqparent, "Refocus") + : Digikam::DImgThreadedFilter(orgImage, parent, "Refocus") { m_matrixSize = matrixSize; m_radius = radius; diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/refocus.h b/digikam/imageplugins/coreplugin/sharpnesseditor/refocus.h index 32cff8a2..323b24b9 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/refocus.h +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/refocus.h @@ -36,7 +36,7 @@ class Refocus : public Digikam::DImgThreadedFilter public: - Refocus(Digikam::DImg *orgImage, TQObject *tqparent=0, int matrixSize=5, double radius=0.9, + Refocus(Digikam::DImg *orgImage, TQObject *parent=0, int matrixSize=5, double radius=0.9, double gauss=0.0, double correlation=0.5, double noise=0.01); ~Refocus(){}; diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp b/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp index fbe33971..68d4ace8 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp @@ -71,8 +71,8 @@ using namespace Digikam; namespace DigikamImagesPluginCore { -SharpenTool::SharpenTool(TQObject* tqparent) - : EditorToolThreaded(tqparent) +SharpenTool::SharpenTool(TQObject* parent) + : EditorToolThreaded(parent) { setName("sharpen"); setToolName(i18n("Sharpen")); @@ -94,7 +94,7 @@ SharpenTool::SharpenTool(TQObject* tqparent) m_sharpMethod = new RComboBox(m_gboxSettings->plainPage()); m_sharpMethod->insertItem( i18n("Simple sharp") ); - m_sharpMethod->insertItem( i18n("Unsharp tqmask") ); + m_sharpMethod->insertItem( i18n("Unsharp mask") ); m_sharpMethod->insertItem( i18n("Refocus") ); m_sharpMethod->setDefaultItem(SimpleSharp); TQWhatsThis::add( m_sharpMethod, i18n("

    Select the sharpening method to apply to the image.")); diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.h b/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.h index 1056f0c8..296e8c6a 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.h +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.h @@ -54,7 +54,7 @@ class SharpenTool : public Digikam::EditorToolThreaded public: - SharpenTool(TQObject *tqparent); + SharpenTool(TQObject *parent); ~SharpenTool(); private slots: diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/unsharp.cpp b/digikam/imageplugins/coreplugin/sharpnesseditor/unsharp.cpp index f6e829fe..fb1b9d21 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/unsharp.cpp +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/unsharp.cpp @@ -38,9 +38,9 @@ namespace DigikamImagesPluginCore { -UnsharpMask::UnsharpMask(Digikam::DImg *orgImage, TQObject *tqparent, int radius, +UnsharpMask::UnsharpMask(Digikam::DImg *orgImage, TQObject *parent, int radius, double amount, double threshold) - : DImgThreadedFilter(orgImage, tqparent, "UnsharpMask") + : DImgThreadedFilter(orgImage, parent, "UnsharpMask") { m_radius = radius; m_amount = amount; diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/unsharp.h b/digikam/imageplugins/coreplugin/sharpnesseditor/unsharp.h index 5c4b4727..a1780ab4 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/unsharp.h +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/unsharp.h @@ -36,7 +36,7 @@ class UnsharpMask : public Digikam::DImgThreadedFilter public: - UnsharpMask(Digikam::DImg *orgImage, TQObject *tqparent=0, int radius=1, + UnsharpMask(Digikam::DImg *orgImage, TQObject *parent=0, int radius=1, double amount=1.0, double threshold=0.05); ~UnsharpMask(){}; diff --git a/digikam/imageplugins/distortionfx/distortionfx.cpp b/digikam/imageplugins/distortionfx/distortionfx.cpp index a2e424a2..79f7195d 100644 --- a/digikam/imageplugins/distortionfx/distortionfx.cpp +++ b/digikam/imageplugins/distortionfx/distortionfx.cpp @@ -46,9 +46,9 @@ namespace DigikamDistortionFXImagesPlugin { -DistortionFX::DistortionFX(Digikam::DImg *orgImage, TQObject *tqparent, int effectType, +DistortionFX::DistortionFX(Digikam::DImg *orgImage, TQObject *parent, int effectType, int level, int iteration, bool antialiasing) - : Digikam::DImgThreadedFilter(orgImage, tqparent, "DistortionFX") + : Digikam::DImgThreadedFilter(orgImage, parent, "DistortionFX") { m_effectType = effectType; m_level = level; diff --git a/digikam/imageplugins/distortionfx/distortionfx.h b/digikam/imageplugins/distortionfx/distortionfx.h index a79209f8..79768c81 100644 --- a/digikam/imageplugins/distortionfx/distortionfx.h +++ b/digikam/imageplugins/distortionfx/distortionfx.h @@ -44,7 +44,7 @@ class DistortionFX : public Digikam::DImgThreadedFilter public: - DistortionFX(Digikam::DImg *orgImage, TQObject *tqparent=0, int effectType=0, + DistortionFX(Digikam::DImg *orgImage, TQObject *parent=0, int effectType=0, int level=0, int iteration=0, bool antialiasing=true); ~DistortionFX(){}; diff --git a/digikam/imageplugins/distortionfx/distortionfxtool.cpp b/digikam/imageplugins/distortionfx/distortionfxtool.cpp index 5b02ed9b..8dc0fcd8 100644 --- a/digikam/imageplugins/distortionfx/distortionfxtool.cpp +++ b/digikam/imageplugins/distortionfx/distortionfxtool.cpp @@ -69,8 +69,8 @@ using namespace Digikam; namespace DigikamDistortionFXImagesPlugin { -DistortionFXTool::DistortionFXTool(TQObject* tqparent) - : EditorToolThreaded(tqparent) +DistortionFXTool::DistortionFXTool(TQObject* parent) + : EditorToolThreaded(parent) { setName("distortionfx"); setToolName(i18n("Distortion Effects")); diff --git a/digikam/imageplugins/distortionfx/distortionfxtool.h b/digikam/imageplugins/distortionfx/distortionfxtool.h index 9eac642d..aff64209 100644 --- a/digikam/imageplugins/distortionfx/distortionfxtool.h +++ b/digikam/imageplugins/distortionfx/distortionfxtool.h @@ -55,7 +55,7 @@ class DistortionFXTool : public Digikam::EditorToolThreaded public: - DistortionFXTool(TQObject *tqparent); + DistortionFXTool(TQObject *parent); ~DistortionFXTool(); private slots: diff --git a/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp b/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp index 583c70f3..926b4672 100644 --- a/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp +++ b/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp @@ -61,8 +61,8 @@ namespace DigikamDistortionFXImagesPlugin { -ImageEffect_DistortionFX::ImageEffect_DistortionFX(TQWidget* tqparent) - : Digikam::ImageGuideDlg(tqparent, i18n("Distortion Effects"), +ImageEffect_DistortionFX::ImageEffect_DistortionFX(TQWidget* parent) + : Digikam::ImageGuideDlg(parent, i18n("Distortion Effects"), "distortionfx", false, true, false, Digikam::ImageGuideWidget::HVGuideMode) { diff --git a/digikam/imageplugins/distortionfx/imageeffect_distortionfx.h b/digikam/imageplugins/distortionfx/imageeffect_distortionfx.h index 5419407f..610e3448 100644 --- a/digikam/imageplugins/distortionfx/imageeffect_distortionfx.h +++ b/digikam/imageplugins/distortionfx/imageeffect_distortionfx.h @@ -47,7 +47,7 @@ class ImageEffect_DistortionFX : public Digikam::ImageGuideDlg public: - ImageEffect_DistortionFX(TQWidget *tqparent); + ImageEffect_DistortionFX(TQWidget *parent); ~ImageEffect_DistortionFX(); private slots: diff --git a/digikam/imageplugins/distortionfx/imageplugin_distortionfx.cpp b/digikam/imageplugins/distortionfx/imageplugin_distortionfx.cpp index 1c82b3a5..87dd6d46 100644 --- a/digikam/imageplugins/distortionfx/imageplugin_distortionfx.cpp +++ b/digikam/imageplugins/distortionfx/imageplugin_distortionfx.cpp @@ -44,8 +44,8 @@ using namespace DigikamDistortionFXImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_distortionfx, KGenericFactory("digikamimageplugin_distortionfx")); -ImagePlugin_DistortionFX::ImagePlugin_DistortionFX(TQObject *tqparent, const char*, const TQStringList &) - : Digikam::ImagePlugin(tqparent, "ImagePlugin_DistortionFX") +ImagePlugin_DistortionFX::ImagePlugin_DistortionFX(TQObject *parent, const char*, const TQStringList &) + : Digikam::ImagePlugin(parent, "ImagePlugin_DistortionFX") { m_distortionfxAction = new KAction(i18n("Distortion Effects..."), "distortionfx", 0, this, TQT_SLOT(slotDistortionFX()), diff --git a/digikam/imageplugins/distortionfx/imageplugin_distortionfx.h b/digikam/imageplugins/distortionfx/imageplugin_distortionfx.h index 42c5efac..635e060f 100644 --- a/digikam/imageplugins/distortionfx/imageplugin_distortionfx.h +++ b/digikam/imageplugins/distortionfx/imageplugin_distortionfx.h @@ -41,7 +41,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_DistortionFX : public Digikam::Imag public: - ImagePlugin_DistortionFX(TQObject *tqparent, const char* name, + ImagePlugin_DistortionFX(TQObject *parent, const char* name, const TQStringList &args); ~ImagePlugin_DistortionFX(); diff --git a/digikam/imageplugins/emboss/emboss.cpp b/digikam/imageplugins/emboss/emboss.cpp index fde69333..d4225148 100644 --- a/digikam/imageplugins/emboss/emboss.cpp +++ b/digikam/imageplugins/emboss/emboss.cpp @@ -39,8 +39,8 @@ namespace DigikamEmbossImagesPlugin { -Emboss::Emboss(Digikam::DImg *orgImage, TQObject *tqparent, int depth) - : Digikam::DImgThreadedFilter(orgImage, tqparent, "Emboss") +Emboss::Emboss(Digikam::DImg *orgImage, TQObject *parent, int depth) + : Digikam::DImgThreadedFilter(orgImage, parent, "Emboss") { m_depth = depth; initFilter(); diff --git a/digikam/imageplugins/emboss/emboss.h b/digikam/imageplugins/emboss/emboss.h index 03ff8bd8..470755a6 100644 --- a/digikam/imageplugins/emboss/emboss.h +++ b/digikam/imageplugins/emboss/emboss.h @@ -40,7 +40,7 @@ class Emboss : public Digikam::DImgThreadedFilter public: - Emboss(Digikam::DImg *orgImage, TQObject *tqparent=0, int depth=30); + Emboss(Digikam::DImg *orgImage, TQObject *parent=0, int depth=30); ~Emboss(){}; private: diff --git a/digikam/imageplugins/emboss/embosstool.cpp b/digikam/imageplugins/emboss/embosstool.cpp index 2f1341aa..a73176c3 100644 --- a/digikam/imageplugins/emboss/embosstool.cpp +++ b/digikam/imageplugins/emboss/embosstool.cpp @@ -58,8 +58,8 @@ using namespace Digikam; namespace DigikamEmbossImagesPlugin { -EmbossTool::EmbossTool(TQObject* tqparent) - : EditorToolThreaded(tqparent) +EmbossTool::EmbossTool(TQObject* parent) + : EditorToolThreaded(parent) { setName("emboss"); setToolName(i18n("Emboss")); diff --git a/digikam/imageplugins/emboss/embosstool.h b/digikam/imageplugins/emboss/embosstool.h index 6f4ca88b..ee7132e3 100644 --- a/digikam/imageplugins/emboss/embosstool.h +++ b/digikam/imageplugins/emboss/embosstool.h @@ -51,7 +51,7 @@ class EmbossTool : public Digikam::EditorToolThreaded public: - EmbossTool(TQObject* tqparent); + EmbossTool(TQObject* parent); ~EmbossTool(); private slots: diff --git a/digikam/imageplugins/emboss/imageeffect_emboss.cpp b/digikam/imageplugins/emboss/imageeffect_emboss.cpp index 8385e922..3722d501 100644 --- a/digikam/imageplugins/emboss/imageeffect_emboss.cpp +++ b/digikam/imageplugins/emboss/imageeffect_emboss.cpp @@ -51,8 +51,8 @@ namespace DigikamEmbossImagesPlugin { -ImageEffect_Emboss::ImageEffect_Emboss(TQWidget* tqparent) - : Digikam::CtrlPanelDlg(tqparent, i18n("Emboss Image"), "emboss", false, false, true, +ImageEffect_Emboss::ImageEffect_Emboss(TQWidget* parent) + : Digikam::CtrlPanelDlg(parent, i18n("Emboss Image"), "emboss", false, false, true, Digikam::ImagePannelWidget::SeparateViewAll) { TQString whatsThis; diff --git a/digikam/imageplugins/emboss/imageeffect_emboss.h b/digikam/imageplugins/emboss/imageeffect_emboss.h index 89f7abb6..258dbe9c 100644 --- a/digikam/imageplugins/emboss/imageeffect_emboss.h +++ b/digikam/imageplugins/emboss/imageeffect_emboss.h @@ -42,7 +42,7 @@ class ImageEffect_Emboss : public Digikam::CtrlPanelDlg public: - ImageEffect_Emboss(TQWidget* tqparent); + ImageEffect_Emboss(TQWidget* parent); ~ImageEffect_Emboss(); private slots: diff --git a/digikam/imageplugins/emboss/imageplugin_emboss.cpp b/digikam/imageplugins/emboss/imageplugin_emboss.cpp index 1f50718b..56932af3 100644 --- a/digikam/imageplugins/emboss/imageplugin_emboss.cpp +++ b/digikam/imageplugins/emboss/imageplugin_emboss.cpp @@ -43,9 +43,9 @@ using namespace DigikamEmbossImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_emboss, KGenericFactory("digikamimageplugin_emboss")); -ImagePlugin_Emboss::ImagePlugin_Emboss(TQObject *tqparent, const char*, +ImagePlugin_Emboss::ImagePlugin_Emboss(TQObject *parent, const char*, const TQStringList &) - : Digikam::ImagePlugin(tqparent, "ImagePlugin_Emboss") + : Digikam::ImagePlugin(parent, "ImagePlugin_Emboss") { m_embossAction = new KAction(i18n("Emboss..."), "embosstool", 0, this, TQT_SLOT(slotEmboss()), diff --git a/digikam/imageplugins/emboss/imageplugin_emboss.h b/digikam/imageplugins/emboss/imageplugin_emboss.h index c69ec19a..a3ee50ad 100644 --- a/digikam/imageplugins/emboss/imageplugin_emboss.h +++ b/digikam/imageplugins/emboss/imageplugin_emboss.h @@ -39,7 +39,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_Emboss : public Digikam::ImagePlugi public: - ImagePlugin_Emboss(TQObject *tqparent, const char* name, + ImagePlugin_Emboss(TQObject *parent, const char* name, const TQStringList &args); ~ImagePlugin_Emboss(); diff --git a/digikam/imageplugins/filmgrain/filmgrain.cpp b/digikam/imageplugins/filmgrain/filmgrain.cpp index 9ca2df0f..02bbca8c 100644 --- a/digikam/imageplugins/filmgrain/filmgrain.cpp +++ b/digikam/imageplugins/filmgrain/filmgrain.cpp @@ -44,8 +44,8 @@ namespace DigikamFilmGrainImagesPlugin { -FilmGrain::FilmGrain(Digikam::DImg *orgImage, TQObject *tqparent, int sensibility) - : Digikam::DImgThreadedFilter(orgImage, tqparent, "FilmGrain") +FilmGrain::FilmGrain(Digikam::DImg *orgImage, TQObject *parent, int sensibility) + : Digikam::DImgThreadedFilter(orgImage, parent, "FilmGrain") { m_sensibility = sensibility; initFilter(); @@ -72,10 +72,10 @@ void FilmGrain::filmgrainImage(Digikam::DImg *orgImage, int Sensibility) uchar* data = orgImage->bits(); Digikam::DImg grain(Width, Height, sixteenBit); // Grain blured without curves adjustment. - Digikam::DImg tqmask(Width, Height, sixteenBit); // Grain tqmask with curves adjustment. + Digikam::DImg mask(Width, Height, sixteenBit); // Grain mask with curves adjustment. uchar* pGrainBits = grain.bits(); - uchar* pMaskBits = tqmask.bits(); - uchar* pOutBits = m_destImage.bits(); // Destination image with merged grain tqmask and original. + uchar* pMaskBits = mask.bits(); + uchar* pOutBits = m_destImage.bits(); // Destination image with merged grain mask and original. int Noise, Shade, nRand, component, progress; uchar *ptr; @@ -86,7 +86,7 @@ void FilmGrain::filmgrainImage(Digikam::DImg *orgImage, int Sensibility) else Noise = Sensibility / 10; - // This value controls the shading pixel effect between original image and grain tqmask. + // This value controls the shading pixel effect between original image and grain mask. if (sixteenBit) Shade = (52 + 1) * 256 - 1; else @@ -96,7 +96,7 @@ void FilmGrain::filmgrainImage(Digikam::DImg *orgImage, int Sensibility) TQDateTime Y2000( TQDate(2000, 1, 1), TQTime(0, 0, 0) ); uint seed = (uint) dt.secsTo(Y2000); - // Make gray grain tqmask. + // Make gray grain mask. grainData.setSixteenBit(sixteenBit); @@ -127,7 +127,7 @@ void FilmGrain::filmgrainImage(Digikam::DImg *orgImage, int Sensibility) postProgress( progress ); } - // Smooth grain tqmask using gaussian blur with radius 1. + // Smooth grain mask using gaussian blur with radius 1. Digikam::DImgGaussianBlur(this, grain, grain, 25, 30, 1); // Normally, film grain tends to be most noticeable in the midtones, and much less @@ -174,7 +174,7 @@ void FilmGrain::filmgrainImage(Digikam::DImg *orgImage, int Sensibility) // read color from orig image blendData.setColor(data + offset, sixteenBit); - // read color from tqmask + // read color from mask maskData.setColor(pMaskBits + offset, sixteenBit); // set shade as alpha value - it will be used as source alpha when blending maskData.setAlpha(Shade); diff --git a/digikam/imageplugins/filmgrain/filmgrain.h b/digikam/imageplugins/filmgrain/filmgrain.h index 26b83b7a..42bcf03c 100644 --- a/digikam/imageplugins/filmgrain/filmgrain.h +++ b/digikam/imageplugins/filmgrain/filmgrain.h @@ -38,7 +38,7 @@ class FilmGrain : public Digikam::DImgThreadedFilter public: - FilmGrain(Digikam::DImg *orgImage, TQObject *tqparent=0, int sensibility=12); + FilmGrain(Digikam::DImg *orgImage, TQObject *parent=0, int sensibility=12); ~FilmGrain(){}; diff --git a/digikam/imageplugins/filmgrain/filmgraintool.cpp b/digikam/imageplugins/filmgrain/filmgraintool.cpp index 69d35836..46ebea44 100644 --- a/digikam/imageplugins/filmgrain/filmgraintool.cpp +++ b/digikam/imageplugins/filmgrain/filmgraintool.cpp @@ -58,8 +58,8 @@ using namespace Digikam; namespace DigikamFilmGrainImagesPlugin { -FilmGrainTool::FilmGrainTool(TQObject* tqparent) - : EditorToolThreaded(tqparent) +FilmGrainTool::FilmGrainTool(TQObject* parent) + : EditorToolThreaded(parent) { setName("filmgrain"); setToolName(i18n("Film Grain")); diff --git a/digikam/imageplugins/filmgrain/filmgraintool.h b/digikam/imageplugins/filmgrain/filmgraintool.h index 33c5c6e6..951f9a2d 100644 --- a/digikam/imageplugins/filmgrain/filmgraintool.h +++ b/digikam/imageplugins/filmgrain/filmgraintool.h @@ -49,7 +49,7 @@ class FilmGrainTool : public Digikam::EditorToolThreaded public: - FilmGrainTool(TQObject* tqparent); + FilmGrainTool(TQObject* parent); ~FilmGrainTool(); private slots: diff --git a/digikam/imageplugins/filmgrain/imageeffect_filmgrain.cpp b/digikam/imageplugins/filmgrain/imageeffect_filmgrain.cpp index 03d91957..e49ff453 100644 --- a/digikam/imageplugins/filmgrain/imageeffect_filmgrain.cpp +++ b/digikam/imageplugins/filmgrain/imageeffect_filmgrain.cpp @@ -55,8 +55,8 @@ namespace DigikamFilmGrainImagesPlugin { -ImageEffect_FilmGrain::ImageEffect_FilmGrain(TQWidget* tqparent) - : Digikam::CtrlPanelDlg(tqparent, i18n("Add Film Grain to Photograph"), +ImageEffect_FilmGrain::ImageEffect_FilmGrain(TQWidget* parent) + : Digikam::CtrlPanelDlg(parent, i18n("Add Film Grain to Photograph"), "filmgrain", false, false, true, Digikam::ImagePannelWidget::SeparateViewAll) { diff --git a/digikam/imageplugins/filmgrain/imageeffect_filmgrain.h b/digikam/imageplugins/filmgrain/imageeffect_filmgrain.h index eb83eb5b..40bba684 100644 --- a/digikam/imageplugins/filmgrain/imageeffect_filmgrain.h +++ b/digikam/imageplugins/filmgrain/imageeffect_filmgrain.h @@ -44,7 +44,7 @@ class ImageEffect_FilmGrain : public Digikam::CtrlPanelDlg public: - ImageEffect_FilmGrain(TQWidget* tqparent); + ImageEffect_FilmGrain(TQWidget* parent); ~ImageEffect_FilmGrain(); private slots: diff --git a/digikam/imageplugins/filmgrain/imageplugin_filmgrain.cpp b/digikam/imageplugins/filmgrain/imageplugin_filmgrain.cpp index 39aec332..49631ad9 100644 --- a/digikam/imageplugins/filmgrain/imageplugin_filmgrain.cpp +++ b/digikam/imageplugins/filmgrain/imageplugin_filmgrain.cpp @@ -43,8 +43,8 @@ using namespace DigikamFilmGrainImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_filmgrain, KGenericFactory("digikamimageplugin_filmgrain")); -ImagePlugin_FilmGrain::ImagePlugin_FilmGrain(TQObject *tqparent, const char*, const TQStringList &) - : Digikam::ImagePlugin(tqparent, "ImagePlugin_FilmGrain") +ImagePlugin_FilmGrain::ImagePlugin_FilmGrain(TQObject *parent, const char*, const TQStringList &) + : Digikam::ImagePlugin(parent, "ImagePlugin_FilmGrain") { m_filmgrainAction = new KAction(i18n("Add Film Grain..."), "filmgrain", 0, this, TQT_SLOT(slotFilmGrain()), diff --git a/digikam/imageplugins/filmgrain/imageplugin_filmgrain.h b/digikam/imageplugins/filmgrain/imageplugin_filmgrain.h index 278c907e..01ca387c 100644 --- a/digikam/imageplugins/filmgrain/imageplugin_filmgrain.h +++ b/digikam/imageplugins/filmgrain/imageplugin_filmgrain.h @@ -39,7 +39,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_FilmGrain : public Digikam::ImagePl public: - ImagePlugin_FilmGrain(TQObject *tqparent, const char* name, + ImagePlugin_FilmGrain(TQObject *parent, const char* name, const TQStringList &args); ~ImagePlugin_FilmGrain(); diff --git a/digikam/imageplugins/freerotation/freerotation.cpp b/digikam/imageplugins/freerotation/freerotation.cpp index cd2e34bd..7b445f35 100644 --- a/digikam/imageplugins/freerotation/freerotation.cpp +++ b/digikam/imageplugins/freerotation/freerotation.cpp @@ -38,9 +38,9 @@ namespace DigikamFreeRotationImagesPlugin { -FreeRotation::FreeRotation(Digikam::DImg *orgImage, TQObject *tqparent, double angle, bool antialiasing, +FreeRotation::FreeRotation(Digikam::DImg *orgImage, TQObject *parent, double angle, bool antialiasing, int autoCrop, TQColor backgroundColor, int orgW, int orgH) - : Digikam::DImgThreadedFilter(orgImage, tqparent, "FreeRotation") + : Digikam::DImgThreadedFilter(orgImage, parent, "FreeRotation") { m_angle = angle; m_orgW = orgW; diff --git a/digikam/imageplugins/freerotation/freerotation.h b/digikam/imageplugins/freerotation/freerotation.h index 941e15c1..7dc4cc8c 100644 --- a/digikam/imageplugins/freerotation/freerotation.h +++ b/digikam/imageplugins/freerotation/freerotation.h @@ -41,7 +41,7 @@ class FreeRotation : public Digikam::DImgThreadedFilter public: - FreeRotation(Digikam::DImg *orgImage, TQObject *tqparent=0, double angle=0.0, + FreeRotation(Digikam::DImg *orgImage, TQObject *parent=0, double angle=0.0, bool antialiasing=true, int autoCrop=NoAutoCrop, TQColor backgroundColor=TQt::black, int orgW=0, int orgH=0); diff --git a/digikam/imageplugins/freerotation/freerotationtool.cpp b/digikam/imageplugins/freerotation/freerotationtool.cpp index 825b88d6..b11c128d 100644 --- a/digikam/imageplugins/freerotation/freerotationtool.cpp +++ b/digikam/imageplugins/freerotation/freerotationtool.cpp @@ -64,8 +64,8 @@ using namespace Digikam; namespace DigikamFreeRotationImagesPlugin { -FreeRotationTool::FreeRotationTool(TQObject* tqparent) - : EditorToolThreaded(tqparent) +FreeRotationTool::FreeRotationTool(TQObject* parent) + : EditorToolThreaded(parent) { setName("freerotation"); setToolName(i18n("Free Rotation")); diff --git a/digikam/imageplugins/freerotation/freerotationtool.h b/digikam/imageplugins/freerotation/freerotationtool.h index 6d6cb907..a060fff5 100644 --- a/digikam/imageplugins/freerotation/freerotationtool.h +++ b/digikam/imageplugins/freerotation/freerotationtool.h @@ -56,7 +56,7 @@ class FreeRotationTool : public Digikam::EditorToolThreaded public: - FreeRotationTool(TQObject *tqparent); + FreeRotationTool(TQObject *parent); ~FreeRotationTool(); private slots: diff --git a/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp b/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp index 50ab4889..ea2a67f7 100644 --- a/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp +++ b/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp @@ -57,8 +57,8 @@ namespace DigikamFreeRotationImagesPlugin { -ImageEffect_FreeRotation::ImageEffect_FreeRotation(TQWidget* tqparent) - : Digikam::ImageGuideDlg(tqparent, i18n("Free Rotation"), "freerotation", +ImageEffect_FreeRotation::ImageEffect_FreeRotation(TQWidget* parent) + : Digikam::ImageGuideDlg(parent, i18n("Free Rotation"), "freerotation", false, true, true, Digikam::ImageGuideWidget::HVGuideMode) { // No need Abort button action. diff --git a/digikam/imageplugins/freerotation/imageeffect_freerotation.h b/digikam/imageplugins/freerotation/imageeffect_freerotation.h index 586cf27c..e70f1e7d 100644 --- a/digikam/imageplugins/freerotation/imageeffect_freerotation.h +++ b/digikam/imageplugins/freerotation/imageeffect_freerotation.h @@ -47,7 +47,7 @@ class ImageEffect_FreeRotation : public Digikam::ImageGuideDlg public: - ImageEffect_FreeRotation(TQWidget *tqparent); + ImageEffect_FreeRotation(TQWidget *parent); ~ImageEffect_FreeRotation(); private slots: diff --git a/digikam/imageplugins/freerotation/imageplugin_freerotation.cpp b/digikam/imageplugins/freerotation/imageplugin_freerotation.cpp index d6a72d27..040d2ad5 100644 --- a/digikam/imageplugins/freerotation/imageplugin_freerotation.cpp +++ b/digikam/imageplugins/freerotation/imageplugin_freerotation.cpp @@ -42,8 +42,8 @@ using namespace DigikamFreeRotationImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_freerotation, KGenericFactory("digikamimageplugin_freerotation")); -ImagePlugin_FreeRotation::ImagePlugin_FreeRotation(TQObject *tqparent, const char*, const TQStringList &) - : Digikam::ImagePlugin(tqparent, "ImagePlugin_FreeRotation") +ImagePlugin_FreeRotation::ImagePlugin_FreeRotation(TQObject *parent, const char*, const TQStringList &) + : Digikam::ImagePlugin(parent, "ImagePlugin_FreeRotation") { m_freerotationAction = new KAction(i18n("Free Rotation..."), "freerotation", 0, this, TQT_SLOT(slotFreeRotation()), diff --git a/digikam/imageplugins/freerotation/imageplugin_freerotation.h b/digikam/imageplugins/freerotation/imageplugin_freerotation.h index e70b41cd..e054ca31 100644 --- a/digikam/imageplugins/freerotation/imageplugin_freerotation.h +++ b/digikam/imageplugins/freerotation/imageplugin_freerotation.h @@ -39,7 +39,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_FreeRotation : public Digikam::Imag public: - ImagePlugin_FreeRotation(TQObject *tqparent, const char* name, + ImagePlugin_FreeRotation(TQObject *parent, const char* name, const TQStringList &args); ~ImagePlugin_FreeRotation(); diff --git a/digikam/imageplugins/hotpixels/blackframelistview.cpp b/digikam/imageplugins/hotpixels/blackframelistview.cpp index 4d169a80..77fd86f1 100644 --- a/digikam/imageplugins/hotpixels/blackframelistview.cpp +++ b/digikam/imageplugins/hotpixels/blackframelistview.cpp @@ -37,8 +37,8 @@ namespace DigikamHotPixelsImagesPlugin { -BlackFrameListView::BlackFrameListView(TQWidget* tqparent) - : TQListView(tqparent) +BlackFrameListView::BlackFrameListView(TQWidget* parent) + : TQListView(parent) { addColumn(i18n("Preview")); addColumn(i18n("Size")); @@ -51,19 +51,19 @@ BlackFrameListView::BlackFrameListView(TQWidget* tqparent) // -------------------------------------------------------------------------- -BlackFrameListViewItem::BlackFrameListViewItem(BlackFrameListView* tqparent, const KURL &url) - : TQObject(tqparent), TQListViewItem(tqparent) +BlackFrameListViewItem::BlackFrameListViewItem(BlackFrameListView* parent, const KURL &url) + : TQObject(parent), TQListViewItem(parent) { - m_parent = tqparent; + m_parent = parent; m_blackFrameURL = url; - m_parser = new BlackFrameParser(tqparent); + m_parser = new BlackFrameParser(parent); m_parser->parseBlackFrame(url); connect(m_parser, TQT_SIGNAL(parsed(TQValueList)), this, TQT_SLOT(slotParsed(TQValueList))); connect(this, TQT_SIGNAL(parsed(TQValueList, const KURL&)), - tqparent, TQT_SLOT(slotParsed(TQValueList, const KURL&))); + parent, TQT_SLOT(slotParsed(TQValueList, const KURL&))); connect(m_parser, TQT_SIGNAL(signalLoadingProgress(float)), this, TQT_SIGNAL(signalLoadingProgress(float))); diff --git a/digikam/imageplugins/hotpixels/blackframelistview.h b/digikam/imageplugins/hotpixels/blackframelistview.h index 7a3e9562..8608094d 100644 --- a/digikam/imageplugins/hotpixels/blackframelistview.h +++ b/digikam/imageplugins/hotpixels/blackframelistview.h @@ -54,7 +54,7 @@ class BlackFrameListView : public TQListView public: - BlackFrameListView(TQWidget* tqparent=0); + BlackFrameListView(TQWidget* parent=0); ~BlackFrameListView(){}; signals: @@ -78,7 +78,7 @@ Q_OBJECT public: - BlackFrameListViewItem(BlackFrameListView* tqparent, const KURL &url); + BlackFrameListViewItem(BlackFrameListView* parent, const KURL &url); ~BlackFrameListViewItem(){}; virtual TQString text(int column)const; diff --git a/digikam/imageplugins/hotpixels/blackframeparser.cpp b/digikam/imageplugins/hotpixels/blackframeparser.cpp index 8f1cfd53..049f9326 100644 --- a/digikam/imageplugins/hotpixels/blackframeparser.cpp +++ b/digikam/imageplugins/hotpixels/blackframeparser.cpp @@ -56,8 +56,8 @@ namespace DigikamHotPixelsImagesPlugin { -BlackFrameParser::BlackFrameParser(TQObject *tqparent) - : TQObject(tqparent) +BlackFrameParser::BlackFrameParser(TQObject *parent) + : TQObject(parent) { m_imageLoaderThread = 0; } diff --git a/digikam/imageplugins/hotpixels/blackframeparser.h b/digikam/imageplugins/hotpixels/blackframeparser.h index ea233686..eeb587ea 100644 --- a/digikam/imageplugins/hotpixels/blackframeparser.h +++ b/digikam/imageplugins/hotpixels/blackframeparser.h @@ -62,7 +62,7 @@ class BlackFrameParser: public TQObject public: - BlackFrameParser(TQObject *tqparent); + BlackFrameParser(TQObject *parent); ~BlackFrameParser(); void parseHotPixels(const TQString &file); diff --git a/digikam/imageplugins/hotpixels/hotpixelfixer.cpp b/digikam/imageplugins/hotpixels/hotpixelfixer.cpp index 079aff31..b89c12fe 100644 --- a/digikam/imageplugins/hotpixels/hotpixelfixer.cpp +++ b/digikam/imageplugins/hotpixels/hotpixelfixer.cpp @@ -55,9 +55,9 @@ namespace DigikamHotPixelsImagesPlugin { -HotPixelFixer::HotPixelFixer(Digikam::DImg *orgImage, TQObject *tqparent, const TQValueList& hpList, +HotPixelFixer::HotPixelFixer(Digikam::DImg *orgImage, TQObject *parent, const TQValueList& hpList, int interpolationMethod) - : Digikam::DImgThreadedFilter(orgImage, tqparent, "HotPixels") + : Digikam::DImgThreadedFilter(orgImage, parent, "HotPixels") { m_hpList = hpList; m_interpolationMethod = interpolationMethod; diff --git a/digikam/imageplugins/hotpixels/hotpixelfixer.h b/digikam/imageplugins/hotpixels/hotpixelfixer.h index 032d66b6..b02d7e00 100644 --- a/digikam/imageplugins/hotpixels/hotpixelfixer.h +++ b/digikam/imageplugins/hotpixels/hotpixelfixer.h @@ -68,7 +68,7 @@ public: public: - HotPixelFixer(Digikam::DImg *orgImage, TQObject *tqparent, + HotPixelFixer(Digikam::DImg *orgImage, TQObject *parent, const TQValueList& hpList, int interpolationMethod); ~HotPixelFixer(); diff --git a/digikam/imageplugins/hotpixels/hotpixelstool.cpp b/digikam/imageplugins/hotpixels/hotpixelstool.cpp index d09244a2..1aece33b 100644 --- a/digikam/imageplugins/hotpixels/hotpixelstool.cpp +++ b/digikam/imageplugins/hotpixels/hotpixelstool.cpp @@ -69,8 +69,8 @@ using namespace Digikam; namespace DigikamHotPixelsImagesPlugin { -HotPixelsTool::HotPixelsTool(TQObject* tqparent) - : EditorToolThreaded(tqparent) +HotPixelsTool::HotPixelsTool(TQObject* parent) + : EditorToolThreaded(parent) { setName("hotpixels"); setToolName(i18n("Hot Pixels")); diff --git a/digikam/imageplugins/hotpixels/hotpixelstool.h b/digikam/imageplugins/hotpixels/hotpixelstool.h index f0497ad4..3e44f9ad 100644 --- a/digikam/imageplugins/hotpixels/hotpixelstool.h +++ b/digikam/imageplugins/hotpixels/hotpixelstool.h @@ -69,7 +69,7 @@ class HotPixelsTool : public Digikam::EditorToolThreaded public: - HotPixelsTool(TQObject *tqparent); + HotPixelsTool(TQObject *parent); ~HotPixelsTool(); private slots: diff --git a/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp b/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp index 5b7d04f5..468a9d3b 100644 --- a/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp +++ b/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp @@ -58,8 +58,8 @@ namespace DigikamHotPixelsImagesPlugin { -ImageEffect_HotPixels::ImageEffect_HotPixels(TQWidget* tqparent) - : CtrlPanelDlg(tqparent, i18n("Hot Pixels Correction"), +ImageEffect_HotPixels::ImageEffect_HotPixels(TQWidget* parent) + : CtrlPanelDlg(parent, i18n("Hot Pixels Correction"), "hotpixels", false, false, false, Digikam::ImagePannelWidget::SeparateViewDuplicate) { diff --git a/digikam/imageplugins/hotpixels/imageeffect_hotpixels.h b/digikam/imageplugins/hotpixels/imageeffect_hotpixels.h index c2cd33d6..9f5e6f8f 100644 --- a/digikam/imageplugins/hotpixels/imageeffect_hotpixels.h +++ b/digikam/imageplugins/hotpixels/imageeffect_hotpixels.h @@ -61,7 +61,7 @@ class ImageEffect_HotPixels : public Digikam::CtrlPanelDlg public: - ImageEffect_HotPixels(TQWidget *tqparent); + ImageEffect_HotPixels(TQWidget *parent); ~ImageEffect_HotPixels(); private slots: diff --git a/digikam/imageplugins/hotpixels/imageplugin_hotpixels.cpp b/digikam/imageplugins/hotpixels/imageplugin_hotpixels.cpp index ee4d1050..feb30388 100644 --- a/digikam/imageplugins/hotpixels/imageplugin_hotpixels.cpp +++ b/digikam/imageplugins/hotpixels/imageplugin_hotpixels.cpp @@ -44,8 +44,8 @@ using namespace DigikamHotPixelsImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_hotpixels, KGenericFactory("digikamimageplugin_hotpixels")); -ImagePlugin_HotPixels::ImagePlugin_HotPixels(TQObject *tqparent, const char*, const TQStringList &) - : Digikam::ImagePlugin(tqparent, "ImagePlugin_HotPixels") +ImagePlugin_HotPixels::ImagePlugin_HotPixels(TQObject *parent, const char*, const TQStringList &) + : Digikam::ImagePlugin(parent, "ImagePlugin_HotPixels") { m_hotpixelsAction = new KAction(i18n("Hot Pixels..."), "hotpixels", 0, this, TQT_SLOT(slotHotPixels()), diff --git a/digikam/imageplugins/hotpixels/imageplugin_hotpixels.h b/digikam/imageplugins/hotpixels/imageplugin_hotpixels.h index 206429b7..8ad5a770 100644 --- a/digikam/imageplugins/hotpixels/imageplugin_hotpixels.h +++ b/digikam/imageplugins/hotpixels/imageplugin_hotpixels.h @@ -38,7 +38,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_HotPixels : public Digikam::ImagePl public: - ImagePlugin_HotPixels(TQObject *tqparent, const char* name, + ImagePlugin_HotPixels(TQObject *parent, const char* name, const TQStringList &args); ~ImagePlugin_HotPixels(); diff --git a/digikam/imageplugins/infrared/imageeffect_infrared.cpp b/digikam/imageplugins/infrared/imageeffect_infrared.cpp index 32987e73..3ad5f44e 100644 --- a/digikam/imageplugins/infrared/imageeffect_infrared.cpp +++ b/digikam/imageplugins/infrared/imageeffect_infrared.cpp @@ -57,8 +57,8 @@ namespace DigikamInfraredImagesPlugin { -ImageEffect_Infrared::ImageEffect_Infrared(TQWidget* tqparent) - : Digikam::CtrlPanelDlg(tqparent, i18n("Simulate Infrared Film to Photograph"), +ImageEffect_Infrared::ImageEffect_Infrared(TQWidget* parent) + : Digikam::CtrlPanelDlg(parent, i18n("Simulate Infrared Film to Photograph"), "infrared", false, false, true, Digikam::ImagePannelWidget::SeparateViewAll) { diff --git a/digikam/imageplugins/infrared/imageeffect_infrared.h b/digikam/imageplugins/infrared/imageeffect_infrared.h index 887a4e63..af8ec6e5 100644 --- a/digikam/imageplugins/infrared/imageeffect_infrared.h +++ b/digikam/imageplugins/infrared/imageeffect_infrared.h @@ -44,7 +44,7 @@ class ImageEffect_Infrared : public Digikam::CtrlPanelDlg public: - ImageEffect_Infrared(TQWidget* tqparent); + ImageEffect_Infrared(TQWidget* parent); ~ImageEffect_Infrared(); private slots: diff --git a/digikam/imageplugins/infrared/imageplugin_infrared.cpp b/digikam/imageplugins/infrared/imageplugin_infrared.cpp index a7e45932..5ec60b28 100644 --- a/digikam/imageplugins/infrared/imageplugin_infrared.cpp +++ b/digikam/imageplugins/infrared/imageplugin_infrared.cpp @@ -43,8 +43,8 @@ using namespace DigikamInfraredImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_infrared, KGenericFactory("digikamimageplugin_infrared")); -ImagePlugin_Infrared::ImagePlugin_Infrared(TQObject *tqparent, const char*, const TQStringList &) - : Digikam::ImagePlugin(tqparent, "ImagePlugin_Infrared") +ImagePlugin_Infrared::ImagePlugin_Infrared(TQObject *parent, const char*, const TQStringList &) + : Digikam::ImagePlugin(parent, "ImagePlugin_Infrared") { m_infraredAction = new KAction(i18n("Infrared Film..."), "infrared", 0, this, TQT_SLOT(slotInfrared()), diff --git a/digikam/imageplugins/infrared/imageplugin_infrared.h b/digikam/imageplugins/infrared/imageplugin_infrared.h index 5e8111fc..57e701fd 100644 --- a/digikam/imageplugins/infrared/imageplugin_infrared.h +++ b/digikam/imageplugins/infrared/imageplugin_infrared.h @@ -39,7 +39,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_Infrared : public Digikam::ImagePlu public: - ImagePlugin_Infrared(TQObject *tqparent, const char* name, + ImagePlugin_Infrared(TQObject *parent, const char* name, const TQStringList &args); ~ImagePlugin_Infrared(); diff --git a/digikam/imageplugins/infrared/infrared.cpp b/digikam/imageplugins/infrared/infrared.cpp index a335c3bb..4874df94 100644 --- a/digikam/imageplugins/infrared/infrared.cpp +++ b/digikam/imageplugins/infrared/infrared.cpp @@ -44,8 +44,8 @@ namespace DigikamInfraredImagesPlugin { -Infrared::Infrared(Digikam::DImg *orgImage, TQObject *tqparent, int sensibility, bool grain) - : Digikam::DImgThreadedFilter(orgImage, tqparent, "Infrared") +Infrared::Infrared(Digikam::DImg *orgImage, TQObject *parent, int sensibility, bool grain) + : Digikam::DImgThreadedFilter(orgImage, parent, "Infrared") { m_sensibility = sensibility; m_grain = grain; @@ -110,9 +110,9 @@ void Infrared::infraredImage(Digikam::DImg *orgImage, int Sensibility, bool Grai uchar* pBWBits = 0; // Black and White conversion. uchar* pBWBlurBits = 0; // Black and White with blur. uchar* pGrainBits = 0; // Grain blured without curves adjustment. - uchar* pMaskBits = 0; // Grain tqmask with curves adjustment. + uchar* pMaskBits = 0; // Grain mask with curves adjustment. uchar* pOverlayBits = 0; // Overlay to merge with original converted in gray scale. - uchar* pOutBits = m_destImage.bits(); // Destination image with merged grain tqmask and original. + uchar* pOutBits = m_destImage.bits(); // Destination image with merged grain mask and original. Digikam::DColor bwData, bwBlurData, grainData, maskData, overData, outData; @@ -153,14 +153,14 @@ void Infrared::infraredImage(Digikam::DImg *orgImage, int Sensibility, bool Grai } //----------------------------------------------------------------- - // 2 - Create Gaussian blured averlay tqmask with grain if necessary. + // 2 - Create Gaussian blured averlay mask with grain if necessary. //----------------------------------------------------------------- if (Grain) { - // Create gray grain tqmask. + // Create gray grain mask. TQDateTime dt = TQDateTime::tqcurrentDateTime(); TQDateTime Y2000( TQDate(2000, 1, 1), TQTime(0, 0, 0) ); @@ -198,7 +198,7 @@ void Infrared::infraredImage(Digikam::DImg *orgImage, int Sensibility, bool Grai postProgress( progress ); } - // Smooth grain tqmask using gaussian blur. + // Smooth grain mask using gaussian blur. Digikam::DImgImageFilters().gaussianBlurImage(pGrainBits, Width, Height, sixteenBit, 1); @@ -223,7 +223,7 @@ void Infrared::infraredImage(Digikam::DImg *orgImage, int Sensibility, bool Grai if (Grain) { Digikam::ImageCurves *grainCurves = new Digikam::ImageCurves(sixteenBit); - pMaskBits = new uchar[numBytes]; // Grain tqmask with curves adjustment. + pMaskBits = new uchar[numBytes]; // Grain mask with curves adjustment. // We modify only global luminosity of the grain. if (sixteenBit) @@ -268,7 +268,7 @@ void Infrared::infraredImage(Digikam::DImg *orgImage, int Sensibility, bool Grai Digikam::DColorComposer *composer = Digikam::DColorComposer::getComposer(Digikam::DColorComposer::PorterDuffNone); int alpha; - int Shade = 52; // This value control the shading pixel effect between original image and grain tqmask. + int Shade = 52; // This value control the shading pixel effect between original image and grain mask. if (sixteenBit) Shade = (Shade + 1) * 256 - 1; @@ -280,7 +280,7 @@ void Infrared::infraredImage(Digikam::DImg *orgImage, int Sensibility, bool Grai // read color from orig image bwBlurData.setColor(pBWBlurBits + offset, sixteenBit); - // read color from tqmask + // read color from mask maskData.setColor(pMaskBits + offset, sixteenBit); // set shade as alpha value - it will be used as source alpha when blending maskData.setAlpha(Shade); @@ -317,7 +317,7 @@ void Infrared::infraredImage(Digikam::DImg *orgImage, int Sensibility, bool Grai } //------------------------------------------ - // 3 - Merge Grayscale image & overlay tqmask. + // 3 - Merge Grayscale image & overlay mask. //------------------------------------------ // Merge overlay and gray scale image using 'Overlay' Gimp method for increase the highlight. diff --git a/digikam/imageplugins/infrared/infrared.h b/digikam/imageplugins/infrared/infrared.h index ec9fb6fe..fc2f89ee 100644 --- a/digikam/imageplugins/infrared/infrared.h +++ b/digikam/imageplugins/infrared/infrared.h @@ -37,7 +37,7 @@ class Infrared : public Digikam::DImgThreadedFilter public: - Infrared(Digikam::DImg *orgImage, TQObject *tqparent=0, int sensibility=1, bool grain=true); + Infrared(Digikam::DImg *orgImage, TQObject *parent=0, int sensibility=1, bool grain=true); ~Infrared(){}; diff --git a/digikam/imageplugins/infrared/infraredtool.cpp b/digikam/imageplugins/infrared/infraredtool.cpp index 9969d246..0e9de024 100644 --- a/digikam/imageplugins/infrared/infraredtool.cpp +++ b/digikam/imageplugins/infrared/infraredtool.cpp @@ -60,8 +60,8 @@ using namespace Digikam; namespace DigikamInfraredImagesPlugin { -InfraredTool::InfraredTool(TQObject* tqparent) - : EditorToolThreaded(tqparent) +InfraredTool::InfraredTool(TQObject* parent) + : EditorToolThreaded(parent) { setName("infrared"); setToolName(i18n("Infrared")); diff --git a/digikam/imageplugins/infrared/infraredtool.h b/digikam/imageplugins/infrared/infraredtool.h index 18b4da26..3774f7ad 100644 --- a/digikam/imageplugins/infrared/infraredtool.h +++ b/digikam/imageplugins/infrared/infraredtool.h @@ -50,7 +50,7 @@ class InfraredTool : public Digikam::EditorToolThreaded public: - InfraredTool(TQObject* tqparent); + InfraredTool(TQObject* parent); ~InfraredTool(); private slots: diff --git a/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp b/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp index 28206c69..35e477cd 100644 --- a/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp +++ b/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp @@ -83,7 +83,7 @@ class InPaintingPassivePopup : public KPassivePopup { public: - InPaintingPassivePopup(TQWidget* tqparent) : KPassivePopup(tqparent), m_parent(tqparent) {} + InPaintingPassivePopup(TQWidget* parent) : KPassivePopup(parent), m_parent(parent) {} protected: @@ -96,7 +96,7 @@ private: //------------------------------------------------------------------------------------------ -void ImageEffect_InPainting::inPainting(TQWidget* tqparent) +void ImageEffect_InPainting::inPainting(TQWidget* parent) { // -- check if we actually have a selection -------------------- @@ -107,7 +107,7 @@ void ImageEffect_InPainting::inPainting(TQWidget* tqparent) if (!w || !h) { - InPaintingPassivePopup* popup = new InPaintingPassivePopup(tqparent); + InPaintingPassivePopup* popup = new InPaintingPassivePopup(parent); popup->setView(i18n("Inpainting Photograph Tool"), i18n("You need to select a region to inpaint to use " "this tool")); @@ -119,14 +119,14 @@ void ImageEffect_InPainting::inPainting(TQWidget* tqparent) // -- run the dlg ---------------------------------------------- - ImageEffect_InPainting_Dialog dlg(tqparent); + ImageEffect_InPainting_Dialog dlg(parent); dlg.exec(); } //------------------------------------------------------------------------------------------ -ImageEffect_InPainting_Dialog::ImageEffect_InPainting_Dialog(TQWidget* tqparent) - : Digikam::ImageGuideDlg(tqparent, i18n("Photograph Inpainting"), +ImageEffect_InPainting_Dialog::ImageEffect_InPainting_Dialog(TQWidget* parent) + : Digikam::ImageGuideDlg(parent, i18n("Photograph Inpainting"), "inpainting", true, true, false, Digikam::ImageGuideWidget::HVGuideMode, 0, true, true, true) @@ -322,12 +322,12 @@ void ImageEffect_InPainting_Dialog::prepareEffect() iface.originalSixteenBit(), iface.originalHasAlpha(), data); delete [] data; - // Selected area from the image and tqmask creation: + // Selected area from the image and mask creation: // // We optimize the computation time to use the current selected area in image editor - // and to create an inpainting tqmask with it. Because inpainting is done by interpolation + // and to create an inpainting mask with it. Because inpainting is done by interpolation // neighboor pixels which can be located far from the selected area, we need to ajust the - // tqmask size in according with the parameter algorithms, especially 'amplitude'. + // mask size in according with the parameter algorithms, especially 'amplitude'. // Mask size is computed like this : // // (image_size_x + 2*amplitude , image_size_y + 2*amplitude) @@ -351,7 +351,7 @@ void ImageEffect_InPainting_Dialog::prepareEffect() m_maskRect = TQRect(x1, y1, x2-x1, y2-y1); // Mask area normalization. - // We need to check if tqmask area is out of image size else inpainting give strange results. + // We need to check if mask area is out of image size else inpainting give strange results. if (m_maskRect.left() < 0) m_maskRect.setLeft(0); if (m_maskRect.top() < 0) m_maskRect.setTop(0); diff --git a/digikam/imageplugins/inpainting/imageeffect_inpainting.h b/digikam/imageplugins/inpainting/imageeffect_inpainting.h index 49c9ce6e..df17a86d 100644 --- a/digikam/imageplugins/inpainting/imageeffect_inpainting.h +++ b/digikam/imageplugins/inpainting/imageeffect_inpainting.h @@ -52,7 +52,7 @@ class ImageEffect_InPainting { public: - static void inPainting(TQWidget *tqparent); + static void inPainting(TQWidget *parent); }; //----------------------------------------------------------- @@ -64,7 +64,7 @@ class ImageEffect_InPainting_Dialog : public Digikam::ImageGuideDlg public: - ImageEffect_InPainting_Dialog(TQWidget* tqparent); + ImageEffect_InPainting_Dialog(TQWidget* parent); ~ImageEffect_InPainting_Dialog(); private slots: diff --git a/digikam/imageplugins/inpainting/imageplugin_inpainting.cpp b/digikam/imageplugins/inpainting/imageplugin_inpainting.cpp index bc4220ae..61dc0486 100644 --- a/digikam/imageplugins/inpainting/imageplugin_inpainting.cpp +++ b/digikam/imageplugins/inpainting/imageplugin_inpainting.cpp @@ -45,8 +45,8 @@ using namespace Digikam; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_inpainting, KGenericFactory("digikamimageplugin_inpainting")); -ImagePlugin_InPainting::ImagePlugin_InPainting(TQObject *tqparent, const char*, const TQStringList &) - : Digikam::ImagePlugin(tqparent, "ImagePlugin_InPainting") +ImagePlugin_InPainting::ImagePlugin_InPainting(TQObject *parent, const char*, const TQStringList &) + : Digikam::ImagePlugin(parent, "ImagePlugin_InPainting") { m_inPaintingAction = new KAction(i18n("Inpainting..."), "inpainting", CTRL+Key_E, diff --git a/digikam/imageplugins/inpainting/imageplugin_inpainting.h b/digikam/imageplugins/inpainting/imageplugin_inpainting.h index 2d5b036b..e6fafcbc 100644 --- a/digikam/imageplugins/inpainting/imageplugin_inpainting.h +++ b/digikam/imageplugins/inpainting/imageplugin_inpainting.h @@ -39,7 +39,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_InPainting : public Digikam::ImageP public: - ImagePlugin_InPainting(TQObject *tqparent, const char* name, + ImagePlugin_InPainting(TQObject *parent, const char* name, const TQStringList &args); ~ImagePlugin_InPainting(); diff --git a/digikam/imageplugins/inpainting/inpaintingtool.cpp b/digikam/imageplugins/inpainting/inpaintingtool.cpp index d45988d2..94f69b4c 100644 --- a/digikam/imageplugins/inpainting/inpaintingtool.cpp +++ b/digikam/imageplugins/inpainting/inpaintingtool.cpp @@ -82,8 +82,8 @@ using namespace Digikam; namespace DigikamInPaintingImagesPlugin { -InPaintingTool::InPaintingTool(TQObject* tqparent) - : EditorToolThreaded(tqparent) +InPaintingTool::InPaintingTool(TQObject* parent) + : EditorToolThreaded(parent) { setName("inpainting"); setToolName(i18n("Inpainting")); @@ -286,12 +286,12 @@ void InPaintingTool::prepareEffect() iface.originalSixteenBit(), iface.originalHasAlpha(), data); delete [] data; - // Selected area from the image and tqmask creation: + // Selected area from the image and mask creation: // // We optimize the computation time to use the current selected area in image editor - // and to create an inpainting tqmask with it. Because inpainting is done by interpolation + // and to create an inpainting mask with it. Because inpainting is done by interpolation // neighboor pixels which can be located far from the selected area, we need to ajust the - // tqmask size in according with the parameter algorithms, especially 'amplitude'. + // mask size in according with the parameter algorithms, especially 'amplitude'. // Mask size is computed like this : // // (image_size_x + 2*amplitude , image_size_y + 2*amplitude) @@ -315,7 +315,7 @@ void InPaintingTool::prepareEffect() m_maskRect = TQRect(x1, y1, x2-x1, y2-y1); // Mask area normalization. - // We need to check if tqmask area is out of image size else inpainting give strange results. + // We need to check if mask area is out of image size else inpainting give strange results. if (m_maskRect.left() < 0) m_maskRect.setLeft(0); if (m_maskRect.top() < 0) m_maskRect.setTop(0); diff --git a/digikam/imageplugins/inpainting/inpaintingtool.h b/digikam/imageplugins/inpainting/inpaintingtool.h index 10bc3ec6..d9c73bf9 100644 --- a/digikam/imageplugins/inpainting/inpaintingtool.h +++ b/digikam/imageplugins/inpainting/inpaintingtool.h @@ -57,7 +57,7 @@ class InPaintingPassivePopup : public KPassivePopup { public: - InPaintingPassivePopup(TQWidget* tqparent) : KPassivePopup(tqparent), m_parent(tqparent) {} + InPaintingPassivePopup(TQWidget* parent) : KPassivePopup(parent), m_parent(parent) {} protected: @@ -77,7 +77,7 @@ class InPaintingTool : public Digikam::EditorToolThreaded public: - InPaintingTool(TQObject* tqparent); + InPaintingTool(TQObject* parent); ~InPaintingTool(); private slots: diff --git a/digikam/imageplugins/inserttext/fontchooserwidget.cpp b/digikam/imageplugins/inserttext/fontchooserwidget.cpp index 2aaddcea..8f13082f 100644 --- a/digikam/imageplugins/inserttext/fontchooserwidget.cpp +++ b/digikam/imageplugins/inserttext/fontchooserwidget.cpp @@ -75,11 +75,11 @@ public: TQPalette m_palette; }; -FontChooserWidget::FontChooserWidget(TQWidget *tqparent, const char *name, +FontChooserWidget::FontChooserWidget(TQWidget *parent, const char *name, bool onlyFixed, const TQStringList &fontList, int visibleListSize, bool diff, TQButton::ToggleState *sizeIsRelativeState ) - : TQWidget(tqparent, name), usingFixed(onlyFixed) + : TQWidget(parent, name), usingFixed(onlyFixed) { charsetsCombo = 0; diff --git a/digikam/imageplugins/inserttext/fontchooserwidget.h b/digikam/imageplugins/inserttext/fontchooserwidget.h index 496a460b..b39b7c94 100644 --- a/digikam/imageplugins/inserttext/fontchooserwidget.h +++ b/digikam/imageplugins/inserttext/fontchooserwidget.h @@ -74,7 +74,7 @@ public: public: - FontChooserWidget(TQWidget *tqparent = 0L, const char *name = 0L, + FontChooserWidget(TQWidget *parent = 0L, const char *name = 0L, bool onlyFixed = false, const TQStringList &fontList = TQStringList(), int visibleListSize=8, diff --git a/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp b/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp index 67dc98b0..aa5ed908 100644 --- a/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp +++ b/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp @@ -69,8 +69,8 @@ namespace DigikamInsertTextImagesPlugin { -ImageEffect_InsertText::ImageEffect_InsertText(TQWidget* tqparent) - : Digikam::ImageDlgBase(tqparent, i18n("Insert Text on Photograph"), +ImageEffect_InsertText::ImageEffect_InsertText(TQWidget* parent) + : Digikam::ImageDlgBase(parent, i18n("Insert Text on Photograph"), "inserttext", false, false) { TQString whatsThis; diff --git a/digikam/imageplugins/inserttext/imageeffect_inserttext.h b/digikam/imageplugins/inserttext/imageeffect_inserttext.h index 27d95e62..24ea4f7f 100644 --- a/digikam/imageplugins/inserttext/imageeffect_inserttext.h +++ b/digikam/imageplugins/inserttext/imageeffect_inserttext.h @@ -55,7 +55,7 @@ class ImageEffect_InsertText : public Digikam::ImageDlgBase public: - ImageEffect_InsertText(TQWidget *tqparent); + ImageEffect_InsertText(TQWidget *parent); ~ImageEffect_InsertText(); signals: diff --git a/digikam/imageplugins/inserttext/imageplugin_inserttext.cpp b/digikam/imageplugins/inserttext/imageplugin_inserttext.cpp index 23ac3459..0768e149 100644 --- a/digikam/imageplugins/inserttext/imageplugin_inserttext.cpp +++ b/digikam/imageplugins/inserttext/imageplugin_inserttext.cpp @@ -41,8 +41,8 @@ using namespace DigikamInsertTextImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_inserttext, KGenericFactory("digikamimageplugin_inserttext")); -ImagePlugin_InsertText::ImagePlugin_InsertText(TQObject *tqparent, const char*, const TQStringList &) - : Digikam::ImagePlugin(tqparent, "ImagePlugin_InsertText") +ImagePlugin_InsertText::ImagePlugin_InsertText(TQObject *parent, const char*, const TQStringList &) + : Digikam::ImagePlugin(parent, "ImagePlugin_InsertText") { m_insertTextAction = new KAction(i18n("Insert Text..."), "inserttext", SHIFT+CTRL+Key_T, diff --git a/digikam/imageplugins/inserttext/imageplugin_inserttext.h b/digikam/imageplugins/inserttext/imageplugin_inserttext.h index f310b4b6..ef020071 100644 --- a/digikam/imageplugins/inserttext/imageplugin_inserttext.h +++ b/digikam/imageplugins/inserttext/imageplugin_inserttext.h @@ -38,7 +38,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_InsertText : public Digikam::ImageP public: - ImagePlugin_InsertText(TQObject *tqparent, const char* name, + ImagePlugin_InsertText(TQObject *parent, const char* name, const TQStringList &args); ~ImagePlugin_InsertText(); diff --git a/digikam/imageplugins/inserttext/inserttexttool.cpp b/digikam/imageplugins/inserttext/inserttexttool.cpp index 220d7471..d48690a1 100644 --- a/digikam/imageplugins/inserttext/inserttexttool.cpp +++ b/digikam/imageplugins/inserttext/inserttexttool.cpp @@ -71,8 +71,8 @@ using namespace Digikam; namespace DigikamInsertTextImagesPlugin { -InsertTextTool::InsertTextTool(TQObject* tqparent) - : EditorTool(tqparent) +InsertTextTool::InsertTextTool(TQObject* parent) + : EditorTool(parent) { setName("inserttext"); setToolName(i18n("Insert Text")); diff --git a/digikam/imageplugins/inserttext/inserttexttool.h b/digikam/imageplugins/inserttext/inserttexttool.h index 9053c45b..d4eacd71 100644 --- a/digikam/imageplugins/inserttext/inserttexttool.h +++ b/digikam/imageplugins/inserttext/inserttexttool.h @@ -61,7 +61,7 @@ class InsertTextTool : public Digikam::EditorTool public: - InsertTextTool(TQObject *tqparent); + InsertTextTool(TQObject *parent); ~InsertTextTool(); signals: diff --git a/digikam/imageplugins/inserttext/inserttextwidget.cpp b/digikam/imageplugins/inserttext/inserttextwidget.cpp index 24fd8ec5..82e0789e 100644 --- a/digikam/imageplugins/inserttext/inserttextwidget.cpp +++ b/digikam/imageplugins/inserttext/inserttextwidget.cpp @@ -51,8 +51,8 @@ namespace DigikamInsertTextImagesPlugin { -InsertTextWidget::InsertTextWidget(int w, int h, TQWidget *tqparent) - : TQWidget(tqparent, 0, TQt::WDestructiveClose) +InsertTextWidget::InsertTextWidget(int w, int h, TQWidget *parent) + : TQWidget(parent, 0, TQt::WDestructiveClose) { m_currentMoving = false; diff --git a/digikam/imageplugins/inserttext/inserttextwidget.h b/digikam/imageplugins/inserttext/inserttextwidget.h index 0c4ff354..56e326ce 100644 --- a/digikam/imageplugins/inserttext/inserttextwidget.h +++ b/digikam/imageplugins/inserttext/inserttextwidget.h @@ -86,7 +86,7 @@ Q_OBJECT public: - InsertTextWidget(int w, int h, TQWidget *tqparent=0); + InsertTextWidget(int w, int h, TQWidget *parent=0); ~InsertTextWidget(); Digikam::ImageIface* imageIface(); diff --git a/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp b/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp index c1095e4a..e645b0a0 100644 --- a/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp +++ b/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp @@ -61,8 +61,8 @@ namespace DigikamLensDistortionImagesPlugin { -ImageEffect_LensDistortion::ImageEffect_LensDistortion(TQWidget* tqparent) - : Digikam::ImageGuideDlg(tqparent, i18n("Lens Distortion Correction"), +ImageEffect_LensDistortion::ImageEffect_LensDistortion(TQWidget* parent) + : Digikam::ImageGuideDlg(parent, i18n("Lens Distortion Correction"), "lensdistortion", false, true, true, Digikam::ImageGuideWidget::HVGuideMode) { diff --git a/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.h b/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.h index 0a88d4ec..cc5f2588 100644 --- a/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.h +++ b/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.h @@ -48,7 +48,7 @@ class ImageEffect_LensDistortion : public Digikam::ImageGuideDlg public: - ImageEffect_LensDistortion(TQWidget *tqparent); + ImageEffect_LensDistortion(TQWidget *parent); ~ImageEffect_LensDistortion(); private slots: diff --git a/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.cpp b/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.cpp index 23336594..0db22289 100644 --- a/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.cpp +++ b/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.cpp @@ -41,8 +41,8 @@ using namespace DigikamLensDistortionImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_lensdistortion, KGenericFactory("digikamimageplugin_lensdistortion")); -ImagePlugin_LensDistortion::ImagePlugin_LensDistortion(TQObject *tqparent, const char*, const TQStringList &) - : Digikam::ImagePlugin(tqparent, "ImagePlugin_LensDistortion") +ImagePlugin_LensDistortion::ImagePlugin_LensDistortion(TQObject *parent, const char*, const TQStringList &) + : Digikam::ImagePlugin(parent, "ImagePlugin_LensDistortion") { m_lensdistortionAction = new KAction(i18n("Lens Distortion..."), "lensdistortion", 0, this, TQT_SLOT(slotLensDistortion()), diff --git a/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.h b/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.h index ab2891ca..b3e02f43 100644 --- a/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.h +++ b/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.h @@ -38,7 +38,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_LensDistortion : public Digikam::Im public: - ImagePlugin_LensDistortion(TQObject *tqparent, const char* name, + ImagePlugin_LensDistortion(TQObject *parent, const char* name, const TQStringList &args); ~ImagePlugin_LensDistortion(); diff --git a/digikam/imageplugins/lensdistortion/lensdistortion.cpp b/digikam/imageplugins/lensdistortion/lensdistortion.cpp index 03c92663..7b18cc93 100644 --- a/digikam/imageplugins/lensdistortion/lensdistortion.cpp +++ b/digikam/imageplugins/lensdistortion/lensdistortion.cpp @@ -37,10 +37,10 @@ namespace DigikamLensDistortionImagesPlugin { -LensDistortion::LensDistortion(Digikam::DImg *orgImage, TQObject *tqparent, double main, +LensDistortion::LensDistortion(Digikam::DImg *orgImage, TQObject *parent, double main, double edge, double rescale, double brighten, int center_x, int center_y) - : Digikam::DImgThreadedFilter(orgImage, tqparent, "LensDistortion") + : Digikam::DImgThreadedFilter(orgImage, parent, "LensDistortion") { m_main = main; m_edge = edge; diff --git a/digikam/imageplugins/lensdistortion/lensdistortion.h b/digikam/imageplugins/lensdistortion/lensdistortion.h index 79538395..cbc46105 100644 --- a/digikam/imageplugins/lensdistortion/lensdistortion.h +++ b/digikam/imageplugins/lensdistortion/lensdistortion.h @@ -37,7 +37,7 @@ class LensDistortion : public Digikam::DImgThreadedFilter public: - LensDistortion(Digikam::DImg *orgImage, TQObject *tqparent=0, double main=0.0, + LensDistortion(Digikam::DImg *orgImage, TQObject *parent=0, double main=0.0, double edge=0.0, double rescale=0.0, double brighten=0.0, int center_x=0, int center_y=0); diff --git a/digikam/imageplugins/lensdistortion/lensdistortiontool.cpp b/digikam/imageplugins/lensdistortion/lensdistortiontool.cpp index ec65d034..88e88e5a 100644 --- a/digikam/imageplugins/lensdistortion/lensdistortiontool.cpp +++ b/digikam/imageplugins/lensdistortion/lensdistortiontool.cpp @@ -69,8 +69,8 @@ using namespace Digikam; namespace DigikamLensDistortionImagesPlugin { -LensDistortionTool::LensDistortionTool(TQObject* tqparent) - : EditorToolThreaded(tqparent) +LensDistortionTool::LensDistortionTool(TQObject* parent) + : EditorToolThreaded(parent) { setName("lensdistortion"); setToolName(i18n("Lens Distortion")); diff --git a/digikam/imageplugins/lensdistortion/lensdistortiontool.h b/digikam/imageplugins/lensdistortion/lensdistortiontool.h index 24993fe3..b3b3ad15 100644 --- a/digikam/imageplugins/lensdistortion/lensdistortiontool.h +++ b/digikam/imageplugins/lensdistortion/lensdistortiontool.h @@ -53,7 +53,7 @@ class LensDistortionTool : public Digikam::EditorToolThreaded public: - LensDistortionTool(TQObject *tqparent); + LensDistortionTool(TQObject *parent); ~LensDistortionTool(); private slots: diff --git a/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp b/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp index fd0d0a23..87caaa3a 100644 --- a/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp +++ b/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp @@ -61,8 +61,8 @@ namespace DigikamNoiseReductionImagesPlugin { -ImageEffect_NoiseReduction::ImageEffect_NoiseReduction(TQWidget* tqparent) - : Digikam::CtrlPanelDlg(tqparent, i18n("Noise Reduction"), +ImageEffect_NoiseReduction::ImageEffect_NoiseReduction(TQWidget* parent) + : Digikam::CtrlPanelDlg(parent, i18n("Noise Reduction"), "noisereduction", true, true, true, Digikam::ImagePannelWidget::SeparateViewAll) { diff --git a/digikam/imageplugins/noisereduction/imageeffect_noisereduction.h b/digikam/imageplugins/noisereduction/imageeffect_noisereduction.h index 9aab21e4..4ab96456 100644 --- a/digikam/imageplugins/noisereduction/imageeffect_noisereduction.h +++ b/digikam/imageplugins/noisereduction/imageeffect_noisereduction.h @@ -40,7 +40,7 @@ class ImageEffect_NoiseReduction : public Digikam::CtrlPanelDlg public: - ImageEffect_NoiseReduction(TQWidget* tqparent); + ImageEffect_NoiseReduction(TQWidget* parent); ~ImageEffect_NoiseReduction(); private slots: diff --git a/digikam/imageplugins/noisereduction/imageplugin_noisereduction.cpp b/digikam/imageplugins/noisereduction/imageplugin_noisereduction.cpp index d8edb6b6..367571d4 100644 --- a/digikam/imageplugins/noisereduction/imageplugin_noisereduction.cpp +++ b/digikam/imageplugins/noisereduction/imageplugin_noisereduction.cpp @@ -42,8 +42,8 @@ using namespace DigikamNoiseReductionImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_noisereduction, KGenericFactory("digikamimageplugin_noisereduction")); -ImagePlugin_NoiseReduction::ImagePlugin_NoiseReduction(TQObject *tqparent, const char*, const TQStringList &) - : Digikam::ImagePlugin(tqparent, "ImagePlugin_NoiseReduction") +ImagePlugin_NoiseReduction::ImagePlugin_NoiseReduction(TQObject *parent, const char*, const TQStringList &) + : Digikam::ImagePlugin(parent, "ImagePlugin_NoiseReduction") { m_noiseReductionAction = new KAction(i18n("Noise Reduction..."), "noisereduction", 0, this, TQT_SLOT(slotNoiseReduction()), diff --git a/digikam/imageplugins/noisereduction/imageplugin_noisereduction.h b/digikam/imageplugins/noisereduction/imageplugin_noisereduction.h index 270ba8e0..6042de37 100644 --- a/digikam/imageplugins/noisereduction/imageplugin_noisereduction.h +++ b/digikam/imageplugins/noisereduction/imageplugin_noisereduction.h @@ -38,7 +38,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_NoiseReduction : public Digikam::Im public: - ImagePlugin_NoiseReduction(TQObject *tqparent, const char* name, + ImagePlugin_NoiseReduction(TQObject *parent, const char* name, const TQStringList &args); ~ImagePlugin_NoiseReduction(); diff --git a/digikam/imageplugins/noisereduction/noisereduction.cpp b/digikam/imageplugins/noisereduction/noisereduction.cpp index 3dc2a363..b9be4729 100644 --- a/digikam/imageplugins/noisereduction/noisereduction.cpp +++ b/digikam/imageplugins/noisereduction/noisereduction.cpp @@ -48,10 +48,10 @@ namespace DigikamNoiseReductionImagesPlugin { -NoiseReduction::NoiseReduction(Digikam::DImg *orgImage, TQObject *tqparent, +NoiseReduction::NoiseReduction(Digikam::DImg *orgImage, TQObject *parent, double radius, double lsmooth, double effect, double texture, double sharp, double csmooth, double lookahead, double gamma, double damping, double phase) - : Digikam::DImgThreadedFilter(orgImage, tqparent, "NoiseReduction") + : Digikam::DImgThreadedFilter(orgImage, parent, "NoiseReduction") { m_radius = radius; /* default radius default = 1.0 */ m_sharp = sharp; /* Sharpness factor default = 0.25 */ diff --git a/digikam/imageplugins/noisereduction/noisereduction.h b/digikam/imageplugins/noisereduction/noisereduction.h index e3887f9b..69e14123 100644 --- a/digikam/imageplugins/noisereduction/noisereduction.h +++ b/digikam/imageplugins/noisereduction/noisereduction.h @@ -201,7 +201,7 @@ class NoiseReduction : public Digikam::DImgThreadedFilter public: - NoiseReduction(Digikam::DImg *orgImage, TQObject *tqparent, + NoiseReduction(Digikam::DImg *orgImage, TQObject *parent, double radius, double lsmooth, double effect, double texture, double sharp, double csmooth, double lookahead, double gamma, double damping, double phase); ~NoiseReduction(){}; diff --git a/digikam/imageplugins/noisereduction/noisereductiontool.cpp b/digikam/imageplugins/noisereduction/noisereductiontool.cpp index 759f336e..c42ca451 100644 --- a/digikam/imageplugins/noisereduction/noisereductiontool.cpp +++ b/digikam/imageplugins/noisereduction/noisereductiontool.cpp @@ -68,8 +68,8 @@ using namespace Digikam; namespace DigikamNoiseReductionImagesPlugin { -NoiseReductionTool::NoiseReductionTool(TQObject* tqparent) - : EditorToolThreaded(tqparent) +NoiseReductionTool::NoiseReductionTool(TQObject* parent) + : EditorToolThreaded(parent) { setName("noisereduction"); setToolName(i18n("Noise Reduction")); diff --git a/digikam/imageplugins/noisereduction/noisereductiontool.h b/digikam/imageplugins/noisereduction/noisereductiontool.h index 92a6359e..2138638e 100644 --- a/digikam/imageplugins/noisereduction/noisereductiontool.h +++ b/digikam/imageplugins/noisereduction/noisereductiontool.h @@ -49,7 +49,7 @@ class NoiseReductionTool : public Digikam::EditorToolThreaded public: - NoiseReductionTool(TQObject* tqparent); + NoiseReductionTool(TQObject* parent); ~NoiseReductionTool(); private: diff --git a/digikam/imageplugins/oilpaint/imageeffect_oilpaint.cpp b/digikam/imageplugins/oilpaint/imageeffect_oilpaint.cpp index 20462ea6..d1e79db1 100644 --- a/digikam/imageplugins/oilpaint/imageeffect_oilpaint.cpp +++ b/digikam/imageplugins/oilpaint/imageeffect_oilpaint.cpp @@ -54,8 +54,8 @@ namespace DigikamOilPaintImagesPlugin { -ImageEffect_OilPaint::ImageEffect_OilPaint(TQWidget* tqparent) - : Digikam::CtrlPanelDlg(tqparent, i18n("Apply Oil Paint Effect"), +ImageEffect_OilPaint::ImageEffect_OilPaint(TQWidget* parent) + : Digikam::CtrlPanelDlg(parent, i18n("Apply Oil Paint Effect"), "oilpaint", false, false, true, Digikam::ImagePannelWidget::SeparateViewAll) { diff --git a/digikam/imageplugins/oilpaint/imageeffect_oilpaint.h b/digikam/imageplugins/oilpaint/imageeffect_oilpaint.h index 14bf28f4..253858fd 100644 --- a/digikam/imageplugins/oilpaint/imageeffect_oilpaint.h +++ b/digikam/imageplugins/oilpaint/imageeffect_oilpaint.h @@ -41,7 +41,7 @@ class ImageEffect_OilPaint : public Digikam::CtrlPanelDlg public: - ImageEffect_OilPaint(TQWidget* tqparent); + ImageEffect_OilPaint(TQWidget* parent); ~ImageEffect_OilPaint(); private slots: diff --git a/digikam/imageplugins/oilpaint/imageplugin_oilpaint.cpp b/digikam/imageplugins/oilpaint/imageplugin_oilpaint.cpp index 13da7ec2..22274a77 100644 --- a/digikam/imageplugins/oilpaint/imageplugin_oilpaint.cpp +++ b/digikam/imageplugins/oilpaint/imageplugin_oilpaint.cpp @@ -42,8 +42,8 @@ using namespace DigikamOilPaintImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_oilpaint, KGenericFactory("digikamimageplugin_oilpaint")); -ImagePlugin_OilPaint::ImagePlugin_OilPaint(TQObject *tqparent, const char*, const TQStringList&) - : Digikam::ImagePlugin(tqparent, "ImagePlugin_OilPaint") +ImagePlugin_OilPaint::ImagePlugin_OilPaint(TQObject *parent, const char*, const TQStringList&) + : Digikam::ImagePlugin(parent, "ImagePlugin_OilPaint") { m_oilpaintAction = new KAction(i18n("Oil Paint..."), "oilpaint", 0, this, TQT_SLOT(slotOilPaint()), diff --git a/digikam/imageplugins/oilpaint/imageplugin_oilpaint.h b/digikam/imageplugins/oilpaint/imageplugin_oilpaint.h index bd6e0f26..af5de4cb 100644 --- a/digikam/imageplugins/oilpaint/imageplugin_oilpaint.h +++ b/digikam/imageplugins/oilpaint/imageplugin_oilpaint.h @@ -38,7 +38,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_OilPaint : public Digikam::ImagePlu public: - ImagePlugin_OilPaint(TQObject *tqparent, const char* name, + ImagePlugin_OilPaint(TQObject *parent, const char* name, const TQStringList &args); ~ImagePlugin_OilPaint(); diff --git a/digikam/imageplugins/oilpaint/oilpaint.cpp b/digikam/imageplugins/oilpaint/oilpaint.cpp index 0e29a233..be9697fa 100644 --- a/digikam/imageplugins/oilpaint/oilpaint.cpp +++ b/digikam/imageplugins/oilpaint/oilpaint.cpp @@ -41,8 +41,8 @@ namespace DigikamOilPaintImagesPlugin { -OilPaint::OilPaint(Digikam::DImg *orgImage, TQObject *tqparent, int brushSize, int smoothness) - : Digikam::DImgThreadedFilter(orgImage, tqparent, "OilPaint") +OilPaint::OilPaint(Digikam::DImg *orgImage, TQObject *parent, int brushSize, int smoothness) + : Digikam::DImgThreadedFilter(orgImage, parent, "OilPaint") { m_brushSize = brushSize; m_smoothness = smoothness; diff --git a/digikam/imageplugins/oilpaint/oilpaint.h b/digikam/imageplugins/oilpaint/oilpaint.h index 7e1829dd..998522a5 100644 --- a/digikam/imageplugins/oilpaint/oilpaint.h +++ b/digikam/imageplugins/oilpaint/oilpaint.h @@ -37,7 +37,7 @@ class OilPaint : public Digikam::DImgThreadedFilter public: - OilPaint(Digikam::DImg *orgImage, TQObject *tqparent=0, int brushSize=1, int smoothness=30); + OilPaint(Digikam::DImg *orgImage, TQObject *parent=0, int brushSize=1, int smoothness=30); ~OilPaint(){}; diff --git a/digikam/imageplugins/oilpaint/oilpainttool.cpp b/digikam/imageplugins/oilpaint/oilpainttool.cpp index 3436e1e3..0a280ed9 100644 --- a/digikam/imageplugins/oilpaint/oilpainttool.cpp +++ b/digikam/imageplugins/oilpaint/oilpainttool.cpp @@ -61,8 +61,8 @@ using namespace Digikam; namespace DigikamOilPaintImagesPlugin { -OilPaintTool::OilPaintTool(TQObject* tqparent) - : EditorToolThreaded(tqparent) +OilPaintTool::OilPaintTool(TQObject* parent) + : EditorToolThreaded(parent) { setName("oilpaint"); setToolName(i18n("Oil Paint")); diff --git a/digikam/imageplugins/oilpaint/oilpainttool.h b/digikam/imageplugins/oilpaint/oilpainttool.h index fe7d92da..c3a21c98 100644 --- a/digikam/imageplugins/oilpaint/oilpainttool.h +++ b/digikam/imageplugins/oilpaint/oilpainttool.h @@ -50,7 +50,7 @@ class OilPaintTool : public Digikam::EditorToolThreaded public: - OilPaintTool(TQObject* tqparent); + OilPaintTool(TQObject* parent); ~OilPaintTool(); private slots: diff --git a/digikam/imageplugins/perspective/imageeffect_perspective.cpp b/digikam/imageplugins/perspective/imageeffect_perspective.cpp index 446f6eee..92de5e51 100644 --- a/digikam/imageplugins/perspective/imageeffect_perspective.cpp +++ b/digikam/imageplugins/perspective/imageeffect_perspective.cpp @@ -60,8 +60,8 @@ namespace DigikamPerspectiveImagesPlugin { -ImageEffect_Perspective::ImageEffect_Perspective(TQWidget* tqparent) - : Digikam::ImageDlgBase(tqparent, i18n("Adjust Photograph Perspective"), +ImageEffect_Perspective::ImageEffect_Perspective(TQWidget* parent) + : Digikam::ImageDlgBase(parent, i18n("Adjust Photograph Perspective"), "perspective", false, false) { TQString whatsThis; diff --git a/digikam/imageplugins/perspective/imageeffect_perspective.h b/digikam/imageplugins/perspective/imageeffect_perspective.h index 4543ef6e..0ec9b342 100644 --- a/digikam/imageplugins/perspective/imageeffect_perspective.h +++ b/digikam/imageplugins/perspective/imageeffect_perspective.h @@ -50,7 +50,7 @@ class ImageEffect_Perspective : public Digikam::ImageDlgBase public: - ImageEffect_Perspective(TQWidget* tqparent); + ImageEffect_Perspective(TQWidget* parent); ~ImageEffect_Perspective(); private slots: diff --git a/digikam/imageplugins/perspective/imageplugin_perspective.cpp b/digikam/imageplugins/perspective/imageplugin_perspective.cpp index dfc55adb..30135b8a 100644 --- a/digikam/imageplugins/perspective/imageplugin_perspective.cpp +++ b/digikam/imageplugins/perspective/imageplugin_perspective.cpp @@ -41,8 +41,8 @@ using namespace DigikamPerspectiveImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_perspective, KGenericFactory("digikamimageplugin_perspective")); -ImagePlugin_Perspective::ImagePlugin_Perspective(TQObject *tqparent, const char*, const TQStringList &) - : Digikam::ImagePlugin(tqparent, "ImagePlugin_Perspective") +ImagePlugin_Perspective::ImagePlugin_Perspective(TQObject *parent, const char*, const TQStringList &) + : Digikam::ImagePlugin(parent, "ImagePlugin_Perspective") { m_perspectiveAction = new KAction(i18n("Perspective Adjustment..."), "perspective", 0, this, TQT_SLOT(slotPerspective()), diff --git a/digikam/imageplugins/perspective/imageplugin_perspective.h b/digikam/imageplugins/perspective/imageplugin_perspective.h index 0109d541..068405dd 100644 --- a/digikam/imageplugins/perspective/imageplugin_perspective.h +++ b/digikam/imageplugins/perspective/imageplugin_perspective.h @@ -38,7 +38,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_Perspective : public Digikam::Image public: - ImagePlugin_Perspective(TQObject *tqparent, const char* name, + ImagePlugin_Perspective(TQObject *parent, const char* name, const TQStringList &args); ~ImagePlugin_Perspective(); diff --git a/digikam/imageplugins/perspective/perspectivetool.cpp b/digikam/imageplugins/perspective/perspectivetool.cpp index f493f513..714c7482 100644 --- a/digikam/imageplugins/perspective/perspectivetool.cpp +++ b/digikam/imageplugins/perspective/perspectivetool.cpp @@ -67,8 +67,8 @@ using namespace Digikam; namespace DigikamPerspectiveImagesPlugin { -PerspectiveTool::PerspectiveTool(TQObject* tqparent) - : EditorTool(tqparent) +PerspectiveTool::PerspectiveTool(TQObject* parent) + : EditorTool(parent) { setName("perspective"); setToolName(i18n("Perspective")); diff --git a/digikam/imageplugins/perspective/perspectivetool.h b/digikam/imageplugins/perspective/perspectivetool.h index a71edda3..bb3df2b2 100644 --- a/digikam/imageplugins/perspective/perspectivetool.h +++ b/digikam/imageplugins/perspective/perspectivetool.h @@ -59,7 +59,7 @@ class PerspectiveTool : public Digikam::EditorTool public: - PerspectiveTool(TQObject* tqparent); + PerspectiveTool(TQObject* parent); ~PerspectiveTool(); private slots: diff --git a/digikam/imageplugins/perspective/perspectivewidget.cpp b/digikam/imageplugins/perspective/perspectivewidget.cpp index 1aceb42e..e3cf6143 100644 --- a/digikam/imageplugins/perspective/perspectivewidget.cpp +++ b/digikam/imageplugins/perspective/perspectivewidget.cpp @@ -60,8 +60,8 @@ namespace DigikamPerspectiveImagesPlugin { -PerspectiveWidget::PerspectiveWidget(int w, int h, TQWidget *tqparent) - : TQWidget(tqparent, 0, TQt::WDestructiveClose) +PerspectiveWidget::PerspectiveWidget(int w, int h, TQWidget *parent) + : TQWidget(parent, 0, TQt::WDestructiveClose) { setBackgroundMode(TQt::NoBackground); setMinimumSize(w, h); diff --git a/digikam/imageplugins/perspective/perspectivewidget.h b/digikam/imageplugins/perspective/perspectivewidget.h index d84af472..a46b0a5d 100644 --- a/digikam/imageplugins/perspective/perspectivewidget.h +++ b/digikam/imageplugins/perspective/perspectivewidget.h @@ -58,7 +58,7 @@ Q_OBJECT public: - PerspectiveWidget(int width, int height, TQWidget *tqparent=0); + PerspectiveWidget(int width, int height, TQWidget *parent=0); ~PerspectiveWidget(); TQRect getTargetSize(void); diff --git a/digikam/imageplugins/raindrop/imageeffect_raindrop.cpp b/digikam/imageplugins/raindrop/imageeffect_raindrop.cpp index 62cb96a4..3ce021a6 100644 --- a/digikam/imageplugins/raindrop/imageeffect_raindrop.cpp +++ b/digikam/imageplugins/raindrop/imageeffect_raindrop.cpp @@ -53,8 +53,8 @@ namespace DigikamRainDropImagesPlugin { -ImageEffect_RainDrop::ImageEffect_RainDrop(TQWidget* tqparent) - : Digikam::ImageGuideDlg(tqparent, i18n("Add Raindrops to Photograph"), +ImageEffect_RainDrop::ImageEffect_RainDrop(TQWidget* parent) + : Digikam::ImageGuideDlg(parent, i18n("Add Raindrops to Photograph"), "raindrops", false, true, false, Digikam::ImageGuideWidget::HVGuideMode) { diff --git a/digikam/imageplugins/raindrop/imageeffect_raindrop.h b/digikam/imageplugins/raindrop/imageeffect_raindrop.h index d5ef6c2d..45e7301c 100644 --- a/digikam/imageplugins/raindrop/imageeffect_raindrop.h +++ b/digikam/imageplugins/raindrop/imageeffect_raindrop.h @@ -41,7 +41,7 @@ class ImageEffect_RainDrop : public Digikam::ImageGuideDlg public: - ImageEffect_RainDrop(TQWidget *tqparent); + ImageEffect_RainDrop(TQWidget *parent); ~ImageEffect_RainDrop(); private slots: diff --git a/digikam/imageplugins/raindrop/imageplugin_raindrop.cpp b/digikam/imageplugins/raindrop/imageplugin_raindrop.cpp index ec517c7a..dd5b87b3 100644 --- a/digikam/imageplugins/raindrop/imageplugin_raindrop.cpp +++ b/digikam/imageplugins/raindrop/imageplugin_raindrop.cpp @@ -41,8 +41,8 @@ using namespace DigikamRainDropImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_raindrop, KGenericFactory("digikamimageplugin_raindrop")); -ImagePlugin_RainDrop::ImagePlugin_RainDrop(TQObject *tqparent, const char*, const TQStringList &) - : Digikam::ImagePlugin(tqparent, "ImagePlugin_RainDrop") +ImagePlugin_RainDrop::ImagePlugin_RainDrop(TQObject *parent, const char*, const TQStringList &) + : Digikam::ImagePlugin(parent, "ImagePlugin_RainDrop") { m_raindropAction = new KAction(i18n("Raindrops..."), "raindrop", 0, this, TQT_SLOT(slotRainDrop()), diff --git a/digikam/imageplugins/raindrop/imageplugin_raindrop.h b/digikam/imageplugins/raindrop/imageplugin_raindrop.h index 24840e25..f2857b22 100644 --- a/digikam/imageplugins/raindrop/imageplugin_raindrop.h +++ b/digikam/imageplugins/raindrop/imageplugin_raindrop.h @@ -38,7 +38,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_RainDrop : public Digikam::ImagePlu public: - ImagePlugin_RainDrop(TQObject *tqparent, const char* name, + ImagePlugin_RainDrop(TQObject *parent, const char* name, const TQStringList &args); ~ImagePlugin_RainDrop(); diff --git a/digikam/imageplugins/raindrop/raindrop.cpp b/digikam/imageplugins/raindrop/raindrop.cpp index eb5926ab..bd466d32 100644 --- a/digikam/imageplugins/raindrop/raindrop.cpp +++ b/digikam/imageplugins/raindrop/raindrop.cpp @@ -45,9 +45,9 @@ namespace DigikamRainDropImagesPlugin { -RainDrop::RainDrop(Digikam::DImg *orgImage, TQObject *tqparent, int drop, +RainDrop::RainDrop(Digikam::DImg *orgImage, TQObject *parent, int drop, int amount, int coeff, TQRect *selection) - : Digikam::DImgThreadedFilter(orgImage, tqparent, "RainDrop") + : Digikam::DImgThreadedFilter(orgImage, parent, "RainDrop") { m_drop = drop; m_amount = amount; diff --git a/digikam/imageplugins/raindrop/raindrop.h b/digikam/imageplugins/raindrop/raindrop.h index 0bd1e7cf..9baca0d1 100644 --- a/digikam/imageplugins/raindrop/raindrop.h +++ b/digikam/imageplugins/raindrop/raindrop.h @@ -39,7 +39,7 @@ class RainDrop : public Digikam::DImgThreadedFilter public: - RainDrop(Digikam::DImg *orgImage, TQObject *tqparent=0, int drop=80, + RainDrop(Digikam::DImg *orgImage, TQObject *parent=0, int drop=80, int amount=150, int coeff=30, TQRect *selection=0L); ~RainDrop(){}; diff --git a/digikam/imageplugins/raindrop/raindroptool.cpp b/digikam/imageplugins/raindrop/raindroptool.cpp index 638aa6f9..cd89bd12 100644 --- a/digikam/imageplugins/raindrop/raindroptool.cpp +++ b/digikam/imageplugins/raindrop/raindroptool.cpp @@ -60,8 +60,8 @@ using namespace Digikam; namespace DigikamRainDropImagesPlugin { -RainDropTool::RainDropTool(TQObject* tqparent) - : EditorToolThreaded(tqparent) +RainDropTool::RainDropTool(TQObject* parent) + : EditorToolThreaded(parent) { setName("raindrops"); setToolName(i18n("Raindrops")); diff --git a/digikam/imageplugins/raindrop/raindroptool.h b/digikam/imageplugins/raindrop/raindroptool.h index cce309f3..8328bdaf 100644 --- a/digikam/imageplugins/raindrop/raindroptool.h +++ b/digikam/imageplugins/raindrop/raindroptool.h @@ -49,7 +49,7 @@ class RainDropTool : public Digikam::EditorToolThreaded public: - RainDropTool(TQObject *tqparent); + RainDropTool(TQObject *parent); ~RainDropTool(); private slots: diff --git a/digikam/imageplugins/restoration/imageeffect_restoration.cpp b/digikam/imageplugins/restoration/imageeffect_restoration.cpp index 6840821f..4472ee85 100644 --- a/digikam/imageplugins/restoration/imageeffect_restoration.cpp +++ b/digikam/imageplugins/restoration/imageeffect_restoration.cpp @@ -59,8 +59,8 @@ namespace DigikamRestorationImagesPlugin { -ImageEffect_Restoration::ImageEffect_Restoration(TQWidget* tqparent) - : Digikam::CtrlPanelDlg(tqparent, i18n("Photograph Restoration"), +ImageEffect_Restoration::ImageEffect_Restoration(TQWidget* parent) + : Digikam::CtrlPanelDlg(parent, i18n("Photograph Restoration"), "restoration", true, true, true, Digikam::ImagePannelWidget::SeparateViewAll) { diff --git a/digikam/imageplugins/restoration/imageeffect_restoration.h b/digikam/imageplugins/restoration/imageeffect_restoration.h index f87636f3..3d3a4796 100644 --- a/digikam/imageplugins/restoration/imageeffect_restoration.h +++ b/digikam/imageplugins/restoration/imageeffect_restoration.h @@ -51,7 +51,7 @@ class ImageEffect_Restoration : public Digikam::CtrlPanelDlg public: - ImageEffect_Restoration(TQWidget* tqparent); + ImageEffect_Restoration(TQWidget* parent); ~ImageEffect_Restoration(); private slots: diff --git a/digikam/imageplugins/restoration/imageplugin_restoration.cpp b/digikam/imageplugins/restoration/imageplugin_restoration.cpp index 52e02d57..36ad4747 100644 --- a/digikam/imageplugins/restoration/imageplugin_restoration.cpp +++ b/digikam/imageplugins/restoration/imageplugin_restoration.cpp @@ -43,8 +43,8 @@ using namespace DigikamRestorationImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_restoration, KGenericFactory("digikamimageplugin_restoration")); -ImagePlugin_Restoration::ImagePlugin_Restoration(TQObject *tqparent, const char*, const TQStringList &) - : Digikam::ImagePlugin(tqparent, "ImagePlugin_Restoration") +ImagePlugin_Restoration::ImagePlugin_Restoration(TQObject *parent, const char*, const TQStringList &) + : Digikam::ImagePlugin(parent, "ImagePlugin_Restoration") { m_restorationAction = new KAction(i18n("Restoration..."), "restoration", 0, this, TQT_SLOT(slotRestoration()), diff --git a/digikam/imageplugins/restoration/imageplugin_restoration.h b/digikam/imageplugins/restoration/imageplugin_restoration.h index bbddbbab..fb323f88 100644 --- a/digikam/imageplugins/restoration/imageplugin_restoration.h +++ b/digikam/imageplugins/restoration/imageplugin_restoration.h @@ -39,7 +39,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_Restoration : public Digikam::Image public: - ImagePlugin_Restoration(TQObject *tqparent, const char* name, + ImagePlugin_Restoration(TQObject *parent, const char* name, const TQStringList &args); ~ImagePlugin_Restoration(); diff --git a/digikam/imageplugins/restoration/restorationtool.cpp b/digikam/imageplugins/restoration/restorationtool.cpp index c73a68a7..0d679222 100644 --- a/digikam/imageplugins/restoration/restorationtool.cpp +++ b/digikam/imageplugins/restoration/restorationtool.cpp @@ -63,8 +63,8 @@ using namespace Digikam; namespace DigikamRestorationImagesPlugin { -RestorationTool::RestorationTool(TQObject* tqparent) - : EditorToolThreaded(tqparent) +RestorationTool::RestorationTool(TQObject* parent) + : EditorToolThreaded(parent) { setName("restoration"); setToolName(i18n("Restoration")); diff --git a/digikam/imageplugins/restoration/restorationtool.h b/digikam/imageplugins/restoration/restorationtool.h index 4b80e91c..ad46e9fc 100644 --- a/digikam/imageplugins/restoration/restorationtool.h +++ b/digikam/imageplugins/restoration/restorationtool.h @@ -53,7 +53,7 @@ class RestorationTool : public Digikam::EditorToolThreaded public: - RestorationTool(TQObject* tqparent); + RestorationTool(TQObject* parent); ~RestorationTool(); private slots: diff --git a/digikam/imageplugins/sheartool/imageeffect_sheartool.cpp b/digikam/imageplugins/sheartool/imageeffect_sheartool.cpp index 2dc66b95..ecd58493 100644 --- a/digikam/imageplugins/sheartool/imageeffect_sheartool.cpp +++ b/digikam/imageplugins/sheartool/imageeffect_sheartool.cpp @@ -55,8 +55,8 @@ namespace DigikamShearToolImagesPlugin { -ImageEffect_ShearTool::ImageEffect_ShearTool(TQWidget* tqparent) - : Digikam::ImageGuideDlg(tqparent, i18n("Shear Tool"), "sheartool", +ImageEffect_ShearTool::ImageEffect_ShearTool(TQWidget* parent) + : Digikam::ImageGuideDlg(parent, i18n("Shear Tool"), "sheartool", false, true, true, Digikam::ImageGuideWidget::HVGuideMode) { diff --git a/digikam/imageplugins/sheartool/imageeffect_sheartool.h b/digikam/imageplugins/sheartool/imageeffect_sheartool.h index 2724b5b9..697a47f7 100644 --- a/digikam/imageplugins/sheartool/imageeffect_sheartool.h +++ b/digikam/imageplugins/sheartool/imageeffect_sheartool.h @@ -46,7 +46,7 @@ class ImageEffect_ShearTool : public Digikam::ImageGuideDlg public: - ImageEffect_ShearTool(TQWidget* tqparent); + ImageEffect_ShearTool(TQWidget* parent); ~ImageEffect_ShearTool(); private slots: diff --git a/digikam/imageplugins/sheartool/imageplugin_sheartool.cpp b/digikam/imageplugins/sheartool/imageplugin_sheartool.cpp index b4ffc783..234ea3aa 100644 --- a/digikam/imageplugins/sheartool/imageplugin_sheartool.cpp +++ b/digikam/imageplugins/sheartool/imageplugin_sheartool.cpp @@ -41,8 +41,8 @@ using namespace DigikamShearToolImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_sheartool, KGenericFactory("digikamimageplugin_sheartool")); -ImagePlugin_ShearTool::ImagePlugin_ShearTool(TQObject *tqparent, const char*, const TQStringList &) - : Digikam::ImagePlugin(tqparent, "ImagePlugin_ShearTool") +ImagePlugin_ShearTool::ImagePlugin_ShearTool(TQObject *parent, const char*, const TQStringList &) + : Digikam::ImagePlugin(parent, "ImagePlugin_ShearTool") { m_sheartoolAction = new KAction(i18n("Shear..."), "shear", 0, this, TQT_SLOT(slotShearTool()), diff --git a/digikam/imageplugins/sheartool/imageplugin_sheartool.h b/digikam/imageplugins/sheartool/imageplugin_sheartool.h index abff9845..2f8f4eea 100644 --- a/digikam/imageplugins/sheartool/imageplugin_sheartool.h +++ b/digikam/imageplugins/sheartool/imageplugin_sheartool.h @@ -38,7 +38,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_ShearTool : public Digikam::ImagePl public: - ImagePlugin_ShearTool(TQObject *tqparent, const char* name, + ImagePlugin_ShearTool(TQObject *parent, const char* name, const TQStringList &args); ~ImagePlugin_ShearTool(); diff --git a/digikam/imageplugins/sheartool/shear.cpp b/digikam/imageplugins/sheartool/shear.cpp index 2003cfdb..3c5a2dd2 100644 --- a/digikam/imageplugins/sheartool/shear.cpp +++ b/digikam/imageplugins/sheartool/shear.cpp @@ -41,9 +41,9 @@ namespace DigikamShearToolImagesPlugin { -Shear::Shear(Digikam::DImg *orgImage, TQObject *tqparent, float hAngle, float vAngle, +Shear::Shear(Digikam::DImg *orgImage, TQObject *parent, float hAngle, float vAngle, bool antialiasing, TQColor backgroundColor, int orgW, int orgH) - : Digikam::DImgThreadedFilter(orgImage, tqparent, "sheartool") + : Digikam::DImgThreadedFilter(orgImage, parent, "sheartool") { m_hAngle = hAngle; m_vAngle = vAngle; diff --git a/digikam/imageplugins/sheartool/shear.h b/digikam/imageplugins/sheartool/shear.h index ed97ce19..480d1084 100644 --- a/digikam/imageplugins/sheartool/shear.h +++ b/digikam/imageplugins/sheartool/shear.h @@ -41,7 +41,7 @@ class Shear : public Digikam::DImgThreadedFilter public: - Shear(Digikam::DImg *orgImage, TQObject *tqparent=0, float hAngle=0.0, float vAngle=0.0, + Shear(Digikam::DImg *orgImage, TQObject *parent=0, float hAngle=0.0, float vAngle=0.0, bool antialiasing=true, TQColor backgroundColor=TQt::black, int orgW=0, int orgH=0); ~Shear(){}; diff --git a/digikam/imageplugins/sheartool/sheartool.cpp b/digikam/imageplugins/sheartool/sheartool.cpp index fb468672..95fc3e04 100644 --- a/digikam/imageplugins/sheartool/sheartool.cpp +++ b/digikam/imageplugins/sheartool/sheartool.cpp @@ -62,8 +62,8 @@ using namespace Digikam; namespace DigikamShearToolImagesPlugin { -ShearTool::ShearTool(TQObject* tqparent) - : EditorToolThreaded(tqparent) +ShearTool::ShearTool(TQObject* parent) + : EditorToolThreaded(parent) { setName("sheartool"); setToolName(i18n("Shear Tool")); diff --git a/digikam/imageplugins/sheartool/sheartool.h b/digikam/imageplugins/sheartool/sheartool.h index 10e99ae9..45a25a16 100644 --- a/digikam/imageplugins/sheartool/sheartool.h +++ b/digikam/imageplugins/sheartool/sheartool.h @@ -55,7 +55,7 @@ class ShearTool : public Digikam::EditorToolThreaded public: - ShearTool(TQObject* tqparent); + ShearTool(TQObject* parent); ~ShearTool(); private slots: diff --git a/digikam/imageplugins/superimpose/dirselectwidget.cpp b/digikam/imageplugins/superimpose/dirselectwidget.cpp index 45f479a8..a4be4449 100644 --- a/digikam/imageplugins/superimpose/dirselectwidget.cpp +++ b/digikam/imageplugins/superimpose/dirselectwidget.cpp @@ -51,8 +51,8 @@ struct DirSelectWidget::Private KURL m_rootUrl; }; -DirSelectWidget::DirSelectWidget(TQWidget* tqparent, const char* name, TQString headerLabel) - : KFileTreeView( tqparent, name) +DirSelectWidget::DirSelectWidget(TQWidget* parent, const char* name, TQString headerLabel) + : KFileTreeView( parent, name) { d = new Private; @@ -65,8 +65,8 @@ DirSelectWidget::DirSelectWidget(TQWidget* tqparent, const char* name, TQString } DirSelectWidget::DirSelectWidget(KURL rootUrl, KURL currentUrl, - TQWidget* tqparent, const char* name, TQString headerLabel) - : KFileTreeView( tqparent, name) + TQWidget* parent, const char* name, TQString headerLabel) + : KFileTreeView( parent, name) { d = new Private; diff --git a/digikam/imageplugins/superimpose/dirselectwidget.h b/digikam/imageplugins/superimpose/dirselectwidget.h index 49211ba8..46f70e28 100644 --- a/digikam/imageplugins/superimpose/dirselectwidget.h +++ b/digikam/imageplugins/superimpose/dirselectwidget.h @@ -46,10 +46,10 @@ Q_OBJECT public: - DirSelectWidget(TQWidget* tqparent, const char* name=0, TQString headerLabel=TQString()); + DirSelectWidget(TQWidget* parent, const char* name=0, TQString headerLabel=TQString()); DirSelectWidget(KURL rootUrl=KURL("/"), KURL currentUrl=KURL(), - TQWidget* tqparent=0, const char* name=0, TQString headerLabel=TQString()); + TQWidget* parent=0, const char* name=0, TQString headerLabel=TQString()); ~DirSelectWidget(); diff --git a/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp b/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp index 0189763b..6c500f0e 100644 --- a/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp +++ b/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp @@ -71,8 +71,8 @@ namespace DigikamSuperImposeImagesPlugin { -ImageEffect_SuperImpose::ImageEffect_SuperImpose(TQWidget* tqparent) - : Digikam::ImageDlgBase(tqparent, i18n("Template Superimpose to Photograph"), +ImageEffect_SuperImpose::ImageEffect_SuperImpose(TQWidget* parent) + : Digikam::ImageDlgBase(parent, i18n("Template Superimpose to Photograph"), "superimpose", false, false) { TQString whatsThis; diff --git a/digikam/imageplugins/superimpose/imageeffect_superimpose.h b/digikam/imageplugins/superimpose/imageeffect_superimpose.h index 79cb9808..359b3a03 100644 --- a/digikam/imageplugins/superimpose/imageeffect_superimpose.h +++ b/digikam/imageplugins/superimpose/imageeffect_superimpose.h @@ -54,7 +54,7 @@ class ImageEffect_SuperImpose : public Digikam::ImageDlgBase public: - ImageEffect_SuperImpose(TQWidget* tqparent); + ImageEffect_SuperImpose(TQWidget* parent); ~ImageEffect_SuperImpose(); private slots: diff --git a/digikam/imageplugins/superimpose/imageplugin_superimpose.cpp b/digikam/imageplugins/superimpose/imageplugin_superimpose.cpp index 6d4064f1..dc990ad9 100644 --- a/digikam/imageplugins/superimpose/imageplugin_superimpose.cpp +++ b/digikam/imageplugins/superimpose/imageplugin_superimpose.cpp @@ -43,8 +43,8 @@ using namespace DigikamSuperImposeImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_superimpose, KGenericFactory("digikamimageplugin_superimpose")); -ImagePlugin_SuperImpose::ImagePlugin_SuperImpose(TQObject *tqparent, const char*, const TQStringList &) - : Digikam::ImagePlugin(tqparent, "ImagePlugin_SuperImpose") +ImagePlugin_SuperImpose::ImagePlugin_SuperImpose(TQObject *parent, const char*, const TQStringList &) + : Digikam::ImagePlugin(parent, "ImagePlugin_SuperImpose") { m_superimposeAction = new KAction(i18n("Template Superimpose..."), "superimpose", 0, this, TQT_SLOT(slotSuperImpose()), diff --git a/digikam/imageplugins/superimpose/imageplugin_superimpose.h b/digikam/imageplugins/superimpose/imageplugin_superimpose.h index a03abcd2..75bc9ce6 100644 --- a/digikam/imageplugins/superimpose/imageplugin_superimpose.h +++ b/digikam/imageplugins/superimpose/imageplugin_superimpose.h @@ -40,7 +40,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_SuperImpose : public Digikam::Image public: - ImagePlugin_SuperImpose(TQObject *tqparent, const char* name, + ImagePlugin_SuperImpose(TQObject *parent, const char* name, const TQStringList &args); ~ImagePlugin_SuperImpose(); diff --git a/digikam/imageplugins/superimpose/superimposetool.cpp b/digikam/imageplugins/superimpose/superimposetool.cpp index 127e3898..7e1f8a76 100644 --- a/digikam/imageplugins/superimpose/superimposetool.cpp +++ b/digikam/imageplugins/superimpose/superimposetool.cpp @@ -74,8 +74,8 @@ using namespace Digikam; namespace DigikamSuperImposeImagesPlugin { -SuperImposeTool::SuperImposeTool(TQObject* tqparent) - : EditorTool(tqparent) +SuperImposeTool::SuperImposeTool(TQObject* parent) + : EditorTool(parent) { setName("superimpose"); setToolName(i18n("Template Superimpose")); diff --git a/digikam/imageplugins/superimpose/superimposetool.h b/digikam/imageplugins/superimpose/superimposetool.h index c35803cd..8d033fec 100644 --- a/digikam/imageplugins/superimpose/superimposetool.h +++ b/digikam/imageplugins/superimpose/superimposetool.h @@ -55,7 +55,7 @@ class SuperImposeTool : public Digikam::EditorTool public: - SuperImposeTool(TQObject* tqparent); + SuperImposeTool(TQObject* parent); ~SuperImposeTool(); private slots: diff --git a/digikam/imageplugins/superimpose/superimposewidget.cpp b/digikam/imageplugins/superimpose/superimposewidget.cpp index 2c30b878..5f911158 100644 --- a/digikam/imageplugins/superimpose/superimposewidget.cpp +++ b/digikam/imageplugins/superimpose/superimposewidget.cpp @@ -46,8 +46,8 @@ namespace DigikamSuperImposeImagesPlugin { -SuperImposeWidget::SuperImposeWidget(int w, int h, TQWidget *tqparent) - : TQWidget(tqparent, 0, TQt::WDestructiveClose) +SuperImposeWidget::SuperImposeWidget(int w, int h, TQWidget *parent) + : TQWidget(parent, 0, TQt::WDestructiveClose) { m_pixmap = new TQPixmap(w, h); m_editMode = MOVE; diff --git a/digikam/imageplugins/superimpose/superimposewidget.h b/digikam/imageplugins/superimpose/superimposewidget.h index 8b661d3b..cda76c11 100644 --- a/digikam/imageplugins/superimpose/superimposewidget.h +++ b/digikam/imageplugins/superimpose/superimposewidget.h @@ -67,7 +67,7 @@ Q_OBJECT public: - SuperImposeWidget(int w, int h, TQWidget *tqparent=0); + SuperImposeWidget(int w, int h, TQWidget *parent=0); ~SuperImposeWidget(); void setEditMode(int mode); diff --git a/digikam/imageplugins/texture/imageeffect_texture.cpp b/digikam/imageplugins/texture/imageeffect_texture.cpp index 7d619bcd..12fb7c6f 100644 --- a/digikam/imageplugins/texture/imageeffect_texture.cpp +++ b/digikam/imageplugins/texture/imageeffect_texture.cpp @@ -54,8 +54,8 @@ namespace DigikamTextureImagesPlugin { -ImageEffect_Texture::ImageEffect_Texture(TQWidget* tqparent) - : Digikam::CtrlPanelDlg(tqparent, i18n("Apply Texture"), +ImageEffect_Texture::ImageEffect_Texture(TQWidget* parent) + : Digikam::CtrlPanelDlg(parent, i18n("Apply Texture"), "texture", false, false, true, Digikam::ImagePannelWidget::SeparateViewAll) { diff --git a/digikam/imageplugins/texture/imageeffect_texture.h b/digikam/imageplugins/texture/imageeffect_texture.h index 3edfdbd1..9bb4bc05 100644 --- a/digikam/imageplugins/texture/imageeffect_texture.h +++ b/digikam/imageplugins/texture/imageeffect_texture.h @@ -47,7 +47,7 @@ class ImageEffect_Texture : public Digikam::CtrlPanelDlg public: - ImageEffect_Texture(TQWidget* tqparent); + ImageEffect_Texture(TQWidget* parent); ~ImageEffect_Texture(); private: diff --git a/digikam/imageplugins/texture/imageplugin_texture.cpp b/digikam/imageplugins/texture/imageplugin_texture.cpp index 6dd4357a..9a82b31e 100644 --- a/digikam/imageplugins/texture/imageplugin_texture.cpp +++ b/digikam/imageplugins/texture/imageplugin_texture.cpp @@ -42,8 +42,8 @@ using namespace DigikamTextureImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_texture, KGenericFactory("digikamimageplugin_texture")); -ImagePlugin_Texture::ImagePlugin_Texture(TQObject *tqparent, const char*, const TQStringList &) - : Digikam::ImagePlugin(tqparent, "ImagePlugin_Texture") +ImagePlugin_Texture::ImagePlugin_Texture(TQObject *parent, const char*, const TQStringList &) + : Digikam::ImagePlugin(parent, "ImagePlugin_Texture") { m_textureAction = new KAction(i18n("Apply Texture..."), "texture", 0, this, TQT_SLOT(slotTexture()), diff --git a/digikam/imageplugins/texture/imageplugin_texture.h b/digikam/imageplugins/texture/imageplugin_texture.h index 8bc58e43..fcfcb30e 100644 --- a/digikam/imageplugins/texture/imageplugin_texture.h +++ b/digikam/imageplugins/texture/imageplugin_texture.h @@ -38,7 +38,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_Texture : public Digikam::ImagePlug public: - ImagePlugin_Texture(TQObject *tqparent, const char* name, + ImagePlugin_Texture(TQObject *parent, const char* name, const TQStringList &args); ~ImagePlugin_Texture(); diff --git a/digikam/imageplugins/texture/texture.cpp b/digikam/imageplugins/texture/texture.cpp index 21d27c80..a056c912 100644 --- a/digikam/imageplugins/texture/texture.cpp +++ b/digikam/imageplugins/texture/texture.cpp @@ -36,8 +36,8 @@ namespace DigikamTextureImagesPlugin { -Texture::Texture(Digikam::DImg *orgImage, TQObject *tqparent, int blendGain, TQString texturePath) - : Digikam::DImgThreadedFilter(orgImage, tqparent, "Texture") +Texture::Texture(Digikam::DImg *orgImage, TQObject *parent, int blendGain, TQString texturePath) + : Digikam::DImgThreadedFilter(orgImage, parent, "Texture") { m_blendGain = blendGain; m_texturePath = texturePath; diff --git a/digikam/imageplugins/texture/texture.h b/digikam/imageplugins/texture/texture.h index a71dbaba..1bcda2ff 100644 --- a/digikam/imageplugins/texture/texture.h +++ b/digikam/imageplugins/texture/texture.h @@ -41,7 +41,7 @@ class Texture : public Digikam::DImgThreadedFilter public: - Texture(Digikam::DImg *orgImage, TQObject *tqparent=0, int blendGain=200, + Texture(Digikam::DImg *orgImage, TQObject *parent=0, int blendGain=200, TQString texturePath=TQString()); ~Texture(){}; diff --git a/digikam/imageplugins/texture/texturetool.cpp b/digikam/imageplugins/texture/texturetool.cpp index 6644719e..0548813f 100644 --- a/digikam/imageplugins/texture/texturetool.cpp +++ b/digikam/imageplugins/texture/texturetool.cpp @@ -61,8 +61,8 @@ using namespace Digikam; namespace DigikamTextureImagesPlugin { -TextureTool::TextureTool(TQObject* tqparent) - : EditorToolThreaded(tqparent) +TextureTool::TextureTool(TQObject* parent) + : EditorToolThreaded(parent) { setName("texture"); setToolName(i18n("Texture")); diff --git a/digikam/imageplugins/texture/texturetool.h b/digikam/imageplugins/texture/texturetool.h index 787c39e1..2f212fa1 100644 --- a/digikam/imageplugins/texture/texturetool.h +++ b/digikam/imageplugins/texture/texturetool.h @@ -55,7 +55,7 @@ class TextureTool : public Digikam::EditorToolThreaded public: - TextureTool(TQObject* tqparent); + TextureTool(TQObject* parent); ~TextureTool(); private: diff --git a/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp b/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp index 1c5e2109..31bb084a 100644 --- a/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp +++ b/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp @@ -79,8 +79,8 @@ namespace DigikamWhiteBalanceImagesPlugin { -ImageEffect_WhiteBalance::ImageEffect_WhiteBalance(TQWidget* tqparent) - : Digikam::ImageDlgBase(tqparent, i18n("White Color Balance Correction"), +ImageEffect_WhiteBalance::ImageEffect_WhiteBalance(TQWidget* parent) + : Digikam::ImageDlgBase(parent, i18n("White Color Balance Correction"), "whitebalance", true, false) { TQString whatsThis; diff --git a/digikam/imageplugins/whitebalance/imageeffect_whitebalance.h b/digikam/imageplugins/whitebalance/imageeffect_whitebalance.h index 1e89054f..a793855c 100644 --- a/digikam/imageplugins/whitebalance/imageeffect_whitebalance.h +++ b/digikam/imageplugins/whitebalance/imageeffect_whitebalance.h @@ -61,7 +61,7 @@ class ImageEffect_WhiteBalance : public Digikam::ImageDlgBase public: - ImageEffect_WhiteBalance(TQWidget* tqparent); + ImageEffect_WhiteBalance(TQWidget* parent); ~ImageEffect_WhiteBalance(); protected: diff --git a/digikam/imageplugins/whitebalance/imageplugin_whitebalance.cpp b/digikam/imageplugins/whitebalance/imageplugin_whitebalance.cpp index 16958654..fd77b32c 100644 --- a/digikam/imageplugins/whitebalance/imageplugin_whitebalance.cpp +++ b/digikam/imageplugins/whitebalance/imageplugin_whitebalance.cpp @@ -42,8 +42,8 @@ using namespace DigikamWhiteBalanceImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_whitebalance, KGenericFactory("digikamimageplugin_whitebalance")); -ImagePlugin_WhiteBalance::ImagePlugin_WhiteBalance(TQObject *tqparent, const char*, const TQStringList &) - : Digikam::ImagePlugin(tqparent, "ImagePlugin_WhiteBalance") +ImagePlugin_WhiteBalance::ImagePlugin_WhiteBalance(TQObject *parent, const char*, const TQStringList &) + : Digikam::ImagePlugin(parent, "ImagePlugin_WhiteBalance") { m_whitebalanceAction = new KAction(i18n("White Balance..."), "whitebalance", CTRL+SHIFT+Key_W, diff --git a/digikam/imageplugins/whitebalance/imageplugin_whitebalance.h b/digikam/imageplugins/whitebalance/imageplugin_whitebalance.h index 5959f8e5..ae89c2f0 100644 --- a/digikam/imageplugins/whitebalance/imageplugin_whitebalance.h +++ b/digikam/imageplugins/whitebalance/imageplugin_whitebalance.h @@ -39,7 +39,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_WhiteBalance : public Digikam::Imag public: - ImagePlugin_WhiteBalance(TQObject *tqparent, const char* name, + ImagePlugin_WhiteBalance(TQObject *parent, const char* name, const TQStringList &args); ~ImagePlugin_WhiteBalance(); diff --git a/digikam/imageplugins/whitebalance/whitebalancetool.cpp b/digikam/imageplugins/whitebalance/whitebalancetool.cpp index 8db9a6f1..5f01d8a4 100644 --- a/digikam/imageplugins/whitebalance/whitebalancetool.cpp +++ b/digikam/imageplugins/whitebalance/whitebalancetool.cpp @@ -90,8 +90,8 @@ using namespace Digikam; namespace DigikamWhiteBalanceImagesPlugin { -WhiteBalanceTool::WhiteBalanceTool(TQObject* tqparent) - : EditorTool(tqparent) +WhiteBalanceTool::WhiteBalanceTool(TQObject* parent) + : EditorTool(parent) { setName("whitebalance"); setToolName(i18n("White Balance")); diff --git a/digikam/imageplugins/whitebalance/whitebalancetool.h b/digikam/imageplugins/whitebalance/whitebalancetool.h index 13a84398..a7f934de 100644 --- a/digikam/imageplugins/whitebalance/whitebalancetool.h +++ b/digikam/imageplugins/whitebalance/whitebalancetool.h @@ -67,7 +67,7 @@ class WhiteBalanceTool : public Digikam::EditorTool public: - WhiteBalanceTool(TQObject* tqparent); + WhiteBalanceTool(TQObject* parent); ~WhiteBalanceTool(); private: diff --git a/digikam/kioslave/digikamalbums.cpp b/digikam/kioslave/digikamalbums.cpp index 21024e3a..1aa8cc99 100644 --- a/digikam/kioslave/digikamalbums.cpp +++ b/digikam/kioslave/digikamalbums.cpp @@ -479,7 +479,7 @@ void kio_digikamalbums::put(const KURL& url, int permissions, bool overwrite, bo // build the album list buildAlbumList(); - // get the tqparent album + // get the parent album AlbumInfo album = findAlbum(url.directory()); if (album.id == -1) { @@ -644,7 +644,7 @@ void kio_digikamalbums::copy( const KURL &src, const KURL &dst, int mode, bool o // build the album list buildAlbumList(); - // find the src tqparent album + // find the src parent album AlbumInfo srcAlbum = findAlbum(src.directory()); if (srcAlbum.id == -1) { @@ -653,7 +653,7 @@ void kio_digikamalbums::copy( const KURL &src, const KURL &dst, int mode, bool o return; } - // find the dst tqparent album + // find the dst parent album AlbumInfo dstAlbum = findAlbum(dst.directory()); if (dstAlbum.id == -1) { @@ -1599,7 +1599,7 @@ void kio_digikamalbums::addImage(int albumID, const TQString& filePath) parentTag != tagsList.end(); ++parentTag ) { // check if name is the same, and if ID is identical - // to the tqparent ID we got from the child tag + // to the parent ID we got from the child tag if ( (*parentTag).id == parentID && (*parentTag).name == (*parentTagName) ) { @@ -1655,14 +1655,14 @@ void kio_digikamalbums::addImage(int albumID, const TQString& filePath) { tagID = 0; - // if the tqparent tag did not exist, we need not check if the child exists + // if the parent tag did not exist, we need not check if the child exists if (parentTagExisted) { for (TagInfo::List::iterator tag = tagsList.begin(); tag != tagsList.end(); ++tag ) { // find the tag with tag name according to tagHierarchy, - // and tqparent ID identical to the ID of the tag we found in + // and parent ID identical to the ID of the tag we found in // the previous run. if ((*tag).name == (*tagName) && (*tag).pid == parentTagID) { diff --git a/digikam/kioslave/digikamtags.cpp b/digikam/kioslave/digikamtags.cpp index 34041c41..c2c931ed 100644 --- a/digikam/kioslave/digikamtags.cpp +++ b/digikam/kioslave/digikamtags.cpp @@ -186,7 +186,7 @@ void kio_digikamtagsProtocol::special(const TQByteArray& data) if (recurseTags) { - // Obtain all images with the given tag, or with this tag as a tqparent. + // Obtain all images with the given tag, or with this tag as a parent. m_db.execSql( TQString( "SELECT DISTINCT Images.id, Images.name, Images.dirid, \n " " Images.datetime, Albums.url \n " " FROM Images, Albums \n " diff --git a/digikam/libs/dialogs/ctrlpaneldlg.cpp b/digikam/libs/dialogs/ctrlpaneldlg.cpp index 54527866..84cd84fd 100644 --- a/digikam/libs/dialogs/ctrlpaneldlg.cpp +++ b/digikam/libs/dialogs/ctrlpaneldlg.cpp @@ -69,7 +69,7 @@ public: CtrlPanelDlgPriv() { - tqparent = 0; + parent = 0; timer = 0; aboutData = 0; progressBar = true; @@ -82,7 +82,7 @@ public: int currentRenderingMode; - TQWidget *tqparent; + TQWidget *parent; TQTimer *timer; @@ -91,12 +91,12 @@ public: KAboutData *aboutData; }; -CtrlPanelDlg::CtrlPanelDlg(TQWidget* tqparent, TQString title, TQString name, +CtrlPanelDlg::CtrlPanelDlg(TQWidget* parent, TQString title, TQString name, bool loadFileSettings, bool tryAction, bool progressBar, int separateViewMode, TQFrame* bannerFrame) : KDialogBase(Plain, 0, Help|Default|User1|User2|User3|Try|Ok|Cancel, Ok, - tqparent, 0, true, true, + parent, 0, true, true, i18n("&Abort"), i18n("&Save As..."), i18n("&Load...")) @@ -105,7 +105,7 @@ CtrlPanelDlg::CtrlPanelDlg(TQWidget* tqparent, TQString title, TQString name, setCaption(DImgInterface::defaultInterface()->getImageFileName() + TQString(" - ") + title); d = new CtrlPanelDlgPriv; - d->tqparent = tqparent; + d->parent = parent; d->name = name; d->tryAction = tryAction; d->progressBar = progressBar; diff --git a/digikam/libs/dialogs/ctrlpaneldlg.h b/digikam/libs/dialogs/ctrlpaneldlg.h index d696b89b..bb197d93 100644 --- a/digikam/libs/dialogs/ctrlpaneldlg.h +++ b/digikam/libs/dialogs/ctrlpaneldlg.h @@ -53,7 +53,7 @@ class DIGIKAM_EXPORT CtrlPanelDlg : public KDialogBase public: - CtrlPanelDlg(TQWidget* tqparent, TQString title, TQString name, + CtrlPanelDlg(TQWidget* parent, TQString title, TQString name, bool loadFileSettings=false, bool tryAction=false, bool progressBar=true, int separateViewMode=ImagePannelWidget::SeparateViewAll, TQFrame* bannerFrame=0); diff --git a/digikam/libs/dialogs/deletedialog.cpp b/digikam/libs/dialogs/deletedialog.cpp index 63409942..9816e4fe 100644 --- a/digikam/libs/dialogs/deletedialog.cpp +++ b/digikam/libs/dialogs/deletedialog.cpp @@ -58,8 +58,8 @@ namespace Digikam // DeleteWidget implementation ////////////////////////////////////////////////////////////////////////////// -DeleteWidget::DeleteWidget(TQWidget *tqparent, const char *name) - : DeleteDialogBase(tqparent, name), +DeleteWidget::DeleteWidget(TQWidget *parent, const char *name) + : DeleteDialogBase(parent, name), m_listMode(DeleteDialogMode::Files), m_deleteMode(DeleteDialogMode::UseTrash) { @@ -179,8 +179,8 @@ void DeleteWidget::updateText() // DeleteDialog implementation ////////////////////////////////////////////////////////////////////////////// -DeleteDialog::DeleteDialog(TQWidget *tqparent, const char *name) - : KDialogBase(Swallow, WStyle_DialogBorder, tqparent, name, +DeleteDialog::DeleteDialog(TQWidget *parent, const char *name) + : KDialogBase(Swallow, WStyle_DialogBorder, parent, name, true, // modal i18n("About to delete selected files"), // caption Ok | Cancel, // available buttons diff --git a/digikam/libs/dialogs/deletedialog.h b/digikam/libs/dialogs/deletedialog.h index 01b84f70..622dd01a 100644 --- a/digikam/libs/dialogs/deletedialog.h +++ b/digikam/libs/dialogs/deletedialog.h @@ -75,7 +75,7 @@ class DeleteWidget : public DeleteDialogBase public: - DeleteWidget(TQWidget *tqparent = 0, const char *name = 0); + DeleteWidget(TQWidget *parent = 0, const char *name = 0); void setFiles(const KURL::List &files); void setListMode(DeleteDialogMode::ListMode mode); @@ -108,7 +108,7 @@ public: public: - DeleteDialog(TQWidget *tqparent, const char *name = "delete_dialog"); + DeleteDialog(TQWidget *parent, const char *name = "delete_dialog"); bool confirmDeleteList(const KURL::List &condemnedURLs, DeleteDialogMode::ListMode listMode, diff --git a/digikam/libs/dialogs/dprogressdlg.cpp b/digikam/libs/dialogs/dprogressdlg.cpp index 0fddc636..de2e633f 100644 --- a/digikam/libs/dialogs/dprogressdlg.cpp +++ b/digikam/libs/dialogs/dprogressdlg.cpp @@ -76,8 +76,8 @@ public: KProgress *progress; }; -DProgressDlg::DProgressDlg(TQWidget *tqparent, const TQString &caption) - : KDialogBase(tqparent, 0, true, caption, Cancel) +DProgressDlg::DProgressDlg(TQWidget *parent, const TQString &caption) + : KDialogBase(parent, 0, true, caption, Cancel) { d = new DProgressDlgPriv; diff --git a/digikam/libs/dialogs/dprogressdlg.h b/digikam/libs/dialogs/dprogressdlg.h index 3aa090db..c98cb4f2 100644 --- a/digikam/libs/dialogs/dprogressdlg.h +++ b/digikam/libs/dialogs/dprogressdlg.h @@ -46,7 +46,7 @@ Q_OBJECT public: - DProgressDlg(TQWidget *tqparent=0, const TQString &caption=TQString()); + DProgressDlg(TQWidget *parent=0, const TQString &caption=TQString()); ~DProgressDlg(); void setButtonText(const TQString &text); diff --git a/digikam/libs/dialogs/iccprofileinfodlg.cpp b/digikam/libs/dialogs/iccprofileinfodlg.cpp index 14ab6df6..1c174902 100644 --- a/digikam/libs/dialogs/iccprofileinfodlg.cpp +++ b/digikam/libs/dialogs/iccprofileinfodlg.cpp @@ -34,9 +34,9 @@ namespace Digikam { -ICCProfileInfoDlg::ICCProfileInfoDlg(TQWidget* tqparent, const TQString& profilePath, +ICCProfileInfoDlg::ICCProfileInfoDlg(TQWidget* parent, const TQString& profilePath, const TQByteArray& profileData) - : KDialogBase(tqparent, 0, true, i18n("Color Profile Info"), + : KDialogBase(parent, 0, true, i18n("Color Profile Info"), Help|Ok, Ok, true) { setHelp("iccprofile.anchor", "digikam"); diff --git a/digikam/libs/dialogs/iccprofileinfodlg.h b/digikam/libs/dialogs/iccprofileinfodlg.h index 6ee8e8f9..abcc1ed8 100644 --- a/digikam/libs/dialogs/iccprofileinfodlg.h +++ b/digikam/libs/dialogs/iccprofileinfodlg.h @@ -48,7 +48,7 @@ class DIGIKAM_EXPORT ICCProfileInfoDlg : public KDialogBase public: - ICCProfileInfoDlg(TQWidget *tqparent, const TQString& profilePath, const TQByteArray& profileData=TQByteArray()); + ICCProfileInfoDlg(TQWidget *parent, const TQString& profilePath, const TQByteArray& profileData=TQByteArray()); ~ICCProfileInfoDlg(); }; diff --git a/digikam/libs/dialogs/imagedialog.cpp b/digikam/libs/dialogs/imagedialog.cpp index 2c41d659..3754f7ae 100644 --- a/digikam/libs/dialogs/imagedialog.cpp +++ b/digikam/libs/dialogs/imagedialog.cpp @@ -83,8 +83,8 @@ public: TQGuardedPtr thumbJob; }; -ImageDialogPreview::ImageDialogPreview(TQWidget *tqparent) - : KPreviewWidgetBase(tqparent) +ImageDialogPreview::ImageDialogPreview(TQWidget *parent) + : KPreviewWidgetBase(parent) { d = new ImageDialogPreviewPrivate; @@ -261,7 +261,7 @@ public: KURL::List urls; }; -ImageDialog::ImageDialog(TQWidget* tqparent, const KURL &url, bool singleSelect, const TQString& caption) +ImageDialog::ImageDialog(TQWidget* parent, const KURL &url, bool singleSelect, const TQString& caption) { d = new ImageDialogPrivate; d->singleSelect = singleSelect; @@ -297,7 +297,7 @@ ImageDialog::ImageDialog(TQWidget* tqparent, const KURL &url, bool singleSelect, DDebug() << "fileformats=" << d->fileformats << endl; - KFileDialog dlg(url.path(), d->fileformats, tqparent, "imageFileOpenDialog", false); + KFileDialog dlg(url.path(), d->fileformats, parent, "imageFileOpenDialog", false); ImageDialogPreview *preview = new ImageDialogPreview(&dlg); dlg.setPreviewWidget(preview); dlg.setOperationMode(KFileDialog::Opening); @@ -345,18 +345,18 @@ KURL::List ImageDialog::urls() const return d->urls; } -KURL::List ImageDialog::getImageURLs(TQWidget* tqparent, const KURL& url, const TQString& caption) +KURL::List ImageDialog::getImageURLs(TQWidget* parent, const KURL& url, const TQString& caption) { - ImageDialog dlg(tqparent, url, false, caption); + ImageDialog dlg(parent, url, false, caption); if (!dlg.urls().isEmpty()) return dlg.urls(); else return KURL::List(); } -KURL ImageDialog::getImageURL(TQWidget* tqparent, const KURL& url, const TQString& caption) +KURL ImageDialog::getImageURL(TQWidget* parent, const KURL& url, const TQString& caption) { - ImageDialog dlg(tqparent, url, true, caption); + ImageDialog dlg(parent, url, true, caption); if (dlg.url() != KURL()) return dlg.url(); else diff --git a/digikam/libs/dialogs/imagedialog.h b/digikam/libs/dialogs/imagedialog.h index c213f5dc..23d85d56 100644 --- a/digikam/libs/dialogs/imagedialog.h +++ b/digikam/libs/dialogs/imagedialog.h @@ -46,7 +46,7 @@ class DIGIKAM_EXPORT ImageDialogPreview : public KPreviewWidgetBase public: - ImageDialogPreview(TQWidget *tqparent=0); + ImageDialogPreview(TQWidget *parent=0); ~ImageDialogPreview(); TQSize tqsizeHint() const; @@ -78,7 +78,7 @@ class DIGIKAM_EXPORT ImageDialog public: - ImageDialog(TQWidget* tqparent, const KURL &url, bool singleSelect=false, const TQString& caption=TQString()); + ImageDialog(TQWidget* parent, const KURL &url, bool singleSelect=false, const TQString& caption=TQString()); ~ImageDialog(); KURL url() const; @@ -87,8 +87,8 @@ public: bool singleSelect() const; TQString fileformats() const; - static KURL::List getImageURLs(TQWidget* tqparent, const KURL& url, const TQString& caption=TQString()); - static KURL getImageURL(TQWidget* tqparent, const KURL& url, const TQString& caption=TQString()); + static KURL::List getImageURLs(TQWidget* parent, const KURL& url, const TQString& caption=TQString()); + static KURL getImageURL(TQWidget* parent, const KURL& url, const TQString& caption=TQString()); private: diff --git a/digikam/libs/dialogs/imagedlgbase.cpp b/digikam/libs/dialogs/imagedlgbase.cpp index f9a33c19..7f1ba5d5 100644 --- a/digikam/libs/dialogs/imagedlgbase.cpp +++ b/digikam/libs/dialogs/imagedlgbase.cpp @@ -69,7 +69,7 @@ public: { aboutData = 0; timer = 0; - tqparent = 0; + parent = 0; mainLayout = 0; hbox = 0; settingsSideBar = 0; @@ -80,7 +80,7 @@ public: TQGridLayout *mainLayout; - TQWidget *tqparent; + TQWidget *parent; TQString name; @@ -95,10 +95,10 @@ public: Sidebar *settingsSideBar; }; -ImageDlgBase::ImageDlgBase(TQWidget* tqparent, TQString title, TQString name, +ImageDlgBase::ImageDlgBase(TQWidget* parent, TQString title, TQString name, bool loadFileSettings, bool tryAction, TQFrame* bannerFrame) : KDialogBase(Plain, 0, Help|Default|User1|User2|User3|Try|Ok|Cancel, Ok, - tqparent, 0, true, true, + parent, 0, true, true, TQString(), i18n("&Save As..."), i18n("&Load...")) @@ -108,7 +108,7 @@ ImageDlgBase::ImageDlgBase(TQWidget* tqparent, TQString title, TQString name, showButton(User1, false); d = new ImageDlgBasePriv; - d->tqparent = tqparent; + d->parent = parent; d->name = name; d->tryAction = tryAction; diff --git a/digikam/libs/dialogs/imagedlgbase.h b/digikam/libs/dialogs/imagedlgbase.h index 0c49d449..5c4d871a 100644 --- a/digikam/libs/dialogs/imagedlgbase.h +++ b/digikam/libs/dialogs/imagedlgbase.h @@ -55,7 +55,7 @@ class DIGIKAM_EXPORT ImageDlgBase : public KDialogBase public: - ImageDlgBase(TQWidget *tqparent, TQString title, TQString name, + ImageDlgBase(TQWidget *parent, TQString title, TQString name, bool loadFileSettings=true, bool tryAction=false, TQFrame* bannerFrame=0); ~ImageDlgBase(); diff --git a/digikam/libs/dialogs/imageguidedlg.cpp b/digikam/libs/dialogs/imageguidedlg.cpp index c4a09c69..5cd94b65 100644 --- a/digikam/libs/dialogs/imageguidedlg.cpp +++ b/digikam/libs/dialogs/imageguidedlg.cpp @@ -80,7 +80,7 @@ public: tryAction = false; progress = true; currentRenderingMode = NoneRendering; - tqparent = 0; + parent = 0; settings = 0; timer = 0; aboutData = 0; @@ -99,7 +99,7 @@ public: int currentRenderingMode; - TQWidget *tqparent; + TQWidget *parent; TQWidget *settings; TQTimer *timer; @@ -124,14 +124,14 @@ public: Sidebar *settingsSideBar; }; -ImageGuideDlg::ImageGuideDlg(TQWidget* tqparent, TQString title, TQString name, +ImageGuideDlg::ImageGuideDlg(TQWidget* parent, TQString title, TQString name, bool loadFileSettings, bool progress, bool guideVisible, int guideMode, TQFrame* bannerFrame, bool prevModeOptions, bool useImageSelection, bool tryAction) : KDialogBase(Plain, 0, Help|Default|User1|User2|User3|Try|Ok|Cancel, Ok, - tqparent, 0, true, true, + parent, 0, true, true, i18n("&Abort"), i18n("&Save As..."), i18n("&Load...")) @@ -140,7 +140,7 @@ ImageGuideDlg::ImageGuideDlg(TQWidget* tqparent, TQString title, TQString name, setCaption(DImgInterface::defaultInterface()->getImageFileName() + TQString(" - ") + title); d = new ImageGuideDlgPriv; - d->tqparent = tqparent; + d->parent = parent; d->name = name; d->progress = progress; d->tryAction = tryAction; diff --git a/digikam/libs/dialogs/imageguidedlg.h b/digikam/libs/dialogs/imageguidedlg.h index 1a19fd23..9047389c 100644 --- a/digikam/libs/dialogs/imageguidedlg.h +++ b/digikam/libs/dialogs/imageguidedlg.h @@ -56,7 +56,7 @@ class DIGIKAM_EXPORT ImageGuideDlg : public KDialogBase public: - ImageGuideDlg(TQWidget* tqparent, TQString title, TQString name, + ImageGuideDlg(TQWidget* parent, TQString title, TQString name, bool loadFileSettings=false, bool progress=true, bool guideVisible=true, int guideMode=ImageGuideWidget::HVGuideMode, diff --git a/digikam/libs/dialogs/rawcameradlg.cpp b/digikam/libs/dialogs/rawcameradlg.cpp index d32c2e7f..705b2701 100644 --- a/digikam/libs/dialogs/rawcameradlg.cpp +++ b/digikam/libs/dialogs/rawcameradlg.cpp @@ -70,8 +70,8 @@ public: SearchTextBar *searchBar; }; -RawCameraDlg::RawCameraDlg(TQWidget *tqparent) - : KDialogBase(tqparent, 0, true, TQString(), Help|Ok, Ok, true) +RawCameraDlg::RawCameraDlg(TQWidget *parent) + : KDialogBase(parent, 0, true, TQString(), Help|Ok, Ok, true) { setHelp("digitalstillcamera.anchor", "digikam"); setCaption(i18n("List of supported RAW cameras")); diff --git a/digikam/libs/dialogs/rawcameradlg.h b/digikam/libs/dialogs/rawcameradlg.h index a205f2a8..4b53b7de 100644 --- a/digikam/libs/dialogs/rawcameradlg.h +++ b/digikam/libs/dialogs/rawcameradlg.h @@ -44,7 +44,7 @@ class DIGIKAM_EXPORT RawCameraDlg : public KDialogBase public: - RawCameraDlg(TQWidget* tqparent); + RawCameraDlg(TQWidget* parent); ~RawCameraDlg(); private slots: diff --git a/digikam/libs/dimg/dimg.h b/digikam/libs/dimg/dimg.h index e0e59527..48973e47 100644 --- a/digikam/libs/dimg/dimg.h +++ b/digikam/libs/dimg/dimg.h @@ -300,7 +300,7 @@ public: TQPixmap convertToPixmap(); TQPixmap convertToPixmap(IccTransform* monitorICCtrans); - /** Return a tqmask image where pure white and pure black pixels are over-colored. + /** Return a mask image where pure white and pure black pixels are over-colored. This way is used to identify over and under exposed pixels. */ TQImage pureColorMask(ExposureSettingsContainer *expoSettings); diff --git a/digikam/libs/dimg/filters/dimggaussianblur.cpp b/digikam/libs/dimg/filters/dimggaussianblur.cpp index cec6501b..2d333cf7 100644 --- a/digikam/libs/dimg/filters/dimggaussianblur.cpp +++ b/digikam/libs/dimg/filters/dimggaussianblur.cpp @@ -38,8 +38,8 @@ namespace Digikam { -DImgGaussianBlur::DImgGaussianBlur(DImg *orgImage, TQObject *tqparent, int radius) - : DImgThreadedFilter(orgImage, tqparent, "GaussianBlur") +DImgGaussianBlur::DImgGaussianBlur(DImg *orgImage, TQObject *parent, int radius) + : DImgThreadedFilter(orgImage, parent, "GaussianBlur") { m_radius = radius; initFilter(); diff --git a/digikam/libs/dimg/filters/dimggaussianblur.h b/digikam/libs/dimg/filters/dimggaussianblur.h index 299a8aad..e88944bc 100644 --- a/digikam/libs/dimg/filters/dimggaussianblur.h +++ b/digikam/libs/dimg/filters/dimggaussianblur.h @@ -40,7 +40,7 @@ class DIGIKAM_EXPORT DImgGaussianBlur : public DImgThreadedFilter public: - DImgGaussianBlur(DImg *orgImage, TQObject *tqparent=0, int radius=3); + DImgGaussianBlur(DImg *orgImage, TQObject *parent=0, int radius=3); // Constructor for slave mode: execute immediately in current thread with specified master filter DImgGaussianBlur(DImgThreadedFilter *parentFilter, const DImg &orgImage, const DImg &destImage, diff --git a/digikam/libs/dimg/filters/dimgimagefilters.cpp b/digikam/libs/dimg/filters/dimgimagefilters.cpp index 523e62c1..ed417045 100644 --- a/digikam/libs/dimg/filters/dimgimagefilters.cpp +++ b/digikam/libs/dimg/filters/dimgimagefilters.cpp @@ -785,7 +785,7 @@ void DImgImageFilters::channelMixerImage(uchar *data, int Width, int Height, boo } } -/** Change color tonality of an image to appling a RGB color tqmask.*/ +/** Change color tonality of an image to appling a RGB color mask.*/ void DImgImageFilters::changeTonality(uchar *data, int width, int height, bool sixteenBit, int redMask, int greenMask, int blueMask) { @@ -798,8 +798,8 @@ void DImgImageFilters::changeTonality(uchar *data, int width, int height, bool s int hue, sat, lig; - DColor tqmask(redMask, greenMask, blueMask, 0, sixteenBit); - tqmask.getHSL(&hue, &sat, &lig); + DColor mask(redMask, greenMask, blueMask, 0, sixteenBit); + mask.getHSL(&hue, &sat, &lig); if (!sixteenBit) // 8 bits image. { @@ -807,15 +807,15 @@ void DImgImageFilters::changeTonality(uchar *data, int width, int height, bool s for (int i = 0 ; i < width*height ; i++) { - // Convert to grayscale using tonal tqmask + // Convert to grayscale using tonal mask lig = ROUND (0.3 * ptr[2] + 0.59 * ptr[1] + 0.11 * ptr[0]); - tqmask.setRGB(hue, sat, lig, sixteenBit); + mask.setRGB(hue, sat, lig, sixteenBit); - ptr[0] = (uchar)tqmask.blue(); - ptr[1] = (uchar)tqmask.green(); - ptr[2] = (uchar)tqmask.red(); + ptr[0] = (uchar)mask.blue(); + ptr[1] = (uchar)mask.green(); + ptr[2] = (uchar)mask.red(); ptr += 4; } } @@ -825,15 +825,15 @@ void DImgImageFilters::changeTonality(uchar *data, int width, int height, bool s for (int i = 0 ; i < width*height ; i++) { - // Convert to grayscale using tonal tqmask + // Convert to grayscale using tonal mask lig = ROUND (0.3 * ptr[2] + 0.59 * ptr[1] + 0.11 * ptr[0]); - tqmask.setRGB(hue, sat, lig, sixteenBit); + mask.setRGB(hue, sat, lig, sixteenBit); - ptr[0] = (unsigned short)tqmask.blue(); - ptr[1] = (unsigned short)tqmask.green(); - ptr[2] = (unsigned short)tqmask.red(); + ptr[0] = (unsigned short)mask.blue(); + ptr[1] = (unsigned short)mask.green(); + ptr[2] = (unsigned short)mask.red(); ptr += 4; } } diff --git a/digikam/libs/dimg/filters/dimgsharpen.cpp b/digikam/libs/dimg/filters/dimgsharpen.cpp index 69c89de8..23d66317 100644 --- a/digikam/libs/dimg/filters/dimgsharpen.cpp +++ b/digikam/libs/dimg/filters/dimgsharpen.cpp @@ -41,8 +41,8 @@ namespace Digikam { -DImgSharpen::DImgSharpen(DImg *orgImage, TQObject *tqparent, double radius, double sigma) - : DImgThreadedFilter(orgImage, tqparent, "Sharpen") +DImgSharpen::DImgSharpen(DImg *orgImage, TQObject *parent, double radius, double sigma) + : DImgThreadedFilter(orgImage, parent, "Sharpen") { m_radius = radius; m_sigma = sigma; diff --git a/digikam/libs/dimg/filters/dimgsharpen.h b/digikam/libs/dimg/filters/dimgsharpen.h index d8a56f71..5802769a 100644 --- a/digikam/libs/dimg/filters/dimgsharpen.h +++ b/digikam/libs/dimg/filters/dimgsharpen.h @@ -40,7 +40,7 @@ class DIGIKAM_EXPORT DImgSharpen : public DImgThreadedFilter public: - DImgSharpen(DImg *orgImage, TQObject *tqparent=0, double radius=0.0, double sigma=1.0); + DImgSharpen(DImg *orgImage, TQObject *parent=0, double radius=0.0, double sigma=1.0); // Constructor for slave mode: execute immediately in current thread with specified master filter DImgSharpen(DImgThreadedFilter *parentFilter, const DImg &orgImage, const DImg &destImage, diff --git a/digikam/libs/dimg/filters/dimgthreadedfilter.cpp b/digikam/libs/dimg/filters/dimgthreadedfilter.cpp index 15086bdf..205405e8 100644 --- a/digikam/libs/dimg/filters/dimgthreadedfilter.cpp +++ b/digikam/libs/dimg/filters/dimgthreadedfilter.cpp @@ -35,13 +35,13 @@ namespace Digikam { -DImgThreadedFilter::DImgThreadedFilter(DImg *orgImage, TQObject *tqparent, +DImgThreadedFilter::DImgThreadedFilter(DImg *orgImage, TQObject *parent, const TQString& name) : TQThread() { // remove meta data m_orgImage = orgImage->copyImageData(); - m_parent = tqparent; + m_parent = parent; m_cancel = false; // See B.K.O #133026: make a deep copy of Qstring to prevent crash @@ -93,11 +93,11 @@ void DImgThreadedFilter::initFilter(void) if (m_parent) start(); // m_parent is valide, start thread ==> run() else - startComputation(); // no tqparent : no using thread. + startComputation(); // no parent : no using thread. } else // No image data { - if (m_parent) // If tqparent then send event about a problem. + if (m_parent) // If parent then send event about a problem. { postProgress(0, false, false); DDebug() << m_name << "::No valid image data !!! ..." << endl; diff --git a/digikam/libs/dimg/filters/dimgthreadedfilter.h b/digikam/libs/dimg/filters/dimgthreadedfilter.h index 30e27ce9..482240e4 100644 --- a/digikam/libs/dimg/filters/dimgthreadedfilter.h +++ b/digikam/libs/dimg/filters/dimgthreadedfilter.h @@ -48,7 +48,7 @@ class DIGIKAM_EXPORT DImgThreadedFilter : public TQThread public: -/** Class used to post status of computation to tqparent. */ +/** Class used to post status of computation to parent. */ class EventData { public: @@ -66,7 +66,7 @@ class EventData public: - DImgThreadedFilter(DImg *orgImage, TQObject *tqparent=0, + DImgThreadedFilter(DImg *orgImage, TQObject *parent=0, const TQString& name=TQString()); ~DImgThreadedFilter(); @@ -92,8 +92,8 @@ protected: /** Clean up filter data if necessary. Call by stopComputation() method. */ virtual void cleanupFilter(void){}; - /** Post Event to tqparent about progress. Warning: you need to delete - 'EventData' instance to 'customEvent' tqparent implementation. */ + /** Post Event to parent about progress. Warning: you need to delete + 'EventData' instance to 'customEvent' parent implementation. */ void postProgress(int progress=0, bool starting=true, bool success=false); protected: @@ -106,7 +106,7 @@ protected: The filter will be executed in the current thread. orgImage and destImage will not be copied. progressBegin and progressEnd can indicate the progress span - that the slave filter uses in the tqparent filter's progress. + that the slave filter uses in the parent filter's progress. Any derived filter class that is publicly available to other filters should implement an additional constructor using this constructor. */ @@ -125,11 +125,11 @@ protected: /** Used to stop compution loop. */ bool m_cancel; - /** The progress span that a slave filter uses in the tqparent filter's progress. */ + /** The progress span that a slave filter uses in the parent filter's progress. */ int m_progressBegin; int m_progressSpan; - /** To post event from thread to tqparent. */ + /** To post event from thread to parent. */ TQObject *m_parent; /** Filter name.*/ diff --git a/digikam/libs/dimg/loaders/jp2ksettings.cpp b/digikam/libs/dimg/loaders/jp2ksettings.cpp index d15fe31e..32a2ca20 100644 --- a/digikam/libs/dimg/loaders/jp2ksettings.cpp +++ b/digikam/libs/dimg/loaders/jp2ksettings.cpp @@ -65,8 +65,8 @@ public: KIntNumInput *JPEG2000compression; }; -JP2KSettings::JP2KSettings(TQWidget *tqparent) - : TQWidget(tqparent, 0, TQt::WDestructiveClose) +JP2KSettings::JP2KSettings(TQWidget *parent) + : TQWidget(parent, 0, TQt::WDestructiveClose) { d = new JP2KSettingsPriv; diff --git a/digikam/libs/dimg/loaders/jp2ksettings.h b/digikam/libs/dimg/loaders/jp2ksettings.h index 365afa30..66c4230d 100644 --- a/digikam/libs/dimg/loaders/jp2ksettings.h +++ b/digikam/libs/dimg/loaders/jp2ksettings.h @@ -44,7 +44,7 @@ Q_OBJECT public: - JP2KSettings(TQWidget *tqparent=0); + JP2KSettings(TQWidget *parent=0); ~JP2KSettings(); void setCompressionValue(int val); diff --git a/digikam/libs/dimg/loaders/jpegsettings.cpp b/digikam/libs/dimg/loaders/jpegsettings.cpp index 86347a0d..3b15dfab 100644 --- a/digikam/libs/dimg/loaders/jpegsettings.cpp +++ b/digikam/libs/dimg/loaders/jpegsettings.cpp @@ -71,8 +71,8 @@ public: KIntNumInput *JPEGcompression; }; -JPEGSettings::JPEGSettings(TQWidget *tqparent) - : TQWidget(tqparent, 0, TQt::WDestructiveClose) +JPEGSettings::JPEGSettings(TQWidget *parent) + : TQWidget(parent, 0, TQt::WDestructiveClose) { d = new JPEGSettingsPriv; diff --git a/digikam/libs/dimg/loaders/jpegsettings.h b/digikam/libs/dimg/loaders/jpegsettings.h index d5c1a2b2..d8d2150b 100644 --- a/digikam/libs/dimg/loaders/jpegsettings.h +++ b/digikam/libs/dimg/loaders/jpegsettings.h @@ -44,7 +44,7 @@ Q_OBJECT public: - JPEGSettings(TQWidget *tqparent=0); + JPEGSettings(TQWidget *parent=0); ~JPEGSettings(); void setCompressionValue(int val); diff --git a/digikam/libs/dimg/loaders/pngsettings.cpp b/digikam/libs/dimg/loaders/pngsettings.cpp index fcfcc81e..e140d46b 100644 --- a/digikam/libs/dimg/loaders/pngsettings.cpp +++ b/digikam/libs/dimg/loaders/pngsettings.cpp @@ -61,8 +61,8 @@ public: KIntNumInput *PNGcompression; }; -PNGSettings::PNGSettings(TQWidget *tqparent) - : TQWidget(tqparent, 0, TQt::WDestructiveClose) +PNGSettings::PNGSettings(TQWidget *parent) + : TQWidget(parent, 0, TQt::WDestructiveClose) { d = new PNGSettingsPriv; diff --git a/digikam/libs/dimg/loaders/pngsettings.h b/digikam/libs/dimg/loaders/pngsettings.h index ab61c525..f01bbec9 100644 --- a/digikam/libs/dimg/loaders/pngsettings.h +++ b/digikam/libs/dimg/loaders/pngsettings.h @@ -44,7 +44,7 @@ Q_OBJECT public: - PNGSettings(TQWidget *tqparent=0); + PNGSettings(TQWidget *parent=0); ~PNGSettings(); void setCompressionValue(int val); diff --git a/digikam/libs/dimg/loaders/tiffsettings.cpp b/digikam/libs/dimg/loaders/tiffsettings.cpp index 027b9af7..96d6d6ad 100644 --- a/digikam/libs/dimg/loaders/tiffsettings.cpp +++ b/digikam/libs/dimg/loaders/tiffsettings.cpp @@ -58,8 +58,8 @@ public: TQCheckBox *TIFFcompression; }; -TIFFSettings::TIFFSettings(TQWidget *tqparent) - : TQWidget(tqparent, 0, TQt::WDestructiveClose) +TIFFSettings::TIFFSettings(TQWidget *parent) + : TQWidget(parent, 0, TQt::WDestructiveClose) { d = new TIFFSettingsPriv; diff --git a/digikam/libs/dimg/loaders/tiffsettings.h b/digikam/libs/dimg/loaders/tiffsettings.h index 7ee2b934..524ef682 100644 --- a/digikam/libs/dimg/loaders/tiffsettings.h +++ b/digikam/libs/dimg/loaders/tiffsettings.h @@ -44,7 +44,7 @@ Q_OBJECT public: - TIFFSettings(TQWidget *tqparent=0); + TIFFSettings(TQWidget *parent=0); ~TIFFSettings(); void setCompression(bool b); diff --git a/digikam/libs/greycstoration/CImg.h b/digikam/libs/greycstoration/CImg.h index 7bbf3f97..008f22aa 100644 --- a/digikam/libs/greycstoration/CImg.h +++ b/digikam/libs/greycstoration/CImg.h @@ -2000,7 +2000,7 @@ namespace cimg_library { - \b CImgDisplayException : Thrown when an error occured when trying to display an image in a window. This exception is thrown when image display request cannot be satisfied. - The tqparent class CImgException may be thrown itself when errors that cannot be classified in one of + The parent class CImgException may be thrown itself when errors that cannot be classified in one of the above type occur. It is recommended not to throw CImgExceptions yourself, since there are normally reserved to %CImg Library functions. \b CImgInstanceException, \b CImgArgumentException, \b CImgIOException and \b CImgDisplayException are simple @@ -7624,7 +7624,7 @@ namespace cimg_library { vtemplate.visualid = XVisualIDFromVisual(visual); int nb_visuals; XVisualInfo *vinfo = XGetVisualInfo(cimg::X11attr().display,VisualIDMask,&vtemplate,&nb_visuals); - if (vinfo && vinfo->red_tqmaskblue_tqmask) cimg::X11attr().blue_first = true; + if (vinfo && vinfo->red_maskblue_mask) cimg::X11attr().blue_first = true; cimg::X11attr().byte_order = ImageByteOrder(cimg::X11attr().display); XFree(vinfo); XLockDisplay(cimg::X11attr().display); @@ -14096,16 +14096,16 @@ namespace cimg_library { CImg get_resize_halfXY() const { if (is_empty()) return *this; - const Tfloat tqmask[9] = { 0.07842776544f, 0.1231940459f, 0.07842776544f, + const Tfloat mask[9] = { 0.07842776544f, 0.1231940459f, 0.07842776544f, 0.1231940459f, 0.1935127547f, 0.1231940459f, 0.07842776544f, 0.1231940459f, 0.07842776544f }; T I[9] = { 0 }; CImg dest(width/2,height/2,depth,dim); cimg_forZV(*this,z,k) cimg_for3x3(*this,x,y,z,k,I) if (x%2 && y%2) dest(x/2,y/2,z,k) = (T) - (I[0]*tqmask[0] + I[1]*tqmask[1] + I[2]*tqmask[2] + - I[3]*tqmask[3] + I[4]*tqmask[4] + I[5]*tqmask[5] + - I[6]*tqmask[6] + I[7]*tqmask[7] + I[8]*tqmask[8]); + (I[0]*mask[0] + I[1]*mask[1] + I[2]*mask[2] + + I[3]*mask[3] + I[4]*mask[4] + I[5]*mask[5] + + I[6]*mask[6] + I[7]*mask[7] + I[8]*mask[8]); return dest; } @@ -15813,7 +15813,7 @@ namespace cimg_library { grad[1](x,y,z,k) = (Tfloat)Icn - Icc; } } break; - case 2 : { // using Sobel tqmask + case 2 : { // using Sobel mask CImg_3x3(I,T); const Tfloat a = 1, b = 2; cimg_forZV(*this,z,k) cimg_for3x3(*this,x,y,z,k,I) { @@ -15821,7 +15821,7 @@ namespace cimg_library { grad[1](x,y,z,k) = -a*Ipp - b*Icp - a*Inp + a*Ipn + b*Icn + a*Inn; } } break; - case 3 : { // using rotation invariant tqmask + case 3 : { // using rotation invariant mask CImg_3x3(I,T); const Tfloat a = (Tfloat)(0.25f*(2-cimg_std::sqrt(2.0f))), b = (Tfloat)(0.5f*(cimg_std::sqrt(2.0f)-1)); cimg_forZV(*this,z,k) cimg_for3x3(*this,x,y,z,k,I) { @@ -19669,34 +19669,34 @@ namespace cimg_library { //! Draw a sprite image in the instance image (masked version). /** \param sprite Sprite image. - \param tqmask Mask image. + \param mask Mask image. \param x0 X-coordinate of the sprite position in the instance image. \param y0 Y-coordinate of the sprite position in the instance image. \param z0 Z-coordinate of the sprite position in the instance image. \param v0 V-coordinate of the sprite position in the instance image. - \param mask_valmax Maximum pixel value of the tqmask image \c tqmask (optional). + \param mask_valmax Maximum pixel value of the mask image \c mask (optional). \param opacity Drawing opacity. \note - - Pixel values of \c tqmask set the opacity of the corresponding pixels in \c sprite. + - Pixel values of \c mask set the opacity of the corresponding pixels in \c sprite. - Clipping is supported. - - Dimensions along x,y and z of \p sprite and \p tqmask must be the same. + - Dimensions along x,y and z of \p sprite and \p mask must be the same. **/ template CImg& draw_image(const int x0, const int y0, const int z0, const int v0, - const CImg& sprite, const CImg& tqmask, const float opacity=1, + const CImg& sprite, const CImg& mask, const float opacity=1, const float mask_valmax=1) { if (is_empty()) return *this; if (!sprite) throw CImgArgumentException("CImg<%s>::draw_image() : Specified sprite image (%u,%u,%u,%u,%p) is empty.", pixel_type(),sprite.width,sprite.height,sprite.depth,sprite.dim,sprite.data); - if (!tqmask) - throw CImgArgumentException("CImg<%s>::draw_image() : Specified tqmask image (%u,%u,%u,%u,%p) is empty.", - pixel_type(),tqmask.width,tqmask.height,tqmask.depth,tqmask.dim,tqmask.data); - if (is_overlapped(sprite)) return draw_image(x0,y0,z0,v0,+sprite,tqmask,opacity,mask_valmax); - if (is_overlapped(tqmask)) return draw_image(x0,y0,z0,v0,sprite,+tqmask,opacity,mask_valmax); - if (tqmask.width!=sprite.width || tqmask.height!=sprite.height || tqmask.depth!=sprite.depth) + if (!mask) + throw CImgArgumentException("CImg<%s>::draw_image() : Specified mask image (%u,%u,%u,%u,%p) is empty.", + pixel_type(),mask.width,mask.height,mask.depth,mask.dim,mask.data); + if (is_overlapped(sprite)) return draw_image(x0,y0,z0,v0,+sprite,mask,opacity,mask_valmax); + if (is_overlapped(mask)) return draw_image(x0,y0,z0,v0,sprite,+mask,opacity,mask_valmax); + if (mask.width!=sprite.width || mask.height!=sprite.height || mask.depth!=sprite.depth) throw CImgArgumentException("CImg<%s>::draw_image() : Mask dimension is (%u,%u,%u,%u), while sprite is (%u,%u,%u,%u)", - pixel_type(),tqmask.width,tqmask.height,tqmask.depth,tqmask.dim,sprite.width,sprite.height,sprite.depth,sprite.dim); + pixel_type(),mask.width,mask.height,mask.depth,mask.dim,sprite.width,sprite.height,sprite.depth,sprite.dim); const bool bx = (x0<0), by = (y0<0), bz = (z0<0), bv = (v0<0); const int lX = sprite.dimx() - (x0 + sprite.dimx()>dimx()?x0 + sprite.dimx() - dimx():0) + (bx?x0:0), @@ -19704,10 +19704,10 @@ namespace cimg_library { lZ = sprite.dimz() - (z0 + sprite.dimz()>dimz()?z0 + sprite.dimz() - dimz():0) + (bz?z0:0), lV = sprite.dimv() - (v0 + sprite.dimv()>dimv()?v0 + sprite.dimv() - dimv():0) + (bv?v0:0); const int - coff = -(bx?x0:0)-(by?y0*tqmask.dimx():0)-(bz?z0*tqmask.dimx()*tqmask.dimy():0)-(bv?v0*tqmask.dimx()*tqmask.dimy()*tqmask.dimz():0), - ssize = tqmask.dimx()*tqmask.dimy()*tqmask.dimz(); + coff = -(bx?x0:0)-(by?y0*mask.dimx():0)-(bz?z0*mask.dimx()*mask.dimy():0)-(bv?v0*mask.dimx()*mask.dimy()*mask.dimz():0), + ssize = mask.dimx()*mask.dimy()*mask.dimz(); const ti *ptrs = sprite.data + coff; - const tm *ptrm = tqmask.data + coff; + const tm *ptrm = mask.data + coff; const unsigned int offX = width - lX, soffX = sprite.width - lX, offY = width*(height - lY), soffY = sprite.width*(sprite.height - lY), @@ -19715,7 +19715,7 @@ namespace cimg_library { if (lX>0 && lY>0 && lZ>0 && lV>0) { T *ptrd = ptr(x0<0?0:x0,y0<0?0:y0,z0<0?0:z0,v0<0?0:v0); for (int v = 0; v CImg& draw_image(const int x0, const int y0, const int z0, - const CImg& sprite, const CImg& tqmask, const float opacity=1, + const CImg& sprite, const CImg& mask, const float opacity=1, const float mask_valmax=1) { - return draw_image(x0,y0,z0,0,sprite,tqmask,opacity,mask_valmax); + return draw_image(x0,y0,z0,0,sprite,mask,opacity,mask_valmax); } //! Draw an image. template CImg& draw_image(const int x0, const int y0, - const CImg& sprite, const CImg& tqmask, const float opacity=1, + const CImg& sprite, const CImg& mask, const float opacity=1, const float mask_valmax=1) { - return draw_image(x0,y0,0,sprite,tqmask,opacity,mask_valmax); + return draw_image(x0,y0,0,sprite,mask,opacity,mask_valmax); } //! Draw an image. template CImg& draw_image(const int x0, - const CImg& sprite, const CImg& tqmask, const float opacity=1, + const CImg& sprite, const CImg& mask, const float opacity=1, const float mask_valmax=1) { - return draw_image(x0,0,sprite,tqmask,opacity,mask_valmax); + return draw_image(x0,0,sprite,mask,opacity,mask_valmax); } //! Draw an image. template - CImg& draw_image(const CImg& sprite, const CImg& tqmask, const float opacity=1, + CImg& draw_image(const CImg& sprite, const CImg& mask, const float opacity=1, const float mask_valmax=1) { - return draw_image(0,sprite,tqmask,opacity,mask_valmax); + return draw_image(0,sprite,mask,opacity,mask_valmax); } //! Draw a 4D filled rectangle in the instance image, at coordinates (\c x0,\c y0,\c z0,\c v0)-(\c x1,\c y1,\c z1,\c v1). @@ -22229,12 +22229,12 @@ namespace cimg_library { case '\t' : x+=4*font[' '].width; break; default : if (c& tqmask = (c+256)<(int)font.size?font[c+256]:font[c]; + const CImg& mask = (c+256)<(int)font.size?font[c+256]:font[c]; if (foreground_color) for (unsigned int p = 0; p=512) draw_image(x,y,letter,tqmask,opacity,(T)1); + if (!mask(p)) cimg_forV(*this,k) letter(p,0,0,k) = (T)background_color[k]; + if (!background_color && font.size>=512) draw_image(x,y,letter,mask,opacity,(T)1); else draw_image(x,y,letter,opacity); x+=letter.width; } @@ -22777,11 +22777,11 @@ namespace cimg_library { \param y Y-coordinate of the starting point of the region to fill. \param z Z-coordinate of the starting point of the region to fill. \param color An array of dimv() values of type \c T, defining the drawing color. - \param region Image that will contain the tqmask of the filled region tqmask, as an output. + \param region Image that will contain the mask of the filled region mask, as an output. \param sigma Tolerance concerning neighborhood values. \param opacity Opacity of the drawing. \param high_connexity Tells if 8-connexity must be used (only for 2D images). - \return \p region is initialized with the binary tqmask of the filled region. + \return \p region is initialized with the binary mask of the filled region. **/ template CImg& draw_fill(const int x, const int y, const int z, @@ -24508,45 +24508,45 @@ namespace cimg_library { //@{ //---------------------------- - //! Compute the correlation of the instance image by a tqmask. + //! Compute the correlation of the instance image by a mask. /** - The correlation of the instance image \p *this by the tqmask \p tqmask is defined to be : + The correlation of the instance image \p *this by the mask \p mask is defined to be : - res(x,y,z) = sum_{i,j,k} (*this)(x+i,y+j,z+k)*tqmask(i,j,k) + res(x,y,z) = sum_{i,j,k} (*this)(x+i,y+j,z+k)*mask(i,j,k) - \param tqmask = the correlation kernel. + \param mask = the correlation kernel. \param cond = the border condition type (0=zero, 1=dirichlet) \param weighted_correl = enable local normalization. **/ template - CImg& correlate(const CImg& tqmask, const unsigned int cond=1, const bool weighted_correl=false) { - return get_correlate(tqmask,cond,weighted_correl).transfer_to(*this); + CImg& correlate(const CImg& mask, const unsigned int cond=1, const bool weighted_correl=false) { + return get_correlate(mask,cond,weighted_correl).transfer_to(*this); } template - CImg::type> get_correlate(const CImg& tqmask, const unsigned int cond=1, + CImg::type> get_correlate(const CImg& mask, const unsigned int cond=1, const bool weighted_correl=false) const { typedef typename cimg::superset2::type Ttfloat; if (is_empty()) return *this; - if (!tqmask || tqmask.dim!=1) - throw CImgArgumentException("CImg<%s>::correlate() : Specified tqmask (%u,%u,%u,%u,%p) is not scalar.", - pixel_type(),tqmask.width,tqmask.height,tqmask.depth,tqmask.dim,tqmask.data); + if (!mask || mask.dim!=1) + throw CImgArgumentException("CImg<%s>::correlate() : Specified mask (%u,%u,%u,%u,%p) is not scalar.", + pixel_type(),mask.width,mask.height,mask.depth,mask.dim,mask.data); CImg dest(width,height,depth,dim); - if (cond && tqmask.width==tqmask.height && ((tqmask.depth==1 && tqmask.width<=5) || (tqmask.depth==tqmask.width && tqmask.width<=3))) { - // A special optimization is done for 2x2, 3x3, 4x4, 5x5, 2x2x2 and 3x3x3 tqmask (with cond=1) - switch (tqmask.depth) { + if (cond && mask.width==mask.height && ((mask.depth==1 && mask.width<=5) || (mask.depth==mask.width && mask.width<=3))) { + // A special optimization is done for 2x2, 3x3, 4x4, 5x5, 2x2x2 and 3x3x3 mask (with cond=1) + switch (mask.depth) { case 3 : { T I[27] = { 0 }; cimg_forZV(*this,z,v) cimg_for3x3x3(*this,x,y,z,v,I) dest(x,y,z,v) = (Ttfloat) - (I[ 0]*tqmask[ 0] + I[ 1]*tqmask[ 1] + I[ 2]*tqmask[ 2] + - I[ 3]*tqmask[ 3] + I[ 4]*tqmask[ 4] + I[ 5]*tqmask[ 5] + - I[ 6]*tqmask[ 6] + I[ 7]*tqmask[ 7] + I[ 8]*tqmask[ 8] + - I[ 9]*tqmask[ 9] + I[10]*tqmask[10] + I[11]*tqmask[11] + - I[12]*tqmask[12] + I[13]*tqmask[13] + I[14]*tqmask[14] + - I[15]*tqmask[15] + I[16]*tqmask[16] + I[17]*tqmask[17] + - I[18]*tqmask[18] + I[19]*tqmask[19] + I[20]*tqmask[20] + - I[21]*tqmask[21] + I[22]*tqmask[22] + I[23]*tqmask[23] + - I[24]*tqmask[24] + I[25]*tqmask[25] + I[26]*tqmask[26]); + (I[ 0]*mask[ 0] + I[ 1]*mask[ 1] + I[ 2]*mask[ 2] + + I[ 3]*mask[ 3] + I[ 4]*mask[ 4] + I[ 5]*mask[ 5] + + I[ 6]*mask[ 6] + I[ 7]*mask[ 7] + I[ 8]*mask[ 8] + + I[ 9]*mask[ 9] + I[10]*mask[10] + I[11]*mask[11] + + I[12]*mask[12] + I[13]*mask[13] + I[14]*mask[14] + + I[15]*mask[15] + I[16]*mask[16] + I[17]*mask[17] + + I[18]*mask[18] + I[19]*mask[19] + I[20]*mask[20] + + I[21]*mask[21] + I[22]*mask[22] + I[23]*mask[23] + + I[24]*mask[24] + I[25]*mask[25] + I[26]*mask[26]); if (weighted_correl) cimg_forZV(*this,z,v) cimg_for3x3x3(*this,x,y,z,v,I) { const double weight = (double)(I[ 0]*I[ 0] + I[ 1]*I[ 1] + I[ 2]*I[ 2] + I[ 3]*I[ 3] + I[ 4]*I[ 4] + I[ 5]*I[ 5] + @@ -24563,10 +24563,10 @@ namespace cimg_library { case 2 : { T I[8] = { 0 }; cimg_forZV(*this,z,v) cimg_for2x2x2(*this,x,y,z,v,I) dest(x,y,z,v) = (Ttfloat) - (I[0]*tqmask[0] + I[1]*tqmask[1] + - I[2]*tqmask[2] + I[3]*tqmask[3] + - I[4]*tqmask[4] + I[5]*tqmask[5] + - I[6]*tqmask[6] + I[7]*tqmask[7]); + (I[0]*mask[0] + I[1]*mask[1] + + I[2]*mask[2] + I[3]*mask[3] + + I[4]*mask[4] + I[5]*mask[5] + + I[6]*mask[6] + I[7]*mask[7]); if (weighted_correl) cimg_forZV(*this,z,v) cimg_for2x2x2(*this,x,y,z,v,I) { const double weight = (double)(I[0]*I[0] + I[1]*I[1] + I[2]*I[2] + I[3]*I[3] + @@ -24577,16 +24577,16 @@ namespace cimg_library { } break; default : case 1 : - switch (tqmask.width) { + switch (mask.width) { case 6 : { T I[36] = { 0 }; cimg_forZV(*this,z,v) cimg_for6x6(*this,x,y,z,v,I) dest(x,y,z,v) = (Ttfloat) - (I[ 0]*tqmask[ 0] + I[ 1]*tqmask[ 1] + I[ 2]*tqmask[ 2] + I[ 3]*tqmask[ 3] + I[ 4]*tqmask[ 4] + I[ 5]*tqmask[ 5] + - I[ 6]*tqmask[ 6] + I[ 7]*tqmask[ 7] + I[ 8]*tqmask[ 8] + I[ 9]*tqmask[ 9] + I[10]*tqmask[10] + I[11]*tqmask[11] + - I[12]*tqmask[12] + I[13]*tqmask[13] + I[14]*tqmask[14] + I[15]*tqmask[15] + I[16]*tqmask[16] + I[17]*tqmask[17] + - I[18]*tqmask[18] + I[19]*tqmask[19] + I[20]*tqmask[20] + I[21]*tqmask[21] + I[22]*tqmask[22] + I[23]*tqmask[23] + - I[24]*tqmask[24] + I[25]*tqmask[25] + I[26]*tqmask[26] + I[27]*tqmask[27] + I[28]*tqmask[28] + I[29]*tqmask[29] + - I[30]*tqmask[30] + I[31]*tqmask[31] + I[32]*tqmask[32] + I[33]*tqmask[33] + I[34]*tqmask[34] + I[35]*tqmask[35]); + (I[ 0]*mask[ 0] + I[ 1]*mask[ 1] + I[ 2]*mask[ 2] + I[ 3]*mask[ 3] + I[ 4]*mask[ 4] + I[ 5]*mask[ 5] + + I[ 6]*mask[ 6] + I[ 7]*mask[ 7] + I[ 8]*mask[ 8] + I[ 9]*mask[ 9] + I[10]*mask[10] + I[11]*mask[11] + + I[12]*mask[12] + I[13]*mask[13] + I[14]*mask[14] + I[15]*mask[15] + I[16]*mask[16] + I[17]*mask[17] + + I[18]*mask[18] + I[19]*mask[19] + I[20]*mask[20] + I[21]*mask[21] + I[22]*mask[22] + I[23]*mask[23] + + I[24]*mask[24] + I[25]*mask[25] + I[26]*mask[26] + I[27]*mask[27] + I[28]*mask[28] + I[29]*mask[29] + + I[30]*mask[30] + I[31]*mask[31] + I[32]*mask[32] + I[33]*mask[33] + I[34]*mask[34] + I[35]*mask[35]); if (weighted_correl) cimg_forZV(*this,z,v) cimg_for5x5(*this,x,y,z,v,I) { const double weight = (double)(I[ 0]*I[ 0] + I[ 1]*I[ 1] + I[ 2]*I[ 2] + I[ 3]*I[ 3] + I[ 4]*I[ 4] + I[ 5]*I[ 5] + I[ 6]*I[ 6] + I[ 7]*I[ 7] + I[ 8]*I[ 8] + I[ 9]*I[ 9] + I[10]*I[10] + I[11]*I[11] + @@ -24600,11 +24600,11 @@ namespace cimg_library { case 5 : { T I[25] = { 0 }; cimg_forZV(*this,z,v) cimg_for5x5(*this,x,y,z,v,I) dest(x,y,z,v) = (Ttfloat) - (I[ 0]*tqmask[ 0] + I[ 1]*tqmask[ 1] + I[ 2]*tqmask[ 2] + I[ 3]*tqmask[ 3] + I[ 4]*tqmask[ 4] + - I[ 5]*tqmask[ 5] + I[ 6]*tqmask[ 6] + I[ 7]*tqmask[ 7] + I[ 8]*tqmask[ 8] + I[ 9]*tqmask[ 9] + - I[10]*tqmask[10] + I[11]*tqmask[11] + I[12]*tqmask[12] + I[13]*tqmask[13] + I[14]*tqmask[14] + - I[15]*tqmask[15] + I[16]*tqmask[16] + I[17]*tqmask[17] + I[18]*tqmask[18] + I[19]*tqmask[19] + - I[20]*tqmask[20] + I[21]*tqmask[21] + I[22]*tqmask[22] + I[23]*tqmask[23] + I[24]*tqmask[24]); + (I[ 0]*mask[ 0] + I[ 1]*mask[ 1] + I[ 2]*mask[ 2] + I[ 3]*mask[ 3] + I[ 4]*mask[ 4] + + I[ 5]*mask[ 5] + I[ 6]*mask[ 6] + I[ 7]*mask[ 7] + I[ 8]*mask[ 8] + I[ 9]*mask[ 9] + + I[10]*mask[10] + I[11]*mask[11] + I[12]*mask[12] + I[13]*mask[13] + I[14]*mask[14] + + I[15]*mask[15] + I[16]*mask[16] + I[17]*mask[17] + I[18]*mask[18] + I[19]*mask[19] + + I[20]*mask[20] + I[21]*mask[21] + I[22]*mask[22] + I[23]*mask[23] + I[24]*mask[24]); if (weighted_correl) cimg_forZV(*this,z,v) cimg_for5x5(*this,x,y,z,v,I) { const double weight = (double)(I[ 0]*I[ 0] + I[ 1]*I[ 1] + I[ 2]*I[ 2] + I[ 3]*I[ 3] + I[ 4]*I[ 4] + I[ 5]*I[ 5] + I[ 6]*I[ 6] + I[ 7]*I[ 7] + I[ 8]*I[ 8] + I[ 9]*I[ 9] + @@ -24617,10 +24617,10 @@ namespace cimg_library { case 4 : { T I[16] = { 0 }; cimg_forZV(*this,z,v) cimg_for4x4(*this,x,y,z,v,I) dest(x,y,z,v) = (Ttfloat) - (I[ 0]*tqmask[ 0] + I[ 1]*tqmask[ 1] + I[ 2]*tqmask[ 2] + I[ 3]*tqmask[ 3] + - I[ 4]*tqmask[ 4] + I[ 5]*tqmask[ 5] + I[ 6]*tqmask[ 6] + I[ 7]*tqmask[ 7] + - I[ 8]*tqmask[ 8] + I[ 9]*tqmask[ 9] + I[10]*tqmask[10] + I[11]*tqmask[11] + - I[12]*tqmask[12] + I[13]*tqmask[13] + I[14]*tqmask[14] + I[15]*tqmask[15]); + (I[ 0]*mask[ 0] + I[ 1]*mask[ 1] + I[ 2]*mask[ 2] + I[ 3]*mask[ 3] + + I[ 4]*mask[ 4] + I[ 5]*mask[ 5] + I[ 6]*mask[ 6] + I[ 7]*mask[ 7] + + I[ 8]*mask[ 8] + I[ 9]*mask[ 9] + I[10]*mask[10] + I[11]*mask[11] + + I[12]*mask[12] + I[13]*mask[13] + I[14]*mask[14] + I[15]*mask[15]); if (weighted_correl) cimg_forZV(*this,z,v) cimg_for4x4(*this,x,y,z,v,I) { const double weight = (double)(I[ 0]*I[ 0] + I[ 1]*I[ 1] + I[ 2]*I[ 2] + I[ 3]*I[ 3] + I[ 4]*I[ 4] + I[ 5]*I[ 5] + I[ 6]*I[ 6] + I[ 7]*I[ 7] + @@ -24632,9 +24632,9 @@ namespace cimg_library { case 3 : { T I[9] = { 0 }; cimg_forZV(*this,z,v) cimg_for3x3(*this,x,y,z,v,I) dest(x,y,z,v) = (Ttfloat) - (I[0]*tqmask[0] + I[1]*tqmask[1] + I[2]*tqmask[2] + - I[3]*tqmask[3] + I[4]*tqmask[4] + I[5]*tqmask[5] + - I[6]*tqmask[6] + I[7]*tqmask[7] + I[8]*tqmask[8]); + (I[0]*mask[0] + I[1]*mask[1] + I[2]*mask[2] + + I[3]*mask[3] + I[4]*mask[4] + I[5]*mask[5] + + I[6]*mask[6] + I[7]*mask[7] + I[8]*mask[8]); if (weighted_correl) cimg_forZV(*this,z,v) cimg_for3x3(*this,x,y,z,v,I) { const double weight = (double)(I[0]*I[0] + I[1]*I[1] + I[2]*I[2] + I[3]*I[3] + I[4]*I[4] + I[5]*I[5] + @@ -24645,28 +24645,28 @@ namespace cimg_library { case 2 : { T I[4] = { 0 }; cimg_forZV(*this,z,v) cimg_for2x2(*this,x,y,z,v,I) dest(x,y,z,v) = (Ttfloat) - (I[0]*tqmask[0] + I[1]*tqmask[1] + - I[2]*tqmask[2] + I[3]*tqmask[3]); + (I[0]*mask[0] + I[1]*mask[1] + + I[2]*mask[2] + I[3]*mask[3]); if (weighted_correl) cimg_forZV(*this,z,v) cimg_for2x2(*this,x,y,z,v,I) { const double weight = (double)(I[0]*I[0] + I[1]*I[1] + I[2]*I[2] + I[3]*I[3]); if (weight>0) dest(x,y,z,v)/=(Ttfloat)cimg_std::sqrt(weight); } } break; - case 1 : (dest.assign(*this))*=tqmask(0); break; + case 1 : (dest.assign(*this))*=mask(0); break; } } } else { // Generic version for other masks const int - mx2 = tqmask.dimx()/2, my2 = tqmask.dimy()/2, mz2 = tqmask.dimz()/2, - mx1 = mx2 - 1 + (tqmask.dimx()%2), my1 = my2 - 1 + (tqmask.dimy()%2), mz1 = mz2 - 1 + (tqmask.dimz()%2), + mx2 = mask.dimx()/2, my2 = mask.dimy()/2, mz2 = mask.dimz()/2, + mx1 = mx2 - 1 + (mask.dimx()%2), my1 = my2 - 1 + (mask.dimy()%2), mz1 = mz2 - 1 + (mask.dimz()%2), mxe = dimx() - mx2, mye = dimy() - my2, mze = dimz() - mz2; cimg_forV(*this,v) if (!weighted_correl) { // Classical correlation for (int z = mz1; z=mye || z=mze)?++x:((x=mxe)?++x:(x=mxe))) { Ttfloat val = 0; for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) - val+=_atXYZ(x+xm,y+ym,z+zm,v)*tqmask(mx1+xm,my1+ym,mz1+zm); + val+=_atXYZ(x+xm,y+ym,z+zm,v)*mask(mx1+xm,my1+ym,mz1+zm); dest(x,y,z,v) = (Ttfloat)val; } else @@ -24682,7 +24682,7 @@ namespace cimg_library { for (int x = 0; x=mye || z=mze)?++x:((x=mxe)?++x:(x=mxe))) { Ttfloat val = 0; for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) - val+=atXYZ(x+xm,y+ym,z+zm,v,0)*tqmask(mx1+xm,my1+ym,mz1+zm); + val+=atXYZ(x+xm,y+ym,z+zm,v,0)*mask(mx1+xm,my1+ym,mz1+zm); dest(x,y,z,v) = (Ttfloat)val; } } else { // Weighted correlation @@ -24690,7 +24690,7 @@ namespace cimg_library { Ttfloat val = 0, weight = 0; for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) { const Ttfloat cval = (Ttfloat)(*this)(x+xm,y+ym,z+zm,v); - val+=cval*tqmask(mx1+xm,my1+ym,mz1+zm); + val+=cval*mask(mx1+xm,my1+ym,mz1+zm); weight+=cval*cval; } dest(x,y,z,v) = (weight>(Ttfloat)0)?(Ttfloat)(val/cimg_std::sqrt((double)weight)):(Ttfloat)0; @@ -24701,7 +24701,7 @@ namespace cimg_library { Ttfloat val = 0, weight = 0; for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) { const Ttfloat cval = (Ttfloat)_atXYZ(x+xm,y+ym,z+zm,v); - val+=cval*tqmask(mx1+xm,my1+ym,mz1+zm); + val+=cval*mask(mx1+xm,my1+ym,mz1+zm); weight+=cval*cval; } dest(x,y,z,v) = (weight>(Ttfloat)0)?(Ttfloat)(val/cimg_std::sqrt((double)weight)):(Ttfloat)0; @@ -24712,7 +24712,7 @@ namespace cimg_library { Ttfloat val = 0, weight = 0; for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) { const Ttfloat cval = (Ttfloat)atXYZ(x+xm,y+ym,z+zm,v,0); - val+=cval*tqmask(mx1+xm,my1+ym,mz1+zm); + val+=cval*mask(mx1+xm,my1+ym,mz1+zm); weight+=cval*cval; } dest(x,y,z,v) = (weight>(Ttfloat)0)?(Ttfloat)(val/cimg_std::sqrt((double)weight)):(Ttfloat)0; @@ -24722,50 +24722,50 @@ namespace cimg_library { return dest; } - //! Compute the convolution of the image by a tqmask. + //! Compute the convolution of the image by a mask. /** - The result \p res of the convolution of an image \p img by a tqmask \p tqmask is defined to be : + The result \p res of the convolution of an image \p img by a mask \p mask is defined to be : - res(x,y,z) = sum_{i,j,k} img(x-i,y-j,z-k)*tqmask(i,j,k) + res(x,y,z) = sum_{i,j,k} img(x-i,y-j,z-k)*mask(i,j,k) - \param tqmask = the correlation kernel. + \param mask = the correlation kernel. \param cond = the border condition type (0=zero, 1=dirichlet) \param weighted_convol = enable local normalization. **/ template - CImg& convolve(const CImg& tqmask, const unsigned int cond=1, const bool weighted_convol=false) { - return get_convolve(tqmask,cond,weighted_convol).transfer_to(*this); + CImg& convolve(const CImg& mask, const unsigned int cond=1, const bool weighted_convol=false) { + return get_convolve(mask,cond,weighted_convol).transfer_to(*this); } template - CImg::type> get_convolve(const CImg& tqmask, const unsigned int cond=1, + CImg::type> get_convolve(const CImg& mask, const unsigned int cond=1, const bool weighted_convol=false) const { typedef typename cimg::superset2::type Ttfloat; if (is_empty()) return *this; - if (!tqmask || tqmask.dim!=1) - throw CImgArgumentException("CImg<%s>::convolve() : Specified tqmask (%u,%u,%u,%u,%p) is not scalar.", - pixel_type(),tqmask.width,tqmask.height,tqmask.depth,tqmask.dim,tqmask.data); - return get_correlate(CImg(tqmask.ptr(),tqmask.size(),1,1,1,true).get_mirror('x').resize(tqmask,-1),cond,weighted_convol); + if (!mask || mask.dim!=1) + throw CImgArgumentException("CImg<%s>::convolve() : Specified mask (%u,%u,%u,%u,%p) is not scalar.", + pixel_type(),mask.width,mask.height,mask.depth,mask.dim,mask.data); + return get_correlate(CImg(mask.ptr(),mask.size(),1,1,1,true).get_mirror('x').resize(mask,-1),cond,weighted_convol); } //! Return the erosion of the image by a structuring element. template - CImg& erode(const CImg& tqmask, const unsigned int cond=1, const bool weighted_erosion=false) { - return get_erode(tqmask,cond,weighted_erosion).transfer_to(*this); + CImg& erode(const CImg& mask, const unsigned int cond=1, const bool weighted_erosion=false) { + return get_erode(mask,cond,weighted_erosion).transfer_to(*this); } template - CImg::type> get_erode(const CImg& tqmask, const unsigned int cond=1, + CImg::type> get_erode(const CImg& mask, const unsigned int cond=1, const bool weighted_erosion=false) const { typedef typename cimg::superset::type Tt; if (is_empty()) return *this; - if (!tqmask || tqmask.dim!=1) - throw CImgArgumentException("CImg<%s>::erode() : Specified tqmask (%u,%u,%u,%u,%p) is not a scalar image.", - pixel_type(),tqmask.width,tqmask.height,tqmask.depth,tqmask.dim,tqmask.data); + if (!mask || mask.dim!=1) + throw CImgArgumentException("CImg<%s>::erode() : Specified mask (%u,%u,%u,%u,%p) is not a scalar image.", + pixel_type(),mask.width,mask.height,mask.depth,mask.dim,mask.data); CImg dest(width,height,depth,dim); const int - mx2 = tqmask.dimx()/2, my2 = tqmask.dimy()/2, mz2 = tqmask.dimz()/2, - mx1 = mx2 - 1 + (tqmask.dimx()%2), my1 = my2 - 1 + (tqmask.dimy()%2), mz1 = mz2 - 1 + (tqmask.dimz()%2), + mx2 = mask.dimx()/2, my2 = mask.dimy()/2, mz2 = mask.dimz()/2, + mx1 = mx2 - 1 + (mask.dimx()%2), my1 = my2 - 1 + (mask.dimy()%2), mz1 = mz2 - 1 + (mask.dimz()%2), mxe = dimx() - mx2, mye = dimy() - my2, mze = dimz() - mz2; cimg_forV(*this,v) if (!weighted_erosion) { // Classical erosion @@ -24773,7 +24773,7 @@ namespace cimg_library { Tt min_val = cimg::type::max(); for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) { const Tt cval = (Tt)(*this)(x+xm,y+ym,z+zm,v); - if (tqmask(mx1+xm,my1+ym,mz1+zm) && cval::max(); for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) { const T cval = (Tt)_atXYZ(x+xm,y+ym,z+zm,v); - if (tqmask(mx1+xm,my1+ym,mz1+zm) && cval::max(); for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) { const T cval = (Tt)atXYZ(x+xm,y+ym,z+zm,v,0); - if (tqmask(mx1+xm,my1+ym,mz1+zm) && cval::max(); for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) { - const t mval = tqmask(mx1+xm,my1+ym,mz1+zm); + const t mval = mask(mx1+xm,my1+ym,mz1+zm); const Tt cval = (Tt)((*this)(x+xm,y+ym,z+zm,v) + mval); if (mval && cval=mye || z=mze)?++x:((x=mxe)?++x:(x=mxe))) { Tt min_val = cimg::type::max(); for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) { - const t mval = tqmask(mx1+xm,my1+ym,mz1+zm); + const t mval = mask(mx1+xm,my1+ym,mz1+zm); const Tt cval = (Tt)(_atXYZ(x+xm,y+ym,z+zm,v) + mval); if (mval && cval=mye || z=mze)?++x:((x=mxe)?++x:(x=mxe))) { Tt min_val = cimg::type::max(); for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) { - const t mval = tqmask(mx1+xm,my1+ym,mz1+zm); + const t mval = mask(mx1+xm,my1+ym,mz1+zm); const Tt cval = (Tt)(atXYZ(x+xm,y+ym,z+zm,v,0) + mval); if (mval && cval get_erode(const unsigned int n, const unsigned int cond=1) const { - static CImg tqmask; + static CImg mask; if (n<2) return *this; - if (tqmask.width!=n) tqmask.assign(n,n,1,1,1); - const CImg res = get_erode(tqmask,cond,false); - if (n>20) tqmask.assign(); + if (mask.width!=n) mask.assign(n,n,1,1,1); + const CImg res = get_erode(mask,cond,false); + if (n>20) mask.assign(); return res; } //! Dilate the image by a structuring element. template - CImg& dilate(const CImg& tqmask, const unsigned int cond=1, const bool weighted_dilatation=false) { - return get_dilate(tqmask,cond,weighted_dilatation).transfer_to(*this); + CImg& dilate(const CImg& mask, const unsigned int cond=1, const bool weighted_dilatation=false) { + return get_dilate(mask,cond,weighted_dilatation).transfer_to(*this); } template - CImg::type> get_dilate(const CImg& tqmask, const unsigned int cond=1, + CImg::type> get_dilate(const CImg& mask, const unsigned int cond=1, const bool weighted_dilatation=false) const { typedef typename cimg::superset::type Tt; if (is_empty()) return *this; - if (!tqmask || tqmask.dim!=1) - throw CImgArgumentException("CImg<%s>::dilate() : Specified tqmask (%u,%u,%u,%u,%p) is not a scalar image.", - pixel_type(),tqmask.width,tqmask.height,tqmask.depth,tqmask.dim,tqmask.data); + if (!mask || mask.dim!=1) + throw CImgArgumentException("CImg<%s>::dilate() : Specified mask (%u,%u,%u,%u,%p) is not a scalar image.", + pixel_type(),mask.width,mask.height,mask.depth,mask.dim,mask.data); CImg dest(width,height,depth,dim); const int - mx2 = tqmask.dimx()/2, my2 = tqmask.dimy()/2, mz2 = tqmask.dimz()/2, - mx1 = mx2 - 1 + (tqmask.dimx()%2), my1 = my2 - 1 + (tqmask.dimy()%2), mz1 = mz2 - 1 + (tqmask.dimz()%2), + mx2 = mask.dimx()/2, my2 = mask.dimy()/2, mz2 = mask.dimz()/2, + mx1 = mx2 - 1 + (mask.dimx()%2), my1 = my2 - 1 + (mask.dimy()%2), mz1 = mz2 - 1 + (mask.dimz()%2), mxe = dimx() - mx2, mye = dimy() - my2, mze = dimz() - mz2; cimg_forV(*this,v) if (!weighted_dilatation) { // Classical dilatation @@ -24873,7 +24873,7 @@ namespace cimg_library { Tt max_val = cimg::type::min(); for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) { const Tt cval = (Tt)(*this)(x+xm,y+ym,z+zm,v); - if (tqmask(mx1+xm,my1+ym,mz1+zm) && cval>max_val) max_val = cval; + if (mask(mx1+xm,my1+ym,mz1+zm) && cval>max_val) max_val = cval; } dest(x,y,z,v) = max_val; } @@ -24883,7 +24883,7 @@ namespace cimg_library { Tt max_val = cimg::type::min(); for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) { const T cval = (Tt)_atXYZ(x+xm,y+ym,z+zm,v); - if (tqmask(mx1+xm,my1+ym,mz1+zm) && cval>max_val) max_val = cval; + if (mask(mx1+xm,my1+ym,mz1+zm) && cval>max_val) max_val = cval; } dest(x,y,z,v) = max_val; } @@ -24893,7 +24893,7 @@ namespace cimg_library { Tt max_val = cimg::type::min(); for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) { const T cval = (Tt)atXYZ(x+xm,y+ym,z+zm,v,0); - if (tqmask(mx1+xm,my1+ym,mz1+zm) && cval>max_val) max_val = cval; + if (mask(mx1+xm,my1+ym,mz1+zm) && cval>max_val) max_val = cval; } dest(x,y,z,v) = max_val; } @@ -24901,7 +24901,7 @@ namespace cimg_library { for (int z = mz1; z::min(); for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) { - const t mval = tqmask(mx1+xm,my1+ym,mz1+zm); + const t mval = mask(mx1+xm,my1+ym,mz1+zm); const Tt cval = (Tt)((*this)(x+xm,y+ym,z+zm,v) - mval); if (mval && cval>max_val) max_val = cval; } @@ -24912,7 +24912,7 @@ namespace cimg_library { for (int x = 0; x=mye || z=mze)?++x:((x=mxe)?++x:(x=mxe))) { Tt max_val = cimg::type::min(); for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) { - const t mval = tqmask(mx1+xm,my1+ym,mz1+zm); + const t mval = mask(mx1+xm,my1+ym,mz1+zm); const Tt cval = (Tt)(_atXYZ(x+xm,y+ym,z+zm,v) - mval); if (mval && cval>max_val) max_val = cval; } @@ -24923,7 +24923,7 @@ namespace cimg_library { for (int x = 0; x=mye || z=mze)?++x:((x=mxe)?++x:(x=mxe))) { Tt max_val = cimg::type::min(); for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) { - const t mval = tqmask(mx1+xm,my1+ym,mz1+zm); + const t mval = mask(mx1+xm,my1+ym,mz1+zm); const Tt cval = (Tt)(atXYZ(x+xm,y+ym,z+zm,v,0) - mval); if (mval && cval>max_val) max_val = cval; } @@ -24940,11 +24940,11 @@ namespace cimg_library { } CImg get_dilate(const unsigned int n, const unsigned int cond=1) const { - static CImg tqmask; + static CImg mask; if (n<2) return *this; - if (tqmask.width!=n) tqmask.assign(n,n,1,1,1); - const CImg res = get_dilate(tqmask,cond,false); - if (n>20) tqmask.assign(); + if (mask.width!=n) mask.assign(n,n,1,1,1); + const CImg res = get_dilate(mask,cond,false); + if (n>20) mask.assign(); return res; } @@ -25476,7 +25476,7 @@ namespace cimg_library { //! Blur an image in an anisotropic way. /** - \param tqmask Binary tqmask. + \param mask Binary mask. \param amplitude Amplitude of the anisotropic blur. \param sharpness Contour preservation. \param anisotropy Smoothing anisotropy. @@ -25490,7 +25490,7 @@ namespace cimg_library { \param geom_factor Geometry factor. **/ template - CImg& blur_anisotropic(const CImg& tqmask, const float amplitude, const float sharpness=0.7f, const float anisotropy=0.3f, + CImg& blur_anisotropic(const CImg& mask, const float amplitude, const float sharpness=0.7f, const float anisotropy=0.3f, const float alpha=0.6f, const float sigma=1.1f, const float dl=0.8f, const float da=30, const float gauss_prec=2, const unsigned int interpolation_type=0, const bool fast_approx=true, const float geom_factor=1) { @@ -25502,7 +25502,7 @@ namespace cimg_library { "Admissible parameters are in the range : amplitude>0, sharpness>0, anisotropy in [0,1], " "alpha>0, sigma>0, dl>0, da>0, gauss_prec>0.", pixel_type(),amplitude,sharpness,anisotropy,alpha,sigma,dl,da,gauss_prec); - const bool threed = (depth>1), no_tqmask = tqmask.is_empty(); + const bool threed = (depth>1), no_mask = mask.is_empty(); const float nsharpness = cimg::max(sharpness,1e-5f), power1 = 0.5f*nsharpness, power2 = power1/(1e-7f+1-anisotropy); CImg blurred = CImg(*this,false).blur(alpha); if (geom_factor>0) blurred*=geom_factor; @@ -25513,7 +25513,7 @@ namespace cimg_library { CImg val(3), vec(3,3), G(blurred.get_structure_tensor()); if (sigma>0) G.blur(sigma); cimg_forXYZ(*this,x,y,z) { - if (no_tqmask || tqmask(x,y,z)) { + if (no_mask || mask(x,y,z)) { G.get_tensor_at(x,y,z).symmetric_eigen(val,vec); const float l1 = val[2], l2 = val[1], l3 = val[0], ux = vec(0,0), uy = vec(0,1), uz = vec(0,2), @@ -25537,7 +25537,7 @@ namespace cimg_library { CImg val(2), vec(2,2), G(blurred.get_structure_tensor()); if (sigma>0) G.blur(sigma); cimg_forXY(*this,x,y) { - if (no_tqmask || tqmask(x,y)) { + if (no_mask || mask(x,y)) { G.get_tensor_at(x,y).symmetric_eigen(val,vec); const float l1 = val[1], l2 = val[0], ux = vec(1,0), uy = vec(1,1), @@ -25558,11 +25558,11 @@ namespace cimg_library { } template - CImg get_blur_anisotropic(const CImg& tqmask, const float amplitude, const float sharpness=0.7f, const float anisotropy=0.3f, + CImg get_blur_anisotropic(const CImg& mask, const float amplitude, const float sharpness=0.7f, const float anisotropy=0.3f, const float alpha=0.6f, const float sigma=1.1f, const float dl=0.8f, const float da=30, const float gauss_prec=2, const unsigned int interpolation_type=0, const bool fast_approx=true, const float geom_factor=1) const { - return (+*this).blur_anisotropic(tqmask,amplitude,sharpness,anisotropy,alpha,sigma,dl,da,gauss_prec,interpolation_type,fast_approx,geom_factor); + return (+*this).blur_anisotropic(mask,amplitude,sharpness,anisotropy,alpha,sigma,dl,da,gauss_prec,interpolation_type,fast_approx,geom_factor); } //! Blur an image following in an anisotropic way. @@ -29139,27 +29139,27 @@ namespace cimg_library { switch (bpp) { case 1 : { // Monochrome for (int y=height-1; y>=0; --y) { - unsigned char tqmask = 0x80, val = 0; + unsigned char mask = 0x80, val = 0; cimg_forX(*this,x) { - if (tqmask==0x80) val = *(ptrs++); - const unsigned char *col = (unsigned char*)(palette+(val&tqmask?1:0)); + if (mask==0x80) val = *(ptrs++); + const unsigned char *col = (unsigned char*)(palette+(val&mask?1:0)); (*this)(x,y,2) = (T)*(col++); (*this)(x,y,1) = (T)*(col++); (*this)(x,y,0) = (T)*(col++); - tqmask = cimg::ror(tqmask); + mask = cimg::ror(mask); } ptrs+=align; } } break; case 4 : { // 16 colors for (int y=height-1; y>=0; --y) { - unsigned char tqmask = 0xF0, val = 0; + unsigned char mask = 0xF0, val = 0; cimg_forX(*this,x) { - if (tqmask==0xF0) val = *(ptrs++); - const unsigned char color = (unsigned char)((tqmask<16)?(val&tqmask):((val&tqmask)>>4)); + if (mask==0xF0) val = *(ptrs++); + const unsigned char color = (unsigned char)((mask<16)?(val&mask):((val&mask)>>4)); unsigned char *col = (unsigned char*)(palette+color); (*this)(x,y,2) = (T)*(col++); (*this)(x,y,1) = (T)*(col++); (*this)(x,y,0) = (T)*(col++); - tqmask = cimg::ror(tqmask,4); + mask = cimg::ror(mask,4); } ptrs+=align; } } break; case 8 : { // 256 colors @@ -35025,9 +35025,9 @@ namespace cimg_library { for (unsigned int y=0; y>=1; if (!m) { m = 0x80000000; val = *(ptr++); } - CImg& img = res[x/w], &tqmask = res[x/w+256]; + CImg& img = res[x/w], &mask = res[x/w+256]; unsigned int xm = x%w; - img(xm,y,0) = img(xm,y,1) = img(xm,y,2) = tqmask(xm,y,0) = (T)((val&m)?1:0); + img(xm,y,0) = img(xm,y,1) = img(xm,y,2) = mask(xm,y,0) = (T)((val&m)?1:0); } if (variable_size) res.crop_font(); if (paddingx || paddingy) cimglist_for(res,l) res[l].resize(res[l].dimx()+paddingx, res[l].dimy()+paddingy,1,-100,0); diff --git a/digikam/libs/greycstoration/greycstoration.h b/digikam/libs/greycstoration/greycstoration.h index f8d979aa..a80e2e0c 100644 --- a/digikam/libs/greycstoration/greycstoration.h +++ b/digikam/libs/greycstoration/greycstoration.h @@ -82,7 +82,7 @@ struct _greycstoration_params { // Non-specific parameters of the algorithms. CImg *source; - const CImg *tqmask; + const CImg *mask; CImg *temporary; unsigned long *counter; unsigned int tile; @@ -104,7 +104,7 @@ struct _greycstoration_params { // Default constructor _greycstoration_params():patch_based(false),amplitude(0),sharpness(0),anisotropy(0),alpha(0),sigma(0),gfact(1), dl(0),da(0),gauss_prec(0),interpolation(0),patch_size(0), - sigma_s(0),sigma_p(0),lookup_size(0),source(0),tqmask(0),temporary(0),counter(0),tile(0), + sigma_s(0),sigma_p(0),lookup_size(0),source(0),mask(0),temporary(0),counter(0),tile(0), tile_border(0),thread(0),nb_threads(0),fast_approx(false),is_running(false), stop_request(0), mutex(0) {} }; @@ -149,8 +149,8 @@ float greycstoration_progress() const { return cimg::min(counter*99.9f/maxcounter,99.9f); } -//! Run the non-patch version of the GREYCstoration algorithm on the instance image, using a tqmask. -CImg& greycstoration_run(const CImg& tqmask, +//! Run the non-patch version of the GREYCstoration algorithm on the instance image, using a mask. +CImg& greycstoration_run(const CImg& mask, const float amplitude=60, const float sharpness=0.7f, const float anisotropy=0.3f, const float alpha=0.6f, const float sigma=1.1f, const float gfact=1.0f, const float dl=0.8f, const float da=30.0f, @@ -162,10 +162,10 @@ CImg& greycstoration_run(const CImg& tqmask, " the instance image (%u,%u,%u,%u,%p).",width,height,depth,dim,data); else { - if (!tqmask.is_empty() && !tqmask.is_sameXY(*this)) - throw CImgArgumentException("CImg<%s>::greycstoration_run() : Given tqmask (%u,%u,%u,%u,%p) and instance image " + if (!mask.is_empty() && !mask.is_sameXY(*this)) + throw CImgArgumentException("CImg<%s>::greycstoration_run() : Given mask (%u,%u,%u,%u,%p) and instance image " "(%u,%u,%u,%u,%p) have different dimensions.", - pixel_type(),tqmask.width,tqmask.height,tqmask.depth,tqmask.dim,tqmask.data,width,height,depth,dim,data); + pixel_type(),mask.width,mask.height,mask.depth,mask.dim,mask.data,width,height,depth,dim,data); if (nb_threads>16) cimg::warn("CImg<%s>::greycstoration_run() : Multi-threading mode limited to 16 threads max."); const unsigned int ntile = (tile && (tile1 && tile& tqmask, greycstoration_params[k].interpolation = interpolation; greycstoration_params[k].fast_approx = fast_approx; greycstoration_params[k].source = this; - greycstoration_params[k].tqmask = &tqmask; + greycstoration_params[k].mask = &mask; greycstoration_params[k].temporary = temporary; greycstoration_params[k].counter = counter; greycstoration_params[k].tile = ntile; @@ -239,8 +239,8 @@ CImg& greycstoration_run(const float amplitude=50, const float sharpness=0.7f, c const float dl=0.8f, const float da=30.0f, const float gauss_prec=2.0f, const unsigned int interpolation=0, const bool fast_approx=true, const unsigned int tile=0, const unsigned int tile_border=0, const unsigned int nb_threads=1) { - static const CImg empty_tqmask; - return greycstoration_run(empty_tqmask,amplitude,sharpness,anisotropy,alpha,sigma,gfact,dl,da,gauss_prec, + static const CImg empty_mask; + return greycstoration_run(empty_mask,amplitude,sharpness,anisotropy,alpha,sigma,gfact,dl,da,gauss_prec, interpolation,fast_approx,tile,tile_border,nb_threads); } @@ -249,7 +249,7 @@ CImg& greycstoration_patch_run(const unsigned int patch_size=5, const float sigm const unsigned int lookup_size=20, const bool fast_approx=true, const unsigned int tile=0, const unsigned int tile_border=0, const unsigned int nb_threads=1) { - static const CImg empty_tqmask; + static const CImg empty_mask; if (greycstoration_is_running()) throw CImgInstanceException("CImg::greycstoration_run() : A GREYCstoration thread is already running on" " the instance image (%u,%u,%u,%u,%p).",width,height,depth,dim,data); @@ -277,7 +277,7 @@ CImg& greycstoration_patch_run(const unsigned int patch_size=5, const float sigm greycstoration_params[k].sigma_p = sigma_p; greycstoration_params[k].lookup_size = lookup_size; greycstoration_params[k].source = this; - greycstoration_params[k].tqmask = &empty_tqmask; + greycstoration_params[k].mask = &empty_mask; greycstoration_params[k].temporary = temporary; greycstoration_params[k].counter = counter; greycstoration_params[k].tile = ntile; @@ -370,7 +370,7 @@ static void* greycstoration_thread(void *arg) { #endif _greycstoration_params &p = *(_greycstoration_params*)arg; greycstoration_mutex_lock(p); - const CImg &tqmask = *(p.tqmask); + const CImg &mask = *(p.mask); CImg &source = *(p.source); if (!p.tile) { @@ -378,7 +378,7 @@ static void* greycstoration_thread(void *arg) { // Non-tiled version //------------------ if (p.patch_based) source.blur_patch(p.patch_size,p.sigma_p,p.sigma_s,p.lookup_size,p.fast_approx); - else source.blur_anisotropic(tqmask,p.amplitude,p.sharpness,p.anisotropy,p.alpha,p.sigma,p.dl,p.da,p.gauss_prec, + else source.blur_anisotropic(mask,p.amplitude,p.sharpness,p.anisotropy,p.alpha,p.sigma,p.dl,p.da,p.gauss_prec, p.interpolation,p.fast_approx,p.gfact); } else { @@ -402,7 +402,7 @@ static void* greycstoration_thread(void *arg) { ye = y1 img = source.get_crop(x-b,y-b,z-b,xe+b,ye+b,ze+b,true); - CImg mask_tile = tqmask.is_empty()?tqmask:tqmask.get_crop(x-b,y-b,z-b,xe+b,ye+b,ze+b,true); + CImg mask_tile = mask.is_empty()?mask:mask.get_crop(x-b,y-b,z-b,xe+b,ye+b,ze+b,true); img.greycstoration_params[0] = p; greycstoration_mutex_unlock(p); if (p.patch_based) img.blur_patch(p.patch_size,p.sigma_p,p.sigma_s,p.lookup_size,p.fast_approx); @@ -421,7 +421,7 @@ static void* greycstoration_thread(void *arg) { xe = x1 img = source.get_crop(x-b,y-b,xe+b,ye+b,true); - CImg mask_tile = tqmask.is_empty()?tqmask:tqmask.get_crop(x-b,y-b,xe+b,ye+b,true); + CImg mask_tile = mask.is_empty()?mask:mask.get_crop(x-b,y-b,xe+b,ye+b,true); img.greycstoration_params[0] = p; greycstoration_mutex_unlock(p); if (p.patch_based) img.blur_patch(p.patch_size,p.sigma_p,p.sigma_s,p.lookup_size,p.fast_approx); @@ -446,7 +446,7 @@ static void* greycstoration_thread(void *arg) { if (p.counter) delete p.counter; if (p.temporary) { source = *(p.temporary); delete p.temporary; } if (p.stop_request) delete p.stop_request; - p.tqmask = 0; + p.mask = 0; p.amplitude = p.sharpness = p.anisotropy = p.alpha = p.sigma = p.gfact = p.dl = p.da = p.gauss_prec = p.sigma_s = p.sigma_p = 0; p.patch_size = p.interpolation = p.lookup_size = 0; p.fast_approx = false; diff --git a/digikam/libs/greycstoration/greycstorationiface.cpp b/digikam/libs/greycstoration/greycstorationiface.cpp index 98d311f1..6b866a6e 100644 --- a/digikam/libs/greycstoration/greycstorationiface.cpp +++ b/digikam/libs/greycstoration/greycstorationiface.cpp @@ -93,7 +93,7 @@ public: GreycstorationSettings settings; // Current Greycstoraion algorithm settings. CImg<> img; // Main image. - CImg tqmask; // The tqmask used with inpaint or resize mode + CImg mask; // The mask used with inpaint or resize mode }; GreycstorationIface::GreycstorationIface(DImg *orgImage, @@ -101,8 +101,8 @@ GreycstorationIface::GreycstorationIface(DImg *orgImage, int mode, int newWidth, int newHeight, const TQImage& inPaintingMask, - TQObject *tqparent) - : DImgThreadedFilter(orgImage, tqparent) + TQObject *parent) + : DImgThreadedFilter(orgImage, parent) { d = new GreycstorationIfacePriv; d->settings = settings; @@ -143,11 +143,11 @@ void GreycstorationIface::initFilter() if (m_parent) start(); // m_parent is valide, start thread ==> run() else - startComputation(); // no tqparent : no using thread. + startComputation(); // no parent : no using thread. } else // No image data { - if (m_parent) // If tqparent then send event about a problem. + if (m_parent) // If parent then send event about a problem. { postProgress(0, false, false); DDebug() << m_name << "::No valid image data !!! ..." << endl; @@ -332,23 +332,23 @@ void GreycstorationIface::inpainting() register int x, y; - d->tqmask = CImg(d->inPaintingMask.width(), d->inPaintingMask.height(), 1, 3); + d->mask = CImg(d->inPaintingMask.width(), d->inPaintingMask.height(), 1, 3); uchar *ptr = d->inPaintingMask.bits(); for (y = 0; y < d->inPaintingMask.height(); y++) { for (x = 0; x < d->inPaintingMask.width(); x++) { - d->tqmask(x, y, 0) = ptr[2]; // blue. - d->tqmask(x, y, 1) = ptr[1]; // green. - d->tqmask(x, y, 2) = ptr[0]; // red. + d->mask(x, y, 0) = ptr[2]; // blue. + d->mask(x, y, 1) = ptr[1]; // green. + d->mask(x, y, 2) = ptr[0]; // red. ptr += 4; } } } else { - DDebug() << "Inpainting image: tqmask is null!" << endl; + DDebug() << "Inpainting image: mask is null!" << endl; m_cancel = true; return; } @@ -358,7 +358,7 @@ void GreycstorationIface::inpainting() // This function will start a thread running one iteration of the GREYCstoration filter. // It returns immediately, so you can do what you want after (update a progress bar for // instance). - d->img.greycstoration_run(d->tqmask, + d->img.greycstoration_run(d->mask, d->settings.amplitude, d->settings.sharpness, d->settings.anisotropy, @@ -388,12 +388,12 @@ void GreycstorationIface::resize() int w = m_destImage.width(); int h = m_destImage.height(); - d->tqmask.assign(d->img.dimx(), d->img.dimy(), 1, 1, 255); + d->mask.assign(d->img.dimx(), d->img.dimy(), 1, 1, 255); if (!anchor) - d->tqmask.resize(w, h, 1, 1, 1); + d->mask.resize(w, h, 1, 1, 1); else - d->tqmask = !d->tqmask.resize(w, h, 1, 1, 4); + d->mask = !d->mask.resize(w, h, 1, 1, 4); d->img.resize(w, h, 1, -100, init); @@ -402,7 +402,7 @@ void GreycstorationIface::resize() // This function will start a thread running one iteration of the GREYCstoration filter. // It returns immediately, so you can do what you want after (update a progress bar for // instance). - d->img.greycstoration_run(d->tqmask, + d->img.greycstoration_run(d->mask, d->settings.amplitude, d->settings.sharpness, d->settings.anisotropy, diff --git a/digikam/libs/greycstoration/greycstorationiface.h b/digikam/libs/greycstoration/greycstorationiface.h index 8f3c57a0..fd7b248b 100644 --- a/digikam/libs/greycstoration/greycstorationiface.h +++ b/digikam/libs/greycstoration/greycstorationiface.h @@ -62,7 +62,7 @@ public: int mode=Restore, int newWidth=0, int newHeight=0, const TQImage& inPaintingMask=TQImage(), - TQObject *tqparent=0); + TQObject *parent=0); ~GreycstorationIface(); diff --git a/digikam/libs/greycstoration/greycstorationwidget.cpp b/digikam/libs/greycstoration/greycstorationwidget.cpp index 66cecb93..5a4bae78 100644 --- a/digikam/libs/greycstoration/greycstorationwidget.cpp +++ b/digikam/libs/greycstoration/greycstorationwidget.cpp @@ -58,7 +58,7 @@ public: GreycstorationWidgetPriv() { - tqparent = 0; + parent = 0; advancedPage = 0; alphaInput = 0; @@ -107,7 +107,7 @@ public: TQCheckBox *fastApproxCBox; - TQTabWidget *tqparent; + TQTabWidget *parent; RComboBox *interpolationBox; @@ -125,17 +125,17 @@ public: RIntNumInput *tileInput; }; -GreycstorationWidget::GreycstorationWidget(TQTabWidget *tqparent) - : TQObject(TQT_TQOBJECT(tqparent)) +GreycstorationWidget::GreycstorationWidget(TQTabWidget *parent) + : TQObject(TQT_TQOBJECT(parent)) { d = new GreycstorationWidgetPriv; - d->tqparent = tqparent; + d->parent = parent; // ------------------------------------------------------------- - d->generalPage = new TQWidget( tqparent ); + d->generalPage = new TQWidget( parent ); TQGridLayout* grid1 = new TQGridLayout(d->generalPage, 6, 2, KDialog::spacingHint()); - tqparent->addTab( d->generalPage, i18n("General") ); + parent->addTab( d->generalPage, i18n("General") ); d->sharpnessLabel = new TQLabel(i18n("Detail preservation:"), d->generalPage); d->sharpnessInput = new RDoubleNumInput(d->generalPage); @@ -195,9 +195,9 @@ GreycstorationWidget::GreycstorationWidget(TQTabWidget *tqparent) // ------------------------------------------------------------- - d->advancedPage = new TQWidget( tqparent ); + d->advancedPage = new TQWidget( parent ); TQGridLayout* grid2 = new TQGridLayout(d->advancedPage, 6, 2, KDialog::spacingHint()); - tqparent->addTab( d->advancedPage, i18n("Advanced Settings") ); + parent->addTab( d->advancedPage, i18n("Advanced Settings") ); d->daLabel = new TQLabel(i18n("Angular step:"), d->advancedPage); d->daInput = new RDoubleNumInput(d->advancedPage); @@ -262,8 +262,8 @@ void GreycstorationWidget::setEnabled(bool b) { d->generalPage->setEnabled(b); d->advancedPage->setEnabled(b); - d->tqparent->setTabEnabled(d->generalPage, b); - d->tqparent->setTabEnabled(d->advancedPage, b); + d->parent->setTabEnabled(d->generalPage, b); + d->parent->setTabEnabled(d->advancedPage, b); } void GreycstorationWidget::setSettings(GreycstorationSettings settings) diff --git a/digikam/libs/greycstoration/greycstorationwidget.h b/digikam/libs/greycstoration/greycstorationwidget.h index b8f56e8d..94c8c4cb 100644 --- a/digikam/libs/greycstoration/greycstorationwidget.h +++ b/digikam/libs/greycstoration/greycstorationwidget.h @@ -48,7 +48,7 @@ class DIGIKAM_EXPORT GreycstorationWidget : public TQObject public: - GreycstorationWidget(TQTabWidget *tqparent); + GreycstorationWidget(TQTabWidget *parent); ~GreycstorationWidget(); void setSettings(GreycstorationSettings settings); diff --git a/digikam/libs/histogram/imagehistogram.cpp b/digikam/libs/histogram/imagehistogram.cpp index ff685010..8e036b0d 100644 --- a/digikam/libs/histogram/imagehistogram.cpp +++ b/digikam/libs/histogram/imagehistogram.cpp @@ -69,7 +69,7 @@ public: ImageHistogramPriv() { - tqparent = 0; + parent = 0; imageData = 0; histogram = 0; runningFlag = true; @@ -86,44 +86,44 @@ public: /** Numbers of histogram segments dependaing of image bytes depth*/ int histoSegments; - /** To post event from thread to tqparent.*/ - TQObject *tqparent; + /** To post event from thread to parent.*/ + TQObject *parent; /** Used to stop thread during calculations.*/ bool runningFlag; }; -ImageHistogram::ImageHistogram(const DImg& image, TQObject *tqparent) +ImageHistogram::ImageHistogram(const DImg& image, TQObject *parent) : TQThread() { - setup(image.bits(), image.width(), image.height(), image.sixteenBit(), tqparent); + setup(image.bits(), image.width(), image.height(), image.sixteenBit(), parent); } -ImageHistogram::ImageHistogram(uchar *i_data, uint i_w, uint i_h, bool i_sixteenBits, TQObject *tqparent) +ImageHistogram::ImageHistogram(uchar *i_data, uint i_w, uint i_h, bool i_sixteenBits, TQObject *parent) : TQThread() { - setup(i_data, i_w, i_h, i_sixteenBits, tqparent); + setup(i_data, i_w, i_h, i_sixteenBits, parent); } -void ImageHistogram::setup(uchar *i_data, uint i_w, uint i_h, bool i_sixteenBits, TQObject *tqparent) +void ImageHistogram::setup(uchar *i_data, uint i_w, uint i_h, bool i_sixteenBits, TQObject *parent) { d = new ImageHistogramPriv; d->imageData = i_data; d->imageWidth = i_w; d->imageHeight = i_h; - d->tqparent = tqparent; + d->parent = parent; d->histoSegments = i_sixteenBits ? 65536 : 256; if (d->imageData && d->imageWidth && d->imageHeight) { - if (d->tqparent) + if (d->parent) start(); else calcHistogramValues(); } else { - if (d->tqparent) + if (d->parent) postProgress(false, false); } } @@ -149,7 +149,7 @@ void ImageHistogram::postProgress(bool starting, bool success) eventData->starting = starting; eventData->success = success; eventData->histogram = this; - TQApplication::postEvent(d->tqparent, new TQCustomEvent(TQEvent::User, eventData)); + TQApplication::postEvent(d->parent, new TQCustomEvent(TQEvent::User, eventData)); } void ImageHistogram::stopCalcHistogramValues(void) @@ -170,7 +170,7 @@ void ImageHistogram::calcHistogramValues() register uint i; int max; - if (d->tqparent) + if (d->parent) postProgress(true, false); d->histogram = new ImageHistogramPriv::double_packet[d->histoSegments]; @@ -180,7 +180,7 @@ void ImageHistogram::calcHistogramValues() { DWarning() << ("HistogramWidget::calcHistogramValues: Unable to allocate memory!") << endl; - if (d->tqparent) + if (d->parent) postProgress(false, false); return; @@ -239,7 +239,7 @@ void ImageHistogram::calcHistogramValues() } } - if (d->tqparent && d->runningFlag) + if (d->parent && d->runningFlag) postProgress(false, true); } diff --git a/digikam/libs/histogram/imagehistogram.h b/digikam/libs/histogram/imagehistogram.h index ad1b530b..6beb4919 100644 --- a/digikam/libs/histogram/imagehistogram.h +++ b/digikam/libs/histogram/imagehistogram.h @@ -73,12 +73,12 @@ public: public: - ImageHistogram(uchar *i_data, uint i_w, uint i_h, bool i_sixteenBits, TQObject *tqparent=0); + ImageHistogram(uchar *i_data, uint i_w, uint i_h, bool i_sixteenBits, TQObject *parent=0); - ImageHistogram(const DImg& image, TQObject *tqparent=0); + ImageHistogram(const DImg& image, TQObject *parent=0); ~ImageHistogram(); - void setup(uchar *i_data, uint i_w, uint i_h, bool i_sixteenBits, TQObject *tqparent); + void setup(uchar *i_data, uint i_w, uint i_h, bool i_sixteenBits, TQObject *parent); /** Method to stop threaded computations.*/ void stopCalcHistogramValues(void); diff --git a/digikam/libs/imageproperties/cameraitempropertiestab.cpp b/digikam/libs/imageproperties/cameraitempropertiestab.cpp index 14847d99..dd71c64e 100644 --- a/digikam/libs/imageproperties/cameraitempropertiestab.cpp +++ b/digikam/libs/imageproperties/cameraitempropertiestab.cpp @@ -156,8 +156,8 @@ public: KSqueezedTextLabel *labelPhotoWhiteBalance; }; -CameraItemPropertiesTab::CameraItemPropertiesTab(TQWidget* tqparent, bool navBar) - : NavigateBarTab(tqparent) +CameraItemPropertiesTab::CameraItemPropertiesTab(TQWidget* parent, bool navBar) + : NavigateBarTab(parent) { d = new CameraItemPropertiesTabPriv; diff --git a/digikam/libs/imageproperties/cameraitempropertiestab.h b/digikam/libs/imageproperties/cameraitempropertiestab.h index 241f652c..33a97b6a 100644 --- a/digikam/libs/imageproperties/cameraitempropertiestab.h +++ b/digikam/libs/imageproperties/cameraitempropertiestab.h @@ -51,7 +51,7 @@ class DIGIKAM_EXPORT CameraItemPropertiesTab : public NavigateBarTab public: - CameraItemPropertiesTab(TQWidget* tqparent, bool navBar=true); + CameraItemPropertiesTab(TQWidget* parent, bool navBar=true); ~CameraItemPropertiesTab(); void setCurrentItem(const GPItemInfo* itemInfo=0, diff --git a/digikam/libs/imageproperties/imagedescedittab.cpp b/digikam/libs/imageproperties/imagedescedittab.cpp index 865bd2a7..ff1f5947 100644 --- a/digikam/libs/imageproperties/imagedescedittab.cpp +++ b/digikam/libs/imageproperties/imagedescedittab.cpp @@ -134,8 +134,8 @@ public: MetadataHub hub; }; -ImageDescEditTab::ImageDescEditTab(TQWidget *tqparent, bool navBar) - : NavigateBarTab(tqparent) +ImageDescEditTab::ImageDescEditTab(TQWidget *parent, bool navBar) + : NavigateBarTab(parent) { d = new ImageDescEditTabPriv; @@ -1212,15 +1212,15 @@ void ImageDescEditTab::slotAlbumAdded(Album* a) } else { - TAlbumCheckListItem* tqparent = (TAlbumCheckListItem*)(tag->tqparent()->extraData(d->tagsView)); - if (!tqparent) + TAlbumCheckListItem* parent = (TAlbumCheckListItem*)(tag->parent()->extraData(d->tagsView)); + if (!parent) { - DWarning() << k_funcinfo << "Failed to find tqparent for Tag " << tag->title() + DWarning() << k_funcinfo << "Failed to find parent for Tag " << tag->title() << endl; return; } - viewItem = new TAlbumCheckListItem(tqparent, tag); + viewItem = new TAlbumCheckListItem(parent, tag); d->tagsSearchBar->lineEdit()->completionObject()->addItem(tag->title()); d->newTagEdit->lineEdit()->completionObject()->addItem(tag->tagPath()); d->newTagEdit->lineEdit()->completionObject()->addItem(tag->tagPath().remove(0, 1)); // without root "/" @@ -1274,9 +1274,9 @@ void ImageDescEditTab::slotAlbumMoved(TAlbum* tag, TAlbum* newParent) if (!item) return; - if (item->tqparent()) + if (item->parent()) { - TQListViewItem* oldPItem = item->tqparent(); + TQListViewItem* oldPItem = item->parent(); oldPItem->takeItem(item); } else @@ -1336,7 +1336,7 @@ void ImageDescEditTab::toggleParentTags(TAlbum *album, bool b) { if (!item->album()) continue; - if (item->album() == album->tqparent()) + if (item->album() == album->parent()) { item->setOn(b); toggleParentTags(item->album() , b); @@ -1509,7 +1509,7 @@ void ImageDescEditTab::updateRecentTags() icon = loader->getStandardTagIcon(album, AlbumThumbnailLoader::SmallerSize); } } - TQString text = album->title() + " (" + ((TAlbum*)album->tqparent())->prettyURL() + ')'; + TQString text = album->title() + " (" + ((TAlbum*)album->parent())->prettyURL() + ')'; menu->insertItem(icon, text, album->id()); } } @@ -1563,16 +1563,16 @@ void ImageDescEditTab::slotTagsSearchChanged(const TQString& filter) if (!match) { // check if any of the parents match the search - Album* tqparent = tag->tqparent(); - while (tqparent && !tqparent->isRoot()) + Album* parent = tag->parent(); + while (parent && !parent->isRoot()) { - if (tqparent->title().lower().contains(search)) + if (parent->title().lower().contains(search)) { match = true; break; } - tqparent = tqparent->tqparent(); + parent = parent->parent(); } } @@ -1653,12 +1653,12 @@ void ImageDescEditTab::slotAssignedTagsToggled(bool t) if (tagAssigned) { - Album* tqparent = tag->tqparent(); - while (tqparent && !tqparent->isRoot()) + Album* parent = tag->parent(); + while (parent && !parent->isRoot()) { - TAlbumCheckListItem *pitem = (TAlbumCheckListItem*)tqparent->extraData(d->tagsView); + TAlbumCheckListItem *pitem = (TAlbumCheckListItem*)parent->extraData(d->tagsView); pitem->setVisible(true); - tqparent = tqparent->tqparent(); + parent = parent->parent(); } } } diff --git a/digikam/libs/imageproperties/imagedescedittab.h b/digikam/libs/imageproperties/imagedescedittab.h index 6c7a2f7f..30f87224 100644 --- a/digikam/libs/imageproperties/imagedescedittab.h +++ b/digikam/libs/imageproperties/imagedescedittab.h @@ -54,7 +54,7 @@ class DIGIKAM_EXPORT ImageDescEditTab : public NavigateBarTab public: - ImageDescEditTab(TQWidget *tqparent, bool navBar=true); + ImageDescEditTab(TQWidget *parent, bool navBar=true); ~ImageDescEditTab(); void assignRating(int rating); diff --git a/digikam/libs/imageproperties/imagepropertiescolorstab.cpp b/digikam/libs/imageproperties/imagepropertiescolorstab.cpp index ea63fd12..4fe50c31 100644 --- a/digikam/libs/imageproperties/imagepropertiescolorstab.cpp +++ b/digikam/libs/imageproperties/imagepropertiescolorstab.cpp @@ -143,8 +143,8 @@ public: SharedLoadSaveThread *imageLoaderThread; }; -ImagePropertiesColorsTab::ImagePropertiesColorsTab(TQWidget* tqparent, bool navBar) - : NavigateBarTab(tqparent) +ImagePropertiesColorsTab::ImagePropertiesColorsTab(TQWidget* parent, bool navBar) + : NavigateBarTab(parent) { d = new ImagePropertiesColorsTabPriv; diff --git a/digikam/libs/imageproperties/imagepropertiescolorstab.h b/digikam/libs/imageproperties/imagepropertiescolorstab.h index 260dc109..baae0020 100644 --- a/digikam/libs/imageproperties/imagepropertiescolorstab.h +++ b/digikam/libs/imageproperties/imagepropertiescolorstab.h @@ -54,7 +54,7 @@ class DIGIKAM_EXPORT ImagePropertiesColorsTab : public NavigateBarTab public: - ImagePropertiesColorsTab(TQWidget* tqparent, bool navBar=true); + ImagePropertiesColorsTab(TQWidget* parent, bool navBar=true); ~ImagePropertiesColorsTab(); void setData(const KURL& url=KURL(), const TQRect &selectionArea = TQRect(), diff --git a/digikam/libs/imageproperties/imagepropertiesmetadatatab.cpp b/digikam/libs/imageproperties/imagepropertiesmetadatatab.cpp index 5ab9b9f8..43734c47 100644 --- a/digikam/libs/imageproperties/imagepropertiesmetadatatab.cpp +++ b/digikam/libs/imageproperties/imagepropertiesmetadatatab.cpp @@ -86,8 +86,8 @@ public: GPSWidget *gpsWidget; }; -ImagePropertiesMetaDataTab::ImagePropertiesMetaDataTab(TQWidget* tqparent, bool navBar) - : NavigateBarTab(tqparent) +ImagePropertiesMetaDataTab::ImagePropertiesMetaDataTab(TQWidget* parent, bool navBar) + : NavigateBarTab(parent) { d = new ImagePropertiesMetadataTabPriv; diff --git a/digikam/libs/imageproperties/imagepropertiesmetadatatab.h b/digikam/libs/imageproperties/imagepropertiesmetadatatab.h index 65314e74..ec2e598f 100644 --- a/digikam/libs/imageproperties/imagepropertiesmetadatatab.h +++ b/digikam/libs/imageproperties/imagepropertiesmetadatatab.h @@ -50,7 +50,7 @@ class DIGIKAM_EXPORT ImagePropertiesMetaDataTab : public NavigateBarTab public: - ImagePropertiesMetaDataTab(TQWidget* tqparent, bool navBar=true); + ImagePropertiesMetaDataTab(TQWidget* parent, bool navBar=true); ~ImagePropertiesMetaDataTab(); void setCurrentURL(const KURL& url=KURL()); diff --git a/digikam/libs/imageproperties/imagepropertiessidebar.cpp b/digikam/libs/imageproperties/imagepropertiessidebar.cpp index 826615a6..efb85a80 100644 --- a/digikam/libs/imageproperties/imagepropertiessidebar.cpp +++ b/digikam/libs/imageproperties/imagepropertiessidebar.cpp @@ -49,10 +49,10 @@ namespace Digikam { -ImagePropertiesSideBar::ImagePropertiesSideBar(TQWidget *tqparent, const char *name, +ImagePropertiesSideBar::ImagePropertiesSideBar(TQWidget *parent, const char *name, TQSplitter *splitter, Side side, bool mimimizedDefault, bool navBar) - : Sidebar(tqparent, name, side, mimimizedDefault) + : Sidebar(parent, name, side, mimimizedDefault) { m_image = 0; m_currentRect = TQRect(); @@ -60,9 +60,9 @@ ImagePropertiesSideBar::ImagePropertiesSideBar(TQWidget *tqparent, const char *n m_dirtyMetadataTab = false; m_dirtyColorTab = false; - m_propertiesTab = new ImagePropertiesTab(tqparent, navBar); - m_metadataTab = new ImagePropertiesMetaDataTab(tqparent, navBar); - m_colorTab = new ImagePropertiesColorsTab(tqparent, navBar); + m_propertiesTab = new ImagePropertiesTab(parent, navBar); + m_metadataTab = new ImagePropertiesMetaDataTab(parent, navBar); + m_colorTab = new ImagePropertiesColorsTab(parent, navBar); setSplitter(splitter); diff --git a/digikam/libs/imageproperties/imagepropertiessidebar.h b/digikam/libs/imageproperties/imagepropertiessidebar.h index 2210331e..cf139e6e 100644 --- a/digikam/libs/imageproperties/imagepropertiessidebar.h +++ b/digikam/libs/imageproperties/imagepropertiessidebar.h @@ -53,7 +53,7 @@ class DIGIKAM_EXPORT ImagePropertiesSideBar : public Sidebar public: - ImagePropertiesSideBar(TQWidget* tqparent, const char *name, TQSplitter *splitter, + ImagePropertiesSideBar(TQWidget* parent, const char *name, TQSplitter *splitter, Side side=Left, bool mimimizedDefault=false, bool navBar=false); ~ImagePropertiesSideBar(); diff --git a/digikam/libs/imageproperties/imagepropertiessidebarcamgui.cpp b/digikam/libs/imageproperties/imagepropertiessidebarcamgui.cpp index 59dcdec6..018ca408 100644 --- a/digikam/libs/imageproperties/imagepropertiessidebarcamgui.cpp +++ b/digikam/libs/imageproperties/imagepropertiessidebarcamgui.cpp @@ -87,14 +87,14 @@ public: CameraItemPropertiesTab *cameraItemTab; }; -ImagePropertiesSideBarCamGui::ImagePropertiesSideBarCamGui(TQWidget *tqparent, const char *name, +ImagePropertiesSideBarCamGui::ImagePropertiesSideBarCamGui(TQWidget *parent, const char *name, TQSplitter *splitter, Side side, bool mimimizedDefault) - : Sidebar(tqparent, name, side, mimimizedDefault) + : Sidebar(parent, name, side, mimimizedDefault) { d = new ImagePropertiesSideBarCamGuiPriv; - d->cameraItemTab = new CameraItemPropertiesTab(tqparent, true); - d->metadataTab = new ImagePropertiesMetaDataTab(tqparent, true); + d->cameraItemTab = new CameraItemPropertiesTab(parent, true); + d->metadataTab = new ImagePropertiesMetaDataTab(parent, true); setSplitter(splitter); diff --git a/digikam/libs/imageproperties/imagepropertiessidebarcamgui.h b/digikam/libs/imageproperties/imagepropertiessidebarcamgui.h index 0cda10e0..97943ca6 100644 --- a/digikam/libs/imageproperties/imagepropertiessidebarcamgui.h +++ b/digikam/libs/imageproperties/imagepropertiessidebarcamgui.h @@ -53,7 +53,7 @@ class DIGIKAM_EXPORT ImagePropertiesSideBarCamGui : public Sidebar public: - ImagePropertiesSideBarCamGui(TQWidget* tqparent, const char *name, TQSplitter *splitter, + ImagePropertiesSideBarCamGui(TQWidget* parent, const char *name, TQSplitter *splitter, Side side=Left, bool mimimizedDefault=false); ~ImagePropertiesSideBarCamGui(); diff --git a/digikam/libs/imageproperties/imagepropertiessidebardb.cpp b/digikam/libs/imageproperties/imagepropertiessidebardb.cpp index 5cbf55a3..a1b76f9b 100644 --- a/digikam/libs/imageproperties/imagepropertiessidebardb.cpp +++ b/digikam/libs/imageproperties/imagepropertiessidebardb.cpp @@ -79,14 +79,14 @@ public: bool hasImageInfoOwnership; }; -ImagePropertiesSideBarDB::ImagePropertiesSideBarDB(TQWidget *tqparent, const char *name, TQSplitter *splitter, +ImagePropertiesSideBarDB::ImagePropertiesSideBarDB(TQWidget *parent, const char *name, TQSplitter *splitter, Side side, bool mimimizedDefault) - : ImagePropertiesSideBar(tqparent, name, splitter, side, mimimizedDefault, false) + : ImagePropertiesSideBar(parent, name, splitter, side, mimimizedDefault, false) { - // Navigate bar is disabled by passing false to tqparent class constructor, and tab constructors + // Navigate bar is disabled by passing false to parent class constructor, and tab constructors d = new ImagePropertiesSideBarDBPriv; - d->desceditTab = new ImageDescEditTab(tqparent, false); + d->desceditTab = new ImageDescEditTab(parent, false); appendTab(d->desceditTab, SmallIcon("imagecomment"), i18n("Captions/Tags")); diff --git a/digikam/libs/imageproperties/imagepropertiessidebardb.h b/digikam/libs/imageproperties/imagepropertiessidebardb.h index 48a5b903..2e903b7f 100644 --- a/digikam/libs/imageproperties/imagepropertiessidebardb.h +++ b/digikam/libs/imageproperties/imagepropertiessidebardb.h @@ -60,7 +60,7 @@ class DIGIKAM_EXPORT ImagePropertiesSideBarDB : public ImagePropertiesSideBar public: - ImagePropertiesSideBarDB(TQWidget* tqparent, const char *name, TQSplitter *splitter, Side side=Left, + ImagePropertiesSideBarDB(TQWidget* parent, const char *name, TQSplitter *splitter, Side side=Left, bool mimimizedDefault=false); ~ImagePropertiesSideBarDB(); diff --git a/digikam/libs/imageproperties/imagepropertiestab.cpp b/digikam/libs/imageproperties/imagepropertiestab.cpp index 9a26ddf3..0d4b3ac0 100644 --- a/digikam/libs/imageproperties/imagepropertiestab.cpp +++ b/digikam/libs/imageproperties/imagepropertiestab.cpp @@ -169,8 +169,8 @@ public: KSqueezedTextLabel *labelPhotoWhiteBalance; }; -ImagePropertiesTab::ImagePropertiesTab(TQWidget* tqparent, bool navBar) - : NavigateBarTab(tqparent) +ImagePropertiesTab::ImagePropertiesTab(TQWidget* parent, bool navBar) + : NavigateBarTab(parent) { d = new ImagePropertiesTabPriv; diff --git a/digikam/libs/imageproperties/imagepropertiestab.h b/digikam/libs/imageproperties/imagepropertiestab.h index 1e8155d7..7f94366f 100644 --- a/digikam/libs/imageproperties/imagepropertiestab.h +++ b/digikam/libs/imageproperties/imagepropertiestab.h @@ -51,7 +51,7 @@ class DIGIKAM_EXPORT ImagePropertiesTab : public NavigateBarTab public: - ImagePropertiesTab(TQWidget* tqparent, bool navBar=true); + ImagePropertiesTab(TQWidget* parent, bool navBar=true); ~ImagePropertiesTab(); void setCurrentURL(const KURL& url=KURL()); diff --git a/digikam/libs/imageproperties/navigatebartab.cpp b/digikam/libs/imageproperties/navigatebartab.cpp index a6fd7875..92e975b0 100644 --- a/digikam/libs/imageproperties/navigatebartab.cpp +++ b/digikam/libs/imageproperties/navigatebartab.cpp @@ -4,7 +4,7 @@ * http://www.digikam.org * * Date : 2007-01-04 - * Description : A tqparent tab class with a navigation bar + * Description : A parent tab class with a navigation bar * * Copyright (C) 2006-2007 by Gilles Caulier * Copyright (C) 2007 by Marcel Wiesweg @@ -56,8 +56,8 @@ public: NavigateBarWidget *navigateBar; }; -NavigateBarTab::NavigateBarTab(TQWidget* tqparent) - : TQWidget(tqparent, 0, TQt::WDestructiveClose) +NavigateBarTab::NavigateBarTab(TQWidget* parent) + : TQWidget(parent, 0, TQt::WDestructiveClose) { d = new NavigateBarTabPriv; m_navigateBarLayout = 0; diff --git a/digikam/libs/imageproperties/navigatebartab.h b/digikam/libs/imageproperties/navigatebartab.h index 5f8b3d5a..e7c56897 100644 --- a/digikam/libs/imageproperties/navigatebartab.h +++ b/digikam/libs/imageproperties/navigatebartab.h @@ -4,7 +4,7 @@ * http://www.digikam.org * * Date : 2007-01-04 - * Description : A tqparent tab class with a navigation bar + * Description : A parent tab class with a navigation bar * * Copyright (C) 2006-2007 by Gilles Caulier * Copyright (C) 2007 by Marcel Wiesweg @@ -54,7 +54,7 @@ class DIGIKAM_EXPORT NavigateBarTab : public TQWidget public: - NavigateBarTab(TQWidget* tqparent); + NavigateBarTab(TQWidget* parent); ~NavigateBarTab(); void setNavigateBarState(bool hasPrevious, bool hasNext); diff --git a/digikam/libs/imageproperties/navigatebarwidget.cpp b/digikam/libs/imageproperties/navigatebarwidget.cpp index 28c04b08..ea01df03 100644 --- a/digikam/libs/imageproperties/navigatebarwidget.cpp +++ b/digikam/libs/imageproperties/navigatebarwidget.cpp @@ -55,8 +55,8 @@ public: StatusNavigateBar *navBar; }; -NavigateBarWidget::NavigateBarWidget(TQWidget *tqparent, bool show) - : TQWidget(tqparent, 0, TQt::WDestructiveClose) +NavigateBarWidget::NavigateBarWidget(TQWidget *parent, bool show) + : TQWidget(parent, 0, TQt::WDestructiveClose) { d = new NavigateBarWidgetPriv; diff --git a/digikam/libs/imageproperties/navigatebarwidget.h b/digikam/libs/imageproperties/navigatebarwidget.h index 2e96b361..89d4358a 100644 --- a/digikam/libs/imageproperties/navigatebarwidget.h +++ b/digikam/libs/imageproperties/navigatebarwidget.h @@ -45,7 +45,7 @@ Q_OBJECT public: - NavigateBarWidget(TQWidget *tqparent=0, bool show=true); + NavigateBarWidget(TQWidget *parent=0, bool show=true); ~NavigateBarWidget(); void setFileName(TQString filename=TQString()); diff --git a/digikam/libs/imageproperties/talbumlistview.cpp b/digikam/libs/imageproperties/talbumlistview.cpp index aebfbb4a..6798b195 100644 --- a/digikam/libs/imageproperties/talbumlistview.cpp +++ b/digikam/libs/imageproperties/talbumlistview.cpp @@ -67,8 +67,8 @@ extern "C" namespace Digikam { -TAlbumCheckListItem::TAlbumCheckListItem(TQListView* tqparent, TAlbum* album) - : FolderCheckListItem(tqparent, album->title(), TQCheckListItem::RadioButtonController) +TAlbumCheckListItem::TAlbumCheckListItem(TQListView* parent, TAlbum* album) + : FolderCheckListItem(parent, album->title(), TQCheckListItem::RadioButtonController) { setDragEnabled(true); m_album = album; @@ -78,8 +78,8 @@ TAlbumCheckListItem::TAlbumCheckListItem(TQListView* tqparent, TAlbum* album) m_album->setExtraData(listView(), this); } -TAlbumCheckListItem::TAlbumCheckListItem(TQCheckListItem* tqparent, TAlbum* album) - : FolderCheckListItem(tqparent, album->title(), TQCheckListItem::CheckBox) +TAlbumCheckListItem::TAlbumCheckListItem(TQCheckListItem* parent, TAlbum* album) + : FolderCheckListItem(parent, album->title(), TQCheckListItem::CheckBox) { setDragEnabled(true); m_album = album; @@ -94,7 +94,7 @@ void TAlbumCheckListItem::refresh() if (!m_album) return; if (AlbumSettings::instance()->getShowFolderTreeViewItemsCount() && - dynamic_cast(tqparent())) + dynamic_cast(parent())) { if (isOpen()) setText(0, TQString("%1 (%2)").tqarg(m_album->title()).tqarg(m_count)); @@ -167,8 +167,8 @@ void TAlbumCheckListItem::settqStatus(MetadataHub::TagtqStatus status) // ------------------------------------------------------------------------ -TAlbumListView::TAlbumListView(TQWidget* tqparent) - : FolderView(tqparent, "TAlbumListView") +TAlbumListView::TAlbumListView(TQWidget* parent) + : FolderView(parent, "TAlbumListView") { addColumn(i18n("Tags")); header()->hide(); @@ -198,7 +198,7 @@ TQDragObject* TAlbumListView::dragObject() if(!item) return 0; - if(!item->tqparent()) + if(!item->parent()) return 0; TagDrag *t = new TagDrag(item->id(), this); @@ -223,14 +223,14 @@ bool TAlbumListView::acceptDrop(const TQDropEvent *e) const if(itemDrag == itemDrop) return false; - // Dragging a tqparent on its child makes no sense + // Dragging a parent on its child makes no sense if(itemDrag && itemDrag->album()->isAncestorOf(itemDrop->album())) return false; return true; } - if (ItemDrag::canDecode(e) && itemDrop && itemDrop->album()->tqparent()) + if (ItemDrag::canDecode(e) && itemDrop && itemDrop->album()->parent()) { // Only other possibility is image items being dropped // And allow this only if there is a Tag to be dropped diff --git a/digikam/libs/imageproperties/talbumlistview.h b/digikam/libs/imageproperties/talbumlistview.h index 4b379fe3..94b1186f 100644 --- a/digikam/libs/imageproperties/talbumlistview.h +++ b/digikam/libs/imageproperties/talbumlistview.h @@ -43,9 +43,9 @@ class DIGIKAM_EXPORT TAlbumCheckListItem : public FolderCheckListItem { public: - TAlbumCheckListItem(TQListView* tqparent, TAlbum* album); + TAlbumCheckListItem(TQListView* parent, TAlbum* album); - TAlbumCheckListItem(TQCheckListItem* tqparent, TAlbum* album); + TAlbumCheckListItem(TQCheckListItem* parent, TAlbum* album); void settqStatus(MetadataHub::TagtqStatus status); void refresh(); @@ -75,7 +75,7 @@ class DIGIKAM_EXPORT TAlbumListView : public FolderView public: - TAlbumListView(TQWidget* tqparent); + TAlbumListView(TQWidget* parent); ~TAlbumListView(); void stateChanged(TAlbumCheckListItem *item); diff --git a/digikam/libs/lprof/cmspcoll.cpp b/digikam/libs/lprof/cmspcoll.cpp index 2acd92ba..0b03fd5a 100644 --- a/digikam/libs/lprof/cmspcoll.cpp +++ b/digikam/libs/lprof/cmspcoll.cpp @@ -101,7 +101,7 @@ BOOL EqualsTo(const char* a, const char *b) } -/* Does return a bitwise tqmask holding the measurements contained in a Sheet */ +/* Does return a bitwise mask holding the measurements contained in a Sheet */ static DWORD MaskOfDataSet(LCMSHANDLE hSheet) @@ -243,7 +243,7 @@ BOOL cmsxPCollLoadFromSheet(LPMEASUREMENT m, LCMSHANDLE hSheet) } - /* Build tqmask according to data format */ + /* Build mask according to data format */ dwMask = MaskOfDataSet(hSheet); @@ -253,7 +253,7 @@ BOOL cmsxPCollLoadFromSheet(LPMEASUREMENT m, LCMSHANDLE hSheet) LPPATCH Patch = m -> Patches + i; - /* Fill in data according to tqmask */ + /* Fill in data according to mask */ if (dwMask & PATCH_HAS_Lab) { @@ -307,7 +307,7 @@ BOOL cmsxPCollSaveToSheet(LPMEASUREMENT m, LCMSHANDLE it8) DWORD dwMask = 0; int i; - /* Find tqmask of fields */ + /* Find mask of fields */ for (i=0; i < m ->nPatches; i++) { if (m ->Allowed[i]) { @@ -416,7 +416,7 @@ void FixLabOnly(LPMEASUREMENT m) /* Higher level function. Does merge reference and measurement sheet into */ /* a MEASUREMENT struct. Data to keep is described in dwNeededSamplesType */ -/* tqmask as follows: */ +/* mask as follows: */ /* */ /* PATCH_HAS_Lab 0x00000001 */ /* PATCH_HAS_XYZ 0x00000002 */ diff --git a/digikam/libs/thumbbar/thumbbar.cpp b/digikam/libs/thumbbar/thumbbar.cpp index 1673e84d..091c0554 100644 --- a/digikam/libs/thumbbar/thumbbar.cpp +++ b/digikam/libs/thumbbar/thumbbar.cpp @@ -152,9 +152,9 @@ public: // ------------------------------------------------------------------------- -ThumbBarView::ThumbBarView(TQWidget* tqparent, int orientation, bool exifRotate, +ThumbBarView::ThumbBarView(TQWidget* parent, int orientation, bool exifRotate, ThumbBarToolTipSettings settings) - : TQScrollView(tqparent) + : TQScrollView(parent) { d = new ThumbBarViewPriv; d->orientation = orientation; @@ -882,8 +882,8 @@ void ThumbBarItem::tqrepaint() // ------------------------------------------------------------------------- -ThumbBarToolTip::ThumbBarToolTip(ThumbBarView* tqparent) - : TQToolTip(tqparent->viewport()), m_maxStringLen(30), m_view(tqparent) +ThumbBarToolTip::ThumbBarToolTip(ThumbBarView* parent) + : TQToolTip(parent->viewport()), m_maxStringLen(30), m_view(parent) { m_headBeg = TQString("" ""); diff --git a/digikam/libs/thumbbar/thumbbar.h b/digikam/libs/thumbbar/thumbbar.h index 8789d150..1891597d 100644 --- a/digikam/libs/thumbbar/thumbbar.h +++ b/digikam/libs/thumbbar/thumbbar.h @@ -100,7 +100,7 @@ public: public: - ThumbBarView(TQWidget* tqparent, int orientation=Vertical, bool exifRotate=true, + ThumbBarView(TQWidget* parent, int orientation=Vertical, bool exifRotate=true, ThumbBarToolTipSettings settings=ThumbBarToolTipSettings()); virtual ~ThumbBarView(); @@ -204,7 +204,7 @@ class DIGIKAM_EXPORT ThumbBarToolTip : public TQToolTip public: - ThumbBarToolTip(ThumbBarView *tqparent); + ThumbBarToolTip(ThumbBarView *parent); virtual ~ThumbBarToolTip(){}; protected: diff --git a/digikam/libs/widgets/common/colorgradientwidget.cpp b/digikam/libs/widgets/common/colorgradientwidget.cpp index 13fdbc69..04426dcf 100644 --- a/digikam/libs/widgets/common/colorgradientwidget.cpp +++ b/digikam/libs/widgets/common/colorgradientwidget.cpp @@ -52,8 +52,8 @@ public: TQColor color2; }; -ColorGradientWidget::ColorGradientWidget(int o, int size, TQWidget *tqparent) - : TQFrame(tqparent, 0, TQt::WDestructiveClose) +ColorGradientWidget::ColorGradientWidget(int o, int size, TQWidget *parent) + : TQFrame(parent, 0, TQt::WDestructiveClose) { d = new ColorGradientWidgetPriv; d->orientation = o; diff --git a/digikam/libs/widgets/common/colorgradientwidget.h b/digikam/libs/widgets/common/colorgradientwidget.h index d9aef44d..48195869 100644 --- a/digikam/libs/widgets/common/colorgradientwidget.h +++ b/digikam/libs/widgets/common/colorgradientwidget.h @@ -53,7 +53,7 @@ public: public: - ColorGradientWidget( int o, int size, TQWidget *tqparent=0 ); + ColorGradientWidget( int o, int size, TQWidget *parent=0 ); ~ColorGradientWidget(); diff --git a/digikam/libs/widgets/common/curveswidget.cpp b/digikam/libs/widgets/common/curveswidget.cpp index 41ab2200..d4641164 100644 --- a/digikam/libs/widgets/common/curveswidget.cpp +++ b/digikam/libs/widgets/common/curveswidget.cpp @@ -107,8 +107,8 @@ public: }; -CurvesWidget::CurvesWidget(int w, int h, TQWidget *tqparent, bool readOnly) - : TQWidget(tqparent, 0, TQt::WDestructiveClose) +CurvesWidget::CurvesWidget(int w, int h, TQWidget *parent, bool readOnly) + : TQWidget(parent, 0, TQt::WDestructiveClose) { d = new CurvesWidgetPriv; @@ -117,8 +117,8 @@ CurvesWidget::CurvesWidget(int w, int h, TQWidget *tqparent, bool readOnly) CurvesWidget::CurvesWidget(int w, int h, uchar *i_data, uint i_w, uint i_h, bool i_sixteenBits, - TQWidget *tqparent, bool readOnly) - : TQWidget(tqparent, 0, TQt::WDestructiveClose) + TQWidget *parent, bool readOnly) + : TQWidget(parent, 0, TQt::WDestructiveClose) { d = new CurvesWidgetPriv; diff --git a/digikam/libs/widgets/common/curveswidget.h b/digikam/libs/widgets/common/curveswidget.h index a3c397bf..50818518 100644 --- a/digikam/libs/widgets/common/curveswidget.h +++ b/digikam/libs/widgets/common/curveswidget.h @@ -66,12 +66,12 @@ public: public: - CurvesWidget(int w, int h, TQWidget *tqparent, bool readOnly=false); + CurvesWidget(int w, int h, TQWidget *parent, bool readOnly=false); CurvesWidget(int w, int h, // Widget size. uchar *i_data, uint i_w, uint i_h, // Full image info. bool i_sixteenBits, // 8 or 16 bits image. - TQWidget *tqparent=0, // Parent widget instance. + TQWidget *parent=0, // Parent widget instance. bool readOnly=false); // If true : widget with full edition mode capabilities. // If false : display curve data only without edition. diff --git a/digikam/libs/widgets/common/dcursortracker.cpp b/digikam/libs/widgets/common/dcursortracker.cpp index 0d718c12..fc820603 100644 --- a/digikam/libs/widgets/common/dcursortracker.cpp +++ b/digikam/libs/widgets/common/dcursortracker.cpp @@ -34,11 +34,11 @@ namespace Digikam { -DCursorTracker::DCursorTracker(const TQString& txt, TQWidget *tqparent) +DCursorTracker::DCursorTracker(const TQString& txt, TQWidget *parent) : TQLabel(txt, 0, "", WX11BypassWM) { - tqparent->setMouseTracking(true); - tqparent->installEventFilter(this); + parent->setMouseTracking(true); + parent->installEventFilter(this); setEnable(true); } @@ -97,8 +97,8 @@ bool DCursorTracker::eventFilter(TQObject *object, TQEvent *e) } -DTipTracker::DTipTracker(const TQString& txt, TQWidget *tqparent) - : DCursorTracker(txt, tqparent) +DTipTracker::DTipTracker(const TQString& txt, TQWidget *parent) + : DCursorTracker(txt, parent) { setPalette(TQToolTip::palette()); setFrameStyle(TQFrame::Plain | TQFrame::Box); diff --git a/digikam/libs/widgets/common/dcursortracker.h b/digikam/libs/widgets/common/dcursortracker.h index 88665841..33d322e1 100644 --- a/digikam/libs/widgets/common/dcursortracker.h +++ b/digikam/libs/widgets/common/dcursortracker.h @@ -45,7 +45,7 @@ class DIGIKAM_EXPORT DCursorTracker : public TQLabel public: - DCursorTracker(const TQString& txt, TQWidget *tqparent); + DCursorTracker(const TQString& txt, TQWidget *parent); void setText(const TQString& txt); void setEnable(bool b); @@ -68,7 +68,7 @@ class DTipTracker : public DCursorTracker public: - DTipTracker(const TQString& txt, TQWidget *tqparent); + DTipTracker(const TQString& txt, TQWidget *parent); }; } // namespace Digikam diff --git a/digikam/libs/widgets/common/dlogoaction.cpp b/digikam/libs/widgets/common/dlogoaction.cpp index d4b81ab2..de82a75f 100644 --- a/digikam/libs/widgets/common/dlogoaction.cpp +++ b/digikam/libs/widgets/common/dlogoaction.cpp @@ -43,8 +43,8 @@ namespace Digikam { -DLogoAction::DLogoAction(TQObject* tqparent, const char* name) - : KAction(tqparent, name) +DLogoAction::DLogoAction(TQObject* parent, const char* name) + : KAction(parent, name) { setText("digikam.org"); setIcon("digikam"); diff --git a/digikam/libs/widgets/common/dlogoaction.h b/digikam/libs/widgets/common/dlogoaction.h index 8c05667c..e06eb1c3 100644 --- a/digikam/libs/widgets/common/dlogoaction.h +++ b/digikam/libs/widgets/common/dlogoaction.h @@ -42,7 +42,7 @@ class DIGIKAM_EXPORT DLogoAction : public KAction public: - DLogoAction(TQObject* tqparent, const char* name=0); + DLogoAction(TQObject* parent, const char* name=0); virtual int plug(TQWidget *widget, int index=-1); diff --git a/digikam/libs/widgets/common/dpopupmenu.cpp b/digikam/libs/widgets/common/dpopupmenu.cpp index d68b9953..10bcef09 100644 --- a/digikam/libs/widgets/common/dpopupmenu.cpp +++ b/digikam/libs/widgets/common/dpopupmenu.cpp @@ -48,8 +48,8 @@ namespace Digikam static TQImage s_dpopupmenu_sidePixmap; static TQColor s_dpopupmenu_sidePixmapColor; -DPopupMenu::DPopupMenu(TQWidget* tqparent, const char* name) - : KPopupMenu(tqparent, name) +DPopupMenu::DPopupMenu(TQWidget* parent, const char* name) + : KPopupMenu(parent, name) { // Must be initialized so that we know the size on first invocation if ( s_dpopupmenu_sidePixmap.isNull() ) diff --git a/digikam/libs/widgets/common/dpopupmenu.h b/digikam/libs/widgets/common/dpopupmenu.h index 96f6a8aa..a9a55e57 100644 --- a/digikam/libs/widgets/common/dpopupmenu.h +++ b/digikam/libs/widgets/common/dpopupmenu.h @@ -51,7 +51,7 @@ class DIGIKAM_EXPORT DPopupMenu : public KPopupMenu public: - DPopupMenu(TQWidget *tqparent=0, const char *name=0); + DPopupMenu(TQWidget *parent=0, const char *name=0); ~DPopupMenu(); int sidePixmapWidth() const; diff --git a/digikam/libs/widgets/common/filesaveoptionsbox.cpp b/digikam/libs/widgets/common/filesaveoptionsbox.cpp index eb4d4f88..8059bbd9 100644 --- a/digikam/libs/widgets/common/filesaveoptionsbox.cpp +++ b/digikam/libs/widgets/common/filesaveoptionsbox.cpp @@ -82,8 +82,8 @@ public: JP2KSettings *JPEG2000Options; }; -FileSaveOptionsBox::FileSaveOptionsBox(TQWidget *tqparent) - : TQWidgetStack(tqparent, 0, TQt::WDestructiveClose) +FileSaveOptionsBox::FileSaveOptionsBox(TQWidget *parent) + : TQWidgetStack(parent, 0, TQt::WDestructiveClose) { d = new FileSaveOptionsBoxPriv; diff --git a/digikam/libs/widgets/common/filesaveoptionsbox.h b/digikam/libs/widgets/common/filesaveoptionsbox.h index ea81927b..c25b76c1 100644 --- a/digikam/libs/widgets/common/filesaveoptionsbox.h +++ b/digikam/libs/widgets/common/filesaveoptionsbox.h @@ -47,7 +47,7 @@ Q_OBJECT public: - FileSaveOptionsBox(TQWidget *tqparent=0); + FileSaveOptionsBox(TQWidget *parent=0); ~FileSaveOptionsBox(); void applySettings(); diff --git a/digikam/libs/widgets/common/histogramwidget.cpp b/digikam/libs/widgets/common/histogramwidget.cpp index 3bb49d42..b88ddb9d 100644 --- a/digikam/libs/widgets/common/histogramwidget.cpp +++ b/digikam/libs/widgets/common/histogramwidget.cpp @@ -110,9 +110,9 @@ public: // Constructor without image data (needed to use updateData() method after instance created). HistogramWidget::HistogramWidget(int w, int h, - TQWidget *tqparent, bool selectMode, + TQWidget *parent, bool selectMode, bool showProgress, bool statisticsVisible) - : TQWidget(tqparent, 0, TQt::WDestructiveClose) + : TQWidget(parent, 0, TQt::WDestructiveClose) { d = new HistogramWidgetPriv; setup(w, h, selectMode, showProgress, statisticsVisible); @@ -126,9 +126,9 @@ HistogramWidget::HistogramWidget(int w, int h, HistogramWidget::HistogramWidget(int w, int h, uchar *i_data, uint i_w, uint i_h, bool i_sixteenBits, - TQWidget *tqparent, bool selectMode, + TQWidget *parent, bool selectMode, bool showProgress, bool statisticsVisible) - : TQWidget(tqparent, 0, TQt::WDestructiveClose) + : TQWidget(parent, 0, TQt::WDestructiveClose) { d = new HistogramWidgetPriv; d->sixteenBits = i_sixteenBits; @@ -144,9 +144,9 @@ HistogramWidget::HistogramWidget(int w, int h, uchar *i_data, uint i_w, uint i_h, uchar *s_data, uint s_w, uint s_h, bool i_sixteenBits, - TQWidget *tqparent, bool selectMode, + TQWidget *parent, bool selectMode, bool showProgress, bool statisticsVisible) - : TQWidget(tqparent, 0, TQt::WDestructiveClose) + : TQWidget(parent, 0, TQt::WDestructiveClose) { d = new HistogramWidgetPriv; d->sixteenBits = i_sixteenBits; diff --git a/digikam/libs/widgets/common/histogramwidget.h b/digikam/libs/widgets/common/histogramwidget.h index 01d0abe7..1bf3b59f 100644 --- a/digikam/libs/widgets/common/histogramwidget.h +++ b/digikam/libs/widgets/common/histogramwidget.h @@ -81,7 +81,7 @@ public: /** Constructor without image data. Needed to use updateData() method after to create instance.*/ HistogramWidget(int w, int h, // Widget size. - TQWidget *tqparent=0, bool selectMode=true, + TQWidget *parent=0, bool selectMode=true, bool showProgress=true, bool statisticsVisible=false); @@ -89,7 +89,7 @@ public: HistogramWidget(int w, int h, // Widget size. uchar *i_data, uint i_w, uint i_h, // Full image info. bool i_sixteenBits, // 8 or 16 bits image. - TQWidget *tqparent=0, bool selectMode=true, + TQWidget *parent=0, bool selectMode=true, bool showProgress=true, bool statisticsVisible=false); @@ -98,7 +98,7 @@ public: uchar *i_data, uint i_w, uint i_h, // Full image info. uchar *s_data, uint s_w, uint s_h, // Image selection info. bool i_sixteenBits, // 8 or 16 bits image. - TQWidget *tqparent=0, bool selectMode=true, + TQWidget *parent=0, bool selectMode=true, bool showProgress=true, bool statisticsVisible=false); diff --git a/digikam/libs/widgets/common/paniconwidget.cpp b/digikam/libs/widgets/common/paniconwidget.cpp index 2591ad68..7f7fcc3d 100644 --- a/digikam/libs/widgets/common/paniconwidget.cpp +++ b/digikam/libs/widgets/common/paniconwidget.cpp @@ -66,8 +66,8 @@ public: TQImage image; }; -PanIconWidget::PanIconWidget(TQWidget *tqparent, WFlags flags) - : TQWidget(tqparent, 0, flags) +PanIconWidget::PanIconWidget(TQWidget *parent, WFlags flags) + : TQWidget(parent, 0, flags) { d = new PanIconWidgetPriv; m_flicker = false; diff --git a/digikam/libs/widgets/common/paniconwidget.h b/digikam/libs/widgets/common/paniconwidget.h index 807f9647..ee2524d3 100644 --- a/digikam/libs/widgets/common/paniconwidget.h +++ b/digikam/libs/widgets/common/paniconwidget.h @@ -48,7 +48,7 @@ Q_OBJECT public: - PanIconWidget(TQWidget *tqparent=0, WFlags flags=TQt::WDestructiveClose); + PanIconWidget(TQWidget *parent=0, WFlags flags=TQt::WDestructiveClose); ~PanIconWidget(); void setImage(int previewWidth, int previewHeight, const TQImage& image); diff --git a/digikam/libs/widgets/common/previewwidget.cpp b/digikam/libs/widgets/common/previewwidget.cpp index 700a45ba..f6795d0c 100644 --- a/digikam/libs/widgets/common/previewwidget.cpp +++ b/digikam/libs/widgets/common/previewwidget.cpp @@ -97,8 +97,8 @@ public: TQColor bgColor; }; -PreviewWidget::PreviewWidget(TQWidget *tqparent) - : TQScrollView(tqparent, 0, TQt::WDestructiveClose) +PreviewWidget::PreviewWidget(TQWidget *parent) + : TQScrollView(parent, 0, TQt::WDestructiveClose) { d = new PreviewWidgetPriv; d->bgColor.setRgb(0, 0, 0); diff --git a/digikam/libs/widgets/common/previewwidget.h b/digikam/libs/widgets/common/previewwidget.h index 67bf1e82..9ceea66a 100644 --- a/digikam/libs/widgets/common/previewwidget.h +++ b/digikam/libs/widgets/common/previewwidget.h @@ -48,7 +48,7 @@ Q_OBJECT public: - PreviewWidget(TQWidget *tqparent=0); + PreviewWidget(TQWidget *parent=0); ~PreviewWidget(); void setZoomFactor(double z); diff --git a/digikam/libs/widgets/common/searchtextbar.cpp b/digikam/libs/widgets/common/searchtextbar.cpp index 219d0a79..e7f9e733 100644 --- a/digikam/libs/widgets/common/searchtextbar.cpp +++ b/digikam/libs/widgets/common/searchtextbar.cpp @@ -59,8 +59,8 @@ public: TQString message; }; -DLineEdit::DLineEdit(const TQString &msg, TQWidget *tqparent) - : KLineEdit(tqparent) +DLineEdit::DLineEdit(const TQString &msg, TQWidget *parent) + : KLineEdit(parent) { d = new DLineEditPriv; setMessage(msg); @@ -152,8 +152,8 @@ public: DLineEdit *searchEdit; }; -SearchTextBar::SearchTextBar(TQWidget *tqparent, const char* name, const TQString &msg) - : TQWidget(tqparent, 0, TQt::WDestructiveClose) +SearchTextBar::SearchTextBar(TQWidget *parent, const char* name, const TQString &msg) + : TQWidget(parent, 0, TQt::WDestructiveClose) { d = new SearchTextBarPriv; setFocusPolicy(TQ_NoFocus); diff --git a/digikam/libs/widgets/common/searchtextbar.h b/digikam/libs/widgets/common/searchtextbar.h index a1f1ee5d..14f54461 100644 --- a/digikam/libs/widgets/common/searchtextbar.h +++ b/digikam/libs/widgets/common/searchtextbar.h @@ -51,7 +51,7 @@ class DIGIKAM_EXPORT DLineEdit : public KLineEdit public: - DLineEdit(const TQString &msg, TQWidget *tqparent); + DLineEdit(const TQString &msg, TQWidget *parent); ~DLineEdit(); void setMessage(const TQString &msg); @@ -78,7 +78,7 @@ Q_OBJECT public: - SearchTextBar(TQWidget *tqparent, const char* name, const TQString &msg=i18n("Search...")); + SearchTextBar(TQWidget *parent, const char* name, const TQString &msg=i18n("Search...")); ~SearchTextBar(); void setText(const TQString& text); diff --git a/digikam/libs/widgets/common/sidebar.cpp b/digikam/libs/widgets/common/sidebar.cpp index 0d935bbb..2bc03ed1 100644 --- a/digikam/libs/widgets/common/sidebar.cpp +++ b/digikam/libs/widgets/common/sidebar.cpp @@ -86,8 +86,8 @@ public: Sidebar::Side side; }; -Sidebar::Sidebar(TQWidget *tqparent, const char *name, Side side, bool minimizedDefault) - : KMultiTabBar(KMultiTabBar::Vertical, tqparent, name) +Sidebar::Sidebar(TQWidget *parent, const char *name, Side side, bool minimizedDefault) + : KMultiTabBar(KMultiTabBar::Vertical, parent, name) { d = new SidebarPriv; d->minimizedDefault = minimizedDefault; @@ -351,7 +351,7 @@ bool Sidebar::eventFilter(TQObject *obj, TQEvent *ev) } } - // Else, pass the event on to the tqparent class + // Else, pass the event on to the parent class return KMultiTabBar::eventFilter(obj, ev); } diff --git a/digikam/libs/widgets/common/sidebar.h b/digikam/libs/widgets/common/sidebar.h index 380acf6d..dfa65ba7 100644 --- a/digikam/libs/widgets/common/sidebar.h +++ b/digikam/libs/widgets/common/sidebar.h @@ -67,12 +67,12 @@ public: /** * Creates a new sidebar - * @param tqparent sidebar's tqparent + * @param parent sidebar's parent * @param name the name of the widget is used to store its state to config * @param side where the sidebar should be displayed. At the left or right border. * @param minimizedDefault hide the sidebar when the program is started the first time? */ - Sidebar(TQWidget *tqparent, const char *name, Side side=Left, bool mimimizedDefault=false); + Sidebar(TQWidget *parent, const char *name, Side side=Left, bool mimimizedDefault=false); virtual ~Sidebar(); /** diff --git a/digikam/libs/widgets/common/squeezedcombobox.cpp b/digikam/libs/widgets/common/squeezedcombobox.cpp index a195e4f9..470f40f3 100644 --- a/digikam/libs/widgets/common/squeezedcombobox.cpp +++ b/digikam/libs/widgets/common/squeezedcombobox.cpp @@ -62,8 +62,8 @@ public: SqueezedComboBoxTip *tooltip; }; -SqueezedComboBox::SqueezedComboBox(TQWidget *tqparent, const char *name) - : TQComboBox(tqparent, name) +SqueezedComboBox::SqueezedComboBox(TQWidget *parent, const char *name) + : TQComboBox(parent, name) { d = new SqueezedComboBoxPriv; d->timer = new TQTimer(this); @@ -173,8 +173,8 @@ TQString SqueezedComboBox::itemHighlighted() // ------------------------------------------------------------------------ -SqueezedComboBoxTip::SqueezedComboBoxTip(TQWidget *tqparent, SqueezedComboBox *name) - : TQToolTip( tqparent ) +SqueezedComboBoxTip::SqueezedComboBoxTip(TQWidget *parent, SqueezedComboBox *name) + : TQToolTip( parent ) { m_originalWidget = name; } diff --git a/digikam/libs/widgets/common/squeezedcombobox.h b/digikam/libs/widgets/common/squeezedcombobox.h index c26792ca..d85b81dc 100644 --- a/digikam/libs/widgets/common/squeezedcombobox.h +++ b/digikam/libs/widgets/common/squeezedcombobox.h @@ -62,10 +62,10 @@ public: /** * Constructor - * @param tqparent tqparent widget + * @param parent parent widget * @param name name to give to the widget */ - SqueezedComboBox(TQWidget *tqparent = 0, const char *name = 0 ); + SqueezedComboBox(TQWidget *parent = 0, const char *name = 0 ); /** * destructor @@ -141,10 +141,10 @@ public: * t = new SqueezedComboBoxTip( this->listBox()->viewport(), this ); * @endcode * - * @param tqparent tqparent widget (viewport) - * @param name tqparent widget + * @param parent parent widget (viewport) + * @param name parent widget */ - SqueezedComboBoxTip(TQWidget *tqparent, SqueezedComboBox *name); + SqueezedComboBoxTip(TQWidget *parent, SqueezedComboBox *name); protected: /** diff --git a/digikam/libs/widgets/common/statusled.cpp b/digikam/libs/widgets/common/statusled.cpp index f63e6347..515762ac 100644 --- a/digikam/libs/widgets/common/statusled.cpp +++ b/digikam/libs/widgets/common/statusled.cpp @@ -39,8 +39,8 @@ namespace Digikam { -StatusLed::StatusLed(TQWidget *tqparent) - : TQLabel(tqparent) +StatusLed::StatusLed(TQWidget *parent) + : TQLabel(parent) { setLedColor(Gray); setFocusPolicy(TQ_NoFocus); diff --git a/digikam/libs/widgets/common/statusled.h b/digikam/libs/widgets/common/statusled.h index 11e1fd29..52105a63 100644 --- a/digikam/libs/widgets/common/statusled.h +++ b/digikam/libs/widgets/common/statusled.h @@ -53,7 +53,7 @@ public: public: - StatusLed(TQWidget *tqparent=0); + StatusLed(TQWidget *parent=0); ~StatusLed(); LedColor ledColor() const; diff --git a/digikam/libs/widgets/common/statusnavigatebar.cpp b/digikam/libs/widgets/common/statusnavigatebar.cpp index 4d136515..dab8e0fa 100644 --- a/digikam/libs/widgets/common/statusnavigatebar.cpp +++ b/digikam/libs/widgets/common/statusnavigatebar.cpp @@ -62,8 +62,8 @@ public: TQToolButton *lastButton; }; -StatusNavigateBar::StatusNavigateBar(TQWidget *tqparent) - : TQWidget(tqparent, 0, TQt::WDestructiveClose) +StatusNavigateBar::StatusNavigateBar(TQWidget *parent) + : TQWidget(parent, 0, TQt::WDestructiveClose) { d = new StatusNavigateBarPriv; setFocusPolicy(TQ_NoFocus); diff --git a/digikam/libs/widgets/common/statusnavigatebar.h b/digikam/libs/widgets/common/statusnavigatebar.h index cc822b2d..ec3ceb65 100644 --- a/digikam/libs/widgets/common/statusnavigatebar.h +++ b/digikam/libs/widgets/common/statusnavigatebar.h @@ -56,7 +56,7 @@ public: public: - StatusNavigateBar(TQWidget *tqparent=0); + StatusNavigateBar(TQWidget *parent=0); ~StatusNavigateBar(); void setNavigateBarState(bool hasPrev, bool hasNext); diff --git a/digikam/libs/widgets/common/statusprogressbar.cpp b/digikam/libs/widgets/common/statusprogressbar.cpp index bd1c9ec3..52d33b33 100644 --- a/digikam/libs/widgets/common/statusprogressbar.cpp +++ b/digikam/libs/widgets/common/statusprogressbar.cpp @@ -73,8 +73,8 @@ public: KProgress *progressBar; }; -StatusProgressBar::StatusProgressBar(TQWidget *tqparent) - : TQWidgetStack(tqparent, 0, TQt::WDestructiveClose) +StatusProgressBar::StatusProgressBar(TQWidget *parent) + : TQWidgetStack(parent, 0, TQt::WDestructiveClose) { d = new StatusProgressBarPriv; setFocusPolicy(TQ_NoFocus); diff --git a/digikam/libs/widgets/common/statusprogressbar.h b/digikam/libs/widgets/common/statusprogressbar.h index 3e801c87..f4292bbf 100644 --- a/digikam/libs/widgets/common/statusprogressbar.h +++ b/digikam/libs/widgets/common/statusprogressbar.h @@ -55,7 +55,7 @@ public: public: - StatusProgressBar(TQWidget *tqparent=0); + StatusProgressBar(TQWidget *parent=0); ~StatusProgressBar(); void tqsetAlignment(int a); diff --git a/digikam/libs/widgets/common/statuszoombar.cpp b/digikam/libs/widgets/common/statuszoombar.cpp index b2ccdea5..1672253c 100644 --- a/digikam/libs/widgets/common/statuszoombar.cpp +++ b/digikam/libs/widgets/common/statuszoombar.cpp @@ -44,8 +44,8 @@ namespace Digikam { -TQSliderReverseWheel::TQSliderReverseWheel(TQWidget *tqparent) - : TQSlider(tqparent) +TQSliderReverseWheel::TQSliderReverseWheel(TQWidget *parent) + : TQSlider(parent) { // empty, we just need to re-implement wheelEvent to reverse the wheel } @@ -100,8 +100,8 @@ public: DTipTracker *zoomTracker; }; -StatusZoomBar::StatusZoomBar(TQWidget *tqparent) - : TQHBox(tqparent, 0, TQt::WDestructiveClose) +StatusZoomBar::StatusZoomBar(TQWidget *parent) + : TQHBox(parent, 0, TQt::WDestructiveClose) { d = new StatusZoomBarPriv; setFocusPolicy(TQ_NoFocus); diff --git a/digikam/libs/widgets/common/statuszoombar.h b/digikam/libs/widgets/common/statuszoombar.h index e0a4093c..a2251f89 100644 --- a/digikam/libs/widgets/common/statuszoombar.h +++ b/digikam/libs/widgets/common/statuszoombar.h @@ -49,7 +49,7 @@ class DIGIKAM_EXPORT TQSliderReverseWheel : public TQSlider public: - TQSliderReverseWheel(TQWidget *tqparent=0); + TQSliderReverseWheel(TQWidget *parent=0); ~TQSliderReverseWheel(); private: @@ -67,7 +67,7 @@ Q_OBJECT public: - StatusZoomBar( TQWidget *tqparent=0 ); + StatusZoomBar( TQWidget *parent=0 ); ~StatusZoomBar(); void setEnableZoomPlus(bool e); diff --git a/digikam/libs/widgets/iccprofiles/cietonguewidget.cpp b/digikam/libs/widgets/iccprofiles/cietonguewidget.cpp index abbf928d..9b66e4f7 100644 --- a/digikam/libs/widgets/iccprofiles/cietonguewidget.cpp +++ b/digikam/libs/widgets/iccprofiles/cietonguewidget.cpp @@ -195,8 +195,8 @@ public: MEASUREMENT Measurement; }; -CIETongueWidget::CIETongueWidget(int w, int h, TQWidget *tqparent, cmsHPROFILE hMonitor) - : TQWidget(tqparent, 0, TQt::WDestructiveClose) +CIETongueWidget::CIETongueWidget(int w, int h, TQWidget *parent, cmsHPROFILE hMonitor) + : TQWidget(parent, 0, TQt::WDestructiveClose) { d = new CIETongueWidgetPriv; d->blinkTimer = new TQTimer( this ); diff --git a/digikam/libs/widgets/iccprofiles/cietonguewidget.h b/digikam/libs/widgets/iccprofiles/cietonguewidget.h index db00e7d9..f5f8df5b 100644 --- a/digikam/libs/widgets/iccprofiles/cietonguewidget.h +++ b/digikam/libs/widgets/iccprofiles/cietonguewidget.h @@ -62,7 +62,7 @@ Q_OBJECT public: - CIETongueWidget(int w, int h, TQWidget *tqparent=0, cmsHPROFILE hMonitor=0); + CIETongueWidget(int w, int h, TQWidget *parent=0, cmsHPROFILE hMonitor=0); ~CIETongueWidget(); bool setProfileData(const TQByteArray& profileData=TQByteArray()); diff --git a/digikam/libs/widgets/iccprofiles/iccpreviewwidget.cpp b/digikam/libs/widgets/iccprofiles/iccpreviewwidget.cpp index 8da25e94..76df5e8a 100644 --- a/digikam/libs/widgets/iccprofiles/iccpreviewwidget.cpp +++ b/digikam/libs/widgets/iccprofiles/iccpreviewwidget.cpp @@ -42,8 +42,8 @@ namespace Digikam { -ICCPreviewWidget::ICCPreviewWidget(TQWidget *tqparent) - : KPreviewWidgetBase( tqparent ) +ICCPreviewWidget::ICCPreviewWidget(TQWidget *parent) + : KPreviewWidgetBase( parent ) { TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); TQVGroupBox *box = new TQVGroupBox( this ); diff --git a/digikam/libs/widgets/iccprofiles/iccpreviewwidget.h b/digikam/libs/widgets/iccprofiles/iccpreviewwidget.h index aa719412..4fe00c1a 100644 --- a/digikam/libs/widgets/iccprofiles/iccpreviewwidget.h +++ b/digikam/libs/widgets/iccprofiles/iccpreviewwidget.h @@ -48,7 +48,7 @@ Q_OBJECT public: - ICCPreviewWidget(TQWidget *tqparent); + ICCPreviewWidget(TQWidget *parent); ~ICCPreviewWidget(); public slots: diff --git a/digikam/libs/widgets/iccprofiles/iccprofilewidget.cpp b/digikam/libs/widgets/iccprofiles/iccprofilewidget.cpp index c38031ba..eec266d1 100644 --- a/digikam/libs/widgets/iccprofiles/iccprofilewidget.cpp +++ b/digikam/libs/widgets/iccprofiles/iccprofilewidget.cpp @@ -118,8 +118,8 @@ public: }; -ICCProfileWidget::ICCProfileWidget(TQWidget* tqparent, const char* name, int w, int h) - : MetadataWidget(tqparent, name) +ICCProfileWidget::ICCProfileWidget(TQWidget* parent, const char* name, int w, int h) + : MetadataWidget(parent, name) { cmsErrorAction(LCMS_ERROR_SHOW); diff --git a/digikam/libs/widgets/iccprofiles/iccprofilewidget.h b/digikam/libs/widgets/iccprofiles/iccprofilewidget.h index 8ce93484..80eeaa3d 100644 --- a/digikam/libs/widgets/iccprofiles/iccprofilewidget.h +++ b/digikam/libs/widgets/iccprofiles/iccprofilewidget.h @@ -46,7 +46,7 @@ class DIGIKAM_EXPORT ICCProfileWidget : public MetadataWidget public: - ICCProfileWidget(TQWidget* tqparent, const char* name=0, int w=256, int h=256); + ICCProfileWidget(TQWidget* parent, const char* name=0, int w=256, int h=256); ~ICCProfileWidget(); bool loadFromURL(const KURL& url); diff --git a/digikam/libs/widgets/imageplugins/imageguidewidget.cpp b/digikam/libs/widgets/imageplugins/imageguidewidget.cpp index 94d3c426..07f05411 100644 --- a/digikam/libs/widgets/imageplugins/imageguidewidget.cpp +++ b/digikam/libs/widgets/imageplugins/imageguidewidget.cpp @@ -97,11 +97,11 @@ public: DImg preview; }; -ImageGuideWidget::ImageGuideWidget(int w, int h, TQWidget *tqparent, +ImageGuideWidget::ImageGuideWidget(int w, int h, TQWidget *parent, bool spotVisible, int guideMode, const TQColor& guideColor, int guideSize, bool blink, bool useImageSelection) - : TQWidget(tqparent, 0, TQt::WDestructiveClose) + : TQWidget(parent, 0, TQt::WDestructiveClose) { d = new ImageGuideWidgetPriv; d->spotVisible = spotVisible; diff --git a/digikam/libs/widgets/imageplugins/imageguidewidget.h b/digikam/libs/widgets/imageplugins/imageguidewidget.h index d583871b..2fa89654 100644 --- a/digikam/libs/widgets/imageplugins/imageguidewidget.h +++ b/digikam/libs/widgets/imageplugins/imageguidewidget.h @@ -78,7 +78,7 @@ public: public: - ImageGuideWidget(int w, int h, TQWidget *tqparent=0, + ImageGuideWidget(int w, int h, TQWidget *parent=0, bool spotVisible=true, int guideMode=HVGuideMode, const TQColor& guideColor=TQt::red, int guideSize=1, bool blink=false, bool useImageSelection=false); diff --git a/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp b/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp index d0666225..faf63543 100644 --- a/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp +++ b/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp @@ -78,8 +78,8 @@ public: }; ImagePanelWidget::ImagePanelWidget(uint w, uint h, const TQString& settingsSection, - ImagePanIconWidget *pan, TQWidget *tqparent, int separateViewMode) - : TQWidget(tqparent, 0, TQt::WDestructiveClose) + ImagePanIconWidget *pan, TQWidget *parent, int separateViewMode) + : TQWidget(parent, 0, TQt::WDestructiveClose) { d = new ImagePanelWidgetPriv; d->settingsSection = settingsSection; diff --git a/digikam/libs/widgets/imageplugins/imagepanelwidget.h b/digikam/libs/widgets/imageplugins/imagepanelwidget.h index 716e8e44..ea0e1c6e 100644 --- a/digikam/libs/widgets/imageplugins/imagepanelwidget.h +++ b/digikam/libs/widgets/imageplugins/imagepanelwidget.h @@ -62,7 +62,7 @@ public: public: ImagePanelWidget(uint w, uint h, const TQString& settingsSection, ImagePanIconWidget *pan, - TQWidget *tqparent=0, int separateViewMode=SeparateViewAll); + TQWidget *parent=0, int separateViewMode=SeparateViewAll); ~ImagePanelWidget(); TQRect getOriginalImageRegion(); diff --git a/digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp b/digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp index 91cc1fa8..0d167246 100644 --- a/digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp +++ b/digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp @@ -64,8 +64,8 @@ public: ImageIface *iface; }; -ImagePanIconWidget::ImagePanIconWidget(int w, int h, TQWidget *tqparent, WFlags flags) - : PanIconWidget(tqparent, flags) +ImagePanIconWidget::ImagePanIconWidget(int w, int h, TQWidget *parent, WFlags flags) + : PanIconWidget(parent, flags) { d = new ImagePanIconWidgetPriv; diff --git a/digikam/libs/widgets/imageplugins/imagepaniconwidget.h b/digikam/libs/widgets/imageplugins/imagepaniconwidget.h index 2a5b1ef7..49d5db63 100644 --- a/digikam/libs/widgets/imageplugins/imagepaniconwidget.h +++ b/digikam/libs/widgets/imageplugins/imagepaniconwidget.h @@ -45,7 +45,7 @@ Q_OBJECT public: - ImagePanIconWidget(int width, int height, TQWidget *tqparent=0, WFlags flags=TQt::WDestructiveClose); + ImagePanIconWidget(int width, int height, TQWidget *parent=0, WFlags flags=TQt::WDestructiveClose); ~ImagePanIconWidget(); void setHighLightPoints(const TQPointArray& pointsList); diff --git a/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp b/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp index c29681f2..5f3b3bab 100644 --- a/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp +++ b/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp @@ -104,8 +104,8 @@ public: }; ImagePannelWidget::ImagePannelWidget(uint w, uint h, const TQString& settingsSection, - TQWidget *tqparent, int separateViewMode) - : TQHBox(tqparent, 0, TQt::WDestructiveClose) + TQWidget *parent, int separateViewMode) + : TQHBox(parent, 0, TQt::WDestructiveClose) { d = new ImagePannelWidgetPriv; d->settingsSection = settingsSection; diff --git a/digikam/libs/widgets/imageplugins/imagepannelwidget.h b/digikam/libs/widgets/imageplugins/imagepannelwidget.h index 35df8304..e48484b9 100644 --- a/digikam/libs/widgets/imageplugins/imagepannelwidget.h +++ b/digikam/libs/widgets/imageplugins/imagepannelwidget.h @@ -60,7 +60,7 @@ public: public: - ImagePannelWidget(uint w, uint h, const TQString& settingsSection, TQWidget *tqparent=0, + ImagePannelWidget(uint w, uint h, const TQString& settingsSection, TQWidget *parent=0, int separateViewMode=SeparateViewAll); ~ImagePannelWidget(); diff --git a/digikam/libs/widgets/imageplugins/imageregionwidget.cpp b/digikam/libs/widgets/imageplugins/imageregionwidget.cpp index 96e56df7..69759682 100644 --- a/digikam/libs/widgets/imageplugins/imageregionwidget.cpp +++ b/digikam/libs/widgets/imageplugins/imageregionwidget.cpp @@ -79,8 +79,8 @@ public: ImageIface *iface; }; -ImageRegionWidget::ImageRegionWidget(int wp, int hp, TQWidget *tqparent, bool scrollBar) - : PreviewWidget(tqparent) +ImageRegionWidget::ImageRegionWidget(int wp, int hp, TQWidget *parent, bool scrollBar) + : PreviewWidget(parent) { d = new ImageRegionWidgetPriv; d->iface = new ImageIface(0, 0); diff --git a/digikam/libs/widgets/imageplugins/imageregionwidget.h b/digikam/libs/widgets/imageplugins/imageregionwidget.h index 2b1e51ef..2489c7ed 100644 --- a/digikam/libs/widgets/imageplugins/imageregionwidget.h +++ b/digikam/libs/widgets/imageplugins/imageregionwidget.h @@ -57,7 +57,7 @@ public: public: - ImageRegionWidget(int wp, int hp, TQWidget *tqparent=0, bool scrollBar=true); + ImageRegionWidget(int wp, int hp, TQWidget *parent=0, bool scrollBar=true); ~ImageRegionWidget(); void setContentsPosition(int x, int y, bool targetDone); diff --git a/digikam/libs/widgets/imageplugins/imagewidget.cpp b/digikam/libs/widgets/imageplugins/imagewidget.cpp index 0424ca3a..c6667d9f 100644 --- a/digikam/libs/widgets/imageplugins/imagewidget.cpp +++ b/digikam/libs/widgets/imageplugins/imagewidget.cpp @@ -74,10 +74,10 @@ public: ImageGuideWidget *previewWidget; }; -ImageWidget::ImageWidget(const TQString& settingsSection, TQWidget *tqparent, +ImageWidget::ImageWidget(const TQString& settingsSection, TQWidget *parent, const TQString& previewWhatsThis, bool prevModeOptions, int guideMode, bool guideVisible, bool useImageSelection) - : TQWidget(tqparent) + : TQWidget(parent) { d = new ImageWidgetPriv; d->settingsSection = settingsSection; diff --git a/digikam/libs/widgets/imageplugins/imagewidget.h b/digikam/libs/widgets/imageplugins/imagewidget.h index cd38768f..d9dc2832 100644 --- a/digikam/libs/widgets/imageplugins/imagewidget.h +++ b/digikam/libs/widgets/imageplugins/imagewidget.h @@ -59,7 +59,7 @@ public: public: - ImageWidget(const TQString& settingsSection, TQWidget *tqparent=0, + ImageWidget(const TQString& settingsSection, TQWidget *parent=0, const TQString& previewWhatsThis=TQString(), bool prevModeOptions=true, int guideMode=ImageGuideWidget::PickColorMode, bool guideVisible=true, bool useImageSelection=false); diff --git a/digikam/libs/widgets/metadata/exifwidget.cpp b/digikam/libs/widgets/metadata/exifwidget.cpp index 78aac53d..286cf693 100644 --- a/digikam/libs/widgets/metadata/exifwidget.cpp +++ b/digikam/libs/widgets/metadata/exifwidget.cpp @@ -81,8 +81,8 @@ static const char* StandardExifEntryList[] = "-1" }; -ExifWidget::ExifWidget(TQWidget* tqparent, const char* name) - : MetadataWidget(tqparent, name) +ExifWidget::ExifWidget(TQWidget* parent, const char* name) + : MetadataWidget(parent, name) { view()->setSortColumn(-1); diff --git a/digikam/libs/widgets/metadata/exifwidget.h b/digikam/libs/widgets/metadata/exifwidget.h index e6fe8065..92c88eb6 100644 --- a/digikam/libs/widgets/metadata/exifwidget.h +++ b/digikam/libs/widgets/metadata/exifwidget.h @@ -43,7 +43,7 @@ class DIGIKAM_EXPORT ExifWidget : public MetadataWidget public: - ExifWidget(TQWidget* tqparent, const char* name=0); + ExifWidget(TQWidget* parent, const char* name=0); ~ExifWidget(); bool loadFromURL(const KURL& url); diff --git a/digikam/libs/widgets/metadata/gpswidget.cpp b/digikam/libs/widgets/metadata/gpswidget.cpp index 2ce83b46..ae87d8ae 100644 --- a/digikam/libs/widgets/metadata/gpswidget.cpp +++ b/digikam/libs/widgets/metadata/gpswidget.cpp @@ -91,8 +91,8 @@ public: WorldMapWidget *map; }; -GPSWidget::GPSWidget(TQWidget* tqparent, const char* name) - : MetadataWidget(tqparent, name) +GPSWidget::GPSWidget(TQWidget* parent, const char* name) + : MetadataWidget(parent, name) { d = new GPSWidgetPriv; diff --git a/digikam/libs/widgets/metadata/gpswidget.h b/digikam/libs/widgets/metadata/gpswidget.h index 3ba524cd..085a745d 100644 --- a/digikam/libs/widgets/metadata/gpswidget.h +++ b/digikam/libs/widgets/metadata/gpswidget.h @@ -57,7 +57,7 @@ public: public: - GPSWidget(TQWidget* tqparent, const char* name=0); + GPSWidget(TQWidget* parent, const char* name=0); ~GPSWidget(); bool loadFromURL(const KURL& url); diff --git a/digikam/libs/widgets/metadata/iptcwidget.cpp b/digikam/libs/widgets/metadata/iptcwidget.cpp index f2ccdcff..24f782dd 100644 --- a/digikam/libs/widgets/metadata/iptcwidget.cpp +++ b/digikam/libs/widgets/metadata/iptcwidget.cpp @@ -64,8 +64,8 @@ static const char* StandardIptcEntryList[] = "-1" }; -IptcWidget::IptcWidget(TQWidget* tqparent, const char* name) - : MetadataWidget(tqparent, name) +IptcWidget::IptcWidget(TQWidget* parent, const char* name) + : MetadataWidget(parent, name) { for (int i=0 ; TQString(StandardIptcEntryList[i]) != TQString("-1") ; i++) m_keysFilter << StandardIptcEntryList[i]; diff --git a/digikam/libs/widgets/metadata/iptcwidget.h b/digikam/libs/widgets/metadata/iptcwidget.h index e2076a42..a8307d25 100644 --- a/digikam/libs/widgets/metadata/iptcwidget.h +++ b/digikam/libs/widgets/metadata/iptcwidget.h @@ -39,7 +39,7 @@ class DIGIKAM_EXPORT IptcWidget : public MetadataWidget public: - IptcWidget(TQWidget* tqparent, const char* name=0); + IptcWidget(TQWidget* parent, const char* name=0); ~IptcWidget(); bool loadFromURL(const KURL& url); diff --git a/digikam/libs/widgets/metadata/makernotewidget.cpp b/digikam/libs/widgets/metadata/makernotewidget.cpp index c9b57078..d2904eda 100644 --- a/digikam/libs/widgets/metadata/makernotewidget.cpp +++ b/digikam/libs/widgets/metadata/makernotewidget.cpp @@ -108,8 +108,8 @@ static const char* ExifEntryListToIgnore[] = "-1" }; -MakerNoteWidget::MakerNoteWidget(TQWidget* tqparent, const char* name) - : MetadataWidget(tqparent, name) +MakerNoteWidget::MakerNoteWidget(TQWidget* parent, const char* name) + : MetadataWidget(parent, name) { for (int i=0 ; TQString(ExifEntryListToIgnore[i]) != TQString("-1") ; i++) m_keysFilter << ExifEntryListToIgnore[i]; diff --git a/digikam/libs/widgets/metadata/makernotewidget.h b/digikam/libs/widgets/metadata/makernotewidget.h index de53d41b..00d97de2 100644 --- a/digikam/libs/widgets/metadata/makernotewidget.h +++ b/digikam/libs/widgets/metadata/makernotewidget.h @@ -40,7 +40,7 @@ class DIGIKAM_EXPORT MakerNoteWidget : public MetadataWidget public: - MakerNoteWidget(TQWidget* tqparent, const char* name=0); + MakerNoteWidget(TQWidget* parent, const char* name=0); ~MakerNoteWidget(); bool loadFromURL(const KURL& url); diff --git a/digikam/libs/widgets/metadata/mdkeylistviewitem.cpp b/digikam/libs/widgets/metadata/mdkeylistviewitem.cpp index 36e4970d..c45ea728 100644 --- a/digikam/libs/widgets/metadata/mdkeylistviewitem.cpp +++ b/digikam/libs/widgets/metadata/mdkeylistviewitem.cpp @@ -41,8 +41,8 @@ namespace Digikam { -MdKeyListViewItem::MdKeyListViewItem(TQListView *tqparent, const TQString& key) - : TQListViewItem(tqparent) +MdKeyListViewItem::MdKeyListViewItem(TQListView *parent, const TQString& key) + : TQListViewItem(parent) { m_decryptedKey = key; diff --git a/digikam/libs/widgets/metadata/mdkeylistviewitem.h b/digikam/libs/widgets/metadata/mdkeylistviewitem.h index 78bf8dc2..aeaf7e4c 100644 --- a/digikam/libs/widgets/metadata/mdkeylistviewitem.h +++ b/digikam/libs/widgets/metadata/mdkeylistviewitem.h @@ -44,7 +44,7 @@ class DIGIKAM_EXPORT MdKeyListViewItem : public TQListViewItem public: - MdKeyListViewItem(TQListView *tqparent, const TQString& key); + MdKeyListViewItem(TQListView *parent, const TQString& key); ~MdKeyListViewItem(); TQString getMdKey(); diff --git a/digikam/libs/widgets/metadata/metadatalistview.cpp b/digikam/libs/widgets/metadata/metadatalistview.cpp index ef79c2e8..e4a3261b 100644 --- a/digikam/libs/widgets/metadata/metadatalistview.cpp +++ b/digikam/libs/widgets/metadata/metadatalistview.cpp @@ -44,8 +44,8 @@ namespace Digikam { -MetadataListView::MetadataListView(TQWidget* tqparent) - : TQListView(tqparent) +MetadataListView::MetadataListView(TQWidget* parent) + : TQListView(parent) { header()->hide(); addColumn("Name"); // No need i18n here. @@ -57,7 +57,7 @@ MetadataListView::MetadataListView(TQWidget* tqparent) // free space to metadata content setVScrollBarMode(TQScrollView::AlwaysOff); - m_parent = dynamic_cast(tqparent); + m_parent = dynamic_cast(parent); connect(this, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotSelectionChanged(TQListViewItem*))); diff --git a/digikam/libs/widgets/metadata/metadatalistview.h b/digikam/libs/widgets/metadata/metadatalistview.h index f03140c3..af3aec90 100644 --- a/digikam/libs/widgets/metadata/metadatalistview.h +++ b/digikam/libs/widgets/metadata/metadatalistview.h @@ -47,7 +47,7 @@ class DIGIKAM_EXPORT MetadataListView : public TQListView public: - MetadataListView(TQWidget* tqparent); + MetadataListView(TQWidget* parent); ~MetadataListView(); TQString getCurrentItemKey(); diff --git a/digikam/libs/widgets/metadata/metadatalistviewitem.cpp b/digikam/libs/widgets/metadata/metadatalistviewitem.cpp index f3e4569b..f18056b5 100644 --- a/digikam/libs/widgets/metadata/metadatalistviewitem.cpp +++ b/digikam/libs/widgets/metadata/metadatalistviewitem.cpp @@ -35,9 +35,9 @@ namespace Digikam { -MetadataListViewItem::MetadataListViewItem(TQListViewItem *tqparent, const TQString& key, +MetadataListViewItem::MetadataListViewItem(TQListViewItem *parent, const TQString& key, const TQString& title, const TQString& value) - : TQListViewItem(tqparent) + : TQListViewItem(parent) { m_key = key; diff --git a/digikam/libs/widgets/metadata/metadatalistviewitem.h b/digikam/libs/widgets/metadata/metadatalistviewitem.h index 95605536..4a860d5b 100644 --- a/digikam/libs/widgets/metadata/metadatalistviewitem.h +++ b/digikam/libs/widgets/metadata/metadatalistviewitem.h @@ -41,7 +41,7 @@ class DIGIKAM_EXPORT MetadataListViewItem : public TQListViewItem { public: - MetadataListViewItem(TQListViewItem *tqparent, const TQString& key, + MetadataListViewItem(TQListViewItem *parent, const TQString& key, const TQString& title, const TQString& value); ~MetadataListViewItem(); diff --git a/digikam/libs/widgets/metadata/metadatawidget.cpp b/digikam/libs/widgets/metadata/metadatawidget.cpp index 6ee370db..ee7764d7 100644 --- a/digikam/libs/widgets/metadata/metadatawidget.cpp +++ b/digikam/libs/widgets/metadata/metadatawidget.cpp @@ -94,8 +94,8 @@ public: DMetadata::MetaDataMap metaDataMap; }; -MetadataWidget::MetadataWidget(TQWidget* tqparent, const char* name) - : TQWidget(tqparent, name) +MetadataWidget::MetadataWidget(TQWidget* parent, const char* name) + : TQWidget(parent, name) { d = new MetadataWidgetPriv; diff --git a/digikam/libs/widgets/metadata/metadatawidget.h b/digikam/libs/widgets/metadata/metadatawidget.h index 112213f4..ac7d00f3 100644 --- a/digikam/libs/widgets/metadata/metadatawidget.h +++ b/digikam/libs/widgets/metadata/metadatawidget.h @@ -59,7 +59,7 @@ public: public: - MetadataWidget(TQWidget* tqparent, const char* name=0); + MetadataWidget(TQWidget* parent, const char* name=0); ~MetadataWidget(); int getMode(); diff --git a/digikam/libs/widgets/metadata/worldmapwidget.cpp b/digikam/libs/widgets/metadata/worldmapwidget.cpp index 73c3fb41..6cf77716 100644 --- a/digikam/libs/widgets/metadata/worldmapwidget.cpp +++ b/digikam/libs/widgets/metadata/worldmapwidget.cpp @@ -73,8 +73,8 @@ static KStaticDeleter pixmapDeleter; TQPixmap *WorldMapWidgetPriv::worldMap = 0; -WorldMapWidget::WorldMapWidget(int w, int h, TQWidget *tqparent) - : TQScrollView(tqparent, 0, TQt::WDestructiveClose) +WorldMapWidget::WorldMapWidget(int w, int h, TQWidget *parent) + : TQScrollView(parent, 0, TQt::WDestructiveClose) { d = new WorldMapWidgetPriv; diff --git a/digikam/libs/widgets/metadata/worldmapwidget.h b/digikam/libs/widgets/metadata/worldmapwidget.h index 096b7259..0166a1c2 100644 --- a/digikam/libs/widgets/metadata/worldmapwidget.h +++ b/digikam/libs/widgets/metadata/worldmapwidget.h @@ -44,7 +44,7 @@ Q_OBJECT public: - WorldMapWidget(int w, int h, TQWidget *tqparent); + WorldMapWidget(int w, int h, TQWidget *parent); ~WorldMapWidget(); void setGPSPosition(double lat, double lng); diff --git a/digikam/project/NEWS.0.9.0 b/digikam/project/NEWS.0.9.0 index 76df473c..47526322 100644 --- a/digikam/project/NEWS.0.9.0 +++ b/digikam/project/NEWS.0.9.0 @@ -136,7 +136,7 @@ digiKam and DigikamImagePlugins BUGFIX FROM KDE BUGZILLA (alias B.K.O | http://b 005 ==> 116248 : Ask user which plugins should be enabled on first startup. 006 ==> 115441 : Resize EXIF-rotated images doesn't work. 007 ==> 115460 : Opening and closing right pane with tag filter also changes width of left pane and vv. -008 ==> 124688 : digiKam loading time is big because of : WARNING: Failed to find tqparent for Tag. +008 ==> 124688 : digiKam loading time is big because of : WARNING: Failed to find parent for Tag. 009 ==> 109253 : digiKam does not store comments in image EXIF tags. 010 ==> 115764 : Modify EXIF creation date. 011 ==> 121487 : "Tip of the day" text gets cut off. @@ -203,7 +203,7 @@ digiKam and DigikamImagePlugins BUGFIX FROM KDE BUGZILLA (alias B.K.O | http://b 071 ==> 126326 : Camera download: auto-rotated images loose EXIF info when 'No EXIF information found.' is written to console. 072 ==> 121242 : mimelnk/x-image-raw.desktop conflicts with kdegraphics-3.5.x. -073 ==> 127374 : Unsharp tqmask: max. radius way too small. +073 ==> 127374 : Unsharp mask: max. radius way too small. 074 ==> 116485 : Mimimize button missing on "Compaq Flash Reader" camera window. 075 ==> 127577 : Raw display too dark and not rotated. 076 ==> 127634 : Communication between digiKam and its kioslaves broken if size_t != off_t. diff --git a/digikam/project/NEWS.0.9.4 b/digikam/project/NEWS.0.9.4 index 459c1435..04a13ec9 100644 --- a/digikam/project/NEWS.0.9.4 +++ b/digikam/project/NEWS.0.9.4 @@ -14,7 +14,7 @@ BUGFIXES FROM KDE BUGZILLA (alias B.K.O | http://bugs.kde.org): 003 ==> 165823 : Digikam crashes if last picture is removed from lighttable. 004 ==> 165921 : Translation bug: Missing german translation. 005 ==> 130906 : Allow user to click text of tags to tag an image (not checkbox only). -006 ==> 126871 : Click on tqparent folder in tree should generate a reaction. +006 ==> 126871 : Click on parent folder in tree should generate a reaction. 007 ==> 162812 : Sharpen slider enhancement refresh previews continuously. 008 ==> 166274 : Rename files on download from camera. 009 ==> 166472 : Thumbnail bar gone in image editor when switching back from fullscreen. @@ -104,7 +104,7 @@ BUGFIXES FROM KDE BUGZILLA (alias B.K.O | http://bugs.kde.org): 007 ==> 147466 : digiKam crashes on termination if an audio file played. 008 ==> 146973 : Crashes when clicking on preview image. 009 ==> 148976 : digiKam Deleted 2.3 g of Pictures. -010 ==> 145252 : Utqmask settings used for album directory, not for image files. +010 ==> 145252 : Umask settings used for album directory, not for image files. 011 ==> 125775 : digiKam way to save and delete "Searches". 012 ==> 150908 : Canon g3 not recognized works version 0.9.1. 013 ==> 152092 : Showfoto crashes ( signal 11 ) on exit. @@ -162,7 +162,7 @@ BUGFIXES FROM KDE BUGZILLA (alias B.K.O | http://bugs.kde.org): 001 ==> 146393 : No gamma adjustment when opening RAW file. 002 ==> 158377 : digiKam duplicates downloaded images while overwriting existing ones. 003 ==> 151122 : Opening Albums Has Become Very Slow. -004 ==> 145252 : Utqmask settings used for album directory, not for image files +004 ==> 145252 : Umask settings used for album directory, not for image files 005 ==> 144253 : Failed to update old Database to new Database format. 006 ==> 159467 : Misleading error message with path change in digikamrc file. 007 ==> 157237 : Connect the data when using the left tabs. diff --git a/digikam/showfoto/setup/setup.cpp b/digikam/showfoto/setup/setup.cpp index 4cf76d9f..b854621b 100644 --- a/digikam/showfoto/setup/setup.cpp +++ b/digikam/showfoto/setup/setup.cpp @@ -84,8 +84,8 @@ public: Digikam::SetupICC *iccPage; }; -Setup::Setup(TQWidget* tqparent, const char* name, Setup::Page page) - : KDialogBase(IconList, i18n("Configure"), Help|Ok|Cancel, Ok, tqparent, +Setup::Setup(TQWidget* parent, const char* name, Setup::Page page) + : KDialogBase(IconList, i18n("Configure"), Help|Ok|Cancel, Ok, parent, name, true, true ) { d = new SetupPrivate; diff --git a/digikam/showfoto/setup/setup.h b/digikam/showfoto/setup/setup.h index 957eb76b..ed5bb6db 100644 --- a/digikam/showfoto/setup/setup.h +++ b/digikam/showfoto/setup/setup.h @@ -61,7 +61,7 @@ public: ICCPage }; - Setup(TQWidget* tqparent=0, const char* name=0, Page page=LastPageUsed); + Setup(TQWidget* parent=0, const char* name=0, Page page=LastPageUsed); ~Setup(); private slots: diff --git a/digikam/showfoto/setup/setupeditor.cpp b/digikam/showfoto/setup/setupeditor.cpp index 4ad88566..03eac23d 100644 --- a/digikam/showfoto/setup/setupeditor.cpp +++ b/digikam/showfoto/setup/setupeditor.cpp @@ -93,15 +93,15 @@ public: KColorButton *overExposureColor; }; -SetupEditor::SetupEditor(TQWidget* tqparent ) - : TQWidget(tqparent) +SetupEditor::SetupEditor(TQWidget* parent ) + : TQWidget(parent) { d = new SetupEditorPriv; - TQVBoxLayout *tqlayout = new TQVBoxLayout( tqparent, 0, KDialog::spacingHint() ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( parent, 0, KDialog::spacingHint() ); // -------------------------------------------------------- - TQVGroupBox *interfaceOptionsGroup = new TQVGroupBox(i18n("Interface Options"), tqparent); + TQVGroupBox *interfaceOptionsGroup = new TQVGroupBox(i18n("Interface Options"), parent); d->themebackgroundColor = new TQCheckBox(i18n("&Use theme background color"), interfaceOptionsGroup); @@ -131,7 +131,7 @@ SetupEditor::SetupEditor(TQWidget* tqparent ) // -------------------------------------------------------- - TQVGroupBox *exposureOptionsGroup = new TQVGroupBox(i18n("Exposure Indicators"), tqparent); + TQVGroupBox *exposureOptionsGroup = new TQVGroupBox(i18n("Exposure Indicators"), parent); TQHBox *underExpoBox = new TQHBox(exposureOptionsGroup); TQLabel *underExpoColorlabel = new TQLabel( i18n("&Under-exposure color:"), underExpoBox); @@ -149,7 +149,7 @@ SetupEditor::SetupEditor(TQWidget* tqparent ) // -------------------------------------------------------- - TQVGroupBox *ExifGroupOptions = new TQVGroupBox(i18n("EXIF Actions"), tqparent); + TQVGroupBox *ExifGroupOptions = new TQVGroupBox(i18n("EXIF Actions"), parent); d->exifRotateBox = new TQCheckBox(ExifGroupOptions); d->exifRotateBox->setText(i18n("Show images/thumbs &rotated according to orientation tag")); @@ -159,7 +159,7 @@ SetupEditor::SetupEditor(TQWidget* tqparent ) // -------------------------------------------------------- - TQVGroupBox *sortOptionsGroup = new TQVGroupBox(i18n("Sort order for images"), tqparent); + TQVGroupBox *sortOptionsGroup = new TQVGroupBox(i18n("Sort order for images"), parent); TQHBox* sortBox = new TQHBox(sortOptionsGroup); new TQLabel(i18n("Sort images by:"), sortBox); diff --git a/digikam/showfoto/setup/setupeditor.h b/digikam/showfoto/setup/setupeditor.h index e2c74fce..aa8f5d71 100644 --- a/digikam/showfoto/setup/setupeditor.h +++ b/digikam/showfoto/setup/setupeditor.h @@ -40,7 +40,7 @@ class SetupEditor : public TQWidget public: - SetupEditor(TQWidget* tqparent=0); + SetupEditor(TQWidget* parent=0); ~SetupEditor(); void applySettings(); diff --git a/digikam/showfoto/setup/setuptooltip.cpp b/digikam/showfoto/setup/setuptooltip.cpp index 4f295f94..35412d38 100644 --- a/digikam/showfoto/setup/setuptooltip.cpp +++ b/digikam/showfoto/setup/setuptooltip.cpp @@ -89,13 +89,13 @@ public: TQVGroupBox *photoSettingBox; }; -SetupToolTip::SetupToolTip(TQWidget* tqparent) - : TQWidget(tqparent) +SetupToolTip::SetupToolTip(TQWidget* parent) + : TQWidget(parent) { d = new SetupToolTipPriv; - TQVBoxLayout *tqlayout = new TQVBoxLayout( tqparent, 0, KDialog::spacingHint() ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( parent, 0, KDialog::spacingHint() ); - d->showToolTipsBox = new TQCheckBox(i18n("Show Thumbbar items toolti&ps"), tqparent); + d->showToolTipsBox = new TQCheckBox(i18n("Show Thumbbar items toolti&ps"), parent); TQWhatsThis::add( d->showToolTipsBox, i18n("

    Set this option to display image information when " "the mouse hovers over a thumbbar item.")); @@ -103,7 +103,7 @@ SetupToolTip::SetupToolTip(TQWidget* tqparent) // -------------------------------------------------------- - d->fileSettingBox = new TQVGroupBox(i18n("File/Image Information"), tqparent); + d->fileSettingBox = new TQVGroupBox(i18n("File/Image Information"), parent); d->showFileNameBox = new TQCheckBox(i18n("Show file name"), d->fileSettingBox); TQWhatsThis::add( d->showFileNameBox, i18n("

    Set this option to display the image file name.")); @@ -124,7 +124,7 @@ SetupToolTip::SetupToolTip(TQWidget* tqparent) // -------------------------------------------------------- - d->photoSettingBox = new TQVGroupBox(i18n("Photograph Information"), tqparent); + d->photoSettingBox = new TQVGroupBox(i18n("Photograph Information"), parent); d->showPhotoMakeBox = new TQCheckBox(i18n("Show camera make and model"), d->photoSettingBox); TQWhatsThis::add( d->showPhotoMakeBox, i18n("

    Set this option to display the make and model of the " diff --git a/digikam/showfoto/setup/setuptooltip.h b/digikam/showfoto/setup/setuptooltip.h index bbd02929..cea07344 100644 --- a/digikam/showfoto/setup/setuptooltip.h +++ b/digikam/showfoto/setup/setuptooltip.h @@ -40,7 +40,7 @@ class SetupToolTip : public TQWidget public: - SetupToolTip(TQWidget* tqparent = 0); + SetupToolTip(TQWidget* parent = 0); ~SetupToolTip(); void applySettings(); diff --git a/digikam/themedesigner/themediconitem.cpp b/digikam/themedesigner/themediconitem.cpp index c36ad220..5d867d76 100644 --- a/digikam/themedesigner/themediconitem.cpp +++ b/digikam/themedesigner/themediconitem.cpp @@ -107,8 +107,8 @@ static TQString squeezedText(TQPainter* p, int width, const TQString& text) return fullText; } -ThemedIconItem::ThemedIconItem(IconGroupItem* tqparent) - : IconItem(tqparent) +ThemedIconItem::ThemedIconItem(IconGroupItem* parent) + : IconItem(parent) { } diff --git a/digikam/themedesigner/themediconitem.h b/digikam/themedesigner/themediconitem.h index 9505ce23..0d54cceb 100644 --- a/digikam/themedesigner/themediconitem.h +++ b/digikam/themedesigner/themediconitem.h @@ -35,7 +35,7 @@ class ThemedIconItem : public IconItem { public: - ThemedIconItem(IconGroupItem* tqparent); + ThemedIconItem(IconGroupItem* parent); ~ThemedIconItem(); protected: diff --git a/digikam/themedesigner/themediconview.cpp b/digikam/themedesigner/themediconview.cpp index 59b2cb8e..7ab00501 100644 --- a/digikam/themedesigner/themediconview.cpp +++ b/digikam/themedesigner/themediconview.cpp @@ -58,8 +58,8 @@ public: TQFont fnXtra; }; -ThemedIconView::ThemedIconView(TQWidget* tqparent) - : IconView(tqparent) +ThemedIconView::ThemedIconView(TQWidget* parent) + : IconView(parent) { d = new ThemedIconViewPriv; d->thumbSize = 128; diff --git a/digikam/themedesigner/themediconview.h b/digikam/themedesigner/themediconview.h index 1018bc59..4921c922 100644 --- a/digikam/themedesigner/themediconview.h +++ b/digikam/themedesigner/themediconview.h @@ -44,7 +44,7 @@ class ThemedIconView : public IconView public: - ThemedIconView(TQWidget* tqparent); + ThemedIconView(TQWidget* parent); ~ThemedIconView(); TQRect tqitemRect() const; diff --git a/digikam/utilities/batch/batchalbumssyncmetadata.cpp b/digikam/utilities/batch/batchalbumssyncmetadata.cpp index bb4b0dbf..d721b151 100644 --- a/digikam/utilities/batch/batchalbumssyncmetadata.cpp +++ b/digikam/utilities/batch/batchalbumssyncmetadata.cpp @@ -69,8 +69,8 @@ public: AlbumList::Iterator albumsIt; }; -BatchAlbumsSyncMetadata::BatchAlbumsSyncMetadata(TQWidget* tqparent) - : DProgressDlg(tqparent) +BatchAlbumsSyncMetadata::BatchAlbumsSyncMetadata(TQWidget* parent) + : DProgressDlg(parent) { d = new BatchAlbumsSyncMetadataPriv; d->imageInfoJob = new ImageInfoJob(); diff --git a/digikam/utilities/batch/batchalbumssyncmetadata.h b/digikam/utilities/batch/batchalbumssyncmetadata.h index c923d2f5..b3a63f3a 100644 --- a/digikam/utilities/batch/batchalbumssyncmetadata.h +++ b/digikam/utilities/batch/batchalbumssyncmetadata.h @@ -46,7 +46,7 @@ class BatchAlbumsSyncMetadata : public DProgressDlg public: - BatchAlbumsSyncMetadata(TQWidget* tqparent); + BatchAlbumsSyncMetadata(TQWidget* parent); ~BatchAlbumsSyncMetadata(); signals: diff --git a/digikam/utilities/batch/batchsyncmetadata.cpp b/digikam/utilities/batch/batchsyncmetadata.cpp index 23d5d410..8e7ff862 100644 --- a/digikam/utilities/batch/batchsyncmetadata.cpp +++ b/digikam/utilities/batch/batchsyncmetadata.cpp @@ -70,15 +70,15 @@ public: ImageInfo *imageInfo; }; -BatchSyncMetadata::BatchSyncMetadata(TQObject* tqparent, Album *album) - : TQObject(tqparent) +BatchSyncMetadata::BatchSyncMetadata(TQObject* parent, Album *album) + : TQObject(parent) { d = new BatchSyncMetadataPriv; d->album = album; } -BatchSyncMetadata::BatchSyncMetadata(TQObject* tqparent, const ImageInfoList& list) - : TQObject(tqparent) +BatchSyncMetadata::BatchSyncMetadata(TQObject* parent, const ImageInfoList& list) + : TQObject(parent) { d = new BatchSyncMetadataPriv; d->imageInfoList = list; diff --git a/digikam/utilities/batch/batchsyncmetadata.h b/digikam/utilities/batch/batchsyncmetadata.h index 6cc61ea4..a0ad2d2f 100644 --- a/digikam/utilities/batch/batchsyncmetadata.h +++ b/digikam/utilities/batch/batchsyncmetadata.h @@ -49,10 +49,10 @@ class BatchSyncMetadata : public TQObject public: /** Constructor witch sync all metatada pictures from an Album */ - BatchSyncMetadata(TQObject* tqparent, Album *album); + BatchSyncMetadata(TQObject* parent, Album *album); /** Constructor witch sync all metatada from an images list */ - BatchSyncMetadata(TQObject* tqparent, const ImageInfoList& list); + BatchSyncMetadata(TQObject* parent, const ImageInfoList& list); ~BatchSyncMetadata(); diff --git a/digikam/utilities/batch/batchthumbsgenerator.cpp b/digikam/utilities/batch/batchthumbsgenerator.cpp index 9a2c901e..b32b86a1 100644 --- a/digikam/utilities/batch/batchthumbsgenerator.cpp +++ b/digikam/utilities/batch/batchthumbsgenerator.cpp @@ -74,8 +74,8 @@ public: TQGuardedPtr thumbJob; }; -BatchThumbsGenerator::BatchThumbsGenerator(TQWidget* tqparent) - : DProgressDlg(tqparent) +BatchThumbsGenerator::BatchThumbsGenerator(TQWidget* parent) + : DProgressDlg(parent) { d = new BatchThumbsGeneratorPriv; setValue(0); diff --git a/digikam/utilities/batch/batchthumbsgenerator.h b/digikam/utilities/batch/batchthumbsgenerator.h index 5a519160..03496765 100644 --- a/digikam/utilities/batch/batchthumbsgenerator.h +++ b/digikam/utilities/batch/batchthumbsgenerator.h @@ -45,7 +45,7 @@ class BatchThumbsGenerator : public DProgressDlg public: - BatchThumbsGenerator(TQWidget* tqparent); + BatchThumbsGenerator(TQWidget* parent); ~BatchThumbsGenerator(); signals: diff --git a/digikam/utilities/cameragui/albumselectdialog.cpp b/digikam/utilities/cameragui/albumselectdialog.cpp index a66f6ace..7fbf1ae2 100644 --- a/digikam/utilities/cameragui/albumselectdialog.cpp +++ b/digikam/utilities/cameragui/albumselectdialog.cpp @@ -80,13 +80,13 @@ public: SearchTextBar *searchBar; }; -AlbumSelectDialog::AlbumSelectDialog(TQWidget* tqparent, PAlbum* albumToSelect, +AlbumSelectDialog::AlbumSelectDialog(TQWidget* parent, PAlbum* albumToSelect, const TQString& header, const TQString& newAlbumString, bool allowRootSelection ) : KDialogBase(Plain, i18n("Select Album"), Help|User1|Ok|Cancel, Ok, - tqparent, 0, true, true, + parent, 0, true, true, i18n("&New Album")) { d = new AlbumSelectDialogPrivate; @@ -136,11 +136,11 @@ AlbumSelectDialog::AlbumSelectDialog(TQWidget* tqparent, PAlbum* albumToSelect, } else { - FolderItem* parentItem = (FolderItem*)(album->tqparent()->extraData(d->folderView)); + FolderItem* parentItem = (FolderItem*)(album->parent()->extraData(d->folderView)); if (!parentItem) { - DWarning() << "Failed to find tqparent for Album " + DWarning() << "Failed to find parent for Album " << album->title() << endl; continue; } @@ -207,11 +207,11 @@ void AlbumSelectDialog::slotAlbumAdded(Album* album) if (!album || album->type() != Album::PHYSICAL) return; - FolderItem* parentItem = (FolderItem*)(album->tqparent()->extraData(d->folderView)); + FolderItem* parentItem = (FolderItem*)(album->parent()->extraData(d->folderView)); if (!parentItem) { - DWarning() << "Failed to find tqparent for Album " + DWarning() << "Failed to find parent for Album " << album->title() << endl; return; } @@ -323,13 +323,13 @@ void AlbumSelectDialog::slotUser1() } } -PAlbum* AlbumSelectDialog::selectAlbum(TQWidget* tqparent, +PAlbum* AlbumSelectDialog::selectAlbum(TQWidget* parent, PAlbum* albumToSelect, const TQString& header, const TQString& newAlbumString, bool allowRootSelection ) { - AlbumSelectDialog dlg(tqparent, albumToSelect, + AlbumSelectDialog dlg(parent, albumToSelect, header, newAlbumString, allowRootSelection); @@ -365,16 +365,16 @@ void AlbumSelectDialog::slotSearchTextChanged(const TQString& filter) if (!match) { // check if any of the parents match the search - Album* tqparent = palbum->tqparent(); - while (tqparent && !tqparent->isRoot()) + Album* parent = palbum->parent(); + while (parent && !parent->isRoot()) { - if (tqparent->title().lower().contains(search)) + if (parent->title().lower().contains(search)) { match = true; break; } - tqparent = tqparent->tqparent(); + parent = parent->parent(); } } diff --git a/digikam/utilities/cameragui/albumselectdialog.h b/digikam/utilities/cameragui/albumselectdialog.h index d9c70f70..b785537c 100644 --- a/digikam/utilities/cameragui/albumselectdialog.h +++ b/digikam/utilities/cameragui/albumselectdialog.h @@ -47,14 +47,14 @@ class AlbumSelectDialog : public KDialogBase public: - AlbumSelectDialog(TQWidget* tqparent, PAlbum* albumToSelect, + AlbumSelectDialog(TQWidget* parent, PAlbum* albumToSelect, const TQString& header=TQString(), const TQString& newAlbumString=TQString(), bool allowRootSelection=false); ~AlbumSelectDialog(); - static PAlbum* selectAlbum(TQWidget* tqparent, + static PAlbum* selectAlbum(TQWidget* parent, PAlbum* albumToSelect, const TQString& header=TQString(), const TQString& newAlbumString=TQString(), diff --git a/digikam/utilities/cameragui/animwidget.cpp b/digikam/utilities/cameragui/animwidget.cpp index ad60c055..1b64f299 100644 --- a/digikam/utilities/cameragui/animwidget.cpp +++ b/digikam/utilities/cameragui/animwidget.cpp @@ -56,8 +56,8 @@ public: TQPixmap pix; }; -AnimWidget::AnimWidget(TQWidget* tqparent, int size) - : TQWidget(tqparent, 0, WResizeNoErase|WRepaintNoErase) +AnimWidget::AnimWidget(TQWidget* parent, int size) + : TQWidget(parent, 0, WResizeNoErase|WRepaintNoErase) { d = new AnimWidgetPriv; setBackgroundMode(TQt::NoBackground); diff --git a/digikam/utilities/cameragui/animwidget.h b/digikam/utilities/cameragui/animwidget.h index a286f9e4..d85f33b2 100644 --- a/digikam/utilities/cameragui/animwidget.h +++ b/digikam/utilities/cameragui/animwidget.h @@ -41,7 +41,7 @@ class AnimWidget : public TQWidget public: - AnimWidget(TQWidget* tqparent, int size=28); + AnimWidget(TQWidget* parent, int size=28); ~AnimWidget(); void start(); diff --git a/digikam/utilities/cameragui/cameracontroller.cpp b/digikam/utilities/cameragui/cameracontroller.cpp index cbfefc96..d8034a07 100644 --- a/digikam/utilities/cameragui/cameracontroller.cpp +++ b/digikam/utilities/cameragui/cameracontroller.cpp @@ -145,7 +145,7 @@ public: skipAll = false; canceled = false; downloadTotal = 0; - tqparent = 0; + parent = 0; timer = 0; camera = 0; thread = 0; @@ -158,7 +158,7 @@ public: int downloadTotal; - TQWidget *tqparent; + TQWidget *parent; TQTimer *timer; @@ -188,11 +188,11 @@ private: CameraControllerPriv *d; - TQObject *tqparent; + TQObject *parent; }; CameraThread::CameraThread(CameraController* controller) - : d(controller->d), tqparent(controller) + : d(controller->d), parent(controller) { } @@ -220,7 +220,7 @@ void CameraThread::run() CameraEvent* event = new CameraEvent(CameraEvent::gp_connected); event->result = result; - TQApplication::postEvent(tqparent, event); + TQApplication::postEvent(parent, event); if (result) sendInfo(i18n("Connection established")); @@ -243,7 +243,7 @@ void CameraThread::run() event->map.insert("summary", TQVariant(summary)); event->map.insert("manual", TQVariant(manual)); event->map.insert("about", TQVariant(about)); - TQApplication::postEvent(tqparent, event); + TQApplication::postEvent(parent, event); break; } case(CameraCommand::gp_listfolders): @@ -260,7 +260,7 @@ void CameraThread::run() CameraEvent* event = new CameraEvent(CameraEvent::gp_listedfolders); event->map.insert("folders", TQVariant(flist)); - TQApplication::postEvent(tqparent, event); + TQApplication::postEvent(parent, event); sendInfo(i18n("The folders have been listed.")); @@ -289,7 +289,7 @@ void CameraThread::run() ds << itemsList; event->map.insert("files", TQVariant(ba)); - TQApplication::postEvent(tqparent, event); + TQApplication::postEvent(parent, event); } sendInfo(i18n("Listing files in %1 is complete").tqarg(folder)); @@ -314,7 +314,7 @@ void CameraThread::run() event->map.insert("folder", TQVariant(folder)); event->map.insert("file", TQVariant(file)); event->map.insert("thumbnail", TQVariant(thumbnail)); - TQApplication::postEvent(tqparent, event); + TQApplication::postEvent(parent, event); } break; @@ -342,7 +342,7 @@ void CameraThread::run() event->map.insert("file", TQVariant(file)); event->map.insert("exifSize", TQVariant(esize)); event->map.insert("exifData", TQVariant(ba)); - TQApplication::postEvent(tqparent, event); + TQApplication::postEvent(parent, event); } break; } @@ -371,7 +371,7 @@ void CameraThread::run() event->map.insert("folder", TQVariant(folder)); event->map.insert("file", TQVariant(file)); event->map.insert("dest", TQVariant(dest)); - TQApplication::postEvent(tqparent, event); + TQApplication::postEvent(parent, event); KURL tempURL(dest); tempURL = tempURL.upURL(); @@ -443,7 +443,7 @@ void CameraThread::run() event->map.insert("file", TQVariant(file)); event->map.insert("dest", TQVariant(dest)); event->map.insert("temp", TQVariant(temp)); - TQApplication::postEvent(tqparent, event); + TQApplication::postEvent(parent, event); } else { @@ -451,7 +451,7 @@ void CameraThread::run() event->map.insert("folder", TQVariant(folder)); event->map.insert("file", TQVariant(file)); event->map.insert("dest", TQVariant(dest)); - TQApplication::postEvent(tqparent, event); + TQApplication::postEvent(parent, event); } break; } @@ -471,7 +471,7 @@ void CameraThread::run() event->map.insert("folder", TQVariant(folder)); event->map.insert("file", TQVariant(file)); event->map.insert("dest", TQVariant(dest)); - TQApplication::postEvent(tqparent, event); + TQApplication::postEvent(parent, event); } else { @@ -504,7 +504,7 @@ void CameraThread::run() ds << itemsInfo; event->map.insert("info", TQVariant(ba)); - TQApplication::postEvent(tqparent, event); + TQApplication::postEvent(parent, event); } else { @@ -512,7 +512,7 @@ void CameraThread::run() event->map.insert("folder", TQVariant(folder)); event->map.insert("file", TQVariant(file)); event->map.insert("src", TQVariant(src)); - TQApplication::postEvent(tqparent, event); + TQApplication::postEvent(parent, event); } break; } @@ -530,14 +530,14 @@ void CameraThread::run() CameraEvent* event = new CameraEvent(CameraEvent::gp_deleted); event->map.insert("folder", TQVariant(folder)); event->map.insert("file", TQVariant(file)); - TQApplication::postEvent(tqparent, event); + TQApplication::postEvent(parent, event); } else { CameraEvent* event = new CameraEvent(CameraEvent::gp_deleteFailed); event->map.insert("folder", TQVariant(folder)); event->map.insert("file", TQVariant(file)); - TQApplication::postEvent(tqparent, event); + TQApplication::postEvent(parent, event); } break; } @@ -556,14 +556,14 @@ void CameraThread::run() CameraEvent* event = new CameraEvent(CameraEvent::gp_locked); event->map.insert("folder", TQVariant(folder)); event->map.insert("file", TQVariant(file)); - TQApplication::postEvent(tqparent, event); + TQApplication::postEvent(parent, event); } else { CameraEvent* event = new CameraEvent(CameraEvent::gp_lockFailed); event->map.insert("folder", TQVariant(folder)); event->map.insert("file", TQVariant(file)); - TQApplication::postEvent(tqparent, event); + TQApplication::postEvent(parent, event); } break; } @@ -581,33 +581,33 @@ void CameraThread::sendBusy(bool val) { CameraEvent* event = new CameraEvent(CameraEvent::gp_busy); event->result = val; - TQApplication::postEvent(tqparent, event); + TQApplication::postEvent(parent, event); } void CameraThread::sendError(const TQString& msg) { CameraEvent* event = new CameraEvent(CameraEvent::gp_errormsg); event->msg = msg; - TQApplication::postEvent(tqparent, event); + TQApplication::postEvent(parent, event); } void CameraThread::sendInfo(const TQString& msg) { CameraEvent* event = new CameraEvent(CameraEvent::gp_infomsg); event->msg = msg; - TQApplication::postEvent(tqparent, event); + TQApplication::postEvent(parent, event); } //-- Camera Controller ------------------------------------------------------ -CameraController::CameraController(TQWidget* tqparent, const TQString& title, const TQString& model, +CameraController::CameraController(TQWidget* parent, const TQString& title, const TQString& model, const TQString& port, const TQString& path) - : TQObject(tqparent) + : TQObject(parent) { d = new CameraControllerPriv; - d->tqparent = tqparent; + d->parent = parent; d->canceled = false; d->close = false; d->overwriteAll = false; @@ -938,7 +938,7 @@ void CameraController::customEvent(TQCustomEvent* e) break; } - KIO::RenameDlg dlg(d->tqparent, i18n("Rename File"), + KIO::RenameDlg dlg(d->parent, i18n("Rename File"), folder + TQString("/") + file, dest, KIO::RenameDlg_Mode(KIO::M_MULTI | KIO::M_OVERWRITE | KIO::M_SKIP)); @@ -1029,12 +1029,12 @@ void CameraController::customEvent(TQCustomEvent* e) { if (d->cmdQueue.isEmpty()) { - KMessageBox::error(d->tqparent, msg); + KMessageBox::error(d->parent, msg); } else { msg += i18n(" Do you want to continue?"); - int result = KMessageBox::warningContinueCancel(d->tqparent, msg); + int result = KMessageBox::warningContinueCancel(d->parent, msg); if (result != KMessageBox::Continue) slotCancel(); } @@ -1068,12 +1068,12 @@ void CameraController::customEvent(TQCustomEvent* e) { if (d->cmdQueue.isEmpty()) { - KMessageBox::error(d->tqparent, msg); + KMessageBox::error(d->parent, msg); } else { msg += i18n(" Do you want to continue?"); - int result = KMessageBox::warningContinueCancel(d->tqparent, msg); + int result = KMessageBox::warningContinueCancel(d->parent, msg); if (result != KMessageBox::Continue) slotCancel(); } @@ -1103,12 +1103,12 @@ void CameraController::customEvent(TQCustomEvent* e) { if (d->cmdQueue.isEmpty()) { - KMessageBox::error(d->tqparent, msg); + KMessageBox::error(d->parent, msg); } else { msg += i18n(" Do you want to continue?"); - int result = KMessageBox::warningContinueCancel(d->tqparent, msg); + int result = KMessageBox::warningContinueCancel(d->parent, msg); if (result != KMessageBox::Continue) slotCancel(); } @@ -1138,12 +1138,12 @@ void CameraController::customEvent(TQCustomEvent* e) { if (d->cmdQueue.isEmpty()) { - KMessageBox::error(d->tqparent, msg); + KMessageBox::error(d->parent, msg); } else { msg += i18n(" Do you want to continue?"); - int result = KMessageBox::warningContinueCancel(d->tqparent, msg); + int result = KMessageBox::warningContinueCancel(d->parent, msg); if (result != KMessageBox::Continue) slotCancel(); } diff --git a/digikam/utilities/cameragui/cameracontroller.h b/digikam/utilities/cameragui/cameracontroller.h index dd7ddbec..aa7accdd 100644 --- a/digikam/utilities/cameragui/cameracontroller.h +++ b/digikam/utilities/cameragui/cameracontroller.h @@ -48,7 +48,7 @@ class CameraController : public TQObject public: - CameraController(TQWidget* tqparent, const TQString& title, const TQString& model, + CameraController(TQWidget* parent, const TQString& title, const TQString& model, const TQString& port, const TQString& path); ~CameraController(); diff --git a/digikam/utilities/cameragui/camerafolderdialog.cpp b/digikam/utilities/cameragui/camerafolderdialog.cpp index 36c31d54..ba3b99df 100644 --- a/digikam/utilities/cameragui/camerafolderdialog.cpp +++ b/digikam/utilities/cameragui/camerafolderdialog.cpp @@ -45,10 +45,10 @@ namespace Digikam { -CameraFolderDialog::CameraFolderDialog(TQWidget *tqparent, CameraIconView *cameraView, +CameraFolderDialog::CameraFolderDialog(TQWidget *parent, CameraIconView *cameraView, const TQStringList& cameraFolderList, const TQString& cameraName, const TQString& rootPath) - : KDialogBase(tqparent, 0, true, + : KDialogBase(parent, 0, true, i18n("%1 - Select Camera Folder").tqarg(cameraName), Help|Ok|Cancel, Ok, true) { diff --git a/digikam/utilities/cameragui/camerafolderdialog.h b/digikam/utilities/cameragui/camerafolderdialog.h index 8aaf477a..51e0a55d 100644 --- a/digikam/utilities/cameragui/camerafolderdialog.h +++ b/digikam/utilities/cameragui/camerafolderdialog.h @@ -46,7 +46,7 @@ class CameraFolderDialog : public KDialogBase public: - CameraFolderDialog(TQWidget *tqparent, CameraIconView *cameraView, const TQStringList& cameraFolderList, + CameraFolderDialog(TQWidget *parent, CameraIconView *cameraView, const TQStringList& cameraFolderList, const TQString& cameraName, const TQString& rootPath); ~CameraFolderDialog(); diff --git a/digikam/utilities/cameragui/camerafolderitem.cpp b/digikam/utilities/cameragui/camerafolderitem.cpp index 722c71f2..6adc480b 100644 --- a/digikam/utilities/cameragui/camerafolderitem.cpp +++ b/digikam/utilities/cameragui/camerafolderitem.cpp @@ -47,8 +47,8 @@ public: TQString name; }; -CameraFolderItem::CameraFolderItem(TQListView* tqparent, const TQString& name, const TQPixmap& pixmap) - : TQListViewItem(tqparent, name) +CameraFolderItem::CameraFolderItem(TQListView* parent, const TQString& name, const TQPixmap& pixmap) + : TQListViewItem(parent, name) { d = new CameraFolderItemPriv; d->virtualFolder = true; @@ -56,9 +56,9 @@ CameraFolderItem::CameraFolderItem(TQListView* tqparent, const TQString& name, c setPixmap(0, pixmap); } -CameraFolderItem::CameraFolderItem(TQListViewItem* tqparent, const TQString& folderName, +CameraFolderItem::CameraFolderItem(TQListViewItem* parent, const TQString& folderName, const TQString& folderPath, const TQPixmap& pixmap) - : TQListViewItem(tqparent, folderName) + : TQListViewItem(parent, folderName) { d = new CameraFolderItemPriv; d->folderName = folderName; diff --git a/digikam/utilities/cameragui/camerafolderitem.h b/digikam/utilities/cameragui/camerafolderitem.h index b88ce2d2..dde2c5c6 100644 --- a/digikam/utilities/cameragui/camerafolderitem.h +++ b/digikam/utilities/cameragui/camerafolderitem.h @@ -44,10 +44,10 @@ class CameraFolderItem : public TQListViewItem public: - CameraFolderItem(TQListView* tqparent, const TQString& name, + CameraFolderItem(TQListView* parent, const TQString& name, const TQPixmap& pixmap=SmallIcon("folder")); - CameraFolderItem(TQListViewItem* tqparent, const TQString& folderName, const TQString& folderPath, + CameraFolderItem(TQListViewItem* parent, const TQString& folderName, const TQString& folderPath, const TQPixmap& pixmap=SmallIcon("folder")); ~CameraFolderItem(); diff --git a/digikam/utilities/cameragui/camerafolderview.cpp b/digikam/utilities/cameragui/camerafolderview.cpp index 1c45e87a..e04c4503 100644 --- a/digikam/utilities/cameragui/camerafolderview.cpp +++ b/digikam/utilities/cameragui/camerafolderview.cpp @@ -54,8 +54,8 @@ public: CameraFolderItem *rootFolder; }; -CameraFolderView::CameraFolderView(TQWidget* tqparent) - : TQListView(tqparent) +CameraFolderView::CameraFolderView(TQWidget* parent) + : TQListView(parent) { d = new CameraFolderViewPriv; @@ -119,7 +119,7 @@ CameraFolderItem* CameraFolderView::addFolder(const TQString& folder, const TQSt } else { - DWarning() << "CameraFolderView: Couldn't find tqparent for subFolder " + DWarning() << "CameraFolderView: Couldn't find parent for subFolder " << subFolder << " of folder " << folder << endl; return 0; } diff --git a/digikam/utilities/cameragui/camerafolderview.h b/digikam/utilities/cameragui/camerafolderview.h index 207bf10a..167b30d7 100644 --- a/digikam/utilities/cameragui/camerafolderview.h +++ b/digikam/utilities/cameragui/camerafolderview.h @@ -47,7 +47,7 @@ class CameraFolderView : public TQListView public: - CameraFolderView(TQWidget* tqparent); + CameraFolderView(TQWidget* parent); ~CameraFolderView(); void addVirtualFolder(const TQString& name, const TQPixmap& pixmap=SmallIcon("camera")); diff --git a/digikam/utilities/cameragui/cameraiconitem.cpp b/digikam/utilities/cameragui/cameraiconitem.cpp index d6fbf240..b0a7da2a 100644 --- a/digikam/utilities/cameragui/cameraiconitem.cpp +++ b/digikam/utilities/cameragui/cameraiconitem.cpp @@ -66,9 +66,9 @@ public: GPItemInfo *itemInfo; }; -CameraIconViewItem::CameraIconViewItem(IconGroupItem* tqparent, const GPItemInfo& itemInfo, +CameraIconViewItem::CameraIconViewItem(IconGroupItem* parent, const GPItemInfo& itemInfo, const TQImage& thumbnail, const TQString& downloadName) - : IconItem(tqparent) + : IconItem(parent) { d = new CameraIconViewItemPriv; d->itemInfo = new GPItemInfo(itemInfo); diff --git a/digikam/utilities/cameragui/cameraiconitem.h b/digikam/utilities/cameragui/cameraiconitem.h index e0530107..961bc1a3 100644 --- a/digikam/utilities/cameragui/cameraiconitem.h +++ b/digikam/utilities/cameragui/cameraiconitem.h @@ -45,7 +45,7 @@ class CameraIconViewItem : public IconItem public: - CameraIconViewItem(IconGroupItem* tqparent, const GPItemInfo& itemInfo, + CameraIconViewItem(IconGroupItem* parent, const GPItemInfo& itemInfo, const TQImage& thumbnail, const TQString& downloadName=TQString()); ~CameraIconViewItem(); diff --git a/digikam/utilities/cameragui/cameraiconview.cpp b/digikam/utilities/cameragui/cameraiconview.cpp index 0bbac235..927efd4a 100644 --- a/digikam/utilities/cameragui/cameraiconview.cpp +++ b/digikam/utilities/cameragui/cameraiconview.cpp @@ -222,8 +222,8 @@ const char *CameraIconViewPriv::unknowPicture_xpm[] = " " }; -CameraIconView::CameraIconView(CameraUI* ui, TQWidget* tqparent) - : IconView(tqparent) +CameraIconView::CameraIconView(CameraUI* ui, TQWidget* parent) + : IconView(parent) { d = new CameraIconViewPriv; d->cameraUI = ui; diff --git a/digikam/utilities/cameragui/cameraiconview.h b/digikam/utilities/cameragui/cameraiconview.h index d70d1ba2..65dee0fd 100644 --- a/digikam/utilities/cameragui/cameraiconview.h +++ b/digikam/utilities/cameragui/cameraiconview.h @@ -58,7 +58,7 @@ class CameraIconView : public IconView public: - CameraIconView(CameraUI* ui, TQWidget* tqparent); + CameraIconView(CameraUI* ui, TQWidget* parent); ~CameraIconView(); void setRenameCustomizer(RenameCustomizer* renamer); diff --git a/digikam/utilities/cameragui/camerainfodialog.cpp b/digikam/utilities/cameragui/camerainfodialog.cpp index 42a83d41..6221bd9e 100644 --- a/digikam/utilities/cameragui/camerainfodialog.cpp +++ b/digikam/utilities/cameragui/camerainfodialog.cpp @@ -40,9 +40,9 @@ namespace Digikam { -CameraInfoDialog::CameraInfoDialog(TQWidget *tqparent, const TQString& summary, const TQString& manual, +CameraInfoDialog::CameraInfoDialog(TQWidget *parent, const TQString& summary, const TQString& manual, const TQString& about) - : KDialogBase(IconList, i18n("Camera Information"), Help|Ok, Ok, tqparent, 0, true, true) + : KDialogBase(IconList, i18n("Camera Information"), Help|Ok, Ok, parent, 0, true, true) { setHelp("digitalstillcamera.anchor", "digikam"); resize(500, 400); diff --git a/digikam/utilities/cameragui/camerainfodialog.h b/digikam/utilities/cameragui/camerainfodialog.h index 07ca63ea..7ec3120f 100644 --- a/digikam/utilities/cameragui/camerainfodialog.h +++ b/digikam/utilities/cameragui/camerainfodialog.h @@ -40,7 +40,7 @@ class CameraInfoDialog : public KDialogBase { public: - CameraInfoDialog(TQWidget *tqparent, const TQString& summary, const TQString& manual, + CameraInfoDialog(TQWidget *parent, const TQString& summary, const TQString& manual, const TQString& about); ~CameraInfoDialog(); }; diff --git a/digikam/utilities/cameragui/cameraui.cpp b/digikam/utilities/cameragui/cameraui.cpp index 3274c25e..ce8212e4 100644 --- a/digikam/utilities/cameragui/cameraui.cpp +++ b/digikam/utilities/cameragui/cameraui.cpp @@ -224,12 +224,12 @@ public: FreeSpaceWidget *freeSpaceWidget; }; -CameraUI::CameraUI(TQWidget* /*tqparent*/, const TQString& cameraTitle, +CameraUI::CameraUI(TQWidget* /*parent*/, const TQString& cameraTitle, const TQString& model, const TQString& port, const TQString& path, const TQDateTime lastAccess) : KDialogBase(Plain, cameraTitle, Help|User1|User2|User3|Close, Close, - 0, // B.K.O # 116485: no tqparent for this modal dialog. + 0, // B.K.O # 116485: no parent for this modal dialog. 0, false, true, i18n("D&elete"), i18n("&Download"), @@ -1630,15 +1630,15 @@ bool CameraUI::createAutoAlbum(const KURL& parentURL, const TQString& sub, // looks like the directory does not exist, try to create it AlbumManager* aman = AlbumManager::instance(); - PAlbum* tqparent = aman->findPAlbum(parentURL); - if (!tqparent) + PAlbum* parent = aman->findPAlbum(parentURL); + if (!parent) { errMsg = i18n("Failed to find Album for path '%1'") .tqarg(parentURL.path()); return false; } - return aman->createPAlbum(tqparent, sub, TQString(""), date, TQString(""), errMsg); + return aman->createPAlbum(parent, sub, TQString(""), date, TQString(""), errMsg); } void CameraUI::addFileExtension(const TQString& ext) diff --git a/digikam/utilities/cameragui/cameraui.h b/digikam/utilities/cameragui/cameraui.h index 889bc345..99d3871b 100644 --- a/digikam/utilities/cameragui/cameraui.h +++ b/digikam/utilities/cameragui/cameraui.h @@ -54,7 +54,7 @@ class CameraUI : public KDialogBase public: - CameraUI(TQWidget* tqparent, const TQString& cameraTitle, + CameraUI(TQWidget* parent, const TQString& cameraTitle, const TQString& model, const TQString& port, const TQString& path, const TQDateTime lastAccess); ~CameraUI(); diff --git a/digikam/utilities/cameragui/freespacewidget.cpp b/digikam/utilities/cameragui/freespacewidget.cpp index f964f072..0a32eb25 100644 --- a/digikam/utilities/cameragui/freespacewidget.cpp +++ b/digikam/utilities/cameragui/freespacewidget.cpp @@ -81,8 +81,8 @@ public: TQPixmap pix; }; -FreeSpaceWidget::FreeSpaceWidget(TQWidget* tqparent, int width) - : TQWidget(tqparent, 0, WResizeNoErase|WRepaintNoErase) +FreeSpaceWidget::FreeSpaceWidget(TQWidget* parent, int width) + : TQWidget(parent, 0, WResizeNoErase|WRepaintNoErase) { d = new FreeSpaceWidgetPriv; setBackgroundMode(TQt::NoBackground); diff --git a/digikam/utilities/cameragui/freespacewidget.h b/digikam/utilities/cameragui/freespacewidget.h index c8ad03f9..4f777d3c 100644 --- a/digikam/utilities/cameragui/freespacewidget.h +++ b/digikam/utilities/cameragui/freespacewidget.h @@ -41,7 +41,7 @@ class FreeSpaceWidget : public TQWidget public: - FreeSpaceWidget(TQWidget* tqparent, int width); + FreeSpaceWidget(TQWidget* parent, int width); ~FreeSpaceWidget(); void setEstimatedDSizeKb(unsigned long dSize); diff --git a/digikam/utilities/cameragui/renamecustomizer.cpp b/digikam/utilities/cameragui/renamecustomizer.cpp index 9857febc..544ec8e5 100644 --- a/digikam/utilities/cameragui/renamecustomizer.cpp +++ b/digikam/utilities/cameragui/renamecustomizer.cpp @@ -126,8 +126,8 @@ public: KIntNumInput *startIndexInput; }; -RenameCustomizer::RenameCustomizer(TQWidget* tqparent, const TQString& cameraTitle) - : TQButtonGroup(tqparent) +RenameCustomizer::RenameCustomizer(TQWidget* parent, const TQString& cameraTitle) + : TQButtonGroup(parent) { d = new RenameCustomizerPriv; d->changedTimer = new TQTimer(this); diff --git a/digikam/utilities/cameragui/renamecustomizer.h b/digikam/utilities/cameragui/renamecustomizer.h index 843344a1..bb5e8c73 100644 --- a/digikam/utilities/cameragui/renamecustomizer.h +++ b/digikam/utilities/cameragui/renamecustomizer.h @@ -51,7 +51,7 @@ public: LOWER }; - RenameCustomizer(TQWidget* tqparent, const TQString& cameraTitle); + RenameCustomizer(TQWidget* parent, const TQString& cameraTitle); ~RenameCustomizer(); void setUseDefault(bool val); diff --git a/digikam/utilities/imageeditor/canvas/canvas.cpp b/digikam/utilities/imageeditor/canvas/canvas.cpp index 93446552..96edc14c 100644 --- a/digikam/utilities/imageeditor/canvas/canvas.cpp +++ b/digikam/utilities/imageeditor/canvas/canvas.cpp @@ -94,7 +94,7 @@ public: panIconPopup = 0; panIconWidget = 0; cornerButton = 0; - tqparent = 0; + parent = 0; im = 0; rubber = 0; autoZoom = false; @@ -137,7 +137,7 @@ public: TQColor bgColor; - TQWidget *tqparent; + TQWidget *parent; KPopupFrame *panIconPopup; @@ -146,12 +146,12 @@ public: ImagePanIconWidget *panIconWidget; }; -Canvas::Canvas(TQWidget *tqparent) - : TQScrollView(tqparent) +Canvas::Canvas(TQWidget *parent) + : TQScrollView(parent) { d = new CanvasPrivate; d->im = new DImgInterface(); - d->tqparent = tqparent; + d->parent = parent; d->bgColor.setRgb(0, 0, 0); d->qcheck.resize(16, 16); @@ -242,7 +242,7 @@ void Canvas::load(const TQString& filename, IOFileSettingsContainer *IOFileSetti viewport()->setUpdatesEnabled(false); - d->im->load( filename, IOFileSettings, d->tqparent ); + d->im->load( filename, IOFileSettings, d->parent ); emit signalPrepareToLoad(); } diff --git a/digikam/utilities/imageeditor/canvas/canvas.h b/digikam/utilities/imageeditor/canvas/canvas.h index 2ce3493d..a0c812c8 100644 --- a/digikam/utilities/imageeditor/canvas/canvas.h +++ b/digikam/utilities/imageeditor/canvas/canvas.h @@ -60,7 +60,7 @@ class DIGIKAM_EXPORT Canvas : public TQScrollView public: - Canvas(TQWidget *tqparent=0); + Canvas(TQWidget *parent=0); ~Canvas(); void load(const TQString& filename, IOFileSettingsContainer *IOFileSettings); diff --git a/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp b/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp index e9d00748..5bb7f70e 100644 --- a/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp +++ b/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp @@ -51,13 +51,13 @@ namespace Digikam { -ColorCorrectionDlg::ColorCorrectionDlg(TQWidget* tqparent, DImg *preview, +ColorCorrectionDlg::ColorCorrectionDlg(TQWidget* parent, DImg *preview, IccTransform *iccTrans, const TQString& file) - : KDialogBase(tqparent, "", true, TQString(), + : KDialogBase(parent, "", true, TQString(), Help|Ok|Apply|Cancel, Ok, true) { m_iccTrans = iccTrans; - m_parent = tqparent; + m_parent = parent; setHelp("iccprofile.anchor", "digikam"); setButtonText(Ok, i18n("Convert")); setButtonTip(Ok, i18n("Apply the default color workspace profile to the image")); diff --git a/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.h b/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.h index c8165de0..f519fc2f 100644 --- a/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.h +++ b/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.h @@ -50,7 +50,7 @@ class DIGIKAM_EXPORT ColorCorrectionDlg : public KDialogBase public: - ColorCorrectionDlg(TQWidget *tqparent, DImg *preview, + ColorCorrectionDlg(TQWidget *parent, DImg *preview, IccTransform *iccTrans, const TQString& file); ~ColorCorrectionDlg(); diff --git a/digikam/utilities/imageeditor/canvas/dimginterface.cpp b/digikam/utilities/imageeditor/canvas/dimginterface.cpp index ba04834e..b9a02ff1 100644 --- a/digikam/utilities/imageeditor/canvas/dimginterface.cpp +++ b/digikam/utilities/imageeditor/canvas/dimginterface.cpp @@ -79,7 +79,7 @@ public: DImgInterfacePrivate() { - tqparent = 0; + parent = 0; undoMan = 0; cmSettings = 0; expoSettings = 0; @@ -120,7 +120,7 @@ public: double zoom; // Used by ICC color profile dialog. - TQWidget *tqparent; + TQWidget *parent; TQString filename; TQString savingFilename; @@ -185,7 +185,7 @@ DImgInterface::~DImgInterface() } void DImgInterface::load(const TQString& filename, IOFileSettingsContainer *iofileSettings, - TQWidget *tqparent) + TQWidget *parent) { // store here in case filename == d->fileName, and is then reset by resetValues TQString newFileName = filename; @@ -194,7 +194,7 @@ void DImgInterface::load(const TQString& filename, IOFileSettingsContainer *iofi d->filename = newFileName; d->iofileSettings = iofileSettings; - d->tqparent = tqparent; + d->parent = parent; if (d->iofileSettings->useRAWImport && DImg::fileFormat(d->filename) == DImg::RAW) { @@ -261,7 +261,7 @@ void DImgInterface::resetValues() d->brightness = 0.0; d->changedBCG = false; d->iofileSettings = 0; - d->tqparent = 0; + d->parent = 0; d->cmod.reset(); d->undoMan->clear(); @@ -323,7 +323,7 @@ void DImgInterface::slotImageLoaded(const LoadingDescription &loadingDescription // Ask or apply? if (d->cmSettings->askOrApplySetting) { - if (d->tqparent) d->tqparent->setCursor( KCursor::waitCursor() ); + if (d->parent) d->parent->setCursor( KCursor::waitCursor() ); trans.setProfiles(TQFile::encodeName(d->cmSettings->inputSetting), TQFile::encodeName(d->cmSettings->workspaceSetting)); @@ -333,7 +333,7 @@ void DImgInterface::slotImageLoaded(const LoadingDescription &loadingDescription TQFile::exists(d->cmSettings->inputSetting)); d->image.getICCProfilFromFile(TQFile::encodeName(d->cmSettings->workspaceSetting)); - if (d->tqparent) d->tqparent->unsetCursor(); + if (d->parent) d->parent->unsetCursor(); } else { @@ -343,12 +343,12 @@ void DImgInterface::slotImageLoaded(const LoadingDescription &loadingDescription DImg preview = d->image.smoothScale(240, 180, TQSize::ScaleMin); trans.setProfiles(TQFile::encodeName(d->cmSettings->inputSetting), TQFile::encodeName(d->cmSettings->workspaceSetting)); - ColorCorrectionDlg dlg(d->tqparent, &preview, &trans, fileName); + ColorCorrectionDlg dlg(d->parent, &preview, &trans, fileName); switch (dlg.exec()) { case TQDialog::Accepted: - if (d->tqparent) d->tqparent->setCursor( KCursor::waitCursor() ); + if (d->parent) d->parent->setCursor( KCursor::waitCursor() ); // NOTE: If Input color profile do not exist, using built-in sRGB intead. trans.apply(d->image, fakeProfile, d->cmSettings->renderingSetting, @@ -356,12 +356,12 @@ void DImgInterface::slotImageLoaded(const LoadingDescription &loadingDescription TQFile::exists(d->cmSettings->inputSetting)); d->image.getICCProfilFromFile(TQFile::encodeName(d->cmSettings->workspaceSetting)); - if (d->tqparent) d->tqparent->unsetCursor(); + if (d->parent) d->parent->unsetCursor(); break; case -1: - if (d->tqparent) d->tqparent->setCursor( KCursor::waitCursor() ); + if (d->parent) d->parent->setCursor( KCursor::waitCursor() ); d->image.getICCProfilFromFile(TQFile::encodeName(d->cmSettings->workspaceSetting)); - if (d->tqparent) d->tqparent->unsetCursor(); + if (d->parent) d->parent->unsetCursor(); DDebug() << "dimginterface.cpp: Apply pressed" << endl; break; } @@ -375,11 +375,11 @@ void DImgInterface::slotImageLoaded(const LoadingDescription &loadingDescription // Ask or apply? if (d->cmSettings->askOrApplySetting) { - if (d->tqparent) d->tqparent->setCursor( KCursor::waitCursor() ); + if (d->parent) d->parent->setCursor( KCursor::waitCursor() ); trans.setProfiles(TQFile::encodeName(d->cmSettings->workspaceSetting)); trans.apply(d->image, fakeProfile, d->cmSettings->renderingSetting, d->cmSettings->BPCSetting, false, false); - if (d->tqparent) d->tqparent->unsetCursor(); + if (d->parent) d->parent->unsetCursor(); } else { @@ -395,21 +395,21 @@ void DImgInterface::slotImageLoaded(const LoadingDescription &loadingDescription DImg preview = d->image.smoothScale(240, 180, TQSize::ScaleMin); trans.setProfiles(TQFile::encodeName(d->cmSettings->workspaceSetting)); - ColorCorrectionDlg dlg(d->tqparent, &preview, &trans, fileName); + ColorCorrectionDlg dlg(d->parent, &preview, &trans, fileName); switch (dlg.exec()) { case TQDialog::Accepted: - if (d->tqparent) d->tqparent->setCursor( KCursor::waitCursor() ); + if (d->parent) d->parent->setCursor( KCursor::waitCursor() ); trans.apply(d->image, fakeProfile, d->cmSettings->renderingSetting, d->cmSettings->BPCSetting, false, false); d->image.getICCProfilFromFile(TQFile::encodeName(d->cmSettings->workspaceSetting)); - if (d->tqparent) d->tqparent->unsetCursor(); + if (d->parent) d->parent->unsetCursor(); break; case -1: - if (d->tqparent) d->tqparent->setCursor( KCursor::waitCursor() ); + if (d->parent) d->parent->setCursor( KCursor::waitCursor() ); d->image.getICCProfilFromFile(TQFile::encodeName(d->cmSettings->workspaceSetting)); - if (d->tqparent) d->tqparent->unsetCursor(); + if (d->parent) d->parent->unsetCursor(); DDebug() << "dimginterface.cpp: Apply pressed" << endl; break; } @@ -424,7 +424,7 @@ void DImgInterface::slotImageLoaded(const LoadingDescription &loadingDescription "No color transform will be applied. " "Please check the \"Color Management\" " "configuration in digiKam's setup to verify the ICC path."); - KMessageBox::information(d->tqparent, message); + KMessageBox::information(d->parent, message); } } } diff --git a/digikam/utilities/imageeditor/canvas/dimginterface.h b/digikam/utilities/imageeditor/canvas/dimginterface.h index 9e01893c..d17ca30d 100644 --- a/digikam/utilities/imageeditor/canvas/dimginterface.h +++ b/digikam/utilities/imageeditor/canvas/dimginterface.h @@ -60,7 +60,7 @@ public: DImgInterface(); ~DImgInterface(); - void load(const TQString& filename, IOFileSettingsContainer *iofileSettings, TQWidget *tqparent=0); + void load(const TQString& filename, IOFileSettingsContainer *iofileSettings, TQWidget *parent=0); void setICCSettings(ICCSettingsContainer *cmSettings); void setExposureSettings(ExposureSettingsContainer *expoSettings); diff --git a/digikam/utilities/imageeditor/canvas/imageplugin.cpp b/digikam/utilities/imageeditor/canvas/imageplugin.cpp index 389c7b34..c7ae00c7 100644 --- a/digikam/utilities/imageeditor/canvas/imageplugin.cpp +++ b/digikam/utilities/imageeditor/canvas/imageplugin.cpp @@ -32,8 +32,8 @@ namespace Digikam { -ImagePlugin::ImagePlugin(TQObject *tqparent, const char* name) - : TQObject(tqparent, name) +ImagePlugin::ImagePlugin(TQObject *parent, const char* name) + : TQObject(parent, name) { } diff --git a/digikam/utilities/imageeditor/canvas/imageplugin.h b/digikam/utilities/imageeditor/canvas/imageplugin.h index 0d66ec45..19dfabde 100644 --- a/digikam/utilities/imageeditor/canvas/imageplugin.h +++ b/digikam/utilities/imageeditor/canvas/imageplugin.h @@ -51,7 +51,7 @@ class DIGIKAM_EXPORT ImagePlugin : public TQObject, public KXMLGUIClient public: - ImagePlugin(TQObject *tqparent, const char* name=0); + ImagePlugin(TQObject *parent, const char* name=0); virtual ~ImagePlugin(); virtual void setEnabledSelectionActions(bool enable); diff --git a/digikam/utilities/imageeditor/canvas/imagepluginloader.cpp b/digikam/utilities/imageeditor/canvas/imagepluginloader.cpp index bf5ca1a9..231c5b57 100644 --- a/digikam/utilities/imageeditor/canvas/imagepluginloader.cpp +++ b/digikam/utilities/imageeditor/canvas/imagepluginloader.cpp @@ -83,8 +83,8 @@ ImagePluginLoader* ImagePluginLoader::instance() return m_instance; } -ImagePluginLoader::ImagePluginLoader(TQObject *tqparent, SplashScreen *splash) - : TQObject(tqparent) +ImagePluginLoader::ImagePluginLoader(TQObject *parent, SplashScreen *splash) + : TQObject(parent) { m_instance = this; d = new ImagePluginLoaderPrivate; diff --git a/digikam/utilities/imageeditor/canvas/imagepluginloader.h b/digikam/utilities/imageeditor/canvas/imagepluginloader.h index db23d446..55ffe933 100644 --- a/digikam/utilities/imageeditor/canvas/imagepluginloader.h +++ b/digikam/utilities/imageeditor/canvas/imagepluginloader.h @@ -49,7 +49,7 @@ class DIGIKAM_EXPORT ImagePluginLoader : public TQObject public: - ImagePluginLoader(TQObject *tqparent, SplashScreen *splash=0); + ImagePluginLoader(TQObject *parent, SplashScreen *splash=0); ~ImagePluginLoader(); static ImagePluginLoader* instance(); diff --git a/digikam/utilities/imageeditor/editor/editorstackview.cpp b/digikam/utilities/imageeditor/editor/editorstackview.cpp index f96b8a4e..27fc2ef0 100644 --- a/digikam/utilities/imageeditor/editor/editorstackview.cpp +++ b/digikam/utilities/imageeditor/editor/editorstackview.cpp @@ -48,8 +48,8 @@ public: Canvas *canvas; }; -EditorStackView::EditorStackView(TQWidget *tqparent) - : TQWidgetStack(tqparent, 0, TQt::WDestructiveClose) +EditorStackView::EditorStackView(TQWidget *parent) + : TQWidgetStack(parent, 0, TQt::WDestructiveClose) { d = new EditorStackViewPriv; } diff --git a/digikam/utilities/imageeditor/editor/editorstackview.h b/digikam/utilities/imageeditor/editor/editorstackview.h index e2a76185..3cccab89 100644 --- a/digikam/utilities/imageeditor/editor/editorstackview.h +++ b/digikam/utilities/imageeditor/editor/editorstackview.h @@ -54,7 +54,7 @@ public: public: - EditorStackView(TQWidget *tqparent=0); + EditorStackView(TQWidget *parent=0); ~EditorStackView(); void setCanvas(Canvas* canvas); diff --git a/digikam/utilities/imageeditor/editor/editortool.cpp b/digikam/utilities/imageeditor/editor/editortool.cpp index fa70b284..55c17890 100644 --- a/digikam/utilities/imageeditor/editor/editortool.cpp +++ b/digikam/utilities/imageeditor/editor/editortool.cpp @@ -69,8 +69,8 @@ public: EditorToolSettings *settings; }; -EditorTool::EditorTool(TQObject *tqparent) - : TQObject(tqparent) +EditorTool::EditorTool(TQObject *parent) + : TQObject(parent) { d = new EditorToolPriv; d->timer = new TQTimer(this); @@ -234,8 +234,8 @@ public: DImgThreadedFilter *threadedFilter; }; -EditorToolThreaded::EditorToolThreaded(TQObject *tqparent) - : EditorTool(tqparent) +EditorToolThreaded::EditorToolThreaded(TQObject *parent) + : EditorTool(parent) { d = new EditorToolThreadedPriv; } diff --git a/digikam/utilities/imageeditor/editor/editortool.h b/digikam/utilities/imageeditor/editor/editortool.h index 041d899a..3a434ebd 100644 --- a/digikam/utilities/imageeditor/editor/editortool.h +++ b/digikam/utilities/imageeditor/editor/editortool.h @@ -48,7 +48,7 @@ class DIGIKAM_EXPORT EditorTool : public TQObject public: - EditorTool(TQObject *tqparent); + EditorTool(TQObject *parent); virtual ~EditorTool(); void init(); @@ -114,7 +114,7 @@ public: public: - EditorToolThreaded(TQObject *tqparent); + EditorToolThreaded(TQObject *parent); virtual ~EditorToolThreaded(); /** Set the small text to show in editor status progress bar during diff --git a/digikam/utilities/imageeditor/editor/editortoolsettings.cpp b/digikam/utilities/imageeditor/editor/editortoolsettings.cpp index 1d09d966..2e3920be 100644 --- a/digikam/utilities/imageeditor/editor/editortoolsettings.cpp +++ b/digikam/utilities/imageeditor/editor/editortoolsettings.cpp @@ -104,8 +104,8 @@ public: RIntNumInput *guideSize; }; -EditorToolSettings::EditorToolSettings(int buttonMask, int toolMask, TQWidget *tqparent) - : TQScrollView(tqparent) +EditorToolSettings::EditorToolSettings(int buttonMask, int toolMask, TQWidget *parent) + : TQScrollView(parent) { d = new EditorToolSettingsPriv; diff --git a/digikam/utilities/imageeditor/editor/editortoolsettings.h b/digikam/utilities/imageeditor/editor/editortoolsettings.h index b2e84810..0f859090 100644 --- a/digikam/utilities/imageeditor/editor/editortoolsettings.h +++ b/digikam/utilities/imageeditor/editor/editortoolsettings.h @@ -65,7 +65,7 @@ public: public: - EditorToolSettings(int buttonMask, int toolMask=NoTool, TQWidget *tqparent=0); + EditorToolSettings(int buttonMask, int toolMask=NoTool, TQWidget *parent=0); ~EditorToolSettings(); virtual void setBusy(bool){}; diff --git a/digikam/utilities/imageeditor/editor/imageiface.cpp b/digikam/utilities/imageeditor/editor/imageiface.cpp index 061fd394..e1bedc9f 100644 --- a/digikam/utilities/imageeditor/editor/imageiface.cpp +++ b/digikam/utilities/imageeditor/editor/imageiface.cpp @@ -69,7 +69,7 @@ public: TQPixmap qcheck; TQPixmap qpix; - TQBitmap qtqmask; + TQBitmap qmask; DImg previewImage; DImg targetPreviewImage; @@ -86,7 +86,7 @@ ImageIface::ImageIface(int w, int h) d->originalHeight = DImgInterface::defaultInterface()->origHeight(); d->originalBytesDepth = DImgInterface::defaultInterface()->bytesDepth(); - d->qpix.setMask(d->qtqmask); + d->qpix.setMask(d->qmask); d->qcheck.resize(8, 8); TQPainter p; @@ -199,7 +199,7 @@ uchar* ImageIface::getPreviewImage() const // only create another copy if needed, in putPreviewImage d->targetPreviewImage = d->previewImage; - d->qtqmask.resize(d->previewWidth, d->previewHeight); + d->qmask.resize(d->previewWidth, d->previewHeight); d->qpix.resize(d->previewWidth, d->previewHeight); if (d->usePreviewSelection) diff --git a/digikam/utilities/imageeditor/rawimport/rawimport.cpp b/digikam/utilities/imageeditor/rawimport/rawimport.cpp index dcce2841..1c7fee3c 100644 --- a/digikam/utilities/imageeditor/rawimport/rawimport.cpp +++ b/digikam/utilities/imageeditor/rawimport/rawimport.cpp @@ -68,8 +68,8 @@ public: RawPreview *previewWidget; }; -RawImport::RawImport(const KURL& url, TQObject *tqparent) - : EditorToolThreaded(tqparent) +RawImport::RawImport(const KURL& url, TQObject *parent) + : EditorToolThreaded(parent) { d = new RawImportPriv; d->previewWidget = new RawPreview(url, 0); diff --git a/digikam/utilities/imageeditor/rawimport/rawimport.h b/digikam/utilities/imageeditor/rawimport/rawimport.h index 4f865d6f..abf554b0 100644 --- a/digikam/utilities/imageeditor/rawimport/rawimport.h +++ b/digikam/utilities/imageeditor/rawimport/rawimport.h @@ -50,7 +50,7 @@ class DIGIKAM_EXPORT RawImport : public EditorToolThreaded public: - RawImport(const KURL& url, TQObject *tqparent); + RawImport(const KURL& url, TQObject *parent); ~RawImport(); DRawDecoding rawDecodingSettings(); diff --git a/digikam/utilities/imageeditor/rawimport/rawpostprocessing.cpp b/digikam/utilities/imageeditor/rawimport/rawpostprocessing.cpp index 9bf78bae..d45dd5e4 100644 --- a/digikam/utilities/imageeditor/rawimport/rawpostprocessing.cpp +++ b/digikam/utilities/imageeditor/rawimport/rawpostprocessing.cpp @@ -35,8 +35,8 @@ namespace Digikam { -RawPostProcessing::RawPostProcessing(DImg *orgImage, TQObject *tqparent, const DRawDecoding& settings) - : DImgThreadedFilter(orgImage, tqparent, "RawPostProcessing") +RawPostProcessing::RawPostProcessing(DImg *orgImage, TQObject *parent, const DRawDecoding& settings) + : DImgThreadedFilter(orgImage, parent, "RawPostProcessing") { m_customRawSettings = settings; initFilter(); diff --git a/digikam/utilities/imageeditor/rawimport/rawpostprocessing.h b/digikam/utilities/imageeditor/rawimport/rawpostprocessing.h index f55b6f6e..3b3c7761 100644 --- a/digikam/utilities/imageeditor/rawimport/rawpostprocessing.h +++ b/digikam/utilities/imageeditor/rawimport/rawpostprocessing.h @@ -40,7 +40,7 @@ class DIGIKAM_EXPORT RawPostProcessing : public DImgThreadedFilter public: - RawPostProcessing(DImg *orgImage, TQObject *tqparent=0, const DRawDecoding& settings=DRawDecoding()); + RawPostProcessing(DImg *orgImage, TQObject *parent=0, const DRawDecoding& settings=DRawDecoding()); // Constructor for slave mode: execute immediately in current thread with specified master filter RawPostProcessing(DImgThreadedFilter *parentFilter, const DImg &orgImage, const DImg &destImage, diff --git a/digikam/utilities/imageeditor/rawimport/rawpreview.cpp b/digikam/utilities/imageeditor/rawimport/rawpreview.cpp index f3a995a2..352d821f 100644 --- a/digikam/utilities/imageeditor/rawimport/rawpreview.cpp +++ b/digikam/utilities/imageeditor/rawimport/rawpreview.cpp @@ -85,8 +85,8 @@ public: LoadingDescription loadingDesc; }; -RawPreview::RawPreview(const KURL& url, TQWidget *tqparent) - : PreviewWidget(tqparent) +RawPreview::RawPreview(const KURL& url, TQWidget *parent) + : PreviewWidget(parent) { d = new RawPreviewPriv; d->thread = new ManagedLoadSaveThread; diff --git a/digikam/utilities/imageeditor/rawimport/rawpreview.h b/digikam/utilities/imageeditor/rawimport/rawpreview.h index a2cdc745..f7d73bc1 100644 --- a/digikam/utilities/imageeditor/rawimport/rawpreview.h +++ b/digikam/utilities/imageeditor/rawimport/rawpreview.h @@ -54,7 +54,7 @@ Q_OBJECT public: - RawPreview(const KURL& url, TQWidget *tqparent); + RawPreview(const KURL& url, TQWidget *parent); ~RawPreview(); DImg& demosaicedImage() const; diff --git a/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp b/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp index 492cc7d5..97936f6d 100644 --- a/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp +++ b/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp @@ -161,8 +161,8 @@ public: DcrawSettingsWidget *decodingSettingsBox; }; -RawSettingsBox::RawSettingsBox(const KURL& url, TQWidget *tqparent) - : EditorToolSettings(Default|Ok|Cancel, NoTool, tqparent) +RawSettingsBox::RawSettingsBox(const KURL& url, TQWidget *parent) + : EditorToolSettings(Default|Ok|Cancel, NoTool, parent) { d = new RawSettingsBoxPriv; diff --git a/digikam/utilities/imageeditor/rawimport/rawsettingsbox.h b/digikam/utilities/imageeditor/rawimport/rawsettingsbox.h index 1cc2f0e1..69b69b99 100644 --- a/digikam/utilities/imageeditor/rawimport/rawsettingsbox.h +++ b/digikam/utilities/imageeditor/rawimport/rawsettingsbox.h @@ -47,7 +47,7 @@ class DIGIKAM_EXPORT RawSettingsBox : public EditorToolSettings public: - RawSettingsBox(const KURL& url, TQWidget *tqparent); + RawSettingsBox(const KURL& url, TQWidget *parent); ~RawSettingsBox(); void setBusy(bool b); diff --git a/digikam/utilities/imageeditor/tools/imageprint.cpp b/digikam/utilities/imageeditor/tools/imageprint.cpp index 98e24378..8589e938 100644 --- a/digikam/utilities/imageeditor/tools/imageprint.cpp +++ b/digikam/utilities/imageeditor/tools/imageprint.cpp @@ -327,7 +327,7 @@ public: autoRotate = 0; colorManaged = 0; cmPreferences = 0; - tqparent = 0; + parent = 0; width = 0; height = 0; units = 0; @@ -346,7 +346,7 @@ public: TQPushButton *cmPreferences; - TQWidget *tqparent; + TQWidget *parent; KDoubleNumInput *width; KDoubleNumInput *height; @@ -359,12 +359,12 @@ public: ImageEditorPrintDialogPage::Unit previousUnit; }; -ImageEditorPrintDialogPage::ImageEditorPrintDialogPage(DImg& image, TQWidget *tqparent, const char *name ) - : KPrintDialogPage( tqparent, name ) +ImageEditorPrintDialogPage::ImageEditorPrintDialogPage(DImg& image, TQWidget *parent, const char *name ) + : KPrintDialogPage( parent, name ) { d = new ImageEditorPrintDialogPagePrivate; d->image = image; - d->tqparent = tqparent; + d->parent = parent; setTitle( i18n("Image Settings") ); readSettings(); @@ -747,7 +747,7 @@ void ImageEditorPrintDialogPage::readSettings() void ImageEditorPrintDialogPage::slotSetupDlg() { - EditorWindow* editor = dynamic_cast(d->tqparent); + EditorWindow* editor = dynamic_cast(d->parent); editor->setup(true); } diff --git a/digikam/utilities/imageeditor/tools/imageprint.h b/digikam/utilities/imageeditor/tools/imageprint.h index aa1abf35..8a1d7874 100644 --- a/digikam/utilities/imageeditor/tools/imageprint.h +++ b/digikam/utilities/imageeditor/tools/imageprint.h @@ -90,7 +90,7 @@ public: public: - ImageEditorPrintDialogPage(DImg& image, TQWidget *tqparent=0L, const char *name=0); + ImageEditorPrintDialogPage(DImg& image, TQWidget *parent=0L, const char *name=0); ~ImageEditorPrintDialogPage(); virtual void getOptions(TQMap& opts, bool incldef = false); diff --git a/digikam/utilities/imageeditor/tools/imageresize.cpp b/digikam/utilities/imageeditor/tools/imageresize.cpp index 12f4e543..2895c4e6 100644 --- a/digikam/utilities/imageeditor/tools/imageresize.cpp +++ b/digikam/utilities/imageeditor/tools/imageresize.cpp @@ -96,7 +96,7 @@ public: ImageResizePriv() { currentRenderingMode = NoneRendering; - tqparent = 0; + parent = 0; preserveRatioBox = 0; useGreycstorationBox = 0; mainTab = 0; @@ -120,7 +120,7 @@ public: double prevWP; double prevHP; - TQWidget *tqparent; + TQWidget *parent; TQLabel *restorationTips; @@ -143,16 +143,16 @@ public: GreycstorationWidget *settingsWidget; }; -ImageResize::ImageResize(TQWidget* tqparent) +ImageResize::ImageResize(TQWidget* parent) : KDialogBase(Plain, i18n("Resize Image"), Help|Default|User2|User3|Ok|Cancel, Ok, - tqparent, 0, true, false, + parent, 0, true, false, TQString(), i18n("&Save As..."), i18n("&Load...")) { d = new ImageResizePriv; - d->tqparent = tqparent; + d->parent = parent; setHelp("resizetool.anchor", "digikam"); TQString whatsThis; setButtonWhatsThis( Default, i18n("

    Reset all filter parameters to their default values.") ); @@ -474,7 +474,7 @@ void ImageResize::slotCancel() if (d->currentRenderingMode != ImageResizePriv::NoneRendering) { d->greycstorationIface->stopComputation(); - d->tqparent->unsetCursor(); + d->parent->unsetCursor(); } done(Cancel); @@ -490,7 +490,7 @@ void ImageResize::closeEvent(TQCloseEvent *e) if (d->currentRenderingMode != ImageResizePriv::NoneRendering) { d->greycstorationIface->stopComputation(); - d->tqparent->unsetCursor(); + d->parent->unsetCursor(); } e->accept(); @@ -516,7 +516,7 @@ void ImageResize::slotOk() enableButton(User2, false); enableButton(User3, false); - d->tqparent->setCursor( KCursor::waitCursor() ); + d->parent->setCursor( KCursor::waitCursor() ); writeUserSettings(); ImageIface iface(0, 0); uchar *data = iface.getOriginalImage(); @@ -550,7 +550,7 @@ void ImageResize::slotOk() image.resize(d->wInput->value(), d->hInput->value()); iface.putOriginalImage(i18n("Resize"), image.bits(), image.width(), image.height()); - d->tqparent->unsetCursor(); + d->parent->unsetCursor(); accept(); } } @@ -582,7 +582,7 @@ void ImageResize::customEvent(TQCustomEvent *event) iface.putOriginalImage(i18n("Resize"), resizedImage.bits(), resizedImage.width(), resizedImage.height()); - d->tqparent->unsetCursor(); + d->parent->unsetCursor(); accept(); break; } diff --git a/digikam/utilities/imageeditor/tools/imageresize.h b/digikam/utilities/imageeditor/tools/imageresize.h index d4383faf..2ba2f056 100644 --- a/digikam/utilities/imageeditor/tools/imageresize.h +++ b/digikam/utilities/imageeditor/tools/imageresize.h @@ -48,7 +48,7 @@ class DIGIKAM_EXPORT ImageResize : public KDialogBase public: - ImageResize(TQWidget* tqparent); + ImageResize(TQWidget* parent); ~ImageResize(); protected: diff --git a/digikam/utilities/lighttable/lighttablebar.cpp b/digikam/utilities/lighttable/lighttablebar.cpp index fd1a6e1b..3ffb35ee 100644 --- a/digikam/utilities/lighttable/lighttablebar.cpp +++ b/digikam/utilities/lighttable/lighttablebar.cpp @@ -90,8 +90,8 @@ public: ImageInfo *info; }; -LightTableBar::LightTableBar(TQWidget* tqparent, int orientation, bool exifRotate) - : ThumbBarView(tqparent, orientation, exifRotate) +LightTableBar::LightTableBar(TQWidget* parent, int orientation, bool exifRotate) + : ThumbBarView(parent, orientation, exifRotate) { d = new LightTableBarPriv; setMouseTracking(true); @@ -821,8 +821,8 @@ bool LightTableBarItem::isOnRightPanel() const // ------------------------------------------------------------------------- -LightTableBarToolTip::LightTableBarToolTip(ThumbBarView *tqparent) - : ThumbBarToolTip(tqparent) +LightTableBarToolTip::LightTableBarToolTip(ThumbBarView *parent) + : ThumbBarToolTip(parent) { } diff --git a/digikam/utilities/lighttable/lighttablebar.h b/digikam/utilities/lighttable/lighttablebar.h index d43178d4..288a61f3 100644 --- a/digikam/utilities/lighttable/lighttablebar.h +++ b/digikam/utilities/lighttable/lighttablebar.h @@ -51,7 +51,7 @@ class DIGIKAM_EXPORT LightTableBar : public ThumbBarView public: - LightTableBar(TQWidget* tqparent, int orientation=Vertical, bool exifRotate=true); + LightTableBar(TQWidget* parent, int orientation=Vertical, bool exifRotate=true); ~LightTableBar(); ImageInfo* currentItemImageInfo() const; @@ -141,7 +141,7 @@ class DIGIKAM_EXPORT LightTableBarToolTip : public ThumbBarToolTip { public: - LightTableBarToolTip(ThumbBarView *tqparent); + LightTableBarToolTip(ThumbBarView *parent); private: diff --git a/digikam/utilities/lighttable/lighttablepreview.cpp b/digikam/utilities/lighttable/lighttablepreview.cpp index 1c2c704f..8d2c4aaf 100644 --- a/digikam/utilities/lighttable/lighttablepreview.cpp +++ b/digikam/utilities/lighttable/lighttablepreview.cpp @@ -120,8 +120,8 @@ public: PreviewLoadThread *previewPreloadThread; }; -LightTablePreview::LightTablePreview(TQWidget *tqparent) - : PreviewWidget(tqparent) +LightTablePreview::LightTablePreview(TQWidget *parent) + : PreviewWidget(parent) { d = new LightTablePreviewPriv; diff --git a/digikam/utilities/lighttable/lighttablepreview.h b/digikam/utilities/lighttable/lighttablepreview.h index 4cdc5c24..41a68499 100644 --- a/digikam/utilities/lighttable/lighttablepreview.h +++ b/digikam/utilities/lighttable/lighttablepreview.h @@ -53,7 +53,7 @@ Q_OBJECT public: - LightTablePreview(TQWidget *tqparent=0); + LightTablePreview(TQWidget *parent=0); ~LightTablePreview(); void setLoadFullImageSize(bool b); diff --git a/digikam/utilities/lighttable/lighttableview.cpp b/digikam/utilities/lighttable/lighttableview.cpp index d23c3562..70bd0007 100644 --- a/digikam/utilities/lighttable/lighttableview.cpp +++ b/digikam/utilities/lighttable/lighttableview.cpp @@ -65,8 +65,8 @@ public: LightTablePreview *rightPreview; }; -LightTableView::LightTableView(TQWidget *tqparent) - : TQFrame(tqparent, 0, TQt::WDestructiveClose) +LightTableView::LightTableView(TQWidget *parent) + : TQFrame(parent, 0, TQt::WDestructiveClose) { d = new LightTableViewPriv; diff --git a/digikam/utilities/lighttable/lighttableview.h b/digikam/utilities/lighttable/lighttableview.h index 2b0fe50f..25bafa52 100644 --- a/digikam/utilities/lighttable/lighttableview.h +++ b/digikam/utilities/lighttable/lighttableview.h @@ -48,7 +48,7 @@ Q_OBJECT public: - LightTableView(TQWidget *tqparent=0); + LightTableView(TQWidget *parent=0); ~LightTableView(); void setSyncPreview(bool sync); diff --git a/digikam/utilities/scripts/digitaglinktree b/digikam/utilities/scripts/digitaglinktree index b8759f87..8d0d12c9 100644 --- a/digikam/utilities/scripts/digitaglinktree +++ b/digikam/utilities/scripts/digitaglinktree @@ -155,7 +155,7 @@ sub getTaggedImages{ # would be the path "people/friends". Images with tag friends would then be # linked in the directory /people/friends/ for($i=0; $i<=$#tags; $i++){ - $pid=$tags[$i]->{"pid"}; # Get tqparent tag id of current tag + $pid=$tags[$i]->{"pid"}; # Get parent tag id of current tag $tag=$tags[$i]->{"tag"}; # Start constructing tag path if( $pid == 0 ){ $tagPath{$i}=$tag; @@ -164,7 +164,7 @@ sub getTaggedImages{ while( $pid != 0){ $tag=$tags[$pid]->{"tag"} . "/$tag"; # add parents tag name to path - $pid=$tags[$pid]->{"pid"}; # look if tqparent has another tqparent + $pid=$tags[$pid]->{"pid"}; # look if parent has another parent } # Store path constructed $tagPath{$i}=$tag; @@ -281,7 +281,7 @@ sub createLinkTree{ # For tags that have subtags there is a path defined in qtagPath # describing the parentrelationship as directory path like "friends/family/brothers" # If it is defined we want to use this path instead of the flat tag name like "brothers" - # Doing so results in a directory hirachy that maps the tags tqparent relationships + # Doing so results in a directory hirachy that maps the tags parent relationships # into the filesystem. if( $opt_flat ){ # For flat option just use the last subdirectory @@ -487,7 +487,7 @@ sub usage{ " -H Use hard links instead of symbolic links in linktree. \n", " -f If there are hierarchical tags (tags that have subtags) \n", " create a flat tag directory hierarchy. So directories for\n", - " subtags are at the same directory level like their tqparent tags\n", + " subtags are at the same directory level like their parent tags\n", " -h Print this help \n", " -v Print scripts version number \n"; diff --git a/digikam/utilities/scripts/digitaglinktree.1 b/digikam/utilities/scripts/digitaglinktree.1 index cbc10d2e..fdfe9e09 100644 --- a/digikam/utilities/scripts/digitaglinktree.1 +++ b/digikam/utilities/scripts/digitaglinktree.1 @@ -130,7 +130,7 @@ will not run. In digikam photos can have hierachical tags (tags that have subtags). In this case digitaglinktree would by default add a directory for the tag and a subdirectory for each of the subtags of this tag. By setting \fB \-f \fR a subtag is treated like a -regular tag just as its tqparent tag so digitaglinktree will create all subdirectories +regular tag just as its parent tag so digitaglinktree will create all subdirectories for tags and subtags at the same level independent of the tag - subtag hierarchy. .TP diff --git a/digikam/utilities/setup/cameraselection.cpp b/digikam/utilities/setup/cameraselection.cpp index e1f30b85..b76156d1 100644 --- a/digikam/utilities/setup/cameraselection.cpp +++ b/digikam/utilities/setup/cameraselection.cpp @@ -96,9 +96,9 @@ public: SearchTextBar *searchBar; }; -CameraSelection::CameraSelection( TQWidget* tqparent ) +CameraSelection::CameraSelection( TQWidget* parent ) : KDialogBase(Plain, i18n("Camera Configuration"), - Help|Ok|Cancel, Ok, tqparent, 0, true, true) + Help|Ok|Cancel, Ok, parent, 0, true, true) { d = new CameraSelectionPriv; diff --git a/digikam/utilities/setup/cameraselection.h b/digikam/utilities/setup/cameraselection.h index 0b96cbe9..04e2fbcd 100644 --- a/digikam/utilities/setup/cameraselection.h +++ b/digikam/utilities/setup/cameraselection.h @@ -48,7 +48,7 @@ class CameraSelection : public KDialogBase public: - CameraSelection(TQWidget *tqparent=0); + CameraSelection(TQWidget *parent=0); ~CameraSelection(); void setCamera(const TQString& title, const TQString& model, diff --git a/digikam/utilities/setup/setup.cpp b/digikam/utilities/setup/setup.cpp index 2bfece71..bdfe3d03 100644 --- a/digikam/utilities/setup/setup.cpp +++ b/digikam/utilities/setup/setup.cpp @@ -132,8 +132,8 @@ public: SetupPlugins *pluginsPage; }; -Setup::Setup(TQWidget* tqparent, const char* name, Setup::Page page) - : KDialogBase(IconList, i18n("Configure"), Help|Ok|Cancel, Ok, tqparent, +Setup::Setup(TQWidget* parent, const char* name, Setup::Page page) + : KDialogBase(IconList, i18n("Configure"), Help|Ok|Cancel, Ok, parent, name, true, true ) { d = new SetupPrivate; diff --git a/digikam/utilities/setup/setup.h b/digikam/utilities/setup/setup.h index f266e845..a94a21c0 100644 --- a/digikam/utilities/setup/setup.h +++ b/digikam/utilities/setup/setup.h @@ -62,7 +62,7 @@ public: Miscellaneous }; - Setup(TQWidget* tqparent=0, const char* name=0, Page page=LastPageUsed); + Setup(TQWidget* parent=0, const char* name=0, Page page=LastPageUsed); ~Setup(); SetupPlugins *kipiPluginsPage(); diff --git a/digikam/utilities/setup/setupcamera.cpp b/digikam/utilities/setup/setupcamera.cpp index 4495314c..02ffab6f 100644 --- a/digikam/utilities/setup/setupcamera.cpp +++ b/digikam/utilities/setup/setupcamera.cpp @@ -75,12 +75,12 @@ public: TQListView *listView; }; -SetupCamera::SetupCamera( TQWidget* tqparent ) - : TQWidget( tqparent ) +SetupCamera::SetupCamera( TQWidget* parent ) + : TQWidget( parent ) { d = new SetupCameraPriv; - TQVBoxLayout *mainLayout = new TQVBoxLayout(tqparent); + TQVBoxLayout *mainLayout = new TQVBoxLayout(parent); TQGridLayout* groupBoxLayout = new TQGridLayout( this, 2, 5, 0, KDialog::spacingHint() ); d->listView = new TQListView( this ); diff --git a/digikam/utilities/setup/setupcamera.h b/digikam/utilities/setup/setupcamera.h index 7ad3fef0..addd89e4 100644 --- a/digikam/utilities/setup/setupcamera.h +++ b/digikam/utilities/setup/setupcamera.h @@ -41,7 +41,7 @@ class SetupCamera : public TQWidget public: - SetupCamera( TQWidget* tqparent = 0 ); + SetupCamera( TQWidget* parent = 0 ); ~SetupCamera(); void applySettings(); diff --git a/digikam/utilities/setup/setupcollections.cpp b/digikam/utilities/setup/setupcollections.cpp index 7b9554ec..09d6ffa7 100644 --- a/digikam/utilities/setup/setupcollections.cpp +++ b/digikam/utilities/setup/setupcollections.cpp @@ -80,12 +80,12 @@ public: TQPushButton *delCollectionButton; }; -SetupCollections::SetupCollections(TQWidget* tqparent ) - : TQWidget(tqparent) +SetupCollections::SetupCollections(TQWidget* parent ) + : TQWidget(parent) { d = new SetupCollectionsPriv; - TQVBoxLayout *mainLayout = new TQVBoxLayout(tqparent); + TQVBoxLayout *mainLayout = new TQVBoxLayout(parent); TQGridLayout *collectionGroupLayout = new TQGridLayout( this, 2, 5, 0, KDialog::spacingHint() ); // -------------------------------------------------------- diff --git a/digikam/utilities/setup/setupcollections.h b/digikam/utilities/setup/setupcollections.h index 4c9b33bc..32046ee2 100644 --- a/digikam/utilities/setup/setupcollections.h +++ b/digikam/utilities/setup/setupcollections.h @@ -40,7 +40,7 @@ class SetupCollections : public TQWidget public: - SetupCollections(TQWidget* tqparent = 0); + SetupCollections(TQWidget* parent = 0); ~SetupCollections(); void applySettings(); diff --git a/digikam/utilities/setup/setupdcraw.cpp b/digikam/utilities/setup/setupdcraw.cpp index ebb37f15..afedd31d 100644 --- a/digikam/utilities/setup/setupdcraw.cpp +++ b/digikam/utilities/setup/setupdcraw.cpp @@ -70,12 +70,12 @@ public: KDcrawIface::DcrawSettingsWidget *dcrawSettings; }; -SetupDcraw::SetupDcraw(TQWidget* tqparent ) - : TQWidget(tqparent) +SetupDcraw::SetupDcraw(TQWidget* parent ) + : TQWidget(parent) { d = new SetupDcrawPriv; - TQVBoxLayout *tqlayout = new TQVBoxLayout(tqparent, 0, KDialog::spacingHint()); - d->dcrawSettings = new DcrawSettingsWidget(tqparent, DcrawSettingsWidget::SIXTEENBITS); + TQVBoxLayout *tqlayout = new TQVBoxLayout(parent, 0, KDialog::spacingHint()); + d->dcrawSettings = new DcrawSettingsWidget(parent, DcrawSettingsWidget::SIXTEENBITS); d->dcrawSettings->setItemIconSet(0, SmallIconSet("kdcraw")); d->dcrawSettings->setItemIconSet(1, SmallIconSet("whitebalance")); d->dcrawSettings->setItemIconSet(2, SmallIconSet("lensdistortion")); diff --git a/digikam/utilities/setup/setupdcraw.h b/digikam/utilities/setup/setupdcraw.h index d8f166af..abf46d99 100644 --- a/digikam/utilities/setup/setupdcraw.h +++ b/digikam/utilities/setup/setupdcraw.h @@ -44,7 +44,7 @@ class DIGIKAM_EXPORT SetupDcraw : public TQWidget public: - SetupDcraw(TQWidget* tqparent = 0); + SetupDcraw(TQWidget* parent = 0); ~SetupDcraw(); void applySettings(); diff --git a/digikam/utilities/setup/setupeditor.cpp b/digikam/utilities/setup/setupeditor.cpp index c6e2df87..ef7f4dd1 100644 --- a/digikam/utilities/setup/setupeditor.cpp +++ b/digikam/utilities/setup/setupeditor.cpp @@ -73,15 +73,15 @@ public: KColorButton *overExposureColor; }; -SetupEditor::SetupEditor(TQWidget* tqparent ) - : TQWidget(tqparent) +SetupEditor::SetupEditor(TQWidget* parent ) + : TQWidget(parent) { d = new SetupEditorPriv; - TQVBoxLayout *tqlayout = new TQVBoxLayout( tqparent, 0, KDialog::spacingHint() ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( parent, 0, KDialog::spacingHint() ); // -------------------------------------------------------- - TQVGroupBox *interfaceOptionsGroup = new TQVGroupBox(i18n("Interface Options"), tqparent); + TQVGroupBox *interfaceOptionsGroup = new TQVGroupBox(i18n("Interface Options"), parent); d->themebackgroundColor = new TQCheckBox(i18n("&Use theme background color"), interfaceOptionsGroup); @@ -106,7 +106,7 @@ SetupEditor::SetupEditor(TQWidget* tqparent ) // -------------------------------------------------------- - TQVGroupBox *exposureOptionsGroup = new TQVGroupBox(i18n("Exposure Indicators"), tqparent); + TQVGroupBox *exposureOptionsGroup = new TQVGroupBox(i18n("Exposure Indicators"), parent); TQHBox *underExpoBox = new TQHBox(exposureOptionsGroup); TQLabel *underExpoColorlabel = new TQLabel( i18n("&Under-exposure color:"), underExpoBox); diff --git a/digikam/utilities/setup/setupeditor.h b/digikam/utilities/setup/setupeditor.h index 1d3ab105..783cf5c5 100644 --- a/digikam/utilities/setup/setupeditor.h +++ b/digikam/utilities/setup/setupeditor.h @@ -40,7 +40,7 @@ class SetupEditor : public TQWidget public: - SetupEditor(TQWidget* tqparent = 0); + SetupEditor(TQWidget* parent = 0); ~SetupEditor(); void applySettings(); diff --git a/digikam/utilities/setup/setupgeneral.cpp b/digikam/utilities/setup/setupgeneral.cpp index 9ff04fdf..fd8a72b7 100644 --- a/digikam/utilities/setup/setupgeneral.cpp +++ b/digikam/utilities/setup/setupgeneral.cpp @@ -100,16 +100,16 @@ public: KDialogBase *mainDialog; }; -SetupGeneral::SetupGeneral(TQWidget* tqparent, KDialogBase* dialog ) - : TQWidget(tqparent) +SetupGeneral::SetupGeneral(TQWidget* parent, KDialogBase* dialog ) + : TQWidget(parent) { d = new SetupGeneralPriv; d->mainDialog = dialog; - TQVBoxLayout *tqlayout = new TQVBoxLayout( tqparent, 0, KDialog::spacingHint() ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( parent, 0, KDialog::spacingHint() ); // -------------------------------------------------------- - TQHGroupBox *albumPathBox = new TQHGroupBox(tqparent); + TQHGroupBox *albumPathBox = new TQHGroupBox(parent); albumPathBox->setTitle(i18n("Album &Library Path")); d->albumPathEdit = new KURLRequester(albumPathBox); @@ -129,7 +129,7 @@ SetupGeneral::SetupGeneral(TQWidget* tqparent, KDialogBase* dialog ) // -------------------------------------------------------- - TQVGroupBox *iconTextGroup = new TQVGroupBox(i18n("Thumbnail Information"), tqparent); + TQVGroupBox *iconTextGroup = new TQVGroupBox(i18n("Thumbnail Information"), parent); d->iconShowNameBox = new TQCheckBox(i18n("Show file &name"), iconTextGroup); TQWhatsThis::add( d->iconShowNameBox, i18n("

    Set this option to show the file name below the image thumbnail.")); @@ -165,7 +165,7 @@ SetupGeneral::SetupGeneral(TQWidget* tqparent, KDialogBase* dialog ) // -------------------------------------------------------- - TQVGroupBox *interfaceOptionsGroup = new TQVGroupBox(i18n("Interface Options"), tqparent); + TQVGroupBox *interfaceOptionsGroup = new TQVGroupBox(i18n("Interface Options"), parent); interfaceOptionsGroup->setColumnLayout(0, Qt::Vertical ); interfaceOptionsGroup->tqlayout()->setMargin(KDialog::marginHint()); TQGridLayout* ifaceSettingsLayout = new TQGridLayout(interfaceOptionsGroup->tqlayout(), 3, 4, KDialog::spacingHint()); diff --git a/digikam/utilities/setup/setupgeneral.h b/digikam/utilities/setup/setupgeneral.h index f3a4b43e..8621b551 100644 --- a/digikam/utilities/setup/setupgeneral.h +++ b/digikam/utilities/setup/setupgeneral.h @@ -43,7 +43,7 @@ class SetupGeneral : public TQWidget public: - SetupGeneral(TQWidget* tqparent = 0, KDialogBase* dialog = 0); + SetupGeneral(TQWidget* parent = 0, KDialogBase* dialog = 0); ~SetupGeneral(); void applySettings(); diff --git a/digikam/utilities/setup/setupicc.cpp b/digikam/utilities/setup/setupicc.cpp index 1cb4368e..971824a9 100644 --- a/digikam/utilities/setup/setupicc.cpp +++ b/digikam/utilities/setup/setupicc.cpp @@ -145,16 +145,16 @@ public: SqueezedComboBox *monitorProfilesKC; }; -SetupICC::SetupICC(TQWidget* tqparent, KDialogBase* dialog ) - : TQWidget(tqparent) +SetupICC::SetupICC(TQWidget* parent, KDialogBase* dialog ) + : TQWidget(parent) { d = new SetupICCPriv(); d->mainDialog = dialog; - TQVBoxLayout *tqlayout = new TQVBoxLayout( tqparent, 0, KDialog::spacingHint()); + TQVBoxLayout *tqlayout = new TQVBoxLayout( parent, 0, KDialog::spacingHint()); // -------------------------------------------------------- - TQGroupBox *colorPolicy = new TQGroupBox(0, Qt::Horizontal, i18n("Color Management Policy"), tqparent); + TQGroupBox *colorPolicy = new TQGroupBox(0, Qt::Horizontal, i18n("Color Management Policy"), parent); TQGridLayout* grid = new TQGridLayout( colorPolicy->tqlayout(), 1, 2, KDialog::spacingHint()); d->enableColorManagement = new TQCheckBox(colorPolicy); @@ -197,7 +197,7 @@ SetupICC::SetupICC(TQWidget* tqparent, KDialogBase* dialog ) // -------------------------------------------------------- - d->defaultPathGB = new TQHGroupBox(tqparent); + d->defaultPathGB = new TQHGroupBox(parent); d->defaultPathGB->setTitle(i18n("Color Profiles Directory")); d->defaultPathKU = new KURLRequester(d->defaultPathGB); @@ -210,7 +210,7 @@ SetupICC::SetupICC(TQWidget* tqparent, KDialogBase* dialog ) // -------------------------------------------------------- - d->profilesGB = new TQGroupBox(0, Qt::Horizontal, i18n("ICC Profiles Settings"), tqparent); + d->profilesGB = new TQGroupBox(0, Qt::Horizontal, i18n("ICC Profiles Settings"), parent); TQGridLayout* grid2 = new TQGridLayout( d->profilesGB->tqlayout(), 4, 3, KDialog::spacingHint()); grid2->setColStretch(2, 10); @@ -293,7 +293,7 @@ SetupICC::SetupICC(TQWidget* tqparent, KDialogBase* dialog ) // -------------------------------------------------------- - d->advancedSettingsGB = new TQVGroupBox(i18n("Advanced Settings"), tqparent); + d->advancedSettingsGB = new TQVGroupBox(i18n("Advanced Settings"), parent); d->bpcAlgorithm = new TQCheckBox(d->advancedSettingsGB); d->bpcAlgorithm->setText(i18n("Use black point compensation")); diff --git a/digikam/utilities/setup/setupicc.h b/digikam/utilities/setup/setupicc.h index 79422401..f902f1e5 100644 --- a/digikam/utilities/setup/setupicc.h +++ b/digikam/utilities/setup/setupicc.h @@ -49,7 +49,7 @@ class DIGIKAM_EXPORT SetupICC : public TQWidget public: - SetupICC(TQWidget* tqparent = 0, KDialogBase* dialog = 0); + SetupICC(TQWidget* parent = 0, KDialogBase* dialog = 0); ~SetupICC(); void applySettings(); diff --git a/digikam/utilities/setup/setupidentity.cpp b/digikam/utilities/setup/setupidentity.cpp index f2514ad0..31824e66 100644 --- a/digikam/utilities/setup/setupidentity.cpp +++ b/digikam/utilities/setup/setupidentity.cpp @@ -66,11 +66,11 @@ public: KLineEdit *copyrightEdit; }; -SetupIdentity::SetupIdentity(TQWidget* tqparent ) - : TQWidget(tqparent) +SetupIdentity::SetupIdentity(TQWidget* parent ) + : TQWidget(parent) { d = new SetupIdentityPriv; - TQVBoxLayout *tqlayout = new TQVBoxLayout( tqparent, 0, KDialog::spacingHint() ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( parent, 0, KDialog::spacingHint() ); // -------------------------------------------------------- @@ -78,7 +78,7 @@ SetupIdentity::SetupIdentity(TQWidget* tqparent ) TQRegExp asciiRx("[\x20-\x7F]+$"); TQValidator *asciiValidator = new TQRegExpValidator(asciiRx, TQT_TQOBJECT(this)); - TQGroupBox *photographerIdGroup = new TQGroupBox(0, Qt::Horizontal, i18n("Photographer and Copyright Information"), tqparent); + TQGroupBox *photographerIdGroup = new TQGroupBox(0, Qt::Horizontal, i18n("Photographer and Copyright Information"), parent); TQGridLayout* grid = new TQGridLayout( photographerIdGroup->tqlayout(), 1, 1, KDialog::spacingHint()); TQLabel *label1 = new TQLabel(i18n("Author:"), photographerIdGroup); @@ -108,7 +108,7 @@ SetupIdentity::SetupIdentity(TQWidget* tqparent ) // -------------------------------------------------------- - TQGroupBox *creditsGroup = new TQGroupBox(0, Qt::Horizontal, i18n("Credit and Copyright"), tqparent); + TQGroupBox *creditsGroup = new TQGroupBox(0, Qt::Horizontal, i18n("Credit and Copyright"), parent); TQGridLayout* grid2 = new TQGridLayout( creditsGroup->tqlayout(), 2, 1, KDialog::spacingHint()); TQLabel *label3 = new TQLabel(i18n("Credit:"), creditsGroup); @@ -171,7 +171,7 @@ SetupIdentity::SetupIdentity(TQWidget* tqparent ) "IPTC text tags only support the printable " "ASCII " "characters set and limit strings size. " - "Use contextual help for details."), tqparent); + "Use contextual help for details."), parent); // -------------------------------------------------------- diff --git a/digikam/utilities/setup/setupidentity.h b/digikam/utilities/setup/setupidentity.h index 260f2e51..645b5a7e 100644 --- a/digikam/utilities/setup/setupidentity.h +++ b/digikam/utilities/setup/setupidentity.h @@ -40,7 +40,7 @@ class SetupIdentity : public TQWidget public: - SetupIdentity(TQWidget* tqparent = 0); + SetupIdentity(TQWidget* parent = 0); ~SetupIdentity(); void applySettings(); diff --git a/digikam/utilities/setup/setupiofiles.cpp b/digikam/utilities/setup/setupiofiles.cpp index ecc13d48..69a9b528 100644 --- a/digikam/utilities/setup/setupiofiles.cpp +++ b/digikam/utilities/setup/setupiofiles.cpp @@ -67,37 +67,37 @@ public: JP2KSettings *JPEG2000Options; }; -SetupIOFiles::SetupIOFiles(TQWidget* tqparent ) - : TQWidget(tqparent) +SetupIOFiles::SetupIOFiles(TQWidget* parent ) + : TQWidget(parent) { d = new SetupIOFilesPriv; - TQVBoxLayout* vbox = new TQVBoxLayout(tqparent); + TQVBoxLayout* vbox = new TQVBoxLayout(parent); //-- JPEG Settings ------------------------------------------------------ - d->JPEGOptions = new JPEGSettings(tqparent); - KSeparator *line1 = new KSeparator(Qt::Horizontal, tqparent); + d->JPEGOptions = new JPEGSettings(parent); + KSeparator *line1 = new KSeparator(Qt::Horizontal, parent); vbox->addWidget(d->JPEGOptions); vbox->addWidget(line1); //-- PNG Settings ------------------------------------------------------- - d->PNGOptions = new PNGSettings(tqparent); - KSeparator *line2 = new KSeparator(Qt::Horizontal, tqparent); + d->PNGOptions = new PNGSettings(parent); + KSeparator *line2 = new KSeparator(Qt::Horizontal, parent); vbox->addWidget(d->PNGOptions); vbox->addWidget(line2); //-- TIFF Settings ------------------------------------------------------ - d->TIFFOptions = new TIFFSettings(tqparent); - KSeparator *line3 = new KSeparator(Qt::Horizontal, tqparent); + d->TIFFOptions = new TIFFSettings(parent); + KSeparator *line3 = new KSeparator(Qt::Horizontal, parent); vbox->addWidget(d->TIFFOptions); vbox->addWidget(line3); //-- JPEG 2000 Settings ------------------------------------------------- - d->JPEG2000Options = new JP2KSettings(tqparent); + d->JPEG2000Options = new JP2KSettings(parent); vbox->addWidget(d->JPEG2000Options); vbox->addStretch(10); diff --git a/digikam/utilities/setup/setupiofiles.h b/digikam/utilities/setup/setupiofiles.h index 53ceeff3..de935f2b 100644 --- a/digikam/utilities/setup/setupiofiles.h +++ b/digikam/utilities/setup/setupiofiles.h @@ -44,7 +44,7 @@ class DIGIKAM_EXPORT SetupIOFiles : public TQWidget public: - SetupIOFiles(TQWidget* tqparent = 0); + SetupIOFiles(TQWidget* parent = 0); ~SetupIOFiles(); void applySettings(); diff --git a/digikam/utilities/setup/setuplighttable.cpp b/digikam/utilities/setup/setuplighttable.cpp index 7089c760..0ec4a78d 100644 --- a/digikam/utilities/setup/setuplighttable.cpp +++ b/digikam/utilities/setup/setuplighttable.cpp @@ -63,15 +63,15 @@ public: TQCheckBox *loadFullImageSize; }; -SetupLightTable::SetupLightTable(TQWidget* tqparent ) - : TQWidget(tqparent) +SetupLightTable::SetupLightTable(TQWidget* parent ) + : TQWidget(parent) { d = new SetupLightTablePriv; - TQVBoxLayout *tqlayout = new TQVBoxLayout( tqparent, 0, KDialog::spacingHint() ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( parent, 0, KDialog::spacingHint() ); // -------------------------------------------------------- - TQVGroupBox *interfaceOptionsGroup = new TQVGroupBox(i18n("Interface Options"), tqparent); + TQVGroupBox *interfaceOptionsGroup = new TQVGroupBox(i18n("Interface Options"), parent); d->autoSyncPreview = new TQCheckBox(i18n("Synchronize panels automatically"), interfaceOptionsGroup); diff --git a/digikam/utilities/setup/setuplighttable.h b/digikam/utilities/setup/setuplighttable.h index 015172a6..7830d0d7 100644 --- a/digikam/utilities/setup/setuplighttable.h +++ b/digikam/utilities/setup/setuplighttable.h @@ -40,7 +40,7 @@ class SetupLightTable : public TQWidget public: - SetupLightTable(TQWidget* tqparent = 0); + SetupLightTable(TQWidget* parent = 0); ~SetupLightTable(); void applySettings(); diff --git a/digikam/utilities/setup/setupmetadata.cpp b/digikam/utilities/setup/setupmetadata.cpp index f342435d..72e311c1 100644 --- a/digikam/utilities/setup/setupmetadata.cpp +++ b/digikam/utilities/setup/setupmetadata.cpp @@ -85,15 +85,15 @@ public: TQCheckBox *saveCreditsIptcBox; }; -SetupMetadata::SetupMetadata(TQWidget* tqparent ) - : TQWidget(tqparent) +SetupMetadata::SetupMetadata(TQWidget* parent ) + : TQWidget(parent) { d = new SetupMetadataPriv; - TQVBoxLayout *mainLayout = new TQVBoxLayout(tqparent, 0, KDialog::spacingHint()); + TQVBoxLayout *mainLayout = new TQVBoxLayout(parent, 0, KDialog::spacingHint()); // -------------------------------------------------------- - TQGroupBox *ExifGroup = new TQGroupBox(1, Qt::Horizontal, i18n("EXIF Actions"), tqparent); + TQGroupBox *ExifGroup = new TQGroupBox(1, Qt::Horizontal, i18n("EXIF Actions"), parent); d->ExifRotateBox = new TQCheckBox(ExifGroup); d->ExifRotateBox->setText(i18n("Show images/thumbs &rotated according to orientation tag")); @@ -103,7 +103,7 @@ SetupMetadata::SetupMetadata(TQWidget* tqparent ) // -------------------------------------------------------- - TQGroupBox *IptcGroup = new TQGroupBox(1, Qt::Horizontal, i18n("IPTC Actions"), tqparent); + TQGroupBox *IptcGroup = new TQGroupBox(1, Qt::Horizontal, i18n("IPTC Actions"), parent); d->saveTagsIptcBox = new TQCheckBox(IptcGroup); d->saveTagsIptcBox->setText(i18n("&Save image tags as \"Keywords\" tag")); @@ -124,7 +124,7 @@ SetupMetadata::SetupMetadata(TQWidget* tqparent ) // -------------------------------------------------------- - TQGroupBox *commonGroup = new TQGroupBox(1, Qt::Horizontal, i18n("Common Metadata Actions"), tqparent); + TQGroupBox *commonGroup = new TQGroupBox(1, Qt::Horizontal, i18n("Common Metadata Actions"), parent); d->saveCommentsBox = new TQCheckBox(commonGroup); d->saveCommentsBox->setText(i18n("&Save image captions as embedded text")); @@ -143,7 +143,7 @@ SetupMetadata::SetupMetadata(TQWidget* tqparent ) // -------------------------------------------------------- - TQHBox *hbox = new TQHBox(tqparent); + TQHBox *hbox = new TQHBox(parent); KURLLabel *exiv2LogoLabel = new KURLLabel(hbox); exiv2LogoLabel->setText(TQString()); diff --git a/digikam/utilities/setup/setupmetadata.h b/digikam/utilities/setup/setupmetadata.h index 3a474d05..9fcbd7cb 100644 --- a/digikam/utilities/setup/setupmetadata.h +++ b/digikam/utilities/setup/setupmetadata.h @@ -41,7 +41,7 @@ class SetupMetadata : public TQWidget public: - SetupMetadata(TQWidget* tqparent = 0); + SetupMetadata(TQWidget* parent = 0); ~SetupMetadata(); void applySettings(); diff --git a/digikam/utilities/setup/setupmime.cpp b/digikam/utilities/setup/setupmime.cpp index b86a27d0..acf415eb 100644 --- a/digikam/utilities/setup/setupmime.cpp +++ b/digikam/utilities/setup/setupmime.cpp @@ -76,15 +76,15 @@ public: TQLineEdit *rawFileFilterEdit; }; -SetupMime::SetupMime(TQWidget* tqparent ) - : TQWidget(tqparent) +SetupMime::SetupMime(TQWidget* parent ) + : TQWidget(parent) { d = new SetupMimePriv; - TQVBoxLayout *tqlayout = new TQVBoxLayout(tqparent, 0, KDialog::spacingHint()); + TQVBoxLayout *tqlayout = new TQVBoxLayout(parent, 0, KDialog::spacingHint()); // -------------------------------------------------------- - TQGroupBox *imageFileFilterBox = new TQGroupBox(0, Qt::Horizontal, i18n("Image Files"), tqparent); + TQGroupBox *imageFileFilterBox = new TQGroupBox(0, Qt::Horizontal, i18n("Image Files"), parent); TQGridLayout* grid1 = new TQGridLayout(imageFileFilterBox->tqlayout(), 1, 1, KDialog::spacingHint()); TQLabel *logoLabel1 = new TQLabel(imageFileFilterBox); @@ -115,7 +115,7 @@ SetupMime::SetupMime(TQWidget* tqparent ) // -------------------------------------------------------- - TQGroupBox *movieFileFilterBox = new TQGroupBox(0, Qt::Horizontal, i18n("Movie Files"), tqparent); + TQGroupBox *movieFileFilterBox = new TQGroupBox(0, Qt::Horizontal, i18n("Movie Files"), parent); TQGridLayout* grid2 = new TQGridLayout(movieFileFilterBox->tqlayout(), 1, 1, KDialog::spacingHint()); TQLabel *logoLabel2 = new TQLabel(movieFileFilterBox); @@ -146,7 +146,7 @@ SetupMime::SetupMime(TQWidget* tqparent ) // -------------------------------------------------------- - TQGroupBox *audioFileFilterBox = new TQGroupBox(0, Qt::Horizontal, i18n("Audio Files"), tqparent); + TQGroupBox *audioFileFilterBox = new TQGroupBox(0, Qt::Horizontal, i18n("Audio Files"), parent); TQGridLayout* grid3 = new TQGridLayout(audioFileFilterBox->tqlayout(), 1, 1, KDialog::spacingHint()); TQLabel *logoLabel3 = new TQLabel(audioFileFilterBox); @@ -177,7 +177,7 @@ SetupMime::SetupMime(TQWidget* tqparent ) // -------------------------------------------------------- - TQGroupBox *rawFileFilterBox = new TQGroupBox(0, Qt::Horizontal, i18n("RAW Files"), tqparent); + TQGroupBox *rawFileFilterBox = new TQGroupBox(0, Qt::Horizontal, i18n("RAW Files"), parent); TQGridLayout* grid4 = new TQGridLayout(rawFileFilterBox->tqlayout(), 1, 1, KDialog::spacingHint()); TQLabel *logoLabel4 = new TQLabel(rawFileFilterBox); diff --git a/digikam/utilities/setup/setupmime.h b/digikam/utilities/setup/setupmime.h index 190ef559..3d909b3a 100644 --- a/digikam/utilities/setup/setupmime.h +++ b/digikam/utilities/setup/setupmime.h @@ -40,7 +40,7 @@ class SetupMime : public TQWidget public: - SetupMime(TQWidget* tqparent = 0); + SetupMime(TQWidget* parent = 0); ~SetupMime(); void applySettings(); diff --git a/digikam/utilities/setup/setupmisc.cpp b/digikam/utilities/setup/setupmisc.cpp index 6981bb2b..601189d0 100644 --- a/digikam/utilities/setup/setupmisc.cpp +++ b/digikam/utilities/setup/setupmisc.cpp @@ -59,12 +59,12 @@ public: TQCheckBox* scanAtStart; }; -SetupMisc::SetupMisc(TQWidget* tqparent) - : TQWidget( tqparent ) +SetupMisc::SetupMisc(TQWidget* parent) + : TQWidget( parent ) { d = new SetupMiscPriv; - TQVBoxLayout *mainLayout = new TQVBoxLayout(tqparent); + TQVBoxLayout *mainLayout = new TQVBoxLayout(parent); TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); // -------------------------------------------------------- diff --git a/digikam/utilities/setup/setupmisc.h b/digikam/utilities/setup/setupmisc.h index 38b15f6c..92918ba4 100644 --- a/digikam/utilities/setup/setupmisc.h +++ b/digikam/utilities/setup/setupmisc.h @@ -38,7 +38,7 @@ class SetupMisc : public TQWidget { public: - SetupMisc(TQWidget* tqparent); + SetupMisc(TQWidget* parent); ~SetupMisc(); void applySettings(); diff --git a/digikam/utilities/setup/setupplugins.cpp b/digikam/utilities/setup/setupplugins.cpp index 53e6e903..7d7f097f 100644 --- a/digikam/utilities/setup/setupplugins.cpp +++ b/digikam/utilities/setup/setupplugins.cpp @@ -66,15 +66,15 @@ public: KIPI::ConfigWidget* kipiConfig; }; -SetupPlugins::SetupPlugins(TQWidget* tqparent ) - : TQWidget(tqparent) +SetupPlugins::SetupPlugins(TQWidget* parent ) + : TQWidget(parent) { d = new SetupPluginsPriv; - TQVBoxLayout *tqlayout = new TQVBoxLayout(tqparent); - d->pluginsNumber = new TQLabel(tqparent); + TQVBoxLayout *tqlayout = new TQVBoxLayout(parent); + d->pluginsNumber = new TQLabel(parent); d->pluginsNumber->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter); - d->kipiConfig = KIPI::PluginLoader::instance()->configWidget( tqparent ); + d->kipiConfig = KIPI::PluginLoader::instance()->configWidget( parent ); TQString pluginsListHelp = i18n("

    A list of available Kipi plugins appears below."); TQWhatsThis::add(d->kipiConfig, pluginsListHelp); diff --git a/digikam/utilities/setup/setupplugins.h b/digikam/utilities/setup/setupplugins.h index 667872e2..82bca1d0 100644 --- a/digikam/utilities/setup/setupplugins.h +++ b/digikam/utilities/setup/setupplugins.h @@ -40,7 +40,7 @@ class SetupPlugins : public TQWidget public: - SetupPlugins(TQWidget* tqparent = 0); + SetupPlugins(TQWidget* parent = 0); ~SetupPlugins(); void initPlugins(int kipiPluginsNumber); diff --git a/digikam/utilities/setup/setupslideshow.cpp b/digikam/utilities/setup/setupslideshow.cpp index c0416fba..886c8bfc 100644 --- a/digikam/utilities/setup/setupslideshow.cpp +++ b/digikam/utilities/setup/setupslideshow.cpp @@ -73,40 +73,40 @@ public: KIntNumInput *delayInput; }; -SetupSlideShow::SetupSlideShow(TQWidget* tqparent ) - : TQWidget(tqparent) +SetupSlideShow::SetupSlideShow(TQWidget* parent ) + : TQWidget(parent) { d = new SetupSlideShowPriv; - TQVBoxLayout *tqlayout = new TQVBoxLayout( tqparent ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( parent ); - d->delayInput = new KIntNumInput(5, tqparent); + d->delayInput = new KIntNumInput(5, parent); d->delayInput->setRange(1, 3600, 1, true ); d->delayInput->setLabel( i18n("&Delay between images:"), AlignLeft|AlignTop ); TQWhatsThis::add( d->delayInput, i18n("

    The delay, in seconds, between images.")); - d->startWithCurrent = new TQCheckBox(i18n("Start with current image"), tqparent); + d->startWithCurrent = new TQCheckBox(i18n("Start with current image"), parent); TQWhatsThis::add( d->startWithCurrent, i18n("

    If this option is enabled, slideshow will be started " "with currently selected image.")); - d->loopMode = new TQCheckBox(i18n("Display in a loop"), tqparent); + d->loopMode = new TQCheckBox(i18n("Display in a loop"), parent); TQWhatsThis::add( d->loopMode, i18n("

    Run the slideshow in endless repetition.")); - d->printName = new TQCheckBox(i18n("Print image file name"), tqparent); + d->printName = new TQCheckBox(i18n("Print image file name"), parent); TQWhatsThis::add( d->printName, i18n("

    Print the image file name at the bottom of the screen.")); - d->printDate = new TQCheckBox(i18n("Print image creation date"), tqparent); + d->printDate = new TQCheckBox(i18n("Print image creation date"), parent); TQWhatsThis::add( d->printDate, i18n("

    Print the image creation time/date at the bottom of the screen.")); - d->printApertureFocal = new TQCheckBox(i18n("Print camera aperture and focal length"), tqparent); + d->printApertureFocal = new TQCheckBox(i18n("Print camera aperture and focal length"), parent); TQWhatsThis::add( d->printApertureFocal, i18n("

    Print the camera aperture and focal length at the bottom of the screen.")); - d->printExpoSensitivity = new TQCheckBox(i18n("Print camera exposure and sensitivity"), tqparent); + d->printExpoSensitivity = new TQCheckBox(i18n("Print camera exposure and sensitivity"), parent); TQWhatsThis::add( d->printExpoSensitivity, i18n("

    Print the camera exposure and sensitivity at the bottom of the screen.")); - d->printMakeModel = new TQCheckBox(i18n("Print camera make and model"), tqparent); + d->printMakeModel = new TQCheckBox(i18n("Print camera make and model"), parent); TQWhatsThis::add( d->printMakeModel, i18n("

    Print the camera make and model at the bottom of the screen.")); - d->printComment = new TQCheckBox(i18n("Print image caption"), tqparent); + d->printComment = new TQCheckBox(i18n("Print image caption"), parent); TQWhatsThis::add( d->printComment, i18n("

    Print the image caption at the bottom of the screen.")); tqlayout->addWidget(d->delayInput); diff --git a/digikam/utilities/setup/setupslideshow.h b/digikam/utilities/setup/setupslideshow.h index 14db3be0..3b87795b 100644 --- a/digikam/utilities/setup/setupslideshow.h +++ b/digikam/utilities/setup/setupslideshow.h @@ -44,7 +44,7 @@ class DIGIKAM_EXPORT SetupSlideShow : public TQWidget public: - SetupSlideShow(TQWidget* tqparent = 0); + SetupSlideShow(TQWidget* parent = 0); ~SetupSlideShow(); void applySettings(); diff --git a/digikam/utilities/setup/setuptooltip.cpp b/digikam/utilities/setup/setuptooltip.cpp index 7070bcd7..74e30bd6 100644 --- a/digikam/utilities/setup/setuptooltip.cpp +++ b/digikam/utilities/setup/setuptooltip.cpp @@ -100,13 +100,13 @@ public: TQVGroupBox *digikamSettingBox; }; -SetupToolTip::SetupToolTip(TQWidget* tqparent) - : TQWidget(tqparent) +SetupToolTip::SetupToolTip(TQWidget* parent) + : TQWidget(parent) { d = new SetupToolTipPriv; - TQVBoxLayout *tqlayout = new TQVBoxLayout( tqparent, 0, KDialog::spacingHint() ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( parent, 0, KDialog::spacingHint() ); - d->showToolTipsBox = new TQCheckBox(i18n("Show album items toolti&ps"), tqparent); + d->showToolTipsBox = new TQCheckBox(i18n("Show album items toolti&ps"), parent); TQWhatsThis::add( d->showToolTipsBox, i18n("

    Set this option to display image information when " "the mouse hovers over an album item.")); @@ -114,7 +114,7 @@ SetupToolTip::SetupToolTip(TQWidget* tqparent) // -------------------------------------------------------- - d->fileSettingBox = new TQVGroupBox(i18n("File/Image Information"), tqparent); + d->fileSettingBox = new TQVGroupBox(i18n("File/Image Information"), parent); d->showFileNameBox = new TQCheckBox(i18n("Show file name"), d->fileSettingBox); TQWhatsThis::add( d->showFileNameBox, i18n("

    Set this option to display the image file name.")); @@ -135,7 +135,7 @@ SetupToolTip::SetupToolTip(TQWidget* tqparent) // -------------------------------------------------------- - d->photoSettingBox = new TQVGroupBox(i18n("Photograph Information"), tqparent); + d->photoSettingBox = new TQVGroupBox(i18n("Photograph Information"), parent); d->showPhotoMakeBox = new TQCheckBox(i18n("Show camera make and model"), d->photoSettingBox); TQWhatsThis::add( d->showPhotoMakeBox, i18n("

    Set this option to display the make and model of the " @@ -168,7 +168,7 @@ SetupToolTip::SetupToolTip(TQWidget* tqparent) // -------------------------------------------------------- - d->digikamSettingBox = new TQVGroupBox(i18n("digiKam Information"), tqparent); + d->digikamSettingBox = new TQVGroupBox(i18n("digiKam Information"), parent); d->showAlbumNameBox = new TQCheckBox(i18n("Show album name"), d->digikamSettingBox); TQWhatsThis::add( d->showAlbumNameBox, i18n("

    Set this option to display the album name.")); diff --git a/digikam/utilities/setup/setuptooltip.h b/digikam/utilities/setup/setuptooltip.h index 094d3afb..06af9fe3 100644 --- a/digikam/utilities/setup/setuptooltip.h +++ b/digikam/utilities/setup/setuptooltip.h @@ -40,7 +40,7 @@ class SetupToolTip : public TQWidget public: - SetupToolTip(TQWidget* tqparent = 0); + SetupToolTip(TQWidget* parent = 0); ~SetupToolTip(); void applySettings(); diff --git a/digikam/utilities/slideshow/toolbar.cpp b/digikam/utilities/slideshow/toolbar.cpp index a90166c5..6f0a5b44 100644 --- a/digikam/utilities/slideshow/toolbar.cpp +++ b/digikam/utilities/slideshow/toolbar.cpp @@ -63,8 +63,8 @@ public: TQToolButton *prevBtn; }; -ToolBar::ToolBar(TQWidget* tqparent) - : TQWidget(tqparent) +ToolBar::ToolBar(TQWidget* parent) + : TQWidget(parent) { d = new ToolBarPriv; diff --git a/digikam/utilities/slideshow/toolbar.h b/digikam/utilities/slideshow/toolbar.h index 82c54422..88cfa8ae 100644 --- a/digikam/utilities/slideshow/toolbar.h +++ b/digikam/utilities/slideshow/toolbar.h @@ -45,7 +45,7 @@ class DIGIKAM_EXPORT ToolBar : public TQWidget public: - ToolBar(TQWidget* tqparent); + ToolBar(TQWidget* parent); ~ToolBar(); bool canHide() const; -- cgit v1.2.3