Use tdeAppHEADmaster

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

11 files changed, 26 insertions, 26 deletions

diff --git a/src/configdialog.cpp b/src/configdialog.cpp
index 3ab3dbb..7150dd0 100644
--- a/src/configdialog.cpp
+++ b/src/configdialog.cpp
@@ -38,7 +38,7 @@ email                : [email protected]
 #include <tqtooltip.h>
 #include <tqvbox.h>
 
-#include <tdeapplication.h> //kapp
+#include <tdeapplication.h> //tdeApp
 #include <kcombobox.h>
 #include <kiconloader.h>
 #include <klineedit.h>
diff --git a/src/dbviewer.cpp b/src/dbviewer.cpp
index 5216cbd..bffb66e 100644
--- a/src/dbviewer.cpp
+++ b/src/dbviewer.cpp
@@ -707,7 +707,7 @@ void KlamDB::shouldIShow(TQWidget * current)
 	    /* Stylesheets */
 	    res = res.arg( locate( "data", "klamav/about/klamav.css" ) );
 	    res = res.arg( locate( "data", "tdeui/about/kde_infopage.css" ) );
-	    if ( kapp->reverseLayout() )
+	    if ( tdeApp->reverseLayout() )
 		res = res.arg( "@import \"%1\";" ).arg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) );
 	    else
 		res = res.arg( "" );
@@ -734,7 +734,7 @@ void KlamDB::shouldIShow(TQWidget * current)
 	    /* Stylesheets */
 	    res = res.arg( locate( "data", "klamav/about/klamav.css" ) );
 	    res = res.arg( locate( "data", "tdeui/about/kde_infopage.css" ) );
-	    if ( kapp->reverseLayout() )
+	    if ( tdeApp->reverseLayout() )
 		res = res.arg( "@import \"%1\";" ).arg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) );
 	    else
 		res = res.arg( "" );
@@ -767,7 +767,7 @@ void KlamDB::shouldIShow(TQWidget * current)
                 VirusList->clear();
             count = 0;
             prog->setProgress (count);
-            kapp->processEvents();
+            tdeApp->processEvents();
 
 //             TQString db = tdemain->freshklam->getCurrentDBDir();
 
@@ -797,7 +797,7 @@ void KlamDB::shouldIShow(TQWidget * current)
 	    /* Stylesheets */
 	    res = res.arg( locate( "data", "klamav/about/klamav.css" ) );
 	    res = res.arg( locate( "data", "tdeui/about/kde_infopage.css" ) );
-	    if ( kapp->reverseLayout() )
+	    if ( tdeApp->reverseLayout() )
 		res = res.arg( "@import \"%1\";" ).arg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) );
 	    else
 		res = res.arg( "" );
@@ -824,15 +824,15 @@ void KlamDB::addVirusName(char *start)
 
     count++;
     
-    kapp->processEvents();
+    tdeApp->processEvents();
     if ((count % 500) == 0){
         //progress->setLabel("Loading " + TQString(start));
         progress->setLabel( i18n( "Loading ClamAV's Database of Virus Signatures") );
         prog->setProgress (count);
-        kapp->processEvents();
+        tdeApp->processEvents();
     }
     new TDEListViewItem( VirusList, TQString(start));
-    kapp->processEvents();
+    tdeApp->processEvents();
 
 }
 
diff --git a/src/directorylist.cpp b/src/directorylist.cpp
index 71dd70a..925e0dd 100644
--- a/src/directorylist.cpp
+++ b/src/directorylist.cpp
@@ -265,8 +265,8 @@ DeviceItem::DeviceItem( TQListViewItem *parent, CollectionSetup *collection, con
 {
     collectionSetup = collection;
 
-    if (!kapp->dcopClient()->isAttached())
-        kapp->dcopClient()->attach();
+    if (!tdeApp->dcopClient()->isAttached())
+        tdeApp->dcopClient()->attach();
     else
 		////kdDebug() << "attached" << endl;
 
@@ -459,8 +459,8 @@ void
 DeviceItem::mountDevice( const TQString & device)
 {
 
-    if (!kapp->dcopClient()->isAttached())
-        kapp->dcopClient()->attach();
+    if (!tdeApp->dcopClient()->isAttached())
+        tdeApp->dcopClient()->attach();
 
 	TQString mountpoint;
 	mountpoint = getMountPoint(device);
diff --git a/src/freshklam.cpp b/src/freshklam.cpp
index 175893e..b90a11f 100644
--- a/src/freshklam.cpp
+++ b/src/freshklam.cpp
@@ -470,8 +470,8 @@ void Freshklam::childExited()
     int status = childproc->exitStatus();
 
 /*       int winid = 0;
-        if (TDEApplication::kApplication()->mainWidget()) {
-            winid = TDEApplication::kApplication()->mainWidget()->winId();
+        if (tdeApp->mainWidget()) {
+            winid = tdeApp->mainWidget()->winId();
         }*/
     finish();
 
diff --git a/src/klamav.cpp b/src/klamav.cpp
index c2fe4ec..edce482 100644
--- a/src/klamav.cpp
+++ b/src/klamav.cpp
@@ -101,7 +101,7 @@ Klamav::Klamav()
 	scanner_menu->insertItem( SmallIcon("xclock"), i18n("&Schedule scan..."), this, TQ_SLOT(slotScheduleScan()) );
 	scanner_menu->insertItem( SmallIcon("configure"), i18n("&Options..."), this, TQ_SLOT(slotOptions()) );
 	scanner_menu->insertSeparator();
-	scanner_menu->insertItem( SmallIcon("application-exit"), i18n("&Quit"), kapp, TQ_SLOT(quit()) );
+	scanner_menu->insertItem( SmallIcon("application-exit"), i18n("&Quit"), tdeApp, TQ_SLOT(quit()) );
 
 	tabs_menu = new TDEPopupMenu(this);
 	tabs_menu->setCheckable(true);
@@ -156,7 +156,7 @@ Klamav::Klamav()
 
 	KStdAction::quit(this, TQ_SLOT(shuttingDown()), actionCollection());
 
-  	if (TDEApplication::kApplication()->isRestored()){
+  	if (tdeApp->isRestored()){
 		hide();
 	}else{
 		show();
@@ -180,7 +180,7 @@ Klamav::~Klamav()
 {
   klamonacc->stop();
   KlamavConfig::writeConfig();
-	kapp->quit();
+	tdeApp->quit();
 }
 
 void  Klamav::shuttingDown(){
diff --git a/src/klamonacc_config.ui.h b/src/klamonacc_config.ui.h
index 7201e8d..5ce9663 100644
--- a/src/klamonacc_config.ui.h
+++ b/src/klamonacc_config.ui.h
@@ -19,7 +19,7 @@
 void KlamOnAccConfig::reconfigurePaths() {
     // Borrowed from amaroK (collectionbrowser.cpp)
     KDialogBase dialog( this, 0, false );
-    // kapp->setTopWidget( &dialog );
+    // tdeApp->setTopWidget( &dialog );
     dialog.setCaption( "Configure Directories Watchlist" );
     
     TDEConfig *config = TDEGlobal::config();
diff --git a/src/klamscan.cpp b/src/klamscan.cpp
index 44ca38c..e89fa3e 100644
--- a/src/klamscan.cpp
+++ b/src/klamscan.cpp
@@ -182,9 +182,9 @@ Klamscan::Klamscan(TQWidget *parent, const char *name)
 
 
      // Register with DCOP
-     if ( !kapp->dcopClient()->isRegistered() ) {
-         kapp->dcopClient()->registerAs( "dcopklamscan" );
-         kapp->dcopClient()->setDefaultObject( objId() );
+     if ( !tdeApp->dcopClient()->isRegistered() ) {
+         tdeApp->dcopClient()->registerAs( "dcopklamscan" );
+         tdeApp->dcopClient()->setDefaultObject( objId() );
      }
 
 
diff --git a/src/scanviewer.cpp b/src/scanviewer.cpp
index 3637225..fab9a1c 100644
--- a/src/scanviewer.cpp
+++ b/src/scanviewer.cpp
@@ -871,10 +871,10 @@ void ScanViewer::slotCancelScanTime()
 int ScanViewer::countFiles( TQDir & root)
 {
 
-    kapp->processEvents();
+    tdeApp->processEvents();
 
     if (!(calculateTime) || (scanCancelled)){
-//         kapp->processEvents();
+//         tdeApp->processEvents();
         return 0;
     }
     TQStringList entries = root.entryList( TQDir::Dirs | TQDir::Files | TQDir::Hidden);
diff --git a/src/schedule.cpp b/src/schedule.cpp
index 80395d8..282f3ca 100644
--- a/src/schedule.cpp
+++ b/src/schedule.cpp
@@ -187,7 +187,7 @@ void Schedule::slotAddDateToCombo(TQDate newdate)
 
 	DCOPClient* client = TDEApplication::dcopClient();
 	client->attach();
-	client->registerAs(kapp->name());
+	client->registerAs(tdeApp->name());
 
 
 	
diff --git a/src/viewer.cpp b/src/viewer.cpp
index 3e656cf..e691c9a 100644
--- a/src/viewer.cpp
+++ b/src/viewer.cpp
@@ -104,7 +104,7 @@ void Viewer::displayInExternalBrowser(const KURL &url, const TQString &mimetype)
 /*   if (Settings::externalBrowserUseKdeDefault())
    {*/
        if (mimetype.isEmpty()) 
-           kapp->invokeBrowser(url.url(), "0");
+           tdeApp->invokeBrowser(url.url(), "0");
        else
            KRun::runURL(url, mimetype, false, false);
 /*   }
diff --git a/src/welcome.cpp b/src/welcome.cpp
index 9b45367..500088d 100644
--- a/src/welcome.cpp
+++ b/src/welcome.cpp
@@ -34,7 +34,7 @@ Aboutklamav::Aboutklamav(TQWidget *parent, const char *name)
 	/* Stylesheets */
 	res = res.arg( locate( "data", "klamav/about/klamav.css" ) );
 	res = res.arg( locate( "data", "tdeui/about/kde_infopage.css" ) );
-	if ( kapp->reverseLayout() )
+	if ( tdeApp->reverseLayout() )
 		res = res.arg( "@import \"%1\";" ).arg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) );
 	else
 		res = res.arg( "" );