1 files changed, 74 insertions, 74 deletions

diff --git a/kgpg/kgpg.cpp b/kgpg/kgpg.cpp
index 0d7acd2..5073b96 100644
--- a/kgpg/kgpg.cpp
+++ b/kgpg/kgpg.cpp
@@ -51,8 +51,8 @@
 #include <kiconloader.h>
 #include <tdetempfile.h>
 #include <twin.h>
-#include <kprocess.h>
-#include <kprocio.h>
+#include <tdeprocess.h>
+#include <tdeprocio.h>
 #include <tdeaboutapplication.h>
 #include <kurlrequester.h>
 #include <ktip.h>
@@ -60,11 +60,11 @@
 #include <ktar.h>
 #include <kzip.h>
 #include <dcopclient.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdefiledialog.h>
 #include <tdepopupmenu.h>
 #include <tqcursor.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 
 #include "kgpgeditor.h"
 
@@ -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,26 +118,26 @@ 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;
 }
 
 void  MyView::clipDecrypt()
 {
-        TQString clippie=kapp->clipboard()->text(clipboardMode).stripWhiteSpace();
+        TQString clippie=tdeApp->clipboard()->text(clipboardMode).stripWhiteSpace();
 	droppedtext(clippie,false);
 }
 
 void  MyView::clipSign(bool openEditor)
 {
-        TQString clippie=kapp->clipboard()->text(clipboardMode).stripWhiteSpace();
+        TQString clippie=tdeApp->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;
@@ -213,7 +213,7 @@ pop = new KPassivePopup();
 	pop->setView(i18n("Processing folder compression and encryption"),i18n("Please wait..."),TDEGlobal::iconLoader()->loadIcon("kgpg",TDEIcon::Desktop));
 	pop->setAutoDelete(false);
 	pop->show();
-	kapp->processEvents();
+	tdeApp->processEvents();
 	dialogue->slotAccept();
 	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;
                 }
         }
@@ -573,7 +573,7 @@ void  MyView::dropEvent (TQDropEvent *o)
 void  MyView::readOptions()
 {
 	clipboardMode=TQClipboard::Clipboard;
-        if ( KGpgSettings::useMouseSelection() && kapp->clipboard()->supportsSelection())
+        if ( KGpgSettings::useMouseSelection() && tdeApp->clipboard()->supportsSelection())
                 clipboardMode=TQClipboard::Selection;
 
 	if (KGpgSettings::firstRun()) {
@@ -594,7 +594,7 @@ void  MyView::readOptions()
 
 void  MyView::firstRun()
 {
-        KProcIO *p=new KProcIO();
+        TDEProcIO *p=new TDEProcIO();
         *p<<"gpg"<<"--no-tty"<<"--list-secret-keys";
         p->start(TDEProcess::Block);  ////  start gnupg so that it will create a config file
         startWizard();
@@ -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();
@@ -778,7 +778,7 @@ void  MyView::installShred()
                 KURL path;
 		path.setPath(TDEGlobalSettings::desktopPath());
 		path.addPath("shredder.desktop");
-                KDesktopFile configl2(path.path(), false);
+                TDEDesktopFile configl2(path.path(), false);
                 if (configl2.isImmutable() ==false) {
                         configl2.setGroup("Desktop Entry");
                         configl2.writeEntry("Type", "Application");
@@ -823,13 +823,13 @@ void  MyView::slotGenKey()
 
 void  MyView::about()
 {
-        TDEAboutApplication dialog(kapp->aboutData());//_aboutData);
+        TDEAboutApplication dialog(tdeApp->aboutData());//_aboutData);
         dialog.exec();
 }
 
 void  MyView::help()
 {
-        kapp->invokeHelp(0,"kgpg");
+        tdeApp->invokeHelp(0,"kgpg");
 }
 
 kgpgapplet::kgpgapplet(TQWidget *parent, const char *name)
@@ -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);
@@ -865,7 +865,7 @@ kgpgapplet::kgpgapplet(TQWidget *parent, const char *name)
 void kgpgapplet::checkMenu()
 {
 	KgpgDecryptClipboard->setEnabled(false);
-	if ((kapp->clipboard()->text(w->clipboardMode).isEmpty()))
+	if ((tdeApp->clipboard()->text(w->clipboardMode).isEmpty()))
 	{
 		KgpgEncryptClipboard->setEnabled(false);
 		KgpgSignClipboard->setEnabled(false);
@@ -873,7 +873,7 @@ void kgpgapplet::checkMenu()
 	else
 	{
 		KgpgEncryptClipboard->setEnabled(true);
-		if (kapp->clipboard()->text(w->clipboardMode).stripWhiteSpace().startsWith("-----BEGIN"))
+		if (tdeApp->clipboard()->text(w->clipboardMode).stripWhiteSpace().startsWith("-----BEGIN"))
 		KgpgDecryptClipboard->setEnabled(true);
 		KgpgSignClipboard->setEnabled(true);
 	}
@@ -882,21 +882,21 @@ void kgpgapplet::checkMenu()
 void kgpgapplet::showOptions()
 {
 TQByteArray data;
-if (!kapp->dcopClient()->send("kgpg", "KeyInterface", "showOptions()",data))
+if (!tdeApp->dcopClient()->send("kgpg", "KeyInterface", "showOptions()",data))
 kdDebug(2100) <<"there was some error using DCOP."<<endl;
 }
 
 void kgpgapplet::slotOpenKeyManager()
 {
 TQByteArray data;
-if (!kapp->dcopClient()->send("kgpg", "KeyInterface", "showKeyManager()",data))
+if (!tdeApp->dcopClient()->send("kgpg", "KeyInterface", "showKeyManager()",data))
 kdDebug(2100) <<"there was some error using DCOP."<<endl;
 }
 
 void kgpgapplet::slotOpenServerDialog()
 {
 TQByteArray data;
-if (!kapp->dcopClient()->send("kgpg", "KeyInterface", "showKeyServer()",data))
+if (!tdeApp->dcopClient()->send("kgpg", "KeyInterface", "showKeyServer()",data))
 kdDebug(2100) <<"there was some error using DCOP."<<endl;
 }
 
@@ -909,7 +909,7 @@ kgpgapplet::~kgpgapplet()
 }
 
 KgpgAppletApp::KgpgAppletApp()
-                : KUniqueApplication()//, kgpg_applet( 0 )
+                : TDEUniqueApplication()//, kgpg_applet( 0 )
 {
 
         running=false;
@@ -933,7 +933,7 @@ s_keyManager->keysList2->saveLayout(TDEGlobal::config(),"KeyView");
 	KGpgSettings::setShowCreat(s_keyManager->sCreat->isChecked());
 	KGpgSettings::setShowSize(s_keyManager->sSize->isChecked());
         KGpgSettings::writeConfig();
-	KSimpleConfig ("kgpgrc").sync();
+	TDESimpleConfig ("kgpgrc").sync();
         quit();
 }
 
@@ -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();
 
 
@@ -1069,7 +1069,7 @@ int KgpgAppletApp::newInstance()
 
 void MyView::encryptClipboard(TQStringList selec,TQStringList encryptOptions,bool,bool symmetric)
 {
-        if (kapp->clipboard()->text(clipboardMode).isEmpty()) {
+        if (tdeApp->clipboard()->text(clipboardMode).isEmpty()) {
 	KPassivePopup::message(i18n("Clipboard is empty."),TQString(),TDEGlobal::iconLoader()->loadIcon("kgpg",TDEIcon::Desktop),this);
 	return;
 	}
@@ -1079,14 +1079,14 @@ 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()));
-                txtEncrypt->KgpgEncryptText(kapp->clipboard()->text(clipboardMode),selec,encryptOptions);
+                connect (txtEncrypt,TQ_SIGNAL(txtencryptionfinished(TQString)),this,TQ_SLOT(slotSetClip(TQString)));
+		connect (txtEncrypt,TQ_SIGNAL(txtencryptionstarted()),this,TQ_SLOT(slotPassiveClip()));
+                txtEncrypt->KgpgEncryptText(tdeApp->clipboard()->text(clipboardMode),selec,encryptOptions);
 }
 
 void MyView::slotPassiveClip()
 {
-TQString newtxt=kapp->clipboard()->text(clipboardMode);
+TQString newtxt=tdeApp->clipboard()->text(clipboardMode);
 if (newtxt.length()>300)
                         newtxt=TQString(newtxt.left(250).stripWhiteSpace())+"...\n"+TQString(newtxt.right(40).stripWhiteSpace());