TQt4 port kdeedu

This enables compilation under both Qt3 and Qt4


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

1 files changed, 24 insertions, 24 deletions

diff --git a/libkdeedu/extdate/extdatetime.h b/libkdeedu/extdate/extdatetime.h
index 0830af83..0ebe324f 100644
--- a/libkdeedu/extdate/extdatetime.h
+++ b/libkdeedu/extdate/extdatetime.h
@@ -57,8 +57,8 @@ public:
 	int weekNumber( int *yearNum = 0 ) const;
 	long int jd() const { return m_jd; }
 
-#ifndef QT_NO_TEXTDATE
-#ifndef QT_NO_COMPAT
+#ifndef TQT_NO_TEXTDATE
+#ifndef TQT_NO_COMPAT
 	static TQString monthName( int month ) { return shortMonthName( month ); }
 	static TQString dayName( int weekday ) { return shortDayName( weekday ); }
 #endif
@@ -66,9 +66,9 @@ public:
 	static TQString shortDayName( int weekday );
 	static TQString longMonthName( int month );
 	static TQString longDayName( int weekday );
-#endif //QT_NO_TEXTDATE
-#ifndef QT_NO_TEXTSTRING
-#if !defined(QT_NO_SPRINTF)
+#endif //TQT_NO_TEXTDATE
+#ifndef TQT_NO_TEXTSTRING
+#if !defined(TQT_NO_SPRINTF)
 	TQString toString( Qt::DateFormat f = Qt::TextDate ) const;
 #endif
 	TQString toString( const TQString& format ) const;
@@ -88,8 +88,8 @@ public:
 	bool operator>( const ExtDate &d )  const { return m_jd  > d.jd(); }
 	bool operator>=( const ExtDate &d ) const { return m_jd >= d.jd(); }
 
-	static ExtDate currentDate( Qt::TimeSpec ts = Qt::LocalTime );
-#ifndef QT_NO_DATESTRING
+	static ExtDate tqcurrentDate( Qt::TimeSpec ts = Qt::LocalTime );
+#ifndef TQT_NO_DATESTRING
 	static ExtDate fromString( const TQString &s );
 	static ExtDate fromString( const TQString &s, Qt::DateFormat f );
 #endif
@@ -113,11 +113,11 @@ private:
 
 	friend class ExtDateTime;
 
-#ifndef QT_NO_DATASTREAM
-	friend Q_EXPORT TQDataStream &operator<<( TQDataStream &, const ExtDate & );
-	friend Q_EXPORT TQDataStream &operator>>( TQDataStream &, ExtDate & );
-	friend Q_EXPORT TQDataStream &operator<<( TQDataStream &, const ExtDateTime & );
-	friend Q_EXPORT TQDataStream &operator>>( TQDataStream &, ExtDateTime & );
+#ifndef TQT_NO_DATASTREAM
+	friend TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const ExtDate & );
+	friend TQ_EXPORT TQDataStream &operator>>( TQDataStream &, ExtDate & );
+	friend TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const ExtDateTime & );
+	friend TQ_EXPORT TQDataStream &operator>>( TQDataStream &, ExtDateTime & );
 #endif
 };
 
@@ -142,8 +142,8 @@ public:
     void   setTime( const TQTime &time ) { t = time; }
     void   setTime_t( uint secsSince1Jan1970UTC );
     void   setTime_t( uint secsSince1Jan1970UTC, Qt::TimeSpec );
-#ifndef QT_NO_DATESTRING
-#ifndef QT_NO_SPRINTF
+#ifndef TQT_NO_DATESTRING
+#ifndef TQT_NO_SPRINTF
     TQString toString( Qt::DateFormat f = Qt::TextDate )	const;
 #endif
     TQString toString( const TQString& format ) const;
@@ -162,18 +162,18 @@ public:
     bool   operator>( const ExtDateTime &dt )  const;
     bool   operator>=( const ExtDateTime &dt ) const;
 
-    static ExtDateTime currentDateTime();
-    static ExtDateTime currentDateTime( Qt::TimeSpec );
-#ifndef QT_NO_DATESTRING
+    static ExtDateTime tqcurrentDateTime();
+    static ExtDateTime tqcurrentDateTime( Qt::TimeSpec );
+#ifndef TQT_NO_DATESTRING
     static ExtDateTime fromString( const TQString &s );
     static ExtDateTime fromString( const TQString &s, Qt::DateFormat f );
 #endif
 private:
     ExtDate  d;
     TQTime  t;
-#ifndef QT_NO_DATASTREAM
-    friend Q_EXPORT TQDataStream &operator<<( TQDataStream &, const ExtDateTime &);
-    friend Q_EXPORT TQDataStream &operator>>( TQDataStream &, ExtDateTime & );
+#ifndef TQT_NO_DATASTREAM
+    friend TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const ExtDateTime &);
+    friend TQ_EXPORT TQDataStream &operator>>( TQDataStream &, ExtDateTime & );
 #endif
 };
 
@@ -181,10 +181,10 @@ private:
   Date and time stream functions
  *****************************************************************************/
 
-#ifndef QT_NO_DATASTREAM
-Q_EXPORT TQDataStream &operator<<( TQDataStream &, const ExtDate & );
-Q_EXPORT TQDataStream &operator>>( TQDataStream &, ExtDate & );
-#endif // QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
+TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const ExtDate & );
+TQ_EXPORT TQDataStream &operator>>( TQDataStream &, ExtDate & );
+#endif // TQT_NO_DATASTREAM
 
 #endif // EXTDATE_H