7 files changed, 26 insertions, 26 deletions
diff --git a/languages/sql/sqlactions.cpp b/languages/sql/sqlactions.cpp
index 1d1a5b14..6ef46f2c 100644
--- a/languages/sql/sqlactions.cpp
+++ b/languages/sql/sqlactions.cpp
@@ -37,8 +37,8 @@ SqlListAction::SqlListAction(SQLSupportPart *part, const TQString &text,
     m_combo->setMinimumWidth( 200 );
     m_combo->setMaximumWidth( 400 );
 
-    connect( m_combo, TQT_SIGNAL(activated(const TQString&)), receiver, slot );
-    connect( m_combo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(activated(int)) );
+    connect( m_combo, TQ_SIGNAL(activated(const TQString&)), receiver, slot );
+    connect( m_combo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(activated(int)) );
 
     setShortcutConfigurable( false );
     setAutoSized( true );
diff --git a/languages/sql/sqlactions.h b/languages/sql/sqlactions.h
index 04ad295b..9ed4453b 100644
--- a/languages/sql/sqlactions.h
+++ b/languages/sql/sqlactions.h
@@ -21,7 +21,7 @@ class KComboBox;
 
 class SqlListAction : public KWidgetAction
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     SqlListAction( SQLSupportPart *part, const TQString &text, const TDEShortcut& cut,
diff --git a/languages/sql/sqlconfigwidget.ui b/languages/sql/sqlconfigwidget.ui
index cfa61833..81e20b78 100644
--- a/languages/sql/sqlconfigwidget.ui
+++ b/languages/sql/sqlconfigwidget.ui
@@ -164,10 +164,10 @@
     <variable access="private">TQDomDocument* doc;</variable>
     <variable access="private">bool changed;</variable>
 </variables>
-<Q_SIGNALS>
+<signals>
     <signal>newConfigSaved()</signal>
-</Q_SIGNALS>
-<Q_SLOTS>
+</signals>
+<slots>
     <slot>init()</slot>
     <slot>valueChanged( int, int )</slot>
     <slot>removeDb()</slot>
@@ -176,7 +176,7 @@
     <slot>accept()</slot>
     <slot>setProjectDom( TQDomDocument * doc )</slot>
     <slot>loadConfig()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includes>
diff --git a/languages/sql/sqlconfigwidget.ui.h b/languages/sql/sqlconfigwidget.ui.h
index c06413e7..e1a4d975 100644
--- a/languages/sql/sqlconfigwidget.ui.h
+++ b/languages/sql/sqlconfigwidget.ui.h
@@ -38,7 +38,7 @@ public:
 
     virtual void setContentFromEditor( TQWidget* w )
     {
-	if ( w->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) )
+	if ( w->inherits( "TQComboBox" ) )
 	    setText( ( (TQComboBox*)w )->currentText() );
 	else
 	    TQTableItem::setContentFromEditor( w );
@@ -62,7 +62,7 @@ public:
 
     virtual void setContentFromEditor( TQWidget* w )
     {
-	if ( w->inherits( TQSPINBOX_OBJECT_NAME_STRING ) )
+	if ( w->inherits( "TQSpinBox" ) )
 	    setText( ( (TQSpinBox*)w )->text() );
 	else
 	    TQTableItem::setContentFromEditor( w );
diff --git a/languages/sql/sqloutputwidget.h b/languages/sql/sqloutputwidget.h
index 4e5fa790..04eb89d2 100644
--- a/languages/sql/sqloutputwidget.h
+++ b/languages/sql/sqloutputwidget.h
@@ -21,7 +21,7 @@ class TQSqlError;
 
 class SqlOutputWidget : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/languages/sql/sqlsupport_part.cpp b/languages/sql/sqlsupport_part.cpp
index 96e8ed4f..096d49d9 100644
--- a/languages/sql/sqlsupport_part.cpp
+++ b/languages/sql/sqlsupport_part.cpp
@@ -40,20 +40,20 @@ SQLSupportPart::SQLSupportPart( TQObject *parent, const char *name, const TQStri
     setXMLFile( "kdevsqlsupport.rc" );
 
     TDEAction *action;
-    action = new TDEAction( i18n( "&Run" ), "application-x-executable", Key_F9, this, TQT_SLOT( slotRun() ), actionCollection(), "build_execute" );
+    action = new TDEAction( i18n( "&Run" ), "application-x-executable", Key_F9, this, TQ_SLOT( slotRun() ), actionCollection(), "build_execute" );
     action->setToolTip(i18n("Run"));
     action->setWhatsThis(i18n("<b>Run</b><p>Executes a SQL script."));
 
-    dbAction = new SqlListAction( this, i18n( "&Database Connections" ), 0, this, TQT_SLOT(activeConnectionChanged()), actionCollection(), "connection_combo" );
+    dbAction = new SqlListAction( this, i18n( "&Database Connections" ), 0, this, TQ_SLOT(activeConnectionChanged()), actionCollection(), "connection_combo" );
 
     kdDebug( 9000 ) << "Creating SQLSupportPart" << endl;
 
-    connect( core(), TQT_SIGNAL( projectConfigWidget( KDialogBase* ) ),
-             this, TQT_SLOT( projectConfigWidget( KDialogBase* ) ) );
-    connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) );
-    connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) );
-    connect( core(), TQT_SIGNAL(languageChanged()), this, TQT_SLOT(projectOpened()) );
-    connect( partController(), TQT_SIGNAL( savedFile( const KURL& ) ), this, TQT_SLOT( savedFile( const KURL& ) ) );
+    connect( core(), TQ_SIGNAL( projectConfigWidget( KDialogBase* ) ),
+             this, TQ_SLOT( projectConfigWidget( KDialogBase* ) ) );
+    connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened()) );
+    connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed()) );
+    connect( core(), TQ_SIGNAL(languageChanged()), this, TQ_SLOT(projectOpened()) );
+    connect( partController(), TQ_SIGNAL( savedFile( const KURL& ) ), this, TQ_SLOT( savedFile( const KURL& ) ) );
 
     m_widget = new SqlOutputWidget();
     mainWindow()->embedOutputView( m_widget, i18n( "SQL" ), i18n( "Output of SQL commands" ) );
@@ -136,22 +136,22 @@ void SQLSupportPart::projectConfigWidget( KDialogBase *dlg )
     SqlConfigWidget *w = new SqlConfigWidget( (TQWidget*)vbox, "SQL config widget" );
     w->setProjectDom( projectDom() );
     w->loadConfig();
-    connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) );
-    connect( w, TQT_SIGNAL(newConfigSaved()), this, TQT_SLOT(loadConfig()) );
+    connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) );
+    connect( w, TQ_SIGNAL(newConfigSaved()), this, TQ_SLOT(loadConfig()) );
 }
 
 void SQLSupportPart::projectOpened()
 {
-    connect( project(), TQT_SIGNAL( addedFilesToProject( const TQStringList & ) ),
-             this, TQT_SLOT( addedFilesToProject( const TQStringList & ) ) );
-    connect( project(), TQT_SIGNAL( removedFilesFromProject( const TQStringList & ) ),
-             this, TQT_SLOT( removedFilesFromProject( const TQStringList & ) ) );
+    connect( project(), TQ_SIGNAL( addedFilesToProject( const TQStringList & ) ),
+             this, TQ_SLOT( addedFilesToProject( const TQStringList & ) ) );
+    connect( project(), TQ_SIGNAL( removedFilesFromProject( const TQStringList & ) ),
+             this, TQ_SLOT( removedFilesFromProject( const TQStringList & ) ) );
 
     loadConfig();
 
     // We want to parse only after all components have been
     // properly initialized
-    TQTimer::singleShot( 0, this, TQT_SLOT( parse() ) );
+    TQTimer::singleShot( 0, this, TQ_SLOT( parse() ) );
 }
 
 
diff --git a/languages/sql/sqlsupport_part.h b/languages/sql/sqlsupport_part.h
index d5efca5b..921743e2 100644
--- a/languages/sql/sqlsupport_part.h
+++ b/languages/sql/sqlsupport_part.h
@@ -16,7 +16,7 @@ class CodeModel;
 
 class SQLSupportPart : public KDevLanguageSupport
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
 public: