diff options
Diffstat (limited to 'kopete/protocols/oscar/liboscar')
102 files changed, 160 insertions, 160 deletions
diff --git a/kopete/protocols/oscar/liboscar/aimlogintask.cpp b/kopete/protocols/oscar/liboscar/aimlogintask.cpp index 74b6b5f9..9c669dcd 100644 --- a/kopete/protocols/oscar/liboscar/aimlogintask.cpp +++ b/kopete/protocols/oscar/liboscar/aimlogintask.cpp @@ -29,8 +29,8 @@ using namespace Oscar; -AimLoginTask::AimLoginTask( Task* tqparent ) - : Task ( tqparent ) +AimLoginTask::AimLoginTask( Task* parent ) + : Task ( parent ) { } diff --git a/kopete/protocols/oscar/liboscar/aimlogintask.h b/kopete/protocols/oscar/liboscar/aimlogintask.h index 11761ad5..af907e6a 100644 --- a/kopete/protocols/oscar/liboscar/aimlogintask.h +++ b/kopete/protocols/oscar/liboscar/aimlogintask.h @@ -28,7 +28,7 @@ class AimLoginTask : public Task Q_OBJECT TQ_OBJECT public: - AimLoginTask( Task* tqparent ); + AimLoginTask( Task* parent ); ~AimLoginTask(); bool take( Transfer* transfer ); virtual void onGo(); diff --git a/kopete/protocols/oscar/liboscar/blmlimitstask.cpp b/kopete/protocols/oscar/liboscar/blmlimitstask.cpp index b61c5cdd..8550c408 100644 --- a/kopete/protocols/oscar/liboscar/blmlimitstask.cpp +++ b/kopete/protocols/oscar/liboscar/blmlimitstask.cpp @@ -23,8 +23,8 @@ #include "oscartypes.h" #include "oscarutils.h" -BLMLimitsTask::BLMLimitsTask( Task* tqparent ) - : Task( tqparent ) +BLMLimitsTask::BLMLimitsTask( Task* parent ) + : Task( parent ) { } diff --git a/kopete/protocols/oscar/liboscar/blmlimitstask.h b/kopete/protocols/oscar/liboscar/blmlimitstask.h index 49fa11d0..7ded03a7 100644 --- a/kopete/protocols/oscar/liboscar/blmlimitstask.h +++ b/kopete/protocols/oscar/liboscar/blmlimitstask.h @@ -28,7 +28,7 @@ Fetch the limits for the BLM service class BLMLimitsTask : public Task { public: - BLMLimitsTask( Task* tqparent ); + BLMLimitsTask( Task* parent ); ~BLMLimitsTask(); diff --git a/kopete/protocols/oscar/liboscar/buddyicontask.cpp b/kopete/protocols/oscar/liboscar/buddyicontask.cpp index 1feccdc4..c75a592b 100644 --- a/kopete/protocols/oscar/liboscar/buddyicontask.cpp +++ b/kopete/protocols/oscar/liboscar/buddyicontask.cpp @@ -27,8 +27,8 @@ #include "oscarutils.h" #include <typeinfo> -BuddyIconTask::BuddyIconTask( Task* tqparent ) - :Task( tqparent ) +BuddyIconTask::BuddyIconTask( Task* parent ) + :Task( parent ) { m_seq = 0; m_refNum = -1; diff --git a/kopete/protocols/oscar/liboscar/buddyicontask.h b/kopete/protocols/oscar/liboscar/buddyicontask.h index 2eb5294a..d19e0ab6 100644 --- a/kopete/protocols/oscar/liboscar/buddyicontask.h +++ b/kopete/protocols/oscar/liboscar/buddyicontask.h @@ -30,7 +30,7 @@ class BuddyIconTask : public Task Q_OBJECT TQ_OBJECT public: - BuddyIconTask( Task* tqparent ); + BuddyIconTask( Task* parent ); void uploadIcon( WORD length, const TQByteArray& data ); void setReferenceNum( WORD num ); diff --git a/kopete/protocols/oscar/liboscar/bytestream.cpp b/kopete/protocols/oscar/liboscar/bytestream.cpp index f2fb8e51..87603c76 100644 --- a/kopete/protocols/oscar/liboscar/bytestream.cpp +++ b/kopete/protocols/oscar/liboscar/bytestream.cpp @@ -63,9 +63,9 @@ public: }; //! -//! Constructs a ByteStream object with tqparent \a tqparent. -ByteStream::ByteStream(TQObject *tqparent) -:TQObject(tqparent) +//! Constructs a ByteStream object with parent \a parent. +ByteStream::ByteStream(TQObject *parent) +:TQObject(parent) { d = new Private; } diff --git a/kopete/protocols/oscar/liboscar/bytestream.h b/kopete/protocols/oscar/liboscar/bytestream.h index c4dc96e1..9104bbce 100644 --- a/kopete/protocols/oscar/liboscar/bytestream.h +++ b/kopete/protocols/oscar/liboscar/bytestream.h @@ -33,7 +33,7 @@ class ByteStream : public TQObject TQ_OBJECT public: enum Error { ErrRead, ErrWrite, ErrCustom = 10 }; - ByteStream(TQObject *tqparent=0); + ByteStream(TQObject *parent=0); virtual ~ByteStream()=0; virtual bool isOpen() const; diff --git a/kopete/protocols/oscar/liboscar/changevisibilitytask.cpp b/kopete/protocols/oscar/liboscar/changevisibilitytask.cpp index 23231179..8830243a 100644 --- a/kopete/protocols/oscar/liboscar/changevisibilitytask.cpp +++ b/kopete/protocols/oscar/liboscar/changevisibilitytask.cpp @@ -30,7 +30,7 @@ #include "transfer.h" -ChangeVisibilityTask::ChangeVisibilityTask(Task* tqparent): Task(tqparent) +ChangeVisibilityTask::ChangeVisibilityTask(Task* parent): Task(parent) { m_sequence = 0; m_visible = true; diff --git a/kopete/protocols/oscar/liboscar/changevisibilitytask.h b/kopete/protocols/oscar/liboscar/changevisibilitytask.h index 33d0c306..0ec5ab04 100644 --- a/kopete/protocols/oscar/liboscar/changevisibilitytask.h +++ b/kopete/protocols/oscar/liboscar/changevisibilitytask.h @@ -30,7 +30,7 @@ class ChangeVisibilityTask : public Task { public: - ChangeVisibilityTask( Task* tqparent ); + ChangeVisibilityTask( Task* parent ); ~ChangeVisibilityTask(); void setVisible( bool visible = true ); diff --git a/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp b/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp index 350c58d1..23136db4 100644 --- a/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp +++ b/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp @@ -25,7 +25,7 @@ #include "connection.h" -ChatNavServiceTask::ChatNavServiceTask( Task* tqparent ) : Task( tqparent ) +ChatNavServiceTask::ChatNavServiceTask( Task* parent ) : Task( parent ) { m_type = Limits; } diff --git a/kopete/protocols/oscar/liboscar/chatnavservicetask.h b/kopete/protocols/oscar/liboscar/chatnavservicetask.h index 4c417e3b..a36e2ab4 100644 --- a/kopete/protocols/oscar/liboscar/chatnavservicetask.h +++ b/kopete/protocols/oscar/liboscar/chatnavservicetask.h @@ -32,7 +32,7 @@ class ChatNavServiceTask : public Task Q_OBJECT TQ_OBJECT public: - ChatNavServiceTask( Task* tqparent ); + ChatNavServiceTask( Task* parent ); ~ChatNavServiceTask(); enum RequestType { Limits = 0x0002, Exchange, Room, ExtRoom, Members, diff --git a/kopete/protocols/oscar/liboscar/chatservicetask.cpp b/kopete/protocols/oscar/liboscar/chatservicetask.cpp index 8d9c55e8..ff3159f4 100644 --- a/kopete/protocols/oscar/liboscar/chatservicetask.cpp +++ b/kopete/protocols/oscar/liboscar/chatservicetask.cpp @@ -30,8 +30,8 @@ #include "buffer.h" #include "oscartypes.h" -ChatServiceTask::ChatServiceTask( Task* tqparent, Oscar::WORD exchange, const TQString& room ) - : Task( tqparent ), m_encoding( "us-ascii" ) +ChatServiceTask::ChatServiceTask( Task* parent, Oscar::WORD exchange, const TQString& room ) + : Task( parent ), m_encoding( "us-ascii" ) { m_exchange = exchange; m_room = room; diff --git a/kopete/protocols/oscar/liboscar/chatservicetask.h b/kopete/protocols/oscar/liboscar/chatservicetask.h index d9805068..8cc09b9f 100644 --- a/kopete/protocols/oscar/liboscar/chatservicetask.h +++ b/kopete/protocols/oscar/liboscar/chatservicetask.h @@ -30,7 +30,7 @@ class ChatServiceTask : public Task Q_OBJECT TQ_OBJECT public: - ChatServiceTask( Task* tqparent, Oscar::WORD exchange, const TQString& room ); + ChatServiceTask( Task* parent, Oscar::WORD exchange, const TQString& room ); ~ChatServiceTask(); void onGo(); diff --git a/kopete/protocols/oscar/liboscar/client.cpp b/kopete/protocols/oscar/liboscar/client.cpp index 41ee73bd..00431434 100644 --- a/kopete/protocols/oscar/liboscar/client.cpp +++ b/kopete/protocols/oscar/liboscar/client.cpp @@ -137,8 +137,8 @@ public: const Oscar::ClientVersion* version; }; -Client::Client( TQObject* tqparent ) -:TQObject( tqparent, "oscarclient" ) +Client::Client( TQObject* parent ) +:TQObject( parent, "oscarclient" ) { m_loginTask = 0L; m_loginTaskTwo = 0L; diff --git a/kopete/protocols/oscar/liboscar/client.h b/kopete/protocols/oscar/liboscar/client.h index 5e9cc61b..976f43be 100644 --- a/kopete/protocols/oscar/liboscar/client.h +++ b/kopete/protocols/oscar/liboscar/client.h @@ -75,7 +75,7 @@ public: EXTERNAL API *************/ - Client(TQObject *tqparent=0); + Client(TQObject *parent=0); ~Client(); /** diff --git a/kopete/protocols/oscar/liboscar/clientreadytask.cpp b/kopete/protocols/oscar/liboscar/clientreadytask.cpp index 0f324f1a..3025a0d8 100644 --- a/kopete/protocols/oscar/liboscar/clientreadytask.cpp +++ b/kopete/protocols/oscar/liboscar/clientreadytask.cpp @@ -28,7 +28,7 @@ using namespace Oscar; -ClientReadyTask::ClientReadyTask(Task* tqparent): Task(tqparent) +ClientReadyTask::ClientReadyTask(Task* parent): Task(parent) { m_classList = client()->rateManager()->classList(); } diff --git a/kopete/protocols/oscar/liboscar/clientreadytask.h b/kopete/protocols/oscar/liboscar/clientreadytask.h index ac570895..d632351f 100644 --- a/kopete/protocols/oscar/liboscar/clientreadytask.h +++ b/kopete/protocols/oscar/liboscar/clientreadytask.h @@ -30,7 +30,7 @@ Fire and forget task to let the server know we're ready class ClientReadyTask : public Task { public: - ClientReadyTask( Task* tqparent ); + ClientReadyTask( Task* parent ); ~ClientReadyTask(); virtual void onGo(); diff --git a/kopete/protocols/oscar/liboscar/closeconnectiontask.cpp b/kopete/protocols/oscar/liboscar/closeconnectiontask.cpp index 4a09f3f9..3b062b2a 100644 --- a/kopete/protocols/oscar/liboscar/closeconnectiontask.cpp +++ b/kopete/protocols/oscar/liboscar/closeconnectiontask.cpp @@ -28,8 +28,8 @@ using namespace Oscar; -CloseConnectionTask::CloseConnectionTask( Task* tqparent ) - : Task(tqparent) +CloseConnectionTask::CloseConnectionTask( Task* parent ) + : Task(parent) { } diff --git a/kopete/protocols/oscar/liboscar/closeconnectiontask.h b/kopete/protocols/oscar/liboscar/closeconnectiontask.h index 27830b31..c3001ba7 100644 --- a/kopete/protocols/oscar/liboscar/closeconnectiontask.h +++ b/kopete/protocols/oscar/liboscar/closeconnectiontask.h @@ -31,7 +31,7 @@ class TQString; class CloseConnectionTask : public Task { public: - CloseConnectionTask(Task* tqparent); + CloseConnectionTask(Task* parent); ~CloseConnectionTask(); diff --git a/kopete/protocols/oscar/liboscar/connector.cpp b/kopete/protocols/oscar/liboscar/connector.cpp index fff59980..6f71c805 100644 --- a/kopete/protocols/oscar/liboscar/connector.cpp +++ b/kopete/protocols/oscar/liboscar/connector.cpp @@ -20,8 +20,8 @@ #include "connector.h" -Connector::Connector(TQObject *tqparent) -:TQObject(tqparent) +Connector::Connector(TQObject *parent) +:TQObject(parent) { setPeerAddressNone(); } diff --git a/kopete/protocols/oscar/liboscar/connector.h b/kopete/protocols/oscar/liboscar/connector.h index d1d96e4d..ee5d3e32 100644 --- a/kopete/protocols/oscar/liboscar/connector.h +++ b/kopete/protocols/oscar/liboscar/connector.h @@ -32,7 +32,7 @@ class Connector : public TQObject Q_OBJECT TQ_OBJECT public: - Connector(TQObject *tqparent=0); + Connector(TQObject *parent=0); virtual ~Connector(); virtual void connectToServer(const TQString &server)=0; diff --git a/kopete/protocols/oscar/liboscar/errortask.cpp b/kopete/protocols/oscar/liboscar/errortask.cpp index 3620addb..9e9ce95b 100644 --- a/kopete/protocols/oscar/liboscar/errortask.cpp +++ b/kopete/protocols/oscar/liboscar/errortask.cpp @@ -20,8 +20,8 @@ #include "oscartypes.h" #include "transfer.h" -ErrorTask::ErrorTask( Task* tqparent ) - : Task( tqparent ) +ErrorTask::ErrorTask( Task* parent ) + : Task( parent ) { } diff --git a/kopete/protocols/oscar/liboscar/errortask.h b/kopete/protocols/oscar/liboscar/errortask.h index 1199eb92..f74152db 100644 --- a/kopete/protocols/oscar/liboscar/errortask.h +++ b/kopete/protocols/oscar/liboscar/errortask.h @@ -27,7 +27,7 @@ Handles OSCAR protocol errors received from the server on snac subtype 0x01 class ErrorTask : public Task { public: - ErrorTask( Task* tqparent ); + ErrorTask( Task* parent ); ~ErrorTask(); bool take( Transfer* transfer ); diff --git a/kopete/protocols/oscar/liboscar/flapprotocol.cpp b/kopete/protocols/oscar/liboscar/flapprotocol.cpp index eaa12166..aef08f9a 100644 --- a/kopete/protocols/oscar/liboscar/flapprotocol.cpp +++ b/kopete/protocols/oscar/liboscar/flapprotocol.cpp @@ -28,8 +28,8 @@ using namespace Oscar; -FlapProtocol::FlapProtocol(TQObject *tqparent, const char *name) - : InputProtocolBase(tqparent, name) +FlapProtocol::FlapProtocol(TQObject *parent, const char *name) + : InputProtocolBase(parent, name) { } diff --git a/kopete/protocols/oscar/liboscar/flapprotocol.h b/kopete/protocols/oscar/liboscar/flapprotocol.h index 2574df50..0771197a 100644 --- a/kopete/protocols/oscar/liboscar/flapprotocol.h +++ b/kopete/protocols/oscar/liboscar/flapprotocol.h @@ -30,7 +30,7 @@ class FlapProtocol : public InputProtocolBase Q_OBJECT TQ_OBJECT public: - FlapProtocol( TQObject *tqparent = 0, const char *name = 0 ); + FlapProtocol( TQObject *parent = 0, const char *name = 0 ); ~FlapProtocol(); /** diff --git a/kopete/protocols/oscar/liboscar/icbmparamstask.cpp b/kopete/protocols/oscar/liboscar/icbmparamstask.cpp index 0aee0f98..ec3ad9da 100644 --- a/kopete/protocols/oscar/liboscar/icbmparamstask.cpp +++ b/kopete/protocols/oscar/liboscar/icbmparamstask.cpp @@ -24,8 +24,8 @@ #include "oscarutils.h" #include "buffer.h" -ICBMParamsTask::ICBMParamsTask( Task* tqparent ) - : Task( tqparent ) +ICBMParamsTask::ICBMParamsTask( Task* parent ) + : Task( parent ) {} diff --git a/kopete/protocols/oscar/liboscar/icbmparamstask.h b/kopete/protocols/oscar/liboscar/icbmparamstask.h index b3091fa8..c7bdfb16 100644 --- a/kopete/protocols/oscar/liboscar/icbmparamstask.h +++ b/kopete/protocols/oscar/liboscar/icbmparamstask.h @@ -28,7 +28,7 @@ Get the parameters we need to follow for instant messages class ICBMParamsTask : public Task { public: - ICBMParamsTask( Task* tqparent ); + ICBMParamsTask( Task* parent ); ~ICBMParamsTask(); bool forMe( const Transfer* transfer ) const; diff --git a/kopete/protocols/oscar/liboscar/icqlogintask.cpp b/kopete/protocols/oscar/liboscar/icqlogintask.cpp index 9bc58452..74958156 100644 --- a/kopete/protocols/oscar/liboscar/icqlogintask.cpp +++ b/kopete/protocols/oscar/liboscar/icqlogintask.cpp @@ -26,8 +26,8 @@ using namespace Oscar; -IcqLoginTask::IcqLoginTask( Task* tqparent ) - : Task( tqparent ) +IcqLoginTask::IcqLoginTask( Task* parent ) + : Task( parent ) { } diff --git a/kopete/protocols/oscar/liboscar/icqlogintask.h b/kopete/protocols/oscar/liboscar/icqlogintask.h index e13b1f99..3111608d 100644 --- a/kopete/protocols/oscar/liboscar/icqlogintask.h +++ b/kopete/protocols/oscar/liboscar/icqlogintask.h @@ -32,7 +32,7 @@ class IcqLoginTask : public Task Q_OBJECT TQ_OBJECT public: - IcqLoginTask( Task* tqparent ); + IcqLoginTask( Task* parent ); ~IcqLoginTask(); bool take( Transfer* transfer ); virtual void onGo(); diff --git a/kopete/protocols/oscar/liboscar/icqtask.cpp b/kopete/protocols/oscar/liboscar/icqtask.cpp index 1c8d98ae..bb58a9c4 100644 --- a/kopete/protocols/oscar/liboscar/icqtask.cpp +++ b/kopete/protocols/oscar/liboscar/icqtask.cpp @@ -24,8 +24,8 @@ #include <kdebug.h> -ICQTask::ICQTask( Task * tqparent ) - : Task( tqparent ) +ICQTask::ICQTask( Task * parent ) + : Task( parent ) { m_icquin = client()->userId().toULong(); m_sequence = 0; diff --git a/kopete/protocols/oscar/liboscar/icqtask.h b/kopete/protocols/oscar/liboscar/icqtask.h index 9397163a..00ef13fb 100644 --- a/kopete/protocols/oscar/liboscar/icqtask.h +++ b/kopete/protocols/oscar/liboscar/icqtask.h @@ -30,7 +30,7 @@ class ICQTask : public Task Q_OBJECT TQ_OBJECT public: - ICQTask( Task* tqparent ); + ICQTask( Task* parent ); ~ICQTask(); virtual void onGo(); diff --git a/kopete/protocols/oscar/liboscar/icquserinfotask.cpp b/kopete/protocols/oscar/liboscar/icquserinfotask.cpp index 6e8dd5d7..3635bc71 100644 --- a/kopete/protocols/oscar/liboscar/icquserinfotask.cpp +++ b/kopete/protocols/oscar/liboscar/icquserinfotask.cpp @@ -23,7 +23,7 @@ #include "buffer.h" -ICQUserInfoRequestTask::ICQUserInfoRequestTask( Task* tqparent ) : ICQTask( tqparent ) +ICQUserInfoRequestTask::ICQUserInfoRequestTask( Task* parent ) : ICQTask( parent ) { //by default, request short info. it saves bandwidth m_type = Short; diff --git a/kopete/protocols/oscar/liboscar/icquserinfotask.h b/kopete/protocols/oscar/liboscar/icquserinfotask.h index 437ac4ca..cd157f4d 100644 --- a/kopete/protocols/oscar/liboscar/icquserinfotask.h +++ b/kopete/protocols/oscar/liboscar/icquserinfotask.h @@ -35,7 +35,7 @@ class ICQUserInfoRequestTask : public ICQTask Q_OBJECT TQ_OBJECT public: - ICQUserInfoRequestTask( Task* tqparent ); + ICQUserInfoRequestTask( Task* parent ); ~ICQUserInfoRequestTask(); enum { Long = 0, Short }; diff --git a/kopete/protocols/oscar/liboscar/inputprotocolbase.cpp b/kopete/protocols/oscar/liboscar/inputprotocolbase.cpp index 2054ace7..4b27166b 100644 --- a/kopete/protocols/oscar/liboscar/inputprotocolbase.cpp +++ b/kopete/protocols/oscar/liboscar/inputprotocolbase.cpp @@ -18,8 +18,8 @@ #include "inputprotocolbase.h" -InputProtocolBase::InputProtocolBase(TQObject *tqparent, const char *name) - : TQObject(tqparent, name) +InputProtocolBase::InputProtocolBase(TQObject *parent, const char *name) + : TQObject(parent, name) { m_state = NeedMore; m_bytes = 0; diff --git a/kopete/protocols/oscar/liboscar/inputprotocolbase.h b/kopete/protocols/oscar/liboscar/inputprotocolbase.h index bf2235ef..365927cc 100644 --- a/kopete/protocols/oscar/liboscar/inputprotocolbase.h +++ b/kopete/protocols/oscar/liboscar/inputprotocolbase.h @@ -33,7 +33,7 @@ Q_OBJECT TQ_OBJECT public: enum EventProtocolState { Success, NeedMore, OutOfSync, ProtocolError }; - InputProtocolBase(TQObject *tqparent = 0, const char *name = 0); + InputProtocolBase(TQObject *parent = 0, const char *name = 0); ~InputProtocolBase(); /** * Returns a value describing the state of the object. diff --git a/kopete/protocols/oscar/liboscar/locationrightstask.cpp b/kopete/protocols/oscar/liboscar/locationrightstask.cpp index dec65031..d1e4b595 100644 --- a/kopete/protocols/oscar/liboscar/locationrightstask.cpp +++ b/kopete/protocols/oscar/liboscar/locationrightstask.cpp @@ -26,8 +26,8 @@ using namespace Oscar; -LocationRightsTask::LocationRightsTask( Task* tqparent ) - : Task( tqparent ) +LocationRightsTask::LocationRightsTask( Task* parent ) + : Task( parent ) { } diff --git a/kopete/protocols/oscar/liboscar/locationrightstask.h b/kopete/protocols/oscar/liboscar/locationrightstask.h index cbc17e10..a3e82767 100644 --- a/kopete/protocols/oscar/liboscar/locationrightstask.h +++ b/kopete/protocols/oscar/liboscar/locationrightstask.h @@ -36,7 +36,7 @@ This task implements the following SNACS: class LocationRightsTask : public Task { public: - LocationRightsTask( Task* tqparent ); + LocationRightsTask( Task* parent ); ~LocationRightsTask(); bool take( Transfer* transfer ); diff --git a/kopete/protocols/oscar/liboscar/logintask.cpp b/kopete/protocols/oscar/liboscar/logintask.cpp index 10d62e6d..f7b55531 100644 --- a/kopete/protocols/oscar/liboscar/logintask.cpp +++ b/kopete/protocols/oscar/liboscar/logintask.cpp @@ -37,8 +37,8 @@ * Stage One Task Implementation */ -StageOneLoginTask::StageOneLoginTask( Task* tqparent ) - : Task ( tqparent ) +StageOneLoginTask::StageOneLoginTask( Task* parent ) + : Task ( parent ) { m_aimTask = 0L; m_icqTask = 0L; @@ -137,8 +137,8 @@ const TQString& StageOneLoginTask::bosPort() const /** * Stage Two Task Implementation */ -StageTwoLoginTask::StageTwoLoginTask( Task* tqparent ) - : Task( tqparent ) +StageTwoLoginTask::StageTwoLoginTask( Task* parent ) + : Task( parent ) { //Create our tasks Task* rootTask = client()->rootTask(); diff --git a/kopete/protocols/oscar/liboscar/logintask.h b/kopete/protocols/oscar/liboscar/logintask.h index 6a61dc9f..c9bf27dc 100644 --- a/kopete/protocols/oscar/liboscar/logintask.h +++ b/kopete/protocols/oscar/liboscar/logintask.h @@ -46,7 +46,7 @@ class StageOneLoginTask : public Task Q_OBJECT TQ_OBJECT public: - StageOneLoginTask( Task* tqparent ); + StageOneLoginTask( Task* parent ); ~StageOneLoginTask(); bool take( Transfer* transfer ); @@ -106,7 +106,7 @@ class StageTwoLoginTask : public Task Q_OBJECT TQ_OBJECT public: - StageTwoLoginTask( Task* tqparent ); + StageTwoLoginTask( Task* parent ); ~StageTwoLoginTask(); bool take( Transfer* transfer ); void onGo(); diff --git a/kopete/protocols/oscar/liboscar/messagereceivertask.cpp b/kopete/protocols/oscar/liboscar/messagereceivertask.cpp index bf8e2350..1bbe6622 100644 --- a/kopete/protocols/oscar/liboscar/messagereceivertask.cpp +++ b/kopete/protocols/oscar/liboscar/messagereceivertask.cpp @@ -25,7 +25,7 @@ #include "userdetails.h" -MessageReceiverTask::MessageReceiverTask( Task* tqparent ) : Task( tqparent ) +MessageReceiverTask::MessageReceiverTask( Task* parent ) : Task( parent ) { } diff --git a/kopete/protocols/oscar/liboscar/messagereceivertask.h b/kopete/protocols/oscar/liboscar/messagereceivertask.h index 55df700a..c288a82d 100644 --- a/kopete/protocols/oscar/liboscar/messagereceivertask.h +++ b/kopete/protocols/oscar/liboscar/messagereceivertask.h @@ -35,7 +35,7 @@ Q_OBJECT TQ_OBJECT public: - MessageReceiverTask( Task* tqparent ); + MessageReceiverTask( Task* parent ); ~MessageReceiverTask(); virtual bool forMe( const Transfer* transfer ) const; diff --git a/kopete/protocols/oscar/liboscar/offlinemessagestask.cpp b/kopete/protocols/oscar/liboscar/offlinemessagestask.cpp index 2fc70b45..88d41a84 100644 --- a/kopete/protocols/oscar/liboscar/offlinemessagestask.cpp +++ b/kopete/protocols/oscar/liboscar/offlinemessagestask.cpp @@ -26,8 +26,8 @@ #include <kdebug.h> -OfflineMessagesTask::OfflineMessagesTask( Task* tqparent ) - : ICQTask( tqparent ) +OfflineMessagesTask::OfflineMessagesTask( Task* parent ) + : ICQTask( parent ) { tzset(); m_sequence = 0; diff --git a/kopete/protocols/oscar/liboscar/offlinemessagestask.h b/kopete/protocols/oscar/liboscar/offlinemessagestask.h index 3433d762..87a7a9dc 100644 --- a/kopete/protocols/oscar/liboscar/offlinemessagestask.h +++ b/kopete/protocols/oscar/liboscar/offlinemessagestask.h @@ -32,7 +32,7 @@ class OfflineMessagesTask : public ICQTask Q_OBJECT TQ_OBJECT public: - OfflineMessagesTask( Task* tqparent ); + OfflineMessagesTask( Task* parent ); ~OfflineMessagesTask(); diff --git a/kopete/protocols/oscar/liboscar/onlinenotifiertask.cpp b/kopete/protocols/oscar/liboscar/onlinenotifiertask.cpp index c3419740..6b6b3d05 100644 --- a/kopete/protocols/oscar/liboscar/onlinenotifiertask.cpp +++ b/kopete/protocols/oscar/liboscar/onlinenotifiertask.cpp @@ -26,7 +26,7 @@ #include <kdebug.h> -OnlineNotifierTask::OnlineNotifierTask( Task* tqparent ) : Task( tqparent ) +OnlineNotifierTask::OnlineNotifierTask( Task* parent ) : Task( parent ) { } diff --git a/kopete/protocols/oscar/liboscar/onlinenotifiertask.h b/kopete/protocols/oscar/liboscar/onlinenotifiertask.h index bc200611..08730c70 100644 --- a/kopete/protocols/oscar/liboscar/onlinenotifiertask.h +++ b/kopete/protocols/oscar/liboscar/onlinenotifiertask.h @@ -37,7 +37,7 @@ class OnlineNotifierTask : public Task Q_OBJECT TQ_OBJECT public: - OnlineNotifierTask( Task* tqparent ); + OnlineNotifierTask( Task* parent ); ~OnlineNotifierTask(); diff --git a/kopete/protocols/oscar/liboscar/oscarbytestream.cpp b/kopete/protocols/oscar/liboscar/oscarbytestream.cpp index 9c12d473..c3a39253 100644 --- a/kopete/protocols/oscar/liboscar/oscarbytestream.cpp +++ b/kopete/protocols/oscar/liboscar/oscarbytestream.cpp @@ -24,8 +24,8 @@ #include "oscarbytestream.h" -KNetworkByteStream::KNetworkByteStream( TQObject *tqparent, const char */*name*/ ) - : ByteStream ( tqparent ) +KNetworkByteStream::KNetworkByteStream( TQObject *parent, const char */*name*/ ) + : ByteStream ( parent ) { kdDebug( 14151 ) << k_funcinfo << "Instantiating new KNetwork byte stream." << endl; diff --git a/kopete/protocols/oscar/liboscar/oscarbytestream.h b/kopete/protocols/oscar/liboscar/oscarbytestream.h index bf11446b..db5c3a3b 100644 --- a/kopete/protocols/oscar/liboscar/oscarbytestream.h +++ b/kopete/protocols/oscar/liboscar/oscarbytestream.h @@ -38,7 +38,7 @@ Q_OBJECT TQ_OBJECT public: - KNetworkByteStream ( TQObject *tqparent = 0, const char *name = 0 ); + KNetworkByteStream ( TQObject *parent = 0, const char *name = 0 ); ~KNetworkByteStream (); diff --git a/kopete/protocols/oscar/liboscar/oscarclientstream.cpp b/kopete/protocols/oscar/liboscar/oscarclientstream.cpp index 3c2edeaf..22c68df6 100644 --- a/kopete/protocols/oscar/liboscar/oscarclientstream.cpp +++ b/kopete/protocols/oscar/liboscar/oscarclientstream.cpp @@ -104,8 +104,8 @@ public: int noop_time; }; -ClientStream::ClientStream(Connector *conn, TQObject *tqparent) -:Stream(tqparent) +ClientStream::ClientStream(Connector *conn, TQObject *parent) +:Stream(parent) { //qDebug("CLIENTSTREAM::ClientStream"); diff --git a/kopete/protocols/oscar/liboscar/oscarclientstream.h b/kopete/protocols/oscar/liboscar/oscarclientstream.h index f5ab752d..6d4f2026 100644 --- a/kopete/protocols/oscar/liboscar/oscarclientstream.h +++ b/kopete/protocols/oscar/liboscar/oscarclientstream.h @@ -74,7 +74,7 @@ public: BindConflict // resource in-use }; - ClientStream(Connector *conn, TQObject *tqparent=0); + ClientStream(Connector *conn, TQObject *parent=0); ~ClientStream(); void connectToServer(const TQString& server, bool auth=true); diff --git a/kopete/protocols/oscar/liboscar/oscarconnector.cpp b/kopete/protocols/oscar/liboscar/oscarconnector.cpp index 9f33eb76..98d56237 100644 --- a/kopete/protocols/oscar/liboscar/oscarconnector.cpp +++ b/kopete/protocols/oscar/liboscar/oscarconnector.cpp @@ -24,8 +24,8 @@ #include "oscarconnector.h" #include "oscarbytestream.h" -KNetworkConnector::KNetworkConnector( TQObject *tqparent, const char */*name*/ ) - : Connector( tqparent ) +KNetworkConnector::KNetworkConnector( TQObject *parent, const char */*name*/ ) + : Connector( parent ) { kdDebug( 14151 ) << k_funcinfo << "New KNetwork connector." << endl; diff --git a/kopete/protocols/oscar/liboscar/oscarconnector.h b/kopete/protocols/oscar/liboscar/oscarconnector.h index 9441c3c6..3e72a8dc 100644 --- a/kopete/protocols/oscar/liboscar/oscarconnector.h +++ b/kopete/protocols/oscar/liboscar/oscarconnector.h @@ -40,7 +40,7 @@ Q_OBJECT TQ_OBJECT public: - KNetworkConnector( TQObject *tqparent = 0, const char *name = 0 ); + KNetworkConnector( TQObject *parent = 0, const char *name = 0 ); virtual ~KNetworkConnector(); diff --git a/kopete/protocols/oscar/liboscar/ownuserinfotask.cpp b/kopete/protocols/oscar/liboscar/ownuserinfotask.cpp index 7731aa51..59ec1b7a 100644 --- a/kopete/protocols/oscar/liboscar/ownuserinfotask.cpp +++ b/kopete/protocols/oscar/liboscar/ownuserinfotask.cpp @@ -29,7 +29,7 @@ using namespace Oscar; -OwnUserInfoTask::OwnUserInfoTask( Task* tqparent ) : Task( tqparent ) +OwnUserInfoTask::OwnUserInfoTask( Task* parent ) : Task( parent ) { } diff --git a/kopete/protocols/oscar/liboscar/ownuserinfotask.h b/kopete/protocols/oscar/liboscar/ownuserinfotask.h index 6b162d00..c5c77d2f 100644 --- a/kopete/protocols/oscar/liboscar/ownuserinfotask.h +++ b/kopete/protocols/oscar/liboscar/ownuserinfotask.h @@ -31,7 +31,7 @@ class OwnUserInfoTask : public Task Q_OBJECT TQ_OBJECT public: - OwnUserInfoTask( Task* tqparent ); + OwnUserInfoTask( Task* parent ); ~OwnUserInfoTask(); diff --git a/kopete/protocols/oscar/liboscar/prmparamstask.cpp b/kopete/protocols/oscar/liboscar/prmparamstask.cpp index cd4cfddc..cc4416be 100644 --- a/kopete/protocols/oscar/liboscar/prmparamstask.cpp +++ b/kopete/protocols/oscar/liboscar/prmparamstask.cpp @@ -24,8 +24,8 @@ using namespace Oscar; -PRMParamsTask::PRMParamsTask( Task* tqparent ) - : Task( tqparent ) +PRMParamsTask::PRMParamsTask( Task* parent ) + : Task( parent ) { } diff --git a/kopete/protocols/oscar/liboscar/prmparamstask.h b/kopete/protocols/oscar/liboscar/prmparamstask.h index fe0f25c0..eebfdc61 100644 --- a/kopete/protocols/oscar/liboscar/prmparamstask.h +++ b/kopete/protocols/oscar/liboscar/prmparamstask.h @@ -28,7 +28,7 @@ class Transfer; class PRMParamsTask : public Task { public: - PRMParamsTask( Task* tqparent ); + PRMParamsTask( Task* parent ); ~PRMParamsTask(); virtual bool forMe( const Transfer* transfer ) const; diff --git a/kopete/protocols/oscar/liboscar/profiletask.cpp b/kopete/protocols/oscar/liboscar/profiletask.cpp index 09a8b3a0..1544a5b4 100644 --- a/kopete/protocols/oscar/liboscar/profiletask.cpp +++ b/kopete/protocols/oscar/liboscar/profiletask.cpp @@ -28,8 +28,8 @@ using namespace Oscar; -ProfileTask::ProfileTask( Task* tqparent ) - : Task( tqparent ) +ProfileTask::ProfileTask( Task* parent ) + : Task( parent ) { } diff --git a/kopete/protocols/oscar/liboscar/profiletask.h b/kopete/protocols/oscar/liboscar/profiletask.h index d16a05de..a51075a5 100644 --- a/kopete/protocols/oscar/liboscar/profiletask.h +++ b/kopete/protocols/oscar/liboscar/profiletask.h @@ -32,7 +32,7 @@ The away message will be set only if the away message has been set non-null. class ProfileTask : public Task { public: - ProfileTask( Task* tqparent ); + ProfileTask( Task* parent ); ~ProfileTask(); bool forMe( const Transfer* transfer ) const; diff --git a/kopete/protocols/oscar/liboscar/rateclass.cpp b/kopete/protocols/oscar/liboscar/rateclass.cpp index 6d050643..d035c810 100644 --- a/kopete/protocols/oscar/liboscar/rateclass.cpp +++ b/kopete/protocols/oscar/liboscar/rateclass.cpp @@ -22,8 +22,8 @@ using namespace Oscar; -RateClass::RateClass( TQObject* tqparent ) -: TQObject( tqparent, 0 ) +RateClass::RateClass( TQObject* parent ) +: TQObject( parent, 0 ) { m_waitingToSend = false; m_packetTimer.start(); diff --git a/kopete/protocols/oscar/liboscar/rateclass.h b/kopete/protocols/oscar/liboscar/rateclass.h index 122bde8d..d981dd83 100644 --- a/kopete/protocols/oscar/liboscar/rateclass.h +++ b/kopete/protocols/oscar/liboscar/rateclass.h @@ -39,7 +39,7 @@ class RateClass : public TQObject Q_OBJECT TQ_OBJECT public: - RateClass( TQObject* tqparent = 0 ); + RateClass( TQObject* parent = 0 ); ~RateClass(); /** Accessor for classid */ diff --git a/kopete/protocols/oscar/liboscar/rateclassmanager.cpp b/kopete/protocols/oscar/liboscar/rateclassmanager.cpp index 0b14c9ec..59ef735e 100644 --- a/kopete/protocols/oscar/liboscar/rateclassmanager.cpp +++ b/kopete/protocols/oscar/liboscar/rateclassmanager.cpp @@ -34,11 +34,11 @@ public: Connection* client; }; -RateClassManager::RateClassManager( Connection* tqparent, const char* name ) -: TQObject( tqparent, name ) +RateClassManager::RateClassManager( Connection* parent, const char* name ) +: TQObject( parent, name ) { d = new RateClassManagerPrivate(); - d->client = tqparent; + d->client = parent; } RateClassManager::~RateClassManager() diff --git a/kopete/protocols/oscar/liboscar/rateclassmanager.h b/kopete/protocols/oscar/liboscar/rateclassmanager.h index fe2a8433..14155029 100644 --- a/kopete/protocols/oscar/liboscar/rateclassmanager.h +++ b/kopete/protocols/oscar/liboscar/rateclassmanager.h @@ -36,7 +36,7 @@ class RateClassManager : public TQObject Q_OBJECT TQ_OBJECT public: - RateClassManager( Connection* tqparent, const char* name = 0 ); + RateClassManager( Connection* parent, const char* name = 0 ); ~RateClassManager(); /** Reset the rate manager */ diff --git a/kopete/protocols/oscar/liboscar/rateinfotask.cpp b/kopete/protocols/oscar/liboscar/rateinfotask.cpp index a7249a74..48fff142 100644 --- a/kopete/protocols/oscar/liboscar/rateinfotask.cpp +++ b/kopete/protocols/oscar/liboscar/rateinfotask.cpp @@ -29,8 +29,8 @@ using namespace Oscar; -RateInfoTask::RateInfoTask( Task* tqparent ) - : Task( tqparent ) +RateInfoTask::RateInfoTask( Task* parent ) + : Task( parent ) { connect( this, TQT_SIGNAL( gotRateLimits() ), this, TQT_SLOT( sendRateInfoAck() ) ); } diff --git a/kopete/protocols/oscar/liboscar/rateinfotask.h b/kopete/protocols/oscar/liboscar/rateinfotask.h index 407e91b4..1ca3174f 100644 --- a/kopete/protocols/oscar/liboscar/rateinfotask.h +++ b/kopete/protocols/oscar/liboscar/rateinfotask.h @@ -32,7 +32,7 @@ class RateInfoTask : public Task Q_OBJECT TQ_OBJECT public: - RateInfoTask( Task* tqparent ); + RateInfoTask( Task* parent ); ~RateInfoTask(); bool take( Transfer* transfer ); diff --git a/kopete/protocols/oscar/liboscar/senddcinfotask.cpp b/kopete/protocols/oscar/liboscar/senddcinfotask.cpp index 02dd0ba6..3bd07cb5 100644 --- a/kopete/protocols/oscar/liboscar/senddcinfotask.cpp +++ b/kopete/protocols/oscar/liboscar/senddcinfotask.cpp @@ -25,7 +25,7 @@ #include "oscarutils.h" #include "transfer.h" -SendDCInfoTask::SendDCInfoTask(Task* tqparent, DWORD status): Task(tqparent), mtqStatus(status) +SendDCInfoTask::SendDCInfoTask(Task* parent, DWORD status): Task(parent), mtqStatus(status) { } diff --git a/kopete/protocols/oscar/liboscar/senddcinfotask.h b/kopete/protocols/oscar/liboscar/senddcinfotask.h index e967cb18..a98b9612 100644 --- a/kopete/protocols/oscar/liboscar/senddcinfotask.h +++ b/kopete/protocols/oscar/liboscar/senddcinfotask.h @@ -28,7 +28,7 @@ Fire and forget task that sends our direct connection info class SendDCInfoTask : public Task { public: - SendDCInfoTask( Task* tqparent, DWORD status ); + SendDCInfoTask( Task* parent, DWORD status ); ~SendDCInfoTask(); virtual void onGo(); diff --git a/kopete/protocols/oscar/liboscar/sendidletimetask.cpp b/kopete/protocols/oscar/liboscar/sendidletimetask.cpp index a4bc61e2..63816a63 100644 --- a/kopete/protocols/oscar/liboscar/sendidletimetask.cpp +++ b/kopete/protocols/oscar/liboscar/sendidletimetask.cpp @@ -23,7 +23,7 @@ #include "oscarutils.h" #include "transfer.h" -SendIdleTimeTask::SendIdleTimeTask( Task* tqparent ) : Task( tqparent ) +SendIdleTimeTask::SendIdleTimeTask( Task* parent ) : Task( parent ) { m_idleTime = 0; } diff --git a/kopete/protocols/oscar/liboscar/sendidletimetask.h b/kopete/protocols/oscar/liboscar/sendidletimetask.h index 4ba9e588..beba74c2 100644 --- a/kopete/protocols/oscar/liboscar/sendidletimetask.h +++ b/kopete/protocols/oscar/liboscar/sendidletimetask.h @@ -29,7 +29,7 @@ Sends the idle time to the server class SendIdleTimeTask : public Task { public: - SendIdleTimeTask( Task* tqparent ); + SendIdleTimeTask( Task* parent ); ~SendIdleTimeTask(); virtual void onGo(); diff --git a/kopete/protocols/oscar/liboscar/sendmessagetask.cpp b/kopete/protocols/oscar/liboscar/sendmessagetask.cpp index b3a4a36e..596e6791 100644 --- a/kopete/protocols/oscar/liboscar/sendmessagetask.cpp +++ b/kopete/protocols/oscar/liboscar/sendmessagetask.cpp @@ -23,7 +23,7 @@ #include "transfer.h" -SendMessageTask::SendMessageTask(Task* tqparent): Task(tqparent) +SendMessageTask::SendMessageTask(Task* parent): Task(parent) { m_autoResponse = false; m_cookieCount = 0x7FFF; diff --git a/kopete/protocols/oscar/liboscar/sendmessagetask.h b/kopete/protocols/oscar/liboscar/sendmessagetask.h index a6a0e598..18e03c73 100644 --- a/kopete/protocols/oscar/liboscar/sendmessagetask.h +++ b/kopete/protocols/oscar/liboscar/sendmessagetask.h @@ -26,7 +26,7 @@ class SendMessageTask : public Task { public: - SendMessageTask( Task* tqparent ); + SendMessageTask( Task* parent ); ~SendMessageTask(); //! Set the message to be sent diff --git a/kopete/protocols/oscar/liboscar/serverredirecttask.cpp b/kopete/protocols/oscar/liboscar/serverredirecttask.cpp index 4e3ffa86..b1de8c4b 100644 --- a/kopete/protocols/oscar/liboscar/serverredirecttask.cpp +++ b/kopete/protocols/oscar/liboscar/serverredirecttask.cpp @@ -25,8 +25,8 @@ #include "connection.h" #include "transfer.h" -ServerRedirectTask::ServerRedirectTask( Task* tqparent ) - :Task( tqparent ), m_service( 0 ) +ServerRedirectTask::ServerRedirectTask( Task* parent ) + :Task( parent ), m_service( 0 ) { } diff --git a/kopete/protocols/oscar/liboscar/serverredirecttask.h b/kopete/protocols/oscar/liboscar/serverredirecttask.h index 936ff582..b43fe195 100644 --- a/kopete/protocols/oscar/liboscar/serverredirecttask.h +++ b/kopete/protocols/oscar/liboscar/serverredirecttask.h @@ -34,7 +34,7 @@ class ServerRedirectTask : public Task Q_OBJECT TQ_OBJECT public: - ServerRedirectTask( Task* tqparent ); + ServerRedirectTask( Task* parent ); void setService( WORD family ); void setChatParams( WORD exchange, TQByteArray cookie, WORD instance ); diff --git a/kopete/protocols/oscar/liboscar/serverversionstask.cpp b/kopete/protocols/oscar/liboscar/serverversionstask.cpp index a6dc557c..336f3b02 100644 --- a/kopete/protocols/oscar/liboscar/serverversionstask.cpp +++ b/kopete/protocols/oscar/liboscar/serverversionstask.cpp @@ -29,8 +29,8 @@ using namespace Oscar; -ServerVersionsTask::ServerVersionsTask( Task* tqparent ) - : Task( tqparent ) +ServerVersionsTask::ServerVersionsTask( Task* parent ) + : Task( parent ) { m_family = 0; } diff --git a/kopete/protocols/oscar/liboscar/serverversionstask.h b/kopete/protocols/oscar/liboscar/serverversionstask.h index 532fcec0..ed7f0104 100644 --- a/kopete/protocols/oscar/liboscar/serverversionstask.h +++ b/kopete/protocols/oscar/liboscar/serverversionstask.h @@ -33,7 +33,7 @@ class ServerVersionsTask : public Task Q_OBJECT TQ_OBJECT public: - ServerVersionsTask( Task* tqparent ); + ServerVersionsTask( Task* parent ); ~ServerVersionsTask(); diff --git a/kopete/protocols/oscar/liboscar/servicesetuptask.cpp b/kopete/protocols/oscar/liboscar/servicesetuptask.cpp index 39da3531..332395dc 100644 --- a/kopete/protocols/oscar/liboscar/servicesetuptask.cpp +++ b/kopete/protocols/oscar/liboscar/servicesetuptask.cpp @@ -34,18 +34,18 @@ #include "ssiparamstask.h" #include "transfer.h" -ServiceSetupTask::ServiceSetupTask( Task* tqparent ) - : Task( tqparent ) +ServiceSetupTask::ServiceSetupTask( Task* parent ) + : Task( parent ) { m_finishedTaskCount = 0; - m_locRightsTask = new LocationRightsTask( tqparent ); - m_profileTask = new ProfileTask( tqparent ); - m_blmLimitsTask = new BLMLimitsTask( tqparent ); - m_icbmTask = new ICBMParamsTask( tqparent ); - m_prmTask = new PRMParamsTask( tqparent ); - m_ssiParamTask = new SSIParamsTask( tqparent ); - m_ssiListTask = new SSIListTask( tqparent ); - m_ssiActivateTask = new SSIActivateTask( tqparent ); + m_locRightsTask = new LocationRightsTask( parent ); + m_profileTask = new ProfileTask( parent ); + m_blmLimitsTask = new BLMLimitsTask( parent ); + m_icbmTask = new ICBMParamsTask( parent ); + m_prmTask = new PRMParamsTask( parent ); + m_ssiParamTask = new SSIParamsTask( parent ); + m_ssiListTask = new SSIListTask( parent ); + m_ssiActivateTask = new SSIActivateTask( parent ); TQObject::connect( m_ssiListTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( childTaskFinished() ) ); TQObject::connect( m_ssiParamTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( childTaskFinished() ) ); diff --git a/kopete/protocols/oscar/liboscar/servicesetuptask.h b/kopete/protocols/oscar/liboscar/servicesetuptask.h index ed364353..513344ba 100644 --- a/kopete/protocols/oscar/liboscar/servicesetuptask.h +++ b/kopete/protocols/oscar/liboscar/servicesetuptask.h @@ -40,7 +40,7 @@ class ServiceSetupTask : public Task Q_OBJECT TQ_OBJECT public: - ServiceSetupTask( Task* tqparent ); + ServiceSetupTask( Task* parent ); ~ServiceSetupTask(); bool forMe( const Transfer* transfer ) const; diff --git a/kopete/protocols/oscar/liboscar/snacprotocol.cpp b/kopete/protocols/oscar/liboscar/snacprotocol.cpp index e7021c4f..708ebb85 100644 --- a/kopete/protocols/oscar/liboscar/snacprotocol.cpp +++ b/kopete/protocols/oscar/liboscar/snacprotocol.cpp @@ -29,8 +29,8 @@ using namespace Oscar; -SnacProtocol::SnacProtocol(TQObject *tqparent, const char *name) - : InputProtocolBase(tqparent, name) +SnacProtocol::SnacProtocol(TQObject *parent, const char *name) + : InputProtocolBase(parent, name) { } diff --git a/kopete/protocols/oscar/liboscar/snacprotocol.h b/kopete/protocols/oscar/liboscar/snacprotocol.h index a9b10cbd..04608487 100644 --- a/kopete/protocols/oscar/liboscar/snacprotocol.h +++ b/kopete/protocols/oscar/liboscar/snacprotocol.h @@ -30,7 +30,7 @@ class SnacProtocol : public InputProtocolBase Q_OBJECT TQ_OBJECT public: - SnacProtocol( TQObject *tqparent = 0, const char *name = 0 ); + SnacProtocol( TQObject *parent = 0, const char *name = 0 ); ~SnacProtocol(); /** diff --git a/kopete/protocols/oscar/liboscar/ssiactivatetask.cpp b/kopete/protocols/oscar/liboscar/ssiactivatetask.cpp index c03d70d4..a2d2dc76 100644 --- a/kopete/protocols/oscar/liboscar/ssiactivatetask.cpp +++ b/kopete/protocols/oscar/liboscar/ssiactivatetask.cpp @@ -26,7 +26,7 @@ -SSIActivateTask::SSIActivateTask(Task* tqparent): Task(tqparent) +SSIActivateTask::SSIActivateTask(Task* parent): Task(parent) { } diff --git a/kopete/protocols/oscar/liboscar/ssiactivatetask.h b/kopete/protocols/oscar/liboscar/ssiactivatetask.h index 7ca44896..66f0a67b 100644 --- a/kopete/protocols/oscar/liboscar/ssiactivatetask.h +++ b/kopete/protocols/oscar/liboscar/ssiactivatetask.h @@ -28,7 +28,7 @@ A fire and forget task to send the activation SNAC for the SSI list to the serve class SSIActivateTask : public Task { public: - SSIActivateTask( Task* tqparent ); + SSIActivateTask( Task* parent ); ~SSIActivateTask(); void onGo(); }; diff --git a/kopete/protocols/oscar/liboscar/ssiauthtask.cpp b/kopete/protocols/oscar/liboscar/ssiauthtask.cpp index 8a33bb56..bccb754e 100644 --- a/kopete/protocols/oscar/liboscar/ssiauthtask.cpp +++ b/kopete/protocols/oscar/liboscar/ssiauthtask.cpp @@ -25,10 +25,10 @@ #include <kdebug.h> -SSIAuthTask::SSIAuthTask( Task* tqparent ) - : Task( tqparent ) +SSIAuthTask::SSIAuthTask( Task* parent ) + : Task( parent ) { - m_manager = tqparent->client()->ssiManager(); + m_manager = parent->client()->ssiManager(); } SSIAuthTask::~SSIAuthTask() diff --git a/kopete/protocols/oscar/liboscar/ssiauthtask.h b/kopete/protocols/oscar/liboscar/ssiauthtask.h index d7e7c78a..c5d8a351 100644 --- a/kopete/protocols/oscar/liboscar/ssiauthtask.h +++ b/kopete/protocols/oscar/liboscar/ssiauthtask.h @@ -31,7 +31,7 @@ class SSIAuthTask : public Task Q_OBJECT TQ_OBJECT public: - SSIAuthTask( Task* tqparent ); + SSIAuthTask( Task* parent ); ~SSIAuthTask(); diff --git a/kopete/protocols/oscar/liboscar/ssilisttask.cpp b/kopete/protocols/oscar/liboscar/ssilisttask.cpp index 6b10e3fa..a62e6721 100644 --- a/kopete/protocols/oscar/liboscar/ssilisttask.cpp +++ b/kopete/protocols/oscar/liboscar/ssilisttask.cpp @@ -23,7 +23,7 @@ #include "ssimanager.h" #include "transfer.h" -SSIListTask::SSIListTask( Task* tqparent ) : Task( tqparent ) +SSIListTask::SSIListTask( Task* parent ) : Task( parent ) { m_ssiManager = client()->ssiManager(); TQObject::connect( this, TQT_SIGNAL( newContact( const Oscar::SSI& ) ), m_ssiManager, TQT_SLOT( newContact( const Oscar::SSI& ) ) ); diff --git a/kopete/protocols/oscar/liboscar/ssilisttask.h b/kopete/protocols/oscar/liboscar/ssilisttask.h index 24ee179d..ac0ddfe5 100644 --- a/kopete/protocols/oscar/liboscar/ssilisttask.h +++ b/kopete/protocols/oscar/liboscar/ssilisttask.h @@ -37,7 +37,7 @@ class SSIListTask : public Task Q_OBJECT TQ_OBJECT public: - SSIListTask( Task* tqparent ); + SSIListTask( Task* parent ); ~SSIListTask(); virtual bool take( Transfer* transfer ); diff --git a/kopete/protocols/oscar/liboscar/ssimanager.cpp b/kopete/protocols/oscar/liboscar/ssimanager.cpp index 45f69340..ce39965f 100644 --- a/kopete/protocols/oscar/liboscar/ssimanager.cpp +++ b/kopete/protocols/oscar/liboscar/ssimanager.cpp @@ -42,8 +42,8 @@ public: WORD nextGroupId; }; -SSIManager::SSIManager( TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ) +SSIManager::SSIManager( TQObject *parent, const char *name ) + : TQObject( parent, name ) { d = new SSIManagerPrivate; d->complete = false; @@ -214,7 +214,7 @@ Oscar::SSI SSIManager::findContact( const TQString &contact, const TQString &gro return m_dummyItem; } - Oscar::SSI gr = findGroup( group ); // find the tqparent group + Oscar::SSI gr = findGroup( group ); // find the parent group if ( gr.isValid() ) { kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "gr->name= " << gr.name() << diff --git a/kopete/protocols/oscar/liboscar/ssimanager.h b/kopete/protocols/oscar/liboscar/ssimanager.h index d75d1e17..2d8d4fd1 100644 --- a/kopete/protocols/oscar/liboscar/ssimanager.h +++ b/kopete/protocols/oscar/liboscar/ssimanager.h @@ -43,7 +43,7 @@ class KOPETE_EXPORT SSIManager : public TQObject Q_OBJECT TQ_OBJECT public: - SSIManager( TQObject* tqparent = 0, const char* name = 0 ); + SSIManager( TQObject* parent = 0, const char* name = 0 ); ~SSIManager(); diff --git a/kopete/protocols/oscar/liboscar/ssimodifytask.cpp b/kopete/protocols/oscar/liboscar/ssimodifytask.cpp index 23164bc0..80a9346c 100644 --- a/kopete/protocols/oscar/liboscar/ssimodifytask.cpp +++ b/kopete/protocols/oscar/liboscar/ssimodifytask.cpp @@ -28,9 +28,9 @@ #include "transfer.h" -SSIModifyTask::SSIModifyTask( Task* tqparent, bool staticTask ) : Task( tqparent ) +SSIModifyTask::SSIModifyTask( Task* parent, bool staticTask ) : Task( parent ) { - m_ssiManager = tqparent->client()->ssiManager(); + m_ssiManager = parent->client()->ssiManager(); m_static = staticTask; m_opType = NoType; m_opSubject = NoSubject; diff --git a/kopete/protocols/oscar/liboscar/ssimodifytask.h b/kopete/protocols/oscar/liboscar/ssimodifytask.h index 3093c159..70486cbc 100644 --- a/kopete/protocols/oscar/liboscar/ssimodifytask.h +++ b/kopete/protocols/oscar/liboscar/ssimodifytask.h @@ -51,7 +51,7 @@ This task implements the following SNACs from the SSI family (0x0013): class SSIModifyTask : public Task { public: - SSIModifyTask( Task* tqparent, bool staticTask = false ); + SSIModifyTask( Task* parent, bool staticTask = false ); ~SSIModifyTask(); virtual void onGo(); diff --git a/kopete/protocols/oscar/liboscar/ssiparamstask.cpp b/kopete/protocols/oscar/liboscar/ssiparamstask.cpp index 11239533..1f6fbd9d 100644 --- a/kopete/protocols/oscar/liboscar/ssiparamstask.cpp +++ b/kopete/protocols/oscar/liboscar/ssiparamstask.cpp @@ -27,7 +27,7 @@ using namespace Oscar; -SSIParamsTask::SSIParamsTask(Task* tqparent): Task(tqparent) +SSIParamsTask::SSIParamsTask(Task* parent): Task(parent) { } diff --git a/kopete/protocols/oscar/liboscar/ssiparamstask.h b/kopete/protocols/oscar/liboscar/ssiparamstask.h index e0244c6d..abf12aa2 100644 --- a/kopete/protocols/oscar/liboscar/ssiparamstask.h +++ b/kopete/protocols/oscar/liboscar/ssiparamstask.h @@ -26,7 +26,7 @@ class SSIParamsTask : public Task { public: - SSIParamsTask(Task* tqparent); + SSIParamsTask(Task* parent); ~SSIParamsTask(); diff --git a/kopete/protocols/oscar/liboscar/stream.cpp b/kopete/protocols/oscar/liboscar/stream.cpp index 517bde68..2fb302c1 100644 --- a/kopete/protocols/oscar/liboscar/stream.cpp +++ b/kopete/protocols/oscar/liboscar/stream.cpp @@ -19,8 +19,8 @@ #include "stream.h" -Stream::Stream(TQObject *tqparent) -:TQObject(tqparent) +Stream::Stream(TQObject *parent) +:TQObject(parent) { } diff --git a/kopete/protocols/oscar/liboscar/stream.h b/kopete/protocols/oscar/liboscar/stream.h index 2ea1f871..583fa5eb 100644 --- a/kopete/protocols/oscar/liboscar/stream.h +++ b/kopete/protocols/oscar/liboscar/stream.h @@ -43,7 +43,7 @@ public: SystemShutdown }; - Stream(TQObject *tqparent=0); + Stream(TQObject *parent=0); virtual ~Stream(); virtual void close()=0; diff --git a/kopete/protocols/oscar/liboscar/task.cpp b/kopete/protocols/oscar/liboscar/task.cpp index cc988ebe..9e637d45 100644 --- a/kopete/protocols/oscar/liboscar/task.cpp +++ b/kopete/protocols/oscar/liboscar/task.cpp @@ -41,19 +41,19 @@ public: Transfer* transfer; }; -Task::Task(Task *tqparent) -:TQObject(tqparent) +Task::Task(Task *parent) +:TQObject(parent) { init(); - d->client = tqparent->client(); + d->client = parent->client(); connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected())); } -Task::Task(Connection* tqparent, bool) +Task::Task(Connection* parent, bool) :TQObject(0) { init(); - d->client = tqparent; + d->client = parent; connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected())); } @@ -75,9 +75,9 @@ void Task::init() d->id = 0; } -Task *Task::tqparent() const +Task *Task::parent() const { - return (Task *)TQObject::tqparent(); + return (Task *)TQObject::parent(); } Connection *Task::client() const diff --git a/kopete/protocols/oscar/liboscar/task.h b/kopete/protocols/oscar/liboscar/task.h index 184abd45..7aaba596 100644 --- a/kopete/protocols/oscar/liboscar/task.h +++ b/kopete/protocols/oscar/liboscar/task.h @@ -40,11 +40,11 @@ class Task : public TQObject TQ_OBJECT public: enum { ErrDisc }; - Task(Task *tqparent); + Task(Task *parent); Task( Connection*, bool isRoot ); virtual ~Task(); - Task *tqparent() const; + Task *parent() const; Connection* client() const; Transfer *transfer() const; diff --git a/kopete/protocols/oscar/liboscar/typingnotifytask.cpp b/kopete/protocols/oscar/liboscar/typingnotifytask.cpp index e69222c1..e68412bc 100644 --- a/kopete/protocols/oscar/liboscar/typingnotifytask.cpp +++ b/kopete/protocols/oscar/liboscar/typingnotifytask.cpp @@ -25,8 +25,8 @@ -TypingNotifyTask::TypingNotifyTask( Task* tqparent ) -: Task( tqparent ) +TypingNotifyTask::TypingNotifyTask( Task* parent ) +: Task( parent ) { m_notificationType = 0x0000; } diff --git a/kopete/protocols/oscar/liboscar/typingnotifytask.h b/kopete/protocols/oscar/liboscar/typingnotifytask.h index b815005a..4940735f 100644 --- a/kopete/protocols/oscar/liboscar/typingnotifytask.h +++ b/kopete/protocols/oscar/liboscar/typingnotifytask.h @@ -32,7 +32,7 @@ Q_OBJECT public: enum { Finished = 0x0000, Typed = 0x0001, Begin = 0x0002 }; - TypingNotifyTask( Task* tqparent ); + TypingNotifyTask( Task* parent ); ~TypingNotifyTask(); virtual bool forMe( const Transfer* transfer) const; diff --git a/kopete/protocols/oscar/liboscar/userinfotask.cpp b/kopete/protocols/oscar/liboscar/userinfotask.cpp index c91dea47..fbe7fd5a 100644 --- a/kopete/protocols/oscar/liboscar/userinfotask.cpp +++ b/kopete/protocols/oscar/liboscar/userinfotask.cpp @@ -26,8 +26,8 @@ Kopete (c) 2002-2005 by the Kopete developers <kopete-devel@kde.org> -UserInfoTask::UserInfoTask( Task* tqparent ) -: Task( tqparent ) +UserInfoTask::UserInfoTask( Task* parent ) +: Task( parent ) { } diff --git a/kopete/protocols/oscar/liboscar/userinfotask.h b/kopete/protocols/oscar/liboscar/userinfotask.h index 4eadc90c..2b1baf82 100644 --- a/kopete/protocols/oscar/liboscar/userinfotask.h +++ b/kopete/protocols/oscar/liboscar/userinfotask.h @@ -35,7 +35,7 @@ class UserInfoTask : public Task Q_OBJECT TQ_OBJECT public: - UserInfoTask( Task* tqparent ); + UserInfoTask( Task* parent ); ~UserInfoTask(); enum { Profile = 0x0001, General = 0x0002, AwayMessage = 0x0003, Capabilities = 0x0004 }; diff --git a/kopete/protocols/oscar/liboscar/usersearchtask.cpp b/kopete/protocols/oscar/liboscar/usersearchtask.cpp index 48a5684f..1a68f4eb 100644 --- a/kopete/protocols/oscar/liboscar/usersearchtask.cpp +++ b/kopete/protocols/oscar/liboscar/usersearchtask.cpp @@ -22,8 +22,8 @@ #include "buffer.h" #include "connection.h" -UserSearchTask::UserSearchTask( Task* tqparent ) - : ICQTask( tqparent ) +UserSearchTask::UserSearchTask( Task* parent ) + : ICQTask( parent ) { } diff --git a/kopete/protocols/oscar/liboscar/usersearchtask.h b/kopete/protocols/oscar/liboscar/usersearchtask.h index 4cef65d0..6b187e84 100644 --- a/kopete/protocols/oscar/liboscar/usersearchtask.h +++ b/kopete/protocols/oscar/liboscar/usersearchtask.h @@ -33,7 +33,7 @@ class UserSearchTask : public ICQTask Q_OBJECT TQ_OBJECT public: - UserSearchTask( Task* tqparent ); + UserSearchTask( Task* parent ); ~UserSearchTask(); diff --git a/kopete/protocols/oscar/liboscar/warningtask.cpp b/kopete/protocols/oscar/liboscar/warningtask.cpp index d2fb1f83..17ac0e0c 100644 --- a/kopete/protocols/oscar/liboscar/warningtask.cpp +++ b/kopete/protocols/oscar/liboscar/warningtask.cpp @@ -23,7 +23,7 @@ #include "transfer.h" #include "connection.h" -WarningTask::WarningTask( Task* tqparent ): Task( tqparent ) +WarningTask::WarningTask( Task* parent ): Task( parent ) { } diff --git a/kopete/protocols/oscar/liboscar/warningtask.h b/kopete/protocols/oscar/liboscar/warningtask.h index 0ce90cea..9287f697 100644 --- a/kopete/protocols/oscar/liboscar/warningtask.h +++ b/kopete/protocols/oscar/liboscar/warningtask.h @@ -31,7 +31,7 @@ class WarningTask : public Task Q_OBJECT TQ_OBJECT public: - WarningTask( Task* tqparent ); + WarningTask( Task* parent ); ~WarningTask(); void setContact( const TQString& contact ); |