Rename a number of classes to enhance compatibility with KDE4

10 files changed, 35 insertions, 35 deletions

diff --git a/src/common/gui/dialog.cpp b/src/common/gui/dialog.cpp
index 58b12ba..ff04649 100644
--- a/src/common/gui/dialog.cpp
+++ b/src/common/gui/dialog.cpp
@@ -56,10 +56,10 @@ void Dialog::updateSize()
 
 //-----------------------------------------------------------------------------
 TreeListDialog::Item::Item(const TQString &label, TQWidget *page, const TQString &title, TQListView *listview)
-  : KListViewItem(listview, label), _page(page), _title(title)
+  : TDEListViewItem(listview, label), _page(page), _title(title)
 {}
 TreeListDialog::Item::Item(const TQString &label, TQWidget *page, const TQString &title, TQListViewItem *item)
-  : KListViewItem(item, label), _page(page), _title(title)
+  : TDEListViewItem(item, label), _page(page), _title(title)
 {}
 
 TreeListDialog::TreeListDialog(TQWidget *parent, const char *name, bool modal,
@@ -75,7 +75,7 @@ TreeListDialog::TreeListDialog(TQWidget *parent, const char *name, bool modal,
   widths += 500;
   Splitter *splitter = new Splitter(widths,Qt::Horizontal, mainWidget(), name);
   top->addWidget(splitter);
-  _listView = new KListView(splitter);
+  _listView = new TDEListView(splitter);
   connect(_listView, TQT_SIGNAL(currentChanged(TQListViewItem *)), TQT_SLOT(currentChanged(TQListViewItem *)));
   _listView->setAllColumnsShowFocus(true);
   _listView->setRootIsDecorated(true);
diff --git a/src/common/gui/dialog.h b/src/common/gui/dialog.h
index 24093d2..555e857 100644
--- a/src/common/gui/dialog.h
+++ b/src/common/gui/dialog.h
@@ -53,12 +53,12 @@ protected slots:
 
 protected:
   TQFrame       *_frame;
-  KListView    *_listView;
+  TDEListView    *_listView;
   TQHBoxLayout  *_titleBox;
   TQLabel       *_label;
   TQWidgetStack *_stack;
 
- class Item : public KListViewItem {
+ class Item : public TDEListViewItem {
   public:
     Item(const TQString &label, TQWidget *page, const TQString &title, TQListView *listview);
     Item(const TQString &label, TQWidget *page, const TQString &title, TQListViewItem *item);
diff --git a/src/common/gui/editlistbox.cpp b/src/common/gui/editlistbox.cpp
index bac8828..8601399 100644
--- a/src/common/gui/editlistbox.cpp
+++ b/src/common/gui/editlistbox.cpp
@@ -71,12 +71,12 @@ void EditListBox::init(uint nbColumns, TQWidget *view)
       hbox->addWidget(view);
       row++;
     }
-    _listView= new KListView(this);
+    _listView= new TDEListView(this);
     for (uint i=0; i<nbColumns; i++) _listView->addColumn(TQString());
     _listView->header()->hide();
     _listView->setSorting(-1);
-    _listView->setResizeMode(KListView::LastColumn);
-    _listView->setColumnWidthMode(nbColumns-1, KListView::Maximum);
+    _listView->setResizeMode(TDEListView::LastColumn);
+    _listView->setColumnWidthMode(nbColumns-1, TDEListView::Maximum);
     grid->addWidget(_listView, row, 0);
     TQVBoxLayout *vbox = new TQVBoxLayout(10);
     grid->addLayout(vbox, row, 1);
@@ -329,7 +329,7 @@ void EditListBox::setEditText(const TQString &text)
 
 TQListViewItem *EditListBox::createItem()
 {
-  return new KListViewItem(_listView);
+  return new TDEListViewItem(_listView);
 }
 
 TQString EditListBox::selectedText() const
diff --git a/src/common/gui/editlistbox.h b/src/common/gui/editlistbox.h
index a9345d3..553ac16 100644
--- a/src/common/gui/editlistbox.h
+++ b/src/common/gui/editlistbox.h
@@ -31,7 +31,7 @@
 // * support for duplicated items
 // * use KStdGuiItem for buttons
 // * support for New, Clear, Reset buttons
-// * use KListView
+// * use TDEListView
 class EditListBox : public TQFrame
 {
 Q_OBJECT
@@ -74,7 +74,7 @@ Q_OBJECT
       void typedSomething(const TQString& text);
 
    protected:
-      KListView *_listView;
+      TDEListView *_listView;
 
       virtual TQListViewItem *createItem();
       virtual uint textColumn() const { return 0; }
diff --git a/src/common/gui/list_container.cpp b/src/common/gui/list_container.cpp
index 234cdf2..372904e 100644
--- a/src/common/gui/list_container.cpp
+++ b/src/common/gui/list_container.cpp
@@ -10,7 +10,7 @@
 
 //----------------------------------------------------------------------------
 PopupContainer::PopupContainer(const TQString &title, TQWidget *parent, const char *name)
-  : KPopupMenu(parent, name)
+  : TDEPopupMenu(parent, name)
 {
   if ( !title.isEmpty() ) insertTitle(title);
 }
@@ -41,14 +41,14 @@ void PopupContainer::appendItem(const TQPixmap &icon, const TQString &label, uin
 }
 
 //----------------------------------------------------------------------------
-ListViewItemContainer::ListViewItemContainer(const TQString &title, KListView *parent)
-  : KListViewItem(parent, title), _parent(0), _column(0)
+ListViewItemContainer::ListViewItemContainer(const TQString &title, TDEListView *parent)
+  : TDEListViewItem(parent, title), _parent(0), _column(0)
 {
   _ids = new TQMap<const TQListViewItem *, uint>;
 }
 
 ListViewItemContainer::ListViewItemContainer(const TQString &title, ListViewItemContainer *parent)
-  : KListViewItem(parent, title), _parent(parent), _column(0)
+  : TDEListViewItem(parent, title), _parent(parent), _column(0)
 {
   _ids = parent->_ids;
 }
@@ -74,7 +74,7 @@ void ListViewItemContainer::appendItem(const TQPixmap &icon, const TQString &tit
 {
   TQListViewItem *item = 0;
   if ( state==Normal || state==Disabled ) {
-    item = new KListViewItem(this);
+    item = new TDEListViewItem(this);
     item->setText(_column, title);
   } else {
     item = new TQCheckListItem(this, title, TQCheckListItem::CheckBox);
diff --git a/src/common/gui/list_container.h b/src/common/gui/list_container.h
index 7d91ef8..b52f9e2 100644
--- a/src/common/gui/list_container.h
+++ b/src/common/gui/list_container.h
@@ -24,7 +24,7 @@ public:
 };
 
 //----------------------------------------------------------------------------
-class PopupContainer : public KPopupMenu, public ListContainer
+class PopupContainer : public TDEPopupMenu, public ListContainer
 {
 Q_OBJECT
   
@@ -36,10 +36,10 @@ public:
 };
 
 //----------------------------------------------------------------------------
-class ListViewItemContainer : public KListViewItem, public ListContainer
+class ListViewItemContainer : public TDEListViewItem, public ListContainer
 {
 public:
-  ListViewItemContainer(const TQString &title, KListView *parent);
+  ListViewItemContainer(const TQString &title, TDEListView *parent);
   ListViewItemContainer(const TQString &title, ListViewItemContainer *parent);
   virtual ~ListViewItemContainer();
   void setColumn(uint column) { _column = column; }
diff --git a/src/common/gui/list_view.cpp b/src/common/gui/list_view.cpp
index 9bce72c..d500f7b 100644
--- a/src/common/gui/list_view.cpp
+++ b/src/common/gui/list_view.cpp
@@ -18,7 +18,7 @@
 
 //----------------------------------------------------------------------------
 ListView::ListView(TQWidget *parent, const char *name)
-  : KListView(parent, name)
+  : TDEListView(parent, name)
 {
   TQToolTip::remove(this);
   _tooltip = new ListViewToolTip(this);
@@ -37,7 +37,7 @@ TQString ListView::tooltip(const TQListViewItem &, int) const
 void ListView::clear()
 {
   _editItems.clear();
-  KListView::clear();
+  TDEListView::clear();
 }
 
 bool ListView::eventFilter(TQObject *o, TQEvent *e)
@@ -79,7 +79,7 @@ bool ListView::eventFilter(TQObject *o, TQEvent *e)
       }
     }
   }
-  return KListView::eventFilter(o, e);
+  return TDEListView::eventFilter(o, e);
 }
 
 void ListView::stopRenaming(bool force)
@@ -109,14 +109,14 @@ void ListViewToolTip::maybeTip(const TQPoint &p)
 
 //----------------------------------------------------------------------------
 EditListViewItem::EditListViewItem(ListView *list)
-  : KListViewItem(list), _renaming(false)
+  : TDEListViewItem(list), _renaming(false)
 {
   setRenameEnabled(0, true);
   list->_editItems.append(this);
 }
 
-EditListViewItem::EditListViewItem(KListViewItem *item)
-  : KListViewItem(item), _renaming(false)
+EditListViewItem::EditListViewItem(TDEListViewItem *item)
+  : TDEListViewItem(item), _renaming(false)
 {
   setRenameEnabled(0, true);
   static_cast<ListView *>(listView())->_editItems.append(this);
@@ -132,7 +132,7 @@ void EditListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colum
 {
   if ( column<int(_editWidgets.count()) && _editWidgets[column] )
     p->fillRect(0, 0, width, height(), cg.color(TQColorGroup::Background));
-  else KListViewItem::paintCell(p, cg, column, width, align);
+  else TDEListViewItem::paintCell(p, cg, column, width, align);
 }
 
 void EditListViewItem::startRename()
@@ -140,7 +140,7 @@ void EditListViewItem::startRename()
   if ( !renameEnabled(0) ) return;
   TQListView *lv = listView();
   if ( !lv ) return;
-  KListViewItem::startRename(0);
+  TDEListViewItem::startRename(0);
   if (renameBox) {
     renameBox->removeEventFilter(lv);
     renameBox->hide();
@@ -212,7 +212,7 @@ void EditListViewItem::renameDone(bool force)
 
 int EditListViewItem::width(const TQFontMetrics &fm, const TQListView *lv, int col) const
 {
-  int w = KListViewItem::width(fm, lv, col);
+  int w = TDEListViewItem::width(fm, lv, col);
   TQWidget *edit = editWidgetFactory(col);
   if ( edit==0 ) return w;
   w = TQMAX(w, edit->sizeHint().width());
diff --git a/src/common/gui/list_view.h b/src/common/gui/list_view.h
index 33aac4f..90e9595 100644
--- a/src/common/gui/list_view.h
+++ b/src/common/gui/list_view.h
@@ -21,7 +21,7 @@
 class EditListViewItem;
 class ListViewToolTip;
 
-class ListView : public KListView
+class ListView : public TDEListView
 {
 Q_OBJECT
   
@@ -61,11 +61,11 @@ private:
 };
 
 //-----------------------------------------------------------------------------
-class EditListViewItem : public KListViewItem
+class EditListViewItem : public TDEListViewItem
 {
 public:
   EditListViewItem(ListView *list);
-  EditListViewItem(KListViewItem *item);
+  EditListViewItem(TDEListViewItem *item);
   virtual ~EditListViewItem();
   void startRename();
   bool isRenaming() const { return _renaming; }
diff --git a/src/common/gui/misc_gui.cpp b/src/common/gui/misc_gui.cpp
index 2c4eb3b..2400070 100644
--- a/src/common/gui/misc_gui.cpp
+++ b/src/common/gui/misc_gui.cpp
@@ -130,7 +130,7 @@ void PopupButton::init()
   setPopup(popup);
 }
 
-void PopupButton::appendAction(KAction *action)
+void PopupButton::appendAction(TDEAction *action)
 {
   if ( _separator && popup()->count()!=0 ) popup()->insertSeparator();
   _separator = false;
@@ -140,7 +140,7 @@ void PopupButton::appendAction(KAction *action)
 void PopupButton::appendAction(const TQString &label, const TQString &icon,
                                TQObject *receiver, const char *slot)
 {
-  appendAction(new KAction(label, icon, 0, receiver, slot, (KActionCollection *)0));
+  appendAction(new TDEAction(label, icon, 0, receiver, slot, (TDEActionCollection *)0));
 }
 
 int PopupButton::appendItem(const TQString &label, const TQString &icon, int id)
diff --git a/src/common/gui/misc_gui.h b/src/common/gui/misc_gui.h
index 6c7ade6..8befca1 100644
--- a/src/common/gui/misc_gui.h
+++ b/src/common/gui/misc_gui.h
@@ -22,7 +22,7 @@
 #include <ktabbar.h>
 #include <kstdguiitem.h>
 #include <klineedit.h>
-class KAction;
+class TDEAction;
 
 #include "common/global/generic_config.h"
 #include "common/global/log.h"
@@ -67,7 +67,7 @@ Q_OBJECT
 public:
   PopupButton(TQWidget *parent = 0, const char *name = 0);
   PopupButton(const TQString &text, TQWidget *parent = 0, const char *name = 0);
-  void appendAction(KAction *action);
+  void appendAction(TDEAction *action);
   void appendAction(const TQString &label, const TQString &icon = TQString(),
                     TQObject *receiver = 0, const char *slot = 0);
   int appendItem(const TQString &label, uint id) { return appendItem(label, TQPixmap(), id); }