Rename KInstance and KAboutData to avoid conflicts with KDE4

2 files changed, 6 insertions, 6 deletions

diff --git a/kcert/kcertpart.cc b/kcert/kcertpart.cc
index 5986bcba0..7ae79d874 100644
--- a/kcert/kcertpart.cc
+++ b/kcert/kcertpart.cc
@@ -131,7 +131,7 @@ KCertPart::KCertPart(TQWidget *parentWidget, const char *widgetName,
                      TQObject *parent, const char *name,
 		     const TQStringList & /*args*/ ) 
           : KParts::ReadWritePart(parent, name) {
-KInstance *instance = new KInstance("KCertPart");
+TDEInstance *instance = new TDEInstance("KCertPart");
 TQGridLayout *grid;
 setInstance(instance);
 
@@ -874,9 +874,9 @@ KMessageBox::information(_frame, i18n("Certificates have been successfully impor
 }
 
 
-KAboutData *KCertPart::createAboutData()
+TDEAboutData *KCertPart::createAboutData()
 {
-    return new KAboutData("KCertPart", I18N_NOOP("TDE Certificate Part"), "1.0");
+    return new TDEAboutData("KCertPart", I18N_NOOP("TDE Certificate Part"), "1.0");
 }
 
 #include "kcertpart.moc"
diff --git a/kcert/kcertpart.h b/kcert/kcertpart.h
index ec011c08d..a5274a926 100644
--- a/kcert/kcertpart.h
+++ b/kcert/kcertpart.h
@@ -40,7 +40,7 @@ class KSSLPKCS12;
 class KSSLCertificate;
 class TQTabWidget;
 class TQMultiLineEdit;
-class KAboutData;
+class TDEAboutData;
 class TQGridLayout;
 
 
@@ -75,7 +75,7 @@ public:
 
   virtual void setReadWrite(bool readwrite);
 
-  static KAboutData *createAboutData();
+  static TDEAboutData *createAboutData();
 
 protected slots:
   void slotChain(int c);
@@ -115,7 +115,7 @@ protected:
 
 
   // The rest
-  KInstance *_instance;
+  TDEInstance *_instance;
   TQButton *_import, *_save, *_done, *_launch, *_importAll;
   // Store the pointer to the current item
   KSSLPKCS12 *_p12;