diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:03:05 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:03:05 -0600 |
| commit | 1e229505aba4dcd319b4e3d26cfd9ac0604d1ae5 (patch) | |
| tree | 317a86d8568b87e1ecb89703c0d90992c27e7421 /kipi-plugins/common | |
| parent | 08276021dd3df53e11e4781b478e14f0b0bb3b70 (diff) | |
| download | kipi-plugins-1e229505aba4dcd319b4e3d26cfd9ac0604d1ae5.tar.gz kipi-plugins-1e229505aba4dcd319b4e3d26cfd9ac0604d1ae5.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kipi-plugins/common')
| -rw-r--r-- | kipi-plugins/common/include/kpaboutdata.h | 2 | ||||
| -rw-r--r-- | kipi-plugins/common/libkipiplugins/kpaboutdata.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kipi-plugins/common/include/kpaboutdata.h b/kipi-plugins/common/include/kpaboutdata.h index 1add86b..a390115 100644 --- a/kipi-plugins/common/include/kpaboutdata.h +++ b/kipi-plugins/common/include/kpaboutdata.h @@ -30,7 +30,7 @@ namespace KIPIPlugins { - class LIBKIPI_EXPORT KPAboutData : public KAboutData + class LIBKIPI_EXPORT KPAboutData : public TDEAboutData { private: TQString KipiPluginsVersionString; diff --git a/kipi-plugins/common/libkipiplugins/kpaboutdata.cpp b/kipi-plugins/common/libkipiplugins/kpaboutdata.cpp index dff78a6..f8bccf9 100644 --- a/kipi-plugins/common/libkipiplugins/kpaboutdata.cpp +++ b/kipi-plugins/common/libkipiplugins/kpaboutdata.cpp @@ -37,7 +37,7 @@ namespace KIPIPlugins const char *pluginVersion, int licenseType, const char *pluginDescription, - const char *copyrightStatement) : KAboutData ("kipi-plugins", pluginName, + const char *copyrightStatement) : TDEAboutData ("kipi-plugins", pluginName, pluginVersion, 0, licenseType, copyrightStatement, |