summaryrefslogtreecommitdiffstats
path: root/certmanager/kwatchgnupg
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-22 20:22:15 -0600
committerTimothy Pearson <[email protected]>2013-01-22 20:22:15 -0600
commit5fc6f26e12b596addd235f87320c31761bd5a84d (patch)
tree0a1ff964c23fce07fc088017df4ad537d57e62e5 /certmanager/kwatchgnupg
parent12c8a23fe75817cb4bfcd604c1863266dd75e840 (diff)
downloadtdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.tar.gz
tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'certmanager/kwatchgnupg')
-rw-r--r--certmanager/kwatchgnupg/aboutdata.cpp2
-rw-r--r--certmanager/kwatchgnupg/aboutdata.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/certmanager/kwatchgnupg/aboutdata.cpp b/certmanager/kwatchgnupg/aboutdata.cpp
index 2759ee31f..5727003f0 100644
--- a/certmanager/kwatchgnupg/aboutdata.cpp
+++ b/certmanager/kwatchgnupg/aboutdata.cpp
@@ -56,7 +56,7 @@ static const about_data credits[] = {
#endif
AboutData::AboutData()
- : KAboutData( "kwatchgnupg", I18N_NOOP("KWatchGnuPG"),
+ : TDEAboutData( "kwatchgnupg", I18N_NOOP("KWatchGnuPG"),
kwatchgnupg_version, description, License_GPL,
"(c) 2004 Klar\xC3\xA4lvdalens Datakonsult AB\n" )
{
diff --git a/certmanager/kwatchgnupg/aboutdata.h b/certmanager/kwatchgnupg/aboutdata.h
index 2a3324107..de8d2be2f 100644
--- a/certmanager/kwatchgnupg/aboutdata.h
+++ b/certmanager/kwatchgnupg/aboutdata.h
@@ -35,7 +35,7 @@
#include <kaboutdata.h>
-class AboutData : public KAboutData {
+class AboutData : public TDEAboutData {
public:
AboutData();
};