--- a/bluetoothengine/btui/btcpplugin/btcpuimainview.h	Wed Jun 23 18:23:52 2010 +0300
+++ b/bluetoothengine/btui/btcpplugin/btcpuimainview.h	Tue Jul 06 14:27:09 2010 +0300
@@ -50,33 +50,30 @@
 
     // from base class BtCpUiBaseView
     virtual void setSoftkeyBack();
-    virtual void activateView( const QVariant& value, int cmdId );
+    virtual void activateView( const QVariant& value, bool fromBackButton );
     virtual void deactivateView();
 
 public slots: 
     void changeOrientation( Qt::Orientation orientation );
     void changePowerState();
+    void visibilityChanged (int index);
+    void changeBtLocalName();
     
     void updateSettingItems(const QModelIndex &topLeft, const QModelIndex &bottomRight);
     void deviceSelected(const QModelIndex& modelIndex);
     void goToDiscoveryView();
     void goToDeviceView(const QModelIndex& modelIndex);
-    
-    // from view manager
-    void changeView(int targetViewId, bool fromBackButton, int cmdId, const QVariant& value = 0 );
     virtual void switchToPreviousView();
-    
-    void visibilityChanged (int index);
-    void changeBtLocalName();
-    
+
     //from delegate classes
     void powerDelegateCompleted(int status);
     void visibilityDelegateCompleted(int status);
     void btNameDelegateCompleted(int status, QVariant param);
     void allActionTriggered();
-    void pairActiontriggered();
+    void pairActionTriggered();
     
-protected:
+private slots:
+    void changeView(int targetViewId, bool fromBackButton, const QVariant& value = 0 );    
 
 private:
     enum filterType {