Initial TDE conversion

5 files changed, 50 insertions, 50 deletions

diff --git a/src/konqplugin/Makefile.am b/src/konqplugin/Makefile.am
index a00dedd..49b67ce 100644
--- a/src/konqplugin/Makefile.am
+++ b/src/konqplugin/Makefile.am
@@ -1,14 +1,14 @@
 INCLUDES = $(all_includes)
 
-kde_module_LTLIBRARIES = khtml_tork.la
+kde_module_LTLIBRARIES = tdehtml_tork.la
 
-khtml_tork_la_METASOURCES = AUTO
-khtml_tork_la_SOURCES = tork_plug_in.cpp
-khtml_tork_la_LIBADD =  $(LIB_KHTML)
-khtml_tork_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+tdehtml_tork_la_METASOURCES = AUTO
+tdehtml_tork_la_SOURCES = tork_plug_in.cpp
+tdehtml_tork_la_LIBADD =  $(LIB_TDEHTML)
+tdehtml_tork_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 
 KDE_ICON = AUTO
 
 part_DATA = tork_plug_in.rc tork_plug_in.desktop
-partdir = $(kde_datadir)/khtml/kpartplugins
+partdir = $(kde_datadir)/tdehtml/kpartplugins
 
diff --git a/src/konqplugin/tork_plug_in.cpp b/src/konqplugin/tork_plug_in.cpp
index 5064279..9d1f825 100644
--- a/src/konqplugin/tork_plug_in.cpp
+++ b/src/konqplugin/tork_plug_in.cpp
@@ -40,21 +40,21 @@
 #include <dcopref.h>
 #include <kdatastream.h>
 #include <kdebug.h>
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 #include <kiconloader.h>
-#include <kglobal.h>
-#include <kaction.h>
+#include <tdeglobal.h>
+#include <tdeaction.h>
 #include <kinstance.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdepopupmenu.h>
 #include <krun.h>
 
 #include <dom/html_document.h>
 #include <dom/html_misc.h>
 #include <dom/dom_element.h>
 
-#include <kparts/partmanager.h>
+#include <tdeparts/partmanager.h>
 
 #include <set>
 
@@ -62,32 +62,32 @@
 Tork_plug_in::Tork_plug_in( TQObject* parent, const char* name )
     : Plugin( parent, name )
 {
-    TQPixmap pix = KGlobal::iconLoader()->loadIcon("tork",
-                                                  KIcon::MainToolbar);
-    KActionMenu *menu = new KActionMenu( i18n("Anonymity Manager"), pix,
+    TQPixmap pix = TDEGlobal::iconLoader()->loadIcon("tork",
+                                                  TDEIcon::MainToolbar);
+    TDEActionMenu *menu = new TDEActionMenu( i18n("Anonymity Manager"), pix,
                                          actionCollection(), "tork_menu" );
     menu->setDelayed( false );
     connect( menu->popupMenu(), SIGNAL( aboutToShow() ), SLOT( showPopup() ));
 
-    m_paToggleKDE=new KAction(i18n("Anonymize KDE"),
-                                           KGlobal::iconLoader()->loadIconSet("tork_konqueroroff",                                               KIcon::Small),
-                                           KShortcut(),
+    m_paToggleKDE=new TDEAction(i18n("Anonymize KDE"),
+                                           TDEGlobal::iconLoader()->loadIconSet("tork_konqueroroff",                                               TDEIcon::Small),
+                                           TDEShortcut(),
                                            this, SLOT(toggleKDE()),
                                            actionCollection(), "tork_konqueroron" );
 
     menu->insert( m_paToggleKDE );
 
 
-    KAction *m_firefox=new KAction(i18n("Re-Open Anonymously with Firefox"),
-                                           KGlobal::iconLoader()->loadIconSet("tork_firefox",                                               KIcon::Small),
-                                           KShortcut(),
+    TDEAction *m_firefox=new TDEAction(i18n("Re-Open Anonymously with Firefox"),
+                                           TDEGlobal::iconLoader()->loadIconSet("tork_firefox",                                               TDEIcon::Small),
+                                           TDEShortcut(),
                                            this, SLOT(openWithFirefox()),
                                            actionCollection(), "tork_firefox" );
     menu->insert( m_firefox );
 
-    KAction *m_opera=new KAction(i18n("Re-Open Anonymously with Opera"),
-                                           KGlobal::iconLoader()->loadIconSet("tork_opera",                                               KIcon::Small),
-                                           KShortcut(),
+    TDEAction *m_opera=new TDEAction(i18n("Re-Open Anonymously with Opera"),
+                                           TDEGlobal::iconLoader()->loadIconSet("tork_opera",                                               TDEIcon::Small),
+                                           TDEShortcut(),
                                            this, SLOT(openWithOpera()),
                                            actionCollection(), "tork_opera" );
     menu->insert( m_opera );
@@ -115,12 +115,12 @@ void Tork_plug_in::showPopup()
     }
 
     if (anonymized){
-        m_paToggleKDE->setIconSet( KGlobal::iconLoader()->loadIconSet("tork_konqueroroff",
-                                                  KIcon::Small) );
+        m_paToggleKDE->setIconSet( TDEGlobal::iconLoader()->loadIconSet("tork_konqueroroff",
+                                                  TDEIcon::Small) );
         m_paToggleKDE->setText( "De-Anonymize KDE" );
     }else{
-        m_paToggleKDE->setIconSet( KGlobal::iconLoader()->loadIconSet("tork_konqueroron",
-                                                  KIcon::Small) );
+        m_paToggleKDE->setIconSet( TDEGlobal::iconLoader()->loadIconSet("tork_konqueroron",
+                                                  TDEIcon::Small) );
         m_paToggleKDE->setText( "Anonymize KDE" );
     }
 }
@@ -141,7 +141,7 @@ void Tork_plug_in::openWithOpera()
 
 void Tork_plug_in::openWithBrowser(const TQString &browser)
 {
-    KHTMLPart *htmlPart = static_cast<KHTMLPart*>( parent() );
+    TDEHTMLPart *htmlPart = static_cast<TDEHTMLPart*>( parent() );
     TQString url = htmlPart->toplevelURL().url();
 
     if (p_dcopServer->isApplicationRegistered ("tork")){
@@ -168,7 +168,7 @@ void Tork_plug_in::toggleKDE()
 KPluginFactory::KPluginFactory( TQObject* parent, const char* name )
         : KLibFactory( parent, name )
 {
-    s_instance = new KInstance("KPluginFactory");
+    s_instance = new TDEInstance("KPluginFactory");
 }
 
 TQObject* KPluginFactory::createObject( TQObject* parent, const char* name, const char*, const TQStringList & )
@@ -184,14 +184,14 @@ KPluginFactory::~KPluginFactory()
 
 extern "C"
 {
-    KDE_EXPORT void* init_khtml_tork()
+    KDE_EXPORT void* init_tdehtml_tork()
     {
-        KGlobal::locale()->insertCatalogue("tork");
+        TDEGlobal::locale()->insertCatalogue("tork");
         return new KPluginFactory;
     }
 
 }
 
-KInstance* KPluginFactory::s_instance = 0L;
+TDEInstance* KPluginFactory::s_instance = 0L;
 
 #include "tork_plug_in.moc"
diff --git a/src/konqplugin/tork_plug_in.desktop b/src/konqplugin/tork_plug_in.desktop
index 4b2c518..8355388 100644
--- a/src/konqplugin/tork_plug_in.desktop
+++ b/src/konqplugin/tork_plug_in.desktop
@@ -1,15 +1,15 @@
 [Desktop Entry]
-X-KDE-Library=khtml_tork
-X-KDE-PluginInfo-Author=Robert Hogan
-X-KDE-PluginInfo-Email=robert@roberthogan.net
-X-KDE-PluginInfo-Name=tork
-X-KDE-PluginInfo-Version=3.4
-X-KDE-PluginInfo-Website=http://tork.sourceforge.net
-X-KDE-PluginInfo-Category=Tools
-X-KDE-PluginInfo-Depends=
-X-KDE-PluginInfo-License=GPL
-X-KDE-PluginInfo-EnabledByDefault=true
+X-TDE-Library=tdehtml_tork
+X-TDE-PluginInfo-Author=Robert Hogan
+X-TDE-PluginInfo-Email=robert@roberthogan.net
+X-TDE-PluginInfo-Name=tork
+X-TDE-PluginInfo-Version=3.4
+X-TDE-PluginInfo-Website=http://tork.sourceforge.net
+X-TDE-PluginInfo-Category=Tools
+X-TDE-PluginInfo-Depends=
+X-TDE-PluginInfo-License=GPL
+X-TDE-PluginInfo-EnabledByDefault=true
 Name=TorK
 Type=Application
 Comment=Anonymity Manager
-Icon=khtml_tork
+Icon=tdehtml_tork
diff --git a/src/konqplugin/tork_plug_in.h b/src/konqplugin/tork_plug_in.h
index 63b9216..93d2069 100644
--- a/src/konqplugin/tork_plug_in.h
+++ b/src/konqplugin/tork_plug_in.h
@@ -38,19 +38,19 @@
 #ifndef __plugin_tork_plug_in_h
 #define __plugin_tork_plug_in_h
 
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 #include <klibloader.h>
 #include <dcopclient.h>
 #include <kurl.h>
 
-class KInstance;
+class TDEInstance;
 
 class Tork_plug_in : public KParts::Plugin
 {
     Q_OBJECT
 public:
     Tork_plug_in( TQObject* parent = 0, const char* name = 0 );
-    KAction *m_paToggleKDE ;
+    TDEAction *m_paToggleKDE ;
     DCOPClient* p_dcopServer;
     virtual ~Tork_plug_in();
 
@@ -75,7 +75,7 @@ public:
                                    const TQStringList &args = TQStringList() );
 
 private:
-    static KInstance* s_instance;
+    static TDEInstance* s_instance;
 };
 
 #endif
diff --git a/src/konqplugin/tork_plug_in.rc b/src/konqplugin/tork_plug_in.rc
index 8b803b5..5a61d95 100644
--- a/src/konqplugin/tork_plug_in.rc
+++ b/src/konqplugin/tork_plug_in.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartgui library="khtml_tork" name="khtml_tork" version="3" >
+<kpartgui library="tdehtml_tork" name="tdehtml_tork" version="3" >
 <MenuBar>
     <Menu name="tools"><Text>&amp;Tools</Text>
         <Action name="tork_menu"/>