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, 20 insertions, 19 deletions

diff --git a/src/fetch/fetchmanager.h b/src/fetch/fetchmanager.h
index 7036d71..c43b997 100644
--- a/src/fetch/fetchmanager.h
+++ b/src/fetch/fetchmanager.h
@@ -27,15 +27,15 @@ namespace Tellico {
 
 #include <ksortablevaluelist.h>
 
-#include <qobject.h>
-#include <qmap.h>
+#include <tqobject.h>
+#include <tqmap.h>
 
 namespace Tellico {
   namespace Fetch {
 
-typedef KSortableItem<Type, QString> TypePair; // fetcher info, type and name of type
-typedef KSortableValueList<Type, QString> TypePairList;
-typedef QMap<FetchKey, QString> KeyMap; // map key type to name of key
+typedef KSortableItem<Type, TQString> TypePair; // fetcher info, type and name of type
+typedef KSortableValueList<Type, TQString> TypePairList;
+typedef TQMap<FetchKey, TQString> KeyMap; // map key type to name of key
 typedef Vector<Fetcher> FetcherVec;
 
 /**
@@ -43,16 +43,17 @@ typedef Vector<Fetcher> FetcherVec;
  *
  * @author Robby Stephenson
  */
-class Manager : public QObject {
+class Manager : public TQObject {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
   static Manager* self() {  if(!s_self) s_self = new Manager(); return s_self; }
 
   ~Manager();
 
-  KeyMap keyMap(const QString& source = QString::null) const;
-  void startSearch(const QString& source, FetchKey key, const QString& value);
+  KeyMap keyMap(const TQString& source = TQString()) const;
+  void startSearch(const TQString& source, FetchKey key, const TQString& value);
   void continueSearch();
   void stop();
   bool canFetch() const;
@@ -61,19 +62,19 @@ public:
   const FetcherVec& fetchers() const { return m_fetchers; }
   FetcherVec fetchers(int type);
   TypePairList typeList();
-  ConfigWidget* configWidget(QWidget* parent, Type type, const QString& name);
+  ConfigWidget* configWidget(TQWidget* tqparent, Type type, const TQString& name);
 
   // create fetcher for updating an entry
   FetcherVec createUpdateFetchers(int collType);
   FetcherVec createUpdateFetchers(int collType, FetchKey key);
-  Fetcher::Ptr createUpdateFetcher(int collType, const QString& source);
+  Fetcher::Ptr createUpdateFetcher(int collType, const TQString& source);
 
-  static QString typeName(Type type);
-  static QPixmap fetcherIcon(Fetch::Type type, int iconGroup=3 /*Small*/, int size=0 /* default */);
-  static QPixmap fetcherIcon(Fetch::Fetcher::CPtr ptr, int iconGroup=3 /*Small*/, int size=0 /* default*/);
+  static TQString typeName(Type type);
+  static TQPixmap fetcherIcon(Fetch::Type type, int iconGroup=3 /*Small*/, int size=0 /* default */);
+  static TQPixmap fetcherIcon(Fetch::Fetcher::CPtr ptr, int iconGroup=3 /*Small*/, int size=0 /* default*/);
 
 signals:
-  void signalStatus(const QString& status);
+  void signaltqStatus(const TQString& status);
   void signalResultFound(Tellico::Fetch::SearchResult* result);
   void signalDone();
 
@@ -85,17 +86,17 @@ private:
   static Manager* s_self;
 
   Manager();
-  Fetcher::Ptr createFetcher(KConfig* config, const QString& configGroup);
+  Fetcher::Ptr createFetcher(KConfig* config, const TQString& configGroup);
   FetcherVec defaultFetchers();
-  void updateStatus(const QString& message);
+  void updatetqStatus(const TQString& message);
 
-  static QString favIcon(const KURL& url);
-  static bool bundledScriptHasExecPath(const QString& specFile, KConfig* config);
+  static TQString favIcon(const KURL& url);
+  static bool bundledScriptHasExecPath(const TQString& specFile, KConfig* config);
 
   FetcherVec m_fetchers;
   int m_currentFetcherIndex;
   KeyMap m_keyMap;
-  typedef QMap<Fetcher::Ptr, QString> ConfigMap;
+  typedef TQMap<Fetcher::Ptr, TQString> ConfigMap;
   ConfigMap m_configMap;
   StringMap m_scriptMap;
   ManagerMessage* m_messager;