More locale-independent ASCII string conversion fixes.

svn path=/trunk/kdepim/; revision=386869
wilder-work
Ingo Klcker 21 years ago
parent db10e041a1
commit 3415ef5de3
  1. 17
      kmmsgpart.cpp
  2. 3
      kmmsgpart.h

@ -11,6 +11,7 @@
#include "kmkernel.h"
#include "globalsettings.h"
#include <kasciistringtools.h>
#include <kmime_charfreq.h>
#include <kmime_codecs.h>
#include <mimelib/enum.h>
@ -39,8 +40,8 @@ KMMessagePart::KMMessagePart( QDataStream & stream )
stream >> mOriginalContentTypeStr >> mName >> mContentDescription
>> mContentDisposition >> mCte >> size >> mPartSpecifier;
mContentDisposition = mContentDisposition.lower();
mOriginalContentTypeStr = mOriginalContentTypeStr.upper();
KPIM::kAsciiToLower( mContentDisposition.data() );
KPIM::kAsciiToUpper( mOriginalContentTypeStr.data() );
// set the type
int sep = mOriginalContentTypeStr.find('/');
@ -379,12 +380,14 @@ void KMMessagePart::magicSetType(bool aAutoDecode)
//-----------------------------------------------------------------------------
QString KMMessagePart::iconName(const QString& mimeType) const
QString KMMessagePart::iconName() const
{
QString fileName = KMimeType::mimeType(mimeType.isEmpty() ?
(mType + "/" + mSubtype).lower() : mimeType.lower())->icon(QString::null,FALSE);
fileName = KGlobal::instance()->iconLoader()->iconPath( fileName,
KIcon::Desktop );
QCString mimeType( mType + "/" + mSubtype );
KPIM::kAsciiToLower( mimeType.data() );
QString fileName =
KMimeType::mimeType( mimeType )->icon( QString::null, false );
fileName =
KGlobal::instance()->iconLoader()->iconPath( fileName, KIcon::Desktop );
return fileName;
}

@ -1,3 +1,4 @@
// -*- mode: C++ -*-
/* part of a mime multi-part message
* Author: Stefan Taferner <taferner@alpin.or.at>
*/
@ -119,7 +120,7 @@ public:
/** Tries to find a good icon for the 'Content-Type' by scanning
the installed mimelnk files. Returns the found icon. If no matching
icon is found, the one for application/octet-stream is returned. */
QString iconName(const QString &mimeType = QString::null) const;
QString iconName() const;
/** Get or set the 'Content-Transfer-Encoding' header field
The member functions that involve enumerated types (ints)

Loading…
Cancel
Save