1 files changed, 21 insertions, 21 deletions

diff --git a/kcontrol/smartcard/smartcard.cpp b/kcontrol/smartcard/smartcard.cpp
index f0891db16..998f936e8 100644
--- a/kcontrol/smartcard/smartcard.cpp
+++ b/kcontrol/smartcard/smartcard.cpp
@@ -50,7 +50,7 @@ KSmartcardConfig::KSmartcardConfig(TQWidget *parent, const char *name)
   TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
   config = new TDEConfig("ksmartcardrc", false, false);
 
-  DCOPClient *dc = TDEApplication::kApplication()->dcopClient();
+  DCOPClient *dc = tdeApp->dcopClient();
 
   _ok = false;
   dc->remoteInterfaces("kded", "kardsvc", &_ok);
@@ -72,19 +72,19 @@ KSmartcardConfig::KSmartcardConfig(TQWidget *parent, const char *name)
      _popUpKardChooser = new TDEPopupMenu(this,"KpopupKardChooser");
      _popUpKardChooser->insertItem(i18n("Change Module..."),
 				   this,
-				   TQT_SLOT(slotLaunchChooser()));
+				   TQ_SLOT(slotLaunchChooser()));
      // The config backend
 
-     connect(base->launchManager, TQT_SIGNAL(clicked()), TQT_SLOT( changed() ));
-     connect(base->beepOnInsert,  TQT_SIGNAL(clicked()), TQT_SLOT( changed() ));
-     connect(base->enableSupport, TQT_SIGNAL(clicked()), TQT_SLOT( changed() ));
+     connect(base->launchManager, TQ_SIGNAL(clicked()), TQ_SLOT( changed() ));
+     connect(base->beepOnInsert,  TQ_SIGNAL(clicked()), TQ_SLOT( changed() ));
+     connect(base->enableSupport, TQ_SIGNAL(clicked()), TQ_SLOT( changed() ));
 
 
-     connect(base->enablePolling, TQT_SIGNAL(clicked()), TQT_SLOT( changed() ));
+     connect(base->enablePolling, TQ_SIGNAL(clicked()), TQ_SLOT( changed() ));
      connect(base->_readerHostsListView,
-	     TQT_SIGNAL(rightButtonPressed(TQListViewItem *,const TQPoint &,int)),
+	     TQ_SIGNAL(rightButtonPressed(TQListViewItem *,const TQPoint &,int)),
 	     this,
-	     TQT_SLOT(slotShowPopup(TQListViewItem *,const TQPoint &,int)));
+	     TQ_SLOT(slotShowPopup(TQListViewItem *,const TQPoint &,int)));
 
 
 
@@ -92,7 +92,7 @@ KSmartcardConfig::KSmartcardConfig(TQWidget *parent, const char *name)
 			    "",
 			    "signalReaderListChanged(TQStringList)",
 			    "loadReadersTab(TQStringList)",
-			    FALSE))
+			    false))
 
        kdDebug()<<"Error connecting to DCOP server" <<endl;
 
@@ -101,7 +101,7 @@ KSmartcardConfig::KSmartcardConfig(TQWidget *parent, const char *name)
 			    "",
 			    "signalCardStateChanged(TQString,bool,TQString)",
 			    "updateReadersState (TQString,bool,TQString) ",
-			    FALSE))
+			    false))
 
        kdDebug()<<"Error connecting to DCOP server" <<endl;
      _cardDB= new KCardDB();
@@ -189,7 +189,7 @@ void KSmartcardConfig::loadReadersTab( TQStringList lr){
 
     //  New view items
     TDEListViewItem * temp;
-    kapp->dcopClient()->call("kded", "kded", "unloadModule(TQCString)",
+    tdeApp->dcopClient()->call("kded", "kded", "unloadModule(TQCString)",
 			     data, rettype, retval);
 
     (void) new TDEListViewItem(base->_readerHostsListView,
@@ -217,7 +217,7 @@ void KSmartcardConfig::loadReadersTab( TQStringList lr){
    TQDataStream argATR(dataATR,IO_WriteOnly);
    argATR << *_slot;
 
-   kapp->dcopClient()->call("kded", "kardsvc", "getCardATR(TQString)",
+   tdeApp->dcopClient()->call("kded", "kardsvc", "getCardATR(TQString)",
 			   dataATR, rettype, retval);
 
 
@@ -263,14 +263,14 @@ void KSmartcardConfig::getSupportingModule( TDEListViewItem * ant,
                                                type,
                                                subType,
                                                subSubType);
-        hil->setSelectable(FALSE);
+        hil->setSelectable(false);
     }
     else{
 
 
         TDEListViewItem * hil =new TDEListViewItem(ant,
                                                i18n("No module managing this card"));
-        hil->setSelectable(FALSE);
+        hil->setSelectable(false);
     }
 
   }
@@ -304,7 +304,7 @@ void KSmartcardConfig::load(bool useDefaults )
   }
 
   // We call kardsvc to retrieve the current readers
-  kapp->dcopClient()->call("kded", "kardsvc", "getSlotList ()",
+  tdeApp->dcopClient()->call("kded", "kardsvc", "getSlotList ()",
 			   data, rettype, retval);
   TQStringList readers;
   readers.clear();
@@ -337,17 +337,17 @@ if (_ok) {
   // Start or stop the server as needed
   if (base->enableSupport->isChecked()) {
 
-    kapp->dcopClient()->call("kded", "kded", "loadModule(TQCString)",
+    tdeApp->dcopClient()->call("kded", "kded", "loadModule(TQCString)",
 			     data, rettype, retval);
     config->sync();
 
-    kapp->dcopClient()->call("kded", "kardsvc", "reconfigure()",
+    tdeApp->dcopClient()->call("kded", "kardsvc", "reconfigure()",
 			     data, rettype, retval);
   } else {
 
 
 
-    kapp->dcopClient()->call("kded", "kded", "unloadModule(TQCString)",
+    tdeApp->dcopClient()->call("kded", "kded", "unloadModule(TQCString)",
 			     data, rettype, retval);
   }
 
@@ -372,12 +372,12 @@ TQString KSmartcardConfig::quickHelp() const
 
 extern "C"
 {
-  KDE_EXPORT TDECModule *create_smartcard(TQWidget *parent, const char *)
+  TDE_EXPORT TDECModule *create_smartcard(TQWidget *parent, const char *)
   {
     return new KSmartcardConfig(parent, "kcmsmartcard");
   }
 
-  KDE_EXPORT void init_smartcard()
+  TDE_EXPORT void init_smartcard()
   {
     TDEConfig *config = new TDEConfig("ksmartcardrc", false, false);
     bool start = config->readBoolEntry("Enable Support", false);
@@ -389,7 +389,7 @@ extern "C"
 	TQDataStream arg(data, IO_WriteOnly);
 	TQCString modName = "kardsvc";
 	arg << modName;
-	kapp->dcopClient()->call("kded", "kded", "loadModule(TQCString)",
+	tdeApp->dcopClient()->call("kded", "kded", "loadModule(TQCString)",
 			         data, rettype, retval);
     }
   }