vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
icc-effect-5.14.5
Maks Orlovich 2009-12-31 18:21:15 +00:00
parent 63697902e3
commit 3073e12f4e
3 changed files with 35 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clients/plastik/config/config.cpp
View File

@ -43,7 +43,7 @@ PlastikConfig::PlastikConfig(KConfig* config, QWidget* parent)
KGlobal::locale()->insertCatalog("kwin_clients"); KGlobal::locale()->insertCatalog("kwin_clients");
// create and show the configuration dialog // create and show the configuration dialog
m_dialog = new ConfigDialog(parent); m_dialog = new PlastikConfigDialog(parent);
m_dialog->show(); m_dialog->show();
// load the configuration // load the configuration

6
clients/plastik/config/config.h
View File

@ -27,10 +27,10 @@
#include "ui_configdialog.h" #include "ui_configdialog.h"
class KConfig; class KConfig;
class ConfigDialog : public QWidget, public Ui::ConfigDialog class PlastikConfigDialog : public QWidget, public Ui::PlastikConfigDialog
{ {
public: public:
ConfigDialog( QWidget *parent ) : QWidget( parent ) { PlastikConfigDialog( QWidget *parent ) : QWidget( parent ) {
setupUi( this ); setupUi( this );
} }
}; };
@ -53,7 +53,7 @@ public slots:
private: private:
KConfig *m_config; KConfig *m_config;
ConfigDialog *m_dialog; PlastikConfigDialog *m_dialog;
}; };
#endif // KNIFTYCONFIG_H #endif // KNIFTYCONFIG_H

8
clients/plastik/config/configdialog.ui
View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>ConfigDialog</class> <class>PlastikConfigDialog</class>
<widget class="QWidget" name="ConfigDialog" > <widget class="QWidget" name="PlastikConfigDialog">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
@ -44,9 +45,6 @@
</widget> </widget>
</item> </item>
</layout> </layout>
<zorder>AlignLeft</zorder>
<zorder>AlignHCenter</zorder>
<zorder>AlignRight</zorder>
</widget> </widget>
</item> </item>
<item> <item>