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 --- kitchensync/src/conflictdialog.h | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 kitchensync/src/conflictdialog.h (limited to 'kitchensync/src/conflictdialog.h') diff --git a/kitchensync/src/conflictdialog.h b/kitchensync/src/conflictdialog.h new file mode 100644 index 000000000..9718f4c65 --- /dev/null +++ b/kitchensync/src/conflictdialog.h @@ -0,0 +1,40 @@ +/* + This file is part of KitchenSync. + + Copyright (c) 2005 Tobias Koenig + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program 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 General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ + +#ifndef CONFLICTDIALOG_H +#define CONFLICTDIALOG_H + +#include + +#include + +/** + Base class for SingleConflictDialog and MultiConflictDialog. + */ +class ConflictDialog : public QDialog +{ + public: + ConflictDialog( QSync::SyncMapping &mapping, QWidget *parent ); + + protected: + QSync::SyncMapping mMapping; +}; + +#endif -- cgit v1.2.1