From 460c52653ab0dcca6f19a4f492ed2c5e4e963ab0 Mon Sep 17 00:00:00 2001 From: toma Date: Wed, 25 Nov 2009 17:56:58 +0000 Subject: 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 --- libkdepim/htmldiffalgodisplay.h | 53 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 libkdepim/htmldiffalgodisplay.h (limited to 'libkdepim/htmldiffalgodisplay.h') diff --git a/libkdepim/htmldiffalgodisplay.h b/libkdepim/htmldiffalgodisplay.h new file mode 100644 index 000000000..3d34a7a46 --- /dev/null +++ b/libkdepim/htmldiffalgodisplay.h @@ -0,0 +1,53 @@ +/* + This file is part of libkdepim. + + Copyright (c) 2004 Tobias Koenig + + 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_HTMLDIFFALGODISPLAY_H +#define KPIM_HTMLDIFFALGODISPLAY_H + +#include +#include +#include + +namespace KPIM { + +class KDE_EXPORT 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 -- cgit v1.2.1