From 28edc0aa2ab09297288186f5bc15765eb7be58c0 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 24 Jan 2013 13:47:22 -0600
Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

---
 kio/kssl/ksslcertdlg.cc     | 2 +-
 kio/kssl/ksslcertificate.cc | 6 +++---
 kio/kssl/ksslinfodlg.cc     | 4 ++--
 kio/kssl/ksslkeygen.cc      | 4 ++--
 kio/kssl/ksslsettings.cc    | 4 ++--
 kio/kssl/ksslutils.cc       | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'kio/kssl')

diff --git a/kio/kssl/ksslcertdlg.cc b/kio/kssl/ksslcertdlg.cc
index 511bd4021..3d51c1e85 100644
--- a/kio/kssl/ksslcertdlg.cc
+++ b/kio/kssl/ksslcertdlg.cc
@@ -60,7 +60,7 @@ KSSLCertDlg::KSSLCertDlg(TQWidget *parent, const char *name, bool modal)
    _certs = new TQListView(this);
    _certs->addColumn(i18n("Certificate"));
    _certs->setResizeMode(TQListView::LastColumn);
-   TQFontMetrics fm( KGlobalSettings::generalFont() );
+   TQFontMetrics fm( TDEGlobalSettings::generalFont() );
    _certs->setMinimumHeight(4*fm.height());
    grid->addWidget(_certs);
 
diff --git a/kio/kssl/ksslcertificate.cc b/kio/kssl/ksslcertificate.cc
index 285bb1d2d..8e2192f7d 100644
--- a/kio/kssl/ksslcertificate.cc
+++ b/kio/kssl/ksslcertificate.cc
@@ -93,7 +93,7 @@ public:
 KSSLCertificate::KSSLCertificate() {
 	d = new KSSLCertificatePrivate;
 	d->m_stateCached = false;
-	KGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl");
+	TDEGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl");
 	#ifdef KSSL_HAVE_SSL
 		d->m_cert = NULL;
 	#endif
@@ -103,7 +103,7 @@ KSSLCertificate::KSSLCertificate() {
 KSSLCertificate::KSSLCertificate(const KSSLCertificate& x) {
 	d = new KSSLCertificatePrivate;
 	d->m_stateCached = false;
-	KGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl");
+	TDEGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl");
 	#ifdef KSSL_HAVE_SSL
 		d->m_cert = NULL;
 		setCert(KOSSL::self()->X509_dup(const_cast<KSSLCertificate&>(x).getCert()));
@@ -637,7 +637,7 @@ KSSLCertificate::KSSLValidationList KSSLCertificate::validateVerbose(KSSLCertifi
 		return errors;
 	}
 
-	TQStringList qsl = KGlobal::dirs()->resourceDirs("kssl");
+	TQStringList qsl = TDEGlobal::dirs()->resourceDirs("kssl");
 
 	if (qsl.isEmpty()) {
 		errors << KSSLCertificate::NoCARoot;
diff --git a/kio/kssl/ksslinfodlg.cc b/kio/kssl/ksslinfodlg.cc
index bc67d3e6e..c6f76a190 100644
--- a/kio/kssl/ksslinfodlg.cc
+++ b/kio/kssl/ksslinfodlg.cc
@@ -127,9 +127,9 @@ KSSLInfoDlg::~KSSLInfoDlg() {
 }
 
 void KSSLInfoDlg::launchConfig() {
-    KProcess p;
+    TDEProcess p;
     p << "kcmshell" << "crypto";
-    p.start(KProcess::DontCare);
+    p.start(TDEProcess::DontCare);
 }
 
 
diff --git a/kio/kssl/ksslkeygen.cc b/kio/kssl/ksslkeygen.cc
index 5e7eb3a77..a34773989 100644
--- a/kio/kssl/ksslkeygen.cc
+++ b/kio/kssl/ksslkeygen.cc
@@ -166,9 +166,9 @@ int KSSLKeyGen::generateCSR(const TQString& name, const TQString& pass, int bits
 	// back from there.  Yes it's inefficient, but it doesn't happen
 	// often and this way things are uniform.
   
-	KGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl");
+	TDEGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl");
 
-	TQString path = KGlobal::dirs()->saveLocation("kssl");
+	TQString path = TDEGlobal::dirs()->saveLocation("kssl");
 	KTempFile csrFile(path + "csr_", ".der");
 
 	if (!csrFile.fstream()) {
diff --git a/kio/kssl/ksslsettings.cc b/kio/kssl/ksslsettings.cc
index 5a77b12bf..26f6114a1 100644
--- a/kio/kssl/ksslsettings.cc
+++ b/kio/kssl/ksslsettings.cc
@@ -98,7 +98,7 @@ KSSLSettings::KSSLSettings(bool readConfig) {
   d = new KSSLSettingsPrivate;
   m_cfg = new KConfig("cryptodefaults", false, false);
 
-  if (!KGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl")) {
+  if (!TDEGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl")) {
     //kdDebug(7029) << "Error adding (kssl, share/apps/kssl)" << endl;
   }
 
@@ -316,7 +316,7 @@ void KSSLSettings::save() {
   m_cfg->sync();
  
   // insure proper permissions -- contains sensitive data
-  TQString cfgName(KGlobal::dirs()->findResource("config", "cryptodefaults"));
+  TQString cfgName(TDEGlobal::dirs()->findResource("config", "cryptodefaults"));
   if (!cfgName.isEmpty())
     ::chmod(TQFile::encodeName(cfgName), 0600);
 #endif
diff --git a/kio/kssl/ksslutils.cc b/kio/kssl/ksslutils.cc
index cf024347c..80651757f 100644
--- a/kio/kssl/ksslutils.cc
+++ b/kio/kssl/ksslutils.cc
@@ -73,7 +73,7 @@ TQString ASN1_UTCTIME_QString(ASN1_UTCTIME *tm) {
   int gmt;
   TQDateTime qdt = ASN1_UTCTIME_QDateTime(tm, &gmt);
 
-  qstr = KGlobal::locale()->formatDateTime(qdt, false, true);
+  qstr = TDEGlobal::locale()->formatDateTime(qdt, false, true);
   if (gmt) { 
     qstr += " ";
     qstr += i18n("GMT");
-- 
cgit v1.2.1