Initial conversion of kdepim to TQt

This will probably require some tweaking before it will build under Qt4,
however Qt3 builds are OK.  Any alterations this commit makes to kdepim
behaviour under Qt3 are unintentional and should be fixed.


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

1 files changed, 7 insertions, 7 deletions

diff --git a/kmailcvt/filters.hxx b/kmailcvt/filters.hxx
index b680ab5e..a5f468e4 100644
--- a/kmailcvt/filters.hxx
+++ b/kmailcvt/filters.hxx
@@ -33,7 +33,7 @@
 class FilterInfo
 {
   public:
-    FilterInfo(KImportPageDlg *dlg, TQWidget *parent, bool _removeDupMsg);
+    FilterInfo(KImportPageDlg *dlg, TQWidget *tqparent, bool _removeDupMsg);
    ~FilterInfo();
 
     void seStatusMsg( const TQString& status );
@@ -48,12 +48,12 @@ class FilterInfo
     static void terminateASAP();
     bool shouldTerminate();
 
-    TQWidget *parent() { return m_parent; }
+    TQWidget *tqparent() { return m_tqparent; }
     bool removeDupMsg;
 
   private:
     KImportPageDlg *m_dlg;
-    TQWidget      *m_parent;
+    TQWidget      *m_tqparent;
     static bool s_terminateASAP;
 };
 
@@ -61,7 +61,7 @@ class Filter
 {
   public:
     Filter( const TQString& name, const TQString& author,
-            const TQString& info = TQString::null );
+            const TQString& info = TQString() );
     virtual ~Filter() {}
     virtual void import( FilterInfo* ) = 0;
     TQString author() const { return m_author; }
@@ -91,7 +91,7 @@ class Filter
 
 
 /** 
-* Glorified QString[N] for (a) understandability (b) older gcc compatibility. 
+* Glorified TQString[N] for (a) understandability (b) older gcc compatibility. 
 */
 template <unsigned int size> class FolderStructureBase
 {
@@ -100,7 +100,7 @@ public:
 	/** Constructor. Need a default constructor for TQValueList. */
 	FolderStructureBase() {} ;
 
-	/** Constructor. Turn N QStrings into a folder structure 
+	/** Constructor. Turn N TQStrings into a folder structure 
 	*   description. 
 	*/
 	FolderStructureBase(const NString &s)
@@ -128,7 +128,7 @@ public:
 	*/
 	const TQString operator [](unsigned int i) const
 	{
-	    if (i<size) return d[i]; else return TQString::null;
+	    if (i<size) return d[i]; else return TQString();
 	} ;
 
 	/** Access the different fields, for writing. */