1 files changed, 0 insertions, 123 deletions
diff --git a/kitchensync/src/singleconflictdialog.cpp b/kitchensync/src/singleconflictdialog.cpp
deleted file mode 100644
index bac94835..00000000
--- a/kitchensync/src/singleconflictdialog.cpp
+++ /dev/null
@@ -1,123 +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.
-*/
-
-#include <kdialog.h>
-#include <tdelocale.h>
-
-#include <tqlabel.h>
-#include <tqlayout.h>
-#include <tqpushbutton.h>
-
-#include "addresseediffalgo.h"
-#include "genericdiffalgo.h"
-#include "htmldiffalgodisplay.h"
-#include "memberinfo.h"
-
-#include "singleconflictdialog.h"
-
-SingleConflictDialog::SingleConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent )
-  : ConflictDialog( mapping, parent ), mDiffAlgo( 0 )
-{
-  initGUI();
-
-  TQString format = mapping.changeAt( 0 ).objectFormatName();
-  QSync::SyncChange leftChange = mapping.changeAt( 0 );
-  QSync::SyncChange rightChange = mapping.changeAt( 1 );
-
-  if ( format == "file" ) {
-    mDiffAlgo = new KSync::GenericDiffAlgo( leftChange.data(), rightChange.data() );
-  } else if ( format == "vcard" ) {
-  } else if ( format == "calendar" ) {
-  } else if ( format == "xml-contact" ) {
-    mDiffAlgo = new KSync::AddresseeDiffAlgo( leftChange.data(), rightChange.data() );
-  }
-
-  MemberInfo miLeft( leftChange.member() );
-  mDiffAlgoDisplay->setLeftSourceTitle( miLeft.name() );
-  MemberInfo miRight( rightChange.member() );
-  mDiffAlgoDisplay->setRightSourceTitle( miRight.name() );
-
-  if ( mDiffAlgo ) {
-    mDiffAlgo->addDisplay( mDiffAlgoDisplay );
-    mDiffAlgo->run();
-  }
-}
-
-SingleConflictDialog::~SingleConflictDialog()
-{
-  delete mDiffAlgo;
-  mDiffAlgo = 0;
-}
-
-void SingleConflictDialog::useFirstChange()
-{
-  mMapping.solve( mMapping.changeAt( 0 ) );
-
-  accept();
-}
-
-void SingleConflictDialog::useSecondChange()
-{
-  mMapping.solve( mMapping.changeAt( 1 ) );
-
-  accept();
-}
-
-void SingleConflictDialog::duplicateChange()
-{
-  mMapping.duplicate();
-
-  accept();
-}
-
-void SingleConflictDialog::ignoreChange()
-{
-  mMapping.ignore();
-
-  accept();
-}
-
-void SingleConflictDialog::initGUI()
-{
-  TQGridLayout *layout = new TQGridLayout( this, 3, 4, KDialog::marginHint(), KDialog::spacingHint() );
-
-  layout->addMultiCellWidget( new TQLabel( i18n( "A conflict has appeared, please solve it manually." ), this ), 0, 0, 0, 3 );
-  mDiffAlgoDisplay = new KSync::HTMLDiffAlgoDisplay( this );
-
-  layout->addMultiCellWidget( mDiffAlgoDisplay, 1, 1, 0, 3 );
-
-  TQPushButton *button = new TQPushButton( i18n( "Use Item" ), this );
-  connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( useFirstChange() ) );
-  layout->addWidget( button, 2, 0 );
-
-  button = new TQPushButton( i18n( "Duplicate Items" ), this );
-  connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( duplicateChange() ) );
-  layout->addWidget( button, 2, 1 );
-
-  button = new TQPushButton( i18n( "Ignore Conflict" ), this );
-  connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( ignoreChange() ) );
-  layout->addWidget( button, 2, 2 );
-
-  button = new TQPushButton( i18n( "Use Item" ), this );
-  connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( useSecondChange() ) );
-  layout->addWidget( button, 2, 3 );
-}
-
-#include "singleconflictdialog.moc"