diff --git a/ChangeLog b/ChangeLog index 5a59ac2..04e7538 100644 --- a/ChangeLog +++ b/ChangeLog @@ -421,7 +421,7 @@ added ------------------------------------------------------------------------ r38 | (jim) | 2005-02-28 22:34:42 -0800 (Mon, 28 Feb 2005) | 2 lines -added KHTMLPart to %ConvertToSubclassCode; install kdepyuic +added TDEHTMLPart to %ConvertToSubclassCode; install kdepyuic ------------------------------------------------------------------------ r37 | (jim) | 2005-02-03 00:07:38 -0800 (Thu, 03 Feb 2005) | 2 lines diff --git a/Changelog b/Changelog index 900e318..6dd4f9e 100644 --- a/Changelog +++ b/Changelog @@ -598,7 +598,7 @@ added ------------------------------------------------------------------------ r38 | (no author) | 2005-02-28 22:34:42 -0800 (Mon, 28 Feb 2005) | 2 lines -added KHTMLPart to %ConvertToSubclassCode; install kdepyuic +added TDEHTMLPart to %ConvertToSubclassCode; install kdepyuic ------------------------------------------------------------------------ r37 | (no author) | 2005-02-03 00:07:38 -0800 (Thu, 03 Feb 2005) | 2 lines diff --git a/cmake b/cmake index 9a21790..274366f 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 9a217903f9fa35ca12213a6e9ee3d2cb87d1131d +Subproject commit 274366fb8b90704586d7beef216b765cc0688b08 diff --git a/doc/classref/allclasses.html b/doc/classref/allclasses.html index 9c5d260..9964f98 100644 --- a/doc/classref/allclasses.html +++ b/doc/classref/allclasses.html @@ -424,9 +424,9 @@ KGradientSelector KGuiItem KHSSelector -KHTMLPart -KHTMLSettings -KHTMLView +TDEHTMLPart +TDEHTMLSettings +TDEHTMLView KHelpMenu KHistoryCombo KIDNA diff --git a/doc/classref/tdehtml/DOM.Document.html b/doc/classref/tdehtml/DOM.Document.html index bfa3049..ec48b3a 100644 --- a/doc/classref/tdehtml/DOM.Document.html +++ b/doc/classref/tdehtml/DOM.Document.html @@ -284,7 +284,7 @@ In versions KDE 3.2.0 and above only
  • view () -
    +
    returns (KHTMLView)
    returns (TDEHTMLView)
    diff --git a/doc/classref/tdehtml/DOM.HTMLDocument.html b/doc/classref/tdehtml/DOM.HTMLDocument.html index f5d28f4..ede3ae0 100644 --- a/doc/classref/tdehtml/DOM.HTMLDocument.html +++ b/doc/classref/tdehtml/DOM.HTMLDocument.html @@ -41,7 +41,7 @@
  • HTMLDocument (parent)
    returns a HTMLDocument instance
    - +
    ArgumentTypeDefault
    parentKHTMLView
    parentTDEHTMLView
  • HTMLDocument (other) diff --git a/doc/classref/tdehtml/KHTMLPart.html b/doc/classref/tdehtml/TDEHTMLPart.html similarity index 97% rename from doc/classref/tdehtml/KHTMLPart.html rename to doc/classref/tdehtml/TDEHTMLPart.html index 55ad168..3d5bc13 100644 --- a/doc/classref/tdehtml/KHTMLPart.html +++ b/doc/classref/tdehtml/TDEHTMLPart.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/html4/loose.dtd""> - class KHTMLPart + class TDEHTMLPart @@ -12,7 +12,7 @@
    -

    class KHTMLPart

    +

    class TDEHTMLPart

    		 @@ -28,7 +28,7 @@ - + @@ -41,23 +41,23 @@ }
  • GUIProfile = {DefaultGUI, BrowserViewGUI }

    methods

      -
    • KHTMLPart (parentWidget = 0, widgetname = 0, parent = 0, name = 0, prof = DefaultGUI) -
    • tdehtml
    ClassKHTMLPartTDEHTMLPart
    Inherits KParts.ReadOnlyPart
    +
  • TDEHTMLPart (parentWidget = 0, widgetname = 0, parent = 0, name = 0, prof = DefaultGUI) +
    • returns a KHTMLPart instance
    returns a TDEHTMLPart instance
    - +
    ArgumentTypeDefault
    parentWidgetTQWidget0
    widgetnamechar0
    parentTQObject0
    namechar0
    profKHTMLPart.GUIProfileDefaultGUI
    profTDEHTMLPart.GUIProfileDefaultGUI
    -
  • KHTMLPart (view, parent = 0, name = 0, prof = DefaultGUI) -
    +
  • TDEHTMLPart (view, parent = 0, name = 0, prof = DefaultGUI) +
    • returns a KHTMLPart instance
    returns a TDEHTMLPart instance
    - + - +
    ArgumentTypeDefault
    viewKHTMLView
    viewTDEHTMLView
    parentTQObject0
    namechar0
    profKHTMLPart.GUIProfileDefaultGUI
    profTDEHTMLPart.GUIProfileDefaultGUI
  • activeNode () @@ -96,7 +96,7 @@
    returns (KParts.BrowserHostExtension)
  • caretDisplayPolicyNonFocused () -
    +
    returns (KHTMLPart.CaretDisplayPolicy)
    returns (TDEHTMLPart.CaretDisplayPolicy)
    In versions KDE 3.2.0 and above only
  • caretPositionChanged (node, offset) @@ -227,13 +227,13 @@
  • findFrame (f) -
    +
    returns (KHTMLPart)
    returns (TDEHTMLPart)
    ArgumentTypeDefault
    fTQString
  • findFrameParent (callingPart, f) -
    +
    returns (KHTMLPart) childFrame (tdehtml.ChildFrame)
    returns (TDEHTMLPart) childFrame (tdehtml.ChildFrame)
    @@ -282,7 +282,7 @@
    ArgumentTypeDefault
    callingPartKParts.ReadOnlyPart
    fTQString
  • formNotification () -
    +
    returns (KHTMLPart.FormNotification)
    returns (TDEHTMLPart.FormNotification)
    In versions KDE 3.2.0 and above only
  • formSubmitNotification (action, url, formData, target, contentType, boundary) @@ -448,7 +448,7 @@
  • parentPart () -
    +
    returns (KHTMLPart)
    returns (TDEHTMLPart)
  • partManager ()
    @@ -553,7 +553,7 @@
    returns (KParts.PartManager)
    returns nothing
    In versions KDE 3.2.0 and above only
    - +
    ArgumentTypeDefault
    policyKHTMLPart.CaretDisplayPolicy
    policyTDEHTMLPart.CaretDisplayPolicy
  • setCaretMode (enable) @@ -616,7 +616,7 @@
    returns nothing
    In versions KDE 3.2.0 and above only
    - +
    ArgumentTypeDefault
    fnKHTMLPart.FormNotification
    fnTDEHTMLPart.FormNotification
  • setJSDefaultStatusBarText (text) @@ -707,7 +707,7 @@
    returns nothing
    - +
    ArgumentTypeDefault
    enablebool
    originPartKHTMLPart
    originPartTDEHTMLPart
  • setURLCursor (c) @@ -735,7 +735,7 @@
  • settings () -
    +
    returns (KHTMLSettings)
    returns (TDEHTMLSettings)
  • show ()
    @@ -783,7 +783,7 @@
    returns nothing
  • view () -
    +
    returns (KHTMLView)
    returns (TDEHTMLView)
  • write (str, len = -1)
    diff --git a/doc/classref/tdehtml/KHTMLSettings.html b/doc/classref/tdehtml/TDEHTMLSettings.html similarity index 95% rename from doc/classref/tdehtml/KHTMLSettings.html rename to doc/classref/tdehtml/TDEHTMLSettings.html index fa095e5..fd57cc6 100644 --- a/doc/classref/tdehtml/KHTMLSettings.html +++ b/doc/classref/tdehtml/TDEHTMLSettings.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/html4/loose.dtd""> - class KHTMLSettings + class TDEHTMLSettings @@ -12,7 +12,7 @@
    returns nothing
    -

    class KHTMLSettings

    +

    class TDEHTMLSettings

    		 @@ -28,7 +28,7 @@ - + @@ -44,13 +44,13 @@ }
  • KJavaScriptAdvice = {KJavaScriptDunno, KJavaScriptAccept, KJavaScriptReject }

    methods

      -
    • KHTMLSettings () -
    • tdehtml
    ClassKHTMLSettingsTDEHTMLSettings
    Inherits
    +
  • TDEHTMLSettings () +
    • returns a KHTMLSettings instance
    returns a TDEHTMLSettings instance
    -
  • KHTMLSettings (other) -
    +
  • TDEHTMLSettings (other) +
    • returns a KHTMLSettings instance
    returns a TDEHTMLSettings instance
    - +
    ArgumentTypeDefault
    otherKHTMLSettings
    otherTDEHTMLSettings
  • accessKeysEnabled () @@ -68,7 +68,7 @@
    returns (char)
    static
    - +
    ArgumentTypeDefault
    _adviceKHTMLSettings.KJavaScriptAdvice
    _adviceTDEHTMLSettings.KJavaScriptAdvice
  • allowTabulation () @@ -246,7 +246,7 @@
    returns (TQString)
  • showAnimations () -
    +
    returns (KHTMLSettings.KAnimationAdvice)
    returns (TDEHTMLSettings.KAnimationAdvice)
  • splitDomainAdvice (configStr, domain)
    Not Implemented
    @@ -278,35 +278,35 @@
    returns (TQColor)
  • windowFocusPolicy (hostname = TQString .null) -
    +
    returns (KHTMLSettings.KJSWindowFocusPolicy)
    returns (TDEHTMLSettings.KJSWindowFocusPolicy)
    In versions KDE 3.2.0 and above only
    ArgumentTypeDefault
    hostnameTQStringTQString .null
  • windowMovePolicy (hostname = TQString .null) -
    +
    returns (KHTMLSettings.KJSWindowMovePolicy)
    returns (TDEHTMLSettings.KJSWindowMovePolicy)
    In versions KDE 3.2.0 and above only
    ArgumentTypeDefault
    hostnameTQStringTQString .null
  • windowOpenPolicy (hostname = TQString .null) -
    +
    returns (KHTMLSettings.KJSWindowOpenPolicy)
    returns (TDEHTMLSettings.KJSWindowOpenPolicy)
    In versions KDE 3.2.0 and above only
    ArgumentTypeDefault
    hostnameTQStringTQString .null
  • windowResizePolicy (hostname = TQString .null) -
    +
    returns (KHTMLSettings.KJSWindowResizePolicy)
    returns (TDEHTMLSettings.KJSWindowResizePolicy)
    In versions KDE 3.2.0 and above only
    ArgumentTypeDefault
    hostnameTQStringTQString .null
  • windowStatusPolicy (hostname = TQString .null) -
    +
    returns (KHTMLSettings.KJSWindowStatusPolicy)
    returns (TDEHTMLSettings.KJSWindowStatusPolicy)
    In versions KDE 3.2.0 and above only
    diff --git a/doc/classref/tdehtml/KHTMLView.html b/doc/classref/tdehtml/TDEHTMLView.html similarity index 98% rename from doc/classref/tdehtml/KHTMLView.html rename to doc/classref/tdehtml/TDEHTMLView.html index f863593..1d85bdd 100644 --- a/doc/classref/tdehtml/KHTMLView.html +++ b/doc/classref/tdehtml/TDEHTMLView.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/html4/loose.dtd""> - class KHTMLView + class TDEHTMLView @@ -12,7 +12,7 @@
    ArgumentTypeDefault
    hostnameTQStringTQString .null
    -

    class KHTMLView

    +

    class TDEHTMLView

    		 @@ -28,17 +28,17 @@ - +
    tdehtml
    ClassKHTMLViewTDEHTMLView
    Inherits TQScrollView

    methods

      -
    • KHTMLView (part, parent, name = 0) -
      +
    • TDEHTMLView (part, parent, name = 0) +
      • returns a KHTMLView instance
      returns a TDEHTMLView instance
      - +
      ArgumentTypeDefault
      partKHTMLPart
      partTDEHTMLPart
      parentTQWidget
      namechar0
      @@ -170,7 +170,7 @@
      returns (int)
    • part () -
      +
      returns (KHTMLPart)
      returns (TDEHTMLPart)
    • print_ ()
      diff --git a/doc/classref/tdehtml/index.html b/doc/classref/tdehtml/index.html index ec14a1f..3f89e22 100644 --- a/doc/classref/tdehtml/index.html +++ b/doc/classref/tdehtml/index.html @@ -108,7 +108,7 @@
      returns nothing
      DOM.HTMLOptionElement
      DOM.HTMLParagraphElement
      		 - + @@ -145,9 +145,9 @@ - - - + + +
      DOM.HTMLParamElement - KHTMLView
      DOM.HTMLParamElement - TDEHTMLView
      DOM.HTMLParamElement
      DOM.HTMLPreElement
      DOM.HTMLQuoteElement
      DOM.TextEvent
      DOM.TreeWalker
      DOM.UIEvent
      KHTMLPart
      KHTMLSettings
      KHTMLView
      TDEHTMLPart
      TDEHTMLSettings
      TDEHTMLView
      diff --git a/doc/examples.html b/doc/examples.html index 0857d79..800508d 100644 --- a/doc/examples.html +++ b/doc/examples.html @@ -83,9 +83,9 @@ The output will vary with KDE version running or from machine to machine.

      -

      pyKHTMLPart.py

      +

      pyTDEHTMLPart.py

      -pyKHTMLPart.py demonstrates importing KHTMLPart as a KPart. +pyTDEHTMLPart.py demonstrates importing TDEHTMLPart as a KPart.

      @@ -96,7 +96,7 @@ connection is active).

      The program is not designed as a complete browser example, and none of the links are "clickable" (it wouldn't be hard to extend it to do this however - see the -KHTMLPart docs). +TDEHTMLPart docs).

      systray.py

      diff --git a/examples/pyKHTMLPart.py b/examples/pyTDEHTMLPart.py similarity index 94% rename from examples/pyKHTMLPart.py rename to examples/pyTDEHTMLPart.py index 2795526..e4e209f 100644 --- a/examples/pyKHTMLPart.py +++ b/examples/pyTDEHTMLPart.py @@ -5,13 +5,13 @@ """ This is an extemely simple and crude example of using -a KHTMLPart - I put it together mostly to make sure +a TDEHTMLPart - I put it together mostly to make sure the openURL method worked correctly after some modifications done in KParts::ReadOnlyPart. It took exactly four lines added to a basic PyKDE app framework to display a URL via the 'net: - self.w = KHTMLPart (self, "HTMLPart", self); + self.w = TDEHTMLPart (self, "HTMLPart", self); self.w.openURL (KURL ("http://www.kde.org")); self.w.view ().setGeometry (30, 55, 500, 400); self.w.show (); @@ -35,7 +35,7 @@ NOTE!!! For this to work, you (obviously) need to have a route to the internet established or specify a local URL - PyKDE/KDE will take care of everything else. -Perceptive users will notice the KHTMLPart code is +Perceptive users will notice the TDEHTMLPart code is lifted from the KDE classref. """ @@ -51,7 +51,7 @@ from qt import TQString, TQStringList from kio import KTrader -from tdehtml import KHTMLPart, KHTMLView +from tdehtml import TDEHTMLPart, TDEHTMLView # Importing the KParts namespace gets us all of the KParts:: classes from tdeparts import KParts, createReadOnlyPart, createReadWritePart @@ -99,13 +99,13 @@ class pyPartsMW (KParts.MainWindow): # create a web browser (of course you have to edit # this file to change url's) - self.w = KHTMLPart (self, "HTMLPart", self); + self.w = TDEHTMLPart (self, "HTMLPart", self); self.w.openURL (KURL ("http://www.kde.org")); self.w.view ().setGeometry (30, 55, 500, 400); -# self.v = KHTMLView (self.w, self) +# self.v = TDEHTMLView (self.w, self) # self.setCentralWidget (self.v) @@ -181,12 +181,12 @@ class pyPartsMW (KParts.MainWindow): #------------- main ---------------------------- # A Human readable description of your program -description = "KHTMLPart - simple example" +description = "TDEHTMLPart - simple example" # The version version = "0.1" # stuff for the "About" menu -aboutData = TDEAboutData ("pyKHTMLPart", "pyHTMLPart",\ +aboutData = TDEAboutData ("pyTDEHTMLPart", "pyHTMLPart",\ version, description, TDEAboutData.License_GPL,\ "(c) 2002, Jim Bublitz") diff --git a/examples/pytde-sampler/qt_widgets/CONTRIB b/examples/pytde-sampler/qt_widgets/CONTRIB index 4e46cd7..1bd8f38 100644 --- a/examples/pytde-sampler/qt_widgets/CONTRIB +++ b/examples/pytde-sampler/qt_widgets/CONTRIB @@ -393,9 +393,9 @@ tdefile,KURLPropsPlugin,,, tdefile,KURLRequester,,, tdefile,KURLRequesterDlg,,, tdehtml,DOM,,, -tdehtml,KHTMLPart,,, -tdehtml,KHTMLSettings,,, -tdehtml,KHTMLView,,, +tdehtml,TDEHTMLPart,,, +tdehtml,TDEHTMLSettings,,, +tdehtml,TDEHTMLView,,, kio,KAr,,, kio,KArchive,,, kio,KArchiveDirectory,,, diff --git a/examples/pytde-sampler/sampler.py b/examples/pytde-sampler/sampler.py index f90a1bb..2a8146e 100755 --- a/examples/pytde-sampler/sampler.py +++ b/examples/pytde-sampler/sampler.py @@ -23,7 +23,7 @@ from tdeui import KKeyDialog, KEditToolbar from kio import KTrader from tdeparts import createReadOnlyPart, createReadWritePart -from tdehtml import KHTMLPart +from tdehtml import TDEHTMLPart import about import lib diff --git a/pytde350.prj b/pytde350.prj index 3820593..90df9f3 100644 --- a/pytde350.prj +++ b/pytde350.prj @@ -342,7 +342,7 @@ include = @KDE_INCLUDEPATH@/tdehtml @KDE_INCLUDEPATH@/dom @KDE_INCLUDEPATH@/ libs = -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeui -ltdehtml -ltdeparts -ltdecore -lkio\ -ltdeuicmodule -ltdecorecmodule -lkiocmodule -ltdepartscmodule -ldcopcmodule -define = "KHTML_EXPORT", "" +define = "TDEHTML_EXPORT", "" retain // ----------------------------------------- diff --git a/pytde351.prj b/pytde351.prj index dc7f95f..bc94f7e 100644 --- a/pytde351.prj +++ b/pytde351.prj @@ -342,7 +342,7 @@ include = @KDE_INCLUDEPATH@/tdehtml @KDE_INCLUDEPATH@/dom @KDE_INCLUDEPATH@/ libs = -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeui -ltdehtml -ltdeparts -ltdecore -lkio\ -ltdeuicmodule -ltdecorecmodule -lkiocmodule -ltdepartscmodule -ldcopcmodule -define = "KHTML_EXPORT", "" +define = "TDEHTML_EXPORT", "" retain // ----------------------------------------- diff --git a/pytde352.prj b/pytde352.prj index 13529df..ed1423a 100644 --- a/pytde352.prj +++ b/pytde352.prj @@ -342,7 +342,7 @@ include = @KDE_INCLUDEPATH@/tdehtml @KDE_INCLUDEPATH@/dom @KDE_INCLUDEPATH@/ libs = -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeui -ltdehtml -ltdeparts -ltdecore -lkio\ -ltdeuicmodule -ltdecorecmodule -lkiocmodule -ltdepartscmodule -ldcopcmodule -define = "KHTML_EXPORT", "" +define = "TDEHTML_EXPORT", "" retain // ----------------------------------------- diff --git a/pytde353.prj b/pytde353.prj index ba4dfe2..e302956 100644 --- a/pytde353.prj +++ b/pytde353.prj @@ -342,7 +342,7 @@ include = @KDE_INCLUDEPATH@/tdehtml @KDE_INCLUDEPATH@/dom @KDE_INCLUDEPATH@/ libs = -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeui -ltdehtml -ltdeparts -ltdecore -lkio\ -ltdeuicmodule -ltdecorecmodule -lkiocmodule -ltdepartscmodule -ldcopcmodule -define = "KHTML_EXPORT", "" +define = "TDEHTML_EXPORT", "" retain // ----------------------------------------- diff --git a/sip/tdehtml/dom_doc.sip b/sip/tdehtml/dom_doc.sip index ef0db05..0974e05 100644 --- a/sip/tdehtml/dom_doc.sip +++ b/sip/tdehtml/dom_doc.sip @@ -100,7 +100,7 @@ public: %End - KHTMLView* view () const; + TDEHTMLView* view () const; DOM::CSSStyleDeclaration getOverrideStyle (const DOM::Element&, const DOM::DOMString&); %If ( KDE_3_2_0 - ) diff --git a/sip/tdehtml/html_document.sip b/sip/tdehtml/html_document.sip index 107e540..3c27427 100644 --- a/sip/tdehtml/html_document.sip +++ b/sip/tdehtml/html_document.sip @@ -35,7 +35,7 @@ class HTMLDocument : DOM::Document public: HTMLDocument (); - HTMLDocument (KHTMLView* /TransferThis/); + HTMLDocument (TDEHTMLView* /TransferThis/); HTMLDocument (const DOM::HTMLDocument&); HTMLDocument (const DOM::Node&); diff --git a/sip/tdehtml/tdehtml_part.sip b/sip/tdehtml/tdehtml_part.sip index 22152ad..4af60f0 100644 --- a/sip/tdehtml/tdehtml_part.sip +++ b/sip/tdehtml/tdehtml_part.sip @@ -24,7 +24,7 @@ // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -class KHTMLPart : KParts::ReadOnlyPart +class TDEHTMLPart : KParts::ReadOnlyPart { %TypeHeaderCode #include @@ -39,8 +39,8 @@ public: BrowserViewGUI }; - KHTMLPart (TQWidget* = 0, const char* = 0, TQObject* /TransferThis/ = 0, const char* = 0, KHTMLPart::GUIProfile = DefaultGUI ); - KHTMLPart (KHTMLView*, TQObject* /TransferThis/ = 0, const char* = 0, KHTMLPart::GUIProfile = DefaultGUI ); + TDEHTMLPart (TQWidget* = 0, const char* = 0, TQObject* /TransferThis/ = 0, const char* = 0, TDEHTMLPart::GUIProfile = DefaultGUI ); + TDEHTMLPart (TDEHTMLView*, TQObject* /TransferThis/ = 0, const char* = 0, TDEHTMLPart::GUIProfile = DefaultGUI ); virtual bool openURL (const KURL&); virtual bool closeURL (); virtual void showError (TDEIO::Job*); @@ -53,7 +53,7 @@ public: //ig KParts::LiveConnectExtension* liveConnectExtension (const tdehtml::RenderPart*) const; %End - KHTMLView* view () const; + TDEHTMLView* view () const; void setJScriptEnabled (bool); bool jScriptEnabled () const; @@ -91,8 +91,8 @@ public: CaretBlink }; - KHTMLPart::CaretDisplayPolicy caretDisplayPolicyNonFocused () const; - void setCaretDisplayPolicyNonFocused (KHTMLPart::CaretDisplayPolicy); + TDEHTMLPart::CaretDisplayPolicy caretDisplayPolicyNonFocused () const; + void setCaretDisplayPolicyNonFocused (TDEHTMLPart::CaretDisplayPolicy); %End void enableJScript (bool); @@ -165,11 +165,11 @@ public: virtual void saveState (TQDataStream&); virtual void restoreState (TQDataStream&); DOM::Node nodeUnderMouse () const; - const KHTMLSettings* settings () const; - KHTMLPart* parentPart (); + const TDEHTMLSettings* settings () const; + TDEHTMLPart* parentPart (); TQStringList frameNames () const; TQPtrList frames () const; - KHTMLPart* findFrame (const TQString&); + TDEHTMLPart* findFrame (const TQString&); KParts::ReadOnlyPart* currentFrame () const; bool frameExists (const TQString&); void setJSStatusBarText (const TQString&); @@ -197,8 +197,8 @@ public: Unused = 255 }; - void setFormNotification (KHTMLPart::FormNotification); - KHTMLPart::FormNotification formNotification () const; + void setFormNotification (TDEHTMLPart::FormNotification); + TDEHTMLPart::FormNotification formNotification () const; KURL toplevelURL (); %If ( KDE_3_3_0 - ) @@ -244,7 +244,7 @@ protected: void setPluginPageQuestionAsked (const TQString&); %If ( KDE_3_2_0 - ) -//ig void setPageSecurity (KHTMLPart::PageSecurity); +//ig void setPageSecurity (TDEHTMLPart::PageSecurity); virtual bool doOpenStream (const TQString&); virtual bool doWriteStream (const TQByteArray&); virtual bool doCloseStream (); @@ -278,5 +278,5 @@ private: void setStatusBarText (const TQString&, int); //end -}; // class KHTMLPart +}; // class TDEHTMLPart diff --git a/sip/tdehtml/tdehtml_part.sip.323 b/sip/tdehtml/tdehtml_part.sip.323 index a45ccbe..4da9650 100644 --- a/sip/tdehtml/tdehtml_part.sip.323 +++ b/sip/tdehtml/tdehtml_part.sip.323 @@ -24,7 +24,7 @@ // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -class KHTMLPart : KParts::ReadOnlyPart +class TDEHTMLPart : KParts::ReadOnlyPart { %TypeHeaderCode #include @@ -39,8 +39,8 @@ public: BrowserViewGUI }; - KHTMLPart (TQWidget* = 0, const char* = 0, TQObject* /TransferThis/ = 0, const char* = 0, KHTMLPart::GUIProfile = DefaultGUI ); - KHTMLPart (KHTMLView*, TQObject* /TransferThis/ = 0, const char* = 0, KHTMLPart::GUIProfile = DefaultGUI ); + TDEHTMLPart (TQWidget* = 0, const char* = 0, TQObject* /TransferThis/ = 0, const char* = 0, TDEHTMLPart::GUIProfile = DefaultGUI ); + TDEHTMLPart (TDEHTMLView*, TQObject* /TransferThis/ = 0, const char* = 0, TDEHTMLPart::GUIProfile = DefaultGUI ); virtual bool openURL (const KURL&); virtual bool closeURL (); virtual void showError (TDEIO::Job*); @@ -53,7 +53,7 @@ public: //ig KParts::LiveConnectExtension* liveConnectExtension (const tdehtml::RenderPart*) const; %End - KHTMLView* view () const; + TDEHTMLView* view () const; void setJScriptEnabled (bool); bool jScriptEnabled () const; @@ -91,8 +91,8 @@ public: CaretBlink }; - KHTMLPart::CaretDisplayPolicy caretDisplayPolicyNonFocused () const; - void setCaretDisplayPolicyNonFocused (KHTMLPart::CaretDisplayPolicy); + TDEHTMLPart::CaretDisplayPolicy caretDisplayPolicyNonFocused () const; + void setCaretDisplayPolicyNonFocused (TDEHTMLPart::CaretDisplayPolicy); %End void enableJScript (bool); @@ -155,11 +155,11 @@ public: virtual void saveState (TQDataStream&); virtual void restoreState (TQDataStream&); DOM::Node nodeUnderMouse () const; - const KHTMLSettings* settings () const; - KHTMLPart* parentPart (); + const TDEHTMLSettings* settings () const; + TDEHTMLPart* parentPart (); TQStringList frameNames () const; TQPtrList frames () const; - KHTMLPart* findFrame (const TQString&); + TDEHTMLPart* findFrame (const TQString&); KParts::ReadOnlyPart* currentFrame () const; bool frameExists (const TQString&); void setJSStatusBarText (const TQString&); @@ -187,8 +187,8 @@ public: Unused = 255 }; - void setFormNotification (KHTMLPart::FormNotification); - KHTMLPart::FormNotification formNotification () const; + void setFormNotification (TDEHTMLPart::FormNotification); + TDEHTMLPart::FormNotification formNotification () const; KURL toplevelURL (); %If ( KDE_3_3_0 - ) @@ -234,7 +234,7 @@ protected: void setPluginPageQuestionAsked (const TQString&); %If ( KDE_3_2_0 - ) -//ig void setPageSecurity (KHTMLPart::PageSecurity); +//ig void setPageSecurity (TDEHTMLPart::PageSecurity); virtual bool doOpenStream (const TQString&); virtual bool doWriteStream (const TQByteArray&); virtual bool doCloseStream (); @@ -268,5 +268,5 @@ private: void setStatusBarText (const TQString&, int); //end -}; // class KHTMLPart +}; // class TDEHTMLPart diff --git a/sip/tdehtml/tdehtml_part.sip.330 b/sip/tdehtml/tdehtml_part.sip.330 index 22152ad..4af60f0 100644 --- a/sip/tdehtml/tdehtml_part.sip.330 +++ b/sip/tdehtml/tdehtml_part.sip.330 @@ -24,7 +24,7 @@ // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -class KHTMLPart : KParts::ReadOnlyPart +class TDEHTMLPart : KParts::ReadOnlyPart { %TypeHeaderCode #include @@ -39,8 +39,8 @@ public: BrowserViewGUI }; - KHTMLPart (TQWidget* = 0, const char* = 0, TQObject* /TransferThis/ = 0, const char* = 0, KHTMLPart::GUIProfile = DefaultGUI ); - KHTMLPart (KHTMLView*, TQObject* /TransferThis/ = 0, const char* = 0, KHTMLPart::GUIProfile = DefaultGUI ); + TDEHTMLPart (TQWidget* = 0, const char* = 0, TQObject* /TransferThis/ = 0, const char* = 0, TDEHTMLPart::GUIProfile = DefaultGUI ); + TDEHTMLPart (TDEHTMLView*, TQObject* /TransferThis/ = 0, const char* = 0, TDEHTMLPart::GUIProfile = DefaultGUI ); virtual bool openURL (const KURL&); virtual bool closeURL (); virtual void showError (TDEIO::Job*); @@ -53,7 +53,7 @@ public: //ig KParts::LiveConnectExtension* liveConnectExtension (const tdehtml::RenderPart*) const; %End - KHTMLView* view () const; + TDEHTMLView* view () const; void setJScriptEnabled (bool); bool jScriptEnabled () const; @@ -91,8 +91,8 @@ public: CaretBlink }; - KHTMLPart::CaretDisplayPolicy caretDisplayPolicyNonFocused () const; - void setCaretDisplayPolicyNonFocused (KHTMLPart::CaretDisplayPolicy); + TDEHTMLPart::CaretDisplayPolicy caretDisplayPolicyNonFocused () const; + void setCaretDisplayPolicyNonFocused (TDEHTMLPart::CaretDisplayPolicy); %End void enableJScript (bool); @@ -165,11 +165,11 @@ public: virtual void saveState (TQDataStream&); virtual void restoreState (TQDataStream&); DOM::Node nodeUnderMouse () const; - const KHTMLSettings* settings () const; - KHTMLPart* parentPart (); + const TDEHTMLSettings* settings () const; + TDEHTMLPart* parentPart (); TQStringList frameNames () const; TQPtrList frames () const; - KHTMLPart* findFrame (const TQString&); + TDEHTMLPart* findFrame (const TQString&); KParts::ReadOnlyPart* currentFrame () const; bool frameExists (const TQString&); void setJSStatusBarText (const TQString&); @@ -197,8 +197,8 @@ public: Unused = 255 }; - void setFormNotification (KHTMLPart::FormNotification); - KHTMLPart::FormNotification formNotification () const; + void setFormNotification (TDEHTMLPart::FormNotification); + TDEHTMLPart::FormNotification formNotification () const; KURL toplevelURL (); %If ( KDE_3_3_0 - ) @@ -244,7 +244,7 @@ protected: void setPluginPageQuestionAsked (const TQString&); %If ( KDE_3_2_0 - ) -//ig void setPageSecurity (KHTMLPart::PageSecurity); +//ig void setPageSecurity (TDEHTMLPart::PageSecurity); virtual bool doOpenStream (const TQString&); virtual bool doWriteStream (const TQByteArray&); virtual bool doCloseStream (); @@ -278,5 +278,5 @@ private: void setStatusBarText (const TQString&, int); //end -}; // class KHTMLPart +}; // class TDEHTMLPart diff --git a/sip/tdehtml/tdehtml_settings.sip b/sip/tdehtml/tdehtml_settings.sip index a383ac8..f467586 100644 --- a/sip/tdehtml/tdehtml_settings.sip +++ b/sip/tdehtml/tdehtml_settings.sip @@ -24,7 +24,7 @@ // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -class KHTMLSettings +class TDEHTMLSettings { %TypeHeaderCode #include @@ -89,8 +89,8 @@ public: %End - KHTMLSettings (); - KHTMLSettings (const KHTMLSettings&); + TDEHTMLSettings (); + TDEHTMLSettings (const TDEHTMLSettings&); void init (); void init (TDEConfig*, bool = 1); bool changeCursor (); @@ -102,7 +102,7 @@ public: bool autoSpellCheck () const; %End - KHTMLSettings::KAnimationAdvice showAnimations () const; + TDEHTMLSettings::KAnimationAdvice showAnimations () const; TQString stdFontName () const; TQString fixedFontName () const; TQString serifFontName () const; @@ -169,16 +169,16 @@ public: %If ( KDE_3_2_0 - ) - KHTMLSettings::KJSWindowOpenPolicy windowOpenPolicy (const TQString& = TQString ::null ) const; - KHTMLSettings::KJSWindowMovePolicy windowMovePolicy (const TQString& = TQString ::null ) const; - KHTMLSettings::KJSWindowResizePolicy windowResizePolicy (const TQString& = TQString ::null ) const; - KHTMLSettings::KJSWindowStatusPolicy windowStatusPolicy (const TQString& = TQString ::null ) const; - KHTMLSettings::KJSWindowFocusPolicy windowFocusPolicy (const TQString& = TQString ::null ) const; + TDEHTMLSettings::KJSWindowOpenPolicy windowOpenPolicy (const TQString& = TQString ::null ) const; + TDEHTMLSettings::KJSWindowMovePolicy windowMovePolicy (const TQString& = TQString ::null ) const; + TDEHTMLSettings::KJSWindowResizePolicy windowResizePolicy (const TQString& = TQString ::null ) const; + TDEHTMLSettings::KJSWindowStatusPolicy windowStatusPolicy (const TQString& = TQString ::null ) const; + TDEHTMLSettings::KJSWindowFocusPolicy windowFocusPolicy (const TQString& = TQString ::null ) const; %End static KJavaScriptAdvice strToAdvice (const TQString&); -//ig static void splitDomainAdvice (const TQString&, TQString&, KHTMLSettings::KJavaScriptAdvice&, KHTMLSettings::KJavaScriptAdvice&); - static const char* adviceToStr (KHTMLSettings::KJavaScriptAdvice); +//ig static void splitDomainAdvice (const TQString&, TQString&, TDEHTMLSettings::KJavaScriptAdvice&, TDEHTMLSettings::KJavaScriptAdvice&); + static const char* adviceToStr (TDEHTMLSettings::KJavaScriptAdvice); %If ( KDE_3_2_0 - ) //ig void readDomainSettings (TDEConfig*, bool, bool, KPerDomainSettings&); @@ -202,7 +202,7 @@ public: %End -}; // class KHTMLSettings +}; // class TDEHTMLSettings diff --git a/sip/tdehtml/tdehtmlview.sip b/sip/tdehtml/tdehtmlview.sip index a03102a..29dc209 100644 --- a/sip/tdehtml/tdehtmlview.sip +++ b/sip/tdehtml/tdehtmlview.sip @@ -26,7 +26,7 @@ //ig namespace tdehtml; -class KHTMLView : TQScrollView +class TDEHTMLView : TQScrollView { %TypeHeaderCode #include @@ -34,8 +34,8 @@ class KHTMLView : TQScrollView public: - KHTMLView (KHTMLPart*, TQWidget* /TransferThis/, const char* = 0); - KHTMLPart* part () const; + TDEHTMLView (TDEHTMLPart*, TQWidget* /TransferThis/, const char* = 0); + TDEHTMLPart* part () const; int frameWidth () const; void setMarginWidth (int); int marginWidth () const; @@ -132,13 +132,13 @@ protected slots: // must be sorted by name. static sipStringTypeClassMap map[] = { - {sipName_KHTMLView, &sipClass_KHTMLView}, - {sipName_KHTMLPart, &sipClass_KHTMLPart}, + {sipName_TDEHTMLView, &sipClass_TDEHTMLView}, + {sipName_TDEHTMLPart, &sipClass_TDEHTMLPart}, }; sipClass = sipMapStringToClass(sipCpp -> className(),map,sizeof (map)/sizeof (map[0])); %End //end -}; // class KHTMLView +}; // class TDEHTMLView