summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/testbed
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:49:40 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:49:40 -0600
commit808e453c56036211f57482ed847d54aca01bba68 (patch)
tree75515d5768dea10d4fbe4cd772e0a89c1c4b3aa9 /kopete/protocols/testbed
parentcd9b9ed7fd0ac8a75106148254aa58e2e5c04863 (diff)
downloadtdenetwork-808e453c56036211f57482ed847d54aca01bba68.tar.gz
tdenetwork-808e453c56036211f57482ed847d54aca01bba68.zip
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'kopete/protocols/testbed')
-rw-r--r--kopete/protocols/testbed/testbedaccount.cpp18
-rw-r--r--kopete/protocols/testbed/testbedaccount.h4
-rw-r--r--kopete/protocols/testbed/testbedaccountpreferences.ui8
-rw-r--r--kopete/protocols/testbed/testbedaddcontactpage.cpp4
-rw-r--r--kopete/protocols/testbed/testbedaddui.ui4
-rw-r--r--kopete/protocols/testbed/testbededitaccountwidget.cpp2
-rw-r--r--kopete/protocols/testbed/testbedfakeserver.cpp4
-rw-r--r--kopete/protocols/testbed/testbedprotocol.cpp4
-rw-r--r--kopete/protocols/testbed/ui/testbedwebcamdialog.cpp6
9 files changed, 27 insertions, 27 deletions
diff --git a/kopete/protocols/testbed/testbedaccount.cpp b/kopete/protocols/testbed/testbedaccount.cpp
index 17c1ea73..cc906447 100644
--- a/kopete/protocols/testbed/testbedaccount.cpp
+++ b/kopete/protocols/testbed/testbedaccount.cpp
@@ -75,10 +75,10 @@ void TestbedAccount::setAway( bool away, const TQString & /* reason */ )
void TestbedAccount::setOnlineStatus(const Kopete::OnlineStatus& status, const TQString &reason )
{
if ( status.status() == Kopete::OnlineStatus::Online &&
- myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Offline )
+ myself()->onlineStatus().status() == Kopete::OnlineStatus::Offline )
slotGoOnline();
else if (status.status() == Kopete::OnlineStatus::Online &&
- myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Away )
+ myself()->onlineStatus().status() == Kopete::OnlineStatus::Away )
setAway( false, reason );
else if ( status.status() == Kopete::OnlineStatus::Offline )
slotGoOffline();
@@ -86,7 +86,7 @@ void TestbedAccount::setOnlineStatus(const Kopete::OnlineStatus& status, const T
slotGoAway( /* reason */ );
}
-void TestbedAccount::connect( const Kopete::OnlineStatus& /* initialtqStatus */ )
+void TestbedAccount::connect( const Kopete::OnlineStatus& /* initialStatus */ )
{
kdDebug ( 14210 ) << k_funcinfo << endl;
myself()->setOnlineStatus( TestbedProtocol::protocol()->testbedOnline );
@@ -114,7 +114,7 @@ void TestbedAccount::slotGoOnline ()
connect ();
else
myself()->setOnlineStatus( TestbedProtocol::protocol()->testbedOnline );
- updateContacttqStatus();
+ updateContactStatus();
}
void TestbedAccount::slotGoAway ()
@@ -125,7 +125,7 @@ void TestbedAccount::slotGoAway ()
connect();
myself()->setOnlineStatus( TestbedProtocol::protocol()->testbedAway );
- updateContacttqStatus();
+ updateContactStatus();
}
@@ -135,7 +135,7 @@ void TestbedAccount::slotGoOffline ()
if (isConnected ())
disconnect ();
- updateContacttqStatus();
+ updateContactStatus();
}
void TestbedAccount::slotShowVideo ()
@@ -144,7 +144,7 @@ void TestbedAccount::slotShowVideo ()
if (isConnected ())
TestbedWebcamDialog *testbedWebcamDialog = new TestbedWebcamDialog(0, 0, "Testbed video window");
- updateContacttqStatus();
+ updateContactStatus();
}
void TestbedAccount::receivedMessage( const TQString &message )
@@ -165,11 +165,11 @@ void TestbedAccount::receivedMessage( const TQString &message )
kdWarning(14210) << k_funcinfo << "unable to look up contact for delivery" << endl;
}
-void TestbedAccount::updateContacttqStatus()
+void TestbedAccount::updateContactStatus()
{
TQDictIterator<Kopete::Contact> itr( contacts() );
for ( ; itr.current(); ++itr )
- itr.current()->setOnlineStatus( myself()->onlinetqStatus() );
+ itr.current()->setOnlineStatus( myself()->onlineStatus() );
}
diff --git a/kopete/protocols/testbed/testbedaccount.h b/kopete/protocols/testbed/testbedaccount.h
index c9f1517e..8bb310ca 100644
--- a/kopete/protocols/testbed/testbedaccount.h
+++ b/kopete/protocols/testbed/testbedaccount.h
@@ -60,7 +60,7 @@ public:
/**
* 'Connect' to the testbed server. Only sets myself() online.
*/
- virtual void connect( const Kopete::OnlineStatus& initialtqStatus = Kopete::OnlineStatus() );
+ virtual void connect( const Kopete::OnlineStatus& initialStatus = Kopete::OnlineStatus() );
/**
* Disconnect from the server. Only sets myself() offline.
*/
@@ -80,7 +80,7 @@ protected:
/**
* This simulates contacts going on and offline in sync with the account's status changes
*/
- void updateContacttqStatus();
+ void updateContactStatus();
TestbedFakeServer* m_server;
protected slots:
diff --git a/kopete/protocols/testbed/testbedaccountpreferences.ui b/kopete/protocols/testbed/testbedaccountpreferences.ui
index 4edf08ca..99500ddb 100644
--- a/kopete/protocols/testbed/testbedaccountpreferences.ui
+++ b/kopete/protocols/testbed/testbedaccountpreferences.ui
@@ -53,7 +53,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout1_2</cstring>
+ <cstring>layout1_2</cstring>
</property>
<hbox>
<property name="name">
@@ -117,7 +117,7 @@
<property name="text">
<string>To use the testbed protocol, just make up an account name. This protocol has no real networking capability.</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@@ -133,7 +133,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>131</height>
@@ -150,7 +150,7 @@
<property name="text">
<string></string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
diff --git a/kopete/protocols/testbed/testbedaddcontactpage.cpp b/kopete/protocols/testbed/testbedaddcontactpage.cpp
index 9250b9a0..15979be0 100644
--- a/kopete/protocols/testbed/testbedaddcontactpage.cpp
+++ b/kopete/protocols/testbed/testbedaddcontactpage.cpp
@@ -16,7 +16,7 @@
#include "testbedaddcontactpage.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqradiobutton.h>
#include <tqlineedit.h>
#include <kdebug.h>
@@ -48,7 +48,7 @@ bool TestbedAddContactPage::apply( Kopete::Account* a, Kopete::MetaContact* m )
if ( m_testbedAddUI->m_rbEcho->isOn() )
{
type = m_testbedAddUI->m_uniqueName->text();
- name = TQString::tqfromLatin1( "Echo Contact" );
+ name = TQString::fromLatin1( "Echo Contact" );
ok = true;
}
if ( ok )
diff --git a/kopete/protocols/testbed/testbedaddui.ui b/kopete/protocols/testbed/testbedaddui.ui
index aa0410dd..b9994322 100644
--- a/kopete/protocols/testbed/testbedaddui.ui
+++ b/kopete/protocols/testbed/testbedaddui.ui
@@ -18,7 +18,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -94,7 +94,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>252</height>
diff --git a/kopete/protocols/testbed/testbededitaccountwidget.cpp b/kopete/protocols/testbed/testbededitaccountwidget.cpp
index 98a52dfc..0e31d639 100644
--- a/kopete/protocols/testbed/testbededitaccountwidget.cpp
+++ b/kopete/protocols/testbed/testbededitaccountwidget.cpp
@@ -16,7 +16,7 @@
#include "testbededitaccountwidget.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlineedit.h>
#include <kdebug.h>
#include "kopeteaccount.h"
diff --git a/kopete/protocols/testbed/testbedfakeserver.cpp b/kopete/protocols/testbed/testbedfakeserver.cpp
index 7740b858..9a4116ca 100644
--- a/kopete/protocols/testbed/testbedfakeserver.cpp
+++ b/kopete/protocols/testbed/testbedfakeserver.cpp
@@ -36,8 +36,8 @@ void TestbedFakeServer::sendMessage( TQString contactId, TQString message )
kdDebug( 14210 ) << k_funcinfo << "Message for: " << contactId << ", is: " << message << endl;
kdDebug( 14210 ) << "recipient is echo, coming back at you." << endl;
// put the message in a map and start a timer to tell it to deliver itself.
- //emit messageReceived( TQString::tqfromLatin1( "echo: " ) + message );
- TQString messageId = contactId + TQString::tqfromLatin1(": ");
+ //emit messageReceived( TQString::fromLatin1( "echo: " ) + message );
+ TQString messageId = contactId + TQString::fromLatin1(": ");
TestbedIncomingMessage* msg = new TestbedIncomingMessage( this, messageId + message );
m_incomingMessages.append( msg );
TQTimer::singleShot( 1000, msg, TQT_SLOT( deliver() ) );
diff --git a/kopete/protocols/testbed/testbedprotocol.cpp b/kopete/protocols/testbed/testbedprotocol.cpp
index 301b8a08..867a2647 100644
--- a/kopete/protocols/testbed/testbedprotocol.cpp
+++ b/kopete/protocols/testbed/testbedprotocol.cpp
@@ -55,9 +55,9 @@ Kopete::Contact *TestbedProtocol::deserializeContact(
TQString type = serializedData[ "contactType" ];
TestbedContact::TestbedContactType tbcType;
- if ( type == TQString::tqfromLatin1( "echo" ) )
+ if ( type == TQString::fromLatin1( "echo" ) )
tbcType = TestbedContact::Echo;
- if ( type == TQString::tqfromLatin1( "null" ) )
+ if ( type == TQString::fromLatin1( "null" ) )
tbcType = TestbedContact::Null;
else
tbcType = TestbedContact::Null;
diff --git a/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp b/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp
index d5453978..828eb6b2 100644
--- a/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp
+++ b/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp
@@ -22,13 +22,13 @@
#include <tqobject.h>
#include <tqwidget.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqvbox.h>
#include <kdebug.h>
#include <klocale.h>
TestbedWebcamDialog::TestbedWebcamDialog( const TQString &contactId, TQWidget * parent, const char * name )
-: KDialogBase( KDialogBase::Plain, TQt::WDestructiveClose, parent, name, false, i18n( "Webcam for %1" ).tqarg( contactId ),
+: KDialogBase( KDialogBase::Plain, TQt::WDestructiveClose, parent, name, false, i18n( "Webcam for %1" ).arg( contactId ),
KDialogBase::Close, KDialogBase::Close, true /*seperator*/ )
{
setInitialSize( TQSize(320,290), false );
@@ -43,7 +43,7 @@ TestbedWebcamDialog::TestbedWebcamDialog( const TQString &contactId, TQWidget *
mImageContainer = new Kopete::WebcamWidget( page );
mImageContainer->setMinimumSize(320,240);
mImageContainer->setText( i18n( "No webcam image received" ) );
- mImageContainer->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+ mImageContainer->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
topLayout->add( mImageContainer );
show();