Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

3 files changed, 8 insertions, 8 deletions

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());