summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/oscar/liboscar/logintask.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-22 00:30:31 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-22 00:30:31 +0000
commit69cac65817d949cda2672ec4f0aa73d5e66a0ba1 (patch)
tree073fde0496ea90eb5bf5cffe66a8da43a9f55fbc /kopete/protocols/oscar/liboscar/logintask.cpp
parent3467e6464beac3a162839bf7078e22e3a74d73e7 (diff)
downloadtdenetwork-69cac65817d949cda2672ec4f0aa73d5e66a0ba1.tar.gz
tdenetwork-69cac65817d949cda2672ec4f0aa73d5e66a0ba1.zip
TQt4 port kdenetwork
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kopete/protocols/oscar/liboscar/logintask.cpp')
-rw-r--r--kopete/protocols/oscar/liboscar/logintask.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/kopete/protocols/oscar/liboscar/logintask.cpp b/kopete/protocols/oscar/liboscar/logintask.cpp
index a153f8f7..10d62e6d 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* parent )
- : Task ( parent )
+StageOneLoginTask::StageOneLoginTask( Task* tqparent )
+ : Task ( tqparent )
{
m_aimTask = 0L;
m_icqTask = 0L;
@@ -137,8 +137,8 @@ const TQString& StageOneLoginTask::bosPort() const
/**
* Stage Two Task Implementation
*/
-StageTwoLoginTask::StageTwoLoginTask( Task* parent )
- : Task( parent )
+StageTwoLoginTask::StageTwoLoginTask( Task* tqparent )
+ : Task( tqparent )
{
//Create our tasks
Task* rootTask = client()->rootTask();
@@ -188,7 +188,7 @@ void StageTwoLoginTask::onGo()
send( ft );
}
else
- setError( -1, TQString::null );
+ setError( -1, TQString() );
return;
}
@@ -210,7 +210,7 @@ void StageTwoLoginTask::versionTaskFinished()
void StageTwoLoginTask::rateTaskFinished()
{
- setSuccess( 0, TQString::null );
+ setSuccess( 0, TQString() );
}
#include "logintask.moc"