From kde-commits  Sat Sep 11 07:18:33 2004
From: =?utf-8?q?Jakob=20Schr=C3=B6ter?= <cvsci () camaya ! net>
Date: Sat, 11 Sep 2004 07:18:33 +0000
To: kde-commits
Subject: kdepim
Message-Id: <20040911071833.35FAD24FD () office ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=109488712321391

CVS commit by schrot: 

pimcopy of kimproxy is obsolete


  M +1 -1      kaddressbook/views/contactlistview.cpp   1.10
  M +1 -1      kaddressbook/views/kaddressbooktableview.cpp   1.23
  M +1 -1      kmail/headerstyle.cpp   1.19
  M +1 -1      kmail/kmcommands.cpp   1.168
  M +1 -1      kmail/kmkernel.h   1.121
  M +1 -1      kmail/urlhandlermanager.cpp   1.14
  M +0 -2      libkdepim/.cvsignore   1.5
  M +1 -2      libkdepim/Makefile.am   1.68
  M +1 -1      libkdepim/addresseeview.h   1.14
  M +1 -1      plugins/kmail/bodypartformatter/text_vcard.cpp   1.13


--- kdepim/kmail/headerstyle.cpp  #1.18:1.19
@@ -50,5 +50,5 @@
 #include <klocale.h>
 #include <kglobal.h>
-#include "kimproxy.h"
+#include <kimproxy.h>
 #include <kabc/stdaddressbook.h>
 #include <kabc/addresseelist.h>

--- kdepim/kmail/urlhandlermanager.cpp  #1.13:1.14
@@ -43,6 +43,6 @@
 #include "kmreaderwin.h"
 #include "callback.h"
-#include "kimproxy.h"
 
+#include <kimproxy.h>
 #include <kurl.h>
 

--- kdepim/kmail/kmcommands.cpp  #1.167:1.168
@@ -57,4 +57,5 @@
 #include <kstandarddirs.h>
 #include <ktempfile.h>
+#include <kimproxy.h>
 #include "actionscheduler.h"
 using KMail::ActionScheduler;
@@ -82,5 +83,4 @@ using KMail::MailSourceViewer;
 #include "secondarywindow.h"
 using KMail::SecondaryWindow;
-#include "kimproxy.h"
 
 #include "progressmanager.h"

--- kdepim/kmail/kmkernel.h  #1.120:1.121
@@ -11,5 +11,5 @@
 #include <kconfig.h>
 #include <kdeversion.h>
-#include "kimproxy.h"
+#include <kimproxy.h>
 
 #include "kmailIface.h"

--- kdepim/kaddressbook/views/contactlistview.cpp  #1.9:1.10
@@ -40,5 +40,5 @@
 #include <kabc/addressbook.h>
 #include <kabc/addressee.h>
-#include <libkdepim/kimproxy.h>
+#include <kimproxy.h>
 
 #include "kaddressbooktableview.h"

--- kdepim/kaddressbook/views/kaddressbooktableview.cpp  #1.22:1.23
@@ -48,5 +48,5 @@
 #include <kurl.h>
 #include <kurlrequester.h>
-#include <libkdepim/kimproxy.h>
+#include <kimproxy.h>
 
 #include "configuretableviewdialog.h"

--- kdepim/plugins/kmail/bodypartformatter/text_vcard.cpp  #1.12:1.13
@@ -47,5 +47,5 @@ using KMail::Interface::BodyPart;
 #include "interfaces/bodyparturlhandler.h"
 #include "khtmlparthtmlwriter.h"
-#include "kimproxy.h"
+#include <kimproxy.h>
 
 #include <kabc/vcardconverter.h>

--- kdepim/libkdepim/addresseeview.h  #1.13:1.14
@@ -27,5 +27,5 @@
 #include <kabc/addressee.h>
 #include <ktextbrowser.h>
-#include "kimproxy.h"
+#include <kimproxy.h>
 
 namespace KIO {

--- kdepim/libkdepim/Makefile.am  #1.67:1.68
@@ -21,5 +21,4 @@
   email.cpp kfileio.cpp configmanager.cpp \
   collectingprocess.cpp ldapclient.cpp \
-  kimproxy.cpp kimiface.stub kimproxyiface.skel \
   overlaywidget.cpp progressmanager.cpp progressdialog.cpp \
   statusbarprogresswidget.cpp ssllabel.cpp completionordereditor.cpp \
@@ -38,5 +37,5 @@
 
 libkdepim_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0:0
-libkdepim_la_LIBADD  = $(LIB_KIO) $(LIB_KABC) $(LIB_KPARTS) \
+libkdepim_la_LIBADD  = $(LIB_KIO) $(LIB_KABC) $(LIB_KPARTS) $(LIB_KIMPROXY) \
   $(top_builddir)/libkcal/libkcal.la $(LIB_KDEUI) 
 #               $top_builddir)/libkdepim/resources/libkpimresources.la

--- kdepim/libkdepim/.cvsignore  #1.4:1.5
@@ -3,6 +3,4 @@
 addresspicker.h
 addresspicker.cpp
-kimiface_stub.cpp
-kimiface_stub.h
 *_base.h
 *_base.cpp