diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-06 15:57:02 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-06 15:57:02 -0600 |
commit | 2c2fbd828ca474671bb9e03681b30b115d8d6035 (patch) | |
tree | 526a9da418f8d3d7ccf515c37048d3dfc80f2843 /libkdepim/htmldiffalgodisplay.h | |
parent | f0610eece3676b6fe99f42cf4ef2b19a39a5c4e8 (diff) | |
download | tdepim-2c2fbd828ca474671bb9e03681b30b115d8d6035.tar.gz tdepim-2c2fbd828ca474671bb9e03681b30b115d8d6035.zip |
Actually move the kde files that were renamed in the last commit
Diffstat (limited to 'libkdepim/htmldiffalgodisplay.h')
-rw-r--r-- | libkdepim/htmldiffalgodisplay.h | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/libkdepim/htmldiffalgodisplay.h b/libkdepim/htmldiffalgodisplay.h deleted file mode 100644 index 35d95f5c8..000000000 --- a/libkdepim/htmldiffalgodisplay.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - This file is part of libtdepim. - - 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_HTMLDIFFALGODISPLAY_H -#define KPIM_HTMLDIFFALGODISPLAY_H - -#include "diffalgo.h" - -#include <ktextbrowser.h> -#include <tdepimmacros.h> - -namespace KPIM { - -class KDE_EXPORT HTMLDiffAlgoDisplay : virtual public DiffAlgoDisplay, public KTextBrowser -{ - public: - HTMLDiffAlgoDisplay( TQWidget *parent ); - - void begin(); - void end(); - void setLeftSourceTitle( const TQString &title ); - void setRightSourceTitle( const TQString &title ); - void additionalLeftField( const TQString &id, const TQString &value ); - void additionalRightField( const TQString &id, const TQString &value ); - void conflictField( const TQString &id, const TQString &leftValue, - const TQString &rightValue ); - - private: - TQString mLeftTitle; - TQString mRightTitle; - TQString mText; -}; - -} - -#endif |