TDE
/
tdenetwork
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdenetwork
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix inadvertent "TQ" changes.

Browse Source
pull/1/head
Darrell Anderson 13 years ago
parent 2bc02dc6e2
commit 008eae43da
42 changed files with 133 additions and 133 deletions
Show Stats Download Patch File Download Diff File

4
dcoprss/query.h
Unescape View File

@ -1,6 +1,6 @@
/* $Id$ */ /* $Id$ */
#ifndef _TQUERY_SERVICE #ifndef _QUERY_SERVICE
#define _TQUERY_SERVICE #define _QUERY_SERVICE
/*************************************************************************** /***************************************************************************
query.h - A query interface to select RSS feeds. query.h - A query interface to select RSS feeds.

4
kdict/queryview.h
Unescape View File

@ -16,8 +16,8 @@
------------------------------------------------------------- */ ------------------------------------------------------------- */
#ifndef _TQUERYVIEW_H_ #ifndef _QUERYVIEW_H_
#define _TQUERYVIEW_H_ #define _QUERYVIEW_H_
#include <tqvbox.h> #include <tqvbox.h>
#include <khtml_part.h> #include <khtml_part.h>

10
kget/kmainwidget.cpp
Unescape View File

@ -1372,7 +1372,7 @@ void KMainWidget::checkQueue()
item = it.current(); item = it.current();
isRunning = (item->getStatus() == Transfer::ST_RUNNING) || ((item->getStatus() == Transfer::ST_TRYING)); isRunning = (item->getStatus() == Transfer::ST_RUNNING) || ((item->getStatus() == Transfer::ST_TRYING));
isQuequed = (item->getMode() == Transfer::MD_TQUEUED || item->getMode() == Transfer::MD_NEW); isQuequed = (item->getMode() == Transfer::MD_QUEUED || item->getMode() == Transfer::MD_NEW);
if (!isRunning && isQuequed && !ksettings.b_offline) if (!isRunning && isQuequed && !ksettings.b_offline)
{ {
@ -1446,7 +1446,7 @@ void KMainWidget::slotTransferTimeout()
for (; it.current(); ++it) { for (; it.current(); ++it) {
item = it.current(); item = it.current();
if (item->getMode() == Transfer::MD_SCHEDULED && item->getStartTime() <= TQDateTime::currentDateTime()) { if (item->getMode() == Transfer::MD_SCHEDULED && item->getStartTime() <= TQDateTime::currentDateTime()) {
item->setMode(Transfer::MD_TQUEUED); item->setMode(Transfer::MD_QUEUED);
flag = true; flag = true;
} }
} }
@ -1533,7 +1533,7 @@ void KMainWidget::slotStatusChanged(Transfer * item, int _operation)
case Transfer::OP_ABORTED: case Transfer::OP_ABORTED:
break; break;
case Transfer::OP_DELAYED: case Transfer::OP_DELAYED:
case Transfer::OP_TQUEUED: case Transfer::OP_QUEUED:
slotUpdateActions(); slotUpdateActions();
item->slotUpdateActions(); item->slotUpdateActions();
break; break;
@ -2082,9 +2082,9 @@ void KMainWidget::slotUpdateActions()
m_paDelay->setEnabled(true); m_paDelay->setEnabled(true);
switch (item->getMode()) { switch (item->getMode()) {
case Transfer::MD_TQUEUED: case Transfer::MD_QUEUED:
#ifdef _DEBUG #ifdef _DEBUG
sDebug << "....................THE MODE IS MD_TQUEUED " << item->getMode() << endl; sDebug << "....................THE MODE IS MD_QUEUED " << item->getMode() << endl;
#endif #endif
m_paQueue->setChecked(true); m_paQueue->setChecked(true);
break; break;

26
kget/transfer.cpp
Unescape View File

@ -218,7 +218,7 @@ void Transfer::slotUpdateActions()
m_paDelay->blockSignals(true); m_paDelay->blockSignals(true);
switch (mode) { switch (mode) {
case MD_TQUEUED: case MD_QUEUED:
m_paQueue->setChecked(true); m_paQueue->setChecked(true);
break; break;
case MD_SCHEDULED: case MD_SCHEDULED:
@ -323,7 +323,7 @@ bool Transfer::updateStatus(int counter)
isTransfer = true; isTransfer = true;
break; break;
case ST_STOPPED: case ST_STOPPED:
if(mode == MD_TQUEUED) if(mode == MD_QUEUED)
pix = &view->pixQueued; pix = &view->pixQueued;
else if(mode == MD_SCHEDULED) else if(mode == MD_SCHEDULED)
pix = &view->pixScheduled; pix = &view->pixScheduled;
@ -385,7 +385,7 @@ void Transfer::slotResume()
m_paResume->setEnabled(false); m_paResume->setEnabled(false);
status = ST_TRYING; status = ST_TRYING;
mode = MD_TQUEUED; mode = MD_QUEUED;
logMessage(i18n("Attempt number %1").arg(retryCount)); logMessage(i18n("Attempt number %1").arg(retryCount));
sDebug << "sending Resume to slave " << endl; sDebug << "sending Resume to slave " << endl;
@ -407,7 +407,7 @@ void Transfer::slotResume()
sDebug << "Killing Slave" << endl; sDebug << "Killing Slave" << endl;
slotSpeed(0); slotSpeed(0);
mode = MD_TQUEUED; mode = MD_QUEUED;
status=ST_STOPPED; status=ST_STOPPED;
m_paQueue->setChecked(true); m_paQueue->setChecked(true);
@ -492,11 +492,11 @@ void Transfer::slotQueue()
logMessage(i18n("Queueing")); logMessage(i18n("Queueing"));
assert(!(mode == MD_TQUEUED)); assert(!(mode == MD_QUEUED));
mode = MD_TQUEUED; mode = MD_QUEUED;
m_paQueue->setChecked(true); m_paQueue->setChecked(true);
emit statusChanged(this, OP_TQUEUED); emit statusChanged(this, OP_QUEUED);
sDebugOut << endl; sDebugOut << endl;
} }
@ -786,7 +786,7 @@ bool Transfer::read(KSimpleConfig * config, int id)
return false; return false;
} }
mode = (TransferMode) config->readNumEntry("Mode", MD_TQUEUED); mode = (TransferMode) config->readNumEntry("Mode", MD_QUEUED);
status = (TransferStatus) config->readNumEntry("Status", ST_RUNNING); status = (TransferStatus) config->readNumEntry("Status", ST_RUNNING);
startTime = config->readDateTimeEntry("ScheduledTime"); startTime = config->readDateTimeEntry("ScheduledTime");
canResume = config->readBoolEntry("CanResume", true); canResume = config->readBoolEntry("CanResume", true);
@ -862,8 +862,8 @@ void Transfer::slotExecBroken()
sDebugIn << endl; sDebugIn << endl;
status = ST_STOPPED; status = ST_STOPPED;
mode = MD_TQUEUED; mode = MD_QUEUED;
emit statusChanged(this, OP_TQUEUED); emit statusChanged(this, OP_QUEUED);
sDebugOut << endl; sDebugOut << endl;
} }
@ -897,8 +897,8 @@ void Transfer::slotExecConnected()
m_pSlave->Op(Slave::KILL); m_pSlave->Op(Slave::KILL);
if (ksettings.b_addQueued) if (ksettings.b_addQueued)
{ {
mode = MD_TQUEUED; mode = MD_QUEUED;
emit statusChanged(this, OP_TQUEUED); emit statusChanged(this, OP_QUEUED);
} }
else else
{ {
@ -1016,7 +1016,7 @@ void Transfer::NotInCache()
{ {
logMessage(i18n("checking if file is in cache...no")); logMessage(i18n("checking if file is in cache...no"));
if (ksettings.b_addQueued) if (ksettings.b_addQueued)
mode = MD_TQUEUED; mode = MD_QUEUED;
else else
mode = MD_DELAYED; mode = MD_DELAYED;
status = ST_STOPPED; status = ST_STOPPED;

4
kget/transfer.h
Unescape View File

@ -55,13 +55,13 @@ class Transfer:public TQObject, public KListViewItem
Q_OBJECT Q_OBJECT
public: public:
enum TransferMode { MD_TQUEUED, MD_DELAYED, MD_SCHEDULED, MD_NONE, MD_NEW }; enum TransferMode { MD_QUEUED, MD_DELAYED, MD_SCHEDULED, MD_NONE, MD_NEW };
enum TransferStatus { ST_TRYING, ST_RUNNING, ST_STOPPED, ST_FINISHED }; enum TransferStatus { ST_TRYING, ST_RUNNING, ST_STOPPED, ST_FINISHED };
enum TransferOperation { enum TransferOperation {
OP_FINISHED, OP_RESUMED, OP_PAUSED, OP_REMOVED, OP_ABORTED, OP_FINISHED, OP_RESUMED, OP_PAUSED, OP_REMOVED, OP_ABORTED,
OP_TQUEUED, OP_SCHEDULED, OP_DELAYED, OP_CONNECTED OP_QUEUED, OP_SCHEDULED, OP_DELAYED, OP_CONNECTED
}; };

2
kget/transferlist.cpp
Unescape View File

@ -202,7 +202,7 @@ bool TransferList::areTransfersQueuedOrScheduled()
if (childCount() > 0) { if (childCount() > 0) {
for (; it.current(); ++it) { for (; it.current(); ++it) {
if ((it.current()->getMode() == Transfer::MD_TQUEUED)|| \ if ((it.current()->getMode() == Transfer::MD_QUEUED)|| \
(it.current()->getMode() == Transfer::MD_SCHEDULED)) (it.current()->getMode() == Transfer::MD_SCHEDULED))
return true; return true;
} }

6
kopete/kopete/chatwindow/chatmessagepart.cpp
Unescape View File

@ -88,7 +88,7 @@
#if !(KDE_IS_VERSION(3,3,90)) #if !(KDE_IS_VERSION(3,3,90))
//From tdelibs/khtml/misc/htmltags.h //From tdelibs/khtml/misc/htmltags.h
// used in ChatMessagePart::copy() // used in ChatMessagePart::copy()
#define ID_BLOCKTQUOTE 12 #define ID_BLOCKQUOTE 12
#define ID_BR 14 #define ID_BR 14
#define ID_DD 22 #define ID_DD 22
#define ID_DIV 26 #define ID_DIV 26
@ -872,7 +872,7 @@ void ChatMessagePart::copy(bool justselection /* default false */)
case ID_TD: case ID_TH: case ID_HR: case ID_TD: case ID_TH: case ID_HR:
case ID_OL: case ID_UL: case ID_LI: case ID_OL: case ID_UL: case ID_LI:
case ID_DD: case ID_DL: case ID_DT: case ID_DD: case ID_DL: case ID_DT:
case ID_PRE: case ID_BLOCKTQUOTE: case ID_DIV: case ID_PRE: case ID_BLOCKQUOTE: case ID_DIV:
if (!hasNewLine) if (!hasNewLine)
text += "\n"; text += "\n";
hasNewLine = true; hasNewLine = true;
@ -902,7 +902,7 @@ void ChatMessagePart::copy(bool justselection /* default false */)
case ID_TD: case ID_TH: case ID_HR: case ID_TD: case ID_TH: case ID_HR:
case ID_OL: case ID_UL: case ID_LI: case ID_OL: case ID_UL: case ID_LI:
case ID_DD: case ID_DL: case ID_DT: case ID_DD: case ID_DL: case ID_DT:
case ID_PRE: case ID_BLOCKTQUOTE: case ID_DIV: case ID_PRE: case ID_BLOCKQUOTE: case ID_DIV:
if (!hasNewLine) if (!hasNewLine)
text += "\n"; text += "\n";
hasNewLine = true; hasNewLine = true;

4
kopete/plugins/motionautoaway/motionawayplugin.cpp
Unescape View File

@ -84,7 +84,7 @@ typedef __signed__ long long __s64;
#define DEF_WIDTH 352 #define DEF_WIDTH 352
#define DEF_HEIGHT 288 #define DEF_HEIGHT 288
#define DEF_TQUALITY 50 #define DEF_QUALITY 50
#define DEF_CHANGES 5000 #define DEF_CHANGES 5000
#define DEF_POLL_INTERVAL 1500 #define DEF_POLL_INTERVAL 1500
@ -104,7 +104,7 @@ MotionAwayPlugin::MotionAwayPlugin( TQObject *parent, const char *name, const TQ
/* This should be read from config someday may be */ /* This should be read from config someday may be */
m_width = DEF_WIDTH; m_width = DEF_WIDTH;
m_height = DEF_HEIGHT; m_height = DEF_HEIGHT;
m_quality = DEF_TQUALITY; m_quality = DEF_QUALITY;
m_maxChanges = DEF_CHANGES; m_maxChanges = DEF_CHANGES;
m_gap = DEF_GAP; m_gap = DEF_GAP;

4
kopete/plugins/smpppdcs/onlineinquiry.h
Unescape View File

@ -14,8 +14,8 @@
************************************************************************* *************************************************************************
*/ */
#ifndef ONLINEINTQUIRY_H #ifndef ONLINEINQUIRY_H
#define ONLINEINTQUIRY_H #define ONLINEINQUIRY_H
#include "iconnector.h" #include "iconnector.h"

4
kopete/protocols/groupwise/libgroupwise/gwfield.h
Unescape View File

@ -122,14 +122,14 @@
// GW7 // GW7
#define NM_A_FA_CUSTOM_STATUSES "NM_A_FA_CUSTOM_STATUSES" #define NM_A_FA_CUSTOM_STATUSES "NM_A_FA_CUSTOM_STATUSES"
#define NM_A_FA_STATUS "NM_A_FA_STATUS" #define NM_A_FA_STATUS "NM_A_FA_STATUS"
#define NM_A_UD_TQUERY_COUNT "NM_A_UD_TQUERY_COUNT" #define NM_A_UD_QUERY_COUNT "NM_A_UD_QUERY_COUNT"
#define NM_A_FA_CHAT "NM_A_FA_CHAT" #define NM_A_FA_CHAT "NM_A_FA_CHAT"
#define NM_A_DISPLAY_NAME "nnmDisplayName" #define NM_A_DISPLAY_NAME "nnmDisplayName"
#define NM_A_CHAT_OWNER_DN "nnmChatOwnerDN" #define NM_A_CHAT_OWNER_DN "nnmChatOwnerDN"
#define NM_A_UD_PARTICIPANTS "NM_A_UD_PARTICIPANTS" #define NM_A_UD_PARTICIPANTS "NM_A_UD_PARTICIPANTS"
#define NM_A_DESCRIPTION "nnmDescription" #define NM_A_DESCRIPTION "nnmDescription"
#define NM_A_DISCLAIMER "nnmDisclaimer" #define NM_A_DISCLAIMER "nnmDisclaimer"
#define NM_A_TQUERY "nnmQuery" #define NM_A_QUERY "nnmQuery"
#define NM_A_ARCHIVE "nnmArchive" #define NM_A_ARCHIVE "nnmArchive"
#define NM_A_MAX_USERS "nnmMaxUsers" #define NM_A_MAX_USERS "nnmMaxUsers"
#define NM_A_SZ_TOPIC "NM_A_SZ_TOPIC" #define NM_A_SZ_TOPIC "NM_A_SZ_TOPIC"

2
kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.cpp
Unescape View File

@ -82,7 +82,7 @@ bool ChatPropertiesTask::take( Transfer * transfer )
m_description = sf->value().toString(); m_description = sf->value().toString();
else if ( sf->tag() == NM_A_DISCLAIMER ) else if ( sf->tag() == NM_A_DISCLAIMER )
m_disclaimer = sf->value().toString(); m_disclaimer = sf->value().toString();
else if ( sf->tag() == NM_A_TQUERY ) else if ( sf->tag() == NM_A_QUERY )
m_query = sf->value().toString(); m_query = sf->value().toString();
else if ( sf->tag() == NM_A_ARCHIVE ) else if ( sf->tag() == NM_A_ARCHIVE )
m_archive = sf->value().toString(); m_archive = sf->value().toString();

2
kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp
Unescape View File

@ -42,7 +42,7 @@ void GetChatSearchResultsTask::poll( int queryHandle )
{ {
Field::FieldList lst; Field::FieldList lst;
lst.append( new Field::SingleField( NM_A_UD_OBJECT_ID, 0, NMFIELD_TYPE_UDWORD, queryHandle ) ); lst.append( new Field::SingleField( NM_A_UD_OBJECT_ID, 0, NMFIELD_TYPE_UDWORD, queryHandle ) );
lst.append( new Field::SingleField( NM_A_UD_TQUERY_COUNT, 0, NMFIELD_TYPE_UDWORD, 10 ) ); lst.append( new Field::SingleField( NM_A_UD_QUERY_COUNT, 0, NMFIELD_TYPE_UDWORD, 10 ) );
createTransfer( "getchatsearchresults", lst ); createTransfer( "getchatsearchresults", lst );
} }

2
kopete/protocols/irc/ircprotocol.cpp
Unescape View File

@ -284,7 +284,7 @@ IRCProtocol::IRCProtocol( TQObject *parent, const char *name, const TQStringList
Kopete::CommandHandler::commandHandler()->registerAlias( this, TQString::fromLatin1("msg"), Kopete::CommandHandler::commandHandler()->registerAlias( this, TQString::fromLatin1("msg"),
TQString::fromLatin1("query %s"), TQString::fromLatin1("query %s"),
i18n("USAGE: /msg <nickname> [<message>] - Alias for TQUERY <nickname> <message>."), Kopete::CommandHandler::SystemAlias, 1 ); i18n("USAGE: /msg <nickname> [<message>] - Alias for QUERY <nickname> <message>."), Kopete::CommandHandler::SystemAlias, 1 );
TQObject::connect( Kopete::ChatSessionManager::self(), TQT_SIGNAL(aboutToDisplay(Kopete::Message &)), TQObject::connect( Kopete::ChatSessionManager::self(), TQT_SIGNAL(aboutToDisplay(Kopete::Message &)),
this, TQT_SLOT(slotMessageFilter(Kopete::Message &)) ); this, TQT_SLOT(slotMessageFilter(Kopete::Message &)) );

2
kopete/protocols/irc/libkirc/kircengine_commands.cpp
Unescape View File

@ -38,7 +38,7 @@ void Engine::bindCommands()
bind("PONG", this, TQT_SLOT(pong(KIRC::Message &)), 0, 0); bind("PONG", this, TQT_SLOT(pong(KIRC::Message &)), 0, 0);
bind("PRIVMSG", this, TQT_SLOT(privmsg(KIRC::Message &)), 1, 1); bind("PRIVMSG", this, TQT_SLOT(privmsg(KIRC::Message &)), 1, 1);
bind("QUIT", this, TQT_SLOT(quit(KIRC::Message &)), 0, 0); bind("QUIT", this, TQT_SLOT(quit(KIRC::Message &)), 0, 0);
// bind("STQUIT", this, TQT_SLOT(squit(KIRC::Message &)), 1, 1); // bind("SQUIT", this, TQT_SLOT(squit(KIRC::Message &)), 1, 1);
bind("TOPIC", this, TQT_SLOT(topic(KIRC::Message &)), 1, 1); bind("TOPIC", this, TQT_SLOT(topic(KIRC::Message &)), 1, 1);
} }

4
kopete/protocols/jabber/jingle/libjingle/talk/base/common.h
Unescape View File

@ -178,8 +178,8 @@ inline void Assert(bool result, const char * function, const char * file, int li
#endif // !ENABLE_DEBUG #endif // !ENABLE_DEBUG
#define COMPILE_TIME_ASSERT(expr) char CTA_UNITQUE_NAME[expr] #define COMPILE_TIME_ASSERT(expr) char CTA_UNIQUE_NAME[expr]
#define CTA_UNITQUE_NAME MAKE_NAME(__LINE__) #define CTA_UNIQUE_NAME MAKE_NAME(__LINE__)
#define CTA_MAKE_NAME(line) MAKE_NAME2(line) #define CTA_MAKE_NAME(line) MAKE_NAME2(line)
#define CTA_MAKE_NAME2(line) constraint_ ## line #define CTA_MAKE_NAME2(line) constraint_ ## line

6
kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.h
Unescape View File

@ -25,8 +25,8 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef __MESSAGETQUEUE_H__ #ifndef __MESSAGEQUEUE_H__
#define __MESSAGETQUEUE_H__ #define __MESSAGEQUEUE_H__
#include "talk/base/basictypes.h" #include "talk/base/basictypes.h"
#include "talk/base/criticalsection.h" #include "talk/base/criticalsection.h"
@ -162,4 +162,4 @@ protected:
} // namespace cricket } // namespace cricket
#endif // __MESSAGETQUEUE_H__ #endif // __MESSAGEQUEUE_H__

2
kopete/protocols/jabber/jingle/libjingle/talk/base/network.cc
Unescape View File

@ -60,7 +60,7 @@ const double kLog2 = 0.693147180559945309417;
const double kLambda = kLog2 / kHalfLife; const double kLambda = kLog2 / kHalfLife;
// assume so-so quality unless data says otherwise // assume so-so quality unless data says otherwise
const double kDefaultQuality = cricket::TQUALITY_FAIR; const double kDefaultQuality = cricket::QUALITY_FAIR;
typedef std::map<std::string,std::string> StrMap; typedef std::map<std::string,std::string> StrMap;

6
kopete/protocols/jabber/jingle/libjingle/talk/base/network.h
Unescape View File

@ -127,9 +127,9 @@ public:
}; };
const double TQUALITY_BAD = 3.0; const double QUALITY_BAD = 3.0;
const double TQUALITY_FAIR = 3.35; const double QUALITY_FAIR = 3.35;
const double TQUALITY_GOOD = 3.7; const double QUALITY_GOOD = 3.7;
} // namespace cricket } // namespace cricket

2
kopete/protocols/jabber/jingle/libjingle/talk/base/sigslot.h
Unescape View File

@ -5,7 +5,7 @@
// License: Public domain. You are free to use this code however you like, with the proviso that // License: Public domain. You are free to use this code however you like, with the proviso that
// the author takes on no responsibility or liability for any use. // the author takes on no responsibility or liability for any use.
// //
// TQUICK DOCUMENTATION // QUICK DOCUMENTATION
// //
// (see also the full documentation at http://sigslot.sourceforge.net/) // (see also the full documentation at http://sigslot.sourceforge.net/)
// //

2
kopete/protocols/jabber/jingle/libjingle/talk/base/socket.h
Unescape View File

@ -84,7 +84,7 @@
#define ENOTEMPTY WSAENOTEMPTY #define ENOTEMPTY WSAENOTEMPTY
#define EPROCLIM WSAEPROCLIM #define EPROCLIM WSAEPROCLIM
#define EUSERS WSAEUSERS #define EUSERS WSAEUSERS
#define EDTQUOT WSAEDTQUOT #define EDQUOT WSAEDQUOT
#define ESTALE WSAESTALE #define ESTALE WSAESTALE
#define EREMOTE WSAEREMOTE #define EREMOTE WSAEREMOTE
#undef EACCES #undef EACCES

6
kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc
Unescape View File

@ -25,7 +25,7 @@
#define SAMPLE_RATE 1 #define SAMPLE_RATE 1
// Speex settings // Speex settings
//#define SPEEX_TQUALITY 8 //#define SPEEX_QUALITY 8
// ORTP settings // ORTP settings
#define MAX_RTP_SIZE 1500 // From mediastreamer #define MAX_RTP_SIZE 1500 // From mediastreamer
@ -65,8 +65,8 @@ PortAudioMediaChannel::PortAudioMediaChannel() : mute_(false), play_(false), str
speex_decoder_ctl(speex_dec_state_, SPEEX_GET_FRAME_SIZE, &speex_frame_size_); speex_decoder_ctl(speex_dec_state_, SPEEX_GET_FRAME_SIZE, &speex_frame_size_);
speex_frame_ = new float[speex_frame_size_]; speex_frame_ = new float[speex_frame_size_];
// int quality = SPEEX_TQUALITY; // int quality = SPEEX_QUALITY;
// speex_encoder_ctl(state, SPEEX_SET_TQUALITY, &quality); // speex_encoder_ctl(state, SPEEX_SET_QUALITY, &quality);
// Initialize ORTP socket // Initialize ORTP socket
struct sockaddr_in sockaddr; struct sockaddr_in sockaddr;

12
kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfilter.c vendored
Unescape View File

@ -130,7 +130,7 @@ int ms_filter_add_link(MSFilter *m1, MSFilter *m2)
if ((m1_q!=-1) && (m2_q!=-1)){ if ((m1_q!=-1) && (m2_q!=-1)){
/* link with queues */ /* link with queues */
ms_trace("m1_q=%i , m2_q=%i",m1_q,m2_q); ms_trace("m1_q=%i , m2_q=%i",m1_q,m2_q);
return ms_filter_link(m1,m1_q,m2,m2_q,LINK_TQUEUE); return ms_filter_link(m1,m1_q,m2,m2_q,LINK_QUEUE);
} }
if ((m1_f!=-1) && (m2_f!=-1)){ if ((m1_f!=-1) && (m2_f!=-1)){
/* link with queues */ /* link with queues */
@ -146,7 +146,7 @@ int ms_filter_add_link(MSFilter *m1, MSFilter *m2)
* @pin1: The pin number on @m1. * @pin1: The pin number on @m1.
* @m2: A #MSFilter object. * @m2: A #MSFilter object.
* @pin2: The pin number on @m2. * @pin2: The pin number on @m2.
* @linktype: Type of connection, it may be #LINK_TQUEUE, #LINK_FIFOS. * @linktype: Type of connection, it may be #LINK_QUEUE, #LINK_FIFOS.
* *
* This function links two MSFilter object between them. It must be used to make chains of filters. * This function links two MSFilter object between them. It must be used to make chains of filters.
* All data outgoing from pin1 of m1 will go to the input pin2 of m2. * All data outgoing from pin1 of m1 will go to the input pin2 of m2.
@ -165,7 +165,7 @@ int ms_filter_link(MSFilter *m1, gint pin1, MSFilter *m2,gint pin2, int linktype
g_message("ms_filter_add_link: %s,%i -> %s,%i",m1->klass->name,pin1,m2->klass->name,pin2); g_message("ms_filter_add_link: %s,%i -> %s,%i",m1->klass->name,pin1,m2->klass->name,pin2);
switch(linktype) switch(linktype)
{ {
case LINK_TQUEUE: case LINK_QUEUE:
/* Are filter m1 and m2 able to accept more queues connections ?*/ /* Are filter m1 and m2 able to accept more queues connections ?*/
g_return_val_if_fail(m1->qoutputs<MS_FILTER_GET_CLASS(m1)->max_qoutputs,-EMLINK); g_return_val_if_fail(m1->qoutputs<MS_FILTER_GET_CLASS(m1)->max_qoutputs,-EMLINK);
g_return_val_if_fail(m2->qinputs<MS_FILTER_GET_CLASS(m2)->max_qinputs,-EMLINK); g_return_val_if_fail(m2->qinputs<MS_FILTER_GET_CLASS(m2)->max_qinputs,-EMLINK);
@ -244,7 +244,7 @@ int ms_filter_link(MSFilter *m1, gint pin1, MSFilter *m2,gint pin2, int linktype
* @pin1: The pin number on @m1. * @pin1: The pin number on @m1.
* @m2: A #MSFilter object. * @m2: A #MSFilter object.
* @pin2: The pin number on @m2. * @pin2: The pin number on @m2.
* @linktype: Type of connection, it may be #LINK_TQUEUE, #LINK_FIFOS. * @linktype: Type of connection, it may be #LINK_QUEUE, #LINK_FIFOS.
* *
* Unlink @pin1 of filter @m1 from @pin2 of filter @m2. @linktype specifies what type of connection is removed. * Unlink @pin1 of filter @m1 from @pin2 of filter @m2. @linktype specifies what type of connection is removed.
* *
@ -254,7 +254,7 @@ int ms_filter_unlink(MSFilter *m1, gint pin1, MSFilter *m2,gint pin2,gint linkty
{ {
switch(linktype) switch(linktype)
{ {
case LINK_TQUEUE: case LINK_QUEUE:
/* Are filter m1 and m2 valid with their inputs and outputs ?*/ /* Are filter m1 and m2 valid with their inputs and outputs ?*/
g_return_val_if_fail(m1->outqueues!=NULL,-EFAULT); g_return_val_if_fail(m1->outqueues!=NULL,-EFAULT);
g_return_val_if_fail(m2->inqueues!=NULL,-EFAULT); g_return_val_if_fail(m2->inqueues!=NULL,-EFAULT);
@ -321,7 +321,7 @@ gint ms_filter_remove_links(MSFilter *m1, MSFilter *m2)
if (rmf==m2){ if (rmf==m2){
j=find_iq(rmf,qo); j=find_iq(rmf,qo);
if (j==-1) g_error("Could not find input queue: impossible case."); if (j==-1) g_error("Could not find input queue: impossible case.");
ms_filter_unlink(m1,i,m2,j,LINK_TQUEUE); ms_filter_unlink(m1,i,m2,j,LINK_QUEUE);
removed=0; removed=0;
} }
} }

4
kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfilter.h vendored
Unescape View File

@ -98,7 +98,7 @@ typedef struct _MSFilterClass
void (*destroy)(MSFilter *filter); void (*destroy)(MSFilter *filter);
guint attributes; guint attributes;
#define FILTER_HAS_FIFOS (0x0001) #define FILTER_HAS_FIFOS (0x0001)
#define FILTER_HAS_TQUEUES (0x0001<<1) #define FILTER_HAS_QUEUES (0x0001<<1)
#define FILTER_IS_SOURCE (0x0001<<2) #define FILTER_IS_SOURCE (0x0001<<2)
#define FILTER_IS_SINK (0x0001<<3) #define FILTER_IS_SINK (0x0001<<3)
#define FILTER_CAN_SYNC (0x0001<<4) #define FILTER_CAN_SYNC (0x0001<<4)
@ -151,7 +151,7 @@ void ms_filter_destroy(MSFilter *f);
#define LINK_DEFAULT 0 #define LINK_DEFAULT 0
#define LINK_FIFO 1 #define LINK_FIFO 1
#define LINK_TQUEUE 2 #define LINK_QUEUE 2
#define MSFILTER_VERSION(a,b,c) (((a)<<2)|((b)<<1)|(c)) #define MSFILTER_VERSION(a,b,c) (((a)<<2)|((b)<<1)|(c))

4
kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqueue.h vendored
Unescape View File

@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef MSTQUEUE_H #ifndef MSQUEUE_H
#define MSTQUEUE_H #define MSQUEUE_H
#include "msbuffer.h" #include "msbuffer.h"

18
kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc
Unescape View File

@ -166,7 +166,7 @@ const TQName TQN_XSTREAM_XML_NOT_WELL_FORMED(true, NS_XSTREAM, "xml-not-well-for
const TQName TQN_XSTREAM_TEXT(true, NS_XSTREAM, "text"); const TQName TQN_XSTREAM_TEXT(true, NS_XSTREAM, "text");
const TQName TQN_TLS_STARTTLS(true, NS_TLS, "starttls"); const TQName TQN_TLS_STARTTLS(true, NS_TLS, "starttls");
const TQName TQN_TLS_RETQUIRED(true, NS_TLS, "required"); const TQName TQN_TLS_REQUIRED(true, NS_TLS, "required");
const TQName TQN_TLS_PROCEED(true, NS_TLS, "proceed"); const TQName TQN_TLS_PROCEED(true, NS_TLS, "proceed");
const TQName TQN_TLS_FAILURE(true, NS_TLS, "failure"); const TQName TQN_TLS_FAILURE(true, NS_TLS, "failure");
@ -199,15 +199,15 @@ const TQName TQN_STANZA_ITEM_NOT_FOUND(true, NS_STANZA, "item-not-found");
const TQName TQN_STANZA_JID_MALFORMED(true, NS_STANZA, "jid-malformed"); const TQName TQN_STANZA_JID_MALFORMED(true, NS_STANZA, "jid-malformed");
const TQName TQN_STANZA_NOT_ACCEPTABLE(true, NS_STANZA, "not-acceptable"); const TQName TQN_STANZA_NOT_ACCEPTABLE(true, NS_STANZA, "not-acceptable");
const TQName TQN_STANZA_NOT_ALLOWED(true, NS_STANZA, "not-allowed"); const TQName TQN_STANZA_NOT_ALLOWED(true, NS_STANZA, "not-allowed");
const TQName TQN_STANZA_PAYMENT_RETQUIRED(true, NS_STANZA, "payment-required"); const TQName TQN_STANZA_PAYMENT_REQUIRED(true, NS_STANZA, "payment-required");
const TQName TQN_STANZA_RECIPIENT_UNAVAILABLE(true, NS_STANZA, "recipient-unavailable"); const TQName TQN_STANZA_RECIPIENT_UNAVAILABLE(true, NS_STANZA, "recipient-unavailable");
const TQName TQN_STANZA_REDIRECT(true, NS_STANZA, "redirect"); const TQName TQN_STANZA_REDIRECT(true, NS_STANZA, "redirect");
const TQName TQN_STANZA_REGISTRATION_RETQUIRED(true, NS_STANZA, "registration-required"); const TQName TQN_STANZA_REGISTRATION_REQUIRED(true, NS_STANZA, "registration-required");
const TQName TQN_STANZA_REMOTE_SERVER_NOT_FOUND(true, NS_STANZA, "remote-server-not-found"); const TQName TQN_STANZA_REMOTE_SERVER_NOT_FOUND(true, NS_STANZA, "remote-server-not-found");
const TQName TQN_STANZA_REMOTE_SERVER_TIMEOUT(true, NS_STANZA, "remote-server-timeout"); const TQName TQN_STANZA_REMOTE_SERVER_TIMEOUT(true, NS_STANZA, "remote-server-timeout");
const TQName TQN_STANZA_RESOURCE_CONSTRAINT(true, NS_STANZA, "resource-constraint"); const TQName TQN_STANZA_RESOURCE_CONSTRAINT(true, NS_STANZA, "resource-constraint");
const TQName TQN_STANZA_SERVICE_UNAVAILABLE(true, NS_STANZA, "service-unavailable"); const TQName TQN_STANZA_SERVICE_UNAVAILABLE(true, NS_STANZA, "service-unavailable");
const TQName TQN_STANZA_SUBSCRIPTION_RETQUIRED(true, NS_STANZA, "subscription-required"); const TQName TQN_STANZA_SUBSCRIPTION_REQUIRED(true, NS_STANZA, "subscription-required");
const TQName TQN_STANZA_UNDEFINED_CONDITION(true, NS_STANZA, "undefined-condition"); const TQName TQN_STANZA_UNDEFINED_CONDITION(true, NS_STANZA, "undefined-condition");
const TQName TQN_STANZA_UNEXPECTED_REQUEST(true, NS_STANZA, "unexpected-request"); const TQName TQN_STANZA_UNEXPECTED_REQUEST(true, NS_STANZA, "unexpected-request");
const TQName TQN_STANZA_TEXT(true, NS_STANZA, "text"); const TQName TQN_STANZA_TEXT(true, NS_STANZA, "text");
@ -242,7 +242,7 @@ const TQName TQN_SERVER_ERROR(true, NS_SERVER, "error");
const TQName TQN_SESSION_SESSION(true, NS_SESSION, "session"); const TQName TQN_SESSION_SESSION(true, NS_SESSION, "session");
const TQName TQN_PRIVACY_TQUERY(true, NS_PRIVACY, "query"); const TQName TQN_PRIVACY_QUERY(true, NS_PRIVACY, "query");
const TQName TQN_PRIVACY_ACTIVE(true, NS_PRIVACY, "active"); const TQName TQN_PRIVACY_ACTIVE(true, NS_PRIVACY, "active");
const TQName TQN_PRIVACY_DEFAULT(true, NS_PRIVACY, "default"); const TQName TQN_PRIVACY_DEFAULT(true, NS_PRIVACY, "default");
const TQName TQN_PRIVACY_LIST(true, NS_PRIVACY, "list"); const TQName TQN_PRIVACY_LIST(true, NS_PRIVACY, "list");
@ -252,11 +252,11 @@ const TQName TQN_PRIVACY_MESSAGE(true, NS_PRIVACY, "message");
const TQName TQN_PRIVACY_PRESENCE_IN(true, NS_PRIVACY, "presence-in"); const TQName TQN_PRIVACY_PRESENCE_IN(true, NS_PRIVACY, "presence-in");
const TQName TQN_PRIVACY_PRESENCE_OUT(true, NS_PRIVACY, "presence-out"); const TQName TQN_PRIVACY_PRESENCE_OUT(true, NS_PRIVACY, "presence-out");
const TQName TQN_ROSTER_TQUERY(true, NS_ROSTER, "query"); const TQName TQN_ROSTER_QUERY(true, NS_ROSTER, "query");
const TQName TQN_ROSTER_ITEM(true, NS_ROSTER, "item"); const TQName TQN_ROSTER_ITEM(true, NS_ROSTER, "item");
const TQName TQN_ROSTER_GROUP(true, NS_ROSTER, "group"); const TQName TQN_ROSTER_GROUP(true, NS_ROSTER, "group");
const TQName TQN_VCARD_TQUERY(true, NS_VCARD, "vCard"); const TQName TQN_VCARD_QUERY(true, NS_VCARD, "vCard");
const TQName TQN_VCARD_FN(true, NS_VCARD, "FN"); const TQName TQN_VCARD_FN(true, NS_VCARD, "FN");
const TQName TQN_XML_LANG(true, NS_XML, "lang"); const TQName TQN_XML_LANG(true, NS_XML, "lang");
@ -308,11 +308,11 @@ const TQName TQN_CATEGORY(true, STR_EMPTY, "category");
const TQName TQN_VAR(true, STR_EMPTY, "var"); const TQName TQN_VAR(true, STR_EMPTY, "var");
const std::string NS_DISCO_INFO("http://jabber.org/protocol/disco#info"); const std::string NS_DISCO_INFO("http://jabber.org/protocol/disco#info");
const std::string NS_DISCO_ITEMS("http://jabber.org/protocol/disco#items"); const std::string NS_DISCO_ITEMS("http://jabber.org/protocol/disco#items");
const TQName TQN_DISCO_INFO_TQUERY(true, NS_DISCO_INFO, "query"); const TQName TQN_DISCO_INFO_QUERY(true, NS_DISCO_INFO, "query");
const TQName TQN_DISCO_IDENTITY(true, NS_DISCO_INFO, "identity"); const TQName TQN_DISCO_IDENTITY(true, NS_DISCO_INFO, "identity");
const TQName TQN_DISCO_FEATURE(true, NS_DISCO_INFO, "feature"); const TQName TQN_DISCO_FEATURE(true, NS_DISCO_INFO, "feature");
const TQName TQN_DISCO_ITEMS_TQUERY(true, NS_DISCO_ITEMS, "query"); const TQName TQN_DISCO_ITEMS_QUERY(true, NS_DISCO_ITEMS, "query");
const TQName TQN_DISCO_ITEM(true, NS_DISCO_ITEMS, "item"); const TQName TQN_DISCO_ITEM(true, NS_DISCO_ITEMS, "item");

18
kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.h
Unescape View File

@ -139,7 +139,7 @@ extern const TQName TQN_XSTREAM_XML_NOT_WELL_FORMED;
extern const TQName TQN_XSTREAM_TEXT; extern const TQName TQN_XSTREAM_TEXT;
extern const TQName TQN_TLS_STARTTLS; extern const TQName TQN_TLS_STARTTLS;
extern const TQName TQN_TLS_RETQUIRED; extern const TQName TQN_TLS_REQUIRED;
extern const TQName TQN_TLS_PROCEED; extern const TQName TQN_TLS_PROCEED;
extern const TQName TQN_TLS_FAILURE; extern const TQName TQN_TLS_FAILURE;
@ -172,15 +172,15 @@ extern const TQName TQN_STANZA_ITEM_NOT_FOUND;
extern const TQName TQN_STANZA_JID_MALFORMED; extern const TQName TQN_STANZA_JID_MALFORMED;
extern const TQName TQN_STANZA_NOT_ACCEPTABLE; extern const TQName TQN_STANZA_NOT_ACCEPTABLE;
extern const TQName TQN_STANZA_NOT_ALLOWED; extern const TQName TQN_STANZA_NOT_ALLOWED;
extern const TQName TQN_STANZA_PAYMENT_RETQUIRED; extern const TQName TQN_STANZA_PAYMENT_REQUIRED;
extern const TQName TQN_STANZA_RECIPIENT_UNAVAILABLE; extern const TQName TQN_STANZA_RECIPIENT_UNAVAILABLE;
extern const TQName TQN_STANZA_REDIRECT; extern const TQName TQN_STANZA_REDIRECT;
extern const TQName TQN_STANZA_REGISTRATION_RETQUIRED; extern const TQName TQN_STANZA_REGISTRATION_REQUIRED;
extern const TQName TQN_STANZA_REMOTE_SERVER_NOT_FOUND; extern const TQName TQN_STANZA_REMOTE_SERVER_NOT_FOUND;
extern const TQName TQN_STANZA_REMOTE_SERVER_TIMEOUT; extern const TQName TQN_STANZA_REMOTE_SERVER_TIMEOUT;
extern const TQName TQN_STANZA_RESOURCE_CONSTRAINT; extern const TQName TQN_STANZA_RESOURCE_CONSTRAINT;
extern const TQName TQN_STANZA_SERVICE_UNAVAILABLE; extern const TQName TQN_STANZA_SERVICE_UNAVAILABLE;
extern const TQName TQN_STANZA_SUBSCRIPTION_RETQUIRED; extern const TQName TQN_STANZA_SUBSCRIPTION_REQUIRED;
extern const TQName TQN_STANZA_UNDEFINED_CONDITION; extern const TQName TQN_STANZA_UNDEFINED_CONDITION;
extern const TQName TQN_STANZA_UNEXPECTED_REQUEST; extern const TQName TQN_STANZA_UNEXPECTED_REQUEST;
extern const TQName TQN_STANZA_TEXT; extern const TQName TQN_STANZA_TEXT;
@ -215,7 +215,7 @@ extern const TQName TQN_SERVER_ERROR;
extern const TQName TQN_SESSION_SESSION; extern const TQName TQN_SESSION_SESSION;
extern const TQName TQN_PRIVACY_TQUERY; extern const TQName TQN_PRIVACY_QUERY;
extern const TQName TQN_PRIVACY_ACTIVE; extern const TQName TQN_PRIVACY_ACTIVE;
extern const TQName TQN_PRIVACY_DEFAULT; extern const TQName TQN_PRIVACY_DEFAULT;
extern const TQName TQN_PRIVACY_LIST; extern const TQName TQN_PRIVACY_LIST;
@ -225,11 +225,11 @@ extern const TQName TQN_PRIVACY_MESSAGE;
extern const TQName TQN_PRIVACY_PRESENCE_IN; extern const TQName TQN_PRIVACY_PRESENCE_IN;
extern const TQName TQN_PRIVACY_PRESENCE_OUT; extern const TQName TQN_PRIVACY_PRESENCE_OUT;
extern const TQName TQN_ROSTER_TQUERY; extern const TQName TQN_ROSTER_QUERY;
extern const TQName TQN_ROSTER_ITEM; extern const TQName TQN_ROSTER_ITEM;
extern const TQName TQN_ROSTER_GROUP; extern const TQName TQN_ROSTER_GROUP;
extern const TQName TQN_VCARD_TQUERY; extern const TQName TQN_VCARD_QUERY;
extern const TQName TQN_VCARD_FN; extern const TQName TQN_VCARD_FN;
extern const TQName TQN_XML_LANG; extern const TQName TQN_XML_LANG;
@ -275,11 +275,11 @@ extern const TQName TQN_VAR;
extern const std::string NS_DISCO_INFO; extern const std::string NS_DISCO_INFO;
extern const std::string NS_DISCO_ITEMS; extern const std::string NS_DISCO_ITEMS;
extern const TQName TQN_DISCO_INFO_TQUERY; extern const TQName TQN_DISCO_INFO_QUERY;
extern const TQName TQN_DISCO_IDENTITY; extern const TQName TQN_DISCO_IDENTITY;
extern const TQName TQN_DISCO_FEATURE; extern const TQName TQN_DISCO_FEATURE;
extern const TQName TQN_DISCO_ITEMS_TQUERY; extern const TQName TQN_DISCO_ITEMS_QUERY;
extern const TQName TQN_DISCO_ITEM; extern const TQName TQN_DISCO_ITEM;

6
kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h
Unescape View File

@ -53,15 +53,15 @@ enum XmppStanzaError {
XSE_JID_MALFORMED, XSE_JID_MALFORMED,
XSE_NOT_ACCEPTABLE, XSE_NOT_ACCEPTABLE,
XSE_NOT_ALLOWED, XSE_NOT_ALLOWED,
XSE_PAYMENT_RETQUIRED, XSE_PAYMENT_REQUIRED,
XSE_RECIPIENT_UNAVAILABLE, XSE_RECIPIENT_UNAVAILABLE,
XSE_REDIRECT, XSE_REDIRECT,
XSE_REGISTRATION_RETQUIRED, XSE_REGISTRATION_REQUIRED,
XSE_SERVER_NOT_FOUND, XSE_SERVER_NOT_FOUND,
XSE_SERVER_TIMEOUT, XSE_SERVER_TIMEOUT,
XSE_RESOURCE_CONSTRAINT, XSE_RESOURCE_CONSTRAINT,
XSE_SERVICE_UNAVAILABLE, XSE_SERVICE_UNAVAILABLE,
XSE_SUBSCRIPTION_RETQUIRED, XSE_SUBSCRIPTION_REQUIRED,
XSE_UNDEFINED_CONDITION, XSE_UNDEFINED_CONDITION,
XSE_UNEXPECTED_REQUEST, XSE_UNEXPECTED_REQUEST,
}; };

12
kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc
Unescape View File

@ -161,8 +161,8 @@ AddErrorCode(XmlElement * error_element, XmppStanzaError code) {
case XSE_NOT_ALLOWED: case XSE_NOT_ALLOWED:
AecImpl(error_element, TQN_STANZA_NOT_ALLOWED, "cancel", "405"); AecImpl(error_element, TQN_STANZA_NOT_ALLOWED, "cancel", "405");
break; break;
case XSE_PAYMENT_RETQUIRED: case XSE_PAYMENT_REQUIRED:
AecImpl(error_element, TQN_STANZA_PAYMENT_RETQUIRED, "auth", "402"); AecImpl(error_element, TQN_STANZA_PAYMENT_REQUIRED, "auth", "402");
break; break;
case XSE_RECIPIENT_UNAVAILABLE: case XSE_RECIPIENT_UNAVAILABLE:
AecImpl(error_element, TQN_STANZA_RECIPIENT_UNAVAILABLE, "wait", "404"); AecImpl(error_element, TQN_STANZA_RECIPIENT_UNAVAILABLE, "wait", "404");
@ -170,8 +170,8 @@ AddErrorCode(XmlElement * error_element, XmppStanzaError code) {
case XSE_REDIRECT: case XSE_REDIRECT:
AecImpl(error_element, TQN_STANZA_REDIRECT, "modify", "302"); AecImpl(error_element, TQN_STANZA_REDIRECT, "modify", "302");
break; break;
case XSE_REGISTRATION_RETQUIRED: case XSE_REGISTRATION_REQUIRED:
AecImpl(error_element, TQN_STANZA_REGISTRATION_RETQUIRED, "auth", "407"); AecImpl(error_element, TQN_STANZA_REGISTRATION_REQUIRED, "auth", "407");
break; break;
case XSE_SERVER_NOT_FOUND: case XSE_SERVER_NOT_FOUND:
AecImpl(error_element, TQN_STANZA_REMOTE_SERVER_NOT_FOUND, AecImpl(error_element, TQN_STANZA_REMOTE_SERVER_NOT_FOUND,
@ -186,8 +186,8 @@ AddErrorCode(XmlElement * error_element, XmppStanzaError code) {
case XSE_SERVICE_UNAVAILABLE: case XSE_SERVICE_UNAVAILABLE:
AecImpl(error_element, TQN_STANZA_SERVICE_UNAVAILABLE, "cancel", "503"); AecImpl(error_element, TQN_STANZA_SERVICE_UNAVAILABLE, "cancel", "503");
break; break;
case XSE_SUBSCRIPTION_RETQUIRED: case XSE_SUBSCRIPTION_REQUIRED:
AecImpl(error_element, TQN_STANZA_SUBSCRIPTION_RETQUIRED, "auth", "407"); AecImpl(error_element, TQN_STANZA_SUBSCRIPTION_REQUIRED, "auth", "407");
break; break;
case XSE_UNDEFINED_CONDITION: case XSE_UNDEFINED_CONDITION:
AecImpl(error_element, TQN_STANZA_UNDEFINED_CONDITION, "wait", "500"); AecImpl(error_element, TQN_STANZA_UNDEFINED_CONDITION, "wait", "500");

6
kopete/protocols/msn/webcam/libmimic/mimic-private.h
Unescape View File

@ -21,9 +21,9 @@
#include "mimic.h" #include "mimic.h"
#define ENCODER_BUFFER_SIZE 16384 #define ENCODER_BUFFER_SIZE 16384
#define ENCODER_TQUALITY_DEFAULT 0 #define ENCODER_QUALITY_DEFAULT 0
#define ENCODER_TQUALITY_MIN 0 #define ENCODER_QUALITY_MIN 0
#define ENCODER_TQUALITY_MAX 10000 #define ENCODER_QUALITY_MAX 10000
struct _MimCtx { struct _MimCtx {
gboolean encoder_initialized; gboolean encoder_initialized;

6
kopete/protocols/msn/webcam/libmimic/mimic.c
Unescape View File

@ -155,7 +155,7 @@ gboolean mimic_encoder_init(MimCtx *ctx, const MimicResEnum resolution)
mimic_init(ctx, width, height); mimic_init(ctx, width, height);
/* Set a default quality setting. */ /* Set a default quality setting. */
ctx->quality = ENCODER_TQUALITY_DEFAULT; ctx->quality = ENCODER_QUALITY_DEFAULT;
ctx->encoder_initialized = TRUE; ctx->encoder_initialized = TRUE;
@ -300,8 +300,8 @@ gboolean mimic_set_property(MimCtx *ctx, const gchar *name, gpointer data)
if (strcmp(name, "quality") == 0) { if (strcmp(name, "quality") == 0) {
gint new_quality = *((gint *) data); gint new_quality = *((gint *) data);
if (new_quality < ENCODER_TQUALITY_MIN || if (new_quality < ENCODER_QUALITY_MIN ||
new_quality > ENCODER_TQUALITY_MAX) new_quality > ENCODER_QUALITY_MAX)
{ {
return FALSE; return FALSE;
} }

6
kppp/kpppwidget.cpp
Unescape View File

@ -1008,8 +1008,8 @@ void KPPPWidget::showNews() {
/* /*
* Introduce the QuickHelp feature to new users of this version * Introduce the QuickHelp feature to new users of this version
*/ */
#define TQUICKHELP_HINT "Hint_QuickHelp" #define QUICKHELP_HINT "Hint_QuickHelp"
if(gpppdata.readNumConfig(GENERAL_GRP, TQUICKHELP_HINT, 0) == 0) { if(gpppdata.readNumConfig(GENERAL_GRP, QUICKHELP_HINT, 0) == 0) {
TQDialog dlg(0, 0, true); TQDialog dlg(0, 0, true);
dlg.setCaption(i18n("Recent Changes in KPPP")); dlg.setCaption(i18n("Recent Changes in KPPP"));
@ -1061,7 +1061,7 @@ void KPPPWidget::showNews() {
dlg.exec(); dlg.exec();
if(cb->isChecked()) { if(cb->isChecked()) {
gpppdata.writeConfig(GENERAL_GRP, TQUICKHELP_HINT, 1); gpppdata.writeConfig(GENERAL_GRP, QUICKHELP_HINT, 1);
gpppdata.save(); gpppdata.save();
} }
} }

4
kppp/pppdata.cpp
Unescape View File

@ -300,12 +300,12 @@ void PPPData::set_redial_on_nocarrier(bool set) {
bool PPPData::quit_on_disconnect() { bool PPPData::quit_on_disconnect() {
return (bool) readNumConfig(GENERAL_GRP, TQUITONDISCONNECT_KEY, false); return (bool) readNumConfig(GENERAL_GRP, QUITONDISCONNECT_KEY, false);
} }
void PPPData::set_quit_on_disconnect(bool set) { void PPPData::set_quit_on_disconnect(bool set) {
writeConfig(GENERAL_GRP, TQUITONDISCONNECT_KEY, (int) set); writeConfig(GENERAL_GRP, QUITONDISCONNECT_KEY, (int) set);
} }

2
kppp/pppdata.h
Unescape View File

@ -70,7 +70,7 @@ class KConfig;
#define SHOWLOGWIN_KEY "ShowLogWindow" #define SHOWLOGWIN_KEY "ShowLogWindow"
#define AUTOREDIAL_KEY "AutomaticRedial" #define AUTOREDIAL_KEY "AutomaticRedial"
#define DISCONNECT_KEY "DisconnectOnXServerExit" #define DISCONNECT_KEY "DisconnectOnXServerExit"
#define TQUITONDISCONNECT_KEY "QuitOnDisconnect" #define QUITONDISCONNECT_KEY "QuitOnDisconnect"
#define NUMACCOUNTS_KEY "NumberOfAccounts" #define NUMACCOUNTS_KEY "NumberOfAccounts"
#define NUMMODEMS_KEY "NumberOfModems" #define NUMMODEMS_KEY "NumberOfModems"
#define REDIALONNOCARR_KEY "RedialOnNoCarrier" #define REDIALONNOCARR_KEY "RedialOnNoCarrier"

2
krdc/krdc.h
Unescape View File

@ -132,7 +132,7 @@ protected:
public: public:
KRDC(WindowMode wm = WINDOW_MODE_AUTO, KRDC(WindowMode wm = WINDOW_MODE_AUTO,
const TQString &host = TQString(), const TQString &host = TQString(),
Quality q = TQUALITY_UNKNOWN, Quality q = QUALITY_UNKNOWN,
const TQString &encodings = TQString(), const TQString &encodings = TQString(),
const TQString &password = TQString(), const TQString &password = TQString(),
bool scale = false, bool scale = false,

8
krdc/kremoteview.h
Unescape View File

@ -24,10 +24,10 @@
#include "events.h" #include "events.h"
typedef enum { typedef enum {
TQUALITY_UNKNOWN=0, QUALITY_UNKNOWN=0,
TQUALITY_HIGH=1, QUALITY_HIGH=1,
TQUALITY_MEDIUM=2, QUALITY_MEDIUM=2,
TQUALITY_LOW=3 QUALITY_LOW=3
} Quality; } Quality;
/** /**

8
krdc/main.cpp
Unescape View File

@ -98,7 +98,7 @@ int main(int argc, char *argv[])
KApplication a; KApplication a;
TQString host = TQString(); TQString host = TQString();
Quality quality = TQUALITY_UNKNOWN; Quality quality = QUALITY_UNKNOWN;
TQString encodings = TQString(); TQString encodings = TQString();
TQString password = TQString(); TQString password = TQString();
TQString resolution = TQString(); TQString resolution = TQString();
@ -111,11 +111,11 @@ int main(int argc, char *argv[])
KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
if (args->isSet("low-quality")) if (args->isSet("low-quality"))
quality = TQUALITY_LOW; quality = QUALITY_LOW;
else if (args->isSet("medium-quality")) else if (args->isSet("medium-quality"))
quality = TQUALITY_MEDIUM; quality = QUALITY_MEDIUM;
else if (args->isSet("high-quality")) else if (args->isSet("high-quality"))
quality = TQUALITY_HIGH; quality = QUALITY_HIGH;
if (args->isSet("fullscreen")) if (args->isSet("fullscreen"))
wm = WINDOW_MODE_FULLSCREEN; wm = WINDOW_MODE_FULLSCREEN;

14
krdc/vnc/kvncview.cpp
Unescape View File

@ -103,7 +103,7 @@ KVncView::KVncView(TQWidget *parent,
"pics/pointcursormask.png")); "pics/pointcursormask.png"));
m_cursor = TQCursor(cursorBitmap, cursorMask); m_cursor = TQCursor(cursorBitmap, cursorMask);
if ((quality != TQUALITY_UNKNOWN) || if ((quality != QUALITY_UNKNOWN) ||
!encodings.isNull()) !encodings.isNull())
configureApp(quality, encodings); configureApp(quality, encodings);
} }
@ -160,21 +160,21 @@ void KVncView::configureApp(Quality q, const TQString specialEncodings) {
appData.shareDesktop = 1; appData.shareDesktop = 1;
appData.viewOnly = 0; appData.viewOnly = 0;
if (q == TQUALITY_LOW) { if (q == QUALITY_LOW) {
appData.useBGR233 = 1; appData.useBGR233 = 1;
appData.encodingsString = "background copyrect softcursor tight zlib hextile raw"; appData.encodingsString = "background copyrect softcursor tight zlib hextile raw";
appData.compressLevel = -1; appData.compressLevel = -1;
appData.qualityLevel = 1; appData.qualityLevel = 1;
appData.dotCursor = 1; appData.dotCursor = 1;
} }
else if (q == TQUALITY_MEDIUM) { else if (q == QUALITY_MEDIUM) {
appData.useBGR233 = 0; appData.useBGR233 = 0;
appData.encodingsString = "background copyrect softcursor tight zlib hextile raw"; appData.encodingsString = "background copyrect softcursor tight zlib hextile raw";
appData.compressLevel = -1; appData.compressLevel = -1;
appData.qualityLevel = 7; appData.qualityLevel = 7;
appData.dotCursor = 1; appData.dotCursor = 1;
} }
else if ((q == TQUALITY_HIGH) || (q == TQUALITY_UNKNOWN)) { else if ((q == QUALITY_HIGH) || (q == QUALITY_UNKNOWN)) {
appData.useBGR233 = 0; appData.useBGR233 = 0;
appData.encodingsString = "copyrect softcursor hextile raw"; appData.encodingsString = "copyrect softcursor hextile raw";
appData.compressLevel = -1; appData.compressLevel = -1;
@ -281,11 +281,11 @@ bool KVncView::start() {
Quality quality; Quality quality;
if (ci == 0) if (ci == 0)
quality = TQUALITY_HIGH; quality = QUALITY_HIGH;
else if (ci == 1) else if (ci == 1)
quality = TQUALITY_MEDIUM; quality = QUALITY_MEDIUM;
else if (ci == 2) else if (ci == 2)
quality = TQUALITY_LOW; quality = QUALITY_LOW;
else { else {
kdDebug() << "Unknown quality"; kdDebug() << "Unknown quality";
return false; return false;

2
krdc/vnc/kvncview.h
Unescape View File

@ -80,7 +80,7 @@ public:
KVncView(TQWidget* parent=0, const char *name=0, KVncView(TQWidget* parent=0, const char *name=0,
const TQString &host = TQString(""), int port = 5900, const TQString &host = TQString(""), int port = 5900,
const TQString &password = TQString(), const TQString &password = TQString(),
Quality quality = TQUALITY_UNKNOWN, Quality quality = QUALITY_UNKNOWN,
DotCursorState dotCursorState = DOT_CURSOR_AUTO, DotCursorState dotCursorState = DOT_CURSOR_AUTO,
const TQString &encodings = TQString()); const TQString &encodings = TQString());
~KVncView(); ~KVncView();

12
krdc/vnc/threads.cpp
Unescape View File

@ -33,9 +33,9 @@ static const int MAXIMUM_WAIT_PERIOD = 8000;
// time to postpone incremental updates that have not been requested explicitly // time to postpone incremental updates that have not been requested explicitly
static const int POSTPONED_INCRRTQ_WAIT_PERIOD = 110; static const int POSTPONED_INCRRTQ_WAIT_PERIOD = 110;
static const int MOUSEPRESS_TQUEUE_SIZE = 5; static const int MOUSEPRESS_QUEUE_SIZE = 5;
static const int MOUSEMOVE_TQUEUE_SIZE = 3; static const int MOUSEMOVE_QUEUE_SIZE = 3;
static const int KEY_TQUEUE_SIZE = 8192; static const int KEY_QUEUE_SIZE = 8192;
ControllerThread::ControllerThread(KVncView *v, WriterThread &wt, volatile bool &quitFlag) : ControllerThread::ControllerThread(KVncView *v, WriterThread &wt, volatile bool &quitFlag) :
@ -246,12 +246,12 @@ void WriterThread::queueMouseEvent(int x, int y, int buttonMask) {
m_lock.unlock(); m_lock.unlock();
return; return;
} }
if (m_mouseEventNum >= MOUSEPRESS_TQUEUE_SIZE) { if (m_mouseEventNum >= MOUSEPRESS_QUEUE_SIZE) {
m_lock.unlock(); m_lock.unlock();
return; return;
} }
if ((m_lastMouseEvent.buttons == buttonMask) && if ((m_lastMouseEvent.buttons == buttonMask) &&
(m_mouseEventNum >= MOUSEMOVE_TQUEUE_SIZE)) { (m_mouseEventNum >= MOUSEMOVE_QUEUE_SIZE)) {
m_lock.unlock(); m_lock.unlock();
return; return;
} }
@ -272,7 +272,7 @@ void WriterThread::queueKeyEvent(unsigned int k, bool down) {
e.e.k.down = down; e.e.k.down = down;
m_lock.lock(); m_lock.lock();
if (m_keyEventNum >= KEY_TQUEUE_SIZE) { if (m_keyEventNum >= KEY_QUEUE_SIZE) {
m_lock.unlock(); m_lock.unlock();
return; return;
} }

4
ktalkd/ktalkd/proto.h
Unescape View File

@ -37,8 +37,8 @@ extern "C" {
/* quirks for repairs.c */ /* quirks for repairs.c */
#define TQUIRK_NONE 0 #define QUIRK_NONE 0
#define TQUIRK_OTALK 1 #define QUIRK_OTALK 1
struct sockaddr_in; struct sockaddr_in;

10
ktalkd/ktalkd/repairs.c
Unescape View File

@ -140,7 +140,7 @@ static int probe_otalk_packet(char *buf, size_t len, size_t maxlen,
struct otalk_packet otp; struct otalk_packet otp;
CTL_MSG m; CTL_MSG m;
ktalk_debug("Probing for TQUIRK_OTALK\n"); ktalk_debug("Probing for QUIRK_OTALK\n");
if (sizeof(otp)!=OTALK_PACKET_SIZE) { if (sizeof(otp)!=OTALK_PACKET_SIZE) {
syslog(LOG_ERR, "QUIRK_OTALK: struct otalk_packet padding " syslog(LOG_ERR, "QUIRK_OTALK: struct otalk_packet padding "
@ -256,8 +256,8 @@ rationalize_packet(char *buf, size_t len, size_t mlen, struct sockaddr_in *sn)
ktalk_debug("Malformed packet (length %u)\n", len); ktalk_debug("Malformed packet (length %u)\n", len);
if (probe_otalk_packet(buf, len, mlen, sn)==0) { if (probe_otalk_packet(buf, len, mlen, sn)==0) {
ktalk_debug("Using TQUIRK_OTALK\n"); ktalk_debug("Using QUIRK_OTALK\n");
return TQUIRK_OTALK; return QUIRK_OTALK;
} }
return -1; return -1;
} }
@ -266,8 +266,8 @@ size_t
irrationalize_reply(char *buf, size_t maxlen, int quirk) irrationalize_reply(char *buf, size_t maxlen, int quirk)
{ {
switch (quirk) { switch (quirk) {
case TQUIRK_NONE: return sizeof(CTL_RESPONSE); case QUIRK_NONE: return sizeof(CTL_RESPONSE);
case TQUIRK_OTALK: return do_otalk_reply(buf, maxlen); case QUIRK_OTALK: return do_otalk_reply(buf, maxlen);
} }
/* ? */ /* ? */
return 0; return 0;

4
ktalkd/mail.local/mail.local.c
Unescape View File

@ -754,8 +754,8 @@ e_to_sys(num)
#ifdef EAGAIN #ifdef EAGAIN
case EAGAIN: /* Resource temporarily unavailable */ case EAGAIN: /* Resource temporarily unavailable */
#endif #endif
#ifdef EDTQUOT #ifdef EDQUOT
case EDTQUOT: /* Disc quota exceeded */ case EDQUOT: /* Disc quota exceeded */
#endif #endif
#ifdef EBUSY #ifdef EBUSY
case EBUSY: /* Device busy */ case EBUSY: /* Device busy */

Write Preview
Loading…
Cancel
Save