Browse Source

Rename KHTML and kiobuffer

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>
206 206
 <listitem><para>Click on the
207 207
 <guilabel>Embedding</guilabel> tab. Make sure that <guilabel>Left Click
208 208
 Action</guilabel> is set to <guilabel>Show file in embedded
209
-viewer</guilabel>, and that <guilabel>KHTML (tdehtml)</guilabel> is at the top
209
+viewer</guilabel>, and that <guilabel>TDEHTML (tdehtml)</guilabel> is at the top
210 210
 of <guilabel>Services Preference Order</guilabel>.</para></listitem>
211 211
 </orderedlist>
212 212
 </para>

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

@@ -32,7 +32,7 @@ kcontrol_la_SOURCES = main.cpp toplevel.cpp indexwidget.cpp \
32 32
 	moduleIface.cpp moduleIface.skel global.cpp modules.cpp \
33 33
 	proxywidget.cpp kcrootonly.cpp searchwidget.cpp
34 34
 
35
-kcontrol_la_LIBADD  = $(LIB_TDEUI) $(LIB_KUTILS) $(LIB_KHTML)
35
+kcontrol_la_LIBADD  = $(LIB_TDEUI) $(LIB_KUTILS) $(LIB_TDEHTML)
36 36
 kcontrol_la_LDFLAGS = $(all_libraries) -module -avoid-version
37 37
 
38 38
 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
81 81
 
82 82
     // set qwhatsthis help
83 83
     TQWhatsThis::add(this, i18n(intro_text));
84
-    _viewer = new KHTMLPart( this, "_viewer" );
84
+    _viewer = new TDEHTMLPart( this, "_viewer" );
85 85
     _viewer->widget()->setSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored );
86 86
     connect( _viewer->browserExtension(),
87 87
              TQT_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)),

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

@@ -28,7 +28,7 @@ class TDECModuleInfo;
28 28
 class TQPixmap;
29 29
 class KPixmap;
30 30
 class ConfigModule;
31
-class KHTMLPart;
31
+class TDEHTMLPart;
32 32
 class KURL;
33 33
 
34 34
 class AboutWidget : public TQHBox
@@ -61,7 +61,7 @@ private:
61 61
     TQListViewItem* _category;
62 62
     TQString _icon;
63 63
     TQString _caption;
64
-    KHTMLPart *_viewer;
64
+    TDEHTMLPart *_viewer;
65 65
     TQMap<TQString,ConfigModule*> _moduleMap;
66 66
 };
67 67
 

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

@@ -1,7 +1,7 @@
1 1
 kde_module_LTLIBRARIES = kcm_keys.la
2 2
 
3 3
 kcm_keys_la_SOURCES =  shortcuts.cpp modifiers.cpp main.cpp khotkeys.cpp treeview.cpp commandShortcuts.cpp
4
-kcm_keys_la_LIBADD   = -ltdeui -lkio
4
+kcm_keys_la_LIBADD   = -ltdeui -ltdeio
5 5
 kcm_keys_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
6 6
 
7 7
 AM_CPPFLAGS= $(all_includes)

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

@@ -296,14 +296,14 @@ void JavaDomainListView::updateDomainListLegacy(const TQStringList &domainConfig
296 296
           it != domainConfig.end(); ++it)
297 297
     {
298 298
         TQString domain;
299
-        KHTMLSettings::KJavaScriptAdvice javaAdvice;
300
-        KHTMLSettings::KJavaScriptAdvice javaScriptAdvice;
301
-        KHTMLSettings::splitDomainAdvice(*it, domain, javaAdvice, javaScriptAdvice);
302
-	if (javaAdvice != KHTMLSettings::KJavaScriptDunno) {
299
+        TDEHTMLSettings::KJavaScriptAdvice javaAdvice;
300
+        TDEHTMLSettings::KJavaScriptAdvice javaScriptAdvice;
301
+        TDEHTMLSettings::splitDomainAdvice(*it, domain, javaAdvice, javaScriptAdvice);
302
+	if (javaAdvice != TDEHTMLSettings::KJavaScriptDunno) {
303 303
           TQListViewItem* index = new TQListViewItem( domainSpecificLV, domain,
304
-                                                  i18n(KHTMLSettings::adviceToStr(javaAdvice))  );
304
+                                                  i18n(TDEHTMLSettings::adviceToStr(javaAdvice))  );
305 305
           pol.setDomain(domain);
306
-          pol.setFeatureEnabled(javaAdvice != KHTMLSettings::KJavaScriptReject);
306
+          pol.setFeatureEnabled(javaAdvice != TDEHTMLSettings::KJavaScriptReject);
307 307
           domainPolicies[index] = new JavaPolicies(pol);
308 308
 	}
309 309
     }

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

@@ -182,16 +182,16 @@ void JSDomainListView::updateDomainListLegacy(const TQStringList &domainConfig)
182 182
     for (TQStringList::ConstIterator it = domainConfig.begin();
183 183
          it != domainConfig.end(); ++it) {
184 184
       TQString domain;
185
-      KHTMLSettings::KJavaScriptAdvice javaAdvice;
186
-      KHTMLSettings::KJavaScriptAdvice javaScriptAdvice;
187
-      KHTMLSettings::splitDomainAdvice(*it, domain, javaAdvice, javaScriptAdvice);
188
-      if (javaScriptAdvice != KHTMLSettings::KJavaScriptDunno) {
185
+      TDEHTMLSettings::KJavaScriptAdvice javaAdvice;
186
+      TDEHTMLSettings::KJavaScriptAdvice javaScriptAdvice;
187
+      TDEHTMLSettings::splitDomainAdvice(*it, domain, javaAdvice, javaScriptAdvice);
188
+      if (javaScriptAdvice != TDEHTMLSettings::KJavaScriptDunno) {
189 189
         TQListViewItem *index =
190 190
           new TQListViewItem( domainSpecificLV, domain,
191
-                i18n(KHTMLSettings::adviceToStr(javaScriptAdvice)) );
191
+                i18n(TDEHTMLSettings::adviceToStr(javaScriptAdvice)) );
192 192
 
193 193
         pol.setDomain(domain);
194
-        pol.setFeatureEnabled(javaScriptAdvice != KHTMLSettings::KJavaScriptReject);
194
+        pol.setFeatureEnabled(javaScriptAdvice != TDEHTMLSettings::KJavaScriptReject);
195 195
         domainPolicies[index] = new JSPolicies(pol);
196 196
       }
197 197
     }

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

@@ -54,23 +54,23 @@ void JSPolicies::load() {
54 54
 //  enableDebugOutputCB->setChecked( m_pConfig->readBoolEntry("EnableJSDebugOutput") );
55 55
   key = prefix + "WindowOpenPolicy";
56 56
   window_open = config->readUnsignedNumEntry(key,
57
-  	is_global ? KHTMLSettings::KJSWindowOpenSmart : INHERIT_POLICY);
57
+  	is_global ? TDEHTMLSettings::KJSWindowOpenSmart : INHERIT_POLICY);
58 58
 
59 59
   key = prefix + "WindowResizePolicy";
60 60
   window_resize = config->readUnsignedNumEntry(key,
61
-  	is_global ? KHTMLSettings::KJSWindowResizeAllow : INHERIT_POLICY);
61
+  	is_global ? TDEHTMLSettings::KJSWindowResizeAllow : INHERIT_POLICY);
62 62
 
63 63
   key = prefix + "WindowMovePolicy";
64 64
   window_move = config->readUnsignedNumEntry(key,
65
-  	is_global ? KHTMLSettings::KJSWindowMoveAllow : INHERIT_POLICY);
65
+  	is_global ? TDEHTMLSettings::KJSWindowMoveAllow : INHERIT_POLICY);
66 66
 
67 67
   key = prefix + "WindowFocusPolicy";
68 68
   window_focus = config->readUnsignedNumEntry(key,
69
-  	is_global ? KHTMLSettings::KJSWindowFocusAllow : INHERIT_POLICY);
69
+  	is_global ? TDEHTMLSettings::KJSWindowFocusAllow : INHERIT_POLICY);
70 70
 
71 71
   key = prefix + "WindowStatusPolicy";
72 72
   window_status = config->readUnsignedNumEntry(key,
73
-  	is_global ? KHTMLSettings::KJSWindowStatusAllow : INHERIT_POLICY);
73
+  	is_global ? TDEHTMLSettings::KJSWindowStatusAllow : INHERIT_POLICY);
74 74
 }
75 75
 
76 76
 void JSPolicies::defaults() {
@@ -79,11 +79,11 @@ void JSPolicies::defaults() {
79 79
 //  enableJavaScriptDebugCB->setChecked( false );
80 80
 //  js_popup->setButton(0);
81 81
  // enableDebugOutputCB->setChecked( false );
82
-  window_open = is_global ? KHTMLSettings::KJSWindowOpenSmart : INHERIT_POLICY;
83
-  window_resize = is_global ? KHTMLSettings::KJSWindowResizeAllow : INHERIT_POLICY;
84
-  window_move = is_global ? KHTMLSettings::KJSWindowMoveAllow : INHERIT_POLICY;
85
-  window_focus = is_global ? KHTMLSettings::KJSWindowFocusAllow : INHERIT_POLICY;
86
-  window_status = is_global ? KHTMLSettings::KJSWindowStatusAllow : INHERIT_POLICY;
82
+  window_open = is_global ? TDEHTMLSettings::KJSWindowOpenSmart : INHERIT_POLICY;
83
+  window_resize = is_global ? TDEHTMLSettings::KJSWindowResizeAllow : INHERIT_POLICY;
84
+  window_move = is_global ? TDEHTMLSettings::KJSWindowMoveAllow : INHERIT_POLICY;
85
+  window_focus = is_global ? TDEHTMLSettings::KJSWindowFocusAllow : INHERIT_POLICY;
86
+  window_status = is_global ? TDEHTMLSettings::KJSWindowStatusAllow : INHERIT_POLICY;
87 87
 }
88 88
 
89 89
 void JSPolicies::save() {
@@ -163,19 +163,19 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
163 163
 
164 164
   policy_btn = new TQRadioButton(i18n("Allow"), this);
165 165
   TQWhatsThis::add(policy_btn,i18n("Accept all popup window requests."));
166
-  js_popup->insert(policy_btn,KHTMLSettings::KJSWindowOpenAllow);
166
+  js_popup->insert(policy_btn,TDEHTMLSettings::KJSWindowOpenAllow);
167 167
   this_layout->addWidget(policy_btn,0,colIdx++);
168 168
   this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
169 169
 
170 170
   policy_btn = new TQRadioButton(i18n("Ask"), this);
171 171
   TQWhatsThis::add(policy_btn,i18n("Prompt every time a popup window is requested."));
172
-  js_popup->insert(policy_btn,KHTMLSettings::KJSWindowOpenAsk);
172
+  js_popup->insert(policy_btn,TDEHTMLSettings::KJSWindowOpenAsk);
173 173
   this_layout->addWidget(policy_btn,0,colIdx++);
174 174
   this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
175 175
 
176 176
   policy_btn = new TQRadioButton(i18n("Deny"), this);
177 177
   TQWhatsThis::add(policy_btn,i18n("Reject all popup window requests."));
178
-  js_popup->insert(policy_btn,KHTMLSettings::KJSWindowOpenDeny);
178
+  js_popup->insert(policy_btn,TDEHTMLSettings::KJSWindowOpenDeny);
179 179
   this_layout->addWidget(policy_btn,0,colIdx++);
180 180
   this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
181 181
 
@@ -183,7 +183,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
183 183
   TQWhatsThis::add(policy_btn, i18n("Accept popup window requests only when "
184 184
                                    "links are activated through an explicit "
185 185
                                    "mouse click or keyboard operation."));
186
-  js_popup->insert(policy_btn,KHTMLSettings::KJSWindowOpenSmart);
186
+  js_popup->insert(policy_btn,TDEHTMLSettings::KJSWindowOpenSmart);
187 187
   this_layout->addWidget(policy_btn,0,colIdx++);
188 188
   this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
189 189
 
@@ -218,7 +218,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
218 218
 
219 219
   policy_btn = new TQRadioButton(i18n("Allow"), this);
220 220
   TQWhatsThis::add(policy_btn,i18n("Allow scripts to change the window size."));
221
-  js_resize->insert(policy_btn,KHTMLSettings::KJSWindowResizeAllow);
221
+  js_resize->insert(policy_btn,TDEHTMLSettings::KJSWindowResizeAllow);
222 222
   this_layout->addWidget(policy_btn,1,colIdx++);
223 223
   this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
224 224
 
@@ -226,7 +226,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
226 226
   TQWhatsThis::add( policy_btn,i18n("Ignore attempts of scripts to change the window size. "
227 227
   				"The web page will <i>think</i> it changed the "
228 228
 				"size but the actual window is not affected."));
229
-  js_resize->insert(policy_btn,KHTMLSettings::KJSWindowResizeIgnore);
229
+  js_resize->insert(policy_btn,TDEHTMLSettings::KJSWindowResizeIgnore);
230 230
   this_layout->addWidget(policy_btn,1,colIdx++);
231 231
   this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
232 232
 
@@ -256,7 +256,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
256 256
 
257 257
   policy_btn = new TQRadioButton(i18n("Allow"), this);
258 258
   TQWhatsThis::add(policy_btn,i18n("Allow scripts to change the window position."));
259
-  js_move->insert(policy_btn,KHTMLSettings::KJSWindowMoveAllow);
259
+  js_move->insert(policy_btn,TDEHTMLSettings::KJSWindowMoveAllow);
260 260
   this_layout->addWidget(policy_btn,2,colIdx++);
261 261
   this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
262 262
 
@@ -264,7 +264,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
264 264
   TQWhatsThis::add(policy_btn,i18n("Ignore attempts of scripts to change the window position. "
265 265
   				"The web page will <i>think</i> it moved the "
266 266
 				"window but the actual position is not affected."));
267
-  js_move->insert(policy_btn,KHTMLSettings::KJSWindowMoveIgnore);
267
+  js_move->insert(policy_btn,TDEHTMLSettings::KJSWindowMoveIgnore);
268 268
   this_layout->addWidget(policy_btn,2,colIdx++);
269 269
   this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
270 270
 
@@ -294,7 +294,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
294 294
 
295 295
   policy_btn = new TQRadioButton(i18n("Allow"), this);
296 296
   TQWhatsThis::add( policy_btn,i18n("Allow scripts to focus the window.") );
297
-  js_focus->insert(policy_btn,KHTMLSettings::KJSWindowFocusAllow);
297
+  js_focus->insert(policy_btn,TDEHTMLSettings::KJSWindowFocusAllow);
298 298
   this_layout->addWidget(policy_btn,3,colIdx++);
299 299
   this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
300 300
 
@@ -303,7 +303,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
303 303
   				"The web page will <i>think</i> it brought "
304 304
 				"the focus to the window but the actual "
305 305
 				"focus will remain unchanged.") );
306
-  js_focus->insert(policy_btn,KHTMLSettings::KJSWindowFocusIgnore);
306
+  js_focus->insert(policy_btn,TDEHTMLSettings::KJSWindowFocusIgnore);
307 307
   this_layout->addWidget(policy_btn,3,colIdx++);
308 308
   this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
309 309
 
@@ -335,7 +335,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
335 335
 
336 336
   policy_btn = new TQRadioButton(i18n("Allow"), this);
337 337
   TQWhatsThis::add(policy_btn,i18n("Allow scripts to change the text of the status bar."));
338
-  js_statusbar->insert(policy_btn,KHTMLSettings::KJSWindowStatusAllow);
338
+  js_statusbar->insert(policy_btn,TDEHTMLSettings::KJSWindowStatusAllow);
339 339
   this_layout->addWidget(policy_btn,4,colIdx++);
340 340
   this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
341 341
 
@@ -344,7 +344,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
344 344
   				"The web page will <i>think</i> it changed "
345 345
 				"the text but the actual text will remain "
346 346
 				"unchanged.") );
347
-  js_statusbar->insert(policy_btn,KHTMLSettings::KJSWindowStatusIgnore);
347
+  js_statusbar->insert(policy_btn,TDEHTMLSettings::KJSWindowStatusIgnore);
348 348
   this_layout->addWidget(policy_btn,4,colIdx++);
349 349
   this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
350 350
 

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

@@ -88,8 +88,8 @@ public:
88 88
    * This will return an illegal value if isWindowOpenPolicyInherited is
89 89
    * true.
90 90
    */
91
-  KHTMLSettings::KJSWindowOpenPolicy windowOpenPolicy() const {
92
-    return (KHTMLSettings::KJSWindowOpenPolicy)window_open;
91
+  TDEHTMLSettings::KJSWindowOpenPolicy windowOpenPolicy() const {
92
+    return (TDEHTMLSettings::KJSWindowOpenPolicy)window_open;
93 93
   }
94 94
 
95 95
   /**
@@ -104,8 +104,8 @@ public:
104 104
    * This will return an illegal value if isWindowResizePolicyInherited is
105 105
    * true.
106 106
    */
107
-  KHTMLSettings::KJSWindowResizePolicy windowResizePolicy() const {
108
-    return (KHTMLSettings::KJSWindowResizePolicy)window_resize;
107
+  TDEHTMLSettings::KJSWindowResizePolicy windowResizePolicy() const {
108
+    return (TDEHTMLSettings::KJSWindowResizePolicy)window_resize;
109 109
   }
110 110
 
111 111
   /**
@@ -120,8 +120,8 @@ public:
120 120
    * This will return an illegal value if isWindowMovePolicyInherited is
121 121
    * true.
122 122
    */
123
-  KHTMLSettings::KJSWindowMovePolicy windowMovePolicy() const {
124
-    return (KHTMLSettings::KJSWindowMovePolicy)window_move;
123
+  TDEHTMLSettings::KJSWindowMovePolicy windowMovePolicy() const {
124
+    return (TDEHTMLSettings::KJSWindowMovePolicy)window_move;
125 125
   }
126 126
 
127 127
   /**
@@ -136,8 +136,8 @@ public:
136 136
    * This will return an illegal value if isWindowFocusPolicyInherited is
137 137
    * true.
138 138
    */
139
-  KHTMLSettings::KJSWindowFocusPolicy windowFocusPolicy() const {
140
-    return (KHTMLSettings::KJSWindowFocusPolicy)window_focus;
139
+  TDEHTMLSettings::KJSWindowFocusPolicy windowFocusPolicy() const {
140
+    return (TDEHTMLSettings::KJSWindowFocusPolicy)window_focus;
141 141
   }
142 142
 
143 143
   /**
@@ -152,8 +152,8 @@ public:
152 152
    * This will return an illegal value if isWindowStatusPolicyInherited is
153 153
    * true.
154 154
    */
155
-  KHTMLSettings::KJSWindowStatusPolicy windowStatusPolicy() const {
156
-    return (KHTMLSettings::KJSWindowStatusPolicy)window_status;
155
+  TDEHTMLSettings::KJSWindowStatusPolicy windowStatusPolicy() const {
156
+    return (TDEHTMLSettings::KJSWindowStatusPolicy)window_status;
157 157
   }
158 158
 
159 159
   /**
@@ -170,15 +170,15 @@ public:
170 170
   virtual void defaults();
171 171
 
172 172
 private:
173
-  // one of KHTMLSettings::KJSWindowOpenPolicy or INHERIT_POLICY
173
+  // one of TDEHTMLSettings::KJSWindowOpenPolicy or INHERIT_POLICY
174 174
   unsigned int window_open;
175
-  // one of KHTMLSettings::KJSWindowResizePolicy or INHERIT_POLICY
175
+  // one of TDEHTMLSettings::KJSWindowResizePolicy or INHERIT_POLICY
176 176
   unsigned int window_resize;
177
-  // one of KHTMLSettings::KJSWindowMovePolicy or INHERIT_POLICY
177
+  // one of TDEHTMLSettings::KJSWindowMovePolicy or INHERIT_POLICY
178 178
   unsigned int window_move;
179
-  // one of KHTMLSettings::KJSWindowFocusPolicy or INHERIT_POLICY
179
+  // one of TDEHTMLSettings::KJSWindowFocusPolicy or INHERIT_POLICY
180 180
   unsigned int window_focus;
181
-  // one of KHTMLSettings::KJSWindowStatusPolicy or INHERIT_POLICY
181
+  // one of TDEHTMLSettings::KJSWindowStatusPolicy or INHERIT_POLICY
182 182
   unsigned int window_status;
183 183
 
184 184
   friend class JSPoliciesFrame;	// for changing policies

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

@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kcm_privacy.la
4 4
 kcm_privacy_la_SOURCES = privacy.cpp kprivacysettings.ui kcmprivacydialog.ui kprivacymanager.cpp
5 5
 
6 6
 kcm_privacy_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
7
-kcm_privacy_la_LIBADD = $(LIB_TDEUI) -lkio
7
+kcm_privacy_la_LIBADD = $(LIB_TDEUI) -ltdeio
8 8
 
9 9
 METASOURCES = AUTO
10 10
 

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

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

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

@@ -1,6 +1,6 @@
1 1
 
2 2
 INCLUDES= $(all_includes)
3
-LDADD = $(LIB_KHTML)
3
+LDADD = $(LIB_TDEHTML)
4 4
 
5 5
 bin_PROGRAMS = 	kwebdesktop
6 6
 

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

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

+ 8
- 8
khelpcenter/DESIGN View File

@@ -220,9 +220,9 @@ regexp' or 'Search case sensitive'.
220 220
 # being represented by a checkable listview item. So, we just let the user
221 221
 # enter a term, replace the \{@} placeholder in the URIs specified in the
222 222
 # selected .desktop files with that term, send out a request via KIO and show
223
-# the results in our KHTMLPart (after all KHC::View is a KHTMLPart already). A
223
+# the results in our TDEHTMLPart (after all KHC::View is a TDEHTMLPart already). A
224 224
 # problem with this: How to display the multiple HTML pages returned by the
225
-# selected search engines? Using a QSplitter to split multiple KHTMLParts?
225
+# selected search engines? Using a QSplitter to split multiple TDEHTMLParts?
226 226
 # Hmm... just wondered... perhaps we can work around that by not showing the
227 227
 # returned HTML data at all but rather use a XSLT script (that is, one XSLT
228 228
 # script per web search) which transforms the returned search results into a
@@ -243,8 +243,8 @@ regexp' or 'Search case sensitive'.
243 243
 # can nicely drop duplicate hits, for example, or create a list of hits in the
244 244
 # sidebar (much like http://www.copernic.com does). After that, we can use
245 245
 # another XSLT stylesheet to transform that cleaned XML tree into HTML which
246
-# we then feed to our KHTMLView. Since we then have one unified output, we don't
247
-# need to worry about having multiple KHTMLParts, and it's also nice because
246
+# we then feed to our TDEHTMLView. Since we then have one unified output, we don't
247
+# need to worry about having multiple TDEHTMLParts, and it's also nice because
248 248
 # the user doesn't see which search engine returned which hit.
249 249
 
250 250
 # A problem with this would be that we cannot tell how a particular search
@@ -274,7 +274,7 @@ regexp' or 'Search case sensitive'.
274 274
 
275 275
 KHC::View
276 276
 ---------
277
-KHC::View inherits KHTMLPart and does the actual job of showing some sort of
277
+KHC::View inherits TDEHTMLPart and does the actual job of showing some sort of
278 278
 document. Most importantly, it has a slot which passes it a KURL pointing to a
279 279
 document to show. KHC::View will invoke kio_help if necessary (if the URL's
280 280
 protocol == "help") by itself and otherwise use the plain URL.
@@ -326,7 +326,7 @@ protocol == "help") by itself and otherwise use the plain URL.
326 326
 ## demand.
327 327
 
328 328
 # My perception is that filling the Navigator's listview takes a significant
329
-# amount of time, just like setting up the KHTML view (loading the stylesheet,
329
+# amount of time, just like setting up the TDEHTML view (loading the stylesheet,
330 330
 # showing the welcome page). We could easily do taht in the background - show
331 331
 # the mainwindow, then tell the TreeBuilders to start populating (using a
332 332
 # 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.
409 409
 Font Configuration
410 410
 ------------------
411 411
 
412
-### Many bug reports on KHelpCenter not honouring KHTML font settings,
412
+### Many bug reports on KHelpCenter not honouring TDEHTML font settings,
413 413
 ### which is odd, because the stylesheet is intentionally loose,
414 414
 ### specifying only "sans-serif" as the font face.
415 415
 
@@ -423,7 +423,7 @@ Font Configuration
423 423
 
424 424
 ### Or, fix whatever is the reason KHC doesn't follow the rules.  It could
425 425
 ### be encoding related, the help pages specify utf-8 as the encoding, and
426
-### previous incarnations of the KHTML settings allowed fonts set on a 
426
+### previous incarnations of the TDEHTML settings allowed fonts set on a 
427 427
 ### per-encoding basis (at which time, this was apparently working, the bug 
428 428
 ### reports dropped off, and only returned post KDE 3.0
429 429
 

+ 1
- 1
khelpcenter/Makefile.am View File

@@ -13,7 +13,7 @@ khc_indexbuilder_SOURCES = khc_indexbuilder.cpp
13 13
 tdeinit_LTLIBRARIES = khelpcenter.la
14 14
 
15 15
 khelpcenter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
16
-khelpcenter_la_LIBADD = $(LIB_KHTML)
16
+khelpcenter_la_LIBADD = $(LIB_TDEHTML)
17 17
 khelpcenter_la_SOURCES = navigator.cpp \
18 18
 	navigatoritem.cpp navigatorappitem.cpp view.cpp \
19 19
 	searchwidget.cpp searchengine.cpp \

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

@@ -34,7 +34,7 @@
34 34
 #include "kcmhtmlsearch.moc"
35 35
 
36 36
 
37
-KHTMLSearchConfig::KHTMLSearchConfig(TQWidget *parent, const char *name)
37
+TDEHTMLSearchConfig::TDEHTMLSearchConfig(TQWidget *parent, const char *name)
38 38
   : TDECModule(parent, name), indexProc(0)
39 39
 {
40 40
   TQVBoxLayout *vbox = new TQVBoxLayout(this, 5);
@@ -172,7 +172,7 @@ KHTMLSearchConfig::KHTMLSearchConfig(TQWidget *parent, const char *name)
172 172
 }
173 173
 
174 174
 
175
-void KHTMLSearchConfig::loadLanguages()
175
+void TDEHTMLSearchConfig::loadLanguages()
176 176
 {
177 177
   // clear the list
178 178
   language->clear();
@@ -198,26 +198,26 @@ void KHTMLSearchConfig::loadLanguages()
198 198
 }
199 199
 
200 200
 
201
-TQString KHTMLSearchConfig::quickHelp() const
201
+TQString TDEHTMLSearchConfig::quickHelp() const
202 202
 {
203 203
     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." );
204 204
 }
205 205
 
206 206
 
207
-void KHTMLSearchConfig::pathSelected(const TQString &)
207
+void TDEHTMLSearchConfig::pathSelected(const TQString &)
208 208
 {
209 209
   checkButtons();
210 210
 }
211 211
 
212 212
 
213
-void KHTMLSearchConfig::checkButtons()
213
+void TDEHTMLSearchConfig::checkButtons()
214 214
 {
215 215
 
216 216
   delButton->setEnabled(searchPaths->currentItem() >= 0);
217 217
 }
218 218
 
219 219
 
220
-void KHTMLSearchConfig::addClicked()
220
+void TDEHTMLSearchConfig::addClicked()
221 221
 {
222 222
   TQString dir = KFileDialog::getExistingDirectory();
223 223
 
@@ -232,7 +232,7 @@ void KHTMLSearchConfig::addClicked()
232 232
 }
233 233
 
234 234
 
235
-void KHTMLSearchConfig::delClicked()
235
+void TDEHTMLSearchConfig::delClicked()
236 236
 {
237 237
   searchPaths->removeItem(searchPaths->currentItem());
238 238
   checkButtons();
@@ -240,18 +240,18 @@ void KHTMLSearchConfig::delClicked()
240 240
 }
241 241
 
242 242
 
243
-KHTMLSearchConfig::~KHTMLSearchConfig()
243
+TDEHTMLSearchConfig::~TDEHTMLSearchConfig()
244 244
 {
245 245
 }
246 246
 
247 247
 
248
-void KHTMLSearchConfig::configChanged()
248
+void TDEHTMLSearchConfig::configChanged()
249 249
 {
250 250
   emit changed(true);
251 251
 }
252 252
 
253 253
 
254
-void KHTMLSearchConfig::load()
254
+void TDEHTMLSearchConfig::load()
255 255
 {
256 256
   TDEConfig *config = new TDEConfig("khelpcenterrc", true);
257 257
 
@@ -279,7 +279,7 @@ void KHTMLSearchConfig::load()
279 279
 }
280 280
 
281 281
 
282
-void KHTMLSearchConfig::save()
282
+void TDEHTMLSearchConfig::save()
283 283
 {
284 284
   TDEConfig *config= new TDEConfig("khelpcenterrc", false);
285 285
 
@@ -308,7 +308,7 @@ void KHTMLSearchConfig::save()
308 308
 }
309 309
 
310 310
 
311
-void KHTMLSearchConfig::defaults()
311
+void TDEHTMLSearchConfig::defaults()
312 312
 {
313 313
   htdigBin->lineEdit()->setText(kapp->dirs()->findExe("htdig"));
314 314
   htsearchBin->lineEdit()->setText(kapp->dirs()->findExe("htsearch"));
@@ -326,13 +326,13 @@ void KHTMLSearchConfig::defaults()
326 326
 }
327 327
 
328 328
 
329
-void KHTMLSearchConfig::urlClicked(const TQString &url)
329
+void TDEHTMLSearchConfig::urlClicked(const TQString &url)
330 330
 {
331 331
   kapp->invokeBrowser(url);
332 332
 }
333 333
 
334 334
 
335
-void KHTMLSearchConfig::generateIndex()
335
+void TDEHTMLSearchConfig::generateIndex()
336 336
 {
337 337
   save();
338 338
 
@@ -354,7 +354,7 @@ void KHTMLSearchConfig::generateIndex()
354 354
 }
355 355
 
356 356
 
357
-void KHTMLSearchConfig::indexTerminated(TDEProcess *)
357
+void TDEHTMLSearchConfig::indexTerminated(TDEProcess *)
358 358
 {
359 359
   runButton->setEnabled(true);
360 360
 }
@@ -365,6 +365,6 @@ extern "C"
365 365
   KDE_EXPORT TDECModule *create_htmlsearch(TQWidget *parent, const char *name)
366 366
   {
367 367
     TDEGlobal::locale()->insertCatalogue("kcmhtmlsearch");
368
-    return new KHTMLSearchConfig(parent, name);
368
+    return new TDEHTMLSearchConfig(parent, name);
369 369
   };
370 370
 }

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

@@ -33,14 +33,14 @@ class TDEProcess;
33 33
 class KLanguageCombo;
34 34
 class KURLRequester;
35 35
 
36
-class KHTMLSearchConfig : public TDECModule
36
+class TDEHTMLSearchConfig : public TDECModule
37 37
 {
38 38
   Q_OBJECT
39 39
 
40 40
 public:
41 41
 
42
-  KHTMLSearchConfig(TQWidget *parent = 0L, const char *name = 0L);
43
-  virtual ~KHTMLSearchConfig();
42
+  TDEHTMLSearchConfig(TQWidget *parent = 0L, const char *name = 0L);
43
+  virtual ~TDEHTMLSearchConfig();
44 44
   
45 45
   void load();
46 46
   void save();

+ 2
- 2
khelpcenter/mainwindow.cpp View File

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

+ 1
- 1
khelpcenter/mainwindow.h View File

@@ -13,7 +13,7 @@
13 13
 #include "navigator.h"
14 14
 #include "glossary.h"
15 15
 
16
-class KHTMLPart;
16
+class TDEHTMLPart;
17 17
 class TQSplitter;
18 18
 
19 19
 class LogDialog;

+ 1
- 1
khelpcenter/searchengine.h View File

@@ -13,7 +13,7 @@
13 13
 class TQWidget;
14 14
 class TDEProcess;
15 15
 class TDEConfig;
16
-class KHTMLPart;
16
+class TDEHTMLPart;
17 17
 
18 18
 namespace KHC {
19 19
 

+ 9
- 9
khelpcenter/view.cpp View File

@@ -21,8 +21,8 @@
21 21
 using namespace KHC;
22 22
 
23 23
 View::View( TQWidget *parentWidget, const char *widgetName,
24
-                  TQObject *parent, const char *name, KHTMLPart::GUIProfile prof, KActionCollection *col )
25
-    : KHTMLPart( parentWidget, widgetName, parent, name, prof ), mState( Docu ), mActionCollection(col)
24
+                  TQObject *parent, const char *name, TDEHTMLPart::GUIProfile prof, KActionCollection *col )
25
+    : TDEHTMLPart( parentWidget, widgetName, parent, name, prof ), mState( Docu ), mActionCollection(col)
26 26
 {
27 27
     setJScriptEnabled(false);
28 28
     setJavaEnabled(false);
@@ -73,21 +73,21 @@ bool View::openURL( const KURL &url )
73 73
         return true;
74 74
     }
75 75
     mState = Docu;
76
-    return KHTMLPart::openURL( url );
76
+    return TDEHTMLPart::openURL( url );
77 77
 }
78 78
 
79 79
 void View::saveState( TQDataStream &stream )
80 80
 {
81 81
     stream << mState;
82 82
     if ( mState == Docu )
83
-        KHTMLPart::saveState( stream );
83
+        TDEHTMLPart::saveState( stream );
84 84
 }
85 85
 
86 86
 void View::restoreState( TQDataStream &stream )
87 87
 {
88 88
     stream >> mState;
89 89
     if ( mState == Docu )
90
-        KHTMLPart::restoreState( stream );
90
+        TDEHTMLPart::restoreState( stream );
91 91
     else if ( mState == About )
92 92
         showAboutPage();
93 93
 }
@@ -327,13 +327,13 @@ bool View::eventFilter( TQObject *o, TQEvent *e )
327 327
 {
328 328
   if ( e->type() != TQEvent::KeyPress ||
329 329
        htmlDocument().links().length() == 0 )
330
-    return KHTMLPart::eventFilter( o, e );
330
+    return TDEHTMLPart::eventFilter( o, e );
331 331
 
332 332
   TQKeyEvent *ke = TQT_TQKEYEVENT( e );
333 333
   if ( ke->state() & TQt::ShiftButton && ke->key() == Key_Space ) {
334 334
     // If we're on the first page, it does not make sense to go back.
335 335
     if ( baseURL().path().endsWith( "/index.html" ) )
336
-      return KHTMLPart::eventFilter( o, e );
336
+      return TDEHTMLPart::eventFilter( o, e );
337 337
 
338 338
     const TQScrollBar * const scrollBar = view()->verticalScrollBar();
339 339
     if ( scrollBar->value() == scrollBar->minValue() ) {
@@ -347,7 +347,7 @@ bool View::eventFilter( TQObject *o, TQEvent *e )
347 347
         return true;
348 348
     }
349 349
   }
350
-  return KHTMLPart::eventFilter( o, e );
350
+  return TDEHTMLPart::eventFilter( o, e );
351 351
 }
352 352
 
353 353
 KURL View::urlFromLinkNode( const DOM::Node &n ) const
@@ -374,7 +374,7 @@ KURL View::urlFromLinkNode( const DOM::Node &n ) const
374 374
 
375 375
 void View::slotReload( const KURL &url )
376 376
 {
377
-  const_cast<KHTMLSettings *>( settings() )->init( kapp->config() );
377
+  const_cast<TDEHTMLSettings *>( settings() )->init( kapp->config() );
378 378
   KParts::URLArgs args = browserExtension()->urlArgs();
379 379
   args.reload = true;
380 380
   browserExtension()->setURLArgs( args );

+ 2
- 2
khelpcenter/view.h View File

@@ -16,12 +16,12 @@ namespace KHC {
16 16
 
17 17
 class Formatter;
18 18
 
19
-class View : public KHTMLPart
19
+class View : public TDEHTMLPart
20 20
 {
21 21
     Q_OBJECT
22 22
   public:
23 23
     View( TQWidget *parentWidget, const char *widgetName,
24
-          TQObject *parent, const char *name, KHTMLPart::GUIProfile prof,
24
+          TQObject *parent, const char *name, TDEHTMLPart::GUIProfile prof,
25 25
           KActionCollection *col );
26 26
 
27 27
     ~View();

+ 2
- 2
konqueror/DESIGN View File

@@ -19,7 +19,7 @@ at once, possibly using several modes. Each view is a KonqView.
19 19
 The KonqView contains the child part, which can be :
20 20
 - an icon view (KonqIconView)
21 21
 - a list view / tree view (KonqListView/KonqTreeView)
22
-- an HTML view (KHTMLPart)
22
+- an HTML view (TDEHTMLPart)
23 23
 - any other ReadOnlyPart with or without Browserextension
24 24
 
25 25
 Where to find those classes
@@ -88,7 +88,7 @@ From the tdehtml side:
88 88
 * Site with no frames: no problem, it just obeys to saveState/restoreState.
89 89
 
90 90
 * Site with frames:
91
-KHTMLPart saves the whole structure (all frames, and their URL) in the
91
+TDEHTMLPart saves the whole structure (all frames, and their URL) in the
92 92
 history buffer (saveState/restoreState).
93 93
 Every time a frame changes its URL, we want a new item in the history.
94 94
 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
3 3
 INCLUDES = -I$(srcdir)/.. -I$(top_srcdir)/libkonq $(all_includes)
4 4
 konq_aboutpage_la_SOURCES = konq_aboutpage.cc
5 5
 konq_aboutpage_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
6
-konq_aboutpage_la_LIBADD = $(LIB_KHTML)
6
+konq_aboutpage_la_LIBADD = $(LIB_TDEHTML)
7 7
 
8 8
 kde_services_DATA = konq_aboutpage.desktop
9 9
 kde_servicetypes_DATA = konqaboutpage.desktop

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

@@ -429,7 +429,7 @@ TQString KonqAboutPageFactory::plugins()
429 429
 KonqAboutPage::KonqAboutPage( //KonqMainWindow *
430 430
                               TQWidget *parentWidget, const char *widgetName,
431 431
                               TQObject *parent, const char *name )
432
-    : KHTMLPart( parentWidget, widgetName, parent, name, BrowserViewGUI )
432
+    : TDEHTMLPart( parentWidget, widgetName, parent, name, BrowserViewGUI )
433 433
 {
434 434
     //m_mainWindow = mainWindow;
435 435
     TQTextCodec* codec = TDEGlobal::locale()->codecForEncoding();
@@ -552,7 +552,7 @@ void KonqAboutPage::urlSelected( const TQString &url, int button, int state, con
552 552
 	return;
553 553
     }
554 554
 
555
-    KHTMLPart::urlSelected( url, button, state, target, _args );
555
+    TDEHTMLPart::urlSelected( url, button, state, target, _args );
556 556
 }
557 557
 
558 558
 #include "konq_aboutpage.moc"

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

@@ -4,7 +4,7 @@
4 4
 #include <tdeparts/factory.h>
5 5
 #include <tdehtml_part.h>
6 6
 
7
-class KHTMLPart;
7
+class TDEHTMLPart;
8 8
 class TDEInstance;
9 9
 
10 10
 class KonqAboutPageFactory : public KParts::Factory
@@ -32,7 +32,7 @@ private:
32 32
     static TQString *s_launch_html, *s_intro_html, *s_specs_html, *s_tips_html, *s_plugins_html;
33 33
 };
34 34
 
35
-class KonqAboutPage : public KHTMLPart
35
+class KonqAboutPage : public TDEHTMLPart
36 36
 {
37 37
     Q_OBJECT
38 38
 public:
@@ -54,7 +54,7 @@ protected:
54 54
 private:
55 55
     void serve( const TQString&, const TQString& );
56 56
 
57
-    KHTMLPart *m_doc;
57
+    TDEHTMLPart *m_doc;
58 58
     //KonqMainWindow *m_mainWindow;
59 59
     TQString m_htmlDoc;
60 60
     TQString m_what;

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

@@ -147,7 +147,7 @@ FavIconWebGrabber::FavIconWebGrabber(KParts::ReadOnlyPart *part, const KURL &url
147 147
 
148 148
     // kdDebug() << "FavIconWebGrabber::FavIconWebGrabber starting TDEIO::get() " << url << endl;
149 149
 
150
-//     the use of KIO rather than directly using KHTML is to allow silently abort on error
150
+//     the use of KIO rather than directly using TDEHTML is to allow silently abort on error
151 151
 
152 152
     TDEIO::Job *job = TDEIO::get(m_url, false, false);
153 153
     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
4815 4815
       viewURL,
4816 4816
       popupMenuCollection,
4817 4817
       m_pMenuNew,
4818
-      // This parent ensures that if the part destroys itself (e.g. KHTML redirection),
4818
+      // This parent ensures that if the part destroys itself (e.g. TDEHTML redirection),
4819 4819
       // it will close the popupmenu
4820 4820
       currentView->part()->widget(),
4821 4821
       kpf,

+ 1
- 1
konqueror/konq_viewmgr.cc View File

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

+ 29
- 29
konqueror/konqueror.kcfg View File

@@ -205,55 +205,55 @@
205 205
 
206 206
   <group name="HTML Settings" >
207 207
 <!-- appearance.cpp -->
208
-    <entry key="MediumFontSize" type="Int"> <!--KHTML-->
208
+    <entry key="MediumFontSize" type="Int"> <!--TDEHTML-->
209 209
       <default>12</default>
210 210
       <label></label>
211 211
       <whatsthis></whatsthis>
212 212
       <!-- checked -->
213 213
     </entry>
214
-    <entry key="MinimumFontSize" type="Int"> <!--KHTML-->
214
+    <entry key="MinimumFontSize" type="Int"> <!--TDEHTML-->
215 215
       <default code="true">HTML_DEFAULT_MIN_FONT_SIZE</default>
216 216
       <label></label>
217 217
       <whatsthis></whatsthis>
218 218
       <!-- checked -->
219 219
     </entry>
220
-    <entry key="Fonts" type="StringList"> <!--KHTML-->
220
+    <entry key="Fonts" type="StringList"> <!--TDEHTML-->
221 221
       <label></label>
222 222
       <whatsthis></whatsthis>
223 223
       <!-- checked -->
224 224
     </entry>
225
-    <entry key="DefaultEncoding" type="String"> <!--KHTML-->
225
+    <entry key="DefaultEncoding" type="String"> <!--TDEHTML-->
226 226
       <default code="true">TQString()</default> 
227 227
       <label></label>
228 228
       <whatsthis></whatsthis>
229 229
       <!-- checked -->
230 230
     </entry>
231 231
 <!-- htmlopts.cpp -->
232
-    <entry key="ChangeCursor" type="Bool"> <!--KHTML-->
232
+    <entry key="ChangeCursor" type="Bool"> <!--TDEHTML-->
233 233
       <default>true</default> 
234 234
       <label></label>
235 235
       <whatsthis></whatsthis>
236 236
       <!-- checked -->
237 237
     </entry>
238
-    <entry name="HtmlUnderlineLinks" key="UnderlineLinks" type="Bool"> <!--KHTML-->
238
+    <entry name="HtmlUnderlineLinks" key="UnderlineLinks" type="Bool"> <!--TDEHTML-->
239 239
       <default>true</default> 
240 240
       <label></label>
241 241
       <whatsthis></whatsthis>
242 242
       <!-- checked -->
243 243
     </entry>
244
-    <entry key="HoverLinks" type="Bool"> <!--KHTML-->
244
+    <entry key="HoverLinks" type="Bool"> <!--TDEHTML-->
245 245
       <default>true</default> 
246 246
       <label></label>
247 247
       <whatsthis></whatsthis>
248 248
       <!-- checked -->
249 249
     </entry>
250
-    <entry key="AutoLoadImages" type="Bool"> <!--KHTML-->
250
+    <entry key="AutoLoadImages" type="Bool"> <!--TDEHTML-->
251 251
       <default>true</default> 
252 252
       <label></label>
253 253
       <whatsthis></whatsthis>
254 254
       <!-- checked -->
255 255
     </entry>
256
-    <entry key="ShowAnimations" type="String"> <!--KHTML-->
256
+    <entry key="ShowAnimations" type="String"> <!--TDEHTML-->
257 257
       <label></label>
258 258
       <whatsthis></whatsthis>
259 259
       <!-- checked -->
@@ -264,13 +264,13 @@
264 264
       <whatsthis></whatsthis>
265 265
       <!-- checked -->
266 266
     </entry>
267
-    <entry key="FormCompletion" type="Bool"> <!--KHTML-->
267
+    <entry key="FormCompletion" type="Bool"> <!--TDEHTML-->
268 268
       <default>true</default> 
269 269
       <label></label>
270 270
       <whatsthis></whatsthis>
271 271
       <!-- checked -->
272 272
     </entry>
273
-    <entry key="MaxFormCompletionItems" type="Int"> <!--KHTML-->
273
+    <entry key="MaxFormCompletionItems" type="Int"> <!--TDEHTML-->
274 274
       <default>10</default> 
275 275
       <label></label>
276 276
       <whatsthis></whatsthis>
@@ -284,18 +284,18 @@
284 284
       <!-- Can't find writeEntry -->
285 285
     </entry>
286 286
 <!-- KDELIBS/tdehtml_part.cpp -->
287
-    <entry key="AutomaticDetectionLanguage" type="Int"> <!--KHTML-->
287
+    <entry key="AutomaticDetectionLanguage" type="Int"> <!--TDEHTML-->
288 288
       <label></label>
289 289
       <whatsthis></whatsthis>
290 290
     </entry>
291 291
 <!-- KDELIBS/tdehtml_settings.cpp -->
292
-    <entry key="EnforceDefaultCharset" type="Bool"> <!--KHTML-->
292
+    <entry key="EnforceDefaultCharset" type="Bool"> <!--TDEHTML-->
293 293
       <label></label>
294 294
       <whatsthis></whatsthis>
295 295
       <!-- Can't find writeEntry -->
296 296
     </entry>
297 297
 <!-- kcmcss.cpp   KDELIBS/tdehtml_settings.cpp -->
298
-    <entry key="UserStyleSheetEnabled" type="Bool"> <!--KHTML-->
298
+    <entry key="UserStyleSheetEnabled" type="Bool"> <!--TDEHTML-->
299 299
       <label></label>
300 300
       <whatsthis></whatsthis>
301 301
     </entry>
@@ -324,13 +324,13 @@
324 324
 
325 325
   <group name="MainView Settings" >
326 326
 <!-- htmlopts.cpp --> 
327
-    <entry key="OpenMiddleClick" type="Bool"> <!--KHTML-->
327
+    <entry key="OpenMiddleClick" type="Bool"> <!--TDEHTML-->
328 328
       <default>true</default> 
329 329
       <label></label>
330 330
       <whatsthis></whatsthis>
331 331
       <!-- checked -->
332 332
     </entry>
333
-    <entry key="BackRightClick" type="Bool"> <!--KHTML-->
333
+    <entry key="BackRightClick" type="Bool"> <!--TDEHTML-->
334 334
       <default>false</default> 
335 335
       <label></label>
336 336
       <whatsthis></whatsthis>
@@ -414,7 +414,7 @@ PATH_JAVA
414 414
       <whatsthis></whatsthis>
415 415
       <!-- checked -->
416 416
     </entry>
417
-    <entry key="JavaDomains" type="StringList"> <!--KHTML-->
417
+    <entry key="JavaDomains" type="StringList"> <!--TDEHTML-->
418 418
       <label></label>
419 419
       <whatsthis></whatsthis>
420 420
       <!-- checked -->
@@ -435,61 +435,61 @@ PATH_JAVA
435 435
       <!-- checked -->
436 436
     </entry>
437 437
 <!-- jsopts.cpp -->
438
-    <entry key="ECMADomains" type="StringList"> <!--KHTML-->
438
+    <entry key="ECMADomains" type="StringList"> <!--TDEHTML-->
439 439
       <default>true</default>
440 440
       <label></label>
441 441
       <whatsthis></whatsthis>
442 442
       <!-- checked -->
443 443
     </entry>
444
-    <entry key="ECMADomainSettings" type="StringList"> <!--KHTML-->
444
+    <entry key="ECMADomainSettings" type="StringList"> <!--TDEHTML-->
445 445
       <label></label>
446 446
       <whatsthis></whatsthis>
447 447
       <!-- checked -->
448 448
     </entry>
449
-    <entry key="ReportJavaScriptErrors" type="Bool"> <!--KHTML-->
449
+    <entry key="ReportJavaScriptErrors" type="Bool"> <!--TDEHTML-->
450 450
       <default>false</default> 
451 451
       <label></label>
452 452
       <whatsthis></whatsthis>
453 453
       <!-- checked -->
454 454
     </entry>
455
-    <entry key="EnableJavaScriptDebug" type="Bool"> <!--KHTML-->
455
+    <entry key="EnableJavaScriptDebug" type="Bool"> <!--TDEHTML-->
456 456
       <default>false</default> 
457 457
       <label></label>
458 458
       <whatsthis></whatsthis>
459 459
       <!-- checked -->
460 460
     </entry>
461 461
 <!-- jspolicies.cpp -->
462
-    <entry key="EnableJavaScript" type="Bool"> <!--KHTML-->
462
+    <entry key="EnableJavaScript" type="Bool"> <!--TDEHTML-->
463 463
       <label></label>
464 464
       <whatsthis></whatsthis>
465 465
     </entry>
466
-    <entry key="WindowOpenPolicy" type="UInt"> <!--KHTML-->
466
+    <entry key="WindowOpenPolicy" type="UInt"> <!--TDEHTML-->
467 467
       <label></label>
468 468
       <whatsthis></whatsthis>
469 469
     </entry>
470
-    <entry key="WindowResizePolicy" type="UInt"> <!--KHTML-->
470
+    <entry key="WindowResizePolicy" type="UInt"> <!--TDEHTML-->
471 471
       <label></label>
472 472
       <whatsthis></whatsthis>
473 473
     </entry>
474
-    <entry key="WindowMovePolicy" type="UInt"> <!--KHTML-->
474
+    <entry key="WindowMovePolicy" type="UInt"> <!--TDEHTML-->
475 475
       <label></label>
476 476
       <whatsthis></whatsthis>
477 477
     </entry>
478
-    <entry key="WindowFocusPolicy" type="UInt"> <!--KHTML-->
478
+    <entry key="WindowFocusPolicy" type="UInt"> <!--TDEHTML-->
479 479
       <label></label>
480 480
       <whatsthis></whatsthis>
481 481
     </entry>
482
-    <entry key="WindowStatusPolicy" type="UInt"> <!--KHTML-->
482
+    <entry key="WindowStatusPolicy" type="UInt"> <!--TDEHTML-->
483 483
       <label></label>
484 484
       <whatsthis></whatsthis>
485 485
     </entry>
486 486
 <!-- pluginopts.cpp -->    
487
-    <entry key="EnablePlugins" type="Bool"> <!--KHTML-->
487
+    <entry key="EnablePlugins" type="Bool"> <!--TDEHTML-->
488 488
       <default>true</default>
489 489
       <label></label>
490 490
       <whatsthis></whatsthis>
491 491
     </entry>
492
-    <entry key="PluginDomains" type="StringList"> <!--KHTML-->
492
+    <entry key="PluginDomains" type="StringList"> <!--TDEHTML-->
493 493
       <label></label>
494 494
       <whatsthis></whatsthis>
495 495
     </entry>

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

@@ -5,7 +5,7 @@ METASOURCES = AUTO
5 5
 kde_module_LTLIBRARIES = libtdehtmlkttsdplugin.la
6 6
 
7 7
 libtdehtmlkttsdplugin_la_SOURCES = tdehtmlkttsd.cpp
8
-libtdehtmlkttsdplugin_la_LIBADD  = $(LIB_KHTML)
8
+libtdehtmlkttsdplugin_la_LIBADD  = $(LIB_TDEHTML)
9 9
 libtdehtmlkttsdplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
10 10
 
11 11
 pluginsdir = $(kde_datadir)/tdehtml/kpartplugins

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

@@ -33,7 +33,7 @@
33 33
 #include <dcopclient.h>
34 34
 #include <ktrader.h>
35 35
 
36
-KHTMLPluginKTTSD::KHTMLPluginKTTSD( TQObject* parent, const char* name, const TQStringList& )
36
+TDEHTMLPluginKTTSD::TDEHTMLPluginKTTSD( TQObject* parent, const char* name, const TQStringList& )
37 37
     : Plugin( parent, name )
38 38
 {
39 39
     // If KTTSD is not installed, hide action.
@@ -46,17 +46,17 @@ KHTMLPluginKTTSD::KHTMLPluginKTTSD( TQObject* parent, const char* name, const TQ
46 46
             actionCollection(), "tools_kttsd" );
47 47
     }
48 48
     else
49
-        kdDebug() << "KHTMLPLuginKTTSD::KHTMLPluginKTTSD: KTrader did not find KTTSD." << endl;
49
+        kdDebug() << "TDEHTMLPLuginKTTSD::TDEHTMLPluginKTTSD: KTrader did not find KTTSD." << endl;
50 50
 }
51 51
 
52
-KHTMLPluginKTTSD::~KHTMLPluginKTTSD()
52
+TDEHTMLPluginKTTSD::~TDEHTMLPluginKTTSD()
53 53
 {
54 54
 }
55 55
 
56
-void KHTMLPluginKTTSD::slotReadOut()
56
+void TDEHTMLPluginKTTSD::slotReadOut()
57 57
 {
58
-    // The parent is assumed to be a KHTMLPart
59
-    if ( !parent()->inherits("KHTMLPart") )
58
+    // The parent is assumed to be a TDEHTMLPart
59
+    if ( !parent()->inherits("TDEHTMLPart") )
60 60
        TQMessageBox::warning( 0, i18n( "Cannot Read source" ),
61 61
                                 i18n( "You cannot read anything except web pages with\n"
62 62
                                       "this plugin, sorry." ));
@@ -91,7 +91,7 @@ void KHTMLPluginKTTSD::slotReadOut()
91 91
             reply >> supportsXhtml;
92 92
         }
93 93
 
94
-        KHTMLPart *part = (KHTMLPart *) parent();
94
+        TDEHTMLPart *part = (TDEHTMLPart *) parent();
95 95
 
96 96
         TQString query;
97 97
         if (supportsXhtml)
@@ -116,7 +116,7 @@ void KHTMLPluginKTTSD::slotReadOut()
116 116
             else
117 117
                 query = part->htmlDocument().body().innerText().string();
118 118
         }
119
-        // kdDebug() << "KHTMLPluginKTTSD::slotReadOut: query = " << query << endl;
119
+        // kdDebug() << "TDEHTMLPluginKTTSD::slotReadOut: query = " << query << endl;
120 120
 
121 121
         dataBuf.at(0);  // reset data
122 122
         arg << query << "";
@@ -133,6 +133,6 @@ void KHTMLPluginKTTSD::slotReadOut()
133 133
     }
134 134
 }
135 135
 
136
-K_EXPORT_COMPONENT_FACTORY( libtdehtmlkttsdplugin, KGenericFactory<KHTMLPluginKTTSD>("tdehtmlkttsd") )
136
+K_EXPORT_COMPONENT_FACTORY( libtdehtmlkttsdplugin, KGenericFactory<TDEHTMLPluginKTTSD>("tdehtmlkttsd") )
137 137
 
138 138
 #include "tdehtmlkttsd.moc"

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

@@ -14,8 +14,8 @@
14 14
  ***************************************************************************/
15 15
 
16 16
 
17
-#ifndef KHTMLKTTSD_H
18
-#define KHTMLKTTSD_H
17
+#ifndef TDEHTMLKTTSD_H
18
+#define TDEHTMLKTTSD_H
19 19
 
20 20
 #include <tdeparts/plugin.h>
21 21
 
@@ -23,9 +23,9 @@ class KURL;
23 23
 class TDEInstance;
24 24
 
25 25
 /**
26
- * KHTML KParts Plugin
26
+ * TDEHTML KParts Plugin
27 27
  */
28
-class KHTMLPluginKTTSD : public KParts::Plugin
28
+class TDEHTMLPluginKTTSD : public KParts::Plugin
29 29
 {
30 30
     Q_OBJECT
31 31
 public:
@@ -33,12 +33,12 @@ public:
33 33
     /**
34 34
      * Construct a new KParts plugin.
35 35
      */
36
-    KHTMLPluginKTTSD( TQObject* parent, const char* name, const TQStringList& );
36
+    TDEHTMLPluginKTTSD( TQObject* parent, const char* name, const TQStringList& );
37 37
 
38 38
     /**
39 39
      * Destructor.
40 40
      */
41
-    virtual ~KHTMLPluginKTTSD();
41
+    virtual ~TDEHTMLPluginKTTSD();
42 42
 public slots:
43 43
     void slotReadOut();
44 44
 };

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

@@ -6,7 +6,7 @@ METASOURCES = AUTO
6 6
 
7 7
 konqsidebar_web_la_SOURCES = web_module.cpp
8 8
 konqsidebar_web_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
9
-konqsidebar_web_la_LIBADD = $(LIB_KPARTS) $(LIB_KHTML) ../libkonqsidebarplugin.la ../../../libkonq/libkonq.la
9
+konqsidebar_web_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEHTML) ../libkonqsidebarplugin.la ../../../libkonq/libkonq.la
10 10
 
11 11
 #plugindir=$(kde_datadir)/konqsidebartng/entries
12 12
 #plugin_DATA=websidebar.desktop

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

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

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

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

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

@@ -28,18 +28,18 @@
28 28
 #include <tqobject.h>
29 29
 
30 30
 
31
-// A wrapper for KHTMLPart to make it behave the way we want it to.
32
-class KHTMLSideBar : public KHTMLPart
31
+// A wrapper for TDEHTMLPart to make it behave the way we want it to.
32
+class TDEHTMLSideBar : public TDEHTMLPart
33 33
 {
34 34
 	Q_OBJECT
35 35
 	public:
36
-		KHTMLSideBar(bool universal) : KHTMLPart() {
36
+		TDEHTMLSideBar(bool universal) : TDEHTMLPart() {
37 37
 			setStatusMessagesEnabled(false);
38 38
 			setMetaRefreshEnabled(true);
39 39
 			setJavaEnabled(false);
40 40
 			setPluginsEnabled(false);
41 41
 
42
-			setFormNotification(KHTMLPart::Only);
42
+			setFormNotification(TDEHTMLPart::Only);
43 43
 			connect(this,
44 44
 				TQT_SIGNAL(formSubmitNotification(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)),
45 45
 				this,
@@ -69,7 +69,7 @@ class KHTMLSideBar : public KHTMLPart
69 69
 				TQT_SLOT(showMenu(const TQString&, const TQPoint&)));
70 70
 
71 71
 		}
72
-		virtual ~KHTMLSideBar() {}
72
+		virtual ~TDEHTMLSideBar() {}
73 73
 
74 74
 	signals:
75 75
 		void submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&);
@@ -102,7 +102,7 @@ class KHTMLSideBar : public KHTMLPart
102 102
 				openURL(completeURL(url));
103 103
 				return;
104 104
 			}
105
-			KHTMLPart::urlSelected(url,button,state,_target,args);
105
+			TDEHTMLPart::urlSelected(url,button,state,_target,args);
106 106
 		}
107 107
 
108 108
 	protected slots:
@@ -149,10 +149,10 @@ class KHTMLSideBar : public KHTMLPart
149 149
 				emit submitFormRequest(action, u, formData,
150 150
 						target, contentType, boundary);
151 151
 			} else if (t.isEmpty() || t == "_self") {
152
-				setFormNotification(KHTMLPart::NoNotification);
152
+				setFormNotification(TDEHTMLPart::NoNotification);
153 153
 				submitFormProxy(action, u, formData, target,
154 154
 						contentType, boundary);
155
-				setFormNotification(KHTMLPart::Only);
155
+				setFormNotification(TDEHTMLPart::Only);
156 156
 			}
157 157
 		}
158 158
 	private:
@@ -192,7 +192,7 @@ class KonqSideBarWebModule : public KonqSidebarPlugin
192 192
 		void reload();
193 193
 
194 194
 	private:
195
-		KHTMLSideBar *_htmlPart;
195
+		TDEHTMLSideBar *_htmlPart;
196 196
 		KURL _url;
197 197
 		int reloadTimeout;
198 198
 		TQString _desktopName;

+ 4
- 4
nsplugins/README View File

@@ -25,7 +25,7 @@ Parts
25 25
 =====
26 26
 
27 27
 The Netscape(R) browser plugin support consists of 3 parts:
28
-- "PluginPart" KPart which is embedded into KHTML pages
28
+- "PluginPart" KPart which is embedded into TDEHTML pages
29 29
   (alone, it looks no different than a gray rectangle)
30 30
 - "nspluginviewer", a separate application which is capable of
31 31
   actually loading and playing the various Netscape(R) plugins.
@@ -144,7 +144,7 @@ Viewer
144 144
 Implemented in: viewer/
145 145
 
146 146
 The viewer is a KDE component used to embed Netscape(R) plugins
147
-into KDE applications (such as KHTML / Konqueror). To the plugin, it
147
+into KDE applications (such as TDEHTML / Konqueror). To the plugin, it
148 148
 emulates a Netscape(R) browser, while outside - it offers a standard KParts
149 149
 object.
150 150
 
@@ -216,7 +216,7 @@ browser plugin execution environment, it still lacks the following features:
216 216
   Support for LiveConnect (for JavaScript support) requires:
217 217
   - Reimplementation of Netscape's JRI functions (see sdk/jri.h)
218 218
     to communicate back (via DCOP?) with the PluginPart, which'll
219
-    signal them to KHTML's KJS interpretor. KParts::BrowserExtension
219
+    signal them to TDEHTML's KJS interpretor. KParts::BrowserExtension
220 220
     should be extended to support those signals. Of course, only
221 221
     JRI calls in the "netscape.javascript" namespace should be handled.
222 222
   - Implementation of g_NPN_GetJavaEnv and g_NPN_GetJavaPeer
@@ -224,7 +224,7 @@ browser plugin execution environment, it still lacks the following features:
224 224
   - Implementing g_NPN_GetValue(NPNVjavascriptEnabledBool, ...)
225 225
     (currently always returns "false").
226 226
     Should involve adding a slot to KParts::BrowserExtension
227
-    and making KHTML signal it whenever JS gets enabled or disabled.
227
+    and making TDEHTML signal it whenever JS gets enabled or disabled.
228 228
 
229 229
   LiveConnect will probably never be supported due to JRE ABI issues, and
230 230
   the fact that we need to have a JRE with JNI inside the nspluginviewer.

+ 1
- 1
nsplugins/TESTCASES View File

@@ -1,7 +1,7 @@
1 1
 
2 2
 When making changes to nsplugin.cpp or related areas, please try to test as
3 3
 many, if not all of the following plugins before and after the changes.  It
4
-is also useful to test in embedded mode in KHTML, as well as with kfmclient
4
+is also useful to test in embedded mode in TDEHTML, as well as with kfmclient
5 5
 loading it into a clean konqueror pane.
6 6
 
7 7
 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)
75 75
         _button = 0L;
76 76
         // Protection against repeated NPSetWindow() - Flash v9,0,115,0 doesn't handle
77 77
         // repeated NPSetWindow() calls properly, which happens when NSPluginInstance is first
78
-        // shown and then resized. Which is what happens with KHTML. Therefore use 'shown'
78
+        // shown and then resized. Which is what happens with TDEHTML. Therefore use 'shown'
79 79
         // to detect whether the widget is shown and drop all resize events before that,
80 80
         // and use 'resize_count' to wait for that one more resize to come (plus a timer
81 81
         // 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)
278 278
 
279 279
             if (!name.isEmpty()) {
280 280
                 // hack to pass view mode from tdehtml
281
-                if ( name=="__KHTML__PLUGINEMBED" ) {
281
+                if ( name=="__TDEHTML__PLUGINEMBED" ) {
282 282
                     embed = true;
283
-                    kdDebug(1432) << "__KHTML__PLUGINEMBED found" << endl;
283
+                    kdDebug(1432) << "__TDEHTML__PLUGINEMBED found" << endl;
284 284
                 } else {
285 285
                     argn << name;
286 286
                     argv << value;

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

@@ -1510,7 +1510,7 @@ DCOPRef NSPluginClass::newInstance( TQString url, TQString mimeType, TQ_INT8 emb
1510 1510
 
1511 1511
       if (!strcasecmp(_argn[i], "WIDTH")) width = argv[i].toInt();
1512 1512
       if (!strcasecmp(_argn[i], "HEIGHT")) height = argv[i].toInt();
1513
-      if (!strcasecmp(_argn[i], "__KHTML__PLUGINBASEURL")) baseURL = _argv[i];
1513
+      if (!strcasecmp(_argn[i], "__TDEHTML__PLUGINBASEURL")) baseURL = _argv[i];
1514 1514
       kdDebug(1431) << "argn=" << _argn[i] << " argv=" << _argv[i] << endl;
1515 1515
    }
1516 1516
 

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

@@ -70,7 +70,7 @@ TDEInstance* KManPartFactory::instance()
70 70
 
71 71
 
72 72
 KManPart::KManPart( TQWidget * parent, const char * name )
73
-: KHTMLPart( parent, name )
73
+: TDEHTMLPart( parent, name )
74 74
 ,m_job(0)
75 75
 {
76 76
    TDEInstance * instance = new TDEInstance( "kmanpart" );

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

@@ -35,7 +35,7 @@ class TDEAboutData;
35 35
 
36 36
 /**
37 37
  * Man Page Viewer
38
- * \todo: Why is it needed? Why is KHTML alone not possible?
38
+ * \todo: Why is it needed? Why is TDEHTML alone not possible?
39 39
  */
40 40
 class KManPartFactory: public KParts::Factory
41 41
 {
@@ -56,7 +56,7 @@ class KManPartFactory: public KParts::Factory
56 56
 
57 57
 };
58 58
 
59
-class KManPart : public KHTMLPart
59
+class KManPart : public TDEHTMLPart
60 60
 {
61 61
    Q_OBJECT
62 62
    public:

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

@@ -32,7 +32,7 @@ textthumbnail_la_LIBADD = $(LIB_KIO) # for kmimetype
32 32
 textthumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
33 33
 
34 34
 htmlthumbnail_la_SOURCES = htmlcreator.cpp
35
-htmlthumbnail_la_LIBADD = $(LIB_KHTML)
35
+htmlthumbnail_la_LIBADD = $(LIB_TDEHTML)
36 36
 htmlthumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
37 37
 
38 38
 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
49 49
 {
50 50
     if (!m_html)
51 51
     {
52
-        m_html = new KHTMLPart;
52
+        m_html = new TDEHTMLPart;
53 53
         connect(m_html, TQT_SIGNAL(completed()), TQT_SLOT(slotCompleted()));
54 54
         m_html->setJScriptEnabled(false);
55 55
         m_html->setJavaEnabled(false);

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

@@ -23,7 +23,7 @@
23 23
 
24 24
 #include <tdeio/thumbcreator.h>
25 25
 
26
-class KHTMLPart;
26
+class TDEHTMLPart;
27 27
 
28 28
 class HTMLCreator : public TQObject, public ThumbCreator
29 29
 {
@@ -41,7 +41,7 @@ private slots:
41 41
     void slotCompleted();
42 42
 
43 43
 private:
44
-    KHTMLPart *m_html;
44
+    TDEHTMLPart *m_html;
45 45
 };
46 46
 
47 47
 #endif

Loading…
Cancel
Save