Desktop compile fixes

3 files changed, 3 insertions, 0 deletions

diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp
index 49c0691..8d0fca1 100644
--- a/kaddressbook/views/kaddressbookcardview.cpp
+++ b/kaddressbook/views/kaddressbookcardview.cpp
@@ -1,124 +1,125 @@
 /*
     This file is part of KAddressBook.
     Copyright (c) 2002 Mike Pilone <mpilone@slac.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program 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 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 <qdragobject.h>
 #include <qevent.h>
 #include <qiconview.h>
 #include <qlayout.h>
 #include <qstringlist.h>
+#include <qregexp.h>
 
 #include <kabc/addressbook.h>
 #include <kabc/addressee.h>
 #include <kconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 
 #include "kabprefs.h"
 #include "viewmanager.h"
 
 #include "kaddressbookcardview.h"
 
 #ifndef KAB_EMBEDDED
 extern "C" {
   void *init_libkaddrbk_cardview()
   {
     return ( new CardViewFactory );
   }
 }
 #endif //KAB_EMBEDDED
 
 ////////////////////////////////
 // AddresseeCardViewItem  (internal class)
 class AddresseeCardViewItem : public CardViewItem
 {
   public:
     AddresseeCardViewItem(const KABC::Field::List &fields,
                           bool showEmptyFields,
                           KABC::AddressBook *doc, const KABC::Addressee &a,
                           CardView *parent)
       : CardViewItem(parent, a.formattedName()),
         mFields( fields ), mShowEmptyFields(showEmptyFields),
         mDocument(doc), mAddressee(a)
       {
           if ( mFields.isEmpty() ) {
             mFields = KABC::Field::defaultFields();
           }
           refresh();
       }
 
     const KABC::Addressee &addressee() const { return mAddressee; }
 
     void refresh()
     {
         // Update our addressee, since it may have changed elsewhere
         mAddressee = mDocument->findByUid(mAddressee.uid());
 
         if (!mAddressee.isEmpty())
         {
           clearFields();
 
           // Try all the selected fields until we find one with text.
           // This will limit the number of unlabeled icons in the view
           KABC::Field::List::Iterator iter;
           for (iter = mFields.begin(); iter != mFields.end(); ++iter)
           {
             // insert empty fields or not? not doing so saves a bit of memory and CPU
             // (during geometry calculations), but prevents having equally
             // wide label columns in all cards, unless CardViewItem/CardView search
             // globally for the widest label. (anders)
             //if (mShowEmptyFields || !(*iter)->value( mAddressee ).isEmpty())
               insertField((*iter)->label(), (*iter)->value( mAddressee ));
           }
 
           // We might want to make this the first field. hmm... -mpilone
           setCaption( mAddressee.realName() );
         }
     }
 
   private:
     KABC::Field::List mFields;
     bool mShowEmptyFields;
     KABC::AddressBook *mDocument;
     KABC::Addressee mAddressee;
 };
 
 ///////////////////////////////
 // AddresseeCardView
 
 AddresseeCardView::AddresseeCardView(QWidget *parent, const char *name)
   : CardView(parent, name)
 {
   setAcceptDrops(true);
 }
 
 AddresseeCardView::~AddresseeCardView()
 {
 }
 
 
 void AddresseeCardView::dragEnterEvent(QDragEnterEvent *e)
 {
 #ifndef KAB_EMBEDDED
   if (QTextDrag::canDecode(e))
     e->accept();
 #else //KAB_EMBEDDED
diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp
index 78d63b0..0ffc674 100644
--- a/kaddressbook/views/kaddressbookiconview.cpp
+++ b/kaddressbook/views/kaddressbookiconview.cpp
@@ -1,138 +1,139 @@
 /*
     This file is part of KAddressBook.                                  
     Copyright (c) 2002 Mike Pilone <mpilone@slac.com>                   
                                                                         
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or   
     (at your option) any later version.                                 
                                                                         
     This program 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 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.
 */                                                                      
 
 #ifndef KAB_EMBEDDED
 #include <qiconview.h>
 #include <qstringlist.h>
 
 #include <kabc/addressee.h>
 #include <kconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klocale.h>
 
 #else //KAB_EMBEDDED
 #endif //KAB_EMBEDDED
 
 #include <kabc/addressbook.h>
 #include "kabprefs.h"
 #include "viewmanager.h"
 #include "kaddressbookiconview.h"
 #include <qlayout.h>
+#include <qregexp.h>
 #include <kglobal.h>
 /*US transfered to the headerfile
 class IconViewFactory : public ViewFactory
 {
   public:
     KAddressBookView *view( KABC::AddressBook *ab, QWidget *parent, const char *name )
     {
       return new KAddressBookIconView( ab, parent, name );
     }
 
     QString type() const { return "Icon"; }
     
     QString description() const { return i18n( "Icons represent contacts. Very simple view." ); }
 };
 
 */
 
 extern "C" {
   void *init_libkaddrbk_iconview()
   {
     return ( new IconViewFactory );
   }
 }
 
 ////////////////////////////////
 // AddresseeIconView (internal class)
 #ifndef KAB_EMBEDDED
 AddresseeIconView::AddresseeIconView(QWidget *parent, const char *name)
   : KIconView(parent, name)
 #else //KAB_EMBEDDED
 AddresseeIconView::AddresseeIconView(QWidget *parent, const char *name)
   : QIconView(parent, name)
 #endif //KAB_EMBEDDED
 
 {
   setSelectionMode( QIconView::Extended );
   setResizeMode( QIconView::Adjust );
   setWordWrapIconText( true );
   setGridX( 100 );
   setItemsMovable(false);
   setSorting(true, true);
 
   
 //US ???  setMode( KIconView::Select );
   
 #ifndef KAB_EMBEDDED
 
   connect(this, SIGNAL(dropped(QDropEvent*, const QValueList<QIconDragItem>&)),
           this, SLOT(itemDropped(QDropEvent*, const QValueList<QIconDragItem>&)));
 #endif //KAB_EMBEDDED
 }
 
 AddresseeIconView::~AddresseeIconView()
 {
 }
 
 
 void AddresseeIconView::itemDropped(QDropEvent *e, 
                                     const QValueList<QIconDragItem> &)
 {
   emit addresseeDropped(e);
 }
 
 QDragObject *AddresseeIconView::dragObject()
 {
   emit startAddresseeDrag();
   
   // We never want IconView to start the drag
   return 0;
 }
 ////////////////////////////////
 // AddresseeIconViewItem  (internal class)
 #ifndef KAB_EMBEDDED
 class AddresseeIconViewItem : public KIconViewItem
 #else //KAB_EMBEDDED
 class AddresseeIconViewItem : public QIconViewItem
 #endif //KAB_EMBEDDED
 {
   public:
 #ifndef KAB_EMBEDDED
     AddresseeIconViewItem(const KABC::Field::List &fields,
                           KABC::AddressBook *doc, const KABC::Addressee &a, 
                           QIconView *parent)
       : KIconViewItem(parent), mFields( fields ), mDocument(doc), mAddressee(a)
 #else //KAB_EMBEDDED
     AddresseeIconViewItem(const KABC::Field::List &fields,
                           KABC::AddressBook *doc, const KABC::Addressee &a,
                           QIconView *parent)
       : QIconViewItem(parent), mFields( fields ), mDocument(doc), mAddressee(a)
 #endif //KAB_EMBEDDED
       {
           if ( mFields.isEmpty() ) {
             mFields = KABC::Field::defaultFields();
           }
           refresh();
       }
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp
index 63ad0ed..1dc9198 100644
--- a/kaddressbook/views/kaddressbooktableview.cpp
+++ b/kaddressbook/views/kaddressbooktableview.cpp
@@ -1,131 +1,132 @@
 // $Id$
 
 #include <qvbox.h>
 #include <qlistbox.h>
 #include <qwidget.h>
 #include <qfile.h>
 #include <qimage.h>
 #include <qcombobox.h>
 #include <qapplication.h>
 #include <qdragobject.h>
 #include <qevent.h>
 #include <qurl.h>
 #include <qpixmap.h>
 
 #include <kabc/addressbook.h>
 #include <kapplication.h>
 #include <kconfig.h>
 #include <kcolorbutton.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kurl.h>
 #include <kurlrequester.h>
 
 //US#include "configuretableviewdialog.h"
 #include "contactlistview.h"
 #include "kabprefs.h"
 #include "undocmds.h"
 #include "viewmanager.h"
 
 #include <qlayout.h>
 #include <qheader.h>
+#include <qregexp.h>
 
 #include "kaddressbooktableview.h"
 
 
 KAddressBookTableView::KAddressBookTableView( KABC::AddressBook *ab,
                                               QWidget *parent, const char *name )
   : KAddressBookView( ab, parent, name )
 {
   mainLayout = new QVBoxLayout( viewWidget(), 2 );
 
   // The list view will be created when the config is read.
   mListView = 0;
 }
 
 KAddressBookTableView::~KAddressBookTableView()
 {
 }
 
 void KAddressBookTableView::reconstructListView()
 {
     if (mListView)
     {
         disconnect(mListView, SIGNAL(selectionChanged()),
                    this, SLOT(addresseeSelected()));
         disconnect(mListView, SIGNAL(executed(QListViewItem*)),
                    this, SLOT(addresseeExecuted(QListViewItem*)));
         disconnect(mListView, SIGNAL(doubleClicked(QListViewItem*)),
                    this, SLOT(addresseeExecuted(QListViewItem*)));
         disconnect(mListView, SIGNAL(startAddresseeDrag()), this,
                    SIGNAL(startDrag()));
         disconnect(mListView, SIGNAL(returnPressed(QListViewItem*)),
           this, SLOT(addresseeExecuted(QListViewItem*)));
 
         disconnect(mListView, SIGNAL(addresseeDropped(QDropEvent*)), this,
                    SIGNAL(dropped(QDropEvent*)));
         delete mListView;
     }
 
   mListView = new ContactListView( this, addressBook(), viewWidget() );
 
   // Add the columns
   KABC::Field::List fieldList = fields();
   KABC::Field::List::ConstIterator it;
 
   int c = 0;
   for( it = fieldList.begin(); it != fieldList.end(); ++it ) {
       mListView->addColumn( (*it)->label() );
       mListView->setColumnWidthMode(c++, QListView::Manual);
 //US
       //  qDebug("KAddressBookTableView::reconstructListView: field %s", (*it)->label().latin1());
   }
 
   connect(mListView, SIGNAL(selectionChanged()),
           this, SLOT(addresseeSelected()));
   connect(mListView, SIGNAL(startAddresseeDrag()), this,
           SIGNAL(startDrag()));
   connect(mListView, SIGNAL(addresseeDropped(QDropEvent*)), this,
           SIGNAL(dropped(QDropEvent*)));
 
   if (KABPrefs::instance()->mHonorSingleClick)
     connect(mListView, SIGNAL(executed(QListViewItem*)),
           this, SLOT(addresseeExecuted(QListViewItem*)));
   else
     connect(mListView, SIGNAL(doubleClicked(QListViewItem*)),
           this, SLOT(addresseeExecuted(QListViewItem*)));
     connect(mListView, SIGNAL(returnPressed(QListViewItem*)),
           this, SLOT(addresseeExecuted(QListViewItem*)));
     connect(mListView, SIGNAL(signalDelete()),
           this, SLOT(addresseeDeleted()));
 
 //US performceimprovement. Refresh is done from the outside
 //US refresh();
 
   mListView->setSorting( 0, true );
   mainLayout->addWidget( mListView );
   mainLayout->activate();
   mListView->show();
 }
 
 void KAddressBookTableView::doSearch( const QString&  s, KABC::Field *field  )
 {
     mListView->clear();
     if ( s.isEmpty() || s == "*" ) {
         refresh();
         return;
     }  
     QString pattern = s.lower()+"*";
     QRegExp re;
     re.setWildcard(true); // most people understand these better.
     re.setCaseSensitive(false);
     re.setPattern( pattern );
     if (!re.isValid())
         return; 
     KABC::Addressee::List addresseeList = addressees();
     KABC::Addressee::List::Iterator it; 
     if (  field ) {