Browse Source

Rename KHTML and kiobuffer

tags/r14.0.0
Timothy Pearson 6 years ago
parent
commit
68c175bf64
47 changed files with 188 additions and 188 deletions
  1. 1
    1
      doc/faq/webbrowse.docbook
  2. 1
    1
      kcontrol/kcontrol/Makefile.am
  3. 1
    1
      kcontrol/kcontrol/aboutwidget.cpp
  4. 2
    2
      kcontrol/kcontrol/aboutwidget.h
  5. 1
    1
      kcontrol/keys/Makefile.am
  6. 6
    6
      kcontrol/konqhtml/javaopts.cpp
  7. 6
    6
      kcontrol/konqhtml/jsopts.cpp
  8. 22
    22
      kcontrol/konqhtml/jspolicies.cpp
  9. 15
    15
      kcontrol/konqhtml/jspolicies.h
  10. 1
    1
      kcontrol/privacy/Makefile.am
  11. 1
    1
      kcontrol/tdeio/uasproviders/ie60oncurrent.desktop
  12. 1
    1
      kdesktop/kwebdesktop/Makefile.am
  13. 1
    1
      kdesktop/kwebdesktop/kwebdesktop.cpp
  14. 8
    8
      khelpcenter/DESIGN
  15. 1
    1
      khelpcenter/Makefile.am
  16. 16
    16
      khelpcenter/htmlsearch/kcmhtmlsearch.cpp
  17. 3
    3
      khelpcenter/htmlsearch/kcmhtmlsearch.h
  18. 2
    2
      khelpcenter/mainwindow.cpp
  19. 1
    1
      khelpcenter/mainwindow.h
  20. 1
    1
      khelpcenter/searchengine.h
  21. 9
    9
      khelpcenter/view.cpp
  22. 2
    2
      khelpcenter/view.h
  23. 2
    2
      konqueror/DESIGN
  24. 1
    1
      konqueror/about/Makefile.am
  25. 2
    2
      konqueror/about/konq_aboutpage.cc
  26. 3
    3
      konqueror/about/konq_aboutpage.h
  27. 1
    1
      konqueror/keditbookmarks/updater.cpp
  28. 1
    1
      konqueror/konq_mainwindow.cc
  29. 1
    1
      konqueror/konq_viewmgr.cc
  30. 29
    29
      konqueror/konqueror.kcfg
  31. 1
    1
      konqueror/kttsplugin/Makefile.am
  32. 9
    9
      konqueror/kttsplugin/tdehtmlkttsd.cpp
  33. 6
    6
      konqueror/kttsplugin/tdehtmlkttsd.h
  34. 1
    1
      konqueror/sidebar/web_module/Makefile.am
  35. 3
    3
      konqueror/sidebar/web_module/TODO
  36. 1
    1
      konqueror/sidebar/web_module/web_module.cpp
  37. 9
    9
      konqueror/sidebar/web_module/web_module.h
  38. 4
    4
      nsplugins/README
  39. 1
    1
      nsplugins/TESTCASES
  40. 1
    1
      nsplugins/nspluginloader.cpp
  41. 2
    2
      nsplugins/plugin_part.cpp
  42. 1
    1
      nsplugins/viewer/nsplugin.cpp
  43. 1
    1
      tdeioslave/man/kmanpart.cpp
  44. 2
    2
      tdeioslave/man/kmanpart.h
  45. 1
    1
      tdeioslave/thumbnail/Makefile.am
  46. 1
    1
      tdeioslave/thumbnail/htmlcreator.cpp
  47. 2
    2
      tdeioslave/thumbnail/htmlcreator.h

+ 1
- 1
doc/faq/webbrowse.docbook View File

@@ -206,7 +206,7 @@ text->html in the tree view.</para>
<listitem><para>Click on the
<guilabel>Embedding</guilabel> tab. Make sure that <guilabel>Left Click
Action</guilabel> is set to <guilabel>Show file in embedded
viewer</guilabel>, and that <guilabel>KHTML (tdehtml)</guilabel> is at the top
viewer</guilabel>, and that <guilabel>TDEHTML (tdehtml)</guilabel> is at the top
of <guilabel>Services Preference Order</guilabel>.</para></listitem>
</orderedlist>
</para>

+ 1
- 1
kcontrol/kcontrol/Makefile.am View File

@@ -32,7 +32,7 @@ kcontrol_la_SOURCES = main.cpp toplevel.cpp indexwidget.cpp \
moduleIface.cpp moduleIface.skel global.cpp modules.cpp \
proxywidget.cpp kcrootonly.cpp searchwidget.cpp

kcontrol_la_LIBADD = $(LIB_TDEUI) $(LIB_KUTILS) $(LIB_KHTML)
kcontrol_la_LIBADD = $(LIB_TDEUI) $(LIB_KUTILS) $(LIB_TDEHTML)
kcontrol_la_LDFLAGS = $(all_libraries) -module -avoid-version

rccontroldir = $(kde_datadir)/kcontrol

+ 1
- 1
kcontrol/kcontrol/aboutwidget.cpp View File

@@ -81,7 +81,7 @@ AboutWidget::AboutWidget(TQWidget *parent , const char *name, TQListViewItem* ca

// set qwhatsthis help
TQWhatsThis::add(this, i18n(intro_text));
_viewer = new KHTMLPart( this, "_viewer" );
_viewer = new TDEHTMLPart( this, "_viewer" );
_viewer->widget()->setSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored );
connect( _viewer->browserExtension(),
TQT_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)),

+ 2
- 2
kcontrol/kcontrol/aboutwidget.h View File

@@ -28,7 +28,7 @@ class TDECModuleInfo;
class TQPixmap;
class KPixmap;
class ConfigModule;
class KHTMLPart;
class TDEHTMLPart;
class KURL;

class AboutWidget : public TQHBox
@@ -61,7 +61,7 @@ private:
TQListViewItem* _category;
TQString _icon;
TQString _caption;
KHTMLPart *_viewer;
TDEHTMLPart *_viewer;
TQMap<TQString,ConfigModule*> _moduleMap;
};


+ 1
- 1
kcontrol/keys/Makefile.am View File

@@ -1,7 +1,7 @@
kde_module_LTLIBRARIES = kcm_keys.la

kcm_keys_la_SOURCES = shortcuts.cpp modifiers.cpp main.cpp khotkeys.cpp treeview.cpp commandShortcuts.cpp
kcm_keys_la_LIBADD = -ltdeui -lkio
kcm_keys_la_LIBADD = -ltdeui -ltdeio
kcm_keys_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined

AM_CPPFLAGS= $(all_includes)

+ 6
- 6
kcontrol/konqhtml/javaopts.cpp View File

@@ -296,14 +296,14 @@ void JavaDomainListView::updateDomainListLegacy(const TQStringList &domainConfig
it != domainConfig.end(); ++it)
{
TQString domain;
KHTMLSettings::KJavaScriptAdvice javaAdvice;
KHTMLSettings::KJavaScriptAdvice javaScriptAdvice;
KHTMLSettings::splitDomainAdvice(*it, domain, javaAdvice, javaScriptAdvice);
if (javaAdvice != KHTMLSettings::KJavaScriptDunno) {
TDEHTMLSettings::KJavaScriptAdvice javaAdvice;
TDEHTMLSettings::KJavaScriptAdvice javaScriptAdvice;
TDEHTMLSettings::splitDomainAdvice(*it, domain, javaAdvice, javaScriptAdvice);
if (javaAdvice != TDEHTMLSettings::KJavaScriptDunno) {
TQListViewItem* index = new TQListViewItem( domainSpecificLV, domain,
i18n(KHTMLSettings::adviceToStr(javaAdvice)) );
i18n(TDEHTMLSettings::adviceToStr(javaAdvice)) );
pol.setDomain(domain);
pol.setFeatureEnabled(javaAdvice != KHTMLSettings::KJavaScriptReject);
pol.setFeatureEnabled(javaAdvice != TDEHTMLSettings::KJavaScriptReject);
domainPolicies[index] = new JavaPolicies(pol);
}
}

+ 6
- 6
kcontrol/konqhtml/jsopts.cpp View File

@@ -182,16 +182,16 @@ void JSDomainListView::updateDomainListLegacy(const TQStringList &domainConfig)
for (TQStringList::ConstIterator it = domainConfig.begin();
it != domainConfig.end(); ++it) {
TQString domain;
KHTMLSettings::KJavaScriptAdvice javaAdvice;
KHTMLSettings::KJavaScriptAdvice javaScriptAdvice;
KHTMLSettings::splitDomainAdvice(*it, domain, javaAdvice, javaScriptAdvice);
if (javaScriptAdvice != KHTMLSettings::KJavaScriptDunno) {
TDEHTMLSettings::KJavaScriptAdvice javaAdvice;
TDEHTMLSettings::KJavaScriptAdvice javaScriptAdvice;
TDEHTMLSettings::splitDomainAdvice(*it, domain, javaAdvice, javaScriptAdvice);
if (javaScriptAdvice != TDEHTMLSettings::KJavaScriptDunno) {
TQListViewItem *index =
new TQListViewItem( domainSpecificLV, domain,
i18n(KHTMLSettings::adviceToStr(javaScriptAdvice)) );
i18n(TDEHTMLSettings::adviceToStr(javaScriptAdvice)) );

pol.setDomain(domain);
pol.setFeatureEnabled(javaScriptAdvice != KHTMLSettings::KJavaScriptReject);
pol.setFeatureEnabled(javaScriptAdvice != TDEHTMLSettings::KJavaScriptReject);
domainPolicies[index] = new JSPolicies(pol);
}
}

+ 22
- 22
kcontrol/konqhtml/jspolicies.cpp View File

@@ -54,23 +54,23 @@ void JSPolicies::load() {
// enableDebugOutputCB->setChecked( m_pConfig->readBoolEntry("EnableJSDebugOutput") );
key = prefix + "WindowOpenPolicy";
window_open = config->readUnsignedNumEntry(key,
is_global ? KHTMLSettings::KJSWindowOpenSmart : INHERIT_POLICY);
is_global ? TDEHTMLSettings::KJSWindowOpenSmart : INHERIT_POLICY);

key = prefix + "WindowResizePolicy";
window_resize = config->readUnsignedNumEntry(key,
is_global ? KHTMLSettings::KJSWindowResizeAllow : INHERIT_POLICY);
is_global ? TDEHTMLSettings::KJSWindowResizeAllow : INHERIT_POLICY);

key = prefix + "WindowMovePolicy";
window_move = config->readUnsignedNumEntry(key,
is_global ? KHTMLSettings::KJSWindowMoveAllow : INHERIT_POLICY);
is_global ? TDEHTMLSettings::KJSWindowMoveAllow : INHERIT_POLICY);

key = prefix + "WindowFocusPolicy";
window_focus = config->readUnsignedNumEntry(key,
is_global ? KHTMLSettings::KJSWindowFocusAllow : INHERIT_POLICY);
is_global ? TDEHTMLSettings::KJSWindowFocusAllow : INHERIT_POLICY);

key = prefix + "WindowStatusPolicy";
window_status = config->readUnsignedNumEntry(key,
is_global ? KHTMLSettings::KJSWindowStatusAllow : INHERIT_POLICY);
is_global ? TDEHTMLSettings::KJSWindowStatusAllow : INHERIT_POLICY);
}

void JSPolicies::defaults() {
@@ -79,11 +79,11 @@ void JSPolicies::defaults() {
// enableJavaScriptDebugCB->setChecked( false );
// js_popup->setButton(0);
// enableDebugOutputCB->setChecked( false );
window_open = is_global ? KHTMLSettings::KJSWindowOpenSmart : INHERIT_POLICY;
window_resize = is_global ? KHTMLSettings::KJSWindowResizeAllow : INHERIT_POLICY;
window_move = is_global ? KHTMLSettings::KJSWindowMoveAllow : INHERIT_POLICY;
window_focus = is_global ? KHTMLSettings::KJSWindowFocusAllow : INHERIT_POLICY;
window_status = is_global ? KHTMLSettings::KJSWindowStatusAllow : INHERIT_POLICY;
window_open = is_global ? TDEHTMLSettings::KJSWindowOpenSmart : INHERIT_POLICY;
window_resize = is_global ? TDEHTMLSettings::KJSWindowResizeAllow : INHERIT_POLICY;
window_move = is_global ? TDEHTMLSettings::KJSWindowMoveAllow : INHERIT_POLICY;
window_focus = is_global ? TDEHTMLSettings::KJSWindowFocusAllow : INHERIT_POLICY;
window_status = is_global ? TDEHTMLSettings::KJSWindowStatusAllow : INHERIT_POLICY;
}

void JSPolicies::save() {
@@ -163,19 +163,19 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,

policy_btn = new TQRadioButton(i18n("Allow"), this);
TQWhatsThis::add(policy_btn,i18n("Accept all popup window requests."));
js_popup->insert(policy_btn,KHTMLSettings::KJSWindowOpenAllow);
js_popup->insert(policy_btn,TDEHTMLSettings::KJSWindowOpenAllow);
this_layout->addWidget(policy_btn,0,colIdx++);
this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);

policy_btn = new TQRadioButton(i18n("Ask"), this);
TQWhatsThis::add(policy_btn,i18n("Prompt every time a popup window is requested."));
js_popup->insert(policy_btn,KHTMLSettings::KJSWindowOpenAsk);
js_popup->insert(policy_btn,TDEHTMLSettings::KJSWindowOpenAsk);
this_layout->addWidget(policy_btn,0,colIdx++);
this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);

policy_btn = new TQRadioButton(i18n("Deny"), this);
TQWhatsThis::add(policy_btn,i18n("Reject all popup window requests."));
js_popup->insert(policy_btn,KHTMLSettings::KJSWindowOpenDeny);
js_popup->insert(policy_btn,TDEHTMLSettings::KJSWindowOpenDeny);
this_layout->addWidget(policy_btn,0,colIdx++);
this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);

@@ -183,7 +183,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
TQWhatsThis::add(policy_btn, i18n("Accept popup window requests only when "
"links are activated through an explicit "
"mouse click or keyboard operation."));
js_popup->insert(policy_btn,KHTMLSettings::KJSWindowOpenSmart);
js_popup->insert(policy_btn,TDEHTMLSettings::KJSWindowOpenSmart);
this_layout->addWidget(policy_btn,0,colIdx++);
this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);

@@ -218,7 +218,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,

policy_btn = new TQRadioButton(i18n("Allow"), this);
TQWhatsThis::add(policy_btn,i18n("Allow scripts to change the window size."));
js_resize->insert(policy_btn,KHTMLSettings::KJSWindowResizeAllow);
js_resize->insert(policy_btn,TDEHTMLSettings::KJSWindowResizeAllow);
this_layout->addWidget(policy_btn,1,colIdx++);
this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);

@@ -226,7 +226,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
TQWhatsThis::add( policy_btn,i18n("Ignore attempts of scripts to change the window size. "
"The web page will <i>think</i> it changed the "
"size but the actual window is not affected."));
js_resize->insert(policy_btn,KHTMLSettings::KJSWindowResizeIgnore);
js_resize->insert(policy_btn,TDEHTMLSettings::KJSWindowResizeIgnore);
this_layout->addWidget(policy_btn,1,colIdx++);
this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);

@@ -256,7 +256,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,

policy_btn = new TQRadioButton(i18n("Allow"), this);
TQWhatsThis::add(policy_btn,i18n("Allow scripts to change the window position."));
js_move->insert(policy_btn,KHTMLSettings::KJSWindowMoveAllow);
js_move->insert(policy_btn,TDEHTMLSettings::KJSWindowMoveAllow);
this_layout->addWidget(policy_btn,2,colIdx++);
this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);

@@ -264,7 +264,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
TQWhatsThis::add(policy_btn,i18n("Ignore attempts of scripts to change the window position. "
"The web page will <i>think</i> it moved the "
"window but the actual position is not affected."));
js_move->insert(policy_btn,KHTMLSettings::KJSWindowMoveIgnore);
js_move->insert(policy_btn,TDEHTMLSettings::KJSWindowMoveIgnore);
this_layout->addWidget(policy_btn,2,colIdx++);
this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);

@@ -294,7 +294,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,

policy_btn = new TQRadioButton(i18n("Allow"), this);
TQWhatsThis::add( policy_btn,i18n("Allow scripts to focus the window.") );
js_focus->insert(policy_btn,KHTMLSettings::KJSWindowFocusAllow);
js_focus->insert(policy_btn,TDEHTMLSettings::KJSWindowFocusAllow);
this_layout->addWidget(policy_btn,3,colIdx++);
this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);

@@ -303,7 +303,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
"The web page will <i>think</i> it brought "
"the focus to the window but the actual "
"focus will remain unchanged.") );
js_focus->insert(policy_btn,KHTMLSettings::KJSWindowFocusIgnore);
js_focus->insert(policy_btn,TDEHTMLSettings::KJSWindowFocusIgnore);
this_layout->addWidget(policy_btn,3,colIdx++);
this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);

@@ -335,7 +335,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,

policy_btn = new TQRadioButton(i18n("Allow"), this);
TQWhatsThis::add(policy_btn,i18n("Allow scripts to change the text of the status bar."));
js_statusbar->insert(policy_btn,KHTMLSettings::KJSWindowStatusAllow);
js_statusbar->insert(policy_btn,TDEHTMLSettings::KJSWindowStatusAllow);
this_layout->addWidget(policy_btn,4,colIdx++);
this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);

@@ -344,7 +344,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
"The web page will <i>think</i> it changed "
"the text but the actual text will remain "
"unchanged.") );
js_statusbar->insert(policy_btn,KHTMLSettings::KJSWindowStatusIgnore);
js_statusbar->insert(policy_btn,TDEHTMLSettings::KJSWindowStatusIgnore);
this_layout->addWidget(policy_btn,4,colIdx++);
this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);


+ 15
- 15
kcontrol/konqhtml/jspolicies.h View File

@@ -88,8 +88,8 @@ public:
* This will return an illegal value if isWindowOpenPolicyInherited is
* true.
*/
KHTMLSettings::KJSWindowOpenPolicy windowOpenPolicy() const {
return (KHTMLSettings::KJSWindowOpenPolicy)window_open;
TDEHTMLSettings::KJSWindowOpenPolicy windowOpenPolicy() const {
return (TDEHTMLSettings::KJSWindowOpenPolicy)window_open;
}

/**
@@ -104,8 +104,8 @@ public:
* This will return an illegal value if isWindowResizePolicyInherited is
* true.
*/
KHTMLSettings::KJSWindowResizePolicy windowResizePolicy() const {
return (KHTMLSettings::KJSWindowResizePolicy)window_resize;
TDEHTMLSettings::KJSWindowResizePolicy windowResizePolicy() const {
return (TDEHTMLSettings::KJSWindowResizePolicy)window_resize;
}

/**
@@ -120,8 +120,8 @@ public:
* This will return an illegal value if isWindowMovePolicyInherited is
* true.
*/
KHTMLSettings::KJSWindowMovePolicy windowMovePolicy() const {
return (KHTMLSettings::KJSWindowMovePolicy)window_move;
TDEHTMLSettings::KJSWindowMovePolicy windowMovePolicy() const {
return (TDEHTMLSettings::KJSWindowMovePolicy)window_move;
}

/**
@@ -136,8 +136,8 @@ public:
* This will return an illegal value if isWindowFocusPolicyInherited is
* true.
*/
KHTMLSettings::KJSWindowFocusPolicy windowFocusPolicy() const {
return (KHTMLSettings::KJSWindowFocusPolicy)window_focus;
TDEHTMLSettings::KJSWindowFocusPolicy windowFocusPolicy() const {
return (TDEHTMLSettings::KJSWindowFocusPolicy)window_focus;
}

/**
@@ -152,8 +152,8 @@ public:
* This will return an illegal value if isWindowStatusPolicyInherited is
* true.
*/
KHTMLSettings::KJSWindowStatusPolicy windowStatusPolicy() const {
return (KHTMLSettings::KJSWindowStatusPolicy)window_status;
TDEHTMLSettings::KJSWindowStatusPolicy windowStatusPolicy() const {
return (TDEHTMLSettings::KJSWindowStatusPolicy)window_status;
}

/**
@@ -170,15 +170,15 @@ public:
virtual void defaults();

private:
// one of KHTMLSettings::KJSWindowOpenPolicy or INHERIT_POLICY
// one of TDEHTMLSettings::KJSWindowOpenPolicy or INHERIT_POLICY
unsigned int window_open;
// one of KHTMLSettings::KJSWindowResizePolicy or INHERIT_POLICY
// one of TDEHTMLSettings::KJSWindowResizePolicy or INHERIT_POLICY
unsigned int window_resize;
// one of KHTMLSettings::KJSWindowMovePolicy or INHERIT_POLICY
// one of TDEHTMLSettings::KJSWindowMovePolicy or INHERIT_POLICY
unsigned int window_move;
// one of KHTMLSettings::KJSWindowFocusPolicy or INHERIT_POLICY
// one of TDEHTMLSettings::KJSWindowFocusPolicy or INHERIT_POLICY
unsigned int window_focus;
// one of KHTMLSettings::KJSWindowStatusPolicy or INHERIT_POLICY
// one of TDEHTMLSettings::KJSWindowStatusPolicy or INHERIT_POLICY
unsigned int window_status;

friend class JSPoliciesFrame; // for changing policies

+ 1
- 1
kcontrol/privacy/Makefile.am View File

@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kcm_privacy.la
kcm_privacy_la_SOURCES = privacy.cpp kprivacysettings.ui kcmprivacydialog.ui kprivacymanager.cpp

kcm_privacy_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
kcm_privacy_la_LIBADD = $(LIB_TDEUI) -lkio
kcm_privacy_la_LIBADD = $(LIB_TDEUI) -ltdeio

METASOURCES = AUTO


+ 1
- 1
kcontrol/tdeio/uasproviders/ie60oncurrent.desktop View File

@@ -87,7 +87,7 @@ Name[zh_TW]=使用者代理描述 (IE 6.0 on current)
Type=Service
X-TDE-ServiceTypes=UserAgentStrings
X-TDE-UA-TAG=IE
X-TDE-UA-FULL=Mozilla/4.0 (compatible; MSIE 6.0; appPlatform; appSysName appMachineType) Konqueror/3.4 (KHTML, like Gecko)
X-TDE-UA-FULL=Mozilla/4.0 (compatible; MSIE 6.0; appPlatform; appSysName appMachineType) Konqueror/3.4 (TDEHTML, like Gecko)
X-TDE-UA-NAME=Internet Explorer
X-TDE-UA-VERSION=6.0
X-TDE-UA-DYNAMIC-ENTRY=1

+ 1
- 1
kdesktop/kwebdesktop/Makefile.am View File

@@ -1,6 +1,6 @@

INCLUDES= $(all_includes)
LDADD = $(LIB_KHTML)
LDADD = $(LIB_TDEHTML)

bin_PROGRAMS = kwebdesktop


+ 1
- 1
kdesktop/kwebdesktop/kwebdesktop.cpp View File

@@ -154,7 +154,7 @@ KParts::ReadOnlyPart* KWebDesktop::createPart( const TQString& mimeType )
return 0;
if ( mime->is( "text/html" ) || mime->is( "text/xml" ) || mime->is( "application/xhtml+xml" ) )
{
KHTMLPart* htmlPart = new KHTMLPart;
TDEHTMLPart* htmlPart = new TDEHTMLPart;
htmlPart->widget()->resize(m_width,m_height);

htmlPart->setMetaRefreshEnabled(false);

+ 8
- 8
khelpcenter/DESIGN View File

@@ -220,9 +220,9 @@ regexp' or 'Search case sensitive'.
# being represented by a checkable listview item. So, we just let the user
# enter a term, replace the \{@} placeholder in the URIs specified in the
# selected .desktop files with that term, send out a request via KIO and show
# the results in our KHTMLPart (after all KHC::View is a KHTMLPart already). A
# the results in our TDEHTMLPart (after all KHC::View is a TDEHTMLPart already). A
# problem with this: How to display the multiple HTML pages returned by the
# selected search engines? Using a QSplitter to split multiple KHTMLParts?
# selected search engines? Using a QSplitter to split multiple TDEHTMLParts?
# Hmm... just wondered... perhaps we can work around that by not showing the
# returned HTML data at all but rather use a XSLT script (that is, one XSLT
# script per web search) which transforms the returned search results into a
@@ -243,8 +243,8 @@ regexp' or 'Search case sensitive'.
# can nicely drop duplicate hits, for example, or create a list of hits in the
# sidebar (much like http://www.copernic.com does). After that, we can use
# another XSLT stylesheet to transform that cleaned XML tree into HTML which
# we then feed to our KHTMLView. Since we then have one unified output, we don't
# need to worry about having multiple KHTMLParts, and it's also nice because
# we then feed to our TDEHTMLView. Since we then have one unified output, we don't
# need to worry about having multiple TDEHTMLParts, and it's also nice because
# the user doesn't see which search engine returned which hit.

# A problem with this would be that we cannot tell how a particular search
@@ -274,7 +274,7 @@ regexp' or 'Search case sensitive'.

KHC::View
---------
KHC::View inherits KHTMLPart and does the actual job of showing some sort of
KHC::View inherits TDEHTMLPart and does the actual job of showing some sort of
document. Most importantly, it has a slot which passes it a KURL pointing to a
document to show. KHC::View will invoke kio_help if necessary (if the URL's
protocol == "help") by itself and otherwise use the plain URL.
@@ -326,7 +326,7 @@ protocol == "help") by itself and otherwise use the plain URL.
## demand.

# My perception is that filling the Navigator's listview takes a significant
# amount of time, just like setting up the KHTML view (loading the stylesheet,
# amount of time, just like setting up the TDEHTML view (loading the stylesheet,
# showing the welcome page). We could easily do taht in the background - show
# the mainwindow, then tell the TreeBuilders to start populating (using a
# QTimer with a timeout of 0, for a snappy GUI). Since they're collapsed at
@@ -409,7 +409,7 @@ protocol == "help") by itself and otherwise use the plain URL.
Font Configuration
------------------

### Many bug reports on KHelpCenter not honouring KHTML font settings,
### Many bug reports on KHelpCenter not honouring TDEHTML font settings,
### which is odd, because the stylesheet is intentionally loose,
### specifying only "sans-serif" as the font face.

@@ -423,7 +423,7 @@ Font Configuration

### Or, fix whatever is the reason KHC doesn't follow the rules. It could
### be encoding related, the help pages specify utf-8 as the encoding, and
### previous incarnations of the KHTML settings allowed fonts set on a
### previous incarnations of the TDEHTML settings allowed fonts set on a
### per-encoding basis (at which time, this was apparently working, the bug
### reports dropped off, and only returned post KDE 3.0


+ 1
- 1
khelpcenter/Makefile.am View File

@@ -13,7 +13,7 @@ khc_indexbuilder_SOURCES = khc_indexbuilder.cpp
tdeinit_LTLIBRARIES = khelpcenter.la

khelpcenter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
khelpcenter_la_LIBADD = $(LIB_KHTML)
khelpcenter_la_LIBADD = $(LIB_TDEHTML)
khelpcenter_la_SOURCES = navigator.cpp \
navigatoritem.cpp navigatorappitem.cpp view.cpp \
searchwidget.cpp searchengine.cpp \

+ 16
- 16
khelpcenter/htmlsearch/kcmhtmlsearch.cpp View File

@@ -34,7 +34,7 @@
#include "kcmhtmlsearch.moc"


KHTMLSearchConfig::KHTMLSearchConfig(TQWidget *parent, const char *name)
TDEHTMLSearchConfig::TDEHTMLSearchConfig(TQWidget *parent, const char *name)
: TDECModule(parent, name), indexProc(0)
{
TQVBoxLayout *vbox = new TQVBoxLayout(this, 5);
@@ -172,7 +172,7 @@ KHTMLSearchConfig::KHTMLSearchConfig(TQWidget *parent, const char *name)
}


void KHTMLSearchConfig::loadLanguages()
void TDEHTMLSearchConfig::loadLanguages()
{
// clear the list
language->clear();
@@ -198,26 +198,26 @@ void KHTMLSearchConfig::loadLanguages()
}


TQString KHTMLSearchConfig::quickHelp() const
TQString TDEHTMLSearchConfig::quickHelp() const
{
return i18n( "<h1>Help Index</h1> This configuration module lets you configure the ht://dig engine which can be used for fulltext search in the TDE documentation as well as other system documentation like man and info pages." );
}


void KHTMLSearchConfig::pathSelected(const TQString &)
void TDEHTMLSearchConfig::pathSelected(const TQString &)
{
checkButtons();
}


void KHTMLSearchConfig::checkButtons()
void TDEHTMLSearchConfig::checkButtons()
{

delButton->setEnabled(searchPaths->currentItem() >= 0);
}


void KHTMLSearchConfig::addClicked()
void TDEHTMLSearchConfig::addClicked()
{
TQString dir = KFileDialog::getExistingDirectory();

@@ -232,7 +232,7 @@ void KHTMLSearchConfig::addClicked()
}


void KHTMLSearchConfig::delClicked()
void TDEHTMLSearchConfig::delClicked()
{
searchPaths->removeItem(searchPaths->currentItem());
checkButtons();
@@ -240,18 +240,18 @@ void KHTMLSearchConfig::delClicked()
}


KHTMLSearchConfig::~KHTMLSearchConfig()
TDEHTMLSearchConfig::~TDEHTMLSearchConfig()
{
}


void KHTMLSearchConfig::configChanged()
void TDEHTMLSearchConfig::configChanged()
{
emit changed(true);
}


void KHTMLSearchConfig::load()
void TDEHTMLSearchConfig::load()
{
TDEConfig *config = new TDEConfig("khelpcenterrc", true);

@@ -279,7 +279,7 @@ void KHTMLSearchConfig::load()
}


void KHTMLSearchConfig::save()
void TDEHTMLSearchConfig::save()
{
TDEConfig *config= new TDEConfig("khelpcenterrc", false);

@@ -308,7 +308,7 @@ void KHTMLSearchConfig::save()
}


void KHTMLSearchConfig::defaults()
void TDEHTMLSearchConfig::defaults()
{
htdigBin->lineEdit()->setText(kapp->dirs()->findExe("htdig"));
htsearchBin->lineEdit()->setText(kapp->dirs()->findExe("htsearch"));
@@ -326,13 +326,13 @@ void KHTMLSearchConfig::defaults()
}


void KHTMLSearchConfig::urlClicked(const TQString &url)
void TDEHTMLSearchConfig::urlClicked(const TQString &url)
{
kapp->invokeBrowser(url);
}


void KHTMLSearchConfig::generateIndex()
void TDEHTMLSearchConfig::generateIndex()
{
save();

@@ -354,7 +354,7 @@ void KHTMLSearchConfig::generateIndex()
}


void KHTMLSearchConfig::indexTerminated(TDEProcess *)
void TDEHTMLSearchConfig::indexTerminated(TDEProcess *)
{
runButton->setEnabled(true);
}
@@ -365,6 +365,6 @@ extern "C"
KDE_EXPORT TDECModule *create_htmlsearch(TQWidget *parent, const char *name)
{
TDEGlobal::locale()->insertCatalogue("kcmhtmlsearch");
return new KHTMLSearchConfig(parent, name);
return new TDEHTMLSearchConfig(parent, name);
};
}

+ 3
- 3
khelpcenter/htmlsearch/kcmhtmlsearch.h View File

@@ -33,14 +33,14 @@ class TDEProcess;
class KLanguageCombo;
class KURLRequester;

class KHTMLSearchConfig : public TDECModule
class TDEHTMLSearchConfig : public TDECModule
{
Q_OBJECT

public:

KHTMLSearchConfig(TQWidget *parent = 0L, const char *name = 0L);
virtual ~KHTMLSearchConfig();
TDEHTMLSearchConfig(TQWidget *parent = 0L, const char *name = 0L);
virtual ~TDEHTMLSearchConfig();
void load();
void save();

+ 2
- 2
khelpcenter/mainwindow.cpp View File

@@ -90,7 +90,7 @@ MainWindow::MainWindow()
{
mSplitter = new TQSplitter( this );

mDoc = new View( mSplitter, 0, TQT_TQOBJECT(this), 0, KHTMLPart::DefaultGUI, actionCollection() );
mDoc = new View( mSplitter, 0, TQT_TQOBJECT(this), 0, TDEHTMLPart::DefaultGUI, actionCollection() );
connect( mDoc, TQT_SIGNAL( setWindowCaption( const TQString & ) ),
TQT_SLOT( setCaption( const TQString & ) ) );
connect( mDoc, TQT_SIGNAL( setStatusBarText( const TQString & ) ),
@@ -135,7 +135,7 @@ MainWindow::MainWindow()
TDEConfigGroupSaver groupSaver( cfg, "General" );
if ( cfg->readBoolEntry( "UseKonqSettings", true ) ) {
TDEConfig konqCfg( "konquerorrc" );
const_cast<KHTMLSettings *>( mDoc->settings() )->init( &konqCfg );
const_cast<TDEHTMLSettings *>( mDoc->settings() )->init( &konqCfg );
}
const int zoomFactor = cfg->readNumEntry( "Font zoom factor", 100 );
mDoc->setZoomFactor( zoomFactor );

+ 1
- 1
khelpcenter/mainwindow.h View File

@@ -13,7 +13,7 @@
#include "navigator.h"
#include "glossary.h"

class KHTMLPart;
class TDEHTMLPart;
class TQSplitter;

class LogDialog;

+ 1
- 1
khelpcenter/searchengine.h View File

@@ -13,7 +13,7 @@
class TQWidget;
class TDEProcess;
class TDEConfig;
class KHTMLPart;
class TDEHTMLPart;

namespace KHC {


+ 9
- 9
khelpcenter/view.cpp View File

@@ -21,8 +21,8 @@
using namespace KHC;

View::View( TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name, KHTMLPart::GUIProfile prof, KActionCollection *col )
: KHTMLPart( parentWidget, widgetName, parent, name, prof ), mState( Docu ), mActionCollection(col)
TQObject *parent, const char *name, TDEHTMLPart::GUIProfile prof, KActionCollection *col )
: TDEHTMLPart( parentWidget, widgetName, parent, name, prof ), mState( Docu ), mActionCollection(col)
{
setJScriptEnabled(false);
setJavaEnabled(false);
@@ -73,21 +73,21 @@ bool View::openURL( const KURL &url )
return true;
}
mState = Docu;
return KHTMLPart::openURL( url );
return TDEHTMLPart::openURL( url );
}

void View::saveState( TQDataStream &stream )
{
stream << mState;
if ( mState == Docu )
KHTMLPart::saveState( stream );
TDEHTMLPart::saveState( stream );
}

void View::restoreState( TQDataStream &stream )
{
stream >> mState;
if ( mState == Docu )
KHTMLPart::restoreState( stream );
TDEHTMLPart::restoreState( stream );
else if ( mState == About )
showAboutPage();
}
@@ -327,13 +327,13 @@ bool View::eventFilter( TQObject *o, TQEvent *e )
{
if ( e->type() != TQEvent::KeyPress ||
htmlDocument().links().length() == 0 )
return KHTMLPart::eventFilter( o, e );
return TDEHTMLPart::eventFilter( o, e );

TQKeyEvent *ke = TQT_TQKEYEVENT( e );
if ( ke->state() & TQt::ShiftButton && ke->key() == Key_Space ) {
// If we're on the first page, it does not make sense to go back.
if ( baseURL().path().endsWith( "/index.html" ) )
return KHTMLPart::eventFilter( o, e );
return TDEHTMLPart::eventFilter( o, e );

const TQScrollBar * const scrollBar = view()->verticalScrollBar();
if ( scrollBar->value() == scrollBar->minValue() ) {
@@ -347,7 +347,7 @@ bool View::eventFilter( TQObject *o, TQEvent *e )
return true;
}
}
return KHTMLPart::eventFilter( o, e );
return TDEHTMLPart::eventFilter( o, e );
}

KURL View::urlFromLinkNode( const DOM::Node &n ) const
@@ -374,7 +374,7 @@ KURL View::urlFromLinkNode( const DOM::Node &n ) const

void View::slotReload( const KURL &url )
{
const_cast<KHTMLSettings *>( settings() )->init( kapp->config() );
const_cast<TDEHTMLSettings *>( settings() )->init( kapp->config() );
KParts::URLArgs args = browserExtension()->urlArgs();
args.reload = true;
browserExtension()->setURLArgs( args );

+ 2
- 2
khelpcenter/view.h View File

@@ -16,12 +16,12 @@ namespace KHC {

class Formatter;

class View : public KHTMLPart
class View : public TDEHTMLPart
{
Q_OBJECT
public:
View( TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name, KHTMLPart::GUIProfile prof,
TQObject *parent, const char *name, TDEHTMLPart::GUIProfile prof,
KActionCollection *col );

~View();

+ 2
- 2
konqueror/DESIGN View File

@@ -19,7 +19,7 @@ at once, possibly using several modes. Each view is a KonqView.
The KonqView contains the child part, which can be :
- an icon view (KonqIconView)
- a list view / tree view (KonqListView/KonqTreeView)
- an HTML view (KHTMLPart)
- an HTML view (TDEHTMLPart)
- any other ReadOnlyPart with or without Browserextension

Where to find those classes
@@ -88,7 +88,7 @@ From the tdehtml side:
* Site with no frames: no problem, it just obeys to saveState/restoreState.

* Site with frames:
KHTMLPart saves the whole structure (all frames, and their URL) in the
TDEHTMLPart saves the whole structure (all frames, and their URL) in the
history buffer (saveState/restoreState).
Every time a frame changes its URL, we want a new item in the history.
But when this happens, since it's internal to tdehtml, konqueror wouldn't know

+ 1
- 1
konqueror/about/Makefile.am View File

@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = konq_aboutpage.la
INCLUDES = -I$(srcdir)/.. -I$(top_srcdir)/libkonq $(all_includes)
konq_aboutpage_la_SOURCES = konq_aboutpage.cc
konq_aboutpage_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
konq_aboutpage_la_LIBADD = $(LIB_KHTML)
konq_aboutpage_la_LIBADD = $(LIB_TDEHTML)

kde_services_DATA = konq_aboutpage.desktop
kde_servicetypes_DATA = konqaboutpage.desktop

+ 2
- 2
konqueror/about/konq_aboutpage.cc View File

@@ -429,7 +429,7 @@ TQString KonqAboutPageFactory::plugins()
KonqAboutPage::KonqAboutPage( //KonqMainWindow *
TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name )
: KHTMLPart( parentWidget, widgetName, parent, name, BrowserViewGUI )
: TDEHTMLPart( parentWidget, widgetName, parent, name, BrowserViewGUI )
{
//m_mainWindow = mainWindow;
TQTextCodec* codec = TDEGlobal::locale()->codecForEncoding();
@@ -552,7 +552,7 @@ void KonqAboutPage::urlSelected( const TQString &url, int button, int state, con
return;
}

KHTMLPart::urlSelected( url, button, state, target, _args );
TDEHTMLPart::urlSelected( url, button, state, target, _args );
}

#include "konq_aboutpage.moc"

+ 3
- 3
konqueror/about/konq_aboutpage.h View File

@@ -4,7 +4,7 @@
#include <tdeparts/factory.h>
#include <tdehtml_part.h>

class KHTMLPart;
class TDEHTMLPart;
class TDEInstance;

class KonqAboutPageFactory : public KParts::Factory
@@ -32,7 +32,7 @@ private:
static TQString *s_launch_html, *s_intro_html, *s_specs_html, *s_tips_html, *s_plugins_html;
};

class KonqAboutPage : public KHTMLPart
class KonqAboutPage : public TDEHTMLPart
{
Q_OBJECT
public:
@@ -54,7 +54,7 @@ protected:
private:
void serve( const TQString&, const TQString& );

KHTMLPart *m_doc;
TDEHTMLPart *m_doc;
//KonqMainWindow *m_mainWindow;
TQString m_htmlDoc;
TQString m_what;

+ 1
- 1
konqueror/keditbookmarks/updater.cpp View File

@@ -147,7 +147,7 @@ FavIconWebGrabber::FavIconWebGrabber(KParts::ReadOnlyPart *part, const KURL &url

// kdDebug() << "FavIconWebGrabber::FavIconWebGrabber starting TDEIO::get() " << url << endl;

// the use of KIO rather than directly using KHTML is to allow silently abort on error
// the use of KIO rather than directly using TDEHTML is to allow silently abort on error

TDEIO::Job *job = TDEIO::get(m_url, false, false);
job->addMetaData( TQString("cookies"), TQString("none") );

+ 1
- 1
konqueror/konq_mainwindow.cc View File

@@ -4815,7 +4815,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa
viewURL,
popupMenuCollection,
m_pMenuNew,
// This parent ensures that if the part destroys itself (e.g. KHTML redirection),
// This parent ensures that if the part destroys itself (e.g. TDEHTML redirection),
// it will close the popupmenu
currentView->part()->widget(),
kpf,

+ 1
- 1
konqueror/konq_viewmgr.cc View File

@@ -1460,7 +1460,7 @@ void KonqViewManager::loadItem( TDEConfig &cfg, KonqFrameContainerBase *parent,
TQString serviceType;
TQString serviceName;
if ( name == "empty" ) {
// An empty profile is an empty KHTML part. Makes all KHTML actions available, avoids crashes,
// An empty profile is an empty TDEHTML part. Makes all TDEHTML actions available, avoids crashes,
// makes it easy to DND a URL onto it, and makes it fast to load a website from there.
serviceType = "text/html";
serviceName = "html";

+ 29
- 29
konqueror/konqueror.kcfg View File

@@ -205,55 +205,55 @@

<group name="HTML Settings" >
<!-- appearance.cpp -->
<entry key="MediumFontSize" type="Int"> <!--KHTML-->
<entry key="MediumFontSize" type="Int"> <!--TDEHTML-->
<default>12</default>
<label></label>
<whatsthis></whatsthis>
<!-- checked -->
</entry>
<entry key="MinimumFontSize" type="Int"> <!--KHTML-->
<entry key="MinimumFontSize" type="Int"> <!--TDEHTML-->
<default code="true">HTML_DEFAULT_MIN_FONT_SIZE</default>
<label></label>
<whatsthis></whatsthis>
<!-- checked -->
</entry>
<entry key="Fonts" type="StringList"> <!--KHTML-->
<entry key="Fonts" type="StringList"> <!--TDEHTML-->
<label></label>
<whatsthis></whatsthis>
<!-- checked -->
</entry>
<entry key="DefaultEncoding" type="String"> <!--KHTML-->
<entry key="DefaultEncoding" type="String"> <!--TDEHTML-->
<default code="true">TQString()</default>
<label></label>
<whatsthis></whatsthis>
<!-- checked -->
</entry>
<!-- htmlopts.cpp -->
<entry key="ChangeCursor" type="Bool"> <!--KHTML-->
<entry key="ChangeCursor" type="Bool"> <!--TDEHTML-->
<default>true</default>
<label></label>
<whatsthis></whatsthis>
<!-- checked -->
</entry>
<entry name="HtmlUnderlineLinks" key="UnderlineLinks" type="Bool"> <!--KHTML-->
<entry name="HtmlUnderlineLinks" key="UnderlineLinks" type="Bool"> <!--TDEHTML-->
<default>true</default>
<label></label>
<whatsthis></whatsthis>
<!-- checked -->
</entry>
<entry key="HoverLinks" type="Bool"> <!--KHTML-->
<entry key="HoverLinks" type="Bool"> <!--TDEHTML-->
<default>true</default>
<label></label>
<whatsthis></whatsthis>
<!-- checked -->
</entry>
<entry key="AutoLoadImages" type="Bool"> <!--KHTML-->
<entry key="AutoLoadImages" type="Bool"> <!--TDEHTML-->
<default>true</default>
<label></label>
<whatsthis></whatsthis>
<!-- checked -->
</entry>
<entry key="ShowAnimations" type="String"> <!--KHTML-->
<entry key="ShowAnimations" type="String"> <!--TDEHTML-->
<label></label>
<whatsthis></whatsthis>
<!-- checked -->
@@ -264,13 +264,13 @@
<whatsthis></whatsthis>
<!-- checked -->
</entry>
<entry key="FormCompletion" type="Bool"> <!--KHTML-->
<entry key="FormCompletion" type="Bool"> <!--TDEHTML-->
<default>true</default>
<label></label>
<whatsthis></whatsthis>
<!-- checked -->
</entry>
<entry key="MaxFormCompletionItems" type="Int"> <!--KHTML-->
<entry key="MaxFormCompletionItems" type="Int"> <!--TDEHTML-->
<default>10</default>
<label></label>
<whatsthis></whatsthis>
@@ -284,18 +284,18 @@
<!-- Can't find writeEntry -->
</entry>
<!-- KDELIBS/tdehtml_part.cpp -->
<entry key="AutomaticDetectionLanguage" type="Int"> <!--KHTML-->
<entry key="AutomaticDetectionLanguage" type="Int"> <!--TDEHTML-->
<label></label>
<whatsthis></whatsthis>
</entry>
<!-- KDELIBS/tdehtml_settings.cpp -->
<entry key="EnforceDefaultCharset" type="Bool"> <!--KHTML-->
<entry key="EnforceDefaultCharset" type="Bool"> <!--TDEHTML-->
<label></label>
<whatsthis></whatsthis>
<!-- Can't find writeEntry -->
</entry>
<!-- kcmcss.cpp KDELIBS/tdehtml_settings.cpp -->
<entry key="UserStyleSheetEnabled" type="Bool"> <!--KHTML-->
<entry key="UserStyleSheetEnabled" type="Bool"> <!--TDEHTML-->
<label></label>
<whatsthis></whatsthis>
</entry>
@@ -324,13 +324,13 @@

<group name="MainView Settings" >
<!-- htmlopts.cpp -->
<entry key="OpenMiddleClick" type="Bool"> <!--KHTML-->
<entry key="OpenMiddleClick" type="Bool"> <!--TDEHTML-->
<default>true</default>
<label></label>
<whatsthis></whatsthis>
<!-- checked -->
</entry>
<entry key="BackRightClick" type="Bool"> <!--KHTML-->
<entry key="BackRightClick" type="Bool"> <!--TDEHTML-->
<default>false</default>
<label></label>
<whatsthis></whatsthis>
@@ -414,7 +414,7 @@ PATH_JAVA
<whatsthis></whatsthis>
<!-- checked -->
</entry>
<entry key="JavaDomains" type="StringList"> <!--KHTML-->
<entry key="JavaDomains" type="StringList"> <!--TDEHTML-->
<label></label>
<whatsthis></whatsthis>
<!-- checked -->
@@ -435,61 +435,61 @@ PATH_JAVA
<!-- checked -->
</entry>
<!-- jsopts.cpp -->
<entry key="ECMADomains" type="StringList"> <!--KHTML-->
<entry key="ECMADomains" type="StringList"> <!--TDEHTML-->
<default>true</default>
<label></label>
<whatsthis></whatsthis>
<!-- checked -->
</entry>
<entry key="ECMADomainSettings" type="StringList"> <!--KHTML-->
<entry key="ECMADomainSettings" type="StringList"> <!--TDEHTML-->
<label></label>
<whatsthis></whatsthis>
<!-- checked -->
</entry>
<entry key="ReportJavaScriptErrors" type="Bool"> <!--KHTML-->
<entry key="ReportJavaScriptErrors" type="Bool"> <!--TDEHTML-->
<default>false</default>
<label></label>
<whatsthis></whatsthis>
<!-- checked -->
</entry>
<entry key="EnableJavaScriptDebug" type="Bool"> <!--KHTML-->
<entry key="EnableJavaScriptDebug" type="Bool"> <!--TDEHTML-->
<default>false</default>
<label></label>
<whatsthis></whatsthis>
<!-- checked -->
</entry>
<!-- jspolicies.cpp -->
<entry key="EnableJavaScript" type="Bool"> <!--KHTML-->
<entry key="EnableJavaScript" type="Bool"> <!--TDEHTML-->
<label></label>
<whatsthis></whatsthis>
</entry>
<entry key="WindowOpenPolicy" type="UInt"> <!--KHTML-->
<entry key="WindowOpenPolicy" type="UInt"> <!--TDEHTML-->
<label></label>
<whatsthis></whatsthis>
</entry>
<entry key="WindowResizePolicy" type="UInt"> <!--KHTML-->
<entry key="WindowResizePolicy" type="UInt"> <!--TDEHTML-->
<label></label>
<whatsthis></whatsthis>
</entry>
<entry key="WindowMovePolicy" type="UInt"> <!--KHTML-->
<entry key="WindowMovePolicy" type="UInt"> <!--TDEHTML-->
<label></label>
<whatsthis></whatsthis>
</entry>
<entry key="WindowFocusPolicy" type="UInt"> <!--KHTML-->
<entry key="WindowFocusPolicy" type="UInt"> <!--TDEHTML-->
<label></label>
<whatsthis></whatsthis>
</entry>
<entry key="WindowStatusPolicy" type="UInt"> <!--KHTML-->
<entry key="WindowStatusPolicy" type="UInt"> <!--TDEHTML-->
<label></label>
<whatsthis></whatsthis>
</entry>
<!-- pluginopts.cpp -->
<entry key="EnablePlugins" type="Bool"> <!--KHTML-->
<entry key="EnablePlugins" type="Bool"> <!--TDEHTML-->
<default>true</default>
<label></label>
<whatsthis></whatsthis>
</entry>
<entry key="PluginDomains" type="StringList"> <!--KHTML-->
<entry key="PluginDomains" type="StringList"> <!--TDEHTML-->
<label></label>
<whatsthis></whatsthis>
</entry>

+ 1
- 1
konqueror/kttsplugin/Makefile.am View File

@@ -5,7 +5,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = libtdehtmlkttsdplugin.la

libtdehtmlkttsdplugin_la_SOURCES = tdehtmlkttsd.cpp
libtdehtmlkttsdplugin_la_LIBADD = $(LIB_KHTML)
libtdehtmlkttsdplugin_la_LIBADD = $(LIB_TDEHTML)
libtdehtmlkttsdplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)

pluginsdir = $(kde_datadir)/tdehtml/kpartplugins

+ 9
- 9
konqueror/kttsplugin/tdehtmlkttsd.cpp View File

@@ -33,7 +33,7 @@
#include <dcopclient.h>
#include <ktrader.h>

KHTMLPluginKTTSD::KHTMLPluginKTTSD( TQObject* parent, const char* name, const TQStringList& )
TDEHTMLPluginKTTSD::TDEHTMLPluginKTTSD( TQObject* parent, const char* name, const TQStringList& )
: Plugin( parent, name )
{
// If KTTSD is not installed, hide action.
@@ -46,17 +46,17 @@ KHTMLPluginKTTSD::KHTMLPluginKTTSD( TQObject* parent, const char* name, const TQ
actionCollection(), "tools_kttsd" );
}
else
kdDebug() << "KHTMLPLuginKTTSD::KHTMLPluginKTTSD: KTrader did not find KTTSD." << endl;
kdDebug() << "TDEHTMLPLuginKTTSD::TDEHTMLPluginKTTSD: KTrader did not find KTTSD." << endl;
}

KHTMLPluginKTTSD::~KHTMLPluginKTTSD()
TDEHTMLPluginKTTSD::~TDEHTMLPluginKTTSD()
{
}

void KHTMLPluginKTTSD::slotReadOut()
void TDEHTMLPluginKTTSD::slotReadOut()
{
// The parent is assumed to be a KHTMLPart
if ( !parent()->inherits("KHTMLPart") )
// The parent is assumed to be a TDEHTMLPart
if ( !parent()->inherits("TDEHTMLPart") )
TQMessageBox::warning( 0, i18n( "Cannot Read source" ),
i18n( "You cannot read anything except web pages with\n"
"this plugin, sorry." ));
@@ -91,7 +91,7 @@ void KHTMLPluginKTTSD::slotReadOut()
reply >> supportsXhtml;
}

KHTMLPart *part = (KHTMLPart *) parent();
TDEHTMLPart *part = (TDEHTMLPart *) parent();

TQString query;
if (supportsXhtml)
@@ -116,7 +116,7 @@ void KHTMLPluginKTTSD::slotReadOut()
else
query = part->htmlDocument().body().innerText().string();
}
// kdDebug() << "KHTMLPluginKTTSD::slotReadOut: query = " << query << endl;
// kdDebug() << "TDEHTMLPluginKTTSD::slotReadOut: query = " << query << endl;

dataBuf.at(0); // reset data
arg << query << "";
@@ -133,6 +133,6 @@ void KHTMLPluginKTTSD::slotReadOut()
}
}

K_EXPORT_COMPONENT_FACTORY( libtdehtmlkttsdplugin, KGenericFactory<KHTMLPluginKTTSD>("tdehtmlkttsd") )
K_EXPORT_COMPONENT_FACTORY( libtdehtmlkttsdplugin, KGenericFactory<TDEHTMLPluginKTTSD>("tdehtmlkttsd") )

#include "tdehtmlkttsd.moc"

+ 6
- 6
konqueror/kttsplugin/tdehtmlkttsd.h View File

@@ -14,8 +14,8 @@
***************************************************************************/


#ifndef KHTMLKTTSD_H
#define KHTMLKTTSD_H
#ifndef TDEHTMLKTTSD_H
#define TDEHTMLKTTSD_H

#include <tdeparts/plugin.h>

@@ -23,9 +23,9 @@ class KURL;
class TDEInstance;

/**
* KHTML KParts Plugin
* TDEHTML KParts Plugin
*/
class KHTMLPluginKTTSD : public KParts::Plugin
class TDEHTMLPluginKTTSD : public KParts::Plugin
{
Q_OBJECT
public:
@@ -33,12 +33,12 @@ public:
/**
* Construct a new KParts plugin.
*/
KHTMLPluginKTTSD( TQObject* parent, const char* name, const TQStringList& );
TDEHTMLPluginKTTSD( TQObject* parent, const char* name, const TQStringList& );

/**
* Destructor.
*/
virtual ~KHTMLPluginKTTSD();
virtual ~TDEHTMLPluginKTTSD();
public slots:
void slotReadOut();
};

+ 1
- 1
konqueror/sidebar/web_module/Makefile.am View File

@@ -6,7 +6,7 @@ METASOURCES = AUTO

konqsidebar_web_la_SOURCES = web_module.cpp
konqsidebar_web_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
konqsidebar_web_la_LIBADD = $(LIB_KPARTS) $(LIB_KHTML) ../libkonqsidebarplugin.la ../../../libkonq/libkonq.la
konqsidebar_web_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEHTML) ../libkonqsidebarplugin.la ../../../libkonq/libkonq.la

#plugindir=$(kde_datadir)/konqsidebartng/entries
#plugin_DATA=websidebar.desktop

+ 3
- 3
konqueror/sidebar/web_module/TODO View File

@@ -1,6 +1,6 @@
- Apparently _content works everywhere in Mozilla. Maybe this should go into
KHTMLPart afterall. That would solve the form post problem too.
TDEHTMLPart afterall. That would solve the form post problem too.
- Forms don't work. I don't know if they will for a long time since we can't
really filter them with KHTML.
really filter them with TDEHTML.
- Allow setting the useragent (only do this in a clean fashion!!)
- Double check the KHTML extensions for security implications.
- Double check the TDEHTML extensions for security implications.

+ 1
- 1
konqueror/sidebar/web_module/web_module.cpp View File

@@ -35,7 +35,7 @@
KonqSideBarWebModule::KonqSideBarWebModule(TDEInstance *instance, TQObject *parent, TQWidget *widgetParent, TQString &desktopName, const char* name)
: KonqSidebarPlugin(instance, parent, widgetParent, desktopName, name)
{
_htmlPart = new KHTMLSideBar(universalMode());
_htmlPart = new TDEHTMLSideBar(universalMode());
connect(_htmlPart, TQT_SIGNAL(reload()), this, TQT_SLOT(reload()));
connect(_htmlPart, TQT_SIGNAL(completed()), this, TQT_SLOT(pageLoaded()));
connect(_htmlPart,

+ 9
- 9
konqueror/sidebar/web_module/web_module.h View File

@@ -28,18 +28,18 @@
#include <tqobject.h>


// A wrapper for KHTMLPart to make it behave the way we want it to.
class KHTMLSideBar : public KHTMLPart
// A wrapper for TDEHTMLPart to make it behave the way we want it to.
class TDEHTMLSideBar : public TDEHTMLPart
{
Q_OBJECT
public:
KHTMLSideBar(bool universal) : KHTMLPart() {
TDEHTMLSideBar(bool universal) : TDEHTMLPart() {
setStatusMessagesEnabled(false);
setMetaRefreshEnabled(true);
setJavaEnabled(false);
setPluginsEnabled(false);

setFormNotification(KHTMLPart::Only);
setFormNotification(TDEHTMLPart::Only);
connect(this,
TQT_SIGNAL(formSubmitNotification(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)),
this,
@@ -69,7 +69,7 @@ class KHTMLSideBar : public KHTMLPart
TQT_SLOT(showMenu(const TQString&, const TQPoint&)));

}
virtual ~KHTMLSideBar() {}
virtual ~TDEHTMLSideBar() {}

signals:
void submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&);
@@ -102,7 +102,7 @@ class KHTMLSideBar : public KHTMLPart
openURL(completeURL(url));
return;
}
KHTMLPart::urlSelected(url,button,state,_target,args);
TDEHTMLPart::urlSelected(url,button,state,_target,args);
}

protected slots:
@@ -149,10 +149,10 @@ class KHTMLSideBar : public KHTMLPart
emit submitFormRequest(action, u, formData,
target, contentType, boundary);
} else if (t.isEmpty() || t == "_self") {
setFormNotification(KHTMLPart::NoNotification);
setFormNotification(TDEHTMLPart::NoNotification);
submitFormProxy(action, u, formData, target,
contentType, boundary);
setFormNotification(KHTMLPart::Only);
setFormNotification(TDEHTMLPart::Only);
}
}
private:
@@ -192,7 +192,7 @@ class KonqSideBarWebModule : public KonqSidebarPlugin
void reload();

private:
KHTMLSideBar *_htmlPart;
TDEHTMLSideBar *_htmlPart;
KURL _url;
int reloadTimeout;
TQString _desktopName;

+ 4
- 4
nsplugins/README View File

@@ -25,7 +25,7 @@ Parts
=====

The Netscape(R) browser plugin support consists of 3 parts:
- "PluginPart" KPart which is embedded into KHTML pages
- "PluginPart" KPart which is embedded into TDEHTML pages
(alone, it looks no different than a gray rectangle)
- "nspluginviewer", a separate application which is capable of
actually loading and playing the various Netscape(R) plugins.
@@ -144,7 +144,7 @@ Viewer
Implemented in: viewer/

The viewer is a KDE component used to embed Netscape(R) plugins
into KDE applications (such as KHTML / Konqueror). To the plugin, it
into KDE applications (such as TDEHTML / Konqueror). To the plugin, it
emulates a Netscape(R) browser, while outside - it offers a standard KParts
object.

@@ -216,7 +216,7 @@ browser plugin execution environment, it still lacks the following features:
Support for LiveConnect (for JavaScript support) requires:
- Reimplementation of Netscape's JRI functions (see sdk/jri.h)
to communicate back (via DCOP?) with the PluginPart, which'll
signal them to KHTML's KJS interpretor. KParts::BrowserExtension
signal them to TDEHTML's KJS interpretor. KParts::BrowserExtension
should be extended to support those signals. Of course, only
JRI calls in the "netscape.javascript" namespace should be handled.
- Implementation of g_NPN_GetJavaEnv and g_NPN_GetJavaPeer
@@ -224,7 +224,7 @@ browser plugin execution environment, it still lacks the following features:
- Implementing g_NPN_GetValue(NPNVjavascriptEnabledBool, ...)
(currently always returns "false").
Should involve adding a slot to KParts::BrowserExtension
and making KHTML signal it whenever JS gets enabled or disabled.
and making TDEHTML signal it whenever JS gets enabled or disabled.

LiveConnect will probably never be supported due to JRE ABI issues, and
the fact that we need to have a JRE with JNI inside the nspluginviewer.

+ 1
- 1
nsplugins/TESTCASES View File

@@ -1,7 +1,7 @@

When making changes to nsplugin.cpp or related areas, please try to test as
many, if not all of the following plugins before and after the changes. It
is also useful to test in embedded mode in KHTML, as well as with kfmclient
is also useful to test in embedded mode in TDEHTML, as well as with kfmclient
loading it into a clean konqueror pane.

LiveConnect is not particularily supported, and probably never will be. Most

+ 1
- 1
nsplugins/nspluginloader.cpp View File

@@ -75,7 +75,7 @@ void NSPluginInstance::init(const TQCString& app, const TQCString& obj)
_button = 0L;
// Protection against repeated NPSetWindow() - Flash v9,0,115,0 doesn't handle
// repeated NPSetWindow() calls properly, which happens when NSPluginInstance is first
// shown and then resized. Which is what happens with KHTML. Therefore use 'shown'
// shown and then resized. Which is what happens with TDEHTML. Therefore use 'shown'
// to detect whether the widget is shown and drop all resize events before that,
// and use 'resize_count' to wait for that one more resize to come (plus a timer
// for a possible timeout). Only then flash is actually initialized ('inited' is true).

+ 2
- 2
nsplugins/plugin_part.cpp View File

@@ -278,9 +278,9 @@ bool PluginPart::openURL(const KURL &url)

if (!name.isEmpty()) {
// hack to pass view mode from tdehtml
if ( name=="__KHTML__PLUGINEMBED" ) {
if ( name=="__TDEHTML__PLUGINEMBED" ) {
embed = true;
kdDebug(1432) << "__KHTML__PLUGINEMBED found" << endl;
kdDebug(1432) << "__TDEHTML__PLUGINEMBED found" << endl;
} else {
argn << name;
argv << value;

+ 1
- 1
nsplugins/viewer/nsplugin.cpp View File

@@ -1510,7 +1510,7 @@ DCOPRef NSPluginClass::newInstance( TQString url, TQString mimeType, TQ_INT8 emb

if (!strcasecmp(_argn[i], "WIDTH")) width = argv[i].toInt();
if (!strcasecmp(_argn[i], "HEIGHT")) height = argv[i].toInt();
if (!strcasecmp(_argn[i], "__KHTML__PLUGINBASEURL")) baseURL = _argv[i];
if (!strcasecmp(_argn[i], "__TDEHTML__PLUGINBASEURL")) baseURL = _argv[i];
kdDebug(1431) << "argn=" << _argn[i] << " argv=" << _argv[i] << endl;
}


+ 1
- 1
tdeioslave/man/kmanpart.cpp View File

@@ -70,7 +70,7 @@ TDEInstance* KManPartFactory::instance()


KManPart::KManPart( TQWidget * parent, const char * name )
: KHTMLPart( parent, name )
: TDEHTMLPart( parent, name )
,m_job(0)
{
TDEInstance * instance = new TDEInstance( "kmanpart" );

+ 2
- 2
tdeioslave/man/kmanpart.h View File

@@ -35,7 +35,7 @@ class TDEAboutData;

/**
* Man Page Viewer
* \todo: Why is it needed? Why is KHTML alone not possible?
* \todo: Why is it needed? Why is TDEHTML alone not possible?
*/
class KManPartFactory: public KParts::Factory
{
@@ -56,7 +56,7 @@ class KManPartFactory: public KParts::Factory

};

class KManPart : public KHTMLPart
class KManPart : public TDEHTMLPart
{
Q_OBJECT
public:

+ 1
- 1
tdeioslave/thumbnail/Makefile.am View File

@@ -32,7 +32,7 @@ textthumbnail_la_LIBADD = $(LIB_KIO) # for kmimetype
textthumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)

htmlthumbnail_la_SOURCES = htmlcreator.cpp
htmlthumbnail_la_LIBADD = $(LIB_KHTML)
htmlthumbnail_la_LIBADD = $(LIB_TDEHTML)
htmlthumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)

djvuthumbnail_la_SOURCES = djvucreator.cpp

+ 1
- 1
tdeioslave/thumbnail/htmlcreator.cpp View File

@@ -49,7 +49,7 @@ bool HTMLCreator::create(const TQString &path, int width, int height, TQImage &i
{
if (!m_html)
{
m_html = new KHTMLPart;
m_html = new TDEHTMLPart;
connect(m_html, TQT_SIGNAL(completed()), TQT_SLOT(slotCompleted()));
m_html->setJScriptEnabled(false);
m_html->setJavaEnabled(false);

+ 2
- 2
tdeioslave/thumbnail/htmlcreator.h View File

@@ -23,7 +23,7 @@

#include <tdeio/thumbcreator.h>

class KHTMLPart;
class TDEHTMLPart;

class HTMLCreator : public TQObject, public ThumbCreator
{
@@ -41,7 +41,7 @@ private slots:
void slotCompleted();

private:
KHTMLPart *m_html;
TDEHTMLPart *m_html;
};

#endif

Loading…
Cancel
Save