diff options
Diffstat (limited to 'src/utilities')
27 files changed, 74 insertions, 74 deletions
diff --git a/src/utilities/batch/batchalbumssyncmetadata.cpp b/src/utilities/batch/batchalbumssyncmetadata.cpp index fba18d34..fab48652 100644 --- a/src/utilities/batch/batchalbumssyncmetadata.cpp +++ b/src/utilities/batch/batchalbumssyncmetadata.cpp @@ -128,7 +128,7 @@ void BatchAlbumsSyncMetadata::parseAlbum() void BatchAlbumsSyncMetadata::slotAlbumParsed(const ImageInfoList& list) { - TQPixmap pix = TDEApplication::kApplication()->iconLoader()->loadIcon( + TQPixmap pix = tdeApp->iconLoader()->loadIcon( "folder_image", TDEIcon::NoGroup, 32); ImageInfoList imageInfoList = list; diff --git a/src/utilities/batch/batchsyncmetadata.cpp b/src/utilities/batch/batchsyncmetadata.cpp index 50e2ad7a..a9403f10 100644 --- a/src/utilities/batch/batchsyncmetadata.cpp +++ b/src/utilities/batch/batchsyncmetadata.cpp @@ -144,7 +144,7 @@ void BatchSyncMetadata::parsePicture() d->imageInfo = d->imageInfoList.next(); - kapp->processEvents(); + tdeApp->processEvents(); parsePicture(); } } diff --git a/src/utilities/cameragui/albumselectdialog.cpp b/src/utilities/cameragui/albumselectdialog.cpp index 486c4711..eed8b627 100644 --- a/src/utilities/cameragui/albumselectdialog.cpp +++ b/src/utilities/cameragui/albumselectdialog.cpp @@ -101,7 +101,7 @@ AlbumSelectDialog::AlbumSelectDialog(TQWidget* parent, PAlbum* albumToSelect, TQGridLayout* grid = new TQGridLayout(plainPage(), 2, 1, 0, spacingHint()); TQLabel *logo = new TQLabel(plainPage()); - TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader(); + TDEIconLoader* iconLoader = tdeApp->iconLoader(); logo->setPixmap(iconLoader->loadIcon("digikam", TDEIcon::NoGroup, 128, TDEIcon::DefaultState, 0, true)); TQLabel *message = new TQLabel(plainPage()); @@ -216,7 +216,7 @@ void AlbumSelectDialog::slotAlbumAdded(Album* album) return; } - TDEIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader(); + TDEIconLoader *iconLoader = tdeApp->iconLoader(); TQPixmap icon = iconLoader->loadIcon("folder", TDEIcon::NoGroup, AlbumSettings::instance()->getDefaultTreeIconSize(), TDEIcon::DefaultState, 0, true); diff --git a/src/utilities/cameragui/camerafolderdialog.cpp b/src/utilities/cameragui/camerafolderdialog.cpp index 93feb0ab..2cd48e5d 100644 --- a/src/utilities/cameragui/camerafolderdialog.cpp +++ b/src/utilities/cameragui/camerafolderdialog.cpp @@ -64,7 +64,7 @@ CameraFolderDialog::CameraFolderDialog(TQWidget *parent, CameraIconView *cameraV TQLabel *logo = new TQLabel(page); TQLabel *message = new TQLabel(page); - TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader(); + TDEIconLoader* iconLoader = tdeApp->iconLoader(); logo->setPixmap(iconLoader->loadIcon("digikam", TDEIcon::NoGroup, 128, TDEIcon::DefaultState, 0, true)); message->setText(i18n("<p>Please select the camera folder " "where you want to upload the images.</p>")); diff --git a/src/utilities/cameragui/cameraiconview.cpp b/src/utilities/cameragui/cameraiconview.cpp index ba496217..7b6b9fba 100644 --- a/src/utilities/cameragui/cameraiconview.cpp +++ b/src/utilities/cameragui/cameraiconview.cpp @@ -309,7 +309,7 @@ void CameraIconView::addItem(const GPItemInfo& info) } else { - TDEIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader(); + TDEIconLoader *iconLoader = tdeApp->iconLoader(); thumb = iconLoader->loadIcon("application-x-zerosize", TDEIcon::Desktop, ThumbnailSize::Huge, TDEIcon::DefaultState, 0, true) .convertToImage(); @@ -739,7 +739,7 @@ void CameraIconView::slotRightButtonClicked(const TQPoint&) if (d->cameraUI->isBusy()) return; - TQMimeSource *data = kapp->clipboard()->data(TQClipboard::Clipboard); + TQMimeSource *data = tdeApp->clipboard()->data(TQClipboard::Clipboard); if(!data || !TQUriDrag::canDecode(data)) return; diff --git a/src/utilities/cameragui/cameraui.cpp b/src/utilities/cameragui/cameraui.cpp index 8b531ea2..157dbaea 100644 --- a/src/utilities/cameragui/cameraui.cpp +++ b/src/utilities/cameragui/cameraui.cpp @@ -450,7 +450,7 @@ CameraUI::CameraUI(TQWidget* /*parent*/, const TQString& cameraTitle, // ------------------------------------------------------------------------- TQPushButton *helpButton = actionButton( Help ); - d->helpMenu = new KHelpMenu(this, kapp->aboutData(), false); + d->helpMenu = new KHelpMenu(this, tdeApp->aboutData(), false); d->helpMenu->menu()->insertItem(SmallIcon("camera-photo"), i18n("Camera Information"), this, TQ_SLOT(slotInformations()), 0, CAMERA_INFO_MENU_ID, 0); helpButton->setPopup( d->helpMenu->menu() ); @@ -591,7 +591,7 @@ CameraUI::~CameraUI() void CameraUI::readSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("Camera Settings"); d->advBox->setCurrentIndex(config->readNumEntry("Settings Tab", CameraUIPriv::RENAMEFILEPAGE)); d->autoRotateCheck->setChecked(config->readBoolEntry("AutoRotate", true)); @@ -623,7 +623,7 @@ void CameraUI::saveSettings() { saveDialogSize("Camera Settings"); - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("Camera Settings"); config->writeEntry("Settings Tab", d->advBox->currentIndex()); config->writeEntry("AutoRotate", d->autoRotateCheck->isChecked()); @@ -642,7 +642,7 @@ void CameraUI::saveSettings() void CameraUI::slotProcessURL(const TQString& url) { - TDEApplication::kApplication()->invokeBrowser(url); + tdeApp->invokeBrowser(url); } bool CameraUI::isBusy() const diff --git a/src/utilities/cameragui/renamecustomizer.cpp b/src/utilities/cameragui/renamecustomizer.cpp index a906ccb1..4d593959 100644 --- a/src/utilities/cameragui/renamecustomizer.cpp +++ b/src/utilities/cameragui/renamecustomizer.cpp @@ -464,7 +464,7 @@ void RenameCustomizer::slotDateTimeButtonClicked() void RenameCustomizer::readSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("Camera Settings"); bool def = config->readBoolEntry("Rename Use Default", true); @@ -507,7 +507,7 @@ void RenameCustomizer::readSettings() void RenameCustomizer::saveSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("Camera Settings"); config->writeEntry("Rename Use Default", d->renameDefault->isChecked()); diff --git a/src/utilities/imageeditor/canvas/colorcorrectiondlg.cpp b/src/utilities/imageeditor/canvas/colorcorrectiondlg.cpp index 1403773f..199c9f5d 100644 --- a/src/utilities/imageeditor/canvas/colorcorrectiondlg.cpp +++ b/src/utilities/imageeditor/canvas/colorcorrectiondlg.cpp @@ -105,7 +105,7 @@ ColorCorrectionDlg::ColorCorrectionDlg(TQWidget* parent, DImg *preview, previewOriginal->setPixmap(preview->convertToPixmap()); previewTarget->setPixmap(preview->convertToPixmap(m_iccTrans)); - TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader(); + TDEIconLoader* iconLoader = tdeApp->iconLoader(); logo->setPixmap(iconLoader->loadIcon("digikam", TDEIcon::NoGroup, 128, TDEIcon::DefaultState, 0, true)); grid->addMultiCellWidget(originalTitle, 0, 0, 0, 0); diff --git a/src/utilities/imageeditor/editor/editortool.cpp b/src/utilities/imageeditor/editor/editortool.cpp index b840e673..9117a780 100644 --- a/src/utilities/imageeditor/editor/editortool.cpp +++ b/src/utilities/imageeditor/editor/editortool.cpp @@ -331,7 +331,7 @@ void EditorToolThreaded::customEvent(TQCustomEvent *e) DDebug() << "Final" << toolName() << " completed..." << endl; putFinalData(); EditorToolIface::editorToolIface()->setToolStopProgress(); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); emit okClicked(); break; } @@ -388,7 +388,7 @@ void EditorToolThreaded::slotOk() toolSettings()->enableButton(EditorToolSettings::Try, false); EditorToolIface::editorToolIface()->setToolStartProgress(d->progressMess.isEmpty() ? toolName() : d->progressMess); - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); if (d->threadedFilter) { @@ -429,7 +429,7 @@ void EditorToolThreaded::slotCancel() { writeSettings(); slotAbort(); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); emit cancelClicked(); } diff --git a/src/utilities/imageeditor/editor/editorwindow.cpp b/src/utilities/imageeditor/editor/editorwindow.cpp index eed7cfea..657a0eae 100644 --- a/src/utilities/imageeditor/editor/editorwindow.cpp +++ b/src/utilities/imageeditor/editor/editorwindow.cpp @@ -618,7 +618,7 @@ void EditorWindow::printImage(KURL url) DImg image(w, h, sixteenBit, hasAlpha, ptr); KPrinter printer; - TQString appName = TDEApplication::kApplication()->aboutData()->appName(); + TQString appName = tdeApp->aboutData()->appName(); printer.setDocName( url.filename() ); printer.setCreator( appName ); #if KDE_IS_VERSION(3,2,0) @@ -837,7 +837,7 @@ void EditorWindow::unLoadImagePlugins() void EditorWindow::readStandardSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("ImageViewer Settings"); // Restore full screen Mode ? @@ -856,7 +856,7 @@ void EditorWindow::readStandardSettings() void EditorWindow::applyStandardSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); // -- Settings for Color Management stuff ---------------------------------------------- @@ -966,7 +966,7 @@ void EditorWindow::applyStandardSettings() void EditorWindow::saveStandardSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("ImageViewer Settings"); config->writeEntry("AutoZoom", d->zoomFitToWindowAction->isChecked()); @@ -1557,7 +1557,7 @@ bool EditorWindow::startingSaveAs(const KURL& url) imageFileSaveDialog.setFilter(mimetypes); TQFileInfo info(m_savingContext->srcURL.fileName()); - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("ImageViewer Settings"); TQString ext = config->readEntry("LastSavedImageTypeMime", "png"); TQString fileName = info.baseName(false) + TQString(".") + ext; @@ -1763,7 +1763,7 @@ void EditorWindow::slotToggleColorManagedView() // Save Color Managed View setting in config file. For performance // reason, no need to flush file, it cached in memory and will be flushed // to disk at end of session. - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("Color Management"); config->writeEntry("ManagedView", cmv); } @@ -1839,17 +1839,17 @@ void EditorWindow::setOverExposureToolTip(bool oei) void EditorWindow::slotDonateMoney() { - TDEApplication::kApplication()->invokeBrowser("http://www.digikam.org/?q=donation"); + tdeApp->invokeBrowser("http://www.digikam.org/?q=donation"); } void EditorWindow::slotContribute() { - TDEApplication::kApplication()->invokeBrowser("http://www.digikam.org/?q=contrib"); + tdeApp->invokeBrowser("http://www.digikam.org/?q=contrib"); } void EditorWindow::slotToggleSlideShow() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("ImageViewer Settings"); bool startWithCurrent = config->readBoolEntry("SlideShowStartCurrent", false); @@ -1886,7 +1886,7 @@ void EditorWindow::slotThemeChanged() m_themeMenuAction->setCurrentItem(index); - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("ImageViewer Settings"); if (!config->readBoolEntry("UseThemeBackgroundColor", true)) diff --git a/src/utilities/imageeditor/editor/imagewindow.cpp b/src/utilities/imageeditor/editor/imagewindow.cpp index 2c10a6f6..94dc584b 100644 --- a/src/utilities/imageeditor/editor/imagewindow.cpp +++ b/src/utilities/imageeditor/editor/imagewindow.cpp @@ -772,7 +772,7 @@ bool ImageWindow::setup(bool iccSetupPage) if (setup.exec() != TQDialog::Accepted) return false; - kapp->config()->sync(); + tdeApp->config()->sync(); applySettings(); return true; @@ -1084,7 +1084,7 @@ void ImageWindow::slideShow(bool startWithCurrent, SlideShowSettings& settings) settings.pictInfoMap.insert(info->kurl(), pictInfo); m_nameLabel->setProgressValue((int)((i++/cnt)*100.0)); - kapp->processEvents(); + tdeApp->processEvents(); } } else @@ -1106,7 +1106,7 @@ void ImageWindow::slideShow(bool startWithCurrent, SlideShowSettings& settings) settings.pictInfoMap.insert(*it, pictInfo); m_nameLabel->setProgressValue((int)((i++/cnt)*100.0)); - kapp->processEvents(); + tdeApp->processEvents(); } } diff --git a/src/utilities/imageeditor/rawimport/rawsettingsbox.cpp b/src/utilities/imageeditor/rawimport/rawsettingsbox.cpp index bf0ee67e..ac7ca43e 100644 --- a/src/utilities/imageeditor/rawimport/rawsettingsbox.cpp +++ b/src/utilities/imageeditor/rawimport/rawsettingsbox.cpp @@ -507,7 +507,7 @@ CurvesWidget* RawSettingsBox::curve() const void RawSettingsBox::readSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("RAW Import Settings"); d->channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", RawSettingsBoxPriv::LuminosityChannel)); @@ -582,7 +582,7 @@ void RawSettingsBox::readSettings() void RawSettingsBox::writeSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("RAW Import Settings"); config->writeEntry("Histogram Channel", d->channelCB->currentItem()); diff --git a/src/utilities/imageeditor/tools/imageprint.cpp b/src/utilities/imageeditor/tools/imageprint.cpp index 5cab236b..f1ffef05 100644 --- a/src/utilities/imageeditor/tools/imageprint.cpp +++ b/src/utilities/imageeditor/tools/imageprint.cpp @@ -204,7 +204,7 @@ bool ImagePrint::printImageWithTQt() if (size.width() > w || size.height() > h) { - int resp = KMessageBox::warningYesNoCancel(TDEApplication::kApplication()->mainWidget(), + int resp = KMessageBox::warningYesNoCancel(tdeApp->mainWidget(), i18n("The image will not fit on the page, what do you want to do?"), TQString(),KStdGuiItem::cont(), i18n("Shrink") ); @@ -300,7 +300,7 @@ TQString ImagePrint::minimizeString( TQString text, const TQFontMetrics& metrics void ImagePrint::readSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("Color Management"); @@ -740,7 +740,7 @@ void ImageEditorPrintDialogPage::slotUnitChanged(const TQString& string) void ImageEditorPrintDialogPage::readSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("Color Management"); d->cmEnabled = config->readBoolEntry("EnableCM", false); } diff --git a/src/utilities/imageeditor/tools/imageresize.cpp b/src/utilities/imageeditor/tools/imageresize.cpp index c779b71e..a681d187 100644 --- a/src/utilities/imageeditor/tools/imageresize.cpp +++ b/src/utilities/imageeditor/tools/imageresize.cpp @@ -303,7 +303,7 @@ void ImageResize::slotRestorationToggled(bool b) void ImageResize::readUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("resize Tool Dialog"); GreycstorationSettings settings; @@ -350,7 +350,7 @@ void ImageResize::readUserSettings() void ImageResize::writeUserSettings() { GreycstorationSettings settings = d->settingsWidget->getSettings(); - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("resize Tool Dialog"); config->writeEntry("FastApprox", settings.fastApprox); config->writeEntry("Interpolation", settings.interp); @@ -482,7 +482,7 @@ void ImageResize::slotCancel() void ImageResize::processCImgURL(const TQString& url) { - TDEApplication::kApplication()->invokeBrowser(url); + tdeApp->invokeBrowser(url); } void ImageResize::closeEvent(TQCloseEvent *e) diff --git a/src/utilities/lighttable/lighttablewindow.cpp b/src/utilities/lighttable/lighttablewindow.cpp index 58409aef..961bb82b 100644 --- a/src/utilities/lighttable/lighttablewindow.cpp +++ b/src/utilities/lighttable/lighttablewindow.cpp @@ -129,7 +129,7 @@ LightTableWindow::~LightTableWindow() void LightTableWindow::readSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("LightTable Settings"); if(config->hasKey("Vertical Splitter Sizes")) @@ -144,7 +144,7 @@ void LightTableWindow::readSettings() void LightTableWindow::writeSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("LightTable Settings"); config->writeEntry("Vertical Splitter Sizes", d->vSplitter->sizes()); config->writeEntry("Horizontal Splitter Sizes", d->hSplitter->sizes()); @@ -154,7 +154,7 @@ void LightTableWindow::writeSettings() void LightTableWindow::applySettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("LightTable Settings"); d->autoLoadOnRightPanel = config->readBoolEntry("Auto Load Right Panel", true); @@ -1261,7 +1261,7 @@ void LightTableWindow::slotFitToWindow() void LightTableWindow::slotToggleSlideShow() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("ImageViewer Settings"); bool startWithCurrent = config->readBoolEntry("SlideShowStartCurrent", false); @@ -1309,7 +1309,7 @@ void LightTableWindow::slideShow(bool startWithCurrent, SlideShowSettings& setti settings.fileList.append(info->kurl()); d->statusProgressBar->setProgressValue((int)((i++/(float)list.count())*100.0)); - kapp->processEvents(); + tdeApp->processEvents(); } d->statusProgressBar->progressBarMode(StatusProgressBar::TextMode, TQString()); @@ -1491,12 +1491,12 @@ void LightTableWindow::unplugActionAccel(TDEAction* action) void LightTableWindow::slotDonateMoney() { - TDEApplication::kApplication()->invokeBrowser("http://www.digikam.org/?q=donation"); + tdeApp->invokeBrowser("http://www.digikam.org/?q=donation"); } void LightTableWindow::slotContribute() { - TDEApplication::kApplication()->invokeBrowser("http://www.digikam.org/?q=contrib"); + tdeApp->invokeBrowser("http://www.digikam.org/?q=contrib"); } void LightTableWindow::slotEditKeys() @@ -1529,7 +1529,7 @@ void LightTableWindow::slotSetup() if (setup.exec() != TQDialog::Accepted) return; - kapp->config()->sync(); + tdeApp->config()->sync(); applySettings(); } diff --git a/src/utilities/setup/cameraselection.cpp b/src/utilities/setup/cameraselection.cpp index 2cf2635c..4c564040 100644 --- a/src/utilities/setup/cameraselection.cpp +++ b/src/utilities/setup/cameraselection.cpp @@ -102,7 +102,7 @@ CameraSelection::CameraSelection( TQWidget* parent ) { d = new CameraSelectionPriv; - kapp->setOverrideCursor(KCursor::waitCursor()); + tdeApp->setOverrideCursor(KCursor::waitCursor()); setHelp("cameraselection.anchor", "digikam"); d->UMSCameraNameActual = TQString("Directory Browse"); // Don't be i18n! d->UMSCameraNameShown = i18n("Mounted Camera"); @@ -180,7 +180,7 @@ CameraSelection::CameraSelection( TQWidget* parent ) TQLabel* logo = new TQLabel( box2 ); - TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader(); + TDEIconLoader* iconLoader = tdeApp->iconLoader(); logo->setPixmap(iconLoader->loadIcon("digikam", TDEIcon::NoGroup, 64, TDEIcon::DefaultState, 0, true)); @@ -246,7 +246,7 @@ CameraSelection::CameraSelection( TQWidget* parent ) getCameraList(); getSerialPortList(); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } CameraSelection::~CameraSelection() diff --git a/src/utilities/setup/setup.cpp b/src/utilities/setup/setup.cpp index bd47796f..e871c955 100644 --- a/src/utilities/setup/setup.cpp +++ b/src/utilities/setup/setup.cpp @@ -206,7 +206,7 @@ Setup::Setup(TQWidget* parent, const char* name, Setup::Page page) showPage((int) page); else { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("General Settings"); showPage(config->readNumEntry("Setup Page", General)); } @@ -216,7 +216,7 @@ Setup::Setup(TQWidget* parent, const char* name, Setup::Page page) Setup::~Setup() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("General Settings"); config->writeEntry("Setup Page", activePageIndex()); config->sync(); diff --git a/src/utilities/setup/setupcamera.cpp b/src/utilities/setup/setupcamera.cpp index 1b8d0bb8..6dc4edff 100644 --- a/src/utilities/setup/setupcamera.cpp +++ b/src/utilities/setup/setupcamera.cpp @@ -178,7 +178,7 @@ SetupCamera::~SetupCamera() void SetupCamera::processGphotoURL(const TQString& url) { - TDEApplication::kApplication()->invokeBrowser(url); + tdeApp->invokeBrowser(url); } void SetupCamera::slotSelectionChanged() @@ -236,9 +236,9 @@ void SetupCamera::slotAutoDetectCamera() { TQString model, port; - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); int ret = GPCamera::autoDetect(model, port); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); if (ret != 0) { diff --git a/src/utilities/setup/setupdcraw.cpp b/src/utilities/setup/setupdcraw.cpp index 57f9cb2d..7aa0cae2 100644 --- a/src/utilities/setup/setupdcraw.cpp +++ b/src/utilities/setup/setupdcraw.cpp @@ -102,7 +102,7 @@ void SetupDcraw::slotSixteenBitsImageToggled(bool) void SetupDcraw::applySettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("ImageViewer Settings"); config->writeEntry("SixteenBitsImage", d->dcrawSettings->sixteenBits()); config->writeEntry("WhiteBalance", d->dcrawSettings->whiteBalance()); @@ -124,7 +124,7 @@ void SetupDcraw::applySettings() void SetupDcraw::readSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("ImageViewer Settings"); d->dcrawSettings->setSixteenBits(config->readBoolEntry("SixteenBitsImage", false)); d->dcrawSettings->setNoiseReduction(config->readBoolEntry("EnableNoiseReduction", false)); diff --git a/src/utilities/setup/setupeditor.cpp b/src/utilities/setup/setupeditor.cpp index 337b5655..98381b22 100644 --- a/src/utilities/setup/setupeditor.cpp +++ b/src/utilities/setup/setupeditor.cpp @@ -148,7 +148,7 @@ void SetupEditor::slotThemeBackgroundColor(bool e) void SetupEditor::readSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); TQColor Black(TQt::black); TQColor White(TQt::white); config->setGroup("ImageViewer Settings"); @@ -162,7 +162,7 @@ void SetupEditor::readSettings() void SetupEditor::applySettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("ImageViewer Settings"); config->writeEntry("UseThemeBackgroundColor", d->themebackgroundColor->isChecked()); config->writeEntry("BackgroundColor", d->backgroundColor->color()); diff --git a/src/utilities/setup/setupicc.cpp b/src/utilities/setup/setupicc.cpp index b08750c1..3ff258ab 100644 --- a/src/utilities/setup/setupicc.cpp +++ b/src/utilities/setup/setupicc.cpp @@ -378,12 +378,12 @@ SetupICC::~SetupICC() void SetupICC::processLCMSURL(const TQString& url) { - TDEApplication::kApplication()->invokeBrowser(url); + tdeApp->invokeBrowser(url); } void SetupICC::applySettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("Color Management"); config->writeEntry("EnableCM", d->enableColorManagement->isChecked()); @@ -417,7 +417,7 @@ void SetupICC::applySettings() void SetupICC::readSettings(bool restore) { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("Color Management"); if (!restore) @@ -706,7 +706,7 @@ void SetupICC::slotToggleManagedView(bool b) bool SetupICC::iccRepositoryIsValid() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("Color Management"); // If color management is disable, no need to check anymore. diff --git a/src/utilities/setup/setupiofiles.cpp b/src/utilities/setup/setupiofiles.cpp index 6cdf23de..1e59dcac 100644 --- a/src/utilities/setup/setupiofiles.cpp +++ b/src/utilities/setup/setupiofiles.cpp @@ -111,7 +111,7 @@ SetupIOFiles::~SetupIOFiles() void SetupIOFiles::applySettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("ImageViewer Settings"); config->writeEntry("JPEGCompression", d->JPEGOptions->getCompressionValue()); config->writeEntry("JPEGSubSampling", d->JPEGOptions->getSubSamplingValue()); @@ -124,7 +124,7 @@ void SetupIOFiles::applySettings() void SetupIOFiles::readSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("ImageViewer Settings"); d->JPEGOptions->setCompressionValue( config->readNumEntry("JPEGCompression", 75) ); d->JPEGOptions->setSubSamplingValue( config->readNumEntry("JPEGSubSampling", 1) ); // Medium subsampling diff --git a/src/utilities/setup/setuplighttable.cpp b/src/utilities/setup/setuplighttable.cpp index 0ed01eab..5134a930 100644 --- a/src/utilities/setup/setuplighttable.cpp +++ b/src/utilities/setup/setuplighttable.cpp @@ -108,7 +108,7 @@ SetupLightTable::~SetupLightTable() void SetupLightTable::readSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); TQColor Black(TQt::black); TQColor White(TQt::white); config->setGroup("LightTable Settings"); @@ -120,7 +120,7 @@ void SetupLightTable::readSettings() void SetupLightTable::applySettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("LightTable Settings"); config->writeEntry("FullScreen Hide ToolBar", d->hideToolBar->isChecked()); config->writeEntry("Auto Sync Preview", d->autoSyncPreview->isChecked()); diff --git a/src/utilities/setup/setupmetadata.cpp b/src/utilities/setup/setupmetadata.cpp index e4f74ede..185dfafe 100644 --- a/src/utilities/setup/setupmetadata.cpp +++ b/src/utilities/setup/setupmetadata.cpp @@ -186,7 +186,7 @@ SetupMetadata::~SetupMetadata() void SetupMetadata::processExiv2URL(const TQString& url) { - TDEApplication::kApplication()->invokeBrowser(url); + tdeApp->invokeBrowser(url); } void SetupMetadata::applySettings() diff --git a/src/utilities/setup/setupslideshow.cpp b/src/utilities/setup/setupslideshow.cpp index 970d9c67..c42b8b10 100644 --- a/src/utilities/setup/setupslideshow.cpp +++ b/src/utilities/setup/setupslideshow.cpp @@ -130,7 +130,7 @@ SetupSlideShow::~SetupSlideShow() void SetupSlideShow::applySettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("ImageViewer Settings"); config->writeEntry("SlideShowDelay", d->delayInput->value()); @@ -147,7 +147,7 @@ void SetupSlideShow::applySettings() void SetupSlideShow::readSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("ImageViewer Settings"); d->delayInput->setValue(config->readNumEntry("SlideShowDelay", 5)); diff --git a/src/utilities/slideshow/slideshow.cpp b/src/utilities/slideshow/slideshow.cpp index 33cf9edc..08a4f997 100644 --- a/src/utilities/slideshow/slideshow.cpp +++ b/src/utilities/slideshow/slideshow.cpp @@ -438,7 +438,7 @@ void SlideShow::updatePixmap() { // End of Slide Show. - TQPixmap logo = kapp->iconLoader()->loadIcon("digikam", TDEIcon::NoGroup, 128, + TQPixmap logo = tdeApp->iconLoader()->loadIcon("digikam", TDEIcon::NoGroup, 128, TDEIcon::DefaultState, 0, true); TQFont fn(font()); diff --git a/src/utilities/slideshow/toolbar.cpp b/src/utilities/slideshow/toolbar.cpp index dbecd4ad..15956f42 100644 --- a/src/utilities/slideshow/toolbar.cpp +++ b/src/utilities/slideshow/toolbar.cpp @@ -75,7 +75,7 @@ ToolBar::ToolBar(TQWidget* parent) d->stopBtn = new TQToolButton(this); d->playBtn->setToggleButton(true); - TDEIconLoader* loader = kapp->iconLoader(); + TDEIconLoader* loader = tdeApp->iconLoader(); d->playBtn->setIconSet(loader->loadIcon("media-playback-pause", TDEIcon::NoGroup, 22)); d->prevBtn->setIconSet(loader->loadIcon("back", TDEIcon::NoGroup, 22)); d->nextBtn->setIconSet(loader->loadIcon("forward", TDEIcon::NoGroup, 22)); @@ -153,14 +153,14 @@ void ToolBar::slotPlayBtnToggled() if (d->playBtn->isOn()) { d->canHide = false; - TDEIconLoader* loader = kapp->iconLoader(); + TDEIconLoader* loader = tdeApp->iconLoader(); d->playBtn->setIconSet(loader->loadIcon("media-playback-start", TDEIcon::NoGroup, 22)); emit signalPause(); } else { d->canHide = true; - TDEIconLoader* loader = kapp->iconLoader(); + TDEIconLoader* loader = tdeApp->iconLoader(); d->playBtn->setIconSet(loader->loadIcon("media-playback-pause", TDEIcon::NoGroup, 22)); emit signalPlay(); } @@ -172,7 +172,7 @@ void ToolBar::slotNexPrevClicked() { d->playBtn->setOn(true); d->canHide = false; - TDEIconLoader* loader = kapp->iconLoader(); + TDEIconLoader* loader = tdeApp->iconLoader(); d->playBtn->setIconSet(loader->loadIcon("media-playback-start", TDEIcon::NoGroup, 22)); emit signalPause(); } |