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

---
 certmanager/lib/tests/gnupgviewer.h               |  8 ++++----
 certmanager/lib/tests/test_gnupgprocessbase.cpp   | 20 ++++++++++----------
 certmanager/lib/tests/test_keyselectiondialog.cpp |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'certmanager/lib/tests')

diff --git a/certmanager/lib/tests/gnupgviewer.h b/certmanager/lib/tests/gnupgviewer.h
index f52774732..9a310d495 100644
--- a/certmanager/lib/tests/gnupgviewer.h
+++ b/certmanager/lib/tests/gnupgviewer.h
@@ -39,7 +39,7 @@
 namespace Kleo {
   class GnuPGProcessBase;
 }
-class KProcess;
+class TDEProcess;
 class TQStringList;
 
 class GnuPGViewer : public TQTextEdit {
@@ -52,10 +52,10 @@ public:
   void setProcess( Kleo::GnuPGProcessBase * process );
 
 private slots:
-  void slotStdout( KProcess *, char *, int );
-  void slotStderr( KProcess *, char *, int );
+  void slotStdout( TDEProcess *, char *, int );
+  void slotStderr( TDEProcess *, char *, int );
   void slotStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
-  void slotProcessExited( KProcess * );
+  void slotProcessExited( TDEProcess * );
 
 private:
   Kleo::GnuPGProcessBase * mProcess;
diff --git a/certmanager/lib/tests/test_gnupgprocessbase.cpp b/certmanager/lib/tests/test_gnupgprocessbase.cpp
index dd94b8d6e..33267350b 100644
--- a/certmanager/lib/tests/test_gnupgprocessbase.cpp
+++ b/certmanager/lib/tests/test_gnupgprocessbase.cpp
@@ -62,12 +62,12 @@ void GnuPGViewer::setProcess( Kleo::GnuPGProcessBase * process ) {
   if ( !process )
     return;
   mProcess = process;
-  connect( mProcess, TQT_SIGNAL(processExited(KProcess*)),
-	   TQT_SLOT(slotProcessExited(KProcess*)) );
-  connect( mProcess, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),
-	   TQT_SLOT(slotStdout(KProcess*,char*,int)) );
-  connect( mProcess, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),
-	   TQT_SLOT(slotStderr(KProcess*,char*,int)) );
+  connect( mProcess, TQT_SIGNAL(processExited(TDEProcess*)),
+	   TQT_SLOT(slotProcessExited(TDEProcess*)) );
+  connect( mProcess, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
+	   TQT_SLOT(slotStdout(TDEProcess*,char*,int)) );
+  connect( mProcess, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
+	   TQT_SLOT(slotStderr(TDEProcess*,char*,int)) );
   connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)),
 	   TQT_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
 }
@@ -91,13 +91,13 @@ static TQString escape( TQString str ) {
   return str.replace( '&', "&amp" ).replace( '<', "&lt;" ).replace( '>', "&gt;" );
 }
 
-void GnuPGViewer::slotStdout( KProcess *, char * buffer, int buflen ) {
+void GnuPGViewer::slotStdout( TDEProcess *, char * buffer, int buflen ) {
   const TQStringList l = split( buffer, buflen, mLastStdout );
   for ( TQStringList::const_iterator it = l.begin() ; it != l.end() ; ++it )
     append( "stdout: " + escape( *it ) );
 }
 
-void GnuPGViewer::slotStderr( KProcess *, char * buffer, int buflen ) {
+void GnuPGViewer::slotStderr( TDEProcess *, char * buffer, int buflen ) {
   const TQStringList l = split( buffer, buflen, mLastStderr );
   for ( TQStringList::const_iterator it = l.begin() ; it != l.end() ; ++it )
     append( "<b>stderr: " + escape( *it ) + "</b>" );
@@ -105,7 +105,7 @@ void GnuPGViewer::slotStderr( KProcess *, char * buffer, int buflen ) {
 void GnuPGViewer::slotStatus( Kleo::GnuPGProcessBase *, const TQString & type, const TQStringList & args ) {
   append( "<b><font color=\"red\">status: " + escape( type + ' ' + args.join( " " ) ) + "</font></b>" );
 }
-void GnuPGViewer::slotProcessExited( KProcess * proc ) {
+void GnuPGViewer::slotProcessExited( TDEProcess * proc ) {
   if ( !proc )
     return;
   if ( proc->normalExit() )
@@ -135,7 +135,7 @@ int main( int argc, char** argv ) {
   app.setMainWidget( gv );
   gv->show();
 
-  gpg.start( KProcess::NotifyOnExit, KProcess::AllOutput );
+  gpg.start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput );
 
   return app.exec();
 }
diff --git a/certmanager/lib/tests/test_keyselectiondialog.cpp b/certmanager/lib/tests/test_keyselectiondialog.cpp
index e74c18d84..763a1637a 100644
--- a/certmanager/lib/tests/test_keyselectiondialog.cpp
+++ b/certmanager/lib/tests/test_keyselectiondialog.cpp
@@ -48,7 +48,7 @@ int main( int argc, char ** argv ) {
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDEApplication app;
 
-  KGlobal::iconLoader()->addAppDir( "libkleopatra" );
+  TDEGlobal::iconLoader()->addAppDir( "libkleopatra" );
 
   Kleo::KeySelectionDialog dlg( "Kleo::KeySelectionDialog Test",
 				"Please select a key:",
-- 
cgit v1.2.1