summaryrefslogtreecommitdiffstats
path: root/kitchensync/src/singleconflictdialog.h
diff options
context:
space:
mode:
Diffstat (limited to 'kitchensync/src/singleconflictdialog.h')
-rw-r--r--kitchensync/src/singleconflictdialog.h55
1 files changed, 0 insertions, 55 deletions
diff --git a/kitchensync/src/singleconflictdialog.h b/kitchensync/src/singleconflictdialog.h
deleted file mode 100644
index 4422a3c2a..000000000
--- a/kitchensync/src/singleconflictdialog.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- This file is part of KitchenSync.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- 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 SINGLECONFLICTDIALOG_H
-#define SINGLECONFLICTDIALOG_H
-
-#include "conflictdialog.h"
-#include <libtdepim/diffalgo.h>
-
-using namespace KPIM;
-
-namespace KSync {
-class HTMLDiffAlgoDisplay;
-}
-
-class SingleConflictDialog : public ConflictDialog
-{
- Q_OBJECT
-
-
- public:
- SingleConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent );
- ~SingleConflictDialog();
-
- private slots:
- void useFirstChange();
- void useSecondChange();
- void duplicateChange();
- void ignoreChange();
-
- private:
- void initGUI();
-
- DiffAlgo *mDiffAlgo;
- KSync::HTMLDiffAlgoDisplay *mDiffAlgoDisplay;
-};
-
-#endif