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

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

8 files changed, 21 insertions, 21 deletions

diff --git a/kate/part/kateautoindent.h b/kate/part/kateautoindent.h
index 6a499df8e..c14f16ce3 100644
--- a/kate/part/kateautoindent.h
+++ b/kate/part/kateautoindent.h
@@ -56,7 +56,7 @@ class IndenterConfigPage : public TQWidget
 
   public slots:
     /**
-     * Apply the changes. Save options here, use @p kapp->config() and
+     * Apply the changes. Save options here, use @p tdeApp->config() and
      * group [Kate Indenter MyIndenter].
      */
     virtual void apply () = 0;
diff --git a/kate/part/kateconfig.cpp b/kate/part/kateconfig.cpp
index 7625af0eb..bc1c51dd7 100644
--- a/kate/part/kateconfig.cpp
+++ b/kate/part/kateconfig.cpp
@@ -114,7 +114,7 @@ KateDocumentConfig::KateDocumentConfig ()
   m_pluginsSet.fill (true);
 
   // init with defaults from config or really hardcoded ones
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
   config->setGroup("Kate Document Defaults");
   readConfig (config);
 }
@@ -631,7 +631,7 @@ KateViewConfig::KateViewConfig ()
   s_global = this;
 
   // init with defaults from config or really hardcoded ones
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
   config->setGroup("Kate View Defaults");
   readConfig (config);
 }
@@ -1022,7 +1022,7 @@ KateRendererConfig::KateRendererConfig ()
   s_global = this;
 
   // init with defaults from config or really hardcoded ones
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
   config->setGroup("Kate Renderer Defaults");
   readConfig (config);
 }
diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp
index a125c2c85..84177de1f 100644
--- a/kate/part/katedocument.cpp
+++ b/kate/part/katedocument.cpp
@@ -1913,13 +1913,13 @@ void KateDocument::writeConfig(TDEConfig *config)
 
 void KateDocument::readConfig()
 {
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
   readConfig (config);
 }
 
 void KateDocument::writeConfig()
 {
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
   writeConfig (config);
   config->sync();
 }
@@ -1984,10 +1984,10 @@ void KateDocument::configDialog()
                                       i18n("Configure"),
                                       KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Help,
                                       KDialogBase::Ok,
-                                      kapp->mainWidget() );
+                                      tdeApp->mainWidget() );
 
 #ifndef TQ_WS_WIN //TODO: reenable
-  KWin::setIcons( kd->winId(), kapp->icon(), kapp->miniIcon() );
+  KWin::setIcons( kd->winId(), tdeApp->icon(), tdeApp->miniIcon() );
 #endif
 
   TQPtrList<KTextEditor::ConfigPage> editorPages;
@@ -2521,7 +2521,7 @@ bool KateDocument::save()
     // get the right permissions, start with safe default
     mode_t  perms = 0600;
     TDEIO::UDSEntry fentry;
-    if (TDEIO::NetAccess::stat (url(), fentry, kapp->mainWidget()))
+    if (TDEIO::NetAccess::stat (url(), fentry, tdeApp->mainWidget()))
     {
       kdDebug () << "stating succesfull: " << url() << endl;
       KFileItem item (fentry, url());
@@ -2530,8 +2530,8 @@ bool KateDocument::save()
 
     // first del existing file if any, than copy over the file we have
     // failure if a: the existing file could not be deleted, b: the file could not be copied
-    if ( (!TDEIO::NetAccess::exists( u, false, kapp->mainWidget() ) || TDEIO::NetAccess::del( u, kapp->mainWidget() ))
-          && TDEIO::NetAccess::file_copy( url(), u, perms, true, false, kapp->mainWidget() ) )
+    if ( (!TDEIO::NetAccess::exists( u, false, tdeApp->mainWidget() ) || TDEIO::NetAccess::del( u, tdeApp->mainWidget() ))
+          && TDEIO::NetAccess::file_copy( url(), u, perms, true, false, tdeApp->mainWidget() ) )
     {
       kdDebug(13020)<<"backing up successfull ("<<url().prettyURL()<<" -> "<<u.prettyURL()<<")"<<endl;
     }
diff --git a/kate/part/kateprinter.cpp b/kate/part/kateprinter.cpp
index a4fdd3627..e6c50e7b3 100644
--- a/kate/part/kateprinter.cpp
+++ b/kate/part/kateprinter.cpp
@@ -69,7 +69,7 @@ bool KatePrinter::print (KateDocument *doc)
   printer.addDialogPage( new KatePrintHeaderFooter(&printer, NULL) );
   printer.addDialogPage( new KatePrintLayout(&printer, NULL) );
 
-   if ( printer.setup( kapp->mainWidget(), i18n("Print %1").arg(printer.docName()) ) )
+   if ( printer.setup( tdeApp->mainWidget(), i18n("Print %1").arg(printer.docName()) ) )
    {
      KateRenderer renderer(doc);
      //renderer.config()->setSchema (1);
diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp
index 6716d079d..a055a00e5 100644
--- a/kate/part/kateschema.cpp
+++ b/kate/part/kateschema.cpp
@@ -155,12 +155,12 @@ class KateStyleListCaption : public TQListViewItem
 //BEGIN KateSchemaManager
 TQString KateSchemaManager::normalSchema ()
 {
-  return TDEApplication::kApplication()->aboutData()->appName () + TQString (" - Normal");
+  return tdeApp->aboutData()->appName () + TQString (" - Normal");
 }
 
 TQString KateSchemaManager::printingSchema ()
 {
-  return TDEApplication::kApplication()->aboutData()->appName () + TQString (" - Printing");
+  return tdeApp->aboutData()->appName () + TQString (" - Printing");
 }
 
 KateSchemaManager::KateSchemaManager ()
@@ -864,7 +864,7 @@ KateSchemaConfigPage::KateSchemaConfigPage( TQWidget *parent, KateDocument *doc
   hbHl = new TQHBox( this );
   layout->add (hbHl);
   hbHl->setSpacing( KDialog::spacingHint() );
-  lHl = new TQLabel( i18n("&Default schema for %1:").arg(TDEApplication::kApplication()->aboutData()->programName ()), hbHl );
+  lHl = new TQLabel( i18n("&Default schema for %1:").arg(tdeApp->aboutData()->programName ()), hbHl );
   defaultSchemaCombo = new TQComboBox( false, hbHl );
   lHl->setBuddy( defaultSchemaCombo );
 
diff --git a/kate/part/kateviewhelpers.cpp b/kate/part/kateviewhelpers.cpp
index 872e7467c..948040236 100644
--- a/kate/part/kateviewhelpers.cpp
+++ b/kate/part/kateviewhelpers.cpp
@@ -1151,7 +1151,7 @@ void KateIconBorder::showMarkMenu( uint line, const TQPoint& pos )
   {
      KateViewConfig::global()->setDefaultMarkType (vec[result-100]);
      // flush config, otherwise it isn't nessecarily done
-     TDEConfig *config = kapp->config();
+     TDEConfig *config = tdeApp->config();
      config->setGroup("Kate View Defaults");
      KateViewConfig::global()->writeConfig( config );
   }
diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp
index 4f4e5692d..cc1654cd6 100644
--- a/kate/part/test_regression.cpp
+++ b/kate/part/test_regression.cpp
@@ -365,7 +365,7 @@ KJS::Value OutputFunction::call(KJS::ExecState *exec, KJS::Object &thisObj, cons
 const char failureSnapshotPrefix[] = "testkateregressionrc-FS.";
 
 static TQString findMostRecentFailureSnapshot() {
-    TQDir dir(kapp->dirs()->saveLocation("config"),
+    TQDir dir(tdeApp->dirs()->saveLocation("config"),
              TQString(failureSnapshotPrefix)+"*",
              TQDir::Time, TQDir::Files);
     return dir[0].mid(sizeof failureSnapshotPrefix - 1);
@@ -906,7 +906,7 @@ static void pause(int msec)
     TQTime t;
     t.start();
     do {
-        kapp->processEvents();
+        tdeApp->processEvents();
     } while (t.elapsed() < msec);
 }
 
@@ -1068,7 +1068,7 @@ void RegressionTest::testStaticFile(const TQString & filename, const TQStringLis
 
     if (!script_error) goto bail_out;
 
-    if (m_showGui) kapp->processEvents();
+    if (m_showGui) tdeApp->processEvents();
 
     if ( m_genOutput ) {
         reportResult(checkOutput(filename+"-result"), "result");
diff --git a/kate/plugins/wordcompletion/docwordcompletion.cpp b/kate/plugins/wordcompletion/docwordcompletion.cpp
index 83933bfce..8ffa241fd 100644
--- a/kate/plugins/wordcompletion/docwordcompletion.cpp
+++ b/kate/plugins/wordcompletion/docwordcompletion.cpp
@@ -68,7 +68,7 @@ DocWordCompletionPlugin::DocWordCompletionPlugin( TQObject *parent,
 
 void DocWordCompletionPlugin::readConfig()
 {
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
   config->setGroup( "DocWordCompletion Plugin" );
   m_treshold = config->readNumEntry( "treshold", 3 );
   m_autopopup = config->readBoolEntry( "autopopup", true );
@@ -76,7 +76,7 @@ void DocWordCompletionPlugin::readConfig()
 
 void DocWordCompletionPlugin::writeConfig()
 {
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
   config->setGroup("DocWordCompletion Plugin");
   config->writeEntry("autopopup", m_autopopup );
   config->writeEntry("treshold", m_treshold );