From b97ee238f88e9578da228388210cd8cab5360778 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 4 Feb 2013 14:18:14 -0600 Subject: Rename KIcon to enhance compatibility with KDE4 --- kaddressbook/addresseeeditorwidget.cpp | 26 ++++++++++++------------- kaddressbook/distributionlistentryview.cpp | 2 +- kaddressbook/features/resourceselection.cpp | 4 ++-- kaddressbook/geowidget.cpp | 2 +- kaddressbook/imagewidget.cpp | 2 +- kaddressbook/kcmconfigs/ldapoptionswidget.cpp | 4 ++-- kaddressbook/soundwidget.cpp | 2 +- kaddressbook/viewconfigurewidget.cpp | 4 ++-- kaddressbook/viewmanager.cpp | 2 +- kaddressbook/views/configuretableviewdialog.cpp | 2 +- kaddressbook/views/kaddressbookiconview.cpp | 10 +++++----- kaddressbook/views/kaddressbookiconview.h | 4 ++-- 12 files changed, 32 insertions(+), 32 deletions(-) (limited to 'kaddressbook') diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp index 8cffb0c32..8c98da740 100644 --- a/kaddressbook/addresseeeditorwidget.cpp +++ b/kaddressbook/addresseeeditorwidget.cpp @@ -157,8 +157,8 @@ void AddresseeEditorWidget::setupTab1() // Person icon label = new TQLabel( tab1 ); - label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop, - KIcon::SizeMedium ) ); + label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "personal", TDEIcon::Desktop, + TDEIcon::SizeMedium ) ); layout->addMultiCellWidget( label, 0, 1, 0, 0 ); // First name @@ -213,7 +213,7 @@ void AddresseeEditorWidget::setupTab1() // Phone numbers (upper right) label = new TQLabel( tab1 ); label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "kaddressbook", - KIcon::Desktop, KIcon::SizeMedium ) ); + TDEIcon::Desktop, TDEIcon::SizeMedium ) ); layout->addMultiCellWidget( label, 0, 1, 3, 3 ); mPhoneEditWidget = new PhoneEditWidget( tab1 ); @@ -226,8 +226,8 @@ void AddresseeEditorWidget::setupTab1() ////////////////////////////////////// // Addresses (lower left) label = new TQLabel( tab1 ); - label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "kfm_home", KIcon::Desktop, - KIcon::SizeMedium ) ); + label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "kfm_home", TDEIcon::Desktop, + TDEIcon::SizeMedium ) ); layout->addMultiCellWidget( label, 5, 6, 0, 0 ); mAddressEditWidget = new AddressEditWidget( tab1 ); @@ -237,8 +237,8 @@ void AddresseeEditorWidget::setupTab1() ////////////////////////////////////// // Email / Web (lower right) label = new TQLabel( tab1 ); - label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "email", KIcon::Desktop, - KIcon::SizeMedium ) ); + label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "email", TDEIcon::Desktop, + TDEIcon::SizeMedium ) ); layout->addMultiCellWidget( label, 5, 6, 3, 3 ); mEmailWidget = new EmailEditWidget( tab1 ); @@ -252,8 +252,8 @@ void AddresseeEditorWidget::setupTab1() TQHBoxLayout *homePageLayout = new TQHBoxLayout( 0, 11, 7 ); label = new TQLabel( tab1 ); - label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "homepage", KIcon::Desktop, - KIcon::SizeMedium ) ); + label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "homepage", TDEIcon::Desktop, + TDEIcon::SizeMedium ) ); homePageLayout->addWidget( label ); label = new TQLabel( i18n( ":", "%1:" ).arg( KABC::Addressee::urlLabel() ), tab1 ); @@ -325,8 +325,8 @@ void AddresseeEditorWidget::setupTab2() // Department label = new TQLabel( tab2 ); - label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "folder", KIcon::Desktop, - KIcon::SizeMedium ) ); + label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "folder", TDEIcon::Desktop, + TDEIcon::SizeMedium ) ); layout->addMultiCellWidget( label, 0, 1, 0, 0 ); label = new TQLabel( i18n( "Department:" ), tab2 ); @@ -384,8 +384,8 @@ void AddresseeEditorWidget::setupTab2() // Personal info label = new TQLabel( tab2 ); - label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop, - KIcon::SizeMedium ) ); + label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "personal", TDEIcon::Desktop, + TDEIcon::SizeMedium ) ); layout->addMultiCellWidget( label, 4, 5, 0, 0 ); label = new TQLabel( i18n( "Nickname:" ), tab2 ); diff --git a/kaddressbook/distributionlistentryview.cpp b/kaddressbook/distributionlistentryview.cpp index 3fc16142e..3d50f730e 100644 --- a/kaddressbook/distributionlistentryview.cpp +++ b/kaddressbook/distributionlistentryview.cpp @@ -105,7 +105,7 @@ void KAB::DistributionListEntryView::setEntry( const KPIM::DistributionList& lis TQPixmap pixmap; pixmap.convertFromImage( m_entry.addressee.photo().data() ); - m_imageLabel->setPixmap( pixmap.isNull() ? TDEGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop ) : pixmap ); + m_imageLabel->setPixmap( pixmap.isNull() ? TDEGlobal::iconLoader()->loadIcon( "personal", TDEIcon::Desktop ) : pixmap ); m_addresseeLabel->setText( i18n( "Formatted name, role, organization", "

%1

%2
%3

" ).arg( m_entry.addressee.formattedName(), m_entry.addressee.role(), m_entry.addressee.organization() ) ); m_distListLabel->setURL( m_list.name() ); m_distListLabel->setText( m_list.name() ); diff --git a/kaddressbook/features/resourceselection.cpp b/kaddressbook/features/resourceselection.cpp index 3534bcdb3..d812c4803 100644 --- a/kaddressbook/features/resourceselection.cpp +++ b/kaddressbook/features/resourceselection.cpp @@ -64,7 +64,7 @@ class ResourceItem : public TQCheckListItem mResourceIdentifier() { setOn( resource->isActive() ); - setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "contents", KIcon::Small ) ); + setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "contents", TDEIcon::Small ) ); mChecked = isOn(); } @@ -77,7 +77,7 @@ class ResourceItem : public TQCheckListItem { KPIM::ResourceABC* res = dynamic_cast( mResource ); setOn( res->subresourceActive( mResourceIdentifier ) ); - setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "contents", KIcon::Small ) ); + setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "contents", TDEIcon::Small ) ); mChecked = isOn(); } diff --git a/kaddressbook/geowidget.cpp b/kaddressbook/geowidget.cpp index 27333bf99..8bad2129e 100644 --- a/kaddressbook/geowidget.cpp +++ b/kaddressbook/geowidget.cpp @@ -55,7 +55,7 @@ GeoWidget::GeoWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name label = new TQLabel( this ); label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "package_network", - KIcon::Desktop, KIcon::SizeMedium ) ); + TDEIcon::Desktop, TDEIcon::SizeMedium ) ); label->setAlignment( TQt::AlignTop ); topLayout->addMultiCellWidget( label, 0, 3, 0, 0 ); diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp index 9ba87d46c..a302f1a29 100644 --- a/kaddressbook/imagewidget.cpp +++ b/kaddressbook/imagewidget.cpp @@ -144,7 +144,7 @@ void ImageButton::startDrag() void ImageButton::updateGUI() { if ( mPicture.data().isNull() ) - setPixmap( TDEGlobal::iconLoader()->iconPath( "personal", KIcon::Desktop ) ); + setPixmap( TDEGlobal::iconLoader()->iconPath( "personal", TDEIcon::Desktop ) ); else setPixmap( mPicture.data() ); } diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp index edd805cae..3225b0a2e 100644 --- a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp +++ b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp @@ -275,11 +275,11 @@ void LDAPOptionsWidget::initGUI() TQVBox* upDownBox = new TQVBox( hBox ); upDownBox->setSpacing( 6 ); mUpButton = new TQToolButton( upDownBox, "mUpButton" ); - mUpButton->setIconSet( BarIconSet( "up", KIcon::SizeSmall ) ); + mUpButton->setIconSet( BarIconSet( "up", TDEIcon::SizeSmall ) ); mUpButton->setEnabled( false ); // b/c no item is selected yet mDownButton = new TQToolButton( upDownBox, "mDownButton" ); - mDownButton->setIconSet( BarIconSet( "down", KIcon::SizeSmall ) ); + mDownButton->setIconSet( BarIconSet( "down", TDEIcon::SizeSmall ) ); mDownButton->setEnabled( false ); // b/c no item is selected yet TQWidget* spacer = new TQWidget( upDownBox ); diff --git a/kaddressbook/soundwidget.cpp b/kaddressbook/soundwidget.cpp index f7beaf202..9a110e258 100644 --- a/kaddressbook/soundwidget.cpp +++ b/kaddressbook/soundwidget.cpp @@ -47,7 +47,7 @@ SoundWidget::SoundWidget( KABC::AddressBook *ab, TQWidget *parent, const char *n TQLabel *label = new TQLabel( this ); label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "multimedia", - KIcon::Desktop, KIcon::SizeMedium ) ); + TDEIcon::Desktop, TDEIcon::SizeMedium ) ); label->setAlignment( TQt::AlignTop ); topLayout->addMultiCellWidget( label, 0, 1, 0, 0 ); diff --git a/kaddressbook/viewconfigurewidget.cpp b/kaddressbook/viewconfigurewidget.cpp index f2153f828..5dfe4084b 100644 --- a/kaddressbook/viewconfigurewidget.cpp +++ b/kaddressbook/viewconfigurewidget.cpp @@ -49,7 +49,7 @@ ViewConfigureWidget::ViewConfigureWidget( KABC::AddressBook *ab, TQWidget *paren // Add the first page, the attributes TQVBox *page = addPage( i18n( "Fields" ), TQString(), TDEGlobal::iconLoader()->loadIcon( "view_detailed", - KIcon::Panel ) ); + TDEIcon::Panel ) ); // Add the select fields page mFieldsPage = new ViewConfigureFieldsPage( addressBook(), page ); @@ -57,7 +57,7 @@ ViewConfigureWidget::ViewConfigureWidget( KABC::AddressBook *ab, TQWidget *paren // Add the second page, the filter selection page = addPage( i18n( "Default Filter" ), TQString(), TDEGlobal::iconLoader()->loadIcon( "filter", - KIcon::Panel ) ); + TDEIcon::Panel ) ); mFilterPage = new ViewConfigureFilterPage( page ); } diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp index 51ed14d87..77608225d 100644 --- a/kaddressbook/viewmanager.cpp +++ b/kaddressbook/viewmanager.cpp @@ -497,7 +497,7 @@ void ViewManager::startDrag() } } - drag->setPixmap( TDEGlobal::iconLoader()->loadIcon( "vcard", KIcon::Desktop ) ); + drag->setPixmap( TDEGlobal::iconLoader()->loadIcon( "vcard", TDEIcon::Desktop ) ); drag->dragCopy(); } diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp index 2551be98e..4e478e255 100644 --- a/kaddressbook/views/configuretableviewdialog.cpp +++ b/kaddressbook/views/configuretableviewdialog.cpp @@ -47,7 +47,7 @@ ConfigureTableViewWidget::ConfigureTableViewWidget( KABC::AddressBook *ab, { TQWidget *page = addPage( i18n( "Look & Feel" ), TQString(), TDEGlobal::iconLoader()->loadIcon( "looknfeel", - KIcon::Panel ) ); + TDEIcon::Panel ) ); mPage = new LookAndFeelPage( page ); } diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp index 60bae788c..e5f4ab259 100644 --- a/kaddressbook/views/kaddressbookiconview.cpp +++ b/kaddressbook/views/kaddressbookiconview.cpp @@ -60,7 +60,7 @@ extern "C" { } AddresseeIconView::AddresseeIconView( TQWidget *parent, const char *name ) - : KIconView( parent, name ) + : TDEIconView( parent, name ) { setSelectionMode( TQIconView::Extended ); setResizeMode( TQIconView::Adjust ); @@ -68,7 +68,7 @@ AddresseeIconView::AddresseeIconView( TQWidget *parent, const char *name ) setGridX( 100 ); setItemsMovable( false ); setSorting( true, true ); - setMode( KIconView::Select ); + setMode( TDEIconView::Select ); connect( this, TQT_SIGNAL( dropped( TQDropEvent*, const TQValueList& ) ), this, TQT_SLOT( itemDropped( TQDropEvent*, const TQValueList& ) ) ); @@ -92,12 +92,12 @@ TQDragObject *AddresseeIconView::dragObject() } -class AddresseeIconViewItem : public KIconViewItem +class AddresseeIconViewItem : public TDEIconViewItem { public: AddresseeIconViewItem( const KABC::Field::List&, KABC::AddressBook *doc, const KABC::Addressee &addr, TQIconView *parent ) - : KIconViewItem( parent ), mDocument( doc ), mAddressee( addr ) + : TDEIconViewItem( parent ), mDocument( doc ), mAddressee( addr ) { refresh(); } @@ -112,7 +112,7 @@ class AddresseeIconViewItem : public KIconViewItem setText( mAddressee.givenName() + " " + mAddressee.familyName() ); TQPixmap icon; - TQPixmap defaultIcon( TDEGlobal::iconLoader()->loadIcon( "vcard", KIcon::Desktop ) ); + TQPixmap defaultIcon( TDEGlobal::iconLoader()->loadIcon( "vcard", TDEIcon::Desktop ) ); KABC::Picture pic = mAddressee.photo(); if ( pic.data().isNull() ) pic = mAddressee.logo(); diff --git a/kaddressbook/views/kaddressbookiconview.h b/kaddressbook/views/kaddressbookiconview.h index 56984cfc5..4cf585b35 100644 --- a/kaddressbook/views/kaddressbookiconview.h +++ b/kaddressbook/views/kaddressbookiconview.h @@ -36,7 +36,7 @@ class AddresseeIconViewItem; namespace KABC { class AddressBook; } /** This is an example kaddressbook view that is implemented using -* KIconView. This view is not the most useful view, but it displays +* TDEIconView. This view is not the most useful view, but it displays * how simple implementing a new view can be. */ class KAddressBookIconView : public KAddressBookView @@ -73,7 +73,7 @@ class KAddressBookIconView : public KAddressBookView }; -class AddresseeIconView : public KIconView +class AddresseeIconView : public TDEIconView { Q_OBJECT -- cgit v1.2.1