diff options
Diffstat (limited to 'kgpg')
-rw-r--r-- | kgpg/adduid.ui | 2 | ||||
-rw-r--r-- | kgpg/conf_decryption.ui | 2 | ||||
-rw-r--r-- | kgpg/conf_encryption.ui | 2 | ||||
-rw-r--r-- | kgpg/conf_gpg.ui | 2 | ||||
-rw-r--r-- | kgpg/conf_misc.ui | 2 | ||||
-rw-r--r-- | kgpg/conf_servers.ui | 2 | ||||
-rw-r--r-- | kgpg/conf_ui2.ui | 2 | ||||
-rw-r--r-- | kgpg/groupedit.ui | 2 | ||||
-rw-r--r-- | kgpg/keyexport.ui | 2 | ||||
-rw-r--r-- | kgpg/keyproperties.ui | 2 | ||||
-rw-r--r-- | kgpg/keyserver.ui | 2 | ||||
-rw-r--r-- | kgpg/kgpgrevokewidget.ui | 2 | ||||
-rw-r--r-- | kgpg/kgpgwizard.ui | 2 | ||||
-rw-r--r-- | kgpg/listkeys.cpp | 12 | ||||
-rw-r--r-- | kgpg/newkey.ui | 2 | ||||
-rw-r--r-- | kgpg/popuppublic.cpp | 8 | ||||
-rw-r--r-- | kgpg/searchres.ui | 2 | ||||
-rw-r--r-- | kgpg/sourceselect.ui | 2 |
18 files changed, 26 insertions, 26 deletions
diff --git a/kgpg/adduid.ui b/kgpg/adduid.ui index 0fbaa39..0bf4537 100644 --- a/kgpg/adduid.ui +++ b/kgpg/adduid.ui @@ -60,5 +60,5 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kgpg/conf_decryption.ui b/kgpg/conf_decryption.ui index 4034ba5..da86512 100644 --- a/kgpg/conf_decryption.ui +++ b/kgpg/conf_decryption.ui @@ -65,5 +65,5 @@ <Q_SLOTS> <slot>use_agent_toggled( bool isOn )</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kgpg/conf_encryption.ui b/kgpg/conf_encryption.ui index 184acf9..7fa0563 100644 --- a/kgpg/conf_encryption.ui +++ b/kgpg/conf_encryption.ui @@ -313,7 +313,7 @@ <Q_SLOTS> <slot>allow_custom_option_toggled( bool isOn )</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kgpg/conf_gpg.ui b/kgpg/conf_gpg.ui index d919ded..1109528 100644 --- a/kgpg/conf_gpg.ui +++ b/kgpg/conf_gpg.ui @@ -205,7 +205,7 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kgpg/conf_misc.ui b/kgpg/conf_misc.ui index 5b8548d..8c0a43e 100644 --- a/kgpg/conf_misc.ui +++ b/kgpg/conf_misc.ui @@ -409,5 +409,5 @@ the original file.</string> </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kgpg/conf_servers.ui b/kgpg/conf_servers.ui index 075d782..a765cd9 100644 --- a/kgpg/conf_servers.ui +++ b/kgpg/conf_servers.ui @@ -110,7 +110,7 @@ all others will be stored for use by KGpg only.</string> </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>klistbox.h</includehint> diff --git a/kgpg/conf_ui2.ui b/kgpg/conf_ui2.ui index 26e3d79..74a4a0b 100644 --- a/kgpg/conf_ui2.ui +++ b/kgpg/conf_ui2.ui @@ -168,7 +168,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint> diff --git a/kgpg/groupedit.ui b/kgpg/groupedit.ui index 41e66fe..438d2b9 100644 --- a/kgpg/groupedit.ui +++ b/kgpg/groupedit.ui @@ -205,7 +205,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kactivelabel.h</includehint> </includehints> diff --git a/kgpg/keyexport.ui b/kgpg/keyexport.ui index 6ac8100..8389aa3 100644 --- a/kgpg/keyexport.ui +++ b/kgpg/keyexport.ui @@ -135,7 +135,7 @@ <Q_SLOTS> <slot>checkFile_toggled( bool isOn )</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> </includehints> diff --git a/kgpg/keyproperties.ui b/kgpg/keyproperties.ui index 873b8ea..485c182 100644 --- a/kgpg/keyproperties.ui +++ b/kgpg/keyproperties.ui @@ -495,7 +495,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kactivelabel.h</includehint> <includehint>kactivelabel.h</includehint> diff --git a/kgpg/keyserver.ui b/kgpg/keyserver.ui index 097702d..40c81ec 100644 --- a/kgpg/keyserver.ui +++ b/kgpg/keyserver.ui @@ -332,5 +332,5 @@ Allows the user to select the Key Server which will be used to import PGP/GnuPG </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kgpg/kgpgrevokewidget.ui b/kgpg/kgpgrevokewidget.ui index 2428d9c..2405494 100644 --- a/kgpg/kgpgrevokewidget.ui +++ b/kgpg/kgpgrevokewidget.ui @@ -145,7 +145,7 @@ <Q_SLOTS> <slot>cbSave_toggled( bool isOn )</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> </includehints> diff --git a/kgpg/kgpgwizard.ui b/kgpg/kgpgwizard.ui index 67b2da9..b826975 100644 --- a/kgpg/kgpgwizard.ui +++ b/kgpg/kgpgwizard.ui @@ -397,7 +397,7 @@ Remember that if you download a file or open one in an editor, parts of the file <Q_SLOTS> <slot>finishButton_clicked()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kactivelabel.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kgpg/listkeys.cpp b/kgpg/listkeys.cpp index f52d821..4d2aa08 100644 --- a/kgpg/listkeys.cpp +++ b/kgpg/listkeys.cpp @@ -2052,24 +2052,24 @@ void listKeys::delsignkey() return; } - TQString signID,tqparentKey,signMail,tqparentMail; + TQString signID,parentKey,signMail,parentMail; ////////////////// open a key selection dialog (KgpgSelKey, see begining of this file) - tqparentKey=keysList2->currentItem()->tqparent()->text(6); + parentKey=keysList2->currentItem()->tqparent()->text(6); signID=keysList2->currentItem()->text(6); - tqparentMail=keysList2->currentItem()->tqparent()->text(0)+" ("+keysList2->currentItem()->tqparent()->text(1)+")"; + parentMail=keysList2->currentItem()->tqparent()->text(0)+" ("+keysList2->currentItem()->tqparent()->text(1)+")"; signMail=keysList2->currentItem()->text(0)+" ("+keysList2->currentItem()->text(1)+")"; - if (tqparentKey==signID) { + if (parentKey==signID) { KMessageBox::sorry(this,i18n("Edit key manually to delete a self-signature.")); return; } - TQString ask=i18n("<qt>Are you sure you want to delete signature<br><b>%1</b> from key:<br><b>%2</b>?</qt>").tqarg(signMail).tqarg(tqparentMail); + TQString ask=i18n("<qt>Are you sure you want to delete signature<br><b>%1</b> from key:<br><b>%2</b>?</qt>").tqarg(signMail).tqarg(parentMail); if (KMessageBox::questionYesNo(this,ask,TQString(),KStdGuiItem::del(),KStdGuiItem::cancel())!=KMessageBox::Yes) return; KgpgInterface *delSignKeyProcess=new KgpgInterface(); - delSignKeyProcess->KgpgDelSignature(tqparentKey,signID); + delSignKeyProcess->KgpgDelSignature(parentKey,signID); connect(delSignKeyProcess,TQT_SIGNAL(delsigfinished(bool)),TQT_TQOBJECT(this),TQT_SLOT(delsignatureResult(bool))); } diff --git a/kgpg/newkey.ui b/kgpg/newkey.ui index 8dfc354..fe978df 100644 --- a/kgpg/newkey.ui +++ b/kgpg/newkey.ui @@ -192,5 +192,5 @@ <Q_SLOTS> <slot>CBsave_toggled( bool isOn )</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kgpg/popuppublic.cpp b/kgpg/popuppublic.cpp index 01bd02b..1ae2a01 100644 --- a/kgpg/popuppublic.cpp +++ b/kgpg/popuppublic.cpp @@ -167,16 +167,16 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, tqpare "box enables you to use any key, even if it has not be signed.")); if (filemode) { - TQWidget *tqparentBox=new TQWidget(boutonboxoptions); - TQHBoxLayout *shredBox=new TQHBoxLayout(tqparentBox,0); + TQWidget *parentBox=new TQWidget(boutonboxoptions); + TQHBoxLayout *shredBox=new TQHBoxLayout(parentBox,0); //shredBox->setFrameStyle(TQFrame::NoFrame); //shredBox->setMargin(0); - CBshred=new TQCheckBox(i18n("Shred source file"),tqparentBox); + CBshred=new TQCheckBox(i18n("Shred source file"),parentBox); TQWhatsThis::add (CBshred,i18n("<b>Shred source file</b>: permanently remove source file. No recovery will be possible")); TQString shredWhatsThis = i18n( "<qt><b>Shred source file:</b><br /><p>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.</p><p><b>But you must be aware that this is not secure</b> 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).</p></qt>"); - KActiveLabel *warn= new KActiveLabel( i18n("<a href=\"whatsthis:%1\">Read this before using shredding</a>").tqarg(shredWhatsThis),tqparentBox ); + KActiveLabel *warn= new KActiveLabel( i18n("<a href=\"whatsthis:%1\">Read this before using shredding</a>").tqarg(shredWhatsThis),parentBox ); shredBox->addWidget(CBshred); shredBox->addWidget(warn); } diff --git a/kgpg/searchres.ui b/kgpg/searchres.ui index c58c6fe..a41947c 100644 --- a/kgpg/searchres.ui +++ b/kgpg/searchres.ui @@ -116,7 +116,7 @@ <tabstop>kLVsearch</tabstop> <tabstop>kLEID</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klistview.h</includehint> diff --git a/kgpg/sourceselect.ui b/kgpg/sourceselect.ui index 2881271..1d0b749 100644 --- a/kgpg/sourceselect.ui +++ b/kgpg/sourceselect.ui @@ -103,7 +103,7 @@ <Q_SLOTS> <slot>checkFile_toggled( bool isOn )</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> |