1 files changed, 0 insertions, 83 deletions
diff --git a/kpilot/conduits/docconduit/doc-conflictdialog.h b/kpilot/conduits/docconduit/doc-conflictdialog.h
deleted file mode 100644
index f0c8b216..00000000
--- a/kpilot/conduits/docconduit/doc-conflictdialog.h
+++ /dev/null
@@ -1,83 +0,0 @@
-#ifndef CONFLICTDIALOG_H
-#define CONFLICTDIALOG_H
-/* doc-conflictdialog.h                           KPilot
-**
-** Copyright (C) 2002-2003 by Reinhold Kainhofer
-**
-*/
-
-/*
-** 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 in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-#include <kdialogbase.h>
-#include "doc-conduit.h"
-
-
-class TQComboBox;
-class TQGridLayout;
-class TQGroupBox;
-
-class TQLabel;
-class TQPushButton;
-class TQTimer;
-class KPilotLink;
-
-
-typedef struct conflictEntry {
-	TQLabel*dbname;
-	TQComboBox* resolution;
-	TQPushButton*info;
-	int index;
-	bool conflict;
-};
-
-
-class ResolutionDialog : public KDialogBase
-{
-	Q_OBJECT
-
-public:
-	ResolutionDialog( TQWidget* parent=0, const TQString& caption=i18n("Resolution Dialog"), syncInfoList*sinfo=0L, KPilotLink*lnk=0L);
-	~ResolutionDialog();
-
-	bool hasConflicts;
-public slots:
-	void _tickle();
-protected:
-	TQTimer* tickleTimer;
-	KPilotLink* fHandle;
-
-protected:
-	TQGroupBox* resolutionGroupBox;
-	TQGridLayout*resolutionGroupBoxLayout;
-
-	syncInfoList*syncInfo;
-	TQValueList<conflictEntry> conflictEntries;
-	TQLabel *textLabel1,*textLabel2;
-
-protected slots:
-	virtual void slotOk();
-	void slotInfo(int index);
-
-};
-
-#endif // CONFLICTDIALOG_H