From 46fb95896138029da90b7767d56d5b45bc960ded Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Sun, 18 Jul 2004 23:40:42 +0000 Subject: [PATCH] More KCModule that now use setAboutData so we avoid leaking of mem svn path=/trunk/kdebase/kwin/; revision=330728 --- kcmkwin/kwindecoration/kwindecoration.cpp | 20 +++++-------- kcmkwin/kwindecoration/kwindecoration.h | 1 - kcmkwin/kwinoptions/main.cpp | 36 ++++++++++------------- kcmkwin/kwinoptions/main.h | 2 -- kcmkwin/kwinrules/main.cpp | 14 ++++----- kcmkwin/kwinrules/main.h | 1 - 6 files changed, 29 insertions(+), 45 deletions(-) diff --git a/kcmkwin/kwindecoration/kwindecoration.cpp b/kcmkwin/kwindecoration/kwindecoration.cpp index 4b5e270635..cc0a9b6422 100644 --- a/kcmkwin/kwindecoration/kwindecoration.cpp +++ b/kcmkwin/kwindecoration/kwindecoration.cpp @@ -176,6 +176,14 @@ KWinDecorationModule::KWinDecorationModule(QWidget* parent, const char* name, co // Allow kwin dcop signal to update our selection list connectDCOPSignal("kwin", 0, "dcopResetAllClients()", "dcopUpdateClientList()", false); + + KAboutData *about = + new KAboutData(I18N_NOOP("kcmkwindecoration"), + I18N_NOOP("Window Decoration Control Module"), + 0, 0, KAboutData::License_GPL, + I18N_NOOP("(c) 2001 Karol Szwed")); + about->addAuthor("Karol Szwed", 0, "gallium@kde.org"); + setAboutData(about); } @@ -593,18 +601,6 @@ QString KWinDecorationModule::quickHelp() const } -const KAboutData* KWinDecorationModule::aboutData() const -{ - KAboutData* about = - new KAboutData(I18N_NOOP("kcmkwindecoration"), - I18N_NOOP("Window Decoration Control Module"), - 0, 0, KAboutData::License_GPL, - I18N_NOOP("(c) 2001 Karol Szwed")); - about->addAuthor("Karol Szwed", 0, "gallium@kde.org"); - return about; -} - - void KWinDecorationModule::resetKWin() { bool ok = kapp->dcopClient()->send("kwin", "KWinInterface", diff --git a/kcmkwin/kwindecoration/kwindecoration.h b/kcmkwin/kwindecoration/kwindecoration.h index 2ee3c8e6a8..1b4db8110a 100644 --- a/kcmkwin/kwindecoration/kwindecoration.h +++ b/kcmkwin/kwindecoration/kwindecoration.h @@ -71,7 +71,6 @@ class KWinDecorationModule : public KCModule, virtual public KWinDecorationIface virtual void defaults(); QString quickHelp() const; - const KAboutData* aboutData() const; virtual void dcopUpdateClientList(); diff --git a/kcmkwin/kwinoptions/main.cpp b/kcmkwin/kwinoptions/main.cpp index 7796f2ec3a..f11b68bf1b 100644 --- a/kcmkwin/kwinoptions/main.cpp +++ b/kcmkwin/kwinoptions/main.cpp @@ -104,6 +104,22 @@ KWinOptions::KWinOptions(QWidget *parent, const char *name) mAdvanced->layout()->setMargin( KDialog::marginHint() ); tab->addTab(mAdvanced, i18n("Ad&vanced")); connect(mAdvanced, SIGNAL(changed(bool)), this, SLOT(moduleChanged(bool))); + + KAboutData *about = + new KAboutData(I18N_NOOP("kcmkwinoptions"), I18N_NOOP("Window Behavior Configuration Module"), + 0, 0, KAboutData::License_GPL, + I18N_NOOP("(c) 1997 - 2002 KWin and KControl Authors")); + + about->addAuthor("Matthias Ettrich",0,"ettrich@kde.org"); + about->addAuthor("Waldo Bastian",0,"bastian@kde.org"); + about->addAuthor("Cristian Tibirna",0,"tibirna@kde.org"); + about->addAuthor("Matthias Kalle Dalheimer",0,"kalle@kde.org"); + about->addAuthor("Daniel Molkentin",0,"molkentin@kde.org"); + about->addAuthor("Wynn Wilkes",0,"wynnw@caldera.com"); + about->addAuthor("Pat Dowler",0,"dowler@pt1B1106.FSH.UVic.CA"); + about->addAuthor("Bernd Wuebben",0,"wuebben@kde.org"); + about->addAuthor("Matthias Hoelzer-Kluepfel",0,"hoelzer@kde.org"); + setAboutData(about); } KWinOptions::~KWinOptions() @@ -156,26 +172,6 @@ QString KWinOptions::quickHelp() const " for how to customize window behavior."); } -const KAboutData* KWinOptions::aboutData() const -{ - KAboutData *about = - new KAboutData(I18N_NOOP("kcmkwinoptions"), I18N_NOOP("Window Behavior Configuration Module"), - 0, 0, KAboutData::License_GPL, - I18N_NOOP("(c) 1997 - 2002 KWin and KControl Authors")); - - about->addAuthor("Matthias Ettrich",0,"ettrich@kde.org"); - about->addAuthor("Waldo Bastian",0,"bastian@kde.org"); - about->addAuthor("Cristian Tibirna",0,"tibirna@kde.org"); - about->addAuthor("Matthias Kalle Dalheimer",0,"kalle@kde.org"); - about->addAuthor("Daniel Molkentin",0,"molkentin@kde.org"); - about->addAuthor("Wynn Wilkes",0,"wynnw@caldera.com"); - about->addAuthor("Pat Dowler",0,"dowler@pt1B1106.FSH.UVic.CA"); - about->addAuthor("Bernd Wuebben",0,"wuebben@kde.org"); - about->addAuthor("Matthias Hoelzer-Kluepfel",0,"hoelzer@kde.org"); - - return about; -} - void KWinOptions::moduleChanged(bool state) { emit KCModule::changed(state); diff --git a/kcmkwin/kwinoptions/main.h b/kcmkwin/kwinoptions/main.h index 6484b07c2f..e7e01d5a89 100644 --- a/kcmkwin/kwinoptions/main.h +++ b/kcmkwin/kwinoptions/main.h @@ -32,7 +32,6 @@ class KConfig; class KFocusConfig; class KActionsConfig; class KAdvancedConfig; -class KAboutData; class KWinOptions : public KCModule { @@ -47,7 +46,6 @@ public: void save(); void defaults(); QString quickHelp() const; - const KAboutData* aboutData() const; protected slots: diff --git a/kcmkwin/kwinrules/main.cpp b/kcmkwin/kwinrules/main.cpp index b8d27c93c2..2d7f42c900 100644 --- a/kcmkwin/kwinrules/main.cpp +++ b/kcmkwin/kwinrules/main.cpp @@ -46,6 +46,11 @@ KCMRules::KCMRules( QWidget *parent, const char *name ) widget = new KCMRulesList( this ); layout->addWidget( widget ); connect( widget, SIGNAL( changed( bool )), SLOT( moduleChanged( bool ))); + KAboutData *about = new KAboutData(I18N_NOOP( "kcmkwinrules" ), + I18N_NOOP( "Window-Specific Settings Configuration Module" ), + 0, 0, KAboutData::License_GPL, I18N_NOOP( "(c) 2004 KWin and KControl Authors" )); + about->addAuthor("Lubos Lunak",0,"l.lunak@kde.org"); + setAboutData(about); } void KCMRules::load() @@ -80,15 +85,6 @@ QString KCMRules::quickHelp() const " for how to customize window behavior."); } -const KAboutData* KCMRules::aboutData() const - { - KAboutData *about = new KAboutData(I18N_NOOP( "kcmkwinrules" ), - I18N_NOOP( "Window-Specific Settings Configuration Module" ), - 0, 0, KAboutData::License_GPL, I18N_NOOP( "(c) 2004 KWin and KControl Authors" )); - about->addAuthor("Lubos Lunak",0,"l.lunak@kde.org"); - return about; - } - void KCMRules::moduleChanged( bool state ) { emit KCModule::changed( state ); diff --git a/kcmkwin/kwinrules/main.h b/kcmkwin/kwinrules/main.h index 5e859c1fd6..b9369bf6ff 100644 --- a/kcmkwin/kwinrules/main.h +++ b/kcmkwin/kwinrules/main.h @@ -41,7 +41,6 @@ class KCMRules virtual void save(); virtual void defaults(); virtual QString quickHelp() const; - virtual const KAboutData* aboutData() const; protected slots: void moduleChanged( bool state ); private: