diff options
Diffstat (limited to 'libkmime')
| -rw-r--r-- | libkmime/CLASSTREE.bodyparts | 2 | ||||
| -rw-r--r-- | libkmime/kmime_header_parsing.cpp | 18 | ||||
| -rw-r--r-- | libkmime/kmime_headers.cpp | 14 | ||||
| -rw-r--r-- | libkmime/kmime_util.cpp | 2 | ||||
| -rw-r--r-- | libkmime/tests/test_dates.cpp | 10 |
5 files changed, 23 insertions, 23 deletions
diff --git a/libkmime/CLASSTREE.bodyparts b/libkmime/CLASSTREE.bodyparts index 5952c2082..eeaa7726a 100644 --- a/libkmime/CLASSTREE.bodyparts +++ b/libkmime/CLASSTREE.bodyparts @@ -15,7 +15,7 @@ + Message::RFC822 + Message::Partial + Message::ExternalBody - + Message::DeliverytqStatus + + Message::DeliveryStatus + GText + Text::Plain + Text::Enriched diff --git a/libkmime/kmime_header_parsing.cpp b/libkmime/kmime_header_parsing.cpp index 59957f10b..14d4ed118 100644 --- a/libkmime/kmime_header_parsing.cpp +++ b/libkmime/kmime_header_parsing.cpp @@ -256,7 +256,7 @@ bool parseAtom( const char * & scursor, const char * const send, TQPair<const char*,int> maybeResult; if ( parseAtom( scursor, send, maybeResult, allow8Bit ) ) { - result += TQString::tqfromLatin1( maybeResult.first, maybeResult.second ); + result += TQString::fromLatin1( maybeResult.first, maybeResult.second ); return true; } @@ -296,7 +296,7 @@ bool parseToken( const char * & scursor, const char * const send, TQPair<const char*,int> maybeResult; if ( parseToken( scursor, send, maybeResult, allow8Bit ) ) { - result += TQString::tqfromLatin1( maybeResult.first, maybeResult.second ); + result += TQString::fromLatin1( maybeResult.first, maybeResult.second ); return true; } @@ -1065,9 +1065,9 @@ bool parseAddressList( const char* & scursor, const char * const send, } -static TQString asterisk = TQString::tqfromLatin1("*0*",1); -static TQString asteriskZero = TQString::tqfromLatin1("*0*",2); -//static TQString asteriskZeroAsterisk = TQString::tqfromLatin1("*0*",3); +static TQString asterisk = TQString::fromLatin1("*0*",1); +static TQString asteriskZero = TQString::fromLatin1("*0*",2); +//static TQString asteriskZeroAsterisk = TQString::fromLatin1("*0*",3); bool parseParameter( const char* & scursor, const char * const send, TQPair<TQString,TQStringOrTQPair> & result, bool isCRLF ) { @@ -1223,7 +1223,7 @@ static void decodeRFC2231Value( Codec* & rfc2231Codec, // take the whole value to be in latin-1: KMIME_WARN << "No charset in extended-initial-value. " "Assuming \"iso-8859-1\"." << endl; - value += TQString::tqfromLatin1( decBegin, source.second ); + value += TQString::fromLatin1( decBegin, source.second ); return; } @@ -1263,7 +1263,7 @@ static void decodeRFC2231Value( Codec* & rfc2231Codec, } if ( !textcodec ) { - value += TQString::tqfromLatin1( decCursor, decEnd - decCursor ); + value += TQString::fromLatin1( decCursor, decEnd - decCursor ); return; } @@ -1348,7 +1348,7 @@ bool parseParameterList( const char* & scursor, const char * const send, } else { // not encoded. if ( (*it).qpair.first ) - value += TQString::tqfromLatin1( (*it).qpair.first, (*it).qpair.second ); + value += TQString::fromLatin1( (*it).qpair.first, (*it).qpair.second ); else value += (*it).qstring; } @@ -1377,7 +1377,7 @@ bool parseParameterList( const char* & scursor, const char * const send, } else { // not encoded if ( (*it).qpair.first ) - value += TQString::tqfromLatin1( (*it).qpair.first, (*it).qpair.second ); + value += TQString::fromLatin1( (*it).qpair.first, (*it).qpair.second ); else value += (*it).qstring; } diff --git a/libkmime/kmime_headers.cpp b/libkmime/kmime_headers.cpp index 85d4c4049..3a454551d 100644 --- a/libkmime/kmime_headers.cpp +++ b/libkmime/kmime_headers.cpp @@ -529,7 +529,7 @@ void MessageID::fromUnicodeString(const TQString &s, const TQCString&) TQString MessageID::asUnicodeString() { - return TQString::tqfromLatin1(m_id); + return TQString::fromLatin1(m_id); } @@ -567,7 +567,7 @@ void Control::fromUnicodeString(const TQString &s, const TQCString&) TQString Control::asUnicodeString() { - return TQString::tqfromLatin1(c_trlMsg); + return TQString::fromLatin1(c_trlMsg); } //-----</Control>------------------------------ @@ -797,7 +797,7 @@ void Date::fromUnicodeString(const TQString &s, const TQCString&) TQString Date::asUnicodeString() { - return TQString::tqfromLatin1(as7BitString(false)); + return TQString::fromLatin1(as7BitString(false)); } @@ -1075,7 +1075,7 @@ void References::fromUnicodeString(const TQString &s, const TQCString&) TQString References::asUnicodeString() { - return TQString::tqfromLatin1(r_ef); + return TQString::fromLatin1(r_ef); } @@ -1221,7 +1221,7 @@ void UserAgent::fromUnicodeString(const TQString &s, const TQCString&) TQString UserAgent::asUnicodeString() { - return TQString::tqfromLatin1(u_agent); + return TQString::fromLatin1(u_agent); } //-----</UserAgent>---------------------------- @@ -1268,7 +1268,7 @@ void ContentType::fromUnicodeString(const TQString &s, const TQCString&) TQString ContentType::asUnicodeString() { - return TQString::tqfromLatin1(as7BitString(false)); + return TQString::fromLatin1(as7BitString(false)); } @@ -1544,7 +1544,7 @@ void CTEncoding::fromUnicodeString(const TQString &s, const TQCString&) TQString CTEncoding::asUnicodeString() { - return TQString::tqfromLatin1(as7BitString(false)); + return TQString::fromLatin1(as7BitString(false)); } //-----</CTEncoding>--------------------------- diff --git a/libkmime/kmime_util.cpp b/libkmime/kmime_util.cpp index 8110227e5..eecf1ba09 100644 --- a/libkmime/kmime_util.cpp +++ b/libkmime/kmime_util.cpp @@ -739,7 +739,7 @@ DateFormatter::localized(time_t otime, bool shortFormat, bool includeSecs, TQString DateFormatter::cTime(time_t otime) const { - return TQString::tqfromLatin1( ctime( &otime ) ).stripWhiteSpace() ; + return TQString::fromLatin1( ctime( &otime ) ).stripWhiteSpace() ; } TQString diff --git a/libkmime/tests/test_dates.cpp b/libkmime/tests/test_dates.cpp index e3a40f812..7087a01a6 100644 --- a/libkmime/tests/test_dates.cpp +++ b/libkmime/tests/test_dates.cpp @@ -80,14 +80,14 @@ main() "Z MMMM dddd yyyy") <<endl; t.setFormat(DateFormatter::Fancy); kdDebug()<<"TQDateTime taking: (dates as in first test)"<<endl; - kdDebug()<<"\tFancy : \t"<<t.dateString((TQDateTime::tqcurrentDateTime()))<<endl; + kdDebug()<<"\tFancy : \t"<<t.dateString((TQDateTime::currentDateTime()))<<endl; t.setFormat(DateFormatter::Localized); - kdDebug()<<"\tLocalized : \t"<<t.dateString(TQDateTime::tqcurrentDateTime())<<endl; + kdDebug()<<"\tLocalized : \t"<<t.dateString(TQDateTime::currentDateTime())<<endl; t.setFormat(DateFormatter::CTime); - kdDebug()<<"\tCTime : \t"<<t.dateString(TQDateTime::tqcurrentDateTime())<<endl; + kdDebug()<<"\tCTime : \t"<<t.dateString(TQDateTime::currentDateTime())<<endl; t.setFormat(DateFormatter::Iso); - kdDebug()<<"\tIso : \t"<<t.dateString(TQDateTime::tqcurrentDateTime())<<endl; + kdDebug()<<"\tIso : \t"<<t.dateString(TQDateTime::currentDateTime())<<endl; t.setCustomFormat("MMMM d dddd yyyy Z"); - kdDebug()<<"\tCustom : \t"<<t.dateString(TQDateTime::tqcurrentDateTime())<<endl; + kdDebug()<<"\tCustom : \t"<<t.dateString(TQDateTime::currentDateTime())<<endl; } |