summaryrefslogtreecommitdiffstats
path: root/kio/misc
diff options
context:
space:
mode:
Diffstat (limited to 'kio/misc')
-rwxr-xr-xkio/misc/fileshareset8
-rw-r--r--kio/misc/kdesasl/kdesasl.cpp8
-rw-r--r--kio/misc/kfile/fileprops.cpp2
-rw-r--r--kio/misc/kntlm/des.cpp28
-rw-r--r--kio/misc/kntlm/des.h2
-rw-r--r--kio/misc/kntlm/kntlm.cpp70
-rw-r--r--kio/misc/kntlm/kntlm.h40
-rw-r--r--kio/misc/kntlm/kswap.h98
-rw-r--r--kio/misc/kpac/README.wpad4
-rw-r--r--kio/misc/kpac/discovery.cpp6
-rw-r--r--kio/misc/kpac/downloader.h2
-rw-r--r--kio/misc/kpac/proxyscout.cpp4
-rw-r--r--kio/misc/kpac/script.cpp32
-rw-r--r--kio/misc/ksendbugmail/main.cpp8
-rw-r--r--kio/misc/ksendbugmail/smtp.cpp28
-rw-r--r--kio/misc/ksendbugmail/smtp.h16
-rw-r--r--kio/misc/kssld/kssld.cpp46
-rw-r--r--kio/misc/kwalletd/kbetterthankdialogbase.ui10
-rw-r--r--kio/misc/kwalletd/ktimeout.cpp6
-rw-r--r--kio/misc/kwalletd/kwalletd.cpp68
-rw-r--r--kio/misc/kwalletd/kwalletd.h2
-rw-r--r--kio/misc/kwalletd/kwalletwizard.ui40
-rw-r--r--kio/misc/uiserver.cpp78
-rw-r--r--kio/misc/uiserver.h2
24 files changed, 304 insertions, 304 deletions
diff --git a/kio/misc/fileshareset b/kio/misc/fileshareset
index a4f534593..4c921ba38 100755
--- a/kio/misc/fileshareset
+++ b/kio/misc/fileshareset
@@ -183,7 +183,7 @@ sub check {
################################################################################
package exports;
-sub tqfind {
+sub find {
my ($exports, $mntpoint) = @_;
foreach (@$exports) {
$_->{mntpoint} eq $mntpoint and return $_;
@@ -396,8 +396,8 @@ sub name_mangle {
last A;
}
}
- $_ or die "can't tqfind a unique name";
- # can't tqfind a unique name, dropping the last letter
+ $_ or die "can't find a unique name";
+ # can't find a unique name, dropping the last letter
s|(.*).|$1|;
}
}
@@ -422,7 +422,7 @@ sub update_server {
system('/etc/rc.d/rc.samba', $_) foreach 'stop', 'start';
}
else {
- print STDERR "Error: Can't tqfind the samba init script \n";
+ print STDERR "Error: Can't find the samba init script \n";
}
}
exit 0;
diff --git a/kio/misc/kdesasl/kdesasl.cpp b/kio/misc/kdesasl/kdesasl.cpp
index e9bc75dc1..b547f7e6b 100644
--- a/kio/misc/kdesasl/kdesasl.cpp
+++ b/kio/misc/kdesasl/kdesasl.cpp
@@ -49,10 +49,10 @@ KDESasl::~KDESasl() {
TQCString KDESasl::chooseMethod(const TQStrIList aMethods)
{
- if (aMethods.tqcontains("DIGEST-MD5")) mMethod = "DIGEST-MD5";
- else if (aMethods.tqcontains("CRAM-MD5")) mMethod = "CRAM-MD5";
- else if (aMethods.tqcontains("PLAIN")) mMethod = "PLAIN";
- else if (aMethods.tqcontains("LOGIN")) mMethod = "LOGIN";
+ if (aMethods.contains("DIGEST-MD5")) mMethod = "DIGEST-MD5";
+ else if (aMethods.contains("CRAM-MD5")) mMethod = "CRAM-MD5";
+ else if (aMethods.contains("PLAIN")) mMethod = "PLAIN";
+ else if (aMethods.contains("LOGIN")) mMethod = "LOGIN";
else mMethod = TQCString();
return mMethod;
}
diff --git a/kio/misc/kfile/fileprops.cpp b/kio/misc/kfile/fileprops.cpp
index 0d8854eb5..096fc1f03 100644
--- a/kio/misc/kfile/fileprops.cpp
+++ b/kio/misc/kfile/fileprops.cpp
@@ -329,7 +329,7 @@ static void processMetaDataOptions( const TQPtrList<FileProps> propList,
for ( ; (props = it.current()); ++it )
{
TQString file = props->fileName() + " ";
- TQString fileString = line.tqreplace( 3, file.length(), file );
+ TQString fileString = line.replace( 3, file.length(), file );
cout << TQFile::encodeName( fileString ) << endl;
if ( args->isSet( "listsupported" ) )
diff --git a/kio/misc/kntlm/des.cpp b/kio/misc/kntlm/des.cpp
index e1029a4ca..b6683ac34 100644
--- a/kio/misc/kntlm/des.cpp
+++ b/kio/misc/kntlm/des.cpp
@@ -25,7 +25,7 @@ static void permute_fp (unsigned char *inblock, DES_KEY * key, unsigned char *ou
static void perminit_ip (DES_KEY * key);
static void spinit (DES_KEY * key);
static void perminit_fp (DES_KEY * key);
-static TQ_UINT32 f (DES_KEY * key, TQ_UINT32 r, char *subkey);
+static Q_UINT32 f (DES_KEY * key, Q_UINT32 r, char *subkey);
/* Tables defined in the Data Encryption Standard documents */
@@ -211,8 +211,8 @@ ntlm_des_set_key (DES_KEY * dkey, char *user_key, int /*len*/)
for (j = 0; j < 56; j++)
{ /* convert pc1 to bits of key */
l = pc1[j] - 1; /* integer bit location */
- m = l & 07; /* tqfind bit */
- pc1m[j] = (user_key[l >> 3] & /* tqfind which key byte l is in */
+ m = l & 07; /* find bit */
+ pc1m[j] = (user_key[l >> 3] & /* find which key byte l is in */
bytebit[m]) /* and which bit of that byte */
? 1 : 0; /* and store 1-bit result */
@@ -227,7 +227,7 @@ ntlm_des_set_key (DES_KEY * dkey, char *user_key, int /*len*/)
/* check bit that goes to kn[j] */
if (pcr[pc2[j] - 1])
{
- /* tqmask it in if it's there */
+ /* mask it in if it's there */
l = j % 6;
dkey->kn[i][j / 6] |= bytebit[l] >> 2;
}
@@ -240,9 +240,9 @@ ntlm_des_set_key (DES_KEY * dkey, char *user_key, int /*len*/)
static void
ntlm_des_encrypt (DES_KEY * key, unsigned char *block)
{
- TQ_UINT32 left, right;
+ Q_UINT32 left, right;
char *knp;
- TQ_UINT32 work[2]; /* Working data storage */
+ Q_UINT32 work[2]; /* Working data storage */
permute_ip (block, key, (unsigned char *) work); /* Initial Permutation */
left = KFromToBigEndian(work[0]);
@@ -310,7 +310,7 @@ permute_ip (unsigned char *inblock, DES_KEY * key, unsigned char *outblock)
ob = outblock;
p = key->iperm[j][(*ib >> 4) & 0xf];
q = key->iperm[j + 1][*ib & 0xf];
- /* and each output byte, OR the tqmasks together */
+ /* and each output byte, OR the masks together */
*ob++ |= *p++ | *q++;
*ob++ |= *p++ | *q++;
*ob++ |= *p++ | *q++;
@@ -339,7 +339,7 @@ permute_fp (unsigned char *inblock, DES_KEY * key, unsigned char *outblock)
ob = outblock;
p = key->fperm[j][(*ib >> 4) & 0xf];
q = key->fperm[j + 1][*ib & 0xf];
- /* and each output byte, OR the tqmasks together */
+ /* and each output byte, OR the masks together */
*ob++ |= *p++ | *q++;
*ob++ |= *p++ | *q++;
*ob++ |= *p++ | *q++;
@@ -352,11 +352,11 @@ permute_fp (unsigned char *inblock, DES_KEY * key, unsigned char *outblock)
}
/* The nonlinear function f(r,k), the heart of DES */
-static TQ_UINT32
-f (DES_KEY * key, TQ_UINT32 r, char *subkey)
+static Q_UINT32
+f (DES_KEY * key, Q_UINT32 r, char *subkey)
{
- TQ_UINT32 *spp;
- TQ_UINT32 rval, rt;
+ Q_UINT32 *spp;
+ Q_UINT32 rval, rt;
int er;
#ifdef TRACE
@@ -377,7 +377,7 @@ f (DES_KEY * key, TQ_UINT32 r, char *subkey)
spp = &key->sp[7][0];
rval = spp[(er ^ *subkey--) & 0x3f];
spp -= 64;
- rt = (TQ_UINT32) r >> 3;
+ rt = (Q_UINT32) r >> 3;
rval |= spp[((int) rt ^ *subkey--) & 0x3f];
spp -= 64;
rt >>= 4;
@@ -457,7 +457,7 @@ spinit (DES_KEY * key)
{
char pbox[32];
int p, i, s, j, rowcol;
- TQ_UINT32 val;
+ Q_UINT32 val;
/* Compute pbox, the inverse of p32i.
* This is easier to work with
diff --git a/kio/misc/kntlm/des.h b/kio/misc/kntlm/des.h
index 0f6f59dc9..1cb2f27e5 100644
--- a/kio/misc/kntlm/des.h
+++ b/kio/misc/kntlm/des.h
@@ -6,7 +6,7 @@
typedef struct des_key
{
char kn[16][8];
- TQ_UINT32 sp[8][64];
+ Q_UINT32 sp[8][64];
char iperm[16][16][8];
char fperm[16][16][8];
} DES_KEY;
diff --git a/kio/misc/kntlm/kntlm.cpp b/kio/misc/kntlm/kntlm.cpp
index db2b45b6c..a3eca3bdd 100644
--- a/kio/misc/kntlm/kntlm.cpp
+++ b/kio/misc/kntlm/kntlm.cpp
@@ -32,12 +32,12 @@
#include "des.h"
#include "kntlm.h"
-TQString KNTLM::getString( const TQByteArray &buf, const SecBuf &secbuf, bool tqunicode )
+TQString KNTLM::getString( const TQByteArray &buf, const SecBuf &secbuf, bool unicode )
{
//watch for buffer overflows
- TQ_UINT32 offset;
- TQ_UINT16 len;
- offset = KFromToLittleEndian((TQ_UINT32)secbuf.offset);
+ Q_UINT32 offset;
+ Q_UINT16 len;
+ offset = KFromToLittleEndian((Q_UINT32)secbuf.offset);
len = KFromToLittleEndian(secbuf.len);
if ( offset > buf.size() ||
offset + len > buf.size() ) return TQString::null;
@@ -45,10 +45,10 @@ TQString KNTLM::getString( const TQByteArray &buf, const SecBuf &secbuf, bool tq
TQString str;
const char *c = buf.data() + offset;
- if ( tqunicode ) {
+ if ( unicode ) {
str = UnicodeLE2TQString( (TQChar*) c, len >> 1 );
} else {
- str = TQString::tqfromLatin1( c, len );
+ str = TQString::fromLatin1( c, len );
}
return str;
}
@@ -56,9 +56,9 @@ TQString KNTLM::getString( const TQByteArray &buf, const SecBuf &secbuf, bool tq
TQByteArray KNTLM::getBuf( const TQByteArray &buf, const SecBuf &secbuf )
{
TQByteArray ret;
- TQ_UINT32 offset;
- TQ_UINT16 len;
- offset = KFromToLittleEndian((TQ_UINT32)secbuf.offset);
+ Q_UINT32 offset;
+ Q_UINT16 len;
+ offset = KFromToLittleEndian((Q_UINT32)secbuf.offset);
len = KFromToLittleEndian(secbuf.len);
//watch for buffer overflows
if ( offset > buf.size() ||
@@ -67,11 +67,11 @@ TQByteArray KNTLM::getBuf( const TQByteArray &buf, const SecBuf &secbuf )
return ret;
}
-void KNTLM::addString( TQByteArray &buf, SecBuf &secbuf, const TQString &str, bool tqunicode )
+void KNTLM::addString( TQByteArray &buf, SecBuf &secbuf, const TQString &str, bool unicode )
{
TQByteArray tmp;
- if ( tqunicode ) {
+ if ( unicode ) {
tmp = QString2UnicodeLE( str );
addBuf( buf, secbuf, tmp );
} else {
@@ -85,26 +85,26 @@ void KNTLM::addString( TQByteArray &buf, SecBuf &secbuf, const TQString &str, bo
void KNTLM::addBuf( TQByteArray &buf, SecBuf &secbuf, TQByteArray &data )
{
- TQ_UINT32 offset;
- TQ_UINT16 len, maxlen;
+ Q_UINT32 offset;
+ Q_UINT16 len, maxlen;
offset = (buf.size() + 1) & 0xfffffffe;
len = data.size();
maxlen = data.size();
- secbuf.offset = KFromToLittleEndian((TQ_UINT32)offset);
+ secbuf.offset = KFromToLittleEndian((Q_UINT32)offset);
secbuf.len = KFromToLittleEndian(len);
secbuf.maxlen = KFromToLittleEndian(maxlen);
buf.resize( offset + len );
memcpy( buf.data() + offset, data.data(), data.size() );
}
-bool KNTLM::getNegotiate( TQByteArray &negotiate, const TQString &domain, const TQString &workstation, TQ_UINT32 flags )
+bool KNTLM::getNegotiate( TQByteArray &negotiate, const TQString &domain, const TQString &workstation, Q_UINT32 flags )
{
TQByteArray rbuf( sizeof(Negotiate) );
rbuf.fill( 0 );
memcpy( rbuf.data(), "NTLMSSP", 8 );
- ((Negotiate*) rbuf.data())->msgType = KFromToLittleEndian( (TQ_UINT32)1 );
+ ((Negotiate*) rbuf.data())->msgType = KFromToLittleEndian( (Q_UINT32)1 );
if ( !domain.isEmpty() ) {
flags |= Negotiate_Domain_Supplied;
addString( rbuf, ((Negotiate*) rbuf.data())->domain, domain );
@@ -126,21 +126,21 @@ bool KNTLM::getAuth( TQByteArray &auth, const TQByteArray &challenge, const TQSt
Challenge *ch = (Challenge *) challenge.data();
TQByteArray response;
uint chsize = challenge.size();
- bool tqunicode = false;
+ bool unicode = false;
TQString dom;
//challenge structure too small
if ( chsize < 32 ) return false;
- tqunicode = KFromToLittleEndian(ch->flags) & Negotiate_Unicode;
+ unicode = KFromToLittleEndian(ch->flags) & Negotiate_Unicode;
if ( domain.isEmpty() )
- dom = getString( challenge, ch->targetName, tqunicode );
+ dom = getString( challenge, ch->targetName, unicode );
else
dom = domain;
rbuf.fill( 0 );
memcpy( rbuf.data(), "NTLMSSP", 8 );
- ((Auth*) rbuf.data())->msgType = KFromToLittleEndian( (TQ_UINT32)3 );
+ ((Auth*) rbuf.data())->msgType = KFromToLittleEndian( (Q_UINT32)3 );
((Auth*) rbuf.data())->flags = ch->flags;
TQByteArray targetInfo = getBuf( challenge, ch->targetInfo );
@@ -164,10 +164,10 @@ bool KNTLM::getAuth( TQByteArray &auth, const TQByteArray &challenge, const TQSt
addBuf( rbuf, ((Auth*) rbuf.data())->lmResponse, response );
// }
if ( !dom.isEmpty() )
- addString( rbuf, ((Auth*) rbuf.data())->domain, dom, tqunicode );
- addString( rbuf, ((Auth*) rbuf.data())->user, user, tqunicode );
+ addString( rbuf, ((Auth*) rbuf.data())->domain, dom, unicode );
+ addString( rbuf, ((Auth*) rbuf.data())->user, user, unicode );
if ( !workstation.isEmpty() )
- addString( rbuf, ((Auth*) rbuf.data())->workstation, workstation, tqunicode );
+ addString( rbuf, ((Auth*) rbuf.data())->workstation, workstation, unicode );
auth = rbuf;
@@ -241,10 +241,10 @@ TQByteArray KNTLM::getNTLMResponse( const TQString &password, const unsigned cha
TQByteArray KNTLM::ntlmHash( const TQString &password )
{
KMD4::Digest digest;
- TQByteArray ret, tqunicode;
- tqunicode = QString2UnicodeLE( password );
+ TQByteArray ret, unicode;
+ unicode = QString2UnicodeLE( password );
- KMD4 md4( tqunicode );
+ KMD4 md4( unicode );
md4.rawDigest( digest );
ret.duplicate( (const char*) digest, sizeof( digest ) );
return ret;
@@ -298,10 +298,10 @@ TQByteArray KNTLM::createBlob( const TQByteArray &targetinfo )
blob.fill( 0 );
Blob *bl = (Blob *) blob.data();
- bl->signature = KFromToBigEndian( (TQ_UINT32) 0x01010000 );
- TQ_UINT64 now = TQDateTime::tqcurrentDateTime().toTime_t();
- now += (TQ_UINT64)3600*(TQ_UINT64)24*(TQ_UINT64)134774;
- now *= (TQ_UINT64)10000000;
+ bl->signature = KFromToBigEndian( (Q_UINT32) 0x01010000 );
+ Q_UINT64 now = TQDateTime::currentDateTime().toTime_t();
+ now += (Q_UINT64)3600*(Q_UINT64)24*(Q_UINT64)134774;
+ now *= (Q_UINT64)10000000;
bl->timestamp = KFromToLittleEndian( now );
for ( uint i = 0; i<8; i++ ) {
bl->challenge[i] = KApplication::random() % 0xff;
@@ -312,7 +312,7 @@ TQByteArray KNTLM::createBlob( const TQByteArray &targetinfo )
TQByteArray KNTLM::hmacMD5( const TQByteArray &data, const TQByteArray &key )
{
- TQ_UINT8 ipad[64], opad[64];
+ Q_UINT8 ipad[64], opad[64];
KMD5::Digest digest;
TQByteArray ret;
@@ -372,18 +372,18 @@ void KNTLM::convertKey( unsigned char *key_56, void* ks )
TQByteArray KNTLM::QString2UnicodeLE( const TQString &target )
{
- TQByteArray tqunicode( target.length() * 2 );
+ TQByteArray unicode( target.length() * 2 );
for ( uint i = 0; i < target.length(); i++ ) {
- ((TQ_UINT16*)tqunicode.data())[ i ] = KFromToLittleEndian( target[i].tqunicode() );
+ ((Q_UINT16*)unicode.data())[ i ] = KFromToLittleEndian( target[i].unicode() );
}
- return tqunicode;
+ return unicode;
}
TQString KNTLM::UnicodeLE2TQString( const TQChar* data, uint len )
{
TQString ret;
for ( uint i = 0; i < len; i++ ) {
- ret += KFromToLittleEndian( data[ i ].tqunicode() );
+ ret += KFromToLittleEndian( data[ i ].unicode() );
}
return ret;
}
diff --git a/kio/misc/kntlm/kntlm.h b/kio/misc/kntlm/kntlm.h
index 23f00aa2a..9be4ea357 100644
--- a/kio/misc/kntlm/kntlm.h
+++ b/kio/misc/kntlm/kntlm.h
@@ -33,7 +33,7 @@
* can be used for various servers which implements NTLM type authentication.
* A comprehensive description of the NTLM authentication protocol can be found
* at http://davenport.sourceforge.net/ntlm.html
- * The class also tqcontains methods to create the LanManager and NT (MD4) hashes
+ * The class also contains methods to create the LanManager and NT (MD4) hashes
* of a password.
* This class doesn't maintain any state information, so all methods are static.
*/
@@ -70,9 +70,9 @@ public:
typedef struct
{
- TQ_UINT16 len;
- TQ_UINT16 maxlen;
- TQ_UINT32 offset;
+ Q_UINT16 len;
+ Q_UINT16 maxlen;
+ Q_UINT32 offset;
} SecBuf;
/**
@@ -81,8 +81,8 @@ public:
typedef struct
{
char signature[8]; /* "NTLMSSP\0" */
- TQ_UINT32 msgType; /* 1 */
- TQ_UINT32 flags;
+ Q_UINT32 msgType; /* 1 */
+ Q_UINT32 flags;
SecBuf domain;
SecBuf workstation;
} Negotiate;
@@ -93,11 +93,11 @@ public:
typedef struct
{
char signature[8];
- TQ_UINT32 msgType; /* 2 */
+ Q_UINT32 msgType; /* 2 */
SecBuf targetName;
- TQ_UINT32 flags;
- TQ_UINT8 challengeData[8];
- TQ_UINT32 context[2];
+ Q_UINT32 flags;
+ Q_UINT8 challengeData[8];
+ Q_UINT32 context[2];
SecBuf targetInfo;
} Challenge;
@@ -107,23 +107,23 @@ public:
typedef struct
{
char signature[8];
- TQ_UINT32 msgType; /* 3 */
+ Q_UINT32 msgType; /* 3 */
SecBuf lmResponse;
SecBuf ntResponse;
SecBuf domain;
SecBuf user;
SecBuf workstation;
SecBuf sessionKey;
- TQ_UINT32 flags;
+ Q_UINT32 flags;
} Auth;
typedef struct
{
- TQ_UINT32 signature;
- TQ_UINT32 reserved;
- TQ_UINT64 timestamp;
- TQ_UINT8 challenge[8];
- TQ_UINT8 unknown[4];
+ Q_UINT32 signature;
+ Q_UINT32 reserved;
+ Q_UINT64 timestamp;
+ Q_UINT8 challenge[8];
+ Q_UINT8 unknown[4];
//Target info block - variable length
} Blob;
@@ -139,7 +139,7 @@ public:
*/
static bool getNegotiate( TQByteArray &negotiate, const TQString &domain = TQString::null,
const TQString &workstation = TQString::null,
- TQ_UINT32 flags = Negotiate_Unicode | Request_Target | Negotiate_NTLM );
+ Q_UINT32 flags = Negotiate_Unicode | Request_Target | Negotiate_NTLM );
/**
* Creates the type 3 message which should be sent to the server after
* the challenge (type 2) received.
@@ -212,7 +212,7 @@ public:
/**
* Extracts a string field from an NTLM structure.
*/
- static TQString getString( const TQByteArray &buf, const SecBuf &secbuf, bool tqunicode );
+ static TQString getString( const TQByteArray &buf, const SecBuf &secbuf, bool unicode );
/**
* Extracts a byte array from an NTLM structure.
*/
@@ -226,7 +226,7 @@ private:
static TQString UnicodeLE2TQString( const TQChar* data, uint len );
static void addBuf( TQByteArray &buf, SecBuf &secbuf, TQByteArray &data );
- static void addString( TQByteArray &buf, SecBuf &secbuf, const TQString &str, bool tqunicode = false );
+ static void addString( TQByteArray &buf, SecBuf &secbuf, const TQString &str, bool unicode = false );
static void convertKey( unsigned char *key_56, void* ks );
};
diff --git a/kio/misc/kntlm/kswap.h b/kio/misc/kntlm/kswap.h
index 6f935237e..336321fd4 100644
--- a/kio/misc/kntlm/kswap.h
+++ b/kio/misc/kntlm/kswap.h
@@ -28,7 +28,7 @@
/**
* \defgroup KSWAP Byte-swapping functions
- * kswap.h tqcontains functions that will help converting
+ * kswap.h contains functions that will help converting
* 16, 32 and 64 bit length data between little-endian and
* big-endian representations.
*
@@ -47,52 +47,52 @@
#ifdef HAVE_BYTESWAP_H
#include <byteswap.h>
- inline TQ_UINT16 KSWAP_16( TQ_UINT16 b ) { return bswap_16( b ); }
- inline TQ_INT16 KSWAP_16( TQ_INT16 b ) { return bswap_16( (TQ_UINT16)b ); }
- inline TQ_UINT32 KSWAP_32( TQ_UINT32 b ) { return bswap_32( b ); }
- inline TQ_INT32 KSWAP_32( TQ_INT32 b ) { return bswap_32( (TQ_UINT32)b ); }
- inline TQ_UINT64 KSWAP_64( TQ_UINT64 b ) { return bswap_64( b ); }
- inline TQ_INT64 KSWAP_64( TQ_INT64 b ) { return bswap_64( (TQ_UINT64)b ); }
+ inline Q_UINT16 KSWAP_16( Q_UINT16 b ) { return bswap_16( b ); }
+ inline Q_INT16 KSWAP_16( Q_INT16 b ) { return bswap_16( (Q_UINT16)b ); }
+ inline Q_UINT32 KSWAP_32( Q_UINT32 b ) { return bswap_32( b ); }
+ inline Q_INT32 KSWAP_32( Q_INT32 b ) { return bswap_32( (Q_UINT32)b ); }
+ inline Q_UINT64 KSWAP_64( Q_UINT64 b ) { return bswap_64( b ); }
+ inline Q_INT64 KSWAP_64( Q_INT64 b ) { return bswap_64( (Q_UINT64)b ); }
#else /* HAVE_BYTESWAP_H */
#ifdef WORDS_BIGENDIAN
- inline TQ_UINT16 KSWAP_16( TQ_UINT16 b )
+ inline Q_UINT16 KSWAP_16( Q_UINT16 b )
{
return (((b) & 0x00ff) << 8 | ((b) & 0xff00) >> 8);
}
- inline TQ_INT16 KSWAP_16( TQ_INT16 b )
+ inline Q_INT16 KSWAP_16( Q_INT16 b )
{
- return ((((TQ_UINT16)b) & 0x00ff) << 8 | (((TQ_UINT16)b) & 0xff00) >> 8);
+ return ((((Q_UINT16)b) & 0x00ff) << 8 | (((Q_UINT16)b) & 0xff00) >> 8);
}
- inline TQ_UINT32 KSWAP_32( TQ_UINT32 b )
+ inline Q_UINT32 KSWAP_32( Q_UINT32 b )
{
return
((((b) & 0xff000000) >> 24) | (((b) & 0x00ff0000) >> 8) | \
(((b) & 0x0000ff00) << 8) | (((b) & 0x000000ff) << 24));
}
- inline TQ_INT32 KSWAP_32( TQ_INT32 b )
+ inline Q_INT32 KSWAP_32( Q_INT32 b )
{
return
- (((((TQ_UINT32)b) & 0xff000000) >> 24) | ((((TQ_UINT32)b) & 0x00ff0000) >> 8) | \
- ((((TQ_UINT32)b) & 0x0000ff00) << 8) | ((((TQ_UINT32)b) & 0x000000ff) << 24));
+ (((((Q_UINT32)b) & 0xff000000) >> 24) | ((((Q_UINT32)b) & 0x00ff0000) >> 8) | \
+ ((((Q_UINT32)b) & 0x0000ff00) << 8) | ((((Q_UINT32)b) & 0x000000ff) << 24));
}
#else /* WORDS_BIGENDIAN */
#include <sys/types.h>
#include <netinet/in.h>
- inline TQ_UINT16 KSWAP_16( TQ_UINT16 b ) { return htons(b); }
- inline TQ_INT16 KSWAP_16( TQ_INT16 b ) { return htons((TQ_UINT16)b); }
- inline TQ_UINT32 KSWAP_32( TQ_UINT32 b ) { return htonl(b); }
- inline TQ_INT32 KSWAP_32( TQ_INT32 b ) { return htonl((TQ_UINT32)b); }
+ inline Q_UINT16 KSWAP_16( Q_UINT16 b ) { return htons(b); }
+ inline Q_INT16 KSWAP_16( Q_INT16 b ) { return htons((Q_UINT16)b); }
+ inline Q_UINT32 KSWAP_32( Q_UINT32 b ) { return htonl(b); }
+ inline Q_INT32 KSWAP_32( Q_INT32 b ) { return htonl((Q_UINT32)b); }
#endif
- inline TQ_UINT64 KSWAP_64( TQ_UINT64 b )
+ inline Q_UINT64 KSWAP_64( Q_UINT64 b )
{
union {
- TQ_UINT64 ll;
- TQ_UINT32 l[2];
+ Q_UINT64 ll;
+ Q_UINT32 l[2];
} w, r;
w.ll = b;
r.l[0] = KSWAP_32( w.l[1] );
@@ -100,13 +100,13 @@
return r.ll;
}
- inline TQ_INT64 KSWAP_64( TQ_INT64 b )
+ inline Q_INT64 KSWAP_64( Q_INT64 b )
{
union {
- TQ_UINT64 ll;
- TQ_UINT32 l[2];
+ Q_UINT64 ll;
+ Q_UINT32 l[2];
} w, r;
- w.ll = (TQ_UINT64) b;
+ w.ll = (Q_UINT64) b;
r.l[0] = KSWAP_32( w.l[1] );
r.l[1] = KSWAP_32( w.l[0] );
return r.ll;
@@ -117,7 +117,7 @@
* \ingroup KSWAP
* Converts a 16 bit unsigned value from/to big-endian byte order to/from the machine order.
*/
-inline TQ_UINT16 KFromToBigEndian( TQ_UINT16 b )
+inline Q_UINT16 KFromToBigEndian( Q_UINT16 b )
{
#ifdef WORDS_BIGENDIAN
return b;
@@ -130,7 +130,7 @@ inline TQ_UINT16 KFromToBigEndian( TQ_UINT16 b )
* \ingroup KSWAP
* Converts a 16 bit unsigned array from/to big-endian byte order to/from the machine order.
*/
-inline void KFromToBigEndian( TQ_UINT16 *out, TQ_UINT16 *in, uint len )
+inline void KFromToBigEndian( Q_UINT16 *out, Q_UINT16 *in, uint len )
{
#ifdef WORDS_BIGENDIAN
if ( out != in ) memcpy( out, in, len<<1 ) ;
@@ -143,7 +143,7 @@ inline void KFromToBigEndian( TQ_UINT16 *out, TQ_UINT16 *in, uint len )
* \ingroup KSWAP
* Converts a 32 bit unsigned value from/to big-endian byte order to/from the machine order.
*/
-inline TQ_UINT32 KFromToBigEndian( TQ_UINT32 b )
+inline Q_UINT32 KFromToBigEndian( Q_UINT32 b )
{
#ifdef WORDS_BIGENDIAN
return b;
@@ -156,7 +156,7 @@ inline TQ_UINT32 KFromToBigEndian( TQ_UINT32 b )
* \ingroup KSWAP
* Converts a 32 bit unsigned array from/to big-endian byte order to/from the machine order.
*/
-inline void KFromToBigEndian( TQ_UINT32 *out, TQ_UINT32 *in, uint len )
+inline void KFromToBigEndian( Q_UINT32 *out, Q_UINT32 *in, uint len )
{
#ifdef WORDS_BIGENDIAN
if ( out != in ) memcpy( out, in, len<<2 ) ;
@@ -169,7 +169,7 @@ inline void KFromToBigEndian( TQ_UINT32 *out, TQ_UINT32 *in, uint len )
* \ingroup KSWAP
* Converts a 64 bit unsigned value from/to big-endian byte order to/from the machine order.
*/
-inline TQ_UINT64 KFromToBigEndian( TQ_UINT64 b )
+inline Q_UINT64 KFromToBigEndian( Q_UINT64 b )
{
#ifdef WORDS_BIGENDIAN
return b;
@@ -182,7 +182,7 @@ inline TQ_UINT64 KFromToBigEndian( TQ_UINT64 b )
* \ingroup KSWAP
* Converts a 64 bit unsigned array from/to big-endian byte order to/from the machine order.
*/
-inline void KFromToBigEndian( TQ_UINT64 *out, TQ_UINT64 *in, uint len )
+inline void KFromToBigEndian( Q_UINT64 *out, Q_UINT64 *in, uint len )
{
#ifdef WORDS_BIGENDIAN
if ( out != in ) memcpy( out, in, len<<3 ) ;
@@ -195,7 +195,7 @@ inline void KFromToBigEndian( TQ_UINT64 *out, TQ_UINT64 *in, uint len )
* \ingroup KSWAP
* Converts a 16 bit signed value from/to big-endian byte order to/from the machine order.
*/
-inline TQ_INT16 KFromToBigEndian( TQ_INT16 b )
+inline Q_INT16 KFromToBigEndian( Q_INT16 b )
{
#ifdef WORDS_BIGENDIAN
return b;
@@ -208,7 +208,7 @@ inline TQ_INT16 KFromToBigEndian( TQ_INT16 b )
* \ingroup KSWAP
* Converts a 16 bit signed array from/to big-endian byte order to/from the machine order.
*/
-inline void KFromToBigEndian( TQ_INT16 *out, TQ_INT16 *in, uint len )
+inline void KFromToBigEndian( Q_INT16 *out, Q_INT16 *in, uint len )
{
#ifdef WORDS_BIGENDIAN
if ( out != in ) memcpy( out, in, len<<1 ) ;
@@ -221,7 +221,7 @@ inline void KFromToBigEndian( TQ_INT16 *out, TQ_INT16 *in, uint len )
* \ingroup KSWAP
* Converts a 32 bit signed value from/to big-endian byte order to/from the machine order.
*/
-inline TQ_INT32 KFromToBigEndian( TQ_INT32 b )
+inline Q_INT32 KFromToBigEndian( Q_INT32 b )
{
#ifdef WORDS_BIGENDIAN
return b;
@@ -234,7 +234,7 @@ inline TQ_INT32 KFromToBigEndian( TQ_INT32 b )
* \ingroup KSWAP
* Converts a 32 bit signed array from/to big-endian byte order to/from the machine order.
*/
-inline void KFromToBigEndian( TQ_INT32 *out, TQ_INT32 *in, uint len )
+inline void KFromToBigEndian( Q_INT32 *out, Q_INT32 *in, uint len )
{
#ifdef WORDS_BIGENDIAN
if ( out != in ) memcpy( out, in, len<<2 ) ;
@@ -247,7 +247,7 @@ inline void KFromToBigEndian( TQ_INT32 *out, TQ_INT32 *in, uint len )
* \ingroup KSWAP
* Converts a 64 bit signed value from/to big-endian byte order to/from the machine order.
*/
-inline TQ_INT64 KFromToBigEndian( TQ_INT64 b )
+inline Q_INT64 KFromToBigEndian( Q_INT64 b )
{
#ifdef WORDS_BIGENDIAN
return b;
@@ -260,7 +260,7 @@ inline TQ_INT64 KFromToBigEndian( TQ_INT64 b )
* \ingroup KSWAP
* Converts a 64 bit signed array from/to big-endian byte order to/from the machine order.
*/
-inline void KFromToBigEndian( TQ_INT64 *out, TQ_INT64 *in, uint len )
+inline void KFromToBigEndian( Q_INT64 *out, Q_INT64 *in, uint len )
{
#ifdef WORDS_BIGENDIAN
if ( out != in ) memcpy( out, in, len<<3 ) ;
@@ -273,7 +273,7 @@ inline void KFromToBigEndian( TQ_INT64 *out, TQ_INT64 *in, uint len )
* \ingroup KSWAP
* Converts a 16 bit unsigned value from/to little-endian byte order to/from the machine order.
*/
-inline TQ_UINT16 KFromToLittleEndian( TQ_UINT16 b )
+inline Q_UINT16 KFromToLittleEndian( Q_UINT16 b )
{
#ifndef WORDS_BIGENDIAN
return b;
@@ -286,7 +286,7 @@ inline TQ_UINT16 KFromToLittleEndian( TQ_UINT16 b )
* \ingroup KSWAP
* Converts a 16 bit unsigned array from/to little-endian byte order to/from the machine order.
*/
-inline void KFromToLittleEndian( TQ_UINT16 *out, TQ_UINT16 *in, uint len )
+inline void KFromToLittleEndian( Q_UINT16 *out, Q_UINT16 *in, uint len )
{
#ifndef WORDS_BIGENDIAN
if ( out != in ) memcpy( out, in, len<<1 ) ;
@@ -299,7 +299,7 @@ inline void KFromToLittleEndian( TQ_UINT16 *out, TQ_UINT16 *in, uint len )
* \ingroup KSWAP
* Converts a 32 bit unsigned value from/to little-endian byte order to/from the machine order.
*/
-inline TQ_UINT32 KFromToLittleEndian( TQ_UINT32 b )
+inline Q_UINT32 KFromToLittleEndian( Q_UINT32 b )
{
#ifndef WORDS_BIGENDIAN
return b;
@@ -312,7 +312,7 @@ inline TQ_UINT32 KFromToLittleEndian( TQ_UINT32 b )
* \ingroup KSWAP
* Converts a 32 bit unsigned array from/to little-endian byte order to/from the machine order.
*/
-inline void KFromToLittleEndian( TQ_UINT32 *out, TQ_UINT32 *in, uint len )
+inline void KFromToLittleEndian( Q_UINT32 *out, Q_UINT32 *in, uint len )
{
#ifndef WORDS_BIGENDIAN
if ( out != in ) memcpy( out, in, len<<2 ) ;
@@ -325,7 +325,7 @@ inline void KFromToLittleEndian( TQ_UINT32 *out, TQ_UINT32 *in, uint len )
* \ingroup KSWAP
* Converts a 64 bit unsigned value from/to little-endian byte order to/from the machine order.
*/
-inline TQ_UINT64 KFromToLittleEndian( TQ_UINT64 b )
+inline Q_UINT64 KFromToLittleEndian( Q_UINT64 b )
{
#ifndef WORDS_BIGENDIAN
return b;
@@ -338,7 +338,7 @@ inline TQ_UINT64 KFromToLittleEndian( TQ_UINT64 b )
* \ingroup KSWAP
* Converts a 64 bit unsigned array from/to little-endian byte order to/from the machine order.
*/
-inline void KFromToLittleEndian( TQ_UINT64 *out, TQ_UINT64 *in, uint len )
+inline void KFromToLittleEndian( Q_UINT64 *out, Q_UINT64 *in, uint len )
{
#ifndef WORDS_BIGENDIAN
if ( out != in ) memcpy( out, in, len<<3 ) ;
@@ -351,7 +351,7 @@ inline void KFromToLittleEndian( TQ_UINT64 *out, TQ_UINT64 *in, uint len )
* \ingroup KSWAP
* Converts a 16 bit signed value from/to little-endian byte order to/from the machine order.
*/
-inline TQ_INT16 KFromToLittleEndian( TQ_INT16 b )
+inline Q_INT16 KFromToLittleEndian( Q_INT16 b )
{
#ifndef WORDS_BIGENDIAN
return b;
@@ -364,7 +364,7 @@ inline TQ_INT16 KFromToLittleEndian( TQ_INT16 b )
* \ingroup KSWAP
* Converts a 16 bit signed array from/to little-endian byte order to/from the machine order.
*/
-inline void KFromToLittleEndian( TQ_INT16 *out, TQ_INT16 *in, uint len )
+inline void KFromToLittleEndian( Q_INT16 *out, Q_INT16 *in, uint len )
{
#ifndef WORDS_BIGENDIAN
if ( out != in ) memcpy( out, in, len<<1 ) ;
@@ -377,7 +377,7 @@ inline void KFromToLittleEndian( TQ_INT16 *out, TQ_INT16 *in, uint len )
* \ingroup KSWAP
* Converts a 32 bit signed value from/to little-endian byte order to/from the machine order.
*/
-inline TQ_INT32 KFromToLittleEndian( TQ_INT32 b )
+inline Q_INT32 KFromToLittleEndian( Q_INT32 b )
{
#ifndef WORDS_BIGENDIAN
return b;
@@ -390,7 +390,7 @@ inline TQ_INT32 KFromToLittleEndian( TQ_INT32 b )
* \ingroup KSWAP
* Converts a 32 bit signed array from/to little-endian byte order to/from the machine order.
*/
-inline void KFromToLittleEndian( TQ_INT32 *out, TQ_INT32 *in, uint len )
+inline void KFromToLittleEndian( Q_INT32 *out, Q_INT32 *in, uint len )
{
#ifndef WORDS_BIGENDIAN
if ( out != in ) memcpy( out, in, len<<2 ) ;
@@ -403,7 +403,7 @@ inline void KFromToLittleEndian( TQ_INT32 *out, TQ_INT32 *in, uint len )
* \ingroup KSWAP
* Converts a 64 bit signed value from/to little-endian byte order to/from the machine order.
*/
-inline TQ_INT64 KFromToLittleEndian( TQ_INT64 b )
+inline Q_INT64 KFromToLittleEndian( Q_INT64 b )
{
#ifndef WORDS_BIGENDIAN
return b;
@@ -416,7 +416,7 @@ inline TQ_INT64 KFromToLittleEndian( TQ_INT64 b )
* \ingroup KSWAP
* Converts a 64 bit signed array from/to little-endian byte order to/from the machine order.
*/
-inline void KFromToLittleEndian( TQ_INT64 *out, TQ_INT64 *in, uint len )
+inline void KFromToLittleEndian( Q_INT64 *out, Q_INT64 *in, uint len )
{
#ifndef WORDS_BIGENDIAN
if ( out != in ) memcpy( out, in, len<<3 ) ;
diff --git a/kio/misc/kpac/README.wpad b/kio/misc/kpac/README.wpad
index ed18a36b5..f63d25764 100644
--- a/kio/misc/kpac/README.wpad
+++ b/kio/misc/kpac/README.wpad
@@ -2,7 +2,7 @@ Web Proxy Auto Discovery (WPAD)
===============================
This README is intended for network administrators who want to enable the
-users on their network to fully automatically tqfind the proxy settings.
+users on their network to fully automatically find the proxy settings.
Automatic proxy discovery works in two steps:
1) Find a configuration script
@@ -12,7 +12,7 @@ The configuration script is a "PAC" (JavaScript) file just as in plain Proxy
Auto Configuration as described here:
http://home.netscape.com/eng/mozilla/2.0/relnotes/demo/proxy-live.html
-The WPAD part of the process (#1 above) described here is about how to tqfind
+The WPAD part of the process (#1 above) described here is about how to find
this script without having the users enter its URL into the proxy settings.
(All they have to do in a WPAD-enabled network is to select "Automatically
detected script file" in KDE's proxy setup.
diff --git a/kio/misc/kpac/discovery.cpp b/kio/misc/kpac/discovery.cpp
index 193b46d98..7a84958f7 100644
--- a/kio/misc/kpac/discovery.cpp
+++ b/kio/misc/kpac/discovery.cpp
@@ -113,11 +113,11 @@ namespace KPAC
void Discovery::failed()
{
- setError( i18n( "Could not tqfind a usable proxy configuration script" ) );
+ setError( i18n( "Could not find a usable proxy configuration script" ) );
// If this is the first DNS query, initialize our host name or abort
// on failure. Otherwise abort if the current domain (which was already
- // queried for a host called "wpad" tqcontains a SOA record)
+ // queried for a host called "wpad" contains a SOA record)
bool firstQuery = m_hostname.isEmpty();
if ( ( firstQuery && !initHostName() ) ||
( !firstQuery && !checkDomain() ) )
@@ -126,7 +126,7 @@ namespace KPAC
return;
}
- int dot = m_hostname.tqfind( '.' );
+ int dot = m_hostname.find( '.' );
if ( dot >= 0 )
{
m_hostname.remove( 0, dot + 1 ); // remove one domain level
diff --git a/kio/misc/kpac/downloader.h b/kio/misc/kpac/downloader.h
index 82418882f..05d8569cc 100644
--- a/kio/misc/kpac/downloader.h
+++ b/kio/misc/kpac/downloader.h
@@ -29,7 +29,7 @@ namespace KIO { class Job; }
namespace KPAC
{
- class Downloader : public TQObject
+ class Downloader : public QObject
{
Q_OBJECT
public:
diff --git a/kio/misc/kpac/proxyscout.cpp b/kio/misc/kpac/proxyscout.cpp
index f843dc045..6cba79db6 100644
--- a/kio/misc/kpac/proxyscout.cpp
+++ b/kio/misc/kpac/proxyscout.cpp
@@ -162,9 +162,9 @@ namespace KPAC
// this particular case, simply calling setProtocol() on
// it trashes the whole URL.
int len = proxyURL.protocol().length();
- if ( !proxyURL.isValid() || proxy.tqfind( ":/", len ) != len )
+ if ( !proxyURL.isValid() || proxy.find( ":/", len ) != len )
proxy.prepend("http://");
- BlackList::Iterator it = m_blackList.tqfind( proxy );
+ BlackList::Iterator it = m_blackList.find( proxy );
if ( it == m_blackList.end() ) return proxy;
else if ( std::time( 0 ) - *it > 1800 ) // 30 minutes
{
diff --git a/kio/misc/kpac/script.cpp b/kio/misc/kpac/script.cpp
index 752fb4cc5..55faef8a1 100644
--- a/kio/misc/kpac/script.cpp
+++ b/kio/misc/kpac/script.cpp
@@ -49,7 +49,7 @@ TQString UString::qstring() const
UString::UString( const TQString &s )
{
UChar* data = new UChar[ s.length() ];
- std::memcpy( data, s.tqunicode(), s.length() * sizeof( UChar ) );
+ std::memcpy( data, s.unicode(), s.length() * sizeof( UChar ) );
rep = Rep::create( data, s.length() );
}
@@ -98,7 +98,7 @@ namespace
virtual bool implementsCall() const { return true; }
- static int tqfindString( const UString& s, const char* const* values )
+ static int findString( const UString& s, const char* const* values )
{
int index = 0;
UString lower = s.toLower();
@@ -123,13 +123,13 @@ namespace
};
// isPlainHostName( host )
- // @returns true if @p host doesn't tqcontains a domain part
+ // @returns true if @p host doesn't contains a domain part
struct IsPlainHostName : public Function
{
virtual Value call( ExecState* exec, Object&, const List& args )
{
if ( args.size() != 1 ) return Undefined();
- return Boolean( args[ 0 ].toString( exec ).tqfind( "." ) == -1 );
+ return Boolean( args[ 0 ].toString( exec ).find( "." ) == -1 );
}
};
@@ -154,7 +154,7 @@ namespace
{
if ( args.size() != 2 ) return Undefined();
UString host = args[ 0 ].toString( exec ).toLower();
- if ( host.tqfind( "." ) == -1 ) return Boolean( true );
+ if ( host.find( "." ) == -1 ) return Boolean( true );
UString fqdn = args[ 1 ].toString( exec ).toLower();
return Boolean( host == fqdn );
}
@@ -173,9 +173,9 @@ namespace
}
};
- // isInNet( host, subnet, tqmask )
+ // isInNet( host, subnet, mask )
// @returns true if @p host is within the IP subnet
- // specified via @p subnet and @p tqmask
+ // specified via @p subnet and @p mask
struct IsInNet : public Function
{
virtual Value call( ExecState* exec, Object&, const List& args )
@@ -185,8 +185,8 @@ namespace
{
in_addr_t host = Address::resolve( args[ 0 ].toString( exec ) );
in_addr_t subnet = Address::parse( args[ 1 ].toString( exec ) );
- in_addr_t tqmask = Address::parse( args[ 2 ].toString( exec ) );
- return Boolean( ( host & tqmask ) == ( subnet & tqmask ) );
+ in_addr_t mask = Address::parse( args[ 2 ].toString( exec ) );
+ return Boolean( ( host & mask ) == ( subnet & mask ) );
}
catch ( const Address::Error& )
{
@@ -259,10 +259,10 @@ namespace
if ( args.size() < 1 || args.size() > 3 ) return Undefined();
static const char* const days[] =
{ "sun", "mon", "tue", "wed", "thu", "fri", "sat", 0 };
- int d1 = tqfindString( args[ 0 ].toString( exec ), days );
+ int d1 = findString( args[ 0 ].toString( exec ), days );
if ( d1 == -1 ) return Undefined();
- int d2 = tqfindString( args[ 1 ].toString( exec ), days );
+ int d2 = findString( args[ 1 ].toString( exec ), days );
if ( d2 == -1 ) d2 = d1;
return checkRange( getTime( exec, args )->tm_wday, d1, d2 );
}
@@ -293,7 +293,7 @@ namespace
int value = -1;
if ( args[ i ].isA( NumberType ) )
value = args[ i ].toInteger( exec );
- else value = tqfindString( args[ i ].toString( exec ), months );
+ else value = findString( args[ i ].toString( exec ), months );
if ( value >= 0 ) values.push_back( value );
else break;
}
@@ -441,16 +441,16 @@ namespace KPAC
TQString Script::evaluate( const KURL& url )
{
ExecState *exec = m_interpreter.globalExec();
- Value tqfindFunc = m_interpreter.globalObject().get( exec, "FindProxyForURL" );
- Object tqfindObj = Object::dynamicCast( tqfindFunc );
- if (!tqfindObj.isValid() || !tqfindObj.implementsCall())
+ Value findFunc = m_interpreter.globalObject().get( exec, "FindProxyForURL" );
+ Object findObj = Object::dynamicCast( findFunc );
+ if (!findObj.isValid() || !findObj.implementsCall())
throw Error( "No such function FindProxyForURL" );
Object thisObj;
List args;
args.append(String(url.url()));
args.append(String(url.host()));
- Value retval = tqfindObj.call( exec, thisObj, args );
+ Value retval = findObj.call( exec, thisObj, args );
if ( exec->hadException() ) {
Value ex = exec->exception();
diff --git a/kio/misc/ksendbugmail/main.cpp b/kio/misc/ksendbugmail/main.cpp
index 4a4449ba2..d84e4c297 100644
--- a/kio/misc/ksendbugmail/main.cpp
+++ b/kio/misc/ksendbugmail/main.cpp
@@ -101,11 +101,11 @@ int main(int argc, char **argv) {
if (!fromaddr.isEmpty()) {
TQString name = emailConfig.getSetting(KEMailSettings::RealName);
if (!name.isEmpty())
- fromaddr = name + TQString::tqfromLatin1(" <") + fromaddr + TQString::tqfromLatin1(">");
+ fromaddr = name + TQString::fromLatin1(" <") + fromaddr + TQString::fromLatin1(">");
} else {
struct passwd *p;
p = getpwuid(getuid());
- fromaddr = TQString::tqfromLatin1(p->pw_name);
+ fromaddr = TQString::fromLatin1(p->pw_name);
fromaddr += "@";
char buffer[256];
buffer[0] = '\0';
@@ -117,7 +117,7 @@ int main(int argc, char **argv) {
TQString server = emailConfig.getSetting(KEMailSettings::OutServer);
if (server.isEmpty())
- server=TQString::tqfromLatin1("bugs.kde.org");
+ server=TQString::fromLatin1("bugs.kde.org");
SMTP *sm = new SMTP;
BugMailer bm(sm);
@@ -129,7 +129,7 @@ int main(int argc, char **argv) {
sm->setSenderAddress(fromaddr);
sm->setRecipientAddress(recipient);
sm->setMessageSubject(subject);
- sm->setMessageHeader(TQString::tqfromLatin1("From: %1\r\nTo: %2\r\n").arg(fromaddr).arg(recipient));
+ sm->setMessageHeader(TQString::fromLatin1("From: %1\r\nTo: %2\r\n").arg(fromaddr).arg(recipient));
sm->setMessageBody(text);
sm->sendMessage();
diff --git a/kio/misc/ksendbugmail/smtp.cpp b/kio/misc/ksendbugmail/smtp.cpp
index 4581d01d4..36a417b88 100644
--- a/kio/misc/ksendbugmail/smtp.cpp
+++ b/kio/misc/ksendbugmail/smtp.cpp
@@ -74,22 +74,22 @@ void SMTP::setTimeOut(int timeout)
void SMTP::setSenderAddress(const TQString& sender)
{
senderAddress = sender;
- int index = senderAddress.tqfind('<');
+ int index = senderAddress.find('<');
if (index == -1)
return;
senderAddress = senderAddress.mid(index + 1);
- index = senderAddress.tqfind('>');
+ index = senderAddress.find('>');
if (index != -1)
senderAddress = senderAddress.left(index);
senderAddress = senderAddress.simplifyWhiteSpace();
while (1) {
- index = senderAddress.tqfind(' ');
+ index = senderAddress.find(' ');
if (index != -1)
senderAddress = senderAddress.mid(index + 1); // take one side
else
break;
}
- index = senderAddress.tqfind('@');
+ index = senderAddress.find('@');
if (index == -1)
senderAddress.append("@localhost"); // won't go through without a local mail system
@@ -134,7 +134,7 @@ void SMTP::sendMessage(void)
kdDebug() << "state was == FINISHED\n" << endl;
finished = false;
state = IN;
- writeString = TQString::tqfromLatin1("helo %1\r\n").arg(domainName);
+ writeString = TQString::fromLatin1("helo %1\r\n").arg(domainName);
write(sock->socket(), writeString.ascii(), writeString.length());
}
if(connected){
@@ -218,7 +218,7 @@ void SMTP::socketRead(KSocket *socket)
readBuffer[n] = '\0';
lineBuffer += readBuffer;
- nl = lineBuffer.tqfind('\n');
+ nl = lineBuffer.find('\n');
if(nl == -1)
return;
lastLine = lineBuffer.left(nl);
@@ -249,12 +249,12 @@ void SMTP::processLine(TQString *line)
int i, stat;
TQString tmpstr;
- i = line->tqfind(' ');
+ i = line->find(' ');
tmpstr = line->left(i);
if(i > 3)
kdDebug() << "warning: SMTP status code longer then 3 digits: " << tmpstr << endl;
stat = tmpstr.toInt();
- serverState = (SMTPServertqStatus)stat;
+ serverState = (SMTPServerStatus)stat;
lastState = state;
kdDebug() << "smtp state: [" << stat << "][" << *line << "]" << endl;
@@ -262,7 +262,7 @@ void SMTP::processLine(TQString *line)
switch(stat){
case GREET: //220
state = IN;
- writeString = TQString::tqfromLatin1("helo %1\r\n").arg(domainName);
+ writeString = TQString::fromLatin1("helo %1\r\n").arg(domainName);
kdDebug() << "out: " << writeString << endl;
write(sock->socket(), writeString.ascii(), writeString.length());
break;
@@ -273,19 +273,19 @@ void SMTP::processLine(TQString *line)
switch(state){
case IN:
state = READY;
- writeString = TQString::tqfromLatin1("mail from: %1\r\n").arg(senderAddress);
+ writeString = TQString::fromLatin1("mail from: %1\r\n").arg(senderAddress);
kdDebug() << "out: " << writeString << endl;
write(sock->socket(), writeString.ascii(), writeString.length());
break;
case READY:
state = SENTFROM;
- writeString = TQString::tqfromLatin1("rcpt to: %1\r\n").arg(recipientAddress);
+ writeString = TQString::fromLatin1("rcpt to: %1\r\n").arg(recipientAddress);
kdDebug() << "out: " << writeString << endl;
write(sock->socket(), writeString.ascii(), writeString.length());
break;
case SENTFROM:
state = SENTTO;
- writeString = TQString::tqfromLatin1("data\r\n");
+ writeString = TQString::fromLatin1("data\r\n");
kdDebug() << "out: " << writeString << endl;
write(sock->socket(), writeString.ascii(), writeString.length());
break;
@@ -305,11 +305,11 @@ void SMTP::processLine(TQString *line)
break;
case READYDATA: //354
state = DATA;
- writeString = TQString::tqfromLatin1("Subject: %1\r\n").arg(messageSubject);
+ writeString = TQString::fromLatin1("Subject: %1\r\n").arg(messageSubject);
writeString += messageHeader;
writeString += "\r\n";
writeString += messageBody;
- writeString += TQString::tqfromLatin1(".\r\n");
+ writeString += TQString::fromLatin1(".\r\n");
kdDebug() << "out: " << writeString;
write(sock->socket(), writeString.ascii(), writeString.length());
break;
diff --git a/kio/misc/ksendbugmail/smtp.h b/kio/misc/ksendbugmail/smtp.h
index b8e782cb9..707d20ae4 100644
--- a/kio/misc/ksendbugmail/smtp.h
+++ b/kio/misc/ksendbugmail/smtp.h
@@ -7,7 +7,7 @@
#include <tqtimer.h>
#include <ksock.h>
-/*int SMTPServertqStatus[] = {
+/*int SMTPServerStatus[] = {
220, // greeting from server
221, // server acknolages goodbye
250, // command successful
@@ -17,7 +17,7 @@
0 // null
};
-int SMTPClienttqStatus[] = {
+int SMTPClientStatus[] = {
50, // not logged in yet.
100, // logged in, got 220
150, // sent helo, got 250
@@ -37,7 +37,7 @@ int SMTPClienttqStatus[] = {
#define SMTP_READ_BUFFER_SIZE 256
-class SMTP:public TQObject
+class SMTP:public QObject
{
Q_OBJECT
public:
@@ -66,7 +66,7 @@ public:
READYDATA = 354, // server ready to receive data
ERROR = 501, // error
UNKNOWN = 550 // user unknown
- }SMTPServertqStatus;
+ }SMTPServerStatus;
typedef enum {
INIT = 50, // not logged in yet
@@ -79,7 +79,7 @@ public:
QUIT = 400, // sent QUIT, got 221
OUT = 450, // finished, logged out
CERROR = 500 // didn't finish, had error or connection drop
- }SMTPClienttqStatus;
+ }SMTPClientStatus;
typedef enum {
NOERROR = 0,
@@ -125,9 +125,9 @@ private:
TQString messageSubject;
TQString messageBody, messageHeader;
- SMTPClienttqStatus state;
- SMTPClienttqStatus lastState;
- SMTPServertqStatus serverState;
+ SMTPClientStatus state;
+ SMTPClientStatus lastState;
+ SMTPServerStatus serverState;
TQString domainName;
diff --git a/kio/misc/kssld/kssld.cpp b/kio/misc/kssld/kssld.cpp
index cd911de4a..9e8b85574 100644
--- a/kio/misc/kssld/kssld.cpp
+++ b/kio/misc/kssld/kssld.cpp
@@ -72,7 +72,7 @@ static void updatePoliciesConfig(KConfig *cfg) {
cfg->setGroup(*i);
// remove it if it has expired
- if (!cfg->readBoolEntry("Permanent") && cfg->readDateTimeEntry("Expires") < TQDateTime::tqcurrentDateTime()) {
+ if (!cfg->readBoolEntry("Permanent") && cfg->readDateTimeEntry("Expires") < TQDateTime::currentDateTime()) {
cfg->deleteGroup(*i);
continue;
}
@@ -164,7 +164,7 @@ KSSLCNode *node;
for (node = certList.first(); node; node = certList.next()) {
if (node->permanent ||
- node->expires > TQDateTime::tqcurrentDateTime()) {
+ node->expires > TQDateTime::currentDateTime()) {
// First convert to a binary format and then write the
// kconfig entry write the (CN, policy, cert) to
// KSimpleConfig
@@ -194,7 +194,7 @@ KSSLCNode *node;
cfg->sync();
- // insure proper permissions -- tqcontains sensitive data
+ // insure proper permissions -- contains sensitive data
TQString cfgName(KGlobal::dirs()->findResource("config", "ksslpolicies"));
if (!cfgName.isEmpty()) {
@@ -239,7 +239,7 @@ TQStringList groups = cfg->groupList();
// remove it if it has expired
if (!cfg->readBoolEntry("Permanent") &&
cfg->readDateTimeEntry("Expires") <
- TQDateTime::tqcurrentDateTime()) {
+ TQDateTime::currentDateTime()) {
cfg->deleteGroup(*i);
continue;
}
@@ -278,7 +278,7 @@ KSSLCNode *node;
node->permanent = permanent;
if (!permanent) {
- node->expires = TQDateTime::tqcurrentDateTime();
+ node->expires = TQDateTime::currentDateTime();
// FIXME: make this configurable
node->expires = node->expires.addSecs(3600);
}
@@ -297,7 +297,7 @@ KSSLCNode *node;
certList.prepend(n);
if (!permanent) {
- n->expires = TQDateTime::tqcurrentDateTime();
+ n->expires = TQDateTime::currentDateTime();
n->expires = n->expires.addSecs(3600);
}
@@ -312,7 +312,7 @@ KSSLCNode *node;
for (node = certList.first(); node; node = certList.next()) {
if (KSSLX509Map(node->cert->getSubject()).getValue("CN") == cn) {
if (!node->permanent &&
- node->expires < TQDateTime::tqcurrentDateTime()) {
+ node->expires < TQDateTime::currentDateTime()) {
certList.remove(node);
cfg->deleteGroup(node->cert->getMD5Digest());
delete node;
@@ -338,7 +338,7 @@ KSSLCNode *node;
for (node = certList.first(); node; node = certList.next()) {
if (cert == *(node->cert)) {
if (!node->permanent &&
- node->expires < TQDateTime::tqcurrentDateTime()) {
+ node->expires < TQDateTime::currentDateTime()) {
certList.remove(node);
cfg->deleteGroup(node->cert->getMD5Digest());
delete node;
@@ -362,7 +362,7 @@ KSSLCNode *node;
for (node = certList.first(); node; node = certList.next()) {
if (KSSLX509Map(node->cert->getSubject()).getValue("CN") == cn) {
if (!node->permanent &&
- node->expires < TQDateTime::tqcurrentDateTime()) {
+ node->expires < TQDateTime::currentDateTime()) {
certList.remove(node);
cfg->deleteGroup(node->cert->getMD5Digest());
delete node;
@@ -386,7 +386,7 @@ KSSLCNode *node;
for (node = certList.first(); node; node = certList.next()) {
if (cert == *(node->cert)) {
if (!node->permanent &&
- node->expires < TQDateTime::tqcurrentDateTime()) {
+ node->expires < TQDateTime::currentDateTime()) {
certList.remove(node);
cfg->deleteGroup(node->cert->getMD5Digest());
delete node;
@@ -410,7 +410,7 @@ KSSLCNode *node;
for (node = certList.first(); node; node = certList.next()) {
if (cert == *(node->cert)) {
if (!node->permanent && node->expires <
- TQDateTime::tqcurrentDateTime()) {
+ TQDateTime::currentDateTime()) {
certList.remove(node);
cfg->deleteGroup(node->cert->getMD5Digest());
delete node;
@@ -535,7 +535,7 @@ KSSLCNode *node;
for (node = certList.first(); node; node = certList.next()) {
if (cert == *(node->cert)) {
if (!node->permanent && node->expires <
- TQDateTime::tqcurrentDateTime()) {
+ TQDateTime::currentDateTime()) {
certList.remove(node);
cfg->deleteGroup(node->cert->getMD5Digest());
searchRemoveCert(node->cert);
@@ -563,7 +563,7 @@ KSSLCNode *node;
for (node = certList.first(); node; node = certList.next()) {
if (cert == *(node->cert)) {
if (!node->permanent && node->expires <
- TQDateTime::tqcurrentDateTime()) {
+ TQDateTime::currentDateTime()) {
certList.remove(node);
cfg->deleteGroup(node->cert->getMD5Digest());
searchRemoveCert(node->cert);
@@ -572,7 +572,7 @@ KSSLCNode *node;
return false;
}
- if (!node->hosts.tqcontains(host)) {
+ if (!node->hosts.contains(host)) {
node->hosts << host;
}
@@ -593,7 +593,7 @@ KSSLCNode *node;
for (node = certList.first(); node; node = certList.next()) {
if (cert == *(node->cert)) {
if (!node->permanent && node->expires <
- TQDateTime::tqcurrentDateTime()) {
+ TQDateTime::currentDateTime()) {
certList.remove(node);
cfg->deleteGroup(node->cert->getMD5Digest());
searchRemoveCert(node->cert);
@@ -623,8 +623,8 @@ void KSSLD::caVerifyUpdate() {
return;
cfg->setGroup(TQString::null);
- TQ_UINT32 newStamp = KGlobal::dirs()->calcResourceHash("config", "ksslcalist", true);
- TQ_UINT32 oldStamp = cfg->readUnsignedNumEntry("ksslcalistStamp");
+ Q_UINT32 newStamp = KGlobal::dirs()->calcResourceHash("config", "ksslcalist", true);
+ Q_UINT32 oldStamp = cfg->readUnsignedNumEntry("ksslcalistStamp");
if (oldStamp != newStamp)
{
caRegenerate();
@@ -857,14 +857,14 @@ void KSSLD::searchAddCert(KSSLCertificate *cert) {
cert->getEmails(mails);
for(TQStringList::const_iterator iter = mails.begin(); iter != mails.end(); ++iter) {
TQString email = static_cast<const TQString &>(*iter).lower();
- TQMap<TQString, TQPtrVector<KSSLCertificate> >::iterator it = skEmail.tqfind(email);
+ TQMap<TQString, TQPtrVector<KSSLCertificate> >::iterator it = skEmail.find(email);
if (it == skEmail.end())
it = skEmail.insert(email, TQPtrVector<KSSLCertificate>());
TQPtrVector<KSSLCertificate> &elem = *it;
- if (elem.tqfindRef(cert) == -1) {
+ if (elem.findRef(cert) == -1) {
unsigned int n = 0;
for(; n < elem.size(); n++) {
if (!elem.at(n)) {
@@ -887,14 +887,14 @@ void KSSLD::searchRemoveCert(KSSLCertificate *cert) {
TQStringList mails;
cert->getEmails(mails);
for(TQStringList::const_iterator iter = mails.begin(); iter != mails.end(); ++iter) {
- TQMap<TQString, TQPtrVector<KSSLCertificate> >::iterator it = skEmail.tqfind(static_cast<const TQString &>(*iter).lower());
+ TQMap<TQString, TQPtrVector<KSSLCertificate> >::iterator it = skEmail.find(static_cast<const TQString &>(*iter).lower());
if (it == skEmail.end())
break;
TQPtrVector<KSSLCertificate> &elem = *it;
- int n = elem.tqfindRef(cert);
+ int n = elem.findRef(cert);
if (n != -1)
elem.remove(n);
}
@@ -903,7 +903,7 @@ void KSSLD::searchRemoveCert(KSSLCertificate *cert) {
TQStringList KSSLD::getKDEKeyByEmail(const TQString &email) {
TQStringList rc;
- TQMap<TQString, TQPtrVector<KSSLCertificate> >::iterator it = skEmail.tqfind(email.lower());
+ TQMap<TQString, TQPtrVector<KSSLCertificate> >::iterator it = skEmail.find(email.lower());
kdDebug() << "GETKDEKey " << email.latin1() << endl;
@@ -924,7 +924,7 @@ TQStringList KSSLD::getKDEKeyByEmail(const TQString &email) {
KSSLCertificate KSSLD::getCertByMD5Digest(const TQString &key) {
- TQMap<TQString, KSSLCertificate *>::iterator iter = skMD5Digest.tqfind(key);
+ TQMap<TQString, KSSLCertificate *>::iterator iter = skMD5Digest.find(key);
kdDebug() << "Searching cert for " << key.latin1() << endl;
diff --git a/kio/misc/kwalletd/kbetterthankdialogbase.ui b/kio/misc/kwalletd/kbetterthankdialogbase.ui
index e3fadec5d..ecf2d236f 100644
--- a/kio/misc/kwalletd/kbetterthankdialogbase.ui
+++ b/kio/misc/kwalletd/kbetterthankdialogbase.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>KBetterThanKDialogBase</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -37,7 +37,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>21</height>
@@ -46,7 +46,7 @@
</spacer>
<widget class="QLayoutWidget" row="1" column="1">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@@ -99,7 +99,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>61</width>
<height>21</height>
@@ -147,7 +147,7 @@
<slot access="protected">accept()</slot>
<slot access="protected">reject()</slot>
</slots>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kactivelabel.h</includehint>
</includehints>
diff --git a/kio/misc/kwalletd/ktimeout.cpp b/kio/misc/kwalletd/ktimeout.cpp
index d4c87bd28..c431ecf69 100644
--- a/kio/misc/kwalletd/ktimeout.cpp
+++ b/kio/misc/kwalletd/ktimeout.cpp
@@ -39,7 +39,7 @@ void KTimeout::clear() {
void KTimeout::removeTimer(int id) {
- TQTimer *t = _timers.tqfind(id);
+ TQTimer *t = _timers.find(id);
if (t != 0L) {
_timers.remove(id); // autodeletes
}
@@ -47,7 +47,7 @@ void KTimeout::removeTimer(int id) {
void KTimeout::addTimer(int id, int timeout) {
- if (_timers.tqfind(id) != 0L) {
+ if (_timers.find(id) != 0L) {
return;
}
@@ -59,7 +59,7 @@ void KTimeout::addTimer(int id, int timeout) {
void KTimeout::resetTimer(int id, int timeout) {
- TQTimer *t = _timers.tqfind(id);
+ TQTimer *t = _timers.find(id);
if (t) {
t->changeInterval(timeout);
}
diff --git a/kio/misc/kwalletd/kwalletd.cpp b/kio/misc/kwalletd/kwalletd.cpp
index 8df3ddb63..069575710 100644
--- a/kio/misc/kwalletd/kwalletd.cpp
+++ b/kio/misc/kwalletd/kwalletd.cpp
@@ -121,7 +121,7 @@ int KWalletD::generateHandle() {
// ASSUMPTION: RAND_MAX is fairly large.
do {
rc = rand();
- } while (_wallets.tqfind(rc) || rc == 0);
+ } while (_wallets.find(rc) || rc == 0);
return rc;
}
@@ -308,7 +308,7 @@ void KWalletD::checkActiveDialog() {
}
int KWalletD::doTransactionOpen(const TQCString& appid, const TQString& wallet, uint wId, bool modal) {
- if (_firstUse && !wallets().tqcontains(KWallet::Wallet::LocalWallet())) {
+ if (_firstUse && !wallets().contains(KWallet::Wallet::LocalWallet())) {
// First use wizard
KWalletWizard *wiz = new KWalletWizard(0);
setupDialog( wiz, wId, appid, modal );
@@ -529,11 +529,11 @@ int KWalletD::internalOpen(const TQCString& appid, const TQString& wallet, bool
KApplication::startServiceByDesktopName("kwalletmanager-kwalletd");
}
} else {
- if (!_handles[appid].tqcontains(rc) && _openPrompt && !isAuthorizedApp(appid, wallet, w)) {
+ if (!_handles[appid].contains(rc) && _openPrompt && !isAuthorizedApp(appid, wallet, w)) {
return -1;
}
_handles[appid].append(rc);
- _wallets.tqfind(rc)->ref();
+ _wallets.find(rc)->ref();
}
return rc;
@@ -567,7 +567,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W
KConfig cfg("kwalletrc");
cfg.setGroup("Auto Allow");
TQStringList apps = cfg.readListEntry(wallet);
- if (!apps.tqcontains(thisApp)) {
+ if (!apps.contains(thisApp)) {
apps += thisApp;
_implicitAllowMap[wallet] += thisApp;
cfg.writeEntry(wallet, apps);
@@ -578,7 +578,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W
KConfig cfg("kwalletrc");
cfg.setGroup("Auto Deny");
TQStringList apps = cfg.readListEntry(wallet);
- if (!apps.tqcontains(thisApp)) {
+ if (!apps.contains(thisApp)) {
apps += thisApp;
_implicitDenyMap[wallet] += thisApp;
cfg.writeEntry(wallet, apps);
@@ -646,7 +646,7 @@ void KWalletD::doTransactionChangePassword(const TQCString& appid, const TQStrin
return;
}
- w = _wallets.tqfind(handle);
+ w = _wallets.find(handle);
reclose = true;
} else {
handle = it.currentKey();
@@ -710,14 +710,14 @@ int KWalletD::close(const TQString& wallet, bool force) {
int KWalletD::closeWallet(KWallet::Backend *w, int handle, bool force) {
if (w) {
const TQString& wallet = w->walletName();
- assert(_passwords.tqcontains(wallet));
+ assert(_passwords.contains(wallet));
if (w->refCount() == 0 || force) {
- tqinvalidateHandle(handle);
+ invalidateHandle(handle);
if (_closeIdle && _timeouts) {
_timeouts->removeTimer(handle);
}
_wallets.remove(handle);
- if (_passwords.tqcontains(wallet)) {
+ if (_passwords.contains(wallet)) {
w->close(TQByteArray().duplicate(_passwords[wallet].data(), _passwords[wallet].length()));
_passwords[wallet].fill(0);
_passwords.remove(wallet);
@@ -735,15 +735,15 @@ int KWalletD::closeWallet(KWallet::Backend *w, int handle, bool force) {
int KWalletD::close(int handle, bool force) {
TQCString appid = friendlyDCOPPeerName();
- KWallet::Backend *w = _wallets.tqfind(handle);
- bool tqcontains = false;
+ KWallet::Backend *w = _wallets.find(handle);
+ bool contains = false;
if (w) { // the handle is valid
- if (_handles.tqcontains(appid)) { // we know this app
- if (_handles[appid].tqcontains(handle)) {
+ if (_handles.contains(appid)) { // we know this app
+ if (_handles[appid].contains(handle)) {
// the app owns this handle
- _handles[appid].remove(_handles[appid].tqfind(handle));
- tqcontains = true;
+ _handles[appid].remove(_handles[appid].find(handle));
+ contains = true;
if (_handles[appid].isEmpty()) {
_handles.remove(appid);
}
@@ -751,15 +751,15 @@ int KWalletD::close(int handle, bool force) {
}
// watch the side effect of the deref()
- if ((tqcontains && w->deref() == 0 && !_leaveOpen) || force) {
+ if ((contains && w->deref() == 0 && !_leaveOpen) || force) {
if (_closeIdle && _timeouts) {
_timeouts->removeTimer(handle);
}
_wallets.remove(handle);
if (force) {
- tqinvalidateHandle(handle);
+ invalidateHandle(handle);
}
- if (_passwords.tqcontains(w->walletName())) {
+ if (_passwords.contains(w->walletName())) {
w->close(TQByteArray().duplicate(_passwords[w->walletName()].data(), _passwords[w->walletName()].length()));
_passwords[w->walletName()].fill(0);
_passwords.remove(w->walletName());
@@ -792,7 +792,7 @@ bool KWalletD::isOpen(int handle) {
return false;
}
- KWallet::Backend *rc = _wallets.tqfind(handle);
+ KWallet::Backend *rc = _wallets.find(handle);
if (rc == 0 && ++_failed > 5) {
_failed = 0;
@@ -1179,11 +1179,11 @@ int KWalletD::removeEntry(int handle, const TQString& folder, const TQString& ke
void KWalletD::slotAppUnregistered(const TQCString& app) {
- if (_handles.tqcontains(app)) {
+ if (_handles.contains(app)) {
TQValueList<int> l = _handles[app];
for (TQValueList<int>::Iterator i = l.begin(); i != l.end(); ++i) {
_handles[app].remove(*i);
- KWallet::Backend *w = _wallets.tqfind(*i);
+ KWallet::Backend *w = _wallets.find(*i);
if (w && !_leaveOpen && 0 == w->deref()) {
close(w->walletName(), true);
}
@@ -1193,7 +1193,7 @@ void KWalletD::slotAppUnregistered(const TQCString& app) {
}
-void KWalletD::tqinvalidateHandle(int handle) {
+void KWalletD::invalidateHandle(int handle) {
for (TQMap<TQCString,TQValueList<int> >::Iterator i = _handles.begin();
i != _handles.end();
++i) {
@@ -1207,11 +1207,11 @@ KWallet::Backend *KWalletD::getWallet(const TQCString& appid, int handle) {
return 0L;
}
- KWallet::Backend *w = _wallets.tqfind(handle);
+ KWallet::Backend *w = _wallets.find(handle);
if (w) { // the handle is valid
- if (_handles.tqcontains(appid)) { // we know this app
- if (_handles[appid].tqcontains(handle)) {
+ if (_handles.contains(appid)) { // we know this app
+ if (_handles[appid].contains(handle)) {
// the app owns this handle
_failed = 0;
if (_closeIdle && _timeouts) {
@@ -1285,7 +1285,7 @@ TQStringList KWalletD::users(const TQString& wallet) const {
++it) {
if (it.current()->walletName() == wallet) {
for (TQMap<TQCString,TQValueList<int> >::ConstIterator hit = _handles.begin(); hit != _handles.end(); ++hit) {
- if (hit.data().tqcontains(it.currentKey())) {
+ if (hit.data().contains(it.currentKey())) {
rc += hit.key();
}
}
@@ -1302,7 +1302,7 @@ bool KWalletD::disconnectApplication(const TQString& wallet, const TQCString& ap
it.current();
++it) {
if (it.current()->walletName() == wallet) {
- if (_handles[application].tqcontains(it.currentKey())) {
+ if (_handles[application].contains(it.currentKey())) {
_handles[application].remove(it.currentKey());
if (_handles[application].isEmpty()) {
@@ -1416,7 +1416,7 @@ bool KWalletD::isEnabled() const {
bool KWalletD::folderDoesNotExist(const TQString& wallet, const TQString& folder) {
- if (!wallets().tqcontains(wallet)) {
+ if (!wallets().contains(wallet)) {
return true;
}
@@ -1435,7 +1435,7 @@ bool KWalletD::folderDoesNotExist(const TQString& wallet, const TQString& folder
bool KWalletD::keyDoesNotExist(const TQString& wallet, const TQString& folder, const TQString& key) {
- if (!wallets().tqcontains(wallet)) {
+ if (!wallets().contains(wallet)) {
return true;
}
@@ -1454,12 +1454,12 @@ bool KWalletD::keyDoesNotExist(const TQString& wallet, const TQString& folder, c
bool KWalletD::implicitAllow(const TQString& wallet, const TQCString& app) {
- return _implicitAllowMap[wallet].tqcontains(TQString::fromLocal8Bit(app));
+ return _implicitAllowMap[wallet].contains(TQString::fromLocal8Bit(app));
}
bool KWalletD::implicitDeny(const TQString& wallet, const TQCString& app) {
- return _implicitDenyMap[wallet].tqcontains(TQString::fromLocal8Bit(app));
+ return _implicitDenyMap[wallet].contains(TQString::fromLocal8Bit(app));
}
@@ -1468,12 +1468,12 @@ TQCString KWalletD::friendlyDCOPPeerName() {
if (!dc) {
return "";
}
- return dc->senderId().tqreplace(TQRegExp("-[0-9]+$"), "");
+ return dc->senderId().replace(TQRegExp("-[0-9]+$"), "");
}
void KWalletD::timedOut(int id) {
- KWallet::Backend *w = _wallets.tqfind(id);
+ KWallet::Backend *w = _wallets.find(id);
if (w) {
closeWallet(w, id, true);
}
diff --git a/kio/misc/kwalletd/kwalletd.h b/kio/misc/kwalletd/kwalletd.h
index ba83b4efc..2aea371ba 100644
--- a/kio/misc/kwalletd/kwalletd.h
+++ b/kio/misc/kwalletd/kwalletd.h
@@ -161,7 +161,7 @@ class KWalletD : public KDEDModule {
// Generate a new unique handle.
int generateHandle();
// Invalidate a handle (remove it from the TQMap)
- void tqinvalidateHandle(int handle);
+ void invalidateHandle(int handle);
// Emit signals about closing wallets
void doCloseSignals(int,const TQString&);
void emitFolderUpdated(const TQString&, const TQString&);
diff --git a/kio/misc/kwalletd/kwalletwizard.ui b/kio/misc/kwalletd/kwalletwizard.ui
index a6278e3e9..609508e11 100644
--- a/kio/misc/kwalletd/kwalletwizard.ui
+++ b/kio/misc/kwalletd/kwalletwizard.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>KWalletWizard</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -36,7 +36,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>21</height>
@@ -58,7 +58,7 @@
<property name="textFormat">
<enum>RichText</enum>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignCenter</set>
</property>
</widget>
@@ -83,7 +83,7 @@
<property name="textFormat">
<enum>RichText</enum>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -135,7 +135,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>140</width>
<height>21</height>
@@ -152,7 +152,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>140</width>
<height>31</height>
@@ -209,7 +209,7 @@
</widget>
<widget class="QLayoutWidget" row="3" column="1">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@@ -217,7 +217,7 @@
</property>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<vbox>
<property name="name">
@@ -233,7 +233,7 @@
<property name="text">
<string>Enter a new password:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -250,7 +250,7 @@
<property name="text">
<string>Verify password:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -261,7 +261,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<vbox>
<property name="name">
@@ -311,7 +311,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>51</height>
@@ -328,7 +328,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>101</width>
<height>21</height>
@@ -345,7 +345,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>111</width>
<height>31</height>
@@ -362,7 +362,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>70</height>
@@ -376,7 +376,7 @@
<property name="text">
<string></string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -403,7 +403,7 @@
<property name="textFormat">
<enum>RichText</enum>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -417,7 +417,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>121</height>
@@ -450,7 +450,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>51</height>
@@ -541,5 +541,5 @@
<slot>setBasic()</slot>
<slot access="private">destroy()</slot>
</slots>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/kio/misc/uiserver.cpp b/kio/misc/uiserver.cpp
index 2f24779be..b1d060f21 100644
--- a/kio/misc/uiserver.cpp
+++ b/kio/misc/uiserver.cpp
@@ -126,7 +126,7 @@ ProgressConfigDialog::ProgressConfigDialog(TQWidget *parent)
:KDialogBase(KDialogBase::Plain,i18n("Configure Network Operation Window"),KDialogBase::Ok|KDialogBase::Apply|KDialogBase::Cancel,
KDialogBase::Ok, parent, "configprog", false)
{
- TQVBoxLayout *tqlayout=new TQVBoxLayout(plainPage(),spacingHint());
+ TQVBoxLayout *layout=new TQVBoxLayout(plainPage(),spacingHint());
m_showSystemTrayCb=new TQCheckBox(i18n("Show system tray icon"), plainPage());
m_keepOpenCb=new TQCheckBox(i18n("Keep network operation window always open"), plainPage());
m_headerCb=new TQCheckBox(i18n("Show column headers"), plainPage());
@@ -150,14 +150,14 @@ ProgressConfigDialog::ProgressConfigDialog(TQWidget *parent)
m_items[ListProgress::TB_LOCAL_FILENAME] =new TQCheckListItem(m_columns, i18n("Local Filename"), TQCheckListItem::CheckBox);
m_items[ListProgress::TB_OPERATION] =new TQCheckListItem(m_columns, i18n("Operation"), TQCheckListItem::CheckBox);
- tqlayout->addWidget(m_showSystemTrayCb);
- tqlayout->addWidget(m_keepOpenCb);
- tqlayout->addWidget(m_headerCb);
- tqlayout->addWidget(m_toolBarCb);
- tqlayout->addWidget(m_statusBarCb);
- tqlayout->addWidget(m_fixedWidthCb);
- tqlayout->addWidget(label);
- tqlayout->addWidget(m_columns);
+ layout->addWidget(m_showSystemTrayCb);
+ layout->addWidget(m_keepOpenCb);
+ layout->addWidget(m_headerCb);
+ layout->addWidget(m_toolBarCb);
+ layout->addWidget(m_statusBarCb);
+ layout->addWidget(m_fixedWidthCb);
+ layout->addWidget(label);
+ layout->addWidget(m_columns);
}
void ProgressConfigDialog::setChecked(int i, bool on)
@@ -272,8 +272,8 @@ void ProgressItem::setPercent( unsigned long percent ) {
void ProgressItem::setInfoMessage( const TQString & msg ) {
TQString plainTextMsg(msg);
- plainTextMsg.tqreplace( TQRegExp( "</?b>" ), TQString::null );
- plainTextMsg.tqreplace( TQRegExp( "<img.*>" ), TQString::null );
+ plainTextMsg.replace( TQRegExp( "</?b>" ), TQString::null );
+ plainTextMsg.replace( TQRegExp( "<img.*>" ), TQString::null );
setText( ListProgress::TB_PROGRESS, plainTextMsg );
defaultProgress->slotInfoMessage( 0, msg );
@@ -529,7 +529,7 @@ void ListProgress::applySettings()
void ListProgress::readSettings() {
KConfig config("uiserverrc");
- // read listview tqgeometry properties
+ // read listview geometry properties
config.setGroup( "ProgressList" );
for ( int i = 0; i < TB_MAX; i++ ) {
TQString tmps="Col"+TQString::number(i);
@@ -562,7 +562,7 @@ void ListProgress::columnWidthChanged(int column)
void ListProgress::writeSettings() {
KConfig config("uiserverrc");
- // write listview tqgeometry properties
+ // write listview geometry properties
config.setGroup( "ProgressList" );
for ( int i = 0; i < TB_MAX; i++ ) {
if (!m_lpcc[i].enabled) {
@@ -750,7 +750,7 @@ int UIServer::newJob( TQCString observerAppId, bool showProgress )
TQListViewItemIterator it( listProgress );
for ( ; it.current(); ++it ) {
- if ( it.current()->itemBelow() == 0L ) { // this will tqfind the end of list
+ if ( it.current()->itemBelow() == 0L ) { // this will find the end of list
break;
}
}
@@ -773,7 +773,7 @@ int UIServer::newJob( TQCString observerAppId, bool showProgress )
}
-ProgressItem* UIServer::tqfindItem( int id )
+ProgressItem* UIServer::findItem( int id )
{
TQListViewItemIterator it( listProgress );
@@ -806,7 +806,7 @@ void UIServer::setItemVisible( ProgressItem * item, bool visible )
void UIServer::setJobVisible( int id, bool visible )
{
kdDebug(7024) << "UIServer::setJobVisible id=" << id << " visible=" << visible << endl;
- ProgressItem *item = tqfindItem( id );
+ ProgressItem *item = findItem( id );
Q_ASSERT( item );
if ( item )
setItemVisible( item, visible );
@@ -815,7 +815,7 @@ void UIServer::setJobVisible( int id, bool visible )
void UIServer::jobFinished( int id )
{
kdDebug(7024) << "UIServer::jobFinished id=" << id << endl;
- ProgressItem *item = tqfindItem( id );
+ ProgressItem *item = findItem( id );
// remove item from the list and delete the corresponding defaultprogress
if ( item ) {
@@ -834,7 +834,7 @@ void UIServer::totalSize64( int id, KIO::filesize_t size )
{
// kdDebug(7024) << "UIServer::totalSize " << id << " " << KIO::number(size) << endl;
- ProgressItem *item = tqfindItem( id );
+ ProgressItem *item = findItem( id );
if ( item ) {
item->setTotalSize( size );
}
@@ -844,7 +844,7 @@ void UIServer::totalFiles( int id, unsigned long files )
{
kdDebug(7024) << "UIServer::totalFiles " << id << " " << (unsigned int) files << endl;
- ProgressItem *item = tqfindItem( id );
+ ProgressItem *item = findItem( id );
if ( item ) {
item->setTotalFiles( files );
}
@@ -854,7 +854,7 @@ void UIServer::totalDirs( int id, unsigned long dirs )
{
kdDebug(7024) << "UIServer::totalDirs " << id << " " << (unsigned int) dirs << endl;
- ProgressItem *item = tqfindItem( id );
+ ProgressItem *item = findItem( id );
if ( item ) {
item->setTotalDirs( dirs );
}
@@ -867,7 +867,7 @@ void UIServer::processedSize64( int id, KIO::filesize_t size )
{
//kdDebug(7024) << "UIServer::processedSize " << id << " " << KIO::number(size) << endl;
- ProgressItem *item = tqfindItem( id );
+ ProgressItem *item = findItem( id );
if ( item ) {
item->setProcessedSize( size );
}
@@ -877,7 +877,7 @@ void UIServer::processedFiles( int id, unsigned long files )
{
//kdDebug(7024) << "UIServer::processedFiles " << id << " " << (unsigned int) files << endl;
- ProgressItem *item = tqfindItem( id );
+ ProgressItem *item = findItem( id );
if ( item ) {
item->setProcessedFiles( files );
}
@@ -887,7 +887,7 @@ void UIServer::processedDirs( int id, unsigned long dirs )
{
kdDebug(7024) << "UIServer::processedDirs " << id << " " << (unsigned int) dirs << endl;
- ProgressItem *item = tqfindItem( id );
+ ProgressItem *item = findItem( id );
if ( item ) {
item->setProcessedDirs( dirs );
}
@@ -897,7 +897,7 @@ void UIServer::percent( int id, unsigned long ipercent )
{
//kdDebug(7024) << "UIServer::percent " << id << " " << (unsigned int) ipercent << endl;
- ProgressItem *item = tqfindItem( id );
+ ProgressItem *item = findItem( id );
if ( item ) {
item->setPercent( ipercent );
}
@@ -907,7 +907,7 @@ void UIServer::speed( int id, unsigned long bytes_per_second )
{
//kdDebug(7024) << "UIServer::speed " << id << " " << (unsigned int) bytes_per_second << endl;
- ProgressItem *item = tqfindItem( id );
+ ProgressItem *item = findItem( id );
if ( item ) {
item->setSpeed( bytes_per_second );
}
@@ -917,7 +917,7 @@ void UIServer::infoMessage( int id, const TQString & msg )
{
//kdDebug(7024) << "UIServer::infoMessage " << id << " " << msg << endl;
- ProgressItem *item = tqfindItem( id );
+ ProgressItem *item = findItem( id );
if ( item ) {
item->setInfoMessage( msg );
}
@@ -930,7 +930,7 @@ void UIServer::canResume64( int id, KIO::filesize_t offset )
{
//kdDebug(7024) << "UIServer::canResume " << id << " " << offset << endl;
- ProgressItem *item = tqfindItem( id );
+ ProgressItem *item = findItem( id );
if ( item ) {
item->setCanResume( offset );
}
@@ -940,7 +940,7 @@ void UIServer::copying( int id, KURL from, KURL to )
{
//kdDebug(7024) << "UIServer::copying " << id << " " << from.url() << " " << to.url() << endl;
- ProgressItem *item = tqfindItem( id );
+ ProgressItem *item = findItem( id );
if ( item ) {
item->setCopying( from, to );
}
@@ -950,7 +950,7 @@ void UIServer::moving( int id, KURL from, KURL to )
{
//kdDebug(7024) << "UIServer::moving " << id << " " << from.url() << " " << to.url() << endl;
- ProgressItem *item = tqfindItem( id );
+ ProgressItem *item = findItem( id );
if ( item ) {
item->setMoving( from, to );
}
@@ -960,7 +960,7 @@ void UIServer::deleting( int id, KURL url )
{
//kdDebug(7024) << "UIServer::deleting " << id << " " << url.url() << endl;
- ProgressItem *item = tqfindItem( id );
+ ProgressItem *item = findItem( id );
if ( item ) {
item->setDeleting( url );
}
@@ -970,7 +970,7 @@ void UIServer::transferring( int id, KURL url )
{
//kdDebug(7024) << "UIServer::transferring " << id << " " << url.url() << endl;
- ProgressItem *item = tqfindItem( id );
+ ProgressItem *item = findItem( id );
if ( item ) {
item->setTransferring( url );
}
@@ -980,7 +980,7 @@ void UIServer::creatingDir( int id, KURL dir )
{
kdDebug(7024) << "UIServer::creatingDir " << id << " " << dir.url() << endl;
- ProgressItem *item = tqfindItem( id );
+ ProgressItem *item = findItem( id );
if ( item ) {
item->setCreatingDir( dir );
}
@@ -990,7 +990,7 @@ void UIServer::stating( int id, KURL url )
{
kdDebug(7024) << "UIServer::stating " << id << " " << url.url() << endl;
- ProgressItem *item = tqfindItem( id );
+ ProgressItem *item = findItem( id );
if ( item ) {
item->setStating( url );
}
@@ -1000,7 +1000,7 @@ void UIServer::mounting( int id, TQString dev, TQString point )
{
kdDebug(7024) << "UIServer::mounting " << id << " " << dev << " " << point << endl;
- ProgressItem *item = tqfindItem( id );
+ ProgressItem *item = findItem( id );
if ( item ) {
item->setMounting( dev, point );
}
@@ -1010,7 +1010,7 @@ void UIServer::unmounting( int id, TQString point )
{
kdDebug(7024) << "UIServer::unmounting " << id << " " << point << endl;
- ProgressItem *item = tqfindItem( id );
+ ProgressItem *item = findItem( id );
if ( item ) {
item->setUnmounting( point );
}
@@ -1195,7 +1195,7 @@ void UIServer::showSSLInfoDialog(const TQString &url, const KIO::MetaData &meta,
kdDebug(7024) << "ssl_cert_errors=" << meta["ssl_cert_errors"] << endl;
kid->setCertState(meta["ssl_cert_errors"]);
- TQString ip = meta.tqcontains("ssl_proxied") ? "" : meta["ssl_peer_ip"];
+ TQString ip = meta.contains("ssl_proxied") ? "" : meta["ssl_peer_ip"];
kid->setup( x,
ip,
url, // the URL
@@ -1278,7 +1278,7 @@ TQByteArray UIServer::open_RenameDlg64( int id,
)
{
// Hide existing dialog box if any
- ProgressItem *item = tqfindItem( id );
+ ProgressItem *item = findItem( id );
if ( item )
setItemVisible( item, false );
TQString newDest;
@@ -1291,7 +1291,7 @@ TQByteArray UIServer::open_RenameDlg64( int id,
kdDebug(7024) << "KIO::open_RenameDlg done" << endl;
TQByteArray data;
TQDataStream stream( data, IO_WriteOnly );
- stream << TQ_UINT8(result) << newDest;
+ stream << Q_UINT8(result) << newDest;
if ( item && result != KIO::R_CANCEL )
setItemVisible( item, true );
return data;
@@ -1302,7 +1302,7 @@ int UIServer::open_SkipDlg( int id,
const TQString & error_text )
{
// Hide existing dialog box if any
- ProgressItem *item = tqfindItem( id );
+ ProgressItem *item = findItem( id );
if ( item )
setItemVisible( item, false );
kdDebug(7024) << "Calling KIO::open_SkipDlg" << endl;
diff --git a/kio/misc/uiserver.h b/kio/misc/uiserver.h
index 2cd6e5fbd..85e255a43 100644
--- a/kio/misc/uiserver.h
+++ b/kio/misc/uiserver.h
@@ -386,7 +386,7 @@ protected slots:
protected:
- ProgressItem* tqfindItem( int id );
+ ProgressItem* findItem( int id );
virtual void resizeEvent(TQResizeEvent* e);
virtual bool queryClose();
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-05 14:43:44 +0000