summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/irc/libkirc
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/protocols/irc/libkirc')
-rw-r--r--kopete/protocols/irc/libkirc/kircengine.cpp4
-rw-r--r--kopete/protocols/irc/libkirc/kircengine.h2
-rw-r--r--kopete/protocols/irc/libkirc/kircengine_commands.cpp2
-rw-r--r--kopete/protocols/irc/libkirc/kirctransfer.cpp16
-rw-r--r--kopete/protocols/irc/libkirc/kirctransfer.h10
-rw-r--r--kopete/protocols/irc/libkirc/kirctransferserver.cpp12
-rw-r--r--kopete/protocols/irc/libkirc/kirctransferserver.h6
-rw-r--r--kopete/protocols/irc/libkirc/ksslsocket.cpp2
8 files changed, 27 insertions, 27 deletions
diff --git a/kopete/protocols/irc/libkirc/kircengine.cpp b/kopete/protocols/irc/libkirc/kircengine.cpp
index 786b4594..da32d591 100644
--- a/kopete/protocols/irc/libkirc/kircengine.cpp
+++ b/kopete/protocols/irc/libkirc/kircengine.cpp
@@ -53,8 +53,8 @@ using namespace KIRC;
*/
const TQRegExp Engine::m_RemoveLinefeeds( TQString::tqfromLatin1("[\\r\\n]*$") );
-Engine::Engine(TQObject *tqparent, const char *name)
- : TQObject(tqparent, TQString::tqfromLatin1("[KIRC::Engine]%1").tqarg(name).latin1()),
+Engine::Engine(TQObject *parent, const char *name)
+ : TQObject(parent, TQString::tqfromLatin1("[KIRC::Engine]%1").tqarg(name).latin1()),
m_status(Idle),
m_FailedNickOnLogin(false),
m_useSSL(false),
diff --git a/kopete/protocols/irc/libkirc/kircengine.h b/kopete/protocols/irc/libkirc/kircengine.h
index ac3fb00c..d6b8c32b 100644
--- a/kopete/protocols/irc/libkirc/kircengine.h
+++ b/kopete/protocols/irc/libkirc/kircengine.h
@@ -106,7 +106,7 @@ public:
MessageOfTheDayCondensedMessage
};
- Engine( TQObject *tqparent = 0, const char* name = 0 );
+ Engine( TQObject *parent = 0, const char* name = 0 );
~Engine();
// TQString nick() const;
diff --git a/kopete/protocols/irc/libkirc/kircengine_commands.cpp b/kopete/protocols/irc/libkirc/kircengine_commands.cpp
index f8c3dcca..4295a2ee 100644
--- a/kopete/protocols/irc/libkirc/kircengine_commands.cpp
+++ b/kopete/protocols/irc/libkirc/kircengine_commands.cpp
@@ -227,7 +227,7 @@ void Engine::user(const TQString &newUserName, const TQString &hostname, const T
void Engine::user(const TQString &newUserName, TQ_UINT8 mode, const TQString &newRealName)
{
/* RFC2812: "<user> <mode> <unused> <realname>"
- * mode is a numeric value (from a bit tqmask).
+ * mode is a numeric value (from a bit mask).
* 0x00 normal
* 0x04 request +w
* 0x08 request +i */
diff --git a/kopete/protocols/irc/libkirc/kirctransfer.cpp b/kopete/protocols/irc/libkirc/kirctransfer.cpp
index 198009a3..3c6d1907 100644
--- a/kopete/protocols/irc/libkirc/kirctransfer.cpp
+++ b/kopete/protocols/irc/libkirc/kirctransfer.cpp
@@ -28,8 +28,8 @@ using namespace KIRC;
Transfer::Transfer( Engine *engine, TQString nick,// TQString nick_peer_adress
Type type,
- TQObject *tqparent, const char *name )
- : TQObject( tqparent, name ),
+ TQObject *parent, const char *name )
+ : TQObject( parent, name ),
m_engine(engine), m_nick(nick),
m_type(type), m_socket(0),
m_initiated(false),
@@ -41,8 +41,8 @@ Transfer::Transfer( Engine *engine, TQString nick,// TQString nick_peer_adress
Transfer::Transfer( Engine *engine, TQString nick,// TQString nick_peer_adress
Transfer::Type type,
TQString fileName, TQ_UINT32 fileSize, // put this in a TQVariant ?
- TQObject *tqparent, const char *name )
- : TQObject( tqparent, name ),
+ TQObject *parent, const char *name )
+ : TQObject( parent, name ),
m_engine(engine), m_nick(nick),
m_type(type), m_socket(0),
m_initiated(false),
@@ -55,8 +55,8 @@ Transfer::Transfer( Engine *engine, TQString nick,// TQString nick_peer_adress
TQHostAddress hostAdress, TQ_UINT16 port, // put this in a TQVariant ?
Transfer::Type type,
TQString fileName, TQ_UINT32 fileSize, // put this in a TQVariant ?
- TQObject *tqparent, const char *name )
- : TQObject( tqparent, name ),
+ TQObject *parent, const char *name )
+ : TQObject( parent, name ),
m_engine(engine), m_nick(nick),
m_type(type), m_socket(0),
m_initiated(false),
@@ -68,8 +68,8 @@ Transfer::Transfer( Engine *engine, TQString nick,// TQString nick_peer_adress
/*
Transfer::Transfer( Engine *engine, TQString nick,// TQString nick_peer_adress
Transfer::Type type, TQVariant properties,
- TQObject *tqparent, const char *name )
- : TQObject( tqparent, name ),
+ TQObject *parent, const char *name )
+ : TQObject( parent, name ),
m_engine(engine), m_nick(nick),
m_type(type), m_socket(properties[socket]),
m_initiated(false),
diff --git a/kopete/protocols/irc/libkirc/kirctransfer.h b/kopete/protocols/irc/libkirc/kirctransfer.h
index 3794e744..950c0e96 100644
--- a/kopete/protocols/irc/libkirc/kirctransfer.h
+++ b/kopete/protocols/irc/libkirc/kirctransfer.h
@@ -59,23 +59,23 @@ public:
public:
Transfer( KIRC::Engine *engine, TQString nick,// TQString nick_peer_adress
Type type = Unknown,
- TQObject *tqparent = 0L, const char *name = 0L );
+ TQObject *parent = 0L, const char *name = 0L );
Transfer( KIRC::Engine *engine, TQString nick,// TQString nick_peer_adress,
TQHostAddress peer_address, TQ_UINT16 peer_port,
Transfer::Type type,
- TQObject *tqparent = 0L, const char *name = 0L );
+ TQObject *parent = 0L, const char *name = 0L );
Transfer( KIRC::Engine *engine, TQString nick,// TQString nick_peer_adress,
Transfer::Type type,
TQString fileName, TQ_UINT32 fileSize,
- TQObject *tqparent = 0L, const char *name = 0L );
+ TQObject *parent = 0L, const char *name = 0L );
Transfer( KIRC::Engine *engine, TQString nick,// TQString nick_peer_adress,
TQHostAddress peer_address, TQ_UINT16 peer_port,
Transfer::Type type,
TQString fileName, TQ_UINT32 fileSize,
- TQObject *tqparent = 0L, const char *name = 0L );
+ TQObject *parent = 0L, const char *name = 0L );
/*
For a file transfer properties are:
@@ -91,7 +91,7 @@ public:
*//*
Transfer( KIRC *engine, TQString nick,// TQString nick_peer_adress,
Transfer::Type type, TQVariant properties,
- TQObject *tqparent = 0L, const char *name = 0L );
+ TQObject *parent = 0L, const char *name = 0L );
*/
~Transfer();
diff --git a/kopete/protocols/irc/libkirc/kirctransferserver.cpp b/kopete/protocols/irc/libkirc/kirctransferserver.cpp
index ee9e38c1..25b41ff9 100644
--- a/kopete/protocols/irc/libkirc/kirctransferserver.cpp
+++ b/kopete/protocols/irc/libkirc/kirctransferserver.cpp
@@ -25,16 +25,16 @@
using namespace KIRC;
/*
-TransferServer::TransferServer( TQObject *tqparent, const char *name )
- : TQObject( tqparent, name ),
+TransferServer::TransferServer( TQObject *parent, const char *name )
+ : TQObject( parent, name ),
m_socket( 0 ),
m_port( 0 ),
m_backlog( 1 )
{
}
*/
-TransferServer::TransferServer(TQ_UINT16 port, int backlog, TQObject *tqparent, const char *name)
- : TQObject( tqparent, name ),
+TransferServer::TransferServer(TQ_UINT16 port, int backlog, TQObject *parent, const char *name)
+ : TQObject( parent, name ),
m_socket( 0 ),
m_port( port ),
m_backlog( backlog )
@@ -44,8 +44,8 @@ TransferServer::TransferServer(TQ_UINT16 port, int backlog, TQObject *tqparent,
TransferServer::TransferServer(Engine *engine, TQString nick,// TQString nick_peer_adress,
Transfer::Type type,
TQString fileName, TQ_UINT32 fileSize,
- TQObject *tqparent, const char *name)
- : TQObject( tqparent, name ),
+ TQObject *parent, const char *name)
+ : TQObject( parent, name ),
m_socket(0),
m_port(0),
m_backlog(1),
diff --git a/kopete/protocols/irc/libkirc/kirctransferserver.h b/kopete/protocols/irc/libkirc/kirctransferserver.h
index a84000e2..e013d9db 100644
--- a/kopete/protocols/irc/libkirc/kirctransferserver.h
+++ b/kopete/protocols/irc/libkirc/kirctransferserver.h
@@ -37,12 +37,12 @@ class TransferServer
TQ_OBJECT
public:
-// TransferServer(TQObject *tqparent = 0, const char *name = 0);
- TransferServer(TQ_UINT16 port, int backlog = 1, TQObject *tqparent = 0, const char *name = 0);
+// TransferServer(TQObject *parent = 0, const char *name = 0);
+ TransferServer(TQ_UINT16 port, int backlog = 1, TQObject *parent = 0, const char *name = 0);
TransferServer(KIRC::Engine *engine, TQString nick,// TQString nick_peer_adress,
Transfer::Type type,
TQString fileName, TQ_UINT32 fileSize,
- TQObject *tqparent = 0, const char *name = 0);
+ TQObject *parent = 0, const char *name = 0);
~TransferServer();
diff --git a/kopete/protocols/irc/libkirc/ksslsocket.cpp b/kopete/protocols/irc/libkirc/ksslsocket.cpp
index 4dcf9ce8..2bf3910a 100644
--- a/kopete/protocols/irc/libkirc/ksslsocket.cpp
+++ b/kopete/protocols/irc/libkirc/ksslsocket.cpp
@@ -326,7 +326,7 @@ int KSSLSocket::verifyCertificate()
setMetaData("ssl_action", "accept");
}
- // Since we're the tqparent, we need to teach the child.
+ // Since we're the parent, we need to teach the child.
setMetaData("ssl_parent_ip", ourIp );
setMetaData("ssl_parent_cert", pc.toString());