diff options
Diffstat (limited to 'kgpg')
36 files changed, 510 insertions, 727 deletions
diff --git a/kgpg/CMakeL10n.txt b/kgpg/CMakeL10n.txt index ebaaf9f..c36f3ca 100644 --- a/kgpg/CMakeL10n.txt +++ b/kgpg/CMakeL10n.txt @@ -4,3 +4,9 @@ tde_l10n_create_template( CATALOG "kgpg" SOURCES "." "tips" ) + +tde_l10n_create_template( + CATALOG "desktop_files/kgpg-desktops/" + SOURCES *.desktop + DESTINATION "${CMAKE_SOURCE_DIR}/translations" +) diff --git a/kgpg/CMakeLists.txt b/kgpg/CMakeLists.txt index 3121421..7f6540b 100644 --- a/kgpg/CMakeLists.txt +++ b/kgpg/CMakeLists.txt @@ -57,11 +57,13 @@ install( FILES kgpg_anim.gif kgpg_docked.png DESTINATION ${DATA_INSTALL_DIR}/kgpg/pics ) -install( FILES kgpg.desktop - DESTINATION ${XDG_APPS_INSTALL_DIR} +tde_create_translated_desktop( + SOURCE kgpg.desktop + PO_DIR kgpg-desktops ) -install( FILES kgpg.desktop +install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/kgpg.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} ) @@ -69,13 +71,12 @@ install( FILES kgpg.rc listkeys.rc tips DESTINATION ${DATA_INSTALL_DIR}/kgpg ) -install( FILES encryptfile.desktop - encryptfolder.desktop - DESTINATION - ${DATA_INSTALL_DIR}/konqueror/servicemenus +tde_create_translated_desktop( + SOURCE encryptfile.desktop encryptfolder.desktop + DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus + PO_DIR kgpg-desktops ) install( FILES kgpg.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) - diff --git a/kgpg/Makefile.am b/kgpg/Makefile.am index e4b78eb..9191bb2 100644 --- a/kgpg/Makefile.am +++ b/kgpg/Makefile.am @@ -37,7 +37,7 @@ KDE_ICON = kgpg messages: rc.cpp $(PREPARETIPS) > tips.txt - LIST=`find . -name \*.h -o -name \*.txt -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \ + LIST=`find . -name \*.h -o -name \*.txt -o -name \*.cpp; \ if test -n "$$LIST"; then \ $(XGETTEXT) $$LIST -o $(podir)/kgpg.pot; \ fi diff --git a/kgpg/conf_decryption.ui b/kgpg/conf_decryption.ui index 9cdee30..911b158 100644 --- a/kgpg/conf_decryption.ui +++ b/kgpg/conf_decryption.ui @@ -62,9 +62,9 @@ </widget> </grid> </widget> -<Q_SLOTS> +<slots> <slot>use_agent_toggled( bool isOn )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/kgpg/conf_encryption.ui b/kgpg/conf_encryption.ui index f64556a..1ac4d56 100644 --- a/kgpg/conf_encryption.ui +++ b/kgpg/conf_encryption.ui @@ -28,10 +28,7 @@ <cstring>kcfg_PgpCompatibility</cstring> </property> <property name="text"> - <string>PGP 6 compatibility</string> - </property> - <property name="accel"> - <string>Alt+6</string> + <string>PGP &6 compatibility</string> </property> <property name="whatsThis" stdset="0"> <string><qt><b>PGP 6 compatibility:</b><br /> @@ -312,8 +309,8 @@ <include location="global" impldecl="in implementation">klineedit.h</include> <include location="global" impldecl="in implementation">kpushbutton.h</include> </includes> -<Q_SLOTS> +<slots> <slot>allow_custom_option_toggled( bool isOn )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kgpg/conf_gpg.ui b/kgpg/conf_gpg.ui index ed91a8a..dea46e2 100644 --- a/kgpg/conf_gpg.ui +++ b/kgpg/conf_gpg.ui @@ -208,9 +208,7 @@ <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> <include location="global" impldecl="in implementation">kurlrequester.h</include> </includes> -<includehints> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> diff --git a/kgpg/encryptfile.desktop b/kgpg/encryptfile.desktop index 382fa3d..ef2a691 100644 --- a/kgpg/encryptfile.desktop +++ b/kgpg/encryptfile.desktop @@ -5,58 +5,5 @@ Actions=encrypt [Desktop Action encrypt] Name=Encrypt File -Name[ar]=تشفير ملف -Name[bg]=Шифроване на файл -Name[br]=E&nrinegañ ar restr -Name[bs]=Šifriraj datoteku -Name[ca]=Xifra fitxer -Name[cs]=Zašifrovat soubor -Name[cy]=Cêl-ysgrifo Ffeil -Name[da]=Indkod fil -Name[de]=Datei verschlüsseln -Name[el]=Κρυπτογράφηση αρχείου -Name[eo]=Ĉifri dosieron -Name[es]=Cifrar archivo -Name[et]=Krüpti fail -Name[eu]=Fitxategiak Zifratu -Name[fa]=رمزبندی پرونده -Name[fi]=Salaa tiedosto -Name[fr]=Chiffrer le fichier -Name[ga]=Criptigh Comhad -Name[he]=הצפן קובץ -Name[hi]=एनक्रिप्ट फ़ाइल -Name[hu]=Fájl titkosítása -Name[is]=Dulrita skrá -Name[it]=Cifratura file -Name[ja]=ファイルを暗号化 -Name[ka]=დაილის დაშიფრვა -Name[kk]=Файлды шифрлау -Name[km]=អ៊ិនគ្រីបឯកសារ -Name[lt]=Šifruoti bylą -Name[mk]=Криптирај датотеки -Name[nb]=Krypter fil -Name[nds]=Dateiverslöteln -Name[ne]=फाइल गुप्तीकरण गर्नुहोस् -Name[nl]=Bestand versleutelen -Name[nn]=Krypter fil -Name[pa]=ਇੰਕਰਿਪਟ ਫਾਇਲ -Name[pl]=Zaszyfruj plik -Name[pt]=Cifrar Ficheiro -Name[pt_BR]=Criptografar Arquivo -Name[ro]=Criptează fişierul -Name[ru]=Зашифровать файл -Name[sk]=Šifrovať súbor -Name[sl]=Šifriraj datoteko -Name[sr]=Шифруј фајл -Name[sr@Latn]=Šifruj fajl -Name[sv]=Kryptera fil -Name[ta]=சங்கேத கோப்பு -Name[tg]=Рамзкунонии Файл -Name[tr]=Dosya Şifrele -Name[uk]=Зашифрувати файл -Name[wa]=Ecripter fitchî -Name[zh_CN]=加密文件 -Name[zh_TW]=加密檔案 Icon=kgpg Exec=kgpg -e %F - diff --git a/kgpg/encryptfolder.desktop b/kgpg/encryptfolder.desktop index 0945f9b..f5ac017 100644 --- a/kgpg/encryptfolder.desktop +++ b/kgpg/encryptfolder.desktop @@ -4,49 +4,5 @@ Actions=encrypt [Desktop Action encrypt] Name=Archive & Encrypt Folder -Name[ar]=أرشفة و تشفير مجلّد -Name[bg]=Архивиране и шифроване на директория -Name[bs]=Arhiviraj i šifriraj direktorij -Name[ca]=Arxiva i xifra la carpeta -Name[cs]=Archivovat a zašifrovat složku -Name[da]=Arkivér & kryptér mappe -Name[de]=Ordner packen und verschlüsseln -Name[el]=Αρχειοθέτηση & κρυπτογράφηση φακέλου -Name[eo]=Arkivigi kaj ĉifri dosierujon -Name[es]=Archivar y cifrar carpeta -Name[et]=Arhiveeri ja krüpti kataloog -Name[eu]=Artxibatu eta enkriptatu karpeta -Name[fa]=بایگانی و رمزبندی پوشه -Name[fi]=Pakkaa ja salaa kansio -Name[fr]=Archiver puis chiffrer le dossier -Name[ga]=Cuir Fillteán i gCartlann & Criptigh É -Name[he]=כלי להצפנה וכיווץ תקייה -Name[hu]=Könyvtár titkosítása és archiválása -Name[is]=Pakka og dulrita möppu -Name[it]=Archivia e cifra cartella -Name[ja]=フォルダをアーカイブ化 & 暗号化 -Name[ka]=არქივი და დაშიფრვის საქაღალდე -Name[kk]=Қапшықты архивтеп шифрлау -Name[km]=ថតប័ណ្ណសារ & អ៊ិនគ្រីប -Name[lt]=Archyvuoti ir šifruoti aplanką -Name[nb]=Arkiver og krypter mappe -Name[nds]=Ornern komprimeren un verslöteln -Name[ne]=फोल्डरलाई सङ्ग्रह र गुप्तीकरण गर्नुहोस् -Name[nl]=Map archiveren en versleutelen -Name[nn]=Arkiver og krypter mappe -Name[pa]=ਆਕੀਵੀ & ਇੰਕਰਿਪਟ ਫੋਲਡਰ -Name[pl]=Zarchiwizuj i zaszyfruj katalog -Name[pt]=Arquivar e Cifrar a Pasta -Name[pt_BR]=Arquivar & Criptografar Pasta -Name[ru]=Архивировать и зашифровать папку -Name[sk]=Archivovať a šifrovať priečinok -Name[sl]=Arhiviranje in ši&friranje imenika -Name[sr]=Архивирај и шифруј фасциклу -Name[sr@Latn]=Arhiviraj i šifruj fasciklu -Name[sv]=Arkivera och kryptera katalog -Name[tr]=Arşiv ve Klasör Şifrele -Name[uk]=Зробити архів теки і зашифрувати -Name[zh_CN]=存档并加密文件夹 -Name[zh_TW]=壓縮並加密資料夾 Icon=kgpg Exec=kgpg -e %F diff --git a/kgpg/keyexport.ui b/kgpg/keyexport.ui index 94f4573..bc310d1 100644 --- a/kgpg/keyexport.ui +++ b/kgpg/keyexport.ui @@ -130,14 +130,12 @@ </connection> </connections> <includes> - <include location="local" impldecl="in implementation">keyexport.ui.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> <include location="global" impldecl="in implementation">kurlrequester.h</include> + <include location="local" impldecl="in implementation">keyexport.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>checkFile_toggled( bool isOn )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> diff --git a/kgpg/keygener.cpp b/kgpg/keygener.cpp index 30fd99c..bf354ed 100644 --- a/kgpg/keygener.cpp +++ b/kgpg/keygener.cpp @@ -65,7 +65,7 @@ keyGenerate::keyGenerate(TQWidget *parent, const char *name):KDialogBase( parent keyexp->insertItem(i18n("Months"),3); keyexp->insertItem(i18n("Years"),4); keyexp->setMinimumSize(keyexp->sizeHint()); - connect(keyexp,TQT_SIGNAL(activated(int)),this,TQT_SLOT(activateexp(int))); + connect(keyexp,TQ_SIGNAL(activated(int)),this,TQ_SLOT(activateexp(int))); (void) new TQLabel(i18n("Key size:"),bgroup1); keysize = new KComboBox(bgroup1); diff --git a/kgpg/keygener.h b/kgpg/keygener.h index 59c73b8..0645a6a 100644 --- a/kgpg/keygener.h +++ b/kgpg/keygener.h @@ -24,7 +24,7 @@ class KLineEdit; class keyGenerate : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: keyGenerate(TQWidget *parent=0, const char *name=0); diff --git a/kgpg/keyinfowidget.cpp b/kgpg/keyinfowidget.cpp index 1b833ac..35c1520 100644 --- a/kgpg/keyinfowidget.cpp +++ b/kgpg/keyinfowidget.cpp @@ -76,18 +76,18 @@ KgpgKeyInfo::KgpgKeyInfo(TQWidget *parent, const char *name,TQString sigkey):KDi if (hasPhoto) { KgpgInterface *photoProcess=new KgpgInterface(); photoProcess->KgpgGetPhotoList(displayedKeyID); - connect(photoProcess,TQT_SIGNAL(signalPhotoList(TQStringList)),this,TQT_SLOT(slotSetMainPhoto(TQStringList))); + connect(photoProcess,TQ_SIGNAL(signalPhotoList(TQStringList)),this,TQ_SLOT(slotSetMainPhoto(TQStringList))); } else prop->comboId->setEnabled(false); - connect(prop->changeExp,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotChangeExp())); - connect(this,TQT_SIGNAL(closeClicked()),this,TQT_SLOT(slotPreOk())); - connect(prop->changePass,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotChangePass())); - connect(prop->comboId,TQT_SIGNAL(activated (const TQString &)),this,TQT_SLOT(reloadMainPhoto(const TQString &))); - connect(prop->cbDisabled,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotDisableKey(bool))); - connect(prop->kCOwnerTrust,TQT_SIGNAL(activated (int)),this,TQT_SLOT(slotChangeTrust(int))); - connect(this,TQT_SIGNAL(changeMainPhoto(const TQPixmap&)),this,TQT_SLOT(slotSetPhoto(const TQPixmap&))); + connect(prop->changeExp,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotChangeExp())); + connect(this,TQ_SIGNAL(closeClicked()),this,TQ_SLOT(slotPreOk())); + connect(prop->changePass,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotChangePass())); + connect(prop->comboId,TQ_SIGNAL(activated (const TQString &)),this,TQ_SLOT(reloadMainPhoto(const TQString &))); + connect(prop->cbDisabled,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotDisableKey(bool))); + connect(prop->kCOwnerTrust,TQ_SIGNAL(activated (int)),this,TQ_SLOT(slotChangeTrust(int))); + connect(this,TQ_SIGNAL(changeMainPhoto(const TQPixmap&)),this,TQ_SLOT(slotSetPhoto(const TQPixmap&))); //prop->setMinimumSize(prop->sizeHint()); } @@ -235,7 +235,7 @@ void KgpgKeyInfo::loadKey(TQString Keyid) date = timestamp.date(); } else { - date = TQDate::fromString(gpgOutput.section(':',5,5), Qt::ISODate); + date = TQDate::fromString(gpgOutput.section(':',5,5), TQt::ISODate); } Q_ASSERT ( date.isValid())/* tqWarning("create date is not valid")*/; @@ -250,7 +250,7 @@ void KgpgKeyInfo::loadKey(TQString Keyid) date = timestamp.date(); } else { - date = TQDate::fromString(gpgOutput.section(':',6,6), Qt::ISODate); + date = TQDate::fromString(gpgOutput.section(':',6,6), TQt::ISODate); } Q_ASSERT (date.isValid()) /* tqWarning("Expirationdate date is not valid")*/; expirationDate=TDEGlobal::locale()->formatDate(date); @@ -347,8 +347,8 @@ void KgpgKeyInfo::reloadMainPhoto(const TQString &uid) KProcIO *p=new KProcIO(); *p<<"gpg"<<"--no-tty"<<"--show-photos"<<"--photo-viewer"<<TQString(TQFile::encodeName(pgpgOutput)); *p<<"--edit-key"<<displayedKeyID<<"uid"<<uid<<"showphoto"; - TQObject::connect(p, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(finishphotoreadprocess(KProcIO *))); - TQObject::connect(p, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotMainImageRead(TDEProcess *))); + TQObject::connect(p, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(finishphotoreadprocess(KProcIO *))); + TQObject::connect(p, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotMainImageRead(TDEProcess *))); p->start(TDEProcess::NotifyOnExit,true); } @@ -374,7 +374,7 @@ void KgpgKeyInfo::slotSetPhoto(const TQPixmap &pix) // kdDebug(2100) << k_funcinfo << endl; TQImage dup=pix.convertToImage(); TQPixmap dup2; - dup2.convertFromImage(dup.scale(prop->pLPhoto->width(),prop->pLPhoto->height(),TQ_ScaleMin)); + dup2.convertFromImage(dup.scale(prop->pLPhoto->width(),prop->pLPhoto->height(),TQImage::ScaleMin)); prop->pLPhoto->setPixmap(dup2); } @@ -423,10 +423,10 @@ void KgpgKeyInfo::slotChangeExp() TQVBoxLayout *vbox=new TQVBoxLayout(page,3); vbox->addWidget(kdt); vbox->addWidget(kb); - connect(kb,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotEnableDate(bool))); - connect(chdate,TQT_SIGNAL(okClicked()),this,TQT_SLOT(slotChangeDate())); - connect(kdt,TQT_SIGNAL(dateChanged(TQDate)),this,TQT_SLOT(slotCheckDate(TQDate))); - connect(kdt,TQT_SIGNAL(dateEntered(TQDate)),this,TQT_SLOT(slotCheckDate(TQDate))); + connect(kb,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotEnableDate(bool))); + connect(chdate,TQ_SIGNAL(okClicked()),this,TQ_SLOT(slotChangeDate())); + connect(kdt,TQ_SIGNAL(dateChanged(TQDate)),this,TQ_SLOT(slotCheckDate(TQDate))); + connect(kdt,TQ_SIGNAL(dateEntered(TQDate)),this,TQ_SLOT(slotCheckDate(TQDate))); chdate->setMainWidget(page); chdate->show(); @@ -450,7 +450,7 @@ void KgpgKeyInfo::slotChangeDate() else { KeyExpirationProcess->KgpgKeyExpire(displayedKeyID,kdt->date(),false); } - connect(KeyExpirationProcess,TQT_SIGNAL(expirationFinished(int)),this,TQT_SLOT(slotInfoExpirationChanged(int))); + connect(KeyExpirationProcess,TQ_SIGNAL(expirationFinished(int)),this,TQ_SLOT(slotInfoExpirationChanged(int))); } void KgpgKeyInfo::slotEnableDate(bool isOn) @@ -481,7 +481,7 @@ void KgpgKeyInfo::slotChangePass() // kdDebug(2100) << k_funcinfo << endl; KgpgInterface *ChangeKeyPassProcess=new KgpgInterface(); ChangeKeyPassProcess->KgpgChangePass(displayedKeyID); - connect(ChangeKeyPassProcess,TQT_SIGNAL(passwordChanged()),this,TQT_SLOT(slotInfoPasswordChanged())); + connect(ChangeKeyPassProcess,TQ_SIGNAL(passwordChanged()),this,TQ_SLOT(slotInfoPasswordChanged())); } void KgpgKeyInfo::slotChangeTrust(int newTrust) @@ -489,7 +489,7 @@ void KgpgKeyInfo::slotChangeTrust(int newTrust) // kdDebug(2100) << k_funcinfo << endl; KgpgInterface *KeyTrustProcess=new KgpgInterface(); KeyTrustProcess->KgpgTrustExpire(displayedKeyID,newTrust); - connect(KeyTrustProcess,TQT_SIGNAL(trustfinished()),this,TQT_SLOT(slotInfoTrustChanged())); + connect(KeyTrustProcess,TQ_SIGNAL(trustfinished()),this,TQ_SLOT(slotInfoTrustChanged())); } diff --git a/kgpg/keyinfowidget.h b/kgpg/keyinfowidget.h index 6d00d3b..c61a5d5 100644 --- a/kgpg/keyinfowidget.h +++ b/kgpg/keyinfowidget.h @@ -32,7 +32,7 @@ class KProcIO; class KgpgKeyInfo : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kgpg/keyservers.cpp b/kgpg/keyservers.cpp index 23eb79a..7fe35c1 100644 --- a/kgpg/keyservers.cpp +++ b/kgpg/keyservers.cpp @@ -68,17 +68,17 @@ keyServer::keyServer(TQWidget *parent, const char *name,bool modal,bool autoClos currentKey = TQString(); hashMap.clear(); - connect(page->Buttonimport,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotImport())); - connect(page->Buttonsearch,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotSearch())); - connect(page->Buttonexport,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotPreExport())); - connect(this,TQT_SIGNAL(okClicked()),this,TQT_SLOT(slotOk())); + connect(page->Buttonimport,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotImport())); + connect(page->Buttonsearch,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotSearch())); + connect(page->Buttonexport,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotPreExport())); + connect(this,TQ_SIGNAL(okClicked()),this,TQ_SLOT(slotOk())); if (KgpgInterface::getGpgVersion() < 210 ) { // was removed in 2.1 - connect(page->cBproxyI,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotEnableProxyI(bool))); - connect(page->cBproxyE,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotEnableProxyE(bool))); + connect(page->cBproxyI,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotEnableProxyI(bool))); + connect(page->cBproxyE,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotEnableProxyE(bool))); } - connect(page->kLEimportid, TQT_SIGNAL( textChanged ( const TQString & )), this, TQT_SLOT( slotTextChanged( const TQString &))); + connect(page->kLEimportid, TQ_SIGNAL( textChanged ( const TQString & )), this, TQ_SLOT( slotTextChanged( const TQString &))); if (KgpgInterface::getGpgVersion() < 210 ) { // was removed in 2.1 page->cBproxyI->setChecked(KGpgSettings::useProxy()); page->cBproxyE->setChecked(KGpgSettings::useProxy()); @@ -93,8 +93,8 @@ 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(processExited(TDEProcess *)),this, TQT_SLOT(slotprocresult(TDEProcess *))); - TQObject::connect(encid, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotprocread(KProcIO *))); + TQObject::connect(encid, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotprocresult(TDEProcess *))); + TQObject::connect(encid, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(slotprocread(KProcIO *))); encid->start(TDEProcess::NotifyOnExit,true); page->Buttonimport->setEnabled( !page->kLEimportid->text().isEmpty()); page->Buttonsearch->setEnabled( !page->kLEimportid->text().isEmpty()); @@ -237,12 +237,12 @@ void keyServer::slotSearch() listpop->kLVsearch->setColumnWidth(0,150); listpop->kLVsearch->setColumnWidth(1,130); listpop->statusText->setText(i18n("Connecting to the server...")); - connect(listpop->kLVsearch,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(transferKeyID())); - connect(dialogServer,TQT_SIGNAL(okClicked()),this,TQT_SLOT(preimport())); - connect(listpop->kLVsearch,TQT_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint &,int)),dialogServer,TQT_SIGNAL(okClicked())); + connect(listpop->kLVsearch,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(transferKeyID())); + connect(dialogServer,TQ_SIGNAL(okClicked()),this,TQ_SLOT(preimport())); + connect(listpop->kLVsearch,TQ_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint &,int)),dialogServer,TQ_SIGNAL(okClicked())); - connect(dialogServer,TQT_SIGNAL(closeClicked()),this,TQT_SLOT(handleQuit())); - connect( listpop , TQT_SIGNAL( destroyed() ) , this, TQT_SLOT( abortSearch())); + connect(dialogServer,TQ_SIGNAL(closeClicked()),this,TQ_SLOT(handleQuit())); + connect( listpop , TQ_SIGNAL( destroyed() ) , this, TQ_SLOT( abortSearch())); searchproc=new KProcIO(TQTextCodec::codecForLocale()); TQString keyserv=page->kCBimportks->currentText(); @@ -262,8 +262,8 @@ void keyServer::slotSearch() keyNumbers=0; TQApplication::setOverrideCursor(TQCursor(TQt::BusyCursor)); - TQObject::connect(searchproc, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotsearchresult(TDEProcess *))); - TQObject::connect(searchproc, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotsearchread(KProcIO *))); + TQObject::connect(searchproc, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotsearchresult(TDEProcess *))); + TQObject::connect(searchproc, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(slotsearchread(KProcIO *))); 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); @@ -414,7 +414,7 @@ void keyServer::slotsearchresult(TDEProcess *) date = timestamp.date(); } else { - date = TQDate::fromString(keyString[5], Qt::ISODate); + date = TQDate::fromString(keyString[5], TQt::ISODate); } Q_ASSERT (date.isValid()) /*tqWarning("create date is not valid")*/; if (date < TQDate::currentDate() ) { @@ -446,7 +446,7 @@ void keyServer::slotsearchresult(TDEProcess *) date = timestamp.date(); } else { - date = TQDate::fromString(keyString[4], Qt::ISODate); + date = TQDate::fromString(keyString[4], TQt::ISODate); } created=TDEGlobal::locale()->formatDate(date, true); } @@ -463,7 +463,7 @@ void keyServer::slotsearchresult(TDEProcess *) date = timestamp.date(); } else { - date = TQDate::fromString(keyString[2], Qt::ISODate); + date = TQDate::fromString(keyString[2], TQt::ISODate); } created=TDEGlobal::locale()->formatDate(date, true); } @@ -532,8 +532,8 @@ void keyServer::slotExport(TQStringList keyIds) } *exportproc << "--status-fd=2" << "--keyserver" << keyserv << "--send-keys" << keyIds; - TQObject::connect(exportproc, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotexportresult(TDEProcess *))); - TQObject::connect(exportproc, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotimportread(KProcIO *))); + TQObject::connect(exportproc, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotexportresult(TDEProcess *))); + TQObject::connect(exportproc, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(slotimportread(KProcIO *))); exportproc->start(TDEProcess::NotifyOnExit,true); TQApplication::setOverrideCursor(TQCursor(TQt::BusyCursor)); importpop = new TQDialog( this,0,true,TQt::WDestructiveClose); @@ -546,8 +546,8 @@ void keyServer::slotExport(TQStringList keyIds) importpop->setMinimumWidth(250); importpop->adjustSize(); importpop->show(); - connect(importpop,TQT_SIGNAL(destroyed ()),this,TQT_SLOT(abortExport())); - connect(Buttonabort,TQT_SIGNAL(clicked ()),importpop,TQT_SLOT(close())); + connect(importpop,TQ_SIGNAL(destroyed ()),this,TQ_SLOT(abortExport())); + connect(Buttonabort,TQ_SIGNAL(clicked ()),importpop,TQ_SLOT(close())); } void keyServer::abortExport() @@ -631,8 +631,8 @@ void keyServer::slotImport() keyNames=keyNames.stripWhiteSpace(); *searchproc<< TQString(TQFile::encodeName(fkeyNames)); } - TQObject::connect(searchproc, TQT_SIGNAL(processExited(TDEProcess *)),TQT_TQOBJECT(this), TQT_SLOT(slotksearchprocresult(TDEProcess *))); - TQObject::connect(searchproc, TQT_SIGNAL(readReady(KProcIO *)),TQT_TQOBJECT(this), TQT_SLOT(slotsearchread(KProcIO *))); + TQObject::connect(searchproc, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotksearchprocresult(TDEProcess *))); + TQObject::connect(searchproc, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(slotsearchread(KProcIO *))); 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); @@ -663,8 +663,8 @@ void keyServer::slotImport() *importproc<< (*it) ; } - TQObject::connect(importproc, TQT_SIGNAL(processExited(TDEProcess *)),TQT_TQOBJECT(this), TQT_SLOT(slotimportresult(TDEProcess *))); - TQObject::connect(importproc, TQT_SIGNAL(readReady(KProcIO *)),TQT_TQOBJECT(this), TQT_SLOT(slotimportread(KProcIO *))); + TQObject::connect(importproc, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotimportresult(TDEProcess *))); + TQObject::connect(importproc, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(slotimportread(KProcIO *))); importproc->start(TDEProcess::NotifyOnExit,true); importproc->closeWhenDone(); @@ -679,8 +679,8 @@ void keyServer::slotImport() importpop->setMinimumWidth(250); importpop->adjustSize(); importpop->show(); - connect(Buttonabort,TQT_SIGNAL(clicked()),importpop,TQT_SLOT(close())); - connect(importpop,TQT_SIGNAL(destroyed ()),this,TQT_SLOT(abortImport())); + connect(Buttonabort,TQ_SIGNAL(clicked()),importpop,TQ_SLOT(close())); + connect(importpop,TQ_SIGNAL(destroyed ()),this,TQ_SLOT(abortImport())); } void keyServer::abortImport() @@ -719,7 +719,7 @@ void keyServer::slotksearchprocresult(TDEProcess *) { date = timestamp.date(); } else { - date = TQDate::fromString(keyString[5], Qt::ISODate); + date = TQDate::fromString(keyString[5], TQt::ISODate); } Q_ASSERT (date.isValid()) /*tqWarning("create date is not valid")*/; if (date < TQDate::currentDate() ) { diff --git a/kgpg/keyservers.h b/kgpg/keyservers.h index 51e98a8..11db80b 100644 --- a/kgpg/keyservers.h +++ b/kgpg/keyservers.h @@ -30,7 +30,7 @@ class searchRes; class keyServer : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: keyServer(TQWidget *parent=0, const char *name=0,bool modal=false,bool autoClose=false); diff --git a/kgpg/kgpg.cpp b/kgpg/kgpg.cpp index 0d7acd2..359644e 100644 --- a/kgpg/kgpg.cpp +++ b/kgpg/kgpg.cpp @@ -84,10 +84,10 @@ MyView::MyView( TQWidget *parent, const char *name ) setBackgroundMode( X11ParentRelative ); openTasks=0; - TDEAction *saveDecrypt=new TDEAction(i18n("&Decrypt && Save File"),"decrypted",0,TQT_TQOBJECT(this), TQT_SLOT(decryptDroppedFile()),TQT_TQOBJECT(this),"decrypt_file"); - TDEAction *showDecrypt=new TDEAction(i18n("&Show Decrypted File"),"edit",0,TQT_TQOBJECT(this), TQT_SLOT(showDroppedFile()),TQT_TQOBJECT(this),"show_file"); - TDEAction *encrypt=new TDEAction(i18n("&Encrypt File"),"encrypted",0,TQT_TQOBJECT(this), TQT_SLOT(encryptDroppedFile()),TQT_TQOBJECT(this),"encrypt_file"); - TDEAction *sign=new TDEAction(i18n("&Sign File"), "signature",0,TQT_TQOBJECT(this), TQT_SLOT(signDroppedFile()),TQT_TQOBJECT(this),"sign_file"); + TDEAction *saveDecrypt=new TDEAction(i18n("&Decrypt && Save File"),"decrypted",0,this, TQ_SLOT(decryptDroppedFile()),this,"decrypt_file"); + TDEAction *showDecrypt=new TDEAction(i18n("&Show Decrypted File"),"edit",0,this, TQ_SLOT(showDroppedFile()),this,"show_file"); + TDEAction *encrypt=new TDEAction(i18n("&Encrypt File"),"encrypted",0,this, TQ_SLOT(encryptDroppedFile()),this,"encrypt_file"); + TDEAction *sign=new TDEAction(i18n("&Sign File"), "signature",0,this, TQ_SLOT(signDroppedFile()),this,"sign_file"); //TQToolTip::add(this,i18n("KGpg drag & drop encryption applet")); readOptions(); @@ -118,7 +118,7 @@ MyView::~MyView() void MyView::clipEncrypt() { popupPublic *dialoguec=new popupPublic(0, "public_keys", 0,false,goDefaultKey); - connect(dialoguec,TQT_SIGNAL(selectedKey(TQStringList,TQStringList,bool,bool)),TQT_TQOBJECT(this),TQT_SLOT(encryptClipboard(TQStringList,TQStringList,bool,bool))); + connect(dialoguec,TQ_SIGNAL(selectedKey(TQStringList,TQStringList,bool,bool)),this,TQ_SLOT(encryptClipboard(TQStringList,TQStringList,bool,bool))); dialoguec->exec(); delete dialoguec; } @@ -134,10 +134,10 @@ void MyView::clipSign(bool openEditor) TQString clippie=kapp->clipboard()->text(clipboardMode).stripWhiteSpace(); if (!clippie.isEmpty()) { KgpgApp *kgpgtxtedit = new KgpgApp(0, "editor",WDestructiveClose,goDefaultKey); - connect(this,TQT_SIGNAL(setFont(TQFont)),kgpgtxtedit,TQT_SLOT(slotSetFont(TQFont))); - connect(kgpgtxtedit,TQT_SIGNAL(encryptFiles(KURL::List)),TQT_TQOBJECT(this),TQT_SLOT(encryptFiles(KURL::List))); + connect(this,TQ_SIGNAL(setFont(TQFont)),kgpgtxtedit,TQ_SLOT(slotSetFont(TQFont))); + connect(kgpgtxtedit,TQ_SIGNAL(encryptFiles(KURL::List)),this,TQ_SLOT(encryptFiles(KURL::List))); if (!openEditor) - connect(kgpgtxtedit->view,TQT_SIGNAL(verifyFinished()),kgpgtxtedit,TQT_SLOT(closeWindow())); + connect(kgpgtxtedit->view,TQ_SIGNAL(verifyFinished()),kgpgtxtedit,TQ_SLOT(closeWindow())); kgpgtxtedit->view->editor->setText(clippie); kgpgtxtedit->view->clearSign(); kgpgtxtedit->show(); @@ -163,9 +163,9 @@ void MyView::encryptDroppedFolder() optionbx->insertItem(i18n("Gzip")); optionbx->insertItem(i18n("Bzip2")); bGroup->show(); - connect(dialogue,TQT_SIGNAL(keyListFilled ()),dialogue,TQT_SLOT(slotSetVisible())); - connect(optionbx,TQT_SIGNAL(activated (int)),TQT_TQOBJECT(this),TQT_SLOT(slotSetCompression(int))); - connect(dialogue,TQT_SIGNAL(selectedKey(TQStringList,TQStringList,bool,bool)),TQT_TQOBJECT(this),TQT_SLOT(startFolderEncode(TQStringList,TQStringList,bool,bool))); + connect(dialogue,TQ_SIGNAL(keyListFilled ()),dialogue,TQ_SLOT(slotSetVisible())); + connect(optionbx,TQ_SIGNAL(activated (int)),this,TQ_SLOT(slotSetCompression(int))); + connect(dialogue,TQ_SIGNAL(selectedKey(TQStringList,TQStringList,bool,bool)),this,TQ_SLOT(startFolderEncode(TQStringList,TQStringList,bool,bool))); dialogue->CBshred->setEnabled(false); dialogue->exec(); dialogue=0L; @@ -236,8 +236,8 @@ pop = new KPassivePopup(); KgpgInterface *folderprocess=new KgpgInterface(); folderprocess->KgpgEncryptFile(selec,KURL(kgpgfoldertmp->name()),encryptedFile,encryptOptions,symetric); - connect(folderprocess,TQT_SIGNAL(encryptionfinished(KURL)),TQT_TQOBJECT(this),TQT_SLOT(slotFolderFinished(KURL))); - connect(folderprocess,TQT_SIGNAL(errormessage(TQString)),TQT_TQOBJECT(this),TQT_SLOT(slotFolderFinishedError(TQString))); + connect(folderprocess,TQ_SIGNAL(encryptionfinished(KURL)),this,TQ_SLOT(slotFolderFinished(KURL))); + connect(folderprocess,TQ_SIGNAL(errormessage(TQString)),this,TQ_SLOT(slotFolderFinishedError(TQString))); } void MyView::slotFolderFinished(KURL) @@ -280,7 +280,7 @@ void MyView::encryptDroppedFile() { TQStringList opts; KgpgLibrary *lib=new KgpgLibrary(this,KGpgSettings::pgpExtension()); - connect(lib,TQT_SIGNAL(systemMessage(TQString,bool)),TQT_TQOBJECT(this),TQT_SLOT(busyMessage(TQString,bool))); + connect(lib,TQ_SIGNAL(systemMessage(TQString,bool)),this,TQ_SLOT(busyMessage(TQString,bool))); if (KGpgSettings::fileKey()!=TQString()) { if (KGpgSettings::allowUntrustedKeys()) opts<<"--always-trust"; @@ -315,7 +315,7 @@ lb->insertStringList(droppedUrls.toStringList()); if (shredConfirm->exec()==TQDialog::Accepted) { KgpgLibrary *lib=new KgpgLibrary(this); - connect(lib,TQT_SIGNAL(systemMessage(TQString,bool)),TQT_TQOBJECT(this),TQT_SLOT(busyMessage(TQString,bool))); + connect(lib,TQ_SIGNAL(systemMessage(TQString,bool)),this,TQ_SLOT(busyMessage(TQString,bool))); lib->shredprocessenc(droppedUrls); } delete shredConfirm; @@ -348,7 +348,7 @@ void MyView::slotVerifyFile() ///////////////////////// pipe gpg command KgpgInterface *verifyFileProcess=new KgpgInterface(); verifyFileProcess->KgpgVerifyFile(droppedUrl,KURL(sigfile)); - connect (verifyFileProcess,TQT_SIGNAL(verifyquerykey(TQString)),TQT_TQOBJECT(this),TQT_SLOT(importSignature(TQString))); + connect (verifyFileProcess,TQ_SIGNAL(verifyquerykey(TQString)),this,TQ_SLOT(importSignature(TQString))); } void MyView::importSignature(TQString ID) @@ -423,10 +423,10 @@ void MyView::decryptDroppedFile() } KgpgLibrary *lib=new KgpgLibrary(this); lib->slotFileDec(droppedUrls.first(),swapname,KGpgSettings::customDecrypt()); - connect(lib,TQT_SIGNAL(importOver(TQStringList)),TQT_TQOBJECT(this),TQT_SIGNAL(importedKeys(TQStringList))); - connect(lib,TQT_SIGNAL(systemMessage(TQString,bool)),TQT_TQOBJECT(this),TQT_SLOT(busyMessage(TQString,bool))); + connect(lib,TQ_SIGNAL(importOver(TQStringList)),this,TQ_SIGNAL(importedKeys(TQStringList))); + connect(lib,TQ_SIGNAL(systemMessage(TQString,bool)),this,TQ_SLOT(busyMessage(TQString,bool))); // if (isFolder) - connect(lib,TQT_SIGNAL(decryptionOver()),TQT_TQOBJECT(this),TQT_SLOT(decryptNextFile())); + connect(lib,TQ_SIGNAL(decryptionOver()),this,TQ_SLOT(decryptNextFile())); } @@ -466,10 +466,10 @@ void MyView::showDroppedFile() kdDebug(2100)<<"------Show dropped file"<<endl; KgpgApp *kgpgtxtedit = new KgpgApp(0, "editor",WDestructiveClose,goDefaultKey); kgpgtxtedit->view->editor->slotDroppedFile(droppedUrls.first()); - connect(kgpgtxtedit,TQT_SIGNAL(encryptFiles(KURL::List)),TQT_TQOBJECT(this),TQT_SLOT(encryptFiles(KURL::List))); - connect(this,TQT_SIGNAL(setFont(TQFont)),kgpgtxtedit,TQT_SLOT(slotSetFont(TQFont))); - connect(kgpgtxtedit,TQT_SIGNAL(refreshImported(TQStringList)),TQT_TQOBJECT(this),TQT_SIGNAL(importedKeys(TQStringList))); - connect(kgpgtxtedit->view->editor,TQT_SIGNAL(refreshImported(TQStringList)),TQT_TQOBJECT(this),TQT_SIGNAL(importedKeys(TQStringList))); + connect(kgpgtxtedit,TQ_SIGNAL(encryptFiles(KURL::List)),this,TQ_SLOT(encryptFiles(KURL::List))); + connect(this,TQ_SIGNAL(setFont(TQFont)),kgpgtxtedit,TQ_SLOT(slotSetFont(TQFont))); + connect(kgpgtxtedit,TQ_SIGNAL(refreshImported(TQStringList)),this,TQ_SIGNAL(importedKeys(TQStringList))); + connect(kgpgtxtedit->view->editor,TQ_SIGNAL(refreshImported(TQStringList)),this,TQ_SIGNAL(importedKeys(TQStringList))); kgpgtxtedit->show(); } @@ -523,8 +523,8 @@ void MyView::droppedtext (TQString inputText,bool allowEncrypt) if (inputText.startsWith("-----BEGIN PGP MESSAGE")) { KgpgApp *kgpgtxtedit = new KgpgApp(0, "editor",WDestructiveClose,goDefaultKey); - connect(kgpgtxtedit,TQT_SIGNAL(encryptFiles(KURL::List)),TQT_TQOBJECT(this),TQT_SLOT(encryptFiles(KURL::List))); - connect(this,TQT_SIGNAL(setFont(TQFont)),kgpgtxtedit,TQT_SLOT(slotSetFont(TQFont))); + connect(kgpgtxtedit,TQ_SIGNAL(encryptFiles(KURL::List)),this,TQ_SLOT(encryptFiles(KURL::List))); + connect(this,TQ_SIGNAL(setFont(TQFont)),kgpgtxtedit,TQ_SLOT(slotSetFont(TQFont))); kgpgtxtedit->view->editor->setText(inputText); kgpgtxtedit->view->slotdecode(); kgpgtxtedit->show(); @@ -537,7 +537,7 @@ void MyView::droppedtext (TQString inputText,bool allowEncrypt) else { KgpgInterface *importKeyProcess=new KgpgInterface(); importKeyProcess->importKey(inputText); - connect(importKeyProcess,TQT_SIGNAL(importfinished(TQStringList)),TQT_TQOBJECT(this),TQT_SIGNAL(importedKeys(TQStringList))); + connect(importKeyProcess,TQ_SIGNAL(importfinished(TQStringList)),this,TQ_SIGNAL(importedKeys(TQStringList))); return; } } @@ -710,17 +710,17 @@ void MyView::startWizard() } wiz->CBdefault->setCurrentItem(firstKey); - //connect(wiz->pushButton4,TQT_SIGNAL(clicked()),TQT_TQOBJECT(this),TQT_SLOT(slotGenKey())); + //connect(wiz->pushButton4,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotGenKey())); if (!counter) - connect(wiz->finishButton(),TQT_SIGNAL(clicked()),TQT_TQOBJECT(this),TQT_SLOT(slotGenKey())); + connect(wiz->finishButton(),TQ_SIGNAL(clicked()),this,TQ_SLOT(slotGenKey())); else { wiz->textGenerate->hide(); wiz->setTitle(wiz->page_4,i18n("Step Three: Select your Default Private Key")); - connect(wiz->finishButton(),TQT_SIGNAL(clicked()),TQT_TQOBJECT(this),TQT_SLOT(slotSaveOptionsPath())); + connect(wiz->finishButton(),TQ_SIGNAL(clicked()),this,TQ_SLOT(slotSaveOptionsPath())); } - connect(wiz->nextButton(),TQT_SIGNAL(clicked()),TQT_TQOBJECT(this),TQT_SLOT(slotWizardChange())); - connect( wiz , TQT_SIGNAL( destroyed() ) , this, TQT_SLOT( slotWizardClose())); - connect(wiz,TQT_SIGNAL(helpClicked()),TQT_TQOBJECT(this),TQT_SLOT(help())); + connect(wiz->nextButton(),TQ_SIGNAL(clicked()),this,TQ_SLOT(slotWizardChange())); + connect( wiz , TQ_SIGNAL( destroyed() ) , this, TQ_SLOT( slotWizardClose())); + connect(wiz,TQ_SIGNAL(helpClicked()),this,TQ_SLOT(help())); wiz->setFinishEnabled(wiz->page_4,true); wiz->show(); @@ -838,19 +838,19 @@ kgpgapplet::kgpgapplet(TQWidget *parent, const char *name) w=new MyView(this); w->show(); TDEPopupMenu *conf_menu=contextMenu(); - KgpgEncryptClipboard = new TDEAction(i18n("&Encrypt Clipboard"), "kgpg", 0,TQT_TQOBJECT(w), TQT_SLOT(clipEncrypt()),actionCollection(),"clip_encrypt"); - KgpgDecryptClipboard = new TDEAction(i18n("&Decrypt Clipboard"), 0, 0,TQT_TQOBJECT(w), TQT_SLOT(clipDecrypt()),actionCollection(),"clip_decrypt"); - KgpgSignClipboard = new TDEAction(i18n("&Sign/Verify Clipboard"), "signature", 0,TQT_TQOBJECT(w), TQT_SLOT(clipSign()),actionCollection(),"clip_sign"); + KgpgEncryptClipboard = new TDEAction(i18n("&Encrypt Clipboard"), "kgpg", 0,w, TQ_SLOT(clipEncrypt()),actionCollection(),"clip_encrypt"); + KgpgDecryptClipboard = new TDEAction(i18n("&Decrypt Clipboard"), 0, 0,w, TQ_SLOT(clipDecrypt()),actionCollection(),"clip_decrypt"); + KgpgSignClipboard = new TDEAction(i18n("&Sign/Verify Clipboard"), "signature", 0,w, TQ_SLOT(clipSign()),actionCollection(),"clip_sign"); TDEAction *KgpgOpenEditor; if (KGpgSettings::leftClick()==KGpgSettings::EnumLeftClick::KeyManager) - KgpgOpenEditor = new TDEAction(i18n("&Open Editor"), "edit", 0,TQT_TQOBJECT(parent), TQT_SLOT(slotOpenEditor()),actionCollection(),"kgpg_editor"); + KgpgOpenEditor = new TDEAction(i18n("&Open Editor"), "edit", 0,parent, TQ_SLOT(slotOpenEditor()),actionCollection(),"kgpg_editor"); else - KgpgOpenEditor = new TDEAction(i18n("&Open Key Manager"), "kgpg", 0,TQT_TQOBJECT(this), TQT_SLOT(slotOpenKeyManager()),actionCollection(),"kgpg_editor"); + KgpgOpenEditor = new TDEAction(i18n("&Open Key Manager"), "kgpg", 0,this, TQ_SLOT(slotOpenKeyManager()),actionCollection(),"kgpg_editor"); - TDEAction *KgpgOpenServer = new TDEAction(i18n("&Key Server Dialog"), "network", 0,TQT_TQOBJECT(this), TQT_SLOT(slotOpenServerDialog()),actionCollection(),"kgpg_server"); - TDEAction *KgpgPreferences=KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showOptions()), actionCollection()); + TDEAction *KgpgOpenServer = new TDEAction(i18n("&Key Server Dialog"), "network", 0,this, TQ_SLOT(slotOpenServerDialog()),actionCollection(),"kgpg_server"); + TDEAction *KgpgPreferences=KStdAction::preferences(this, TQ_SLOT(showOptions()), actionCollection()); - connect (conf_menu,TQT_SIGNAL(aboutToShow()),TQT_TQOBJECT(this),TQT_SLOT(checkMenu())); + connect (conf_menu,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(checkMenu())); KgpgEncryptClipboard->plug(conf_menu); KgpgDecryptClipboard->plug(conf_menu); @@ -970,16 +970,16 @@ int KgpgAppletApp::newInstance() { kgpg_applet=new kgpgapplet(s_keyManager->s_kgpgEditor,"kgpg_systrayapplet"); } - connect(s_keyManager,TQT_SIGNAL(encryptFiles(KURL::List)),kgpg_applet->w,TQT_SLOT(encryptFiles(KURL::List))); - connect(s_keyManager,TQT_SIGNAL(installShredder()),kgpg_applet->w,TQT_SLOT(installShred())); - connect(s_keyManager->s_kgpgEditor,TQT_SIGNAL(encryptFiles(KURL::List)),kgpg_applet->w,TQT_SLOT(encryptFiles(KURL::List))); - - connect( kgpg_applet, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(slotHandleQuit())); - connect(s_keyManager,TQT_SIGNAL(readAgainOptions()),kgpg_applet->w,TQT_SLOT(readOptions())); - connect(kgpg_applet->w,TQT_SIGNAL(updateDefault(TQString)),TQT_TQOBJECT(this),TQT_SLOT(wizardOver(TQString))); - connect(kgpg_applet->w,TQT_SIGNAL(createNewKey()),s_keyManager,TQT_SLOT(slotgenkey())); - connect(s_keyManager,TQT_SIGNAL(fontChanged(TQFont)),kgpg_applet->w,TQT_SIGNAL(setFont(TQFont))); - connect(kgpg_applet->w,TQT_SIGNAL(importedKeys(TQStringList)),s_keyManager->keysList2,TQT_SLOT(slotReloadKeys(TQStringList))); + connect(s_keyManager,TQ_SIGNAL(encryptFiles(KURL::List)),kgpg_applet->w,TQ_SLOT(encryptFiles(KURL::List))); + connect(s_keyManager,TQ_SIGNAL(installShredder()),kgpg_applet->w,TQ_SLOT(installShred())); + connect(s_keyManager->s_kgpgEditor,TQ_SIGNAL(encryptFiles(KURL::List)),kgpg_applet->w,TQ_SLOT(encryptFiles(KURL::List))); + + connect( kgpg_applet, TQ_SIGNAL(quitSelected()), this, TQ_SLOT(slotHandleQuit())); + connect(s_keyManager,TQ_SIGNAL(readAgainOptions()),kgpg_applet->w,TQ_SLOT(readOptions())); + connect(kgpg_applet->w,TQ_SIGNAL(updateDefault(TQString)),this,TQ_SLOT(wizardOver(TQString))); + connect(kgpg_applet->w,TQ_SIGNAL(createNewKey()),s_keyManager,TQ_SLOT(slotgenkey())); + connect(s_keyManager,TQ_SIGNAL(fontChanged(TQFont)),kgpg_applet->w,TQ_SIGNAL(setFont(TQFont))); + connect(kgpg_applet->w,TQ_SIGNAL(importedKeys(TQStringList)),s_keyManager->keysList2,TQ_SLOT(slotReloadKeys(TQStringList))); kgpg_applet->show(); @@ -1079,8 +1079,8 @@ void MyView::encryptClipboard(TQStringList selec,TQStringList encryptOptions,boo if (symmetric) selec.clear(); KgpgInterface *txtEncrypt=new KgpgInterface(); - connect (txtEncrypt,TQT_SIGNAL(txtencryptionfinished(TQString)),TQT_TQOBJECT(this),TQT_SLOT(slotSetClip(TQString))); - connect (txtEncrypt,TQT_SIGNAL(txtencryptionstarted()),TQT_TQOBJECT(this),TQT_SLOT(slotPassiveClip())); + connect (txtEncrypt,TQ_SIGNAL(txtencryptionfinished(TQString)),this,TQ_SLOT(slotSetClip(TQString))); + connect (txtEncrypt,TQ_SIGNAL(txtencryptionstarted()),this,TQ_SLOT(slotPassiveClip())); txtEncrypt->KgpgEncryptText(kapp->clipboard()->text(clipboardMode),selec,encryptOptions); } diff --git a/kgpg/kgpg.desktop b/kgpg/kgpg.desktop index fc9f04e..4bff60e 100644 --- a/kgpg/kgpg.desktop +++ b/kgpg/kgpg.desktop @@ -1,113 +1,9 @@ [Desktop Entry] Name=KGpg -Name[hi]=केजीपीजी GenericName=Encryption Tool -GenericName[ar]=أداة للتشفير -GenericName[bg]=Програма за шифроване -GenericName[br]=Ostilh enrinegadur -GenericName[bs]=Alat za šifrovanje -GenericName[ca]=Eina de xifrat -GenericName[cs]=Šifrovací nástroj -GenericName[cy]=Erfyn Cêl-ysgrifo -GenericName[da]=Krypteringsværktøj -GenericName[de]=Verschlüsselungsprogramm -GenericName[el]=Εργαλείο κρυπτογράφησης -GenericName[eo]=Ilo por Ĉifrado -GenericName[es]=Herramienta de cifrado -GenericName[et]=Krüptimisvahend -GenericName[eu]=Zifraketa Tresna -GenericName[fa]=میلۀ رمزبندی -GenericName[fi]=Salaustyökalu -GenericName[fr]=Outil de cryptage -GenericName[ga]=Uirlis Chriptithe -GenericName[he]=כלי הצפנה -GenericName[hi]=एनक्रिप्शन औज़ार -GenericName[hu]=Titkosítóeszköz -GenericName[is]=Dulritunartól -GenericName[it]=Strumento di crittografia -GenericName[ja]=暗号化ツール -GenericName[ka]=დაშიფვრის ხელსაწყო -GenericName[kk]=Шифрлау құралы -GenericName[km]=ឧបករណ៍អ៊ិនគ្រីប -GenericName[lt]=Šifravimo įrankis -GenericName[mk]=Алатка за криптирање -GenericName[nb]=Krypteringsverktøy -GenericName[nds]=Verslötel-Warktüüch -GenericName[ne]=गुप्तीकरण उपकरण -GenericName[nl]=Cryptografisch programma -GenericName[nn]=Krypteringsverktøy -GenericName[pa]=ਇੰਕਰਿਪਸ਼ਨ ਸੰਦ -GenericName[pl]=Narzędzie do szyfrowania -GenericName[pt]=Ferramenta de Cifra -GenericName[pt_BR]=Ferramenta de Criptografia -GenericName[ro]=Utilitar de criptare -GenericName[ru]=Шифрование -GenericName[sk]=Šifrovací nástroj -GenericName[sl]=Šifrirno orodje -GenericName[sr]=Алат за шифровање -GenericName[sr@Latn]=Alat za šifrovanje -GenericName[sv]=Krypteringsverktyg -GenericName[ta]=சங்கேத கருவி -GenericName[tg]=Асбоби Рамзкунонӣ -GenericName[tr]=Şifreleme Aracı -GenericName[uk]=Засіб для шифрування -GenericName[zh_CN]=加密工具 -GenericName[zh_TW]=加密工具 Comment=A GnuPG frontend -Comment[ar]=واجهة لـ GnuPG -Comment[bg]=Клиент за GnuPG -Comment[bs]=Alat za GnuPG -Comment[ca]=Un entorn gràfic per GnuPG -Comment[cs]=Rozhraní pro GnuPG -Comment[cy]=Blaen-wyneb GnuPG -Comment[da]=En GnuPG-forende -Comment[de]=Eine Oberfläche für GnuPG -Comment[el]=Λογισμικό κρυπτογράφησης (GnuPG) -Comment[eo]=Fasado por GnuPG -Comment[es]=Interfaz para GnuPG -Comment[et]=GnuPG kasutajaliides -Comment[eu]=GnuPGren bitarteko bat -Comment[fa]=GnuPGنرمافزار نهایی -Comment[fi]=GnuPG-käyttöliittymä -Comment[fr]=Une interface à GnuPG -Comment[ga]=Comhéadan do GnuPG -Comment[he]=מנשק גרפי של GnuPG -Comment[hi]=एक ग्नू-पीजी फ्रन्टएण्ड -Comment[hu]=Grafikus kezelőprogram a GnuPG-hez -Comment[is]=Viðmót á GnuPG -Comment[it]=Interfaccia grafica per GnuPG -Comment[ja]=GnuPG のフロントエンド -Comment[ka]=GnuPG გრაფიკული გარსი -Comment[kk]=GnuPG интерфейсі -Comment[km]=កម្មវិធីខាងមុខ GnuPG -Comment[lt]=GnuPG naudotojo sąsaja -Comment[nb]=En GnuPG grenseflate -Comment[nds]=En GnuPG-Böversiet -Comment[ne]=GnuPG फ्रन्टेन्ड -Comment[nl]=Een programma om GnuPG-cryptografie en -ondertekening te gebruiken -Comment[nn]=Ei GnuPG-grenseflate -Comment[pa]=GnuPG ਮੁੱਖੜਾ -Comment[pl]=Interfejs do GnuPG -Comment[pt]=Uma interface para o GnuPG -Comment[pt_BR]=Uma interface para o GnuPG -Comment[ro]=Interfaţă grafică pentru GnuPG -Comment[ru]=Управление ключами GPG -Comment[sk]=Rozhranie pre GnuPG -Comment[sl]=Vmesnik za GnuPG -Comment[sr]=Интерфејс за GnuPG -Comment[sr@Latn]=Interfejs za GnuPG -Comment[sv]=Gränssnitt till GnuPG -Comment[ta]=GnuPG முன் அமைப்பு -Comment[tg]=Пешохири GnuPG -Comment[tr]=Bir GnuPG arayüzü -Comment[uk]=Інтерфейс до GnuPG -Comment[uz]=GnuPG uchun grafik interfeys -Comment[uz@cyrillic]=GnuPG учун график интерфейс -Comment[wa]=Ene eterface po GnuPG -Comment[zh_CN]=GnuPG 前端 -Comment[zh_TW]=GnuPG 前端軟體 Type=Application Exec=kgpg %U @@ -120,4 +16,4 @@ Terminal=false X-TDE-autostart-after=panel X-TDE-autostart-condition=kgpgrc:User Interface:AutoStart:false -Categories=Qt;TDE;Utility;
\ No newline at end of file +Categories=Qt;TDE;Utility; diff --git a/kgpg/kgpg.h b/kgpg/kgpg.h index e797d28..409f92b 100644 --- a/kgpg/kgpg.h +++ b/kgpg/kgpg.h @@ -43,7 +43,7 @@ class popupPublic; class MyView : public TQLabel { - Q_OBJECT + TQ_OBJECT public: @@ -121,7 +121,7 @@ signals: class kgpgapplet : public KSystemTray//KUniqueApplication { - Q_OBJECT + TQ_OBJECT public: @@ -145,7 +145,7 @@ class TDECmdLineArgs; class KgpgAppletApp : public KUniqueApplication { - Q_OBJECT + TQ_OBJECT friend class kgpgapplet; public: diff --git a/kgpg/kgpgeditor.cpp b/kgpg/kgpgeditor.cpp index b60ee8d..405005e 100644 --- a/kgpg/kgpgeditor.cpp +++ b/kgpg/kgpgeditor.cpp @@ -126,33 +126,33 @@ void KgpgApp::readOptions(bool doresize) void KgpgApp::initActions() { - KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(slotFileNew()), actionCollection()); - KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), actionCollection()); - KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAs()), actionCollection()); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection()); - KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotEditCut()), actionCollection()); - KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotEditCopy()), actionCollection()); - KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotEditPaste()), actionCollection()); - KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll()), actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotOptions()), actionCollection(),"kgpg_config"); - - //KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); - //KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureToolbars()), actionCollection()); - - fileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection()); - (void) new TDEAction(i18n("&Encrypt File..."), "encrypted", 0,TQT_TQOBJECT(this), TQT_SLOT(slotFilePreEnc()), actionCollection(),"file_encrypt"); - (void) new TDEAction(i18n("&Decrypt File..."), "decrypted", 0,TQT_TQOBJECT(this), TQT_SLOT(slotFilePreDec()), actionCollection(),"file_decrypt"); - (void) new TDEAction(i18n("&Open Key Manager"), "kgpg", 0,TQT_TQOBJECT(this), TQT_SLOT(slotKeyManager()), actionCollection(),"key_manage"); - editUndo = KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(slotundo()), actionCollection()); - editRedo = KStdAction::redo(TQT_TQOBJECT(this), TQT_SLOT(slotredo()), actionCollection()); - //(void) new TDEAction(i18n("&Manage Keys"), "kgpg_manage", CTRL+Key_K,TQT_TQOBJECT(this), TQT_SLOT(slotManageKey()), actionCollection(),"keys_manage"); - (void) new TDEAction(i18n("&Generate Signature..."),0, TQT_TQOBJECT(this), TQT_SLOT(slotPreSignFile()), actionCollection(), "sign_generate"); - (void) new TDEAction(i18n("&Verify Signature..."),0, TQT_TQOBJECT(this), TQT_SLOT(slotPreVerifyFile()), actionCollection(), "sign_verify"); - (void) new TDEAction(i18n("&Check MD5 Sum..."), 0,TQT_TQOBJECT(this), TQT_SLOT(slotCheckMd5()), actionCollection(), "sign_check"); - KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), actionCollection()); + KStdAction::openNew(this, TQ_SLOT(slotFileNew()), actionCollection()); + KStdAction::open(this, TQ_SLOT(slotFileOpen()), actionCollection()); + KStdAction::saveAs(this, TQ_SLOT(slotFileSaveAs()), actionCollection()); + KStdAction::quit(this, TQ_SLOT(slotFileQuit()), actionCollection()); + KStdAction::cut(this, TQ_SLOT(slotEditCut()), actionCollection()); + KStdAction::copy(this, TQ_SLOT(slotEditCopy()), actionCollection()); + KStdAction::paste(this, TQ_SLOT(slotEditPaste()), actionCollection()); + KStdAction::selectAll(this, TQ_SLOT(slotSelectAll()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(slotOptions()), actionCollection(),"kgpg_config"); + + //KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); + //KStdAction::configureToolbars(this, TQ_SLOT(slotConfigureToolbars()), actionCollection()); + + fileSave = KStdAction::save(this, TQ_SLOT(slotFileSave()), actionCollection()); + (void) new TDEAction(i18n("&Encrypt File..."), "encrypted", 0,this, TQ_SLOT(slotFilePreEnc()), actionCollection(),"file_encrypt"); + (void) new TDEAction(i18n("&Decrypt File..."), "decrypted", 0,this, TQ_SLOT(slotFilePreDec()), actionCollection(),"file_decrypt"); + (void) new TDEAction(i18n("&Open Key Manager"), "kgpg", 0,this, TQ_SLOT(slotKeyManager()), actionCollection(),"key_manage"); + editUndo = KStdAction::undo(this, TQ_SLOT(slotundo()), actionCollection()); + editRedo = KStdAction::redo(this, TQ_SLOT(slotredo()), actionCollection()); + //(void) new TDEAction(i18n("&Manage Keys"), "kgpg_manage", CTRL+Key_K,this, TQ_SLOT(slotManageKey()), actionCollection(),"keys_manage"); + (void) new TDEAction(i18n("&Generate Signature..."),0, this, TQ_SLOT(slotPreSignFile()), actionCollection(), "sign_generate"); + (void) new TDEAction(i18n("&Verify Signature..."),0, this, TQ_SLOT(slotPreVerifyFile()), actionCollection(), "sign_verify"); + (void) new TDEAction(i18n("&Check MD5 Sum..."), 0,this, TQ_SLOT(slotCheckMd5()), actionCollection(), "sign_check"); + KStdAction::print(this, TQ_SLOT(slotFilePrint()), actionCollection()); // comment out for now, only confusing - //encodingAction=new TDEToggleAction(i18n("&Unicode (utf-8) Encoding"), 0, 0,this, TQT_SLOT(slotSetCharset()),actionCollection(),"charsets"); + //encodingAction=new TDEToggleAction(i18n("&Unicode (utf-8) Encoding"), 0, 0,this, TQ_SLOT(slotSetCharset()),actionCollection(),"charsets"); } void KgpgApp::slotSetFont(TQFont myFont) @@ -181,7 +181,7 @@ void KgpgApp::initView() view = new KgpgView(this,0); // doc->addView(view); - connect(view,TQT_SIGNAL(resetEncoding(bool)),this,TQT_SLOT(slotResetEncoding(bool))); + connect(view,TQ_SIGNAL(resetEncoding(bool)),this,TQ_SLOT(slotResetEncoding(bool))); setCentralWidget(view); setCaption(i18n("Untitled"),false); /// doc->URL().fileName(),false); @@ -276,7 +276,7 @@ void KgpgApp::slotFilePreDec() } KgpgLibrary *lib=new KgpgLibrary(this); lib->slotFileDec(url,KURL(newname), customDecrypt); - connect(lib,TQT_SIGNAL(importOver(TQStringList)),this,TQT_SIGNAL(refreshImported(TQStringList))); + connect(lib,TQ_SIGNAL(importOver(TQStringList)),this,TQ_SIGNAL(refreshImported(TQStringList))); } else openEncryptedDocumentFile(url); } @@ -534,7 +534,7 @@ void KgpgApp::slotVerifyFile(KURL url) ///////////////////////// pipe gpg command KgpgInterface *verifyFileProcess=new KgpgInterface(); verifyFileProcess->KgpgVerifyFile(url,KURL(sigfile)); - connect (verifyFileProcess,TQT_SIGNAL(verifyquerykey(TQString)),this,TQT_SLOT(importSignatureKey(TQString))); + connect (verifyFileProcess,TQ_SIGNAL(verifyquerykey(TQString)),this,TQ_SLOT(importSignatureKey(TQString))); } } diff --git a/kgpg/kgpgeditor.h b/kgpg/kgpgeditor.h index 4f8a9fb..4b6d2c3 100644 --- a/kgpg/kgpgeditor.h +++ b/kgpg/kgpgeditor.h @@ -35,7 +35,7 @@ class KgpgView; class KgpgApp : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT friend class KgpgView; diff --git a/kgpg/kgpginterface.cpp b/kgpg/kgpginterface.cpp index 9fb5cca..e113bad 100644 --- a/kgpg/kgpginterface.cpp +++ b/kgpg/kgpginterface.cpp @@ -118,8 +118,8 @@ void KgpgInterface::KgpgEncryptFile(TQStringList encryptKeys,KURL srcUrl,KURL de *proc<<TQString(TQFile::encodeName(srcUrl.path())); ///////// when process ends, update dialog infos - TQObject::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),this,TQT_SLOT(encryptfin(TDEProcess *))); - TQObject::connect(proc,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(readencprocess(KProcIO *))); + TQObject::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),this,TQ_SLOT(encryptfin(TDEProcess *))); + TQObject::connect(proc,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(readencprocess(KProcIO *))); proc->start(TDEProcess::NotifyOnExit,true); } @@ -190,8 +190,8 @@ void KgpgInterface::KgpgDecryptFile(KURL srcUrl,KURL destUrl,TQStringList Option *proc<<"-d"<<TQString(TQFile::encodeName(srcUrl.path())); - TQObject::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),this,TQT_SLOT(decryptfin(TDEProcess *))); - TQObject::connect(proc,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(readdecprocess(KProcIO *))); + TQObject::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),this,TQ_SLOT(decryptfin(TDEProcess *))); + TQObject::connect(proc,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(readdecprocess(KProcIO *))); proc->start(TDEProcess::NotifyOnExit,true); } @@ -283,8 +283,8 @@ void KgpgInterface::KgpgEncryptText(TQString text,TQStringList userIDs, TQString ///////// when process ends, update dialog infos - TQObject::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),this,TQT_SLOT(txtencryptfin(TDEProcess *))); - TQObject::connect(proc,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(txtreadencprocess(KProcIO *))); + TQObject::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),this,TQ_SLOT(txtencryptfin(TDEProcess *))); + TQObject::connect(proc,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(txtreadencprocess(KProcIO *))); proc->start(TDEProcess::NotifyOnExit,false); emit txtencryptionstarted(); } @@ -352,9 +352,9 @@ void KgpgInterface::KgpgDecryptText(TQString text,TQStringList Options) ///////// when process ends, update dialog infos - 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))); + TQObject::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),this,TQ_SLOT(txtdecryptfin(TDEProcess *))); + connect(proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),this, TQ_SLOT(getOutput(TDEProcess *, char *, int))); + connect(proc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)),this, TQ_SLOT(getCmdOutput(TDEProcess *, char *, int))); proc->start(TDEProcess::NotifyOnExit,TDEProcess::All); proc->writeStdin(text.utf8(), text.length()); } @@ -471,8 +471,8 @@ void KgpgInterface::KgpgSignText(TQString text,TQString userIDs, TQStringList Op ///////// when process ends, update dialog infos - TQObject::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),this,TQT_SLOT(txtsignfin(TDEProcess *))); - TQObject::connect(proc,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(txtsignprocess(KProcIO *))); + TQObject::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),this,TQ_SLOT(txtsignfin(TDEProcess *))); + TQObject::connect(proc,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(txtsignprocess(KProcIO *))); //emit txtsigningstarted(); @@ -571,9 +571,9 @@ void KgpgInterface::KgpgDecryptFileToText(KURL srcUrl,TQStringList Options) ///////// when process ends, update dialog infos - 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))); + connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),this,TQ_SLOT(txtdecryptfin(TDEProcess *))); + connect(proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),this, TQ_SLOT(getOutput(TDEProcess *, char *, int))); + connect(proc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)),this, TQ_SLOT(getCmdOutput(TDEProcess *, char *, int))); proc->start(TDEProcess::NotifyOnExit,TDEProcess::All); } @@ -592,8 +592,8 @@ 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(TDEProcess *)),this, TQT_SLOT(slotverifyresult(TDEProcess *))); - connect(verifyproc, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotverifyread(KProcIO *))); + connect(verifyproc, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotverifyresult(TDEProcess *))); + connect(verifyproc, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(slotverifyread(KProcIO *))); verifyproc->start(TDEProcess::NotifyOnExit,true); verifyproc->writeStdin (text); verifyproc->closeWhenDone(); @@ -655,7 +655,7 @@ Md5Widget::Md5Widget(TQWidget *parent, const char *name,KURL url):KDialogBase( p f.open( IO_ReadOnly); KMD5 checkfile; checkfile.reset(); - checkfile.update(*TQT_TQIODEVICE(&f)); + checkfile.update(f); mdSum=checkfile.hexDigest().data(); f.close(); TQWidget *page = new TQWidget(this); @@ -743,8 +743,8 @@ void KgpgInterface::KgpgSignFile(TQString keyID,KURL srcUrl,TQStringList Options *proc<<"--output"<<TQString(TQFile::encodeName(srcUrl.path()+".sig")); *proc<<"--detach-sig"<<TQString(TQFile::encodeName(srcUrl.path())); - TQObject::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),this,TQT_SLOT(signfin(TDEProcess *))); - TQObject::connect(proc,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(readsignprocess(KProcIO *))); + TQObject::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),this,TQ_SLOT(signfin(TDEProcess *))); + TQObject::connect(proc,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(readsignprocess(KProcIO *))); proc->start(TDEProcess::NotifyOnExit,true); } @@ -819,8 +819,8 @@ void KgpgInterface::KgpgVerifyFile(KURL sigUrl,KURL srcUrl) *proc<<TQString(TQFile::encodeName(srcUrl.path())); *proc<<TQString(TQFile::encodeName(sigUrl.path())); - TQObject::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),this,TQT_SLOT(verifyfin(TDEProcess *))); - TQObject::connect(proc,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(readprocess(KProcIO *))); + TQObject::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),this,TQ_SLOT(verifyfin(TDEProcess *))); + TQObject::connect(proc,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(readprocess(KProcIO *))); proc->start(TDEProcess::NotifyOnExit,true); } @@ -903,8 +903,8 @@ void KgpgInterface::KgpgSignKey(TQString keyID,TQString signKeyID,TQString signK *conprocess<<"--edit-key"<<keyID; 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(TDEProcess *)),this, TQT_SLOT(signover(TDEProcess *))); + TQObject::connect(conprocess,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(sigprocess(KProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(signover(TDEProcess *))); TQApplication::setOverrideCursor(TQCursor(TQt::BusyCursor)); conprocess->start(TDEProcess::NotifyOnExit,true); } @@ -1151,8 +1151,8 @@ void KgpgInterface::KgpgDelSignature(TQString keyID,TQString signKeyID) KProcIO *conprocess=new KProcIO(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,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(delsigprocess(KProcIO *))); - TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(delsignover(TDEProcess *))); + TQObject::connect(conprocess,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(delsigprocess(KProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(delsignover(TDEProcess *))); TQApplication::setOverrideCursor(TQCursor(TQt::BusyCursor)); conprocess->start(TDEProcess::NotifyOnExit,true); } @@ -1242,8 +1242,8 @@ void KgpgInterface::KgpgKeyExpire(TQString keyID,TQDate date,bool unlimited) KProcIO *conprocess=new KProcIO(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,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(expprocess(KProcIO *))); - TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(expover(TDEProcess *))); + TQObject::connect(conprocess,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(expprocess(KProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(expover(TDEProcess *))); conprocess->start(TDEProcess::NotifyOnExit,TDEProcess::AllOutput); } @@ -1339,8 +1339,8 @@ void KgpgInterface::KgpgTrustExpire(TQString keyID,int keyTrust) KProcIO *conprocess=new KProcIO(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,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(trustprocess(KProcIO *))); - TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(trustover(TDEProcess *))); + TQObject::connect(conprocess,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(trustprocess(KProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(trustover(TDEProcess *))); conprocess->start(TDEProcess::NotifyOnExit,true); } @@ -1398,8 +1398,8 @@ void KgpgInterface::KgpgChangePass(TQString keyID) KProcIO *conprocess=new KProcIO(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,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(passprocess(KProcIO *))); - TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(passover(TDEProcess *))); + TQObject::connect(conprocess,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(passprocess(KProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(passover(TDEProcess *))); conprocess->start(TDEProcess::NotifyOnExit,TDEProcess::AllOutput); } @@ -1505,7 +1505,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 *))); + TQObject::connect(proc, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(slotReadKey(KProcIO *))); proc->start(TDEProcess::Block,false); return keyString; } @@ -1533,8 +1533,8 @@ void KgpgInterface::importKeyURL(KURL url) *conprocess<< "gpg"<<"--no-tty"<<"--no-secmem-warning"<<"--status-fd=2"<<"--utf8-strings"<<"--import"; *conprocess<<"--allow-secret-key-import"; *conprocess<<tempKeyFile; - TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(importURLover(TDEProcess *))); - TQObject::connect(conprocess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(importprocess(KProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(importURLover(TDEProcess *))); + TQObject::connect(conprocess, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(importprocess(KProcIO *))); conprocess->start(TDEProcess::NotifyOnExit,true); } } @@ -1546,8 +1546,8 @@ 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(TDEProcess *)),this, TQT_SLOT(importover(TDEProcess *))); - TQObject::connect(conprocess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(importprocess(KProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(importover(TDEProcess *))); + TQObject::connect(conprocess, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(importprocess(KProcIO *))); conprocess->start(TDEProcess::NotifyOnExit,true); conprocess->writeStdin(keystr, true); conprocess->closeWhenDone(); @@ -1653,8 +1653,8 @@ addSuccess=true; KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); *conprocess<< "gpg"<<"--no-tty"<<"--status-fd=2"<<"--command-fd=0"<<"--utf8-strings"; *conprocess<<"--edit-key"<<keyID<<"adduid"; - TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(adduidover(TDEProcess *))); - TQObject::connect(conprocess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(adduidprocess(KProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(adduidover(TDEProcess *))); + TQObject::connect(conprocess, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(adduidprocess(KProcIO *))); conprocess->start(TDEProcess::NotifyOnExit,true); } @@ -1740,8 +1740,8 @@ userIDs=keyID; KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); *conprocess<< "gpg"<<"--no-tty"<<"--status-fd=2"<<"--command-fd=0"; *conprocess<<"--with-colon"<<"--list-keys"<<keyID; - TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(photoreadover(TDEProcess *))); - TQObject::connect(conprocess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(photoreadprocess(KProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(photoreadover(TDEProcess *))); + TQObject::connect(conprocess, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(photoreadprocess(KProcIO *))); conprocess->start(TDEProcess::NotifyOnExit,true); } @@ -1793,8 +1793,8 @@ 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"<<keyID<<"uid"<<uid<<"deluid"; - TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(delphotoover(TDEProcess *))); - TQObject::connect(conprocess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(delphotoprocess(KProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(delphotoover(TDEProcess *))); + TQObject::connect(conprocess, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(delphotoprocess(KProcIO *))); conprocess->start(TDEProcess::NotifyOnExit,true); } @@ -1859,8 +1859,8 @@ addSuccess=true; KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); *conprocess<< "gpg"<<"--no-tty"<<"--status-fd=2"<<"--command-fd=0"<<"--utf8-strings"; *conprocess<<"--edit-key"<<keyID<<"addphoto"; - TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(addphotoover(TDEProcess *))); - TQObject::connect(conprocess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(addphotoprocess(KProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(addphotoover(TDEProcess *))); + TQObject::connect(conprocess, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(addphotoprocess(KProcIO *))); conprocess->start(TDEProcess::NotifyOnExit,true); } @@ -1943,8 +1943,8 @@ void KgpgInterface::KgpgRevokeKey(TQString keyID,TQString revokeUrl,int reason,T if (!revokeUrl.isEmpty()) *conprocess<<"-o"<<revokeUrl; *conprocess<<"--gen-revoke"<<keyID; - TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(revokeover(TDEProcess *))); - TQObject::connect(conprocess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(revokeprocess(KProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(revokeover(TDEProcess *))); + TQObject::connect(conprocess, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(revokeprocess(KProcIO *))); conprocess->start(TDEProcess::NotifyOnExit,true); } diff --git a/kgpg/kgpginterface.h b/kgpg/kgpginterface.h index 2433c72..0dc2654 100644 --- a/kgpg/kgpginterface.h +++ b/kgpg/kgpginterface.h @@ -36,7 +36,7 @@ class KLed; class KgpgInterface : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -389,7 +389,7 @@ private: class Md5Widget :public KDialogBase { - Q_OBJECT + TQ_OBJECT public: Md5Widget(TQWidget *parent=0, const char *name=0,KURL url=KURL()); diff --git a/kgpg/kgpglibrary.cpp b/kgpg/kgpglibrary.cpp index 66fbc45..05af489 100644 --- a/kgpg/kgpglibrary.cpp +++ b/kgpg/kgpglibrary.cpp @@ -54,7 +54,7 @@ void KgpgLibrary::slotFileEnc(KURL::List urls,TQStringList opts,TQStringList def TQString fileNames=urls.first().fileName(); if (urls.count()>1) fileNames+=",..."; popupPublic *dialogue=new popupPublic(0,"Public keys",fileNames,true,goDefaultKey); - connect(dialogue,TQT_SIGNAL(selectedKey(TQStringList,TQStringList,bool,bool)),this,TQT_SLOT(startencode(TQStringList,TQStringList,bool,bool))); + connect(dialogue,TQ_SIGNAL(selectedKey(TQStringList,TQStringList,bool,bool)),this,TQ_SLOT(startencode(TQStringList,TQStringList,bool,bool))); dialogue->exec(); delete dialogue; } else @@ -111,11 +111,11 @@ void KgpgLibrary::fastencode(KURL &fileToCrypt,TQStringList selec,TQStringList e cryptFileProcess->KgpgEncryptFile(selec,urlselected,dest,encryptOptions,symetric); if (!popIsActive) { - //connect(cryptFileProcess,TQT_SIGNAL(processstarted(TQString)),this,TQT_SLOT(processpopup2(TQString))); + //connect(cryptFileProcess,TQ_SIGNAL(processstarted(TQString)),this,TQ_SLOT(processpopup2(TQString))); popIsActive=true; } - connect(cryptFileProcess,TQT_SIGNAL(encryptionfinished(KURL)),this,TQT_SLOT(processenc(KURL))); - connect(cryptFileProcess,TQT_SIGNAL(errormessage(TQString)),this,TQT_SLOT(processencerror(TQString))); + connect(cryptFileProcess,TQ_SIGNAL(encryptionfinished(KURL)),this,TQ_SLOT(processenc(KURL))); + connect(cryptFileProcess,TQ_SIGNAL(errormessage(TQString)),this,TQ_SLOT(processencerror(TQString))); } void KgpgLibrary::processpopup2(TQString fileName) @@ -144,7 +144,7 @@ emit systemMessage(i18n("Shredding %n file","Shredding %n files",filesToShred.co TDEIO::Job *job; job = TDEIO::del( filesToShred, true ); -connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),TQT_SLOT( slotShredResult( TDEIO::Job * ) ) ); +connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),TQ_SLOT( slotShredResult( TDEIO::Job * ) ) ); } void KgpgLibrary::slotShredResult( TDEIO::Job * job ) @@ -184,10 +184,10 @@ void KgpgLibrary::slotFileDec(KURL srcUrl,KURL destUrl,TQStringList customDecryp pop = new KPassivePopup(); urlselected=srcUrl; decryptFileProcess->KgpgDecryptFile(srcUrl,destUrl,customDecryptOption); - connect(decryptFileProcess,TQT_SIGNAL(processaborted(bool)),this,TQT_SLOT(processdecover())); - connect(decryptFileProcess,TQT_SIGNAL(processstarted(TQString)),this,TQT_SLOT(processpopup(TQString))); - connect(decryptFileProcess,TQT_SIGNAL(decryptionfinished()),this,TQT_SLOT(processdecover())); - connect(decryptFileProcess,TQT_SIGNAL(errormessage(TQString)),this,TQT_SLOT(processdecerror(TQString))); + connect(decryptFileProcess,TQ_SIGNAL(processaborted(bool)),this,TQ_SLOT(processdecover())); + connect(decryptFileProcess,TQ_SIGNAL(processstarted(TQString)),this,TQ_SLOT(processpopup(TQString))); + connect(decryptFileProcess,TQ_SIGNAL(decryptionfinished()),this,TQ_SLOT(processdecover())); + connect(decryptFileProcess,TQ_SIGNAL(errormessage(TQString)),this,TQ_SLOT(processdecerror(TQString))); } void KgpgLibrary::processpopup(TQString fileName) @@ -228,7 +228,7 @@ void KgpgLibrary::processdecerror(TQString mssge) else { KgpgInterface *importKeyProcess=new KgpgInterface(); importKeyProcess->importKeyURL(urlselected); - connect(importKeyProcess,TQT_SIGNAL(importfinished(TQStringList)),this,TQT_SIGNAL(importOver(TQStringList))); + connect(importKeyProcess,TQ_SIGNAL(importfinished(TQStringList)),this,TQ_SIGNAL(importOver(TQStringList))); return; } } else if (result.startsWith("-----BEGIN PGP PRIVATE KEY BLOCK")) {////// dropped file is a public key, ask for import diff --git a/kgpg/kgpglibrary.h b/kgpg/kgpglibrary.h index 267b7f6..965201c 100644 --- a/kgpg/kgpglibrary.h +++ b/kgpg/kgpglibrary.h @@ -30,7 +30,7 @@ class KProgress; class KgpgLibrary : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kgpg/kgpgoptions.cpp b/kgpg/kgpgoptions.cpp index f412172..3c18751 100644 --- a/kgpg/kgpgoptions.cpp +++ b/kgpg/kgpgoptions.cpp @@ -117,26 +117,26 @@ kgpgOptions::kgpgOptions(TQWidget *parent, const char *name) page1->clear_fkey->setIconSet(TQIconSet(TQPixmap(SmallIcon("clear_left")))); // The following widgets are managed manually. - connect(page1->change_fkey, TQT_SIGNAL(clicked()), this, TQT_SLOT(insertFileKey())); - connect(page1->clear_fkey, TQT_SIGNAL(clicked()), page1->kcfg_FileKey, TQT_SLOT(clear())); - connect(page1->change_akey, TQT_SIGNAL(clicked()), this, TQT_SLOT(insertAlwaysKey())); - connect(page1->clear_akey, TQT_SIGNAL(clicked()), page1->alwaysKey, TQT_SLOT(clear())); - connect(page1->alwaysKey, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateButtons())); - connect(page4->gpg_conf_path, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateButtons())); - connect(page4->gpg_home_path, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateButtons())); - connect(page4->use_agent, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateButtons())); - connect(page4->changeHome, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotChangeHome())); - connect(page4->kcfg_PubKeyring, TQT_SIGNAL(toggled (bool)), page4->kcfg_PubKeyringUrl, TQT_SLOT(setEnabled(bool))); - connect(page4->kcfg_PubKeyring, TQT_SIGNAL(toggled (bool)), this, TQT_SLOT(checkAdditionalState(bool))); - connect(page4->kcfg_PrivKeyring, TQT_SIGNAL(toggled (bool)), page4->kcfg_PrivKeyringUrl, TQT_SLOT(setEnabled(bool))); - connect(page4->kcfg_PrivKeyring, TQT_SIGNAL(toggled (bool)), this, TQT_SLOT(checkAdditionalState(bool))); - connect(page6->server_add, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddKeyServer())); - connect(page6->server_del, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDelKeyServer())); - connect(page6->server_default, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDefaultKeyServer())); - connect(page6->ServerBox, TQT_SIGNAL(currentChanged ( TQListBoxItem *)), this, TQT_SLOT(updateButtons())); - connect(page7->pushShredder, TQT_SIGNAL(clicked ()), this, TQT_SIGNAL(installShredder())); - - //connect(this, TQT_SIGNAL(settingsChanged()), TQT_SLOT(updateSettings())); + connect(page1->change_fkey, TQ_SIGNAL(clicked()), this, TQ_SLOT(insertFileKey())); + connect(page1->clear_fkey, TQ_SIGNAL(clicked()), page1->kcfg_FileKey, TQ_SLOT(clear())); + connect(page1->change_akey, TQ_SIGNAL(clicked()), this, TQ_SLOT(insertAlwaysKey())); + connect(page1->clear_akey, TQ_SIGNAL(clicked()), page1->alwaysKey, TQ_SLOT(clear())); + connect(page1->alwaysKey, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateButtons())); + connect(page4->gpg_conf_path, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateButtons())); + connect(page4->gpg_home_path, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateButtons())); + connect(page4->use_agent, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updateButtons())); + connect(page4->changeHome, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotChangeHome())); + connect(page4->kcfg_PubKeyring, TQ_SIGNAL(toggled (bool)), page4->kcfg_PubKeyringUrl, TQ_SLOT(setEnabled(bool))); + connect(page4->kcfg_PubKeyring, TQ_SIGNAL(toggled (bool)), this, TQ_SLOT(checkAdditionalState(bool))); + connect(page4->kcfg_PrivKeyring, TQ_SIGNAL(toggled (bool)), page4->kcfg_PrivKeyringUrl, TQ_SLOT(setEnabled(bool))); + connect(page4->kcfg_PrivKeyring, TQ_SIGNAL(toggled (bool)), this, TQ_SLOT(checkAdditionalState(bool))); + connect(page6->server_add, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddKeyServer())); + connect(page6->server_del, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDelKeyServer())); + connect(page6->server_default, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDefaultKeyServer())); + connect(page6->ServerBox, TQ_SIGNAL(currentChanged ( TQListBoxItem *)), this, TQ_SLOT(updateButtons())); + connect(page7->pushShredder, TQ_SIGNAL(clicked ()), this, TQ_SIGNAL(installShredder())); + + //connect(this, TQ_SIGNAL(settingsChanged()), TQ_SLOT(updateSettings())); keyGood=KGpgSettings::colorGood(); keyUnknown=KGpgSettings::colorUnknown(); diff --git a/kgpg/kgpgoptions.h b/kgpg/kgpgoptions.h index 272384e..7411908 100644 --- a/kgpg/kgpgoptions.h +++ b/kgpg/kgpgoptions.h @@ -38,7 +38,7 @@ class KSimpleConfig; class kgpgOptions : public TDEConfigDialog { - Q_OBJECT + TQ_OBJECT public: kgpgOptions(TQWidget *parent=0, const char *name=0); diff --git a/kgpg/kgpgrevokewidget.ui b/kgpg/kgpgrevokewidget.ui index c5cd4af..b73711f 100644 --- a/kgpg/kgpgrevokewidget.ui +++ b/kgpg/kgpgrevokewidget.ui @@ -140,14 +140,12 @@ <tabstop>kURLRequester1</tabstop> </tabstops> <includes> - <include location="local" impldecl="in implementation">kgpgrevokewidget.ui.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> <include location="global" impldecl="in implementation">kurlrequester.h</include> + <include location="local" impldecl="in implementation">kgpgrevokewidget.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>cbSave_toggled( bool isOn )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> diff --git a/kgpg/kgpgview.cpp b/kgpg/kgpgview.cpp index 0c044f7..525dacd 100644 --- a/kgpg/kgpgview.cpp +++ b/kgpg/kgpgview.cpp @@ -134,7 +134,7 @@ TQFile qfile(fileToCheck); } else { KgpgInterface *importKeyProcess=new KgpgInterface(); importKeyProcess->importKeyURL(KURL(fileToCheck)); - connect(importKeyProcess,TQT_SIGNAL(importfinished(TQStringList)),TQT_TQOBJECT(this),TQT_SLOT(slotProcessResult(TQStringList))); + connect(importKeyProcess,TQ_SIGNAL(importfinished(TQStringList)),this,TQ_SLOT(slotProcessResult(TQStringList))); return true; } } else { @@ -172,8 +172,8 @@ void MyEditor::slotDecodeFile(TQString fname) TQFile qfile(TQFile::encodeName(fname)); if (qfile.open(IO_ReadOnly)) { KgpgInterface *txtDecrypt=new KgpgInterface(); - connect (txtDecrypt,TQT_SIGNAL(txtdecryptionfinished(TQString)),TQT_TQOBJECT(this),TQT_SLOT(editorUpdateDecryptedtxt(TQString))); - connect (txtDecrypt,TQT_SIGNAL(txtdecryptionfailed(TQString)),TQT_TQOBJECT(this),TQT_SLOT(editorFailedDecryptedtxt(TQString))); + connect (txtDecrypt,TQ_SIGNAL(txtdecryptionfinished(TQString)),this,TQ_SLOT(editorUpdateDecryptedtxt(TQString))); + connect (txtDecrypt,TQ_SIGNAL(txtdecryptionfailed(TQString)),this,TQ_SLOT(editorFailedDecryptedtxt(TQString))); txtDecrypt->KgpgDecryptFileToText(KURL(fname),TQStringList::split(TQString(" "),KGpgSettings::customDecrypt().simplifyWhiteSpace())); } else KMessageBox::sorry(this,i18n("Unable to read file.")); @@ -205,14 +205,14 @@ KgpgView::KgpgView(TQWidget *parent, const char *name) : TQWidget(parent, name) setAcceptDrops(true); - KButtonBox *boutonbox=new KButtonBox(this,Qt::Horizontal,15,12); + KButtonBox *boutonbox=new KButtonBox(this,TQt::Horizontal,15,12); boutonbox->addStretch(1); - bouton0=boutonbox->addButton(i18n("S&ign/Verify"),TQT_TQOBJECT(this),TQT_SLOT(clearSign()),TRUE); - bouton1=boutonbox->addButton(i18n("En&crypt"),TQT_TQOBJECT(this),TQT_SLOT(popuppublic()),TRUE); - bouton2=boutonbox->addButton(i18n("&Decrypt"),TQT_TQOBJECT(this),TQT_SLOT(slotdecode()),TRUE); + bouton0=boutonbox->addButton(i18n("S&ign/Verify"),this,TQ_SLOT(clearSign()),TRUE); + bouton1=boutonbox->addButton(i18n("En&crypt"),this,TQ_SLOT(popuppublic()),TRUE); + bouton2=boutonbox->addButton(i18n("&Decrypt"),this,TQ_SLOT(slotdecode()),TRUE); - TQObject::connect(editor,TQT_SIGNAL(textChanged()),TQT_TQOBJECT(this),TQT_SLOT(modified())); + TQObject::connect(editor,TQ_SIGNAL(textChanged()),this,TQ_SLOT(modified())); boutonbox->layout(); editor->resize(editor->maximumSize()); @@ -261,8 +261,8 @@ void KgpgView::clearSign() if (mess.startsWith("-----BEGIN PGP SIGNED")) { ////////////////////// this is a signed message, verify it KgpgInterface *verifyProcess=new KgpgInterface(); - connect(verifyProcess,TQT_SIGNAL(missingSignature(TQString)),TQT_TQOBJECT(this),TQT_SLOT(slotAskForImport(TQString))); - connect(verifyProcess,TQT_SIGNAL(verifyOver(TQString,TQString)),TQT_TQOBJECT(this),TQT_SLOT(slotVerifyResult(TQString,TQString))); + connect(verifyProcess,TQ_SIGNAL(missingSignature(TQString)),this,TQ_SLOT(slotAskForImport(TQString))); + connect(verifyProcess,TQ_SIGNAL(verifyOver(TQString,TQString)),this,TQ_SLOT(slotVerifyResult(TQString,TQString))); verifyProcess->KgpgVerifyText(mess); } else { @@ -280,7 +280,7 @@ void KgpgView::clearSign() delete opts; KgpgInterface *signProcess=new KgpgInterface(); - connect(signProcess,TQT_SIGNAL(txtSignOver(TQString)),TQT_TQOBJECT(this),TQT_SLOT(slotSignResult(TQString))); + connect(signProcess,TQ_SIGNAL(txtSignOver(TQString)),this,TQ_SLOT(slotSignResult(TQString))); TQStringList options=NULL; if (KGpgSettings::pgpCompatibility()) options<<"--pgp6"; @@ -312,7 +312,7 @@ void KgpgView::popuppublic() //////// open dialog --> popuppublic.cpp popupPublic *dialogue=new popupPublic(this, "public_keys", 0,false,((KgpgApp *) parent())->goDefaultKey); - connect(dialogue,TQT_SIGNAL(selectedKey(TQStringList,TQStringList,bool,bool)),TQT_TQOBJECT(this),TQT_SLOT(encodetxt(TQStringList,TQStringList,bool,bool))); + connect(dialogue,TQ_SIGNAL(selectedKey(TQStringList,TQStringList,bool,bool)),this,TQ_SLOT(encodetxt(TQStringList,TQStringList,bool,bool))); dialogue->exec(); delete dialogue; } @@ -329,8 +329,8 @@ void KgpgView::slotdecode() //TQString resultat=KgpgInterface::KgpgDecryptText(editor->text(),encUsers); KgpgInterface *txtDecrypt=new KgpgInterface(); - connect (txtDecrypt,TQT_SIGNAL(txtdecryptionfinished(TQString)),TQT_TQOBJECT(this),TQT_SLOT(updateDecryptedtxt(TQString))); - connect (txtDecrypt,TQT_SIGNAL(txtdecryptionfailed(TQString)),TQT_TQOBJECT(this),TQT_SLOT(failedDecryptedtxt(TQString))); + connect (txtDecrypt,TQ_SIGNAL(txtdecryptionfinished(TQString)),this,TQ_SLOT(updateDecryptedtxt(TQString))); + connect (txtDecrypt,TQ_SIGNAL(txtdecryptionfailed(TQString)),this,TQ_SLOT(failedDecryptedtxt(TQString))); txtDecrypt->KgpgDecryptText(editor->text(),TQStringList::split(TQString(" "),KGpgSettings::customDecrypt().simplifyWhiteSpace())); /* @@ -371,7 +371,7 @@ void KgpgView::encodetxt(TQStringList selec,TQStringList encryptOptions,bool, bo if (symmetric) selec.clear(); KgpgInterface *txtCrypt=new KgpgInterface(); - connect (txtCrypt,TQT_SIGNAL(txtencryptionfinished(TQString)),TQT_TQOBJECT(this),TQT_SLOT(updatetxt(TQString))); + connect (txtCrypt,TQ_SIGNAL(txtencryptionfinished(TQString)),this,TQ_SLOT(updatetxt(TQString))); txtCrypt->KgpgEncryptText(editor->text(),selec,encryptOptions); //KMessageBox::sorry(0,"OVER"); diff --git a/kgpg/kgpgview.h b/kgpg/kgpgview.h index bca013e..54fbcb5 100644 --- a/kgpg/kgpgview.h +++ b/kgpg/kgpgview.h @@ -40,7 +40,7 @@ class TQDragEnterEvent; class MyEditor : public KTextEdit { - Q_OBJECT + TQ_OBJECT public: @@ -68,7 +68,7 @@ signals: class KgpgView : public TQWidget { - Q_OBJECT + TQ_OBJECT friend class MyEditor; public: diff --git a/kgpg/kgpgwizard.ui b/kgpg/kgpgwizard.ui index fe4167c..37f3169 100644 --- a/kgpg/kgpgwizard.ui +++ b/kgpg/kgpgwizard.ui @@ -394,16 +394,14 @@ Remember that if you download a file or open one in an editor, parts of the file <data format="XPM.GZ" length="79396">789cedbd59732339b2eff97e3e45dbc1dbb1315c52a4b8d8d83c68a5b84994445112c7e6014bec3b1791e2b5f9ee0384bb23b3faa8bbab32d95975e7b264acc89f18810838dcffee4090a1fff15f7f7b9b4dfff65fffe33fd61bb189d4df5428567ffb2fbdcdb2cffffbfff9bffee77ffc67b375f6b7b3b3c6df9a67ddf6dfcefef3fff88ffff4c5dfd4df58a3d750cd5ecd9fc4670dcbe11970b3d1acd96f10c3fbfa1db9dda88f570762d83f6c39aedf0fe6c467fd9a2f907bb07f32b2dc6cd0f5841b60f31bb8be9018f6d7a56338bf2286eb2b17c8787dde8e188e57b963385e13c3f1ded6717dbd7e4adc6ad69c11b76bd64b64ec8f2a1c43fb7b62689f6d1dd7ed2717c4d0be2256d8dea763684f10437b41d771dd1e6b11437be9d871fd7e86ed9da13dbd0fc775fbfc8e18f62f7b353b7ff09e1dd7fbeb4f64b4af7e720cd73b25c6ebfd2006fb791e32dacfeb3b86e325318e0f730cd7372486ebd58fc4d0be3f712c6a7b64c8685f39725c9f4f8e89e17cbcedb86e5fe4c4605ff6e1b87e3fe4c4d8bfd4717dfec09defbc8ec704dba7f150dc31f49f1163fc1d1cd7e7e37362b81e7ee518de3f2786eba9bac478fed8717d7dea1219c74f3788e1fce9ce31b44fed617cb06bc7f0fe9018cebfda3a86f1a0feb6e1fc2bb77fa7bebe402353bcb488b1bf3d62689f5f3aaedb93b55e9db97809678eebf6bc0631b4e7ed81c9feb24f8cfe70e618faf74c8cfdbf2286eb0953c7f5f5887362b0bf7c4346fbaa9d6368bf458cedb71d839e3a86f329b73f9c6f45d7db86f3a57dc760ff1e31d87b758b8cf1a69963b89e0e315c4f103806fda1ebc7f1f0368eebf38509315c4ff9e218aed7b587d7d3740cf15322e3f85553623c3fd917e34ff88eebe3a301319c3f2b88e17ce53d700bc78f49c7f5f1fc8218ed79edb87ebf84ebef937fe80299f42f760cfec789c19e72888cf6571f8ea1bd9c18ed7fe618f4f08218f3d31e19eda5bbc4986f268e617c07c4707cf0460cfd5d5d1383bd62b07fbf85fdf53431faebc631b47f438cf17aeb18ec3b2286f385d231f8cf1d32da4b798e61fca93dd2972131b4173d39aedf6797c438fe5bc7e06f3de26eab3e7f1319ed1d1c88a17d3e765c1f9f53ffd19ff33bc7e02f136268bfa2f7d1be6904dc26ffaae3a7d5a4f12f1f1c433c3062b0afbc40c6f1970762b45fd3311cdf20c6e3ef80693c55e618fadf27c6f1bc26067b54cfc8e8ef9a8e277fbf740cfed12046fdb8770ce3bf2686f6f357c7f5fb71428cfa312306fbfa747d546f6d1d837d26c4d89f27c7a0df0762387fcc1c83bf2d89d19fa68e21bf5e21a37de3dc311c9f12a3be7c3a067fdc1043fbc5d271fd7ef1410cfd5d1d1ccbfa7d4ddcabdf4f6f80db385e7ed771dd5ef24c0ce7634bc7905f77c470be724cdc57f5f8dd22e3786413c760cf36311c9f0f88e1faaa3a7e5b4eaf74df31f813d8cbe94b191363bdb144467ff372c770fc8c18eb23e118f2d18818f3d51531da234226ff61c4988fdb8e217ea97df48f78ee18f488ae1ffb2707c4188f5dc790cfdcfe387e9c18fd6fe718e2078f6fa3bdc49818f3ddc431e8f13b31b6bf705cbf9f85c4680fe118f44f12c3f86637c430be31bd4ff17d490cedf18363389f470cfe2c02e27ebbf6ef6764b4afd7740cfda1fea1de662f8eebf6c257e25ecd0afdab8df1949c398678da12437f0af48f73ea3ff6f7fc1cdacb2262b8dea8d6b77693eab7f49918ec1d3c20933f9d39aedbf77ac4a8171531f63f43467fe14d62d4cfc031c4a3db1ff5e51a98f2afdf2386f7f58763f0ef4b64aa2f3bc4a84f1e31eac5c6716d1f4ded637f5789e3faf82a24c6f3a3fd283e04730cf1312586fdc508d8f97be218f4d9bd0ff629c68ea1ff3931fae7d271fdbe56c8a42f53623cdfda31e8e78218ce273a8ea1bd67621c8fc831d89b11833d195d3fda8b53fb549fbc3986787b2046fb148e61bcbac4d07efa480cfe1edd2153fe3a2386e3934f62ac9fae1cd7e31dd0f9307e3c3a9f82f8c8c8de4ad41c0f8129bea23931b42f6e1cd7ed273b62683f79715cbf1f65c470bee4e0b8ce5f11473e87f678490ced89d431e807faf7791ff7cf89e1fd74450ce78b717ccf3570f804dc3987fe16cc717d3d29d84b50fcfb7d645a5f181363be3a3886f7b7c0546f4b418cfb4bc7504f5d23a3bf7a3e31ecef158e217fdd10833fc917c7e01f6b64f42771818cfea1211e05c563de45c6f8919f8e213e3831ae674c1dc3fbb7c8a8272c740cfd97c438df183a06ff5f10437fd41c19ed2d687fb4b7b8750cef7bc4988f3f1c43fc3688d11ed89f731c0f513a06fba6c4584f0d1d43bcdd1263bc7e10833f277d628ca70df239ea419b18c72f710cf9f79918da0f946388e70631e643c7989f2f1dd7d7e3d3f5a2bf276fc4b2e612fdcbc453dd1e9f3986f85a11637c6f1d437e3e23c6f8168eebf387f7c470fe32725cbf9fed91359ccf0f88e17cc1d031e8cd2b319ecf735cb7b7720ce75b69e04e138e0f2262d4831d32da333d10c3fbeccc71dd7ebe2506fb55753e383f233da8ae1d433cde0253fc27b963a87f1f91295ff588617fd5700cf9b9498cf9f90119e32b1f3986f8bc20c6f9f1d031f8fb1899ea959e63d07f9f188eafbe31e43fbc7ecacfd92d31fa53df318cdf3531dadb43c6fe472fc438ffbb2486e3334d8cf900fb4bfa92bf3b06fb2e88f1fadf8831bfb61d433dfa844cf3c38963184f6a0ff367dc755cfb0753c04e5f068ec13e5d62d4bbd2318c47807c8ec7f71c837fec89b1fe74fb63bef68851ef56c87dd4b70e31ce277a8e41df3262acbf77c4584fe37852bc06cfc4604fc61dc3fce192188fa7ebc1f84c136288a70c8f37f10af5cad431d4af0b62684faf1dd7f62f57c4d07e903986f845ffed603dc1a97d8cf7403a06fd1c12c3f1c58618aeb76821a37dd8de71bd7f2c8861ff244246bdcaeb7c732e285e831631faeb1c19fd2fbc26c6f807ff14543f071d62ac9f5f1c433c5c10837f44b43fea4934710cf5c98c18f62f7a8e61fc3932ea49b623067ba45dc7757f031f19afdfff20c6fa6d4e0cfbeb1898e2271a12c3f161450ce7cb578eebe3c51d32c68fda10a3fd34721fe3ad720cf1e21163bcf41d831e6f89d13e43c7103f2fc4d03f86fd3fd7d8deca319c2f23c6f59a37c7609f2931e643f05793cff07eceb563e8af63684f668ee1fa56c4e8bfd8ff0eea4945fba39eb0c2717d7c9c1243bc867b62ccef0932d60ffecc31e86d9718ceef49c7b0bef5480ced05afc4a817b1635d5f1fdaab837a54a58eebf3ad36c478be8e63f0979018f4c313c470be30765c9f2fb92756e775fbe86f5dd4a3ec9518eb919d63a8179f88a13df9410cedc54de4beaadfcfea7cd171f938cf8029de8ba963c85797c818dfe98563a8bf27c430beea1999e6ab1bc790ef5f89513f768e613c97c8a44f3bc750afaf89d19fde1d833f05c0940f459718e32b24c6f5ad27c7f5f1559b18ebbbc231e48735318c878e90319e53bc1e179f5dc7109f9a18eb7f9f18f3530bb8d3c4fa6b448cf614c4b85efe440cd7cb2bc7503f7f1283bf78387e149fac24c6f83e770cf3ef6b62cccf3931b4cf0b62b087df41267de3c478bd8563689ffa8bf1bd9a12437fe49563888705319c2f5a3b86fadded0ff196a3ff74d0fefa8c18e7b397c418ef1b6238ff8aeca7717eaf88a17d6fe0b88eaf780cdcc5f1481831ea4f488cc74f1cd7c7733c7f97ec9b12637f2f1dd7ef577d62682f5e3baedb0b6e88410fd20632da77e53b86fedd13c3f9f88763b81ef73eb4973491c91e77c03decaf067bb8f979ca1c437e71efc378c457c818ef9213e37c76e618e205fae7f279ec3b867a66458cfefdea18f2df8018e7c3ee7888c772490cf61260ef6ff9b0e318f42320c67cf68c8cf1935f3b86fa76428cfe72e318f42627c6f82a9131be3cda1fe34b6c1d43be7a25c6f9f61d31b45fb489b17d0f19e3c50b89b19e881dd7edc92931e6e737c7506f3c10e37add9818ce172e1d83bf48e02eda37578e213f3c12c3f9e4d2318c678f18f3f32731fa73e618eaeb1531f8efeac9711d3f4223e3f8792f8ea1ff0531c6937b1fd707df1d43ffde8871fda4725c9fcf5f23e3f8f82362ac27568e21feaf8851ef3e1cd7ed853e31c4ab42ffede278f85b626c7fec18fcaf4b8cf6891dd7ed6bba1eac5ffcbde3fafd08f289203d080531ead5c431f4df2746bd8a8935e80dfa638ff4aee3b83e3ec5f1eaf561ffbcf6cf6ecbad472f8931ff6c80297ed91019f39f8c89511f0262ac77ef9031de644a8cfaf14e8ceb6b23c7107fb43fc6935a13e3fa55e518d6b724b08b8737623c5f460ce7f31362ac1fd78e61bde18218d7a3ee91b1ffde8118ae27fb700cf1bd2746ff2f89e17cd9ca31f8db0b319ccfbf4246fbe96b628cb7d231cc17a7c478ff413986f6e97a313efc1631facbbb63c8d7b7c498cf0a64b47770498cf67c750cf506b58ff1b272c7e3fcfe11b887f6f7cf88e17cded031e4eb1c99ecb524c6fc3a720cfede2486f622e618e2ef8a18e2217d42a67cfe408ceb0b1f8e61bed02646fdb8730cfa48fdc178f3a87dec3fdf3b067b3b86fd57b5de7425c5539e20e3f8eb0019e3211b3886fcd620c678c4f7293f24a963f0e73931e6874b64f477b520c678ba2686f1963931faf73931f457558e411f3d64ec4f7cef18fceb9618d703df1c43bddb22c6f15a13a37db78e61feda2086f12ae87ad07edeab63d0932631fa77db31d4abefc4a8df53628c5fe618f41bfbd7437dd21d62cccf1b62acef43c790cf2431aebf5d11a3ff9f3986fe3262f47fb45f0fc72b5c10e3fd940b62684fb488c19fd317648a878a18ded774fde8ef058e478fea972d311c1f158e215e2262383e13c07dec1ff71c43fcbaf7512f5ac4703cd78ebd7a7ff4cf3efa9fdc12c3f1e18018f657f5f8f6bee58f5b625c8f9e22533c7062183f75efb8de5fbd20a37f7b0b62cc7fdc31cc3706c4303e95760cedf9c8e49f743d58af68f73eae8760fbe45f2b498cf92f750cf54d498cf58d720cfa3747a6feae1cc3f137c4a80757c4986fdcfba8072fc4301efa1c19eda3e78e416f5ac4180f2f8e411f36c4e86f9a18eba72bc7f5f9bd1819e33f0c88315e3262eccfd431c4e79a18fd3521c6f5257c9ffcb9108e21bf3591d11e5c11c3f5f28018fc33c5fef551df78480cfbe7b7c4180fb1e3fa787640c6fa54c3f192eab1fc0c98eaa3e2d531ac972c91e9f34163625cef6b10e3f82c1c43febe40a6f9574c8cf5cb9b63f0df7362bc5f3027067bea0132c643f94c8cfefb4e0cfd951130c5837a20c6fb272dc7e0cf0362f4df866318df4b62acf7f17c3db44fdc2346ff6d13637c2e88b1de7c700cf9232646bdbd43467b551e31de0ffec6a0276e7fcc17ca31e48b4f62f0978a98d6731f1c433c6862bcffb324c6f9db9c18f5953986f55dd71e9c2f467feba3be161931f487dd3b86f87e22c678ba700cf3bb15318ef7dc31c4fb3931ce9f668eebf8f0713cfb54cfbf12c3f923458cf54d8f18dae73b62685fa23f52bcf18818cec7410fa420ffb921c6f719b1d7a9fdb9b647bf4df3f172848cf11224c418bf05328e5fd521c6fcb2700cf9ba498cfede06a678083c62d4d7d231d817cf4ffe5e3489b1de081d437cdd11437b5221e3f5e79e63d08f73623cff16993e9fb022467db8720c7afb498cf5fa3531fa7f0c4cfe575d10a3bfcd1cd7c7ab8418e71323c7f5f8491caf3ef63f3c3886f8e1c478ffc52786eb53743de84fdcbd8ffe8afdedd37c4f13a3fd26c4d8fecc71dd7ea188d11e57c470be60edb83e5f3246a6f5aa7762ac1f9b8e411f1931cee7c81ee8ffd52db0a0faee9d18ebb13afefacaf96b4e0cfbe72fc0e49ff99e18f59f3b86fd67c8f4f99d1531fabbe718ae3f43a6f9df8118ebcf6b648c2f754e8ceb692362f41f883f457a97df1363fd36740cf9e18e188fcf1dd7d7b37a2686ebc9b6c438ff7c47c6fe562dc7a0670131f6bf700ce3352186f6abc431d873410ce70b1b8eebf12b9e90a93ea3fed2fadcda31e4a35762385fe91343fbace9b86e3fd6c8686f3125c6f69963c89fd43ec67b211dd7ede50fc002edaf0262b4ff1b31de4fbc2386f6d4d071dd9eae9069fe714d8cf5684e0cc78bc431f40ffd4f08d0ffb08e57e1f459b78169beb812c878befc0299eaa10fc7600fda1ff35375e918f2e91698fc2bef3886faa44246bdaff6c4580f6862385e7c22e378471131b63f760ced3f20e3f8463d62d42ff73efa7fc3311c4fede1f8461298c633e938867c7a4e8cfdbf2586e3454c8ce33147a6f8183b86fe3d12c3f8fa1bc7757b2bb49f10a8cf1dc7b03ed422c678481d433d551263bcb71dd7ed7b6b62b8de00c7477868efc231ccf7c93e1eea3f730cf986fae3417be51bb0ec0057d09e227f2aa13f4eaffc0131c6cfc131e8cd3932da33178e417f1f88d19e0a19fd29d1c4b8feb1700cf1774b8ceb6d1132f9ff3786f6bac4b8ff9b63b02fee4ffe14e6c4a88f7362ccdf9218ec95627b4e0f4ac770bd8e717de4ce717dfeec8c18da9337c8e82f719f188e8f9e913dcc67f43efa4371700c7abc20c67af49318fd09fc41c933acf7278eebe31f37c4b07f922077f0fa968e21fe1431deafa8fd413abd29f6c8146f03c7f5fbd59218e3e10a19fda39a11a3fe53fbf4f9938018fd27710c7ae0f6c7f178745cdba77c02a6f14fde8971ff0bc750dfe0f5d0f856ca31f8d71b328ea70c1c43fb43626cbf720cc73b46fbfbc838bef10b31c6fb9363c8dff7c4e8af787e1adff08218f52c24467fd4c838bef92531dabf4f8cfb6f1c83de44c8d85f3520c67abb4d0cfb871d64ec5fb024c6f9589318f6afeafa4f6af29fe41119c75728c7d0fe1898c6b73a27c6f9ec2b32d5ef37c468cf01325e5f72458cfe5e3986f86e12837df21cd8d81bfab3760cf54b490cfb470fc868ffea8318fbf78d213fee8971be3927f66bceae91713ca25b629c4f3788e1f878818cfd952b62f4f72762685fc1f86985fd8b2ac7500f9d13c3fea940c6fe54af8ec11febfca5ce9d7e0f808dfe427f1bc0643fe918de8f77c8d83f79e618e6437b62cc7f8f8e410ffac8145fd41e8e679402537f93b563b89e2762b4e78363580f9c11e3f8f490d11e31770cd71312a33f3d13c3f1215ebfa2f15c3a067b1d88f17a226238be6c39f6ebf6a93d0f38abf543397f8b3f91b1fd5c13a33d27c8180fd12b31fa67e6188e87fe39ff294ac710bf37c478fd5bc7106f9218ae37ec23a3bdfc67c760cf3631f43fa2f3a33d045eafc2ebcf9bc438fe2362b417f89fd678bdde8c18ebcd376268bf7a715c1f5fd6fea89d3fe757c8140f37c470fd0531da3b7b770ce35322e3f5aa8818ce1f57c064cf6ce418ecd324467bec1dd7d79b6e91d1bed9d2319c5f21e3f5a5e78ec11fbac4d8fe0b32d9bb4f8cf58a700cfa4fd78ffd49f07c64ffaa24c678f9740cf6dc13e3f81d90c93f68ff0ebc1fa4c8e8ef72468cfe50ebb1f65c3e2b91f17afd3930d9773521c6f87d41c6f3cb07646affcc31d877400cc7179fc834be783dd4ff22710cf7131e88d17e73c730be2132c64770e7b87e5f3c23e3f509e918fadf43c6f1136f8ec11ed89e87d793d7fee975c81ec52d329e3f7e44c6fe2697c8d8dfeac6717d7db202a6feca4762783fba40267bfbc4a81f1fc8d89f64428cfe7aefb8debf7a47c6fe9567c4d81ef68ffa5b3e12e3f5d7f9c5f3487fa319308d8f583806fb2f91f17acb5764b44774e3b87e7f95033b7bb789617ff6e218f67f4046fb9733c770fe4764b2c73b328d473dfefe377b7f22e3f16c868cfd8d6364bc5e1502d3f5a85b64bc1e31770cf1db42a6eb79720cfdb944c6eb0b43c790df52609fecfde018e27f808ce7af0e8ee1fc703e9ffa173591f1fcfe0e19cf579d0153ff04be4ffd6173643c5e7ac8783cc3f3d1f58919321dff888cc7b367641ff871c3997989ffddb7d6165c70695eec7ff72dfac59f3e267f852dfac59f3e267f85ed492f4e7af1d5f6a41727bdf86a7bd28b935e7cb53de9c5492fbeda9ef4e2a4175f6d4f7a71d28bafb627bd38e9c557db935e9cf4e2abed492f4e7af1d5f6a41727bdf86a7bd28b935e7cb53de9c5492fbeda9ef4e2a4175f6d4f7a71d28bafb627bd38e9c557db935e9cf4e2abed492f4e7af1d5f6a41727bdf86a7bd28b935e7cb53de9c5492fbeda9ef4e2a4175f6d4f7a71d28bafb627bd38e9c557db935e9cf4e2abed492f4e7af1d5f6a41727bdf86a7bd28b935e7cb53de9c5492fbeda9ef4e2a4175f6d4f7a71d28bafb627bd38e9c557db935e9cf4e2abed492f4e7af1d5f6a41727bdf86a7bd28b935e7cb53de9c5492fbeda9ef4e2a4175f6d4f7a71d28bafb627bd38e9c557db935e9cf4e2abed492f4e7af1d5f6a41727bdf86a7bd28b935e7cb53de9c5492fbeda9ef4e217ea85e29a7bdc37afa0e690477f051ff8c57a11f384a73ce3392f78c92bbee26bbee15bfec1777ccf3fff1abef00bf422363d3ff00b7ec9aff835bfe1b77c60fe75c787e667c4c77cc2a7fc9e3ffcf9bef06fd68b197fe44ffc99cff90b5ff057fe66b6ef7cc91bbcc9cf788bb7f939eff02eeff13ee38c71efafe01347d78b9409268d0dbafc8629a699c77c16b090452c66094b59c67256b092556cc5d66cc3b6ec83edf884edd9273bfcf9be7124bd50ec825db22b76cd6ed82d1b98bede99d7908dd8984dd894ddb30736638fec893dd7af397b610bf6caded8bb3966c796acc1f59fed1b3faf17acc9ce4c5f5aaccdce5987758d0d7aac6fde4a0413c258e1c5d8e0f91ffd082994d0c213be084428227610f1ffaa7a2112918a4ce4a21025bb139579adc4da586123b6e243ecfeaeefffc02a622f3ec5415c884b7165a2e54fca313fa517a1b81637ec8337c4ad18304f0cc49d188a91188b89988a7bf1607a3933af47f1249ec55cbc88857835db37f624deffde3262c9ee454334c59969f74ff18d9fd08b40b4ecdff2161dd1153dd1173dc92593424aa9a4668fd233ca3093fee34606329491103296894c65267359884f59caca68c86fbc46aee45a6ec495a9c8fe04dff851bd905bf9217726773ec9bdb1c48029f9290ff2425eca2b795d8ffd83bc91b7c60a57a294037927877254ff8ce5d864d6969c885b3995f7f2417e6711f1261fe59388e4f3aff78d1fd50b39973bf92217f2550c8d3f48e3116ff25dde89b55cca866cca33d9926d792e3bb22b7bc60e7d6b0565128e124a2aa5b4f991863c3652be0a8cc2923d9e54a82215cbe7ff35f442252ae557b26b74c2fcb04465a69fb92ae44195aa32fe7fab566acd7ca31e635b5ba88df18185daaa4c7da81d3f533bb5373f85fa540775a12ed595ba5637ea167d63c65ed440ddc9e7bfbe5ea8a1b811e76a647c40aab1e9e3c48cf15469e3fd4cddab0735538f6caa9ed4b39aab17b550afea4dbd8b955aca816aa8a63cb08d3a33d613f54f617e846aa9b6fdcbbda41ce25e7555efafaf17aacfdafc499b09a8cd1a669473630ba5f69a99d12fb4d052542604b4f6b4af031dea4847c63306e256c762a8139dea4ce7ba404be4baac8f371123f7ba12a01e8f7aa5d77af3d7d60bbdd51f664ef12a467a2799deab83fe54b91ceb83bed097fa4a5feb1b7dab07fa4e0ff5488fa5146b35d73b36d11373cc54dfeb07638b99ceac6f70f3d28fb53573fd64fefdace7e209bc43bfe8857efdebea857cd66f6c2b1746074236513bfd6efa71a197bac11b2cd34d7dc602ddd26dfb9774c58a458a43e6906f9a99bdbbc67699ca748fc5ba672cd2d7b9c73d66226c6fdab13f058bb4a742a83d3ce1491eff55f5c2536c6b7abd161b3df5b4f571fdae97f64fa27a816c1b9d1878a11779b197e8c444cfa7f0f993a9cd7722b3ffe7732f557b9351cfbc4c4df4cccbbdc2a84d66f694c6b746a6b527638fcc2bc51c728a57792b6ffdd7d40b6fe36de58085a662b8f43ecc54c2da61e7eda5f43ebd8377e15d7a57deb577232ff919bbf66ef9ca1b7877ded01bb14f6fec4dbca9a9d67def9ecf95f0989dc3eb2eef98bcc24cbe3dd4da61bc434ebc877a0ef7eccdbc47efe92fa917669ecddb62c312de30b1fda4f6deb3faf49e75d79b7b2fdec27bf5debc776f29efbc86d7f4cebc96d73699f1b735a4f2cebd8ed765d2ebd9fc63f289a9bc74ae98d7c73891ead3e7620aaa21573ee3c15f502f6e7d21195b1baf80eb2ecc3816c6c34772e94bf3a37ced7b5e9f3f7b53af656659ffa01d53537abeef074cf2b6ad348cee1a35e11d7df0c3da370abd14433faa6de1f1a9ff4b6ad03fa2177ee2a7bec9007eae3339f276b5358ceaf1865fe8815ffa95bf929162fcd95ffbbfa33d91f85bff830f6c0ef136c6339a6a27c7b577987c6bce30f777f50ceec1eba8e15f492ffc3ddbf99fbccd125b6f1b4b1430869ea92a7ca314fe857fe95ff9d7bca5fabf772cfc1bfee0df1a6be4bcad73a31b4645a5d1623fb46dab9d3fb0f359ffce1ffa237ffcd7d10b3ff027661a71601329bc9dd5fb5af305eff853f5e85dfaf7fe83995b307ff647e698fea3899627ab42bcc39ba6963f9879cdb8f63853a38bd2af67f6fedc7ff9f7af8bfe5ebd90cffec2879a39b3f9cf8e9b79997fb1d47ff5dff4c87f3713adbeb8f9e3f580bf64c26f88dc7846a3ae408abadad0bae42dbf69eb50e97953ffecdf3d3ff9bd7ae1b7f895b73579636366db63f4895c1dd895dff6cffd8ea9273c16fb5d5327fec098782bbf67f27357657edfe4205ed719ca7a5dc003663ce3311081349af197d08b40795b9bfb036da21ae610d62f3ee524f04c84dc7837811f0441c8c31f1a9338884cb5d15259109b6ab4ab0fe017e63c2c4882d4ae6b0459901b7df90be84550980899aa2228add6431da097721c5432d403d60d5626bf7c78ad1f1d93601d6c4c8eca4d15fa116cd5ced4e53af83067e16c14eca4c79e83bdf1cde8cfd78be03338185bd8191803bfb01935b8d0fbe032b80aaecddc7d62aaedcdcfac4505377c6e66afdd2096774641c7a6eab035e8c1fce656cc834170170cc5f59faf17fe2c1819ad3fe367c1d878726d15bb12c326c12498b2a1bc34b5e321b8ffa9b1894d2dbaf57ac61ea98995077b96ba1e1f05b3c0e412b10b9ebccebf731df4f7e945f01cccf9b3d5365301b4eaf539bbf2c0d92a78091662a819fb085e7ffaded747f06694f920ef8c66ec4d255a584d32f93b0fdee54ccc8265d0089a7fae5e98f13e78dbe02c68e91e6f9879d4b456f88ba02d97c1b97975826ed0f3973f3b36fec6f4d5cce2a5b0fac93b21b77ee1ede4bb17f8f5bdb6a011b23f572f42119a79839e09a646d62f4c1cdb1aa0d02c54a1964b3343d986decf7fae423e873e1fc94b9355cdbc5d77ebdc5d5a6bb0280cc2308cc2d80ffe5cbd08599884298bf4334b94f58bbc9e4b16621c66616e66659c7d98b9e411c626688685649ea9b994a9bacc9c6faf9fbc9df18c376f1e9662e68dc38a3ffc797a617243aa5a26930ee4a75c58bf3075858964f5c917e14a05a2c136ec3c3cd2d8f8db706d3ca32b2f4d0d9aab8f70637ce3dd33755cb80d3fd853b80bf77fa25e78e1a738a8891c88b55c48bb52f704b305c9c34378a13bfa22bcfcc91ce2b66a185e85d78249667dc3f8433d6bd5cba0d497d267f3f02650e1ed9fa517e18097ec36bc63eb70188e586c6c51d6f3854f9686e370124e593bbc97db238d51e889f04176c558303d0b67b6ce000565a9aea4173e060dfef1efb9a7f63bf442874ffcd6f3d95aacc530e87cd38bf0399c872fe1820f3c79acb1e19ffe327c955dfe22989f07b1329a61ab71e38b997f1ebeb197f03d5cf2f0cfd18bb02152fe14363517b7e61713de0acfc296f58bb01d9e871d2dcc3ce4f57863c49ade547464972561d7e4931ddc71d4a51ccb7d7813f6c27ec423f6ef98b3fe6bbd88042ff893bc64eb60256ef9b2f68b835d8b129b480622527e4f5c1e6f8ce473a423cfe4a6848df5bdbce36d53cf186b78bbc88f02318fc228525dffcfd28b3c8a8d5e84c62f4a7b4fc466399bf7e5204aa254dd0487288bf2e38d515444a5ec6aae7b62547b86bd0957dacc1a2ca24adceb2a5afd3b3e03f8aff5221c44eb28f67c29a38db8d53bbdafef08dbda338bb6d28f3ebcb9d7f4ce8f3546fe8d484418ed8c7e8ec4584fccf964bd5e7250e682a37df469a3c43b3bfe9cf5f7d5176ce769311403b551733327296abfd05e3fb88a0ed145300d2fa3cbe38d918992abe85ab5d9448ce44035eb95f2bafe34f5792bba896e23ed4dc3c6afd70b13252c1a282fba0b56d150acede70b3cebb76606e9bd0477d128ccc5215c46471b2333170da2b11a4513964453e37df77595a1d4d46c5fa28768163db2dc5b79ed5fad17763e123df18e4ec46dfd398acbda67cbfade270f27e2297af682686e6fbb1f6b8cfc71741979b21bbde87b16eb3d5a5fa99c4da285f1c5d7e8cd7b3cf69cf5f7cc47a277ef36e4e6ca96d150be9a5afcadbe2f92ab0ba39e8da8199d45ada81d9d1f6f8c4cc6f4c32b9b4ba20eb36b3bfdda338c2f060fde6bd495aba8c757e2ea57eb85dd467db63573d427518aa1992bf4e1de883a9899ea4185310fae621684478d5f150b3689a5a93fcdcc3588eb7b103067ed8b66ac621d7b3c3dee770e7edf7aa73fe343fe1efb621807b2eb6deab9597ddf330ee3288ed97d9cc4e931c728cea24bff2dcef5b3189b5ab719ce60edddf8473b2ee232ae642b5e89c868cb2fd50b2ee23537734793439ea46413cdd4bef68b42b178136fe38f78676a8c79541c6f8cd821def332e8b3095b9baa2b0a62b7e2dcf58bf833dec587f8c2df9b68faa57a61d715e24b3e17eb70145fb189bcb3eb0ab52d3ee36b91a8d0545c0f7c1cdf1c337ec3417c1bc53697e867160763c5ea3bd95339169bf0100fe23b7d25c260fdabf5c2f8ec50e472118ed4dcd4835d25e1fe88fd94623c3293c6a5df66b7f1f898f95ec4f144ee545b744cc575afd3baf637b9442fe3697c1f4ee2877021e7def87873d6df7b7fc4fb14793c337ae1b3500aa39efb3a7e3ff5d2bb881fc55206c6164f3f7e7fe4ab6df41e3fc773b9883a26b39a28d18f36ab0617ec9cade2977811bfc66ff1fbafd60bb34dbd0def5abf507316d11cc1ae39a92c9c9b5cb264a5b1c6916bc1b8692a9b775b7ffad7f5faa799a105178aeb697ce63fc7adb81d0cfdfdafd58b3a972c8240f3d8577331d2793d46e81b46d7cfd98357ea9db9b223e692c74ddc89bbaaede7626ce6ac703742d84f320565dc8bfbe14dc2c32ab1f7ea7fa95e703361e273a3e8a130a3a29a768ce0beaa5e2632ec272ad166463f39662e312f9d78a2239918998a8be9bcae7897aa30fac9139df84920a7c16b12fe5abd78dc245112abb6c9f743b19197668c0aa805bd5d78ed6fe2384992948f227dd45a30622cc9820e5bdb35f824e7678a9b11a8d7e093427c24651cf232a97eb15e8878cf243719351c31334a416caee850cf9872d94f56c99a3d249b70986c8ff9794c11271fc92e8ad5c85435a6e83019ac50a25e3b79637e7848f67a9e7c7af23873d63ff279ade4905cf0d770a47746cbfaf51dd5bc5e7392ac6fa2e432b992fbe4da5f1eb316f4da6c9fdc24b7c9803fb18d6ed8cf0e9ae8dc2b1337c95ddc4a86c1345c86bf582fccf6815db3b6e66a2ea54e4d556c6c918cead9fb241927133f52eb649adc1fb31694cfc9835e27b368cc6e95f0eca710f0ceb6defb45f2687389b8499ef8fe57ea85dd26cf463fd7f19518ea7bf81c86b1855d996d283fec2473d962efc98bd1f523e6127608d6d1557c1b0ff9796d0b6d7c439a735f9ab9914af661962c92d7e4e157ea459d4bde025b774e4d36199bd8ddd367fcbd3e5b27efc93269b08c8f9223af2bd8ef188522394bead5f7fa9c665698b4599c9c279da49bf4923efff8b57a61d71552ce5b29333586cd2567b6be80352ecf97217b488599975cc5aba3e6927a1bac138f5d9af8e0f80d8da9d79743d655b354ea2b95a62afde9efb7fed1cf83ab946da54c3d969879ebce5c99a8e768b91ca57e1aa4619889db344a8ffed9fee4234d4c8785fd5e42ed8b5a8ed38c85d15bbcf35ff98197ecf3d7ea0567699e5c041df969fc62909a397b3d939e9a5ac36393b48cce829dba4eab203ca64fd82ddfa5ab746defe27a1fa6e6ddf3677d907dff3aee85f36062742cfbd57ac165ba8906c199a93142b69697c6333ef173a9f613dd8fe9364a8377769e7e70753c9fa8b71f6cc976bc93eeec67113c6e6601b9fa60917723e7e93efd4c8ff07df83ffafd11ff9171cf1483e9855ca497e6bacef193a9f6537d9da413cdf4ab8c63965e1d572f184baf8d8d6f22df545ca96aa6b7661ec0c4d05b184b0c828d99affedafaa2de069ffc8a37e4423d59cfa8bf41879ff79497e95d741b0ffc221dea453a3aa65e784f5e3335358664aaad326b0d9d0a964e582f9d069b64c71ffe892fdfffbecf85fec0f753c3f441e4c62f3e5353fba90f132512d6a8e5bb3c0f6fd2595c88327d3c4e2df86d9b3ea56b6fcb9fd52e7d363380a6caf88b5cb0cb7498ced3977f7c5c3c4e177ceabfe8b57e39ae5ed8adbf16b960d18bd50cf581b5b899c17b3b1337afb14adfd2773ee6f747d50bb335d658b296c883aec879cbcc8daef96dda489b7afbcf8e0b9468fbb7412477c66a67110f86ff68ff1ff97e6ab8f2365ea1797ca5a7b25747491e7cd839bceea6adb49d9eebebb4a3d263dfbf3075af97764399f6f85ddacf78c632f1af3eef297326789549f6942976ce6f329d79997f2cbda8bf3330635b9db0502e78c34489acfd42fba11c89db2c0896aa277a59e81d75fdb3de463c5449166571ba096ffff9fefe583e6789388883f2c52c4bb3cc68dcb53fcd72b6f45a47d20bb3f5d759c1bba98993acd4997ca75a501dc2667c1675b34addc72c5bfd7b3fbffdd5d6b76bf677d93adbb073bf17ae334f70bdcbb66c2e97d126fb48baf14db6fb7a5df6479f7f91eded2a97fd9eaab1c51b7d76462fb34fef226ef9cfd19b28f9e4e76bc1dfb7f5c77aebb532a112711333fbd42676ced67a9a4e4469bf55cfba2c531b21b283686617c936bbfc6a2efda3cfbfc8aef84d10d8fb9d7685458e8d5ed867177c2a26c6e95b761dbfb055762342ef88f72f701b7df73d124fc5fe325cf10daf8261348ee6d9addc27292b752006b16f227560fc61190ee52bebc976a4b24a24d91d5b7eb52efbe3cfcbc9867c6efd428ce45dfddc02bb2e5ea84fbd0fa6d92878ccc62c4d5e928fe3fa80fd6c701289883ff8beb140994dd832d8f049364db4f7ca4ab1625da1ed3765598fade2fbec3ef6e45e4a93e51f64983d64b3ec317be29374732cbdb0dbec599c1b5b6cf47de4eb9ceef0999cb20b9fbd755c657319f3c9b19f55e027d94bb6c85efd5636d11f26331c84970d82a97af04bc94d5cec8c3fbeb13249e5793ccadeb3252ba389b80d2a33420d35cc9ac61a67c1306b1d4f2f8c5fb4d96d1028bb363e5159fdfdebf7ba023db04d709ef8c9a39cc64c2f8eb7fe99ed93add18243a4d88beab04c5e1ac51a64e75927cbd8cad4a0895d71b34f53c8baeada6864cfe48f3e2bb36eb8f4dbde59ceb38b9ce5227b0a32b63c9e5ed86d2eed3d56cd4d0d3a09da5edf7ea6cd7e2e4333e320fa71937ba6429e8b23e592dc673bb6cb83ac2b3ec52ebaf10bfd2c56799847e2238ff384ad5924c6792aeff22c9d7873fd6abfc128eec3439ee7455e8aabbc92d76aa6e2304fb6f9ea987ac1a5deb25b761e8ee4a71c18fd045bd4f33416e6eb6cc4eea356bec9b7fca7ef5fe41fde2ddb05815cc889a9bb57de6b706db645ba0d96f1367a6366de6cecb2538f828b91b6f96d98eff3cffa7b6a7779fd19915c8b66d265f7f2d6f8c590af12713cbdb05b1b25d18b5d17d7b3fa53a9397e1be823bfc82ff32bb1cdaff31b91fc58fbfc33bfcd07e9a7b84887f95d10e44396d8e7fae5f693d8cfea3a1fe793a4112e445f8cf2a91ee5f7f9433e63f6735e139f7b41b4901bf6903f8a5dfe24bdfc39dae73cd1d92c9f674fd9821f8ea717f5f660e6ac037b5791c59eb69f0ab09fcb08edb31e7af22c5ee42fea9a2df5f60fdd0b8f8266be089ae19599d38ca241f4143de5aff99bf0a4fdfcc1bd9eb291f18faef18bbec9193c1c194bbcb34ebecc1bec396fe6b1181b1db93433fa323f0b17c12efe604f792b6f87f3fc3c9b5abfc83be226f9fcfb5cf2b3cfe34bfb7c105fe55d3da9bf7d05cfafc8f532efa5af795f050597fb82fdab672215a2905e4bbfea6da13c59e8e8a9f0d26161924611445e1186f6392c9d2232bebf968b22e2f6f94d8368a3e3686946622d7a451c054522766259987258de055b3589a659371d644fc9dc7e8f317cc9abec29cc8d4f348aacc8c58db9b8a3e985dd860f41507bc65832fb9c026b09eb1bf2ad28b2eba22caa62c596eaee9fb553ac935d94159b625b7c444fe9301bcac458601779a2fee1b6865d8443b6b64f6312b7e1d05493a9dc8ba1c91a23fb19505355ac82243e2bf67ed3541377f2c03b6a629f076732ab9717ec25fe283e8b43786eeace876c5a5cc8b0b82cae8ea917761b748b6b35d7cfc66b85b185c46f0f8ecd58dd14b7c520bc2ceef8c73f3abe50f1387ee287e08ecd83cf62588c222fbf0edbc94078ecddfa81e9cfabe95f47dca617f6dfc5b898186b18ffe02f700fbe98d6ebaf32beaa9f4671e7f7ed0a6070c66ed4c8d43a2ff95c45d14df419dd14f77915a9e2c1f8c54cdcf81fc5e311f5c26ced131a4dc5bfb6ab5cba5e1337758636f6b82a9e541855e226fb87c79bde3ff31b7e53ccc3883d679be225f28c472c8a057f0b87cae802337512cb8a57534d3d8a81b181f18a622c3af63dd5566dc94c0e9b79b9fd8ea4c96507336bfed04c656a12f44dd5c38c729ccb56d415923d0a19758bb75cc89616c62fde8b65f19bfbb03ffffcce3815b9b85563cd7daebbeccadbe965bd36be2b9a712ce6c5d957df43e79f45ab6887977920657ac1fac579d1c98c2f181db82dba461b7a5617582236ac1fb76510c745bfe4d62fc46dc944279ac86e29d8c6f862aa53638333eb096a2245fdbdd1862942077c10f4830eebe9ab52b1273353f5e2f3681fa952979ea9cccf9383a9ddaf8ea7175c94beb795e6bfe8c5aa7719e8a7da2f94927c51246558467ff71d827b533daea2391f4703b6339125d9da68a17d8cdd44744ced38f217c61663eb13561d582f984637a66e7ac93e4c9dd5b1bf37fe302963d5b4cfcc28131b11bc632d617c61a226c64726968320e8cbae28e5d2d49b4de98937e99769f6106a392fb332d73e3f94c531f5c258a314a6048d5ed20b7daf9aa61acfe1797bc1367f48e63c2fab72e50d8a46b90eafbc6eb12c37e9b0dc961fc9a05894467da39df1fab51d6bfe5eeef87bb4331678afc7dee8859e668372cf9ecb4ff560de1772a2ecb7f2263aafbfe36c7eca83f5049595b2bc088c7f9497f07baf179c9557e1b0bcb6b984cdc54c980c6be6aa8df2a6bc2d07e51d9ff8c931f5c2ae439643cdd593e6a602bdb34f92c26f457d94a364e99d672fe5b89c94533ee2b7e53d1f951faa145ef9213ae190bff177d98d62f37fab0d1deb13f483be7129c6e98368aa1e4bd5846da09f2667d9e7a834cb076b05deb0df5bb4f681df7f7bb18d992f75a2b254e5ac34be9517e513bb2f9fe579392f782292677f763cbdb0b92068972fe130657211f9eac35843a9bc5ce8cc2fcad7f2ad7c4fb2725936cc78770ad35f9b1be299898777ab0b6a549ae32c1791d18a9ee89446f12c9bed24e8f086974b667c84d9be5a5da86dd13431d0b7df55e40d6b0dfafddf6f4ba97bf6d991c153d92ccfca56d91649792e9765a77ccf1ad926d3feec787a61b76597b58cc68fe5a7f18fcc7e12d30fcb9efa10dbb2cf9e2b5e8c8de7c7266398d137c2b0801f517a41f8203ac637de6c6e005f3036b2738e89bd638be39dd9f88771ae9f0a31a1dfdb57c5fede17be7fa949258c1a9d57b2527215cd92b5baf15f2b9d4d63aff2e49c4ff43a681e4f2f4c8d9197db20101b31323561a3feeea0ad31de8d7a3ed8ef947a015fb249e59b7982c93955e0053216039b13f8ab1a810f583f31f972a246fc4576ab50655e513fafce8d7130d65d3dfbe60be5a1d6cbb37fe413766befa384d7729fb6721e6fcb66320f27c179795345559c96a55f257c94b58ea717765bd9e7792ecc1ceddeaef9e983d50bafaf3eaa2c6fb3c7f03c7f6393283639736172dc6595a7af7ecb5691d607d4087482bffb769ed195cce48889fd763ff881cd0bf5bf9a759e305ea29affcc177efbb2478443e31945a9c47d55569568c687e4ae5a85efd943b50e36d5e6787a61b7c13bfb30713908b65eeee5bc659fbd68ea0cae9e632d66712ba84c8dc8cd3cf3b5da268bcacc96bcb58c4dedf82a17a017b2ebf3a09fd423a9263647940f6a92d8e709cd54667cc2f03ff781ffbe35d16a9fe9969aca2c2d6fb265f9c9e6d5cece57cba76a6fc2eb5e96e2267ed2dbe3e90567f198b5d496c5726866462cb0cf1ab46b9f4c8cbdcfea335cb19e1c588f576d534f5e47afd5c17f3699dffa45574eac32d8ba31a82b26f487a6197dd28be6b7dcf1475ef62988f648537fa681174e6c2e896ec249945417d52a9b49337baf2e855f5d1d4b2f44c2ed9a772e85bcd37b316077a617cf8a79a6068ea6c175e227976929a58df352a86dd091d33c8fde6cede873d35f51574818dfb0353ed1acaead2e180b8dff882f7cb535b3b475f621d7d58d5dcb48e601cbaa9cc52fd5453e4eef926b98971c412f22af69ff9e447026c7416c3fabcd4676445556d78d4c8878c99ec5b377632acbc4d41063336f49ec7382adf7436feb279ad663693d03fcc2daa3f6961ff087ffe61f0db9f08beca96c470731f7665555dd26efb1ae06d9347be0651616eb63e84575c787de7d3e2c2f94f4bc602cc67acaed1c32b3916f7c60efbdd9b980df166b9644bead9df47d3eb2969097b257e7c64e30ae86ba2f0fd5e8fb312d1fcac3cffa441d239791cf7a455e8dab1b363391d2ae262a48fc6c1a4cc4553e4f3fed036f7e522fa274c85ad5d4334e974ecd9c91d57f4b600c39cfcc1bbbdcce283ad5bd96a257d70c0c34c0f886b184eec1d6b0ed33fbfbf1b46af9dbdffd3dffee5743eefd37be8b6ec53cecb197709277f4b07aa8bc6a16a9a0489f44fc737a1133d6e2b7324df7d563f514b7f52c3216b163eee772908f4ccf97c60b1e74563debccea85b5453517a3acd4f7660e99d8ef2647be7d3e8e1c060ff699523feb03b4358af53dcfe4221bd815bfeac5ccd296f1367b8a92709135f24915853a6807cd9fd18bf4890f446e469e578bbcc1e6c1ad7dbe8becda3984c929f6798ecc44c1a5e929fed86adafeceded7d03dfb833e92420df1a3f9e2f7bc24cbbac122335a117fa8b07acd2e42ed0fc243b4a82eb20393d1e58feb4590b34b91b31ba3919160d55e96d94076f5056fd8da534f4c6f9f4dbf7ba67eb4cffbec99d7a59c5473538bcdccdca201ca49be026cf2c9517ce2abad9a888d3c8fa2c78d0ac54e858f9bac515d44a68049cb7051bdb1ed8fea45f118b360ae26b61f7565bc3035b51d7356095b330866bf3d68fcc08efb0434c15ac3a808e8c3a5fda9b74c6dedefed8f5da7fc37f9855de719b07e7099ecf3839923bd4761ceab65a88b7d91055745973fff985e0479f1c15a660e68674ff518d7cf422e7823e8578daa2999cfad6ed8e780f386d18319f880d9c758c7ae3dd9e7a52bb488d115a3a06ca31af5fca37b5c9f3055b8d5db96ee86d7ace79fdb95e0ea4c7ad547b48fefccbca4253e8369d54e3f7f4c2f12ab990d5b2f525eb06b8df2a09a6562d71931571c6c74e854de599f405fb8b32b72765d52eff5dece35c83f20b7d42b7447f307de5266168b6cae95f5d37dd20d96d559d84b2ea5aeced97d5514cdaa13a8a0f1637a118fabaecd15667ef102f305755626b6d710f73a4d6f75df3e574f35ac35cc3b3da827d25b6b09589fb43fe9ed77ba71798c1ad3e9c3ce5670411b2bfa336d6a5c719b0e643bde563d318b3ecb76362b1e64abc8bd45b80c863fa617559f9f077d13ffcc3ebb04ea066b89fad99b5d0dabd233b7de543f1fdefeded452b6a2baabff9e80fdf9e643f57e562fea4ae3a7fcc13e6334ddf1b67daebf7dda36fdde5cd588ad565cde88b9fd9b39315f3175be122bb9522bbdf27e4c2f56fe2a303a606c5044662e6eb659a8eaf8373ed0b73e60ea8b49deabd7a42e8d6ff44d3c7cc07cc3fa4e6d1b1ac3eef739c55ae4877da3057f9f805dd92dffcd9cd6dac2ce4bc2e7609a5762c91ec5ac3a5b85ab287af3cffd76b8e4d31fd38b551c0decdf1f31b922865c6035b4bec759af49adb0beacf521b316b25586f9b7a9b2eb979b73d4d738f9e61bb5ba1e7e349f386df8f265eb60711bb556e92a136f62b6cad37319ae0aef25f6f4225aff687db12af939bf317effe05fcb81a91dd147f88bfd66edb7bac1d61b9843ee54560d8d8e7c1bcb9474c3e6906fbef1fd5ad6cfe710b090e5ca5c91a931f6ea21526c667e5e56d56a152ea2a8ba58ad579b1fad2ffcd96acb6f8c325bad18d4ab515d39a8eb4c66f24bfd32d6b0339206db983869da9c0139c48d93f114faf7f7ba6195e51839c468c66ffc2438b3e3130e5916df18cd581665f21eead547a492f7dc5fed7e743e12ae92e7aa5bd71103653387a925ed67f87d6ef4a32307661bd5fa31b3f7b6ecd68e39d50f726875d4f8889d7d808e64e41b5feb859d937db71ed132d972f77bea8aef7feff56c6d68c62e0da659b5dab37972992d7326cb34f70fce2f7e603e120cd371d0afebe7cc3e4bd0ae4dd4f776bbb68e841a13ebce7abe6135c3664da31af5b843beb07353cdec3dd03ad3d4fbd8f5cc7f994b6a7bfc717f01cd28eeb227719fb7c4cc9b8537c55bb4f73aabcf9f58bf78581d44beba905d3f17233bcfb0b5a67e30b190c29cf45bdd60ac62957366734aad8e771e66d5606cef06836f404e01dfe1cd63d69ebf594b9ff157218a3c6ddb5c2266f12069946938ad7e582fec36f94cc7defd2aa933e71d640c9859502d69fd01fefdbd1ed4bfcf6d94581f019f70b5a189a6e3e8c53ff00b9bd5bbacefbfc6dbd5257bced2ea2c0d92fd6ab3bafa99f50bff897dacaef980378d4ff7bef705332b8fec3ca5ae382fbff711d842dd257bd647709df3430eedb6b65ba39eaffc1be6aab035bab6d757f14eccea4ffaeda4bfbaf1d9cfe885d9863ee777debdd5051619addc7e3ff676b6f6cd0fbefd1b5f77506fd178ad6ee5d0decbf8ee98eeb7f10cceeccf11724b9d57a4fd7b5bcbd5203f987aebc01ef34391acee929f5def3cac86ab5179558f75fadbb1ff6e6bc7f837b5a5f1071f7ca1d60d1b13cd5ad72e7feb3bc79dabd6ff6a1acd9ef1c56a9c2f5793eaacfecb72f3ac67fc62fa73eb9d8cf37391f38189f1de2ab17df8b636f1fdfcf3fbfb9f0a7b6fd7b1e059e0f665e72cf51cf6bbfd7fd60fccecacae31ecfce4bb39c9c46479934b56f7612e9e6c94ac1e4c94dc05e1cfde1f59cd582b1f7eef0b902b8c5e5c12dbfba2565bab919dc5c3fbf667f5687e7b69e7ae3066660e6b676d99f9bd55d09fb91f622bcd1dbbe26754737eff7e29edfd92d554dd5437f03791aa9e77c67f4e2fcc3694fc2ae8c37dce6f3e613f41856b5513f81c55bd9e09cf9d87ca0c34c3cef233d48d7e6d993b581f7573963f92537e67bd61eb4f5edf2f918f3697d828e1e9eae967ef8f642d6f2372537309fb84f3efd621b6750eb9abd7b0fe4e3f6ca56eb736137f773fa45eef303e92dabf8967d749ed6713bde277fb02fc35acdfe13bc199caccfca9b77a5ecd2197b0b99caf5e7efe7e6af0965c78f7942fa08eb0fda07fd31cc3de39727587f321a8ace4a14ceabcd2af86f55f4bccec3a58ed1d47f70b9b8f4cbe9aac16abd7d55bdec4bf37b85dbdfffcfdd43009467c5035ec7cc268c0525e06ad6f7546dd5f3347b32b7f303f81dfff565f6c56ae86d5a81ad6eba17807c97e2eebd8f505ddb73573d6c5aa51de445d36afff2ee795b7faf9fba96973b5b535463dde3d53554c6cff3d5d7f9bb6616bae7aee8aeb1934e6b42efe7735c7acdef75b8de1c6f2fb5ae438f5a7a93e7b51591c581d27feb6ac8ef0f98b78d534f5e796cf4dc4ce5767fac0cd4bb58069bb3ab3dbfffefb2ff66b192f7eaef959ed43ee31de665bd8121f63cb5be5d46baed6ab56781b158c799fc7fafcc5ff1fb6fff9fffe9ffff1ff01d65fbc39</data> </image> </images> -<Q_SLOTS> +<slots> <slot>finishButton_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kactivelabel.h</include> <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> <include location="global" impldecl="in implementation">kurlrequester.h</include> </includes> -<includehints> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> diff --git a/kgpg/listkeys.cpp b/kgpg/listkeys.cpp index ed1d7dc..a7a8904 100644 --- a/kgpg/listkeys.cpp +++ b/kgpg/listkeys.cpp @@ -350,8 +350,8 @@ KDialogBase( parent, name, true,i18n("Private Key List"),Ok | Cancel) { KMessageBox::information(this,i18n("<qt><b>Some of your secret keys are untrusted.</b><br>Change their trust if you want to use them for signing.</qt>"),TQString(),"warnUntrusted"); } - TQObject::connect(keysListpr,TQT_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint &,int)),TQT_TQOBJECT(this),TQT_SLOT(slotpreOk())); - TQObject::connect(keysListpr,TQT_SIGNAL(clicked(TQListViewItem *)),TQT_TQOBJECT(this),TQT_SLOT(slotSelect(TQListViewItem *))); + TQObject::connect(keysListpr,TQ_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint &,int)),this,TQ_SLOT(slotpreOk())); + TQObject::connect(keysListpr,TQ_SIGNAL(clicked(TQListViewItem *)),this,TQ_SLOT(slotSelect(TQListViewItem *))); if (!selectedok) @@ -460,7 +460,7 @@ KeyView::KeyView( TQWidget *parent, const char *name ) trustgood.fill(KGpgSettings::colorGood());//TQColor(144,255,0)); bitBlt(&trustgood,0,0,&blankFrame,0,0,50,15); - connect(this,TQT_SIGNAL(expanded (TQListViewItem *)),TQT_TQOBJECT(this),TQT_SLOT(expandKey(TQListViewItem *))); + connect(this,TQ_SIGNAL(expanded (TQListViewItem *)),this,TQ_SLOT(expandKey(TQListViewItem *))); header()->setMovingEnabled(false); setAcceptDrops(true); setDragEnabled(true); @@ -476,7 +476,7 @@ void KeyView::droppedfile (KURL url) KgpgInterface *importKeyProcess=new KgpgInterface(); importKeyProcess->importKeyURL(url); - connect(importKeyProcess,TQT_SIGNAL(importfinished(TQStringList)),TQT_TQOBJECT(this),TQT_SLOT(slotReloadKeys(TQStringList))); + connect(importKeyProcess,TQ_SIGNAL(importfinished(TQStringList)),this,TQ_SLOT(slotReloadKeys(TQStringList))); } void KeyView::contentsDragMoveEvent(TQDragMoveEvent *e) @@ -573,64 +573,64 @@ listKeys::listKeys(TQWidget *parent, const char *name) : DCOPObject( "KeyInterfa installEventFilter(this); setCaption(i18n("Key Management")); - (void) new TDEAction(i18n("&Open Editor"), "edit",0,TQT_TQOBJECT(this), TQT_SLOT(slotOpenEditor()),actionCollection(),"kgpg_editor"); - TDEAction *exportPublicKey = new TDEAction(i18n("E&xport Public Keys..."), "kgpg_export", TDEStdAccel::shortcut(TDEStdAccel::Copy),TQT_TQOBJECT(this), TQT_SLOT(slotexport()),actionCollection(),"key_export"); - TDEAction *deleteKey = new TDEAction(i18n("&Delete Keys"),"edit-delete", TQt::Key_Delete,TQT_TQOBJECT(this), TQT_SLOT(confirmdeletekey()),actionCollection(),"key_delete"); - signKey = new TDEAction(i18n("&Sign Keys..."), "kgpg_sign", 0,TQT_TQOBJECT(this), TQT_SLOT(signkey()),actionCollection(),"key_sign"); - TDEAction *delSignKey = new TDEAction(i18n("Delete Sign&ature"),"edit-delete", 0,TQT_TQOBJECT(this), TQT_SLOT(delsignkey()),actionCollection(),"key_delsign"); - TDEAction *infoKey = new TDEAction(i18n("&Edit Key"), "kgpg_info", TQt::Key_Return,TQT_TQOBJECT(this), TQT_SLOT(listsigns()),actionCollection(),"key_info"); - TDEAction *importKey = new TDEAction(i18n("&Import Key..."), "kgpg_import", TDEStdAccel::shortcut(TDEStdAccel::Paste),TQT_TQOBJECT(this), TQT_SLOT(slotPreImportKey()),actionCollection(),"key_import"); - TDEAction *setDefaultKey = new TDEAction(i18n("Set as De&fault Key"),0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotSetDefKey()),actionCollection(),"key_default"); - importSignatureKey = new TDEAction(i18n("Import Key From Keyserver"),"network", 0,TQT_TQOBJECT(this), TQT_SLOT(preimportsignkey()),actionCollection(),"key_importsign"); - importAllSignKeys = new TDEAction(i18n("Import &Missing Signatures From Keyserver"),"network", 0,TQT_TQOBJECT(this), TQT_SLOT(importallsignkey()),actionCollection(),"key_importallsign"); - refreshKey = new TDEAction(i18n("&Refresh Keys From Keyserver"),"reload", 0,TQT_TQOBJECT(this), TQT_SLOT(refreshKeyFromServer()),actionCollection(),"key_server_refresh"); - - TDEAction *createGroup=new TDEAction(i18n("&Create Group with Selected Keys..."), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(createNewGroup()),actionCollection(),"create_group"); - TDEAction *delGroup= new TDEAction(i18n("&Delete Group"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(deleteGroup()),actionCollection(),"delete_group"); - TDEAction *editCurrentGroup= new TDEAction(i18n("&Edit Group"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(editGroup()),actionCollection(),"edit_group"); - - TDEAction *newContact=new TDEAction(i18n("&Create New Contact in Address Book"), "kaddressbook", 0,TQT_TQOBJECT(this), TQT_SLOT(addToKAB()),actionCollection(),"add_kab"); - (void) new TDEAction(i18n("&Go to Default Key"), "go-home",TQKeySequence(CTRL+TQt::Key_Home) ,TQT_TQOBJECT(this), TQT_SLOT(slotGotoDefaultKey()),actionCollection(),"go_default_key"); - - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(quitApp()), actionCollection()); - KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(findKey()), actionCollection()); - KStdAction::findNext(TQT_TQOBJECT(this), TQT_SLOT(findNextKey()), actionCollection()); - (void) new TDEAction(i18n("&Refresh List"), "reload", TDEStdAccel::reload(),TQT_TQOBJECT(this), TQT_SLOT(refreshkey()),actionCollection(),"key_refresh"); - TDEAction *openPhoto= new TDEAction(i18n("&Open Photo"), "image-x-generic", 0,TQT_TQOBJECT(this), TQT_SLOT(slotShowPhoto()),actionCollection(),"key_photo"); - TDEAction *deletePhoto= new TDEAction(i18n("&Delete Photo"), "delete", 0,TQT_TQOBJECT(this), TQT_SLOT(slotDeletePhoto()),actionCollection(),"delete_photo"); - TDEAction *addPhoto= new TDEAction(i18n("&Add Photo"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotAddPhoto()),actionCollection(),"add_photo"); - - TDEAction *addUid= new TDEAction(i18n("&Add User Id"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotAddUid()),actionCollection(),"add_uid"); - TDEAction *delUid= new TDEAction(i18n("&Delete User Id"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotDelUid()),actionCollection(),"del_uid"); - - TDEAction *editKey = new TDEAction(i18n("Edit Key in &Terminal"), "kgpg_term", TQKeySequence(ALT+TQt::Key_Return),TQT_TQOBJECT(this), TQT_SLOT(slotedit()),actionCollection(),"key_edit"); - TDEAction *exportSecretKey = new TDEAction(i18n("Export Secret Key..."), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotexportsec()),actionCollection(),"key_sexport"); - TDEAction *revokeKey = new TDEAction(i18n("Revoke Key..."), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(revokeWidget()),actionCollection(),"key_revoke"); - - TDEAction *deleteKeyPair = new TDEAction(i18n("Delete Key Pair"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(deleteseckey()),actionCollection(),"key_pdelete"); - TDEAction *generateKey = new TDEAction(i18n("&Generate Key Pair..."), "kgpg_gen", TDEStdAccel::shortcut(TDEStdAccel::New),TQT_TQOBJECT(this), TQT_SLOT(slotgenkey()),actionCollection(),"key_gener"); - - TDEAction *regeneratePublic = new TDEAction(i18n("&Regenerate Public Key"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotregenerate()),actionCollection(),"key_regener"); - - (void) new TDEAction(i18n("&Key Server Dialog"), "network", 0,TQT_TQOBJECT(this), TQT_SLOT(showKeyServer()),actionCollection(),"key_server"); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showOptions()), actionCollection(),"options_configure"); - (void) new TDEAction(i18n("Tip of the &Day"), "idea", 0,TQT_TQOBJECT(this), TQT_SLOT(slotTip()), actionCollection(),"help_tipofday"); - (void) new TDEAction(i18n("View GnuPG Manual"), "contents", 0,TQT_TQOBJECT(this), TQT_SLOT(slotManpage()),actionCollection(),"gpg_man"); - - (void) new TDEToggleAction(i18n("&Show only Secret Keys"), "kgpg_show", 0,TQT_TQOBJECT(this), TQT_SLOT(slotToggleSecret()),actionCollection(),"show_secret"); + (void) new TDEAction(i18n("&Open Editor"), "edit",0,this, TQ_SLOT(slotOpenEditor()),actionCollection(),"kgpg_editor"); + TDEAction *exportPublicKey = new TDEAction(i18n("E&xport Public Keys..."), "kgpg_export", TDEStdAccel::shortcut(TDEStdAccel::Copy),this, TQ_SLOT(slotexport()),actionCollection(),"key_export"); + TDEAction *deleteKey = new TDEAction(i18n("&Delete Keys"),"edit-delete", TQt::Key_Delete,this, TQ_SLOT(confirmdeletekey()),actionCollection(),"key_delete"); + signKey = new TDEAction(i18n("&Sign Keys..."), "kgpg_sign", 0,this, TQ_SLOT(signkey()),actionCollection(),"key_sign"); + TDEAction *delSignKey = new TDEAction(i18n("Delete Sign&ature"),"edit-delete", 0,this, TQ_SLOT(delsignkey()),actionCollection(),"key_delsign"); + TDEAction *infoKey = new TDEAction(i18n("&Edit Key"), "kgpg_info", TQt::Key_Return,this, TQ_SLOT(listsigns()),actionCollection(),"key_info"); + TDEAction *importKey = new TDEAction(i18n("&Import Key..."), "kgpg_import", TDEStdAccel::shortcut(TDEStdAccel::Paste),this, TQ_SLOT(slotPreImportKey()),actionCollection(),"key_import"); + TDEAction *setDefaultKey = new TDEAction(i18n("Set as De&fault Key"),0, 0,this, TQ_SLOT(slotSetDefKey()),actionCollection(),"key_default"); + importSignatureKey = new TDEAction(i18n("Import Key From Keyserver"),"network", 0,this, TQ_SLOT(preimportsignkey()),actionCollection(),"key_importsign"); + importAllSignKeys = new TDEAction(i18n("Import &Missing Signatures From Keyserver"),"network", 0,this, TQ_SLOT(importallsignkey()),actionCollection(),"key_importallsign"); + refreshKey = new TDEAction(i18n("&Refresh Keys From Keyserver"),"reload", 0,this, TQ_SLOT(refreshKeyFromServer()),actionCollection(),"key_server_refresh"); + + TDEAction *createGroup=new TDEAction(i18n("&Create Group with Selected Keys..."), 0, 0,this, TQ_SLOT(createNewGroup()),actionCollection(),"create_group"); + TDEAction *delGroup= new TDEAction(i18n("&Delete Group"), 0, 0,this, TQ_SLOT(deleteGroup()),actionCollection(),"delete_group"); + TDEAction *editCurrentGroup= new TDEAction(i18n("&Edit Group"), 0, 0,this, TQ_SLOT(editGroup()),actionCollection(),"edit_group"); + + TDEAction *newContact=new TDEAction(i18n("&Create New Contact in Address Book"), "kaddressbook", 0,this, TQ_SLOT(addToKAB()),actionCollection(),"add_kab"); + (void) new TDEAction(i18n("&Go to Default Key"), "go-home",TQKeySequence(CTRL+TQt::Key_Home) ,this, TQ_SLOT(slotGotoDefaultKey()),actionCollection(),"go_default_key"); + + KStdAction::quit(this, TQ_SLOT(quitApp()), actionCollection()); + KStdAction::find(this, TQ_SLOT(findKey()), actionCollection()); + KStdAction::findNext(this, TQ_SLOT(findNextKey()), actionCollection()); + (void) new TDEAction(i18n("&Refresh List"), "reload", TDEStdAccel::reload(),this, TQ_SLOT(refreshkey()),actionCollection(),"key_refresh"); + TDEAction *openPhoto= new TDEAction(i18n("&Open Photo"), "image-x-generic", 0,this, TQ_SLOT(slotShowPhoto()),actionCollection(),"key_photo"); + TDEAction *deletePhoto= new TDEAction(i18n("&Delete Photo"), "delete", 0,this, TQ_SLOT(slotDeletePhoto()),actionCollection(),"delete_photo"); + TDEAction *addPhoto= new TDEAction(i18n("&Add Photo"), 0, 0,this, TQ_SLOT(slotAddPhoto()),actionCollection(),"add_photo"); + + TDEAction *addUid= new TDEAction(i18n("&Add User Id"), 0, 0,this, TQ_SLOT(slotAddUid()),actionCollection(),"add_uid"); + TDEAction *delUid= new TDEAction(i18n("&Delete User Id"), 0, 0,this, TQ_SLOT(slotDelUid()),actionCollection(),"del_uid"); + + TDEAction *editKey = new TDEAction(i18n("Edit Key in &Terminal"), "kgpg_term", TQKeySequence(ALT+TQt::Key_Return),this, TQ_SLOT(slotedit()),actionCollection(),"key_edit"); + TDEAction *exportSecretKey = new TDEAction(i18n("Export Secret Key..."), 0, 0,this, TQ_SLOT(slotexportsec()),actionCollection(),"key_sexport"); + TDEAction *revokeKey = new TDEAction(i18n("Revoke Key..."), 0, 0,this, TQ_SLOT(revokeWidget()),actionCollection(),"key_revoke"); + + TDEAction *deleteKeyPair = new TDEAction(i18n("Delete Key Pair"), 0, 0,this, TQ_SLOT(deleteseckey()),actionCollection(),"key_pdelete"); + TDEAction *generateKey = new TDEAction(i18n("&Generate Key Pair..."), "kgpg_gen", TDEStdAccel::shortcut(TDEStdAccel::New),this, TQ_SLOT(slotgenkey()),actionCollection(),"key_gener"); + + TDEAction *regeneratePublic = new TDEAction(i18n("&Regenerate Public Key"), 0, 0,this, TQ_SLOT(slotregenerate()),actionCollection(),"key_regener"); + + (void) new TDEAction(i18n("&Key Server Dialog"), "network", 0,this, TQ_SLOT(showKeyServer()),actionCollection(),"key_server"); + KStdAction::preferences(this, TQ_SLOT(showOptions()), actionCollection(),"options_configure"); + (void) new TDEAction(i18n("Tip of the &Day"), "idea", 0,this, TQ_SLOT(slotTip()), actionCollection(),"help_tipofday"); + (void) new TDEAction(i18n("View GnuPG Manual"), "contents", 0,this, TQ_SLOT(slotManpage()),actionCollection(),"gpg_man"); + + (void) new TDEToggleAction(i18n("&Show only Secret Keys"), "kgpg_show", 0,this, TQ_SLOT(slotToggleSecret()),actionCollection(),"show_secret"); keysList2->displayOnlySecret=false; - (void) new TDEToggleAction(i18n("&Hide Expired/Disabled Keys"),0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotToggleDisabled()),actionCollection(),"hide_disabled"); + (void) new TDEToggleAction(i18n("&Hide Expired/Disabled Keys"),0, 0,this, TQ_SLOT(slotToggleDisabled()),actionCollection(),"hide_disabled"); keysList2->displayDisabled=true; - sTrust=new TDEToggleAction(i18n("Trust"),0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotShowTrust()),actionCollection(),"show_trust"); - sSize=new TDEToggleAction(i18n("Size"),0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotShowSize()),actionCollection(),"show_size"); - sCreat=new TDEToggleAction(i18n("Creation"),0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotShowCreat()),actionCollection(),"show_creat"); - sExpi=new TDEToggleAction(i18n("Expiration"),0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotShowExpi()),actionCollection(),"show_expi"); + sTrust=new TDEToggleAction(i18n("Trust"),0, 0,this, TQ_SLOT(slotShowTrust()),actionCollection(),"show_trust"); + sSize=new TDEToggleAction(i18n("Size"),0, 0,this, TQ_SLOT(slotShowSize()),actionCollection(),"show_size"); + sCreat=new TDEToggleAction(i18n("Creation"),0, 0,this, TQ_SLOT(slotShowCreat()),actionCollection(),"show_creat"); + sExpi=new TDEToggleAction(i18n("Expiration"),0, 0,this, TQ_SLOT(slotShowExpi()),actionCollection(),"show_expi"); photoProps = new TDESelectAction(i18n("&Photo ID's"),"kgpg_photo", actionCollection(), "photo_settings"); - connect(photoProps, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetPhotoSize(int))); + connect(photoProps, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSetPhotoSize(int))); // Keep the list in kgpg.kcfg in sync with this one! TQStringList list; @@ -722,12 +722,12 @@ listKeys::listKeys(TQWidget *parent, const char *name) : DCOPObject( "KeyInterfa setCentralWidget(keysList2); 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())); - TQObject::connect(keysList2,TQT_SIGNAL(selectionChanged ()),TQT_TQOBJECT(this),TQT_SLOT(checkList())); - TQObject::connect(keysList2,TQT_SIGNAL(contextMenuRequested(TQListViewItem *,const TQPoint &,int)), - this,TQT_SLOT(slotmenu(TQListViewItem *,const TQPoint &,int))); - TQObject::connect(keysList2,TQT_SIGNAL(destroyed()),TQT_TQOBJECT(this),TQT_SLOT(annule())); + TQObject::connect(keysList2,TQ_SIGNAL(returnPressed(TQListViewItem *)),this,TQ_SLOT(listsigns())); + TQObject::connect(keysList2,TQ_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint &,int)),this,TQ_SLOT(listsigns())); + TQObject::connect(keysList2,TQ_SIGNAL(selectionChanged ()),this,TQ_SLOT(checkList())); + TQObject::connect(keysList2,TQ_SIGNAL(contextMenuRequested(TQListViewItem *,const TQPoint &,int)), + this,TQ_SLOT(slotmenu(TQListViewItem *,const TQPoint &,int))); + TQObject::connect(keysList2,TQ_SIGNAL(destroyed()),this,TQ_SLOT(annule())); /////////////// get all keys data @@ -742,10 +742,10 @@ listKeys::listKeys(TQWidget *parent, const char *name) : DCOPObject( "KeyInterfa : "locationbar_erase")); (void) new TQLabel(i18n("Search: "),toolBar()); listViewSearch = new mySearchLine(toolBar(),keysList2); - connect(clearSearch, TQT_SIGNAL(pressed()), TQT_TQOBJECT(listViewSearch), TQT_SLOT(clear())); + connect(clearSearch, TQ_SIGNAL(pressed()), listViewSearch, TQ_SLOT(clear())); - (void)new TDEAction(i18n("Filter Search"), TQt::Key_F6, TQT_TQOBJECT(listViewSearch), TQT_SLOT(setFocus()),actionCollection(), "search_focus"); + (void)new TDEAction(i18n("Filter Search"), TQt::Key_F6, listViewSearch, TQ_SLOT(setFocus()),actionCollection(), "search_focus"); sTrust->setChecked(KGpgSettings::showTrust()); sSize->setChecked(KGpgSettings::showSize()); @@ -758,13 +758,13 @@ listKeys::listKeys(TQWidget *parent, const char *name) : DCOPObject( "KeyInterfa keyStatusBar->insertFixedItem(i18n("00000 Keys, 000 Groups"),1,true); keyStatusBar->setItemAlignment(0, AlignLeft); keyStatusBar->changeItem("",1); - TQObject::connect(keysList2,TQT_SIGNAL(statusMessage(TQString,int,bool)),TQT_TQOBJECT(this),TQT_SLOT(changeMessage(TQString,int,bool))); - TQObject::connect(statusbarTimer,TQT_SIGNAL(timeout()),TQT_TQOBJECT(this),TQT_SLOT(statusBarTimeout())); + TQObject::connect(keysList2,TQ_SIGNAL(statusMessage(TQString,int,bool)),this,TQ_SLOT(changeMessage(TQString,int,bool))); + TQObject::connect(statusbarTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(statusBarTimeout())); s_kgpgEditor= new KgpgApp(parent, "editor",WType_Dialog,actionCollection()->action("go_default_key")->shortcut(),true); - connect(s_kgpgEditor,TQT_SIGNAL(refreshImported(TQStringList)),keysList2,TQT_SLOT(slotReloadKeys(TQStringList))); - connect(this,TQT_SIGNAL(fontChanged(TQFont)),s_kgpgEditor,TQT_SLOT(slotSetFont(TQFont))); - connect(s_kgpgEditor->view->editor,TQT_SIGNAL(refreshImported(TQStringList)),keysList2,TQT_SLOT(slotReloadKeys(TQStringList))); + connect(s_kgpgEditor,TQ_SIGNAL(refreshImported(TQStringList)),keysList2,TQ_SLOT(slotReloadKeys(TQStringList))); + connect(this,TQ_SIGNAL(fontChanged(TQFont)),s_kgpgEditor,TQ_SLOT(slotSetFont(TQFont))); + connect(s_kgpgEditor->view->editor,TQ_SIGNAL(refreshImported(TQStringList)),keysList2,TQ_SLOT(slotReloadKeys(TQStringList))); // kdDebug(2100) << k_funcinfo << "getGpgversion" << KgpgInterface::getGpgVersion() <<endl; } @@ -781,10 +781,10 @@ show(); void listKeys::slotOpenEditor() { KgpgApp *kgpgtxtedit = new KgpgApp(this, "editor",WType_TopLevel | WDestructiveClose,actionCollection()->action("go_default_key")->shortcut()); - connect(kgpgtxtedit,TQT_SIGNAL(refreshImported(TQStringList)),keysList2,TQT_SLOT(slotReloadKeys(TQStringList))); - connect(kgpgtxtedit,TQT_SIGNAL(encryptFiles(KURL::List)),TQT_TQOBJECT(this),TQT_SIGNAL(encryptFiles(KURL::List))); - connect(this,TQT_SIGNAL(fontChanged(TQFont)),kgpgtxtedit,TQT_SLOT(slotSetFont(TQFont))); - connect(kgpgtxtedit->view->editor,TQT_SIGNAL(refreshImported(TQStringList)),keysList2,TQT_SLOT(slotReloadKeys(TQStringList))); + connect(kgpgtxtedit,TQ_SIGNAL(refreshImported(TQStringList)),keysList2,TQ_SLOT(slotReloadKeys(TQStringList))); + connect(kgpgtxtedit,TQ_SIGNAL(encryptFiles(KURL::List)),this,TQ_SIGNAL(encryptFiles(KURL::List))); + connect(this,TQ_SIGNAL(fontChanged(TQFont)),kgpgtxtedit,TQ_SLOT(slotSetFont(TQFont))); + connect(kgpgtxtedit->view->editor,TQ_SIGNAL(refreshImported(TQStringList)),keysList2,TQ_SLOT(slotReloadKeys(TQStringList))); kgpgtxtedit->show(); } @@ -911,7 +911,7 @@ void listKeys::refreshKeyFromServer() kServer=new keyServer(0,"server_dialog",false); kServer->page->kLEimportid->setText(keyIDS); kServer->slotImport(); - connect( kServer, TQT_SIGNAL( importFinished(TQString) ) , this, TQT_SLOT(refreshFinished())); + connect( kServer, TQ_SIGNAL( importFinished(TQString) ) , this, TQ_SLOT(refreshFinished())); } @@ -970,13 +970,13 @@ void listKeys::slotAddUid() addUidWidget->setMainWidget(keyUid); //keyUid->setMinimumSize(keyUid->sizeHint()); keyUid->setMinimumWidth(300); - connect(keyUid->kLineEdit1,TQT_SIGNAL(textChanged ( const TQString & )),TQT_TQOBJECT(this),TQT_SLOT(slotAddUidEnable(const TQString & ))); + connect(keyUid->kLineEdit1,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(slotAddUidEnable(const TQString & ))); if (addUidWidget->exec()!=TQDialog::Accepted) return; KgpgInterface *addUidProcess=new KgpgInterface(); addUidProcess->KgpgAddUid(keysList2->currentItem()->text(6),keyUid->kLineEdit1->text(),keyUid->kLineEdit2->text(),keyUid->kLineEdit3->text()); - connect(addUidProcess,TQT_SIGNAL(addUidFinished()),keysList2,TQT_SLOT(refreshselfkey())); - connect(addUidProcess,TQT_SIGNAL(addUidError(TQString)),TQT_TQOBJECT(this),TQT_SLOT(slotGpgError(TQString))); + connect(addUidProcess,TQ_SIGNAL(addUidFinished()),keysList2,TQ_SLOT(refreshselfkey())); + connect(addUidProcess,TQ_SIGNAL(addUidError(TQString)),this,TQ_SLOT(slotGpgError(TQString))); } void listKeys::slotAddUidEnable(const TQString & name) @@ -999,8 +999,8 @@ void listKeys::slotAddPhoto() return; KgpgInterface *addPhotoProcess=new KgpgInterface(); addPhotoProcess->KgpgAddPhoto(keysList2->currentItem()->text(6),imagePath); - connect(addPhotoProcess,TQT_SIGNAL(addPhotoFinished()),TQT_TQOBJECT(this),TQT_SLOT(slotUpdatePhoto())); - connect(addPhotoProcess,TQT_SIGNAL(addPhotoError(TQString)),TQT_TQOBJECT(this),TQT_SLOT(slotGpgError(TQString))); + connect(addPhotoProcess,TQ_SIGNAL(addPhotoFinished()),this,TQ_SLOT(slotUpdatePhoto())); + connect(addPhotoProcess,TQ_SIGNAL(addPhotoError(TQString)),this,TQ_SLOT(slotGpgError(TQString))); } void listKeys::slotGpgError(TQString errortxt) @@ -1016,8 +1016,8 @@ void listKeys::slotDeletePhoto() KgpgInterface *delPhotoProcess=new KgpgInterface(); delPhotoProcess->KgpgDeletePhoto(keysList2->currentItem()->parent()->text(6),keysList2->currentItem()->text(6)); - connect(delPhotoProcess,TQT_SIGNAL(delPhotoFinished()),TQT_TQOBJECT(this),TQT_SLOT(slotUpdatePhoto())); - connect(delPhotoProcess,TQT_SIGNAL(delPhotoError(TQString)),TQT_TQOBJECT(this),TQT_SLOT(slotGpgError(TQString))); + connect(delPhotoProcess,TQ_SIGNAL(delPhotoFinished()),this,TQ_SLOT(slotUpdatePhoto())); + connect(delPhotoProcess,TQ_SIGNAL(delPhotoError(TQString)),this,TQ_SLOT(slotGpgError(TQString))); } void listKeys::slotUpdatePhoto() @@ -1251,7 +1251,7 @@ void listKeys::showKeyServer() { // kdDebug(2100) << k_funcinfo << endl; keyServer *ks=new keyServer(this); - connect(ks,TQT_SIGNAL( importFinished(TQString) ) , keysList2, TQT_SLOT(refreshcurrentkey(TQString))); + connect(ks,TQ_SIGNAL( importFinished(TQString) ) , keysList2, TQ_SLOT(refreshcurrentkey(TQString))); ks->exec(); if (ks) delete ks; @@ -1338,12 +1338,12 @@ void listKeys::showOptions() if (TDEConfigDialog::showDialog("settings")) return; kgpgOptions *optionsDialog=new kgpgOptions(this,"settings"); - connect(optionsDialog,TQT_SIGNAL(settingsUpdated()),TQT_TQOBJECT(this),TQT_SLOT(readAllOptions())); - connect(optionsDialog,TQT_SIGNAL(homeChanged()),TQT_TQOBJECT(this),TQT_SLOT(refreshkey())); - connect(optionsDialog,TQT_SIGNAL(reloadKeyList()),TQT_TQOBJECT(this),TQT_SLOT(refreshkey())); - connect(optionsDialog,TQT_SIGNAL(refreshTrust(int,TQColor)),keysList2,TQT_SLOT(refreshTrust(int,TQColor))); - connect(optionsDialog,TQT_SIGNAL(changeFont(TQFont)),TQT_TQOBJECT(this),TQT_SIGNAL(fontChanged(TQFont))); - connect(optionsDialog,TQT_SIGNAL(installShredder()),TQT_TQOBJECT(this),TQT_SIGNAL(installShredder())); + connect(optionsDialog,TQ_SIGNAL(settingsUpdated()),this,TQ_SLOT(readAllOptions())); + connect(optionsDialog,TQ_SIGNAL(homeChanged()),this,TQ_SLOT(refreshkey())); + connect(optionsDialog,TQ_SIGNAL(reloadKeyList()),this,TQ_SLOT(refreshkey())); + connect(optionsDialog,TQ_SIGNAL(refreshTrust(int,TQColor)),keysList2,TQ_SLOT(refreshTrust(int,TQColor))); + connect(optionsDialog,TQ_SIGNAL(changeFont(TQFont)),this,TQ_SIGNAL(fontChanged(TQFont))); + connect(optionsDialog,TQ_SIGNAL(installShredder()),this,TQ_SIGNAL(installShredder())); optionsDialog->exec(); delete optionsDialog; } @@ -1476,15 +1476,15 @@ void listKeys::revokeWidget() if (keyRevoke->cbSave->isChecked()) { slotrevoke(keysList2->currentItem()->text(6),keyRevoke->kURLRequester1->url(),keyRevoke->comboBox1->currentItem(),keyRevoke->textDescription->text()); if (keyRevoke->cbPrint->isChecked()) - connect(revKeyProcess,TQT_SIGNAL(revokeurl(TQString)),TQT_TQOBJECT(this),TQT_SLOT(doFilePrint(TQString))); + connect(revKeyProcess,TQ_SIGNAL(revokeurl(TQString)),this,TQ_SLOT(doFilePrint(TQString))); if (keyRevoke->cbImport->isChecked()) - connect(revKeyProcess,TQT_SIGNAL(revokeurl(TQString)),TQT_TQOBJECT(this),TQT_SLOT(slotImportRevoke(TQString))); + connect(revKeyProcess,TQ_SIGNAL(revokeurl(TQString)),this,TQ_SLOT(slotImportRevoke(TQString))); } else { slotrevoke(keysList2->currentItem()->text(6),TQString(),keyRevoke->comboBox1->currentItem(),keyRevoke->textDescription->text()); if (keyRevoke->cbPrint->isChecked()) - connect(revKeyProcess,TQT_SIGNAL(revokecertificate(TQString)),TQT_TQOBJECT(this),TQT_SLOT(doPrint(TQString))); + connect(revKeyProcess,TQ_SIGNAL(revokecertificate(TQString)),this,TQ_SLOT(doPrint(TQString))); if (keyRevoke->cbImport->isChecked()) - connect(revKeyProcess,TQT_SIGNAL(revokecertificate(TQString)),TQT_TQOBJECT(this),TQT_SLOT(slotImportRevokeTxt(TQString))); + connect(revKeyProcess,TQ_SIGNAL(revokecertificate(TQString)),this,TQ_SLOT(slotImportRevokeTxt(TQString))); } } @@ -1493,14 +1493,14 @@ void listKeys::slotImportRevoke(TQString url) { KgpgInterface *importKeyProcess=new KgpgInterface(); importKeyProcess->importKeyURL(KURL::fromPathOrURL( url )); - connect(importKeyProcess,TQT_SIGNAL(importfinished(TQStringList)),keysList2,TQT_SLOT(refreshselfkey())); + connect(importKeyProcess,TQ_SIGNAL(importfinished(TQStringList)),keysList2,TQ_SLOT(refreshselfkey())); } void listKeys::slotImportRevokeTxt(TQString revokeText) { KgpgInterface *importKeyProcess=new KgpgInterface(); importKeyProcess->importKey(revokeText); - connect(importKeyProcess,TQT_SIGNAL(importfinished(TQStringList)),keysList2,TQT_SLOT(refreshselfkey())); + connect(importKeyProcess,TQ_SIGNAL(importfinished(TQStringList)),keysList2,TQ_SLOT(refreshselfkey())); } void listKeys::slotexportsec() @@ -1623,10 +1623,10 @@ void listKeys::slotexport() TQString result=kexp->getKey(tdelist,exportAttr); if (page->checkClipboard->isChecked()) slotProcessExportClip(result); - //connect(kexp,TQT_SIGNAL(publicKeyString(TQString)),TQT_TQOBJECT(this),TQT_SLOT(slotProcessExportClip(TQString))); + //connect(kexp,TQ_SIGNAL(publicKeyString(TQString)),this,TQ_SLOT(slotProcessExportClip(TQString))); else slotProcessExportMail(result); - //connect(kexp,TQT_SIGNAL(publicKeyString(TQString)),TQT_TQOBJECT(this),TQT_SLOT(slotProcessExportMail(TQString))); + //connect(kexp,TQ_SIGNAL(publicKeyString(TQString)),this,TQ_SLOT(slotProcessExportMail(TQString))); } } @@ -1698,7 +1698,7 @@ void listKeys::listsigns() TQString key=keysList2->currentItem()->text(6); if (!key.isEmpty()) { KgpgKeyInfo *opts=new KgpgKeyInfo(this,"key_props",key); - connect(opts,TQT_SIGNAL(keyNeedsRefresh()),keysList2,TQT_SLOT(refreshselfkey())); + connect(opts,TQ_SIGNAL(keyNeedsRefresh()),keysList2,TQ_SLOT(refreshselfkey())); opts->exec(); } else editGroup(); @@ -1848,11 +1848,11 @@ void listKeys::editGroup() gEdit->buttonAdd->setPixmap(TDEGlobal::iconLoader()->loadIcon("go-down",TDEIcon::Small,20)); gEdit->buttonRemove->setPixmap(TDEGlobal::iconLoader()->loadIcon("go-up",TDEIcon::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())); - // connect(dialogGroupEdit->okClicked(),TQT_SIGNAL(clicked()),TQT_TQOBJECT(this),TQT_SLOT(groupChange())); - connect(gEdit->availableKeys,TQT_SIGNAL(doubleClicked (TQListViewItem *, const TQPoint &, int)),TQT_TQOBJECT(this),TQT_SLOT(groupAdd())); - connect(gEdit->groupKeys,TQT_SIGNAL(doubleClicked (TQListViewItem *, const TQPoint &, int)),TQT_TQOBJECT(this),TQT_SLOT(groupRemove())); + connect(gEdit->buttonAdd,TQ_SIGNAL(clicked()),this,TQ_SLOT(groupAdd())); + connect(gEdit->buttonRemove,TQ_SIGNAL(clicked()),this,TQ_SLOT(groupRemove())); + // connect(dialogGroupEdit->okClicked(),TQ_SIGNAL(clicked()),this,TQ_SLOT(groupChange())); + connect(gEdit->availableKeys,TQ_SIGNAL(doubleClicked (TQListViewItem *, const TQPoint &, int)),this,TQ_SLOT(groupAdd())); + connect(gEdit->groupKeys,TQ_SIGNAL(doubleClicked (TQListViewItem *, const TQPoint &, int)),this,TQ_SLOT(groupRemove())); TQListViewItem *item=keysList2->firstChild(); if (item==NULL) return; @@ -2024,7 +2024,7 @@ void listKeys::signLoop() // kdDebug(2100)<<"Sign process for key: "<<keyCount<<" on a total of "<<signList.count()<<endl; if ( signList.at(keyCount) ) { KgpgInterface *signKeyProcess=new KgpgInterface(); - TQObject::connect(signKeyProcess,TQT_SIGNAL(signatureFinished(int)),TQT_TQOBJECT(this),TQT_SLOT(signatureResult(int))); + TQObject::connect(signKeyProcess,TQ_SIGNAL(signatureFinished(int)),this,TQ_SLOT(signatureResult(int))); signKeyProcess->KgpgSignKey(signList.at(keyCount)->text(6),globalkeyID,globalkeyMail,globalisLocal,globalChecked); } } @@ -2088,7 +2088,7 @@ bool listKeys::importRemoteKey(TQString keyID) kServer->page->tabWidget2->setTabEnabled(kServer->page->tabWidget2->page(1),false); kServer->show(); kServer->raise(); - connect( kServer, TQT_SIGNAL( importFinished(TQString) ) , this, TQT_SLOT( dcopImportFinished())); + connect( kServer, TQ_SIGNAL( importFinished(TQString) ) , this, TQ_SLOT( dcopImportFinished())); return true; } @@ -2117,7 +2117,7 @@ void listKeys::importsignkey(TQString importKeyId) kServer->slotImport(); // kServer->slotSearch(); //kServer->show(); - connect( kServer, TQT_SIGNAL( importFinished(TQString) ) , this, TQT_SLOT( importfinished())); + connect( kServer, TQ_SIGNAL( importFinished(TQString) ) , this, TQ_SLOT( importfinished())); } @@ -2164,7 +2164,7 @@ void listKeys::delsignkey() return; KgpgInterface *delSignKeyProcess=new KgpgInterface(); delSignKeyProcess->KgpgDelSignature(parentKey,signID); - connect(delSignKeyProcess,TQT_SIGNAL(delsigfinished(bool)),TQT_TQOBJECT(this),TQT_SLOT(delsignatureResult(bool))); + connect(delSignKeyProcess,TQ_SIGNAL(delsigfinished(bool)),this,TQ_SLOT(delsignatureResult(bool))); } void listKeys::delsignatureResult(bool success) @@ -2272,7 +2272,7 @@ void listKeys::slotgenkey() //*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"; ///////// when process ends, update dialog infos - TQObject::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),TQT_TQOBJECT(this), TQT_SLOT(genover(TDEProcess *))); + TQObject::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(genover(TDEProcess *))); proc->start(TDEProcess::NotifyOnExit,true); if (ktype=="RSA") @@ -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,TQT_SIGNAL(readReady(KProcIO *)),TQT_TQOBJECT(this),TQT_SLOT(readgenprocess(KProcIO *))); + TQObject::connect(proc,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(readgenprocess(KProcIO *))); proc->closeWhenDone(); } else ////// start expert (=konsole) mode { @@ -2346,8 +2346,8 @@ void listKeys::genover(TDEProcess *) <<"--with-colons" << fpropt <<"--list-keys"<<newKeyName; - TQObject::connect(conprocess,TQT_SIGNAL(readReady(KProcIO *)),TQT_TQOBJECT(this),TQT_SLOT(slotReadFingerProcess(KProcIO *))); - TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),TQT_TQOBJECT(this), TQT_SLOT(newKeyDone(TDEProcess *))); + TQObject::connect(conprocess,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(slotReadFingerProcess(KProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(newKeyDone(TDEProcess *))); conprocess->start(TDEProcess::NotifyOnExit,true); } @@ -2413,10 +2413,10 @@ void listKeys::newKeyDone(TDEProcess *) if (page->CBsave->isChecked()) { slotrevoke(newkeyID,page->kURLRequester1->url(),0,i18n("backup copy")); if (page->CBprint->isChecked()) - connect(revKeyProcess,TQT_SIGNAL(revokeurl(TQString)),TQT_TQOBJECT(this),TQT_SLOT(doFilePrint(TQString))); + connect(revKeyProcess,TQ_SIGNAL(revokeurl(TQString)),this,TQ_SLOT(doFilePrint(TQString))); } else if (page->CBprint->isChecked()) { slotrevoke(newkeyID,TQString(),0,i18n("backup copy")); - connect(revKeyProcess,TQT_SIGNAL(revokecertificate(TQString)),TQT_TQOBJECT(this),TQT_SLOT(doPrint(TQString))); + connect(revKeyProcess,TQ_SIGNAL(revokecertificate(TQString)),this,TQ_SLOT(doPrint(TQString))); } } @@ -2460,7 +2460,7 @@ void listKeys::deleteseckey() *conprocess<< config->readPathEntry("TerminalApplication","konsole"); *conprocess<<"-e"<<"gpg" <<"--no-secmem-warning" <<"--delete-secret-key"<<keysList2->currentItem()->text(6); - TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),TQT_TQOBJECT(this), TQT_SLOT(reloadSecretKeys())); + TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(reloadSecretKeys())); conprocess->start(TDEProcess::NotifyOnExit,TDEProcess::AllOutput); } @@ -2594,8 +2594,8 @@ void listKeys::slotPreImportKey() ////////////////////////// import from file KgpgInterface *importKeyProcess=new KgpgInterface(); importKeyProcess->importKeyURL(KURL::fromPathOrURL( impname )); - connect(importKeyProcess,TQT_SIGNAL(importfinished(TQStringList)),keysList2,TQT_SLOT(slotReloadKeys(TQStringList))); - connect(importKeyProcess,TQT_SIGNAL(refreshOrphaned()),keysList2,TQT_SLOT(slotReloadOrphaned())); + connect(importKeyProcess,TQ_SIGNAL(importfinished(TQStringList)),keysList2,TQ_SLOT(slotReloadKeys(TQStringList))); + connect(importKeyProcess,TQ_SIGNAL(refreshOrphaned()),keysList2,TQ_SLOT(slotReloadOrphaned())); } } else { TQString keystr = kapp->clipboard()->text(clipboardMode); @@ -2603,8 +2603,8 @@ void listKeys::slotPreImportKey() changeMessage(i18n("Importing..."),0,true); KgpgInterface *importKeyProcess=new KgpgInterface(); importKeyProcess->importKey(keystr); - connect(importKeyProcess,TQT_SIGNAL(importfinished(TQStringList)),keysList2,TQT_SLOT(slotReloadKeys(TQStringList))); - connect(importKeyProcess,TQT_SIGNAL(refreshOrphaned()),keysList2,TQT_SLOT(slotReloadOrphaned())); + connect(importKeyProcess,TQ_SIGNAL(importfinished(TQStringList)),keysList2,TQ_SLOT(slotReloadKeys(TQStringList))); + connect(importKeyProcess,TQ_SIGNAL(refreshOrphaned()),keysList2,TQ_SLOT(slotReloadOrphaned())); } } } @@ -2641,9 +2641,9 @@ TQPixmap KeyView::slotGetPhoto(TQString photoId,bool mini) TQImage dup=pixmap.convertToImage(); TQPixmap dup2; if (!mini) - dup2.convertFromImage(dup.scale(previewSize+5,previewSize,TQ_ScaleMin)); + dup2.convertFromImage(dup.scale(previewSize+5,previewSize,TQImage::ScaleMin)); else - dup2.convertFromImage(dup.scale(22,22,TQ_ScaleMin)); + dup2.convertFromImage(dup.scale(22,22,TQImage::ScaleMin)); phototmp->unlink(); delete phototmp; return dup2; @@ -2721,7 +2721,7 @@ void KeyView::expandKey(TQListViewItem *item) pixmap.load(kgpgphototmp->name()); TQImage dup=pixmap.convertToImage(); TQPixmap dup2; - dup2.convertFromImage(dup.scale(previewSize+5,previewSize,TQ_ScaleMin)); + dup2.convertFromImage(dup.scale(previewSize+5,previewSize,TQImage::ScaleMin)); itemuid->setPixmap(0,dup2); delete kgpgphototmp; //itemuid->setPixmap(0,keyPhotoId); @@ -3420,7 +3420,7 @@ gpgKey KeyView::extractKey(TQString keyColon) date = timestamp.date(); } else { - date = TQDate::fromString(ret.gpgkeycreation, Qt::ISODate); + date = TQDate::fromString(ret.gpgkeycreation, TQt::ISODate); } Q_ASSERT (date.isValid()) /*tqWarning("create date is not valid")*/; ret.gpgkeycreation=TDEGlobal::locale()->formatDate(date, true); @@ -3439,7 +3439,7 @@ gpgKey KeyView::extractKey(TQString keyColon) date = timestamp.date(); } else { - date = TQDate::fromString(ret.gpgkeyexpiration, Qt::ISODate); + date = TQDate::fromString(ret.gpgkeyexpiration, TQt::ISODate); } Q_ASSERT (date.isValid()) /*tqWarning("expire date is not valid")*/; ret.gpgkeyexpiration=TDEGlobal::locale()->formatDate(date, true); diff --git a/kgpg/listkeys.h b/kgpg/listkeys.h index 55af3b5..a0269c6 100644 --- a/kgpg/listkeys.h +++ b/kgpg/listkeys.h @@ -67,7 +67,7 @@ struct gpgKey class KgpgSelKey : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -91,7 +91,7 @@ public slots: class KeyView : public TDEListView { - Q_OBJECT + TQ_OBJECT friend class listKeys; public: @@ -143,7 +143,7 @@ protected: class mySearchLine: public TDEListViewSearchLine { - Q_OBJECT + TQ_OBJECT public: mySearchLine(TQWidget *parent = 0, KeyView *listView = 0, const char *name = 0); @@ -161,7 +161,7 @@ virtual bool itemMatches(const TQListViewItem *item, const TQString & s) const; class listKeys : public TDEMainWindow, virtual public KeyInterface { friend class KeyView; - Q_OBJECT + TQ_OBJECT public: diff --git a/kgpg/newkey.ui b/kgpg/newkey.ui index 7793d74..a181bd5 100644 --- a/kgpg/newkey.ui +++ b/kgpg/newkey.ui @@ -191,8 +191,8 @@ <include location="global" impldecl="in implementation">klineedit.h</include> <include location="global" impldecl="in implementation">kurlrequester.h</include> </includes> -<Q_SLOTS> +<slots> <slot>CBsave_toggled( bool isOn )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kgpg/popuppublic.cpp b/kgpg/popuppublic.cpp index 07eb33e..f46b722 100644 --- a/kgpg/popuppublic.cpp +++ b/kgpg/popuppublic.cpp @@ -124,7 +124,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent : "locationbar_erase")); (void) new TQLabel(i18n("Search: "),hBar); TDEListViewSearchLine* listViewSearch = new TDEListViewSearchLine(hBar); - connect(clearSearch, TQT_SIGNAL(pressed()), listViewSearch, TQT_SLOT(clear())); + connect(clearSearch, TQ_SIGNAL(pressed()), listViewSearch, TQ_SLOT(clear())); #endif keysList = new TDEListView( page ); @@ -147,10 +147,10 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent keysList->setColumnWidth(0,210); keysList->setColumnWidth(1,210); - boutonboxoptions=new TQButtonGroup(5,Qt::Vertical ,page,0); + boutonboxoptions=new TQButtonGroup(5,TQt::Vertical ,page,0); TDEActionCollection *actcol=new TDEActionCollection(this); - (void) new TDEAction(i18n("&Go to Default Key"),goDefaultKey, TQT_TQOBJECT(this), TQT_SLOT(slotGotoDefaultKey()),actcol,"go_default_key"); + (void) new TDEAction(i18n("&Go to Default Key"),goDefaultKey, this, TQ_SLOT(slotGotoDefaultKey()),actcol,"go_default_key"); CBarmor=new TQCheckBox(i18n("ASCII armored encryption"),boutonboxoptions); @@ -189,7 +189,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent TQWhatsThis::add (CBsymmetric,i18n("<b>Symmetrical encryption</b>: encryption does not use keys. You just need to give a password " "to encrypt/decrypt the file")); - TQObject::connect(CBsymmetric,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(isSymetric(bool))); + TQObject::connect(CBsymmetric,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(isSymetric(bool))); CBarmor->setChecked( KGpgSettings::asciiArmor() ); CBuntrusted->setChecked( KGpgSettings::allowUntrustedKeys() ); @@ -204,11 +204,11 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent optiontxt->setText(customOptions); TQWhatsThis::add (optiontxt,i18n("<b>Custom option</b>: for experienced users only, allows you to enter a gpg command line option, like: '--armor'")); - TQObject::connect(optiontxt,TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(customOpts(const TQString & ))); + TQObject::connect(optiontxt,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(customOpts(const TQString & ))); } - TQObject::connect(keysList,TQT_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint &,int)),this,TQT_SLOT(slotOk())); -// TQObject::connect(this,TQT_SIGNAL(okClicked()),this,TQT_SLOT(crypte())); - TQObject::connect(CBuntrusted,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(refresh(bool))); + TQObject::connect(keysList,TQ_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint &,int)),this,TQ_SLOT(slotOk())); +// TQObject::connect(this,TQ_SIGNAL(okClicked()),this,TQ_SLOT(crypte())); + TQObject::connect(CBuntrusted,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(refresh(bool))); char line[200]="\0"; FILE *fp2; @@ -343,26 +343,111 @@ 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(TDEProcess *)),this, TQT_SLOT(slotpreselect())); - TQObject::connect(encid, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotprocread(KProcIO *))); + TQObject::connect(encid, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotpreselect())); + TQObject::connect(encid, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(slotprocread(KProcIO *))); encid->start(TDEProcess::NotifyOnExit,true); } void popupPublic::slotpreselect() { -TQListViewItem *it=NULL; -if (!keysList->firstChild()) return; - if (fmode) it=keysList->findItem(KGpgSettings::defaultKey(),2); -if (!trusted) - sort(); -if (fmode) -{ - keysList->clearSelection(); - keysList->setSelected(it,true); - keysList->setCurrentItem(it); - keysList->ensureItemVisible(it); -} -emit keyListFilled(); + + TQString defaultKey = KGpgSettings::defaultKey().right(8); + + // process the output to update dialog infos + TQMap<TQString,TQStringList>::Iterator ite; + for (ite = hashMap.begin(); ite != hashMap.end(); ite++) { + TQStringList::Iterator it; + TQString fullname,keyname,keymail,val,id; + bool dead; + for (it = ite.data().begin(); it != ite.data().end(); it++) { + TQString line = (*it); + kdDebug(2100) << k_funcinfo << line << endl; + + if (line.startsWith("pub")) { + TQStringList keyString=TQStringList::split(":",line,true); + dead=false; + const TQString trust=keyString[1]; + val=keyString[6]; + id=TQString("0x"+keyString[4].right(8)); + if (val.isEmpty()) { + val=i18n("Unlimited"); + } +// unused TQString tr; + switch( trust[0] ) { + case 'o': // unknown + untrustedList<<id; // untrustedList used in sort + break; + case 'i': // invalid + case 'd': // disabled + case 'r': // revoked + case 'e': // expired + dead=true; + break; + case 'q': // undefined + case 'n': // none + case 'm': // marginal + untrustedList<<id; + break; + case 'f': // full + case 'u': // ultimate + break; + default: + untrustedList<<id; + break; + } + if (keyString[11].find('D')!=-1) { // disabled + dead=true; + } + fullname=keyString[9]; + } + + if ( line.startsWith("uid") && fullname.isEmpty() ) { + fullname = line.section(':',9,9); + } + } + + if (fullname.find("<")!=-1) { + keymail=fullname.section('<',-1,-1); + keymail.truncate(keymail.length()-1); + keyname=fullname.section('<',0,0); + //if (keyname.find("(")!=-1) { + // keyname=keyname.section('(',0,0); + //} + } + else { + keymail=TQString(); + keyname=fullname;//.section('(',0,0); + } + if ((!dead) && (!fullname.isEmpty())) { + bool isDefaultKey=false; + if (id.right(8)==defaultKey) { + isDefaultKey=true; + } + UpdateViewItem2 *item=new UpdateViewItem2(keysList,keyname,keymail,id,isDefaultKey); + //TDEListViewItem *sub= new TDEListViewItem(item,i18n("ID: %1, trust: %2, validity: %3").arg(id).arg(tr).arg(val)); + //sub->setSelectable(false); + if (seclist.find(fullname,0,FALSE)!=-1) { + item->setPixmap(0,keyPair); + } + else { + item->setPixmap(0,keySingle); + } + } + } + // + TQListViewItem *it=NULL; + if (!keysList->firstChild()) return; + if (fmode) it=keysList->findItem(KGpgSettings::defaultKey(),2); + if (!trusted) + sort(); + if (fmode) + { + keysList->clearSelection(); + keysList->setSelected(it,true); + keysList->setCurrentItem(it); + keysList->ensureItemVisible(it); + } + emit keyListFilled(); } void popupPublic::slotSetVisible() @@ -372,14 +457,11 @@ void popupPublic::slotSetVisible() void popupPublic::slotprocread(KProcIO *p) { +// collect all data (output starts with pub line followed by related) // kdDebug(2100) << k_funcinfo << endl; - ///////////////////////////////////////////////////////////////// extract encryption keys TQString tst; - TQString defaultKey = KGpgSettings::defaultKey().right(8); - while (p->readln(tst)!=-1) { -// kdDebug(2100) << k_funcinfo << "Read one public key line: " << tst << endl; if ( tst.startsWith("pub") ) { currentKey = tst.section(':',4,4); TQStringList lst; lst << tst; @@ -389,98 +471,6 @@ void popupPublic::slotprocread(KProcIO *p) hashMap.find(currentKey).data().append(tst); } } - - TQMap<TQString,TQStringList>::Iterator ite; - for (ite = hashMap.begin(); ite != hashMap.end(); ite++) { - TQStringList::Iterator it; - TQString fullname,keyname,keymail,val,id; - bool dead; - - for (it = ite.data().begin(); it != ite.data().end(); it++) { - TQString line = (*it); - - if (line.startsWith("pub")) { - TQStringList keyString=TQStringList::split(":",line,true); - dead=false; - const TQString trust=keyString[1]; - val=keyString[6]; - id=TQString("0x"+keyString[4].right(8)); - if (val.isEmpty()) { - val=i18n("Unlimited"); - } - TQString tr; - switch( trust[0] ) { - case 'o': - untrustedList<<id; - break; - case 'i': - dead=true; - break; - case 'd': - dead=true; - break; - case 'r': - dead=true; - break; - case 'e': - dead=true; - break; - case 'q': - untrustedList<<id; - break; - case 'n': - untrustedList<<id; - break; - case 'm': - untrustedList<<id; - break; - case 'f': - break; - case 'u': - break; - default: - untrustedList<<id; - break; - } - if (keyString[11].find('D')!=-1) { - dead=true; - } - fullname=keyString[9]; - } - - if ( line.startsWith("uid") && fullname.isEmpty() ) { - fullname = line.section(':',9,9); - } - } - - if (fullname.find("<")!=-1) { - keymail=fullname.section('<',-1,-1); - keymail.truncate(keymail.length()-1); - keyname=fullname.section('<',0,0); - //if (keyname.find("(")!=-1) { - // keyname=keyname.section('(',0,0); - //} - } - else { - keymail=TQString(); - keyname=fullname;//.section('(',0,0); - } - if ((!dead) && (!fullname.isEmpty())) { - bool isDefaultKey=false; - if (id.right(8)==defaultKey) { - isDefaultKey=true; - } - UpdateViewItem2 *item=new UpdateViewItem2(keysList,keyname,keymail,id,isDefaultKey); - //TDEListViewItem *sub= new TDEListViewItem(item,i18n("ID: %1, trust: %2, validity: %3").arg(id).arg(tr).arg(val)); - //sub->setSelectable(false); - if (seclist.find(fullname,0,FALSE)!=-1) { - item->setPixmap(0,keyPair); - } - else { - item->setPixmap(0,keySingle); - } - } - } } diff --git a/kgpg/popuppublic.h b/kgpg/popuppublic.h index 7f860f6..a8e0327 100644 --- a/kgpg/popuppublic.h +++ b/kgpg/popuppublic.h @@ -31,7 +31,7 @@ class KProcIO; class popupPublic : public KDialogBase //TQDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/kgpg/sourceselect.ui b/kgpg/sourceselect.ui index 2dc9c38..ad88492 100644 --- a/kgpg/sourceselect.ui +++ b/kgpg/sourceselect.ui @@ -100,15 +100,13 @@ <slot>checkFile_toggled(bool)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>checkFile_toggled( bool isOn )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> <include location="global" impldecl="in implementation">kurlrequester.h</include> </includes> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> |