Branding and code cleanup.

23 files changed, 108 insertions, 108 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 5abd534..8a738c4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,7 +18,7 @@ SUBDIRS=icons arkollon $(geoipdir) privoxytemplates \
 
 DISTCLEANFILES=dcoptork.kidl
 
-# set the include path for X, qt and KDE
+# set the include path for X, qt and TDE
 INCLUDES         = $(all_includes)
 
 # let automoc handle all of the meta source files (moc)
diff --git a/src/arkollon/wizard.cpp b/src/arkollon/wizard.cpp
index ec41827..fd2cfac 100644
--- a/src/arkollon/wizard.cpp
+++ b/src/arkollon/wizard.cpp
@@ -292,7 +292,7 @@ void Wizard::setupFromRc()
 		c.subDir = parser.readString("SubDir");
 		c.forceDir = sub(parser.readString("ForceDir"));
 		c.optional = parser.readBool("Optional", false);
-		c.kdeOnly = parser.readBool("KDEOnly", false);
+		c.kdeOnly = parser.readBool("TDEOnly", false);
 		c.gnomeOnly = parser.readBool("GnomeOnly", false);
 		c.description = sub(parser.readString("Description"));
 		c.confOptions = parser.readString("ConfigureOptions");
@@ -328,7 +328,7 @@ void Wizard::setupFromRc()
 			case 0: headers[item->section]->setText(0, "Required components"); break;
 			case 1: headers[item->section]->setText(0, "Optional components"); break;
 			case 2: headers[item->section]->setText(0, "Gnome specific components"); break;
-			case 3: headers[item->section]->setText(0, "KDE specific components"); break;
+			case 3: headers[item->section]->setText(0, "TDE specific components"); break;
 			}
 		}
 		
diff --git a/src/dcoptork.h b/src/dcoptork.h
index d83c055..5ce358a 100644
--- a/src/dcoptork.h
+++ b/src/dcoptork.h
@@ -31,8 +31,8 @@ class DCOPTork : virtual public DCOPObject
 
     virtual void startEverything() = 0;
     virtual void stopTor() = 0;
-    virtual void toggleKDESetting() = 0;
-    virtual bool getKDESetting() = 0;
+    virtual void toggleTDESetting() = 0;
+    virtual bool getTDESetting() = 0;
     virtual void anonymousEmail() = 0;
     virtual void anonymousFirefox() = 0;
     virtual void anonymizedFirefox(const TQString & url) = 0;
diff --git a/src/eventsrc b/src/eventsrc
index a9a7bdb..ac82f57 100644
--- a/src/eventsrc
+++ b/src/eventsrc
@@ -4,7 +4,7 @@ Comment=Anonymity Notice
 
 [TorDisabled]
 Name=TorDisabled
-Comment=Anonymous Use of KDE/Konqueror Disabled
+Comment=Anonymous Use of TDE/Konqueror Disabled
 #default_sound=k3b_success1.wav
 default_presentation=16
 # None = 0, Sound = 1, Messagebox = 2, Logfile = 4, Stderr = 8, PassivePopup = 16, Execute = 32
diff --git a/src/hiddensrvs.ui.h b/src/hiddensrvs.ui.h
index e2c10aa..9bc6647 100644
--- a/src/hiddensrvs.ui.h
+++ b/src/hiddensrvs.ui.h
@@ -175,7 +175,7 @@ void MyHidden::startAllServices_clicked()
 
 void MyHidden::testService_clicked()
 {
-    if ((TorkConfig::kDEUsesTor()) &&
+    if ((TorkConfig::tDEUsesTor()) &&
         (static_cast<tork*>(this->topLevelWidget()->parentWidget())->connectedToTor())){
         KURL url = TQString("http://%1").arg(servicesList->currentItem()->text(0));
         kapp->invokeBrowser(url.url(), "0");
@@ -191,7 +191,7 @@ void MyHidden::testService_clicked()
 
 void MyHidden::publishService_clicked()
 {
-    if ((TorkConfig::kDEUsesTor()) &&
+    if ((TorkConfig::tDEUsesTor()) &&
         (static_cast<tork*>(this->topLevelWidget()->parentWidget())->connectedToTor())){
 
        KURL url = TQString("tor:6sxoyfb3h2nvok2d.onion/tor/FrontPage?action=edit");
diff --git a/src/konqplugin/tork_plug_in.cpp b/src/konqplugin/tork_plug_in.cpp
index 9d1f825..98dd755 100644
--- a/src/konqplugin/tork_plug_in.cpp
+++ b/src/konqplugin/tork_plug_in.cpp
@@ -69,13 +69,13 @@ Tork_plug_in::Tork_plug_in( TQObject* parent, const char* name )
     menu->setDelayed( false );
     connect( menu->popupMenu(), SIGNAL( aboutToShow() ), SLOT( showPopup() ));
 
-    m_paToggleKDE=new TDEAction(i18n("Anonymize KDE"),
+    m_paToggleTDE=new TDEAction(i18n("Anonymize TDE"),
                                            TDEGlobal::iconLoader()->loadIconSet("tork_konqueroroff",                                               TDEIcon::Small),
                                            TDEShortcut(),
-                                           this, SLOT(toggleKDE()),
+                                           this, SLOT(toggleTDE()),
                                            actionCollection(), "tork_konqueroron" );
 
-    menu->insert( m_paToggleKDE );
+    menu->insert( m_paToggleTDE );
 
 
     TDEAction *m_firefox=new TDEAction(i18n("Re-Open Anonymously with Firefox"),
@@ -111,17 +111,17 @@ void Tork_plug_in::showPopup()
     if (p_dcopServer->isApplicationRegistered ("tork"))
     {
         DCOPRef tork( "tork", "DCOPTork" );
-        anonymized = tork.call( "getKDESetting" );
+        anonymized = tork.call( "getTDESetting" );
     }
 
     if (anonymized){
-        m_paToggleKDE->setIconSet( TDEGlobal::iconLoader()->loadIconSet("tork_konqueroroff",
+        m_paToggleTDE->setIconSet( TDEGlobal::iconLoader()->loadIconSet("tork_konqueroroff",
                                                   TDEIcon::Small) );
-        m_paToggleKDE->setText( "De-Anonymize KDE" );
+        m_paToggleTDE->setText( "De-Anonymize TDE" );
     }else{
-        m_paToggleKDE->setIconSet( TDEGlobal::iconLoader()->loadIconSet("tork_konqueroron",
+        m_paToggleTDE->setIconSet( TDEGlobal::iconLoader()->loadIconSet("tork_konqueroron",
                                                   TDEIcon::Small) );
-        m_paToggleKDE->setText( "Anonymize KDE" );
+        m_paToggleTDE->setText( "Anonymize TDE" );
     }
 }
 
@@ -153,14 +153,14 @@ void Tork_plug_in::openWithBrowser(const TQString &browser)
 
 }
 
-void Tork_plug_in::toggleKDE()
+void Tork_plug_in::toggleTDE()
 {
     if (!p_dcopServer->isApplicationRegistered ("tork"))
-        KRun::runCommand("tork --toggleKDE");
+        KRun::runCommand("tork --toggleTDE");
     else
     {
         DCOPRef tork( "tork", "DCOPTork" );
-        tork.send( "toggleKDESetting");
+        tork.send( "toggleTDESetting");
     }
 }
 
diff --git a/src/konqplugin/tork_plug_in.h b/src/konqplugin/tork_plug_in.h
index 93d2069..115bd94 100644
--- a/src/konqplugin/tork_plug_in.h
+++ b/src/konqplugin/tork_plug_in.h
@@ -50,12 +50,12 @@ class Tork_plug_in : public KParts::Plugin
     Q_OBJECT
 public:
     Tork_plug_in( TQObject* parent = 0, const char* name = 0 );
-    TDEAction *m_paToggleKDE ;
+    TDEAction *m_paToggleTDE ;
     DCOPClient* p_dcopServer;
     virtual ~Tork_plug_in();
 
 private slots:
-    void toggleKDE();
+    void toggleTDE();
     void openWithBrowser(const TQString&);
     void openWithFirefox();
     void openWithOpera();
diff --git a/src/main.cpp b/src/main.cpp
index 7caf450..6889b4a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -32,7 +32,7 @@
 #include <tdeconfigdialogmanager.h>
 
 static const char description[] =
-    I18N_NOOP("<b>TorK - An Anonymity Manager for the KDE Desktop.</b>\n"
+    I18N_NOOP("<b>TorK - An Anonymity Manager for the TDE Desktop.</b>\n"
               "This product is produced independently from the Tor anonymity\n"
               "software and carries no guarantee from The Tor Project about\n"
               "quality, suitability or anything else.");
@@ -43,7 +43,7 @@ static const char title[] = "TorK 0.33";
 static TDECmdLineOptions options[] =
 {
     { "+[URL]", I18N_NOOP( "Document to open." ), 0 },
-    { "toggleKDE", I18N_NOOP("Toggle Anonymous KDE"), 0 },
+    { "toggleTDE", I18N_NOOP("Toggle Anonymous TDE"), 0 },
     { "anonymousFirefox", I18N_NOOP("Launch Anonymous Firefox"), 0 },
     { "anonymousOpera", I18N_NOOP("Launch Anonymous Opera"), 0 },
     { "anonymousKonsole", I18N_NOOP("Launch Anonymous Konsole"), 0 },
diff --git a/src/menu/tork.in b/src/menu/tork.in
index a22ec7b..ab28611 100644
--- a/src/menu/tork.in
+++ b/src/menu/tork.in
@@ -1,4 +1,4 @@
 ?package(tork):needs="X11" section="Applications/Network/Web Browsing"\
  title="TorK"\
- description="An anonymity manager for KDE."\
+ description="An anonymity manager for TDE."\
  command="@prefix@/bin/tork" icon="@prefix@/share/pixmaps/tork.xpm"
diff --git a/src/newstreamosd.cpp b/src/newstreamosd.cpp
index e8785e3..ebdb068 100644
--- a/src/newstreamosd.cpp
+++ b/src/newstreamosd.cpp
@@ -162,13 +162,13 @@ void StreamOSD::renderOSD()
     TQToolTip::add( changeID, i18n( "Change the 'Exit' used for current traffic.") );
 
     
-    toggleKDE = new TQToolButton( this,"konq" );
-    toggleKDE->setIconSet( SmallIconSet( "tork_konqueroroff" ) );
-    toggleKDE->setUsesTextLabel(false);
-    toggleKDE->setMaximumSize(SmallIconSet( "tork_konqueroroff" ).iconSize(TQIconSet::Small));
-    toggleKDE->adjustSize();
-    TabPageLayout->addWidget(toggleKDE,0,6);
-    TQToolTip::add( toggleKDE,i18n("Enable/Disable Konqueror's use of Tor"));
+    toggleTDE = new TQToolButton( this,"konq" );
+    toggleTDE->setIconSet( SmallIconSet( "tork_konqueroroff" ) );
+    toggleTDE->setUsesTextLabel(false);
+    toggleTDE->setMaximumSize(SmallIconSet( "tork_konqueroroff" ).iconSize(TQIconSet::Small));
+    toggleTDE->adjustSize();
+    TabPageLayout->addWidget(toggleTDE,0,6);
+    TQToolTip::add( toggleTDE,i18n("Enable/Disable Konqueror's use of Tor"));
 
     TQToolButton* hideMonitor = new TQToolButton( this,"hide" );
     hideMonitor->setIconSet( SmallIconSet( "cancel" ) );
@@ -185,13 +185,13 @@ void StreamOSD::renderOSD()
 
      connect( hideMonitor, SIGNAL(clicked()),
          SLOT(slotHideMonitor()) );
-     connect( toggleKDE, SIGNAL(clicked()),
-         SLOT(slotToggleKDE()) );
+     connect( toggleTDE, SIGNAL(clicked()),
+         SLOT(slotToggleTDE()) );
      connect( changeID, SIGNAL(clicked()),
          SLOT(slotChangeID()) );
 
-//      connect( toggleKDE, SIGNAL(clicked()),
-//          SLOT(slotToggleKDE()) );
+//      connect( toggleTDE, SIGNAL(clicked()),
+//          SLOT(slotToggleTDE()) );
 
 
     infoList = new TQListView( this, "infoList" );
@@ -504,9 +504,9 @@ void StreamOSD::slotChangeID( )
     emit requestChangeID();
 }
 
-void StreamOSD::slotToggleKDE( )
+void StreamOSD::slotToggleTDE( )
 {
-    emit requestToggleKDE();
+    emit requestToggleTDE();
 }
 
 void StreamOSD::contextMenuRequested( TQListViewItem *, const TQPoint &point, int )
diff --git a/src/newstreamosd.h b/src/newstreamosd.h
index a2f332b..e64bf0c 100644
--- a/src/newstreamosd.h
+++ b/src/newstreamosd.h
@@ -54,7 +54,7 @@ class StreamOSD : public TQWidget
 
  signals:
   void requestHideMonitor();
-  void requestToggleKDE();
+  void requestToggleTDE();
   void requestChangeID();
   void closeStream(const TQString &);
 
@@ -63,7 +63,7 @@ class StreamOSD : public TQWidget
   void setText( const TQString& );
   void setProgress( int );
   void slotHideMonitor();
-  void slotToggleKDE();
+  void slotToggleTDE();
   void slotChangeID();
 
   /**
@@ -92,7 +92,7 @@ class StreamOSD : public TQWidget
   StatGraph* m_graphIn;
   StatGraph* m_graphOut;
   Chart* chart;
-  TQToolButton* toggleKDE;
+  TQToolButton* toggleTDE;
   TQToolButton* changeID;
  private:
   /**
diff --git a/src/quickconfig.ui b/src/quickconfig.ui
index 374e8d7..e292994 100644
--- a/src/quickconfig.ui
+++ b/src/quickconfig.ui
@@ -318,7 +318,7 @@
                 </widget>
                 <widget class="TQCheckBox" row="7" column="1" rowspan="1" colspan="5">
                     <property name="name">
-                        <cstring>kcfg_AlwaysAnonymizeKDE</cstring>
+                        <cstring>kcfg_AlwaysAnonymizeTDE</cstring>
                     </property>
                     <property name="font">
                         <font>
diff --git a/src/tor_ioslave/torioslave.cpp b/src/tor_ioslave/torioslave.cpp
index 429ced0..1c1e875 100644
--- a/src/tor_ioslave/torioslave.cpp
+++ b/src/tor_ioslave/torioslave.cpp
@@ -106,7 +106,7 @@ void tdeio_torProtocol::get(const KURL& url )
     if (p_dcopServer->isApplicationRegistered ("tork")){
             m_torkrunning = true;
             DCOPRef tork( "tork", "DCOPTork" );
-            anonymized = tork.call( "getKDESetting" );
+            anonymized = tork.call( "getTDESetting" );
     }
 
     
@@ -114,18 +114,18 @@ void tdeio_torProtocol::get(const KURL& url )
     if (m_torkrunning){
         DCOPRef("tork*", "DCOPTork").send("startEverything");
         if (!anonymized)
-            DCOPRef("tork*", "DCOPTork").send("toggleKDESetting");
+            DCOPRef("tork*", "DCOPTork").send("toggleTDESetting");
         wait = "3";
     }else{
         KProcIO *whichproc = new KProcIO();
         whichproc->setUseShell(TRUE);
-        TQString whichCommand="tork --toggleKDE";
+        TQString whichCommand="tork --toggleTDE";
     
         *whichproc<<whichCommand;
     
         whichproc->start(KProcIO::NotifyOnExit,TRUE);
 
-        //KRun::runCommand( "tork --toggleKDE");
+        //KRun::runCommand( "tork --toggleTDE");
         wait = "10";
     }
 
diff --git a/src/tork.1 b/src/tork.1
index cd7a195..fc24053 100644
--- a/src/tork.1
+++ b/src/tork.1
@@ -1,13 +1,13 @@
 .TH "TORK" "1"
 .SH "NAME"
-tork \- an anonymity manager for KDE.
+tork \- an anonymity manager for TDE.
 .SH "SYNOPSIS"
 \fBtork\fR
 .SH "DESCRIPTION"
 This manual page documents briefly the
 \fBtork\fR commandline
 parameters.
-\fBtork\fR is an anonymity manager for KDE.
+\fBtork\fR is an anonymity manager for TDE.
 It allows you to monitor all your tor and
 non-tor traffic, to search and setup tor servers
 and to launch programs like Konqueror, Opera or
@@ -17,8 +17,8 @@ This program follows the usual GNU command line syntax, with long
 options starting with two dashes (`-').
 A summary of options is included below.
 .TP
-.B \-\-toggleKDE
-Toggle Anonymous KDE
+.B \-\-toggleTDE
+Toggle Anonymous TDE
 .TP
 .B \-\-anonymousFirefox
 Launch Anonymous Firefox
diff --git a/src/tork.cpp b/src/tork.cpp
index 2c56e0a..00b1ae4 100644
--- a/src/tork.cpp
+++ b/src/tork.cpp
@@ -252,8 +252,8 @@ tork::tork()
                                           const TQString&, const TQString&)));
      connect(m_view->m_osd, SIGNAL(requestHideMonitor()),
              this,   SLOT(toggleTorMon2()));
-     connect(m_view->m_osd, SIGNAL(requestToggleKDE()),
-             this,   SLOT(toggleKDESetting()));
+     connect(m_view->m_osd, SIGNAL(requestToggleTDE()),
+             this,   SLOT(toggleTDESetting()));
      connect(m_view->m_osd, SIGNAL(requestChangeID()),
              this,   SLOT(useNewIdentity()));
 
@@ -265,7 +265,7 @@ tork::tork()
     connect(m_view, SIGNAL(newIdentity()),
              this,   SLOT(useNewIdentity()));
     connect(m_view, SIGNAL(konqWithTor()),
-             this,   SLOT(toggleKDESettingAndLaunchKonq()));
+             this,   SLOT(toggleTDESettingAndLaunchKonq()));
     connect(m_view, SIGNAL(networkList()),
              this,   SLOT(networkList()));
     connect(m_view, SIGNAL(hiddenServices()),
@@ -321,15 +321,15 @@ tork::tork()
     changeStatusbar("zero","zero");
     sayWhatImDoing(i18n("To connect to Tor, press play."));
     showTipOnStart();
-    turnOffKDE();
+    turnOffTDE();
 
 	if ((TDEApplication::kApplication()->isRestored()))
         startEverything();
 
     TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
-    if( args->isSet( "toggleKDE" ) ){
+    if( args->isSet( "toggleTDE" ) ){
         startEverything();
-        enableKDE(true);
+        enableTDE(true);
     }
 
     if( args->isSet( "anonymousFirefox" ) ){
@@ -488,7 +488,7 @@ void tork::shuttingDown()
 
 
     KNotifyClient::event(tdemain->_tray->winId(),"TorDisabled", "TorK Has Closed And Returned "
-                         "KDE To Its Non-Anonymous State! Goodbye!");
+                         "TDE To Its Non-Anonymous State! Goodbye!");
 
     prepareToShut();
 
@@ -511,7 +511,7 @@ void tork::setupActions()
     torkStop = new TDEAction(i18n("Disconnect From Tor"),"tork_stop", 0,this,
                             SLOT(stopTorGracefully()),actionCollection(),"stop_tor");
     enableKonqi = new TDEAction(i18n("Enable/Disable Konqueror's use of Tor"),"konqueror", 0,this,
-                              SLOT(toggleKDESetting()),actionCollection(),"enable_konqi");
+                              SLOT(toggleTDESetting()),actionCollection(),"enable_konqi");
     enableTormon = new TDEAction(i18n("Toggle Tor Traffic OSD"),"tork_konsole", 0,this,
                                SLOT(toggleTorMon()),actionCollection(),"enable_tormon");
     browseHiddenServices = new TDEAction(i18n("Browse Hidden Services"),"tork_tor", 0,this,
@@ -2043,7 +2043,7 @@ void tork::stopTor()
     //timer->stop();
 	_tray->setPixmap(KSystemTray::loadIcon("tork_pressplay"));
     changeStatusbar("zero","zero");
-    turnOffKDE();
+    turnOffTDE();
     m_view->m_osd->infoList->clear();
     m_view->m_osd->hide();
     sayWhatImDoing(i18n("To connect to Tor, press play."));
@@ -2622,7 +2622,7 @@ void tork::childExited()
     browseHiddenServices->setEnabled(false);
     sayWhatImDoing(i18n("To connect to Tor, press play."));
 
-    turnOffKDE();
+    turnOffTDE();
 
 
 
@@ -2979,10 +2979,10 @@ void tork::startController()
     m_view->welcomeitem->setEnabled(false);
 	_tray->setPixmap(KSystemTray::loadIcon("tork_green"));
 
-    if( TorkConfig::alwaysAnonymizeKDE())
-        enableKDE(true);
+    if( TorkConfig::alwaysAnonymizeTDE())
+        enableTDE(true);
     else
-        TorkConfig::setKDEUsesTor(false);
+        TorkConfig::setTDEUsesTor(false);
 
     TorkConfig::setCurrentExcludeNodes("");
     TorkConfig::setCurrentEntryNodes("");
@@ -3300,9 +3300,9 @@ void tork::runWizard()
 }
 
 
-void tork::turnOffKDE()
+void tork::turnOffTDE()
 {
-    setKDE(false);
+    setTDE(false);
 }
 
 void tork::toggleTorBar()
@@ -3359,12 +3359,12 @@ void tork::networkList()
        kapp->invokeBrowser(url.url(), "0");
 }
 
-void tork::toggleKDESetting()
+void tork::toggleTDESetting()
 {
-    TorkConfig::setKDEUsesTor(!TorkConfig::kDEUsesTor());
-    setKDE(TorkConfig::kDEUsesTor());
+    TorkConfig::setTDEUsesTor(!TorkConfig::tDEUsesTor());
+    setTDE(TorkConfig::tDEUsesTor());
 
-    if (TorkConfig::kDEUsesTor())
+    if (TorkConfig::tDEUsesTor())
         KNotifyClient::event(tdemain->_tray->winId(),"TorDisabled", i18n("All <b>Konqueror</b> Sessions Are Now Safe for Anonymous Use. <br> <b>Amarok, Akregator, KTorrent should be treated with caution! </b><br> This is because they may have javascript/java/plugins/flash enabled."));
     else
         KNotifyClient::event(tdemain->_tray->winId(),"TorDisabled", i18n("<b>Konqueror</b> is Now Back to "
@@ -3374,12 +3374,12 @@ void tork::toggleKDESetting()
 
 }
 
-void tork::enableKDE(bool enable)
+void tork::enableTDE(bool enable)
 {
-    TorkConfig::setKDEUsesTor(enable);
-    setKDE(TorkConfig::kDEUsesTor());
+    TorkConfig::setTDEUsesTor(enable);
+    setTDE(TorkConfig::tDEUsesTor());
 
-    if (TorkConfig::kDEUsesTor())
+    if (TorkConfig::tDEUsesTor())
         KNotifyClient::event(tdemain->_tray->winId(),"TorDisabled", i18n("All <b>Konqueror</b> Sessions Are Now Safe for Anonymous Use. <br> <b>Amarok, Akregator, KTorrent should be treated with caution! </b><br> This is because they may have javascript/java/plugins/flash enabled."));
     else
         KNotifyClient::event(tdemain->_tray->winId(),"TorDisabled", i18n("<b>Konqueror</b> is Now Back to "
@@ -3389,11 +3389,11 @@ void tork::enableKDE(bool enable)
 
 }
 
-void tork::toggleKDESettingAndLaunchKonq()
+void tork::toggleTDESettingAndLaunchKonq()
 {
-    toggleKDESetting();
+    toggleTDESetting();
 
-    if (TorkConfig::kDEUsesTor()){
+    if (TorkConfig::tDEUsesTor()){
 
         KRun::runCommand( "konqueror --caption \"Anonymous Browsing Session\" "
                           "http://healthcheck.anonymityanywhere.com/",
@@ -3403,12 +3403,12 @@ void tork::toggleKDESettingAndLaunchKonq()
     }
 }
 
-void tork::enableKDEAndLaunchKonqWithUrl(const TQString &url)
+void tork::enableTDEAndLaunchKonqWithUrl(const TQString &url)
 {
-    if (!TorkConfig::kDEUsesTor())
-        toggleKDESetting();
+    if (!TorkConfig::tDEUsesTor())
+        toggleTDESetting();
 
-    if (TorkConfig::kDEUsesTor()){
+    if (TorkConfig::tDEUsesTor()){
 
         KRun::runCommand( TQString("konqueror --caption \"Anonymous Browsing Session\" "
                           "%1").arg(url),
@@ -3416,12 +3416,12 @@ void tork::enableKDEAndLaunchKonqWithUrl(const TQString &url)
     }
 }
 
-bool tork::getKDESetting()
+bool tork::getTDESetting()
 {
-    return TorkConfig::kDEUsesTor();
+    return TorkConfig::tDEUsesTor();
 }
 
-void tork::setKDE(bool set)
+void tork::setTDE(bool set)
 {
 
   if (!m_view->konqitem)
@@ -3515,7 +3515,7 @@ void tork::setKDE(bool set)
 
   if (set){
       enableKonqi->setIcon("tork_konqueroroff");
-      m_view->m_osd->toggleKDE->setIconSet(SmallIconSet( "tork_konqueroroff"));
+      m_view->m_osd->toggleTDE->setIconSet(SmallIconSet( "tork_konqueroroff"));
       m_view->konqitem->setIcon("tork_konqueror_stop");
       m_view->konqitem->icon->repaint();
       m_view->konqitem->setDescriptionText("<qt>"+
@@ -3535,7 +3535,7 @@ void tork::setKDE(bool set)
 
   }else{
       enableKonqi->setIcon("tork_konqueroron");
-      m_view->m_osd->toggleKDE->setIconSet(SmallIconSet( "tork_konqueroron"));
+      m_view->m_osd->toggleTDE->setIconSet(SmallIconSet( "tork_konqueroron"));
       m_view->konqitem->setIcon("tork_konqueror_play");
       m_view->konqitem->setDescriptionText("<qt>"+
                        i18n("<b>Click the icon to launch an anonymous "
diff --git a/src/tork.desktop b/src/tork.desktop
index 85d9a8b..678bb2a 100644
--- a/src/tork.desktop
+++ b/src/tork.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=TorK
 GenericName=Anonymity Manager
-Comment=An Anonymity Manager for KDE
+Comment=An Anonymity Manager for TDE
 Type=Application
 Categories=Qt;TDE;Network;FileTransfer
 Terminal=false
diff --git a/src/tork.h b/src/tork.h
index 1ad1497..722c618 100644
--- a/src/tork.h
+++ b/src/tork.h
@@ -119,13 +119,13 @@ public:
     void anonymousGaim(){torkify( 2 );};
     void anonymousPidgin(){torkify( 3 );};
     void anonymousKonsole(){torkify( 4 );};
-    bool getKDESetting();
+    bool getTDESetting();
     bool routerDiscovered(){ return m_routerDiscovered;};
     void setRouterDiscovered(bool discovered){ m_routerDiscovered = discovered;};
 
     TQStringList getDiscoveredRouters(){ return discoveredRouters;};
     void setBandwidthFromSysTray(int rate );
-    void enableKDEAndLaunchKonqWithUrl(const TQString &);
+    void enableTDEAndLaunchKonqWithUrl(const TQString &);
     int upnpORPort(){ return orPort; };
     int upnpDirPort(){ return dirPort; };
     void setUpnpDirPort(int port){ dirPort=port; };
@@ -159,11 +159,11 @@ private slots:
     void receivedOutput(KProcIO *);
     void processFilter(KProcIO *filterproc);
     void receivedNetStatOutput(KProcIO *);
-    void toggleKDESetting();
-    void enableKDE(bool enable);
-    void toggleKDESettingAndLaunchKonq();
-    void setKDE(bool set);
-    void turnOffKDE();
+    void toggleTDESetting();
+    void enableTDE(bool enable);
+    void toggleTDESettingAndLaunchKonq();
+    void setTDE(bool set);
+    void turnOffTDE();
     void sayWhatImDoing(const TQString& );
     void slotOnItem( int, TQListViewItem *, const TQPoint &, int );
     void slotOnORItem( TQListViewItem * );
diff --git a/src/torkapplet/tork_mnu.cpp b/src/torkapplet/tork_mnu.cpp
index 29e96b0..fc5a45d 100644
--- a/src/torkapplet/tork_mnu.cpp
+++ b/src/torkapplet/tork_mnu.cpp
@@ -114,7 +114,7 @@ void TorkMenu::initialize()
 
     insertSeparator();
     
-    insertItem( SmallIcon("tork_konqueroron"), i18n( "Anonymize KDE" ), 9,9 );
+    insertItem( SmallIcon("tork_konqueroron"), i18n( "Anonymize TDE" ), 9,9 );
 
     connect( this, SIGNAL( aboutToShow() ), SLOT( showPopup() ));
 
@@ -128,13 +128,13 @@ void TorkMenu::showPopup()
     if (p_dcopServer->isApplicationRegistered ("tork"))
     {
         DCOPRef tork( "tork", "DCOPTork" );
-        anonymized = tork.call( "getKDESetting" );
+        anonymized = tork.call( "getTDESetting" );
     }
 
     if (anonymized)
-        changeItem(9, SmallIcon("tork_konqueroroff"), i18n( "De-Anonymize KDE" ));
+        changeItem(9, SmallIcon("tork_konqueroroff"), i18n( "De-Anonymize TDE" ));
     else
-        changeItem(9, SmallIcon("tork_konqueroron"), i18n( "Anonymize KDE" ));
+        changeItem(9, SmallIcon("tork_konqueroron"), i18n( "Anonymize TDE" ));
 
 
 }
@@ -150,7 +150,7 @@ void TorkMenu::slotExec(int id)
 	switch(id)
 	{
 	case 9:
-		anonymizeKDE(); break;
+		anonymizeTDE(); break;
 	default:
 		anonymousApp(id);break;
 	}
@@ -172,18 +172,18 @@ void TorkMenu::anonymousApp(int id)
 }
 
 
-void TorkMenu::anonymizeKDE()
+void TorkMenu::anonymizeTDE()
 {
     if (m_torkrunning){
         DCOPRef("tork*", "DCOPTork").send("startEverything");
-        DCOPRef("tork*", "DCOPTork").send("toggleKDESetting");
+        DCOPRef("tork*", "DCOPTork").send("toggleTDESetting");
     }else
-        KRun::runCommand( "tork --toggleKDE", "tork", "tork" );
+        KRun::runCommand( "tork --toggleTDE", "tork", "tork" );
 
 //     if (m_kdestate)
-//         changeItem(9, SmallIcon("tork_konqueroroff"), i18n( "De-Anonymize KDE" ));
+//         changeItem(9, SmallIcon("tork_konqueroroff"), i18n( "De-Anonymize TDE" ));
 //     else
-//         changeItem(9, SmallIcon("tork_konqueroron"), i18n( "Anonymize KDE" ));
+//         changeItem(9, SmallIcon("tork_konqueroron"), i18n( "Anonymize TDE" ));
 // 
 //     m_kdestate = !m_kdestate;
 
diff --git a/src/torkapplet/tork_mnu.h b/src/torkapplet/tork_mnu.h
index 274da88..f92c534 100644
--- a/src/torkapplet/tork_mnu.h
+++ b/src/torkapplet/tork_mnu.h
@@ -38,7 +38,7 @@ public:
     TorkMenu(TQWidget *parent, const char *name, const TQStringList& /* args */);
     ~TorkMenu();
     void anonymousApp(int id);
-    void anonymizeKDE();
+    void anonymizeTDE();
     bool m_kdestate;
     bool m_torkrunning;
     DCOPClient* p_dcopServer;
diff --git a/src/torkconfig.kcfg b/src/torkconfig.kcfg
index bdcd084..8137916 100644
--- a/src/torkconfig.kcfg
+++ b/src/torkconfig.kcfg
@@ -348,11 +348,11 @@
 	    <label></label>
         <default>true</default>
     </entry>
-    <entry name="KDEUsesTor" type="Bool">
+    <entry name="TDEUsesTor" type="Bool">
 	    <label></label>
         <default>false</default>
     </entry>
-    <entry name="AlwaysAnonymizeKDE" type="Bool">
+    <entry name="AlwaysAnonymizeTDE" type="Bool">
 	    <label></label>
         <default>false</default>
     </entry>
diff --git a/src/torkview.cpp b/src/torkview.cpp
index 6a238e6..ace59d8 100644
--- a/src/torkview.cpp
+++ b/src/torkview.cpp
@@ -1655,7 +1655,7 @@ void torkView::populateMenu()
       
       konqitem->setIcon("tork_konqueror_play");
 
-      if (TorkConfig::kDEUsesTor())
+      if (TorkConfig::tDEUsesTor())
           konqitem->icon->pixmap()->fill(TQt::red);
 
       konqitem->setDescriptionText("<qt>"+i18n("<b>Click the icon to launch an anonymous browsing session. </b><br>"
diff --git a/src/trayicon.cpp b/src/trayicon.cpp
index 6884564..20fd2a9 100644
--- a/src/trayicon.cpp
+++ b/src/trayicon.cpp
@@ -92,7 +92,7 @@ void  TrayIcon::droppedfile (KURL::List url)
 {
     m_parent->startEverything();
     if (TorkConfig::availablePrograms().contains("konqueror"))
-      m_parent->enableKDEAndLaunchKonqWithUrl(url.first().url());
+      m_parent->enableTDEAndLaunchKonqWithUrl(url.first().url());
     else if (TorkConfig::availablePrograms().contains("firefox"))
       m_parent->anonymizedFirefox(url.first().url());
 }
diff --git a/src/update.cpp b/src/update.cpp
index 43f4a8d..859e617 100644
--- a/src/update.cpp
+++ b/src/update.cpp
@@ -259,7 +259,7 @@ void TorkUpdate::downloadComponent(TQString component, TQString version, TQStrin
                 TDEProcess* arkollonproc = new KShellProcess();
 
                 KMessageBox::information (this,i18n( "<p><b>If this the first time you've compiled software then here are a few useful tips:</b><br>"
-                    "1. Any error messages in the log file with the words 'KDE', 'TQt','curl' or 'X' in them mean that you need to install "
+                    "1. Any error messages in the log file with the words 'TDE', 'TQt','curl' or 'X' in them mean that you need to install "
                     "the appropriate development libraries.<br>"
                     "2. Any package provided by your distribution with 'lib' or 'devel' in the name is a development library, e.g. qt-devel, libkde.<br>"
                     "</p>" ),"Compilation Tips","compiler");