From aef5eada7f51ee48f3d21448db290bd8f06953a8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:50:20 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kgpg/keyinfowidget.cpp | 28 ++++----- kgpg/keyinfowidget.h | 6 +- kgpg/keyservers.cpp | 22 +++---- kgpg/keyservers.h | 8 +-- kgpg/kgpg.cpp | 14 ++--- kgpg/kgpg.kcfg | 2 +- kgpg/kgpgeditor.cpp | 2 +- kgpg/kgpginterface.cpp | 152 ++++++++++++++++++++++++------------------------- kgpg/kgpginterface.h | 48 ++++++++-------- kgpg/kgpglibrary.cpp | 6 +- kgpg/kgpgoptions.cpp | 6 +- kgpg/listkeys.cpp | 78 ++++++++++++------------- kgpg/listkeys.h | 6 +- kgpg/popuppublic.cpp | 6 +- 14 files changed, 192 insertions(+), 192 deletions(-) (limited to 'kgpg') diff --git a/kgpg/keyinfowidget.cpp b/kgpg/keyinfowidget.cpp index 2e75a4d..d3a8b2d 100644 --- a/kgpg/keyinfowidget.cpp +++ b/kgpg/keyinfowidget.cpp @@ -90,7 +90,7 @@ KgpgKeyInfo::KgpgKeyInfo(TQWidget *parent, const char *name,TQString sigkey):KDi void KgpgKeyInfo::slotDisableKey(bool isOn) { -KProcess kp; +TDEProcess kp; kp<<"gpg" <<"--no-tty" @@ -99,7 +99,7 @@ KProcess kp; if (isOn) kp<<"disable"; else kp<<"enable"; kp<<"save"; - kp.start(KProcess::Block); + kp.start(TDEProcess::Block); loadKey(displayedKeyID); keyWasChanged=true; } @@ -205,13 +205,13 @@ TQString gpgcmd="gpg --no-tty --no-secmem-warning --with-colon --with-fingerprin TQString fullname=gpgOutput.section(':',9,9); TQDate date = TQDate::fromString(gpgOutput.section(':',5,5), Qt::ISODate); - prop->tLCreation->setText(KGlobal::locale()->formatDate(date)); + prop->tLCreation->setText(TDEGlobal::locale()->formatDate(date)); if (gpgOutput.section(':',6,6).isEmpty()) expirationDate=i18n("Unlimited"); else { date = TQDate::fromString(gpgOutput.section(':',6,6), Qt::ISODate); - expirationDate=KGlobal::locale()->formatDate(date); + expirationDate=TDEGlobal::locale()->formatDate(date); } prop->tLExpiration->setText(expirationDate); @@ -297,13 +297,13 @@ void KgpgKeyInfo::reloadMainPhoto(const TQString &uid) *p<<"gpg"<<"--no-tty"<<"--show-photos"<<"--photo-viewer"<start(KProcess::NotifyOnExit,true); + TQObject::connect(p, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotMainImageRead(TDEProcess *))); + p->start(TDEProcess::NotifyOnExit,true); } -void KgpgKeyInfo::slotMainImageRead(KProcess *p) +void KgpgKeyInfo::slotMainImageRead(TDEProcess *p) { p->deleteLater(); TQPixmap pixmap; @@ -347,7 +347,7 @@ void KgpgKeyInfo::openPhoto() //KMessageBox::sorry(0,ptr->desktopEntryName()); KProcIO *p=new KProcIO(); *p<<"gpg"<<"--show-photos"<<"--photo-viewer"<desktopEntryName()+" %i"))<<"--list-keys"<start(KProcess::DontCare,true); + p->start(TDEProcess::DontCare,true); } void KgpgKeyInfo::slotChangeExp() @@ -363,7 +363,7 @@ kb->setChecked(true); kdt->setEnabled(false); } else -kdt= new KDatePicker(page,KGlobal::locale()->readDate(prop->tLExpiration->text())); +kdt= new KDatePicker(page,TDEGlobal::locale()->readDate(prop->tLExpiration->text())); TQVBoxLayout *vbox=new TQVBoxLayout(page,3); vbox->addWidget(kdt); vbox->addWidget(kb); @@ -405,7 +405,7 @@ chdate->enableButtonOK(kdt->date()>=TQDate::currentDate ()); } } -void KgpgKeyInfo::slotinfoimgread(KProcess *) +void KgpgKeyInfo::slotinfoimgread(TDEProcess *) { TQPixmap pixmap; pixmap.load(kgpginfotmp->name()); @@ -430,14 +430,14 @@ void KgpgKeyInfo::slotChangeTrust(int newTrust) void KgpgKeyInfo::slotInfoPasswordChanged() { -KPassivePopup::message(i18n("Passphrase for the key was changed"),TQString(),KGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop),this); +KPassivePopup::message(i18n("Passphrase for the key was changed"),TQString(),TDEGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop),this); } void KgpgKeyInfo::slotInfoTrustChanged() { keyWasChanged=true; loadKey(displayedKeyID); -//KPassivePopup::message(i18n("Owner trust of the key was changed"),TQString(),KGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop),this,0,600); +//KPassivePopup::message(i18n("Owner trust of the key was changed"),TQString(),TDEGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop),this,0,600); } void KgpgKeyInfo::slotInfoExpirationChanged(int res) @@ -447,11 +447,11 @@ if (res==3) { keyWasChanged=true; if (kb->isChecked()) prop->tLExpiration->setText(i18n("Unlimited")); -else prop->tLExpiration->setText(KGlobal::locale()->formatDate(kdt->date())); +else prop->tLExpiration->setText(TDEGlobal::locale()->formatDate(kdt->date())); } if (res==2) { infoMessage=i18n("Could not change expiration");infoText=i18n("Bad passphrase"); -KPassivePopup::message(infoMessage,infoText,KGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop),this); +KPassivePopup::message(infoMessage,infoText,TDEGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop),this); } } diff --git a/kgpg/keyinfowidget.h b/kgpg/keyinfowidget.h index 2560e96..6d00d3b 100644 --- a/kgpg/keyinfowidget.h +++ b/kgpg/keyinfowidget.h @@ -27,7 +27,7 @@ class KDialogBase; class TQCheckBox; class KDatePicker; class KeyProperties; -class KProcess; +class TDEProcess; class KProcIO; class KgpgKeyInfo : public KDialogBase @@ -42,7 +42,7 @@ public: KeyProperties *prop; private slots: - void slotinfoimgread(KProcess *); + void slotinfoimgread(TDEProcess *); void slotChangePass(); void slotPreOk(); void slotChangeExp(); @@ -52,7 +52,7 @@ private slots: void openPhoto(); void slotSetPhoto(const TQPixmap &pix); void finishphotoreadprocess(KProcIO *p); - void slotMainImageRead(KProcess *); + void slotMainImageRead(TDEProcess *); void slotSetMainPhoto(TQStringList list); void reloadMainPhoto(const TQString &uid); void slotInfoPasswordChanged(); diff --git a/kgpg/keyservers.cpp b/kgpg/keyservers.cpp index 00c655a..b0a673d 100644 --- a/kgpg/keyservers.cpp +++ b/kgpg/keyservers.cpp @@ -85,7 +85,7 @@ keyServer::keyServer(TQWidget *parent, const char *name,bool modal,bool autoClos KProcIO *encid=new KProcIO(TQTextCodec::codecForLocale()); *encid << "gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--with-colon"<<"--list-keys"; TQObject::connect(encid, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotprocread(KProcIO *))); - encid->start(KProcess::NotifyOnExit,true); + encid->start(TDEProcess::NotifyOnExit,true); page->Buttonimport->setEnabled( !page->kLEimportid->text().isEmpty()); page->Buttonsearch->setEnabled( !page->kLEimportid->text().isEmpty()); setMinimumSize(sizeHint()); @@ -119,7 +119,7 @@ void keyServer::slotprocread(KProcIO *p) ///////////////////////////////////////////////////////////////// extract encryption keys bool dead; TQString tst; - //TQPixmap pixkeySingle(KGlobal::iconLoader()->loadIcon("kgpg_key1",KIcon::Small,20)); + //TQPixmap pixkeySingle(TDEGlobal::iconLoader()->loadIcon("kgpg_key1",KIcon::Small,20)); while (p->readln(tst)!=-1) { //tst=tst.stripWhiteSpace(); if (tst.startsWith("pub")) { @@ -196,9 +196,9 @@ void keyServer::slotSearch() *searchproc<<"--keyserver"<kLEimportid->text().stripWhiteSpace(); keyNumbers=0; - TQObject::connect(searchproc, TQT_SIGNAL(processExited(KProcess *)),this, TQT_SLOT(slotsearchresult(KProcess *))); + TQObject::connect(searchproc, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotsearchresult(TDEProcess *))); TQObject::connect(searchproc, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotsearchread(KProcIO *))); - searchproc->start(KProcess::NotifyOnExit,true); + searchproc->start(TDEProcess::NotifyOnExit,true); TQApplication::setOverrideCursor(TQCursor(TQt::BusyCursor)); dialogServer->setMainWidget(listpop); listpop->setMinimumSize(listpop->sizeHint()); @@ -255,7 +255,7 @@ void keyServer::transferKeyID() listpop->kLEID->setText(keysToSearch.stripWhiteSpace()); } -void keyServer::slotsearchresult(KProcess *) +void keyServer::slotsearchresult(TDEProcess *) { TQString nb; dialogServer->enableButtonOK(true); @@ -364,9 +364,9 @@ void keyServer::slotExport(TQStringList keyIds) *exportproc<< "--keyserver-options"<<"no-honor-http-proxy"; *exportproc << "--status-fd=2" << "--keyserver" << keyserv << "--send-keys" << keyIds; - TQObject::connect(exportproc, TQT_SIGNAL(processExited(KProcess *)),this, TQT_SLOT(slotexportresult(KProcess *))); + TQObject::connect(exportproc, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotexportresult(TDEProcess *))); TQObject::connect(exportproc, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotimportread(KProcIO *))); - exportproc->start(KProcess::NotifyOnExit,true); + exportproc->start(TDEProcess::NotifyOnExit,true); TQApplication::setOverrideCursor(TQCursor(TQt::BusyCursor)); importpop = new TQDialog( this,0,true,TQt::WDestructiveClose); TQVBoxLayout *vbox=new TQVBoxLayout(importpop,3); @@ -392,7 +392,7 @@ void keyServer::abortExport() } } -void keyServer::slotexportresult(KProcess*) +void keyServer::slotexportresult(TDEProcess*) { TQApplication::restoreOverrideCursor(); KMessageBox::information(0,readmessage); @@ -431,9 +431,9 @@ void keyServer::slotImport() *importproc<start(KProcess::NotifyOnExit,true); + importproc->start(TDEProcess::NotifyOnExit,true); importproc->closeWhenDone(); TQApplication::setOverrideCursor(TQCursor(TQt::BusyCursor)); importpop = new TQDialog( this,0,true,TQt::WDestructiveClose); @@ -462,7 +462,7 @@ void keyServer::abortImport() if (autoCloseWindow) close(); } -void keyServer::slotimportresult(KProcess*) +void keyServer::slotimportresult(TDEProcess*) { TQApplication::restoreOverrideCursor(); TQString importedNb,importedNbSucess,importedNbProcess,resultMessage, parsedOutput,importedNbUnchanged,importedNbSig; diff --git a/kgpg/keyservers.h b/kgpg/keyservers.h index de33f35..2387b2a 100644 --- a/kgpg/keyservers.h +++ b/kgpg/keyservers.h @@ -24,7 +24,7 @@ class KListViewItem; class KSimpleConfig; class KProcIO; -class KProcess; +class TDEProcess; class searchRes; @@ -47,14 +47,14 @@ public slots: void syncCombobox(); void slotImport(); void slotSearch(); - void slotimportresult(KProcess*); - void slotexportresult(KProcess*); + void slotimportresult(TDEProcess*); + void slotexportresult(TDEProcess*); void slotimportread(KProcIO *p); void slotprocread(KProcIO *p); void slotPreExport(); void slotExport(TQStringList keyIds); void preimport(); - void slotsearchresult(KProcess *); + void slotsearchresult(TDEProcess *); void slotEnableProxyI(bool on); void slotEnableProxyE(bool on); void handleQuit(); diff --git a/kgpg/kgpg.cpp b/kgpg/kgpg.cpp index 016988d..6cfba30 100644 --- a/kgpg/kgpg.cpp +++ b/kgpg/kgpg.cpp @@ -206,7 +206,7 @@ if (encryptedFolder.exists()) { } pop = new KPassivePopup(); - pop->setView(i18n("Processing folder compression and encryption"),i18n("Please wait..."),KGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop)); + pop->setView(i18n("Processing folder compression and encryption"),i18n("Please wait..."),TDEGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop)); pop->setAutoDelete(false); pop->show(); kapp->processEvents(); @@ -592,7 +592,7 @@ void MyView::firstRun() { KProcIO *p=new KProcIO(); *p<<"gpg"<<"--no-tty"<<"--list-secret-keys"; - p->start(KProcess::Block); //// start gnupg so that it will create a config file + p->start(TDEProcess::Block); //// start gnupg so that it will create a config file startWizard(); } @@ -642,7 +642,7 @@ void MyView::startWizard() wiz->kURLRequester1->setURL(confPath); /* - wiz->kURLRequester2->setURL(KGlobalSettings::desktopPath()); + wiz->kURLRequester2->setURL(TDEGlobalSettings::desktopPath()); wiz->kURLRequester2->setMode(2);*/ FILE *fp,*fp2; @@ -715,7 +715,7 @@ void MyView::slotWizardChange() void MyView::installShred() { KURL path; - path.setPath(KGlobalSettings::desktopPath()); + path.setPath(TDEGlobalSettings::desktopPath()); path.addPath("shredder.desktop"); KDesktopFile configl2(path.path(), false); if (configl2.isImmutable() ==false) { @@ -865,7 +865,7 @@ KgpgAppletApp::~KgpgAppletApp() void KgpgAppletApp::slotHandleQuit() { -s_keyManager->keysList2->saveLayout(KGlobal::config(),"KeyView"); +s_keyManager->keysList2->saveLayout(TDEGlobal::config(),"KeyView"); KGpgSettings::setPhotoProperties(s_keyManager->photoProps->currentItem()); KGpgSettings::setShowTrust(s_keyManager->sTrust->isChecked()); KGpgSettings::setShowExpi(s_keyManager->sExpi->isChecked()); @@ -1009,7 +1009,7 @@ int KgpgAppletApp::newInstance() void MyView::encryptClipboard(TQStringList selec,TQStringList encryptOptions,bool,bool symmetric) { if (kapp->clipboard()->text(clipboardMode).isEmpty()) { - KPassivePopup::message(i18n("Clipboard is empty."),TQString(),KGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop),this); + KPassivePopup::message(i18n("Clipboard is empty."),TQString(),TDEGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop),this); return; } if (KGpgSettings::pgpCompatibility()) @@ -1033,7 +1033,7 @@ if (newtxt.length()>300) newtxt.replace(TQRegExp("\n"),"
"); pop = new KPassivePopup( this); - pop->setView(i18n("Encrypted following text:"),newtxt,KGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop)); + pop->setView(i18n("Encrypted following text:"),newtxt,TDEGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop)); pop->setTimeout(3200); pop->show(); TQRect qRect(TQApplication::desktop()->screenGeometry()); diff --git a/kgpg/kgpg.kcfg b/kgpg/kgpg.kcfg index a7ade9f..6ee2417 100644 --- a/kgpg/kgpg.kcfg +++ b/kgpg/kgpg.kcfg @@ -193,7 +193,7 @@ - KGlobalSettings::fixedFont() + TDEGlobalSettings::fixedFont() diff --git a/kgpg/kgpgeditor.cpp b/kgpg/kgpgeditor.cpp index 59acd4e..153cb75 100644 --- a/kgpg/kgpgeditor.cpp +++ b/kgpg/kgpgeditor.cpp @@ -300,7 +300,7 @@ void KgpgApp::slotFileOpen() bool KgpgApp::checkEncoding(TQTextCodec *codec) { - ///////////// KGlobal::locale()->encoding()->name() + ///////////// TDEGlobal::locale()->encoding()->name() return codec->canEncode(view->editor->text()); } diff --git a/kgpg/kgpginterface.cpp b/kgpg/kgpginterface.cpp index 7e9dc56..0655b38 100644 --- a/kgpg/kgpginterface.cpp +++ b/kgpg/kgpginterface.cpp @@ -111,9 +111,9 @@ void KgpgInterface::KgpgEncryptFile(TQStringList encryptKeys,KURL srcUrl,KURL de *proc<start(KProcess::NotifyOnExit,true); + proc->start(TDEProcess::NotifyOnExit,true); } @@ -121,7 +121,7 @@ KgpgInterface::~KgpgInterface() {} -void KgpgInterface::encryptfin(KProcess *) +void KgpgInterface::encryptfin(TDEProcess *) { if (message.find("END_ENCRYPTION")!=-1) emit encryptionfinished(sourceFile); @@ -180,12 +180,12 @@ void KgpgInterface::KgpgDecryptFile(KURL srcUrl,KURL destUrl,TQStringList Option *proc<<"-d"<start(KProcess::NotifyOnExit,true); + proc->start(TDEProcess::NotifyOnExit,true); } -void KgpgInterface::decryptfin(KProcess *) +void KgpgInterface::decryptfin(TDEProcess *) { if ((message.find("DECRYPTION_OKAY")!=-1) && (message.find("END_DECRYPTION")!=-1)) //&& (message.find("GOODMDC")!=-1) emit decryptionfinished(); @@ -248,7 +248,7 @@ void KgpgInterface::readdecprocess(KProcIO *p) void KgpgInterface::KgpgEncryptText(TQString text,TQStringList userIDs, TQStringList Options) { message=TQString(); - //TQTextCodec *codec = KGlobal::charsets()->codecForName(KGlobal::locale()->encoding()); + //TQTextCodec *codec = TDEGlobal::charsets()->codecForName(TDEGlobal::locale()->encoding()); TQTextCodec *codec =TQTextCodec::codecForLocale (); if (codec->canEncode(text)) txtToEncrypt=text; else txtToEncrypt=text.utf8(); @@ -270,14 +270,14 @@ void KgpgInterface::KgpgEncryptText(TQString text,TQStringList userIDs, TQString ///////// when process ends, update dialog infos - TQObject::connect(proc, TQT_SIGNAL(processExited(KProcess *)),this,TQT_SLOT(txtencryptfin(KProcess *))); + TQObject::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),this,TQT_SLOT(txtencryptfin(TDEProcess *))); TQObject::connect(proc,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(txtreadencprocess(KProcIO *))); - proc->start(KProcess::NotifyOnExit,false); + proc->start(TDEProcess::NotifyOnExit,false); emit txtencryptionstarted(); } -void KgpgInterface::txtencryptfin(KProcess *) +void KgpgInterface::txtencryptfin(TDEProcess *) { if (!message.isEmpty()) emit txtencryptionfinished(message); @@ -328,7 +328,7 @@ void KgpgInterface::KgpgDecryptText(TQString text,TQStringList Options) decfinished=false; decok=false; badmdc=false; - KProcess *proc=new KProcess(); + TDEProcess *proc=new TDEProcess(); *proc<<"gpg"<<"--no-tty"<<"--no-secmem-warning"<<"--command-fd=0"<<"--status-fd=2"<<"--no-batch"<<"--utf8-strings"; for ( TQStringList::Iterator it = Options.begin(); it != Options.end(); ++it ) if (!TQFile::encodeName(*it).isEmpty()) *proc<< TQString(TQFile::encodeName(*it)); @@ -336,14 +336,14 @@ void KgpgInterface::KgpgDecryptText(TQString text,TQStringList Options) ///////// when process ends, update dialog infos - TQObject::connect(proc, TQT_SIGNAL(processExited(KProcess *)),this,TQT_SLOT(txtdecryptfin(KProcess *))); - connect(proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),this, TQT_SLOT(getOutput(KProcess *, char *, int))); - connect(proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)),this, TQT_SLOT(getCmdOutput(KProcess *, char *, int))); - proc->start(KProcess::NotifyOnExit,KProcess::All); + TQObject::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),this,TQT_SLOT(txtdecryptfin(TDEProcess *))); + connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),this, TQT_SLOT(getOutput(TDEProcess *, char *, int))); + connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),this, TQT_SLOT(getCmdOutput(TDEProcess *, char *, int))); + proc->start(TDEProcess::NotifyOnExit,TDEProcess::All); proc->writeStdin(text.utf8(), text.length()); } -void KgpgInterface::txtdecryptfin(KProcess *) +void KgpgInterface::txtdecryptfin(TDEProcess *) { if ((decok) && (!badmdc)) emit txtdecryptionfinished(message); @@ -358,13 +358,13 @@ emit txtdecryptionfailed(log); } -void KgpgInterface::getOutput(KProcess *, char *data, int ) +void KgpgInterface::getOutput(TDEProcess *, char *data, int ) { message.append(TQString::fromUtf8(data)); } -void KgpgInterface::getCmdOutput(KProcess *p, char *data, int ) +void KgpgInterface::getCmdOutput(TDEProcess *p, char *data, int ) { gpgOutput.append(TQString::fromUtf8(data)); log.append(data); @@ -450,12 +450,12 @@ void KgpgInterface::KgpgSignText(TQString text,TQString userIDs, TQStringList Op ///////// when process ends, update dialog infos - TQObject::connect(proc, TQT_SIGNAL(processExited(KProcess *)),this,TQT_SLOT(txtsignfin(KProcess *))); + TQObject::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),this,TQT_SLOT(txtsignfin(TDEProcess *))); TQObject::connect(proc,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(txtsignprocess(KProcIO *))); //emit txtsigningstarted(); - proc->start(KProcess::NotifyOnExit,false); + proc->start(TDEProcess::NotifyOnExit,false); /*if (useAgent) { kdDebug(2100)<<"Using Agent+++++++++++++"<start(KProcess::NotifyOnExit,KProcess::All); + connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),this,TQT_SLOT(txtdecryptfin(TDEProcess *))); + connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),this, TQT_SLOT(getOutput(TDEProcess *, char *, int))); + connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),this, TQT_SLOT(getCmdOutput(TDEProcess *, char *, int))); + proc->start(TDEProcess::NotifyOnExit,TDEProcess::All); } @@ -559,15 +559,15 @@ void KgpgInterface::KgpgVerifyText(TQString text) message=TQString(); KProcIO *verifyproc=new KProcIO(TQTextCodec::codecForLocale()); *verifyproc<<"gpg"<<"--no-secmem-warning"<<"--status-fd=2"<<"--command-fd=0"<<"--utf8-strings"<<"--verify"; - connect(verifyproc, TQT_SIGNAL(processExited(KProcess *)),this, TQT_SLOT(slotverifyresult(KProcess *))); + connect(verifyproc, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotverifyresult(TDEProcess *))); connect(verifyproc, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotverifyread(KProcIO *))); - verifyproc->start(KProcess::NotifyOnExit,true); + verifyproc->start(TDEProcess::NotifyOnExit,true); verifyproc->writeStdin (text); verifyproc->closeWhenDone(); } -void KgpgInterface::slotverifyresult(KProcess*) +void KgpgInterface::slotverifyresult(TDEProcess*) { if (signmiss) emit missingSignature(signID); else { @@ -705,14 +705,14 @@ void KgpgInterface::KgpgSignFile(TQString keyID,KURL srcUrl,TQStringList Options *proc<<"--output"<start(KProcess::NotifyOnExit,true); + proc->start(TDEProcess::NotifyOnExit,true); } -void KgpgInterface::signfin(KProcess *) +void KgpgInterface::signfin(TDEProcess *) { if (message.find("SIG_CREATED")!=-1) KMessageBox::information(0,i18n("The signature file %1 was successfully created.").arg(file.fileName())); @@ -778,9 +778,9 @@ void KgpgInterface::KgpgVerifyFile(KURL sigUrl,KURL srcUrl) *proc<start(KProcess::NotifyOnExit,true); + proc->start(TDEProcess::NotifyOnExit,true); } @@ -819,7 +819,7 @@ TQString required; } -void KgpgInterface::verifyfin(KProcess *) +void KgpgInterface::verifyfin(TDEProcess *) { if (!signmiss) { if (signID.isEmpty()) signID=i18n("No signature found."); @@ -860,8 +860,8 @@ void KgpgInterface::KgpgSignKey(TQString keyID,TQString signKeyID,TQString signK if (local) *conprocess<<"lsign"; else *conprocess<<"sign"; TQObject::connect(conprocess,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(sigprocess(KProcIO *))); - TQObject::connect(conprocess, TQT_SIGNAL(processExited(KProcess *)),this, TQT_SLOT(signover(KProcess *))); - conprocess->start(KProcess::NotifyOnExit,true); + TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(signover(TDEProcess *))); + conprocess->start(TDEProcess::NotifyOnExit,true); } void KgpgInterface::sigprocess(KProcIO *p) @@ -941,7 +941,7 @@ void KgpgInterface::sigprocess(KProcIO *p) } -void KgpgInterface::signover(KProcess *) +void KgpgInterface::signover(TDEProcess *) { if (signSuccess>1) emit signatureFinished(signSuccess); //// signature successful or bad passphrase @@ -957,8 +957,8 @@ void KgpgInterface::signover(KProcess *) void KgpgInterface::openSignConsole() { - KProcess conprocess; - KConfig *config = KGlobal::config(); + TDEProcess conprocess; + KConfig *config = TDEGlobal::config(); config->setGroup("General"); conprocess<< config->readPathEntry("TerminalApplication","konsole"); conprocess<<"-e"<<"gpg"; @@ -967,7 +967,7 @@ void KgpgInterface::openSignConsole() conprocess<<"--sign-key"<start(KProcess::NotifyOnExit,true); + TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(delsignover(TDEProcess *))); + conprocess->start(TDEProcess::NotifyOnExit,true); } @@ -1042,7 +1042,7 @@ void KgpgInterface::delsigprocess(KProcIO *p) } } -void KgpgInterface::delsignover(KProcess *) +void KgpgInterface::delsignover(TDEProcess *) { emit delsigfinished(deleteSuccess); } @@ -1085,8 +1085,8 @@ void KgpgInterface::KgpgKeyExpire(TQString keyID,TQDate date,bool unlimited) *conprocess<<"gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--command-fd=0"<<"--status-fd=2"<<"--utf8-strings"; *conprocess<<"--edit-key"<start(KProcess::NotifyOnExit,KProcess::AllOutput); + TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(expover(TDEProcess *))); + conprocess->start(TDEProcess::NotifyOnExit,TDEProcess::AllOutput); } @@ -1150,7 +1150,7 @@ void KgpgInterface::expprocess(KProcIO *p) -void KgpgInterface::expover(KProcess *) +void KgpgInterface::expover(TDEProcess *) { if ((expSuccess==3) || (expSuccess==2)) emit expirationFinished(expSuccess); //// signature successful or bad passphrase @@ -1179,8 +1179,8 @@ void KgpgInterface::KgpgTrustExpire(TQString keyID,int keyTrust) *conprocess<<"gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--command-fd=0"<<"--status-fd=2"<<"--utf8-strings"; *conprocess<<"--edit-key"<start(KProcess::NotifyOnExit,true); + TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(trustover(TDEProcess *))); + conprocess->start(TDEProcess::NotifyOnExit,true); } @@ -1217,7 +1217,7 @@ void KgpgInterface::trustprocess(KProcIO *p) -void KgpgInterface::trustover(KProcess *) +void KgpgInterface::trustover(TDEProcess *) { emit trustfinished(); } @@ -1235,8 +1235,8 @@ void KgpgInterface::KgpgChangePass(TQString keyID) *conprocess<<"gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--no-use-agent"<<"--command-fd=0"<<"--status-fd=2"<<"--utf8-strings"; *conprocess<<"--edit-key"<start(KProcess::NotifyOnExit,KProcess::AllOutput); + TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(passover(TDEProcess *))); + conprocess->start(TDEProcess::NotifyOnExit,TDEProcess::AllOutput); } @@ -1318,7 +1318,7 @@ void KgpgInterface::passprocess(KProcIO *p) -void KgpgInterface::passover(KProcess *) +void KgpgInterface::passover(TDEProcess *) { //emit trustfinished(); } @@ -1339,7 +1339,7 @@ TQString KgpgInterface::getKey(TQStringList IDs, bool attributes) for ( TQStringList::Iterator it = IDs.begin(); it != IDs.end(); ++it ) *proc << *it; TQObject::connect(proc, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotReadKey(KProcIO *))); - proc->start(KProcess::Block,false); + proc->start(TDEProcess::Block,false); return keyString; } @@ -1364,9 +1364,9 @@ void KgpgInterface::importKeyURL(KURL url) *conprocess<< "gpg"<<"--no-tty"<<"--no-secmem-warning"<<"--status-fd=2"<<"--utf8-strings"<<"--import"; *conprocess<<"--allow-secret-key-import"; *conprocess<start(KProcess::NotifyOnExit,true); + conprocess->start(TDEProcess::NotifyOnExit,true); } } @@ -1377,14 +1377,14 @@ void KgpgInterface::importKey(TQString keystr) KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); *conprocess<< "gpg"<<"--no-tty"<<"--no-secmem-warning"<<"--status-fd=2"<<"--import"; *conprocess<<"--allow-secret-key-import"; - TQObject::connect(conprocess, TQT_SIGNAL(processExited(KProcess *)),this, TQT_SLOT(importover(KProcess *))); + TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(importover(TDEProcess *))); TQObject::connect(conprocess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(importprocess(KProcIO *))); - conprocess->start(KProcess::NotifyOnExit,true); + conprocess->start(TDEProcess::NotifyOnExit,true); conprocess->writeStdin(keystr, true); conprocess->closeWhenDone(); } -void KgpgInterface::importover(KProcess *) +void KgpgInterface::importover(TDEProcess *) { TQStringList importedKeysIds; TQStringList messageList; @@ -1448,7 +1448,7 @@ kdDebug(2100)<<"Importing is over"<start(KProcess::NotifyOnExit,true); + conprocess->start(TDEProcess::NotifyOnExit,true); } -void KgpgInterface::adduidover(KProcess *) +void KgpgInterface::adduidover(TDEProcess *) { if (addSuccess) emit addUidFinished(); else emit addUidError(output); @@ -1564,9 +1564,9 @@ userIDs=keyID; KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); *conprocess<< "gpg"<<"--no-tty"<<"--status-fd=2"<<"--command-fd=0"; *conprocess<<"--with-colon"<<"--list-keys"<start(KProcess::NotifyOnExit,true); + conprocess->start(TDEProcess::NotifyOnExit,true); } void KgpgInterface::photoreadprocess(KProcIO *p) @@ -1579,7 +1579,7 @@ void KgpgInterface::photoreadprocess(KProcIO *p) } -void KgpgInterface::photoreadover(KProcess *) +void KgpgInterface::photoreadover(TDEProcess *) { for (int i=1;istart(KProcess::Block); + conprocess->start(TDEProcess::Block); if (kgpginfotmp->file()->size()>0) { kgpginfotmp->unlink(); @@ -1613,12 +1613,12 @@ void KgpgInterface::KgpgDeletePhoto(TQString keyID,TQString uid) KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); *conprocess<< "gpg"<<"--no-tty"<<"--status-fd=2"<<"--command-fd=0"<<"--utf8-strings"; *conprocess<<"--edit-key"<start(KProcess::NotifyOnExit,true); + conprocess->start(TDEProcess::NotifyOnExit,true); } -void KgpgInterface::delphotoover(KProcess *) +void KgpgInterface::delphotoover(TDEProcess *) { if (delSuccess) emit delPhotoFinished(); else emit delPhotoError(output); @@ -1676,12 +1676,12 @@ addSuccess=true; KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); *conprocess<< "gpg"<<"--no-tty"<<"--status-fd=2"<<"--command-fd=0"<<"--utf8-strings"; *conprocess<<"--edit-key"<start(KProcess::NotifyOnExit,true); + conprocess->start(TDEProcess::NotifyOnExit,true); } -void KgpgInterface::addphotoover(KProcess *) +void KgpgInterface::addphotoover(TDEProcess *) { if (addSuccess) emit addPhotoFinished(); else emit addPhotoError(output); @@ -1757,12 +1757,12 @@ void KgpgInterface::KgpgRevokeKey(TQString keyID,TQString revokeUrl,int reason,T if (!revokeUrl.isEmpty()) *conprocess<<"-o"<start(KProcess::NotifyOnExit,true); + conprocess->start(TDEProcess::NotifyOnExit,true); } -void KgpgInterface::revokeover(KProcess *) +void KgpgInterface::revokeover(TDEProcess *) { if (!revokeSuccess) KMessageBox::detailedSorry(0,i18n("Creation of the revocation certificate failed..."),output); diff --git a/kgpg/kgpginterface.h b/kgpg/kgpginterface.h index da0d0f1..2433c72 100644 --- a/kgpg/kgpginterface.h +++ b/kgpg/kgpginterface.h @@ -26,7 +26,7 @@ class TQLabel; class KProcIO; -class KProcess; +class TDEProcess; class KLed; /** @@ -84,7 +84,7 @@ public slots: void KgpgVerifyText(TQString text); void slotverifyread(KProcIO *p); - void slotverifyresult(KProcess*); + void slotverifyresult(TDEProcess*); /**Import key function @@ -124,15 +124,15 @@ public slots: */ //static TQString KgpgDecryptText(TQString text,TQString userID); void KgpgDecryptText(TQString text,TQStringList Options=TQString()); - void txtdecryptfin(KProcess *); + void txtdecryptfin(TDEProcess *); /**Extract list of photographic user id's * @param keyID the recipients key id's. */ void KgpgGetPhotoList(TQString keyID); - void getOutput(KProcess *, char *data, int ); - void getCmdOutput(KProcess *p, char *data, int ); + void getOutput(TDEProcess *, char *data, int ); + void getCmdOutput(TDEProcess *p, char *data, int ); TQString getKey(TQStringList IDs, bool attributes); @@ -141,7 +141,7 @@ public slots: void KgpgChangePass(TQString keyID); void KgpgRevokeKey(TQString keyID,TQString revokeUrl,int reason,TQString description); - void revokeover(KProcess *); + void revokeover(TDEProcess *); void revokeprocess(KProcIO *p); void KgpgDeletePhoto(TQString keyID,TQString uid); void KgpgAddPhoto(TQString keyID,TQString imagePath); @@ -173,7 +173,7 @@ private slots: /** * Checks output of the signature process */ - void signover(KProcess *); + void signover(TDEProcess *); /** * Read output of the signature process */ @@ -182,17 +182,17 @@ private slots: /** * Checks if the encrypted file was saved. */ - void encryptfin(KProcess *); + void encryptfin(TDEProcess *); /** * Checks if the decrypted file was saved. */ - void decryptfin(KProcess *); + void decryptfin(TDEProcess *); /** * Checks if the signing was successful. */ - void signfin(KProcess *p); + void signfin(TDEProcess *p); /** * Checks the number of uid's for a key-> if greater than one, key signature will switch to konsole mode @@ -206,12 +206,12 @@ private slots: /** * Checks output of the delete signature process */ - void delsignover(KProcess *p); + void delsignover(TDEProcess *p); /** * Checks output of the import process */ - void importURLover(KProcess *p); - void importover(KProcess *); + void importURLover(TDEProcess *p); + void importover(TDEProcess *); /** * Read output of the import process */ @@ -235,37 +235,37 @@ private slots: /** * Checks output of the verify process */ - void verifyfin(KProcess *p); + void verifyfin(TDEProcess *p); void expprocess(KProcIO *p); - void expover(KProcess*); + void expover(TDEProcess*); void trustprocess(KProcIO *p); void passprocess(KProcIO *p); - void trustover(KProcess *); - void passover(KProcess *); + void trustover(TDEProcess *); + void passover(TDEProcess *); void txtreadencprocess(KProcIO *p); - void txtencryptfin(KProcess *); + void txtencryptfin(TDEProcess *); - void delphotoover(KProcess *); + void delphotoover(TDEProcess *); void delphotoprocess(KProcIO *p); - void addphotoover(KProcess *); + void addphotoover(TDEProcess *); void addphotoprocess(KProcIO *p); - void adduidover(KProcess *); + void adduidover(TDEProcess *); void adduidprocess(KProcIO *p); void slotReadKey(KProcIO *p); - void photoreadover(KProcess *); + void photoreadover(TDEProcess *); void photoreadprocess(KProcIO *p); bool isPhotoId(int uid); void updateIDs(TQString txtString); void txtsignprocess(KProcIO *p); - void txtsignfin(KProcess *); + void txtsignfin(TDEProcess *); - //void txtdecryptfin(KProcess *); + //void txtdecryptfin(TDEProcess *); signals: diff --git a/kgpg/kgpglibrary.cpp b/kgpg/kgpglibrary.cpp index 418c53e..0f3e66a 100644 --- a/kgpg/kgpglibrary.cpp +++ b/kgpg/kgpglibrary.cpp @@ -122,7 +122,7 @@ void KgpgLibrary::processpopup2(TQString fileName) { //pop->setTimeout(0); - pop->setView(i18n("Processing encryption (%1)").arg(fileName),i18n("Please wait..."),KGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop)); + pop->setView(i18n("Processing encryption (%1)").arg(fileName),i18n("Please wait..."),TDEGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop)); pop->show(); /*TQRect qRect(TQApplication::desktop()->screenGeometry()); int iXpos=qRect.width()/2-pop->width()/2; @@ -154,7 +154,7 @@ void KgpgLibrary::slotShredResult( KIO::Job * job ) { job->showErrorDialog( (TQWidget*)parent() ); emit systemMessage(TQString(),true); - KPassivePopup::message(i18n("KGpg Error"),i18n("Process halted, not all files were shredded."),KGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop),panel,"kgpg_error",0); + KPassivePopup::message(i18n("KGpg Error"),i18n("Process halted, not all files were shredded."),TDEGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop),panel,"kgpg_error",0); } } @@ -194,7 +194,7 @@ void KgpgLibrary::processpopup(TQString fileName) { emit systemMessage(i18n("Decrypting %1").arg(fileName)); pop->setTimeout(0); - pop->setView(i18n("Processing decryption"),i18n("Please wait..."),KGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop)); + pop->setView(i18n("Processing decryption"),i18n("Please wait..."),TDEGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop)); pop->show(); TQRect qRect(TQApplication::desktop()->screenGeometry()); int iXpos=qRect.width()/2-pop->width()/2; diff --git a/kgpg/kgpgoptions.cpp b/kgpg/kgpgoptions.cpp index 211fb77..85a0e75 100644 --- a/kgpg/kgpgoptions.cpp +++ b/kgpg/kgpgoptions.cpp @@ -96,8 +96,8 @@ kdDebug(2100)<<"Adding pages"<shredInfo->setText(i18n( "

You must be aware that shredding is not secure on all file systems, and that parts of the file may have been saved in a temporary file or in the spooler of your printer if you previously opened it in an editor or tried to print it. Only works on files (not on folders).

")); page7->groupShred->adjustSize(); - pixkeySingle=KGlobal::iconLoader()->loadIcon("kgpg_key1",KIcon::Small,20); - pixkeyDouble=KGlobal::iconLoader()->loadIcon("kgpg_key2",KIcon::Small,20); + pixkeySingle=TDEGlobal::iconLoader()->loadIcon("kgpg_key1",KIcon::Small,20); + pixkeyDouble=TDEGlobal::iconLoader()->loadIcon("kgpg_key2",KIcon::Small,20); addPage(page1, i18n("Encryption"), "encrypted"); addPage(page2, i18n("Decryption"), "decrypted"); addPage(page3, i18n("Appearance"), "looknfeel"); @@ -197,7 +197,7 @@ if (!gpgHome.endsWith("/")) gpgHome.append("/"); { KProcIO *p=new KProcIO(); *p<<"gpg"<<"--homedir"<start(KProcess::Block); //// start gnupg so that it will create a config file + p->start(TDEProcess::Block); //// start gnupg so that it will create a config file confPath="gpg.conf"; TQFile confFile(gpgHome+confPath); if (!confFile.open(IO_WriteOnly)) diff --git a/kgpg/listkeys.cpp b/kgpg/listkeys.cpp index f09d6ac..c761552 100644 --- a/kgpg/listkeys.cpp +++ b/kgpg/listkeys.cpp @@ -167,8 +167,8 @@ int UpdateViewItem :: compare( TQListViewItem * item, int c, bool ascending ) c { int rc = 0; if ((c==3) || (c==5)) { - TQDate d = KGlobal::locale()->readDate(text(c)); - TQDate itemDate = KGlobal::locale()->readDate(item->text(c)); + TQDate d = TDEGlobal::locale()->readDate(text(c)); + TQDate itemDate = TDEGlobal::locale()->readDate(item->text(c)); bool itemDateValid = itemDate.isValid(); if (d.isValid()) { if (itemDateValid) { @@ -219,7 +219,7 @@ KDialogBase( parent, name, true,i18n("Private Key List"),Ok | Cancel) TQString keyname; page = new TQWidget(this); TQLabel *labeltxt; - KIconLoader *loader = KGlobal::iconLoader(); + KIconLoader *loader = TDEGlobal::iconLoader(); keyPair=loader->loadIcon("kgpg_key2",KIcon::Small,20); setMinimumSize(350,100); @@ -395,7 +395,7 @@ TQString KgpgSelKey::getkeyMail() KeyView::KeyView( TQWidget *parent, const char *name ) : KListView( parent, name ) { - KIconLoader *loader = KGlobal::iconLoader(); + KIconLoader *loader = TDEGlobal::iconLoader(); pixkeyOrphan=loader->loadIcon("kgpg_key4",KIcon::Small,20); pixkeyGroup=loader->loadIcon("kgpg_key3",KIcon::Small,20); @@ -680,7 +680,7 @@ listKeys::listKeys(TQWidget *parent, const char *name) : DCOPObject( "KeyInterfa newContact->setEnabled(false); setCentralWidget(keysList2); - keysList2->restoreLayout(KGlobal::config(), "KeyView"); + keysList2->restoreLayout(TDEGlobal::config(), "KeyView"); TQObject::connect(keysList2,TQT_SIGNAL(returnPressed(TQListViewItem *)),TQT_TQOBJECT(this),TQT_SLOT(listsigns())); TQObject::connect(keysList2,TQT_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint &,int)),TQT_TQOBJECT(this),TQT_SLOT(listsigns())); @@ -889,13 +889,13 @@ void listKeys::slotDelUid() while (item->depth()>0) item=item->parent(); - KProcess *conprocess=new KProcess(); - KConfig *config = KGlobal::config(); + TDEProcess *conprocess=new TDEProcess(); + KConfig *config = TDEGlobal::config(); config->setGroup("General"); *conprocess<< config->readPathEntry("TerminalApplication","konsole"); *conprocess<<"-e"<<"gpg"; *conprocess<<"--edit-key"<text(6)<<"uid"; - conprocess->start(KProcess::Block); + conprocess->start(TDEProcess::Block); keysList2->refreshselfkey(); } @@ -1475,7 +1475,7 @@ void listKeys::slotexportsec() KProcIO *p=new KProcIO(TQTextCodec::codecForLocale()); *p<<"gpg"<<"--no-tty"<<"--output"<currentItem()->text(6); - p->start(KProcess::Block); + p->start(TDEProcess::Block); if (fgpg.exists()) KMessageBox::information(this,i18n("Your PRIVATE key \"%1\" was successfully exported.\nDO NOT leave it in an insecure place.").arg(url.path())); @@ -1551,7 +1551,7 @@ void listKeys::slotexport() *p<<(exportList.at(i)->text(6)).stripWhiteSpace(); - p->start(KProcess::Block); + p->start(TDEProcess::Block); if (fgpg.exists()) KMessageBox::information(this,i18n("Your public key \"%1\" was successfully exported\n").arg(expname)); else @@ -1611,7 +1611,7 @@ void listKeys::slotShowPhoto() //KMessageBox::sorry(0,ptr->desktopEntryName()); KProcIO *p=new KProcIO(TQTextCodec::codecForLocale()); *p<<"gpg"<<"--no-tty"<<"--photo-viewer"<desktopEntryName()+" %i"))<<"--edit-key"<currentItem()->parent()->text(6)<<"uid"<currentItem()->text(6)<<"showphoto"<<"quit"; - p->start(KProcess::DontCare,true); + p->start(TDEProcess::DontCare,true); } void listKeys::listsigns() @@ -1778,8 +1778,8 @@ void listKeys::editGroup() KDialogBase *dialogGroupEdit=new KDialogBase(KDialogBase::Swallow, i18n("Group Properties"), KDialogBase::Ok | KDialogBase::Cancel,KDialogBase::Ok,this,0,true); gEdit=new groupEdit(); - gEdit->buttonAdd->setPixmap(KGlobal::iconLoader()->loadIcon("down",KIcon::Small,20)); - gEdit->buttonRemove->setPixmap(KGlobal::iconLoader()->loadIcon("up",KIcon::Small,20)); + gEdit->buttonAdd->setPixmap(TDEGlobal::iconLoader()->loadIcon("down",KIcon::Small,20)); + gEdit->buttonRemove->setPixmap(TDEGlobal::iconLoader()->loadIcon("up",KIcon::Small,20)); connect(gEdit->buttonAdd,TQT_SIGNAL(clicked()),TQT_TQOBJECT(this),TQT_SLOT(groupAdd())); connect(gEdit->buttonRemove,TQT_SIGNAL(clicked()),TQT_TQOBJECT(this),TQT_SLOT(groupRemove())); @@ -1919,9 +1919,9 @@ void listKeys::signkey() if (!terminalSign->isChecked()) signLoop(); else { - KProcess kp; + TDEProcess kp; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("General"); kp<< config->readPathEntry("TerminalApplication","konsole"); kp<<"-e" @@ -1935,7 +1935,7 @@ void listKeys::signkey() kp<<"lsign"; else kp<<"sign"; - kp.start(KProcess::Block); + kp.start(TDEProcess::Block); keysList2->refreshcurrentkey(keysList2->currentItem()); } } @@ -2095,9 +2095,9 @@ void listKeys::slotedit() if (keysList2->currentItem()->text(6).isEmpty()) return; - KProcess kp; + TDEProcess kp; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("General"); kp<< config->readPathEntry("TerminalApplication","konsole"); kp<<"-e" @@ -2107,7 +2107,7 @@ void listKeys::slotedit() <<"--edit-key" <currentItem()->text(6) <<"help"; - kp.start(KProcess::Block); + kp.start(TDEProcess::Block); keysList2->refreshcurrentkey(keysList2->currentItem()); } @@ -2149,7 +2149,7 @@ void listKeys::slotgenkey() TQWidget *wid=new TQWidget(pop); TQVBoxLayout *vbox=new TQVBoxLayout(wid,3); - TQVBox *passiveBox=pop->standardView(i18n("Generating new key pair."),TQString(),KGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop),wid); + TQVBox *passiveBox=pop->standardView(i18n("Generating new key pair."),TQString(),TDEGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop),wid); TQMovie anim; @@ -2179,8 +2179,8 @@ void listKeys::slotgenkey() //*proc<<"gpg"<<"--no-tty"<<"--no-secmem-warning"<<"--batch"<<"--passphrase-fd"<start(KProcess::NotifyOnExit,true); + TQObject::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),TQT_TQOBJECT(this), TQT_SLOT(genover(TDEProcess *))); + proc->start(TDEProcess::NotifyOnExit,true); if (ktype=="RSA") proc->writeStdin(TQString("Key-Type: 1")); @@ -2214,15 +2214,15 @@ void listKeys::slotgenkey() proc->closeWhenDone(); } else ////// start expert (=konsole) mode { - KProcess kp; + TDEProcess kp; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("General"); kp<< config->readPathEntry("TerminalApplication","konsole"); kp<<"-e" <<"gpg" <<"--gen-key"; - kp.start(KProcess::Block); + kp.start(TDEProcess::Block); refreshkey(); } } @@ -2240,7 +2240,7 @@ void listKeys::readgenprocess(KProcIO *p) // sample: [GNUPG:] KEY_CREATED B 156A4305085A58C01E2988229282910254D1B368 } -void listKeys::genover(KProcess *) +void listKeys::genover(TDEProcess *) { newkeyID=TQString(); continueSearch=true; @@ -2248,8 +2248,8 @@ void listKeys::genover(KProcess *) *conprocess<< "gpg"; *conprocess<<"--no-secmem-warning"<<"--with-colons"<<"--fingerprint"<<"--list-keys"<start(KProcess::NotifyOnExit,true); + TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),TQT_TQOBJECT(this), TQT_SLOT(newKeyDone(TDEProcess *))); + conprocess->start(TDEProcess::NotifyOnExit,true); } @@ -2270,7 +2270,7 @@ void listKeys::slotReadFingerProcess(KProcIO *p) } -void listKeys::newKeyDone(KProcess *) +void listKeys::newKeyDone(TDEProcess *) { changeMessage(i18n("Ready"),0); // refreshkey(); @@ -2351,15 +2351,15 @@ void listKeys::deleteseckey() if (result!=KMessageBox::Continue) return; - KProcess *conprocess=new KProcess(); - KConfig *config = KGlobal::config(); + TDEProcess *conprocess=new TDEProcess(); + KConfig *config = TDEGlobal::config(); config->setGroup("General"); *conprocess<< config->readPathEntry("TerminalApplication","konsole"); *conprocess<<"-e"<<"gpg" <<"--no-secmem-warning" <<"--delete-secret-key"<currentItem()->text(6); - TQObject::connect(conprocess, TQT_SIGNAL(processExited(KProcess *)),TQT_TQOBJECT(this), TQT_SLOT(reloadSecretKeys())); - conprocess->start(KProcess::NotifyOnExit,KProcess::AllOutput); + TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),TQT_TQOBJECT(this), TQT_SLOT(reloadSecretKeys())); + conprocess->start(TDEProcess::NotifyOnExit,TDEProcess::AllOutput); } void listKeys::reloadSecretKeys() @@ -2425,7 +2425,7 @@ void listKeys::deletekey() TQPtrList exportList=keysList2->selectedItems(); if (exportList.count()==0) return; - KProcess gp; + TDEProcess gp; gp << "gpg" << "--no-tty" << "--no-secmem-warning" @@ -2435,7 +2435,7 @@ void listKeys::deletekey() for ( uint i = 0; i < exportList.count(); ++i ) if ( exportList.at(i) ) gp<<(exportList.at(i)->text(6)).stripWhiteSpace(); - gp.start(KProcess::Block); + gp.start(TDEProcess::Block); for ( uint i = 0; i < exportList.count(); ++i ) if ( exportList.at(i) ) @@ -2520,7 +2520,7 @@ TQPixmap KeyView::slotGetPhoto(TQString photoId,bool mini) TQString popt="cp %i "+phototmp->name(); KProcIO *p=new KProcIO(TQTextCodec::codecForLocale()); *p<<"gpg"<<"--show-photos"<<"--photo-viewer"<start(KProcess::Block); + p->start(TDEProcess::Block); TQPixmap pixmap; @@ -2580,7 +2580,7 @@ void KeyView::expandKey(TQListViewItem *item) KProcIO *p=new KProcIO(TQTextCodec::codecForLocale()); *p<<"gpg"<<"--no-tty"<<"--photo-viewer"<text(6)<<"uid"<start(KProcess::Block); + p->start(TDEProcess::Block); TQPixmap pixmap; pixmap.load(kgpgphototmp->name()); TQImage dup=pixmap.convertToImage(); @@ -3047,7 +3047,7 @@ gpgKey KeyView::extractKey(TQString keyColon) ret.gpgkeycreation=keyString[5]; if(!ret.gpgkeycreation.isEmpty()) { TQDate date = TQDate::fromString(ret.gpgkeycreation, Qt::ISODate); - ret.gpgkeycreation=KGlobal::locale()->formatDate(date, true); + ret.gpgkeycreation=TDEGlobal::locale()->formatDate(date, true); } TQString tid=keyString[4]; ret.gpgkeyid=TQString("0x"+tid.right(8)); @@ -3056,7 +3056,7 @@ gpgKey KeyView::extractKey(TQString keyColon) ret.gpgkeyexpiration=i18n("Unlimited"); else { TQDate date = TQDate::fromString(ret.gpgkeyexpiration, Qt::ISODate); - ret.gpgkeyexpiration=KGlobal::locale()->formatDate(date, true); + ret.gpgkeyexpiration=TDEGlobal::locale()->formatDate(date, true); } TQString fullname=keyString[9]; if (fullname.find("<")!=-1) { diff --git a/kgpg/listkeys.h b/kgpg/listkeys.h index 13f0bf1..c006198 100644 --- a/kgpg/listkeys.h +++ b/kgpg/listkeys.h @@ -41,7 +41,7 @@ class TQLabel; class TQCheckbox; class KStatusBar; class KPassivePopup; -class KProcess; +class TDEProcess; class KProcIO; class TQEvent; class KTempFile; @@ -236,7 +236,7 @@ private slots: void slotSetPhotoSize(int size); void slotShowPhoto(); void readgenprocess(KProcIO *p); - void newKeyDone(KProcess *); + void newKeyDone(TDEProcess *); void slotrevoke(TQString keyID,TQString revokeUrl,int reason,TQString description); void revokeWidget(); void doFilePrint(TQString url); @@ -251,7 +251,7 @@ private slots: void slotProcessExportMail(TQString keys); void slotProcessExportClip(TQString keys); void readOptions(); - void genover(KProcess *p); + void genover(TDEProcess *p); void showOptions(); void slotSetDefKey(); void slotSetDefaultKey(TQListViewItem *newdef); diff --git a/kgpg/popuppublic.cpp b/kgpg/popuppublic.cpp index e079540..c4f436f 100644 --- a/kgpg/popuppublic.cpp +++ b/kgpg/popuppublic.cpp @@ -100,7 +100,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent if (KGpgSettings::allowCustomEncryptionOptions()) customOptions=KGpgSettings::customEncryptionOptions(); - KIconLoader *loader = KGlobal::iconLoader(); + KIconLoader *loader = TDEGlobal::iconLoader(); keyPair=loader->loadIcon("kgpg_key2",KIcon::Small,20); keySingle=loader->loadIcon("kgpg_key1",KIcon::Small,20); @@ -337,9 +337,9 @@ void popupPublic::refreshkeys() KProcIO *encid=new KProcIO(TQTextCodec::codecForLocale()); *encid << "gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--with-colon"<<"--list-keys"; ///////// when process ends, update dialog infos - TQObject::connect(encid, TQT_SIGNAL(processExited(KProcess *)),this, TQT_SLOT(slotpreselect())); + TQObject::connect(encid, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotpreselect())); TQObject::connect(encid, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotprocread(KProcIO *))); - encid->start(KProcess::NotifyOnExit,true); + encid->start(TDEProcess::NotifyOnExit,true); } void popupPublic::slotpreselect() -- cgit v1.2.1