From 68c175bf64155c578223561d9c3a1ad38d9424f8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 18:13:27 -0600 Subject: Rename KHTML and kiobuffer --- kcontrol/kcontrol/Makefile.am | 2 +- kcontrol/kcontrol/aboutwidget.cpp | 2 +- kcontrol/kcontrol/aboutwidget.h | 4 +-- kcontrol/keys/Makefile.am | 2 +- kcontrol/konqhtml/javaopts.cpp | 12 +++---- kcontrol/konqhtml/jsopts.cpp | 12 +++---- kcontrol/konqhtml/jspolicies.cpp | 44 +++++++++++------------ kcontrol/konqhtml/jspolicies.h | 30 ++++++++-------- kcontrol/privacy/Makefile.am | 2 +- kcontrol/tdeio/uasproviders/ie60oncurrent.desktop | 2 +- 10 files changed, 56 insertions(+), 56 deletions(-) (limited to 'kcontrol') diff --git a/kcontrol/kcontrol/Makefile.am b/kcontrol/kcontrol/Makefile.am index 90b56fa71..9de9b6f15 100644 --- a/kcontrol/kcontrol/Makefile.am +++ b/kcontrol/kcontrol/Makefile.am @@ -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 diff --git a/kcontrol/kcontrol/aboutwidget.cpp b/kcontrol/kcontrol/aboutwidget.cpp index 54db1588c..ad2b11463 100644 --- a/kcontrol/kcontrol/aboutwidget.cpp +++ b/kcontrol/kcontrol/aboutwidget.cpp @@ -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&)), diff --git a/kcontrol/kcontrol/aboutwidget.h b/kcontrol/kcontrol/aboutwidget.h index af1dc3019..97ba32ffd 100644 --- a/kcontrol/kcontrol/aboutwidget.h +++ b/kcontrol/kcontrol/aboutwidget.h @@ -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 _moduleMap; }; diff --git a/kcontrol/keys/Makefile.am b/kcontrol/keys/Makefile.am index 0f07b43a5..a41bbaa71 100644 --- a/kcontrol/keys/Makefile.am +++ b/kcontrol/keys/Makefile.am @@ -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) diff --git a/kcontrol/konqhtml/javaopts.cpp b/kcontrol/konqhtml/javaopts.cpp index 617f79f6f..d08e0cdfc 100644 --- a/kcontrol/konqhtml/javaopts.cpp +++ b/kcontrol/konqhtml/javaopts.cpp @@ -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); } } diff --git a/kcontrol/konqhtml/jsopts.cpp b/kcontrol/konqhtml/jsopts.cpp index 18baf833f..f27cd4153 100644 --- a/kcontrol/konqhtml/jsopts.cpp +++ b/kcontrol/konqhtml/jsopts.cpp @@ -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); } } diff --git a/kcontrol/konqhtml/jspolicies.cpp b/kcontrol/konqhtml/jspolicies.cpp index 84ce7dda0..bdaa506cb 100644 --- a/kcontrol/konqhtml/jspolicies.cpp +++ b/kcontrol/konqhtml/jspolicies.cpp @@ -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 think 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 think 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 think 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 think 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++); diff --git a/kcontrol/konqhtml/jspolicies.h b/kcontrol/konqhtml/jspolicies.h index 3f434e682..3291dedab 100644 --- a/kcontrol/konqhtml/jspolicies.h +++ b/kcontrol/konqhtml/jspolicies.h @@ -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 diff --git a/kcontrol/privacy/Makefile.am b/kcontrol/privacy/Makefile.am index cff96f5e7..34e55f55f 100644 --- a/kcontrol/privacy/Makefile.am +++ b/kcontrol/privacy/Makefile.am @@ -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 diff --git a/kcontrol/tdeio/uasproviders/ie60oncurrent.desktop b/kcontrol/tdeio/uasproviders/ie60oncurrent.desktop index 09abff044..c2cb98dce 100644 --- a/kcontrol/tdeio/uasproviders/ie60oncurrent.desktop +++ b/kcontrol/tdeio/uasproviders/ie60oncurrent.desktop @@ -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 -- cgit v1.2.1