From a581368f208b67b04cd245c786c4e5ad33985cad Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 4 Feb 2013 14:12:04 -0600 Subject: Rename KIcon to enhance compatibility with KDE4 --- kipi-plugins/acquireimages/acquireimagedialog.cpp | 4 ++-- kipi-plugins/calendar/calevents.cpp | 6 +++--- kipi-plugins/calendar/monthwidget.cpp | 12 ++++++------ kipi-plugins/cdarchiving/cdarchivingdialog.cpp | 8 ++++---- kipi-plugins/findimages/finddupplicatedialog.cpp | 4 ++-- kipi-plugins/flickrexport/flickrwindow.cpp | 4 ++-- kipi-plugins/flickrexport/imageslist.cpp | 2 +- kipi-plugins/galleryexport/gallerywindow.cpp | 4 ++-- kipi-plugins/gpssync/gpslistviewitem.cpp | 2 +- kipi-plugins/ipodexport/ipodexportdialog.cpp | 10 +++++----- kipi-plugins/kameraklient/dmessagebox.cpp | 6 +++--- kipi-plugins/metadataedit/exifeditdialog.cpp | 12 ++++++------ kipi-plugins/metadataedit/iptceditdialog.cpp | 16 ++++++++-------- kipi-plugins/mpegencoder/kimg2mpg.cpp | 4 ++-- kipi-plugins/mpegencoder/kimg2mpg.h | 4 ++-- kipi-plugins/mpegencoder/optionsdialog.cpp | 8 ++++---- kipi-plugins/mpegencoder/optionsdialog.h | 4 ++-- kipi-plugins/rawconverter/batchdialog.cpp | 2 +- kipi-plugins/sendimages/sendimagesdialog.cpp | 4 ++-- kipi-plugins/simpleviewerexport/svedialog.cpp | 6 +++--- kipi-plugins/slideshow/toolbar.cpp | 22 +++++++++++----------- kipi-plugins/sync/gallerywindow.cpp | 4 ++-- 22 files changed, 74 insertions(+), 74 deletions(-) diff --git a/kipi-plugins/acquireimages/acquireimagedialog.cpp b/kipi-plugins/acquireimages/acquireimagedialog.cpp index 2d81462..3a21ed9 100644 --- a/kipi-plugins/acquireimages/acquireimagedialog.cpp +++ b/kipi-plugins/acquireimages/acquireimagedialog.cpp @@ -179,7 +179,7 @@ void AcquireImageDialog::setupImageOptions(void) page_setupImageOptions = addPage( i18n("Target Image"), i18n("Target Image Options"), - BarIcon("image", KIcon::SizeMedium ) ); + BarIcon("image", TDEIcon::SizeMedium ) ); TQVBoxLayout *vlay = new TQVBoxLayout( page_setupImageOptions, 0, spacingHint() ); @@ -302,7 +302,7 @@ void AcquireImageDialog::setupAlbumsList(void) page_setupAlbumsList = addPage( i18n("Selection"), i18n("Album selection"), - BarIcon("folder_image", KIcon::SizeMedium ) ); + BarIcon("folder_image", TDEIcon::SizeMedium ) ); TQVBoxLayout *vlay = new TQVBoxLayout( page_setupAlbumsList, 0, spacingHint() ); diff --git a/kipi-plugins/calendar/calevents.cpp b/kipi-plugins/calendar/calevents.cpp index 7744fff..4c493e5 100644 --- a/kipi-plugins/calendar/calevents.cpp +++ b/kipi-plugins/calendar/calevents.cpp @@ -35,9 +35,9 @@ namespace KIPICalendarPlugin { CalEvents::CalEvents(TQWidget *parent, const char *name) : CalEventsBase(parent, name) { - KIconLoader * icons = new KIconLoader( TQString( "MenuDlg" ) ); - ohBtn->setPixmap( icons->loadIcon( TQString( "fileopen" ), KIcon::Toolbar ) ); - fhBtn->setPixmap( icons->loadIcon( TQString( "fileopen" ), KIcon::Toolbar ) ); + TDEIconLoader * icons = new TDEIconLoader( TQString( "MenuDlg" ) ); + ohBtn->setPixmap( icons->loadIcon( TQString( "fileopen" ), TDEIcon::Toolbar ) ); + fhBtn->setPixmap( icons->loadIcon( TQString( "fileopen" ), TDEIcon::Toolbar ) ); } diff --git a/kipi-plugins/calendar/monthwidget.cpp b/kipi-plugins/calendar/monthwidget.cpp index 687c01a..3cd11ab 100644 --- a/kipi-plugins/calendar/monthwidget.cpp +++ b/kipi-plugins/calendar/monthwidget.cpp @@ -66,8 +66,8 @@ MonthWidget::MonthWidget( KIPI::Interface* interface, TQWidget *parent, int mont month_ = month; imagePath_ = TQString(""); pixmap_ = new TQPixmap(SmallIcon("file_broken", - KIcon::SizeMedium, - KIcon::DisabledState)); + TDEIcon::SizeMedium, + TDEIcon::DisabledState)); setFixedSize(TQSize(70,90)); setFrameStyle(TQFrame::Panel|TQFrame::Raised); } @@ -125,8 +125,8 @@ void MonthWidget::setImage( const KURL &url ) imagePath_ = url; CalSettings::instance()->setImage(month_, imagePath_); - KIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader(); - TQPixmap pix = iconLoader->loadIcon("image", KIcon::NoGroup, 64 ); + TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader(); + TQPixmap pix = iconLoader->loadIcon("image", TDEIcon::NoGroup, 64 ); if ( pixmap_ ) delete pixmap_; pixmap_ = new TQPixmap( pix ); @@ -184,8 +184,8 @@ void MonthWidget::mouseReleaseEvent(TQMouseEvent* e) CalSettings::instance()->setImage(month_,imagePath_); delete pixmap_; pixmap_ = new TQPixmap(SmallIcon("file_broken", - KIcon::SizeMedium, - KIcon::DisabledState)); + TDEIcon::SizeMedium, + TDEIcon::DisabledState)); update(); } } diff --git a/kipi-plugins/cdarchiving/cdarchivingdialog.cpp b/kipi-plugins/cdarchiving/cdarchivingdialog.cpp index 00ac2bd..e898154 100644 --- a/kipi-plugins/cdarchiving/cdarchivingdialog.cpp +++ b/kipi-plugins/cdarchiving/cdarchivingdialog.cpp @@ -138,7 +138,7 @@ void CDArchivingDialog::slotHelp() void CDArchivingDialog::setupSelection(void) { page_setupSelection = addPage(i18n("Selection"), i18n("Album Selection"), - BarIcon("folder_image", KIcon::SizeMedium)); + BarIcon("folder_image", TDEIcon::SizeMedium)); TQVBoxLayout *layout = new TQVBoxLayout(page_setupSelection, 0, spacingHint() ); m_imageCollectionSelector = new KIPI::ImageCollectionSelector(page_setupSelection, m_interface); @@ -180,7 +180,7 @@ void CDArchivingDialog::setupLookPage(void) { TQString whatsThis; page_setupLook = addPage( i18n("HTML Interface"), i18n("HTML Interface Look"), - BarIcon("html", KIcon::SizeMedium ) ); + BarIcon("html", TDEIcon::SizeMedium ) ); TQVBoxLayout *vlay = new TQVBoxLayout( page_setupLook, 0, spacingHint() ); @@ -416,7 +416,7 @@ void CDArchivingDialog::setupLookPage(void) void CDArchivingDialog::setupCDInfos(void) { page_CDInfos = addPage( i18n("Volume Descriptor"), i18n("Media Volume Descriptor"), - BarIcon("cd", KIcon::SizeMedium ) ); + BarIcon("cd", TDEIcon::SizeMedium ) ); TQVBoxLayout *vlay = new TQVBoxLayout( page_CDInfos, 0, spacingHint() ); @@ -500,7 +500,7 @@ void CDArchivingDialog::setupBurning(void) { page_burning = addPage( i18n("Media Burning"), i18n("CD/DVD Burning Setup"), - BarIcon("cdwriter_unmount", KIcon::SizeMedium ) ); + BarIcon("cdwriter_unmount", TDEIcon::SizeMedium ) ); TQVBoxLayout *vlay = new TQVBoxLayout( page_burning, 0, spacingHint() ); diff --git a/kipi-plugins/findimages/finddupplicatedialog.cpp b/kipi-plugins/findimages/finddupplicatedialog.cpp index 9b0836e..466edba 100644 --- a/kipi-plugins/findimages/finddupplicatedialog.cpp +++ b/kipi-plugins/findimages/finddupplicatedialog.cpp @@ -124,7 +124,7 @@ void FindDuplicateDialog::setupSelection(void) { page_setupSelection = addPage(i18n("Selection"), i18n("Album's Selection"), - BarIcon("folder_image", KIcon::SizeMedium)); + BarIcon("folder_image", TDEIcon::SizeMedium)); TQVBoxLayout *layout = new TQVBoxLayout(page_setupSelection, 0, spacingHint() ); m_imageCollectionSelector = new KIPI::ImageCollectionSelector(page_setupSelection, m_interface); @@ -138,7 +138,7 @@ void FindDuplicateDialog::setupPageMethod(void) { TQString whatsThis; page_setupMethod = addPage( i18n("Method & Cache"), i18n("Find-Duplicates Method & Cache Configuration"), - BarIcon("run", KIcon::SizeMedium ) ); + BarIcon("run", TDEIcon::SizeMedium ) ); TQVBoxLayout *vlay = new TQVBoxLayout( page_setupMethod, 0, spacingHint() ); diff --git a/kipi-plugins/flickrexport/flickrwindow.cpp b/kipi-plugins/flickrexport/flickrwindow.cpp index d614e59..b13877d 100644 --- a/kipi-plugins/flickrexport/flickrwindow.cpp +++ b/kipi-plugins/flickrexport/flickrwindow.cpp @@ -334,8 +334,8 @@ void FlickrWindow::slotAlbums( const TQValueList& albumList ) //m_photoView->write( "" ); //m_photoView->end(); - KIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader(); - TQPixmap pix = iconLoader->loadIcon( "folder", KIcon::NoGroup, 32 ); + TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader(); + TQPixmap pix = iconLoader->loadIcon( "folder", TDEIcon::NoGroup, 32 ); typedef TQValueList GAlbumList; GAlbumList::const_iterator iter; diff --git a/kipi-plugins/flickrexport/imageslist.cpp b/kipi-plugins/flickrexport/imageslist.cpp index 19b7d5b..639523a 100644 --- a/kipi-plugins/flickrexport/imageslist.cpp +++ b/kipi-plugins/flickrexport/imageslist.cpp @@ -58,7 +58,7 @@ namespace KIPIFlickrExportPlugin ImagesListViewItem::ImagesListViewItem(TQListView *view, const KURL& url) : TQListViewItem(view) { - setThumb(SmallIcon("file_broken", ICONSIZE, KIcon::DisabledState)); + setThumb(SmallIcon("file_broken", ICONSIZE, TDEIcon::DisabledState)); setUrl(url); } diff --git a/kipi-plugins/galleryexport/gallerywindow.cpp b/kipi-plugins/galleryexport/gallerywindow.cpp index be5087f..c41f201 100644 --- a/kipi-plugins/galleryexport/gallerywindow.cpp +++ b/kipi-plugins/galleryexport/gallerywindow.cpp @@ -282,8 +282,8 @@ void GalleryWindow::slotAlbums( const TQValueList& albumList ) m_photoView->write( "" ); m_photoView->end(); - KIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader(); - TQPixmap pix = iconLoader->loadIcon( "folder", KIcon::NoGroup, 32 ); + TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader(); + TQPixmap pix = iconLoader->loadIcon( "folder", TDEIcon::NoGroup, 32 ); typedef TQValueList GAlbumList; GAlbumList::const_iterator iter; diff --git a/kipi-plugins/gpssync/gpslistviewitem.cpp b/kipi-plugins/gpssync/gpslistviewitem.cpp index 8d495d1..cba1afd 100644 --- a/kipi-plugins/gpssync/gpslistviewitem.cpp +++ b/kipi-plugins/gpssync/gpslistviewitem.cpp @@ -72,7 +72,7 @@ GPSListViewItem::GPSListViewItem(TDEListView *view, TQListViewItem *after, const d->url = url; setEnabled(false); - setPixmap(0, SmallIcon( "file_broken", KIcon::SizeLarge, KIcon::DisabledState )); + setPixmap(0, SmallIcon( "file_broken", TDEIcon::SizeLarge, TDEIcon::DisabledState )); setText(1, d->url.fileName()); KExiv2Iface::KExiv2 exiv2Iface; diff --git a/kipi-plugins/ipodexport/ipodexportdialog.cpp b/kipi-plugins/ipodexport/ipodexportdialog.cpp index b140194..18421f2 100644 --- a/kipi-plugins/ipodexport/ipodexportdialog.cpp +++ b/kipi-plugins/ipodexport/ipodexportdialog.cpp @@ -103,7 +103,7 @@ UploadDialog::UploadDialog( TQWhatsThis::add( m_renameAlbumButton, i18n("Rename the selected photo album on the iPod.")); TQLabel *ipod_icon = new TQLabel( buttons ); - ipod_icon->setPixmap( TDEGlobal::iconLoader()->loadIcon( "ipod", KIcon::Desktop, KIcon::SizeHuge ) ); + ipod_icon->setPixmap( TDEGlobal::iconLoader()->loadIcon( "ipod", TDEIcon::Desktop, TDEIcon::SizeHuge ) ); m_ipodPreview = new TQLabel( buttons ); m_ipodPreview->setFixedHeight( 80 ); @@ -148,7 +148,7 @@ UploadDialog::UploadDialog( TQWhatsThis::add( m_imagePreview, i18n( "The preview of the selected image in the list." ) ); TQLabel *hdd_icon = new TQLabel( urlBox ); - hdd_icon->setPixmap( TDEGlobal::iconLoader()->loadIcon( "system", KIcon::Desktop, KIcon::SizeHuge ) ); + hdd_icon->setPixmap( TDEGlobal::iconLoader()->loadIcon( "system", TDEIcon::Desktop, TDEIcon::SizeHuge ) ); uploadPaneLayout->addWidget( m_imagePreview ); uploadPaneLayout->addStretch( 1 ); @@ -207,7 +207,7 @@ UploadDialog::getIpodAlbums() Itdb_PhotoAlbum *ipodAlbum = (Itdb_PhotoAlbum *)it->data; debug() << " found album: " << ipodAlbum->name << endl; last = new IpodAlbumItem( m_ipodAlbumList, last, ipodAlbum ); - last->setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "folder", KIcon::Toolbar, KIcon::SizeSmall ) ); + last->setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "folder", TDEIcon::Toolbar, TDEIcon::SizeSmall ) ); getIpodAlbumPhotos( last, ipodAlbum ); } } @@ -225,7 +225,7 @@ UploadDialog::getIpodAlbumPhotos( IpodAlbumItem *item, Itdb_PhotoAlbum *album ) gint photo_id = photo->id; last = new IpodPhotoItem( item, last, photo ); last->setText( 0, TQString::number( photo_id ) ); - last->setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "image", KIcon::Toolbar, KIcon::SizeSmall ) ); + last->setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "image", TDEIcon::Toolbar, TDEIcon::SizeSmall ) ); } } @@ -469,7 +469,7 @@ UploadDialog::createIpodAlbum() Itdb_PhotoAlbum *photoAlbum = itdb_photodb_photoalbum_create( m_itdb, TQFile::encodeName( newAlbum ), -1/*end*/ ); // add the new album to the list view IpodAlbumItem *i = new IpodAlbumItem( m_ipodAlbumList, last, photoAlbum ); - i->setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "folder", KIcon::Toolbar, KIcon::SizeSmall ) ); + i->setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "folder", TDEIcon::Toolbar, TDEIcon::SizeSmall ) ); m_ipodAlbumList->clearSelection(); m_ipodAlbumList->setSelected( i, true ); diff --git a/kipi-plugins/kameraklient/dmessagebox.cpp b/kipi-plugins/kameraklient/dmessagebox.cpp index 8df3ae0..fb4afff 100644 --- a/kipi-plugins/kameraklient/dmessagebox.cpp +++ b/kipi-plugins/kameraklient/dmessagebox.cpp @@ -52,9 +52,9 @@ DMessageBox::DMessageBox() : TQWidget(0, 0, WShowModal | WStyle_DialogBorder| WD TQHBox *hbox = new TQHBox(this); hbox->setSpacing(5); TQPixmap pix = TDEApplication::kApplication()->iconLoader()->loadIcon("error", - KIcon::NoGroup, - KIcon::SizeMedium, - KIcon::DefaultState, + TDEIcon::NoGroup, + TDEIcon::SizeMedium, + TDEIcon::DefaultState, 0, true); TQLabel *pixLabel = new TQLabel(hbox); pixLabel->setPixmap(pix); diff --git a/kipi-plugins/metadataedit/exifeditdialog.cpp b/kipi-plugins/metadataedit/exifeditdialog.cpp index acf7e3c..e4d9628 100644 --- a/kipi-plugins/metadataedit/exifeditdialog.cpp +++ b/kipi-plugins/metadataedit/exifeditdialog.cpp @@ -136,27 +136,27 @@ EXIFEditDialog::EXIFEditDialog(TQWidget* parent, KURL::List urls, KIPI::Interfac // --------------------------------------------------------------- d->page_caption = addPage(i18n("Caption"), i18n("Caption Information"), - BarIcon("editclear", KIcon::SizeMedium)); + BarIcon("editclear", TDEIcon::SizeMedium)); d->captionPage = new EXIFCaption(d->page_caption); d->page_datetime = addPage(i18n("Date & Time"), i18n("Date and Time"), - BarIcon("today", KIcon::SizeMedium)); + BarIcon("today", TDEIcon::SizeMedium)); d->datetimePage = new EXIFDateTime(d->page_datetime); d->page_lens = addPage(i18n("Lens"), i18n("Lens Settings"), - BarIcon("camera", KIcon::SizeMedium)); + BarIcon("camera", TDEIcon::SizeMedium)); d->lensPage = new EXIFLens(d->page_lens); d->page_device = addPage(i18n("Device"), i18n("Capture Device Settings"), - BarIcon("scanner", KIcon::SizeMedium)); + BarIcon("scanner", TDEIcon::SizeMedium)); d->devicePage = new EXIFDevice(d->page_device); d->page_light = addPage(i18n("Light"), i18n("Light Source Information"), - BarIcon("idea", KIcon::SizeMedium)); + BarIcon("idea", TDEIcon::SizeMedium)); d->lightPage = new EXIFLight(d->page_light); d->page_adjust = addPage(i18n("Adjustments"), i18n("Pictures Adjustments"), - BarIcon("blend", KIcon::SizeMedium)); + BarIcon("blend", TDEIcon::SizeMedium)); d->adjustPage = new EXIFAdjust(d->page_adjust); // --------------------------------------------------------------- diff --git a/kipi-plugins/metadataedit/iptceditdialog.cpp b/kipi-plugins/metadataedit/iptceditdialog.cpp index b95cd65..335e72a 100644 --- a/kipi-plugins/metadataedit/iptceditdialog.cpp +++ b/kipi-plugins/metadataedit/iptceditdialog.cpp @@ -144,35 +144,35 @@ IPTCEditDialog::IPTCEditDialog(TQWidget* parent, KURL::List urls, KIPI::Interfac // --------------------------------------------------------------- d->page_caption = addPage(i18n("Caption"), i18n("Caption Information"), - BarIcon("editclear", KIcon::SizeMedium)); + BarIcon("editclear", TDEIcon::SizeMedium)); d->captionPage = new IPTCCaption(d->page_caption); d->page_datetime = addPage(i18n("Date & Time"), i18n("Date and Time Information"), - BarIcon("today", KIcon::SizeMedium)); + BarIcon("today", TDEIcon::SizeMedium)); d->datetimePage = new IPTCDateTime(d->page_datetime); d->page_subjects = addPage(i18n("Subjects"), i18n("Subjects Information"), - BarIcon("cookie", KIcon::SizeMedium)); + BarIcon("cookie", TDEIcon::SizeMedium)); d->subjectsPage = new IPTCSubjects(d->page_subjects); d->page_keywords = addPage(i18n("Keywords"), i18n("Keywords Information"), - BarIcon("bookmark", KIcon::SizeMedium)); + BarIcon("bookmark", TDEIcon::SizeMedium)); d->keywordsPage = new IPTCKeywords(d->page_keywords); d->page_categories = addPage(i18n("Categories"), i18n("Categories Information"), - BarIcon("bookmark_folder", KIcon::SizeMedium)); + BarIcon("bookmark_folder", TDEIcon::SizeMedium)); d->categoriesPage = new IPTCCategories(d->page_categories); d->page_credits = addPage(i18n("Credits"), i18n("Credits Information"), - BarIcon("identity", KIcon::SizeMedium)); + BarIcon("identity", TDEIcon::SizeMedium)); d->creditsPage = new IPTCCredits(d->page_credits); d->page_status = addPage(i18n("Status"), i18n("Status Information"), - BarIcon("messagebox_info", KIcon::SizeMedium)); + BarIcon("messagebox_info", TDEIcon::SizeMedium)); d->statusPage = new IPTCStatus(d->page_status); d->page_origin = addPage(i18n("Origin"), i18n("Origin Information"), - BarIcon("www", KIcon::SizeMedium)); + BarIcon("www", TDEIcon::SizeMedium)); d->originPage = new IPTCOrigin(d->page_origin); // --------------------------------------------------------------- diff --git a/kipi-plugins/mpegencoder/kimg2mpg.cpp b/kipi-plugins/mpegencoder/kimg2mpg.cpp index 6fb94ea..8f736e5 100644 --- a/kipi-plugins/mpegencoder/kimg2mpg.cpp +++ b/kipi-plugins/mpegencoder/kimg2mpg.cpp @@ -188,7 +188,7 @@ KImg2mpgData::KImg2mpgData(KIPI::Interface* interface, TQWidget *parent, const c m_Encoding = false; m_Abort = false; - m_Icons = new KIconLoader( TQString( "kipi" ) ); + m_Icons = new TDEIconLoader( TQString( "kipi" ) ); m_NoneLabel = i18n ("none"); // Set buttons icon @@ -951,7 +951,7 @@ void KImg2mpgData::EncodeDone(TDEProcess*) TQPixmap KImg2mpgData::LoadIcon( TQString Name, int Group ) { - return m_Icons->loadIcon( Name, (KIcon::Group)Group ); + return m_Icons->loadIcon( Name, (TDEIcon::Group)Group ); } diff --git a/kipi-plugins/mpegencoder/kimg2mpg.h b/kipi-plugins/mpegencoder/kimg2mpg.h index 67d4198..8028950 100644 --- a/kipi-plugins/mpegencoder/kimg2mpg.h +++ b/kipi-plugins/mpegencoder/kimg2mpg.h @@ -61,7 +61,7 @@ class TQPixmap; class TDEConfig; class TDEProcess; class KLineEdit; -class KIconLoader; +class TDEIconLoader; class KColorButton; class TDEListBox; class KButtonBox; @@ -167,7 +167,7 @@ private: TDEProcess* m_Proc; - KIconLoader* m_Icons; + TDEIconLoader* m_Icons; KIPI::Interface* m_interface; diff --git a/kipi-plugins/mpegencoder/optionsdialog.cpp b/kipi-plugins/mpegencoder/optionsdialog.cpp index b0fa30c..83f29eb 100644 --- a/kipi-plugins/mpegencoder/optionsdialog.cpp +++ b/kipi-plugins/mpegencoder/optionsdialog.cpp @@ -51,7 +51,7 @@ OptionsDialog::OptionsDialog(TQWidget *parent) : KDialogBase( parent, "MPEGEncoderOptionsDialog", true, i18n("MPEG Encoder Plugin Settings"), Ok|Cancel, Ok, false) { - Icons = new KIconLoader( TQString( "MenuDlg" ) ); + Icons = new TDEIconLoader( TQString( "MenuDlg" ) ); TQWidget* box = new TQWidget( this ); setMainWidget(box); @@ -68,7 +68,7 @@ OptionsDialog::OptionsDialog(TQWidget *parent) IMBinFolderEditFilename = new KLineEdit( IMBinFolderGroup ); IMBinFolderEditFilename->setMinimumWidth( 300 ); TQPushButton* IMBinFolderButtonFilename = new TQPushButton( IMBinFolderGroup ); - IMBinFolderButtonFilename->setPixmap( LoadIcon( TQString( "fileopen" ), KIcon::Toolbar ) ); + IMBinFolderButtonFilename->setPixmap( LoadIcon( TQString( "fileopen" ), TDEIcon::Toolbar ) ); connect( IMBinFolderButtonFilename, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotIMBinFolderFilenameDialog())); // MjpegTools binary programs folder @@ -78,7 +78,7 @@ OptionsDialog::OptionsDialog(TQWidget *parent) MJBinFolderEditFilename = new KLineEdit( MJBinFolderGroup ); MJBinFolderEditFilename->setMinimumWidth( 300 ); TQPushButton* MJBinFolderButtonFilename = new TQPushButton( MJBinFolderGroup ); - MJBinFolderButtonFilename->setPixmap( LoadIcon( TQString( "fileopen" ), KIcon::Toolbar ) ); + MJBinFolderButtonFilename->setPixmap( LoadIcon( TQString( "fileopen" ), TDEIcon::Toolbar ) ); connect( MJBinFolderButtonFilename, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMJBinFolderFilenameDialog())); } @@ -94,7 +94,7 @@ OptionsDialog::~OptionsDialog() TQPixmap OptionsDialog::LoadIcon( TQString Name, int Group ) { - return Icons->loadIcon( Name, (KIcon::Group)Group ); + return Icons->loadIcon( Name, (TDEIcon::Group)Group ); } ////////////////////////////////// SLOTS //////////////////////////////////////////////////// diff --git a/kipi-plugins/mpegencoder/optionsdialog.h b/kipi-plugins/mpegencoder/optionsdialog.h index 48664d1..b582e62 100644 --- a/kipi-plugins/mpegencoder/optionsdialog.h +++ b/kipi-plugins/mpegencoder/optionsdialog.h @@ -33,7 +33,7 @@ #include class KLineEdit; -class KIconLoader; +class TDEIconLoader; namespace KIPIMPEGEncoderPlugin { @@ -55,7 +55,7 @@ Q_OBJECT void slotMJBinFolderFilenameDialog(void); private: - KIconLoader* Icons; + TDEIconLoader* Icons; TQPixmap LoadIcon( TQString Name, int Group ); }; diff --git a/kipi-plugins/rawconverter/batchdialog.cpp b/kipi-plugins/rawconverter/batchdialog.cpp index 1416c27..f7a40bd 100644 --- a/kipi-plugins/rawconverter/batchdialog.cpp +++ b/kipi-plugins/rawconverter/batchdialog.cpp @@ -386,7 +386,7 @@ void BatchDialog::addItems(const TQStringList& itemList) KURL::List urlList; - TQPixmap pix(SmallIcon( "file_broken", KIcon::SizeLarge, KIcon::DisabledState )); + TQPixmap pix(SmallIcon( "file_broken", TDEIcon::SizeLarge, TDEIcon::DisabledState )); for (TQStringList::const_iterator it = itemList.begin(); it != itemList.end(); ++it) diff --git a/kipi-plugins/sendimages/sendimagesdialog.cpp b/kipi-plugins/sendimages/sendimagesdialog.cpp index 59a89bd..d79fb9c 100644 --- a/kipi-plugins/sendimages/sendimagesdialog.cpp +++ b/kipi-plugins/sendimages/sendimagesdialog.cpp @@ -250,7 +250,7 @@ void SendImagesDialog::setupImagesList(void) page_setupImagesList = addPage(i18n("Images"), i18n("Images to EMail"), - BarIcon("image", KIcon::SizeMedium)); + BarIcon("image", TDEIcon::SizeMedium)); TQVBoxLayout *vlay = new TQVBoxLayout( page_setupImagesList, 0, spacingHint() ); @@ -363,7 +363,7 @@ void SendImagesDialog::setupEmailOptions(void) page_setupEmailOptions = addPage(i18n("Mail"), i18n("Mail Options"), - BarIcon("mail_generic", KIcon::SizeMedium)); + BarIcon("mail_generic", TDEIcon::SizeMedium)); TQVBoxLayout *vlay = new TQVBoxLayout( page_setupEmailOptions, 0, spacingHint() ); diff --git a/kipi-plugins/simpleviewerexport/svedialog.cpp b/kipi-plugins/simpleviewerexport/svedialog.cpp index f6faf78..a001e56 100644 --- a/kipi-plugins/simpleviewerexport/svedialog.cpp +++ b/kipi-plugins/simpleviewerexport/svedialog.cpp @@ -169,7 +169,7 @@ void SVEDialog::writeConfig() void SVEDialog::selectionPage() { m_selectionPage = addPage(i18n("Selection"), i18n("Album Selection"), - BarIcon("folder_image", KIcon::SizeMedium)); + BarIcon("folder_image", TDEIcon::SizeMedium)); TQVBoxLayout *layout = new TQVBoxLayout( m_selectionPage, 0, spacingHint() ); m_imageCollectionSelector = new KIPI::ImageCollectionSelector( m_selectionPage, m_interface ); @@ -179,7 +179,7 @@ void SVEDialog::selectionPage() void SVEDialog::lookPage() { m_lookPage = addPage(i18n("Look"), i18n("Page Look"), - BarIcon("colors", KIcon::SizeMedium)); + BarIcon("colors", TDEIcon::SizeMedium)); TQVBoxLayout *mainLayout = new TQVBoxLayout(m_lookPage, 0, spacingHint()); TQVGroupBox *vgroupbox; @@ -272,7 +272,7 @@ void SVEDialog::lookPage() void SVEDialog::generalPage() { m_generalPage = addPage(i18n("General"), i18n("General Setup"), - BarIcon("html", KIcon::SizeMedium)); + BarIcon("html", TDEIcon::SizeMedium)); TQVBoxLayout *mainLayout = new TQVBoxLayout(m_generalPage, 0, spacingHint()); diff --git a/kipi-plugins/slideshow/toolbar.cpp b/kipi-plugins/slideshow/toolbar.cpp index 2f040f9..8a70951 100644 --- a/kipi-plugins/slideshow/toolbar.cpp +++ b/kipi-plugins/slideshow/toolbar.cpp @@ -51,11 +51,11 @@ ToolBar::ToolBar(TQWidget* parent) m_stopBtn = new TQToolButton(this); m_playBtn->setToggleButton(true); - KIconLoader* loader = kapp->iconLoader(); - m_playBtn->setIconSet(loader->loadIcon("player_pause", KIcon::NoGroup, 22)); - m_prevBtn->setIconSet(loader->loadIcon("back", KIcon::NoGroup, 22)); - m_nextBtn->setIconSet(loader->loadIcon("forward", KIcon::NoGroup, 22)); - m_stopBtn->setIconSet(loader->loadIcon("stop", KIcon::NoGroup, 22)); + TDEIconLoader* loader = kapp->iconLoader(); + m_playBtn->setIconSet(loader->loadIcon("player_pause", TDEIcon::NoGroup, 22)); + m_prevBtn->setIconSet(loader->loadIcon("back", TDEIcon::NoGroup, 22)); + m_nextBtn->setIconSet(loader->loadIcon("forward", TDEIcon::NoGroup, 22)); + m_stopBtn->setIconSet(loader->loadIcon("stop", TDEIcon::NoGroup, 22)); lay->addWidget(m_playBtn); lay->addWidget(m_prevBtn); @@ -129,15 +129,15 @@ void ToolBar::slotPlayBtnToggled() if (m_playBtn->isOn()) { m_canHide = false; - KIconLoader* loader = kapp->iconLoader(); - m_playBtn->setIconSet(loader->loadIcon("player_play", KIcon::NoGroup, 22)); + TDEIconLoader* loader = kapp->iconLoader(); + m_playBtn->setIconSet(loader->loadIcon("player_play", TDEIcon::NoGroup, 22)); emit signalPause(); } else { m_canHide = true; - KIconLoader* loader = kapp->iconLoader(); - m_playBtn->setIconSet(loader->loadIcon("player_pause", KIcon::NoGroup, 22)); + TDEIconLoader* loader = kapp->iconLoader(); + m_playBtn->setIconSet(loader->loadIcon("player_pause", TDEIcon::NoGroup, 22)); emit signalPlay(); } } @@ -148,8 +148,8 @@ void ToolBar::slotNexPrevClicked() { m_playBtn->setOn(true); m_canHide = false; - KIconLoader* loader = kapp->iconLoader(); - m_playBtn->setIconSet(loader->loadIcon("player_play", KIcon::NoGroup, 22)); + TDEIconLoader* loader = kapp->iconLoader(); + m_playBtn->setIconSet(loader->loadIcon("player_play", TDEIcon::NoGroup, 22)); emit signalPause(); } } diff --git a/kipi-plugins/sync/gallerywindow.cpp b/kipi-plugins/sync/gallerywindow.cpp index b7abfcf..84ca881 100644 --- a/kipi-plugins/sync/gallerywindow.cpp +++ b/kipi-plugins/sync/gallerywindow.cpp @@ -267,8 +267,8 @@ void GalleryWindow::slotAlbums( const TQValueList& albumList ) m_photoView->write( "" ); m_photoView->end(); - KIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader(); - TQPixmap pix = iconLoader->loadIcon( "folder", KIcon::NoGroup, 32 ); + TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader(); + TQPixmap pix = iconLoader->loadIcon( "folder", TDEIcon::NoGroup, 32 ); typedef TQValueList GAlbumList; GAlbumList::const_iterator iter; -- cgit v1.2.1