Rename kiobuffer and KHTML

pull/1/head
Timothy Pearson 11 years ago
parent a7a7d24b6c
commit 369bc3df47

@ -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")

@ -1 +1 @@
Subproject commit 9a217903f9fa35ca12213a6e9ee3d2cb87d1131d
Subproject commit 274366fb8b90704586d7beef216b765cc0688b08

@ -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]

@ -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

@ -27,13 +27,13 @@
#include <tdehtml_part.h>
#include <tdehtml_settings.h>
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<KHTMLSettings *>(set) )->init( &konqConfig, false );
//const TDEHTMLSettings * set = settings();
//( const_cast<TDEHTMLSettings *>(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'");

@ -19,7 +19,7 @@
#include <tdehtml_part.h>
#include <tqstringlist.h>
class DocumentationViewer : public KHTMLPart
class DocumentationViewer : public TDEHTMLPart
{
Q_OBJECT

@ -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));

Loading…
Cancel
Save