Rename KIcon to enhance compatibility with KDE4

8 files changed, 19 insertions, 19 deletions

diff --git a/libtdepim/addresseeemailselection.cpp b/libtdepim/addresseeemailselection.cpp
index 817e60327..9cbbeb027 100644
--- a/libtdepim/addresseeemailselection.cpp
+++ b/libtdepim/addresseeemailselection.cpp
@@ -133,7 +133,7 @@ TQPixmap AddresseeEmailSelection::itemIcon( const KABC::Addressee &addressee, ui
   if ( !addressee.photo().data().isNull() )
     return addressee.photo().data().smoothScale( 16, 16 );
   else
-    return TDEGlobal::iconLoader()->loadIcon( "personal", KIcon::Small );
+    return TDEGlobal::iconLoader()->loadIcon( "personal", TDEIcon::Small );
 }
 
 bool AddresseeEmailSelection::itemEnabled( const KABC::Addressee &addressee, uint ) const
@@ -160,7 +160,7 @@ TQString AddresseeEmailSelection::distributionListText( const KABC::Distribution
 
 TQPixmap AddresseeEmailSelection::distributionListIcon( const KABC::DistributionList* ) const
 {
-  return TDEGlobal::iconLoader()->loadIcon( "tdmconfig", KIcon::Small );
+  return TDEGlobal::iconLoader()->loadIcon( "tdmconfig", TDEIcon::Small );
 }
 
 bool AddresseeEmailSelection::distributionListEnabled( const KABC::DistributionList* ) const
diff --git a/libtdepim/addresseeselector.cpp b/libtdepim/addresseeselector.cpp
index a5221c647..082b73c54 100644
--- a/libtdepim/addresseeselector.cpp
+++ b/libtdepim/addresseeselector.cpp
@@ -288,8 +288,8 @@ void AddresseeSelector::initGUI()
 
   int row = 1;
 
-  TQIconSet moveSet = TDEGlobal::iconLoader()->loadIconSet( "next", KIcon::Small );
-  TQIconSet removeSet = TDEGlobal::iconLoader()->loadIconSet( "previous", KIcon::Small );
+  TQIconSet moveSet = TDEGlobal::iconLoader()->loadIconSet( "next", TDEIcon::Small );
+  TQIconSet removeSet = TDEGlobal::iconLoader()->loadIconSet( "previous", TDEIcon::Small );
 
   uint count = mSelection->fieldCount();
   for ( uint i = 0; i < count; ++i, ++row ) {
diff --git a/libtdepim/addresseeview.cpp b/libtdepim/addresseeview.cpp
index 20c06c94d..e2aa2e42c 100644
--- a/libtdepim/addresseeview.cpp
+++ b/libtdepim/addresseeview.cpp
@@ -207,7 +207,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr
     } else if ( !pic.url().isEmpty() ) {
       image = (pic.url().startsWith( "http://" ) || pic.url().startsWith( "https://" ) ? pic.url() : "http://" + pic.url());
     } else {
-      image = "file:" + TDEGlobal::iconLoader()->iconPath( "personal", KIcon::Desktop );
+      image = "file:" + TDEGlobal::iconLoader()->iconPath( "personal", TDEIcon::Desktop );
     }
   }
 
@@ -554,7 +554,7 @@ void AddresseeView::updateView()
       }
     } else {
       TQMimeSourceFactory::defaultFactory()->setPixmap( imageURL,
-        TDEGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop, 128 ) );
+        TDEGlobal::iconLoader()->loadIcon( "personal", TDEIcon::Desktop, 128 ) );
     }
   }
 
diff --git a/libtdepim/addressesdialog.cpp b/libtdepim/addressesdialog.cpp
index 68fd906e3..1a3dc662a 100644
--- a/libtdepim/addressesdialog.cpp
+++ b/libtdepim/addressesdialog.cpp
@@ -105,11 +105,11 @@ AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *parent, const KABC::Add
 
   if ( addr.photo().url().isEmpty() ) {
     if ( addr.photo().data().isNull() )
-      setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "personal", KIcon::Small ) );
+      setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "personal", TDEIcon::Small ) );
     else
       setPixmap( 0, addr.photo().data().smoothScale( 16, 16 ) );
   } else {
-    setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( addr.photo().url(), KIcon::Small ) );
+    setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( addr.photo().url(), TDEIcon::Small ) );
   }
 }
 
@@ -135,7 +135,7 @@ AddresseeViewItem::AddresseeViewItem(  AddresseeViewItem *parent, const TQString
   d = new AddresseeViewItemPrivate;
   d->category = DistList;
 
-  setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "tdmconfig", KIcon::Small ) );
+  setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "tdmconfig", TDEIcon::Small ) );
 }
 
 AddresseeViewItem::~AddresseeViewItem()
diff --git a/libtdepim/completionordereditor.cpp b/libtdepim/completionordereditor.cpp
index 6c31a31e2..8c9f599ff 100644
--- a/libtdepim/completionordereditor.cpp
+++ b/libtdepim/completionordereditor.cpp
@@ -223,12 +223,12 @@ CompletionOrderEditor::CompletionOrderEditor( KPIM::LdapSearch* ldapSearch,
 
   TQVBox* upDownBox = new TQVBox( page );
   mUpButton = new KPushButton( upDownBox, "mUpButton" );
-  mUpButton->setIconSet( BarIconSet( "up", KIcon::SizeSmall ) );
+  mUpButton->setIconSet( BarIconSet( "up", TDEIcon::SizeSmall ) );
   mUpButton->setEnabled( false ); // b/c no item is selected yet
   mUpButton->setFocusPolicy( TQ_StrongFocus );
 
   mDownButton = new KPushButton( upDownBox, "mDownButton" );
-  mDownButton->setIconSet( BarIconSet( "down", KIcon::SizeSmall ) );
+  mDownButton->setIconSet( BarIconSet( "down", TDEIcon::SizeSmall ) );
   mDownButton->setEnabled( false ); // b/c no item is selected yet
   mDownButton->setFocusPolicy( TQ_StrongFocus );
 
diff --git a/libtdepim/kscoringeditor.cpp b/libtdepim/kscoringeditor.cpp
index 0eadb6709..a0ce66f5a 100644
--- a/libtdepim/kscoringeditor.cpp
+++ b/libtdepim/kscoringeditor.cpp
@@ -613,12 +613,12 @@ RuleListWidget::RuleListWidget(KScoringManager *m, bool standalone, TQWidget *p,
 
   TQHBoxLayout *btnL = new TQHBoxLayout( topL, KDialog::spacingHint() );
   mRuleUp = new TQPushButton( this );
-  mRuleUp->setPixmap( BarIcon( "up", KIcon::SizeSmall ) );
+  mRuleUp->setPixmap( BarIcon( "up", TDEIcon::SizeSmall ) );
   TQToolTip::add( mRuleUp, i18n("Move rule up") );
   btnL->addWidget( mRuleUp );
   connect( mRuleUp, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRuleUp() ) );
   mRuleDown = new TQPushButton( this );
-  mRuleDown->setPixmap( BarIcon( "down", KIcon::SizeSmall ) );
+  mRuleDown->setPixmap( BarIcon( "down", TDEIcon::SizeSmall ) );
   TQToolTip::add( mRuleDown, i18n("Move rule down") );
   btnL->addWidget( mRuleDown );
   connect( mRuleDown, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRuleDown() ) );
@@ -626,25 +626,25 @@ RuleListWidget::RuleListWidget(KScoringManager *m, bool standalone, TQWidget *p,
   btnL = new TQHBoxLayout( topL, KDialog::spacingHint() );
   editRule=0L;
   newRule = new TQPushButton(this);
-  newRule->setPixmap( BarIcon( "filenew", KIcon::SizeSmall ) );
+  newRule->setPixmap( BarIcon( "filenew", TDEIcon::SizeSmall ) );
   TQToolTip::add(newRule,i18n("New rule")),
   btnL->addWidget(newRule);
   connect(newRule, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewRule()));
   // if we're standalone, we need an additional edit button
   if (standalone) {
     editRule = new TQPushButton(this);
-    editRule->setIconSet( BarIconSet("edit", KIcon::SizeSmall) );
+    editRule->setIconSet( BarIconSet("edit", TDEIcon::SizeSmall) );
     TQToolTip::add(editRule,i18n("Edit rule"));
     btnL->addWidget(editRule);
     connect(editRule,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotEditRule()));
   }
   delRule = new TQPushButton(this);
-  delRule->setIconSet( BarIconSet( "editdelete", KIcon::SizeSmall ) );
+  delRule->setIconSet( BarIconSet( "editdelete", TDEIcon::SizeSmall ) );
   TQToolTip::add(delRule,i18n("Remove rule"));
   btnL->addWidget(delRule);
   connect(delRule, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDelRule()));
   copyRule = new TQPushButton(this);
-  copyRule->setIconSet(BarIconSet("editcopy", KIcon::SizeSmall));
+  copyRule->setIconSet(BarIconSet("editcopy", TDEIcon::SizeSmall));
   TQToolTip::add(copyRule,i18n("Copy rule"));
   btnL->addWidget(copyRule);
   connect(copyRule, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCopyRule()));
diff --git a/libtdepim/ksubscription.cpp b/libtdepim/ksubscription.cpp
index 5829d63a1..601da0fbb 100644
--- a/libtdepim/ksubscription.cpp
+++ b/libtdepim/ksubscription.cpp
@@ -224,7 +224,7 @@ KSubscription::KSubscription( TQWidget *parent, const TQString &caption,
 
   TQToolButton *clearButton = new TQToolButton( page );
   clearButton->setIconSet( TDEGlobal::iconLoader()->loadIconSet(
-              TDEApplication::reverseLayout() ? "clear_left":"locationbar_erase", KIcon::Small, 0 ) );
+              TDEApplication::reverseLayout() ? "clear_left":"locationbar_erase", TDEIcon::Small, 0 ) );
   filterEdit = new KLineEdit(page);
   TQLabel *l = new TQLabel(filterEdit,i18n("S&earch:"), page);
   connect( clearButton, TQT_SIGNAL( clicked() ), filterEdit, TQT_SLOT( clear() ) );
diff --git a/libtdepim/progressdialog.cpp b/libtdepim/progressdialog.cpp
index 947c0ce89..82a8895d4 100644
--- a/libtdepim/progressdialog.cpp
+++ b/libtdepim/progressdialog.cpp
@@ -260,7 +260,7 @@ ProgressDialog::ProgressDialog( TQWidget* alignWidget, TQWidget* parent, const c
     pbClose->setAutoRaise(true);
     pbClose->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
     pbClose->setFixedSize( 16, 16 );
-    pbClose->setIconSet( TDEGlobal::iconLoader()->loadIconSet( "fileclose", KIcon::Small, 14 ) );
+    pbClose->setIconSet( TDEGlobal::iconLoader()->loadIconSet( "fileclose", TDEIcon::Small, 14 ) );
     TQToolTip::add( pbClose, i18n( "Hide detailed progress window" ) );
     connect(pbClose, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClose()));
     TQWidget* spacer = new TQWidget( rightBox ); // don't let the close button take up all the height