From bf280726d5d22f33d33e4f9e771220c725249407 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:50:52 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- kgpg/conf_decryption.ui | 2 +- kgpg/conf_encryption.ui | 6 +-- kgpg/conf_gpg.ui | 6 +-- kgpg/conf_misc.ui | 14 +++---- kgpg/conf_servers.ui | 2 +- kgpg/conf_ui2.ui | 4 +- kgpg/detailedconsole.cpp | 6 +-- kgpg/groupedit.ui | 2 +- kgpg/keyexport.ui | 4 +- kgpg/keygener.cpp | 10 ++--- kgpg/keyinfowidget.cpp | 10 ++--- kgpg/keyproperties.ui | 12 +++--- kgpg/keyserver.ui | 12 +++--- kgpg/keyservers.cpp | 12 +++--- kgpg/kgpg.cpp | 36 ++++++++--------- kgpg/kgpg.h | 2 +- kgpg/kgpgeditor.cpp | 14 +++---- kgpg/kgpginterface.cpp | 66 +++++++++++++++---------------- kgpg/kgpglibrary.cpp | 12 +++--- kgpg/kgpgoptions.cpp | 2 +- kgpg/kgpgrevokewidget.ui | 2 +- kgpg/kgpgview.cpp | 14 +++---- kgpg/kgpgwizard.ui | 30 +++++++------- kgpg/listkeys.cpp | 100 +++++++++++++++++++++++------------------------ kgpg/listkeys.h | 2 +- kgpg/popuppublic.cpp | 14 +++---- kgpg/sourceselect.ui | 4 +- 27 files changed, 200 insertions(+), 200 deletions(-) (limited to 'kgpg') diff --git a/kgpg/conf_decryption.ui b/kgpg/conf_decryption.ui index da86512..b604046 100644 --- a/kgpg/conf_decryption.ui +++ b/kgpg/conf_decryption.ui @@ -40,7 +40,7 @@ Expanding - + 21 155 diff --git a/kgpg/conf_encryption.ui b/kgpg/conf_encryption.ui index 7fa0563..ff807aa 100644 --- a/kgpg/conf_encryption.ui +++ b/kgpg/conf_encryption.ui @@ -42,7 +42,7 @@ kcfg_AsciiArmor - + 0 0 @@ -102,7 +102,7 @@ Expanding - + 20 72 @@ -111,7 +111,7 @@ - tqlayout3 + layout3 diff --git a/kgpg/conf_gpg.ui b/kgpg/conf_gpg.ui index 1109528..8a7f14a 100644 --- a/kgpg/conf_gpg.ui +++ b/kgpg/conf_gpg.ui @@ -103,7 +103,7 @@ Expanding - + 190 20 @@ -122,7 +122,7 @@ Expanding - + 21 54 @@ -166,7 +166,7 @@ - tqlayout1 + layout1 diff --git a/kgpg/conf_misc.ui b/kgpg/conf_misc.ui index 8c0a43e..3455386 100644 --- a/kgpg/conf_misc.ui +++ b/kgpg/conf_misc.ui @@ -53,7 +53,7 @@ kcfg_UseMouseSelection - + 0 0 @@ -71,7 +71,7 @@ kcfg_RemoteFileWarn - + 0 0 @@ -107,7 +107,7 @@ Expanding - + 91 20 @@ -132,7 +132,7 @@ It will shred (overwrite several times before erasing) the files you drop on it, making it almost impossible to recover the original file. - + WordBreak|AlignJustify|AlignTop @@ -143,7 +143,7 @@ the original file. textLabel5 - + AlignTop @@ -159,7 +159,7 @@ the original file. Expanding - + 20 71 @@ -220,7 +220,7 @@ the original file. Expanding - + 21 91 diff --git a/kgpg/conf_servers.ui b/kgpg/conf_servers.ui index a765cd9..f93b871 100644 --- a/kgpg/conf_servers.ui +++ b/kgpg/conf_servers.ui @@ -82,7 +82,7 @@ - tqlayout2 + layout2 diff --git a/kgpg/conf_ui2.ui b/kgpg/conf_ui2.ui index 74a4a0b..1344d26 100644 --- a/kgpg/conf_ui2.ui +++ b/kgpg/conf_ui2.ui @@ -129,7 +129,7 @@ Expanding - + 21 210 @@ -146,7 +146,7 @@ Expanding - + 140 20 diff --git a/kgpg/detailedconsole.cpp b/kgpg/detailedconsole.cpp index 6874813..4e00b45 100644 --- a/kgpg/detailedconsole.cpp +++ b/kgpg/detailedconsole.cpp @@ -16,10 +16,10 @@ ***************************************************************************/ -#include +#include #include #include -#include +#include #include #include @@ -42,7 +42,7 @@ KDetailedConsole::KDetailedConsole(TQWidget *parent, const char *name,const TQSt TQVGroupBox *detailsGroup = new TQVGroupBox( i18n("Details"), page); (void) new TQLabel(errormessage,detailsGroup); - //labdetails->setMinimumSize(labdetails->tqsizeHint()); + //labdetails->setMinimumSize(labdetails->sizeHint()); setDetailsWidget(detailsGroup); vbox->addWidget(lab1); diff --git a/kgpg/groupedit.ui b/kgpg/groupedit.ui index 438d2b9..fe6d178 100644 --- a/kgpg/groupedit.ui +++ b/kgpg/groupedit.ui @@ -127,7 +127,7 @@ Expanding - + 71 20 diff --git a/kgpg/keyexport.ui b/kgpg/keyexport.ui index 8389aa3..4daae5b 100644 --- a/kgpg/keyexport.ui +++ b/kgpg/keyexport.ui @@ -20,7 +20,7 @@ 0 - + 350 0 @@ -54,7 +54,7 @@ Expanding - + 20 16 diff --git a/kgpg/keygener.cpp b/kgpg/keygener.cpp index 70bbff7..3ae0587 100644 --- a/kgpg/keygener.cpp +++ b/kgpg/keygener.cpp @@ -19,7 +19,7 @@ #include -#include +#include #include #include #include @@ -64,7 +64,7 @@ keyGenerate::keyGenerate(TQWidget *parent, const char *name):KDialogBase( parent keyexp->insertItem(i18n("Weeks"),2); keyexp->insertItem(i18n("Months"),3); keyexp->insertItem(i18n("Years"),4); - keyexp->setMinimumSize(keyexp->tqsizeHint()); + keyexp->setMinimumSize(keyexp->sizeHint()); connect(keyexp,TQT_SIGNAL(activated(int)),this,TQT_SLOT(activateexp(int))); (void) new TQLabel(i18n("Key size:"),bgroup1); @@ -74,17 +74,17 @@ keyGenerate::keyGenerate(TQWidget *parent, const char *name):KDialogBase( parent keysize->insertItem("2048"); keysize->insertItem("4096"); keysize->setCurrentItem("1024"); - keysize->setMinimumSize(keysize->tqsizeHint()); + keysize->setMinimumSize(keysize->sizeHint()); (void) new TQLabel(i18n("Algorithm:"),bgroup1); keykind = new KComboBox(bgroup1); keykind->insertItem("DSA & ElGamal"); keykind->insertItem("RSA"); - keykind->setMinimumSize(keykind->tqsizeHint()); + keykind->setMinimumSize(keykind->sizeHint()); vbox->addWidget(bgroup1); page->show(); - page->resize(page->tqmaximumSize()); + page->resize(page->maximumSize()); setMainWidget(page); } diff --git a/kgpg/keyinfowidget.cpp b/kgpg/keyinfowidget.cpp index 93aa61f..aa05301 100644 --- a/kgpg/keyinfowidget.cpp +++ b/kgpg/keyinfowidget.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include @@ -85,7 +85,7 @@ KgpgKeyInfo::KgpgKeyInfo(TQWidget *parent, const char *name,TQString sigkey):KDi 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&))); - //prop->setMinimumSize(prop->tqsizeHint()); + //prop->setMinimumSize(prop->sizeHint()); } void KgpgKeyInfo::slotDisableKey(bool isOn) @@ -378,14 +378,14 @@ chdate->show(); void KgpgKeyInfo::slotCheckDate(TQDate date) { -chdate->enableButtonOK(date>=TQDate::tqcurrentDate ()); +chdate->enableButtonOK(date>=TQDate::currentDate ()); } void KgpgKeyInfo::slotChangeDate() { KgpgInterface *KeyExpirationProcess=new KgpgInterface(); if (kb->isChecked()) - KeyExpirationProcess->KgpgKeyExpire(displayedKeyID,TQDate::tqcurrentDate(),true); + KeyExpirationProcess->KgpgKeyExpire(displayedKeyID,TQDate::currentDate(),true); else KeyExpirationProcess->KgpgKeyExpire(displayedKeyID,kdt->date(),false); connect(KeyExpirationProcess,TQT_SIGNAL(expirationFinished(int)),this,TQT_SLOT(slotInfoExpirationChanged(int))); @@ -401,7 +401,7 @@ chdate->enableButtonOK(true); else { kdt->setEnabled(true); -chdate->enableButtonOK(kdt->date()>=TQDate::tqcurrentDate ()); +chdate->enableButtonOK(kdt->date()>=TQDate::currentDate ()); } } diff --git a/kgpg/keyproperties.ui b/kgpg/keyproperties.ui index 485c182..7dce70b 100644 --- a/kgpg/keyproperties.ui +++ b/kgpg/keyproperties.ui @@ -32,7 +32,7 @@ - tqlayout39 + layout39 @@ -50,13 +50,13 @@ 0 - + 120 140 - + 32767 140 @@ -81,7 +81,7 @@ false - + AlignCenter @@ -92,7 +92,7 @@ - tqlayout13 + layout13 @@ -117,7 +117,7 @@ - tqlayout4 + layout4 diff --git a/kgpg/keyserver.ui b/kgpg/keyserver.ui index 40c81ec..4087bde 100644 --- a/kgpg/keyserver.ui +++ b/kgpg/keyserver.ui @@ -107,7 +107,7 @@ Allows the user to select the Key Server which will be used to import PGP/GnuPG Expanding - + 20 16 @@ -124,7 +124,7 @@ Allows the user to select the Key Server which will be used to import PGP/GnuPG Expanding - + 20 20 @@ -141,7 +141,7 @@ Allows the user to select the Key Server which will be used to import PGP/GnuPG Expanding - + 160 20 @@ -214,7 +214,7 @@ Allows the user to select the Key Server which will be used to import PGP/GnuPG Expanding - + 250 20 @@ -262,7 +262,7 @@ Allows the user to select the Key Server which will be used to import PGP/GnuPG Expanding - + 20 40 @@ -279,7 +279,7 @@ Allows the user to select the Key Server which will be used to import PGP/GnuPG Expanding - + 20 30 diff --git a/kgpg/keyservers.cpp b/kgpg/keyservers.cpp index 5f77590..460134a 100644 --- a/kgpg/keyservers.cpp +++ b/kgpg/keyservers.cpp @@ -24,8 +24,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -88,7 +88,7 @@ keyServer::keyServer(TQWidget *parent, const char *name,bool modal,bool autoClos encid->start(KProcess::NotifyOnExit,true); page->Buttonimport->setEnabled( !page->kLEimportid->text().isEmpty()); page->Buttonsearch->setEnabled( !page->kLEimportid->text().isEmpty()); -setMinimumSize(tqsizeHint()); +setMinimumSize(sizeHint()); } @@ -201,7 +201,7 @@ void keyServer::slotSearch() searchproc->start(KProcess::NotifyOnExit,true); TQApplication::setOverrideCursor(TQCursor(TQt::BusyCursor)); dialogServer->setMainWidget(listpop); - listpop->setMinimumSize(listpop->tqsizeHint()); + listpop->setMinimumSize(listpop->sizeHint()); listpop->setMinimumWidth(550); dialogServer->exec(); } @@ -261,8 +261,8 @@ void keyServer::slotsearchresult(KProcess *) dialogServer->enableButtonOK(true); TQApplication::restoreOverrideCursor(); nb=nb.setNum(keyNumbers); - //listpop->kLVsearch->setColumnText(0,i18n("Found %1 matching keys").tqarg(nb)); - listpop->statusText->setText(i18n("Found %1 matching keys").tqarg(nb)); + //listpop->kLVsearch->setColumnText(0,i18n("Found %1 matching keys").arg(nb)); + listpop->statusText->setText(i18n("Found %1 matching keys").arg(nb)); if (listpop->kLVsearch->firstChild()!=NULL) { listpop->kLVsearch->setSelected(listpop->kLVsearch->firstChild(),true); diff --git a/kgpg/kgpg.cpp b/kgpg/kgpg.cpp index 1227498..87e1157 100644 --- a/kgpg/kgpg.cpp +++ b/kgpg/kgpg.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include #include @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include #include @@ -121,13 +121,13 @@ void MyView::clipEncrypt() void MyView::clipDecrypt() { - TQString clippie=kapp->tqclipboard()->text(clipboardMode).stripWhiteSpace(); + TQString clippie=kapp->clipboard()->text(clipboardMode).stripWhiteSpace(); droppedtext(clippie,false); } void MyView::clipSign(bool openEditor) { - TQString clippie=kapp->tqclipboard()->text(clipboardMode).stripWhiteSpace(); + 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))); @@ -147,7 +147,7 @@ void MyView::encryptDroppedFolder() compressionScheme=0; kgpgfoldertmp=new KTempFile(TQString()); kgpgfoldertmp->setAutoDelete(true); - if (KMessageBox::warningContinueCancel(0,i18n("KGpg will now create a temporary archive file:
%1 to process the encryption. The file will be deleted after the encryption is finished.").tqarg(kgpgfoldertmp->name()),i18n("Temporary File Creation"),KStdGuiItem::cont(),"FolderTmpFile")==KMessageBox::Cancel) + if (KMessageBox::warningContinueCancel(0,i18n("KGpg will now create a temporary archive file:
%1 to process the encryption. The file will be deleted after the encryption is finished.").arg(kgpgfoldertmp->name()),i18n("Temporary File Creation"),KStdGuiItem::cont(),"FolderTmpFile")==KMessageBox::Cancel) return; dialogue=new popupPublic(0,"Public keys",droppedUrls.first().fileName(),true,goDefaultKey); @@ -302,10 +302,10 @@ void MyView::shredDroppedFile() KDialogBase *shredConfirm=new KDialogBase( this, "confirm_shred", true,i18n("Shred Files"),KDialogBase::Ok | KDialogBase::Cancel); TQWidget *page = new TQWidget(shredConfirm); shredConfirm->setMainWidget(page); -TQBoxLayout *tqlayout=new TQBoxLayout(page,TQBoxLayout::TopToBottom,0); -tqlayout->setAutoAdd(true); +TQBoxLayout *layout=new TQBoxLayout(page,TQBoxLayout::TopToBottom,0); +layout->setAutoAdd(true); -(void) new KActiveLabel( i18n("Do you really want to shred these files?").tqarg(i18n( "

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

")),page); +(void) new KActiveLabel( i18n("Do you really want to shred these files?").arg(i18n( "

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

")),page); KListBox *lb=new KListBox(page); lb->insertStringList(droppedUrls.toStringList()); if (shredConfirm->exec()==TQDialog::Accepted) @@ -400,7 +400,7 @@ void MyView::decryptDroppedFile() kgpgFolderExtract=new KTempFile(TQString(),".tar.gz"); kgpgFolderExtract->setAutoDelete(true); swapname=KURL(kgpgFolderExtract->name()); - if (KMessageBox::warningContinueCancel(0,i18n("The file to decrypt is an archive. KGpg will create a temporary unencrypted archive file:
%1 before processing the archive extraction. This temporary file will be deleted after the decryption is finished.").tqarg(kgpgFolderExtract->name()),i18n("Temporary File Creation"),KStdGuiItem::cont(),"FolderTmpDecFile")==KMessageBox::Cancel) + if (KMessageBox::warningContinueCancel(0,i18n("The file to decrypt is an archive. KGpg will create a temporary unencrypted archive file:
%1 before processing the archive extraction. This temporary file will be deleted after the decryption is finished.").arg(kgpgFolderExtract->name()),i18n("Temporary File Creation"),KStdGuiItem::cont(),"FolderTmpDecFile")==KMessageBox::Cancel) return; } else*/ { swapname=KURL(droppedUrls.first().directory(0,0)+oldname); @@ -560,7 +560,7 @@ void MyView::dropEvent (TQDropEvent *o) droppedfile(list); else if ( TQTextDrag::decode(o, text) ) { - TQApplication::tqclipboard()->setText(text,clipboardMode); + TQApplication::clipboard()->setText(text,clipboardMode); droppedtext(text); } } @@ -569,7 +569,7 @@ void MyView::dropEvent (TQDropEvent *o) void MyView::readOptions() { clipboardMode=TQClipboard::Clipboard; - if ( KGpgSettings::useMouseSelection() && kapp->tqclipboard()->supportsSelection()) + if ( KGpgSettings::useMouseSelection() && kapp->clipboard()->supportsSelection()) clipboardMode=TQClipboard::Selection; if (KGpgSettings::firstRun()) { @@ -804,7 +804,7 @@ kgpgapplet::kgpgapplet(TQWidget *parent, const char *name) void kgpgapplet::checkMenu() { KgpgDecryptClipboard->setEnabled(false); - if ((kapp->tqclipboard()->text(w->clipboardMode).isEmpty())) + if ((kapp->clipboard()->text(w->clipboardMode).isEmpty())) { KgpgEncryptClipboard->setEnabled(false); KgpgSignClipboard->setEnabled(false); @@ -812,7 +812,7 @@ void kgpgapplet::checkMenu() else { KgpgEncryptClipboard->setEnabled(true); - if (kapp->tqclipboard()->text(w->clipboardMode).stripWhiteSpace().startsWith("-----BEGIN")) + if (kapp->clipboard()->text(w->clipboardMode).stripWhiteSpace().startsWith("-----BEGIN")) KgpgDecryptClipboard->setEnabled(true); KgpgSignClipboard->setEnabled(true); } @@ -926,7 +926,7 @@ int KgpgAppletApp::newInstance() if ((KgpgInterface::getGpgBoolSetting("use-agent",gpgPath)) && (!getenv("GPG_AGENT_INFO"))) KMessageBox::sorry(0,i18n("The use of GnuPG Agent is enabled in GnuPG's configuration file (%1).
" "However, the agent does not seem to be running. This could result in problems with signing/decryption.
" - "Please disable GnuPG Agent from KGpg settings, or fix the agent.").tqarg(gpgPath)); + "Please disable GnuPG Agent from KGpg settings, or fix the agent.").arg(gpgPath)); } } @@ -1008,7 +1008,7 @@ int KgpgAppletApp::newInstance() void MyView::encryptClipboard(TQStringList selec,TQStringList encryptOptions,bool,bool symmetric) { - if (kapp->tqclipboard()->text(clipboardMode).isEmpty()) { + if (kapp->clipboard()->text(clipboardMode).isEmpty()) { KPassivePopup::message(i18n("Clipboard is empty."),TQString(),KGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop),this); return; } @@ -1020,12 +1020,12 @@ void MyView::encryptClipboard(TQStringList selec,TQStringList encryptOptions,boo 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())); - txtEncrypt->KgpgEncryptText(kapp->tqclipboard()->text(clipboardMode),selec,encryptOptions); + txtEncrypt->KgpgEncryptText(kapp->clipboard()->text(clipboardMode),selec,encryptOptions); } void MyView::slotPassiveClip() { -TQString newtxt=kapp->tqclipboard()->text(clipboardMode); +TQString newtxt=kapp->clipboard()->text(clipboardMode); if (newtxt.length()>300) newtxt=TQString(newtxt.left(250).stripWhiteSpace())+"...\n"+TQString(newtxt.right(40).stripWhiteSpace()); @@ -1045,7 +1045,7 @@ pop = new KPassivePopup( this); void MyView::slotSetClip(TQString newtxt) { if (newtxt.isEmpty()) return; - TQApplication::tqclipboard()->setText(newtxt,clipboardMode);//,TQClipboard::Clipboard); QT 3.1 only + TQApplication::clipboard()->setText(newtxt,clipboardMode);//,TQClipboard::Clipboard); QT 3.1 only } diff --git a/kgpg/kgpg.h b/kgpg/kgpg.h index 5fa6089..ba4e958 100644 --- a/kgpg/kgpg.h +++ b/kgpg/kgpg.h @@ -30,7 +30,7 @@ #include #include -#include +#include class TQPopupMenu; diff --git a/kgpg/kgpgeditor.cpp b/kgpg/kgpgeditor.cpp index c36be3d..e0321e4 100644 --- a/kgpg/kgpgeditor.cpp +++ b/kgpg/kgpgeditor.cpp @@ -27,8 +27,8 @@ #include #include -#include -#include +#include +#include #include #include #include @@ -250,8 +250,8 @@ void KgpgApp::slotFilePreDec() page->newFilename->setCaption(i18n("Save File")); page->checkClipboard->setText(i18n("Editor")); - page->resize(page->tqminimumSize()); - popn->resize(popn->tqminimumSize()); + page->resize(page->minimumSize()); + popn->resize(popn->minimumSize()); if (popn->exec()==TQDialog::Accepted) { if (page->checkFile->isChecked()) newname=page->newFilename->url(); @@ -314,7 +314,7 @@ void KgpgApp::slotFileSave() TQTextCodec*cod=TQTextCodec::codecForName (textEncoding.ascii()); // slotStatusMsg(i18n("Saving file...")); if (!checkEncoding(cod)) { - KMessageBox::sorry(this,i18n("The document could not been saved, as the selected encoding cannot encode every tqunicode character in it.")); + KMessageBox::sorry(this,i18n("The document could not been saved, as the selected encoding cannot encode every unicode character in it.")); return; } @@ -376,7 +376,7 @@ void KgpgApp::slotFileSaveAs() TQString filn=url.path(); TQFile f(filn); if (f.exists()) { - TQString message=i18n("Overwrite existing file %1?").tqarg(url.fileName()); + TQString message=i18n("Overwrite existing file %1?").arg(url.fileName()); int result=KMessageBox::warningContinueCancel(this,TQString(message),i18n("Warning"),i18n("Overwrite")); if (result==KMessageBox::Cancel) return; @@ -385,7 +385,7 @@ void KgpgApp::slotFileSaveAs() } else if (KIO::NetAccess::exists(url,false,this)) { - TQString message=i18n("Overwrite existing file %1?").tqarg(url.fileName()); + TQString message=i18n("Overwrite existing file %1?").arg(url.fileName()); int result=KMessageBox::warningContinueCancel(this,TQString(message),i18n("Warning"),i18n("Overwrite")); if (result==KMessageBox::Cancel) return; diff --git a/kgpg/kgpginterface.cpp b/kgpg/kgpginterface.cpp index b45240d..0a54db1 100644 --- a/kgpg/kgpginterface.cpp +++ b/kgpg/kgpginterface.cpp @@ -18,8 +18,8 @@ #include #include -#include -#include +#include +#include #include #include #include @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include @@ -219,9 +219,9 @@ void KgpgInterface::readdecprocess(KProcIO *p) if (anonymous) passdlgmessage=i18n("No user id found. Trying all secret keys.
"); if ((step<3) && (!anonymous)) - passdlgmessage=i18n("Bad passphrase. You have %1 tries left.
").tqarg(step); + passdlgmessage=i18n("Bad passphrase. You have %1 tries left.
").arg(step); - passdlgmessage+=i18n("Enter passphrase for %1").tqarg(userIDs); + passdlgmessage+=i18n("Enter passphrase for %1").arg(userIDs); int code=KPasswordDialog::getPassword(passphrase,passdlgmessage); if (code!=TQDialog::Accepted) { p->deleteLater(); @@ -395,8 +395,8 @@ void KgpgInterface::getCmdOutput(KProcess *p, char *data, int ) if (anonymous) passdlgmessage=i18n("No user id found. Trying all secret keys.
"); if ((step<3) && (!anonymous)) - passdlgmessage=i18n("Bad passphrase. You have %1 tries left.
").tqarg(step); - passdlgmessage+=i18n("Enter passphrase for %1").tqarg(userIDs); + passdlgmessage=i18n("Bad passphrase. You have %1 tries left.
").arg(step); + passdlgmessage+=i18n("Enter passphrase for %1").arg(userIDs); int code=KPasswordDialog::getPassword(passphrase,passdlgmessage); if (code!=TQDialog::Accepted) { @@ -501,8 +501,8 @@ void KgpgInterface::txtsignprocess(KProcIO *p) TQCString passphrase; TQString passdlgmessage; if (step<3) - passdlgmessage=i18n("Bad passphrase. You have %1 tries left.
").tqarg(step); - passdlgmessage+=i18n("Enter passphrase for %1").tqarg(userIDs); + passdlgmessage=i18n("Bad passphrase. You have %1 tries left.
").arg(step); + passdlgmessage+=i18n("Enter passphrase for %1").arg(userIDs); int code=KPasswordDialog::getPassword(passphrase,passdlgmessage); if (code!=TQDialog::Accepted) { @@ -588,11 +588,11 @@ TQString required; { TQString userName=required.section(" ",2,-1).replace(TQRegExp("<"),"<"); userName=checkForUtf8(userName); - signID=i18n("Good signature from:
%1
Key ID: %2").tqarg(userName).tqarg("0x"+required.section(" ",1,1).right(8)); + signID=i18n("Good signature from:
%1
Key ID: %2").arg(userName).arg("0x"+required.section(" ",1,1).right(8)); } if (required.startsWith("BADSIG")) { - signID=i18n("Bad signature from:
%1
Key ID: %2

Text is corrupted.").tqarg(required.section(" ",2,-1).replace(TQRegExp("<"),"<")).tqarg("0x"+required.section(" ",1,1).right(8)); + signID=i18n("Bad signature from:
%1
Key ID: %2

Text is corrupted.").arg(required.section(" ",2,-1).replace(TQRegExp("<"),"<")).arg("0x"+required.section(" ",1,1).right(8)); } if (required.startsWith("NO_PUBKEY")) { @@ -628,7 +628,7 @@ Md5Widget::Md5Widget(TQWidget *parent, const char *name,KURL url):KDialogBase( p TQGridLayout *MyDialogLayout = new TQGridLayout( page, 1, 1, 5, 6, "MyDialogLayout"); TQLabel *TextLabel1 = new TQLabel( page, "TextLabel1" ); - TextLabel1->setText(i18n("MD5 sum for %1 is:").tqarg(url.fileName())); + TextLabel1->setText(i18n("MD5 sum for %1 is:").arg(url.fileName())); MyDialogLayout->addWidget( TextLabel1, 0, 0 ); KLineEdit *KRestrictedLine1 = new KLineEdit(mdSum,page); @@ -641,7 +641,7 @@ Md5Widget::Md5Widget(TQWidget *parent, const char *name,KURL url):KDialogBase( p KLed1=new KLed(TQColor(80,80,80),KLed::Off,KLed::Sunken,KLed::Circular,page,"KLed1"); KLed1->off(); - KLed1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, KLed1->sizePolicy().hasHeightForWidth() ) ); + KLed1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, KLed1->sizePolicy().hasHeightForWidth() ) ); Layout4->addWidget( KLed1 ); TextLabel1_2 = new TQLabel( page, "TextLabel1_2" ); @@ -653,7 +653,7 @@ Md5Widget::Md5Widget(TQWidget *parent, const char *name,KURL url):KDialogBase( p MyDialogLayout->addItem( spacer, 3, 0 ); page->show(); - page->resize(page->tqminimumSize()); + page->resize(page->minimumSize()); setMainWidget(page); @@ -664,7 +664,7 @@ Md5Widget::~Md5Widget() void Md5Widget::slotApply() { - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); TQString text; // Copy text from the clipboard (paste) text = cb->text(TQClipboard::Clipboard); @@ -715,7 +715,7 @@ void KgpgInterface::KgpgSignFile(TQString keyID,KURL srcUrl,TQStringList Options void KgpgInterface::signfin(KProcess *) { if (message.find("SIG_CREATED")!=-1) - KMessageBox::information(0,i18n("The signature file %1 was successfully created.").tqarg(file.fileName())); + KMessageBox::information(0,i18n("The signature file %1 was successfully created.").arg(file.fileName())); else if (message.find("BAD_PASSPHRASE")!=-1) KMessageBox::sorry(0,i18n("Bad passphrase, signature was not created.")); else @@ -740,8 +740,8 @@ void KgpgInterface::readsignprocess(KProcIO *p) TQCString passphrase; TQString passdlgmessage; if (step<3) - passdlgmessage=i18n("Bad passphrase. you have %1 tries left.
").tqarg(step); - passdlgmessage+=i18n("Enter passphrase for %1").tqarg(userIDs); + passdlgmessage=i18n("Bad passphrase. you have %1 tries left.
").arg(step); + passdlgmessage+=i18n("Enter passphrase for %1").arg(userIDs); int code=KPasswordDialog::getPassword(passphrase,passdlgmessage); if (code!=TQDialog::Accepted) { p->deleteLater(); @@ -799,12 +799,12 @@ TQString required; signID=i18n("No signature found."); if (required.startsWith("GOODSIG")) { - signID=i18n("Good signature from:
%1
Key ID: %2").tqarg(required.section(" ",2,-1).replace(TQRegExp("<"),"<")).tqarg("0x"+required.section(" ",1,1).right(8)); + signID=i18n("Good signature from:
%1
Key ID: %2").arg(required.section(" ",2,-1).replace(TQRegExp("<"),"<")).arg("0x"+required.section(" ",1,1).right(8)); } if (required.startsWith("BADSIG")) { signID=i18n("BAD signature from:
%1
Key id: %2

" - "The file is corrupted!").tqarg(required.section(" ",2,-1).replace(TQRegExp("<"),"<")).tqarg("0x"+required.section(" ",1,1).right(8)); + "The file is corrupted!").arg(required.section(" ",2,-1).replace(TQRegExp("<"),"<")).arg("0x"+required.section(" ",1,1).right(8)); } if (required.startsWith("NO_PUBKEY")) { @@ -827,7 +827,7 @@ void KgpgInterface::verifyfin(KProcess *) } else { if (KMessageBox::questionYesNo(0,i18n("Missing signature:
Key id: %1

" - "Do you want to import this key from a keyserver?").tqarg(signID),file.fileName(),TQString(), i18n("Import"), i18n("Do Not Import"))==KMessageBox::Yes) + "Do you want to import this key from a keyserver?").arg(signID),file.fileName(),TQString(), i18n("Import"), i18n("Do Not Import"))==KMessageBox::Yes) emit verifyquerykey(signID); } emit verifyfinished(); @@ -908,7 +908,7 @@ void KgpgInterface::sigprocess(KProcIO *p) if (required.find("passphrase.enter")!=-1) { TQCString signpass; int code=KPasswordDialog::getPassword(signpass,i18n("%1 Enter passphrase for %2:") - .tqarg(errMessage).tqarg(userIDs)); + .arg(errMessage).arg(userIDs)); if (code!=TQDialog::Accepted) { signSuccess=4; ///// aborted by user mode required=TQString(); @@ -947,7 +947,7 @@ void KgpgInterface::signover(KProcess *) emit signatureFinished(signSuccess); //// signature successful or bad passphrase else { KDetailedConsole *q=new KDetailedConsole(0,"sign_error",i18n("Signing key %1 with key %2 failed.
" - "Do you want to try signing the key in console mode?").tqarg(konsKeyID).tqarg(konsSignKey),output); + "Do you want to try signing the key in console mode?").arg(konsKeyID).arg(konsSignKey),output); if (q->exec()==TQDialog::Accepted) openSignConsole(); else @@ -1079,7 +1079,7 @@ void KgpgInterface::KgpgKeyExpire(TQString keyID,TQDate date,bool unlimited) if (unlimited) expirationDelay=0; else - expirationDelay=TQDate::tqcurrentDate().daysTo(date); + expirationDelay=TQDate::currentDate().daysTo(date); output=TQString(); KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); *conprocess<<"gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--command-fd=0"<<"--status-fd=2"<<"--utf8-strings"; @@ -1112,7 +1112,7 @@ void KgpgInterface::expprocess(KProcIO *p) if (required.find("passphrase.enter")!=-1) { TQCString signpass; - int code=KPasswordDialog::getPassword(signpass,i18n("Enter passphrase for %1:").tqarg(userIDs)); + int code=KPasswordDialog::getPassword(signpass,i18n("Enter passphrase for %1:").arg(userIDs)); if (code!=TQDialog::Accepted) { expSuccess=3; ///// aborted by user mode p->writeStdin(TQString("quit")); @@ -1276,7 +1276,7 @@ void KgpgInterface::passprocess(KProcIO *p) if (step==1) { TQCString passphrase; int code=KPasswordDialog::getPassword(passphrase,i18n("%1 Enter passphrase for %2") - .tqarg(message).tqarg(userIDs)); + .arg(message).arg(userIDs)); if (code!=TQDialog::Accepted) { p->writeStdin(TQString("quit")); // p->closeWhenDone(); @@ -1290,7 +1290,7 @@ void KgpgInterface::passprocess(KProcIO *p) if (step==3) { TQCString passphrase; - int code=KPasswordDialog::getNewPassword(passphrase,i18n("Enter new passphrase for %1
If you forget this passphrase, all your encrypted files and messages will be lost !
").tqarg(userIDs)); + int code=KPasswordDialog::getNewPassword(passphrase,i18n("Enter new passphrase for %1
If you forget this passphrase, all your encrypted files and messages will be lost !
").arg(userIDs)); if (code!=TQDialog::Accepted) { step=4; p->writeStdin(TQString("quit")); @@ -1517,7 +1517,7 @@ void KgpgInterface::adduidprocess(KProcIO *p) if (required.find("passphrase.enter")!=-1) { TQCString delpass; int code=KPasswordDialog::getPassword(delpass,i18n("Enter passphrase for %1:") - .tqarg(userIDs)); + .arg(userIDs)); if (code!=TQDialog::Accepted) { //addSuccess=false; p->writeStdin(TQString("quit")); @@ -1639,7 +1639,7 @@ void KgpgInterface::delphotoprocess(KProcIO *p) if (required.find("passphrase.enter")!=-1) { TQCString delpass; - int code=KPasswordDialog::getPassword(delpass,i18n("Enter passphrase for %1:").tqarg(userIDs)); + int code=KPasswordDialog::getPassword(delpass,i18n("Enter passphrase for %1:").arg(userIDs)); if (code!=TQDialog::Accepted) { //deleteSuccess=false; p->writeStdin(TQString("quit")); @@ -1714,7 +1714,7 @@ void KgpgInterface::addphotoprocess(KProcIO *p) if (required.find("passphrase.enter")!=-1) { TQCString delpass; - int code=KPasswordDialog::getPassword(delpass,i18n("Enter passphrase for %1:").tqarg(userIDs)); + int code=KPasswordDialog::getPassword(delpass,i18n("Enter passphrase for %1:").arg(userIDs)); if (code!=TQDialog::Accepted) { //deleteSuccess=false; p->writeStdin(TQString("quit")); @@ -1800,7 +1800,7 @@ void KgpgInterface::revokeprocess(KProcIO *p) if (required.find("passphrase.enter")!=-1) { TQCString signpass; - int code=KPasswordDialog::getPassword(signpass,i18n("Enter passphrase for %1:").tqarg(userIDs)); + int code=KPasswordDialog::getPassword(signpass,i18n("Enter passphrase for %1:").arg(userIDs)); if (code!=TQDialog::Accepted) { expSuccess=3; ///// aborted by user mode p->writeStdin(TQString("quit")); @@ -1928,7 +1928,7 @@ void KgpgInterface::setGpgGroupSetting(TQString name,TQStringList values, TQStri if (result2.startsWith(name) && (result2.remove(0,name.length()).stripWhiteSpace().startsWith("="))) { // kdDebug(2100)<<"Found group: "<1) - emit systemMessage(i18n("%1 Files left.\nEncrypting %2").tqarg(filesToEncode).tqarg(urlselecteds.first().path())); - else emit systemMessage(i18n("Encrypting %2").tqarg(urlselecteds.first().path())); + emit systemMessage(i18n("%1 Files left.\nEncrypting %2").arg(filesToEncode).arg(urlselecteds.first().path())); + else emit systemMessage(i18n("Encrypting %2").arg(urlselecteds.first().path())); KgpgInterface *cryptFileProcess=new KgpgInterface(); pop = new KPassivePopup(panel); cryptFileProcess->KgpgEncryptFile(selec,urlselected,dest,encryptOptions,symetric); @@ -122,7 +122,7 @@ void KgpgLibrary::processpopup2(TQString fileName) { //pop->setTimeout(0); - pop->setView(i18n("Processing encryption (%1)").tqarg(fileName),i18n("Please wait..."),KGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop)); + pop->setView(i18n("Processing encryption (%1)").arg(fileName),i18n("Please wait..."),KGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop)); pop->show(); /*TQRect qRect(TQApplication::desktop()->screenGeometry()); int iXpos=qRect.width()/2-pop->width()/2; @@ -192,7 +192,7 @@ void KgpgLibrary::slotFileDec(KURL srcUrl,KURL destUrl,TQStringList customDecryp void KgpgLibrary::processpopup(TQString fileName) { - emit systemMessage(i18n("Decrypting %1").tqarg(fileName)); + emit systemMessage(i18n("Decrypting %1").arg(fileName)); pop->setTimeout(0); pop->setView(i18n("Processing decryption"),i18n("Please wait..."),KGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop)); pop->show(); @@ -222,7 +222,7 @@ void KgpgLibrary::processdecerror(TQString mssge) qfile.close(); ////////////// if pgp data found, decode it if (result.startsWith("-----BEGIN PGP PUBLIC KEY BLOCK")) {////// dropped file is a public key, ask for import - int result=KMessageBox::warningContinueCancel(0,i18n("

The file %1 is a public key.
Do you want to import it ?

").tqarg(urlselected.path()),i18n("Warning")); + int result=KMessageBox::warningContinueCancel(0,i18n("

The file %1 is a public key.
Do you want to import it ?

").arg(urlselected.path()),i18n("Warning")); if (result==KMessageBox::Cancel) return; else { @@ -233,7 +233,7 @@ void KgpgLibrary::processdecerror(TQString mssge) } } else if (result.startsWith("-----BEGIN PGP PRIVATE KEY BLOCK")) {////// dropped file is a public key, ask for import qfile.close(); - KMessageBox::information(0,i18n("

The file %1 is a private key block. Please use KGpg key manager to import it.

").tqarg(urlselected.path())); + KMessageBox::information(0,i18n("

The file %1 is a private key block. Please use KGpg key manager to import it.

").arg(urlselected.path())); return; } } diff --git a/kgpg/kgpgoptions.cpp b/kgpg/kgpgoptions.cpp index 211fb77..76b9eaf 100644 --- a/kgpg/kgpgoptions.cpp +++ b/kgpg/kgpgoptions.cpp @@ -18,7 +18,7 @@ /////////////////////////////////////////////// code for the option dialog box #include -#include +#include #include #include #include diff --git a/kgpg/kgpgrevokewidget.ui b/kgpg/kgpgrevokewidget.ui index 2405494..e4f30ff 100644 --- a/kgpg/kgpgrevokewidget.ui +++ b/kgpg/kgpgrevokewidget.ui @@ -26,7 +26,7 @@ key id - + AlignVCenter diff --git a/kgpg/kgpgview.cpp b/kgpg/kgpgview.cpp index f85563c..06ea2aa 100644 --- a/kgpg/kgpgview.cpp +++ b/kgpg/kgpgview.cpp @@ -32,12 +32,12 @@ #include #include -#include +#include #include #include #include #include -#include +#include #include "kgpgsettings.h" @@ -127,7 +127,7 @@ TQFile qfile(fileToCheck); } else if (result.startsWith("-----BEGIN PGP PUBLIC KEY BLOCK")) {////// dropped file is a public key, ask for import qfile.close(); - int result=KMessageBox::warningContinueCancel(this,i18n("

The file %1 is a public key.
Do you want to import it ?

").tqarg(fileToCheck),i18n("Warning")); + int result=KMessageBox::warningContinueCancel(this,i18n("

The file %1 is a public key.
Do you want to import it ?

").arg(fileToCheck),i18n("Warning")); if (result==KMessageBox::Cancel) { KIO::NetAccess::removeTempFile(fileToCheck); return true; @@ -195,7 +195,7 @@ KgpgView::KgpgView(TQWidget *parent, const char *name) : TQWidget(parent, name) editor=new MyEditor(this); windowAutoClose=true; - ///// tqlayout + ///// layout TQVBoxLayout *vbox=new TQVBoxLayout(this,3); @@ -214,8 +214,8 @@ KgpgView::KgpgView(TQWidget *parent, const char *name) : TQWidget(parent, name) TQObject::connect(editor,TQT_SIGNAL(textChanged()),TQT_TQOBJECT(this),TQT_SLOT(modified())); - boutonbox->tqlayout(); - editor->resize(editor->tqmaximumSize()); + boutonbox->layout(); + editor->resize(editor->maximumSize()); vbox->addWidget(editor); vbox->addWidget(boutonbox); } @@ -239,7 +239,7 @@ void KgpgView::modified() void KgpgView::slotAskForImport(TQString ID) { if (KMessageBox::questionYesNo(0,i18n("Missing signature:
Key id: %1

" - "Do you want to import this key from a keyserver?").tqarg(ID),i18n("Missing Key"), TQString(), i18n("Import"), i18n("Do Not Import"))==KMessageBox::Yes) { + "Do you want to import this key from a keyserver?").arg(ID),i18n("Missing Key"), TQString(), i18n("Import"), i18n("Do Not Import"))==KMessageBox::Yes) { keyServer *kser=new keyServer(0,"server_dialog",false,true); kser->page->kLEimportid->setText(ID); kser->slotImport(); diff --git a/kgpg/kgpgwizard.ui b/kgpg/kgpgwizard.ui index b826975..c607b30 100644 --- a/kgpg/kgpgwizard.ui +++ b/kgpg/kgpgwizard.ui @@ -50,7 +50,7 @@ false - + AlignTop @@ -62,7 +62,7 @@ <h1>Welcome to the KGpg Wizard</h1> This wizard will first setup some basic configuration options required for KGpg to work properly. Next, it will allow you to create your own key pair, enabling you to encrypt your files and emails. - + WordBreak|AlignTop @@ -76,7 +76,7 @@ This wizard will first setup some basic configuration options required for KGpg Expanding - + 20 41 @@ -111,7 +111,7 @@ This wizard will first setup some basic configuration options required for KGpg Unless you want to try some unusual settings, just click on the "next" button. - + WordBreak|AlignTop @@ -122,7 +122,7 @@ This wizard will first setup some basic configuration options required for KGpg KGpg needs to know where your GnuPG configuration file is stored. - + WordBreak|AlignTop @@ -136,7 +136,7 @@ This wizard will first setup some basic configuration options required for KGpg Expanding - + 20 60 @@ -155,7 +155,7 @@ This wizard will first setup some basic configuration options required for KGpg <br>Path to your GnuPG options file: - + WordBreak|AlignVCenter @@ -183,7 +183,7 @@ This wizard will first setup some basic configuration options required for KGpg false - + AlignTop @@ -235,7 +235,7 @@ This wizard will first setup some basic configuration options required for KGpg false - + AlignTop @@ -249,7 +249,7 @@ This wizard will first setup some basic configuration options required for KGpg Expanding - + 20 16 @@ -266,7 +266,7 @@ The shredder securely deletes files (overwriting them 35 times) dropped on to it Remember that if you download a file or open one in an editor, parts of the file may be saved in a temporary location. Shredding will not erase these temporary files. <br><b>Shredding may not be 100% secure if you use a journaling file system.</b></qt> - + WordBreak|AlignJustify|AlignTop @@ -304,7 +304,7 @@ Remember that if you download a file or open one in an editor, parts of the file Expanding - + 20 30 @@ -313,7 +313,7 @@ Remember that if you download a file or open one in an editor, parts of the file - tqlayout2 + layout2 @@ -349,7 +349,7 @@ Remember that if you download a file or open one in an editor, parts of the file KGpg will now launch the key generation dialog to create your own key pair for encryption and decryption. - + WordBreak|AlignTop @@ -377,7 +377,7 @@ Remember that if you download a file or open one in an editor, parts of the file false - + AlignTop diff --git a/kgpg/listkeys.cpp b/kgpg/listkeys.cpp index 5f01af7..5c0a5c4 100644 --- a/kgpg/listkeys.cpp +++ b/kgpg/listkeys.cpp @@ -23,14 +23,14 @@ #include #include -#include +#include #include #include #include #include -#include +#include #include -#include +#include #include #include #include @@ -137,7 +137,7 @@ UpdateViewItem::UpdateViewItem(TQListViewItem *parent, TQString name,TQString em } -void UpdateViewItem::paintCell(TQPainter *p, const TQColorGroup &cg,int column, int width, int tqalignment) +void UpdateViewItem::paintCell(TQPainter *p, const TQColorGroup &cg,int column, int width, int alignment) { TQColorGroup _cg( cg ); if (depth()==0) @@ -157,7 +157,7 @@ void UpdateViewItem::paintCell(TQPainter *p, const TQColorGroup &cg,int column, } - KListViewItem::paintCell(p,_cg, column, width, tqalignment); + KListViewItem::paintCell(p,_cg, column, width, alignment); } #include @@ -257,7 +257,7 @@ KDialogBase( parent, name, true,i18n("Private Key List"),Ok | Cancel) val=i18n("Unlimited"); fullname=keyString[9]; - fp2 = popen(TQFile::encodeName(TQString("gpg --no-tty --with-colons --list-key %1").tqarg(KShellProcess::quote(id))), "r"); + fp2 = popen(TQFile::encodeName(TQString("gpg --no-tty --with-colons --list-key %1").arg(KShellProcess::quote(id))), "r"); bool dead=true; while ( fgets( line, sizeof(line), fp2)) { tst2=TQString::fromUtf8(line); @@ -297,7 +297,7 @@ KDialogBase( parent, name, true,i18n("Private Key List"),Ok | Cancel) item=new KListViewItem(keysListpr,keyName,keyMail,id); - //KListViewItem *sub= new KListViewItem(item,i18n("ID: %1, trust: %2, expiration: %3").tqarg(id).tqarg(trust).tqarg(val)); + //KListViewItem *sub= new KListViewItem(item,i18n("ID: %1, trust: %2, expiration: %3").arg(id).arg(trust).arg(val)); KListViewItem *sub= new KListViewItem(item,i18n("Expiration:"),val); sub->setSelectable(false); item->setPixmap(0,keyPair); @@ -434,7 +434,7 @@ KeyView::KeyView( TQWidget *parent, const char *name ) void KeyView::droppedfile (KURL url) { - if (KMessageBox::questionYesNo(this,i18n("

Do you want to import file %1 into your key ring?

").tqarg(url.path()), TQString(), i18n("Import"), i18n("Do Not Import"))!=KMessageBox::Yes) + if (KMessageBox::questionYesNo(this,i18n("

Do you want to import file %1 into your key ring?

").arg(url.path()), TQString(), i18n("Import"), i18n("Do Not Import"))!=KMessageBox::Yes) return; KgpgInterface *importKeyProcess=new KgpgInterface(); @@ -923,7 +923,7 @@ void listKeys::slotAddUid() addUidWidget->enableButtonOK(false); AddUid *keyUid=new AddUid(); addUidWidget->setMainWidget(keyUid); - //keyUid->setMinimumSize(keyUid->tqsizeHint()); + //keyUid->setMinimumSize(keyUid->sizeHint()); keyUid->setMinimumWidth(300); connect(keyUid->kLineEdit1,TQT_SIGNAL(textChanged ( const TQString & )),TQT_TQOBJECT(this),TQT_SLOT(slotAddUidEnable(const TQString & ))); if (addUidWidget->exec()!=TQDialog::Accepted) @@ -966,7 +966,7 @@ void listKeys::slotGpgError(TQString errortxt) void listKeys::slotDeletePhoto() { - if (KMessageBox::warningContinueCancel(this,i18n("Are you sure you want to delete Photo id %1
from key %2 <%3> ?").tqarg(keysList2->currentItem()->text(6)).tqarg(keysList2->currentItem()->parent()->text(0)).tqarg(keysList2->currentItem()->parent()->text(1)),i18n("Warning"),KGuiItem(i18n("Delete"),"editdelete"))!=KMessageBox::Continue) + if (KMessageBox::warningContinueCancel(this,i18n("Are you sure you want to delete Photo id %1
from key %2 <%3> ?").arg(keysList2->currentItem()->text(6)).arg(keysList2->currentItem()->parent()->text(0)).arg(keysList2->currentItem()->parent()->text(1)),i18n("Warning"),KGuiItem(i18n("Delete"),"editdelete"))!=KMessageBox::Continue) return; KgpgInterface *delPhotoProcess=new KgpgInterface(); @@ -1070,7 +1070,7 @@ void listKeys::findFirstKey() keysList2->setSelected(item,true); keysList2->ensureItemVisible(item); } else - KMessageBox::sorry(this,i18n("Search string '%1' not found.").tqarg(searchString)); + KMessageBox::sorry(this,i18n("Search string '%1' not found.").arg(searchString)); } void listKeys::findNextKey() @@ -1275,7 +1275,7 @@ void listKeys::readOptions() KGpgSettings::setGroups(groups.join(",")); keysList2->groupNb=groups.count(); if (keyStatusBar) - changeMessage(i18n("%1 Keys, %2 Groups").tqarg(keysList2->childCount()-keysList2->groupNb).tqarg(keysList2->groupNb),1); + changeMessage(i18n("%1 Keys, %2 Groups").arg(keysList2->childCount()-keysList2->groupNb).arg(keysList2->groupNb),1); showTipOfDay= KGpgSettings::showTipOfDay(); } @@ -1415,7 +1415,7 @@ void listKeys::revokeWidget() keyRevoke->kURLRequester1->setURL(TQDir::homeDirPath()+"/"+keysList2->currentItem()->text(1).section('@',0,0)+".revoke"); keyRevoke->kURLRequester1->setMode(KFile::File); - keyRevoke->setMinimumSize(keyRevoke->tqsizeHint()); + keyRevoke->setMinimumSize(keyRevoke->sizeHint()); keyRevoke->show(); keyRevokeWidget->setMainWidget(keyRevoke); @@ -1478,7 +1478,7 @@ void listKeys::slotexportsec() p->start(KProcess::Block); if (fgpg.exists()) - KMessageBox::information(this,i18n("Your PRIVATE key \"%1\" was successfully exported.\nDO NOT leave it in an insecure place.").tqarg(url.path())); + KMessageBox::information(this,i18n("Your PRIVATE key \"%1\" was successfully exported.\nDO NOT leave it in an insecure place.").arg(url.path())); else KMessageBox::sorry(this,i18n("Your secret key could not be exported.\nCheck the key.")); } @@ -1553,7 +1553,7 @@ void listKeys::slotexport() p->start(KProcess::Block); if (fgpg.exists()) - KMessageBox::information(this,i18n("Your public key \"%1\" was successfully exported\n").tqarg(expname)); + KMessageBox::information(this,i18n("Your public key \"%1\" was successfully exported\n").arg(expname)); else KMessageBox::sorry(this,i18n("Your public key could not be exported\nCheck the key.")); } @@ -1593,7 +1593,7 @@ void listKeys::slotProcessExportMail(TQString keys) void listKeys::slotProcessExportClip(TQString keys) { - kapp->tqclipboard()->setText(keys,clipboardMode); + kapp->clipboard()->setText(keys,clipboardMode); } @@ -1667,7 +1667,7 @@ void listKeys::deleteGroup() if (!keysList2->currentItem() || !keysList2->currentItem()->text(6).isEmpty()) return; - int result=KMessageBox::warningContinueCancel(this,i18n("Are you sure you want to delete group %1 ?").tqarg(keysList2->currentItem()->text(0)),i18n("Warning"),KGuiItem(i18n("Delete"),"editdelete")); + int result=KMessageBox::warningContinueCancel(this,i18n("Are you sure you want to delete group %1 ?").arg(keysList2->currentItem()->text(0)),i18n("Warning"),KGuiItem(i18n("Delete"),"editdelete")); if (result!=KMessageBox::Continue) return; KgpgInterface::delGpgGroup(keysList2->currentItem()->text(0), KGpgSettings::gpgConfigPath()); @@ -1681,7 +1681,7 @@ void listKeys::deleteGroup() TQStringList groups=KgpgInterface::getGpgGroupNames(KGpgSettings::gpgConfigPath()); KGpgSettings::setGroups(groups.join(",")); keysList2->groupNb=groups.count(); - changeMessage(i18n("%1 Keys, %2 Groups").tqarg(keysList2->childCount()-keysList2->groupNb).tqarg(keysList2->groupNb),1); + changeMessage(i18n("%1 Keys, %2 Groups").arg(keysList2->childCount()-keysList2->groupNb).arg(keysList2->groupNb),1); } void listKeys::groupChange() @@ -1737,9 +1737,9 @@ void listKeys::createNewGroup() keysList2->setSelected(newgrp,true); keysList2->ensureItemVisible(newgrp); keysList2->groupNb=groups.count(); - changeMessage(i18n("%1 Keys, %2 Groups").tqarg(keysList2->childCount()-keysList2->groupNb).tqarg(keysList2->groupNb),1); + changeMessage(i18n("%1 Keys, %2 Groups").arg(keysList2->childCount()-keysList2->groupNb).arg(keysList2->groupNb),1); } else - KMessageBox::sorry(this,i18n("No valid or trusted key was selected. The group %1 will not be created.").tqarg(groupName)); + KMessageBox::sorry(this,i18n("No valid or trusted key was selected. The group %1 will not be created.").arg(groupName)); } } @@ -1817,7 +1817,7 @@ void listKeys::editGroup() gEdit->groupKeys->setColumnWidthMode(1,TQListView::Manual); gEdit->groupKeys->setColumnWidthMode(2,TQListView::Manual); - gEdit->setMinimumSize(gEdit->tqsizeHint()); + gEdit->setMinimumSize(gEdit->sizeHint()); gEdit->show(); if (dialogGroupEdit->exec()==TQDialog::Accepted) groupChange(); @@ -1864,7 +1864,7 @@ void listKeys::signkey() pclose(pass); opt= i18n("You are about to sign key:

%1
ID: %2
Fingerprint:
%3.

" "You should check the key fingerprint by phoning or meeting the key owner to be sure that someone " - "is not trying to intercept your communications").tqarg(keysList2->currentItem()->text(0)+" ("+keysList2->currentItem()->text(1)+")").tqarg(keysList2->currentItem()->text(6)).tqarg(fingervalue); + "is not trying to intercept your communications").arg(keysList2->currentItem()->text(0)+" ("+keysList2->currentItem()->text(1)+")").arg(keysList2->currentItem()->text(6)).arg(fingervalue); if (KMessageBox::warningContinueCancel(this,opt)!=KMessageBox::Continue) return; @@ -1958,7 +1958,7 @@ void listKeys::signatureResult(int success) keysList2->refreshcurrentkey(signList.at(keyCount)); else if (success==2) - KMessageBox::sorry(this,i18n("Bad passphrase, key %1 not signed.").tqarg(signList.at(keyCount)->text(0)+i18n(" (")+signList.at(keyCount)->text(1)+i18n(")"))); + KMessageBox::sorry(this,i18n("Bad passphrase, key %1 not signed.").arg(signList.at(keyCount)->text(0)+i18n(" (")+signList.at(keyCount)->text(1)+i18n(")"))); keyCount++; signLoop(); @@ -2064,7 +2064,7 @@ void listKeys::delsignkey() KMessageBox::sorry(this,i18n("Edit key manually to delete a self-signature.")); return; } - TQString ask=i18n("Are you sure you want to delete signature
%1 from key:
%2?").tqarg(signMail).tqarg(parentMail); + TQString ask=i18n("Are you sure you want to delete signature
%1 from key:
%2?").arg(signMail).arg(parentMail); if (KMessageBox::questionYesNo(this,ask,TQString(),KStdGuiItem::del(),KStdGuiItem::cancel())!=KMessageBox::Yes) return; @@ -2134,7 +2134,7 @@ void listKeys::slotgenkey() bool goodpass=false; while (!goodpass) { - int code=KPasswordDialog::getNewPassword(password,i18n("Enter passphrase for %1:
Passphrase should include non alphanumeric characters and random sequences").tqarg(newKeyName+" <"+newKeyMail+">")); + int code=KPasswordDialog::getNewPassword(password,i18n("Enter passphrase for %1:
Passphrase should include non alphanumeric characters and random sequences").arg(newKeyName+" <"+newKeyMail+">")); if (code!=TQDialog::Accepted) return; if (password.length()<5) @@ -2157,7 +2157,7 @@ void listKeys::slotgenkey() TQLabel *tex=new TQLabel(wid); TQLabel *tex2=new TQLabel(wid); - tex->tqsetAlignment(AlignHCenter); + tex->setAlignment(AlignHCenter); tex->setMovie(anim); tex2->setText(i18n("\nPlease wait...")); vbox->addWidget(passiveBox); @@ -2188,27 +2188,27 @@ void listKeys::slotgenkey() { proc->writeStdin(TQString("Key-Type: DSA")); proc->writeStdin(TQString("Subkey-Type: ELG-E")); - proc->writeStdin(TQString("Subkey-Length:%1").tqarg(ksize)); + proc->writeStdin(TQString("Subkey-Length:%1").arg(ksize)); } - proc->writeStdin(TQString("Passphrase:%1").tqarg(password.data())); - proc->writeStdin(TQString("Key-Length:%1").tqarg(ksize)); - proc->writeStdin(TQString("Name-Real:%1").tqarg(newKeyName)); + proc->writeStdin(TQString("Passphrase:%1").arg(password.data())); + proc->writeStdin(TQString("Key-Length:%1").arg(ksize)); + proc->writeStdin(TQString("Name-Real:%1").arg(newKeyName)); if (!newKeyMail.isEmpty()) - proc->writeStdin(TQString("Name-Email:%1").tqarg(newKeyMail)); + proc->writeStdin(TQString("Name-Email:%1").arg(newKeyMail)); if (!kcomment.isEmpty()) - proc->writeStdin(TQString("Name-Comment:%1").tqarg(kcomment)); + proc->writeStdin(TQString("Name-Comment:%1").arg(kcomment)); if (kexp==0) proc->writeStdin(TQString("Expire-Date:0")); if (kexp==1) - proc->writeStdin(TQString("Expire-Date:%1").tqarg(knumb)); + proc->writeStdin(TQString("Expire-Date:%1").arg(knumb)); if (kexp==2) - proc->writeStdin(TQString("Expire-Date:%1w").tqarg(knumb)); + proc->writeStdin(TQString("Expire-Date:%1w").arg(knumb)); if (kexp==3) - proc->writeStdin(TQString("Expire-Date:%1m").tqarg(knumb)); + proc->writeStdin(TQString("Expire-Date:%1m").arg(knumb)); if (kexp==4) - proc->writeStdin(TQString("Expire-Date:%1y").tqarg(knumb)); + 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 *))); proc->closeWhenDone(); @@ -2281,7 +2281,7 @@ void listKeys::newKeyDone(KProcess *) return; } keysList2->refreshcurrentkey(newkeyID); - changeMessage(i18n("%1 Keys, %2 Groups").tqarg(keysList2->childCount()-keysList2->groupNb).tqarg(keysList2->groupNb),1); + changeMessage(i18n("%1 Keys, %2 Groups").arg(keysList2->childCount()-keysList2->groupNb).arg(keysList2->groupNb),1); KDialogBase *keyCreated=new KDialogBase( this, "key_created", true,i18n("New Key Pair Created"), KDialogBase::Ok); newKey *page=new newKey(keyCreated); page->TLname->setText(""+newKeyName+""); @@ -2294,7 +2294,7 @@ void listKeys::newKeyDone(KProcess *) page->LEfinger->setText(newkeyFinger); page->CBdefault->setChecked(true); page->show(); - //page->resize(page->tqmaximumSize()); + //page->resize(page->maximumSize()); keyCreated->setMainWidget(page); delete pop; keyCreated->exec(); @@ -2326,7 +2326,7 @@ void listKeys::doFilePrint(TQString url) TQTextStream t( &qfile ); doPrint(t.read()); } else - KMessageBox::sorry(this,i18n("Cannot open file %1 for printing...").tqarg(url)); + KMessageBox::sorry(this,i18n("Cannot open file %1 for printing...").arg(url)); } void listKeys::doPrint(TQString txt) @@ -2345,7 +2345,7 @@ void listKeys::deleteseckey() //////////////////////// delete a key TQString res=keysList2->currentItem()->text(0)+" ("+keysList2->currentItem()->text(1)+")"; int result=KMessageBox::warningContinueCancel(this, - i18n("

Delete SECRET KEY pair %1?

Deleting this key pair means you will never be able to decrypt files encrypted with this key again.").tqarg(res), + i18n("

Delete SECRET KEY pair %1?

Deleting this key pair means you will never be able to decrypt files encrypted with this key again.").arg(res), i18n("Warning"), KGuiItem(i18n("Delete"),"editdelete")); if (result!=KMessageBox::Continue) @@ -2406,7 +2406,7 @@ void listKeys::confirmdeletekey() } if (secretKeyInside) { - int result=KMessageBox::warningContinueCancel(this,i18n("The following are secret key pairs:
%1They will not be deleted.
").tqarg(secList)); + int result=KMessageBox::warningContinueCancel(this,i18n("The following are secret key pairs:
%1They will not be deleted.
").arg(secList)); if (result!=KMessageBox::Continue) return; } @@ -2461,7 +2461,7 @@ void listKeys::deletekey() } } else stateChanged("empty_list"); - changeMessage(i18n("%1 Keys, %2 Groups").tqarg(keysList2->childCount()-keysList2->groupNb).tqarg(keysList2->groupNb),1); + changeMessage(i18n("%1 Keys, %2 Groups").arg(keysList2->childCount()-keysList2->groupNb).arg(keysList2->groupNb),1); } @@ -2473,8 +2473,8 @@ void listKeys::slotPreImportKey() dial->setMainWidget(page); page->newFilename->setCaption(i18n("Open File")); page->newFilename->setMode(KFile::File); - page->resize(page->tqminimumSize()); - dial->resize(dial->tqminimumSize()); + page->resize(page->minimumSize()); + dial->resize(dial->minimumSize()); if (dial->exec()==TQDialog::Accepted) { if (page->checkFile->isChecked()) { @@ -2488,7 +2488,7 @@ void listKeys::slotPreImportKey() connect(importKeyProcess,TQT_SIGNAL(refreshOrphaned()),keysList2,TQT_SLOT(slotReloadOrphaned())); } } else { - TQString keystr = kapp->tqclipboard()->text(clipboardMode); + TQString keystr = kapp->clipboard()->text(clipboardMode); if (!keystr.isEmpty()) { changeMessage(i18n("Importing..."),0,true); KgpgInterface *importKeyProcess=new KgpgInterface(); @@ -2638,7 +2638,7 @@ void KeyView::expandKey(TQListViewItem *item) } else if (tst[0]=="sub") { gpgKey subKey=extractKey(line); - itemsub= new UpdateViewItem(item,i18n("%1 subkey").tqarg(subKey.gpgkeyalgo),TQString(),TQString(),subKey.gpgkeyexpiration,subKey.gpgkeysize,subKey.gpgkeycreation,subKey.gpgkeyid); + itemsub= new UpdateViewItem(item,i18n("%1 subkey").arg(subKey.gpgkeyalgo),TQString(),TQString(),subKey.gpgkeyexpiration,subKey.gpgkeysize,subKey.gpgkeycreation,subKey.gpgkeyid); itemsub->setPixmap(0,pixkeySingle); itemsub->setPixmap(2,subKey.trustpic); cycle="sub"; @@ -2768,7 +2768,7 @@ void KeyView::refreshkeylist() setSelected(firstChild(),true); } - emit statusMessage(i18n("%1 Keys, %2 Groups").tqarg(childCount()-groupNb).tqarg(groupNb),1); + emit statusMessage(i18n("%1 Keys, %2 Groups").arg(childCount()-groupNb).arg(groupNb),1); emit statusMessage(i18n("Ready"),0); kdDebug(2100)<<"Refresh Finished"<setPixmap(0,pixkeyGroup); item->setExpandable(false); } - emit statusMessage(i18n("%1 Keys, %2 Groups").tqarg(childCount()-groupNb).tqarg(groupNb),1); + emit statusMessage(i18n("%1 Keys, %2 Groups").arg(childCount()-groupNb).arg(groupNb),1); emit statusMessage(i18n("Ready"),0); } @@ -2882,7 +2882,7 @@ void KeyView::slotReloadKeys(TQStringList keyIDs) } kdDebug(2100)<<"Refreshing key:--------"<findItem((keyIDs.last()).right(8).prepend("0x"),6)); - emit statusMessage(i18n("%1 Keys, %2 Groups").tqarg(childCount()-groupNb).tqarg(groupNb),1); + emit statusMessage(i18n("%1 Keys, %2 Groups").arg(childCount()-groupNb).arg(groupNb),1); emit statusMessage(i18n("Ready"),0); } @@ -2917,7 +2917,7 @@ void KeyView::slotReloadOrphaned() } } setSelected(findItem(*it,6),true); - emit statusMessage(i18n("%1 Keys, %2 Groups").tqarg(childCount()-groupNb).tqarg(groupNb),1); + emit statusMessage(i18n("%1 Keys, %2 Groups").arg(childCount()-groupNb).arg(groupNb),1); emit statusMessage(i18n("Ready"),0); } diff --git a/kgpg/listkeys.h b/kgpg/listkeys.h index abb2689..00de748 100644 --- a/kgpg/listkeys.h +++ b/kgpg/listkeys.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include "dcopiface.h" diff --git a/kgpg/popuppublic.cpp b/kgpg/popuppublic.cpp index 0800823..8bfe665 100644 --- a/kgpg/popuppublic.cpp +++ b/kgpg/popuppublic.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ //////////////////////////////////////////////////////// code for choosing a public key from a list for encryption -#include +#include #include #include #include @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include @@ -70,14 +70,14 @@ def=isDefault; } -void UpdateViewItem2::paintCell(TQPainter *p, const TQColorGroup &cg,int column, int width, int tqalignment) +void UpdateViewItem2::paintCell(TQPainter *p, const TQColorGroup &cg,int column, int width, int alignment) { if ((def) && (column<2)) { TQFont font(p->font()); font.setBold(true); p->setFont(font); } - KListViewItem::paintCell(p, cg, column, width, tqalignment); + KListViewItem::paintCell(p, cg, column, width, alignment); } TQString UpdateViewItem2 :: key(int c,bool ) const @@ -106,7 +106,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent keySingle=loader->loadIcon("kgpg_key1",KIcon::Small,20); keyGroup=loader->loadIcon("kgpg_key3",KIcon::Small,20); - if (filemode) setCaption(i18n("Select Public Key for %1").tqarg(sfile)); + if (filemode) setCaption(i18n("Select Public Key for %1").arg(sfile)); fmode=filemode; TQHButtonGroup *hBar=new TQHButtonGroup(page); @@ -176,7 +176,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent (CBshred,i18n("Shred source file: permanently remove source file. No recovery will be possible")); TQString shredWhatsThis = i18n( "Shred source file:

Checking this option will shred (overwrite several times before erasing) the files you have encrypted. This way, it is almost impossible that the source file is recovered.

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

"); - KActiveLabel *warn= new KActiveLabel( i18n("Read this before using shredding").tqarg(shredWhatsThis),parentBox ); + KActiveLabel *warn= new KActiveLabel( i18n("Read this before using shredding").arg(shredWhatsThis),parentBox ); shredBox->addWidget(CBshred); shredBox->addWidget(warn); } @@ -431,7 +431,7 @@ void popupPublic::slotprocread(KProcIO *p) bool isDefaultKey=false; if (id.right(8)==defaultKey) isDefaultKey=true; UpdateViewItem2 *item=new UpdateViewItem2(keysList,keyname,keymail,id,isDefaultKey); - //KListViewItem *sub= new KListViewItem(item,i18n("ID: %1, trust: %2, validity: %3").tqarg(id).tqarg(tr).tqarg(val)); + //KListViewItem *sub= new KListViewItem(item,i18n("ID: %1, trust: %2, validity: %3").arg(id).arg(tr).arg(val)); //sub->setSelectable(false); if (seclist.find(tst,0,FALSE)!=-1) item->setPixmap(0,keyPair); diff --git a/kgpg/sourceselect.ui b/kgpg/sourceselect.ui index 1d0b749..b974eb7 100644 --- a/kgpg/sourceselect.ui +++ b/kgpg/sourceselect.ui @@ -20,7 +20,7 @@ 0 - + 350 0 @@ -83,7 +83,7 @@ Expanding - + 20 31 -- cgit v1.2.1