TQt4 port tellico

This enables compilation under both Qt3 and Qt4


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

1 files changed, 17 insertions, 17 deletions

diff --git a/src/tellico_kernel.h b/src/tellico_kernel.h
index ed801d6..bafa022 100644
--- a/src/tellico_kernel.h
+++ b/src/tellico_kernel.h
@@ -21,9 +21,9 @@
 
 class KURL;
 
-class QWidget;
-class QString;
-class QStringList;
+class TQWidget;
+class TQString;
+class TQStringList;
 
 namespace Tellico {
   class MainWindow;
@@ -45,14 +45,14 @@ public:
   /**
    * Initializes the singleton. Should just be called once, from Tellico::MainWindow
    */
-  static void init(MainWindow* parent) { if(!s_self) s_self = new Kernel(parent); }
+  static void init(MainWindow* tqparent) { if(!s_self) s_self = new Kernel(tqparent); }
 
   /**
-   * Returns a pointer to the parent widget. This is mainly used for error dialogs and the like.
+   * Returns a pointer to the tqparent widget. This is mainly used for error dialogs and the like.
    *
    * @return The widget pointer
    */
-  QWidget* widget() { return m_widget; }
+  TQWidget* widget() { return m_widget; }
 
   /**
    * Returns the url of the current document.
@@ -65,29 +65,29 @@ public:
    *
    * @return the field titles
    */
-  const QStringList& fieldTitles() const;
+  const TQStringList& fieldTitles() const;
   /**
    * Returns the name of an field, given its title. Wraps the call to the collection itself.
    *
    * @param title The field title
    * @return The field name
    */
-  QString fieldNameByTitle(const QString& title) const;
+  TQString fieldNameByTitle(const TQString& title) const;
   /**
    * Returns the title of an field, given its name. Wraps the call to the collection itself.
    *
    * @param name The field name
    * @return The field title
    */
-  QString fieldTitleByName(const QString& name) const;
-  QStringList valuesByFieldName(const QString& name) const;
+  TQString fieldTitleByName(const TQString& name) const;
+  TQStringList valuesByFieldName(const TQString& name) const;
 
   int collectionType() const;
-  QString collectionTypeName() const;
+  TQString collectionTypeName() const;
 
-  void sorry(const QString& text, QWidget* widget=0);
+  void sorry(const TQString& text, TQWidget* widget=0);
 
-  void beginCommandGroup(const QString& name);
+  void beginCommandGroup(const TQString& name);
   void endCommandGroup();
   void resetHistory();
 
@@ -116,7 +116,7 @@ public:
 
   // adds new fields into collection if any values in entries are not empty
   // first object is modified fields, second is new fields
-  QPair<Data::FieldVec, Data::FieldVec> mergeFields(Data::CollPtr coll,
+  TQPair<Data::FieldVec, Data::FieldVec> mergeFields(Data::CollPtr coll,
                                                     Data::FieldVec fields,
                                                     Data::EntryVec entries);
 
@@ -124,19 +124,19 @@ public:
   const KCommandHistory* commandHistory() { return &m_commandHistory; }
 
   int askAndMerge(Data::EntryPtr entry1, Data::EntryPtr entry2, Data::FieldPtr field,
-                  QString value1 = QString(), QString value2 = QString());
+                  TQString value1 = TQString(), TQString value2 = TQString());
 
 private:
   static Kernel* s_self;
 
   // all constructors are private
-  Kernel(MainWindow* parent);
+  Kernel(MainWindow* tqparent);
   Kernel(const Kernel&);
   Kernel& operator=(const Kernel&);
 
   void doCommand(KCommand* command);
 
-  QWidget* m_widget;
+  TQWidget* m_widget;
   KCommandHistory m_commandHistory;
   Command::Group* m_commandGroup;
 };