diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-12-16 13:36:22 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-12-16 13:36:22 +0900 |
commit | 834febe1fd138859a6384428c108d4d163e0fd2f (patch) | |
tree | 5c223938fe05d2064ab7bd8816735c506febacfc /kgpg | |
parent | 3e7afb77fa6046426eeb62d412b27a5cdae44140 (diff) | |
download | tdeutils-834febe1fd138859a6384428c108d4d163e0fd2f.tar.gz tdeutils-834febe1fd138859a6384428c108d4d163e0fd2f.zip |
Use TDEProcIO class
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'kgpg')
-rw-r--r-- | kgpg/keyinfowidget.cpp | 10 | ||||
-rw-r--r-- | kgpg/keyinfowidget.h | 4 | ||||
-rw-r--r-- | kgpg/keyservers.cpp | 28 | ||||
-rw-r--r-- | kgpg/keyservers.h | 14 | ||||
-rw-r--r-- | kgpg/kgpg.cpp | 4 | ||||
-rw-r--r-- | kgpg/kgpginterface.cpp | 122 | ||||
-rw-r--r-- | kgpg/kgpginterface.h | 40 | ||||
-rw-r--r-- | kgpg/kgpgoptions.cpp | 4 | ||||
-rw-r--r-- | kgpg/listkeys.cpp | 24 | ||||
-rw-r--r-- | kgpg/listkeys.h | 6 | ||||
-rw-r--r-- | kgpg/popuppublic.cpp | 8 | ||||
-rw-r--r-- | kgpg/popuppublic.h | 4 |
12 files changed, 134 insertions, 134 deletions
diff --git a/kgpg/keyinfowidget.cpp b/kgpg/keyinfowidget.cpp index 891c5fd..291bb8c 100644 --- a/kgpg/keyinfowidget.cpp +++ b/kgpg/keyinfowidget.cpp @@ -23,7 +23,7 @@ #include <tdeprocess.h> #include <tqdatetime.h> #include <tqfile.h> -#include <kprocio.h> +#include <tdeprocio.h> #include <kpassivepopup.h> #include <tdeaction.h> #include <tqregexp.h> @@ -344,10 +344,10 @@ void KgpgKeyInfo::reloadMainPhoto(const TQString &uid) kgpginfotmp=new KTempFile(); kgpginfotmp->setAutoDelete(true); TQString pgpgOutput="cp %i "+kgpginfotmp->name(); - KProcIO *p=new KProcIO(); + TDEProcIO *p=new TDEProcIO(); *p<<"gpg"<<"--no-tty"<<"--show-photos"<<"--photo-viewer"<<TQString(TQFile::encodeName(pgpgOutput)); *p<<"--edit-key"<<displayedKeyID<<"uid"<<uid<<"showphoto"; - TQObject::connect(p, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(finishphotoreadprocess(KProcIO *))); + TQObject::connect(p, TQ_SIGNAL(readReady(TDEProcIO *)),this, TQ_SLOT(finishphotoreadprocess(TDEProcIO *))); TQObject::connect(p, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotMainImageRead(TDEProcess *))); p->start(TDEProcess::NotifyOnExit,true); @@ -381,7 +381,7 @@ void KgpgKeyInfo::slotSetPhoto(const TQPixmap &pix) -void KgpgKeyInfo::finishphotoreadprocess(KProcIO *p) +void KgpgKeyInfo::finishphotoreadprocess(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; TQString required=TQString(); @@ -400,7 +400,7 @@ void KgpgKeyInfo::openPhoto() TDETrader::OfferList offers = TDETrader::self()->query("image/jpeg", "Type == 'Application'"); KService::Ptr ptr = offers.first(); //KMessageBox::sorry(0,ptr->desktopEntryName()); - KProcIO *p=new KProcIO(); + TDEProcIO *p=new TDEProcIO(); *p<<"gpg"<<"--show-photos"<<"--photo-viewer"<<TQString(TQFile::encodeName(ptr->desktopEntryName()+" %i"))<<"--list-keys"<<displayedKeyID; p->start(TDEProcess::DontCare,true); } diff --git a/kgpg/keyinfowidget.h b/kgpg/keyinfowidget.h index c61a5d5..6ebc352 100644 --- a/kgpg/keyinfowidget.h +++ b/kgpg/keyinfowidget.h @@ -28,7 +28,7 @@ class TQCheckBox; class KDatePicker; class KeyProperties; class TDEProcess; -class KProcIO; +class TDEProcIO; class KgpgKeyInfo : public KDialogBase { @@ -51,7 +51,7 @@ private slots: void slotCheckDate(TQDate date); void openPhoto(); void slotSetPhoto(const TQPixmap &pix); - void finishphotoreadprocess(KProcIO *p); + void finishphotoreadprocess(TDEProcIO *p); void slotMainImageRead(TDEProcess *); void slotSetMainPhoto(TQStringList list); void reloadMainPhoto(const TQString &uid); diff --git a/kgpg/keyservers.cpp b/kgpg/keyservers.cpp index 741aef4..514f3f3 100644 --- a/kgpg/keyservers.cpp +++ b/kgpg/keyservers.cpp @@ -41,7 +41,7 @@ #include <tdelocale.h> #include <tdeprocess.h> -#include <kprocio.h> +#include <tdeprocio.h> #include <tdelistview.h> #include <kstatusbar.h> #include <tdeconfig.h> @@ -91,10 +91,10 @@ keyServer::keyServer(TQWidget *parent, const char *name,bool modal,bool autoClos } } - KProcIO *encid=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *encid=new TDEProcIO(TQTextCodec::codecForLocale()); *encid << "gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--with-colon"<<"--list-keys"; TQObject::connect(encid, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotprocresult(TDEProcess *))); - TQObject::connect(encid, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(slotprocread(KProcIO *))); + TQObject::connect(encid, TQ_SIGNAL(readReady(TDEProcIO *)),this, TQ_SLOT(slotprocread(TDEProcIO *))); encid->start(TDEProcess::NotifyOnExit,true); page->Buttonimport->setEnabled( !page->kLEimportid->text().isEmpty()); page->Buttonsearch->setEnabled( !page->kLEimportid->text().isEmpty()); @@ -123,7 +123,7 @@ void keyServer::slotEnableProxyE(bool on) page->kLEproxyE->setEnabled(on); } -void keyServer::slotprocread(KProcIO *p) +void keyServer::slotprocread(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; ///////////////////////////////////////////////////////////////// extract encryption keys @@ -244,7 +244,7 @@ void keyServer::slotSearch() connect(dialogServer,TQ_SIGNAL(closeClicked()),this,TQ_SLOT(handleQuit())); connect( listpop , TQ_SIGNAL( destroyed() ) , this, TQ_SLOT( abortSearch())); - searchproc=new KProcIO(TQTextCodec::codecForLocale()); + searchproc=new TDEProcIO(TQTextCodec::codecForLocale()); TQString keyserv=page->kCBimportks->currentText(); *searchproc<<"gpg"<<"--utf8-strings"/*<<"--no-tty"*/; @@ -263,7 +263,7 @@ void keyServer::slotSearch() keyNumbers=0; TQApplication::setOverrideCursor(TQCursor(TQt::BusyCursor)); TQObject::connect(searchproc, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotsearchresult(TDEProcess *))); - TQObject::connect(searchproc, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(slotsearchread(KProcIO *))); + TQObject::connect(searchproc, TQ_SIGNAL(readReady(TDEProcIO *)),this, TQ_SLOT(slotsearchread(TDEProcIO *))); searchproc->setUsePty(TDEProcess::Stdout,false); // EKO: very important line - it took me a day to find out why I should use it searchproc->start(TDEProcess::NotifyOnExit,true); @@ -327,7 +327,7 @@ void keyServer::transferKeyID() listpop->kLEID->setText(keysToSearch.stripWhiteSpace()); } -void keyServer::slotsearchread(KProcIO *p) +void keyServer::slotsearchread(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; TQString required = TQString(); @@ -514,7 +514,7 @@ void keyServer::slotExport(TQStringList keyIds) return; readmessage=TQString(); hashMap.clear(); - exportproc=new KProcIO(TQTextCodec::codecForLocale()); + exportproc=new TDEProcIO(TQTextCodec::codecForLocale()); TQString keyserv=page->kCBexportks->currentText(); *exportproc<<"gpg"<<"--utf8-strings"; @@ -533,7 +533,7 @@ void keyServer::slotExport(TQStringList keyIds) *exportproc << "--status-fd=2" << "--keyserver" << keyserv << "--send-keys" << keyIds; TQObject::connect(exportproc, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotexportresult(TDEProcess *))); - TQObject::connect(exportproc, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(slotimportread(KProcIO *))); + TQObject::connect(exportproc, TQ_SIGNAL(readReady(TDEProcIO *)),this, TQ_SLOT(slotimportread(TDEProcIO *))); exportproc->start(TDEProcess::NotifyOnExit,true); TQApplication::setOverrideCursor(TQCursor(TQt::BusyCursor)); importpop = new TQDialog( this,0,true,TQt::WDestructiveClose); @@ -611,7 +611,7 @@ void keyServer::slotImport() keyNames=keyNames.simplifyWhiteSpace(); if ( keyNames.startsWith("0x") ) { - searchproc=new KProcIO(TQTextCodec::codecForLocale()); + searchproc=new TDEProcIO(TQTextCodec::codecForLocale()); *searchproc << "gpg"<<"--utf8-strings"<<"--no-secmem-warning"; if (KgpgInterface::getGpgVersion() < 210 ) { // was removed in 2.1 if (page->cBproxyI->isChecked()) { @@ -632,7 +632,7 @@ void keyServer::slotImport() *searchproc<< TQString(TQFile::encodeName(fkeyNames)); } TQObject::connect(searchproc, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotksearchprocresult(TDEProcess *))); - TQObject::connect(searchproc, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(slotsearchread(KProcIO *))); + TQObject::connect(searchproc, TQ_SIGNAL(readReady(TDEProcIO *)),this, TQ_SLOT(slotsearchread(TDEProcIO *))); TQApplication::setOverrideCursor(TQCursor(TQt::BusyCursor)); searchproc->setUsePty(TDEProcess::Stdout,false); // EKO: very important line - it took me a day to find out why I should use it searchproc->start(TDEProcess::Block,true); @@ -646,7 +646,7 @@ void keyServer::slotImport() keysToImport = TQStringList::split(" ",keyNames,true); } - importproc=new KProcIO(TQTextCodec::codecForLocale()); + importproc=new TDEProcIO(TQTextCodec::codecForLocale()); *importproc<<"gpg"<<"--utf8-strings"; if (KgpgInterface::getGpgVersion() < 210 ) { // was removed in 2.1 if (page->cBproxyI->isChecked()) { @@ -664,7 +664,7 @@ void keyServer::slotImport() } TQObject::connect(importproc, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotimportresult(TDEProcess *))); - TQObject::connect(importproc, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(slotimportread(KProcIO *))); + TQObject::connect(importproc, TQ_SIGNAL(readReady(TDEProcIO *)),this, TQ_SLOT(slotimportread(TDEProcIO *))); importproc->start(TDEProcess::NotifyOnExit,true); importproc->closeWhenDone(); @@ -831,7 +831,7 @@ void keyServer::slotimportresult(TDEProcess*) if (autoCloseWindow) close(); } -void keyServer::slotimportread(KProcIO *p) +void keyServer::slotimportread(TDEProcIO *p) { TQString required; while (p->readln(required,true)!=-1) diff --git a/kgpg/keyservers.h b/kgpg/keyservers.h index 11db80b..ee43fc5 100644 --- a/kgpg/keyservers.h +++ b/kgpg/keyservers.h @@ -23,7 +23,7 @@ class TDEListViewItem; class KSimpleConfig; -class KProcIO; +class TDEProcIO; class TDEProcess; class searchRes; @@ -42,15 +42,15 @@ public slots: void abortExport(); void abortSearch(); void transferKeyID(); - void slotsearchread(KProcIO *p); + void slotsearchread(TDEProcIO *p); void slotOk(); void syncCombobox(); void slotImport(); void slotSearch(); void slotimportresult(TDEProcess*); void slotexportresult(TDEProcess*); - void slotimportread(KProcIO *p); - void slotprocread(KProcIO *p); + void slotimportread(TDEProcIO *p); + void slotprocread(TDEProcIO *p); void slotprocresult(TDEProcess *); void slotPreExport(); void slotExport(TQStringList keyIds); @@ -60,7 +60,7 @@ public slots: void slotEnableProxyE(bool on); void handleQuit(); void slotTextChanged( const TQString &text); -// void slotksearchprocread(KProcIO *p); +// void slotksearchprocread(TDEProcIO *p); void slotksearchprocresult(TDEProcess *); private: @@ -71,8 +71,8 @@ private: TQString readmessage, currentKey;; TQStringList keysToImport, invalidKeys; TQMap<TQString,TQStringList> hashMap; - KProcIO *importproc,*exportproc; - KProcIO *searchproc; + TDEProcIO *importproc,*exportproc; + TDEProcIO *searchproc; searchRes *listpop; int count; bool cycle,autoCloseWindow; diff --git a/kgpg/kgpg.cpp b/kgpg/kgpg.cpp index d467905..5273fcf 100644 --- a/kgpg/kgpg.cpp +++ b/kgpg/kgpg.cpp @@ -52,7 +52,7 @@ #include <tdetempfile.h> #include <twin.h> #include <tdeprocess.h> -#include <kprocio.h> +#include <tdeprocio.h> #include <tdeaboutapplication.h> #include <kurlrequester.h> #include <ktip.h> @@ -594,7 +594,7 @@ void MyView::readOptions() void MyView::firstRun() { - KProcIO *p=new KProcIO(); + TDEProcIO *p=new TDEProcIO(); *p<<"gpg"<<"--no-tty"<<"--list-secret-keys"; p->start(TDEProcess::Block); //// start gnupg so that it will create a config file startWizard(); diff --git a/kgpg/kgpginterface.cpp b/kgpg/kgpginterface.cpp index 1c24cff..e397966 100644 --- a/kgpg/kgpginterface.cpp +++ b/kgpg/kgpginterface.cpp @@ -42,7 +42,7 @@ #include <tdeaction.h> #include <tqtextcodec.h> #include <tdeprocess.h> -#include <kprocio.h> +#include <tdeprocio.h> #include <tdeconfig.h> #include <tqfile.h> #include <kled.h> @@ -101,7 +101,7 @@ void KgpgInterface::KgpgEncryptFile(TQStringList encryptKeys,KURL srcUrl,KURL de sourceFile=srcUrl; message=TQString(); - KProcIO *proc=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *proc=new TDEProcIO(TQTextCodec::codecForLocale()); *proc<<"gpg"<<"--no-tty"<<"--no-secmem-warning"<<"--status-fd=2"<<"--command-fd=0"<<"--utf8-strings"; for ( TQStringList::Iterator it = Options.begin(); it != Options.end(); ++it ) if (!TQFile::encodeName(*it).isEmpty()) *proc<< TQString(TQFile::encodeName(*it)); @@ -119,7 +119,7 @@ void KgpgInterface::KgpgEncryptFile(TQStringList encryptKeys,KURL srcUrl,KURL de ///////// when process ends, update dialog infos TQObject::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),this,TQ_SLOT(encryptfin(TDEProcess *))); - TQObject::connect(proc,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(readencprocess(KProcIO *))); + TQObject::connect(proc,TQ_SIGNAL(readReady(TDEProcIO *)),this,TQ_SLOT(readencprocess(TDEProcIO *))); proc->start(TDEProcess::NotifyOnExit,true); } @@ -138,7 +138,7 @@ void KgpgInterface::encryptfin(TDEProcess *) } } -void KgpgInterface::readencprocess(KProcIO *p) +void KgpgInterface::readencprocess(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; TQString required; @@ -178,7 +178,7 @@ void KgpgInterface::KgpgDecryptFile(KURL srcUrl,KURL destUrl,TQStringList Option userIDs=TQString(); anonymous=false; - KProcIO *proc=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *proc=new TDEProcIO(TQTextCodec::codecForLocale()); *proc<<"gpg"<<"--no-tty"<<"--no-secmem-warning"<<"--status-fd=2"<<"--command-fd=0"<<"--utf8-strings"; @@ -191,7 +191,7 @@ void KgpgInterface::KgpgDecryptFile(KURL srcUrl,KURL destUrl,TQStringList Option *proc<<"-d"<<TQString(TQFile::encodeName(srcUrl.path())); TQObject::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),this,TQ_SLOT(decryptfin(TDEProcess *))); - TQObject::connect(proc,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(readdecprocess(KProcIO *))); + TQObject::connect(proc,TQ_SIGNAL(readReady(TDEProcIO *)),this,TQ_SLOT(readdecprocess(TDEProcIO *))); proc->start(TDEProcess::NotifyOnExit,true); } @@ -205,7 +205,7 @@ void KgpgInterface::decryptfin(TDEProcess *) } -void KgpgInterface::readdecprocess(KProcIO *p) +void KgpgInterface::readdecprocess(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; TQString required; @@ -266,7 +266,7 @@ void KgpgInterface::KgpgEncryptText(TQString text,TQStringList userIDs, TQString if (codec->canEncode(text)) txtToEncrypt=text; else txtToEncrypt=text.utf8(); - KProcIO *proc=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *proc=new TDEProcIO(TQTextCodec::codecForLocale()); *proc<<"gpg"<<"--no-tty"<<"--no-secmem-warning"<<"--command-fd=0"<<"--status-fd=1"<<"--utf8-strings"; for ( TQStringList::Iterator it = Options.begin(); it != Options.end(); ++it ) @@ -284,7 +284,7 @@ void KgpgInterface::KgpgEncryptText(TQString text,TQStringList userIDs, TQString ///////// when process ends, update dialog infos TQObject::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),this,TQ_SLOT(txtencryptfin(TDEProcess *))); - TQObject::connect(proc,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(txtreadencprocess(KProcIO *))); + TQObject::connect(proc,TQ_SIGNAL(readReady(TDEProcIO *)),this,TQ_SLOT(txtreadencprocess(TDEProcIO *))); proc->start(TDEProcess::NotifyOnExit,false); emit txtencryptionstarted(); } @@ -299,7 +299,7 @@ void KgpgInterface::txtencryptfin(TDEProcess *) emit txtencryptionfinished(TQString()); } -void KgpgInterface::txtreadencprocess(KProcIO *p) +void KgpgInterface::txtreadencprocess(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; TQString required; @@ -462,7 +462,7 @@ void KgpgInterface::KgpgSignText(TQString text,TQString userIDs, TQStringList Op if (codec->canEncode(text)) txtprocess=text; else txtprocess=text.utf8(); - KProcIO *proc=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *proc=new TDEProcIO(TQTextCodec::codecForLocale()); *proc<<"gpg"<<"--no-tty"<<"--no-secmem-warning"<<"--command-fd=0"<<"--status-fd=1"<<"--utf8-strings"; for ( TQStringList::Iterator it = Options.begin(); it != Options.end(); ++it ) @@ -472,7 +472,7 @@ void KgpgInterface::KgpgSignText(TQString text,TQString userIDs, TQStringList Op ///////// when process ends, update dialog infos TQObject::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),this,TQ_SLOT(txtsignfin(TDEProcess *))); - TQObject::connect(proc,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(txtsignprocess(KProcIO *))); + TQObject::connect(proc,TQ_SIGNAL(readReady(TDEProcIO *)),this,TQ_SLOT(txtsignprocess(TDEProcIO *))); //emit txtsigningstarted(); @@ -498,7 +498,7 @@ void KgpgInterface::txtsignfin(TDEProcess *) emit txtSignOver(TQString()); } -void KgpgInterface::txtsignprocess(KProcIO *p) +void KgpgInterface::txtsignprocess(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; TQString required; @@ -590,10 +590,10 @@ void KgpgInterface::KgpgVerifyText(TQString text) signmiss=false; signID=TQString(); message=TQString(); - KProcIO *verifyproc=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *verifyproc=new TDEProcIO(TQTextCodec::codecForLocale()); *verifyproc<<"gpg"<<"--no-secmem-warning"<<"--status-fd=2"<<"--command-fd=0"<<"--utf8-strings"<<"--verify"; connect(verifyproc, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotverifyresult(TDEProcess *))); - connect(verifyproc, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(slotverifyread(KProcIO *))); + connect(verifyproc, TQ_SIGNAL(readReady(TDEProcIO *)),this, TQ_SLOT(slotverifyread(TDEProcIO *))); verifyproc->start(TDEProcess::NotifyOnExit,true); verifyproc->writeStdin (text); verifyproc->closeWhenDone(); @@ -611,7 +611,7 @@ if (signmiss) emit missingSignature(signID); //kdDebug(2100) << "GPG VERIFY OVER________"<<endl; } -void KgpgInterface::slotverifyread(KProcIO *p) +void KgpgInterface::slotverifyread(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; TQString required; @@ -734,7 +734,7 @@ void KgpgInterface::KgpgSignFile(TQString keyID,KURL srcUrl,TQStringList Options message=TQString(); step=3; ///////////// create gpg command - KProcIO *proc=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *proc=new TDEProcIO(TQTextCodec::codecForLocale()); keyID=keyID.stripWhiteSpace(); *proc<<"gpg"<<"--no-tty"<<"--no-secmem-warning"<<"--utf8-strings"<<"--status-fd=2"<<"--command-fd=0"<<"-u"<<keyID.local8Bit(); for ( TQStringList::Iterator it = Options.begin(); it != Options.end(); ++it ) @@ -744,7 +744,7 @@ void KgpgInterface::KgpgSignFile(TQString keyID,KURL srcUrl,TQStringList Options *proc<<"--detach-sig"<<TQString(TQFile::encodeName(srcUrl.path())); TQObject::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),this,TQ_SLOT(signfin(TDEProcess *))); - TQObject::connect(proc,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(readsignprocess(KProcIO *))); + TQObject::connect(proc,TQ_SIGNAL(readReady(TDEProcIO *)),this,TQ_SLOT(readsignprocess(TDEProcIO *))); proc->start(TDEProcess::NotifyOnExit,true); } @@ -763,7 +763,7 @@ void KgpgInterface::signfin(TDEProcess *) } -void KgpgInterface::readsignprocess(KProcIO *p) +void KgpgInterface::readsignprocess(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; TQString required; @@ -812,7 +812,7 @@ void KgpgInterface::KgpgVerifyFile(KURL sigUrl,KURL srcUrl) signID=TQString(); signmiss=false; ///////////// create gpg command - KProcIO *proc=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *proc=new TDEProcIO(TQTextCodec::codecForLocale()); file=sigUrl; *proc<<"gpg"<<"--no-tty"<<"--utf8-strings"<<"--no-secmem-warning"<<"--status-fd=2"<<"--verify"; if (!srcUrl.isEmpty()) @@ -820,12 +820,12 @@ void KgpgInterface::KgpgVerifyFile(KURL sigUrl,KURL srcUrl) *proc<<TQString(TQFile::encodeName(sigUrl.path())); TQObject::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),this,TQ_SLOT(verifyfin(TDEProcess *))); - TQObject::connect(proc,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(readprocess(KProcIO *))); + TQObject::connect(proc,TQ_SIGNAL(readReady(TDEProcIO *)),this,TQ_SLOT(readprocess(TDEProcIO *))); proc->start(TDEProcess::NotifyOnExit,true); } -void KgpgInterface::readprocess(KProcIO *p) +void KgpgInterface::readprocess(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; TQString required; @@ -898,18 +898,18 @@ void KgpgInterface::KgpgSignKey(TQString keyID,TQString signKeyID,TQString signK signSuccess=0; step=1; output=TQString(); - KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *conprocess=new TDEProcIO(TQTextCodec::codecForLocale()); *conprocess<<"gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--utf8-strings"<<"--command-fd=0"<<"--status-fd=2"<<"-u"<<signKeyID; *conprocess<<"--edit-key"<<keyID; if (local) *conprocess<<"lsign"; else *conprocess<<"sign"; - TQObject::connect(conprocess,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(sigprocess(KProcIO *))); + TQObject::connect(conprocess,TQ_SIGNAL(readReady(TDEProcIO *)),this,TQ_SLOT(sigprocess(TDEProcIO *))); TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(signover(TDEProcess *))); TQApplication::setOverrideCursor(TQCursor(TQt::BusyCursor)); conprocess->start(TDEProcess::NotifyOnExit,true); } -void KgpgInterface::sigprocess(KProcIO *p) +void KgpgInterface::sigprocess(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; TQString required=TQString(); @@ -1148,17 +1148,17 @@ void KgpgInterface::KgpgDelSignature(TQString keyID,TQString signKeyID) signb++; } pclose(fp); - KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *conprocess=new TDEProcIO(TQTextCodec::codecForLocale()); *conprocess<<"gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--utf8-strings"<<"--command-fd=0"<<"--status-fd=2"; *conprocess<<"--edit-key"<<keyID<<"uid 1"<<"delsig"; - TQObject::connect(conprocess,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(delsigprocess(KProcIO *))); + TQObject::connect(conprocess,TQ_SIGNAL(readReady(TDEProcIO *)),this,TQ_SLOT(delsigprocess(TDEProcIO *))); TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(delsignover(TDEProcess *))); TQApplication::setOverrideCursor(TQCursor(TQt::BusyCursor)); conprocess->start(TDEProcess::NotifyOnExit,true); } -void KgpgInterface::delsigprocess(KProcIO *p) +void KgpgInterface::delsigprocess(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; @@ -1239,16 +1239,16 @@ void KgpgInterface::KgpgKeyExpire(TQString keyID,TQDate date,bool unlimited) expirationDelay=TQDate::currentDate().daysTo(date); // kdDebug(2100) << "KgpgKeyExpire date: " << TQDate::currentDate().daysTo(date) <<endl; output=TQString(); - KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *conprocess=new TDEProcIO(TQTextCodec::codecForLocale()); *conprocess<<"gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--command-fd=0"<<"--status-fd=2"<<"--utf8-strings"; *conprocess<<"--edit-key"<<keyID<<"expire"; - TQObject::connect(conprocess,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(expprocess(KProcIO *))); + TQObject::connect(conprocess,TQ_SIGNAL(readReady(TDEProcIO *)),this,TQ_SLOT(expprocess(TDEProcIO *))); TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(expover(TDEProcess *))); conprocess->start(TDEProcess::NotifyOnExit,TDEProcess::AllOutput); } -void KgpgInterface::expprocess(KProcIO *p) +void KgpgInterface::expprocess(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; TQString required=TQString(); @@ -1336,16 +1336,16 @@ void KgpgInterface::KgpgTrustExpire(TQString keyID,int keyTrust) /* Don't know=1; Do NOT trust=2; Marginally=3; Fully=4; Ultimately=5; */ output=TQString(); - KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *conprocess=new TDEProcIO(TQTextCodec::codecForLocale()); *conprocess<<"gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--command-fd=0"<<"--status-fd=2"<<"--utf8-strings"; *conprocess<<"--edit-key"<<keyID<<"trust"; - TQObject::connect(conprocess,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(trustprocess(KProcIO *))); + TQObject::connect(conprocess,TQ_SIGNAL(readReady(TDEProcIO *)),this,TQ_SLOT(trustprocess(TDEProcIO *))); TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(trustover(TDEProcess *))); conprocess->start(TDEProcess::NotifyOnExit,true); } -void KgpgInterface::trustprocess(KProcIO *p) +void KgpgInterface::trustprocess(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; TQString required=TQString(); @@ -1395,16 +1395,16 @@ void KgpgInterface::KgpgChangePass(TQString keyID) step=1; output=TQString(); message=TQString(); - KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *conprocess=new TDEProcIO(TQTextCodec::codecForLocale()); *conprocess<<"gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--no-use-agent"<<"--command-fd=0"<<"--status-fd=2"<<"--utf8-strings"; *conprocess<<"--edit-key"<<keyID<<"passwd"; - TQObject::connect(conprocess,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(passprocess(KProcIO *))); + TQObject::connect(conprocess,TQ_SIGNAL(readReady(TDEProcIO *)),this,TQ_SLOT(passprocess(TDEProcIO *))); TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(passover(TDEProcess *))); conprocess->start(TDEProcess::NotifyOnExit,TDEProcess::AllOutput); } -void KgpgInterface::passprocess(KProcIO *p) +void KgpgInterface::passprocess(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; TQString required=TQString(); @@ -1497,7 +1497,7 @@ TQString KgpgInterface::getKey(TQStringList IDs, bool attributes) { // kdDebug(2100) << k_funcinfo << endl; keyString=TQString(); - KProcIO *proc=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *proc=new TDEProcIO(TQTextCodec::codecForLocale()); *proc<< "gpg"<<"--no-tty"<<"--no-secmem-warning"<<"--utf8-strings"; *proc<<"--export"<<"--armor"; if (!attributes) @@ -1505,13 +1505,13 @@ TQString KgpgInterface::getKey(TQStringList IDs, bool attributes) for ( TQStringList::Iterator it = IDs.begin(); it != IDs.end(); ++it ) *proc << *it; - TQObject::connect(proc, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(slotReadKey(KProcIO *))); + TQObject::connect(proc, TQ_SIGNAL(readReady(TDEProcIO *)),this, TQ_SLOT(slotReadKey(TDEProcIO *))); proc->start(TDEProcess::Block,false); return keyString; } -void KgpgInterface::slotReadKey(KProcIO *p) +void KgpgInterface::slotReadKey(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; TQString outp; @@ -1529,12 +1529,12 @@ void KgpgInterface::importKeyURL(KURL url) // kdDebug(2100) << k_funcinfo << endl; if( TDEIO::NetAccess::download( url, tempKeyFile,0) ) { message=TQString(); - KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *conprocess=new TDEProcIO(TQTextCodec::codecForLocale()); *conprocess<< "gpg"<<"--no-tty"<<"--no-secmem-warning"<<"--status-fd=2"<<"--utf8-strings"<<"--import"; *conprocess<<"--allow-secret-key-import"; *conprocess<<tempKeyFile; TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(importURLover(TDEProcess *))); - TQObject::connect(conprocess, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(importprocess(KProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(readReady(TDEProcIO *)),this, TQ_SLOT(importprocess(TDEProcIO *))); conprocess->start(TDEProcess::NotifyOnExit,true); } } @@ -1543,11 +1543,11 @@ void KgpgInterface::importKey(TQString keystr) { ///////////// import a key message=TQString(); - KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *conprocess=new TDEProcIO(TQTextCodec::codecForLocale()); *conprocess<< "gpg"<<"--no-tty"<<"--no-secmem-warning"<<"--status-fd=2"<<"--import"; *conprocess<<"--allow-secret-key-import"; TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(importover(TDEProcess *))); - TQObject::connect(conprocess, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(importprocess(KProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(readReady(TDEProcIO *)),this, TQ_SLOT(importprocess(TDEProcIO *))); conprocess->start(TDEProcess::NotifyOnExit,true); conprocess->writeStdin(keystr, true); conprocess->closeWhenDone(); @@ -1627,7 +1627,7 @@ void KgpgInterface::importURLover(TDEProcess *p) //emit importfinished(); } -void KgpgInterface::importprocess(KProcIO *p) +void KgpgInterface::importprocess(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; TQString outp; @@ -1650,11 +1650,11 @@ uidEmail=email; output=TQString(); addSuccess=true; - KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *conprocess=new TDEProcIO(TQTextCodec::codecForLocale()); *conprocess<< "gpg"<<"--no-tty"<<"--status-fd=2"<<"--command-fd=0"<<"--utf8-strings"; *conprocess<<"--edit-key"<<keyID<<"adduid"; TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(adduidover(TDEProcess *))); - TQObject::connect(conprocess, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(adduidprocess(KProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(readReady(TDEProcIO *)),this, TQ_SLOT(adduidprocess(TDEProcIO *))); conprocess->start(TDEProcess::NotifyOnExit,true); } @@ -1665,7 +1665,7 @@ if (addSuccess) emit addUidFinished(); else emit addUidError(output); } -void KgpgInterface::adduidprocess(KProcIO *p) +void KgpgInterface::adduidprocess(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; TQString required=TQString(); @@ -1737,15 +1737,15 @@ output=TQString(); photoCount=1; userIDs=keyID; - KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *conprocess=new TDEProcIO(TQTextCodec::codecForLocale()); *conprocess<< "gpg"<<"--no-tty"<<"--status-fd=2"<<"--command-fd=0"; *conprocess<<"--with-colon"<<"--list-keys"<<keyID; TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(photoreadover(TDEProcess *))); - TQObject::connect(conprocess, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(photoreadprocess(KProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(readReady(TDEProcIO *)),this, TQ_SLOT(photoreadprocess(TDEProcIO *))); conprocess->start(TDEProcess::NotifyOnExit,true); } -void KgpgInterface::photoreadprocess(KProcIO *p) +void KgpgInterface::photoreadprocess(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; TQString required=TQString(); @@ -1772,7 +1772,7 @@ KTempFile *kgpginfotmp=new KTempFile(); kgpginfotmp->setAutoDelete(true); TQString pgpgOutput="cp %i "+kgpginfotmp->name(); -KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); +TDEProcIO *conprocess=new TDEProcIO(TQTextCodec::codecForLocale()); *conprocess<< "gpg"<<"--no-tty"<<"--status-fd=2"<<"--command-fd=0"<<"--utf8-strings"; *conprocess<<"--photo-viewer"<<TQString(TQFile::encodeName(pgpgOutput))<<"--edit-key"<<userIDs<<"uid"<<TQString::number(uid)<<"showphoto"; conprocess->start(TDEProcess::Block); @@ -1790,11 +1790,11 @@ void KgpgInterface::KgpgDeletePhoto(TQString keyID,TQString uid) // kdDebug(2100) << k_funcinfo << endl; delSuccess=true; output=TQString(); - KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *conprocess=new TDEProcIO(TQTextCodec::codecForLocale()); *conprocess<< "gpg"<<"--no-tty"<<"--status-fd=2"<<"--command-fd=0"<<"--utf8-strings"; *conprocess<<"--edit-key"<<keyID<<"uid"<<uid<<"deluid"; TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(delphotoover(TDEProcess *))); - TQObject::connect(conprocess, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(delphotoprocess(KProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(readReady(TDEProcIO *)),this, TQ_SLOT(delphotoprocess(TDEProcIO *))); conprocess->start(TDEProcess::NotifyOnExit,true); } @@ -1805,7 +1805,7 @@ if (delSuccess) emit delPhotoFinished(); else emit delPhotoError(output); } -void KgpgInterface::delphotoprocess(KProcIO *p) +void KgpgInterface::delphotoprocess(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; TQString required=TQString(); @@ -1856,11 +1856,11 @@ void KgpgInterface::KgpgAddPhoto(TQString keyID,TQString imagePath) photoUrl=imagePath; output=TQString(); addSuccess=true; - KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *conprocess=new TDEProcIO(TQTextCodec::codecForLocale()); *conprocess<< "gpg"<<"--no-tty"<<"--status-fd=2"<<"--command-fd=0"<<"--utf8-strings"; *conprocess<<"--edit-key"<<keyID<<"addphoto"; TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(addphotoover(TDEProcess *))); - TQObject::connect(conprocess, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(addphotoprocess(KProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(readReady(TDEProcIO *)),this, TQ_SLOT(addphotoprocess(TDEProcIO *))); conprocess->start(TDEProcess::NotifyOnExit,true); } @@ -1871,7 +1871,7 @@ if (addSuccess) emit addPhotoFinished(); else emit addPhotoError(output); } -void KgpgInterface::addphotoprocess(KProcIO *p) +void KgpgInterface::addphotoprocess(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; TQString required=TQString(); @@ -1938,13 +1938,13 @@ void KgpgInterface::KgpgRevokeKey(TQString keyID,TQString revokeUrl,int reason,T revokeDescription=description; certificateUrl=revokeUrl; output=TQString(); - KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *conprocess=new TDEProcIO(TQTextCodec::codecForLocale()); *conprocess<< "gpg"<<"--no-tty"<<"--status-fd=2"<<"--logger-fd=2"<<"--command-fd=0"<<"--utf8-strings"; if (!revokeUrl.isEmpty()) *conprocess<<"-o"<<revokeUrl; *conprocess<<"--gen-revoke"<<keyID; TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(revokeover(TDEProcess *))); - TQObject::connect(conprocess, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(revokeprocess(KProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(readReady(TDEProcIO *)),this, TQ_SLOT(revokeprocess(TDEProcIO *))); conprocess->start(TDEProcess::NotifyOnExit,true); } @@ -1963,7 +1963,7 @@ void KgpgInterface::revokeover(TDEProcess *) } } -void KgpgInterface::revokeprocess(KProcIO *p) +void KgpgInterface::revokeprocess(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; TQString required=TQString(); diff --git a/kgpg/kgpginterface.h b/kgpg/kgpginterface.h index 0dc2654..df00e45 100644 --- a/kgpg/kgpginterface.h +++ b/kgpg/kgpginterface.h @@ -25,7 +25,7 @@ #include <tqdatetime.h> class TQLabel; -class KProcIO; +class TDEProcIO; class TDEProcess; class KLed; @@ -83,7 +83,7 @@ public slots: void KgpgVerifyFile(KURL sigUrl,KURL srcUrl=KURL()) ; void KgpgVerifyText(TQString text); - void slotverifyread(KProcIO *p); + void slotverifyread(TDEProcIO *p); void slotverifyresult(TDEProcess*); @@ -142,7 +142,7 @@ public slots: void KgpgRevokeKey(TQString keyID,TQString revokeUrl,int reason,TQString description); void revokeover(TDEProcess *); - void revokeprocess(KProcIO *p); + void revokeprocess(TDEProcIO *p); void KgpgDeletePhoto(TQString keyID,TQString uid); void KgpgAddPhoto(TQString keyID,TQString imagePath); @@ -177,7 +177,7 @@ private slots: /** * Read output of the signature process */ - void sigprocess(KProcIO *p); + void sigprocess(TDEProcIO *p); /** * Checks if the encrypted file was saved. @@ -202,7 +202,7 @@ private slots: /** * Reads output of the delete signature process */ - void delsigprocess(KProcIO *p); + void delsigprocess(TDEProcIO *p); /** * Checks output of the delete signature process */ @@ -215,54 +215,54 @@ private slots: /** * Read output of the import process */ - void importprocess(KProcIO *p); + void importprocess(TDEProcIO *p); /** * Reads output of the current process + allow overwriting of a file */ - void readprocess(KProcIO *p); + void readprocess(TDEProcIO *p); /** * Reads output of the current encryption process + allow overwriting of a file */ - void readencprocess(KProcIO *p); + void readencprocess(TDEProcIO *p); /** * Reads output of the current signing process + allow overwriting of a file */ - void readsignprocess(KProcIO *p); + void readsignprocess(TDEProcIO *p); /** * Reads output of the current decryption process + allow overwriting of a file */ - void readdecprocess(KProcIO *p); + void readdecprocess(TDEProcIO *p); /** * Checks output of the verify process */ void verifyfin(TDEProcess *p); - void expprocess(KProcIO *p); + void expprocess(TDEProcIO *p); void expover(TDEProcess*); - void trustprocess(KProcIO *p); - void passprocess(KProcIO *p); + void trustprocess(TDEProcIO *p); + void passprocess(TDEProcIO *p); void trustover(TDEProcess *); void passover(TDEProcess *); - void txtreadencprocess(KProcIO *p); + void txtreadencprocess(TDEProcIO *p); void txtencryptfin(TDEProcess *); void delphotoover(TDEProcess *); - void delphotoprocess(KProcIO *p); + void delphotoprocess(TDEProcIO *p); void addphotoover(TDEProcess *); - void addphotoprocess(KProcIO *p); + void addphotoprocess(TDEProcIO *p); void adduidover(TDEProcess *); - void adduidprocess(KProcIO *p); + void adduidprocess(TDEProcIO *p); - void slotReadKey(KProcIO *p); + void slotReadKey(TDEProcIO *p); void photoreadover(TDEProcess *); - void photoreadprocess(KProcIO *p); + void photoreadprocess(TDEProcIO *p); bool isPhotoId(int uid); void updateIDs(TQString txtString); - void txtsignprocess(KProcIO *p); + void txtsignprocess(TDEProcIO *p); void txtsignfin(TDEProcess *); //void txtdecryptfin(TDEProcess *); diff --git a/kgpg/kgpgoptions.cpp b/kgpg/kgpgoptions.cpp index 3c18751..cc19d24 100644 --- a/kgpg/kgpgoptions.cpp +++ b/kgpg/kgpgoptions.cpp @@ -26,7 +26,7 @@ #include <tdeconfig.h> #include <tdeversion.h> #include <tdelocale.h> -#include <kprocio.h> +#include <tdeprocio.h> #include <tqcheckbox.h> #include <tqradiobutton.h> #include <tqpushbutton.h> @@ -206,7 +206,7 @@ void kgpgOptions::slotChangeHome() if (!TQFile(gpgHome+confPath).exists()) { if (KMessageBox::questionYesNo(this,i18n("No configuration file was found in the selected location.\nDo you want to create it now ?\n\nWithout configuration file, neither KGpg nor Gnupg will work properly."),i18n("No Configuration File Found"),i18n("Create"),i18n("Ignore")) ==KMessageBox::Yes) {////////// Try to create config File by running gpg once - KProcIO *p=new KProcIO(); + TDEProcIO *p=new TDEProcIO(); *p<<"gpg"<<"--homedir"<<gpgHome<<"--no-tty"<<"--list-secret-keys"; p->start(TDEProcess::Block); //// start gnupg so that it will create a config file confPath="gpg.conf"; diff --git a/kgpg/listkeys.cpp b/kgpg/listkeys.cpp index a5dc54f..38f80ad 100644 --- a/kgpg/listkeys.cpp +++ b/kgpg/listkeys.cpp @@ -43,7 +43,7 @@ #include <tdetempfile.h> #include <kdebug.h> #include <tdeprocess.h> -#include <kprocio.h> +#include <tdeprocio.h> #include <tqwidget.h> #include <tdeaction.h> #include <tqcheckbox.h> @@ -1525,7 +1525,7 @@ void listKeys::slotexportsec() if (fgpg.exists()) fgpg.remove(); - KProcIO *p=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *p=new TDEProcIO(TQTextCodec::codecForLocale()); *p<<"gpg"<<"--no-tty"<<"--output"<<TQString(TQFile::encodeName(url.path()))<<"--armor"<<"--export-secret-keys"<<keysList2->currentItem()->text(6); p->start(TDEProcess::Block); @@ -1587,7 +1587,7 @@ void listKeys::slotexport() expServer->slotExport(exportKeysList); return; } - KProcIO *p=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *p=new TDEProcIO(TQTextCodec::codecForLocale()); *p<<"gpg"<<"--no-tty"; if (page->checkFile->isChecked()) { expname=page->newFilename->url().stripWhiteSpace(); @@ -1664,7 +1664,7 @@ void listKeys::slotShowPhoto() TDETrader::OfferList offers = TDETrader::self()->query("image/jpeg", "Type == 'Application'"); KService::Ptr ptr = offers.first(); //KMessageBox::sorry(0,ptr->desktopEntryName()); - KProcIO *p=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *p=new TDEProcIO(TQTextCodec::codecForLocale()); *p<<"gpg"<<"--no-tty" <<"--photo-viewer"<<TQString(TQFile::encodeName(ptr->desktopEntryName()+" %i")) <<"--edit-key"<<keysList2->currentItem()->parent()->text(6) @@ -2267,7 +2267,7 @@ void listKeys::slotgenkey() int iYpos=qRect.height()/2-pop->height()/2; pop->move(iXpos,iYpos); pop->setAutoDelete(false); - KProcIO *proc=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *proc=new TDEProcIO(TQTextCodec::codecForLocale()); message=TQString(); //*proc<<"gpg"<<"--no-tty"<<"--no-secmem-warning"<<"--batch"<<"--passphrase-fd"<<res<<"--gen-key"<<"-a"<<"kgpg.tmp"; *proc<<"gpg"<<"--no-tty"<<"--status-fd=2"<<"--no-secmem-warning"<<"--batch"<<"--gen-key"<<"--utf8-strings"; @@ -2303,7 +2303,7 @@ void listKeys::slotgenkey() if (kexp==4) proc->writeStdin(TQString("Expire-Date:%1y").arg(knumb)); proc->writeStdin(TQString("%commit")); - TQObject::connect(proc,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(readgenprocess(KProcIO *))); + TQObject::connect(proc,TQ_SIGNAL(readReady(TDEProcIO *)),this,TQ_SLOT(readgenprocess(TDEProcIO *))); proc->closeWhenDone(); } else ////// start expert (=konsole) mode { @@ -2321,7 +2321,7 @@ void listKeys::slotgenkey() } } -void listKeys::readgenprocess(KProcIO *p) +void listKeys::readgenprocess(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; TQString required; @@ -2339,20 +2339,20 @@ void listKeys::genover(TDEProcess *) // kdDebug(2100) << k_funcinfo << endl; newkeyID=TQString(); continueSearch=true; - KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *conprocess=new TDEProcIO(TQTextCodec::codecForLocale()); TQString fpropt = (KgpgInterface::getGpgVersion() < 210 ) ? "--fingerprint" : "--with-fingerprint"; *conprocess<< "gpg"; *conprocess<<"--no-secmem-warning" <<"--with-colons" << fpropt <<"--list-keys"<<newKeyName; - TQObject::connect(conprocess,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(slotReadFingerProcess(KProcIO *))); + TQObject::connect(conprocess,TQ_SIGNAL(readReady(TDEProcIO *)),this,TQ_SLOT(slotReadFingerProcess(TDEProcIO *))); TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(newKeyDone(TDEProcess *))); conprocess->start(TDEProcess::NotifyOnExit,true); } -void listKeys::slotReadFingerProcess(KProcIO *p) +void listKeys::slotReadFingerProcess(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; TQString outp; @@ -2629,7 +2629,7 @@ TQPixmap KeyView::slotGetPhoto(TQString photoId,bool mini) // kdDebug(2100) << k_funcinfo << endl; KTempFile *phototmp=new KTempFile(); TQString popt="cp %i "+phototmp->name(); - KProcIO *p=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *p=new TDEProcIO(TQTextCodec::codecForLocale()); *p<<"gpg"<<"--show-photos" <<"--photo-viewer"<<TQString(TQFile::encodeName(popt)) <<"--list-keys"<<photoId; @@ -2710,7 +2710,7 @@ void KeyView::expandKey(TQListViewItem *item) kgpgphototmp=new KTempFile(); kgpgphototmp->setAutoDelete(true); TQString pgpgOutput="cp %i "+kgpgphototmp->name(); - KProcIO *p=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *p=new TDEProcIO(TQTextCodec::codecForLocale()); *p<<"gpg"<<"--no-tty" <<"--photo-viewer"<<TQString(TQFile::encodeName(pgpgOutput)) <<"--edit-key"<<item->text(6) diff --git a/kgpg/listkeys.h b/kgpg/listkeys.h index a0269c6..a65abe6 100644 --- a/kgpg/listkeys.h +++ b/kgpg/listkeys.h @@ -42,7 +42,7 @@ class TQCheckbox; class KStatusBar; class KPassivePopup; class TDEProcess; -class KProcIO; +class TDEProcIO; class TQEvent; class KTempFile; class KgpgApp; @@ -235,7 +235,7 @@ private slots: void slotAddPhoto(); void slotSetPhotoSize(int size); void slotShowPhoto(); - void readgenprocess(KProcIO *p); + void readgenprocess(TDEProcIO *p); void newKeyDone(TDEProcess *); void slotrevoke(TQString keyID,TQString revokeUrl,int reason,TQString description); void revokeWidget(); @@ -247,7 +247,7 @@ private slots: void slotTip(); void showKeyServer(); void showKeyManager(); - void slotReadFingerProcess(KProcIO *p); + void slotReadFingerProcess(TDEProcIO *p); void slotProcessExportMail(TQString keys); void slotProcessExportClip(TQString keys); void readOptions(); diff --git a/kgpg/popuppublic.cpp b/kgpg/popuppublic.cpp index 4334b65..b1162c2 100644 --- a/kgpg/popuppublic.cpp +++ b/kgpg/popuppublic.cpp @@ -35,7 +35,7 @@ #include <tdeversion.h> #include <tdelistview.h> #include <tdeprocess.h> -#include <kprocio.h> +#include <tdeprocio.h> #include <tdelocale.h> #include <tdeaccel.h> #if KDE_IS_VERSION( 3, 2, 90 ) @@ -340,11 +340,11 @@ void popupPublic::refreshkeys() } } } - KProcIO *encid=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *encid=new TDEProcIO(TQTextCodec::codecForLocale()); *encid << "gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--with-colon"<<"--list-keys"; ///////// when process ends, update dialog infos TQObject::connect(encid, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotpreselect())); - TQObject::connect(encid, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(slotprocread(KProcIO *))); + TQObject::connect(encid, TQ_SIGNAL(readReady(TDEProcIO *)),this, TQ_SLOT(slotprocread(TDEProcIO *))); encid->start(TDEProcess::NotifyOnExit,true); } @@ -455,7 +455,7 @@ void popupPublic::slotSetVisible() keysList->ensureItemVisible(keysList->currentItem()); } -void popupPublic::slotprocread(KProcIO *p) +void popupPublic::slotprocread(TDEProcIO *p) { // collect all data (output starts with pub line followed by related) // kdDebug(2100) << k_funcinfo << endl; diff --git a/kgpg/popuppublic.h b/kgpg/popuppublic.h index a8e0327..120dc17 100644 --- a/kgpg/popuppublic.h +++ b/kgpg/popuppublic.h @@ -27,7 +27,7 @@ class TQPushButton; class TQCheckBox; class TDEListView; class TQButtonGroup; -class KProcIO; +class TDEProcIO; class popupPublic : public KDialogBase //TQDialog { @@ -52,7 +52,7 @@ private: private slots: void customOpts(const TQString &); - void slotprocread(KProcIO *); + void slotprocread(TDEProcIO *); void slotpreselect(); void refreshkeys(); void refresh(bool state); |