Copy the KDE 3.5 branch to branches/trinity for new KDE 3.5 features.

BUG:215923


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1054174 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 53 insertions, 0 deletions

diff --git a/libkdepim/calendardiffalgo.h b/libkdepim/calendardiffalgo.h
new file mode 100644
index 000000000..14fb4eba3
--- /dev/null
+++ b/libkdepim/calendardiffalgo.h
@@ -0,0 +1,53 @@
+/*
+    This file is part of libkdepim.
+
+    Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library 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
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#ifndef KPIM_CALENDARDIFFALGO_H
+#define KPIM_CALENDARDIFFALGO_H
+
+#include <libkcal/event.h>
+#include <libkcal/todo.h>
+#include <libkdepim/diffalgo.h>
+
+namespace KPIM {
+
+class KDE_EXPORT CalendarDiffAlgo : public DiffAlgo
+{
+  public:
+    CalendarDiffAlgo( KCal::Incidence *leftIncidence, KCal::Incidence *rightIncidence );
+
+    void run();
+
+  private:
+    template <class L>
+    void diffList( const QString &id, const QValueList<L> &left, const QValueList<L> &right );
+
+    void diffIncidenceBase( KCal::IncidenceBase*, KCal::IncidenceBase* );
+    void diffIncidence( KCal::Incidence*, KCal::Incidence* );
+    void diffEvent( KCal::Event*, KCal::Event* );
+    void diffTodo( KCal::Todo*, KCal::Todo* );
+
+    KCal::Incidence *mLeftIncidence;
+    KCal::Incidence *mRightIncidence;
+};
+
+}
+
+#endif