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/popmail/setupDialog.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'conduits/popmail/setupDialog.cc')

diff --git a/conduits/popmail/setupDialog.cc b/conduits/popmail/setupDialog.cc
index b8d3db7..ea8b113 100644
--- a/conduits/popmail/setupDialog.cc
+++ b/conduits/popmail/setupDialog.cc
@@ -64,11 +64,11 @@ PopMailWidgetConfig::PopMailWidgetConfig(TQWidget *p,const char *n) :
 {
 	FUNCTIONSETUP;
 	fConduitName = i18n("KMail");
-	KAboutData *fAbout = new KAboutData("popmailConduit",
+	TDEAboutData *fAbout = new TDEAboutData("popmailConduit",
 		I18N_NOOP("Mail Conduit for KPilot"),
 		KPILOT_VERSION,
 		I18N_NOOP("Configures the Mail Conduit for KPilot"),
-		KAboutData::License_GPL,
+		TDEAboutData::License_GPL,
 		"(C) 2001, Dan Pilone, Michael Kropfberger, Adriaan de Groot");
 	fAbout->addAuthor("Adriaan de Groot",
 		I18N_NOOP("Maintainer"),
-- 
cgit v1.2.3