small merge fixes, fix a compiler warning

src/client.cpp

@@ -661,7 +661,7 @@ void CClient::OnCLChannelLevelListReceived ( CHostAddress      InetAddr,
     emit CLChannelLevelListReceived ( InetAddr, vecLevelList );
 }
 
-void CClient::OnHandledSignal(int sigNum)
+void CClient::OnHandledSignal ( int sigNum )
 {
 #ifdef _WIN32
     // Windows does not actually get OnHandledSignal triggered
@@ -670,7 +670,6 @@ void CClient::OnHandledSignal(int sigNum)
 #else
     switch ( sigNum )
     {
-
     case SIGINT:
     case SIGTERM:
         // This should trigger OnAboutToQuit

src/client.h

@@ -393,6 +393,7 @@ protected:
     CSignalHandler*         pSignalHandler;
 
 public slots:
+    void OnHandledSignal ( int sigNum );
     void OnSendProtMessage ( CVector<uint8_t> vecMessage );
     void OnInvalidPacketReceived ( CHostAddress RecHostAddr );
 
@@ -420,9 +421,6 @@ public slots:
     void OnCLChannelLevelListReceived ( CHostAddress      InetAddr,
                                         CVector<uint16_t> vecLevelList );
 
-private slots:
-    void OnHandledSignal ( int sigNum );
-
 signals:
     void ConClientListMesReceived ( CVector<CChannelInfo> vecChanInfo );
     void ChatTextReceived ( QString strChatText );

src/server.cpp

@@ -746,7 +746,7 @@ void CServer::Stop()
 void CServer::OnTimer()
 {
     int                i, j, iUnused;
-    int                iClientFrameSizeSamples;
+    int                iClientFrameSizeSamples = 0; // initialize to avoid a compiler warning
     OpusCustomDecoder* CurOpusDecoder;
     OpusCustomEncoder* CurOpusEncoder;
     unsigned char*     pCurCodedData;