[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepimlibs/kabc
From:       Volker Krause <vkrause () kde ! org>
Date:       2010-03-07 12:00:23
Message-ID: 1267963223.511700.32489.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1100369 by vkrause:

make KMail and KAddressbook build without KResources


 M  +2 -2      CMakeLists.txt  
 M  +4 -0      addresseedialog.cpp  
 M  +5 -0      addresseedialog.h  
 M  +6 -0      distributionlist.h  


--- trunk/KDE/kdepimlibs/kabc/CMakeLists.txt #1100368:1100369
@@ -52,6 +52,7 @@
    ${CMAKE_CURRENT_BINARY_DIR}/addressee.cpp
    ${CMAKE_CURRENT_BINARY_DIR}/addressee.h
    ${CMAKE_CURRENT_BINARY_DIR}/field.cpp
+   addresseedialog.cpp
    distributionlist.cpp
    emailselectdialog.cpp
    errorhandler.cpp
@@ -80,7 +81,6 @@
   set(kabc_LIB_SRCS
     ${kabc_LIB_SRCS}
     addressbook.cpp
-    addresseedialog.cpp
     addresslineedit.cpp
     distributionlistdialog.cpp
     formatfactory.cpp
@@ -112,6 +112,7 @@
    kabc_export.h
    address.h
    ${CMAKE_CURRENT_BINARY_DIR}/addressee.h
+   addresseedialog.h
    addresseelist.h
    contactgroup.h
    contactgrouptool.h
@@ -139,7 +140,6 @@
   install( FILES kabc_manager.desktop  DESTINATION  ${SERVICES_INSTALL_DIR}/kresources )
   install( FILES
     addressbook.h
-    addresseedialog.h
     addresslineedit.h
     distributionlistdialog.h
     format.h
--- trunk/KDE/kdepimlibs/kabc/addresseedialog.cpp #1100368:1100369
@@ -170,11 +170,13 @@
     setInitialSize( QSize( 650, 350 ) );
   }
 
+#ifndef KDEPIM_NO_KRESOURCES
   d->mAddressBook = StdAddressBook::self( true );
   connect( d->mAddressBook, SIGNAL( addressBookChanged( AddressBook* ) ),
            SLOT( addressBookChanged() ) );
   connect( d->mAddressBook, SIGNAL( loadingFinished( Resource* ) ),
            SLOT( addressBookChanged() ) );
+#endif
 
   d->loadAddressBook();
 }
@@ -254,12 +256,14 @@
   mItemDict.clear();
   mAddresseeEdit->completionObject()->clear();
 
+#ifndef KDEPIM_NO_KRESOURCES
   AddressBook::Iterator it;
   for ( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) {
     AddresseeItem *item = new AddresseeItem( mAddresseeList, (*it) );
     addCompletionItem( (*it).realName(), item );
     addCompletionItem( (*it).preferredEmail(), item );
   }
+#endif
 }
 
 void AddresseeDialog::Private::addCompletionItem( const QString &str, QTreeWidgetItem *item )
--- trunk/KDE/kdepimlibs/kabc/addresseedialog.h #1100368:1100369
@@ -21,7 +21,12 @@
 #ifndef KABC_ADDRESSEEDIALOG_H
 #define KABC_ADDRESSEEDIALOG_H
 
+#include "kabc_export.h"
+#ifndef KDEPIM_NO_KRESOURCES
 #include "addressbook.h"
+#else
+#include "addressee.h"
+#endif
 
 #include <kdialog.h>
 #include <klineedit.h>
--- trunk/KDE/kdepimlibs/kabc/distributionlist.h #1100368:1100369
@@ -21,7 +21,13 @@
 #ifndef KABC_DISTRIBUTIONLIST_H
 #define KABC_DISTRIBUTIONLIST_H
 
+#include "kabc_export.h"
+#ifndef KDEPIM_NO_KRESOURCES
 #include "addressbook.h"
+#else
+#include "addressee.h"
+#include <QtCore/QMap>
+#endif
 #include <QtCore/QList>
 
 namespace KABC {
[prev in list] [next in list] [prev in thread] [next in thread]