Rearranged linking

14 files changed, 482 insertions, 13 deletions

diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp
new file mode 100644
index 0000000..b4717d7
--- a/dev/null
+++ b/kabc/addresseeview.cpp
@@ -0,0 +1,401 @@
+/*
+    This file is part of libkdepim.
+
+    Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+    Boston, MA 02111-1307, USA.
+*/
+
+#include <kabc/address.h>
+#include <kabc/addressee.h>
+#include <kabc/phonenumber.h>
+#include <kglobal.h>
+//US#include <kglobalsettings.h>
+#include <kiconloader.h>
+#include <klocale.h>
+//US #include <kstringhandler.h>
+#include <qscrollview.h>
+#include <qregexp.h>
+#include <qfile.h>
+#include <qapplication.h>
+
+
+#include "externalapphandler.h"
+#include "addresseeview.h"
+
+
+//US #ifndef DESKTOP_VERSION
+//US #include <qtopia/qcopenvelope_qws.h>
+//US #include <qpe/qpeapplication.h>
+//US #endif
+
+//US static int kphoneInstalled = 0;
+
+using namespace KPIM;
+
+AddresseeView::AddresseeView( QWidget *parent, const char *name )
+//US  : KTextBrowser( parent, name )
+  : QTextBrowser( parent, name )
+
+
+{
+//US  setWrapPolicy( QTextEdit::AtWordBoundary );
+  setLinkUnderline( false );
+  // setVScrollBarMode( QScrollView::AlwaysOff );
+  //setHScrollBarMode( QScrollView::AlwaysOff );
+
+//US  QStyleSheet *sheet = styleSheet();
+//US  QStyleSheetItem *link = sheet->item( "a" );
+//US  link->setColor( KGlobalSettings::linkColor() );
+
+}
+
+void AddresseeView::setSource(const QString& n)
+{
+    //qDebug("********AddresseeView::setSource %s", n.latin1());
+
+  if ( n.left( 6 ) == "mailto" )
+    ExternalAppHandler::instance()->mailToOneContact( n.mid(7) );
+  else if ( n.left( 7 ) == "phoneto" )
+    ExternalAppHandler::instance()->callByPhone(  n.mid(8) );
+  else if ( n.left( 5 ) == "faxto" )
+    ExternalAppHandler::instance()->callByFax(  n.mid(6) );
+  else if ( n.left( 5 ) == "smsto" )
+    ExternalAppHandler::instance()->callBySMS(  n.mid(6) );
+  else if ( n.left( 7 ) == "pagerto" )
+    ExternalAppHandler::instance()->callByPager(  n.mid(8) );
+  else if ( n.left( 5 ) == "sipto" )
+    ExternalAppHandler::instance()->callBySIP(  n.mid(6) );
+
+}
+void AddresseeView::setAddressee( const KABC::Addressee& addr )
+{
+  ExternalAppHandler* eah = ExternalAppHandler::instance();
+  bool kemailAvail = eah->isEmailAppAvailable();
+  bool kphoneAvail = eah->isPhoneAppAvailable();
+  bool kfaxAvail = eah->isFaxAppAvailable();
+  bool ksmsAvail = eah->isSMSAppAvailable();
+  bool kpagerAvail = eah->isPagerAppAvailable();
+  bool ksipAvail = eah->isSIPAppAvailable();
+
+
+  mAddressee = addr;
+  // clear view
+  setText( QString::null );
+
+  if ( mAddressee.isEmpty() )
+    return;
+
+  QString name = ( mAddressee.assembledName().isEmpty() ?
+                   mAddressee.formattedName() : mAddressee.assembledName() );
+
+  QString dynamicPart;
+
+  QStringList emails = mAddressee.emails();
+  QStringList::ConstIterator emailIt;
+  QString type = i18n( "Email" );
+  emailIt = emails.begin();
+  if ( emailIt != emails.end() ) {
+    if ( kemailAvail ) {
+      dynamicPart += QString(
+            "<tr><td align=\"right\"><b>%1</b></td>"
+           "<td align=\"left\"><a href=\"mailto:%2 <%3> \">%4</a></td></tr>" )
+          .arg( type )
+          .arg( name )
+          .arg( *emailIt )
+          .arg( *emailIt );
+      ++emailIt;
+    } else {
+      dynamicPart += QString(
+            "<tr><td align=\"right\"><b>%1</b></td>"
+           "<td align=\"left\">%2</td></tr>" )
+          .arg( type )
+          .arg( *emailIt );
+      ++emailIt;
+    }
+  }
+  if ( mAddressee.birthday().date().isValid() ) {
+      dynamicPart += QString(
+            "<tr><td align=\"right\"><b>%1</b></td>"
+           "<td align=\"left\">%2</td></tr>" )
+          .arg( i18n ("Birthday") )
+          .arg( KGlobal::locale()->formatDate( mAddressee.birthday().date()  ,true) );
+  }
+  KABC::PhoneNumber::List phones = mAddressee.phoneNumbers();
+  KABC::PhoneNumber::List::ConstIterator phoneIt;
+  QString extension;
+  int phonetype;
+  QString sms;
+  for ( phoneIt = phones.begin(); phoneIt != phones.end(); ++phoneIt ) {
+    phonetype = (*phoneIt).type();
+    if (ksmsAvail &&
+        (
+		 ((phonetype & KABC::PhoneNumber::Car) == KABC::PhoneNumber::Car) ||
+         ((phonetype & KABC::PhoneNumber::Cell) == KABC::PhoneNumber::Cell)
+        )
+       )
+    {
+      sms = QString("<a href=\"smsto:%1  \">(sms)</a>" )
+              .arg( (*phoneIt).number() );
+
+    }
+    else
+      sms = "";
+
+    extension = QString::null;
+    if ((phonetype & KABC::PhoneNumber::Fax) == KABC::PhoneNumber::Fax) {
+      if (kfaxAvail) extension = "faxto:";
+    }
+    else if ((phonetype & KABC::PhoneNumber::Pager) == KABC::PhoneNumber::Pager) {
+      if (kpagerAvail) extension = "pagerto:";
+    }
+    else if ((phonetype & KABC::PhoneNumber::Sip) == KABC::PhoneNumber::Sip) {
+      if (ksipAvail) extension = "sipto:";
+    }
+    else if (kphoneAvail) {
+      extension = "phoneto:";
+    }
+    else
+      extension = QString::null;
+
+      if ( !extension.isEmpty() ) {
+          dynamicPart += QString(
+                                 "<tr><td align=\"right\"><b>%1</b></td>"
+           "<td align=\"left\"><a href=\"%2%3  \">%4</a> %5</td></tr>" )
+              .arg( KABC::PhoneNumber::typeLabel( phonetype ) )
+              .arg( extension )
+              .arg( (*phoneIt).number() )
+              .arg( (*phoneIt).number() )
+              .arg( sms );
+
+      } else {
+          dynamicPart += QString(
+                                 "<tr><td align=\"right\"><b>%1</b></td>"
+                                 "<td align=\"left\">%2 %3</td></tr>" )
+              .arg( KABC::PhoneNumber::typeLabel( phonetype ) )
+              .arg( (*phoneIt).number() )
+              .arg( sms );
+      }
+  }
+
+
+  for ( ; emailIt != emails.end(); ++emailIt ) {
+    if ( kemailAvail ) {
+      dynamicPart += QString(
+        "<tr><td align=\"right\"><b>%1</b></td>"
+        "<td align=\"left\"><a href=\"mailto:%2 <%3> \">%4</a></td></tr>" )
+        .arg( type )
+        .arg( name )
+        .arg( *emailIt )
+        .arg( *emailIt );
+	} else {
+      dynamicPart += QString(
+        "<tr><td align=\"right\"><b>%1</b></td>"
+        "<td align=\"left\">%2</td></tr>" )
+        .arg( type )
+        .arg( *emailIt );
+    }
+  }
+
+  if ( !mAddressee.url().url().isEmpty() ) {
+    dynamicPart += QString(
+      "<tr><td align=\"right\"><b>%1</b></td>"
+      "<td align=\"left\">%2</td></tr>" )
+      .arg( i18n( "Homepage" ) )
+//US      .arg( KStringHandler::tagURLs( mAddressee.url().url() ) );
+      .arg( mAddressee.url().url() );
+    //qDebug("AddresseeView::setAddressee has to be verified.");
+  }
+
+  KABC::Address::List addresses = mAddressee.addresses();
+  KABC::Address::List::ConstIterator addrIt;
+  for ( addrIt = addresses.begin(); addrIt != addresses.end(); ++addrIt ) {
+      if ( true /*(*addrIt).label().isEmpty()*/ ) {
+      QString formattedAddress = (*addrIt).formattedAddress().stripWhiteSpace();
+//US      formattedAddress = formattedAddress.replace( '\n', "<br>" );
+      //qDebug("adresss %s ",formattedAddress.latin1() );
+       formattedAddress = formattedAddress.replace( QRegExp("\n"), "<br>" );
+       //qDebug("AddresseeView::setAddressee has to be verified.");
+
+      dynamicPart += QString(
+        "<tr><td align=\"right\"><b>%1</b></td>"
+        "<td align=\"left\">%2</td></tr>" )
+        .arg( KABC::Address::typeLabel( (*addrIt).type() ) )
+        .arg( formattedAddress );
+    } else {
+
+      dynamicPart += QString(
+        "<tr><td align=\"right\"><b>%1</b></td>"
+        "<td align=\"left\">%2</td></tr>" )
+        .arg( KABC::Address::typeLabel( (*addrIt).type() ) )
+//US        .arg( (*addrIt).label().replace( '\n', "<br>" ) );
+          .arg( (*addrIt).label() /*replace( QRegExp("\n"), "<br>" )*/ );
+
+    }
+  }
+
+  QString notes;
+  if ( !mAddressee.note().isEmpty() ) {
+    notes = QString(
+      "<tr>"
+      "<td align=\"right\" valign=\"top\"><b>%1</b></td>"  // note label
+      "<td align=\"left\">%2</td>"  // note
+      "</tr>" ).arg( i18n( "Notes" ) )
+//US      .arg( mAddressee.note().replace( '\n', "<br>" ) );
+      .arg( mAddressee.note().replace( QRegExp("\n"), "<br>" ) );
+    //qDebug("AddresseeView::setAddressee has to be verified.");
+  }
+
+  QString aRole = "";
+  QString aOrga = "";
+  if ( true /*!mAddressee.role().isEmpty()*/ ) {
+      aRole = "<tr>"
+          "<td align=\"left\">" + mAddressee.role() + "</td>"
+          "</tr>";
+  }
+  if ( true /*!mAddressee.organization().isEmpty()*/ ) {
+      aOrga = "<tr>"
+          "<td align=\"left\">" + mAddressee.organization() + "</td>" ;
+          "</tr>";
+  }
+  mText = "";
+  QString picString = "";
+  KABC::Picture picture = mAddressee.photo();
+  bool picAvailintern = false;
+  bool picAvailUrl = false;
+  if (! picture.undefined() ) {
+      picAvailintern = (picture.isIntern() && !picture.data().isNull());
+      picAvailUrl = !picture.isIntern() &&  QFile::exists(picture.url() );
+  }
+  if ( picAvailUrl || picAvailintern || QApplication::desktop()->width() > 320 ) {
+      if (  picAvailintern ) {
+          QMimeSourceFactory::defaultFactory()->setImage( "myimage", picture.data() );
+      } else {
+          if ( picAvailUrl ) {
+              QMimeSourceFactory::defaultFactory()->setPixmap( "myimage", QPixmap( picture.url() ));
+          } else {
+          QMimeSourceFactory::defaultFactory()->setPixmap( "myimage", KGlobal::iconLoader()->loadIcon( "package_toys", KIcon::Desktop, 128 ) );
+          }
+      }
+      picString =  "<img src=\"myimage\" width=\"50\" height=\"70\">";
+    mText = QString::fromLatin1(
+  "<html>"
+  "<body text=\"%1\" bgcolor=\"%2\">" // text and background color
+  "<table>"
+  "<tr>"
+  "<td rowspan=\"3\" align=\"right\" valign=\"top\">"
+  "%3"
+  "</td>"
+  "<td align=\"left\"><font size=\"+2\"><b>%4</b></font></td>"  // name
+  "</tr>"
+  "%5"  // role
+  "%6"  // organization
+  "<td colspan=\"2\">&nbsp;</td>"
+  "%7"  // dynamic part
+  "%8"  // notes
+  "</table>"
+  "</body>"
+  "</html>")
+//US
+  .arg( /*KGlobalSettings::textColor().name()*/ "black" )
+//US
+  .arg( /*KGlobalSettings::baseColor().name()*/ "white" )
+  .arg( picString )
+  .arg( name )
+  .arg( aRole )
+  .arg( aOrga )
+  .arg( dynamicPart )
+  .arg( notes );
+
+  } else { // no picture!
+
+mText = "<table width=\"100%\">\n";
+    //mText += "<tr bgcolor=\"#3679AD\"><td><h2>";
+#ifdef DESKTOP_VERSION
+    mText += "<tr bgcolor=\"#5699CD\"><td align=\"left\"><h1>";
+#else
+    mText += "<tr bgcolor=\"#5699CD\"><td align=\"left\"><h2>";
+#endif
+
+#ifdef DESKTOP_VERSION
+    mText += "<font color=\"#FFFFFF\"> <em>" +  name+"</em></font></h1>";
+#else
+    mText += "<font color=\"#FFFFFF\"> <em>" +  name +"</em></font></h2>";
+#endif
+    mText += "</td></tr>\n<tr  bgcolor=\"#EAF8FA\"><td>";
+
+    mText += "<table><td colspan=\"2\">&nbsp;</td>";
+    /*
+      mText += QString("<tr><td align=\"right\"><b2>%1</b2></td>"
+        "<td align=\"left\"><b>%2</b></td></tr>" )
+          .arg( i18n(" ") )
+        .arg( name );
+    */
+      if ( ! mAddressee.role().isEmpty() )
+      mText += QString("<tr><td align=\"right\"><b>%1</b></td>"
+        "<td align=\"left\">%2</td></tr>" )
+          .arg( i18n(" ") )
+        .arg( mAddressee.role());
+      if ( ! mAddressee.organization().isEmpty() )
+      mText += QString("<tr><td align=\"right\"><b>%1</b></td>"
+        "<td align=\"left\">%2</td></tr>" )
+          .arg( i18n(" ") )
+        .arg( mAddressee.organization());
+      mText += dynamicPart;
+      mText += notes;
+      mText += "</table>";
+
+ }
+
+  // at last display it...
+  setText( mText );
+
+}
+
+KABC::Addressee AddresseeView::addressee() const
+{
+  return mAddressee;
+}
+void AddresseeView::addTag(const QString & tag,const QString & text)
+{
+    if ( text.isEmpty() )
+        return;
+    int number=text.contains("\n");
+    QString str = "<" + tag + ">";
+    QString tmpText=text;
+    QString tmpStr=str;
+    if(number !=-1)
+        {
+            if (number > 0) {
+                int pos=0;
+                QString tmp;
+                for(int i=0;i<=number;i++) {
+                    pos=tmpText.find("\n");
+                    tmp=tmpText.left(pos);
+                    tmpText=tmpText.right(tmpText.length()-pos-1);
+                    tmpStr+=tmp+"<br>";
+                }
+            }
+            else tmpStr += tmpText;
+            tmpStr+="</" + tag + ">";
+            mText.append(tmpStr);
+        }
+    else
+        {
+            str += text + "</" + tag + ">";
+            mText.append(str);
+        }
+}
diff --git a/kabc/addresseeview.h b/kabc/addresseeview.h
new file mode 100644
index 0000000..1865fc4
--- a/dev/null
+++ b/kabc/addresseeview.h
@@ -0,0 +1,60 @@
+/*
+    This file is part of libkdepim.
+
+    Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+    Boston, MA 02111-1307, USA.
+*/
+
+#ifndef KPIM_ADDRESSEEVIEW_H
+#define KPIM_ADDRESSEEVIEW_H
+
+#include <kabc/addressee.h>
+
+//US #include <ktextbrowser.h>
+#include <qtextbrowser.h>
+
+namespace KPIM {
+
+//US class AddresseeView : public KTextBrowser
+class AddresseeView : public QTextBrowser
+{
+  public:
+    AddresseeView( QWidget *parent = 0, const char *name = 0 );
+
+    /**
+      Sets the addressee object. The addressee is displayed immediately.
+
+      @param addr The addressee object.
+     */
+    void setAddressee( const KABC::Addressee& addr );
+    void setSource(const QString& n);
+    /**
+      Returns the current addressee object.
+     */
+    KABC::Addressee addressee() const;
+
+  private:
+    KABC::Addressee mAddressee;
+    QString mText;
+    void addTag(const QString & tag,const QString & text);
+    class AddresseeViewPrivate;
+    AddresseeViewPrivate *d;
+};
+
+}
+
+#endif
diff --git a/kabc/kabc.pro b/kabc/kabc.pro
index 417f5b0..d690acc 100644
--- a/kabc/kabc.pro
+++ b/kabc/kabc.pro
@@ -26,24 +26,25 @@ INTERFACES = \
 
 
 HEADERS = \
  resource.h \
  stdaddressbook.h \
  agent.h \
  geo.h \
  key.h \
  field.h \
  plugin.h \
  address.h \
  addresseelist.h \
+ addresseeview.h \
 formatfactory.h \
  formatplugin.h \
  phonenumber.h \
 distributionlist.h \
 distributionlistdialog.h \
 distributionlisteditor.h \
 vcardformatplugin.h \
 formats/vcardformatplugin2.h \
  picture.h \
  secrecy.h \
  sound.h \
  addressbook.h \
@@ -143,24 +144,25 @@ distributionlist.cpp \
 distributionlistdialog.cpp \
 distributionlisteditor.cpp \
 vcardformatplugin.cpp \
 formats/vcardformatplugin2.cpp \
 formatfactory.cpp \
  resource.cpp \
  stdaddressbook.cpp \
  plugin.cpp \
  agent.cpp \
  geo.cpp \
  key.cpp \
  field.cpp \
+ addresseeview.cpp \
  address.cpp \
  phonenumber.cpp \
  picture.cpp \
  secrecy.cpp \
  sound.cpp \
  addressbook.cpp \
  syncprefwidget.cpp \
  timezone.cpp \
  tmpaddressbook.cpp \
  addressee.cpp \
  addresseelist.cpp \
  addresseedialog.cpp \
diff --git a/kabc/kabcE.pro b/kabc/kabcE.pro
index dfdbcff..b360e8c 100644
--- a/kabc/kabcE.pro
+++ b/kabc/kabcE.pro
@@ -12,24 +12,25 @@ LIBS += -lmicrokdepim
 #LIBS += -lldap
 LIBS += -L$(QPEDIR)/lib
 DEFINES += KAB_EMBEDDED
 
 INTERFACES = \
 
 HEADERS = \
  address.h \
  addressbook.h \
  addressee.h \
  addresseedialog.h \
  addresseelist.h \
+ addresseeview.h \
  agent.h \
  distributionlist.h \
  distributionlistdialog.h \
  distributionlisteditor.h \
  field.h \
  formatfactory.h \
  formatplugin.h \
  geo.h \
  key.h \
  phonenumber.h \
  picture.h \
  plugin.h \
@@ -117,24 +118,25 @@ HEADERS = \
  vcard/include/generated/FloatValue-generated.h \
  vcard/include/generated/TextListValue-generated.h
 
  
  
  
 SOURCES = \
  address.cpp \
  addressbook.cpp \
  addressee.cpp \
  addresseedialog.cpp \
  addresseelist.cpp \
+ addresseeview.cpp \
  agent.cpp \
  distributionlist.cpp \
  distributionlistdialog.cpp \
  distributionlisteditor.cpp \
  field.cpp \
  formatfactory.cpp \
  geo.cpp \
  key.cpp \
  phonenumber.cpp \
  picture.cpp \
  plugin.cpp \
  resource.cpp \
diff --git a/kaddressbook/details/look_html.cpp b/kaddressbook/details/look_html.cpp
index 2a70273..63364a7 100644
--- a/kaddressbook/details/look_html.cpp
+++ b/kaddressbook/details/look_html.cpp
@@ -12,25 +12,25 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
-#include <libkdepim/addresseeview.h>
+#include <addresseeview.h>
 
 #include "look_html.h"
 #include <qscrollview.h> 
 KABHtmlView::KABHtmlView( QWidget *parent, const char *name )
   : KABBasicLook( parent, name )
 {
     mView = new KPIM::AddresseeView( this ); 
 }
 
 KABHtmlView::~KABHtmlView()
 {
 }
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index f21507a..32dd43a 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -67,25 +67,25 @@ $Id$
 #include "kstdaction.h"
 #include "kaddressbookservice.h"
 #include "ldapsearchdialog.h"
 #include "printing/printingwizard.h"
 #else // KAB_EMBEDDED
 
 #include <kapplication.h>
 #include "KDGanttMinimizeSplitter.h"
 #include "kaddressbookmain.h"
 #include "kactioncollection.h"
 #include "addresseedialog.h"
 //US
-#include <libkdepim/addresseeview.h>
+#include <addresseeview.h>
 
 #include <qapp.h>
 #include <qmenubar.h>
 //#include <qtoolbar.h>
 #include <qmessagebox.h>
 #include <kdebug.h>
 #include <kiconloader.h> // needed for SmallIcon
 #include <kresources/kcmkresources.h>
 #include <ktoolbar.h>
 
 
 //#include <qlabel.h>
diff --git a/kaddressbook/kaddressbookE.pro b/kaddressbook/kaddressbookE.pro
index 1c9eeef..c027895 100644
--- a/kaddressbook/kaddressbookE.pro
+++ b/kaddressbook/kaddressbookE.pro
@@ -3,34 +3,36 @@ CONFIG		+= qt warn_on
 
 
 TARGET		= kapi
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR=$(QPEDIR)/bin
 
 INCLUDEPATH += . ./details ./features ./xxport ../libkdepim ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../microkde/kresources ../kabc ../qtcompat ../ interfaces $(QPEDIR)/include
 DEFINES += KAB_EMBEDDED KAB_NOSPLITTER
 #DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOKABC KORG_NOARCHIVE KORG_NOMAIL
 #DEFINES += KORG_NOPRINTER  KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER
 #DEFINES += KORG_NOLVALTERNATION
-LIBS += -lmicrokdepim
-LIBS += -lmicrokcal
+#LIBS += -lmicrokdepim
+#LIBS += -lmicrokcal
 LIBS += -lmicrokde
 LIBS += -lmicroqtcompat
 LIBS += -lmicrokabc
 LIBS += -lqpe
 LIBS += -ljpeg
 LIBS += $(QTOPIALIB)
 LIBS += -L$(QPEDIR)/lib
 LIBS += -Wl,-export-dynamic
+LIBS += $(GCC3EXTRALIB1)
+LIBS += $(GCC3EXTRALIB2)
 
 INTERFACES = \
 # filteredit_base.ui \
 # kofilterview_base.ui \
 
 HEADERS = \
 features/mergewidget.h \
 features/distributionlistwidget.h \
 kcmconfigs/addresseewidget.h \
 kcmconfigs/extensionconfigdialog.h \
 kcmconfigs/kcmkabconfig.h \
 kcmconfigs/kabconfigwidget.h \
diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp
index 713b0fc..810c3e2 100644
--- a/kaddressbook/xxportmanager.cpp
+++ b/kaddressbook/xxportmanager.cpp
@@ -43,25 +43,25 @@ $Id$
 #else //KAB_EMBEDDED
 extern "C"
 {
   void* init_microkaddrbk_csv_xxport();
   void* init_microkaddrbk_kde2_xxport();
   void* init_microkaddrbk_vcard_xxport();
   void* init_microkaddrbk_opie_xxport();
   void* init_microkaddrbk_qtopia_xxport();
   void* init_microkaddrbk_sharpdtm_xxport();
 }
 #endif //KAB_EMBEDDED
 
-#include <libkdepim/addresseeview.h>
+#include <addresseeview.h>
 
 #include "kabcore.h"
 #include "undocmds.h"
 #include "xxportselectdialog.h"
 
 #include "xxportmanager.h"
 
 KURL XXPortManager::importURL = KURL();
 QString XXPortManager::importData = QString::null;
 
 class PreviewDialog : public KDialogBase
 {
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 369c7a0..56b3fb0 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1317,27 +1317,28 @@ void CalendarView::syncExternal( int mode  )
     delete calendar;
     updateView();
     return ;//syncOK;
 
 }
 void CalendarView::syncSharp()
 {
     syncExternal( 0 );
 
 }
 
 
-#include <kabc/stdaddressbook.h>
+//#include <kabc/stdaddressbook.h>
 bool CalendarView::importBday()
 {
+#if 0
     KABC::StdAddressBook* AddressBook = KABC::StdAddressBook::self( true );
     KABC::AddressBook::Iterator it;
     int count = 0;
     for( it = AddressBook->begin(); it != AddressBook->end(); ++it ) { 
         ++count;
     }
     QProgressBar bar(count,0 );
     int w = 300;
     if ( QApplication::desktop()->width() < 320 )
         w = 220;
     int h = bar.sizeHint().height() ;
     int dw = QApplication::desktop()->width();
@@ -1360,24 +1361,25 @@ bool CalendarView::importBday()
             if ( addAnniversary(  (*it).birthday().date(), (*it).assembledName(),  a, true ) )
             ++addCount;
         } 
         QDate anni = KGlobal::locale()->readDate( (*it).custom("KADDRESSBOOK", "X-Anniversary" ), "%Y-%m-%d"); 
         if ( anni.isValid() ){ 
             a = new KCal::Attendee( (*it).realName(), (*it).preferredEmail(),false,KCal::Attendee::NeedsAction,KCal::Attendee::ReqParticipant,(*it).uid()) ;
             if ( addAnniversary(  anni, (*it).assembledName(),  a, false ) )
             ++addCount;
         }
     }
     updateView(); 
     topLevelWidget()->setCaption(QString::number( addCount )+ i18n(" birthdays/anniversaries added!"));
+#endif
     return true;
 }
  
 bool  CalendarView::addAnniversary(  QDate date, QString name, KCal::Attendee* a,  bool birthday)
 {
     //qDebug("addAnni ");
     Event * ev = new Event();
     if ( a ) {
         ev->addAttendee( a );
     }
     QString kind;
     if ( birthday )
diff --git a/korganizer/incomingdialog.cpp b/korganizer/incomingdialog.cpp
index f3bd09f..50e3077 100644
--- a/korganizer/incomingdialog.cpp
+++ b/korganizer/incomingdialog.cpp
@@ -41,25 +41,26 @@
 #include "mailscheduler.h"
 #else
 #include <libkcal/dummyscheduler.h>
 #endif
 
 
 #include "incomingdialog.h"
 #include "koeventviewerdialog.h"
 #include "kocounterdialog.h"
 #include "koprefs.h"
 
 #ifndef KORG_NOKABC
-#include <kabc/stdaddressbook.h>
+#define KORG_NOKABC
+//#include <kabc/stdaddressbook.h>
 #define size count
 #endif
 
 
 ScheduleItemIn::ScheduleItemIn(QListView *parent,IncidenceBase *ev,
                                Scheduler::Method method,ScheduleMessage::Status status)
   : QListViewItem(parent)
 {
   mIncidence = ev;
   mMethod = method;
   mStatus = status;
   setText(6,Scheduler::translatedMethodName(mMethod)+" ");
diff --git a/korganizer/korganizerE.pro b/korganizer/korganizerE.pro
index 4247838..d841193 100644
--- a/korganizer/korganizerE.pro
+++ b/korganizer/korganizerE.pro
@@ -6,30 +6,32 @@ MOC_DIR = moc/$(PLATFORM)
 DESTDIR=$(QPEDIR)/bin
 
 INCLUDEPATH += $(KDEPIMDIR) $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kdeui $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/libkdepim interfaces $(KDEPIMDIR)/kabc $(QPEDIR)/include
 
 DEFINES += KORG_NODND KORG_NOPLUGINS  KORG_NOARCHIVE KORG_NOMAIL
 DEFINES += KORG_NOPRINTER  KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER
 DEFINES += KORG_NOLVALTERNATION
 #KORG_NOKABC
 LIBS += -lmicrokdepim
 LIBS += -lmicrokcal
 LIBS += -lmicrokde
 LIBS += -lmicroqtcompat
-LIBS += -lmicrokabc
+#LIBS += -lmicrokabc
 
 #LIBS +=  $(QPEDIR)/lib/gammu
 #LIBS += -lmicrogammu
 #LIBS += -lbluetooth
 #LIBS += -lsdp
+LIBS += $(GCC3EXTRALIB1)
+LIBS += $(GCC3EXTRALIB2)
 
 
 LIBS += -lqpe
 LIBS += -ljpeg
 LIBS += $(QTOPIALIB)
 LIBS += -L$(QPEDIR)/lib
  
 INTERFACES =  kofilterview_base.ui 
 #filteredit_base.ui
 
 HEADERS = \
  wordsgerman.h \
diff --git a/korganizer/publishdialog.cpp b/korganizer/publishdialog.cpp
index 4323b91..2ae6720 100644
--- a/korganizer/publishdialog.cpp
+++ b/korganizer/publishdialog.cpp
@@ -18,25 +18,26 @@
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qlineedit.h>
 #include <kdebug.h>
 
 #include <kglobal.h>
 #include <klocale.h>
 #ifndef KORG_NOKABC
-#include <kabc/addresseedialog.h>
+#define KORG_NOKABC
+//#include <kabc/addresseedialog.h>
 #endif
 
 #include "koprefs.h"
 #include "publishdialog.h"
 
 PublishDialog::PublishDialog(QWidget* parent, const char* name,
                                bool modal, WFlags fl)
     : PublishDialog_base(parent,name,modal,fl)
 {
   setCaption(i18n("Select Addresses"));
   mNameLineEdit->setEnabled(false);
   mEmailLineEdit->setEnabled(false);
diff --git a/libkdepim/libkdepim.pro b/libkdepim/libkdepim.pro
index 060145e..f5de653 100644
--- a/libkdepim/libkdepim.pro
+++ b/libkdepim/libkdepim.pro
@@ -22,38 +22,36 @@ HEADERS = \
  categoryeditdialog.h \
  categoryeditdialog_base.h \
  categoryselectdialog.h \
  categoryselectdialog_base.h \
  externalapphandler.h \
  kdateedit.h \
  kdatepicker.h \
  kinputdialog.h \
  kincidenceformatter.h \
  kpimprefs.h \
  kpimglobalprefs.h \
  kprefsdialog.h \
- addresseeview.h \
  ksyncprofile.h \
  ksyncprefsdialog.h \
  kcmconfigs/kcmkdepimconfig.h \
  kcmconfigs/kdepimconfigwidget.h
 
 SOURCES = \
  categoryeditdialog.cpp \
  categoryeditdialog_base.cpp \
  categoryselectdialog.cpp \
  categoryselectdialog_base.cpp \
  externalapphandler.cpp \
  kdateedit.cpp \
  kdatepicker.cpp \
  kinputdialog.cpp \
  kincidenceformatter.cpp \
  kpimprefs.cpp \
  kpimglobalprefs.cpp \
  kprefsdialog.cpp \
- addresseeview.cpp \
  ksyncprofile.cpp \
  ksyncprefsdialog.cpp \
  kcmconfigs/kcmkdepimconfig.cpp \
  kcmconfigs/kdepimconfigwidget.cpp
 
 
diff --git a/libkdepim/libkdepimE.pro b/libkdepim/libkdepimE.pro
index b455a3e..102d827 100644
--- a/libkdepim/libkdepimE.pro
+++ b/libkdepim/libkdepimE.pro
@@ -16,38 +16,36 @@ HEADERS = \
  categoryeditdialog.h \
  categoryeditdialog_base.h \
  categoryselectdialog.h \
  categoryselectdialog_base.h \
  externalapphandler.h \
  kdateedit.h \
  kdatepicker.h \
  kinputdialog.h \
  kincidenceformatter.h \
  kpimprefs.h \
  kpimglobalprefs.h \
  kprefsdialog.h \
- addresseeview.h \
  ksyncprofile.h \
  ksyncprefsdialog.h \
  kcmconfigs/kcmkdepimconfig.h \
  kcmconfigs/kdepimconfigwidget.h
  
 
 
 SOURCES = \
  categoryeditdialog.cpp \
  categoryeditdialog_base.cpp \
  categoryselectdialog.cpp \
  categoryselectdialog_base.cpp \
  externalapphandler.cpp \
  kdateedit.cpp \
  kinputdialog.cpp \
  kdatepicker.cpp \
  kincidenceformatter.cpp \
  kpimprefs.cpp \
  kpimglobalprefs.cpp \
  kprefsdialog.cpp \
- addresseeview.cpp \
  ksyncprofile.cpp \
  ksyncprefsdialog.cpp \
  kcmconfigs/kcmkdepimconfig.cpp \
  kcmconfigs/kdepimconfigwidget.cpp