*** empty log message ***

1 files changed, 97 insertions, 111 deletions

diff --git a/kabc/kabcE.pro b/kabc/kabcE.pro
index 6c37beb..6a3bbf1 100644
--- a/kabc/kabcE.pro
+++ b/kabc/kabcE.pro
@@ -16,146 +16,132 @@ INTERFACES = \
 
 HEADERS = \
- resource.h \
- stdaddressbook.h \
- agent.h \
- geo.h \
- key.h \
- field.h \
- plugin.h \
  address.h \
+ addressbook.h \
+ addressee.h \
+ addresseedialog.h \
  addresseelist.h \
-formatfactory.h \
+ agent.h \
+ distributionlist.h \
+ distributionlistdialog.h \
+ distributionlisteditor.h \
+ field.h \
+ formatfactory.h \
  formatplugin.h \
+ geo.h \
+ key.h \
  phonenumber.h \
-distributionlist.h \
-distributionlistdialog.h \
-distributionlisteditor.h \
-vcardformatplugin.h \
-formats/binaryformat.h \
-formats/vcardformatplugin2.h \
  picture.h \
+ plugin.h \
+ resource.h \
  secrecy.h \
  sound.h \
- addressbook.h \
+ stdaddressbook.h \
  timezone.h \
- addressee.h \
- addresseedialog.h \
  vcardconverter.h \
  vcard21parser.h \
  vcardformatimpl.h \
- plugins/file/resourcefile.h \
- plugins/file/resourcefileconfig.h \
- plugins/dir/resourcedir.h \
- plugins/dir/resourcedirconfig.h \
+ vcardformatplugin.h \
  vcardparser/vcardline.h \
  vcardparser/vcard.h \
  vcardparser/vcardtool.h \
  vcardparser/vcardparser.h \
-vcard/include/VCardAdrParam.h \
-vcard/include/VCardAdrValue.h \
-vcard/include/VCardAgentParam.h \
-vcard/include/VCardContentLine.h \
-vcard/include/VCardDateParam.h \
-vcard/include/VCardDateValue.h \
-vcard/include/VCardEmailParam.h \
-vcard/include/VCardGeoValue.h \
-vcard/include/VCardGroup.h \
-vcard/include/VCardImageParam.h \
-vcard/include/VCardImageValue.h \
-vcard/include/VCardLangValue.h \
-vcard/include/VCardNValue.h \
-vcard/include/VCardParam.h \
-vcard/include/VCardPhoneNumberValue.h \
-vcard/include/VCardSourceParam.h \
-vcard/include/VCardTelParam.h \
-vcard/include/VCardTextParam.h \
-vcard/include/VCardTextNSParam.h \
-vcard/include/VCardTextValue.h \
-vcard/include/VCardTextBinParam.h \
-vcard/include/VCardURIValue.h \
-vcard/include/VCardVCard.h \
-vcard/include/VCardEntity.h \
-vcard/include/VCardValue.h \
-vcard/include/VCardSoundValue.h \
-vcard/include/VCardAgentValue.h \
-vcard/include/VCardTelValue.h \
-vcard/include/VCardTextBinValue.h \
-vcard/include/VCardOrgValue.h \
-vcard/include/VCardUTCValue.h \
-vcard/include/VCardClassValue.h \
-vcard/include/VCardFloatValue.h \
-vcard/include/VCardTextListValue.h \
-vcard/include/generated/AdrParam-generated.h \
-vcard/include/generated/AdrValue-generated.h \
-vcard/include/generated/AgentParam-generated.h \
-vcard/include/generated/ContentLine-generated.h \
-vcard/include/generated/DateParam-generated.h \
-vcard/include/generated/DateValue-generated.h \
-vcard/include/generated/EmailParam-generated.h \
-vcard/include/generated/GeoValue-generated.h \
-vcard/include/generated/Group-generated.h \
-vcard/include/generated/ImageParam-generated.h \
-vcard/include/generated/ImageValue-generated.h \
-vcard/include/generated/LangValue-generated.h \
-vcard/include/generated/NValue-generated.h \
-vcard/include/generated/Param-generated.h \
-vcard/include/generated/PhoneNumberValue-generated.h \
-vcard/include/generated/SourceParam-generated.h \
-vcard/include/generated/TelParam-generated.h \
-vcard/include/generated/TextParam-generated.h \
-vcard/include/generated/TextNSParam-generated.h \
-vcard/include/generated/TextValue-generated.h \
-vcard/include/generated/TextBinParam-generated.h \
-vcard/include/generated/URIValue-generated.h \
-vcard/include/generated/VCard-generated.h \
-vcard/include/generated/VCardEntity-generated.h \
-vcard/include/generated/Value-generated.h \
-vcard/include/generated/SoundValue-generated.h \
-vcard/include/generated/AgentValue-generated.h \
-vcard/include/generated/TelValue-generated.h \
-vcard/include/generated/TextBinValue-generated.h \
-vcard/include/generated/OrgValue-generated.h \
-vcard/include/generated/UTCValue-generated.h \
-vcard/include/generated/ClassValue-generated.h \
-vcard/include/generated/FloatValue-generated.h \
-vcard/include/generated/TextListValue-generated.h
+ vcard/include/VCardAdrParam.h \
+ vcard/include/VCardAdrValue.h \
+ vcard/include/VCardAgentParam.h \
+ vcard/include/VCardContentLine.h \
+ vcard/include/VCardDateParam.h \
+ vcard/include/VCardDateValue.h \
+ vcard/include/VCardEmailParam.h \
+ vcard/include/VCardGeoValue.h \
+ vcard/include/VCardGroup.h \
+ vcard/include/VCardImageParam.h \
+ vcard/include/VCardImageValue.h \
+ vcard/include/VCardLangValue.h \
+ vcard/include/VCardNValue.h \
+ vcard/include/VCardParam.h \
+ vcard/include/VCardPhoneNumberValue.h \
+ vcard/include/VCardSourceParam.h \
+ vcard/include/VCardTelParam.h \
+ vcard/include/VCardTextParam.h \
+ vcard/include/VCardTextNSParam.h \
+ vcard/include/VCardTextValue.h \
+ vcard/include/VCardTextBinParam.h \
+ vcard/include/VCardURIValue.h \
+ vcard/include/VCardVCard.h \
+ vcard/include/VCardEntity.h \
+ vcard/include/VCardValue.h \
+ vcard/include/VCardSoundValue.h \
+ vcard/include/VCardAgentValue.h \
+ vcard/include/VCardTelValue.h \
+ vcard/include/VCardTextBinValue.h \
+ vcard/include/VCardOrgValue.h \
+ vcard/include/VCardUTCValue.h \
+ vcard/include/VCardClassValue.h \
+ vcard/include/VCardFloatValue.h \
+ vcard/include/VCardTextListValue.h \
+ vcard/include/generated/AdrParam-generated.h \
+ vcard/include/generated/AdrValue-generated.h \
+ vcard/include/generated/AgentParam-generated.h \
+ vcard/include/generated/ContentLine-generated.h \
+ vcard/include/generated/DateParam-generated.h \
+ vcard/include/generated/DateValue-generated.h \
+ vcard/include/generated/EmailParam-generated.h \
+ vcard/include/generated/GeoValue-generated.h \
+ vcard/include/generated/Group-generated.h \
+ vcard/include/generated/ImageParam-generated.h \
+ vcard/include/generated/ImageValue-generated.h \
+ vcard/include/generated/LangValue-generated.h \
+ vcard/include/generated/NValue-generated.h \
+ vcard/include/generated/Param-generated.h \
+ vcard/include/generated/PhoneNumberValue-generated.h \
+ vcard/include/generated/SourceParam-generated.h \
+ vcard/include/generated/TelParam-generated.h \
+ vcard/include/generated/TextParam-generated.h \
+ vcard/include/generated/TextNSParam-generated.h \
+ vcard/include/generated/TextValue-generated.h \
+ vcard/include/generated/TextBinParam-generated.h \
+ vcard/include/generated/URIValue-generated.h \
+ vcard/include/generated/VCard-generated.h \
+ vcard/include/generated/VCardEntity-generated.h \
+ vcard/include/generated/Value-generated.h \
+ vcard/include/generated/SoundValue-generated.h \
+ vcard/include/generated/AgentValue-generated.h \
+ vcard/include/generated/TelValue-generated.h \
+ vcard/include/generated/TextBinValue-generated.h \
+ vcard/include/generated/OrgValue-generated.h \
+ vcard/include/generated/UTCValue-generated.h \
+ vcard/include/generated/ClassValue-generated.h \
+ vcard/include/generated/FloatValue-generated.h \
+ vcard/include/generated/TextListValue-generated.h
 
  
-# plugins/ldap/resourceldap.h \
-# plugins/ldap/resourceldapconfig.h \
  
  
 SOURCES = \
-distributionlist.cpp \
-distributionlistdialog.cpp \
-distributionlisteditor.cpp \
-vcardformatplugin.cpp \
-formats/binaryformat.cpp \
-formats/vcardformatplugin2.cpp \
-formatfactory.cpp \
- resource.cpp \
- stdaddressbook.cpp \
- plugin.cpp \
+ address.cpp \
+ addressbook.cpp \
+ addressee.cpp \
+ addresseedialog.cpp \
+ addresseelist.cpp \
  agent.cpp \
+ distributionlist.cpp \
+ distributionlistdialog.cpp \
+ distributionlisteditor.cpp \
+ field.cpp \
+ formatfactory.cpp \
  geo.cpp \
  key.cpp \
- field.cpp \
- address.cpp \
  phonenumber.cpp \
  picture.cpp \
+ plugin.cpp \
+ resource.cpp \
  secrecy.cpp \
  sound.cpp \
- addressbook.cpp \
+ stdaddressbook.cpp \
  timezone.cpp \
- addressee.cpp \
- addresseelist.cpp \
- addresseedialog.cpp \
  vcardconverter.cpp \
  vcard21parser.cpp \
  vcardformatimpl.cpp \
- plugins/file/resourcefile.cpp \
- plugins/file/resourcefileconfig.cpp \
- plugins/dir/resourcedir.cpp \
- plugins/dir/resourcedirconfig.cpp \
+ vcardformatplugin.cpp \
  vcardparser/vcardline.cpp \
  vcardparser/vcard.cpp \