summaryrefslogtreecommitdiffstats
path: root/kopete/plugins
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:48:31 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:48:31 -0600
commitc48e769eb275917717e2b55eb869f7e559293ac8 (patch)
tree8f650b907e21c918b826f854dbe1c8174cc2c0c6 /kopete/plugins
parent8011d84f483f3628f3f04ea5cb2c1c3c86b2dba7 (diff)
downloadtdenetwork-c48e769eb275917717e2b55eb869f7e559293ac8.tar.gz
tdenetwork-c48e769eb275917717e2b55eb869f7e559293ac8.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kopete/plugins')
-rw-r--r--kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp4
-rw-r--r--kopete/plugins/alias/aliaspreferences.cpp6
-rw-r--r--kopete/plugins/autoreplace/autoreplaceconfig.cpp4
-rw-r--r--kopete/plugins/connectionstatus/connectionstatusplugin.cpp14
-rw-r--r--kopete/plugins/connectionstatus/connectionstatusplugin.h8
-rw-r--r--kopete/plugins/cryptography/cryptographyplugin.cpp2
-rw-r--r--kopete/plugins/cryptography/kgpgselkey.cpp4
-rw-r--r--kopete/plugins/cryptography/popuppublic.cpp10
-rw-r--r--kopete/plugins/history/converter.cpp24
-rw-r--r--kopete/plugins/latex/latexplugin.cpp6
-rw-r--r--kopete/plugins/motionautoaway/motionawayplugin.cpp2
-rw-r--r--kopete/plugins/netmeeting/netmeetinginvitation.cpp6
-rw-r--r--kopete/plugins/netmeeting/netmeetingplugin.cpp2
-rw-r--r--kopete/plugins/netmeeting/netmeetingpreferences.cpp4
-rw-r--r--kopete/plugins/smpppdcs/detectornetstat.cpp14
-rw-r--r--kopete/plugins/smpppdcs/detectornetstat.h8
-rw-r--r--kopete/plugins/smpppdcs/smpppdsearcher.cpp18
-rw-r--r--kopete/plugins/smpppdcs/smpppdsearcher.h10
-rw-r--r--kopete/plugins/statistics/statisticsdialog.cpp8
-rw-r--r--kopete/plugins/texteffect/texteffectconfig.cpp4
-rw-r--r--kopete/plugins/translator/translatorplugin.cpp2
-rw-r--r--kopete/plugins/webpresence/webpresenceplugin.cpp4
-rw-r--r--kopete/plugins/webpresence/webpresencepreferences.cpp2
23 files changed, 83 insertions, 83 deletions
diff --git a/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp b/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp
index 34d921c3..acb1b1b1 100644
--- a/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp
+++ b/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp
@@ -28,7 +28,7 @@ BookmarksPrefsSettings::~BookmarksPrefsSettings()
void BookmarksPrefsSettings::load()
{
- KConfig * configfile = KGlobal::config();
+ KConfig * configfile = TDEGlobal::config();
m_isfolderforeachcontact = Always;
m_contactslist.clear();
m_addbookmarksfromunknowns = false;
@@ -48,7 +48,7 @@ void BookmarksPrefsSettings::load()
void BookmarksPrefsSettings::save()
{
- KConfig * configfile = KGlobal::config();
+ KConfig * configfile = TDEGlobal::config();
if( configfile->getConfigState() != KConfigBase::ReadWrite ){
kdDebug( 14501 ) << "save: failed to open config file for writing" << endl;
diff --git a/kopete/plugins/alias/aliaspreferences.cpp b/kopete/plugins/alias/aliaspreferences.cpp
index 9a1a0594..60c4b0f2 100644
--- a/kopete/plugins/alias/aliaspreferences.cpp
+++ b/kopete/plugins/alias/aliaspreferences.cpp
@@ -158,7 +158,7 @@ AliasPreferences::~AliasPreferences()
// reload configuration reading it from kopeterc
void AliasPreferences::load()
{
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
if( config->hasGroup( "AliasPlugin" ) )
{
config->setGroup("AliasPlugin");
@@ -189,7 +189,7 @@ void AliasPreferences::slotPluginLoaded( Kopete::Plugin *plugin )
Kopete::Protocol *protocol = static_cast<Kopete::Protocol*>( plugin );
if( protocol )
{
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
if( config->hasGroup( "AliasPlugin" ) )
{
config->setGroup("AliasPlugin");
@@ -240,7 +240,7 @@ void AliasPreferences::slotPluginLoaded( Kopete::Plugin *plugin )
// save list to kopeterc and creates map out of it
void AliasPreferences::save()
{
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->deleteGroup( TQString::fromLatin1("AliasPlugin") );
config->setGroup( TQString::fromLatin1("AliasPlugin") );
diff --git a/kopete/plugins/autoreplace/autoreplaceconfig.cpp b/kopete/plugins/autoreplace/autoreplaceconfig.cpp
index 2537f44a..96de543f 100644
--- a/kopete/plugins/autoreplace/autoreplaceconfig.cpp
+++ b/kopete/plugins/autoreplace/autoreplaceconfig.cpp
@@ -30,7 +30,7 @@ AutoReplaceConfig::AutoReplaceConfig()
// reload configuration reading it from kopeterc
void AutoReplaceConfig::load()
{
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup( "AutoReplace Plugin" );
TQStringList wordsList = config->readListEntry( "WordsToReplace" );
@@ -113,7 +113,7 @@ AutoReplaceConfig::WordsToReplace AutoReplaceConfig::map() const
void AutoReplaceConfig::save()
{
- KConfig * config = KGlobal::config();
+ KConfig * config = TDEGlobal::config();
config->setGroup( "AutoReplace Plugin" );
TQStringList newWords;
diff --git a/kopete/plugins/connectionstatus/connectionstatusplugin.cpp b/kopete/plugins/connectionstatus/connectionstatusplugin.cpp
index d6365c0a..fbbe7c8b 100644
--- a/kopete/plugins/connectionstatus/connectionstatusplugin.cpp
+++ b/kopete/plugins/connectionstatus/connectionstatusplugin.cpp
@@ -63,16 +63,16 @@ void ConnectionStatusPlugin::slotCheckStatus()
m_buffer = TQString();
- // Use KProcess to run netstat -rn. We'll then parse the output of
+ // Use TDEProcess to run netstat -rn. We'll then parse the output of
// netstat -rn in slotProcessStdout() to see if it mentions the
// default gateway. If so, we're connected, if not, we're offline
- m_process = new KProcess;
+ m_process = new TDEProcess;
*m_process << "netstat" << "-r";
- connect( m_process, TQT_SIGNAL( receivedStdout( KProcess *, char *, int ) ), this, TQT_SLOT( slotProcessStdout( KProcess *, char *, int ) ) );
- connect( m_process, TQT_SIGNAL( processExited( KProcess * ) ), this, TQT_SLOT( slotProcessExited( KProcess * ) ) );
+ connect( m_process, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), this, TQT_SLOT( slotProcessStdout( TDEProcess *, char *, int ) ) );
+ connect( m_process, TQT_SIGNAL( processExited( TDEProcess * ) ), this, TQT_SLOT( slotProcessExited( TDEProcess * ) ) );
- if ( !m_process->start( KProcess::NotifyOnExit, KProcess::Stdout ) )
+ if ( !m_process->start( TDEProcess::NotifyOnExit, TDEProcess::Stdout ) )
{
kdWarning( 14301 ) << k_funcinfo << "Unable to start netstat process!" << endl;
@@ -81,7 +81,7 @@ void ConnectionStatusPlugin::slotCheckStatus()
}
}
-void ConnectionStatusPlugin::slotProcessExited( KProcess *process )
+void ConnectionStatusPlugin::slotProcessExited( TDEProcess *process )
{
kdDebug( 14301 ) << m_buffer << endl;
@@ -94,7 +94,7 @@ void ConnectionStatusPlugin::slotProcessExited( KProcess *process )
}
}
-void ConnectionStatusPlugin::slotProcessStdout( KProcess *, char *buffer, int buflen )
+void ConnectionStatusPlugin::slotProcessStdout( TDEProcess *, char *buffer, int buflen )
{
// Look for a default gateway
//kdDebug( 14301 ) << k_funcinfo << endl;
diff --git a/kopete/plugins/connectionstatus/connectionstatusplugin.h b/kopete/plugins/connectionstatus/connectionstatusplugin.h
index 6240e11e..9920bec2 100644
--- a/kopete/plugins/connectionstatus/connectionstatusplugin.h
+++ b/kopete/plugins/connectionstatus/connectionstatusplugin.h
@@ -21,7 +21,7 @@
#include "kopeteplugin.h"
class TQTimer;
-class KProcess;
+class TDEProcess;
/**
* @author Chris Howells <howells@kde.org>
@@ -37,18 +37,18 @@ public:
private slots:
void slotCheckStatus();
- void slotProcessStdout( KProcess *process, char *buffer, int len );
+ void slotProcessStdout( TDEProcess *process, char *buffer, int len );
/**
* Notify when the netstat process has exited
*/
- void slotProcessExited( KProcess *process );
+ void slotProcessExited( TDEProcess *process );
private:
void setConnectedStatus( bool newStatus );
bool m_pluginConnected;
- KProcess *m_process;
+ TDEProcess *m_process;
TQTimer *m_timer;
TQString m_buffer;
};
diff --git a/kopete/plugins/cryptography/cryptographyplugin.cpp b/kopete/plugins/cryptography/cryptographyplugin.cpp
index 903e73d3..f76fae2f 100644
--- a/kopete/plugins/cryptography/cryptographyplugin.cpp
+++ b/kopete/plugins/cryptography/cryptographyplugin.cpp
@@ -94,7 +94,7 @@ CryptographyPlugin::~CryptographyPlugin()
void CryptographyPlugin::loadSettings()
{
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup("Cryptography Plugin");
mPrivateKeyID = config->readEntry("PGP_private_key");
diff --git a/kopete/plugins/cryptography/kgpgselkey.cpp b/kopete/plugins/cryptography/kgpgselkey.cpp
index 88078ece..37a0d8ab 100644
--- a/kopete/plugins/cryptography/kgpgselkey.cpp
+++ b/kopete/plugins/cryptography/kgpgselkey.cpp
@@ -43,7 +43,7 @@ KgpgSelKey::KgpgSelKey(TQWidget *parent, const char *name,bool showlocal):KDialo
TQString keyname;
TQWidget *page = new TQWidget(this);
TQLabel *labeltxt;
- KIconLoader *loader = KGlobal::iconLoader();
+ KIconLoader *loader = TDEGlobal::iconLoader();
keyPair=loader->loadIcon("kgpg_key2",KIcon::Small,20);
@@ -69,7 +69,7 @@ KgpgSelKey::KgpgSelKey(TQWidget *parent, const char *name,bool showlocal):KDialo
TQString tst,tst2;
char line[130];
- // FIXME: Why use popen instead of KProcess, TQProcess or KProcIO?!?
+ // FIXME: Why use popen instead of TDEProcess, TQProcess or KProcIO?!?
// Are we interested in having buffer overflows now? - Martijn
fp = popen( "gpg --no-tty --with-colon --list-secret-keys", "r" );
while ( fgets( line, sizeof(line), fp))
diff --git a/kopete/plugins/cryptography/popuppublic.cpp b/kopete/plugins/cryptography/popuppublic.cpp
index 116abd4a..39560eeb 100644
--- a/kopete/plugins/cryptography/popuppublic.cpp
+++ b/kopete/plugins/cryptography/popuppublic.cpp
@@ -102,7 +102,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent
/* if (KGpgSettings::allowCustomEncryptionOptions())
customOptions=KGpgSettings::customEncryptionOptions();*/
- KIconLoader *loader = KGlobal::iconLoader();
+ KIconLoader *loader = TDEGlobal::iconLoader();
keyPair=loader->loadIcon("kgpg_key2",KIcon::Small,20);
keySingle=loader->loadIcon("kgpg_key1",KIcon::Small,20);
@@ -194,7 +194,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent
CBuntrusted->setChecked( KGpgSettings::allowUntrustedKeys() );
CBhideid->setChecked( KGpgSettings::hideUserID() );
if (filemode) CBshred->setChecked( KGpgSettings::shredSource() );*/
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup("Cryptography Plugin");
CBarmor->hide();
@@ -350,9 +350,9 @@ void popupPublic::refreshkeys()
KProcIO *encid=new KProcIO();
*encid << "gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--with-colon"<<"--list-keys";
///////// when process ends, update dialog infos
- TQObject::connect(encid, TQT_SIGNAL(processExited(KProcess *)),this, TQT_SLOT(slotpreselect()));
+ TQObject::connect(encid, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotpreselect()));
TQObject::connect(encid, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotprocread(KProcIO *)));
- encid->start(KProcess::NotifyOnExit,true);
+ encid->start(TDEProcess::NotifyOnExit,true);
}
void popupPublic::slotpreselect()
@@ -467,7 +467,7 @@ void popupPublic::slotprocread(KProcIO *p)
void popupPublic::slotOk()
{
//BEGIN modified for Kopete
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup("Cryptography Plugin");
config->writeEntry("UntrustedKeys", CBuntrusted->isChecked());
diff --git a/kopete/plugins/history/converter.cpp b/kopete/plugins/history/converter.cpp
index 2bf748ce..1c5c573d 100644
--- a/kopete/plugins/history/converter.cpp
+++ b/kopete/plugins/history/converter.cpp
@@ -71,32 +71,32 @@ void HistoryPlugin::convertOldHistory()
if(fi->fileName() == "MSNProtocol" || fi->fileName() == "msn_logs" )
{
protocolId="MSNProtocol";
- KGlobal::config()->setGroup("MSN");
- accountId=KGlobal::config()->readEntry( "UserID" );
+ TDEGlobal::config()->setGroup("MSN");
+ accountId=TDEGlobal::config()->readEntry( "UserID" );
}
else if(fi->fileName() == "ICTQProtocol" || fi->fileName() == "icq_logs" )
{
protocolId="ICTQProtocol";
- KGlobal::config()->setGroup("ICQ");
- accountId=KGlobal::config()->readEntry( "UIN" );
+ TDEGlobal::config()->setGroup("ICQ");
+ accountId=TDEGlobal::config()->readEntry( "UIN" );
}
else if(fi->fileName() == "AIMProtocol" || fi->fileName() == "aim_logs" )
{
protocolId="AIMProtocol";
- KGlobal::config()->setGroup("AIM");
- accountId=KGlobal::config()->readEntry( "UserID" );
+ TDEGlobal::config()->setGroup("AIM");
+ accountId=TDEGlobal::config()->readEntry( "UserID" );
}
else if(fi->fileName() == "OscarProtocol" )
{
protocolId="AIMProtocol";
- KGlobal::config()->setGroup("OSCAR");
- accountId=KGlobal::config()->readEntry( "UserID" );
+ TDEGlobal::config()->setGroup("OSCAR");
+ accountId=TDEGlobal::config()->readEntry( "UserID" );
}
else if(fi->fileName() == "JabberProtocol" || fi->fileName() == "jabber_logs")
{
protocolId="JabberProtocol";
- KGlobal::config()->setGroup("Jabber");
- accountId=KGlobal::config()->readEntry( "UserID" );
+ TDEGlobal::config()->setGroup("Jabber");
+ accountId=TDEGlobal::config()->readEntry( "UserID" );
}
//TODO: gadu, wp
}
@@ -303,8 +303,8 @@ void HistoryPlugin::convertOldHistory()
bool HistoryPlugin::detectOldHistory()
{
- KGlobal::config()->setGroup("History Plugin");
- TQString version=KGlobal::config()->readEntry( "Version" ,"0.6" );
+ TDEGlobal::config()->setGroup("History Plugin");
+ TQString version=TDEGlobal::config()->readEntry( "Version" ,"0.6" );
if(version != "0.6")
return false;
diff --git a/kopete/plugins/latex/latexplugin.cpp b/kopete/plugins/latex/latexplugin.cpp
index 11537aba..d8169311 100644
--- a/kopete/plugins/latex/latexplugin.cpp
+++ b/kopete/plugins/latex/latexplugin.cpp
@@ -180,7 +180,7 @@ void LatexPlugin::slotMessageAboutToSend( Kopete::Message& msg)
Q_UNUSED(msg)
//disabled because to work correctly, we need to find what special has the gif we can send over MSN
#if 0
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup("Latex Plugin");
if(!config->readBoolEntry("ParseOutgoing", false))
@@ -222,7 +222,7 @@ TQString LatexPlugin::handleLatex(const TQString &latexFormula)
m_tempFiles.setAutoDelete(true);
TQString fileName = tempFile->name();
- KProcess p;
+ TDEProcess p;
TQString argumentRes = "-r %1x%2";
TQString argumentOut = "-o %1";
@@ -235,7 +235,7 @@ TQString LatexPlugin::handleLatex(const TQString &latexFormula)
kdDebug() << k_funcinfo << " Rendering " << m_convScript << " " << argumentRes.arg(TQString::number(hDPI), TQString::number(vDPI)) << " " << argumentOut.arg(fileName) << endl;
// FIXME our sucky sync filter API limitations :-)
- p.start(KProcess::Block);
+ p.start(TDEProcess::Block);
return fileName;
}
diff --git a/kopete/plugins/motionautoaway/motionawayplugin.cpp b/kopete/plugins/motionautoaway/motionawayplugin.cpp
index ea37878d..56958bec 100644
--- a/kopete/plugins/motionautoaway/motionawayplugin.cpp
+++ b/kopete/plugins/motionautoaway/motionawayplugin.cpp
@@ -159,7 +159,7 @@ MotionAwayPlugin::~MotionAwayPlugin()
}
void MotionAwayPlugin::loadSettings(){
- KConfig *kconfig = KGlobal::config();
+ KConfig *kconfig = TDEGlobal::config();
kconfig->setGroup("MotionAway Plugin");
awayTimeout = kconfig->readNumEntry("AwayTimeout", 1);
diff --git a/kopete/plugins/netmeeting/netmeetinginvitation.cpp b/kopete/plugins/netmeeting/netmeetinginvitation.cpp
index 5fb799c1..8d310bc0 100644
--- a/kopete/plugins/netmeeting/netmeetinginvitation.cpp
+++ b/kopete/plugins/netmeeting/netmeetinginvitation.cpp
@@ -158,9 +158,9 @@ void NetMeetingInvitation::slotTimeout()
void NetMeetingInvitation::startMeeting(const TQString & ip_address)
{
- //TODO: use KProcess
+ //TODO: use TDEProcess
- KConfig *config=KGlobal::config();
+ KConfig *config=TDEGlobal::config();
config->setGroup("Netmeeting Plugin");
TQString app=config->readEntry("NetmeetingApplication","ekiga -c callto://%1").arg(ip_address);
@@ -168,7 +168,7 @@ void NetMeetingInvitation::startMeeting(const TQString & ip_address)
TQStringList args=TQStringList::split(" ", app);
- KProcess p;
+ TDEProcess p;
for(TQStringList::Iterator it=args.begin() ; it != args.end() ; ++it)
{
p << *it;
diff --git a/kopete/plugins/netmeeting/netmeetingplugin.cpp b/kopete/plugins/netmeeting/netmeetingplugin.cpp
index 827270f7..2f76b09a 100644
--- a/kopete/plugins/netmeeting/netmeetingplugin.cpp
+++ b/kopete/plugins/netmeeting/netmeetingplugin.cpp
@@ -36,7 +36,7 @@ static const TDEAboutData aboutdata("kopete_netmeeting", I18N_NOOP("NetMeeting")
K_EXPORT_COMPONENT_FACTORY( kopete_netmeeting, KGenericFactory<NetMeetingPlugin>( &aboutdata ) )
NetMeetingPlugin::NetMeetingPlugin( TQObject *parent, const char *name, const TQStringList &/*args*/ )
-: Kopete::Plugin( KGlobal::instance(), parent, name )
+: Kopete::Plugin( TDEGlobal::instance(), parent, name )
{
if(MSNProtocol::protocol())
slotPluginLoaded(MSNProtocol::protocol());
diff --git a/kopete/plugins/netmeeting/netmeetingpreferences.cpp b/kopete/plugins/netmeeting/netmeetingpreferences.cpp
index 313eb197..a1801fbf 100644
--- a/kopete/plugins/netmeeting/netmeetingpreferences.cpp
+++ b/kopete/plugins/netmeeting/netmeetingpreferences.cpp
@@ -56,7 +56,7 @@ NetmeetingPreferences::~NetmeetingPreferences()
void NetmeetingPreferences::load()
{
- KConfig *config=KGlobal::config();
+ KConfig *config=TDEGlobal::config();
config->setGroup("Netmeeting Plugin");
preferencesDialog->m_app->setCurrentText(config->readEntry("NetmeetingApplication","ekiga -c callto://%1"));
emit KCModule::changed(false);
@@ -64,7 +64,7 @@ void NetmeetingPreferences::load()
void NetmeetingPreferences::save()
{
- KConfig *config=KGlobal::config();
+ KConfig *config=TDEGlobal::config();
config->setGroup("Netmeeting Plugin");
config->writeEntry("NetmeetingApplication",preferencesDialog->m_app->currentText());
emit KCModule::changed(false);
diff --git a/kopete/plugins/smpppdcs/detectornetstat.cpp b/kopete/plugins/smpppdcs/detectornetstat.cpp
index f1ed21b5..6cb85d0e 100644
--- a/kopete/plugins/smpppdcs/detectornetstat.cpp
+++ b/kopete/plugins/smpppdcs/detectornetstat.cpp
@@ -39,16 +39,16 @@ void DetectorNetstat::checkStatus() const {
m_buffer = TQString();
- // Use KProcess to run netstat -r. We'll then parse the output of
+ // Use TDEProcess to run netstat -r. We'll then parse the output of
// netstat -r in slotProcessStdout() to see if it mentions the
// default gateway. If so, we're connected, if not, we're offline
- m_process = new KProcess;
+ m_process = new TDEProcess;
*m_process << "netstat" << "-r";
- connect(m_process, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), this, TQT_SLOT(slotProcessStdout( KProcess *, char *, int)));
- connect(m_process, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotProcessExited(KProcess *)));
+ connect(m_process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQT_SLOT(slotProcessStdout( TDEProcess *, char *, int)));
+ connect(m_process, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotProcessExited(TDEProcess *)));
- if(!m_process->start(KProcess::NotifyOnExit, KProcess::Stdout)) {
+ if(!m_process->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout)) {
kdWarning(14312) << k_funcinfo << "Unable to start netstat process!" << endl;
delete m_process;
@@ -56,14 +56,14 @@ void DetectorNetstat::checkStatus() const {
}
}
-void DetectorNetstat::slotProcessStdout(KProcess *, char *buffer, int buflen) {
+void DetectorNetstat::slotProcessStdout(TDEProcess *, char *buffer, int buflen) {
// Look for a default gateway
kdDebug(14312) << k_funcinfo << endl;
m_buffer += TQString::fromLatin1(buffer, buflen);
kdDebug(14312) << m_buffer << endl;
}
-void DetectorNetstat::slotProcessExited(KProcess *process) {
+void DetectorNetstat::slotProcessExited(TDEProcess *process) {
kdDebug(14312) << k_funcinfo << m_buffer << endl;
if(process == m_process) {
m_connector->setConnectedStatus(m_buffer.contains("default"));
diff --git a/kopete/plugins/smpppdcs/detectornetstat.h b/kopete/plugins/smpppdcs/detectornetstat.h
index 959cf7fc..9542c58b 100644
--- a/kopete/plugins/smpppdcs/detectornetstat.h
+++ b/kopete/plugins/smpppdcs/detectornetstat.h
@@ -21,7 +21,7 @@
#include "detector.h"
-class KProcess;
+class TDEProcess;
class IConnector;
/**
@@ -42,16 +42,16 @@ public:
private slots:
// Original cs-plugin code
- void slotProcessStdout(KProcess * process, char * buffer, int len);
+ void slotProcessStdout(TDEProcess * process, char * buffer, int len);
/**
* Notify when the netstat process has exited
*/
- void slotProcessExited(KProcess *process);
+ void slotProcessExited(TDEProcess *process);
private:
mutable TQString m_buffer;
- mutable KProcess * m_process;
+ mutable TDEProcess * m_process;
};
#endif
diff --git a/kopete/plugins/smpppdcs/smpppdsearcher.cpp b/kopete/plugins/smpppdcs/smpppdsearcher.cpp
index a06e30a9..8f4c92de 100644
--- a/kopete/plugins/smpppdcs/smpppdsearcher.cpp
+++ b/kopete/plugins/smpppdcs/smpppdsearcher.cpp
@@ -42,12 +42,12 @@ void SMPPPDSearcher::searchNetwork() {
// the first point to search is localhost
if(!scan("127.0.0.1", "255.0.0.0")) {
- m_procNetstat = new KProcess;
+ m_procNetstat = new TDEProcess;
m_procNetstat->setEnvironment("LANG", "C"); // we want to force english output
*m_procNetstat << "/bin/netstat" << "-rn";
- connect(m_procNetstat, TQT_SIGNAL(receivedStdout(KProcess *,char *,int)), this, TQT_SLOT(slotStdoutReceivedNetstat(KProcess *,char *,int)));
- if(!m_procNetstat->start(KProcess::Block, KProcess::Stdout)) {
+ connect(m_procNetstat, TQT_SIGNAL(receivedStdout(TDEProcess *,char *,int)), this, TQT_SLOT(slotStdoutReceivedNetstat(TDEProcess *,char *,int)));
+ if(!m_procNetstat->start(TDEProcess::Block, TDEProcess::Stdout)) {
kdDebug(14312) << k_funcinfo << "Couldn't execute /sbin/netstat -rn" << endl << "Perhaps the package net-tools isn't installed." << endl;
emit smpppdNotFound();
@@ -59,9 +59,9 @@ void SMPPPDSearcher::searchNetwork() {
}
/*!
- \fn SMPPPDSearcher::slotStdoutReceived(KProcess * proc, char * buf, int len)
+ \fn SMPPPDSearcher::slotStdoutReceived(TDEProcess * proc, char * buf, int len)
*/
-void SMPPPDSearcher::slotStdoutReceivedIfconfig(KProcess * /* proc */, char * buf, int len) {
+void SMPPPDSearcher::slotStdoutReceivedIfconfig(TDEProcess * /* proc */, char * buf, int len) {
kdDebug(14312) << k_funcinfo << endl;
TQString myBuf = TQString::fromLatin1(buf,len);
@@ -78,7 +78,7 @@ void SMPPPDSearcher::slotStdoutReceivedIfconfig(KProcess * /* proc */, char * bu
emit smpppdNotFound();
}
-void SMPPPDSearcher::slotStdoutReceivedNetstat(KProcess * /* proc */, char * buf, int len) {
+void SMPPPDSearcher::slotStdoutReceivedNetstat(TDEProcess * /* proc */, char * buf, int len) {
kdDebug(14312) << k_funcinfo << endl;
TQRegExp rexGW(".*\\n0.0.0.0[ ]*([0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}).*");
@@ -86,12 +86,12 @@ void SMPPPDSearcher::slotStdoutReceivedNetstat(KProcess * /* proc */, char * buf
if(!(rexGW.exactMatch(myBuf) && scan(rexGW.cap(1), "255.255.255.255"))) {
// if netstat -r found no gateway we search the network
- m_procIfconfig = new KProcess;
+ m_procIfconfig = new TDEProcess;
m_procIfconfig->setEnvironment("LANG", "C"); // we want to force english output
*m_procIfconfig << "/sbin/ifconfig";
- connect(m_procIfconfig, TQT_SIGNAL(receivedStdout(KProcess *,char *,int)), this, TQT_SLOT(slotStdoutReceivedIfconfig(KProcess *,char *,int)));
- if(!m_procIfconfig->start(KProcess::Block, KProcess::Stdout)) {
+ connect(m_procIfconfig, TQT_SIGNAL(receivedStdout(TDEProcess *,char *,int)), this, TQT_SLOT(slotStdoutReceivedIfconfig(TDEProcess *,char *,int)));
+ if(!m_procIfconfig->start(TDEProcess::Block, TDEProcess::Stdout)) {
kdDebug(14312) << k_funcinfo << "Couldn't execute /sbin/ifconfig" << endl << "Perhaps the package net-tools isn't installed." << endl;
emit smpppdNotFound();
diff --git a/kopete/plugins/smpppdcs/smpppdsearcher.h b/kopete/plugins/smpppdcs/smpppdsearcher.h
index 36c4ac9c..e6c0b8ea 100644
--- a/kopete/plugins/smpppdcs/smpppdsearcher.h
+++ b/kopete/plugins/smpppdcs/smpppdsearcher.h
@@ -20,7 +20,7 @@
#include <kresolver.h>
-class KProcess;
+class TDEProcess;
/**
* @brief Searches a network for a smpppd
@@ -86,13 +86,13 @@ signals:
void scanFinished();
protected slots:
- void slotStdoutReceivedIfconfig(KProcess * proc, char * buf, int len);
- void slotStdoutReceivedNetstat (KProcess * proc, char * buf, int len);
+ void slotStdoutReceivedIfconfig(TDEProcess * proc, char * buf, int len);
+ void slotStdoutReceivedNetstat (TDEProcess * proc, char * buf, int len);
private:
bool m_cancelSearchNow;
- KProcess * m_procIfconfig;
- KProcess * m_procNetstat;
+ TDEProcess * m_procIfconfig;
+ TDEProcess * m_procNetstat;
};
inline void SMPPPDSearcher::cancelSearch() {
diff --git a/kopete/plugins/statistics/statisticsdialog.cpp b/kopete/plugins/statistics/statisticsdialog.cpp
index 0e775405..a4bd07cf 100644
--- a/kopete/plugins/statistics/statisticsdialog.cpp
+++ b/kopete/plugins/statistics/statisticsdialog.cpp
@@ -404,8 +404,8 @@ void StatisticsDialog::generatePageFromTQStringList(TQStringList values, const T
generalHTMLPart->write(TQString("</div>"));
generalHTMLPart->write(TQString("<div class=\"statgroup\">"));
- generalHTMLPart->write(i18n("<b title=\"The last time you talked with %1\">Last talk :</b> %2<br>").arg(m_contact->metaContact()->displayName()).arg(KGlobal::locale()->formatDateTime(m_contact->lastTalk())));
- generalHTMLPart->write(i18n("<b title=\"The last time I have seen %1 online or away\">Last time contact was present :</b> %2").arg(m_contact->metaContact()->displayName()).arg(KGlobal::locale()->formatDateTime(m_contact->lastPresent())));
+ generalHTMLPart->write(i18n("<b title=\"The last time you talked with %1\">Last talk :</b> %2<br>").arg(m_contact->metaContact()->displayName()).arg(TDEGlobal::locale()->formatDateTime(m_contact->lastTalk())));
+ generalHTMLPart->write(i18n("<b title=\"The last time I have seen %1 online or away\">Last time contact was present :</b> %2").arg(m_contact->metaContact()->displayName()).arg(TDEGlobal::locale()->formatDateTime(m_contact->lastPresent())));
generalHTMLPart->write(TQString("</div>"));
//generalHTMLPart->write(TQString("<div class=\"statgroup\">"));
@@ -418,7 +418,7 @@ void StatisticsDialog::generatePageFromTQStringList(TQStringList values, const T
generalHTMLPart->write("<div title=\"" +i18n("Current status") + "\" class=\"statgroup\">");
generalHTMLPart->write(i18n("Is <b>%1</b> since <b>%2</b>").arg(
Kopete::OnlineStatus(m_contact->oldStatus()).description(),
- KGlobal::locale()->formatDateTime(m_contact->oldStatusDateTime())));
+ TDEGlobal::locale()->formatDateTime(m_contact->oldStatusDateTime())));
generalHTMLPart->write(TQString("</div>"));
}
@@ -524,7 +524,7 @@ void StatisticsDialog::slotAskButtonClicked()
if (mainWidget->questionComboBox->currentItem()==0)
{
TQString text = i18n("1 is date, 2 is contact name, 3 is online status", "%1, %2 was %3")
- .arg(KGlobal::locale()->formatDateTime(TQDateTime(mainWidget->datePicker->date(), mainWidget->timePicker->time())))
+ .arg(TDEGlobal::locale()->formatDateTime(TQDateTime(mainWidget->datePicker->date(), mainWidget->timePicker->time())))
.arg(m_contact->metaContact()->displayName())
.arg(m_contact->statusAt(TQDateTime(mainWidget->datePicker->date(), mainWidget->timePicker->time())));
mainWidget->answerEdit->setText(text);
diff --git a/kopete/plugins/texteffect/texteffectconfig.cpp b/kopete/plugins/texteffect/texteffectconfig.cpp
index 2f6da206..bf05d59a 100644
--- a/kopete/plugins/texteffect/texteffectconfig.cpp
+++ b/kopete/plugins/texteffect/texteffectconfig.cpp
@@ -30,7 +30,7 @@ TextEffectConfig::TextEffectConfig()
void TextEffectConfig::load()
{
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup("TextEffect Plugin");
mColors = config->readListEntry("Colors");
@@ -54,7 +54,7 @@ TQStringList TextEffectConfig::defaultColorList()
void TextEffectConfig::save()
{
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup("TextEffect Plugin");
config->writeEntry("Colors", mColors );
diff --git a/kopete/plugins/translator/translatorplugin.cpp b/kopete/plugins/translator/translatorplugin.cpp
index f4a9e8a0..d331f8f2 100644
--- a/kopete/plugins/translator/translatorplugin.cpp
+++ b/kopete/plugins/translator/translatorplugin.cpp
@@ -107,7 +107,7 @@ TranslatorPlugin* TranslatorPlugin::pluginStatic_ = 0L;
void TranslatorPlugin::loadSettings()
{
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
int mode = 0;
config->setGroup( "Translator Plugin" );
diff --git a/kopete/plugins/webpresence/webpresenceplugin.cpp b/kopete/plugins/webpresence/webpresenceplugin.cpp
index bb7b9d4c..59cf8315 100644
--- a/kopete/plugins/webpresence/webpresenceplugin.cpp
+++ b/kopete/plugins/webpresence/webpresenceplugin.cpp
@@ -73,7 +73,7 @@ WebPresencePlugin::~WebPresencePlugin()
void WebPresencePlugin::loadSettings()
{
- KConfig *kconfig = KGlobal::config();
+ KConfig *kconfig = TDEGlobal::config();
kconfig->setGroup( "Web Presence Plugin" );
frequency = kconfig->readNumEntry("UploadFrequency", 15);
@@ -228,7 +228,7 @@ KTempFile* WebPresencePlugin::generateFile()
// insert the current date/time
TQDomElement date = doc.createElement( "listdate" );
TQDomText t = doc.createTextNode(
- KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) );
+ TDEGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) );
date.appendChild( t );
root.appendChild( date );
diff --git a/kopete/plugins/webpresence/webpresencepreferences.cpp b/kopete/plugins/webpresence/webpresencepreferences.cpp
index e25458ee..e62e63bc 100644
--- a/kopete/plugins/webpresence/webpresencepreferences.cpp
+++ b/kopete/plugins/webpresence/webpresencepreferences.cpp
@@ -37,7 +37,7 @@ WebPresencePreferences::WebPresencePreferences(TQWidget *parent, const char* /*n
preferencesDialog->formatStylesheetURL->setFilter( "*.xsl" );
// KAutoConfig stuff
- kautoconfig = new KAutoConfig(KGlobal::config(), TQT_TQOBJECT(this), "kautoconfig");
+ kautoconfig = new KAutoConfig(TDEGlobal::config(), TQT_TQOBJECT(this), "kautoconfig");
connect(kautoconfig, TQT_SIGNAL(widgetModified()), TQT_SLOT(widgetModified()));
connect(kautoconfig, TQT_SIGNAL(settingsChanged()), TQT_SLOT(widgetModified()));
kautoconfig->addWidget(preferencesDialog, "Web Presence Plugin");