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

---
 kweather/CMakeLists.txt | 6 +++---
 kweather/Makefile.am    | 2 +-
 kweather/reportview.cpp | 4 ++--
 kweather/weatherbar.h   | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'kweather')

diff --git a/kweather/CMakeLists.txt b/kweather/CMakeLists.txt
index a63f788..4c93de2 100644
--- a/kweather/CMakeLists.txt
+++ b/kweather/CMakeLists.txt
@@ -29,7 +29,7 @@ link_directories(
 tde_add_tdeinit_executable( kweatherreport AUTOMOC
   SOURCES reportmain.cpp weatherservice.stub
     reportview.cpp
-  LINK tdeui-shared khtml-shared
+  LINK tdeui-shared tdehtml-shared
 )
 
 
@@ -84,7 +84,7 @@ tde_add_kpart( weather_panelapplet AUTOMOC
   SOURCES reportview.cpp kweather.cpp
     dockwidget.cpp weatherIface.skel
     weatherservice.stub weatherbutton.cpp
-  LINK khtml-shared
+  LINK tdehtml-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
@@ -105,7 +105,7 @@ tde_add_kpart( kcm_weatherservice AUTOMOC
   SOURCES kcmweatherservice.cpp
     serviceconfigwidget.cpp serviceconfigdata.ui
     weatherservice.stub
-  LINK tdeui-shared khtml-shared
+  LINK tdeui-shared tdehtml-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
diff --git a/kweather/Makefile.am b/kweather/Makefile.am
index 6925b27..7feacb8 100644
--- a/kweather/Makefile.am
+++ b/kweather/Makefile.am
@@ -56,7 +56,7 @@ kcm_weatherservice_la_LIBADD = $(LIB_TDEUI)
 #globaladddir   = $(kde_datadir)/konqsidebartng/add
 #globaladd_DATA = weatherbar_add.desktop
 
-kweatherservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kweatherservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kweatherservice_LDADD = $(LIB_KIO)
 kweatherservice_SOURCES = main.cpp metar_parser.cpp weatherlib.cpp \
                           weatherservice.cpp weatherservice.skel \
diff --git a/kweather/reportview.cpp b/kweather/reportview.cpp
index afe59b4..4825489 100644
--- a/kweather/reportview.cpp
+++ b/kweather/reportview.cpp
@@ -19,8 +19,8 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <khtml_part.h>
-#include <khtmlview.h>
+#include <tdehtml_part.h>
+#include <tdehtmlview.h>
 #include <kglobalsettings.h>
 
 #include <tqvbox.h>
diff --git a/kweather/weatherbar.h b/kweather/weatherbar.h
index a3c86f8..6938e69 100644
--- a/kweather/weatherbar.h
+++ b/kweather/weatherbar.h
@@ -23,9 +23,9 @@
 #define __KONTQSIDEBARWEATHER_H__
 
 #include <konqsidebarplugin.h>
-#include <kparts/part.h>
-#include <kparts/factory.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/part.h>
+#include <tdeparts/factory.h>
+#include <tdeparts/browserextension.h>
 #include <tqdict.h>
 #include <dcopobject.h>
 #include <tqlayout.h>
-- 
cgit v1.2.3