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

---
 klipper/CMakeLists.txt | 2 +-
 klipper/Makefile.am    | 2 +-
 klipper/applet.cpp     | 4 ++--
 klipper/toplevel.cpp   | 2 +-
 klipper/urlgrabber.cpp | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'klipper')

diff --git a/klipper/CMakeLists.txt b/klipper/CMakeLists.txt
index c3886a3c8..0ff5eb436 100644
--- a/klipper/CMakeLists.txt
+++ b/klipper/CMakeLists.txt
@@ -60,5 +60,5 @@ tde_add_library( klipper_common STATIC_PIC AUTOMOC
     toplevel.skel clipboardpoll.cpp history.cpp historyitem.cpp
     historystringitem.cpp klipperpopup.cpp popupproxy.cpp
     historyimageitem.cpp historyurlitem.cpp
-  LINK kio-shared ${XFIXES_LIBRARIES}
+  LINK tdeio-shared ${XFIXES_LIBRARIES}
 )
diff --git a/klipper/Makefile.am b/klipper/Makefile.am
index 45ef01f8a..83292c936 100644
--- a/klipper/Makefile.am
+++ b/klipper/Makefile.am
@@ -45,7 +45,7 @@ dummy.cpp:
 	echo > dummy.cpp
 
 # update script:
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 update_DATA = klipperrc.upd klippershortcuts.upd
 update_SCRIPTS = klipper-1-2.pl klipper-trinity1.sh
 
diff --git a/klipper/applet.cpp b/klipper/applet.cpp
index 2ec01c2a9..c6c1a0b7d 100644
--- a/klipper/applet.cpp
+++ b/klipper/applet.cpp
@@ -24,7 +24,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <dcopclient.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "toplevel.h"
 #include "history.h"
@@ -101,7 +101,7 @@ void KlipperApplet::about()
 }
 
 KlipperAppletWidget::KlipperAppletWidget( TQWidget* parent )
-// init() is called first, before KlipperWidget is called with ( parent, kconfig )
+// init() is called first, before KlipperWidget is called with ( parent, tdeconfig )
     : KlipperWidget( ( init(), parent ), new TDEConfig( "klipperrc" ))
 {
 }
diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp
index 163c8eb5f..b7832aae5 100644
--- a/klipper/toplevel.cpp
+++ b/klipper/toplevel.cpp
@@ -34,7 +34,7 @@
 #include <kaboutdata.h>
 #include <kaction.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kipc.h>
 #include <kkeydialog.h>
diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp
index cb891a33d..c2952a736 100644
--- a/klipper/urlgrabber.cpp
+++ b/klipper/urlgrabber.cpp
@@ -22,7 +22,7 @@
 #include <tqtimer.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <ktextedit.h>
 #include <klocale.h>
-- 
cgit v1.2.3