1 files changed, 18 insertions, 18 deletions

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 );
 }