TQt4 port kmplayer

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kmplayer@1238840 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 60 insertions, 60 deletions

diff --git a/src/kmplayerplaylist.h b/src/kmplayerplaylist.h
index c9c0b6b..0b3f29b 100644
--- a/src/kmplayerplaylist.h
+++ b/src/kmplayerplaylist.h
@@ -26,7 +26,7 @@
 #include <config.h>
 #include <sys/time.h>
 
-#include <qstring.h>
+#include <tqstring.h>
 
 #include "kmplayer_def.h"
 #include "kmplayertypes.h"
@@ -34,7 +34,7 @@
 
 typedef struct _cairo_surface cairo_surface_t;
 
-class QTextStream;
+class TQTextStream;
 
 namespace KMPlayer {
 
@@ -164,8 +164,8 @@ public:
 };
 
 /*
- * Base class for double linked tree nodes having parent/siblings/children.
- * The linkage is a shared firstChild and weak parentNode.
+ * Base class for double linked tree nodes having tqparent/siblings/tqchildren.
+ * The linkage is a shared firstChild and weak tqparentNode.
  */
 template <class T>
 class KMPLAYER_EXPORT TreeNode : public ListNodeBase <T> {
@@ -176,7 +176,7 @@ public:
     virtual void removeChild (typename Item<T>::SharedType c);
 
     bool hasChildNodes () const { return m_first_child != 0L; }
-    typename Item<T>::SharedType parentNode () const { return m_parent; }
+    typename Item<T>::SharedType tqparentNode () const { return m_parent; }
     typename Item<T>::SharedType firstChild () const { return m_first_child; }
     typename Item<T>::SharedType lastChild () const { return m_last_child; }
 
@@ -193,15 +193,15 @@ protected:
 class KMPLAYER_EXPORT Attribute : public ListNodeBase <Attribute> {
 public:
     KDE_NO_CDTOR_EXPORT Attribute () {}
-    Attribute (const TrieString & n, const QString & v);
+    Attribute (const TrieString & n, const TQString & v);
     KDE_NO_CDTOR_EXPORT ~Attribute () {}
     TrieString name () const { return m_name; }
-    QString value () const { return m_value; }
+    TQString value () const { return m_value; }
     void setName (const TrieString &);
-    void setValue (const QString &);
+    void setValue (const TQString &);
 protected:
     TrieString m_name;
-    QString m_value;
+    TQString m_value;
 };
 
 ITEM_AS_POINTER(KMPlayer::Attribute)
@@ -246,7 +246,7 @@ typedef Item<Node>::WeakType NodePtrW;
 typedef Item<Attribute>::SharedType AttributePtr;
 typedef Item<Attribute>::WeakType AttributePtrW;
 typedef Item<Event>::SharedType EventPtr;
-typedef List<Node> NodeList;                 // eg. for Node's children
+typedef List<Node> NodeList;                 // eg. for Node's tqchildren
 typedef Item<NodeList>::SharedType NodeListPtr;
 typedef Item<NodeList>::WeakType NodeListPtrW;
 ITEM_AS_POINTER(KMPlayer::NodeList)
@@ -312,14 +312,14 @@ public:
     virtual ~Node ();
     Document * document ();
     virtual Mrl * mrl ();
-    virtual NodePtr childFromTag (const QString & tag);
-    void characterData (const QString & s);
-    QString innerText () const;
-    QString innerXML () const;
-    QString outerXML () const;
+    virtual NodePtr childFromTag (const TQString & tag);
+    void characterData (const TQString & s);
+    TQString innerText () const;
+    TQString innerXML () const;
+    TQString outerXML () const;
     virtual const char * nodeName () const;
-    virtual QString nodeValue () const;
-    virtual void setNodeName (const QString &) {}
+    virtual TQString nodeValue () const;
+    virtual void setNodeName (const TQString &) {}
 
     /**
      * If this is a derived Mrl object and has a SRC attribute
@@ -397,12 +397,12 @@ public:
     virtual void begin ();
     /**
      * Sets state to state_finish when >= state_activated.
-     * Notifies parent with a childDone call.
+     * Notifies tqparent with a childDone call.
      */
     virtual void finish ();
     /**
      * Stops element, sets state to state_deactivated. Calls deactivate() on 
-     * activated/deferred children. May call childDone() when active() and not
+     * activated/deferred tqchildren. May call childDone() when active() and not
      * finished yet.
      */
     virtual void deactivate ();
@@ -440,7 +440,7 @@ public:
      */
     virtual void opened ();
     /*
-     * Close tag is found by parser, children are appended
+     * Close tag is found by parser, tqchildren are appended
      */
     virtual void closed ();
 protected:
@@ -475,8 +475,8 @@ class KMPLAYER_EXPORT Element : public Node {
 public:
     ~Element ();
     void setAttributes (AttributeListPtr attrs);
-    void setAttribute (const TrieString & name, const QString & value);
-    QString getAttribute (const TrieString & name);
+    void setAttribute (const TrieString & name, const TQString & value);
+    TQString getAttribute (const TrieString & name);
     KDE_NO_EXPORT AttributeListPtr attributes () const { return m_attributes; }
     virtual void init ();
     virtual void reset ();
@@ -487,13 +487,13 @@ public:
      * pass a modification id, that it can use to restore the old value.
      * Param will be auto removed on deactivate
      */
-    void setParam (const TrieString &para, const QString &val, int * mod_id=0L);
-    QString param (const TrieString & para);
+    void setParam (const TrieString &para, const TQString &val, int * mod_id=0L);
+    TQString param (const TrieString & para);
     void resetParam (const TrieString & para, int mod_id);
     /**
      * Called from (re)setParam for specialized interpretation of params
      **/
-    virtual void parseParam (const TrieString &, const QString &) {}
+    virtual void parseParam (const TrieString &, const TQString &) {}
 protected:
     Element (NodePtr & d, short id=0);
     AttributeListPtr m_attributes;
@@ -512,7 +512,7 @@ public:
     void setRefNode (const NodePtr ref);
 protected:
     NodePtrW ref_node;
-    QString tag_name;
+    TQString tag_name;
 };
 
 template <class T>
@@ -526,8 +526,8 @@ inline KDE_NO_EXPORT T * convertNode (NodePtr e) {
 class KMPLAYER_EXPORT Mrl : public Element {
 protected:
     Mrl (NodePtr & d, short id=0);
-    NodePtr childFromTag (const QString & tag);
-    void parseParam (const TrieString &, const QString &);
+    NodePtr childFromTag (const TQString & tag);
+    void parseParam (const TrieString &, const TQString &);
     unsigned int cached_ismrl_version;
     PlayType cached_play_type;
 public:
@@ -539,7 +539,7 @@ public:
     virtual Mrl * linkNode ();
     virtual Mrl * mrl ();
     virtual void endOfFile ();
-    QString absolutePath ();
+    TQString absolutePath ();
     /*
      * Reimplement to callback with requestPlayURL if isPlayable()
      */ 
@@ -553,12 +553,12 @@ public:
 
     /**
      * If this Mrl is top node of external document, opener has the
-     * location in SCR. Typically that's the parent of this node.
+     * location in SCR. Typically that's the tqparent of this node.
      */
     NodePtrW opener; //if this node is top node of external document,
-    QString src;
-    QString pretty_name;
-    QString mimetype;
+    TQString src;
+    TQString pretty_name;
+    TQString mimetype;
     Single width;
     Single height;
     float aspect;
@@ -594,7 +594,7 @@ public:
     /**
      * Request to show msg for informing the user
      */
-    virtual void setInfoMessage (const QString & msg) = 0;
+    virtual void setInfoMessage (const TQString & msg) = 0;
     /**
      * Ask for connection bitrates settings
      */
@@ -613,12 +613,12 @@ class KMPLAYER_NO_EXPORT RemoteObject {
 public:
     RemoteObject ();
     virtual ~RemoteObject ();
-    bool wget (const QString & url);
+    bool wget (const TQString & url);
     void killWGet ();
     void clear ();
-    QString mimetype ();
+    TQString mimetype ();
 protected:
-    KDE_NO_EXPORT virtual void remoteReady (QByteArray &) {}
+    KDE_NO_EXPORT virtual void remoteReady (TQByteArray &) {}
     bool downloading () const;
 private:
     RemoteObjectPrivate *d;
@@ -632,14 +632,14 @@ public:
     virtual SurfacePtr createSurface (NodePtr owner, const SRect & rect) = 0;
     virtual IRect toScreen (Single x, Single y, Single w, Single h) = 0;
     virtual void resize (const SRect & rect) = 0;
-    virtual void repaint () = 0;
-    virtual void repaint (const SRect &rect) = 0;
+    virtual void tqrepaint () = 0;
+    virtual void tqrepaint (const SRect &rect) = 0;
     virtual void video () = 0;
-    void remove ();                // remove from parent, mark ancestors dirty
+    void remove ();                // remove from tqparent, mark ancestors dirty
     void markDirty ();             // mark this and ancestors dirty
 
     NodePtrW node;
-    SRect bounds;                  // bounds in in parent coord. 
+    SRect bounds;                  // bounds in in tqparent coord. 
     float xscale, yscale;          // internal scaling
     unsigned int background_color; // rgba background color
     bool dirty;                    // a decendant is removed
@@ -710,15 +710,15 @@ typedef WeakPtr <Postpone> PostponePtrW;
 class KMPLAYER_EXPORT Document : public Mrl {
     friend class Postpone;
 public:
-    Document (const QString &, PlayListNotify * notify = 0L);
+    Document (const TQString &, PlayListNotify * notify = 0L);
     ~Document ();
-    NodePtr getElementById (const QString & id);
-    NodePtr getElementById (NodePtr start, const QString & id, bool inter_doc);
+    NodePtr getElementById (const TQString & id);
+    NodePtr getElementById (NodePtr start, const TQString & id, bool inter_doc);
     /** All nodes have shared pointers to Document,
      * so explicitly dispose it (calls clear and set m_doc to 0L)
      * */
     void dispose ();
-    virtual NodePtr childFromTag (const QString & tag);
+    virtual NodePtr childFromTag (const TQString & tag);
     KDE_NO_EXPORT const char * nodeName () const { return "document"; }
     virtual void activate ();
     virtual void defer ();
@@ -765,15 +765,15 @@ private:
  */
 class KMPLAYER_EXPORT TextNode : public Node {
 public:
-    TextNode (NodePtr & d, const QString & s, short _id = id_node_text);
+    TextNode (NodePtr & d, const TQString & s, short _id = id_node_text);
     KDE_NO_CDTOR_EXPORT ~TextNode () {}
-    void appendText (const QString & s);
-    void setText (const QString & txt) { text = txt; }
+    void appendText (const TQString & s);
+    void setText (const TQString & txt) { text = txt; }
     const char * nodeName () const { return "#text"; }
-    QString nodeValue () const;
+    TQString nodeValue () const;
     bool expose () const;
 protected:
-    QString text;
+    TQString text;
 };
 
 /**
@@ -781,23 +781,23 @@ protected:
  */
 class KMPLAYER_EXPORT CData : public TextNode {
 public:
-    CData (NodePtr & d, const QString & s);
+    CData (NodePtr & d, const TQString & s);
     KDE_NO_CDTOR_EXPORT ~CData () {}
     const char * nodeName () const { return "#cdata"; }
 };
 
 /**
- * Unrecognized tag by parent element or just some auxiliary node
+ * Unrecognized tag by tqparent element or just some auxiliary node
  */
 class KMPLAYER_EXPORT DarkNode : public Element {
 public:
-    DarkNode (NodePtr & d, const QString & n, short id=0);
+    DarkNode (NodePtr & d, const TQString & n, short id=0);
     KDE_NO_CDTOR_EXPORT ~DarkNode () {}
     const char * nodeName () const { return name.ascii (); }
-    NodePtr childFromTag (const QString & tag);
+    NodePtr childFromTag (const TQString & tag);
     virtual bool expose () const;
 protected:
-    QString name;
+    TQString name;
 };
 
 namespace SMIL {
@@ -860,7 +860,7 @@ public:
  */
 class KMPLAYER_EXPORT GenericURL : public Mrl { 
 public:
-    GenericURL(NodePtr &d, const QString &s, const QString &n=QString ());
+    GenericURL(NodePtr &d, const TQString &s, const TQString &n=TQString ());
     KDE_NO_EXPORT const char * nodeName () const { return "url"; }
     void closed ();
 };
@@ -871,16 +871,16 @@ public:
 class KMPLAYER_EXPORT GenericMrl : public Mrl { 
 public:
     KDE_NO_CDTOR_EXPORT GenericMrl (NodePtr & d) : Mrl (d), node_name ("mrl") {}
-    GenericMrl(NodePtr &d, const QString &s, const QString & name=QString (), const QString &tag=QString ("mrl"));
+    GenericMrl(NodePtr &d, const TQString &s, const TQString & name=TQString (), const TQString &tag=TQString ("mrl"));
     KDE_NO_EXPORT const char * nodeName () const { return node_name.ascii (); }
     void closed ();
     bool expose () const;
-    QString node_name;
+    TQString node_name;
 };
 
 KMPLAYER_EXPORT
-void readXML (NodePtr root, QTextStream & in, const QString & firstline, bool set_opener=true);
-KMPLAYER_EXPORT Node * fromXMLDocumentTag (NodePtr & d, const QString & tag);
+void readXML (NodePtr root, TQTextStream & in, const TQString & firstline, bool set_opener=true);
+KMPLAYER_EXPORT Node * fromXMLDocumentTag (NodePtr & d, const TQString & tag);
 
 template <class T>
 inline Item<T>::Item () : m_self (static_cast <T*> (this), true) {}