From 0ae5679aa160245af248836e1d7743aeff63f2e1 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 6 Nov 2011 02:31:13 -0600 Subject: Additional kde to tde renaming --- khtml/CMakeLists.txt | 12 ++++++------ khtml/Mainpage.dox | 2 +- khtml/Makefile.am | 8 ++++---- khtml/css/CMakeLists.txt | 6 +++--- khtml/design.h | 2 +- khtml/dom/CMakeLists.txt | 4 ++-- khtml/dom/Makefile.am | 2 +- khtml/ecma/CMakeLists.txt | 8 ++++---- khtml/html/CMakeLists.txt | 6 +++--- khtml/java/CMakeLists.txt | 6 +++--- khtml/khtml_part.cpp | 2 +- khtml/khtml_printsettings.cpp | 2 +- khtml/khtml_printsettings.h | 4 ++-- khtml/khtmlview.cpp | 2 +- khtml/kmultipart/CMakeLists.txt | 6 +++--- khtml/misc/CMakeLists.txt | 6 +++--- khtml/misc/Makefile.am | 2 +- khtml/rendering/CMakeLists.txt | 6 +++--- khtml/rendering/Makefile.am | 2 +- khtml/xml/CMakeLists.txt | 6 +++--- khtml/xml/Makefile.am | 2 +- 21 files changed, 48 insertions(+), 48 deletions(-) (limited to 'khtml') diff --git a/khtml/CMakeLists.txt b/khtml/CMakeLists.txt index 9a2488c4a..fc503ca81 100644 --- a/khtml/CMakeLists.txt +++ b/khtml/CMakeLists.txt @@ -28,20 +28,20 @@ include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/kjs ${CMAKE_BINARY_DIR}/kio/kssl - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdefx - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdefx + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kfile ${CMAKE_SOURCE_DIR}/kio/kssl ${CMAKE_SOURCE_DIR}/kutils ${CMAKE_SOURCE_DIR}/kwallet/client - ${CMAKE_SOURCE_DIR}/kdeprint + ${CMAKE_SOURCE_DIR}/tdeprint ) link_directories( @@ -88,7 +88,7 @@ tde_add_library( ${target} SHARED AUTOMOC VERSION 4.2.0 LINK ${VSCRIPT} kjava-static kjs_html-static khtmldom-static khtmlcss-static khtmlhtml-static khtmlxml-static khtmlrender-static khtmlmisc-static - kutils-shared kdeprint-shared kjs-shared ${JPEG_LIBRARIES} + kutils-shared tdeprint-shared kjs-shared ${JPEG_LIBRARIES} DESTINATION ${LIB_INSTALL_DIR} DEPENDENCIES dcopidl ) diff --git a/khtml/Mainpage.dox b/khtml/Mainpage.dox index 2e838b4a6..02ac5c5dd 100644 --- a/khtml/Mainpage.dox +++ b/khtml/Mainpage.dox @@ -40,7 +40,7 @@ Maksim Orlovich @lgpl */ -// DOXYGEN_REFERENCES = kdecore kdeui kio kparts kjs +// DOXYGEN_REFERENCES = tdecore tdeui kio kparts kjs // DOXYGEN_EXCLUDE = test*.* html rendering xml misc ecma css imload pics test // DOXYGEN_SET_PROJECT_NAME = KHTML // vim:ts=4:sw=4:expandtab:filetype=doxygen diff --git a/khtml/Makefile.am b/khtml/Makefile.am index a81d679d8..61e3a5865 100644 --- a/khtml/Makefile.am +++ b/khtml/Makefile.am @@ -55,7 +55,7 @@ libkhtml_la_LIBADD = ./xml/libkhtmlxml.la ./html/libkhtmlhtml.la \ ./misc/libkhtmlmisc.la ecma/libkjs_html.la ./dom/libkhtmldom.la $(LIBKJAVA) \ $(LIB_KPARTS) \ $(LIBTHAI) \ - $(top_builddir)/kdeprint/libtdeprint.la \ + $(top_builddir)/tdeprint/libtdeprint.la \ $(top_builddir)/kutils/libkutils.la \ $(top_builddir)/kwallet/client/libkwalletclient.la $(top_builddir)/kjs/libkjs.la $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) $(LIB_KFILE) $(top_builddir)/dcop/libDCOP.la $(LIBJPEG) $(LIB_X11) @@ -84,7 +84,7 @@ INCLUDES = -I$(top_srcdir)/kjs -I$(top_builddir)/kjs -I$(top_srcdir)/kimgio \ -I$(srcdir)/dom -I$(srcdir)/xml -I$(srcdir)/html -I$(srcdir)/css \ -I$(top_srcdir)/libltdl \ -I$(top_srcdir)/kio/kssl -I$(top_builddir)/kio/kssl \ - -I$(top_srcdir)/kdeprint \ + -I$(top_srcdir)/tdeprint \ -I$(top_srcdir)/interfaces \ -I$(top_srcdir)/interfaces/kregexpeditor \ -I$(top_srcdir)/kwallet/client \ @@ -102,7 +102,7 @@ SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/khtml ## generate lib documentation srcdoc: $(mkinstalldirs) $(SRCDOC_DEST) - kdoc -H -d $(SRCDOC_DEST) kdecore \ + kdoc -H -d $(SRCDOC_DEST) tdecore \ $(include_HEADERS) -lqt EXTRA_DIST = CHANGES DESIGN README.HTMLWidget README.tags @@ -124,7 +124,7 @@ testkhtml_static_LDFLAGS = -static testregression_SOURCES = test_regression.cpp test_regression_fontoverload.cpp testregression_LDADD = libkhtml.la -DOXYGEN_REFERENCES = kdecore kdeui kio kdefx kparts +DOXYGEN_REFERENCES = tdecore tdeui kio tdefx kparts DOXYGEN_EXCLUDE = test*.* css ecma html java kmultipart misc pics rendering test xml include ../admin/Doxyfile.am diff --git a/khtml/css/CMakeLists.txt b/khtml/css/CMakeLists.txt index 1283dce2d..50ca11815 100644 --- a/khtml/css/CMakeLists.txt +++ b/khtml/css/CMakeLists.txt @@ -13,12 +13,12 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/khtml ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kwallet/client diff --git a/khtml/design.h b/khtml/design.h index 22a989b02..5f54c3137 100644 --- a/khtml/design.h +++ b/khtml/design.h @@ -34,7 +34,7 @@ * cascading style sheets (CSS2), and JavaScript. * * If you want to add to your application a widget that only needs simple text - * browsing, you can also use the KTextBrowser widget in kdeui. + * browsing, you can also use the KTextBrowser widget in tdeui. * * KHTMLPart : * The main part/widget for using khtml. diff --git a/khtml/dom/CMakeLists.txt b/khtml/dom/CMakeLists.txt index ea0837cdf..83dd88c5c 100644 --- a/khtml/dom/CMakeLists.txt +++ b/khtml/dom/CMakeLists.txt @@ -15,9 +15,9 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR}/khtml - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/kio ) diff --git a/khtml/dom/Makefile.am b/khtml/dom/Makefile.am index f17e29423..a799e8c0d 100644 --- a/khtml/dom/Makefile.am +++ b/khtml/dom/Makefile.am @@ -54,5 +54,5 @@ SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/khtml ## generate lib documentation srcdoc: $(mkinstalldirs) $(SRCDOC_DEST) - kdoc -H -d $(SRCDOC_DEST) kdecore -lqt + kdoc -H -d $(SRCDOC_DEST) tdecore -lqt diff --git a/khtml/ecma/CMakeLists.txt b/khtml/ecma/CMakeLists.txt index 307623f48..77457436b 100644 --- a/khtml/ecma/CMakeLists.txt +++ b/khtml/ecma/CMakeLists.txt @@ -14,13 +14,13 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/kjs - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/khtml ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdefx - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdefx + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/bookmarks diff --git a/khtml/html/CMakeLists.txt b/khtml/html/CMakeLists.txt index 0736cb407..8f47c06f8 100644 --- a/khtml/html/CMakeLists.txt +++ b/khtml/html/CMakeLists.txt @@ -13,12 +13,12 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/khtml ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kfile diff --git a/khtml/java/CMakeLists.txt b/khtml/java/CMakeLists.txt index 94a249318..abda3ed66 100644 --- a/khtml/java/CMakeLists.txt +++ b/khtml/java/CMakeLists.txt @@ -15,13 +15,13 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_BINARY_DIR}/kio/kssl ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/khtml ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kssl ) diff --git a/khtml/khtml_part.cpp b/khtml/khtml_part.cpp index 5076e1c89..6412902a7 100644 --- a/khtml/khtml_part.cpp +++ b/khtml/khtml_part.cpp @@ -1136,7 +1136,7 @@ void KHTMLPart::launchJSErrorDialog() { void KHTMLPart::launchJSConfigDialog() { TQStringList args; args << "khtml_java_js"; - KApplication::kdeinitExec( "kcmshell", args ); + KApplication::tdeinitExec( "kcmshell", args ); } TQVariant KHTMLPart::executeScript(const TQString& filename, int baseLine, const DOM::Node& n, const TQString& script) diff --git a/khtml/khtml_printsettings.cpp b/khtml/khtml_printsettings.cpp index 466e3066c..ed998ffb7 100644 --- a/khtml/khtml_printsettings.cpp +++ b/khtml/khtml_printsettings.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2002 Michael Goffioul + * Copyright (c) 2002 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/khtml/khtml_printsettings.h b/khtml/khtml_printsettings.h index b26c98144..9f69d9b88 100644 --- a/khtml/khtml_printsettings.h +++ b/khtml/khtml_printsettings.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2002 Michael Goffioul + * Copyright (c) 2002 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -20,7 +20,7 @@ #ifndef KHTML_PRINTSETTINGS_H #define KHTML_PRINTSETTINGS_H -#include +#include class TQCheckBox; diff --git a/khtml/khtmlview.cpp b/khtml/khtmlview.cpp index bcf9ede59..c895df5f6 100644 --- a/khtml/khtmlview.cpp +++ b/khtml/khtmlview.cpp @@ -2785,7 +2785,7 @@ void KHTMLView::print(bool quick) if ( !docname.isEmpty() ) docname = KStringHandler::csqueeze(docname, 80); if(quick || printer->setup(this, i18n("Print %1").arg(docname))) { - viewport()->setCursor( tqwaitCursor ); // only viewport(), no TQApplication::, otherwise we get the busy cursor in kdeprint's dialogs + viewport()->setCursor( tqwaitCursor ); // only viewport(), no TQApplication::, otherwise we get the busy cursor in tdeprint's dialogs // set up KPrinter printer->setFullPage(false); printer->setCreator(TQString("KDE %1.%2.%3 HTML Library").arg(KDE_VERSION_MAJOR).arg(KDE_VERSION_MINOR).arg(KDE_VERSION_RELEASE)); diff --git a/khtml/kmultipart/CMakeLists.txt b/khtml/kmultipart/CMakeLists.txt index 4c798f584..3f07007bd 100644 --- a/khtml/kmultipart/CMakeLists.txt +++ b/khtml/kmultipart/CMakeLists.txt @@ -13,11 +13,11 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/khtml - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kutils diff --git a/khtml/misc/CMakeLists.txt b/khtml/misc/CMakeLists.txt index ea074a639..3ef86c200 100644 --- a/khtml/misc/CMakeLists.txt +++ b/khtml/misc/CMakeLists.txt @@ -13,12 +13,12 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/khtml ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kutils diff --git a/khtml/misc/Makefile.am b/khtml/misc/Makefile.am index a64706e73..fcb4ed025 100644 --- a/khtml/misc/Makefile.am +++ b/khtml/misc/Makefile.am @@ -39,5 +39,5 @@ SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/khtml ## generate lib documentation srcdoc: $(mkinstalldirs) $(SRCDOC_DEST) - kdoc -H -d $(SRCDOC_DEST) kdecore -lqt + kdoc -H -d $(SRCDOC_DEST) tdecore -lqt diff --git a/khtml/rendering/CMakeLists.txt b/khtml/rendering/CMakeLists.txt index 45924ac2d..fe3301265 100644 --- a/khtml/rendering/CMakeLists.txt +++ b/khtml/rendering/CMakeLists.txt @@ -14,11 +14,11 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/khtml - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kfile diff --git a/khtml/rendering/Makefile.am b/khtml/rendering/Makefile.am index 4389b29f8..c81b4bea1 100644 --- a/khtml/rendering/Makefile.am +++ b/khtml/rendering/Makefile.am @@ -49,7 +49,7 @@ SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/khtml ## generate lib documentation srcdoc: $(mkinstalldirs) $(SRCDOC_DEST) - kdoc -H -d $(SRCDOC_DEST) kdecore -lqt + kdoc -H -d $(SRCDOC_DEST) tdecore -lqt ## maintainer: regen loading icon loading-icon: diff --git a/khtml/xml/CMakeLists.txt b/khtml/xml/CMakeLists.txt index c9ea9f696..82fe99d4c 100644 --- a/khtml/xml/CMakeLists.txt +++ b/khtml/xml/CMakeLists.txt @@ -14,12 +14,12 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/kjs - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/khtml - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kwallet/client diff --git a/khtml/xml/Makefile.am b/khtml/xml/Makefile.am index 8f7cd6b7f..676c945be 100644 --- a/khtml/xml/Makefile.am +++ b/khtml/xml/Makefile.am @@ -44,5 +44,5 @@ SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/khtml ## generate lib documentation srcdoc: $(mkinstalldirs) $(SRCDOC_DEST) - kdoc -H -d $(SRCDOC_DEST) kdecore -lqt + kdoc -H -d $(SRCDOC_DEST) tdecore -lqt -- cgit v1.2.3