From aef5eada7f51ee48f3d21448db290bd8f06953a8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:50:20 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kgpg/kgpgoptions.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'kgpg/kgpgoptions.cpp') 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"<shredInfo->setText(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).

")); 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"<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)) -- cgit v1.2.1