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

---
 knewsticker/CMakeLists.txt                 | 2 +-
 knewsticker/Makefile.am                    | 2 +-
 knewsticker/common/configaccess.h          | 4 ++--
 knewsticker/common/newsengine.h            | 2 +-
 knewsticker/common/newsiconmgr.h           | 2 +-
 knewsticker/common/xmlnewsaccess.h         | 2 +-
 knewsticker/knewstickerstub/CMakeLists.txt | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'knewsticker')

diff --git a/knewsticker/CMakeLists.txt b/knewsticker/CMakeLists.txt
index 116a1dad..912d0a36 100644
--- a/knewsticker/CMakeLists.txt
+++ b/knewsticker/CMakeLists.txt
@@ -43,6 +43,6 @@ tde_add_kpart( knewsticker_panelapplet AUTOMOC
     newsscroller.cpp knewsticker.cpp knewsticker.skel
     knewstickerconfig.cpp knewstickerconfigwidget.ui
     newssourcedlgimpl.cpp newssourcedlg.ui
-  LINK knewstickercommon-static kio-shared
+  LINK knewstickercommon-static tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/knewsticker/Makefile.am b/knewsticker/Makefile.am
index ffc15272..28be1fd8 100644
--- a/knewsticker/Makefile.am
+++ b/knewsticker/Makefile.am
@@ -18,7 +18,7 @@ knewsticker_panelapplet_la_LIBADD = common/libknewstickercommon.la \
 appdatadir = $(kde_datadir)/knewsticker
 appdata_DATA = eventsrc
 
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 update_DATA = knewsticker.upd
 update_SCRIPTS = knt-0.1-0.2.pl
 
diff --git a/knewsticker/common/configaccess.h b/knewsticker/common/configaccess.h
index cebce895..b9be6d49 100644
--- a/knewsticker/common/configaccess.h
+++ b/knewsticker/common/configaccess.h
@@ -14,8 +14,8 @@
 #include "configiface.h"
 #include "newsengine.h"
 
-#include <kconfig.h>
-#include <kio/job.h>
+#include <tdeconfig.h>
+#include <tdeio/job.h>
 #include <klocale.h>
 
 #include <tqpixmap.h>
diff --git a/knewsticker/common/newsengine.h b/knewsticker/common/newsengine.h
index e9175317..6cb3f3af 100644
--- a/knewsticker/common/newsengine.h
+++ b/knewsticker/common/newsengine.h
@@ -22,7 +22,7 @@
 #include <tqmap.h>
 #include <tqpixmap.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klocale.h>
 #include <ksharedptr.h>
 
diff --git a/knewsticker/common/newsiconmgr.h b/knewsticker/common/newsiconmgr.h
index f2997479..2cc90cf2 100644
--- a/knewsticker/common/newsiconmgr.h
+++ b/knewsticker/common/newsiconmgr.h
@@ -15,7 +15,7 @@
 #include <tqpixmap.h>
 
 #include <dcopobject.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kurl.h>
 
 class DCOPClient;
diff --git a/knewsticker/common/xmlnewsaccess.h b/knewsticker/common/xmlnewsaccess.h
index 4af60fcf..954727c3 100644
--- a/knewsticker/common/xmlnewsaccess.h
+++ b/knewsticker/common/xmlnewsaccess.h
@@ -18,7 +18,7 @@
 #include <tqvaluelist.h>
 #include <tqobject.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kurl.h>
 
 class TQBuffer;
diff --git a/knewsticker/knewstickerstub/CMakeLists.txt b/knewsticker/knewstickerstub/CMakeLists.txt
index 970db280..d25f25a6 100644
--- a/knewsticker/knewstickerstub/CMakeLists.txt
+++ b/knewsticker/knewstickerstub/CMakeLists.txt
@@ -33,6 +33,6 @@ install( FILES
 
 tde_add_executable( knewstickerstub AUTOMOC
   SOURCES knewstickerstub.cpp
-  LINK knewstickercommon-static kio-shared
+  LINK knewstickercommon-static tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
-- 
cgit v1.2.1