summaryrefslogtreecommitdiffstats
path: root/kopete/plugins/netmeeting
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:48:06 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:48:06 +0000
commit47c8a359c5276062c4bc17f0e82410f29081b502 (patch)
tree2d54a5f60a5b74067632f9ef6df58c2bc38155e6 /kopete/plugins/netmeeting
parent6f82532777a35e0e60bbd2b290b2e93e646f349b (diff)
downloadtdenetwork-47c8a359c5276062c4bc17f0e82410f29081b502.tar.gz
tdenetwork-47c8a359c5276062c4bc17f0e82410f29081b502.zip
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1157648 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kopete/plugins/netmeeting')
-rw-r--r--kopete/plugins/netmeeting/netmeetingguiclient.cpp8
-rw-r--r--kopete/plugins/netmeeting/netmeetingguiclient.h4
-rw-r--r--kopete/plugins/netmeeting/netmeetinginvitation.cpp44
-rw-r--r--kopete/plugins/netmeeting/netmeetinginvitation.h16
-rw-r--r--kopete/plugins/netmeeting/netmeetingplugin.cpp20
-rw-r--r--kopete/plugins/netmeeting/netmeetingplugin.h4
-rw-r--r--kopete/plugins/netmeeting/netmeetingpreferences.cpp10
-rw-r--r--kopete/plugins/netmeeting/netmeetingpreferences.h4
8 files changed, 55 insertions, 55 deletions
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 <qvariant.h>
+#include <tqvariant.h>
#include <kdebug.h>
#include <kaction.h>
@@ -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<NetMeetingPlugin>::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<Kopete::Contact> c=m_manager->members();
+ TQPtrList<Kopete::Contact> c=m_manager->members();
NetMeetingInvitation *i=new NetMeetingInvitation(false, static_cast<MSNContact*>(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 <qobject.h>
+#include <tqobject.h>
#include <kxmlguiclient.h>
namespace Kopete { class ChatSession; }
@@ -31,7 +31,7 @@ class NetMeetingPlugin;
* @author Olivier Goffart <ogoffart @ kde.org>
*/
-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 <kglobal.h>
-#include <qtimer.h>
+#include <tqtimer.h>
#include <kprocess.h>
-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<MSNChatSession*>(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 <qobject.h>
+#include <tqobject.h>
#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<NetMeetingPlugin>( &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<Kopete::ChatSession*> sessions = Kopete::ChatSessionManager::self()->sessions();
- for (QValueListIterator<Kopete::ChatSession*> it= sessions.begin(); it!=sessions.end() ; ++it)
+ TQValueList<Kopete::ChatSession*> sessions = Kopete::ChatSessionManager::self()->sessions();
+ for (TQValueListIterator<Kopete::ChatSession*> 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<MSNChatSession*>(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 <qlayout.h>
-#include <qcheckbox.h>
+#include <tqlayout.h>
+#include <tqcheckbox.h>
#include <kcombobox.h>
#include <klineedit.h>
@@ -39,13 +39,13 @@
typedef KGenericFactory<NetmeetingPreferences> 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 <kcmodule.h>
-#include <qstring.h>
+#include <tqstring.h>
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();