Rename a number of classes to enhance compatibility with KDE4

35 files changed, 195 insertions, 195 deletions

diff --git a/ChangeLog b/ChangeLog
index ca5d131..63b55de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2220,7 +2220,7 @@ Jake Maciejewski.
         * Fixed UIC variable usage, primarily for *BSD platforms
         * Fixed double encoding bug on bibtexml inport
         * Fixed wrong namespace on bibtexml export
-        * Changed to use KAcceleratorManager for keyboard accels on tabs
+        * Changed to use TDEAcceleratorManager for keyboard accels on tabs
         * Fixed bug with the group view icon not getting changed back to the folder
 
 2003-05-03  Robby Stephenson  <robby@periapsis.org>
diff --git a/src/borrowerdialog.cpp b/src/borrowerdialog.cpp
index 8e47279..d9d34c7 100644
--- a/src/borrowerdialog.cpp
+++ b/src/borrowerdialog.cpp
@@ -25,14 +25,14 @@
 
 using Tellico::BorrowerDialog;
 
-BorrowerDialog::Item::Item(KListView* parent_, const KABC::Addressee& add_)
-    : KListViewItem(parent_), m_uid(add_.uid()) {
+BorrowerDialog::Item::Item(TDEListView* parent_, const KABC::Addressee& add_)
+    : TDEListViewItem(parent_), m_uid(add_.uid()) {
   setText(0, add_.realName());
   setPixmap(0, SmallIcon(TQString::fromLatin1("kaddressbook")));
 }
 
-BorrowerDialog::Item::Item(KListView* parent_, const Data::Borrower& bor_)
-    : KListViewItem(parent_), m_uid(bor_.uid()) {
+BorrowerDialog::Item::Item(TDEListView* parent_, const Data::Borrower& bor_)
+    : TDEListViewItem(parent_), m_uid(bor_.uid()) {
   setText(0, bor_.name());
   setPixmap(0, SmallIcon(TQString::fromLatin1("tellico")));
 }
@@ -44,7 +44,7 @@ BorrowerDialog::BorrowerDialog(TQWidget* parent_, const char* name_/*=0*/)
   setMainWidget(mainWidget);
   TQVBoxLayout* topLayout = new TQVBoxLayout(mainWidget, 0, KDialog::spacingHint());
 
-  m_listView = new KListView(mainWidget);
+  m_listView = new TDEListView(mainWidget);
   topLayout->addWidget(m_listView);
   m_listView->addColumn(i18n("Name"));
   m_listView->setFullWidth(true);
diff --git a/src/borrowerdialog.h b/src/borrowerdialog.h
index e17c27c..afe08d2 100644
--- a/src/borrowerdialog.h
+++ b/src/borrowerdialog.h
@@ -55,14 +55,14 @@ private:
   Data::BorrowerPtr borrower();
 
   TQString m_uid;
-  KListView* m_listView;
+  TDEListView* m_listView;
   KLineEdit* m_lineEdit;
-  TQDict<KListViewItem> m_itemDict;
+  TQDict<TDEListViewItem> m_itemDict;
 
-class Item : public KListViewItem {
+class Item : public TDEListViewItem {
 public:
-  Item(KListView* parent, const KABC::Addressee& addressee);
-  Item(KListView* parent, const Data::Borrower& borrower);
+  Item(TDEListView* parent, const KABC::Addressee& addressee);
+  Item(TDEListView* parent, const Data::Borrower& borrower);
   const TQString& uid() const { return m_uid; }
 
 private:
diff --git a/src/collectionfieldsdialog.cpp b/src/collectionfieldsdialog.cpp
index 06d6473..1044b4f 100644
--- a/src/collectionfieldsdialog.cpp
+++ b/src/collectionfieldsdialog.cpp
@@ -254,7 +254,7 @@ CollectionFieldsDialog::CollectionFieldsDialog(Data::CollPtr coll_, TQWidget* pa
 
   // need to stretch at bottom
   vbox->setStretchFactor(new TQWidget(vbox), 1);
-  KAcceleratorManager::manage(vbox);
+  TDEAcceleratorManager::manage(vbox);
 
   // keep a default collection
   m_defaultCollection = CollectionFactory::collection(m_coll->type(), true);
diff --git a/src/configdialog.cpp b/src/configdialog.cpp
index ed5e67d..c19d939 100644
--- a/src/configdialog.cpp
+++ b/src/configdialog.cpp
@@ -71,9 +71,9 @@ namespace {
 using Tellico::SourceListViewItem;
 using Tellico::ConfigDialog;
 
-SourceListViewItem::SourceListViewItem(KListView* parent_, const GeneralFetcherInfo& info_,
+SourceListViewItem::SourceListViewItem(TDEListView* parent_, const GeneralFetcherInfo& info_,
                                        const TQString& groupName_)
-    : KListViewItem(parent_, info_.name), m_info(info_),
+    : TDEListViewItem(parent_, info_.name), m_info(info_),
       m_configGroup(groupName_), m_newSource(groupName_.isNull()), m_fetcher(0) {
   TQPixmap pix = Fetch::Manager::fetcherIcon(info_.type);
   if(!pix.isNull()) {
@@ -81,9 +81,9 @@ SourceListViewItem::SourceListViewItem(KListView* parent_, const GeneralFetcherI
   }
 }
 
-SourceListViewItem::SourceListViewItem(KListView* parent_, TQListViewItem* after_,
+SourceListViewItem::SourceListViewItem(TDEListView* parent_, TQListViewItem* after_,
                                        const GeneralFetcherInfo& info_, const TQString& groupName_)
-    : KListViewItem(parent_, after_, info_.name), m_info(info_),
+    : TDEListViewItem(parent_, after_, info_.name), m_info(info_),
       m_configGroup(groupName_), m_newSource(groupName_.isNull()), m_fetcher(0) {
   TQPixmap pix = Fetch::Manager::fetcherIcon(info_.type);
   if(!pix.isNull()) {
@@ -404,7 +404,7 @@ void ConfigDialog::setupTemplatePage() {
 
   lab = new TQLabel(i18n("Font:"), fontGroup);
   fontLayout->addWidget(lab, ++row, 0);
-  m_fontCombo = new KFontCombo(fontGroup);
+  m_fontCombo = new TDEFontCombo(fontGroup);
   fontLayout->addWidget(m_fontCombo, row, 1);
   connect(m_fontCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotModified()));
   lab->setBuddy(m_fontCombo);
@@ -493,7 +493,7 @@ void ConfigDialog::setupTemplatePage() {
   // stretch to fill lower area
   l->addStretch(1);
 
-  KAcceleratorManager::manage(frame);
+  TDEAcceleratorManager::manage(frame);
 }
 
 void ConfigDialog::setupFetchPage() {
@@ -502,7 +502,7 @@ void ConfigDialog::setupFetchPage() {
   TQHBoxLayout* l = new TQHBoxLayout(frame, KDialog::marginHint(), KDialog::spacingHint());
 
   TQVBoxLayout* leftLayout = new TQVBoxLayout(l);
-  m_sourceListView = new KListView(frame);
+  m_sourceListView = new TDEListView(frame);
   m_sourceListView->addColumn(i18n("Source"));
   m_sourceListView->setResizeMode(TQListView::LastColumn);
   m_sourceListView->setSorting(-1); // no sorting
@@ -558,7 +558,7 @@ void ConfigDialog::setupFetchPage() {
   connect(m_removeSourceBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveSourceClicked()));
   connect(m_newStuffBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotNewStuffClicked()));
 
-  KAcceleratorManager::manage(frame);
+  TDEAcceleratorManager::manage(frame);
 }
 
 void ConfigDialog::readConfiguration() {
diff --git a/src/configdialog.h b/src/configdialog.h
index d547b65..40b9f42 100644
--- a/src/configdialog.h
+++ b/src/configdialog.h
@@ -24,7 +24,7 @@ class KLineEdit;
 class KIntSpinBox;
 class KPushButton;
 class KIntNumInput;
-class KFontCombo;
+class TDEFontCombo;
 class KColorCombo;
 
 class TQCheckBox;
@@ -172,14 +172,14 @@ private:
 
   GUI::ComboBox* m_templateCombo;
   KPushButton* m_previewButton;
-  KFontCombo* m_fontCombo;
+  TDEFontCombo* m_fontCombo;
   KIntNumInput* m_fontSizeInput;
   KColorCombo* m_baseColorCombo;
   KColorCombo* m_textColorCombo;
   KColorCombo* m_highBaseColorCombo;
   KColorCombo* m_highTextColorCombo;
 
-  KListView* m_sourceListView;
+  TDEListView* m_sourceListView;
   TQMap<SourceListViewItem*, Fetch::ConfigWidget*> m_configWidgets;
   TQPtrList<Fetch::ConfigWidget> m_newStuffConfigWidgets;
   TQPtrList<Fetch::ConfigWidget> m_removedConfigWidgets;
@@ -198,12 +198,12 @@ public:
   bool updateOverwrite : 1;
 };
 
-class SourceListViewItem : public KListViewItem {
+class SourceListViewItem : public TDEListViewItem {
 public:
-  SourceListViewItem(KListView* parent, const GeneralFetcherInfo& info,
+  SourceListViewItem(TDEListView* parent, const GeneralFetcherInfo& info,
                      const TQString& groupName = TQString());
 
-  SourceListViewItem(KListView* parent, TQListViewItem* after,
+  SourceListViewItem(TDEListView* parent, TQListViewItem* after,
                      const GeneralFetcherInfo& info, const TQString& groupName = TQString());
 
   void setConfigGroup(const TQString& s) { m_configGroup = s; }
diff --git a/src/controller.cpp b/src/controller.cpp
index 9e31c6d..bf8e7fe 100644
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -566,7 +566,7 @@ void Controller::plugEntryActions(TQPopupMenu* popup_) {
   m_mainWindow->m_deleteEntry->plug(popup_);
   m_mainWindow->m_mergeEntry->plug(popup_);
   m_mainWindow->m_updateEntryMenu->plug(popup_);
-  // there's a bug in KActionMenu with KXMLGUIFactory::plugActionList
+  // there's a bug in TDEActionMenu with KXMLGUIFactory::plugActionList
   // pluging the menu action isn't enough to have the popup get populated
   plugUpdateMenu(popup_);
   popup_->insertSeparator();
@@ -591,7 +591,7 @@ void Controller::plugUpdateMenu(TQPopupMenu* popup_) {
   // I can't figure out why the actions get duplicated, but they do
   // so clear them all
   m_mainWindow->m_updateAll->unplug(updatePopup);
-  for(TQPtrListIterator<KAction> it(m_mainWindow->m_fetchActions); it.current(); ++it) {
+  for(TQPtrListIterator<TDEAction> it(m_mainWindow->m_fetchActions); it.current(); ++it) {
     it.current()->unplug(updatePopup);
   }
 
@@ -600,7 +600,7 @@ void Controller::plugUpdateMenu(TQPopupMenu* popup_) {
 
   m_mainWindow->m_updateAll->plug(updatePopup);
   updatePopup->insertSeparator();
-  for(TQPtrListIterator<KAction> it(m_mainWindow->m_fetchActions); it.current(); ++it) {
+  for(TQPtrListIterator<TDEAction> it(m_mainWindow->m_fetchActions); it.current(); ++it) {
     it.current()->plug(updatePopup);
   }
 }
@@ -609,7 +609,7 @@ void Controller::updateActions() const {
   bool emptySelection = m_selectedEntries.isEmpty();
   m_mainWindow->stateChanged(TQString::fromLatin1("empty_selection"),
                              emptySelection ? KXMLGUIClient::StateNoReverse : KXMLGUIClient::StateReverse);
-  for(TQPtrListIterator<KAction> it(m_mainWindow->m_fetchActions); it.current(); ++it) {
+  for(TQPtrListIterator<TDEAction> it(m_mainWindow->m_fetchActions); it.current(); ++it) {
     it.current()->setEnabled(!emptySelection);
   }
   //only enable citation items when it's a bibliography
diff --git a/src/detailedentryitem.cpp b/src/detailedentryitem.cpp
index bd2c565..5cdc8f5 100644
--- a/src/detailedentryitem.cpp
+++ b/src/detailedentryitem.cpp
@@ -103,7 +103,7 @@ void DetailedEntryItem::paintCell(TQPainter* p_, const TQColorGroup& cg_,
                 TQColorGroup::Background : TQColorGroup::Base,
                 backgroundColor(column_));
   }
-  // don't call KListViewItem::paintCell() since that also does alternate painting, etc...
+  // don't call TDEListViewItem::paintCell() since that also does alternate painting, etc...
   TQListViewItem::paintCell(p_, cg, column_, width_, align_);
 }
 
diff --git a/src/detailedlistview.cpp b/src/detailedlistview.cpp
index 0a64ecf..8151d56 100644
--- a/src/detailedlistview.cpp
+++ b/src/detailedlistview.cpp
@@ -62,7 +62,7 @@ DetailedListView::DetailedListView(TQWidget* parent_, const char* name_/*=0*/)
   connect(header(), TQT_SIGNAL(sizeChange(int, int, int)),
           this, TQT_SLOT(slotCacheColumnWidth(int, int, int)));
 
-  m_headerMenu = new KPopupMenu(this);
+  m_headerMenu = new TDEPopupMenu(this);
   m_headerMenu->setCheckable(true);
   m_headerMenu->insertTitle(i18n("View Columns"));
   connect(m_headerMenu, TQT_SIGNAL(activated(int)),
@@ -341,7 +341,7 @@ void DetailedListView::contextMenuRequested(TQListViewItem* item_, const TQPoint
   if(!item_) {
     return;
   }
-  KPopupMenu menu(this);
+  TDEPopupMenu menu(this);
   Controller::self()->plugEntryActions(&menu);
   menu.exec(point_);
 }
diff --git a/src/detailedlistview.h b/src/detailedlistview.h
index dba780c..af84d6b 100644
--- a/src/detailedlistview.h
+++ b/src/detailedlistview.h
@@ -22,7 +22,7 @@
 #include <tqpixmap.h>
 #include <tqvaluevector.h>
 
-class KPopupMenu;
+class TDEPopupMenu;
 
 namespace Tellico {
   class DetailedEntryItem;
@@ -194,7 +194,7 @@ private:
     int prev2Sort;
   };
 
-  KPopupMenu* m_headerMenu;
+  TDEPopupMenu* m_headerMenu;
   TQValueVector<int> m_columnWidths;
   TQValueVector<bool> m_isDirty;
   TQValueVector<int> m_imageColumns;
diff --git a/src/entryeditdialog.cpp b/src/entryeditdialog.cpp
index a6d5dd5..5d29160 100644
--- a/src/entryeditdialog.cpp
+++ b/src/entryeditdialog.cpp
@@ -85,7 +85,7 @@ EntryEditDialog::EntryEditDialog(TQWidget* parent_, const char* name_)
   setButtonGuiItem(m_nextBtn, next);
   setButtonGuiItem(m_prevBtn, prev);
 
-  KAccel* accel = new KAccel(this);
+  TDEAccel* accel = new TDEAccel(this);
   accel->insert(TQString::fromLatin1("Go Prev"), TQString(), prev.toolTip(), TQt::Key_PageUp,
                 Controller::self(), TQT_SLOT(slotGoPrevEntry()));
   accel->insert(TQString::fromLatin1("Go Next"), TQString(), next.toolTip(), TQt::Key_PageDown,
@@ -264,7 +264,7 @@ void EntryEditDialog::setLayout(Data::CollPtr coll_) {
 
   // update keyboard accels
   // only want to manage tabBar()
-  KAcceleratorManager::manage(m_tabs->tabBar());
+  TDEAcceleratorManager::manage(m_tabs->tabBar());
 
   m_tabs->setCurrentPage(0);
 
diff --git a/src/entryiconview.cpp b/src/entryiconview.cpp
index 5b8ea67..f08aa58 100644
--- a/src/entryiconview.cpp
+++ b/src/entryiconview.cpp
@@ -269,7 +269,7 @@ void EntryIconView::updateSelected(EntryIconViewItem* item_, bool s_) const {
 }
 
 void EntryIconView::slotShowContextMenu(TQIconViewItem* item_, const TQPoint& point_) {
-  KPopupMenu menu(this);
+  TDEPopupMenu menu(this);
 
   // only insert entry items if one is selected
   if(item_) {
@@ -277,7 +277,7 @@ void EntryIconView::slotShowContextMenu(TQIconViewItem* item_, const TQPoint& po
     menu.insertSeparator();
   }
 
-  KPopupMenu sortMenu(&menu);
+  TDEPopupMenu sortMenu(&menu);
   const TQStringList titles = m_coll->fieldTitles();
   for(TQStringList::ConstIterator it = titles.begin(); it != titles.end(); ++it) {
     sortMenu.insertItem(*it);
@@ -289,7 +289,7 @@ void EntryIconView::slotShowContextMenu(TQIconViewItem* item_, const TQPoint& po
 }
 
 void EntryIconView::slotSortMenuActivated(int id_) {
-  const KPopupMenu* menu = ::tqqt_cast<KPopupMenu*>(sender());
+  const TDEPopupMenu* menu = ::tqqt_cast<TDEPopupMenu*>(sender());
   if(menu) {
     TQString title = menu->text(id_);
     Data::FieldPtr f = m_coll->fieldByTitle(title);
diff --git a/src/entryitem.h b/src/entryitem.h
index 74c95cd..46958ac 100644
--- a/src/entryitem.h
+++ b/src/entryitem.h
@@ -42,7 +42,7 @@ public:
    */
   EntryItem(GUI::ListView* parent, Data::EntryPtr entry);
   /**
-   * This constructor is for items which have other KListViewItems as parents. It
+   * This constructor is for items which have other TDEListViewItems as parents. It
    * initializes the text in the first column, as well.
    *
    * @param parent A pointer to the parent
diff --git a/src/entryupdater.cpp b/src/entryupdater.cpp
index 846ca73..c30a97c 100644
--- a/src/entryupdater.cpp
+++ b/src/entryupdater.cpp
@@ -221,23 +221,23 @@ Tellico::EntryUpdater::UpdateResult EntryUpdater::askUser(ResultList results) {
   GUI::RichTextLabel* l = new GUI::RichTextLabel(s, hbox);
   hbox->setStretchFactor(l, 100);
 
-  KListView* view = new KListView(box);
+  TDEListView* view = new TDEListView(box);
   view->setShowSortIndicator(true);
   view->setAllColumnsShowFocus(true);
   view->setResizeMode(TQListView::AllColumns);
   view->setMinimumWidth(640);
   view->addColumn(i18n("Title"));
   view->addColumn(i18n("Description"));
-  TQMap<KListViewItem*, UpdateResult> map;
+  TQMap<TDEListViewItem*, UpdateResult> map;
   for(ResultList::Iterator res = results.begin(); res != results.end(); ++res) {
-    map.insert(new KListViewItem(view, (*res).first->fetchEntry()->title(), (*res).first->desc), *res);
+    map.insert(new TDEListViewItem(view, (*res).first->fetchEntry()->title(), (*res).first->desc), *res);
   }
 
   dlg.setMainWidget(box);
   if(dlg.exec() != TQDialog::Accepted) {
     return UpdateResult(0, false);
   }
-  KListViewItem* item = static_cast<KListViewItem*>(view->selectedItem());
+  TDEListViewItem* item = static_cast<TDEListViewItem*>(view->selectedItem());
   if(!item) {
     return UpdateResult(0, false);
   }
diff --git a/src/fetch/amazonfetcher.cpp b/src/fetch/amazonfetcher.cpp
index 6705e67..754842f 100644
--- a/src/fetch/amazonfetcher.cpp
+++ b/src/fetch/amazonfetcher.cpp
@@ -902,7 +902,7 @@ AmazonFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const AmazonFetcher
 
   addFieldsWidget(AmazonFetcher::customFields(), fetcher_ ? fetcher_->m_fields : TQStringList());
 
-  KAcceleratorManager::manage(optionsWidget());
+  TDEAcceleratorManager::manage(optionsWidget());
 }
 
 void AmazonFetcher::ConfigWidget::saveConfig(TDEConfigGroup& config_) {
diff --git a/src/fetch/configwidget.cpp b/src/fetch/configwidget.cpp
index 8e1e5b7..9c68578 100644
--- a/src/fetch/configwidget.cpp
+++ b/src/fetch/configwidget.cpp
@@ -48,7 +48,7 @@ void ConfigWidget::addFieldsWidget(const StringMap& customFields_, const TQStrin
     connect(cb, TQT_SIGNAL(clicked()), TQT_SLOT(slotSetModified()));
   }
 
-  KAcceleratorManager::manage(this);
+  TDEAcceleratorManager::manage(this);
 
   return;
 }
diff --git a/src/fetch/execexternalfetcher.cpp b/src/fetch/execexternalfetcher.cpp
index 4430317..5c95610 100644
--- a/src/fetch/execexternalfetcher.cpp
+++ b/src/fetch/execexternalfetcher.cpp
@@ -454,7 +454,7 @@ ExecExternalFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const ExecExt
     m_formatCombo->setCurrentItem(formatMap[Import::TellicoXML]);
   }
   m_deleteOnRemove = fetcher_ && fetcher_->m_deleteOnRemove;
-  KAcceleratorManager::manage(optionsWidget());
+  TDEAcceleratorManager::manage(optionsWidget());
 }
 
 ExecExternalFetcher::ConfigWidget::~ConfigWidget() {
diff --git a/src/fetch/gcstarpluginfetcher.cpp b/src/fetch/gcstarpluginfetcher.cpp
index 49c9178..59d2386 100644
--- a/src/fetch/gcstarpluginfetcher.cpp
+++ b/src/fetch/gcstarpluginfetcher.cpp
@@ -437,7 +437,7 @@ GCstarPluginFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const GCstarP
     m_originalPluginName = fetcher_->m_plugin;
   }
 
-  KAcceleratorManager::manage(optionsWidget());
+  TDEAcceleratorManager::manage(optionsWidget());
 }
 
 GCstarPluginFetcher::ConfigWidget::~ConfigWidget() {
diff --git a/src/fetch/srufetcher.cpp b/src/fetch/srufetcher.cpp
index 38bf62a..482efa2 100644
--- a/src/fetch/srufetcher.cpp
+++ b/src/fetch/srufetcher.cpp
@@ -492,7 +492,7 @@ SRUConfigWidget::SRUConfigWidget(TQWidget* parent_, const SRUFetcher* fetcher_ /
     m_pathEdit->setText(fetcher_->m_path);
     m_formatCombo->setCurrentData(fetcher_->m_format);
   }
-  KAcceleratorManager::manage(optionsWidget());
+  TDEAcceleratorManager::manage(optionsWidget());
 }
 
 void SRUConfigWidget::saveConfig(TDEConfigGroup& config_) {
diff --git a/src/fetch/z3950fetcher.cpp b/src/fetch/z3950fetcher.cpp
index 0bec0c7..2a63fe9 100644
--- a/src/fetch/z3950fetcher.cpp
+++ b/src/fetch/z3950fetcher.cpp
@@ -633,7 +633,7 @@ Z3950Fetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const Z3950Fetcher*
     m_syntax = fetcher_->m_syntax;
     m_syntaxCombo->setCurrentData(m_syntax);
   }
-  KAcceleratorManager::manage(optionsWidget());
+  TDEAcceleratorManager::manage(optionsWidget());
 
   // start with presets turned off
   m_usePreset->setChecked(fetcher_ && !fetcher_->m_preset.isEmpty());
diff --git a/src/fetchdialog.cpp b/src/fetchdialog.cpp
index 441fc2d..7b47dd8 100644
--- a/src/fetchdialog.cpp
+++ b/src/fetchdialog.cpp
@@ -243,7 +243,7 @@ FetchDialog::FetchDialog(TQWidget* parent_, const char* name_)
   // make sure to delete results afterwards
   m_results.setAutoDelete(true);
 
-  KAcceleratorManager::manage(this);
+  TDEAcceleratorManager::manage(this);
   // initialize combos
   TQTimer::singleShot(0, this, TQT_SLOT(slotInit()));
 
diff --git a/src/filterview.cpp b/src/filterview.cpp
index 57061a2..055d16e 100644
--- a/src/filterview.cpp
+++ b/src/filterview.cpp
@@ -63,7 +63,7 @@ void FilterView::contextMenuRequested(TQListViewItem* item_, const TQPoint& poin
 
   GUI::ListViewItem* item = static_cast<GUI::ListViewItem*>(item_);
   if(item->isFilterItem()) {
-    KPopupMenu menu(this);
+    TDEPopupMenu menu(this);
     menu.insertItem(SmallIconSet(TQString::fromLatin1("filter")),
                     i18n("Modify Filter"), this, TQT_SLOT(slotModifyFilter()));
     menu.insertItem(SmallIconSet(TQString::fromLatin1("editdelete")),
diff --git a/src/groupview.cpp b/src/groupview.cpp
index 24e945c..0724d39 100644
--- a/src/groupview.cpp
+++ b/src/groupview.cpp
@@ -245,7 +245,7 @@ void GroupView::contextMenuRequested(TQListViewItem* item_, const TQPoint& point
     return;
   }
 
-  KPopupMenu menu(this);
+  TDEPopupMenu menu(this);
   GUI::ListViewItem* item = static_cast<GUI::ListViewItem*>(item_);
   if(item->isEntryGroupItem()) {
     menu.insertItem(SmallIconSet(TQString::fromLatin1("2downarrow")),
diff --git a/src/gui/counteditem.cpp b/src/gui/counteditem.cpp
index 536d08e..56f4575 100644
--- a/src/gui/counteditem.cpp
+++ b/src/gui/counteditem.cpp
@@ -54,7 +54,7 @@ void CountedItem::paintCell(TQPainter* p_, const TQColorGroup& cg_,
   }
 
   // set a catchable text so that we can have our own implementation (see further down)
-  // but still benefit from KListView::paintCell
+  // but still benefit from TDEListView::paintCell
   TQString oldText = text(column_);
 //  if(oldText.isEmpty()) {
   if(oldText == '\t') {
diff --git a/src/gui/lineedit.cpp b/src/gui/lineedit.cpp
index db77b29..b71667e 100644
--- a/src/gui/lineedit.cpp
+++ b/src/gui/lineedit.cpp
@@ -28,7 +28,7 @@ LineEdit::LineEdit(TQWidget* parent_, const char* name_) : KLineEdit(parent_, na
     , m_allowSpellCheck(false)
     , m_enableSpellCheck(true)
     , m_spell(0) {
-  m_spellAction = KStdAction::spelling(TQT_TQOBJECT(this), TQT_SLOT(slotCheckSpelling()), new KActionCollection(this));
+  m_spellAction = KStdAction::spelling(TQT_TQOBJECT(this), TQT_SLOT(slotCheckSpelling()), new TDEActionCollection(this));
 }
 
 void LineEdit::clear() {
diff --git a/src/gui/lineedit.h b/src/gui/lineedit.h
index a39d8a8..d2f9873 100644
--- a/src/gui/lineedit.h
+++ b/src/gui/lineedit.h
@@ -18,7 +18,7 @@
 
 #include <tqstring.h>
 
-class KAction;
+class TDEAction;
 class KSpell;
 
 namespace Tellico {
@@ -62,7 +62,7 @@ private slots:
 private:
   TQString m_hint;
   bool m_drawHint;
-  KAction* m_spellAction;
+  TDEAction* m_spellAction;
   bool m_allowSpellCheck;
   bool m_enableSpellCheck;
   KSpell* m_spell;
diff --git a/src/gui/listview.cpp b/src/gui/listview.cpp
index 4b8c250..5c1a38c 100644
--- a/src/gui/listview.cpp
+++ b/src/gui/listview.cpp
@@ -25,7 +25,7 @@
 using Tellico::GUI::ListView;
 using Tellico::GUI::ListViewItem;
 
-ListView::ListView(TQWidget* parent_, const char* name_) : KListView(parent_, name_/*=0*/),
+ListView::ListView(TQWidget* parent_, const char* name_) : TDEListView(parent_, name_/*=0*/),
     m_sortStyle(SortByText), m_isClear(true) {
   setSelectionMode(TQListView::Extended);
   connect(this, TQT_SIGNAL(selectionChanged()),
@@ -113,7 +113,7 @@ int ListView::lastVisibleColumn() const {
 
 void ListView::setColumnText(int column, const TQString& label) {
   ListViewComparison* comp = m_comparisons.take(columnText(column));
-  KListView::setColumnText(column, label);
+  TDEListView::setColumnText(column, label);
   if(comp) {
     m_comparisons.insert(columnText(column), comp);
   }
@@ -227,7 +227,7 @@ void ListView::slotDoubleClicked(TQListViewItem* item_) {
 void ListView::drawContentsOffset(TQPainter* p, int ox, int oy, int cx, int cy, int cw, int ch) {
   bool oldUpdatesEnabled = isUpdatesEnabled();
   setUpdatesEnabled(false);
-  KListView::drawContentsOffset(p, ox, oy, cx, cy, cw, ch);
+  TDEListView::drawContentsOffset(p, ox, oy, cx, cy, cw, ch);
   setUpdatesEnabled(oldUpdatesEnabled);
 }
 
@@ -259,7 +259,7 @@ int ListViewItem::compare(TQListViewItem* item_, int col_, bool asc_) const {
     return res;
   }
   res = listView()->compare(col_, this, static_cast<GUI::ListViewItem*>(item_), asc_);
-  return res == 0 ? KListViewItem::compare(item_, col_, asc_) : res;
+  return res == 0 ? TDEListViewItem::compare(item_, col_, asc_) : res;
 }
 
 int ListViewItem::compareWeight(TQListViewItem* item_, int col_, bool asc_) const {
@@ -288,13 +288,13 @@ void ListViewItem::setSelected(bool s_) {
   }
   if(s_ != isSelected()) {
     lv->updateSelected(this, s_);
-    KListViewItem::setSelected(s_);
+    TDEListViewItem::setSelected(s_);
   }
 }
 
 TQColor ListViewItem::backgroundColor(int column_) {
 #if KDE_IS_VERSION(3,3,90)
-  return KListViewItem::backgroundColor(column_);
+  return TDEListViewItem::backgroundColor(column_);
 #else
   ListView* view = listView();
   if(view->columns() > 1 && view->shadeSortColumn() && column_ == view->sortColumn()) {
@@ -307,7 +307,7 @@ TQColor ListViewItem::backgroundColor(int column_) {
 void ListViewItem::paintCell(TQPainter* p_, const TQColorGroup& cg_,
                              int column_, int width_, int align_) {
   // taken from klistview.cpp
-  // I can't call KListViewItem::paintCell since KListViewItem::backgroundCOlor(int) is
+  // I can't call TDEListViewItem::paintCell since TDEListViewItem::backgroundCOlor(int) is
   // not virtual. I need to be sure to call ListViewItem::backgroundColor(int);
   TQColorGroup cg = cg_;
   const TQPixmap* pm = listView()->viewport()->backgroundPixmap();
@@ -321,7 +321,7 @@ void ListViewItem::paintCell(TQPainter* p_, const TQColorGroup& cg_,
                 backgroundColor(column_));
   }
 
-  // don't call KListViewItem::paintCell() since that also does alternate painting, etc...
+  // don't call TDEListViewItem::paintCell() since that also does alternate painting, etc...
   TQListViewItem::paintCell(p_, cg, column_, width_, align_);
 
   // borrowed from amarok, draw line to left of cell
diff --git a/src/gui/listview.h b/src/gui/listview.h
index 47d3e8e..8e0be06 100644
--- a/src/gui/listview.h
+++ b/src/gui/listview.h
@@ -40,7 +40,7 @@ typedef TQPtrListIterator<ListViewItem> ListViewItemListIt;
  *
  * @author Robby Stephenson
  */
-class ListView : public KListView {
+class ListView : public TDEListView {
 Q_OBJECT
   
 
@@ -130,13 +130,13 @@ private:
  *
  * @author Robby Stephenson
  */
-class ListViewItem : public KListViewItem {
+class ListViewItem : public TDEListViewItem {
 public:
-  ListViewItem(ListView* parent) : KListViewItem(parent), m_sortWeight(-1) {}
-  ListViewItem(ListView* parent, TQListViewItem* after) : KListViewItem(parent, after), m_sortWeight(-1) {}
-  ListViewItem(ListViewItem* parent) : KListViewItem(parent), m_sortWeight(-1) {}
-  ListViewItem(ListView* parent, const TQString& text) : KListViewItem(parent, text), m_sortWeight(-1) {}
-  ListViewItem(ListViewItem* parent, const TQString& text) : KListViewItem(parent, text), m_sortWeight(-1) {}
+  ListViewItem(ListView* parent) : TDEListViewItem(parent), m_sortWeight(-1) {}
+  ListViewItem(ListView* parent, TQListViewItem* after) : TDEListViewItem(parent, after), m_sortWeight(-1) {}
+  ListViewItem(ListViewItem* parent) : TDEListViewItem(parent), m_sortWeight(-1) {}
+  ListViewItem(ListView* parent, const TQString& text) : TDEListViewItem(parent, text), m_sortWeight(-1) {}
+  ListViewItem(ListViewItem* parent, const TQString& text) : TDEListViewItem(parent, text), m_sortWeight(-1) {}
   virtual ~ListViewItem();
 
   virtual int realChildCount() const { return childCount(); }
@@ -160,11 +160,11 @@ public:
    * @param column The column number
    * @param alternate The alternate row color can be forced
    */
-  virtual TQColor backgroundColor(int column); // not virtual in KListViewItem!!!
+  virtual TQColor backgroundColor(int column); // not virtual in TDEListViewItem!!!
   virtual void paintCell(TQPainter* painter, const TQColorGroup& colorGroup,
                          int column, int width, int alignment);
 
-  ListView* listView () const { return static_cast<ListView*>(KListViewItem::listView()); }
+  ListView* listView () const { return static_cast<ListView*>(TDEListViewItem::listView()); }
 
   virtual void doubleClicked() {}
   virtual Data::EntryVec entries() const;
diff --git a/src/gui/stringmapdialog.cpp b/src/gui/stringmapdialog.cpp
index bf03ae9..fb3878d 100644
--- a/src/gui/stringmapdialog.cpp
+++ b/src/gui/stringmapdialog.cpp
@@ -32,7 +32,7 @@ StringMapDialog::StringMapDialog(const TQMap<TQString, TQString>& map_, TQWidget
   TQWidget* page = new TQWidget(this);
   TQVBoxLayout* l = new TQVBoxLayout(page, 0, KDialog::spacingHint());
 
-  m_listView = new KListView(page);
+  m_listView = new TDEListView(page);
   m_listView->setAllColumnsShowFocus(true);
   m_listView->setShowSortIndicator(true);
   m_listView->addColumn(TQString());
@@ -65,7 +65,7 @@ StringMapDialog::StringMapDialog(const TQMap<TQString, TQString>& map_, TQWidget
 
   for(TQMap<TQString, TQString>::ConstIterator it = map_.begin(); it != map_.end(); ++it) {
     if(!it.data().isEmpty()) {
-      (void) new KListViewItem(m_listView, it.key(), it.data());
+      (void) new TDEListViewItem(m_listView, it.key(), it.data());
     }
   }
 
@@ -83,7 +83,7 @@ void StringMapDialog::slotAdd() {
   if(item && s1 == item->text(0)) { // only update values if same key
     item->setText(1, s2);
   } else {
-    item = new KListViewItem(m_listView, s1, s2);
+    item = new TDEListViewItem(m_listView, s1, s2);
   }
   m_listView->ensureItemVisible(item);
   m_listView->setSelected(item, true);
diff --git a/src/gui/stringmapdialog.h b/src/gui/stringmapdialog.h
index 974bcf4..ac9b10a 100644
--- a/src/gui/stringmapdialog.h
+++ b/src/gui/stringmapdialog.h
@@ -15,7 +15,7 @@
 #define STRINGMAPDIALOG_H
 
 class KLineEdit;
-class KListView;
+class TDEListView;
 class TQListViewItem;
 
 #include <kdialogbase.h>
@@ -28,7 +28,7 @@ namespace Tellico {
 /**
  * @short A simple dialog for editing a map between two strings.
  *
- * A \ref KListView is used with the map keys in the first column and
+ * A \ref TDEListView is used with the map keys in the first column and
  * the map values in the second. Two edit boxes are below the list view.
  * When an item is selected, the key-value is pair is placed in the edit
  * boxes. Add and Delete buttons are used to add a new pair, or to remove
@@ -63,7 +63,7 @@ private slots:
   void slotUpdate(TQListViewItem* item);
 
 protected:
-  KListView* m_listView;
+  TDEListView* m_listView;
   KLineEdit* m_edit1;
   KLineEdit* m_edit2;
 };
diff --git a/src/gui/tablefieldwidget.cpp b/src/gui/tablefieldwidget.cpp
index 81c9dba..fb5afe5 100644
--- a/src/gui/tablefieldwidget.cpp
+++ b/src/gui/tablefieldwidget.cpp
@@ -237,7 +237,7 @@ bool TableFieldWidget::eventFilter(TQObject* obj_, TQEvent* ev_) {
       }
       m_row = -1;
       m_col = col;
-      KPopupMenu menu(this);
+      TDEPopupMenu menu(this);
       menu.insertItem(SmallIconSet(TQString::fromLatin1("edit")), i18n("Rename Column..."),
                       this, TQT_SLOT(slotRenameColumn()));
       menu.exec(ev->globalPos());
@@ -270,7 +270,7 @@ void TableFieldWidget::contextMenu(int row_, int col_, const TQPoint& p_) {
   m_col = col_;
 
   int id;
-  KPopupMenu menu(this);
+  TDEPopupMenu menu(this);
   menu.insertItem(SmallIconSet(TQString::fromLatin1("insrow")), i18n("Insert Row"),
                   this, TQT_SLOT(slotInsertRow()));
   menu.insertItem(SmallIconSet(TQString::fromLatin1("remrow")), i18n("Remove Row"),
diff --git a/src/loanview.cpp b/src/loanview.cpp
index 7f7d36d..9744d74 100644
--- a/src/loanview.cpp
+++ b/src/loanview.cpp
@@ -69,7 +69,7 @@ void LoanView::contextMenuRequested(TQListViewItem* item_, const TQPoint& point_
 
   GUI::ListViewItem* item = static_cast<GUI::ListViewItem*>(item_);
   if(item->isLoanItem()) {
-    KPopupMenu menu(this);
+    TDEPopupMenu menu(this);
     menu.insertItem(SmallIconSet(TQString::fromLatin1("2downarrow")),
                     i18n("Check-in"), this, TQT_SLOT(slotCheckIn()));
     menu.insertItem(SmallIconSet(TQString::fromLatin1("2downarrow")),
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 72924aa..318bc51 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -98,7 +98,7 @@ namespace {
 
 using Tellico::MainWindow;
 
-MainWindow::MainWindow(TQWidget* parent_/*=0*/, const char* name_/*=0*/) : KMainWindow(parent_, name_),
+MainWindow::MainWindow(TQWidget* parent_/*=0*/, const char* name_/*=0*/) : TDEMainWindow(parent_, name_),
     ApplicationInterface(),
     m_updateAll(0),
     m_statusBar(0),
@@ -186,14 +186,14 @@ void MainWindow::initActions() {
   connect(collectionMapper, TQT_SIGNAL(mapped(int)),
           TQT_TQOBJECT(this), TQT_SLOT(slotFileNew(int)));
 
-  KActionMenu* fileNewMenu = new KActionMenu(actionCollection(), "file_new_collection");
+  TDEActionMenu* fileNewMenu = new TDEActionMenu(actionCollection(), "file_new_collection");
   fileNewMenu->setText(i18n("New"));
 //  fileNewMenu->setIconSet(BarIconSet(TQString::fromLatin1("filenew"))); // doesn't work
   fileNewMenu->setIconSet(BarIcon(TQString::fromLatin1("filenew")));
   fileNewMenu->setToolTip(i18n("Create a new collection"));
   fileNewMenu->setDelayed(false);
 
-  KAction* action = new KAction(actionCollection(), "new_book_collection");
+  TDEAction* action = new TDEAction(actionCollection(), "new_book_collection");
   action->setText(i18n("New &Book Collection"));
   action->setIconSet(UserIconSet(TQString::fromLatin1("book")));
   action->setToolTip(i18n("Create a new book collection"));
@@ -201,7 +201,7 @@ void MainWindow::initActions() {
   connect(action, TQT_SIGNAL(activated()), collectionMapper, TQT_SLOT(map()));
   collectionMapper->setMapping(action, Data::Collection::Book);
 
-  action = new KAction(actionCollection(), "new_bibtex_collection");
+  action = new TDEAction(actionCollection(), "new_bibtex_collection");
   action->setText(i18n("New B&ibliography"));
   action->setIconSet(UserIconSet(TQString::fromLatin1("bibtex")));
   action->setToolTip(i18n("Create a new bibtex bibliography"));
@@ -209,7 +209,7 @@ void MainWindow::initActions() {
   connect(action, TQT_SIGNAL(activated()), collectionMapper, TQT_SLOT(map()));
   collectionMapper->setMapping(action, Data::Collection::Bibtex);
 
-  action = new KAction(actionCollection(), "new_comic_book_collection");
+  action = new TDEAction(actionCollection(), "new_comic_book_collection");
   action->setText(i18n("New &Comic Book Collection"));
   action->setIconSet(UserIconSet(TQString::fromLatin1("comic")));
   action->setToolTip(i18n("Create a new comic book collection"));
@@ -217,7 +217,7 @@ void MainWindow::initActions() {
   connect(action, TQT_SIGNAL(activated()), collectionMapper, TQT_SLOT(map()));
   collectionMapper->setMapping(action, Data::Collection::ComicBook);
 
-  action = new KAction(actionCollection(), "new_video_collection");
+  action = new TDEAction(actionCollection(), "new_video_collection");
   action->setText(i18n("New &Video Collection"));
   action->setIconSet(UserIconSet(TQString::fromLatin1("video")));
   action->setToolTip(i18n("Create a new video collection"));
@@ -225,7 +225,7 @@ void MainWindow::initActions() {
   connect(action, TQT_SIGNAL(activated()), collectionMapper, TQT_SLOT(map()));
   collectionMapper->setMapping(action, Data::Collection::Video);
 
-  action = new KAction(actionCollection(), "new_music_collection");
+  action = new TDEAction(actionCollection(), "new_music_collection");
   action->setText(i18n("New &Music Collection"));
   action->setIconSet(UserIconSet(TQString::fromLatin1("album")));
   action->setToolTip(i18n("Create a new music collection"));
@@ -233,7 +233,7 @@ void MainWindow::initActions() {
   connect(action, TQT_SIGNAL(activated()), collectionMapper, TQT_SLOT(map()));
   collectionMapper->setMapping(action, Data::Collection::Album);
 
-  action = new KAction(actionCollection(), "new_coin_collection");
+  action = new TDEAction(actionCollection(), "new_coin_collection");
   action->setText(i18n("New C&oin Collection"));
   action->setIconSet(UserIconSet(TQString::fromLatin1("coin")));
   action->setToolTip(i18n("Create a new coin collection"));
@@ -241,7 +241,7 @@ void MainWindow::initActions() {
   connect(action, TQT_SIGNAL(activated()), collectionMapper, TQT_SLOT(map()));
   collectionMapper->setMapping(action, Data::Collection::Coin);
 
-  action = new KAction(actionCollection(), "new_stamp_collection");
+  action = new TDEAction(actionCollection(), "new_stamp_collection");
   action->setText(i18n("New &Stamp Collection"));
   action->setIconSet(UserIconSet(TQString::fromLatin1("stamp")));
   action->setToolTip(i18n("Create a new stamp collection"));
@@ -249,7 +249,7 @@ void MainWindow::initActions() {
   connect(action, TQT_SIGNAL(activated()), collectionMapper, TQT_SLOT(map()));
   collectionMapper->setMapping(action, Data::Collection::Stamp);
 
-  action = new KAction(actionCollection(), "new_card_collection");
+  action = new TDEAction(actionCollection(), "new_card_collection");
   action->setText(i18n("New C&ard Collection"));
   action->setIconSet(UserIconSet(TQString::fromLatin1("card")));
   action->setToolTip(i18n("Create a new trading card collection"));
@@ -257,7 +257,7 @@ void MainWindow::initActions() {
   connect(action, TQT_SIGNAL(activated()), collectionMapper, TQT_SLOT(map()));
   collectionMapper->setMapping(action, Data::Collection::Card);
 
-  action = new KAction(actionCollection(), "new_wine_collection");
+  action = new TDEAction(actionCollection(), "new_wine_collection");
   action->setText(i18n("New &Wine Collection"));
   action->setIconSet(UserIconSet(TQString::fromLatin1("wine")));
   action->setToolTip(i18n("Create a new wine collection"));
@@ -265,7 +265,7 @@ void MainWindow::initActions() {
   connect(action, TQT_SIGNAL(activated()), collectionMapper, TQT_SLOT(map()));
   collectionMapper->setMapping(action, Data::Collection::Wine);
 
-  action = new KAction(actionCollection(), "new_game_collection");
+  action = new TDEAction(actionCollection(), "new_game_collection");
   action->setText(i18n("New &Game Collection"));
   action->setIconSet(UserIconSet(TQString::fromLatin1("game")));
   action->setToolTip(i18n("Create a new game collection"));
@@ -273,7 +273,7 @@ void MainWindow::initActions() {
   connect(action, TQT_SIGNAL(activated()), collectionMapper, TQT_SLOT(map()));
 
   collectionMapper->setMapping(action, Data::Collection::Game);
-  action = new KAction(actionCollection(), "new_boardgame_collection");
+  action = new TDEAction(actionCollection(), "new_boardgame_collection");
   action->setText(i18n("New Boa&rd Game Collection"));
   action->setIconSet(UserIconSet(TQString::fromLatin1("boardgame")));
   action->setToolTip(i18n("Create a new board game collection"));
@@ -281,7 +281,7 @@ void MainWindow::initActions() {
   connect(action, TQT_SIGNAL(activated()), collectionMapper, TQT_SLOT(map()));
   collectionMapper->setMapping(action, Data::Collection::BoardGame);
 
-  action = new KAction(actionCollection(), "new_file_catalog");
+  action = new TDEAction(actionCollection(), "new_file_catalog");
   action->setText(i18n("New &File Catalog"));
   action->setIconSet(UserIconSet(TQString::fromLatin1("file")));
   action->setToolTip(i18n("Create a new file catalog"));
@@ -289,7 +289,7 @@ void MainWindow::initActions() {
   connect(action, TQT_SIGNAL(activated()), collectionMapper, TQT_SLOT(map()));
   collectionMapper->setMapping(action, Data::Collection::File);
 
-  action = new KAction(actionCollection(), "new_custom_collection");
+  action = new TDEAction(actionCollection(), "new_custom_collection");
   action->setText(i18n("New C&ustom Collection"));
   action->setIconSet(UserIconSet(TQString::fromLatin1("filenew")));
   action->setToolTip(i18n("Create a new custom collection"));
@@ -319,13 +319,13 @@ void MainWindow::initActions() {
   connect(importMapper, TQT_SIGNAL(mapped(int)),
           TQT_TQOBJECT(this), TQT_SLOT(slotFileImport(int)));
 
-  KActionMenu* importMenu = new KActionMenu(actionCollection(), "file_import");
+  TDEActionMenu* importMenu = new TDEActionMenu(actionCollection(), "file_import");
   importMenu->setText(i18n("&Import"));
   importMenu->setIconSet(BarIconSet(TQString::fromLatin1("fileimport")));
   importMenu->setToolTip(i18n("Import collection data from other formats"));
   importMenu->setDelayed(false);
 
-  action = new KAction(actionCollection(), "file_import_tellico");
+  action = new TDEAction(actionCollection(), "file_import_tellico");
   action->setText(i18n("Import Tellico Data..."));
   action->setToolTip(i18n("Import another Tellico data file"));
   action->setIcon(TQString::fromLatin1("tellico"));
@@ -333,7 +333,7 @@ void MainWindow::initActions() {
   connect(action, TQT_SIGNAL(activated()), importMapper, TQT_SLOT(map()));
   importMapper->setMapping(action, Import::TellicoXML);
 
-  action = new KAction(actionCollection(), "file_import_csv");
+  action = new TDEAction(actionCollection(), "file_import_csv");
   action->setText(i18n("Import CSV Data..."));
   action->setToolTip(i18n("Import a CSV file"));
   action->setIcon(MIME_ICON("text/x-csv"));
@@ -341,7 +341,7 @@ void MainWindow::initActions() {
   connect(action, TQT_SIGNAL(activated()), importMapper, TQT_SLOT(map()));
   importMapper->setMapping(action, Import::CSV);
 
-  action = new KAction(actionCollection(), "file_import_mods");
+  action = new TDEAction(actionCollection(), "file_import_mods");
   action->setText(i18n("Import MODS Data..."));
   action->setToolTip(i18n("Import a MODS data file"));
   action->setIcon(MIME_ICON("text/xml"));
@@ -349,7 +349,7 @@ void MainWindow::initActions() {
   connect(action, TQT_SIGNAL(activated()), importMapper, TQT_SLOT(map()));
   importMapper->setMapping(action, Import::MODS);
 
-  action = new KAction(actionCollection(), "file_import_alexandria");
+  action = new TDEAction(actionCollection(), "file_import_alexandria");
   action->setText(i18n("Import Alexandria Data..."));
   action->setToolTip(i18n("Import data from the Alexandria book collection manager"));
   action->setIcon(TQString::fromLatin1("alexandria"));
@@ -357,7 +357,7 @@ void MainWindow::initActions() {
   connect(action, TQT_SIGNAL(activated()), importMapper, TQT_SLOT(map()));
   importMapper->setMapping(action, Import::Alexandria);
 
-  action = new KAction(actionCollection(), "file_import_delicious");
+  action = new TDEAction(actionCollection(), "file_import_delicious");
   action->setText(i18n("Import Delicious Library Data..."));
   action->setToolTip(i18n("Import data from Delicious Library"));
   action->setIcon(MIME_ICON("text/xml"));
@@ -365,7 +365,7 @@ void MainWindow::initActions() {
   connect(action, TQT_SIGNAL(activated()), importMapper, TQT_SLOT(map()));
   importMapper->setMapping(action, Import::Delicious);
 
-  action = new KAction(actionCollection(), "file_import_referencer");
+  action = new TDEAction(actionCollection(), "file_import_referencer");
   action->setText(i18n("Import Referencer Data..."));
   action->setToolTip(i18n("Import data from Referencer"));
   action->setIcon(TQString::fromLatin1("referencer"));
@@ -373,7 +373,7 @@ void MainWindow::initActions() {
   connect(action, TQT_SIGNAL(activated()), importMapper, TQT_SLOT(map()));
   importMapper->setMapping(action, Import::Referencer);
 
-  action = new KAction(actionCollection(), "file_import_bibtex");
+  action = new TDEAction(actionCollection(), "file_import_bibtex");
   action->setText(i18n("Import Bibtex Data..."));
   action->setToolTip(i18n("Import a bibtex bibliography file"));
   action->setIcon(MIME_ICON("text/x-bibtex"));
@@ -381,7 +381,7 @@ void MainWindow::initActions() {
   connect(action, TQT_SIGNAL(activated()), importMapper, TQT_SLOT(map()));
   importMapper->setMapping(action, Import::Bibtex);
 
-  action = new KAction(actionCollection(), "file_import_bibtexml");
+  action = new TDEAction(actionCollection(), "file_import_bibtexml");
   action->setText(i18n("Import Bibtexml Data..."));
   action->setToolTip(i18n("Import a Bibtexml bibliography file"));
   action->setIcon(MIME_ICON("text/xml"));
@@ -389,7 +389,7 @@ void MainWindow::initActions() {
   connect(action, TQT_SIGNAL(activated()), importMapper, TQT_SLOT(map()));
   importMapper->setMapping(action, Import::Bibtexml);
 
-  action = new KAction(actionCollection(), "file_import_ris");
+  action = new TDEAction(actionCollection(), "file_import_ris");
   action->setText(i18n("Import RIS Data..."));
   action->setToolTip(i18n("Import an RIS reference file"));
   action->setIcon(MIME_ICON("application/x-research-info-systems"));
@@ -397,7 +397,7 @@ void MainWindow::initActions() {
   connect(action, TQT_SIGNAL(activated()), importMapper, TQT_SLOT(map()));
   importMapper->setMapping(action, Import::RIS);
 
-  action = new KAction(actionCollection(), "file_import_pdf");
+  action = new TDEAction(actionCollection(), "file_import_pdf");
   action->setText(i18n("Import PDF File..."));
   action->setToolTip(i18n("Import a PDF file"));
   action->setIcon(MIME_ICON("application/pdf"));
@@ -405,7 +405,7 @@ void MainWindow::initActions() {
   connect(action, TQT_SIGNAL(activated()), importMapper, TQT_SLOT(map()));
   importMapper->setMapping(action, Import::PDF);
 
-  action = new KAction(actionCollection(), "file_import_audiofile");
+  action = new TDEAction(actionCollection(), "file_import_audiofile");
   action->setText(i18n("Import Audio File Metadata..."));
   action->setToolTip(i18n("Import meta-data from audio files"));
   action->setIcon(MIME_ICON("audio/x-mp3"));
@@ -416,7 +416,7 @@ void MainWindow::initActions() {
   action->setEnabled(false);
 #endif
 
-  action = new KAction(actionCollection(), "file_import_freedb");
+  action = new TDEAction(actionCollection(), "file_import_freedb");
   action->setText(i18n("Import Audio CD Data..."));
   action->setToolTip(i18n("Import audio CD information"));
   action->setIcon(MIME_ICON("media/audiocd"));
@@ -427,7 +427,7 @@ void MainWindow::initActions() {
   action->setEnabled(false);
 #endif
 
-  action = new KAction(actionCollection(), "file_import_gcfilms");
+  action = new TDEAction(actionCollection(), "file_import_gcfilms");
   action->setText(i18n("Import GCstar Data..."));
   action->setToolTip(i18n("Import a GCstar data file"));
   action->setIcon(TQString::fromLatin1("gcstar"));
@@ -435,7 +435,7 @@ void MainWindow::initActions() {
   connect(action, TQT_SIGNAL(activated()), importMapper, TQT_SLOT(map()));
   importMapper->setMapping(action, Import::GCfilms);
 
-  action = new KAction(actionCollection(), "file_import_griffith");
+  action = new TDEAction(actionCollection(), "file_import_griffith");
   action->setText(i18n("Import Griffith Data..."));
   action->setToolTip(i18n("Import a Griffith database"));
   action->setIcon(TQString::fromLatin1("griffith"));
@@ -443,7 +443,7 @@ void MainWindow::initActions() {
   connect(action, TQT_SIGNAL(activated()), importMapper, TQT_SLOT(map()));
   importMapper->setMapping(action, Import::Griffith);
 
-  action = new KAction(actionCollection(), "file_import_amc");
+  action = new TDEAction(actionCollection(), "file_import_amc");
   action->setText(i18n("Import Ant Movie Catalog Data..."));
   action->setToolTip(i18n("Import an Ant Movie Catalog data file"));
   action->setIcon(MIME_ICON("application/x-crossover-amc"));
@@ -451,7 +451,7 @@ void MainWindow::initActions() {
   connect(action, TQT_SIGNAL(activated()), importMapper, TQT_SLOT(map()));
   importMapper->setMapping(action, Import::AMC);
 
-  action = new KAction(actionCollection(), "file_import_filelisting");
+  action = new TDEAction(actionCollection(), "file_import_filelisting");
   action->setText(i18n("Import File Listing..."));
   action->setToolTip(i18n("Import information about files in a folder"));
   action->setIcon(MIME_ICON("inode/directory"));
@@ -459,7 +459,7 @@ void MainWindow::initActions() {
   connect(action, TQT_SIGNAL(activated()), importMapper, TQT_SLOT(map()));
   importMapper->setMapping(action, Import::FileListing);
 
-  action = new KAction(actionCollection(), "file_import_xslt");
+  action = new TDEAction(actionCollection(), "file_import_xslt");
   action->setText(i18n("Import XSL Transform..."));
   action->setToolTip(i18n("Import using an XSL Transform"));
   action->setIcon(MIME_ICON("text/x-xslt"));
@@ -473,13 +473,13 @@ void MainWindow::initActions() {
   connect(exportMapper, TQT_SIGNAL(mapped(int)),
           TQT_TQOBJECT(this), TQT_SLOT(slotFileExport(int)));
 
-  KActionMenu* exportMenu = new KActionMenu(actionCollection(), "file_export");
+  TDEActionMenu* exportMenu = new TDEActionMenu(actionCollection(), "file_export");
   exportMenu->setText(i18n("&Export"));
   exportMenu->setIconSet(BarIconSet(TQString::fromLatin1("fileexport")));
   exportMenu->setToolTip(i18n("Export the collection data to other formats"));
   exportMenu->setDelayed(false);
 
-  action = new KAction(actionCollection(), "file_export_xml");
+  action = new TDEAction(actionCollection(), "file_export_xml");
   action->setText(i18n("Export to XML..."));
   action->setToolTip(i18n("Export to a Tellico XML file"));
   action->setIcon(TQString::fromLatin1("tellico"));
@@ -487,7 +487,7 @@ void MainWindow::initActions() {
   connect(action, TQT_SIGNAL(activated()), exportMapper, TQT_SLOT(map()));
   exportMapper->setMapping(action, Export::TellicoXML);
 
-  action = new KAction(actionCollection(), "file_export_zip");
+  action = new TDEAction(actionCollection(), "file_export_zip");
   action->setText(i18n("Export to Zip..."));
   action->setToolTip(i18n("Export to a Tellico Zip file"));
   action->setIcon(TQString::fromLatin1("tellico"));
@@ -495,7 +495,7 @@ void MainWindow::initActions() {
   connect(action, TQT_SIGNAL(activated()), exportMapper, TQT_SLOT(map()));
   exportMapper->setMapping(action, Export::TellicoZip);
 
-  action = new KAction(actionCollection(), "file_export_html");
+  action = new TDEAction(actionCollection(), "file_export_html");
   action->setText(i18n("Export to HTML..."));
   action->setToolTip(i18n("Export to an HTML file"));
   action->setIcon(MIME_ICON("text/html"));
@@ -503,7 +503,7 @@ void MainWindow::initActions() {
   connect(action, TQT_SIGNAL(activated()), exportMapper, TQT_SLOT(map()));
   exportMapper->setMapping(action, Export::HTML);
 
-  action = new KAction(actionCollection(), "file_export_csv");
+  action = new TDEAction(actionCollection(), "file_export_csv");
   action->setText(i18n("Export to CSV..."));
   action->setToolTip(i18n("Export to a comma-separated values file"));
   action->setIcon(MIME_ICON("text/x-csv"));
@@ -511,7 +511,7 @@ void MainWindow::initActions() {
   connect(action, TQT_SIGNAL(activated()), exportMapper, TQT_SLOT(map()));
   exportMapper->setMapping(action, Export::CSV);
 
-  action = new KAction(actionCollection(), "file_export_pilotdb");
+  action = new TDEAction(actionCollection(), "file_export_pilotdb");
   action->setText(i18n("Export to PilotDB..."));
   action->setToolTip(i18n("Export to a PilotDB database"));
   action->setIcon(MIME_ICON("application/vnd.palm"));
@@ -519,7 +519,7 @@ void MainWindow::initActions() {
   connect(action, TQT_SIGNAL(activated()), exportMapper, TQT_SLOT(map()));
   exportMapper->setMapping(action, Export::PilotDB);
 
-  action = new KAction(actionCollection(), "file_export_alexandria");
+  action = new TDEAction(actionCollection(), "file_export_alexandria");
   action->setText(i18n("Export to Alexandria..."));
   action->setToolTip(i18n("Export to an Alexandria library"));
   action->setIcon(TQString::fromLatin1("alexandria"));
@@ -527,7 +527,7 @@ void MainWindow::initActions() {
   connect(action, TQT_SIGNAL(activated()), exportMapper, TQT_SLOT(map()));
   exportMapper->setMapping(action, Export::Alexandria);
 
-  action = new KAction(actionCollection(), "file_export_bibtex");
+  action = new TDEAction(actionCollection(), "file_export_bibtex");
   action->setText(i18n("Export to Bibtex..."));
   action->setToolTip(i18n("Export to a bibtex file"));
   action->setIcon(MIME_ICON("text/x-bibtex"));
@@ -535,7 +535,7 @@ void MainWindow::initActions() {
   connect(action, TQT_SIGNAL(activated()), exportMapper, TQT_SLOT(map()));
   exportMapper->setMapping(action, Export::Bibtex);
 
-  action = new KAction(actionCollection(), "file_export_bibtexml");
+  action = new TDEAction(actionCollection(), "file_export_bibtexml");
   action->setText(i18n("Export to Bibtexml..."));
   action->setToolTip(i18n("Export to a Bibtexml file"));
   action->setIcon(MIME_ICON("text/xml"));
@@ -543,7 +543,7 @@ void MainWindow::initActions() {
   connect(action, TQT_SIGNAL(activated()), exportMapper, TQT_SLOT(map()));
   exportMapper->setMapping(action, Export::Bibtexml);
 
-  action = new KAction(actionCollection(), "file_export_onix");
+  action = new TDEAction(actionCollection(), "file_export_onix");
   action->setText(i18n("Export to ONIX..."));
   action->setToolTip(i18n("Export to an ONIX file"));
   action->setIcon(MIME_ICON("text/xml"));
@@ -551,7 +551,7 @@ void MainWindow::initActions() {
   connect(action, TQT_SIGNAL(activated()), exportMapper, TQT_SLOT(map()));
   exportMapper->setMapping(action, Export::ONIX);
 
-  action = new KAction(actionCollection(), "file_export_gcfilms");
+  action = new TDEAction(actionCollection(), "file_export_gcfilms");
   action->setText(i18n("Export to GCfilms..."));
   action->setToolTip(i18n("Export to a GCfilms data file"));
   action->setIcon(TQString::fromLatin1("gcstar"));
@@ -564,7 +564,7 @@ void MainWindow::initActions() {
     TQString dummy2 = i18n("Export to a GCstar data file");
 #endif
 
-  action = new KAction(actionCollection(), "file_export_xslt");
+  action = new TDEAction(actionCollection(), "file_export_xslt");
   action->setText(i18n("Export XSL Transform..."));
   action->setToolTip(i18n("Export using an XSL Transform"));
   action->setIcon(MIME_ICON("text/x-xslt"));
@@ -586,12 +586,12 @@ void MainWindow::initActions() {
   action = KStdAction::deselect(TQT_TQOBJECT(this), TQT_SLOT(slotEditDeselect()), actionCollection());
   action->setToolTip(i18n("Deselect all the entries in the collection"));
 
-  action = new KAction(i18n("Internet Search..."), TQString::fromLatin1("wizard"), CTRL + Key_M,
+  action = new TDEAction(i18n("Internet Search..."), TQString::fromLatin1("wizard"), CTRL + Key_M,
                        TQT_TQOBJECT(this), TQT_SLOT(slotShowFetchDialog()),
                        actionCollection(), "edit_search_internet");
   action->setToolTip(i18n("Search the internet..."));
 
-  action = new KAction(i18n("Advanced &Filter..."), TQString::fromLatin1("filter"), CTRL + Key_J,
+  action = new TDEAction(i18n("Advanced &Filter..."), TQString::fromLatin1("filter"), CTRL + Key_J,
                        TQT_TQOBJECT(this), TQT_SLOT(slotShowFilterDialog()),
                        actionCollection(), "filter_dialog");
   action->setToolTip(i18n("Filter the collection"));
@@ -599,55 +599,55 @@ void MainWindow::initActions() {
   /*************************************************
    * Collection menu
    *************************************************/
-  m_newEntry = new KAction(i18n("&New Entry..."), TQString::fromLatin1("filenew"), CTRL + Key_N,
+  m_newEntry = new TDEAction(i18n("&New Entry..."), TQString::fromLatin1("filenew"), CTRL + Key_N,
                                TQT_TQOBJECT(this), TQT_SLOT(slotNewEntry()),
                                actionCollection(), "coll_new_entry");
   m_newEntry->setToolTip(i18n("Create a new entry"));
-  m_editEntry = new KAction(i18n("&Edit Entry..."), TQString::fromLatin1("edit"), CTRL + Key_E,
+  m_editEntry = new TDEAction(i18n("&Edit Entry..."), TQString::fromLatin1("edit"), CTRL + Key_E,
                             TQT_TQOBJECT(this), TQT_SLOT(slotShowEntryEditor()),
                             actionCollection(), "coll_edit_entry");
   m_editEntry->setToolTip(i18n("Edit the selected entries"));
-  m_copyEntry = new KAction(i18n("D&uplicate Entry"), TQString::fromLatin1("editcopy"), CTRL + Key_Y,
+  m_copyEntry = new TDEAction(i18n("D&uplicate Entry"), TQString::fromLatin1("editcopy"), CTRL + Key_Y,
                             Controller::self(), TQT_SLOT(slotCopySelectedEntries()),
                             actionCollection(), "coll_copy_entry");
   m_copyEntry->setToolTip(i18n("Copy the selected entries"));
-  m_deleteEntry = new KAction(i18n("&Delete Entry"), TQString::fromLatin1("editdelete"), CTRL + Key_D,
+  m_deleteEntry = new TDEAction(i18n("&Delete Entry"), TQString::fromLatin1("editdelete"), CTRL + Key_D,
                               Controller::self(), TQT_SLOT(slotDeleteSelectedEntries()),
                               actionCollection(), "coll_delete_entry");
   m_deleteEntry->setToolTip(i18n("Delete the selected entries"));
-  m_mergeEntry = new KAction(i18n("&Merge Entries"), TQString::fromLatin1("editcopy"), CTRL + Key_G,
+  m_mergeEntry = new TDEAction(i18n("&Merge Entries"), TQString::fromLatin1("editcopy"), CTRL + Key_G,
                               Controller::self(), TQT_SLOT(slotMergeSelectedEntries()),
                               actionCollection(), "coll_merge_entry");
   m_mergeEntry->setToolTip(i18n("Merge the selected entries"));
   m_mergeEntry->setEnabled(false); // gets enabled when more than 1 entry is selected
 
-  action = new KAction(i18n("&Generate Reports..."), TQString::fromLatin1("document"), 0, TQT_TQOBJECT(this),
+  action = new TDEAction(i18n("&Generate Reports..."), TQString::fromLatin1("document"), 0, TQT_TQOBJECT(this),
                        TQT_SLOT(slotShowReportDialog()),
                        actionCollection(), "coll_reports");
   action->setToolTip(i18n("Generate collection reports"));
-  m_checkOutEntry = new KAction(i18n("Check-&out..."), TQString::fromLatin1("2uparrow"), 0,
+  m_checkOutEntry = new TDEAction(i18n("Check-&out..."), TQString::fromLatin1("2uparrow"), 0,
                                 Controller::self(),  TQT_SLOT(slotCheckOut()),
                                 actionCollection(), "coll_checkout");
   m_checkOutEntry->setToolTip(i18n("Check-out the selected items"));
-  m_checkInEntry = new KAction(i18n("Check-&in"), TQString::fromLatin1("2downarrow"), 0,
+  m_checkInEntry = new TDEAction(i18n("Check-&in"), TQString::fromLatin1("2downarrow"), 0,
                                Controller::self(),  TQT_SLOT(slotCheckIn()),
                                actionCollection(), "coll_checkin");
   m_checkInEntry->setToolTip(i18n("Check-in the selected items"));
 
-  action = new KAction(i18n("&Rename Collection..."), TQString::fromLatin1("editclear"), CTRL + Key_R,
+  action = new TDEAction(i18n("&Rename Collection..."), TQString::fromLatin1("editclear"), CTRL + Key_R,
                        TQT_TQOBJECT(this), TQT_SLOT(slotRenameCollection()),
                        actionCollection(), "coll_rename_collection");
   action->setToolTip(i18n("Rename the collection"));
-  action = new KAction(i18n("Collection &Fields..."), TQString::fromLatin1("edit"), CTRL + Key_U,
+  action = new TDEAction(i18n("Collection &Fields..."), TQString::fromLatin1("edit"), CTRL + Key_U,
                        TQT_TQOBJECT(this), TQT_SLOT(slotShowCollectionFieldsDialog()),
                        actionCollection(), "coll_fields");
   action->setToolTip(i18n("Modify the collection fields"));
-  action = new KAction(i18n("Convert to &Bibliography"), 0,
+  action = new TDEAction(i18n("Convert to &Bibliography"), 0,
                        TQT_TQOBJECT(this), TQT_SLOT(slotConvertToBibliography()),
                        actionCollection(), "coll_convert_bibliography");
   action->setToolTip(i18n("Convert a book collection to a bibliography"));
   action->setIconSet(UserIconSet(TQString::fromLatin1("bibtex")));
-  action = new KAction(i18n("String &Macros..."), TQString::fromLatin1("view_text"), 0,
+  action = new TDEAction(i18n("String &Macros..."), TQString::fromLatin1("view_text"), 0,
                        TQT_TQOBJECT(this), TQT_SLOT(slotShowStringMacroDialog()),
                        actionCollection(), "coll_string_macros");
   action->setToolTip(i18n("Edit the bibtex string macros"));
@@ -656,21 +656,21 @@ void MainWindow::initActions() {
   connect(citeMapper, TQT_SIGNAL(mapped(int)),
           TQT_TQOBJECT(this), TQT_SLOT(slotCiteEntry(int)));
 
-  action = new KAction(actionCollection(), "cite_clipboard");
+  action = new TDEAction(actionCollection(), "cite_clipboard");
   action->setText(i18n("Copy Bibtex to Cli&pboard"));
   action->setToolTip(i18n("Copy bibtex citations to the clipboard"));
   action->setIcon(TQString::fromLatin1("editpaste"));
   connect(action, TQT_SIGNAL(activated()), citeMapper, TQT_SLOT(map()));
   citeMapper->setMapping(action, Cite::CiteClipboard);
 
-  action = new KAction(actionCollection(), "cite_lyxpipe");
+  action = new TDEAction(actionCollection(), "cite_lyxpipe");
   action->setText(i18n("Cite Entry in &LyX"));
   action->setToolTip(i18n("Cite the selected entries in LyX"));
   action->setIcon(TQString::fromLatin1("lyx"));
   connect(action, TQT_SIGNAL(activated()), citeMapper, TQT_SLOT(map()));
   citeMapper->setMapping(action, Cite::CiteLyxpipe);
 
-  action = new KAction(actionCollection(), "cite_openoffice");
+  action = new TDEAction(actionCollection(), "cite_openoffice");
   action->setText(i18n("Ci&te Entry in OpenOffice.org"));
   action->setToolTip(i18n("Cite the selected entries in OpenOffice.org"));
   action->setIcon(TQString::fromLatin1("ooo-writer"));
@@ -681,11 +681,11 @@ void MainWindow::initActions() {
   connect(updateMapper, TQT_SIGNAL(mapped(const TQString&)),
           Controller::self(), TQT_SLOT(slotUpdateSelectedEntries(const TQString&)));
 
-  m_updateEntryMenu = new KActionMenu(i18n("&Update Entry"), actionCollection(), "coll_update_entry");
+  m_updateEntryMenu = new TDEActionMenu(i18n("&Update Entry"), actionCollection(), "coll_update_entry");
 //  m_updateEntryMenu->setIconSet(BarIconSet(TQString::fromLatin1("fileexport")));
   m_updateEntryMenu->setDelayed(false);
 
-  m_updateAll = new KAction(actionCollection(), "update_entry_all");
+  m_updateAll = new TDEAction(actionCollection(), "update_entry_all");
   m_updateAll->setText(i18n("All Sources"));
   m_updateAll->setToolTip(i18n("Update entry data from all available sources"));
 //  m_updateEntryMenu->insert(action);
@@ -699,19 +699,19 @@ void MainWindow::initActions() {
   createStandardStatusBarAction();
   KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfigToolbar()), actionCollection());
   KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotConfigKeys()), actionCollection());
-  m_toggleGroupWidget = new KToggleAction(i18n("Show Grou&p View"), 0,
+  m_toggleGroupWidget = new TDEToggleAction(i18n("Show Grou&p View"), 0,
                                           TQT_TQOBJECT(this), TQT_SLOT(slotToggleGroupWidget()),
                                           actionCollection(), "toggle_group_widget");
   m_toggleGroupWidget->setToolTip(i18n("Enable/disable the group view"));
   m_toggleGroupWidget->setCheckedState(i18n("Hide Grou&p View"));
 
-  m_toggleEntryEditor = new KToggleAction(i18n("Show Entry &Editor"), 0,
+  m_toggleEntryEditor = new TDEToggleAction(i18n("Show Entry &Editor"), 0,
                                          TQT_TQOBJECT(this), TQT_SLOT(slotToggleEntryEditor()),
                                          actionCollection(), "toggle_edit_widget");
   m_toggleEntryEditor->setToolTip(i18n("Enable/disable the editor"));
   m_toggleEntryEditor->setCheckedState(i18n("Hide Entry &Editor"));
 
-  m_toggleEntryView = new KToggleAction(i18n("Show Entry &View"), 0,
+  m_toggleEntryView = new TDEToggleAction(i18n("Show Entry &View"), 0,
                                         TQT_TQOBJECT(this), TQT_SLOT(slotToggleEntryView()),
                                         actionCollection(), "toggle_entry_view");
   m_toggleEntryView->setToolTip(i18n("Enable/disable the entry view"));
@@ -727,19 +727,19 @@ void MainWindow::initActions() {
   /*************************************************
    * Collection Toolbar
    *************************************************/
-  (void) new KAction(i18n("Change Grouping"), CTRL + Key_G,
+  (void) new TDEAction(i18n("Change Grouping"), CTRL + Key_G,
                      TQT_TQOBJECT(this), TQT_SLOT(slotGroupLabelActivated()),
                      actionCollection(), "change_entry_grouping_accel");
 
-  m_entryGrouping = new KSelectAction(i18n("&Group Selection"), 0, TQT_TQOBJECT(this),
+  m_entryGrouping = new TDESelectAction(i18n("&Group Selection"), 0, TQT_TQOBJECT(this),
                                       TQT_SLOT(slotChangeGrouping()),
                                       actionCollection(), "change_entry_grouping");
   m_entryGrouping->setToolTip(i18n("Change the grouping of the collection"));
 
-  (void) new KAction(i18n("Filter"), CTRL + Key_F,
+  (void) new TDEAction(i18n("Filter"), CTRL + Key_F,
                      TQT_TQOBJECT(this), TQT_SLOT(slotFilterLabelActivated()),
                      actionCollection(), "quick_filter_accel");
-  (void) new KAction(i18n("Clear Filter"), TQString::fromLatin1("locationbar_erase"), 0,
+  (void) new TDEAction(i18n("Clear Filter"), TQString::fromLatin1("locationbar_erase"), 0,
                      TQT_TQOBJECT(this), TQT_SLOT(slotClearFilter()),
                      actionCollection(), "quick_filter_clear");
 
@@ -1180,7 +1180,7 @@ void MainWindow::slotFileOpenRecent(const KURL& url_) {
       m_fileOpenRecent->setCurrentItem(-1);
     }
   } else {
-    // the KAction shouldn't be checked now
+    // the TDEAction shouldn't be checked now
     m_fileOpenRecent->setCurrentItem(-1);
   }
 
@@ -1321,7 +1321,7 @@ bool MainWindow::fileSaveAs() {
   if(!url.isEmpty() && url.isValid()) {
     GUI::CursorSaver cs(TQt::waitCursor);
     if(Data::Document::self()->saveDocument(url)) {
-      KRecentDocument::add(url);
+      TDERecentDocument::add(url);
       m_fileOpenRecent->addURL(url);
       updateCaption(false);
       m_newDocument = false;
@@ -1646,7 +1646,7 @@ void MainWindow::slotUpdateCollectionToolBar(Data::CollPtr coll_) {
   // this isn't really proper, but works so the combo box width gets adjusted
   const int len = m_entryGrouping->containerCount();
   for(int i = 0; i < len; ++i) {
-    KToolBar* tb = dynamic_cast<KToolBar*>(m_entryGrouping->container(i));
+    TDEToolBar* tb = dynamic_cast<TDEToolBar*>(m_entryGrouping->container(i));
     if(tb) {
       KComboBox* cb = tb->getCombo(m_entryGrouping->itemId(i));
       if(cb) {
@@ -2196,7 +2196,7 @@ void MainWindow::slotUpdateToolbarIcons() {
 
   // since the toolbar icon is probably a different size than the menu item icon
   // superimpose it on the "mime_empty" icon
-  KToolBar* tb = toolBar("collectionToolBar");
+  TDEToolBar* tb = toolBar("collectionToolBar");
   if(!tb) {
     return;
   }
@@ -2213,7 +2213,7 @@ void MainWindow::slotUpdateToolbarIcons() {
 
 void MainWindow::slotGroupLabelActivated() {
   // need entry grouping combo id
-  KToolBar* tb = toolBar("collectionToolBar");
+  TDEToolBar* tb = toolBar("collectionToolBar");
   if(!tb) {
     return;
   }
@@ -2278,7 +2278,7 @@ void MainWindow::updateEntrySources() {
   }
 
   unplugActionList(TQString::fromLatin1("update_entry_actions"));
-  for(TQPtrListIterator<KAction> it(m_fetchActions); it.current(); ++it) {
+  for(TQPtrListIterator<TDEAction> it(m_fetchActions); it.current(); ++it) {
     it.current()->unplugAll();
     mapper->removeMappings(it.current());
   }
@@ -2287,7 +2287,7 @@ void MainWindow::updateEntrySources() {
 
   Fetch::FetcherVec vec = Fetch::Manager::self()->fetchers(Kernel::self()->collectionType());
   for(Fetch::FetcherVec::Iterator it = vec.begin(); it != vec.end(); ++it) {
-    KAction* action = new KAction(actionCollection());
+    TDEAction* action = new TDEAction(actionCollection());
     action->setText(it->source());
     action->setToolTip(i18n("Update entry data from %1").arg(it->source()));
     action->setIconSet(Fetch::Manager::fetcherIcon(it.data()));
@@ -2381,7 +2381,7 @@ bool MainWindow::importCollection(Data::CollPtr coll_, Import::Action action_) {
 void MainWindow::slotURLAction(const KURL& url_) {
   Q_ASSERT(url_.protocol() == Latin1Literal("tc"));
   TQString actionName = url_.fileName();
-  KAction* action = this->action(actionName);
+  TDEAction* action = this->action(actionName);
   if(action) {
     action->activate();
   } else {
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 4c2e5be..087869e 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -22,13 +22,13 @@
 
 #include <kmainwindow.h>
 
-class KToolBar;
+class TDEToolBar;
 class KURL;
-class KAction;
-class KSelectAction;
-class KToggleAction;
-class KRecentFilesAction;
-class KActionMenu;
+class TDEAction;
+class TDESelectAction;
+class TDEToggleAction;
+class TDERecentFilesAction;
+class TDEActionMenu;
 class KDialogBase;
 
 class TQCloseEvent;
@@ -61,16 +61,16 @@ namespace Tellico {
 /**
  * The base class for Tellico application windows. It sets up the main
  * window and reads the config file as well as providing a menubar, toolbar
- * and statusbar. Tellico reimplements the methods that KMainWindow provides
+ * and statusbar. Tellico reimplements the methods that TDEMainWindow provides
  * for main window handling and supports full session management as well as
- * using KActions.
- * @see KMainWindow
+ * using TDEActions.
+ * @see TDEMainWindow
  * @see TDEApplication
  * @see TDEConfig
  *
  * @author Robby Stephenson
  */
-class MainWindow : public KMainWindow, public ApplicationInterface {
+class MainWindow : public TDEMainWindow, public ApplicationInterface {
 Q_OBJECT
   
 
@@ -307,7 +307,7 @@ private:
    */
   void readOptions();
   /**
-   * Initializes the KActions of the application
+   * Initializes the TDEActions of the application
    */
   void initActions();
   /**
@@ -335,7 +335,7 @@ private:
    * Saves the window properties for each open window during session end to the
    * session config file, including saving the currently opened file by a temporary
    * filename provided by TDEApplication.
-   * @see KMainWindow::saveProperties
+   * @see TDEMainWindow::saveProperties
    *
    * @param cfg The config class with the properties to restore
    */
@@ -344,7 +344,7 @@ private:
    * Reads the session config file and restores the application's state including
    * the last opened files and documents by reading the temporary files saved by
    * @ref saveProperties().
-   * @see KMainWindow::readProperties
+   * @see TDEMainWindow::readProperties
    *
    * @param cfg The config class with the properties to restore
    */
@@ -355,13 +355,13 @@ private:
    *
    * The purpose of this function is to prepare the window in a way that it is safe to close it,
    * i.e. without the user losing some data.
-   * @see KMainWindow::queryClose
+   * @see TDEMainWindow::queryClose
    */
   bool queryClose();
   /**
    * Called before the very last window is closed, either by the user
    * or indirectly by the session manager.
-   * @see KMainWindow::queryExit
+   * @see TDEMainWindow::queryExit
    */
   bool queryExit();
   /**
@@ -479,22 +479,22 @@ private:
 
   // the reason that I have to keep pointers to all these
   // is because they get plugged into menus later in Controller
-  KRecentFilesAction* m_fileOpenRecent;
-  KAction* m_fileSave;
-  KAction* m_newEntry;
-  KAction* m_editEntry;
-  KAction* m_copyEntry;
-  KAction* m_deleteEntry;
-  KAction* m_mergeEntry;
-  KActionMenu* m_updateEntryMenu;
-  KAction* m_updateAll;
-  KAction* m_checkInEntry;
-  KAction* m_checkOutEntry;
-  KToggleAction* m_toggleGroupWidget;
-  KToggleAction* m_toggleEntryEditor;
-  KToggleAction* m_toggleEntryView;
+  TDERecentFilesAction* m_fileOpenRecent;
+  TDEAction* m_fileSave;
+  TDEAction* m_newEntry;
+  TDEAction* m_editEntry;
+  TDEAction* m_copyEntry;
+  TDEAction* m_deleteEntry;
+  TDEAction* m_mergeEntry;
+  TDEActionMenu* m_updateEntryMenu;
+  TDEAction* m_updateAll;
+  TDEAction* m_checkInEntry;
+  TDEAction* m_checkOutEntry;
+  TDEToggleAction* m_toggleGroupWidget;
+  TDEToggleAction* m_toggleEntryEditor;
+  TDEToggleAction* m_toggleEntryView;
 
-  KSelectAction* m_entryGrouping;
+  TDESelectAction* m_entryGrouping;
   GUI::LineEdit* m_quickFilter;
 
   // m_split is used between the stuff on the left and stuff on the right
@@ -519,7 +519,7 @@ private:
   FetchDialog* m_fetchDlg;
   ReportDialog* m_reportDlg;
 
-  TQPtrList<KAction> m_fetchActions;
+  TQPtrList<TDEAction> m_fetchActions;
   CollectionInterface m_collInterface;
 
   // keep track of the number of queued filter updates
diff --git a/src/newstuff/dialog.cpp b/src/newstuff/dialog.cpp
index b627cf0..d29b557 100644
--- a/src/newstuff/dialog.cpp
+++ b/src/newstuff/dialog.cpp
@@ -246,7 +246,7 @@ Dialog::Dialog(NewStuff::DataType type_, TQWidget* parent_)
   }
   loader->load(m_typeName, prov);
 
-  KAcceleratorManager::manage(this);
+  TDEAcceleratorManager::manage(this);
 }
 
 Dialog::~Dialog() {