aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/dcc
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules/dcc')
-rw-r--r--src/modules/dcc/broker.cpp2
-rw-r--r--src/modules/dcc/canvaswidget.h10
-rw-r--r--src/modules/dcc/chat.h4
-rw-r--r--src/modules/dcc/descriptor.h2
-rw-r--r--src/modules/dcc/dialogs.cpp4
-rw-r--r--src/modules/dcc/dialogs.h4
-rw-r--r--src/modules/dcc/libkvidcc.cpp12
-rw-r--r--src/modules/dcc/marshal.cpp2
-rw-r--r--src/modules/dcc/requests.cpp4
-rw-r--r--src/modules/dcc/send.h2
-rw-r--r--src/modules/dcc/voice.cpp8
-rw-r--r--src/modules/dcc/window.h2
12 files changed, 28 insertions, 28 deletions
diff --git a/src/modules/dcc/broker.cpp b/src/modules/dcc/broker.cpp
index ff3b27dc3..9d3216127 100644
--- a/src/modules/dcc/broker.cpp
+++ b/src/modules/dcc/broker.cpp
@@ -245,7 +245,7 @@ void KviDccBroker::rsendExecute(KviDccDescriptor * dcc)
szTag = dcc->szFileName;
}
- // now add a file offer , so he we will accept it automatically
+ // now add a file offer, so he we will accept it automatically
// 120 secs is a reasonable timeout
QString szMask = dcc->szNick;
szMask += "!*@*";
diff --git a/src/modules/dcc/canvaswidget.h b/src/modules/dcc/canvaswidget.h
index 84eee1c41..5616e1729 100644
--- a/src/modules/dcc/canvaswidget.h
+++ b/src/modules/dcc/canvaswidget.h
@@ -194,15 +194,15 @@
KviCanvasView(QCanvas * c,KviCanvasWidget * cw,QWidget * par);
~KviCanvasView();
public:
- enum State { Idle , SelectOrigin };
+ enum State { Idle, SelectOrigin };
enum ObjectType {
- Rectangle , RichText , Line , Ellipse , Chord , Pie ,
- PolygonTriangle , PolygonRectangle , PolygonPentagon ,
+ Rectangle, RichText, Line, Ellipse, Chord, Pie,
+ PolygonTriangle, PolygonRectangle, PolygonPentagon,
PolygonHexagon
};
enum DragMode {
- None , All , Left , Right , Top , Bottom , LeftTop , RightTop ,
- LeftBottom , RightBottom , Scale , SinglePoint , Rotate
+ None, All, Left, Right, Top, Bottom, LeftTop, RightTop,
+ LeftBottom, RightBottom, Scale, SinglePoint, Rotate
};
protected:
KviCanvasWidget * m_pCanvasWidget;
diff --git a/src/modules/dcc/chat.h b/src/modules/dcc/chat.h
index b0d569a51..8d5fdde7c 100644
--- a/src/modules/dcc/chat.h
+++ b/src/modules/dcc/chat.h
@@ -53,8 +53,8 @@ protected:
bool tryFlushOutBuffers();
// This should handle the incoming data buffer
// must "eat" some data from data.buffer, memmove the remaining part
- // to the beginning , kvi_realloc data.buffer and update data.iLen
- // If bCritical is true , it should handle the whole data buffer
+ // to the beginning, kvi_realloc data.buffer and update data.iLen
+ // If bCritical is true, it should handle the whole data buffer
// since the thread is going to die
// It should return true if the handing was succesfull
// or false if the thread should be stopped
diff --git a/src/modules/dcc/descriptor.h b/src/modules/dcc/descriptor.h
index 4d1ea6661..d799c8658 100644
--- a/src/modules/dcc/descriptor.h
+++ b/src/modules/dcc/descriptor.h
@@ -76,7 +76,7 @@ private:
void copyFrom(const KviDccDescriptor &src);
public:
// Generic parameters
- QString szType; // DCC protocol : CHAT , SCHAT , SEND , TSSEND....
+ QString szType; // DCC protocol : CHAT, SCHAT, SEND, TSSEND....
bool bActive; // active or passive connection ?
diff --git a/src/modules/dcc/dialogs.cpp b/src/modules/dcc/dialogs.cpp
index d6b0b073e..bee5618d5 100644
--- a/src/modules/dcc/dialogs.cpp
+++ b/src/modules/dcc/dialogs.cpp
@@ -57,7 +57,7 @@ void KviDccBox::forgetDescriptor()
}
KviDccAcceptBox::KviDccAcceptBox(KviDccBroker * br,KviDccDescriptor * dcc,const QString &text,const QString &capt)
-: QWidget(0) , KviDccBox(br,dcc)
+: QWidget(0), KviDccBox(br,dcc)
{
setObjectName("dcc_accept_box");
//QVBoxLayout * vb = new QVBoxLayout(this,4,4);
@@ -126,7 +126,7 @@ void KviDccAcceptBox::showEvent(QShowEvent *e)
KviDccRenameBox::KviDccRenameBox(KviDccBroker * br,KviDccDescriptor * dcc,const QString &text,bool bDisableResume)
-: QWidget(0) , KviDccBox(br,dcc)
+: QWidget(0), KviDccBox(br,dcc)
{
setObjectName("dcc_rename_box");
//QVBoxLayout * vb = new QVBoxLayout(this,4,4);
diff --git a/src/modules/dcc/dialogs.h b/src/modules/dcc/dialogs.h
index 1074fa656..06e314fde 100644
--- a/src/modules/dcc/dialogs.h
+++ b/src/modules/dcc/dialogs.h
@@ -43,7 +43,7 @@ public:
};
-class KviDccAcceptBox : public QWidget , public KviDccBox
+class KviDccAcceptBox : public QWidget, public KviDccBox
{
Q_OBJECT
public:
@@ -60,7 +60,7 @@ signals:
void rejected(KviDccBox *,KviDccDescriptor *);
};
-class KviDccRenameBox : public QWidget , public KviDccBox
+class KviDccRenameBox : public QWidget, public KviDccBox
{
Q_OBJECT
public:
diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp
index 2079f8614..7f0b94220 100644
--- a/src/modules/dcc/libkvidcc.cpp
+++ b/src/modules/dcc/libkvidcc.cpp
@@ -85,7 +85,7 @@ static bool dcc_kvs_parse_default_parameters(KviDccDescriptor * d,KviKvsModuleCo
if(!d->console())
{
- // We don't need a console with -c and -n , otherwise we need it
+ // We don't need a console with -c and -n, otherwise we need it
if(!(c->switches()->find('c',"connect") || c->switches()->find('n',"no-ctcp")))
{
delete d;
@@ -98,14 +98,14 @@ static bool dcc_kvs_parse_default_parameters(KviDccDescriptor * d,KviKvsModuleCo
if(!d->console()->isConnected())
{
- // We don't need a connection with -c and -n , otherwise we need it
+ // We don't need a connection with -c and -n, otherwise we need it
if(!(c->switches()->find('c',"connect") || c->switches()->find('n',"no-ctcp")))
{
delete d;
c->error(__tr2qs_ctx("You're not connected to a server (an active connection is required unless -c or -n are passed)","dcc"));
return false;
} else {
- // -c or -n , grab a local nick from somewhere
+ // -c or -n, grab a local nick from somewhere
d->szLocalNick = KVI_OPTION_STRING(KviOption_stringNickname1).trimmed();
if(d->szLocalNick.isEmpty())d->szLocalNick = KVI_DEFAULT_NICKNAME1;
d->szLocalUser = __tr2qs_ctx("unknown","dcc"); // we can live without it
@@ -1279,7 +1279,7 @@ static bool dcc_module_cmd_canvas(KviModule *m,KviCommand *c)
if(!d->console())
{
- // We don't need a console with -c and -n , otherwise we need it
+ // We don't need a console with -c and -n, otherwise we need it
if(!(c->hasSwitch('c') || c->hasSwitch('n')))return c->noIrcContext();
else d->console() = c->window()->frame()->firstConsole();
}
@@ -1288,10 +1288,10 @@ static bool dcc_module_cmd_canvas(KviModule *m,KviCommand *c)
if(!d->console()->isConnected())
{
- // We don't need a connection with -c and -n , otherwise we need it
+ // We don't need a connection with -c and -n, otherwise we need it
if(!(c->hasSwitch('c') || c->hasSwitch('n')))return c->notConnectedToServer();
else {
- // -c or -n , grab a local nick from somewhere
+ // -c or -n, grab a local nick from somewhere
d->szLocalNick = KVI_OPTION_STRING(KviOption_stringNickname1).trimmed();
if(d->szLocalNick.isEmpty())d->szLocalNick = KVI_DEFAULT_NICKNAME1;
d->szLocalUser = __tr("unknown"); // we can live without it
diff --git a/src/modules/dcc/marshal.cpp b/src/modules/dcc/marshal.cpp
index ccbdc36c9..6f2327c44 100644
--- a/src/modules/dcc/marshal.cpp
+++ b/src/modules/dcc/marshal.cpp
@@ -610,7 +610,7 @@ void KviDccMarshal::doSSLHandshake(int)
int err = kvi_socket_error();
if(kvi_socket_recoverableError(err))
{
- // can recover ? (EAGAIN , EINTR ?)
+ // can recover ? (EAGAIN, EINTR ?)
m_pSn = new QSocketNotifier((int)m_fd,QSocketNotifier::Write);
QObject::connect(m_pSn,SIGNAL(activated(int)),this,SLOT(doSSLHandshake(int)));
m_pSn->setEnabled(true);
diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp
index e4aad108d..37ae55525 100644
--- a/src/modules/dcc/requests.cpp
+++ b/src/modules/dcc/requests.cpp
@@ -887,7 +887,7 @@ static void dccModuleParseDccGet(KviDccRequest *dcc)
if(KVI_OPTION_BOOL(KviOption_boolCantAcceptIncomingDccConnections))
{
- // we have to use DCC RSEND , otherwise it will not work
+ // we have to use DCC RSEND, otherwise it will not work
KviStr szSubproto("RSEND");
szSubproto.prepend(szExtensions);
@@ -901,7 +901,7 @@ static void dccModuleParseDccGet(KviDccRequest *dcc)
// able to recognize the file.
// Here we add another temporary offer with the right filename.
- // now add a file offer , so he we will accept it automatically
+ // now add a file offer, so he we will accept it automatically
// 120 secs is a reasonable timeout
QString szMask;
dcc->ctcpMsg->pSource->mask(szMask,KviIrcMask::NickUserHost);
diff --git a/src/modules/dcc/send.h b/src/modules/dcc/send.h
index a05ea2d0b..e47884b6d 100644
--- a/src/modules/dcc/send.h
+++ b/src/modules/dcc/send.h
@@ -168,7 +168,7 @@ protected slots:
class KviDccFileTransfer : public KviFileTransfer, public KviDccMarshalOutputContext
{
- enum GeneralStatus { Connecting , Transferring , Success , Failure };
+ enum GeneralStatus { Connecting, Transferring, Success, Failure };
Q_OBJECT
public:
KviDccFileTransfer(KviDccDescriptor * dcc);
diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp
index 283ae4324..c46eb1f81 100644
--- a/src/modules/dcc/voice.cpp
+++ b/src/modules/dcc/voice.cpp
@@ -83,7 +83,7 @@ extern KviDccBroker * g_pDccBroker;
//#define KVI_AUDIO_DEVICE "/dev/dsp"
-// 32 fragments , 512 bytes
+// 32 fragments, 512 bytes
#define KVI_SNDCTL_FRAG_SIZE 0x00B00009
#define KVI_FRAGMENT_SIZE_IN_BYTES 512
#define KVI_FORMAT AFMT_S16_LE
@@ -391,7 +391,7 @@ bool KviDccVoiceThread::soundStep()
// m_uSleepTime += 100; // sleep for a while
//}
} else {
- // hmmmm....playing , but nothing to write , possible underrun or EOF
+ // hmmmm....playing, but nothing to write, possible underrun or EOF
// a nice idea would be to use SNDCTL_DSP_GETODELAY here...
// but it appears to be broken on some audio devices
if(ioctl(m_soundFd,SNDCTL_DSP_GETOSPACE,&info) < 0)info.fragstotal = info.fragments; // dummy...but what should we do ?
@@ -407,12 +407,12 @@ bool KviDccVoiceThread::soundStep()
{
if(m_inSignalBuffer.size() >= m_pOpt->iPreBufferSize)
{
- // yep...stuff to play... open the soundcard , if possible
+ // yep...stuff to play... open the soundcard, if possible
startPlaying();
m_iLastSignalBufferSize = m_inSignalBuffer.size();
} else {
- // have stuff to play , but it's not enough to fill the pre-buffer
+ // have stuff to play, but it's not enough to fill the pre-buffer
//
struct timeval tv;
gettimeofday(&tv,0);
diff --git a/src/modules/dcc/window.h b/src/modules/dcc/window.h
index 2b51d8c3c..0b85ced3d 100644
--- a/src/modules/dcc/window.h
+++ b/src/modules/dcc/window.h
@@ -30,7 +30,7 @@
#include "kvi_window.h"
class KviDccThread;
-class KviDccWindow : public KviWindow , public KviDccMarshalOutputContext
+class KviDccWindow : public KviWindow, public KviDccMarshalOutputContext
{
Q_OBJECT
public: