--- a/bluetoothengine/btui/btuidelegate/btdelegateconnect.h	Fri May 28 17:03:06 2010 +0300
+++ b/bluetoothengine/btui/btuidelegate/btdelegateconnect.h	Mon Jul 12 18:51:05 2010 +0300
@@ -15,12 +15,13 @@
 *
 */
 
-#ifndef BTDELEGATECONNECT_H_
-#define BTDELEGATECONNECT_H_
+#ifndef BTDELEGATECONNECT_H
+#define BTDELEGATECONNECT_H
 
 #include <e32base.h>
 #include <btengconnman.h>
 #include "btabstractdelegate.h"
+#include <hbaction.h>
 
 class BtuiModel;
 
@@ -40,33 +41,42 @@
             QObject *parent = 0 );
     
     virtual ~BtDelegateConnect();
-
     virtual void exec( const QVariant &params );
-    
     virtual void cancel();
     
 public slots:
 
+
 protected:
     //From MBTEngConnObserver
     virtual void ConnectComplete( TBTDevAddr& aAddr, TInt aErr, 
                                    RBTDevAddrArray* aConflicts );
     virtual void DisconnectComplete( TBTDevAddr& aAddr, TInt aErr );
-    virtual void PairingComplete( TBTDevAddr& aAddr, TInt aErr );
-
-    void emitCommandComplete(int error);
+  
+private slots:
+    void handleUserAnswer( HbAction* answer );
+    void powerDelegateCompleted(int status);
+    void disconnectDelegateCompleted(int status);
     
 private:
-
+    void exec_connect();
+    void emitCommandComplete(int error);
+    bool callOngoing();
+    
+private:
+    QModelIndex mIndex;
+    QModelIndex mConflictDevIndex;
     CBTEngConnMan *mBtengConnMan;
-
-    TBTDevAddr mBtEngddr;
-    
-    QString mdeviceName;
+    QString mDeviceName;
+    int mMajorProperty;
+    int mCod;
+    BtAbstractDelegate* mAbstractDelegate;
+    bool mActiveHandling;
+    TBTDevAddr mAddr;
     
     Q_DISABLE_COPY(BtDelegateConnect)
 
 };
 
 
-#endif /* BTDELEGATECONNECT_H_ */
+#endif /* BTDELEGATECONNECT_H */