Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

14 files changed, 107 insertions, 107 deletions

diff --git a/filesharing/advanced/kcm_sambaconf/dictmanager.cpp b/filesharing/advanced/kcm_sambaconf/dictmanager.cpp
index 099e29ea..bd82714f 100644
--- a/filesharing/advanced/kcm_sambaconf/dictmanager.cpp
+++ b/filesharing/advanced/kcm_sambaconf/dictmanager.cpp
@@ -64,7 +64,7 @@ void DictManager::handleUnsupportedWidget(const TQString & s, TQWidget* w) {
 void DictManager::add(const TQString & key, TQLineEdit* lineEdit) {
   if (_share->optionSupported(key)) {
     lineEditDict.insert(key,lineEdit);
-    connect(lineEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changedSlot()));
+    connect(lineEdit, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changedSlot()));
   } else
     handleUnsupportedWidget(key,lineEdit);
 }
@@ -72,7 +72,7 @@ void DictManager::add(const TQString & key, TQLineEdit* lineEdit) {
 void DictManager::add(const TQString & key, TQCheckBox* checkBox){
   if (_share->optionSupported(key)) {
     checkBoxDict.insert(key,checkBox);
-    connect(checkBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(changedSlot()));
+    connect(checkBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(changedSlot()));
   } else
     handleUnsupportedWidget(key,checkBox);
 }
@@ -80,7 +80,7 @@ void DictManager::add(const TQString & key, TQCheckBox* checkBox){
 void DictManager::add(const TQString & key, KURLRequester* urlRq){
   if (_share->optionSupported(key)) {
     urlRequesterDict.insert(key,urlRq);
-    connect(urlRq, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changedSlot()));
+    connect(urlRq, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changedSlot()));
   } else
     handleUnsupportedWidget(key,urlRq);
 }
@@ -88,7 +88,7 @@ void DictManager::add(const TQString & key, KURLRequester* urlRq){
 void DictManager::add(const TQString & key, TQSpinBox* spinBox){
   if (_share->optionSupported(key)) {
     spinBoxDict.insert(key,spinBox);
-    connect(spinBox, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changedSlot()));
+    connect(spinBox, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changedSlot()));
   } else
     handleUnsupportedWidget(key,spinBox);
 }
@@ -97,7 +97,7 @@ void DictManager::add(const TQString & key, TQComboBox* comboBox, TQStringList*
   if (_share->optionSupported(key)) {
     comboBoxDict.insert(key,comboBox);
     comboBoxValuesDict.insert(key,values);
-    connect(comboBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changedSlot()));
+    connect(comboBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changedSlot()));
   } else
     handleUnsupportedWidget(key,comboBox);
 }
diff --git a/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp b/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp
index 2b629f42..8ed4cacb 100644
--- a/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp
+++ b/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp
@@ -121,18 +121,18 @@ HiddenFileView::HiddenFileView(ShareDlgImpl* shareDlg, SambaShare* share)
   _dlg->hiddenChk->setTristate(true);
   _dlg->vetoChk->setTristate(true);
 
-  connect( _dlg->hiddenChk, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT( hiddenChkClicked(bool) ));
-  connect( _dlg->vetoChk, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT( vetoChkClicked(bool) ));
-  connect( _dlg->vetoOplockChk, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT( vetoOplockChkClicked(bool) ));
+  connect( _dlg->hiddenChk, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT( hiddenChkClicked(bool) ));
+  connect( _dlg->vetoChk, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT( vetoChkClicked(bool) ));
+  connect( _dlg->vetoOplockChk, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT( vetoOplockChkClicked(bool) ));
 
   _dlg->hiddenEdit->setText( _share->getValue("hide files") );
-  connect( _dlg->hiddenEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(updateView()));
+  connect( _dlg->hiddenEdit, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(updateView()));
 
   _dlg->vetoEdit->setText( _share->getValue("veto files") );
-  connect( _dlg->vetoEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(updateView()));
+  connect( _dlg->vetoEdit, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(updateView()));
 
   _dlg->vetoOplockEdit->setText( _share->getValue("veto oplock files") );
-  connect( _dlg->vetoOplockEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(updateView()));
+  connect( _dlg->vetoOplockEdit, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(updateView()));
 
 //  new TQLabel(i18n("Hint")+" : ",grid);
 //  new TQLabel(i18n("You have to separate the entries with a '/'. You can use the wildcards '*' and '?'"),grid);
@@ -142,18 +142,18 @@ HiddenFileView::HiddenFileView(ShareDlgImpl* shareDlg, SambaShare* share)
   _dir = new KDirLister(true);
   _dir->setShowingDotFiles(true);
 
-  connect( _dir, TQT_SIGNAL(newItems(const KFileItemList &)),
-           this, TQT_SLOT(insertNewFiles(const KFileItemList &)));
+  connect( _dir, TQ_SIGNAL(newItems(const KFileItemList &)),
+           this, TQ_SLOT(insertNewFiles(const KFileItemList &)));
 
-  connect( _dir, TQT_SIGNAL(deleteItem(KFileItem*)),
-           this, TQT_SLOT(deleteItem(KFileItem*)));
+  connect( _dir, TQ_SIGNAL(deleteItem(KFileItem*)),
+           this, TQ_SLOT(deleteItem(KFileItem*)));
 
-  connect( _dir, TQT_SIGNAL(refreshItems(const KFileItemList &)),
-           this, TQT_SLOT(refreshItems(const KFileItemList &)));
+  connect( _dir, TQ_SIGNAL(refreshItems(const KFileItemList &)),
+           this, TQ_SLOT(refreshItems(const KFileItemList &)));
 
-  connect( _hiddenActn, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(hiddenChkClicked(bool)));
-  connect( _vetoActn, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(vetoChkClicked(bool)));
-  connect( _vetoOplockActn, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(vetoOplockChkClicked(bool)));
+  connect( _hiddenActn, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(hiddenChkClicked(bool)));
+  connect( _vetoActn, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(vetoChkClicked(bool)));
+  connect( _vetoOplockActn, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(vetoOplockChkClicked(bool)));
 }
 
 void HiddenFileView::initListView()
@@ -172,15 +172,15 @@ void HiddenFileView::initListView()
   _vetoActn->plug(_popup);
   _vetoOplockActn->plug(_popup);
 
-  connect( _dlg->hiddenListView, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged()));
-  connect( _dlg->hiddenListView, TQT_SIGNAL(contextMenu(TDEListView*,TQListViewItem*,const TQPoint&)),
-           this, TQT_SLOT(showContextMenu()));
+  connect( _dlg->hiddenListView, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(selectionChanged()));
+  connect( _dlg->hiddenListView, TQ_SIGNAL(contextMenu(TDEListView*,TQListViewItem*,const TQPoint&)),
+           this, TQ_SLOT(showContextMenu()));
 
-  connect( _dlg->hideDotFilesChk, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(hideDotFilesChkClicked(bool)));
-  connect( _dlg->hideUnreadableChk, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(hideUnreadableChkClicked(bool)));
+  connect( _dlg->hideDotFilesChk, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(hideDotFilesChkClicked(bool)));
+  connect( _dlg->hideUnreadableChk, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(hideUnreadableChkClicked(bool)));
 
-  connect( _dlg->hiddenListView, TQT_SIGNAL(mouseButtonPressed(int,TQListViewItem*,const TQPoint &,int)),
-           this, TQT_SLOT(slotMouseButtonPressed(int,TQListViewItem*,const TQPoint &,int)));
+  connect( _dlg->hiddenListView, TQ_SIGNAL(mouseButtonPressed(int,TQListViewItem*,const TQPoint &,int)),
+           this, TQ_SLOT(slotMouseButtonPressed(int,TQListViewItem*,const TQPoint &,int)));
 }
 
 HiddenFileView::~HiddenFileView()
diff --git a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
index c4b9c25f..c4e41d14 100644
--- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
+++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
@@ -202,8 +202,8 @@ KcmSambaConf::~KcmSambaConf() {
 
 void KcmSambaConf::createSmbConfigWidget() {
   m_smbConfConfigWidget = new SmbConfConfigWidget(this);
-  connect( m_smbConfConfigWidget, TQT_SIGNAL(smbConfChoosed(const TQString &)),
-           this, TQT_SLOT(slotSpecifySmbConf(const TQString &)));
+  connect( m_smbConfConfigWidget, TQ_SIGNAL(smbConfChoosed(const TQString &)),
+           this, TQ_SLOT(slotSpecifySmbConf(const TQString &)));
 }
 
 void KcmSambaConf::slotSpecifySmbConf(const TQString & smbConf) {
@@ -231,45 +231,45 @@ void KcmSambaConf::init() {
   _interface = new KcmInterface(this);
 
 
-  connect ( _interface->sambaUserPasswordBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(sambaUserPasswordBtnClicked()));
+  connect ( _interface->sambaUserPasswordBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(sambaUserPasswordBtnClicked()));
 
-  connect ( _interface->editShareBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(editShare()));
-  connect ( _interface->addShareBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(addShare()));
-  connect ( _interface->removeShareBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeShare()));
+  connect ( _interface->editShareBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(editShare()));
+  connect ( _interface->addShareBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(addShare()));
+  connect ( _interface->removeShareBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeShare()));
 
-  connect ( _interface->editPrinterBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(editPrinter()));
-  connect ( _interface->addPrinterBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(addPrinter()));
-  connect ( _interface->removePrinterBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(removePrinter()));
+  connect ( _interface->editPrinterBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(editPrinter()));
+  connect ( _interface->addPrinterBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(addPrinter()));
+  connect ( _interface->removePrinterBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(removePrinter()));
 
-  connect ( _interface->editDefaultPrinterBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(editPrinterDefaults()));
-  connect ( _interface->editDefaultShareBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(editShareDefaults()));
+  connect ( _interface->editDefaultPrinterBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(editPrinterDefaults()));
+  connect ( _interface->editDefaultShareBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(editShareDefaults()));
 
-  connect( _interface->domainRadio, TQT_SIGNAL(toggled(bool)),
-          _interface->joinADomainBtn, TQT_SLOT( setEnabled(bool) ));
+  connect( _interface->domainRadio, TQ_SIGNAL(toggled(bool)),
+          _interface->joinADomainBtn, TQ_SLOT( setEnabled(bool) ));
 
-  connect(_interface->nullPasswordsChk,TQT_SIGNAL(toggled(bool)),
-          this, TQT_SLOT(nullPasswordsEnabled(bool)));
+  connect(_interface->nullPasswordsChk,TQ_SIGNAL(toggled(bool)),
+          this, TQ_SLOT(nullPasswordsEnabled(bool)));
 
-  connect( _interface->addSambaUserBtn, TQT_SIGNAL(clicked()),
-          this, TQT_SLOT( addSambaUserBtnClicked() ));
+  connect( _interface->addSambaUserBtn, TQ_SIGNAL(clicked()),
+          this, TQ_SLOT( addSambaUserBtnClicked() ));
 
-  connect( _interface->removeSambaUserBtn, TQT_SIGNAL(clicked()),
-          this, TQT_SLOT( removeSambaUserBtnClicked() ));
+  connect( _interface->removeSambaUserBtn, TQ_SIGNAL(clicked()),
+          this, TQ_SLOT( removeSambaUserBtnClicked() ));
 
   _interface->removeSambaUserBtn->setIconSet(SmallIconSet("1rightarrow"));
   _interface->addSambaUserBtn->setIconSet(SmallIconSet("1leftarrow"));
 
 
-  connect( _interface->sambaUsersListView, TQT_SIGNAL(mouseButtonPressed(int,TQListViewItem*,const TQPoint &,int)),
-          this, TQT_SLOT(slotMouseButtonPressed(int,TQListViewItem*,const TQPoint &,int)));
+  connect( _interface->sambaUsersListView, TQ_SIGNAL(mouseButtonPressed(int,TQListViewItem*,const TQPoint &,int)),
+          this, TQ_SLOT(slotMouseButtonPressed(int,TQListViewItem*,const TQPoint &,int)));
 
-  connect( _interface->joinADomainBtn, TQT_SIGNAL(clicked()),
-          this, TQT_SLOT( joinADomainBtnClicked() ));
+  connect( _interface->joinADomainBtn, TQ_SIGNAL(clicked()),
+          this, TQ_SLOT( joinADomainBtnClicked() ));
 
-  connect( _interface->loadBtn, TQT_SIGNAL(clicked()),
-          this, TQT_SLOT( loadBtnClicked() ));
+  connect( _interface->loadBtn, TQ_SIGNAL(clicked()),
+          this, TQ_SLOT( loadBtnClicked() ));
 
-  connect( _interface, TQT_SIGNAL(changed()), this, TQT_SLOT(configChanged()));
+  connect( _interface, TQ_SIGNAL(changed()), this, TQ_SLOT(configChanged()));
 }
 
 
@@ -366,11 +366,11 @@ void KcmSambaConf::editShare()
     return;
 
   ShareDlgImpl* dlg = new ShareDlgImpl(_interface,item->getShare());
-  connect(dlg, TQT_SIGNAL(changed()), this, TQT_SLOT(configChanged()));
+  connect(dlg, TQ_SIGNAL(changed()), this, TQ_SLOT(configChanged()));
   dlg->exec();
   item->updateShare();
 
-  disconnect(dlg, TQT_SIGNAL(changed()), this, TQT_SLOT(configChanged()));
+  disconnect(dlg, TQ_SIGNAL(changed()), this, TQ_SLOT(configChanged()));
 
   delete dlg;
 
@@ -504,8 +504,8 @@ void KcmSambaConf::load(const TQString & smbFile)
 
   _sambaFile = new SambaFile(_smbconf,false);
 
-  connect( _sambaFile, TQT_SIGNAL(completed()), this, TQT_SLOT(fillFields()));
-  connect( _sambaFile, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(loadCanceled(const TQString &)));
+  connect( _sambaFile, TQ_SIGNAL(completed()), this, TQ_SLOT(fillFields()));
+  connect( _sambaFile, TQ_SIGNAL(canceled(const TQString &)), this, TQ_SLOT(loadCanceled(const TQString &)));
 
   _sambaFile->load();
 
@@ -579,7 +579,7 @@ void KcmSambaConf::fillFields()
 
   loadUserTab();
 
-  connect(_dictMngr, TQT_SIGNAL(changed()), this, TQT_SLOT(configChanged()));
+  connect(_dictMngr, TQ_SIGNAL(changed()), this, TQ_SLOT(configChanged()));
 
 }
 
diff --git a/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp b/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp
index 81c95f6c..4953b27c 100644
--- a/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp
+++ b/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp
@@ -108,7 +108,7 @@ void PrinterDlgImpl::initDialog()
   _userTab = new UserTabImpl(this,_share);
   _tabs->insertTab(_userTab,i18n("&Users"),1);
   _userTab->load();
-  connect(_userTab, TQT_SIGNAL(changed()), this, TQT_SLOT(changedSlot()));
+  connect(_userTab, TQ_SIGNAL(changed()), this, TQ_SLOT(changedSlot()));
   
 
   // Printing
@@ -156,7 +156,7 @@ void PrinterDlgImpl::initDialog()
   _dictMngr->add("root postexec",rootPostExecEdit);
 
   _dictMngr->load( _share );
-  connect(_dictMngr, TQT_SIGNAL(changed()), this, TQT_SLOT(changedSlot()));
+  connect(_dictMngr, TQ_SIGNAL(changed()), this, TQ_SLOT(changedSlot()));
     
 }
 
diff --git a/filesharing/advanced/kcm_sambaconf/sambafile.cpp b/filesharing/advanced/kcm_sambaconf/sambafile.cpp
index a9eb26a5..f667857c 100644
--- a/filesharing/advanced/kcm_sambaconf/sambafile.cpp
+++ b/filesharing/advanced/kcm_sambaconf/sambafile.cpp
@@ -200,8 +200,8 @@ bool SambaFile::slotApply()
     srcURL.setPath( _tempFile->name() );
 
     TDEIO::FileCopyJob * job =  TDEIO::file_copy( srcURL, url, -1, true  );
-    connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), 
-             this, TQT_SLOT( slotSaveJobFinished ( TDEIO::Job * ) ) );
+    connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), 
+             this, TQ_SLOT( slotSaveJobFinished ( TDEIO::Job * ) ) );
     return (job->error()==0);
   }
 
@@ -347,8 +347,8 @@ int SambaFile::getSambaVersion() {
   _parmOutput = TQString("");
   _sambaVersion = 2;
       
-  connect( &testParam, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
-          this, TQT_SLOT(testParmStdOutReceived(TDEProcess*,char*,int)));
+  connect( &testParam, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
+          this, TQ_SLOT(testParmStdOutReceived(TDEProcess*,char*,int)));
 
   if (testParam.start(TDEProcess::Block, TDEProcess::Stdout)) {
     if (_parmOutput.find(" 3.") > -1) {
@@ -383,8 +383,8 @@ SambaShare* SambaFile::getTestParmValues(bool reload)
   testParam << "/dev/null";
   _parmOutput = TQString("");
   
-  connect( &testParam, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
-          this, TQT_SLOT(testParmStdOutReceived(TDEProcess*,char*,int)));
+  connect( &testParam, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
+          this, TQ_SLOT(testParmStdOutReceived(TDEProcess*,char*,int)));
 
   if (testParam.start(TDEProcess::Block,TDEProcess::Stdout))
   {
@@ -493,7 +493,7 @@ bool SambaFile::load()
     destURL.setPath( localPath );
     TDEIO::FileCopyJob * job =  TDEIO::file_copy( url, destURL, 0600, true, false, true );
 //    emit started( d->m_job );
-    connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotJobFinished ( TDEIO::Job * ) ) );
+    connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotJobFinished ( TDEIO::Job * ) ) );
     return true;
   } else {
     localPath = path;
diff --git a/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp b/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp
index 7d73a3d7..4332ee7f 100644
--- a/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp
+++ b/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp
@@ -122,7 +122,7 @@ void ShareDlgImpl::initDialog()
   _userTab = new UserTabImpl(this,_share);
   _tabs->insertTab(_userTab,i18n("&Users"),1);
   _userTab->load();
-  connect(_userTab, TQT_SIGNAL(changed()), this, TQT_SLOT(changedSlot()));
+  connect(_userTab, TQ_SIGNAL(changed()), this, TQ_SLOT(changedSlot()));
 
   // Filename settings
 
@@ -256,8 +256,8 @@ void ShareDlgImpl::initDialog()
   _dictMngr->load( _share );
   
 
-  connect( _tabs, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(tabChangedSlot(TQWidget*)));
-  connect(_dictMngr, TQT_SIGNAL(changed()), this, TQT_SLOT(changedSlot()));
+  connect( _tabs, TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT(tabChangedSlot(TQWidget*)));
+  connect(_dictMngr, TQ_SIGNAL(changed()), this, TQ_SLOT(changedSlot()));
 }
 
 ShareDlgImpl::~ShareDlgImpl()
diff --git a/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp b/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp
index b3cc0b82..543f3989 100644
--- a/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp
+++ b/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp
@@ -51,7 +51,7 @@ SmbConfConfigWidget::SmbConfConfigWidget(TQWidget* parent)
 
   TQHBoxLayout *hbox = new TQHBoxLayout(NULL, 0, KDialog::spacingHint());
   TQPushButton *btn = new TQPushButton(i18n("Specify Location"), this);
-  connect(btn, TQT_SIGNAL(pressed()), this, TQT_SLOT( btnPressed()));
+  connect(btn, TQ_SIGNAL(pressed()), this, TQ_SLOT( btnPressed()));
 
   btn->setDefault(false);
   btn->setAutoDefault(false);
diff --git a/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp b/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp
index cf91918f..0e78d312 100644
--- a/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp
+++ b/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp
@@ -115,8 +115,8 @@ bool SmbPasswdFile::executeSmbpasswd(const TQStringList & args) {
   TDEProcess p;
   p << "smbpasswd" << args;
 
-  connect( &p, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
-           this, TQT_SLOT(smbpasswdStdOutReceived(TDEProcess*,char*,int)));
+  connect( &p, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
+           this, TQ_SLOT(smbpasswdStdOutReceived(TDEProcess*,char*,int)));
 
   _smbpasswdOutput = "";
 
@@ -141,8 +141,8 @@ bool SmbPasswdFile::addUser(const SambaUser & user,const TQString & password)
 
   p << password;
 
-  connect( &p, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
-           this, TQT_SLOT(smbpasswdStdOutReceived(TDEProcess*,char*,int)));
+  connect( &p, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
+           this, TQ_SLOT(smbpasswdStdOutReceived(TDEProcess*,char*,int)));
 
   _smbpasswdOutput = "";
 
diff --git a/filesharing/advanced/nfs/nfsdialog.cpp b/filesharing/advanced/nfs/nfsdialog.cpp
index 9636b5cb..666901b0 100644
--- a/filesharing/advanced/nfs/nfsdialog.cpp
+++ b/filesharing/advanced/nfs/nfsdialog.cpp
@@ -66,16 +66,16 @@ void NFSDialog::initGUI() {
   layout->addWidget( m_gui );
   
   TDEAccel* accel = new TDEAccel( m_gui->listView );
-  accel->insert( "Delete", TQt::Key_Delete, this, TQT_SLOT(slotRemoveHost()));
+  accel->insert( "Delete", TQt::Key_Delete, this, TQ_SLOT(slotRemoveHost()));
 }
 
 void NFSDialog::initSlots()
 {
-  connect( m_gui->removeHostBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT( slotRemoveHost()));
-  connect( m_gui->addHostBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT( slotAddHost()));
-  connect( m_gui->modifyHostBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT( slotModifyHost()));
-  connect( m_gui->listView, TQT_SIGNAL(doubleClicked(TQListViewItem*)), 
-           this, TQT_SLOT( slotModifyHost()));
+  connect( m_gui->removeHostBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT( slotRemoveHost()));
+  connect( m_gui->addHostBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT( slotAddHost()));
+  connect( m_gui->modifyHostBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT( slotModifyHost()));
+  connect( m_gui->listView, TQ_SIGNAL(doubleClicked(TQListViewItem*)), 
+           this, TQ_SLOT( slotModifyHost()));
 
 }
 
diff --git a/filesharing/advanced/nfs/nfshostdlg.cpp b/filesharing/advanced/nfs/nfshostdlg.cpp
index 4b62845e..e4575cdb 100644
--- a/filesharing/advanced/nfs/nfshostdlg.cpp
+++ b/filesharing/advanced/nfs/nfshostdlg.cpp
@@ -44,7 +44,7 @@ NFSHostDlg::NFSHostDlg(TQWidget* parent, HostList* hosts, NFSEntry* entry)
   TQVBoxLayout *layout = new TQVBoxLayout( page, 0, 6 );
   layout->addWidget( m_gui );
 
-  connect( m_gui, TQT_SIGNAL(modified()), this, TQT_SLOT(setModified()));
+  connect( m_gui, TQ_SIGNAL(modified()), this, TQ_SLOT(setModified()));
 
   init();
 
diff --git a/filesharing/advanced/propsdlgplugin/propertiespage.cpp b/filesharing/advanced/propsdlgplugin/propertiespage.cpp
index c4e9a4b2..d6ca9f37 100644
--- a/filesharing/advanced/propsdlgplugin/propertiespage.cpp
+++ b/filesharing/advanced/propsdlgplugin/propertiespage.cpp
@@ -78,8 +78,8 @@ PropertiesPage::PropertiesPage(TQWidget* parent, KFileItemList items,bool enterU
                    KFile::ExistingOnly |
                    KFile::LocalOnly );
     urlRq->setURL(m_path);            
-    connect( urlRq, TQT_SIGNAL(textChanged(const TQString&)),
-             this, TQT_SLOT(urlRqTextChanged(const TQString&)));       
+    connect( urlRq, TQ_SIGNAL(textChanged(const TQString&)),
+             this, TQ_SLOT(urlRqTextChanged(const TQString&)));       
   } else {
     urlRq->hide();
     folderLbl->hide();
@@ -90,7 +90,7 @@ PropertiesPage::PropertiesPage(TQWidget* parent, KFileItemList items,bool enterU
   enableNFS(false,i18n("Reading NFS configuration file ..."));
   
       
-  //TQTimer::singleShot(1, this, TQT_SLOT(load));
+  //TQTimer::singleShot(1, this, TQ_SLOT(load));
   load();
 }  
 
diff --git a/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp b/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp
index 2b05706c..4ce5e828 100644
--- a/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp
+++ b/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp
@@ -78,7 +78,7 @@ PropsDlgSharePlugin::PropsDlgSharePlugin( KPropertiesDialog *dlg,
         }                    
                     
         KPushButton* btn = new KPushButton( i18n("Configure File Sharing..."), widget );
-        connect( btn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotConfigureFileSharing() ) );
+        connect( btn, TQ_SIGNAL( clicked() ), TQ_SLOT( slotConfigureFileSharing() ) );
         btn->setDefault(false);
         TQHBoxLayout* hBox = new TQHBoxLayout( (TQWidget *)0L );
         hBox->addWidget( btn, 0, TQt::AlignLeft );
@@ -91,8 +91,8 @@ PropsDlgSharePlugin::PropsDlgSharePlugin( KPropertiesDialog *dlg,
   d = new Private();
   
   d->page = new PropertiesPage(vbox, properties->items(),false);
-  connect(d->page, TQT_SIGNAL(changed()), 
-          this, TQT_SIGNAL(changed()));
+  connect(d->page, TQ_SIGNAL(changed()), 
+          this, TQ_SIGNAL(changed()));
   
   kdDebug(5009) << "Fileshare properties dialog plugin loaded" << endl;
   
diff --git a/filesharing/simple/fileshare.cpp b/filesharing/simple/fileshare.cpp
index 2ce40e3a..d1e23711 100644
--- a/filesharing/simple/fileshare.cpp
+++ b/filesharing/simple/fileshare.cpp
@@ -76,9 +76,9 @@ KFileShareConfig::KFileShareConfig(TQWidget *parent, const char *name, const TQS
   sharing=new TQRadioButton( i18n("&Allow users to share files from their HOME folder"),  box);
 */
   m_ccgui = new ControlCenterGUI(this);
-  connect( m_ccgui, TQT_SIGNAL( changed()), this, TQT_SLOT(configChanged()));
-  connect( m_ccgui->allowedUsersBtn, TQT_SIGNAL( clicked()), 
-           this, TQT_SLOT(allowedUsersBtnClicked()));
+  connect( m_ccgui, TQ_SIGNAL( changed()), this, TQ_SLOT(configChanged()));
+  connect( m_ccgui->allowedUsersBtn, TQ_SIGNAL( clicked()), 
+           this, TQ_SLOT(allowedUsersBtnClicked()));
 
   TQString path = TQString::fromLocal8Bit( getenv( "PATH" ) );
   path += TQString::fromLatin1(":/usr/sbin");
@@ -108,10 +108,10 @@ KFileShareConfig::KFileShareConfig(TQWidget *parent, const char *name, const TQS
       m_ccgui->infoLbl->hide();      
       layout->addWidget(m_ccgui);
       updateShareListView();
-      connect( KNFSShare::instance(), TQT_SIGNAL( changed()), 
-               this, TQT_SLOT(updateShareListView()));
-      connect( KSambaShare::instance(), TQT_SIGNAL( changed()), 
-               this, TQT_SLOT(updateShareListView()));
+      connect( KNFSShare::instance(), TQ_SIGNAL( changed()), 
+               this, TQ_SLOT(updateShareListView()));
+      connect( KSambaShare::instance(), TQ_SIGNAL( changed()), 
+               this, TQ_SLOT(updateShareListView()));
 
                
   }
@@ -120,12 +120,12 @@ KFileShareConfig::KFileShareConfig(TQWidget *parent, const char *name, const TQS
      ((KFileShare::shareMode() == KFileShare::Advanced) &&
       (KFileShare::authorization() == KFileShare::Authorized)))
   {
-      connect( m_ccgui->addShareBtn, TQT_SIGNAL(clicked()),
-               this, TQT_SLOT(addShareBtnClicked()));
-      connect( m_ccgui->changeShareBtn, TQT_SIGNAL(clicked()),
-               this, TQT_SLOT(changeShareBtnClicked()));
-      connect( m_ccgui->removeShareBtn, TQT_SIGNAL(clicked()),
-               this, TQT_SLOT(removeShareBtnClicked()));
+      connect( m_ccgui->addShareBtn, TQ_SIGNAL(clicked()),
+               this, TQ_SLOT(addShareBtnClicked()));
+      connect( m_ccgui->changeShareBtn, TQ_SIGNAL(clicked()),
+               this, TQ_SLOT(changeShareBtnClicked()));
+      connect( m_ccgui->removeShareBtn, TQ_SIGNAL(clicked()),
+               this, TQ_SLOT(removeShareBtnClicked()));
       m_ccgui->listView->setSelectionMode(TQListView::Extended);       
       m_ccgui->shareBtnPnl->setEnabled(true);        
   }
diff --git a/filesharing/simple/groupconfigdlg.cpp b/filesharing/simple/groupconfigdlg.cpp
index 67d66274..56530e7c 100644
--- a/filesharing/simple/groupconfigdlg.cpp
+++ b/filesharing/simple/groupconfigdlg.cpp
@@ -81,12 +81,12 @@ void GroupConfigDlg::initGUI() {
   m_gui->groupUsersRadio->setChecked(m_restricted);
   m_gui->writeAccessChk->setChecked(!m_rootPassNeeded);            
           
-  connect( m_gui->addBtn, TQT_SIGNAL(clicked()),
-           this, TQT_SLOT(slotAddUser()));
-  connect( m_gui->removeBtn, TQT_SIGNAL(clicked()),
-           this, TQT_SLOT(slotRemoveUser()));
-  connect( m_gui->otherGroupBtn, TQT_SIGNAL(clicked()),
-           this, TQT_SLOT(slotChangeGroup()));
+  connect( m_gui->addBtn, TQ_SIGNAL(clicked()),
+           this, TQ_SLOT(slotAddUser()));
+  connect( m_gui->removeBtn, TQ_SIGNAL(clicked()),
+           this, TQ_SLOT(slotRemoveUser()));
+  connect( m_gui->otherGroupBtn, TQ_SIGNAL(clicked()),
+           this, TQ_SLOT(slotChangeGroup()));
            
   if (m_simpleSharing) {
       // if simple sharing users never need the root password