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 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'kgpg/keyinfowidget.cpp') 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); } } -- cgit v1.2.1