diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:15:55 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:15:55 -0600 |
| commit | 1d061b286a8b183b39be60fe531f2b1c2915f03a (patch) | |
| tree | 0a4c6ee79918e366077094fb59e9c1196d7f4156 /twin/kcmtwin | |
| parent | 1e0a98b8623428064963b1627e4e09ea02c1e87e (diff) | |
| download | tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'twin/kcmtwin')
| -rw-r--r-- | twin/kcmtwin/twindecoration/twindecoration.cpp | 6 | ||||
| -rw-r--r-- | twin/kcmtwin/twinoptions/main.cpp | 6 | ||||
| -rw-r--r-- | twin/kcmtwin/twinrules/kcm.cpp | 4 | ||||
| -rw-r--r-- | twin/kcmtwin/twinrules/kcm.h | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/twin/kcmtwin/twindecoration/twindecoration.cpp b/twin/kcmtwin/twindecoration/twindecoration.cpp index 14d45cf80..4f9c82a21 100644 --- a/twin/kcmtwin/twindecoration/twindecoration.cpp +++ b/twin/kcmtwin/twindecoration/twindecoration.cpp @@ -378,10 +378,10 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c // Allow twin dcop signal to update our selection list connectDCOPSignal("twin", 0, "dcopResetAllClients()", "dcopUpdateClientList()", false); - KAboutData *about = - new KAboutData(I18N_NOOP("kcmtwindecoration"), + TDEAboutData *about = + new TDEAboutData(I18N_NOOP("kcmtwindecoration"), I18N_NOOP("Window Decoration Control Module"), - 0, 0, KAboutData::License_GPL, + 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c) 2001 Karol Szwed")); about->addAuthor("Karol Szwed", 0, "gallium@kde.org"); setAboutData(about); diff --git a/twin/kcmtwin/twinoptions/main.cpp b/twin/kcmtwin/twinoptions/main.cpp index a10269eca..5b193ed5f 100644 --- a/twin/kcmtwin/twinoptions/main.cpp +++ b/twin/kcmtwin/twinoptions/main.cpp @@ -122,9 +122,9 @@ KWinOptions::KWinOptions(TQWidget *parent, const char *name) tab->addTab(mTranslucency, i18n("&Translucency")); connect(mTranslucency, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); - KAboutData *about = - new KAboutData(I18N_NOOP("kcmtwinoptions"), I18N_NOOP("Window Behavior Configuration Module"), - 0, 0, KAboutData::License_GPL, + TDEAboutData *about = + new TDEAboutData(I18N_NOOP("kcmtwinoptions"), I18N_NOOP("Window Behavior Configuration Module"), + 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c) 1997 - 2002 KWin and KControl Authors")); about->addAuthor("Matthias Ettrich",0,"ettrich@kde.org"); diff --git a/twin/kcmtwin/twinrules/kcm.cpp b/twin/kcmtwin/twinrules/kcm.cpp index c7cdc7587..d498a5e71 100644 --- a/twin/kcmtwin/twinrules/kcm.cpp +++ b/twin/kcmtwin/twinrules/kcm.cpp @@ -46,9 +46,9 @@ KCMRules::KCMRules( TQWidget *parent, const char *name ) widget = new KCMRulesList( this ); layout->addWidget( TQT_TQWIDGET(widget) ); connect( widget, TQT_SIGNAL( changed( bool )), TQT_SLOT( moduleChanged( bool ))); - KAboutData *about = new KAboutData(I18N_NOOP( "kcmtwinrules" ), + TDEAboutData *about = new TDEAboutData(I18N_NOOP( "kcmtwinrules" ), I18N_NOOP( "Window-Specific Settings Configuration Module" ), - 0, 0, KAboutData::License_GPL, I18N_NOOP( "(c) 2004 KWin and KControl Authors" )); + 0, 0, TDEAboutData::License_GPL, I18N_NOOP( "(c) 2004 KWin and KControl Authors" )); about->addAuthor("Lubos Lunak",0,"l.lunak@kde.org"); setAboutData(about); } diff --git a/twin/kcmtwin/twinrules/kcm.h b/twin/kcmtwin/twinrules/kcm.h index 9fb307458..d02bfc112 100644 --- a/twin/kcmtwin/twinrules/kcm.h +++ b/twin/kcmtwin/twinrules/kcm.h @@ -24,7 +24,7 @@ #include <kconfig.h> class KConfig; -class KAboutData; +class TDEAboutData; namespace KWinInternal { |