Conversion KDE3->TDE

Signed-off-by: Mavridis Philippe <[email protected]>
author: Mavridis Philippe <[email protected]> 2021-01-13 19:34:09 +0200
committer: Mavridis Philippe <[email protected]> 2021-01-13 19:34:09 +0200
commit: 4c04a441814c7d1dda08f6075ab4e09dc05541df (patch)
tree: cf8a3dbd77114c416255d3995cd1b047072ef26a /src
parent: 357ddeb8afd82d69ef871c146f4fc8f2c67fb17e (diff)
download: klamav-4c04a441814c7d1dda08f6075ab4e09dc05541df.tar.gz
klamav-4c04a441814c7d1dda08f6075ab4e09dc05541df.zip
67 files changed, 683 insertions, 683 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index edbc088..cd01a64 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,7 +19,7 @@ INCLUDES         = $(all_includes)
 klamav_LDFLAGS = $(KDE_RPATH) $(all_libraries) 
 
 # the libraries to link against.
-klamav_LDADD   = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KHTML) $(LIB_SQLITE) $(LIB_SQLITE_LOCAL) $(LIB_CLAM)
+klamav_LDADD   = $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEHTML) $(LIB_SQLITE) $(LIB_SQLITE_LOCAL) $(LIB_CLAM)
 
 # which sources should be compiled for klamav
 klamav_SOURCES =  main.cpp klamav.cpp freshklam.cpp sigtool.cpp klamscan.cpp \
diff --git a/src/Makefile.in b/src/Makefile.in
index 4d94125..9f8af3b 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -235,24 +235,24 @@ LIBZ = @LIBZ@
 LIB_CLAM = @LIB_CLAM@
 LIB_KAB = @LIB_KAB@
 LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
+LIB_TDECORE = @LIB_TDECORE@
 LIB_KDED = @LIB_KDED@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KDNSSD = @LIB_KDNSSD@
+LIB_TDEPIM = @LIB_TDEPIM@
+LIB_TDEPRINT = @LIB_TDEPRINT@
+LIB_TDEUI = @LIB_TDEUI@
+LIB_TDEDNSSD = @LIB_TDEDNSSD@
 LIB_KFILE = @LIB_KFILE@
 LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMPROXY = @LIB_KIMPROXY@
-LIB_KIO = @LIB_KIO@
+LIB_TDEHTML = @LIB_TDEHTML@
+LIB_TDEIMPROXY = @LIB_TDEIMPROXY@
+LIB_TDEIO = @LIB_TDEIO@
 LIB_KJS = @LIB_KJS@
 LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUNITTEST = @LIB_KUNITTEST@
-LIB_KUTILS = @LIB_KUTILS@
+LIB_TDEPARTS = @LIB_TDEPARTS@
+LIB_TDESPELL = @LIB_TDESPELL@
+LIB_TDESYCOCA = @LIB_TDESYCOCA@
+LIB_TDEUNITTEST = @LIB_TDEUNITTEST@
+LIB_TDEUTILS = @LIB_TDEUTILS@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
@@ -264,7 +264,7 @@ LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
-MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+MAKETDEWIDGETS = @MAKETDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MEINPROC = @MEINPROC@
 MOC = @MOC@
@@ -369,7 +369,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -412,7 +412,7 @@ INCLUDES = $(all_includes)
 klamav_LDFLAGS = $(KDE_RPATH) $(all_libraries) 
 
 # the libraries to link against.
-klamav_LDADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KHTML) $(LIB_SQLITE) $(LIB_SQLITE_LOCAL) $(LIB_CLAM)
+klamav_LDADD = $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEHTML) $(LIB_SQLITE) $(LIB_SQLITE_LOCAL) $(LIB_CLAM)
 
 # which sources should be compiled for klamav
 #>- klamav_SOURCES = main.cpp klamav.cpp freshklam.cpp sigtool.cpp klamscan.cpp \
@@ -1366,7 +1366,7 @@ kuarantine.lo: kuarantine.moc
 firstrunwizard.cpp: $(srcdir)/firstrunwizard.ui firstrunwizard.h firstrunwizard.moc
 	rm -f firstrunwizard.cpp
 	echo '#include <kdialog.h>' > firstrunwizard.cpp
-	echo '#include <klocale.h>' >> firstrunwizard.cpp
+	echo '#include <tdelocale.h>' >> firstrunwizard.cpp
 	$(UIC) -tr ${UIC_TR} -i firstrunwizard.h $(srcdir)/firstrunwizard.ui > firstrunwizard.cpp.temp ; ret=$$?; \
 	$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" firstrunwizard.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_firstrunwizard,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> firstrunwizard.cpp ;\
 	rm -f firstrunwizard.cpp.temp ;\
@@ -1381,7 +1381,7 @@ firstrunwizard.moc: firstrunwizard.h
 specialfiletypes.cpp: $(srcdir)/specialfiletypes.ui specialfiletypes.h specialfiletypes.moc
 	rm -f specialfiletypes.cpp
 	echo '#include <kdialog.h>' > specialfiletypes.cpp
-	echo '#include <klocale.h>' >> specialfiletypes.cpp
+	echo '#include <tdelocale.h>' >> specialfiletypes.cpp
 	$(UIC) -tr ${UIC_TR} -i specialfiletypes.h $(srcdir)/specialfiletypes.ui > specialfiletypes.cpp.temp ; ret=$$?; \
 	$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" specialfiletypes.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_specialfiletypes,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> specialfiletypes.cpp ;\
 	rm -f specialfiletypes.cpp.temp ;\
@@ -1396,7 +1396,7 @@ specialfiletypes.moc: specialfiletypes.h
 autoscanoptions.cpp: $(srcdir)/autoscanoptions.ui autoscanoptions.h autoscanoptions.moc
 	rm -f autoscanoptions.cpp
 	echo '#include <kdialog.h>' > autoscanoptions.cpp
-	echo '#include <klocale.h>' >> autoscanoptions.cpp
+	echo '#include <tdelocale.h>' >> autoscanoptions.cpp
 	$(UIC) -tr ${UIC_TR} -i autoscanoptions.h $(srcdir)/autoscanoptions.ui > autoscanoptions.cpp.temp ; ret=$$?; \
 	$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" autoscanoptions.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_autoscanoptions,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> autoscanoptions.cpp ;\
 	rm -f autoscanoptions.cpp.temp ;\
@@ -1417,7 +1417,7 @@ klamavconfig.h: $(srcdir)/klamavconfig.kcfg $(srcdir)/klamavconfig.kcfgc $(KCFG_
 archivetypes.cpp: $(srcdir)/archivetypes.ui archivetypes.h archivetypes.moc
 	rm -f archivetypes.cpp
 	echo '#include <kdialog.h>' > archivetypes.cpp
-	echo '#include <klocale.h>' >> archivetypes.cpp
+	echo '#include <tdelocale.h>' >> archivetypes.cpp
 	$(UIC) -tr ${UIC_TR} -i archivetypes.h $(srcdir)/archivetypes.ui > archivetypes.cpp.temp ; ret=$$?; \
 	$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" archivetypes.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_archivetypes,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> archivetypes.cpp ;\
 	rm -f archivetypes.cpp.temp ;\
@@ -1432,7 +1432,7 @@ archivetypes.moc: archivetypes.h
 logoptions.cpp: $(srcdir)/logoptions.ui logoptions.h logoptions.moc
 	rm -f logoptions.cpp
 	echo '#include <kdialog.h>' > logoptions.cpp
-	echo '#include <klocale.h>' >> logoptions.cpp
+	echo '#include <tdelocale.h>' >> logoptions.cpp
 	$(UIC) -tr ${UIC_TR} -i logoptions.h $(srcdir)/logoptions.ui > logoptions.cpp.temp ; ret=$$?; \
 	$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" logoptions.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_logoptions,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> logoptions.cpp ;\
 	rm -f logoptions.cpp.temp ;\
@@ -1447,7 +1447,7 @@ logoptions.moc: logoptions.h
 archivelimits.cpp: $(srcdir)/archivelimits.ui archivelimits.h archivelimits.moc
 	rm -f archivelimits.cpp
 	echo '#include <kdialog.h>' > archivelimits.cpp
-	echo '#include <klocale.h>' >> archivelimits.cpp
+	echo '#include <tdelocale.h>' >> archivelimits.cpp
 	$(UIC) -tr ${UIC_TR} -i archivelimits.h $(srcdir)/archivelimits.ui > archivelimits.cpp.temp ; ret=$$?; \
 	$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" archivelimits.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_archivelimits,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> archivelimits.cpp ;\
 	rm -f archivelimits.cpp.temp ;\
diff --git a/src/about/Makefile.in b/src/about/Makefile.in
index 2828a4f..154e6c8 100644
--- a/src/about/Makefile.in
+++ b/src/about/Makefile.in
@@ -149,24 +149,24 @@ LIBZ = @LIBZ@
 LIB_CLAM = @LIB_CLAM@
 LIB_KAB = @LIB_KAB@
 LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
+LIB_TDECORE = @LIB_TDECORE@
 LIB_KDED = @LIB_KDED@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KDNSSD = @LIB_KDNSSD@
+LIB_TDEPIM = @LIB_TDEPIM@
+LIB_TDEPRINT = @LIB_TDEPRINT@
+LIB_TDEUI = @LIB_TDEUI@
+LIB_TDEDNSSD = @LIB_TDEDNSSD@
 LIB_KFILE = @LIB_KFILE@
 LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMPROXY = @LIB_KIMPROXY@
-LIB_KIO = @LIB_KIO@
+LIB_TDEHTML = @LIB_TDEHTML@
+LIB_TDEIMPROXY = @LIB_TDEIMPROXY@
+LIB_TDEIO = @LIB_TDEIO@
 LIB_KJS = @LIB_KJS@
 LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUNITTEST = @LIB_KUNITTEST@
-LIB_KUTILS = @LIB_KUTILS@
+LIB_TDEPARTS = @LIB_TDEPARTS@
+LIB_TDESPELL = @LIB_TDESPELL@
+LIB_TDESYCOCA = @LIB_TDESYCOCA@
+LIB_TDEUNITTEST = @LIB_TDEUNITTEST@
+LIB_TDEUTILS = @LIB_TDEUTILS@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
@@ -178,7 +178,7 @@ LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
-MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+MAKETDEWIDGETS = @MAKETDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MEINPROC = @MEINPROC@
 MOC = @MOC@
@@ -283,7 +283,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/src/aboutklamav.cpp b/src/aboutklamav.cpp
index e06c18d..793b1f4 100644
--- a/src/aboutklamav.cpp
+++ b/src/aboutklamav.cpp
@@ -7,7 +7,7 @@
 #include "tabwidget.h"
 #include "version.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kstandarddirs.h>
 #include <kstandarddirs.h>
diff --git a/src/aboutklamav.h b/src/aboutklamav.h
index 0d3452c..a04f106 100644
--- a/src/aboutklamav.h
+++ b/src/aboutklamav.h
@@ -9,13 +9,13 @@
 #include <config.h>
 #endif
 
-#include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdeapplication.h>
+#include <tdemainwindow.h>
 
 
 
 class KPrinter;
-class KToggleAction;
+class TDEToggleAction;
 class KURL;
 class TQLineEdit;
 class TQComboBox;
@@ -23,8 +23,8 @@ class TQCheckBox;
 class TQListBox;
 class TQPushButton;
 class TQLabel;
-class KProcess;
-class KConfig;
+class TDEProcess;
+class TDEConfig;
 class KURLRequester;
 
 namespace KlamAV
@@ -74,14 +74,14 @@ protected:
      * This function is called when it is time for the app to save its
      * properties for session management purposes.
      */
-    //void saveProperties(KConfig *);
+    //void saveProperties(TDEConfig *);
 
     /**
-     * This function is called when this app is restored.  The KConfig
+     * This function is called when this app is restored.  The TDEConfig
      * object points to the session management config file that was saved
      * with @ref saveProperties
      */
-    //void readProperties(KConfig *);
+    //void readProperties(TDEConfig *);
 
 
 private slots:
@@ -108,8 +108,8 @@ private:
     //AboutklamavView *m_view;
 
   /*  KPrinter   *m_printer;
-    KToggleAction *m_toolbarAction;
-    KToggleAction *m_statusbarAction;*/
+    TDEToggleAction *m_toolbarAction;
+    TDEToggleAction *m_statusbarAction;*/
     KlamAV::PageViewer* homepage;
     KlamAV::TabWidget* tabBrowser;
 signals:
@@ -126,7 +126,7 @@ protected slots:
 private:
 
     TQPushButton *about_button;
-    KConfig *config;
+    TDEConfig *config;
     TQComboBox *check_combo;
     TQLabel *notes_label;
 };
diff --git a/src/action/Makefile.in b/src/action/Makefile.in
index 938d8d2..0391604 100644
--- a/src/action/Makefile.in
+++ b/src/action/Makefile.in
@@ -143,24 +143,24 @@ LIBZ = @LIBZ@
 LIB_CLAM = @LIB_CLAM@
 LIB_KAB = @LIB_KAB@
 LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
+LIB_TDECORE = @LIB_TDECORE@
 LIB_KDED = @LIB_KDED@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KDNSSD = @LIB_KDNSSD@
+LIB_TDEPIM = @LIB_TDEPIM@
+LIB_TDEPRINT = @LIB_TDEPRINT@
+LIB_TDEUI = @LIB_TDEUI@
+LIB_TDEDNSSD = @LIB_TDEDNSSD@
 LIB_KFILE = @LIB_KFILE@
 LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMPROXY = @LIB_KIMPROXY@
-LIB_KIO = @LIB_KIO@
+LIB_TDEHTML = @LIB_TDEHTML@
+LIB_TDEIMPROXY = @LIB_TDEIMPROXY@
+LIB_TDEIO = @LIB_TDEIO@
 LIB_KJS = @LIB_KJS@
 LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUNITTEST = @LIB_KUNITTEST@
-LIB_KUTILS = @LIB_KUTILS@
+LIB_TDEPARTS = @LIB_TDEPARTS@
+LIB_TDESPELL = @LIB_TDESPELL@
+LIB_TDESYCOCA = @LIB_TDESYCOCA@
+LIB_TDEUNITTEST = @LIB_TDEUNITTEST@
+LIB_TDEUTILS = @LIB_TDEUTILS@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
@@ -172,7 +172,7 @@ LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
-MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+MAKETDEWIDGETS = @MAKETDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MEINPROC = @MEINPROC@
 MOC = @MOC@
@@ -277,7 +277,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/src/activityviewer.cpp b/src/activityviewer.cpp
index 6df81b6..7b11b57 100644
--- a/src/activityviewer.cpp
+++ b/src/activityviewer.cpp
@@ -11,16 +11,16 @@
 #include "collectiondb.h"
 
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kstatusbar.h>
 #include <kkeydialog.h>
-#include <kio/netaccess.h>
-#include <kfiledialog.h>
+#include <tdeio/netaccess.h>
+#include <tdefiledialog.h>
 #include <kdebug.h>
-#include <klistviewsearchline.h>
-#include <ktoolbarbutton.h> //ctor
+#include <tdelistviewsearchline.h>
+#include <tdetoolbarbutton.h> //ctor
 
 
 #include <kbuttonbox.h>
@@ -28,7 +28,7 @@
 #include <kurlcompletion.h>
 #include <kcombobox.h>
 #include <tqlayout.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tqtoolbutton.h>
 
@@ -122,18 +122,18 @@ Activityviewer::Activityviewer(TQWidget *parent, const char *name)
 
 
 
-	KToolBarButton *button;
-	KToolBar* searchToolBar = new KToolBar( hlp2 );
+	TDEToolBarButton *button;
+	TDEToolBar* searchToolBar = new TDEToolBar( hlp2 );
 	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 );
         /*TQLabel *filter_label =*/ new TQLabel( i18n("Search:") + " ", searchToolBar );
 
 
-	currentbox = new KListView(hlp2);
+	currentbox = new TDEListView(hlp2);
         currentbox->setShowSortIndicator(true);
     
 	TQFontMetrics rb_fm(currentbox->fontMetrics());
@@ -153,7 +153,7 @@ Activityviewer::Activityviewer(TQWidget *parent, const char *name)
 //     	connect(currentbox, SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint& , int ) ), 
 // 		this, SLOT( slotRMB( TQListViewItem *, const TQPoint &, int ) ) );
 
-	kLineEdit1 = new KListViewSearchLine( (TQWidget *)searchToolBar, currentbox,"klinedit1");
+	kLineEdit1 = new TDEListViewSearchLine( (TQWidget *)searchToolBar, currentbox,"klinedit1");
 /*	TQValueList<int> columns;
         columns.append(0);
 	columns.append(1);
@@ -256,7 +256,7 @@ void Activityviewer::insertItem(const  TQString &date, const  TQString &type, co
 void  Activityviewer::slotOptions(){
 
 	
-	kmain->slotConfigKlamav( "Event Logging" );	
+	tdemain->slotConfigKlamav( "Event Logging" );	
 
 }
 
@@ -265,8 +265,8 @@ Activityviewer::~Activityviewer()
 {
 }
 
-EventListItem::EventListItem( KListView *parent, TQString label1, TQString label2 , TQString label3, TQString label4)
-    : KListViewItem( parent, label1, label2 , label3, label4 )
+EventListItem::EventListItem( TDEListView *parent, TQString label1, TQString label2 , TQString label3, TQString label4)
+    : TDEListViewItem( parent, label1, label2 , label3, label4 )
 {
 }
  
@@ -288,7 +288,7 @@ void EventListItem::paintCell ( TQPainter * p, const TQColorGroup & cg, int colu
 	else if ( this->text(1) == "Quarantine")
 		cg2.setColor(TQColorGroup::Text, TQt::green);
 
-    	KListViewItem::paintCell( p, cg2, column, width, align );
+    	TDEListViewItem::paintCell( p, cg2, column, width, align );
 
 }
 
diff --git a/src/activityviewer.h b/src/activityviewer.h
index e027ee0..f1511b5 100644
--- a/src/activityviewer.h
+++ b/src/activityviewer.h
@@ -9,24 +9,24 @@
 #include <config.h>
 #endif
 
-#include <kapplication.h>
-#include <kmainwindow.h>
-#include <klistview.h>
+#include <tdeapplication.h>
+#include <tdemainwindow.h>
+#include <tdelistview.h>
 
 
-class KToggleAction;
+class TDEToggleAction;
 class KURL;
 class TQLineEdit;
 class TQComboBox;
 class TQCheckBox;
-class KListView;
+class TDEListView;
 class TQPushButton;
 class TQLabel;
-class KProcess;
-class KConfig;
+class TDEProcess;
+class TDEConfig;
 class KURLRequester;
-class KListViewItem;
-class KListViewSearchLine;
+class TDEListViewItem;
+class TDEListViewSearchLine;
 
 
 /**
@@ -62,7 +62,7 @@ public:
     TQString getWhen(TQString);
     TQString getSelectedVirusName();
     void insertItem(const  TQString &date, const  TQString &type, const TQString &event, const TQString &file);
-    KListViewSearchLine* kLineEdit1;
+    TDEListViewSearchLine* kLineEdit1;
 
 protected:
     /**
@@ -76,14 +76,14 @@ protected:
      * This function is called when it is time for the app to save its
      * properties for session management purposes.
      */
-    //void saveProperties(KConfig *);
+    //void saveProperties(TDEConfig *);
 
     /**
-     * This function is called when this app is restored.  The KConfig
+     * This function is called when this app is restored.  The TDEConfig
      * object points to the session management config file that was saved
      * with @ref saveProperties
      */
-    //void readProperties(KConfig *);
+    //void readProperties(TDEConfig *);
 
 
 private slots:
@@ -100,8 +100,8 @@ private:
     //ActivityviewerView *m_view;
 
   /*  KPrinter   *m_printer;
-    KToggleAction *m_toolbarAction;
-    KToggleAction *m_statusbarAction;*/
+    TDEToggleAction *m_toolbarAction;
+    TDEToggleAction *m_statusbarAction;*/
 
 
 signals:
@@ -119,12 +119,12 @@ private:
     TQComboBox *check_combo, *days_combo;
     KURLRequester *dir_combo;
     TQCheckBox *recursive_box;
-    KListView *currentbox;
+    TDEListView *currentbox;
     TQPushButton *search_button, *cancel_button, *refresh_button, *search_button3, *cancel_button3;
     TQLabel *status_label, *matches_label;
-    KProcess *childproc;
+    TDEProcess *childproc;
     TQString buf;
-    KConfig* config;
+    TDEConfig* config;
     TQStringList lastQuarItems;
     TQStringList lastHistoryItems;
     TQStringList lastQuarLocations;
@@ -136,10 +136,10 @@ private:
 };
 
     
-    class EventListItem : public KListViewItem
+    class EventListItem : public TDEListViewItem
     {
         public:
-            EventListItem( KListView *parent, TQString label1, TQString label2 = TQString::null, TQString label3 = TQString::null, TQString label4 = TQString::null);
+            EventListItem( TDEListView *parent, TQString label1, TQString label2 = TQString::null, TQString label3 = TQString::null, TQString label4 = TQString::null);
             ~EventListItem();
 
             void paintCell ( TQPainter * p, const TQColorGroup & cg, int column, int width, int align );
diff --git a/src/arkollon/Makefile.in b/src/arkollon/Makefile.in
index c13c0e9..58cff69 100644
--- a/src/arkollon/Makefile.in
+++ b/src/arkollon/Makefile.in
@@ -184,24 +184,24 @@ LIBZ = @LIBZ@
 LIB_CLAM = @LIB_CLAM@
 LIB_KAB = @LIB_KAB@
 LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
+LIB_TDECORE = @LIB_TDECORE@
 LIB_KDED = @LIB_KDED@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KDNSSD = @LIB_KDNSSD@
+LIB_TDEPIM = @LIB_TDEPIM@
+LIB_TDEPRINT = @LIB_TDEPRINT@
+LIB_TDEUI = @LIB_TDEUI@
+LIB_TDEDNSSD = @LIB_TDEDNSSD@
 LIB_KFILE = @LIB_KFILE@
 LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMPROXY = @LIB_KIMPROXY@
-LIB_KIO = @LIB_KIO@
+LIB_TDEHTML = @LIB_TDEHTML@
+LIB_TDEIMPROXY = @LIB_TDEIMPROXY@
+LIB_TDEIO = @LIB_TDEIO@
 LIB_KJS = @LIB_KJS@
 LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUNITTEST = @LIB_KUNITTEST@
-LIB_KUTILS = @LIB_KUTILS@
+LIB_TDEPARTS = @LIB_TDEPARTS@
+LIB_TDESPELL = @LIB_TDESPELL@
+LIB_TDESYCOCA = @LIB_TDESYCOCA@
+LIB_TDEUNITTEST = @LIB_TDEUNITTEST@
+LIB_TDEUTILS = @LIB_TDEUTILS@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
@@ -213,7 +213,7 @@ LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
-MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+MAKETDEWIDGETS = @MAKETDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MEINPROC = @MEINPROC@
 MOC = @MOC@
@@ -318,7 +318,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -807,7 +807,7 @@ $(srcdir)/wizard.cpp: logdialog.h wizardbase.h
 wizardbase.cpp: $(srcdir)/wizardbase.ui wizardbase.h wizardbase.moc
 	rm -f wizardbase.cpp
 	echo '#include <kdialog.h>' > wizardbase.cpp
-	echo '#include <klocale.h>' >> wizardbase.cpp
+	echo '#include <tdelocale.h>' >> wizardbase.cpp
 	$(UIC) -tr ${UIC_TR} -i wizardbase.h $(srcdir)/wizardbase.ui > wizardbase.cpp.temp ; ret=$$?; \
 	$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" wizardbase.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_wizardbase,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> wizardbase.cpp ;\
 	rm -f wizardbase.cpp.temp ;\
@@ -822,7 +822,7 @@ wizardbase.moc: wizardbase.h
 logdialog.cpp: $(srcdir)/logdialog.ui logdialog.h logdialog.moc
 	rm -f logdialog.cpp
 	echo '#include <kdialog.h>' > logdialog.cpp
-	echo '#include <klocale.h>' >> logdialog.cpp
+	echo '#include <tdelocale.h>' >> logdialog.cpp
 	$(UIC) -tr ${UIC_TR} -i logdialog.h $(srcdir)/logdialog.ui > logdialog.cpp.temp ; ret=$$?; \
 	$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" logdialog.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_logdialog,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> logdialog.cpp ;\
 	rm -f logdialog.cpp.temp ;\
diff --git a/src/arkollon/klamarkollon.cpp b/src/arkollon/klamarkollon.cpp
index 0dc7b08..c966d78 100644
--- a/src/arkollon/klamarkollon.cpp
+++ b/src/arkollon/klamarkollon.cpp
@@ -39,7 +39,7 @@ int main(int argc, char *argv[])
 	// Check if we're root
 	if (getuid() != 0)
 	{
-		TQString command = "kdesu -i klamav -n -c \"";
+		TQString command = "tdesu -i klamav -n -c \"";
 		for (int i=0 ; i<app.argc() ; i++)
 		{
 			if (TQString(app.argv()[i]).contains(" "))
diff --git a/src/arkollon/wizard.cpp b/src/arkollon/wizard.cpp
index a15491b..67ce53f 100644
--- a/src/arkollon/wizard.cpp
+++ b/src/arkollon/wizard.cpp
@@ -108,7 +108,7 @@ Wizard::Wizard(TQWidget *parent, const char *name)
 	kdeDirProcess = new TQProcess(this);
 	connect(kdeDirProcess, SIGNAL(readyReadStdout()), SLOT(kdeDirReady()));
 	connect(kdeDirProcess, SIGNAL(processExited()), SLOT(getInstalledComponents()));
-	kdeDirProcess->addArgument("kde-config");
+	kdeDirProcess->addArgument("tde-config");
 	kdeDirProcess->addArgument("--prefix");
 	if (!kdeDirProcess->start())
 		getInstalledComponents();
@@ -890,7 +890,7 @@ void Wizard::errorOccured()
 TQString Wizard::sub(TQString s)
 {
 	TQString tmp = s;
-	tmp.replace(TQRegExp("\\$KDEDIR"), kdeDir);
+	tmp.replace(TQRegExp("\\$TDEDIR"), kdeDir);
 	tmp.replace(TQRegExp("\\$HOMEDIR"), TQDir::homeDirPath());
 	tmp.replace(TQRegExp("~"), TQDir::homeDirPath());
 	tmp.replace(TQRegExp("\\$PREFIX"), "/usr/local");
diff --git a/src/clicklineedit.cpp b/src/clicklineedit.cpp
index e3cb6db..0e63579 100644
--- a/src/clicklineedit.cpp
+++ b/src/clicklineedit.cpp
@@ -1,5 +1,5 @@
 /*
-   This file is part of libkdepim.
+   This file is part of libtdepim.
    Copyright (c) 2004 Daniel Molkentin <[email protected]>
    based on code by Cornelius Schumacher <[email protected]>
 
@@ -63,7 +63,7 @@ void ClickComboBox::paintEvent( TQPaintEvent * ev)
 
 	KComboBox::paintEvent(ev);
 
-   	if (kmain->klamscan->isMultiScan()){
+   	if (tdemain->klamscan->isMultiScan()){
 		//kdDebug() << "drawing text" << endl;
 		TQPainter p (this->lineEdit());
 		p.setPen( palette().color( TQPalette::Disabled, TQColorGroup::Text ) );
diff --git a/src/clicklineedit.h b/src/clicklineedit.h
index 171aa28..5a4aa77 100644
--- a/src/clicklineedit.h
+++ b/src/clicklineedit.h
@@ -1,5 +1,5 @@
 /*
-  This file is part of libkdepim.
+  This file is part of libtdepim.
   Copyright (c) 2004 Daniel Molkentin <[email protected]>
 
   This library is free software; you can redistribute it and/or
diff --git a/src/collectiondb.cpp b/src/collectiondb.cpp
index a729282..fea1182 100644
--- a/src/collectiondb.cpp
+++ b/src/collectiondb.cpp
@@ -18,18 +18,18 @@
 #include <tqfile.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
-#include <kconfig.h>
-#include <kglobal.h>
+#include <tdeapplication.h>
+#include <tdeconfig.h>
+#include <tdeglobal.h>
 #include <kinputdialog.h>         //setupCoverFetcher()
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klineedit.h>            //setupCoverFetcher()
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmdcodec.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
 #include <kdebug.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <cmath>                 //DbConnection::sqlite_power()
 #include <ctime>                 //query()
@@ -388,7 +388,7 @@ CollectionDB::initialize()
     DbConnection *dbConn = m_dbConnPool->getDbConnection();
     m_dbConnPool->putDbConnection( dbConn );
 
-//    KConfig* config = amaroK::config( "Collection Browser" );
+//    TDEConfig* config = amaroK::config( "Collection Browser" );
     if(!dbConn->isConnected())
 	kdDebug() << "db not connected" << endl;
         //amaroK::MessageQueue::instance()->addMessage(dbConn->lastError());
@@ -606,7 +606,7 @@ int SqliteConnection::insert( const TQString& statement, const TQString& /* tabl
 // this implements a RAND() function compatible with the MySQL RAND() (0-param-form without seed)
 void SqliteConnection::sqlite_rand(sqlite3_context *context, int /*argc*/, sqlite3_value ** /*argv*/)
 {
-    sqlite3_result_double( context, static_cast<double>(KApplication::random()) / (RAND_MAX+1.0) );
+    sqlite3_result_double( context, static_cast<double>(TDEApplication::random()) / (RAND_MAX+1.0) );
 }
 
 // this implements a POWER() function compatible with the MySQL POWER()
@@ -761,7 +761,7 @@ void CollectionDB::insertEvent(const  TQString &type, const TQString &event, con
 	 .arg( file )
 	 , "klamav_activity", conn);
 
-        kmain->activityviewer->insertItem(date,type,event,file);
+        tdemain->activityviewer->insertItem(date,type,event,file);
 }
 
 void CollectionDB::insertMetaDBEntry(const  TQString &date, const TQString &submission, const TQString &creator,const TQString &virus,const TQString &alias, const TQString &sender,DbConnection *conn)
diff --git a/src/configdialog.cpp b/src/configdialog.cpp
index 6c02371..a46c304 100644
--- a/src/configdialog.cpp
+++ b/src/configdialog.cpp
@@ -34,19 +34,19 @@ email                : [email protected]
 #include <tqtooltip.h>
 #include <tqvbox.h>
 
-#include <kapplication.h> //kapp
+#include <tdeapplication.h> //kapp
 #include <kcombobox.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC
 //////////////////////////////////////////////////////////////////////////////////////////
 
-KlamavConfigDialog::KlamavConfigDialog( TQWidget *parent, const char* name, KConfigSkeleton *config )
-        : KConfigDialog( parent, name, config )
+KlamavConfigDialog::KlamavConfigDialog( TQWidget *parent, const char* name, TDEConfigSkeleton *config )
+        : TDEConfigDialog( parent, name, config )
 {
     setWFlags( WDestructiveClose );
 
@@ -69,7 +69,7 @@ KlamavConfigDialog::KlamavConfigDialog( TQWidget *parent, const char* name, KCon
         static_cast<TQLabel*>(label)->setPixmap( TQMessageBox::standardIcon( TQMessageBox::Information ) );
     delete list;
 
-    //stop KFont Requesters getting stupidly large
+    //stop TDEFont Requesters getting stupidly large
     list = queryList( "TQLabel", "m_sampleLabel" );
     for( TQObject *label = list->first(); label; label = list->next() )
         static_cast<TQLabel*>(label)->setMaximumWidth( 250 );
@@ -89,19 +89,19 @@ void KlamavConfigDialog::showPage( const TQCString& page )
 {
     for( uint index = 0; index < m_pageList.count(); index++ ) {
         if ( m_pageList[index]->name() == page ) {
-            KConfigDialog::showPage( index );
+            TDEConfigDialog::showPage( index );
             return;
         }
     }
 }
 
-/** Reimplemented from KConfigDialog */
+/** Reimplemented from TDEConfigDialog */
 void KlamavConfigDialog::addPage( TQWidget *page, const TQString &itemName, const TQString &pixmapName, const TQString &header, bool manage )
 {
     // Add the widget pointer to our list, for later reference
     m_pageList << page;
 
-    KConfigDialog::addPage( page, itemName, pixmapName, header, manage );
+    TDEConfigDialog::addPage( page, itemName, pixmapName, header, manage );
 }
 
 
diff --git a/src/configdialog.h b/src/configdialog.h
index dfaf901..c18e106 100644
--- a/src/configdialog.h
+++ b/src/configdialog.h
@@ -20,19 +20,19 @@ email                : [email protected]
 #include <tqmap.h>
 #include <tqvaluelist.h>
 
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 
 class TQComboBox;
 class TQGroupBox;
 class TQVBox;
 
 
-class KlamavConfigDialog : public KConfigDialog
+class KlamavConfigDialog : public TDEConfigDialog
 {
     Q_OBJECT
 
     public:
-        KlamavConfigDialog( TQWidget *parent, const char* name, KConfigSkeleton *config );
+        KlamavConfigDialog( TQWidget *parent, const char* name, TDEConfigSkeleton *config );
         ~KlamavConfigDialog();
 
         void addPage( TQWidget *page, const TQString &itemName, const TQString &pixmapName,
diff --git a/src/ctcron.cpp b/src/ctcron.cpp
index d5bfd07..d8b5893 100644
--- a/src/ctcron.cpp
+++ b/src/ctcron.cpp
@@ -22,7 +22,7 @@
 #include <tqfile.h>
 
 #include <kprocess.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <stdlib.h>      // system
 
 using namespace std;
@@ -44,15 +44,15 @@ CTCron::CTCron(bool _syscron, string ) :
   {
     if (syscron)
     {
-      readCommand  = "cat /etc/crontab > " + KProcess::quote(tmpFileName);
-      writeCommand = "cat " + KProcess::quote(tmpFileName) + " > /etc/crontab";
+      readCommand  = "cat /etc/crontab > " + TDEProcess::quote(tmpFileName);
+      writeCommand = "cat " + TDEProcess::quote(tmpFileName) + " > /etc/crontab";
       login = (const char *)i18n("(System Crontab)").local8Bit();
       name = "";
     }
     else
     {
-      readCommand  = TQString("crontab -u ") + _login.c_str() + " -l > " + KProcess::quote(tmpFileName);
-      writeCommand = TQString("crontab -u ") + _login.c_str() + " " + KProcess::quote(tmpFileName);
+      readCommand  = TQString("crontab -u ") + _login.c_str() + " -l > " + TDEProcess::quote(tmpFileName);
+      writeCommand = TQString("crontab -u ") + _login.c_str() + " " + TDEProcess::quote(tmpFileName);
       if (!initFromPasswd(getpwnam(_login.c_str())))
       {
          error = i18n("No password entry found for user '%1'").arg(_login.c_str());
@@ -62,8 +62,8 @@ CTCron::CTCron(bool _syscron, string ) :
   else*/
   // regular user, so provide user's own crontab
   {
-    readCommand  = "crontab -l > " + KProcess::quote(tmpFileName);
-    writeCommand = "crontab "      + KProcess::quote(tmpFileName);
+    readCommand  = "crontab -l > " + TDEProcess::quote(tmpFileName);
+    writeCommand = "crontab "      + TDEProcess::quote(tmpFileName);
     if (!initFromPasswd(getpwuid(uid)))
     {
       error = i18n("No password entry found for uid '%1'").arg(uid);
@@ -101,8 +101,8 @@ CTCron::CTCron(const struct passwd *pwd) :
   tmp.close();
   tmpFileName = tmp.name();  
 
-  TQString readCommand  = TQString("crontab -u ") + TQString(pwd->pw_name) + " -l > " + KProcess::quote(tmpFileName);
-  writeCommand = TQString("crontab -u ") + TQString(pwd->pw_name) + " " + KProcess::quote(tmpFileName);
+  TQString readCommand  = TQString("crontab -u ") + TQString(pwd->pw_name) + " -l > " + TDEProcess::quote(tmpFileName);
+  writeCommand = TQString("crontab -u ") + TQString(pwd->pw_name) + " " + TDEProcess::quote(tmpFileName);
 
   initFromPasswd(pwd);
 
diff --git a/src/cti18n.h b/src/cti18n.h
index a5b96ec..7cea13a 100644
--- a/src/cti18n.h
+++ b/src/cti18n.h
@@ -21,7 +21,7 @@
 // Regardless, please don't introduce any other TQt or KDE dependencies here.
 // -GM 11/99
 
-#include <klocale.h>
-#include <kapplication.h>
+#include <tdelocale.h>
+#include <tdeapplication.h>
 
 #endif // CTI18N_H
diff --git a/src/datepicker.cpp b/src/datepicker.cpp
index 7a7b589..c881010 100644
--- a/src/datepicker.cpp
+++ b/src/datepicker.cpp
@@ -26,8 +26,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <kdatepicker.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kwin.h>
+#include <tdelocale.h>
+#include <twin.h>
 
 DatePicker::DatePicker(TQWidget *parent, const TQDate& date)
     : TQVBox( parent, 0,(WType_TopLevel | WDestructiveClose | WStyle_StaysOnTop))
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")
diff --git a/src/dbviewer.h b/src/dbviewer.h
index 6f0b280..63a33d5 100644
--- a/src/dbviewer.h
+++ b/src/dbviewer.h
@@ -21,10 +21,10 @@ class TQGridLayout;
 class TQSpacerItem;
 class TQTabWidget;
 class TQWidget;
-class KListViewSearchLine;
+class TDEListViewSearchLine;
 class TQListView;
-class KListView;
-class KListViewItem;
+class TDEListView;
+class TDEListViewItem;
 class TQListViewItem;
 class KProgress;
 class KProgressDialog;
@@ -48,8 +48,8 @@ public:
 
     KlamAV::TabWidget* tabBrowser;
     TQWidget* tab;
-    KListViewSearchLine* kLineEdit1;
-    KListView* VirusList;
+    TDEListViewSearchLine* kLineEdit1;
+    TDEListView* VirusList;
     void slotExternal(TQString name, TQString service);
 
 public slots:
diff --git a/src/directorylist.cpp b/src/directorylist.cpp
index f830ecd..80571ab 100644
--- a/src/directorylist.cpp
+++ b/src/directorylist.cpp
@@ -20,13 +20,13 @@
 #include <tqtooltip.h>
 #include <tqdir.h>
 
-#include <kfileitem.h>
-#include <klocale.h>
+#include <tdefileitem.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
 #include <tqregexp.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopref.h>
 #include <dcopclient.h>
 #include <kautomount.h>
@@ -194,7 +194,7 @@ Item::newItems( const KFileItemList &list ) //SLOT
         item->setOn( CollectionSetup::instance()->recursive() && isOn() ||
                      CollectionSetup::instance()->m_dirs.contains( item->fullPath() ) );
 
-        item->setPixmap( 0, (*it)->pixmap( KIcon::SizeSmall ) );
+        item->setPixmap( 0, (*it)->pixmap( TDEIcon::SizeSmall ) );
     }
 }
 
@@ -379,7 +379,7 @@ DeviceItem::newItems( const KFileItemList &list ) //SLOT
             item->setOn( CollectionSetup::instance()->recursive() && isOn() ||
                         CollectionSetup::instance()->m_dirs.contains( item->fullPath() ) );
     
-            item->setPixmap( 0, (*it)->pixmap( KIcon::SizeSmall ) );
+            item->setPixmap( 0, (*it)->pixmap( TDEIcon::SizeSmall ) );
         }
     }
 }
diff --git a/src/firstrunwizard.ui.h b/src/firstrunwizard.ui.h
index 2f74980..5d14bcd 100644
--- a/src/firstrunwizard.ui.h
+++ b/src/firstrunwizard.ui.h
@@ -11,8 +11,8 @@
 *****************************************************************************/
 #include "config.h"
 #include "klamav.h"
-#include <kapplication.h>
-#include <klocale.h>
+#include <tdeapplication.h>
+#include <tdelocale.h>
 #include <tqpushbutton.h>
 #include <tqpixmap.h>
 #include <stdlib.h>
@@ -68,7 +68,7 @@ FirstRunWizard::showPage( TQWidget *w ) //virtual
 // {
 // 
 // 
-//     KConfig* config = klamav->KGlobal::config();
+//     TDEConfig* config = klamav->TDEGlobal::config();
 //     config->setGroup("Freshklam");
 // 
 //     //Configure Database Path
@@ -94,7 +94,7 @@ FirstRunWizard::showPage( TQWidget *w ) //virtual
 // 
 //     //Download an updated database?
 //     if (CheckForDatabaseUpdates->isChecked())
-//         kmain->firstDownload = true;
+//         tdemain->firstDownload = true;
 // }
 
 KURL
diff --git a/src/frame.cpp b/src/frame.cpp
index eabb217..eafb543 100644
--- a/src/frame.cpp
+++ b/src/frame.cpp
@@ -5,9 +5,9 @@
  *     Licensed under GPL.                                                 *
  ***************************************************************************/
 
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 
-//#include <libkdepim/progressmanager.h>
+//#include <libtdepim/progressmanager.h>
 
 #include "frame.h"
 
@@ -32,12 +32,12 @@ Frame::Frame(TQObject * parent, KParts::ReadOnlyPart *p, TQWidget *visWidget, co
         if (ext)
             connect( ext, SIGNAL(loadingProgress(int)), this, SLOT(setProgress(int)) );
 
-        connect(p, SIGNAL(started(KIO::Job*)), this, SLOT(setStarted()));
+        connect(p, SIGNAL(started(TDEIO::Job*)), this, SLOT(setStarted()));
         connect(p, SIGNAL(completed()), this, SLOT(setCompleted()));
         connect(p, SIGNAL(canceled(const TQString &)), this, SLOT(setCanceled(const TQString&)));
         connect(p, SIGNAL(completed(bool)), this, SLOT(setCompleted()));
 
-/*        KActionCollection *coll=p->actionCollection();
+/*        TDEActionCollection *coll=p->actionCollection();
         if (coll)
         {
             connect( coll, SIGNAL( actionStatusText( const TQString & ) ),
diff --git a/src/frame.h b/src/frame.h
index da37fff..9c14fd9 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -8,7 +8,7 @@
 #ifndef FRAME_H
 #define FRAME_H
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 #include <tqobject.h>
 
diff --git a/src/freshklam.cpp b/src/freshklam.cpp
index 77bfe27..341564e 100644
--- a/src/freshklam.cpp
+++ b/src/freshklam.cpp
@@ -12,11 +12,11 @@
 #include "config.h"
 #include "../config.h"
 
-#include <klocale.h>
-#include <kio/netaccess.h>
+#include <tdelocale.h>
+#include <tdeio/netaccess.h>
 
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include <tqcheckbox.h>
 #include <kbuttonbox.h>
@@ -24,16 +24,16 @@
 #include <kurlcompletion.h>
 #include <kcombobox.h>
 #include <tqlayout.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <klineedit.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <ksystemtray.h>
 #include <ktar.h>
 #include <kprogress.h>
 #include <kprocio.h>
 #include <knotifyclient.h>
 #include <dom/html_misc.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <kuser.h>
 
@@ -88,17 +88,17 @@ Freshklam::Freshklam(TQWidget *parent, const char *name)
 
 
 
-    kmain->firstDownload = false;
+    tdemain->firstDownload = false;
     checkingDirectly = false;
     
 
     freshklamAlive = FALSE;
-    config = KGlobal::config();
+    config = TDEGlobal::config();
     config->setGroup("Freshklam");
     lastDownloadPaths = config->readListEntry("lastDownloadPaths");
     getCurrentVersionOfClamAV( );
 
-    if ((lastDownloadPaths.isEmpty()) || (!(KIO::NetAccess::exists(TQString((*lastDownloadPaths.begin())),TRUE,NULL)))){
+    if ((lastDownloadPaths.isEmpty()) || (!(TDEIO::NetAccess::exists(TQString((*lastDownloadPaths.begin())),TRUE,NULL)))){
         createDBDir();
     }
     TQString proxyIPText = config->readEntry("ProxyIP");
@@ -310,7 +310,7 @@ Freshklam::~Freshklam()
         killPID();
     }
     if (!(tempFileName.isEmpty()))
-        KIO::NetAccess::del(tempFileName,NULL);
+        TDEIO::NetAccess::del(tempFileName,NULL);
 
 }
 
@@ -346,20 +346,20 @@ void Freshklam::processOutput()
 
     if ((pos = item2.find("Database updated")) != -1){
 	   CollectionDB::instance()->insertEvent("Updates","Database Updated",dir_combo->url());
-        KNotifyClient::event(kmain->_tray->winId(),"UpdatedDatabase", "Virus Database Updated.");
+        KNotifyClient::event(tdemain->_tray->winId(),"UpdatedDatabase", "Virus Database Updated.");
         updateMailClient();
     }
 
     if ((pos = item2.find("daily.cvd is up to date")) != -1){
 	   CollectionDB::instance()->insertEvent("Updates","Database Already Up To Date",dir_combo->url());
-        KNotifyClient::event(kmain->_tray->winId(),"DatabaseUpToDate", "Virus Database Up To Date.");
+        KNotifyClient::event(tdemain->_tray->winId(),"DatabaseUpToDate", "Virus Database Up To Date.");
         updateMailClient();
     }
 
 
     if ((pos = item2.find("Recommended version:")) != -1){
 
-    	kmain->_tray->setPixmap(KSystemTray::loadIcon("klamav_update_required"));
+    	tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_update_required"));
         pos2 = item2.find('\n',pos);
         TQString version = item2.mid((pos+20),pos2 - (pos+20)).stripWhiteSpace();
 
@@ -374,7 +374,7 @@ void Freshklam::processOutput()
                     updater->downloadComponent("clamav",version,"tar.gz");
             }
         }else if (!(clamav_box->isChecked()))
-            KNotifyClient::event(kmain->_tray->winId(),"ClamAVOutDated", TQString("Your copy of ClamAV is out of date! Please Upgrade to ClamAV %1!").arg(version));
+            KNotifyClient::event(tdemain->_tray->winId(),"ClamAVOutDated", TQString("Your copy of ClamAV is out of date! Please Upgrade to ClamAV %1!").arg(version));
     }
 
 
@@ -421,10 +421,10 @@ void Freshklam::slotSearch()
         freshklamAlive = TRUE;
     }
     
-    if (!(KApplication::kApplication()->isRestored())){
+    if (!(TDEApplication::kApplication()->isRestored())){
 
-        if (kmain->klamd->isKlamdAlive()){
-            TQString klamdconf = kmain->klamd->getKlamdConfFile();
+        if (tdemain->klamd->isKlamdAlive()){
+            TQString klamdconf = tdemain->klamd->getKlamdConfFile();
             ////kdDebug() << klamdconf << endl;
             command += " --daemon-notify=";
             command += klamdconf;
@@ -442,20 +442,20 @@ void Freshklam::slotSearch()
     
     //kdDebug() << command << endl;
 
-    childproc->start(KProcess::NotifyOnExit, KProcess::Stdout);
+    childproc->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout);
 
-    connect( childproc, SIGNAL(processExited(KProcess *)),
+    connect( childproc, SIGNAL(processExited(TDEProcess *)),
         SLOT(childExited()) );
-    connect( childproc, SIGNAL(receivedStdout(KProcess *, char *, int)),
-        SLOT(receivedOutput(KProcess *, char *, int)) );
+    connect( childproc, SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+        SLOT(receivedOutput(TDEProcess *, char *, int)) );
     
-//     if (kmain->klamd->isKlamdAlive())
-//         kmain->_tray->setPixmap(KSystemTray::loadIcon("klamavdl"));    
+//     if (tdemain->klamd->isKlamdAlive())
+//         tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamavdl"));    
 //     else
-//         kmain->_tray->setPixmap(KSystemTray::loadIcon("klamavbwdl"));    
+//         tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamavbwdl"));    
 
-    kmain->EnableFreshklam->setEnabled(FALSE);
-    kmain->DisableFreshklam->setEnabled(TRUE);
+    tdemain->EnableFreshklam->setEnabled(FALSE);
+    tdemain->DisableFreshklam->setEnabled(TRUE);
 
 }
 
@@ -465,10 +465,10 @@ void Freshklam::finish()
     cancel_button->setEnabled(false);
 
     enableInputs();
-    if (kmain->klamd->isKlamdAlive())
-        kmain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_enabled"));    
+    if (tdemain->klamd->isKlamdAlive())
+        tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_enabled"));    
     else
-        kmain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_disabled"));
+        tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_disabled"));
 
     buf += '\n';
     processOutput();
@@ -476,10 +476,10 @@ void Freshklam::finish()
     childproc = 0;
     freshklamAlive = FALSE;
     if (!(tempFileName.isEmpty()))
-        KIO::NetAccess::del(tempFileName,NULL);
+        TDEIO::NetAccess::del(tempFileName,NULL);
 
-    kmain->EnableFreshklam->setEnabled(TRUE);
-    kmain->DisableFreshklam->setEnabled(FALSE);
+    tdemain->EnableFreshklam->setEnabled(TRUE);
+    tdemain->DisableFreshklam->setEnabled(FALSE);
 
     //updateMetaDB();
 
@@ -530,8 +530,8 @@ void Freshklam::childExited()
     int status = childproc->exitStatus();
 
 /*       int winid = 0;
-        if (KApplication::kApplication()->mainWidget()) {
-            winid = KApplication::kApplication()->mainWidget()->winId();
+        if (TDEApplication::kApplication()->mainWidget()) {
+            winid = TDEApplication::kApplication()->mainWidget()->winId();
         }*/
     finish();
     
@@ -616,7 +616,7 @@ void Freshklam::updateMailClient()
     config->sync();
 
     
-    KConfig* mailconfig = new KConfig("kmailrc");
+    TDEConfig* mailconfig = new TDEConfig("kmailrc");
     mailconfig->setGroup("General");
     TQVariant nooffilters = mailconfig->readEntry("filters");
 
@@ -654,7 +654,7 @@ void Freshklam::updateMailClient()
     delete mailconfig;
 
 }
-void Freshklam::receivedOutput(KProcess */*proc*/, char *buffer, int buflen)
+void Freshklam::receivedOutput(TDEProcess */*proc*/, char *buffer, int buflen)
 {
     //kdDebug() << buffer << endl;
     buf += TQCString(buffer, buflen+1);
@@ -749,7 +749,7 @@ void  Freshklam::initCheckBoxes(){
 void  Freshklam::handleChecks(){
 
 
-    config = KGlobal::config();
+    config = TDEGlobal::config();
     config->setGroup("Freshklam");
     if (daemon_box->isChecked()){
         config->writeEntry("AutoUpdate","Yes");
@@ -792,7 +792,7 @@ bool  Freshklam::killPID(){
     else
         return false;
     if (!(pidFileName.isEmpty()))
-        KIO::NetAccess::del(pidFileName,NULL);
+        TDEIO::NetAccess::del(pidFileName,NULL);
 
     return true;
 }
@@ -830,7 +830,7 @@ TQString  Freshklam::getCurrentDBDir(){
     TQString dbdir;
     TQString db;
 
-    config = KGlobal::config();
+    config = TDEGlobal::config();
     config->setGroup("Freshklam");
     lastDownloadPaths = config->readListEntry("lastDownloadPaths");
     for (TQStringList::Iterator ita = lastDownloadPaths.begin(); ita == lastDownloadPaths.begin() ; ita++){
@@ -886,7 +886,7 @@ void  Freshklam::createDBDir(){
 
     if (ok){
         lastDownloadPaths.prepend( TQString("%1").arg(path));
-        config = KGlobal::config();
+        config = TDEGlobal::config();
         config->setGroup("Freshklam");
         config->writeEntry("lastDownloadPaths", lastDownloadPaths);
         config->sync();
@@ -901,7 +901,7 @@ void  Freshklam::createDBDir(){
             switch (result) {
                 case 2 : KMessageBox::information (this,i18n( "You should update the database manually at your earliest convenience.") );  break;
                 case 5 : 
-                    kmain->firstDownload = true;
+                    tdemain->firstDownload = true;
                     break;
 
                 }
@@ -920,7 +920,7 @@ bool  Freshklam::isFreshklamAlive(){
 void Freshklam::enableAutoUpdates()
 {
 
-        config = KGlobal::config();
+        config = TDEGlobal::config();
         config->writeEntry("AutoUpdate","Yes");
         config->sync();
         daemon_box->setChecked(true);
@@ -992,7 +992,7 @@ Freshklam::getCurrentVersionOfClamAV( )
 	
 	connect( versionproc, SIGNAL(readReady(KProcIO *)),
 		SLOT(readVersionLine(KProcIO *)) );
-	connect( versionproc, SIGNAL(processExited(KProcess *)),
+	connect( versionproc, SIGNAL(processExited(TDEProcess *)),
 			SLOT(versionExited()) );
 
 	versionproc->start(KProcIO::NotifyOnExit);
diff --git a/src/freshklam.h b/src/freshklam.h
index 96e1f99..f6a4bf9 100644
--- a/src/freshklam.h
+++ b/src/freshklam.h
@@ -9,12 +9,12 @@
 #include <config.h>
 #endif
 
-#include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdeapplication.h>
+#include <tdemainwindow.h>
 #include <kdirlister.h> //stack allocated
 #include <kurl.h>       //stack allocated
 #include <kresolver.h> // namespace
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 #include "update.h"
 
 namespace DOM {
@@ -25,7 +25,7 @@ namespace DOM {
 using namespace KNetwork;
 
 class KPrinter;
-class KToggleAction;
+class TDEToggleAction;
 class KURL;
 class TQLineEdit;
 class TQComboBox;
@@ -33,13 +33,13 @@ class TQCheckBox;
 class TQListBox;
 class TQPushButton;
 class TQLabel;
-class KProcess;
-class KConfig;
+class TDEProcess;
+class TDEConfig;
 class KURLRequester;
 class KLineEdit;
 class KProgressDialog;
 class KProcIO;
-class KHTMLPart;
+class TDEHTMLPart;
 class KlamavUpdate;
 
 /**
@@ -85,14 +85,14 @@ protected:
      * This function is called when it is time for the app to save its
      * properties for session management purposes.
      */
-    //void saveProperties(KConfig *);
+    //void saveProperties(TDEConfig *);
 
     /**
-     * This function is called when this app is restored.  The KConfig
+     * This function is called when this app is restored.  The TDEConfig
      * object points to the session management config file that was saved
      * with @ref saveProperties
      */
-    //void readProperties(KConfig *);
+    //void readProperties(TDEConfig *);
 
 
 
@@ -119,13 +119,13 @@ private slots:
 /*    void slotProg();*/
     void childExited();
     void processDied();
-    void receivedOutput(KProcess *proc, char *buffer, int buflen);
+    void receivedOutput(TDEProcess *proc, char *buffer, int buflen);
     void slotClear();
     void writeConf();
     void handleChecks();
-    //void arkollonExited(KProcess *arkollonproc);
-/*    void klamavInstallationExited(KProcess *arkollonproc);
-    void clamavInstallationExited(KProcess *arkollonproc);*/
+    //void arkollonExited(TDEProcess *arkollonproc);
+/*    void klamavInstallationExited(TDEProcess *arkollonproc);
+    void clamavInstallationExited(TDEProcess *arkollonproc);*/
     //void newItems( const KFileItemList& );
     void resolved(KResolverResults result);
     void checkForNewKlamAVNow();
@@ -165,10 +165,10 @@ private:
     TQCheckBox *recursive_box;
     TQListBox *resultbox;
     TQLabel *status_label, *matches_label;
-    KProcess *childproc;
+    TDEProcess *childproc;
     KProcIO *versionproc;
     TQString buf;
-    KConfig* config;
+    TDEConfig* config;
     TQStringList lastSearchItems;
     TQStringList lastDownloadPaths;
     KLineEdit    *proxyIP;
@@ -188,7 +188,7 @@ private:
     TQString highestsofarfilename;*/
     KResolver m_resolver;
 /*    TQString currentClamAVVersion;
-    KHTMLPart *filelist;*/
+    TDEHTMLPart *filelist;*/
     TQPushButton *clamav_options;
     TQPushButton *klamav_options;
 
diff --git a/src/icons/Makefile.in b/src/icons/Makefile.in
index a72b63e..8613c30 100644
--- a/src/icons/Makefile.in
+++ b/src/icons/Makefile.in
@@ -139,24 +139,24 @@ LIBZ = @LIBZ@
 LIB_CLAM = @LIB_CLAM@
 LIB_KAB = @LIB_KAB@
 LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
+LIB_TDECORE = @LIB_TDECORE@
 LIB_KDED = @LIB_KDED@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KDNSSD = @LIB_KDNSSD@
+LIB_TDEPIM = @LIB_TDEPIM@
+LIB_TDEPRINT = @LIB_TDEPRINT@
+LIB_TDEUI = @LIB_TDEUI@
+LIB_TDEDNSSD = @LIB_TDEDNSSD@
 LIB_KFILE = @LIB_KFILE@
 LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMPROXY = @LIB_KIMPROXY@
-LIB_KIO = @LIB_KIO@
+LIB_TDEHTML = @LIB_TDEHTML@
+LIB_TDEIMPROXY = @LIB_TDEIMPROXY@
+LIB_TDEIO = @LIB_TDEIO@
 LIB_KJS = @LIB_KJS@
 LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUNITTEST = @LIB_KUNITTEST@
-LIB_KUTILS = @LIB_KUTILS@
+LIB_TDEPARTS = @LIB_TDEPARTS@
+LIB_TDESPELL = @LIB_TDESPELL@
+LIB_TDESYCOCA = @LIB_TDESYCOCA@
+LIB_TDEUNITTEST = @LIB_TDEUNITTEST@
+LIB_TDEUTILS = @LIB_TDEUTILS@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
@@ -168,7 +168,7 @@ LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
-MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+MAKETDEWIDGETS = @MAKETDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MEINPROC = @MEINPROC@
 MOC = @MOC@
@@ -273,7 +273,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/src/k3bjobprogressosd_mod.cpp b/src/k3bjobprogressosd_mod.cpp
index 1431bf3..cf1ed3e 100644
--- a/src/k3bjobprogressosd_mod.cpp
+++ b/src/k3bjobprogressosd_mod.cpp
@@ -21,13 +21,13 @@
 #include "k3bjobprogressosd_mod.h"
 
 
-#include <kwin.h>
+#include <twin.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <kcursor.h>
-#include <kconfig.h>
-#include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdeconfig.h>
+#include <tdelocale.h>
+#include <tdepopupmenu.h>
 
 #include <tqpixmap.h>
 #include <tqpainter.h>
@@ -115,7 +115,7 @@ void K3bJobProgressOSD::renderOSD()
   // ----------------------------------------
 
   // calculate needed size 
-    TQPixmap icon = KGlobal::iconLoader()->loadIcon( "klamav", KIcon::NoGroup, 32 );
+    TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "klamav", TDEIcon::NoGroup, 32 );
     int margin = 10;
     int textWidth = fontMetrics().width( m_text );
 
@@ -212,7 +212,7 @@ void K3bJobProgressOSD::mousePressEvent( TQMouseEvent* e )
     m_dragging = true;
   }
   else if( e->button() == RightButton ) {
-    KPopupMenu m;
+    TDEPopupMenu m;
     if( m.insertItem( i18n("Hide OSD") ) == m.exec( e->globalPos() ) )
       hide();
   }
@@ -279,7 +279,7 @@ TQPoint K3bJobProgressOSD::fixupPosition( const TQPoint& pp )
 }
 
 
-void K3bJobProgressOSD::readSettings( KConfigBase* c )
+void K3bJobProgressOSD::readSettings( TDEConfigBase* c )
 {
   TQString oldGroup = c->group();
   c->setGroup( "KlamOSD Position" );
@@ -291,7 +291,7 @@ void K3bJobProgressOSD::readSettings( KConfigBase* c )
 }
 
 
-void K3bJobProgressOSD::saveSettings( KConfigBase* c )
+void K3bJobProgressOSD::saveSettings( TDEConfigBase* c )
 {
   TQString oldGroup = c->group();
   c->setGroup( "KlamOSD Position" );
diff --git a/src/k3bjobprogressosd_mod.h b/src/k3bjobprogressosd_mod.h
index 123f43a..dc27699 100644
--- a/src/k3bjobprogressosd_mod.h
+++ b/src/k3bjobprogressosd_mod.h
@@ -21,7 +21,7 @@
 
 class TQPaintEvent;
 class TQMouseEvent;
-class KConfigBase;
+class TDEConfigBase;
 
 /**
  * An OSD displaying a text and a progress bar.
@@ -39,8 +39,8 @@ class K3bJobProgressOSD : public TQWidget
   int screen() const { return m_screen; }
   const TQPoint& position() const { return m_position; }
 
-  void readSettings( KConfigBase* );
-  void saveSettings( KConfigBase* );
+  void readSettings( TDEConfigBase* );
+  void saveSettings( TDEConfigBase* );
 
  public slots:
   void setScreen( int );
diff --git a/src/klamav-dropdown.desktop b/src/klamav-dropdown.desktop
index 5832531..870944a 100644
--- a/src/klamav-dropdown.desktop
+++ b/src/klamav-dropdown.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Actions=Scan
 Encoding=UTF-8
-ServiceTypes=all/allfiles,inode/directory
-ExcludeServiceTypes=application/x-iso
+X-TDE-ServiceTypes=all/allfiles,inode/directory
+X-TDE-ExcludeServiceTypes=application/x-iso
 Comment=KlamAV - Anti-Virus Manager
 Keywords=klamav
 Terminal=false
diff --git a/src/klamav.cpp b/src/klamav.cpp
index 4778c11..ab99910 100644
--- a/src/klamav.cpp
+++ b/src/klamav.cpp
@@ -17,46 +17,46 @@
 #include "configdialog.h"
 #include "klamavconfig.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tqpushbutton.h>
 #include <tqlayout.h>
 #include <ksystemtray.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 
 #include <tqdir.h>
 #include <tqfile.h>
 
-Klamav *kmain = 0L;
+Klamav *tdemain = 0L;
 
 
 
 Klamav::Klamav()
-    : KMainWindow( 0, "KlamAV " )
+    : TDEMainWindow( 0, "KlamAV " )
 {
 
 	downloadDBForWizard = false;
 	downloadClamAVForWizard = false;
 
-	kmain = this;
+	tdemain = this;
 	TQVBoxLayout *top = new TQVBoxLayout(this,10,10);
 	tab = new TQTabWidget(this);
 	
-  	_tray = new KSystemTray(kmain, "klamav tray");
+  	_tray = new KSystemTray(tdemain, "klamav tray");
 	_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_disabled"));
 	connect(_tray,SIGNAL(quitSelected()),SLOT(shuttingDown()));
 	
-	KPopupMenu *conf_menu = _tray->contextMenu();
-    EnableKlamd = new KAction(i18n("&Enable Auto-Scan"), "klamav_on_acc_enabled", 0,this, SLOT(contextEnable()),actionCollection(),"klamd_enable");
-    DisableKlamd = new KAction(i18n("&Disable Auto-Scan"),"klamav_on_acc_disabled", 0,this, SLOT(contextDisable()),actionCollection(),"klamd_disable");
+	TDEPopupMenu *conf_menu = _tray->contextMenu();
+    EnableKlamd = new TDEAction(i18n("&Enable Auto-Scan"), "klamav_on_acc_enabled", 0,this, SLOT(contextEnable()),actionCollection(),"klamd_enable");
+    DisableKlamd = new TDEAction(i18n("&Disable Auto-Scan"),"klamav_on_acc_disabled", 0,this, SLOT(contextDisable()),actionCollection(),"klamd_disable");
         
-	EnableFreshklam = new KAction(i18n("&Enable Auto-Updates"), "klamav", 0,this, SLOT(contextEnableFK()),actionCollection(),"fk_enable");
-    DisableFreshklam = new KAction(i18n("&Disable Auto-Updates"),"klamavbw", 0,this, SLOT(contextDisableFK()),actionCollection(),"fk_disable");
+	EnableFreshklam = new TDEAction(i18n("&Enable Auto-Updates"), "klamav", 0,this, SLOT(contextEnableFK()),actionCollection(),"fk_enable");
+    DisableFreshklam = new TDEAction(i18n("&Disable Auto-Updates"),"klamavbw", 0,this, SLOT(contextDisableFK()),actionCollection(),"fk_disable");
 
 	EnableFreshklam->plug(conf_menu);
 	DisableFreshklam->plug(conf_menu);
@@ -71,7 +71,7 @@ Klamav::Klamav()
 	DisableKlamd->setEnabled(FALSE);
 	EnableKlamd->setEnabled(TRUE);
 
-        KConfig* config = KGlobal::config();
+        TDEConfig* config = TDEGlobal::config();
         config->setGroup("Freshklam");
         TQStringList DatabasePaths = config->readListEntry("lastDownloadPaths");
 
@@ -126,8 +126,8 @@ Klamav::Klamav()
 
 	KStdAction::quit(this, SLOT(shuttingDown()), actionCollection());
   
-  	if (KApplication::kApplication()->isRestored()){
-/*		config = KGlobal::config();
+  	if (TDEApplication::kApplication()->isRestored()){
+/*		config = TDEGlobal::config();
 		config->setGroup("Klamd");
 		TQString RunKlamd = config->readEntry("Enabled");
 		
@@ -249,7 +249,7 @@ void Klamav::firstRunWizard() {
         TQString defaultquar = homepath + "/.klamav/quarantine";
         if( wizard.exec() != TQDialog::Rejected ){
     
-            KConfig* config = KGlobal::config();
+            TDEConfig* config = TDEGlobal::config();
 
             config->setGroup("Freshklam");
             
@@ -334,11 +334,11 @@ void  Klamav::checkDir(TQString path){
 void Klamav::slotConfigKlamav( const TQCString& page )
 {
 
-    KlamavConfigDialog* dialog = (KlamavConfigDialog*) KConfigDialog::exists( "settings" );
+    KlamavConfigDialog* dialog = (KlamavConfigDialog*) TDEConfigDialog::exists( "settings" );
 
     if( !dialog )
     {
-        //KConfigDialog didn't find an instance of this dialog, so lets create it :
+        //TDEConfigDialog didn't find an instance of this dialog, so lets create it :
         dialog = new KlamavConfigDialog( this, "settings", KlamavConfig::self() );
         //connect( dialog, SIGNAL(settingsChanged()), SLOT(applySettings()) );
     }
diff --git a/src/klamav.desktop b/src/klamav.desktop
index fba4d75..5c32197 100644
--- a/src/klamav.desktop
+++ b/src/klamav.desktop
@@ -4,7 +4,7 @@ Name=KlamAV
 Exec=klamav %i %m -caption "%c"
 Icon=klamav
 Type=Application
-DocPath=klamav/klamav.html
+X-DocPath=klamav/klamav.html
 Comment=An Anti-Virus Manager
 Comment[cs]=An Anti-Virus Manager
 Comment[da]=An Anti-Virus Manager
@@ -38,4 +38,4 @@ Comment[zh_CN.GB2312]=An Anti-Virus Manager
 Terminal=0
 GenericName=Anti-Virus Manager
 GenericName[fr]=Anti-Virus Manager
-Categories=Qt;KDE;Application;System;
+Categories=Qt;TDE;Application;System;
diff --git a/src/klamav.h b/src/klamav.h
index 80552fa..01a0b07 100644
--- a/src/klamav.h
+++ b/src/klamav.h
@@ -9,14 +9,14 @@
 #include <config.h>
 #endif
 
-#include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdeapplication.h>
+#include <tdemainwindow.h>
 #include <tqtabwidget.h>
 
 #include <stdlib.h>
 
 class KPrinter;
-class KToggleAction;
+class TDEToggleAction;
 class KURL;
 class TQLineEdit;
 class TQComboBox;
@@ -24,8 +24,8 @@ class TQCheckBox;
 class TQListBox;
 class TQPushButton;
 class TQLabel;
-class KProcess;
-class KConfig;
+class TDEProcess;
+class TDEConfig;
 class KURLRequester;
 class Freshklam;
 class Sigtool;
@@ -46,7 +46,7 @@ class KSystemTray;
  * @author $AUTHOR <$EMAIL>
  * @version $APP_VERSION
  */
-class Klamav : public KMainWindow
+class Klamav : public TDEMainWindow
 {
     Q_OBJECT
 public:
@@ -67,10 +67,10 @@ public:
 
     KlamavDock *m_dock;
     KSystemTray *_tray;
-    KAction *EnableKlamd;
-    KAction *DisableKlamd;
-    KAction *EnableFreshklam;
-    KAction *DisableFreshklam;
+    TDEAction *EnableKlamd;
+    TDEAction *DisableKlamd;
+    TDEAction *EnableFreshklam;
+    TDEAction *DisableFreshklam;
     Klamd *klamd;
     Freshklam *freshklam;
     bool firstDownload;
@@ -99,14 +99,14 @@ protected:
      * This function is called when it is time for the app to save its
      * properties for session management purposes.
      */
-    //void saveProperties(KConfig *);
+    //void saveProperties(TDEConfig *);
 
     /**
-     * This function is called when this app is restored.  The KConfig
+     * This function is called when this app is restored.  The TDEConfig
      * object points to the session management config file that was saved
      * with @ref saveProperties
      */
-    //void readProperties(KConfig *);
+    //void readProperties(TDEConfig *);
 
 public slots:
 	void contextDisable();
@@ -148,9 +148,9 @@ private:
     TQListBox *resultbox;
     TQPushButton *search_button, *cancel_button;
     TQLabel *status_label, *matches_label;
-    KProcess *childproc;
+    TDEProcess *childproc;
     TQString buf;
-    KConfig* config;
+    TDEConfig* config;
     TQStringList lastSearchItems;
     TQStringList lastSearchPaths;
     Sigtool *sigtool;
@@ -158,6 +158,6 @@ private:
     
 };
 
-extern Klamav *kmain;
+extern Klamav *tdemain;
 
 #endif // _KLAMAV_H_
diff --git a/src/klamav_run.h b/src/klamav_run.h
index 0e9280f..76a0f8d 100644
--- a/src/klamav_run.h
+++ b/src/klamav_run.h
@@ -8,7 +8,7 @@
 #ifndef KLAMAV_RUN_H 
 #define KLAMAV_RUN_H
 
-#include <kparts/browserrun.h>
+#include <tdeparts/browserrun.h>
 
 namespace KlamAV
 {
diff --git a/src/klamavconfig.kcfgc b/src/klamavconfig.kcfgc
index 3292c2b..c8f883a 100644
--- a/src/klamavconfig.kcfgc
+++ b/src/klamavconfig.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=klamavconfig.kcfg
 ClassName=KlamavConfig
 Singleton=true
diff --git a/src/klamd.cpp b/src/klamd.cpp
index f8b6c89..e6d6859 100644
--- a/src/klamd.cpp
+++ b/src/klamd.cpp
@@ -10,21 +10,21 @@
 
 
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <karrowbutton.h>
 
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include <tqcheckbox.h>
 #include <kbuttonbox.h>
 #include <kprocio.h>
 #include <kurlrequester.h>
 #include <tqlayout.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
 #include <ksystemtray.h>
 #include <tqtoolbutton.h>
 #include <knotifyclient.h>
@@ -98,7 +98,7 @@ Klamd::Klamd(TQWidget *_parent, const char *name)
 
        sessionslb = new MyListBox(hlp);
        
-	config = KGlobal::config();
+	config = TDEGlobal::config();
 	config->setGroup("Klamd");
 	includePaths = config->readListEntry("IncludePaths");
 	if (!(includePaths.isEmpty()))
@@ -146,7 +146,7 @@ Klamd::Klamd(TQWidget *_parent, const char *name)
 	
 
        sessionslb2 = new MyListBox(hlp2);
-       	//config = KGlobal::config();
+       	//config = TDEGlobal::config();
 	config->setGroup("Klamd");
 	excludePaths = config->readListEntry("ExcludePaths");
 	if (!(excludePaths.isEmpty()))
@@ -266,7 +266,7 @@ Klamd::Klamd(TQWidget *_parent, const char *name)
 	connect( cancel_button, SIGNAL(clicked()),
 		SLOT(slotCancel()) );
 */
-	if (KApplication::kApplication()->isRestored())
+	if (TDEApplication::kApplication()->isRestored())
 		restoreKlamd();
 
 //	KStdAction::quit(this, SLOT(hide()), actionCollection());
@@ -282,7 +282,7 @@ Klamd::~Klamd()
 
 	}
 	if (!(tempFileName.isEmpty()))
-		KIO::NetAccess::del(tempFileName,NULL);
+		TDEIO::NetAccess::del(tempFileName,NULL);
 
 }
 
@@ -306,14 +306,14 @@ void Klamd::processOutput()
 			tmpVirusName.replace("FOUND","");
             CollectionDB::instance()->insertEvent("Virus Found",tmpVirusName,tmpFName);
             if (recursive_box1->isChecked())
-                KNotifyClient::event(kmain->_tray->winId(),i18n( "ScanCompleteNoVirus" ), i18n( "Virus %1 Found In %2 by Auto-Scan!" ).arg(tmpVirusName).arg(tmpFName));
+                KNotifyClient::event(tdemain->_tray->winId(),i18n( "ScanCompleteNoVirus" ), i18n( "Virus %1 Found In %2 by Auto-Scan!" ).arg(tmpVirusName).arg(tmpFName));
 			if (recursive_box->isChecked())
 				Quarantine(tmpFName.stripWhiteSpace(),tmpVirusName.stripWhiteSpace());
 		}
 		if ((pos = (item2.find("ERROR: Clamuko: Can't register with Dazuko"))) != -1){
             finish();
 			KMessageBox::information (this,i18n( "Can't Start On-Access Scanning! Check you have read permissions on file /dev/dazuko.") );
-            KNotifyClient::event(kmain->_tray->winId(),i18n( "Can't Start On-Access Scanning!" ), i18n( "Check you have read permissions on file /dev/dazuko." ));
+            KNotifyClient::event(tdemain->_tray->winId(),i18n( "Can't Start On-Access Scanning!" ), i18n( "Check you have read permissions on file /dev/dazuko." ));
             return;
 		}
 
@@ -333,7 +333,7 @@ void Klamd::processOutput()
 bool Klamd::startKlamd()
 {
 
-	config = KGlobal::config();
+	config = TDEGlobal::config();
 	config->setGroup("Klamd");
 	if ((config->readListEntry("IncludePaths")).isEmpty()){
 		KMessageBox::information (this,i18n("You haven't specified any paths to scan. Select the directories you want to KlamAV to keep an eye on and try again.")); 
@@ -361,12 +361,12 @@ void Klamd::finish()
 {
 	search_button->setEnabled(true);
 	cancel_button->setEnabled(false);
-	//config = KGlobal::config();
-  	if (!KApplication::kApplication()->closingDown()){
+	//config = TDEGlobal::config();
+  	if (!TDEApplication::kApplication()->closingDown()){
         config->setGroup("Klamd");
         config->writeEntry("Enabled", "No");
     }
-    kmain->clamdStopped();
+    tdemain->clamdStopped();
 	
 	buf += '\n';
     if (childproc){
@@ -379,7 +379,7 @@ void Klamd::finish()
 	klamdAlive = FALSE;
 	enableInputs();
  	if (!(tempFileName.isEmpty()))
- 		KIO::NetAccess::del(tempFileName,NULL);
+ 		TDEIO::NetAccess::del(tempFileName,NULL);
 
 
 }
@@ -400,7 +400,7 @@ void Klamd::childExited()
 // 
 //     kdDebug() << "klamd status" << status << endl;
 
-    kmain->contextDisable();
+    tdemain->contextDisable();
     
     KMessageBox::information (this,i18n( "The auto-scan process died unexpectedly!") );
 
@@ -438,7 +438,7 @@ void Klamd::slotAddIncludeDir()
 		if ((includePaths.contains(filepa) == 0) && (excludePaths.contains(filepa) == 0)){
 			sessionslb->insertItem(filepa);
 	
-			//config = KGlobal::config();
+			//config = TDEGlobal::config();
 			config->setGroup("Klamd");
 			
 			if (includePaths.contains(filepa) == 0) {
@@ -465,7 +465,7 @@ void Klamd::slotDelIncludeDir()
 
 	sessionslb->removeItem(sessionslb->currentItem());
 	
-	//config = KGlobal::config();
+	//config = TDEGlobal::config();
 	config->setGroup("Klamd");
 	config->writeEntry("IncludePaths", includePaths);
 	config->sync();
@@ -487,7 +487,7 @@ void Klamd::slotAddExcludeDir()
 		if ((includePaths.contains(filepa) == 0) && (excludePaths.contains(filepa) == 0)){
 			sessionslb2->insertItem(filepa);
 
-			//config = KGlobal::config();
+			//config = TDEGlobal::config();
 			config->setGroup("Klamd");
 			
 			if (excludePaths.contains(filepa) == 0) {
@@ -513,7 +513,7 @@ void Klamd::slotDelExcludeDir()
 	
 	sessionslb2->removeItem(sessionslb2->currentItem());
 	
-	//config = KGlobal::config();
+	//config = TDEGlobal::config();
 	config->setGroup("Klamd");
 	config->writeEntry("ExcludePaths", excludePaths);
 	config->sync();
@@ -535,7 +535,7 @@ void Klamd::writeConf()
       }
 
 
-	//config = KGlobal::config();
+	//config = TDEGlobal::config();
 	config->setGroup("Kuarantine");
 	TQStringList lastQuarLocations = config->readListEntry("KuarantineLocations");
 	TQString quarloc;
@@ -543,7 +543,7 @@ void Klamd::writeConf()
 			quarloc = *ita;
 	}
 	
-	TQString db = kmain->freshklam->getCurrentDBDir();
+	TQString db = tdemain->freshklam->getCurrentDBDir();
 
 
       //tf->setAutoDelete(TRUE);
@@ -613,7 +613,7 @@ void Klamd::writeConf()
 
 void  Klamd::Quarantine(TQString fname, TQString virusname){
 
-	//config = KGlobal::config();
+	//config = TDEGlobal::config();
 	config->setGroup("Kuarantine");
 	//object.replace("Clamuko:","");
 	//object = object.stripWhiteSpace();
@@ -695,7 +695,7 @@ void  Klamd::Quarantine(TQString fname, TQString virusname){
 	config->writeEntry(TQString("Items %1").arg(quarloc), lastQuarItems);
 	//config->sync();
 	
-	//kmain->kuarantine->refresh();
+	//tdemain->kuarantine->refresh();
 	//kdDebug() << "finished klamd quar" << endl;
 }
 
@@ -726,10 +726,10 @@ int  Klamd::runDazuko(bool caller){
 	connect( lsmodproc, SIGNAL(readReady(KProcIO *)),
 		SLOT(checkForDazuko()) );
 	if (caller){
-		connect( lsmodproc, SIGNAL(processExited(KProcess *)),
+		connect( lsmodproc, SIGNAL(processExited(TDEProcess *)),
 			SLOT(lsmodOutput()) );
 	}else{
-		connect( lsmodproc, SIGNAL(processExited(KProcess *)),
+		connect( lsmodproc, SIGNAL(processExited(TDEProcess *)),
 			SLOT(lsmodCheck()) );
 	}
 
@@ -767,7 +767,7 @@ void Klamd::loadKlamd()
 
 	klamdAlive = TRUE;
 	
-	//TQString suCommand=TQString("kdesu -t -c '" +clamdcommand+" -c '%1'").arg(tempFileName)+"'";
+	//TQString suCommand=TQString("tdesu -t -c '" +clamdcommand+" -c '%1'").arg(tempFileName)+"'";
     TQString suCommand=TQString(clamdcommand+" -c '%1'").arg(tempFileName);
 	childproc = new KProcIO();
 	childproc->setUseShell(TRUE);
@@ -782,19 +782,19 @@ void Klamd::loadKlamd()
 	connect( childproc, SIGNAL(readReady(KProcIO *)),
 		SLOT(receivedOutput(KProcIO *)) );
 	childproc->start(KProcIO::NotifyOnExit);
-	connect( childproc, SIGNAL(processExited(KProcess *)),
+	connect( childproc, SIGNAL(processExited(TDEProcess *)),
 			SLOT(childExited()) );
 	
 	search_button->setEnabled(false);
 	cancel_button->setEnabled(true);
 	
-/*	if (kmain->freshklam->isFreshklamAlive())
-		kmain->_tray->setPixmap(KSystemTray::loadIcon("klamavdl"));
+/*	if (tdemain->freshklam->isFreshklamAlive())
+		tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamavdl"));
 	else*/
-	kmain->_tray->setPixmap(KSystemTray::loadIcon("klamav"));
-	kmain->EnableKlamd->setEnabled(FALSE);
-	kmain->DisableKlamd->setEnabled(TRUE);
-	//config = KGlobal::config();
+	tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav"));
+	tdemain->EnableKlamd->setEnabled(FALSE);
+	tdemain->DisableKlamd->setEnabled(TRUE);
+	//config = TDEGlobal::config();
 	config->setGroup("Klamd");
 	config->writeEntry("Enabled", "Yes");
 	config->sync();
@@ -826,9 +826,9 @@ void Klamd::loadDazuko()
 	insmodproc->setEnvironment("PATH",curpath + ":/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin");
 
 	insmodproc->setUseShell(TRUE);
-	*insmodproc<<"kdesu -i klamav"<<"-c"<<insmodCommand;
+	*insmodproc<<"tdesu -i klamav"<<"-c"<<insmodCommand;
 	
-	connect( insmodproc, SIGNAL(processExited(KProcess *)),
+	connect( insmodproc, SIGNAL(processExited(TDEProcess *)),
 		SLOT(moduleLoaded()) );
 
 	insmodproc->start(KProcIO::NotifyOnExit);
@@ -878,7 +878,7 @@ void Klamd::checkForDazuko()
 
 void  Klamd::restoreKlamd(){
 
-	config = KGlobal::config();
+	config = TDEGlobal::config();
 	config->setGroup("Klamd");
 	TQString RunKlamd = config->readEntry("Enabled");
 	
@@ -890,7 +890,7 @@ void  Klamd::restoreKlamd(){
 
 void  Klamd::handleChecks(){
 
-	//config = KGlobal::config();
+	//config = TDEGlobal::config();
 	config->setGroup("Klamd");
 	if (recursive_box->isChecked())
 		config->writeEntry("Quarantine","Yes");
@@ -925,7 +925,7 @@ TQString  Klamd::getKlamdConfFile(){
 
 void  Klamd::slotAdvOptions(){
 
-/*	config = KGlobal::config();
+/*	config = TDEGlobal::config();
 	config->setGroup("Klamd");
 	TQString RunKlamd = config->readEntry("Enabled");
 
@@ -938,7 +938,7 @@ void  Klamd::slotAdvOptions(){
 	dialog->raise();
 	dialog->setActiveWindow();*/
 	
-	kmain->slotConfigKlamav( "Auto-Scan" );	
+	tdemain->slotConfigKlamav( "Auto-Scan" );	
 
 }
 
diff --git a/src/klamd.h b/src/klamd.h
index 66f8d71..e909d49 100644
--- a/src/klamd.h
+++ b/src/klamd.h
@@ -9,16 +9,16 @@
 #include <config.h>
 #endif
 
-#include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdeapplication.h>
+#include <tdemainwindow.h>
 #include <tqlistview.h>
 #include <tqlistbox.h>
-#include "kfiletreeview.h"
+#include "tdefiletreeview.h"
 
 
 
 class KPrinter;
-class KToggleAction;
+class TDEToggleAction;
 class KURL;
 class TQLineEdit;
 class TQComboBox;
@@ -26,8 +26,8 @@ class TQCheckBox;
 class TQListBox;
 class TQPushButton;
 class TQLabel;
-class KProcess;
-class KConfig;
+class TDEProcess;
+class TDEConfig;
 class KURLRequester;
 class K3bFileTreeView;
 class KArrowButton;
@@ -87,14 +87,14 @@ protected:
      * This function is called when it is time for the app to save its
      * properties for session management purposes.
      */
-    //void saveProperties(KConfig *);
+    //void saveProperties(TDEConfig *);
 
     /**
-     * This function is called when this app is restored.  The KConfig
+     * This function is called when this app is restored.  The TDEConfig
      * object points to the session management config file that was saved
      * with @ref saveProperties
      */
-    //void readProperties(KConfig *);
+    //void readProperties(TDEConfig *);
 
 
 public:
@@ -106,8 +106,8 @@ private:
     //KlamdView *m_view;
 
   /*  KPrinter   *m_printer;
-    KToggleAction *m_toolbarAction;
-    KToggleAction *m_statusbarAction;*/
+    TDEToggleAction *m_toolbarAction;
+    TDEToggleAction *m_statusbarAction;*/
 
 
 signals:
@@ -159,7 +159,7 @@ private:
     KProcIO *proc; 
     KProcIO *lsmodproc;
     TQString buf, bufmv, mvbuffer;
-    KConfig* config;
+    TDEConfig* config;
     TQStringList lastSearchItems;
     TQStringList lastSearchPaths;
     TQStringList lastQuarItems;
diff --git a/src/klamdoptions.cpp b/src/klamdoptions.cpp
index ff7ccb6..a2b53a5 100644
--- a/src/klamdoptions.cpp
+++ b/src/klamdoptions.cpp
@@ -13,7 +13,7 @@
 #include <tqpushbutton.h>
 #include <kpushbutton.h>
 #include <kdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqgroupbox.h>
 #include <tqcombobox.h>
 #include <tqcheckbox.h>
@@ -21,8 +21,8 @@
 #include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
-#include <kconfig.h>
-#include <klocale.h>
+#include <tdeconfig.h>
+#include <tdelocale.h>
 
 const char *check_desc3[] = {
     "1",
@@ -156,7 +156,7 @@ void KlamdOptions::languageChange()
 
 void KlamdOptions::updateSettings()
 {
-	KConfig* config = KGlobal::config();
+	TDEConfig* config = TDEGlobal::config();
 	config->setGroup("Klamd");
 
 	config->writeEntry("Enabled", "No");
@@ -193,7 +193,7 @@ void KlamdOptions::updateSettings()
 
 void KlamdOptions::fetchSettings()
 {
-	config = KGlobal::config();
+	config = TDEGlobal::config();
 	config->setGroup("Klamd");
 
 
diff --git a/src/klamdoptions.h b/src/klamdoptions.h
index 3a5a696..7f5d658 100644
--- a/src/klamdoptions.h
+++ b/src/klamdoptions.h
@@ -23,7 +23,7 @@ class TQGroupBox;
 class TQComboBox;
 class TQCheckBox;
 class TQLabel;
-class KConfig;
+class TDEConfig;
 
 class KlamdOptions : public TQDialog
 {
@@ -45,7 +45,7 @@ public:
     TQCheckBox* Executed;
     TQCheckBox* Opened;
     TQCheckBox* Closed;
-    KConfig* config;
+    TDEConfig* config;
 private:
 
     void fetchSettings();
diff --git a/src/klammail/Makefile.in b/src/klammail/Makefile.in
index 818d5f9..cb84bbc 100644
--- a/src/klammail/Makefile.in
+++ b/src/klammail/Makefile.in
@@ -170,24 +170,24 @@ LIBZ = @LIBZ@
 LIB_CLAM = @LIB_CLAM@
 LIB_KAB = @LIB_KAB@
 LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
+LIB_TDECORE = @LIB_TDECORE@
 LIB_KDED = @LIB_KDED@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KDNSSD = @LIB_KDNSSD@
+LIB_TDEPIM = @LIB_TDEPIM@
+LIB_TDEPRINT = @LIB_TDEPRINT@
+LIB_TDEUI = @LIB_TDEUI@
+LIB_TDEDNSSD = @LIB_TDEDNSSD@
 LIB_KFILE = @LIB_KFILE@
 LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMPROXY = @LIB_KIMPROXY@
-LIB_KIO = @LIB_KIO@
+LIB_TDEHTML = @LIB_TDEHTML@
+LIB_TDEIMPROXY = @LIB_TDEIMPROXY@
+LIB_TDEIO = @LIB_TDEIO@
 LIB_KJS = @LIB_KJS@
 LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUNITTEST = @LIB_KUNITTEST@
-LIB_KUTILS = @LIB_KUTILS@
+LIB_TDEPARTS = @LIB_TDEPARTS@
+LIB_TDESPELL = @LIB_TDESPELL@
+LIB_TDESYCOCA = @LIB_TDESYCOCA@
+LIB_TDEUNITTEST = @LIB_TDEUNITTEST@
+LIB_TDEUTILS = @LIB_TDEUTILS@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
@@ -199,7 +199,7 @@ LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
-MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+MAKETDEWIDGETS = @MAKETDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MEINPROC = @MEINPROC@
 MOC = @MOC@
@@ -304,7 +304,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/src/klamscan.cpp b/src/klamscan.cpp
index a5dc91c..16de3c8 100644
--- a/src/klamscan.cpp
+++ b/src/klamscan.cpp
@@ -22,8 +22,8 @@
 
 #include <tqpushbutton.h>
 #include <tqlayout.h>
-#include <kcmdlineargs.h>
-#include <kmessagebox.h>
+#include <tdecmdlineargs.h>
+#include <tdemessagebox.h>
 #include <tqtooltip.h>
 #include <tqtoolbutton.h>
 #include <dcopclient.h>
@@ -71,7 +71,7 @@ Klamscan::Klamscan(TQWidget *parent, const char *name)
     
 
 
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
 
     TQLabel *combo_label = new TQLabel(i18n("When a virus is found:"), privateLayoutWidget2);
@@ -132,7 +132,7 @@ Klamscan::Klamscan(TQWidget *parent, const char *name)
     controls->setMargin(2);
 
     play = new TQToolButton( controls,"play" );
-    play->setIconSet( SmallIconSet( "player_play" ) );
+    play->setIconSet( SmallIconSet( "media-playback-start" ) );
     play->setTextLabel(i18n( "Scan" ));
     play->setTextPosition(TQToolButton::Right);
     play->setUsesTextLabel(true);
@@ -140,7 +140,7 @@ Klamscan::Klamscan(TQWidget *parent, const char *name)
     play->setFixedHeight(play->height() - 1);
 
     stop = new TQToolButton( controls,"stop" );
-    stop->setIconSet( SmallIconSet( "player_stop" ) );
+    stop->setIconSet( SmallIconSet( "media-playback-stop" ) );
     stop->setTextLabel(i18n( "Stop" ));
     stop->setTextPosition(TQToolButton::Right);
     stop->setUsesTextLabel(true);
@@ -213,7 +213,7 @@ void Klamscan::slotScan()
         SLOT( slotManageButtons(TQWidget *) ) );
 
 
-	kmain->_tray->setPixmap(KSystemTray::loadIcon("klamav_scanning"));
+	tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_scanning"));
 
     TQDate today = TQDate::currentDate();
     TQTime now = TQTime::currentTime();
@@ -227,7 +227,7 @@ void Klamscan::slotScan()
     
     TQStringList filepattern;
 
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
     
     if( args->isSet( "scanthis" ) ) {
         listOfUrlsToScan.clear();
@@ -260,7 +260,7 @@ void  Klamscan::slotAdvOptions(){
     dialog->raise();
     dialog->setActiveWindow();*/
 
-    kmain->slotConfigKlamav( "Archive Limits" );
+    tdemain->slotConfigKlamav( "Archive Limits" );
     
 
 }
@@ -286,7 +286,7 @@ void  Klamscan::slotSchedule(){
 
 void  Klamscan::setDefaults(){
 
-    config = KGlobal::config();
+    config = TDEGlobal::config();
     config->setGroup("ScanPaths");
     
     config->setGroup("Klamscan");
@@ -345,7 +345,7 @@ void Klamscan::scanURLs(const TQString &urls)
 {
     setActiveWindow();
     raise();
-    kmain->tab->setCurrentPage(0);
+    tdemain->tab->setCurrentPage(0);
 
     TQString tmpurls = urls;
     //urlsToScan = urlsToScan.replace("*"," ");
@@ -379,10 +379,10 @@ void Klamscan::scanURLs(const TQString &urls)
 
 void  Klamscan::slotStopScanning(){
 
-    if (kmain->klamd->isKlamdAlive())
-      kmain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_enabled"));
+    if (tdemain->klamd->isKlamdAlive())
+      tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_enabled"));
     else
-      kmain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_disabled"));
+      tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_disabled"));
 
     ////kdDebug() << tabBrowser->currentPage()->name() << endl;
     ScanViewer* cur = static_cast<ScanViewer*>(tabBrowser->currentPage());
@@ -408,10 +408,10 @@ void  Klamscan::slotStartAgain(){
 
 void  Klamscan::slotRemoveTab(){
 
-    if (kmain->klamd->isKlamdAlive())
-      kmain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_enabled"));
+    if (tdemain->klamd->isKlamdAlive())
+      tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_enabled"));
     else
-      kmain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_disabled"));
+      tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_disabled"));
     ////kdDebug() << tabBrowser->currentPage()->name() << endl;
     if (tabBrowser->currentPageIndex() != 0){
         slotStopScanning();
diff --git a/src/klamscan.h b/src/klamscan.h
index a765364..c8e02f5 100644
--- a/src/klamscan.h
+++ b/src/klamscan.h
@@ -9,13 +9,13 @@
 #include <config.h>
 #endif
 
-#include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdeapplication.h>
+#include <tdemainwindow.h>
 #include <dcopklamscan.h>
 
 
 class KPrinter;
-class KToggleAction;
+class TDEToggleAction;
 class KURL;
 class TQLineEdit;
 class TQComboBox;
@@ -25,8 +25,8 @@ class TQListView;
 class TQListViewItem;
 class TQPushButton;
 class TQLabel;
-class KProcess;
-class KConfig;
+class TDEProcess;
+class TDEConfig;
 class KURLRequester;
 class CollectionSetup;
 class TQToolButton;
@@ -78,11 +78,11 @@ protected:
      */
 
     /**
-     * This function is called when this app is restored.  The KConfig
+     * This function is called when this app is restored.  The TDEConfig
      * object points to the session management config file that was saved
      * with @ref saveProperties
      */
-    //void readProperties(KConfig *);
+    //void readProperties(TDEConfig *);
 
 
 private slots:
@@ -115,9 +115,9 @@ private:
     TQListView *resultview;
     TQPushButton *search_button, *cancel_button;
     TQLabel *status_label, *status2_label,*matches_label,*matches2_label;
-    KProcess *childproc;
+    TDEProcess *childproc;
     TQString buf;
-    KConfig* config;
+    TDEConfig* config;
     bool errorsEncountered;
     TQPopupMenu* menu;
     TQToolButton* adv_options;
diff --git a/src/klamscan.hpre b/src/klamscan.hpre
index 994328a..94f4d17 100644
--- a/src/klamscan.hpre
+++ b/src/klamscan.hpre
@@ -9,13 +9,13 @@
 #include <config.h>
 #endif
 
-#include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdeapplication.h>
+#include <tdemainwindow.h>
 #include <dcopklamscan.h>
 
 
 class KPrinter;
-class KToggleAction;
+class TDEToggleAction;
 class KURL;
 class TQLineEdit;
 class TQComboBox;
@@ -25,8 +25,8 @@ class TQListView;
 class TQListViewItem;
 class TQPushButton;
 class TQLabel;
-class KProcess;
-class KConfig;
+class TDEProcess;
+class TDEConfig;
 class KURLRequester;
 
 
@@ -70,14 +70,14 @@ protected:
      * This function is called when it is time for the app to save its
      * properties for session management purposes.
      */
-    //void saveProperties(KConfig *);
+    //void saveProperties(TDEConfig *);
 
     /**
-     * This function is called when this app is restored.  The KConfig
+     * This function is called when this app is restored.  The TDEConfig
      * object points to the session management config file that was saved
      * with @ref saveProperties
      */
-    //void readProperties(KConfig *);
+    //void readProperties(TDEConfig *);
 
 
 private slots:
@@ -104,8 +104,8 @@ private:
     //KlamscanView *m_view;
 
   /*  KPrinter   *m_printer;
-    KToggleAction *m_toolbarAction;
-    KToggleAction *m_statusbarAction;*/
+    TDEToggleAction *m_toolbarAction;
+    TDEToggleAction *m_statusbarAction;*/
 
 signals:
     void itemSelected(TQString abs_filename, int line);
@@ -117,7 +117,7 @@ private slots:
     //void dirButtonClicked();
     //void templateActivated(int index);
     void childExited();
-    void receivedOutput(KProcess *proc, char *buffer, int buflen);
+    void receivedOutput(TDEProcess *proc, char *buffer, int buflen);
     //void itemSelected(const TQString&);
     void slotSearch();
     void slotCancel();
@@ -144,9 +144,9 @@ private:
     TQListView *resultview;
     TQPushButton *search_button, *cancel_button;
     TQLabel *status_label, *status2_label,*matches_label,*matches2_label;
-    KProcess *childproc;
+    TDEProcess *childproc;
     TQString buf;
-    KConfig* config;
+    TDEConfig* config;
     TQStringList lastSearchItems;
     TQStringList lastScanPaths;
     TQStringList lastQuarItems;
diff --git a/src/klamscanoptions.cpp b/src/klamscanoptions.cpp
index 428cd5c..cb1140e 100644
--- a/src/klamscanoptions.cpp
+++ b/src/klamscanoptions.cpp
@@ -14,9 +14,9 @@
 #include <tqcheckbox.h>
 #include <tqbuttongroup.h>
 #include <kurlrequester.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /*
  *  Constructs a KlamscanOptions as a child of 'parent', with the
@@ -221,7 +221,7 @@ void KlamscanOptions::languageChange()
 
 void KlamscanOptions::updateSettings()
 {
-	KConfig* config = KGlobal::config();
+	TDEConfig* config = TDEGlobal::config();
 	config->setGroup("Klamscan");
 
 	config->writeEntry("NoFilesToExtract", NoFilesToExtract->text());
@@ -332,7 +332,7 @@ void KlamscanOptions::updateSettings()
 
 void KlamscanOptions::fetchSettings()
 {
-	config = KGlobal::config();
+	config = TDEGlobal::config();
 	config->setGroup("Klamscan");
 
 	
diff --git a/src/klamscanoptions.h b/src/klamscanoptions.h
index 3ceeb29..bf7ca5a 100644
--- a/src/klamscanoptions.h
+++ b/src/klamscanoptions.h
@@ -24,7 +24,7 @@ class TQCheckBox;
 class TQButtonGroup;
 class KURLRequester;
 class TQPushButton;
-class KConfig;
+class TDEConfig;
 class KComboBox;
 
 class KlamscanOptions : public TQDialog
@@ -74,7 +74,7 @@ public:
     TQCheckBox* ExcludeQuarantine;
     TQPushButton* OK;
     TQPushButton* Cancel;
-    KConfig* config;
+    TDEConfig* config;
     KComboBox* zipedit;
 
 
diff --git a/src/kticon.cpp b/src/kticon.cpp
index 9fff86d..bc2af78 100644
--- a/src/kticon.cpp
+++ b/src/kticon.cpp
@@ -88,9 +88,9 @@ TQPixmap KTIcon::shell(bool mini)
 TQPixmap KTIcon::home(bool mini)
 {
   if (mini)
-    return getMiniIcon("gohome");
+    return getMiniIcon("go-home");
   else
-    return getIcon("gohome");
+    return getIcon("go-home");
 }
 
 TQPixmap KTIcon::path(bool mini)
diff --git a/src/ktlistcron.cpp b/src/ktlistcron.cpp
index d45b723..5dbc48a 100644
--- a/src/ktlistcron.cpp
+++ b/src/ktlistcron.cpp
@@ -11,7 +11,7 @@
 
 #include "ktlistcron.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "ctcron.h"
 
diff --git a/src/ktlisttasks.cpp b/src/ktlisttasks.cpp
index a5eba31..6a44456 100644
--- a/src/ktlisttasks.cpp
+++ b/src/ktlisttasks.cpp
@@ -12,7 +12,7 @@
 #include "ktlisttasks.h"
 
 
-#include <klocale.h>  // i18n()
+#include <tdelocale.h>  // i18n()
 
 
 #include "kticon.h"
@@ -65,7 +65,7 @@ void KTListTasks::refresh()
 // 
 //   stnd = printer.getFont();
 // 
-//   printer.setFont(TQFont( KGlobalSettings::generalFont().family(), 10, TQFont::Bold ));
+//   printer.setFont(TQFont( TDEGlobalSettings::generalFont().family(), 10, TQFont::Bold ));
 //   printer.print (i18n("Task name:"), 1, KTPrint::alignTextLeft);
 //   printer.print (i18n("Program:"), 2, KTPrint::alignTextCenter);
 //   printer.print (i18n("Description:"),3,KTPrint::alignTextRight);
diff --git a/src/ktview.cpp b/src/ktview.cpp
index 4225595..dd018a1 100644
--- a/src/ktview.cpp
+++ b/src/ktview.cpp
@@ -295,11 +295,11 @@ void KTView::refresh()
 //     .arg(TQString::fromLocal8Bit(hostName));
 // 
 //   stnd = printer.getFont();
-//   printer.setFont(TQFont( KGlobalSettings::generalFont().family(), 14, TQFont::Bold ));
+//   printer.setFont(TQFont( TDEGlobalSettings::generalFont().family(), 14, TQFont::Bold ));
 // 
 //   printer.print (i18n("Scheduled Tasks"), 2, KTPrint::alignTextCenter, false);
 //   printer.print (logonInfo, 2, KTPrint::alignTextCenter, false);
-//   printer.print (KGlobal::locale()->formatDateTime(now), 2, KTPrint::alignTextCenter, false);
+//   printer.print (TDEGlobal::locale()->formatDateTime(now), 2, KTPrint::alignTextCenter, false);
 //   printer.setFont(stnd);
 // 
 //   printer.levelColumns(20);
diff --git a/src/kuarantine.cpp b/src/kuarantine.cpp
index fdb335f..03b0847 100644
--- a/src/kuarantine.cpp
+++ b/src/kuarantine.cpp
@@ -9,13 +9,13 @@
 #include "klamav.h"
 
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kstatusbar.h>
 #include <kkeydialog.h>
-#include <kio/netaccess.h>
-#include <kfiledialog.h>
+#include <tdeio/netaccess.h>
+#include <tdefiledialog.h>
 
 
 
@@ -24,7 +24,7 @@
 #include <kurlcompletion.h>
 #include <kcombobox.h>
 #include <tqlayout.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 
 
@@ -32,7 +32,7 @@ Kuarantine::Kuarantine(TQWidget *parent, const char *name)
     : TQWidget(parent, name)
 {
 
-    config = KGlobal::config();
+    config = TDEGlobal::config();
     config->setGroup("Kuarantine");
     lastQuarLocations = config->readListEntry("KuarantineLocations");
 
@@ -42,7 +42,7 @@ Kuarantine::Kuarantine(TQWidget *parent, const char *name)
      }else{
         for (TQStringList::Iterator it = lastQuarLocations.begin(); it == lastQuarLocations.begin(); it++ )
         quarloc = *it;
-        if (!(KIO::NetAccess::exists(quarloc,TRUE,NULL))){
+        if (!(TDEIO::NetAccess::exists(quarloc,TRUE,NULL))){
             KMessageBox::information (this,i18n( "Your current quarantine location ('%1') no longer exists. I'm going to attempt to create a new one.").arg(quarloc));
             createQuarDir();
         }
@@ -250,11 +250,11 @@ void Kuarantine::refresh()
 
 
     TQStringList obsoleteQuarItems;
-    config = KGlobal::config();
+    config = TDEGlobal::config();
     config->setGroup("Kuarantine");
     lastQuarItems = config->readListEntry(TQString("Items %1").arg(quarloc));
     
-    if (!(KIO::NetAccess::exists(quarloc,TRUE,NULL))){
+    if (!(TDEIO::NetAccess::exists(quarloc,TRUE,NULL))){
         KMessageBox::information (this,i18n("Your current quarantine location ('%1') no longer exists. I'm going to attempt to create a new one.").arg(quarloc));
         createQuarDir();
     }else{
@@ -273,7 +273,7 @@ void Kuarantine::refresh()
                 qname.prepend(quarloc);
                 qname.append(":"+when);
                 //kdDebug() << qname << endl;
-                if (KIO::NetAccess::exists(qname,TRUE,NULL)){
+                if (TDEIO::NetAccess::exists(qname,TRUE,NULL)){
                     //currentbox->insertItem(*it);
                     new TQListViewItem( currentbox, fname, itemname,when);
                 }else{
@@ -293,7 +293,7 @@ void Kuarantine::refresh()
 
 void Kuarantine::refreshhistory()
 {
-    config = KGlobal::config();
+    config = TDEGlobal::config();
     config->setGroup("Kuarantine");
     lastHistoryItems = config->readListEntry(TQString("History %1").arg(quarloc));
 
@@ -338,7 +338,7 @@ void Kuarantine::slotSearch()
         while ( it.current() ) {
 
         TQListViewItem* tItem = it.current();
-        config = KGlobal::config();
+        config = TDEGlobal::config();
         config->setGroup("Kuarantine");
         lastQuarItems = config->readListEntry(TQString("Items %1").arg(quarloc));
         lastHistoryItems = config->readListEntry(TQString("History %1").arg(quarloc));
@@ -351,7 +351,7 @@ void Kuarantine::slotSearch()
         qname.prepend(quarloc);
         qname.append(":"+tItem->text(2));
         
-        if (KIO::NetAccess::file_move(qname,fname)){
+        if (TDEIO::NetAccess::file_move(qname,fname)){
             lastQuarItems.remove(tItem->text(0)+":"+tItem->text(1)+":"+tItem->text(2));
             
             //currentbox->takeItem(currentbox->currentItem());
@@ -378,7 +378,7 @@ void Kuarantine::updateLastQuarLocations()
 {
 
 
-    config = KGlobal::config();
+    config = TDEGlobal::config();
     config->setGroup("Kuarantine");
     lastQuarLocations = config->readListEntry("KuarantineLocations");
     
@@ -416,7 +416,7 @@ void Kuarantine::slotCancel()
             
         //TQListViewItem* tItem = ( *it );
         //if (tItem->isSelected()){
-            config = KGlobal::config();
+            config = TDEGlobal::config();
             config->setGroup("Kuarantine");
             lastQuarItems = config->readListEntry(TQString("Items %1").arg(quarloc));
             lastHistoryItems = config->readListEntry(TQString("History %1").arg(quarloc));
@@ -436,7 +436,7 @@ void Kuarantine::slotCancel()
             qname.prepend(QuarLocation);
             qname.append(":"+( it.current() )->text(2));
             
-            if (KIO::NetAccess::del(qname,NULL)){
+            if (TDEIO::NetAccess::del(qname,NULL)){
         
                 lastQuarItems.remove(( it.current() )->text(0)+":"+( it.current() )->text(1)+":"+( it.current() )->text(2));
                 lastHistoryItems.prepend(( it.current() )->text(0)+":"+( it.current() )->text(1)+":"+( it.current() )->text(2));
@@ -473,7 +473,7 @@ void Kuarantine::slotClearHistory()
 {
 
     historybox->clear();
-    config = KGlobal::config();
+    config = TDEGlobal::config();
     config->setGroup("Kuarantine");
     lastHistoryItems = config->readListEntry(TQString("History %1").arg(quarloc));
 
@@ -551,7 +551,7 @@ void  Kuarantine::createQuarDir(){
     if (ok){
         quarloc = TQString("%1").arg(path);
         lastQuarLocations.append( TQString("%1").arg(path));
-        config = KGlobal::config();
+        config = TDEGlobal::config();
         config->setGroup("Kuarantine");
         config->writeEntry("KuarantineLocations", lastQuarLocations);
         config->sync();
@@ -612,25 +612,25 @@ void Kuarantine::slotRMB( TQListViewItem* Item, const TQPoint & point, int )
 
         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 );
 
         iconPath = locate("cache", KMimeType::favIconForURL("http://www.viruslist.com")+".png");
         if ( iconPath.isEmpty() )
-          vlicon = SmallIcon("find");
+          vlicon = SmallIcon("edit-find");
         else
           vlicon = TQPixmap( iconPath );
 
@@ -658,50 +658,50 @@ void Kuarantine::slotRMB( TQListViewItem* Item, const TQPoint & point, int )
 void Kuarantine::slotVirusPoolCurrent()
 {
     TQString name = currentbox->currentItem()->text(1);
-    kmain->klamdb->slotExternal(name,"VirusPool");
+    tdemain->klamdb->slotExternal(name,"VirusPool");
 }
 
 void Kuarantine::slotVirusListCurrent()
 {
     TQString name = currentbox->currentItem()->text(1);
-    kmain->klamdb->slotExternal(name,"VirusList");
+    tdemain->klamdb->slotExternal(name,"VirusList");
 }
 
 void Kuarantine::slotGoogleCurrent()
 {
     TQString name = currentbox->currentItem()->text(1);
-    kmain->klamdb->slotExternal(name,"Google");
+    tdemain->klamdb->slotExternal(name,"Google");
 }
 
 void Kuarantine::slotTrendMicroCurrent()
 {
     TQString name = currentbox->currentItem()->text(1);
-    kmain->klamdb->slotExternal(name, "TrendMicro");
+    tdemain->klamdb->slotExternal(name, "TrendMicro");
 }
 
 
 void Kuarantine::slotVirusPoolHistory()
 {
     TQString name = historybox->currentItem()->text(1);
-    kmain->klamdb->slotExternal(name,"VirusPool");
+    tdemain->klamdb->slotExternal(name,"VirusPool");
 }
 
 void Kuarantine::slotVirusListHistory()
 {
     TQString name = historybox->currentItem()->text(1);
-    kmain->klamdb->slotExternal(name,"VirusList");
+    tdemain->klamdb->slotExternal(name,"VirusList");
 }
 
 void Kuarantine::slotGoogleHistory()
 {
     TQString name = historybox->currentItem()->text(1);
-    kmain->klamdb->slotExternal(name,"Google");
+    tdemain->klamdb->slotExternal(name,"Google");
 }
 
 void Kuarantine::slotTrendMicroHistory()
 {
     TQString name = historybox->currentItem()->text(1);
-    kmain->klamdb->slotExternal(name, "TrendMicro");
+    tdemain->klamdb->slotExternal(name, "TrendMicro");
 }
 
 #include "kuarantine.moc"
diff --git a/src/kuarantine.h b/src/kuarantine.h
index 4dfc9bd..060442a 100644
--- a/src/kuarantine.h
+++ b/src/kuarantine.h
@@ -9,13 +9,13 @@
 #include <config.h>
 #endif
 
-#include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdeapplication.h>
+#include <tdemainwindow.h>
 
 
 
 class KPrinter;
-class KToggleAction;
+class TDEToggleAction;
 class KURL;
 class TQLineEdit;
 class TQComboBox;
@@ -23,8 +23,8 @@ class TQCheckBox;
 class TQListView;
 class TQPushButton;
 class TQLabel;
-class KProcess;
-class KConfig;
+class TDEProcess;
+class TDEConfig;
 class KURLRequester;
 class TQListViewItem;
 
@@ -74,14 +74,14 @@ protected:
      * This function is called when it is time for the app to save its
      * properties for session management purposes.
      */
-    //void saveProperties(KConfig *);
+    //void saveProperties(TDEConfig *);
 
     /**
-     * This function is called when this app is restored.  The KConfig
+     * This function is called when this app is restored.  The TDEConfig
      * object points to the session management config file that was saved
      * with @ref saveProperties
      */
-    //void readProperties(KConfig *);
+    //void readProperties(TDEConfig *);
 
 
 private slots:
@@ -109,8 +109,8 @@ private:
     //KuarantineView *m_view;
 
   /*  KPrinter   *m_printer;
-    KToggleAction *m_toolbarAction;
-    KToggleAction *m_statusbarAction;*/
+    TDEToggleAction *m_toolbarAction;
+    TDEToggleAction *m_statusbarAction;*/
 
 
 signals:
@@ -147,9 +147,9 @@ private:
     TQListView *historybox;
     TQPushButton *search_button, *cancel_button, *refresh_button, *search_button3, *cancel_button3;
     TQLabel *status_label, *matches_label;
-    KProcess *childproc;
+    TDEProcess *childproc;
     TQString buf;
-    KConfig* config;
+    TDEConfig* config;
     TQStringList lastQuarItems;
     TQStringList lastHistoryItems;
     TQStringList lastQuarLocations;
diff --git a/src/main.cpp b/src/main.cpp
index 00c39dc..f7f0191 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5,8 +5,8 @@
 #include "klamav.h"
 #include "version.h"
 #include "klamavconfig.h"
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <kuniqueapplication.h>
 
 static const char *description =
@@ -15,7 +15,7 @@ static const char *description =
 static const char *version = KLAMAV_VERSION;
 //static const char title[] = "KlamAV";
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
     { "+[URL]", I18N_NOOP( "Document to open." ), 0 },
     { "scanthis", I18N_NOOP("Scan this..."), 0 },
@@ -24,11 +24,11 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char **argv)
 {
-    KAboutData about("klamav", I18N_NOOP(""), version, description,
-                     KAboutData::License_GPL, "(C) 2004 Robert Hogan", 0, 0, "robert at roberthogan dot net");
+    TDEAboutData about("klamav", I18N_NOOP(""), version, description,
+                     TDEAboutData::License_GPL, "(C) 2004 Robert Hogan", 0, 0, "robert at roberthogan dot net");
     about.addAuthor( "Robert Hogan", 0, "robert at roberthogan dot net" );
-    KCmdLineArgs::init(argc, argv, &about);
-    KCmdLineArgs::addCmdLineOptions(options);
+    TDECmdLineArgs::init(argc, argv, &about);
+    TDECmdLineArgs::addCmdLineOptions(options);
     KUniqueApplication app;
     
 
@@ -42,7 +42,7 @@ int main(int argc, char **argv)
     //else
     //{
         // no session.. just start up normally
-        KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+        TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
         if (args->count() == 0)
         {
             new Klamav;
diff --git a/src/pageviewer.cpp b/src/pageviewer.cpp
index 64b3265..849c833 100644
--- a/src/pageviewer.cpp
+++ b/src/pageviewer.cpp
@@ -9,12 +9,12 @@
 //#include "feediconmanager.h"
 #include "pageviewer.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kbookmarkmanager.h>
-#include <khtml_settings.h>
+#include <tdehtml_settings.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdelocale.h>
+#include <tdepopupmenu.h>
 
 
 #include <tqmetaobject.h>
@@ -26,13 +26,13 @@ PageViewer::PageViewer(TQWidget *parent, const char *name)
     : Viewer(parent, name)
 {
     // this hack is necessary since the part looks for []HTML Settings] in
-    // KGlobal::config() by default, which is wrong when running in Kontact
-    KHTMLSettings* s = const_cast<KHTMLSettings*> (settings());
+    // TDEGlobal::config() by default, which is wrong when running in Kontact
+    TDEHTMLSettings* s = const_cast<TDEHTMLSettings*> (settings());
     //s->init(Settings::self()->config());
     s->init();
     //setXMLFile(locate("data", "akregator/pageviewer.rc"), true);
     
-    m_backAction = new KToolBarPopupAction(i18n("Back"), "back", 0, this, SLOT(slotBack()), actionCollection(), "pageviewer_back");
+    m_backAction = new TDEToolBarPopupAction(i18n("Back"), "back", 0, this, SLOT(slotBack()), actionCollection(), "pageviewer_back");
 
     connect(m_backAction->popupMenu(), SIGNAL(aboutToShow()),
             this, SLOT(slotBackAboutToShow()));
@@ -40,17 +40,17 @@ PageViewer::PageViewer(TQWidget *parent, const char *name)
             this, SLOT(slotPopupActivated(int)));
 
     
-    m_forwardAction = new KToolBarPopupAction(i18n("Forward"), "forward", 0, this, SLOT(slotForward()), actionCollection(), "pageviewer_forward");
+    m_forwardAction = new TDEToolBarPopupAction(i18n("Forward"), "forward", 0, this, SLOT(slotForward()), actionCollection(), "pageviewer_forward");
 
     connect(m_forwardAction->popupMenu(), SIGNAL(aboutToShow()),
             this, SLOT(slotForwardAboutToShow()));
     connect(m_forwardAction->popupMenu(), SIGNAL(activated(int)),
             this, SLOT(slotPopupActivated(int)));
 
-    m_reloadAction = new KAction(i18n("Reload"), "reload", 0,
+    m_reloadAction = new TDEAction(i18n("Reload"), "reload", 0,
                             this, SLOT(slotReload()),
                             actionCollection(), "pageviewer_reload");
-    m_stopAction = new KAction(i18n("Stop"), "stop", 0,
+    m_stopAction = new TDEAction(i18n("Stop"), "stop", 0,
                                  this, SLOT(slotStop()),
                                  actionCollection(), "pageviewer_stop");
 
@@ -60,7 +60,7 @@ PageViewer::PageViewer(TQWidget *parent, const char *name)
     m_forwardAction->setEnabled(false);
     m_stopAction->setEnabled(false);
     
-    connect(this, SIGNAL(started(KIO::Job *)), this, SLOT(slotStarted(KIO::Job* )));
+    connect(this, SIGNAL(started(TDEIO::Job *)), this, SLOT(slotStarted(TDEIO::Job* )));
     connect(this, SIGNAL(completed()), this, SLOT(slotCompleted()));
     connect(this, SIGNAL(canceled(const TQString &)), this, SLOT(slotCancelled(const TQString &)));
 
@@ -101,7 +101,7 @@ void PageViewer::slotForward()
 
 void PageViewer::slotBackAboutToShow()
 {
-    KPopupMenu *popup = m_backAction->popupMenu();
+    TDEPopupMenu *popup = m_backAction->popupMenu();
     popup->clear();
 
     if ( m_current == m_history.begin() )
@@ -127,7 +127,7 @@ void PageViewer::slotBackAboutToShow()
 
 void PageViewer::slotForwardAboutToShow()
 {
-    KPopupMenu *popup = m_forwardAction->popupMenu();
+    TDEPopupMenu *popup = m_forwardAction->popupMenu();
     popup->clear();
 
     if ( m_current == m_history.fromLast() )
@@ -175,9 +175,9 @@ bool PageViewer::openURL(const KURL &url)
   
  /*   TQString favicon = FeedIconManager::self()->iconLocation(url);
     if (!favicon.isEmpty()) 
-        emit setTabIcon(TQPixmap(KGlobal::dirs()->findResource("cache", favicon+".png")));
+        emit setTabIcon(TQPixmap(TDEGlobal::dirs()->findResource("cache", favicon+".png")));
     else
-        emit setTabIcon(SmallIcon("html"));
+        emit setTabIcon(SmallIcon("text-html"));
  */   
     return true;
 }
@@ -229,7 +229,7 @@ void PageViewer::addHistoryEntry(const KURL& url)
 }
 
 // Taken from KDevelop (lib/widgets/kdevhtmlpart.cpp)
-void PageViewer::slotStarted( KIO::Job * )
+void PageViewer::slotStarted( TDEIO::Job * )
 {
     m_stopAction->setEnabled(true);
 }
@@ -255,7 +255,7 @@ void PageViewer::slotSetCaption(const TQString& cap) {
 void PageViewer::slotPaletteOrFontChanged()
 {
     //kdDebug() << "PageViewer::slotPaletteOrFontChanged()" << endl;
-    // taken from KonqView (kdebase/konqueror/konq_view.cc)
+    // taken from KonqView (tdebase/konqueror/konq_view.cc)
     
     TQObject *obj = KParts::BrowserExtension::childObject(this);
     if ( !obj ) // not all views have a browser extension !
@@ -269,9 +269,9 @@ void PageViewer::slotPaletteOrFontChanged()
     obj->tqt_invoke(id, o);
     
     // this hack is necessary since the part looks for []HTML Settings] in
-    // KGlobal::config() by default, which is wrong when running in Kontact
+    // TDEGlobal::config() by default, which is wrong when running in Kontact
     // NOTE: when running in Kontact, immediate updating doesn't work
-    KHTMLSettings* s = const_cast<KHTMLSettings*> (settings());
+    TDEHTMLSettings* s = const_cast<TDEHTMLSettings*> (settings());
     //s->init(Settings::self()->config());
     s->init();
 }
@@ -293,8 +293,8 @@ void PageViewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kur
     // if true show popup menu for link. Maybe that doesn't work properly when using frames
     bool isLink = kurl != Viewer::url();
     
-//  KPopupMenu popup( i18n( "Documentation Viewer" ), this->widget() );
-    KPopupMenu popup(this->widget());
+//  TDEPopupMenu popup( i18n( "Documentation Viewer" ), this->widget() );
+    TDEPopupMenu popup(this->widget());
 
 //     bool needSep = false;
     int idNewWindow = -2;
@@ -302,16 +302,16 @@ void PageViewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kur
     {
         idNewWindow = popup.insertItem(SmallIcon("tab_new"),i18n("Open Link in New &Tab"), this, SLOT(slotOpenLinkInForegroundTab()));
         popup.setWhatsThis(idNewWindow, i18n("<b>Open Link in New Tab</b><p>Opens current link in a new tab."));
-        popup.insertItem(SmallIcon("window_new"), i18n("Open Link in External &Browser"), this, SLOT(slotOpenLinkInBrowser()));
+        popup.insertItem(SmallIcon("window-new"), i18n("Open Link in External &Browser"), this, SLOT(slotOpenLinkInBrowser()));
                 
         popup.insertSeparator();
         
-        KAction *savelinkas = action("savelinkas");
+        TDEAction *savelinkas = action("savelinkas");
         
         if (savelinkas)
                 savelinkas->plug( &popup);
         
-        KAction* copylinkaddress = action("copylinkaddress");
+        TDEAction* copylinkaddress = action("copylinkaddress");
         if (copylinkaddress)
         {
             copylinkaddress->plug( &popup);
@@ -330,8 +330,8 @@ void PageViewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kur
         action("viewer_copy")->plug(&popup);
         popup.insertSeparator();
 
-        KAction* incFontAction = this->action("incFontSizes");
-        KAction* decFontAction = this->action("decFontSizes");
+        TDEAction* incFontAction = this->action("incFontSizes");
+        TDEAction* decFontAction = this->action("decFontSizes");
         if ( incFontAction && decFontAction )
         {
             incFontAction->plug( &popup );
@@ -339,12 +339,12 @@ void PageViewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kur
             popup.insertSeparator();
         }
     
-        popup.insertItem(SmallIcon("window_new"), i18n("Open Page in External Browser"), this, SLOT(slotOpenLinkInBrowser()));
+        popup.insertItem(SmallIcon("window-new"), i18n("Open Page in External Browser"), this, SLOT(slotOpenLinkInBrowser()));
     
         action("viewer_print")->plug(&popup);
         popup.insertSeparator();
         
-        KAction *ac = action("setEncoding");
+        TDEAction *ac = action("setEncoding");
         if (ac)
             ac->plug(&popup);
         popup.insertItem(SmallIcon("bookmark_add"),i18n("Add to Konqueror Bookmarks"), this, SLOT(slotGlobalBookmarkArticle()));
diff --git a/src/pageviewer.h b/src/pageviewer.h
index 80a4ff5..3b39437 100644
--- a/src/pageviewer.h
+++ b/src/pageviewer.h
@@ -17,8 +17,8 @@ using std::abs;
 #include "viewer.h"
 
 
-class KAction;
-class KToolBarPopupAction;
+class TDEAction;
+class TDEToolBarPopupAction;
 
 
 namespace KlamAV
@@ -60,7 +60,7 @@ namespace KlamAV
             void addHistoryEntry(const KURL& url);
             
         protected slots:
-            void slotStarted(KIO::Job *);
+            void slotStarted(TDEIO::Job *);
             void slotCompleted();
             void slotCancelled(const TQString &errMsg);
             void slotBackAboutToShow();
@@ -80,10 +80,10 @@ namespace KlamAV
             TQValueList<PageViewerHistoryEntry> m_history;
             TQValueList<PageViewerHistoryEntry>::Iterator m_current;
             
-            KToolBarPopupAction* m_backAction;
-            KToolBarPopupAction* m_forwardAction;
-            KAction* m_reloadAction;
-            KAction* m_stopAction;
+            TDEToolBarPopupAction* m_backAction;
+            TDEToolBarPopupAction* m_forwardAction;
+            TDEAction* m_reloadAction;
+            TDEAction* m_stopAction;
 
             bool m_restoring;
             TQString m_caption;
diff --git a/src/scanviewer.cpp b/src/scanviewer.cpp
index 22ccb42..bce8d72 100644
--- a/src/scanviewer.cpp
+++ b/src/scanviewer.cpp
@@ -14,16 +14,16 @@
 #include "klamavconfig.h"
 
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kstatusbar.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <knotifyclient.h>
 #include <kprocio.h>
 #include <tqlayout.h>
-#include <kcmdlineargs.h>
-#include <kmessagebox.h>
+#include <tdecmdlineargs.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <ksystemtray.h>
 #include <kprogress.h>
@@ -112,7 +112,7 @@ ScanViewer::ScanViewer(TQWidget *parent, const char *name)
     prog = new KProgress(status2_frame);
     progosd = new K3bJobProgressOSD();
     progosd->setText("Scanning..");
-    progosd->readSettings(KGlobal::config());
+    progosd->readSettings(TDEGlobal::config());
 
     status2_layout->addWidget(prog, 10);
     prog->adjustSize();
@@ -238,7 +238,7 @@ void ScanViewer::processOutput()
                 filesscanned++;
                 if (!(showProgress))
                     status2_label->setText(i18n("Files scanned: %1").arg(filesscanned));
-                KNotifyClient::event(kmain->_tray->winId(),"ScanAccessDenied", TQString("Can't scan %1 "
+                KNotifyClient::event(tdemain->_tray->winId(),"ScanAccessDenied", TQString("Can't scan %1 "
                     "- Access Denied!").arg(tmpFName));
                 CollectionDB::instance()->insertEvent("Error Found","Access Denied",tmpFName);
             //}else if ((pos = buf.section('\n',j,j).find(": Can't open")) != -1){
@@ -248,7 +248,7 @@ void ScanViewer::processOutput()
                 filesscanned++;
                 if (!(showProgress))
                     status2_label->setText(i18n("Files scanned: %1").arg(filesscanned));
-                KNotifyClient::event(kmain->_tray->winId(),"ScanAccessDenied", TQString("Can't scan %1 "
+                KNotifyClient::event(tdemain->_tray->winId(),"ScanAccessDenied", TQString("Can't scan %1 "
                    "- Access Denied!").arg(tmpFName));
                 CollectionDB::instance()->insertEvent("Error Found","Access Denied",tmpFName);
             }else if ((pos = (item2.find(": Empty file"))) != -1){
@@ -256,7 +256,7 @@ void ScanViewer::processOutput()
                 filesscanned++;
                 if (!(showProgress))
                         status2_label->setText(i18n("Files scanned: %1").arg(filesscanned));
-            //KNotifyClient::event(kmain->_tray->winId(),"ScanAccessDenied", TQString("Can't scan %1 "
+            //KNotifyClient::event(tdemain->_tray->winId(),"ScanAccessDenied", TQString("Can't scan %1 "
             //            "- Empty File!").arg(tmpFName));
                 CollectionDB::instance()->insertEvent("Error Found","Empty File",tmpFName);
             }
@@ -282,7 +282,7 @@ void ScanViewer::slotScan(const TQStringList & filepattern, int mode, bool recur
 {
 
     //KMessageBox::information (this, filepattern);    
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
     
     if(( args->isSet( "scanthis" ) ) || (dcopscan)) {
         calculateTime = FALSE;
@@ -344,7 +344,7 @@ void ScanViewer::slotScan(const TQStringList & filepattern, int mode, bool recur
     prog->setTotalSteps(cnt);
     kdDebug() << "COUNT" << cnt << endl;    
 
-    config = KGlobal::config();
+    config = TDEGlobal::config();
 
     slotClear();
     QuarantineList.clear();
@@ -356,7 +356,7 @@ void ScanViewer::slotScan(const TQStringList & filepattern, int mode, bool recur
     TQString db;
 
     if(!( args->isSet( "scanthis" ) ) )
-        db = kmain->freshklam->getCurrentDBDir();
+        db = tdemain->freshklam->getCurrentDBDir();
     else{
         config->setGroup("Freshklam");
         TQStringList lastDownloadPaths = config->readListEntry("lastDownloadPaths");
@@ -525,16 +525,16 @@ void ScanViewer::slotScan(const TQStringList & filepattern, int mode, bool recur
     *childproc << "'" + m_filepattern.join("' '") + "'";
 
 
-/*    connect( childproc, SIGNAL(processExited(KProcess *)),
+/*    connect( childproc, SIGNAL(processExited(TDEProcess *)),
         SLOT(childExited()) );
-    connect( childproc, SIGNAL(receivedStdout(KProcess *, char *, int)),
-        SLOT(receivedOutput(KProcess *, char *, int)) );
-    childproc->start(KProcess::NotifyOnExit, KProcess::Stdout);*/
+    connect( childproc, SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+        SLOT(receivedOutput(TDEProcess *, char *, int)) );
+    childproc->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout);*/
 
     connect( childproc, SIGNAL(readReady(KProcIO *)),
         SLOT(receivedOutput(KProcIO *)) );
     childproc->start(KProcIO::NotifyOnExit);
-    connect( childproc, SIGNAL(processExited(KProcess *)),
+    connect( childproc, SIGNAL(processExited(TDEProcess *)),
             SLOT(childExited()) );
 
     scanInProgress = TRUE;
@@ -568,7 +568,7 @@ void ScanViewer::finish()
     scan_time->hide();
     prog->hide();
     progosd->hide();
-    progosd->saveSettings(KGlobal::config());
+    progosd->saveSettings(TDEGlobal::config());
     status2_label->show();
 
     multiScan = FALSE;
@@ -594,10 +594,10 @@ void ScanViewer::slotCancel()
 
 void ScanViewer::resetSysTray()
 {
-    if (kmain->klamd->isKlamdAlive())
-      kmain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_enabled"));
+    if (tdemain->klamd->isKlamdAlive())
+      tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_enabled"));
     else
-      kmain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_disabled"));
+      tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_disabled"));
 }
 
 void ScanViewer::childExited()
@@ -610,21 +610,21 @@ void ScanViewer::childExited()
     CollectionDB::instance()->insertEvent("Manual Scan",TQString("Scan Complete"),m_filepattern.join(" "));
 
     if (status == 0){
-    	kmain->_tray->setPixmap(KSystemTray::loadIcon("klamav_scan_safe"));
+    	tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_scan_safe"));
         TQTimer::singleShot( 10000, this, SLOT(resetSysTray()) );
         if (!(errorsEncountered))
-            KNotifyClient::event(kmain->_tray->winId(),i18n( "ScanCompleteNoVirus" ), i18n( "Scan Complete - No Viruses Found!" ));
+            KNotifyClient::event(tdemain->_tray->winId(),i18n( "ScanCompleteNoVirus" ), i18n( "Scan Complete - No Viruses Found!" ));
         else
-            KNotifyClient::event(kmain->_tray->winId(),i18n( "ScanCompleteNoVirusButErrors" ), i18n( "Scan Complete - No Viruses Found But Some Errors Encountered!" ));
+            KNotifyClient::event(tdemain->_tray->winId(),i18n( "ScanCompleteNoVirusButErrors" ), i18n( "Scan Complete - No Viruses Found But Some Errors Encountered!" ));
 
     }else if(status == 1){
-    	kmain->_tray->setPixmap(KSystemTray::loadIcon("klamav_scan_found"));
+    	tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_scan_found"));
         switch (m_mode) {
         case 0:
             progosd->setText("Problems found!");
             result = KMessageBox::warningContinueCancelList(this, i18n( "I'm going to quarantine this lot, you can restore them later if you want. If you don't want to quarantine, just press cancel."),QuarantineList,i18n( "Quarantine Infected Files" ),i18n( "Quarantine" ));
             switch (result) {
-                case 2 :KNotifyClient::event(kmain->_tray->winId(),"ScanAccessDenied", TQString("Suspicious Items Not "
+                case 2 :KNotifyClient::event(tdemain->_tray->winId(),"ScanAccessDenied", TQString("Suspicious Items Not "
                         "Quarantined!")); break;
                 case 5 : Quarantine(); break;
             }
@@ -709,7 +709,7 @@ void  ScanViewer::Quarantine(){
     config->setGroup("Kuarantine");
     TQStringList lastQuarLocations = config->readListEntry("KuarantineLocations");
 
-    kmain->_tray->setPixmap(KSystemTray::loadIcon("klamav_quarantining"));
+    tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_quarantining"));
 
     TQString quarloc;
     for (TQStringList::Iterator it = lastQuarLocations.begin(); it == lastQuarLocations.begin() ; it++){
@@ -734,7 +734,7 @@ void  ScanViewer::Quarantine(){
             qname.prepend("/");
             qname.prepend(quarloc);
             qname.append(":"+when);
-            if (KIO::NetAccess::file_move(fname,qname)){
+            if (TDEIO::NetAccess::file_move(fname,qname)){
                 if (lastQuarItems.contains(item2))
                     lastQuarItems.remove(item2);
                 lastQuarItems.prepend(item2);
@@ -751,16 +751,16 @@ void  ScanViewer::Quarantine(){
         }
     }
     if (allQuarantined) {
-      if (kmain->klamd->isKlamdAlive())
-        kmain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_enabled"));
+      if (tdemain->klamd->isKlamdAlive())
+        tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_enabled"));
       else
-        kmain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_disabled"));
+        tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_disabled"));
     }else
-        kmain->_tray->setPixmap(KSystemTray::loadIcon("klamav_scan_found"));
+        tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_scan_found"));
     config->writeEntry(TQString("Items %1").arg(quarloc), lastQuarItems);
     config->sync();
     
-    //kmain->kuarantine->refresh();
+    //tdemain->kuarantine->refresh();
 
 
 
@@ -777,25 +777,25 @@ void ScanViewer::slotRMB( TQListViewItem* Item, const TQPoint & point, int )
 
         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 );
 
         iconPath = locate("cache", KMimeType::favIconForURL("http://www.viruslist.com")+".png");
         if ( iconPath.isEmpty() )
-          vlicon = SmallIcon("find");
+          vlicon = SmallIcon("edit-find");
         else
           vlicon = TQPixmap( iconPath );
 
@@ -839,25 +839,25 @@ void ScanViewer::slotQuarantineSelected()
 void ScanViewer::slotGoogle()
 {
     TQString name = resultview->currentItem()->text(1);
-    kmain->klamdb->slotExternal(name, "Google");
+    tdemain->klamdb->slotExternal(name, "Google");
 }
 
 void ScanViewer::slotVirusPool()
 {
     TQString name = resultview->currentItem()->text(1);
-    kmain->klamdb->slotExternal(name, "VirusPool");
+    tdemain->klamdb->slotExternal(name, "VirusPool");
 }
 
 void ScanViewer::slotTrendMicro()
 {
     TQString name = resultview->currentItem()->text(1);
-    kmain->klamdb->slotExternal(name, "TrendMicro");
+    tdemain->klamdb->slotExternal(name, "TrendMicro");
 }
 
 void ScanViewer::slotVirusList()
 {
     TQString name = resultview->currentItem()->text(1);
-    kmain->klamdb->slotExternal(name, "VirusList");
+    tdemain->klamdb->slotExternal(name, "VirusList");
 }
 
 void ScanViewer::slotStartAgain()
diff --git a/src/scanviewer.h b/src/scanviewer.h
index 00de43b..7dc1306 100644
--- a/src/scanviewer.h
+++ b/src/scanviewer.h
@@ -9,13 +9,13 @@
 #include <config.h>
 #endif
 
-#include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdeapplication.h>
+#include <tdemainwindow.h>
 #include "k3bjobprogressosd_mod.h"
 
 
 class KPrinter;
-class KToggleAction;
+class TDEToggleAction;
 class KURL;
 class TQLineEdit;
 class TQComboBox;
@@ -26,7 +26,7 @@ class TQListViewItem;
 class TQPushButton;
 class TQLabel;
 class KProcIO;
-class KConfig;
+class TDEConfig;
 class KURLRequester;
 class KProgress;
 class K3bJobProgressOSD;
@@ -78,14 +78,14 @@ protected:
      * This function is called when it is time for the app to save its
      * properties for session management purposes.
      */
-    //void saveProperties(KConfig *);
+    //void saveProperties(TDEConfig *);
 
     /**
-     * This function is called when this app is restored.  The KConfig
+     * This function is called when this app is restored.  The TDEConfig
      * object points to the session management config file that was saved
      * with @ref saveProperties
      */
-    //void readProperties(KConfig *);
+    //void readProperties(TDEConfig *);
 
 
 private slots:
@@ -141,7 +141,7 @@ private:
     TQLabel *status_label, *status2_label,*matches_label,*matches2_label;
     KProcIO *childproc;
     TQString buf;
-    KConfig* config;
+    TDEConfig* config;
     TQStringList lastSearchItems;
     TQStringList lastScanPaths;
     TQStringList lastQuarItems;
diff --git a/src/schedule.cpp b/src/schedule.cpp
index 56c03d2..4ad3532 100644
--- a/src/schedule.cpp
+++ b/src/schedule.cpp
@@ -15,7 +15,7 @@
 #include <tqlayout.h>
 #include <tqlistview.h>
 //#include <qlistviewitem.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kdialog.h>
 #include <dcopclient.h>
 #include <kstdguiitem.h>
@@ -173,7 +173,7 @@ void Schedule::slotAddDateToCombo(TQDate newdate)
 	check_combo->insertItem(newstring);
 	check_combo->setCurrentItem(check_combo->count()-1);
 
-	DCOPClient* client = KApplication::dcopClient();
+	DCOPClient* client = TDEApplication::dcopClient();
 	client->attach();
 	client->registerAs(kapp->name());
 
@@ -357,7 +357,7 @@ TQString Schedule::createScanScript()
 	if ( file.open( IO_WriteOnly ) ) {
 		TQTextStream ts( &file );
 	
-		TQString kdedir = getenv("KDEDIR");
+		TQString tdedir = getenv("TDEDIR");
 	
 	
 		ts << "#!/bin/bash" << "\n";
@@ -403,7 +403,7 @@ TQString Schedule::createScanScript()
 TQString Schedule::createStartupScript()
 {
 
-	TQString path = KGlobalSettings::autostartPath();
+	TQString path = TDEGlobalSettings::autostartPath();
 	TQDir startupdir(path);
 	if (!startupdir.exists())
 		return TQString("Error");
diff --git a/src/schedule.h b/src/schedule.h
index adc99eb..d3725fd 100644
--- a/src/schedule.h
+++ b/src/schedule.h
@@ -26,7 +26,7 @@
 
 
 class KPrinter;
-class KToggleAction;
+class TDEToggleAction;
 class KURL;
 class TQLineEdit;
 class TQComboBox;
@@ -37,8 +37,8 @@ class KTView;
 class TQListViewItem;
 class TQPushButton;
 class TQLabel;
-class KProcess;
-class KConfig;
+class TDEProcess;
+class TDEConfig;
 class KURLRequester;
 class CollectionSetup;
 class TQToolButton;
@@ -105,14 +105,14 @@ protected:
      * This function is called when it is time for the app to save its
      * properties for session management purposes.
      */
-    //void saveProperties(KConfig *);
+    //void saveProperties(TDEConfig *);
 
     /**
-     * This function is called when this app is restored.  The KConfig
+     * This function is called when this app is restored.  The TDEConfig
      * object points to the session management config file that was saved
      * with @ref saveProperties
      */
-    //void readProperties(KConfig *);
+    //void readProperties(TDEConfig *);
 
 
 private slots:
@@ -141,9 +141,9 @@ private:
 //    TQListView *resultview;
     TQPushButton *search_button, *cancel_button;
     TQLabel *status_label, *status2_label,*matches_label,*matches2_label;
-    KProcess *childproc;
+    TDEProcess *childproc;
     TQString buf;
-    KConfig* config;
+    TDEConfig* config;
     bool errorsEncountered;
     TQPushButton* adv_options;
     TQString urlsToScan;
diff --git a/src/sigtool.cpp b/src/sigtool.cpp
index 779047b..3c2b1d8 100644
--- a/src/sigtool.cpp
+++ b/src/sigtool.cpp
@@ -5,15 +5,15 @@
 #include "sigtool.h"
 
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstatusbar.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 
 
 #include <kurlrequester.h>
 #include <tqlayout.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 const char *mail_clients[] = {
     "KMail",
@@ -130,14 +130,14 @@ void  Sigtool::configureKMail(){
 	KMessageBox::information (this,i18n( "Please ensure KMail is not open before we proceed.") );
 	
 	TQString DatabaseLocation;
-	config = KGlobal::config();
+	config = TDEGlobal::config();
 	config->setGroup("Freshklam");
 	TQStringList lastDownloadPaths = config->readListEntry("lastDownloadPaths");
 	for (TQStringList::Iterator it = lastDownloadPaths.begin(); it == lastDownloadPaths.begin() ; it++){
 			DatabaseLocation = *it;
 	}
 
-	config = new KConfig("kmailrc");
+	config = new TDEConfig("kmailrc");
 	config->setGroup("General");
 	TQVariant nooffilters = config->readEntry("filters");
 	
diff --git a/src/sigtool.h b/src/sigtool.h
index bb5da38..df35641 100644
--- a/src/sigtool.h
+++ b/src/sigtool.h
@@ -9,13 +9,13 @@
 #include <config.h>
 #endif
 
-#include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdeapplication.h>
+#include <tdemainwindow.h>
 
 
 
 class KPrinter;
-class KToggleAction;
+class TDEToggleAction;
 class KURL;
 class TQLineEdit;
 class TQComboBox;
@@ -23,8 +23,8 @@ class TQCheckBox;
 class TQListBox;
 class TQPushButton;
 class TQLabel;
-class KProcess;
-class KConfig;
+class TDEProcess;
+class TDEConfig;
 class KURLRequester;
 
 
@@ -67,14 +67,14 @@ protected:
      * This function is called when it is time for the app to save its
      * properties for session management purposes.
      */
-    //void saveProperties(KConfig *);
+    //void saveProperties(TDEConfig *);
 
     /**
-     * This function is called when this app is restored.  The KConfig
+     * This function is called when this app is restored.  The TDEConfig
      * object points to the session management config file that was saved
      * with @ref saveProperties
      */
-    //void readProperties(KConfig *);
+    //void readProperties(TDEConfig *);
 
 
 private slots:
@@ -101,8 +101,8 @@ private:
     //SigtoolView *m_view;
 
   /*  KPrinter   *m_printer;
-    KToggleAction *m_toolbarAction;
-    KToggleAction *m_statusbarAction;*/
+    TDEToggleAction *m_toolbarAction;
+    TDEToggleAction *m_statusbarAction;*/
 
 
 signals:
@@ -125,9 +125,9 @@ private:
     TQListBox *resultbox;
     TQPushButton *search_button, *manual_button;
     TQLabel *status_label, *matches_label;
-    KProcess *childproc;
+    TDEProcess *childproc;
     TQString buf;
-    KConfig *config;
+    TDEConfig *config;
     TQStringList lastSearchItems;
     TQStringList lastSearchPaths;
     TQComboBox *check_combo;
diff --git a/src/sqlite/Makefile.in b/src/sqlite/Makefile.in
index 93cff89..cab70a6 100644
--- a/src/sqlite/Makefile.in
+++ b/src/sqlite/Makefile.in
@@ -196,24 +196,24 @@ LIBZ = @LIBZ@
 LIB_CLAM = @LIB_CLAM@
 LIB_KAB = @LIB_KAB@
 LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
+LIB_TDECORE = @LIB_TDECORE@
 LIB_KDED = @LIB_KDED@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KDNSSD = @LIB_KDNSSD@
+LIB_TDEPIM = @LIB_TDEPIM@
+LIB_TDEPRINT = @LIB_TDEPRINT@
+LIB_TDEUI = @LIB_TDEUI@
+LIB_TDEDNSSD = @LIB_TDEDNSSD@
 LIB_KFILE = @LIB_KFILE@
 LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMPROXY = @LIB_KIMPROXY@
-LIB_KIO = @LIB_KIO@
+LIB_TDEHTML = @LIB_TDEHTML@
+LIB_TDEIMPROXY = @LIB_TDEIMPROXY@
+LIB_TDEIO = @LIB_TDEIO@
 LIB_KJS = @LIB_KJS@
 LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUNITTEST = @LIB_KUNITTEST@
-LIB_KUTILS = @LIB_KUTILS@
+LIB_TDEPARTS = @LIB_TDEPARTS@
+LIB_TDESPELL = @LIB_TDESPELL@
+LIB_TDESYCOCA = @LIB_TDESYCOCA@
+LIB_TDEUNITTEST = @LIB_TDEUNITTEST@
+LIB_TDEUTILS = @LIB_TDEUTILS@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
@@ -225,7 +225,7 @@ LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
-MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+MAKETDEWIDGETS = @MAKETDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MEINPROC = @MEINPROC@
 MOC = @MOC@
@@ -330,7 +330,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/src/tabwidget.cpp b/src/tabwidget.cpp
index e2d4577..a001fb2 100644
--- a/src/tabwidget.cpp
+++ b/src/tabwidget.cpp
@@ -10,12 +10,12 @@
 #include <tqstyle.h>
 #include <tqclipboard.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <ktabbar.h>
-#include <kpopupmenu.h>
-#include <klocale.h>
-#include <khtmlview.h>
-#include <khtml_part.h>
+#include <tdepopupmenu.h>
+#include <tdelocale.h>
+#include <tdehtmlview.h>
+#include <tdehtml_part.h>
 #include <kiconloader.h>
 
 //#include "akregatorconfig.h"
@@ -151,7 +151,7 @@ void TabWidget::setTitle( const TQString &title , TQWidget* sender)
 void TabWidget::contextMenu(int i, const TQPoint &p)
 {
    currentItem = page(i);
-   KPopupMenu popup;
+   TDEPopupMenu popup;
    //popup.insertTitle(tabLabel(currentItem));
    //int detachTab = popup.insertItem( SmallIcon("tab_breakoff"), i18n("Detach Tab"), this, SLOT( slotDetachTab() ) );
    //int copyLink = popup.insertItem( i18n("Copy Link Address"), this, SLOT( slotCopyLinkAddress() ) );
@@ -169,7 +169,7 @@ void TabWidget::slotDetachTab()
 {
    if(!currentItem) return;
    KURL url;
-   if (KHTMLView *view = dynamic_cast<KHTMLView*>(currentItem)) url = view->part()->url();
+   if (TDEHTMLView *view = dynamic_cast<TDEHTMLView*>(currentItem)) url = view->part()->url();
    else return;
    kapp->invokeBrowser(url.url(), "0");
    removePage(currentItem);
@@ -181,7 +181,7 @@ void TabWidget::slotCopyLinkAddress()
 {
     if(!currentItem) return;
     KURL url;
-    if (KHTMLView *view = dynamic_cast<KHTMLView*>(currentItem)) url = view->part()->url();
+    if (TDEHTMLView *view = dynamic_cast<TDEHTMLView*>(currentItem)) url = view->part()->url();
     else return;
     TQClipboard *cb = TQApplication::clipboard();
     if(cb) cb->setText(url.prettyURL());
diff --git a/src/update.cpp b/src/update.cpp
index f8497d0..8ee0ad4 100644
--- a/src/update.cpp
+++ b/src/update.cpp
@@ -25,11 +25,11 @@
 
 #include <kstaticdeleter.h>
 
-#include <klocale.h>
-#include <kio/netaccess.h>
+#include <tdelocale.h>
+#include <tdeio/netaccess.h>
 
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include <tqcheckbox.h>
 #include <kbuttonbox.h>
@@ -37,16 +37,16 @@
 #include <kurlcompletion.h>
 #include <kcombobox.h>
 #include <tqlayout.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <klineedit.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <ksystemtray.h>
 #include <ktar.h>
 #include <kprogress.h>
 #include <kprocio.h>
 #include <knotifyclient.h>
 #include <dom/html_misc.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <kuser.h>
 
@@ -78,7 +78,7 @@ const char *mirrors[] = {
 };
 
 KlamavUpdate::KlamavUpdate(TQWidget *parent, const char *name)
-    : TQWidget(parent, name),filelist(new KHTMLPart(this))
+    : TQWidget(parent, name),filelist(new TDEHTMLPart(this))
 {
 
     filelist->hide();
@@ -140,7 +140,7 @@ void KlamavUpdate::downloadComponent(TQString component, TQString version, TQStr
         startProgressDialog( i18n( "Downloading %1-%2..." ).arg(component).arg(version) );
  
         TQString tmpFile;
-        if ( !KIO::NetAccess::download( TQString("http://%1.dl.sourceforge.net/sourceforge/%2/%3-%4.%5").arg(getMirror()).arg(component).arg(component).arg(version).arg(extension), tmpFile, 0L ) ){
+        if ( !TDEIO::NetAccess::download( TQString("http://%1.dl.sourceforge.net/sourceforge/%2/%3-%4.%5").arg(getMirror()).arg(component).arg(component).arg(version).arg(extension), tmpFile, 0L ) ){
             KMessageBox::information (this,i18n("Couldn't download %1.").arg(component));
             delete timer;
             timer=0;
@@ -180,7 +180,7 @@ void KlamavUpdate::downloadComponent(TQString component, TQString version, TQStr
         tar.directory()->copyTo( location );
         tar.close();
         // remove the temp file
-        KIO::NetAccess::removeTempFile( tmpFile );
+        TDEIO::NetAccess::removeTempFile( tmpFile );
     
         delete timer;
         timer=0;
@@ -215,7 +215,7 @@ void KlamavUpdate::downloadComponent(TQString component, TQString version, TQStr
                 break;
             case 5 : 
 
-                KProcess* arkollonproc = new KShellProcess();
+                TDEProcess* arkollonproc = new KShellProcess();
                 //make sure we catch arkollon in the .klamav directory
 // 	        TQString curpath = (TQString) getenv("PATH");
 //                 TQString homedir = (TQString) getenv("HOME");
@@ -230,9 +230,9 @@ void KlamavUpdate::downloadComponent(TQString component, TQString version, TQStr
                 TQString command = TQString("klamarkollon %1/%2-%3").arg(location).arg(component).arg(version);
                 *arkollonproc << command;
                 if (component == "klamav")
-                connect( arkollonproc, SIGNAL(processExited(KProcess *)), SLOT(klamavInstallationExited(KProcess *)) );
+                connect( arkollonproc, SIGNAL(processExited(TDEProcess *)), SLOT(klamavInstallationExited(TDEProcess *)) );
                 else
-                    connect( arkollonproc, SIGNAL(processExited(KProcess *)), SLOT(clamavInstallationExited(KProcess *)) );
+                    connect( arkollonproc, SIGNAL(processExited(TDEProcess *)), SLOT(clamavInstallationExited(TDEProcess *)) );
                 arkollonproc->start();
         }
     }
@@ -351,7 +351,7 @@ void KlamavUpdate::slotProg()
         progressDialog->progressBar()->setProgress(progressDialog->progressBar()->progress() + 4 );
 }
 
-void KlamavUpdate::clamavInstallationExited(KProcess* arkollonproc)
+void KlamavUpdate::clamavInstallationExited(TDEProcess* arkollonproc)
 {
 
     arkollonproc = 0;
@@ -361,7 +361,7 @@ void KlamavUpdate::clamavInstallationExited(KProcess* arkollonproc)
 
 }
 
-void KlamavUpdate::klamavInstallationExited(KProcess* arkollonproc)
+void KlamavUpdate::klamavInstallationExited(TDEProcess* arkollonproc)
 {
 
     arkollonproc = 0;
diff --git a/src/update.h b/src/update.h
index da0ffe3..b3fa5aa 100644
--- a/src/update.h
+++ b/src/update.h
@@ -26,11 +26,11 @@
 #include <config.h>
 #endif
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdirlister.h> //stack allocated
 #include <kurl.h>       //stack allocated
 #include <kresolver.h> // namespace
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 
 
 namespace DOM {
@@ -41,11 +41,11 @@ namespace DOM {
 using namespace KNetwork;
 
 class KURL;
-class KProcess;
+class TDEProcess;
 class KURLRequester;
 class KProgressDialog;
 class KProcIO;
-class KHTMLPart;
+class TDEHTMLPart;
 
 /**
  * This class serves as the main window for KlamavUpdate.  It handles the
@@ -79,8 +79,8 @@ signals:
 
 private slots:
     void slotProg();
-    void klamavInstallationExited(KProcess *arkollonproc);
-    void clamavInstallationExited(KProcess *arkollonproc);
+    void klamavInstallationExited(TDEProcess *arkollonproc);
+    void clamavInstallationExited(TDEProcess *arkollonproc);
 /*    void resolved(KResolverResults result);*/
 /*    void readVersionLine(KProcIO *);*/
     void parseSFPage();
@@ -97,7 +97,7 @@ private:
     void completedSearchForUpdates(const TQString &component, const TQString &extension);
     double numericizeVersion(TQString &version);
     TQString getMirror();
-    KProcess *childproc;
+    TDEProcess *childproc;
     KProcIO *versionproc;
     TQString tempFileName;
     TQString errorMessage;
@@ -112,7 +112,7 @@ private:
     KResolver m_resolver;
     TQString currentClamavVersion;
     bool m_alpha;
-    KHTMLPart *filelist;
+    TDEHTMLPart *filelist;
 private:
     KDirLister clamav_lister;
     KURL       clamav_url;
diff --git a/src/viewer.cpp b/src/viewer.cpp
index 1cbf083..f98fb79 100644
--- a/src/viewer.cpp
+++ b/src/viewer.cpp
@@ -5,12 +5,12 @@
  *   Licensed under GPL.                                                   *
  ***************************************************************************/
 
-#include <kaction.h>
-#include <kapplication.h>
-#include <khtmlview.h>
+#include <tdeaction.h>
+#include <tdeapplication.h>
+#include <tdehtmlview.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdelocale.h>
+#include <tdepopupmenu.h>
 
 #include <tqclipboard.h>
 #include <tqpaintdevicemetrics.h>
@@ -22,7 +22,7 @@
 using namespace KlamAV;
 
 Viewer::Viewer(TQWidget *parent, const char *name)
-    : KHTMLPart(parent, name), m_url(0)
+    : TDEHTMLPart(parent, name), m_url(0)
 {
     setZoomFactor(100);
     setJScriptEnabled(true);
@@ -34,8 +34,8 @@ Viewer::Viewer(TQWidget *parent, const char *name)
     setStatusMessagesEnabled(true);
 
     // change the cursor when loading stuff...
-    connect( this, SIGNAL(started(KIO::Job *)),
-             this, SLOT(slotStarted(KIO::Job *)));
+    connect( this, SIGNAL(started(TDEIO::Job *)),
+             this, SLOT(slotStarted(TDEIO::Job *)));
     connect( this, SIGNAL(completed()),
              this, SLOT(slotCompleted()));
 
@@ -50,12 +50,12 @@ SIGNAL(popupMenu (KXMLGUIClient*, const TQPoint&, const KURL&, const
     KStdAction::print(this, SLOT(slotPrint()), actionCollection(), "viewer_print");
     KStdAction::copy(this, SLOT(slotCopy()), actionCollection(), "viewer_copy");
     
-    new KAction( i18n("&Increase Font Sizes"), "viewmag+", "Ctrl+Plus", this, SLOT(slotZoomIn()), actionCollection(), "incFontSizes" );
-    new KAction( i18n("&Decrease Font Sizes"), "viewmag-", "Ctrl+Minus", this, SLOT(slotZoomOut()), actionCollection(), "decFontSizes" );
+    new TDEAction( i18n("&Increase Font Sizes"), "viewmag+", "Ctrl+Plus", this, SLOT(slotZoomIn()), actionCollection(), "incFontSizes" );
+    new TDEAction( i18n("&Decrease Font Sizes"), "viewmag-", "Ctrl+Minus", this, SLOT(slotZoomOut()), actionCollection(), "decFontSizes" );
 
     connect(this, SIGNAL(selectionChanged()), this, SLOT(slotSelectionChanged()));
 
-    new KAction(i18n("Copy &Link Address"), "", 0,
+    new TDEAction(i18n("Copy &Link Address"), "", 0,
                                  this, SLOT(slotCopyLinkAddress()),
                                  actionCollection(), "copylinkaddress");
 }
@@ -72,7 +72,7 @@ bool Viewer::closeURL()
 {
     emit browserExtension()->loadingProgress(-1);
     emit canceled(TQString::null);
-    return KHTMLPart::closeURL();
+    return TDEHTMLPart::closeURL();
 }
 
 int Viewer::pointsToPixel(int pointSize) const
@@ -96,10 +96,10 @@ void Viewer::displayInExternalBrowser(const KURL &url, const TQString &mimetype)
        TQString cmd = Settings::externalBrowserCustomCommand();
        TQString urlStr = url.url();
        cmd.replace(TQRegExp("%u"), urlStr);
-       KProcess *proc = new KProcess;
+       TDEProcess *proc = new TDEProcess;
        TQStringList cmdAndArgs = KShell::splitArgs(cmd);
        *proc << cmdAndArgs;
-       proc->start(KProcess::DontCare);
+       proc->start(TDEProcess::DontCare);
        delete proc;
    }*/
 }
@@ -145,12 +145,12 @@ void Viewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kurl, c
    TQString url = kurl.url();
    if(this->url() == url) return;
    m_url = url;
-   KPopupMenu popup;
+   TDEPopupMenu popup;
    
    if (!url.isEmpty())
    {
         popup.insertItem(SmallIcon("tab_new"), i18n("Open Link in New &Tab"), this, SLOT(slotOpenLinkInForegroundTab()));
-        popup.insertItem(SmallIcon("window_new"), i18n("Open Link in External &Browser"), this, SLOT(slotOpenLinkInBrowser()));
+        popup.insertItem(SmallIcon("window-new"), i18n("Open Link in External &Browser"), this, SLOT(slotOpenLinkInBrowser()));
         action("copylinkaddress")->plug(&popup);
    }
    else
@@ -158,7 +158,7 @@ void Viewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kurl, c
        action("viewer_copy")->plug(&popup);
        popup.insertSeparator();
        action("viewer_print")->plug(&popup);
-       KAction *ac = action("setEncoding");
+       TDEAction *ac = action("setEncoding");
        if (ac)
             ac->plug(&popup);
    }
@@ -210,7 +210,7 @@ void Viewer::slotOpenLinkInBrowser()
     displayInExternalBrowser(m_url, TQString::null);
 }
 
-void Viewer::slotStarted(KIO::Job *)
+void Viewer::slotStarted(TDEIO::Job *)
 {
    widget()->setCursor( waitCursor );
 }
diff --git a/src/viewer.h b/src/viewer.h
index de0fcfc..f8ed799 100644
--- a/src/viewer.h
+++ b/src/viewer.h
@@ -8,18 +8,18 @@
 #ifndef VIEWER_H
 #define VIEWER_H
 
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 
 class KURL;
 
-namespace KIO
+namespace TDEIO
 {
     class MetaData;
 }
 
 namespace KlamAV
 {
-    class Viewer : public KHTMLPart
+    class Viewer : public TDEHTMLPart
     {
         Q_OBJECT
         public:
@@ -27,8 +27,8 @@ namespace KlamAV
             virtual bool closeURL();
             virtual bool openURL(const KURL &);
             
-            /** used by the BrowserRun object to call KHTMLPart::openURL() */
-            void openPage(const KURL& url) { KHTMLPart::openURL(url);}
+            /** used by the BrowserRun object to call TDEHTMLPart::openURL() */
+            void openPage(const KURL& url) { TDEHTMLPart::openURL(url);}
 
         public slots:
             
@@ -72,7 +72,7 @@ namespace KlamAV
             virtual void slotOpenLinkInBackgroundTab();
             
             /** This changes cursor to wait cursor */
-            void slotStarted(KIO::Job *);
+            void slotStarted(TDEIO::Job *);
 
             /** This reverts cursor back to normal one */
             void slotCompleted();
author	Mavridis Philippe <[email protected]>	2021-01-13 19:34:09 +0200
committer	Mavridis Philippe <[email protected]>	2021-01-13 19:34:09 +0200
commit	4c04a441814c7d1dda08f6075ab4e09dc05541df (patch)
tree	cf8a3dbd77114c416255d3995cd1b047072ef26a /src
parent	357ddeb8afd82d69ef871c146f4fc8f2c67fb17e (diff)
download	klamav-4c04a441814c7d1dda08f6075ab4e09dc05541df.tar.gz klamav-4c04a441814c7d1dda08f6075ab4e09dc05541df.zip