summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/kaddressbookview.cpp58
1 files changed, 26 insertions, 32 deletions
diff --git a/kaddressbook/kaddressbookview.cpp b/kaddressbook/kaddressbookview.cpp
index a44fd82..da28870 100644
--- a/kaddressbook/kaddressbookview.cpp
+++ b/kaddressbook/kaddressbookview.cpp
@@ -1,25 +1,25 @@
/*
- This file is part of KAddressBook.
- Copyright (c) 2002 Mike Pilone <mpilone@slac.com>
-
+ 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,
+ 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 <qapplication.h>
@@ -33,6 +33,7 @@
#endif //KAB_EMBEDDED
#include <qlayout.h>
+#include <kabc/distributionlistdialog.h>
#include <kabc/addressbook.h>
#include <kdebug.h>
@@ -69,18 +70,16 @@ void KAddressBookView::writeConfig( KConfig* )
QString KAddressBookView::selectedEmails()
{
-#ifndef KAB_EMBEDDED
-
bool first = true;
QString emailAddrs;
QStringList uidList = selectedUids();
KABC::Addressee addr;
QString email;
-
+
QStringList::Iterator it;
for ( it = uidList.begin(); it != uidList.end(); ++it ) {
addr = mAddressBook->findByUid( *it );
-
+
if ( !addr.isEmpty() ) {
QString m = QString::null;
@@ -88,22 +87,17 @@ QString KAddressBookView::selectedEmails()
m = KABC::EmailSelector::getEmail( addr.emails(), addr.preferredEmail(), this );
email = addr.fullEmail( m );
-
+
if ( !first )
emailAddrs += ", ";
else
first = false;
-
+
emailAddrs += email;
}
}
-
+
return emailAddrs;
-#else //KAB_EMBEDDED
-qDebug("KAddressBookView::selectedEmails() update method");
-return 0;
-#endif //KAB_EMBEDDED
-
}
KABC::Addressee::List KAddressBookView::addressees()
@@ -123,7 +117,7 @@ void KAddressBookView::initGUI()
{
// Create the layout
QVBoxLayout *layout = new QVBoxLayout( this );
-
+
// Add the view widget
mViewWidget = new QWidget( this );
layout->addWidget( mViewWidget );
@@ -148,7 +142,7 @@ const QString &KAddressBookView::defaultFilterName() const
{
return mDefaultFilterName;
}
-
+
KABC::AddressBook *KAddressBookView::addressBook() const
{
return mAddressBook;