*** empty log message ***

1 files changed, 22 insertions, 0 deletions

diff --git a/pwmanager/pwmanager/pwmview.h b/pwmanager/pwmanager/pwmview.h
index 5a326d3..75cce51 100644
--- a/pwmanager/pwmanager/pwmview.h
+++ b/pwmanager/pwmanager/pwmview.h
@@ -36,6 +36,7 @@
 
 #include <kconfig.h>
 #include <klocale.h>
+#include <kdialogbase.h>
 
 #include <qevent.h>
 #include <qfont.h>
@@ -147,4 +148,25 @@ private:
         PwM *mainClass;
 };
 
+
+//US ENH we need this chooser when syncing results in a conflict
+class PwMDataItemChooser : public KDialogBase
+{
+    Q_OBJECT
+
+  public:
+    PwMDataItemChooser( PwMDataItem loc, PwMDataItem rem, bool takeloc, QWidget *parent = 0, const char *name = 0 );
+
+    int executeD( bool local );
+
+  private:
+    int mSyncResult;
+
+  private slots:
+    void slot_remote();
+    void slot_local();
+
+};
+
+
 #endif