From 369bc3df47111df298764b69146ae1de7e616ce0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 20:56:08 -0600 Subject: [PATCH] Rename kiobuffer and KHTML --- acinclude.m4 | 4 ++-- cmake | 2 +- src/kile.kdevprj | 2 +- src/kile/Makefile.am | 2 +- src/kile/docpart.cpp | 12 ++++++------ src/kile/docpart.h | 2 +- src/kile/kilelauncher.cpp | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 8429f63..0190605 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2095,7 +2095,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") @@ -2116,7 +2116,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 index 9a21790..274366f 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 9a217903f9fa35ca12213a6e9ee3d2cb87d1131d +Subproject commit 274366fb8b90704586d7beef216b765cc0688b08 diff --git a/src/kile.kdevprj b/src/kile.kdevprj index 60ef08e..afdc5f0 100644 --- a/src/kile.kdevprj +++ b/src/kile.kdevprj @@ -22,7 +22,7 @@ bin_program=kile cflags=-pg -a cppflags= cxxflags=\s-O0 -g3 -Wall -ldadd=-ltdeprint $(LIB_KSPELL) $(LIB_KPARTS) $(LIB_KFILE) $(LIB_KHTML) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) +ldadd=-ltdeprint $(LIB_KSPELL) $(LIB_KPARTS) $(LIB_KFILE) $(LIB_TDEHTML) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) ldflags=\s \s [General] diff --git a/src/kile/Makefile.am b/src/kile/Makefile.am index 5257fff..1c6ae7b 100644 --- a/src/kile/Makefile.am +++ b/src/kile/Makefile.am @@ -29,7 +29,7 @@ kile_SOURCES = latexcmd.cpp latexcmddialog.cpp texdocdialog.cpp userhelp.cpp \ kileversion.cpp graphicsconfigwidget.ui kilemultitabbar.cpp newdocumentwidget.ui\ symbolviewconfig.ui -kile_LDADD = -lkjs -ltdeprint -ltdetexteditor -lkatepartinterfaces $(LIB_KSPELL) $(LIB_KHTML) +kile_LDADD = -lkjs -ltdeprint -ltdetexteditor -lkatepartinterfaces $(LIB_KSPELL) $(LIB_TDEHTML) SUBDIRS = icons pics symbols templates syntax complete help encodings test diff --git a/src/kile/docpart.cpp b/src/kile/docpart.cpp index 0bf5d68..359737b 100644 --- a/src/kile/docpart.cpp +++ b/src/kile/docpart.cpp @@ -27,13 +27,13 @@ #include #include -DocumentationViewer::DocumentationViewer(TQWidget *parent, const char *name ) : KHTMLPart(parent,name, 0, 0, BrowserViewGUI) +DocumentationViewer::DocumentationViewer(TQWidget *parent, const char *name ) : TDEHTMLPart(parent,name, 0, 0, BrowserViewGUI) { m_hpos = 0; TDEConfig konqConfig("konquerorrc"); konqConfig.setGroup("HTML Settings"); - //const KHTMLSettings * set = settings(); - //( const_cast(set) )->init( &konqConfig, false ); + //const TDEHTMLSettings * set = settings(); + //( const_cast(set) )->init( &konqConfig, false ); TQString rc = TDEGlobal::dirs()->findResource("appdata", "docpartui.rc"); setXMLFile(rc); (void) KStdAction::back(this, TQT_SLOT(back()), actionCollection(),"Back" ); @@ -48,15 +48,15 @@ void DocumentationViewer::urlSelected(const TQString &url, int button, int state KURL cURL = completeURL(url); TQString mime = KMimeType::findByURL(cURL).data()->name(); - //load this URL in the embedded viewer if KHTML can handle it, or when mimetype detection failed + //load this URL in the embedded viewer if TDEHTML can handle it, or when mimetype detection failed KService::Ptr service = KService::serviceByDesktopName("tdehtml"); if ( ( mime == KMimeType::defaultMimeType() ) || (service && service->hasServiceType(mime)) ) { - KHTMLPart::urlSelected(url, button, state, target, args); + TDEHTMLPart::urlSelected(url, button, state, target, args); openURL(cURL) ; addToHistory(cURL.url()); } - //KHTML can't handle it, look for an appropriate application + //TDEHTML can't handle it, look for an appropriate application else { KTrader::OfferList offers = KTrader::self()->query(mime, "Type == 'Application'"); diff --git a/src/kile/docpart.h b/src/kile/docpart.h index ad0a190..f380320 100644 --- a/src/kile/docpart.h +++ b/src/kile/docpart.h @@ -19,7 +19,7 @@ #include #include -class DocumentationViewer : public KHTMLPart +class DocumentationViewer : public TDEHTMLPart { Q_OBJECT diff --git a/src/kile/kilelauncher.cpp b/src/kile/kilelauncher.cpp index eb437cd..8147ad7 100644 --- a/src/kile/kilelauncher.cpp +++ b/src/kile/kilelauncher.cpp @@ -337,8 +337,8 @@ TQString name="%dir_target/%target"; tool()->translate(name); - TQString out = "*****\n***** " + tool()->name() + i18n(" output: \n") + "***** KHTML " + name + "\n*****\n"; - TQString msg = shrt+ " (KHTML)"; + TQString out = "*****\n***** " + tool()->name() + i18n(" output: \n") + "***** TDEHTML " + name + "\n*****\n"; + TQString msg = shrt+ " (TDEHTML)"; emit(message(Info, msg)); emit(output(out));