aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/dcc
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules/dcc')
-rw-r--r--src/modules/dcc/adpcmcodec.cpp20
-rw-r--r--src/modules/dcc/canvas.cpp54
-rw-r--r--src/modules/dcc/canvas.h6
-rw-r--r--src/modules/dcc/canvaswidget.cpp334
-rw-r--r--src/modules/dcc/canvaswidget.h74
-rw-r--r--src/modules/dcc/descriptor.cpp8
-rw-r--r--src/modules/dcc/descriptor.h6
-rw-r--r--src/modules/dcc/dialogs.cpp2
-rw-r--r--src/modules/dcc/gsmcodec.cpp46
-rw-r--r--src/modules/dcc/marshal.cpp2
-rw-r--r--src/modules/dcc/send.h8
11 files changed, 280 insertions, 280 deletions
diff --git a/src/modules/dcc/adpcmcodec.cpp b/src/modules/dcc/adpcmcodec.cpp
index 1afff6ebc..28f35f948 100644
--- a/src/modules/dcc/adpcmcodec.cpp
+++ b/src/modules/dcc/adpcmcodec.cpp
@@ -25,10 +25,10 @@
// Copyright 1992 by Stichting Mathematisch Centrum, Amsterdam, The Netherlands.
// All Rights Reserved
//
-// Permission to use, copy, modify, and distribute this software and its
-// documentation for any purpose and without fee is hereby granted,
+// Permission to use, copy, modify, and distribute this software and its
+// documentation for any purpose and without fee is hereby granted,
// provided that the above copyright notice appear in all copies and that
-// both that copyright notice and this permission notice appear in
+// both that copyright notice and this permission notice appear in
// supporting documentation, and that the names of Stichting Mathematisch
// Centrum or CWI not be used in advertising or publicity pertaining to
// distribution of the software without specific, written prior permission.
@@ -97,10 +97,10 @@ void ADPCM_compress(short indata[],char outdata[],int len,ADPCM_state *state)
int index; /* Current step change index */
int outputbuffer = 0; /* place to keep previous 4-bit value */
int bufferstep; /* toggle between outputbuffer/output */
-
+
lpOut = (signed char *)outdata;
lpIn = indata;
-
+
valpred = state->valprev;
index = state->index;
step = stepsizeTable[index];
@@ -113,7 +113,7 @@ void ADPCM_compress(short indata[],char outdata[],int len,ADPCM_state *state)
diff = val - valpred;
sign = (diff < 0) ? 8 : 0;
if(sign)diff=(-diff);
- // Step 2 - Divide and clamp
+ // Step 2 - Divide and clamp
// Note:
// This code *approximately* computes:
// delta = diff*4/step;
@@ -147,7 +147,7 @@ void ADPCM_compress(short indata[],char outdata[],int len,ADPCM_state *state)
if ( valpred > 32767 )valpred = 32767;
else if ( valpred < -32768 )valpred = -32768;
// Step 5 - Assemble value, update index and step values
- delta |= sign;
+ delta |= sign;
index += indexTable[delta];
if ( index < 0 ) index = 0;
if ( index > 88 ) index = 88;
@@ -175,10 +175,10 @@ void ADPCM_uncompress(char indata[],short outdata[],int len,ADPCM_state *state)
int index; /* Current step change index */
int inputbuffer=0; /* place to keep next 4-bit value */
int bufferstep; /* toggle between inputbuffer/input */
-
+
outp = outdata;
inp = (signed char *)indata;
-
+
valpred = state->valprev;
index = state->index;
step = stepsizeTable[index];
@@ -226,7 +226,7 @@ void ADPCM_uncompress(char indata[],short outdata[],int len,ADPCM_state *state)
/* Step 7 - Output value */
*outp++ = valpred;
}
-
+
state->valprev = valpred;
state->index = index;
}
diff --git a/src/modules/dcc/canvas.cpp b/src/modules/dcc/canvas.cpp
index a67edd315..4c17ae666 100644
--- a/src/modules/dcc/canvas.cpp
+++ b/src/modules/dcc/canvas.cpp
@@ -31,7 +31,7 @@
#include "dialogs.h"
#include "marshal.h"
#include "canvaswidget.h"
-
+
#define _KVI_DEBUG_CHECK_RANGE_
#include "kvi_debug.h"
#include "kvi_options.h"
@@ -51,29 +51,29 @@
#include "kvi_settings.h"
#include "kvi_themedlabel.h"
#include "kvi_ircconnection.h"
-
+
#include <QSplitter>
-
+
extern KviDccBroker * g_pDccBroker;
-
-
+
+
KviDccCanvas::KviDccCanvas(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name)
: KviDccWindow(KVI_WINDOW_TYPE_DCCCANVAS,pFrm,name,dcc)
{
m_pSplitter = new QSplitter(QSplitter::Vertical,this,"splitter");
-
+
m_pCanvas = new KviCanvasWidget(m_pSplitter);
-
+
m_pIrcView = new KviIrcView(m_pSplitter,pFrm,this);
m_pInput = new KviInput(this);
-
+
// setFocusHandler(m_pInput,this);
-
+
m_pMarshal = new KviDccMarshal(this);
connect(m_pMarshal,SIGNAL(error(int)),this,SLOT(handleMarshalError(int)));
connect(m_pMarshal,SIGNAL(connected()),this,SLOT(connected()));
-
-
+
+
if(!(m_pDescriptor->bActive))
{
// PASSIVE CONNECTION
@@ -81,10 +81,10 @@
int ret = m_pMarshal->dccListen(dcc->szListenIp,dcc->szListenPort,m_pDescriptor->bDoTimeout);
if(ret != KviError_success)handleMarshalError(ret);
else {
-
+
output(KVI_OUT_DCCMSG,__tr2qs_ctx("Listening on interface %Q port %Q","dcc"),
&(m_pMarshal->localIp()),&(m_pMarshal->localPort()));
-
+
if(dcc->bSendRequest)
{
QString ip = !dcc->szFakeIp.isEmpty() ? dcc->szFakeIp : dcc->szListenIp;
@@ -108,10 +108,10 @@
if(ret != KviError_success)handleMarshalError(ret);
else output(KVI_OUT_DCCMSG,__tr2qs_ctx("Contacting host %Q on port %Q","dcc"),&(dcc->szIp),&(dcc->szPort));
}
-
+
// m_pSlaveThread = 0;
}
-
+
KviDccCanvas::~KviDccCanvas()
{
g_pDccBroker->unregisterDccWindow(this);
@@ -125,7 +125,7 @@
// delete m_pDescriptor;
// delete m_pMarshal;
}
-
+
const QString & KviDccCanvas::target()
{
// This may change on the fly...
@@ -133,20 +133,20 @@
m_pDescriptor->szNick.toUtf8().data(),m_pDescriptor->szIp.toUtf8().data(),m_pDescriptor->szPort.toUtf8().data());
return m_szTarget;
}
-
+
void KviDccCanvas::fillCaptionBuffers()
{
KviStr tmp(KviStr::Format,"DCC Canvas %s@%s:%s",
m_pDescriptor->szNick.toUtf8().data(),m_pDescriptor->szIp.toUtf8().data(),m_pDescriptor->szPort.toUtf8().data());
-
+
m_szPlainTextCaption = tmp;
-
+
m_szHtmlActiveCaption.sprintf("<nobr><font color=\"%s\"><b>%s</b></font></nobr>",
KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().ascii(),tmp.ptr());
m_szHtmlInactiveCaption.sprintf("<nobr><font color=\"%s\"><b>%s</b></font></nobr>",
KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().ascii(),tmp.ptr());
}
-
+
QPixmap * KviDccCanvas::myIconPtr()
{
return g_pIconManager->getSmallIcon(KVI_SMALLICON_CANVAS);
@@ -165,14 +165,14 @@
m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
m_pDescriptor->szLocalHost.toUtf8().data(),text);
}
-
+
void KviDccCanvas::ownAction(const char * text)
{
KviStr buf(KviStr::Format,"%cACTION %s%c\r\n",text);
// m_pSlaveThread->sendRawData(buf.ptr(),buf.len());
output(KVI_OUT_ACTION,"%Q %s",&(m_pDescriptor->szLocalNick),text);
}
-
+
bool KviDccCanvas::event(QEvent *e)
{
// if(e->type() == KVI_THREAD_EVENT)
@@ -255,7 +255,7 @@
// }
return KviWindow::event(e);
}
-
+
void KviDccCanvas::resizeEvent(QResizeEvent *e)
{
int hght = m_pInput->heightHint();
@@ -264,20 +264,20 @@
m_pSplitter->setGeometry(0,0,width(),height() - hght);
m_pInput->setGeometry(0,height() - hght,width(),hght);
}
-
+
QSize KviDccCanvas::sizeHint() const
{
QSize ret(m_pIrcView->sizeHint().width(),
m_pIrcView->sizeHint().height() + m_pInput->heightHint());
return ret;
}
-
+
void KviDccCanvas::handleMarshalError(int err)
{
QString sss = KviError::getDescription(err);
output(KVI_OUT_DCCERROR,__tr2qs_ctx("DCC Failed: %Q","dcc"),&sss);
}
-
+
void KviDccCanvas::connected()
{
output(KVI_OUT_DCCMSG,__tr2qs_ctx("Connected to %Q:%Q","dcc"),
@@ -295,6 +295,6 @@
// m_pSlaveThread = new KviDccCanvasThread(this,m_pMarshal->releaseSocket());
// m_pSlaveThread->start();
}
-
+
#include "m_canvas.moc"
#endif
diff --git a/src/modules/dcc/canvas.h b/src/modules/dcc/canvas.h
index 6cc1fc134..3853a33c2 100644
--- a/src/modules/dcc/canvas.h
+++ b/src/modules/dcc/canvas.h
@@ -30,15 +30,15 @@
#include "descriptor.h"
#include "window.h"
#include "thread.h"
-
+
#include "kvi_window.h"
#include "kvi_string.h"
#include "kvi_pointerlist.h"
-
+
class KviDccMarshal;
class KviCanvasWidget;
class QSplitter;
-
+
class KviDccCanvas : public KviDccWindow
{
Q_OBJECT
diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp
index 69d6e7155..94cc5446b 100644
--- a/src/modules/dcc/canvaswidget.cpp
+++ b/src/modules/dcc/canvaswidget.cpp
@@ -28,31 +28,31 @@
#include "kvi_string.h"
#include "kvi_locale.h"
#include "kvi_tal_popupmenu.h"
-
+
#include <QCursor>
#include <QPainter>
#include <QTextDocument>
#include <QLineEdit>
#include <QComboBox>
#include <QValidator>
-
+
#include <math.h>
#include <stdlib.h>
-
+
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
// KviCanvasRectangleItem
//
-
+
KviCanvasRectangleItem::KviCanvasRectangleItem(QCanvas * c,int x,int y,int w,int h)
: QCanvasRectangle(x,y,w,h,c)
{
}
-
+
KviCanvasRectangleItem::~KviCanvasRectangleItem()
{
}
-
+
void KviCanvasRectangleItem::drawSelection(QPainter &p)
{
p.setRasterOp(NotROP);
@@ -61,7 +61,7 @@
p.drawRect((int)x(),(int)y(),width(),height());
p.setRasterOp(CopyROP);
}
-
+
void KviCanvasRectangleItem::setProperty(const QString &property,const QVariant &val)
{
if(m_properties[property].isValid())
@@ -71,8 +71,8 @@
show();
}
}
-
-
+
+
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
// KviCanvasPolygon
@@ -82,34 +82,34 @@
{
m_properties.insert("clrForeground",QVariant(QColor(0,0,0)));
m_properties.insert("uLineWidth",QVariant((unsigned int)0));
-
+
m_properties.insert("clrBackground",QVariant(QColor(0,0,0)));
m_properties.insert("bHasBackground",QVariant(false,1));
-
+
m_dScaleFactor = dScaleFactor;
m_points = pnts;
-
+
resetPoints();
move(x,y);
}
-
+
KviCanvasPolygon::~KviCanvasPolygon()
{
}
-
+
void KviCanvasPolygon::setScaleFactor(double dScaleFactor)
{
m_dScaleFactor = dScaleFactor;
resetPoints();
}
-
+
void KviCanvasPolygon::setInternalPoints(const QPointArray &pnts)
{
m_points = pnts;
resetPoints();
-
+
}
-
+
void KviCanvasPolygon::resetPoints()
{
QPointArray scaled(m_points.size());
@@ -124,12 +124,12 @@
}
setPoints(scaled);
}
-
+
int KviCanvasPolygon::rtti() const
{
return KVI_CANVAS_RTTI_POLYGON;
}
-
+
void KviCanvasPolygon::setProperty(const QString &property,const QVariant &val)
{
if(m_properties[property].isValid())
@@ -149,7 +149,7 @@
}
}
}
-
+
void KviCanvasPolygon::draw(QPainter &p)
{
if(isEnabled())
@@ -158,7 +158,7 @@
p.setPen(pen());
p.drawPolygon(areaPoints());
}
-
+
if(isSelected())
{
p.setRasterOp(NotROP);
@@ -173,29 +173,29 @@
canvas()->setChanged(QRect((int)(x() - dVal),(int)(y() - dVal),(int)(dVal * 4),(int)(dVal * 4)));
}
}
-
+
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
// KviCanvasEllipticItem
//
-
+
KviCanvasEllipticItem::KviCanvasEllipticItem(QCanvas * c,int x,int y,int w,int h)
: KviCanvasRectangleItem(c,x,y,w,h)
{
m_properties.insert("clrForeground",QVariant(QColor(0,0,0)));
m_properties.insert("uLineWidth",QVariant((unsigned int)0));
-
+
m_properties.insert("clrBackground",QVariant(QColor(0,0,0)));
m_properties.insert("bHasBackground",QVariant(false,1));
-
+
// m_properties.insert("iStartAngle",QVariant(0));
// m_properties.insert("iEndAngle",QVariant(360));
}
-
+
KviCanvasEllipticItem::~KviCanvasEllipticItem()
{
}
-
+
void KviCanvasEllipticItem::draw(QPainter &p)
{
if(isEnabled())
@@ -207,14 +207,14 @@
drawContent(p);
p.setBrush(b);
}
-
+
if(isSelected())drawSelection(p);
}
-
+
void KviCanvasEllipticItem::drawContent(QPainter &p)
{
}
-
+
void KviCanvasEllipticItem::setProperty(const QString & property,const QVariant &val)
{
if(m_properties[property].isValid())
@@ -228,68 +228,68 @@
}
}
}
-
+
int KviCanvasEllipticItem::rtti() const
{
return KVI_CANVAS_RTTI_ELLIPSE;
}
-
-
+
+
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
// KviCanvasEllipse
//
-
-
+
+
KviCanvasEllipse::KviCanvasEllipse(QCanvas * c,int x,int y,int w,int h)
: KviCanvasEllipticItem(c,x,y,w,h)
{
}
-
+
KviCanvasEllipse::~KviCanvasEllipse()
{
}
-
+
int KviCanvasEllipse::rtti() const
{
return KVI_CANVAS_RTTI_ELLIPSE;
}
-
+
void KviCanvasEllipse::drawContent(QPainter &p)
{
p.drawEllipse((int)x(),(int)y(),width(),height());
}
-
+
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
// KviCanvasPie
//
-
-
+
+
KviCanvasPie::KviCanvasPie(QCanvas * c,int x,int y,int w,int h)
: KviCanvasEllipticItem(c,x,y,w,h)
{
m_properties.insert("iStartAngle",QVariant((int)0));
m_properties.insert("iExtensionAngle",QVariant((int)360));
}
-
+
KviCanvasPie::~KviCanvasPie()
{
}
-
+
int KviCanvasPie::rtti() const
{
return KVI_CANVAS_RTTI_PIE;
}
-
+
void KviCanvasPie::drawContent(QPainter &p)
{
int iStartAngle = m_properties["iStartAngle"].asInt() * 16;
int iEndAngle = m_properties["iExtensionAngle"].asInt() * 16;
p.drawPie((int)x(),(int)y(),width(),height(),iStartAngle,iEndAngle);
}
-
-
+
+
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
// KviCanvasChord
@@ -300,23 +300,23 @@
m_properties.insert("iStartAngle",QVariant((int)0));
m_properties.insert("iExtensionAngle",QVariant((int)360));
}
-
+
KviCanvasChord::~KviCanvasChord()
{
}
-
+
int KviCanvasChord::rtti() const
{
return KVI_CANVAS_RTTI_CHORD;
}
-
+
void KviCanvasChord::drawContent(QPainter &p)
{
int iStartAngle = m_properties["iStartAngle"].asInt() * 16;
int iEndAngle = m_properties["iExtensionAngle"].asInt() * 16;
p.drawChord((int)x(),(int)y(),width(),height(),iStartAngle,iEndAngle);
}
-
+
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
// KviCanvasRectangle
@@ -326,20 +326,20 @@
{
m_properties.insert("clrForeground",QVariant(QColor(0,0,0)));
m_properties.insert("uLineWidth",QVariant((unsigned int)0));
-
+
m_properties.insert("clrBackground",QVariant(QColor(0,0,0)));
m_properties.insert("bHasBackground",QVariant(false,1));
}
-
+
KviCanvasRectangle::~KviCanvasRectangle()
{
}
-
+
int KviCanvasRectangle::rtti() const
{
return KVI_CANVAS_RTTI_RECTANGLE;
}
-
+
void KviCanvasRectangle::setProperty(const QString &property,const QVariant &val)
{
if(m_properties[property].isValid())
@@ -353,7 +353,7 @@
}
}
}
-
+
void KviCanvasRectangle::draw(QPainter & p)
{
if(isEnabled())
@@ -365,10 +365,10 @@
p.setPen(pen());
p.drawRect((int)x(),(int)y(),width(),height());
}
-
+
if(isSelected())drawSelection(p);
}
-
+
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
// KviCanvasRichText
@@ -382,16 +382,16 @@
m_properties.insert("szText",QVariant(QString("<center>Insert here your <font color=\"#FF0000\"><b>RICH TEXT</b></font></center>")));
m_properties.insert("fntDefault",QVariant(f));
}
-
+
KviCanvasRichText::~KviCanvasRichText()
{
}
-
+
int KviCanvasRichText::rtti() const
{
return KVI_CANVAS_RTTI_RICHTEXT;
}
-
+
void KviCanvasRichText::draw(QPainter & p)
{
if(isEnabled())
@@ -401,11 +401,11 @@
text.setWidth(width());
text.draw(&p,(int)x() + 1,(int)y() + 1,QRegion(QRect((int)x() + 1,(int)y() + 1,width(),height())),QColorGroup());
}
-
+
if(isSelected())drawSelection(p);
}
-
-
+
+
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
// KviCanvasLine
@@ -417,11 +417,11 @@
m_properties.insert("uLineWidth",QVariant((unsigned int)0));
m_properties.insert("clrForeground",QVariant(QColor()));
}
-
+
KviCanvasLine::~KviCanvasLine()
{
}
-
+
void KviCanvasLine::setProperty(const QString &property,const QVariant &val)
{
m_properties.replace(property,val);
@@ -430,12 +430,12 @@
setPen(QPen(m_properties["clrForeground"].asColor(),m_properties["uLineWidth"].toInt()));
}
}
-
+
int KviCanvasLine::rtti() const
{
return KVI_CANVAS_RTTI_LINE;
}
-
+
void KviCanvasLine::draw(QPainter &p)
{
if(isEnabled())
@@ -443,7 +443,7 @@
p.setPen(pen());
p.drawLine(startPoint(),endPoint());
}
-
+
if(isSelected())
{
p.setRasterOp(NotROP);
@@ -452,7 +452,7 @@
p.setRasterOp(CopyROP);
}
}
-
+
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
// KviCanvasView
@@ -466,85 +466,85 @@
m_pSelectedItem = 0;
viewport()->setMouseTracking(true);
}
-
+
KviCanvasView::~KviCanvasView()
{
}
-
+
void KviCanvasView::insertRectangle()
{
m_state = SelectOrigin;
setCursor(crossCursor);
m_objectToInsert = Rectangle;
}
-
+
void KviCanvasView::insertRichText()
{
m_state = SelectOrigin;
setCursor(crossCursor);
m_objectToInsert = RichText;
}
-
+
void KviCanvasView::insertLine()
{
m_state = SelectOrigin;
setCursor(crossCursor);
m_objectToInsert = Line;
}
-
+
void KviCanvasView::insertEllipse()
{
m_state = SelectOrigin;
setCursor(crossCursor);
m_objectToInsert = Ellipse;
}
-
+
void KviCanvasView::insertPie()
{
m_state = SelectOrigin;
setCursor(crossCursor);
m_objectToInsert = Pie;
}
-
+
void KviCanvasView::insertChord()
{
m_state = SelectOrigin;
setCursor(crossCursor);
m_objectToInsert = Chord;
}
-
+
void KviCanvasView::insertPolygonTriangle()
{
m_state = SelectOrigin;
setCursor(crossCursor);
m_objectToInsert = PolygonTriangle;
}
-
+
void KviCanvasView::insertPolygonRectangle()
{
m_state = SelectOrigin;
setCursor(crossCursor);
m_objectToInsert = PolygonRectangle;
}
-
+
void KviCanvasView::insertPolygonPentagon()
{
m_state = SelectOrigin;
setCursor(crossCursor);
m_objectToInsert = PolygonPentagon;
}
-
+
void KviCanvasView::insertPolygonHexagon()
{
m_state = SelectOrigin;
setCursor(crossCursor);
m_objectToInsert = PolygonPentagon;
}
-
+
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif
-
+
static void calcPolygonPoints(QPointArray &pnts,unsigned int nVertices)
{
double dDelta = (2 * M_PI) / nVertices;
@@ -556,11 +556,11 @@
pnts.setPoint(i,(int)theX,(int)theY);
}
}
-
+
void KviCanvasView::insertObjectAt(const QPoint & pnt,ObjectType o)
{
QCanvasItem * r = 0;
-
+
switch(o)
{
case Rectangle:
@@ -615,14 +615,14 @@
}
break;
}
-
+
if(r)
{
setItemSelected(r);
r->setEnabled(true);
r->show();
}
-
+
switch(KVI_CANVAS_RTTI_CONTROL_TYPE(r))
{
case KVI_CANVAS_RTTI_CONTROL_TYPE_RECTANGLE:
@@ -635,19 +635,19 @@
// beginDragPolygon((KviCanvasPolygon *)r,pnt,true);
// break;
}
-
+
// canvas()->update();
}
-
+
void KviCanvasView::setItemSelected(QCanvasItem * it)
{
clearSelection();
it->setSelected(true);
m_pSelectedItem = it;
m_pCanvasWidget->m_pPropertiesWidget->editItem(it);
-
+
}
-
+
void KviCanvasView::clearSelection()
{
if(!m_pSelectedItem)return;
@@ -655,27 +655,27 @@
m_pSelectedItem = 0;
m_pCanvasWidget->m_pPropertiesWidget->editItem(0);
}
-
+
void KviCanvasView::beginDragLine(KviCanvasLine * it,const QPoint &p,bool bInitial)
{
QPoint sp = it->startPoint();
-
+
m_dragBegin = p - sp;
-
+
if(bInitial)
{
m_dragMode = Bottom;
setCursor(sizeAllCursor);
return;
}
-
+
if((abs(p.x() - sp.x()) < 3) && (abs(p.y() - sp.y()) < 3))
{
m_dragMode = Top;
setCursor(sizeAllCursor);
return;
}
-
+
sp = it->endPoint();
if((abs(p.x() - sp.x()) < 3) && (abs(p.y() - sp.y()) < 3))
{
@@ -683,11 +683,11 @@
setCursor(sizeAllCursor);
return;
}
-
+
m_dragMode = All;
setCursor(pointingHandCursor);
}
-
+
void KviCanvasView::dragLine(KviCanvasLine * it,const QPoint &p)
{
switch(m_dragMode)
@@ -716,7 +716,7 @@
}
canvas()->update();
}
-
+
static double ssm_2d_rotationAngleFromXAxis(double dx,double dy)
{
//
@@ -724,24 +724,24 @@
//acos(---------) = acos(-----------------) = acos(---------)
// |v1||v2| |(dx,dy)| * 1 |(dx,dy)|
//
-
+
//double dVal = hypot(dx,dy);
double dVal = sqrt((dx * dx) + (dy * dy));
-
+
if(dVal == 0.0)return 0; // ???
-
+
dVal = acos(dx / dVal);
-
+
return (dy > 0.0) ? dVal : -dVal;
}
-
+
static double ssm_2d_rotationAngle(double drefx,double drefy,double drotatedx,double drotatedy)
{
double dRefAngle = ssm_2d_rotationAngleFromXAxis(drefx,drefy);
double dRotAngle = ssm_2d_rotationAngleFromXAxis(drotatedx,drotatedy);
return dRotAngle - dRefAngle;
}
-
+
static void ssm_2d_rotate(double &dx,double &dy,double dAngle)
{
// Rotation matrix:
@@ -749,28 +749,28 @@
// | cos(x) sin(x) |
// | |
// | -sin(x) cos(x) |
-
+
double s = sin(dAngle);
double c = cos(dAngle);
-
+
double tmpX = (dx * c) - (dy * s);
double tmpY = (dx * s) + (dy * c);
-
+
dx = tmpX;
dy = tmpY;
}
-
+
static double ssm_hypot(double a,double b)
{
return sqrt((a * a) + (b * b));
}
-
+
void KviCanvasView::beginDragPolygon(KviCanvasPolygon * it,const QPoint &p,bool bShift,bool bCtrl)
{
m_dragBegin = QPoint((int)(p.x() - it->x()),(int)(p.y() - it->y()));
-
+
QPointArray pa = it->areaPoints();
-
+
for(unsigned int i=0;i<pa.size();i++)
{
QPoint pnt = pa.point(i);
@@ -786,7 +786,7 @@
return;
}
}
-
+
if(bShift)
{
m_dragMode = Scale;
@@ -794,7 +794,7 @@
setCursor(sizeAllCursor);
return;
}
-
+
if(bCtrl)
{
m_dragMode = Rotate;
@@ -803,11 +803,11 @@
setCursor(sizeHorCursor);
return;
}
-
+
m_dragMode = All;
setCursor(pointingHandCursor);
}
-
+
void KviCanvasView::dragPolygon(KviCanvasPolygon * it,const QPoint &p)
{
switch(m_dragMode)
@@ -853,11 +853,11 @@
}
canvas()->update();
}
-
+
void KviCanvasView::beginDragRectangle(KviCanvasRectangleItem * it,const QPoint & p,bool bInitial)
{
m_dragBegin = QPoint((int)(p.x() - it->x()),(int)(p.y() - it->y()));
-
+
if(bInitial)
{
// Right bottom
@@ -865,7 +865,7 @@
setCursor(sizeFDiagCursor);
return;
}
-
+
if(p.x() < (((int)it->x()) + 2))
{
// Left edge
@@ -887,7 +887,7 @@
setCursor(sizeHorCursor);
return;
}
-
+
if(p.x() > (it->right() - 2))
{
// Right edge
@@ -909,7 +909,7 @@
setCursor(sizeHorCursor);
return;
}
-
+
// Somewhere in the middle
if(p.y() < (((int)it->y()) + 2))
{
@@ -925,16 +925,16 @@
setCursor(sizeVerCursor);
return;
}
-
+
m_dragMode = All;
setCursor(pointingHandCursor);
}
-
+
void KviCanvasView::dragRectangle(KviCanvasRectangleItem * it,const QPoint & p)
{
-
+
int aux1,aux2,aux3,aux4;
-
+
switch(m_dragMode)
{
case All:
@@ -1026,10 +1026,10 @@
default:
break;
}
-
+
canvas()->update();
}
-
+
void KviCanvasView::contentsMouseMoveEvent(QMouseEvent *e)
{
// QPoint p = inverseWorldMatrix().map(e->pos());
@@ -1058,7 +1058,7 @@
{
QCanvasItemList l = canvas()->collisions(p);
QCanvasItemList::Iterator it = l.begin();
-
+
if(it != l.end())
{
// Got an item
@@ -1086,7 +1086,7 @@
}
}
}
-
+
void KviCanvasView::contentsMouseReleaseEvent(QMouseEvent *e)
{
if(m_dragMode != None)
@@ -1101,14 +1101,14 @@
}
}
}
-
+
void KviCanvasView::contentsMousePressEvent(QMouseEvent *e)
{
if(e->button() & Qt::LeftButton)
{
// QPoint p = inverseWorldMatrix().map(e->pos());
QPoint p = e->pos();
-
+
switch(m_state)
{
case SelectOrigin:
@@ -1118,12 +1118,12 @@
insertObjectAt(p,m_objectToInsert);
canvas()->update();
break;
-
+
case Idle:
{
QCanvasItemList l = canvas()->collisions(p);
QCanvasItemList::Iterator it = l.begin();
-
+
if(it != l.end())
{
// Got an item
@@ -1157,11 +1157,11 @@
}
}
}
-
+
void KviCanvasView::propertyChanged(const QString &s,const QVariant &v)
{
if(!m_pSelectedItem)return;
-
+
switch(KVI_CANVAS_RTTI_CONTROL_TYPE(m_pSelectedItem))
{
case KVI_CANVAS_RTTI_CONTROL_TYPE_RECTANGLE:
@@ -1174,11 +1174,11 @@
((KviCanvasPolygon *)m_pSelectedItem)->setProperty(s,v);
break;
}
-
+
canvas()->update();
}
-
-
+
+
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
// KviVariantTableItem
@@ -1188,11 +1188,11 @@
{
m_property = property;
}
-
+
KviVariantTableItem::~KviVariantTableItem()
{
}
-
+
QWidget * KviVariantTableItem::createEditor() const
{
switch(m_property.type())
@@ -1268,7 +1268,7 @@
b->insertItem(tmpDefault + ", 40");
b->insertItem(tmpDefault + ", 48");
b->insertItem(f.family() + ", 12");
- b->setCurrentItem(0);
+ b->setCurrentItem(0);
b->setCurrentItem(m_property.toBool() ? 1 : 0);
return b;
}
@@ -1278,7 +1278,7 @@
}
return 0;
}
-
+
void KviVariantTableItem::setContentFromEditor(QWidget * w)
{
switch(m_property.type())
@@ -1320,11 +1320,11 @@
break;
}
}
-
+
void KviVariantTableItem::paint(QPainter *p,const QColorGroup &cg,const QRect &cr,bool)
{
p->fillRect(0,0,cr.width(),cr.height(),cg.base());
-
+
if(m_property.type() == QVariant::Color)
{
p->fillRect(3,3,cr.width() - 6,cr.height() - 6,m_property.asColor());
@@ -1356,8 +1356,8 @@
p->drawText(0,0,cr.width(),cr.height(),Qt::AlignLeft | Qt::AlignTop,sz);
}
}
-
-
+
+
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
// KviCanvasItemPropertiesWidget
@@ -1375,11 +1375,11 @@
verticalHeader()->hide();
connect(this,SIGNAL(valueChanged(int,int)),this,SLOT(cellEdited(int,int)));
}
-
+
KviCanvasItemPropertiesWidget::~KviCanvasItemPropertiesWidget()
{
}
-
+
void KviCanvasItemPropertiesWidget::cellEdited(int row,int)
{
QTableItem * it = item(row,0);
@@ -1389,7 +1389,7 @@
if(!it)return;
emit propertyChanged(szName,((KviVariantTableItem *)it)->property());
}
-
+
void KviCanvasItemPropertiesWidget::editItem(QCanvasItem * it)
{
if(!it)
@@ -1403,9 +1403,9 @@
setNumRows(0);
return;
}
-
+
QMap<QString,QVariant> * m = 0;
-
+
switch(KVI_CANVAS_RTTI_CONTROL_TYPE(it))
{
case KVI_CANVAS_RTTI_CONTROL_TYPE_RECTANGLE:
@@ -1418,26 +1418,26 @@
m = ((KviCanvasPolygon *)it)->properties();
break;
}
-
+
if(!m)
{
editItem(0);
return;
}
-
+
for(int i=0;i<numRows();i++)
{
clearCell(i,0);
clearCell(i,1);
clearCellWidget(i,1);
}
-
+
setNumRows(m->count());
-
+
QTableItem * item;
-
+
int idx = 0;
-
+
for(QMap<QString,QVariant>::ConstIterator iter = m->begin();iter != m->end();++iter)
{
item = new QTableItem(this,QTableItem::Never,iter.key().toUtf8().data());
@@ -1446,9 +1446,9 @@
setItem(idx,1,item);
idx++;
}
-
+
}
-
+
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
// KviCanvasWidget
@@ -1468,9 +1468,9 @@
l.append(80);
l.append(20);
m_pSplitter->setSizes(l);
-
+
connect(m_pPropertiesWidget,SIGNAL(propertyChanged(const QString &,const QVariant &)),m_pCanvasView,SLOT(propertyChanged(const QString &,const QVariant &)));
-
+
KviTalPopupMenu * add = new KviTalPopupMenu(m_pMenuBar);
KviTalPopupMenu * shapes = new KviTalPopupMenu(add);
KviTalPopupMenu * polygons = new KviTalPopupMenu(add);
@@ -1480,25 +1480,25 @@
shapes->insertItem(__tr2qs_ctx("&Ellipse","dcc"),m_pCanvasView,SLOT(insertEllipse()));
shapes->insertItem(__tr2qs_ctx("&Pie","dcc"),m_pCanvasView,SLOT(insertPie()));
shapes->insertItem(__tr2qs_ctx("&Chord","dcc"),m_pCanvasView,SLOT(insertChord()));
-
+
items->insertItem(__tr2qs_ctx("&Rich text (html)","dcc"),m_pCanvasView,SLOT(insertRichText()));
-
+
polygons->insertItem(__tr2qs_ctx("&Triangle","dcc"),m_pCanvasView,SLOT(insertPolygonTriangle()));
polygons->insertItem(__tr2qs_ctx("&Rectangle","dcc"),m_pCanvasView,SLOT(insertPolygonRectangle()));
polygons->insertItem(__tr2qs_ctx("&Pentagon","dcc"),m_pCanvasView,SLOT(insertPolygonPentagon()));
polygons->insertItem(__tr2qs_ctx("&Hexagon","dcc"),m_pCanvasView,SLOT(insertPolygonHexagon()));
-
+
add->insertItem(__tr2qs_ctx("&Shape","dcc"),shapes);
add->insertItem(__tr2qs_ctx("&Item","dcc"),items);
add->insertItem(__tr2qs_ctx("&Polygons","dcc"),polygons);
-
+
m_pMenuBar->insertItem(__tr2qs_ctx("&Insert","dcc"),add);
}
-
+
KviCanvasWidget::~KviCanvasWidget()
{
}
-
+
void KviCanvasWidget::resizeEvent(QResizeEvent *)
{
int h = m_pMenuBar->sizeHint().height();
@@ -1507,6 +1507,6 @@
m_pStatusLabel->setGeometry(0,height() - h2,width(),h2);
m_pSplitter->setGeometry(0,h,width(),height() - (h + h2));
}
-
+
#include "m_canvaswidget.moc"
#endif
diff --git a/src/modules/dcc/canvaswidget.h b/src/modules/dcc/canvaswidget.h
index f3da02409..84eee1c41 100644
--- a/src/modules/dcc/canvaswidget.h
+++ b/src/modules/dcc/canvaswidget.h
@@ -34,15 +34,15 @@
#include <QVariant>
#include <QTable>
#include <QSplitter>
-
+
class KviCanvasWidget;
-
+
#define KVI_CANVAS_RTTI_CONTROL_TYPE_RECTANGLE 1
#define KVI_CANVAS_RTTI_CONTROL_TYPE_LINE 2
#define KVI_CANVAS_RTTI_CONTROL_TYPE_POLYGON 4
-
+
#define KVI_CANVAS_RTTI_CONTROL_TYPE_MASK 255
-
+
#define KVI_CANVAS_RTTI_RECTANGLE (KVI_CANVAS_RTTI_CONTROL_TYPE_RECTANGLE | (1 << 8))
#define KVI_CANVAS_RTTI_RICHTEXT (KVI_CANVAS_RTTI_CONTROL_TYPE_RECTANGLE | (2 << 8))
#define KVI_CANVAS_RTTI_LINE (KVI_CANVAS_RTTI_CONTROL_TYPE_LINE | (3 << 8))
@@ -50,11 +50,11 @@
#define KVI_CANVAS_RTTI_CHORD (KVI_CANVAS_RTTI_CONTROL_TYPE_RECTANGLE | (5 << 8))
#define KVI_CANVAS_RTTI_PIE (KVI_CANVAS_RTTI_CONTROL_TYPE_RECTANGLE | (6 << 8))
#define KVI_CANVAS_RTTI_POLYGON (KVI_CANVAS_RTTI_CONTROL_TYPE_POLYGON | (7 << 8))
-
+
#define KVI_CANVAS_RTTI_CONTROL_TYPE(__item) (__item->rtti() & KVI_CANVAS_RTTI_CONTROL_TYPE_MASK)
-
-
-
+
+
+
class KviCanvasPolygon : public QCanvasPolygon
{
public:
@@ -75,8 +75,8 @@
virtual void setProperty(const QString &property,const QVariant &val);
virtual int rtti() const;
};
-
-
+
+
class KviCanvasRectangleItem : public QCanvasRectangle
{
friend class KviCanvasRectangle;
@@ -97,8 +97,8 @@
protected:
void drawSelection(QPainter &p);
};
-
-
+
+
class KviCanvasEllipticItem : public KviCanvasRectangleItem
{
friend class KviCanvasEllipse;
@@ -113,8 +113,8 @@
virtual void drawContent(QPainter & p);
virtual int rtti() const;
};
-
-
+
+
class KviCanvasEllipse : public KviCanvasEllipticItem
{
public:
@@ -124,8 +124,8 @@
virtual void drawContent(QPainter & p);
virtual int rtti() const;
};
-
-
+
+
class KviCanvasPie : public KviCanvasEllipticItem
{
public:
@@ -135,8 +135,8 @@
virtual void drawContent(QPainter & p);
virtual int rtti() const;
};
-
-
+
+
class KviCanvasChord : public KviCanvasEllipticItem
{
public:
@@ -146,8 +146,8 @@
virtual void drawContent(QPainter & p);
virtual int rtti() const;
};
-
-
+
+
class KviCanvasLine : public QCanvasLine
{
public:
@@ -162,8 +162,8 @@
virtual void draw(QPainter & p);
virtual int rtti() const;
};
-
-
+
+
class KviCanvasRectangle : public KviCanvasRectangleItem
{
public:
@@ -174,8 +174,8 @@
virtual void setProperty(const QString &property,const QVariant &val);
virtual int rtti() const;
};
-
-
+
+
class KviCanvasRichText : public KviCanvasRectangleItem
{
public:
@@ -185,8 +185,8 @@
virtual void draw(QPainter & p);
virtual int rtti() const;
};
-
-
+
+
class KviCanvasView : public QCanvasView
{
Q_OBJECT
@@ -206,14 +206,14 @@
};
protected:
KviCanvasWidget * m_pCanvasWidget;
-
+
// Insertion of objects
State m_state;
ObjectType m_objectToInsert;
-
+
// Selected item
QCanvasItem * m_pSelectedItem;
-
+
DragMode m_dragMode;
QPoint m_dragBegin;
double m_dragScaleFactor;
@@ -222,13 +222,13 @@
protected:
void beginDragRectangle(KviCanvasRectangleItem * it,const QPoint &p,bool bInitial = false);
void dragRectangle(KviCanvasRectangleItem * it,const QPoint & p);
-
+
void beginDragLine(KviCanvasLine * it,const QPoint &p,bool bInitial = false);
void dragLine(KviCanvasLine * it,const QPoint &p);
-
+
void beginDragPolygon(KviCanvasPolygon * it,const QPoint &p,bool bShift = false,bool bCtrl = false);
void dragPolygon(KviCanvasPolygon * it,const QPoint &p);
-
+
void setItemSelected(QCanvasItem * it);
void clearSelection();
void insertObjectAt(const QPoint & pnt,ObjectType o);
@@ -248,7 +248,7 @@
void insertPolygonHexagon();
void propertyChanged(const QString &s,const QVariant &v);
};
-
+
class KviVariantTableItem : public QTableItem
{
@@ -263,8 +263,8 @@
QVariant & property(){ return m_property; };
virtual void paint(QPainter *p,const QColorGroup &cg,const QRect &cr,bool selected);
};
-
-
+
+
class KviCanvasItemPropertiesWidget : public QTable
{
Q_OBJECT
@@ -278,8 +278,8 @@
signals:
void propertyChanged(const QString &s,const QVariant &v);
};
-
-
+
+
class KviCanvasWidget : public QWidget
{
friend class KviCanvasView;
diff --git a/src/modules/dcc/descriptor.cpp b/src/modules/dcc/descriptor.cpp
index f8d98b987..46ed03a21 100644
--- a/src/modules/dcc/descriptor.cpp
+++ b/src/modules/dcc/descriptor.cpp
@@ -52,9 +52,9 @@ KviDccDescriptor::KviDccDescriptor(KviConsole * pConsole)
m_uId = g_uNextDescriptorId;
g_uNextDescriptorId++;
-
+
m_szId.setNum(m_uId);
-
+
if(!g_pDescriptorDict)
{
g_pDescriptorDict = new KviPointerHashTable<int,KviDccDescriptor>;
@@ -102,7 +102,7 @@ KviDccDescriptor::~KviDccDescriptor()
else {
if(!(g_pApp->windowExists(pEventWindow)))pEventWindow = g_pApp->activeConsole();
}
-
+
if(pEventWindow)
{
// recheck it again...
@@ -150,7 +150,7 @@ KviDccDescriptor * KviDccDescriptor::find(unsigned int uId)
void KviDccDescriptor::copyFrom(const KviDccDescriptor &src)
{
m_uId = g_uNextDescriptorId;
- g_uNextDescriptorId++;
+ g_uNextDescriptorId++;
m_szId.setNum(m_uId);
if(!g_pDescriptorDict)
diff --git a/src/modules/dcc/descriptor.h b/src/modules/dcc/descriptor.h
index a735d5223..ac4eadb22 100644
--- a/src/modules/dcc/descriptor.h
+++ b/src/modules/dcc/descriptor.h
@@ -45,10 +45,10 @@ protected:
unsigned int m_uId; // this dcc session ID
QString m_szId;
-
+
KviDccWindow * m_pDccWindow; // 0 if it has no window
KviDccFileTransfer * m_pDccTransfer; // 0 if it is not a transfer
-
+
bool m_bCreationEventTriggered;
public:
// A console that this DCC is bound to (might be replaced while we wait for user acknowledge in dialogs)
@@ -57,7 +57,7 @@ public:
KviDccWindow * window() const { return m_pDccWindow; };
void setWindow(KviDccWindow * w){ m_pDccWindow = w; };
-
+
KviDccFileTransfer * transfer() const { return m_pDccTransfer; };
void setTransfer(KviDccFileTransfer * t){ m_pDccTransfer = t; };
diff --git a/src/modules/dcc/dialogs.cpp b/src/modules/dcc/dialogs.cpp
index 041064569..d6b0b073e 100644
--- a/src/modules/dcc/dialogs.cpp
+++ b/src/modules/dcc/dialogs.cpp
@@ -140,7 +140,7 @@ KviDccRenameBox::KviDccRenameBox(KviDccBroker * br,KviDccDescriptor * dcc,const
//QHBoxLayout *hb = new QHBoxLayout(4);
QHBoxLayout *hb = new QHBoxLayout();
hb->setSpacing(4);
- vb->addLayout(hb,Qt::AlignCenter);
+ vb->addLayout(hb,Qt::AlignCenter);
QPushButton * btn = new QPushButton(__tr2qs_ctx("&Rename","dcc"),this);
hb->addWidget(btn);
diff --git a/src/modules/dcc/gsmcodec.cpp b/src/modules/dcc/gsmcodec.cpp
index ee0689eb0..4b9bf2f45 100644
--- a/src/modules/dcc/gsmcodec.cpp
+++ b/src/modules/dcc/gsmcodec.cpp
@@ -28,30 +28,30 @@
#ifdef COMPILE_USE_GSM
#include <dlfcn.h>
-
+
#define GSM_PACKED_FRAME_SIZE_IN_BYTES 33
#define GSM_UNPACKED_FRAME_SIZE_IN_BYTES 320
#define GSM_UNPACKED_FRAME_SIZE_IN_SHORTS 160
-
+
void * (*gsm_session_create)() = 0;
void (*gsm_session_destroy)(void *) = 0;
void (*gsm_session_encode)(void *,short *,unsigned char *) = 0;
int (*gsm_session_decode)(void *,unsigned char *,short *) = 0;
-
+
void * g_pGSMCodecLibraryHandle = 0;
-
+
bool kvi_gsm_codec_init()
{
if(g_pGSMCodecLibraryHandle)return true; // Already initialized
-
+
g_pGSMCodecLibraryHandle = dlopen("libgsm.so",RTLD_NOW | RTLD_GLOBAL);
if(!g_pGSMCodecLibraryHandle)return false; // no way to open it
-
+
gsm_session_create = (void * (*)()) dlsym(g_pGSMCodecLibraryHandle,"gsm_create");
gsm_session_destroy = (void (*)(void *)) dlsym(g_pGSMCodecLibraryHandle,"gsm_destroy");
gsm_session_encode = (void (*)(void *,short *,unsigned char *)) dlsym(g_pGSMCodecLibraryHandle,"gsm_encode");
gsm_session_decode = (int (*)(void *,unsigned char *,short *)) dlsym(g_pGSMCodecLibraryHandle,"gsm_decode");
-
+
if(! (gsm_session_create && gsm_session_destroy && gsm_session_encode && gsm_session_decode))
{
dlclose(g_pGSMCodecLibraryHandle);
@@ -60,7 +60,7 @@
}
return true;
}
-
+
void kvi_gsm_codec_done()
{
if(g_pGSMCodecLibraryHandle)
@@ -69,8 +69,8 @@
g_pGSMCodecLibraryHandle = 0;
}
}
-
-
+
+
KviDccVoiceGsmCodec::KviDccVoiceGsmCodec()
: KviDccVoiceCodec()
{
@@ -78,26 +78,26 @@
m_pDecodeState = gsm_session_create();
m_szName = "gsm (compression 33:320)";
}
-
+
KviDccVoiceGsmCodec::~KviDccVoiceGsmCodec()
{
gsm_session_destroy(m_pEncodeState);
gsm_session_destroy(m_pDecodeState);
}
-
+
void KviDccVoiceGsmCodec::encode(KviDataBuffer * signal,KviDataBuffer * stream)
{
if(signal->size() < GSM_UNPACKED_FRAME_SIZE_IN_BYTES)return; // nothing to encode
-
+
unsigned char * ptr = signal->data();
-
+
int uFrames = signal->size() / GSM_UNPACKED_FRAME_SIZE_IN_BYTES;
int uTotalDataCompressed = uFrames * GSM_UNPACKED_FRAME_SIZE_IN_BYTES;
int uFrameOffset = stream->size();
unsigned char * endPtr = ptr + uTotalDataCompressed;
-
+
stream->addSize(GSM_PACKED_FRAME_SIZE_IN_BYTES * uFrames);
-
+
while(ptr != endPtr)
{
gsm_session_encode(m_pEncodeState,(short *)ptr,stream->data() + uFrameOffset);
@@ -106,21 +106,21 @@
}
signal->remove(uTotalDataCompressed);
}
-
+
void KviDccVoiceGsmCodec::decode(KviDataBuffer * stream,KviDataBuffer * signal)
{
if(stream->size() < GSM_PACKED_FRAME_SIZE_IN_BYTES)return; // nothing to decode
-
+
unsigned char * ptr = stream->data();
-
+
// Gsm codec
int uFrames = stream->size() / GSM_PACKED_FRAME_SIZE_IN_BYTES;
int uTotalDataDecompressed = uFrames * GSM_PACKED_FRAME_SIZE_IN_BYTES;
int uSignalOffset = signal->size();
unsigned char * endPtr = ptr + (uTotalDataDecompressed);
-
+
signal->addSize(GSM_UNPACKED_FRAME_SIZE_IN_BYTES * uFrames);
-
+
while(ptr != endPtr)
{
// We don't check the return value here
@@ -134,12 +134,12 @@
}
stream->remove(uTotalDataDecompressed);
}
-
+
int KviDccVoiceGsmCodec::encodedFrameSize()
{
return GSM_PACKED_FRAME_SIZE_IN_BYTES;
}
-
+
int KviDccVoiceGsmCodec::decodedFrameSize()
{
return GSM_UNPACKED_FRAME_SIZE_IN_BYTES;
diff --git a/src/modules/dcc/marshal.cpp b/src/modules/dcc/marshal.cpp
index 3a2a098a6..499828f02 100644
--- a/src/modules/dcc/marshal.cpp
+++ b/src/modules/dcc/marshal.cpp
@@ -115,7 +115,7 @@ int KviDccMarshal::dccListen(const QString &ip,const QString &port,bool bUseTime
m_bOutgoing = false;
m_bUseTimeout = bUseTimeout;
-
+
if(m_pTimeoutTimer)
{
delete m_pTimeoutTimer;
diff --git a/src/modules/dcc/send.h b/src/modules/dcc/send.h
index 02520b37d..282cab123 100644
--- a/src/modules/dcc/send.h
+++ b/src/modules/dcc/send.h
@@ -192,10 +192,10 @@ private:
kvi_time_t m_tTransferEndTime;
// cached stats
unsigned long m_uTotalFileSize; // total file size to transfer
-
+
unsigned int m_uMaxBandwidth;
KviDccFileTransferBandwidthDialog * m_pBandwidthDialog;
-
+
QTimer * m_pResumeTimer; // used to signal resume timeout
public:
bool resumeAccepted(const char * filename,const char * port,const char *szZeroPortTag);
@@ -221,12 +221,12 @@ public:
virtual bool active();
virtual QString tipText();
virtual QString localFileName();
-
+
bool isFileUpload(){ return m_pDescriptor->isFileUpload(); };
unsigned int averageSpeed();
unsigned int transferredBytes();
-
+
int bandwidthLimit();
void setBandwidthLimit(int iVal);
protected:
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-08-08 09:17:55 +0000