Rename TDEApplication::kApplication() to TDEApplication::tdeApplication() and kapp to tdeApp.

Signed-off-by: Michele Calgaro <[email protected]>

1 files changed, 9 insertions, 9 deletions

diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp
index 1b74c5388..81cd2fa97 100644
--- a/tdehtml/tdehtml_part.cpp
+++ b/tdehtml/tdehtml_part.cpp
@@ -1483,7 +1483,7 @@ void TDEHTMLPart::clear()
   d->m_startOffset = 0;
   d->m_endOffset = 0;
 #ifndef TQT_NO_CLIPBOARD
-  connect( kapp->clipboard(), TQ_SIGNAL( selectionChanged()), TQ_SLOT( slotClearSelection()));
+  connect( tdeApp->clipboard(), TQ_SIGNAL( selectionChanged()), TQ_SLOT( slotClearSelection()));
 #endif
 
   d->m_jobPercent = 0;
@@ -2426,7 +2426,7 @@ void TDEHTMLPart::slotRedirect()
   if ( openedByJS() && d->m_opener )
       cUrl = d->m_opener->url();
 
-  if (!kapp || !kapp->authorizeURLAction("redirect", cUrl, url))
+  if (!tdeApp || !tdeApp->authorizeURLAction("redirect", cUrl, url))
   {
     kdWarning(6050) << "TDEHTMLPart::scheduleRedirection: Redirection from " << cUrl << " to " << url << " REJECTED!" << endl;
     emit completed();
@@ -3008,7 +3008,7 @@ void TDEHTMLPart::findText()
 
   // The lineedit of the dialog would make tdehtml lose its selection, otherwise
 #ifndef TQT_NO_CLIPBOARD
-  disconnect( kapp->clipboard(), TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotClearSelection()) );
+  disconnect( tdeApp->clipboard(), TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotClearSelection()) );
 #endif
 
   // Now show the dialog in which the user can choose options.
@@ -3039,7 +3039,7 @@ void TDEHTMLPart::findText( const TQString &str, long options, TQWidget *parent,
     return;
 
 #ifndef TQT_NO_CLIPBOARD
-  connect( kapp->clipboard(), TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotClearSelection()) );
+  connect( tdeApp->clipboard(), TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotClearSelection()) );
 #endif
 
   // Create the KFind object
@@ -4779,7 +4779,7 @@ void TDEHTMLPart::submitForm( const char *action, const TQString &url, const TQB
                                                       KGuiItem(i18n("&Send Unencrypted")),
                                                       "WarnOnUnencryptedForm");
           // Move this setting into KSSL instead
-          TDEConfig *config = kapp->config();
+          TDEConfig *config = tdeApp->config();
           TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages");
           TDEConfigGroupSaver saver( config, grpNotifMsgs );
 
@@ -6615,9 +6615,9 @@ void TDEHTMLPart::tdehtmlMouseReleaseEvent( tdehtml::MouseReleaseEvent *event )
 #ifndef TQT_NO_CLIPBOARD
     TQString text = selectedText();
     text.replace(TQChar(0xa0), ' ');
-    disconnect( kapp->clipboard(), TQ_SIGNAL( selectionChanged()), this, TQ_SLOT( slotClearSelection()));
-    kapp->clipboard()->setText(text,TQClipboard::Selection);
-    connect( kapp->clipboard(), TQ_SIGNAL( selectionChanged()), TQ_SLOT( slotClearSelection()));
+    disconnect( tdeApp->clipboard(), TQ_SIGNAL( selectionChanged()), this, TQ_SLOT( slotClearSelection()));
+    tdeApp->clipboard()->setText(text,TQClipboard::Selection);
+    connect( tdeApp->clipboard(), TQ_SIGNAL( selectionChanged()), TQ_SLOT( slotClearSelection()));
 #endif
     //kdDebug( 6000 ) << "selectedText = " << text << endl;
     emitSelectionChanged();
@@ -6819,7 +6819,7 @@ bool TDEHTMLPart::checkLinkSecurity(const KURL &linkURL,const TQString &message,
   bool linkAllowed = true;
 
   if ( d->m_doc )
-    linkAllowed = kapp && kapp->authorizeURLAction("redirect", url(), linkURL);
+    linkAllowed = tdeApp && tdeApp->authorizeURLAction("redirect", url(), linkURL);
 
   if ( !linkAllowed ) {
     tdehtml::Tokenizer *tokenizer = d->m_doc->tokenizer();