From f2225fc1f936c1d9e6a5570a63ffe12c366176bf Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 31 Jan 2013 13:29:09 -0600
Subject: Rename KStandard for enhanced compatibility with KDE4

---
 certmanager/certmanager.cpp                       | 4 ++--
 certmanager/lib/backends/qgpgme/qgpgmebackend.cpp | 2 +-
 certmanager/lib/backends/qgpgme/qgpgmejob.cpp     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'certmanager')

diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp
index b665c65f3..57ea1432d 100644
--- a/certmanager/certmanager.cpp
+++ b/certmanager/certmanager.cpp
@@ -334,7 +334,7 @@ void CertManager::createActions() {
                                         TQT_TQOBJECT(this), TQT_SLOT(slotDownloadCertificate()), actionCollection(),
                                         "download_certificate" );
 
-  const TQString dirmngr = KStandardDirs::findExe( "gpgsm" );
+  const TQString dirmngr = TDEStandardDirs::findExe( "gpgsm" );
   mDirMngrFound = !dirmngr.isEmpty();
 
   action = new KAction( i18n("Dump CRL Cache..."), 0,
@@ -350,7 +350,7 @@ void CertManager::createActions() {
   action = new KAction( i18n("GnuPG Log Viewer..."), "pgp-keys", 0, TQT_TQOBJECT(this),
                         TQT_SLOT(slotStartWatchGnuPG()), actionCollection(), "tools_start_kwatchgnupg");
   // disable action if no kwatchgnupg binary is around
-  if (KStandardDirs::findExe("kwatchgnupg").isEmpty()) action->setEnabled(false);
+  if (TDEStandardDirs::findExe("kwatchgnupg").isEmpty()) action->setEnabled(false);
 
   (void)new LabelAction( i18n("Search:"), actionCollection(), "label_action" );
 
diff --git a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
index 3cd30c632..744dd1133 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
@@ -73,7 +73,7 @@ TQString Kleo::QGpgMEBackend::displayName() const {
 
 Kleo::CryptoConfig * Kleo::QGpgMEBackend::config() const {
   if ( !mCryptoConfig ) {
-    static bool hasGpgConf = !KStandardDirs::findExe( "gpgconf" ).isEmpty();
+    static bool hasGpgConf = !TDEStandardDirs::findExe( "gpgconf" ).isEmpty();
     if ( hasGpgConf )
       mCryptoConfig = new QGpgMECryptoConfig();
   }
diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp
index 61da793ed..847b92f31 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp
@@ -279,7 +279,7 @@ char * Kleo::QGpgMEJob::getPassphrase( const char * useridHint, const char * /*d
   msg = msg.arg( TQString::fromUtf8( useridHint ) ) + "<br/><br/>";
   msg.prepend( "<qt>" );
   msg += i18n( "This dialog will reappear every time the passphrase is needed. For a more secure solution that also allows caching the passphrase, use gpg-agent." ) + "<br/>";
-  const TQString gpgAgent = KStandardDirs::findExe( "gpg-agent" );
+  const TQString gpgAgent = TDEStandardDirs::findExe( "gpg-agent" );
   if ( !gpgAgent.isEmpty() ) {
     msg += i18n( "gpg-agent was found in %1, but does not appear to be running." )
            .arg( gpgAgent );
-- 
cgit v1.2.1