Rename a number of classes to enhance compatibility with KDE4

3 files changed, 16 insertions, 16 deletions

diff --git a/tdeio/misc/tdewalletd/tdewalletd.desktop b/tdeio/misc/tdewalletd/tdewalletd.desktop
index 1e65fe0df..1f92976e7 100644
--- a/tdeio/misc/tdewalletd/tdewalletd.desktop
+++ b/tdeio/misc/tdewalletd/tdewalletd.desktop
@@ -61,7 +61,7 @@ Name[ru]=Служба бумажника
 Name[rw]=Igice Dayimoni KUruhago
 Name[se]=KWallet-bálvámoduvla
 Name[sk]=Modul démona KWallet
-Name[sl]=Modul demona KListnica
+Name[sl]=Modul demona TDEListnica
 Name[sq]=Demoni për Modulin KWallet
 Name[sr]=KWallet демон модул
 Name[sr@Latn]=KWallet demon modul
@@ -132,7 +132,7 @@ Comment[ru]=Управление бумажником TDE
 Comment[rw]=Igice cya dayimoni KUruhago cya KDED
 Comment[se]=KDED:a KWallet-bálvámoduvla
 Comment[sk]=Modul démona KWallet pre KDED
-Comment[sl]=Modul demona KListnica za KDED
+Comment[sl]=Modul demona TDEListnica za KDED
 Comment[sr]=KWallet демон модул за KDED
 Comment[sr@Latn]=KWallet demon modul za KDED
 Comment[sv]=Kwallet-demonmodul för KDED
diff --git a/tdeio/misc/uiserver.cpp b/tdeio/misc/uiserver.cpp
index 8a9c7f21e..4f4b720f5 100644
--- a/tdeio/misc/uiserver.cpp
+++ b/tdeio/misc/uiserver.cpp
@@ -94,7 +94,7 @@ class UIServerSystemTray:public KSystemTray
       UIServerSystemTray(UIServer* uis)
          :KSystemTray(uis)
       {
-         KPopupMenu* pop= contextMenu();
+         TDEPopupMenu* pop= contextMenu();
          pop->insertItem(i18n("Settings..."), uis, TQT_SLOT(slotConfigure()));
          pop->insertItem(i18n("Remove"), uis, TQT_SLOT(slotRemoveSystemTrayIcon()));
          setPixmap(loadIcon("filesave"));
@@ -118,7 +118,7 @@ class ProgressConfigDialog:public KDialogBase
       TQCheckBox *m_statusBarCb;
       TQCheckBox *m_headerCb;
       TQCheckBox *m_fixedWidthCb;
-      KListView *m_columns;
+      TDEListView *m_columns;
       TQCheckListItem *(m_items[ListProgress::TB_MAX]);
 };
 
@@ -134,7 +134,7 @@ ProgressConfigDialog::ProgressConfigDialog(TQWidget *parent)
    m_statusBarCb=new TQCheckBox(i18n("Show statusbar"), plainPage());
    m_fixedWidthCb=new TQCheckBox(i18n("Column widths are user adjustable"), plainPage());
    TQLabel *label=new TQLabel(i18n("Show information:"), plainPage());
-   m_columns=new KListView(plainPage());
+   m_columns=new TDEListView(plainPage());
 
    m_columns->addColumn("info");
    m_columns->setSorting(-1);
@@ -455,7 +455,7 @@ void ProgressItem::updateVisibility()
 
 //-----------------------------------------------------------------------------
 ListProgress::ListProgress (TQWidget *parent, const char *name)
-: KListView (parent, name)
+: TDEListView (parent, name)
 {
 
   // enable selection of more than one item
@@ -584,7 +584,7 @@ void ListProgress::writeSettings() {
 
 
 UIServer::UIServer()
-:KMainWindow(0, "")
+:TDEMainWindow(0, "")
 ,DCOPObject("UIServer")
 ,m_shuttingDown(false)
 ,m_configDialog(0)
@@ -602,7 +602,7 @@ UIServer::UIServer()
                           TQT_SIGNAL(clicked()), TQT_TQOBJECT(this),
                           TQT_SLOT(slotConfigure()), true, i18n("Settings..."));
 
-  toolBar()->setBarPos( KToolBar::Left );
+  toolBar()->setBarPos( TDEToolBar::Left );
 
   // setup statusbar
   statusBar()->insertItem( i18n(" Files: %1 ").arg( 0 ), ID_TOTAL_FILES);
@@ -619,8 +619,8 @@ UIServer::UIServer()
            TQT_SLOT( slotSelection() ) );
   connect( listProgress, TQT_SIGNAL( executed( TQListViewItem* ) ),
            TQT_SLOT( slotToggleDefaultProgress( TQListViewItem* ) ) );
-  connect( listProgress, TQT_SIGNAL( contextMenu( KListView*, TQListViewItem *, const TQPoint &)),
-           TQT_SLOT(slotShowContextMenu(KListView*, TQListViewItem *, const TQPoint&)));
+  connect( listProgress, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem *, const TQPoint &)),
+           TQT_SLOT(slotShowContextMenu(TDEListView*, TQListViewItem *, const TQPoint&)));
 
 
   // setup animation timer
@@ -671,7 +671,7 @@ void UIServer::applySettings()
      toolBar()->show();
 }
 
-void UIServer::slotShowContextMenu(KListView*, TQListViewItem* item, const TQPoint& pos)
+void UIServer::slotShowContextMenu(TDEListView*, TQListViewItem* item, const TQPoint& pos)
 {
    if (m_contextMenu==0)
    {
@@ -1355,7 +1355,7 @@ void UIServer::slotCancelCurrent() {
 
 void UIServer::resizeEvent(TQResizeEvent* e)
 {
-   KMainWindow::resizeEvent(e);
+   TDEMainWindow::resizeEvent(e);
    writeSettings();
 }
 
diff --git a/tdeio/misc/uiserver.h b/tdeio/misc/uiserver.h
index baf495dfe..c86886bac 100644
--- a/tdeio/misc/uiserver.h
+++ b/tdeio/misc/uiserver.h
@@ -55,7 +55,7 @@ struct ListProgressColumnConfig
 * List view in the UIServer.
 * @internal
 */
-class TDEIO_EXPORT ListProgress : public KListView {
+class TDEIO_EXPORT ListProgress : public TDEListView {
 
   Q_OBJECT
 
@@ -214,7 +214,7 @@ class UIServerSystemTray;
  *
  * @internal
  */
-class TDEIO_EXPORT UIServer : public KMainWindow, public DCOPObject {
+class TDEIO_EXPORT UIServer : public TDEMainWindow, public DCOPObject {
 
   K_DCOP
   Q_OBJECT
@@ -382,7 +382,7 @@ protected slots:
 
   void slotJobCanceled( ProgressItem * );
   void slotApplyConfig();
-  void slotShowContextMenu(KListView*, TQListViewItem *item, const TQPoint& pos);
+  void slotShowContextMenu(TDEListView*, TQListViewItem *item, const TQPoint& pos);
 
 protected:
 
@@ -396,7 +396,7 @@ protected:
   TQTimer* updateTimer;
   ListProgress* listProgress;
 
-  KToolBar::BarPosition toolbarPos;
+  TDEToolBar::BarPosition toolbarPos;
   TQString properties;
 
   void applySettings();