Apply clang-format

1 files changed, 72 insertions, 66 deletions

diff --git a/src/modules/dcc/DccVoiceCodec.cpp b/src/modules/dcc/DccVoiceCodec.cpp
index 0784c54b3..57be1681e 100644
--- a/src/modules/dcc/DccVoiceCodec.cpp
+++ b/src/modules/dcc/DccVoiceCodec.cpp
@@ -24,7 +24,6 @@
 
 #include "DccVoiceCodec.h"
 
-
 #include <QImage>
 #include <QByteArray>
 #include <QBuffer>
@@ -37,11 +36,11 @@ DccVoiceCodec::~DccVoiceCodec()
 {
 }
 
-void DccVoiceCodec::encode(KviDataBuffer *,KviDataBuffer *)
+void DccVoiceCodec::encode(KviDataBuffer *, KviDataBuffer *)
 {
 }
 
-void DccVoiceCodec::decode(KviDataBuffer *,KviDataBuffer *)
+void DccVoiceCodec::decode(KviDataBuffer *, KviDataBuffer *)
 {
 }
 
@@ -61,7 +60,7 @@ const char * DccVoiceCodec::name()
 }
 
 DccVoiceNullCodec::DccVoiceNullCodec()
-: DccVoiceCodec()
+    : DccVoiceCodec()
 {
 	m_szName = "null (no compression)";
 }
@@ -70,17 +69,19 @@ DccVoiceNullCodec::~DccVoiceNullCodec()
 {
 }
 
-void DccVoiceNullCodec::encode(KviDataBuffer * signal,KviDataBuffer * stream)
+void DccVoiceNullCodec::encode(KviDataBuffer * signal, KviDataBuffer * stream)
 {
-	if(signal->size() < 1)return;
-	stream->append(signal->data(),signal->size());
+	if(signal->size() < 1)
+		return;
+	stream->append(signal->data(), signal->size());
 	signal->resize(0);
 }
 
-void DccVoiceNullCodec::decode(KviDataBuffer * stream,KviDataBuffer * signal)
+void DccVoiceNullCodec::decode(KviDataBuffer * stream, KviDataBuffer * signal)
 {
-	if(stream->size() < 1)return;
-	signal->append(stream->data(),stream->size());
+	if(stream->size() < 1)
+		return;
+	signal->append(stream->data(), stream->size());
 
 	stream->resize(0);
 }
@@ -105,15 +106,15 @@ DccVideoCodec::~DccVideoCodec()
 {
 }
 
-void DccVideoCodec::encodeVideo(KviDataBuffer *,KviDataBuffer *)
+void DccVideoCodec::encodeVideo(KviDataBuffer *, KviDataBuffer *)
 {
 }
 
-void DccVideoCodec::encodeText(KviDataBuffer *,KviDataBuffer *)
+void DccVideoCodec::encodeText(KviDataBuffer *, KviDataBuffer *)
 {
 }
 
-void DccVideoCodec::decode(KviDataBuffer *,KviDataBuffer *,KviDataBuffer *)
+void DccVideoCodec::decode(KviDataBuffer *, KviDataBuffer *, KviDataBuffer *)
 {
 }
 
@@ -133,7 +134,7 @@ const char * DccVideoCodec::name()
 }
 
 DccVideoSJpegCodec::DccVideoSJpegCodec()
-: DccVideoCodec()
+    : DccVideoCodec()
 {
 	m_szName = "sjpeg";
 }
@@ -142,10 +143,11 @@ DccVideoSJpegCodec::~DccVideoSJpegCodec()
 {
 }
 
-void DccVideoSJpegCodec::encodeVideo(KviDataBuffer * videoSignal,KviDataBuffer * stream)
+void DccVideoSJpegCodec::encodeVideo(KviDataBuffer * videoSignal, KviDataBuffer * stream)
 {
 
-	if(videoSignal->size() < 1) return;
+	if(videoSignal->size() < 1)
+		return;
 
 	QImage img(videoSignal->data(), 320, 240, 1280, QImage::Format_ARGB32);
 	QByteArray ba;
@@ -157,65 +159,67 @@ void DccVideoSJpegCodec::encodeVideo(KviDataBuffer * videoSignal,KviDataBuffer *
 	img.save(&buffer, "JPEG", 20);
 	if(ba.size() > 0)
 	{
-		stream->append((const unsigned char*)ba.data(),ba.size());
-        }
+		stream->append((const unsigned char *)ba.data(), ba.size());
+	}
 	videoSignal->clear();
 }
 
 void DccVideoSJpegCodec::encodeText(KviDataBuffer * textSignal, KviDataBuffer * stream)
 {
-	static unsigned const char *irct_magic_init = (unsigned const char*) "\0<text>\0";
-	static unsigned const char *irct_magic_end = (unsigned const char*) "\0</text>\0";
+	static unsigned const char * irct_magic_init = (unsigned const char *)"\0<text>\0";
+	static unsigned const char * irct_magic_end = (unsigned const char *)"\0</text>\0";
 
-	qDebug("encodeText %s %d",textSignal->data(), textSignal->size());
-	if(textSignal->size() < 1) return;
-	stream->append(irct_magic_init,8);
-	stream->append((const unsigned char*)textSignal->data(),textSignal->size());
-	stream->append(irct_magic_end,9);
+	qDebug("encodeText %s %d", textSignal->data(), textSignal->size());
+	if(textSignal->size() < 1)
+		return;
+	stream->append(irct_magic_init, 8);
+	stream->append((const unsigned char *)textSignal->data(), textSignal->size());
+	stream->append(irct_magic_end, 9);
 	textSignal->clear();
 	return;
 }
 
-void DccVideoSJpegCodec::decode(KviDataBuffer * stream,KviDataBuffer * videoSignal,KviDataBuffer * textSignal)
+void DccVideoSJpegCodec::decode(KviDataBuffer * stream, KviDataBuffer * videoSignal, KviDataBuffer * textSignal)
 {
-	static unsigned const char jpg_magic_init[4] = { 0xFF, 0xD8, 0xFF, 0xE0}; //SOI + APP0
-	static unsigned const char jpg_magic_end[2] = { 0xFF, 0xD9}; //EOI
-
-	static unsigned const char *irct_magic_init = (unsigned const char*) "\0<text>\0";
-	static unsigned const char *irct_magic_end = (unsigned const char*) "\0</text>\0";
+	static unsigned const char jpg_magic_init[4] = { 0xFF, 0xD8, 0xFF, 0xE0 }; //SOI + APP0
+	static unsigned const char jpg_magic_end[2] = { 0xFF, 0xD9 };              //EOI
 
-	if(stream->size() < 1)return;
+	static unsigned const char * irct_magic_init = (unsigned const char *)"\0<text>\0";
+	static unsigned const char * irct_magic_end = (unsigned const char *)"\0</text>\0";
 
+	if(stream->size() < 1)
+		return;
 
 	int txtStart = stream->find(irct_magic_init, 8);
 	int txtEnd = stream->find(irct_magic_end, 9);
 
 	int jpgStart = stream->find(jpg_magic_init, 4);
 
-	if(txtStart!=-1 && txtEnd !=-1 && txtStart<jpgStart)
+	if(txtStart != -1 && txtEnd != -1 && txtStart < jpgStart)
 	{
-		qDebug("a txtStart %d txtEnd %d",txtStart,txtEnd);
-		stream->remove(txtStart+8);
-		int len = txtEnd - txtStart -8; //-8 irct_magic_init
-		if(len>0)
+		qDebug("a txtStart %d txtEnd %d", txtStart, txtEnd);
+		stream->remove(txtStart + 8);
+		int len = txtEnd - txtStart - 8; //-8 irct_magic_init
+		if(len > 0)
 		{
 			textSignal->append(stream->data(), len);
-			char*txt=(char*)malloc(len+1);
-			memcpy(txt,stream->data(), len);
-			txt[len]='\0';
-			qDebug("a recv |%s| %d",txt,len);
+			char * txt = (char *)malloc(len + 1);
+			memcpy(txt, stream->data(), len);
+			txt[len] = '\0';
+			qDebug("a recv |%s| %d", txt, len);
 		}
-		stream->remove(len+9);
+		stream->remove(len + 9);
 	}
 
-	if(stream->size() < 1)return;
+	if(stream->size() < 1)
+		return;
 
 	jpgStart = stream->find(jpg_magic_init, 4);
 	int jpgEnd = stream->find(jpg_magic_end, 2);
 
 	if(jpgStart != -1 && jpgEnd != -1)
 	{
-// 		qDebug("jpgStart %d jpgEnd %d",jpgStart,jpgEnd);
+		// 		qDebug("jpgStart %d jpgEnd %d",jpgStart,jpgEnd);
 		QImage img;
 		//remove junk before jpeg start
 		if(jpgStart > 0)
@@ -227,7 +231,7 @@ void DccVideoSJpegCodec::decode(KviDataBuffer * stream,KviDataBuffer * videoSign
 		if(!img.isNull())
 		{
 			videoSignal->clear();
-			videoSignal->append(img.bits(),img.byteCount());
+			videoSignal->append(img.bits(), img.byteCount());
 		}
 		stream->remove(len);
 	}
@@ -235,20 +239,20 @@ void DccVideoSJpegCodec::decode(KviDataBuffer * stream,KviDataBuffer * videoSign
 	txtStart = stream->find(irct_magic_init, 8);
 	txtEnd = stream->find(irct_magic_end, 9);
 
-	if(txtStart!=-1 && txtEnd !=-1)
+	if(txtStart != -1 && txtEnd != -1)
 	{
-		qDebug("b txtStart %d txtEnd %d",txtStart,txtEnd);
-		stream->remove(txtStart+8);
-		int len = txtEnd - txtStart -8; //-8 irct_magic_init
-		if(len>0)
+		qDebug("b txtStart %d txtEnd %d", txtStart, txtEnd);
+		stream->remove(txtStart + 8);
+		int len = txtEnd - txtStart - 8; //-8 irct_magic_init
+		if(len > 0)
 		{
 			textSignal->append(stream->data(), len);
-			char*txt=(char*)malloc(len+1);
-			memcpy(txt,stream->data(), len);
-			txt[len]='\0';
-			qDebug("b recv |%s| %d",txt,len);
+			char * txt = (char *)malloc(len + 1);
+			memcpy(txt, stream->data(), len);
+			txt[len] = '\0';
+			qDebug("b recv |%s| %d", txt, len);
 		}
-		stream->remove(len+9);
+		stream->remove(len + 9);
 	}
 }
 
@@ -262,10 +266,9 @@ int DccVideoSJpegCodec::decodedFrameSize()
 	return 0;
 }
 
-
 #ifndef COMPILE_DISABLE_OGG_THEORA
 DccVideoTheoraCodec::DccVideoTheoraCodec()
-: DccVideoCodec()
+    : DccVideoCodec()
 {
 	m_szName = "theora";
 	m_pEncoder = 0;
@@ -276,38 +279,41 @@ DccVideoTheoraCodec::~DccVideoTheoraCodec()
 {
 	if(m_pEncoder)
 		delete m_pEncoder;
-	m_pEncoder=0;
+	m_pEncoder = 0;
 
 	if(m_pDecoder)
 		delete m_pDecoder;
-	m_pDecoder=0;
+	m_pDecoder = 0;
 }
 
-void DccVideoTheoraCodec::encodeVideo(KviDataBuffer * videoSignal,KviDataBuffer * stream)
+void DccVideoTheoraCodec::encodeVideo(KviDataBuffer * videoSignal, KviDataBuffer * stream)
 {
-	if(videoSignal->size() < 1) return;
+	if(videoSignal->size() < 1)
+		return;
 
 	if(!m_pEncoder)
 		m_pEncoder = new KviOggTheoraEncoder(stream);
 
-	m_pEncoder->addVideoFrame((QRgb *) videoSignal->data(),videoSignal->size());
+	m_pEncoder->addVideoFrame((QRgb *)videoSignal->data(), videoSignal->size());
 	videoSignal->clear();
 }
 
 void DccVideoTheoraCodec::encodeText(KviDataBuffer * textSignal, KviDataBuffer * stream)
 {
-	if(textSignal->size() < 1) return;
+	if(textSignal->size() < 1)
+		return;
 
 	if(!m_pEncoder)
 		m_pEncoder = new KviOggTheoraEncoder(stream);
 
-	m_pEncoder->addTextFrame(textSignal->data(),textSignal->size());
+	m_pEncoder->addTextFrame(textSignal->data(), textSignal->size());
 	textSignal->clear();
 }
 
-void DccVideoTheoraCodec::decode(KviDataBuffer * stream,KviDataBuffer * videoSignal,KviDataBuffer * textSignal)
+void DccVideoTheoraCodec::decode(KviDataBuffer * stream, KviDataBuffer * videoSignal, KviDataBuffer * textSignal)
 {
-	if(stream->size() < 1)return;
+	if(stream->size() < 1)
+		return;
 
 	if(!m_pDecoder)
 		m_pDecoder = new KviOggTheoraDecoder(videoSignal, textSignal);