Rename KInstance and KAboutData to avoid conflicts with KDE4

3 files changed, 13 insertions, 13 deletions

diff --git a/lib/plugin.cc b/lib/plugin.cc
index afa0fd5..0e61b32 100644
--- a/lib/plugin.cc
+++ b/lib/plugin.cc
@@ -108,7 +108,7 @@ ConduitConfigBase::~ConduitConfigBase()
 	return true;
 }
 
-TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, KAboutData *ad)
+TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, TDEAboutData *ad)
 {
 	FUNCTIONSETUP;
 
@@ -117,7 +117,7 @@ TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, KAboutData *ad)
 	TQString s;
 	TQLabel *text;
 	KIconLoader *l = KGlobal::iconLoader();
-	const KAboutData *p = ad ? ad : KGlobal::instance()->aboutData();
+	const TDEAboutData *p = ad ? ad : KGlobal::instance()->aboutData();
 
 	TQGridLayout *grid = new TQGridLayout(w, 5, 4, SPACING);
 
@@ -251,7 +251,7 @@ TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, KAboutData *ad)
 }
 
 /* static */ void ConduitConfigBase::addAboutPage(TQTabWidget *tw,
-	KAboutData *ad)
+	TDEAboutData *ad)
 {
 	FUNCTIONSETUP;
 
diff --git a/lib/plugin.h b/lib/plugin.h
index 33cdee4..57761b2 100644
--- a/lib/plugin.h
+++ b/lib/plugin.h
@@ -43,7 +43,7 @@
 
 
 class TQTabWidget;
-class KAboutData;
+class TDEAboutData;
 class KLibrary;
 
 class PilotDatabase;
@@ -137,11 +137,11 @@ public:
 	* "About".
 	*
 	* @param w The tab widget to which the about page is added.
-	* @param data The KAboutData that is used.
+	* @param data The TDEAboutData that is used.
 	*
 	*/
 	static  void addAboutPage(TQTabWidget *w,
-		KAboutData *data=0L);
+		TDEAboutData *data=0L);
 
 	/**
 	* This creates the actual about widget. Again, public & static so
@@ -153,9 +153,9 @@ public:
 	* anywhere. Copied from KAboutDialog, mostly.
 	*
 	* @param parent The widget that holds the about widget.
-	* @param data The KAboutData that is used to populate the widget.
+	* @param data The TDEAboutData that is used to populate the widget.
 	*/
-	static TQWidget *aboutPage(TQWidget *parent, KAboutData *data=0L);
+	static TQWidget *aboutPage(TQWidget *parent, TDEAboutData *data=0L);
 
 protected:
 	/**
@@ -433,7 +433,7 @@ namespace PluginUtility
 *
 *
 * <pre>
-* 	static KAboutData *about() { return fAbout; } ;
+* 	static TDEAboutData *about() { return fAbout; } ;
 * </pre>
 *
 *
@@ -454,8 +454,8 @@ namespace PluginUtility
 * by about() above.
 *
 * <pre>
-* 	KInstance *fInstance;
-* 	static KAboutData *fAbout;
+* 	TDEInstance *fInstance;
+* 	static TDEAboutData *fAbout;
 * } ;
 * </pre>
 *
diff --git a/lib/pluginfactory.h b/lib/pluginfactory.h
index dbbe2ec..1afdf8c 100644
--- a/lib/pluginfactory.h
+++ b/lib/pluginfactory.h
@@ -47,7 +47,7 @@ template <class Widget, class Action> class ConduitFactory : public KLibFactory
 public:
 	ConduitFactory(TQObject *parent = 0, const char *name = 0) :
 		KLibFactory(parent,name)
-		{ fInstance = new KInstance(name); } ;
+		{ fInstance = new TDEInstance(name); } ;
 	virtual ~ConduitFactory()
 		{ delete fInstance; } ;
 
@@ -91,7 +91,7 @@ protected:
 		return 0L;
 	}
 
-	KInstance *fInstance;
+	TDEInstance *fInstance;
 } ;
 
 #endif