diff --git a/linux/sound.h b/linux/sound.h
index f63d4fff..d592aab3 100755
--- a/linux/sound.h
+++ b/linux/sound.h
@@ -92,7 +92,7 @@ public:
     int     GetDev() { return 0; }
 
     // dummy definitions
-    virtual int  Init  ( const int iNewPrefMonoBufferSize ) { CSoundBase::Init ( iNewPrefMonoBufferSize ); }
+    virtual int  Init  ( const int iNewPrefMonoBufferSize ) { return CSoundBase::Init ( iNewPrefMonoBufferSize ); }
     virtual bool Read  ( CVector<short>& ) { printf ( "no sound!" ); return false; }
     virtual bool Write ( CVector<short>& ) { printf ( "no sound!" ); return false; }
 };
diff --git a/src/global.h b/src/global.h
index ed061d9c..4ba8636e 100755
--- a/src/global.h
+++ b/src/global.h
@@ -200,8 +200,8 @@ public:
     }
 
 protected:
-    QString strErrorType;
     QString strErrorMsg;
+    QString strErrorType;
 };
 
 class CLlconEvent : public QEvent
diff --git a/src/multicolorled.h b/src/multicolorled.h
index 906441ef..334becec 100755
--- a/src/multicolorled.h
+++ b/src/multicolorled.h
@@ -105,8 +105,8 @@ class CMultColLEDListViewItem : public CMultiColorLED
     Q_OBJECT
 
 public:
-    CMultColLEDListViewItem ( const int iNewCol ) : iColumn ( iNewCol ),
-        pListViewItem ( NULL ) {}
+    CMultColLEDListViewItem ( const int iNewCol ) : pListViewItem ( NULL ),
+        iColumn ( iNewCol ) {}
 
     void SetListViewItemPointer ( QTreeWidgetItem* pNewListViewItem )
     {
@@ -131,8 +131,8 @@ protected:
 class CServerListViewItem : public QTreeWidgetItem
 {
 public:
-    CServerListViewItem ( QTreeWidget* parent ) : LED0 ( 2 ), LED1 ( 3 ),
-        QTreeWidgetItem ( parent )
+    CServerListViewItem ( QTreeWidget* parent ) : QTreeWidgetItem ( parent ),
+        LED0 ( 2 ), LED1 ( 3 )
     {
         LED0.SetListViewItemPointer ( this );
         LED1.SetListViewItemPointer ( this );
diff --git a/src/protocol.cpp b/src/protocol.cpp
index b2b754aa..dfc1c407 100755
--- a/src/protocol.cpp
+++ b/src/protocol.cpp
@@ -375,11 +375,11 @@ if ( rand() < ( RAND_MAX / 2 ) ) return false;
                     break;
 
                 case PROTMESSID_REQ_JITT_BUF_SIZE:
-                    bRet = EvaluateReqJitBufMes ( vecData );
+                    bRet = EvaluateReqJitBufMes();
                     break;
 
                 case PROTMESSID_SERVER_FULL:
-                    bRet = EvaluateServerFullMes ( vecData );
+                    bRet = EvaluateServerFullMes();
                     break;
 
                 case PROTMESSID_CHANNEL_GAIN:
@@ -391,7 +391,7 @@ if ( rand() < ( RAND_MAX / 2 ) ) return false;
                     break;
 
                 case PROTMESSID_REQ_CONN_CLIENTS_LIST:
-                    bRet = EvaluateReqConnClientsList ( vecData );
+                    bRet = EvaluateReqConnClientsList();
                     break;
 
                 case PROTMESSID_CHANNEL_NAME:
@@ -399,7 +399,7 @@ if ( rand() < ( RAND_MAX / 2 ) ) return false;
                     break;
 
                 case PROTMESSID_REQ_CHANNEL_NAME:
-                    bRet = EvaluateReqChanNameMes ( vecData );
+                    bRet = EvaluateReqChanNameMes();
                     break;
 
                 case PROTMESSID_CHAT_TEXT:
@@ -415,11 +415,11 @@ if ( rand() < ( RAND_MAX / 2 ) ) return false;
                     break;
 
                 case PROTMESSID_REQ_NETW_TRANSPORT_PROPS:
-                    bRet = EvaluateReqNetwTranspPropsMes ( vecData );
+                    bRet = EvaluateReqNetwTranspPropsMes();
                     break;
 
                 case PROTMESSID_DISCONNECTION:
-                    bRet = EvaluateDisconnectionMes ( vecData );
+                    bRet = EvaluateDisconnectionMes();
                     break;
                 }
 
@@ -485,7 +485,7 @@ void CProtocol::CreateReqJitBufMes()
     CreateAndSendMessage ( PROTMESSID_REQ_JITT_BUF_SIZE, CVector<uint8_t> ( 0 ) );
 }
 
-bool CProtocol::EvaluateReqJitBufMes ( const CVector<uint8_t>& vecData )
+bool CProtocol::EvaluateReqJitBufMes()
 {
     // invoke message action
     emit ReqJittBufSize();
@@ -498,7 +498,7 @@ void CProtocol::CreateServerFullMes()
     CreateAndSendMessage ( PROTMESSID_SERVER_FULL, CVector<uint8_t> ( 0 ) );
 }
 
-bool CProtocol::EvaluateServerFullMes ( const CVector<uint8_t>& vecData )
+bool CProtocol::EvaluateServerFullMes()
 {
     // invoke message action
     emit ServerFull();
@@ -647,7 +647,7 @@ void CProtocol::CreateReqConnClientsList()
     CreateAndSendMessage ( PROTMESSID_REQ_CONN_CLIENTS_LIST, CVector<uint8_t> ( 0 ) );
 }
 
-bool CProtocol::EvaluateReqConnClientsList ( const CVector<uint8_t>& vecData )
+bool CProtocol::EvaluateReqConnClientsList()
 {
     // invoke message action
     emit ReqConnClientsList();
@@ -720,7 +720,7 @@ void CProtocol::CreateReqChanNameMes()
     CreateAndSendMessage ( PROTMESSID_REQ_CHANNEL_NAME, CVector<uint8_t> ( 0 ) );
 }
 
-bool CProtocol::EvaluateReqChanNameMes ( const CVector<uint8_t>& vecData )
+bool CProtocol::EvaluateReqChanNameMes()
 {
     // invoke message action
     emit ReqChanName();
@@ -943,7 +943,7 @@ void CProtocol::CreateReqNetwTranspPropsMes()
     CreateAndSendMessage ( PROTMESSID_REQ_NETW_TRANSPORT_PROPS, CVector<uint8_t> ( 0 ) );
 }
 
-bool CProtocol::EvaluateReqNetwTranspPropsMes ( const CVector<uint8_t>& vecData )
+bool CProtocol::EvaluateReqNetwTranspPropsMes()
 {
     // invoke message action
     emit ReqNetTranspProps();
@@ -974,7 +974,7 @@ void CProtocol::CreateAndImmSendDisconnectionMes()
     emit MessReadyForSending ( vecDisconMessage );
 }
 
-bool CProtocol::EvaluateDisconnectionMes ( const CVector<uint8_t>& vecData )
+bool CProtocol::EvaluateDisconnectionMes()
 {
     // invoke message action
     emit Disconnection();
diff --git a/src/protocol.h b/src/protocol.h
index a6f39ae3..ff3b8a36 100755
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -146,18 +146,18 @@ protected:
     void CreateAndSendMessage ( const int iID, const CVector<uint8_t>& vecData );
 
     bool EvaluateJitBufMes             ( const CVector<uint8_t>& vecData );
-    bool EvaluateReqJitBufMes          ( const CVector<uint8_t>& vecData );
+    bool EvaluateReqJitBufMes();
     bool EvaluateChanGainMes           ( const CVector<uint8_t>& vecData );
     bool EvaluateConClientListMes      ( const CVector<uint8_t>& vecData );
-    bool EvaluateServerFullMes         ( const CVector<uint8_t>& vecData );
-    bool EvaluateReqConnClientsList    ( const CVector<uint8_t>& vecData );
+    bool EvaluateServerFullMes();
+    bool EvaluateReqConnClientsList();
     bool EvaluateChanNameMes           ( const CVector<uint8_t>& vecData );
-    bool EvaluateReqChanNameMes        ( const CVector<uint8_t>& vecData );
+    bool EvaluateReqChanNameMes();
     bool EvaluateChatTextMes           ( const CVector<uint8_t>& vecData );
     bool EvaluatePingMes               ( const CVector<uint8_t>& vecData );
     bool EvaluateNetwTranspPropsMes    ( const CVector<uint8_t>& vecData );
-    bool EvaluateReqNetwTranspPropsMes ( const CVector<uint8_t>& vecData );
-    bool EvaluateDisconnectionMes      ( const CVector<uint8_t>& vecData );
+    bool EvaluateReqNetwTranspPropsMes();
+    bool EvaluateDisconnectionMes();
 
     int                     iOldRecID, iOldRecCnt;
 
diff --git a/src/util.h b/src/util.h
index 87216f5d..ef412564 100755
--- a/src/util.h
+++ b/src/util.h
@@ -524,8 +524,8 @@ public:
     uint32_t GetCRC();
 
 protected:
-    uint32_t iBitOutMask;
     uint32_t iPoly;
+    uint32_t iBitOutMask;
     uint32_t iStateShiftReg;
 };