TQt4 port piklab

This enables compilation under both Qt3 and Qt4


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

1 files changed, 13 insertions, 12 deletions

diff --git a/src/common/cli/cli_main.h b/src/common/cli/cli_main.h
index 9b54c70..b0d71cb 100644
--- a/src/common/cli/cli_main.h
+++ b/src/common/cli/cli_main.h
@@ -17,8 +17,8 @@ namespace CLI
 {
 //-----------------------------------------------------------------------------
 enum Property { NoProperty = 0, HasForce = 1, HasInteractiveMode = 2 };
-Q_DECLARE_FLAGS(Properties, Property)
-Q_DECLARE_OPERATORS_FOR_FLAGS(Properties)
+TQ_DECLARE_FLAGS(Properties, Property)
+TQ_DECLARE_OPERATORS_FOR_FLAGS(Properties)
 
 extern const KCmdLineOptions OPTIONS[];
 //-----------------------------------------------------------------------------
@@ -29,8 +29,8 @@ struct CommandData {
 };
 extern const CommandData NORMAL_COMMAND_DATA[];
 extern const CommandData INTERACTIVE_COMMAND_DATA[];
-extern const CommandData *findCommandData(const QString &command);
-extern ExitCode findCommand(const QString &s);
+extern const CommandData *findCommandData(const TQString &command);
+extern ExitCode findCommand(const TQString &s);
 extern ExitCode commandList();
 
 //-----------------------------------------------------------------------------
@@ -39,8 +39,8 @@ struct PropertyData
   const char *name, *optName, *alias, *help, *list, *listHelp;
 };
 extern const PropertyData PROPERTY_DATA[];
-extern bool isPropertyList(const QString &s);
-extern bool isProperty(const QString &s);
+extern bool isPropertyList(const TQString &s);
+extern bool isProperty(const TQString &s);
 extern ExitCode propertyList();
 
 //-----------------------------------------------------------------------------
@@ -55,18 +55,19 @@ private:
 };
 
 //-----------------------------------------------------------------------------
-class MainBase : public QObject, public Log::Base
+class MainBase : public TQObject, public Log::Base
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
   MainBase(Properties properties);
   virtual OptionList optionList(const char *fileDescription) const;
   virtual ExitCode doRun();
-  virtual ExitCode list(const QString &listName);
-  virtual ExitCode prepareCommand(const QString &command) = 0;
-  virtual ExitCode executeCommand(const QString &command) = 0;
-  virtual ExitCode executeSetCommand(const QString &property, const QString &value) = 0;
-  virtual QString executeGetCommand(const QString &property) = 0;
+  virtual ExitCode list(const TQString &listName);
+  virtual ExitCode prepareCommand(const TQString &command) = 0;
+  virtual ExitCode executeCommand(const TQString &command) = 0;
+  virtual ExitCode executeSetCommand(const TQString &property, const TQString &value) = 0;
+  virtual TQString executeGetCommand(const TQString &property) = 0;
 
 protected:
   Properties    _properties;