1 files changed, 14 insertions, 14 deletions

diff --git a/tqtinterface/qt4/src/tools/tqdatetime.cpp b/tqtinterface/qt4/src/tools/tqdatetime.cpp
index 4f95dd1..2b28868 100644
--- a/tqtinterface/qt4/src/tools/tqdatetime.cpp
+++ b/tqtinterface/qt4/src/tools/tqdatetime.cpp
@@ -161,7 +161,7 @@ static TQString fmtDateTime( const TQString& f, const TQTime* dt = 0, const TQDa
     if ( dd && !dd->isValid() )
 	return TQString::null;
 
-    bool ap = ( f.tqcontains( "AP" ) || f.tqcontains( "ap" ) );
+    bool ap = ( f.contains( "AP" ) || f.contains( "ap" ) );
 
     TQString buf;
     TQString frm;
@@ -213,7 +213,7 @@ static TQString fmtDateTime( const TQString& f, const TQTime* dt = 0, const TQDa
     \ingroup time
     \mainclass
 
-    A TQDate object tqcontains a calendar date, i.e. year, month, and day
+    A TQDate object contains a calendar date, i.e. year, month, and day
     numbers, in the modern Western (Gregorian) calendar. It can read
     the current date from the system clock. It provides functions for
     comparing dates and for manipulating dates, e.g. by adding a
@@ -270,7 +270,7 @@ static TQString fmtDateTime( const TQString& f, const TQTime* dt = 0, const TQDa
     \enum TQt::TimeSpec
 
     \value LocalTime Locale dependent time (Timezones and Daylight Savings Time)
-    \value UTC Coordinated Universal Time, tqreplaces Greenwich Time
+    \value UTC Coordinated Universal Time, replaces Greenwich Time
 */
 
 /*!
@@ -1101,8 +1101,8 @@ TQDate TQDate::fromString( const TQString& s, TQt::DateFormat f )
 	      This will fail gracefully if the input string doesn't
 	      contain any space.
 	    */
-	    int monthPos = s.tqfind( ' ' ) + 1;
-	    int dayPos = s.tqfind( ' ', monthPos ) + 1;
+	    int monthPos = s.find( ' ' ) + 1;
+	    int dayPos = s.find( ' ', monthPos ) + 1;
 
 	    TQString monthName( s.mid(monthPos, dayPos - monthPos - 1) );
 	    int month = -1;
@@ -1252,7 +1252,7 @@ void TQDate::julianToGregorian( uint jd, int &y, int &m, int &d )
     \ingroup time
     \mainclass
 
-    A TQTime object tqcontains a clock time, i.e. the number of hours,
+    A TQTime object contains a clock time, i.e. the number of hours,
     minutes, seconds, and milliseconds since midnight. It can read the
     current time from the system clock and measure a span of elapsed
     time. It provides functions for comparing times and for
@@ -1265,7 +1265,7 @@ void TQDate::julianToGregorian( uint jd, int &y, int &m, int &d )
     A TQTime object is typically created either by giving the number of
     hours, minutes, seconds, and milliseconds explicitly, or by using
     the static function currentTime(), which creates a TQTime object
-    that tqcontains the system's clock time. Note that the accuracy
+    that contains the system's clock time. Note that the accuracy
     depends on the accuracy of the underlying operating system; not
     all systems provide 1-millisecond accuracy.
 
@@ -1458,9 +1458,9 @@ TQString TQTime::toString( TQt::DateFormat f ) const
     \row \i z \i the milliseconds without leading zeroes (0..999)
     \row \i zzz \i the milliseconds with leading zeroes (000..999)
     \row \i AP
-	 \i use AM/PM display. \e AP will be tqreplaced by either "AM" or "PM".
+	 \i use AM/PM display. \e AP will be replaced by either "AM" or "PM".
     \row \i ap
-	 \i use am/pm display. \e ap will be tqreplaced by either "am" or "pm".
+	 \i use am/pm display. \e ap will be replaced by either "am" or "pm".
     \endtable
 
     All other input characters will be ignored.
@@ -1873,7 +1873,7 @@ int TQTime::elapsed() const
     \ingroup time
     \mainclass
 
-    A TQDateTime object tqcontains a calendar date and a clock time (a
+    A TQDateTime object contains a calendar date and a clock time (a
     "datetime"). It is a combination of the TQDate and TQTime classes.
     It can read the current datetime from the system clock. It
     provides functions for comparing datetimes and for manipulating a
@@ -2200,9 +2200,9 @@ TQString TQDateTime::toString( TQt::DateFormat f ) const
     \row \i z \i the milliseconds without leading zeroes (0..999)
     \row \i zzz \i the milliseconds with leading zeroes (000..999)
     \row \i AP
-	    \i use AM/PM display. \e AP will be tqreplaced by either "AM" or "PM".
+	    \i use AM/PM display. \e AP will be replaced by either "AM" or "PM".
     \row \i ap
-	    \i use am/pm display. \e ap will be tqreplaced by either "am" or "pm".
+	    \i use am/pm display. \e ap will be replaced by either "am" or "pm".
     \endtable
 
     All other input characters will be ignored.
@@ -2465,7 +2465,7 @@ TQDateTime TQDateTime::fromString( const TQString& s, TQt::DateFormat f )
     }
 #if !defined(TQT_NO_REGEXP) && !defined(TQT_NO_TEXTDATE)
     else if ( f == TQt::TextDate ) {
-        const int firstSpace = s.tqfind(' ');
+        const int firstSpace = s.find(' ');
 	TQString monthName( s.mid( firstSpace + 1, 3 ) );
 	int month = -1;
 	// Assume that English monthnames are the default
@@ -2497,7 +2497,7 @@ TQDateTime TQDateTime::fromString( const TQString& s, TQt::DateFormat f )
 	TQDate date( year, month, day );
 	TQTime time;
 	int hour, minute, second;
-	int pivot = s.tqfind( TQRegExp(TQString::tqfromLatin1("[0-9][0-9]:[0-9][0-9]:[0-9][0-9]")) );
+	int pivot = s.find( TQRegExp(TQString::tqfromLatin1("[0-9][0-9]:[0-9][0-9]:[0-9][0-9]")) );
 	if ( pivot != -1 ) {
 	    hour = s.mid( pivot, 2 ).toInt();
 	    minute = s.mid( pivot+3, 2 ).toInt();