diff options
Diffstat (limited to 'parts')
| -rw-r--r-- | parts/classview/Makefile.am | 2 | ||||
| -rw-r--r-- | parts/documentation/Makefile.am | 2 | ||||
| -rw-r--r-- | parts/documentation/bookmarkview.cpp | 2 | ||||
| -rw-r--r-- | parts/documentation/docglobalconfigwidget.cpp | 10 | ||||
| -rw-r--r-- | parts/grepview/Makefile.am | 2 | ||||
| -rw-r--r-- | parts/outputviews/Makefile.am | 4 | ||||
| -rw-r--r-- | parts/quickopen/Makefile.am | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/parts/classview/Makefile.am b/parts/classview/Makefile.am index a58ec684..3041259e 100644 --- a/parts/classview/Makefile.am +++ b/parts/classview/Makefile.am @@ -5,7 +5,7 @@ INCLUDES = -I$(top_srcdir)/lib/compat -I$(top_srcdir)/lib/interfaces -I$(top_src kde_module_LTLIBRARIES = libkdevclassview.la libkdevclassview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libkdevclassview_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_KHTML) $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la +libkdevclassview_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_TDEHTML) $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la libkdevclassview_la_SOURCES = classviewpart.cpp classviewwidget.cpp \ digraphview.cpp hierarchydlg.cpp navigator.cpp viewcombos.cpp diff --git a/parts/documentation/Makefile.am b/parts/documentation/Makefile.am index e6724ba1..13c4db3f 100644 --- a/parts/documentation/Makefile.am +++ b/parts/documentation/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util \ kde_module_LTLIBRARIES = libkdevdocumentation.la libkdevdocumentation_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) libkdevdocumentation_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ - $(top_builddir)/parts/documentation/interfaces/libdocumentation_interfaces.la $(LIB_KHTML) + $(top_builddir)/parts/documentation/interfaces/libdocumentation_interfaces.la $(LIB_TDEHTML) libkdevdocumentation_la_SOURCES = documentation_part.cpp \ documentation_widget.cpp contentsview.cpp indexview.cpp docglobalconfigwidgetbase.ui \ diff --git a/parts/documentation/bookmarkview.cpp b/parts/documentation/bookmarkview.cpp index 0ca74f43..4581361d 100644 --- a/parts/documentation/bookmarkview.cpp +++ b/parts/documentation/bookmarkview.cpp @@ -73,7 +73,7 @@ TQString DocBookmarkOwner::currentTitle() const KParts::ReadOnlyPart *activePart = dynamic_cast<KParts::ReadOnlyPart*>(m_part->partController()->activePart()); if (activePart) { - KHTMLPart *htmlPart = dynamic_cast<KHTMLPart*>(activePart); + TDEHTMLPart *htmlPart = dynamic_cast<TDEHTMLPart*>(activePart); if (htmlPart) return htmlPart->htmlDocument().title().string(); return activePart->url().prettyURL(); diff --git a/parts/documentation/docglobalconfigwidget.cpp b/parts/documentation/docglobalconfigwidget.cpp index fa6bafd0..5cea1004 100644 --- a/parts/documentation/docglobalconfigwidget.cpp +++ b/parts/documentation/docglobalconfigwidget.cpp @@ -104,9 +104,9 @@ DocGlobalConfigWidget::DocGlobalConfigWidget(DocumentationPart *part, useAssistant_box->hide(); //font sizes and zoom levels - KHTMLPart htmlpart; + TDEHTMLPart htmlpart; TDEConfig *appConfig = TDEGlobal::config(); - appConfig->setGroup("KHTMLPart"); + appConfig->setGroup("TDEHTMLPart"); standardFont_combo->setCurrentText(appConfig->readEntry("StandardFont", htmlpart.settings()->stdFontName())); fixedFont_combo->setCurrentText(appConfig->readEntry("FixedFont", @@ -215,7 +215,7 @@ void DocGlobalConfigWidget::accept() //font sizes and zoom levels TDEConfig *appConfig = TDEGlobal::config(); - appConfig->setGroup("KHTMLPart"); + appConfig->setGroup("TDEHTMLPart"); appConfig->writeEntry("StandardFont", standardFont_combo->currentText()); appConfig->writeEntry("FixedFont", fixedFont_combo->currentText()); appConfig->writeEntry("Zoom", zoom_combo->currentText()); @@ -238,11 +238,11 @@ void DocGlobalConfigWidget::updateConfigForHTMLParts() KURL::List urls = m_part->partController()->openURLs(); for (KURL::List::const_iterator it = urls.constBegin(); it != urls.constEnd(); ++it) { - KHTMLPart *htmlPart = dynamic_cast<KHTMLPart*>(m_part->partController()->partForURL(*it)); + TDEHTMLPart *htmlPart = dynamic_cast<TDEHTMLPart*>(m_part->partController()->partForURL(*it)); if (htmlPart) { TDEConfig *appConfig = TDEGlobal::config(); - appConfig->setGroup("KHTMLPart"); + appConfig->setGroup("TDEHTMLPart"); htmlPart->setStandardFont(appConfig->readEntry("StandardFont")); htmlPart->setFixedFont(appConfig->readEntry("FixedFont")); //hack to force reloading the page diff --git a/parts/grepview/Makefile.am b/parts/grepview/Makefile.am index c282e75a..dc5f5fed 100644 --- a/parts/grepview/Makefile.am +++ b/parts/grepview/Makefile.am @@ -6,7 +6,7 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util \ kde_module_LTLIBRARIES = libkdevgrepview.la libkdevgrepview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) libkdevgrepview_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ - $(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_KHTML) + $(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_TDEHTML) libkdevgrepview_la_SOURCES = grepviewpart.cpp grepviewwidget.cpp grepdlg.cpp diff --git a/parts/outputviews/Makefile.am b/parts/outputviews/Makefile.am index 803d51c2..6a890586 100644 --- a/parts/outputviews/Makefile.am +++ b/parts/outputviews/Makefile.am @@ -22,7 +22,7 @@ noinst_HEADERS = filterdlg.h libkdevmakeview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) libkdevmakeview_la_LIBADD = $(top_builddir)/lib/widgets/libkdevwidgets.la \ $(top_builddir)/lib/interfaces/extensions/dcop/libkdevdcopextensions.la $(top_builddir)/lib/libtdevelop.la \ - $(LIB_KHTML) $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la + $(LIB_TDEHTML) $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la libkdevmakeview_la_SOURCES = makeviewpart.cpp makewidget.cpp \ directorystatusmessagefilter.cpp outputfilter.cpp compileerrorfilter.cpp commandcontinuationfilter.cpp \ makeitem.cpp makeactionfilter.cpp otherfilter.cpp @@ -30,6 +30,6 @@ libkdevmakeview_la_SOURCES = makeviewpart.cpp makewidget.cpp \ libkdevappview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) libkdevappview_la_LIBADD = $(top_builddir)/lib/widgets/libkdevwidgets.la \ $(top_builddir)/lib/interfaces/extensions/dcop/libkdevdcopextensions.la $(top_builddir)/lib/libtdevelop.la \ - $(LIB_KHTML) $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la + $(LIB_TDEHTML) $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la libkdevappview_la_SOURCES = appoutputviewpart.cpp appoutputwidget.cpp \ filterdlg.ui diff --git a/parts/quickopen/Makefile.am b/parts/quickopen/Makefile.am index 2b9fafe0..ca7ed3dd 100644 --- a/parts/quickopen/Makefile.am +++ b/parts/quickopen/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extensi kde_module_LTLIBRARIES = libkdevquickopen.la libkdevquickopen_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libkdevquickopen_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_KHTML) +libkdevquickopen_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_TDEHTML) libkdevquickopen_la_SOURCES = quickopen_part.cpp quickopendialog.cpp quickopenclassdialog.cpp quickopenbase.ui quickopenfiledialog.cpp quickopenfunctiondialog.cpp quickopenfunctionchooseformbase.ui quickopenfunctionchooseform.cpp |