diff options
Diffstat (limited to 'src/imageplugins/coreplugin')
21 files changed, 143 insertions, 143 deletions
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.<p>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("<p>The selected ICC input profile path seems to be invalid.<p>" "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("<p>The selected ICC proof profile path seems to be invalid.<p>" "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("<p>Selected ICC workspace profile path seems to be invalid.<p>" "Please check it.")); return; @@ -833,14 +833,14 @@ void ICCProofTool::slotEffect() if ( proofCondition || spaceCondition ) { - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); TQString error = i18n("<p>Your settings are not sufficient.</p>" "<p>To apply a color transform, you need at least two ICC profiles:</p>" "<ul><li>An \"Input\" profile.</li>" "<li>A \"Workspace\" profile.</li></ul>" "<p>If you want to do a \"soft-proof\" transform, in addition to these profiles " "you need a \"Proof\" profile.</p>"); - 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("<p>Selected ICC input profile path seems " "to be invalid.<p>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("<p>The selected ICC proof profile path seems " "to be invalid.<p>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("<p>Selected ICC workspace profile path seems " "to be invalid.<p>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("<p>You have selected the \"Default builtin sRGB profile\"</p>"); message.append(i18n("<p>This profile is built on the fly, so there is no relevant information " "about it.</p>")); - 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("<p>You have not enabled Color Management in the digiKam preferences.</p>"); message.append(i18n("<p>\"Use of default profile\" options will be disabled now.</p>")); - 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("<p>Your settings are not sufficient.</p>" "<p>To apply a color transform, you need at least two ICC profiles:</p>" "<ul><li>An \"Input\" profile.</li>" @@ -857,7 +857,7 @@ void ImageEffect_ICCProof::slotEffect() memcpy(m_destinationPreviewData, preview2.bits(), preview2.numBytes()); m_histogramWidget->updateData(m_destinationPreviewData, w, h, sb, 0, 0, 0, false); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } } @@ -865,7 +865,7 @@ void ImageEffect_ICCProof::finalRendering() { if (!m_doSoftProofBox->isChecked()) { - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); Digikam::ImageIface *iface = m_previewWidget->imageIface(); uchar *data = iface->getOriginalImage(); @@ -1005,7 +1005,7 @@ void ImageEffect_ICCProof::finalRendering() delete [] data; } - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } accept(); diff --git a/src/imageplugins/coreplugin/imageeffect_redeye.cpp b/src/imageplugins/coreplugin/imageeffect_redeye.cpp index df3ae2e7..817a1893 100644 --- a/src/imageplugins/coreplugin/imageeffect_redeye.cpp +++ b/src/imageplugins/coreplugin/imageeffect_redeye.cpp @@ -282,7 +282,7 @@ void ImageEffect_RedEye::slotColorSelectedFromTarget(const Digikam::DColor& colo void ImageEffect_RedEye::readUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("redeye Tool Dialog"); m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0)); // Luminosity. m_scaleBG->setButton(config->readNumEntry("Histogram Scale", Digikam::HistogramWidget::LogScaleHistogram)); @@ -300,7 +300,7 @@ void ImageEffect_RedEye::readUserSettings() void ImageEffect_RedEye::writeUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("redeye Tool Dialog"); config->writeEntry("Histogram Channel", m_channelCB->currentItem()); config->writeEntry("Histogram Scale", m_scaleBG->selectedId()); @@ -338,7 +338,7 @@ void ImageEffect_RedEye::resetValues() void ImageEffect_RedEye::slotEffect() { - kapp->setOverrideCursor(KCursor::waitCursor()); + tdeApp->setOverrideCursor(KCursor::waitCursor()); m_histogramWidget->stopHistogramComputation(); @@ -368,12 +368,12 @@ void ImageEffect_RedEye::slotEffect() memcpy(m_destinationPreviewData, selection.bits(), selection.numBytes()); m_histogramWidget->updateData(m_destinationPreviewData, w, h, sb, 0, 0, 0, false); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } void ImageEffect_RedEye::finalRendering() { - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); Digikam::ImageIface* iface = m_previewWidget->imageIface(); uchar *data = iface->getImageSelection(); @@ -388,7 +388,7 @@ void ImageEffect_RedEye::finalRendering() iface->putImageSelection(i18n("Red Eyes Correction"), selection.bits()); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); accept(); } diff --git a/src/imageplugins/coreplugin/imageeffect_rgb.cpp b/src/imageplugins/coreplugin/imageeffect_rgb.cpp index fcff9c41..135ef8b6 100644 --- a/src/imageplugins/coreplugin/imageeffect_rgb.cpp +++ b/src/imageplugins/coreplugin/imageeffect_rgb.cpp @@ -294,7 +294,7 @@ void ImageEffect_RGB::slotColorSelectedFromTarget( const Digikam::DColor &color void ImageEffect_RGB::readUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("colorbalance Tool Dialog"); m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0)); // Luminosity. m_scaleBG->setButton(config->readNumEntry("Histogram Scale", Digikam::HistogramWidget::LogScaleHistogram)); @@ -308,7 +308,7 @@ void ImageEffect_RGB::readUserSettings() void ImageEffect_RGB::writeUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("colorbalance Tool Dialog"); config->writeEntry("Histogram Channel", m_channelCB->currentItem()); config->writeEntry("Histogram Scale", m_scaleBG->selectedId()); @@ -351,7 +351,7 @@ void ImageEffect_RGB::adjustSliders(int r, int g, int b) void ImageEffect_RGB::slotEffect() { - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); enableButtonOK(m_rInput->value() != 0 || m_gInput->value() != 0 || @@ -386,12 +386,12 @@ void ImageEffect_RGB::slotEffect() memcpy(m_destinationPreviewData, preview.bits(), preview.numBytes()); m_histogramWidget->updateData(m_destinationPreviewData, w, h, sixteenBit, 0, 0, 0, false); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } void ImageEffect_RGB::finalRendering() { - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); double r = ((double)m_rInput->value() + 100.0)/100.0; double g = ((double)m_gInput->value() + 100.0)/100.0; @@ -411,7 +411,7 @@ void ImageEffect_RGB::finalRendering() cmod.applyColorModifier(original, r, g, b, a); iface->putOriginalImage(i18n("Color Balance"), original.bits()); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); accept(); } diff --git a/src/imageplugins/coreplugin/imageplugin_core.cpp b/src/imageplugins/coreplugin/imageplugin_core.cpp index 22c63b34..ea1e060e 100644 --- a/src/imageplugins/coreplugin/imageplugin_core.cpp +++ b/src/imageplugins/coreplugin/imageplugin_core.cpp @@ -199,7 +199,7 @@ void ImagePlugin_Core::slotAutoCorrection() void ImagePlugin_Core::slotInvert() { - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); ImageIface iface(0, 0); @@ -213,7 +213,7 @@ void ImagePlugin_Core::slotInvert() iface.putOriginalImage(i18n("Invert"), data); delete [] data; - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } void ImagePlugin_Core::slotBW() @@ -228,7 +228,7 @@ void ImagePlugin_Core::slotRedEye() if (!iface.selectedWidth() || !iface.selectedHeight()) { - RedEyePassivePopup* popup = new RedEyePassivePopup(kapp->activeWindow()); + RedEyePassivePopup* popup = new RedEyePassivePopup(tdeApp->activeWindow()); popup->setView(i18n("Red-Eye Correction Tool"), i18n("You need to select a region including the eyes to use " "the red-eye correction tool")); @@ -260,13 +260,13 @@ void ImagePlugin_Core::slotConvertTo8Bits() if (!iface.originalSixteenBit()) { - KMessageBox::error(kapp->activeWindow(), i18n("This image is already using a depth of 8 bits / color / pixel.")); + KMessageBox::error(tdeApp->activeWindow(), i18n("This image is already using a depth of 8 bits / color / pixel.")); return; } else { if (KMessageBox::warningContinueCancel( - kapp->activeWindow(), + tdeApp->activeWindow(), i18n("Performing this operation will reduce image color quality. " "Do you want to continue?"), TQString(), KStdGuiItem::cont(), @@ -274,9 +274,9 @@ void ImagePlugin_Core::slotConvertTo8Bits() return; } - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); iface.convertOriginalColorDepth(32); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } void ImagePlugin_Core::slotConvertTo16Bits() @@ -285,11 +285,11 @@ void ImagePlugin_Core::slotConvertTo16Bits() if (iface.originalSixteenBit()) { - KMessageBox::error(kapp->activeWindow(), i18n("This image is already using a depth of 16 bits / color / pixel.")); + KMessageBox::error(tdeApp->activeWindow(), i18n("This image is already using a depth of 16 bits / color / pixel.")); return; } - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); iface.convertOriginalColorDepth(64); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } diff --git a/src/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp b/src/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp index 64bc7a8e..92afaf1c 100644 --- a/src/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp +++ b/src/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp @@ -349,7 +349,7 @@ ImageEffect_RatioCrop::~ImageEffect_RatioCrop() void ImageEffect_RatioCrop::readSettings() { TQColor defaultGuideColor(250, 250, 255); - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("aspectratiocrop Tool Dialog"); // No guide lines per default. @@ -424,7 +424,7 @@ void ImageEffect_RatioCrop::readSettings() void ImageEffect_RatioCrop::writeSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("aspectratiocrop Tool Dialog"); if (m_originalIsLandscape) @@ -771,7 +771,7 @@ void ImageEffect_RatioCrop::slotCustomRatioChanged() void ImageEffect_RatioCrop::slotOk() { - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); TQRect currentRegion = m_imageSelectionWidget->getRegionSelection(); Digikam::ImageIface* iface = m_imageSelectionWidget->imageIface(); @@ -791,7 +791,7 @@ void ImageEffect_RatioCrop::slotOk() iface->putOriginalImage(i18n("Aspect Ratio Crop"), imOrg.bits(), imOrg.width(), imOrg.height()); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); writeSettings(); accept(); } diff --git a/src/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp b/src/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp index ed0e670e..f48050ff 100644 --- a/src/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp +++ b/src/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp @@ -398,7 +398,7 @@ RatioCropTool::~RatioCropTool() void RatioCropTool::readSettings() { TQColor defaultGuideColor(250, 250, 255); - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("aspectratiocrop Tool"); // No guide lines per default. @@ -462,7 +462,7 @@ void RatioCropTool::readSettings() void RatioCropTool::writeSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("aspectratiocrop Tool"); if (m_originalIsLandscape) @@ -823,7 +823,7 @@ void RatioCropTool::slotCustomRatioChanged() void RatioCropTool::finalRendering() { - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); TQRect currentRegion = m_imageSelectionWidget->getRegionSelection(); ImageIface* iface = m_imageSelectionWidget->imageIface(); @@ -846,7 +846,7 @@ void RatioCropTool::finalRendering() iface->putOriginalImage(i18n("Aspect Ratio Crop"), imOrg.bits(), imOrg.width(), imOrg.height()); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); writeSettings(); } diff --git a/src/imageplugins/coreplugin/redeyetool.cpp b/src/imageplugins/coreplugin/redeyetool.cpp index 5b5af7e7..72d9bca3 100644 --- a/src/imageplugins/coreplugin/redeyetool.cpp +++ b/src/imageplugins/coreplugin/redeyetool.cpp @@ -294,7 +294,7 @@ void RedEyeTool::slotColorSelectedFromTarget(const DColor& color) void RedEyeTool::readSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("redeye Tool"); m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0)); // Luminosity. m_scaleBG->setButton(config->readNumEntry("Histogram Scale", HistogramWidget::LogScaleHistogram)); @@ -313,7 +313,7 @@ void RedEyeTool::readSettings() void RedEyeTool::writeSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("redeye Tool"); config->writeEntry("Histogram Channel", m_channelCB->currentItem()); config->writeEntry("Histogram Scale", m_scaleBG->selectedId()); @@ -352,7 +352,7 @@ void RedEyeTool::slotResetSettings() void RedEyeTool::slotEffect() { - kapp->setOverrideCursor(KCursor::waitCursor()); + tdeApp->setOverrideCursor(KCursor::waitCursor()); m_histogramWidget->stopHistogramComputation(); @@ -382,12 +382,12 @@ void RedEyeTool::slotEffect() memcpy(m_destinationPreviewData, selection.bits(), selection.numBytes()); m_histogramWidget->updateData(m_destinationPreviewData, w, h, sb, 0, 0, 0, false); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } void RedEyeTool::finalRendering() { - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); ImageIface* iface = m_previewWidget->imageIface(); uchar *data = iface->getImageSelection(); @@ -402,7 +402,7 @@ void RedEyeTool::finalRendering() iface->putImageSelection(i18n("Red Eyes Correction"), selection.bits()); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } void RedEyeTool::redEyeFilter(DImg& selection) diff --git a/src/imageplugins/coreplugin/rgbtool.cpp b/src/imageplugins/coreplugin/rgbtool.cpp index e27e396e..d4f7dfe4 100644 --- a/src/imageplugins/coreplugin/rgbtool.cpp +++ b/src/imageplugins/coreplugin/rgbtool.cpp @@ -309,7 +309,7 @@ void RGBTool::slotColorSelectedFromTarget(const DColor &color) void RGBTool::readSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("colorbalance Tool"); m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0)); // Luminosity. m_scaleBG->setButton(config->readNumEntry("Histogram Scale", HistogramWidget::LogScaleHistogram)); @@ -324,7 +324,7 @@ void RGBTool::readSettings() void RGBTool::writeSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("colorbalance Tool"); config->writeEntry("Histogram Channel", m_channelCB->currentItem()); config->writeEntry("Histogram Scale", m_scaleBG->selectedId()); @@ -372,7 +372,7 @@ void RGBTool::adjustSliders(int r, int g, int b) void RGBTool::slotEffect() { - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); m_gboxSettings->enableButton(EditorToolSettings::Ok, (m_rInput->value() != 0 || @@ -408,12 +408,12 @@ void RGBTool::slotEffect() memcpy(m_destinationPreviewData, preview.bits(), preview.numBytes()); m_histogramWidget->updateData(m_destinationPreviewData, w, h, sixteenBit, 0, 0, 0, false); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } void RGBTool::finalRendering() { - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); double r = ((double) m_rInput->value() + 100.0) / 100.0; double g = ((double) m_gInput->value() + 100.0) / 100.0; @@ -433,7 +433,7 @@ void RGBTool::finalRendering() cmod.applyColorModifier(original, r, g, b, a); iface->putOriginalImage(i18n("Color Balance"), original.bits()); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } } // NameSpace DigikamImagesPluginCore diff --git a/src/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp b/src/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp index b2ae9a62..45a9d8ad 100644 --- a/src/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp +++ b/src/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp @@ -332,7 +332,7 @@ void ImageEffect_Sharpen::slotSharpMethodActived(int w) void ImageEffect_Sharpen::readUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("sharpen Tool Dialog"); m_radiusInput->blockSignals(true); m_radiusInput2->blockSignals(true); @@ -369,7 +369,7 @@ void ImageEffect_Sharpen::readUserSettings() void ImageEffect_Sharpen::writeUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("sharpen Tool Dialog"); config->writeEntry("SimpleSharpRadiusAjustment", m_radiusInput->value()); config->writeEntry("UnsharpMaskRadiusAjustment", m_radiusInput2->value()); diff --git a/src/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp b/src/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp index aee5d841..de0a3d3c 100644 --- a/src/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp +++ b/src/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp @@ -375,7 +375,7 @@ void SharpenTool::slotSharpMethodActived(int w) void SharpenTool::readSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("sharpen Tool"); m_radiusInput->blockSignals(true); m_radiusInput2->blockSignals(true); @@ -415,7 +415,7 @@ void SharpenTool::readSettings() void SharpenTool::writeSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("sharpen Tool"); config->writeEntry("SimpleSharpRadiusAjustment", m_radiusInput->value()); config->writeEntry("UnsharpMaskRadiusAjustment", m_radiusInput2->value()); @@ -679,7 +679,7 @@ void SharpenTool::putFinalData() void SharpenTool::slotLoadSettings() { KURL loadRestorationFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), - TQString( "*" ), kapp->activeWindow(), + TQString( "*" ), tdeApp->activeWindow(), TQString( i18n("Photograph Refocus Settings File to Load")) ); if ( loadRestorationFile.isEmpty() ) return; @@ -691,7 +691,7 @@ void SharpenTool::slotLoadSettings() TQTextStream stream( &file ); if ( stream.readLine() != "# Photograph Refocus Configuration File" ) { - KMessageBox::error(kapp->activeWindow(), + KMessageBox::error(tdeApp->activeWindow(), i18n("\"%1\" is not a Photograph Refocus settings text file.") .arg(loadRestorationFile.fileName())); file.close(); @@ -707,7 +707,7 @@ void SharpenTool::slotLoadSettings() blockSignals(false); } else - KMessageBox::error(kapp->activeWindow(), i18n("Cannot load settings from the Photograph Refocus text file.")); + KMessageBox::error(tdeApp->activeWindow(), i18n("Cannot load settings from the Photograph Refocus text file.")); file.close(); } @@ -715,7 +715,7 @@ void SharpenTool::slotLoadSettings() void SharpenTool::slotSaveAsSettings() { KURL saveRestorationFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), - TQString( "*" ), kapp->activeWindow(), + TQString( "*" ), tdeApp->activeWindow(), TQString( i18n("Photograph Refocus Settings File to Save")) ); if ( saveRestorationFile.isEmpty() ) return; @@ -733,7 +733,7 @@ void SharpenTool::slotSaveAsSettings() stream << m_noise->value() << "\n"; } else - KMessageBox::error(kapp->activeWindow(), i18n("Cannot save settings to the Photograph Refocus text file.")); + KMessageBox::error(tdeApp->activeWindow(), i18n("Cannot save settings to the Photograph Refocus text file.")); file.close(); } |