1 files changed, 12 insertions, 11 deletions

diff --git a/src/document/RosegardenGUIDoc.h b/src/document/RosegardenGUIDoc.h
index 46eb805..282e8c0 100644
--- a/src/document/RosegardenGUIDoc.h
+++ b/src/document/RosegardenGUIDoc.h
@@ -87,15 +87,16 @@ static const int MERGE_KEEP_NEW_TIMINGS = (1 << 3);
   * RosegardenGUIDoc owns the Composition in the document.
   */
 
-class RosegardenGUIDoc : public QObject
+class RosegardenGUIDoc : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     /**
      * Constructor for the fileclass of the application
      */
-    RosegardenGUIDoc(TQWidget *parent,
+    RosegardenGUIDoc(TQWidget *tqparent,
                      AudioPluginManager *audioPluginManager = 0,
                      bool skipAutoload = false,
                      const char *name=0);
@@ -146,7 +147,7 @@ protected:
      * action on the view connected to the document.
      *
      * this is just an accessor, other components should call
-     * slotDocumentModified() and clearModifiedStatus() instead of
+     * slotDocumentModified() and clearModifiedtqStatus() instead of
      * this method, which perform all the related housework.
      * 
      */
@@ -163,7 +164,7 @@ public:
      * clears the 'modified' status of the document (sets it back to false).
      * 
      */
-    void clearModifiedStatus();
+    void clearModifiedtqStatus();
 
     /**
      * "save modified" - asks the user for saving if the document is
@@ -425,7 +426,7 @@ public:
     // Get the sequence manager from the app
     //
     SequenceManager* getSequenceManager() 
-        { return (dynamic_cast<RosegardenGUIApp*>(parent()))
+        { return (dynamic_cast<RosegardenGUIApp*>(tqparent()))
                                          ->getSequenceManager(); }
 
     //Obsolete: multitrack MIDI recording. plcl 06/2006.
@@ -438,7 +439,7 @@ public:
     /**
      * return the list of the views currently connected to the document
      */
-    QList<RosegardenGUIView>& getViewList() { return m_viewList; }
+    TQList<RosegardenGUIView>& getViewList() { return m_viewList; }
 
     bool isBeingDestroyed() { return m_beingDestroyed; }
 
@@ -446,9 +447,9 @@ public:
 
 public slots:
     /**
-     * calls repaint() on all views connected to the document object
+     * calls tqrepaint() on all views connected to the document object
      * and is called by the view by which the document has been
-     * changed.  As this view normally repaints itself, it is excluded
+     * changed.  As this view normally tqrepaints itself, it is excluded
      * from the paintEvent.
      */
     void slotUpdateAllViews(RosegardenGUIView *sender);
@@ -574,7 +575,7 @@ protected:
      */
     void saveSegment(TQTextStream&, Segment*, KProgress*,
                      long totalNbOfEvents, long &count,
-                     TQString extraAttributes = TQString::null);
+                     TQString extraAttributes = TQString());
 
     bool deleteOrphanedAudioFiles(bool documentWillNotBeSaved);
 
@@ -616,12 +617,12 @@ protected:
     /**
      * the list of the views currently connected to the document
      */
-    QList<RosegardenGUIView> m_viewList;        
+    TQList<RosegardenGUIView> m_viewList;        
 
     /**
      * the list of the edit views currently editing a part of this document
      */
-    QList<EditViewBase> m_editViewList;
+    TQList<EditViewBase> m_editViewList;
 
     /**
      * the modified flag of the current document