summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/msn
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/protocols/msn')
-rw-r--r--kopete/protocols/msn/config/msnprefs.ui2
-rw-r--r--kopete/protocols/msn/msnaccount.cpp10
-rw-r--r--kopete/protocols/msn/msnchatsession.cpp4
-rw-r--r--kopete/protocols/msn/msncontact.cpp16
-rw-r--r--kopete/protocols/msn/msncontact.h4
-rw-r--r--kopete/protocols/msn/msnfiletransfersocket.cpp2
-rw-r--r--kopete/protocols/msn/msnnotifysocket.cpp14
-rw-r--r--kopete/protocols/msn/msnnotifysocket.h8
-rw-r--r--kopete/protocols/msn/msnprotocol.cpp2
-rw-r--r--kopete/protocols/msn/msnsocket.cpp16
-rw-r--r--kopete/protocols/msn/msnsocket.h6
-rw-r--r--kopete/protocols/msn/msnswitchboardsocket.cpp24
-rw-r--r--kopete/protocols/msn/ui/msnadd.ui2
-rw-r--r--kopete/protocols/msn/ui/msneditaccountui.ui36
-rw-r--r--kopete/protocols/msn/ui/msninfo.ui2
-rw-r--r--kopete/protocols/msn/webcam.cpp4
-rw-r--r--kopete/protocols/msn/webcam.h4
-rw-r--r--kopete/protocols/msn/webcam/msnwebcamdialog.cpp4
18 files changed, 80 insertions, 80 deletions
diff --git a/kopete/protocols/msn/config/msnprefs.ui b/kopete/protocols/msn/config/msnprefs.ui
index 701d564d..a0c37920 100644
--- a/kopete/protocols/msn/config/msnprefs.ui
+++ b/kopete/protocols/msn/config/msnprefs.ui
@@ -182,7 +182,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>70</height>
diff --git a/kopete/protocols/msn/msnaccount.cpp b/kopete/protocols/msn/msnaccount.cpp
index fbf43221..760f7cba 100644
--- a/kopete/protocols/msn/msnaccount.cpp
+++ b/kopete/protocols/msn/msnaccount.cpp
@@ -231,7 +231,7 @@ void MSNAccount::createNotificationServer( const TQString &host, uint port )
TQObject::connect( m_notifySocket, TQT_SIGNAL( errorMessage(int, const TQString& ) ),
TQT_SLOT( slotErrorMessageReceived(int, const TQString& ) ) );
- m_notifySocket->settqStatus( m_connectstatus );
+ m_notifySocket->setStatus( m_connectstatus );
m_notifySocket->connect(host, port);
}
@@ -314,7 +314,7 @@ void MSNAccount::setOnlineStatus( const Kopete::OnlineStatus &status , const TQS
disconnect();
else if ( m_notifySocket )
{
- m_notifySocket->settqStatus( status );
+ m_notifySocket->setStatus( status );
}
else
{
@@ -409,7 +409,7 @@ void MSNAccount::slotNotifySocketClosed()
m_notifySocket->deleteLater();
m_notifySocket = 0l;
myself()->setOnlineStatus( MSNProtocol::protocol()->FLN );
- setAllContactstqStatus( MSNProtocol::protocol()->FLN );
+ setAllContactsStatus( MSNProtocol::protocol()->FLN );
disconnected(reason);
@@ -951,7 +951,7 @@ void MSNAccount::slotContactAdded( const TQString& handle, const TQString& list,
if( !c->hasProperty(MSNProtocol::protocol()->propGuid.key()) )
c->setProperty( MSNProtocol::protocol()->propGuid, contactGuid );
- if ( c->onlinetqStatus() == MSNProtocol::protocol()->UNK )
+ if ( c->onlineStatus() == MSNProtocol::protocol()->UNK )
c->setOnlineStatus( MSNProtocol::protocol()->FLN );
if ( c->metaContact() && c->metaContact()->isTemporary() )
@@ -1488,7 +1488,7 @@ void MSNAccount::resetPictureObject(bool silent, bool force)
if(old!=m_pictureObj && isConnected() && m_notifySocket && !silent)
{
//update the msn pict
- m_notifySocket->settqStatus( myself()->onlinetqStatus() );
+ m_notifySocket->setStatus( myself()->onlineStatus() );
}
}
diff --git a/kopete/protocols/msn/msnchatsession.cpp b/kopete/protocols/msn/msnchatsession.cpp
index 2b7fe8bb..3fcecc47 100644
--- a/kopete/protocols/msn/msnchatsession.cpp
+++ b/kopete/protocols/msn/msnchatsession.cpp
@@ -527,7 +527,7 @@ void MSNChatSession::slotRequestPicture()
if( !c->object().isEmpty() )
m_chatService->requestDisplayPicture();
}
- else if(myself()->onlinetqStatus().isDefinitelyOnline() && myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Invisible )
+ else if(myself()->onlineStatus().isDefinitelyOnline() && myself()->onlineStatus().status() != Kopete::OnlineStatus::Invisible )
startChatSession();
}
else
@@ -548,7 +548,7 @@ void MSNChatSession::slotDisplayPictureChanged()
int sz=22;
// get the size of the toolbar were the aciton is plugged.
// if you know a better way to get the toolbar, let me know
- KMainWindow *w= view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->tqtopLevelWidget() ) : 0L;
+ KMainWindow *w= view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : 0L;
if(w)
{
//We connected that in the constructor. we don't need to keep this slot active.
diff --git a/kopete/protocols/msn/msncontact.cpp b/kopete/protocols/msn/msncontact.cpp
index 304029bf..0b38f2c3 100644
--- a/kopete/protocols/msn/msncontact.cpp
+++ b/kopete/protocols/msn/msncontact.cpp
@@ -89,7 +89,7 @@ MSNContact::~MSNContact()
bool MSNContact::isReachable()
{
- if ( account()->isConnected() && isOnline() && account()->myself()->onlinetqStatus() != MSNProtocol::protocol()->HDN )
+ if ( account()->isConnected() && isOnline() && account()->myself()->onlineStatus() != MSNProtocol::protocol()->HDN )
return true;
MSNChatSession *kmm=dynamic_cast<MSNChatSession*>(manager(Kopete::Contact::CannotCreate));
@@ -98,13 +98,13 @@ bool MSNContact::isReachable()
// When we are invisible we can't start a chat with others, make isReachable return false
// (This is an MSN limitation, not a problem in Kopete)
- if ( !account()->isConnected() || account()->myself()->onlinetqStatus() == MSNProtocol::protocol()->HDN )
+ if ( !account()->isConnected() || account()->myself()->onlineStatus() == MSNProtocol::protocol()->HDN )
return false;
//if the contact is offline, it is impossible to send it a message. but it is impossible
//to be sure the contact is realy offline. For example, if the contact is not on the contactlist for
//some reason.
- if( onlinetqStatus() == MSNProtocol::protocol()->FLN && ( isAllowed() || isBlocked() ) && !serverGroups().isEmpty() )
+ if( onlineStatus() == MSNProtocol::protocol()->FLN && ( isAllowed() || isBlocked() ) && !serverGroups().isEmpty() )
return false;
return true;
@@ -264,8 +264,8 @@ void MSNContact::setBlocked( bool blocked )
{
m_blocked = blocked;
//update the status
- setOnlineStatus(m_currenttqStatus);
- //m_currenttqStatus is used here. previously it was onlinetqStatus() but this may cause problem when
+ setOnlineStatus(m_currentStatus);
+ //m_currentStatus is used here. previously it was onlineStatus() but this may cause problem when
// the account is offline because of the Kopete::Contact::OnlineStatus() account offline hack.
}
}
@@ -577,7 +577,7 @@ void MSNContact::rename( const TQString &newName )
void MSNContact::slotShowProfile()
{
- KRun::runURL( KURL( TQString::tqfromLatin1("http://members.msn.com/?pgmarket=it-it&mem=") + contactId()) , "text/html" );
+ KRun::runURL( KURL( TQString::fromLatin1("http://members.msn.com/?pgmarket=it-it&mem=") + contactId()) , "text/html" );
}
@@ -655,7 +655,7 @@ void MSNContact::setOnlineStatus(const Kopete::OnlineStatus& status)
}
else
Kopete::Contact::setOnlineStatus(status);
- m_currenttqStatus=status;
+ m_currentStatus=status;
}
void MSNContact::slotSendMail()
@@ -703,7 +703,7 @@ void MSNContact::setObject(const TQString &obj)
KConfig *config = KGlobal::config();
config->setGroup( "MSN" );
if ( config->readNumEntry( "DownloadPicture", 2 ) >= 2 && !obj.isEmpty()
- && account()->myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Invisible )
+ && account()->myself()->onlineStatus().status() != Kopete::OnlineStatus::Invisible )
manager(Kopete::Contact::CanCreate); //create the manager which will download the photo automatically.
}
diff --git a/kopete/protocols/msn/msncontact.h b/kopete/protocols/msn/msncontact.h
index 97039fed..42667682 100644
--- a/kopete/protocols/msn/msncontact.h
+++ b/kopete/protocols/msn/msncontact.h
@@ -185,10 +185,10 @@ private:
TQString m_obj; //the MSNObject
/**
- * keep the current status here. (it's normally already in Kopete::Contact::d->onlinetqStatus)
+ * keep the current status here. (it's normally already in Kopete::Contact::d->onlineStatus)
* This is a workaround to prevent problems with the account offline status.
*/
- Kopete::OnlineStatus m_currenttqStatus;
+ Kopete::OnlineStatus m_currentStatus;
//MSNProtocol::deserializeContact need to acess some contact insternals
friend class MSNProtocol;
diff --git a/kopete/protocols/msn/msnfiletransfersocket.cpp b/kopete/protocols/msn/msnfiletransfersocket.cpp
index 72b5f1f8..157209e9 100644
--- a/kopete/protocols/msn/msnfiletransfersocket.cpp
+++ b/kopete/protocols/msn/msnfiletransfersocket.cpp
@@ -217,7 +217,7 @@ void MSNFileTransferSocket::slotAcceptConnection()
void MSNFileTransferSocket::slotTimer()
{
- if(onlinetqStatus() != Disconnected)
+ if(onlineStatus() != Disconnected)
return;
kdDebug(14140) << "MSNFileTransferSocket::slotTimer: timeout "<< endl;
if( m_kopeteTransfer)
diff --git a/kopete/protocols/msn/msnnotifysocket.cpp b/kopete/protocols/msn/msnnotifysocket.cpp
index 93dc2f0e..89714326 100644
--- a/kopete/protocols/msn/msnnotifysocket.cpp
+++ b/kopete/protocols/msn/msnnotifysocket.cpp
@@ -90,14 +90,14 @@ void MSNNotifySocket::disconnect()
m_isLogged = false;
if( m_disconnectReason==Kopete::Account::Unknown )
m_disconnectReason=Kopete::Account::Manual;
- if( onlinetqStatus() == Connected )
+ if( onlineStatus() == Connected )
sendCommand( "OUT", TQString(), false );
if( m_keepaliveTimer )
m_keepaliveTimer->stop();
// the socket is not connected yet, so I should force the signals
- if ( onlinetqStatus() == Disconnected || onlinetqStatus() == Connecting )
+ if ( onlineStatus() == Disconnected || onlineStatus() == Connecting )
emit socketClosed();
else
MSNSocket::disconnect();
@@ -563,7 +563,7 @@ void MSNNotifySocket::parseCommand( const TQString &cmd, uint id, const TQString
kdDebug(14140) << k_funcinfo << "Contact list up-to-date." << endl;
// set the status
- settqStatus( m_newstatus );
+ setStatus( m_newstatus );
}
else if( cmd == "BPR" )
{
@@ -641,7 +641,7 @@ void MSNNotifySocket::parseCommand( const TQString &cmd, uint id, const TQString
"<input type=\"hidden\" name=\"sl\" value=\"" + sl +"\">\n"
"<input type=\"hidden\" name=\"rru\" value=\"" + rru + "\">\n"
"<input type=\"hidden\" name=\"auth\" value=\"" + m_MSPAuth + "\">\n"
- "<input type=\"hidden\" name=\"creds\" value=\"" + TQString::tqfromLatin1( md5.hexDigest() ) + "\">\n"
+ "<input type=\"hidden\" name=\"creds\" value=\"" + TQString::fromLatin1( md5.hexDigest() ) + "\">\n"
"<input type=\"hidden\" name=\"svc\" value=\"mail\">\n"
"<input type=\"hidden\" name=\"js\" value=\"yes\">\n"
"</form></body>\n</html>\n";
@@ -909,7 +909,7 @@ void MSNNotifySocket::slotReadMessage( const TQByteArray &bytes )
m_msnAlertURLs.append(subscString);
// Don't do any MSN alerts notification for new blog updates
- if( subscString != TQString::tqfromLatin1("s.htm") && actionString != TQString::tqfromLatin1("a.htm") )
+ if( subscString != TQString::fromLatin1("s.htm") && actionString != TQString::fromLatin1("a.htm") )
{
KNotification* notification = KNotification::event("msn_alert", textString, 0L, 0L, actions);
TQObject::connect(notification, TQT_SIGNAL(activated(unsigned int)), this, TQT_SLOT(slotMSNAlertLink(unsigned int)));
@@ -1105,11 +1105,11 @@ void MSNNotifySocket::removeContact( const TQString &handle, int list, const TQS
m_tmpHandles[id]=handle;
}
-void MSNNotifySocket::settqStatus( const Kopete::OnlineStatus &status )
+void MSNNotifySocket::setStatus( const Kopete::OnlineStatus &status )
{
// kdDebug( 14140 ) << k_funcinfo << statusToString( status ) << endl;
- if( onlinetqStatus() == Disconnected )
+ if( onlineStatus() == Disconnected )
m_newstatus = status;
else
sendCommand( "CHG", statusToString( status ) + " " + m_account->myselfClientId() + " " + escape(m_account->pictureObject()) );
diff --git a/kopete/protocols/msn/msnnotifysocket.h b/kopete/protocols/msn/msnnotifysocket.h
index 805e427c..ccec2e89 100644
--- a/kopete/protocols/msn/msnnotifysocket.h
+++ b/kopete/protocols/msn/msnnotifysocket.h
@@ -50,7 +50,7 @@ public:
virtual void disconnect();
- void settqStatus( const Kopete::OnlineStatus &status );
+ void setStatus( const Kopete::OnlineStatus &status );
void addContact( const TQString &handle, int list, const TQString& publicName, const TQString& contactGuid, const TQString& groupGuid );
void removeContact( const TQString &handle, int list, const TQString &contactGuid, const TQString &groupGuid );
@@ -86,7 +86,7 @@ public slots:
signals:
void newContactList();
void contactList(const TQString& handle, const TQString& publicName, const TQString &contactGuid, uint lists, const TQString& groups);
- void contacttqStatus(const TQString&, const TQString&, const TQString& );
+ void contactStatus(const TQString&, const TQString&, const TQString& );
void contactAdded(const TQString& handle, const TQString& list, const TQString& publicName, const TQString& contactGuid, const TQString& groupGuid);
//void contactRemoved(const TQString&, const TQString&, uint);
void contactRemoved(const TQString& handle, const TQString& list, const TQString& contactGuid, const TQString& groupGuid);
@@ -99,7 +99,7 @@ signals:
void invitedToChat(const TQString&, const TQString&, const TQString&, const TQString&, const TQString& );
void startChat( const TQString&, const TQString& );
- void statusChanged( const Kopete::OnlineStatus &newtqStatus );
+ void statusChanged( const Kopete::OnlineStatus &newStatus );
void hotmailSeted(bool) ;
@@ -165,7 +165,7 @@ private:
Kopete::OnlineStatus m_newstatus;
/**
- * Convert an entry of the tqStatus enum back to a string
+ * Convert an entry of the Status enum back to a string
*/
TQString statusToString( const Kopete::OnlineStatus &status ) const;
diff --git a/kopete/protocols/msn/msnprotocol.cpp b/kopete/protocols/msn/msnprotocol.cpp
index a3ab2532..b7eaf57b 100644
--- a/kopete/protocols/msn/msnprotocol.cpp
+++ b/kopete/protocols/msn/msnprotocol.cpp
@@ -74,7 +74,7 @@ MSNProtocol::MSNProtocol( TQObject *parent, const char *name, const TQStringList
setCapabilities( Kopete::Protocol::BaseFgColor | Kopete::Protocol::BaseFont | Kopete::Protocol::BaseFormatting );
- // m_status = m_unknowntqStatus = UNK;
+ // m_status = m_unknownStatus = UNK;
}
Kopete::Contact *MSNProtocol::deserializeContact( Kopete::MetaContact *metaContact, const TQMap<TQString, TQString> &serializedData,
diff --git a/kopete/protocols/msn/msnsocket.cpp b/kopete/protocols/msn/msnsocket.cpp
index f238a507..e65fcd87 100644
--- a/kopete/protocols/msn/msnsocket.cpp
+++ b/kopete/protocols/msn/msnsocket.cpp
@@ -56,7 +56,7 @@ class MimeMessage
MSNSocket::MSNSocket(TQObject* parent) : TQObject (parent)
{
- m_onlinetqStatus = Disconnected;
+ m_onlineStatus = Disconnected;
m_socket = 0L;
m_useHttp = false;
m_timer = 0L;
@@ -64,7 +64,7 @@ MSNSocket::MSNSocket(TQObject* parent) : TQObject (parent)
MSNSocket::~MSNSocket()
{
- //if ( m_onlinetqStatus != Disconnected )
+ //if ( m_onlineStatus != Disconnected )
// disconnect();
delete m_timer;
m_timer = 0L;
@@ -75,13 +75,13 @@ MSNSocket::~MSNSocket()
void MSNSocket::connect( const TQString &server, uint port )
{
- if ( m_onlinetqStatus == Connected || m_onlinetqStatus == Connecting )
+ if ( m_onlineStatus == Connected || m_onlineStatus == Connecting )
{
kdWarning( 14140 ) << k_funcinfo << "Already connected or connecting! Not connecting again." << endl;
return;
}
- if( m_onlinetqStatus == Disconnecting )
+ if( m_onlineStatus == Disconnecting )
{
// Cleanup first.
// FIXME: More generic!!!
@@ -166,10 +166,10 @@ void MSNSocket::doneDisconnect()
void MSNSocket::setOnlineStatus( MSNSocket::OnlineStatus status )
{
- if ( m_onlinetqStatus == status )
+ if ( m_onlineStatus == status )
return;
- m_onlinetqStatus = status;
+ m_onlineStatus = status;
emit onlineStatusChanged( status );
}
@@ -823,7 +823,7 @@ void MSNSocket::slotSocketClosed()
{
kdDebug( 14140 ) << k_funcinfo << "Socket closed. " << endl;
- if ( !m_socket || m_onlinetqStatus == Disconnected )
+ if ( !m_socket || m_onlineStatus == Disconnected )
{
kdDebug( 14140 ) << k_funcinfo << "Socket already deleted or already disconnected" << endl;
return;
@@ -897,7 +897,7 @@ bool MSNSocket::setUseHttpMethod( bool useHttp )
m_gateway = "gateway.messenger.hotmail.com";
}
- if ( m_onlinetqStatus != Disconnected )
+ if ( m_onlineStatus != Disconnected )
disconnect();
m_useHttp = useHttp;
diff --git a/kopete/protocols/msn/msnsocket.h b/kopete/protocols/msn/msnsocket.h
index e4238a59..aa5a5922 100644
--- a/kopete/protocols/msn/msnsocket.h
+++ b/kopete/protocols/msn/msnsocket.h
@@ -76,11 +76,11 @@ public:
* handshake likely has to follow first.
*/
enum OnlineStatus { Connecting, Connected, Disconnecting, Disconnected };
- enum LookuptqStatus { Processing, Success, Failed };
+ enum LookupStatus { Processing, Success, Failed };
enum Transport { TcpTransport, HttpTransport };
enum ErrorType { ErrorConnectionLost, ErrorConnectionError, ErrorCannotConnect, ErrorServerError, ErrorInformation};
- OnlineStatus onlinetqStatus() { return m_onlinetqStatus; }
+ OnlineStatus onlineStatus() { return m_onlineStatus; }
/*
* return the local ip.
@@ -279,7 +279,7 @@ private:
void parseLine( const TQString &str );
KNetwork::KBufferedSocket *m_socket;
- OnlineStatus m_onlinetqStatus;
+ OnlineStatus m_onlineStatus;
TQString m_server;
uint m_port;
diff --git a/kopete/protocols/msn/msnswitchboardsocket.cpp b/kopete/protocols/msn/msnswitchboardsocket.cpp
index 319df782..b5519ed8 100644
--- a/kopete/protocols/msn/msnswitchboardsocket.cpp
+++ b/kopete/protocols/msn/msnswitchboardsocket.cpp
@@ -577,7 +577,7 @@ void MSNSwitchBoardSocket::sendTypingMsg( bool isTyping )
if( !isTyping )
return;
- if ( onlinetqStatus() != Connected || m_chatMembers.empty())
+ if ( onlineStatus() != Connected || m_chatMembers.empty())
{
//we are not yet in a chat.
//if we send that command now, we may get disconnected.
@@ -653,7 +653,7 @@ int MSNSwitchBoardSocket::sendCustomEmoticon(const TQString &name, const TQStrin
// this sends a short message to the server
int MSNSwitchBoardSocket::sendMsg( const Kopete::Message &msg )
{
- if ( onlinetqStatus() != Connected || m_chatMembers.empty())
+ if ( onlineStatus() != Connected || m_chatMembers.empty())
{
// m_messagesQueue.append(msg);
return -1;
@@ -1021,19 +1021,19 @@ Kopete::Message &MSNSwitchBoardSocket::parseCustomEmoticons(Kopete::Message &kms
* emoticons like that. So, in that case, we show like the MSN client */
#if 0
TQString em = TQRegExp::escape( es );
- message.replace( TQRegExp(TQString::tqfromLatin1( "(^|[\\W\\s]|%1)(%2)(?!\\w)" ).tqarg(em).tqarg(em)),
- TQString::tqfromLatin1("\\1<img align=\"center\" width=\"") +
+ message.replace( TQRegExp(TQString::fromLatin1( "(^|[\\W\\s]|%1)(%2)(?!\\w)" ).tqarg(em).tqarg(em)),
+ TQString::fromLatin1("\\1<img align=\"center\" width=\"") +
#endif
//match any occurence which is not in a html tag.
- message.replace( TQRegExp(TQString::tqfromLatin1("%1(?![^><]*>)").tqarg(TQRegExp::escape(es))),
- TQString::tqfromLatin1("<img align=\"center\" width=\"") +
+ message.replace( TQRegExp(TQString::fromLatin1("%1(?![^><]*>)").tqarg(TQRegExp::escape(es))),
+ TQString::fromLatin1("<img align=\"center\" width=\"") +
TQString::number(iconImage.width()) +
- TQString::tqfromLatin1("\" height=\"") +
+ TQString::fromLatin1("\" height=\"") +
TQString::number(iconImage.height()) +
- TQString::tqfromLatin1("\" src=\"") + imgPath +
- TQString::tqfromLatin1("\" title=\"") + es +
- TQString::tqfromLatin1("\" alt=\"") + es +
- TQString::tqfromLatin1( "\"/>" ) );
+ TQString::fromLatin1("\" src=\"") + imgPath +
+ TQString::fromLatin1("\" title=\"") + es +
+ TQString::fromLatin1("\" alt=\"") + es +
+ TQString::fromLatin1( "\"/>" ) );
kmsg.setBody(message, Kopete::Message::RichText);
}
}
@@ -1112,7 +1112,7 @@ void MSNSwitchBoardSocket::slotKeepAliveTimer( )
the bad side effect: some switchboard connection may be maintained for really long time!
*/
- if ( onlinetqStatus() != Connected || m_chatMembers.empty())
+ if ( onlineStatus() != Connected || m_chatMembers.empty())
{
//we are not yet in a chat.
//if we send that command now, we may get disconnected.
diff --git a/kopete/protocols/msn/ui/msnadd.ui b/kopete/protocols/msn/ui/msnadd.ui
index 283ea56f..cee5897d 100644
--- a/kopete/protocols/msn/ui/msnadd.ui
+++ b/kopete/protocols/msn/ui/msnadd.ui
@@ -84,7 +84,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>160</height>
diff --git a/kopete/protocols/msn/ui/msneditaccountui.ui b/kopete/protocols/msn/ui/msneditaccountui.ui
index 674248a1..b511de42 100644
--- a/kopete/protocols/msn/ui/msneditaccountui.ui
+++ b/kopete/protocols/msn/ui/msneditaccountui.ui
@@ -54,7 +54,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>146</height>
@@ -92,7 +92,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -449,7 +449,7 @@ Only works for emoticons in the PNG format.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>61</width>
<height>21</height>
@@ -468,7 +468,7 @@ Only works for emoticons in the PNG format.</string>
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -498,7 +498,7 @@ Only works for emoticons in the PNG format.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>40</height>
@@ -706,7 +706,7 @@ Only works for emoticons in the PNG format.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>61</width>
<height>21</height>
@@ -725,7 +725,7 @@ Only works for emoticons in the PNG format.</string>
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>1</height>
@@ -760,13 +760,13 @@ Only works for emoticons in the PNG format.</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>96</width>
<height>96</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>96</width>
<height>96</height>
@@ -789,7 +789,7 @@ Only works for emoticons in the PNG format.</string>
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>1</height>
@@ -810,7 +810,7 @@ Only works for emoticons in the PNG format.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -921,7 +921,7 @@ Only works for emoticons in the PNG format.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -966,7 +966,7 @@ Only works for emoticons in the PNG format.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>20</height>
@@ -994,7 +994,7 @@ Only works for emoticons in the PNG format.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>20</height>
@@ -1021,7 +1021,7 @@ Only works for emoticons in the PNG format.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>81</width>
<height>20</height>
@@ -1032,7 +1032,7 @@ Only works for emoticons in the PNG format.</string>
<property name="name">
<cstring>m_RLButton</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>200</width>
<height>32767</height>
@@ -1058,7 +1058,7 @@ Only works for emoticons in the PNG format.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>111</width>
<height>20</height>
@@ -1287,7 +1287,7 @@ Only check this option if the normal connection doesn't work.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>70</height>
diff --git a/kopete/protocols/msn/ui/msninfo.ui b/kopete/protocols/msn/ui/msninfo.ui
index 42a0f0b6..fde773a2 100644
--- a/kopete/protocols/msn/ui/msninfo.ui
+++ b/kopete/protocols/msn/ui/msninfo.ui
@@ -208,7 +208,7 @@ If not, the user has not added you to their list, or has removed you.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
diff --git a/kopete/protocols/msn/webcam.cpp b/kopete/protocols/msn/webcam.cpp
index e2024a94..a91d3460 100644
--- a/kopete/protocols/msn/webcam.cpp
+++ b/kopete/protocols/msn/webcam.cpp
@@ -268,7 +268,7 @@ void Webcam::processMessage(const Message& message)
{
unsigned char X=dataMessage[q+f];
char C=((char)(( X<128 && X>31 ) ? X : '.'));
- echoS+=TQString::tqfromLatin1(&C,1);
+ echoS+=TQString::fromLatin1(&C,1);
}
f+=16;
}
@@ -462,7 +462,7 @@ void Webcam::makeSIPMessage(const TQString &message, TQ_UINT8 XX, TQ_UINT8 YY ,
{
unsigned char X=dataMessage[q+f];
char C=((char)(( X<128 && X>31 ) ? X : '.'));
- echoS+=TQString::tqfromLatin1(&C,1);
+ echoS+=TQString::fromLatin1(&C,1);
}
f+=16;
}
diff --git a/kopete/protocols/msn/webcam.h b/kopete/protocols/msn/webcam.h
index 75e742d3..459f7fca 100644
--- a/kopete/protocols/msn/webcam.h
+++ b/kopete/protocols/msn/webcam.h
@@ -57,7 +57,7 @@ class Webcam : public TransferContext
KNetwork::KServerSocket *m_listener;
KNetwork::KBufferedSocket *m_webcamSocket;
- enum WebcamtqStatus { wsNegotiating , wsConnecting, wsConnected, wsTransfer } ;
+ enum WebcamStatus { wsNegotiating , wsConnecting, wsConnected, wsTransfer } ;
Who m_who;
@@ -68,7 +68,7 @@ class Webcam : public TransferContext
MSNWebcamDialog *m_widget;
TQValueList<KNetwork::KBufferedSocket* > m_allSockets;
- TQMap<KNetwork::KBufferedSocket*, WebcamtqStatus> m_webcamStates;
+ TQMap<KNetwork::KBufferedSocket*, WebcamStatus> m_webcamStates;
int m_timerId;
int m_timerFps;
diff --git a/kopete/protocols/msn/webcam/msnwebcamdialog.cpp b/kopete/protocols/msn/webcam/msnwebcamdialog.cpp
index 31e5dbfc..d5ed4865 100644
--- a/kopete/protocols/msn/webcam/msnwebcamdialog.cpp
+++ b/kopete/protocols/msn/webcam/msnwebcamdialog.cpp
@@ -48,7 +48,7 @@ MSNWebcamDialog::MSNWebcamDialog( const TQString& contact, TQWidget * parent, co
{
kdDebug(14180) << k_funcinfo << "Adding webcam image container" << endl;
//m_imageContainer.setText( i18n( "No webcam image received" ) );
- //m_imageContainer.tqsetAlignment( TQt::AlignCenter );
+ //m_imageContainer.setAlignment( TQt::AlignCenter );
m_imageContainer.setMinimumSize(320,240);
}
show();
@@ -73,7 +73,7 @@ void MSNWebcamDialog::webcamClosed( int reason )
kdDebug(14180) << k_funcinfo << "webcam closed with reason?? " << reason <<endl;
//m_imageContainer.clear();
//m_imageContainer.setText( i18n( "Webcam closed with reason %1" ).tqarg( TQString::number( reason ) ) );
- //m_imageContainer.tqsetAlignment( TQt::AlignCenter );
+ //m_imageContainer.setAlignment( TQt::AlignCenter );
//show();
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-26 12:37:22 +0000