summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/jabber/jingle/libjingle/talk
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/protocols/jabber/jingle/libjingle/talk')
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc6
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/base/task.h8
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.h2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.h2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/session/phone/mediaengine.h2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/session/receiver.h4
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/session/sessionsendtask.h4
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/alsacard.c8
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/alsacard.h2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/g711common.h16
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/hpuxsndcard.c4
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/jackcard.h2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssdlout.h2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexdec.h4
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexenc.h4
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msv4l.h2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/osscard.h2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/portaudiocard.h2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/ortp.c2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.h2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.c6
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.h10
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.c26
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.h10
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.h6
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc6
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h4
28 files changed, 75 insertions, 75 deletions
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc
index 09655472..6d85cb0d 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc
@@ -32,9 +32,9 @@
namespace buzz {
-Task::Task(Task * tqparent) :
+Task::Task(Task * parent) :
state_(STATE_INIT),
- parent_(tqparent),
+ parent_(parent),
blocked_(false),
done_(false),
aborted_(false),
@@ -42,7 +42,7 @@ Task::Task(Task * tqparent) :
error_(false),
child_error_(false),
start_time_(0) {
- runner_ = ((tqparent == NULL) ? (TaskRunner *)this : tqparent->GetRunner());
+ runner_ = ((parent == NULL) ? (TaskRunner *)this : parent->GetRunner());
if (parent_ != NULL) {
parent_->AddChild(this);
}
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h
index c583bda8..7140b691 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h
@@ -61,12 +61,12 @@
// might be working on something as you send it infomration, you may want
// to have a queue in the task.
//
-// (3) Finally it helps manage tqparent tasks and tqchildren. If a tqparent
+// (3) Finally it helps manage parent tasks and tqchildren. If a parent
// task gets aborted, all the tqchildren tasks are too. The nice thing
-// about this, for example, is if you have one tqparent task that
+// about this, for example, is if you have one parent task that
// represents, say, and Xmpp connection, then you can spawn a whole bunch
// of infinite lifetime child tasks and now worry about cleaning them up.
-// When the tqparent task goes to STATE_DONE, the task engine will make
+// When the parent task goes to STATE_DONE, the task engine will make
// sure all those tqchildren are aborted and get deleted.
//
// Notice that Task has a few built-in states, e.g.,
@@ -103,7 +103,7 @@ class RootTask;
class Task {
public:
- Task(Task * tqparent);
+ Task(Task * parent);
virtual ~Task() {}
void Start();
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.h b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.h
index 7307a522..47660514 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.h
@@ -28,7 +28,7 @@ namespace buzz {
class PresenceOutTask : public XmppTask {
public:
- PresenceOutTask(Task * tqparent) : XmppTask(tqparent) {}
+ PresenceOutTask(Task * parent) : XmppTask(parent) {}
virtual ~PresenceOutTask() {}
XmppReturntqStatus Send(const tqStatus & s);
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.h b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.h
index 2ed5ac46..06c68015 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.h
@@ -30,7 +30,7 @@ namespace buzz {
class PresencePushTask : public XmppTask {
public:
- PresencePushTask(Task * tqparent) : XmppTask(tqparent, XmppEngine::HL_TYPE) {}
+ PresencePushTask(Task * parent) : XmppTask(parent, XmppEngine::HL_TYPE) {}
virtual int ProcessStart();
sigslot::signal1<const tqStatus &>SignalStatusUpdate;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/mediaengine.h b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/mediaengine.h
index fe6f0f6c..fa07d2ec 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/mediaengine.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/mediaengine.h
@@ -50,7 +50,7 @@ class MediaEngine {
bool operator <(const Codec& c) const { return preference > c.preference; }
};
- // Bittqmask flags for options that may be supported by the media engine implementation
+ // Bitmask flags for options that may be supported by the media engine implementation
enum MediaEngineOptions {
AUTO_GAIN_CONTROL = 1 << 1,
};
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/receiver.h b/kopete/protocols/jabber/jingle/libjingle/talk/session/receiver.h
index 5b75af3c..a5326893 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/session/receiver.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/receiver.h
@@ -36,8 +36,8 @@ namespace cricket {
class Receiver : public buzz::XmppTask {
public:
- Receiver(Task *tqparent, SessionClient *session_client)
- : buzz::XmppTask(tqparent, buzz::XmppEngine::HL_TYPE) {
+ Receiver(Task *parent, SessionClient *session_client)
+ : buzz::XmppTask(parent, buzz::XmppEngine::HL_TYPE) {
session_client_ = session_client;
}
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/sessionsendtask.h b/kopete/protocols/jabber/jingle/libjingle/talk/session/sessionsendtask.h
index 5f67d58b..57564ad0 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/session/sessionsendtask.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/sessionsendtask.h
@@ -45,8 +45,8 @@ namespace cricket {
// session_client is guaranteed to outlive the xmpp session.
class SessionSendTask : public buzz::XmppTask {
public:
- SessionSendTask(Task *tqparent, SessionClient *session_client)
- : buzz::XmppTask(tqparent, buzz::XmppEngine::HL_SINGLE),
+ SessionSendTask(Task *parent, SessionClient *session_client)
+ : buzz::XmppTask(parent, buzz::XmppEngine::HL_SINGLE),
session_client_(session_client),
timed_out_(false) {
}
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/alsacard.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/alsacard.c
index 6d8868d6..24cc5a3f 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/alsacard.c
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/alsacard.c
@@ -279,7 +279,7 @@ int __alsa_card_read(AlsaCard *obj,char *buf,int bsize)
sigset_t set;
sigemptyset(&set);
sigaddset(&set,SIGALRM);
- sigproctqmask(SIG_BLOCK,&set,NULL);
+ sigprocmask(SIG_BLOCK,&set,NULL);
err=snd_pcm_readi(obj->read_handle,buf,bsize/obj->frame_size);
if (err<0) {
if (err!=-EPIPE){
@@ -289,7 +289,7 @@ int __alsa_card_read(AlsaCard *obj,char *buf,int bsize)
err=snd_pcm_readi(obj->read_handle,buf,bsize/obj->frame_size);
if (err<0) g_warning("alsa_card_read: snd_pcm_readi() failed:%s.",snd_strerror(err));
}
- sigproctqmask(SIG_UNBLOCK,&set,NULL);
+ sigprocmask(SIG_UNBLOCK,&set,NULL);
return err*obj->frame_size;
}
@@ -322,7 +322,7 @@ int __alsa_card_write(AlsaCard *obj,char *buf,int size)
sigset_t set;
sigemptyset(&set);
sigaddset(&set,SIGALRM);
- sigproctqmask(SIG_BLOCK,&set,NULL);
+ sigprocmask(SIG_BLOCK,&set,NULL);
if ((err=snd_pcm_writei(obj->write_handle,buf,size/obj->frame_size))<0){
if (err!=-EPIPE){
g_warning("alsa_card_write: snd_pcm_writei() failed:%s.",snd_strerror(err));
@@ -332,7 +332,7 @@ int __alsa_card_write(AlsaCard *obj,char *buf,int size)
if (err<0) g_warning("alsa_card_write: Error writing sound buffer (size=%i):%s",size,snd_strerror(err));
}
- sigproctqmask(SIG_UNBLOCK,&set,NULL);
+ sigprocmask(SIG_UNBLOCK,&set,NULL);
return err;
}
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/alsacard.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/alsacard.h
index 9ee33ef4..1d7ba3a0 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/alsacard.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/alsacard.h
@@ -27,7 +27,7 @@
#include <alsa/asoundlib.h>
struct _AlsaCard
{
- SndCard tqparent;
+ SndCard parent;
gchar *pcmdev;
gchar *mixdev;
snd_pcm_t *read_handle;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/g711common.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/g711common.h
index 30128191..3f5ad16f 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/g711common.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/g711common.h
@@ -44,14 +44,14 @@ static inline int val_seg(int val)
static inline unsigned char s16_to_alaw(int pcm_val)
{
- int tqmask;
+ int mask;
int seg;
unsigned char aval;
if (pcm_val >= 0) {
- tqmask = 0xD5;
+ mask = 0xD5;
} else {
- tqmask = 0x55;
+ mask = 0x55;
pcm_val = -pcm_val;
if (pcm_val > 0x7fff)
pcm_val = 0x7fff;
@@ -64,7 +64,7 @@ static inline unsigned char s16_to_alaw(int pcm_val)
seg = val_seg(pcm_val);
aval = (seg << 4) | ((pcm_val >> (seg + 3)) & 0x0f);
}
- return aval ^ tqmask;
+ return aval ^ mask;
}
/*
@@ -119,16 +119,16 @@ static inline int alaw_to_s16(unsigned char a_val)
static inline unsigned char s16_to_ulaw(int pcm_val) /* 2's complement (16-bit range) */
{
- int tqmask;
+ int mask;
int seg;
unsigned char uval;
if (pcm_val < 0) {
pcm_val = 0x84 - pcm_val;
- tqmask = 0x7f;
+ mask = 0x7f;
} else {
pcm_val += 0x84;
- tqmask = 0xff;
+ mask = 0xff;
}
if (pcm_val > 0x7fff)
pcm_val = 0x7fff;
@@ -141,7 +141,7 @@ static inline unsigned char s16_to_ulaw(int pcm_val) /* 2's complement (16-bit r
* and complement the code word.
*/
uval = (seg << 4) | ((pcm_val >> (seg + 3)) & 0x0f);
- return uval ^ tqmask;
+ return uval ^ mask;
}
/*
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/hpuxsndcard.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/hpuxsndcard.c
index fe98df74..8a636c99 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/hpuxsndcard.c
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/hpuxsndcard.c
@@ -194,7 +194,7 @@ void hpux_snd_card_set_level(HpuxSndCard *obj,gint way,gint a)
g_warning("hpux_snd_card_set_level: unsupported command.");
return;
}
- gain.channel_tqmask=AUDIO_CHANNEL_RIGHT|AUDIO_CHANNEL_LEFT;
+ gain.channel_mask=AUDIO_CHANNEL_RIGHT|AUDIO_CHANNEL_LEFT;
mix_fd = open(obj->mixdev_name, O_WRONLY);
g_return_if_fail(mix_fd>0);
error=ioctl(mix_fd,AUDIO_SET_GAINS,&gain);
@@ -210,7 +210,7 @@ gint hpux_snd_card_get_level(HpuxSndCard *obj,gint way)
int p=0,mix_fd,error;
g_return_if_fail(obj->mixdev_name!=NULL);
- gain.channel_tqmask=AUDIO_CHANNEL_RIGHT|AUDIO_CHANNEL_LEFT;
+ gain.channel_mask=AUDIO_CHANNEL_RIGHT|AUDIO_CHANNEL_LEFT;
mix_fd = open(obj->mixdev_name, O_RDONLY);
g_return_if_fail(mix_fd>0);
error=ioctl(mix_fd,AUDIO_GET_GAINS,&gain);
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/jackcard.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/jackcard.h
index ae6f1c7c..0118e035 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/jackcard.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/jackcard.h
@@ -54,7 +54,7 @@ typedef struct {
struct _JackCard
{
- SndCard tqparent;
+ SndCard parent;
jack_client_t *client;
gboolean jack_running;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssdlout.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssdlout.h
index 9c7d5ab3..0ce08618 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssdlout.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssdlout.h
@@ -36,7 +36,7 @@
struct _MSSdlOut
{
- MSFilter tqparent;
+ MSFilter parent;
MSQueue *input[2];
gint width,height;
const gchar *format;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexdec.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexdec.h
index 9c7f7fc4..370af69e 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexdec.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexdec.h
@@ -27,7 +27,7 @@
struct _MSSpeexDec
{
- MSFilter tqparent;
+ MSFilter parent;
MSQueue *inq[1]; /* speex has an input q because it can be variable bit rate */
MSFifo *outf[1];
void *speex_state;
@@ -42,7 +42,7 @@ typedef struct _MSSpeexDec MSSpeexDec;
struct _MSSpeexDecClass
{
- MSFilterClass tqparent;
+ MSFilterClass parent;
};
typedef struct _MSSpeexDecClass MSSpeexDecClass;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexenc.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexenc.h
index 2325ba23..f63edfcd 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexenc.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexenc.h
@@ -27,7 +27,7 @@
struct _MSSpeexEnc
{
- MSFilter tqparent;
+ MSFilter parent;
MSFifo *inf[1];
MSQueue *outq[1]; /* speex has an output q because it can be variable bit rate */
void *speex_state;
@@ -42,7 +42,7 @@ typedef struct _MSSpeexEnc MSSpeexEnc;
struct _MSSpeexEncClass
{
- MSFilterClass tqparent;
+ MSFilterClass parent;
};
typedef struct _MSSpeexEncClass MSSpeexEncClass;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msv4l.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msv4l.h
index 950187b8..3dc5ee04 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msv4l.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msv4l.h
@@ -27,7 +27,7 @@
struct _MSV4l
{
- MSVideoSource tqparent;
+ MSVideoSource parent;
int fd;
char *device;
struct video_capability cap;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/osscard.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/osscard.h
index 6413c682..0f1e09ab 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/osscard.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/osscard.h
@@ -27,7 +27,7 @@
#define OSS_CARD_BUFFERS 3
struct _OssCard
{
- SndCard tqparent;
+ SndCard parent;
gchar *dev_name; /* /dev/dsp0 for example */
gchar *mixdev_name; /* /dev/mixer0 for example */
gint fd; /* the file descriptor of the open soundcard, 0 if not open*/
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/portaudiocard.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/portaudiocard.h
index caf906df..2ffc6cd1 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/portaudiocard.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/portaudiocard.h
@@ -24,7 +24,7 @@
typedef struct _PortAudioCard
{
- SndCard tqparent;
+ SndCard parent;
PortAudioStream* stream;
char *out_buffer, *out_buffer_read, *out_buffer_write, *out_buffer_end;
char *in_buffer, *in_buffer_read, *in_buffer_write, *in_buffer_end;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/ortp.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/ortp.c
index 1ac35d9c..80e07682 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/ortp.c
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/ortp.c
@@ -101,7 +101,7 @@ void ortp_scheduler_init()
sigset_t set;
sigemptyset(&set);
sigaddset(&set,SIGALRM);
- sigproctqmask(SIG_BLOCK,&set,NULL);
+ sigprocmask(SIG_BLOCK,&set,NULL);
#endif /* __hpux */
if (!g_thread_supported()) g_thread_init(NULL);
__ortp_scheduler=rtp_scheduler_new();
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.h
index 7518e075..e7702000 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.h
@@ -177,7 +177,7 @@ struct _RtpSession
RtpSessionMode mode;
struct _RtpScheduler *sched;
guint32 flags;
- gint mask_pos; /* the position in the scheduler tqmask of RtpSession */
+ gint mask_pos; /* the position in the scheduler mask of RtpSession */
gpointer user_data;
/* telephony events extension */
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.c
index bee787a2..17ff6748 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.c
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.c
@@ -148,7 +148,7 @@ gpointer rtp_scheduler_schedule(gpointer psched)
g_mutex_unlock(sched->lock);
/* now while the scheduler is going to sleep, the other threads can compute their
- result tqmask and see if they have to leave, or to wait for next tick*/
+ result mask and see if they have to leave, or to wait for next tick*/
//g_message("scheduler: sleeping.");
timer->timer_do();
sched->time_+=sched->timer_inc;
@@ -174,7 +174,7 @@ void rtp_scheduler_add_session(RtpScheduler *sched, RtpSession *session)
if (sched->max_sessions==0){
g_error("rtp_scheduler_add_session: max_session=0 !");
}
- /* find a free pos in the session tqmask*/
+ /* find a free pos in the session mask*/
for (i=0;i<sched->max_sessions;i++){
if (!ORTP_FD_ISSET(i,&sched->all_sessions.rtpset)){
session->mask_pos=i;
@@ -229,7 +229,7 @@ void rtp_scheduler_remove_session(RtpScheduler *sched, RtpSession *session)
}
}
rtp_session_unset_flag(session,RTP_SESSION_IN_SCHEDULER);
- /* delete the bit in the tqmask */
+ /* delete the bit in the mask */
session_set_clr(&sched->all_sessions,session);
rtp_scheduler_unlock(sched);
}
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.h
index 4dcd9afb..91cde6a9 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.h
@@ -29,13 +29,13 @@
struct _RtpScheduler {
RtpSession *list; /* list of scheduled sessions*/
- SessionSet all_sessions; /* tqmask of scheduled sessions */
- gint all_max; /* the highest pos in the all tqmask */
- SessionSet r_sessions; /* tqmask of sessions that have a recv event */
+ SessionSet all_sessions; /* mask of scheduled sessions */
+ gint all_max; /* the highest pos in the all mask */
+ SessionSet r_sessions; /* mask of sessions that have a recv event */
gint r_max;
- SessionSet w_sessions; /* tqmask of sessions that have a send event */
+ SessionSet w_sessions; /* mask of sessions that have a send event */
gint w_max;
- SessionSet e_sessions; /* tqmask of session that have error event */
+ SessionSet e_sessions; /* mask of session that have error event */
gint e_max;
gint max_sessions; /* the number of position in the masks */
/* GMutex *unblock_select_mutex; */
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.c
index 36856a99..7b5ad921 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.c
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.c
@@ -60,27 +60,27 @@ void session_set_destroy(SessionSet *set)
gint session_set_and(SessionSet *sched_set, gint maxs, SessionSet *user_set, SessionSet *result_set)
{
- guint32 *tqmask1,*tqmask2,*tqmask3;
+ guint32 *mask1,*mask2,*mask3;
gint i=0;
gint j,ret=0;
- tqmask1=(guint32*)&sched_set->rtpset;
- tqmask2=(guint32*)&user_set->rtpset;
- tqmask3=(guint32*)&result_set->rtpset;
+ mask1=(guint32*)&sched_set->rtpset;
+ mask2=(guint32*)&user_set->rtpset;
+ mask3=(guint32*)&result_set->rtpset;
while(i<maxs+1){
- *tqmask3=(*tqmask1) & (*tqmask2); /* computes the AND between the two masks*/
+ *mask3=(*mask1) & (*mask2); /* computes the AND between the two masks*/
/* and unset the sessions that have been found from the sched_set */
- *tqmask1=(*tqmask1) & (~(*tqmask3));
- if ((*tqmask3)!=0){
+ *mask1=(*mask1) & (~(*mask3));
+ if ((*mask3)!=0){
for (j=0;j<32;j++){
- if ( ((*tqmask3)>>j) & 1){
+ if ( ((*mask3)>>j) & 1){
ret++;
}
}
}
i+=32;
- tqmask1++;
- tqmask2++;
- tqmask3++;
+ mask1++;
+ mask2++;
+ mask3++;
}
//printf("session_set_and: ret=%i\n",ret);
return ret;
@@ -120,8 +120,8 @@ int session_set_select(SessionSet *recvs, SessionSet *sends, SessionSet *errors)
rtp_scheduler_lock(sched);
while(1){
- /* computes the SessionSet intersection (in the other words tqmask intersection) between
- the tqmask given by the user and scheduler masks */
+ /* computes the SessionSet intersection (in the other words mask intersection) between
+ the mask given by the user and scheduler masks */
if (recvs!=NULL){
bits=session_set_and(&sched->r_sessions,sched->all_max,recvs,&temp);
if (bits>0){
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.h
index 8d166222..623b9d10 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.h
@@ -45,7 +45,7 @@ typedef fd_set ortp_fd_set;
do { \
unsigned int __i; \
ortp_fd_set *__arr = (s); \
- for (__i = 0; __i < sizeof (ortp_fd_set) / sizeof (ortp__fd_tqmask); ++__i) \
+ for (__i = 0; __i < sizeof (ortp_fd_set) / sizeof (ortp__fd_mask); ++__i) \
ORTP__FDS_BITS (__arr)[__i] = 0; \
} while (0)
#define ORTP_FD_SET(d, s) (ORTP__FDS_BITS (s)[ORTP__FDELT(d)] |= ORTP__FDMASK(d))
@@ -55,22 +55,22 @@ typedef fd_set ortp_fd_set;
/* The fd_set member is required to be an array of longs. */
-typedef long int ortp__fd_tqmask;
+typedef long int ortp__fd_mask;
/* Number of bits per word of `fd_set' (some code assumes this is 32). */
#define ORTP__FD_SETSIZE 1024
/* It's easier to assume 8-bit bytes than to get CHAR_BIT. */
-#define ORTP__NFDBITS (8 * sizeof (ortp__fd_tqmask))
+#define ORTP__NFDBITS (8 * sizeof (ortp__fd_mask))
#define ORTP__FDELT(d) ((d) / ORTP__NFDBITS)
-#define ORTP__FDMASK(d) ((ortp__fd_tqmask) 1 << ((d) % ORTP__NFDBITS))
+#define ORTP__FDMASK(d) ((ortp__fd_mask) 1 << ((d) % ORTP__NFDBITS))
/* fd_set for select and pselect. */
typedef struct
{
- ortp__fd_tqmask fds_bits[ORTP__FD_SETSIZE / ORTP__NFDBITS];
+ ortp__fd_mask fds_bits[ORTP__FD_SETSIZE / ORTP__NFDBITS];
# define ORTP__FDS_BITS(set) ((set)->fds_bits)
} ortp_fd_set;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc
index f5b9d0b4..fa6a14a6 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc
@@ -245,7 +245,7 @@ XmppClient::Disconnect() {
return XMPP_RETURN_OK;
}
-XmppClient::XmppClient(Task * tqparent) : Task(tqparent),
+XmppClient::XmppClient(Task * parent) : Task(parent),
delivering_signal_(false) {
d_.reset(new Private(this));
}
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.h
index 540d774d..fd65c39c 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.h
@@ -51,9 +51,9 @@ class CaptchaChallenge;
//
/////////////////////////////////////////////////////////////////////
//
-// See Task first. XmppClient is a tqparent task for XmppTasks.
+// See Task first. XmppClient is a parent task for XmppTasks.
//
-// XmppClient is a task which is designed to be the tqparent task for
+// XmppClient is a task which is designed to be the parent task for
// all tasks that depend on a single Xmpp connection. If you want to,
// for example, listen for subscription requests forever, then your
// listener should be a task that is a child of the XmppClient that owns
@@ -71,7 +71,7 @@ class CaptchaChallenge;
class XmppClient : public Task, public sigslot::has_slots<>
{
public:
- XmppClient(Task * tqparent);
+ XmppClient(Task * parent);
~XmppClient();
XmppReturntqStatus Connect(const XmppClientSettings & settings,
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc
index 38ed1994..e7ac0e04 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc
@@ -32,9 +32,9 @@
namespace buzz {
-XmppTask::XmppTask(Task * tqparent, XmppEngine::HandlerLevel level)
- : Task(tqparent), client_(NULL) {
- XmppClient * client = (XmppClient*)tqparent->GetParent(XMPP_CLIENT_TASK_CODE);
+XmppTask::XmppTask(Task * parent, XmppEngine::HandlerLevel level)
+ : Task(parent), client_(NULL) {
+ XmppClient * client = (XmppClient*)parent->GetParent(XMPP_CLIENT_TASK_CODE);
client_ = client;
id_ = client->NextId();
client->AddXmppTask(this, level);
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h
index d84019a2..a1ed3dd3 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h
@@ -45,7 +45,7 @@ namespace buzz {
// See Task and XmppClient first.
//
// XmppTask is a task that is designed to go underneath XmppClient and be
-// useful there. It has a way of finding its XmppClient tqparent so you
+// useful there. It has a way of finding its XmppClient parent so you
// can have it nested arbitrarily deep under an XmppClient and it can
// still find the XMPP services.
//
@@ -69,7 +69,7 @@ class XmppTask :
public sigslot::has_slots<>
{
public:
- XmppTask(Task * tqparent, XmppEngine::HandlerLevel level = XmppEngine::HL_NONE);
+ XmppTask(Task * parent, XmppEngine::HandlerLevel level = XmppEngine::HL_NONE);
virtual ~XmppTask();
virtual XmppClient * GetClient() const { return client_; }