From edfc85e62cba9be0a16a44c060141f33d0f28481 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 21 Jan 2025 14:25:31 +0900 Subject: Use tdeApp Signed-off-by: Michele Calgaro --- src/imageplugins/adjustcurves/adjustcurves.cpp | 8 ++-- src/imageplugins/adjustcurves/adjustcurvestool.cpp | 16 +++---- src/imageplugins/adjustlevels/adjustlevels.cpp | 12 ++--- src/imageplugins/adjustlevels/adjustlevelstool.cpp | 20 ++++---- .../antivignetting/antivignettingtool.cpp | 4 +- .../antivignetting/imageeffect_antivignetting.cpp | 4 +- src/imageplugins/blurfx/blurfxtool.cpp | 4 +- src/imageplugins/blurfx/imageeffect_blurfx.cpp | 4 +- src/imageplugins/border/bordertool.cpp | 4 +- src/imageplugins/border/imageeffect_border.cpp | 4 +- src/imageplugins/channelmixer/channelmixer.cpp | 8 ++-- src/imageplugins/channelmixer/channelmixertool.cpp | 16 +++---- src/imageplugins/charcoal/charcoaltool.cpp | 4 +- src/imageplugins/charcoal/imageeffect_charcoal.cpp | 4 +- src/imageplugins/colorfx/colorfxtool.cpp | 12 ++--- src/imageplugins/colorfx/imageeffect_colorfx.cpp | 12 ++--- src/imageplugins/coreplugin/autocorrectiontool.cpp | 12 ++--- src/imageplugins/coreplugin/bcgtool.cpp | 12 ++--- src/imageplugins/coreplugin/blurtool.cpp | 4 +- src/imageplugins/coreplugin/bwsepiatool.cpp | 22 ++++----- src/imageplugins/coreplugin/hsl/hsltool.cpp | 12 ++--- .../coreplugin/hsl/imageeffect_hsl.cpp | 12 ++--- src/imageplugins/coreplugin/iccprooftool.cpp | 54 +++++++++++----------- .../coreplugin/imageeffect_autocorrection.cpp | 12 ++--- src/imageplugins/coreplugin/imageeffect_bcg.cpp | 12 ++--- src/imageplugins/coreplugin/imageeffect_blur.cpp | 4 +- .../coreplugin/imageeffect_bwsepia.cpp | 12 ++--- .../coreplugin/imageeffect_iccproof.cpp | 16 +++---- src/imageplugins/coreplugin/imageeffect_redeye.cpp | 12 ++--- src/imageplugins/coreplugin/imageeffect_rgb.cpp | 12 ++--- src/imageplugins/coreplugin/imageplugin_core.cpp | 20 ++++---- .../coreplugin/ratiocrop/imageeffect_ratiocrop.cpp | 8 ++-- .../coreplugin/ratiocrop/ratiocroptool.cpp | 8 ++-- src/imageplugins/coreplugin/redeyetool.cpp | 12 ++--- src/imageplugins/coreplugin/rgbtool.cpp | 12 ++--- .../sharpnesseditor/imageeffect_sharpen.cpp | 4 +- .../coreplugin/sharpnesseditor/sharpentool.cpp | 14 +++--- src/imageplugins/distortionfx/distortionfxtool.cpp | 4 +- .../distortionfx/imageeffect_distortionfx.cpp | 4 +- src/imageplugins/emboss/embosstool.cpp | 4 +- src/imageplugins/emboss/imageeffect_emboss.cpp | 4 +- src/imageplugins/filmgrain/filmgraintool.cpp | 4 +- .../filmgrain/imageeffect_filmgrain.cpp | 4 +- src/imageplugins/freerotation/freerotationtool.cpp | 8 ++-- .../freerotation/imageeffect_freerotation.cpp | 8 ++-- src/imageplugins/hotpixels/blackframeparser.cpp | 2 +- src/imageplugins/hotpixels/hotpixelstool.cpp | 6 +-- .../hotpixels/imageeffect_hotpixels.cpp | 4 +- src/imageplugins/infrared/imageeffect_infrared.cpp | 4 +- src/imageplugins/infrared/infraredtool.cpp | 4 +- .../inpainting/imageeffect_inpainting.cpp | 8 ++-- .../inpainting/imageplugin_inpainting.cpp | 2 +- src/imageplugins/inpainting/inpaintingtool.cpp | 16 +++---- .../inserttext/imageeffect_inserttext.cpp | 8 ++-- src/imageplugins/inserttext/inserttexttool.cpp | 8 ++-- .../lensdistortion/imageeffect_lensdistortion.cpp | 4 +- .../lensdistortion/lensdistortiontool.cpp | 4 +- .../noisereduction/imageeffect_noisereduction.cpp | 4 +- .../noisereduction/noisereductiontool.cpp | 14 +++--- src/imageplugins/oilpaint/imageeffect_oilpaint.cpp | 4 +- src/imageplugins/oilpaint/oilpainttool.cpp | 4 +- .../perspective/imageeffect_perspective.cpp | 8 ++-- src/imageplugins/perspective/perspectivetool.cpp | 8 ++-- src/imageplugins/raindrop/imageeffect_raindrop.cpp | 4 +- src/imageplugins/raindrop/raindroptool.cpp | 4 +- .../restoration/imageeffect_restoration.cpp | 6 +-- src/imageplugins/restoration/restorationtool.cpp | 16 +++---- .../sheartool/imageeffect_sheartool.cpp | 8 ++-- src/imageplugins/sheartool/sheartool.cpp | 8 ++-- .../superimpose/imageeffect_superimpose.cpp | 6 +-- src/imageplugins/superimpose/superimposetool.cpp | 10 ++-- src/imageplugins/texture/imageeffect_texture.cpp | 4 +- src/imageplugins/texture/texturetool.cpp | 4 +- .../whitebalance/imageeffect_whitebalance.cpp | 10 ++-- src/imageplugins/whitebalance/whitebalancetool.cpp | 24 +++++----- 75 files changed, 339 insertions(+), 339 deletions(-) (limited to 'src/imageplugins') diff --git a/src/imageplugins/adjustcurves/adjustcurves.cpp b/src/imageplugins/adjustcurves/adjustcurves.cpp index ace9c9b3..dcda4da6 100644 --- a/src/imageplugins/adjustcurves/adjustcurves.cpp +++ b/src/imageplugins/adjustcurves/adjustcurves.cpp @@ -456,7 +456,7 @@ void AdjustCurveDialog::slotEffect() void AdjustCurveDialog::finalRendering() { - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); Digikam::ImageIface* iface = m_previewWidget->imageIface(); uchar *orgData = iface->getOriginalImage(); int w = iface->originalWidth(); @@ -473,7 +473,7 @@ void AdjustCurveDialog::finalRendering() m_curves->curvesLutProcess(orgData, desData, w, h); iface->putOriginalImage(i18n("Adjust Curve"), desData); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); delete [] orgData; delete [] desData; @@ -558,7 +558,7 @@ void AdjustCurveDialog::slotCurveTypeChanged(int type) void AdjustCurveDialog::readUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("adjustcurves Tool Dialog"); m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0)); // Luminosity. @@ -595,7 +595,7 @@ void AdjustCurveDialog::readUserSettings() void AdjustCurveDialog::writeUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("adjustcurves Tool Dialog"); config->writeEntry("Histogram Channel", m_channelCB->currentItem()); config->writeEntry("Histogram Scale", m_scaleBG->selectedId()); diff --git a/src/imageplugins/adjustcurves/adjustcurvestool.cpp b/src/imageplugins/adjustcurves/adjustcurvestool.cpp index 7bfd00f7..dbf2a08d 100644 --- a/src/imageplugins/adjustcurves/adjustcurvestool.cpp +++ b/src/imageplugins/adjustcurves/adjustcurvestool.cpp @@ -438,7 +438,7 @@ void AdjustCurvesTool::slotEffect() void AdjustCurvesTool::finalRendering() { - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); ImageIface* iface = m_previewWidget->imageIface(); uchar *orgData = iface->getOriginalImage(); int w = iface->originalWidth(); @@ -455,7 +455,7 @@ void AdjustCurvesTool::finalRendering() m_curvesWidget->curves()->curvesLutProcess(orgData, desData, w, h); iface->putOriginalImage(i18n("Adjust Curves"), desData); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); delete [] orgData; delete [] desData; @@ -539,7 +539,7 @@ void AdjustCurvesTool::slotCurveTypeChanged(int type) void AdjustCurvesTool::readSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("adjustcurves Tool"); m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0)); // Luminosity. @@ -578,7 +578,7 @@ void AdjustCurvesTool::readSettings() void AdjustCurvesTool::writeSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("adjustcurves Tool"); config->writeEntry("Histogram Channel", m_channelCB->currentItem()); config->writeEntry("Histogram Scale", m_scaleBG->selectedId()); @@ -620,14 +620,14 @@ void AdjustCurvesTool::slotLoadSettings() KURL loadCurvesFile; loadCurvesFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), - TQString( "*" ), kapp->activeWindow(), + TQString( "*" ), tdeApp->activeWindow(), TQString( i18n("Select Gimp Curves File to Load")) ); if( loadCurvesFile.isEmpty() ) return; if ( m_curvesWidget->curves()->loadCurvesFromGimpCurvesFile( loadCurvesFile ) == false ) { - KMessageBox::error(kapp->activeWindow(), i18n("Cannot load from the Gimp curves text file.")); + KMessageBox::error(tdeApp->activeWindow(), i18n("Cannot load from the Gimp curves text file.")); return; } @@ -641,14 +641,14 @@ void AdjustCurvesTool::slotSaveAsSettings() KURL saveCurvesFile; saveCurvesFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), - TQString( "*" ), kapp->activeWindow(), + TQString( "*" ), tdeApp->activeWindow(), TQString( i18n("Gimp Curves File to Save")) ); if( saveCurvesFile.isEmpty() ) return; if ( m_curvesWidget->curves()->saveCurvesToGimpCurvesFile( saveCurvesFile ) == false ) { - KMessageBox::error(kapp->activeWindow(), i18n("Cannot save to the Gimp curves text file.")); + KMessageBox::error(tdeApp->activeWindow(), i18n("Cannot save to the Gimp curves text file.")); return; } diff --git a/src/imageplugins/adjustlevels/adjustlevels.cpp b/src/imageplugins/adjustlevels/adjustlevels.cpp index 72d5e46b..4a65b275 100644 --- a/src/imageplugins/adjustlevels/adjustlevels.cpp +++ b/src/imageplugins/adjustlevels/adjustlevels.cpp @@ -288,12 +288,12 @@ AdjustLevelDialog::AdjustLevelDialog(TQWidget* parent) m_pickerColorButtonGroup->setFrameShape(TQFrame::NoFrame); m_autoButton = new TQPushButton(gboxSettings); - m_autoButton->setPixmap(kapp->iconLoader()->loadIcon("system-run", (TDEIcon::Group)TDEIcon::Toolbar)); TQToolTip::add( m_autoButton, i18n( "Adjust all levels automatically." ) ); + m_autoButton->setPixmap(tdeApp->iconLoader()->loadIcon("system-run", (TDEIcon::Group)TDEIcon::Toolbar)); TQToolTip::add( m_autoButton, i18n( "Adjust all levels automatically." ) ); TQWhatsThis::add( m_autoButton, i18n("

If you press this button, all channel levels will be adjusted " "automatically.")); m_resetButton = new TQPushButton(i18n("&Reset"), gboxSettings); - m_resetButton->setPixmap(kapp->iconLoader()->loadIcon("reload_page", (TDEIcon::Group)TDEIcon::Toolbar)); + m_resetButton->setPixmap(tdeApp->iconLoader()->loadIcon("reload_page", (TDEIcon::Group)TDEIcon::Toolbar)); TQToolTip::add( m_resetButton, i18n( "Reset current channel levels' values." ) ); TQWhatsThis::add( m_resetButton, i18n("

If you press this button, all levels' values " "from the current selected channel " @@ -596,7 +596,7 @@ void AdjustLevelDialog::slotEffect() void AdjustLevelDialog::finalRendering() { - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); Digikam::ImageIface* iface = m_previewWidget->imageIface(); uchar *orgData = iface->getOriginalImage(); int w = iface->originalWidth(); @@ -613,7 +613,7 @@ void AdjustLevelDialog::finalRendering() m_levels->levelsLutProcess(orgData, desData, w, h); iface->putOriginalImage(i18n("Adjust Level"), desData); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); delete [] orgData; delete [] desData; @@ -690,7 +690,7 @@ void AdjustLevelDialog::slotScaleChanged(int scale) void AdjustLevelDialog::readUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("adjustlevels Tool Dialog"); m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0)); // Luminosity. @@ -728,7 +728,7 @@ void AdjustLevelDialog::readUserSettings() void AdjustLevelDialog::writeUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("adjustlevels Tool Dialog"); config->writeEntry("Histogram Channel", m_channelCB->currentItem()); config->writeEntry("Histogram Scale", m_scaleBG->selectedId()); diff --git a/src/imageplugins/adjustlevels/adjustlevelstool.cpp b/src/imageplugins/adjustlevels/adjustlevelstool.cpp index 28066774..c8697226 100644 --- a/src/imageplugins/adjustlevels/adjustlevelstool.cpp +++ b/src/imageplugins/adjustlevels/adjustlevelstool.cpp @@ -285,12 +285,12 @@ AdjustLevelsTool::AdjustLevelsTool(TQObject* parent) m_pickerColorButtonGroup->setFrameShape(TQFrame::NoFrame); m_autoButton = new TQPushButton(m_gboxSettings->plainPage()); - m_autoButton->setPixmap(kapp->iconLoader()->loadIcon("system-run", (TDEIcon::Group)TDEIcon::Toolbar)); TQToolTip::add( m_autoButton, i18n( "Adjust all levels automatically." ) ); + m_autoButton->setPixmap(tdeApp->iconLoader()->loadIcon("system-run", (TDEIcon::Group)TDEIcon::Toolbar)); TQToolTip::add( m_autoButton, i18n( "Adjust all levels automatically." ) ); TQWhatsThis::add( m_autoButton, i18n("

If you press this button, all channel levels will be adjusted " "automatically.")); m_resetButton = new TQPushButton(i18n("&Reset"), m_gboxSettings->plainPage()); - m_resetButton->setPixmap(kapp->iconLoader()->loadIcon("reload_page", (TDEIcon::Group)TDEIcon::Toolbar)); + m_resetButton->setPixmap(tdeApp->iconLoader()->loadIcon("reload_page", (TDEIcon::Group)TDEIcon::Toolbar)); TQToolTip::add( m_resetButton, i18n( "Reset current channel levels' values." ) ); TQWhatsThis::add( m_resetButton, i18n("

If you press this button, all levels' values " "from the current selected channel " @@ -579,7 +579,7 @@ void AdjustLevelsTool::slotEffect() void AdjustLevelsTool::finalRendering() { - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); ImageIface* iface = m_previewWidget->imageIface(); uchar *orgData = iface->getOriginalImage(); int w = iface->originalWidth(); @@ -596,7 +596,7 @@ void AdjustLevelsTool::finalRendering() m_levels->levelsLutProcess(orgData, desData, w, h); iface->putOriginalImage(i18n("Adjust Level"), desData); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); delete [] orgData; delete [] desData; @@ -672,7 +672,7 @@ void AdjustLevelsTool::slotScaleChanged(int scale) void AdjustLevelsTool::readSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("adjustlevels Tool"); m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0)); // Luminosity. @@ -710,7 +710,7 @@ void AdjustLevelsTool::readSettings() void AdjustLevelsTool::writeSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("adjustlevels Tool"); config->writeEntry("Histogram Channel", m_channelCB->currentItem()); config->writeEntry("Histogram Scale", m_scaleBG->selectedId()); @@ -752,14 +752,14 @@ void AdjustLevelsTool::slotLoadSettings() KURL loadLevelsFile; loadLevelsFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), - TQString( "*" ), kapp->activeWindow(), + TQString( "*" ), tdeApp->activeWindow(), TQString( i18n("Select Gimp Levels File to Load")) ); if( loadLevelsFile.isEmpty() ) return; if ( m_levels->loadLevelsFromGimpLevelsFile( loadLevelsFile ) == false ) { - KMessageBox::error(kapp->activeWindow(), i18n("Cannot load from the Gimp levels text file.")); + KMessageBox::error(tdeApp->activeWindow(), i18n("Cannot load from the Gimp levels text file.")); return; } @@ -772,14 +772,14 @@ void AdjustLevelsTool::slotSaveAsSettings() KURL saveLevelsFile; saveLevelsFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), - TQString( "*" ), kapp->activeWindow(), + TQString( "*" ), tdeApp->activeWindow(), TQString( i18n("Gimp Levels File to Save")) ); if( saveLevelsFile.isEmpty() ) return; if ( m_levels->saveLevelsToGimpLevelsFile( saveLevelsFile ) == false ) { - KMessageBox::error(kapp->activeWindow(), i18n("Cannot save to the Gimp levels text file.")); + KMessageBox::error(tdeApp->activeWindow(), i18n("Cannot save to the Gimp levels text file.")); return; } diff --git a/src/imageplugins/antivignetting/antivignettingtool.cpp b/src/imageplugins/antivignetting/antivignettingtool.cpp index d8f211c7..6f468794 100644 --- a/src/imageplugins/antivignetting/antivignettingtool.cpp +++ b/src/imageplugins/antivignetting/antivignettingtool.cpp @@ -212,7 +212,7 @@ void AntiVignettingTool::renderingFinished() void AntiVignettingTool::readSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("antivignettings Tool"); m_densityInput->blockSignals(true); @@ -241,7 +241,7 @@ void AntiVignettingTool::readSettings() void AntiVignettingTool::writeSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("antivignettings Tool"); config->writeEntry("DensityAjustment", m_densityInput->value()); config->writeEntry("PowerAjustment", m_powerInput->value()); diff --git a/src/imageplugins/antivignetting/imageeffect_antivignetting.cpp b/src/imageplugins/antivignetting/imageeffect_antivignetting.cpp index 7d7a00c6..494fe430 100644 --- a/src/imageplugins/antivignetting/imageeffect_antivignetting.cpp +++ b/src/imageplugins/antivignetting/imageeffect_antivignetting.cpp @@ -211,7 +211,7 @@ void ImageEffect_AntiVignetting::renderingFinished() void ImageEffect_AntiVignetting::readUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("antivignettings Tool Dialog"); m_densityInput->blockSignals(true); @@ -240,7 +240,7 @@ void ImageEffect_AntiVignetting::readUserSettings() void ImageEffect_AntiVignetting::writeUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("antivignettings Tool Dialog"); config->writeEntry("DensityAjustment", m_densityInput->value()); config->writeEntry("PowerAjustment", m_powerInput->value()); diff --git a/src/imageplugins/blurfx/blurfxtool.cpp b/src/imageplugins/blurfx/blurfxtool.cpp index 2998dbde..0f5a130a 100644 --- a/src/imageplugins/blurfx/blurfxtool.cpp +++ b/src/imageplugins/blurfx/blurfxtool.cpp @@ -196,7 +196,7 @@ void BlurFXTool::renderingFinished(void) void BlurFXTool::readSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("blurfx Tool"); m_effectType->blockSignals(true); m_distanceInput->blockSignals(true); @@ -213,7 +213,7 @@ void BlurFXTool::readSettings() void BlurFXTool::writeSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("blurfx Tool"); config->writeEntry("EffectType", m_effectType->currentItem()); config->writeEntry("DistanceAjustment", m_distanceInput->value()); diff --git a/src/imageplugins/blurfx/imageeffect_blurfx.cpp b/src/imageplugins/blurfx/imageeffect_blurfx.cpp index 62bcd525..be25bfff 100644 --- a/src/imageplugins/blurfx/imageeffect_blurfx.cpp +++ b/src/imageplugins/blurfx/imageeffect_blurfx.cpp @@ -194,7 +194,7 @@ void ImageEffect_BlurFX::renderingFinished(void) void ImageEffect_BlurFX::readUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("blurfx Tool Dialog"); m_effectType->blockSignals(true); m_distanceInput->blockSignals(true); @@ -209,7 +209,7 @@ void ImageEffect_BlurFX::readUserSettings() void ImageEffect_BlurFX::writeUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("blurfx Tool Dialog"); config->writeEntry("EffectType", m_effectType->currentItem()); config->writeEntry("DistanceAjustment", m_distanceInput->value()); diff --git a/src/imageplugins/border/bordertool.cpp b/src/imageplugins/border/bordertool.cpp index 160f5b0a..0ae2ab30 100644 --- a/src/imageplugins/border/bordertool.cpp +++ b/src/imageplugins/border/bordertool.cpp @@ -204,7 +204,7 @@ void BorderTool::readSettings() m_secondColorButton->blockSignals(true); m_preserveAspectRatio->blockSignals(true); - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("border Tool"); m_borderType->setCurrentItem(config->readNumEntry("Border Type", m_borderType->defaultItem())); @@ -237,7 +237,7 @@ void BorderTool::readSettings() void BorderTool::writeSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("border Tool"); config->writeEntry("Border Type", m_borderType->currentItem()); diff --git a/src/imageplugins/border/imageeffect_border.cpp b/src/imageplugins/border/imageeffect_border.cpp index 9f3dd6c3..61318b3b 100644 --- a/src/imageplugins/border/imageeffect_border.cpp +++ b/src/imageplugins/border/imageeffect_border.cpp @@ -204,7 +204,7 @@ void ImageEffect_Border::readUserSettings(void) m_secondColorButton->blockSignals(true); m_preserveAspectRatio->blockSignals(true); - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("border Tool Dialog"); m_borderType->setCurrentItem(config->readNumEntry("Border Type", Border::SolidBorder)); @@ -237,7 +237,7 @@ void ImageEffect_Border::readUserSettings(void) void ImageEffect_Border::writeUserSettings(void) { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("border Tool Dialog"); config->writeEntry("Border Type", m_borderType->currentItem()); diff --git a/src/imageplugins/channelmixer/channelmixer.cpp b/src/imageplugins/channelmixer/channelmixer.cpp index 849cc1e8..f7aee9de 100644 --- a/src/imageplugins/channelmixer/channelmixer.cpp +++ b/src/imageplugins/channelmixer/channelmixer.cpp @@ -450,7 +450,7 @@ void ChannelMixerDialog::slotEffect() void ChannelMixerDialog::finalRendering() { - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); Digikam::ImageIface* iface = m_previewWidget->imageIface(); uchar *data = iface->getOriginalImage(); int w = iface->originalWidth(); @@ -480,7 +480,7 @@ void ChannelMixerDialog::finalRendering() iface->putOriginalImage(i18n("Channel Mixer"), data); delete [] data; - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); accept(); } @@ -525,7 +525,7 @@ void ChannelMixerDialog::slotScaleChanged(int scale) void ChannelMixerDialog::readUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("channelmixer Tool Dialog"); m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0)); // Luminosity. @@ -559,7 +559,7 @@ void ChannelMixerDialog::readUserSettings() void ChannelMixerDialog::writeUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("channelmixer Tool Dialog"); config->writeEntry("Histogram Channel", m_channelCB->currentItem()); config->writeEntry("Histogram Scale", m_scaleBG->selectedId()); diff --git a/src/imageplugins/channelmixer/channelmixertool.cpp b/src/imageplugins/channelmixer/channelmixertool.cpp index c8215178..ac27be5c 100644 --- a/src/imageplugins/channelmixer/channelmixertool.cpp +++ b/src/imageplugins/channelmixer/channelmixertool.cpp @@ -443,7 +443,7 @@ void ChannelMixerTool::slotEffect() void ChannelMixerTool::finalRendering() { - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); ImageIface* iface = m_previewWidget->imageIface(); uchar *data = iface->getOriginalImage(); int w = iface->originalWidth(); @@ -473,7 +473,7 @@ void ChannelMixerTool::finalRendering() iface->putOriginalImage(i18n("Channel Mixer"), data); delete [] data; - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } void ChannelMixerTool::slotChannelChanged(int channel) @@ -517,7 +517,7 @@ void ChannelMixerTool::slotScaleChanged(int scale) void ChannelMixerTool::readSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("channelmixer Tool"); m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0)); // Luminosity. @@ -550,7 +550,7 @@ void ChannelMixerTool::readSettings() void ChannelMixerTool::writeSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("channelmixer Tool"); config->writeEntry("Histogram Channel", m_channelCB->currentItem()); config->writeEntry("Histogram Scale", m_scaleBG->selectedId()); @@ -619,7 +619,7 @@ void ChannelMixerTool::slotLoadSettings() bool monochrome; loadGainsFileUrl = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), - TQString( "*" ), kapp->activeWindow(), + TQString( "*" ), tdeApp->activeWindow(), TQString( i18n("Select Gimp Gains Mixer File to Load")) ); if( loadGainsFileUrl.isEmpty() ) return; @@ -692,7 +692,7 @@ void ChannelMixerTool::slotLoadSettings() } else { - KMessageBox::error(kapp->activeWindow(), i18n("Cannot load settings from the Gains Mixer text file.")); + KMessageBox::error(tdeApp->activeWindow(), i18n("Cannot load settings from the Gains Mixer text file.")); return; } } @@ -703,7 +703,7 @@ void ChannelMixerTool::slotSaveAsSettings() FILE *fp = 0L; saveGainsFileUrl = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), - TQString( "*" ), kapp->activeWindow(), + TQString( "*" ), tdeApp->activeWindow(), TQString( i18n("Gimp Gains Mixer File to Save")) ); if( saveGainsFileUrl.isEmpty() ) return; @@ -766,7 +766,7 @@ void ChannelMixerTool::slotSaveAsSettings() } else { - KMessageBox::error(kapp->activeWindow(), i18n("Cannot save settings to the Gains Mixer text file.")); + KMessageBox::error(tdeApp->activeWindow(), i18n("Cannot save settings to the Gains Mixer text file.")); return; } } diff --git a/src/imageplugins/charcoal/charcoaltool.cpp b/src/imageplugins/charcoal/charcoaltool.cpp index 75ee22df..75984cca 100644 --- a/src/imageplugins/charcoal/charcoaltool.cpp +++ b/src/imageplugins/charcoal/charcoaltool.cpp @@ -129,7 +129,7 @@ void CharcoalTool::renderingFinished() void CharcoalTool::readSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("charcoal Tool"); m_pencilInput->blockSignals(true); m_smoothInput->blockSignals(true); @@ -143,7 +143,7 @@ void CharcoalTool::readSettings() void CharcoalTool::writeSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("charcoal Tool"); config->writeEntry("PencilAjustment", m_pencilInput->value()); config->writeEntry("SmoothAjustment", m_smoothInput->value()); diff --git a/src/imageplugins/charcoal/imageeffect_charcoal.cpp b/src/imageplugins/charcoal/imageeffect_charcoal.cpp index 67a0269d..9a83f470 100644 --- a/src/imageplugins/charcoal/imageeffect_charcoal.cpp +++ b/src/imageplugins/charcoal/imageeffect_charcoal.cpp @@ -123,7 +123,7 @@ void ImageEffect_Charcoal::renderingFinished() void ImageEffect_Charcoal::readUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("charcoal Tool Dialog"); m_pencilInput->blockSignals(true); m_smoothInput->blockSignals(true); @@ -135,7 +135,7 @@ void ImageEffect_Charcoal::readUserSettings() void ImageEffect_Charcoal::writeUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("charcoal Tool Dialog"); config->writeEntry("PencilAjustment", m_pencilInput->value()); config->writeEntry("SmoothAjustment", m_smoothInput->value()); diff --git a/src/imageplugins/colorfx/colorfxtool.cpp b/src/imageplugins/colorfx/colorfxtool.cpp index dd16e7cf..864e5da1 100644 --- a/src/imageplugins/colorfx/colorfxtool.cpp +++ b/src/imageplugins/colorfx/colorfxtool.cpp @@ -235,7 +235,7 @@ ColorFXTool::~ColorFXTool() void ColorFXTool::readSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("coloreffect Tool"); m_effectType->setCurrentItem(config->readNumEntry("EffectType", m_effectType->defaultItem())); m_levelInput->setValue(config->readNumEntry("LevelAjustment", m_levelInput->defaultValue())); @@ -249,7 +249,7 @@ void ColorFXTool::readSettings() void ColorFXTool::writeSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("coloreffect Tool"); config->writeEntry("EffectType", m_effectType->currentItem()); config->writeEntry("LevelAjustment", m_levelInput->value()); @@ -359,7 +359,7 @@ void ColorFXTool::slotEffectTypeChanged(int type) void ColorFXTool::slotEffect() { - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); m_histogramWidget->stopHistogramComputation(); @@ -381,12 +381,12 @@ void ColorFXTool::slotEffect() m_histogramWidget->updateData(m_destinationPreviewData, w, h, sb, 0, 0, 0, false); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } void ColorFXTool::finalRendering() { - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); ImageIface* iface = m_previewWidget->imageIface(); uchar *data = iface->getOriginalImage(); int w = iface->originalWidth(); @@ -421,7 +421,7 @@ void ColorFXTool::finalRendering() delete[] data; } - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } void ColorFXTool::colorEffect(uchar *data, int w, int h, bool sb) diff --git a/src/imageplugins/colorfx/imageeffect_colorfx.cpp b/src/imageplugins/colorfx/imageeffect_colorfx.cpp index a4ab6fe7..abf96f77 100644 --- a/src/imageplugins/colorfx/imageeffect_colorfx.cpp +++ b/src/imageplugins/colorfx/imageeffect_colorfx.cpp @@ -242,7 +242,7 @@ ImageEffect_ColorFX::~ImageEffect_ColorFX() void ImageEffect_ColorFX::readUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("coloreffect Tool Dialog"); m_effectType->setCurrentItem(config->readNumEntry("EffectType", ColorFX)); m_levelInput->setValue(config->readNumEntry("LevelAjustment", 0)); @@ -252,7 +252,7 @@ void ImageEffect_ColorFX::readUserSettings() void ImageEffect_ColorFX::writeUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("coloreffect Tool Dialog"); config->writeEntry("EffectType", m_effectType->currentItem()); config->writeEntry("LevelAjustment", m_levelInput->value()); @@ -349,7 +349,7 @@ void ImageEffect_ColorFX::slotEffectTypeChanged(int type) void ImageEffect_ColorFX::slotEffect() { - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); m_histogramWidget->stopHistogramComputation(); @@ -371,12 +371,12 @@ void ImageEffect_ColorFX::slotEffect() m_histogramWidget->updateData(m_destinationPreviewData, w, h, sb, 0, 0, 0, false); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } void ImageEffect_ColorFX::finalRendering() { - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); Digikam::ImageIface* iface = m_previewWidget->imageIface(); uchar *data = iface->getOriginalImage(); int w = iface->originalWidth(); @@ -411,7 +411,7 @@ void ImageEffect_ColorFX::finalRendering() delete [] data; } - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); accept(); } diff --git a/src/imageplugins/coreplugin/autocorrectiontool.cpp b/src/imageplugins/coreplugin/autocorrectiontool.cpp index 32f00b44..f9e35986 100644 --- a/src/imageplugins/coreplugin/autocorrectiontool.cpp +++ b/src/imageplugins/coreplugin/autocorrectiontool.cpp @@ -292,7 +292,7 @@ void AutoCorrectionTool::slotColorSelectedFromTarget(const DColor& color) void AutoCorrectionTool::readSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("autocorrection Tool"); m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0)); // Luminosity. m_scaleBG->setButton(config->readNumEntry("Histogram Scale", HistogramWidget::LogScaleHistogram)); @@ -304,7 +304,7 @@ void AutoCorrectionTool::readSettings() void AutoCorrectionTool::writeSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("autocorrection Tool"); config->writeEntry("Histogram Channel", m_channelCB->currentItem()); config->writeEntry("Histogram Scale", m_scaleBG->selectedId()); @@ -324,7 +324,7 @@ void AutoCorrectionTool::slotResetSettings() void AutoCorrectionTool::slotEffect() { - kapp->setOverrideCursor(KCursor::waitCursor()); + tdeApp->setOverrideCursor(KCursor::waitCursor()); m_histogramWidget->stopHistogramComputation(); @@ -346,7 +346,7 @@ void AutoCorrectionTool::slotEffect() m_histogramWidget->updateData(m_destinationPreviewData, w, h, sb, 0, 0, 0, false); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } TQPixmap AutoCorrectionTool::getThumbnailForEffect(AutoCorrectionType type) @@ -359,7 +359,7 @@ TQPixmap AutoCorrectionTool::getThumbnailForEffect(AutoCorrectionType type) void AutoCorrectionTool::finalRendering() { - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); ImageIface* iface = m_previewWidget->imageIface(); uchar *data = iface->getOriginalImage(); int w = iface->originalWidth(); @@ -399,7 +399,7 @@ void AutoCorrectionTool::finalRendering() delete [] data; } - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } void AutoCorrectionTool::autoCorrection(uchar *data, int w, int h, bool sb, int type) diff --git a/src/imageplugins/coreplugin/bcgtool.cpp b/src/imageplugins/coreplugin/bcgtool.cpp index 17ecf838..b33b16df 100644 --- a/src/imageplugins/coreplugin/bcgtool.cpp +++ b/src/imageplugins/coreplugin/bcgtool.cpp @@ -266,7 +266,7 @@ void BCGTool::slotColorSelectedFromTarget(const DColor &color) void BCGTool::readSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("bcgadjust Tool"); m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0)); // Luminosity. m_scaleBG->setButton(config->readNumEntry("Histogram Scale", HistogramWidget::LogScaleHistogram)); @@ -280,7 +280,7 @@ void BCGTool::readSettings() void BCGTool::writeSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("bcgadjust Tool"); config->writeEntry("Histogram Channel", m_channelCB->currentItem()); config->writeEntry("Histogram Scale", m_scaleBG->selectedId()); @@ -310,7 +310,7 @@ void BCGTool::slotResetSettings() void BCGTool::slotEffect() { - kapp->setOverrideCursor(KCursor::waitCursor()); + tdeApp->setOverrideCursor(KCursor::waitCursor()); double b = (double) m_bInput->value() / 250.0; double c = (double) (m_cInput->value() / 100.0) + 1.00; @@ -346,12 +346,12 @@ void BCGTool::slotEffect() memcpy(m_destinationPreviewData, preview.bits(), preview.numBytes()); m_histogramWidget->updateData(m_destinationPreviewData, w, h, sb, 0, 0, 0, false); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } void BCGTool::finalRendering() { - kapp->setOverrideCursor(KCursor::waitCursor()); + tdeApp->setOverrideCursor(KCursor::waitCursor()); ImageIface* iface = m_previewWidget->imageIface(); double b = (double) m_bInput->value() / 250.0; @@ -359,7 +359,7 @@ void BCGTool::finalRendering() double g = m_gInput->value(); iface->setOriginalBCG(b, c, g); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } } // NameSpace DigikamImagesPluginCore diff --git a/src/imageplugins/coreplugin/blurtool.cpp b/src/imageplugins/coreplugin/blurtool.cpp index 85e1dc19..c792e187 100644 --- a/src/imageplugins/coreplugin/blurtool.cpp +++ b/src/imageplugins/coreplugin/blurtool.cpp @@ -104,14 +104,14 @@ BlurTool::~BlurTool() void BlurTool::readSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("gaussianblur Tool"); m_radiusInput->setValue(config->readNumEntry("RadiusAjustment", m_radiusInput->defaultValue())); } void BlurTool::writeSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("gaussianblur Tool"); config->writeEntry("RadiusAjustment", m_radiusInput->value()); config->sync(); diff --git a/src/imageplugins/coreplugin/bwsepiatool.cpp b/src/imageplugins/coreplugin/bwsepiatool.cpp index 06c30462..54a53e80 100644 --- a/src/imageplugins/coreplugin/bwsepiatool.cpp +++ b/src/imageplugins/coreplugin/bwsepiatool.cpp @@ -630,7 +630,7 @@ void BWSepiaTool::slotColorSelectedFromTarget(const DColor &color) void BWSepiaTool::readSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("convertbw Tool"); m_tab->setCurrentPage(config->readNumEntry("Settings Tab", BWFiltersTab)); @@ -673,7 +673,7 @@ void BWSepiaTool::readSettings() void BWSepiaTool::writeSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("convertbw Tool"); config->writeEntry("Settings Tab", m_tab->currentPageIndex()); config->writeEntry("Histogram Channel", m_channelCB->currentItem()); @@ -742,7 +742,7 @@ void BWSepiaTool::slotResetSettings() void BWSepiaTool::slotEffect() { - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); m_histogramWidget->stopHistogramComputation(); @@ -789,12 +789,12 @@ void BWSepiaTool::slotEffect() m_histogramWidget->updateData(m_destinationPreviewData, w, h, sb, 0, 0, 0, false); delete [] targetData; - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } void BWSepiaTool::finalRendering() { - kapp->setOverrideCursor(KCursor::waitCursor()); + tdeApp->setOverrideCursor(KCursor::waitCursor()); ImageIface* iface = m_previewWidget->imageIface(); uchar *data = iface->getOriginalImage(); int w = iface->originalWidth(); @@ -835,7 +835,7 @@ void BWSepiaTool::finalRendering() delete [] targetData; } - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } void BWSepiaTool::blackAndWhiteConversion(uchar *data, int w, int h, bool sb, int type) @@ -1064,7 +1064,7 @@ void BWSepiaTool::blackAndWhiteConversion(uchar *data, int w, int h, bool sb, in void BWSepiaTool::slotLoadSettings() { KURL loadFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), - TQString( "*" ), kapp->activeWindow(), + TQString( "*" ), tdeApp->activeWindow(), TQString( i18n("Black & White Settings File to Load")) ); if( loadFile.isEmpty() ) return; @@ -1077,7 +1077,7 @@ void BWSepiaTool::slotLoadSettings() if (stream.readLine() != "# Black & White Configuration File") { - KMessageBox::error(kapp->activeWindow(), + KMessageBox::error(tdeApp->activeWindow(), i18n("\"%1\" is not a Black & White settings text file.") .arg(loadFile.fileName())); file.close(); @@ -1129,7 +1129,7 @@ void BWSepiaTool::slotLoadSettings() slotEffect(); } else - KMessageBox::error(kapp->activeWindow(), + KMessageBox::error(tdeApp->activeWindow(), i18n("Cannot load settings from the Black & White text file.")); file.close(); @@ -1140,7 +1140,7 @@ void BWSepiaTool::slotLoadSettings() void BWSepiaTool::slotSaveAsSettings() { KURL saveFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), - TQString( "*" ), kapp->activeWindow(), + TQString( "*" ), tdeApp->activeWindow(), TQString( i18n("Black & White Settings File to Save"))); if( saveFile.isEmpty() ) return; @@ -1168,7 +1168,7 @@ void BWSepiaTool::slotSaveAsSettings() } } else - KMessageBox::error(kapp->activeWindow(), + KMessageBox::error(tdeApp->activeWindow(), i18n("Cannot save settings to the Black & White text file.")); file.close(); diff --git a/src/imageplugins/coreplugin/hsl/hsltool.cpp b/src/imageplugins/coreplugin/hsl/hsltool.cpp index 5fa3d746..ff681c16 100644 --- a/src/imageplugins/coreplugin/hsl/hsltool.cpp +++ b/src/imageplugins/coreplugin/hsl/hsltool.cpp @@ -331,7 +331,7 @@ void HSLTool::slotSChanged(double s) void HSLTool::readSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("hsladjust Tool"); m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0)); // Luminosity. m_scaleBG->setButton(config->readNumEntry("Histogram Scale", HistogramWidget::LogScaleHistogram)); @@ -349,7 +349,7 @@ void HSLTool::readSettings() void HSLTool::writeSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("hsladjust Tool"); config->writeEntry("Histogram Channel", m_channelCB->currentItem()); config->writeEntry("Histogram Scale", m_scaleBG->selectedId()); @@ -382,7 +382,7 @@ void HSLTool::slotResetSettings() void HSLTool::slotEffect() { - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); double hu = m_hInput->value(); double sa = m_sInput->value(); @@ -419,12 +419,12 @@ void HSLTool::slotEffect() memcpy(m_destinationPreviewData, preview.bits(), preview.numBytes()); m_histogramWidget->updateData(m_destinationPreviewData, w, h, sb, 0, 0, 0, false); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } void HSLTool::finalRendering() { - kapp->setOverrideCursor(KCursor::waitCursor()); + tdeApp->setOverrideCursor(KCursor::waitCursor()); double hu = m_hInput->value(); double sa = m_sInput->value(); @@ -446,7 +446,7 @@ void HSLTool::finalRendering() cmod.applyHSL(original); iface->putOriginalImage(i18n("HSL Adjustments"), original.bits()); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } } // NameSpace DigikamImagesPluginCore diff --git a/src/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp b/src/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp index e179d36f..c2f1a752 100644 --- a/src/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp +++ b/src/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp @@ -315,7 +315,7 @@ void ImageEffect_HSL::slotSChanged(double s) void ImageEffect_HSL::readUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("hsladjust Tool Dialog"); m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0)); // Luminosity. m_scaleBG->setButton(config->readNumEntry("Histogram Scale", Digikam::HistogramWidget::LogScaleHistogram)); @@ -330,7 +330,7 @@ void ImageEffect_HSL::readUserSettings() void ImageEffect_HSL::writeUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("hsladjust Tool Dialog"); config->writeEntry("Histogram Channel", m_channelCB->currentItem()); config->writeEntry("Histogram Scale", m_scaleBG->selectedId()); @@ -357,7 +357,7 @@ void ImageEffect_HSL::resetValues() void ImageEffect_HSL::slotEffect() { - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); double hu = m_hInput->value(); double sa = m_sInput->value(); @@ -393,12 +393,12 @@ void ImageEffect_HSL::slotEffect() memcpy(m_destinationPreviewData, preview.bits(), preview.numBytes()); m_histogramWidget->updateData(m_destinationPreviewData, w, h, sb, 0, 0, 0, false); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } void ImageEffect_HSL::finalRendering() { - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); double hu = m_hInput->value(); double sa = m_sInput->value(); @@ -420,7 +420,7 @@ void ImageEffect_HSL::finalRendering() cmod.applyHSL(original); iface->putOriginalImage(i18n("HSL Adjustments"), original.bits()); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); accept(); } diff --git a/src/imageplugins/coreplugin/iccprooftool.cpp b/src/imageplugins/coreplugin/iccprooftool.cpp index b74adf9a..d7026949 100644 --- a/src/imageplugins/coreplugin/iccprooftool.cpp +++ b/src/imageplugins/coreplugin/iccprooftool.cpp @@ -538,7 +538,7 @@ ICCProofTool::~ICCProofTool() void ICCProofTool::readSettings() { TQString defaultICCPath = TDEGlobalSettings::documentPath(); - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); // General settings of digiKam Color Management config->setGroup("Color Management"); @@ -563,7 +563,7 @@ void ICCProofTool::readSettings() TQString message = i18n("The ICC profiles path seems to be invalid. You won't be able to use the \"Default profile\"\ options.

Please fix this in the digiKam ICC setup."); slotToggledWidgets( false ); - KMessageBox::information(kapp->activeWindow(), message); + KMessageBox::information(tdeApp->activeWindow(), message); } } @@ -615,7 +615,7 @@ void ICCProofTool::readSettings() void ICCProofTool::writeSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("colormanagement Tool"); config->writeEntry("Settings Tab", m_toolBoxWidgets->currentIndex()); config->writeEntry("Histogram Channel", m_channelCB->currentItem()); @@ -652,7 +652,7 @@ void ICCProofTool::writeSettings() void ICCProofTool::processLCMSURL(const TQString& url) { - TDEApplication::kApplication()->invokeBrowser(url); + tdeApp->invokeBrowser(url); } void ICCProofTool::slotSpotColorChanged(const DColor &color) @@ -717,7 +717,7 @@ void ICCProofTool::slotResetSettings() void ICCProofTool::slotEffect() { - kapp->setOverrideCursor(KCursor::waitCursor()); + tdeApp->setOverrideCursor(KCursor::waitCursor()); m_gboxSettings->enableButton(EditorToolSettings::Ok, true); m_histogramWidget->stopHistogramComputation(); @@ -754,7 +754,7 @@ void ICCProofTool::slotEffect() TQFileInfo info(tmpInPath); if (!info.exists() || !info.isReadable() || !info.isFile()) { - KMessageBox::information(kapp->activeWindow(), + KMessageBox::information(tdeApp->activeWindow(), i18n("

The selected ICC input profile path seems to be invalid.

" "Please check it.")); return; @@ -773,7 +773,7 @@ void ICCProofTool::slotEffect() TQFileInfo info(tmpProofPath); if (!info.exists() || !info.isReadable() || !info.isFile()) { - KMessageBox::information(kapp->activeWindow(), + KMessageBox::information(tdeApp->activeWindow(), i18n("

The selected ICC proof profile path seems to be invalid.

" "Please check it.")); return; @@ -795,7 +795,7 @@ void ICCProofTool::slotEffect() TQFileInfo info(tmpSpacePath); if (!info.exists() || !info.isReadable() || !info.isFile()) { - KMessageBox::information(kapp->activeWindow(), + KMessageBox::information(tdeApp->activeWindow(), i18n("

Selected ICC workspace profile path seems to be invalid.

" "Please check it.")); return; @@ -833,14 +833,14 @@ void ICCProofTool::slotEffect() if ( proofCondition || spaceCondition ) { - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); TQString error = i18n("

Your settings are not sufficient.

" "

To apply a color transform, you need at least two ICC profiles:

" "" "

If you want to do a \"soft-proof\" transform, in addition to these profiles " "you need a \"Proof\" profile.

"); - KMessageBox::information(kapp->activeWindow(), error); + KMessageBox::information(tdeApp->activeWindow(), error); m_gboxSettings->enableButton(EditorToolSettings::Ok, false); } else @@ -876,7 +876,7 @@ void ICCProofTool::slotEffect() memcpy(m_destinationPreviewData, preview2.bits(), preview2.numBytes()); m_histogramWidget->updateData(m_destinationPreviewData, w, h, sb, 0, 0, 0, false); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } } @@ -884,7 +884,7 @@ void ICCProofTool::finalRendering() { if (!m_doSoftProofBox->isChecked()) { - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); ImageIface *iface = m_previewWidget->imageIface(); uchar *data = iface->getOriginalImage(); @@ -916,7 +916,7 @@ void ICCProofTool::finalRendering() TQFileInfo info(tmpInPath); if (!info.exists() || !info.isReadable() || !info.isFile()) { - KMessageBox::information(kapp->activeWindow(), + KMessageBox::information(tdeApp->activeWindow(), i18n("

Selected ICC input profile path seems " "to be invalid.

Please check it.")); return; @@ -935,7 +935,7 @@ void ICCProofTool::finalRendering() TQFileInfo info(tmpProofPath); if (!info.exists() || !info.isReadable() || !info.isFile()) { - KMessageBox::information(kapp->activeWindow(), + KMessageBox::information(tdeApp->activeWindow(), i18n("

The selected ICC proof profile path seems " "to be invalid.

Please check it.")); return; @@ -957,7 +957,7 @@ void ICCProofTool::finalRendering() TQFileInfo info(tmpSpacePath); if (!info.exists() || !info.isReadable() || !info.isFile()) { - KMessageBox::information(kapp->activeWindow(), + KMessageBox::information(tdeApp->activeWindow(), i18n("

Selected ICC workspace profile path seems " "to be invalid.

Please check it.")); return; @@ -1027,7 +1027,7 @@ void ICCProofTool::finalRendering() delete [] data; } - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } } @@ -1049,7 +1049,7 @@ void ICCProofTool::slotInICCInfo() TQString message = i18n("

You have selected the \"Default builtin sRGB profile\"

"); message.append(i18n("

This profile is built on the fly, so there is no relevant information " "about it.

")); - KMessageBox::information(kapp->activeWindow(), message); + KMessageBox::information(tdeApp->activeWindow(), message); } else if (useDefaultInProfile()) { @@ -1089,13 +1089,13 @@ void ICCProofTool::getICCInfo(const TQString& profile) { if (profile.isEmpty()) { - KMessageBox::error(kapp->activeWindow(), + KMessageBox::error(tdeApp->activeWindow(), i18n("Sorry, there is no selected profile"), i18n("Profile Error")); return; } - ICCProfileInfoDlg infoDlg(kapp->activeWindow(), profile); + ICCProfileInfoDlg infoDlg(tdeApp->activeWindow(), profile); infoDlg.exec(); } @@ -1103,13 +1103,13 @@ void ICCProofTool::getICCInfo(const TQByteArray& profile) { if (profile.isNull()) { - KMessageBox::error(kapp->activeWindow(), + KMessageBox::error(tdeApp->activeWindow(), i18n("Sorry, it seems there is no embedded profile"), i18n("Profile Error")); return; } - ICCProfileInfoDlg infoDlg(kapp->activeWindow(), TQString(), profile); + ICCProfileInfoDlg infoDlg(tdeApp->activeWindow(), TQString(), profile); infoDlg.exec(); } @@ -1119,7 +1119,7 @@ void ICCProofTool::slotCMDisabledWarning() { TQString message = i18n("

You have not enabled Color Management in the digiKam preferences.

"); message.append(i18n("

\"Use of default profile\" options will be disabled now.

")); - KMessageBox::information(kapp->activeWindow(), message); + KMessageBox::information(tdeApp->activeWindow(), message); slotToggledWidgets(false); } } @@ -1187,7 +1187,7 @@ bool ICCProofTool::useDefaultProofProfile() void ICCProofTool::slotLoadSettings() { KURL loadColorManagementFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), - TQString("*"), kapp->activeWindow(), + TQString("*"), tdeApp->activeWindow(), TQString(i18n("Color Management Settings File to Load"))); if (loadColorManagementFile.isEmpty()) return; @@ -1200,7 +1200,7 @@ void ICCProofTool::slotLoadSettings() if (stream.readLine() != "# Color Management Configuration File") { - KMessageBox::error(kapp->activeWindow(), + KMessageBox::error(tdeApp->activeWindow(), i18n("\"%1\" is not a Color Management settings text file.") .arg(loadColorManagementFile.fileName())); file.close(); @@ -1253,7 +1253,7 @@ void ICCProofTool::slotLoadSettings() slotEffect(); } else - KMessageBox::error(kapp->activeWindow(), + KMessageBox::error(tdeApp->activeWindow(), i18n("Cannot load settings from the Color Management text file.")); file.close(); @@ -1264,7 +1264,7 @@ void ICCProofTool::slotLoadSettings() void ICCProofTool::slotSaveAsSettings() { KURL saveColorManagementFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), - TQString( "*" ), kapp->activeWindow(), + TQString( "*" ), tdeApp->activeWindow(), TQString(i18n("Color Management Settings File to Save"))); if (saveColorManagementFile.isEmpty()) return; @@ -1301,7 +1301,7 @@ void ICCProofTool::slotSaveAsSettings() } } else - KMessageBox::error(kapp->activeWindow(), + KMessageBox::error(tdeApp->activeWindow(), i18n("Cannot save settings to the Color Management text file.")); file.close(); diff --git a/src/imageplugins/coreplugin/imageeffect_autocorrection.cpp b/src/imageplugins/coreplugin/imageeffect_autocorrection.cpp index 290b93cb..c76c20a9 100644 --- a/src/imageplugins/coreplugin/imageeffect_autocorrection.cpp +++ b/src/imageplugins/coreplugin/imageeffect_autocorrection.cpp @@ -288,7 +288,7 @@ void ImageEffect_AutoCorrection::slotColorSelectedFromTarget( const Digikam::DCo void ImageEffect_AutoCorrection::readUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("autocorrection Tool Dialog"); m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0)); // Luminosity. m_scaleBG->setButton(config->readNumEntry("Histogram Scale", Digikam::HistogramWidget::LogScaleHistogram)); @@ -299,7 +299,7 @@ void ImageEffect_AutoCorrection::readUserSettings() void ImageEffect_AutoCorrection::writeUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("autocorrection Tool Dialog"); config->writeEntry("Histogram Channel", m_channelCB->currentItem()); config->writeEntry("Histogram Scale", m_scaleBG->selectedId()); @@ -316,7 +316,7 @@ void ImageEffect_AutoCorrection::resetValues() void ImageEffect_AutoCorrection::slotEffect() { - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); m_histogramWidget->stopHistogramComputation(); @@ -338,7 +338,7 @@ void ImageEffect_AutoCorrection::slotEffect() m_histogramWidget->updateData(m_destinationPreviewData, w, h, sb, 0, 0, 0, false); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } TQPixmap ImageEffect_AutoCorrection::getThumbnailForEffect(AutoCorrectionType type) @@ -351,7 +351,7 @@ TQPixmap ImageEffect_AutoCorrection::getThumbnailForEffect(AutoCorrectionType ty void ImageEffect_AutoCorrection::finalRendering() { - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); Digikam::ImageIface* iface = m_previewWidget->imageIface(); uchar *data = iface->getOriginalImage(); int w = iface->originalWidth(); @@ -391,7 +391,7 @@ void ImageEffect_AutoCorrection::finalRendering() delete [] data; } - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); accept(); } diff --git a/src/imageplugins/coreplugin/imageeffect_bcg.cpp b/src/imageplugins/coreplugin/imageeffect_bcg.cpp index 9d21115d..5d6d3a90 100644 --- a/src/imageplugins/coreplugin/imageeffect_bcg.cpp +++ b/src/imageplugins/coreplugin/imageeffect_bcg.cpp @@ -256,7 +256,7 @@ void ImageEffect_BCG::slotColorSelectedFromTarget( const Digikam::DColor &color void ImageEffect_BCG::readUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("bcgadjust Tool Dialog"); m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0)); // Luminosity. m_scaleBG->setButton(config->readNumEntry("Histogram Scale", Digikam::HistogramWidget::LogScaleHistogram)); @@ -269,7 +269,7 @@ void ImageEffect_BCG::readUserSettings() void ImageEffect_BCG::writeUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("bcgadjust Tool Dialog"); config->writeEntry("Histogram Channel", m_channelCB->currentItem()); config->writeEntry("Histogram Scale", m_scaleBG->selectedId()); @@ -294,7 +294,7 @@ void ImageEffect_BCG::resetValues() void ImageEffect_BCG::slotEffect() { - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); double b = (double)m_bInput->value()/250.0; double c = (double)(m_cInput->value()/100.0) + 1.00; @@ -329,12 +329,12 @@ void ImageEffect_BCG::slotEffect() memcpy(m_destinationPreviewData, preview.bits(), preview.numBytes()); m_histogramWidget->updateData(m_destinationPreviewData, w, h, sb, 0, 0, 0, false); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } void ImageEffect_BCG::finalRendering() { - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); Digikam::ImageIface* iface = m_previewWidget->imageIface(); double b = (double)m_bInput->value()/250.0; @@ -342,7 +342,7 @@ void ImageEffect_BCG::finalRendering() double g = m_gInput->value(); iface->setOriginalBCG(b, c, g); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); accept(); } diff --git a/src/imageplugins/coreplugin/imageeffect_blur.cpp b/src/imageplugins/coreplugin/imageeffect_blur.cpp index bd23854b..ea877ae2 100644 --- a/src/imageplugins/coreplugin/imageeffect_blur.cpp +++ b/src/imageplugins/coreplugin/imageeffect_blur.cpp @@ -79,14 +79,14 @@ ImageEffect_Blur::~ImageEffect_Blur() void ImageEffect_Blur::readUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("gaussianblur Tool Dialog"); m_radiusInput->setValue(config->readNumEntry("RadiusAjustment", 0)); } void ImageEffect_Blur::writeUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("gaussianblur Tool Dialog"); config->writeEntry("RadiusAjustment", m_radiusInput->value()); config->sync(); diff --git a/src/imageplugins/coreplugin/imageeffect_bwsepia.cpp b/src/imageplugins/coreplugin/imageeffect_bwsepia.cpp index 7dcdf0da..e2195a63 100644 --- a/src/imageplugins/coreplugin/imageeffect_bwsepia.cpp +++ b/src/imageplugins/coreplugin/imageeffect_bwsepia.cpp @@ -634,7 +634,7 @@ void ImageEffect_BWSepia::slotColorSelectedFromTarget( const Digikam::DColor &co void ImageEffect_BWSepia::readUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("convertbw Tool Dialog"); m_tab->setCurrentPage(config->readNumEntry("Settings Tab", BWFiltersTab)); @@ -676,7 +676,7 @@ void ImageEffect_BWSepia::readUserSettings() void ImageEffect_BWSepia::writeUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("convertbw Tool Dialog"); config->writeEntry("Settings Tab", m_tab->currentPageIndex()); config->writeEntry("Histogram Channel", m_channelCB->currentItem()); @@ -736,7 +736,7 @@ void ImageEffect_BWSepia::resetValues() void ImageEffect_BWSepia::slotEffect() { - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); m_histogramWidget->stopHistogramComputation(); @@ -783,7 +783,7 @@ void ImageEffect_BWSepia::slotEffect() m_histogramWidget->updateData(m_destinationPreviewData, w, h, sb, 0, 0, 0, false); delete [] targetData; - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } void ImageEffect_BWSepia::slotTimer() @@ -799,7 +799,7 @@ void ImageEffect_BWSepia::slotTimer() void ImageEffect_BWSepia::finalRendering() { - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); Digikam::ImageIface* iface = m_previewWidget->imageIface(); uchar *data = iface->getOriginalImage(); int w = iface->originalWidth(); @@ -840,7 +840,7 @@ void ImageEffect_BWSepia::finalRendering() delete [] targetData; } - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); accept(); } diff --git a/src/imageplugins/coreplugin/imageeffect_iccproof.cpp b/src/imageplugins/coreplugin/imageeffect_iccproof.cpp index 79a09983..bee8560c 100644 --- a/src/imageplugins/coreplugin/imageeffect_iccproof.cpp +++ b/src/imageplugins/coreplugin/imageeffect_iccproof.cpp @@ -528,7 +528,7 @@ ImageEffect_ICCProof::~ImageEffect_ICCProof() void ImageEffect_ICCProof::readUserSettings() { TQString defaultICCPath = TDEGlobalSettings::documentPath(); - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); // General settings of digiKam Color Management config->setGroup("Color Management"); @@ -604,7 +604,7 @@ void ImageEffect_ICCProof::readUserSettings() void ImageEffect_ICCProof::writeUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("colormanagement Tool Dialog"); config->writeEntry("Settings Tab", m_toolBoxWidgets->currentIndex()); config->writeEntry("Histogram Channel", m_channelCB->currentItem()); @@ -640,7 +640,7 @@ void ImageEffect_ICCProof::writeUserSettings() void ImageEffect_ICCProof::processLCMSURL(const TQString& url) { - TDEApplication::kApplication()->invokeBrowser(url); + tdeApp->invokeBrowser(url); } void ImageEffect_ICCProof::slotSpotColorChanged(const Digikam::DColor &color) @@ -701,7 +701,7 @@ void ImageEffect_ICCProof::resetValues() void ImageEffect_ICCProof::slotEffect() { - kapp->setOverrideCursor(KCursor::waitCursor()); + tdeApp->setOverrideCursor(KCursor::waitCursor()); enableButtonOK(true); m_histogramWidget->stopHistogramComputation(); @@ -814,7 +814,7 @@ void ImageEffect_ICCProof::slotEffect() if ( proofCondition || spaceCondition ) { - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); TQString error = i18n("

Your settings are not sufficient.

" "

To apply a color transform, you need at least two ICC profiles:

" "