diff options
Diffstat (limited to 'src/libs')
23 files changed, 68 insertions, 68 deletions
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 ); |