Rename a number of classes to enhance compatibility with KDE4

6 files changed, 12 insertions, 12 deletions

diff --git a/kcontrol/tdm/tdm-conv.cpp b/kcontrol/tdm/tdm-conv.cpp
index fa1260b7e..105630f40 100644
--- a/kcontrol/tdm/tdm-conv.cpp
+++ b/kcontrol/tdm/tdm-conv.cpp
@@ -134,7 +134,7 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name)
     connect(npGroup, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
 
     pl_label = new TQLabel(i18n("No password re&quired for:"), npGroup);
-    npuserlv = new KListView(npGroup);
+    npuserlv = new TDEListView(npGroup);
     pl_label->setBuddy(npuserlv);
     npuserlv->addColumn(TQString::null);
     npuserlv->header()->hide();
diff --git a/kcontrol/tdm/tdm-conv.h b/kcontrol/tdm/tdm-conv.h
index 3f8dda974..1a086ec6c 100644
--- a/kcontrol/tdm/tdm-conv.h
+++ b/kcontrol/tdm/tdm-conv.h
@@ -73,7 +73,7 @@ private:
 	TQRadioButton	*npRadio, *ppRadio, *spRadio;
 	KComboBox	*userlb, *puserlb;
 	TQSpinBox	*delaysb;
-	KListView	*npuserlv;
+	TDEListView	*npuserlv;
 	TQLabel		*u_label, *d_label, *pu_label, *w_label, *n_label, *pl_label;
 	TQString	autoUser, preselUser;
 	TQStringList	noPassUsers;
diff --git a/kcontrol/tdm/tdm-font.cpp b/kcontrol/tdm/tdm-font.cpp
index 9947101c1..954759df6 100644
--- a/kcontrol/tdm/tdm-font.cpp
+++ b/kcontrol/tdm/tdm-font.cpp
@@ -44,7 +44,7 @@ TDMFontWidget::TDMFontWidget(TQWidget *parent, const char *name)
 {
   TQGridLayout *ml = new TQGridLayout(this, 5, 2, KDialog::marginHint(), KDialog::spacingHint());
   TQLabel *label = new TQLabel(i18n("&General:"), this);
-  stdFontChooser = new KFontRequester(this);
+  stdFontChooser = new TDEFontRequester(this);
   label->setBuddy(stdFontChooser);
   TQWhatsThis::add( stdFontChooser, i18n("This changes the font which is used for all the text in the login manager except for the greeting and failure messages.") );
   connect(stdFontChooser, TQT_SIGNAL(fontSelected(const TQFont&)),this,TQT_SLOT(configChanged()));
@@ -52,7 +52,7 @@ TDMFontWidget::TDMFontWidget(TQWidget *parent, const char *name)
   ml->addWidget(stdFontChooser, 1, 1);
 
   label = new TQLabel(i18n("&Failures:"), this);
-  failFontChooser = new KFontRequester(this);
+  failFontChooser = new TDEFontRequester(this);
   label->setBuddy(failFontChooser);
   TQWhatsThis::add( failFontChooser, i18n("This changes the font which is used for failure messages in the login manager.") );
   connect(failFontChooser, TQT_SIGNAL(fontSelected(const TQFont&)),this,TQT_SLOT(configChanged()));
@@ -60,7 +60,7 @@ TDMFontWidget::TDMFontWidget(TQWidget *parent, const char *name)
   ml->addWidget(failFontChooser, 2, 1);
 
   label = new TQLabel(i18n("Gree&ting:"), this);
-  greetingFontChooser = new KFontRequester(this);
+  greetingFontChooser = new TDEFontRequester(this);
   label->setBuddy(greetingFontChooser);
   TQWhatsThis::add( greetingFontChooser, i18n("This changes the font which is used for the login manager's greeting.") );
   connect(greetingFontChooser, TQT_SIGNAL(fontSelected(const TQFont&)),this,TQT_SLOT(configChanged()));
diff --git a/kcontrol/tdm/tdm-font.h b/kcontrol/tdm/tdm-font.h
index 67b2c864d..fbbbc5028 100644
--- a/kcontrol/tdm/tdm-font.h
+++ b/kcontrol/tdm/tdm-font.h
@@ -22,7 +22,7 @@
 
 #include <tqwidget.h>
 
-class KFontRequester;
+class TDEFontRequester;
 class TQCheckBox;
 
 class TDMFontWidget : public TQWidget
@@ -46,9 +46,9 @@ protected slots:
 
 private:
 	TQCheckBox	*aacb;
-        KFontRequester *greetingFontChooser;
-        KFontRequester *failFontChooser;
-        KFontRequester *stdFontChooser;
+        TDEFontRequester *greetingFontChooser;
+        TDEFontRequester *failFontChooser;
+        TDEFontRequester *stdFontChooser;
 };
 
 
diff --git a/kcontrol/tdm/tdm-users.cpp b/kcontrol/tdm/tdm-users.cpp
index daa507a51..65d57a894 100644
--- a/kcontrol/tdm/tdm-users.cpp
+++ b/kcontrol/tdm/tdm-users.cpp
@@ -127,7 +127,7 @@ TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name)
 
     wstack = new TQWidgetStack( this );
     s_label = new TQLabel( wstack, i18n("S&elect users and groups:"), this );
-    optinlv = new KListView( this );
+    optinlv = new TDEListView( this );
     optinlv->addColumn( i18n("Selected Users") );
     optinlv->setResizeMode( TQListView::LastColumn );
     TQWhatsThis::add( optinlv, i18n("TDM will show all checked users. Entries denoted with '@' are user groups. Checking a group is like checking all users in that group.") );
@@ -136,7 +136,7 @@ TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name)
 	     TQT_SLOT(slotUpdateOptIn( TQListViewItem * )) );
     connect( optinlv, TQT_SIGNAL(clicked( TQListViewItem * )),
 	     TQT_SLOT(slotChanged()) );
-    optoutlv = new KListView( this );
+    optoutlv = new TDEListView( this );
     optoutlv->addColumn( i18n("Hidden Users") );
     optoutlv->setResizeMode( TQListView::LastColumn );
     TQWhatsThis::add( optoutlv, i18n("TDM will show all non-checked non-system users. Entries denoted with '@' are user groups. Checking a group is like checking all users in that group.") );
diff --git a/kcontrol/tdm/tdm-users.h b/kcontrol/tdm/tdm-users.h
index 8a87c28dd..c5167655c 100644
--- a/kcontrol/tdm/tdm-users.h
+++ b/kcontrol/tdm/tdm-users.h
@@ -84,7 +84,7 @@ private:
 
 	TQLabel		*s_label; // middle
 	TQWidgetStack	*wstack;
-	KListView	*optoutlv, *optinlv;
+	TDEListView	*optoutlv, *optinlv;
 
 	TQButtonGroup	*faceGroup; // right
 	TQRadioButton	*rbadmonly, *rbprefadm, *rbprefusr, *rbusronly;