1 files changed, 18 insertions, 17 deletions

diff --git a/src/controller.h b/src/controller.h
index 58c3917..462d0bb 100644
--- a/src/controller.h
+++ b/src/controller.h
@@ -14,7 +14,7 @@
 #ifndef TELLICOCONTROLLER_H
 #define TELLICOCONTROLLER_H
 
-class QPopupMenu;
+class TQPopupMenu;
 
 namespace Tellico {
   class MainWindow;
@@ -27,7 +27,7 @@ namespace Tellico {
 
 #include "entry.h"
 
-#include <qobject.h>
+#include <tqobject.h>
 
 namespace Tellico {
 class Observer;
@@ -35,16 +35,17 @@ class Observer;
 /**
  * @author Robby Stephenson
  */
-class Controller : public QObject {
+class Controller : public TQObject {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
   static Controller* self() { return s_self; }
   /**
    * Initializes the singleton. Should just be called once, from Tellico::MainWindow
    */
-  static void init(MainWindow* parent, const char* name=0) {
-    if(!s_self) s_self = new Controller(parent, name);
+  static void init(MainWindow* tqparent, const char* name=0) {
+    if(!s_self) s_self = new Controller(tqparent, name);
   }
 
   const Data::EntryVec& selectedEntries() const { return m_selectedEntries; }
@@ -55,11 +56,11 @@ public:
   /**
    * Plug the default collection actions into a widget
    */
-  void plugCollectionActions(QPopupMenu* popup);
+  void plugCollectionActions(TQPopupMenu* popup);
   /**
    * Plug the default entry actions into a widget
    */
-  void plugEntryActions(QPopupMenu* popup);
+  void plugEntryActions(TQPopupMenu* popup);
   void updateActions() const;
 
   GroupIterator groupIterator() const;
@@ -68,21 +69,21 @@ public:
    * That field name may not be an actual field in the collection, since
    * pseudo-groups like _people exist.
    */
-  QString groupBy() const;
+  TQString groupBy() const;
   /**
    * Returns a list of the fields being used to group the entries.
    * For ordinary fields, the list has a single item, the field name.
    * For the pseudo-group _people, all the people fields are included.
    */
-  QStringList expandedGroupBy() const;
+  TQStringList expandedGroupBy() const;
   /**
    * Returns a list of the titles of the fields being used to sort the entries in the detailed column view.
    */
-  QStringList sortTitles() const;
+  TQStringList sortTitles() const;
   /**
    * Returns the title of the fields currently visible in the detailed column view.
    */
-  QStringList visibleColumns() const;
+  TQStringList visibleColumns() const;
 
   void    addObserver(Observer* obs);
   void removeObserver(Observer* obs);
@@ -107,7 +108,7 @@ public:
 public slots:
   /**
    * When a collection is added to the document, certain actions need to be taken
-   * by the parent app. The collection toolbar is updated, the entry count is set, and
+   * by the tqparent app. The collection toolbar is updated, the entry count is set, and
    * the collection's modified signal is connected to the @ref GroupView widget.
    *
    * @param coll A pointer to the collection being added
@@ -130,10 +131,10 @@ public slots:
    * @param widget The widget doing the selecting, if NULL, then use previous
    * @param entries The list of selected entries
    */
-  void slotUpdateSelection(QWidget* widget, const Tellico::Data::EntryVec& entries);
+  void slotUpdateSelection(TQWidget* widget, const Tellico::Data::EntryVec& entries);
   void slotUpdateCurrent(const Tellico::Data::EntryVec& entries);
   void slotCopySelectedEntries();
-  void slotUpdateSelectedEntries(const QString& source);
+  void slotUpdateSelectedEntries(const TQString& source);
   void slotDeleteSelectedEntries();
   void slotMergeSelectedEntries();
   void slotUpdateFilter(Tellico::FilterPtr filter);
@@ -148,11 +149,11 @@ signals:
 
 private:
   static Controller* s_self;
-  Controller(MainWindow* parent, const char* name);
+  Controller(MainWindow* tqparent, const char* name);
 
   void blockAllSignals(bool block) const;
   bool canCheckIn() const;
-  void plugUpdateMenu(QPopupMenu* popup);
+  void plugUpdateMenu(TQPopupMenu* popup);
   enum EntryDirection { PrevEntry, NextEntry };
   void goEntrySibling(EntryDirection dir);
 
@@ -168,7 +169,7 @@ private:
    */
   Data::EntryVec m_selectedEntries;
   Data::EntryVec m_currentEntries;
-  QWidget* m_widgetWithSelection;
+  TQWidget* m_widgetWithSelection;
 };
 
 } // end namespace