1 files changed, 21 insertions, 21 deletions

diff --git a/src/dbviewer.cpp b/src/dbviewer.cpp
index 4e53574..4e128c6 100644
--- a/src/dbviewer.cpp
+++ b/src/dbviewer.cpp
@@ -18,17 +18,17 @@
 #include <tqlayout.h>
 #include <tqpopupmenu.h>
 
-#include <ktoolbarbutton.h> //ctor
-#include <ktempfile.h>
+#include <tdetoolbarbutton.h> //ctor
+#include <tdetempfile.h>
 #include <ktempdir.h>
-#include <klistviewsearchline.h>
-#include <klistview.h>
+#include <tdelistviewsearchline.h>
+#include <tdelistview.h>
 #include <kprogress.h>
 
 #include <dirent.h>
 #include <zlib.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 
@@ -70,16 +70,16 @@ KlamDB::KlamDB( TQWidget* parent, const char* name, bool modal, WFlags fl )
     
     dblayout->addMultiCellWidget( tabBrowser, 0, 1, 1, 1 );
         
-    KToolBarButton *button;
-    KToolBar* searchToolBar = new KToolBar( privateLayoutWidget );
+    TDEToolBarButton *button;
+    TDEToolBar* searchToolBar = new TDEToolBar( privateLayoutWidget );
     searchToolBar->setMovingEnabled(false);
     searchToolBar->setFlat(true);
     searchToolBar->setIconSize( 16 );
     searchToolBar->setEnableContextMenu( false );
 
-    button = new KToolBarButton( "locationbar_erase", 0, searchToolBar );
+    button = new TDEToolBarButton( "locationbar_erase", 0, searchToolBar );
 
-    VirusList = new KListView( privateLayoutWidget, "VirusList" );
+    VirusList = new TDEListView( privateLayoutWidget, "VirusList" );
     VirusList->addColumn( i18n( "All Known Viruses" ),150 );
     connect(VirusList, SIGNAL( doubleClicked( TQListViewItem * , const TQPoint &, int ) ),
                     this, SLOT(slotOpenTab(TQListViewItem * , const TQPoint &, int )) );
@@ -92,19 +92,19 @@ KlamDB::KlamDB( TQWidget* parent, const char* name, bool modal, WFlags fl )
 
     TQString iconPath = locate("cache", KMimeType::favIconForURL("http://www.viruspool.net")+".png");
     if ( iconPath.isEmpty() )
-      vicon = SmallIcon("find");
+      vicon = SmallIcon("edit-find");
     else
       vicon = TQPixmap( iconPath );
 
     iconPath = locate("cache", KMimeType::favIconForURL("http://www.google.com")+".png");
     if ( iconPath.isEmpty() )
-      gicon = SmallIcon("find");
+      gicon = SmallIcon("edit-find");
     else
       gicon = TQPixmap( iconPath );
 
     iconPath = locate("cache", KMimeType::favIconForURL("http://www.trendmicro.com")+".png");
     if ( iconPath.isEmpty() )
-      ticon = SmallIcon("find");
+      ticon = SmallIcon("edit-find");
     else
       ticon = TQPixmap( iconPath );
 
@@ -116,7 +116,7 @@ KlamDB::KlamDB( TQWidget* parent, const char* name, bool modal, WFlags fl )
     connect(VirusList, SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint& , int ) ), 
     this, SLOT( slotRMB( TQListViewItem *, const TQPoint &, int ) ) );
 
-    kLineEdit1 = new KListViewSearchLine( (TQWidget *)searchToolBar, VirusList,"klinedit1");
+    kLineEdit1 = new TDEListViewSearchLine( (TQWidget *)searchToolBar, VirusList,"klinedit1");
     TQValueList<int> columns;
         columns.append(0);
     kLineEdit1->setSearchColumns(columns);
@@ -153,7 +153,7 @@ void KlamDB::languageChange()
     tabBrowser->changeTab( tab, i18n( "Info" ) );
     VirusList->header()->setLabel( 0, i18n( "All Known Viruses" ) );
     VirusList->clear();
-    /*KListViewItem * item =*/ new KListViewItem( VirusList, 0 );
+    /*TDEListViewItem * item =*/ new TDEListViewItem( VirusList, 0 );
     //item->setText( 0, tr( "New Item" ) );
 
 }
@@ -698,7 +698,7 @@ void KlamDB::shouldIShow(TQWidget * current)
     TQString location;
 
     if ((current == this) && (!(loadinprogress))){
-        TQString db = kmain->freshklam->getCurrentDBDir();
+        TQString db = tdemain->freshklam->getCurrentDBDir();
     
         if (checkdir((const char *)db) == -1){
             kdDebug() << "returned -1" << endl;
@@ -732,7 +732,7 @@ void KlamDB::shouldIShow(TQWidget * current)
             prog->setProgress (count);
             kapp->processEvents();
 
-//             TQString db = kmain->freshklam->getCurrentDBDir();
+//             TQString db = tdemain->freshklam->getCurrentDBDir();
 
             listdir((const char *)db);
 
@@ -754,7 +754,7 @@ void KlamDB::shouldIShow(TQWidget * current)
           
             loadinprogress = false;
             // Default english
-            TQString location = locate( "data", "klamav/about/main-" + KGlobal::locale()->language() + ".html" );
+            TQString location = locate( "data", "klamav/about/main-" + TDEGlobal::locale()->language() + ".html" );
             if( location != TQString::null )
                 homepage->openURL( location );
             else
@@ -776,7 +776,7 @@ void KlamDB::addVirusName(char *start)
         prog->setProgress (count);
         kapp->processEvents();
     }
-    new KListViewItem( VirusList, TQString(start));
+    new TDEListViewItem( VirusList, TQString(start));
     kapp->processEvents();
 
 }
@@ -792,7 +792,7 @@ unsigned int  KlamDB::getSigNos()
     TQString dbdir;
     TQString db;
 
-    KConfig* config = KGlobal::config();
+    TDEConfig* config = TDEGlobal::config();
     config->setGroup("Freshklam");
     lastDownloadPaths = config->readListEntry("lastDownloadPaths");
     dbdir = lastDownloadPaths.first();
@@ -896,7 +896,7 @@ void KlamDB::slotOpenHome()
 //    else
         setFocus();
         
-    TQString location = locate( "data", "klamav/about/wait-" + KGlobal::locale()->language() + ".html" );
+    TQString location = locate( "data", "klamav/about/wait-" + TDEGlobal::locale()->language() + ".html" );
     if( location != TQString::null )
        homepage->openURL( location );
     else
@@ -956,7 +956,7 @@ void KlamDB::slotTrendMicro()
 
 void KlamDB::slotExternal(TQString name,TQString service)
 {
-    kmain->showVirusBrowser();
+    tdemain->showVirusBrowser();
     shouldIShow(this);
     TQString prefix;
     if (service == "VirusPool")