From 92edeb1fe4ce92c3e4b9a1e985f4ab588219f290 Mon Sep 17 00:00:00 2001
From: Christoph Feck <christoph@maxiom.de>
Date: Mon, 20 Jul 2009 17:18:02 +0000
Subject: [PATCH] Fix double margins

svn path=/trunk/KDE/kdebase/workspace/; revision=999968
---
 kcmkwin/kwindesktop/desktopnameswidget.cpp |  1 +
 kcmkwin/kwindesktop/main.cpp               |  1 +
 kcmkwin/kwindesktop/main.ui                | 11 +++--------
 kcmkwin/kwinoptions/mouse.cpp              |  1 -
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/kcmkwin/kwindesktop/desktopnameswidget.cpp b/kcmkwin/kwindesktop/desktopnameswidget.cpp
index 473cd5b796..004e651458 100644
--- a/kcmkwin/kwindesktop/desktopnameswidget.cpp
+++ b/kcmkwin/kwindesktop/desktopnameswidget.cpp
@@ -35,6 +35,7 @@ DesktopNamesWidget::DesktopNamesWidget( QWidget *parent )
     , m_maxDesktops( 0 )
     {
     m_namesLayout = new QGridLayout;
+    m_namesLayout->setMargin( 0 );
 
     setLayout( m_namesLayout );
     }
diff --git a/kcmkwin/kwindesktop/main.cpp b/kcmkwin/kwindesktop/main.cpp
index 3da9343149..1387a92399 100644
--- a/kcmkwin/kwindesktop/main.cpp
+++ b/kcmkwin/kwindesktop/main.cpp
@@ -65,6 +65,7 @@ void KWinDesktopConfig::init()
     // TODO: there has to be a way to add the shortcuts editor to the ui file
     m_editor = new KShortcutsEditor( m_ui, KShortcutsEditor::GlobalAction );
     m_ui->editorFrame->setLayout( new QVBoxLayout() );
+    m_ui->editorFrame->layout()->setMargin( 0 );
     m_ui->editorFrame->layout()->addWidget( m_editor );
 
     m_ui->desktopNames->setDesktopConfig( this );
diff --git a/kcmkwin/kwindesktop/main.ui b/kcmkwin/kwindesktop/main.ui
index a5c40202f3..3236f30f0e 100644
--- a/kcmkwin/kwindesktop/main.ui
+++ b/kcmkwin/kwindesktop/main.ui
@@ -2,15 +2,10 @@
 <ui version="4.0">
  <class>KWinDesktopConfigForm</class>
  <widget class="QWidget" name="KWinDesktopConfigForm">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>724</width>
-    <height>434</height>
-   </rect>
-  </property>
   <layout class="QHBoxLayout" name="horizontalLayout">
+   <property name="margin">
+    <number>0</number>
+   </property>
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
diff --git a/kcmkwin/kwinoptions/mouse.cpp b/kcmkwin/kwinoptions/mouse.cpp
index 6bfc108946..e974f84ef0 100644
--- a/kcmkwin/kwinoptions/mouse.cpp
+++ b/kcmkwin/kwinoptions/mouse.cpp
@@ -741,7 +741,6 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config,
                              " a window while pressing a modifier key."));
 
   QHBoxLayout* innerLay=new QHBoxLayout(box);
-  innerLay->setMargin(0);
   QHBoxLayout* fLay=new QHBoxLayout;
   gridLayout = new QGridLayout;
   innerLay->addLayout(fLay);