From 47c8a359c5276062c4bc17f0e82410f29081b502 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:48:06 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1157648 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kopete/plugins/netmeeting/netmeetingguiclient.cpp | 8 ++-- kopete/plugins/netmeeting/netmeetingguiclient.h | 4 +- kopete/plugins/netmeeting/netmeetinginvitation.cpp | 44 +++++++++++----------- kopete/plugins/netmeeting/netmeetinginvitation.h | 16 ++++---- kopete/plugins/netmeeting/netmeetingplugin.cpp | 20 +++++----- kopete/plugins/netmeeting/netmeetingplugin.h | 4 +- .../plugins/netmeeting/netmeetingpreferences.cpp | 10 ++--- kopete/plugins/netmeeting/netmeetingpreferences.h | 4 +- 8 files changed, 55 insertions(+), 55 deletions(-) (limited to 'kopete/plugins/netmeeting') diff --git a/kopete/plugins/netmeeting/netmeetingguiclient.cpp b/kopete/plugins/netmeeting/netmeetingguiclient.cpp index e024a872..9dffde7f 100644 --- a/kopete/plugins/netmeeting/netmeetingguiclient.cpp +++ b/kopete/plugins/netmeeting/netmeetingguiclient.cpp @@ -17,7 +17,7 @@ ************************************************************************* */ -#include +#include #include #include @@ -33,12 +33,12 @@ class NetMeetingPlugin; NetMeetingGUIClient::NetMeetingGUIClient( MSNChatSession *parent, const char *name ) -: QObject( parent, name ) , KXMLGUIClient(parent) +: TQObject( parent, name ) , KXMLGUIClient(parent) { setInstance(KGenericFactory::instance()); m_manager=parent; - new KAction( i18n( "Invite to Use NetMeeting" ), 0, this, SLOT( slotStartInvitation() ), actionCollection() , "netmeeting" ) ; + new KAction( i18n( "Invite to Use NetMeeting" ), 0, this, TQT_SLOT( slotStartInvitation() ), actionCollection() , "netmeeting" ) ; setXMLFile("netmeetingchatui.rc"); } @@ -50,7 +50,7 @@ NetMeetingGUIClient::~NetMeetingGUIClient() void NetMeetingGUIClient::slotStartInvitation() { - QPtrList c=m_manager->members(); + TQPtrList c=m_manager->members(); NetMeetingInvitation *i=new NetMeetingInvitation(false, static_cast(c.first()),m_manager); m_manager->initInvitation(i); } diff --git a/kopete/plugins/netmeeting/netmeetingguiclient.h b/kopete/plugins/netmeeting/netmeetingguiclient.h index fa84b694..c847a5cd 100644 --- a/kopete/plugins/netmeeting/netmeetingguiclient.h +++ b/kopete/plugins/netmeeting/netmeetingguiclient.h @@ -20,7 +20,7 @@ #ifndef TRANSLATORGUICLIENT_H #define TRANSLATORGUICLIENT_H -#include +#include #include namespace Kopete { class ChatSession; } @@ -31,7 +31,7 @@ class NetMeetingPlugin; * @author Olivier Goffart */ -class NetMeetingGUIClient : public QObject , public KXMLGUIClient +class NetMeetingGUIClient : public TQObject , public KXMLGUIClient { Q_OBJECT diff --git a/kopete/plugins/netmeeting/netmeetinginvitation.cpp b/kopete/plugins/netmeeting/netmeetinginvitation.cpp index 191bc140..5fb799c1 100644 --- a/kopete/plugins/netmeeting/netmeetinginvitation.cpp +++ b/kopete/plugins/netmeeting/netmeetinginvitation.cpp @@ -29,11 +29,11 @@ #include -#include +#include #include -NetMeetingInvitation::NetMeetingInvitation(bool incoming, MSNContact *c, QObject *parent) - : QObject(parent) , MSNInvitation( incoming, NetMeetingInvitation::applicationID() , i18n("NetMeeting") ) +NetMeetingInvitation::NetMeetingInvitation(bool incoming, MSNContact *c, TQObject *parent) + : TQObject(parent) , MSNInvitation( incoming, NetMeetingInvitation::applicationID() , i18n("NetMeeting") ) { m_contact=c; oki=false; @@ -45,20 +45,20 @@ NetMeetingInvitation::~NetMeetingInvitation() } -QString NetMeetingInvitation::invitationHead() +TQString NetMeetingInvitation::invitationHead() { - QTimer::singleShot( 10*60000, this, SLOT( slotTimeout() ) ); //send TIMEOUT in 10 minute if the invitation has not been accepted/refused - return QString( MSNInvitation::invitationHead()+ + TQTimer::singleShot( 10*60000, this, TQT_SLOT( slotTimeout() ) ); //send TIMEOUT in 10 minute if the invitation has not been accepted/refused + return TQString( MSNInvitation::invitationHead()+ "Session-Protocol: SM1\r\n" "Session-ID: {6672F94C-45BF-11D7-B4AE-00010A1008DF}\r\n" //FIXME i don't know what is the session id "\r\n").utf8(); } -void NetMeetingInvitation::parseInvitation(const QString& msg) +void NetMeetingInvitation::parseInvitation(const TQString& msg) { - QRegExp rx("Invitation-Command: ([A-Z]*)"); + TQRegExp rx("Invitation-Command: ([A-Z]*)"); rx.search(msg); - QString command=rx.cap(1); + TQString command=rx.cap(1); if( msg.contains("Invitation-Command: INVITE") ) { MSNInvitation::parseInvitation(msg); //for the cookie @@ -73,12 +73,12 @@ void NetMeetingInvitation::parseInvitation(const QString& msg) { if(result==3) // Yes == 3 { - QCString message=QString( + TQCString message=TQString( "MIME-Version: 1.0\r\n" "Content-Type: text/x-msmsgsinvite; charset=UTF-8\r\n" "\r\n" "Invitation-Command: ACCEPT\r\n" - "Invitation-Cookie: " + QString::number(cookie()) + "\r\n" + "Invitation-Cookie: " + TQString::number(cookie()) + "\r\n" "Session-ID: {6672F94C-45BF-11D7-B4AE-00010A1008DF}\r\n" //FIXME "Session-Protocol: SM1\r\n" "Launch-Application: TRUE\r\n" @@ -89,7 +89,7 @@ void NetMeetingInvitation::parseInvitation(const QString& msg) manager->service()->sendCommand( "MSG" , "N", true, message ); oki=false; - QTimer::singleShot( 10* 60000, this, SLOT( slotTimeout() ) ); //TIMOUT afte 10 min + TQTimer::singleShot( 10* 60000, this, TQT_SLOT( slotTimeout() ) ); //TIMOUT afte 10 min } else //No { @@ -105,12 +105,12 @@ void NetMeetingInvitation::parseInvitation(const QString& msg) MSNChatSession* manager=dynamic_cast(m_contact->manager()); if(manager && manager->service()) { - QCString message=QString( + TQCString message=TQString( "MIME-Version: 1.0\r\n" "Content-Type: text/x-msmsgsinvite; charset=UTF-8\r\n" "\r\n" "Invitation-Command: ACCEPT\r\n" - "Invitation-Cookie: " + QString::number(cookie()) + "\r\n" + "Invitation-Cookie: " + TQString::number(cookie()) + "\r\n" "Session-ID: {6672F94C-45BF-11D7-B4AE-00010A1008DF}\r\n" //FIXME: what is session id? "Session-Protocol: SM1\r\n" "Launch-Application: TRUE\r\n" @@ -119,17 +119,17 @@ void NetMeetingInvitation::parseInvitation(const QString& msg) "\r\n" ).utf8(); manager->service()->sendCommand( "MSG" , "N", true, message ); } - rx=QRegExp("IP-Address: ([0-9\\:\\.]*)"); + rx=TQRegExp("IP-Address: ([0-9\\:\\.]*)"); rx.search(msg); - QString ip_address = rx.cap(1); + TQString ip_address = rx.cap(1); startMeeting(ip_address); kdDebug() << k_funcinfo << ip_address << endl; } else { - rx=QRegExp("IP-Address: ([0-9\\:\\.]*)"); + rx=TQRegExp("IP-Address: ([0-9\\:\\.]*)"); rx.search(msg); - QString ip_address = rx.cap(1); + TQString ip_address = rx.cap(1); startMeeting(ip_address); } @@ -156,20 +156,20 @@ void NetMeetingInvitation::slotTimeout() } -void NetMeetingInvitation::startMeeting(const QString & ip_address) +void NetMeetingInvitation::startMeeting(const TQString & ip_address) { //TODO: use KProcess KConfig *config=KGlobal::config(); config->setGroup("Netmeeting Plugin"); - QString app=config->readEntry("NetmeetingApplication","ekiga -c callto://%1").arg(ip_address); + TQString app=config->readEntry("NetmeetingApplication","ekiga -c callto://%1").arg(ip_address); kdDebug() << k_funcinfo << app << endl ; - QStringList args=QStringList::split(" ", app); + TQStringList args=TQStringList::split(" ", app); KProcess p; - for(QStringList::Iterator it=args.begin() ; it != args.end() ; ++it) + for(TQStringList::Iterator it=args.begin() ; it != args.end() ; ++it) { p << *it; } diff --git a/kopete/plugins/netmeeting/netmeetinginvitation.h b/kopete/plugins/netmeeting/netmeetinginvitation.h index 0fbaf318..eb4b2ba6 100644 --- a/kopete/plugins/netmeeting/netmeetinginvitation.h +++ b/kopete/plugins/netmeeting/netmeetinginvitation.h @@ -17,7 +17,7 @@ #ifndef MSNVOICEINVITATION_H #define MSNVOICEINVITATION_H -#include +#include #include "msninvitation.h" class MSNContact; @@ -25,19 +25,19 @@ class MSNContact; /** *@author Olivier Goffart */ -class NetMeetingInvitation : public QObject , public MSNInvitation +class NetMeetingInvitation : public TQObject , public MSNInvitation { Q_OBJECT public: - NetMeetingInvitation(bool incoming ,MSNContact*, QObject *parent = 0); + NetMeetingInvitation(bool incoming ,MSNContact*, TQObject *parent = 0); ~NetMeetingInvitation(); - static QString applicationID() { return "44BBA842-CC51-11CF-AAFA-00AA00B6015C"; } - QString invitationHead(); + static TQString applicationID() { return "44BBA842-CC51-11CF-AAFA-00AA00B6015C"; } + TQString invitationHead(); - virtual void parseInvitation(const QString& invitation); + virtual void parseInvitation(const TQString& invitation); - virtual QObject* object() { return this; } + virtual TQObject* object() { return this; } signals: void done( MSNInvitation * ); @@ -48,7 +48,7 @@ private slots: private: MSNContact *m_contact; bool oki; - void startMeeting(const QString & ip_address); + void startMeeting(const TQString & ip_address); }; diff --git a/kopete/plugins/netmeeting/netmeetingplugin.cpp b/kopete/plugins/netmeeting/netmeetingplugin.cpp index d2ea501c..2d71c257 100644 --- a/kopete/plugins/netmeeting/netmeetingplugin.cpp +++ b/kopete/plugins/netmeeting/netmeetingplugin.cpp @@ -35,19 +35,19 @@ static const KAboutData aboutdata("kopete_netmeeting", I18N_NOOP("NetMeeting") , "1.0" ); K_EXPORT_COMPONENT_FACTORY( kopete_netmeeting, KGenericFactory( &aboutdata ) ) -NetMeetingPlugin::NetMeetingPlugin( QObject *parent, const char *name, const QStringList &/*args*/ ) +NetMeetingPlugin::NetMeetingPlugin( TQObject *parent, const char *name, const TQStringList &/*args*/ ) : Kopete::Plugin( KGlobal::instance(), parent, name ) { if(MSNProtocol::protocol()) slotPluginLoaded(MSNProtocol::protocol()); else - connect(Kopete::PluginManager::self() , SIGNAL(pluginLoaded(Kopete::Plugin*) ), this, SLOT(slotPluginLoaded(Kopete::Plugin*))); + connect(Kopete::PluginManager::self() , TQT_SIGNAL(pluginLoaded(Kopete::Plugin*) ), this, TQT_SLOT(slotPluginLoaded(Kopete::Plugin*))); - connect( Kopete::ChatSessionManager::self(), SIGNAL( chatSessionCreated( Kopete::ChatSession * )) , SLOT( slotNewKMM( Kopete::ChatSession * ) ) ); + connect( Kopete::ChatSessionManager::self(), TQT_SIGNAL( chatSessionCreated( Kopete::ChatSession * )) , TQT_SLOT( slotNewKMM( Kopete::ChatSession * ) ) ); //Add GUI action to all already existing kmm (if the plugin is launched when kopete already rining) - QValueList sessions = Kopete::ChatSessionManager::self()->sessions(); - for (QValueListIterator it= sessions.begin(); it!=sessions.end() ; ++it) + TQValueList sessions = Kopete::ChatSessionManager::self()->sessions(); + for (TQValueListIterator it= sessions.begin(); it!=sessions.end() ; ++it) { slotNewKMM(*it); } @@ -62,8 +62,8 @@ void NetMeetingPlugin::slotPluginLoaded(Kopete::Plugin *p) { if(p->pluginId()=="MSNProtocol") { - connect( p , SIGNAL(invitation(MSNInvitation*& , const QString & , long unsigned int , MSNChatSession* , MSNContact* )) , - this, SLOT( slotInvitation(MSNInvitation*& , const QString & , long unsigned int , MSNChatSession* , MSNContact* ))); + connect( p , TQT_SIGNAL(invitation(MSNInvitation*& , const TQString & , long unsigned int , MSNChatSession* , MSNContact* )) , + this, TQT_SLOT( slotInvitation(MSNInvitation*& , const TQString & , long unsigned int , MSNChatSession* , MSNContact* ))); } } @@ -72,14 +72,14 @@ void NetMeetingPlugin::slotNewKMM(Kopete::ChatSession *KMM) MSNChatSession *msnMM=dynamic_cast(KMM); if(msnMM) { - connect(this , SIGNAL( destroyed(QObject*)) , + connect(this , TQT_SIGNAL( destroyed(TQObject*)) , new NetMeetingGUIClient(msnMM) - , SLOT(deleteLater())); + , TQT_SLOT(deleteLater())); } } -void NetMeetingPlugin::slotInvitation(MSNInvitation*& invitation, const QString &bodyMSG , long unsigned int /*cookie*/ , MSNChatSession* msnMM , MSNContact* c ) +void NetMeetingPlugin::slotInvitation(MSNInvitation*& invitation, const TQString &bodyMSG , long unsigned int /*cookie*/ , MSNChatSession* msnMM , MSNContact* c ) { if(!invitation && bodyMSG.contains(NetMeetingInvitation::applicationID())) { diff --git a/kopete/plugins/netmeeting/netmeetingplugin.h b/kopete/plugins/netmeeting/netmeetingplugin.h index 7427bbf8..495eb510 100644 --- a/kopete/plugins/netmeeting/netmeetingplugin.h +++ b/kopete/plugins/netmeeting/netmeetingplugin.h @@ -31,13 +31,13 @@ class NetMeetingPlugin : public Kopete::Plugin Q_OBJECT public: - NetMeetingPlugin( QObject *parent, const char *name, const QStringList &args ); + NetMeetingPlugin( TQObject *parent, const char *name, const TQStringList &args ); ~NetMeetingPlugin(); private slots: void slotNewKMM(Kopete::ChatSession *); void slotPluginLoaded(Kopete::Plugin*); - void slotInvitation(MSNInvitation*& invitation, const QString &bodyMSG , long unsigned int cookie , MSNChatSession* msnMM , MSNContact* c ); + void slotInvitation(MSNInvitation*& invitation, const TQString &bodyMSG , long unsigned int cookie , MSNChatSession* msnMM , MSNContact* c ); }; diff --git a/kopete/plugins/netmeeting/netmeetingpreferences.cpp b/kopete/plugins/netmeeting/netmeetingpreferences.cpp index b28dfe09..313eb197 100644 --- a/kopete/plugins/netmeeting/netmeetingpreferences.cpp +++ b/kopete/plugins/netmeeting/netmeetingpreferences.cpp @@ -14,8 +14,8 @@ * * ***************************************************************************/ -#include -#include +#include +#include #include #include @@ -39,13 +39,13 @@ typedef KGenericFactory NetmeetingPreferencesFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kopete_netmeeting, NetmeetingPreferencesFactory( "kcm_kopete_netmeeting" ) ) -NetmeetingPreferences::NetmeetingPreferences(QWidget *parent, const char* /*name*/, const QStringList &args) +NetmeetingPreferences::NetmeetingPreferences(TQWidget *parent, const char* /*name*/, const TQStringList &args) : KCModule(NetmeetingPreferencesFactory::instance(), parent, args) { - ( new QVBoxLayout( this ) )->setAutoAdd( true ); + ( new TQVBoxLayout( this ) )->setAutoAdd( true ); preferencesDialog = new NetmeetingPrefsUI(this); - connect(preferencesDialog->m_app , SIGNAL(textChanged(const QString &)) , this , SLOT(slotChanged())); + connect(preferencesDialog->m_app , TQT_SIGNAL(textChanged(const TQString &)) , this , TQT_SLOT(slotChanged())); load(); } diff --git a/kopete/plugins/netmeeting/netmeetingpreferences.h b/kopete/plugins/netmeeting/netmeetingpreferences.h index 94a7031e..6ad09f58 100644 --- a/kopete/plugins/netmeeting/netmeetingpreferences.h +++ b/kopete/plugins/netmeeting/netmeetingpreferences.h @@ -18,7 +18,7 @@ #define NetmeetingPREFERENCES_H #include -#include +#include class NetmeetingPrefsUI; @@ -30,7 +30,7 @@ class NetmeetingPreferences : public KCModule { Q_OBJECT public: - NetmeetingPreferences(QWidget *parent = 0, const char* name = 0, const QStringList &args = QStringList()); + NetmeetingPreferences(TQWidget *parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); ~NetmeetingPreferences(); virtual void save(); -- cgit v1.2.1