From 64df902cf71a8ee258fb85f6be26248f399aa01f Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 01:05:15 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 libkpgp/Makefile.am | 2 +-
 libkpgp/kpgp.cpp    | 4 ++--
 libkpgp/kpgpui.cpp  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'libkpgp')

diff --git a/libkpgp/Makefile.am b/libkpgp/Makefile.am
index e8b89f72..d17105bb 100644
--- a/libkpgp/Makefile.am
+++ b/libkpgp/Makefile.am
@@ -20,7 +20,7 @@ libkpgp_la_LIBADD = $(LIB_TDEUI) $(LIB_POLL)
 
 METASOURCES = AUTO
 
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 update_DATA = kpgp.upd
 update_SCRIPTS = kpgp-3.1-upgrade-address-data.pl
 
diff --git a/libkpgp/kpgp.cpp b/libkpgp/kpgp.cpp
index 18060ec6..33aa8995 100644
--- a/libkpgp/kpgp.cpp
+++ b/libkpgp/kpgp.cpp
@@ -37,8 +37,8 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kconfigbase.h>
-#include <kconfig.h>
+#include <tdeconfigbase.h>
+#include <tdeconfig.h>
 #include <kstaticdeleter.h>
 
 #include "kpgpbase.h"
diff --git a/libkpgp/kpgpui.cpp b/libkpgp/kpgpui.cpp
index 164225d1..f468cb92 100644
--- a/libkpgp/kpgpui.cpp
+++ b/libkpgp/kpgpui.cpp
@@ -38,8 +38,8 @@
 #include <kseparator.h>
 #include <kiconloader.h>
 #include <klistview.h>
-#include <kconfigbase.h>
-#include <kconfig.h>
+#include <tdeconfigbase.h>
+#include <tdeconfig.h>
 #include <kprogress.h>
 #include <kapplication.h>
 #include <twin.h>
-- 
cgit v1.2.3