diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:18:35 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:18:35 -0600 |
| commit | f71394031a5e1c3b315081a98000f242b461ca8c (patch) | |
| tree | 54081035a0fdae2cadbf9d7df74a9a4e4cd46925 /kmrml/kmrml/kcontrol | |
| parent | e5ce3b4175f2e72788b49b9ed46c722784218dad (diff) | |
| download | tdegraphics-f71394031a5e1c3b315081a98000f242b461ca8c.tar.gz tdegraphics-f71394031a5e1c3b315081a98000f242b461ca8c.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kmrml/kmrml/kcontrol')
| -rw-r--r-- | kmrml/kmrml/kcontrol/kcmkmrml.cpp | 4 | ||||
| -rw-r--r-- | kmrml/kmrml/kcontrol/kcmkmrml.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kmrml/kmrml/kcontrol/kcmkmrml.cpp b/kmrml/kmrml/kcontrol/kcmkmrml.cpp index a07018c4..294d7581 100644 --- a/kmrml/kmrml/kcontrol/kcmkmrml.cpp +++ b/kmrml/kmrml/kcontrol/kcmkmrml.cpp @@ -46,12 +46,12 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kmrml, MrmlFactory("kmrml") ) KCMKMrml::KCMKMrml(TQWidget *parent, const char *name, const TQStringList & ): KCModule(MrmlFactory::instance(), parent, name) { - KAboutData* ab = new KAboutData( + TDEAboutData* ab = new TDEAboutData( "kcmkmrml", I18N_NOOP("KCMKMrml"), KMRML_VERSION, I18N_NOOP("Advanced Search Control Module"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, I18N_NOOP( "Copyright 2002, Carsten Pfeiffer" ), 0, "http://devel-home.kde.org/~pfeiffer/kmrml/" ); diff --git a/kmrml/kmrml/kcontrol/kcmkmrml.h b/kmrml/kmrml/kcontrol/kcmkmrml.h index 9be6db8a..8ff7d971 100644 --- a/kmrml/kmrml/kcontrol/kcmkmrml.h +++ b/kmrml/kmrml/kcontrol/kcmkmrml.h @@ -21,7 +21,7 @@ #include <kcmodule.h> -class KAboutData; +class TDEAboutData; class KURLRequester; namespace KMrmlConfig |