fixes

3 files changed, 0 insertions, 26 deletions

diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index 7f592e9..155ce24 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -53,3 +53,2 @@ struct Addressee::AddresseeData : public KShared
   QString formattedName;
-  QString defaultFormattedName;
   QString familyName;
@@ -750,9 +749,2 @@ void Addressee::setFormattedName( const QString &formattedName )
 }
-void Addressee::setDefaultFormattedName( const QString &formattedName )
-{
-  if ( formattedName == mData->defaultFormattedName ) return;
-  detach();
-  mData->empty = false;
-  mData->defaultFormattedName = formattedName;
-}
 
@@ -762,6 +754,2 @@ QString Addressee::formattedName() const
 }
-QString Addressee::defaultFormattedName() const
-{
-  return mData->defaultFormattedName;
-}
 
@@ -772,7 +760,2 @@ QString Addressee::formattedNameLabel()
 
-QString Addressee::defaultFormattedNameLabel()
-{
-  return i18n("Def.Formatted Name");
-}
-
 
diff --git a/kabc/addressee.h b/kabc/addressee.h
index 0d688f8..a2fbcf5 100644
--- a/kabc/addressee.h
+++ b/kabc/addressee.h
@@ -156,3 +156,2 @@ class Addressee
     void setFormattedName( const QString &formattedName );
-    void setDefaultFormattedName( const QString &formattedName );
     /**
@@ -161,3 +160,2 @@ class Addressee
     QString formattedName() const;
-    QString defaultFormattedName() const;
     /**
@@ -166,3 +164,2 @@ class Addressee
     static QString formattedNameLabel();
-    static QString defaultFormattedNameLabel();
 
diff --git a/kabc/field.cpp b/kabc/field.cpp
index 5c561c3..fd51026 100644
--- a/kabc/field.cpp
+++ b/kabc/field.cpp
@@ -89,3 +89,2 @@ class Field::FieldImpl
       Sip,
-      DefaultFormattedName,
       MobileWorkPhone,
@@ -131,4 +130,2 @@ QString Field::label()
       return Addressee::formattedNameLabel();
-    case FieldImpl::DefaultFormattedName:
-      return Addressee::defaultFormattedNameLabel();
     case FieldImpl::FamilyName:
@@ -250,4 +247,2 @@ QString Field::value( const KABC::Addressee &a )
       return a.formattedName();
-    case FieldImpl::DefaultFormattedName:
-      return a.defaultFormattedName();
     case FieldImpl::FamilyName:
@@ -410,3 +405,2 @@ Field::List Field::allFields()
     createField( FieldImpl::FormattedName, Frequent );
-    createField( FieldImpl::DefaultFormattedName, Frequent );
     createField( FieldImpl::FamilyName, Frequent );