Rename a number of classes to enhance compatibility with KDE4

30 files changed, 75 insertions, 75 deletions

diff --git a/kmymoney2/dialogs/kcurrencyeditdlg.h b/kmymoney2/dialogs/kcurrencyeditdlg.h
index 4cc2a11..b3a29c2 100644
--- a/kmymoney2/dialogs/kcurrencyeditdlg.h
+++ b/kmymoney2/dialogs/kcurrencyeditdlg.h
@@ -31,7 +31,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-class KPopupMenu;
+class TDEPopupMenu;
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/dialogs/kcurrencyeditdlgdecl.ui b/kmymoney2/dialogs/kcurrencyeditdlgdecl.ui
index 2ab7f00..c4fab59 100644
--- a/kmymoney2/dialogs/kcurrencyeditdlgdecl.ui
+++ b/kmymoney2/dialogs/kcurrencyeditdlgdecl.ui
@@ -38,7 +38,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="KListView">
+                        <widget class="TDEListView">
                             <property name="name">
                                 <cstring>m_currencyList</cstring>
                             </property>
@@ -174,7 +174,7 @@
                                 <string>X</string>
                             </property>
                         </widget>
-                        <widget class="KListView">
+                        <widget class="TDEListView">
                             <column>
                                 <property name="text">
                                     <string>Currency</string>
diff --git a/kmymoney2/dialogs/kequitypriceupdatedlg.cpp b/kmymoney2/dialogs/kequitypriceupdatedlg.cpp
index 3af2912..d9c09cc 100644
--- a/kmymoney2/dialogs/kequitypriceupdatedlg.cpp
+++ b/kmymoney2/dialogs/kequitypriceupdatedlg.cpp
@@ -217,7 +217,7 @@ void KEquityPriceUpdateDlg::addPricePair(const MyMoneySecurityPair& pair, bool d
       }
 
       if(keep) {
-        KListViewItem* item = new KListViewItem(lvEquityList,
+        TDEListViewItem* item = new TDEListViewItem(lvEquityList,
           symbol,
           i18n("%1 units in %2").arg(pair.first,pair.second));
         if(pr.isValid()) {
@@ -251,7 +251,7 @@ void KEquityPriceUpdateDlg::addInvestment(const MyMoneySecurity& inv)
     }
     // if it is in use, it_a is not equal to list.end()
     if(it_a != list.end()) {
-      KListViewItem* item = new KListViewItem(lvEquityList, symbol, inv.name());
+      TDEListViewItem* item = new TDEListViewItem(lvEquityList, symbol, inv.name());
       MyMoneySecurity currency = file->currency(inv.tradingCurrency());
       MyMoneyPrice pr = file->price(id.utf8(), inv.tradingCurrency());
       if(pr.isValid()) {
diff --git a/kmymoney2/dialogs/kequitypriceupdatedlgdecl.ui b/kmymoney2/dialogs/kequitypriceupdatedlgdecl.ui
index a381e0d..d3dbf99 100644
--- a/kmymoney2/dialogs/kequitypriceupdatedlgdecl.ui
+++ b/kmymoney2/dialogs/kequitypriceupdatedlgdecl.ui
@@ -20,7 +20,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="KListView">
+        <widget class="TDEListView">
             <property name="name">
                 <cstring>lvEquityList</cstring>
             </property>
diff --git a/kmymoney2/dialogs/kfindtransactiondlgdecl.ui b/kmymoney2/dialogs/kfindtransactiondlgdecl.ui
index 81d17c1..1109da9 100644
--- a/kmymoney2/dialogs/kfindtransactiondlgdecl.ui
+++ b/kmymoney2/dialogs/kfindtransactiondlgdecl.ui
@@ -488,7 +488,7 @@
                                         <property name="spacing">
                                             <number>6</number>
                                         </property>
-                                        <widget class="KListView">
+                                        <widget class="TDEListView">
                                             <column>
                                                 <property name="text">
                                                     <string>Payee</string>
diff --git a/kmymoney2/dialogs/kmergetransactionsdlg.cpp b/kmymoney2/dialogs/kmergetransactionsdlg.cpp
index aeb4f69..6b750f1 100644
--- a/kmymoney2/dialogs/kmergetransactionsdlg.cpp
+++ b/kmymoney2/dialogs/kmergetransactionsdlg.cpp
@@ -32,7 +32,7 @@
 #include "kmergetransactionsdlg.h"
 
 KMergeTransactionsDlg::KMergeTransactionsDlg(const MyMoneyAccount& account, TQWidget* parent, const char* name) :
-  KSelectTransactionsDlg(account, parent, name)
+  TDESelectTransactionsDlg(account, parent, name)
 {
 
   // setup descriptive texts
diff --git a/kmymoney2/dialogs/kmergetransactionsdlg.h b/kmymoney2/dialogs/kmergetransactionsdlg.h
index 68bfee0..f42997c 100644
--- a/kmymoney2/dialogs/kmergetransactionsdlg.h
+++ b/kmymoney2/dialogs/kmergetransactionsdlg.h
@@ -36,7 +36,7 @@ class TQResizeEvent;
 
 #include "../dialogs/kselecttransactionsdlg.h"
 
-class KMergeTransactionsDlg: public KSelectTransactionsDlg
+class KMergeTransactionsDlg: public TDESelectTransactionsDlg
 {
   Q_OBJECT
   
diff --git a/kmymoney2/dialogs/kmymoneyfileinfodlg.cpp b/kmymoney2/dialogs/kmymoneyfileinfodlg.cpp
index 49852a7..0041a68 100644
--- a/kmymoney2/dialogs/kmymoneyfileinfodlg.cpp
+++ b/kmymoney2/dialogs/kmymoneyfileinfodlg.cpp
@@ -67,7 +67,7 @@ KMyMoneyFileInfoDlg::KMyMoneyFileInfoDlg(TQWidget *parent, const char *name )
 
   TQMap<MyMoneyAccount::accountTypeE, int>::const_iterator it_m;
   for(it_m = accountMap.begin(); it_m != accountMap.end(); ++it_m) {
-    new KListViewItem(m_accountView, KMyMoneyUtils::accountTypeToString(it_m.key()), TQString("%1").arg(*it_m), TQString("%1").arg(accountMapClosed[it_m.key()]));
+    new TDEListViewItem(m_accountView, KMyMoneyUtils::accountTypeToString(it_m.key()), TQString("%1").arg(*it_m), TQString("%1").arg(accountMapClosed[it_m.key()]));
   }
 
 
diff --git a/kmymoney2/dialogs/kmymoneyfileinfodlgdecl.ui b/kmymoney2/dialogs/kmymoneyfileinfodlgdecl.ui
index 4a625f7..5f85579 100644
--- a/kmymoney2/dialogs/kmymoneyfileinfodlgdecl.ui
+++ b/kmymoney2/dialogs/kmymoneyfileinfodlgdecl.ui
@@ -49,7 +49,7 @@
                         <string>x</string>
                     </property>
                 </widget>
-                <widget class="KListView" row="6" column="0" rowspan="1" colspan="2">
+                <widget class="TDEListView" row="6" column="0" rowspan="1" colspan="2">
                     <column>
                         <property name="text">
                             <string>Type</string>
diff --git a/kmymoney2/dialogs/kmymoneysplittable.cpp b/kmymoney2/dialogs/kmymoneysplittable.cpp
index bd37775..64387a8 100644
--- a/kmymoney2/dialogs/kmymoneysplittable.cpp
+++ b/kmymoney2/dialogs/kmymoneysplittable.cpp
@@ -93,7 +93,7 @@ kMyMoneySplitTable::kMyMoneySplitTable(TQWidget *parent, const char *name ) :
   setHScrollBarMode(TQScrollView::AlwaysOff);
 
   // setup the context menu
-  m_contextMenu = new KPopupMenu(this);
+  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()));
@@ -272,8 +272,8 @@ bool kMyMoneySplitTable::eventFilter(TQObject *o, TQEvent *e)
 
       default:
         rc = true;
-        KShortcut copySplit(i18n("Duplicate split", "CTRL+c"));
-        KShortcut newSplit(TQKeySequence(TQt::CTRL | TQt::Key_Insert));
+        TDEShortcut copySplit(i18n("Duplicate split", "CTRL+c"));
+        TDEShortcut newSplit(TQKeySequence(TQt::CTRL | TQt::Key_Insert));
         if(copySplit.contains(KKey(k))) {
           slotDuplicateSplit();
 
diff --git a/kmymoney2/dialogs/kmymoneysplittable.h b/kmymoney2/dialogs/kmymoneysplittable.h
index 43b75fb..cc61b14 100644
--- a/kmymoney2/dialogs/kmymoneysplittable.h
+++ b/kmymoney2/dialogs/kmymoneysplittable.h
@@ -34,7 +34,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-class KPopupMenu;
+class TDEPopupMenu;
 class KPushButton;
 
 // ----------------------------------------------------------------------------
@@ -221,7 +221,7 @@ private:
   /**
     * This member keeps a pointer to the context menu
     */
-  KPopupMenu*         m_contextMenu;
+  TDEPopupMenu*         m_contextMenu;
 
   /// keeps the id of the delete entry in the context menu
   int                 m_contextMenuDelete;
diff --git a/kmymoney2/dialogs/kplugindlg.ui b/kmymoney2/dialogs/kplugindlg.ui
index 2cf4373..f41ffb1 100644
--- a/kmymoney2/dialogs/kplugindlg.ui
+++ b/kmymoney2/dialogs/kplugindlg.ui
@@ -22,7 +22,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="KListView" row="0" column="0" rowspan="1" colspan="4">
+        <widget class="TDEListView" row="0" column="0" rowspan="1" colspan="4">
             <column>
                 <property name="text">
                     <string>PlugIn</string>
diff --git a/kmymoney2/dialogs/krecentfileitem.cpp b/kmymoney2/dialogs/krecentfileitem.cpp
index ff06c6a..495d81f 100644
--- a/kmymoney2/dialogs/krecentfileitem.cpp
+++ b/kmymoney2/dialogs/krecentfileitem.cpp
@@ -37,7 +37,7 @@
 
 #include "krecentfileitem.h"
 
-KRecentFileItem::KRecentFileItem(const TQString& url, TQIconView* parent, const TQString& text, const TQPixmap& icon)
+TDERecentFileItem::TDERecentFileItem(const TQString& url, TQIconView* parent, const TQString& text, const TQPixmap& icon)
   : TQIconViewItem(parent, text, icon),
     m_url(url),
     m_parent(parent)
@@ -47,11 +47,11 @@ KRecentFileItem::KRecentFileItem(const TQString& url, TQIconView* parent, const
   setDragEnabled(false);
 }
 
-KRecentFileItem::~KRecentFileItem()
+TDERecentFileItem::~TDERecentFileItem()
 {
 }
 
-bool KRecentFileItem::move( int x, int y )
+bool TDERecentFileItem::move( int x, int y )
 {
   TQRect r = rect();
   TQToolTip::remove(m_parent, rect());
diff --git a/kmymoney2/dialogs/krecentfileitem.h b/kmymoney2/dialogs/krecentfileitem.h
index 89a080a..bc89c48 100644
--- a/kmymoney2/dialogs/krecentfileitem.h
+++ b/kmymoney2/dialogs/krecentfileitem.h
@@ -40,10 +40,10 @@
   * @author Michael Edwardes
   */
 
-class KRecentFileItem : public TQIconViewItem  {
+class TDERecentFileItem : public TQIconViewItem  {
 public: 
-  KRecentFileItem(const TQString& url, TQIconView* parent, const TQString& text, const TQPixmap& icon);
-  ~KRecentFileItem();
+  TDERecentFileItem(const TQString& url, TQIconView* parent, const TQString& text, const TQPixmap& icon);
+  ~TDERecentFileItem();
   TQString fileURL(void) const { return m_url; }
 
   bool move( int x, int y );
diff --git a/kmymoney2/dialogs/kreconciledlgdecl.ui b/kmymoney2/dialogs/kreconciledlgdecl.ui
index d5893e8..dce5658 100644
--- a/kmymoney2/dialogs/kreconciledlgdecl.ui
+++ b/kmymoney2/dialogs/kreconciledlgdecl.ui
@@ -141,7 +141,7 @@ Your account is balanced when the Difference is Zero.  Click on the Finish butto
                                 <string>Withdrawals</string>
                             </property>
                         </widget>
-                        <widget class="KListView">
+                        <widget class="TDEListView">
                             <property name="name">
                                 <cstring>debitListView</cstring>
                             </property>
@@ -198,7 +198,7 @@ Your account is balanced when the Difference is Zero.  Click on the Finish butto
                                 <string>Deposits</string>
                             </property>
                         </widget>
-                        <widget class="KListView">
+                        <widget class="TDEListView">
                             <property name="name">
                                 <cstring>creditListView</cstring>
                             </property>
diff --git a/kmymoney2/dialogs/ksecuritylisteditor.cpp b/kmymoney2/dialogs/ksecuritylisteditor.cpp
index e0642a0..afbf4e3 100644
--- a/kmymoney2/dialogs/ksecuritylisteditor.cpp
+++ b/kmymoney2/dialogs/ksecuritylisteditor.cpp
@@ -115,7 +115,7 @@ void KSecurityListEditor::slotLoadList(void)
     list += MyMoneyFile::instance()->currencyList();
   }
   for(it = list.begin(); it != list.end(); ++it) {
-    KListViewItem* newItem = new KListViewItem(m_listView, TQString((*it).id()));
+    TDEListViewItem* newItem = new TDEListViewItem(m_listView, TQString((*it).id()));
     fillItem(newItem, *it);
 
   }
diff --git a/kmymoney2/dialogs/ksecuritylisteditordecl.ui b/kmymoney2/dialogs/ksecuritylisteditordecl.ui
index d9033da..e88177e 100644
--- a/kmymoney2/dialogs/ksecuritylisteditordecl.ui
+++ b/kmymoney2/dialogs/ksecuritylisteditordecl.ui
@@ -30,7 +30,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="KListView">
+                <widget class="TDEListView">
                     <column>
                         <property name="text">
                             <string>ID</string>
diff --git a/kmymoney2/dialogs/kselectdatabasedlg.cpp b/kmymoney2/dialogs/kselectdatabasedlg.cpp
index 50e66d4..607abbc 100644
--- a/kmymoney2/dialogs/kselectdatabasedlg.cpp
+++ b/kmymoney2/dialogs/kselectdatabasedlg.cpp
@@ -45,8 +45,8 @@
 
 #include "kselectdatabasedlg.h"
 
-KSelectDatabaseDlg::KSelectDatabaseDlg(TQWidget *parent, const char *name)
- : KSelectDatabaseDlgDecl(parent, name) {
+TDESelectDatabaseDlg::TDESelectDatabaseDlg(TQWidget *parent, const char *name)
+ : TDESelectDatabaseDlgDecl(parent, name) {
   listDrivers->clear();
   // list drivers supported by KMM
   TQMap<TQString, TQString> map = m_map.driverMap();
@@ -95,8 +95,8 @@ KSelectDatabaseDlg::KSelectDatabaseDlg(TQWidget *parent, const char *name)
   }
 }
 
-KSelectDatabaseDlg::KSelectDatabaseDlg(KURL openURL, TQWidget *parent, const char *name)
- : KSelectDatabaseDlgDecl(parent, name) {
+TDESelectDatabaseDlg::TDESelectDatabaseDlg(KURL openURL, TQWidget *parent, const char *name)
+ : TDESelectDatabaseDlgDecl(parent, name) {
   // here we are re-opening a database from a URL
   // probably taken from the last-used or recent file list
   listDrivers->clear();
@@ -142,16 +142,16 @@ KSelectDatabaseDlg::KSelectDatabaseDlg(KURL openURL, TQWidget *parent, const cha
 
 }
 
-KSelectDatabaseDlg::~KSelectDatabaseDlg() {
+TDESelectDatabaseDlg::~TDESelectDatabaseDlg() {
   if (m_requiredFields != 0) delete m_requiredFields;
 }
 
-void KSelectDatabaseDlg::setMode (int openMode) {
+void TDESelectDatabaseDlg::setMode (int openMode) {
   m_mode = openMode;
   checkPreLoad->setEnabled (openMode == IO_ReadWrite);
 }
 
-const KURL KSelectDatabaseDlg::selectedURL() {
+const KURL TDESelectDatabaseDlg::selectedURL() {
   KURL url;
   url.setProtocol("sql");
   url.setUser(textUserName->text());
@@ -166,7 +166,7 @@ const KURL KSelectDatabaseDlg::selectedURL() {
   return (url);
 }
 
-void KSelectDatabaseDlg::slotDriverSelected (TQListBoxItem *driver) {
+void TDESelectDatabaseDlg::slotDriverSelected (TQListBoxItem *driver) {
   databaseTypeE dbType = m_map.driverToType(driver->text().section(' ', 0, 0));
   if (!m_map.isTested(dbType)) {
     int rc = KMessageBox::warningContinueCancel (0,
@@ -203,7 +203,7 @@ void KSelectDatabaseDlg::slotDriverSelected (TQListBoxItem *driver) {
   }
 }
 
-void KSelectDatabaseDlg::slotGenerateSQL () {
+void TDESelectDatabaseDlg::slotGenerateSQL () {
   TQString fileName = TQFileDialog::getSaveFileName(
       "",
       i18n("All files (*.*)"),
@@ -219,11 +219,11 @@ void KSelectDatabaseDlg::slotGenerateSQL () {
   out.close();
 }
 
-void KSelectDatabaseDlg::slotHelp(void) {
+void TDESelectDatabaseDlg::slotHelp(void) {
   kapp->invokeHelp("details.database.selectdatabase");
 }
 
-void KSelectDatabaseDlg::setError() {
+void TDESelectDatabaseDlg::setError() {
   buttonOK->setEnabled(false);
   buttonSQL->setEnabled(false);
   m_requiredFields = 0;
diff --git a/kmymoney2/dialogs/kselectdatabasedlg.h b/kmymoney2/dialogs/kselectdatabasedlg.h
index a0d446f..4fe2809 100644
--- a/kmymoney2/dialogs/kselectdatabasedlg.h
+++ b/kmymoney2/dialogs/kselectdatabasedlg.h
@@ -34,14 +34,14 @@
 #include "../mymoney/storage/mymoneystoragesql.h"
 #include "kmymoney/kguiutils.h"
 
-class KSelectDatabaseDlg : public KSelectDatabaseDlgDecl
+class TDESelectDatabaseDlg : public TDESelectDatabaseDlgDecl
 {
 Q_OBJECT
   
 public:
-  KSelectDatabaseDlg(TQWidget *parent = 0, const char *name = 0);
-  KSelectDatabaseDlg(KURL openURL, TQWidget *parent = 0, const char *name = 0);
-  ~KSelectDatabaseDlg();
+  TDESelectDatabaseDlg(TQWidget *parent = 0, const char *name = 0);
+  TDESelectDatabaseDlg(KURL openURL, TQWidget *parent = 0, const char *name = 0);
+  ~TDESelectDatabaseDlg();
   /** Set the mode of this dialog
     * @param - openMode (IO_ReadWrite = open database; IO_WriteOnly = saveas database)
   **/
diff --git a/kmymoney2/dialogs/kselectdatabasedlgdecl.ui b/kmymoney2/dialogs/kselectdatabasedlgdecl.ui
index 2215b9a..5e756a7 100644
--- a/kmymoney2/dialogs/kselectdatabasedlgdecl.ui
+++ b/kmymoney2/dialogs/kselectdatabasedlgdecl.ui
@@ -1,8 +1,8 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
-<class>KSelectDatabaseDlgDecl</class>
+<class>TDESelectDatabaseDlgDecl</class>
 <widget class="TQDialog">
     <property name="name">
-        <cstring>KSelectDatabaseDlgDecl</cstring>
+        <cstring>TDESelectDatabaseDlgDecl</cstring>
     </property>
     <property name="geometry">
         <rect>
@@ -236,13 +236,13 @@ As always, please make sure you have adequate backups of your data.&lt;/font&gt;
     <connection>
         <sender>buttonOK</sender>
         <signal>released()</signal>
-        <receiver>KSelectDatabaseDlgDecl</receiver>
+        <receiver>TDESelectDatabaseDlgDecl</receiver>
         <slot>accept()</slot>
     </connection>
     <connection>
         <sender>buttonCancel</sender>
         <signal>released()</signal>
-        <receiver>KSelectDatabaseDlgDecl</receiver>
+        <receiver>TDESelectDatabaseDlgDecl</receiver>
         <slot>reject()</slot>
     </connection>
 </connections>
diff --git a/kmymoney2/dialogs/kselecttransactionsdlg.cpp b/kmymoney2/dialogs/kselecttransactionsdlg.cpp
index 04e377e..51968f1 100644
--- a/kmymoney2/dialogs/kselecttransactionsdlg.cpp
+++ b/kmymoney2/dialogs/kselecttransactionsdlg.cpp
@@ -36,8 +36,8 @@
 
 #include "kmergetransactionsdlg.h"
 
-KSelectTransactionsDlg::KSelectTransactionsDlg(const MyMoneyAccount& _account, TQWidget* parent, const char* name) :
-  KSelectTransactionsDlgDecl(parent, name),
+TDESelectTransactionsDlg::TDESelectTransactionsDlg(const MyMoneyAccount& _account, TQWidget* parent, const char* name) :
+  TDESelectTransactionsDlgDecl(parent, name),
   m_account(_account)
 {
   // setup descriptive texts
@@ -82,12 +82,12 @@ KSelectTransactionsDlg::KSelectTransactionsDlg(const MyMoneyAccount& _account, T
   connect(m_helpButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotHelp()));
 }
 
-void KSelectTransactionsDlg::slotEnableOk(const KMyMoneyRegister::SelectedTransactions& list)
+void TDESelectTransactionsDlg::slotEnableOk(const KMyMoneyRegister::SelectedTransactions& list)
 {
   buttonOk->setEnabled(list.count() != 0);
 }
 
-void KSelectTransactionsDlg::addTransaction(const MyMoneyTransaction& t)
+void TDESelectTransactionsDlg::addTransaction(const MyMoneyTransaction& t)
 {
   TQValueList<MyMoneySplit>::const_iterator it_s;
   for(it_s = t.splits().begin(); it_s != t.splits().end(); ++it_s) {
@@ -100,37 +100,37 @@ void KSelectTransactionsDlg::addTransaction(const MyMoneyTransaction& t)
   }
 }
 
-int KSelectTransactionsDlg::exec(void)
+int TDESelectTransactionsDlg::exec(void)
 {
   m_register->updateRegister(true);
   m_register->updateContents();
 
   m_register->setFocus();
 
-  return KSelectTransactionsDlgDecl::exec();
+  return TDESelectTransactionsDlgDecl::exec();
 }
 
-void KSelectTransactionsDlg::slotHelp(void)
+void TDESelectTransactionsDlg::slotHelp(void)
 {
   // kapp->invokeHelp("details.ledgers.match");
 }
 
-void KSelectTransactionsDlg::show(void)
+void TDESelectTransactionsDlg::show(void)
 {
-  KSelectTransactionsDlgDecl::show();
+  TDESelectTransactionsDlgDecl::show();
   m_register->resize(KMyMoneyRegister::DetailColumn);
 }
 
-void KSelectTransactionsDlg::resizeEvent(TQResizeEvent* ev)
+void TDESelectTransactionsDlg::resizeEvent(TQResizeEvent* ev)
 {
   // don't forget the resizer
-  KSelectTransactionsDlgDecl::resizeEvent(ev);
+  TDESelectTransactionsDlgDecl::resizeEvent(ev);
 
   // resize the register
   m_register->resize(KMyMoneyRegister::DetailColumn);
 }
 
-MyMoneyTransaction KSelectTransactionsDlg::transaction(void) const
+MyMoneyTransaction TDESelectTransactionsDlg::transaction(void) const
 {
   MyMoneyTransaction t;
 
@@ -144,7 +144,7 @@ MyMoneyTransaction KSelectTransactionsDlg::transaction(void) const
   return t;
 }
 
-bool KSelectTransactionsDlg::eventFilter(TQObject* o, TQEvent* e)
+bool TDESelectTransactionsDlg::eventFilter(TQObject* o, TQEvent* e)
 {
   bool rc = false;
   TQKeyEvent* k;
diff --git a/kmymoney2/dialogs/kselecttransactionsdlg.h b/kmymoney2/dialogs/kselecttransactionsdlg.h
index 657df34..4eeaea2 100644
--- a/kmymoney2/dialogs/kselecttransactionsdlg.h
+++ b/kmymoney2/dialogs/kselecttransactionsdlg.h
@@ -36,12 +36,12 @@ class TQResizeEvent;
 
 #include "../dialogs/kselecttransactionsdlgdecl.h"
 
-class KSelectTransactionsDlg: public KSelectTransactionsDlgDecl
+class TDESelectTransactionsDlg: public TDESelectTransactionsDlgDecl
 {
   Q_OBJECT
   
 public:
-  KSelectTransactionsDlg(const MyMoneyAccount& account, TQWidget* parent = 0, const char* name = 0);
+  TDESelectTransactionsDlg(const MyMoneyAccount& account, TQWidget* parent = 0, const char* name = 0);
 
   /**
    * Adds the transaction @a t to the dialog
diff --git a/kmymoney2/dialogs/kselecttransactionsdlgdecl.ui b/kmymoney2/dialogs/kselecttransactionsdlgdecl.ui
index f4fb116..24bc6f0 100644
--- a/kmymoney2/dialogs/kselecttransactionsdlgdecl.ui
+++ b/kmymoney2/dialogs/kselecttransactionsdlgdecl.ui
@@ -1,8 +1,8 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
-<class>KSelectTransactionsDlgDecl</class>
+<class>TDESelectTransactionsDlgDecl</class>
 <widget class="TQDialog">
     <property name="name">
-        <cstring>KSelectTransactionsDlgDecl</cstring>
+        <cstring>TDESelectTransactionsDlgDecl</cstring>
     </property>
     <property name="geometry">
         <rect>
@@ -160,13 +160,13 @@
     <connection>
         <sender>buttonOk</sender>
         <signal>clicked()</signal>
-        <receiver>KSelectTransactionsDlgDecl</receiver>
+        <receiver>TDESelectTransactionsDlgDecl</receiver>
         <slot>accept()</slot>
     </connection>
     <connection>
         <sender>buttonCancel</sender>
         <signal>clicked()</signal>
-        <receiver>KSelectTransactionsDlgDecl</receiver>
+        <receiver>TDESelectTransactionsDlgDecl</receiver>
         <slot>reject()</slot>
     </connection>
 </connections>
diff --git a/kmymoney2/dialogs/kstartdlg.cpp b/kmymoney2/dialogs/kstartdlg.cpp
index f6f1460..9aefa00 100644
--- a/kmymoney2/dialogs/kstartdlg.cpp
+++ b/kmymoney2/dialogs/kstartdlg.cpp
@@ -142,7 +142,7 @@ void KStartDlg::readConfig()
     if( !value.isNull() && fileExists(value) )
     {
       TQString file_name = value.mid(value.findRev('/')+1);
-      (void)new KRecentFileItem( value, view_recent, file_name, il->loadIcon("kmy", KIcon::Desktop, KIcon::SizeLarge));
+      (void)new TDERecentFileItem( value, view_recent, file_name, il->loadIcon("kmy", KIcon::Desktop, KIcon::SizeLarge));
     }
     i++;
   } while( !value.isNull() );
@@ -176,7 +176,7 @@ void KStartDlg::writeConfig()
 /** slot to recent view */
 void KStartDlg::slotRecentClicked(TQIconViewItem *item)
 {
-  KRecentFileItem *kitem = (KRecentFileItem*)item;
+  TDERecentFileItem *kitem = (TDERecentFileItem*)item;
   if(!kitem) return;
 
   isopenfile = true;
@@ -220,7 +220,7 @@ void KStartDlg::slotTemplateSelectionChanged(TQIconViewItem* item)
 
 void KStartDlg::slotRecentSelectionChanged(TQIconViewItem* item)
 {
-  KRecentFileItem *kitem = (KRecentFileItem*)item;
+  TDERecentFileItem *kitem = (TDERecentFileItem*)item;
   if(!kitem) return;
 
   // Clear the other selection
diff --git a/kmymoney2/dialogs/settings/ksettingsfontsdecl.ui b/kmymoney2/dialogs/settings/ksettingsfontsdecl.ui
index a6e48f9..874aa85 100644
--- a/kmymoney2/dialogs/settings/ksettingsfontsdecl.ui
+++ b/kmymoney2/dialogs/settings/ksettingsfontsdecl.ui
@@ -38,12 +38,12 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="KFontRequester" row="0" column="2">
+                <widget class="TDEFontRequester" row="0" column="2">
                     <property name="name">
                         <cstring>kcfg_listCellFont</cstring>
                     </property>
                 </widget>
-                <widget class="KFontRequester" row="1" column="2">
+                <widget class="TDEFontRequester" row="1" column="2">
                     <property name="name">
                         <cstring>kcfg_listHeaderFont</cstring>
                     </property>
diff --git a/kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui b/kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui
index c442639..948e487 100644
--- a/kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui
+++ b/kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui
@@ -370,7 +370,7 @@
                             <set>WordBreak|AlignTop</set>
                         </property>
                     </widget>
-                    <widget class="KListView">
+                    <widget class="TDEListView">
                         <property name="name">
                             <cstring>m_viewList</cstring>
                         </property>
diff --git a/kmymoney2/dialogs/settings/ksettingshomedecl.ui b/kmymoney2/dialogs/settings/ksettingshomedecl.ui
index f6342f3..33eb837 100644
--- a/kmymoney2/dialogs/settings/ksettingshomedecl.ui
+++ b/kmymoney2/dialogs/settings/ksettingshomedecl.ui
@@ -132,7 +132,7 @@ Use the buttons and checkboxes to customize the layout of the home page.</string
                         <string></string>
                     </property>
                 </widget>
-                <widget class="KListView" row="0" column="1" rowspan="2" colspan="1">
+                <widget class="TDEListView" row="0" column="1" rowspan="2" colspan="1">
                     <property name="name">
                         <cstring>m_homePageList</cstring>
                     </property>
diff --git a/kmymoney2/dialogs/settings/ksettingsonlinequotesdecl.ui b/kmymoney2/dialogs/settings/ksettingsonlinequotesdecl.ui
index ad68131..def8727 100644
--- a/kmymoney2/dialogs/settings/ksettingsonlinequotesdecl.ui
+++ b/kmymoney2/dialogs/settings/ksettingsonlinequotesdecl.ui
@@ -25,7 +25,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="KListView">
+        <widget class="TDEListView">
             <column>
                 <property name="text">
                     <string>Name</string>
diff --git a/kmymoney2/dialogs/transactioneditor.cpp b/kmymoney2/dialogs/transactioneditor.cpp
index a6f83dc..0af5b41 100644
--- a/kmymoney2/dialogs/transactioneditor.cpp
+++ b/kmymoney2/dialogs/transactioneditor.cpp
@@ -1286,7 +1286,7 @@ void StdTransactionEditor::autoFill(const TQString& payeeId)
         t = list.last().first;
       } else {
 #endif
-        KSelectTransactionsDlg dlg(m_account, m_regForm);
+        TDESelectTransactionsDlg dlg(m_account, m_regForm);
         dlg.setCaption(i18n("Select autofill transaction"));
 
         TQMap<TQString, struct uniqTransaction>::const_iterator it_u;
diff --git a/kmymoney2/dialogs/transactioneditor.h b/kmymoney2/dialogs/transactioneditor.h
index 581cdfc..39ebcc4 100644
--- a/kmymoney2/dialogs/transactioneditor.h
+++ b/kmymoney2/dialogs/transactioneditor.h
@@ -193,7 +193,7 @@ signals:
   /**
     * This signal is sent out whenever enough data is present to enter the
     * transaction into the ledger. This signal can be used to control the
-    * KAction which implements entering the transaction.
+    * TDEAction which implements entering the transaction.
     *
     * @sa isComplete()
     *