diff options
Diffstat (limited to 'libtdeedu/extdate/extdatetime.h')
| -rw-r--r-- | libtdeedu/extdate/extdatetime.h | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/libtdeedu/extdate/extdatetime.h b/libtdeedu/extdate/extdatetime.h index 479d1fae..d07eaa4a 100644 --- a/libtdeedu/extdate/extdatetime.h +++ b/libtdeedu/extdate/extdatetime.h @@ -20,7 +20,7 @@ #include "tqstring.h" #include "tqnamespace.h" #include "tqdatetime.h" -#include <kdemacros.h> +#include <tdemacros.h> #define INVALID_DAY LONG_MIN @@ -34,7 +34,7 @@ extern void test2_unit(int y, int m, int d); class ExtDateTime; -class KDE_EXPORT ExtDate +class TDE_EXPORT ExtDate { public: ExtDate() : m_jd(INVALID_DAY), m_year(0), m_month(0), m_day(0) {} @@ -58,10 +58,6 @@ public: long int jd() const { return m_jd; } #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 static TQString shortMonthName( int month ); static TQString shortDayName( int weekday ); static TQString longMonthName( int month ); @@ -69,7 +65,7 @@ public: #endif //TQT_NO_TEXTDATE #ifndef TQT_NO_TEXTSTRING #if !defined(TQT_NO_SPRINTF) - TQString toString( Qt::DateFormat f = Qt::TextDate ) const; + TQString toString( TQt::DateFormat f = TQt::TextDate ) const; #endif TQString toString( const TQString& format ) const; #endif @@ -88,10 +84,10 @@ 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 ); + static ExtDate currentDate( TQt::TimeSpec ts = TQt::LocalTime ); #ifndef TQT_NO_DATESTRING static ExtDate fromString( const TQString &s ); - static ExtDate fromString( const TQString &s, Qt::DateFormat f ); + static ExtDate fromString( const TQString &s, TQt::DateFormat f ); #endif static bool isValid( int y, int m, int d ); static bool leapYear( int year ); @@ -125,7 +121,7 @@ private: ExtDateTime class *****************************************************************************/ -class KDE_EXPORT ExtDateTime +class TDE_EXPORT ExtDateTime { public: ExtDateTime() {} // set null date and null time @@ -141,10 +137,10 @@ public: void setDate( const ExtDate &date ) { d = date; } void setTime( const TQTime &time ) { t = time; } void setTime_t( uint secsSince1Jan1970UTC ); - void setTime_t( uint secsSince1Jan1970UTC, Qt::TimeSpec ); + void setTime_t( uint secsSince1Jan1970UTC, TQt::TimeSpec ); #ifndef TQT_NO_DATESTRING #ifndef TQT_NO_SPRINTF - TQString toString( Qt::DateFormat f = Qt::TextDate ) const; + TQString toString( TQt::DateFormat f = TQt::TextDate ) const; #endif TQString toString( const TQString& format ) const; #endif @@ -163,10 +159,10 @@ public: bool operator>=( const ExtDateTime &dt ) const; static ExtDateTime currentDateTime(); - static ExtDateTime currentDateTime( Qt::TimeSpec ); + static ExtDateTime currentDateTime( TQt::TimeSpec ); #ifndef TQT_NO_DATESTRING static ExtDateTime fromString( const TQString &s ); - static ExtDateTime fromString( const TQString &s, Qt::DateFormat f ); + static ExtDateTime fromString( const TQString &s, TQt::DateFormat f ); #endif private: ExtDate d; |