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, 54 insertions, 0 deletions

diff --git a/kitchensync/src/htmldiffalgodisplay.h b/kitchensync/src/htmldiffalgodisplay.h
new file mode 100644
index 000000000..e35e5eb40
--- /dev/null
+++ b/kitchensync/src/htmldiffalgodisplay.h
@@ -0,0 +1,54 @@
+/*
+    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 KSYNC_HTMLDIFFALGODISPLAY_H
+#define KSYNC_HTMLDIFFALGODISPLAY_H
+
+#include <ktextbrowser.h>
+#include <libkdepim/diffalgo.h>
+
+using namespace KPIM;
+
+namespace KSync {
+
+class HTMLDiffAlgoDisplay : virtual public DiffAlgoDisplay, public KTextBrowser
+{
+  public:
+    HTMLDiffAlgoDisplay( QWidget *parent );
+
+    void begin();
+    void end();
+    void setLeftSourceTitle( const QString &title );
+    void setRightSourceTitle( const QString &title );
+    void additionalLeftField( const QString &id, const QString &value );
+    void additionalRightField( const QString &id, const QString &value );
+    void conflictField( const QString &id, const QString &leftValue,
+                        const QString &rightValue );
+
+  private:
+    QString mLeftTitle;
+    QString mRightTitle;
+    QString mText;
+};
+
+}
+
+#endif