@ -27,39 +27,39 @@
# include <ntqtimer.h> # include <ntqtimer.h>
# include <ntqgroupbox.h> # include <ntqgroupbox.h>
# include < k configdialog.h># include < tde configdialog.h>
# include < k global.h># include < tde global.h>
# include < k locale.h># include < tde locale.h>
# include <kiconloader.h> # include <kiconloader.h>
# include < k deversion.h># include < t deversion.h>
# include < k menubar.h># include < tde menubar.h>
# include <kstatusbar.h> # include <kstatusbar.h>
# include <kkeydialog.h> # include <kkeydialog.h>
# include <ksqueezedtextlabel.h> # include <ksqueezedtextlabel.h>
# include <kedittoolbar.h> # include <kedittoolbar.h>
# include < k toolbarbutton.h># include < tde toolbarbutton.h>
# include <krun.h> # include <krun.h>
# include < k stdaccel.h># include < tde stdaccel.h>
# include < k action.h># include < tde action.h>
# include <kstdaction.h> # include <kstdaction.h>
# include < k popupmenu.h># include < tde popupmenu.h>
# include <kprocio.h> # include <kprocio.h>
# include < k messagebox.h># include < tde messagebox.h>
# include <dcopref.h> # include <dcopref.h>
# include < k config.h># include < tde config.h>
# include < k messagebox.h># include < tde messagebox.h>
# include < k locale.h># include < tde locale.h>
# include <kpassivepopup.h> # include <kpassivepopup.h>
# include < k io/netaccess.h># include < tde io/netaccess.h>
# include < k html_part.h># include < tde html_part.h>
# include <dom/html_misc.h> # include <dom/html_misc.h>
# include <kurl.h> # include <kurl.h>
# include < k htmlview.h># include < tde htmlview.h>
# include <kstandarddirs.h> # include <kstandarddirs.h>
# include <ktip.h> # include <ktip.h>
# include < k win.h># include < t win.h>
# include <knotifyclient.h> # include <knotifyclient.h>
# include < k listviewsearchline.h># include < tde listviewsearchline.h>
# include <ntqtooltip.h> # include <ntqtooltip.h>
# include <ntqlabel.h> # include <ntqlabel.h>
@ -69,7 +69,7 @@
# include <ntqhostaddress.h> # include <ntqhostaddress.h>
# include <dcopref.h> # include <dcopref.h>
# include <dcopclient.h> # include <dcopclient.h>
# include < k cmdlineargs.h># include < tde cmdlineargs.h>
# ifndef EXTERNAL_GEOIP # ifndef EXTERNAL_GEOIP
# include "GeoIP-1.4.0 / libGeoIP / GeoIP.h" # include "GeoIP-1.4.0 / libGeoIP / GeoIP.h"
@ -96,7 +96,7 @@
# include "../config.h" # include "../config.h"
tork * k main = 0L ; tork * tde main = 0L ;
using namespace tk ; using namespace tk ;
@ -117,7 +117,7 @@ TQValueVector<TQString> countryType(256);
tork : : tork ( ) tork : : tork ( )
: DCOPObject ( " DCOPTork " ) ,
: DCOPObject ( " DCOPTork " ) ,
K MainWindow( 0 , " TorK " ) ,
TDE MainWindow( 0 , " TorK " ) ,
m_view ( new torkView ( this ) ) ,
m_view ( new torkView ( this ) ) ,
m_printer ( 0 ) ,
m_printer ( 0 ) ,
m_servererrornag ( true ) ,
m_servererrornag ( true ) ,
@ -142,7 +142,7 @@ tork::tork()
kapp - > dcopClient ( ) - > setDefaultObject ( objId ( ) ) ;
kapp - > dcopClient ( ) - > setDefaultObject ( objId ( ) ) ;
// }
// }
k main = this ;
tde main = this ;
client = 0L ;
client = 0L ;
childproc = 0L ;
childproc = 0L ;
privoxyproc = 0L ;
privoxyproc = 0L ;
@ -215,7 +215,7 @@ tork::tork()
// Comment the following line once you are sure all your windows have a name:
// Comment the following line once you are sure all your windows have a name:
likeBack - > setWindowNamesListing ( LikeBack : : WarnUnnamedWindows ) ;
likeBack - > setWindowNamesListing ( LikeBack : : WarnUnnamedWindows ) ;
// This line should be called early in your K MainWindow constructor because it references actionCollection().
// This line should be called early in your TDE MainWindow constructor because it references actionCollection().
// It should be called before createGUI() for the action to be plugged in the Help menu:
// It should be called before createGUI() for the action to be plugged in the Help menu:
likeBack - > sendACommentAction ( actionCollection ( ) ) ;
likeBack - > sendACommentAction ( actionCollection ( ) ) ;
@ -236,7 +236,7 @@ tork::tork()
//currentChanged(0);
//currentChanged(0);
//applySettings(false);
//applySettings(false);
// tell the K MainWindow that this is indeed the main widget
// tell the TDE MainWindow that this is indeed the main widget
setCentralWidget ( m_view ) ;
setCentralWidget ( m_view ) ;
setStandardToolBarMenuEnabled ( true ) ;
setStandardToolBarMenuEnabled ( true ) ;
@ -323,10 +323,10 @@ tork::tork()
showTipOnStart ( ) ;
showTipOnStart ( ) ;
turnOffKDE ( ) ;
turnOffKDE ( ) ;
if ( ( K Application: : kApplication ( ) - > isRestored ( ) ) )
if ( ( TDE Application: : kApplication ( ) - > isRestored ( ) ) )
startEverything ( ) ;
startEverything ( ) ;
KCmdLineArgs * args = K CmdLineArgs: : parsedArgs ( ) ;
TDECmdLineArgs * args = TDE CmdLineArgs: : parsedArgs ( ) ;
if ( args - > isSet ( " toggleKDE " ) ) {
if ( args - > isSet ( " toggleKDE " ) ) {
startEverything ( ) ;
startEverything ( ) ;
enableKDE ( true ) ;
enableKDE ( true ) ;
@ -386,11 +386,11 @@ tork::tork()
toolBar ( " TorToolBar " ) - > toggleButton ( toolBar ( " TorToolBar " ) - > idAt ( 2 ) ) ;
toolBar ( " TorToolBar " ) - > toggleButton ( toolBar ( " TorToolBar " ) - > idAt ( 2 ) ) ;
toolBar ( " MoreToolBar " ) - > show ( ) ;
toolBar ( " MoreToolBar " ) - > show ( ) ;
} else {
} else {
toolBar ( " TorToolBar " ) - > setIconText ( K ToolBar: : IconTextRight , false ) ;
toolBar ( " TorToolBar " ) - > setIconText ( TDE ToolBar: : IconTextRight , false ) ;
m_ModeButton - > plug ( toolBar ( " TorToolBar " ) ) ;
m_ModeButton - > plug ( toolBar ( " TorToolBar " ) ) ;
toolBar ( " TorToolBar " ) - > setToggle ( toolBar ( " TorToolBar " ) - > idAt ( 2 ) , true ) ;
toolBar ( " TorToolBar " ) - > setToggle ( toolBar ( " TorToolBar " ) - > idAt ( 2 ) , true ) ;
toolBar ( " MoreToolBar " ) - > hide ( ) ;
toolBar ( " MoreToolBar " ) - > hide ( ) ;
toolBar ( " TorToolBar " ) - > setIconText ( K ToolBar: : IconOnly , false ) ;
toolBar ( " TorToolBar " ) - > setIconText ( TDE ToolBar: : IconOnly , false ) ;
}
}
} }
@ -411,7 +411,7 @@ void tork::prepareToShut()
client = 0L ;
client = 0L ;
}
}
KConfig* config = new KConfig ( " k ioslaverc" , false , false ) ;
TDEConfig* config = new TDEConfig ( " tde ioslaverc" , false , false ) ;
config - > setGroup ( " Proxy Settings " ) ;
config - > setGroup ( " Proxy Settings " ) ;
config - > writeEntry ( " httpProxy " , TorkConfig : : originalHttpProxy ( ) ) ;
config - > writeEntry ( " httpProxy " , TorkConfig : : originalHttpProxy ( ) ) ;
config - > writeEntry ( " httpsProxy " , TorkConfig : : originalHttpsProxy ( ) ) ;
config - > writeEntry ( " httpsProxy " , TorkConfig : : originalHttpsProxy ( ) ) ;
@ -421,7 +421,7 @@ void tork::prepareToShut()
//delete config;
//delete config;
// Inform all running io-slaves about the changes...
// Inform all running io-slaves about the changes...
// if we cannot update, ioslaves inform the end user...
// if we cannot update, ioslaves inform the end user...
if ( ! DCOPRef ( " * " , " K IO::Scheduler" ) . send ( " reparseSlaveConfiguration " , TQString : : null ) )
if ( ! DCOPRef ( " * " , " TDE IO::Scheduler" ) . send ( " reparseSlaveConfiguration " , TQString : : null ) )
{
{
TQString caption = i18n ( " Update Failed " ) ;
TQString caption = i18n ( " Update Failed " ) ;
TQString message = i18n ( " You have to restart the running applications "
TQString message = i18n ( " You have to restart the running applications "
@ -457,7 +457,7 @@ void tork::prepareToShut()
privoxytest = 0L ;
privoxytest = 0L ;
}
}
m_view - > m_osd - > saveSettings ( K Global: : config ( ) ) ;
m_view - > m_osd - > saveSettings ( TDE Global: : config ( ) ) ;
TorkConfig : : writeConfig ( ) ;
TorkConfig : : writeConfig ( ) ;
@ -480,14 +480,14 @@ void tork::shuttingDown()
if ( m_DNSTorified ) {
if ( m_DNSTorified ) {
KNotifyClient : : event ( k main- > _tray - > winId ( ) , " TorDisabled " , i18n ( " <b>You are now in "
KNotifyClient : : event ( tde main- > _tray - > winId ( ) , " TorDisabled " , i18n ( " <b>You are now in "
" FailSafe Mode</b>. <br> You need to be in Normal Mode before "
" FailSafe Mode</b>. <br> You need to be in Normal Mode before "
" you can close TorK. " ) ) ;
" you can close TorK. " ) ) ;
return ;
return ;
}
}
KNotifyClient : : event ( k main- > _tray - > winId ( ) , " TorDisabled " , " TorK Has Closed And Returned "
KNotifyClient : : event ( tde main- > _tray - > winId ( ) , " TorDisabled " , " TorK Has Closed And Returned "
" KDE To Its Non-Anonymous State! Goodbye! " ) ;
" KDE To Its Non-Anonymous State! Goodbye! " ) ;
prepareToShut ( ) ;
prepareToShut ( ) ;
@ -502,42 +502,42 @@ void tork::setupActions()
_tray = new TrayIcon ( this ) ;
_tray = new TrayIcon ( this ) ;
_tray - > setPixmap ( KSystemTray : : loadIcon ( " tork_pressplay " ) ) ;
_tray - > setPixmap ( KSystemTray : : loadIcon ( " tork_pressplay " ) ) ;
connect ( _tray , SIGNAL ( quitSelected ( ) ) , SLOT ( shuttingDown ( ) ) ) ;
connect ( _tray , SIGNAL ( quitSelected ( ) ) , SLOT ( shuttingDown ( ) ) ) ;
K PopupMenu * conf_menu = _tray - > contextMenu ( ) ;
TDE PopupMenu * conf_menu = _tray - > contextMenu ( ) ;
torkConfigure = new K Action( i18n ( " &Configure TorK " ) , " configure " , 0 ,
torkConfigure = new TDE Action( i18n ( " &Configure TorK " ) , " configure " , 0 ,
this , SLOT ( optionsPreferences ( ) ) , actionCollection ( ) , " configure_tor " ) ;
this , SLOT ( optionsPreferences ( ) ) , actionCollection ( ) , " configure_tor " ) ;
torkStart = new K Action( i18n ( " Connect To Tor " ) , " tork_play " , 0 , this ,
torkStart = new TDE Action( i18n ( " Connect To Tor " ) , " tork_play " , 0 , this ,
SLOT ( startEverything ( ) ) , actionCollection ( ) , " start_tor " ) ;
SLOT ( startEverything ( ) ) , actionCollection ( ) , " start_tor " ) ;
torkStop = new K Action( i18n ( " Disconnect From Tor " ) , " tork_stop " , 0 , this ,
torkStop = new TDE Action( i18n ( " Disconnect From Tor " ) , " tork_stop " , 0 , this ,
SLOT ( stopTorGracefully ( ) ) , actionCollection ( ) , " stop_tor " ) ;
SLOT ( stopTorGracefully ( ) ) , actionCollection ( ) , " stop_tor " ) ;
enableKonqi = new K Action( i18n ( " Enable/Disable Konqueror's use of Tor " ) , " konqueror " , 0 , this ,
enableKonqi = new TDE Action( i18n ( " Enable/Disable Konqueror's use of Tor " ) , " konqueror " , 0 , this ,
SLOT ( toggleKDESetting ( ) ) , actionCollection ( ) , " enable_konqi " ) ;
SLOT ( toggleKDESetting ( ) ) , actionCollection ( ) , " enable_konqi " ) ;
enableTormon = new K Action( i18n ( " Toggle Tor Traffic OSD " ) , " tork_konsole " , 0 , this ,
enableTormon = new TDE Action( i18n ( " Toggle Tor Traffic OSD " ) , " tork_konsole " , 0 , this ,
SLOT ( toggleTorMon ( ) ) , actionCollection ( ) , " enable_tormon " ) ;
SLOT ( toggleTorMon ( ) ) , actionCollection ( ) , " enable_tormon " ) ;
browseHiddenServices = new K Action( i18n ( " Browse Hidden Services " ) , " tork_tor " , 0 , this ,
browseHiddenServices = new TDE Action( i18n ( " Browse Hidden Services " ) , " tork_tor " , 0 , this ,
SLOT ( hiddenServices ( ) ) , actionCollection ( ) , " hidden_services " ) ;
SLOT ( hiddenServices ( ) ) , actionCollection ( ) , " hidden_services " ) ;
browseNetworkList = new K Action( i18n ( " Browse Tor Network Status " ) , " info " , 0 , this ,
browseNetworkList = new TDE Action( i18n ( " Browse Tor Network Status " ) , " info " , 0 , this ,
SLOT ( networkList ( ) ) , actionCollection ( ) , " network_list " ) ;
SLOT ( networkList ( ) ) , actionCollection ( ) , " network_list " ) ;
# ifndef LIVECD # ifndef LIVECD
torkUpdateTork = new K Action( i18n ( " Download Tork " ) , " tork_green " , 0 , this ,
torkUpdateTork = new TDE Action( i18n ( " Download Tork " ) , " tork_green " , 0 , this ,
SLOT ( updateTork ( ) ) , actionCollection ( ) , " update_tork " ) ;
SLOT ( updateTork ( ) ) , actionCollection ( ) , " update_tork " ) ;
torkUpdateStable = new K Action( i18n ( " Download Tor (Stable Version) " ) , " tork_tor " , 0 , this ,
torkUpdateStable = new TDE Action( i18n ( " Download Tor (Stable Version) " ) , " tork_tor " , 0 , this ,
SLOT ( updateTorStable ( ) ) , actionCollection ( ) , " update_torstable " ) ;
SLOT ( updateTorStable ( ) ) , actionCollection ( ) , " update_torstable " ) ;
torkUpdateUnstable = new K Action( i18n ( " Download Tor (Experimental Version) " ) , " tork_tor " , 0 , this ,
torkUpdateUnstable = new TDE Action( i18n ( " Download Tor (Experimental Version) " ) , " tork_tor " , 0 , this ,
SLOT ( updateTorUnstable ( ) ) , actionCollection ( ) , " update_torunstable " ) ;
SLOT ( updateTorUnstable ( ) ) , actionCollection ( ) , " update_torunstable " ) ;
torkUpdatePrivoxy = new K Action( i18n ( " Download Privoxy (Proxy) " ) , " proxy " , 0 , this ,
torkUpdatePrivoxy = new TDE Action( i18n ( " Download Privoxy (Proxy) " ) , " proxy " , 0 , this ,
SLOT ( updatePrivoxy ( ) ) , actionCollection ( ) , " update_privoxy " ) ;
SLOT ( updatePrivoxy ( ) ) , actionCollection ( ) , " update_privoxy " ) ;
# endif # endif
torkFirstRunWizard = new K Action( i18n ( " First Run Wizard " ) , " wizard " , 0 , this ,
torkFirstRunWizard = new TDE Action( i18n ( " First Run Wizard " ) , " wizard " , 0 , this ,
SLOT ( runWizard ( ) ) , actionCollection ( ) , " firstrun_wizard " ) ;
SLOT ( runWizard ( ) ) , actionCollection ( ) , " firstrun_wizard " ) ;
toggleTorbar = new K Action( i18n ( " Toggle Tor Bar " ) , " tork_tor " , 0 , this ,
toggleTorbar = new TDE Action( i18n ( " Toggle Tor Bar " ) , " tork_tor " , 0 , this ,
SLOT ( toggleTorBar ( ) ) , actionCollection ( ) , " toggle_torbar " ) ;
SLOT ( toggleTorBar ( ) ) , actionCollection ( ) , " toggle_torbar " ) ;
connect ( m_view - > TorkTabs , SIGNAL ( currentChanged ( TQWidget * ) ) , SLOT ( currentTabChanged ( TQWidget * ) ) ) ;
connect ( m_view - > TorkTabs , SIGNAL ( currentChanged ( TQWidget * ) ) , SLOT ( currentTabChanged ( TQWidget * ) ) ) ;
//Servers Filter
//Servers Filter
m_ServerFilterButton = new K ActionMenu( i18n ( " Servers " ) , " filter " , actionCollection ( ) ) ;
m_ServerFilterButton = new TDE ActionMenu( i18n ( " Servers " ) , " filter " , actionCollection ( ) ) ;
m_ServerFilterButton - > setDelayed ( false ) ;
m_ServerFilterButton - > setDelayed ( false ) ;
m_ServerFilterMenu = m_ServerFilterButton - > popupMenu ( ) ;
m_ServerFilterMenu = m_ServerFilterButton - > popupMenu ( ) ;
m_ServerFilterMenu - > insertItem ( i18n ( " All " ) , this , SLOT ( filterServers ( int ) ) , 0 , 0 ) ;
m_ServerFilterMenu - > insertItem ( i18n ( " All " ) , this , SLOT ( filterServers ( int ) ) , 0 , 0 ) ;
@ -558,17 +558,17 @@ void tork::setupActions()
m_ServerFilterMenu - > setItemChecked ( 0 , true ) ;
m_ServerFilterMenu - > setItemChecked ( 0 , true ) ;
m_CountryMenu = new K PopupMenu( this ) ;
m_CountryMenu = new TDE PopupMenu( this ) ;
m_ServerFilterMenu - > insertItem ( i18n ( " Show Countries " ) , m_CountryMenu ) ;
m_ServerFilterMenu - > insertItem ( i18n ( " Show Countries " ) , m_CountryMenu ) ;
m_CountryMenuEU = new K PopupMenu( this ) ;
m_CountryMenuEU = new TDE PopupMenu( this ) ;
m_CountryMenuAF = new K PopupMenu( this ) ;
m_CountryMenuAF = new TDE PopupMenu( this ) ;
m_CountryMenuAS = new K PopupMenu( this ) ;
m_CountryMenuAS = new TDE PopupMenu( this ) ;
m_CountryMenuNA = new K PopupMenu( this ) ;
m_CountryMenuNA = new TDE PopupMenu( this ) ;
m_CountryMenuAN = new K PopupMenu( this ) ;
m_CountryMenuAN = new TDE PopupMenu( this ) ;
m_CountryMenuSA = new K PopupMenu( this ) ;
m_CountryMenuSA = new TDE PopupMenu( this ) ;
m_CountryMenuNN = new K PopupMenu( this ) ;
m_CountryMenuNN = new TDE PopupMenu( this ) ;
m_CountryMenuOC = new K PopupMenu( this ) ;
m_CountryMenuOC = new TDE PopupMenu( this ) ;
continentMapList [ " EU " ] = m_CountryMenuEU ;
continentMapList [ " EU " ] = m_CountryMenuEU ;
continentMapList [ " AF " ] = m_CountryMenuAF ;
continentMapList [ " AF " ] = m_CountryMenuAF ;
@ -599,7 +599,7 @@ void tork::setupActions()
m_view - > serverFilter - > setHidden ( true ) ;
m_view - > serverFilter - > setHidden ( true ) ;
// Launch Filter
// Launch Filter
m_LaunchMenuButton = new K ActionMenu( i18n ( " Launch " ) , " tork_tor " , actionCollection ( ) ) ;
m_LaunchMenuButton = new TDE ActionMenu( i18n ( " Launch " ) , " tork_tor " , actionCollection ( ) ) ;
m_LaunchMenuButton - > setDelayed ( false ) ;
m_LaunchMenuButton - > setDelayed ( false ) ;
m_LaunchMenu = m_LaunchMenuButton - > popupMenu ( ) ;
m_LaunchMenu = m_LaunchMenuButton - > popupMenu ( ) ;
m_LaunchMenu - > insertItem ( SmallIcon ( " tork_mail " ) , i18n ( " Anonymous Email " ) , m_view ,
m_LaunchMenu - > insertItem ( SmallIcon ( " tork_mail " ) , i18n ( " Anonymous Email " ) , m_view ,
@ -627,7 +627,7 @@ void tork::setupActions()
this , SLOT ( torkify ( int ) ) , 0 , 4 ) ;
this , SLOT ( torkify ( int ) ) , 0 , 4 ) ;
// Log Filter
// Log Filter
m_LogFilterButton = new K ActionMenu( i18n ( " Tor Log " ) , " filter " , actionCollection ( ) ) ;
m_LogFilterButton = new TDE ActionMenu( i18n ( " Tor Log " ) , " filter " , actionCollection ( ) ) ;
m_LogFilterButton - > setDelayed ( false ) ;
m_LogFilterButton - > setDelayed ( false ) ;
m_LogFilterMenu = m_LogFilterButton - > popupMenu ( ) ;
m_LogFilterMenu = m_LogFilterButton - > popupMenu ( ) ;
m_LogFilterMenu - > insertItem ( i18n ( " All " ) , this , SLOT ( filterLog ( int ) ) , 0 , 0 ) ;
m_LogFilterMenu - > insertItem ( i18n ( " All " ) , this , SLOT ( filterLog ( int ) ) , 0 , 0 ) ;
@ -638,11 +638,11 @@ void tork::setupActions()
m_LogFilterMenu - > setItemChecked ( 0 , true ) ;
m_LogFilterMenu - > setItemChecked ( 0 , true ) ;
// Traffic Filter
// Traffic Filter
m_TrafficFilterButton = new K ActionMenu( i18n ( " Traffic " ) , " filter " , actionCollection ( ) ) ;
m_TrafficFilterButton = new TDE ActionMenu( i18n ( " Traffic " ) , " filter " , actionCollection ( ) ) ;
m_TrafficFilterButton - > setDelayed ( false ) ;
m_TrafficFilterButton - > setDelayed ( false ) ;
m_TrafficFilterMenu = m_TrafficFilterButton - > popupMenu ( ) ;
m_TrafficFilterMenu = m_TrafficFilterButton - > popupMenu ( ) ;
m_TorTrafficFilterMenu = new K PopupMenu( this ) ;
m_TorTrafficFilterMenu = new TDE PopupMenu( this ) ;
m_NonTorTrafficFilterMenu = new K PopupMenu( this ) ;
m_NonTorTrafficFilterMenu = new TDE PopupMenu( this ) ;
m_TrafficFilterMenu - > insertItem ( i18n ( " Tor Traffic " ) , m_TorTrafficFilterMenu ) ;
m_TrafficFilterMenu - > insertItem ( i18n ( " Tor Traffic " ) , m_TorTrafficFilterMenu ) ;
m_TrafficFilterMenu - > insertItem ( i18n ( " Non-Tor Traffic " ) , m_NonTorTrafficFilterMenu ) ;
m_TrafficFilterMenu - > insertItem ( i18n ( " Non-Tor Traffic " ) , m_NonTorTrafficFilterMenu ) ;
@ -687,23 +687,23 @@ void tork::setupActions()
m_NonTorTrafficFilterMenu - > setItemChecked ( 0 , true ) ;
m_NonTorTrafficFilterMenu - > setItemChecked ( 0 , true ) ;
m_IdentityButton = new K Action( i18n ( " Change Identity " ) , " tork_identity " , 0 , this ,
m_IdentityButton = new TDE Action( i18n ( " Change Identity " ) , " tork_identity " , 0 , this ,
SLOT ( useNewIdentity ( ) ) , actionCollection ( ) ) ;
SLOT ( useNewIdentity ( ) ) , actionCollection ( ) ) ;
//Pseudonymity Buttons
//Pseudonymity Buttons
m_PseudoButton = new K ActionMenu( i18n ( " Be From.. " ) , " tork_internet " ,
m_PseudoButton = new TDE ActionMenu( i18n ( " Be From.. " ) , " tork_internet " ,
actionCollection ( ) ) ;
actionCollection ( ) ) ;
m_PseudoButton - > setDelayed ( false ) ;
m_PseudoButton - > setDelayed ( false ) ;
m_PseudoMenu = m_PseudoButton - > popupMenu ( ) ;
m_PseudoMenu = m_PseudoButton - > popupMenu ( ) ;
m_PseudoMenuEU = new K PopupMenu( this ) ;
m_PseudoMenuEU = new TDE PopupMenu( this ) ;
m_PseudoMenuAF = new K PopupMenu( this ) ;
m_PseudoMenuAF = new TDE PopupMenu( this ) ;
m_PseudoMenuAS = new K PopupMenu( this ) ;
m_PseudoMenuAS = new TDE PopupMenu( this ) ;
m_PseudoMenuNA = new K PopupMenu( this ) ;
m_PseudoMenuNA = new TDE PopupMenu( this ) ;
m_PseudoMenuAN = new K PopupMenu( this ) ;
m_PseudoMenuAN = new TDE PopupMenu( this ) ;
m_PseudoMenuSA = new K PopupMenu( this ) ;
m_PseudoMenuSA = new TDE PopupMenu( this ) ;
m_PseudoMenuNN = new K PopupMenu( this ) ;
m_PseudoMenuNN = new TDE PopupMenu( this ) ;
m_PseudoMenuOC = new K PopupMenu( this ) ;
m_PseudoMenuOC = new TDE PopupMenu( this ) ;
continentMap [ " EU " ] = m_PseudoMenuEU ;
continentMap [ " EU " ] = m_PseudoMenuEU ;
continentMap [ " AF " ] = m_PseudoMenuAF ;
continentMap [ " AF " ] = m_PseudoMenuAF ;
@ -728,7 +728,7 @@ void tork::setupActions()
m_PseudoMenu - > setItemChecked ( 999 , true ) ;
m_PseudoMenu - > setItemChecked ( 999 , true ) ;
// Server Button
// Server Button
m_ServerButton = new K ActionMenu( i18n ( " Run Server " ) , " server " , actionCollection ( ) ) ;
m_ServerButton = new TDE ActionMenu( i18n ( " Run Server " ) , " server " , actionCollection ( ) ) ;
m_ServerButton - > setDelayed ( false ) ;
m_ServerButton - > setDelayed ( false ) ;
m_ServerButtonMenu = m_ServerButton - > popupMenu ( ) ;
m_ServerButtonMenu = m_ServerButton - > popupMenu ( ) ;
m_ServerButtonMenu - > insertItem ( i18n ( " None " ) , this , SLOT ( configureServer ( int ) ) , 0 , 0 ) ;
m_ServerButtonMenu - > insertItem ( i18n ( " None " ) , this , SLOT ( configureServer ( int ) ) , 0 , 0 ) ;
@ -739,9 +739,9 @@ void tork::setupActions()
m_ServerButtonMenu - > insertItem ( i18n ( " To Defeat Censorship Of Tor " ) , this ,
m_ServerButtonMenu - > insertItem ( i18n ( " To Defeat Censorship Of Tor " ) , this ,
SLOT ( configureServer ( int ) ) , 0 , 3 ) ;
SLOT ( configureServer ( int ) ) , 0 , 3 ) ;
m_ServerButtonMenu - > insertSeparator ( ) ;
m_ServerButtonMenu - > insertSeparator ( ) ;
m_ServerButtonMenu - > insertItem ( K Global: : iconLoader ( ) - > loadIconSet ( " configure " , K Icon: : Small ) ,
m_ServerButtonMenu - > insertItem ( TDE Global: : iconLoader ( ) - > loadIconSet ( " configure " , TDE Icon: : Small ) ,
i18n ( " Configure Server " ) , this , SLOT ( configureServer ( int ) ) , 0 , 4 ) ;
i18n ( " Configure Server " ) , this , SLOT ( configureServer ( int ) ) , 0 , 4 ) ;
m_ServerButtonMenu - > insertItem ( K Global: : iconLoader ( ) - > loadIconSet ( " tork_agent " , K Icon: : Small ) ,
m_ServerButtonMenu - > insertItem ( TDE Global: : iconLoader ( ) - > loadIconSet ( " tork_agent " , TDE Icon: : Small ) ,
i18n ( " Manage Hidden Services " ) , this , SLOT ( configureServer ( int ) ) , 0 , 5 ) ;
i18n ( " Manage Hidden Services " ) , this , SLOT ( configureServer ( int ) ) , 0 , 5 ) ;
m_ServerButtonMenu - > setItemChecked ( 0 , true ) ;
m_ServerButtonMenu - > setItemChecked ( 0 , true ) ;
@ -749,24 +749,24 @@ void tork::setupActions()
m_ServerButtonMenu - > setItemEnabled ( 4 , ! TorkConfig : : clientOnly ( ) ) ;
m_ServerButtonMenu - > setItemEnabled ( 4 , ! TorkConfig : : clientOnly ( ) ) ;
// Server Button
// Server Button
m_SecurityButton = new K ActionMenu( i18n ( " Fail-Safe " ) , " tork_penguin " , actionCollection ( ) ) ;
m_SecurityButton = new TDE ActionMenu( i18n ( " Fail-Safe " ) , " tork_penguin " , actionCollection ( ) ) ;
m_SecurityButton - > setDelayed ( false ) ;
m_SecurityButton - > setDelayed ( false ) ;
m_SecurityButtonMenu = m_SecurityButton - > popupMenu ( ) ;
m_SecurityButtonMenu = m_SecurityButton - > popupMenu ( ) ;
m_SecurityButtonMenu - > insertItem ( K Global: : iconLoader ( ) - > loadIconSet ( " tork_penguin " , K Icon: : Small ) ,
m_SecurityButtonMenu - > insertItem ( TDE Global: : iconLoader ( ) - > loadIconSet ( " tork_penguin " , TDE Icon: : Small ) ,
i18n ( " None " ) , this , SLOT ( configureSecurity ( int ) ) , 0 , 0 ) ;
i18n ( " None " ) , this , SLOT ( configureSecurity ( int ) ) , 0 , 0 ) ;
m_SecurityButtonMenu - > insertItem ( K Global: : iconLoader ( ) - > loadIconSet ( " tork_agent " , K Icon: : Small ) ,
m_SecurityButtonMenu - > insertItem ( TDE Global: : iconLoader ( ) - > loadIconSet ( " tork_agent " , TDE Icon: : Small ) ,
i18n ( " DNS FailSafe " ) , this , SLOT ( configureSecurity ( int ) ) , 0 , 1 ) ;
i18n ( " DNS FailSafe " ) , this , SLOT ( configureSecurity ( int ) ) , 0 , 1 ) ;
m_SecurityButtonMenu - > insertItem ( K Global: : iconLoader ( ) - > loadIconSet ( " gv " , K Icon: : Small ) ,
m_SecurityButtonMenu - > insertItem ( TDE Global: : iconLoader ( ) - > loadIconSet ( " gv " , TDE Icon: : Small ) ,
i18n ( " System FailSafe " ) , this , SLOT ( configureSecurity ( int ) ) , 0 , 2 ) ;
i18n ( " System FailSafe " ) , this , SLOT ( configureSecurity ( int ) ) , 0 , 2 ) ;
m_SecurityButtonMenu - > insertSeparator ( ) ;
m_SecurityButtonMenu - > insertSeparator ( ) ;
m_SecurityButtonMenu - > insertItem ( K Global: : iconLoader ( ) - > loadIconSet ( " configure " ,
m_SecurityButtonMenu - > insertItem ( TDE Global: : iconLoader ( ) - > loadIconSet ( " configure " ,
K Icon: : Small ) , i18n ( " Configure FailSafe " ) , this , SLOT ( configureSecurity ( int ) ) , 0 , 3 ) ;
TDE Icon: : Small ) , i18n ( " Configure FailSafe " ) , this , SLOT ( configureSecurity ( int ) ) , 0 , 3 ) ;
m_SecurityButtonMenu - > setItemChecked ( 0 , true ) ;
m_SecurityButtonMenu - > setItemChecked ( 0 , true ) ;
m_UnCensorButton = new K Action( i18n ( " Un-Censor " ) , " tork_uncensor " , 0 , this ,
m_UnCensorButton = new TDE Action( i18n ( " Un-Censor " ) , " tork_uncensor " , 0 , this ,
SLOT ( showFirewallEvasion ( ) ) , actionCollection ( ) ) ;
SLOT ( showFirewallEvasion ( ) ) , actionCollection ( ) ) ;
torkTip = new K Action( i18n ( " Tip of the Day " ) , " idea " , 0 , this ,
torkTip = new TDE Action( i18n ( " Tip of the Day " ) , " idea " , 0 , this ,
SLOT ( showTip ( ) ) , actionCollection ( ) , " help_show_tip " ) ;
SLOT ( showTip ( ) ) , actionCollection ( ) , " help_show_tip " ) ;
//set up all other actions
//set up all other actions
@ -784,11 +784,11 @@ void tork::setupActions()
createGUI ( ) ;
createGUI ( ) ;
m_ModeButton = new K Action( i18n ( " More Options " ) , " add " , 0 , this ,
m_ModeButton = new TDE Action( i18n ( " More Options " ) , " add " , 0 , this ,
SLOT ( switchMode ( ) ) , actionCollection ( ) ) ;
SLOT ( switchMode ( ) ) , actionCollection ( ) ) ;
//Set Up Advanced Toolbar
//Set Up Advanced Toolbar
toolBar ( " MoreToolBar " ) - > setIconText ( K ToolBar: : IconTextRight , false ) ;
toolBar ( " MoreToolBar " ) - > setIconText ( TDE ToolBar: : IconTextRight , false ) ;
m_PseudoButton - > plug ( toolBar ( " MoreToolBar " ) ) ;
m_PseudoButton - > plug ( toolBar ( " MoreToolBar " ) ) ;
m_ServerButton - > plug ( toolBar ( " MoreToolBar " ) ) ;
m_ServerButton - > plug ( toolBar ( " MoreToolBar " ) ) ;
# ifndef LIVECD # ifndef LIVECD
@ -796,15 +796,15 @@ void tork::setupActions()
m_SecurityButton - > plug ( toolBar ( " MoreToolBar " ) ) ;
m_SecurityButton - > plug ( toolBar ( " MoreToolBar " ) ) ;
# endif
# endif
# endif # endif
toolBar ( " MoreToolBar " ) - > setIconText ( K ToolBar: : IconOnly , false ) ;
toolBar ( " MoreToolBar " ) - > setIconText ( TDE ToolBar: : IconOnly , false ) ;
//Set Up Core Toolbar
//Set Up Core Toolbar
toolBar ( " TorToolBar " ) - > setIconText ( K ToolBar: : IconTextRight , false ) ;
toolBar ( " TorToolBar " ) - > setIconText ( TDE ToolBar: : IconTextRight , false ) ;
m_UnCensorButton - > plug ( toolBar ( " TorToolBar " ) ) ;
m_UnCensorButton - > plug ( toolBar ( " TorToolBar " ) ) ;
# ifndef LIVECD # ifndef LIVECD
//m_IdentityButton->plug( toolBar("TorToolBar") );
//m_IdentityButton->plug( toolBar("TorToolBar") );
# endif # endif
toolBar ( " TorToolBar " ) - > setIconText ( K ToolBar: : IconOnly , false ) ;
toolBar ( " TorToolBar " ) - > setIconText ( TDE ToolBar: : IconOnly , false ) ;
m_PseudoButton - > setToolTip ( i18n ( " Pretend you're using the Internet <br> in another country. " ) ) ;
m_PseudoButton - > setToolTip ( i18n ( " Pretend you're using the Internet <br> in another country. " ) ) ;
@ -914,7 +914,7 @@ void tork::applyPseudonymity( int country_id )
}
}
// Update Menu
// Update Menu
for ( TQMap < TQString , K PopupMenu* > : : Iterator menu = continentMap . begin ( ) ; menu ! = continentMap . end ( ) ; + + menu )
for ( TQMap < TQString , TDE PopupMenu* > : : Iterator menu = continentMap . begin ( ) ; menu ! = continentMap . end ( ) ; + + menu )
{
{
for ( unsigned int index = 0 ; index ! = menu . data ( ) - > count ( ) ; + + index ) {
for ( unsigned int index = 0 ; index ! = menu . data ( ) - > count ( ) ; + + index ) {
menu . data ( ) - > setItemChecked ( menu . data ( ) - > idAt ( index ) , false ) ;
menu . data ( ) - > setItemChecked ( menu . data ( ) - > idAt ( index ) , false ) ;
@ -1002,7 +1002,7 @@ void
tork : : currentTabChanged ( TQWidget * cur ) //SLOT
tork : : currentTabChanged ( TQWidget * cur ) //SLOT
{ {
toolBar ( ) - > setIconText ( K ToolBar: : IconTextRight , false ) ;
toolBar ( ) - > setIconText ( TDE ToolBar: : IconTextRight , false ) ;
if ( cur = = prev )
if ( cur = = prev )
return ;
return ;
@ -1032,7 +1032,7 @@ tork::currentTabChanged(TQWidget* cur ) //SLOT
}
}
toolBar ( ) - > setIconText ( K ToolBar: : IconOnly , false ) ;
toolBar ( ) - > setIconText ( TDE ToolBar: : IconOnly , false ) ;
m_ServerFilterButton - > setToolTip ( i18n ( " Filter the List of Servers. " ) ) ;
m_ServerFilterButton - > setToolTip ( i18n ( " Filter the List of Servers. " ) ) ;
m_LaunchMenuButton - > setToolTip ( i18n ( " Launch anonymized applications <br> with a single click. " ) ) ;
m_LaunchMenuButton - > setToolTip ( i18n ( " Launch anonymized applications <br> with a single click. " ) ) ;
m_LogFilterButton - > setToolTip ( i18n ( " Filter Log Messages by Type. " ) ) ;
m_LogFilterButton - > setToolTip ( i18n ( " Filter Log Messages by Type. " ) ) ;
@ -1142,7 +1142,7 @@ tork::switchMode() //SLOT
if ( TorkConfig : : advancedMode ( ) ) {
if ( TorkConfig : : advancedMode ( ) ) {
m_ModeButton - > unplug ( toolBar ( " TorToolBar " ) ) ;
m_ModeButton - > unplug ( toolBar ( " TorToolBar " ) ) ;
toolBar ( " TorToolBar " ) - > setIconText ( K ToolBar: : IconOnly , false ) ;
toolBar ( " TorToolBar " ) - > setIconText ( TDE ToolBar: : IconOnly , false ) ;
m_ModeButton - > plug ( toolBar ( " TorToolBar " ) ) ;
m_ModeButton - > plug ( toolBar ( " TorToolBar " ) ) ;
toolBar ( " TorToolBar " ) - > setToggle ( toolBar ( " TorToolBar " ) - > idAt ( 2 ) , true ) ;
toolBar ( " TorToolBar " ) - > setToggle ( toolBar ( " TorToolBar " ) - > idAt ( 2 ) , true ) ;
toolBar ( " TorToolBar " ) - > toggleButton ( toolBar ( " TorToolBar " ) - > idAt ( 2 ) ) ;
toolBar ( " TorToolBar " ) - > toggleButton ( toolBar ( " TorToolBar " ) - > idAt ( 2 ) ) ;
@ -1150,7 +1150,7 @@ tork::switchMode() //SLOT
} else {
} else {
m_ModeButton - > unplug ( toolBar ( " TorToolBar " ) ) ;
m_ModeButton - > unplug ( toolBar ( " TorToolBar " ) ) ;
toolBar ( " TorToolBar " ) - > setIconText ( K ToolBar: : IconTextRight , false ) ;
toolBar ( " TorToolBar " ) - > setIconText ( TDE ToolBar: : IconTextRight , false ) ;
m_ModeButton - > plug ( toolBar ( " TorToolBar " ) ) ;
m_ModeButton - > plug ( toolBar ( " TorToolBar " ) ) ;
toolBar ( " MoreToolBar " ) - > hide ( ) ;
toolBar ( " MoreToolBar " ) - > hide ( ) ;
}
}
@ -1277,11 +1277,11 @@ tork::configureSecurity( int id ) //SLOT
filterproc = new KProcIO ( ) ;
filterproc = new KProcIO ( ) ;
filterproc - > setUseShell ( TRUE ) ;
filterproc - > setUseShell ( TRUE ) ;
TQString filterCommand = TQString ( " k desu --noignorebutton --miniicon tork --caption '%1' -t -i %2 -d -c "
TQString filterCommand = TQString ( " t desu --noignorebutton --miniicon tork --caption '%1' -t -i %2 -d -c "
" '%3' " ) . arg ( filterRequest ) . arg ( iconstring ) . arg ( cmd ) ;
" '%3' " ) . arg ( filterRequest ) . arg ( iconstring ) . arg ( cmd ) ;
connect ( filterproc , SIGNAL ( readReady ( KProcIO * ) ) ,
connect ( filterproc , SIGNAL ( readReady ( KProcIO * ) ) ,
SLOT ( processFilter ( KProcIO * ) ) ) ;
SLOT ( processFilter ( KProcIO * ) ) ) ;
connect ( filterproc , SIGNAL ( processExited ( K Process * ) ) ,
connect ( filterproc , SIGNAL ( processExited ( TDE Process * ) ) ,
SLOT ( filterExited ( ) ) ) ;
SLOT ( filterExited ( ) ) ) ;
* filterproc < < filterCommand ;
* filterproc < < filterCommand ;
@ -1339,7 +1339,7 @@ void tork::filterExited()
client - > enableTransPort ( false ) ;
client - > enableTransPort ( false ) ;
}
}
m_SecurityButton - > setIconSet ( SmallIconSet ( " tork_penguin " ) ) ;
m_SecurityButton - > setIconSet ( SmallIconSet ( " tork_penguin " ) ) ;
KNotifyClient : : event ( k main- > _tray - > winId ( ) , " TorDisabled " , i18n ( " You are now in <b>Normal Mode</b>. <br> Tor and TorK will operate normally. " ) ) ;
KNotifyClient : : event ( tde main- > _tray - > winId ( ) , " TorDisabled " , i18n ( " You are now in <b>Normal Mode</b>. <br> Tor and TorK will operate normally. " ) ) ;
break ;
break ;
case 1 :
case 1 :
m_DNSTorified = true ;
m_DNSTorified = true ;
@ -1348,7 +1348,7 @@ void tork::filterExited()
client - > enableTransPort ( true ) ;
client - > enableTransPort ( true ) ;
}
}
m_SecurityButton - > setIconSet ( SmallIconSet ( " tork_agent " ) ) ;
m_SecurityButton - > setIconSet ( SmallIconSet ( " tork_agent " ) ) ;
KNotifyClient : : event ( k main- > _tray - > winId ( ) , " TorDisabled " , i18n ( " You are now in <b>DNS FailSafe Mode</b>. <br> All DNS queries will be routed through Tor. " ) ) ;
KNotifyClient : : event ( tde main- > _tray - > winId ( ) , " TorDisabled " , i18n ( " You are now in <b>DNS FailSafe Mode</b>. <br> All DNS queries will be routed through Tor. " ) ) ;
break ;
break ;
case 2 :
case 2 :
m_DNSTorified = true ;
m_DNSTorified = true ;
@ -1357,7 +1357,7 @@ void tork::filterExited()
client - > enableTransPort ( true ) ;
client - > enableTransPort ( true ) ;
}
}
m_SecurityButton - > setIconSet ( SmallIconSet ( " gv " ) ) ;
m_SecurityButton - > setIconSet ( SmallIconSet ( " gv " ) ) ;
KNotifyClient : : event ( k main- > _tray - > winId ( ) , " TorDisabled " , i18n ( " You are now in <b>System FailSafe Mode</b>. <br> Tor will use new routes for every new connection as often as possible. <br> All secure traffic will be routed through Tor. " ) ) ;
KNotifyClient : : event ( tde main- > _tray - > winId ( ) , " TorDisabled " , i18n ( " You are now in <b>System FailSafe Mode</b>. <br> Tor will use new routes for every new connection as often as possible. <br> All secure traffic will be routed through Tor. " ) ) ;
break ;
break ;
default :
default :
break ;
break ;
@ -1435,7 +1435,7 @@ tork::filterCountries( int id ) //SLOT
// Display servers for each selected country
// Display servers for each selected country
for ( TQMap < TQString , K PopupMenu* > : : Iterator menu = continentMapList . begin ( ) ;
for ( TQMap < TQString , TDE PopupMenu* > : : Iterator menu = continentMapList . begin ( ) ;
menu ! = continentMapList . end ( ) ; + + menu ) {
menu ! = continentMapList . end ( ) ; + + menu ) {
if ( m_CountryMenu - > isItemChecked ( 251 ) ) { // If 'All' selected, deselect all items
if ( m_CountryMenu - > isItemChecked ( 251 ) ) { // If 'All' selected, deselect all items
for ( unsigned int index = 0 ; index ! = menu . data ( ) - > count ( ) ; + + index ) {
for ( unsigned int index = 0 ; index ! = menu . data ( ) - > count ( ) ; + + index ) {
@ -1526,7 +1526,7 @@ tork::filterServers( int id ) //SLOT
}
}
for ( TQMap < TQString ,
for ( TQMap < TQString ,
K PopupMenu* > : : Iterator menu = continentMapList . begin ( ) ;
TDE PopupMenu* > : : Iterator menu = continentMapList . begin ( ) ;
menu ! = continentMapList . end ( ) ; + + menu ) {
menu ! = continentMapList . end ( ) ; + + menu ) {
TQListView * tmp = dynamic_cast < TQListView * > ( m_view - > serverList ) ;
TQListView * tmp = dynamic_cast < TQListView * > ( m_view - > serverList ) ;
filterView ( countryType , tmp , menu . data ( ) , 255 , 4 ) ;
filterView ( countryType , tmp , menu . data ( ) , 255 , 4 ) ;
@ -1558,7 +1558,7 @@ tork::filterServers( int id ) //SLOT
void void
tork : : filterView ( TQValueVector < TQString > & possibleValues , TQListView * & view , tork : : filterView ( TQValueVector < TQString > & possibleValues , TQListView * & view ,
K PopupMenu* & menu , int id , int column ) {
TDE PopupMenu* & menu , int id , int column ) {
if ( possibleValues [ id ] = = " All " ) {
if ( possibleValues [ id ] = = " All " ) {
TQListViewItemIterator it ( view ) ;
TQListViewItemIterator it ( view ) ;
@ -1601,7 +1601,7 @@ tork::filterView( TQValueVector<TQString> &possibleValues, TQListView* &view,
void void
tork : : filterViewServers ( TQValueVector < TQString > & possibleValues , tork : : filterViewServers ( TQValueVector < TQString > & possibleValues ,
TQListView * & view , K PopupMenu* & menu , int ,
TQListView * & view , TDE PopupMenu* & menu , int ,
int column ) //SLOT
int column ) //SLOT
{ {
@ -1692,14 +1692,14 @@ void tork::optionsConfigureKeys()
void tork : : optionsConfigureToolbars ( ) void tork : : optionsConfigureToolbars ( )
{ {
// use the standard toolbar editor
// use the standard toolbar editor
# if defined( K DE_MAKE_VERSION)
# if defined( T DE_MAKE_VERSION)
# if KDE_VERSION >= K DE_MAKE_VERSION(3,1,0)
# if TDE_VERSION >= T DE_MAKE_VERSION(3,1,0)
saveMainWindowSettings ( K Global: : config ( ) , autoSaveGroup ( ) ) ;
saveMainWindowSettings ( TDE Global: : config ( ) , autoSaveGroup ( ) ) ;
# else
# else
saveMainWindowSettings ( K Global: : config ( ) ) ;
saveMainWindowSettings ( TDE Global: : config ( ) ) ;
# endif
# endif
# else
# else
saveMainWindowSettings ( K Global: : config ( ) ) ;
saveMainWindowSettings ( TDE Global: : config ( ) ) ;
# endif
# endif
KEditToolbar dlg ( factory ( ) ) ;
KEditToolbar dlg ( factory ( ) ) ;
connect ( & dlg , SIGNAL ( newToolbarConfig ( ) ) , this , SLOT ( newToolbarConfig ( ) ) ) ;
connect ( & dlg , SIGNAL ( newToolbarConfig ( ) ) , this , SLOT ( newToolbarConfig ( ) ) ) ;
@ -1712,14 +1712,14 @@ void tork::newToolbarConfig()
// recreate our GUI, and re-apply the settings (e.g. "text under icons", etc.)
// recreate our GUI, and re-apply the settings (e.g. "text under icons", etc.)
createGUI ( ) ;
createGUI ( ) ;
# if defined( K DE_MAKE_VERSION)
# if defined( T DE_MAKE_VERSION)
# if KDE_VERSION >= K DE_MAKE_VERSION(3,1,0)
# if TDE_VERSION >= T DE_MAKE_VERSION(3,1,0)
applyMainWindowSettings ( K Global: : config ( ) , autoSaveGroup ( ) ) ;
applyMainWindowSettings ( TDE Global: : config ( ) , autoSaveGroup ( ) ) ;
# else
# else
applyMainWindowSettings ( K Global: : config ( ) ) ;
applyMainWindowSettings ( TDE Global: : config ( ) ) ;
# endif
# endif
# else
# else
applyMainWindowSettings ( K Global: : config ( ) ) ;
applyMainWindowSettings ( TDE Global: : config ( ) ) ;
# endif
# endif
} }
@ -1728,8 +1728,8 @@ void tork::copyOldConfig()
{ {
TorkConfig : : writeConfig ( ) ;
TorkConfig : : writeConfig ( ) ;
K ConfigSkeletonItem: : List pitems ( TorkConfig : : self ( ) - > items ( ) ) ;
TDE ConfigSkeletonItem: : List pitems ( TorkConfig : : self ( ) - > items ( ) ) ;
K ConfigSkeletonItem: : List : : ConstIterator it ;
TDE ConfigSkeletonItem: : List : : ConstIterator it ;
PrevConfig : : PrevConfigList : : iterator tp ;
PrevConfig : : PrevConfigList : : iterator tp ;
for ( it = pitems . begin ( ) ; it ! = pitems . end ( ) ; + + it ) {
for ( it = pitems . begin ( ) ; it ! = pitems . end ( ) ; + + it ) {
@ -1762,12 +1762,12 @@ void tork::optionsPreferences()
copyOldConfig ( ) ;
copyOldConfig ( ) ;
TorkConfigDialog * dialog = ( TorkConfigDialog * ) K ConfigDialog: : exists ( " settings " ) ;
TorkConfigDialog * dialog = ( TorkConfigDialog * ) TDE ConfigDialog: : exists ( " settings " ) ;
if ( ! dialog )
if ( ! dialog )
{
{
// K ConfigDialog didn't find an instance of this dialog, so lets create it :
// TDE ConfigDialog didn't find an instance of this dialog, so lets create it :
dialog = new TorkConfigDialog ( this , " settings " , TorkConfig : : self ( ) ) ;
dialog = new TorkConfigDialog ( this , " settings " , TorkConfig : : self ( ) ) ;
}
}
@ -1791,11 +1791,11 @@ void tork::openConfig(const TQCString& page)
//
//
// compare the names of the widgets in the .ui file
// compare the names of the widgets in the .ui file
// to the names of the variables in the .kcfg file
// to the names of the variables in the .kcfg file
TorkConfigDialog * dialog = ( TorkConfigDialog * ) K ConfigDialog: : exists ( " settings " ) ;
TorkConfigDialog * dialog = ( TorkConfigDialog * ) TDE ConfigDialog: : exists ( " settings " ) ;
if ( ! dialog )
if ( ! dialog )
{
{
// K ConfigDialog didn't find an instance of this dialog, so lets create it :
// TDE ConfigDialog didn't find an instance of this dialog, so lets create it :
dialog = new TorkConfigDialog ( this , " settings " , TorkConfig : : self ( ) ) ;
dialog = new TorkConfigDialog ( this , " settings " , TorkConfig : : self ( ) ) ;
}
}
@ -1942,7 +1942,7 @@ void tork::startTor()
* childproc < < TorkConfig : : torLocation ( ) < < " -f " + torConfFile ;
* childproc < < TorkConfig : : torLocation ( ) < < " -f " + torConfFile ;
connect ( childproc , SIGNAL ( processExited ( K Process * ) ) ,
connect ( childproc , SIGNAL ( processExited ( TDE Process * ) ) ,
SLOT ( childExited ( ) ) ) ;
SLOT ( childExited ( ) ) ) ;
connect ( childproc , SIGNAL ( readReady ( KProcIO * ) ) ,
connect ( childproc , SIGNAL ( readReady ( KProcIO * ) ) ,
SLOT ( receivedOutput ( KProcIO * ) ) ) ;
SLOT ( receivedOutput ( KProcIO * ) ) ) ;
@ -1974,7 +1974,7 @@ void tork::stopTor()
{ {
if ( m_DNSTorified ) {
if ( m_DNSTorified ) {
KNotifyClient : : event ( k main- > _tray - > winId ( ) , " TorDisabled " , i18n ( " <b>You are now in FailSafe Mode</b>. <br> You need to be in Normal Mode before you can stop Tor. " ) ) ;
KNotifyClient : : event ( tde main- > _tray - > winId ( ) , " TorDisabled " , i18n ( " <b>You are now in FailSafe Mode</b>. <br> You need to be in Normal Mode before you can stop Tor. " ) ) ;
return ;
return ;
}
}
@ -2013,7 +2013,7 @@ void tork::stopTor()
//Reset Country filter menu to 'All' checked
//Reset Country filter menu to 'All' checked
for ( TQMap < TQString , K PopupMenu* > : : Iterator menu = continentMapList . begin ( ) ; menu ! = continentMapList . end ( ) ; + + menu ) {
for ( TQMap < TQString , TDE PopupMenu* > : : Iterator menu = continentMapList . begin ( ) ; menu ! = continentMapList . end ( ) ; + + menu ) {
for ( unsigned int index = 0 ; index ! = menu . data ( ) - > count ( ) ; + + index ) {
for ( unsigned int index = 0 ; index ! = menu . data ( ) - > count ( ) ; + + index ) {
menu . data ( ) - > setItemChecked ( menu . data ( ) - > idAt ( index ) , false ) ;
menu . data ( ) - > setItemChecked ( menu . data ( ) - > idAt ( index ) , false ) ;
}
}
@ -2028,7 +2028,7 @@ void tork::stopTor()
//Reset Pseudonymity filter menu to 'All' checked
//Reset Pseudonymity filter menu to 'All' checked
for ( TQMap < TQString , K PopupMenu* > : : Iterator menu = continentMap . begin ( ) ; menu ! = continentMap . end ( ) ; + + menu )
for ( TQMap < TQString , TDE PopupMenu* > : : Iterator menu = continentMap . begin ( ) ; menu ! = continentMap . end ( ) ; + + menu )
{
{
for ( unsigned int index = 0 ; index ! = menu . data ( ) - > count ( ) ; + + index ) {
for ( unsigned int index = 0 ; index ! = menu . data ( ) - > count ( ) ; + + index ) {
menu . data ( ) - > setItemChecked ( menu . data ( ) - > idAt ( index ) , false ) ;
menu . data ( ) - > setItemChecked ( menu . data ( ) - > idAt ( index ) , false ) ;
@ -2361,8 +2361,8 @@ void tork::writeCustomOptions2(TQTextStream &ts)
}
}
K ConfigSkeletonItem: : List items = TorkConfig : : self ( ) - > items ( ) ;
TDE ConfigSkeletonItem: : List items = TorkConfig : : self ( ) - > items ( ) ;
K ConfigSkeletonItem: : List : : ConstIterator it ;
TDE ConfigSkeletonItem: : List : : ConstIterator it ;
for ( it = items . begin ( ) ; it ! = items . end ( ) ; + + it ) {
for ( it = items . begin ( ) ; it ! = items . end ( ) ; + + it ) {
kdDebug ( ) < < ( * it ) - > name ( ) < < endl ;
kdDebug ( ) < < ( * it ) - > name ( ) < < endl ;
if ( elementShouldBeUsed ( ( * it ) ) ) {
if ( elementShouldBeUsed ( ( * it ) ) ) {
@ -2403,7 +2403,7 @@ void tork::writeCustomOptions2(TQTextStream &ts)
} }
bool tork : : elementShouldBeUsed ( const K ConfigSkeletonItem* it ) bool tork : : elementShouldBeUsed ( const TDE ConfigSkeletonItem* it )
{ {
@ -2425,7 +2425,7 @@ bool tork::elementShouldBeUsed(const KConfigSkeletonItem* it)
return false ;
return false ;
} }
bool tork : : noSpecialProcessing ( const K ConfigSkeletonItem* it , TQTextStream & ts ) bool tork : : noSpecialProcessing ( const TDE ConfigSkeletonItem* it , TQTextStream & ts )
{ {
if ( ( ( * it ) . name ( ) = = " DirListenAddress " ) | |
if ( ( ( * it ) . name ( ) = = " DirListenAddress " ) | |
@ -2636,7 +2636,7 @@ void tork::privoxyExited()
died = true ;
died = true ;
if ( privoxyproc ! = 0L ) {
if ( privoxyproc ! = 0L ) {
disconnect ( privoxyproc , SIGNAL ( processExited ( K Process * ) ) ,
disconnect ( privoxyproc , SIGNAL ( processExited ( TDE Process * ) ) ,
this , SLOT ( privoxyExited ( ) ) ) ;
this , SLOT ( privoxyExited ( ) ) ) ;
delete privoxyproc ;
delete privoxyproc ;
privoxyproc = 0L ;
privoxyproc = 0L ;
@ -2748,7 +2748,7 @@ void tork::startPrivoxy()
}
}
if ( privoxyproc ! = 0L ) {
if ( privoxyproc ! = 0L ) {
disconnect ( privoxyproc , SIGNAL ( processExited ( K Process * ) ) ,
disconnect ( privoxyproc , SIGNAL ( processExited ( TDE Process * ) ) ,
this , SLOT ( privoxyExited ( ) ) ) ;
this , SLOT ( privoxyExited ( ) ) ) ;
delete privoxyproc ;
delete privoxyproc ;
privoxyproc = 0L ;
privoxyproc = 0L ;
@ -2772,7 +2772,7 @@ void tork::startPrivoxy()
* privoxyproc < < TorkConfig : : privoxyLocation ( ) < < " --user " < < getenv ( " USER " )
* privoxyproc < < TorkConfig : : privoxyLocation ( ) < < " --user " < < getenv ( " USER " )
< < " --no-daemon --pidfile " < < privoxypid < < " " < < privoxyConfFile ;
< < " --no-daemon --pidfile " < < privoxypid < < " " < < privoxyConfFile ;
connect ( privoxyproc , SIGNAL ( processExited ( K Process * ) ) ,
connect ( privoxyproc , SIGNAL ( processExited ( TDE Process * ) ) ,
SLOT ( privoxyExited ( ) ) ) ;
SLOT ( privoxyExited ( ) ) ) ;
privoxyproc - > start ( KProcIO : : NotifyOnExit ) ;
privoxyproc - > start ( KProcIO : : NotifyOnExit ) ;
@ -3178,7 +3178,7 @@ void tork::copyCookie()
KProcIO * catproc = new KProcIO ( ) ;
KProcIO * catproc = new KProcIO ( ) ;
catproc - > setUseShell ( TRUE ) ;
catproc - > setUseShell ( TRUE ) ;
TQString whichCommand = TQString (
TQString whichCommand = TQString (
" k desu -c '"
" t desu -c '"
" mkdir -p -m 600 %1/.tor; "
" mkdir -p -m 600 %1/.tor; "
" cp -u /var/lib/tor/control_auth_cookie %2/.tor/control_auth_cookie; "
" cp -u /var/lib/tor/control_auth_cookie %2/.tor/control_auth_cookie; "
" cp -u /usr/local/var/lib/tor/control_auth_cookie %3/.tor/control_auth_cookie; "
" cp -u /usr/local/var/lib/tor/control_auth_cookie %3/.tor/control_auth_cookie; "
@ -3365,9 +3365,9 @@ void tork::toggleKDESetting()
setKDE ( TorkConfig : : kDEUsesTor ( ) ) ;
setKDE ( TorkConfig : : kDEUsesTor ( ) ) ;
if ( TorkConfig : : kDEUsesTor ( ) )
if ( TorkConfig : : kDEUsesTor ( ) )
KNotifyClient : : event ( k main- > _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. " ) ) ;
KNotifyClient : : event ( tde main- > _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
else
KNotifyClient : : event ( k main- > _tray - > winId ( ) , " TorDisabled " , i18n ( " <b>Konqueror</b> is Now Back to "
KNotifyClient : : event ( tde main- > _tray - > winId ( ) , " TorDisabled " , i18n ( " <b>Konqueror</b> is Now Back to "
" Non-Anonymous Use! <br> Close Konqueror completely and do not use it non-anonymously for a while. <br> "
" Non-Anonymous Use! <br> Close Konqueror completely and do not use it non-anonymously for a while. <br> "
" This is because malicious websites could gain access to information from your anonymous "
" This is because malicious websites could gain access to information from your anonymous "
" session. " ) ) ;
" session. " ) ) ;
@ -3380,9 +3380,9 @@ void tork::enableKDE(bool enable)
setKDE ( TorkConfig : : kDEUsesTor ( ) ) ;
setKDE ( TorkConfig : : kDEUsesTor ( ) ) ;
if ( TorkConfig : : kDEUsesTor ( ) )
if ( TorkConfig : : kDEUsesTor ( ) )
KNotifyClient : : event ( k main- > _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. " ) ) ;
KNotifyClient : : event ( tde main- > _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
else
KNotifyClient : : event ( k main- > _tray - > winId ( ) , " TorDisabled " , i18n ( " <b>Konqueror</b> is Now Back to "
KNotifyClient : : event ( tde main- > _tray - > winId ( ) , " TorDisabled " , i18n ( " <b>Konqueror</b> is Now Back to "
" Non-Anonymous Use! <br>Close Konqueror completely and do not use it non-anonymously for a while. <br> "
" Non-Anonymous Use! <br>Close Konqueror completely and do not use it non-anonymously for a while. <br> "
" This is because malicious websites could gain access to information from your anonymous "
" This is because malicious websites could gain access to information from your anonymous "
" session. " ) ) ;
" session. " ) ) ;
@ -3427,7 +3427,7 @@ void tork::setKDE(bool set)
if ( ! m_view - > konqitem )
if ( ! m_view - > konqitem )
return ;
return ;
KConfig* config = new KConfig ( " k ioslaverc" , false , false ) ;
TDEConfig* config = new TDEConfig ( " tde ioslaverc" , false , false ) ;
config - > setGroup ( " Proxy Settings " ) ;
config - > setGroup ( " Proxy Settings " ) ;
if ( set ) {
if ( set ) {
config - > writeEntry ( " httpProxy " , TQString ( " %1:%2 " )
config - > writeEntry ( " httpProxy " , TQString ( " %1:%2 " )
@ -3441,15 +3441,15 @@ void tork::setKDE(bool set)
. arg ( TorkConfig : : konqFtpProxyPort ( ) ) ) ;
. arg ( TorkConfig : : konqFtpProxyPort ( ) ) ) ;
config - > writeEntry ( " ProxyType " , " 1 " ) ;
config - > writeEntry ( " ProxyType " , " 1 " ) ;
config - > sync ( ) ;
config - > sync ( ) ;
config = new K Config( " kcookiejarrc " , false , false ) ;
config = new TDE Config( " kcookiejarrc " , false , false ) ;
config - > setGroup ( " Cookie Policy " ) ;
config - > setGroup ( " Cookie Policy " ) ;
// K Config doesn't return a bool, just a text representation of the bool
// TDE Config doesn't return a bool, just a text representation of the bool
TorkConfig : : setOriginalCookies ( config - > readEntry ( " Cookies " )
TorkConfig : : setOriginalCookies ( config - > readEntry ( " Cookies " )
= = " true " ? true : false ) ;
= = " true " ? true : false ) ;
config - > writeEntry ( " Cookies " , ! TorkConfig : : disableCookies ( ) ) ;
config - > writeEntry ( " Cookies " , ! TorkConfig : : disableCookies ( ) ) ;
TorkConfig : : writeConfig ( ) ;
TorkConfig : : writeConfig ( ) ;
config - > sync ( ) ;
config - > sync ( ) ;
config = new KConfig( " k io_httprc" , false , false ) ;
config = new TDEConfig( " tde io_httprc" , false , false ) ;
TorkConfig : : setOriginalUseCache ( config - > readEntry ( " UseCache " )
TorkConfig : : setOriginalUseCache ( config - > readEntry ( " UseCache " )
= = " true " ? true : false ) ;
= = " true " ? true : false ) ;
TorkConfig : : setOriginalSendUserAgent ( config - > readEntry ( " SendUserAgent " )
TorkConfig : : setOriginalSendUserAgent ( config - > readEntry ( " SendUserAgent " )
@ -3459,7 +3459,7 @@ void tork::setKDE(bool set)
! TorkConfig : : disableBrowserIdentification ( ) ) ;
! TorkConfig : : disableBrowserIdentification ( ) ) ;
TorkConfig : : writeConfig ( ) ;
TorkConfig : : writeConfig ( ) ;
config - > sync ( ) ;
config - > sync ( ) ;
config = new K Config( " konquerorrc " , false , false ) ;
config = new TDE Config( " konquerorrc " , false , false ) ;
config - > setGroup ( " Java/JavaScript Settings " ) ;
config - > setGroup ( " Java/JavaScript Settings " ) ;
TorkConfig : : setOriginalEnableJavascript ( config - > readEntry ( " EnableJavaScript " )
TorkConfig : : setOriginalEnableJavascript ( config - > readEntry ( " EnableJavaScript " )
= = " true " ? true : false ) ;
= = " true " ? true : false ) ;
@ -3479,19 +3479,19 @@ void tork::setKDE(bool set)
config - > writeEntry ( " ProxyType " , TorkConfig : : originalProxyType ( ) ) ;
config - > writeEntry ( " ProxyType " , TorkConfig : : originalProxyType ( ) ) ;
config - > sync ( ) ;
config - > sync ( ) ;
config = new K Config( " kcookiejarrc " , false , false ) ;
config = new TDE Config( " kcookiejarrc " , false , false ) ;
config - > setGroup ( " Cookie Policy " ) ;
config - > setGroup ( " Cookie Policy " ) ;
config - > writeEntry ( " Cookies " , TorkConfig : : originalCookies ( ) ) ;
config - > writeEntry ( " Cookies " , TorkConfig : : originalCookies ( ) ) ;
config - > sync ( ) ;
config - > sync ( ) ;
config = new KConfig( " k io_httprc" , false , false ) ;
config = new TDEConfig( " tde io_httprc" , false , false ) ;
config - > writeEntry ( " UseCache " , TorkConfig : : originalUseCache ( ) ) ;
config - > writeEntry ( " UseCache " , TorkConfig : : originalUseCache ( ) ) ;
config - > writeEntry ( " SendUserAgent " , TorkConfig : : originalSendUserAgent ( ) ) ;
config - > writeEntry ( " SendUserAgent " , TorkConfig : : originalSendUserAgent ( ) ) ;
config - > sync ( ) ;
config - > sync ( ) ;
kdDebug ( ) < < " UseCache " < < config - > readEntry ( " UseCache " )
kdDebug ( ) < < " UseCache " < < config - > readEntry ( " UseCache " )
< < endl ;
< < endl ;
config = new K Config( " konquerorrc " , false , false ) ;
config = new TDE Config( " konquerorrc " , false , false ) ;
config - > setGroup ( " Java/JavaScript Settings " ) ;
config - > setGroup ( " Java/JavaScript Settings " ) ;
config - > writeEntry ( " EnableJavaScript " , TorkConfig : : originalEnableJavascript ( ) ) ;
config - > writeEntry ( " EnableJavaScript " , TorkConfig : : originalEnableJavascript ( ) ) ;
config - > writeEntry ( " EnableJava " , TorkConfig : : originalEnableJava ( ) ) ;
config - > writeEntry ( " EnableJava " , TorkConfig : : originalEnableJava ( ) ) ;
@ -3502,7 +3502,7 @@ void tork::setKDE(bool set)
// Inform all running io-slaves about the changes...
// Inform all running io-slaves about the changes...
// if we cannot update, ioslaves inform the end user...
// if we cannot update, ioslaves inform the end user...
if ( ! DCOPRef ( " * " , " K IO::Scheduler" ) . send ( " reparseSlaveConfiguration " , TQString : : null ) )
if ( ! DCOPRef ( " * " , " TDE IO::Scheduler" ) . send ( " reparseSlaveConfiguration " , TQString : : null ) )
{
{
TQString caption = i18n ( " Update Failed " ) ;
TQString caption = i18n ( " Update Failed " ) ;
TQString message = i18n ( " You have to restart the running applications "
TQString message = i18n ( " You have to restart the running applications "
@ -3627,13 +3627,13 @@ void tork::showWarning( display_status_t &msg, const TQString &headline,const TQ
m_tooltip - > display ( ) ;
m_tooltip - > display ( ) ;
if ( ! k main- > isActiveWindow ( ) ) {
if ( ! tde main- > isActiveWindow ( ) ) {
KPassivePopup * pop ;
KPassivePopup * pop ;
TQPoint pnt ;
TQPoint pnt ;
pop = new KPassivePopup ( k main- > _tray ) ;
pop = new KPassivePopup ( tde main- > _tray ) ;
pnt = k main- > _tray - > pos ( ) ;
pnt = tde main- > _tray - > pos ( ) ;
pop - > setTimeout ( 15000 ) ;
pop - > setTimeout ( 15000 ) ;
pop - > setView ( i18n ( " %1 " ) . arg ( headline ) , i18n ( " See TorK window for details. " ) ) ;
pop - > setView ( i18n ( " %1 " ) . arg ( headline ) , i18n ( " See TorK window for details. " ) ) ;
pop - > show ( TQPoint ( pnt ) ) ;
pop - > show ( TQPoint ( pnt ) ) ;
@ -3689,13 +3689,13 @@ void tork::askQuestion(display_status_t &msg, const TQString &headline,const TQS
m_tooltip - > display ( ) ;
m_tooltip - > display ( ) ;
if ( ! k main- > isActiveWindow ( ) ) {
if ( ! tde main- > isActiveWindow ( ) ) {
KPassivePopup * pop ;
KPassivePopup * pop ;
TQPoint pnt ;
TQPoint pnt ;
pop = new KPassivePopup ( k main- > _tray ) ;
pop = new KPassivePopup ( tde main- > _tray ) ;
pnt = k main- > _tray - > pos ( ) ;
pnt = tde main- > _tray - > pos ( ) ;
pop - > setTimeout ( 15000 ) ;
pop - > setTimeout ( 15000 ) ;
pop - > setView ( i18n ( " %1 " ) . arg ( headline ) , i18n ( " %1 See TorK window for details. " ) . arg ( body ) ) ;
pop - > setView ( i18n ( " %1 " ) . arg ( headline ) , i18n ( " %1 See TorK window for details. " ) . arg ( body ) ) ;
pop - > show ( TQPoint ( pnt ) ) ;
pop - > show ( TQPoint ( pnt ) ) ;
@ -3836,7 +3836,7 @@ void tork::torClosedConnection()
if ( m_DNSTorified ) {
if ( m_DNSTorified ) {
KNotifyClient : : event ( k main- > _tray - > winId ( ) , " TorDisabled " ,
KNotifyClient : : event ( tde main- > _tray - > winId ( ) , " TorDisabled " ,
i18n ( " <b>You are still in "
i18n ( " <b>You are still in "
" FailSafe Mode</b>. <br> If Tor is still running its capacity to route FailSafe traffic <br> will "
" FailSafe Mode</b>. <br> If Tor is still running its capacity to route FailSafe traffic <br> will "
" remain enabled. Enter your password to return <br> the rest of your system to Normal Mode. " ) ) ;
" remain enabled. Enter your password to return <br> the rest of your system to Normal Mode. " ) ) ;
@ -3953,7 +3953,7 @@ void tork::startNetStat()
* netstatproc < < netstatcmd ;
* netstatproc < < netstatcmd ;
connect ( netstatproc , SIGNAL ( processExited ( K Process * ) ) ,
connect ( netstatproc , SIGNAL ( processExited ( TDE Process * ) ) ,
SLOT ( netStatExited ( ) ) ) ;
SLOT ( netStatExited ( ) ) ) ;
connect ( netstatproc , SIGNAL ( readReady ( KProcIO * ) ) ,
connect ( netstatproc , SIGNAL ( readReady ( KProcIO * ) ) ,
SLOT ( receivedNetStatOutput ( KProcIO * ) ) ) ;
SLOT ( receivedNetStatOutput ( KProcIO * ) ) ) ;
@ -4337,10 +4337,10 @@ void tork::resetTor()
{ {
KProcIO * catproc = new KProcIO ( ) ;
KProcIO * catproc = new KProcIO ( ) ;
catproc - > setUseShell ( TRUE ) ;
catproc - > setUseShell ( TRUE ) ;
TQString whichCommand = " k desu -c 'killall -s HUP tor'" ;
TQString whichCommand = " t desu -c 'killall -s HUP tor'" ;
* catproc < < whichCommand ;
* catproc < < whichCommand ;
catproc - > start ( KProcIO : : NotifyOnExit , TRUE ) ;
catproc - > start ( KProcIO : : NotifyOnExit , TRUE ) ;
connect ( catproc , SIGNAL ( processExited ( K Process * ) ) ,
connect ( catproc , SIGNAL ( processExited ( TDE Process * ) ) ,
SLOT ( resetExited ( ) ) ) ;
SLOT ( resetExited ( ) ) ) ;
} }
