From 3073e12f4e88c79af3c0c1fa6e199004ca2e2444 Mon Sep 17 00:00:00 2001
From: Maks Orlovich <maksim@kde.org>
Date: Thu, 31 Dec 2009 18:21:15 +0000
Subject: [PATCH] Fix symbol clash on ConfigDialog between this and
 systemsettings which makes it crash on trying to open this kcm with plastik
 deco active and non-hidden-visibility build

svn path=/trunk/KDE/kdebase/workspace/; revision=1068280
---
 clients/plastik/config/config.cpp      |  2 +-
 clients/plastik/config/config.h        |  6 +--
 clients/plastik/config/configdialog.ui | 64 +++++++++++++-------------
 3 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/clients/plastik/config/config.cpp b/clients/plastik/config/config.cpp
index aa0286dc06..a4ddfe08ed 100644
--- a/clients/plastik/config/config.cpp
+++ b/clients/plastik/config/config.cpp
@@ -43,7 +43,7 @@ PlastikConfig::PlastikConfig(KConfig* config, QWidget* parent)
     KGlobal::locale()->insertCatalog("kwin_clients");
 
     // create and show the configuration dialog
-    m_dialog = new ConfigDialog(parent);
+    m_dialog = new PlastikConfigDialog(parent);
     m_dialog->show();
 
     // load the configuration
diff --git a/clients/plastik/config/config.h b/clients/plastik/config/config.h
index 03ab3a65d0..b037efefd2 100644
--- a/clients/plastik/config/config.h
+++ b/clients/plastik/config/config.h
@@ -27,10 +27,10 @@
 #include "ui_configdialog.h"
 class KConfig;
 
-class ConfigDialog : public QWidget, public Ui::ConfigDialog
+class PlastikConfigDialog : public QWidget, public Ui::PlastikConfigDialog
 {
 public:
-  ConfigDialog( QWidget *parent ) : QWidget( parent ) {
+  PlastikConfigDialog( QWidget *parent ) : QWidget( parent ) {
     setupUi( this );
   }
 };
@@ -53,7 +53,7 @@ public slots:
 
 private:
     KConfig *m_config;
-    ConfigDialog *m_dialog;
+    PlastikConfigDialog *m_dialog;
 };
 
 #endif // KNIFTYCONFIG_H
diff --git a/clients/plastik/config/configdialog.ui b/clients/plastik/config/configdialog.ui
index fcdb52728d..fe9f53a5ab 100644
--- a/clients/plastik/config/configdialog.ui
+++ b/clients/plastik/config/configdialog.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
- <class>ConfigDialog</class>
- <widget class="QWidget" name="ConfigDialog" >
-  <property name="geometry" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>PlastikConfigDialog</class>
+ <widget class="QWidget" name="PlastikConfigDialog">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,92 +10,89 @@
     <height>176</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Config Dialog</string>
   </property>
-  <layout class="QVBoxLayout" >
-   <property name="margin" >
+  <layout class="QVBoxLayout">
+   <property name="margin">
     <number>0</number>
    </property>
    <item>
-    <widget class="KButtonGroup" name="titleAlign" >
-     <property name="title" >
+    <widget class="KButtonGroup" name="titleAlign">
+     <property name="title">
       <string>Title &amp;Alignment</string>
      </property>
-     <layout class="QHBoxLayout" name="horizontalLayout" >
+     <layout class="QHBoxLayout" name="horizontalLayout">
       <item>
-       <widget class="QRadioButton" name="AlignLeft" >
-        <property name="text" >
+       <widget class="QRadioButton" name="AlignLeft">
+        <property name="text">
          <string>Left</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QRadioButton" name="AlignHCenter" >
-        <property name="text" >
+       <widget class="QRadioButton" name="AlignHCenter">
+        <property name="text">
          <string>Center</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QRadioButton" name="AlignRight" >
-        <property name="text" >
+       <widget class="QRadioButton" name="AlignRight">
+        <property name="text">
          <string>Right</string>
         </property>
        </widget>
       </item>
      </layout>
-     <zorder>AlignLeft</zorder>
-     <zorder>AlignHCenter</zorder>
-     <zorder>AlignRight</zorder>
     </widget>
    </item>
    <item>
-    <widget class="QCheckBox" name="coloredBorder" >
-     <property name="whatsThis" >
+    <widget class="QCheckBox" name="coloredBorder">
+     <property name="whatsThis">
       <string>Check this option if the window border should be painted in the titlebar color. Otherwise it will be painted in the background color.</string>
      </property>
-     <property name="text" >
+     <property name="text">
       <string>Colored window border</string>
      </property>
-     <property name="shortcut" >
+     <property name="shortcut">
       <string/>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="QCheckBox" name="titleShadow" >
-     <property name="whatsThis" >
+    <widget class="QCheckBox" name="titleShadow">
+     <property name="whatsThis">
       <string>Check this option if you want the titlebar text to have a 3D look with a shadow behind it.</string>
      </property>
-     <property name="text" >
+     <property name="text">
       <string>Use shadowed &amp;text</string>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="QCheckBox" name="animateButtons" >
-     <property name="whatsThis" >
+    <widget class="QCheckBox" name="animateButtons">
+     <property name="whatsThis">
       <string>Check this option if you want the buttons to fade in when the mouse pointer hovers over them and fade out again when it moves away.</string>
      </property>
-     <property name="text" >
+     <property name="text">
       <string>Animate buttons</string>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="QCheckBox" name="menuClose" >
-     <property name="whatsThis" >
+    <widget class="QCheckBox" name="menuClose">
+     <property name="whatsThis">
       <string>Check this option if you want windows to be closed when you double click the menu button, similar to Microsoft Windows.</string>
      </property>
-     <property name="text" >
+     <property name="text">
       <string>Close windows by double clicking the menu button</string>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
-  <customwidgets>
+ <customwidgets>
   <customwidget>
    <class>KButtonGroup</class>
    <extends>QGroupBox</extends>