diff options
Diffstat (limited to 'src')
148 files changed, 561 insertions, 561 deletions
diff --git a/src/digikam/albumiconview.cpp b/src/digikam/albumiconview.cpp index 88d6a3d1..d80fcba4 100644 --- a/src/digikam/albumiconview.cpp +++ b/src/digikam/albumiconview.cpp @@ -525,7 +525,7 @@ void AlbumIconView::slotRightButtonClicked(const TQPoint& pos) TQPopupMenu popmenu(this); TDEAction *paste = KStdAction::paste(this, TQ_SLOT(slotPaste()), 0); - TQMimeSource *data = kapp->clipboard()->data(TQClipboard::Clipboard); + TQMimeSource *data = tdeApp->clipboard()->data(TQClipboard::Clipboard); if(!data || !TQUriDrag::canDecode(data)) { @@ -684,7 +684,7 @@ void AlbumIconView::slotRightButtonClicked(IconItem *item, const TQPoint& pos) TDEAction *copy = KStdAction::copy(this, TQ_SLOT(slotCopy()), 0); TDEAction *paste = KStdAction::paste(this, TQ_SLOT(slotPaste()), 0); - TQMimeSource *data = kapp->clipboard()->data(TQClipboard::Clipboard); + TQMimeSource *data = tdeApp->clipboard()->data(TQClipboard::Clipboard); if(!data || !TQUriDrag::canDecode(data)) { paste->setEnabled(false); @@ -848,12 +848,12 @@ void AlbumIconView::slotCopy() TQDragObject* drag = 0; drag = new ItemDrag(urls, kioURLs, albumIDs, imageIDs, this); - kapp->clipboard()->setData(drag); + tdeApp->clipboard()->setData(drag); } void AlbumIconView::slotPaste() { - TQMimeSource *data = kapp->clipboard()->data(TQClipboard::Clipboard); + TQMimeSource *data = tdeApp->clipboard()->data(TQClipboard::Clipboard); if(!data) return; @@ -1686,7 +1686,7 @@ void AlbumIconView::changeTagOnImageInfos(const TQPtrList<ImageInfo> &list, cons if (progress) { emit signalProgressValue((int)((i++/cnt)*100.0)); - kapp->processEvents(); + tdeApp->processEvents(); } } d->imageLister->blockSignals(false); @@ -1883,7 +1883,7 @@ void AlbumIconView::slotSetExifOrientation( int orientation ) } emit signalProgressValue((int)((i++/cnt)*100.0)); - kapp->processEvents(); + tdeApp->processEvents(); } emit signalProgressBarMode(StatusProgressBar::TextMode, TQString()); @@ -2269,7 +2269,7 @@ void AlbumIconView::slotAssignRating(int rating) hub.write(info->filePath(), MetadataHub::FullWriteIfChanged); emit signalProgressValue((int)((i++/cnt)*100.0)); - kapp->processEvents(); + tdeApp->processEvents(); } } } diff --git a/src/digikam/albumlister.cpp b/src/digikam/albumlister.cpp index 63648773..91f808eb 100644 --- a/src/digikam/albumlister.cpp +++ b/src/digikam/albumlister.cpp @@ -521,7 +521,7 @@ void AlbumLister::slotFilterItems() // This takes linear time - and deleting seems to take longer. Set wait cursor for large numbers. bool setCursor = (3*deleteFilteredItemsList.count() + newFilteredItemsList.count()) > 1500; if (setCursor) - kapp->setOverrideCursor(KCursor::waitCursor()); + tdeApp->setOverrideCursor(KCursor::waitCursor()); emit signalItemsTextFilterMatch(matchForText); emit signalItemsFilterMatch(match); @@ -537,7 +537,7 @@ void AlbumLister::slotFilterItems() } if (setCursor) - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } void AlbumLister::slotResult(TDEIO::Job* job) diff --git a/src/digikam/albumsettings.cpp b/src/digikam/albumsettings.cpp index 6b7d4315..f87dd0d8 100644 --- a/src/digikam/albumsettings.cpp +++ b/src/digikam/albumsettings.cpp @@ -149,7 +149,7 @@ AlbumSettings* AlbumSettings::instance() AlbumSettings::AlbumSettings() { d = new AlbumSettingsPrivate; - d->config = kapp->config(); + d->config = tdeApp->config(); m_instance = this; init(); } diff --git a/src/digikam/albumthumbnailloader.cpp b/src/digikam/albumthumbnailloader.cpp index 1fe2065b..667fe53c 100644 --- a/src/digikam/albumthumbnailloader.cpp +++ b/src/digikam/albumthumbnailloader.cpp @@ -190,7 +190,7 @@ TQRect AlbumThumbnailLoader::computeBlendRect(int iconSize) TQPixmap AlbumThumbnailLoader::loadIcon(const TQString &name, int size) { - TDEIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader(); + TDEIconLoader *iconLoader = tdeApp->iconLoader(); return iconLoader->loadIcon(name, TDEIcon::NoGroup, size, TDEIcon::DefaultState, 0, true); diff --git a/src/digikam/datefolderview.cpp b/src/digikam/datefolderview.cpp index 8e36742e..4c52dc41 100644 --- a/src/digikam/datefolderview.cpp +++ b/src/digikam/datefolderview.cpp @@ -329,7 +329,7 @@ void DateFolderView::slotSelectionChanged() void DateFolderView::loadViewState() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup(name()); TQString selected; @@ -363,7 +363,7 @@ void DateFolderView::loadViewState() void DateFolderView::saveViewState() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup(name()); DateFolderItem *item = dynamic_cast<DateFolderItem*>(d->listview->selectedItem()); diff --git a/src/digikam/digikamapp.cpp b/src/digikam/digikamapp.cpp index 5b12575a..d6e2551a 100644 --- a/src/digikam/digikamapp.cpp +++ b/src/digikam/digikamapp.cpp @@ -113,11 +113,11 @@ DigikamApp::DigikamApp() { d = new DigikamAppPriv; m_instance = this; - d->config = kapp->config(); + d->config = tdeApp->config(); d->config->setGroup("General Settings"); if(d->config->readBoolEntry("Show Splash", true) && - !kapp->isRestored()) + !tdeApp->isRestored()) { d->splashScreen = new SplashScreen("digikam-splash.png"); d->splashScreen->show(); @@ -1755,7 +1755,7 @@ void DigikamApp::slotToggleFullScreen() } else { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("ImageViewer Settings"); bool fullScreenHideToolBar = config->readBoolEntry("FullScreen Hide ToolBar", false); @@ -1789,7 +1789,7 @@ void DigikamApp::slotShowTip() void DigikamApp::slotShowKipiHelp() { - TDEApplication::kApplication()->invokeHelp( TQString(), "kipi-plugins" ); + tdeApp->invokeHelp( TQString(), "kipi-plugins" ); } void DigikamApp::slotRawCameraList() @@ -2014,12 +2014,12 @@ void DigikamApp::slotSyncAllPicturesMetadataDone() void DigikamApp::slotDonateMoney() { - TDEApplication::kApplication()->invokeBrowser("http://www.digikam.org/?q=donation"); + tdeApp->invokeBrowser("http://www.digikam.org/?q=donation"); } void DigikamApp::slotContribute() { - TDEApplication::kApplication()->invokeBrowser("http://www.digikam.org/?q=contrib"); + tdeApp->invokeBrowser("http://www.digikam.org/?q=contrib"); } void DigikamApp::slotRecurseAlbums(bool checked) diff --git a/src/digikam/digikamfirstrun.cpp b/src/digikam/digikamfirstrun.cpp index e7a95c01..0810e334 100644 --- a/src/digikam/digikamfirstrun.cpp +++ b/src/digikam/digikamfirstrun.cpp @@ -89,7 +89,7 @@ DigikamFirstRun::DigikamFirstRun(TDEConfig* config, TQWidget* parent, "include the slash in the translation","/Pictures")); m_ui->m_path->setMode(KFile::Directory | KFile::LocalOnly); - TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader(); + TDEIconLoader* iconLoader = tdeApp->iconLoader(); m_ui->m_pixLabel->setPixmap(iconLoader->loadIcon("digikam", TDEIcon::NoGroup, 128, TDEIcon::DefaultState, 0, true)); m_ui->setMinimumSize(450, m_ui->sizeHint().height()); @@ -171,7 +171,7 @@ void DigikamFirstRun::slotOk() TQString ErrorMsg, URL; - if (kapp->startServiceByDesktopName("digikam", URL , &ErrorMsg) > 0) + if (tdeApp->startServiceByDesktopName("digikam", URL , &ErrorMsg) > 0) { DError() << ErrorMsg << endl; KMessageBox::sorry(this, i18n("Cannot restart digiKam automatically.\n" diff --git a/src/digikam/digikamview.cpp b/src/digikam/digikamview.cpp index a8fb42fb..1fb00828 100644 --- a/src/digikam/digikamview.cpp +++ b/src/digikam/digikamview.cpp @@ -466,7 +466,7 @@ void DigikamView::setupConnections() void DigikamView::loadViewState() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("MainWindow"); if(config->hasKey("SplitterSizes")) @@ -477,7 +477,7 @@ void DigikamView::loadViewState() void DigikamView::saveViewState() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("MainWindow"); config->writeEntry("SplitterSizes", d->splitter->sizes()); @@ -1500,7 +1500,7 @@ void DigikamView::slotItemsInfoFromAlbums(const ImageInfoList& infoList) void DigikamView::slideShow(ImageInfoList &infoList) { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("ImageViewer Settings"); bool startWithCurrent = config->readBoolEntry("SlideShowStartCurrent", false); @@ -1543,7 +1543,7 @@ void DigikamView::slideShow(ImageInfoList &infoList) settings.pictInfoMap.insert(info->kurl(), pictInfo); emit signalProgressValue((int)((i++/cnt)*100.0)); - kapp->eventLoop()->processEvents(TQEventLoop::AllEvents & ~TQEventLoop::WaitForMore); + tdeApp->eventLoop()->processEvents(TQEventLoop::AllEvents & ~TQEventLoop::WaitForMore); } emit signalProgressBarMode(StatusProgressBar::TextMode, TQString()); diff --git a/src/digikam/folderview.cpp b/src/digikam/folderview.cpp index 0e2d515d..0f750f2f 100644 --- a/src/digikam/folderview.cpp +++ b/src/digikam/folderview.cpp @@ -383,7 +383,7 @@ void FolderView::slotAllAlbumsLoaded() void FolderView::loadViewState() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup(name()); int selectedItem = config->readNumEntry("LastSelectedItem", 0); @@ -430,7 +430,7 @@ void FolderView::loadViewState() void FolderView::saveViewState() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup(name()); FolderItem *item = dynamic_cast<FolderItem*>(selectedItem()); diff --git a/src/digikam/scanlib.cpp b/src/digikam/scanlib.cpp index 71ea425c..86e90b3f 100644 --- a/src/digikam/scanlib.cpp +++ b/src/digikam/scanlib.cpp @@ -93,7 +93,7 @@ ScanLib::~ScanLib() void ScanLib::startScan() { struct timeval tv1, tv2; - TQPixmap pix = TDEApplication::kApplication()->iconLoader()->loadIcon( + TQPixmap pix = tdeApp->iconLoader()->loadIcon( "system-run", TDEIcon::NoGroup, 32); TQString message = i18n("Finding non-existent Albums"); @@ -145,7 +145,7 @@ void ScanLib::findFoldersWhichDoNotExist() } } - kapp->processEvents(); + tdeApp->processEvents(); if (!toBeDeleted.isEmpty()) { @@ -200,11 +200,11 @@ void ScanLib::findMissingItems() m_progressBar->setLabel(i18n("Scanning items, please wait...")); m_progressBar->progressBar()->setTotalSteps( countItemsInFolder( albumPath ) ); if (!m_splash) m_progressBar->show(); - kapp->processEvents(); + tdeApp->processEvents(); TQDir dir(albumPath); TQStringList fileList(dir.entryList(TQDir::Dirs)); - TQPixmap pix = TDEApplication::kApplication()->iconLoader()->loadIcon( + TQPixmap pix = tdeApp->iconLoader()->loadIcon( "folder_image", TDEIcon::NoGroup, 32); AlbumDB* db = AlbumManager::instance()->albumDB(); @@ -222,7 +222,7 @@ void ScanLib::findMissingItems() db->commitTransaction(); m_progressBar->hide(); - kapp->processEvents(); + tdeApp->processEvents(); } void ScanLib::updateItemsWithoutDate() @@ -244,7 +244,7 @@ void ScanLib::updateItemsWithoutDate() m_progressBar->progressBar()->setTotalSteps(urls.count()); m_progressBar->setLabel(i18n("Updating items, please wait...")); m_progressBar->show(); - kapp->processEvents(); + tdeApp->processEvents(); TQString basePath = AlbumManager::instance()->getLibraryPath(); basePath = TQDir::cleanDirPath(basePath); @@ -258,7 +258,7 @@ void ScanLib::updateItemsWithoutDate() ++counter; if ( counter % 30 == 0 ) { - kapp->processEvents(); + tdeApp->processEvents(); } TQFileInfo fi(*it); @@ -290,7 +290,7 @@ void ScanLib::updateItemsWithoutDate() db->commitTransaction(); m_progressBar->hide(); - kapp->processEvents(); + tdeApp->processEvents(); } int ScanLib::countItemsInFolder(const TQString& directory) @@ -364,7 +364,7 @@ void ScanLib::allFiles(const TQString& directory) TQFileInfo *fi; m_progressBar->progressBar()->advance(list->count()); - kapp->processEvents(); + tdeApp->processEvents(); while ( (fi = it.current()) != 0 ) { diff --git a/src/digikam/syncjob.cpp b/src/digikam/syncjob.cpp index b350aabc..edc7a22c 100644 --- a/src/digikam/syncjob.cpp +++ b/src/digikam/syncjob.cpp @@ -243,7 +243,7 @@ TQPixmap SyncJob::getTagThumbnailPriv(const TQString &name, int size) } else { - TDEIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader(); + TDEIconLoader *iconLoader = tdeApp->iconLoader(); *thumbnail_ = iconLoader->loadIcon(name, TDEIcon::NoGroup, thumbnailSize_, TDEIcon::DefaultState, 0, true); } diff --git a/src/digikam/tageditdlg.cpp b/src/digikam/tageditdlg.cpp index d77a0169..f801aa52 100644 --- a/src/digikam/tageditdlg.cpp +++ b/src/digikam/tageditdlg.cpp @@ -104,7 +104,7 @@ TagEditDlg::TagEditDlg(TQWidget *parent, TAlbum* album, bool create) // -------------------------------------------------------- TQLabel *logo = new TQLabel(page); - TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader(); + TDEIconLoader* iconLoader = tdeApp->iconLoader(); logo->setPixmap(iconLoader->loadIcon("digikam", TDEIcon::NoGroup, 96, TDEIcon::DefaultState, 0, true)); d->topLabel = new TQLabel(page); diff --git a/src/digikam/tagfilterview.cpp b/src/digikam/tagfilterview.cpp index 2bebc2b8..e3675dbb 100644 --- a/src/digikam/tagfilterview.cpp +++ b/src/digikam/tagfilterview.cpp @@ -330,7 +330,7 @@ TagFilterView::TagFilterView(TQWidget* parent) // ------------------------------------------------------------------------ - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("Tag Filters View"); d->matchingCond = (AlbumLister::MatchingCondition)(config->readNumEntry("Matching Condition", AlbumLister::OrCondition)); @@ -340,7 +340,7 @@ TagFilterView::TagFilterView(TQWidget* parent) TagFilterView::~TagFilterView() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("Tag Filters View"); config->writeEntry("Matching Condition", (int)(d->matchingCond)); config->writeEntry("Toggle Auto Tags", (int)(d->toggleAutoTags)); @@ -653,7 +653,7 @@ void TagFilterView::contentsDropEvent(TQDropEvent *e) hub.write(info.filePath(), MetadataHub::FullWriteIfChanged); emit signalProgressValue((int)((i++/(float)imageIDs.count())*100.0)); - kapp->processEvents(); + tdeApp->processEvents(); } AlbumLister::instance()->blockSignals(false); AlbumManager::instance()->albumDB()->commitTransaction(); @@ -1134,13 +1134,13 @@ void TagFilterView::tagNew(TagFilterViewItem* item, const TQString& _title, cons if (title.isNull()) { - if (!TagEditDlg::tagCreate(kapp->activeWindow(), parent, title, icon)) + if (!TagEditDlg::tagCreate(tdeApp->activeWindow(), parent, title, icon)) return; } TQMap<TQString, TQString> errMap; AlbumList tList = TagEditDlg::createTAlbum(parent, title, icon, errMap); - TagEditDlg::showtagsListCreationError(kapp->activeWindow(), errMap); + TagEditDlg::showtagsListCreationError(tdeApp->activeWindow(), errMap); for (AlbumList::iterator it = tList.begin(); it != tList.end(); ++it) { @@ -1165,7 +1165,7 @@ void TagFilterView::tagEdit(TagFilterViewItem* item) return; TQString title, icon; - if (!TagEditDlg::tagEdit(kapp->activeWindow(), tag, title, icon)) + if (!TagEditDlg::tagEdit(tdeApp->activeWindow(), tag, title, icon)) { return; } @@ -1359,7 +1359,7 @@ void TagFilterView::slotResetTagFilters() void TagFilterView::loadViewState() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup(name()); int selectedItem = config->readNumEntry("LastSelectedItem", 0); @@ -1406,7 +1406,7 @@ void TagFilterView::loadViewState() void TagFilterView::saveViewState() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup(name()); TagFilterViewItem *item = dynamic_cast<TagFilterViewItem*>(selectedItem()); diff --git a/src/digikam/tagfolderview.cpp b/src/digikam/tagfolderview.cpp index c5d54331..c0b5aaa3 100644 --- a/src/digikam/tagfolderview.cpp +++ b/src/digikam/tagfolderview.cpp @@ -635,13 +635,13 @@ void TagFolderView::tagNew( TagFolderViewItem *item, const TQString& _title, con if (title.isNull()) { - if(!TagEditDlg::tagCreate(kapp->activeWindow(), parent, title, icon)) + if(!TagEditDlg::tagCreate(tdeApp->activeWindow(), parent, title, icon)) return; } TQMap<TQString, TQString> errMap; AlbumList tList = TagEditDlg::createTAlbum(parent, title, icon, errMap); - TagEditDlg::showtagsListCreationError(kapp->activeWindow(), errMap); + TagEditDlg::showtagsListCreationError(tdeApp->activeWindow(), errMap); for (AlbumList::iterator it = tList.begin(); it != tList.end(); ++it) { @@ -667,7 +667,7 @@ void TagFolderView::tagEdit(TagFolderViewItem *item) return; TQString title, icon; - if(!TagEditDlg::tagEdit(kapp->activeWindow(), tag, title, icon)) + if(!TagEditDlg::tagEdit(tdeApp->activeWindow(), tag, title, icon)) return; if(tag->title() != title) @@ -975,7 +975,7 @@ void TagFolderView::contentsDropEvent(TQDropEvent *e) hub.write(info.filePath(), MetadataHub::FullWriteIfChanged); emit signalProgressValue((int)((i++/(float)imageIDs.count())*100.0)); - kapp->processEvents(); + tdeApp->processEvents(); } AlbumLister::instance()->blockSignals(false); d->albumMan->albumDB()->commitTransaction(); diff --git a/src/digikam/tagspopupmenu.cpp b/src/digikam/tagspopupmenu.cpp index 8b9e4644..b0f47bad 100644 --- a/src/digikam/tagspopupmenu.cpp +++ b/src/digikam/tagspopupmenu.cpp @@ -71,7 +71,7 @@ public: { TQFont fn = m_popup->font(); TQFontMetrics fm(fn); - int w = fm.width(m_txt) + 5 + kapp->style().pixelMetric(TQStyle::PM_IndicatorWidth, 0); + int w = fm.width(m_txt) + 5 + tdeApp->style().pixelMetric(TQStyle::PM_IndicatorWidth, 0); int h = TQMAX(fm.height(), m_pix.height()); return TQSize( w, h ); } @@ -90,8 +90,8 @@ public: p->drawPixmap( pixRect.topLeft(), m_pix ); } - int checkWidth = kapp->style().pixelMetric(TQStyle::PM_IndicatorWidth, 0); - int checkHeight = kapp->style().pixelMetric(TQStyle::PM_IndicatorHeight, 0); + int checkWidth = tdeApp->style().pixelMetric(TQStyle::PM_IndicatorWidth, 0); + int checkHeight = tdeApp->style().pixelMetric(TQStyle::PM_IndicatorHeight, 0); TQStyle::SFlags flags = TQStyle::Style_Default; flags |= TQStyle::Style_On; @@ -103,7 +103,7 @@ public: TQFont fn = m_popup->font(); TQFontMetrics fm(fn); TQRect r(x + 5 + fm.width(m_txt), y + (h/2-checkHeight/2), checkWidth, checkHeight); - kapp->style().drawPrimitive(TQStyle::PE_CheckMark, p, r, cg, flags); + tdeApp->style().drawPrimitive(TQStyle::PE_CheckMark, p, r, cg, flags); } private: @@ -141,7 +141,7 @@ TagsPopupMenu::TagsPopupMenu(const TQValueList<TQ_LLONG>& selectedImageIDs, int d->addToID = addToID; d->mode = mode; - TDEIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader(); + TDEIconLoader *iconLoader = tdeApp->iconLoader(); d->addTagPix = iconLoader->loadIcon("tag", TDEIcon::NoGroup, TDEIcon::SizeSmall, @@ -346,12 +346,12 @@ void TagsPopupMenu::slotActivated(int id) } TQString title, icon; - if (!TagEditDlg::tagCreate(kapp->activeWindow(), parent, title, icon)) + if (!TagEditDlg::tagCreate(tdeApp->activeWindow(), parent, title, icon)) return; TQMap<TQString, TQString> errMap; AlbumList tList = TagEditDlg::createTAlbum(parent, title, icon, errMap); - TagEditDlg::showtagsListCreationError(kapp->activeWindow(), errMap); + TagEditDlg::showtagsListCreationError(tdeApp->activeWindow(), errMap); for (AlbumList::iterator it = tList.begin(); it != tList.end(); ++it) emit signalTagActivated((*it)->id()); diff --git a/src/digikam/timelineview.cpp b/src/digikam/timelineview.cpp index ae8a6bc2..7794c898 100644 --- a/src/digikam/timelineview.cpp +++ b/src/digikam/timelineview.cpp @@ -325,7 +325,7 @@ void TimeLineView::slotInit() void TimeLineView::readConfig() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("TimeLine SideBar"); d->timeUnitCB->setCurrentItem(config->readNumEntry("Histogram TimeUnit", TimeLineWidget::Month)); @@ -341,7 +341,7 @@ void TimeLineView::readConfig() void TimeLineView::writeConfig() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("TimeLine SideBar"); config->writeEntry("Histogram TimeUnit", d->timeUnitCB->currentItem()); config->writeEntry("Histogram Scale", d->scaleBG->selectedId()); diff --git a/src/digikam/welcomepageview.cpp b/src/digikam/welcomepageview.cpp index 6327c947..c7c5cf8c 100644 --- a/src/digikam/welcomepageview.cpp +++ b/src/digikam/welcomepageview.cpp @@ -65,7 +65,7 @@ WelcomePageView::WelcomePageView(TQWidget* parent) TQString locationHtml = locate("data", "digikam/about/main.html"); TQString locationCss = locate("data", "digikam/about/kde_infopage.css"); TQString locationRtl = locate("data", "digikam/about/kde_infopage_rtl.css" ); - TQString rtl = kapp->reverseLayout() ? TQString("@import \"%1\";" ).arg(locationRtl) + TQString rtl = tdeApp->reverseLayout() ? TQString("@import \"%1\";" ).arg(locationRtl) : TQString(); begin(KURL(locationHtml)); @@ -93,7 +93,7 @@ WelcomePageView::~WelcomePageView() void WelcomePageView::slotUrlOpen(const KURL &url) { - TDEApplication::kApplication()->invokeBrowser(url.url()); + tdeApp->invokeBrowser(url.url()); } TQString WelcomePageView::infoPage() 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("<p>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("<p>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("<p>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("<p>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.<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(); } diff --git a/src/imageplugins/distortionfx/distortionfxtool.cpp b/src/imageplugins/distortionfx/distortionfxtool.cpp index 45ff0e45..22b3980a 100644 --- a/src/imageplugins/distortionfx/distortionfxtool.cpp +++ b/src/imageplugins/distortionfx/distortionfxtool.cpp @@ -228,7 +228,7 @@ void DistortionFXTool::renderingFinished() void DistortionFXTool::readSettings(void) { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("distortionfx Tool"); m_effectType->blockSignals(true); @@ -251,7 +251,7 @@ void DistortionFXTool::readSettings(void) void DistortionFXTool::writeSettings(void) { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("distortionfx Tool"); config->writeEntry("EffectType", m_effectType->currentItem()); config->writeEntry("IterationAjustment", m_iterationInput->value()); diff --git a/src/imageplugins/distortionfx/imageeffect_distortionfx.cpp b/src/imageplugins/distortionfx/imageeffect_distortionfx.cpp index 695e7749..03f3ccf4 100644 --- a/src/imageplugins/distortionfx/imageeffect_distortionfx.cpp +++ b/src/imageplugins/distortionfx/imageeffect_distortionfx.cpp @@ -219,7 +219,7 @@ void ImageEffect_DistortionFX::renderingFinished() void ImageEffect_DistortionFX::readUserSettings(void) { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("distortionfx Tool Dialog"); m_effectType->blockSignals(true); @@ -239,7 +239,7 @@ void ImageEffect_DistortionFX::readUserSettings(void) void ImageEffect_DistortionFX::writeUserSettings(void) { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("distortionfx Tool Dialog"); config->writeEntry("EffectType", m_effectType->currentItem()); config->writeEntry("IterationAjustment", m_iterationInput->value()); diff --git a/src/imageplugins/emboss/embosstool.cpp b/src/imageplugins/emboss/embosstool.cpp index f16ef4de..03a22f96 100644 --- a/src/imageplugins/emboss/embosstool.cpp +++ b/src/imageplugins/emboss/embosstool.cpp @@ -111,7 +111,7 @@ void EmbossTool::renderingFinished() void EmbossTool::readSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("emboss Tool"); m_depthInput->blockSignals(true); m_depthInput->setValue(config->readNumEntry("DepthAjustment", m_depthInput->defaultValue())); @@ -120,7 +120,7 @@ void EmbossTool::readSettings() void EmbossTool::writeSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("emboss Tool"); config->writeEntry("DepthAjustment", m_depthInput->value()); m_previewWidget->writeSettings(); diff --git a/src/imageplugins/emboss/imageeffect_emboss.cpp b/src/imageplugins/emboss/imageeffect_emboss.cpp index b4557c80..fe4b1eed 100644 --- a/src/imageplugins/emboss/imageeffect_emboss.cpp +++ b/src/imageplugins/emboss/imageeffect_emboss.cpp @@ -110,7 +110,7 @@ void ImageEffect_Emboss::renderingFinished() void ImageEffect_Emboss::readUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("emboss Tool Dialog"); m_depthInput->blockSignals(true); m_depthInput->setValue(config->readNumEntry("DepthAjustment", 30)); @@ -119,7 +119,7 @@ void ImageEffect_Emboss::readUserSettings() void ImageEffect_Emboss::writeUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("emboss Tool Dialog"); config->writeEntry("DepthAjustment", m_depthInput->value()); config->sync(); diff --git a/src/imageplugins/filmgrain/filmgraintool.cpp b/src/imageplugins/filmgrain/filmgraintool.cpp index 5799d814..8fe07a24 100644 --- a/src/imageplugins/filmgrain/filmgraintool.cpp +++ b/src/imageplugins/filmgrain/filmgraintool.cpp @@ -131,7 +131,7 @@ void FilmGrainTool::renderingFinished() void FilmGrainTool::readSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("filmgrain Tool"); m_sensibilitySlider->blockSignals(true); m_sensibilitySlider->setValue(config->readNumEntry("SensitivityAjustment", 12)); @@ -141,7 +141,7 @@ void FilmGrainTool::readSettings() void FilmGrainTool::writeSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("filmgrain Tool"); config->writeEntry("SensitivityAjustment", m_sensibilitySlider->value()); m_previewWidget->writeSettings(); diff --git a/src/imageplugins/filmgrain/imageeffect_filmgrain.cpp b/src/imageplugins/filmgrain/imageeffect_filmgrain.cpp index e008095a..90f32959 100644 --- a/src/imageplugins/filmgrain/imageeffect_filmgrain.cpp +++ b/src/imageplugins/filmgrain/imageeffect_filmgrain.cpp @@ -131,7 +131,7 @@ void ImageEffect_FilmGrain::renderingFinished() void ImageEffect_FilmGrain::readUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("filmgrain Tool Dialog"); m_sensibilitySlider->blockSignals(true); m_sensibilitySlider->setValue(config->readNumEntry("SensitivityAjustment", 12)); @@ -141,7 +141,7 @@ void ImageEffect_FilmGrain::readUserSettings() void ImageEffect_FilmGrain::writeUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("filmgrain Tool Dialog"); config->writeEntry("SensitivityAjustment", m_sensibilitySlider->value()); config->sync(); diff --git a/src/imageplugins/freerotation/freerotationtool.cpp b/src/imageplugins/freerotation/freerotationtool.cpp index b25f2196..37bc168b 100644 --- a/src/imageplugins/freerotation/freerotationtool.cpp +++ b/src/imageplugins/freerotation/freerotationtool.cpp @@ -181,7 +181,7 @@ void FreeRotationTool::slotColorGuideChanged() void FreeRotationTool::readSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("freerotation Tool"); m_angleInput->setValue(config->readNumEntry("Main Angle", m_angleInput->defaultValue())); m_fineAngleInput->setValue(config->readDoubleNumEntry("Fine Angle", m_fineAngleInput->defaultValue())); @@ -196,7 +196,7 @@ void FreeRotationTool::readSettings() void FreeRotationTool::writeSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("freerotation Tool"); config->writeEntry("Main Angle", m_angleInput->value()); config->writeEntry("Fine Angle", m_fineAngleInput->value()); @@ -226,7 +226,7 @@ void FreeRotationTool::slotResetSettings() void FreeRotationTool::prepareEffect() { - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); m_angleInput->setEnabled(false); m_fineAngleInput->setEnabled(false); m_antialiasInput->setEnabled(false); @@ -312,7 +312,7 @@ void FreeRotationTool::renderingFinished() m_fineAngleInput->setEnabled(true); m_antialiasInput->setEnabled(true); m_autoCropCB->setEnabled(true); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } } // NameSpace DigikamFreeRotationImagesPlugin diff --git a/src/imageplugins/freerotation/imageeffect_freerotation.cpp b/src/imageplugins/freerotation/imageeffect_freerotation.cpp index bce50f07..e5f76cfa 100644 --- a/src/imageplugins/freerotation/imageeffect_freerotation.cpp +++ b/src/imageplugins/freerotation/imageeffect_freerotation.cpp @@ -175,7 +175,7 @@ ImageEffect_FreeRotation::~ImageEffect_FreeRotation() void ImageEffect_FreeRotation::readUserSettings(void) { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("freerotation Tool Dialog"); m_angleInput->setValue(config->readNumEntry("Main Angle", 0)); m_fineAngleInput->setValue(config->readDoubleNumEntry("Fine Angle", 0.0)); @@ -186,7 +186,7 @@ void ImageEffect_FreeRotation::readUserSettings(void) void ImageEffect_FreeRotation::writeUserSettings(void) { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("freerotation Tool Dialog"); config->writeEntry("Main Angle", m_angleInput->value()); config->writeEntry("Fine Angle", m_fineAngleInput->value()); @@ -211,7 +211,7 @@ void ImageEffect_FreeRotation::resetValues() void ImageEffect_FreeRotation::prepareEffect() { - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); m_angleInput->setEnabled(false); m_fineAngleInput->setEnabled(false); m_antialiasInput->setEnabled(false); @@ -301,7 +301,7 @@ void ImageEffect_FreeRotation::renderingFinished() m_fineAngleInput->setEnabled(true); m_antialiasInput->setEnabled(true); m_autoCropCB->setEnabled(true); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } } // NameSpace DigikamFreeRotationImagesPlugin diff --git a/src/imageplugins/hotpixels/blackframeparser.cpp b/src/imageplugins/hotpixels/blackframeparser.cpp index 7306f4e6..96a26138 100644 --- a/src/imageplugins/hotpixels/blackframeparser.cpp +++ b/src/imageplugins/hotpixels/blackframeparser.cpp @@ -75,7 +75,7 @@ void BlackFrameParser::parseHotPixels(const TQString &file) void BlackFrameParser::parseBlackFrame(const KURL &url) { #if KDE_IS_VERSION(3,2,0) - TDEIO::NetAccess::download(url, m_localFile, kapp->activeWindow()); + TDEIO::NetAccess::download(url, m_localFile, tdeApp->activeWindow()); #else TDEIO::NetAccess::download(url, m_localFile); #endif diff --git a/src/imageplugins/hotpixels/hotpixelstool.cpp b/src/imageplugins/hotpixels/hotpixelstool.cpp index fbcc6c9f..dd4dd8b9 100644 --- a/src/imageplugins/hotpixels/hotpixelstool.cpp +++ b/src/imageplugins/hotpixels/hotpixelstool.cpp @@ -135,7 +135,7 @@ HotPixelsTool::~HotPixelsTool() void HotPixelsTool::readSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("hotpixels Tool"); m_blackFrameURL = KURL(config->readEntry("Last Black Frame File", TQString())); m_filterMethodCombo->setCurrentItem(config->readNumEntry("Filter Method", @@ -166,7 +166,7 @@ void HotPixelsTool::slotLoadingComplete() void HotPixelsTool::writeSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("hotpixels Tool"); config->writeEntry("Last Black Frame File", m_blackFrameURL.url()); config->writeEntry("Filter Method", m_filterMethodCombo->currentItem()); @@ -183,7 +183,7 @@ void HotPixelsTool::slotResetSettings() void HotPixelsTool::slotAddBlackFrame() { - KURL url = ImageDialog::getImageURL(kapp->activeWindow(), m_blackFrameURL, i18n("Select Black Frame Image")); + KURL url = ImageDialog::getImageURL(tdeApp->activeWindow(), m_blackFrameURL, i18n("Select Black Frame Image")); if (!url.isEmpty()) { diff --git a/src/imageplugins/hotpixels/imageeffect_hotpixels.cpp b/src/imageplugins/hotpixels/imageeffect_hotpixels.cpp index 67e9a1b2..4e73d981 100644 --- a/src/imageplugins/hotpixels/imageeffect_hotpixels.cpp +++ b/src/imageplugins/hotpixels/imageeffect_hotpixels.cpp @@ -133,7 +133,7 @@ ImageEffect_HotPixels::~ImageEffect_HotPixels() void ImageEffect_HotPixels::readUserSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("hotpixels Tool Dialog"); m_blackFrameURL = KURL(config->readEntry("Last Black Frame File", TQString())); m_filterMethodCombo->setCurrentItem(config->readNumEntry("Filter Method", @@ -153,7 +153,7 @@ void ImageEffect_HotPixels::readUserSettings() void ImageEffect_HotPixels::writeUserSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("hotpixels Tool Dialog"); config->writeEntry("Last Black Frame File", m_blackFrameURL.url()); config->writeEntry("Filter Method", m_filterMethodCombo->currentItem()); diff --git a/src/imageplugins/infrared/imageeffect_infrared.cpp b/src/imageplugins/infrared/imageeffect_infrared.cpp index f8069255..ae0adc9f 100644 --- a/src/imageplugins/infrared/imageeffect_infrared.cpp +++ b/src/imageplugins/infrared/imageeffect_infrared.cpp @@ -150,7 +150,7 @@ void ImageEffect_Infrared::renderingFinished() void ImageEffect_Infrared::readUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("infrared Tool Dialog"); m_sensibilitySlider->blockSignals(true); m_addFilmGrain->blockSignals(true); @@ -163,7 +163,7 @@ void ImageEffect_Infrared::readUserSettings() void ImageEffect_Infrared::writeUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("infrared Tool Dialog"); config->writeEntry("SensitivityAjustment", m_sensibilitySlider->value()); config->writeEntry("AddFilmGrain", m_addFilmGrain->isChecked()); diff --git a/src/imageplugins/infrared/infraredtool.cpp b/src/imageplugins/infrared/infraredtool.cpp index f34d1c8a..83e35d3b 100644 --- a/src/imageplugins/infrared/infraredtool.cpp +++ b/src/imageplugins/infrared/infraredtool.cpp @@ -150,7 +150,7 @@ void InfraredTool::renderingFinished() void InfraredTool::readSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("infrared Tool"); m_sensibilitySlider->blockSignals(true); m_addFilmGrain->blockSignals(true); @@ -163,7 +163,7 @@ void InfraredTool::readSettings() void InfraredTool::writeSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("infrared Tool"); config->writeEntry("SensitivityAjustment", m_sensibilitySlider->value()); config->writeEntry("AddFilmGrain", m_addFilmGrain->isChecked()); diff --git a/src/imageplugins/inpainting/imageeffect_inpainting.cpp b/src/imageplugins/inpainting/imageeffect_inpainting.cpp index d7f2f5fe..1ef057b1 100644 --- a/src/imageplugins/inpainting/imageeffect_inpainting.cpp +++ b/src/imageplugins/inpainting/imageeffect_inpainting.cpp @@ -218,7 +218,7 @@ void ImageEffect_InPainting_Dialog::renderingFinished() void ImageEffect_InPainting_Dialog::readUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("inpainting Tool Dialog"); Digikam::GreycstorationSettings settings; @@ -249,7 +249,7 @@ void ImageEffect_InPainting_Dialog::readUserSettings() void ImageEffect_InPainting_Dialog::writeUserSettings() { Digikam::GreycstorationSettings settings = m_settingsWidget->getSettings(); - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("inpainting Tool Dialog"); config->writeEntry("Preset", m_inpaintingTypeCB->currentItem()); config->writeEntry("FastApprox", settings.fastApprox); @@ -309,7 +309,7 @@ void ImageEffect_InPainting_Dialog::resetValues() void ImageEffect_InPainting_Dialog::processCImgURL(const TQString& url) { - TDEApplication::kApplication()->invokeBrowser(url); + tdeApp->invokeBrowser(url); } void ImageEffect_InPainting_Dialog::prepareEffect() @@ -380,7 +380,7 @@ void ImageEffect_InPainting_Dialog::prepareFinal() else { putFinalData(); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); accept(); } } diff --git a/src/imageplugins/inpainting/imageplugin_inpainting.cpp b/src/imageplugins/inpainting/imageplugin_inpainting.cpp index 2c1e30f3..6c4b4f0a 100644 --- a/src/imageplugins/inpainting/imageplugin_inpainting.cpp +++ b/src/imageplugins/inpainting/imageplugin_inpainting.cpp @@ -80,7 +80,7 @@ void ImagePlugin_InPainting::slotInPainting() if (!w || !h) { - InPaintingPassivePopup* popup = new InPaintingPassivePopup(kapp->activeWindow()); + InPaintingPassivePopup* popup = new InPaintingPassivePopup(tdeApp->activeWindow()); popup->setView(i18n("Inpainting Photograph Tool"), i18n("You need to select a region to inpaint to use " "this tool")); diff --git a/src/imageplugins/inpainting/inpaintingtool.cpp b/src/imageplugins/inpainting/inpaintingtool.cpp index 2ada52bf..906c1f65 100644 --- a/src/imageplugins/inpainting/inpaintingtool.cpp +++ b/src/imageplugins/inpainting/inpaintingtool.cpp @@ -179,7 +179,7 @@ void InPaintingTool::renderingFinished() void InPaintingTool::readSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("inpainting Tool"); GreycstorationSettings settings; @@ -212,7 +212,7 @@ void InPaintingTool::readSettings() void InPaintingTool::writeSettings() { GreycstorationSettings settings = m_settingsWidget->getSettings(); - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("inpainting Tool"); config->writeEntry("Preset", m_inpaintingTypeCB->currentItem()); config->writeEntry("FastApprox", settings.fastApprox); @@ -273,7 +273,7 @@ void InPaintingTool::slotResetSettings() void InPaintingTool::processCImgURL(const TQString& url) { - TDEApplication::kApplication()->invokeBrowser(url); + tdeApp->invokeBrowser(url); } void InPaintingTool::prepareEffect() @@ -381,7 +381,7 @@ void InPaintingTool::putFinalData() void InPaintingTool::slotLoadSettings() { KURL loadInpaintingFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), - TQString( "*" ), kapp->activeWindow(), + TQString( "*" ), tdeApp->activeWindow(), TQString( i18n("Photograph Inpainting Settings File to Load")) ); if( loadInpaintingFile.isEmpty() ) return; @@ -392,7 +392,7 @@ void InPaintingTool::slotLoadSettings() { if (!m_settingsWidget->loadSettings(file, TQString("# Photograph Inpainting Configuration File V2"))) { - KMessageBox::error(kapp->activeWindow(), + KMessageBox::error(tdeApp->activeWindow(), i18n("\"%1\" is not a Photograph Inpainting settings text file.") .arg(loadInpaintingFile.fileName())); file.close(); @@ -400,7 +400,7 @@ void InPaintingTool::slotLoadSettings() } } else - KMessageBox::error(kapp->activeWindow(), i18n("Cannot load settings from the Photograph Inpainting text file.")); + KMessageBox::error(tdeApp->activeWindow(), i18n("Cannot load settings from the Photograph Inpainting text file.")); file.close(); m_inpaintingTypeCB->blockSignals(true); @@ -412,7 +412,7 @@ void InPaintingTool::slotLoadSettings() void InPaintingTool::slotSaveAsSettings() { KURL saveRestorationFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), - TQString( "*" ), kapp->activeWindow(), + TQString( "*" ), tdeApp->activeWindow(), TQString( i18n("Photograph Inpainting Settings File to Save")) ); if( saveRestorationFile.isEmpty() ) return; @@ -422,7 +422,7 @@ void InPaintingTool::slotSaveAsSettings() if ( file.open(IO_WriteOnly) ) m_settingsWidget->saveSettings(file, TQString("# Photograph Inpainting Configuration File V2")); else - KMessageBox::error(kapp->activeWindow(), i18n("Cannot save settings to the Photograph Inpainting text file.")); + KMessageBox::error(tdeApp->activeWindow(), i18n("Cannot save settings to the Photograph Inpainting text file.")); file.close(); } diff --git a/src/imageplugins/inserttext/imageeffect_inserttext.cpp b/src/imageplugins/inserttext/imageeffect_inserttext.cpp index 3f88644b..6e353e68 100644 --- a/src/imageplugins/inserttext/imageeffect_inserttext.cpp +++ b/src/imageplugins/inserttext/imageeffect_inserttext.cpp @@ -225,7 +225,7 @@ ImageEffect_InsertText::~ImageEffect_InsertText() void ImageEffect_InsertText::readUserSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("inserttext Tool Dialog"); TQColor black(0, 0, 0); TQFont defaultFont; @@ -253,7 +253,7 @@ void ImageEffect_InsertText::readUserSettings() void ImageEffect_InsertText::writeUserSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("inserttext Tool Dialog"); config->writeEntry( "Text Rotation", m_textRotation->currentItem() ); @@ -335,13 +335,13 @@ void ImageEffect_InsertText::slotUpdatePreview() void ImageEffect_InsertText::finalRendering() { accept(); - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); Digikam::ImageIface iface(0, 0); Digikam::DImg dest = m_previewWidget->makeInsertText(); iface.putOriginalImage(i18n("Insert Text"), dest.bits(), dest.width(), dest.height()); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } } // NameSpace DigikamInsertTextImagesPlugin diff --git a/src/imageplugins/inserttext/inserttexttool.cpp b/src/imageplugins/inserttext/inserttexttool.cpp index 3c854896..231697d1 100644 --- a/src/imageplugins/inserttext/inserttexttool.cpp +++ b/src/imageplugins/inserttext/inserttexttool.cpp @@ -215,7 +215,7 @@ InsertTextTool::~InsertTextTool() void InsertTextTool::readSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("inserttext Tool"); TQColor black(0, 0, 0); TQFont defaultFont; @@ -243,7 +243,7 @@ void InsertTextTool::readSettings() void InsertTextTool::writeSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("inserttext Tool"); config->writeEntry("Text Rotation", m_textRotation->currentItem()); @@ -324,13 +324,13 @@ void InsertTextTool::slotUpdatePreview() void InsertTextTool::finalRendering() { - kapp->setOverrideCursor(KCursor::waitCursor()); + tdeApp->setOverrideCursor(KCursor::waitCursor()); ImageIface iface(0, 0); DImg dest = m_previewWidget->makeInsertText(); iface.putOriginalImage(i18n("Insert Text"), dest.bits(), dest.width(), dest.height()); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } } // NameSpace DigikamInsertTextImagesPlugin diff --git a/src/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp b/src/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp index 89420a9c..15d4ca64 100644 --- a/src/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp +++ b/src/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp @@ -197,7 +197,7 @@ ImageEffect_LensDistortion::~ImageEffect_LensDistortion() void ImageEffect_LensDistortion::readUserSettings(void) { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("lensdistortion Tool Dialog"); m_mainInput->blockSignals(true); @@ -220,7 +220,7 @@ void ImageEffect_LensDistortion::readUserSettings(void) void ImageEffect_LensDistortion::writeUserSettings(void) { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("lensdistortion Tool Dialog"); config->writeEntry("2nd Order Distortion", m_mainInput->value()); config->writeEntry("4th Order Distortion", m_edgeInput->value()); diff --git a/src/imageplugins/lensdistortion/lensdistortiontool.cpp b/src/imageplugins/lensdistortion/lensdistortiontool.cpp index 8d33e1df..9561ae61 100644 --- a/src/imageplugins/lensdistortion/lensdistortiontool.cpp +++ b/src/imageplugins/lensdistortion/lensdistortiontool.cpp @@ -205,7 +205,7 @@ void LensDistortionTool::slotColorGuideChanged() void LensDistortionTool::readSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("lensdistortion Tool"); m_mainInput->blockSignals(true); @@ -231,7 +231,7 @@ void LensDistortionTool::readSettings() void LensDistortionTool::writeSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("lensdistortion Tool"); config->writeEntry("2nd Order Distortion", m_mainInput->value()); config->writeEntry("4th Order Distortion", m_edgeInput->value()); diff --git a/src/imageplugins/noisereduction/imageeffect_noisereduction.cpp b/src/imageplugins/noisereduction/imageeffect_noisereduction.cpp index 707b05db..128c6679 100644 --- a/src/imageplugins/noisereduction/imageeffect_noisereduction.cpp +++ b/src/imageplugins/noisereduction/imageeffect_noisereduction.cpp @@ -316,7 +316,7 @@ void ImageEffect_NoiseReduction::renderingFinished() void ImageEffect_NoiseReduction::readUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("noisereduction Tool Dialog"); m_radiusInput->setEnabled(true); m_lumToleranceInput->setEnabled(true); @@ -354,7 +354,7 @@ void ImageEffect_NoiseReduction::readUserSettings() void ImageEffect_NoiseReduction::writeUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("noisereduction Tool Dialog"); config->writeEntry("RadiusAjustment", m_radiusInput->value()); config->writeEntry("LumToleranceAjustment", m_lumToleranceInput->value()); diff --git a/src/imageplugins/noisereduction/noisereductiontool.cpp b/src/imageplugins/noisereduction/noisereductiontool.cpp index d1e4908a..b990e515 100644 --- a/src/imageplugins/noisereduction/noisereductiontool.cpp +++ b/src/imageplugins/noisereduction/noisereductiontool.cpp @@ -301,7 +301,7 @@ void NoiseReductionTool::renderingFinished() void NoiseReductionTool::readSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("noisereduction Tool"); m_radiusInput->setEnabled(false); @@ -340,7 +340,7 @@ void NoiseReductionTool::readSettings() void NoiseReductionTool::writeSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("noisereduction Tool"); config->writeEntry("RadiusAjustment", m_radiusInput->value()); config->writeEntry("LumToleranceAjustment", m_lumToleranceInput->value()); @@ -463,7 +463,7 @@ void NoiseReductionTool::putFinalData() void NoiseReductionTool::slotLoadSettings() { KURL loadRestorationFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), - TQString( "*" ), kapp->activeWindow(), + TQString( "*" ), tdeApp->activeWindow(), TQString( i18n("Photograph Noise Reduction Settings File to Load")) ); if ( loadRestorationFile.isEmpty() ) return; @@ -475,7 +475,7 @@ void NoiseReductionTool::slotLoadSettings() TQTextStream stream( &file ); if ( stream.readLine() != "# Photograph Noise Reduction Configuration File" ) { - KMessageBox::error(kapp->activeWindow(), + KMessageBox::error(tdeApp->activeWindow(), i18n("\"%1\" is not a Photograph Noise Reduction settings text file.") .arg(loadRestorationFile.fileName())); file.close(); @@ -496,7 +496,7 @@ void NoiseReductionTool::slotLoadSettings() blockSignals(false); } else - KMessageBox::error(kapp->activeWindow(), i18n("Cannot load settings from the Photograph Noise Reduction text file.")); + KMessageBox::error(tdeApp->activeWindow(), i18n("Cannot load settings from the Photograph Noise Reduction text file.")); file.close(); } @@ -504,7 +504,7 @@ void NoiseReductionTool::slotLoadSettings() void NoiseReductionTool::slotSaveAsSettings() { KURL saveRestorationFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), - TQString( "*" ), kapp->activeWindow(), + TQString( "*" ), tdeApp->activeWindow(), TQString( i18n("Photograph Noise Reduction Settings File to Save")) ); if ( saveRestorationFile.isEmpty() ) return; @@ -528,7 +528,7 @@ void NoiseReductionTool::slotSaveAsSettings() } else - KMessageBox::error(kapp->activeWindow(), i18n("Cannot save settings to the Photograph Noise Reduction text file.")); + KMessageBox::error(tdeApp->activeWindow(), i18n("Cannot save settings to the Photograph Noise Reduction text file.")); file.close(); } diff --git a/src/imageplugins/oilpaint/imageeffect_oilpaint.cpp b/src/imageplugins/oilpaint/imageeffect_oilpaint.cpp index da07be05..46d3bf0c 100644 --- a/src/imageplugins/oilpaint/imageeffect_oilpaint.cpp +++ b/src/imageplugins/oilpaint/imageeffect_oilpaint.cpp @@ -130,7 +130,7 @@ void ImageEffect_OilPaint::renderingFinished() void ImageEffect_OilPaint::readUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("oilpaint Tool Dialog"); m_brushSizeInput->blockSignals(true); m_smoothInput->blockSignals(true); @@ -142,7 +142,7 @@ void ImageEffect_OilPaint::readUserSettings() void ImageEffect_OilPaint::writeUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("oilpaint Tool Dialog"); config->writeEntry("BrushSize", m_brushSizeInput->value()); config->writeEntry("SmoothAjustment", m_smoothInput->value()); diff --git a/src/imageplugins/oilpaint/oilpainttool.cpp b/src/imageplugins/oilpaint/oilpainttool.cpp index 25bea302..c1e73698 100644 --- a/src/imageplugins/oilpaint/oilpainttool.cpp +++ b/src/imageplugins/oilpaint/oilpainttool.cpp @@ -134,7 +134,7 @@ void OilPaintTool::renderingFinished() void OilPaintTool::readSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("oilpaint Tool"); m_brushSizeInput->blockSignals(true); m_smoothInput->blockSignals(true); @@ -148,7 +148,7 @@ void OilPaintTool::readSettings() void OilPaintTool::writeSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("oilpaint Tool"); config->writeEntry("BrushSize", m_brushSizeInput->value()); config->writeEntry("SmoothAjustment", m_smoothInput->value()); diff --git a/src/imageplugins/perspective/imageeffect_perspective.cpp b/src/imageplugins/perspective/imageeffect_perspective.cpp index 15bef877..ac20bfa1 100644 --- a/src/imageplugins/perspective/imageeffect_perspective.cpp +++ b/src/imageplugins/perspective/imageeffect_perspective.cpp @@ -199,7 +199,7 @@ ImageEffect_Perspective::~ImageEffect_Perspective() void ImageEffect_Perspective::readUserSettings(void) { TQColor defaultGuideColor(TQt::red); - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("perspective Tool Dialog"); m_drawWhileMovingCheckBox->setChecked(config->readBoolEntry("Draw While Moving", true)); m_drawGridCheckBox->setChecked(config->readBoolEntry("Draw Grid", false)); @@ -213,7 +213,7 @@ void ImageEffect_Perspective::readUserSettings(void) void ImageEffect_Perspective::writeUserSettings(void) { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("perspective Tool Dialog"); config->writeEntry("Draw While Moving", m_drawWhileMovingCheckBox->isChecked()); config->writeEntry("Draw Grid", m_drawGridCheckBox->isChecked()); @@ -229,10 +229,10 @@ void ImageEffect_Perspective::resetValues() void ImageEffect_Perspective::finalRendering() { - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); m_previewWidget->applyPerspectiveAdjustment(); accept(); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } void ImageEffect_Perspective::slotUpdateInfo(TQRect newSize, float topLeftAngle, float topRightAngle, diff --git a/src/imageplugins/perspective/perspectivetool.cpp b/src/imageplugins/perspective/perspectivetool.cpp index 30d0a2cf..96209942 100644 --- a/src/imageplugins/perspective/perspectivetool.cpp +++ b/src/imageplugins/perspective/perspectivetool.cpp @@ -193,7 +193,7 @@ PerspectiveTool::~PerspectiveTool() void PerspectiveTool::readSettings() { TQColor defaultGuideColor(TQt::red); - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("perspective Tool"); m_drawWhileMovingCheckBox->setChecked(config->readBoolEntry("Draw While Moving", true)); m_drawGridCheckBox->setChecked(config->readBoolEntry("Draw Grid", false)); @@ -207,7 +207,7 @@ void PerspectiveTool::readSettings() void PerspectiveTool::writeSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("perspective Tool"); config->writeEntry("Draw While Moving", m_drawWhileMovingCheckBox->isChecked()); config->writeEntry("Draw Grid", m_drawGridCheckBox->isChecked()); @@ -223,9 +223,9 @@ void PerspectiveTool::slotResetSettings() void PerspectiveTool::finalRendering() { - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); m_previewWidget->applyPerspectiveAdjustment(); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } void PerspectiveTool::slotUpdateInfo(TQRect newSize, float topLeftAngle, float topRightAngle, diff --git a/src/imageplugins/raindrop/imageeffect_raindrop.cpp b/src/imageplugins/raindrop/imageeffect_raindrop.cpp index 8a82829d..a95b49dc 100644 --- a/src/imageplugins/raindrop/imageeffect_raindrop.cpp +++ b/src/imageplugins/raindrop/imageeffect_raindrop.cpp @@ -153,7 +153,7 @@ void ImageEffect_RainDrop::renderingFinished() void ImageEffect_RainDrop::readUserSettings(void) { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("raindrops Tool Dialog"); m_dropInput->blockSignals(true); @@ -173,7 +173,7 @@ void ImageEffect_RainDrop::readUserSettings(void) void ImageEffect_RainDrop::writeUserSettings(void) { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("raindrops Tool Dialog"); config->writeEntry("DropAdjustment", m_dropInput->value()); config->writeEntry("AmountAdjustment", m_amountInput->value()); diff --git a/src/imageplugins/raindrop/raindroptool.cpp b/src/imageplugins/raindrop/raindroptool.cpp index 3d19238d..35f55cb7 100644 --- a/src/imageplugins/raindrop/raindroptool.cpp +++ b/src/imageplugins/raindrop/raindroptool.cpp @@ -146,7 +146,7 @@ void RainDropTool::renderingFinished() void RainDropTool::readSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("raindrops Tool"); m_dropInput->blockSignals(true); @@ -166,7 +166,7 @@ void RainDropTool::readSettings() void RainDropTool::writeSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("raindrops Tool"); config->writeEntry("DropAdjustment", m_dropInput->value()); config->writeEntry("AmountAdjustment", m_amountInput->value()); diff --git a/src/imageplugins/restoration/imageeffect_restoration.cpp b/src/imageplugins/restoration/imageeffect_restoration.cpp index 825ef23d..8173155d 100644 --- a/src/imageplugins/restoration/imageeffect_restoration.cpp +++ b/src/imageplugins/restoration/imageeffect_restoration.cpp @@ -149,7 +149,7 @@ void ImageEffect_Restoration::renderingFinished() void ImageEffect_Restoration::readUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("restoration Tool Dialog"); Digikam::GreycstorationSettings settings; @@ -180,7 +180,7 @@ void ImageEffect_Restoration::readUserSettings() void ImageEffect_Restoration::writeUserSettings() { Digikam::GreycstorationSettings settings = m_settingsWidget->getSettings(); - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("restoration Tool Dialog"); config->writeEntry("Preset", m_restorationTypeCB->currentItem()); config->writeEntry("FastApprox", settings.fastApprox); @@ -246,7 +246,7 @@ void ImageEffect_Restoration::resetValues() void ImageEffect_Restoration::processCImgURL(const TQString& url) { - TDEApplication::kApplication()->invokeBrowser(url); + tdeApp->invokeBrowser(url); } void ImageEffect_Restoration::prepareEffect() diff --git a/src/imageplugins/restoration/restorationtool.cpp b/src/imageplugins/restoration/restorationtool.cpp index a6896135..9a0111b0 100644 --- a/src/imageplugins/restoration/restorationtool.cpp +++ b/src/imageplugins/restoration/restorationtool.cpp @@ -159,7 +159,7 @@ void RestorationTool::renderingFinished() void RestorationTool::readSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("restoration Tool"); GreycstorationSettings settings; @@ -192,7 +192,7 @@ void RestorationTool::readSettings() void RestorationTool::writeSettings() { GreycstorationSettings settings = m_settingsWidget->getSettings(); - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("restoration Tool"); config->writeEntry("Preset", m_restorationTypeCB->currentItem()); config->writeEntry("FastApprox", settings.fastApprox); @@ -259,7 +259,7 @@ void RestorationTool::slotResetSettings() void RestorationTool::processCImgURL(const TQString& url) { - TDEApplication::kApplication()->invokeBrowser(url); + tdeApp->invokeBrowser(url); } void RestorationTool::prepareEffect() @@ -304,7 +304,7 @@ void RestorationTool::putFinalData() void RestorationTool::slotLoadSettings() { KURL loadRestorationFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), - TQString( "*" ), kapp->activeWindow(), + TQString( "*" ), tdeApp->activeWindow(), TQString( i18n("Photograph Restoration Settings File to Load")) ); if( loadRestorationFile.isEmpty() ) return; @@ -315,7 +315,7 @@ void RestorationTool::slotLoadSettings() { if (!m_settingsWidget->loadSettings(file, TQString("# Photograph Restoration Configuration File V2"))) { - KMessageBox::error(kapp->activeWindow(), + KMessageBox::error(tdeApp->activeWindow(), i18n("\"%1\" is not a Photograph Restoration settings text file.") .arg(loadRestorationFile.fileName())); file.close(); @@ -325,7 +325,7 @@ void RestorationTool::slotLoadSettings() slotEffect(); } else - KMessageBox::error(kapp->activeWindow(), i18n("Cannot load settings from the Photograph Restoration text file.")); + KMessageBox::error(tdeApp->activeWindow(), i18n("Cannot load settings from the Photograph Restoration text file.")); file.close(); m_restorationTypeCB->blockSignals(true); @@ -337,7 +337,7 @@ void RestorationTool::slotLoadSettings() void RestorationTool::slotSaveAsSettings() { KURL saveRestorationFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), - TQString( "*" ), kapp->activeWindow(), + TQString( "*" ), tdeApp->activeWindow(), TQString( i18n("Photograph Restoration Settings File to Save")) ); if( saveRestorationFile.isEmpty() ) return; @@ -347,7 +347,7 @@ void RestorationTool::slotSaveAsSettings() if ( file.open(IO_WriteOnly) ) m_settingsWidget->saveSettings(file, TQString("# Photograph Restoration Configuration File V2")); else - KMessageBox::error(kapp->activeWindow(), i18n("Cannot save settings to the Photograph Restoration text file.")); + KMessageBox::error(tdeApp->activeWindow(), i18n("Cannot save settings to the Photograph Restoration text file.")); file.close(); } diff --git a/src/imageplugins/sheartool/imageeffect_sheartool.cpp b/src/imageplugins/sheartool/imageeffect_sheartool.cpp index e65bd91b..1d59d9f7 100644 --- a/src/imageplugins/sheartool/imageeffect_sheartool.cpp +++ b/src/imageplugins/sheartool/imageeffect_sheartool.cpp @@ -181,7 +181,7 @@ ImageEffect_ShearTool::~ImageEffect_ShearTool() void ImageEffect_ShearTool::readUserSettings(void) { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("sheartool Tool Dialog"); m_mainHAngleInput->setValue(config->readNumEntry("Main HAngle", 0)); m_mainVAngleInput->setValue(config->readNumEntry("Main VAngle", 0)); @@ -193,7 +193,7 @@ void ImageEffect_ShearTool::readUserSettings(void) void ImageEffect_ShearTool::writeUserSettings(void) { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("sheartool Tool Dialog"); config->writeEntry("Main HAngle", m_mainHAngleInput->value()); config->writeEntry("Main VAngle", m_mainVAngleInput->value()); @@ -224,7 +224,7 @@ void ImageEffect_ShearTool::resetValues() void ImageEffect_ShearTool::prepareEffect() { - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); m_mainHAngleInput->setEnabled(false); m_mainVAngleInput->setEnabled(false); m_fineHAngleInput->setEnabled(false); @@ -315,7 +315,7 @@ void ImageEffect_ShearTool::renderingFinished() m_fineHAngleInput->setEnabled(true); m_fineVAngleInput->setEnabled(true); m_antialiasInput->setEnabled(true); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } } // NameSpace DigikamShearToolImagesPlugin diff --git a/src/imageplugins/sheartool/sheartool.cpp b/src/imageplugins/sheartool/sheartool.cpp index 9f65b6d3..01d72a88 100644 --- a/src/imageplugins/sheartool/sheartool.cpp +++ b/src/imageplugins/sheartool/sheartool.cpp @@ -186,7 +186,7 @@ void ShearTool::slotColorGuideChanged() void ShearTool::readSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("sheartool Tool"); m_mainHAngleInput->setValue(config->readNumEntry("Main HAngle", m_mainHAngleInput->defaultValue())); m_mainVAngleInput->setValue(config->readNumEntry("Main VAngle", m_mainVAngleInput->defaultValue())); @@ -202,7 +202,7 @@ void ShearTool::readSettings() void ShearTool::writeSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("sheartool Tool"); config->writeEntry("Main HAngle", m_mainHAngleInput->value()); config->writeEntry("Main VAngle", m_mainVAngleInput->value()); @@ -238,7 +238,7 @@ void ShearTool::slotResetSettings() void ShearTool::prepareEffect() { - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); m_mainHAngleInput->setEnabled(false); m_mainVAngleInput->setEnabled(false); m_fineHAngleInput->setEnabled(false); @@ -325,7 +325,7 @@ void ShearTool::renderingFinished() m_fineHAngleInput->setEnabled(true); m_fineVAngleInput->setEnabled(true); m_antialiasInput->setEnabled(true); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } } // NameSpace DigikamShearToolImagesPlugin diff --git a/src/imageplugins/superimpose/imageeffect_superimpose.cpp b/src/imageplugins/superimpose/imageeffect_superimpose.cpp index 1cea3e08..e2dce011 100644 --- a/src/imageplugins/superimpose/imageeffect_superimpose.cpp +++ b/src/imageplugins/superimpose/imageeffect_superimpose.cpp @@ -211,7 +211,7 @@ void ImageEffect_SuperImpose::populateTemplates(void) void ImageEffect_SuperImpose::readUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("Album Settings"); KURL albumDBUrl( config->readPathEntry("Album Path", TDEGlobalSettings::documentPath()) ); config->setGroup("superimpose Tool Dialog"); @@ -223,7 +223,7 @@ void ImageEffect_SuperImpose::readUserSettings() void ImageEffect_SuperImpose::writeUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("superimpose Tool Dialog"); config->writeEntry( "Templates Root URL", m_dirSelect->rootPath().path() ); config->writeEntry( "Templates URL", m_templatesUrl.path() ); @@ -236,7 +236,7 @@ void ImageEffect_SuperImpose::resetValues() void ImageEffect_SuperImpose::slotRootTemplateDirChanged(void) { - KURL url = KFileDialog::getExistingDirectory(m_templatesRootUrl.path(), kapp->activeWindow(), + KURL url = KFileDialog::getExistingDirectory(m_templatesRootUrl.path(), tdeApp->activeWindow(), i18n("Select Template Root Directory to Use")); if( url.isValid() ) diff --git a/src/imageplugins/superimpose/superimposetool.cpp b/src/imageplugins/superimpose/superimposetool.cpp index f035559c..934bf065 100644 --- a/src/imageplugins/superimpose/superimposetool.cpp +++ b/src/imageplugins/superimpose/superimposetool.cpp @@ -203,7 +203,7 @@ void SuperImposeTool::populateTemplates() void SuperImposeTool::readSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("Album Settings"); KURL albumDBUrl( config->readPathEntry("Album Path", TDEGlobalSettings::documentPath()) ); config->setGroup("superimpose Tool"); @@ -215,7 +215,7 @@ void SuperImposeTool::readSettings() void SuperImposeTool::writeSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("superimpose Tool"); config->writeEntry( "Templates Root URL", m_dirSelect->rootPath().path() ); config->writeEntry( "Templates URL", m_templatesUrl.path() ); @@ -229,7 +229,7 @@ void SuperImposeTool::slotResetSettings() void SuperImposeTool::slotRootTemplateDirChanged() { - KURL url = KFileDialog::getExistingDirectory(m_templatesRootUrl.path(), kapp->activeWindow(), + KURL url = KFileDialog::getExistingDirectory(m_templatesRootUrl.path(), tdeApp->activeWindow(), i18n("Select Template Root Directory to Use")); if( url.isValid() ) @@ -252,7 +252,7 @@ void SuperImposeTool::slotTemplateDirChanged(const KURL& url) void SuperImposeTool::finalRendering() { - kapp->setOverrideCursor(KCursor::waitCursor()); + tdeApp->setOverrideCursor(KCursor::waitCursor()); m_previewWidget->setEnabled(false); m_dirSelect->setEnabled(false); m_thumbnailsBar->setEnabled(false); @@ -265,7 +265,7 @@ void SuperImposeTool::finalRendering() m_previewWidget->setEnabled(true); m_dirSelect->setEnabled(true); m_thumbnailsBar->setEnabled(true); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } } // NameSpace DigikamSuperImposeImagesPlugin diff --git a/src/imageplugins/texture/imageeffect_texture.cpp b/src/imageplugins/texture/imageeffect_texture.cpp index 5f5d7e9f..a045f68d 100644 --- a/src/imageplugins/texture/imageeffect_texture.cpp +++ b/src/imageplugins/texture/imageeffect_texture.cpp @@ -143,7 +143,7 @@ void ImageEffect_Texture::renderingFinished() void ImageEffect_Texture::readUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("texture Tool Dialog"); m_textureType->blockSignals(true); m_blendGain->blockSignals(true); @@ -155,7 +155,7 @@ void ImageEffect_Texture::readUserSettings() void ImageEffect_Texture::writeUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("texture Tool Dialog"); config->writeEntry("TextureType", m_textureType->currentItem()); config->writeEntry("BlendGain", m_blendGain->value()); diff --git a/src/imageplugins/texture/texturetool.cpp b/src/imageplugins/texture/texturetool.cpp index 71e29aea..d2050930 100644 --- a/src/imageplugins/texture/texturetool.cpp +++ b/src/imageplugins/texture/texturetool.cpp @@ -144,7 +144,7 @@ void TextureTool::renderingFinished() void TextureTool::readSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("texture Tool"); m_textureType->blockSignals(true); @@ -159,7 +159,7 @@ void TextureTool::readSettings() void TextureTool::writeSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("texture Tool"); config->writeEntry("TextureType", m_textureType->currentItem()); config->writeEntry("BlendGain", m_blendGain->value()); diff --git a/src/imageplugins/whitebalance/imageeffect_whitebalance.cpp b/src/imageplugins/whitebalance/imageeffect_whitebalance.cpp index f72609dd..7c065db3 100644 --- a/src/imageplugins/whitebalance/imageeffect_whitebalance.cpp +++ b/src/imageplugins/whitebalance/imageeffect_whitebalance.cpp @@ -281,7 +281,7 @@ ImageEffect_WhiteBalance::ImageEffect_WhiteBalance(TQWidget* parent) " (E.V): </qt>"), gboxSettings); m_mainExposureLabel = new TQLabel(i18n("Main:"), gboxSettings); m_autoAdjustExposure = new TQPushButton(gboxSettings); - m_autoAdjustExposure->setPixmap(kapp->iconLoader()->loadIcon("system-run", (TDEIcon::Group)TDEIcon::Toolbar)); + m_autoAdjustExposure->setPixmap(tdeApp->iconLoader()->loadIcon("system-run", (TDEIcon::Group)TDEIcon::Toolbar)); TQToolTip::add( m_autoAdjustExposure, i18n( "Auto exposure adjustments" ) ); TQWhatsThis::add( m_autoAdjustExposure, i18n("<p>With this button, you can automatically adjust Exposure " "and Black Point values.")); @@ -660,7 +660,7 @@ void ImageEffect_WhiteBalance::slotEffect() void ImageEffect_WhiteBalance::finalRendering() { - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); Digikam::ImageIface* iface = m_previewWidget->imageIface(); uchar *data = iface->getOriginalImage(); int w = iface->originalWidth(); @@ -684,7 +684,7 @@ void ImageEffect_WhiteBalance::finalRendering() iface->putOriginalImage(i18n("White Balance"), data); delete [] data; - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); accept(); } @@ -729,7 +729,7 @@ void ImageEffect_WhiteBalance::resetValues() void ImageEffect_WhiteBalance::readUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("whitebalance Tool Dialog"); m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0)); // Luminosity. m_scaleBG->setButton(config->readNumEntry("Histogram Scale", Digikam::HistogramWidget::LogScaleHistogram)); @@ -749,7 +749,7 @@ void ImageEffect_WhiteBalance::readUserSettings() void ImageEffect_WhiteBalance::writeUserSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("whitebalance Tool Dialog"); config->writeEntry("Histogram Channel", m_channelCB->currentItem()); config->writeEntry("Histogram Scale", m_scaleBG->selectedId()); diff --git a/src/imageplugins/whitebalance/whitebalancetool.cpp b/src/imageplugins/whitebalance/whitebalancetool.cpp index fdbe723a..5f432721 100644 --- a/src/imageplugins/whitebalance/whitebalancetool.cpp +++ b/src/imageplugins/whitebalance/whitebalancetool.cpp @@ -285,7 +285,7 @@ WhiteBalanceTool::WhiteBalanceTool(TQObject* parent) " (E.V): </qt>"), m_gboxSettings->plainPage()); m_mainExposureLabel = new TQLabel(i18n("Main:"), m_gboxSettings->plainPage()); m_autoAdjustExposure = new TQPushButton(m_gboxSettings->plainPage()); - m_autoAdjustExposure->setPixmap(kapp->iconLoader()->loadIcon("system-run", (TDEIcon::Group)TDEIcon::Toolbar)); + m_autoAdjustExposure->setPixmap(tdeApp->iconLoader()->loadIcon("system-run", (TDEIcon::Group)TDEIcon::Toolbar)); TQToolTip::add( m_autoAdjustExposure, i18n( "Auto exposure adjustments" ) ); TQWhatsThis::add( m_autoAdjustExposure, i18n("<p>With this button, you can automatically adjust Exposure " "and Black Point values.")); @@ -601,7 +601,7 @@ void WhiteBalanceTool::slotChannelChanged(int channel) void WhiteBalanceTool::slotAutoAdjustExposure() { - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); ImageIface* iface = m_previewWidget->imageIface(); uchar *data = iface->getOriginalImage(); @@ -619,7 +619,7 @@ void WhiteBalanceTool::slotAutoAdjustExposure() m_mainExposureInput->setValue(exposureLevel); m_fineExposureInput->setValue(0.0); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); slotEffect(); } @@ -665,7 +665,7 @@ void WhiteBalanceTool::slotEffect() void WhiteBalanceTool::finalRendering() { - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); ImageIface* iface = m_previewWidget->imageIface(); uchar *data = iface->getOriginalImage(); int w = iface->originalWidth(); @@ -689,7 +689,7 @@ void WhiteBalanceTool::finalRendering() iface->putOriginalImage(i18n("White Balance"), data); delete [] data; - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } void WhiteBalanceTool::slotResetSettings() @@ -737,7 +737,7 @@ void WhiteBalanceTool::slotResetSettings() void WhiteBalanceTool::readSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("whitebalance Tool"); m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0)); // Luminosity. m_scaleBG->setButton(config->readNumEntry("Histogram Scale", HistogramWidget::LogScaleHistogram)); @@ -759,7 +759,7 @@ void WhiteBalanceTool::readSettings() void WhiteBalanceTool::writeSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("whitebalance Tool"); config->writeEntry("Histogram Channel", m_channelCB->currentItem()); config->writeEntry("Histogram Scale", m_scaleBG->selectedId()); @@ -779,7 +779,7 @@ void WhiteBalanceTool::writeSettings() void WhiteBalanceTool::slotLoadSettings() { KURL loadWhiteBalanceFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), - TQString( "*" ), kapp->activeWindow(), + TQString( "*" ), tdeApp->activeWindow(), TQString( i18n("White Color Balance Settings File to Load")) ); if( loadWhiteBalanceFile.isEmpty() ) return; @@ -792,7 +792,7 @@ void WhiteBalanceTool::slotLoadSettings() if ( stream.readLine() != "# White Color Balance Configuration File V2" ) { - KMessageBox::error(kapp->activeWindow(), + KMessageBox::error(tdeApp->activeWindow(), i18n("\"%1\" is not a White Color Balance settings text file.") .arg(loadWhiteBalanceFile.fileName())); file.close(); @@ -813,7 +813,7 @@ void WhiteBalanceTool::slotLoadSettings() slotEffect(); } else - KMessageBox::error(kapp->activeWindow(), i18n("Cannot load settings from the White Color Balance text file.")); + KMessageBox::error(tdeApp->activeWindow(), i18n("Cannot load settings from the White Color Balance text file.")); file.close(); } @@ -821,7 +821,7 @@ void WhiteBalanceTool::slotLoadSettings() void WhiteBalanceTool::slotSaveAsSettings() { KURL saveWhiteBalanceFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), - TQString( "*" ), kapp->activeWindow(), + TQString( "*" ), tdeApp->activeWindow(), TQString( i18n("White Color Balance Settings File to Save")) ); if( saveWhiteBalanceFile.isEmpty() ) return; @@ -842,7 +842,7 @@ void WhiteBalanceTool::slotSaveAsSettings() stream << m_greenInput->value() << "\n"; } else - KMessageBox::error(kapp->activeWindow(), i18n("Cannot save settings to the White Color Balance text file.")); + KMessageBox::error(tdeApp->activeWindow(), i18n("Cannot save settings to the White Color Balance text file.")); file.close(); } diff --git a/src/libs/dialogs/ctrlpaneldlg.cpp b/src/libs/dialogs/ctrlpaneldlg.cpp index 450d380f..9d218a99 100644 --- a/src/libs/dialogs/ctrlpaneldlg.cpp +++ b/src/libs/dialogs/ctrlpaneldlg.cpp @@ -101,7 +101,7 @@ CtrlPanelDlg::CtrlPanelDlg(TQWidget* parent, TQString title, TQString name, i18n("&Save As..."), i18n("&Load...")) { - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); setCaption(DImgInterface::defaultInterface()->getImageFileName() + TQString(" - ") + title); d = new CtrlPanelDlgPriv; @@ -143,7 +143,7 @@ CtrlPanelDlg::CtrlPanelDlg(TQWidget* parent, TQString title, TQString name, // ------------------------------------------------------------- TQTimer::singleShot(0, this, TQ_SLOT(slotInit())); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } CtrlPanelDlg::~CtrlPanelDlg() @@ -228,7 +228,7 @@ void CtrlPanelDlg::slotCancel() if (m_threadedFilter) m_threadedFilter->stopComputation(); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } saveDialogSize(d->name + TQString(" Tool Dialog")); @@ -242,7 +242,7 @@ void CtrlPanelDlg::closeEvent(TQCloseEvent *e) if (m_threadedFilter) m_threadedFilter->stopComputation(); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } saveDialogSize(d->name + TQString(" Tool Dialog")); @@ -271,7 +271,7 @@ void CtrlPanelDlg::slotHelp() // else digiKam help. In this case, setHelp() method must be used to set anchor and handbook name. if (d->aboutData) - TDEApplication::kApplication()->invokeHelp(d->name, "digikam"); + tdeApp->invokeHelp(d->name, "digikam"); else KDialogBase::slotHelp(); } @@ -334,7 +334,7 @@ void CtrlPanelDlg::slotOk() enableButton(User3, false); enableButton(Try, false); enableButton(Default, false); - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); m_imagePreviewWidget->setProgress(0); if (m_threadedFilter) @@ -376,7 +376,7 @@ void CtrlPanelDlg::customEvent(TQCustomEvent *event) { DDebug() << "Final" << d->name << " completed..." << endl; putFinalData(); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); accept(); break; } diff --git a/src/libs/dialogs/dprogressdlg.cpp b/src/libs/dialogs/dprogressdlg.cpp index d4b0dc29..935b9f65 100644 --- a/src/libs/dialogs/dprogressdlg.cpp +++ b/src/libs/dialogs/dprogressdlg.cpp @@ -94,7 +94,7 @@ DProgressDlg::DProgressDlg(TQWidget *parent, const TQString &caption) vlay->addWidget(d->title); vlay->addStretch(); - TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader(); + TDEIconLoader* iconLoader = tdeApp->iconLoader(); d->logo->setPixmap(iconLoader->loadIcon("digikam", TDEIcon::NoGroup, 128, TDEIcon::DefaultState, 0, true)); d->actionsList->addColumn("Thumb"); // no i18n here: hiden column diff --git a/src/libs/dialogs/imagedialog.cpp b/src/libs/dialogs/imagedialog.cpp index d052a2af..f56a6d91 100644 --- a/src/libs/dialogs/imagedialog.cpp +++ b/src/libs/dialogs/imagedialog.cpp @@ -229,7 +229,7 @@ void ImageDialogPreview::slotGotThumbnail(const KURL& url, const TQPixmap& pix) void ImageDialogPreview::slotFailedThumbnail(const KURL& /*url*/) { - TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader(); + TDEIconLoader* iconLoader = tdeApp->iconLoader(); d->imageLabel->setPixmap(iconLoader->loadIcon("image-x-generic", TDEIcon::NoGroup, 128, TDEIcon::DefaultState, 0, true)); } diff --git a/src/libs/dialogs/imagedlgbase.cpp b/src/libs/dialogs/imagedlgbase.cpp index 61666406..3bdb8725 100644 --- a/src/libs/dialogs/imagedlgbase.cpp +++ b/src/libs/dialogs/imagedlgbase.cpp @@ -103,7 +103,7 @@ ImageDlgBase::ImageDlgBase(TQWidget* parent, TQString title, TQString name, i18n("&Save As..."), i18n("&Load...")) { - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); setCaption(DImgInterface::defaultInterface()->getImageFileName() + TQString(" - ") + title); showButton(User1, false); @@ -143,7 +143,7 @@ ImageDlgBase::ImageDlgBase(TQWidget* parent, TQString title, TQString name, d->mainLayout->setColStretch(0, 10); d->mainLayout->setRowStretch(2, 10); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } ImageDlgBase::~ImageDlgBase() @@ -160,7 +160,7 @@ ImageDlgBase::~ImageDlgBase() void ImageDlgBase::readSettings(void) { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup(d->name + TQString(" Tool Dialog")); if(config->hasKey("SplitterSizes")) d->splitter->setSizes(config->readIntListEntry("SplitterSizes")); @@ -170,7 +170,7 @@ void ImageDlgBase::readSettings(void) void ImageDlgBase::writeSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup(d->name + TQString(" Tool Dialog")); config->writeEntry("SplitterSizes", d->splitter->sizes()); config->sync(); @@ -208,7 +208,7 @@ void ImageDlgBase::slotHelp() // else digiKam help. In this case, setHelp() method must be used to set anchor and handbook name. if (d->aboutData) - TDEApplication::kApplication()->invokeHelp(d->name, "digikam"); + tdeApp->invokeHelp(d->name, "digikam"); else KDialogBase::slotHelp(); } diff --git a/src/libs/dialogs/imageguidedlg.cpp b/src/libs/dialogs/imageguidedlg.cpp index 9713a872..01937d8f 100644 --- a/src/libs/dialogs/imageguidedlg.cpp +++ b/src/libs/dialogs/imageguidedlg.cpp @@ -136,7 +136,7 @@ ImageGuideDlg::ImageGuideDlg(TQWidget* parent, TQString title, TQString name, i18n("&Save As..."), i18n("&Load...")) { - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); setCaption(DImgInterface::defaultInterface()->getImageFileName() + TQString(" - ") + title); d = new ImageGuideDlgPriv; @@ -253,7 +253,7 @@ ImageGuideDlg::ImageGuideDlg(TQWidget* parent, TQString title, TQString name, d->settingsSideBar->loadViewState(); // Reading splitter sizes here prevent flicker effect in dialog. - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup(d->name + TQString(" Tool Dialog")); if(config->hasKey("SplitterSizes")) d->splitter->setSizes(config->readIntListEntry("SplitterSizes")); @@ -261,7 +261,7 @@ ImageGuideDlg::ImageGuideDlg(TQWidget* parent, TQString title, TQString name, // ------------------------------------------------------------- TQTimer::singleShot(0, this, TQ_SLOT(slotInit())); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } ImageGuideDlg::~ImageGuideDlg() @@ -282,7 +282,7 @@ ImageGuideDlg::~ImageGuideDlg() void ImageGuideDlg::readSettings(void) { TQColor defaultGuideColor(TQt::red); - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup(d->name + TQString(" Tool Dialog")); d->guideColorBt->setColor(config->readColorEntry("Guide Color", &defaultGuideColor)); d->guideSize->setValue(config->readNumEntry("Guide Width", 1)); @@ -292,7 +292,7 @@ void ImageGuideDlg::readSettings(void) void ImageGuideDlg::writeSettings(void) { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup(d->name + TQString(" Tool Dialog")); config->writeEntry( "Guide Color", d->guideColorBt->color() ); config->writeEntry( "Guide Width", d->guideSize->value() ); @@ -401,7 +401,7 @@ void ImageGuideDlg::slotCancel() if (m_threadedFilter) m_threadedFilter->stopComputation(); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } writeSettings(); @@ -415,7 +415,7 @@ void ImageGuideDlg::closeEvent(TQCloseEvent *e) if (m_threadedFilter) m_threadedFilter->stopComputation(); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } writeSettings(); @@ -428,7 +428,7 @@ void ImageGuideDlg::slotHelp() // else digiKam help. In this case, setHelp() method must be used to set anchor and handbook name. if (d->aboutData) - TDEApplication::kApplication()->invokeHelp(d->name, "digikam"); + tdeApp->invokeHelp(d->name, "digikam"); else KDialogBase::slotHelp(); } @@ -487,7 +487,7 @@ void ImageGuideDlg::slotOk() enableButton(User3, false); enableButton(Default, false); enableButton(Try, false); - kapp->setOverrideCursor( KCursor::waitCursor() ); + tdeApp->setOverrideCursor( KCursor::waitCursor() ); d->progressBar->setValue(0); if (m_threadedFilter) @@ -529,7 +529,7 @@ void ImageGuideDlg::customEvent(TQCustomEvent *event) { DDebug() << "Final" << d->name << " completed..." << endl; putFinalData(); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); accept(); break; } diff --git a/src/libs/dialogs/rawcameradlg.cpp b/src/libs/dialogs/rawcameradlg.cpp index 298b47d4..0323c19e 100644 --- a/src/libs/dialogs/rawcameradlg.cpp +++ b/src/libs/dialogs/rawcameradlg.cpp @@ -93,9 +93,9 @@ RawCameraDlg::RawCameraDlg(TQWidget *parent) // -------------------------------------------------------- TQLabel *logo = new TQLabel(page); - TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader(); + TDEIconLoader* iconLoader = tdeApp->iconLoader(); - if (TDEApplication::kApplication()->aboutData()->appName() == TQString("digikam")) + if (tdeApp->aboutData()->appName() == TQString("digikam")) logo->setPixmap(iconLoader->loadIcon("digikam", TDEIcon::NoGroup, 96, TDEIcon::DefaultState, 0, true)); else logo->setPixmap(iconLoader->loadIcon("showfoto", TDEIcon::NoGroup, 96, TDEIcon::DefaultState, 0, true)); diff --git a/src/libs/dimg/filters/icctransform.cpp b/src/libs/dimg/filters/icctransform.cpp index 0a1324db..0aa2b666 100644 --- a/src/libs/dimg/filters/icctransform.cpp +++ b/src/libs/dimg/filters/icctransform.cpp @@ -141,14 +141,14 @@ TQString IccTransform::getProfileDescription(const TQString& profile) int IccTransform::getRenderingIntent() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("Color Management"); return config->readNumEntry("RenderingIntent", 0); } bool IccTransform::getUseBPC() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("Color Management"); return config->readBoolEntry("BPCAlgorithm", false); } diff --git a/src/libs/imageproperties/imagedescedittab.cpp b/src/libs/imageproperties/imagedescedittab.cpp index f79b1d7c..3a70563b 100644 --- a/src/libs/imageproperties/imagedescedittab.cpp +++ b/src/libs/imageproperties/imagedescedittab.cpp @@ -186,7 +186,7 @@ ImageDescEditTab::ImageDescEditTab(TQWidget *parent, bool navBar) d->assignedTagsBtn = new TQToolButton(tagsSearch); TQToolTip::add(d->assignedTagsBtn, i18n("Tags already assigned")); - d->assignedTagsBtn->setIconSet(kapp->iconLoader()->loadIcon("tag-assigned", + d->assignedTagsBtn->setIconSet(tdeApp->iconLoader()->loadIcon("tag-assigned", TDEIcon::NoGroup, TDEIcon::SizeSmall, TDEIcon::DefaultState, 0, true)); d->assignedTagsBtn->setToggleButton(true); @@ -194,7 +194,7 @@ ImageDescEditTab::ImageDescEditTab(TQWidget *parent, bool navBar) d->recentTagsBtn = new TQToolButton(tagsSearch); TQPopupMenu *popupMenu = new TQPopupMenu(d->recentTagsBtn); TQToolTip::add(d->recentTagsBtn, i18n("Recent Tags")); - d->recentTagsBtn->setIconSet(kapp->iconLoader()->loadIcon("tag-recents", + d->recentTagsBtn->setIconSet(tdeApp->iconLoader()->loadIcon("tag-recents", TDEIcon::NoGroup, TDEIcon::SizeSmall, TDEIcon::DefaultState, 0, true)); d->recentTagsBtn->setUsesBigPixmap(false); @@ -343,7 +343,7 @@ ImageDescEditTab::ImageDescEditTab(TQWidget *parent, bool navBar) // -- read config --------------------------------------------------------- - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("Tag List View"); d->toggleAutoTags = (TagFilterView::ToggleAutoTags)(config->readNumEntry("Toggle Auto Tags", TagFilterView::NoToggleAuto)); @@ -361,7 +361,7 @@ ImageDescEditTab::~ImageDescEditTab() } */ - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("Tag List View"); config->writeEntry("Toggle Auto Tags", (int)(d->toggleAutoTags)); config->sync(); @@ -474,7 +474,7 @@ void ImageDescEditTab::slotApplyAllChanges() i18n("Applying changes to images. Please wait...")); MetadataWriteSettings writeSettings = MetadataHub::defaultWriteSettings(); - // debugging - use this to indicate reentry from event loop (kapp->processEvents) + // debugging - use this to indicate reentry from event loop (tdeApp->processEvents) // remove before final release if (d->ignoreImageAttributesWatch) { @@ -495,7 +495,7 @@ void ImageDescEditTab::slotApplyAllChanges() emit signalProgressValue((int)((i++/(float)d->currInfos.count())*100.0)); if (progressInfo) - kapp->processEvents(); + tdeApp->processEvents(); } AlbumLister::instance()->blockSignals(false); AlbumManager::instance()->albumDB()->commitTransaction(); @@ -588,7 +588,7 @@ void ImageDescEditTab::slotReadFromFileMetadataToDatabase() fileHub.write(info); emit signalProgressValue((int)((i++/(float)d->currInfos.count())*100.0)); - kapp->processEvents(); + tdeApp->processEvents(); } AlbumManager::instance()->albumDB()->commitTransaction(); d->ignoreImageAttributesWatch = false; @@ -615,7 +615,7 @@ void ImageDescEditTab::slotWriteToFileMetadataFromDatabase() fileHub.write(info->filePath()); emit signalProgressValue((int)((i++/(float)d->currInfos.count())*100.0)); - kapp->processEvents(); + tdeApp->processEvents(); } emit signalProgressBarMode(StatusProgressBar::TextMode, TQString()); @@ -1071,13 +1071,13 @@ void ImageDescEditTab::tagNew(TAlbum* parAlbum, const TQString& _title, const TQ if (title.isNull()) { - if (!TagEditDlg::tagCreate(kapp->activeWindow(), parAlbum, title, icon)) + if (!TagEditDlg::tagCreate(tdeApp->activeWindow(), parAlbum, title, icon)) return; } TQMap<TQString, TQString> errMap; AlbumList tList = TagEditDlg::createTAlbum(parAlbum, title, icon, errMap); - TagEditDlg::showtagsListCreationError(kapp->activeWindow(), errMap); + TagEditDlg::showtagsListCreationError(tdeApp->activeWindow(), errMap); for (AlbumList::iterator it = tList.begin(); it != tList.end(); ++it) { @@ -1171,7 +1171,7 @@ void ImageDescEditTab::tagEdit(TAlbum* album) TQString title; TQString icon; - if (!TagEditDlg::tagEdit(kapp->activeWindow(), album, title, icon)) + if (!TagEditDlg::tagEdit(tdeApp->activeWindow(), album, title, icon)) return; AlbumManager *albumMan = AlbumManager::instance(); diff --git a/src/libs/imageproperties/imagepropertiescolorstab.cpp b/src/libs/imageproperties/imagepropertiescolorstab.cpp index af85953b..01fd06d2 100644 --- a/src/libs/imageproperties/imagepropertiescolorstab.cpp +++ b/src/libs/imageproperties/imagepropertiescolorstab.cpp @@ -381,7 +381,7 @@ ImagePropertiesColorsTab::ImagePropertiesColorsTab(TQWidget* parent, bool navBar // -- read config --------------------------------------------------------- - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("Image Properties SideBar"); d->tab->setCurrentPage(config->readNumEntry("ImagePropertiesColors Tab", ImagePropertiesColorsTabPriv::HISTOGRAM)); @@ -400,7 +400,7 @@ ImagePropertiesColorsTab::~ImagePropertiesColorsTab() // stop it before the d->image data are deleted automatically! d->histogramWidget->stopHistogramComputation(); - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("Image Properties SideBar"); config->writeEntry("ImagePropertiesColors Tab", d->tab->currentPageIndex()); config->writeEntry("Histogram Channel", d->channelCB->currentItem()); diff --git a/src/libs/imageproperties/imagepropertiesmetadatatab.cpp b/src/libs/imageproperties/imagepropertiesmetadatatab.cpp index 5a48aaec..cb843265 100644 --- a/src/libs/imageproperties/imagepropertiesmetadatatab.cpp +++ b/src/libs/imageproperties/imagepropertiesmetadatatab.cpp @@ -117,7 +117,7 @@ ImagePropertiesMetaDataTab::ImagePropertiesMetaDataTab(TQWidget* parent, bool na // -- read config --------------------------------------------------------- - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("Image Properties SideBar"); d->tab->setCurrentPage(config->readNumEntry("ImagePropertiesMetaData Tab", ImagePropertiesMetadataTabPriv::EXIF)); @@ -134,7 +134,7 @@ ImagePropertiesMetaDataTab::ImagePropertiesMetaDataTab(TQWidget* parent, bool na ImagePropertiesMetaDataTab::~ImagePropertiesMetaDataTab() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("Image Properties SideBar"); config->writeEntry("ImagePropertiesMetaData Tab", d->tab->currentPageIndex()); config->writeEntry("EXIF Level", d->exifWidget->getMode()); diff --git a/src/libs/imageproperties/talbumlistview.cpp b/src/libs/imageproperties/talbumlistview.cpp index 1369d228..098f85ab 100644 --- a/src/libs/imageproperties/talbumlistview.cpp +++ b/src/libs/imageproperties/talbumlistview.cpp @@ -408,7 +408,7 @@ void TAlbumListView::contentsDropEvent(TQDropEvent *e) hub.write(info.filePath(), MetadataHub::FullWriteIfChanged); emit signalProgressValue((int)((i++/(float)imageIDs.count())*100.0)); - kapp->processEvents(); + tdeApp->processEvents(); } AlbumLister::instance()->blockSignals(false); AlbumManager::instance()->albumDB()->commitTransaction(); @@ -458,7 +458,7 @@ void TAlbumListView::slotRefresh(const TQMap<int, int>& tagsStatMap) void TAlbumListView::loadViewState() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup(name()); int selectedItem = config->readNumEntry("LastSelectedItem", 0); @@ -505,7 +505,7 @@ void TAlbumListView::loadViewState() void TAlbumListView::saveViewState() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup(name()); TAlbumCheckListItem *item = dynamic_cast<TAlbumCheckListItem*>(selectedItem()); diff --git a/src/libs/themeengine/themeengine.cpp b/src/libs/themeengine/themeengine.cpp index 331ffa5d..7445cec1 100644 --- a/src/libs/themeengine/themeengine.cpp +++ b/src/libs/themeengine/themeengine.cpp @@ -283,7 +283,7 @@ void ThemeEngine::changePalette() plt = d->defaultPalette; else { - plt = kapp->palette(); + plt = tdeApp->palette(); int h, s, v; const TQColor fg(ThemeEngine::instance()->textRegColor()); const TQColor bg(ThemeEngine::instance()->baseColor()); @@ -325,7 +325,7 @@ void ThemeEngine::changePalette() plt.setDisabled(cg); } - kapp->setPalette(plt, true); + tdeApp->setPalette(plt, true); } Theme* ThemeEngine::getCurrentTheme() const @@ -342,7 +342,7 @@ void ThemeEngine::buildDefaultTheme() { Theme* t = d->defaultTheme; - d->defaultPalette = kapp->palette(); + d->defaultPalette = tdeApp->palette(); TQColorGroup cg = d->defaultPalette.active(); t->baseColor = cg.base(); diff --git a/src/libs/thumbbar/thumbbar.cpp b/src/libs/thumbbar/thumbbar.cpp index f5b32767..3bac9b3b 100644 --- a/src/libs/thumbbar/thumbbar.cpp +++ b/src/libs/thumbbar/thumbbar.cpp @@ -801,7 +801,7 @@ void ThumbBarView::slotFailedThumbnail(const KURL& url) if (!item) return; - TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader(); + TDEIconLoader* iconLoader = tdeApp->iconLoader(); TQPixmap pix = iconLoader->loadIcon("image-x-generic", TDEIcon::NoGroup, ThumbnailSize::Huge); if (item->d->pixmap) diff --git a/src/libs/widgets/common/dlogoaction.cpp b/src/libs/widgets/common/dlogoaction.cpp index 73bf4b7d..47ef084f 100644 --- a/src/libs/widgets/common/dlogoaction.cpp +++ b/src/libs/widgets/common/dlogoaction.cpp @@ -53,7 +53,7 @@ DLogoAction::DLogoAction(TQObject* parent, const char* name) int DLogoAction::plug(TQWidget *widget, int index) { - if (kapp && !kapp->authorizeTDEAction(name())) + if (tdeApp && !tdeApp->authorizeTDEAction(name())) return -1; if ( widget->inherits( "TDEToolBar" ) ) @@ -91,7 +91,7 @@ int DLogoAction::plug(TQWidget *widget, int index) void DLogoAction::slotProcessURL(const TQString& url) { - TDEApplication::kApplication()->invokeBrowser(url); + tdeApp->invokeBrowser(url); } } // namespace Digikam diff --git a/src/libs/widgets/common/dpopupmenu.cpp b/src/libs/widgets/common/dpopupmenu.cpp index f41404ce..befee139 100644 --- a/src/libs/widgets/common/dpopupmenu.cpp +++ b/src/libs/widgets/common/dpopupmenu.cpp @@ -68,7 +68,7 @@ void DPopupMenu::generateSidePixmap() { s_dpopupmenu_sidePixmapColor = newColor; - if (TDEApplication::kApplication()->aboutData()->appName() == TQString("digikam")) + if (tdeApp->aboutData()->appName() == TQString("digikam")) s_dpopupmenu_sidePixmap.load( locate( "data","digikam/data/menusidepixmap.png" ) ); else s_dpopupmenu_sidePixmap.load( locate( "data","showfoto/menusidepixmap.png" ) ); diff --git a/src/libs/widgets/common/filesaveoptionsbox.cpp b/src/libs/widgets/common/filesaveoptionsbox.cpp index 26985fb5..b00fd184 100644 --- a/src/libs/widgets/common/filesaveoptionsbox.cpp +++ b/src/libs/widgets/common/filesaveoptionsbox.cpp @@ -156,7 +156,7 @@ void FileSaveOptionsBox::toggleFormatOptions(const TQString& format) void FileSaveOptionsBox::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()); @@ -169,7 +169,7 @@ void FileSaveOptionsBox::applySettings() void FileSaveOptionsBox::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/libs/widgets/common/searchtextbar.cpp b/src/libs/widgets/common/searchtextbar.cpp index 1a81c03b..f66a3667 100644 --- a/src/libs/widgets/common/searchtextbar.cpp +++ b/src/libs/widgets/common/searchtextbar.cpp @@ -164,7 +164,7 @@ SearchTextBar::SearchTextBar(TQWidget *parent, const char* name, const TQString d->clearButton = new TQToolButton(this); d->clearButton->setEnabled(false); d->clearButton->setAutoRaise(true); - d->clearButton->setIconSet(kapp->iconLoader()->loadIcon("clear_left", + d->clearButton->setIconSet(tdeApp->iconLoader()->loadIcon("clear_left", TDEIcon::Toolbar, TDEIcon::SizeSmall)); d->searchEdit = new DLineEdit(msg, this); @@ -185,7 +185,7 @@ SearchTextBar::SearchTextBar(TQWidget *parent, const char* name, const TQString connect(d->searchEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotTextChanged(const TQString&))); - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup(name + TQString(" Search Text Tool")); d->searchEdit->setCompletionMode((TDEGlobalSettings::Completion)config->readNumEntry("AutoCompletionMode", (int)TDEGlobalSettings::CompletionAuto)); @@ -193,7 +193,7 @@ SearchTextBar::SearchTextBar(TQWidget *parent, const char* name, const TQString SearchTextBar::~SearchTextBar() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup(name() + TQString(" Search Text Tool")); config->writeEntry("AutoCompletionMode", (int)d->searchEdit->completionMode()); config->sync(); diff --git a/src/libs/widgets/common/sidebar.cpp b/src/libs/widgets/common/sidebar.cpp index a1bcd752..2b00d670 100644 --- a/src/libs/widgets/common/sidebar.cpp +++ b/src/libs/widgets/common/sidebar.cpp @@ -140,7 +140,7 @@ TQSplitter* Sidebar::splitter() const void Sidebar::loadViewState() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup(TQString("%1").arg(name())); int tab = config->readNumEntry("ActiveTab", 0); @@ -167,7 +167,7 @@ void Sidebar::loadViewState() void Sidebar::saveViewState() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup(TQString("%1").arg(name())); config->writeEntry("ActiveTab", d->activeTab); config->writeEntry("Minimized", d->minimized); diff --git a/src/libs/widgets/imageplugins/imagepanelwidget.cpp b/src/libs/widgets/imageplugins/imagepanelwidget.cpp index 4551e09e..6e62dae1 100644 --- a/src/libs/widgets/imageplugins/imagepanelwidget.cpp +++ b/src/libs/widgets/imageplugins/imagepanelwidget.cpp @@ -212,7 +212,7 @@ ImageRegionWidget *ImagePanelWidget::previewWidget() const void ImagePanelWidget::readSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup(d->settingsSection); int mode = config->readNumEntry("Separate View", ImageRegionWidget::SeparateViewDuplicateVert); mode = TQMAX(ImageRegionWidget::SeparateViewHorizontal, mode); @@ -231,7 +231,7 @@ void ImagePanelWidget::readSettings() void ImagePanelWidget::writeSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup(d->settingsSection); config->writeEntry( "Separate View", d->separateView->selectedId() ); config->sync(); diff --git a/src/libs/widgets/imageplugins/imagepannelwidget.cpp b/src/libs/widgets/imageplugins/imagepannelwidget.cpp index cebf0f3c..336d59ef 100644 --- a/src/libs/widgets/imageplugins/imagepannelwidget.cpp +++ b/src/libs/widgets/imageplugins/imagepannelwidget.cpp @@ -291,7 +291,7 @@ ImagePannelWidget::~ImagePannelWidget() void ImagePannelWidget::readSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup(d->settingsSection); int mode = config->readNumEntry("Separate View", ImageRegionWidget::SeparateViewDuplicateVert); mode = TQMAX(ImageRegionWidget::SeparateViewHorizontal, mode); @@ -310,7 +310,7 @@ void ImagePannelWidget::readSettings() void ImagePannelWidget::writeSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup(d->settingsSection); config->writeEntry( "Separate View", d->separateView->selectedId() ); config->sync(); diff --git a/src/libs/widgets/imageplugins/imagewidget.cpp b/src/libs/widgets/imageplugins/imagewidget.cpp index ab73bbf7..949b19aa 100644 --- a/src/libs/widgets/imageplugins/imagewidget.cpp +++ b/src/libs/widgets/imageplugins/imagewidget.cpp @@ -322,7 +322,7 @@ void ImageWidget::slotUpdateSpotInfo(const Digikam::DColor &col, const TQPoint & void ImageWidget::readSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup(d->settingsSection); d->underExposureButton->setOn(config->readBoolEntry("Under Exposure Indicator", false)); @@ -336,7 +336,7 @@ void ImageWidget::readSettings() void ImageWidget::writeSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup(d->settingsSection); config->writeEntry("Separate View", getRenderingPreviewMode()); config->writeEntry("Under Exposure Indicator", d->underExposureButton->isOn()); diff --git a/src/libs/widgets/metadata/gpswidget.cpp b/src/libs/widgets/metadata/gpswidget.cpp index 033423e9..3957e2f1 100644 --- a/src/libs/widgets/metadata/gpswidget.cpp +++ b/src/libs/widgets/metadata/gpswidget.cpp @@ -212,7 +212,7 @@ void GPSWidget::slotGPSDetails() } } - TDEApplication::kApplication()->invokeBrowser(url); + tdeApp->invokeBrowser(url); } TQString GPSWidget::getMetadataTitle() diff --git a/src/libs/widgets/metadata/metadatawidget.cpp b/src/libs/widgets/metadata/metadatawidget.cpp index d0bd5b19..adcc8904 100644 --- a/src/libs/widgets/metadata/metadatawidget.cpp +++ b/src/libs/widgets/metadata/metadatawidget.cpp @@ -100,7 +100,7 @@ MetadataWidget::MetadataWidget(TQWidget* parent, const char* name) d = new MetadataWidgetPriv; d->mainLayout = new TQGridLayout(this, 3, 4, KDialog::spacingHint(), KDialog::spacingHint()); - TDEIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader(); + TDEIconLoader *iconLoader = tdeApp->iconLoader(); d->levelButtons = new TQHButtonGroup(this); d->levelButtons->setInsideMargin( 0 ); diff --git a/src/showfoto/setup/setup.cpp b/src/showfoto/setup/setup.cpp index 85ec82d2..978967f7 100644 --- a/src/showfoto/setup/setup.cpp +++ b/src/showfoto/setup/setup.cpp @@ -122,7 +122,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", EditorPage)); } @@ -132,7 +132,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/showfoto/setup/setupeditor.cpp b/src/showfoto/setup/setupeditor.cpp index 19bab8fb..9e2c17cf 100644 --- a/src/showfoto/setup/setupeditor.cpp +++ b/src/showfoto/setup/setupeditor.cpp @@ -202,7 +202,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"); @@ -224,7 +224,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/showfoto/setup/setuptooltip.cpp b/src/showfoto/setup/setuptooltip.cpp index d3a08678..3e5cc047 100644 --- a/src/showfoto/setup/setuptooltip.cpp +++ b/src/showfoto/setup/setuptooltip.cpp @@ -177,7 +177,7 @@ SetupToolTip::~SetupToolTip() void SetupToolTip::readSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("ImageViewer Settings"); d->showToolTipsBox->setChecked(config->readBoolEntry("Show ToolTips", true)); @@ -202,7 +202,7 @@ void SetupToolTip::readSettings() void SetupToolTip::applySettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("ImageViewer Settings"); config->writeEntry("Show ToolTips", d->showToolTipsBox->isChecked()); diff --git a/src/showfoto/showfoto.cpp b/src/showfoto/showfoto.cpp index 42575833..605524a6 100644 --- a/src/showfoto/showfoto.cpp +++ b/src/showfoto/showfoto.cpp @@ -162,12 +162,12 @@ ShowFoto::ShowFoto(const KURL::List& urlList) // -- Show splash at start ---------------------------- - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("ImageViewer Settings"); TDEGlobal::dirs()->addResourceType("data", TDEGlobal::dirs()->kde_default("data") + "digikam"); TDEGlobal::iconLoader()->addAppDir("digikam"); - if(config->readBoolEntry("ShowSplash", true) && !kapp->isRestored()) + if(config->readBoolEntry("ShowSplash", true) && !tdeApp->isRestored()) { d->splash = new Digikam::SplashScreen("showfoto-splash.png"); d->splash->show(); @@ -356,7 +356,7 @@ void ShowFoto::show() // Report errors from ICC repository path. - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); if(!d->validIccPath) { TQString message = i18n("<qt><p>The ICC profile path seems to be invalid.</p>" @@ -407,7 +407,7 @@ void ShowFoto::setupConnections() void ShowFoto::setupUserArea() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("ImageViewer Settings"); TQWidget* widget = new TQWidget(this); @@ -509,7 +509,7 @@ void ShowFoto::readSettings() { readStandardSettings(); - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("ImageViewer Settings"); d->showBarAction->setChecked(config->readBoolEntry("Show Thumbnails", true)); @@ -531,7 +531,7 @@ void ShowFoto::saveSettings() { saveStandardSettings(); - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("ImageViewer Settings"); config->writeEntry("Last Opened Directory", d->lastOpenedDirectory.path() ); @@ -549,7 +549,7 @@ void ShowFoto::applySettings() { applyStandardSettings(); - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("ImageViewer Settings"); // Current image deleted go to trash ? @@ -754,7 +754,7 @@ bool ShowFoto::setup(bool iccSetupPage) if (setup.exec() != TQDialog::Accepted) return false; - kapp->config()->sync(); + tdeApp->config()->sync(); applySettings(); @@ -873,7 +873,7 @@ void ShowFoto::openFolder(const KURL& url) // Determine sort ordering for the entries from configuration setting: - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("ImageViewer Settings"); int flag; @@ -1190,7 +1190,7 @@ void ShowFoto::slideShow(bool startWithCurrent, Digikam::SlideShowSettings& sett { if (!d->thumbBar->countItems()) return; - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("ImageViewer Settings"); settings.exifRotate = config->readBoolEntry("EXIF Rotate", true); @@ -1214,7 +1214,7 @@ void ShowFoto::slideShow(bool startWithCurrent, Digikam::SlideShowSettings& sett settings.pictInfoMap.insert(*it, pictInfo); m_nameLabel->setProgressValue((int)((i++/cnt)*100.0)); - kapp->processEvents(); + tdeApp->processEvents(); } m_nameLabel->progressBarMode(Digikam::StatusProgressBar::TextMode, TQString()); diff --git a/src/themedesigner/mainwindow.cpp b/src/themedesigner/mainwindow.cpp index f51a4f64..ae4ef0d7 100644 --- a/src/themedesigner/mainwindow.cpp +++ b/src/themedesigner/mainwindow.cpp @@ -231,7 +231,7 @@ MainWindow::MainWindow() m_folderView->setResizeMode(TQListView::LastColumn); m_folderView->setRootIsDecorated(true); - TDEIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader(); + TDEIconLoader *iconLoader = tdeApp->iconLoader(); for (int i=0; i<10; i++) { FolderItem* folderItem = new FolderItem(m_folderView, TQString("Album %1").arg(i)); diff --git a/src/themedesigner/themediconitem.cpp b/src/themedesigner/themediconitem.cpp index 2ed7df80..9e90beda 100644 --- a/src/themedesigner/themediconitem.cpp +++ b/src/themedesigner/themediconitem.cpp @@ -135,7 +135,7 @@ void ThemedIconItem::paintItem() { r = view->itemPixmapRect(); - TDEIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader(); + TDEIconLoader *iconLoader = tdeApp->iconLoader(); TQPixmap thumbnail = iconLoader->loadIcon("colors", TDEIcon::NoGroup, 100, TDEIcon::DefaultState, 0, true); 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(); } |