TQt4 port kpilot

This enables compilation under both Qt3 and Qt4


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

1 files changed, 5 insertions, 5 deletions

diff --git a/lib/pilot.h b/lib/pilot.h
index 4ae7030..5638b70 100644
--- a/lib/pilot.h
+++ b/lib/pilot.h
@@ -55,7 +55,7 @@ class PilotCategoryInfo; // ... and category information
 
 /**
 * The Pilot namespace holds constants that are global for
-* the handheld data structures. Also tqcontains some global
+* the handheld data structures. Also contains some global
 * functions that deal with pilot-link structures as well
 * as mapping user-visible strings from UTF8 (KDE side) to
 * the encoding used on the handheld.
@@ -106,7 +106,7 @@ namespace Pilot
 	* native 8 bit encoding of the handheld.
 	*
 	* @param s String to encode
-	* @return Encoded string in a QCString
+	* @return Encoded string in a TQCString
 	*/
 	TQCString toPilot( const TQString &s );
 
@@ -141,9 +141,9 @@ namespace Pilot
 	}
 
 	/** Returns the TQString for the requested category @p i
-	* in the category structure @p info. Returns @c TQString::null
+	* in the category structure @p info. Returns @c TQString()
 	* on error (bad pointer or bad category number). May also
-	* return @c TQString::null if the category name is empty.
+	* return @c TQString() if the category name is empty.
 	*/
 	inline TQString categoryName(const struct CategoryAppInfo *info, unsigned int i)
 	{
@@ -157,7 +157,7 @@ namespace Pilot
 		}
 		else
 		{
-			return TQString::null;
+			return TQString();
 		}
 	}