author | zautrix <zautrix> | 2005-04-08 22:05:03 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-04-08 22:05:03 (UTC) |
commit | 9667e6f2589d5b2080cca928814f382761f8dda6 (patch) (side-by-side diff) | |
tree | 438bcb5c041de0804284cf457cbc97a367dadf37 | |
parent | c0f1d38e29ee0d0a1d1dcb5bda08089923926b41 (diff) | |
download | kdepimpi-9667e6f2589d5b2080cca928814f382761f8dda6.zip kdepimpi-9667e6f2589d5b2080cca928814f382761f8dda6.tar.gz kdepimpi-9667e6f2589d5b2080cca928814f382761f8dda6.tar.bz2 |
utf8 kapi import fix
-rw-r--r-- | bin/kdepim/WhatsNew.txt | 2 | ||||
-rw-r--r-- | kabc/vcardparser/vcard.cpp | 2 | ||||
-rw-r--r-- | kabc/vcardparser/vcardline.cpp | 14 | ||||
-rw-r--r-- | kabc/vcardparser/vcardline.h | 7 | ||||
-rw-r--r-- | kabc/vcardparser/vcardparser.cpp | 8 | ||||
-rw-r--r-- | kabc/vcardparser/vcardtool.cpp | 86 | ||||
-rw-r--r-- | kaddressbook/views/cardview.cpp | 9 |
7 files changed, 67 insertions, 61 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index bc0c62a..97c8154 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt @@ -4,8 +4,10 @@ Info about the changes in new versions of KDE-Pim/Pi And again fixed some bugs. Added two more fields to the KA/Pi view config: A "Mobile (home)" and a "Mobile (work)" field. +Fixed utf8 import (e.g. for Japaneese text) in KA/Pi. + ********** VERSION 2.0.25 ************ And again fixed some bugs. diff --git a/kabc/vcardparser/vcard.cpp b/kabc/vcardparser/vcard.cpp index 24fd498..bc9f208 100644 --- a/kabc/vcardparser/vcard.cpp +++ b/kabc/vcardparser/vcard.cpp @@ -110,9 +110,9 @@ VCard::Version VCard::version() const if ( versionEntry == mLineMap.end() ) return v3_0; VCardLine line = ( *versionEntry )[ 0 ]; - if ( line.value() == "2.1" ) + if ( line.valueString() == "2.1" ) return v2_1; else return v3_0; } diff --git a/kabc/vcardparser/vcardline.cpp b/kabc/vcardparser/vcardline.cpp index 0972a35..8df2d32 100644 --- a/kabc/vcardparser/vcardline.cpp +++ b/kabc/vcardparser/vcardline.cpp @@ -81,21 +81,25 @@ QString VCardLine::identifier() const { return mIdentifier; } -void VCardLine::setValue( const QString& value ) +void VCardLine::setValueString( const QString& value ) { - mValue.duplicate( value.data(), value.length() ); + setValueCString( value.utf8() ); +} +void VCardLine::setValueCString( const QCString& value ) +{ + mValue.duplicate( value.data(), value.length() ); } -void VCardLine::setValue( const QByteArray& value ) +void VCardLine::setValueBytes( const QByteArray& value ) { mValue = value; } -QVariant VCardLine::value() const +QString VCardLine::valueString() const { - return QVariant( QCString( mValue.data(), mValue.size()+1 ) ); + return QString::fromUtf8( mValue.data(), mValue.size() ); } QByteArray VCardLine::valueBytes() const { diff --git a/kabc/vcardparser/vcardline.h b/kabc/vcardparser/vcardline.h index 6e74b38..8dc9322 100644 --- a/kabc/vcardparser/vcardline.h +++ b/kabc/vcardparser/vcardline.h @@ -57,15 +57,16 @@ class VCardLine /** * Sets the value of of this line. */ - void setValue( const QString& value ); - void setValue( const QByteArray& value ); + void setValueString( const QString& value ); + void setValueCString( const QCString& value ); + void setValueBytes( const QByteArray& value ); /** * Returns the value of this line. */ - QVariant value() const; + QString valueString() const; QByteArray valueBytes() const; /** * Sets the group the line belongs to. diff --git a/kabc/vcardparser/vcardparser.cpp b/kabc/vcardparser/vcardparser.cpp index 7fae011..11622a0 100644 --- a/kabc/vcardparser/vcardparser.cpp +++ b/kabc/vcardparser/vcardparser.cpp @@ -125,14 +125,14 @@ VCard::List VCardParser::parseVCards( const QString& text ) //PP our vcards are *supposed* to be in UTF-8 // if ( vCardLine.parameter( "charset" ).lower() == "utf-8" ) { // vCardLine.setValue( QString::fromUtf8( output.data(), output.size() ) ); // } else - vCardLine.setValue( output ); + vCardLine.setValueBytes( output ); //PP our vcards are *supposed* to be in UTF-8 // } else if ( vCardLine.parameter( "charset" ).lower() == "utf-8" ) { // vCardLine.setValue( QString::fromUtf8( value.ascii() ) ); } else - vCardLine.setValue( value.replace( QRegExp("\\\\n"), "\n" ) ); + vCardLine.setValueString( value.replace( QRegExp("\\\\n"), "\n" ) ); currentVCard.addLine( vCardLine ); } @@ -187,9 +187,9 @@ QString VCardParser::createVCards( const VCard::List& list ) lines = (*cardIt).lines( (*identIt) ); // iterate over the lines for ( lineIt = lines.begin(); lineIt != lines.end(); ++lineIt ) { - if ( !(*lineIt).value().asString().isEmpty() ) { + if ( !(*lineIt).valueString().isEmpty() ) { if ( (*lineIt).hasGroup() ) textLine = (*lineIt).group() + "." + (*lineIt).identifier(); else textLine = (*lineIt).identifier(); @@ -220,9 +220,9 @@ QString VCardParser::createVCards( const VCard::List& list ) else if ( encodingType == "quoted-printable" ) KCodecs::quotedPrintableEncode( input, output ); textLine.append( ":" + QString( output ) ); } else - textLine.append( ":" + (*lineIt).value().asString().replace( QRegExp("\n"), "\\n" ) ); + textLine.append( ":" + (*lineIt).valueString().replace( QRegExp("\n"), "\\n" ) ); if ( textLine.length() > FOLD_WIDTH ) { // we have to fold the line for ( uint i = 0; i <= ( textLine.length() / FOLD_WIDTH ); ++i ) text.append( ( i == 0 ? "" : " " ) + textLine.mid( i * FOLD_WIDTH, FOLD_WIDTH ) + "\r\n" ); diff --git a/kabc/vcardparser/vcardtool.cpp b/kabc/vcardparser/vcardtool.cpp index 0cf72c0..c3d92b6 100644 --- a/kabc/vcardparser/vcardtool.cpp +++ b/kabc/vcardparser/vcardtool.cpp @@ -366,9 +366,9 @@ Addressee::List VCardTool::parseVCards( const QString& vcard ) identifier = (*lineIt).identifier().lower(); // ADR if ( identifier == "adr" ) { Address address; - const QStringList addrParts = splitString( semicolonSep, (*lineIt).value().asString() ); + const QStringList addrParts = splitString( semicolonSep, (*lineIt).valueString() ); if ( addrParts.count() > 0 ) address.setPostOfficeBox( addrParts[ 0 ] ); if ( addrParts.count() > 1 ) address.setExtended( addrParts[ 1 ] ); @@ -398,13 +398,13 @@ Addressee::List VCardTool::parseVCards( const QString& vcard ) addr.setAgent( parseAgent( *lineIt ) ); // BDAY else if ( identifier == "bday" ) - addr.setBirthday( parseDateTime( (*lineIt).value().asString() ) ); + addr.setBirthday( parseDateTime( (*lineIt).valueString() ) ); // CATEGORIES else if ( identifier == "categories" ) { - const QStringList categories = splitString( commaSep, (*lineIt).value().asString() ); + const QStringList categories = splitString( commaSep, (*lineIt).valueString() ); addr.setCategories( categories ); } // CLASS @@ -413,20 +413,20 @@ Addressee::List VCardTool::parseVCards( const QString& vcard ) // EMAIL else if ( identifier == "email" ) { const QStringList types = (*lineIt).parameters( "type" ); - addr.insertEmail( (*lineIt).value().asString(), types.findIndex( "PREF" ) != -1 ); + addr.insertEmail( (*lineIt).valueString(), types.findIndex( "PREF" ) != -1 ); } // FN else if ( identifier == "fn" ) - addr.setFormattedName( (*lineIt).value().asString() ); + addr.setFormattedName( (*lineIt).valueString() ); // GEO else if ( identifier == "geo" ) { Geo geo; - const QStringList geoParts = QStringList::split( ';', (*lineIt).value().asString(), true ); + const QStringList geoParts = QStringList::split( ';', (*lineIt).valueString(), true ); geo.setLatitude( geoParts[ 0 ].toFloat() ); geo.setLongitude( geoParts[ 1 ].toFloat() ); addr.setGeo( geo ); @@ -448,18 +448,18 @@ Addressee::List VCardTool::parseVCards( const QString& vcard ) KABC::Address::List addressList = addr.addresses(); KABC::Address::List::Iterator it; for ( it = addressList.begin(); it != addressList.end(); ++it ) { if ( (*it).type() == type ) { - (*it).setLabel( (*lineIt).value().asString() ); + (*it).setLabel( (*lineIt).valueString() ); addr.insertAddress( *it ); available = true; break; } } if ( !available ) { // a standalone LABEL tag KABC::Address address( type ); - address.setLabel( (*lineIt).value().asString() ); + address.setLabel( (*lineIt).valueString() ); addr.insertAddress( address ); } } @@ -468,13 +468,13 @@ Addressee::List VCardTool::parseVCards( const QString& vcard ) addr.setLogo( parsePicture( *lineIt ) ); // MAILER else if ( identifier == "mailer" ) - addr.setMailer( (*lineIt).value().asString() ); + addr.setMailer( (*lineIt).valueString() ); // N else if ( identifier == "n" ) { - const QStringList nameParts = splitString( semicolonSep, (*lineIt).value().asString() ); + const QStringList nameParts = splitString( semicolonSep, (*lineIt).valueString() ); if ( nameParts.count() > 0 ) addr.setFamilyName( nameParts[ 0 ] ); if ( nameParts.count() > 1 ) addr.setGivenName( nameParts[ 1 ] ); @@ -487,50 +487,50 @@ Addressee::List VCardTool::parseVCards( const QString& vcard ) } // NAME else if ( identifier == "name" ) - addr.setName( (*lineIt).value().asString() ); + addr.setName( (*lineIt).valueString() ); // NICKNAME else if ( identifier == "nickname" ) - addr.setNickName( (*lineIt).value().asString() ); + addr.setNickName( (*lineIt).valueString() ); // NOTE else if ( identifier == "note" ) - addr.setNote( (*lineIt).value().asString() ); + addr.setNote( (*lineIt).valueString() ); // ORGANIZATION else if ( identifier == "org" ) - addr.setOrganization( (*lineIt).value().asString() ); + addr.setOrganization( (*lineIt).valueString() ); // PHOTO else if ( identifier == "photo" ) addr.setPhoto( parsePicture( *lineIt ) ); // PROID else if ( identifier == "prodid" ) - addr.setProductId( (*lineIt).value().asString() ); + addr.setProductId( (*lineIt).valueString() ); // REV else if ( identifier == "rev" ) - addr.setRevision( parseDateTime( (*lineIt).value().asString() ) ); + addr.setRevision( parseDateTime( (*lineIt).valueString() ) ); // ROLE else if ( identifier == "role" ) - addr.setRole( (*lineIt).value().asString() ); + addr.setRole( (*lineIt).valueString() ); // SORT-STRING else if ( identifier == "sort-string" ) - addr.setSortString( (*lineIt).value().asString() ); + addr.setSortString( (*lineIt).valueString() ); // SOUND else if ( identifier == "sound" ) addr.setSound( parseSound( *lineIt ) ); // TEL else if ( identifier == "tel" ) { PhoneNumber phone; - phone.setNumber( (*lineIt).value().asString() ); + phone.setNumber( (*lineIt).valueString() ); int type = 0; const QStringList types = (*lineIt).parameters( "type" ); @@ -543,14 +543,14 @@ Addressee::List VCardTool::parseVCards( const QString& vcard ) } // TITLE else if ( identifier == "title" ) - addr.setTitle( (*lineIt).value().asString() ); + addr.setTitle( (*lineIt).valueString() ); // TZ else if ( identifier == "tz" ) { TimeZone tz; - const QString date = (*lineIt).value().asString(); + const QString date = (*lineIt).valueString(); int hours = date.mid( 1, 2).toInt(); int minutes = date.mid( 4, 2 ).toInt(); int offset = ( hours * 60 ) + minutes; @@ -561,19 +561,19 @@ Addressee::List VCardTool::parseVCards( const QString& vcard ) } // UID else if ( identifier == "uid" ) - addr.setUid( (*lineIt).value().asString() ); + addr.setUid( (*lineIt).valueString() ); // URL else if ( identifier == "url" ) - addr.setUrl( KURL( (*lineIt).value().asString() ) ); + addr.setUrl( KURL( (*lineIt).valueString() ) ); // X- else if ( identifier.startsWith( "x-" ) ) { const QString key = (*lineIt).identifier().mid( 2 ); int dash = key.find( "-" ); - addr.insertCustom( key.left( dash ), key.mid( dash + 1 ), (*lineIt).value().asString() ); + addr.insertCustom( key.left( dash ), key.mid( dash + 1 ), (*lineIt).valueString() ); } } } @@ -635,9 +635,9 @@ Picture VCardTool::parsePicture( const VCardLine &line ) img.loadFromData( line.valueBytes() ); pic.setData( img ); } else if ( params.findIndex( "value" ) != -1 ) { if ( line.parameter( "value" ).lower() == "uri" ) - pic.setUrl( line.value().asString() ); + pic.setUrl( line.valueString() ); } if ( params.findIndex( "type" ) != -1 ) pic.setType( line.parameter( "type" ) ); @@ -654,15 +654,15 @@ VCardLine VCardTool::createPicture( const QString &identifier, const Picture &pi QByteArray input; QDataStream s( input, IO_WriteOnly ); s.setVersion( 4 ); s << pic.data(); - line.setValue( input ); + line.setValueBytes( input ); line.addParameter( "encoding", "b" ); line.addParameter( "type", "image/png" ); } } else if ( !pic.url().isEmpty() ) { QByteArray ba; - line.setValue( pic.url() ); + line.setValueString( pic.url() ); line.addParameter( "value", "URI" ); } return line; @@ -676,9 +676,9 @@ Sound VCardTool::parseSound( const VCardLine &line ) if ( params.findIndex( "encoding" ) != -1 ) snd.setData( line.valueBytes() ); else if ( params.findIndex( "value" ) != -1 ) { if ( line.parameter( "value" ).lower() == "uri" ) - snd.setUrl( line.value().asString() ); + snd.setUrl( line.valueString() ); } /* TODO: support sound types if ( params.contains( "type" ) ) @@ -693,14 +693,14 @@ VCardLine VCardTool::createSound( const Sound &snd ) VCardLine line( "SOUND" ); if ( snd.isIntern() ) { if ( !snd.data().isEmpty() ) { - line.setValue( snd.data() ); + line.setValueBytes( snd.data() ); line.addParameter( "encoding", "b" ); // TODO: need to store sound type!!! } } else if ( !snd.url().isEmpty() ) { - line.setValue( snd.url() ); + line.setValueString( snd.url() ); line.addParameter( "value", "URI" ); } return line; @@ -713,9 +713,9 @@ Key VCardTool::parseKey( const VCardLine &line ) const QStringList params = line.parameterList(); if ( params.findIndex( "encoding" ) != -1 ) key.setBinaryData( line.valueBytes() ); else - key.setTextData( line.value().asString() ); + key.setTextData( line.valueString() ); if ( params.findIndex( "type" ) != -1 ) { if ( line.parameter( "type" ).lower() == "x509" ) key.setType( Key::X509 ); @@ -735,13 +735,13 @@ VCardLine VCardTool::createKey( const Key &key ) VCardLine line( "KEY" ); if ( key.isBinary() ) { if ( !key.binaryData().isEmpty() ) { - line.setValue( key.binaryData() ); + line.setValueBytes( key.binaryData() ); line.addParameter( "encoding", "b" ); } } else if ( !key.textData().isEmpty() ) - line.setValue( key.textData() ); + line.setValueString( key.textData() ); if ( key.type() == Key::X509 ) line.addParameter( "type", "X509" ); else if ( key.type() == Key::PGP ) @@ -755,13 +755,13 @@ VCardLine VCardTool::createKey( const Key &key ) Secrecy VCardTool::parseSecrecy( const VCardLine &line ) { Secrecy secrecy; - if ( line.value().asString().lower() == "public" ) + if ( line.valueString().lower() == "public" ) secrecy.setType( Secrecy::Public ); - if ( line.value().asString().lower() == "private" ) + if ( line.valueString().lower() == "private" ) secrecy.setType( Secrecy::Private ); - if ( line.value().asString().lower() == "confidential" ) + if ( line.valueString().lower() == "confidential" ) secrecy.setType( Secrecy::Confidential ); return secrecy; } @@ -772,13 +772,13 @@ VCardLine VCardTool::createSecrecy( const Secrecy &secrecy ) int type = secrecy.type(); if ( type == Secrecy::Public ) - line.setValue( "PUBLIC" ); + line.setValueString( "PUBLIC" ); else if ( type == Secrecy::Private ) - line.setValue( "PRIVATE" ); + line.setValueString( "PRIVATE" ); else if ( type == Secrecy::Confidential ) - line.setValue( "CONFIDENTIAL" ); + line.setValueString( "CONFIDENTIAL" ); return line; } @@ -788,11 +788,11 @@ Agent VCardTool::parseAgent( const VCardLine &line ) const QStringList params = line.parameterList(); if ( params.findIndex( "value" ) != -1 ) { if ( line.parameter( "value" ).lower() == "uri" ) - agent.setUrl( line.value().asString() ); + agent.setUrl( line.valueString() ); } else { - QString str = line.value().asString(); + QString str = line.valueString(); str.replace( QRegExp("\\\\n"), "\r\n" ); str.replace( QRegExp("\\\\N"), "\r\n" ); str.replace( QRegExp("\\\\;"), ";" ); str.replace( QRegExp("\\\\:"), ":" ); @@ -822,12 +822,12 @@ VCardLine VCardTool::createAgent( VCard::Version version, const Agent &agent ) str.replace( QRegExp("\\r\\n"), "\\n" ); str.replace( QRegExp(";"), "\\;" ); str.replace( QRegExp(":"), "\\:" ); str.replace( QRegExp(","), "\\," ); - line.setValue( str ); + line.setValueString( str ); } } else if ( !agent.url().isEmpty() ) { - line.setValue( agent.url() ); + line.setValueString( agent.url() ); line.addParameter( "value", "URI" ); } return line; diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp index 84d3116..b6e053f 100644 --- a/kaddressbook/views/cardview.cpp +++ b/kaddressbook/views/cardview.cpp @@ -935,26 +935,25 @@ uint CardView::columnWidth() void CardView::drawContents(QPainter *p, int clipx, int clipy, int clipw, int cliph) { - QScrollView::drawContents(p, clipx, clipy, clipw, cliph); - + //QScrollView::drawContents(p, clipx, clipy, clipw, cliph); if (d->mLayoutDirty) calcLayout(); //kdDebug() << "CardView::drawContents: " << clipx << ", " << clipy // << ", " << clipw << ", " << cliph << endl; QColorGroup cg = viewport()->palette().active(); // allow setting costum colors in the viewport pale - + int cX, cY; + contentsToViewport ( clipx, clipy, cX, cY ); QRect clipRect(clipx, clipy, clipw, cliph); QRect cardRect; QRect sepRect; CardViewItem *item; CardViewSeparator *sep; - // make sure the viewport is a pure background - viewport()->erase(clipRect); + viewport()->erase( QRect ( cX, cY , clipw, cliph ) ); // Now tell the cards to draw, if they are in the clip region QPtrListIterator<CardViewItem> iter(d->mItemList); for (iter.toFirst(); iter.current(); ++iter) |