Use tdeApp

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

15 files changed, 47 insertions, 47 deletions

diff --git a/khelpcenter/fontdialog.cpp b/khelpcenter/fontdialog.cpp
index 7acac556d..821cc0d05 100644
--- a/khelpcenter/fontdialog.cpp
+++ b/khelpcenter/fontdialog.cpp
@@ -148,7 +148,7 @@ void FontDialog::setupFontEncodingBox()
 
 void FontDialog::load()
 {
-	TDEConfig *cfg = kapp->config();
+	TDEConfig *cfg = tdeApp->config();
 	{
 		TDEConfigGroupSaver groupSaver( cfg, "HTML Settings" );
 
@@ -178,7 +178,7 @@ void FontDialog::load()
 
 void FontDialog::save()
 {
-	TDEConfig *cfg = kapp->config();
+	TDEConfig *cfg = tdeApp->config();
 	{
 		TDEConfigGroupSaver groupSaver( cfg, "General" );
 		cfg->writeEntry( "UseKonqSettings", false );
diff --git a/khelpcenter/glossary.cpp b/khelpcenter/glossary.cpp
index 30819d4a0..73d98d113 100644
--- a/khelpcenter/glossary.cpp
+++ b/khelpcenter/glossary.cpp
@@ -94,7 +94,7 @@ Glossary::Glossary( TQWidget *parent ) : TDEListView( parent )
 
 	m_sourceFile = View::View::langLookup( TQString::fromLatin1( "khelpcenter/glossary/index.docbook" ) );
 
-	m_config = kapp->config();
+	m_config = tdeApp->config();
 	m_config->setGroup( "Glossary" );
 
 }
@@ -142,7 +142,7 @@ int Glossary::glossaryCTime() const
 
 void Glossary::rebuildGlossaryCache()
 {
-	TDEMainWindow *mainWindow = dynamic_cast<TDEMainWindow *>( kapp->mainWidget() );
+	TDEMainWindow *mainWindow = dynamic_cast<TDEMainWindow *>( tdeApp->mainWidget() );
 	Q_ASSERT( mainWindow );
 	mainWindow->statusBar()->message( i18n( "Rebuilding cache..." ) );
 
@@ -172,7 +172,7 @@ void Glossary::meinprocExited( TDEProcess *meinproc )
 	
 	m_status = CacheOk;
 
-	TDEMainWindow *mainWindow = dynamic_cast<TDEMainWindow *>( kapp->mainWidget() );
+	TDEMainWindow *mainWindow = dynamic_cast<TDEMainWindow *>( tdeApp->mainWidget() );
 	Q_ASSERT( mainWindow );
 	mainWindow->statusBar()->message( i18n( "Rebuilding cache... done." ), 2000 );
 
diff --git a/khelpcenter/history.cpp b/khelpcenter/history.cpp
index 69e6521ae..0b2c67138 100644
--- a/khelpcenter/history.cpp
+++ b/khelpcenter/history.cpp
@@ -256,7 +256,7 @@ void History::fillForwardMenu()
 
 void History::fillGoMenu()
 {
-  TDEMainWindow *mainWindow = static_cast<TDEMainWindow *>( kapp->mainWidget() );
+  TDEMainWindow *mainWindow = static_cast<TDEMainWindow *>( tdeApp->mainWidget() );
   TQPopupMenu *goMenu = dynamic_cast<TQPopupMenu *>( mainWindow->guiFactory()->container( TQString::fromLatin1( "go" ), mainWindow ) );
   if ( !goMenu || m_goMenuIndex == -1 )
     return;
@@ -289,7 +289,7 @@ void History::fillGoMenu()
 
 void History::goMenuActivated( int id )
 {
-  TDEMainWindow *mainWindow = static_cast<TDEMainWindow *>( kapp->mainWidget() );
+  TDEMainWindow *mainWindow = static_cast<TDEMainWindow *>( tdeApp->mainWidget() );
   TQPopupMenu *goMenu = dynamic_cast<TQPopupMenu *>( mainWindow->guiFactory()->container( TQString::fromLatin1( "go" ), mainWindow ) );
   if ( !goMenu )
     return;
diff --git a/khelpcenter/htmlsearch/htmlsearch.cpp b/khelpcenter/htmlsearch/htmlsearch.cpp
index 72534bc6b..9b2f67abf 100644
--- a/khelpcenter/htmlsearch/htmlsearch.cpp
+++ b/khelpcenter/htmlsearch/htmlsearch.cpp
@@ -22,7 +22,7 @@ HTMLSearch::HTMLSearch()
 
 TQString HTMLSearch::dataPath(const TQString& _lang)
 {
-    return kapp->dirs()->saveLocation("data", TQString("khelpcenter/%1").arg(_lang));
+    return tdeApp->dirs()->saveLocation("data", TQString("khelpcenter/%1").arg(_lang));
 }
 
 
@@ -56,7 +56,7 @@ void HTMLSearch::scanDir(const TQString& dir)
         if (*it != "." && *it != "..")
         {
             scanDir(dir + *it + "/");
-            kapp->processEvents();
+            tdeApp->processEvents();
         }
 }
 
@@ -74,7 +74,7 @@ bool HTMLSearch::saveFilesList(const TQString& _lang)
 
     // add KDE help dirs
     if (config->readBoolEntry("KDE", true))
-        dirs = kapp->dirs()->findDirs("html", _lang + "/");
+        dirs = tdeApp->dirs()->findDirs("html", _lang + "/");
     kdDebug() << "got " << dirs.count() << " dirs\n";
 
     // TODO: Man and Info!!
@@ -232,7 +232,7 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
     // create progress dialog
     progress = new ProgressDialog(parent);
     progress->show();
-    kapp->processEvents();
+    tdeApp->processEvents();
 
     // create files list ----------------------------------------------
     if (!saveFilesList(_lang))
@@ -243,7 +243,7 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
     // run htdig ------------------------------------------------------
     TDEConfig *config = new TDEConfig("khelpcenterrc", true);
     TDEConfigGroupSaver saver(config, "htdig");
-    TQString exe = config->readPathEntry("htdig", kapp->dirs()->findExe("htdig"));
+    TQString exe = config->readPathEntry("htdig", tdeApp->dirs()->findExe("htdig"));
 
     if (exe.isEmpty())
     {
@@ -310,7 +310,7 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
         // execute htdig
         _proc->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout );
 
-        kapp->enter_loop();
+        tdeApp->enter_loop();
 
         if (!_proc->normalExit() || _proc->exitStatus() != 0)
 	{
@@ -322,13 +322,13 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
 
         // _filesDigged += CHUNK_SIZE;
         progress->setFilesDigged(_filesDigged);
-        kapp->processEvents();
+        tdeApp->processEvents();
     }
 
     progress->setState(2);
 
     // run htmerge -----------------------------------------------------
-    exe = config->readPathEntry("htmerge", kapp->dirs()->findExe("htmerge"));
+    exe = config->readPathEntry("htmerge", tdeApp->dirs()->findExe("htmerge"));
     if (exe.isEmpty())
     {
         delete config;
@@ -347,7 +347,7 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
 
     _proc->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout);
 
-    kapp->enter_loop();
+    tdeApp->enter_loop();
 
     if (!_proc->normalExit() || _proc->exitStatus() != 0)
     {
@@ -360,7 +360,7 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
     delete _proc;
 
     progress->setState(3);
-    kapp->processEvents();
+    tdeApp->processEvents();
 
     delete progress;
     delete config;
@@ -393,7 +393,7 @@ void HTMLSearch::htdigExited(TDEProcess *p)
 {
     kdDebug() << "htdig terminated " << p->exitStatus() << endl;
     _htdigRunning = false;
-    kapp->exit_loop();
+    tdeApp->exit_loop();
 }
 
 
@@ -401,7 +401,7 @@ void HTMLSearch::htmergeExited(TDEProcess *)
 {
   kdDebug() << "htmerge terminated" << endl;
   _htmergeRunning = false;
-  kapp->exit_loop();
+  tdeApp->exit_loop();
 }
 
 
@@ -415,7 +415,7 @@ void HTMLSearch::htsearchExited(TDEProcess *)
 {
   kdDebug() << "htsearch terminated" << endl;
   _htsearchRunning = false;
-  kapp->exit_loop();
+  tdeApp->exit_loop();
 }
 
 
@@ -432,7 +432,7 @@ TQString HTMLSearch::search(TQString _lang, TQString words, TQString method, int
   // run htsearch ----------------------------------------------------
   TDEConfig *config = new TDEConfig("khelpcenterrc", true);
   TDEConfigGroupSaver saver(config, "htdig");
-  TQString exe = config->readPathEntry("htsearch", kapp->dirs()->findExe("htsearch"));
+  TQString exe = config->readPathEntry("htsearch", tdeApp->dirs()->findExe("htsearch"));
   if (exe.isEmpty())
   {
       delete config;
@@ -454,7 +454,7 @@ TQString HTMLSearch::search(TQString _lang, TQString words, TQString method, int
 
   _proc->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout);
 
-  kapp->enter_loop();
+  tdeApp->enter_loop();
 
   if (!_proc->normalExit() || _proc->exitStatus() != 0)
     {
diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
index d51496cae..d737f2528 100644
--- a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
+++ b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
@@ -256,9 +256,9 @@ void TDEHTMLSearchConfig::load()
   TDEConfig *config = new TDEConfig("khelpcenterrc", true);
 
   config->setGroup("htdig");
-  htdigBin->lineEdit()->setText(config->readPathEntry("htdig", kapp->dirs()->findExe("htdig")));
-  htsearchBin->lineEdit()->setText(config->readPathEntry("htsearch", kapp->dirs()->findExe("htsearch")));
-  htmergeBin->lineEdit()->setText(config->readPathEntry("htmerge", kapp->dirs()->findExe("htmerge")));
+  htdigBin->lineEdit()->setText(config->readPathEntry("htdig", tdeApp->dirs()->findExe("htdig")));
+  htsearchBin->lineEdit()->setText(config->readPathEntry("htsearch", tdeApp->dirs()->findExe("htsearch")));
+  htmergeBin->lineEdit()->setText(config->readPathEntry("htmerge", tdeApp->dirs()->findExe("htmerge")));
 
   config->setGroup("Scope");
   indexKDE->setChecked(config->readBoolEntry("KDE", true));
@@ -310,9 +310,9 @@ void TDEHTMLSearchConfig::save()
 
 void TDEHTMLSearchConfig::defaults()
 {
-  htdigBin->lineEdit()->setText(kapp->dirs()->findExe("htdig"));
-  htsearchBin->lineEdit()->setText(kapp->dirs()->findExe("htsearch"));
-  htmergeBin->lineEdit()->setText(kapp->dirs()->findExe("htmerge"));
+  htdigBin->lineEdit()->setText(tdeApp->dirs()->findExe("htdig"));
+  htsearchBin->lineEdit()->setText(tdeApp->dirs()->findExe("htsearch"));
+  htmergeBin->lineEdit()->setText(tdeApp->dirs()->findExe("htmerge"));
 
   indexKDE->setChecked(true);
   indexMan->setChecked(false);
@@ -328,7 +328,7 @@ void TDEHTMLSearchConfig::defaults()
 
 void TDEHTMLSearchConfig::urlClicked(const TQString &url)
 {
-  kapp->invokeBrowser(url);
+  tdeApp->invokeBrowser(url);
 }
 
 
@@ -336,7 +336,7 @@ void TDEHTMLSearchConfig::generateIndex()
 {
   save();
 
-  TQString exe = kapp->dirs()->findExe("tdehtmlindex");
+  TQString exe = tdeApp->dirs()->findExe("tdehtmlindex");
   if (exe.isEmpty())
     return;
 
diff --git a/khelpcenter/htmlsearchconfig.cpp b/khelpcenter/htmlsearchconfig.cpp
index d7af38c07..d62e9fdb2 100644
--- a/khelpcenter/htmlsearchconfig.cpp
+++ b/khelpcenter/htmlsearchconfig.cpp
@@ -121,7 +121,7 @@ void HtmlSearchConfig::load( TDEConfig *config )
 {
   config->setGroup("htdig");
 
-  mHtsearchUrl->lineEdit()->setText(config->readPathEntry("htsearch", kapp->dirs()->findExe("htsearch")));
+  mHtsearchUrl->lineEdit()->setText(config->readPathEntry("htsearch", tdeApp->dirs()->findExe("htsearch")));
   mIndexerBin->lineEdit()->setText(config->readPathEntry("indexer"));
   mDbDir->lineEdit()->setText(config->readPathEntry("dbdir", "/opt/www/htdig/db/" ) );
 }
@@ -137,14 +137,14 @@ void HtmlSearchConfig::save( TDEConfig *config )
 
 void HtmlSearchConfig::defaults()
 {
-    mHtsearchUrl->lineEdit()->setText(kapp->dirs()->findExe("htsearch"));
+    mHtsearchUrl->lineEdit()->setText(tdeApp->dirs()->findExe("htsearch"));
     mIndexerBin->lineEdit()->setText("");
     mDbDir->lineEdit()->setText("/opt/www/htdig/db/" );
 }
 
 void HtmlSearchConfig::urlClicked(const TQString &url)
 {
-  kapp->invokeBrowser(url);
+  tdeApp->invokeBrowser(url);
 }
 
 } // End namespace KHC
diff --git a/khelpcenter/infotree.cpp b/khelpcenter/infotree.cpp
index 2c71d2bbe..83c2ce5ea 100644
--- a/khelpcenter/infotree.cpp
+++ b/khelpcenter/infotree.cpp
@@ -95,7 +95,7 @@ void InfoTree::build( NavigatorItem *parent )
   m_categoryItem = new NavigatorItem( entry, parent );
   m_categoryItem->setAutoDeleteDocEntry( true );
 
-  TDEConfig *cfg = kapp->config();
+  TDEConfig *cfg = tdeApp->config();
   cfg->setGroup( "Info pages" );
   TQStringList infoDirFiles = cfg->readListEntry( "Search paths" );
   // Default paths taken fron tdebase/tdeioslave/info/kde-info2html.conf
diff --git a/khelpcenter/kcmhelpcenter.cpp b/khelpcenter/kcmhelpcenter.cpp
index 63bea1668..5d03c92eb 100644
--- a/khelpcenter/kcmhelpcenter.cpp
+++ b/khelpcenter/kcmhelpcenter.cpp
@@ -240,12 +240,12 @@ KCMHelpCenter::KCMHelpCenter( KHC::SearchEngine *engine, TQWidget *parent,
 
   load();
 
-  bool success = kapp->dcopClient()->connectDCOPSignal( "khc_indexbuilder",
+  bool success = tdeApp->dcopClient()->connectDCOPSignal( "khc_indexbuilder",
       0, "buildIndexProgress()", "kcmhelpcenter",
       "slotIndexProgress()", false );
   if ( !success ) kdError() << "connect DCOP signal failed" << endl;
 
-  success = kapp->dcopClient()->connectDCOPSignal( "khc_indexbuilder",
+  success = tdeApp->dcopClient()->connectDCOPSignal( "khc_indexbuilder",
       0, "buildIndexError(TQString)", "kcmhelpcenter",
       "slotIndexError(TQString)", false );
   if ( !success ) kdError() << "connect DCOP signal failed" << endl;
diff --git a/khelpcenter/khc_indexbuilder.cpp b/khelpcenter/khc_indexbuilder.cpp
index b6b961785..df7a2a3aa 100644
--- a/khelpcenter/khc_indexbuilder.cpp
+++ b/khelpcenter/khc_indexbuilder.cpp
@@ -143,21 +143,21 @@ void IndexBuilder::sendErrorSignal( const TQString &error )
   TQByteArray params;
   TQDataStream stream( params, IO_WriteOnly );
   stream << error;
-  kapp->dcopClient()->emitDCOPSignal("buildIndexError(TQString)", params );  
+  tdeApp->dcopClient()->emitDCOPSignal("buildIndexError(TQString)", params );  
 }
 
 void IndexBuilder::sendProgressSignal()
 {
   kdDebug(1402) << "IndexBuilder::sendProgressSignal()" << endl;
  
-  kapp->dcopClient()->emitDCOPSignal("buildIndexProgress()", TQByteArray() );  
+  tdeApp->dcopClient()->emitDCOPSignal("buildIndexProgress()", TQByteArray() );  
 }
 
 void IndexBuilder::quit()
 {
   kdDebug(1402) << "IndexBuilder::quit()" << endl;
 
-  kapp->quit();
+  tdeApp->quit();
 }
 
 
diff --git a/khelpcenter/mainwindow.cpp b/khelpcenter/mainwindow.cpp
index 0bfc80118..909dbca17 100644
--- a/khelpcenter/mainwindow.cpp
+++ b/khelpcenter/mainwindow.cpp
@@ -130,7 +130,7 @@ MainWindow::MainWindow()
     mSplitter->setSizes(sizes);
     setGeometry(366, 0, 800, 600);
 
-    TDEConfig *cfg = kapp->config();
+    TDEConfig *cfg = tdeApp->config();
     {
       TDEConfigGroupSaver groupSaver( cfg, "General" );
       if ( cfg->readBoolEntry( "UseKonqSettings", true ) ) {
@@ -447,7 +447,7 @@ void MainWindow::updateZoomActions()
   actionCollection()->action( "incFontSizes" )->setEnabled( mDoc->zoomFactor() + mDoc->zoomStepping() <= 300 );
   actionCollection()->action( "decFontSizes" )->setEnabled( mDoc->zoomFactor() - mDoc->zoomStepping() >= 20 );
 
-  TDEConfig *cfg = kapp->config();
+  TDEConfig *cfg = tdeApp->config();
   {
     TDEConfigGroupSaver groupSaver( cfg, "General" );
     cfg->writeEntry( "Font zoom factor", mDoc->zoomFactor() );
diff --git a/khelpcenter/navigator.cpp b/khelpcenter/navigator.cpp
index 5860e9af7..7568736d6 100644
--- a/khelpcenter/navigator.cpp
+++ b/khelpcenter/navigator.cpp
@@ -80,7 +80,7 @@ Navigator::Navigator( View *view, TQWidget *parent, const char *name )
    : TQWidget( parent, name ), mIndexDialog( 0 ),
      mView( view ), mSelected( false )
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("General");
     mShowMissingDocs = config->readBoolEntry("ShowMissingDocs",false);
 
diff --git a/khelpcenter/plugintraverser.cpp b/khelpcenter/plugintraverser.cpp
index 80c2e33cb..337aa39d4 100644
--- a/khelpcenter/plugintraverser.cpp
+++ b/khelpcenter/plugintraverser.cpp
@@ -73,7 +73,7 @@ void PluginTraverser::process( DocEntry *entry )
       appItem = new NavigatorAppItem( entry, mListView, mCurrentItem );
     else
       appItem = new NavigatorAppItem( entry, mParentItem, mCurrentItem );
-    TDEConfig *cfg = kapp->config();
+    TDEConfig *cfg = tdeApp->config();
     cfg->setGroup( "General" );
     appItem->setRelpath( cfg->readPathEntry( "AppsRoot" ) );
     mCurrentItem = appItem;
diff --git a/khelpcenter/scrollkeepertreebuilder.cpp b/khelpcenter/scrollkeepertreebuilder.cpp
index 051a99231..2f8a9775f 100644
--- a/khelpcenter/scrollkeepertreebuilder.cpp
+++ b/khelpcenter/scrollkeepertreebuilder.cpp
@@ -44,7 +44,7 @@ ScrollKeeperTreeBuilder::ScrollKeeperTreeBuilder( TQObject *parent, const char *
 
 void ScrollKeeperTreeBuilder::loadConfig()
 {
-  TDEConfig *cfg = kapp->config();
+  TDEConfig *cfg = tdeApp->config();
   {
     TDEConfigGroupSaver groupSaver( cfg, "ScrollKeeper" );
     mShowEmptyDirs = cfg->readBoolEntry( "ShowEmptyDirs", false );
diff --git a/khelpcenter/searchengine.cpp b/khelpcenter/searchengine.cpp
index 46ce57304..a99926dfe 100644
--- a/khelpcenter/searchengine.cpp
+++ b/khelpcenter/searchengine.cpp
@@ -366,7 +366,7 @@ bool SearchEngine::search( TQString words, TQString method, int matches,
     mProc->start(TDEProcess::NotifyOnExit, TDEProcess::All);
 
     while (mSearchRunning && mProc->isRunning())
-      kapp->processEvents();
+      tdeApp->processEvents();
 
     if ( !mProc->normalExit() || mProc->exitStatus() != 0 ) {
       kdError() << "Unable to run search program '" << commonSearchProgram
diff --git a/khelpcenter/view.cpp b/khelpcenter/view.cpp
index 49135e0b0..21def32d3 100644
--- a/khelpcenter/view.cpp
+++ b/khelpcenter/view.cpp
@@ -62,7 +62,7 @@ View::~View()
 
 void View::copySelectedText()
 {
-  kapp->clipboard()->setText( selectedText() );
+  tdeApp->clipboard()->setText( selectedText() );
 }
 
 bool View::openURL( const KURL &url )
@@ -374,7 +374,7 @@ KURL View::urlFromLinkNode( const DOM::Node &n ) const
 
 void View::slotReload( const KURL &url )
 {
-  const_cast<TDEHTMLSettings *>( settings() )->init( kapp->config() );
+  const_cast<TDEHTMLSettings *>( settings() )->init( tdeApp->config() );
   KParts::URLArgs args = browserExtension()->urlArgs();
   args.reload = true;
   browserExtension()->setURLArgs( args );