1 files changed, 24 insertions, 23 deletions

diff --git a/quanta/src/quanta.h b/quanta/src/quanta.h
index e55c8814..b10d6480 100644
--- a/quanta/src/quanta.h
+++ b/quanta/src/quanta.h
@@ -30,7 +30,7 @@
 
 #define IDS_DEFAULT     "Ready."
 
-// include files for Qt
+// include files for TQt
 #include <tqmap.h>
 #include <tqdict.h>
 #include <tqvaluelist.h>
@@ -56,11 +56,11 @@ class QuantaPluginInterface;
 
 class QuantaDoc;
 class QuantaView;
-class QNewDTEPStuff;
-class QNewToolbarStuff;
-class QNewTemplateStuff;
-class QNewScriptStuff;
-class QNewDocStuff;
+class TQNewDTEPStuff;
+class TQNewToolbarStuff;
+class TQNewTemplateStuff;
+class TQNewScriptStuff;
+class TQNewDocStuff;
 
 class TQTabWidget;
 class TQWidgetStack;
@@ -112,6 +112,7 @@ struct ToolbarEntry;
 class QuantaApp : public KMdiMainFrm, public DCOPWindowManagerIf
 {
   Q_OBJECT
+  TQ_OBJECT
 
 friend class QuantaInit;
 
@@ -131,8 +132,8 @@ public:
   DebuggerManager *debugger() const {return m_debugger;}
   KParts::PartManager *partManager() {return m_partManager;}
 
-  TQWidget* createContainer(TQWidget *parent, int index, const TQDomElement &element, int &id );
-  void removeContainer(TQWidget *container, TQWidget *parent, TQDomElement &element, int id );
+  TQWidget* createContainer(TQWidget *tqparent, int index, const TQDomElement &element, int &id );
+  void removeContainer(TQWidget *container, TQWidget *tqparent, TQDomElement &element, int id );
 /** Returns the project's base URL if it exists, the HOME dir if there is no project and no opened document (or the current opened document was not saved yet), and the base URL of the opened document, if it is saved somewhere.
 
   maps to the same function in Project*/
@@ -193,7 +194,7 @@ public:
    * @param attr The string containing the attrs of the new Node to create.
    * @return Returns a new Node created according to the contents of the TagDialog.
    */
-  Node *showTagDialogAndReturnNode(const TQString &tag, const TQString &attr = TQString::null);
+  Node *showTagDialogAndReturnNode(const TQString &tag, const TQString &attr = TQString());
   /** Returns the baseURL of the document. */
   KURL baseURL();
 
@@ -281,15 +282,15 @@ public slots:
        unexpected things may happen. */
   void slotStatusMsg(const TQString &text);
 
-  void slotNewStatus();
+  void slotNewtqStatus();
   void slotNewLineColumn();
-//  void slotUpdateStatus(TQWidget*);FIXME:
+//  void slotUpdatetqStatus(TQWidget*);FIXME:
 
-  /** repaint preview */
+  /** tqrepaint preview */
   void slotRepaintPreview();
   /** toggles showing the preview */
   void slotToggleShowPreview();
-  /** Shows the preview widget and repaints the preview or
+  /** Shows the preview widget and tqrepaints the preview or
         hides the preview widget and restores the original document
   */
   void slotShowPreviewWidget(bool show);
@@ -297,7 +298,7 @@ public slots:
         - hide if the preview was in the editor area
         - update if the preview is in a toolview
    */
-  void slotChangePreviewStatus();
+  void slotChangePreviewtqStatus();
   /** Called when the preview widget got or lost the focus */
   void slotPreviewHasFocus(bool focus);
 
@@ -315,7 +316,7 @@ public slots:
   void slotOptionsConfigureToolbars();
   void slotNewToolbarConfig();
   /** Configure toolbars, show defaultToolbar by default */
-  void slotConfigureToolbars(const TQString& defaultToolbar = TQString::null);
+  void slotConfigureToolbars(const TQString& defaultToolbar = TQString());
   void slotOptionsConfigureActions();
 
   void setCursorPosition(int row, int col );
@@ -523,12 +524,12 @@ protected slots:
 
 protected:
   /** Create a DTEP tarball which can be uploaded or sent in email. Returns
-  *   the name of the created file or TQString::null if creation has failed.
+  *   the name of the created file or TQString() if creation has failed.
   */
   TQString createDTEPTarball();
 
   /** Create a toolbar tarball which can be uploaded or sent in email. Returns
-  *   the name of the created file or TQString::null if creation has failed.
+  *   the name of the created file or TQString() if creation has failed.
   */
   TQString createToolbarTarball();
 
@@ -543,7 +544,7 @@ protected:
   virtual bool queryClose();
   void saveAsTemplate (bool projectTemplate, bool selectionOnly = false);
   /** Saves a toolbar as local or project specific. */
-  bool saveToolbar(bool localToolbar = true, const TQString& toolbarToSave = TQString::null, const KURL& destURL = KURL());
+  bool saveToolbar(bool localToolbar = true, const TQString& toolbarToSave = TQString(), const KURL& destURL = KURL());
   /** Saves the toolbar and the actions. Returns the name of the actions file*/
   KURL saveToolbarToFile(const TQString& toolbarName,const KURL& destFile);
   /** Makes the tabwidget look and behave like we want. If closeButtonsOnly is true,
@@ -643,11 +644,11 @@ protected: // Protected attributes
   DCOPQuanta *dcopQuanta;
   KParts::PartManager *m_partManager;  ///< the pointer to the part manager
   TQGuardedPtr<KTextEditor::View> m_oldKTextEditor;  ///< remembers the last activated GUI
-  QNewDTEPStuff *m_newDTEPStuff;
-  QNewToolbarStuff *m_newToolbarStuff;
-  QNewTemplateStuff *m_newTemplateStuff;
-  QNewScriptStuff *m_newScriptStuff;
-  QNewDocStuff *m_newDocStuff;
+  TQNewDTEPStuff *m_newDTEPStuff;
+  TQNewToolbarStuff *m_newToolbarStuff;
+  TQNewTemplateStuff *m_newTemplateStuff;
+  TQNewScriptStuff *m_newScriptStuff;
+  TQNewDocStuff *m_newDocStuff;
   TQDict<ToolbarEntry> m_toolbarList;
 
 public: //TODO: check if it's worth to make a read method for them