1 files changed, 24 insertions, 24 deletions

diff --git a/src/torkview.cpp b/src/torkview.cpp
index c5e8ed7..6a238e6 100644
--- a/src/torkview.cpp
+++ b/src/torkview.cpp
@@ -24,7 +24,7 @@
 #include "torkview.h"
 #include "tork.h"
 #include "torclient.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ntqlabel.h>
 #include <ntqlistview.h>
 #include "dndlistview.h"
@@ -52,10 +52,10 @@
 #include <kmimetype.h>
 #include <ksystemtray.h>
 #include <kprocio.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <krun.h>
 #include <kurl.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <ntqregexp.h>
 #include <ntqsplitter.h>
@@ -163,10 +163,10 @@ torkView::torkView(TQWidget *parent)
 
 
     m_osd = new StreamOSD(this, true);
-    m_osd->readSettings(KGlobal::config());
+    m_osd->readSettings(TDEGlobal::config());
 
     m_nontorosd = new StreamOSD(this, false);
-    m_nontorosd->readSettings(KGlobal::config());
+    m_nontorosd->readSettings(TDEGlobal::config());
 
     //Icons showing the status of the stream
     streamStatusIcon["SUCCEEDED"] = TQPixmap(SmallIcon("tork_green"));
@@ -335,17 +335,17 @@ void torkView::anonymizedFirefox(const TQString& url)
         }else{
             emit processWarning("cantreadprofiles",i18n("Can't read %1")
                     .arg(TQString("%1/profiles.ini").arg(firefoxdir)));
-            KIO::NetAccess::del(torkfirefox,0L);
+            TDEIO::NetAccess::del(torkfirefox,0L);
             return;
         }
     
         TQString originalprofile = line.replace("Path=","");
         TQString originalfirefox = TQString("%1/%2").arg(firefoxdir).arg(originalprofile);
     
-        if (!KIO::NetAccess::dircopy(originalfirefox,torkfirefox, 0L))
+        if (!TDEIO::NetAccess::dircopy(originalfirefox,torkfirefox, 0L))
         {
             emit processWarning("cantcopyprofile",i18n("Can't copy %1").arg(originalfirefox));
-            KIO::NetAccess::del(torkfirefox,0L);
+            TDEIO::NetAccess::del(torkfirefox,0L);
             return;
         }
 
@@ -365,7 +365,7 @@ void torkView::anonymizedFirefox(const TQString& url)
         }else{
             emit processWarning("cantreadprofiles",i18n("Can't read %1")
                     .arg(TQString("%1/profiles.ini").arg(firefoxdir)));
-            KIO::NetAccess::del(torkfirefox,0L);
+            TDEIO::NetAccess::del(torkfirefox,0L);
             return;
         }
 
@@ -439,7 +439,7 @@ void torkView::anonymizedFirefox(const TQString& url)
 
     }else{
         emit processWarning("cantwritefirefoxsettings", i18n("Can't write to %1").arg(TQString("%1/prefs.js").arg(torkfirefox)));
-        KIO::NetAccess::del(torkfirefox,0L);
+        TDEIO::NetAccess::del(torkfirefox,0L);
         return;
     }
 
@@ -461,7 +461,7 @@ void torkView::anonymizedOpera(const TQString& url)
     TQString torkopera = TQString("%1/.opera-tork").arg(getenv("HOME"));
     TQDir torkdir(torkopera);
     if (!torkdir.exists())
-        KIO::NetAccess::dircopy(originalopera,torkopera,0L);
+        TDEIO::NetAccess::dircopy(originalopera,torkopera,0L);
 
     TQFile inf(TQString("%1/.opera-tork/opera6.ini").arg(getenv("HOME")));
     if ( inf.open(IO_WriteOnly | IO_Append) ) {
@@ -1116,7 +1116,7 @@ TQPixmap torkView::streamProgram(const TQString &program)
 {
 
     
-    TQString prog = KGlobal::iconLoader()->iconPath(program, KIcon::Small, true);
+    TQString prog = TDEGlobal::iconLoader()->iconPath(program, TDEIcon::Small, true);
     if (prog.isEmpty())
         return SmallIcon( "exec" );
     else
@@ -1428,14 +1428,14 @@ void torkView::displayError( const TQString &caption, const TQString &infol)
     KPassivePopup* pop;
 
     TQPoint pnt;
-    if (kmain->isActiveWindow()){
-        pop = new KPassivePopup( kmain );
-        pnt = kmain->pos() += kmain->m_view->pos() += kmain->m_view->circuitList->pos() +=
-                kmain->m_view->circuitList->getMousePos() += kmain->m_view->splitter3->pos() += 
-                kmain->m_view->splitter4->pos() += kmain->m_view->groupBox1->pos();
+    if (tdemain->isActiveWindow()){
+        pop = new KPassivePopup( tdemain );
+        pnt = tdemain->pos() += tdemain->m_view->pos() += tdemain->m_view->circuitList->pos() +=
+                tdemain->m_view->circuitList->getMousePos() += tdemain->m_view->splitter3->pos() += 
+                tdemain->m_view->splitter4->pos() += tdemain->m_view->groupBox1->pos();
     }else{
-        pop = new KPassivePopup( kmain->_tray );
-        pnt = kmain->_tray->pos();
+        pop = new KPassivePopup( tdemain->_tray );
+        pnt = tdemain->_tray->pos();
     }
     pop->setView( caption,info );
     pop->show(TQPoint(pnt));
@@ -1450,12 +1450,12 @@ void torkView::displayServer( const TQString &caption, const TQString &info)
     KPassivePopup* pop;
 
     TQPoint pnt;
-    if (kmain->isActiveWindow()){
+    if (tdemain->isActiveWindow()){
         pop = new KPassivePopup( serverList );
-        //pnt = kmain->pos()  -= kmain->m_view->serverList->getMousePos() -= kmain->m_view->serverList->getMousePos() -= kmain->m_view->serverList->getMousePos();
+        //pnt = tdemain->pos()  -= tdemain->m_view->serverList->getMousePos() -= tdemain->m_view->serverList->getMousePos() -= tdemain->m_view->serverList->getMousePos();
     }else{
-        pop = new KPassivePopup( kmain->_tray );
-        pnt = kmain->_tray->pos();
+        pop = new KPassivePopup( tdemain->_tray );
+        pnt = tdemain->_tray->pos();
     }
     pop->setView( caption,info );
     //pop->show(TQPoint(pnt));
@@ -1471,7 +1471,7 @@ void torkView::showServerBW(const TQString &fp )
     TQString tmpFile;
     fl = TQString("http://www.noreply.org/tor-running-routers/%1/node-traf-%2.png")
                 .arg(fp.left(2)).arg(fp);
-    KIO::NetAccess::download( fl, tmpFile, 0L );
+    TDEIO::NetAccess::download( fl, tmpFile, 0L );
     kapp->processEvents();
     streamList-> setPaletteBackgroundPixmap( TQPixmap(tmpFile) );
 }