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

List:       kde-commits
Subject:    kdepim/wizards
From:       Till Adam <adam () kde ! org>
Date:       2004-12-09 12:36:29
Message-ID: 20041209123629.CD8FD1BB0B () office ! kde ! org
[Download RAW message or body]

CVS commit by tilladam: 

Adjust to the new resource.


  M +4 -4      Makefile.am   1.32
  M +7 -7      kolabwizard.cpp   1.22


--- kdepim/wizards/Makefile.am  #1.31:1.32
@@ -3,5 +3,5 @@
 INCLUDES = -I$(top_srcdir)/libkdepim \
            -I$(top_srcdir)/libkpimidentities -I$(top_srcdir)/libkcal \
-           -I$(top_srcdir)/kresources/imap/shared -I$(top_srcdir) \
+           -I$(top_srcdir)/kresources/kolab/shared -I$(top_srcdir) \
            -I$(top_srcdir)/knotes \
            -I$(top_srcdir)/certmanager/lib \
@@ -23,7 +23,7 @@
 # Kolab
 libkolabwizard_la_LDFLAGS = $(all_libraries) -no-undefined
-libkolabwizard_la_LIBADD = $(top_builddir)/kresources/imap/kcal/libkcal_imap.la \
-                           $(top_builddir)/kresources/imap/kabc/libkabc_imap.la \
-                           $(top_builddir)/kresources/imap/knotes/libknotes_imap.la \
+libkolabwizard_la_LIBADD = $(top_builddir)/kresources/kolab/kcal/libkcalkolab.la \
+                           $(top_builddir)/kresources/kolab/kabc/libkabckolab.la \
+                           $(top_builddir)/kresources/kolab/knotes/libknoteskolab.la \
                            $(top_builddir)/libkcal/libkcal.la \
                            $(top_builddir)/libkdepim/libkdepim.la \

--- kdepim/wizards/kolabwizard.cpp  #1.21:1.22
@@ -26,11 +26,11 @@
 #include "kolabkmailchanges.h"
 
+#include "kresources/kolab/kcal/resourcekolab.h"
+#include "kresources/kolab/kabc/resourcekolab.h"
+#include "kresources/kolab/knotes/resourcekolab.h"
+
 #include <libkcal/resourcecalendar.h>
 #include <kabc/resource.h>
 
-#include "kresources/imap/kcal/resourceimap.h"
-#include "kresources/imap/kabc/resourceimap.h"
-#include "kresources/imap/knotes/resourceimap.h"
-
 #include <klineedit.h>
 #include <klocale.h>
@@ -106,5 +106,5 @@ class CreateCalendarImapResource : publi
       KCal::CalendarResourceManager m( "calendar" );
       m.readConfig();
-      KCal::ResourceIMAP *r = new KCal::ResourceIMAP();
+      KCal::ResourceKolab *r = new KCal::ResourceKolab( 0 );
       r->setResourceName( i18n("Kolab Server") );
       m.add( r );
@@ -126,5 +126,5 @@ class CreateContactImapResource : public
       KRES::Manager<KABC::Resource> m( "contact" );
       m.readConfig();
-      KABC::ResourceIMAP *r = new KABC::ResourceIMAP( 0 );
+      KABC::ResourceKolab *r = new KABC::ResourceKolab( 0 );
       r->setResourceName( i18n("Kolab Server") );
       m.add( r );
@@ -147,5 +147,5 @@ class CreateNotesImapResource : public K
       KRES::Manager<ResourceNotes> m( "notes" );
       m.readConfig();
-      KNotesIMAP::ResourceIMAP *r = new KNotesIMAP::ResourceIMAP( 0 );
+      Kolab::ResourceKolab *r = new Kolab::ResourceKolab( 0 );
       r->setResourceName( i18n("Kolab Server") );
       m.add( r );


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