diff --git a/kcmkwin/kwindecoration/kwindecoration.cpp b/kcmkwin/kwindecoration/kwindecoration.cpp
index 9723a6171c..ef1e247d22 100644
--- a/kcmkwin/kwindecoration/kwindecoration.cpp
+++ b/kcmkwin/kwindecoration/kwindecoration.cpp
@@ -32,7 +32,8 @@
 #include <QFileInfo>
 #include <QLayout>
 
-#include <q3groupbox.h>
+#include <QGroupBox>
+#include <QGridLayout>
 #include <QCheckBox>
 #include <QTabWidget>
 
@@ -101,11 +102,12 @@ KWinDecorationModule::KWinDecorationModule(QWidget* parent, const QStringList &)
 	decorationList->setWhatsThis( whatsThis);
 	pluginLayout->addWidget(decorationList);
 
-	Q3GroupBox *pluginSettingsGrp = new Q3GroupBox( i18n("Decoration Options"), pluginPage );
-	pluginSettingsGrp->setColumnLayout( 0, Qt::Vertical );
+	QGroupBox *pluginSettingsGrp = new QGroupBox( i18n("Decoration Options"), pluginPage );
+    QGridLayout *pluginSettingsLayout = new QGridLayout();
 	pluginSettingsGrp->setFlat( true );
-	pluginSettingsGrp->layout()->setMargin( 0 );
-	pluginSettingsGrp->layout()->setSpacing( KDialog::spacingHint() );
+	pluginSettingsLayout->setMargin( 0 );
+	pluginSettingsLayout->setSpacing( KDialog::spacingHint() );
+	pluginSettingsGrp->setLayout( pluginSettingsLayout );
 	pluginLayout->addWidget( pluginSettingsGrp );
 
 	pluginLayout->addStretch();
diff --git a/kcmkwin/kwindecoration/preview.cpp b/kcmkwin/kwindecoration/preview.cpp
index 5401e021e8..5df5767d09 100644
--- a/kcmkwin/kwindecoration/preview.cpp
+++ b/kcmkwin/kwindecoration/preview.cpp
@@ -40,11 +40,9 @@
 
 // FRAME the preview doesn't update to reflect the changes done in the kcm
 
-KDecorationPreview::KDecorationPreview( QWidget* parent, const char* name )
+KDecorationPreview::KDecorationPreview( QWidget* parent )
     :   QWidget( parent )
     {
-      setObjectName( name );
-
     options = new KDecorationPreviewOptions;
 
     bridge[Active]   = new KDecorationPreviewBridge( this, true );
diff --git a/kcmkwin/kwindecoration/preview.h b/kcmkwin/kwindecoration/preview.h
index 138e17595d..b9041ad083 100644
--- a/kcmkwin/kwindecoration/preview.h
+++ b/kcmkwin/kwindecoration/preview.h
@@ -43,7 +43,7 @@ class KDecorationPreview
         //       and an inactive window.
         enum Windows { Inactive = 0, Active, NumWindows };
 
-        KDecorationPreview( QWidget* parent = NULL, const char* name = NULL );
+        KDecorationPreview( QWidget* parent = NULL );
         virtual ~KDecorationPreview();
         bool recreateDecoration( KDecorationPlugins* plugin );
         void enablePreview();