Rename kiobuffer and KHTML

feat/lzip-support
Timothy Pearson 12 years ago
parent 21530c065c
commit 8406945c90

@ -2075,7 +2075,7 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc") AC_SUBST(LIB_KABC, "-lkabc")
AC_SUBST(LIB_KHTML, "-ltdehtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
@ -2096,7 +2096,7 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-ltdefile") AC_SUBST(LIB_KFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-ltdehtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")

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

@ -22,7 +22,7 @@ bin_program=krusader
cflags=-DKDE_NO_COMPAT -D_LARGEFILE64_SOURCE cflags=-DKDE_NO_COMPAT -D_LARGEFILE64_SOURCE
cppflags=-DKDE_NO_COMPAT -D_LARGEFILE64_SOURCE cppflags=-DKDE_NO_COMPAT -D_LARGEFILE64_SOURCE
cxxflags=\s-O0 -Wall cxxflags=\s-O0 -Wall
ldadd=UserMenu/libUserMenu.a VFS/libVFS.a KViewer/libKViewer.a Dialogs/libDialogs.a BookMan/libBookMan.a GUI/libGUI.a $(LIB_KPARTS) $(LIB_KFILE) $(LIB_KHTML) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) ldadd=UserMenu/libUserMenu.a VFS/libVFS.a KViewer/libKViewer.a Dialogs/libDialogs.a BookMan/libBookMan.a GUI/libGUI.a $(LIB_KPARTS) $(LIB_KFILE) $(LIB_TDEHTML) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
ldflags=\s \s ldflags=\s \s
[General] [General]

@ -119,7 +119,7 @@ KrViewer::~KrViewer() {
} }
void KrViewer::createGUI( KParts::Part* part ) { void KrViewer::createGUI( KParts::Part* part ) {
if ( part == 0 ) /* KHTMLPart calls this function with 0 at destruction. */ if ( part == 0 ) /* TDEHTMLPart calls this function with 0 at destruction. */
return ; /* Can cause crash after JavaScript self.close() if removed */ return ; /* Can cause crash after JavaScript self.close() if removed */
@ -607,10 +607,10 @@ bool KrViewer::viewGeneric() {
if ( !generic_part ) { if ( !generic_part ) {
if ( mimetype.contains( "html" ) ) { if ( mimetype.contains( "html" ) ) {
KHTMLPart * p = new KHTMLPart( this, 0, 0, 0, KHTMLPart::BrowserViewGUI ); TDEHTMLPart * p = new TDEHTMLPart( this, 0, 0, 0, TDEHTMLPart::BrowserViewGUI );
connect( p->browserExtension(), TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ), connect( p->browserExtension(), TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ),
TQT_TQOBJECT(this), TQT_SLOT( handleOpenURLRequest( const KURL &, const KParts::URLArgs & ) ) ); TQT_TQOBJECT(this), TQT_SLOT( handleOpenURLRequest( const KURL &, const KParts::URLArgs & ) ) );
/* At JavaScript self.close() the KHTMLPart destroys itself. */ /* At JavaScript self.close() the TDEHTMLPart destroys itself. */
/* After destruction, just close the window */ /* After destruction, just close the window */
connect( p, TQT_SIGNAL( destroyed() ), TQT_TQOBJECT(this), TQT_SLOT( close() ) ); connect( p, TQT_SIGNAL( destroyed() ), TQT_TQOBJECT(this), TQT_SLOT( close() ) );

@ -97,7 +97,7 @@ krusader_LDADD = \
$(LIB_KJSEMBED) \ $(LIB_KJSEMBED) \
$(LIB_KPARTS) \ $(LIB_KPARTS) \
$(LIB_KFILE) \ $(LIB_KFILE) \
$(LIB_KHTML) \ $(LIB_TDEHTML) \
$(LIB_TDEUI) \ $(LIB_TDEUI) \
$(LIB_TDECORE) \ $(LIB_TDECORE) \
$(LIB_QT) \ $(LIB_QT) \

Loading…
Cancel
Save