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, 10 insertions, 9 deletions

diff --git a/src/document.h b/src/document.h
index 82d74f7..2481df9 100644
--- a/src/document.h
+++ b/src/document.h
@@ -21,8 +21,8 @@
 
 #include <kurl.h>
 
-#include <qobject.h>
-#include <qguardedptr.h>
+#include <tqobject.h>
+#include <tqguardedptr.h>
 
 namespace Tellico {
   namespace Import {
@@ -32,13 +32,14 @@ namespace Tellico {
 
 /**
  * The Document contains everything needed to deal with the contents, thus separated from
- * the viewer, the Tellico object. It can take of opening and saving documents, and contains
+ * the viewer, the Tellico object. It can take of opening and saving documents, and tqcontains
  * a list of the collections in the document.
  *
  * @author Robby Stephenson
  */
-class Document : public QObject {
+class Document : public TQObject {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
   static Document* self() { if(!s_self) s_self = new Document(); return s_self; }
@@ -135,7 +136,7 @@ public:
    * since each entry in @p coll must be compared to ever entry in the current collection.
    *
    * @param coll A pointer to the collection to be merged.
-   * @return A QPair of the merged entries, see note in datavectors.h
+   * @return A TQPair of the merged entries, see note in datavectors.h
    */
   MergePair mergeCollection(CollPtr coll);
   /**
@@ -150,7 +151,7 @@ public:
   /**
    * Attempts to load an image from the document file
    */
-  bool loadImage(const QString& id);
+  bool loadImage(const TQString& id);
   bool loadAllImagesNow() const;
   bool allImagesOnDisk() const { return m_allImagesOnDisk; }
   int imageCount() const;
@@ -160,7 +161,7 @@ public:
    */
   EntryVec sortEntries(EntryVec entries) const;
 
-  void renameCollection(const QString& newTitle);
+  void renameCollection(const TQString& newTitle);
 
   void checkInEntry(EntryPtr entry);
   void checkOutEntry(EntryPtr entry);
@@ -191,7 +192,7 @@ signals:
    *
    * @param str The message
    */
-  void signalStatusMsg(const QString& str);
+  void signalStatusMsg(const TQString& str);
   /**
    * Signals that all images in the loaded file have been loaded
    * into memory or onto the disk
@@ -226,7 +227,7 @@ private:
   bool m_loadAllImages : 1;
   KURL m_url;
   bool m_validFile : 1;
-  QGuardedPtr<Import::TellicoImporter> m_importer;
+  TQGuardedPtr<Import::TellicoImporter> m_importer;
   bool m_cancelImageWriting : 1;
   int m_fileFormat;
   bool m_allImagesOnDisk : 1;