summaryrefslogtreecommitdiffstats
path: root/certmanager/lib
diff options
context:
space:
mode:
Diffstat (limited to 'certmanager/lib')
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp16
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h2
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp16
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h2
-rw-r--r--certmanager/lib/tests/gnupgviewer.h2
-rw-r--r--certmanager/lib/tests/test_gnupgprocessbase.cpp4
6 files changed, 21 insertions, 21 deletions
diff --git a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp
index 63453a4e5..a17aca9e0 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp
@@ -112,7 +112,7 @@ GpgME::Error Kleo::QGpgMERefreshKeysJob::startAProcess() {
connect( mProcess, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),
TQT_SLOT(slotStderr(KProcess*,char*,int)) );
connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)),
- TQT_SLOT(sloStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
+ TQT_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
if ( !mProcess->start( KProcess::NotifyOnExit, KProcess::Stderr ) ) {
mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ); // what else?
@@ -129,7 +129,7 @@ void Kleo::QGpgMERefreshKeysJob::slotCancel() {
mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_CANCELED );
}
-void Kleo::QGpgMERefreshKeysJob::sloStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) {
+void Kleo::QGpgMERefreshKeysJob::slotStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) {
if ( proc != mProcess )
return;
TQStringList::const_iterator it = args.begin();
@@ -139,18 +139,18 @@ void Kleo::QGpgMERefreshKeysJob::sloStatus( GnuPGProcessBase * proc, const TQStr
if ( args.size() < 2 ) {
- kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() not recognising ERROR with < 2 args!" << endl;
+ kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotStatus() not recognising ERROR with < 2 args!" << endl;
return;
}
const int source = (*++it).toInt( &ok );
if ( !ok ) {
- kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() expected number for first ERROR arg, got something else" << endl;
+ kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotStatus() expected number for first ERROR arg, got something else" << endl;
return;
}
ok = false;
const int code = (*++it).toInt( &ok );
if ( !ok ) {
- kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() expected number for second ERROR arg, got something else" << endl;
+ kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotStatus() expected number for second ERROR arg, got something else" << endl;
return;
}
mError = gpg_err_make( (gpg_err_source_t)source, (gpg_err_code_t)code );
@@ -160,20 +160,20 @@ void Kleo::QGpgMERefreshKeysJob::sloStatus( GnuPGProcessBase * proc, const TQStr
if ( args.size() < 4 ) {
- kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() not recognising PROGRESS with < 4 args!" << endl;
+ kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotStatus() not recognising PROGRESS with < 4 args!" << endl;
return;
}
const TQString what = *++it;
++it; // don't use "type"...
const int cur = (*++it).toInt( &ok );
if ( !ok ) {
- kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() expected number for \"cur\", got something else" << endl;
+ kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotStatus() expected number for \"cur\", got something else" << endl;
return;
}
ok = false;
const int total = (*++it).toInt( &ok );
if ( !ok ) {
- kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() expected number for \"total\", got something else" << endl;
+ kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotStatus() expected number for \"total\", got something else" << endl;
return;
}
emit progress( QGpgMEProgressTokenMapper::instance()->map( what, 0, cur, total ), cur, total );
diff --git a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h
index be4c9f796..555a0bfe3 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h
@@ -63,7 +63,7 @@ namespace Kleo {
/*! \reimp from Job */
void slotCancel();
- void sloStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
+ void slotStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
void slotStderr( KProcess *, char *, int );
void slotProcessExited( KProcess * );
diff --git a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
index b753899a0..f409df735 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
@@ -95,7 +95,7 @@ GpgME::Error Kleo::QGpgMESecretKeyExportJob::start( const TQStringList & pattern
connect( mProcess, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),
TQT_SLOT(slotStderr(KProcess*,char*,int)) );
connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)),
- TQT_SLOT(sloStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
+ TQT_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
if ( !mProcess->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) {
mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ); // what else?
@@ -112,7 +112,7 @@ void Kleo::QGpgMESecretKeyExportJob::slotCancel() {
mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_CANCELED );
}
-void Kleo::QGpgMESecretKeyExportJob::sloStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) {
+void Kleo::QGpgMESecretKeyExportJob::slotStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) {
if ( proc != mProcess )
return;
TQStringList::const_iterator it = args.begin();
@@ -122,18 +122,18 @@ void Kleo::QGpgMESecretKeyExportJob::sloStatus( GnuPGProcessBase * proc, const T
if ( args.size() < 2 ) {
- kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() not recognising ERROR with < 2 args!" << endl;
+ kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotStatus() not recognising ERROR with < 2 args!" << endl;
return;
}
const int source = (*++it).toInt( &ok );
if ( !ok ) {
- kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() expected number for first ERROR arg, got something else" << endl;
+ kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotStatus() expected number for first ERROR arg, got something else" << endl;
return;
}
ok = false;
const int code = (*++it).toInt( &ok );
if ( !ok ) {
- kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() expected number for second ERROR arg, got something else" << endl;
+ kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotStatus() expected number for second ERROR arg, got something else" << endl;
return;
}
mError = gpg_err_make( (gpg_err_source_t)source, (gpg_err_code_t)code );
@@ -143,20 +143,20 @@ void Kleo::QGpgMESecretKeyExportJob::sloStatus( GnuPGProcessBase * proc, const T
if ( args.size() < 4 ) {
- kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() not recognising PROGRESS with < 4 args!" << endl;
+ kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotStatus() not recognising PROGRESS with < 4 args!" << endl;
return;
}
const TQString what = *++it;
++it; // don't use "type"...
const int cur = (*++it).toInt( &ok );
if ( !ok ) {
- kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() expected number for \"cur\", got something else" << endl;
+ kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotStatus() expected number for \"cur\", got something else" << endl;
return;
}
ok = false;
const int total = (*++it).toInt( &ok );
if ( !ok ) {
- kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() expected number for \"total\", got something else" << endl;
+ kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotStatus() expected number for \"total\", got something else" << endl;
return;
}
emit progress( QGpgMEProgressTokenMapper::instance()->map( what, 0, cur, total ), cur, total );
diff --git a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h
index 0c775a015..73fae9982 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h
@@ -68,7 +68,7 @@ namespace Kleo {
/*! \reimp from Job */
void slotCancel();
- void sloStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
+ void slotStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
void slotStdout( KProcess *, char *, int );
void slotStderr( KProcess *, char *, int );
void slotProcessExited( KProcess * );
diff --git a/certmanager/lib/tests/gnupgviewer.h b/certmanager/lib/tests/gnupgviewer.h
index 8f1a65229..055a874b2 100644
--- a/certmanager/lib/tests/gnupgviewer.h
+++ b/certmanager/lib/tests/gnupgviewer.h
@@ -54,7 +54,7 @@ public:
private slots:
void slotStdout( KProcess *, char *, int );
void slotStderr( KProcess *, char *, int );
- void sloStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
+ void slotStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
void slotProcessExited( KProcess * );
private:
diff --git a/certmanager/lib/tests/test_gnupgprocessbase.cpp b/certmanager/lib/tests/test_gnupgprocessbase.cpp
index ec88fd813..c65afffc4 100644
--- a/certmanager/lib/tests/test_gnupgprocessbase.cpp
+++ b/certmanager/lib/tests/test_gnupgprocessbase.cpp
@@ -69,7 +69,7 @@ void GnuPGViewer::setProcess( Kleo::GnuPGProcessBase * process ) {
connect( mProcess, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),
TQT_SLOT(slotStderr(KProcess*,char*,int)) );
connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)),
- TQT_SLOT(sloStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
+ TQT_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
}
static TQStringList split( char * buffer, int buflen, TQString & old ) {
@@ -102,7 +102,7 @@ void GnuPGViewer::slotStderr( KProcess *, char * buffer, int buflen ) {
for ( TQStringList::const_iterator it = l.begin() ; it != l.end() ; ++it )
append( "<b>stderr: " + escape( *it ) + "</b>" );
}
-void GnuPGViewer::sloStatus( Kleo::GnuPGProcessBase *, const TQString & type, const TQStringList & args ) {
+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 ) {