summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-27 20:56:08 -0600
committerTimothy Pearson <[email protected]>2013-01-27 20:56:08 -0600
commit369bc3df47111df298764b69146ae1de7e616ce0 (patch)
tree5eba7b51b0cb37041a467bb28e66d1afead936ed
parenta7a7d24b6ca13558962e3b91c5e18fd29d33fc3b (diff)
downloadkile-369bc3df47111df298764b69146ae1de7e616ce0.tar.gz
kile-369bc3df47111df298764b69146ae1de7e616ce0.zip
Rename kiobuffer and KHTML
-rw-r--r--acinclude.m44
m---------cmake0
-rw-r--r--src/kile.kdevprj2
-rw-r--r--src/kile/Makefile.am2
-rw-r--r--src/kile/docpart.cpp12
-rw-r--r--src/kile/docpart.h2
-rw-r--r--src/kile/kilelauncher.cpp4
7 files changed, 13 insertions, 13 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
-Subproject 9a217903f9fa35ca12213a6e9ee3d2cb87d1131
+Subproject 274366fb8b90704586d7beef216b765cc0688b0
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 <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'");
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 <tdehtml_part.h>
#include <tqstringlist.h>
-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));