diff options
42 files changed, 148 insertions, 148 deletions
@@ -21041,7 +21041,7 @@ v0.9.2-beta1 - 2007-05-04 2007-03-07 19:45 mwiesweg * trunk/extragear/graphics/digikam/digikam/albumiconview.cpp: - Disable KIconEffect for Preview again: It is a blocking + Disable TDEIconEffect for Preview again: It is a blocking operation, and takes much too long, preview loading is faster! @@ -21056,7 +21056,7 @@ v0.9.2-beta1 - 2007-05-04 but under certain conditions (saved as and then deleted immediately) it did not work. - - In AlbumIconView, move the KIconEffect::visualActivate to the + - In AlbumIconView, move the TDEIconEffect::visualActivate to the click action. This is more homogenous: It is now associated with a click on an icon, @@ -57221,7 +57221,7 @@ v0.7.1-beta1 17/12/04 2004-11-29 04:08 pahlibar * utilities/cameragui/cameraui.cpp: - use KIconLoader::loadIconSet instead of loadicon to show visually + use TDEIconLoader::loadIconSet instead of loadicon to show visually better disabled icons 2004-11-29 03:50 pahlibar diff --git a/digikam/digikam/albumiconview.cpp b/digikam/digikam/albumiconview.cpp index a765837..61e2ab2 100644 --- a/digikam/digikam/albumiconview.cpp +++ b/digikam/digikam/albumiconview.cpp @@ -501,12 +501,12 @@ void AlbumIconView::slotDoubleClicked(IconItem *item) if (d->albumSettings->getItemRightClickAction() == AlbumSettings::ShowPreview) { // icon effect takes too much time - //KIconEffect::visualActivate(viewport(), contentsRectToViewport(item->rect())); + //TDEIconEffect::visualActivate(viewport(), contentsRectToViewport(item->rect())); signalPreviewItem(static_cast<AlbumIconItem *>(item)); } else { - KIconEffect::visualActivate(viewport(), contentsRectToViewport(item->rect())); + TDEIconEffect::visualActivate(viewport(), contentsRectToViewport(item->rect())); slotDisplayItem(static_cast<AlbumIconItem *>(item)); } } @@ -560,7 +560,7 @@ void AlbumIconView::slotRightButtonClicked(IconItem *item, const TQPoint& pos) for( iter = offers.begin(); iter != offers.end(); ++iter ) { ptr = *iter; - openWithMenu.insertItem( ptr->pixmap(KIcon::Small), ptr->name(), index++); + openWithMenu.insertItem( ptr->pixmap(TDEIcon::Small), ptr->name(), index++); serviceVector.push_back(ptr); } diff --git a/digikam/digikam/albummanager.h b/digikam/digikam/albummanager.h index 2bb6f56..3e79033 100644 --- a/digikam/digikam/albummanager.h +++ b/digikam/digikam/albummanager.h @@ -345,12 +345,12 @@ public: * Update the icon for a TAlbum. * @return true if the operation succeeds, false otherwise * @param album the album for which icon should be changed - * @param iconKDE a simple filename which can be loaded by KIconLoader + * @param iconKDE a simple filename which can be loaded by TDEIconLoader * @param iconID id of the icon image file * @param errMsg this will contain the error message describing why the * operation failed * \note if iconKDE is not empty then iconID is used. So if you want to set - * the icon to a file which can be loaded by KIconLoader, pass it in as + * the icon to a file which can be loaded by TDEIconLoader, pass it in as * iconKDE. otherwise pass a null TQString to iconKDE and set iconID */ bool updateTAlbumIcon(TAlbum* album, const TQString& iconKDE, diff --git a/digikam/digikam/albumthumbnailloader.cpp b/digikam/digikam/albumthumbnailloader.cpp index fa4f366..a658f35 100644 --- a/digikam/digikam/albumthumbnailloader.cpp +++ b/digikam/digikam/albumthumbnailloader.cpp @@ -190,9 +190,9 @@ TQRect AlbumThumbnailLoader::computeBlendRect(int iconSize) TQPixmap AlbumThumbnailLoader::loadIcon(const TQString &name, int size) { - KIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader(); - return iconLoader->loadIcon(name, KIcon::NoGroup, - size, KIcon::DefaultState, + TDEIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader(); + return iconLoader->loadIcon(name, TDEIcon::NoGroup, + size, TDEIcon::DefaultState, 0, true); } diff --git a/digikam/digikam/digikamfirstrun.cpp b/digikam/digikam/digikamfirstrun.cpp index 3affe60..aac0fb0 100644 --- a/digikam/digikam/digikamfirstrun.cpp +++ b/digikam/digikam/digikamfirstrun.cpp @@ -89,9 +89,9 @@ DigikamFirstRun::DigikamFirstRun(TDEConfig* config, TQWidget* parent, "include the slash in the translation","/Pictures")); m_ui->m_path->setMode(KFile::Directory | KFile::LocalOnly); - KIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader(); - m_ui->m_pixLabel->setPixmap(iconLoader->loadIcon("digikam", KIcon::NoGroup, - 128, KIcon::DefaultState, 0, true)); + TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader(); + m_ui->m_pixLabel->setPixmap(iconLoader->loadIcon("digikam", TDEIcon::NoGroup, + 128, TDEIcon::DefaultState, 0, true)); m_ui->setMinimumSize(450, m_ui->sizeHint().height()); } diff --git a/digikam/digikam/imagepreviewview.cpp b/digikam/digikam/imagepreviewview.cpp index 66d410b..21a3ef8 100644 --- a/digikam/digikam/imagepreviewview.cpp +++ b/digikam/digikam/imagepreviewview.cpp @@ -353,7 +353,7 @@ void ImagePreviewView::slotContextMenu() for( iter = offers.begin(); iter != offers.end(); ++iter ) { ptr = *iter; - openWithMenu.insertItem( ptr->pixmap(KIcon::Small), ptr->name(), index++); + openWithMenu.insertItem( ptr->pixmap(TDEIcon::Small), ptr->name(), index++); serviceVector.push_back(ptr); } diff --git a/digikam/digikam/pixmapmanager.cpp b/digikam/digikam/pixmapmanager.cpp index 06dab23..b63ab7d 100644 --- a/digikam/digikam/pixmapmanager.cpp +++ b/digikam/digikam/pixmapmanager.cpp @@ -197,20 +197,20 @@ void PixmapManager::slotFailedThumbnail(const KURL& url) if (settings->getImageFileFilter().upper().contains(ext.upper()) || settings->getRawFileFilter().upper().contains(ext.upper())) { - img = DesktopIcon("image", KIcon::SizeEnormous).convertToImage(); + img = DesktopIcon("image", TDEIcon::SizeEnormous).convertToImage(); } else if (settings->getMovieFileFilter().upper().contains(ext.upper())) { - img = DesktopIcon("video", KIcon::SizeEnormous).convertToImage(); + img = DesktopIcon("video", TDEIcon::SizeEnormous).convertToImage(); } else if (settings->getAudioFileFilter().upper().contains(ext.upper())) { - img = DesktopIcon("sound", KIcon::SizeEnormous).convertToImage(); + img = DesktopIcon("sound", TDEIcon::SizeEnormous).convertToImage(); } } if (img.isNull()) - img = DesktopIcon("file_broken", KIcon::SizeEnormous).convertToImage(); + img = DesktopIcon("file_broken", TDEIcon::SizeEnormous).convertToImage(); // Resize icon to the right size depending of current settings. diff --git a/digikam/digikam/scanlib.cpp b/digikam/digikam/scanlib.cpp index e409f8d..a0bc177 100644 --- a/digikam/digikam/scanlib.cpp +++ b/digikam/digikam/scanlib.cpp @@ -94,7 +94,7 @@ void ScanLib::startScan() { struct timeval tv1, tv2; TQPixmap pix = TDEApplication::kApplication()->iconLoader()->loadIcon( - "run", KIcon::NoGroup, 32); + "run", TDEIcon::NoGroup, 32); TQString message = i18n("Finding non-existent Albums"); if (m_splash) m_splash->message(message); @@ -205,7 +205,7 @@ void ScanLib::findMissingItems() TQDir dir(albumPath); TQStringList fileList(dir.entryList(TQDir::Dirs)); TQPixmap pix = TDEApplication::kApplication()->iconLoader()->loadIcon( - "folder_image", KIcon::NoGroup, 32); + "folder_image", TDEIcon::NoGroup, 32); AlbumDB* db = AlbumManager::instance()->albumDB(); db->beginTransaction(); diff --git a/digikam/digikam/syncjob.cpp b/digikam/digikam/syncjob.cpp index 48cd77b..c0c78f7 100644 --- a/digikam/digikam/syncjob.cpp +++ b/digikam/digikam/syncjob.cpp @@ -243,9 +243,9 @@ TQPixmap SyncJob::getTagThumbnailPriv(const TQString &name, int size) } else { - KIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader(); - *thumbnail_ = iconLoader->loadIcon(name, KIcon::NoGroup, thumbnailSize_, - KIcon::DefaultState, 0, true); + TDEIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader(); + *thumbnail_ = iconLoader->loadIcon(name, TDEIcon::NoGroup, thumbnailSize_, + TDEIcon::DefaultState, 0, true); } return *thumbnail_; } diff --git a/digikam/digikam/tageditdlg.cpp b/digikam/digikam/tageditdlg.cpp index 2ae0f71..92a3aa2 100644 --- a/digikam/digikam/tageditdlg.cpp +++ b/digikam/digikam/tageditdlg.cpp @@ -104,8 +104,8 @@ TagEditDlg::TagEditDlg(TQWidget *parent, TAlbum* album, bool create) // -------------------------------------------------------- TQLabel *logo = new TQLabel(page); - KIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader(); - logo->setPixmap(iconLoader->loadIcon("digikam", KIcon::NoGroup, 96, KIcon::DefaultState, 0, true)); + TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader(); + logo->setPixmap(iconLoader->loadIcon("digikam", TDEIcon::NoGroup, 96, TDEIcon::DefaultState, 0, true)); d->topLabel = new TQLabel(page); d->topLabel->setAlignment(TQt::AlignAuto | TQt::AlignVCenter | TQt::SingleLine); @@ -219,11 +219,11 @@ void TagEditDlg::slotIconResetClicked() void TagEditDlg::slotIconChanged() { #if KDE_IS_VERSION(3,3,0) - KIconDialog dlg(this); - dlg.setup(KIcon::NoGroup, KIcon::Application, false, 20, false, false, false); + TDEIconDialog dlg(this); + dlg.setup(TDEIcon::NoGroup, TDEIcon::Application, false, 20, false, false, false); TQString icon = dlg.openDialog(); #else - TQString icon = KIconDialog::getIcon(KIcon::NoGroup, KIcon::Application, false, 20); + TQString icon = TDEIconDialog::getIcon(TDEIcon::NoGroup, TDEIcon::Application, false, 20); if (icon.startsWith("/")) return; #endif diff --git a/digikam/digikam/tagspopupmenu.cpp b/digikam/digikam/tagspopupmenu.cpp index 91e6260..225dd04 100644 --- a/digikam/digikam/tagspopupmenu.cpp +++ b/digikam/digikam/tagspopupmenu.cpp @@ -141,11 +141,11 @@ TagsPopupMenu::TagsPopupMenu(const TQValueList<TQ_LLONG>& selectedImageIDs, int d->addToID = addToID; d->mode = mode; - KIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader(); + TDEIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader(); d->addTagPix = iconLoader->loadIcon("tag", - KIcon::NoGroup, - KIcon::SizeSmall, - KIcon::DefaultState, + TDEIcon::NoGroup, + TDEIcon::SizeSmall, + TDEIcon::DefaultState, 0, true); connect(this, TQT_SIGNAL(aboutToShow()), diff --git a/digikam/imageplugins/adjustlevels/adjustlevels.cpp b/digikam/imageplugins/adjustlevels/adjustlevels.cpp index f4b9971..03112c3 100644 --- a/digikam/imageplugins/adjustlevels/adjustlevels.cpp +++ b/digikam/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("run", (KIcon::Group)KIcon::Toolbar)); TQToolTip::add( m_autoButton, i18n( "Adjust all levels automatically." ) ); + m_autoButton->setPixmap(kapp->iconLoader()->loadIcon("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", (KIcon::Group)KIcon::Toolbar)); + m_resetButton->setPixmap(kapp->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 " diff --git a/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp b/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp index ee2a09e..e9a9756 100644 --- a/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp +++ b/digikam/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("run", (KIcon::Group)KIcon::Toolbar)); TQToolTip::add( m_autoButton, i18n( "Adjust all levels automatically." ) ); + m_autoButton->setPixmap(kapp->iconLoader()->loadIcon("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", (KIcon::Group)KIcon::Toolbar)); + m_resetButton->setPixmap(kapp->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 " diff --git a/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp b/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp index d2c2af9..6932733 100644 --- a/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp +++ b/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp @@ -125,30 +125,30 @@ ImageEffect_InsertText::ImageEffect_InsertText(TQWidget* parent) // ------------------------------------------------------------- - KIconLoader icon; + TDEIconLoader icon; m_alignButtonGroup = new TQHButtonGroup(gbox2); TQPushButton *alignLeft = new TQPushButton( m_alignButtonGroup ); m_alignButtonGroup->insert(alignLeft, ALIGN_LEFT); - alignLeft->setPixmap( icon.loadIcon( "text_left", (KIcon::Group)KIcon::Small ) ); + alignLeft->setPixmap( icon.loadIcon( "text_left", (TDEIcon::Group)TDEIcon::Small ) ); alignLeft->setToggleButton(true); TQToolTip::add( alignLeft, i18n( "Align text to the left" ) ); TQPushButton *alignRight = new TQPushButton( m_alignButtonGroup ); m_alignButtonGroup->insert(alignRight, ALIGN_RIGHT); - alignRight->setPixmap( icon.loadIcon( "text_right", (KIcon::Group)KIcon::Small ) ); + alignRight->setPixmap( icon.loadIcon( "text_right", (TDEIcon::Group)TDEIcon::Small ) ); alignRight->setToggleButton(true); TQToolTip::add( alignRight, i18n( "Align text to the right" ) ); TQPushButton *alignCenter = new TQPushButton( m_alignButtonGroup ); m_alignButtonGroup->insert(alignCenter, ALIGN_CENTER); - alignCenter->setPixmap( icon.loadIcon( "text_center", (KIcon::Group)KIcon::Small ) ); + alignCenter->setPixmap( icon.loadIcon( "text_center", (TDEIcon::Group)TDEIcon::Small ) ); alignCenter->setToggleButton(true); TQToolTip::add( alignCenter, i18n( "Align text to center" ) ); TQPushButton *alignBlock = new TQPushButton( m_alignButtonGroup ); m_alignButtonGroup->insert(alignBlock, ALIGN_BLOCK); - alignBlock->setPixmap( icon.loadIcon( "text_block", (KIcon::Group)KIcon::Small ) ); + alignBlock->setPixmap( icon.loadIcon( "text_block", (TDEIcon::Group)TDEIcon::Small ) ); alignBlock->setToggleButton(true); TQToolTip::add( alignBlock, i18n( "Align text to a block" ) ); diff --git a/digikam/imageplugins/inserttext/inserttexttool.cpp b/digikam/imageplugins/inserttext/inserttexttool.cpp index 713685b..4bf9307 100644 --- a/digikam/imageplugins/inserttext/inserttexttool.cpp +++ b/digikam/imageplugins/inserttext/inserttexttool.cpp @@ -108,30 +108,30 @@ InsertTextTool::InsertTextTool(TQObject* parent) // ------------------------------------------------------------- - KIconLoader icon; + TDEIconLoader icon; m_alignButtonGroup = new TQHButtonGroup(m_gboxSettings->plainPage()); TQPushButton *alignLeft = new TQPushButton(m_alignButtonGroup); m_alignButtonGroup->insert(alignLeft, ALIGN_LEFT); - alignLeft->setPixmap(icon.loadIcon("text_left", (KIcon::Group) KIcon::Small)); + alignLeft->setPixmap(icon.loadIcon("text_left", (TDEIcon::Group) TDEIcon::Small)); alignLeft->setToggleButton(true); TQToolTip::add(alignLeft, i18n("Align text to the left")); TQPushButton *alignRight = new TQPushButton(m_alignButtonGroup); m_alignButtonGroup->insert(alignRight, ALIGN_RIGHT); - alignRight->setPixmap(icon.loadIcon("text_right", (KIcon::Group) KIcon::Small)); + alignRight->setPixmap(icon.loadIcon("text_right", (TDEIcon::Group) TDEIcon::Small)); alignRight->setToggleButton(true); TQToolTip::add(alignRight, i18n("Align text to the right")); TQPushButton *alignCenter = new TQPushButton(m_alignButtonGroup); m_alignButtonGroup->insert(alignCenter, ALIGN_CENTER); - alignCenter->setPixmap(icon.loadIcon("text_center", (KIcon::Group) KIcon::Small)); + alignCenter->setPixmap(icon.loadIcon("text_center", (TDEIcon::Group) TDEIcon::Small)); alignCenter->setToggleButton(true); TQToolTip::add(alignCenter, i18n("Align text to center")); TQPushButton *alignBlock = new TQPushButton(m_alignButtonGroup); m_alignButtonGroup->insert(alignBlock, ALIGN_BLOCK); - alignBlock->setPixmap(icon.loadIcon("text_block", (KIcon::Group) KIcon::Small)); + alignBlock->setPixmap(icon.loadIcon("text_block", (TDEIcon::Group) TDEIcon::Small)); alignBlock->setToggleButton(true); TQToolTip::add(alignBlock, i18n("Align text to a block")); diff --git a/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp b/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp index 46d020a..acae848 100644 --- a/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp +++ b/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp @@ -112,23 +112,23 @@ ImageEffect_SuperImpose::ImageEffect_SuperImpose(TQWidget* parent) // ------------------------------------------------------------- TQHButtonGroup *bGroup = new TQHButtonGroup(frame); - KIconLoader icon; + TDEIconLoader icon; bGroup->addSpace(0); TQPushButton *zoomInButton = new TQPushButton( bGroup ); bGroup->insert(zoomInButton, ZOOMIN); - zoomInButton->setPixmap( icon.loadIcon( "viewmag+", (KIcon::Group)KIcon::Toolbar ) ); + zoomInButton->setPixmap( icon.loadIcon( "viewmag+", (TDEIcon::Group)TDEIcon::Toolbar ) ); zoomInButton->setToggleButton(true); TQToolTip::add( zoomInButton, i18n( "Zoom in" ) ); bGroup->addSpace(20); TQPushButton *zoomOutButton = new TQPushButton( bGroup ); bGroup->insert(zoomOutButton, ZOOMOUT); - zoomOutButton->setPixmap( icon.loadIcon( "viewmag-", (KIcon::Group)KIcon::Toolbar ) ); + zoomOutButton->setPixmap( icon.loadIcon( "viewmag-", (TDEIcon::Group)TDEIcon::Toolbar ) ); zoomOutButton->setToggleButton(true); TQToolTip::add( zoomOutButton, i18n( "Zoom out" ) ); bGroup->addSpace(20); TQPushButton *moveButton = new TQPushButton( bGroup ); bGroup->insert(moveButton, MOVE); - moveButton->setPixmap( icon.loadIcon( "move", (KIcon::Group)KIcon::Toolbar ) ); + moveButton->setPixmap( icon.loadIcon( "move", (TDEIcon::Group)TDEIcon::Toolbar ) ); moveButton->setToggleButton(true); moveButton->setOn(true); TQToolTip::add( moveButton, i18n( "Move" ) ); diff --git a/digikam/imageplugins/superimpose/superimposetool.cpp b/digikam/imageplugins/superimpose/superimposetool.cpp index 93d3524..235f91f 100644 --- a/digikam/imageplugins/superimpose/superimposetool.cpp +++ b/digikam/imageplugins/superimpose/superimposetool.cpp @@ -94,23 +94,23 @@ SuperImposeTool::SuperImposeTool(TQObject* parent) // ------------------------------------------------------------- TQHButtonGroup *bGroup = new TQHButtonGroup(frame); - KIconLoader icon; + TDEIconLoader icon; bGroup->addSpace(0); TQPushButton *zoomInButton = new TQPushButton( bGroup ); bGroup->insert(zoomInButton, ZOOMIN); - zoomInButton->setPixmap( icon.loadIcon( "viewmag+", (KIcon::Group)KIcon::Toolbar ) ); + zoomInButton->setPixmap( icon.loadIcon( "viewmag+", (TDEIcon::Group)TDEIcon::Toolbar ) ); zoomInButton->setToggleButton(true); TQToolTip::add( zoomInButton, i18n( "Zoom in" ) ); bGroup->addSpace(20); TQPushButton *zoomOutButton = new TQPushButton( bGroup ); bGroup->insert(zoomOutButton, ZOOMOUT); - zoomOutButton->setPixmap( icon.loadIcon( "viewmag-", (KIcon::Group)KIcon::Toolbar ) ); + zoomOutButton->setPixmap( icon.loadIcon( "viewmag-", (TDEIcon::Group)TDEIcon::Toolbar ) ); zoomOutButton->setToggleButton(true); TQToolTip::add( zoomOutButton, i18n( "Zoom out" ) ); bGroup->addSpace(20); TQPushButton *moveButton = new TQPushButton( bGroup ); bGroup->insert(moveButton, MOVE); - moveButton->setPixmap( icon.loadIcon( "move", (KIcon::Group)KIcon::Toolbar ) ); + moveButton->setPixmap( icon.loadIcon( "move", (TDEIcon::Group)TDEIcon::Toolbar ) ); moveButton->setToggleButton(true); moveButton->setOn(true); TQToolTip::add( moveButton, i18n( "Move" ) ); diff --git a/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp b/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp index 3e7d7b5..a1068b2 100644 --- a/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp +++ b/digikam/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("run", (KIcon::Group)KIcon::Toolbar)); + m_autoAdjustExposure->setPixmap(kapp->iconLoader()->loadIcon("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.")); diff --git a/digikam/imageplugins/whitebalance/whitebalancetool.cpp b/digikam/imageplugins/whitebalance/whitebalancetool.cpp index bd83bdd..be2bc72 100644 --- a/digikam/imageplugins/whitebalance/whitebalancetool.cpp +++ b/digikam/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("run", (KIcon::Group)KIcon::Toolbar)); + m_autoAdjustExposure->setPixmap(kapp->iconLoader()->loadIcon("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.")); diff --git a/digikam/libs/dialogs/deletedialog.cpp b/digikam/libs/dialogs/deletedialog.cpp index 4801672..dde5e84 100644 --- a/digikam/libs/dialogs/deletedialog.cpp +++ b/digikam/libs/dialogs/deletedialog.cpp @@ -115,13 +115,13 @@ void DeleteWidget::updateText() ddDeleteText->setText(i18n("<qt>These items will be <b>permanently " "deleted</b> from your hard disk.</qt>")); ddWarningIcon->setPixmap(TDEGlobal::iconLoader()->loadIcon("messagebox_warning", - KIcon::Desktop, KIcon::SizeLarge)); + TDEIcon::Desktop, TDEIcon::SizeLarge)); } else { ddDeleteText->setText(i18n("<qt>These items will be moved to Trash.</qt>")); ddWarningIcon->setPixmap(TDEGlobal::iconLoader()->loadIcon("trashcan_full", - KIcon::Desktop, KIcon::SizeLarge)); + TDEIcon::Desktop, TDEIcon::SizeLarge)); } ddNumFiles->setText(i18n("<b>1</b> file selected.", "<b>%n</b> files selected.", ddFileList->count())); break; @@ -135,13 +135,13 @@ void DeleteWidget::updateText() ddDeleteText->setText(i18n("<qt>These albums will be <b>permanently " "deleted</b> from your hard disk.</qt>")); ddWarningIcon->setPixmap(TDEGlobal::iconLoader()->loadIcon("messagebox_warning", - KIcon::Desktop, KIcon::SizeLarge)); + TDEIcon::Desktop, TDEIcon::SizeLarge)); } else { ddDeleteText->setText(i18n("<qt>These albums will be moved to Trash.</qt>")); ddWarningIcon->setPixmap(TDEGlobal::iconLoader()->loadIcon("trashcan_full", - KIcon::Desktop, KIcon::SizeLarge)); + TDEIcon::Desktop, TDEIcon::SizeLarge)); } ddNumFiles->setText(i18n("<b>1</b> album selected.", "<b>%n</b> albums selected.", ddFileList->count())); break; @@ -158,7 +158,7 @@ void DeleteWidget::updateText() "are included in this list and will " "be deleted permanently as well.</qt>")); ddWarningIcon->setPixmap(TDEGlobal::iconLoader()->loadIcon("messagebox_warning", - KIcon::Desktop, KIcon::SizeLarge)); + TDEIcon::Desktop, TDEIcon::SizeLarge)); } else { @@ -167,7 +167,7 @@ void DeleteWidget::updateText() "are included in this list and will " "be moved to Trash as well.</qt>")); ddWarningIcon->setPixmap(TDEGlobal::iconLoader()->loadIcon("trashcan_full", - KIcon::Desktop, KIcon::SizeLarge)); + TDEIcon::Desktop, TDEIcon::SizeLarge)); } ddNumFiles->setText(i18n("<b>1</b> album selected.", "<b>%n</b> albums selected.", ddFileList->count())); break; diff --git a/digikam/libs/dialogs/dprogressdlg.cpp b/digikam/libs/dialogs/dprogressdlg.cpp index d9ad528..22251b7 100644 --- a/digikam/libs/dialogs/dprogressdlg.cpp +++ b/digikam/libs/dialogs/dprogressdlg.cpp @@ -94,8 +94,8 @@ DProgressDlg::DProgressDlg(TQWidget *parent, const TQString &caption) vlay->addWidget(d->title); vlay->addStretch(); - KIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader(); - d->logo->setPixmap(iconLoader->loadIcon("digikam", KIcon::NoGroup, 128, KIcon::DefaultState, 0, true)); + TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader(); + d->logo->setPixmap(iconLoader->loadIcon("digikam", TDEIcon::NoGroup, 128, TDEIcon::DefaultState, 0, true)); d->actionsList->addColumn("Thumb"); // no i18n here: hiden column d->actionsList->addColumn("Status"); // no i18n here: hiden column diff --git a/digikam/libs/dialogs/imagedialog.cpp b/digikam/libs/dialogs/imagedialog.cpp index 908df1f..0e1a959 100644 --- a/digikam/libs/dialogs/imagedialog.cpp +++ b/digikam/libs/dialogs/imagedialog.cpp @@ -229,9 +229,9 @@ void ImageDialogPreview::slotGotThumbnail(const KURL& url, const TQPixmap& pix) void ImageDialogPreview::slotFailedThumbnail(const KURL& /*url*/) { - KIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader(); - d->imageLabel->setPixmap(iconLoader->loadIcon("image", KIcon::NoGroup, 128, - KIcon::DefaultState, 0, true)); + TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader(); + d->imageLabel->setPixmap(iconLoader->loadIcon("image", TDEIcon::NoGroup, 128, + TDEIcon::DefaultState, 0, true)); } void ImageDialogPreview::clearPreview() diff --git a/digikam/libs/dialogs/rawcameradlg.cpp b/digikam/libs/dialogs/rawcameradlg.cpp index 8c4a01c..2127ed7 100644 --- a/digikam/libs/dialogs/rawcameradlg.cpp +++ b/digikam/libs/dialogs/rawcameradlg.cpp @@ -93,12 +93,12 @@ RawCameraDlg::RawCameraDlg(TQWidget *parent) // -------------------------------------------------------- TQLabel *logo = new TQLabel(page); - KIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader(); + TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader(); if (TDEApplication::kApplication()->aboutData()->appName() == TQString("digikam")) - logo->setPixmap(iconLoader->loadIcon("digikam", KIcon::NoGroup, 96, KIcon::DefaultState, 0, true)); + logo->setPixmap(iconLoader->loadIcon("digikam", TDEIcon::NoGroup, 96, TDEIcon::DefaultState, 0, true)); else - logo->setPixmap(iconLoader->loadIcon("showfoto", KIcon::NoGroup, 96, KIcon::DefaultState, 0, true)); + logo->setPixmap(iconLoader->loadIcon("showfoto", TDEIcon::NoGroup, 96, TDEIcon::DefaultState, 0, true)); // -------------------------------------------------------- diff --git a/digikam/libs/imageproperties/imagedescedittab.cpp b/digikam/libs/imageproperties/imagedescedittab.cpp index bae5c17..54e5005 100644 --- a/digikam/libs/imageproperties/imagedescedittab.cpp +++ b/digikam/libs/imageproperties/imagedescedittab.cpp @@ -187,16 +187,16 @@ 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", - KIcon::NoGroup, KIcon::SizeSmall, - KIcon::DefaultState, 0, true)); + TDEIcon::NoGroup, TDEIcon::SizeSmall, + TDEIcon::DefaultState, 0, true)); d->assignedTagsBtn->setToggleButton(true); 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", - KIcon::NoGroup, KIcon::SizeSmall, - KIcon::DefaultState, 0, true)); + TDEIcon::NoGroup, TDEIcon::SizeSmall, + TDEIcon::DefaultState, 0, true)); d->recentTagsBtn->setUsesBigPixmap(false); d->recentTagsBtn->setPopup(popupMenu); d->recentTagsBtn->setPopupDelay(1); diff --git a/digikam/libs/thumbbar/thumbbar.cpp b/digikam/libs/thumbbar/thumbbar.cpp index f8011f2..db96b78 100644 --- a/digikam/libs/thumbbar/thumbbar.cpp +++ b/digikam/libs/thumbbar/thumbbar.cpp @@ -801,8 +801,8 @@ void ThumbBarView::slotFailedThumbnail(const KURL& url) if (!item) return; - KIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader(); - TQPixmap pix = iconLoader->loadIcon("image", KIcon::NoGroup, ThumbnailSize::Huge); + TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader(); + TQPixmap pix = iconLoader->loadIcon("image", TDEIcon::NoGroup, ThumbnailSize::Huge); if (item->d->pixmap) { diff --git a/digikam/libs/widgets/common/dpopupmenu.cpp b/digikam/libs/widgets/common/dpopupmenu.cpp index 86b7af1..af397dc 100644 --- a/digikam/libs/widgets/common/dpopupmenu.cpp +++ b/digikam/libs/widgets/common/dpopupmenu.cpp @@ -73,7 +73,7 @@ void DPopupMenu::generateSidePixmap() else s_dpopupmenu_sidePixmap.load( locate( "data","showfoto/menusidepixmap.png" ) ); - KIconEffect::colorize(s_dpopupmenu_sidePixmap, newColor, 1.0); + TDEIconEffect::colorize(s_dpopupmenu_sidePixmap, newColor, 1.0); } } diff --git a/digikam/libs/widgets/common/searchtextbar.cpp b/digikam/libs/widgets/common/searchtextbar.cpp index 66987ca..d84f05b 100644 --- a/digikam/libs/widgets/common/searchtextbar.cpp +++ b/digikam/libs/widgets/common/searchtextbar.cpp @@ -165,7 +165,7 @@ SearchTextBar::SearchTextBar(TQWidget *parent, const char* name, const TQString d->clearButton->setEnabled(false); d->clearButton->setAutoRaise(true); d->clearButton->setIconSet(kapp->iconLoader()->loadIcon("clear_left", - KIcon::Toolbar, KIcon::SizeSmall)); + TDEIcon::Toolbar, TDEIcon::SizeSmall)); d->searchEdit = new DLineEdit(msg, this); KCompletion *kcom = new KCompletion; diff --git a/digikam/libs/widgets/metadata/metadatawidget.cpp b/digikam/libs/widgets/metadata/metadatawidget.cpp index 39d105e..c5081ea 100644 --- a/digikam/libs/widgets/metadata/metadatawidget.cpp +++ b/digikam/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()); - KIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader(); + TDEIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader(); d->levelButtons = new TQHButtonGroup(this); d->levelButtons->setInsideMargin( 0 ); @@ -108,14 +108,14 @@ MetadataWidget::MetadataWidget(TQWidget* parent, const char* name) d->levelButtons->setFrameShape(TQFrame::NoFrame); TQPushButton *simpleLevel = new TQPushButton( d->levelButtons ); - simpleLevel->setPixmap( iconLoader->loadIcon( "ascii", (KIcon::Group)KIcon::Toolbar ) ); + simpleLevel->setPixmap( iconLoader->loadIcon( "ascii", (TDEIcon::Group)TDEIcon::Toolbar ) ); simpleLevel->setToggleButton(true); TQWhatsThis::add( simpleLevel, i18n( "Switch the tags view to a simple human-readable list" ) ); TQToolTip::add( simpleLevel, i18n( "Simple list" )); d->levelButtons->insert(simpleLevel, SIMPLE); TQPushButton *fullLevel = new TQPushButton( d->levelButtons ); - fullLevel->setPixmap( iconLoader->loadIcon( "document", (KIcon::Group)KIcon::Toolbar ) ); + fullLevel->setPixmap( iconLoader->loadIcon( "document", (TDEIcon::Group)TDEIcon::Toolbar ) ); fullLevel->setToggleButton(true); TQWhatsThis::add( fullLevel, i18n( "Switch the tags view to a full list" ) ); TQToolTip::add( fullLevel, i18n( "Full list" )); @@ -126,19 +126,19 @@ MetadataWidget::MetadataWidget(TQWidget* parent, const char* name) d->toolButtons->setFrameShape(TQFrame::NoFrame); TQPushButton *saveMetadata = new TQPushButton( d->toolButtons ); - saveMetadata->setPixmap( iconLoader->loadIcon( "filesave", (KIcon::Group)KIcon::Toolbar ) ); + saveMetadata->setPixmap( iconLoader->loadIcon( "filesave", (TDEIcon::Group)TDEIcon::Toolbar ) ); TQWhatsThis::add( saveMetadata, i18n( "Save metadata to a binary file" ) ); TQToolTip::add( saveMetadata, i18n( "Save metadata" )); d->toolButtons->insert(saveMetadata); TQPushButton *printMetadata = new TQPushButton( d->toolButtons ); - printMetadata->setPixmap( iconLoader->loadIcon( "fileprint", (KIcon::Group)KIcon::Toolbar ) ); + printMetadata->setPixmap( iconLoader->loadIcon( "fileprint", (TDEIcon::Group)TDEIcon::Toolbar ) ); TQWhatsThis::add( printMetadata, i18n( "Print metadata to printer" ) ); TQToolTip::add( printMetadata, i18n( "Print metadata" )); d->toolButtons->insert(printMetadata); TQPushButton *copy2ClipBoard = new TQPushButton( d->toolButtons ); - copy2ClipBoard->setPixmap( iconLoader->loadIcon( "editcopy", (KIcon::Group)KIcon::Toolbar ) ); + copy2ClipBoard->setPixmap( iconLoader->loadIcon( "editcopy", (TDEIcon::Group)TDEIcon::Toolbar ) ); TQWhatsThis::add( copy2ClipBoard, i18n( "Copy metadata to clipboard" ) ); TQToolTip::add( copy2ClipBoard, i18n( "Copy metadata to clipboard" )); d->toolButtons->insert(copy2ClipBoard); diff --git a/digikam/showfoto/setup/setup.cpp b/digikam/showfoto/setup/setup.cpp index 0466efd..7d43b6e 100644 --- a/digikam/showfoto/setup/setup.cpp +++ b/digikam/showfoto/setup/setup.cpp @@ -92,27 +92,27 @@ Setup::Setup(TQWidget* parent, const char* name, Setup::Page page) setHelp("setupdialog.anchor", "showfoto"); d->page_editor = addPage(i18n("General"), i18n("General Settings"), - BarIcon("showfoto", KIcon::SizeMedium)); + BarIcon("showfoto", TDEIcon::SizeMedium)); d->editorPage = new SetupEditor(d->page_editor); d->page_toolTip = addPage(i18n("Tool Tip"), i18n("Thumbbar Items Tool Tip Settings"), - BarIcon("filetypes", KIcon::SizeMedium)); + BarIcon("filetypes", TDEIcon::SizeMedium)); d->toolTipPage = new SetupToolTip(d->page_toolTip); d->page_dcraw = addPage(i18n("RAW decoding"), i18n("RAW Files Decoding Settings"), - BarIcon("kdcraw", KIcon::SizeMedium)); + BarIcon("kdcraw", TDEIcon::SizeMedium)); d->dcrawPage = new Digikam::SetupDcraw(d->page_dcraw); d->page_icc = addPage(i18n("Color Management"), i18n("Color Management Settings"), - BarIcon("colorize", KIcon::SizeMedium)); + BarIcon("colorize", TDEIcon::SizeMedium)); d->iccPage = new Digikam::SetupICC(d->page_icc, this); d->page_iofiles = addPage(i18n("Save Images"), i18n("Save Images' Files' Settings"), - BarIcon("filesave", KIcon::SizeMedium)); + BarIcon("filesave", TDEIcon::SizeMedium)); d->iofilesPage = new Digikam::SetupIOFiles(d->page_iofiles); d->page_slideshow = addPage(i18n("Slide Show"), i18n("Slide Show Settings"), - BarIcon("slideshow", KIcon::SizeMedium)); + BarIcon("slideshow", TDEIcon::SizeMedium)); d->slideshowPage = new Digikam::SetupSlideShow(d->page_slideshow); connect(this, TQT_SIGNAL(okClicked()), diff --git a/digikam/themedesigner/mainwindow.cpp b/digikam/themedesigner/mainwindow.cpp index 118fa4e..e1d4114 100644 --- a/digikam/themedesigner/mainwindow.cpp +++ b/digikam/themedesigner/mainwindow.cpp @@ -231,12 +231,12 @@ MainWindow::MainWindow() m_folderView->setResizeMode(TQListView::LastColumn); m_folderView->setRootIsDecorated(true); - KIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader(); + TDEIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader(); for (int i=0; i<10; i++) { FolderItem* folderItem = new FolderItem(m_folderView, TQString("Album %1").arg(i)); - folderItem->setPixmap(0, iconLoader->loadIcon("folder", KIcon::NoGroup, - 32, KIcon::DefaultState, 0, true)); + folderItem->setPixmap(0, iconLoader->loadIcon("folder", TDEIcon::NoGroup, + 32, TDEIcon::DefaultState, 0, true)); if (i == 2) { m_folderView->setSelected(folderItem, true); diff --git a/digikam/themedesigner/themediconitem.cpp b/digikam/themedesigner/themediconitem.cpp index 814bc15..a2eefe1 100644 --- a/digikam/themedesigner/themediconitem.cpp +++ b/digikam/themedesigner/themediconitem.cpp @@ -135,9 +135,9 @@ void ThemedIconItem::paintItem() { r = view->itemPixmapRect(); - KIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader(); - TQPixmap thumbnail = iconLoader->loadIcon("colors", KIcon::NoGroup, - 100, KIcon::DefaultState, 0, true); + TDEIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader(); + TQPixmap thumbnail = iconLoader->loadIcon("colors", TDEIcon::NoGroup, + 100, TDEIcon::DefaultState, 0, true); p.drawPixmap(r.x() + (r.width()-thumbnail.width())/2, r.y() + (r.height()-thumbnail.height())/2, diff --git a/digikam/utilities/batch/batchalbumssyncmetadata.cpp b/digikam/utilities/batch/batchalbumssyncmetadata.cpp index ce89aaf..b2f295f 100644 --- a/digikam/utilities/batch/batchalbumssyncmetadata.cpp +++ b/digikam/utilities/batch/batchalbumssyncmetadata.cpp @@ -129,7 +129,7 @@ void BatchAlbumsSyncMetadata::parseAlbum() void BatchAlbumsSyncMetadata::slotAlbumParsed(const ImageInfoList& list) { TQPixmap pix = TDEApplication::kApplication()->iconLoader()->loadIcon( - "folder_image", KIcon::NoGroup, 32); + "folder_image", TDEIcon::NoGroup, 32); ImageInfoList imageInfoList = list; diff --git a/digikam/utilities/cameragui/albumselectdialog.cpp b/digikam/utilities/cameragui/albumselectdialog.cpp index 962990f..54b1e6e 100644 --- a/digikam/utilities/cameragui/albumselectdialog.cpp +++ b/digikam/utilities/cameragui/albumselectdialog.cpp @@ -101,8 +101,8 @@ AlbumSelectDialog::AlbumSelectDialog(TQWidget* parent, PAlbum* albumToSelect, TQGridLayout* grid = new TQGridLayout(plainPage(), 2, 1, 0, spacingHint()); TQLabel *logo = new TQLabel(plainPage()); - KIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader(); - logo->setPixmap(iconLoader->loadIcon("digikam", KIcon::NoGroup, 128, KIcon::DefaultState, 0, true)); + TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader(); + logo->setPixmap(iconLoader->loadIcon("digikam", TDEIcon::NoGroup, 128, TDEIcon::DefaultState, 0, true)); TQLabel *message = new TQLabel(plainPage()); if (!header.isEmpty()) @@ -118,8 +118,8 @@ AlbumSelectDialog::AlbumSelectDialog(TQWidget* parent, PAlbum* albumToSelect, // ------------------------------------------------------------- - TQPixmap icon = iconLoader->loadIcon("folder", KIcon::NoGroup, - AlbumSettings::instance()->getDefaultTreeIconSize(), KIcon::DefaultState, 0, true); + TQPixmap icon = iconLoader->loadIcon("folder", TDEIcon::NoGroup, + AlbumSettings::instance()->getDefaultTreeIconSize(), TDEIcon::DefaultState, 0, true); AlbumList aList = AlbumManager::instance()->allPAlbums(); @@ -216,10 +216,10 @@ void AlbumSelectDialog::slotAlbumAdded(Album* album) return; } - KIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader(); - TQPixmap icon = iconLoader->loadIcon("folder", KIcon::NoGroup, + TDEIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader(); + TQPixmap icon = iconLoader->loadIcon("folder", TDEIcon::NoGroup, AlbumSettings::instance()->getDefaultTreeIconSize(), - KIcon::DefaultState, 0, true); + TDEIcon::DefaultState, 0, true); FolderItem* viewItem = new FolderItem(parentItem, album->title()); viewItem->setPixmap(0, icon); diff --git a/digikam/utilities/cameragui/camerafolderdialog.cpp b/digikam/utilities/cameragui/camerafolderdialog.cpp index 1fa82c9..5d3c896 100644 --- a/digikam/utilities/cameragui/camerafolderdialog.cpp +++ b/digikam/utilities/cameragui/camerafolderdialog.cpp @@ -64,8 +64,8 @@ CameraFolderDialog::CameraFolderDialog(TQWidget *parent, CameraIconView *cameraV TQLabel *logo = new TQLabel(page); TQLabel *message = new TQLabel(page); - KIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader(); - logo->setPixmap(iconLoader->loadIcon("digikam", KIcon::NoGroup, 128, KIcon::DefaultState, 0, true)); + TDEIconLoader* iconLoader = TDEApplication::kApplication()->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/digikam/utilities/cameragui/cameraiconview.cpp b/digikam/utilities/cameragui/cameraiconview.cpp index 81b55ad..53d5d47 100644 --- a/digikam/utilities/cameragui/cameraiconview.cpp +++ b/digikam/utilities/cameragui/cameraiconview.cpp @@ -304,14 +304,14 @@ void CameraIconView::addItem(const GPItemInfo& info) if (mime) { - thumb = TQImage(mime->pixmap(KIcon::Desktop, ThumbnailSize::Huge, KIcon::DefaultState) + thumb = TQImage(mime->pixmap(TDEIcon::Desktop, ThumbnailSize::Huge, TDEIcon::DefaultState) .convertToImage()); } else { - KIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader(); - thumb = iconLoader->loadIcon("empty", KIcon::Desktop, - ThumbnailSize::Huge, KIcon::DefaultState, 0, true) + TDEIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader(); + thumb = iconLoader->loadIcon("empty", TDEIcon::Desktop, + ThumbnailSize::Huge, TDEIcon::DefaultState, 0, true) .convertToImage(); } diff --git a/digikam/utilities/cameragui/camerainfodialog.cpp b/digikam/utilities/cameragui/camerainfodialog.cpp index 29e0fa5..2ad0ac1 100644 --- a/digikam/utilities/cameragui/camerainfodialog.cpp +++ b/digikam/utilities/cameragui/camerainfodialog.cpp @@ -49,7 +49,7 @@ CameraInfoDialog::CameraInfoDialog(TQWidget *parent, const TQString& summary, co // ---------------------------------------------------------- - TQFrame *p1 = addPage( i18n("Summary"), i18n("Camera Summary"), BarIcon("contents2", KIcon::SizeMedium) ); + TQFrame *p1 = addPage( i18n("Summary"), i18n("Camera Summary"), BarIcon("contents2", TDEIcon::SizeMedium) ); TQVBoxLayout *p1layout = new TQVBoxLayout( p1, 0, 6 ); TQTextEdit *summaryView = new TQTextEdit(summary, TQString(), p1); @@ -59,7 +59,7 @@ CameraInfoDialog::CameraInfoDialog(TQWidget *parent, const TQString& summary, co // ---------------------------------------------------------- - TQFrame *p2 = addPage( i18n("Manual"), i18n("Camera Manual"), BarIcon("contents", KIcon::SizeMedium) ); + TQFrame *p2 = addPage( i18n("Manual"), i18n("Camera Manual"), BarIcon("contents", TDEIcon::SizeMedium) ); TQVBoxLayout *p2layout = new TQVBoxLayout( p2, 0, 6 ); TQTextEdit *manualView = new TQTextEdit(manual, TQString(), p2); @@ -69,7 +69,7 @@ CameraInfoDialog::CameraInfoDialog(TQWidget *parent, const TQString& summary, co // ---------------------------------------------------------- - TQFrame *p3 = addPage( i18n("About"), i18n("About Driver"), BarIcon("camera", KIcon::SizeMedium) ); + TQFrame *p3 = addPage( i18n("About"), i18n("About Driver"), BarIcon("camera", TDEIcon::SizeMedium) ); TQVBoxLayout *p3layout = new TQVBoxLayout( p3, 0, 6 ); TQTextEdit *aboutView = new TQTextEdit(about, TQString(), p3); diff --git a/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp b/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp index 3f19f3f..2847049 100644 --- a/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp +++ b/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp @@ -105,8 +105,8 @@ ColorCorrectionDlg::ColorCorrectionDlg(TQWidget* parent, DImg *preview, previewOriginal->setPixmap(preview->convertToPixmap()); previewTarget->setPixmap(preview->convertToPixmap(m_iccTrans)); - KIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader(); - logo->setPixmap(iconLoader->loadIcon("digikam", KIcon::NoGroup, 128, KIcon::DefaultState, 0, true)); + TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader(); + logo->setPixmap(iconLoader->loadIcon("digikam", TDEIcon::NoGroup, 128, TDEIcon::DefaultState, 0, true)); grid->addMultiCellWidget(originalTitle, 0, 0, 0, 0); grid->addMultiCellWidget(previewOriginal, 1, 1, 0, 0); diff --git a/digikam/utilities/lighttable/lighttablepreview.cpp b/digikam/utilities/lighttable/lighttablepreview.cpp index 60a0f1d..4177c19 100644 --- a/digikam/utilities/lighttable/lighttablepreview.cpp +++ b/digikam/utilities/lighttable/lighttablepreview.cpp @@ -367,7 +367,7 @@ void LightTablePreview::slotContextMenu() for( iter = offers.begin(); iter != offers.end(); ++iter ) { ptr = *iter; - openWithMenu.insertItem( ptr->pixmap(KIcon::Small), ptr->name(), index++); + openWithMenu.insertItem( ptr->pixmap(TDEIcon::Small), ptr->name(), index++); serviceVector.push_back(ptr); } diff --git a/digikam/utilities/setup/cameraselection.cpp b/digikam/utilities/setup/cameraselection.cpp index 76543c7..45ed8a4 100644 --- a/digikam/utilities/setup/cameraselection.cpp +++ b/digikam/utilities/setup/cameraselection.cpp @@ -180,9 +180,9 @@ CameraSelection::CameraSelection( TQWidget* parent ) TQLabel* logo = new TQLabel( box2 ); - KIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader(); - logo->setPixmap(iconLoader->loadIcon("digikam", KIcon::NoGroup, 64, - KIcon::DefaultState, 0, true)); + TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader(); + logo->setPixmap(iconLoader->loadIcon("digikam", TDEIcon::NoGroup, 64, + TDEIcon::DefaultState, 0, true)); KActiveLabel* link = new KActiveLabel(box2); link->setText(i18n("<p>To set a <b>USB Mass Storage</b> camera<br>" diff --git a/digikam/utilities/setup/setup.cpp b/digikam/utilities/setup/setup.cpp index ea46a96..95899db 100644 --- a/digikam/utilities/setup/setup.cpp +++ b/digikam/utilities/setup/setup.cpp @@ -140,63 +140,63 @@ Setup::Setup(TQWidget* parent, const char* name, Setup::Page page) setHelp("setupdialog.anchor", "digikam"); d->page_general = addPage(i18n("Albums"), i18n("Album Settings"), - BarIcon("folder_image", KIcon::SizeMedium)); + BarIcon("folder_image", TDEIcon::SizeMedium)); d->generalPage = new SetupGeneral(d->page_general, this); d->page_collections = addPage(i18n("Collections"), i18n("Album Collections"), - BarIcon("fileopen", KIcon::SizeMedium)); + BarIcon("fileopen", TDEIcon::SizeMedium)); d->collectionsPage = new SetupCollections(d->page_collections); d->page_identity = addPage(i18n("Identity"), i18n("Default IPTC identity information"), - BarIcon("identity", KIcon::SizeMedium)); + BarIcon("identity", TDEIcon::SizeMedium)); d->identityPage = new SetupIdentity(d->page_identity); d->page_metadata = addPage(i18n("Metadata"), i18n("Embedded Image Information Management"), - BarIcon("exifinfo", KIcon::SizeMedium)); + BarIcon("exifinfo", TDEIcon::SizeMedium)); d->metadataPage = new SetupMetadata(d->page_metadata); d->page_tooltip = addPage(i18n("Tool Tip"), i18n("Album Items Tool Tip Settings"), - BarIcon("filetypes", KIcon::SizeMedium)); + BarIcon("filetypes", TDEIcon::SizeMedium)); d->tooltipPage = new SetupToolTip(d->page_tooltip); d->page_mime = addPage(i18n("Mime Types"), i18n("File (MIME) Types Settings"), - BarIcon("kcmsystem", KIcon::SizeMedium)); + BarIcon("kcmsystem", TDEIcon::SizeMedium)); d->mimePage = new SetupMime(d->page_mime); d->page_lighttable = addPage(i18n("Light Table"), i18n("Light Table Settings"), - BarIcon("lighttable", KIcon::SizeMedium)); + BarIcon("lighttable", TDEIcon::SizeMedium)); d->lighttablePage = new SetupLightTable(d->page_lighttable); d->page_editor = addPage(i18n("Image Editor"), i18n("Image Editor General Settings"), - BarIcon("image", KIcon::SizeMedium)); + BarIcon("image", TDEIcon::SizeMedium)); d->editorPage = new SetupEditor(d->page_editor); d->page_iofiles = addPage(i18n("Save Images"), i18n("Image Editor: Settings for Saving Images Files"), - BarIcon("filesave", KIcon::SizeMedium)); + BarIcon("filesave", TDEIcon::SizeMedium)); d->iofilesPage = new SetupIOFiles(d->page_iofiles); d->page_dcraw = addPage(i18n("RAW decoding"), i18n("RAW Files Decoding Settings"), - BarIcon("kdcraw", KIcon::SizeMedium)); + BarIcon("kdcraw", TDEIcon::SizeMedium)); d->dcrawPage = new SetupDcraw(d->page_dcraw); d->page_icc = addPage(i18n("Color Management"), i18n("Image Editor Color Management Settings"), - BarIcon("colorize", KIcon::SizeMedium)); + BarIcon("colorize", TDEIcon::SizeMedium)); d->iccPage = new SetupICC(d->page_icc, this); d->page_plugins = addPage(i18n("Kipi Plugins"), i18n("Main Interface Plug-in Settings"), - BarIcon("kipi", KIcon::SizeMedium)); + BarIcon("kipi", TDEIcon::SizeMedium)); d->pluginsPage = new SetupPlugins(d->page_plugins); d->page_slideshow = addPage(i18n("Slide Show"), i18n("Slide Show Settings"), - BarIcon("slideshow", KIcon::SizeMedium)); + BarIcon("slideshow", TDEIcon::SizeMedium)); d->slideshowPage = new SetupSlideShow(d->page_slideshow); d->page_camera = addPage(i18n("Cameras"), i18n("Camera Settings"), - BarIcon("digitalcam", KIcon::SizeMedium)); + BarIcon("digitalcam", TDEIcon::SizeMedium)); d->cameraPage = new SetupCamera(d->page_camera); d->page_misc = addPage(i18n("Miscellaneous"), i18n("Miscellaneous Settings"), - BarIcon("misc", KIcon::SizeMedium)); + BarIcon("misc", TDEIcon::SizeMedium)); d->miscPage = new SetupMisc(d->page_misc); connect(this, TQT_SIGNAL(okClicked()), diff --git a/digikam/utilities/slideshow/slideshow.cpp b/digikam/utilities/slideshow/slideshow.cpp index 19fa24b..cc8fdb2 100644 --- a/digikam/utilities/slideshow/slideshow.cpp +++ b/digikam/utilities/slideshow/slideshow.cpp @@ -438,8 +438,8 @@ void SlideShow::updatePixmap() { // End of Slide Show. - TQPixmap logo = kapp->iconLoader()->loadIcon("digikam", KIcon::NoGroup, 128, - KIcon::DefaultState, 0, true); + TQPixmap logo = kapp->iconLoader()->loadIcon("digikam", TDEIcon::NoGroup, 128, + TDEIcon::DefaultState, 0, true); TQFont fn(font()); fn.setPointSize(fn.pointSize()+10); diff --git a/digikam/utilities/slideshow/toolbar.cpp b/digikam/utilities/slideshow/toolbar.cpp index 5ea420a..5f3570d 100644 --- a/digikam/utilities/slideshow/toolbar.cpp +++ b/digikam/utilities/slideshow/toolbar.cpp @@ -75,11 +75,11 @@ ToolBar::ToolBar(TQWidget* parent) d->stopBtn = new TQToolButton(this); d->playBtn->setToggleButton(true); - KIconLoader* loader = kapp->iconLoader(); - d->playBtn->setIconSet(loader->loadIcon("player_pause", KIcon::NoGroup, 22)); - d->prevBtn->setIconSet(loader->loadIcon("back", KIcon::NoGroup, 22)); - d->nextBtn->setIconSet(loader->loadIcon("forward", KIcon::NoGroup, 22)); - d->stopBtn->setIconSet(loader->loadIcon("stop", KIcon::NoGroup, 22)); + TDEIconLoader* loader = kapp->iconLoader(); + d->playBtn->setIconSet(loader->loadIcon("player_pause", TDEIcon::NoGroup, 22)); + d->prevBtn->setIconSet(loader->loadIcon("back", TDEIcon::NoGroup, 22)); + d->nextBtn->setIconSet(loader->loadIcon("forward", TDEIcon::NoGroup, 22)); + d->stopBtn->setIconSet(loader->loadIcon("stop", TDEIcon::NoGroup, 22)); lay->addWidget(d->playBtn); lay->addWidget(d->prevBtn); @@ -153,15 +153,15 @@ void ToolBar::slotPlayBtnToggled() if (d->playBtn->isOn()) { d->canHide = false; - KIconLoader* loader = kapp->iconLoader(); - d->playBtn->setIconSet(loader->loadIcon("player_play", KIcon::NoGroup, 22)); + TDEIconLoader* loader = kapp->iconLoader(); + d->playBtn->setIconSet(loader->loadIcon("player_play", TDEIcon::NoGroup, 22)); emit signalPause(); } else { d->canHide = true; - KIconLoader* loader = kapp->iconLoader(); - d->playBtn->setIconSet(loader->loadIcon("player_pause", KIcon::NoGroup, 22)); + TDEIconLoader* loader = kapp->iconLoader(); + d->playBtn->setIconSet(loader->loadIcon("player_pause", TDEIcon::NoGroup, 22)); emit signalPlay(); } } @@ -172,8 +172,8 @@ void ToolBar::slotNexPrevClicked() { d->playBtn->setOn(true); d->canHide = false; - KIconLoader* loader = kapp->iconLoader(); - d->playBtn->setIconSet(loader->loadIcon("player_play", KIcon::NoGroup, 22)); + TDEIconLoader* loader = kapp->iconLoader(); + d->playBtn->setIconSet(loader->loadIcon("player_play", TDEIcon::NoGroup, 22)); emit signalPause(); } } |