[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: kdepim/kresources/kolab/kcal
From: Till Adam <adam () kde ! org>
Date: 2004-10-08 20:31:18
Message-ID: 20041008203118.A767C1C67 () office ! kde ! org
[Download RAW message or body]
CVS commit by tilladam:
Fix compilation. The conflict resolution isn't ported yet.
M +4 -0 resourcekolab.cpp 1.6
--- kdepim/kresources/kolab/kcal/resourcekolab.cpp #1.5:1.6
@@ -45,5 +45,7 @@
#include <kabc/locknull.h>
#include <klocale.h>
+#if 0
#include <libkdepim/kincidencechooser.h>
+#endif
using namespace KCal;
@@ -231,4 +233,5 @@ void ResourceKolab::incidenceUpdated( KC
void ResourceKolab::resolveConflict( KCal::Incidence* inc, const QString& subresource, Q_UINT32 sernum )
{
+#if 0
if ( ! inc )
return;
@@ -275,4 +278,5 @@ void ResourceKolab::resolveConflict( KCa
mSilent = silent;
}
+#endif
}
void ResourceKolab::addIncidence( const char* mimetype, const QString& xml,
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic