Rename obsolete tq methods to standard names

21 files changed, 41 insertions, 41 deletions

diff --git a/kcontrol/access/kcmaccess.cpp b/kcontrol/access/kcmaccess.cpp
index 9d1eae438..d7e114c55 100644
--- a/kcontrol/access/kcmaccess.cpp
+++ b/kcontrol/access/kcmaccess.cpp
@@ -248,7 +248,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   grp->setColumnLayout( 0, Qt::Horizontal );
   vbox->addWidget(grp);
 
-  TQVBoxLayout *vvbox = new TQVBoxLayout(grp->tqlayout(),
+  TQVBoxLayout *vvbox = new TQVBoxLayout(grp->layout(),
       KDialogBase::spacingHint());
 
   systemBell = new TQCheckBox(i18n("Use &system bell"), grp);
@@ -291,7 +291,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   grp->setColumnLayout( 0, Qt::Horizontal );
   vbox->addWidget(grp);
 
-  vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
+  vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
 
   visibleBell = new TQCheckBox(i18n("&Use visible bell"), grp);
   vvbox->addWidget(visibleBell);
@@ -353,7 +353,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   grp->setColumnLayout( 0, Qt::Horizontal );
   vbox->addWidget(grp);
 
-  vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
+  vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
 
   stickyKeys = new TQCheckBox(i18n("Use &sticky keys"), grp);
   vvbox->addWidget(stickyKeys);
@@ -377,7 +377,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   grp->setColumnLayout( 0, Qt::Horizontal );
   vbox->addWidget(grp);
 
-  vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
+  vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
 
   toggleKeysBeep = new TQCheckBox(i18n("Use system bell whenever a locking key gets activated or deactivated"), grp);
   vvbox->addWidget(toggleKeysBeep);
@@ -415,7 +415,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   grp->setColumnLayout( 0, Qt::Horizontal );
   vbox->addWidget(grp);
 
-  vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
+  vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
 
   slowKeys = new TQCheckBox(i18n("&Use slow keys"), grp);
   vvbox->addWidget(slowKeys);
@@ -447,7 +447,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   grp->setColumnLayout( 0, Qt::Horizontal );
   vbox->addWidget(grp);
 
-  vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
+  vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
 
   bounceKeys = new TQCheckBox(i18n("Use bou&nce keys"), grp);
   vvbox->addWidget(bounceKeys);
@@ -491,7 +491,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   grp->setColumnLayout( 0, Qt::Horizontal );
   vbox->addWidget(grp);
 
-  vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
+  vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
 
   gestures = new TQCheckBox(i18n("Use gestures for activating sticky keys and slow keys"), grp);
   vvbox->addWidget(gestures);
@@ -521,7 +521,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   grp->setColumnLayout( 0, Qt::Horizontal );
   vbox->addWidget(grp);
 
-  vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
+  vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
 
   accessxBeep = new TQCheckBox(i18n("Use the system bell whenever a gesture is used to turn an accessibility feature on or off"), grp);
   vvbox->addWidget(accessxBeep);
diff --git a/kcontrol/background/bghash.h b/kcontrol/background/bghash.h
index 61e9d7300..7cc09ca43 100644
--- a/kcontrol/background/bghash.h
+++ b/kcontrol/background/bghash.h
@@ -8,7 +8,7 @@
 static int TQHash(TQString key)
 {
     int g, h = 0;
-    const TQChar *p = key.tqunicode();
+    const TQChar *p = key.unicode();
     for (unsigned i=0; i < key.length(); i++) {
         h = (h << 4) + p[i].cell();
         if ((g = (h & 0xf0000000)))
diff --git a/kcontrol/bell/bell.cpp b/kcontrol/bell/bell.cpp
index fd2aaafb3..10d774da7 100644
--- a/kcontrol/bell/bell.cpp
+++ b/kcontrol/bell/bell.cpp
@@ -74,7 +74,7 @@ KBellConfig::KBellConfig(TQWidget *parent, const char *name):
   box->setColumnLayout( 0, Qt::Horizontal );
   layout->addWidget(box);
   layout->addStretch();
-  TQGridLayout *grid = new TQGridLayout(box->tqlayout(), KDialog::spacingHint());
+  TQGridLayout *grid = new TQGridLayout(box->layout(), KDialog::spacingHint());
   grid->setColStretch(0, 0);
   grid->setColStretch(1, 1);
   grid->addColSpacing(0, 30);
diff --git a/kcontrol/colors/widgetcanvas.cpp b/kcontrol/colors/widgetcanvas.cpp
index f9fd0a97f..623fd67b8 100644
--- a/kcontrol/colors/widgetcanvas.cpp
+++ b/kcontrol/colors/widgetcanvas.cpp
@@ -435,7 +435,7 @@ void WidgetCanvas::drawSampleWidgets()
     // Menu bar
 
     //qDrawShadePanel ( &paint, 25, 55, width()-52, 28, cg, FALSE, 2, &brush);
-    kapp->tqstyle().tqdrawPrimitive(TQStyle::PE_PanelMenuBar, &paint, 
+    kapp->style().tqdrawPrimitive(TQStyle::PE_PanelMenuBar, &paint, 
 			TQRect(TQPoint(25, 55), TQSize(width()-52, 28)), cg);
 
     paint.setFont( menuFont );
@@ -443,7 +443,7 @@ void WidgetCanvas::drawSampleWidgets()
 	TQString file = i18n("File");
     textLen = paint.fontMetrics().width( file );
     //qDrawShadePanel ( &paint, 30, 59, textLen + 10, 21, cg, FALSE, 2, &brush);
-	kapp->tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, &paint,
+	kapp->style().tqdrawPrimitive(TQStyle::PE_Panel, &paint,
 			TQRect(30, 59, textLen + 10, 21), cg);
     paint.drawText( 35, 74, file );
 
@@ -528,7 +528,7 @@ void WidgetCanvas::drawSampleWidgets()
     cg2.setColor(TQColorGroup::Button, button);
     cg2.setColor(TQColorGroup::Background, window);
     //qDrawWinButton(&paint, xpos, ypos, textLen+32, 28, cg, false, &brush);
-	kapp->tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonCommand, &paint,
+	kapp->style().tqdrawPrimitive(TQStyle::PE_ButtonCommand, &paint,
 			TQRect(xpos, ypos, textLen+32, 28), cg2, TQStyle::Style_Enabled | TQStyle::Style_Raised);
     paint.setPen(buttonTxt);
     paint.drawText(xpos, ypos, textLen+32, 28, AlignCenter,
diff --git a/kcontrol/input/mouse.cpp b/kcontrol/input/mouse.cpp
index ccd4a0536..eafa18c18 100644
--- a/kcontrol/input/mouse.cpp
+++ b/kcontrol/input/mouse.cpp
@@ -291,7 +291,7 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name)
   TQBoxLayout *vbox = new TQVBoxLayout(mouse, KDialog::marginHint(),
     KDialog::spacingHint());
 
-  TQVBoxLayout *vvbox = new TQVBoxLayout(mouse->tqlayout(), KDialog::spacingHint());
+  TQVBoxLayout *vvbox = new TQVBoxLayout(mouse->layout(), KDialog::spacingHint());
 
   mouseKeys = new TQCheckBox(i18n("&Move pointer with keyboard (using the num pad)"), mouse);
   vvbox->addWidget(mouseKeys);
diff --git a/kcontrol/kdm/kdm-appear.cpp b/kcontrol/kdm/kdm-appear.cpp
index e25c7b265..1dcf05dab 100644
--- a/kcontrol/kdm/kdm-appear.cpp
+++ b/kcontrol/kdm/kdm-appear.cpp
@@ -228,7 +228,7 @@ KDMAppearanceWidget::KDMAppearanceWidget(TQWidget *parent, const char *name)
   loadLanguageList(langcombo);
   connect(langcombo, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(changed()));
   label = new TQLabel(langcombo, i18n("Languag&e:"), group);
-  TQGridLayout *hbox = new TQGridLayout( group->tqlayout(), 2, 2, KDialog::spacingHint() );
+  TQGridLayout *hbox = new TQGridLayout( group->layout(), 2, 2, KDialog::spacingHint() );
   hbox->setColStretch(1, 1);
   hbox->addWidget(label, 1, 0);
   hbox->addWidget(langcombo, 1, 1);
@@ -244,7 +244,7 @@ KDMAppearanceWidget::KDMAppearanceWidget(TQWidget *parent, const char *name)
 
   sakbox = new TQCheckBox( i18n("Enable Secure Attention Key"), group );
   connect( sakbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()) );
-  TQGridLayout *hbox2 = new TQGridLayout( group->tqlayout(), 2, 2, KDialog::spacingHint() );
+  TQGridLayout *hbox2 = new TQGridLayout( group->layout(), 2, 2, KDialog::spacingHint() );
   hbox2->setColStretch(1, 1);
   hbox2->addWidget(sakbox, 1, 0);
   wtstr = i18n("Here you can enable or disable the Secure Attention Key [SAK] anti-spoofing measure.");
@@ -351,7 +351,7 @@ bool KDMAppearanceWidget::setLogo(TQString logo)
     if (p.width() > 100 || p.height() > 100)
         p = p.smoothScale(100, 100, TQ_ScaleMin);
     logobutton->setPixmap(p);
-    uint bd = tqstyle().pixelMetric( TQStyle::PM_ButtonMargin ) * 2;
+    uint bd = style().pixelMetric( TQStyle::PM_ButtonMargin ) * 2;
     logobutton->setFixedSize(p.width() + bd, p.height() + bd);
     logopath = logo;
     return true;
diff --git a/kcontrol/kdm/kdm-users.cpp b/kcontrol/kdm/kdm-users.cpp
index b6018c842..3d6139a25 100644
--- a/kcontrol/kdm/kdm-users.cpp
+++ b/kcontrol/kdm/kdm-users.cpp
@@ -168,7 +168,7 @@ KDMUsersWidget::KDMUsersWidget(TQWidget *parent, const char *name)
     userbutton = new TQPushButton( hlpw );
     userbutton->setAcceptDrops( true );
     userbutton->installEventFilter( this ); // for drag and drop
-    uint sz = tqstyle().pixelMetric( TQStyle::PM_ButtonMargin ) * 2 + 48;
+    uint sz = style().pixelMetric( TQStyle::PM_ButtonMargin ) * 2 + 48;
     userbutton->setFixedSize( sz, sz );
     connect( userbutton, TQT_SIGNAL(clicked()),
 	     TQT_SLOT(slotUserButtonClicked()) );
diff --git a/kcontrol/kfontinst/kfontinst/FontEngine.cpp b/kcontrol/kfontinst/kfontinst/FontEngine.cpp
index dffa60f2d..4fe823c23 100644
--- a/kcontrol/kfontinst/kfontinst/FontEngine.cpp
+++ b/kcontrol/kfontinst/kfontinst/FontEngine.cpp
@@ -163,7 +163,7 @@ static void removeSymbols(TQString &str)
     TQChar space(' ');
 
     for(int c=0; c<len; ++c)
-        if(str[c].tqunicode()<0x20 || str[c].tqunicode()>0x7E)
+        if(str[c].unicode()<0x20 || str[c].unicode()>0x7E)
             str[c]=space;
 
     str=str.simplifyWhiteSpace();
diff --git a/kcontrol/kfontinst/lib/FcEngine.cpp b/kcontrol/kfontinst/lib/FcEngine.cpp
index 2b3d40737..44d180fd2 100644
--- a/kcontrol/kfontinst/lib/FcEngine.cpp
+++ b/kcontrol/kfontinst/lib/FcEngine.cpp
@@ -439,7 +439,7 @@ static bool hasStr(XftFont *font, TQString &str)
                  ch;
 
     for(ch=0; ch<slen; ++ch)
-        if(!FcCharSetHasChar(font->charset, str[ch].tqunicode()))
+        if(!FcCharSetHasChar(font->charset, str[ch].unicode()))
             return false;
     return true;
 }
diff --git a/kcontrol/kfontinst/viewpart/FontPreview.cpp b/kcontrol/kfontinst/viewpart/FontPreview.cpp
index 8b5ead1a8..3679be252 100644
--- a/kcontrol/kfontinst/viewpart/FontPreview.cpp
+++ b/kcontrol/kfontinst/viewpart/FontPreview.cpp
@@ -88,7 +88,7 @@ void CFontPreview::paintEvent(TQPaintEvent *)
     {
         if(!itsCurrentUrl.isEmpty())
         {
-            paint.setPen(kapp->tqpalette().active().text());
+            paint.setPen(kapp->palette().active().text());
             paint.drawText(rect(), AlignCenter, i18n(" No preview available"));
         }
     }
diff --git a/kcontrol/kio/smbrodlg.cpp b/kcontrol/kio/smbrodlg.cpp
index 148af43d1..90dfd9170 100644
--- a/kcontrol/kio/smbrodlg.cpp
+++ b/kcontrol/kio/smbrodlg.cpp
@@ -140,7 +140,7 @@ void SMBRoOptions::save()
    for (uint i=0; i<password.length(); i++)
    {
       TQChar c = password[i];
-      unsigned int num = (c.tqunicode() ^ 173) + 17;
+      unsigned int num = (c.unicode() ^ 173) + 17;
       unsigned int a1 = (num & 0xFC00) >> 10;
       unsigned int a2 = (num & 0x3E0) >> 5;
       unsigned int a3 = (num & 0x1F);
diff --git a/kcontrol/kio/uagentproviderdlg.cpp b/kcontrol/kio/uagentproviderdlg.cpp
index 5bf92cdb7..9e945948d 100644
--- a/kcontrol/kio/uagentproviderdlg.cpp
+++ b/kcontrol/kio/uagentproviderdlg.cpp
@@ -47,7 +47,7 @@ void UALineEdit::keyPressEvent( TQKeyEvent* e )
   TQString keycode = e->text();
   if ( (key >= Qt::Key_Escape && key <= Qt::Key_Help) || key == Qt::Key_Period ||
        (cursorPosition() > 0 && key == Qt::Key_Minus) ||
-       (!keycode.isEmpty() && keycode.tqunicode()->isLetterOrNumber()) )
+       (!keycode.isEmpty() && keycode.unicode()->isLetterOrNumber()) )
   {
     KLineEdit::keyPressEvent(e);
     return;
diff --git a/kcontrol/konqhtml/domainlistview.cpp b/kcontrol/konqhtml/domainlistview.cpp
index c0a72e9e1..29dccb14b 100644
--- a/kcontrol/konqhtml/domainlistview.cpp
+++ b/kcontrol/konqhtml/domainlistview.cpp
@@ -38,7 +38,7 @@ DomainListView::DomainListView(KConfig *config,const TQString &title,
   setColumnLayout(0, Qt::Vertical);
   layout()->setSpacing(0);
   layout()->setMargin(0);
-  TQGridLayout* thisLayout = new TQGridLayout(tqlayout());
+  TQGridLayout* thisLayout = new TQGridLayout(layout());
   thisLayout->setAlignment(Qt::AlignTop);
   thisLayout->setSpacing(KDialog::spacingHint());
   thisLayout->setMargin(KDialog::marginHint());
diff --git a/kcontrol/konqhtml/htmlopts.cpp b/kcontrol/konqhtml/htmlopts.cpp
index b72caa544..0b81421a8 100644
--- a/kcontrol/konqhtml/htmlopts.cpp
+++ b/kcontrol/konqhtml/htmlopts.cpp
@@ -82,7 +82,7 @@ KMiscHTMLOptions::KMiscHTMLOptions(KConfig *config, TQString group, TQWidget *pa
     // Tabbed Browsing
 
     TQGroupBox *bgTabbedBrowsing = new TQGroupBox( 0, Qt::Vertical, i18n("Tabbed Browsing"), this );
-    TQVBoxLayout *laygroup = new TQVBoxLayout(bgTabbedBrowsing->tqlayout(), KDialog::spacingHint() );
+    TQVBoxLayout *laygroup = new TQVBoxLayout(bgTabbedBrowsing->layout(), KDialog::spacingHint() );
 
     m_pShowMMBInTabs = new TQCheckBox( i18n( "Open &links in new tab instead of in new window" ), bgTabbedBrowsing );
     TQWhatsThis::add( m_pShowMMBInTabs, i18n("This will open a new tab instead of a new window in various situations, "
diff --git a/kcontrol/konqhtml/jspolicies.cpp b/kcontrol/konqhtml/jspolicies.cpp
index eb37c15db..5196af8dd 100644
--- a/kcontrol/konqhtml/jspolicies.cpp
+++ b/kcontrol/konqhtml/jspolicies.cpp
@@ -135,7 +135,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
   setColumnLayout(0, Qt::Vertical);
   layout()->setSpacing(0);
   layout()->setMargin(0);
-  TQGridLayout *this_layout = new TQGridLayout(tqlayout(),5,10+is_per_domain*2);
+  TQGridLayout *this_layout = new TQGridLayout(layout(),5,10+is_per_domain*2);
   this_layout->setAlignment(Qt::AlignTop);
   this_layout->setSpacing(3);
   this_layout->setMargin(11);
diff --git a/kcontrol/konsole/schemaeditor.cpp b/kcontrol/konsole/schemaeditor.cpp
index 80b8ef2fa..e870aff33 100644
--- a/kcontrol/konsole/schemaeditor.cpp
+++ b/kcontrol/konsole/schemaeditor.cpp
@@ -666,7 +666,7 @@ void SchemaEditor::readSchema(int num)
 		    continue;
 		if (!(0 <= bo && bo <= 1))
 		    continue;
-		color[fi] = kapp->tqpalette().active().text();
+		color[fi] = kapp->palette().active().text();
 		transparent[fi] = tr;
 		bold[fi] = bo;
 		type[fi] = 1;
@@ -681,7 +681,7 @@ void SchemaEditor::readSchema(int num)
 		    continue;
 		if (!(0 <= bo && bo <= 1))
 		    continue;
-		color[fi] = kapp->tqpalette().active().base();
+		color[fi] = kapp->palette().active().base();
 		transparent[fi] = tr;
 		bold[fi] = bo;
 		type[fi] = 2;
diff --git a/kcontrol/launch/kcmlaunch.cpp b/kcontrol/launch/kcmlaunch.cpp
index f73303bc0..ba6193107 100644
--- a/kcontrol/launch/kcmlaunch.cpp
+++ b/kcontrol/launch/kcmlaunch.cpp
@@ -57,10 +57,10 @@ LaunchConfig::LaunchConfig(TQWidget * parent, const char * name, const TQStringL
      "given in the section 'Startup indication timeout'"));
 
     GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->tqlayout()->setSpacing( 0 );
-    GroupBox1->tqlayout()->setMargin( 0 );
+    GroupBox1->layout()->setSpacing( 0 );
+    GroupBox1->layout()->setMargin( 0 );
     Form1Layout->addWidget( GroupBox1 );
-    TQGridLayout* GroupBox1Layout = new TQGridLayout( GroupBox1->tqlayout(), 3, 2 );
+    TQGridLayout* GroupBox1Layout = new TQGridLayout( GroupBox1->layout(), 3, 2 );
     GroupBox1Layout->setSpacing( 6 );
     GroupBox1Layout->setMargin( 11 );
     GroupBox1Layout->setColStretch( 1, 1 );
@@ -97,10 +97,10 @@ LaunchConfig::LaunchConfig(TQWidget * parent, const char * name, const TQStringL
      "given in the section 'Startup indication timeout'"));
 
     GroupBox2->setColumnLayout( 0, Qt::Vertical );
-    GroupBox2->tqlayout()->setSpacing( 0 );
-    GroupBox2->tqlayout()->setMargin( 0 );
+    GroupBox2->layout()->setSpacing( 0 );
+    GroupBox2->layout()->setMargin( 0 );
     Form1Layout->addWidget( GroupBox2 );
-    TQGridLayout* GroupBox2Layout = new TQGridLayout( GroupBox2->tqlayout(), 2, 2 );
+    TQGridLayout* GroupBox2Layout = new TQGridLayout( GroupBox2->layout(), 2, 2 );
     GroupBox2Layout->setSpacing( 6 );
     GroupBox2Layout->setMargin( 11 );
     GroupBox2Layout->setColStretch( 1, 1 );
diff --git a/kcontrol/locale/klocalesample.cpp b/kcontrol/locale/klocalesample.cpp
index d97010b97..7af914ae9 100644
--- a/kcontrol/locale/klocalesample.cpp
+++ b/kcontrol/locale/klocalesample.cpp
@@ -45,7 +45,7 @@ KLocaleSample::KLocaleSample(KLocale *locale,
   lay->setAutoAdd(TRUE);
 
   // Whatever the color scheme is, we want black text
-  TQColorGroup a = tqpalette().active();
+  TQColorGroup a = palette().active();
   a.setColor(TQColorGroup::Foreground, Qt::black);
   TQPalette pal(a, a, a);
 
diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp
index c3c154951..4764f0605 100644
--- a/kcontrol/screensaver/scrnsave.cpp
+++ b/kcontrol/screensaver/scrnsave.cpp
@@ -133,7 +133,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
     mSaverGroup->setColumnLayout( 0, Qt::Horizontal );
     vLayout->addWidget(mSaverGroup);
     vLayout->setStretchFactor( mSaverGroup, 10 );
-    TQBoxLayout *groupLayout = new TQVBoxLayout( mSaverGroup->tqlayout(),
+    TQBoxLayout *groupLayout = new TQVBoxLayout( mSaverGroup->layout(),
         KDialog::spacingHint() );
 
     mSaverListView = new TQListView( mSaverGroup );
@@ -162,7 +162,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
     mSettingsGroup = new TQGroupBox( i18n("Settings"), this );
     mSettingsGroup->setColumnLayout( 0, Qt::Vertical );
     leftColumnLayout->addWidget( mSettingsGroup );
-    groupLayout = new TQVBoxLayout( mSettingsGroup->tqlayout(),
+    groupLayout = new TQVBoxLayout( mSettingsGroup->layout(),
         KDialog::spacingHint() );
 
     mEnabledCheckBox = new TQCheckBox(i18n(
diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp
index a35a8cdc5..16ff43b68 100644
--- a/kcontrol/style/kcmstyle.cpp
+++ b/kcontrol/style/kcmstyle.cpp
@@ -160,7 +160,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
 	gbWidgetStyle->layout()->setMargin( KDialog::marginHint() );
 	gbWidgetStyle->layout()->setSpacing( KDialog::spacingHint() );
 
-	gbWidgetStyleLayout = new TQVBoxLayout( gbWidgetStyle->tqlayout() );
+	gbWidgetStyleLayout = new TQVBoxLayout( gbWidgetStyle->layout() );
 	gbWidgetStyleLayout->setAlignment( Qt::AlignTop );
 	hbLayout = new TQHBoxLayout( KDialog::spacingHint(), "hbLayout" );
 
@@ -195,7 +195,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
 	gbPreview->layout()->setSpacing( KDialog::spacingHint() );
 	gbPreview->setFlat( true );
 	stylePreview = new StylePreview( gbPreview );
-	gbPreview->tqlayout()->add( stylePreview );
+	gbPreview->layout()->add( stylePreview );
 
 	page1Layout->addWidget( gbWidgetStyle );
 	page1Layout->addWidget( gbPreview );
@@ -804,7 +804,7 @@ void KCMStyle::loadStyle( KConfig& config )
 			break;
 		else if ( id.contains( cfgStyle ) )
 			break;
-		else if ( id.contains( TQApplication::tqstyle().className() ) )
+		else if ( id.contains( TQApplication::style().className() ) )
 			break;
 		item = 0;
 	}
diff --git a/kcontrol/usbview/kcmusb.cpp b/kcontrol/usbview/kcmusb.cpp
index 5939e5997..6d78841ec 100644
--- a/kcontrol/usbview/kcmusb.cpp
+++ b/kcontrol/usbview/kcmusb.cpp
@@ -39,7 +39,7 @@ USBViewer::USBViewer(TQWidget *parent, const char *name, const TQStringList &)
   gbox->setColumnLayout( 0, Qt::Horizontal );
   vbox->addWidget(gbox);
 
-  TQVBoxLayout *vvbox = new TQVBoxLayout(gbox->tqlayout(), KDialog::spacingHint());
+  TQVBoxLayout *vvbox = new TQVBoxLayout(gbox->layout(), KDialog::spacingHint());
 
   TQSplitter *splitter = new TQSplitter(gbox);
   vvbox->addWidget(splitter);