5 files changed, 20 insertions, 20 deletions
diff --git a/kcontrol/kthememanager/knewthemedlg.cpp b/kcontrol/kthememanager/knewthemedlg.cpp
index 76af5490a..220408ab9 100644
--- a/kcontrol/kthememanager/knewthemedlg.cpp
+++ b/kcontrol/kthememanager/knewthemedlg.cpp
@@ -28,7 +28,7 @@ KNewThemeDlg::KNewThemeDlg( TQWidget * parent, const char * name )
 {
     m_base = new NewThemeWidget( this, "new_theme_base" );
     setMainWidget( m_base );
-    connect( m_base->leName, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotThemeNameChanged( const TQString & ) ) );
+    connect( m_base->leName, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotThemeNameChanged( const TQString & ) ) );
     slotThemeNameChanged( m_base->leName->text() );
 }
 
diff --git a/kcontrol/kthememanager/knewthemedlg.h b/kcontrol/kthememanager/knewthemedlg.h
index 5580c4d01..39b7d554c 100644
--- a/kcontrol/kthememanager/knewthemedlg.h
+++ b/kcontrol/kthememanager/knewthemedlg.h
@@ -31,7 +31,7 @@ class NewThemeWidget;
  */
 class KNewThemeDlg: public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KNewThemeDlg( TQWidget * parent = 0, const char * name = 0);
     ~KNewThemeDlg();
diff --git a/kcontrol/kthememanager/kthemedlg.ui b/kcontrol/kthememanager/kthemedlg.ui
index 717f68e32..8f7fade9d 100644
--- a/kcontrol/kthememanager/kthemedlg.ui
+++ b/kcontrol/kthememanager/kthemedlg.ui
@@ -503,7 +503,7 @@
     <include location="local" impldecl="in implementation">kthemedlg.ui.h</include>
     <include location="global" impldecl="in implementation">kurllabel.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot specifier="non virtual">startKonqui( const TQString &amp; url )</slot>
     <slot specifier="non virtual">startBackground()</slot>
     <slot specifier="non virtual">startColors()</slot>
@@ -511,6 +511,6 @@
     <slot specifier="non virtual">startIcons()</slot>
     <slot specifier="non virtual">startFonts()</slot>
     <slot specifier="non virtual">startSaver()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp
index 5972efa2b..4d3791511 100644
--- a/kcontrol/kthememanager/kthememanager.cpp
+++ b/kcontrol/kthememanager/kthememanager.cpp
@@ -66,26 +66,26 @@ kthememanager::kthememanager( TQWidget *parent, const char *name )
 
     dlg->lvThemes->setColumnWidthMode( 0, TQListView::Maximum );
 
-    connect( ( TQObject * )dlg->btnInstall, TQT_SIGNAL( clicked() ),
-             this, TQT_SLOT( slotInstallTheme() ) );
+    connect( ( TQObject * )dlg->btnInstall, TQ_SIGNAL( clicked() ),
+             this, TQ_SLOT( slotInstallTheme() ) );
 
-    connect( ( TQObject * )dlg->btnRemove, TQT_SIGNAL( clicked() ),
-             this, TQT_SLOT( slotRemoveTheme() ) );
+    connect( ( TQObject * )dlg->btnRemove, TQ_SIGNAL( clicked() ),
+             this, TQ_SLOT( slotRemoveTheme() ) );
 
-    connect( ( TQObject * )dlg->btnCreate, TQT_SIGNAL( clicked() ),
-             this, TQT_SLOT( slotCreateTheme() ) );
+    connect( ( TQObject * )dlg->btnCreate, TQ_SIGNAL( clicked() ),
+             this, TQ_SLOT( slotCreateTheme() ) );
 
-    connect( ( TQObject * )dlg->lvThemes, TQT_SIGNAL( clicked( TQListViewItem * ) ),
-             this, TQT_SLOT( slotThemeChanged( TQListViewItem * ) ) );
+    connect( ( TQObject * )dlg->lvThemes, TQ_SIGNAL( clicked( TQListViewItem * ) ),
+             this, TQ_SLOT( slotThemeChanged( TQListViewItem * ) ) );
 
-    connect( ( TQObject * )dlg->lvThemes, TQT_SIGNAL( currentChanged( TQListViewItem * ) ),
-             this, TQT_SLOT( slotThemeChanged( TQListViewItem * ) ) );
+    connect( ( TQObject * )dlg->lvThemes, TQ_SIGNAL( currentChanged( TQListViewItem * ) ),
+             this, TQ_SLOT( slotThemeChanged( TQListViewItem * ) ) );
 
-    connect( this, TQT_SIGNAL( filesDropped( const KURL::List& ) ),
-             this, TQT_SLOT( updateButton() ) );
+    connect( this, TQ_SIGNAL( filesDropped( const KURL::List& ) ),
+             this, TQ_SLOT( updateButton() ) );
 
-    connect( ( TQObject * )dlg->lvThemes, TQT_SIGNAL( clicked( TQListViewItem * ) ),
-             this, TQT_SLOT( updateButton() ) );
+    connect( ( TQObject * )dlg->lvThemes, TQ_SIGNAL( clicked( TQListViewItem * ) ),
+             this, TQ_SLOT( updateButton() ) );
 
     m_origTheme = new KTheme( this, true ); // stores the defaults to get back to
     m_origTheme->setName( ORIGINAL_THEME );
@@ -405,7 +405,7 @@ void kthememanager::updatePreview( const TQString & pixFile )
      TQImage preview( pixFile, "PNG" );
      if (preview.width()>dlg->lbPreview->contentsRect().width() ||
          preview.height()>dlg->lbPreview->contentsRect().height() )
-         preview = preview.smoothScale( dlg->lbPreview->contentsRect().size(), TQ_ScaleMin );
+         preview = preview.smoothScale( dlg->lbPreview->contentsRect().size(), TQImage::ScaleMin );
      TQPixmap pix;
      pix.convertFromImage( preview );
      dlg->lbPreview->setPixmap( pix );
diff --git a/kcontrol/kthememanager/kthememanager.h b/kcontrol/kthememanager/kthememanager.h
index ac9fa5dc7..2415bd02e 100644
--- a/kcontrol/kthememanager/kthememanager.h
+++ b/kcontrol/kthememanager/kthememanager.h
@@ -60,7 +60,7 @@ private:
  */
 class kthememanager: public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     kthememanager( TQWidget *parent=0, const char *name=0 );
     virtual ~kthememanager();