Fix double margins

svn path=/trunk/KDE/kdebase/workspace/; revision=999968

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 );
     }

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 );

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">

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);