Merge 4.6.0-statemachine

diff --cc client.cpp
index 25f3ebccf737a557b3ab6fdd8b6e4328e8eaa344,4acb117b3f84e89e662069e97da3016215b3c7b6..3369bf0e78f27ac66c1d69e37cbae0c4021f9ddc
--- 1/client.cpp
--- 2/client.cpp
+++ b/client.cpp
@@@ -51,22 -49,22 +50,22 @@@ qDebug() << "Api instance init!"
        logoutCommand = new LogoutCommand(this);
        uptimeCommand = new UptimeCommand(this);
  
 -      setFloodInterval(5);
 +      setFloodInterval(3);
  
-       stateMachine = new QtStateMachine(this);
- 
-       errorState = new QtState;
-       disconnectedState = new QtState;
-       connectingState = new QtState;
-       connectedState = new QtState;
-       authenticatingState = new QtState(connectedState);
-       idleState = new QtState(connectedState);
-       idleTimeoutState = new QtState(connectedState);
-       sendState = new QtState(connectedState);
-       waitState = new QtState(connectedState);
-       recieveState = new QtState;
-       recieveFailState = new QtState;
-       connectedHistoryState = connectedState->addHistoryState();
+       stateMachine = new QStateMachine(this);
+ 
+       errorState = new QState;
+       disconnectedState = new QState;
+       connectingState = new QState;
+       connectedState = new QState;
+       authenticatingState = new QState(connectedState);
+       idleState = new QState(connectedState);
+       idleTimeoutState = new QState(connectedState);
+       sendState = new QState(connectedState);
+       waitState = new QState(connectedState);
+       recieveState = new QState;
+       recieveFailState = new QState;
+       connectedHistoryState = new QHistoryState(connectedState);
  
        stateMachine->addState(errorState);
        stateMachine->addState(disconnectedState);