diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-02-16 20:17:18 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-02-16 20:17:18 +0000 |
commit | f4fae92b6768541e2952173c3d4b09040f95bf7e (patch) | |
tree | d8c5d93232235cd635f3310b4d95490df181ba2d /kmail/kmmsgpartdlg.cpp | |
parent | 125c0a08265b75a133644d3b55f47e37c919f45d (diff) | |
download | tdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.tar.gz tdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.zip |
Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmail/kmmsgpartdlg.cpp')
-rw-r--r-- | kmail/kmmsgpartdlg.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/kmail/kmmsgpartdlg.cpp b/kmail/kmmsgpartdlg.cpp index 4a897291f..e87fbd8ac 100644 --- a/kmail/kmmsgpartdlg.cpp +++ b/kmail/kmmsgpartdlg.cpp @@ -54,7 +54,7 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption, TQLabel * label; TQString msg; - setHelp( TQString::fromLatin1("attachments") ); + setHelp( TQString::tqfromLatin1("attachments") ); for ( int i = 0 ; i < numEncodingTypes ; ++i ) mI18nizedEncodings << i18n( encodingTypes[i].displayName ); @@ -73,14 +73,14 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption, mMimeType->setInsertionPolicy( TQComboBox::NoInsertion ); mMimeType->setValidator( new KMimeTypeValidator( mMimeType ) ); mMimeType->insertStringList( TQStringList() - << TQString::fromLatin1("text/html") - << TQString::fromLatin1("text/plain") - << TQString::fromLatin1("image/gif") - << TQString::fromLatin1("image/jpeg") - << TQString::fromLatin1("image/png") - << TQString::fromLatin1("application/octet-stream") - << TQString::fromLatin1("application/x-gunzip") - << TQString::fromLatin1("application/zip") ); + << TQString::tqfromLatin1("text/html") + << TQString::tqfromLatin1("text/plain") + << TQString::tqfromLatin1("image/gif") + << TQString::tqfromLatin1("image/jpeg") + << TQString::tqfromLatin1("image/png") + << TQString::tqfromLatin1("application/octet-stream") + << TQString::tqfromLatin1("application/x-gunzip") + << TQString::tqfromLatin1("application/zip") ); connect( mMimeType, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotMimeTypeChanged(const TQString&)) ); glay->addWidget( mMimeType, 0, 1 ); @@ -210,7 +210,7 @@ void KMMsgPartDialog::setMimeType( const TQString & mimeType ) { void KMMsgPartDialog::setMimeType( const TQString & type, const TQString & subtype ) { - setMimeType( TQString::fromLatin1("%1/%2").arg(type).arg(subtype) ); + setMimeType( TQString::tqfromLatin1("%1/%2").arg(type).arg(subtype) ); } void KMMsgPartDialog::setMimeTypeList( const TQStringList & mimeTypes ) { @@ -396,7 +396,7 @@ void KMMsgPartDialogCompat::applyChanges() if ( name != TQString( encName ) ) cDisp += "*=" + encName; else - cDisp += "=\"" + encName.replace( '\\', "\\\\" ).replace( '"', "\\\"" ) + '"'; + cDisp += "=\"" + encName.tqreplace( '\\', "\\\\" ).tqreplace( '"', "\\\"" ) + '"'; mMsgPart->setContentDisposition( cDisp ); } |