1 files changed, 17 insertions, 17 deletions
diff --git a/kcontrol/tdm/main.cpp b/kcontrol/tdm/main.cpp
index 2a5f72895..71e09cb0d 100644
--- a/kcontrol/tdm/main.cpp
+++ b/kcontrol/tdm/main.cpp
@@ -127,13 +127,13 @@ TDModule::TDModule(TQWidget *parent, const char *name, const TQStringList &)
   TQMap<gid_t,TQStringList> tgmap;
   TQMap<gid_t,TQStringList>::Iterator tgmapi;
   TQMap<gid_t,TQStringList>::ConstIterator tgmapci;
-  TQMap<TQString, QPair<int,TQStringList> >::Iterator umapi;
+  TQMap<TQString, TQPair<int,TQStringList> >::Iterator umapi;
 
   struct passwd *ps;
   for (setpwent(); (ps = getpwent()); ) {
     TQString un( TQFile::decodeName( ps->pw_name ) );
     if (usermap.find( un ) == usermap.end()) {
-      usermap.insert( un, QPair<int,TQStringList>( ps->pw_uid, sl ) );
+      usermap.insert( un, TQPair<int,TQStringList>( ps->pw_uid, sl ) );
       if ((tgmapi = tgmap.find( ps->pw_gid )) != tgmap.end())
         (*tgmapi).append( un );
       else
@@ -190,34 +190,34 @@ TDModule::TDModule(TQWidget *parent, const char *name, const TQStringList &)
 
   appearance = new TDMAppearanceWidget(this);
   tab->addTab(appearance, i18n("A&ppearance"));
-  connect(appearance, TQT_SIGNAL(changed(bool)), TQT_SIGNAL( changed(bool)));
+  connect(appearance, TQ_SIGNAL(changed(bool)), TQ_SIGNAL( changed(bool)));
 
   font = new TDMFontWidget(this);
   tab->addTab(font, i18n("&Font"));
-  connect(font, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
+  connect(font, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)));
 
   background = new KBackground(this);
   tab->addTab(background, i18n("&Background"));
-  connect(background, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
+  connect(background, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)));
 
   sessions = new TDMSessionsWidget(this);
   tab->addTab(sessions, i18n("&Shutdown"));
-  connect(sessions, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
+  connect(sessions, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)));
 
   users = new TDMUsersWidget(this, 0);
   tab->addTab(users, i18n("&Users"));
-  connect(users, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
-  connect(users, TQT_SIGNAL(setMinMaxUID(int,int)), TQT_SLOT(slotMinMaxUID(int,int)));
-  connect(this, TQT_SIGNAL(addUsers(const TQMap<TQString,int> &)), users, TQT_SLOT(slotAddUsers(const TQMap<TQString,int> &)));
-  connect(this, TQT_SIGNAL(delUsers(const TQMap<TQString,int> &)), users, TQT_SLOT(slotDelUsers(const TQMap<TQString,int> &)));
-  connect(this, TQT_SIGNAL(clearUsers()), users, TQT_SLOT(slotClearUsers()));
+  connect(users, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)));
+  connect(users, TQ_SIGNAL(setMinMaxUID(int,int)), TQ_SLOT(slotMinMaxUID(int,int)));
+  connect(this, TQ_SIGNAL(addUsers(const TQMap<TQString,int> &)), users, TQ_SLOT(slotAddUsers(const TQMap<TQString,int> &)));
+  connect(this, TQ_SIGNAL(delUsers(const TQMap<TQString,int> &)), users, TQ_SLOT(slotDelUsers(const TQMap<TQString,int> &)));
+  connect(this, TQ_SIGNAL(clearUsers()), users, TQ_SLOT(slotClearUsers()));
 
   convenience = new TDMConvenienceWidget(this, 0);
   tab->addTab(convenience, i18n("Con&venience"));
-  connect(convenience, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
-  connect(this, TQT_SIGNAL(addUsers(const TQMap<TQString,int> &)), convenience, TQT_SLOT(slotAddUsers(const TQMap<TQString,int> &)));
-  connect(this, TQT_SIGNAL(delUsers(const TQMap<TQString,int> &)), convenience, TQT_SLOT(slotDelUsers(const TQMap<TQString,int> &)));
-  connect(this, TQT_SIGNAL(clearUsers()), convenience, TQT_SLOT(slotClearUsers()));
+  connect(convenience, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)));
+  connect(this, TQ_SIGNAL(addUsers(const TQMap<TQString,int> &)), convenience, TQ_SLOT(slotAddUsers(const TQMap<TQString,int> &)));
+  connect(this, TQ_SIGNAL(delUsers(const TQMap<TQString,int> &)), convenience, TQ_SLOT(slotDelUsers(const TQMap<TQString,int> &)));
+  connect(this, TQ_SIGNAL(clearUsers()), convenience, TQ_SLOT(slotClearUsers()));
 
   load();
   if (getuid() != 0 || !config->checkConfigFilesWritable( true )) {
@@ -298,7 +298,7 @@ void TDModule::propagateUsers()
   groupmap.clear();
   emit clearUsers();
   TQMap<TQString,int> lusers;
-  TQMapConstIterator<TQString, QPair<int,TQStringList> > it;
+  TQMapConstIterator<TQString, TQPair<int,TQStringList> > it;
   TQStringList::ConstIterator jt;
   TQMap<TQString,int>::Iterator gmapi;
   for (it = usermap.begin(); it != usermap.end(); ++it) {
@@ -321,7 +321,7 @@ void TDModule::slotMinMaxUID(int min, int max)
 {
   if (updateOK) {
     TQMap<TQString,int> alusers, dlusers;
-    TQMapConstIterator<TQString, QPair<int,TQStringList> > it;
+    TQMapConstIterator<TQString, TQPair<int,TQStringList> > it;
     TQStringList::ConstIterator jt;
     TQMap<TQString,int>::Iterator gmapi;
     for (it = usermap.begin(); it != usermap.end(); ++it) {