Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

6 files changed, 39 insertions, 39 deletions

diff --git a/kcontrol/filetypes/filegroupdetails.cpp b/kcontrol/filetypes/filegroupdetails.cpp
index 7000a97e5..e9cb1fbf9 100644
--- a/kcontrol/filetypes/filegroupdetails.cpp
+++ b/kcontrol/filetypes/filegroupdetails.cpp
@@ -37,7 +37,7 @@ FileGroupDetails::FileGroupDetails(TQWidget *parent, const char *name )
   // The order of those two items is very important. If you change it, fix typeslistitem.cpp !
   new TQRadioButton( i18n("Show file in embedded viewer"), m_autoEmbed );
   new TQRadioButton( i18n("Show file in separate viewer"), m_autoEmbed );
-  connect(m_autoEmbed, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( slotAutoEmbedClicked( int ) ));
+  connect(m_autoEmbed, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( slotAutoEmbedClicked( int ) ));
 
   TQWhatsThis::add( m_autoEmbed, i18n("Here you can configure what the Konqueror file manager"
     " will do when you click on a file belonging to this group. Konqueror can display the file in"
diff --git a/kcontrol/filetypes/filetypedetails.cpp b/kcontrol/filetypes/filetypedetails.cpp
index 589677b58..7928cef73 100644
--- a/kcontrol/filetypes/filetypedetails.cpp
+++ b/kcontrol/filetypes/filetypedetails.cpp
@@ -30,7 +30,7 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name )
 
   iconButton = new TDEIconButton(firstWidget);
   iconButton->setIconType(TDEIcon::Desktop, TDEIcon::MimeType);
-  connect(iconButton, TQT_SIGNAL(iconChanged(TQString)), TQT_SLOT(updateIcon(TQString)));
+  connect(iconButton, TQ_SIGNAL(iconChanged(TQString)), TQ_SLOT(updateIcon(TQString)));
 
   iconButton->setFixedSize(70, 70);
   hBox->addWidget(iconButton);
@@ -46,7 +46,7 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name )
   grid->addRowSpacing(0, fontMetrics().lineSpacing());
 
   extensionLB = new TQListBox(gb);
-  connect(extensionLB, TQT_SIGNAL(highlighted(int)), TQT_SLOT(enableExtButtons(int)));
+  connect(extensionLB, TQ_SIGNAL(highlighted(int)), TQ_SLOT(enableExtButtons(int)));
   grid->addMultiCellWidget(extensionLB, 1, 2, 0, 0);
   grid->setRowStretch(0, 0);
   grid->setRowStretch(1, 1);
@@ -59,16 +59,16 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name )
 
   addExtButton = new TQPushButton(i18n("Add..."), gb);
   addExtButton->setEnabled(false);
-  connect(addExtButton, TQT_SIGNAL(clicked()),
-          this, TQT_SLOT(addExtension()));
+  connect(addExtButton, TQ_SIGNAL(clicked()),
+          this, TQ_SLOT(addExtension()));
   grid->addWidget(addExtButton, 1, 1);
 
   TQWhatsThis::add( addExtButton, i18n("Add a new pattern for the selected file type.") );
 
   removeExtButton = new TQPushButton(i18n("Remove"), gb);
   removeExtButton->setEnabled(false);
-  connect(removeExtButton, TQT_SIGNAL(clicked()),
-          this, TQT_SLOT(removeExtension()));
+  connect(removeExtButton, TQ_SIGNAL(clicked()),
+          this, TQ_SLOT(removeExtension()));
   grid->addWidget(removeExtButton, 2, 1);
 
   TQWhatsThis::add( removeExtButton, i18n("Remove the selected filename pattern.") );
@@ -78,8 +78,8 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name )
 
   gb->setColumnLayout(1, TQt::Horizontal);
   description = new KLineEdit(gb);
-  connect(description, TQT_SIGNAL(textChanged(const TQString &)),
-          TQT_SLOT(updateDescription(const TQString &)));
+  connect(description, TQ_SIGNAL(textChanged(const TQString &)),
+          TQ_SLOT(updateDescription(const TQString &)));
 
   wtstr = i18n("You can enter a short description for files of the selected"
     " file type (e.g. 'HTML Page'). This description will be used by applications"
@@ -88,7 +88,7 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name )
   TQWhatsThis::add( description, wtstr );
 
   serviceListWidget = new KServiceListWidget( KServiceListWidget::SERVICELIST_APPLICATIONS, firstWidget );
-  connect( serviceListWidget, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool)));
+  connect( serviceListWidget, TQ_SIGNAL(changed(bool)), this, TQ_SIGNAL(changed(bool)));
   firstLayout->addWidget(serviceListWidget, 5);
 
   // Second tab - Embedding
@@ -106,10 +106,10 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name )
   new TQRadioButton( i18n("Show file in embedded viewer"), m_autoEmbed );
   new TQRadioButton( i18n("Show file in separate viewer"), m_autoEmbed );
   m_rbGroupSettings = new TQRadioButton( i18n("Use settings for '%1' group"), m_autoEmbed );
-  connect(m_autoEmbed, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( slotAutoEmbedClicked( int ) ));
+  connect(m_autoEmbed, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( slotAutoEmbedClicked( int ) ));
 
   m_chkAskSave = new TQCheckBox( i18n("Ask whether to save to disk instead"), m_autoEmbed);
-  connect(m_chkAskSave, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotAskSaveToggled(bool) ));
+  connect(m_chkAskSave, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotAskSaveToggled(bool) ));
 
   TQWhatsThis::add( m_autoEmbed, i18n("Here you can configure what the Konqueror file manager"
     " will do when you click on a file of this type. Konqueror can display the file in"
@@ -121,7 +121,7 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name )
 
   embedServiceListWidget = new KServiceListWidget( KServiceListWidget::SERVICELIST_SERVICES, secondWidget );
   embedServiceListWidget->setMinimumHeight( serviceListWidget->sizeHint().height() );
-  connect( embedServiceListWidget, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool)));
+  connect( embedServiceListWidget, TQ_SIGNAL(changed(bool)), this, TQ_SIGNAL(changed(bool)));
   secondLayout->addWidget(embedServiceListWidget, 3);
 
   addTab( firstWidget, i18n("&General") );
diff --git a/kcontrol/filetypes/filetypesview.cpp b/kcontrol/filetypes/filetypesview.cpp
index 3dfa28c50..43b53540a 100644
--- a/kcontrol/filetypes/filetypesview.cpp
+++ b/kcontrol/filetypes/filetypesview.cpp
@@ -66,8 +66,8 @@ FileTypesView::FileTypesView(TQWidget *p, const char *name)
   patternFilterLBL->setBuddy( patternFilterLE );
   leftLayout->addMultiCellWidget(patternFilterLE, 1, 1, 0, 2);
 
-  connect(patternFilterLE, TQT_SIGNAL(textChanged(const TQString &)),
-          this, TQT_SLOT(slotFilter(const TQString &)));
+  connect(patternFilterLE, TQ_SIGNAL(textChanged(const TQString &)),
+          this, TQ_SLOT(slotFilter(const TQString &)));
 
   wtstr = i18n("Enter a part of a filename pattern. Only file types with a "
                "matching file pattern will appear in the list.");
@@ -81,10 +81,10 @@ FileTypesView::FileTypesView(TQWidget *p, const char *name)
 
   typesLV->addColumn(i18n("Known Types"));
   leftLayout->addMultiCellWidget(typesLV, 2, 2, 0, 2);
-  connect(typesLV, TQT_SIGNAL(selectionChanged(TQListViewItem *)),
-          this, TQT_SLOT(updateDisplay(TQListViewItem *)));
-  connect(typesLV, TQT_SIGNAL(doubleClicked(TQListViewItem *)),
-          this, TQT_SLOT(slotDoubleClicked(TQListViewItem *)));
+  connect(typesLV, TQ_SIGNAL(selectionChanged(TQListViewItem *)),
+          this, TQ_SLOT(updateDisplay(TQListViewItem *)));
+  connect(typesLV, TQ_SIGNAL(doubleClicked(TQListViewItem *)),
+          this, TQ_SLOT(slotDoubleClicked(TQListViewItem *)));
 
   TQWhatsThis::add( typesLV, i18n("Here you can see a hierarchical list of"
     " the file types which are known on your system. Click on the '+' sign"
@@ -93,13 +93,13 @@ FileTypesView::FileTypesView(TQWidget *p, const char *name)
     " file type using the controls on the right.") );
 
   TQPushButton *addTypeB = new TQPushButton(i18n("Add..."), this);
-  connect(addTypeB, TQT_SIGNAL(clicked()), TQT_SLOT(addType()));
+  connect(addTypeB, TQ_SIGNAL(clicked()), TQ_SLOT(addType()));
   leftLayout->addWidget(addTypeB, 3, 0);
 
   TQWhatsThis::add( addTypeB, i18n("Click here to add a new file type.") );
 
   m_removeTypeB = new TQPushButton(i18n("&Remove"), this);
-  connect(m_removeTypeB, TQT_SIGNAL(clicked()), TQT_SLOT(removeType()));
+  connect(m_removeTypeB, TQ_SIGNAL(clicked()), TQ_SLOT(removeType()));
   leftLayout->addWidget(m_removeTypeB, 3, 2);
   m_removeTypeB->setEnabled(false);
 
@@ -112,16 +112,16 @@ FileTypesView::FileTypesView(TQWidget *p, const char *name)
 
   // File Type Details
   m_details = new FileTypeDetails( m_widgetStack );
-  connect( m_details, TQT_SIGNAL( changed(bool) ),
-           this, TQT_SLOT( setDirty(bool) ) );
-  connect( m_details, TQT_SIGNAL( embedMajor(const TQString &, bool &) ),
-           this, TQT_SLOT( slotEmbedMajor(const TQString &, bool &)));
+  connect( m_details, TQ_SIGNAL( changed(bool) ),
+           this, TQ_SLOT( setDirty(bool) ) );
+  connect( m_details, TQ_SIGNAL( embedMajor(const TQString &, bool &) ),
+           this, TQ_SLOT( slotEmbedMajor(const TQString &, bool &)));
   m_widgetStack->addWidget( m_details, 1 /*id*/ );
 
   // File Group Details
   m_groupDetails = new FileGroupDetails( m_widgetStack );
-  connect( m_groupDetails, TQT_SIGNAL( changed(bool) ),
-           this, TQT_SLOT( setDirty(bool) ) );
+  connect( m_groupDetails, TQ_SIGNAL( changed(bool) ),
+           this, TQ_SLOT( setDirty(bool) ) );
   m_widgetStack->addWidget( m_groupDetails, 2 /*id*/ );
 
   // Widget shown on startup
@@ -132,9 +132,9 @@ FileTypesView::FileTypesView(TQWidget *p, const char *name)
 
   m_widgetStack->raiseWidget( m_emptyWidget );
 
-  TQTimer::singleShot( 0, this, TQT_SLOT( init() ) ); // this takes some time
+  TQTimer::singleShot( 0, this, TQ_SLOT( init() ) ); // this takes some time
 
-  connect( KSycoca::self(), TQT_SIGNAL( databaseChanged() ), TQT_SLOT( slotDatabaseChanged() ) );
+  connect( KSycoca::self(), TQ_SIGNAL( databaseChanged() ), TQ_SLOT( slotDatabaseChanged() ) );
 }
 
 FileTypesView::~FileTypesView()
diff --git a/kcontrol/filetypes/keditfiletype.cpp b/kcontrol/filetypes/keditfiletype.cpp
index 19aa01a59..a7412438b 100644
--- a/kcontrol/filetypes/keditfiletype.cpp
+++ b/kcontrol/filetypes/keditfiletype.cpp
@@ -58,11 +58,11 @@ void FileTypeDialog::init( KMimeType::Ptr mime, bool newItem )
 
   // This code is very similar to kcdialog.cpp
   setMainWidget( m_details );
-  connect(m_details, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(clientChanged(bool)));
+  connect(m_details, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(clientChanged(bool)));
   // TODO setHelp()
   enableButton(Apply, false);
 
-  connect( KSycoca::self(), TQT_SIGNAL( databaseChanged() ), TQT_SLOT( slotDatabaseChanged() ) );
+  connect( KSycoca::self(), TQ_SIGNAL( databaseChanged() ), TQ_SLOT( slotDatabaseChanged() ) );
 }
 
 void FileTypeDialog::save()
diff --git a/kcontrol/filetypes/kservicelistwidget.cpp b/kcontrol/filetypes/kservicelistwidget.cpp
index d0463d7ad..16669168a 100644
--- a/kcontrol/filetypes/kservicelistwidget.cpp
+++ b/kcontrol/filetypes/kservicelistwidget.cpp
@@ -74,9 +74,9 @@ KServiceListWidget::KServiceListWidget(int kind, TQWidget *parent, const char *n
   grid->setRowStretch(6, 1);
 
   servicesLB = new TQListBox(gb);
-  connect(servicesLB, TQT_SIGNAL(highlighted(int)), TQT_SLOT(enableMoveButtons(int)));
+  connect(servicesLB, TQ_SIGNAL(highlighted(int)), TQ_SLOT(enableMoveButtons(int)));
   grid->addMultiCellWidget(servicesLB, 1, 6, 0, 0);
-  connect( servicesLB, TQT_SIGNAL( doubleClicked ( TQListBoxItem * )), this, TQT_SLOT( editService()));
+  connect( servicesLB, TQ_SIGNAL( doubleClicked ( TQListBoxItem * )), this, TQ_SLOT( editService()));
 
   TQString wtstr =
     (kind == SERVICELIST_APPLICATIONS ?
@@ -96,7 +96,7 @@ KServiceListWidget::KServiceListWidget(int kind, TQWidget *parent, const char *n
 
   servUpButton = new TQPushButton(i18n("Move &Up"), gb);
   servUpButton->setEnabled(false);
-  connect(servUpButton, TQT_SIGNAL(clicked()), TQT_SLOT(promoteService()));
+  connect(servUpButton, TQ_SIGNAL(clicked()), TQ_SLOT(promoteService()));
   grid->addWidget(servUpButton, 2, 1);
 
   TQWhatsThis::add( servUpButton, kind == SERVICELIST_APPLICATIONS ?
@@ -109,7 +109,7 @@ KServiceListWidget::KServiceListWidget(int kind, TQWidget *parent, const char *n
 
   servDownButton = new TQPushButton(i18n("Move &Down"), gb);
   servDownButton->setEnabled(false);
-  connect(servDownButton, TQT_SIGNAL(clicked()), TQT_SLOT(demoteService()));
+  connect(servDownButton, TQ_SIGNAL(clicked()), TQ_SLOT(demoteService()));
   grid->addWidget(servDownButton, 3, 1);
 
   TQWhatsThis::add( servDownButton, kind == SERVICELIST_APPLICATIONS ?
@@ -122,7 +122,7 @@ KServiceListWidget::KServiceListWidget(int kind, TQWidget *parent, const char *n
 
   servNewButton = new TQPushButton(i18n("Add..."), gb);
   servNewButton->setEnabled(false);
-  connect(servNewButton, TQT_SIGNAL(clicked()), TQT_SLOT(addService()));
+  connect(servNewButton, TQ_SIGNAL(clicked()), TQ_SLOT(addService()));
   grid->addWidget(servNewButton, 1, 1);
 
   TQWhatsThis::add( servNewButton, i18n( "Add a new application for this file type." ) );
@@ -130,7 +130,7 @@ KServiceListWidget::KServiceListWidget(int kind, TQWidget *parent, const char *n
 
   servEditButton = new TQPushButton(i18n("Edit..."), gb);
   servEditButton->setEnabled(false);
-  connect(servEditButton, TQT_SIGNAL(clicked()), TQT_SLOT(editService()));
+  connect(servEditButton, TQ_SIGNAL(clicked()), TQ_SLOT(editService()));
   grid->addWidget(servEditButton, 4, 1);
 
   TQWhatsThis::add( servEditButton, i18n( "Edit command line of the selected application." ) );
@@ -138,7 +138,7 @@ KServiceListWidget::KServiceListWidget(int kind, TQWidget *parent, const char *n
 
   servRemoveButton = new TQPushButton(i18n("Remove"), gb);
   servRemoveButton->setEnabled(false);
-  connect(servRemoveButton, TQT_SIGNAL(clicked()), TQT_SLOT(removeService()));
+  connect(servRemoveButton, TQ_SIGNAL(clicked()), TQ_SLOT(removeService()));
   grid->addWidget(servRemoveButton, 5, 1);
 
   TQWhatsThis::add( servRemoveButton, i18n( "Remove the selected application from the list." ) );
diff --git a/kcontrol/filetypes/kserviceselectdlg.cpp b/kcontrol/filetypes/kserviceselectdlg.cpp
index f8c4f0dd4..e9618683d 100644
--- a/kcontrol/filetypes/kserviceselectdlg.cpp
+++ b/kcontrol/filetypes/kserviceselectdlg.cpp
@@ -50,7 +50,7 @@ KServiceSelectDlg::KServiceSelectDlg( const TQString& /*serviceType*/, const TQS
     m_listbox->sort();
     m_listbox->setMinimumHeight(350);
     m_listbox->setMinimumWidth(300);
-    connect(m_listbox,TQT_SIGNAL(doubleClicked ( TQListBoxItem * )),TQT_SLOT(slotOk()));
+    connect(m_listbox,TQ_SIGNAL(doubleClicked ( TQListBoxItem * )),TQ_SLOT(slotOk()));
     setMainWidget(vbox);
 }