From 28879aa783655c1bb2b65e7761f8fe2a7cf8f7b2 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 22 Jan 2013 19:56:54 -0600
Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4

---
 conduits/null/null-factory.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'conduits/null')

diff --git a/conduits/null/null-factory.cc b/conduits/null/null-factory.cc
index c2d381d..aeed7c9 100644
--- a/conduits/null/null-factory.cc
+++ b/conduits/null/null-factory.cc
@@ -52,7 +52,7 @@ public:
 	virtual void load();
 protected:
 	NullWidget *fConfigWidget;
-	KAboutData *fAbout;
+	TDEAboutData *fAbout;
 } ;
 
 NullConduitConfig::NullConduitConfig(TQWidget *p, const char *n) :
@@ -61,11 +61,11 @@ NullConduitConfig::NullConduitConfig(TQWidget *p, const char *n) :
 {
 	FUNCTIONSETUP;
 	fConduitName = i18n("Null");
-	fAbout = new KAboutData("nullConduit",
+	fAbout = new TDEAboutData("nullConduit",
 		I18N_NOOP("Null Conduit for KPilot"),
 		KPILOT_VERSION,
 		I18N_NOOP("Configures the Null Conduit for KPilot"),
-		KAboutData::License_GPL,
+		TDEAboutData::License_GPL,
 		"(C) 2001, Adriaan de Groot");
 	fAbout->addAuthor("Adriaan de Groot",
 		I18N_NOOP("Primary Author"),
-- 
cgit v1.2.3