summaryrefslogtreecommitdiffstats
path: root/kgpg/kgpgoptions.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:50:20 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:50:20 -0600
commitaef5eada7f51ee48f3d21448db290bd8f06953a8 (patch)
tree9d6e7572ebcc27e402501d6966f9b46361a1702c /kgpg/kgpgoptions.cpp
parent95d05392f9bc01594738a1e06ebf23123b3d3e6e (diff)
downloadtdeutils-aef5eada7f51ee48f3d21448db290bd8f06953a8.tar.gz
tdeutils-aef5eada7f51ee48f3d21448db290bd8f06953a8.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kgpg/kgpgoptions.cpp')
-rw-r--r--kgpg/kgpgoptions.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/kgpg/kgpgoptions.cpp b/kgpg/kgpgoptions.cpp
index 211fb77..85a0e75 100644
--- a/kgpg/kgpgoptions.cpp
+++ b/kgpg/kgpgoptions.cpp
@@ -96,8 +96,8 @@ kdDebug(2100)<<"Adding pages"<<endl;
page7->shredInfo->setText(i18n( "<qt><p>You must be aware that <b>shredding 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>"));
page7->groupShred->adjustSize();
- pixkeySingle=KGlobal::iconLoader()->loadIcon("kgpg_key1",KIcon::Small,20);
- pixkeyDouble=KGlobal::iconLoader()->loadIcon("kgpg_key2",KIcon::Small,20);
+ pixkeySingle=TDEGlobal::iconLoader()->loadIcon("kgpg_key1",KIcon::Small,20);
+ pixkeyDouble=TDEGlobal::iconLoader()->loadIcon("kgpg_key2",KIcon::Small,20);
addPage(page1, i18n("Encryption"), "encrypted");
addPage(page2, i18n("Decryption"), "decrypted");
addPage(page3, i18n("Appearance"), "looknfeel");
@@ -197,7 +197,7 @@ if (!gpgHome.endsWith("/")) gpgHome.append("/");
{
KProcIO *p=new KProcIO();
*p<<"gpg"<<"--homedir"<<gpgHome<<"--no-tty"<<"--list-secret-keys";
- p->start(KProcess::Block); //// start gnupg so that it will create a config file
+ p->start(TDEProcess::Block); //// start gnupg so that it will create a config file
confPath="gpg.conf";
TQFile confFile(gpgHome+confPath);
if (!confFile.open(IO_WriteOnly))