From eadb90501307a49e582b0d4e31983787c3447816 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 21:04:40 -0600 Subject: Rename kiobuffer and KHTML --- cmake | 2 +- kweather/Makefile.am | 4 ++-- kweather/reportview.cpp | 4 ++-- kweather/reportview.h | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmake b/cmake index 9a21790..274366f 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 9a217903f9fa35ca12213a6e9ee3d2cb87d1131d +Subproject commit 274366fb8b90704586d7beef216b765cc0688b08 diff --git a/kweather/Makefile.am b/kweather/Makefile.am index 7feacb8..f49d2d5 100644 --- a/kweather/Makefile.am +++ b/kweather/Makefile.am @@ -26,7 +26,7 @@ weather_panelapplet_la_SOURCES = reportview.cpp kweather.cpp dockwidget.cpp \ weatherIface.skel weatherservice.stub \ weatherbutton.cpp weather_panelapplet_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries) -weather_panelapplet_la_LIBADD = $(LIB_KHTML) $(LIB_QT) -lDCOP +weather_panelapplet_la_LIBADD = $(LIB_TDEHTML) $(LIB_QT) -lDCOP appletdir = $(kde_datadir)/kicker/applets @@ -68,7 +68,7 @@ servicedir = $(kde_servicesdir) kde_services_DATA = kcmweather.desktop kcmweatherservice.desktop kweatherreport_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -kweatherreport_la_LIBADD = $(LIB_KHTML) reportview.lo $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -lDCOP +kweatherreport_la_LIBADD = $(LIB_TDEHTML) reportview.lo $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -lDCOP kweatherreport_la_SOURCES = reportmain.cpp weatherservice.stub KDE_ICON = kweather diff --git a/kweather/reportview.cpp b/kweather/reportview.cpp index 29a3d5b..7434823 100644 --- a/kweather/reportview.cpp +++ b/kweather/reportview.cpp @@ -35,7 +35,7 @@ reportView::reportView(const TQString &reportLocation) m_locationCode(reportLocation) { TQVBox *vbox = makeVBoxMainWidget(); - m_reportView = new KHTMLPart(vbox, "m_reportView"); + m_reportView = new TDEHTMLPart(vbox, "m_reportView"); TDEConfig config( "weather_panelappletrc" ); config.setGroup( "General Options" ); @@ -55,7 +55,7 @@ reportView::reportView(const TQString &reportLocation) reportView::~reportView(){ delete m_weatherService; // we do not have to delete m_reportView because this class is - // the parent of the TQVBox, and that is the parent of the KHTMLPart. + // the parent of the TQVBox, and that is the parent of the TDEHTMLPart. TDEConfig config( "weather_panelappletrc" ); config.setGroup( "General Options" ); diff --git a/kweather/reportview.h b/kweather/reportview.h index 86ee370..a89d96b 100644 --- a/kweather/reportview.h +++ b/kweather/reportview.h @@ -22,7 +22,7 @@ #include -class KHTMLPart; +class TDEHTMLPart; class WeatherService_stub; /**This is the main report generated for the user. @@ -41,7 +41,7 @@ public: private: WeatherService_stub *m_weatherService; - KHTMLPart *m_reportView; + TDEHTMLPart *m_reportView; TQString m_locationCode; }; -- cgit v1.2.3