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

---
 libkcddb/kcmcddb/Makefile.am          | 2 +-
 libkcddb/kcmcddb/cddbconfigwidget.cpp | 2 +-
 libkcddb/kcmcddb/kcmcddb.cpp          | 4 ++--
 libkcddb/kcmcddb/libkcddb.desktop     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'libkcddb/kcmcddb')

diff --git a/libkcddb/kcmcddb/Makefile.am b/libkcddb/kcmcddb/Makefile.am
index 8233116d..3a93445f 100644
--- a/libkcddb/kcmcddb/Makefile.am
+++ b/libkcddb/kcmcddb/Makefile.am
@@ -19,5 +19,5 @@ xdg_apps_DATA = libkcddb.desktop
 messages: rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/kcmcddb.pot
 
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 update_DATA = kcmcddb-emailsettings.upd
diff --git a/libkcddb/kcmcddb/cddbconfigwidget.cpp b/libkcddb/kcmcddb/cddbconfigwidget.cpp
index 442efd12..a693d22f 100644
--- a/libkcddb/kcmcddb/cddbconfigwidget.cpp
+++ b/libkcddb/kcmcddb/cddbconfigwidget.cpp
@@ -27,7 +27,7 @@
 #include <tqcombobox.h>
 #include <tqspinbox.h>
 #include <tqlineedit.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <kinputdialog.h>
diff --git a/libkcddb/kcmcddb/kcmcddb.cpp b/libkcddb/kcmcddb/kcmcddb.cpp
index 75dd8501..8ce6a6dd 100644
--- a/libkcddb/kcmcddb/kcmcddb.cpp
+++ b/libkcddb/kcmcddb/kcmcddb.cpp
@@ -28,12 +28,12 @@
 #include <tqlabel.h>
 #include <tqbuttongroup.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kgenericfactory.h>
 #include <kmessagebox.h>
-#include <kconfigdialogmanager.h>
+#include <tdeconfigdialogmanager.h>
 
 #include "cddbconfigwidget.h"
 
diff --git a/libkcddb/kcmcddb/libkcddb.desktop b/libkcddb/kcmcddb/libkcddb.desktop
index a2c2a5da..fb0163ad 100644
--- a/libkcddb/kcmcddb/libkcddb.desktop
+++ b/libkcddb/kcmcddb/libkcddb.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell libkcddb
+Exec=tdecmshell libkcddb
 Icon=cdaudio_unmount
 Type=Application
 X-TDE-ModuleType=Library
-- 
cgit v1.2.1