6 files changed, 15 insertions, 15 deletions
diff --git a/tdeio/tdefile/kdirselectdialog.cpp b/tdeio/tdefile/kdirselectdialog.cpp
index ab8e64d92..11a6f6512 100644
--- a/tdeio/tdefile/kdirselectdialog.cpp
+++ b/tdeio/tdefile/kdirselectdialog.cpp
@@ -73,10 +73,10 @@ static KURL rootUrl(const KURL &url)
     KURL root = url;
     root.setPath( "/" );
 
-    if (!kapp->authorizeURLAction("list", KURL(), root))
+    if (!tdeApp->authorizeURLAction("list", KURL(), root))
     {
         root = KURL::fromPathOrURL( TQDir::homeDirPath() );
-        if (!kapp->authorizeURLAction("list", KURL(), root))
+        if (!tdeApp->authorizeURLAction("list", KURL(), root))
         {
             root = url;
         }
diff --git a/tdeio/tdefile/kicondialog.cpp b/tdeio/tdefile/kicondialog.cpp
index ba54383a0..a73f34915 100644
--- a/tdeio/tdefile/kicondialog.cpp
+++ b/tdeio/tdefile/kicondialog.cpp
@@ -135,7 +135,7 @@ void TDEIconCanvas::slotLoadFiles()
     TQStringList::ConstIterator end(mFiles.end());
     for (it=mFiles.begin(), i=0; it!=end; ++it, i++)
     {
-	// Calling kapp->processEvents() makes the iconview flicker like hell
+	// Calling tdeApp->processEvents() makes the iconview flicker like hell
 	// (it's being repainted once for every new item), so we don't do this.
 	// Instead, we directly repaint the progress bar without going through
 	// the event-loop. We do that just once for every 10th item so that
@@ -146,7 +146,7 @@ void TDEIconCanvas::slotLoadFiles()
         }
 
         emitProgress++;
-//	kapp->processEvents();
+//	tdeApp->processEvents();
         if ( !d->m_bLoading ) // user clicked on a button that will load another set of icons
             break;
 	TQImage img;
diff --git a/tdeio/tdefile/knotifydialog.cpp b/tdeio/tdefile/knotifydialog.cpp
index b4f4d9c7d..24e1227ab 100644
--- a/tdeio/tdefile/knotifydialog.cpp
+++ b/tdeio/tdefile/knotifydialog.cpp
@@ -816,11 +816,11 @@ void KNotifyWidget::save()
         ++it;
     }
 
-    if ( kapp )
+    if ( tdeApp )
     {
-        if ( !kapp->dcopClient()->isAttached() )
-            kapp->dcopClient()->attach();
-        kapp->dcopClient()->send("knotify", "", "reconfigure()", TQString(""));
+        if ( !tdeApp->dcopClient()->isAttached() )
+            tdeApp->dcopClient()->attach();
+        tdeApp->dcopClient()->send("knotify", "", "reconfigure()", TQString(""));
     }
 
     emit changed( false );
diff --git a/tdeio/tdefile/kopenwith.cpp b/tdeio/tdefile/kopenwith.cpp
index 527f53b51..b1fdbaacc 100644
--- a/tdeio/tdefile/kopenwith.cpp
+++ b/tdeio/tdefile/kopenwith.cpp
@@ -388,7 +388,7 @@ void KOpenWithDlg::setServiceType( const KURL::List& _urls )
 void KOpenWithDlg::init( const TQString& _text, const TQString& _value )
 {
   d = new KOpenWithDlgPrivate;
-  bool bReadOnly = kapp && !kapp->authorize("shell_access");
+  bool bReadOnly = tdeApp && !tdeApp->authorize("shell_access");
   m_terminaldirty = false;
   m_pTree = 0L;
   m_pService = 0L;
diff --git a/tdeio/tdefile/kpropertiesdialog.cpp b/tdeio/tdefile/kpropertiesdialog.cpp
index 21bfb378b..aa25ac10f 100644
--- a/tdeio/tdefile/kpropertiesdialog.cpp
+++ b/tdeio/tdefile/kpropertiesdialog.cpp
@@ -498,7 +498,7 @@ void KPropertiesDialog::insertPages()
     insertPlugin (p);
   }
 
-  if ( kapp->authorizeTDEAction("sharefile") &&
+  if ( tdeApp->authorizeTDEAction("sharefile") &&
        KFileSharePropsPlugin::supports( m_items ) )
   {
     KPropsDlgPlugin *p = new KFileSharePropsPlugin( this );
@@ -971,7 +971,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
 
     connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( slotEditFileType() ));
 
-    if (!kapp->authorizeTDEAction("editfiletype"))
+    if (!tdeApp->authorizeTDEAction("editfiletype"))
        button->hide();
 #endif
 
@@ -3628,7 +3628,7 @@ bool KDesktopPropsPlugin::supports( KFileItemList _items )
     return false;
   // open file and check type
   KDesktopFile config( item->url().path(), true /* readonly */ );
-  return config.hasApplicationType() && kapp->authorize("run_desktop_files") && kapp->authorize("shell_access");
+  return config.hasApplicationType() && tdeApp->authorize("run_desktop_files") && tdeApp->authorize("shell_access");
 }
 
 void KPropertiesDialog::virtual_hook( int id, void* data )
@@ -3906,7 +3906,7 @@ bool KExecPropsPlugin::supports( KFileItemList _items )
     return false;
   // open file and check type
   KDesktopFile config( item->url().path(), true /* readonly */ );
-  return config.hasApplicationType() && kapp->authorize("run_desktop_files") && kapp->authorize("shell_access");
+  return config.hasApplicationType() && tdeApp->authorize("run_desktop_files") && tdeApp->authorize("shell_access");
 }
 
 void KExecPropsPlugin::applyChanges()
diff --git a/tdeio/tdefile/tdefiledialog.cpp b/tdeio/tdefile/tdefiledialog.cpp
index cf5d97692..e1e911400 100644
--- a/tdeio/tdefile/tdefiledialog.cpp
+++ b/tdeio/tdefile/tdefiledialog.cpp
@@ -529,7 +529,7 @@ void KFileDialog::slotOk()
             return;
     }
 
-    if (!kapp->authorizeURLAction("open", KURL(), d->url))
+    if (!tdeApp->authorizeURLAction("open", KURL(), d->url))
     {
         TQString msg = TDEIO::buildErrorString(TDEIO::ERR_ACCESS_DENIED, d->url.prettyURL());
         KMessageBox::error( d->mainWidget, msg);
@@ -547,7 +547,7 @@ void KFileDialog::slotOk()
         for ( KURL::List::ConstIterator it = list.begin();
               it != list.end(); ++it )
         {
-            if (!kapp->authorizeURLAction("open", KURL(), *it))
+            if (!tdeApp->authorizeURLAction("open", KURL(), *it))
             {
                 TQString msg = TDEIO::buildErrorString(TDEIO::ERR_ACCESS_DENIED, (*it).prettyURL());
                 KMessageBox::error( d->mainWidget, msg);