1 files changed, 57 insertions, 57 deletions

diff --git a/kommander/widget/kommanderwidget.h b/kommander/widget/kommanderwidget.h
index 90a748b2..c9576010 100644
--- a/kommander/widget/kommanderwidget.h
+++ b/kommander/widget/kommanderwidget.h
@@ -23,11 +23,11 @@
 
 #include "kommander_export.h"
 /* QT INCLUDES */
-#include <qmap.h>
-#include <qobject.h>
-#include <qpair.h>
-#include <qstring.h>
-#include <qstringlist.h>
+#include <tqmap.h>
+#include <tqobject.h>
+#include <tqpair.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
 
 class ParserData;
 
@@ -35,64 +35,64 @@ class KOMMANDER_EXPORT KommanderWidget
 {
   friend class MyProcess;
 public:
-  KommanderWidget(QObject *);
+  KommanderWidget(TQObject *);
   virtual ~KommanderWidget();
 
   //List of available states. Most widgets have only one state, but f. e. radiobutton has both 
   // 'checked' and 'unchecked'
-  virtual QStringList states() const;
-  virtual QStringList displayStates() const;
-  virtual QString currentState() const = 0;
+  virtual TQStringList states() const;
+  virtual TQStringList displayStates() const;
+  virtual TQString currentState() const = 0;
 
   virtual bool isKommanderWidget() const = 0;
 
   // Associated script
-  virtual void setAssociatedText(const QStringList& a_associations);
-  virtual QStringList associatedText() const;
+  virtual void setAssociatedText(const TQStringList& a_associations);
+  virtual TQStringList associatedText() const;
   virtual bool hasAssociatedText();
 
   // Execute default script, expanding all @macros.
-  virtual QString evalAssociatedText();
+  virtual TQString evalAssociatedText();
   // Execute given script, expanding all @macros.
-  virtual QString evalAssociatedText(const QString&);
+  virtual TQString evalAssociatedText(const TQString&);
   // Evaluate given Kommander function using given args.
-  virtual QString evalFunction(const QString& function, const QStringList& args);
+  virtual TQString evalFunction(const TQString& function, const TQStringList& args);
   // Parse and evaluate function for given widget, converting it to appropriate DCOP call.
-  virtual QString evalWidgetFunction(const QString& identifier, const QString& s, int& pos);
+  virtual TQString evalWidgetFunction(const TQString& identifier, const TQString& s, int& pos);
   // Evaluate given array function using given args.
-  virtual QString evalArrayFunction(const QString&, const QStringList&);
+  virtual TQString evalArrayFunction(const TQString&, const TQStringList&);
   // Parse and evaluate given execBegin..execEnd block.
-  virtual QString evalExecBlock(const QStringList&, const QString& s, int& pos);
+  virtual TQString evalExecBlock(const TQStringList&, const TQString& s, int& pos);
   // Parse and evaluate given forEach..end block.
-  virtual QString evalForEachBlock(const QStringList&, const QString& s, int& pos);
+  virtual TQString evalForEachBlock(const TQStringList&, const TQString& s, int& pos);
   // Parse and evaluate given for..end block.
-  virtual QString evalForBlock(const QStringList&, const QString& s, int& pos);
+  virtual TQString evalForBlock(const TQStringList&, const TQString& s, int& pos);
   // Parse and evaluate given switch..case..end block.
-  virtual QString evalSwitchBlock(const QStringList&, const QString& s, int& pos);
+  virtual TQString evalSwitchBlock(const TQStringList&, const TQString& s, int& pos);
   // Parse and evaluate given if..endif block.
-  virtual QString evalIfBlock(const QStringList&, const QString& s, int& pos);
+  virtual TQString evalIfBlock(const TQStringList&, const TQString& s, int& pos);
   // Population text. It will become widgetText after populate() is called
-  virtual QString populationText() const;
-  virtual void setPopulationText(const QString&);
+  virtual TQString populationText() const;
+  virtual void setPopulationText(const TQString&);
   virtual void populate() = 0;
 
   // Handles all widget-specific DCOP calls 
-  virtual QString handleDCOP(int function, const QStringList& args = QStringList());
+  virtual TQString handleDCOP(int function, const TQStringList& args = TQStringList());
   // Checks if appropriate function is supported by widget. By default all functions
   // are reported as supported: use this to allow recognizing incorrect function calls.
   virtual bool isFunctionSupported(int function);
   // Checks if the function is common widget function (i. e. supported by all widgets)
   virtual bool isCommonFunction(int function);
   // Checks if the string is a valid widget name)
-  virtual bool isWidget(const QString& a_name) const;
+  virtual bool isWidget(const TQString& a_name) const;
   // Returns widget from name 
-  virtual KommanderWidget* widgetByName(const QString& a_name) const;
+  virtual KommanderWidget* widgetByName(const TQString& a_name) const;
   // Returns current widget name;
-  virtual QString widgetName() const;
+  virtual TQString widgetName() const;
   // Returns filename associated with the dialog
-  virtual QString fileName();
+  virtual TQString fileName();
 
-  QObject* object() { return m_thisObject;}
+  TQObject* object() { return m_thisObject;}
 
 
   // Recognizes editor vs executor mode
@@ -102,55 +102,55 @@ public:
   // Default parser
   static bool useInternalParser;
   // Return global variable value
-  QString global(const QString& variableName);
+  TQString global(const TQString& variableName);
   // Set global variable value
-  void setGlobal(const QString& variableName, const QString& value);
+  void setGlobal(const TQString& variableName, const TQString& value);
 
 protected:
-  virtual void setStates(const QStringList& a_states);
-  virtual void setDisplayStates(const QStringList& a_displayStates);
+  virtual void setStates(const TQStringList& a_states);
+  virtual void setDisplayStates(const TQStringList& a_displayStates);
 
   // Execute DCOP query and return its result or null on failure
-  // Only QString and int are now handled
-  QString DCOPQuery(const QStringList& args);
-  QString localDCOPQuery(const QString function, const QStringList& args = QStringList());
-  QString localDCOPQuery(const QString function, const QString& arg1, 
-     const QString& arg2, const QString& arg3 = QString::null,
-     const QString& arg4 = QString::null);
+  // Only TQString and int are now handled
+  TQString DCOPQuery(const TQStringList& args);
+  TQString localDCOPQuery(const TQString function, const TQStringList& args = TQStringList());
+  TQString localDCOPQuery(const TQString function, const TQString& arg1, 
+     const TQString& arg2, const TQString& arg3 = TQString::null,
+     const TQString& arg4 = TQString::null);
   // Execute given command, return its result
-  QString execCommand(const QString& a_command, const QString& a_shell = QString::null) const;
+  TQString execCommand(const TQString& a_command, const TQString& a_shell = TQString::null) const;
   // Find and run dialog (with optional parameters)
-  QString runDialog(const QString& a_dialog, const QString& a_params = QString::null);
+  TQString runDialog(const TQString& a_dialog, const TQString& a_params = TQString::null);
   // Display error message a_error; display current class name if no other is given
-  void printError(const QString& a_error) const;
+  void printError(const TQString& a_error) const;
   // Auxiliary functions for parser
   // Find matching brackets starting from current position
-  QString parseBrackets(const QString& s, int& from, bool& ok) const;
+  TQString parseBrackets(const TQString& s, int& from, bool& ok) const;
   // Return identifier: the longest string of letters and numbers starting from i
-  QString parseIdentifier(const QString& s, int& from) const;
+  TQString parseIdentifier(const TQString& s, int& from) const;
   // Parse arguments for given function. Returns list of arguments without quotations
-  QStringList parseArgs(const QString& s, bool &ok);
+  TQStringList parseArgs(const TQString& s, bool &ok);
   // Remove quotes from given identifier
-  QString parseQuotes(const QString& s) const;
+  TQString parseQuotes(const TQString& s) const;
   // Parse function
-  QStringList parseFunction(const QString& group, const QString& function,
-    const QString& s, int& from, bool& ok);
+  TQStringList parseFunction(const TQString& group, const TQString& function,
+    const TQString& s, int& from, bool& ok);
   // Detect and return block boundary
-  int parseBlockBoundary(const QString& s, int from, const QStringList& args) const;
+  int parseBlockBoundary(const TQString& s, int from, const TQStringList& args) const;
 
   // Parse given identifier as widget name
-  KommanderWidget* parseWidget(const QString& name) const;
+  KommanderWidget* parseWidget(const TQString& name) const;
   // Return parent dialog of this widget
-  QWidget* parentDialog() const;
-  QString substituteVariable(QString text, QString variable, QString value) const;
+  TQWidget* parentDialog() const;
+  TQString substituteVariable(TQString text, TQString variable, TQString value) const;
 
   ParserData* internalParserData() const;
 
-  QObject *m_thisObject;
-  QStringList m_states;
-  QStringList m_displayStates;
-  QStringList m_associatedText;
-  QString m_populationText;
+  TQObject *m_thisObject;
+  TQStringList m_states;
+  TQStringList m_displayStates;
+  TQStringList m_associatedText;
+  TQString m_populationText;
 
   // Internal parser data
   static ParserData* m_parserData;