Rename kiobuffer and KHTML

8 files changed, 8 insertions, 8 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index 17ea4c0..637bbc9 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2075,7 +2075,7 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_TDEHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
    AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
@@ -2096,7 +2096,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_TDEHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
    AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
diff --git a/cmake b/cmake
-Subproject 9a217903f9fa35ca12213a6e9ee3d2cb87d1131
+Subproject 274366fb8b90704586d7beef216b765cc0688b0
diff --git a/kmymoney2/Makefile.am b/kmymoney2/Makefile.am
index aa853fe..ee9d0cb 100644
--- a/kmymoney2/Makefile.am
+++ b/kmymoney2/Makefile.am
@@ -4,7 +4,7 @@ bin_PROGRAMS = kmymoney2
 
 kmymoney2_SOURCES = kmymoneyutils.cpp kstartuplogo.cpp kmymoney2.cpp main.cpp kmymoney2.stub kmymoney2.skel kmymoneysettings.kcfgc kmymoneyglobalsettings.cpp
 
-kmymoney2_LDADD = $(top_builddir)/kmymoney2/views/libviews.a $(top_builddir)/kmymoney2/reports/libreports.a $(top_builddir)/kmymoney2/wizards/newuserwizard/libnewuserwizard.a $(top_builddir)/kmymoney2/wizards/newaccountwizard/libnewaccountwizard.a $(top_builddir)/kmymoney2/wizards/wizardpages/libwizardpages.a $(top_builddir)/kmymoney2/dialogs/libdialogs.a $(top_builddir)/kmymoney2/dialogs/settings/libsettings.a $(top_builddir)/kmymoney2/widgets/libwidgets.a $(top_builddir)/kmymoney2/converter/libconverter.a $(top_builddir)/kmymoney2/mymoney/storage/libstorage.a $(top_builddir)/kmymoney2/mymoney/libkmm_mymoney.la $(top_builddir)/libkgpgfile/libkgpgfile.la $(top_builddir)/kmymoney2/plugins/interfaces/libinterfaces.a $(top_builddir)/kmymoney2/plugins/libkmm_plugin.la $(top_builddir)/libkdchart/libkmm_kdchart.la dialogs/libdialogs.a $(LIB_KABC) $(LIB_KHTML) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIB_KUTILS)
+kmymoney2_LDADD = $(top_builddir)/kmymoney2/views/libviews.a $(top_builddir)/kmymoney2/reports/libreports.a $(top_builddir)/kmymoney2/wizards/newuserwizard/libnewuserwizard.a $(top_builddir)/kmymoney2/wizards/newaccountwizard/libnewaccountwizard.a $(top_builddir)/kmymoney2/wizards/wizardpages/libwizardpages.a $(top_builddir)/kmymoney2/dialogs/libdialogs.a $(top_builddir)/kmymoney2/dialogs/settings/libsettings.a $(top_builddir)/kmymoney2/widgets/libwidgets.a $(top_builddir)/kmymoney2/converter/libconverter.a $(top_builddir)/kmymoney2/mymoney/storage/libstorage.a $(top_builddir)/kmymoney2/mymoney/libkmm_mymoney.la $(top_builddir)/libkgpgfile/libkgpgfile.la $(top_builddir)/kmymoney2/plugins/interfaces/libinterfaces.a $(top_builddir)/kmymoney2/plugins/libkmm_plugin.la $(top_builddir)/libkdchart/libkmm_kdchart.la dialogs/libdialogs.a $(LIB_KABC) $(LIB_TDEHTML) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIB_KUTILS)
 
 SUBDIRS = mymoney widgets dialogs wizards views converter pics icons html templates plugins reports misc
 
diff --git a/kmymoney2/plugins/ofximport/Makefile.am b/kmymoney2/plugins/ofximport/Makefile.am
index 3fc8d66..66b7f6a 100644
--- a/kmymoney2/plugins/ofximport/Makefile.am
+++ b/kmymoney2/plugins/ofximport/Makefile.am
@@ -16,7 +16,7 @@ kmm_ofximport_la_LIBADD = @OFX_LIBS@ dialogs/libdialogs.la ../libkmm_plugin.la .
 # LD flags for the plugin
 # -module says: this is a module, i.e. something you're going to dlopen
 # so e.g. it has no version number like a normal shared lib would have.
-kmm_ofximport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_KHTML) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(LIB_QT) -L../.libs
+kmm_ofximport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TDEHTML) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(LIB_QT) -L../.libs
 
 # rc file containing the GUI for the plugin
 pluginsdir = $(kde_datadir)/kmm_ofximport
diff --git a/kmymoney2/views/khomeview.cpp b/kmymoney2/views/khomeview.cpp
index 1a78cac..316ca75 100644
--- a/kmymoney2/views/khomeview.cpp
+++ b/kmymoney2/views/khomeview.cpp
@@ -114,7 +114,7 @@ KHomeView::KHomeView(TQWidget *parent, const char *name ) :
   m_showAllSchedules(false),
   m_needReload(true)
 {
-  m_part = new KHTMLPart(this, "htmlpart_km2");
+  m_part = new TDEHTMLPart(this, "htmlpart_km2");
   addWidget(m_part->view());
 
   m_filename = KMyMoneyUtils::findResource("appdata", TQString("html/home%1.html"));
diff --git a/kmymoney2/views/khomeview.h b/kmymoney2/views/khomeview.h
index 0afa739..1f4c4ea 100644
--- a/kmymoney2/views/khomeview.h
+++ b/kmymoney2/views/khomeview.h
@@ -142,7 +142,7 @@ private:
    */
   MyMoneyMoney forecastPaymentBalance(const MyMoneyAccount& acc, const MyMoneyMoney& payment, TQDate& paymentDate);
 
-  KHTMLPart*      m_part;
+  TDEHTMLPart*      m_part;
   TQVBoxLayout*    m_qvboxlayoutPage;
   TQString         m_filename;
   bool            m_showAllSchedules;
diff --git a/kmymoney2/views/kreportsview.cpp b/kmymoney2/views/kreportsview.cpp
index daaf1c3..95eb991 100755
--- a/kmymoney2/views/kreportsview.cpp
+++ b/kmymoney2/views/kreportsview.cpp
@@ -88,7 +88,7 @@ using namespace reports;
 
 KReportsView::KReportTab::KReportTab(KTabWidget* parent, const MyMoneyReport& report ):
   TQWidget( parent, "reporttab" ),
-  m_part( new KHTMLPart( this, "reporttabpart" ) ),
+  m_part( new TDEHTMLPart( this, "reporttabpart" ) ),
   m_chartView( new KReportChartView( this, "reportchart" ) ),
   m_control( new kMyMoneyReportControlDecl( this, "reportcontrol" ) ),
   m_layout( new TQVBoxLayout( this, 11, 6, "reporttablayout" ) ),
diff --git a/kmymoney2/views/kreportsview.h b/kmymoney2/views/kreportsview.h
index 4b34a5d..7f199d1 100755
--- a/kmymoney2/views/kreportsview.h
+++ b/kmymoney2/views/kreportsview.h
@@ -91,7 +91,7 @@ public:
   class KReportTab: public TQWidget
   {
   private:
-    KHTMLPart* m_part;
+    TDEHTMLPart* m_part;
     reports::KReportChartView* m_chartView;
     kMyMoneyReportControlDecl* m_control;
     TQVBoxLayout* m_layout;