Rename KIcon to enhance compatibility with KDE4

41 files changed, 137 insertions, 137 deletions

diff --git a/kmymoney2/dialogs/kaccountselectdlg.cpp b/kmymoney2/dialogs/kaccountselectdlg.cpp
index 42987ba..c60043b 100644
--- a/kmymoney2/dialogs/kaccountselectdlg.cpp
+++ b/kmymoney2/dialogs/kaccountselectdlg.cpp
@@ -60,22 +60,22 @@ KAccountSelectDlg::KAccountSelectDlg(const KMyMoneyUtils::categoryTypeE accountT
 
   slotReloadWidget();
 
-  KIconLoader* il = TDEGlobal::iconLoader();
+  TDEIconLoader* il = TDEGlobal::iconLoader();
   KGuiItem skipButtonItem( i18n( "&Skip" ),
-                    TQIconSet(il->loadIcon("redo", KIcon::Small, KIcon::SizeSmall)),
+                    TQIconSet(il->loadIcon("redo", TDEIcon::Small, TDEIcon::SizeSmall)),
                     i18n("Skip this transaction"),
                     i18n("Use this to skip importing this transaction and proceed with the next one."));
   m_qbuttonCancel->setGuiItem(skipButtonItem);
 
   KGuiItem createButtenItem( i18n( "&Create..." ),
-                      TQIconSet(il->loadIcon("filenew", KIcon::Small, KIcon::SizeSmall)),
+                      TQIconSet(il->loadIcon("filenew", TDEIcon::Small, TDEIcon::SizeSmall)),
                       i18n("Create a new account/category"),
                       i18n("Use this to add a new account/category to the file"));
   m_createButton->setGuiItem(createButtenItem);
   m_qbuttonOk->setGuiItem(KStdGuiItem::ok());
 
   KGuiItem abortButtenItem( i18n("&Abort" ),
-                    TQIconSet(il->loadIcon("stop", KIcon::Small, KIcon::SizeSmall)),
+                    TQIconSet(il->loadIcon("stop", TDEIcon::Small, TDEIcon::SizeSmall)),
                     i18n("Abort the import operation and dismiss all changes"),
                     i18n("Use this to abort the import. Your financial data will be in the state before you started the QIF import."));
   m_kButtonAbort->setGuiItem(abortButtenItem);
diff --git a/kmymoney2/dialogs/kbackupdlg.cpp b/kmymoney2/dialogs/kbackupdlg.cpp
index d931f90..de1eadd 100644
--- a/kmymoney2/dialogs/kbackupdlg.cpp
+++ b/kmymoney2/dialogs/kbackupdlg.cpp
@@ -50,12 +50,12 @@ KBackupDlg::KBackupDlg( TQWidget* parent,  const char* name/*, bool modal*/)
   readConfig();
 
   // add icons to buttons
-  KIconLoader *il = TDEGlobal::iconLoader();
+  TDEIconLoader *il = TDEGlobal::iconLoader();
   btnOK->setGuiItem(KStdGuiItem::ok());
   btnCancel->setGuiItem(KStdGuiItem::cancel());
 
   KGuiItem chooseButtenItem( i18n("C&hoose..."),
-                    TQIconSet(il->loadIcon("folder", KIcon::Small, KIcon::SizeSmall)),
+                    TQIconSet(il->loadIcon("folder", TDEIcon::Small, TDEIcon::SizeSmall)),
                     i18n("Select mount point"),
                     i18n("Use this to browse to the mount point."));
   chooseButton->setGuiItem(chooseButtenItem);
diff --git a/kmymoney2/dialogs/keditequityentrydlg.cpp b/kmymoney2/dialogs/keditequityentrydlg.cpp
index cb32a64..77aec7c 100644
--- a/kmymoney2/dialogs/keditequityentrydlg.cpp
+++ b/kmymoney2/dialogs/keditequityentrydlg.cpp
@@ -66,14 +66,14 @@ KEditEquityEntryDlg::KEditEquityEntryDlg(const MyMoneySecurity& selectedSecurity
   // kpvPriceHistory->setHistory(m_selectedSecurity.priceHistory());
 
   // add icons to buttons
-  KIconLoader *il = TDEGlobal::iconLoader();
+  TDEIconLoader *il = TDEGlobal::iconLoader();
   btnOK->setGuiItem(KStdGuiItem::ok());
   btnCancel->setGuiItem(KStdGuiItem::cancel());
   btnRemoveEntry->setGuiItem(KStdGuiItem::remove());
   btnAddEntry->setGuiItem(KStdGuiItem::add());
 
   KGuiItem editButtenItem( i18n( "&Edit" ),
-                    TQIconSet(il->loadIcon("edit", KIcon::Small, KIcon::SizeSmall)),
+                    TQIconSet(il->loadIcon("edit", TDEIcon::Small, TDEIcon::SizeSmall)),
                     i18n("Modify the selected entry"),
                     i18n("Change the price information of the selected entry."));
   btnEditEntry->setGuiItem(editButtenItem);
diff --git a/kmymoney2/dialogs/kenterscheduledlg.cpp b/kmymoney2/dialogs/kenterscheduledlg.cpp
index c0f9d7b..daa8428 100644
--- a/kmymoney2/dialogs/kenterscheduledlg.cpp
+++ b/kmymoney2/dialogs/kenterscheduledlg.cpp
@@ -68,8 +68,8 @@ KEnterScheduleDlg::KEnterScheduleDlg(TQWidget *parent, const MyMoneySchedule& sc
 {
   d->m_schedule = schedule;
   d->m_extendedReturnCode = KMyMoneyUtils::Enter;
-  buttonOk->setIconSet(TDEGlobal::iconLoader()->loadIconSet("key_enter", KIcon::NoGroup, KIcon::SizeSmall, true));
-  buttonSkip->setIconSet(TDEGlobal::iconLoader()->loadIconSet("player_fwd", KIcon::NoGroup, KIcon::SizeSmall, true));
+  buttonOk->setIconSet(TDEGlobal::iconLoader()->loadIconSet("key_enter", TDEIcon::NoGroup, TDEIcon::SizeSmall, true));
+  buttonSkip->setIconSet(TDEGlobal::iconLoader()->loadIconSet("player_fwd", TDEIcon::NoGroup, TDEIcon::SizeSmall, true));
   buttonCancel->setGuiItem(KStdGuiItem::cancel());
   buttonHelp->setGuiItem(KStdGuiItem::help());
   buttonIgnore->setHidden(true);
diff --git a/kmymoney2/dialogs/kexportdlg.cpp b/kmymoney2/dialogs/kexportdlg.cpp
index 9a89a95..f87e6b5 100644
--- a/kmymoney2/dialogs/kexportdlg.cpp
+++ b/kmymoney2/dialogs/kexportdlg.cpp
@@ -55,23 +55,23 @@ KExportDlg::KExportDlg(TQWidget *parent)
   loadAccounts();
 
   // load button icons
-  KIconLoader* il = TDEGlobal::iconLoader();
+  TDEIconLoader* il = TDEGlobal::iconLoader();
   m_qbuttonCancel->setGuiItem(KStdGuiItem::cancel());
 
   KGuiItem okButtenItem( i18n( "&Export" ),
-                      TQIconSet(il->loadIcon("fileexport", KIcon::Small, KIcon::SizeSmall)),
+                      TQIconSet(il->loadIcon("fileexport", TDEIcon::Small, TDEIcon::SizeSmall)),
                       i18n("Start operation"),
                       i18n("Use this to start the export operation"));
   m_qbuttonOk->setGuiItem(okButtenItem);
 
   KGuiItem browseButtenItem( i18n( "&Browse..." ),
-                      TQIconSet(il->loadIcon("fileopen", KIcon::Small, KIcon::SizeSmall)),
+                      TQIconSet(il->loadIcon("fileopen", TDEIcon::Small, TDEIcon::SizeSmall)),
                       i18n("Select filename"),
                       i18n("Use this to select a filename to export to"));
   m_qbuttonBrowse->setGuiItem(browseButtenItem);
 
   KGuiItem newButtenItem( i18n( "&New..." ),
-                      TQIconSet(il->loadIcon("filenew", KIcon::Small, KIcon::SizeSmall)),
+                      TQIconSet(il->loadIcon("filenew", TDEIcon::Small, TDEIcon::SizeSmall)),
                       i18n("Create a new profile"),
                       i18n("Use this to open the profile editor"));
   m_profileEditorButton->setGuiItem(newButtenItem);
diff --git a/kmymoney2/dialogs/kimportdlg.cpp b/kmymoney2/dialogs/kimportdlg.cpp
index 874469f..118db29 100644
--- a/kmymoney2/dialogs/kimportdlg.cpp
+++ b/kmymoney2/dialogs/kimportdlg.cpp
@@ -62,21 +62,21 @@ KImportDlg::KImportDlg(TQWidget *parent, const char * name)
   // load button icons
   m_qbuttonCancel->setGuiItem(KStdGuiItem::cancel());
 
-  KIconLoader* il = TDEGlobal::iconLoader();
+  TDEIconLoader* il = TDEGlobal::iconLoader();
   KGuiItem okButtenItem( i18n( "&Import" ),
-                      TQIconSet(il->loadIcon("fileimport", KIcon::Small, KIcon::SizeSmall)),
+                      TQIconSet(il->loadIcon("fileimport", TDEIcon::Small, TDEIcon::SizeSmall)),
                       i18n("Start operation"),
                       i18n("Use this to start the import operation"));
   m_qbuttonOk->setGuiItem(okButtenItem);
 
   KGuiItem browseButtenItem( i18n( "&Browse..." ),
-                      TQIconSet(il->loadIcon("fileopen", KIcon::Small, KIcon::SizeSmall)),
+                      TQIconSet(il->loadIcon("fileopen", TDEIcon::Small, TDEIcon::SizeSmall)),
                       i18n("Select filename"),
                       i18n("Use this to select a filename to export to"));
   m_qbuttonBrowse->setGuiItem(browseButtenItem);
 
   KGuiItem newButtenItem( i18n( "&New..." ),
-                      TQIconSet(il->loadIcon("filenew", KIcon::Small, KIcon::SizeSmall)),
+                      TQIconSet(il->loadIcon("filenew", TDEIcon::Small, TDEIcon::SizeSmall)),
                       i18n("Create a new profile"),
                       i18n("Use this to open the profile editor"));
   m_profileEditorButton->setGuiItem(newButtenItem);
diff --git a/kmymoney2/dialogs/kmymoneypricedlg.cpp b/kmymoney2/dialogs/kmymoneypricedlg.cpp
index 720fbf4..9d55b82 100644
--- a/kmymoney2/dialogs/kmymoneypricedlg.cpp
+++ b/kmymoney2/dialogs/kmymoneypricedlg.cpp
@@ -56,27 +56,27 @@
 KMyMoneyPriceDlg::KMyMoneyPriceDlg(TQWidget* parent, const char *name) :
   KMyMoneyPriceDlgDecl(parent, name)
 {
-  KIconLoader *il = TDEGlobal::iconLoader();
+  TDEIconLoader *il = TDEGlobal::iconLoader();
   KGuiItem removeButtenItem( i18n( "&Delete" ),
-                    TQIconSet(il->loadIcon("delete", KIcon::Small, KIcon::SizeSmall)),
+                    TQIconSet(il->loadIcon("delete", TDEIcon::Small, TDEIcon::SizeSmall)),
                     i18n("Delete this entry"),
                     i18n("Remove this price item from the file"));
   m_deleteButton->setGuiItem(removeButtenItem);
 
   KGuiItem newButtenItem( i18n( "&New" ),
-                    TQIconSet(il->loadIcon("file_new", KIcon::Small, KIcon::SizeSmall)),
+                    TQIconSet(il->loadIcon("file_new", TDEIcon::Small, TDEIcon::SizeSmall)),
                     i18n("Add a new entry"),
                     i18n("Create a new price entry."));
   m_newButton->setGuiItem(newButtenItem);
 
   KGuiItem editButtenItem( i18n( "&Edit" ),
-                    TQIconSet(il->loadIcon("edit", KIcon::Small, KIcon::SizeSmall)),
+                    TQIconSet(il->loadIcon("edit", TDEIcon::Small, TDEIcon::SizeSmall)),
                     i18n("Modify the selected entry"),
                     i18n("Change the details of selected price information."));
   m_editButton->setGuiItem(editButtenItem);
 
   KGuiItem okButtenItem( i18n("&Close" ),
-                    TQIconSet(il->loadIcon("button_ok", KIcon::Small, KIcon::SizeSmall)),
+                    TQIconSet(il->loadIcon("button_ok", TDEIcon::Small, TDEIcon::SizeSmall)),
                     i18n("Close the dialog"),
                     i18n("Use this to close the dialog and return to the application."));
   m_closeButton->setGuiItem(okButtenItem);
diff --git a/kmymoney2/dialogs/kmymoneysplittable.cpp b/kmymoney2/dialogs/kmymoneysplittable.cpp
index 57f1e09..6724cd0 100644
--- a/kmymoney2/dialogs/kmymoneysplittable.cpp
+++ b/kmymoney2/dialogs/kmymoneysplittable.cpp
@@ -94,11 +94,11 @@ kMyMoneySplitTable::kMyMoneySplitTable(TQWidget *parent, const char *name ) :
 
   // setup the context menu
   m_contextMenu = new TDEPopupMenu(this);
-  KIconLoader *il = TDEGlobal::iconLoader();
-  m_contextMenu->insertTitle(il->loadIcon("transaction", KIcon::MainToolbar), i18n("Split Options"));
-  m_contextMenu->insertItem(il->loadIcon("edit", KIcon::Small), i18n("Edit..."), this, TQT_SLOT(slotStartEdit()));
-  m_contextMenuDuplicate = m_contextMenu->insertItem(il->loadIcon("editcopy", KIcon::Small), i18n("Duplicate"), this, TQT_SLOT(slotDuplicateSplit()));
-  m_contextMenuDelete = m_contextMenu->insertItem(il->loadIcon("delete", KIcon::Small),
+  TDEIconLoader *il = TDEGlobal::iconLoader();
+  m_contextMenu->insertTitle(il->loadIcon("transaction", TDEIcon::MainToolbar), i18n("Split Options"));
+  m_contextMenu->insertItem(il->loadIcon("edit", TDEIcon::Small), i18n("Edit..."), this, TQT_SLOT(slotStartEdit()));
+  m_contextMenuDuplicate = m_contextMenu->insertItem(il->loadIcon("editcopy", TDEIcon::Small), i18n("Duplicate"), this, TQT_SLOT(slotDuplicateSplit()));
+  m_contextMenuDelete = m_contextMenu->insertItem(il->loadIcon("delete", TDEIcon::Small),
                         i18n("Delete ..."),
                         this, TQT_SLOT(slotDeleteSplit()));
 
@@ -851,16 +851,16 @@ TQWidget* kMyMoneySplitTable::createEditWidgets(void)
   m_editMemo->setFont(cellFont);
 
   // create buttons for the mouse users
-  KIconLoader *il = TDEGlobal::iconLoader();
+  TDEIconLoader *il = TDEGlobal::iconLoader();
   m_registerButtonFrame = new TQFrame(this, "buttonFrame");
   TQPalette palette = m_registerButtonFrame->palette();
   palette.setColor(TQColorGroup::Background, rowBackgroundColor(m_currentRow+1) );
   m_registerButtonFrame->setPalette(palette);
 
   TQHBoxLayout* l = new TQHBoxLayout(m_registerButtonFrame);
-  m_registerEnterButton = new KPushButton(il->loadIcon("button_ok", KIcon::Small, KIcon::SizeSmall), TQString(), m_registerButtonFrame, "EnterButton");
+  m_registerEnterButton = new KPushButton(il->loadIcon("button_ok", TDEIcon::Small, TDEIcon::SizeSmall), TQString(), m_registerButtonFrame, "EnterButton");
 
-  m_registerCancelButton = new KPushButton(il->loadIcon("button_cancel", KIcon::Small, KIcon::SizeSmall), TQString(), m_registerButtonFrame, "CancelButton");
+  m_registerCancelButton = new KPushButton(il->loadIcon("button_cancel", TDEIcon::Small, TDEIcon::SizeSmall), TQString(), m_registerButtonFrame, "CancelButton");
 
   l->addWidget(m_registerEnterButton);
   l->addWidget(m_registerCancelButton);
diff --git a/kmymoney2/dialogs/knewaccountdlg.cpp b/kmymoney2/dialogs/knewaccountdlg.cpp
index f95ad5e..7f964dc 100644
--- a/kmymoney2/dialogs/knewaccountdlg.cpp
+++ b/kmymoney2/dialogs/knewaccountdlg.cpp
@@ -362,7 +362,7 @@ KNewAccountDlg::KNewAccountDlg(const MyMoneyAccount& account, bool isEditing, bo
     setCaption(title);
 
   // load button icons
-  KIconLoader* il = TDEGlobal::iconLoader();
+  TDEIconLoader* il = TDEGlobal::iconLoader();
   cancelButton->setGuiItem(KStdGuiItem::cancel());
   createButton->setGuiItem(KStdGuiItem::ok());
 
diff --git a/kmymoney2/dialogs/knewloanwizard.cpp b/kmymoney2/dialogs/knewloanwizard.cpp
index e5b16c0..d75072b 100644
--- a/kmymoney2/dialogs/knewloanwizard.cpp
+++ b/kmymoney2/dialogs/knewloanwizard.cpp
@@ -118,23 +118,23 @@ KNewLoanWizard::KNewLoanWizard(TQWidget *parent, const char *name ) :
   m_interestAccountEdit->removeButtons();
 
   // load button icons
-  KIconLoader* il = TDEGlobal::iconLoader();
+  TDEIconLoader* il = TDEGlobal::iconLoader();
   KGuiItem createCategoryButtenItem( i18n( "&Create..." ),
-                      TQIconSet(il->loadIcon("filenew", KIcon::Small, KIcon::SizeSmall)),
+                      TQIconSet(il->loadIcon("filenew", TDEIcon::Small, TDEIcon::SizeSmall)),
                       i18n("Create a new category"),
                       i18n("Use this to open the new account editor"));
   m_createCategoryButton->setGuiItem(createCategoryButtenItem);
   connect(m_createCategoryButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCreateCategory()));
 
   KGuiItem additionalFeeButtenItem( i18n( "&Additional fees..." ),
-                      0, //TQIconSet(il->loadIcon("filenew", KIcon::Small, KIcon::SizeSmall)),
+                      0, //TQIconSet(il->loadIcon("filenew", TDEIcon::Small, TDEIcon::SizeSmall)),
                       i18n("Enter additional fees"),
                       i18n("Use this to add any additional fees other than principal and interest contained in your periodical payments."));
   m_additionalFeeButton->setGuiItem(additionalFeeButtenItem);
   connect(m_additionalFeeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAdditionalFees()));
 
   KGuiItem createAssetButtenItem( i18n( "&Create..." ),
-                      TQIconSet(il->loadIcon("filenew", KIcon::Small, KIcon::SizeSmall)),
+                      TQIconSet(il->loadIcon("filenew", TDEIcon::Small, TDEIcon::SizeSmall)),
                       i18n("Create a new asset account"),
                       i18n("Use this to create a new account to which the initial payment should be made"));
   m_createNewAssetButton->setGuiItem(createAssetButtenItem);
diff --git a/kmymoney2/dialogs/ksecuritylisteditor.cpp b/kmymoney2/dialogs/ksecuritylisteditor.cpp
index 84266e3..72715aa 100644
--- a/kmymoney2/dialogs/ksecuritylisteditor.cpp
+++ b/kmymoney2/dialogs/ksecuritylisteditor.cpp
@@ -63,27 +63,27 @@ KSecurityListEditor::KSecurityListEditor(TQWidget *parent, const char *name) :
   m_listView->setMultiSelection(false);
   m_listView->setAllColumnsShowFocus(true);
 
-  KIconLoader *il = TDEGlobal::iconLoader();
+  TDEIconLoader *il = TDEGlobal::iconLoader();
   KGuiItem removeButtenItem( i18n( "&Delete" ),
-                    TQIconSet(il->loadIcon("delete", KIcon::Small, KIcon::SizeSmall)),
+                    TQIconSet(il->loadIcon("delete", TDEIcon::Small, TDEIcon::SizeSmall)),
                     i18n("Delete this entry"),
                     i18n("Remove this security item from the file"));
   m_deleteButton->setGuiItem(removeButtenItem);
 
   KGuiItem addButtenItem( i18n( "&Add" ),
-                    TQIconSet(il->loadIcon("file_new", KIcon::Small, KIcon::SizeSmall)),
+                    TQIconSet(il->loadIcon("file_new", TDEIcon::Small, TDEIcon::SizeSmall)),
                     i18n("Add a new entry"),
                     i18n("Create a new security entry."));
   m_addButton->setGuiItem(addButtenItem);
 
   KGuiItem editButtenItem( i18n( "&Edit" ),
-                    TQIconSet(il->loadIcon("edit", KIcon::Small, KIcon::SizeSmall)),
+                    TQIconSet(il->loadIcon("edit", TDEIcon::Small, TDEIcon::SizeSmall)),
                     i18n("Modify the selected entry"),
                     i18n("Change the security information of the selected entry."));
   m_editButton->setGuiItem(editButtenItem);
 
   KGuiItem okButtenItem( i18n("&Close" ),
-                    TQIconSet(il->loadIcon("button_ok", KIcon::Small, KIcon::SizeSmall)),
+                    TQIconSet(il->loadIcon("button_ok", TDEIcon::Small, TDEIcon::SizeSmall)),
                     i18n("Close the dialog"),
                     i18n("Use this to close the dialog and return to the application."));
   m_closeButton->setGuiItem(okButtenItem);
diff --git a/kmymoney2/dialogs/ksplittransactiondlg.cpp b/kmymoney2/dialogs/ksplittransactiondlg.cpp
index bf30d61..eb8b867 100644
--- a/kmymoney2/dialogs/ksplittransactiondlg.cpp
+++ b/kmymoney2/dialogs/ksplittransactiondlg.cpp
@@ -72,17 +72,17 @@ KSplitTransactionDlg::KSplitTransactionDlg(const MyMoneyTransaction& t,
   m_calculatedValue(calculatedValue)
 {
   // add icons to buttons
-  KIconLoader *il = TDEGlobal::iconLoader();
+  TDEIconLoader *il = TDEGlobal::iconLoader();
 
   KGuiItem clearButtenItem( i18n( "Clear &All" ),
-                    TQIconSet(il->loadIcon("edittrash", KIcon::Small, KIcon::SizeSmall)),
+                    TQIconSet(il->loadIcon("edittrash", TDEIcon::Small, TDEIcon::SizeSmall)),
                     i18n("Clear all splits"),
                     i18n("Use this to clear all splits of this transaction"));
   clearAllBtn->setGuiItem(clearButtenItem);
 
 
   KGuiItem mergeButtenItem( i18n( "&Merge" ),
-                             TQIconSet(il->loadIcon("math_sum", KIcon::Small, KIcon::SizeSmall)),
+                             TQIconSet(il->loadIcon("math_sum", TDEIcon::Small, TDEIcon::SizeSmall)),
                                       "", "");
   mergeBtn->setGuiItem(mergeButtenItem);
 
diff --git a/kmymoney2/dialogs/kstartdlg.cpp b/kmymoney2/dialogs/kstartdlg.cpp
index c781479..a5cdb21 100644
--- a/kmymoney2/dialogs/kstartdlg.cpp
+++ b/kmymoney2/dialogs/kstartdlg.cpp
@@ -70,10 +70,10 @@ KStartDlg::~KStartDlg()
 /** Set the font  Page of the preferences dialog */
 void KStartDlg::setPage_Template()
 {
-  KIconLoader *ic = TDEGlobal::iconLoader();
+  TDEIconLoader *ic = TDEGlobal::iconLoader();
   templateMainFrame = addVBoxPage( i18n("Templates"), i18n("Select templates"), DesktopIcon("wizard"));
-  view_wizard = new KIconView( templateMainFrame, "view_options" );
-  (void)new TQIconViewItem( view_wizard, i18n("New KMyMoney document"), ic->loadIcon("mime_empty.png", KIcon::Desktop, KIcon::SizeLarge)/*TQPixmap( locate("icon","hicolor/48x48/mimetypes/mime_empty.png") )*/ );
+  view_wizard = new TDEIconView( templateMainFrame, "view_options" );
+  (void)new TQIconViewItem( view_wizard, i18n("New KMyMoney document"), ic->loadIcon("mime_empty.png", TDEIcon::Desktop, TDEIcon::SizeLarge)/*TQPixmap( locate("icon","hicolor/48x48/mimetypes/mime_empty.png") )*/ );
   connect(view_wizard, TQT_SIGNAL(executed(TQIconViewItem *) ), this, TQT_SLOT(slotTemplateClicked(TQIconViewItem *) ) );
   connect(view_wizard, TQT_SIGNAL(selectionChanged(TQIconViewItem*)),
     this, TQT_SLOT(slotTemplateSelectionChanged(TQIconViewItem*)));
@@ -97,11 +97,11 @@ void KStartDlg::setPage_Documents()
   TQLabel *label1 = new TQLabel( recentMainFrame, "label1" );
   label1->setText( i18n("Recent Files") );
   mainLayout->addWidget( label1 );
-  view_recent = new KIconView( recentMainFrame, "view_recent" );
+  view_recent = new TDEIconView( recentMainFrame, "view_recent" );
   connect( view_recent, TQT_SIGNAL( executed(TQIconViewItem *) ), this, TQT_SLOT( slotRecentClicked(TQIconViewItem *) ) );
   mainLayout->addWidget( view_recent );
-  view_recent->setArrangement(KIconView::LeftToRight/*TopToBottom*/);
-  view_recent->setItemTextPos(KIconView::Bottom);
+  view_recent->setArrangement(TDEIconView::LeftToRight/*TopToBottom*/);
+  view_recent->setItemTextPos(TDEIconView::Bottom);
 
   connect(view_recent, TQT_SIGNAL(selectionChanged(TQIconViewItem*)),
     this, TQT_SLOT(slotRecentSelectionChanged(TQIconViewItem*)));
@@ -129,7 +129,7 @@ void KStartDlg::readConfig()
   unsigned int i = 1;
 
   TDEConfig *config = TDEGlobal::config();
-  KIconLoader *il = TDEGlobal::iconLoader();
+  TDEIconLoader *il = TDEGlobal::iconLoader();
 
   // read file list
   do {
@@ -142,7 +142,7 @@ void KStartDlg::readConfig()
     if( !value.isNull() && fileExists(value) )
     {
       TQString file_name = value.mid(value.findRev('/')+1);
-      (void)new TDERecentFileItem( value, view_recent, file_name, il->loadIcon("kmy", KIcon::Desktop, KIcon::SizeLarge));
+      (void)new TDERecentFileItem( value, view_recent, file_name, il->loadIcon("kmy", TDEIcon::Desktop, TDEIcon::SizeLarge));
     }
     i++;
   } while( !value.isNull() );
diff --git a/kmymoney2/dialogs/kstartdlg.h b/kmymoney2/dialogs/kstartdlg.h
index 4a4c9dd..463cd53 100644
--- a/kmymoney2/dialogs/kstartdlg.h
+++ b/kmymoney2/dialogs/kstartdlg.h
@@ -58,8 +58,8 @@ private: // Private methods
   void writeConfig();
   /** Read config window */
   void readConfig();
-  KIconView *view_wizard;
-  KIconView *view_recent;
+  TDEIconView *view_wizard;
+  TDEIconView *view_recent;
   KURLRequester *kurlrequest;
   /** misc variables */
   bool isnewfile;
diff --git a/kmymoney2/dialogs/mymoneyqifprofileeditor.cpp b/kmymoney2/dialogs/mymoneyqifprofileeditor.cpp
index 742b32c..5a2ebb6 100644
--- a/kmymoney2/dialogs/mymoneyqifprofileeditor.cpp
+++ b/kmymoney2/dialogs/mymoneyqifprofileeditor.cpp
@@ -90,9 +90,9 @@ MyMoneyQifProfileEditor::MyMoneyQifProfileEditor(const bool edit, TQWidget *pare
   loadProfileListFromConfig();
 
   // load button icons
-  KIconLoader* il = TDEGlobal::iconLoader();
+  TDEIconLoader* il = TDEGlobal::iconLoader();
   KGuiItem newButtenItem( i18n( "&New" ),
-                      TQIconSet(il->loadIcon("filenew", KIcon::Small, KIcon::SizeSmall)),
+                      TQIconSet(il->loadIcon("filenew", TDEIcon::Small, TDEIcon::SizeSmall)),
                       i18n("Create a new profile"),
                       i18n("Use this to create a new QIF import/export profile"));
   m_newButton->setGuiItem(newButtenItem);
diff --git a/kmymoney2/dialogs/settings/ksettingshome.cpp b/kmymoney2/dialogs/settings/ksettingshome.cpp
index 3ef5e51..8eb85e5 100644
--- a/kmymoney2/dialogs/settings/ksettingshome.cpp
+++ b/kmymoney2/dialogs/settings/ksettingshome.cpp
@@ -47,13 +47,13 @@ KSettingsHome::KSettingsHome(TQWidget* parent, const char* name) :
   m_homePageList->header()->hide();
   m_homePageList->setAllColumnsShowFocus(true);
 
-  KIconLoader* il = TDEGlobal::iconLoader();
+  TDEIconLoader* il = TDEGlobal::iconLoader();
   KGuiItem upButtonItem( i18n( "&Up" ),
-                    TQIconSet(il->loadIcon("up", KIcon::Small, KIcon::SizeSmall)),
+                    TQIconSet(il->loadIcon("up", TDEIcon::Small, TDEIcon::SizeSmall)),
                     i18n("Move selected item up"),
                     i18n("Use this to move the selected item up by one position in the list."));
   KGuiItem downButtonItem( i18n( "&Down" ),
-                    TQIconSet(il->loadIcon("down", KIcon::Small, KIcon::SizeSmall)),
+                    TQIconSet(il->loadIcon("down", TDEIcon::Small, TDEIcon::SizeSmall)),
                     i18n("Move selected item down"),
                     i18n("Use this to move the selected item down by one position in the list."));
 
diff --git a/kmymoney2/dialogs/settings/ksettingsonlinequotes.cpp b/kmymoney2/dialogs/settings/ksettingsonlinequotes.cpp
index 0262e78..6afa4f4 100644
--- a/kmymoney2/dialogs/settings/ksettingsonlinequotes.cpp
+++ b/kmymoney2/dialogs/settings/ksettingsonlinequotes.cpp
@@ -48,21 +48,21 @@ KSettingsOnlineQuotes::KSettingsOnlineQuotes(TQWidget *parent, const char *name
 
   m_updateButton->setEnabled(false);
 
-  KIconLoader* il = TDEGlobal::iconLoader();
+  TDEIconLoader* il = TDEGlobal::iconLoader();
   KGuiItem updateButtenItem( i18n("&Update" ),
-                    TQIconSet(il->loadIcon("button_ok", KIcon::Small, KIcon::SizeSmall)),
+                    TQIconSet(il->loadIcon("button_ok", TDEIcon::Small, TDEIcon::SizeSmall)),
                     i18n("Accepts the entered data and stores it"),
                     i18n("Use this to accept the modified data."));
   m_updateButton->setGuiItem(updateButtenItem);
 
   KGuiItem deleteButtenItem( i18n( "&Delete" ),
-                      TQIconSet(il->loadIcon("editdelete", KIcon::Small, KIcon::SizeSmall)),
+                      TQIconSet(il->loadIcon("editdelete", TDEIcon::Small, TDEIcon::SizeSmall)),
                       i18n("Delete the selected source entry"),
                       i18n("Use this to delete the selected online source entry"));
   m_deleteButton->setGuiItem(deleteButtenItem);
 
   KGuiItem newButtenItem( i18n( "&New..." ),
-                      TQIconSet(il->loadIcon("filenew", KIcon::Small, KIcon::SizeSmall)),
+                      TQIconSet(il->loadIcon("filenew", TDEIcon::Small, TDEIcon::SizeSmall)),
                       i18n("Create a new source entry for online quotes"),
                       i18n("Use this to create a new entry for online quotes"));
   m_newButton->setGuiItem(newButtenItem);
diff --git a/kmymoney2/dialogs/transactioneditor.cpp b/kmymoney2/dialogs/transactioneditor.cpp
index fd5b1de..eb6c7c7 100644
--- a/kmymoney2/dialogs/transactioneditor.cpp
+++ b/kmymoney2/dialogs/transactioneditor.cpp
@@ -601,13 +601,13 @@ bool TransactionEditor::enterTransactions(TQString& newId, bool askForSchedule,
           bool enter = true;
           if(askForSchedule && (*it_ts).postDate() > TQDate::currentDate()) {
             KGuiItem enterItem;
-            KIconLoader* il = TDEGlobal::iconLoader();
+            TDEIconLoader* il = TDEGlobal::iconLoader();
             KGuiItem enterButton( i18n("&Enter" ),
-                    TQIconSet(il->loadIcon("kontact_journal", KIcon::Small, KIcon::SizeSmall)),
+                    TQIconSet(il->loadIcon("kontact_journal", TDEIcon::Small, TDEIcon::SizeSmall)),
                     i18n("Accepts the entered data and stores it"),
                     i18n("Use this to enter the transaction into the ledger."));
             KGuiItem scheduleButton( i18n("&Schedule" ),
-                    TQIconSet(il->loadIcon("kontact_date", KIcon::Small, KIcon::SizeSmall)),
+                    TQIconSet(il->loadIcon("kontact_date", TDEIcon::Small, TDEIcon::SizeSmall)),
                     i18n("Accepts the entered data and stores it as schedule"),
                     i18n("Use this to schedule the transaction for later entry into the ledger."));
 
diff --git a/kmymoney2/kmymoney2.cpp b/kmymoney2/kmymoney2.cpp
index 6414a77..6605c82 100644
--- a/kmymoney2/kmymoney2.cpp
+++ b/kmymoney2/kmymoney2.cpp
@@ -369,8 +369,8 @@ void KMyMoney2App::initActions(void)
 #endif
   new TDEAction(i18n("Map to online account"), "news_subscribe", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountMapOnline()), actionCollection(), "account_online_map");
   new TDEAction(i18n("Unmap account"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountUnmapOnline()), actionCollection(), "account_online_unmap");
-  TDEActionMenu* menu = new TDEActionMenu(i18n("Update"), TQIconSet(TDEGlobal::iconLoader()->loadIcon("reload", KIcon::Small,
-                                      KIcon::SizeSmall)), actionCollection(), "account_online_update_menu");
+  TDEActionMenu* menu = new TDEActionMenu(i18n("Update"), TQIconSet(TDEGlobal::iconLoader()->loadIcon("reload", TDEIcon::Small,
+                                      TDEIcon::SizeSmall)), actionCollection(), "account_online_update_menu");
   // activating the menu button is the same as selecting the current account
   connect( menu, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT(slotAccountUpdateOnline()));
   menu->insert(new TDEAction(i18n("Update account..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountUpdateOnline()), actionCollection(), "account_online_update"));
diff --git a/kmymoney2/kmymoneyutils.cpp b/kmymoney2/kmymoneyutils.cpp
index 34bf045..ef2fe74 100644
--- a/kmymoney2/kmymoneyutils.cpp
+++ b/kmymoney2/kmymoneyutils.cpp
@@ -141,10 +141,10 @@ const TQString KMyMoneyUtils::scheduleTypeToString(MyMoneySchedule::typeE type)
 
 KGuiItem KMyMoneyUtils::scheduleNewGuiItem(void)
 {
-  KIconLoader *ic = TDEGlobal::iconLoader();
+  TDEIconLoader *ic = TDEGlobal::iconLoader();
 
   KGuiItem splitGuiItem(  i18n("&New Schedule..."),
-                          TQIconSet(ic->loadIcon("filenew", KIcon::Small, KIcon::SizeSmall)),
+                          TQIconSet(ic->loadIcon("filenew", TDEIcon::Small, TDEIcon::SizeSmall)),
                           i18n("Create a new schedule."),
                           i18n("Use this to create a new schedule."));
 
@@ -153,10 +153,10 @@ KGuiItem KMyMoneyUtils::scheduleNewGuiItem(void)
 
 KGuiItem KMyMoneyUtils::accountsFilterGuiItem(void)
 {
-  KIconLoader *ic = TDEGlobal::iconLoader();
+  TDEIconLoader *ic = TDEGlobal::iconLoader();
 
   KGuiItem splitGuiItem(  i18n("&Filter"),
-                          TQIconSet(ic->loadIcon("filter", KIcon::Small, KIcon::SizeSmall)),
+                          TQIconSet(ic->loadIcon("filter", TDEIcon::Small, TDEIcon::SizeSmall)),
                           i18n("Filter out accounts"),
                           i18n("Use this to filter out accounts"));
 
@@ -165,26 +165,26 @@ KGuiItem KMyMoneyUtils::accountsFilterGuiItem(void)
 
 TQPixmap KMyMoneyUtils::billScheduleIcon(int size)
 {
-  KIconLoader *ic = TDEGlobal::iconLoader();
-  return ic->loadIcon("billschedule", KIcon::User, size);
+  TDEIconLoader *ic = TDEGlobal::iconLoader();
+  return ic->loadIcon("billschedule", TDEIcon::User, size);
 }
 
 TQPixmap KMyMoneyUtils::depositScheduleIcon(int size)
 {
-  KIconLoader *ic = TDEGlobal::iconLoader();
-  return ic->loadIcon("depositschedule", KIcon::User, size);
+  TDEIconLoader *ic = TDEGlobal::iconLoader();
+  return ic->loadIcon("depositschedule", TDEIcon::User, size);
 }
 
 TQPixmap KMyMoneyUtils::transferScheduleIcon(int size)
 {
-  KIconLoader *ic = TDEGlobal::iconLoader();
-  return ic->loadIcon("transferschedule", KIcon::User, size);
+  TDEIconLoader *ic = TDEGlobal::iconLoader();
+  return ic->loadIcon("transferschedule", TDEIcon::User, size);
 }
 
 TQPixmap KMyMoneyUtils::scheduleIcon(int size)
 {
-  KIconLoader *ic = TDEGlobal::iconLoader();
-  return ic->loadIcon("schedule", KIcon::User, size);
+  TDEIconLoader *ic = TDEGlobal::iconLoader();
+  return ic->loadIcon("schedule", TDEIcon::User, size);
 }
 
 const char* homePageItems[] = {
diff --git a/kmymoney2/views/kaccountsview.cpp b/kmymoney2/views/kaccountsview.cpp
index 9e7d596..1dbced9 100644
--- a/kmymoney2/views/kaccountsview.cpp
+++ b/kmymoney2/views/kaccountsview.cpp
@@ -44,7 +44,7 @@
 
 
 KMyMoneyAccountIconItem::KMyMoneyAccountIconItem(TQIconView *parent, const MyMoneyAccount& account) :
-  KIconViewItem(parent, account.name()),
+  TDEIconViewItem(parent, account.name()),
   m_account(account),
   m_reconcileFlag(false)
 {
@@ -82,13 +82,13 @@ KAccountsView::KAccountsView(TQWidget *parent, const char *name) :
   }
 
   // setup icons for collapse and expand button
-  KIconLoader *ic = TDEGlobal::iconLoader();
+  TDEIconLoader *ic = TDEGlobal::iconLoader();
   KGuiItem collapseGuiItem("",
-                          TQIconSet(ic->loadIcon("viewmag-", KIcon::Small, KIcon::SizeSmall)),
+                          TQIconSet(ic->loadIcon("viewmag-", TDEIcon::Small, TDEIcon::SizeSmall)),
                           TQString(),
                           TQString());
   KGuiItem expandGuiItem("",
-                          TQIconSet(ic->loadIcon("viewmag+", KIcon::Small, KIcon::SizeSmall)),
+                          TQIconSet(ic->loadIcon("viewmag+", TDEIcon::Small, TDEIcon::SizeSmall)),
                           TQString(),
                           TQString());
   m_collapseButton->setGuiItem(collapseGuiItem);
diff --git a/kmymoney2/views/kaccountsview.h b/kmymoney2/views/kaccountsview.h
index 96c547a..892af17 100644
--- a/kmymoney2/views/kaccountsview.h
+++ b/kmymoney2/views/kaccountsview.h
@@ -43,16 +43,16 @@ class TDEListViewSearchLineWidget;
   * This class represents an item in the account icon view. It is used
   * by the KAccountsView to select between the accounts using icons.
   */
-class KMyMoneyAccountIconItem : public KIconViewItem
+class KMyMoneyAccountIconItem : public TDEIconViewItem
 {
 public:
   /**
     * Constructor to be used to construct an account icon object.
     *
-    * @param parent pointer to the KIconView object this entry should be
+    * @param parent pointer to the TDEIconView object this entry should be
     *               added to.
     * @param account const reference to MyMoneyAccount for which
-    *               the KIconView entry is constructed
+    *               the TDEIconView entry is constructed
     */
   KMyMoneyAccountIconItem(TQIconView *parent, const MyMoneyAccount& account);
   ~KMyMoneyAccountIconItem();
diff --git a/kmymoney2/views/kaccountsviewdecl.ui b/kmymoney2/views/kaccountsviewdecl.ui
index a8182a5..3aa073e 100644
--- a/kmymoney2/views/kaccountsviewdecl.ui
+++ b/kmymoney2/views/kaccountsviewdecl.ui
@@ -107,7 +107,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="KIconView">
+                    <widget class="TDEIconView">
                         <property name="name">
                             <cstring>m_accountIcons</cstring>
                         </property>
diff --git a/kmymoney2/views/kbudgetview.cpp b/kmymoney2/views/kbudgetview.cpp
index 2a09ac9..cb3049b 100644
--- a/kmymoney2/views/kbudgetview.cpp
+++ b/kmymoney2/views/kbudgetview.cpp
@@ -103,37 +103,37 @@ KBudgetView::KBudgetView(TQWidget *parent, const char *name ) :
   m_accountTree->setSorting(-1);
   m_budgetList->setSorting(0);
 
-  KIconLoader* il = TDEGlobal::iconLoader();
+  TDEIconLoader* il = TDEGlobal::iconLoader();
   KGuiItem newButtenItem( TQString(""),
-                             TQIconSet(il->loadIcon("file_new", KIcon::Small, KIcon::SizeSmall)),
+                             TQIconSet(il->loadIcon("file_new", TDEIcon::Small, TDEIcon::SizeSmall)),
                              i18n("Creates a new budget"),
                              i18n("Use this to create a new empty budget."));
   m_newButton->setGuiItem(newButtenItem);
   TQToolTip::add(m_newButton, newButtenItem.toolTip());
 
   KGuiItem renameButtenItem( TQString(""),
-                          TQIconSet(il->loadIcon("editpaste", KIcon::Small, KIcon::SizeSmall)),
+                          TQIconSet(il->loadIcon("editpaste", TDEIcon::Small, TDEIcon::SizeSmall)),
                           i18n("Rename the current selected budget"),
                           i18n("Use this to start renaming the selected budget."));
   m_renameButton->setGuiItem(renameButtenItem);
   TQToolTip::add(m_renameButton, renameButtenItem.toolTip());
 
   KGuiItem deleteButtenItem( TQString(""),
-                             TQIconSet(il->loadIcon("editdelete", KIcon::Small, KIcon::SizeSmall)),
+                             TQIconSet(il->loadIcon("editdelete", TDEIcon::Small, TDEIcon::SizeSmall)),
                              i18n("Delete the current selected budget"),
                              i18n("Use this to delete the selected budget."));
   m_deleteButton->setGuiItem(deleteButtenItem);
   TQToolTip::add(m_deleteButton, deleteButtenItem.toolTip());
 
   KGuiItem updateButtenItem( TQString(""),
-                             TQIconSet(il->loadIcon("button_ok", KIcon::Small, KIcon::SizeSmall)),
+                             TQIconSet(il->loadIcon("button_ok", TDEIcon::Small, TDEIcon::SizeSmall)),
                              i18n("Accepts the entered values and stores the budget"),
                              i18n("Use this to store the modified data."));
   m_updateButton->setGuiItem(updateButtenItem);
   TQToolTip::add(m_updateButton, updateButtenItem.toolTip());
 
   KGuiItem resetButtenItem( TQString(""),
-                             TQIconSet(il->loadIcon("undo", KIcon::Small, KIcon::SizeSmall)),
+                             TQIconSet(il->loadIcon("undo", TDEIcon::Small, TDEIcon::SizeSmall)),
                              i18n("Revert budget to last saved state"),
                              i18n("Use this to discard the modified data."));
   m_resetButton->setGuiItem(resetButtenItem);
diff --git a/kmymoney2/views/kcategoriesview.cpp b/kmymoney2/views/kcategoriesview.cpp
index 93e9acb..1c08e62 100644
--- a/kmymoney2/views/kcategoriesview.cpp
+++ b/kmymoney2/views/kcategoriesview.cpp
@@ -61,13 +61,13 @@ KCategoriesView::KCategoriesView(TQWidget *parent, const char *name ) :
   }
 
   // setup icons for collapse and expand button
-  KIconLoader *ic = TDEGlobal::iconLoader();
+  TDEIconLoader *ic = TDEGlobal::iconLoader();
   KGuiItem collapseGuiItem("",
-                          TQIconSet(ic->loadIcon("viewmag-", KIcon::Small, KIcon::SizeSmall)),
+                          TQIconSet(ic->loadIcon("viewmag-", TDEIcon::Small, TDEIcon::SizeSmall)),
                           TQString(),
                           TQString());
   KGuiItem expandGuiItem("",
-                          TQIconSet(ic->loadIcon("viewmag+", KIcon::Small, KIcon::SizeSmall)),
+                          TQIconSet(ic->loadIcon("viewmag+", TDEIcon::Small, TDEIcon::SizeSmall)),
                           TQString(),
                           TQString());
   m_collapseButton->setGuiItem(collapseGuiItem);
diff --git a/kmymoney2/views/kgloballedgerview.cpp b/kmymoney2/views/kgloballedgerview.cpp
index 6e1e052..0ea4fe3 100644
--- a/kmymoney2/views/kgloballedgerview.cpp
+++ b/kmymoney2/views/kgloballedgerview.cpp
@@ -170,8 +170,8 @@ TDEGlobalLedgerView::TDEGlobalLedgerView(TQWidget *parent, const char *name )
   // the account button at the right of the toolbar
   // I leave the code commented here for a while, so that I see
   // how I can add other  widgets at this point
-  KIconLoader *il = TDEGlobal::iconLoader();
-  m_toolbar->insertButton(il->loadIcon("document", KIcon::Small, KIcon::SizeSmall),
+  TDEIconLoader *il = TDEGlobal::iconLoader();
+  m_toolbar->insertButton(il->loadIcon("document", TDEIcon::Small, TDEIcon::SizeSmall),
                         1,true,i18n("Account"));
   //m_toolbar->setMaximumSize(50,20);
   m_toolbar->alignItemRight(1);
diff --git a/kmymoney2/views/khomeview.cpp b/kmymoney2/views/khomeview.cpp
index a380120..23937c5 100644
--- a/kmymoney2/views/khomeview.cpp
+++ b/kmymoney2/views/khomeview.cpp
@@ -641,8 +641,8 @@ void KHomeView::showPaymentEntry(const MyMoneySchedule& sched, int cnt)
         MyMoneySplit sp = t.splitByAccount(acc.id(), true);
 
         TQString pathEnter, pathSkip;
-        TDEGlobal::iconLoader()->loadIcon("key_enter", KIcon::Small, KIcon::SizeSmall, KIcon::DefaultState, &pathEnter);
-        TDEGlobal::iconLoader()->loadIcon("player_fwd", KIcon::Small, KIcon::SizeSmall, KIcon::DefaultState, &pathSkip);
+        TDEGlobal::iconLoader()->loadIcon("key_enter", TDEIcon::Small, TDEIcon::SizeSmall, TDEIcon::DefaultState, &pathEnter);
+        TDEGlobal::iconLoader()->loadIcon("player_fwd", TDEIcon::Small, TDEIcon::SizeSmall, TDEIcon::DefaultState, &pathSkip);
 
         //show payment date
         tmp = TQString("<td>") +
diff --git a/kmymoney2/views/kpayeesview.cpp b/kmymoney2/views/kpayeesview.cpp
index f295dc5..a4cbcf4 100644
--- a/kmymoney2/views/kpayeesview.cpp
+++ b/kmymoney2/views/kpayeesview.cpp
@@ -364,9 +364,9 @@ KPayeesView::KPayeesView(TQWidget *parent, const char *name ) :
   labelDefaultAccount->setEnabled(false);
   comboDefaultAccount->setEnabled(false);
 
-  KIconLoader* il = TDEGlobal::iconLoader();
+  TDEIconLoader* il = TDEGlobal::iconLoader();
   KGuiItem updateButtenItem( i18n("Update"),
-                    TQIconSet(il->loadIcon("button_ok", KIcon::Small, KIcon::SizeSmall)),
+                    TQIconSet(il->loadIcon("button_ok", TDEIcon::Small, TDEIcon::SizeSmall)),
                     i18n("Accepts the entered data and stores it"),
                     i18n("Use this to accept the modified data."));
   m_updateButton->setGuiItem(updateButtenItem);
diff --git a/kmymoney2/views/kscheduledlistitem.cpp b/kmymoney2/views/kscheduledlistitem.cpp
index c1bf126..d509521 100644
--- a/kmymoney2/views/kscheduledlistitem.cpp
+++ b/kmymoney2/views/kscheduledlistitem.cpp
@@ -56,7 +56,7 @@ KScheduledListItem::KScheduledListItem(KScheduledListItem *parent, const MyMoney
 {
   m_schedule = schedule;
   m_sortKey = schedule.name();
-  setPixmap(0, KMyMoneyUtils::scheduleIcon(KIcon::Small));
+  setPixmap(0, KMyMoneyUtils::scheduleIcon(TDEIcon::Small));
 
   try
   {
diff --git a/kmymoney2/views/kscheduledview.cpp b/kmymoney2/views/kscheduledview.cpp
index c5aff20..ed52339 100644
--- a/kmymoney2/views/kscheduledview.cpp
+++ b/kmymoney2/views/kscheduledview.cpp
@@ -94,9 +94,9 @@ KScheduledView::KScheduledView(TQWidget *parent, const char *name ) :
   m_qbuttonNew->setGuiItem(KMyMoneyUtils::scheduleNewGuiItem());
   m_accountsCombo->setGuiItem(KMyMoneyUtils::accountsFilterGuiItem());
 
-  KIconLoader *il = TDEGlobal::iconLoader();
-  m_tabWidget->setTabIconSet(m_listTab, TQIconSet(il->loadIcon("contents", KIcon::Small, KIcon::SizeSmall)));
-  m_tabWidget->setTabIconSet(m_calendarTab, TQIconSet(il->loadIcon("calendartab", KIcon::User, KIcon::SizeSmall)));
+  TDEIconLoader *il = TDEGlobal::iconLoader();
+  m_tabWidget->setTabIconSet(m_listTab, TQIconSet(il->loadIcon("contents", TDEIcon::Small, TDEIcon::SizeSmall)));
+  m_tabWidget->setTabIconSet(m_calendarTab, TQIconSet(il->loadIcon("calendartab", TDEIcon::User, TDEIcon::SizeSmall)));
 
   connect(m_qlistviewScheduled, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
     this, TQT_SLOT(slotListViewContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
@@ -168,10 +168,10 @@ void KScheduledView::refresh(bool full, const TQString& schedId)
     if (scheduledItems.count() == 0)
       return;
 
-    KScheduledListItem *itemBills = new KScheduledListItem(m_qlistviewScheduled, i18n("Bills"), KMyMoneyUtils::billScheduleIcon(KIcon::Small), "0");
-    KScheduledListItem *itemDeposits = new KScheduledListItem(m_qlistviewScheduled, i18n("Deposits"), KMyMoneyUtils::depositScheduleIcon(KIcon::Small), "1");
-    KScheduledListItem *itemLoans = new KScheduledListItem(m_qlistviewScheduled, i18n("Loans"), KMyMoneyUtils::transferScheduleIcon(KIcon::Small), "2");
-    KScheduledListItem *itemTransfers = new KScheduledListItem(m_qlistviewScheduled, i18n("Transfers"), KMyMoneyUtils::transferScheduleIcon(KIcon::Small), "3");
+    KScheduledListItem *itemBills = new KScheduledListItem(m_qlistviewScheduled, i18n("Bills"), KMyMoneyUtils::billScheduleIcon(TDEIcon::Small), "0");
+    KScheduledListItem *itemDeposits = new KScheduledListItem(m_qlistviewScheduled, i18n("Deposits"), KMyMoneyUtils::depositScheduleIcon(TDEIcon::Small), "1");
+    KScheduledListItem *itemLoans = new KScheduledListItem(m_qlistviewScheduled, i18n("Loans"), KMyMoneyUtils::transferScheduleIcon(TDEIcon::Small), "2");
+    KScheduledListItem *itemTransfers = new KScheduledListItem(m_qlistviewScheduled, i18n("Transfers"), KMyMoneyUtils::transferScheduleIcon(TDEIcon::Small), "3");
 
     TQValueList<MyMoneySchedule>::Iterator it;
 
diff --git a/kmymoney2/widgets/kmymoneyaccounttree.cpp b/kmymoney2/widgets/kmymoneyaccounttree.cpp
index 1f7c2ae..c67c7b0 100644
--- a/kmymoney2/widgets/kmymoneyaccounttree.cpp
+++ b/kmymoney2/widgets/kmymoneyaccounttree.cpp
@@ -88,7 +88,7 @@ void KMyMoneyAccountTreeItem::fillColumns()
   if (!lv)
     return;
   KMyMoneyAccountTreeBaseItem::fillColumns();
-  TQPixmap checkMark = TQPixmap(TDEGlobal::iconLoader()->loadIcon("ok", KIcon::Small));
+  TQPixmap checkMark = TQPixmap(TDEGlobal::iconLoader()->loadIcon("ok", TDEIcon::Small));
   MyMoneyMoney vatRate;
   if (!isInstitution())
     setPixmap(lv->nameColumn(), m_account.accountPixmap(m_reconcileFlag, 22));
diff --git a/kmymoney2/widgets/kmymoneybriefschedule.cpp b/kmymoney2/widgets/kmymoneybriefschedule.cpp
index 404d2a9..3e9ab7b 100644
--- a/kmymoney2/widgets/kmymoneybriefschedule.cpp
+++ b/kmymoney2/widgets/kmymoneybriefschedule.cpp
@@ -46,7 +46,7 @@
 KMyMoneyBriefSchedule::KMyMoneyBriefSchedule(TQWidget *parent, const char *name )
   : kScheduleBriefWidget(parent,name, WStyle_Customize | WStyle_NoBorder)
 {
-  KIconLoader *ic = TDEGlobal::iconLoader();
+  TDEIconLoader *ic = TDEGlobal::iconLoader();
   m_nextButton->setPixmap(BarIcon(TQString::fromLatin1("1rightarrow")));
   m_prevButton->setPixmap(BarIcon(TQString::fromLatin1("1leftarrow")));
 
@@ -57,13 +57,13 @@ KMyMoneyBriefSchedule::KMyMoneyBriefSchedule(TQWidget *parent, const char *name
   connect(m_buttonEnter, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEnterClicked()));
 
   KGuiItem skipGuiItem(  i18n("&Skip"),
-                          TQIconSet(ic->loadIcon("player_fwd", KIcon::Small, KIcon::SizeSmall)),
+                          TQIconSet(ic->loadIcon("player_fwd", TDEIcon::Small, TDEIcon::SizeSmall)),
                           i18n("Skip this transaction"),
                           i18n("Use this button to skip this transaction"));
   m_skipButton->setGuiItem(skipGuiItem);
 
   KGuiItem enterGuiItem(  i18n("&Enter"),
-                          TQIconSet(ic->loadIcon("key_enter", KIcon::Small, KIcon::SizeSmall)),
+                          TQIconSet(ic->loadIcon("key_enter", TDEIcon::Small, TDEIcon::SizeSmall)),
                           i18n("Record this transaction into the register"),
                           i18n("Use this button to record this transaction"));
   m_buttonEnter->setGuiItem(enterGuiItem);
diff --git a/kmymoney2/widgets/kmymoneycalendar.cpp b/kmymoney2/widgets/kmymoneycalendar.cpp
index c9772ab..15b0c14 100644
--- a/kmymoney2/widgets/kmymoneycalendar.cpp
+++ b/kmymoney2/widgets/kmymoneycalendar.cpp
@@ -118,7 +118,7 @@ void kMyMoneyCalendar::init( const TQDate &dt )
 
   d->selectWeek = new TQToolButton( this );
 
-//  KIconLoader *kiconloader = TDEGlobal::iconLoader();
+//  TDEIconLoader *kiconloader = TDEGlobal::iconLoader();
   TDEPopupMenu* tdepopupmenuNew = new TDEPopupMenu(this);
   tdepopupmenuNew->insertItem(i18n("Week"), this, TQT_SLOT(slotSetStyleWeekly()));
   tdepopupmenuNew->insertItem(i18n("Month"), this, TQT_SLOT(slotSetStyleMonthly()));
diff --git a/kmymoney2/widgets/kmymoneycategory.cpp b/kmymoney2/widgets/kmymoneycategory.cpp
index b4e2f83..99474f3 100644
--- a/kmymoney2/widgets/kmymoneycategory.cpp
+++ b/kmymoney2/widgets/kmymoneycategory.cpp
@@ -68,8 +68,8 @@ KMyMoneyCategory::KMyMoneyCategory(TQWidget* parent, const char * name, bool spl
 
     // create button
     KGuiItem splitButtonItem("",
-        TQIconSet(TDEGlobal::iconLoader()->loadIcon("split_transaction", KIcon::Small,
-        KIcon::SizeSmall)), "", "");
+        TQIconSet(TDEGlobal::iconLoader()->loadIcon("split_transaction", TDEIcon::Small,
+        TDEIcon::SizeSmall)), "", "");
     d->splitButton = new KPushButton(splitButtonItem, d->frame, "splitButton");
 
     layout->addWidget(this, 5);
diff --git a/kmymoney2/widgets/kmymoneydateinput.cpp b/kmymoney2/widgets/kmymoneydateinput.cpp
index ef4f4ee..eedd535 100644
--- a/kmymoney2/widgets/kmymoneydateinput.cpp
+++ b/kmymoney2/widgets/kmymoneydateinput.cpp
@@ -132,7 +132,7 @@ kMyMoneyDateInput::kMyMoneyDateInput(TQWidget *parent, const char *name, TQt::Al
 #endif
 
   // the next line is a try to add an icon to the button
-  m_dateButton = new KPushButton(TQIconSet(TQPixmap(TDEGlobal::iconLoader()->iconPath("date", -KIcon::SizeSmall))), TQString(""), this);
+  m_dateButton = new KPushButton(TQIconSet(TQPixmap(TDEGlobal::iconLoader()->iconPath("date", -TDEIcon::SizeSmall))), TQString(""), this);
   m_dateButton->setMinimumWidth(30);
 
   connect(m_dateButton,TQT_SIGNAL(clicked()),TQT_SLOT(toggleDatePicker()));
diff --git a/kmymoney2/widgets/kmymoneyedit.cpp b/kmymoney2/widgets/kmymoneyedit.cpp
index 549b772..cb04111 100644
--- a/kmymoney2/widgets/kmymoneyedit.cpp
+++ b/kmymoney2/widgets/kmymoneyedit.cpp
@@ -222,7 +222,7 @@ void kMyMoneyEdit::init(void)
   m_calculatorFrame->setFixedSize(m_calculator->width()+3, m_calculator->height()+3);
   m_calculatorFrame->hide();
 
-  m_calcButton = new KPushButton(TQIconSet(TQPixmap(TDEGlobal::iconLoader()->iconPath("kcalc", -KIcon::SizeSmall))), TQString(""), this);
+  m_calcButton = new KPushButton(TQIconSet(TQPixmap(TDEGlobal::iconLoader()->iconPath("kcalc", -TDEIcon::SizeSmall))), TQString(""), this);
   m_calcButton->setFixedWidth( m_calcButton->sizeHint().width() );
   m_calcButton->setFixedHeight(m_edit->sizeHint().height());
   m_calcButton->setFocusProxy(m_edit);
diff --git a/kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp b/kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp
index 47f2077..6f04112 100644
--- a/kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp
+++ b/kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp
@@ -48,21 +48,21 @@ kMyMoneyOnlineQuoteConfig::kMyMoneyOnlineQuoteConfig(TQWidget *parent, const cha
 
   m_updateButton->setEnabled(false);
 
-  KIconLoader* il = TDEGlobal::iconLoader();
+  TDEIconLoader* il = TDEGlobal::iconLoader();
   KGuiItem updateButtenItem( i18n("&Update" ),
-                    TQIconSet(il->loadIcon("button_ok", KIcon::Small, KIcon::SizeSmall)),
+                    TQIconSet(il->loadIcon("button_ok", TDEIcon::Small, TDEIcon::SizeSmall)),
                     i18n("Accepts the entered data and stores it"),
                     i18n("Use this to accept the modified data."));
   m_updateButton->setGuiItem(updateButtenItem);
 
   KGuiItem deleteButtenItem( i18n( "&Delete" ),
-                      TQIconSet(il->loadIcon("editdelete", KIcon::Small, KIcon::SizeSmall)),
+                      TQIconSet(il->loadIcon("editdelete", TDEIcon::Small, TDEIcon::SizeSmall)),
                       i18n("Delete the selected source entry"),
                       i18n("Use this to delete the selected online source entry"));
   m_deleteButton->setGuiItem(deleteButtenItem);
 
   KGuiItem newButtenItem( i18n( "&New..." ),
-                      TQIconSet(il->loadIcon("filenew", KIcon::Small, KIcon::SizeSmall)),
+                      TQIconSet(il->loadIcon("filenew", TDEIcon::Small, TDEIcon::SizeSmall)),
                       i18n("Create a new source entry for online quotes"),
                       i18n("Use this to create a new entry for online quotes"));
   m_newButton->setGuiItem(newButtenItem);
diff --git a/kmymoney2/widgets/kmymoneypriceview.cpp b/kmymoney2/widgets/kmymoneypriceview.cpp
index a4714ac..83b9ba5 100644
--- a/kmymoney2/widgets/kmymoneypriceview.cpp
+++ b/kmymoney2/widgets/kmymoneypriceview.cpp
@@ -137,23 +137,23 @@ KMyMoneyPriceView::KMyMoneyPriceView(TQWidget *parent, const char *name ) :
 
   header()->setFont(KMyMoneyGlobalSettings::listHeaderFont());
 
-  KIconLoader *kiconloader = TDEGlobal::iconLoader();
+  TDEIconLoader *kiconloader = TDEGlobal::iconLoader();
 
   m_contextMenu = new TDEPopupMenu(this);
   m_contextMenu->insertTitle(i18n("Price Options"));
-  m_contextMenu->insertItem(kiconloader->loadIcon("filenew", KIcon::Small),
+  m_contextMenu->insertItem(kiconloader->loadIcon("filenew", TDEIcon::Small),
                         i18n("New..."),
                         this, TQT_SIGNAL(newPrice()));
 
-  m_contextMenu->insertItem(kiconloader->loadIcon("edit", KIcon::Small),
+  m_contextMenu->insertItem(kiconloader->loadIcon("edit", TDEIcon::Small),
                         i18n("Edit..."),
                         this, TQT_SIGNAL(editPrice()));
 
-  m_contextMenu->insertItem(kiconloader->loadIcon("connect_creating", KIcon::Small),
+  m_contextMenu->insertItem(kiconloader->loadIcon("connect_creating", TDEIcon::Small),
                         i18n("Online Price Update..."),
                         this, TQT_SIGNAL(onlinePriceUpdate()));
 
-  m_contextMenu->insertItem(kiconloader->loadIcon("delete", KIcon::Small),
+  m_contextMenu->insertItem(kiconloader->loadIcon("delete", TDEIcon::Small),
                         i18n("Delete..."),
                         this, TQT_SIGNAL(deletePrice()));
 
diff --git a/kmymoney2/widgets/transaction.cpp b/kmymoney2/widgets/transaction.cpp
index ea5ea2c..2773258 100644
--- a/kmymoney2/widgets/transaction.cpp
+++ b/kmymoney2/widgets/transaction.cpp
@@ -212,7 +212,7 @@ void Transaction::markAttachment(TQPainter* painter, int /* row */, int /* col *
 
   painter->save();
   if(clip.isNull()) {
-    clip = TDEGlobal::iconLoader()->loadIcon("attach", KIcon::Small, KIcon::SizeSmall, KIcon::DefaultState);
+    clip = TDEGlobal::iconLoader()->loadIcon("attach", TDEIcon::Small, TDEIcon::SizeSmall, TDEIcon::DefaultState);
     if(clip.height() > h) {
       clip.resize(h, h);
     }
diff --git a/kmymoney2/widgets/transactionsortoption.ui.h b/kmymoney2/widgets/transactionsortoption.ui.h
index 2a1f2e2..2bf069f 100644
--- a/kmymoney2/widgets/transactionsortoption.ui.h
+++ b/kmymoney2/widgets/transactionsortoption.ui.h
@@ -26,11 +26,11 @@
 
 void TransactionSortOption::init()
 {
-  KIconLoader* il = TDEGlobal::iconLoader();
-  m_addButton->setIconSet(TQIconSet(il->loadIcon("1rightarrow", KIcon::Small, KIcon::SizeSmall)));
-  m_removeButton->setIconSet(TQIconSet(il->loadIcon("1leftarrow", KIcon::Small, KIcon::SizeSmall)));
-  m_upButton->setIconSet(TQIconSet(il->loadIcon("1uparrow", KIcon::Small, KIcon::SizeSmall)));
-  m_downButton->setIconSet(TQIconSet(il->loadIcon("1downarrow", KIcon::Small, KIcon::SizeSmall)));
+  TDEIconLoader* il = TDEGlobal::iconLoader();
+  m_addButton->setIconSet(TQIconSet(il->loadIcon("1rightarrow", TDEIcon::Small, TDEIcon::SizeSmall)));
+  m_removeButton->setIconSet(TQIconSet(il->loadIcon("1leftarrow", TDEIcon::Small, TDEIcon::SizeSmall)));
+  m_upButton->setIconSet(TQIconSet(il->loadIcon("1uparrow", TDEIcon::Small, TDEIcon::SizeSmall)));
+  m_downButton->setIconSet(TQIconSet(il->loadIcon("1downarrow", TDEIcon::Small, TDEIcon::SizeSmall)));
 
   // don't allow sorting of the selected entries
   m_selectedList->setSortColumn(-1);
diff --git a/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp b/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp
index 1550618..f3ead6f 100644
--- a/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp
+++ b/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp
@@ -1377,9 +1377,9 @@ LoanPayoutPage::LoanPayoutPage(Wizard* wizard, const char* name) :
   m_mandatoryGroup->add(m_assetAccount->lineEdit());
   m_mandatoryGroup->add(m_loanAccount->lineEdit());
 
-  KIconLoader* il = TDEGlobal::iconLoader();
+  TDEIconLoader* il = TDEGlobal::iconLoader();
   KGuiItem createAssetButtenItem( i18n( "&Create..." ),
-                                  TQIconSet(il->loadIcon("filenew", KIcon::Small, KIcon::SizeSmall)),
+                                  TQIconSet(il->loadIcon("filenew", TDEIcon::Small, TDEIcon::SizeSmall)),
                                   i18n("Create a new asset account"),
                                   i18n("If the asset account does not yet exist, press this button to create it."));
   m_createAssetButton->setGuiItem(createAssetButtenItem);