1 files changed, 14 insertions, 14 deletions

diff --git a/kgpg/kgpg.cpp b/kgpg/kgpg.cpp
index 5273fcf..1957b96 100644
--- a/kgpg/kgpg.cpp
+++ b/kgpg/kgpg.cpp
@@ -125,13 +125,13 @@ void  MyView::clipEncrypt()
 
 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,TQ_SIGNAL(setFont(TQFont)),kgpgtxtedit,TQ_SLOT(slotSetFont(TQFont)));
@@ -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;
 
@@ -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()) {
@@ -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)
@@ -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;
 }
 
@@ -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;
 	}
@@ -1081,12 +1081,12 @@ void MyView::encryptClipboard(TQStringList selec,TQStringList encryptOptions,boo
                 KgpgInterface *txtEncrypt=new KgpgInterface();
                 connect (txtEncrypt,TQ_SIGNAL(txtencryptionfinished(TQString)),this,TQ_SLOT(slotSetClip(TQString)));
 		connect (txtEncrypt,TQ_SIGNAL(txtencryptionstarted()),this,TQ_SLOT(slotPassiveClip()));
-                txtEncrypt->KgpgEncryptText(kapp->clipboard()->text(clipboardMode),selec,encryptOptions);
+                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());