From 1b89319fd93b88313cab40f1e9de24c067b04efb Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 6 Dec 2011 14:15:01 -0600 Subject: Initial TQt conversion --- ChangeLog | 10 +- Doxyfile | 50 +- acinclude.m4 | 24 +- doc/README.DCOP | 2 +- doc/README.smartcard | 2 +- kvpnc.kdevses.save | 2 +- po/bg.po | 26 +- po/ca.po | 26 +- po/da.po | 26 +- po/de.po | 32 +- po/es.po | 26 +- po/fr.po | 26 +- po/hu.po | 26 +- po/it.po | 26 +- po/ja.po | 26 +- po/kvpnc.pot | 26 +- po/nl.po | 26 +- po/pl.po | 42 +- po/pt_BR.po | 26 +- po/ru.po | 26 +- po/sk.po | 60 +- po/sv.po | 26 +- po/tr.po | 26 +- po/zh_CN.po | 26 +- src/addnetworkroutedialog.cpp | 20 +- src/addnetworkroutedialog.h | 21 +- src/addnetworkroutedialogbase.ui | 30 +- src/advancedprofiledialogbase.ui | 16 +- src/advancedprofilesettingsdialogbase.ui | 124 +- src/advancedsettingsdialog.cpp | 26 +- src/advancedsettingsdialog.h | 3 +- src/ciscocertificateenrollment.cpp | 126 +- src/ciscocertificateenrollment.h | 61 +- src/ciscocertificateenrollmentbase.ui | 34 +- src/ciscocertificateenrollmentdatadialog.cpp | 4 +- src/ciscocertificateenrollmentdatadialog.h | 8 +- src/ciscocertificateenrollmentdatadialogbase.ui | 76 +- src/ciscocertificateenrollmentfinishwidgetbase.ui | 4 +- src/ciscopasswddecoder.cpp | 42 +- src/ciscopasswddecoder.h | 16 +- src/configconnectoptions.cpp | 14 +- src/configconnectoptions.h | 5 +- src/configconnectoptionsbase.ui | 32 +- src/configdaemonoptions.cpp | 22 +- src/configdaemonoptions.h | 5 +- src/configdaemonoptionsbase.ui | 488 +-- src/configdebugoptions.cpp | 2 +- src/configdebugoptions.h | 5 +- src/configdebugoptionsbase.ui | 38 +- src/configgeneraloptions.ui | 40 +- src/confighelperprogramoptions.cpp | 2 +- src/confighelperprogramoptions.h | 5 +- src/confighelperprogramoptionsbase.ui | 258 +- src/configlogoptions.cpp | 10 +- src/configlogoptions.h | 19 +- src/configlogoptionsbase.ui | 80 +- src/debugoutputtextedit.cpp | 16 +- src/debugoutputtextedit.h | 13 +- src/displaycertdialog.cpp | 8 +- src/displaycertdialog.h | 6 +- src/displaycertdialogbase.ui | 176 +- src/enterpassworddialog.cpp | 22 +- src/enterpassworddialog.h | 3 +- src/enterpassworddialogbase.ui | 58 +- src/enterxauthinteractivepasscodedialog.cpp | 14 +- src/enterxauthinteractivepasscodedialog.h | 5 +- src/enterxauthinteractivepasscodedialogbase.ui | 32 +- src/generateopenvpnkeydialog.cpp | 38 +- src/generateopenvpnkeydialog.h | 13 +- src/generateopenvpnkeydialogbase.ui | 16 +- src/helpdialogbase.ui | 16 +- src/importcertificatedialog.cpp | 166 +- src/importcertificatedialog.h | 33 +- src/importcertificatedialogbase.ui | 40 +- src/importipsecprofiledialog.cpp | 194 +- src/importipsecprofiledialog.h | 12 +- src/importopenvpnprofiledialog.cpp | 256 +- src/importopenvpnprofiledialog.h | 9 +- src/importopenvpnprofiledialogbase.ui | 28 +- src/importprofiledialog.cpp | 146 +- src/importprofiledialog.h | 7 +- src/importprofiledialogbase.ui | 30 +- src/kfeedback.cpp | 140 +- src/kfeedback.h | 93 +- src/kvpnc.cpp | 4294 ++++++++++----------- src/kvpnc.h | 259 +- src/kvpncconfig.cpp | 818 ++-- src/kvpncconfig.h | 200 +- src/kvpncimportprofileselectiondialog.cpp | 8 +- src/kvpncimportprofileselectiondialog.h | 1 + src/kvpncimportprofileselectiondialogbase.ui | 34 +- src/kvpnckicker.cpp | 20 +- src/kvpnckicker.h | 27 +- src/listviewtooltip.h | 36 +- src/logviewerdialog.cpp | 70 +- src/logviewerdialog.h | 17 +- src/logviewerdialogbase.ui | 18 +- src/main.cpp | 24 +- src/mainview.cpp | 26 +- src/mainview.h | 8 +- src/mainviewbase.ui | 18 +- src/manageciscocert.cpp | 102 +- src/manageciscocert.h | 23 +- src/manageciscocertbase.ui | 32 +- src/networkinterface.cpp | 180 +- src/networkinterface.h | 81 +- src/newprofiledialog.cpp | 58 +- src/newprofiledialog.h | 43 +- src/newprofiledialogbase.ui | 70 +- src/newprofilewizard.cpp | 590 +-- src/newprofilewizard.h | 131 +- src/newprofilewizardauthselection.ui | 14 +- src/newprofilewizardcert.ui | 122 +- src/newprofilewizardciscomanually.ui | 32 +- src/newprofilewizardciscopcfimport.ui | 2 +- src/newprofilewizardciscoselection.ui | 12 +- src/newprofilewizardconnectionstatuscheck.ui | 40 +- src/newprofilewizardconnectoptions.ui | 26 +- src/newprofilewizardfreeswan.ui | 164 +- src/newprofilewizardgeneral.ui | 24 +- src/newprofilewizardnat.ui | 34 +- src/newprofilewizardnetwork.ui | 64 +- src/newprofilewizardnetworkroute.ui | 26 +- src/newprofilewizardopenvpn.ui | 118 +- src/newprofilewizardopenvpnauth.ui | 48 +- src/newprofilewizardopenvpnselection.ui | 12 +- src/newprofilewizardp12certselection.ui | 22 +- src/newprofilewizardpptp.ui | 84 +- src/newprofilewizardpsk.ui | 34 +- src/newprofilewizardracoon.ui | 148 +- src/newprofilewizardstart.ui | 8 +- src/newprofilewizardtypeselection.ui | 38 +- src/newprofilewizarduser.ui | 44 +- src/openvpnmanagementhandler.cpp | 252 +- src/openvpnmanagementhandler.h | 19 +- src/preferencesdialog.cpp | 870 ++--- src/preferencesdialog.h | 175 +- src/profilecertoptions.cpp | 8 +- src/profilecertoptions.h | 5 +- src/profilecertoptionsbase.ui | 138 +- src/profileciscooptions.cpp | 2 +- src/profileciscooptions.h | 5 +- src/profileciscooptionsbase.ui | 124 +- src/profilecmdexecafterconnectoptions.cpp | 6 +- src/profilecmdexecafterconnectoptions.h | 5 +- src/profilecmdexecafterconnectoptionsbase.ui | 22 +- src/profilecmdexecafterdisconnectoptions.cpp | 4 +- src/profilecmdexecafterdisconnectoptions.h | 5 +- src/profilecmdexecafterdisconnectoptionsbase.ui | 10 +- src/profilecmdexecbeforeconnectoptions.cpp | 4 +- src/profilecmdexecbeforeconnectoptions.h | 5 +- src/profilecmdexecbeforeconnectoptionsbase.ui | 10 +- src/profilecmdexecbeforedisconnectoptions.cpp | 4 +- src/profilecmdexecbeforedisconnectoptions.h | 5 +- src/profilecmdexecbeforedisconnectoptionsbase.ui | 10 +- src/profilegeneraloptions.cpp | 6 +- src/profilegeneraloptions.h | 5 +- src/profilegeneraloptionsbase.ui | 28 +- src/profileipsecoptions.cpp | 18 +- src/profileipsecoptions.h | 9 +- src/profileipsecoptionsbase.ui | 202 +- src/profilemanagerbase.cpp | 22 +- src/profilenetworkgeneraloptions.cpp | 10 +- src/profilenetworkgeneraloptions.h | 5 +- src/profilenetworkgeneraloptionsbase.ui | 146 +- src/profilenetworkhttpproxyoptions.cpp | 8 +- src/profilenetworkhttpproxyoptions.h | 5 +- src/profilenetworkhttpproxyoptionsbase.ui | 68 +- src/profilenetworknatoptions.cpp | 6 +- src/profilenetworknatoptions.h | 5 +- src/profilenetworknatoptionsbase.ui | 38 +- src/profilenetworkrouteoptions.cpp | 46 +- src/profilenetworkrouteoptions.h | 11 +- src/profilenetworkrouteoptionsbase.ui | 26 +- src/profilenetworkvirtualipoptions.cpp | 6 +- src/profilenetworkvirtualipoptions.h | 5 +- src/profilenetworkvirtualipoptionsbase.ui | 50 +- src/profileopenvpnoptions.cpp | 8 +- src/profileopenvpnoptions.h | 5 +- src/profileopenvpnoptionsbase.ui | 120 +- src/profilepptpoptions.cpp | 6 +- src/profilepptpoptions.h | 5 +- src/profilepptpoptionsbase.ui | 114 +- src/profilepskoptions.cpp | 8 +- src/profilepskoptions.h | 5 +- src/profilepskoptionsbase.ui | 42 +- src/profileracoonoptions.cpp | 24 +- src/profileracoonoptions.h | 9 +- src/profileracoonoptionsbase.ui | 170 +- src/profilesmartcardoptions.cpp | 8 +- src/profilesmartcardoptions.h | 5 +- src/profilesmartcardoptionsbase.ui | 74 +- src/profilesshoptions.cpp | 12 +- src/profilesshoptions.h | 5 +- src/profilesshoptionsbase.ui | 60 +- src/profileuseroptions.cpp | 4 +- src/profileuseroptions.h | 5 +- src/profileuseroptionsbase.ui | 54 +- src/profilevtunoptions.cpp | 8 +- src/profilevtunoptions.h | 5 +- src/profilevtunoptionsbase.ui | 44 +- src/toolinfo.cpp | 102 +- src/toolinfo.h | 35 +- src/toolsinfodialog.cpp | 56 +- src/toolsinfodialog.h | 4 +- src/toolsinfowidgetbase.ui | 6 +- src/utils.cpp | 504 +-- src/utils.h | 157 +- src/vpnaccountdata.cpp | 282 +- src/vpnaccountdata.h | 430 +-- src/vpntypesinfodialog.cpp | 148 +- src/vpntypesinfodialog.h | 16 +- src/widgetnotifyhelper.cpp | 38 +- src/widgetnotifyhelper.h | 10 +- 214 files changed, 8598 insertions(+), 8547 deletions(-) diff --git a/ChangeLog b/ChangeLog index 41f3536..7c61015 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1561,7 +1561,7 @@ auto size of profile manager fixed 2005-06-01 Christoph Thielecke - slots in advanced settings dialog fixed + Q_SLOTS in advanced settings dialog fixed saving of use udp protocol fixed add additional network routes creation fixed freeswan conf generation now set from installed version @@ -1569,7 +1569,7 @@ translation update 2005-05-30 Christoph Thielecke - slots in preferences dialog fixed + Q_SLOTS in preferences dialog fixed slot for udp port in profile dialog fixed slot in import certificate dialog fixed @@ -1678,7 +1678,7 @@ - void doConnect() - void doDisconnect() - uint getConnectedTime() - - QString getStatus() + - QString gettqStatus() - QString getCurrentProfile() - void setProfile(QString profilename) - void createNewProfile() @@ -1733,11 +1733,11 @@ option for udp port added (vpnc) 2004-12-29 Christoph Thielecke - patch to "includemoc" added. thank to Laurent Montel who has it provided. + patch to "includetqmoc" added. thank to Laurent Montel who has it provided. crash fix if no currentprofile defined. thank to Laurent Montel who has it provided. 2004-12-16 Christoph Thielecke - geometry setting of mainwindow fixed + tqgeometry setting of mainwindow fixed 2004-12-11 Christoph Thielecke profile widget better organized diff --git a/Doxyfile b/Doxyfile index abdbfe8..16c98ee 100644 --- a/Doxyfile +++ b/Doxyfile @@ -122,24 +122,24 @@ FILE_PATTERNS = *.c \ *.tlh \ *.diff \ *.patch \ - *.moc \ + *.tqmoc \ *.xpm \ *.dox RECURSIVE = YES EXCLUDE = /home/crissi/work/kvpnc/src/CVS \ /home/crissi/work/kvpnc/src/AdvancedProfileSettingsDialogBase.cpp \ /home/crissi/work/kvpnc/src/AdvancedProfileSettingsDialogBase.h \ - /home/crissi/work/kvpnc/src/AdvancedProfileSettingsDialogBase.moc \ + /home/crissi/work/kvpnc/src/AdvancedProfileSettingsDialogBase.tqmoc \ /home/crissi/work/kvpnc/src/AdvancedProfileSettingsDialogBase.o \ /home/crissi/work/kvpnc/src/AdvancedProfileSettingsDialogBase.ui \ /home/crissi/work/kvpnc/src/HelpDialogBase.cpp \ /home/crissi/work/kvpnc/src/HelpDialogBase.h \ - /home/crissi/work/kvpnc/src/HelpDialogBase.moc \ + /home/crissi/work/kvpnc/src/HelpDialogBase.tqmoc \ /home/crissi/work/kvpnc/src/HelpDialogBase.o \ /home/crissi/work/kvpnc/src/HelpDialogBase.ui \ /home/crissi/work/kvpnc/src/NewProfileDialogBase.cpp \ /home/crissi/work/kvpnc/src/NewProfileDialogBase.h \ - /home/crissi/work/kvpnc/src/NewProfileDialogBase.moc \ + /home/crissi/work/kvpnc/src/NewProfileDialogBase.tqmoc \ /home/crissi/work/kvpnc/src/NewProfileDialogBase.o \ /home/crissi/work/kvpnc/src/NewProfileDialogBase.ui \ /home/crissi/work/kvpnc/src/NewProfileDialogBase.ui~ \ @@ -147,17 +147,17 @@ EXCLUDE = /home/crissi/work/kvpnc/src/CVS \ /home/crissi/work/kvpnc/src/PreferencesBase.cpp~ \ /home/crissi/work/kvpnc/src/PreferencesBase.h \ /home/crissi/work/kvpnc/src/PreferencesBase.h~ \ - /home/crissi/work/kvpnc/src/PreferencesBase.moc \ + /home/crissi/work/kvpnc/src/PreferencesBase.tqmoc \ /home/crissi/work/kvpnc/src/PreferencesBase.o \ /home/crissi/work/kvpnc/src/PreferencesBase.ui \ /home/crissi/work/kvpnc/src/PreferencesBase.ui~ \ /home/crissi/work/kvpnc/src/connectionsettingsdialogbase.ui~ \ - /home/crissi/work/kvpnc/src/importp12certificatedialog.moc.cpp \ - /home/crissi/work/kvpnc/src/importp12certificatedialog.moc.o \ + /home/crissi/work/kvpnc/src/importp12certificatedialog.tqmoc.cpp \ + /home/crissi/work/kvpnc/src/importp12certificatedialog.tqmoc.o \ /home/crissi/work/kvpnc/src/importp12certificatedialogbase.cpp \ /home/crissi/work/kvpnc/src/importp12certificatedialogbase.h \ /home/crissi/work/kvpnc/src/importp12certificatedialogbase.h~ \ - /home/crissi/work/kvpnc/src/importp12certificatedialogbase.moc \ + /home/crissi/work/kvpnc/src/importp12certificatedialogbase.tqmoc \ /home/crissi/work/kvpnc/src/importp12certificatedialogbase.o \ /home/crissi/work/kvpnc/src/importp12certificatedialogbase.ui \ /home/crissi/work/kvpnc/src/importp12certificatedialogbase.ui~ \ @@ -165,42 +165,42 @@ EXCLUDE = /home/crissi/work/kvpnc/src/CVS \ /home/crissi/work/kvpnc/src/importprofiledialogbase.cpp~ \ /home/crissi/work/kvpnc/src/importprofiledialogbase.h \ /home/crissi/work/kvpnc/src/importprofiledialogbase.h~ \ - /home/crissi/work/kvpnc/src/importprofiledialogbase.moc \ + /home/crissi/work/kvpnc/src/importprofiledialogbase.tqmoc \ /home/crissi/work/kvpnc/src/importprofiledialogbase.o \ /home/crissi/work/kvpnc/src/importprofiledialogbase.ui \ /home/crissi/work/kvpnc/src/importprofiledialogbase.ui~ \ - /home/crissi/work/kvpnc/src/kvpnc.moc.cpp \ - /home/crissi/work/kvpnc/src/kvpnc.moc.o \ - /home/crissi/work/kvpnc/src/kvpnckicker.moc.cpp \ - /home/crissi/work/kvpnc/src/kvpnckicker.moc.o \ + /home/crissi/work/kvpnc/src/kvpnc.tqmoc.cpp \ + /home/crissi/work/kvpnc/src/kvpnc.tqmoc.o \ + /home/crissi/work/kvpnc/src/kvpnckicker.tqmoc.cpp \ + /home/crissi/work/kvpnc/src/kvpnckicker.tqmoc.o \ /home/crissi/work/kvpnc/src/mainviewbase.cpp \ /home/crissi/work/kvpnc/src/mainviewbase.h \ - /home/crissi/work/kvpnc/src/mainviewbase.moc \ + /home/crissi/work/kvpnc/src/mainviewbase.tqmoc \ /home/crissi/work/kvpnc/src/mainviewbase.o \ /home/crissi/work/kvpnc/src/mainviewbase.ui \ /home/crissi/work/kvpnc/src/mainviewbase.ui~ \ - /home/crissi/work/kvpnc/src/networkinterface.moc.cpp \ - /home/crissi/work/kvpnc/src/networkinterface.moc.o \ - /home/crissi/work/kvpnc/src/newprofiledialog.moc.cpp \ - /home/crissi/work/kvpnc/src/newprofiledialog.moc.o \ - /home/crissi/work/kvpnc/src/preferencesdialog.moc.cpp \ - /home/crissi/work/kvpnc/src/preferencesdialog.moc.o \ + /home/crissi/work/kvpnc/src/networkinterface.tqmoc.cpp \ + /home/crissi/work/kvpnc/src/networkinterface.tqmoc.o \ + /home/crissi/work/kvpnc/src/newprofiledialog.tqmoc.cpp \ + /home/crissi/work/kvpnc/src/newprofiledialog.tqmoc.o \ + /home/crissi/work/kvpnc/src/preferencesdialog.tqmoc.cpp \ + /home/crissi/work/kvpnc/src/preferencesdialog.tqmoc.o \ /home/crissi/work/kvpnc/src/profilemanagerbase.cpp \ /home/crissi/work/kvpnc/src/profilemanagerbase.h \ - /home/crissi/work/kvpnc/src/profilemanagerbase.moc \ + /home/crissi/work/kvpnc/src/profilemanagerbase.tqmoc \ /home/crissi/work/kvpnc/src/profilemanagerbase.o \ /home/crissi/work/kvpnc/src/profilemanagerbase.ui \ /home/crissi/work/kvpnc/src/profilemanagerbase.ui~ \ - /home/crissi/work/kvpnc/src/profilewidget.moc.cpp \ - /home/crissi/work/kvpnc/src/profilewidget.moc.o \ + /home/crissi/work/kvpnc/src/profilewidget.tqmoc.cpp \ + /home/crissi/work/kvpnc/src/profilewidget.tqmoc.o \ /home/crissi/work/kvpnc/src/profilewidgetbase.cpp \ /home/crissi/work/kvpnc/src/profilewidgetbase.h \ - /home/crissi/work/kvpnc/src/profilewidgetbase.moc \ + /home/crissi/work/kvpnc/src/profilewidgetbase.tqmoc \ /home/crissi/work/kvpnc/src/profilewidgetbase.o \ /home/crissi/work/kvpnc/src/profilewidgetbase.ui \ /home/crissi/work/kvpnc/src/profilewidgetbase.ui~ EXCLUDE_SYMLINKS = NO -EXCLUDE_PATTERNS = *moc* \ +EXCLUDE_PATTERNS = *tqmoc* \ *ui* EXCLUDE_SYMBOLS = EXAMPLE_PATH = diff --git a/acinclude.m4 b/acinclude.m4 index 9676e4e..ad094b1 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -239,14 +239,14 @@ AC_DEFUN([KDE_FIND_PATH], fi ]) -AC_DEFUN([KDE_MOC_ERROR_MESSAGE], +AC_DEFUN([KDE_TQMOC_ERROR_MESSAGE], [ - AC_MSG_ERROR([No Qt meta object compiler (moc) found! + AC_MSG_ERROR([No Qt meta object compiler (tqmoc) found! Please check whether you installed Qt correctly. -You need to have a running moc binary. -configure tried to run $ac_cv_path_moc and the test didn't +You need to have a running tqmoc binary. +configure tried to run $ac_cv_path_tqmoc and the test didn't succeed. If configure shouldn't have tried this one, set -the environment variable MOC to the right one before running +the environment variable TQMOC to the right one before running configure. ]) ]) @@ -299,19 +299,19 @@ dnl Find the meta object compiler and the ui compiler in the PATH, dnl in $QTDIR/bin, and some more usual places dnl ------------------------------------------------------------------------ dnl -AC_DEFUN([AC_PATH_QT_MOC_UIC], +AC_DEFUN([AC_PATH_QT_TQMOC_UIC], [ AC_REQUIRE([KDE_CHECK_PERL]) qt_bindirs="" for dir in $kde_qt_dirs; do - qt_bindirs="$qt_bindirs $dir/bin $dir/src/moc" + qt_bindirs="$qt_bindirs $dir/bin $dir/src/tqmoc" done qt_bindirs="$qt_bindirs /usr/bin /usr/X11R6/bin /usr/local/qt/bin" if test ! "$ac_qt_bindir" = "NO"; then qt_bindirs="$ac_qt_bindir $qt_bindirs" fi - KDE_FIND_PATH(moc, MOC, [$qt_bindirs], [KDE_MOC_ERROR_MESSAGE]) + KDE_FIND_PATH(tqmoc, TQMOC, [$qt_bindirs], [KDE_TQMOC_ERROR_MESSAGE]) if test -z "$UIC_NOT_NEEDED"; then KDE_FIND_PATH(uic, UIC_PATH, [$qt_bindirs], [UIC_PATH=""]) if test -z "$UIC_PATH" ; then @@ -336,7 +336,7 @@ AC_DEFUN([AC_PATH_QT_MOC_UIC], UIC="echo uic not available: " fi - AC_SUBST(MOC) + AC_SUBST(TQMOC) AC_SUBST(UIC) UIC_TR="i18n" @@ -1572,7 +1572,7 @@ test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS" AC_SUBST(QT_INCLUDES) AC_SUBST(QT_LDFLAGS) -AC_PATH_QT_MOC_UIC +AC_PATH_QT_TQMOC_UIC KDE_CHECK_QT_JPEG @@ -1602,7 +1602,7 @@ AC_PATH_QT_1_3 AC_DEFUN([KDE_CHECK_UIC_PLUGINS], [ -AC_REQUIRE([AC_PATH_QT_MOC_UIC]) +AC_REQUIRE([AC_PATH_QT_TQMOC_UIC]) if test x$ac_uic_supports_libpath = xyes; then @@ -1612,7 +1612,7 @@ AC_CACHE_VAL(kde_cv_uic_plugins, cat > actest.ui << EOF NewConnectionDialog - + testInput diff --git a/doc/README.DCOP b/doc/README.DCOP index e46c83d..04c6c3d 100644 --- a/doc/README.DCOP +++ b/doc/README.DCOP @@ -18,7 +18,7 @@ QString getVersion() void doConnect() void doDisconnect() uint getConnectedTime() -QString getStatus() +QString gettqStatus() QString getCurrentProfile() void setProfile(QString profilename) void createNewProfile() diff --git a/doc/README.smartcard b/doc/README.smartcard index 65654bb..d4e5241 100644 --- a/doc/README.smartcard +++ b/doc/README.smartcard @@ -13,7 +13,7 @@ Date: 2007/13/01 03. check 'enable pkcs11 smartcard support' 04. select id type (usally id) 05. check 'use token provider library' and select one if nessary - 06. click detect button behind slot combobox (now the slots on cardreaders should shown, useally 0) + 06. click detect button behind slot combobox (now the Q_SLOTS on cardreaders should shown, useally 0) 07. select your slot 08. click detect button behind id combobox (now the content of the slot selected slot of step 6 should shown should be shown) 09. select your id diff --git a/kvpnc.kdevses.save b/kvpnc.kdevses.save index 5f9c294..1786dc1 100644 --- a/kvpnc.kdevses.save +++ b/kvpnc.kdevses.save @@ -28,7 +28,7 @@ - + diff --git a/po/bg.po b/po/bg.po index 6167a38..44cfaf3 100644 --- a/po/bg.po +++ b/po/bg.po @@ -7686,7 +7686,7 @@ msgstr "" #. i18n: ectx: property (title), widget (QGroupBox) #: rc.cpp:4263 profilenetworkgeneraloptionsbase.cpp:346 #, fuzzy -msgid "Connection Status Check" +msgid "Connection tqStatus Check" msgstr "Връзката е установена" #. i18n: file: profilenetworkgeneraloptionsbase.ui:593 @@ -14025,23 +14025,23 @@ msgid "write of %1 was ok." msgstr "" #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("user password")), -#. i18n( "Unable to store secure %1" ).arg(i18n("user password")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("user password")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("user password")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "User password", it->getUserPassword() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("pre shared key")), -#. i18n( "Unable to store secure %1" ).arg(i18n("pre shared key")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("pre shared key")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("pre shared key")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("preshared key password")), -#. i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("preshared key password")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("reshared key password")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } @@ -16531,15 +16531,15 @@ msgid "%1 cant be opened!" msgstr "Журналният файл не може да се отвори!" #: utils.cpp:1127 -msgid "Unable to fetch smartcard slots via pkcs11-tool!" +msgid "Unable to fetch smartcard Q_SLOTS via pkcs11-tool!" msgstr "" #: utils.cpp:1133 -msgid "Fetch smartcard slots via pkcs11-tool started." +msgid "Fetch smartcard Q_SLOTS via pkcs11-tool started." msgstr "" #: utils.cpp:1144 -msgid "Fetch smartcard slots via pkcs11-tool finished." +msgid "Fetch smartcard Q_SLOTS via pkcs11-tool finished." msgstr "" #: utils.cpp:1219 diff --git a/po/ca.po b/po/ca.po index a1efc03..6b2a617 100644 --- a/po/ca.po +++ b/po/ca.po @@ -7648,7 +7648,7 @@ msgstr "" #. i18n: ectx: property (title), widget (QGroupBox) #: rc.cpp:4263 profilenetworkgeneraloptionsbase.cpp:346 #, fuzzy -msgid "Connection Status Check" +msgid "Connection tqStatus Check" msgstr "Connexió establerta." #. i18n: file: profilenetworkgeneraloptionsbase.ui:593 @@ -14036,23 +14036,23 @@ msgid "write of %1 was ok." msgstr "" #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("user password")), -#. i18n( "Unable to store secure %1" ).arg(i18n("user password")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("user password")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("user password")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "User password", it->getUserPassword() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("pre shared key")), -#. i18n( "Unable to store secure %1" ).arg(i18n("pre shared key")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("pre shared key")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("pre shared key")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("preshared key password")), -#. i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("preshared key password")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("reshared key password")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } @@ -16587,15 +16587,15 @@ msgid "%1 cant be opened!" msgstr "L'arxiu de registre no es pot obrir!" #: utils.cpp:1127 -msgid "Unable to fetch smartcard slots via pkcs11-tool!" +msgid "Unable to fetch smartcard Q_SLOTS via pkcs11-tool!" msgstr "" #: utils.cpp:1133 -msgid "Fetch smartcard slots via pkcs11-tool started." +msgid "Fetch smartcard Q_SLOTS via pkcs11-tool started." msgstr "" #: utils.cpp:1144 -msgid "Fetch smartcard slots via pkcs11-tool finished." +msgid "Fetch smartcard Q_SLOTS via pkcs11-tool finished." msgstr "" #: utils.cpp:1219 diff --git a/po/da.po b/po/da.po index 0931bc3..65e5e60 100644 --- a/po/da.po +++ b/po/da.po @@ -7488,7 +7488,7 @@ msgstr "" #. i18n: file: profilenetworkgeneraloptionsbase.ui:590 #. i18n: ectx: property (title), widget (QGroupBox) #: rc.cpp:4263 profilenetworkgeneraloptionsbase.cpp:346 -msgid "Connection Status Check" +msgid "Connection tqStatus Check" msgstr "Forbindelsesstatus kontrol" #. i18n: file: profilenetworkgeneraloptionsbase.ui:593 @@ -13721,23 +13721,23 @@ msgid "write of %1 was ok." msgstr "Det lykkedes at gemme %1." #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("user password")), -#. i18n( "Unable to store secure %1" ).arg(i18n("user password")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("user password")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("user password")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "User password", it->getUserPassword() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("pre shared key")), -#. i18n( "Unable to store secure %1" ).arg(i18n("pre shared key")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("pre shared key")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("pre shared key")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("preshared key password")), -#. i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("preshared key password")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("reshared key password")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } @@ -16162,15 +16162,15 @@ msgid "%1 cant be opened!" msgstr "Logfil kan ikke åbnes!" #: utils.cpp:1127 -msgid "Unable to fetch smartcard slots via pkcs11-tool!" +msgid "Unable to fetch smartcard Q_SLOTS via pkcs11-tool!" msgstr "" #: utils.cpp:1133 -msgid "Fetch smartcard slots via pkcs11-tool started." +msgid "Fetch smartcard Q_SLOTS via pkcs11-tool started." msgstr "" #: utils.cpp:1144 -msgid "Fetch smartcard slots via pkcs11-tool finished." +msgid "Fetch smartcard Q_SLOTS via pkcs11-tool finished." msgstr "" #: utils.cpp:1219 diff --git a/po/de.po b/po/de.po index d0038e7..9ac0f6c 100644 --- a/po/de.po +++ b/po/de.po @@ -7438,7 +7438,7 @@ msgstr "" #. i18n: file: profilenetworkgeneraloptionsbase.ui:590 #. i18n: ectx: property (title), widget (QGroupBox) #: rc.cpp:4263 profilenetworkgeneraloptionsbase.cpp:346 -msgid "Connection Status Check" +msgid "Connection tqStatus Check" msgstr "Verbindungsstatustest" #. i18n: file: profilenetworkgeneraloptionsbase.ui:593 @@ -9449,7 +9449,7 @@ msgstr "Trennen angefordert" #: kvpnc.cpp:8228 msgid "Disconnect requested, status connected" -msgstr "Trennen angefordert, Status verbunden" +msgstr "Trennen angefordert, tqStatus verbunden" #: kvpnc.cpp:8305 kvpnc.cpp:9782 msgid "Vpnc pid file found, killing process %1" @@ -9584,7 +9584,7 @@ msgstr "ssh-Stopdatei" #: kvpnc.cpp:9726 msgid "Disconnect requested, status connecting" -msgstr "Trennen angefordert, Status Verbindungsaufbau" +msgstr "Trennen angefordert, tqStatus Verbindungsaufbau" #: kvpnc.cpp:9729 msgid "Killing process while connecting.\n" @@ -9592,7 +9592,7 @@ msgstr "Es wird Prozess während des Verbindens getötet.\n" #: kvpnc.cpp:10456 msgid "%1 tunnel state: %2" -msgstr "%1 Tunnel-Status: %2" +msgstr "%1 Tunnel-tqStatus: %2" #: kvpnc.cpp:11059 msgid "Not connected.\n" @@ -13437,23 +13437,23 @@ msgid "write of %1 was ok." msgstr "schreiben von %1 war ok." #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("user password")), -#. i18n( "Unable to store secure %1" ).arg(i18n("user password")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("user password")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("user password")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "User password", it->getUserPassword() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("pre shared key")), -#. i18n( "Unable to store secure %1" ).arg(i18n("pre shared key")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("pre shared key")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("pre shared key")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("preshared key password")), -#. i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("preshared key password")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("reshared key password")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } @@ -15723,15 +15723,15 @@ msgid "%1 cant be opened!" msgstr "%1 kann nicht geöffnet werden!" #: utils.cpp:1127 -msgid "Unable to fetch smartcard slots via pkcs11-tool!" +msgid "Unable to fetch smartcard Q_SLOTS via pkcs11-tool!" msgstr "Smartcard-Slots konnten nicht mit pkcs11-tool ermittelt werden!" #: utils.cpp:1133 -msgid "Fetch smartcard slots via pkcs11-tool started." +msgid "Fetch smartcard Q_SLOTS via pkcs11-tool started." msgstr "Ermittlung von Smartcard-Slots mit pkcs11-tool gestartet." #: utils.cpp:1144 -msgid "Fetch smartcard slots via pkcs11-tool finished." +msgid "Fetch smartcard Q_SLOTS via pkcs11-tool finished." msgstr "Ermittlung von Smartcard-Slots mit pkcs11-tool beendet." #: utils.cpp:1219 diff --git a/po/es.po b/po/es.po index 6c11d4c..c77b69c 100644 --- a/po/es.po +++ b/po/es.po @@ -7538,7 +7538,7 @@ msgstr "" #. i18n: file: profilenetworkgeneraloptionsbase.ui:590 #. i18n: ectx: property (title), widget (QGroupBox) #: rc.cpp:4263 profilenetworkgeneraloptionsbase.cpp:346 -msgid "Connection Status Check" +msgid "Connection tqStatus Check" msgstr "Comprobación del estado de la conexión" #. i18n: file: profilenetworkgeneraloptionsbase.ui:593 @@ -13913,23 +13913,23 @@ msgid "write of %1 was ok." msgstr "la escritura de %1 se ha realizado correctamente." #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("user password")), -#. i18n( "Unable to store secure %1" ).arg(i18n("user password")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("user password")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("user password")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "User password", it->getUserPassword() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("pre shared key")), -#. i18n( "Unable to store secure %1" ).arg(i18n("pre shared key")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("pre shared key")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("pre shared key")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("preshared key password")), -#. i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("preshared key password")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("reshared key password")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } @@ -16402,15 +16402,15 @@ msgid "%1 cant be opened!" msgstr "¡No se ha podido abrir el archivo del registro!" #: utils.cpp:1127 -msgid "Unable to fetch smartcard slots via pkcs11-tool!" +msgid "Unable to fetch smartcard Q_SLOTS via pkcs11-tool!" msgstr "" #: utils.cpp:1133 -msgid "Fetch smartcard slots via pkcs11-tool started." +msgid "Fetch smartcard Q_SLOTS via pkcs11-tool started." msgstr "" #: utils.cpp:1144 -msgid "Fetch smartcard slots via pkcs11-tool finished." +msgid "Fetch smartcard Q_SLOTS via pkcs11-tool finished." msgstr "" #: utils.cpp:1219 diff --git a/po/fr.po b/po/fr.po index 85c2992..c42a210 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7632,7 +7632,7 @@ msgstr "" #. i18n: file: profilenetworkgeneraloptionsbase.ui:590 #. i18n: ectx: property (title), widget (QGroupBox) #: rc.cpp:4263 profilenetworkgeneraloptionsbase.cpp:346 -msgid "Connection Status Check" +msgid "Connection tqStatus Check" msgstr "Vérification de l'état de la connexion" #. i18n: file: profilenetworkgeneraloptionsbase.ui:593 @@ -13925,23 +13925,23 @@ msgid "write of %1 was ok." msgstr "ecriture de %1 complétée." #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("user password")), -#. i18n( "Unable to store secure %1" ).arg(i18n("user password")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("user password")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("user password")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "User password", it->getUserPassword() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("pre shared key")), -#. i18n( "Unable to store secure %1" ).arg(i18n("pre shared key")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("pre shared key")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("pre shared key")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("preshared key password")), -#. i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("preshared key password")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("reshared key password")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } @@ -16388,15 +16388,15 @@ msgid "%1 cant be opened!" msgstr "Le fichier journal ne peut être ouvert !" #: utils.cpp:1127 -msgid "Unable to fetch smartcard slots via pkcs11-tool!" +msgid "Unable to fetch smartcard Q_SLOTS via pkcs11-tool!" msgstr "" #: utils.cpp:1133 -msgid "Fetch smartcard slots via pkcs11-tool started." +msgid "Fetch smartcard Q_SLOTS via pkcs11-tool started." msgstr "" #: utils.cpp:1144 -msgid "Fetch smartcard slots via pkcs11-tool finished." +msgid "Fetch smartcard Q_SLOTS via pkcs11-tool finished." msgstr "" #: utils.cpp:1219 diff --git a/po/hu.po b/po/hu.po index 4c0b866..1f4d193 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7708,7 +7708,7 @@ msgstr "" #. i18n: ectx: property (title), widget (QGroupBox) #: rc.cpp:4263 profilenetworkgeneraloptionsbase.cpp:346 #, fuzzy -msgid "Connection Status Check" +msgid "Connection tqStatus Check" msgstr "A kapcsolat létrejött." #. i18n: file: profilenetworkgeneraloptionsbase.ui:593 @@ -14145,23 +14145,23 @@ msgid "write of %1 was ok." msgstr "" #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("user password")), -#. i18n( "Unable to store secure %1" ).arg(i18n("user password")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("user password")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("user password")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "User password", it->getUserPassword() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("pre shared key")), -#. i18n( "Unable to store secure %1" ).arg(i18n("pre shared key")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("pre shared key")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("pre shared key")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("preshared key password")), -#. i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("preshared key password")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("reshared key password")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } @@ -16693,15 +16693,15 @@ msgid "%1 cant be opened!" msgstr "A logfájl megnyitása nem sikerült." #: utils.cpp:1127 -msgid "Unable to fetch smartcard slots via pkcs11-tool!" +msgid "Unable to fetch smartcard Q_SLOTS via pkcs11-tool!" msgstr "" #: utils.cpp:1133 -msgid "Fetch smartcard slots via pkcs11-tool started." +msgid "Fetch smartcard Q_SLOTS via pkcs11-tool started." msgstr "" #: utils.cpp:1144 -msgid "Fetch smartcard slots via pkcs11-tool finished." +msgid "Fetch smartcard Q_SLOTS via pkcs11-tool finished." msgstr "" #: utils.cpp:1219 diff --git a/po/it.po b/po/it.po index b0b4cfb..9e44b7c 100644 --- a/po/it.po +++ b/po/it.po @@ -7508,7 +7508,7 @@ msgstr "" #. i18n: ectx: property (title), widget (QGroupBox) #: rc.cpp:4263 profilenetworkgeneraloptionsbase.cpp:346 #, fuzzy -msgid "Connection Status Check" +msgid "Connection tqStatus Check" msgstr "Connessione stabilita." #. i18n: file: profilenetworkgeneraloptionsbase.ui:593 @@ -13782,23 +13782,23 @@ msgid "write of %1 was ok." msgstr "" #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("user password")), -#. i18n( "Unable to store secure %1" ).arg(i18n("user password")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("user password")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("user password")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "User password", it->getUserPassword() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("pre shared key")), -#. i18n( "Unable to store secure %1" ).arg(i18n("pre shared key")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("pre shared key")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("pre shared key")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("preshared key password")), -#. i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("preshared key password")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("reshared key password")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } @@ -16270,15 +16270,15 @@ msgid "%1 cant be opened!" msgstr "Il file di log non può essere aperto!" #: utils.cpp:1127 -msgid "Unable to fetch smartcard slots via pkcs11-tool!" +msgid "Unable to fetch smartcard Q_SLOTS via pkcs11-tool!" msgstr "" #: utils.cpp:1133 -msgid "Fetch smartcard slots via pkcs11-tool started." +msgid "Fetch smartcard Q_SLOTS via pkcs11-tool started." msgstr "" #: utils.cpp:1144 -msgid "Fetch smartcard slots via pkcs11-tool finished." +msgid "Fetch smartcard Q_SLOTS via pkcs11-tool finished." msgstr "" #: utils.cpp:1219 diff --git a/po/ja.po b/po/ja.po index c3b8dcb..5014a92 100644 --- a/po/ja.po +++ b/po/ja.po @@ -7474,7 +7474,7 @@ msgstr "" #. i18n: file: profilenetworkgeneraloptionsbase.ui:590 #. i18n: ectx: property (title), widget (QGroupBox) #: rc.cpp:4263 profilenetworkgeneraloptionsbase.cpp:346 -msgid "Connection Status Check" +msgid "Connection tqStatus Check" msgstr "接続状態チェック" #. i18n: file: profilenetworkgeneraloptionsbase.ui:593 @@ -13741,23 +13741,23 @@ msgid "write of %1 was ok." msgstr "%1 の書き込みに成功しました。" #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("user password")), -#. i18n( "Unable to store secure %1" ).arg(i18n("user password")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("user password")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("user password")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "User password", it->getUserPassword() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("pre shared key")), -#. i18n( "Unable to store secure %1" ).arg(i18n("pre shared key")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("pre shared key")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("pre shared key")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("preshared key password")), -#. i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("preshared key password")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("reshared key password")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } @@ -16197,15 +16197,15 @@ msgid "%1 cant be opened!" msgstr "ログファイルを開けません。" #: utils.cpp:1127 -msgid "Unable to fetch smartcard slots via pkcs11-tool!" +msgid "Unable to fetch smartcard Q_SLOTS via pkcs11-tool!" msgstr "" #: utils.cpp:1133 -msgid "Fetch smartcard slots via pkcs11-tool started." +msgid "Fetch smartcard Q_SLOTS via pkcs11-tool started." msgstr "" #: utils.cpp:1144 -msgid "Fetch smartcard slots via pkcs11-tool finished." +msgid "Fetch smartcard Q_SLOTS via pkcs11-tool finished." msgstr "" #: utils.cpp:1219 diff --git a/po/kvpnc.pot b/po/kvpnc.pot index 9d7348a..7dcfde4 100644 --- a/po/kvpnc.pot +++ b/po/kvpnc.pot @@ -7163,7 +7163,7 @@ msgstr "" #. i18n: file: profilenetworkgeneraloptionsbase.ui:590 #. i18n: ectx: property (title), widget (QGroupBox) #: rc.cpp:4263 profilenetworkgeneraloptionsbase.cpp:346 -msgid "Connection Status Check" +msgid "Connection tqStatus Check" msgstr "" #. i18n: file: profilenetworkgeneraloptionsbase.ui:593 @@ -12842,23 +12842,23 @@ msgid "write of %1 was ok." msgstr "" #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("user password")), -#. i18n( "Unable to store secure %1" ).arg(i18n("user password")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("user password")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("user password")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "User password", it->getUserPassword() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("pre shared key")), -#. i18n( "Unable to store secure %1" ).arg(i18n("pre shared key")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("pre shared key")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("pre shared key")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("preshared key password")), -#. i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("preshared key password")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("reshared key password")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } @@ -15006,15 +15006,15 @@ msgid "%1 cant be opened!" msgstr "" #: utils.cpp:1127 -msgid "Unable to fetch smartcard slots via pkcs11-tool!" +msgid "Unable to fetch smartcard Q_SLOTS via pkcs11-tool!" msgstr "" #: utils.cpp:1133 -msgid "Fetch smartcard slots via pkcs11-tool started." +msgid "Fetch smartcard Q_SLOTS via pkcs11-tool started." msgstr "" #: utils.cpp:1144 -msgid "Fetch smartcard slots via pkcs11-tool finished." +msgid "Fetch smartcard Q_SLOTS via pkcs11-tool finished." msgstr "" #: utils.cpp:1219 diff --git a/po/nl.po b/po/nl.po index 465df05..bac3697 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7550,7 +7550,7 @@ msgstr "" #. i18n: file: profilenetworkgeneraloptionsbase.ui:590 #. i18n: ectx: property (title), widget (QGroupBox) #: rc.cpp:4263 profilenetworkgeneraloptionsbase.cpp:346 -msgid "Connection Status Check" +msgid "Connection tqStatus Check" msgstr "Controle op verbindingsstatus" #. i18n: file: profilenetworkgeneraloptionsbase.ui:593 @@ -13913,23 +13913,23 @@ msgid "write of %1 was ok." msgstr "schrijven van %1 is gelukt." #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("user password")), -#. i18n( "Unable to store secure %1" ).arg(i18n("user password")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("user password")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("user password")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "User password", it->getUserPassword() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("pre shared key")), -#. i18n( "Unable to store secure %1" ).arg(i18n("pre shared key")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("pre shared key")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("pre shared key")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("preshared key password")), -#. i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("preshared key password")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("reshared key password")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } @@ -16404,15 +16404,15 @@ msgid "%1 cant be opened!" msgstr "Logbestand kan niet worden geopend!" #: utils.cpp:1127 -msgid "Unable to fetch smartcard slots via pkcs11-tool!" +msgid "Unable to fetch smartcard Q_SLOTS via pkcs11-tool!" msgstr "" #: utils.cpp:1133 -msgid "Fetch smartcard slots via pkcs11-tool started." +msgid "Fetch smartcard Q_SLOTS via pkcs11-tool started." msgstr "" #: utils.cpp:1144 -msgid "Fetch smartcard slots via pkcs11-tool finished." +msgid "Fetch smartcard Q_SLOTS via pkcs11-tool finished." msgstr "" #: utils.cpp:1219 diff --git a/po/pl.po b/po/pl.po index 13146a7..d6107b2 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1923,7 +1923,7 @@ msgstr "F1" #. i18n: ectx: property (toolTip), widget (QPushButton) #: rc.cpp:380 msgid "Click for more help" -msgstr "Kliknij aby uzyskać pomoc dodatkową" +msgstr "Kliknij aby uzyskać potqmoc dodatkową" #. i18n: file: advancedprofilesettingsdialogbase.ui:664 #. i18n: ectx: property (toolTip), widget (QPushButton) @@ -3387,7 +3387,7 @@ msgstr "" #. i18n: ectx: property (caption), widget (QWidget) #: rc.cpp:1127 confighelperprogramoptionsbase.cpp:545 msgid "Helper programs" -msgstr "Programy pomocnicze" +msgstr "Programy potqmocnicze" #. i18n: file: confighelperprogramoptionsbase.ui:19 #. i18n: ectx: property (whatsThis), widget (QWidget) @@ -4003,7 +4003,7 @@ msgstr "" "

1.2 Rozłączenie

\n" "

2. Dodatkowa pomoc

\n" +"size:18pt;font-weight:600\">2. Dodatkowa potqmoc

\n" "

2.1 Strona domowa projektu

\n" "

Do góry

\n" "

2. Dodatkowa pomoc

\n" +"size:18pt;font-weight:600\">2. Dodatkowa potqmoc

\n" "

2.1 Strona domowa projektu

\n" "

Go to http://home.gna.org/kvpnc/" @@ -6110,7 +6110,7 @@ msgstr "Autoryzuj naz&wą użytkownika i hasłem" #: rc.cpp:2920 rc.cpp:4669 profileopenvpnoptionsbase.cpp:358 #: newprofilewizardopenvpnauth.cpp:103 msgid "Authenticate with server using username and password" -msgstr "Użyj autoryzacji przy pomocy nazwy użytkownika i hasła" +msgstr "Użyj autoryzacji przy potqmocy nazwy użytkownika i hasła" #. i18n: file: newprofilewizardopenvpnauth.ui:104 #. i18n: ectx: property (text), widget (QCheckBox) @@ -7474,7 +7474,7 @@ msgstr "" #. i18n: file: profilenetworkgeneraloptionsbase.ui:590 #. i18n: ectx: property (title), widget (QGroupBox) #: rc.cpp:4263 profilenetworkgeneraloptionsbase.cpp:346 -msgid "Connection Status Check" +msgid "Connection tqStatus Check" msgstr "Sprawdzanie statusu połączenia" #. i18n: file: profilenetworkgeneraloptionsbase.ui:593 @@ -13729,23 +13729,23 @@ msgid "write of %1 was ok." msgstr "poprawny zapis %1." #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("user password")), -#. i18n( "Unable to store secure %1" ).arg(i18n("user password")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("user password")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("user password")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "User password", it->getUserPassword() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("pre shared key")), -#. i18n( "Unable to store secure %1" ).arg(i18n("pre shared key")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("pre shared key")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("pre shared key")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("preshared key password")), -#. i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("preshared key password")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("reshared key password")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } @@ -15403,7 +15403,7 @@ msgstr "Demony" #: preferencesdialog.cpp:1039 preferencesdialog.cpp:1040 msgid "Helper Programs" -msgstr "Programy pomocnicze" +msgstr "Programy potqmocnicze" #: preferencesdialog.cpp:1052 preferencesdialog.cpp:1056 #: preferencesdialog.cpp:1076 preferencesdialog.cpp:1097 @@ -15883,7 +15883,7 @@ msgstr "" "

1.2 Rozłączenie

\n" "

2. Dodatkowa pomoc

\n" +"size:18pt;font-weight:600\">2. Dodatkowa potqmoc

\n" "

2.1 Strona domowa projektu

\n" "

Do góry

\n" "

2. Dodatkowa pomoc

\n" +"size:18pt;font-weight:600\">2. Dodatkowa potqmoc

\n" "

2.1 Strona domowa projektu

\n" "

Go to http://home.gna.org/kvpnc/" @@ -16194,15 +16194,15 @@ msgid "%1 cant be opened!" msgstr "Nie można otworzyć pliku logów!" #: utils.cpp:1127 -msgid "Unable to fetch smartcard slots via pkcs11-tool!" +msgid "Unable to fetch smartcard Q_SLOTS via pkcs11-tool!" msgstr "" #: utils.cpp:1133 -msgid "Fetch smartcard slots via pkcs11-tool started." +msgid "Fetch smartcard Q_SLOTS via pkcs11-tool started." msgstr "" #: utils.cpp:1144 -msgid "Fetch smartcard slots via pkcs11-tool finished." +msgid "Fetch smartcard Q_SLOTS via pkcs11-tool finished." msgstr "" #: utils.cpp:1219 diff --git a/po/pt_BR.po b/po/pt_BR.po index 84d857e..629bb86 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7583,7 +7583,7 @@ msgstr "" #. i18n: ectx: property (title), widget (QGroupBox) #: rc.cpp:4263 profilenetworkgeneraloptionsbase.cpp:346 #, fuzzy -msgid "Connection Status Check" +msgid "Connection tqStatus Check" msgstr "Opções de conexão" #. i18n: file: profilenetworkgeneraloptionsbase.ui:593 @@ -13922,23 +13922,23 @@ msgid "write of %1 was ok." msgstr "" #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("user password")), -#. i18n( "Unable to store secure %1" ).arg(i18n("user password")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("user password")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("user password")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "User password", it->getUserPassword() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("pre shared key")), -#. i18n( "Unable to store secure %1" ).arg(i18n("pre shared key")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("pre shared key")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("pre shared key")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("preshared key password")), -#. i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("preshared key password")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("reshared key password")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } @@ -16466,15 +16466,15 @@ msgid "%1 cant be opened!" msgstr "Arquivo de log não pode ser aberto!" #: utils.cpp:1127 -msgid "Unable to fetch smartcard slots via pkcs11-tool!" +msgid "Unable to fetch smartcard Q_SLOTS via pkcs11-tool!" msgstr "" #: utils.cpp:1133 -msgid "Fetch smartcard slots via pkcs11-tool started." +msgid "Fetch smartcard Q_SLOTS via pkcs11-tool started." msgstr "" #: utils.cpp:1144 -msgid "Fetch smartcard slots via pkcs11-tool finished." +msgid "Fetch smartcard Q_SLOTS via pkcs11-tool finished." msgstr "" #: utils.cpp:1219 diff --git a/po/ru.po b/po/ru.po index 359455f..8434395 100644 --- a/po/ru.po +++ b/po/ru.po @@ -7653,7 +7653,7 @@ msgstr "" #. i18n: ectx: property (title), widget (QGroupBox) #: rc.cpp:4263 profilenetworkgeneraloptionsbase.cpp:346 #, fuzzy -msgid "Connection Status Check" +msgid "Connection tqStatus Check" msgstr "Соединение установлено." #. i18n: file: profilenetworkgeneraloptionsbase.ui:593 @@ -14019,23 +14019,23 @@ msgid "write of %1 was ok." msgstr "" #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("user password")), -#. i18n( "Unable to store secure %1" ).arg(i18n("user password")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("user password")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("user password")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "User password", it->getUserPassword() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("pre shared key")), -#. i18n( "Unable to store secure %1" ).arg(i18n("pre shared key")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("pre shared key")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("pre shared key")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("preshared key password")), -#. i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("preshared key password")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("reshared key password")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } @@ -16565,15 +16565,15 @@ msgid "%1 cant be opened!" msgstr "Невозможно открыть файл журнала!" #: utils.cpp:1127 -msgid "Unable to fetch smartcard slots via pkcs11-tool!" +msgid "Unable to fetch smartcard Q_SLOTS via pkcs11-tool!" msgstr "" #: utils.cpp:1133 -msgid "Fetch smartcard slots via pkcs11-tool started." +msgid "Fetch smartcard Q_SLOTS via pkcs11-tool started." msgstr "" #: utils.cpp:1144 -msgid "Fetch smartcard slots via pkcs11-tool finished." +msgid "Fetch smartcard Q_SLOTS via pkcs11-tool finished." msgstr "" #: utils.cpp:1219 diff --git a/po/sk.po b/po/sk.po index 5831bb4..2ba7d6f 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1566,7 +1566,7 @@ msgid "" "dh17 = modp6144 (only racoon)\n" "dh18 = modp8192 (only racoon)" msgstr "" -"Definícia skupiny použitej pre Diffie-Hellman umocnenie. Budú nasledovné " +"Definícia skupiny použitej pre Diffie-Hellman utqmocnenie. Budú nasledovné " "priradenia:\n" "dh1 = modp768\n" "dh2 = modp1024\n" @@ -1935,7 +1935,7 @@ msgstr "F1" #. i18n: ectx: property (toolTip), widget (QPushButton) #: rc.cpp:380 msgid "Click for more help" -msgstr "Klikni pre viac pomoci" +msgstr "Klikni pre viac potqmoci" #. i18n: file: advancedprofilesettingsdialogbase.ui:664 #. i18n: ectx: property (toolTip), widget (QPushButton) @@ -2592,7 +2592,7 @@ msgid "" "Debug level of the program. Increase to show more verbose debug output of " "program. This is helpful if you have any trouble with your VPN connection." msgstr "" -"Úroveň ladenia programu. Bude vám to nápomocné pri problémoch s VPN spojením." +"Úroveň ladenia programu. Bude vám to nápotqmocné pri problétqmoch s VPN spojením." #. i18n: file: configdaemonoptionsbase.ui:271 #. i18n: ectx: property (whatsThis), widget (QSpinBox) @@ -2613,7 +2613,7 @@ msgid "" "of program.
This is helpful if you have any trouble with your VPN " "connection." msgstr "" -"Úroveň ladenia programu.
Bude vám to nápomocné pri problémoch s VPN " +"Úroveň ladenia programu.
Bude vám to nápotqmocné pri problétqmoch s VPN " "spojením." #. i18n: file: configdaemonoptionsbase.ui:305 @@ -2723,8 +2723,8 @@ msgid "" "Enable this to show debug output of program.
This is helpful if you have " "any trouble with your VPN connection." msgstr "" -"Povoliť pre zobrazenie výstupu ladenia programu.
ude vám to nápomocné " -"pri problémoch so VPN pripojením." +"Povoliť pre zobrazenie výstupu ladenia programu.
ude vám to nápotqmocné " +"pri problétqmoch so VPN pripojením." #. i18n: file: configdaemonoptionsbase.ui:662 #. i18n: ectx: property (text), widget (QCheckBox) @@ -3044,7 +3044,7 @@ msgid "" "Debug level of the program.
Increase to show more verbose debug output " "of program.
This is helpful if you have any trouble with your VPN c" msgstr "" -"Úroveň ladenia programu.
Bude vám to nápomocné pri problémoch s VPNc" +"Úroveň ladenia programu.
Bude vám to nápotqmocné pri problétqmoch s VPNc" #. i18n: file: configdaemonoptionsbase.ui:1517 #. i18n: ectx: property (text), widget (QLabel) @@ -3336,8 +3336,8 @@ msgid "" "KVpnc." msgstr "" "Úroveň debugovania programu KVpnc.
Zvýšením sa zobrazí viac podrobný " -"výpis debug informácií.
Bude vám to nápomocné pri problémoch so spojením " -"pomocou PPTP." +"výpis debug informácií.
Bude vám to nápotqmocné pri problétqmoch so spojením " +"potqmocou PPTP." #. i18n: file: configdebugoptionsbase.ui:195 #. i18n: ectx: property (text), widget (QCheckBox) @@ -3398,13 +3398,13 @@ msgstr "" #. i18n: ectx: property (caption), widget (QWidget) #: rc.cpp:1127 confighelperprogramoptionsbase.cpp:545 msgid "Helper programs" -msgstr "Pomocné programy" +msgstr "Potqmocné programy" #. i18n: file: confighelperprogramoptionsbase.ui:19 #. i18n: ectx: property (whatsThis), widget (QWidget) #: rc.cpp:1130 confighelperprogramoptionsbase.cpp:546 msgid "Here you can set options for small helper programs (no daemons)" -msgstr "Tu možete nastaviť voľby pre malé pomocné programy (nie daemoni)" +msgstr "Tu možete nastaviť voľby pre malé potqmocné programy (nie daemoni)" #. i18n: file: confighelperprogramoptionsbase.ui:57 #. i18n: ectx: property (text), widget (QLabel) @@ -4015,7 +4015,7 @@ msgstr "" "

1.2 Odpojenie

\n" "

2. Získanie externej pomoci

\n" +"size:18pt;font-weight:600\">2. Získanie externej potqmoci

\n" "

2.1 Domovská stránka

\n" "

" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("user password")), -#. i18n( "Unable to store secure %1" ).arg(i18n("user password")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("user password")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("user password")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "User password", it->getUserPassword() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("pre shared key")), -#. i18n( "Unable to store secure %1" ).arg(i18n("pre shared key")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("pre shared key")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("pre shared key")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("preshared key password")), -#. i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("preshared key password")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("reshared key password")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } @@ -15443,7 +15443,7 @@ msgstr "Daemoni" #: preferencesdialog.cpp:1039 preferencesdialog.cpp:1040 msgid "Helper Programs" -msgstr "Pomocné programy" +msgstr "Potqmocné programy" #: preferencesdialog.cpp:1052 preferencesdialog.cpp:1056 #: preferencesdialog.cpp:1076 preferencesdialog.cpp:1097 @@ -15925,7 +15925,7 @@ msgstr "" "

1.2 Odpojenie

\n" "

2. Získanie externej pomoci

\n" +"size:18pt;font-weight:600\">2. Získanie externej potqmoci

\n" "

2.1 Domovská stránka

\n" "

" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("user password")), -#. i18n( "Unable to store secure %1" ).arg(i18n("user password")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("user password")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("user password")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "User password", it->getUserPassword() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("pre shared key")), -#. i18n( "Unable to store secure %1" ).arg(i18n("pre shared key")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("pre shared key")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("pre shared key")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("preshared key password")), -#. i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("preshared key password")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("reshared key password")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } @@ -16537,15 +16537,15 @@ msgid "%1 cant be opened!" msgstr "Loggfilen kunde inte öppnas!" #: utils.cpp:1127 -msgid "Unable to fetch smartcard slots via pkcs11-tool!" +msgid "Unable to fetch smartcard Q_SLOTS via pkcs11-tool!" msgstr "" #: utils.cpp:1133 -msgid "Fetch smartcard slots via pkcs11-tool started." +msgid "Fetch smartcard Q_SLOTS via pkcs11-tool started." msgstr "" #: utils.cpp:1144 -msgid "Fetch smartcard slots via pkcs11-tool finished." +msgid "Fetch smartcard Q_SLOTS via pkcs11-tool finished." msgstr "" #: utils.cpp:1219 diff --git a/po/tr.po b/po/tr.po index 6e4ea78..ec945a4 100644 --- a/po/tr.po +++ b/po/tr.po @@ -7657,7 +7657,7 @@ msgstr "" #. i18n: ectx: property (title), widget (QGroupBox) #: rc.cpp:4263 profilenetworkgeneraloptionsbase.cpp:346 #, fuzzy -msgid "Connection Status Check" +msgid "Connection tqStatus Check" msgstr "Bağlantı sağlandı." #. i18n: file: profilenetworkgeneraloptionsbase.ui:593 @@ -14035,23 +14035,23 @@ msgid "write of %1 was ok." msgstr "" #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("user password")), -#. i18n( "Unable to store secure %1" ).arg(i18n("user password")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("user password")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("user password")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "User password", it->getUserPassword() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("pre shared key")), -#. i18n( "Unable to store secure %1" ).arg(i18n("pre shared key")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("pre shared key")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("pre shared key")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("preshared key password")), -#. i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("preshared key password")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("reshared key password")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } @@ -16577,15 +16577,15 @@ msgid "%1 cant be opened!" msgstr "Kayıt dosyası açılamadı!" #: utils.cpp:1127 -msgid "Unable to fetch smartcard slots via pkcs11-tool!" +msgid "Unable to fetch smartcard Q_SLOTS via pkcs11-tool!" msgstr "" #: utils.cpp:1133 -msgid "Fetch smartcard slots via pkcs11-tool started." +msgid "Fetch smartcard Q_SLOTS via pkcs11-tool started." msgstr "" #: utils.cpp:1144 -msgid "Fetch smartcard slots via pkcs11-tool finished." +msgid "Fetch smartcard Q_SLOTS via pkcs11-tool finished." msgstr "" #: utils.cpp:1219 diff --git a/po/zh_CN.po b/po/zh_CN.po index f777847..3aa3783 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7609,7 +7609,7 @@ msgstr "" #. i18n: ectx: property (title), widget (QGroupBox) #: rc.cpp:4263 profilenetworkgeneraloptionsbase.cpp:346 #, fuzzy -msgid "Connection Status Check" +msgid "Connection tqStatus Check" msgstr "连接已建立。" #. i18n: file: profilenetworkgeneraloptionsbase.ui:593 @@ -13939,23 +13939,23 @@ msgid "write of %1 was ok." msgstr "" #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("user password")), -#. i18n( "Unable to store secure %1" ).arg(i18n("user password")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("user password")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("user password")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "User password", it->getUserPassword() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("pre shared key")), -#. i18n( "Unable to store secure %1" ).arg(i18n("pre shared key")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("pre shared key")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("pre shared key")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.
" -#. "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("preshared key password")), -#. i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")), -#. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) +#. "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("preshared key password")), +#. i18n( "Unable to store secure %1" ).tqarg(i18n("reshared key password")), +#. KGuiItem( i18n( "Store &Unsafe" ), QString::tqfromLatin1( "unlock" ),QString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } @@ -16478,15 +16478,15 @@ msgid "%1 cant be opened!" msgstr "不能打开日志文件！" #: utils.cpp:1127 -msgid "Unable to fetch smartcard slots via pkcs11-tool!" +msgid "Unable to fetch smartcard Q_SLOTS via pkcs11-tool!" msgstr "" #: utils.cpp:1133 -msgid "Fetch smartcard slots via pkcs11-tool started." +msgid "Fetch smartcard Q_SLOTS via pkcs11-tool started." msgstr "" #: utils.cpp:1144 -msgid "Fetch smartcard slots via pkcs11-tool finished." +msgid "Fetch smartcard Q_SLOTS via pkcs11-tool finished." msgstr "" #: utils.cpp:1219 diff --git a/src/addnetworkroutedialog.cpp b/src/addnetworkroutedialog.cpp index 64c2512..b823884 100644 --- a/src/addnetworkroutedialog.cpp +++ b/src/addnetworkroutedialog.cpp @@ -22,18 +22,18 @@ #include #include #include -#include +#include #include "widgetnotifyhelper.h" #include -AddNetworkRouteDialog::AddNetworkRouteDialog(QWidget *parent, const QString& caption) : KDialogBase( parent, "Add_new_network_route", false, caption, +AddNetworkRouteDialog::AddNetworkRouteDialog(TQWidget *parent, const TQString& caption) : KDialogBase( parent, "Add_new_network_route", false, caption, KDialogBase::Ok|KDialogBase::Cancel,KDialogBase::Ok, true ) { main = new AddNetworkRouteDialogBase (this); setMainWidget(main); - main->setMinimumSize(main->sizeHint()); - connect(main->UseGatewayCheckBox,SIGNAL(toggled(bool)),this, SLOT(useGatewayToggled(bool))); - connect(main->UseInterfaceCheckBox,SIGNAL(toggled(bool)),this, SLOT(useInterfaceToggled(bool))); + main->setMinimumSize(main->tqsizeHint()); + connect(main->UseGatewayCheckBox,TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(useGatewayToggled(bool))); + connect(main->UseInterfaceCheckBox,TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(useInterfaceToggled(bool))); WidgetNotifyHelper h; h.setupChangedAction(this); @@ -60,25 +60,25 @@ void AddNetworkRouteDialog::accept() Interface = main->InterfaceComboBox->currentText(); useGateway = main->UseGatewayCheckBox->isChecked(); useInterface = main->UseInterfaceCheckBox->isChecked(); - QDialog::accept(); + TQDialog::accept(); } -QString AddNetworkRouteDialog::getNetwork() +TQString AddNetworkRouteDialog::getNetwork() { return Network; } -QString AddNetworkRouteDialog::getNetmask() +TQString AddNetworkRouteDialog::getNetmask() { return Netmask; } -QString AddNetworkRouteDialog::getGateway() +TQString AddNetworkRouteDialog::getGateway() { return Gateway; } -QString AddNetworkRouteDialog::getInterface() +TQString AddNetworkRouteDialog::getInterface() { return Interface; } diff --git a/src/addnetworkroutedialog.h b/src/addnetworkroutedialog.h index 2c58265..b23dce4 100644 --- a/src/addnetworkroutedialog.h +++ b/src/addnetworkroutedialog.h @@ -22,7 +22,7 @@ #include "addnetworkroutedialogbase.h" #include -#include +#include /** @author Christoph Thielecke @@ -30,14 +30,15 @@ class AddNetworkRouteDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - AddNetworkRouteDialog(QWidget *parent, const QString& caption); + AddNetworkRouteDialog(TQWidget *parent, const TQString& caption); ~AddNetworkRouteDialog(); - QString getNetwork(); - QString getNetmask(); - QString getGateway(); - QString getInterface(); + TQString getNetwork(); + TQString getNetmask(); + TQString getGateway(); + TQString getInterface(); bool getUseGateway(); bool getUseInterface(); AddNetworkRouteDialogBase *main; @@ -49,10 +50,10 @@ public slots: void useInterfaceToggled(bool); private: - QString Network; - QString Netmask; - QString Gateway; - QString Interface; + TQString Network; + TQString Netmask; + TQString Gateway; + TQString Interface; bool useGateway; bool useInterface; diff --git a/src/addnetworkroutedialogbase.ui b/src/addnetworkroutedialogbase.ui index dbf2cb7..bb2c355 100644 --- a/src/addnetworkroutedialogbase.ui +++ b/src/addnetworkroutedialogbase.ui @@ -1,6 +1,6 @@ AddNetworkRouteDialogBase - + AddNetworkRouteDialogBase @@ -25,23 +25,23 @@ unnamed - + - layout12 + tqlayout12 unnamed - + - layout9 + tqlayout9 unnamed - + LabelRemoteNetwork @@ -63,7 +63,7 @@ This is the remote network where the connection should going to. Use this at a PPTP connection for set another network than the retrieved IP is located. - + RemoteNetDividetextLabel @@ -212,15 +212,15 @@ - + - layout5 + tqlayout5 unnamed - + UseGatewayCheckBox @@ -247,7 +247,7 @@ Expanding - + 49 20 @@ -270,15 +270,15 @@ - + - layout11 + tqlayout11 unnamed - + UseInterfaceCheckBox @@ -305,7 +305,7 @@ Expanding - + 88 20 diff --git a/src/advancedprofiledialogbase.ui b/src/advancedprofiledialogbase.ui index abe7445..2bba094 100644 --- a/src/advancedprofiledialogbase.ui +++ b/src/advancedprofiledialogbase.ui @@ -1,6 +1,6 @@ AdvancedProfileDialogBase - + AdvancedProfileDialogBase @@ -19,7 +19,7 @@ unnamed - + AdvancedSettingsCheckbox @@ -43,14 +43,14 @@ Expanding - + 20 56 - + groupBox3 @@ -61,7 +61,7 @@ unnamed - + SingleDesCheckbox @@ -75,7 +75,7 @@ Allow single DES encryption (insecure) - + IkeGroupCheckbox @@ -89,7 +89,7 @@ Use special Diffie Hellman group - + PerfectForwardSecurityCheckbox @@ -103,7 +103,7 @@ Use perfect forward secrety (PFS) - + ApplicationVersionCheckbox diff --git a/src/advancedprofilesettingsdialogbase.ui b/src/advancedprofilesettingsdialogbase.ui index 93f57d2..8092d5a 100644 --- a/src/advancedprofilesettingsdialogbase.ui +++ b/src/advancedprofilesettingsdialogbase.ui @@ -1,6 +1,6 @@ AdvancedProfileSettingsDialogBase - + AdvancedProfileSettingsDialogBase @@ -22,15 +22,15 @@ unnamed - + - layout15 + tqlayout15 unnamed - + AdvancedSettingsCheckbox @@ -41,7 +41,7 @@ Check for use of advanced settings - + groupBox3 @@ -52,23 +52,23 @@ unnamed - + - layout39 + tqlayout39 unnamed - + - layout38 + tqlayout38 unnamed - + LocalPortCheckbox @@ -79,7 +79,7 @@ Check this if you want to specify an own local port for use with the tunnel - + SingleDesCheckbox @@ -90,15 +90,15 @@ Check for use of Single DES (insecure) - + - layout75_2 + tqlayout75_2 unnamed - + UseNoDeflateCheckbox @@ -119,7 +119,7 @@ Expanding - + 181 20 @@ -147,15 +147,15 @@ Domain name for authentication: - + - layout76 + tqlayout76 unnamed - + AllowStatefulModeCheckbox @@ -176,7 +176,7 @@ Expanding - + 110 20 @@ -185,7 +185,7 @@ - + Refuse40BitEncryptionCheckbox @@ -196,7 +196,7 @@ Check this for refusing 40 bit length encryption of MPPE - + requireMppeCheckbox @@ -207,7 +207,7 @@ Check this for use of MPPE encrpytion (enabled by default) - + GetDnsFromPeerCheckbox @@ -218,7 +218,7 @@ Check this for retrieve DNS server from peer - + IkeGroupCheckbox @@ -240,7 +240,7 @@ Application string - + MtuCheckbox @@ -254,15 +254,15 @@ If you enable this you can set a own MTU size. - + - layout75 + tqlayout75 unnamed - + RefuseEapCheckbox @@ -283,7 +283,7 @@ Expanding - + 181 20 @@ -292,7 +292,7 @@ - + PerfectForwardSecurityCheckbox @@ -303,7 +303,7 @@ Check this if you want to select perfect forward secrety method - + ApplicationVersionCheckbox @@ -314,15 +314,15 @@ Check if you want to send an own application version string - + - layout15 + tqlayout15 unnamed - + LocalPortSpinbox @@ -346,7 +346,7 @@ Expanding - + 167 21 @@ -355,7 +355,7 @@ - + DnsServerCheckbox @@ -374,7 +374,7 @@ Diffie Hellman group - + SetDefaultRouteCheckbox @@ -385,15 +385,15 @@ Check this for adding a new default route - + - layout78 + tqlayout78 unnamed - + UseGlobalIpsecSecretCheckbox @@ -414,7 +414,7 @@ Expanding - + 141 20 @@ -423,7 +423,7 @@ - + UseNoBsdCompCheckbox @@ -434,15 +434,15 @@ Check this for refuse BSD compression (disabled by default) - + - layout15_2 + tqlayout15_2 unnamed - + MtuSpinbox @@ -472,7 +472,7 @@ Expanding - + 167 21 @@ -486,15 +486,15 @@ PerfectForwardSecrecyCombobox - + - layout77 + tqlayout77 unnamed - + Refuse128BitEncryptionCheckbox @@ -515,7 +515,7 @@ Expanding - + 121 20 @@ -524,7 +524,7 @@ - + NtDomainNameCheckbox @@ -535,15 +535,15 @@ Check if domain name for authentication is needed - + - layout75_2_2 + tqlayout75_2_2 unnamed - + ReplaceDefaultRouteCheckbox @@ -564,7 +564,7 @@ Expanding - + 181 20 @@ -585,7 +585,7 @@ Expanding - + 20 20 @@ -596,7 +596,7 @@ - + Layout1 @@ -610,7 +610,7 @@ 6 - + buttonHelp @@ -637,14 +637,14 @@ Expanding - + 20 20 - + buttonOk @@ -664,7 +664,7 @@ Click for closing the dialog by accepting the settings - + buttonCancel @@ -767,7 +767,7 @@ localPortToggled() - + advancedSettingsToggled() domainNameToggled() applicationVersionToggled() @@ -781,7 +781,7 @@ useUdpToggled() setDefaultRouteToggled() mtuToggled() - + klineedit.h diff --git a/src/advancedsettingsdialog.cpp b/src/advancedsettingsdialog.cpp index 866fc0f..08a4fe9 100644 --- a/src/advancedsettingsdialog.cpp +++ b/src/advancedsettingsdialog.cpp @@ -19,32 +19,32 @@ ***************************************************************************/ //BEGIN includes -#include +#include #include #include -#include -#include -#include +#include +#include +#include #include #include "advancedsettingsdialog.h" #include "toolinfo.h" #include //END includes -AdvancedSettingsDialog::AdvancedSettingsDialog(QWidget *parent, const QString& caption, VpnAccountData *currentProfile, VpnAccountData::ConnectionType connectionType, KVpncConfig *GlobalConfig) : KDialogBase( parent, "Advanced_settings", true, caption, KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ) +AdvancedSettingsDialog::AdvancedSettingsDialog(TQWidget *parent, const TQString& caption, VpnAccountData *currentProfile, VpnAccountData::ConnectionType connectionType, KVpncConfig *GlobalConfig) : KDialogBase( parent, "Advanced_settings", true, caption, KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ) { main = new AdvancedProfileDialogBase(this); setMainWidget(main); - main->setMinimumSize(main->sizeHint()); + main->setMinimumSize(main->tqsizeHint()); this->currentProfile = currentProfile; this->connectionType = connectionType; - connect (main->AdvancedSettingsCheckbox, SIGNAL(toggled(bool)),this, SLOT(advancedSettingsToggled(bool))); - connect (main->ApplicationVersionCheckbox, SIGNAL(toggled(bool)),this, SLOT(applicationVersionToggled(bool))); - connect (main->PerfectForwardSecurityCheckbox, SIGNAL(toggled(bool)),this, SLOT(perfectForwardSecurityToggled(bool))); - connect (main->IkeGroupCheckbox, SIGNAL(toggled(bool)),this, SLOT(IkeGroupToggled(bool))); - connect (main->SingleDesCheckbox, SIGNAL(toggled(bool)),this, SLOT(singleDesToggled(bool))); + connect (main->AdvancedSettingsCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(advancedSettingsToggled(bool))); + connect (main->ApplicationVersionCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(applicationVersionToggled(bool))); + connect (main->PerfectForwardSecurityCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(perfectForwardSecurityToggled(bool))); + connect (main->IkeGroupCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(IkeGroupToggled(bool))); + connect (main->SingleDesCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(singleDesToggled(bool))); main->IkeGroupCheckbox->setEnabled( false ); main->PerfectForwardSecrecyCombobox->setEnabled( false ); @@ -55,7 +55,7 @@ AdvancedSettingsDialog::AdvancedSettingsDialog(QWidget *parent, const QString& c main->ApplicationVersionCheckbox->setEnabled( false ); main->IkeGroupCombobox->setEnabled( false ); - QString vpnc_version=""; + TQString vpnc_version=""; ToolInfo *tool; for ( tool = GlobalConfig->ToolList->first(); tool; tool = GlobalConfig->ToolList->next() ) { @@ -213,7 +213,7 @@ void AdvancedSettingsDialog::accept() currentProfile->setUsePerfectForwardSecrety( this->main->PerfectForwardSecurityCheckbox->isChecked() ); currentProfile->setUseSingleDes( this->main->SingleDesCheckbox->isChecked() ); - QDialog::accept(); + TQDialog::accept(); } #include "advancedsettingsdialog.moc" diff --git a/src/advancedsettingsdialog.h b/src/advancedsettingsdialog.h index b98c940..ff82e9f 100644 --- a/src/advancedsettingsdialog.h +++ b/src/advancedsettingsdialog.h @@ -30,8 +30,9 @@ */ class AdvancedSettingsDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - AdvancedSettingsDialog(QWidget *parent, const QString& caption, VpnAccountData *currentProfile, VpnAccountData::ConnectionType connectionType, KVpncConfig *GlobalConfig); + AdvancedSettingsDialog(TQWidget *parent, const TQString& caption, VpnAccountData *currentProfile, VpnAccountData::ConnectionType connectionType, KVpncConfig *GlobalConfig); ~AdvancedSettingsDialog(); VpnAccountData::ConnectionType connectionType; diff --git a/src/ciscocertificateenrollment.cpp b/src/ciscocertificateenrollment.cpp index bb1d54c..02eb4af 100644 --- a/src/ciscocertificateenrollment.cpp +++ b/src/ciscocertificateenrollment.cpp @@ -29,13 +29,13 @@ #include #include #include -#include -#include +#include +#include #include "utils.h" //END INCLUDES -CiscoCertificateEnrollment::CiscoCertificateEnrollment ( QWidget *, const char*, KVpncConfig *GlobalConfig ) +CiscoCertificateEnrollment::CiscoCertificateEnrollment ( TQWidget *, const char*, KVpncConfig *GlobalConfig ) { this->GlobalConfig = GlobalConfig; valuesOk=true; @@ -71,7 +71,7 @@ CiscoCertificateEnrollment::~CiscoCertificateEnrollment() void CiscoCertificateEnrollment::accept() { finished=true; - QWizard::accept(); + TQWizard::accept(); } void CiscoCertificateEnrollment::canAccept() @@ -79,7 +79,7 @@ void CiscoCertificateEnrollment::canAccept() - QDialog::accept(); + TQDialog::accept(); } void CiscoCertificateEnrollment::reject() @@ -90,48 +90,48 @@ void CiscoCertificateEnrollment::reject() if ( EnrollmentProcess != 0 && EnrollmentProcess->isRunning() ) { EnrollmentProcess->tryTerminate(); - QTimer::singleShot ( 2000, EnrollmentProcess, SLOT ( kill() ) ); + TQTimer::singleShot ( 2000, EnrollmentProcess, TQT_SLOT ( kill() ) ); if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "process %1 killed" ).arg ( "cisco_cert_mgr" ), GlobalConfig->debug ); } finished = false; - QWizard::reject(); + TQWizard::reject(); } void CiscoCertificateEnrollment::setupPages() { - GlobalConfig->appPointer->setOverrideCursor( QCursor(Qt::WaitCursor) ); + GlobalConfig->appPointer->setOverrideCursor( TQCursor(TQt::WaitCursor) ); selectionpage = new CiscoCertificateEnrollmentBase ( 0 ); - selectionpage->sizeHint(); + selectionpage->tqsizeHint(); addPage ( selectionpage, "" + i18n ( "Select enrollment type..." ) + "" ); - connect ( selectionpage->FileEnrollementRadioButton, SIGNAL ( toggled ( bool ) ), this, SLOT ( enrollmentToggled ( bool ) ) ); - connect ( selectionpage->OnlineEnrollementRadioButton, SIGNAL ( toggled ( bool ) ), this, SLOT ( enrollmentToggled ( bool ) ) ); + connect ( selectionpage->FileEnrollementRadioButton, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( enrollmentToggled ( bool ) ) ); + connect ( selectionpage->OnlineEnrollementRadioButton, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( enrollmentToggled ( bool ) ) ); GlobalConfig->slotStatusMsg(i18n("Collecting cisco CA certs from Cisco certificate store..."), ID_STATUS_MSG); if (GlobalConfig->KvpncDebugLevel > 2) GlobalConfig->appendLogEntry(i18n("Looking for CA certs in Cisco certificate store..."), GlobalConfig->debug); - QStringList CiscoCaCerts = Utils(GlobalConfig).getCertsFromCiscoCertStore("ca"); + TQStringList CiscoCaCerts = Utils(GlobalConfig).getCertsFromCiscoCertStore("ca"); if (GlobalConfig->KvpncDebugLevel > 2) GlobalConfig->appendLogEntry(i18n("Done."), GlobalConfig->debug); GlobalConfig->slotStatusMsg(i18n("Done."), ID_FLASH_MSG); GlobalConfig->slotStatusMsg(i18n("Ready."), ID_STATUS_MSG); - for ( QStringList::Iterator it = CiscoCaCerts.begin(); it != CiscoCaCerts.end(); ++it ) + for ( TQStringList::Iterator it = CiscoCaCerts.begin(); it != CiscoCaCerts.end(); ++it ) { if ( GlobalConfig->KvpncDebugLevel > 2 ) - std::cout << "insert item (cisco ca certs): " << QString ( *it ) << std::endl; + std::cout << "insert item (cisco ca certs): " << TQString ( *it ) << std::endl; selectionpage->CAComboBox->insertItem ( *it ); } datapage = new CiscoCertificateEnrollmentDataDialog ( 0, "datapage",GlobalConfig ); - datapage->sizeHint(); + datapage->tqsizeHint(); addPage ( datapage, "" + i18n ( "Enter certificate data..." ) + "" ); finishpage = new CiscoCertificateEnrollmentFinishWidgetBase ( 0 ); - finishpage->sizeHint(); + finishpage->tqsizeHint(); addPage ( finishpage, "" + i18n ( "Finish" ) + "" ); GlobalConfig->appPointer->restoreOverrideCursor(); @@ -141,7 +141,7 @@ void CiscoCertificateEnrollment::next () { // called at each finish of a page bool ok = true; - QString msg = i18n ( "Please fill in all fields!" ); + TQString msg = i18n ( "Please fill in all fields!" ); msg = i18n ( "These fields must be filled in:\n" ); if ( currentpage == selectionpage ) { @@ -177,7 +177,7 @@ void CiscoCertificateEnrollment::next () else if ( GlobalConfig->KvpncDebugLevel > 4 ) GlobalConfig->appendLogEntry ( i18n ( "Password (cleartext): %1" ).arg ( selectionpage->NewPasswordPasswordEdit->password() ), KVpncConfig::debug ); - ChallengePassword =QString(selectionpage->NewPasswordPasswordEdit->password()); + ChallengePassword =TQString(selectionpage->NewPasswordPasswordEdit->password()); } if ( GlobalConfig->KvpncDebugLevel > 2 ) @@ -224,7 +224,7 @@ void CiscoCertificateEnrollment::next () else if ( GlobalConfig->KvpncDebugLevel > 4 ) GlobalConfig->appendLogEntry ( i18n ( "Challenge password (cleartext): %1" ).arg ( selectionpage->ChallengePasswordPasswordEdit->password() ), KVpncConfig::debug ); - ChallengePassword =QString(selectionpage->ChallengePasswordPasswordEdit->password()); + ChallengePassword =TQString(selectionpage->ChallengePasswordPasswordEdit->password()); } } @@ -277,7 +277,7 @@ void CiscoCertificateEnrollment::next () // now do the work successmsg =i18n ( "Enrollment was sucessful." ); success=0; - QString bin="cisco_cert_mgr"; + TQString bin="cisco_cert_mgr"; ToolInfo *tool; //std::cout << "Tool (bin): " << bin << std::endl; if ( !GlobalConfig->ToolList->isEmpty() ) @@ -299,12 +299,12 @@ void CiscoCertificateEnrollment::next () } - GlobalConfig->appPointer->setOverrideCursor ( QCursor ( Qt::WaitCursor ) ); + GlobalConfig->appPointer->setOverrideCursor ( TQCursor ( TQt::WaitCursor ) ); - env = new QStringList(); + env = new TQStringList(); *env << "LC_ALL=C" << "LANG=C" << "PATH=/bin:/usr/bin:/usr/sbin:/sbin"; - EnrollmentProcess = new QProcess ( this ); + EnrollmentProcess = new TQProcess ( this ); EnrollmentProcess->addArgument ( GlobalConfig->pathToCiscoCertMgr ); if ( type == "file" ) @@ -372,18 +372,18 @@ void CiscoCertificateEnrollment::next () } - connect ( EnrollmentProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout() ) ); - connect ( EnrollmentProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr() ) ); - connect ( EnrollmentProcess, SIGNAL ( processExited()) , this, SLOT(enrollmentProcessFinished())); + connect ( EnrollmentProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout() ) ); + connect ( EnrollmentProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr() ) ); + connect ( EnrollmentProcess, TQT_SIGNAL ( processExited()) , this, TQT_SLOT(enrollmentProcessFinished())); // if ( GlobalConfig->KvpncDebugLevel > 3 ) { - QString args = ""; - QStringList list = EnrollmentProcess->arguments(); - QStringList::Iterator it2 = list.begin(); + TQString args = ""; + TQStringList list = EnrollmentProcess->arguments(); + TQStringList::Iterator it2 = list.begin(); while ( it2 != list.end() ) { - args += QString ( " " + *it2 ) ; + args += TQString ( " " + *it2 ) ; ++it2; } @@ -409,7 +409,7 @@ void CiscoCertificateEnrollment::next () ProgressDlg->show(); ProgressDlg->resize ( ProgressDlg->width() +100,ProgressDlg->height() ); - connect ( &CheckEnrollmentTimer, SIGNAL ( timeout() ), this, SLOT ( checkProgress() ) ); + connect ( &CheckEnrollmentTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( checkProgress() ) ); CheckEnrollmentTimer.start ( 500, FALSE ); // we stupid have to send the password :( @@ -439,7 +439,7 @@ void CiscoCertificateEnrollment::next () if ( ok ) { previouspage = currentpage; - QWizard::next(); + TQWizard::next(); } else { @@ -460,13 +460,13 @@ void CiscoCertificateEnrollment::back() */ - QWizard::back(); + TQWizard::back(); } -void CiscoCertificateEnrollment::showPage ( QWidget* page ) +void CiscoCertificateEnrollment::showPage ( TQWidget* page ) { currentpage = page; - QWizard::showPage ( page ); + TQWizard::showPage ( page ); // FIXME set currentpage at back() @@ -482,9 +482,9 @@ void CiscoCertificateEnrollment::showPage ( QWidget* page ) void CiscoCertificateEnrollment::enrollmentProcessFinished() { - disconnect ( EnrollmentProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout() ) ); - disconnect ( EnrollmentProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr() ) ); - disconnect ( EnrollmentProcess, SIGNAL ( processExited()) , this, SLOT(enrollmentProcessFinished())); + disconnect ( EnrollmentProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout() ) ); + disconnect ( EnrollmentProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr() ) ); + disconnect ( EnrollmentProcess, TQT_SIGNAL ( processExited()) , this, TQT_SLOT(enrollmentProcessFinished())); if ( ProgressDlg!= 0 ) ProgressDlg->progressBar()->setValue ( 100 ); GlobalConfig->appPointer->restoreOverrideCursor(); @@ -541,13 +541,13 @@ void CiscoCertificateEnrollment::enrollmentToggled ( bool ) void CiscoCertificateEnrollment::readFromStdout() { - QString line2 = QString( EnrollmentProcess->readStdout() ); - QStringList lines = QStringList::split( '\n', line2 ); - for ( QStringList::Iterator it = lines.begin(); it != lines.end(); ++it ) + TQString line2 = TQString( EnrollmentProcess->readStdout() ); + TQStringList lines = TQStringList::split( '\n', line2 ); + for ( TQStringList::Iterator it = lines.begin(); it != lines.end(); ++it ) // while ( EnrollmentProcess->canReadLineStdout() ) { -// QString line = QString ( EnrollmentProcess->readLineStdout() ); - QString line = *it; +// TQString line = TQString ( EnrollmentProcess->readLineStdout() ); + TQString line = *it; if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( "[cisco_cert_mgr raw] "+line,GlobalConfig->debug ); @@ -591,13 +591,13 @@ void CiscoCertificateEnrollment::readFromStdout() void CiscoCertificateEnrollment::readFromStderr() { - QString line2 = QString( EnrollmentProcess->readStderr() ); - QStringList lines = QStringList::split( '\n', line2 ); - for ( QStringList::Iterator it = lines.begin(); it != lines.end(); ++it ) + TQString line2 = TQString( EnrollmentProcess->readStderr() ); + TQStringList lines = TQStringList::split( '\n', line2 ); + for ( TQStringList::Iterator it = lines.begin(); it != lines.end(); ++it ) // while ( EnrollmentProcess->canReadLineStderr() ) { -// QString line = QString ( EnrollmentProcess->readLineStderr() ); - QString line = *it; +// TQString line = TQString ( EnrollmentProcess->readLineStderr() ); + TQString line = *it; if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( "[cisco_cert_mgr err raw] "+line,GlobalConfig->debug ); @@ -632,18 +632,18 @@ void CiscoCertificateEnrollment::checkProgress() CheckEnrollmentTimer.stop(); // kill process - disconnect ( EnrollmentProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout() ) ); - disconnect ( EnrollmentProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr() ) ); + disconnect ( EnrollmentProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout() ) ); + disconnect ( EnrollmentProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr() ) ); if ( EnrollmentProcess->isRunning() ) { EnrollmentProcess->tryTerminate(); - QTimer::singleShot ( 2000, EnrollmentProcess, SLOT ( kill() ) ); + TQTimer::singleShot ( 2000, EnrollmentProcess, TQT_SLOT ( kill() ) ); if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "process %1 killed" ).arg ( "cisco_cert_mgr" ), GlobalConfig->debug ); } - QStringList CiscoCertRequests = Utils ( GlobalConfig ).getCertsFromCiscoCertStore ( "enrollment" ); + TQStringList CiscoCertRequests = Utils ( GlobalConfig ).getCertsFromCiscoCertStore ( "enrollment" ); if ( !CiscoCertRequests.isEmpty() ) { if ( GlobalConfig->KvpncDebugLevel > 2 ) @@ -654,16 +654,16 @@ void CiscoCertificateEnrollment::checkProgress() if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "delete enrollment request..." ), GlobalConfig->debug ); - DeleteProcess = new QProcess ( 0 ); + DeleteProcess = new TQProcess ( 0 ); DeleteProcess->addArgument ( GlobalConfig->pathToCiscoCertMgr ); DeleteProcess->addArgument ( "-E" ); DeleteProcess->addArgument ( "-op" ); DeleteProcess->addArgument ( "delete" ); DeleteProcess->addArgument ( "-ct" ); DeleteProcess->addArgument ( 0 ); - connect ( DeleteProcess, SIGNAL ( processExited()) , this, SLOT(cancelProcessFinished())); - connect ( DeleteProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_cancel() ) ); - connect ( DeleteProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_cancel() ) ); + connect ( DeleteProcess, TQT_SIGNAL ( processExited()) , this, TQT_SLOT(cancelProcessFinished())); + connect ( DeleteProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_cancel() ) ); + connect ( DeleteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_cancel() ) ); if ( !DeleteProcess->start ( env ) ) { @@ -684,9 +684,9 @@ void CiscoCertificateEnrollment::checkProgress() sleep(1); } } - disconnect ( DeleteProcess, SIGNAL ( processExited()) , this, SLOT(cancelProcessFinished())); - disconnect ( DeleteProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_cancel() ) ); - disconnect ( DeleteProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_cancel() ) ); + disconnect ( DeleteProcess, TQT_SIGNAL ( processExited()) , this, TQT_SLOT(cancelProcessFinished())); + disconnect ( DeleteProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_cancel() ) ); + disconnect ( DeleteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_cancel() ) ); delete DeleteProcess; DeleteProcess=0L; @@ -714,10 +714,10 @@ void CiscoCertificateEnrollment::cancelProcessFinished() void CiscoCertificateEnrollment::readFromStdout_cancel() { - QString line = QString( DeleteProcess->readStdout() ); + TQString line = TQString( DeleteProcess->readStdout() ); // while ( DeleteProcess->canReadLineStdout() ) // { -// QString line = QString ( DeleteProcess->readLineStdout() ); +// TQString line = TQString ( DeleteProcess->readLineStdout() ); if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( "[cisco_cert_mgr raw] "+line,GlobalConfig->debug ); @@ -727,10 +727,10 @@ void CiscoCertificateEnrollment::readFromStdout_cancel() void CiscoCertificateEnrollment::readFromStderr_cancel() { - QString line = QString ( DeleteProcess->readStderr() ); + TQString line = TQString ( DeleteProcess->readStderr() ); // while ( DeleteProcess->canReadLineStderr() ) // { -// QString line = QString ( DeleteProcess->readLineStderr() ); +// TQString line = TQString ( DeleteProcess->readLineStderr() ); if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( "[cisco_cert_mgr err raw] "+line,GlobalConfig->debug ); diff --git a/src/ciscocertificateenrollment.h b/src/ciscocertificateenrollment.h index 179627a..a0bc743 100644 --- a/src/ciscocertificateenrollment.h +++ b/src/ciscocertificateenrollment.h @@ -24,31 +24,32 @@ #include "ciscocertificateenrollmentbase.h" #include "ciscocertificateenrollmentfinishwidgetbase.h" #include "ciscocertificateenrollmentdatadialog.h" -#include -#include -#include +#include +#include +#include #include #include -#include -#include +#include +#include #include "kvpncconfig.h" /** @author Christoph Thielecke */ -class CiscoCertificateEnrollment : public QWizard +class CiscoCertificateEnrollment : public TQWizard { Q_OBJECT + TQ_OBJECT public: - CiscoCertificateEnrollment ( QWidget *parent, const char* caption, KVpncConfig *GlobalConfig ); + CiscoCertificateEnrollment ( TQWidget *parent, const char* caption, KVpncConfig *GlobalConfig ); ~CiscoCertificateEnrollment(); - QProcess *EnrollmentProcess; - QProcess *DeleteProcess; + TQProcess *EnrollmentProcess; + TQProcess *DeleteProcess; KVpncConfig *GlobalConfig; bool done; bool finished; bool valuesOk; - QStringList *env; + TQStringList *env; public slots: @@ -56,7 +57,7 @@ class CiscoCertificateEnrollment : public QWizard void canAccept(); void enrollmentToggled(bool); void setupPages(); - void showPage( QWidget* page ); + void showPage( TQWidget* page ); void next (); void back(); void reject(); @@ -73,31 +74,31 @@ class CiscoCertificateEnrollment : public QWizard CiscoCertificateEnrollmentBase *selectionpage; CiscoCertificateEnrollmentDataDialogBase *datapage; CiscoCertificateEnrollmentFinishWidgetBase *finishpage; - QWidget* currentpage; // pointer to current page - QWidget* previouspage; //< pointer to previous page + TQWidget* currentpage; // pointer to current page + TQWidget* previouspage; //< pointer to previous page KProgressDialog *ProgressDlg; public: - QString type; - QString successmsg; + TQString type; + TQString successmsg; int success; - QString CA; - QString CaUrl; - QString ChallengePassword; - QString CaDomain; - QString FileEncoding; - QString FilenameURL; - QString Ip; - QString State; - QString Department; - QString Company; - QString Domain; - QString Name; - QString Email; - QString Country; + TQString CA; + TQString CaUrl; + TQString ChallengePassword; + TQString CaDomain; + TQString FileEncoding; + TQString FilenameURL; + TQString Ip; + TQString State; + TQString Department; + TQString Company; + TQString Domain; + TQString Name; + TQString Email; + TQString Country; private: - QTimer CheckEnrollmentTimer; + TQTimer CheckEnrollmentTimer; }; diff --git a/src/ciscocertificateenrollmentbase.ui b/src/ciscocertificateenrollmentbase.ui index 45995a3..9d05906 100644 --- a/src/ciscocertificateenrollmentbase.ui +++ b/src/ciscocertificateenrollmentbase.ui @@ -1,6 +1,6 @@ CiscoCertificateEnrollmentBase - + CiscoCertificateEnrollmentBase @@ -19,15 +19,15 @@ unnamed - + - layout71 + tqlayout71 unnamed - + textLabel8 @@ -35,7 +35,7 @@ <b>Select your enrollment method:</b> - + buttonGroup1 @@ -51,7 +51,7 @@ ChallengePasswordPasswordEdit - + FileEnrollementRadioButton @@ -75,7 +75,7 @@ CAComboBox - + NewPasswordTextLabel @@ -96,7 +96,7 @@ Expanding - + 331 21 @@ -113,14 +113,14 @@ Expanding - + 331 21 - + ChallengePasswordTextLabel @@ -128,7 +128,7 @@ Challenge password: - + CaDomainTextLabel @@ -136,7 +136,7 @@ CA domain: - + CaUrlTextLabel @@ -144,7 +144,7 @@ CA URL: - + CaTextLabel @@ -152,7 +152,7 @@ Certificate authority: - + FileEncodingTextLabel @@ -163,7 +163,7 @@ File encoding: - + FilenameTextLabel @@ -202,7 +202,7 @@ false - + OnlineEnrollementRadioButton @@ -236,7 +236,7 @@ Expanding - + 20 20 diff --git a/src/ciscocertificateenrollmentdatadialog.cpp b/src/ciscocertificateenrollmentdatadialog.cpp index 3fbbd57..2ecabe4 100644 --- a/src/ciscocertificateenrollmentdatadialog.cpp +++ b/src/ciscocertificateenrollmentdatadialog.cpp @@ -26,9 +26,9 @@ #include #include #include -#include +#include -CiscoCertificateEnrollmentDataDialog::CiscoCertificateEnrollmentDataDialog(QWidget *parent, const char* caption, KVpncConfig *GlobalConfig) +CiscoCertificateEnrollmentDataDialog::CiscoCertificateEnrollmentDataDialog(TQWidget *parent, const char* caption, KVpncConfig *GlobalConfig) { } diff --git a/src/ciscocertificateenrollmentdatadialog.h b/src/ciscocertificateenrollmentdatadialog.h index b2c57c9..bcd7fab 100644 --- a/src/ciscocertificateenrollmentdatadialog.h +++ b/src/ciscocertificateenrollmentdatadialog.h @@ -22,9 +22,9 @@ #include #include "ciscocertificateenrollmentdatadialogbase.h" -#include -#include -#include +#include +#include +#include #include #include "kvpncconfig.h" @@ -34,7 +34,7 @@ class CiscoCertificateEnrollmentDataDialog : public CiscoCertificateEnrollmentDataDialogBase { public: - CiscoCertificateEnrollmentDataDialog(QWidget *parent, const char* caption, KVpncConfig *GlobalConfig); + CiscoCertificateEnrollmentDataDialog(TQWidget *parent, const char* caption, KVpncConfig *GlobalConfig); ~CiscoCertificateEnrollmentDataDialog(); KVpncConfig *GlobalConfig; diff --git a/src/ciscocertificateenrollmentdatadialogbase.ui b/src/ciscocertificateenrollmentdatadialogbase.ui index cb3bbce..ae65436 100644 --- a/src/ciscocertificateenrollmentdatadialogbase.ui +++ b/src/ciscocertificateenrollmentdatadialogbase.ui @@ -1,6 +1,6 @@ CiscoCertificateEnrollmentDataDialogBase - + CiscoCertificateEnrollmentDataDialogBase @@ -19,31 +19,31 @@ unnamed - + - layout73 + tqlayout73 unnamed - + - layout72 + tqlayout72 unnamed - + - layout69 + tqlayout69 unnamed - + textLabel12 @@ -61,7 +61,7 @@ Expanding - + 51 21 @@ -70,15 +70,15 @@ - + - layout65 + tqlayout65 unnamed - + textLabel15 @@ -96,7 +96,7 @@ Expanding - + 40 20 @@ -115,15 +115,15 @@ StateLineEdit - + - layout68 + tqlayout68 unnamed - + textLabel11 @@ -141,7 +141,7 @@ Expanding - + 40 20 @@ -150,15 +150,15 @@ - + - layout67 + tqlayout67 unnamed - + textLabel14 @@ -176,7 +176,7 @@ Expanding - + 40 20 @@ -185,15 +185,15 @@ - + - layout63 + tqlayout63 unnamed - + textLabel10 @@ -211,7 +211,7 @@ Expanding - + 31 21 @@ -225,15 +225,15 @@ DepartmentLineEdit - + - layout64 + tqlayout64 unnamed - + textLabel16 @@ -251,7 +251,7 @@ Expanding - + 40 20 @@ -265,15 +265,15 @@ CompanyLineEdit - + - layout70 + tqlayout70 unnamed - + textLabel13 @@ -291,7 +291,7 @@ Expanding - + 40 20 @@ -320,15 +320,15 @@ CountryLineEdit - + - layout62 + tqlayout62 unnamed - + textLabel9 @@ -346,7 +346,7 @@ Expanding - + 31 21 @@ -367,7 +367,7 @@ Expanding - + 20 41 diff --git a/src/ciscocertificateenrollmentfinishwidgetbase.ui b/src/ciscocertificateenrollmentfinishwidgetbase.ui index 3ec1b72..79e312f 100644 --- a/src/ciscocertificateenrollmentfinishwidgetbase.ui +++ b/src/ciscocertificateenrollmentfinishwidgetbase.ui @@ -1,6 +1,6 @@ CiscoCertificateEnrollmentFinishWidgetBase - + CiscoCertificateEnrollmentFinishWidgetBase @@ -19,7 +19,7 @@ unnamed - + SucessTextLabel diff --git a/src/ciscopasswddecoder.cpp b/src/ciscopasswddecoder.cpp index f4d98bb..3529373 100644 --- a/src/ciscopasswddecoder.cpp +++ b/src/ciscopasswddecoder.cpp @@ -20,12 +20,12 @@ ***************************************************************************/ #include "ciscopasswddecoder.h" -#include -#include +#include +#include #include #include -CiscoPasswdDecoder::CiscoPasswdDecoder(QString& profileFile) +CiscoPasswdDecoder::CiscoPasswdDecoder(TQString& profileFile) { profile = profileFile; } @@ -34,14 +34,14 @@ CiscoPasswdDecoder::~CiscoPasswdDecoder() {} /* read hex strings for "enc_GroupPwd" and "enc_UserPassword" from profile file */ -void CiscoPasswdDecoder::readProfileData(QString& profile, QString& userData, QString& groupData) +void CiscoPasswdDecoder::readProfileData(TQString& profile, TQString& userData, TQString& groupData) { - QFile PcfFile(profile); - QTextStream stream ( &PcfFile ); + TQFile PcfFile(profile); + TQTextStream stream ( &PcfFile ); if ( PcfFile.open(IO_ReadOnly)) { - QString line = ""; + TQString line = ""; while ( !stream.atEnd() ) { line = stream.readLine(); // line of text excluding '\n' and replace all white chars with one blank @@ -72,13 +72,13 @@ int CiscoPasswdDecoder::hex2bin_c(unsigned int c) return -1; } -int CiscoPasswdDecoder::hex2bin(QString str, QString& bin, int& len) +int CiscoPasswdDecoder::hex2bin(TQString str, TQString& bin, int& len) { -QString p; +TQString p; int i, l; for (i = 0; str[i] != '\0'; i++) - if (hex2bin_c(QChar(str[i]).unicode()) == -1) + if (hex2bin_c(TQChar(str[i]).tqunicode()) == -1) return EINVAL; l = i; @@ -87,7 +87,7 @@ QString p; l /= 2; for (i = 0; i < l; i++) - p+= hex2bin_c(QChar(str[i*2]).unicode()) << 4 | hex2bin_c(QChar(str[i*2+1]).unicode()); + p+= hex2bin_c(TQChar(str[i*2]).tqunicode()) << 4 | hex2bin_c(TQChar(str[i*2+1]).tqunicode()); bin = p; if (len) @@ -96,9 +96,9 @@ QString p; return 0; } -int CiscoPasswdDecoder::c_decrypt(QString ct, int len, char **resp, int reslenp) +int CiscoPasswdDecoder::c_decrypt(TQString ct, int len, char **resp, int reslenp) { - QString h1 = ct; + TQString h1 = ct; const char *h4 = ct.ascii() + 20; const char *enc = ct.ascii() + 40; @@ -149,13 +149,13 @@ int CiscoPasswdDecoder::c_decrypt(QString ct, int len, char **resp, int reslenp) return 0; } -bool CiscoPasswdDecoder::decodePasswords(QString& userPasswd, QString& groupPasswd) +bool CiscoPasswdDecoder::decodePasswords(TQString& userPasswd, TQString& groupPasswd) { - QString encUserPasswd=""; - QString encGroupPasswd=""; + TQString encUserPasswd=""; + TQString encGroupPasswd=""; int i, len, ret = 0; char *pw, *pw2; - QString bin,bin2; + TQString bin,bin2; int len2=0; bool success=true; @@ -182,10 +182,10 @@ bool CiscoPasswdDecoder::decodePasswords(QString& userPasswd, QString& groupPass else { // printf("groupPasswd: %s\n", pw); -// std::cout << "groupPasswd: " << QString::fromLocal8Bit(pw) << std::endl; +// std::cout << "groupPasswd: " << TQString::fromLocal8Bit(pw) << std::endl; - groupPasswd = QString::fromLocal8Bit(pw); + groupPasswd = TQString::fromLocal8Bit(pw); //free(pw); } } @@ -212,8 +212,8 @@ bool CiscoPasswdDecoder::decodePasswords(QString& userPasswd, QString& groupPass { // // printf("userPasswd: %s\n", pw2); -// std::cout << "userPasswd " << QString::fromLocal8Bit(pw2) << std::endl; - userPasswd = QString::fromLocal8Bit(pw2); +// std::cout << "userPasswd " << TQString::fromLocal8Bit(pw2) << std::endl; + userPasswd = TQString::fromLocal8Bit(pw2); //free(pw); diff --git a/src/ciscopasswddecoder.h b/src/ciscopasswddecoder.h index f73f702..392a667 100644 --- a/src/ciscopasswddecoder.h +++ b/src/ciscopasswddecoder.h @@ -23,8 +23,8 @@ #include #include #include -#include -// #include +#include +// #include #include #include @@ -41,16 +41,16 @@ using namespace std; class CiscoPasswdDecoder { public: - CiscoPasswdDecoder(QString& profileFile); + CiscoPasswdDecoder(TQString& profileFile); ~CiscoPasswdDecoder(); - bool decodePasswords(QString& userPasswd, QString& groupPasswd); + bool decodePasswords(TQString& userPasswd, TQString& groupPasswd); private: - void readProfileData(QString& profile, QString& userData, QString& groupData); - QString profile; + void readProfileData(TQString& profile, TQString& userData, TQString& groupData); + TQString profile; int hex2bin_c(unsigned int c); - int hex2bin(QString str, QString& bin, int& len); - int c_decrypt(QString ct, int len, char **resp, int reslenp); + int hex2bin(TQString str, TQString& bin, int& len); + int c_decrypt(TQString ct, int len, char **resp, int reslenp); }; diff --git a/src/configconnectoptions.cpp b/src/configconnectoptions.cpp index e0cddfe..887bcda 100644 --- a/src/configconnectoptions.cpp +++ b/src/configconnectoptions.cpp @@ -18,23 +18,23 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ #include "configconnectoptions.h" -#include +#include #include #include -ConfigConnectOptions::ConfigConnectOptions(QWidget *parent) : ConfigConnectOptionsBase(parent) +ConfigConnectOptions::ConfigConnectOptions(TQWidget *parent) : ConfigConnectOptionsBase(parent) { dialogModified=false; // connect changed signals to own signal - connect(AutoConnectProfileComboBox,SIGNAL(textChanged ( const QString & )),this,SIGNAL(changed())); - connect(checkMinimizeAfterConnectCheck,SIGNAL(stateChanged ( int )),this,SIGNAL(changed())); - connect(SilentQuitcheckBox,SIGNAL(stateChanged ( int )),this,SIGNAL(changed())); - connect(DoAutoConnectCheckBox,SIGNAL(stateChanged ( int )),this,SIGNAL(changed())); + connect(AutoConnectProfileComboBox,TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SIGNAL(changed())); + connect(checkMinimizeAfterConnectCheck,TQT_SIGNAL(stateChanged ( int )),this,TQT_SIGNAL(changed())); + connect(SilentQuitcheckBox,TQT_SIGNAL(stateChanged ( int )),this,TQT_SIGNAL(changed())); + connect(DoAutoConnectCheckBox,TQT_SIGNAL(stateChanged ( int )),this,TQT_SIGNAL(changed())); // connect changed to slot - connect(this,SIGNAL(changed ()),this,SLOT(dialogChanged())); + connect(this,TQT_SIGNAL(changed ()),this,TQT_SLOT(dialogChanged())); } diff --git a/src/configconnectoptions.h b/src/configconnectoptions.h index 2d6fef0..0ab200b 100644 --- a/src/configconnectoptions.h +++ b/src/configconnectoptions.h @@ -21,7 +21,7 @@ #define CONFIGCONNECTOPTIONS_H #include "configconnectoptionsbase.h" -#include +#include /** @author Christoph Thielecke @@ -29,8 +29,9 @@ class ConfigConnectOptions : public ConfigConnectOptionsBase { Q_OBJECT + TQ_OBJECT public: - ConfigConnectOptions(QWidget *parent); + ConfigConnectOptions(TQWidget *parent); ~ConfigConnectOptions(); bool dialogModified; diff --git a/src/configconnectoptionsbase.ui b/src/configconnectoptionsbase.ui index ea6fe7b..eb15636 100644 --- a/src/configconnectoptionsbase.ui +++ b/src/configconnectoptionsbase.ui @@ -1,6 +1,6 @@ ConfigConnectOptionsBase - + ConfigConnectOptionsBase @@ -19,15 +19,15 @@ unnamed - + - layout10 + tqlayout10 unnamed - + checkMinimizeAfterConnectCheck @@ -65,7 +65,7 @@ Expanding - + 154 20 @@ -74,15 +74,15 @@ - + - layout11 + tqlayout11 unnamed - + SilentQuitcheckBox @@ -115,7 +115,7 @@ about the active connecions Expanding - + 210 20 @@ -134,22 +134,22 @@ about the active connecions Expanding - + 41 16 - + - layout12 + tqlayout12 unnamed - + DoAutoConnectCheckBox @@ -176,7 +176,7 @@ about the active connecions Expanding - + 59 20 @@ -209,9 +209,9 @@ about the active connecions DoAutoConnectCheckBox AutoConnectProfileComboBox - + autoConnectToggled(bool) - + kcombobox.h diff --git a/src/configdaemonoptions.cpp b/src/configdaemonoptions.cpp index 6936021..8f76f63 100644 --- a/src/configdaemonoptions.cpp +++ b/src/configdaemonoptions.cpp @@ -23,23 +23,23 @@ #include "configdaemonoptions.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include -#include -#include -#include +#include +#include +#include #include #include "widgetnotifyhelper.h" -#include +#include //END INCLUDES @@ -47,7 +47,7 @@ * Constructs a ConfigDaemonOptions as a child of 'parent', with the * name 'name' and widget flags set to 'f'. */ -ConfigDaemonOptions::ConfigDaemonOptions( QWidget* parent) : ConfigDaemonOptionsBase( parent) +ConfigDaemonOptions::ConfigDaemonOptions( TQWidget* parent) : ConfigDaemonOptionsBase( parent) { WidgetNotifyHelper h; h.setupChangedAction(this); diff --git a/src/configdaemonoptions.h b/src/configdaemonoptions.h index 3f397e0..2002342 100644 --- a/src/configdaemonoptions.h +++ b/src/configdaemonoptions.h @@ -22,14 +22,15 @@ #define CONFIGDAEMONOPTIONS_H #include "configdaemonoptionsbase.h" -#include +#include class ConfigDaemonOptions : public ConfigDaemonOptionsBase { Q_OBJECT + TQ_OBJECT public: - ConfigDaemonOptions( QWidget* parent); + ConfigDaemonOptions( TQWidget* parent); ~ConfigDaemonOptions(); bool dialogModified; diff --git a/src/configdaemonoptionsbase.ui b/src/configdaemonoptionsbase.ui index 9e8f502..315ebae 100644 --- a/src/configdaemonoptionsbase.ui +++ b/src/configdaemonoptionsbase.ui @@ -1,6 +1,6 @@ ConfigDaemonOptionsBase - + ConfigDaemonOptionsBase @@ -27,31 +27,31 @@ unnamed - + - layout154 + tqlayout154 unnamed - + - layout153 + tqlayout153 unnamed - + - layout39 + tqlayout39 unnamed - + ProgramsInPathcheckBox @@ -81,14 +81,14 @@ Expanding - + 71 31 - + ShowInterfaceIPinTooltipCheckBox @@ -107,7 +107,7 @@ - + groupBox7 @@ -121,23 +121,23 @@ unnamed - + - layout7 + tqlayout7 unnamed - + - layout6 + tqlayout6 unnamed - + textLabel1_4_2_2_2 @@ -158,14 +158,14 @@ Expanding - + 20 20 - + VpncVersionLineEdit @@ -177,7 +177,7 @@ 0 - + 32767 32767 @@ -197,7 +197,7 @@ true - + 250 0 @@ -207,7 +207,7 @@ Program path - + VpncStatePixmapLabel @@ -217,7 +217,7 @@ true - + AlignJustify|AlignVCenter @@ -226,15 +226,15 @@ - + - layout4 + tqlayout4 unnamed - + textLabel1_3_2 @@ -248,7 +248,7 @@ Debug level of the program. Increase to show more verbose debug output of program. This is helpful if you have any trouble with your VPN connection. - + spinVpncDebugLevel @@ -281,7 +281,7 @@ Expanding - + 16 20 @@ -294,7 +294,7 @@ - + groupBox7_2 @@ -308,23 +308,23 @@ unnamed - + - layout7_2 + tqlayout7_2 unnamed - + - layout6_2 + tqlayout6_2 unnamed - + textLabel1_4_2_2_2_2 @@ -345,14 +345,14 @@ Expanding - + 20 20 - + CiscoVpncVersionLineEdit @@ -364,7 +364,7 @@ 0 - + 32767 32767 @@ -384,7 +384,7 @@ true - + 250 0 @@ -394,7 +394,7 @@ Program path - + CiscoVpncStatePixmapLabel @@ -404,7 +404,7 @@ true - + AlignJustify|AlignVCenter @@ -413,15 +413,15 @@ - + - layout4_2 + tqlayout4_2 unnamed - + textLabel1_3_2_3 @@ -435,7 +435,7 @@ Debug level of the program. Increase to show more verbose debug output of program. This is helpful if you have any trouble with your VPN connection. - + spinCiscoVpncDebugLevel_2 @@ -468,7 +468,7 @@ Expanding - + 16 20 @@ -481,7 +481,7 @@ - + groupBox8_2_2 @@ -495,23 +495,23 @@ unnamed - + - layout15 + tqlayout15 unnamed - + - layout8 + tqlayout8 unnamed - + textLabel1_4_2_2 @@ -532,14 +532,14 @@ Expanding - + 60 20 - + IpsecVersionLineEdit @@ -551,7 +551,7 @@ 0 - + 32767 32767 @@ -571,7 +571,7 @@ true - + 250 0 @@ -581,7 +581,7 @@ Program path - + IpsecStatePixmapLabel @@ -591,7 +591,7 @@ true - + AlignJustify|AlignVCenter @@ -602,15 +602,15 @@ - + - layout162 + tqlayout162 unnamed - + PlutoGroupBox @@ -621,23 +621,23 @@ unnamed - + - layout158 + tqlayout158 unnamed - + - layout157 + tqlayout157 unnamed - + IpsecCryptDebugCheckBox @@ -654,7 +654,7 @@ Enable this to show debug output of program. <br>This is helpful if you have any trouble with your VPN connection. - + IpsecPrivateDebugCheckBox @@ -671,7 +671,7 @@ Enable this to show debug output of program. <br>This is helpful if you have any trouble with your VPN connection. - + IpsecKlipsDebugCheckBox @@ -688,7 +688,7 @@ Enable this to show debug output of program. <br>This is helpful if you have any trouble with your VPN connection. - + IpsecEmittingDebugCheckBox @@ -705,7 +705,7 @@ Enable this to show debug output of program. <br>This is helpful if you have any trouble with your VPN connection. - + IpsecRawDebugCheckBox @@ -722,7 +722,7 @@ Enable this to show debug output of program. <br>This is helpful if you have any trouble with your VPN connection. - + IpsecControlDebugCheckBox @@ -739,7 +739,7 @@ Enable this to show debug output of program. <br>This is helpful if you have any trouble with your VPN connection. - + IpsecParsingDebugCheckBox @@ -762,7 +762,7 @@ - + KlipsGroupBox @@ -773,31 +773,31 @@ unnamed - + - layout161 + tqlayout161 unnamed - + - layout160 + tqlayout160 unnamed - + - layout159 + tqlayout159 unnamed - + KlipsDebugSpiCheckBox @@ -808,7 +808,7 @@ - + KlipsDebugAhCheckBox @@ -819,7 +819,7 @@ - + KlipsDebugEspCheckBox @@ -830,7 +830,7 @@ - + KlipsDebugErouteCheckBox @@ -841,7 +841,7 @@ - + KlipsDebugPfkeyCheckBox @@ -852,7 +852,7 @@ - + KlipsDebugRadijCheckBox @@ -863,7 +863,7 @@ - + KlipsDebugVerboseCheckBox @@ -874,7 +874,7 @@ - + KlipsDebugIpcompCheckBox @@ -885,7 +885,7 @@ - + KlipsDebugXformCheckBox @@ -896,7 +896,7 @@ - + KlipsDebugTunnel_xmitCheckBox @@ -919,7 +919,7 @@ - + groupBox8 @@ -936,17 +936,17 @@ unnamed - + - layout71 + tqlayout71 unnamed - + - layout10 + tqlayout10 @@ -959,7 +959,7 @@ true - + 250 0 @@ -979,14 +979,14 @@ Expanding - + 87 20 - + textLabel1_4 @@ -994,7 +994,7 @@ racoon/setkey - + RacoonVersionLineEdit @@ -1006,7 +1006,7 @@ 0 - + 32767 32767 @@ -1019,7 +1019,7 @@ Version information for the program - + RacoonStatePixmapLabel @@ -1029,7 +1029,7 @@ true - + AlignJustify|AlignVCenter @@ -1038,23 +1038,23 @@ - + - layout70 + tqlayout70 unnamed - + - layout69 + tqlayout69 unnamed - + textLabel1_3_2_2 @@ -1081,9 +1081,9 @@ - + - layout68 + tqlayout68 @@ -1099,14 +1099,14 @@ Expanding - + 117 20 - + DoKillRacoonIfStillRunningCheckBox @@ -1125,7 +1125,7 @@ - + groupBox8_2_3_2 @@ -1142,15 +1142,15 @@ unnamed - + - layout13 + tqlayout13 unnamed - + textLabel1_4_2_3_2 @@ -1171,14 +1171,14 @@ Expanding - + 82 20 - + PppdVersionLineEdit @@ -1190,7 +1190,7 @@ 0 - + 32767 32767 @@ -1210,7 +1210,7 @@ true - + 250 0 @@ -1220,7 +1220,7 @@ Program path - + PppdStatePixmapLabel @@ -1230,7 +1230,7 @@ true - + AlignJustify|AlignVCenter @@ -1239,15 +1239,15 @@ - + - layout13_2 + tqlayout13_2 unnamed - + textLabel1_4_2_3_2_3 @@ -1268,14 +1268,14 @@ Expanding - + 82 20 - + PptpVersionLineEdit @@ -1287,7 +1287,7 @@ 0 - + 32767 32767 @@ -1307,7 +1307,7 @@ true - + 250 0 @@ -1317,7 +1317,7 @@ Program path - + PptpStatePixmapLabel @@ -1327,7 +1327,7 @@ true - + AlignJustify|AlignVCenter @@ -1336,23 +1336,23 @@ - + - layout36 + tqlayout36 unnamed - + - layout34 + tqlayout34 unnamed - + DebugPppdcheckBox @@ -1379,7 +1379,7 @@ Expanding - + 51 21 @@ -1388,15 +1388,15 @@ - + - layout33 + tqlayout33 unnamed - + DebugPptpdcheckBox @@ -1423,7 +1423,7 @@ Expanding - + 31 21 @@ -1434,15 +1434,15 @@ - + - layout56 + tqlayout56 unnamed - + PppdKernelLogLevelTextLabel @@ -1484,9 +1484,9 @@ - + - layout57 + tqlayout57 @@ -1502,14 +1502,14 @@ Expanding - + 80 21 - + textLabel1_3_2_2_3 @@ -1553,7 +1553,7 @@ - + groupBox8_2_3_2_2 @@ -1567,23 +1567,23 @@ unnamed - + - layout18 + tqlayout18 unnamed - + - layout16 + tqlayout16 unnamed - + textLabel1_4_2_3_2_2 @@ -1604,14 +1604,14 @@ Expanding - + 87 20 - + OpenvpnVersionLineEdit @@ -1623,7 +1623,7 @@ 0 - + 32767 32767 @@ -1643,7 +1643,7 @@ true - + 250 0 @@ -1653,7 +1653,7 @@ Program path - + OpenvpnStatePixmapLabel @@ -1663,7 +1663,7 @@ true - + AlignJustify|AlignVCenter @@ -1672,15 +1672,15 @@ - + - layout17 + tqlayout17 unnamed - + textLabel1_3_2_2_2 @@ -1694,7 +1694,7 @@ Debug level of the program. Increase to show more verbose debug output of program. This is helpful if you have any trouble with your VPN connection. - + spinOpenvpnDebugLevel @@ -1727,7 +1727,7 @@ Expanding - + 151 20 @@ -1740,7 +1740,7 @@ - + groupBox8_2_3_2_2_2 @@ -1754,23 +1754,23 @@ unnamed - + - layout36 + tqlayout36 unnamed - + - layout16_2 + tqlayout16_2 unnamed - + textLabel1_4_2_3_2_2_2 @@ -1791,14 +1791,14 @@ Expanding - + 87 20 - + L2tpdVersionLineEdit @@ -1810,7 +1810,7 @@ 0 - + 32767 32767 @@ -1830,7 +1830,7 @@ true - + 250 0 @@ -1840,7 +1840,7 @@ Program path - + L2tpdStatePixmapLabel @@ -1850,7 +1850,7 @@ true - + AlignJustify|AlignVCenter @@ -1859,15 +1859,15 @@ - + - layout35 + tqlayout35 unnamed - + DebugL2tpdCheckBox @@ -1884,7 +1884,7 @@ Enable this to show debug output of program. <br>This is helpful if you have any trouble with your VPN connection. - + DoKillL2tpdIfStillRunningCheckBox @@ -1901,7 +1901,7 @@ - + groupBox8_2_3_2_2_2_2 @@ -1915,15 +1915,15 @@ unnamed - + - layout16_2_2 + tqlayout16_2_2 unnamed - + textLabel1_4_2_3_2_2_2_2 @@ -1944,14 +1944,14 @@ Expanding - + 87 20 - + Xl2tpdVersionLineEdit @@ -1963,7 +1963,7 @@ 0 - + 32767 32767 @@ -1983,7 +1983,7 @@ true - + 250 0 @@ -1993,7 +1993,7 @@ Program path - + Xl2tpdStatePixmapLabel @@ -2003,7 +2003,7 @@ true - + AlignJustify|AlignVCenter @@ -2012,23 +2012,23 @@ - + - layout37 + tqlayout37 unnamed - + - layout65_2 + tqlayout65_2 unnamed - + DoKillXl2tpdIfStillRunningCheckBox @@ -2043,15 +2043,15 @@ - + - layout37 + tqlayout37 unnamed - + EnableDebugXl2tpdstateCheckBox @@ -2062,7 +2062,7 @@ - + EnableDebugXl2tpdtunnelCheckBox @@ -2073,7 +2073,7 @@ - + EnableDebugXl2tpdpacketCheckBox @@ -2084,7 +2084,7 @@ - + EnableDebugXl2tpdNetworkCheckBox @@ -2099,7 +2099,7 @@ - + groupBox8_2_3_2_2_2_3 @@ -2113,23 +2113,23 @@ unnamed - + - layout36_2 + tqlayout36_2 unnamed - + - layout16_2_3 + tqlayout16_2_3 unnamed - + textLabel1_4_2_3_2_2_2_3 @@ -2150,14 +2150,14 @@ Expanding - + 87 20 - + Openl2tpVersionLineEdit @@ -2169,7 +2169,7 @@ 0 - + 32767 32767 @@ -2189,7 +2189,7 @@ true - + 250 0 @@ -2199,7 +2199,7 @@ Program path - + Openl2tpStatePixmapLabel @@ -2209,7 +2209,7 @@ true - + AlignJustify|AlignVCenter @@ -2218,15 +2218,15 @@ - + - layout35_2 + tqlayout35_2 unnamed - + DebugOpenl2tpCheckBox @@ -2252,7 +2252,7 @@ - + groupBox8_2_3_2_2_2_2_2 @@ -2266,15 +2266,15 @@ unnamed - + - layout16_2_2_2 + tqlayout16_2_2_2 unnamed - + textLabel1_4_2_3_2_2_2_2_2 @@ -2295,14 +2295,14 @@ Expanding - + 87 20 - + VtunVersionLineEdit @@ -2314,7 +2314,7 @@ 0 - + 32767 32767 @@ -2334,7 +2334,7 @@ true - + 250 0 @@ -2344,7 +2344,7 @@ Program path - + VtundStatePixmapLabel @@ -2354,7 +2354,7 @@ true - + AlignJustify|AlignVCenter @@ -2365,7 +2365,7 @@ - + groupBox8_2_3_2_2_2_2_2_2 @@ -2379,23 +2379,23 @@ unnamed - + - layout140 + tqlayout140 unnamed - + - layout16_2_2_2_2 + tqlayout16_2_2_2_2 unnamed - + textLabel1_4_2_3_2_2_2_2_2_2 @@ -2416,14 +2416,14 @@ Expanding - + 87 20 - + SshVersionLineEdit @@ -2435,7 +2435,7 @@ 0 - + 32767 32767 @@ -2455,7 +2455,7 @@ true - + 250 0 @@ -2465,7 +2465,7 @@ Program path - + SshStatePixmapLabel @@ -2475,7 +2475,7 @@ true - + AlignJustify|AlignVCenter @@ -2484,15 +2484,15 @@ - + - layout139 + tqlayout139 unnamed - + textLabel1_3_2_2_2_2 @@ -2506,7 +2506,7 @@ Debug level of the program. Increase to show more verbose debug output of program. This is helpful if you have any trouble with your VPN connection. - + spinSshDebugLevel @@ -2539,7 +2539,7 @@ Expanding - + 365 20 @@ -2562,7 +2562,7 @@ Expanding - + 20 16 @@ -2581,7 +2581,7 @@ Expanding - + 16 21 @@ -2625,9 +2625,9 @@ OpenvpnPathInput spinOpenvpnDebugLevel - + programsInPathToggled(bool) - + kurlrequester.h diff --git a/src/configdebugoptions.cpp b/src/configdebugoptions.cpp index e5402b5..a705feb 100644 --- a/src/configdebugoptions.cpp +++ b/src/configdebugoptions.cpp @@ -22,7 +22,7 @@ #include -ConfigDebugOptions::ConfigDebugOptions(QWidget *parent, const QString& caption): ConfigDebugOptionsBase(parent) +ConfigDebugOptions::ConfigDebugOptions(TQWidget *parent, const TQString& caption): ConfigDebugOptionsBase(parent) { WidgetNotifyHelper h; h.setupChangedAction(this); diff --git a/src/configdebugoptions.h b/src/configdebugoptions.h index b3eee36..3584ff6 100644 --- a/src/configdebugoptions.h +++ b/src/configdebugoptions.h @@ -22,7 +22,7 @@ #include "configdebugoptionsbase.h" #include -#include +#include /** @author Christoph Thielecke @@ -30,8 +30,9 @@ class ConfigDebugOptions : public ConfigDebugOptionsBase { Q_OBJECT + TQ_OBJECT public: - ConfigDebugOptions(QWidget *parent, const QString& caption); + ConfigDebugOptions(TQWidget *parent, const TQString& caption); ~ConfigDebugOptions(); bool dialogModified; diff --git a/src/configdebugoptionsbase.ui b/src/configdebugoptionsbase.ui index efc0a65..274a5ce 100644 --- a/src/configdebugoptionsbase.ui +++ b/src/configdebugoptionsbase.ui @@ -1,6 +1,6 @@ ConfigDebugOptionsBase - + ConfigDebugOptionsBase @@ -27,15 +27,15 @@ unnamed - + - layout7 + tqlayout7 unnamed - + showDebugCheck @@ -62,7 +62,7 @@ Expanding - + 110 20 @@ -71,15 +71,15 @@ - + - layout8 + tqlayout8 unnamed - + WriteLogCheck @@ -106,7 +106,7 @@ Expanding - + 170 20 @@ -115,15 +115,15 @@ - + - layout9 + tqlayout9 unnamed - + spinKvpncDebugLevel @@ -146,7 +146,7 @@ Debug level of the KVpnc program. <br>Increase to show more verbose debug output of KVpnc. <br>This is helpful if you have any trouble with using KVpnc. - + textLabel1_3_2_3 @@ -170,7 +170,7 @@ Expanding - + 150 20 @@ -179,15 +179,15 @@ - + - layout10 + tqlayout10 unnamed - + KeepConnectionFilesCheckBox @@ -211,7 +211,7 @@ Expanding - + 110 20 @@ -230,7 +230,7 @@ Expanding - + 20 21 diff --git a/src/configgeneraloptions.ui b/src/configgeneraloptions.ui index 9c202a4..fbcef37 100644 --- a/src/configgeneraloptions.ui +++ b/src/configgeneraloptions.ui @@ -1,6 +1,6 @@ ConfigGeneralOptions - + ConfigGeneralOptions @@ -27,9 +27,9 @@ unnamed - + - layout9 + tqlayout9 @@ -37,23 +37,23 @@ - + - layout9 + tqlayout9 unnamed - + - layout7 + tqlayout7 unnamed - + useKwalletCheckBox @@ -80,7 +80,7 @@ Expanding - + 110 20 @@ -89,15 +89,15 @@ - + - layout11 + tqlayout11 unnamed - + DontQuitOnCloseEventCheckBox @@ -121,7 +121,7 @@ Expanding - + 16 20 @@ -130,15 +130,15 @@ - + - layout11_2 + tqlayout11_2 unnamed - + HideOnStartupCheckBox @@ -162,7 +162,7 @@ Expanding - + 16 20 @@ -181,7 +181,7 @@ Expanding - + 20 80 @@ -192,8 +192,8 @@ - + useKwalletToggled(bool) - + diff --git a/src/confighelperprogramoptions.cpp b/src/confighelperprogramoptions.cpp index d82ab34..49ead5e 100644 --- a/src/confighelperprogramoptions.cpp +++ b/src/confighelperprogramoptions.cpp @@ -21,7 +21,7 @@ #include "widgetnotifyhelper.h" #include -ConfigHelperProgramOptions::ConfigHelperProgramOptions(QWidget *parent) +ConfigHelperProgramOptions::ConfigHelperProgramOptions(TQWidget *parent) : ConfigHelperProgramOptionsBase(parent) { WidgetNotifyHelper h; diff --git a/src/confighelperprogramoptions.h b/src/confighelperprogramoptions.h index 54f0631..3bb9470 100644 --- a/src/confighelperprogramoptions.h +++ b/src/confighelperprogramoptions.h @@ -21,7 +21,7 @@ #define CONFIGHELPERPROGRAMOPTIONS_H #include "confighelperprogramoptionsbase.h" -#include +#include /** @author Christoph Thielecke @@ -29,8 +29,9 @@ class ConfigHelperProgramOptions : public ConfigHelperProgramOptionsBase { Q_OBJECT + TQ_OBJECT public: - ConfigHelperProgramOptions(QWidget *parent); + ConfigHelperProgramOptions(TQWidget *parent); ~ConfigHelperProgramOptions(); bool dialogModified; diff --git a/src/confighelperprogramoptionsbase.ui b/src/confighelperprogramoptionsbase.ui index 09d8012..9ee6be2 100644 --- a/src/confighelperprogramoptionsbase.ui +++ b/src/confighelperprogramoptionsbase.ui @@ -1,6 +1,6 @@ ConfigHelperProgramOptionsBase - + ConfigHelperProgramOptionsBase @@ -22,31 +22,31 @@ unnamed - + - layout233 + tqlayout233 unnamed - + - layout232 + tqlayout232 unnamed - + - layout21 + tqlayout21 unnamed - + textLabel1_4_2_3_4_5 @@ -67,7 +67,7 @@ Expanding - + 146 20 @@ -76,11 +76,11 @@ - + IptablesStatePixmapLabel - + 22 22 @@ -96,7 +96,7 @@ Program availability (found or not found) - + textLabel1_4_2_4 @@ -107,7 +107,7 @@ <b>Path</b> - + IptablesVersionLineEdit @@ -119,7 +119,7 @@ 0 - + 32767 32767 @@ -139,7 +139,7 @@ true - + 250 0 @@ -149,11 +149,11 @@ Program path - + KillStatePixmapLabel - + 22 22 @@ -169,7 +169,7 @@ Program availability (found or not found) - + OpensslVersionLineEdit @@ -181,7 +181,7 @@ 0 - + 32767 32767 @@ -194,11 +194,11 @@ Version information for the program - + IpStatePixmapLabel - + 22 22 @@ -214,7 +214,7 @@ Program availability (found or not found) - + CiscoCertMgrVersionLineEdit @@ -226,7 +226,7 @@ 0 - + 32767 32767 @@ -239,15 +239,15 @@ Version information for the program - + - layout23 + tqlayout23 unnamed - + textLabel1_4_2_3_4_6_2 @@ -268,7 +268,7 @@ Expanding - + 146 16 @@ -284,7 +284,7 @@ true - + 250 0 @@ -294,11 +294,11 @@ Program path - + OpensslStatePixmapLabel - + 22 22 @@ -314,15 +314,15 @@ Program availability (found or not found) - + - layout24 + tqlayout24 unnamed - + textLabel1_4_2_3_4_6_2_2 @@ -343,7 +343,7 @@ Expanding - + 146 16 @@ -352,7 +352,7 @@ - + IpVersionLineEdit @@ -364,7 +364,7 @@ 0 - + 32767 32767 @@ -377,7 +377,7 @@ Version information for the program - + GnomeaskpassVersionLineEdit @@ -389,7 +389,7 @@ 0 - + 32767 32767 @@ -402,15 +402,15 @@ Version information for the program - + - layout19 + tqlayout19 unnamed - + textLabel1_4_2_3_4_2 @@ -431,7 +431,7 @@ Expanding - + 146 20 @@ -447,7 +447,7 @@ true - + 250 0 @@ -457,11 +457,11 @@ Program path - + Pkcs11ToolStatePixmapLabel - + 22 22 @@ -477,15 +477,15 @@ Program availability (found or not found) - + - layout24_2_2 + tqlayout24_2_2 unnamed - + textLabel1_4_2_3_4_6_2_2_2_2 @@ -506,7 +506,7 @@ Expanding - + 146 16 @@ -515,15 +515,15 @@ - + - layout24_2_3 + tqlayout24_2_3 unnamed - + textLabel1_4_2_3_4_6_2_2_2_3 @@ -544,7 +544,7 @@ Expanding - + 146 16 @@ -560,7 +560,7 @@ true - + 250 0 @@ -577,7 +577,7 @@ true - + 250 0 @@ -587,15 +587,15 @@ Program path - + - layout15 + tqlayout15 unnamed - + textLabel1_4_2 @@ -616,7 +616,7 @@ Expanding - + 146 20 @@ -625,11 +625,11 @@ - + KsshaskpassStatePixmapLabel - + 22 22 @@ -645,7 +645,7 @@ Program availability (found or not found) - + TailVersionLineEdit @@ -657,7 +657,7 @@ 0 - + 32767 32767 @@ -670,7 +670,7 @@ Version information for the program - + PingVersionLineEdit @@ -682,7 +682,7 @@ 0 - + 32767 32767 @@ -695,15 +695,15 @@ Version information for the program - + - layout18 + tqlayout18 unnamed - + textLabel1_4_2_3_4 @@ -724,7 +724,7 @@ Expanding - + 146 20 @@ -733,11 +733,11 @@ - + CiscoCertMgrStatePixmapLabel - + 22 22 @@ -753,7 +753,7 @@ Program availability (found or not found) - + KillallVersionLineEdit @@ -765,7 +765,7 @@ 0 - + 32767 32767 @@ -778,11 +778,11 @@ Version information for the program - + GnomeaskpassStatePixmapLabel - + 22 22 @@ -798,15 +798,15 @@ Program availability (found or not found) - + - layout22 + tqlayout22 unnamed - + textLabel1_4_2_3_4_6 @@ -827,7 +827,7 @@ Expanding - + 146 16 @@ -843,7 +843,7 @@ true - + 250 0 @@ -853,11 +853,11 @@ Program path - + IfconfigStatePixmapLabel - + 22 22 @@ -873,15 +873,15 @@ Program availability (found or not found) - + - layout25 + tqlayout25 unnamed - + textLabel1_4_2_2 @@ -902,7 +902,7 @@ Expanding - + 146 20 @@ -911,15 +911,15 @@ - + - layout20 + tqlayout20 unnamed - + textLabel1_4_2_3_4_4 @@ -940,7 +940,7 @@ Expanding - + 146 20 @@ -956,7 +956,7 @@ true - + 250 0 @@ -973,7 +973,7 @@ true - + 250 0 @@ -983,15 +983,15 @@ Program path - + - layout16 + tqlayout16 unnamed - + textLabel1_4_2_3_5 @@ -1012,7 +1012,7 @@ Expanding - + 146 20 @@ -1028,7 +1028,7 @@ true - + 250 0 @@ -1038,7 +1038,7 @@ Program path - + KillVersionLineEdit @@ -1050,7 +1050,7 @@ 0 - + 32767 32767 @@ -1070,7 +1070,7 @@ true - + 250 0 @@ -1080,7 +1080,7 @@ Program path - + textLabel1_4_2_3 @@ -1091,7 +1091,7 @@ <b>Version</b> - + KsshaskpassVersionLineEdit @@ -1103,7 +1103,7 @@ 0 - + 32767 32767 @@ -1116,7 +1116,7 @@ Version information for the program - + RouteVersionLineEdit @@ -1128,7 +1128,7 @@ 0 - + 32767 32767 @@ -1141,11 +1141,11 @@ Version information for the program - + TailStatePixmapLabel - + 22 22 @@ -1161,11 +1161,11 @@ Program availability (found or not found) - + KillallStatePixmapLabel - + 22 22 @@ -1181,11 +1181,11 @@ Program availability (found or not found) - + PingStatePixmapLabel - + 22 22 @@ -1201,7 +1201,7 @@ Program availability (found or not found) - + Pkcs11ToolVersionLineEdit @@ -1213,7 +1213,7 @@ 0 - + 32767 32767 @@ -1226,11 +1226,11 @@ Version information for the program - + RouteStatePixmapLabel - + 22 22 @@ -1253,7 +1253,7 @@ true - + 250 0 @@ -1263,7 +1263,7 @@ Program path - + IfconfigVersionLineEdit @@ -1275,7 +1275,7 @@ 0 - + 32767 32767 @@ -1295,7 +1295,7 @@ true - + 250 0 @@ -1312,7 +1312,7 @@ true - + 250 0 @@ -1322,15 +1322,15 @@ Program path - + - layout17 + tqlayout17 unnamed - + textLabel1_4_2_3_3 @@ -1351,7 +1351,7 @@ Expanding - + 146 20 @@ -1360,15 +1360,15 @@ - + - layout24_2 + tqlayout24_2 unnamed - + textLabel1_4_2_3_4_6_2_2_2 @@ -1389,7 +1389,7 @@ Expanding - + 146 16 @@ -1410,7 +1410,7 @@ Expanding - + 31 130 diff --git a/src/configlogoptions.cpp b/src/configlogoptions.cpp index 276f292..97e400c 100644 --- a/src/configlogoptions.cpp +++ b/src/configlogoptions.cpp @@ -19,15 +19,15 @@ ***************************************************************************/ #include "configlogoptions.h" #include -#include -#include -#include -#include +#include +#include +#include +#include #include "widgetnotifyhelper.h" #include -ConfigLogOptions::ConfigLogOptions(QWidget *parent) +ConfigLogOptions::ConfigLogOptions(TQWidget *parent) : ConfigLogOptionsBase(parent) { WidgetNotifyHelper h; diff --git a/src/configlogoptions.h b/src/configlogoptions.h index 9797ddf..e756755 100644 --- a/src/configlogoptions.h +++ b/src/configlogoptions.h @@ -21,8 +21,8 @@ #define CONFIGLOGOPTIONS_H #include "configlogoptionsbase.h" -#include -#include +#include +#include /** @author Christoph Thielecke @@ -30,8 +30,9 @@ class ConfigLogOptions : public ConfigLogOptionsBase { Q_OBJECT + TQ_OBJECT public: - ConfigLogOptions(QWidget *parent); + ConfigLogOptions(TQWidget *parent); ~ConfigLogOptions(); bool dialogModified; @@ -45,12 +46,12 @@ public slots: void backgroundLogColorClicked(); protected: - QColor InfoLogColor; - QColor RemoteLogColor; - QColor ErrorLogColor; - QColor SuccessLogColor; - QColor DebugLogColor; - QColor BackgroundLogColor; + TQColor InfoLogColor; + TQColor RemoteLogColor; + TQColor ErrorLogColor; + TQColor SuccessLogColor; + TQColor DebugLogColor; + TQColor BackgroundLogColor; private slots: void dialogChanged(); diff --git a/src/configlogoptionsbase.ui b/src/configlogoptionsbase.ui index a4d4387..6e3bc31 100644 --- a/src/configlogoptionsbase.ui +++ b/src/configlogoptionsbase.ui @@ -1,6 +1,6 @@ ConfigLogOptionsBase - + ConfigLogOptionsBase @@ -19,23 +19,23 @@ unnamed - + - layout3 + tqlayout3 unnamed - + - layout57_3 + tqlayout57_3 unnamed - + LogFontSizeSpinBox @@ -55,7 +55,7 @@ Font size in the debug console - + LogFontSizetextLabel @@ -76,7 +76,7 @@ Expanding - + 16 20 @@ -85,15 +85,15 @@ - + - layout211 + tqlayout211 unnamed - + UseColorizedLogOutputcheckBox @@ -117,7 +117,7 @@ Expanding - + 61 20 @@ -126,7 +126,7 @@ - + ColorGroupBox @@ -137,7 +137,7 @@ unnamed - + textLabel2_2 @@ -148,11 +148,11 @@ Message type - + RemoteLogLabel - + 25 25 @@ -172,11 +172,11 @@ Sunken - + InfoLogLabel - + 25 25 @@ -199,11 +199,11 @@ 1 - + ErrorLogLabel - + 25 25 @@ -233,7 +233,7 @@ Expanding - + 173 20 @@ -250,7 +250,7 @@ Expanding - + 173 20 @@ -268,7 +268,7 @@ Change color of this message type - + textLabel2_3 @@ -289,7 +289,7 @@ Expanding - + 173 20 @@ -306,14 +306,14 @@ Expanding - + 173 20 - + textLabel2_3_2_2 @@ -360,11 +360,11 @@ Change color of this message type - + SuccessLogLabel - + 25 25 @@ -384,7 +384,7 @@ Sunken - + textLabel2_3_2 @@ -405,7 +405,7 @@ Expanding - + 173 20 @@ -426,11 +426,11 @@ Change color of this message type - + DebugLogLabel - + 25 25 @@ -450,7 +450,7 @@ Sunken - + textLabel2_3_2_3 @@ -471,7 +471,7 @@ Expanding - + 43 20 @@ -492,11 +492,11 @@ Change color of this message type - + BackgroundLogLabel - + 25 25 @@ -516,7 +516,7 @@ Sunken - + textLabel2 @@ -539,7 +539,7 @@ Expanding - + 21 20 @@ -603,7 +603,7 @@ SuccessLogFontPushButton DebugLogFontPushButton - + debugLogColorClicked() errorLogColorClicked() successLogColorClicked() @@ -611,7 +611,7 @@ remoteLogColorClicked() useColorizedLogOutputToggled(bool) backgroundLogColorClicked() - + kpushbutton.h diff --git a/src/debugoutputtextedit.cpp b/src/debugoutputtextedit.cpp index b81a94c..d6857bb 100644 --- a/src/debugoutputtextedit.cpp +++ b/src/debugoutputtextedit.cpp @@ -22,9 +22,9 @@ #include #include #include -#include +#include -DebugOutputTextEdit::DebugOutputTextEdit( QWidget* parent, const char* name) +DebugOutputTextEdit::DebugOutputTextEdit( TQWidget* parent, const char* name) : KTextBrowser( parent, name) { @@ -37,19 +37,19 @@ DebugOutputTextEdit::~DebugOutputTextEdit() delete popup; } -QPopupMenu* DebugOutputTextEdit::createPopupMenu(const QPoint &) +TQPopupMenu* DebugOutputTextEdit::createPopupMenu(const TQPoint &) { - popup = new QPopupMenu(this); - popup->insertItem(i18n("Cut Content"), this, SLOT(cut() ) ); - popup->insertItem(i18n("Copy Content"), this, SLOT(copy() ) ); + popup = new TQPopupMenu(this); + popup->insertItem(i18n("Cut Content"), this, TQT_SLOT(cut() ) ); + popup->insertItem(i18n("Copy Content"), this, TQT_SLOT(copy() ) ); popup->insertSeparator(); - popup->insertItem(i18n("Clear Log Window"), this, SLOT(clear() ) ); + popup->insertItem(i18n("Clear Log Window"), this, TQT_SLOT(clear() ) ); popup->insertSeparator(); return popup; } -void DebugOutputTextEdit::append ( const QString & text ) +void DebugOutputTextEdit::append ( const TQString & text ) { KTextBrowser::append(text); } diff --git a/src/debugoutputtextedit.h b/src/debugoutputtextedit.h index 09bfc08..7e4f965 100644 --- a/src/debugoutputtextedit.h +++ b/src/debugoutputtextedit.h @@ -21,8 +21,8 @@ #define DEBUGOUTPUTTEXTEDIT_H #include -#include -#include +#include +#include /** This class is used for showing log content @@ -32,16 +32,17 @@ This class is used for showing log content class DebugOutputTextEdit : public KTextBrowser { Q_OBJECT + TQ_OBJECT public: - DebugOutputTextEdit( QWidget* parent=0, const char* name=0); + DebugOutputTextEdit( TQWidget* parent=0, const char* name=0); ~DebugOutputTextEdit(); public slots: - QPopupMenu* createPopupMenu(const QPoint & pos); - void append ( const QString & text ); + TQPopupMenu* createPopupMenu(const TQPoint & pos); + void append ( const TQString & text ); private: - QPopupMenu *popup; + TQPopupMenu *popup; }; diff --git a/src/displaycertdialog.cpp b/src/displaycertdialog.cpp index 4264f68..802314b 100644 --- a/src/displaycertdialog.cpp +++ b/src/displaycertdialog.cpp @@ -20,16 +20,16 @@ #include "displaycertdialog.h" #include "klocale.h" #include -#include +#include #include -DisplayCertDialog::DisplayCertDialog(QWidget *parent, const char* caption, KVpncConfig *GlobalConfig) +DisplayCertDialog::DisplayCertDialog(TQWidget *parent, const char* caption, KVpncConfig *GlobalConfig) : KDialogBase ( parent, i18n ( "Certificate data" ).ascii(), true, caption, KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ) { main = new DisplayCertDialogBase ( this ); setMainWidget ( main ); - main->setMinimumSize ( main->sizeHint() ); + main->setMinimumSize ( main->tqsizeHint() ); this->GlobalConfig = GlobalConfig; } @@ -42,7 +42,7 @@ DisplayCertDialog::~DisplayCertDialog() void DisplayCertDialog::parseCertData() { std::cout << "certdatalist" << CertDataList.join (" ") << std::endl; - for ( QStringList::Iterator it = CertDataList.begin(); it != CertDataList.end(); ++it ) { + for ( TQStringList::Iterator it = CertDataList.begin(); it != CertDataList.end(); ++it ) { if (GlobalConfig->KvpncDebugLevel > 2) GlobalConfig->appendLogEntry("[cert data]: "+*it,GlobalConfig->debug); if ((*it).contains("Common Name:")) diff --git a/src/displaycertdialog.h b/src/displaycertdialog.h index a70a1d6..4a7799c 100644 --- a/src/displaycertdialog.h +++ b/src/displaycertdialog.h @@ -24,7 +24,7 @@ #include "kvpncconfig.h" #include "displaycertdialogbase.h" -#include +#include /** @@ -33,7 +33,7 @@ class DisplayCertDialog : public KDialogBase { public: - DisplayCertDialog ( QWidget *parent, const char* caption, KVpncConfig *GlobalConfig ); + DisplayCertDialog ( TQWidget *parent, const char* caption, KVpncConfig *GlobalConfig ); ~DisplayCertDialog(); @@ -43,7 +43,7 @@ class DisplayCertDialog : public KDialogBase public: KVpncConfig *GlobalConfig; void parseCertData(); - QStringList CertDataList; + TQStringList CertDataList; }; diff --git a/src/displaycertdialogbase.ui b/src/displaycertdialogbase.ui index b69b99c..3f09e98 100644 --- a/src/displaycertdialogbase.ui +++ b/src/displaycertdialogbase.ui @@ -1,6 +1,6 @@ DisplayCertDialogBase - + DisplayCertDialogBase @@ -19,23 +19,23 @@ unnamed - + - layout131 + tqlayout131 unnamed - + - layout130 + tqlayout130 unnamed - + CertNameTextLabel @@ -43,15 +43,15 @@ - + - layout62 + tqlayout62 unnamed - + textLabel9 @@ -69,7 +69,7 @@ Expanding - + 31 21 @@ -78,15 +78,15 @@ - + - layout64_2_3 + tqlayout64_2_3 unnamed - + textLabel1_3 @@ -104,7 +104,7 @@ Expanding - + 40 20 @@ -117,7 +117,7 @@ SerialLineEdit - + 350 0 @@ -131,7 +131,7 @@ KeySizeLineEdit - + 350 0 @@ -145,7 +145,7 @@ DomainLineEdit - + 350 0 @@ -155,15 +155,15 @@ true - + - layout64_2_3_2 + tqlayout64_2_3_2 unnamed - + textLabel1_3_2 @@ -181,7 +181,7 @@ Expanding - + 40 20 @@ -194,7 +194,7 @@ EmailLineEdit - + 350 0 @@ -204,15 +204,15 @@ true - + - layout64_2 + tqlayout64_2 unnamed - + textLabel1 @@ -230,7 +230,7 @@ Expanding - + 40 20 @@ -243,7 +243,7 @@ SubjectLineEdit - + 350 0 @@ -253,15 +253,15 @@ true - + - layout64_2_3_3_2 + tqlayout64_2_3_3_2 unnamed - + textLabel1_3_3_2 @@ -279,7 +279,7 @@ Expanding - + 40 20 @@ -288,19 +288,19 @@ - + - layout109 + tqlayout109 unnamed - + textLabel18 - + 150 0 @@ -309,7 +309,7 @@ <b>Data of certificate:</b> - + AlignVCenter @@ -323,7 +323,7 @@ Expanding - + 51 21 @@ -336,7 +336,7 @@ ValidToLineEdit - + 350 0 @@ -346,15 +346,15 @@ true - + - layout63 + tqlayout63 unnamed - + textLabel10 @@ -372,7 +372,7 @@ Expanding - + 31 21 @@ -381,15 +381,15 @@ - + - layout67 + tqlayout67 unnamed - + textLabel14 @@ -407,7 +407,7 @@ Expanding - + 40 20 @@ -416,15 +416,15 @@ - + - layout64 + tqlayout64 unnamed - + textLabel16 @@ -442,7 +442,7 @@ Expanding - + 40 20 @@ -451,15 +451,15 @@ - + - layout65 + tqlayout65 unnamed - + textLabel15 @@ -477,7 +477,7 @@ Expanding - + 40 20 @@ -490,7 +490,7 @@ NameLineEdit - + 350 0 @@ -504,7 +504,7 @@ CompanyLineEdit - + 350 0 @@ -514,15 +514,15 @@ true - + - layout64_2_3_3 + tqlayout64_2_3_3 unnamed - + textLabel1_3_3 @@ -540,7 +540,7 @@ Expanding - + 40 20 @@ -553,7 +553,7 @@ ValidFromLineEdit - + 350 0 @@ -563,15 +563,15 @@ true - + - layout68 + tqlayout68 unnamed - + textLabel11 @@ -589,7 +589,7 @@ Expanding - + 40 20 @@ -602,7 +602,7 @@ IssuerLineEdit - + 350 0 @@ -616,7 +616,7 @@ DepartmentLineEdit - + 350 0 @@ -630,7 +630,7 @@ CountryLineEdit - + 350 0 @@ -640,7 +640,7 @@ true - + CertTypeTextLabel @@ -652,7 +652,7 @@ IpLineEdit - + 350 0 @@ -662,15 +662,15 @@ true - + - layout64_2_2 + tqlayout64_2_2 unnamed - + textLabel1_2 @@ -688,7 +688,7 @@ Expanding - + 40 20 @@ -701,7 +701,7 @@ StateLineEdit - + 350 0 @@ -711,15 +711,15 @@ true - + - layout69 + tqlayout69 unnamed - + textLabel12 @@ -737,7 +737,7 @@ Expanding - + 51 21 @@ -746,15 +746,15 @@ - + - layout62_2 + tqlayout62_2 unnamed - + textLabel9_2 @@ -772,7 +772,7 @@ Expanding - + 31 21 @@ -781,15 +781,15 @@ - + - layout70 + tqlayout70 unnamed - + textLabel13 @@ -807,7 +807,7 @@ Expanding - + 40 20 @@ -828,7 +828,7 @@ Expanding - + 20 30 diff --git a/src/enterpassworddialog.cpp b/src/enterpassworddialog.cpp index 59f74a9..0946d2b 100644 --- a/src/enterpassworddialog.cpp +++ b/src/enterpassworddialog.cpp @@ -19,15 +19,15 @@ ***************************************************************************/ #include "enterpassworddialog.h" -#include +#include #include #include -#include -#include -#include -#include +#include +#include +#include +#include -EnterUsernamePasswordDialog::EnterUsernamePasswordDialog(QWidget *parent, const QString& caption,bool askForGrouppassword, bool askForUsername) : KDialogBase( parent, "Enter_account_data", true, caption, +EnterUsernamePasswordDialog::EnterUsernamePasswordDialog(TQWidget *parent, const TQString& caption,bool askForGrouppassword, bool askForUsername) : KDialogBase( parent, "Enter_account_data", true, caption, KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ) { @@ -36,7 +36,7 @@ EnterUsernamePasswordDialog::EnterUsernamePasswordDialog(QWidget *parent, const main = new EnterUsernamePasswordDialogBase(this); setMainWidget(main); - main->setMinimumSize(main->sizeHint()); + main->setMinimumSize(main->tqsizeHint()); if (!askForGrouppassword) { @@ -55,7 +55,7 @@ EnterUsernamePasswordDialog::EnterUsernamePasswordDialog(QWidget *parent, const if (!askForUsername) main->SaveUsernameCheckBox->hide(); - main->textLabel2->setText( QString(""+i18n( "Enter account data:")+"" )); + main->textLabel2->setText( TQString(""+i18n( "Enter account data:")+"" )); } EnterUsernamePasswordDialog::~ EnterUsernamePasswordDialog() @@ -68,7 +68,7 @@ void EnterUsernamePasswordDialog::accept() { bool ok=true; - QString msg=""; + TQString msg=""; if (askForGrouppassword){ if( main->PSKLineEdit->text().isEmpty()) msg+="\n- "+i18n("PSK"); @@ -83,12 +83,12 @@ void EnterUsernamePasswordDialog::accept() } if (!msg.isEmpty()) { - KMessageBox::sorry( 0, i18n( "All fields must be filled in. Please check:\n%1").arg(msg)); + KMessageBox::sorry( 0, i18n( "All fields must be filled in. Please check:\n%1").tqarg(msg)); ok=false; } if (ok) - QDialog::accept(); + TQDialog::accept(); } diff --git a/src/enterpassworddialog.h b/src/enterpassworddialog.h index cf94567..db0d3b7 100644 --- a/src/enterpassworddialog.h +++ b/src/enterpassworddialog.h @@ -25,8 +25,9 @@ class EnterUsernamePasswordDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - EnterUsernamePasswordDialog(QWidget *parent, const QString& caption,bool askForGrouppassword, bool askForUsername); + EnterUsernamePasswordDialog(TQWidget *parent, const TQString& caption,bool askForGrouppassword, bool askForUsername); ~EnterUsernamePasswordDialog(); public slots: diff --git a/src/enterpassworddialogbase.ui b/src/enterpassworddialogbase.ui index 516d409..e475840 100644 --- a/src/enterpassworddialogbase.ui +++ b/src/enterpassworddialogbase.ui @@ -1,6 +1,6 @@ EnterUsernamePasswordDialogBase - + EnterUsernamePasswordDialogBase @@ -19,15 +19,15 @@ unnamed - + - layout12 + tqlayout12 unnamed - + textLabel2 @@ -35,39 +35,39 @@ - + - layout7 + tqlayout7 unnamed - + - layout6 + tqlayout6 unnamed - + - layout5 + tqlayout5 unnamed - + - layout4 + tqlayout4 unnamed - + LabelUsername @@ -78,7 +78,7 @@ Username for authentication - + LabelGroupPassword @@ -99,14 +99,14 @@ Expanding - + 156 20 - + PasswordEdit @@ -117,7 +117,7 @@ Password for authentication - + IDEdit @@ -144,14 +144,14 @@ Expanding - + 88 20 - + LabelPassword @@ -172,14 +172,14 @@ Expanding - + 156 20 - + LabelID @@ -193,7 +193,7 @@ Username for authentication - + UsernameEdit @@ -207,7 +207,7 @@ - + PSKLineEdit @@ -231,7 +231,7 @@ Expanding - + 156 20 @@ -240,7 +240,7 @@ - + SaveUsernameCheckBox @@ -254,7 +254,7 @@ Save username, shared secret and password <br>in config file or in KWallet - + SavePskCheckBox @@ -268,7 +268,7 @@ Save username, shared secret and password <br>in config file or in KWallet - + SavePasswordCheckBox @@ -294,7 +294,7 @@ Expanding - + 20 16 @@ -313,7 +313,7 @@ Expanding - + 16 21 diff --git a/src/enterxauthinteractivepasscodedialog.cpp b/src/enterxauthinteractivepasscodedialog.cpp index 9ea8562..32d0e3c 100644 --- a/src/enterxauthinteractivepasscodedialog.cpp +++ b/src/enterxauthinteractivepasscodedialog.cpp @@ -19,19 +19,19 @@ ***************************************************************************/ #include "enterxauthinteractivepasscodedialog.h" -#include +#include #include #include -#include -#include -#include +#include +#include +#include -EnterXauthInteractivePasscodeDialog::EnterXauthInteractivePasscodeDialog( QWidget *parent, bool allowEmptyPassword ) : KDialogBase( parent, "Enter Xauth interactive passcode", true, "Enter Xauth interactive passcode", KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true ) { +EnterXauthInteractivePasscodeDialog::EnterXauthInteractivePasscodeDialog( TQWidget *parent, bool allowEmptyPassword ) : KDialogBase( parent, "Enter Xauth interactive passcode", true, "Enter Xauth interactive passcode", KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true ) { Password = ""; this->allowEmptyPassword = allowEmptyPassword; main = new EnterXauthInteractivePasscodeDialogBase( this ); setMainWidget( main ); - main->setMinimumSize( main->sizeHint() ); + main->setMinimumSize( main->tqsizeHint() ); } EnterXauthInteractivePasscodeDialog::~ EnterXauthInteractivePasscodeDialog() { @@ -48,6 +48,6 @@ void EnterXauthInteractivePasscodeDialog::accept() { if ( ok ) { Password = main->PasswordEdit->text(); - QDialog::accept(); + TQDialog::accept(); } } diff --git a/src/enterxauthinteractivepasscodedialog.h b/src/enterxauthinteractivepasscodedialog.h index e11bf35..f8a0bf9 100644 --- a/src/enterxauthinteractivepasscodedialog.h +++ b/src/enterxauthinteractivepasscodedialog.h @@ -25,15 +25,16 @@ class EnterXauthInteractivePasscodeDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - EnterXauthInteractivePasscodeDialog(QWidget *parent, bool allowEmptyPassword=false); + EnterXauthInteractivePasscodeDialog(TQWidget *parent, bool allowEmptyPassword=false); ~EnterXauthInteractivePasscodeDialog(); public slots: void accept(); public: - QString Password; + TQString Password; bool allowEmptyPassword; EnterXauthInteractivePasscodeDialogBase *main; }; diff --git a/src/enterxauthinteractivepasscodedialogbase.ui b/src/enterxauthinteractivepasscodedialogbase.ui index 55ffcd9..8f8c090 100644 --- a/src/enterxauthinteractivepasscodedialogbase.ui +++ b/src/enterxauthinteractivepasscodedialogbase.ui @@ -1,6 +1,6 @@ EnterXauthInteractivePasscodeDialogBase - + EnterXauthInteractivePasscodeDialogBase @@ -19,23 +19,23 @@ unnamed - + - layout138 + tqlayout138 unnamed - + - layout137 + tqlayout137 unnamed - + SavePasswordCheckBox @@ -46,15 +46,15 @@ Alt+W - + - layout136 + tqlayout136 unnamed - + DescriptionLabel @@ -72,7 +72,7 @@ Expanding - + 151 21 @@ -81,9 +81,9 @@ - + - layout5 + tqlayout5 @@ -99,14 +99,14 @@ Expanding - + 83 20 - + PasswordEdit @@ -117,7 +117,7 @@ Xauth passcode for authentication - + LabelPassword @@ -139,7 +139,7 @@ Expanding - + 21 45 diff --git a/src/generateopenvpnkeydialog.cpp b/src/generateopenvpnkeydialog.cpp index 4315668..04e13e9 100644 --- a/src/generateopenvpnkeydialog.cpp +++ b/src/generateopenvpnkeydialog.cpp @@ -23,14 +23,14 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include // -GenerateOpenvpnKeyDialog::GenerateOpenvpnKeyDialog(KVpncConfig *GlobalConfig,QWidget *parent, const QString& caption) +GenerateOpenvpnKeyDialog::GenerateOpenvpnKeyDialog(KVpncConfig *GlobalConfig,TQWidget *parent, const TQString& caption) : KDialogBase( parent, "Import_Cisco_PCF_profile", true, caption, KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ) { @@ -39,7 +39,7 @@ GenerateOpenvpnKeyDialog::GenerateOpenvpnKeyDialog(KVpncConfig *GlobalConfig,QWi genOk = false; main = new GenerateOpenvpnKeyDialogBase(this); setMainWidget(main); - //main->setMinimumSize(main->sizeHint()); + //main->setMinimumSize(main->tqsizeHint()); main->FilenameUrlrequester->setFilter( "*.key" ); @@ -73,7 +73,7 @@ void GenerateOpenvpnKeyDialog::canAccept() { /* - QFile f( filename ); + TQFile f( filename ); if ( !f.exists() ) { KMessageBox::information( 0, i18n( "File not found." ), i18n( "No fFile" ) ); @@ -81,22 +81,22 @@ void GenerateOpenvpnKeyDialog::canAccept() // emit progress( 100 ); return ; }*/ - generateOpenvpnKeyProcess = new QProcess(this); + generateOpenvpnKeyProcess = new TQProcess(this); generateOpenvpnKeyProcess->addArgument(GlobalConfig->pathToOpenvpn); generateOpenvpnKeyProcess->addArgument("--genkey"); generateOpenvpnKeyProcess->addArgument("--secret"); generateOpenvpnKeyProcess->addArgument(filename); - connect( generateOpenvpnKeyProcess, SIGNAL( readyReadStderr() ), this, SLOT( readStdErr() ) ); - connect( generateOpenvpnKeyProcess, SIGNAL( readyReadStdout() ), this, SLOT( readStdErr() ) ); + connect( generateOpenvpnKeyProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErr() ) ); + connect( generateOpenvpnKeyProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdErr() ) ); if ( !generateOpenvpnKeyProcess->start(env) ) { - KMessageBox::sorry( this, i18n( "Generating of %1 key failed!" ).arg( "openvpn" ) ); - GlobalConfig->appendLogEntry(i18n( "\"%1\" start failed!" ).arg( "openvpn" ),GlobalConfig->error); + KMessageBox::sorry( this, i18n( "Generating of %1 key failed!" ).tqarg( "openvpn" ) ); + GlobalConfig->appendLogEntry(i18n( "\"%1\" start failed!" ).tqarg( "openvpn" ),GlobalConfig->error); } else { - GlobalConfig->appendLogEntry( i18n("Generating of %1 key was successful.").arg("openvpn"), GlobalConfig->info); + GlobalConfig->appendLogEntry( i18n("Generating of %1 key was successful.").tqarg("openvpn"), GlobalConfig->info); genOk = true; } @@ -104,25 +104,25 @@ void GenerateOpenvpnKeyDialog::canAccept() { sleep(1); } - disconnect( generateOpenvpnKeyProcess, SIGNAL( readyReadStderr() ), this, SLOT( readStdErr() ) ); - disconnect( generateOpenvpnKeyProcess, SIGNAL( readyReadStdout() ), this, SLOT( readStdErr() ) ); + disconnect( generateOpenvpnKeyProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErr() ) ); + disconnect( generateOpenvpnKeyProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdErr() ) ); delete generateOpenvpnKeyProcess; generateOpenvpnKeyProcess = 0L; if (genOk) - KMessageBox::information( this, i18n( "Generating the key in \"%1\" was successful." ).arg( filename ) ); + KMessageBox::information( this, i18n( "Generating the key in \"%1\" was successful." ).tqarg( filename ) ); else - KMessageBox::sorry( this, i18n( "Generating the key in \"%1\" failed!" ).arg( filename ) ); + KMessageBox::sorry( this, i18n( "Generating the key in \"%1\" failed!" ).tqarg( filename ) ); //std::cout << "accept" << std::endl; - QDialog::accept(); + TQDialog::accept(); } void GenerateOpenvpnKeyDialog::readStdErr() { // while ( generateOpenvpnKeyProcess->canReadLineStderr() ) { // ProcessMsg_connect = generateOpenvpnKeyProcess->readLineStderr(); - QString ProcessMsg_connect = QString( generateOpenvpnKeyProcess->readStderr() ); + TQString ProcessMsg_connect = TQString( generateOpenvpnKeyProcess->readStderr() ); if (ProcessMsg_connect.isEmpty()) - ProcessMsg_connect = QString( generateOpenvpnKeyProcess->readStdout() ); + ProcessMsg_connect = TQString( generateOpenvpnKeyProcess->readStdout() ); if ( ProcessMsg_connect.find( "Permission denied", 0 , FALSE ) > -1 ) { diff --git a/src/generateopenvpnkeydialog.h b/src/generateopenvpnkeydialog.h index 919ad9f..7cedcb0 100644 --- a/src/generateopenvpnkeydialog.h +++ b/src/generateopenvpnkeydialog.h @@ -22,9 +22,9 @@ #include #include "generateopenvpnkeydialogbase.h" -#include +#include #include "kvpncconfig.h" -#include +#include /** @author Christoph Thielecke @@ -32,12 +32,13 @@ class GenerateOpenvpnKeyDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - GenerateOpenvpnKeyDialog(KVpncConfig *GlobalConfig,QWidget *parent, const QString& caption); + GenerateOpenvpnKeyDialog(KVpncConfig *GlobalConfig,TQWidget *parent, const TQString& caption); ~GenerateOpenvpnKeyDialog(); void canAccept(); - QString filename; + TQString filename; bool genOk; GenerateOpenvpnKeyDialogBase *main; @@ -46,9 +47,9 @@ public slots: void readStdErr(); private: - QProcess *generateOpenvpnKeyProcess; + TQProcess *generateOpenvpnKeyProcess; KVpncConfig *GlobalConfig; - QStringList *env; + TQStringList *env; }; #endif diff --git a/src/generateopenvpnkeydialogbase.ui b/src/generateopenvpnkeydialogbase.ui index 438c55a..8316804 100644 --- a/src/generateopenvpnkeydialogbase.ui +++ b/src/generateopenvpnkeydialogbase.ui @@ -1,7 +1,7 @@ GenerateOpenvpnKeyDialogBase Christoph Thielecke - + GenerateOpenvpnKeyDialogBase @@ -20,23 +20,23 @@ unnamed - + - layout3 + tqlayout3 unnamed - + - layout2 + tqlayout2 unnamed - + textLabel1 @@ -61,9 +61,9 @@ - + canAccept() - + kurlrequester.h diff --git a/src/helpdialogbase.ui b/src/helpdialogbase.ui index 3471810..0c8e5f8 100644 --- a/src/helpdialogbase.ui +++ b/src/helpdialogbase.ui @@ -1,6 +1,6 @@ HelpDialogBase - + HelpDialogBase @@ -12,7 +12,7 @@ 604 - + 800 600 @@ -28,7 +28,7 @@ unnamed - + kTextEdit1 @@ -57,7 +57,7 @@ </body></html> - + Layout1 @@ -81,14 +81,14 @@ Expanding - + 20 20 - + buttonClose @@ -117,8 +117,8 @@ accept() - + closeClicked() - + diff --git a/src/importcertificatedialog.cpp b/src/importcertificatedialog.cpp index 2fbc281..e6b0030 100644 --- a/src/importcertificatedialog.cpp +++ b/src/importcertificatedialog.cpp @@ -31,24 +31,24 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include "kvpncconfig.h" #include "utils.h" //END includes -ImportCertificateDialog::ImportCertificateDialog ( QWidget *parent, const char* caption, KVpncConfig *GlobalConfig ) +ImportCertificateDialog::ImportCertificateDialog ( TQWidget *parent, const char* caption, KVpncConfig *GlobalConfig ) : KDialogBase ( parent, i18n ( "Import Certificate" ).ascii(), true, caption, KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ) { main = new ImportCertificateDialogBase ( this ); setMainWidget ( main ); - main->setMinimumSize ( main->sizeHint() ); + main->setMinimumSize ( main->tqsizeHint() ); this->GlobalConfig = GlobalConfig; filename = ""; @@ -67,13 +67,13 @@ ImportCertificateDialog::ImportCertificateDialog ( QWidget *parent, const char* main->FilenameUrlrequester->setFilter ( "*" ); askpasscount=0; - env = new QStringList(); + env = new TQStringList(); *env << "LC_ALL=C" << "LANG=C" << "PATH=/bin:/usr/bin:/usr/sbin:/sbin"; - connect ( main->ImporttypeComboBox, SIGNAL ( activated ( int ) ), this, SLOT ( typeToggeled ( int ) ) ); + connect ( main->ImporttypeComboBox, TQT_SIGNAL ( activated ( int ) ), this, TQT_SLOT ( typeToggeled ( int ) ) ); typeToggeled ( main->ImporttypeComboBox->currentItem() ); - connect (main->UsePrivateKeyPasswordCheckBox, SIGNAL( toggled(bool)), this, SLOT(usePrivateKeyPassToggled(bool))); + connect (main->UsePrivateKeyPasswordCheckBox, TQT_SIGNAL( toggled(bool)), this, TQT_SLOT(usePrivateKeyPassToggled(bool))); usePrivateKeyPassToggled(main->UsePrivateKeyPasswordCheckBox->isChecked()); // TMP @@ -120,9 +120,9 @@ void ImportCertificateDialog::accept() // return; // } - GlobalConfig->appPointer->setOverrideCursor ( QCursor ( Qt::WaitCursor ) ); + GlobalConfig->appPointer->setOverrideCursor ( TQCursor ( TQt::WaitCursor ) ); - QFile f ( filename ); + TQFile f ( filename ); if ( f.exists() ) { if ( f.open ( IO_ReadOnly ) ) @@ -152,9 +152,9 @@ void ImportCertificateDialog::accept() if ( main->ImporttypeComboBox->currentItem() == pkcs12_freeswan ) { certpath="/etc/ipsec.d"; - if ( !QDir ( certpath ).exists() ) + if ( !TQDir ( certpath ).exists() ) { - if ( !QDir().mkdir ( certpath ) ) + if ( !TQDir().mkdir ( certpath ) ) { KMessageBox::error ( this, i18n ( "\"%1\" could not be created!" ).arg ( "/etc/ipsec.d" ) ); GlobalConfig->appendLogEntry ( i18n ( "Certificate import: directory \"%1\" does not exist and could not be created." ).arg ( "/etc/ipsec.d" ),GlobalConfig->error ); @@ -163,9 +163,9 @@ void ImportCertificateDialog::accept() { if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "Certificate import: directory \"%1\" does not exist but was successful created." ).arg ( "/etc/ipsec.d" ),GlobalConfig->debug ); - if ( !QDir ( "/etc/ipsec.d/certs" ).exists() ) + if ( !TQDir ( "/etc/ipsec.d/certs" ).exists() ) { - if ( !QDir().mkdir ( "/etc/ipsec.d/certs" ) ) + if ( !TQDir().mkdir ( "/etc/ipsec.d/certs" ) ) { KMessageBox::error ( this, i18n ( "\"%1\" could not be created!" ).arg ( "/etc/ipsec.d/certs" ) ); GlobalConfig->appendLogEntry ( i18n ( "Certificate import: directory \"%1\" does not exist and could not be created." ).arg ( "/etc/ipsec.d/certs" ),GlobalConfig->error ); @@ -175,8 +175,8 @@ void ImportCertificateDialog::accept() else { GlobalConfig->appendLogEntry ( i18n ( "Certificate import: directory \"%1\" does not exist but was successful created." ).arg ( "/etc/ipsec.d/certs" ),GlobalConfig->debug ); - if ( !QDir ( "/etc/ipsec.d/cacerts" ).exists() ) - if ( !QDir().mkdir ( "/etc/ipsec.d/cacerts" ) ) + if ( !TQDir ( "/etc/ipsec.d/cacerts" ).exists() ) + if ( !TQDir().mkdir ( "/etc/ipsec.d/cacerts" ) ) { KMessageBox::error ( this, i18n ( "\"%1\" could not be created!" ).arg ( "/etc/ipsec.d/cacerts" ) ); GlobalConfig->appendLogEntry ( i18n ( "Certificate import: directory \"%1\" does not exist and could not be created." ).arg ( "/etc/ipsec.d/cacerts" ),GlobalConfig->error ); @@ -196,8 +196,8 @@ void ImportCertificateDialog::accept() else if ( main->ImporttypeComboBox->currentItem() == pkcs12_racoon || main->ImporttypeComboBox->currentItem() == ca_der ) { certpath="/etc/racoon/certs"; - if ( !QDir ( certpath ).exists() ) - if ( !QDir().mkdir ( certpath ) ) + if ( !TQDir ( certpath ).exists() ) + if ( !TQDir().mkdir ( certpath ) ) { KMessageBox::error ( this, i18n ( "\"%1\" could not be created!" ).arg ( certpath ) ); GlobalConfig->appendLogEntry ( i18n ( "Certificate import: directory \"%1\" does not exist." ).arg ( certpath ),GlobalConfig->error ); @@ -213,8 +213,8 @@ void ImportCertificateDialog::accept() else if ( main->ImporttypeComboBox->currentItem() == pkcs12_openvpn ) { certpath = main->RacoonCertificatePathUrlrequester->url(); - if ( !QDir ( certpath ).exists() ) - if ( !QDir().mkdir ( certpath ) ) + if ( !TQDir ( certpath ).exists() ) + if ( !TQDir().mkdir ( certpath ) ) { KMessageBox::error ( this, i18n ( "\"%1\" could not be created!" ).arg ( certpath ) ); GlobalConfig->appendLogEntry ( i18n ( "Certificate import: directory \"%1\" does not exist." ).arg ( certpath ),GlobalConfig->error ); @@ -259,7 +259,7 @@ void ImportCertificateDialog::accept() } if ( importOk ) { - if ( QString ( main->PrivateKeyPasswordEdit->password() ) != QString ( main->PrivateKeyAgainPasswordEdit->password() ) ) + if ( TQString ( main->PrivateKeyPasswordEdit->password() ) != TQString ( main->PrivateKeyAgainPasswordEdit->password() ) ) { importOk = false; KMessageBox::sorry ( 0, i18n ( "Private key passwords does not match!" ), i18n ( "Passwords Do Not Match" ) ); @@ -268,7 +268,7 @@ void ImportCertificateDialog::accept() } else { - privatekeypassword= QString ( main->PrivateKeyAgainPasswordEdit->password() ); + privatekeypassword= TQString ( main->PrivateKeyAgainPasswordEdit->password() ); } } } @@ -291,7 +291,7 @@ void ImportCertificateDialog::accept() } if ( importOk ) { - if ( main->UsePrivateKeyPasswordCheckBox->isChecked() && (QString ( main->PrivateKeyPasswordEdit->password() ) != QString ( main->PrivateKeyAgainPasswordEdit->password() ) )) + if ( main->UsePrivateKeyPasswordCheckBox->isChecked() && (TQString ( main->PrivateKeyPasswordEdit->password() ) != TQString ( main->PrivateKeyAgainPasswordEdit->password() ) )) { importOk = false; KMessageBox::sorry ( 0, i18n ( "Certificate passwords does not match!" ), i18n ( "Passwords Do Not Match" ) ); @@ -301,7 +301,7 @@ void ImportCertificateDialog::accept() else { if (main->UsePrivateKeyPasswordCheckBox->isChecked() ) - privatekeypassword= QString ( main->PrivateKeyAgainPasswordEdit->password() ); + privatekeypassword= TQString ( main->PrivateKeyAgainPasswordEdit->password() ); } } } @@ -313,7 +313,7 @@ void ImportCertificateDialog::accept() { // looking for openssl - QString bin="openssl"; + TQString bin="openssl"; ToolInfo *tool = Utils ( GlobalConfig ).getToolInfo ( "openssl" ); //std::cout << "Tool (bin): " << bin << std::endl; @@ -336,17 +336,17 @@ void ImportCertificateDialog::accept() } - QString file = Utils ( this->GlobalConfig ).removeSpecialCharsForFilename ( QUrl ( filename ).fileName() ); + TQString file = Utils ( this->GlobalConfig ).removeSpecialCharsForFilename ( TQUrl ( filename ).fileName() ); certName = file.left ( file.length() - 4 ); // peter_pan.p12 -> peter_pan if ( main->ImporttypeComboBox->currentItem() == pkcs12_racoon || main->ImporttypeComboBox->currentItem() == pkcs12_openvpn ) { - QString type=""; + TQString type=""; if ( main->ImporttypeComboBox->currentItem() == pkcs12_racoon ) type="racoon"; else type="OpenVPN"; - QFile certpathtest ( certpath + "/." ); + TQFile certpathtest ( certpath + "/." ); if ( !certpathtest.exists() ) { @@ -358,7 +358,7 @@ void ImportCertificateDialog::accept() } else { - QFile testfile ( QString ( certpath + "/test" ) ); + TQFile testfile ( TQString ( certpath + "/test" ) ); if ( !testfile.open ( IO_WriteOnly ) ) { KMessageBox::error ( this, i18n ( "%1 certificate path (%2) is not writeable!" ).arg ( type ).arg ( certpath ) ); @@ -389,7 +389,7 @@ void ImportCertificateDialog::accept() */ // std::cout << "[std]:" << "settings ok." << std::endl; - ImportProcess = new QProcess ( this ); + ImportProcess = new TQProcess ( this ); if ( main->ImporttypeComboBox->currentItem() == pkcs12_freeswan || main->ImporttypeComboBox->currentItem() == pkcs12_openvpn || main->ImporttypeComboBox->currentItem() == pkcs12_racoon || main->ImporttypeComboBox->currentItem() == ca_der ) @@ -451,23 +451,23 @@ void ImportCertificateDialog::accept() } - connect ( ImportProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_import() ) ); - connect ( ImportProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_import() ) ); + connect ( ImportProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_import() ) ); + connect ( ImportProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_import() ) ); if ( main->ImporttypeComboBox->currentItem() == pkcs12_freeswan || main->ImporttypeComboBox->currentItem() == pkcs12_racoon || main->ImporttypeComboBox->currentItem() == pkcs12_openvpn ) { - connect ( ImportProcess, SIGNAL ( processExited () ), this, SLOT ( doCacert() ) ); + connect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doCacert() ) ); } if ( main->ImporttypeComboBox->currentItem() == ca_der ) { - connect ( ImportProcess, SIGNAL ( processExited () ), this, SLOT ( doCreateHash() ) ); + connect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doCreateHash() ) ); } if ( main->ImporttypeComboBox->currentItem() == cisco || main->ImporttypeComboBox->currentItem() == ciscoca) { - connect ( ImportProcess, SIGNAL ( processExited () ), this, SLOT ( ciscoCertMgrExited() ) ); + connect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( ciscoCertMgrExited() ) ); } if ( !ImportProcess->start ( env ) ) @@ -483,14 +483,14 @@ void ImportCertificateDialog::accept() { doExit=true; - QString processname = ""; + TQString processname = ""; if ( main->ImporttypeComboBox->currentItem() == pkcs12_freeswan || main->ImporttypeComboBox->currentItem() == pkcs12_openvpn || main->ImporttypeComboBox->currentItem() == pkcs12_racoon || main->ImporttypeComboBox->currentItem() == ca_der ) { processname="openssl"; if ( GlobalConfig->KvpncDebugLevel >3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2" ).arg("accept()").arg ( i18n ( " import password" ) ),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2" ).tqarg("accept()").arg ( i18n ( " import password" ) ),GlobalConfig->debug ); if ( main->ImportPasswordEdit->text().isEmpty() ) ImportProcess->writeToStdin ( "\n" ); @@ -509,8 +509,8 @@ void ImportCertificateDialog::accept() ImportProcess->writeToStdin ( main->ImportPasswordEdit->text() +"\n"); if (main->UsePrivateKeyPasswordCheckBox->isChecked() ) { - ImportProcess->writeToStdin ( QString ( main->PrivateKeyPasswordEdit->password() ) + "\n" ); - ImportProcess->writeToStdin ( QString ( main->PrivateKeyPasswordEdit->password() ) + "\n" ); + ImportProcess->writeToStdin ( TQString ( main->PrivateKeyPasswordEdit->password() ) + "\n" ); + ImportProcess->writeToStdin ( TQString ( main->PrivateKeyPasswordEdit->password() ) + "\n" ); } } } @@ -535,7 +535,7 @@ void ImportCertificateDialog::canAccept() if ( main->ImporttypeComboBox->currentItem() == pkcs12_freeswan ) { - QString bin="ipsec"; + TQString bin="ipsec"; ToolInfo *tool; //std::cout << "Tool (bin): " << bin << std::endl; if ( !GlobalConfig->ToolList->isEmpty() ) @@ -558,7 +558,7 @@ void ImportCertificateDialog::canAccept() } else if ( main->ImporttypeComboBox->currentItem() == pkcs12_racoon ) { - QString bin="racoon"; + TQString bin="racoon"; ToolInfo *tool; //std::cout << "Tool (bin): " << bin << std::endl; if ( !GlobalConfig->ToolList->isEmpty() ) @@ -581,7 +581,7 @@ void ImportCertificateDialog::canAccept() } else if ( main->ImporttypeComboBox->currentItem() == pkcs12_openvpn ) { - QString bin="openvpn"; + TQString bin="openvpn"; ToolInfo *tool; //std::cout << "Tool (bin): " << bin << std::endl; if ( !GlobalConfig->ToolList->isEmpty() ) @@ -604,7 +604,7 @@ void ImportCertificateDialog::canAccept() } else if ( main->ImporttypeComboBox->currentItem() == cisco || main->ImporttypeComboBox->currentItem() == ciscoca || main->ImporttypeComboBox->currentItem() == ciscouserca ) { - QString bin="cisco_cert_mgr"; + TQString bin="cisco_cert_mgr"; ToolInfo *tool; //std::cout << "Tool (bin): " << bin << std::endl; if ( !GlobalConfig->ToolList->isEmpty() ) @@ -628,21 +628,21 @@ void ImportCertificateDialog::canAccept() GlobalConfig->appPointer->restoreOverrideCursor(); if ( doExit ) - QDialog::accept(); + TQDialog::accept(); } void ImportCertificateDialog::reject() { importOk=false; importSuccess=false; - QDialog::reject(); + TQDialog::reject(); } void ImportCertificateDialog::doCacert() { - disconnect ( ImportProcess, SIGNAL ( processExited () ), this, SLOT ( doCacert() ) ); + disconnect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doCacert() ) ); if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).arg("doCacert()"),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).tqarg("doCacert()"),GlobalConfig->debug ); if ( ImportProcess->normalExit () ) { @@ -681,7 +681,7 @@ void ImportCertificateDialog::doCacert() ImportProcess->addArgument ( "-nodes" ); - connect ( ImportProcess, SIGNAL ( processExited () ), this, SLOT ( doCreateHash() ) ); + connect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doCreateHash() ) ); if ( ! ImportProcess->start ( env ) ) { @@ -695,7 +695,7 @@ void ImportCertificateDialog::doCacert() { if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2" ).arg("doCacert()").arg ( i18n ( " import password" ) ),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2" ).tqarg("doCacert()").arg ( i18n ( " import password" ) ),GlobalConfig->debug ); if ( main->ImportPasswordEdit->text().isEmpty() ) ImportProcess->writeToStdin ( "\n" ); @@ -719,7 +719,7 @@ void ImportCertificateDialog::doPrivateKey() if ( GlobalConfig->KvpncDebugLevel > 3 ) GlobalConfig->appendLogEntry ( "[dbg]: doPrivateKey()",GlobalConfig->debug ); - disconnect ( ImportProcess, SIGNAL ( processExited () ), this, SLOT ( doPrivateKey() ) ); + disconnect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doPrivateKey() ) ); if ( ImportProcess->normalExit () ) { @@ -748,9 +748,9 @@ void ImportCertificateDialog::doPrivateKey() CertFullPath=certpath+"/" + certName + ".pem"; if ( main->UsePrivateKeyPasswordCheckBox->isChecked() ) - connect ( ImportProcess, SIGNAL ( processExited () ), this, SLOT ( exit() ) ); + connect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( exit() ) ); else - connect ( ImportProcess, SIGNAL ( processExited () ), this, SLOT ( removePrivateKey() ) ); + connect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( removePrivateKey() ) ); //LogOutput->append( "priv key: we starting..." ); if ( !ImportProcess->start( ) ) @@ -766,7 +766,7 @@ void ImportCertificateDialog::doPrivateKey() { if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2" ).arg("doPrivateKey()").arg ( i18n ( " import password" ) ),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2" ).tqarg("doPrivateKey()").arg ( i18n ( " import password" ) ),GlobalConfig->debug ); // if ( main->ImportPasswordEdit->text().isEmpty() ) // ImportProcess->writeToStdin ( "\n" ); @@ -777,14 +777,14 @@ void ImportCertificateDialog::doPrivateKey() if ( main->UsePrivateKeyPasswordCheckBox->isChecked() ) { if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).arg("doPrivateKey").arg ( i18n ( " private key password" ) ),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).tqarg("doPrivateKey").arg ( i18n ( " private key password" ) ),GlobalConfig->debug ); ImportProcess->writeToStdin ( main->PrivateKeyPasswordEdit->text() + "\n" ); } else { if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).arg("doPrivateKey").arg ( i18n ( " private key password dummy" ) ),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).tqarg("doPrivateKey").arg ( i18n ( " private key password dummy" ) ),GlobalConfig->debug ); // we need 4 chars here ImportProcess->writeToStdin ( "abcd\n" ); @@ -794,14 +794,14 @@ void ImportCertificateDialog::doPrivateKey() if ( main->UsePrivateKeyPasswordCheckBox->isChecked() ) { if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).arg("doPrivateKey").arg ( i18n ( " private key password" ) ),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).tqarg("doPrivateKey").arg ( i18n ( " private key password" ) ),GlobalConfig->debug ); ImportProcess->writeToStdin ( main->PrivateKeyPasswordEdit->text() + "\n" ); } else { if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).arg("doPrivateKey").arg ( i18n ( " private key password dummy" ) ),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).tqarg("doPrivateKey").arg ( i18n ( " private key password dummy" ) ),GlobalConfig->debug ); // we need 4 chars here ImportProcess->writeToStdin ( "abcd\n" ); @@ -823,10 +823,10 @@ void ImportCertificateDialog::doPrivateKey() void ImportCertificateDialog::doCreateHash() { - disconnect ( ImportProcess, SIGNAL ( processExited () ), this, SLOT ( doCreateHash() ) ); + disconnect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doCreateHash() ) ); if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).arg("doCreateHash()"),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).tqarg("doCreateHash()"),GlobalConfig->debug ); if ( ImportProcess->normalExit () ) { @@ -850,7 +850,7 @@ void ImportCertificateDialog::doCreateHash() else ImportProcess->addArgument ( certpath + "/ca_" + certName + ".pem" ); - connect ( ImportProcess, SIGNAL ( processExited () ), this, SLOT ( doLink() ) ); + connect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doLink() ) ); // LogOutput->append( "hash: we starting..." ); @@ -866,7 +866,7 @@ void ImportCertificateDialog::doCreateHash() { if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2" ).arg("doCreateHash()").arg ( i18n ( " import password" ) ),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2" ).tqarg("doCreateHash()").arg ( i18n ( " import password" ) ),GlobalConfig->debug ); if ( main->ImportPasswordEdit->text().isEmpty() ) ImportProcess->writeToStdin ( "\n" ); @@ -892,9 +892,9 @@ void ImportCertificateDialog::doCreateHash() void ImportCertificateDialog::doLink() { - disconnect ( ImportProcess, SIGNAL ( processExited () ), this, SLOT ( doLink() ) ); + disconnect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doLink() ) ); if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).arg("doLink()"),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).tqarg("doLink()"),GlobalConfig->debug ); if ( ImportProcess->normalExit () ) { @@ -919,9 +919,9 @@ void ImportCertificateDialog::doLink() if ( main->ImporttypeComboBox->currentItem() == pkcs12_freeswan || main->ImporttypeComboBox->currentItem() == pkcs12_openvpn ) - connect ( ImportProcess, SIGNAL ( processExited () ), this, SLOT ( doPrivateKey() ) ); + connect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doPrivateKey() ) ); else - connect ( ImportProcess, SIGNAL ( processExited () ), this, SLOT ( exit() ) ); + connect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( exit() ) ); if ( !ImportProcess->start( ) ) @@ -957,7 +957,7 @@ void ImportCertificateDialog::doLink() void ImportCertificateDialog::exit() { if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).arg("exit()"),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).tqarg("exit()"),GlobalConfig->debug ); if ( (ImportProcess != 0L && ImportProcess->normalExit() ) || ImportProcess == 0L ) @@ -987,10 +987,10 @@ void ImportCertificateDialog::exit() void ImportCertificateDialog::readFromStdout_import() { -// QString line = QString( ImportProcess->readStdout() ); +// TQString line = TQString( ImportProcess->readStdout() ); while ( ImportProcess->canReadLineStdout() ) { - QString line = QString ( ImportProcess->readLineStdout() ); + TQString line = TQString ( ImportProcess->readLineStdout() ); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "Certificate import stdout: %1" ).arg ( line ),GlobalConfig->debug ); @@ -1021,14 +1021,14 @@ void ImportCertificateDialog::readFromStdout_import() if ( main->UsePrivateKeyPasswordCheckBox->isChecked() ) { if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).arg("doPrivateKey").arg ( i18n ( " private key password" ) ),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).tqarg("doPrivateKey").arg ( i18n ( " private key password" ) ),GlobalConfig->debug ); ImportProcess->writeToStdin ( main->PrivateKeyPasswordEdit->text() + "\n" ); } else { if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).arg("doPrivateKey").arg ( i18n ( " private key password dummy" ) ),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).tqarg("doPrivateKey").arg ( i18n ( " private key password dummy" ) ),GlobalConfig->debug ); // we need 4 chars here ImportProcess->writeToStdin ( "abcd\n" ); @@ -1054,7 +1054,7 @@ void ImportCertificateDialog::readFromStdout_import() { if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1 was requested, send it..." ).arg ( i18n ( "certificate password" ) ),GlobalConfig->debug ); - ImportProcess->writeToStdin ( QString ( main->PrivateKeyPasswordEdit->password() ) + "\n" ); + ImportProcess->writeToStdin ( TQString ( main->PrivateKeyPasswordEdit->password() ) + "\n" ); } if ( line.find ( "Success: certificate imported from path:", 0, FALSE ) > -1 ) @@ -1073,10 +1073,10 @@ void ImportCertificateDialog::readFromStdout_import() void ImportCertificateDialog::readFromStderr_import() { -// QString line = QString ( ImportProcess->readStderr() ); +// TQString line = TQString ( ImportProcess->readStderr() ); while ( ImportProcess->canReadLineStderr() ) { - QString line = QString ( ImportProcess->readLineStderr() ); + TQString line = TQString ( ImportProcess->readLineStderr() ); if ( GlobalConfig->KvpncDebugLevel > 3 ) { if ( line.find ( "Enter Import Pass", 0, FALSE ) > -1 || line.find ( "Enter PEM pass phrase", 0, FALSE ) > -1 || line.find ( "MAC verified OK", 0, FALSE ) > -1 || line.find ( "Enter pass phrase for", 0, FALSE ) > -1 || line.find ( "writing RSA key", 0, FALSE ) > -1 ) @@ -1120,8 +1120,8 @@ void ImportCertificateDialog::readFromStderr_import() error_found=true; // if ( ImportProcess != 0L && ImportProcess->isRunning() ) // { -// disconnect ( ImportProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_import() ) ); -// disconnect ( ImportProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_import() ) ); +// disconnect ( ImportProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_import() ) ); +// disconnect ( ImportProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_import() ) ); // ImportProcess->kill(); // ImportProcess = 0L; // } @@ -1215,7 +1215,7 @@ void ImportCertificateDialog::readFromStderr_import() void ImportCertificateDialog::typeToggeled ( int type ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry ( QString ( "type: "+QString().setNum ( type ) ),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( TQString ( "type: "+TQString().setNum ( type ) ),GlobalConfig->debug ); if ( type == pkcs12_freeswan ) { certpath = "/etc/ipsec.d/certs"; @@ -1311,9 +1311,9 @@ void ImportCertificateDialog::usePrivateKeyPassToggled(bool) void ImportCertificateDialog::removePrivateKey() { - disconnect ( ImportProcess, SIGNAL ( processExited () ), this, SLOT ( removePrivateKey() ) ); + disconnect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( removePrivateKey() ) ); if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).arg("removePrivateKey()"),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).tqarg("removePrivateKey()"),GlobalConfig->debug ); if ( ImportProcess->normalExit () ) { @@ -1334,7 +1334,7 @@ void ImportCertificateDialog::removePrivateKey() else if ( main->ImporttypeComboBox->currentItem() == pkcs12_openvpn ) ImportProcess->addArgument ( certpath+"/" + certName + ".pem" ); // warning: static - connect ( ImportProcess, SIGNAL ( processExited () ), this, SLOT ( exit() ) ); + connect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( exit() ) ); if ( !ImportProcess->start( ) ) @@ -1349,7 +1349,7 @@ void ImportCertificateDialog::removePrivateKey() { if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).arg("removePrivateKey()").arg ( i18n ( " private key password dummy" ) ),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).tqarg("removePrivateKey()").arg ( i18n ( " private key password dummy" ) ),GlobalConfig->debug ); // we need 4 chars here ImportProcess->writeToStdin ( "abcd\n" ); diff --git a/src/importcertificatedialog.h b/src/importcertificatedialog.h index b1a05e5..932723c 100644 --- a/src/importcertificatedialog.h +++ b/src/importcertificatedialog.h @@ -21,9 +21,9 @@ #define IMPORTCERTIFICATEDIALOG_H #include "importcertificatedialogbase.h" -#include -#include -#include +#include +#include +#include #include #include "kvpncconfig.h" @@ -32,21 +32,22 @@ */ class ImportCertificateDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ImportCertificateDialog(QWidget *parent, const char* caption, KVpncConfig *GlobalConfig); + ImportCertificateDialog(TQWidget *parent, const char* caption, KVpncConfig *GlobalConfig); ~ImportCertificateDialog(); void canAccept(); - QString filename; - QString certpath; - QString importpassword; - QString privatekeypassword; - QString privatekeyagainpassword; - QString pathToOpenSSL; - QString certHash; - QString certName; - QString CertFullPath; - QString CaCertFullPath; + TQString filename; + TQString certpath; + TQString importpassword; + TQString privatekeypassword; + TQString privatekeyagainpassword; + TQString pathToOpenSSL; + TQString certHash; + TQString certName; + TQString CertFullPath; + TQString CaCertFullPath; bool importOk; bool doHash; bool importSuccess; @@ -55,12 +56,12 @@ class ImportCertificateDialog : public KDialogBase { enum ImportType {pkcs12_freeswan=0,pkcs12_racoon=1,ca_der=2,pkcs12_openvpn=3,cisco=4, ciscoca=5, ciscouserca=6}; protected: - QProcess *ImportProcess; + TQProcess *ImportProcess; KVpncConfig *GlobalConfig; bool done; bool error_found; int askpasscount; - QStringList *env; + TQStringList *env; public slots: void accept(); diff --git a/src/importcertificatedialogbase.ui b/src/importcertificatedialogbase.ui index 6cf55ed..8213ac1 100644 --- a/src/importcertificatedialogbase.ui +++ b/src/importcertificatedialogbase.ui @@ -1,6 +1,6 @@ ImportCertificateDialogBase - + ImportCertificateDialogBase @@ -19,15 +19,15 @@ unnamed - + - layout19 + tqlayout19 unnamed - + GeneralGroupBox @@ -38,7 +38,7 @@ unnamed - + textLabel1 @@ -46,7 +46,7 @@ File name: - + ImporttypeTextLabel @@ -54,7 +54,7 @@ Import type: - + CertPathTextLabel @@ -80,7 +80,7 @@ FilenameUrlrequester - + 250 0 @@ -100,7 +100,7 @@ Expanding - + 100 20 @@ -172,7 +172,7 @@ Expanding - + 80 20 @@ -189,7 +189,7 @@ Expanding - + 60 20 @@ -198,7 +198,7 @@ - + P12GroupBox @@ -209,7 +209,7 @@ unnamed - + textLabel1_2 @@ -230,7 +230,7 @@ - + UsePrivateKeyPasswordCheckBox @@ -244,7 +244,7 @@ true - + PrivateKeyPassGroupBox @@ -266,7 +266,7 @@ Passphrase to protect private key. Feel free to choose what you want (don't forget it!). - + PrivateKeyPassTextLabel @@ -274,7 +274,7 @@ Private key passphrase: - + PrivateKeyPassAgainTextLabel @@ -302,7 +302,7 @@ Expanding - + 21 20 @@ -330,9 +330,9 @@ PrivateKeyPasswordEdit PrivateKeyAgainPasswordEdit - + usePrivateKeyPassToggled(bool) - + kurlrequester.h diff --git a/src/importipsecprofiledialog.cpp b/src/importipsecprofiledialog.cpp index 82de933..c448819 100644 --- a/src/importipsecprofiledialog.cpp +++ b/src/importipsecprofiledialog.cpp @@ -34,16 +34,16 @@ #include #include #include -#include -#include +#include +#include #include -#include -#include -#include +#include +#include +#include #include -#include -#include -#include +#include +#include +#include #include @@ -56,7 +56,7 @@ //END INCLUDES -ImportIpsecProfileDialog::ImportIpsecProfileDialog ( KVpncConfig *GlobalConfig, QWidget *parent, const QString& caption, QString file ) +ImportIpsecProfileDialog::ImportIpsecProfileDialog ( KVpncConfig *GlobalConfig, TQWidget *parent, const TQString& caption, TQString file ) : KDialogBase ( parent, "Import_Ipsec_profile", true, caption, KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true ) { if ( !file.isEmpty() ) @@ -70,7 +70,7 @@ ImportIpsecProfileDialog::ImportIpsecProfileDialog ( KVpncConfig *GlobalConfig, main = new ImportOpenvpnProfileDialogBase ( this ); setMainWidget ( main ); - //main->setMinimumSize(main->sizeHint()); + //main->setMinimumSize(main->tqsizeHint()); main->FilenameUrlrequester->setFilter ( "*.conf" ); main->FilenameUrlrequester->setURL ( filename ); @@ -108,7 +108,7 @@ void ImportIpsecProfileDialog::reject() void ImportIpsecProfileDialog::canAccept() { - QFile f ( filename ); + TQFile f ( filename ); if ( !f.exists() ) { KMessageBox::sorry ( 0, i18n ( "File not found." ), i18n ( "No File" ) ); @@ -118,44 +118,44 @@ void ImportIpsecProfileDialog::canAccept() } - QFile IpsecConfigFile ( filename ); - QString importprefix = QFileInfo ( filename ).dirPath(); + TQFile IpsecConfigFile ( filename ); + TQString importprefix = TQFileInfo ( filename ).dirPath(); if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "IPSec import: import prefix: %1" ).arg ( importprefix ), GlobalConfig->debug ); - QString certprefix = locateLocal ( "data", "kvpnc" ); + TQString certprefix = locateLocal ( "data", "kvpnc" ); if ( IpsecConfigFile.open ( IO_ReadOnly ) ) { - QPtrList *ImportedAccountList = new QPtrList(); + TQPtrList *ImportedAccountList = new TQPtrList(); ImportedAccountList->setAutoDelete ( TRUE ); // the list owns the objects - QPtrList *IpsecImportSectionList = new QPtrList(); + TQPtrList *IpsecImportSectionList = new TQPtrList(); bool isIpsecGlobalSection=false; bool firstSectionFound=false; bool defaultSectionFound=false; bool useNat=false; bool disableOpportunisticEncryption=true; - QStringList InterfaceList; + TQStringList InterfaceList; int IpsecVersion=1; // bool pskIsInFile=true; - QString PskFile="/etc/ipsec.secrets"; - QString CertPath="/etc/ipsec.d/certs"; + TQString PskFile="/etc/ipsec.secrets"; + TQString CertPath="/etc/ipsec.d/certs"; - QString IpsecConfigSection=""; + TQString IpsecConfigSection=""; bool validLineFound=false; - QString line = NULL; - QString IpsecConfigSectionName=""; - QString IpsecConfigData=""; + TQString line = NULL; + TQString IpsecConfigSectionName=""; + TQString IpsecConfigData=""; bool sectionEndFound=false; // std::cout << "pass1: collecting sections" << std::endl; if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "import ipsec config: pass1: collecting sections" ),GlobalConfig->debug ); - QTextStream stream ( &IpsecConfigFile ); + TQTextStream stream ( &IpsecConfigFile ); while ( !stream.atEnd() ) { line = stream.readLine().replace ( "\"","" ); @@ -217,11 +217,11 @@ void ImportIpsecProfileDialog::canAccept() } if ( line.startsWith ( "version" ) ) { - IpsecVersion=QString ( line.simplifyWhiteSpace().section ( '#',0,0 ).section ( " ",1,1 ).stripWhiteSpace() ).toFloat(); + IpsecVersion=TQString ( line.simplifyWhiteSpace().section ( '#',0,0 ).section ( " ",1,1 ).stripWhiteSpace() ).toFloat(); validLineFound=true; // std::cout << "ipsec version found: " << IpsecVersion << std::endl; if ( GlobalConfig->KvpncDebugLevel > 2 ) - GlobalConfig->appendLogEntry ( i18n ( "import ipsec config: ipsec version found: " ) + QString().setNum ( IpsecVersion ) ,GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "import ipsec config: ipsec version found: " ) + TQString().setNum ( IpsecVersion ) ,GlobalConfig->debug ); } if ( line.startsWith ( "config setup" ) ) { @@ -235,7 +235,7 @@ void ImportIpsecProfileDialog::canAccept() if ( isIpsecGlobalSection==true ) { - QString line2 = GlobalConfig->removeWhiteSpaceAtBegin ( line ); + TQString line2 = GlobalConfig->removeWhiteSpaceAtBegin ( line ); // std::cout << "global section line: " << line2 << std::endl; if ( line2.startsWith ( "plutodebug" ) ) { @@ -271,7 +271,7 @@ void ImportIpsecProfileDialog::canAccept() } else { - InterfaceList = QStringList::split ( ' ',line2.replace ( "interfaces=","" ).replace ( QRegExp ( "ipsec[0-9]=" ),"" ) ); + InterfaceList = TQStringList::split ( ' ',line2.replace ( "interfaces=","" ).replace ( TQRegExp ( "ipsec[0-9]=" ),"" ) ); // std::cout << "interface list: " << InterfaceList << std::endl; if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "import ipsec config: use interface from list:" ) + " "+InterfaceList.join ( ", " ),GlobalConfig->debug ); @@ -293,7 +293,7 @@ void ImportIpsecProfileDialog::canAccept() if ( !sectionEndFound && firstSectionFound==true ) { // collecting data - QString cleanLine = GlobalConfig->removeWhiteSpaceAtBegin ( line ) +"\n"; + TQString cleanLine = GlobalConfig->removeWhiteSpaceAtBegin ( line ) +"\n"; // std:: cout << "clean line: \"" << cleanLine << "\"" << std::endl; if ( !cleanLine.startsWith ( "#" ) && !cleanLine.startsWith ( "include" ) && cleanLine != "" && !line.startsWith ( "conn" ) && cleanLine != "\n" ) { @@ -331,15 +331,15 @@ void ImportIpsecProfileDialog::canAccept() // std::cout << "sections: IpsecImportSectionList: " << IpsecImportSectionList->count() << std::endl; if ( GlobalConfig->KvpncDebugLevel > 2 ) - GlobalConfig->appendLogEntry ( i18n ( "import ipsec config: sections: " ) + QString().setNum ( IpsecImportSectionList->count() ),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "import ipsec config: sections: " ) + TQString().setNum ( IpsecImportSectionList->count() ),GlobalConfig->debug ); if ( !IpsecImportSectionList->isEmpty() ) { for ( int i=0; i< ( int ) IpsecImportSectionList->count();i++ ) { IpsecImportSection *section = IpsecImportSectionList->at ( i ); - QString Name= section->SectionName; - QStringList data = QStringList::split ( '\n',section->SectionData.join ( "\n" ) ); + TQString Name= section->SectionName; + TQStringList data = TQStringList::split ( '\n',section->SectionData.join ( "\n" ) ); // std::cout << " => processing section: \"" << Name << "\"" << std::endl; @@ -348,9 +348,9 @@ void ImportIpsecProfileDialog::canAccept() if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "import ipsec config: => processing section: " ) +"\"" + Name + "\"",GlobalConfig->debug ); - for ( QStringList::Iterator it2 = data.begin(); it2 != data.end(); ++it2 ) + for ( TQStringList::Iterator it2 = data.begin(); it2 != data.end(); ++it2 ) { - QString dataline = *it2; + TQString dataline = *it2; // std::cout << "dataline found: \"" << dataline.remove("\n") << "\"" << std::endl; if ( GlobalConfig->removeWhiteSpaceAtBegin ( dataline ).startsWith ( "also=" ) ) { @@ -358,11 +358,11 @@ void ImportIpsecProfileDialog::canAccept() if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "import ipsec config: also= found, looking for other section..." ),GlobalConfig->debug ); - QString newdata = QString ( section->SectionData.join ( "\n" ) ); - newdata.replace ( QRegExp ( "^.*also=.*$" ),"" ); + TQString newdata = TQString ( section->SectionData.join ( "\n" ) ); + newdata.replace ( TQRegExp ( "^.*also=.*$" ),"" ); section->SectionData= newdata; - QString OtherSection=dataline.simplifyWhiteSpace().section ( '#',0,0 ).section ( "=",1,1 ); + TQString OtherSection=dataline.simplifyWhiteSpace().section ( '#',0,0 ).section ( "=",1,1 ); // we have to find the other section and replace this line by the config data of the other section (after the =) bool section_found=false; for ( IpsecImportSection * it3 = IpsecImportSectionList->first(); it3; it3 = IpsecImportSectionList->next() ) @@ -377,23 +377,23 @@ void ImportIpsecProfileDialog::canAccept() section_found=true; // data.remove(dataline); dataline=""; - // QStringList otherdata = QStringList::split("\n",QString(it3->SectionData.join("\n"))); - QString OtherData = QString ( it3->SectionData.join ( "\n" ) ); + // TQStringList otherdata = TQStringList::split("\n",TQString(it3->SectionData.join("\n"))); + TQString OtherData = TQString ( it3->SectionData.join ( "\n" ) ); - QStringList newdata; + TQStringList newdata; - for ( QStringList::Iterator it6 = data.begin(); it6 != data.end(); ++it6 ) + for ( TQStringList::Iterator it6 = data.begin(); it6 != data.end(); ++it6 ) { // std::cout << " also line: " << *it6 << std::endl; if ( GlobalConfig->KvpncDebugLevel > 2 ) - GlobalConfig->appendLogEntry ( i18n ( "import ipsec config: also line: " ) + QString ( *it6 ),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "import ipsec config: also line: " ) + TQString ( *it6 ),GlobalConfig->debug ); - if ( QString ( *it6 ).find ( "also=" ) < 0 ) + if ( TQString ( *it6 ).find ( "also=" ) < 0 ) { // std::cout << " also= found." << std::endl; if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "import ipsec config: also= found." ),GlobalConfig->debug ); - newdata.append ( QString ( *it6 ) ); + newdata.append ( TQString ( *it6 ) ); } else { @@ -426,17 +426,17 @@ void ImportIpsecProfileDialog::canAccept() for ( int i=0; i< ( int ) IpsecImportSectionList->count();i++ ) { IpsecImportSection *section2 = IpsecImportSectionList->at ( i ); - QString Name= section2->SectionName; + TQString Name= section2->SectionName; if ( Name == "%default" ) { if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "import ipsec config: => appending %default section: " ) +"\"" + section2->SectionData.join ( "\n" ) ,GlobalConfig->debug ); - QStringList defaultdata = QStringList::split ( '\n',section2->SectionData.join ( "\n" ) ); + TQStringList defaultdata = TQStringList::split ( '\n',section2->SectionData.join ( "\n" ) ); - for ( QStringList::Iterator defaultit = defaultdata.begin(); defaultit != defaultdata.end(); ++defaultit ) + for ( TQStringList::Iterator defaultit = defaultdata.begin(); defaultit != defaultdata.end(); ++defaultit ) { if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "import ipsec config: => appending %default line: " ) +"\"" + *defaultit,GlobalConfig->debug ); @@ -454,8 +454,8 @@ void ImportIpsecProfileDialog::canAccept() // KVpncConfig->IpsecImportSection *it5=NULL; // for ( it5 = IpsecImportSectionList->first(); it5; it5 = IpsecImportSectionList->next() ) // { -// QString SectionName= it5->SectionName; -// QStringList data = it5->SectionData; +// TQString SectionName= it5->SectionName; +// TQStringList data = it5->SectionData; // // std::cout << SectionName << std::endl; // std::cout << data.join("\n") << std::endl; @@ -465,7 +465,7 @@ void ImportIpsecProfileDialog::canAccept() for ( int i=0; i< ( int ) IpsecImportSectionList->count();i++ ) { IpsecImportSection *section = IpsecImportSectionList->at ( i ); - QString Name= section->SectionName; + TQString Name= section->SectionName; if ( Name == "%default" ) { IpsecImportSectionList->remove ( IpsecImportSectionList->at ( i ) ); @@ -480,8 +480,8 @@ void ImportIpsecProfileDialog::canAccept() IpsecImportSection *it5=NULL; for ( it5 = IpsecImportSectionList->first(); it5; it5 = IpsecImportSectionList->next() ) { - QString SectionName= it5->SectionName; - QStringList data = it5->SectionData; + TQString SectionName= it5->SectionName; + TQStringList data = it5->SectionData; GlobalConfig->appendLogEntry ( SectionName ,GlobalConfig->debug ); GlobalConfig->appendLogEntry ( data.join ( "\n" ) ,GlobalConfig->debug ); @@ -500,27 +500,27 @@ void ImportIpsecProfileDialog::canAccept() { IpsecImportSection *section = IpsecImportSectionList->at ( i ); - QStringList sectiondata = QStringList::split ( '\n',section->SectionData.join ( "\n" ) ); + TQStringList sectiondata = TQStringList::split ( '\n',section->SectionData.join ( "\n" ) ); // std::cout << " => processing section: \"" << section->SectionName << "\"" << std::endl; // std::cout << " => data: \"" << section->SectionData.join("\n") << "\"" << std::endl; if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "import ipsec config: => processing section: " ) +"\"" + section->SectionName + "\"" ,GlobalConfig->debug ); - VpnAccountData *profiledata = new VpnAccountData ( VpnAccountData::freeswan,QString ( section->SectionName ) ) ; + VpnAccountData *profiledata = new VpnAccountData ( VpnAccountData::freeswan,TQString ( section->SectionName ) ) ; - for ( QStringList::Iterator it2 = sectiondata.begin(); it2!= sectiondata.end() ; it2++ ) + for ( TQStringList::Iterator it2 = sectiondata.begin(); it2!= sectiondata.end() ; it2++ ) { - QString dataline = *it2; + TQString dataline = *it2; - QString line2 = GlobalConfig->removeWhiteSpaceAtBegin ( dataline ); // line of text excluding '\n' and replace all white chars with one blank + TQString line2 = GlobalConfig->removeWhiteSpaceAtBegin ( dataline ); // line of text excluding '\n' and replace all white chars with one blank // std::cout << "dataline: \"" << line2 << "\""; if ( line2.startsWith ( "rightsubnet=" ) ) { validLineFound=true; - QString RightSubnet=line2.section ( "rightsubnet=",1,-1 ); + TQString RightSubnet=line2.section ( "rightsubnet=",1,-1 ); // std::cout << "right subnet (remote) found: " << RightSubnet << std::endl; if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "import ipsec config: right subnet (remote) found: " ) + RightSubnet ,GlobalConfig->debug ); @@ -535,7 +535,7 @@ void ImportIpsecProfileDialog::canAccept() if ( line2.startsWith ( "leftsubnet=" ) ) { validLineFound=true; - QString LeftSubnet=line2.section ( "leftsubnet=",1,-1 ); + TQString LeftSubnet=line2.section ( "leftsubnet=",1,-1 ); // std::cout << "left subnet (local) found: " << LeftSubnet << std::endl; if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "import ipsec config: left subnet (local) found: " ) + LeftSubnet ,GlobalConfig->debug ); @@ -548,7 +548,7 @@ void ImportIpsecProfileDialog::canAccept() if ( line2.startsWith ( "rightnexthop=" ) ) { validLineFound=true; - QString RightNextHop=line2.section ( "rightnexthop=",1,-1 ); + TQString RightNextHop=line2.section ( "rightnexthop=",1,-1 ); // std::cout << "right next hop (remote) found: " << RightNextHop << std::endl; if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "import ipsec config: right next hop (remote) found: " ) +RightNextHop ,GlobalConfig->debug ); @@ -561,7 +561,7 @@ void ImportIpsecProfileDialog::canAccept() if ( line2.startsWith ( "leftnexthop=" ) ) { validLineFound=true; - QString LeftNextHop=line2.section ( "leftnexthop=",1,-1 ); + TQString LeftNextHop=line2.section ( "leftnexthop=",1,-1 ); std::cout << "left next hop (local) found: " << LeftNextHop << std::endl; if (GlobalConfig->KvpncDebugLevel > 2) GlobalConfig->appendLogEntry("import ipsec config: left next hop (local) found: " +LeftNextHop ,GlobalConfig->debug); @@ -574,7 +574,7 @@ void ImportIpsecProfileDialog::canAccept() if ( line2.startsWith ( "left=" ) ) { validLineFound=true; - QString left=line2.section ( "left=",1,-1 ); + TQString left=line2.section ( "left=",1,-1 ); // local ip cant be set yet. // std::cout << "left found: " << left << std::endl; // if (GlobalConfig->KvpncDebugLevel > 2) @@ -587,7 +587,7 @@ void ImportIpsecProfileDialog::canAccept() if ( line2.startsWith ( "right=" ) ) { validLineFound=true; - QString right=line2.section ( "right=",1,-1 ); + TQString right=line2.section ( "right=",1,-1 ); // std::cout << "right (remote gateway) found: " << right << std::endl; if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "import ipsec config: right (remote gateway) found: " ) + right ,GlobalConfig->debug ); @@ -599,7 +599,7 @@ void ImportIpsecProfileDialog::canAccept() if ( line2.startsWith ( "leftcert=" ) ) { validLineFound=true; - QString LeftCert=line2.section ( "leftcert=",1,-1 ); + TQString LeftCert=line2.section ( "leftcert=",1,-1 ); // std::cout << "left cert (local) found: " << LeftCert << std::endl; if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "import ipsec config: left cert (local) found: " ) + LeftCert ,GlobalConfig->debug ); @@ -611,7 +611,7 @@ void ImportIpsecProfileDialog::canAccept() if ( line2.startsWith ( "rightcert=" ) ) { validLineFound=true; - QString RightCert=line2.section("rightcert=",1,-1); + TQString RightCert=line2.section("rightcert=",1,-1); // std::cout << "right cert (remote) found: " << RightCert << std::endl; if (GlobalConfig->KvpncDebugLevel > 2) GlobalConfig->appendLogEntry(i18n ("import ipsec config: right cert (remote) found: ") + RightCert ,GlobalConfig->debug); @@ -624,7 +624,7 @@ void ImportIpsecProfileDialog::canAccept() if ( line2.startsWith ( "rightca=" ) ) { validLineFound=true; - QString RightCA=line2.section ( "rightca=",1,-1 ); + TQString RightCA=line2.section ( "rightca=",1,-1 ); // std::cout << "right CA (remote) found: " << RightCA << std::endl; if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "import ipsec config: right CA (remote) found: " ) +RightCA ,GlobalConfig->debug ); @@ -636,7 +636,7 @@ void ImportIpsecProfileDialog::canAccept() if ( line2.startsWith ( "rightid=" ) ) { validLineFound=true; - QString RightID=line2.section ( "rightid=",1,-1 ); + TQString RightID=line2.section ( "rightid=",1,-1 ); // std::cout << "right ID (remote) found: " << RightID << std::endl; if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "import ipsec config: right ID (remote) found: " ) + RightID ,GlobalConfig->debug ); @@ -650,7 +650,7 @@ void ImportIpsecProfileDialog::canAccept() if ( line2.startsWith ( "leftid=" ) ) { validLineFound=true; - QString LeftID=line2.section ( "leftid=",1,-1 ); + TQString LeftID=line2.section ( "leftid=",1,-1 ); // std::cout << "local ID (local) found: " << LeftID << std::endl; if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "import ipsec config: local ID (local) found: " ) + LeftID ,GlobalConfig->debug ); @@ -664,7 +664,7 @@ void ImportIpsecProfileDialog::canAccept() if ( line2.startsWith ( "rightrsasigkey=" ) ) { validLineFound=true; - QString RightRsaSigKey=line2.section ( "rightrsasigkey=",1,-1 ); + TQString RightRsaSigKey=line2.section ( "rightrsasigkey=",1,-1 ); // std::cout << "right uses (remote) " << RightRsaSigKey << std::endl; if (RightRsaSigKey=="%cert") { @@ -690,7 +690,7 @@ void ImportIpsecProfileDialog::canAccept() if ( line2.startsWith ( "leftrsasigkey=" ) ) { validLineFound=true; - QString LeftRsaSigKey=line2.section ( "leftrsasigkey=",1,-1 ); + TQString LeftRsaSigKey=line2.section ( "leftrsasigkey=",1,-1 ); // std::cout << "right uses (remote) " << LeftRsaSigKey << std::endl; if (LeftRsaSigKey=="%cert") { @@ -716,7 +716,7 @@ void ImportIpsecProfileDialog::canAccept() if ( line2.startsWith ( "authby=" ) ) { validLineFound=true; - QString Authby=line2.simplifyWhiteSpace().section ( "authby=",1,1 ); + TQString Authby=line2.simplifyWhiteSpace().section ( "authby=",1,1 ); // std::cout << "left and right use certs " << std::endl; if ( Authby.find ( "rsasig", 0 , FALSE ) > -1 ) { @@ -750,7 +750,7 @@ void ImportIpsecProfileDialog::canAccept() if ( line2.startsWith ( "auto=start" ) ) { // validLineFound=true; - // QString Authby=line2.simplifyWhiteSpace().section('#',0,0).section("=",1,1); + // TQString Authby=line2.simplifyWhiteSpace().section('#',0,0).section("=",1,1); // std::cout << "profile should be started" << std::endl; // if (GlobalConfig->KvpncDebugLevel > 2) // GlobalConfig->appendLogEntry("import ipsec config: profile should be started" ,GlobalConfig->debug); @@ -762,7 +762,7 @@ void ImportIpsecProfileDialog::canAccept() if ( line2.startsWith ( "leftsourceip=" ) ) { validLineFound=true; - QString leftsourceip=line2.section ( "leftsourceip=",1,-1 ); + TQString leftsourceip=line2.section ( "leftsourceip=",1,-1 ); std::cout << "left (local) have to use IP address " << leftsourceip << std::endl; if (GlobalConfig->KvpncDebugLevel > 2) GlobalConfig->appendLogEntry("import ipsec config: left (local) have to use IP address " + leftsourceip ,GlobalConfig->debug); @@ -774,7 +774,7 @@ void ImportIpsecProfileDialog::canAccept() if ( line2.startsWith ( "virtual_private=" ) ) { validLineFound=true; - QString virtualprivate=line2.section ( "virtual_private=",1,-1 ); + TQString virtualprivate=line2.section ( "virtual_private=",1,-1 ); std::cout << "virtual private networks " << virtualprivate << std::endl; if (GlobalConfig->KvpncDebugLevel > 2) GlobalConfig->appendLogEntry("import ipsec config: virtual private networks " +virtualprivate ,GlobalConfig->debug); @@ -787,7 +787,7 @@ void ImportIpsecProfileDialog::canAccept() if ( line2.startsWith ( "rightsourceip=" ) ) { validLineFound=true; - QString rightsourceip=line2.section ( "rightsourceip=",1,-1 ); + TQString rightsourceip=line2.section ( "rightsourceip=",1,-1 ); std::cout << "right (remote) have to use IP address " << rightsourceip << std::endl; if (GlobalConfig->KvpncDebugLevel > 2) GlobalConfig->appendLogEntry("import ipsec config: right (remote) have to use IP address " + rightsourceip ,GlobalConfig->debug); @@ -800,7 +800,7 @@ void ImportIpsecProfileDialog::canAccept() if ( line2.startsWith ( "esp=" ) ) { validLineFound=true; - QString IpsecEsp=line2.section ( "esp=",1,-1 ); + TQString IpsecEsp=line2.section ( "esp=",1,-1 ); // std::cout << "esp settings found: " << IpsecEsp << std::endl; if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "import ipsec config: esp settings found: " ) + IpsecEsp ,GlobalConfig->debug ); @@ -813,7 +813,7 @@ void ImportIpsecProfileDialog::canAccept() if ( line2.startsWith ( "ike=" ) ) { validLineFound=true; - QString IpsecIke=line2.section ( "ike=",1,-1 ); + TQString IpsecIke=line2.section ( "ike=",1,-1 ); // std::cout << "ike settings found: " << IpsecIke << std::endl; if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "import ipsec config: ike settings found: " ) + IpsecIke ,GlobalConfig->debug ); @@ -826,7 +826,7 @@ void ImportIpsecProfileDialog::canAccept() if ( line2.startsWith ( "type=" ) ) { validLineFound=true; - QString IpsecVpnMode=line2.section ( "type=",1,1 ); + TQString IpsecVpnMode=line2.section ( "type=",1,1 ); // std::cout << "IpsecType found: " << IpsecType << std::endl; if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "import ipsec config: IPsec vpn mode found: " ) + IpsecVpnMode ,GlobalConfig->debug ); @@ -841,7 +841,7 @@ void ImportIpsecProfileDialog::canAccept() if ( line2.startsWith ( "leftxauthclient=" ) ) { validLineFound=true; - QString useXauth=line2.section ( "leftxauthclient=",1,1 ); + TQString useXauth=line2.section ( "leftxauthclient=",1,1 ); if (useXauth=="yes") { //std::cout << "Use XAUTH: " << i18n("yes") << std::endl; @@ -863,7 +863,7 @@ void ImportIpsecProfileDialog::canAccept() if ( line2.startsWith ( "rightxauthserver=" ) ) { validLineFound=true; - QString useXauth=line2.section ( "rightxauthserver=",1,-1 ); + TQString useXauth=line2.section ( "rightxauthserver=",1,-1 ); if (useXauth == "yes") { //std::cout << "Use XAUTH: " << i18n("yes") << std::endl; @@ -885,10 +885,10 @@ void ImportIpsecProfileDialog::canAccept() if ( line2.startsWith ( "keyingtries=" ) ) { validLineFound=true; - int MaxConnectTries=QString(line2.section ( "keyingtries=",1,1 )).toInt(); + int MaxConnectTries=TQString(line2.section ( "keyingtries=",1,1 )).toInt(); // std::cout << "keyingtries found: " << MaxConnectTries << std::endl; if ( GlobalConfig->KvpncDebugLevel > 2 ) - GlobalConfig->appendLogEntry ( i18n ( "import ipsec config: keyingtries found: " ) + QString().setNum(MaxConnectTries) ,GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "import ipsec config: keyingtries found: " ) + TQString().setNum(MaxConnectTries) ,GlobalConfig->debug ); profiledata->setMaxConnectTries ( MaxConnectTries ); // std::cout << " => set it for profile " << IpsecConfigSection << " ." << std::endl; // if (GlobalConfig->KvpncDebugLevel > 2) @@ -897,7 +897,7 @@ void ImportIpsecProfileDialog::canAccept() if ( line2.startsWith ( "pfs=" ) ) { validLineFound=true; - QString UsePerfectForwardSecrety=line2.section ( "pfs=",1,1 ).remove ( '"' ); + TQString UsePerfectForwardSecrety=line2.section ( "pfs=",1,1 ).remove ( '"' ); if (UsePerfectForwardSecrety =="yes") { //std::cout << "Use PFS: " << i18n("yes") << std::endl; @@ -919,7 +919,7 @@ void ImportIpsecProfileDialog::canAccept() if ( line2.startsWith ( "pfsgroup=" ) ) { validLineFound=true; - QString PerfectForwardSecrety=line2.section ( "pfsgroup=",1,1 ); + TQString PerfectForwardSecrety=line2.section ( "pfsgroup=",1,1 ); // std::cout << "keyingtries found: " << MaxConnectTries << std::endl; if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "import ipsec config: PFS group found: " ) + PerfectForwardSecrety ,GlobalConfig->debug ); @@ -931,7 +931,7 @@ void ImportIpsecProfileDialog::canAccept() if ( line2.startsWith ( "aggrmode=" ) ) { validLineFound=true; - QString UseAgressiveMode=line2.section ( "aggrmode=",1,1 ).remove ( '"' ); + TQString UseAgressiveMode=line2.section ( "aggrmode=",1,1 ).remove ( '"' ); if (UseAgressiveMode == "yes") { //std::cout << "Exchange mode: " << i18n("aggressive") << std::endl; @@ -982,11 +982,11 @@ void ImportIpsecProfileDialog::canAccept() // FIXME we only use the first in list - QString Interface = InterfaceList.first(); + TQString Interface = InterfaceList.first(); profiledata->setNetworkDevice ( Interface ); profiledata->setName ( "kvpnc_import_"+profiledata->getName() ); - profiledata->setDescription ( QString ( i18n ( "import from " ) +filename ) ); + profiledata->setDescription ( TQString ( i18n ( "import from " ) +filename ) ); ImportedAccountList->append ( profiledata ); } } @@ -1007,11 +1007,11 @@ void ImportIpsecProfileDialog::canAccept() selectdlg.ImportProfileListView->addColumn ( i18n ( "Gateway" ) ); selectdlg.ImportProfileListView->addColumn ( i18n ( "Authentication" ) ); selectdlg.ImportProfileListView->addColumn ( i18n ( "Remote network" ) ); - QCheckListItem *item; + TQCheckListItem *item; for ( it = ImportedAccountList->first(); it; it = ImportedAccountList->next() ) { - QString name = it->getName(); - QString type=""; + TQString name = it->getName(); + TQString type=""; if ( it->getConnectionType() == VpnAccountData::cisco ) type = "cisco" ; else if ( it->getConnectionType() == VpnAccountData::ciscoorig ) @@ -1032,7 +1032,7 @@ void ImportIpsecProfileDialog::canAccept() type = i18n ( "other" ); // litem->setSelectable(true); - item = new QCheckListItem ( selectdlg.ImportProfileListView,it->getName(),QCheckListItem::RadioButton ); + item = new TQCheckListItem ( selectdlg.ImportProfileListView,it->getName(),TQCheckListItem::RadioButton ); item->setText ( 1,type ); item->setText ( 2,it->getGateway() ); if ( it->getAuthType() == VpnAccountData::cert ) @@ -1042,13 +1042,13 @@ void ImportIpsecProfileDialog::canAccept() else item->setText ( 3,i18n ( "unknown" ) ); selectdlg.ImportProfileListView->insertItem ( item ); - QString RemoteNetDiv="/"; + TQString RemoteNetDiv="/"; if ( it->getRemoteNetAddr() == "" ) { it->setRemoteNetMask ( "" ); RemoteNetDiv=""; } - item->setText ( 4,QString ( it->getRemoteNetAddr() +RemoteNetDiv+it->getRemoteNetMask() ) ); + item->setText ( 4,TQString ( it->getRemoteNetAddr() +RemoteNetDiv+it->getRemoteNetMask() ) ); // std::cout << "insert profile into listview: " << name << std::endl; } @@ -1058,18 +1058,18 @@ void ImportIpsecProfileDialog::canAccept() if ( ret == true ) { - QListViewItemIterator it2 ( selectdlg.ImportProfileListView ); + TQListViewItemIterator it2 ( selectdlg.ImportProfileListView ); for ( ; it2.current(); ++it2 ) { if ( profilefound==false ) { - if ( ( ( QCheckListItem* ) it2.current() )->isOn() ) + if ( ( ( TQCheckListItem* ) it2.current() )->isOn() ) { VpnAccountData *data=NULL; it = 0; for ( it = ImportedAccountList->first(); it; it = ImportedAccountList->next() ) { - if ( it->getName() == ( ( QCheckListItem* ) it2.current() )->text() && ( ( QCheckListItem* ) it2.current() )->isOn() ) + if ( it->getName() == ( ( TQCheckListItem* ) it2.current() )->text() && ( ( TQCheckListItem* ) it2.current() )->isOn() ) { acc = it; profilefound=true; @@ -1095,6 +1095,6 @@ void ImportIpsecProfileDialog::canAccept() importOk = false; //std::cout << "accept" << std::endl; - QDialog::accept(); + TQDialog::accept(); } diff --git a/src/importipsecprofiledialog.h b/src/importipsecprofiledialog.h index dff2f18..8d2e71e 100644 --- a/src/importipsecprofiledialog.h +++ b/src/importipsecprofiledialog.h @@ -30,19 +30,19 @@ class ImportIpsecProfileDialog : public KDialogBase { public: - ImportIpsecProfileDialog( KVpncConfig *config, QWidget *parent, const QString& caption, QString file); + ImportIpsecProfileDialog( KVpncConfig *config, TQWidget *parent, const TQString& caption, TQString file); ~ImportIpsecProfileDialog(); void canAccept(); - QString filename; + TQString filename; bool importOk; VpnAccountData *acc; ImportOpenvpnProfileDialogBase *main; private: struct IpsecImportSection { - QString SectionName; - QStringList SectionData; + TQString SectionName; + TQStringList SectionData; }; public slots: @@ -51,8 +51,8 @@ public slots: private: KVpncConfig* GlobalConfig; - QString Pkcs12CertFile; - QString CertPath; + TQString Pkcs12CertFile; + TQString CertPath; }; #endif diff --git a/src/importopenvpnprofiledialog.cpp b/src/importopenvpnprofiledialog.cpp index 1a4877e..61ed32e 100644 --- a/src/importopenvpnprofiledialog.cpp +++ b/src/importopenvpnprofiledialog.cpp @@ -33,13 +33,13 @@ #include #include #include -#include -#include +#include +#include #include -#include -#include +#include +#include #include -#include +#include #include @@ -48,7 +48,7 @@ #include "importcertificatedialog.h" //END INCLUDES -ImportOpenvpnProfileDialog::ImportOpenvpnProfileDialog ( KVpncConfig *config, QWidget *parent, const QString& caption, QString file ) +ImportOpenvpnProfileDialog::ImportOpenvpnProfileDialog ( KVpncConfig *config, TQWidget *parent, const TQString& caption, TQString file ) : KDialogBase ( parent, "Import_Cisco_OpenVPN_profile", true, caption, KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true ) { @@ -63,7 +63,7 @@ ImportOpenvpnProfileDialog::ImportOpenvpnProfileDialog ( KVpncConfig *config, QW main = new ImportOpenvpnProfileDialogBase ( this ); setMainWidget ( main ); - //main->setMinimumSize(main->sizeHint()); + //main->setMinimumSize(main->tqsizeHint()); main->FilenameUrlrequester->setFilter ( "*.ovpn *.conf" ); @@ -98,7 +98,7 @@ void ImportOpenvpnProfileDialog::accept() void ImportOpenvpnProfileDialog::canAccept() { - QFile f ( filename ); + TQFile f ( filename ); if ( !f.exists() ) { KMessageBox::sorry ( 0, i18n ( "File not found." ), i18n ( "No File" ) ); @@ -223,21 +223,21 @@ void ImportOpenvpnProfileDialog::canAccept() */ //END Sample - QFile OpenvpnConfigFile ( filename ); - QTextStream stream ( &OpenvpnConfigFile ); + TQFile OpenvpnConfigFile ( filename ); + TQTextStream stream ( &OpenvpnConfigFile ); - QString importprefix = QFileInfo ( filename ).dirPath(); + TQString importprefix = TQFileInfo ( filename ).dirPath(); if ( config->KvpncDebugLevel > 2 ) config->appendLogEntry ( i18n ( "OpenVPN import: import prefix: %1" ).arg ( importprefix ), config->debug ); - QString certprefix = locateLocal ( "data", "kvpnc" ); + TQString certprefix = locateLocal ( "data", "kvpnc" ); if ( OpenvpnConfigFile.open ( IO_ReadOnly ) ) { VpnAccountData::ConnectionType ConnType = VpnAccountData::openvpn; acc = new VpnAccountData ( ConnType, "" ); - QString profilename = Utils ( config ).removeSpecialCharsForFilename ( filename.section ( '/', -1, -1 ) ).section ( '.', -2, -2 ); + TQString profilename = Utils ( config ).removeSpecialCharsForFilename ( filename.section ( '/', -1, -1 ) ).section ( '.', -2, -2 ); acc->setName ( profilename ); // /home/user/openvpn/CompanyABC.conf -> CompanyABC acc->setDescription ( i18n ( "Imported from %1" ).arg ( Utils ( config ).removeSpecialCharsForFilename ( filename.section ( '/', -1, -1 ) ) ) ); acc->setLocalPort ( 1194 ); @@ -252,20 +252,20 @@ void ImportOpenvpnProfileDialog::canAccept() // acc->setDoReconnectAfterConnectionLost( false ); // inline cert settings - QString CaCert=""; - QString Cert=""; - QString PrivateKey=""; - QString StaticKey=""; + TQString CaCert=""; + TQString Cert=""; + TQString PrivateKey=""; + TQString StaticKey=""; bool CaCertStartFound=false; bool CertStartFound=false; bool PrivateKeyStartFound=false; bool StaticKeyStartFound=false; bool TlsAuthStartFound=false; - QString line = ""; + TQString line = ""; while ( !stream.atEnd() ) { - QString line_raw = stream.readLine(); + TQString line_raw = stream.readLine(); line = line_raw.simplifyWhiteSpace(); // line of text excluding '\n' and replace all white chars with one blank /* look for inline parts */ @@ -276,14 +276,14 @@ void ImportOpenvpnProfileDialog::canAccept() if ( config->KvpncDebugLevel > 4 ) config->appendLogEntry ( i18n ( "OpenVPN import: inlince ca end found." ), config->debug ); - QString CaFilePath = certprefix+"/"+"openvpn_ca_"+profilename+".pem"; + TQString CaFilePath = certprefix+"/"+"openvpn_ca_"+profilename+".pem"; if ( config->KvpncDebugLevel > 2 ) config->appendLogEntry ( i18n ( "OpenVPN import: ca file: %1" ).arg ( CaFilePath ), config->debug ); - QFile CaFileHandle (CaFilePath); + TQFile CaFileHandle (CaFilePath); if( CaFileHandle.open(IO_WriteOnly)) { - QTextStream ExportStream ( &CaFileHandle ); + TQTextStream ExportStream ( &CaFileHandle ); ExportStream << CaCert; CaFileHandle.close(); acc->setCaCertificate ( CaFilePath ); @@ -310,17 +310,17 @@ void ImportOpenvpnProfileDialog::canAccept() if ( config->KvpncDebugLevel > 4 ) config->appendLogEntry ( i18n ( "OpenVPN import: inlince cert end found." ), config->debug ); - QString CertFilePath = certprefix+"/"+"openvpn_cert_"+profilename+".pem"; + TQString CertFilePath = certprefix+"/"+"openvpn_cert_"+profilename+".pem"; if ( config->KvpncDebugLevel > 2 ) config->appendLogEntry ( i18n ( "OpenVPN import: cert file: %1" ).arg ( CertFilePath ), config->debug ); acc->setAuthType ( VpnAccountData::cert ); acc->setCertPath (certprefix); - QFile CertFileHandle (CertFilePath); + TQFile CertFileHandle (CertFilePath); if( CertFileHandle.open(IO_WriteOnly)) { - QTextStream ExportStream ( &CertFileHandle ); + TQTextStream ExportStream ( &CertFileHandle ); ExportStream << Cert; CertFileHandle.close(); acc->setX509Certificate ( CertFilePath ); @@ -347,14 +347,14 @@ void ImportOpenvpnProfileDialog::canAccept() if ( config->KvpncDebugLevel > 4 ) config->appendLogEntry ( i18n ( "OpenVPN import: inlince private key end found." ), config->debug ); - QString PrivateKeyFilePath = certprefix+"/"+"openvpn_privatekey_"+profilename+".pem"; + TQString PrivateKeyFilePath = certprefix+"/"+"openvpn_privatekey_"+profilename+".pem"; if ( config->KvpncDebugLevel > 2 ) config->appendLogEntry ( i18n ( "OpenVPN import: private key file: %1" ).arg ( PrivateKeyFilePath ), config->debug ); - QFile PrivateKeyFileHandle (PrivateKeyFilePath); + TQFile PrivateKeyFileHandle (PrivateKeyFilePath); if( PrivateKeyFileHandle.open(IO_WriteOnly)) { - QTextStream ExportStream ( &PrivateKeyFileHandle ); + TQTextStream ExportStream ( &PrivateKeyFileHandle ); ExportStream << PrivateKey << "\n"; PrivateKeyFileHandle.close(); acc->setPrivateKey ( PrivateKeyFilePath ); @@ -381,14 +381,14 @@ void ImportOpenvpnProfileDialog::canAccept() if ( config->KvpncDebugLevel > 4 ) config->appendLogEntry ( i18n ( "OpenVPN import: inlince tls-auth end found." ), config->debug ); - QString StaticKeyFilePath = certprefix+"/"+"openvpn_tlsauth_"+profilename+".pem"; + TQString StaticKeyFilePath = certprefix+"/"+"openvpn_tlsauth_"+profilename+".pem"; if ( config->KvpncDebugLevel > 2 ) config->appendLogEntry ( i18n ( "OpenVPN import: TLS auth file: %1" ).arg ( StaticKeyFilePath ), config->debug ); - QFile StaticKeyFileHandle (StaticKeyFilePath); + TQFile StaticKeyFileHandle (StaticKeyFilePath); if( StaticKeyFileHandle.open(IO_WriteOnly)) { - QTextStream ExportStream ( &StaticKeyFileHandle ); + TQTextStream ExportStream ( &StaticKeyFileHandle ); ExportStream << StaticKey << "\n"; StaticKeyFileHandle.close(); acc->setTlsAuthFile ( StaticKeyFilePath ); @@ -441,7 +441,7 @@ void ImportOpenvpnProfileDialog::canAccept() } else if ( line.startsWith ( "dev " ) ) { - QString Type = line.section ( ' ', 1, 1 ); // tun or tap + TQString Type = line.section ( ' ', 1, 1 ); // tun or tap if ( Type == "tun" || Type == "tap" ) { acc->setTunnelDeviceType ( Type ); @@ -454,16 +454,16 @@ void ImportOpenvpnProfileDialog::canAccept() // FIXME no fully supported yet!!! // FIXME made it possible to remember what type have to been set! - QString gateway_type = ""; + TQString gateway_type = ""; bool useGateway; acc->setUseAdditionalNetworkRoutes ( true ); - QStringList AdditionalNetworkRoutes; + TQStringList AdditionalNetworkRoutes; // example entry: // /# - QString network = line.section ( ' ', 1, 1 ) + "/" + line.section ( ' ', 2, 2 ); // ip and netmask + TQString network = line.section ( ' ', 1, 1 ) + "/" + line.section ( ' ', 2, 2 ); // ip and netmask - QString Part3 = line.section ( ' ', 3, 3 ); // possible gateway + TQString Part3 = line.section ( ' ', 3, 3 ); // possible gateway if ( Part3 != "vpn_gateway" && Part3 != "net_gateway" && Part3 != "remote_host" ) { network.append ( "#" ); @@ -501,27 +501,27 @@ void ImportOpenvpnProfileDialog::canAccept() else if ( line.startsWith ( "cert " ) ) { acc->setAuthType ( VpnAccountData::cert ); - QString cert = line.section ( ' ', 1 ).stripWhiteSpace(); + TQString cert = line.section ( ' ', 1 ).stripWhiteSpace(); if ( config->KvpncDebugLevel > 2 ) config->appendLogEntry ( i18n ( "OpenVPN import: cert file: %1" ).arg ( importprefix+"/"+cert ), config->debug ); - if ( QFile ( QString ( importprefix+"/"+cert ) ).exists() ) + if ( TQFile ( TQString ( importprefix+"/"+cert ) ).exists() ) { // copy to ~/.kde/share/apps/kvpnc/ and rename it if ( config->KvpncDebugLevel > 0 ) - config->appendLogEntry ( i18n ( "OpenVPN import: copy %1 to %2" ).arg ( QString ( importprefix+"/"+cert ) ).arg ( QString ( certprefix+"/"+"openvpn_cert_"+profilename+"_"+cert ) ), config->debug ); - QProcess CopyProcess ( this ); + config->appendLogEntry ( i18n ( "OpenVPN import: copy %1 to %2" ).arg ( TQString ( importprefix+"/"+cert ) ).arg ( TQString ( certprefix+"/"+"openvpn_cert_"+profilename+"_"+cert ) ), config->debug ); + TQProcess CopyProcess ( this ); CopyProcess.addArgument ( "cp" ); - CopyProcess.addArgument ( QString ( importprefix+"/"+cert ) ); - CopyProcess.addArgument ( QString ( certprefix+"/"+"openvpn_cert_"+profilename+"_"+cert ) ); + CopyProcess.addArgument ( TQString ( importprefix+"/"+cert ) ); + CopyProcess.addArgument ( TQString ( certprefix+"/"+"openvpn_cert_"+profilename+"_"+cert ) ); if ( CopyProcess.start() ) { while (CopyProcess.isRunning()) { sleep(1); } - acc->setX509Certificate ( QString ( certprefix+"/"+"openvpn_cert_"+profilename+"_"+cert ) ); + acc->setX509Certificate ( TQString ( certprefix+"/"+"openvpn_cert_"+profilename+"_"+cert ) ); } else { @@ -541,27 +541,27 @@ void ImportOpenvpnProfileDialog::canAccept() else if ( line.startsWith ( "key " ) ) { - QString privatekey = line.section ( ' ', 1 ).stripWhiteSpace(); + TQString privatekey = line.section ( ' ', 1 ).stripWhiteSpace(); if ( config->KvpncDebugLevel > 2 ) config->appendLogEntry ( i18n ( "OpenVPN import: private key file for certificate: %1" ).arg ( importprefix+"/"+privatekey ), config->debug ); - if ( QFile ( QString ( importprefix+"/"+privatekey ) ).exists() ) + if ( TQFile ( TQString ( importprefix+"/"+privatekey ) ).exists() ) { // copy to ~/.kde/share/apps/kvpnc/ and rename it if ( config->KvpncDebugLevel > 0 ) - config->appendLogEntry ( i18n ( "OpenVPN import: copy %1 to %2" ).arg ( QString ( importprefix+"/"+privatekey ) ).arg ( QString ( certprefix+"/"+"openvpn_privatekey_"+profilename+"_"+privatekey ) ), config->debug ); - QProcess CopyProcess ( this ); + config->appendLogEntry ( i18n ( "OpenVPN import: copy %1 to %2" ).arg ( TQString ( importprefix+"/"+privatekey ) ).arg ( TQString ( certprefix+"/"+"openvpn_privatekey_"+profilename+"_"+privatekey ) ), config->debug ); + TQProcess CopyProcess ( this ); CopyProcess.addArgument ( "cp" ); - CopyProcess.addArgument ( QString ( importprefix+"/"+privatekey ) ); - CopyProcess.addArgument ( QString ( certprefix+"/"+"openvpn_privatekey_"+profilename+"_"+privatekey ) ); + CopyProcess.addArgument ( TQString ( importprefix+"/"+privatekey ) ); + CopyProcess.addArgument ( TQString ( certprefix+"/"+"openvpn_privatekey_"+profilename+"_"+privatekey ) ); if ( CopyProcess.start() ) { while (CopyProcess.isRunning()) { sleep(1); } - acc->setPrivateKey ( QString ( certprefix+"/"+"openvpn_privatekey_"+profilename+"_"+privatekey ) ); + acc->setPrivateKey ( TQString ( certprefix+"/"+"openvpn_privatekey_"+profilename+"_"+privatekey ) ); } else { @@ -582,27 +582,27 @@ void ImportOpenvpnProfileDialog::canAccept() { acc->setAuthType ( VpnAccountData::psk ); - QString privatekey = line.section ( ' ', 1 ).stripWhiteSpace(); + TQString privatekey = line.section ( ' ', 1 ).stripWhiteSpace(); if ( config->KvpncDebugLevel > 2 ) config->appendLogEntry ( i18n ( "OpenVPN import: private key file: %1" ).arg ( importprefix+"/"+privatekey ), config->debug ); - if ( QFile ( QString ( importprefix+"/"+privatekey ) ).exists() ) + if ( TQFile ( TQString ( importprefix+"/"+privatekey ) ).exists() ) { // copy to ~/.kde/share/apps/kvpnc/ and rename it if ( config->KvpncDebugLevel > 0 ) - config->appendLogEntry ( i18n ( "OpenVPN import: copy %1 to %2" ).arg ( QString ( importprefix+"/"+privatekey ) ).arg ( QString ( certprefix+"/"+"openvpn_privatekey_"+profilename+"_"+privatekey ) ), config->debug ); - QProcess CopyProcess ( this ); + config->appendLogEntry ( i18n ( "OpenVPN import: copy %1 to %2" ).arg ( TQString ( importprefix+"/"+privatekey ) ).arg ( TQString ( certprefix+"/"+"openvpn_privatekey_"+profilename+"_"+privatekey ) ), config->debug ); + TQProcess CopyProcess ( this ); CopyProcess.addArgument ( "cp" ); - CopyProcess.addArgument ( QString ( importprefix+"/"+privatekey ) ); - CopyProcess.addArgument ( QString ( certprefix+"/"+"openvpn_privatekey_"+profilename+"_"+privatekey ) ); + CopyProcess.addArgument ( TQString ( importprefix+"/"+privatekey ) ); + CopyProcess.addArgument ( TQString ( certprefix+"/"+"openvpn_privatekey_"+profilename+"_"+privatekey ) ); if ( CopyProcess.start() ) { while (CopyProcess.isRunning()) { sleep(1); } - acc->setPreSharedKeyFile ( QString ( certprefix+"/"+"openvpn_privatekey_"+profilename+"_"+privatekey ) ); + acc->setPreSharedKeyFile ( TQString ( certprefix+"/"+"openvpn_privatekey_"+profilename+"_"+privatekey ) ); acc->setSavePsk ( false ); } else @@ -624,27 +624,27 @@ void ImportOpenvpnProfileDialog::canAccept() { acc->setAuthType ( VpnAccountData::cert ); - QString ca = line.section ( ' ', 1 ); + TQString ca = line.section ( ' ', 1 ); if ( config->KvpncDebugLevel > 2 ) config->appendLogEntry ( i18n ( "OpenVPN import: ca file: %1" ).arg ( importprefix+"/"+ca ), config->debug ); - if ( QFile ( QString ( importprefix+"/"+ca ) ).exists() ) + if ( TQFile ( TQString ( importprefix+"/"+ca ) ).exists() ) { // copy to ~/.kde/share/apps/kvpnc/ and rename it if ( config->KvpncDebugLevel > 0 ) - config->appendLogEntry ( i18n ( "OpenVPN import: copy %1 to %2" ).arg ( QString ( importprefix+"/"+ca ) ).arg ( QString ( certprefix+"/"+"openvpn_privatekey_"+profilename+"_"+ca ) ), config->debug ); - QProcess CopyProcess ( this ); + config->appendLogEntry ( i18n ( "OpenVPN import: copy %1 to %2" ).arg ( TQString ( importprefix+"/"+ca ) ).arg ( TQString ( certprefix+"/"+"openvpn_privatekey_"+profilename+"_"+ca ) ), config->debug ); + TQProcess CopyProcess ( this ); CopyProcess.addArgument ( "cp" ); - CopyProcess.addArgument ( QString ( importprefix+"/"+ca ) ); - CopyProcess.addArgument ( QString ( certprefix+"/"+"openvpn_privatekey_"+profilename+"_"+ca ) ); + CopyProcess.addArgument ( TQString ( importprefix+"/"+ca ) ); + CopyProcess.addArgument ( TQString ( certprefix+"/"+"openvpn_privatekey_"+profilename+"_"+ca ) ); if ( CopyProcess.start() ) { while (CopyProcess.isRunning()) { sleep(1); } - acc->setCaCertificate ( QString ( certprefix+"/"+"openvpn_privatekey_"+profilename+"_"+ca ) ); + acc->setCaCertificate ( TQString ( certprefix+"/"+"openvpn_privatekey_"+profilename+"_"+ca ) ); } else { @@ -716,8 +716,8 @@ void ImportOpenvpnProfileDialog::canAccept() { acc->setUseTlsAuth ( true ); - QString tlsauth = line.section ( ' ', 1,1 ); - QString tlsauthdirection = line.section ( ' ', 2,2 ); + TQString tlsauth = line.section ( ' ', 1,1 ); + TQString tlsauthdirection = line.section ( ' ', 2,2 ); if ( config->KvpncDebugLevel > 2 ) { @@ -725,22 +725,22 @@ void ImportOpenvpnProfileDialog::canAccept() config->appendLogEntry ( i18n ( "OpenVPN import: TLS auth direction: %1" ).arg ( tlsauthdirection ), config->debug ); } - if ( QFile ( QString ( importprefix+"/"+tlsauth ) ).exists() ) + if ( TQFile ( TQString ( importprefix+"/"+tlsauth ) ).exists() ) { // copy to ~/.kde/share/apps/kvpnc/ and rename it if ( config->KvpncDebugLevel > 0 ) - config->appendLogEntry ( i18n ( "OpenVPN import: copy %1 to %2" ).arg ( QString ( importprefix+"/"+tlsauth ) ).arg ( QString ( certprefix+"/"+"openvpn_privatekey_"+profilename+"_"+tlsauth ) ), config->debug ); - QProcess CopyProcess ( this ); + config->appendLogEntry ( i18n ( "OpenVPN import: copy %1 to %2" ).arg ( TQString ( importprefix+"/"+tlsauth ) ).arg ( TQString ( certprefix+"/"+"openvpn_privatekey_"+profilename+"_"+tlsauth ) ), config->debug ); + TQProcess CopyProcess ( this ); CopyProcess.addArgument ( "cp" ); - CopyProcess.addArgument ( QString ( importprefix+"/"+tlsauth ) ); - CopyProcess.addArgument ( QString ( certprefix+"/"+"openvpn_tlsauth_"+profilename+"_"+tlsauth ) ); + CopyProcess.addArgument ( TQString ( importprefix+"/"+tlsauth ) ); + CopyProcess.addArgument ( TQString ( certprefix+"/"+"openvpn_tlsauth_"+profilename+"_"+tlsauth ) ); if ( CopyProcess.start() ) { while (CopyProcess.isRunning()) { sleep(1); } - acc->setTlsAuthFile ( QString ( certprefix+"/"+"openvpn_tlsauth_"+profilename+"_"+tlsauth ) ); + acc->setTlsAuthFile ( TQString ( certprefix+"/"+"openvpn_tlsauth_"+profilename+"_"+tlsauth ) ); } else { @@ -761,7 +761,7 @@ void ImportOpenvpnProfileDialog::canAccept() { acc->setAuthenticationDirection(tlsauthdirection); if ( config->KvpncDebugLevel > 0 ) - config->appendLogEntry ( i18n ( "OpenVPN import: use TLS auth direction: %1" ).arg(tlsauthdirection), config->debug ); + config->appendLogEntry ( i18n ( "OpenVPN import: use TLS auth direction: %1" ).tqarg(tlsauthdirection), config->debug ); } } else if ( line.startsWith ( "redirect-gateway" ) ) @@ -799,14 +799,14 @@ void ImportOpenvpnProfileDialog::canAccept() acc->setHttpProxy ( line.section ( ' ', 1, 1 ) ); acc->setHttpProxyPort ( line.section ( ' ', 2, 2 ).toInt() ); if ( config->KvpncDebugLevel > 0 ) - config->appendLogEntry ( i18n ( "OpenVPN import: use HTTP proxy: %1, Port: %2" ).arg ( acc->getHttpProxy() ).arg ( QString().setNum ( acc->getHttpProxyPort() ) ), config->debug ); + config->appendLogEntry ( i18n ( "OpenVPN import: use HTTP proxy: %1, Port: %2" ).arg ( acc->getHttpProxy() ).arg ( TQString().setNum ( acc->getHttpProxyPort() ) ), config->debug ); } else if ( line.startsWith ( "http-proxy-timeout " ) ) { acc->setUseHttpProxy ( true ); acc->setHttpProxyTimeout ( line.section ( ' ', 1, 1 ).toInt() ); if ( config->KvpncDebugLevel > 0 ) - config->appendLogEntry ( i18n ( "OpenVPN import: use NS certificate type: %1" ).arg ( QString().setNum ( acc->getHttpProxyTimeout() ) ), config->debug ); + config->appendLogEntry ( i18n ( "OpenVPN import: use NS certificate type: %1" ).arg ( TQString().setNum ( acc->getHttpProxyTimeout() ) ), config->debug ); } else if ( line.startsWith ( "pkcs12 " ) ) { @@ -853,8 +853,8 @@ void ImportOpenvpnProfileDialog::canAccept() else if ( line.startsWith ( "ifconfig " ) ) { acc->setUseVirtualIP ( true ); - QString VirtualIpLocal = line.section ( ' ', 1, 1 ); - QString VirtualIpRemote = line.section ( ' ', 2, 2 ); + TQString VirtualIpLocal = line.section ( ' ', 1, 1 ); + TQString VirtualIpRemote = line.section ( ' ', 2, 2 ); acc->setLocalVirtualIP ( VirtualIpLocal ); acc->setRemoteVirtualIP ( VirtualIpRemote ); if ( config->KvpncDebugLevel > 0 ) @@ -882,16 +882,16 @@ void ImportOpenvpnProfileDialog::canAccept() else if ( line.startsWith ( "fragment " ) ) { acc->setUseFragment( true ); - int Fragment = QString(line.section ( ' ', 1, 1 )).toInt(); + int Fragment = TQString(line.section ( ' ', 1, 1 )).toInt(); acc->setFragment( Fragment ); if ( config->KvpncDebugLevel > 0 ) - config->appendLogEntry ( i18n ( "OpenVPN import: use fragmention, size: %1" ).arg ( QString().setNum(Fragment) ), config->debug ); + config->appendLogEntry ( i18n ( "OpenVPN import: use fragmention, size: %1" ).arg ( TQString().setNum(Fragment) ), config->debug ); } else if ( line.startsWith ( "inactive " ) ) { // acc->setUseVirtualIP ( true ); -// QString VirtualIpLocal = line.section ( ' ', 1, 1 ); -// QString VirtualIpRemote = line.section ( ' ', 2, 2 ); +// TQString VirtualIpLocal = line.section ( ' ', 1, 1 ); +// TQString VirtualIpRemote = line.section ( ' ', 2, 2 ); // acc->setLocalVirtualIP ( VirtualIpLocal ); // acc->setRemoteVirtualIP ( VirtualIpRemote ); // if ( config->KvpncDebugLevel > 0 ) @@ -900,10 +900,10 @@ void ImportOpenvpnProfileDialog::canAccept() else if ( line.startsWith ( "mssfix" ) ) { acc->setUseMssfix ( true ); - int Mssfix = QString(line.section ( ' ', 1, 1 )).toInt(); + int Mssfix = TQString(line.section ( ' ', 1, 1 )).toInt(); acc->setMssfix( Mssfix ); if ( config->KvpncDebugLevel > 0 ) - config->appendLogEntry ( i18n ( "OpenVPN import: use Mssfix, size: %1" ).arg ( QString().setNum(Mssfix )), config->debug ); + config->appendLogEntry ( i18n ( "OpenVPN import: use Mssfix, size: %1" ).arg ( TQString().setNum(Mssfix )), config->debug ); } else if ( line.startsWith ( "nobind" ) ) { @@ -915,34 +915,34 @@ void ImportOpenvpnProfileDialog::canAccept() else if ( line.startsWith ( "ping " ) ) { acc->setUseTunnelPing( true ); - int TunnelPing = QString(line.section ( ' ', 1, 1 )).toInt(); + int TunnelPing = TQString(line.section ( ' ', 1, 1 )).toInt(); acc->setTunnelPing ( TunnelPing); if ( config->KvpncDebugLevel > 0 ) - config->appendLogEntry ( i18n ( "OpenVPN import: use ping through tunnel every: %1" ).arg ( QString().setNum(TunnelPing) ), config->debug ); + config->appendLogEntry ( i18n ( "OpenVPN import: use ping through tunnel every: %1" ).arg ( TQString().setNum(TunnelPing) ), config->debug ); } else if ( line.startsWith ( "ping-restart " ) ) { acc->setUseTunnelPingRestart( true ); - int TunnelPingRestart = QString(line.section ( ' ', 1, 1 )).toInt(); + int TunnelPingRestart = TQString(line.section ( ' ', 1, 1 )).toInt(); acc->setTunnelPingRestart ( TunnelPingRestart ); if ( config->KvpncDebugLevel > 0 ) - config->appendLogEntry ( i18n ( "OpenVPN import: restart ping through tunnel fails after: %1" ).arg ( QString().setNum(TunnelPingRestart) ), config->debug ); + config->appendLogEntry ( i18n ( "OpenVPN import: restart ping through tunnel fails after: %1" ).arg ( TQString().setNum(TunnelPingRestart) ), config->debug ); } else if ( line.startsWith ( "reneg-sec " ) ) { acc->setUseRenegSec ( true ); - int RenegSec =QString(line.section ( ' ', 1, 1 )).toInt(); + int RenegSec =TQString(line.section ( ' ', 1, 1 )).toInt(); acc->setRenegSec ( RenegSec ); if ( config->KvpncDebugLevel > 0 ) - config->appendLogEntry ( i18n ( "OpenVPN import: use reneg-sec: %1" ).arg ( QString().setNum(RenegSec) ), config->debug ); + config->appendLogEntry ( i18n ( "OpenVPN import: use reneg-sec: %1" ).arg ( TQString().setNum(RenegSec) ), config->debug ); } else if ( line.startsWith ( "tun-mtu " ) ) { acc->setUseMtu ( true ); - int Mtu = QString(line.section ( ' ', 1, 1 )).toInt(); + int Mtu = TQString(line.section ( ' ', 1, 1 )).toInt(); acc->setMtu ( Mtu ); if ( config->KvpncDebugLevel > 0 ) - config->appendLogEntry ( i18n ( "OpenVPN import: use usedefinied MTU: %1" ).arg ( QString().setNum(Mtu) ), config->debug ); + config->appendLogEntry ( i18n ( "OpenVPN import: use usedefinied MTU: %1" ).arg ( TQString().setNum(Mtu) ), config->debug ); } } } @@ -954,108 +954,108 @@ void ImportOpenvpnProfileDialog::canAccept() // } // // /* we need to put the prefix to all cert paths */ // if ( !acc->getCaCertificate().isEmpty() && !acc->getCaCertificate().startsWith( CertPath ) ) { -// QString prefix = "./"; +// TQString prefix = "./"; // if ( !filename.find( '/' ) > -1 ) -// prefix = QString( Utils(this->GlobalConfig).removeSpecialCharsForFilename( filename).section( '/', 0, -2 ) + "/" ); +// prefix = TQString( Utils(this->GlobalConfig).removeSpecialCharsForFilename( filename).section( '/', 0, -2 ) + "/" ); // -// QFile CaCertFileSrc ( prefix + acc->getCaCertificate() ); -// QFile CaCertFileDst ( QString( CertPath + "/openvpnimport_" + acc->getCaCertificate() ) ); -// acc->setCaCertificate( QString( CertPath + "/openvpnimport_" + acc->getCaCertificate() ) ); +// TQFile CaCertFileSrc ( prefix + acc->getCaCertificate() ); +// TQFile CaCertFileDst ( TQString( CertPath + "/openvpnimport_" + acc->getCaCertificate() ) ); +// acc->setCaCertificate( TQString( CertPath + "/openvpnimport_" + acc->getCaCertificate() ) ); // -// QTextStream CaCertDstStream( &CaCertFileDst ); +// TQTextStream CaCertDstStream( &CaCertFileDst ); // // if ( config->KvpncDebugLevel > 1 ) -// config->appendLogEntry( i18n( "OpenVPN import: try to copy ca cert file %1 to %2." ).arg( CaCertFileSrc.name() ).arg( CaCertFileDst.name() ), config->debug ); +// config->appendLogEntry( i18n( "OpenVPN import: try to copy ca cert file %1 to %2." ).tqarg( CaCertFileSrc.name() ).tqarg( CaCertFileDst.name() ), config->debug ); // // // if ( CaCertFileSrc.open( IO_ReadOnly ) ) { // if ( CaCertFileDst.open( IO_WriteOnly ) ) { -// QString CaCertFileString = QString( CaCertFileSrc.readAll() ); +// TQString CaCertFileString = TQString( CaCertFileSrc.readAll() ); // CaCertDstStream << CaCertFileString; // CaCertFileDst.close(); // if ( config->KvpncDebugLevel > 1 ) -// config->appendLogEntry( i18n( "OpenVPN import: ca cert file %1 copied to %2." ).arg( CaCertFileSrc.name() ).arg( CaCertFileDst.name() ), config->debug ); +// config->appendLogEntry( i18n( "OpenVPN import: ca cert file %1 copied to %2." ).tqarg( CaCertFileSrc.name() ).tqarg( CaCertFileDst.name() ), config->debug ); // } else { // if ( config->KvpncDebugLevel > 2 ) -// config->appendLogEntry( i18n( "OpenVPN import: ca cert file %1 could not open for writing." ).arg( CaCertFileDst.name() ), config->debug ); +// config->appendLogEntry( i18n( "OpenVPN import: ca cert file %1 could not open for writing." ).tqarg( CaCertFileDst.name() ), config->debug ); // // // return; // } // CaCertFileDst.close(); // } else { // if ( config->KvpncDebugLevel > 2 ) -// config->appendLogEntry( i18n( "OpenVPN import: ca cert file %1 could not open for reading." ).arg( CaCertFileSrc.name() ), config->debug ); +// config->appendLogEntry( i18n( "OpenVPN import: ca cert file %1 could not open for reading." ).tqarg( CaCertFileSrc.name() ), config->debug ); // // // return; // } // } // if ( !acc->getX509Certificate().isEmpty() && !acc->getX509Certificate().startsWith( CertPath ) ) { -// QString prefix = "./"; +// TQString prefix = "./"; // if ( !filename.find( '/' ) > -1 ) -// prefix = QString( Utils(this->GlobalConfig).removeSpecialCharsForFilename(filename).section( '/', 0, -2 ) + "/" ); +// prefix = TQString( Utils(this->GlobalConfig).removeSpecialCharsForFilename(filename).section( '/', 0, -2 ) + "/" ); // -// QFile X509CertFileSrc ( prefix + acc->getX509Certificate() ); -// QFile X509CertFileDst ( QString( CertPath + "/openvpnimport_" + acc->getX509Certificate() ) ); -// acc->setX509Certificate( QString( CertPath + "/openvpnimport_" + acc->getX509Certificate() ) ); +// TQFile X509CertFileSrc ( prefix + acc->getX509Certificate() ); +// TQFile X509CertFileDst ( TQString( CertPath + "/openvpnimport_" + acc->getX509Certificate() ) ); +// acc->setX509Certificate( TQString( CertPath + "/openvpnimport_" + acc->getX509Certificate() ) ); // -// QTextStream X509CertDstStream( &X509CertFileDst ); +// TQTextStream X509CertDstStream( &X509CertFileDst ); // // if ( config->KvpncDebugLevel > 1 ) -// config->appendLogEntry( i18n( "OpenVPN import: try to copy pre shared key file %1 to %2." ).arg( X509CertFileSrc.name() ).arg( X509CertFileDst.name() ), config->debug ); +// config->appendLogEntry( i18n( "OpenVPN import: try to copy pre shared key file %1 to %2." ).tqarg( X509CertFileSrc.name() ).tqarg( X509CertFileDst.name() ), config->debug ); // // // if ( X509CertFileSrc.open( IO_ReadOnly ) ) { // if ( X509CertFileDst.open( IO_WriteOnly ) ) { -// QString X509CertFileString = QString( X509CertFileSrc.readAll() ); +// TQString X509CertFileString = TQString( X509CertFileSrc.readAll() ); // X509CertDstStream << X509CertFileString; // X509CertFileDst.close(); // if ( config->KvpncDebugLevel > 2 ) -// config->appendLogEntry( i18n( "OpenVPN import: X509 cert file %1 copied to %2." ).arg( X509CertFileSrc.name() ).arg( X509CertFileDst.name() ), config->debug ); +// config->appendLogEntry( i18n( "OpenVPN import: X509 cert file %1 copied to %2." ).tqarg( X509CertFileSrc.name() ).tqarg( X509CertFileDst.name() ), config->debug ); // } else { // if ( config->KvpncDebugLevel > 2 ) -// config->appendLogEntry( i18n( "OpenVPN import: X509 cert file %1 could not open for writing." ).arg( X509CertFileDst.name() ), config->debug ); +// config->appendLogEntry( i18n( "OpenVPN import: X509 cert file %1 could not open for writing." ).tqarg( X509CertFileDst.name() ), config->debug ); // // // return; // } // X509CertFileDst.close(); // } else { // if ( config->KvpncDebugLevel > 2 ) -// config->appendLogEntry( i18n( "OpenVPN import: X509 cert file %1 could not open for reading." ).arg( X509CertFileSrc.name() ), config->debug ); +// config->appendLogEntry( i18n( "OpenVPN import: X509 cert file %1 could not open for reading." ).tqarg( X509CertFileSrc.name() ), config->debug ); // // // return; // } // } // if ( !acc->getPreSharedKey().isEmpty() && !acc->getPreSharedKey().startsWith( CertPath ) ) { -// QString prefix = "./"; +// TQString prefix = "./"; // if ( !filename.find( '/' ) > -1 ) -// prefix = QString( Utils(this->GlobalConfig).removeSpecialCharsForFilename( filename).section( '/', 0, -2 ) + "/" ); +// prefix = TQString( Utils(this->GlobalConfig).removeSpecialCharsForFilename( filename).section( '/', 0, -2 ) + "/" ); // -// QFile PreSharedKeyFileSrc ( QString( prefix + acc->getPreSharedKey() ) ); -// QFile PreSharedKeyFileDst ( QString( CertPath + "/openvpnimport_" + acc->getPreSharedKey() ) ); -// acc->setPreSharedKey( QString( CertPath + "/openvpnimport_" + acc->getPreSharedKey() ) ); +// TQFile PreSharedKeyFileSrc ( TQString( prefix + acc->getPreSharedKey() ) ); +// TQFile PreSharedKeyFileDst ( TQString( CertPath + "/openvpnimport_" + acc->getPreSharedKey() ) ); +// acc->setPreSharedKey( TQString( CertPath + "/openvpnimport_" + acc->getPreSharedKey() ) ); // -// QTextStream PreSharedKeyDstStream( &PreSharedKeyFileDst ); +// TQTextStream PreSharedKeyDstStream( &PreSharedKeyFileDst ); // // if ( config->KvpncDebugLevel > 1 ) -// config->appendLogEntry( i18n( "OpenVPN import: try to copy pre shared key file %1 to %2." ).arg( PreSharedKeyFileSrc.name() ).arg( PreSharedKeyFileDst.name() ), config->debug ); +// config->appendLogEntry( i18n( "OpenVPN import: try to copy pre shared key file %1 to %2." ).tqarg( PreSharedKeyFileSrc.name() ).tqarg( PreSharedKeyFileDst.name() ), config->debug ); // // if ( PreSharedKeyFileSrc.open( IO_ReadOnly ) ) { // if ( PreSharedKeyFileDst.open( IO_WriteOnly ) ) { -// QString PreSharedKeyFileString = QString( PreSharedKeyFileSrc.readAll() ); +// TQString PreSharedKeyFileString = TQString( PreSharedKeyFileSrc.readAll() ); // PreSharedKeyDstStream << PreSharedKeyFileString; // PreSharedKeyFileDst.close(); // if ( config->KvpncDebugLevel > 2 ) -// config->appendLogEntry( i18n( "OpenVPN import: pre shared key file %1 copied to %2." ).arg( PreSharedKeyFileSrc.name() ).arg( PreSharedKeyFileDst.name() ), config->debug ); +// config->appendLogEntry( i18n( "OpenVPN import: pre shared key file %1 copied to %2." ).tqarg( PreSharedKeyFileSrc.name() ).tqarg( PreSharedKeyFileDst.name() ), config->debug ); // } else { // if ( config->KvpncDebugLevel > 2 ) -// config->appendLogEntry( i18n( "OpenVPN import: pre shared key file %1 could not open for writing." ).arg( PreSharedKeyFileDst.name() ), config->debug ); +// config->appendLogEntry( i18n( "OpenVPN import: pre shared key file %1 could not open for writing." ).tqarg( PreSharedKeyFileDst.name() ), config->debug ); // // // return; // } // PreSharedKeyFileDst.close(); // } else { // if ( config->KvpncDebugLevel > 2 ) -// config->appendLogEntry( i18n( "OpenVPN import: pre shared key file %1 could not open for reading." ).arg( PreSharedKeyFileSrc.name() ), config->debug ); +// config->appendLogEntry( i18n( "OpenVPN import: pre shared key file %1 could not open for reading." ).tqarg( PreSharedKeyFileSrc.name() ), config->debug ); // // // return; // } @@ -1070,11 +1070,11 @@ void ImportOpenvpnProfileDialog::canAccept() if ( !Pkcs12CertFile.isEmpty() ) { - QString filepath = filename.section ( '/', 0, -2 ); // should give the base path + TQString filepath = filename.section ( '/', 0, -2 ); // should give the base path ImportCertificateDialog dlg ( this, i18n ( "Import Certificate..." ).ascii(), config ); - QString p12file=""; + TQString p12file=""; if ( Pkcs12CertFile.find ( '/' ) < 0 ) p12file = filepath + "/" + Pkcs12CertFile; @@ -1101,7 +1101,7 @@ void ImportOpenvpnProfileDialog::canAccept() int result = dlg.exec(); - if ( result == QDialog::Accepted ) + if ( result == TQDialog::Accepted ) { if ( dlg.importSuccess ) { @@ -1131,6 +1131,6 @@ void ImportOpenvpnProfileDialog::canAccept() } //std::cout << "accept" << std::endl; - QDialog::accept(); + TQDialog::accept(); } diff --git a/src/importopenvpnprofiledialog.h b/src/importopenvpnprofiledialog.h index 59b736c..73e2d2d 100644 --- a/src/importopenvpnprofiledialog.h +++ b/src/importopenvpnprofiledialog.h @@ -31,12 +31,13 @@ class ImportOpenvpnProfileDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ImportOpenvpnProfileDialog( KVpncConfig *config, QWidget *parent, const QString& caption, QString file); + ImportOpenvpnProfileDialog( KVpncConfig *config, TQWidget *parent, const TQString& caption, TQString file); ~ImportOpenvpnProfileDialog(); void canAccept(); - QString filename; + TQString filename; bool importOk; VpnAccountData *acc; ImportOpenvpnProfileDialogBase *main; @@ -46,8 +47,8 @@ public slots: private: KVpncConfig* config; - QString Pkcs12CertFile; - QString CertPath; + TQString Pkcs12CertFile; + TQString CertPath; }; #endif diff --git a/src/importopenvpnprofiledialogbase.ui b/src/importopenvpnprofiledialogbase.ui index 7a59be9..7b9e459 100644 --- a/src/importopenvpnprofiledialogbase.ui +++ b/src/importopenvpnprofiledialogbase.ui @@ -1,7 +1,7 @@ ImportOpenvpnProfileDialogBase Christoph Thielecke - + ImportOpenvpnProfileDialogBase @@ -13,7 +13,7 @@ 143 - + 400 0 @@ -26,17 +26,17 @@ unnamed - + - layout52 + tqlayout52 unnamed - + - layout51 + tqlayout51 @@ -52,14 +52,14 @@ Expanding - + 241 21 - + OpenProfileManagerCheckBox @@ -72,15 +72,15 @@ - + - layout204 + tqlayout204 unnamed - + textLabel1 @@ -98,7 +98,7 @@ - + TextLabel @@ -110,9 +110,9 @@ - + canAccept() - + kurlrequester.h diff --git a/src/importprofiledialog.cpp b/src/importprofiledialog.cpp index 80ec8a0..bf5f1f8 100644 --- a/src/importprofiledialog.cpp +++ b/src/importprofiledialog.cpp @@ -26,13 +26,13 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include -#include -#include -#include +#include +#include +#include #include #include @@ -43,7 +43,7 @@ #include "ciscopasswddecoder.h" //END INCLUDES -ImportProfileDialog::ImportProfileDialog(KVpncConfig *GlobalConfig, QWidget *parent, const QString& caption, QString file) +ImportProfileDialog::ImportProfileDialog(KVpncConfig *GlobalConfig, TQWidget *parent, const TQString& caption, TQString file) : KDialogBase( parent, "Import_Cisco_PCF_profile", true, caption, KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ) { @@ -57,7 +57,7 @@ ImportProfileDialog::ImportProfileDialog(KVpncConfig *GlobalConfig, QWidget *par main = new ImportProfileDialogBase(this); setMainWidget(main); - main->setMinimumSize(main->sizeHint()); + main->setMinimumSize(main->tqsizeHint()); main->FilenameUrlrequester->setFilter( "*.pcf" ); main->FilenameUrlrequester->setURL(filename); @@ -77,7 +77,7 @@ void ImportProfileDialog::accept() filename = main->FilenameUrlrequester->url(); if ( !filename.isEmpty() ) { - f = new QFile(filename); + f = new TQFile(filename); canAccept(); } @@ -101,14 +101,14 @@ void ImportProfileDialog::canAccept() KConfig config( filename, true, false ); - QStringList grouplist = config.groupList(); + TQStringList grouplist = config.groupList(); if (GlobalConfig->KvpncDebugLevel > 0) { - QString groups=""; - for ( QStringList::Iterator group = grouplist.begin(); group != grouplist.end(); ++group ) - groups += QString(" "+*group); - GlobalConfig->appendLogEntry(i18n("PCF import: groups found: [ %1 ]").arg(groups), GlobalConfig->debug); + TQString groups=""; + for ( TQStringList::Iterator group = grouplist.begin(); group != grouplist.end(); ++group ) + groups += TQString(" "+*group); + GlobalConfig->appendLogEntry(i18n("PCF import: groups found: [ %1 ]").tqarg(groups), GlobalConfig->debug); } config.setGroup( "main" ); @@ -148,23 +148,23 @@ void ImportProfileDialog::canAccept() VpnAccountData::ConnectionType ConnType = VpnAccountData::cisco; - QString ProfileName = QFileInfo ( f->name().stripWhiteSpace().remove(".pcf").remove(".PCF") ).fileName(); + TQString ProfileName = TQFileInfo ( f->name().stripWhiteSpace().remove(".pcf").remove(".PCF") ).fileName(); acc = new VpnAccountData ( ConnType, Utils(this->GlobalConfig).removeSpecialCharsForFilename( ProfileName )); - QString Description = config.readEntry( "Description", "" ); + TQString Description = config.readEntry( "Description", "" ); if (Description.isEmpty()) - Description = config.readEntry("!Description",i18n("Profile imported from file %1.").arg(filename)); + Description = config.readEntry("!Description",i18n("Profile imported from file %1.").tqarg(filename)); if (!Description.isEmpty()) { if (GlobalConfig->KvpncDebugLevel > 0) - GlobalConfig->appendLogEntry(i18n("PCF import: description found: %1").arg(Description), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: description found: %1").tqarg(Description), GlobalConfig->debug); acc->setDescription( Description ); } - QString Gateway = config.readEntry( "Host", "" ); + TQString Gateway = config.readEntry( "Host", "" ); if (Gateway.isEmpty()) Gateway = config.readEntry( "!Host", "" ); @@ -172,7 +172,7 @@ void ImportProfileDialog::canAccept() if (!Gateway.isEmpty()) { if (GlobalConfig->KvpncDebugLevel > 0) - GlobalConfig->appendLogEntry(i18n("PCF import: gateway found: %1").arg(Gateway), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: gateway found: %1").tqarg(Gateway), GlobalConfig->debug); acc->setGateway( Gateway ); } @@ -180,9 +180,9 @@ void ImportProfileDialog::canAccept() acc->setUseApplicationVersion( useApplicationVersion ); bool enableBackup = config.readBoolEntry( "EnableBackup" , FALSE ); - QString BackupServer = config.readEntry( "BackupServer", "" ); + TQString BackupServer = config.readEntry( "BackupServer", "" ); - QString GroupName = config.readEntry( "GroupName" , "" ); + TQString GroupName = config.readEntry( "GroupName" , "" ); if (GroupName.isEmpty()) GroupName = config.readEntry( "!GroupName", "" ); @@ -193,18 +193,18 @@ void ImportProfileDialog::canAccept() if (!GroupName.isEmpty()) { if (GlobalConfig->KvpncDebugLevel > 0) - GlobalConfig->appendLogEntry(i18n("PCF import: group name found: %1").arg(GroupName), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: group name found: %1").tqarg(GroupName), GlobalConfig->debug); acc->setID( GroupName ); } - QString NtDomain = config.readEntry( "NTDomain" ); + TQString NtDomain = config.readEntry( "NTDomain" ); if (NtDomain.isEmpty()) NtDomain = config.readEntry( "!NTDomain", "" ); if (!NtDomain.isEmpty()) { if (GlobalConfig->KvpncDebugLevel > 0) - GlobalConfig->appendLogEntry(i18n("PCF import: NT domain found: %1").arg(NtDomain), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: NT domain found: %1").tqarg(NtDomain), GlobalConfig->debug); acc->setNtDomainName( NtDomain ); } @@ -214,14 +214,14 @@ void ImportProfileDialog::canAccept() if ( enableMSLogon && !NtDomain.isEmpty() ) useNtDomainName = true; - QString CertName = config.readEntry( "CertName", "" ); + TQString CertName = config.readEntry( "CertName", "" ); if (GlobalConfig->KvpncDebugLevel > 0) - GlobalConfig->appendLogEntry(i18n("PCF import: certificate name found: %1").arg(CertName), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: certificate name found: %1").tqarg(CertName), GlobalConfig->debug); - QString CertPath = config.readEntry( "CertPath", "" ); - QString CertSubjectName = config.readEntry( "CertSubjectName", "" ); - QString CertSerialHash = config.readEntry( "CertSerialHash", "" ); + TQString CertPath = config.readEntry( "CertPath", "" ); + TQString CertSubjectName = config.readEntry( "CertSubjectName", "" ); + TQString CertSerialHash = config.readEntry( "CertSerialHash", "" ); // bool SendCertChain = config.readBoolEntry( "SendCertChain" , "" ); // bool VerifyCertDN = config.readBoolEntry( "VerifyCertDN", FALSE ); @@ -234,7 +234,7 @@ void ImportProfileDialog::canAccept() if (CertStore == 1) useCertStore = true; if (GlobalConfig->KvpncDebugLevel > 0) - GlobalConfig->appendLogEntry(i18n("PCF import: certificate should be stored into cisco cert store: %1").arg(QString().setNum(int(useCertStore))), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: certificate should be stored into cisco cert store: %1").tqarg(TQString().setNum(int(useCertStore))), GlobalConfig->debug); if (useCertStore) { @@ -242,11 +242,11 @@ void ImportProfileDialog::canAccept() if (!CertName.isEmpty()) { bool CertPathFound = false; - QString CertFullPath = CertName; - if (!QFile(CertFullPath).exists()) + TQString CertFullPath = CertName; + if (!TQFile(CertFullPath).exists()) { CertFullPath = CertPath+"/"+CertName; - if (!QFile(CertFullPath).exists()) + if (!TQFile(CertFullPath).exists()) { GlobalConfig->appendLogEntry(i18n("Cisco certificate import: cert not found, skipping."), GlobalConfig->error); } @@ -266,18 +266,18 @@ void ImportProfileDialog::canAccept() } if (CertPathFound) { - QStringList OldCiscoCerts = Utils(GlobalConfig).getCertsFromCiscoCertStore(); + TQStringList OldCiscoCerts = Utils(GlobalConfig).getCertsFromCiscoCertStore(); ImportCertificateDialog dlg( this, i18n( "Import certificate..." ).ascii(), GlobalConfig ); dlg.main->FilenameUrlrequester->setURL(CertFullPath); dlg.main->ImporttypeComboBox->setCurrentItem(dlg.ciscouserca); // import user and ca cert int result = dlg.exec(); - if (result == QDialog::Accepted) + if (result == TQDialog::Accepted) { acc->setUseCiscoCertStore(true); - QStringList CiscoCerts = Utils(GlobalConfig).getCertsFromCiscoCertStore(); - for ( QStringList::Iterator ciscoit = CiscoCerts.begin(); ciscoit != CiscoCerts.end(); ++ciscoit ) + TQStringList CiscoCerts = Utils(GlobalConfig).getCertsFromCiscoCertStore(); + for ( TQStringList::Iterator ciscoit = CiscoCerts.begin(); ciscoit != CiscoCerts.end(); ++ciscoit ) { - if (OldCiscoCerts.findIndex(QString(*ciscoit)) < 1 ) + if (OldCiscoCerts.findIndex(TQString(*ciscoit)) < 1 ) { // if it was not in list, then its the new added one. acc->setX509Certificate(*ciscoit); @@ -328,13 +328,13 @@ void ImportProfileDialog::canAccept() if (useUdp) { if (GlobalConfig->KvpncDebugLevel > 0) - GlobalConfig->appendLogEntry(i18n("PCF import: using %1 for tunneling").arg("UDP"), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: using %1 for tunneling").tqarg("UDP"), GlobalConfig->debug); acc->setUseUdp( true); } else { if (GlobalConfig->KvpncDebugLevel > 0) - GlobalConfig->appendLogEntry(i18n("PCF import: using %1 for tunneling").arg("TCP"), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: using %1 for tunneling").tqarg("TCP"), GlobalConfig->debug); acc->setUseUdp( false); } /* @@ -345,13 +345,13 @@ void ImportProfileDialog::canAccept() if (enableNAT) { if (GlobalConfig->KvpncDebugLevel > 0) - GlobalConfig->appendLogEntry(i18n("PCF import: enable NAT mode: %1").arg(i18n("yes")), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: enable NAT mode: %1").tqarg(i18n("yes")), GlobalConfig->debug); acc->setUseNat(true); } else { if (GlobalConfig->KvpncDebugLevel > 0) - GlobalConfig->appendLogEntry(i18n("PCF import: enable NAT mode: %1").arg(i18n("no")), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: enable NAT mode: %1").tqarg(i18n("no")), GlobalConfig->debug); acc->setUseNat(false); } @@ -364,19 +364,19 @@ void ImportProfileDialog::canAccept() // useUdpPort = true; // } - QString PerfectForwardSecrecy = ""; //QString("dh"+QString().setNum(DHGroup)); + TQString PerfectForwardSecrecy = ""; //TQString("dh"+TQString().setNum(DHGroup)); // bool usePerfectForwardSecrety = false; bool usePerfectSecrecy = false; acc->setPerfectForwardSecrety( PerfectForwardSecrecy ); acc->setUsePerfectForwardSecrety( usePerfectSecrecy ); bool useIkeGroup = false; - QString IkeGroup; + TQString IkeGroup; int DHGroup = config.readNumEntry( "DHGroup", -1 ); if (DHGroup != -1 ) { if (GlobalConfig->KvpncDebugLevel > 0) - GlobalConfig->appendLogEntry(i18n("PCF import: Diffie Hellman group found: %1").arg(QString().setNum(DHGroup)), GlobalConfig->debug); - IkeGroup = "dh" + QString().setNum( DHGroup ) ; + GlobalConfig->appendLogEntry(i18n("PCF import: Diffie Hellman group found: %1").tqarg(TQString().setNum(DHGroup)), GlobalConfig->debug); + IkeGroup = "dh" + TQString().setNum( DHGroup ) ; useIkeGroup = true; acc->setIkeGroup( IkeGroup ); } @@ -385,43 +385,43 @@ void ImportProfileDialog::canAccept() if (PeerTimeout > -1 ) { if (GlobalConfig->KvpncDebugLevel > 0) - GlobalConfig->appendLogEntry(i18n("PCF import: peer timeout found: %1").arg(QString().setNum(PeerTimeout)), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: peer timeout found: %1").tqarg(TQString().setNum(PeerTimeout)), GlobalConfig->debug); // read minutes but store seconds acc->setPeerTimeout( PeerTimeout*60 ); } - QString Username = config.readEntry( "Username" , "" ); + TQString Username = config.readEntry( "Username" , "" ); if (!Username.isEmpty()) { if (GlobalConfig->KvpncDebugLevel > 0) - GlobalConfig->appendLogEntry(i18n("PCF import: user name found: %1").arg(Username), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: user name found: %1").tqarg(Username), GlobalConfig->debug); acc->setUserName( Username ); } - QString UserPassword = config.readEntry( "UserPassword", "" ); + TQString UserPassword = config.readEntry( "UserPassword", "" ); if (UserPassword.isEmpty()) UserPassword = config.readEntry( "!UserPassword", "" ); if (!UserPassword.isEmpty()) { if (GlobalConfig->KvpncDebugLevel > 0) - GlobalConfig->appendLogEntry(i18n("PCF import: clear text user password found: %1").arg(UserPassword), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: clear text user password found: %1").tqarg(UserPassword), GlobalConfig->debug); acc->setUserPassword( UserPassword ); } - QString enc_UserPassword = config.readEntry( "enc_UserPassword", "" ); + TQString enc_UserPassword = config.readEntry( "enc_UserPassword", "" ); if (enc_UserPassword.isEmpty()) enc_UserPassword = config.readEntry( "!enc_UserPassword", "" ); if (!enc_UserPassword.isEmpty()) { if (GlobalConfig->KvpncDebugLevel > 0) - GlobalConfig->appendLogEntry(i18n("PCF import: encrypted user password found: %1").arg(enc_UserPassword), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: encrypted user password found: %1").tqarg(enc_UserPassword), GlobalConfig->debug); } CiscoPasswdDecoder dec (filename); - QString userpasswd=""; - QString grouppasswd=""; + TQString userpasswd=""; + TQString grouppasswd=""; dec.decodePasswords(userpasswd,grouppasswd); // std::cout << "decoded userpasswd: " << userpasswd << std::endl; @@ -438,30 +438,30 @@ void ImportProfileDialog::canAccept() if (!userpasswd.isEmpty()) { if (GlobalConfig->KvpncDebugLevel > 3) - GlobalConfig->appendLogEntry(i18n("PCF import: decrypted user password found: %1").arg(userpasswd), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: decrypted user password found: %1").tqarg(userpasswd), GlobalConfig->debug); acc->setUserPassword( userpasswd ); } if (GlobalConfig->KvpncDebugLevel > 0) if (saveUserPassword) - GlobalConfig->appendLogEntry(i18n("PCF import: save user pass : %1").arg(i18n("yes")), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: save user pass : %1").tqarg(i18n("yes")), GlobalConfig->debug); else - GlobalConfig->appendLogEntry(i18n("PCF import: save user pass : %1").arg(i18n("no")), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: save user pass : %1").tqarg(i18n("no")), GlobalConfig->debug); acc->setSaveUserPassword( saveUserPassword ); bool saveGroupPwd = true; - QString GroupPwd = config.readEntry( "GroupPwd" , "" ); + TQString GroupPwd = config.readEntry( "GroupPwd" , "" ); if (GroupPwd.isEmpty()) GroupPwd = config.readEntry( "!GroupPwd", "" ); if (!GroupPwd.isEmpty()) { if (GlobalConfig->KvpncDebugLevel > 3) - GlobalConfig->appendLogEntry(i18n("PCF import: clear text group password found: %1").arg(GroupPwd), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: clear text group password found: %1").tqarg(GroupPwd), GlobalConfig->debug); acc->setPreSharedKey( GroupPwd ); } - QString enc_GroupPwd = config.readEntry( "enc_GroupPwd", "" ); + TQString enc_GroupPwd = config.readEntry( "enc_GroupPwd", "" ); if (enc_GroupPwd.isEmpty()) enc_GroupPwd = config.readEntry( "!enc_GroupPwd", "" ); @@ -469,7 +469,7 @@ void ImportProfileDialog::canAccept() if (!grouppasswd.isEmpty()) { if (GlobalConfig->KvpncDebugLevel > 3) - GlobalConfig->appendLogEntry(i18n("PCF import: decrypted group password found: %1").arg(grouppasswd), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: decrypted group password found: %1").tqarg(grouppasswd), GlobalConfig->debug); acc->setPreSharedKey( grouppasswd ); } @@ -479,7 +479,7 @@ void ImportProfileDialog::canAccept() if ( Description.isEmpty() ) { - Description = ( QUrl( filename ).fileName() ); + Description = ( TQUrl( filename ).fileName() ); Description = Utils(this->GlobalConfig).removeSpecialCharsForFilename( Description.left( filename.section('/',-1).length() - 4 )); } @@ -502,13 +502,13 @@ void ImportProfileDialog::canAccept() if (GlobalConfig->KvpncDebugLevel > 0) if (AuthType ==1) - GlobalConfig->appendLogEntry(i18n("PCF import: authentication type found: %1").arg(i18n("PSK")), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: authentication type found: %1").tqarg(i18n("PSK")), GlobalConfig->debug); else if (AuthType ==3) - GlobalConfig->appendLogEntry(i18n("PCF import: authentication type found: %1").arg(i18n("certificate")), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: authentication type found: %1").tqarg(i18n("certificate")), GlobalConfig->debug); else if (AuthType ==5) - GlobalConfig->appendLogEntry(i18n("PCF import: authentication type found: %1").arg(i18n("hybrid")), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: authentication type found: %1").tqarg(i18n("hybrid")), GlobalConfig->debug); else - GlobalConfig->appendLogEntry(i18n("PCF import: no authentication type found, assuming %1").arg(i18n("PSK")), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: no authentication type found, assuming %1").tqarg(i18n("PSK")), GlobalConfig->debug); if (AuthType == 3 || AuthType == 5) { @@ -580,10 +580,10 @@ void ImportProfileDialog::canAccept() acc.setUserPassword( UserPassword ); acc.setSaveUserPassword( saveUserPassword ); acc.setSaveGroupPassword( true ); - //acc.setIkeGroup( QString IkeGroup ); - acc.setPerfectForwardSecrety( QString PerfectForwardSecrecy ); - acc.setNtDomainName( QString Name ); - acc.setApplicationVersion( QString version ); + //acc.setIkeGroup( TQString IkeGroup ); + acc.setPerfectForwardSecrety( TQString PerfectForwardSecrecy ); + acc.setNtDomainName( TQString Name ); + acc.setApplicationVersion( TQString version ); acc.setUseSingleDes( bool useSingleDes ); acc.setLocalPort( int port ); acc.setUseIkeGroup( bool useIkeGroup); @@ -596,6 +596,6 @@ void ImportProfileDialog::canAccept() */ importOk = true; //std::cout << "accept" << std::endl; - QDialog::accept(); + TQDialog::accept(); } diff --git a/src/importprofiledialog.h b/src/importprofiledialog.h index 7215b2a..4fe4476 100644 --- a/src/importprofiledialog.h +++ b/src/importprofiledialog.h @@ -31,17 +31,18 @@ class ImportProfileDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ImportProfileDialog( KVpncConfig *config, QWidget *parent, const QString& caption, QString file); + ImportProfileDialog( KVpncConfig *config, TQWidget *parent, const TQString& caption, TQString file); ~ImportProfileDialog(); void canAccept(); bool decodeEncPasswd; - QString filename; + TQString filename; bool importOk; VpnAccountData *acc; ImportProfileDialogBase *main; - QFile *f; + TQFile *f; public slots: void accept(); diff --git a/src/importprofiledialogbase.ui b/src/importprofiledialogbase.ui index 95535ae..ef968e0 100644 --- a/src/importprofiledialogbase.ui +++ b/src/importprofiledialogbase.ui @@ -1,7 +1,7 @@ ImportProfileDialogBase Christoph Thielecke - + ImportProfileDialogBase @@ -20,23 +20,23 @@ unnamed - + - layout7 + tqlayout7 unnamed - + - layout203 + tqlayout203 unnamed - + textLabel1_2 @@ -44,15 +44,15 @@ <b>Please choose the PCF file:</b> - + - layout202 + tqlayout202 unnamed - + textLabel1 @@ -72,9 +72,9 @@ - + - layout6 + tqlayout6 @@ -90,14 +90,14 @@ Expanding - + 258 21 - + OpenProfileManagerCheckBox @@ -114,9 +114,9 @@ - + canAccept() - + kurlrequester.h diff --git a/src/kfeedback.cpp b/src/kfeedback.cpp index e1eefac..07d7ba3 100644 --- a/src/kfeedback.cpp +++ b/src/kfeedback.cpp @@ -9,12 +9,12 @@ */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include @@ -27,15 +27,15 @@ #include "kfeedback.h" -KFeedbackDialog::KFeedbackDialog( const QString & feedbackMailAddress, - const QString & helpTopic ) +KFeedbackDialog::KFeedbackDialog( const TQString & feedbackMailAddress, + const TQString & helpTopic ) : KDialogBase( Plain, // dialogFace i18n( "Feedback" ), // caption Apply | Cancel | ( helpTopic.isEmpty() ? 0 : (int) Help ), // buttonMask Apply ) // defaultButton { - QVBoxLayout * layout = new QVBoxLayout( plainPage(), 0, spacingHint() ); + TQVBoxLayout * tqlayout = new TQVBoxLayout( plainPage(), 0, spacingHint() ); setButtonApply( KGuiItem( i18n( "&Mail this..." ) ) ); if ( ! helpTopic.isEmpty() ) @@ -44,20 +44,20 @@ KFeedbackDialog::KFeedbackDialog( const QString & feedbackMailAddress, _form = new KFeedbackForm( feedbackMailAddress, plainPage() ); Q_CHECK_PTR( _form ); - layout->addWidget( _form ); + tqlayout->addWidget( _form ); checkSendButton(); - connect( this, SIGNAL( applyClicked() ), - _form, SLOT ( sendMail() ) ); + connect( this, TQT_SIGNAL( applyClicked() ), + _form, TQT_SLOT ( sendMail() ) ); - connect( _form, SIGNAL( mailSent() ), - this, SLOT ( hide() ) ); + connect( _form, TQT_SIGNAL( mailSent() ), + this, TQT_SLOT ( hide() ) ); - connect( _form, SIGNAL( mailSent() ), - this, SIGNAL( mailSent() ) ); + connect( _form, TQT_SIGNAL( mailSent() ), + this, TQT_SIGNAL( mailSent() ) ); - connect( _form, SIGNAL( checkComplete() ), - this, SLOT ( checkSendButton() ) ); + connect( _form, TQT_SIGNAL( checkComplete() ), + this, TQT_SLOT ( checkSendButton() ) ); } @@ -77,16 +77,16 @@ KFeedbackDialog::checkSendButton() -KFeedbackForm::KFeedbackForm( const QString & feedbackMailAddress, - QWidget * parent ) - : QVBox( parent ) +KFeedbackForm::KFeedbackForm( const TQString & feedbackMailAddress, + TQWidget * parent ) + : TQVBox( parent ) , _feedbackMailAddress( feedbackMailAddress ) { // // Explanation above the question list // - QLabel * label = new QLabel( i18n( "

Please tell us your opinion about this program.

" + TQLabel * label = new TQLabel( i18n( "

Please tell us your opinion about this program.

" "

You will be able to review everything in your mailer " "before any mail is sent.
" "Nothing will be sent behind your back.

" @@ -98,47 +98,47 @@ KFeedbackForm::KFeedbackForm( const QString & feedbackMailAddress, _questionList = new KFeedbackQuestionList( this ); Q_CHECK_PTR( _questionList ); - connect( _questionList, SIGNAL( checkComplete() ), - this, SLOT ( slotCheckComplete() ) ); + connect( _questionList, TQT_SIGNAL( checkComplete() ), + this, TQT_SLOT ( slotCheckComplete() ) ); // // Explanation below the question list // - QHBox * hbox = new QHBox( this ); + TQHBox * hbox = new TQHBox( this ); Q_CHECK_PTR( hbox ); - QSizePolicy pol( QSizePolicy::Fixed, QSizePolicy::Fixed ); // hor / vert + TQSizePolicy pol( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); // hor / vert - label = new QLabel( i18n( "Questions marked with " ), hbox ); + label = new TQLabel( i18n( "Questions marked with " ), hbox ); Q_CHECK_PTR( label ); - label->setSizePolicy( pol ); + label->tqsetSizePolicy( pol ); - label = new QLabel( hbox ); + label = new TQLabel( hbox ); Q_CHECK_PTR( label ); label->setPixmap( KGlobal::iconLoader()->loadIcon( "edit", KIcon::Small ) ); - label->setSizePolicy( pol ); + label->tqsetSizePolicy( pol ); - label = new QLabel( i18n( " must be answered before a mail can be sent.") , hbox ); + label = new TQLabel( i18n( " must be answered before a mail can be sent.") , hbox ); Q_CHECK_PTR( label ); - label->setSizePolicy( pol ); + label->tqsetSizePolicy( pol ); - new QWidget( hbox ); // Fill any leftover space to the right. + new TQWidget( hbox ); // Fill any leftover space to the right. // // Free-text comment field // - label = new QLabel( "\n" + i18n( "&Additional Comments:" ), this ); Q_CHECK_PTR( label ); - _comment = new QMultiLineEdit( this ); Q_CHECK_PTR( _comment ); + label = new TQLabel( "\n" + i18n( "&Additional Comments:" ), this ); Q_CHECK_PTR( label ); + _comment = new TQMultiLineEdit( this ); Q_CHECK_PTR( _comment ); label->setBuddy( _comment ); -#if (QT_VERSION < 300) +#if ([[[TQT_VERSION IS DEPRECATED]]] < 300) _comment->setFixedVisibleLines( 5 ); #endif - _comment->setWordWrap( QMultiLineEdit::FixedColumnWidth ); + _comment->setWordWrap( TQMultiLineEdit::FixedColumnWidth ); _comment->setWrapColumnOrWidth( 70 ); } @@ -156,7 +156,7 @@ KFeedbackForm::sendMail() // Build mail subject // - QString subject; + TQString subject; const KAboutData * aboutData = KGlobal::instance()->aboutData(); @@ -172,7 +172,7 @@ KFeedbackForm::sendMail() // Build mail body // - QString body = subject + "\n\n" + TQString body = subject + "\n\n" + formatComment() + _questionList->result(); @@ -211,10 +211,10 @@ KFeedbackForm::slotCheckComplete() } -QString +TQString KFeedbackForm::formatComment() { - QString result = _comment->text(); + TQString result = _comment->text(); if ( ! result.isEmpty() ) { @@ -236,8 +236,8 @@ KFeedbackForm::readyToSend() -KFeedbackQuestionList::KFeedbackQuestionList( QWidget *parent ) - : QListView( parent ) +KFeedbackQuestionList::KFeedbackQuestionList( TQWidget *parent ) + : TQListView( parent ) { addColumn( "" ); header()->hide(); @@ -267,10 +267,10 @@ KFeedbackQuestionList::isComplete() } -QString +TQString KFeedbackQuestionList::result() { - QString res; + TQString res; KFeedbackQuestion * question = firstQuestion(); while ( question ) @@ -285,8 +285,8 @@ KFeedbackQuestionList::result() KFeedbackQuestion * -KFeedbackQuestionList::addQuestion( const QString & text, - const QString & id, +KFeedbackQuestionList::addQuestion( const TQString & text, + const TQString & id, bool exclusiveAnswer, bool required ) { @@ -300,8 +300,8 @@ KFeedbackQuestionList::addQuestion( const QString & text, void -KFeedbackQuestionList::addYesNoQuestion( const QString & text, - const QString & id, +KFeedbackQuestionList::addYesNoQuestion( const TQString & text, + const TQString & id, bool required ) { @@ -334,12 +334,12 @@ KFeedbackQuestionList::questionAdded( KFeedbackQuestion * question) static int nextNo = 0; KFeedbackQuestion::KFeedbackQuestion( KFeedbackQuestionList * parent, - const QString & text, - const QString & id, + const TQString & text, + const TQString & id, bool exclusiveAnswer, bool required, bool open ) - : QCheckListItem( parent, text ) + : TQCheckListItem( parent, text ) , _id( id ) , _exclusiveAnswer( exclusiveAnswer ) , _required( required ) @@ -357,8 +357,8 @@ KFeedbackQuestion::KFeedbackQuestion( KFeedbackQuestionList * parent, void -KFeedbackQuestion::addAnswer( const QString & text, - const QString & id ) +KFeedbackQuestion::addAnswer( const TQString & text, + const TQString & id ) { new KFeedbackAnswer( this, text, id, _exclusiveAnswer ); } @@ -381,7 +381,7 @@ KFeedbackQuestion::isAnswered() /** * If this question requires an exclusive answer, exactly one of them * should be checked. We don't need to bother about more than one being - * checked here - QListView does that for us. + * checked here - TQListView does that for us. **/ KFeedbackAnswer *answer = firstAnswer(); @@ -398,10 +398,10 @@ KFeedbackQuestion::isAnswered() } -QString +TQString KFeedbackQuestion::result() { - QString res; + TQString res; int answers = 0; KFeedbackAnswer *answer = firstAnswer(); @@ -426,17 +426,17 @@ KFeedbackQuestion::result() } -QString +TQString KFeedbackQuestion::text() { - return QCheckListItem::text(0); + return TQCheckListItem::text(0); } -QString +TQString KFeedbackQuestion::key( int, bool ) const { - QString no; + TQString no; no.sprintf( "%08d", _no ); return no; @@ -456,31 +456,31 @@ KFeedbackQuestion::questionList() const KFeedbackAnswer::KFeedbackAnswer( KFeedbackQuestion * parent, - const QString & text, - const QString & id, + const TQString & text, + const TQString & id, bool exclusive ) - : QCheckListItem( parent, + : TQCheckListItem( parent, text, exclusive - ? QCheckListItem::RadioButton - : QCheckListItem::CheckBox ) + ? TQCheckListItem::RadioButton + : TQCheckListItem::CheckBox ) , _id( id ) { _no = nextNo++; } -QString +TQString KFeedbackAnswer::text() { - return QCheckListItem::text(0); + return TQCheckListItem::text(0); } -QString +TQString KFeedbackAnswer::key( int, bool ) const { - QString no; + TQString no; no.sprintf( "%08d", _no ); return no; diff --git a/src/kfeedback.h b/src/kfeedback.h index 6ba6abd..34e077e 100644 --- a/src/kfeedback.h +++ b/src/kfeedback.h @@ -11,15 +11,15 @@ #ifndef KFeedback_h #define KFeedback_h -#include -#include +#include +#include #include class KFeedbackForm; class KFeedbackQuestionList; class KFeedbackQuestion; class KFeedbackAnswer; -class QMultiLineEdit; +class TQMultiLineEdit; /** @@ -29,14 +29,15 @@ class QMultiLineEdit; class KFeedbackDialog: public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** * Constructor. **/ - KFeedbackDialog( const QString & feedbackMailAddress, - const QString & helpTopic = QString::null ); + KFeedbackDialog( const TQString & feedbackMailAddress, + const TQString & helpTopic = TQString() ); /** @@ -82,16 +83,17 @@ protected: * User is asked a list of questions, the answers of which will be sent via * mail back to a feedback mail address. **/ -class KFeedbackForm: public QVBox +class KFeedbackForm: public TQVBox { Q_OBJECT + TQ_OBJECT public: /** * Constructor. **/ - KFeedbackForm( const QString & feedbackMailAddress, - QWidget * parent ); + KFeedbackForm( const TQString & feedbackMailAddress, + TQWidget * parent ); /** * Destructor. @@ -158,29 +160,30 @@ protected: /** * Format the "personal comments" field for sending mail. **/ - QString formatComment(); + TQString formatComment(); - QString _feedbackMailAddress; + TQString _feedbackMailAddress; KFeedbackQuestionList * _questionList; - QMultiLineEdit * _comment; + TQMultiLineEdit * _comment; }; /** - * List of feedback questions presented in a @ref QListView widget. + * List of feedback questions presented in a @ref TQListView widget. **/ -class KFeedbackQuestionList: public QListView +class KFeedbackQuestionList: public TQListView { Q_OBJECT + TQ_OBJECT public: /** * Constructor. **/ - KFeedbackQuestionList( QWidget *parent ); + KFeedbackQuestionList( TQWidget *parent ); /** * Destructor. @@ -196,7 +199,7 @@ public: /** * The result of all answered questions in ASCII. **/ - QString result(); + TQString result(); /** * Add a yes/no question to the list. @@ -215,16 +218,16 @@ public: * Returns a pointer to this question so you can add answers. **/ - KFeedbackQuestion * addQuestion( const QString & text, - const QString & id, + KFeedbackQuestion * addQuestion( const TQString & text, + const TQString & id, bool exclusiveAnswer = true, bool required = false ); /** * Add a yes/no question to the list. **/ - void addYesNoQuestion( const QString & text, - const QString & id, + void addYesNoQuestion( const TQString & text, + const TQString & id, bool required = false ); /** @@ -232,7 +235,7 @@ public: * Use @ref KFeedbackQuestion::next() to get the next one. **/ KFeedbackQuestion * firstQuestion() const - { return (KFeedbackQuestion *) QListView::firstChild(); } + { return (KFeedbackQuestion *) TQListView::firstChild(); } /** * Notify the list that another question has been answered. @@ -259,7 +262,7 @@ signals: /** * A user feedback question to be inserted into a @ref KFeedbackQuestionList. **/ -class KFeedbackQuestion: public QCheckListItem +class KFeedbackQuestion: public TQCheckListItem { public: @@ -285,8 +288,8 @@ public: * checked at any one time, to 'false' if multiple answers are allowed. **/ KFeedbackQuestion( KFeedbackQuestionList * parent, - const QString & text, - const QString & id, + const TQString & text, + const TQString & id, bool exclusiveAnswer = true, bool required = false, bool open = true ); @@ -297,8 +300,8 @@ public: * the mail. The answer IDs need only be unique for that question; answers * to other questions may have the same ID. **/ - void addAnswer( const QString & text, - const QString & id ); + void addAnswer( const TQString & text, + const TQString & id ); /** * Returns if answering this question is required. @@ -318,17 +321,17 @@ public: * features_i_like="pink_elephant" * features_i_like="studlycapslyfier" **/ - QString result(); + TQString result(); /** * Return this question's ID. **/ - QString id() { return _id; } + TQString id() { return _id; } /** * Return this question's text. **/ - QString text(); + TQString text(); /** * Returns whether or not this question requires an exclusive answer. @@ -339,22 +342,22 @@ public: /** * Returns the sort key. * - * Reimplemented from @ref QListViewItem to maintain insertion order. + * Reimplemented from @ref TQListViewItem to maintain insertion order. **/ - virtual QString key( int column, bool ascending ) const; + virtual TQString key( int column, bool ascending ) const; /** * Returns the next question or 0 if there is no more. **/ KFeedbackQuestion * nextQuestion() const - { return (KFeedbackQuestion *) QListViewItem::nextSibling(); } + { return (KFeedbackQuestion *) TQListViewItem::nextSibling(); } /** * Returns the first possible answer to this question. * Use @ref KFeedbackAnswer::nextAnswer() to get the next one. **/ KFeedbackAnswer * firstAnswer() const - { return (KFeedbackAnswer *) QListViewItem::firstChild(); } + { return (KFeedbackAnswer *) TQListViewItem::firstChild(); } /** * Returns the @ref KFeedbackQuestionList this question belongs to or 0 if @@ -365,14 +368,14 @@ public: protected: - QString _id; + TQString _id; bool _exclusiveAnswer; bool _required; int _no; }; -class KFeedbackAnswer: public QCheckListItem +class KFeedbackAnswer: public TQCheckListItem { public: /** @@ -382,19 +385,19 @@ public: * of many. **/ KFeedbackAnswer( KFeedbackQuestion * parent, - const QString & text, - const QString & id, + const TQString & text, + const TQString & id, bool exclusive = true ); /** * Return this answer's ID. **/ - QString id() { return _id; } + TQString id() { return _id; } /** * Return this answer's text. **/ - QString text(); + TQString text(); /** * Returns whether or not this is an exclusive answer. @@ -404,32 +407,32 @@ public: /** * Returns whether or not this answer is checked. **/ - bool isChecked() { return QCheckListItem::isOn(); } + bool isChecked() { return TQCheckListItem::isOn(); } /** * Returns the next possible answer or 0 if there is no more. **/ KFeedbackAnswer * nextAnswer() const - { return (KFeedbackAnswer *) QListViewItem::nextSibling(); } + { return (KFeedbackAnswer *) TQListViewItem::nextSibling(); } /** * Returns the question to this answer. **/ KFeedbackQuestion * question() const - { return (KFeedbackQuestion *) QListViewItem::parent(); } + { return (KFeedbackQuestion *) TQListViewItem::parent(); } /** * Returns the sort key. * - * Reimplemented from @ref QListViewItem to maintain insertion order. + * Reimplemented from @ref TQListViewItem to maintain insertion order. **/ - virtual QString key( int column, bool ascending ) const; + virtual TQString key( int column, bool ascending ) const; /** * On/off change. * - * Reimplemented from @ref QCheckListItem to monitor answering required + * Reimplemented from @ref TQCheckListItem to monitor answering required * questions. This method notifies the @ref KFeedbackQuestionList whenever * a required question is being answered. **/ @@ -437,7 +440,7 @@ public: protected: - QString _id; + TQString _id; bool _exclusive; int _no; }; diff --git a/src/kvpnc.cpp b/src/kvpnc.cpp index a743284..a4a5e19 100644 --- a/src/kvpnc.cpp +++ b/src/kvpnc.cpp @@ -27,31 +27,31 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include "debugoutputtextedit.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include @@ -111,7 +111,7 @@ //END includes -KVpnc::KVpnc ( KApplication *parent, QWidget*, const char *name ) : KMainWindow ( 0, name ), DCOPObject ( "KVpncInterface" ) +KVpnc::KVpnc ( KApplication *parent, TQWidget*, const char *name ) : KMainWindow ( 0, name ), DCOPObject ( "KVpncInterface" ) { this->parent = parent; setCaption ( i18n ( "KVpnc" ) ); @@ -160,7 +160,7 @@ KVpnc::KVpnc ( KApplication *parent, QWidget*, const char *name ) : KMainWindow ReplaceDefaultRouteProcess = 0; ConnectionStatusCheckProcess = 0; hour = min = sec = 0; - env = new QStringList(); + env = new TQStringList(); *env << "LC_ALL=C" << "LANG=C" << "PATH=/bin:/usr/bin:/usr/sbin:/sbin"; AuthRetry = false; @@ -170,16 +170,16 @@ KVpnc::KVpnc ( KApplication *parent, QWidget*, const char *name ) : KMainWindow showProfilesOnly=false; tmpPath = locateLocal ( "data", "kvpnc/" ); - QFile file ( tmpPath + "kvpnc_running" ); + TQFile file ( tmpPath + "kvpnc_running" ); if ( !file.exists() ) { if ( GlobalConfig->KvpncDebugLevel > 1 ) GlobalConfig->appendLogEntry ( i18n ( "KVpnc started normal." ), GlobalConfig->debug ); - QTextStream stream ( &file ); + TQTextStream stream ( &file ); if ( file.open ( IO_WriteOnly ) ) { - stream << "created at: " << QDate().currentDate().toString ( "yyyyMMdd" ) << QTime().currentTime().toString ( "hhmm" ) << "\n"; + stream << "created at: " << TQDate().tqcurrentDate().toString ( "yyyyMMdd" ) << TQTime().currentTime().toString ( "hhmm" ) << "\n"; file.close(); } else @@ -215,28 +215,28 @@ KVpnc::KVpnc ( KApplication *parent, QWidget*, const char *name ) : KMainWindow { mw->DebugOutput->hide(); // setMinimumSize(0,0); - // this->resize( minimumSizeHint() ); + // this->resize( tqminimumSizeHint() ); } DebugconsoleAction ->setChecked ( GlobalConfig->showDebugConsole ); - GlobalConfig->LogOutput->setPaper ( QBrush ( QColor ( GlobalConfig->DebugBackgroundcolor ) ) ); + GlobalConfig->LogOutput->setPaper ( TQBrush ( TQColor ( GlobalConfig->DebugBackgroundcolor ) ) ); if ( GlobalConfig->WindowSize.width() < 50 || GlobalConfig->WindowSize.height() < 50 ) { - GlobalConfig->WindowSize = QSize ( minimumWidth(), minimumHeight() ); + GlobalConfig->WindowSize = TQSize ( minimumWidth(), minimumHeight() ); } if ( GlobalConfig->WindowPos.x() < 0 || GlobalConfig->WindowPos.y() < 0 ) - GlobalConfig->WindowPos = QPoint ( 0, 0 ); + GlobalConfig->WindowPos = TQPoint ( 0, 0 ); resize ( GlobalConfig->WindowSize ); move ( GlobalConfig->WindowPos ); - QuickConnectMenu = new QPopupMenu ( KVpncDock->menu() ); - connect ( QuickConnectMenu, SIGNAL ( activated ( int ) ), this, SLOT ( doQuickConnect ( int ) ) ); + QuickConnectMenu = new TQPopupMenu ( KVpncDock->menu() ); + connect ( QuickConnectMenu, TQT_SIGNAL ( activated ( int ) ), this, TQT_SLOT ( doQuickConnect ( int ) ) ); - connect ( parent, SIGNAL ( shutDown() ), this, SLOT ( shutdownCalled() ) ); + connect ( parent, TQT_SIGNAL ( shutDown() ), this, TQT_SLOT ( shutdownCalled() ) ); - connect ( KVpncDock, SIGNAL ( closeEventKicker ( QCloseEvent * ) ),this,SLOT ( closeEvent ( QCloseEvent * ) ) ); + connect ( KVpncDock, TQT_SIGNAL ( closeEventKicker ( TQCloseEvent * ) ),this,TQT_SLOT ( closeEvent ( TQCloseEvent * ) ) ); for ( uint i = 0; i < GlobalConfig->AccountList->count();i++ ) { @@ -362,56 +362,56 @@ void KVpnc::initAction() connectingIcon = KGlobal::iconLoader() ->loadIcon ( "connecting", KIcon::NoGroup, 22 ); setIcon ( disconnectedIcon ); - ( void* ) KStdAction::quit ( this, SLOT ( quitCalled() ), actionCollection() ); - - SaveSessionAction = new KAction ( i18n ( "&Save Profile..." ), "fileexport", Key_S, this, SLOT ( saveSessionClicked() ), actionCollection(), "saveSession" ); - DeleteSessionAction = new KAction ( i18n ( "&Delete Profile..." ), "editdelete", Key_D, this, SLOT ( deleteSessionClicked() ), actionCollection(), "deleteSession" ); - RenameSessionAction = new KAction ( i18n ( "&Rename Profile..." ), "view_detailed", Key_D, this, SLOT ( renameSessionClicked() ), actionCollection(), "renameSession" ); - // NewSessionAction = new KAction( i18n( "&New Profile..." ), "profilenew", Key_N, this, SLOT( newSessionClicked() ), actionCollection(), "newSession" ); - //AdvancedSessionAction = new KAction( i18n( "&Advanced..." ), "wizard", Key_A, this, SLOT( advancedSettingsClicked() ), actionCollection(), "advancedSettingsSession" ); - ImportSessionAction = new KAction ( i18n ( "&Import Cisco pcf file..." ), "cisco", Key_F, this, SLOT ( importProfileClicked() ), actionCollection(), "importSession" ); - ImportOpenvpnProfileAction = new KAction ( i18n ( "Import &OpenVPN config file..." ), "openvpnimport", Key_O, this, SLOT ( importOpenvpnProfileClicked() ), actionCollection(), "importOpenvpnConfig" ); - ImportFreeswanProfileAction = new KAction ( i18n ( "Import &Freeswan/Openswan/strongSwan config file..." ), "openswan", Key_I, this, SLOT ( importIpsecProfileClicked() ), actionCollection(), "importFreeswanConfig" ); - ImportFritzboxProfileAction = new KAction ( i18n ( "Import Fritz&box VPN user config file..." ), "fritzboximport", Key_I, this, SLOT ( importFritzboxProfileClicked() ), actionCollection(), "importFritzboxConfig" ); - ImportCertAction = new KAction ( i18n ( "Import &certificate..." ), "certimport", Key_C, this, SLOT ( importCertClicked() ), actionCollection(), "importCert" ); - ManageCiscoCertAction = new KAction ( i18n ( "Manage Cisco certificates..." ), "certimport", Key_C, this, SLOT ( manageCiscoCertClicked() ), actionCollection(), "manageCiscoCert" ); - CiscoCertEnrollmentAction = new KAction ( i18n ( "Enroll Cisco certificates..." ), "certimport", Key_T, this, SLOT ( enrollCiscoCertClicked() ), actionCollection(), "enrollCiscoCert" ); - ExportOpenvpnProfileAction = new KAction ( i18n ( "Export &OpenVPN profile to config file" ), "openvpnexport", Key_O, this, SLOT ( exportOpenvpnProfileClicked() ), actionCollection(), "exportOpenvpnConfig" ); - - ImportKvpncSettingsAction = new KAction ( i18n ( "Import KVpnc settings..." ), "2downarrow", Key_I, this, SLOT ( importKvpncSettingsClicked() ), actionCollection(), "importKvpncSettings" ); - ExportKvpncSettingsAction = new KAction ( i18n ( "Export KVpnc settings to file" ), "2uparrow", Key_E, this, SLOT ( exportKvpncSettingsClicked() ), actionCollection(), "exportKvpncSettings" ); - - ConnectAction = new KAction ( i18n ( "&Connect" ), "connected", CTRL + Key_Up, this, SLOT ( slotConnecting() ), actionCollection(), "serverConnect" ); - DisconnectAction = new KAction ( i18n ( "&Disconnect" ), "disconnected", CTRL + Key_Down, this, SLOT ( disconnectClicked() ), actionCollection(), "serverDisconnect" ); - ProfileManagerAction = new KAction ( i18n ( "&Manage Profiles" ), "view_detailed", CTRL + Key_M, this, SLOT ( showProfileManagerClicked() ), actionCollection(), "profileManager" ); - NewProfileWizardAction = new KAction ( i18n ( "&new Profile (Wizard)" ), "wizard", CTRL + Key_W, this, SLOT ( showNewProfileWizardClicked() ), actionCollection(), "NewProfileWizard" ); - DonateAction = new KAction ( i18n ( "&Support KVpnc..." ), "donate", CTRL + Key_D, this, SLOT ( donateClicked() ), actionCollection(), "donate" ); - ReportBugAction = new KAction ( i18n ( "&Report a bug..." ), "bug", CTRL + Key_R, this, SLOT ( reportBugClicked() ), actionCollection(), "reportbug" ); - DebugconsoleAction = new KToggleAction ( i18n ( "Toggle Debug &Console" ), "text_center", CTRL + Key_C, this, SLOT ( toggleDebugConsole() ), actionCollection(), "debugconsole" ); - ToolsInfoAction = new KToggleAction ( i18n ( "Show &Tools Info" ), "info", CTRL + Key_I, this, SLOT ( toolsInfoClicked() ), actionCollection(), "toolsinfo" ); - VpnTypesInfoAction = new KToggleAction ( i18n ( "Show &VPN types Info" ), "info", CTRL + Key_T, this, SLOT ( vpnTypesInfoClicked() ), actionCollection(), "vpntypesinfo" ); + ( void* ) KStdAction::quit ( this, TQT_SLOT ( quitCalled() ), actionCollection() ); + + SaveSessionAction = new KAction ( i18n ( "&Save Profile..." ), "fileexport", Key_S, this, TQT_SLOT ( saveSessionClicked() ), actionCollection(), "saveSession" ); + DeleteSessionAction = new KAction ( i18n ( "&Delete Profile..." ), "editdelete", Key_D, this, TQT_SLOT ( deleteSessionClicked() ), actionCollection(), "deleteSession" ); + RenameSessionAction = new KAction ( i18n ( "&Rename Profile..." ), "view_detailed", Key_D, this, TQT_SLOT ( renameSessionClicked() ), actionCollection(), "renameSession" ); + // NewSessionAction = new KAction( i18n( "&New Profile..." ), "profilenew", Key_N, this, TQT_SLOT( newSessionClicked() ), actionCollection(), "newSession" ); + //AdvancedSessionAction = new KAction( i18n( "&Advanced..." ), "wizard", Key_A, this, TQT_SLOT( advancedSettingsClicked() ), actionCollection(), "advancedSettingsSession" ); + ImportSessionAction = new KAction ( i18n ( "&Import Cisco pcf file..." ), "cisco", Key_F, this, TQT_SLOT ( importProfileClicked() ), actionCollection(), "importSession" ); + ImportOpenvpnProfileAction = new KAction ( i18n ( "Import &OpenVPN config file..." ), "openvpnimport", Key_O, this, TQT_SLOT ( importOpenvpnProfileClicked() ), actionCollection(), "importOpenvpnConfig" ); + ImportFreeswanProfileAction = new KAction ( i18n ( "Import &Freeswan/Openswan/strongSwan config file..." ), "openswan", Key_I, this, TQT_SLOT ( importIpsecProfileClicked() ), actionCollection(), "importFreeswanConfig" ); + ImportFritzboxProfileAction = new KAction ( i18n ( "Import Fritz&box VPN user config file..." ), "fritzboximport", Key_I, this, TQT_SLOT ( importFritzboxProfileClicked() ), actionCollection(), "importFritzboxConfig" ); + ImportCertAction = new KAction ( i18n ( "Import &certificate..." ), "certimport", Key_C, this, TQT_SLOT ( importCertClicked() ), actionCollection(), "importCert" ); + ManageCiscoCertAction = new KAction ( i18n ( "Manage Cisco certificates..." ), "certimport", Key_C, this, TQT_SLOT ( manageCiscoCertClicked() ), actionCollection(), "manageCiscoCert" ); + CiscoCertEnrollmentAction = new KAction ( i18n ( "Enroll Cisco certificates..." ), "certimport", Key_T, this, TQT_SLOT ( enrollCiscoCertClicked() ), actionCollection(), "enrollCiscoCert" ); + ExportOpenvpnProfileAction = new KAction ( i18n ( "Export &OpenVPN profile to config file" ), "openvpnexport", Key_O, this, TQT_SLOT ( exportOpenvpnProfileClicked() ), actionCollection(), "exportOpenvpnConfig" ); + + ImportKvpncSettingsAction = new KAction ( i18n ( "Import KVpnc settings..." ), "2downarrow", Key_I, this, TQT_SLOT ( importKvpncSettingsClicked() ), actionCollection(), "importKvpncSettings" ); + ExportKvpncSettingsAction = new KAction ( i18n ( "Export KVpnc settings to file" ), "2uparrow", Key_E, this, TQT_SLOT ( exportKvpncSettingsClicked() ), actionCollection(), "exportKvpncSettings" ); + + ConnectAction = new KAction ( i18n ( "&Connect" ), "connected", CTRL + Key_Up, this, TQT_SLOT ( slotConnecting() ), actionCollection(), "serverConnect" ); + DisconnectAction = new KAction ( i18n ( "&Disconnect" ), "disconnected", CTRL + Key_Down, this, TQT_SLOT ( disconnectClicked() ), actionCollection(), "serverDisconnect" ); + ProfileManagerAction = new KAction ( i18n ( "&Manage Profiles" ), "view_detailed", CTRL + Key_M, this, TQT_SLOT ( showProfileManagerClicked() ), actionCollection(), "profileManager" ); + NewProfileWizardAction = new KAction ( i18n ( "&new Profile (Wizard)" ), "wizard", CTRL + Key_W, this, TQT_SLOT ( showNewProfileWizardClicked() ), actionCollection(), "NewProfileWizard" ); + DonateAction = new KAction ( i18n ( "&Support KVpnc..." ), "donate", CTRL + Key_D, this, TQT_SLOT ( donateClicked() ), actionCollection(), "donate" ); + ReportBugAction = new KAction ( i18n ( "&Report a bug..." ), "bug", CTRL + Key_R, this, TQT_SLOT ( reportBugClicked() ), actionCollection(), "reportbug" ); + DebugconsoleAction = new KToggleAction ( i18n ( "Toggle Debug &Console" ), "text_center", CTRL + Key_C, this, TQT_SLOT ( toggleDebugConsole() ), actionCollection(), "debugconsole" ); + ToolsInfoAction = new KToggleAction ( i18n ( "Show &Tools Info" ), "info", CTRL + Key_I, this, TQT_SLOT ( toolsInfoClicked() ), actionCollection(), "toolsinfo" ); + VpnTypesInfoAction = new KToggleAction ( i18n ( "Show &VPN types Info" ), "info", CTRL + Key_T, this, TQT_SLOT ( vpnTypesInfoClicked() ), actionCollection(), "vpntypesinfo" ); // // tmp -// ToolsInfoAction = new KToggleAction ( i18n("Show &Tools Info"), "info", CTRL + Key_T, this, SLOT(helpClicked() ), actionCollection(), "toolsinfo" ); +// ToolsInfoAction = new KToggleAction ( i18n("Show &Tools Info"), "info", CTRL + Key_T, this, TQT_SLOT(helpClicked() ), actionCollection(), "toolsinfo" ); - LogViewerAction = new KToggleAction ( i18n ( "Show &Log" ), "log", CTRL + Key_L, this, SLOT ( showLogViewer() ), actionCollection(), "logviewer" ); - GenerateOpenvpnKeyAction = new KToggleAction ( i18n ( "Generate OpenVPN Key" ), "key", CTRL + Key_G, this, SLOT ( generateOpenvpnKey() ), actionCollection(), "genOpenvpncKey" ); - SendFeedbackMailAction = new KAction ( i18n ( "Send &Feedback Mail..." ), 0, this, SLOT ( sendFeedbackMail() ), actionCollection(), "help_send_feedback_mail" ); - PrefAction = KStdAction::preferences ( this, SLOT ( slotSettings() ), actionCollection(), "preferences" ); - KStdAction::helpContents ( this, SLOT ( helpClicked () ), actionCollection(), "help" ); - KStdAction::configureNotifications ( this, SLOT ( slotConfigNotifications() ), actionCollection() ); - KStdAction::keyBindings ( this, SLOT ( slotKeyBindings() ), actionCollection() ); + LogViewerAction = new KToggleAction ( i18n ( "Show &Log" ), "log", CTRL + Key_L, this, TQT_SLOT ( showLogViewer() ), actionCollection(), "logviewer" ); + GenerateOpenvpnKeyAction = new KToggleAction ( i18n ( "Generate OpenVPN Key" ), "key", CTRL + Key_G, this, TQT_SLOT ( generateOpenvpnKey() ), actionCollection(), "genOpenvpncKey" ); + SendFeedbackMailAction = new KAction ( i18n ( "Send &Feedback Mail..." ), 0, this, TQT_SLOT ( sendFeedbackMail() ), actionCollection(), "help_send_feedback_mail" ); + PrefAction = KStdAction::preferences ( this, TQT_SLOT ( slotSettings() ), actionCollection(), "preferences" ); + KStdAction::helpContents ( this, TQT_SLOT ( helpClicked () ), actionCollection(), "help" ); + KStdAction::configureNotifications ( this, TQT_SLOT ( slotConfigNotifications() ), actionCollection() ); + KStdAction::keyBindings ( this, TQT_SLOT ( slotKeyBindings() ), actionCollection() ); this->ConnectAction->setEnabled ( false ); this->DisconnectAction->setEnabled ( false ); - // ShowToolbarAction = KStdAction::showToolbar( this, SLOT( slotShowToolbar() ), actionCollection() ); + // ShowToolbarAction = KStdAction::showToolbar( this, TQT_SLOT( slotShowToolbar() ), actionCollection() ); createStandardStatusBarAction(); - ShowStatusbarAction = KStdAction::showStatusbar ( this, SLOT ( slotShowStatusbar() ), actionCollection() ); - PreferencesAction = KStdAction::preferences ( this, SLOT ( slotSettings() ), actionCollection() ); + ShowStatusbarAction = KStdAction::showStatusbar ( this, TQT_SLOT ( slotShowStatusbar() ), actionCollection() ); + PreferencesAction = KStdAction::preferences ( this, TQT_SLOT ( slotSettings() ), actionCollection() ); - ( void* ) KStdAction::keyBindings ( this, SLOT ( slotKeyBindings() ), actionCollection() ); - ( void* ) KStdAction::configureToolbars ( this, SLOT ( slotConfigToolbars() ), actionCollection() ); - ( void* ) KStdAction::configureNotifications ( this, SLOT ( slotConfigNotifications() ), actionCollection() ); + ( void* ) KStdAction::keyBindings ( this, TQT_SLOT ( slotKeyBindings() ), actionCollection() ); + ( void* ) KStdAction::configureToolbars ( this, TQT_SLOT ( slotConfigToolbars() ), actionCollection() ); + ( void* ) KStdAction::configureNotifications ( this, TQT_SLOT ( slotConfigNotifications() ), actionCollection() ); createGUI(); @@ -423,20 +423,20 @@ void KVpnc::initView() mw = new MainView ( this, "mainView" ); setCentralWidget ( mw ); - connect ( mw->buttonConnect, SIGNAL ( clicked() ), this, SLOT ( slotConnecting() ) ); - connect ( mw->buttonDisconnect, SIGNAL ( clicked() ), this, SLOT ( disconnectClicked() ) ); + connect ( mw->buttonConnect, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( slotConnecting() ) ); + connect ( mw->buttonDisconnect, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( disconnectClicked() ) ); - connect ( mw->SessionCombo, SIGNAL ( activated ( const QString & ) ), this, SLOT ( sessionToggled ( const QString& ) ) ); + connect ( mw->SessionCombo, TQT_SIGNAL ( activated ( const TQString & ) ), this, TQT_SLOT ( sessionToggled ( const TQString& ) ) ); mw->SessionCombo->setEnabled ( FALSE ); - statusColorLabel = new QLabel ( this ); - disconnectedStatusPixmap = new QPixmap ( 15, 15 ); - disconnectedStatusPixmap->fill ( QColor ( Qt::red ) ); - connectedStatusPixmap = new QPixmap ( 15, 15 ); - connectedStatusPixmap->fill ( QColor ( Qt::green ) ); - connectingStatusPixmap = new QPixmap ( 15, 15 ); - connectingStatusPixmap->fill ( QColor ( Qt::yellow ) ); + statusColorLabel = new TQLabel ( this ); + disconnectedStatusPixmap = new TQPixmap ( 15, 15 ); + disconnectedStatusPixmap->fill ( TQColor ( TQt::red ) ); + connectedStatusPixmap = new TQPixmap ( 15, 15 ); + connectedStatusPixmap->fill ( TQColor ( TQt::green ) ); + connectingStatusPixmap = new TQPixmap ( 15, 15 ); + connectingStatusPixmap->fill ( TQColor ( TQt::yellow ) ); statusColorLabel->setPixmap ( *disconnectedStatusPixmap ); @@ -461,7 +461,7 @@ void KVpnc::initDockWindow() DisconnectAction->plug ( KVpncDock->menu(), 2 ); KVpncDock->menu() ->insertSeparator ( 5 ); PreferencesAction->plug ( KVpncDock->menu(), 6 ); - connect (KVpncDock, SIGNAL(tooltipRequested()), this, SLOT(showDockTooltip())); + connect (KVpncDock, TQT_SIGNAL(tooltipRequested()), this, TQT_SLOT(showDockTooltip())); } void KVpnc::slotSettings() @@ -473,11 +473,11 @@ void KVpnc::slotSettings() // prefDlg->setMinimumSize ( 800, 600 ); VpnAccountData *oldProfile = GlobalConfig->currentProfile; - connect ( prefDlg->ProfileGeneralOptionsWidget->NewSessionPushButton , SIGNAL ( clicked () ), this, SLOT ( showNewProfileWizardClicked() ) ); - connect ( this, SIGNAL(newProfileCreated(QString )), prefDlg, SLOT(slotProfileCreated(QString ))); + connect ( prefDlg->ProfileGeneralOptionsWidget->NewSessionPushButton , TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( showNewProfileWizardClicked() ) ); + connect ( this, TQT_SIGNAL(newProfileCreated(TQString )), prefDlg, TQT_SLOT(slotProfileCreated(TQString ))); prefDlg->exec(); - GlobalConfig->LogOutput->setPaper ( QBrush ( QColor ( GlobalConfig->DebugBackgroundcolor ) ) ); + GlobalConfig->LogOutput->setPaper ( TQBrush ( TQColor ( GlobalConfig->DebugBackgroundcolor ) ) ); if ( prefDlg->profileAddedOrDeleted ) { @@ -495,7 +495,7 @@ void KVpnc::slotSettings() } else { - QString Name = ""; + TQString Name = ""; if ( GlobalConfig->currentProfile != 0 ) Name = GlobalConfig->currentProfile->getName(); if ( Name != mw->SessionCombo->currentText() ) @@ -524,13 +524,13 @@ void KVpnc::slotSettings() if ( GlobalConfig->showDebugConsole ) { mw->DebugOutput->show(); - //resize( minimumSizeHint() ); + //resize( tqminimumSizeHint() ); } else { mw->DebugOutput->hide(); setMinimumSize ( 0, 0 ); - this->resize ( minimumSizeHint() ); + this->resize ( tqminimumSizeHint() ); } if ( GlobalConfig->writeLogFile ) @@ -538,8 +538,8 @@ void KVpnc::slotSettings() if ( !GlobalConfig->logfile.isOpen() ) { KStandardDirs * dirs = KGlobal::dirs(); - QString logfileName = QString ( dirs->saveLocation ( "data" ) ); - QString logfilePath = QString ( logfileName + "/kvpnc/kvpnc.log" ); + TQString logfileName = TQString ( dirs->saveLocation ( "data" ) ); + TQString logfilePath = TQString ( logfileName + "/kvpnc/kvpnc.log" ); //KMessageBox::information( this, "info", logfileName ); GlobalConfig->logfile.setName ( logfileName ); if ( !GlobalConfig->logfile.open ( IO_WriteOnly | IO_Append ) ) @@ -549,7 +549,7 @@ void KVpnc::slotSettings() } else { - GlobalConfig->logFileStream << i18n ( "Log session started at: " ) << QDateTime::currentDateTime().toString ( Qt::TextDate ) << endl; + GlobalConfig->logFileStream << i18n ( "Log session started at: " ) << TQDateTime::tqcurrentDateTime().toString ( Qt::TextDate ) << endl; } } } @@ -557,8 +557,8 @@ void KVpnc::slotSettings() { if ( GlobalConfig->logfile.isOpen() ) { - //QTextStream s( &logfile ); - GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << QDateTime::currentDateTime().toString ( Qt::TextDate ) << endl; + //TQTextStream s( &logfile ); + GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::tqcurrentDateTime().toString ( Qt::TextDate ) << endl; GlobalConfig->logfile.close(); } } @@ -566,8 +566,8 @@ void KVpnc::slotSettings() //saveGuiOptions(); saveSessionClicked(); showProfilesOnly=false; - disconnect ( prefDlg->ProfileGeneralOptionsWidget->NewSessionPushButton , SIGNAL ( clicked () ), this, SLOT ( showNewProfileWizardClicked() ) ); - disconnect ( this, SIGNAL(newProfileCreated(QString )), prefDlg, SLOT(slotProfileCreated(QString ))); + disconnect ( prefDlg->ProfileGeneralOptionsWidget->NewSessionPushButton , TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( showNewProfileWizardClicked() ) ); + disconnect ( this, TQT_SIGNAL(newProfileCreated(TQString )), prefDlg, TQT_SLOT(slotProfileCreated(TQString ))); delete prefDlg; } @@ -618,7 +618,7 @@ void KVpnc::slotConfigNotifications() KNotifyDialog::configure ( this ); } -void KVpnc::slotStatusMsg ( const QString &text, int id ) +void KVpnc::slotStatusMsg ( const TQString &text, int id ) { if ( id != ID_FLASH_MSG ) { @@ -637,7 +637,7 @@ void KVpnc:: quitCalled() bool reallyQuit = false; if ( GlobalConfig->KvpncDebugLevel > 1 ) GlobalConfig->appendLogEntry ( i18n ( "quitCalled()" ), GlobalConfig->debug ); - QString TypeString = ""; + TQString TypeString = ""; if ( GlobalConfig->currentProfile != 0 ) { @@ -665,8 +665,8 @@ void KVpnc:: quitCalled() TypeString = i18n ( "other" ); } - GlobalConfig->WindowSize = QSize ( QWidget::width(), QWidget::height() ); - GlobalConfig->WindowPos = QPoint ( this->x(), this->y() ); + GlobalConfig->WindowSize = TQSize ( TQWidget::width(), TQWidget::height() ); + GlobalConfig->WindowPos = TQPoint ( this->x(), this->y() ); if ( GlobalConfig->status == GlobalConfig->connected ) { @@ -685,8 +685,8 @@ void KVpnc:: quitCalled() { if ( GlobalConfig->logfile.isOpen() ) { - // QTextStream s( &logfile ); - GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << QDateTime::currentDateTime().toString ( Qt::TextDate ) << endl; + // TQTextStream s( &logfile ); + GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::tqcurrentDateTime().toString ( Qt::TextDate ) << endl; GlobalConfig->logfile.flush(); GlobalConfig->logfile.close(); GlobalConfig->appPointer->processEvents(); @@ -696,7 +696,7 @@ void KVpnc:: quitCalled() GlobalConfig->saveOptions(); restoreNetworkEnvironment(); tmpPath = locateLocal ( "data", "kvpnc/" ); - QFile file ( tmpPath + "kvpnc_running" ); + TQFile file ( tmpPath + "kvpnc_running" ); file.remove(); kapp->quit(); } @@ -712,8 +712,8 @@ void KVpnc:: quitCalled() { if ( GlobalConfig->logfile.isOpen() ) { - // QTextStream s( &logfile ); - GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << QDateTime::currentDateTime().toString ( Qt::TextDate ) << endl; + // TQTextStream s( &logfile ); + GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::tqcurrentDateTime().toString ( Qt::TextDate ) << endl; GlobalConfig->logfile.flush(); GlobalConfig->logfile.close(); GlobalConfig->appPointer->processEvents(); @@ -723,7 +723,7 @@ void KVpnc:: quitCalled() GlobalConfig->saveOptions(); restoreNetworkEnvironment(); tmpPath = locateLocal ( "data", "kvpnc/" ); - QFile file ( tmpPath + "kvpnc_running" ); + TQFile file ( tmpPath + "kvpnc_running" ); file.remove(); kapp->quit(); } @@ -739,8 +739,8 @@ void KVpnc:: quitCalled() { if ( GlobalConfig->logfile.isOpen() ) { - // QTextStream s( &logfile ); - GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << QDateTime::currentDateTime().toString ( Qt::TextDate ) << endl; + // TQTextStream s( &logfile ); + GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::tqcurrentDateTime().toString ( Qt::TextDate ) << endl; GlobalConfig->logfile.flush(); GlobalConfig->logfile.close(); GlobalConfig->appPointer->processEvents(); @@ -750,7 +750,7 @@ void KVpnc:: quitCalled() GlobalConfig->saveOptions(); restoreNetworkEnvironment(); tmpPath = locateLocal ( "data", "kvpnc/" ); - QFile file ( tmpPath + "kvpnc_running" ); + TQFile file ( tmpPath + "kvpnc_running" ); file.remove(); kapp->quit(); @@ -768,8 +768,8 @@ void KVpnc:: quitCalled() { if ( GlobalConfig->logfile.isOpen() ) { - // QTextStream s( &logfile ); - GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << QDateTime::currentDateTime().toString ( Qt::TextDate ) << endl; + // TQTextStream s( &logfile ); + GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::tqcurrentDateTime().toString ( Qt::TextDate ) << endl; GlobalConfig->logfile.flush(); GlobalConfig->logfile.close(); GlobalConfig->appPointer->processEvents(); @@ -779,7 +779,7 @@ void KVpnc:: quitCalled() GlobalConfig->saveOptions(); restoreNetworkEnvironment(); tmpPath = locateLocal ( "data", "kvpnc/" ); - QFile file ( tmpPath + "kvpnc_running" ); + TQFile file ( tmpPath + "kvpnc_running" ); file.remove(); kapp->quit(); } @@ -800,12 +800,12 @@ void KVpnc::shutdownCalled() GlobalConfig->appendLogEntry ( i18n ( "shutdown called!" ), GlobalConfig->debug ); } -void KVpnc::closeEvent ( QCloseEvent *e ) +void KVpnc::closeEvent ( TQCloseEvent *e ) { if ( GlobalConfig->KvpncDebugLevel > 1 ) GlobalConfig->appendLogEntry ( i18n ( "CloseEvent recieved (reciever: %1)." ).arg ( "kvpnc" ), GlobalConfig->debug ); - QString TypeString = ""; + TQString TypeString = ""; if ( GlobalConfig->currentProfile != 0 ) { if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::cisco ) @@ -851,7 +851,7 @@ void KVpnc::closeEvent ( QCloseEvent *e ) if ( !GlobalConfig->useSilentQuit ) { res = KMessageBox::questionYesNo ( this, i18n ( "You are still connected to \"%1\" (%2) Do you really want to quit?" ).arg ( GlobalConfig->currentProfile->getName() ).arg ( TypeString ), i18n ( "Quit?" ), KStdGuiItem::quit(), KStdGuiItem::cancel() ); - //KMessageBox::error( this,QString().setNum(res) ); + //KMessageBox::error( this,TQString().setNum(res) ); if ( res != 4 ) { reallyQuit = true; @@ -867,14 +867,14 @@ void KVpnc::closeEvent ( QCloseEvent *e ) { if ( GlobalConfig->logfile.isOpen() ) { - // QTextStream s( &logfile ); - GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << QDateTime::currentDateTime().toString ( Qt::TextDate ) << endl; + // TQTextStream s( &logfile ); + GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::tqcurrentDateTime().toString ( Qt::TextDate ) << endl; GlobalConfig->logfile.close(); GlobalConfig->appPointer->processEvents(); } } tmpPath = locateLocal ( "data", "kvpnc/" ); - QFile file ( tmpPath + "kvpnc_running" ); + TQFile file ( tmpPath + "kvpnc_running" ); file.remove(); KMainWindow::closeEvent ( e ); @@ -912,13 +912,13 @@ void KVpnc::closeEvent ( QCloseEvent *e ) //KMainWindow::closeEvent( e ); disconnectClicked(); tmpPath = locateLocal ( "data", "kvpnc/" ); - QFile file ( tmpPath + "kvpnc_running" ); + TQFile file ( tmpPath + "kvpnc_running" ); file.remove(); if ( GlobalConfig->writeLogFile ) { if ( GlobalConfig->logfile.isOpen() ) { - GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << QDateTime::currentDateTime().toString ( Qt::TextDate ) << endl; + GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::tqcurrentDateTime().toString ( Qt::TextDate ) << endl; GlobalConfig->logfile.flush(); GlobalConfig->logfile.close(); GlobalConfig->appPointer->processEvents(); @@ -1000,7 +1000,7 @@ void KVpnc::restore() void KVpnc::saveProperties ( KConfig* c ) { - QString saveDir = KGlobal::dirs()->saveLocation ( "appdata", "sessions/" + qApp->sessionId() + "/", true ); + TQString saveDir = KGlobal::dirs()->saveLocation ( "appdata", "sessions/" + tqApp->sessionId() + "/", true ); c = new KSimpleConfig ( saveDir + "list", false ); c->setGroup ( "Saved Session" ); @@ -1010,7 +1010,7 @@ void KVpnc::saveProperties ( KConfig* c ) void KVpnc::readProperties ( KConfig* c ) { - QString saveDir = KGlobal::dirs()->saveLocation ( "appdata", "sessions/" + qApp->sessionId() + "/", true ); + TQString saveDir = KGlobal::dirs()->saveLocation ( "appdata", "sessions/" + tqApp->sessionId() + "/", true ); c = new KSimpleConfig ( saveDir + "list", true ); c->setGroup ( "Saved Session" ); delete c; @@ -1027,7 +1027,7 @@ void KVpnc::connectClicked() stopContinue = false; ToolInfo *IpsecToolInfo = Utils ( GlobalConfig ).getToolInfo ( "ipsec" ) ; - QString TypeString = i18n ( "unknown" ); + TQString TypeString = i18n ( "unknown" ); if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::cisco ) TypeString = i18n ( "Cisco" ); else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ciscoorig ) @@ -1075,7 +1075,7 @@ void KVpnc::connectClicked() KMessageBox::error ( this, i18n ( "No gateway for profile \"%1\" entered. STOP." ).arg ( GlobalConfig->currentProfile->getName() ) ); GlobalConfig->appendLogEntry ( i18n ( "No gateway for profile \"%1\" entered. STOP." ).arg ( GlobalConfig->currentProfile->getName() ), GlobalConfig->error ); ok = false; - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return ; } @@ -1095,7 +1095,7 @@ void KVpnc::connectClicked() if ( GlobalConfig->currentProfile != 0 && GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::cisco ) { - //setGuiStatus(connecting); + //setGuitqStatus(connecting); // looking for vpnc if ( Utils ( GlobalConfig ).getToolInfo ( "vpnc" )->found == false ) @@ -1103,7 +1103,7 @@ void KVpnc::connectClicked() KMessageBox::error ( this, i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "vpnc" ).arg ( GlobalConfig->pathToVpnc ) ); GlobalConfig->appendLogEntry ( i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "vpnc" ).arg ( GlobalConfig->pathToVpnc ), GlobalConfig->error ); ok = false; - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return ; } @@ -1354,7 +1354,7 @@ void KVpnc::connectClicked() AuthRetry = false; if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "Connect canceled because account data dialog aborted." ), GlobalConfig->debug ); - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return; } } @@ -1375,8 +1375,8 @@ void KVpnc::connectClicked() tmpPath = locateLocal ( "data", "kvpnc/" ); - QString tmpInterface; - QString LocalIP; + TQString tmpInterface; + TQString LocalIP; NetworkInterface iface ( GlobalConfig , parent ); if ( GlobalConfig->currentProfile->getNetworkDevice() == "default" ) { @@ -1418,19 +1418,19 @@ void KVpnc::connectClicked() LocalIP = "127.0.0.1"; // no IP for default interface found :( } - // QString tunneldevice = "tun0"; + // TQString tunneldevice = "tun0"; OldDefaultroute = tmpPath + "default-route." + GlobalConfig->currentProfile->getName(); // default-route. -// QFile DefaultRouteBackupFile(OldDefaultroute + ".sh"); -// QTextStream DefaultRouteBackupFileStream(&DefaultRouteBackupFile); -// if (DefaultRouteBackupFile.open(QIODevice::WriteOnly)) { +// TQFile DefaultRouteBackupFile(OldDefaultroute + ".sh"); +// TQTextStream DefaultRouteBackupFileStream(&DefaultRouteBackupFile); +// if (DefaultRouteBackupFile.open(TQIODevice::WriteOnly)) { // DefaultRouteBackupFileStream << "# generated by kvpnc. Do not edit it." << "\n"; // DefaultRouteBackupFileStream << "\n"; // DefaultRouteBackupFileStream << GlobalConfig->pathToIp + " route show | grep default > " + OldDefaultroute + "\n"; // DefaultRouteBackupFile.close(); -// QProcess backupDefaultRouteProcess(this); -// QString proc = GlobalConfig->InterpreterShell; -// QStringList args; +// TQProcess backupDefaultRouteProcess(this); +// TQString proc = GlobalConfig->InterpreterShell; +// TQStringList args; // backupDefaultRouteProcess.setEnvironment(*env); // args.append(OldDefaultroute + ".sh"); // backupDefaultRouteProcess.setEnvironment(*env); @@ -1460,8 +1460,8 @@ void KVpnc::connectClicked() VpncScript = tmpPath + "vpnc-script." + GlobalConfig->currentProfile->getName(); // vpnc-script. if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( "VpncScript: " + VpncScript + "\n", GlobalConfig->debug ); - QFile file ( VpncScript ); - QTextStream stream ( &file ); + TQFile file ( VpncScript ); + TQTextStream stream ( &file ); if ( file.open ( IO_WriteOnly ) ) { stream << "#!"<< GlobalConfig->InterpreterShell << "\n"; @@ -1560,7 +1560,7 @@ void KVpnc::connectClicked() stream << "\n"; stream << "do_ifconfig() {\n"; if ( GlobalConfig->currentProfile->getUseMtu() ) - stream << GlobalConfig->pathToIfconfig + " \"$TUNDEV\" inet \"$INTERNAL_IP4_ADDRESS\" $ifconfig_syntax_ptp \"$INTERNAL_IP4_ADDRESS\" netmask 255.255.255.255 mtu " + QString().setNum ( GlobalConfig->currentProfile->getMtu() ) + " up\n"; + stream << GlobalConfig->pathToIfconfig + " \"$TUNDEV\" inet \"$INTERNAL_IP4_ADDRESS\" $ifconfig_syntax_ptp \"$INTERNAL_IP4_ADDRESS\" netmask 255.255.255.255 mtu " + TQString().setNum ( GlobalConfig->currentProfile->getMtu() ) + " up\n"; else stream << GlobalConfig->pathToIfconfig + " \"$TUNDEV\" inet \"$INTERNAL_IP4_ADDRESS\" $ifconfig_syntax_ptp \"$INTERNAL_IP4_ADDRESS\" netmask 255.255.255.255 mtu 1390 up\n"; stream << "}\n"; @@ -1904,8 +1904,8 @@ void KVpnc::connectClicked() } else { - GlobalConfig->appendLogEntry ( i18n ( "Creating %1 has been failed." ).arg ( QString ( "VpncScript" ) ), GlobalConfig->error ); - setGuiStatus ( disconnected ); + GlobalConfig->appendLogEntry ( i18n ( "Creating %1 has been failed." ).arg ( TQString ( "VpncScript" ) ), GlobalConfig->error ); + setGuitqStatus ( disconnected ); timer.stop(); return ; } @@ -1919,7 +1919,7 @@ void KVpnc::connectClicked() //if ( !NetworkInterface ( GlobalConfig, parent, this ).interfaceExist ( "tun0" ) ) //FIXME make it dynamiclly (tun+) { - QFile tundevfile ( "/dev/net/tun" ); + TQFile tundevfile ( "/dev/net/tun" ); if ( !tundevfile.exists() ) { if ( !Utils ( GlobalConfig, parent ).createTunDev() ) @@ -1927,7 +1927,7 @@ void KVpnc::connectClicked() KMessageBox::error ( this, i18n ( "Creating of \"%1\" has been failed!" ).arg ( "/dev/net/tun" ) ); GlobalConfig->appendLogEntry ( i18n ( "Tunnel device is missing, creating has been failed: stop." ), GlobalConfig->error ); disconnectClicked(); - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); GlobalConfig->status = GlobalConfig->disconnected; return ; } @@ -1943,15 +1943,15 @@ void KVpnc::connectClicked() if ( GlobalConfig->KvpncDebugLevel > 3 ) GlobalConfig->appendLogEntry ( i18n ( "Checking tun support" ), GlobalConfig->debug ); bool tunsupportfound = false; - QString procmisc = ""; - QFile f ( "/proc/misc" ); + TQString procmisc = ""; + TQFile f ( "/proc/misc" ); if ( f.open ( IO_ReadOnly ) ) { - QTextStream procmiscstream ( &f ); - QString procmiscontent = QString(procmiscstream.read()); - QStringList procmisc_content_list = QStringList::split("\n", procmiscontent); - QString line = ""; - for ( QStringList::Iterator it = procmisc_content_list.begin(); it != procmisc_content_list.end(); ++it ) + TQTextStream procmiscstream ( &f ); + TQString procmiscontent = TQString(procmiscstream.read()); + TQStringList procmisc_content_list = TQStringList::split("\n", procmiscontent); + TQString line = ""; + for ( TQStringList::Iterator it = procmisc_content_list.begin(); it != procmisc_content_list.end(); ++it ) { line = *it; // line of text excluding '\n' if ( line.contains ( "tun", false ) ) @@ -1974,7 +1974,7 @@ void KVpnc::connectClicked() KMessageBox::information ( this, i18n ( "Loading of module \"%1\" failed!" ).arg ( "tun" ) ); GlobalConfig->appendLogEntry ( i18n ( "Tunnel device is missing, loading module \"%1\" has failed: stop." ).arg ( "tun" ), GlobalConfig->error ); disconnectClicked(); - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); GlobalConfig->status = GlobalConfig->disconnected; return ; } @@ -1988,10 +1988,10 @@ void KVpnc::connectClicked() - QString vpncConfig = ""; + TQString vpncConfig = ""; vpncConfig += "IPSec gateway " + GlobalConfig->TmpGatewayIP + "\n"; vpncConfig += "IPSec ID " + GlobalConfig->currentProfile->getID() + "\n"; - QString GrpPassStr = ""; + TQString GrpPassStr = ""; if ( !GlobalConfig->currentProfile->getSavePsk() || AuthRetry ) GrpPassStr = GlobalConfig->TmpGroupPassword; else @@ -2012,25 +2012,25 @@ void KVpnc::connectClicked() } else if ( GlobalConfig->currentProfile->getAuthType() == VpnAccountData::hybrid ) { - vpncConfig += QString("IKE Authmode")+ " " + "hybrid" + "\n"; + vpncConfig += TQString("IKE Authmode")+ " " + "hybrid" + "\n"; if ( !GlobalConfig->currentProfile->getCaCertificate().isEmpty() ) { - vpncConfig += QString( "CA-File " + GlobalConfig->currentProfile->getCaCertificate() + "\n"); + vpncConfig += TQString( "CA-File " + GlobalConfig->currentProfile->getCaCertificate() + "\n"); } if ( !GlobalConfig->currentProfile->getCertPath().isEmpty() ) { - vpncConfig += QString("CA-Dir " + GlobalConfig->currentProfile->getCertPath() + "\n"); + vpncConfig += TQString("CA-Dir " + GlobalConfig->currentProfile->getCertPath() + "\n"); } } if ( GlobalConfig->KvpncDebugLevel > 3 ) { - QStringList vpncConfigLineList = QStringList::split ( '\n', vpncConfig ); + TQStringList vpncConfigLineList = TQStringList::split ( '\n', vpncConfig ); //GlobalConfig->appendLogEntry ( i18n ( "start\n" ), GlobalConfig->debug ); - for ( QStringList::Iterator it = vpncConfigLineList.begin(); it != vpncConfigLineList.end(); ++it ) + for ( TQStringList::Iterator it = vpncConfigLineList.begin(); it != vpncConfigLineList.end(); ++it ) { - QString configstring = *it; + TQString configstring = *it; if ( configstring.find ( "Xauth password",0 ) > -1 ) configstring = "Xauth password ******"; if ( configstring.find ( "IPSec secret",0 ) > -1 ) @@ -2041,14 +2041,14 @@ void KVpnc::connectClicked() } } - QString VpncConfigFile = tmpPath + "vpnc-config." + GlobalConfig->currentProfile->getName(); // vpnc-config. + TQString VpncConfigFile = tmpPath + "vpnc-config." + GlobalConfig->currentProfile->getName(); // vpnc-config. if ( vpnc_version_major <= 0 && vpnc_version_minor <= 3 && vpnc_version_subminor <= 2 ) { // write vpnc connect script if ( GlobalConfig->KvpncDebugLevel > 1 ) GlobalConfig->appendLogEntry ( "VpncConfig: " + VpncConfigFile + "\n", GlobalConfig->debug ); - QFile configfile ( VpncConfigFile ); - QTextStream configstream ( &configfile ); + TQFile configfile ( VpncConfigFile ); + TQTextStream configstream ( &configfile ); if ( configfile.open ( IO_WriteOnly ) ) { configstream << vpncConfig << "\n"; @@ -2059,16 +2059,16 @@ void KVpnc::connectClicked() KMessageBox::information ( this, i18n ( "Write of \"%1\" has been failed!" ).arg ( VpncConfigFile ) ); GlobalConfig->appendLogEntry ( i18n ( "Write of \"%1\" has been failed!" ).arg ( VpncConfigFile ), GlobalConfig->error ); disconnectClicked(); - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); GlobalConfig->status = GlobalConfig->disconnected; return ; } } - VpncProcess = new QProcess ( this ); - VpncProcess->setCommunication ( QProcess::Stdin | QProcess::Stdout | QProcess::Stderr | QProcess::DupStderr ); - connect ( VpncProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readOutputFrom_vpnc() ) ); + VpncProcess = new TQProcess ( this ); + VpncProcess->setCommunication ( TQProcess::Stdin | TQProcess::Stdout | TQProcess::Stderr | TQProcess::DupStderr ); + connect ( VpncProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readOutputFrom_vpnc() ) ); VpncProcess->addArgument ( GlobalConfig->pathToVpnc ); @@ -2088,7 +2088,7 @@ void KVpnc::connectClicked() { VpncProcess->addArgument ( "--debug" ); - VpncProcess->addArgument ( QString().setNum ( GlobalConfig->VpncDebugLevel ) ); + VpncProcess->addArgument ( TQString().setNum ( GlobalConfig->VpncDebugLevel ) ); } VpncProcess->addArgument ( "--pid-file" ); VpncProcess->addArgument ( GlobalConfig->Vpnc_pid_file ); @@ -2157,16 +2157,16 @@ void KVpnc::connectClicked() if ( GlobalConfig->currentProfile->getUseLocalPort() == true ) { VpncProcess->addArgument ( "--local-port" ); - VpncProcess->addArgument ( QString().setNum ( GlobalConfig->currentProfile->getLocalPort() ) ); + VpncProcess->addArgument ( TQString().setNum ( GlobalConfig->currentProfile->getLocalPort() ) ); if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry ( i18n ( "Using userdefined local port \"%1\"." ).arg ( QString().setNum ( GlobalConfig->currentProfile->getLocalPort() ) ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Using userdefined local port \"%1\"." ).arg ( TQString().setNum ( GlobalConfig->currentProfile->getLocalPort() ) ), GlobalConfig->debug ); } if ( GlobalConfig->currentProfile->getUseUdpPort() ) { VpncProcess->addArgument ( "--udp-port" ); - VpncProcess->addArgument ( QString().setNum ( GlobalConfig->currentProfile->getUdpPort() ) ); + VpncProcess->addArgument ( TQString().setNum ( GlobalConfig->currentProfile->getUdpPort() ) ); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "Using userdefined UDP port \"%1\"." ).arg ( GlobalConfig->currentProfile->getUdpPort() ), GlobalConfig->debug ); } @@ -2247,7 +2247,7 @@ void KVpnc::connectClicked() if ( GlobalConfig->currentProfile->getUseDpdIdleTimeout() ) { VpncProcess->addArgument ( "--dpd-idle" ); - VpncProcess->addArgument ( QString().setNum ( GlobalConfig->currentProfile->getDpdIdleTimeout() ) ); + VpncProcess->addArgument ( TQString().setNum ( GlobalConfig->currentProfile->getDpdIdleTimeout() ) ); if ( GlobalConfig->KvpncDebugLevel > 1 ) GlobalConfig->appendLogEntry ( i18n ( "Using DPD idle timeout: %1." ).arg ( GlobalConfig->currentProfile->getDpdIdleTimeout() ), GlobalConfig->debug ); } @@ -2309,12 +2309,12 @@ void KVpnc::connectClicked() if ( GlobalConfig->KvpncDebugLevel > 1 ) { - QString args = ""; - QStringList list = VpncProcess->arguments(); - QStringList::Iterator it = list.begin(); + TQString args = ""; + TQStringList list = VpncProcess->arguments(); + TQStringList::Iterator it = list.begin(); while ( it != list.end() ) { - args += QString ( " " + *it ) ; + args += TQString ( " " + *it ) ; ++it; } GlobalConfig->appendLogEntry ( i18n ( "vpnc arguments: %1" ).arg ( args ), GlobalConfig->debug ); @@ -2324,7 +2324,7 @@ void KVpnc::connectClicked() KMessageBox::sorry ( this, i18n ( "\"%1\" start failed!" ).arg ( "vpnc" ) ); GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "vpnc" ), GlobalConfig->error ); disconnectClicked(); - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); } else { @@ -2338,8 +2338,8 @@ void KVpnc::connectClicked() mw->buttonConnect->setEnabled ( false ); this->ConnectAction->setEnabled ( false ); - connect ( VpncProcess, SIGNAL ( processExited () ), this, SLOT ( vpncStarted() ) ); - connect ( VpncProcess, SIGNAL ( wroteToStdin() ), this, SLOT ( wroteToStdin_vpncConfig() ) ); + connect ( VpncProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( vpncStarted() ) ); + connect ( VpncProcess, TQT_SIGNAL ( wroteToStdin() ), this, TQT_SLOT ( wroteToStdin_vpncConfig() ) ); if ( vpnc_version_major >= 0 && vpnc_version_minor > 2 ) { @@ -2358,8 +2358,8 @@ void KVpnc::connectClicked() } } - disconnect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) ); - connect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) ); + disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); + connect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); timer.start ( GlobalConfig->tryConnectTimeout * 1000, FALSE ); } } @@ -2368,7 +2368,7 @@ void KVpnc::connectClicked() { VpncScript = tmpPath + "vpnc-script." + GlobalConfig->currentProfile->getName(); // vpnc-script. GlobalConfig->appendLogEntry ( i18n ( "Making %1 (%2) excutable failed!" ).arg ( "VpncScript" ).arg ( VpncScript ), GlobalConfig->error ); - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); timer.stop(); return ; } @@ -2383,7 +2383,7 @@ void KVpnc::connectClicked() KMessageBox::error ( this, i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "vpnclient" ).arg ( GlobalConfig->pathToCiscoVpnc ) ); GlobalConfig->appendLogEntry ( i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "vpnclient" ).arg ( GlobalConfig->pathToCiscoVpnc ), GlobalConfig->error ); ok = false; - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return ; } @@ -2391,10 +2391,10 @@ void KVpnc::connectClicked() GlobalConfig->appendLogEntry ( i18n ( "vpnclient: %1" ) .arg ( GlobalConfig->pathToCiscoVpnc ), GlobalConfig->debug ); - if ( checkCiscoVpncStatus() == false ) + if ( checkCiscoVpnctqStatus() == false ) { startCiscoVpnc(); - if ( checkCiscoVpncStatus() == false ) + if ( checkCiscoVpnctqStatus() == false ) { KMessageBox::error ( this, i18n ( "The Cisco ipsec interface could not setup!" ) ); GlobalConfig->appendLogEntry ( i18n ( "The Cisco ipsec interface could not setup!" ), GlobalConfig->error ); @@ -2602,7 +2602,7 @@ void KVpnc::connectClicked() AuthRetry = false; if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "Connect canceled because account data dialog aborted." ), GlobalConfig->debug ); - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return; } GlobalConfig->TmpPassword= GlobalConfig->currentProfile->getUserPassword(); @@ -2616,8 +2616,8 @@ void KVpnc::connectClicked() tmpPath = locateLocal ( "data", "kvpnc/" ); - QString tmpInterface; - QString LocalIP; + TQString tmpInterface; + TQString LocalIP; NetworkInterface iface ( GlobalConfig , parent ); if ( GlobalConfig->currentProfile->getNetworkDevice() == "default" ) { @@ -2659,18 +2659,18 @@ void KVpnc::connectClicked() LocalIP = "127.0.0.1"; // no IP for default interface found :( } - // QString tunneldevice = "tun0"; + // TQString tunneldevice = "tun0"; OldDefaultroute = tmpPath + "default-route." + GlobalConfig->currentProfile->getName(); // default-route. - QFile DefaultRouteBackupFile ( OldDefaultroute + ".sh" ); - QTextStream DefaultRouteBackupFileStream ( &DefaultRouteBackupFile ); + TQFile DefaultRouteBackupFile ( OldDefaultroute + ".sh" ); + TQTextStream DefaultRouteBackupFileStream ( &DefaultRouteBackupFile ); if ( DefaultRouteBackupFile.open ( IO_WriteOnly ) ) { DefaultRouteBackupFileStream << "# generated by kvpnc. Do not edit it." << "\n"; DefaultRouteBackupFileStream << "\n"; DefaultRouteBackupFileStream << GlobalConfig->pathToIp + " route show | grep default > " + OldDefaultroute + "\n"; DefaultRouteBackupFile.close(); - QProcess backupDefaultRouteProcess ( this ); + TQProcess backupDefaultRouteProcess ( this ); backupDefaultRouteProcess.addArgument ( GlobalConfig->InterpreterShell ); backupDefaultRouteProcess.addArgument ( OldDefaultroute + ".sh" ); if ( !backupDefaultRouteProcess.start() ) @@ -2692,27 +2692,27 @@ void KVpnc::connectClicked() return ; } - QString ResolvConfBackupProfile = tmpPath + "resolv.conf.before.kvpnc_" + GlobalConfig->currentProfile->getName(); + TQString ResolvConfBackupProfile = tmpPath + "resolv.conf.before.kvpnc_" + GlobalConfig->currentProfile->getName(); if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "Backup file of %1: %1" ).arg ( "resolv.conf" ).arg ( ResolvConfBackupProfile ), GlobalConfig->debug ); - QString UserPassStr = ""; + TQString UserPassStr = ""; if ( !GlobalConfig->currentProfile->getUserPassword() || GlobalConfig->currentProfile->getUserPassword() == "" || AuthRetry ) UserPassStr = GlobalConfig->TmpPassword; else UserPassStr = GlobalConfig->currentProfile->getUserPassword(); - CiscoVpncProcess = new QProcess ( this ); - CiscoVpncProcess->setCommunication ( QProcess::Stdin | QProcess::Stdout | QProcess::Stderr | QProcess::DupStderr ); - connect ( CiscoVpncProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readOutputFrom_ciscovpnc() ) ); + CiscoVpncProcess = new TQProcess ( this ); + CiscoVpncProcess->setCommunication ( TQProcess::Stdin | TQProcess::Stdout | TQProcess::Stderr | TQProcess::DupStderr ); + connect ( CiscoVpncProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readOutputFrom_ciscovpnc() ) ); // write vpnc connect script - QString CiscoVpncConfig = QString ( "/etc/opt/cisco-vpnclient/Profiles/" ) +QString ( "kvpnc_" ) +QString ( GlobalConfig->currentProfile->getName() +".pcf" ); // vpnc-script. + TQString CiscoVpncConfig = TQString ( "/etc/opt/cisco-vpnclient/Profiles/" ) +TQString ( "kvpnc_" ) +TQString ( GlobalConfig->currentProfile->getName() +".pcf" ); // vpnc-script. if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( "CiscoVpncConfig: " + CiscoVpncConfig + "\n", GlobalConfig->debug ); - QFile file ( CiscoVpncConfig ); - QTextStream stream ( &file ); + TQFile file ( CiscoVpncConfig ); + TQTextStream stream ( &file ); if ( file.open ( IO_WriteOnly ) ) { // stream << "# generated by kvpnc. Do not edit it." << "\n"; @@ -2836,7 +2836,7 @@ void KVpnc::connectClicked() KMessageBox::sorry ( this, i18n ( "\"%1\" start failed!" ).arg ( "vpnclient" ) ); GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "vpnclient" ), GlobalConfig->error ); disconnectClicked(); - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); } else { @@ -2850,26 +2850,26 @@ void KVpnc::connectClicked() mw->buttonConnect->setEnabled ( false ); this->ConnectAction->setEnabled ( false ); -// connect ( VpncProcess, SIGNAL ( processExited () ), this, SLOT ( vpncStarted() ) ); -// connect ( VpncProcess, SIGNAL ( wroteToStdin() ), this, SLOT ( wroteToStdin_vpncConfig() ) ); +// connect ( VpncProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( vpncStarted() ) ); +// connect ( VpncProcess, TQT_SIGNAL ( wroteToStdin() ), this, TQT_SLOT ( wroteToStdin_vpncConfig() ) ); } - disconnect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) ); - connect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) ); + disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); + connect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); timer.start ( GlobalConfig->tryConnectTimeout * 1000, FALSE ); } else { // file could not written GlobalConfig->appendLogEntry ( i18n ( "Connect canceled because profile file could not be written." ), GlobalConfig->error ); - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return ; } } else { // ok is false - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return ; } } @@ -2881,7 +2881,7 @@ void KVpnc::connectClicked() if ( GlobalConfig->KvpncDebugLevel > 1 ) GlobalConfig->appendLogEntry ( i18n ( "racoon" ), GlobalConfig->debug ); - //setGuiStatus(connecting); + //setGuitqStatus(connecting); // looking for racoon if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::racoon ) { @@ -2890,7 +2890,7 @@ void KVpnc::connectClicked() KMessageBox::error ( this, i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "racoon" ).arg ( GlobalConfig->pathToRacoon ) ); GlobalConfig->appendLogEntry ( i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "racoon" ).arg ( GlobalConfig->pathToRacoon ), GlobalConfig->error ); ok = false; - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return ; } } @@ -2902,7 +2902,7 @@ void KVpnc::connectClicked() KMessageBox::error ( this, i18n ( "Unable to find \"%1\" or \"%2\"!" ).arg ( "l2tpd" ).arg ( "xl2tpd" ) ); GlobalConfig->appendLogEntry ( i18n ( "Unable to find \"%1\" or \"%2\"!" ).arg ( "l2tpd" ).arg ( "xl2tpd" ), GlobalConfig->error ); ok = false; - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return ; } } @@ -2910,24 +2910,24 @@ void KVpnc::connectClicked() // looking for setkey if ( GlobalConfig->useDefaultPaths ) { - GlobalConfig->pathToSetkey = KStandardDirs::findExe ( "setkey", QString::null ); + GlobalConfig->pathToSetkey = KStandardDirs::findExe ( "setkey", TQString() ); } else if ( GlobalConfig->pathToSetkey.isEmpty() || KStandardDirs::findExe ( GlobalConfig->pathToSetkey.section ( '/', -1, -1 ), GlobalConfig->pathToSetkey.section ( '/', 0, -2 ) ).isEmpty() ) { KMessageBox::error ( this, i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "setkey" ).arg ( GlobalConfig->pathToSetkey ) ); GlobalConfig->appendLogEntry ( i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "setkey" ).arg ( GlobalConfig->pathToSetkey ), GlobalConfig->error ); ok = false; - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return ; } - QString resolvedIp = Utils ( GlobalConfig, parent ).resolveName ( GlobalConfig->currentProfile->getGateway() ); + TQString resolvedIp = Utils ( GlobalConfig, parent ).resolveName ( GlobalConfig->currentProfile->getGateway() ); if ( resolvedIp == "0.0.0.0" || resolvedIp.isEmpty() ) { KMessageBox::error ( this, i18n ( "Host \"%1\" could not be resolved!" ).arg ( GlobalConfig->currentProfile->getGateway() ) ); GlobalConfig->appendLogEntry ( i18n ( "Host \"%1\" could not be resolved!" ).arg ( GlobalConfig->currentProfile->getGateway() ), GlobalConfig->error ) ; ok = false; - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return; } else @@ -2938,7 +2938,7 @@ void KVpnc::connectClicked() if ( GlobalConfig->currentProfile->authtype == VpnAccountData::cert ) { - QFile CertTmpFile; + TQFile CertTmpFile; CertTmpFile.setName ( GlobalConfig->currentProfile->getX509Certificate() ); if ( !CertTmpFile.exists() ) { @@ -2996,10 +2996,10 @@ void KVpnc::connectClicked() GlobalConfig->TmpGroupPassword = GlobalConfig->currentProfile->getPreSharedKey(); else { - QFile PskFile ( GlobalConfig->currentProfile->getPreSharedKeyFile() ); + TQFile PskFile ( GlobalConfig->currentProfile->getPreSharedKeyFile() ); if ( PskFile.open ( IO_ReadOnly ) ) { - QString PskFileContent = QString ( PskFile.readAll() ); + TQString PskFileContent = TQString ( PskFile.readAll() ); PskFile.close(); GlobalConfig->TmpGroupPassword = PskFileContent; } @@ -3140,11 +3140,11 @@ void KVpnc::connectClicked() } if ( GlobalConfig->currentProfile->getPskIsInFile() ) { - QFile f ( GlobalConfig->currentProfile->getPreSharedKeyFile() ); + TQFile f ( GlobalConfig->currentProfile->getPreSharedKeyFile() ); if ( f.open ( IO_ReadOnly ) ) { - QTextStream stream ( &f ); - QString line = ""; + TQTextStream stream ( &f ); + TQString line = ""; while ( !stream.atEnd() ) { line = stream.readLine(); // line of text excluding '\n' @@ -3173,8 +3173,8 @@ void KVpnc::connectClicked() if ( GlobalConfig->currentProfile->getExecuteCmdBeforeConnect() ) executeCommandBeforeConnect(); - QString tmpInterface; - QString LocalIP; + TQString tmpInterface; + TQString LocalIP; NetworkInterface iface ( GlobalConfig, parent ); if ( GlobalConfig->currentProfile->getNetworkDevice() == "default" || GlobalConfig->currentProfile->getNetworkDevice() == "" ) { @@ -3217,9 +3217,9 @@ void KVpnc::connectClicked() // FIXME // if not virtual ip, its same as LocalIP - QString VirtualLocalIP=LocalIP; + TQString VirtualLocalIP=LocalIP; // if not virtual ip, its 32 (only one host) - QString VirtualLocalNetmask="32"; + TQString VirtualLocalNetmask="32"; if ( GlobalConfig->currentProfile->getUseLeftSourceIp() ) { @@ -3234,33 +3234,33 @@ void KVpnc::connectClicked() GlobalConfig->appendLogEntry ( i18n ( "Local netmask (virtual): %1" ).arg ( VirtualLocalNetmask ), GlobalConfig->debug ); } - QString Gateway = GlobalConfig->currentProfile->getGateway(); - QString RemoteNetAddr = GlobalConfig->currentProfile->getRemoteNetAddr(); - QString RemoteNetMask = GlobalConfig->currentProfile->getRemoteNetMask(); - QString RemoteNet = RemoteNetAddr + "/" + RemoteNetMask; + TQString Gateway = GlobalConfig->currentProfile->getGateway(); + TQString RemoteNetAddr = GlobalConfig->currentProfile->getRemoteNetAddr(); + TQString RemoteNetMask = GlobalConfig->currentProfile->getRemoteNetMask(); + TQString RemoteNet = RemoteNetAddr + "/" + RemoteNetMask; tmpPath = locateLocal ( "data", "kvpnc/" ); // should be // KTempDir tmpdir; // tmpPath = tmpdir.name(); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( "tmppath: " + tmpPath, GlobalConfig->debug ); - QString ProfileName = GlobalConfig->currentProfile->getName(); - QString CertPath = GlobalConfig->currentProfile->getCertPath(); + TQString ProfileName = GlobalConfig->currentProfile->getName(); + TQString CertPath = GlobalConfig->currentProfile->getCertPath(); // write setkey.conf - QFile file ( tmpPath + "setkey." + ProfileName + ".conf" ); - QTextStream stream ( &file ); + TQFile file ( tmpPath + "setkey." + ProfileName + ".conf" ); + TQTextStream stream ( &file ); if ( file.open ( IO_WriteOnly ) ) { - QString PolicyRemote = ""; - QString PolicyLocal = ""; + TQString PolicyRemote = ""; + TQString PolicyLocal = ""; - QString Remote = GlobalConfig->currentProfile->getGateway(); + TQString Remote = GlobalConfig->currentProfile->getGateway(); //FIXME make it dynamiclly - QString LocalPort = "4500"; - QString RemotePort = "4500"; + TQString LocalPort = "4500"; + TQString RemotePort = "4500"; if ( !GlobalConfig->currentProfile->getUseNat() ) { @@ -3312,11 +3312,11 @@ void KVpnc::connectClicked() // additional network routes if ( !GlobalConfig->currentProfile->getAdditionalNetworkRoutes().isEmpty() ) { - QStringList AdditionalNetworkRoutes = GlobalConfig->currentProfile->getAdditionalNetworkRoutes(); + TQStringList AdditionalNetworkRoutes = GlobalConfig->currentProfile->getAdditionalNetworkRoutes(); - for ( QStringList::Iterator it = AdditionalNetworkRoutes.begin(); it != AdditionalNetworkRoutes.end();++it ) + for ( TQStringList::Iterator it = AdditionalNetworkRoutes.begin(); it != AdditionalNetworkRoutes.end();++it ) { - QString net = ( *it ).section ( '#', 0, 0 ); + TQString net = ( *it ).section ( '#', 0, 0 ); // stream << "spdadd " + LocalIP + " " + net + " any -P out ipsec esp/tunnel/" + PolicyLocal + "-" + PolicyRemote + "/require;" << "\n"; // stream << "spdadd " + net + " " + LocalIP + " any -P in ipsec esp/tunnel/" + PolicyRemote + "-" + PolicyLocal + "/require;" << "\n"; stream << "spdadd " + LocalIP + " " + net + " any -P out ipsec esp/tunnel/" + LocalIP + "-" + GlobalConfig->TmpGatewayIP + "/require;" << "\n"; @@ -3396,7 +3396,7 @@ void KVpnc::connectClicked() // { // if ( GlobalConfig->currentProfile->getUseMailAddressAsIdentifier() ) // { -// QString MailAddressOfUserCert = Utils ( GlobalConfig ).getEmailAddressOfCert ( GlobalConfig->currentProfile->getX509Certificate() ); +// TQString MailAddressOfUserCert = Utils ( GlobalConfig ).getEmailAddressOfCert ( GlobalConfig->currentProfile->getX509Certificate() ); // // if ( GlobalConfig->KvpncDebugLevel > 0 ) // GlobalConfig->appendLogEntry ( i18n ( "Using mail address as VPN id: %1." ).arg ( MailAddressOfUserCert ), GlobalConfig->debug ); @@ -3459,14 +3459,14 @@ void KVpnc::connectClicked() /* none: No ID address: The type is the IP address. This is the default type if you do not specify an identifier to use - user_fqdn: The type is a USER_FQDN (user fully-qualified domain name) - fqdn: The type is a FQDN (fully-qualified domain name) + user_fqdn: The type is a USER_FTQDN (user fully-qualified domain name) + fqdn: The type is a FTQDN (fully-qualified domain name) keyid (file): The type is a KEY_ID, read from the file keyid: The type is a KEY_ID, specified in the quoted string asn1dn: The type is an ASN.1 distinguished name. If empty, DN from the Subject field in the certificate will be used */ - QString RemoteIDType = GlobalConfig->currentProfile->getRemoteIDType(); + TQString RemoteIDType = GlobalConfig->currentProfile->getRemoteIDType(); if ( RemoteIDType == "none" ) { @@ -3500,7 +3500,7 @@ void KVpnc::connectClicked() stream << " peers_identifier asn1dn;" << "\n"; } - QString LocalIDType = GlobalConfig->currentProfile->getLocalIDType(); + TQString LocalIDType = GlobalConfig->currentProfile->getLocalIDType(); if ( LocalIDType == "none" ) { // no ID @@ -3573,7 +3573,7 @@ void KVpnc::connectClicked() modp6144 17 modp8192 18 */ - QString DhGroupNumber = "2"; + TQString DhGroupNumber = "2"; if (GlobalConfig->currentProfile->getIkeGroup() == "modp768") DhGroupNumber = "1"; else if (GlobalConfig->currentProfile->getIkeGroup() == "modp1024") @@ -3598,9 +3598,9 @@ void KVpnc::connectClicked() stream << "}" << "\n"; stream << "" << "\n"; - QString RemoteNetAddr = GlobalConfig->currentProfile->getRemoteNetAddr(); - QString RemoteNetMask = GlobalConfig->currentProfile->getRemoteNetMask(); - QString RemoteNet = RemoteNetAddr + "/" + RemoteNetMask; + TQString RemoteNetAddr = GlobalConfig->currentProfile->getRemoteNetAddr(); + TQString RemoteNetMask = GlobalConfig->currentProfile->getRemoteNetMask(); + TQString RemoteNet = RemoteNetAddr + "/" + RemoteNetMask; if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_racoon || ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::racoon && GlobalConfig->currentProfile->getAuthType() == VpnAccountData::hybrid ) ) @@ -3619,7 +3619,7 @@ void KVpnc::connectClicked() if ( GlobalConfig->currentProfile->getUsePerfectForwardSecrety() ) { - QString pfs_group = ""; + TQString pfs_group = ""; // if ( GlobalConfig->currentProfile->getPerfectForwardSecrety() == "server" ) // pfs_group = ""; // else if ( GlobalConfig->currentProfile->getPerfectForwardSecrety() == "nopfs" ) @@ -3633,7 +3633,7 @@ void KVpnc::connectClicked() pfs_group = GlobalConfig->currentProfile->getPerfectForwardSecrety(); - QString PFSGroupNumber = "2"; + TQString PFSGroupNumber = "2"; if (pfs_group== "modp768") PFSGroupNumber = "1"; else if (pfs_group== "modp1024") @@ -3668,22 +3668,22 @@ void KVpnc::connectClicked() // Utils::IpsecAlgos KernelCrypto = Utils ( GlobalConfig ).getKernelCrypto(); // // phase 2 encr algos from kernel -// QString EncrAlgos=""; -// for ( QStringList::Iterator it = KernelCrypto.IpsecEspEncryptionAlgorithms.begin(); it != KernelCrypto.IpsecEspEncryptionAlgorithms.end(); ++it ) +// TQString EncrAlgos=""; +// for ( TQStringList::Iterator it = KernelCrypto.IpsecEspEncryptionAlgorithms.begin(); it != KernelCrypto.IpsecEspEncryptionAlgorithms.end(); ++it ) // { // if (EncrAlgos.length() > 0) // EncrAlgos+=","; -// EncrAlgos+= QString(*it ); +// EncrAlgos+= TQString(*it ); // } // // // // phase 2 auth algos from kernel -// QString AuthAlgos=""; -// for ( QStringList::Iterator it = KernelCrypto.IpsecEspAuthenticationAlgorithms.begin(); it != KernelCrypto.IpsecEspAuthenticationAlgorithms.end(); ++it ) +// TQString AuthAlgos=""; +// for ( TQStringList::Iterator it = KernelCrypto.IpsecEspAuthenticationAlgorithms.begin(); it != KernelCrypto.IpsecEspAuthenticationAlgorithms.end(); ++it ) // { // if (AuthAlgos.length() > 0) // AuthAlgos+=","; -// AuthAlgos+= QString(*it ); +// AuthAlgos+= TQString(*it ); // } // // @@ -3732,7 +3732,7 @@ void KVpnc::connectClicked() // iptables need the right interface (eth0:1 => eth0) - QString tmpInterface2 = ""; + TQString tmpInterface2 = ""; int pointPos = tmpInterface.find ( ':', 0, FALSE ); if ( pointPos > 1 ) { @@ -3786,14 +3786,14 @@ void KVpnc::connectClicked() else { GlobalConfig->appendLogEntry ( i18n ( "\"%1\" write failed!" ).arg ( file.name() ), GlobalConfig->error ); - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return; } stream.unsetDevice(); - QFile file1 ( tmpPath + "iptables." + GlobalConfig->currentProfile->getName() + ".remove_racoon.sh" ); - QTextStream stream1 ( &file1 ); + TQFile file1 ( tmpPath + "iptables." + GlobalConfig->currentProfile->getName() + ".remove_racoon.sh" ); + TQTextStream stream1 ( &file1 ); if ( file1.open ( IO_WriteOnly ) ) { stream1 << "#!"<< GlobalConfig->InterpreterShell << "\n"; @@ -3835,13 +3835,13 @@ void KVpnc::connectClicked() else { GlobalConfig->appendLogEntry ( i18n ( "\"%1\" write failed!" ).arg ( file1.name() ), GlobalConfig->error ); - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return; } - QFile upfile ( tmpPath+"racoon-"+ProfileName+".phase1-up.sh" ); - QTextStream upstream ( &upfile ); + TQFile upfile ( tmpPath+"racoon-"+ProfileName+".phase1-up.sh" ); + TQTextStream upstream ( &upfile ); if ( upfile.open ( IO_WriteOnly ) ) { upstream << "#!"<< GlobalConfig->InterpreterShell << "\n"; @@ -3942,13 +3942,13 @@ void KVpnc::connectClicked() else { GlobalConfig->appendLogEntry ( i18n ( "\"%1\" write failed!" ).arg ( upfile.name() ), GlobalConfig->error ); - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return; } - QFile downfile ( tmpPath+"racoon-"+ProfileName+".phase1-down.sh" ); - QTextStream downstream ( &downfile ); + TQFile downfile ( tmpPath+"racoon-"+ProfileName+".phase1-down.sh" ); + TQTextStream downstream ( &downfile ); if ( downfile.open ( IO_WriteOnly ) ) { downstream << "#!"<< GlobalConfig->InterpreterShell << "\n"; @@ -3995,7 +3995,7 @@ void KVpnc::connectClicked() else { GlobalConfig->appendLogEntry ( i18n ( "\"%1\" write failed!" ).arg ( downfile.name() ), GlobalConfig->error ); - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return; } @@ -4031,7 +4031,7 @@ void KVpnc::connectClicked() // if (GlobalConfig->currentProfile->useVirtualIP()){ // if (!setVirtualIP()){ - // setGuiStatus(disconnected); + // setGuitqStatus(disconnected); // return; // } // @@ -4050,26 +4050,26 @@ void KVpnc::connectClicked() OpenL2tpProcess=0L; L2tpdProcess=0L; - RacoonHelperProcess = new QProcess ( this ); + RacoonHelperProcess = new TQProcess ( this ); // RacoonHelperProcess->addArgument ( GlobalConfig->InterpreterShell ); RacoonHelperProcess->addArgument ( tmpPath + "/setkey." + GlobalConfig->currentProfile->getName() + ".sh" ); - connect ( RacoonHelperProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_racoon_helper() ) ); - connect ( RacoonHelperProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_racoon_helper() ) ); - connect ( RacoonHelperProcess, SIGNAL ( processExited () ), this, SLOT ( doRacoon() ) ); + connect ( RacoonHelperProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_racoon_helper() ) ); + connect ( RacoonHelperProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_racoon_helper() ) ); + connect ( RacoonHelperProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doRacoon() ) ); if ( !RacoonHelperProcess->start ( env ) ) { - disconnect ( RacoonHelperProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_racoon_helper() ) ); - disconnect ( RacoonHelperProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_racoon_helper() ) ); - disconnect ( RacoonHelperProcess, SIGNAL ( processExited () ), this, SLOT ( doRacoon() ) ); + disconnect ( RacoonHelperProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_racoon_helper() ) ); + disconnect ( RacoonHelperProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_racoon_helper() ) ); + disconnect ( RacoonHelperProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doRacoon() ) ); delete RacoonHelperProcess; RacoonHelperProcess =0L; if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "setkey" ), GlobalConfig->error ); KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( "setkey." + GlobalConfig->currentProfile->getName() + ".sh" ) ); - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); } else { @@ -4102,11 +4102,11 @@ void KVpnc::connectClicked() if ( GlobalConfig->currentConnectRetry > GlobalConfig->maxConnectRetry ) { if ( GlobalConfig->KvpncDebugLevel > 1 ) - GlobalConfig->appendLogEntry ( i18n ( "Max connect retries (%1) reached, stopping." ).arg ( QString().setNum ( GlobalConfig->maxConnectRetry ) ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Max connect retries (%1) reached, stopping." ).arg ( TQString().setNum ( GlobalConfig->maxConnectRetry ) ), GlobalConfig->debug ); return; } - //setGuiStatus(connecting); + //setGuitqStatus(connecting); // looking for ipsec @@ -4115,7 +4115,7 @@ void KVpnc::connectClicked() KMessageBox::error ( this, i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "ipsec (" + IpsecType + ")" ).arg ( GlobalConfig->pathToIpsec ) ); GlobalConfig->appendLogEntry ( i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "ipsec (" + IpsecType + ")" ).arg ( GlobalConfig->pathToIpsec ), GlobalConfig->error ); ok = false; - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return ; } if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_freeswan ) @@ -4125,7 +4125,7 @@ void KVpnc::connectClicked() KMessageBox::error ( this, i18n ( "Unable to find \"%1\" or \"%2\"!" ).arg ( "l2tpd" ).arg ( "xl2tpd" ) ); GlobalConfig->appendLogEntry ( i18n ( "Unable to find \"%1\" or \"%2\"!" ).arg ( "l2tpd" ).arg ( "xl2tpd" ), GlobalConfig->error ); ok = false; - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return ; } } @@ -4147,7 +4147,7 @@ void KVpnc::connectClicked() { if ( !GlobalConfig->currentProfile->getUseSmartcard() ) { - QFile CertTmpFile; + TQFile CertTmpFile; CertTmpFile.setName ( GlobalConfig->currentProfile->getX509Certificate() ); if ( !CertTmpFile.exists() ) { @@ -4157,7 +4157,7 @@ void KVpnc::connectClicked() } } - QFile CertTmpFile; + TQFile CertTmpFile; CertTmpFile.setName ( GlobalConfig->currentProfile->getCaCertificate() ); if ( !CertTmpFile.exists() ) { @@ -4169,15 +4169,15 @@ void KVpnc::connectClicked() // if ( !Utils( GlobalConfig, parent ).loadKernelModule( "esp4", parent ) ) // { - // KMessageBox::information( this, i18n( "Loading of module \"%1\" failed!" ).arg( "esp4" ) ); - // GlobalConfig->appendLogEntry( i18n( "Loading module \"%1\" has failed: stop." ).arg( "esp4" ), GlobalConfig->error ); + // KMessageBox::information( this, i18n( "Loading of module \"%1\" failed!" ).tqarg( "esp4" ) ); + // GlobalConfig->appendLogEntry( i18n( "Loading module \"%1\" has failed: stop." ).tqarg( "esp4" ), GlobalConfig->error ); // ok = false; // } // // if ( !Utils( GlobalConfig, parent ).loadKernelModule( "ah4", parent ) ) // { - // KMessageBox::information( this, i18n( "Loading of module \"%1\" failed!" ).arg( "ah4" ) ); - // GlobalConfig->appendLogEntry( i18n( "Loading module \"%1\" has failed: stop." ).arg( "ah4" ), GlobalConfig->error ); + // KMessageBox::information( this, i18n( "Loading of module \"%1\" failed!" ).tqarg( "ah4" ) ); + // GlobalConfig->appendLogEntry( i18n( "Loading module \"%1\" has failed: stop." ).tqarg( "ah4" ), GlobalConfig->error ); // ok = false; // } @@ -4209,10 +4209,10 @@ void KVpnc::connectClicked() GlobalConfig->TmpGroupPassword = GlobalConfig->currentProfile->getPreSharedKey(); else { - QFile PskFile ( GlobalConfig->currentProfile->getPreSharedKeyFile() ); + TQFile PskFile ( GlobalConfig->currentProfile->getPreSharedKeyFile() ); if ( PskFile.open ( IO_ReadOnly ) ) { - QString PskFileContent = QString ( PskFile.readAll() ); + TQString PskFileContent = TQString ( PskFile.readAll() ); PskFile.close(); GlobalConfig->TmpGroupPassword = PskFileContent; } @@ -4356,10 +4356,10 @@ void KVpnc::connectClicked() } else { - QFile PskFile ( GlobalConfig->currentProfile->getPreSharedKeyFile() ); + TQFile PskFile ( GlobalConfig->currentProfile->getPreSharedKeyFile() ); if ( PskFile.open ( IO_WriteOnly ) ) { - QTextStream stream; + TQTextStream stream; stream.setDevice ( &PskFile ); stream << GlobalConfig->TmpGroupPassword; PskFile.close(); @@ -4403,11 +4403,11 @@ void KVpnc::connectClicked() if ( GlobalConfig->currentProfile->getPskIsInFile() ) { - QFile f ( GlobalConfig->currentProfile->getPreSharedKeyFile() ); + TQFile f ( GlobalConfig->currentProfile->getPreSharedKeyFile() ); if ( f.open ( IO_ReadOnly ) ) { - QTextStream stream ( &f ); - QString line = ""; + TQTextStream stream ( &f ); + TQString line = ""; while ( !stream.atEnd() ) { line = stream.readLine(); // line of text excluding '\n' @@ -4431,14 +4431,14 @@ void KVpnc::connectClicked() } } - QString leftid = ""; - QString rightid = ""; + TQString leftid = ""; + TQString rightid = ""; if ( GlobalConfig->currentProfile->getAuthType() == VpnAccountData::cert && GlobalConfig->currentProfile->getUseSmartcard() ) { GlobalConfig->TmpPassword = ""; - QCString password; - QString pass = ""; + TQCString password; + TQString pass = ""; Pkcs11PIN = ""; GlobalConfig->TmpPrivateKeyPass = ""; @@ -4462,7 +4462,7 @@ void KVpnc::connectClicked() GlobalConfig->appendLogEntry ( "[ipsec]: " + i18n ( "PIN got from user" ), GlobalConfig->debug ); - GlobalConfig->TmpPrivateKeyPass = QString ( pass ); + GlobalConfig->TmpPrivateKeyPass = TQString ( pass ); Pkcs11PIN = GlobalConfig->TmpPrivateKeyPass; } else @@ -4487,8 +4487,8 @@ void KVpnc::connectClicked() if ( GlobalConfig->currentProfile->getExecuteCmdBeforeConnect() ) executeCommandBeforeConnect(); - QString tmpInterface; - QString LocalIP; + TQString tmpInterface; + TQString LocalIP; NetworkInterface iface ( GlobalConfig, parent ); if ( GlobalConfig->currentProfile->getNetworkDevice() == "default" || GlobalConfig->currentProfile->getNetworkDevice() == "" ) { @@ -4516,15 +4516,15 @@ void KVpnc::connectClicked() GlobalConfig->appendLogEntry ( "LocalIP: " + LocalIP, GlobalConfig->debug ); } - QString Gateway = GlobalConfig->currentProfile->getGateway(); - QString RemoteNetAddr = GlobalConfig->currentProfile->getRemoteNetAddr(); - QString RemoteNetMask = GlobalConfig->currentProfile->getRemoteNetMask(); - QString RemoteNet=""; + TQString Gateway = GlobalConfig->currentProfile->getGateway(); + TQString RemoteNetAddr = GlobalConfig->currentProfile->getRemoteNetAddr(); + TQString RemoteNetMask = GlobalConfig->currentProfile->getRemoteNetMask(); + TQString RemoteNet=""; if ( !RemoteNetAddr.isEmpty() ) RemoteNet = RemoteNetAddr + "/" + RemoteNetMask; - QString LocalNetAddr = LocalIP; - QString LocalNetMask = "/32"; - QString LocalNet=""; + TQString LocalNetAddr = LocalIP; + TQString LocalNetMask = "/32"; + TQString LocalNet=""; tmpPath = locateLocal ( "data", "kvpnc/" ); // should be // KTempDir tmpdir; @@ -4532,19 +4532,19 @@ void KVpnc::connectClicked() // if (GlobalConfig->KvpncDebugLevel > 0) // GlobalConfig->appendLogEntry( "tmppath: " + tmpPath, GlobalConfig->debug ); - QString ProfileName = GlobalConfig->currentProfile->getName(); - QString CertPath = GlobalConfig->currentProfile->getCertPath(); - QString PrivateKeyPass = GlobalConfig->currentProfile->getPrivateKeyPass(); - QString PrivateKey = GlobalConfig->currentProfile->getPrivateKey(); + TQString ProfileName = GlobalConfig->currentProfile->getName(); + TQString CertPath = GlobalConfig->currentProfile->getCertPath(); + TQString PrivateKeyPass = GlobalConfig->currentProfile->getPrivateKeyPass(); + TQString PrivateKey = GlobalConfig->currentProfile->getPrivateKey(); startStopIpsec ( true ); backupIpsecSystemConfig(); - QString IpsecPrefix = "/etc"; + TQString IpsecPrefix = "/etc"; // write /etc/ipsec.secrets - QFile IpsecSecretsFile ( IpsecPrefix + "/ipsec.secrets" ); // warning: static - QTextStream stream ( &IpsecSecretsFile ); + TQFile IpsecSecretsFile ( IpsecPrefix + "/ipsec.secrets" ); // warning: static + TQTextStream stream ( &IpsecSecretsFile ); if ( IpsecSecretsFile.open ( IO_WriteOnly ) ) { // cert @@ -4572,7 +4572,7 @@ void KVpnc::connectClicked() if ( !GlobalConfig->currentProfile->getPskIsInFile() ) { - GlobalConfig->appendLogEntry ( QString("ipsec: "+ IpsecToolInfo->Version ),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( TQString("ipsec: "+ IpsecToolInfo->Version ),GlobalConfig->debug ); if ( !GlobalConfig->currentProfile->getAuthWithUsernameAndPassword() ) { // if ( !GlobalConfig->currentProfile->getUseSpecialLocalID()) @@ -4594,10 +4594,10 @@ void KVpnc::connectClicked() } else { - QFile PskFile ( GlobalConfig->currentProfile->getPreSharedKeyFile() ); + TQFile PskFile ( GlobalConfig->currentProfile->getPreSharedKeyFile() ); if ( PskFile.open ( IO_ReadOnly ) ) { - QString PskFileContent = QString ( PskFile.readAll() ); + TQString PskFileContent = TQString ( PskFile.readAll() ); PskFile.close(); if ( !GlobalConfig->currentProfile->getAuthWithUsernameAndPassword() ) { @@ -4626,8 +4626,8 @@ void KVpnc::connectClicked() GlobalConfig->appendLogEntry ( i18n ( "---- %1 ---" ).arg ( IpsecSecretsFile.name() ),GlobalConfig->debug ); if ( IpsecSecretsFile.open ( IO_ReadOnly ) ) { - QTextStream stream ( &IpsecSecretsFile ); - QString line; + TQTextStream stream ( &IpsecSecretsFile ); + TQString line; while ( !stream.atEnd() ) { line = stream.readLine(); // line of text excluding '\n' @@ -4641,15 +4641,15 @@ void KVpnc::connectClicked() } ToolInfo *tool = Utils ( GlobalConfig ).getToolInfo ( "ipsec" ); - QString realversion = tool->Version.section ( ' ', 1, 1 ).section ( '/', 0, 0 ).right ( tool->Version.section ( ' ', 1, 1 ).section ( '/', 0, 0 ).length() - 1 ); + TQString realversion = tool->Version.section ( ' ', 1, 1 ).section ( '/', 0, 0 ).right ( tool->Version.section ( ' ', 1, 1 ).section ( '/', 0, 0 ).length() - 1 ); int IpsecMajor= realversion.section ( '.',0,0 ).toInt(); int IpsecMinor= realversion.section ( '.',1,1 ).toInt(); int IpsecSubMinor= realversion.section ( '.',2,2 ).toInt(); - QString realtype = tool->Version.section ( ' ', 0, 0 ).lower(); + TQString realtype = tool->Version.section ( ' ', 0, 0 ).lower(); // write /etc/ipsec.conf //file.setName( tmpPath + "freeswan." + ProfileName + ".conf" ) - QFile IpsecConfigFile ( IpsecPrefix + "/ipsec.conf" ); // warning: static + TQFile IpsecConfigFile ( IpsecPrefix + "/ipsec.conf" ); // warning: static if ( IpsecConfigFile.open ( IO_WriteOnly ) ) { @@ -4661,7 +4661,7 @@ void KVpnc::connectClicked() stream << "" << "\n"; if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "IPSec version: %1.%2.%3" ).arg ( QString::number ( IpsecMajor ) ).arg ( QString::number ( IpsecMinor ) ).arg ( QString::number ( IpsecSubMinor ) ),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "IPSec version: %1.%2.%3" ).arg ( TQString::number ( IpsecMajor ) ).arg ( TQString::number ( IpsecMinor ) ).arg ( TQString::number ( IpsecSubMinor ) ),GlobalConfig->debug ); // if ( realversion.find ( "2.", 0, -1 ) > -1 ) if ( !IpsecType.contains ( "free", false ) ) // only version 2 @@ -4685,7 +4685,7 @@ void KVpnc::connectClicked() } stream << " klipsdebug=\""; - for ( QStringList::Iterator it = GlobalConfig->KlipsDebug.begin(); it != GlobalConfig->KlipsDebug.end(); ++it ) + for ( TQStringList::Iterator it = GlobalConfig->KlipsDebug.begin(); it != GlobalConfig->KlipsDebug.end(); ++it ) { stream << *it << " "; @@ -4695,7 +4695,7 @@ void KVpnc::connectClicked() stream << "\"" << "\n"; stream << " plutodebug=\""; - for ( QStringList::Iterator it = GlobalConfig->PlutoDebug.begin(); it != GlobalConfig->PlutoDebug.end(); ++it ) + for ( TQStringList::Iterator it = GlobalConfig->PlutoDebug.begin(); it != GlobalConfig->PlutoDebug.end(); ++it ) { stream << *it << " "; @@ -4802,9 +4802,9 @@ void KVpnc::connectClicked() if ( GlobalConfig->currentProfile->getUsePerfectForwardSecrety() ) { stream << " pfs=yes" << "\n"; - QString pfs_group = GlobalConfig->currentProfile->getPerfectForwardSecrety(); + TQString pfs_group = GlobalConfig->currentProfile->getPerfectForwardSecrety(); -// QString PFSGroupNumber = "2"; +// TQString PFSGroupNumber = "2"; // if (pfs_group== "modp768") // PFSGroupNumber = "1"; // else if (pfs_group== "modp1024") @@ -4846,7 +4846,7 @@ void KVpnc::connectClicked() else { // we have to split slot id and name ("0 : foobar") => 0 - QString Pkcs11Slot = GlobalConfig->currentProfile->getPkcs11Slot().section ( ':', 0, 0 ).stripWhiteSpace(); + TQString Pkcs11Slot = GlobalConfig->currentProfile->getPkcs11Slot().section ( ':', 0, 0 ).stripWhiteSpace(); stream << " leftcert=%smartcard" << Pkcs11Slot << ":" << GlobalConfig->currentProfile->getPkcs11Id() << "\n"; } @@ -4891,16 +4891,16 @@ void KVpnc::connectClicked() { if (GlobalConfig->currentProfile->getRemoteIDType() == "address" && !Utils(GlobalConfig).isValidIPv4Address( GlobalConfig->currentProfile->getSpecialRemoteID() ) ) { - QString resolvedIp = Utils(GlobalConfig).resolveName(GlobalConfig->currentProfile->getSpecialRemoteID()); + TQString resolvedIp = Utils(GlobalConfig).resolveName(GlobalConfig->currentProfile->getSpecialRemoteID()); if (resolvedIp.isEmpty()) { - GlobalConfig->appendLogEntry( i18n("Remote ID \"%1\" (type: address) could not resolved, ommiting right id.").arg(GlobalConfig->currentProfile->getSpecialRemoteID()), GlobalConfig->error ); + GlobalConfig->appendLogEntry( i18n("Remote ID \"%1\" (type: address) could not resolved, ommiting right id.").tqarg(GlobalConfig->currentProfile->getSpecialRemoteID()), GlobalConfig->error ); } else { if (GlobalConfig->KvpncDebugLevel > 3) - GlobalConfig->appendLogEntry( i18n("Remote ID \"%1\" (type: address) resolved to: %2").arg(GlobalConfig->currentProfile->getSpecialRemoteID()).arg(resolvedIp), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( i18n("Remote ID \"%1\" (type: address) resolved to: %2").tqarg(GlobalConfig->currentProfile->getSpecialRemoteID()).tqarg(resolvedIp), GlobalConfig->debug ); stream << " rightid=" + resolvedIp << "\n"; } } @@ -4920,16 +4920,16 @@ void KVpnc::connectClicked() { if (GlobalConfig->currentProfile->getLocalIDType() == "address" && !Utils(GlobalConfig).isValidIPv4Address( GlobalConfig->currentProfile->getSpecialLocalID() ) ) { - QString resolvedIp = Utils(GlobalConfig).resolveName(GlobalConfig->currentProfile->getSpecialLocalID()); + TQString resolvedIp = Utils(GlobalConfig).resolveName(GlobalConfig->currentProfile->getSpecialLocalID()); if (resolvedIp.isEmpty()) { - GlobalConfig->appendLogEntry( i18n("Local ID \"%1\" (type: address) could not resolved, ommiting left id.").arg(GlobalConfig->currentProfile->getSpecialLocalID()), GlobalConfig->error ); + GlobalConfig->appendLogEntry( i18n("Local ID \"%1\" (type: address) could not resolved, ommiting left id.").tqarg(GlobalConfig->currentProfile->getSpecialLocalID()), GlobalConfig->error ); } else { if (GlobalConfig->KvpncDebugLevel > 3) - GlobalConfig->appendLogEntry( i18n("Local ID \"%1\" (type: address) resolved to: %2").arg(GlobalConfig->currentProfile->getSpecialLocalID()).arg(resolvedIp), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( i18n("Local ID \"%1\" (type: address) resolved to: %2").tqarg(GlobalConfig->currentProfile->getSpecialLocalID()).tqarg(resolvedIp), GlobalConfig->debug ); stream << " leftid=" + resolvedIp << "\n"; } } @@ -4983,7 +4983,7 @@ void KVpnc::connectClicked() // XAUTH if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan && GlobalConfig->currentProfile->getAuthWithUsernameAndPassword() ) { - QString LocalID = GlobalConfig->currentProfile->getSpecialLocalID(); + TQString LocalID = GlobalConfig->currentProfile->getSpecialLocalID(); // if (!LocalID.find( "@", 0 , FALSE ) > -1) // LocalID="@"+LocalID; if ( IpsecToolInfo->Version.contains ( "Openswan" , false ) ) @@ -5031,12 +5031,12 @@ void KVpnc::connectClicked() { GlobalConfig->appendLogEntry ( i18n ( "---- %1 ---" ).arg ( IpsecPrefix + "/ipsec.conf" ),GlobalConfig->debug ); GlobalConfig->appendLogEntry ( "---------------------",GlobalConfig->debug ); - QString IpsecContent=""; - QFile file ( IpsecPrefix + "/ipsec.conf" ); + TQString IpsecContent=""; + TQFile file ( IpsecPrefix + "/ipsec.conf" ); if ( file.open ( IO_ReadOnly ) ) { - QTextStream stream ( &file ); - QString line; + TQTextStream stream ( &file ); + TQString line; while ( !stream.atEnd() ) { line = stream.readLine(); // line of text excluding '\n' @@ -5050,7 +5050,7 @@ void KVpnc::connectClicked() else { GlobalConfig->appendLogEntry ( i18n ( "%1 could not opened. Stop." ).arg ( IpsecConfigFile.name() ),GlobalConfig->error ); - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return; } @@ -5059,7 +5059,7 @@ void KVpnc::connectClicked() // iptables need the right interface (eth0:1 => eth0) - QString tmpInterface2 = ""; + TQString tmpInterface2 = ""; int pointPos = tmpInterface.find ( ':', 0, FALSE ); if ( pointPos > 1 ) { @@ -5069,7 +5069,7 @@ void KVpnc::connectClicked() tmpInterface2 = tmpInterface; // write iptables._add_ipsec_freeswan.sh - QFile file ( tmpPath + "iptables." + GlobalConfig->currentProfile->getName() + ".add_ipsec_freeswan.sh" ); + TQFile file ( tmpPath + "iptables." + GlobalConfig->currentProfile->getName() + ".add_ipsec_freeswan.sh" ); stream.setDevice ( &file ); if ( file.open ( IO_WriteOnly ) ) { @@ -5101,13 +5101,13 @@ void KVpnc::connectClicked() else { GlobalConfig->appendLogEntry ( i18n ( "%1 could not opened. Stop." ).arg ( tmpPath + "iptables." + GlobalConfig->currentProfile->getName() + ".add_ipsec_freeswan.sh" ),GlobalConfig->error ); - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return; } stream.unsetDevice(); - QFile file1 ( tmpPath + "iptables." + GlobalConfig->currentProfile->getName() + ".remove_ipsec_freeswan.sh" ); - QTextStream stream1 ( &file1 ); + TQFile file1 ( tmpPath + "iptables." + GlobalConfig->currentProfile->getName() + ".remove_ipsec_freeswan.sh" ); + TQTextStream stream1 ( &file1 ); if ( file1.open ( IO_WriteOnly ) ) { stream1 << "#!"<< GlobalConfig->InterpreterShell << "\n"; @@ -5138,14 +5138,14 @@ void KVpnc::connectClicked() else { GlobalConfig->appendLogEntry ( i18n ( "%1 could not opened. Stop." ).arg ( tmpPath + "iptables." + GlobalConfig->currentProfile->getName() + ".remove_ipsec_freeswan.sh" ),GlobalConfig->error ); - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return; } if ( GlobalConfig->currentProfile->getAuthType() == VpnAccountData::psk ) { // write psk..key - QFile Pskfile ( tmpPath + "psk." + ProfileName + ".key" ); + TQFile Pskfile ( tmpPath + "psk." + ProfileName + ".key" ); stream.setDevice ( &Pskfile ); if ( Pskfile.open ( IO_WriteOnly ) ) { @@ -5167,7 +5167,7 @@ void KVpnc::connectClicked() // if (GlobalConfig->currentProfile->useVirtualIP()){ // if (!setVirtualIP()){ - // setGuiStatus(disconnected); + // setGuitqStatus(disconnected); // return; // } // } @@ -5183,7 +5183,7 @@ void KVpnc::connectClicked() // startStopIpsec(false); - IpsecStartProcess = new QProcess ( this ); + IpsecStartProcess = new TQProcess ( this ); // IpsecStartProcess->addArgument ( GlobalConfig->pathToIpsec ); @@ -5205,29 +5205,29 @@ void KVpnc::connectClicked() // IpsecStartProcess->addArgument ( "starter" ); // IpsecStartProcess->addArgument ( "--nofork"); -// QFile("/var/run/pluto.pid").remove(); -// QFile("/var/run/starter.pid").remove(); +// TQFile("/var/run/pluto.pid").remove(); +// TQFile("/var/run/starter.pid").remove(); // IpsecStartProcess->addArgument ( "setup" ); IpsecStartProcess->addArgument ( "start" ); } IpsecGotError = false; - connect ( IpsecStartProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsec() ) ); - connect ( IpsecStartProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsec() ) ); - connect ( IpsecStartProcess, SIGNAL ( normalExit () ), this, SLOT ( ipsecStarted() ) ); + connect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsec() ) ); + connect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsec() ) ); + connect ( IpsecStartProcess, TQT_SIGNAL ( normalExit () ), this, TQT_SLOT ( ipsecStarted() ) ); if ( !IpsecStartProcess->start ( env ) ) { KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( "ipsec (" + IpsecType + "): setup" ) ); GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "ipsec (" + IpsecType + "): setup" ) , GlobalConfig->error ); - disconnect ( IpsecStartProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsec() ) ); - disconnect ( IpsecStartProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsec() ) ); - //disconnect ( IpsecStartProcess, SIGNAL ( processExited () ), this, SLOT ( ipsecStarted() ) ); + disconnect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsec() ) ); + disconnect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsec() ) ); + //disconnect ( IpsecStartProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( ipsecStarted() ) ); delete IpsecStartProcess; IpsecStartProcess = 0L; disconnectClicked(); - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); } else { @@ -5263,9 +5263,9 @@ void KVpnc::connectClicked() GlobalConfig->appPointer->processEvents(); usleep ( 500 ); } - disconnect ( IpsecStartProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsec() ) ); - disconnect ( IpsecStartProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsec() ) ); - disconnect ( IpsecStartProcess, SIGNAL ( processExited () ), this, SLOT ( ipsecStarted() ) ); + disconnect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsec() ) ); + disconnect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsec() ) ); + disconnect ( IpsecStartProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( ipsecStarted() ) ); delete IpsecStartProcess; IpsecStartProcess = 0L; @@ -5285,20 +5285,20 @@ void KVpnc::connectClicked() else { GlobalConfig->appendLogEntry ( i18n ( "%1 could not opened. Stop." ).arg ( IpsecSecretsFile.name() ),GlobalConfig->error ); - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return; } } else { - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); } } // freeswan /* ============ pptp ================ */ else if ( GlobalConfig->currentProfile != 0 && GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::pptp ) { - //setGuiStatus(connecting); + //setGuitqStatus(connecting); // looking for pppd if ( Utils ( GlobalConfig ).getToolInfo ( "pppd" )->found == false ) @@ -5306,7 +5306,7 @@ void KVpnc::connectClicked() KMessageBox::error ( this, i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "pppd" ).arg ( GlobalConfig->pathToPppd ) ); GlobalConfig->appendLogEntry ( i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "pppd" ).arg ( GlobalConfig->pathToPppd ), GlobalConfig->error ); ok = false; - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return ; } if ( GlobalConfig->KvpncDebugLevel > 0 ) @@ -5315,15 +5315,15 @@ void KVpnc::connectClicked() if ( GlobalConfig->KvpncDebugLevel > 3 ) GlobalConfig->appendLogEntry ( i18n ( "Checking gre support" ), GlobalConfig->debug ); bool gresupportfound = false; - QString procnetdev = ""; - QFile f ( "/proc/net/dev" ); + TQString procnetdev = ""; + TQFile f ( "/proc/net/dev" ); if ( f.open ( IO_ReadOnly ) ) { - QTextStream procnetdevstream ( &f ); - QString procnetdevcontent = QString(procnetdevstream.read()); - QStringList procnetdev_content_list = QStringList::split("\n", procnetdevcontent); - QString line = ""; - for ( QStringList::Iterator it = procnetdev_content_list.begin(); it != procnetdev_content_list.end(); ++it ) + TQTextStream procnetdevstream ( &f ); + TQString procnetdevcontent = TQString(procnetdevstream.read()); + TQStringList procnetdev_content_list = TQStringList::split("\n", procnetdevcontent); + TQString line = ""; + for ( TQStringList::Iterator it = procnetdev_content_list.begin(); it != procnetdev_content_list.end(); ++it ) { line = *it; // line of text excluding '\n' if ( line.contains ( "gre0", false ) ) @@ -5336,15 +5336,15 @@ void KVpnc::connectClicked() } if ( !gresupportfound ) { - QString procmodules = ""; - QFile f2 ( "/proc/modules" ); + TQString procmodules = ""; + TQFile f2 ( "/proc/modules" ); if ( f2.open ( IO_ReadOnly ) ) { - QTextStream procmodulesstream ( &f2 ); - QString procmodulescontent = QString(procmodulesstream.read()); - QStringList procmodules_content_list = QStringList::split("\n", procmodulescontent); - QString line = ""; - for ( QStringList::Iterator it2 = procmodules_content_list.begin(); it2 != procmodules_content_list.end(); ++it2 ) + TQTextStream procmodulesstream ( &f2 ); + TQString procmodulescontent = TQString(procmodulesstream.read()); + TQStringList procmodules_content_list = TQStringList::split("\n", procmodulescontent); + TQString line = ""; + for ( TQStringList::Iterator it2 = procmodules_content_list.begin(); it2 != procmodules_content_list.end(); ++it2 ) { line = *it2; // line of text excluding '\n' if ( line.contains ( "ip_gre", false ) ) @@ -5359,7 +5359,7 @@ void KVpnc::connectClicked() if ( gresupportfound ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry ( i18n ( "Support for %1 found (compiled into kernel or kernel module already loaded)." ).arg("GRE"), GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Support for %1 found (compiled into kernel or kernel module already loaded)." ).tqarg("GRE"), GlobalConfig->debug ); } else { @@ -5368,7 +5368,7 @@ void KVpnc::connectClicked() KMessageBox::information ( this, i18n ( "Loading of module \"%1\" failed!" ).arg ( "ip_gre" ) ); GlobalConfig->appendLogEntry ( i18n ( "Tunnel device is missing, loading module \"%1\" has failed: stop." ).arg ( "ip_gre" ), GlobalConfig->error ); disconnectClicked(); - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); GlobalConfig->status = GlobalConfig->disconnected; return ; } @@ -5384,7 +5384,7 @@ void KVpnc::connectClicked() // { // GlobalConfig->appendLogEntry( i18n( "Remote network is missing, please fill in in profile dialog." ), GlobalConfig->error ); // ok = false; - // setGuiStatus(disconnected); + // setGuitqStatus(disconnected); // return; // } @@ -5535,8 +5535,8 @@ void KVpnc::connectClicked() tmpPath = locateLocal ( "data", "kvpnc/" ); - QString tmpInterface; - QString LocalIP; + TQString tmpInterface; + TQString LocalIP; NetworkInterface iface ( GlobalConfig, parent ); if ( GlobalConfig->currentProfile->getNetworkDevice() == "default" ) { @@ -5549,8 +5549,8 @@ void KVpnc::connectClicked() } else { - // QString device = GlobalConfig->currentProfile->getNetworkDevice() - // QString device = PppdDevice; + // TQString device = GlobalConfig->currentProfile->getNetworkDevice() + // TQString device = PppdDevice; // tmpInterface = GlobalConfig->currentProfile->getNetworkDevice(); // LocalIP = iface.getInterfaceIP( device ); } @@ -5591,12 +5591,12 @@ void KVpnc::connectClicked() GlobalConfig->Pppd_pid_file = "/var/run/ppp-" + GlobalConfig->currentProfile->getName() + ".pid"; // /var/run/ppp-.pid // write pppd peer script - QString PppdPeerScript = "/etc/ppp/peers/kvpnc." + GlobalConfig->currentProfile->getName(); // /etc/ppp/peers/ + TQString PppdPeerScript = "/etc/ppp/peers/kvpnc." + GlobalConfig->currentProfile->getName(); // /etc/ppp/peers/ if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( "pppd peer script: " + PppdPeerScript + "\n", GlobalConfig->debug ); - QFile file ( PppdPeerScript ); - QTextStream stream ( &file ); + TQFile file ( PppdPeerScript ); + TQTextStream stream ( &file ); if ( file.open ( IO_WriteOnly ) ) { stream << "# generated by kvpnc. Do not edit it." << "\n"; @@ -5613,14 +5613,14 @@ void KVpnc::connectClicked() stream << "ipparam kvpnc." + GlobalConfig->currentProfile->getName() + "\n"; stream << "\n"; stream << "# data stream for pppd to use\n"; - QString pptpdebug=""; + TQString pptpdebug=""; if ( GlobalConfig->enableDebugPptpd == true ) { pptpdebug=" --debug "; if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "Enabling debug for pptpd." ), GlobalConfig->debug ); } - stream << "pty \"" << GlobalConfig->pathToPptp << " " << pptpdebug << "--loglevel " << QString().setNum ( GlobalConfig->PptpLogLevel ) << " " << GlobalConfig->currentProfile->getGateway() << " --nolaunchpppd\"\n"; + stream << "pty \"" << GlobalConfig->pathToPptp << " " << pptpdebug << "--loglevel " << TQString().setNum ( GlobalConfig->PptpLogLevel ) << " " << GlobalConfig->currentProfile->getGateway() << " --nolaunchpppd\"\n"; stream << "\n"; stream << "# domain and username, used to select lines in secrets files\n"; @@ -5773,7 +5773,7 @@ void KVpnc::connectClicked() if ( GlobalConfig->currentProfile->getUseMtu() ) { stream << "# userdefined MTU\n"; - stream << "mtu " + QString().setNum ( GlobalConfig->currentProfile->getMtu() ) + "\n"; + stream << "mtu " + TQString().setNum ( GlobalConfig->currentProfile->getMtu() ) + "\n"; stream << "\n"; } else @@ -5786,7 +5786,7 @@ void KVpnc::connectClicked() if ( GlobalConfig->currentProfile->getUseMru() ) { stream << "# userdefined MRU\n"; - stream << "mru " + QString().setNum ( GlobalConfig->currentProfile->getMru() ) + "\n"; + stream << "mru " + TQString().setNum ( GlobalConfig->currentProfile->getMru() ) + "\n"; stream << "\n"; } else @@ -5908,7 +5908,7 @@ void KVpnc::connectClicked() Utils ( GlobalConfig, this ).doChmod ( "/etc/ppp/pap-secrets", "go-rwx" ); // write pppd /etc/ppp/chap-secrets - QString ChapSecrets = "/etc/ppp/chap-secrets"; // /etc/ppp/chap-secrets + TQString ChapSecrets = "/etc/ppp/chap-secrets"; // /etc/ppp/chap-secrets if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1" ).arg ( "/etc/ppp/chap-secrets" ), GlobalConfig->debug ); @@ -5922,7 +5922,7 @@ void KVpnc::connectClicked() if ( GlobalConfig->currentProfile->getSaveUserPassword() ) GlobalConfig->TmpPassword = GlobalConfig->currentProfile->getUserPassword(); - QString UsernameStr; + TQString UsernameStr; if ( !GlobalConfig->currentProfile->getDontSaveUsername() ) UsernameStr = GlobalConfig->currentProfile->getUserName(); else @@ -5962,7 +5962,7 @@ void KVpnc::connectClicked() // write pppd /etc/ppp/pap-secrets - QString papSecrets = "/etc/ppp/pap-secrets"; // /etc/ppp/pap-secrets + TQString papSecrets = "/etc/ppp/pap-secrets"; // /etc/ppp/pap-secrets if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1" ).arg ( "/etc/ppp/pap-secrets" ), GlobalConfig->debug ); @@ -5976,7 +5976,7 @@ void KVpnc::connectClicked() if ( GlobalConfig->currentProfile->getSaveUserPassword() ) GlobalConfig->TmpPassword = GlobalConfig->currentProfile->getUserPassword(); - QString UsernameStr; + TQString UsernameStr; if ( !GlobalConfig->currentProfile->getDontSaveUsername() ) UsernameStr = GlobalConfig->currentProfile->getUserName(); else @@ -6009,8 +6009,8 @@ void KVpnc::connectClicked() pppdHasReplacedefaultrouteSupport = pppdcap.pppdHasReplacedefaultrouteSupport; - QFile pppdbackupdefaultroutefile ( tmpPath + "pppd." + GlobalConfig->currentProfile->getName() + ".backup_default_route.sh" ); - QTextStream pppdbackupdefaultroutestream ( &pppdbackupdefaultroutefile ); + TQFile pppdbackupdefaultroutefile ( tmpPath + "pppd." + GlobalConfig->currentProfile->getName() + ".backup_default_route.sh" ); + TQTextStream pppdbackupdefaultroutestream ( &pppdbackupdefaultroutefile ); if ( pppdbackupdefaultroutefile.open ( IO_WriteOnly ) ) { pppdbackupdefaultroutestream << "#!"<< GlobalConfig->InterpreterShell << "\n"; @@ -6022,7 +6022,7 @@ void KVpnc::connectClicked() - QProcess *backupDefaultRouteProcess = new QProcess ( this ); + TQProcess *backupDefaultRouteProcess = new TQProcess ( this ); backupDefaultRouteProcess->addArgument ( GlobalConfig->InterpreterShell ); backupDefaultRouteProcess->addArgument ( tmpPath + "pppd." + GlobalConfig->currentProfile->getName() + ".backup_default_route.sh" ); @@ -6035,7 +6035,7 @@ void KVpnc::connectClicked() if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "\"%1\" (%2) started." ).arg ( "PppdBackupDefaultRouteScript" ).arg ( tmpPath + "pppd." + GlobalConfig->currentProfile->getName() + ".backup_default_route.sh" ) , GlobalConfig->debug ); while ( backupDefaultRouteProcess->isRunning() ) - parent->QApplication::processEvents(); + parent->TQApplication::processEvents(); if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "\"%1\" (%2) finished." ).arg ( "PppdBackupDefaultRouteScript" ).arg ( tmpPath + "pppd." + GlobalConfig->currentProfile->getName() + ".up" ) , GlobalConfig->debug ); @@ -6046,15 +6046,15 @@ void KVpnc::connectClicked() // load the module 'ppp_mppe' - QFile modprobe_confFile ( "/etc/modprobe.conf" ); + TQFile modprobe_confFile ( "/etc/modprobe.conf" ); if ( modprobe_confFile.exists() ) { - QString modprobe_confFileContent = ""; + TQString modprobe_confFileContent = ""; bool ppp_compress_18_found = false; if ( modprobe_confFile.open ( IO_ReadOnly ) ) { - QTextStream stream ( &modprobe_confFile ); - QString line = ""; + TQTextStream stream ( &modprobe_confFile ); + TQString line = ""; while ( !stream.atEnd() ) { line = stream.readLine(); // line of text excluding '\n' @@ -6100,7 +6100,7 @@ void KVpnc::connectClicked() bool load_module_ok=true; if ( !Utils ( GlobalConfig, parent ).loadKernelModule ( "ppp-compress-18", parent ) ) { - //KMessageBox::information( this, i18n( "Loading of module \"%1\" failed!" ).arg("\"ppp-compress-18\" (ppp_mppe)")); + //KMessageBox::information( this, i18n( "Loading of module \"%1\" failed!" ).tqarg("\"ppp-compress-18\" (ppp_mppe)")); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "Loading module \"%1\" has been failed, trying \"%2\"..." ).arg ( "ppp-compress-18" ).arg ( "ppp_mppe" ), GlobalConfig->debug ); @@ -6108,7 +6108,7 @@ void KVpnc::connectClicked() if ( !Utils ( GlobalConfig, parent ).loadKernelModule ( "ppp_mppe", parent ) ) { GlobalConfig->appendLogEntry ( i18n ( "Loading module \"%1\" and \"%2\" has been failed: stop." ).arg ( "ppp-compress-18" ).arg ( "ppp_mppe" ), GlobalConfig->error ); - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); disconnectClicked(); load_module_ok=false; } @@ -6127,17 +6127,17 @@ void KVpnc::connectClicked() //sleep(2); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( "pppd: " + GlobalConfig->pathToPppd + "\n", GlobalConfig->debug ); - PptpProcess = new QProcess ( this ); + PptpProcess = new TQProcess ( this ); PptpProcess->addArgument ( GlobalConfig->pathToPppd ); PptpProcess->addArgument ( "call" ); - PptpProcess->addArgument ( QString ( "kvpnc." + GlobalConfig->currentProfile->getName() ) ); + PptpProcess->addArgument ( TQString ( "kvpnc." + GlobalConfig->currentProfile->getName() ) ); // PptpProcess->addArgument( GlobalConfig->InterpreterShell ); // PptpProcess->addArgument( "/home/crissi/pppd.sh" ); - connect ( PptpProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_pptp() ) ); - connect ( PptpProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_pptp() ) ); + connect ( PptpProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_pptp() ) ); + connect ( PptpProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_pptp() ) ); @@ -6152,10 +6152,10 @@ void KVpnc::connectClicked() { KMessageBox::sorry ( this, i18n ( "\"%1\" start failed!" ).arg ( "pppd" ) ); GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "pppd" ), GlobalConfig->error ); - disconnect ( PptpProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_pptp() ) ); - disconnect ( PptpProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_pptp() ) ); + disconnect ( PptpProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_pptp() ) ); + disconnect ( PptpProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_pptp() ) ); disconnectClicked(); - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); } else { @@ -6167,12 +6167,12 @@ void KVpnc::connectClicked() this->DisconnectAction->setEnabled ( true ); mw->buttonConnect->setEnabled ( false ); this->ConnectAction->setEnabled ( false ); - //connect ( PptpProcess, SIGNAL( processExited () ), this, SLOT( pppdStarted() ) ); + //connect ( PptpProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT( pppdStarted() ) ); - // connect( &timer, SIGNAL( timeout() ), this, SLOT( slotConnectTimedOut() ) ); + // connect( &timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotConnectTimedOut() ) ); // timer.start( tryConnectTimeout * 1000, FALSE ); - //connect ( PptpProcess, SIGNAL ( processExited() ), this, SLOT ( pptpProcessExited() ) ); + //connect ( PptpProcess, TQT_SIGNAL ( processExited() ), this, TQT_SLOT ( pptpProcessExited() ) ); } @@ -6183,7 +6183,7 @@ void KVpnc::connectClicked() { if (AuthRetry) disconnectClicked(); - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return ; } } // pptp @@ -6191,9 +6191,9 @@ void KVpnc::connectClicked() /* ============ openvpn ================ */ else if ( GlobalConfig->currentProfile != 0 && GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::openvpn ) { - //setGuiStatus(connecting); + //setGuitqStatus(connecting); tmpPath = locateLocal ( "data", "kvpnc/" ); - QString OpenvpnSecrectPath = tmpPath + "openvpn." + GlobalConfig->currentProfile->getName() + ".secret"; + TQString OpenvpnSecrectPath = tmpPath + "openvpn." + GlobalConfig->currentProfile->getName() + ".secret"; // looking for openvpn if ( Utils ( GlobalConfig ).getToolInfo ( "openvpn" )->found == false ) @@ -6201,7 +6201,7 @@ void KVpnc::connectClicked() KMessageBox::error ( this, i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "openvpn" ).arg ( GlobalConfig->pathToOpenvpn ) ); GlobalConfig->appendLogEntry ( i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "openvpn" ).arg ( GlobalConfig->pathToOpenvpn ), GlobalConfig->error ); ok = false; - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return ; } @@ -6219,10 +6219,10 @@ void KVpnc::connectClicked() // Utils(GlobalConfig).getSmartcardInfo(); // if ( GlobalConfig->pathToPkcs11Tool.isEmpty() || KStandardDirs::findExe( GlobalConfig->pathToPkcs11Tool.section( '/', -1, -1 ), GlobalConfig->pathTopathToPkcs11Tool.section( '/', 0, -2 ) ).isEmpty() ) // { - // KMessageBox::error( this, i18n( "Unable to find \"%1\" at \"%2\"!" ).arg( "pkcs11-tool" ).arg( GlobalConfig->pathToPkcs11Tool) ); - // GlobalConfig->appendLogEntry( i18n( "Unable to find \"%1\" at \"%2\"!" ).arg( "pkcs11-tool" ).arg( GlobalConfig->pathToPkcs11Tool ), GlobalConfig->error ); + // KMessageBox::error( this, i18n( "Unable to find \"%1\" at \"%2\"!" ).tqarg( "pkcs11-tool" ).tqarg( GlobalConfig->pathToPkcs11Tool) ); + // GlobalConfig->appendLogEntry( i18n( "Unable to find \"%1\" at \"%2\"!" ).tqarg( "pkcs11-tool" ).tqarg( GlobalConfig->pathToPkcs11Tool ), GlobalConfig->error ); // ok = false; - // setGuiStatus( disconnected ); + // setGuitqStatus( disconnected ); // return ; // } @@ -6231,7 +6231,7 @@ void KVpnc::connectClicked() KMessageBox::error ( this, i18n ( "Pkcs11 slot cant be empty!" ) ); GlobalConfig->appendLogEntry ( i18n ( "Pkcs11 slot cant be empty!" ), GlobalConfig->error ); ok = false; - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return ; } if ( GlobalConfig->currentProfile->getPkcs11Id().isEmpty() ) @@ -6239,7 +6239,7 @@ void KVpnc::connectClicked() KMessageBox::error ( this, i18n ( "Pkcs11 id cant be empty!" ) ); GlobalConfig->appendLogEntry ( i18n ( "Pkcs11 id cant be empty!" ), GlobalConfig->error ); ok = false; - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return ; } if ( GlobalConfig->currentProfile->getUsePkcs11Providers() && GlobalConfig->currentProfile->getPkcs11Providers().isEmpty() ) @@ -6247,23 +6247,23 @@ void KVpnc::connectClicked() KMessageBox::error ( this, i18n ( "Pkcs11 providers cant be empty!" ) ); GlobalConfig->appendLogEntry ( i18n ( "Pkcs11 providers cant be empty!" ), GlobalConfig->error ); ok = false; - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return ; } } else { /* use cert on filesystem */ - QFile CertTmpFile; + TQFile CertTmpFile; if ( ! GlobalConfig->currentProfile->getUseOnlyCaCertAndUserAuth() ) { CertTmpFile.setName ( GlobalConfig->currentProfile->getX509Certificate() ); if ( !CertTmpFile.exists() ) { - // KMessageBox::error( 0, i18n( "Certificate file (%1) could not be found. Please check the path of it." ).arg( GlobalConfig->currentProfile->getX509Certificate() ), i18n( "File Not Found" ) ); - // GlobalConfig->appendLogEntry( i18n( "Certificate file (%1) could not be found. Please check the path of it." ).arg( GlobalConfig->currentProfile->getX509Certificate() ), GlobalConfig->error ); + // KMessageBox::error( 0, i18n( "Certificate file (%1) could not be found. Please check the path of it." ).tqarg( GlobalConfig->currentProfile->getX509Certificate() ), i18n( "File Not Found" ) ); + // GlobalConfig->appendLogEntry( i18n( "Certificate file (%1) could not be found. Please check the path of it." ).tqarg( GlobalConfig->currentProfile->getX509Certificate() ), GlobalConfig->error ); // ok = false; - // setGuiStatus( disconnected ); + // setGuitqStatus( disconnected ); // return ; } else @@ -6274,7 +6274,7 @@ void KVpnc::connectClicked() KMessageBox::error ( 0, i18n ( "Private key file (%1) could not be found. Please check the path of it." ).arg ( GlobalConfig->currentProfile->getPrivateKey() ), i18n ( "File Not Found" ) ); GlobalConfig->appendLogEntry ( i18n ( "Private key file (%1) could not be found. Please check the path of it." ).arg ( GlobalConfig->currentProfile->getPrivateKey() ) , GlobalConfig->error ); ok = false; - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return ; } } @@ -6286,19 +6286,19 @@ void KVpnc::connectClicked() KMessageBox::error ( 0, i18n ( "CA certificate file (%1) could not be found. Please check the path of it." ).arg ( GlobalConfig->currentProfile->getCaCertificate() ), i18n ( "File Not Found" ) ); GlobalConfig->appendLogEntry ( i18n ( "CA certificate file (%1) could not be found. Please check the path of it." ).arg ( GlobalConfig->currentProfile->getCaCertificate() ) , GlobalConfig->error ); ok = false; - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return ; } } } bool tunsupportfound = false; - QString procmisc = ""; - QFile f ( "/proc/misc" ); + TQString procmisc = ""; + TQFile f ( "/proc/misc" ); if ( f.open ( IO_ReadOnly ) ) { - QTextStream stream ( &f ); - QString line = ""; + TQTextStream stream ( &f ); + TQString line = ""; while ( !stream.atEnd() ) { line = stream.readLine(); // line of text excluding '\n' @@ -6315,7 +6315,7 @@ void KVpnc::connectClicked() if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "Support for TUN/TAP found (compiled into kernel or kernel module already loaded)." ), GlobalConfig->debug ); - QFile tundevfile ( "/dev/net/tun" ); + TQFile tundevfile ( "/dev/net/tun" ); if ( !tundevfile.exists() ) { if ( !Utils ( GlobalConfig, parent ).createTunDev() ) @@ -6323,7 +6323,7 @@ void KVpnc::connectClicked() KMessageBox::error ( this, i18n ( "Creating of \"%1\" has been failed!" ).arg ( "/dev/net/tun" ) ); GlobalConfig->appendLogEntry ( i18n ( "Tunnel device is missing, creating has been failed: stop." ), GlobalConfig->error ); disconnectClicked(); - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); GlobalConfig->status = GlobalConfig->disconnected; return ; } @@ -6342,7 +6342,7 @@ void KVpnc::connectClicked() KMessageBox::information ( this, i18n ( "Loading of module \"%1\" failed!" ).arg ( "tun" ) ); GlobalConfig->appendLogEntry ( i18n ( "Tunnel device is missing, loading module \"%1\" has failed: stop." ).arg ( "tun" ), GlobalConfig->error ); disconnectClicked(); - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); GlobalConfig->status = GlobalConfig->disconnected; return ; } @@ -6356,13 +6356,13 @@ void KVpnc::connectClicked() // GlobalConfig->TmpGatewayIP = Utils( GlobalConfig, parent ).resolveName(GlobalConfig->currentProfile->getGateway()); // if (GlobalConfig->TmpGatewayIP=="0.0.0.0" || GlobalConfig->TmpGatewayIP.isEmpty()) // { - // KMessageBox::error( this, i18n( "Host \"%1\" could not be resolved!" ).arg(GlobalConfig->currentProfile->getGateway()) ); - // GlobalConfig->appendLogEntry(i18n( "Host \"%1\" could not be resolved!" ).arg(GlobalConfig->currentProfile->getGateway()),GlobalConfig->error); + // KMessageBox::error( this, i18n( "Host \"%1\" could not be resolved!" ).tqarg(GlobalConfig->currentProfile->getGateway()) ); + // GlobalConfig->appendLogEntry(i18n( "Host \"%1\" could not be resolved!" ).tqarg(GlobalConfig->currentProfile->getGateway()),GlobalConfig->error); // ok =false; // } // else // { - // GlobalConfig->appendLogEntry( i18n( "Gateway hostname (%1) resolved to \"%2\"." ).arg(GlobalConfig->currentProfile->getGateway()).arg(GlobalConfig->TmpGatewayIP), GlobalConfig->info ); + // GlobalConfig->appendLogEntry( i18n( "Gateway hostname (%1) resolved to \"%2\"." ).tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(GlobalConfig->TmpGatewayIP), GlobalConfig->info ); // } bool askUsernamePass = false; @@ -6561,8 +6561,8 @@ void KVpnc::connectClicked() AuthRetry = false; GlobalConfig->haveUserData=true; - // QFile OpenvpnSecrectFile (OpenvpnSecrectPath); - // QTextStream openvpn_secret_stream( &OpenvpnSecrectFile); + // TQFile OpenvpnSecrectFile (OpenvpnSecrectPath); + // TQTextStream openvpn_secret_stream( &OpenvpnSecrectFile); // if ( OpenvpnSecrectFile.open( IO_WriteOnly ) ) // { // if (GlobalConfig->TmpUsername.isEmpty()) @@ -6591,8 +6591,8 @@ void KVpnc::connectClicked() mw->buttonConnect->setEnabled ( false ); tmpPath = locateLocal ( "data", "kvpnc/" ); - QString tmpInterface; - QString LocalIP; + TQString tmpInterface; + TQString LocalIP; NetworkInterface iface ( GlobalConfig, parent ); if ( GlobalConfig->currentProfile->getNetworkDevice() == "default" ) { @@ -6628,8 +6628,8 @@ void KVpnc::connectClicked() // GlobalConfig->appendLogEntry( "debug: remote virtual ip: "+GlobalConfig->currentProfile->getRemoteVirtualIP(),GlobalConfig->debug ); // } // write openvpn..conf - QFile openvpn_file ( tmpPath + "openvpn." + GlobalConfig->currentProfile->getName() + ".conf" ); - QTextStream openvpn_stream ( &openvpn_file ); + TQFile openvpn_file ( tmpPath + "openvpn." + GlobalConfig->currentProfile->getName() + ".conf" ); + TQTextStream openvpn_stream ( &openvpn_file ); if ( openvpn_file.open ( IO_WriteOnly ) ) { openvpn_stream << "# generated by kvpnc. Do not edit it." << "\n"; @@ -6637,7 +6637,7 @@ void KVpnc::connectClicked() openvpn_stream << "# verbosity" << "\n"; openvpn_stream << "verb " << GlobalConfig->OpenvpnDebugLevel << "\n\n"; - QString certPath = "/etc/openvpn"; + TQString certPath = "/etc/openvpn"; if ( !GlobalConfig->currentProfile->getCertPath().isEmpty() ) certPath = GlobalConfig->currentProfile->getCertPath(); @@ -6665,7 +6665,7 @@ void KVpnc::connectClicked() ToolInfo *OpenvpnToolInfo = Utils ( GlobalConfig ).getToolInfo ( "openvpn" ) ; int OpenvpnMajor = OpenvpnToolInfo->Version.section ( ".",0,0 ).toInt(); int OpenvpnMinor = OpenvpnToolInfo->Version.section ( ".",1,1 ).section ( "_",0,0 ).toInt(); - QString OpenvpnExtra=""; + TQString OpenvpnExtra=""; int OpenvpnExtraVer=0; if ( OpenvpnToolInfo->Version.section ( ".",1,1 ).find ( "_", 0, FALSE ) > -1 ) { @@ -6682,7 +6682,7 @@ void KVpnc::connectClicked() } if ( GlobalConfig->KvpncDebugLevel > 4 ) { - GlobalConfig->appendLogEntry ( i18n ( "OpenVPN major: %1, minor: %2, extra: %3, extra ver: %4" ).arg ( QString().setNum ( OpenvpnMajor ) ).arg ( QString().setNum ( OpenvpnMinor ) ).arg ( OpenvpnExtra ).arg ( QString().setNum ( OpenvpnExtraVer ) ),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "OpenVPN major: %1, minor: %2, extra: %3, extra ver: %4" ).arg ( TQString().setNum ( OpenvpnMajor ) ).arg ( TQString().setNum ( OpenvpnMinor ) ).arg ( OpenvpnExtra ).arg ( TQString().setNum ( OpenvpnExtraVer ) ),GlobalConfig->debug ); } @@ -6727,7 +6727,7 @@ void KVpnc::connectClicked() openvpn_stream << "pkcs11-slot-type \"" << GlobalConfig->currentProfile->getPkcs11SlotType() << "\"\n"; // we have to split slot id and name ("0 : foobar") => 0 - QString Pkcs11Slot = GlobalConfig->currentProfile->getPkcs11Slot().section ( ':', 0, 0 ).stripWhiteSpace(); + TQString Pkcs11Slot = GlobalConfig->currentProfile->getPkcs11Slot().section ( ':', 0, 0 ).stripWhiteSpace(); openvpn_stream << "pkcs11-slot \"" << Pkcs11Slot << "\"\n"; openvpn_stream << "pkcs11-id-type \"" << GlobalConfig->currentProfile->getPkcs11IdType() << "\"\n"; openvpn_stream << "pkcs11-sign-mode \"" << GlobalConfig->currentProfile->getPkcs11SignMode() << "\"\n"; @@ -6737,7 +6737,7 @@ void KVpnc::connectClicked() else { /* use cert on filesystem */ - QFile CertTmpFile; + TQFile CertTmpFile; if ( !GlobalConfig->currentProfile->getUseOnlyCaCertAndUserAuth() ) { CertTmpFile.setName ( GlobalConfig->currentProfile->getX509Certificate() ); @@ -6747,7 +6747,7 @@ void KVpnc::connectClicked() openvpn_stream << "cert " << GlobalConfig->currentProfile->getX509Certificate() << "\n\n"; openvpn_stream << "" << "\n"; - QFile PrivateKeyTmpFile ( GlobalConfig->currentProfile->getPrivateKey() ); + TQFile PrivateKeyTmpFile ( GlobalConfig->currentProfile->getPrivateKey() ); // if ( PrivateKeyTmpFile.exists() ) { openvpn_stream << "# client private key" << "\n"; @@ -6771,7 +6771,7 @@ void KVpnc::connectClicked() openvpn_stream << "# client psk" << "\n"; if ( GlobalConfig->currentProfile->getPskIsInFile() ) { - QString direction=""; + TQString direction=""; if ( GlobalConfig->currentProfile->getAuthenticationDirection() != "none" ) direction= GlobalConfig->currentProfile->getAuthenticationDirection(); openvpn_stream << "secret " << GlobalConfig->currentProfile->getPreSharedKeyFile() << " " << direction << "\n\n"; @@ -6779,8 +6779,8 @@ void KVpnc::connectClicked() else { // write openvpn..secret - QFile openvpn_secretfile ( tmpPath + "openvpn." + GlobalConfig->currentProfile->getName() + ".secret" ); - QTextStream openvpn_secretstream ( &openvpn_secretfile ); + TQFile openvpn_secretfile ( tmpPath + "openvpn." + GlobalConfig->currentProfile->getName() + ".secret" ); + TQTextStream openvpn_secretstream ( &openvpn_secretfile ); if ( openvpn_secretfile.open ( IO_WriteOnly ) ) { openvpn_secretstream << "# generated by kvpnc. Do not edit it." << "\n"; @@ -6788,7 +6788,7 @@ void KVpnc::connectClicked() openvpn_secretstream << GlobalConfig->currentProfile->getPreSharedKey() << "\n\n"; } openvpn_secretfile.close(); - QString direction=""; + TQString direction=""; if ( GlobalConfig->currentProfile->getAuthenticationDirection() != "none" ) direction= GlobalConfig->currentProfile->getAuthenticationDirection(); openvpn_stream << "secret " << tmpPath + "openvpn." + GlobalConfig->currentProfile->getName() + ".secret " << direction << "\n\n"; @@ -6832,9 +6832,9 @@ void KVpnc::connectClicked() openvpn_stream << "ifconfig " << GlobalConfig->currentProfile->getLocalVirtualIP() << " " << GlobalConfig->currentProfile->getRemoteVirtualIP() << "\n\n"; -// QString RemoteNetAddr = GlobalConfig->currentProfile->getRemoteNetAddr(); +// TQString RemoteNetAddr = GlobalConfig->currentProfile->getRemoteNetAddr(); // int RemoteNetMaskNum = GlobalConfig->currentProfile->getRemoteNetMask().toInt(); -// QString RemoteNetMask = "255.255.255.0"; +// TQString RemoteNetMask = "255.255.255.0"; // if ( RemoteNetMaskNum == 24 ) // RemoteNetMask = "255.255.255.0"; // else if ( RemoteNetMaskNum == 25 ) @@ -6954,7 +6954,7 @@ void KVpnc::connectClicked() if ( GlobalConfig->currentProfile->getUseTlsAuth() && !GlobalConfig->currentProfile->getTlsAuthFile().isEmpty() ) { openvpn_stream << "# Add an additional layer of HMAC authentication on top of the TLS control channel to protect against DoS attacks\n"; - QString direction=""; + TQString direction=""; if ( GlobalConfig->currentProfile->getAuthenticationDirection() != "none" ) direction= GlobalConfig->currentProfile->getAuthenticationDirection(); openvpn_stream << "tls-auth " << GlobalConfig->currentProfile->getTlsAuthFile() << " " << direction << "\n\n"; @@ -6975,7 +6975,7 @@ void KVpnc::connectClicked() if ( GlobalConfig->currentProfile->getUseHttpProxy() ) { openvpn_stream << "# Use a HTTP proxy\n"; - QString HttpProxyAuthType = ""; + TQString HttpProxyAuthType = ""; if ( GlobalConfig->currentProfile->getUseHttpProxyAuth() ) HttpProxyAuthType = GlobalConfig->currentProfile->getHttpProxyAuthType(); @@ -7030,8 +7030,8 @@ void KVpnc::connectClicked() tmpPath = locateLocal ( "data", "kvpnc/" ); // write openvpn..up - QFile upfile ( tmpPath + "openvpn." + GlobalConfig->currentProfile->getName() + ".up" ); - QTextStream upstream ( &upfile ); + TQFile upfile ( tmpPath + "openvpn." + GlobalConfig->currentProfile->getName() + ".up" ); + TQTextStream upstream ( &upfile ); if ( upfile.open ( IO_WriteOnly ) ) { upstream << "#!"<< GlobalConfig->InterpreterShell << "\n"; @@ -7188,8 +7188,8 @@ void KVpnc::connectClicked() Utils ( GlobalConfig, this ).doChmod ( tmpPath + "openvpn." + GlobalConfig->currentProfile->getName() + ".up", "a+x" ); // write openvpn..down - QFile downfile ( tmpPath + "openvpn." + GlobalConfig->currentProfile->getName() + ".down" ); - QTextStream downstream ( &downfile ); + TQFile downfile ( tmpPath + "openvpn." + GlobalConfig->currentProfile->getName() + ".down" ); + TQTextStream downstream ( &downfile ); if ( downfile.open ( IO_WriteOnly ) ) { downstream << "#!"<< GlobalConfig->InterpreterShell << "\n"; @@ -7218,7 +7218,7 @@ void KVpnc::connectClicked() /* dont update dns */ } - QString OldDefaultroute = tmpPath + "default-route." + GlobalConfig->currentProfile->getName(); // default-route. + TQString OldDefaultroute = tmpPath + "default-route." + GlobalConfig->currentProfile->getName(); // default-route. if ( ! pppdHasReplacedefaultrouteSupport && GlobalConfig->currentProfile->getReplaceDefaultRoute() ) { downstream << GlobalConfig->pathToIp << " route add $(cat " << OldDefaultroute << ")" << "\n"; @@ -7237,15 +7237,15 @@ void KVpnc::connectClicked() OldDefaultroute = tmpPath + "default-route." + GlobalConfig->currentProfile->getName(); // default-route. - QFile DefaultRouteBackupFile ( OldDefaultroute + ".sh" ); - QTextStream DefaultRouteBackupFileStream ( &DefaultRouteBackupFile ); + TQFile DefaultRouteBackupFile ( OldDefaultroute + ".sh" ); + TQTextStream DefaultRouteBackupFileStream ( &DefaultRouteBackupFile ); if ( DefaultRouteBackupFile.open ( IO_WriteOnly ) ) { DefaultRouteBackupFileStream << "# generated by kvpnc. Do not edit it." << "\n"; DefaultRouteBackupFileStream << "\n"; DefaultRouteBackupFileStream << GlobalConfig->pathToIp + " route show | grep default > " + OldDefaultroute + "\n"; DefaultRouteBackupFile.close(); - QProcess backupDefaultRouteProcess ( this ); + TQProcess backupDefaultRouteProcess ( this ); backupDefaultRouteProcess.addArgument ( GlobalConfig->InterpreterShell ); backupDefaultRouteProcess.addArgument ( OldDefaultroute + ".sh" ); if ( !backupDefaultRouteProcess.start() ) @@ -7283,8 +7283,8 @@ void KVpnc::connectClicked() delete OpenvpnProcess; OpenvpnProcess = 0L; } - OpenvpnProcess = new QProcess ( this ); - OpenvpnProcess->setCommunication ( QProcess::Stdin|QProcess::Stdout|QProcess::Stderr|QProcess::DupStderr ); + OpenvpnProcess = new TQProcess ( this ); + OpenvpnProcess->setCommunication ( TQProcess::Stdin|TQProcess::Stdout|TQProcess::Stderr|TQProcess::DupStderr ); OpenvpnProcess->addArgument ( GlobalConfig->pathToOpenvpn ); OpenvpnProcess->addArgument ( "--writepid" ); @@ -7292,9 +7292,9 @@ void KVpnc::connectClicked() OpenvpnProcess->addArgument ( "--config" ); OpenvpnProcess->addArgument ( tmpPath + "openvpn." + GlobalConfig->currentProfile->getName() + ".conf" ); // default - connect ( OpenvpnProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readOutput_openvpn() ) ); -// connect( OpenvpnProcess, SIGNAL( readyReadStderr() ), this, SLOT( readOutput_openvpn() ) ); - connect ( OpenvpnProcess, SIGNAL ( processExited() ), this, SLOT ( openvpn_exited() ) ); + connect ( OpenvpnProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readOutput_openvpn() ) ); +// connect( OpenvpnProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readOutput_openvpn() ) ); + connect ( OpenvpnProcess, TQT_SIGNAL ( processExited() ), this, TQT_SLOT ( openvpn_exited() ) ); GlobalConfig->appendLogEntry ( i18n ( "Trying to connect to server \"%1\" with ...\n" ).arg ( GlobalConfig->currentProfile->getGateway() ) ,GlobalConfig->info ); @@ -7330,7 +7330,7 @@ void KVpnc::connectClicked() OpenvpnVersionOk = true; if ( GlobalConfig->KvpncDebugLevel > 2 ) - GlobalConfig->appendLogEntry ( i18n ( "Openvpn Version: %1.%2.%3" ).arg ( QString().setNum ( major ) ).arg ( QString().setNum ( minor ) ).arg ( QString().setNum ( subminor ) ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Openvpn Version: %1.%2.%3" ).arg ( TQString().setNum ( major ) ).arg ( TQString().setNum ( minor ) ).arg ( TQString().setNum ( subminor ) ), GlobalConfig->debug ); // if (OpenvpnVersionOk && ( GlobalConfig->currentProfile->getUseSmartcard() || GlobalConfig->currentProfile->getAuthWithUsernameAndPassword() ) ) @@ -7338,7 +7338,7 @@ void KVpnc::connectClicked() if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "Starting Openvpn management handler..." ), GlobalConfig->debug ); managementhandler = new OpenvpnManagementHandler ( this, GlobalConfig ); - connect ( managementhandler, SIGNAL ( terminate_openvpn() ), this, SLOT ( disconnectClicked() ) ); + connect ( managementhandler, TQT_SIGNAL ( terminate_openvpn() ), this, TQT_SLOT ( disconnectClicked() ) ); if ( managementhandler->doConnect()) { @@ -7352,21 +7352,21 @@ void KVpnc::connectClicked() // if (managementhandler->isConnectedToManagementPort()) // { // if (! GlobalConfig->KvpncDebugLevel > 1 ) - // GlobalConfig->appendLogEntry( i18n( "Connect to %1 management handler was sucessful" ).arg( "openvpn" ) , GlobalConfig->debug ); + // GlobalConfig->appendLogEntry( i18n( "Connect to %1 management handler was sucessful" ).tqarg( "openvpn" ) , GlobalConfig->debug ); // break; // } // if (! GlobalConfig->KvpncDebugLevel > 1 ) - // GlobalConfig->appendLogEntry( i18n( "Trying to connect to %1 management handler..." ).arg( "openvpn" ) , GlobalConfig->debug ); + // GlobalConfig->appendLogEntry( i18n( "Trying to connect to %1 management handler..." ).tqarg( "openvpn" ) , GlobalConfig->debug ); // } // // managementhandler->sendToServer("help"); // // } // if (failManagementHandlerConnectCheckCount >= maxfailManagementHandlerConnectCheckCount) // { - // // KMessageBox::sorry( this, i18n( "Could not connect to %1 management handler!" ).arg( "openvpn" ) ); - // GlobalConfig->appendLogEntry( i18n( "Could not connect to %1 management handler!" ).arg( "openvpn" ) , GlobalConfig->error ); + // // KMessageBox::sorry( this, i18n( "Could not connect to %1 management handler!" ).tqarg( "openvpn" ) ); + // GlobalConfig->appendLogEntry( i18n( "Could not connect to %1 management handler!" ).tqarg( "openvpn" ) , GlobalConfig->error ); // if (OpenvpnProcess != 0) // OpenvpnProcess->kill(); - // setGuiStatus(disconnected); + // setGuitqStatus(disconnected); // return; // } @@ -7385,7 +7385,7 @@ void KVpnc::connectClicked() } // openvpn else { - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return ; } } @@ -7394,7 +7394,7 @@ void KVpnc::connectClicked() /* ============ vtun ================ */ else if ( GlobalConfig->currentProfile != 0 && GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::vtun ) { - //setGuiStatus(connecting); + //setGuitqStatus(connecting); tmpPath = locateLocal ( "data", "kvpnc/" ); // looking for vtund @@ -7403,7 +7403,7 @@ void KVpnc::connectClicked() KMessageBox::error ( this, i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "vtund" ).arg ( GlobalConfig->pathToVtund ) ); GlobalConfig->appendLogEntry ( i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "vtund" ).arg ( GlobalConfig->pathToVtund ), GlobalConfig->error ); ok = false; - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return ; } @@ -7411,12 +7411,12 @@ void KVpnc::connectClicked() GlobalConfig->appendLogEntry ( i18n ( "vtund: %1" ) .arg ( GlobalConfig->pathToVtund ) , GlobalConfig->debug ); bool tunsupportfound = false; - QString procmisc = ""; - QFile f ( "/proc/misc" ); + TQString procmisc = ""; + TQFile f ( "/proc/misc" ); if ( f.open ( IO_ReadOnly ) ) { - QTextStream stream ( &f ); - QString line = ""; + TQTextStream stream ( &f ); + TQString line = ""; while ( !stream.atEnd() ) { line = stream.readLine(); // line of text excluding '\n' @@ -7433,7 +7433,7 @@ void KVpnc::connectClicked() if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "Support for TUN/TAP found (compiled into kernel or kernel module already loaded)." ), GlobalConfig->debug ); - QFile tundevfile ( "/dev/net/tun" ); + TQFile tundevfile ( "/dev/net/tun" ); if ( !tundevfile.exists() ) { if ( !Utils ( GlobalConfig, parent ).createTunDev() ) @@ -7441,7 +7441,7 @@ void KVpnc::connectClicked() KMessageBox::error ( this, i18n ( "Creating of \"%1\" has been failed!" ).arg ( "/dev/net/tun" ) ); GlobalConfig->appendLogEntry ( i18n ( "Tunnel device is missing, creating has been failed: stop." ), GlobalConfig->error ); disconnectClicked(); - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); GlobalConfig->status = GlobalConfig->disconnected; return ; } @@ -7459,7 +7459,7 @@ void KVpnc::connectClicked() KMessageBox::information ( this, i18n ( "Loading of module \"%1\" failed!" ).arg ( "tun" ) ); GlobalConfig->appendLogEntry ( i18n ( "Tunnel device is missing, loading module \"%1\" has failed: stop." ).arg ( "tun" ), GlobalConfig->error ); disconnectClicked(); - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); GlobalConfig->status = GlobalConfig->disconnected; return ; } @@ -7474,13 +7474,13 @@ void KVpnc::connectClicked() // GlobalConfig->TmpGatewayIP = Utils( GlobalConfig, parent ).resolveName(GlobalConfig->currentProfile->getGateway()); // if (GlobalConfig->TmpGatewayIP=="0.0.0.0" || GlobalConfig->TmpGatewayIP.isEmpty()) // { - // KMessageBox::error( this, i18n( "Host \"%1\" could not be resolved!" ).arg(GlobalConfig->currentProfile->getGateway()) ); - // GlobalConfig->appendLogEntry(i18n( "Host \"%1\" could not be resolved!" ).arg(GlobalConfig->currentProfile->getGateway()),GlobalConfig->error); + // KMessageBox::error( this, i18n( "Host \"%1\" could not be resolved!" ).tqarg(GlobalConfig->currentProfile->getGateway()) ); + // GlobalConfig->appendLogEntry(i18n( "Host \"%1\" could not be resolved!" ).tqarg(GlobalConfig->currentProfile->getGateway()),GlobalConfig->error); // ok =false; // } // else // { - // GlobalConfig->appendLogEntry( i18n( "Gateway hostname (%1) resolved to \"%2\"." ).arg(GlobalConfig->currentProfile->getGateway()).arg(GlobalConfig->TmpGatewayIP), GlobalConfig->info ); + // GlobalConfig->appendLogEntry( i18n( "Gateway hostname (%1) resolved to \"%2\"." ).tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(GlobalConfig->TmpGatewayIP), GlobalConfig->info ); // } bool askUsernamePass = false; @@ -7622,8 +7622,8 @@ void KVpnc::connectClicked() executeCommandBeforeConnect(); // write vtun..conf - QFile vtun_file ( tmpPath + "vtun." + GlobalConfig->currentProfile->getName() + ".conf" ); - QTextStream vtun_stream ( &vtun_file ); + TQFile vtun_file ( tmpPath + "vtun." + GlobalConfig->currentProfile->getName() + ".conf" ); + TQTextStream vtun_stream ( &vtun_file ); if ( vtun_file.open ( IO_WriteOnly ) ) { vtun_stream << "# generated by kvpnc. Do not edit it." << "\n"; @@ -7677,8 +7677,8 @@ void KVpnc::connectClicked() } vtun_file.close(); - VtundProcess = new QProcess ( this ); -// VtundProcess->setCommunication ( QProcess::Stdin|QProcess::Stdout|QProcess::Stderr|QProcess::DupStderr ); + VtundProcess = new TQProcess ( this ); +// VtundProcess->setCommunication ( TQProcess::Stdin|TQProcess::Stdout|TQProcess::Stderr|TQProcess::DupStderr ); VtundProcess->addArgument ( GlobalConfig->pathToVtund ); VtundProcess->addArgument ( "-n" ); VtundProcess->addArgument ( "-f" ); @@ -7687,9 +7687,9 @@ void KVpnc::connectClicked() VtundProcess->addArgument ( GlobalConfig->currentProfile->getGateway() ); - connect ( VtundProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_vtun() ) ); - connect ( VtundProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_vtun() ) ); - connect ( VtundProcess, SIGNAL ( processExited() ), this, SLOT ( vtun_exited() ) ); + connect ( VtundProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_vtun() ) ); + connect ( VtundProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_vtun() ) ); + connect ( VtundProcess, TQT_SIGNAL ( processExited() ), this, TQT_SLOT ( vtun_exited() ) ); GlobalConfig->appendLogEntry ( i18n ( "Trying to connect to server \"%1\" with ...\n" ).arg ( GlobalConfig->currentProfile->getGateway() ) ,GlobalConfig->info ); @@ -7718,14 +7718,14 @@ void KVpnc::connectClicked() } else { - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return ; } } /* ============ ssh ================ */ else if ( GlobalConfig->currentProfile != 0 && GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ssh ) { - //setGuiStatus(connecting); + //setGuitqStatus(connecting); tmpPath = locateLocal ( "data", "kvpnc/" ); // looking for ssh @@ -7734,7 +7734,7 @@ void KVpnc::connectClicked() KMessageBox::error ( this, i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "ssh" ).arg ( GlobalConfig->pathToSsh ) ); GlobalConfig->appendLogEntry ( i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "ssh" ).arg ( GlobalConfig->pathToSsh ), GlobalConfig->error ); ok = false; - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return ; } @@ -7742,12 +7742,12 @@ void KVpnc::connectClicked() GlobalConfig->appendLogEntry ( i18n ( "ssh: %1" ) .arg ( GlobalConfig->pathToSsh ) , GlobalConfig->debug ); bool tunsupportfound = false; - QString procmisc = ""; - QFile f ( "/proc/misc" ); + TQString procmisc = ""; + TQFile f ( "/proc/misc" ); if ( f.open ( IO_ReadOnly ) ) { - QTextStream stream ( &f ); - QString line = ""; + TQTextStream stream ( &f ); + TQString line = ""; while ( !stream.atEnd() ) { line = stream.readLine(); // line of text excluding '\n' @@ -7764,7 +7764,7 @@ void KVpnc::connectClicked() if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "Support for TUN/TAP found (compiled into kernel or kernel module already loaded)." ), GlobalConfig->debug ); - QFile tundevfile ( "/dev/net/tun" ); + TQFile tundevfile ( "/dev/net/tun" ); if ( !tundevfile.exists() ) { if ( !Utils ( GlobalConfig, parent ).createTunDev() ) @@ -7772,7 +7772,7 @@ void KVpnc::connectClicked() KMessageBox::error ( this, i18n ( "Creating of \"%1\" has been failed!" ).arg ( "/dev/net/tun" ) ); GlobalConfig->appendLogEntry ( i18n ( "Tunnel device is missing, creating has been failed: stop." ), GlobalConfig->error ); disconnectClicked(); - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); GlobalConfig->status = GlobalConfig->disconnected; return ; } @@ -7790,7 +7790,7 @@ void KVpnc::connectClicked() KMessageBox::information ( this, i18n ( "Loading of module \"%1\" failed!" ).arg ( "tun" ) ); GlobalConfig->appendLogEntry ( i18n ( "Tunnel device is missing, loading module \"%1\" has failed: stop." ).arg ( "tun" ), GlobalConfig->error ); disconnectClicked(); - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); GlobalConfig->status = GlobalConfig->disconnected; return ; } @@ -7977,13 +7977,13 @@ void KVpnc::connectClicked() *SshProcess << GlobalConfig->pathToSsh ; // SshProcess->setExecutable(GlobalConfig->pathToSsh); /* - connect(m_process, SIGNAL(processExited(KProcess*)), - this, SLOT(slotProcessExited(KProcess*)));*/ + connect(m_process, TQT_SIGNAL(processExited(KProcess*)), + this, TQT_SLOT(slotProcessExited(KProcess*)));*/ -// QString AskPassScript= tmpPath+"ssh."+GlobalConfig->currentProfile->getName()+".askpass.sh"; +// TQString AskPassScript= tmpPath+"ssh."+GlobalConfig->currentProfile->getName()+".askpass.sh"; // -// QFile askpassfile (AskPassScript ); -// QTextStream stream ( &askpassfile ); +// TQFile askpassfile (AskPassScript ); +// TQTextStream stream ( &askpassfile ); // if ( askpassfile.open ( IO_WriteOnly ) ) // { // stream << "#!"<< GlobalConfig->InterpreterShell << "\n"; @@ -7998,7 +7998,7 @@ void KVpnc::connectClicked() // else // { // GlobalConfig->appendLogEntry ( i18n ( "\"%1\" write failed!" ).arg ( askpassfile.name() ), GlobalConfig->error ); -// setGuiStatus ( disconnected ); +// setGuitqStatus ( disconnected ); // return; // } // @@ -8023,7 +8023,7 @@ void KVpnc::connectClicked() if ( GlobalConfig->SshDebugLevel > 0 ) { - QString SshDebug="-"; + TQString SshDebug="-"; for ( int i=0;iSshDebugLevel;i++ ) SshDebug+="v"; *SshProcess << SshDebug; @@ -8074,7 +8074,7 @@ void KVpnc::connectClicked() if ( GlobalConfig->currentProfile->getUseRemotePort() ) { *SshProcess << "-p" ; - *SshProcess << QString().setNum ( GlobalConfig->currentProfile->getRemotePort() ); + *SshProcess << TQString().setNum ( GlobalConfig->currentProfile->getRemotePort() ); } *SshProcess << GlobalConfig->TmpGatewayIP ; @@ -8132,21 +8132,21 @@ void KVpnc::connectClicked() if ( GlobalConfig->KvpncDebugLevel > 3 ) { - QString args = ""; - QValueList list = SshProcess->args(); - QValueList::Iterator it = list.begin(); + TQString args = ""; + TQValueList list = SshProcess->args(); + TQValueList::Iterator it = list.begin(); while ( it != list.end() ) { - args += QString ( " " + *it ) ; + args += TQString ( " " + *it ) ; ++it; } GlobalConfig->appendLogEntry ( i18n ( "%1 arguments: %1" ).arg ( "ssh" ).arg ( args ), GlobalConfig->debug ); } - connect ( SshProcess, SIGNAL ( receivedStdout ( KProcess *, char *, int ) ), this, SLOT ( readFromStdout_ssh ( KProcess *, char *, int ) ) ); - connect ( SshProcess, SIGNAL ( receivedStderr ( KProcess *, char *, int ) ), this, SLOT ( readFromStderr_ssh ( KProcess *, char *, int ) ) ); -// connect( SshProcess, SIGNAL( processExited() ), this, SLOT( sshExited() ) ); + connect ( SshProcess, TQT_SIGNAL ( receivedStdout ( KProcess *, char *, int ) ), this, TQT_SLOT ( readFromStdout_ssh ( KProcess *, char *, int ) ) ); + connect ( SshProcess, TQT_SIGNAL ( receivedStderr ( KProcess *, char *, int ) ), this, TQT_SLOT ( readFromStderr_ssh ( KProcess *, char *, int ) ) ); +// connect( SshProcess, TQT_SIGNAL( processExited() ), this, TQT_SLOT( sshExited() ) ); GlobalConfig->appendLogEntry ( i18n ( "Trying to connect to server \"%1\" with ...\n" ).arg ( GlobalConfig->currentProfile->getGateway() ) ,GlobalConfig->info ); slotStatusMsg ( i18n ( "Connecting..." ), ID_CONNECTION_MSG ); @@ -8200,13 +8200,13 @@ void KVpnc::connectClicked() GlobalConfig->currentConnectRetry++; - SshProcess->writeStdin ( QString ( GlobalConfig->TmpPassword+'\n' ).ascii(),GlobalConfig->TmpPassword.length() +1 ); + SshProcess->writeStdin ( TQString ( GlobalConfig->TmpPassword+'\n' ).ascii(),GlobalConfig->TmpPassword.length() +1 ); } } else { - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return ; } } @@ -8226,15 +8226,15 @@ void KVpnc::disconnectClicked() prevConnectionState = connected; if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "Disconnect requested, status connected" ), GlobalConfig->debug ); - QString type_string = ""; + TQString type_string = ""; bool ok = true; // if ok we will run process if ( ConnectionStatusCheckProcess != 0 ) { if ( ConnectionStatusCheckProcess->isRunning() ) { - disconnect ( ConnectionStatusCheckProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_connectionStatusCheck() ) ); - disconnect ( ConnectionStatusCheckProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_connectionStatusCheck() ) ); + disconnect ( ConnectionStatusCheckProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_connectionStatusCheck() ) ); + disconnect ( ConnectionStatusCheckProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_connectionStatusCheck() ) ); ConnectionStatusCheckProcess->kill(); @@ -8259,11 +8259,11 @@ void KVpnc::disconnectClicked() //Vpnc_pid_file = tmpPath + "vpnc-pid." + GlobalConfig->currentProfile->getID() + ".pid"; // vpnc-pid..pid VpncDisconnectScript = tmpPath + "vpnc-disconnect." + GlobalConfig->currentProfile->getID() + ".sh"; // write vpnc connect script - QFile pidFile ( GlobalConfig->Vpnc_pid_file ); - QString Vpnc_pid = ""; + TQFile pidFile ( GlobalConfig->Vpnc_pid_file ); + TQString Vpnc_pid = ""; if ( pidFile.open ( IO_ReadOnly ) ) { - Vpnc_pid = QString ( pidFile.readAll() ).stripWhiteSpace(); + Vpnc_pid = TQString ( pidFile.readAll() ).stripWhiteSpace(); } @@ -8271,9 +8271,9 @@ void KVpnc::disconnectClicked() { if ( VpncProcess->isRunning() ) { - disconnect ( VpncProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readOutputFrom_vpnc() ) ); - disconnect ( VpncProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readOutputFrom_vpnc() ) ); - disconnect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) ); + disconnect ( VpncProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readOutputFrom_vpnc() ) ); + disconnect ( VpncProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readOutputFrom_vpnc() ) ); + disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); VpncProcess->kill(); sleep ( 1 ); @@ -8290,8 +8290,8 @@ void KVpnc::disconnectClicked() VpncProcess = 0L; } - QFile file ( VpncDisconnectScript ); - QTextStream stream ( &file ); + TQFile file ( VpncDisconnectScript ); + TQTextStream stream ( &file ); if ( file.open ( IO_WriteOnly ) ) { stream << "#!"<< GlobalConfig->InterpreterShell << "\n"; @@ -8312,7 +8312,7 @@ void KVpnc::disconnectClicked() stream << GlobalConfig->pathToKill << " -KILL " << Vpnc_pid << " > /dev/null 2>&1\n"; stream << GlobalConfig->pathToKill << " -KILL " << Vpnc_pid << " > /dev/null 2>&1\n"; stream << GlobalConfig->pathToKill << " -KILL " << Vpnc_pid << " > /dev/null 2>&1\n"; - QFile ( GlobalConfig->Vpnc_pid_file ).remove(); + TQFile ( GlobalConfig->Vpnc_pid_file ).remove(); } // else // { @@ -8348,7 +8348,7 @@ void KVpnc::disconnectClicked() if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "Restoring default route before connection..." ), GlobalConfig->debug ); - QString OldDefaultroute = tmpPath + "default-route." + GlobalConfig->currentProfile->getName(); // default-route. + TQString OldDefaultroute = tmpPath + "default-route." + GlobalConfig->currentProfile->getName(); // default-route. stream << GlobalConfig->pathToIp + " route del default > /dev/null 2>&1\n"; stream << GlobalConfig->pathToIp + " route add $(cat \"" + OldDefaultroute + "\")\n"; // stream << GlobalConfig->pathToIp + " route add $(cat \"/var/run/vpnc/defaultroute\")\n"; @@ -8362,12 +8362,12 @@ void KVpnc::disconnectClicked() file.close(); - DisconnectProcess = new QProcess (); + DisconnectProcess = new TQProcess (); DisconnectProcess->addArgument ( GlobalConfig->InterpreterShell ); DisconnectProcess->addArgument ( VpncDisconnectScript ); - connect ( DisconnectProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_disconnect() ) ); - connect ( DisconnectProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_disconnect() ) ); + connect ( DisconnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_disconnect() ) ); + connect ( DisconnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_disconnect() ) ); if ( !DisconnectProcess->start ( env ) ) { @@ -8380,26 +8380,26 @@ void KVpnc::disconnectClicked() sleep ( 1 ); } } - disconnect ( DisconnectProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_disconnect() ) ); - disconnect ( DisconnectProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_disconnect() ) ); + disconnect ( DisconnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_disconnect() ) ); + disconnect ( DisconnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_disconnect() ) ); delete DisconnectProcess; DisconnectProcess=0L; } - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); durationTimer.stop(); - disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); connectionEnded(); } // vpnclient else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ciscoorig ) { tmpPath = locateLocal ( "data", "kvpnc/" ); - QString CiscoVpncDisconnectScript = tmpPath + "vpnclient-disconnect." + GlobalConfig->currentProfile->getID() + ".sh"; + TQString CiscoVpncDisconnectScript = tmpPath + "vpnclient-disconnect." + GlobalConfig->currentProfile->getID() + ".sh"; // write vpnc connect script - QFile file ( CiscoVpncDisconnectScript ); - QTextStream stream ( &file ); + TQFile file ( CiscoVpncDisconnectScript ); + TQTextStream stream ( &file ); if ( file.open ( IO_WriteOnly ) ) { stream << "#!"<< GlobalConfig->InterpreterShell << "\n"; @@ -8412,7 +8412,7 @@ void KVpnc::disconnectClicked() // if ( GlobalConfig->KvpncDebugLevel > 2 ) // GlobalConfig->appendLogEntry ( i18n ( "Restoring default route before connection..." ), GlobalConfig->debug ); // -// QString OldDefaultroute = tmpPath + "default-route." + GlobalConfig->currentProfile->getName(); // default-route. +// TQString OldDefaultroute = tmpPath + "default-route." + GlobalConfig->currentProfile->getName(); // default-route. // stream << GlobalConfig->pathToIp + " route del default > /dev/null 2>&1\n"; // stream << GlobalConfig->pathToIp + " route add $(cat \"" + OldDefaultroute + "\")\n"; // // stream << GlobalConfig->pathToIp + " route add $(cat \"/var/run/vpnc/defaultroute\")\n"; @@ -8439,12 +8439,12 @@ void KVpnc::disconnectClicked() } file.close(); - DisconnectProcess = new QProcess (); + DisconnectProcess = new TQProcess (); DisconnectProcess->addArgument ( GlobalConfig->InterpreterShell ); DisconnectProcess->addArgument ( CiscoVpncDisconnectScript ); - connect ( DisconnectProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_disconnect() ) ); - connect ( DisconnectProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_disconnect() ) ); + connect ( DisconnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_disconnect() ) ); + connect ( DisconnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_disconnect() ) ); if ( !DisconnectProcess->start ( env ) ) { @@ -8457,12 +8457,12 @@ void KVpnc::disconnectClicked() sleep ( 1 ); } } - disconnect ( DisconnectProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_disconnect() ) ); - disconnect ( DisconnectProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_disconnect() ) ); + disconnect ( DisconnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_disconnect() ) ); + disconnect ( DisconnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_disconnect() ) ); delete DisconnectProcess; DisconnectProcess=0L; - disconnect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) ); + disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); if ( CiscoVpncProcess != 0 && CiscoVpncProcess->isRunning() ) @@ -8474,8 +8474,8 @@ void KVpnc::disconnectClicked() delete CiscoVpncProcess; CiscoVpncProcess=0L; - setGuiStatus ( disconnected ); - disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) ); + setGuitqStatus ( disconnected ); + disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); connectionEnded(); } // racoon @@ -8484,7 +8484,7 @@ void KVpnc::disconnectClicked() // // looking for setkey // if ( GlobalConfig->pathToSetkey.isEmpty() ) { - // QFile setkey( "/usr/sbin/setkey" ); + // TQFile setkey( "/usr/sbin/setkey" ); // if ( setkey.exists() ) // GlobalConfig->pathToSetkey = "/usr/sbin/setkey"; // else { @@ -8496,7 +8496,7 @@ void KVpnc::disconnectClicked() // if ( setkey.exists() ) // GlobalConfig->pathToSetkey = "/usr/bin/setkey"; // else { - // KMessageBox::error( this, i18n( "Unable to find \"%1\"!" ).arg("setkey") ); + // KMessageBox::error( this, i18n( "Unable to find \"%1\"!" ).tqarg("setkey") ); // ok = false; // } // } @@ -8505,8 +8505,8 @@ void KVpnc::disconnectClicked() - QFile file2 ( tmpPath + "setkey." + GlobalConfig->currentProfile->getName() + ".remove_setkey.sh" ); - QTextStream stream2 ( &file2 ); + TQFile file2 ( tmpPath + "setkey." + GlobalConfig->currentProfile->getName() + ".remove_setkey.sh" ); + TQTextStream stream2 ( &file2 ); if ( file2.open ( IO_WriteOnly ) ) { stream2 << "#!"<< GlobalConfig->InterpreterShell << "\n"; @@ -8520,18 +8520,18 @@ void KVpnc::disconnectClicked() } else { - // KMessageBox::error( this, i18n( "\"%1\" write failed!" ).arg( "setkey (remove)" ) ); + // KMessageBox::error( this, i18n( "\"%1\" write failed!" ).tqarg( "setkey (remove)" ) ); GlobalConfig->appendLogEntry ( i18n ( "\"%1\" write failed!" ).arg ( "setkey (remove)" ) , GlobalConfig->error ); } if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_racoon ) { -// if (QFile("/var/run/l2tpd.pid").exists()) +// if (TQFile("/var/run/l2tpd.pid").exists()) // { // if (GlobalConfig->KvpncDebugLevel > 1) // GlobalConfig->appendLogEntry(i18n("Using control interface for disconnecting l2tp connection"),GlobalConfig->debug); -// QFile L2tpdControlFile ( "/var/run/l2tp-control" ); -// QTextStream stream( &L2tpdControlFile ); +// TQFile L2tpdControlFile ( "/var/run/l2tp-control" ); +// TQTextStream stream( &L2tpdControlFile ); // if ( L2tpdControlFile.open( IO_WriteOnly ) ) { // stream << "d " << GlobalConfig->currentProfile->getName() << "\n"; // L2tpdControlFile.close(); @@ -8544,8 +8544,8 @@ void KVpnc::disconnectClicked() if ( L2tpdProcess != 0L && L2tpdProcess->isRunning() ) { - disconnect ( this, SIGNAL ( L2tpdStdoutRecieved() ), this, SLOT ( processStdout_l2tpd() ) ); - disconnect ( this, SIGNAL ( L2tpdStderrRecieved() ), this, SLOT ( processStderr_l2tpd() ) ); + disconnect ( this, TQT_SIGNAL ( L2tpdStdoutRecieved() ), this, TQT_SLOT ( processStdout_l2tpd() ) ); + disconnect ( this, TQT_SIGNAL ( L2tpdStderrRecieved() ), this, TQT_SLOT ( processStderr_l2tpd() ) ); L2tpdProcess->kill(); if ( L2tpdProcess->isRunning() ) @@ -8560,8 +8560,8 @@ void KVpnc::disconnectClicked() if ( OpenL2tpProcess != 0L && OpenL2tpProcess->isRunning() ) { - disconnect ( OpenL2tpProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_openl2tp() ) ); - disconnect ( OpenL2tpProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_openl2tp() ) ); + disconnect ( OpenL2tpProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_openl2tp() ) ); + disconnect ( OpenL2tpProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_openl2tp() ) ); OpenL2tpProcess->tryTerminate(); sleep ( 1 ); @@ -8571,8 +8571,8 @@ void KVpnc::disconnectClicked() if ( OpenL2tpProcess != 0L && OpenL2tpProcess->isRunning() ) OpenL2tpProcess->kill(); - if ( QFile ( "/var/run/openl2tpd.pid" ).exists() ) - QFile ( "/var/run/openl2tpd.pid" ).remove(); + if ( TQFile ( "/var/run/openl2tpd.pid" ).exists() ) + TQFile ( "/var/run/openl2tpd.pid" ).remove(); if ( !Utils ( GlobalConfig, parent ).unloadKernelModule ( "slhc", parent ) ) { @@ -8635,8 +8635,8 @@ void KVpnc::disconnectClicked() if ( RacoonTailProcess != 0 && RacoonTailProcess->isRunning() ) { - disconnect ( RacoonTailProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_tail_racoon() ) ); - disconnect ( RacoonTailProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_tail_racoon() ) ); + disconnect ( RacoonTailProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_tail_racoon() ) ); + disconnect ( RacoonTailProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_tail_racoon() ) ); // terminateConnection( RacoonTailProcess ); if ( GlobalConfig->KvpncDebugLevel > 2 ) @@ -8658,8 +8658,8 @@ void KVpnc::disconnectClicked() if ( RacoonProcess != 0 && RacoonProcess->isRunning() ) { - disconnect ( RacoonProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_racoon() ) ); - disconnect ( RacoonProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_racoon() ) ); + disconnect ( RacoonProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_racoon() ) ); + disconnect ( RacoonProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_racoon() ) ); // terminateConnection( RacoonProcess ); if ( GlobalConfig->KvpncDebugLevel > 2 ) @@ -8688,14 +8688,14 @@ void KVpnc::disconnectClicked() if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_racoon && ( GlobalConfig->currentProfile->getL2tpDaemon() == "l2tpd" || GlobalConfig->currentProfile->getL2tpDaemon() == "l2tpd" ) ) { // remove kvpnc entries from secrets file - QFile papSecretsFile ( "/etc/ppp/pap-secrets" ); + TQFile papSecretsFile ( "/etc/ppp/pap-secrets" ); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1" ).arg ( "/etc/ppp/chap-secrets" ), GlobalConfig->debug ); - QTextStream stream ( &papSecretsFile ); + TQTextStream stream ( &papSecretsFile ); if ( papSecretsFile.open ( IO_ReadOnly ) ) { - QString line = ""; - QString papsecret_content = ""; + TQString line = ""; + TQString papsecret_content = ""; bool kvpnc_start_marker_found = false; bool kvpnc_end_marker_found = false; while ( !stream.atEnd() ) @@ -8753,8 +8753,8 @@ void KVpnc::disconnectClicked() } } - setGuiStatus ( disconnected ); - disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) ); + setGuitqStatus ( disconnected ); + disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); durationTimer.stop(); connectionEnded(); @@ -8763,16 +8763,16 @@ void KVpnc::disconnectClicked() // DisconnectProcess->addArgument( "-3" ); // DisconnectProcess->addArgument( "racoon" ); // - // connect( DisconnectProcess, SIGNAL( readyReadStdout() ), this, SLOT( readFromStdout_racoon() ) ); - // connect( DisconnectProcess, SIGNAL( readyReadStderr() ), this, SLOT( readFromStderr_racoon() ) ); - // connect( DisconnectProcess, SIGNAL( processExited () ), this, SLOT( removeSetkey() ) ); + // connect( DisconnectProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_racoon() ) ); + // connect( DisconnectProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_racoon() ) ); + // connect( DisconnectProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT( removeSetkey() ) ); // // if ( !DisconnectProcess->start(env) ) - // KMessageBox::error( this, i18n( "\"%1\" start failed!" ).arg("killall -3 racoon") ); + // KMessageBox::error( this, i18n( "\"%1\" start failed!" ).tqarg("killall -3 racoon") ); // else { // RacoonTailProcess->tryTerminate(); // if ( GlobalConfig->KvpncDebugLevel > 0 ) - // GlobalConfig->appendLogEntry( i18n( "\"%1\" was successful." ).arg("killall -3 racoon"), GlobalConfig->debug ); + // GlobalConfig->appendLogEntry( i18n( "\"%1\" was successful." ).tqarg("killall -3 racoon"), GlobalConfig->debug ); // } // } @@ -8781,7 +8781,7 @@ void KVpnc::disconnectClicked() else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan || GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_freeswan ) { // iptables need the right interface (eth0:1 => eth0) - QString tmpInterface2 = ""; + TQString tmpInterface2 = ""; int pointPos = tmpInterface.find ( ':', 0, FALSE ); if ( pointPos > 1 ) { @@ -8792,12 +8792,12 @@ void KVpnc::disconnectClicked() if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_freeswan ) { -// if (QFile("/var/run/l2tpd.pid").exists()) +// if (TQFile("/var/run/l2tpd.pid").exists()) // { // if (GlobalConfig->KvpncDebugLevel > 1) // GlobalConfig->appendLogEntry(i18n("Using control interface for disconnecting l2tp connection"),GlobalConfig->debug); -// QFile L2tpdControlFile ( "/var/run/l2tp-control" ); -// QTextStream stream( &L2tpdControlFile ); +// TQFile L2tpdControlFile ( "/var/run/l2tp-control" ); +// TQTextStream stream( &L2tpdControlFile ); // if ( L2tpdControlFile.open( IO_WriteOnly ) ) { // stream << "d " << GlobalConfig->currentProfile->getName() << "\n"; // L2tpdControlFile.close(); @@ -8822,8 +8822,8 @@ void KVpnc::disconnectClicked() { if ( OpenL2tpProcess != 0L && OpenL2tpProcess->isRunning() ) { - disconnect ( OpenL2tpProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_openl2tp() ) ); - disconnect ( OpenL2tpProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_openl2tp() ) ); + disconnect ( OpenL2tpProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_openl2tp() ) ); + disconnect ( OpenL2tpProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_openl2tp() ) ); //OpenL2tpProcess->tryTerminate(); sleep ( 1 ); //if (OpenL2tpProcess->isRunning()) @@ -8832,8 +8832,8 @@ void KVpnc::disconnectClicked() if ( OpenL2tpProcess != 0L && OpenL2tpProcess->isRunning() ) OpenL2tpProcess->kill(); - if ( QFile ( "/var/run/openl2tpd.pid" ).exists() ) - QFile ( "/var/run/openl2tpd.pid" ).remove(); + if ( TQFile ( "/var/run/openl2tpd.pid" ).exists() ) + TQFile ( "/var/run/openl2tpd.pid" ).remove(); if ( !Utils ( GlobalConfig, parent ).unloadKernelModule ( "slhc", parent ) ) { @@ -8895,22 +8895,22 @@ void KVpnc::disconnectClicked() ToolInfo *tool = Utils ( GlobalConfig ).getToolInfo ( "ipsec" ); - QString realversion = tool->Version.section ( ' ', 1, 1 ).section ( '/', 0, 0 ).right ( tool->Version.section ( ' ', 1, 1 ).section ( '/', 0, 0 ).length() - 1 ); + TQString realversion = tool->Version.section ( ' ', 1, 1 ).section ( '/', 0, 0 ).right ( tool->Version.section ( ' ', 1, 1 ).section ( '/', 0, 0 ).length() - 1 ); int IpsecMajor= realversion.section ( '.',0,0 ).toInt(); int IpsecMinor= realversion.section ( '.',1,1 ).toInt(); int IpsecSubMinor= realversion.section ( '.',2,2 ).toInt(); - QString realtype = tool->Version.section ( ' ', 0, 0 ).lower(); + TQString realtype = tool->Version.section ( ' ', 0, 0 ).lower(); putenv ( ( char* ) ( "LC_ALL=C" ) ); - IpsecWhackDeleteProcess = new QProcess ( this ); + IpsecWhackDeleteProcess = new TQProcess ( this ); IpsecWhackDeleteProcess->addArgument ( GlobalConfig->pathToIpsec ); IpsecWhackDeleteProcess->addArgument ( "whack" ); IpsecWhackDeleteProcess->addArgument ( "--name" ); IpsecWhackDeleteProcess->addArgument ( GlobalConfig->currentProfile->getName() ); IpsecWhackDeleteProcess->addArgument ( "--delete" ); - connect ( IpsecWhackDeleteProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsecwhackdelete() ) ); - connect ( IpsecWhackDeleteProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsecwhackdelete() ) ); + connect ( IpsecWhackDeleteProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhackdelete() ) ); + connect ( IpsecWhackDeleteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhackdelete() ) ); if ( !IpsecWhackDeleteProcess->start ( env ) ) { @@ -8932,8 +8932,8 @@ void KVpnc::disconnectClicked() usleep ( 500 ); } } - disconnect ( IpsecWhackDeleteProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsecwhackdelete() ) ); - disconnect ( IpsecWhackDeleteProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsecwhackdelete() ) ); + disconnect ( IpsecWhackDeleteProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhackdelete() ) ); + disconnect ( IpsecWhackDeleteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhackdelete() ) ); delete IpsecWhackDeleteProcess; IpsecWhackDeleteProcess=0L; @@ -8941,7 +8941,7 @@ void KVpnc::disconnectClicked() IpsecGotError = true; -// IpsecStartProcess = new QProcess ( this ); +// IpsecStartProcess = new TQProcess ( this ); // IpsecStartProcess->addArgument ( GlobalConfig->pathToIpsec ); // if ( !IpsecType.contains ( "Openswan", false ) ) // { @@ -8955,9 +8955,9 @@ void KVpnc::disconnectClicked() // IpsecStartProcess->addArgument ( "stop" ); // } // -// connect ( IpsecStartProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStderr_ipsec() ) ); -// connect ( IpsecStartProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsec() ) ); -// // connect( IpsecStartProcess, SIGNAL( processExited () ), this, SLOT( removeRouteFreeswan() ) ); +// connect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStderr_ipsec() ) ); +// connect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsec() ) ); +// // connect( IpsecStartProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT( removeRouteFreeswan() ) ); // // if ( !IpsecStartProcess->start ( env ) ) // { @@ -8993,9 +8993,9 @@ void KVpnc::disconnectClicked() // } // // } -// disconnect ( IpsecStartProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStderr_ipsec() ) ); -// disconnect ( IpsecStartProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsec() ) ); -// //disconnect( IpsecStartProcess, SIGNAL( processExited () ), this, SLOT( removeRouteFreeswan() ) ); +// disconnect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStderr_ipsec() ) ); +// disconnect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsec() ) ); +// //disconnect( IpsecStartProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT( removeRouteFreeswan() ) ); // delete IpsecStartProcess; // IpsecStartProcess=0L; @@ -9004,8 +9004,8 @@ void KVpnc::disconnectClicked() delRouteIpsec(); removeIptablesFreeswan(); - disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) ); - setGuiStatus ( disconnected ); + disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); + setGuitqStatus ( disconnected ); durationTimer.stop(); GlobalConfig->currentConnectRetry=0; connectionEnded(); @@ -9014,22 +9014,22 @@ void KVpnc::disconnectClicked() GlobalConfig->appendLogEntry ( i18n ( "Restoring original ipsec settings" ), KVpncConfig::debug ); // restore system files - QString IpsecPrefix = "/etc"; + TQString IpsecPrefix = "/etc"; // ipsec.conf - QFile originalIpsecConfFile ( "/etc/ipsec.conf.before.kvpnc" ); - QTextStream stream ( &originalIpsecConfFile ); - QString originalIpsecConfFileContent = ""; + TQFile originalIpsecConfFile ( "/etc/ipsec.conf.before.kvpnc" ); + TQTextStream stream ( &originalIpsecConfFile ); + TQString originalIpsecConfFileContent = ""; if ( originalIpsecConfFile.exists() ) { if ( originalIpsecConfFile.open ( IO_ReadOnly ) ) { - originalIpsecConfFileContent = QString ( originalIpsecConfFile.readAll() ); + originalIpsecConfFileContent = TQString ( originalIpsecConfFile.readAll() ); originalIpsecConfFile.close(); } } - QFile backupOriginalIpsecConfFile ( "/etc/ipsec.conf" ); + TQFile backupOriginalIpsecConfFile ( "/etc/ipsec.conf" ); stream.setDevice ( &backupOriginalIpsecConfFile ); if ( backupOriginalIpsecConfFile.open ( IO_WriteOnly ) ) { @@ -9039,19 +9039,19 @@ void KVpnc::disconnectClicked() stream.unsetDevice(); //if ( GlobalConfig->KvpncDebugLevel > 0 ) - // GlobalConfig->appendLogEntry( i18n( "%1 found in %2, assuming %3 as prefix for %4." ).arg( "ipsec.conf.before.kvpnc" ).arg( IpsecPrefix ).arg( IpsecPrefix ).arg( IpsecType ), GlobalConfig->debug ); + // GlobalConfig->appendLogEntry( i18n( "%1 found in %2, assuming %3 as prefix for %4." ).tqarg( "ipsec.conf.before.kvpnc" ).tqarg( IpsecPrefix ).tqarg( IpsecPrefix ).tqarg( IpsecType ), GlobalConfig->debug ); // ipsec.secret - QFile originalIpsecSecretFile ( "/etc/ipsec.secrets.before.kvpnc" ); + TQFile originalIpsecSecretFile ( "/etc/ipsec.secrets.before.kvpnc" ); stream.setDevice ( &originalIpsecSecretFile ); - QString originalIpsecSecretFileContent = ""; + TQString originalIpsecSecretFileContent = ""; if ( originalIpsecSecretFile.open ( IO_ReadOnly ) ) { - originalIpsecSecretFileContent = QString ( originalIpsecSecretFile.readAll() ); + originalIpsecSecretFileContent = TQString ( originalIpsecSecretFile.readAll() ); originalIpsecSecretFile.close(); } - QFile backupOriginalIpsecSecretFile ( "/etc/ipsec.secrets" ); + TQFile backupOriginalIpsecSecretFile ( "/etc/ipsec.secrets" ); stream.setDevice ( &backupOriginalIpsecSecretFile ); if ( backupOriginalIpsecSecretFile.open ( IO_WriteOnly ) ) { @@ -9064,14 +9064,14 @@ void KVpnc::disconnectClicked() if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_freeswan ) { // remove kvpnc entries from secrets file - QFile papSecretsFile ( "/etc/ppp/pap-secrets" ); + TQFile papSecretsFile ( "/etc/ppp/pap-secrets" ); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1" ).arg ( "/etc/ppp/chap-secrets" ), GlobalConfig->debug ); - QTextStream stream ( &papSecretsFile ); + TQTextStream stream ( &papSecretsFile ); if ( papSecretsFile.open ( IO_ReadOnly ) ) { - QString line = ""; - QString papsecret_content = ""; + TQString line = ""; + TQString papsecret_content = ""; bool kvpnc_start_marker_found = false; bool kvpnc_end_marker_found = false; while ( !stream.atEnd() ) @@ -9140,12 +9140,12 @@ void KVpnc::disconnectClicked() if (PptpProcess != 0L) { - disconnect ( PptpProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_pptp() ) ); - disconnect ( PptpProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_pptp() ) ); + disconnect ( PptpProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_pptp() ) ); + disconnect ( PptpProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_pptp() ) ); OldDefaultroute = tmpPath + "default-route." + GlobalConfig->currentProfile->getName(); // default-route. ToolInfo *PptpInfo = Utils ( GlobalConfig ).getToolInfo ( "pptp" ); - QString pptpversion = PptpInfo->Version.section ( ' ', 1, 1 ).section ( '/', 0, 0 ).right ( PptpInfo->Version.section ( ' ', 1, 1 ).section ( '/', 0, 0 ).length() - 1 ); + TQString pptpversion = PptpInfo->Version.section ( ' ', 1, 1 ).section ( '/', 0, 0 ).right ( PptpInfo->Version.section ( ' ', 1, 1 ).section ( '/', 0, 0 ).length() - 1 ); int PptpMajor= pptpversion.section ( '.',0,0 ).toInt(); int PptpMinor= pptpversion.section ( '.',1,1 ).toInt(); int PptpSubMinor= pptpversion.section ( '.',2,2 ).toInt(); @@ -9154,7 +9154,7 @@ void KVpnc::disconnectClicked() PptpProcess->kill(); -// QProcess *pptpdKillProcess = new QProcess ( this ); +// TQProcess *pptpdKillProcess = new TQProcess ( this ); // if ( GlobalConfig->KvpncDebugLevel > 2 ) // GlobalConfig->appendLogEntry ( i18n ( "No pid file, trying to terminate %1 with killall..." ).arg ( "pptp" ), GlobalConfig->debug ); // pptpdKillProcess->addArgument ( GlobalConfig->pathToKillall ); @@ -9163,12 +9163,12 @@ void KVpnc::disconnectClicked() // // if ( !pptpdKillProcess->start ( env ) ) // { -// KMessageBox::sorry ( this, i18n ( "\"%1\" start failed!" ).arg ( QString ( GlobalConfig->pathToKillall+" -TERM "+GlobalConfig->pathToPptp ) ) ); +// KMessageBox::sorry ( this, i18n ( "\"%1\" start failed!" ).arg ( TQString ( GlobalConfig->pathToKillall+" -TERM "+GlobalConfig->pathToPptp ) ) ); // } // else // { // if ( GlobalConfig->KvpncDebugLevel > 1 ) -// GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( QString ( GlobalConfig->pathToKillall+" -TERM "+GlobalConfig->pathToPptp ) ) , GlobalConfig->debug ); +// GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( TQString ( GlobalConfig->pathToKillall+" -TERM "+GlobalConfig->pathToPptp ) ) , GlobalConfig->debug ); // } // // sleep ( 2 ); @@ -9183,7 +9183,7 @@ void KVpnc::disconnectClicked() // // if ( !pptpdKillProcess->start ( env ) ) // { -// KMessageBox::sorry ( this, i18n ( "\"%1\" start failed!" ).arg ( QString ( GlobalConfig->pathToKillall+" -KILL "+GlobalConfig->pathToPptp ) ) ); +// KMessageBox::sorry ( this, i18n ( "\"%1\" start failed!" ).arg ( TQString ( GlobalConfig->pathToKillall+" -KILL "+GlobalConfig->pathToPptp ) ) ); // } // else // { @@ -9216,12 +9216,12 @@ void KVpnc::disconnectClicked() // // if ( !pptpdKillProcess->start ( env ) ) // { -// KMessageBox::sorry ( this, i18n ( "\"%1\" start failed!" ).arg ( QString ( GlobalConfig->pathToKillall+" -SIGKILL "+GlobalConfig->pathToPptp ) ) ); +// KMessageBox::sorry ( this, i18n ( "\"%1\" start failed!" ).arg ( TQString ( GlobalConfig->pathToKillall+" -SIGKILL "+GlobalConfig->pathToPptp ) ) ); // } // else // { // if ( GlobalConfig->KvpncDebugLevel > 1 ) -// GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( QString ( GlobalConfig->pathToKillall+" -SIGKILL "+GlobalConfig->pathToPptp ) ) , GlobalConfig->debug ); +// GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( TQString ( GlobalConfig->pathToKillall+" -SIGKILL "+GlobalConfig->pathToPptp ) ) , GlobalConfig->debug ); // while ( pptpdKillProcess->isRunning() ) // { // sleep ( 1 ); @@ -9247,8 +9247,8 @@ void KVpnc::disconnectClicked() durationTimer.stop(); // write pppd..down - QFile downfile ( tmpPath + "pppd." + GlobalConfig->currentProfile->getName() + ".down" ); - QTextStream downstream ( &downfile ); + TQFile downfile ( tmpPath + "pppd." + GlobalConfig->currentProfile->getName() + ".down" ); + TQTextStream downstream ( &downfile ); if ( downfile.open ( IO_WriteOnly ) ) { downstream << "#!"<< GlobalConfig->InterpreterShell << "\n"; @@ -9292,7 +9292,7 @@ void KVpnc::disconnectClicked() // if ( GlobalConfig->NewDefaultGw != "0.0.0.0" ) // { - // QString pppdev = ""; + // TQString pppdev = ""; // if ( !PppdDevice.isEmpty() ) // pppdev = PppdDevice; // else @@ -9311,7 +9311,7 @@ void KVpnc::disconnectClicked() downfile.close(); - QProcess *pppdDownProcess = new QProcess ( this ); + TQProcess *pppdDownProcess = new TQProcess ( this ); pppdDownProcess->addArgument ( GlobalConfig->InterpreterShell ); pppdDownProcess->addArgument ( tmpPath + "pppd." + GlobalConfig->currentProfile->getName() + ".down" ); @@ -9324,7 +9324,7 @@ void KVpnc::disconnectClicked() if ( GlobalConfig->KvpncDebugLevel > 1 ) GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( "PppdDownScript" ) , GlobalConfig->debug ); while ( pppdDownProcess->isRunning() ) - parent->QApplication::processEvents(); + parent->TQApplication::processEvents(); if ( GlobalConfig->KvpncDebugLevel > 1 ) GlobalConfig->appendLogEntry ( i18n ( "\"%1\" (%2) finished." ).arg ( "PppdDownScript" ).arg ( tmpPath + "pppd." + GlobalConfig->currentProfile->getName() + ".down" ), GlobalConfig->debug ); @@ -9358,14 +9358,14 @@ void KVpnc::disconnectClicked() if ( GlobalConfig->currentProfile->getAuthMethod() == "chap" || GlobalConfig->currentProfile->getAuthMethod() == "mschap" || GlobalConfig->currentProfile->getAuthMethod() == "mschap-v2" ) { // remove kvpnc entries from chap-secerets - QFile ChapSecretsFile ( "/etc/ppp/chap-secrets" ); + TQFile ChapSecretsFile ( "/etc/ppp/chap-secrets" ); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1" ).arg ( "/etc/ppp/chap-secrets" ), GlobalConfig->debug ); - QTextStream stream ( &ChapSecretsFile ); + TQTextStream stream ( &ChapSecretsFile ); if ( ChapSecretsFile.open ( IO_ReadOnly ) ) { - QString line = ""; - QString chapsecret_content = ""; + TQString line = ""; + TQString chapsecret_content = ""; bool kvpnc_start_marker_found = false; bool kvpnc_end_marker_found = false; while ( !stream.atEnd() ) @@ -9425,14 +9425,14 @@ void KVpnc::disconnectClicked() if ( GlobalConfig->currentProfile->getAuthMethod() == "pap" ) { // remove kvpnc entries from pap-secerets - QFile papSecretsFile ( "/etc/ppp/pap-secrets" ); + TQFile papSecretsFile ( "/etc/ppp/pap-secrets" ); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1" ).arg ( "/etc/ppp/chap-secrets" ), GlobalConfig->debug ); - QTextStream stream ( &papSecretsFile ); + TQTextStream stream ( &papSecretsFile ); if ( papSecretsFile.open ( IO_ReadOnly ) ) { - QString line = ""; - QString papsecret_content = ""; + TQString line = ""; + TQString papsecret_content = ""; bool kvpnc_start_marker_found = false; bool kvpnc_end_marker_found = false; while ( !stream.atEnd() ) @@ -9489,10 +9489,10 @@ void KVpnc::disconnectClicked() GlobalConfig->appendLogEntry ( i18n ( "File %1 could not opened!" ).arg ( "/etc/ppp/pap-secrets" ), GlobalConfig->error ); } } - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); GlobalConfig->status = GlobalConfig->disconnected; connectCounter = 0; - disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); // connectionEnded(); } } @@ -9504,13 +9504,13 @@ void KVpnc::disconnectClicked() { // delete managementhandler; } - disconnect ( OpenvpnProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readOutput_openvpn() ) ); - //disconnect( OpenvpnProcess, SIGNAL( readyReadStderr() ), this, SLOT( readOutput_openvpn() ) ); - //disconnect ( OpenvpnProcess, SIGNAL ( processExited() ), this, SLOT ( openvpn_exited() ) ); + disconnect ( OpenvpnProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readOutput_openvpn() ) ); + //disconnect( OpenvpnProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readOutput_openvpn() ) ); + //disconnect ( OpenvpnProcess, TQT_SIGNAL ( processExited() ), this, TQT_SLOT ( openvpn_exited() ) ); if ( managementhandler ) { - disconnect ( managementhandler, SIGNAL ( terminate_openvpn() ), this, SLOT ( disconnectClicked() ) ); + disconnect ( managementhandler, TQT_SIGNAL ( terminate_openvpn() ), this, TQT_SLOT ( disconnectClicked() ) ); managementhandler->greetingtimer.stop(); managementhandler->closeConnection(); while( ! managementhandler->socketReallyClosed ) @@ -9525,12 +9525,12 @@ void KVpnc::disconnectClicked() if ( OpenvpnProcess != 0L && OpenvpnProcess->isRunning() ) { //OpenvpnProcess->tryTerminate(); - //QTimer::singleShot ( 2000, OpenvpnProcess, SLOT ( kill() ) ); + //TQTimer::singleShot ( 2000, OpenvpnProcess, TQT_SLOT ( kill() ) ); OpenvpnProcess->kill(); } //sleep ( 2 ); - disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); connectionEnded(); @@ -9542,19 +9542,19 @@ void KVpnc::disconnectClicked() if ( VtundProcess != 0 ) { VtundProcess->tryTerminate(); - QTimer::singleShot ( 2000, VtundProcess, SLOT ( kill() ) ); + TQTimer::singleShot ( 2000, VtundProcess, TQT_SLOT ( kill() ) ); } // terminateConnection( VtundProcess ); - // VtundProcess = new QProcess (); + // VtundProcess = new TQProcess (); // VtundProcess->addArgument( GlobalConfig->pathToKillall ); // VtundProcess->addArgument( "vtund" ); // - // connect( VtundProcess, SIGNAL( readyReadStdout() ), this, SLOT( readFromStdout_disconnect() ) ); - // connect( VtundProcess, SIGNAL( readyReadStderr() ), this, SLOT( readFromStderr_disconnect() ) ); + // connect( VtundProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_disconnect() ) ); + // connect( VtundProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_disconnect() ) ); // // if ( !DisconnectProcess->start(env) ) { - // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "killall vtund" ) ); + // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( "killall vtund" ) ); // else // { // sleep(1); @@ -9562,7 +9562,7 @@ void KVpnc::disconnectClicked() // delete VtundProcess; // VtundProcess=0L; // } - disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); sleep ( 2 ); delete VtundProcess; @@ -9577,20 +9577,20 @@ void KVpnc::disconnectClicked() if ( SshProcess != 0 ) { // SshProcess->tryTerminate(); -// QTimer::singleShot ( 5000, SshProcess, SLOT ( kill() ) ); +// TQTimer::singleShot ( 5000, SshProcess, TQT_SLOT ( kill() ) ); SshProcess->kill(); } // terminateConnection( SshProcess ); - // SshProcess = new QProcess (); + // SshProcess = new TQProcess (); // SshProcess->addArgument( GlobalConfig->pathToKillall ); // SshProcess->addArgument( "openvpn" ); // - // connect( SshProcess, SIGNAL( readyReadStdout() ), this, SLOT( readFromStdout_disconnect() ) ); - // connect( SshProcess, SIGNAL( readyReadStderr() ), this, SLOT( readFromStderr_disconnect() ) ); + // connect( SshProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_disconnect() ) ); + // connect( SshProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_disconnect() ) ); // // if ( !DisconnectProcess->start(env) ) { - // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "killall ssh" ) ); + // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( "killall ssh" ) ); // } else { @@ -9600,8 +9600,8 @@ void KVpnc::disconnectClicked() SshProcess=0L; // write ssh..down - QFile downfile ( tmpPath + "ssh." + GlobalConfig->currentProfile->getName() + ".down" ); - QTextStream downstream ( &downfile ); + TQFile downfile ( tmpPath + "ssh." + GlobalConfig->currentProfile->getName() + ".down" ); + TQTextStream downstream ( &downfile ); if ( downfile.open ( IO_WriteOnly ) ) { downstream << "#!"<< GlobalConfig->InterpreterShell << "\n"; @@ -9661,7 +9661,7 @@ void KVpnc::disconnectClicked() downfile.close(); - QProcess *SshDownProcess = new QProcess ( this ); + TQProcess *SshDownProcess = new TQProcess ( this ); SshDownProcess->addArgument ( GlobalConfig->InterpreterShell ); SshDownProcess->addArgument ( tmpPath + "ssh." + GlobalConfig->currentProfile->getName() + ".down" ); @@ -9674,7 +9674,7 @@ void KVpnc::disconnectClicked() if ( GlobalConfig->KvpncDebugLevel > 1 ) GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( "SshDownScript" ) , GlobalConfig->debug ); while ( SshDownProcess->isRunning() ) - parent->QApplication::processEvents(); + parent->TQApplication::processEvents(); if ( GlobalConfig->KvpncDebugLevel > 1 ) GlobalConfig->appendLogEntry ( i18n ( "\"%1\" (%2) finished." ).arg ( "SshDownScript" ).arg ( tmpPath + "ssh." + GlobalConfig->currentProfile->getName() + ".down" ), GlobalConfig->debug ); @@ -9707,13 +9707,13 @@ void KVpnc::disconnectClicked() } - disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); connectionEnded(); } } // ConnectingProcess = 0L; - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); if ( GlobalConfig->currentProfile->getExecuteCmdAfterDisconnect() ) executeCommandAfterDisconnect(); @@ -9737,20 +9737,20 @@ void KVpnc::disconnectClicked() //Vpnc_pid_file = tmpPath + "vpnc-pid." + GlobalConfig->currentProfile->getID() + ".pid"; // vpnc-pid..pid VpncDisconnectScript = tmpPath + "vpnc-disconnect." + GlobalConfig->currentProfile->getID() + ".sh"; // write vpnc connect script - QFile pidFile ( GlobalConfig->Vpnc_pid_file ); - QString Vpnc_pid = ""; + TQFile pidFile ( GlobalConfig->Vpnc_pid_file ); + TQString Vpnc_pid = ""; if ( pidFile.open ( IO_ReadOnly ) ) { - Vpnc_pid = QString ( pidFile.readAll() ).stripWhiteSpace(); + Vpnc_pid = TQString ( pidFile.readAll() ).stripWhiteSpace(); } if ( VpncProcess != 0 ) { if ( VpncProcess->isRunning() ) { - disconnect ( VpncProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readOutputFrom_vpnc() ) ); - disconnect ( VpncProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readOutputFrom_vpnc() ) ); - disconnect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) ); + disconnect ( VpncProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readOutputFrom_vpnc() ) ); + disconnect ( VpncProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readOutputFrom_vpnc() ) ); + disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); VpncProcess->kill(); sleep ( 1 ); @@ -9767,8 +9767,8 @@ void KVpnc::disconnectClicked() VpncProcess = 0L; } - QFile file ( VpncDisconnectScript ); - QTextStream stream ( &file ); + TQFile file ( VpncDisconnectScript ); + TQTextStream stream ( &file ); if ( file.open ( IO_WriteOnly ) ) { stream << "#!"<< GlobalConfig->InterpreterShell << "\n"; @@ -9785,7 +9785,7 @@ void KVpnc::disconnectClicked() stream << GlobalConfig->pathToKill << " -KILL " << Vpnc_pid << " > /dev/null 2>&1\n"; stream << GlobalConfig->pathToKill << " -KILL " << Vpnc_pid << " > /dev/null 2>&1\n"; stream << GlobalConfig->pathToKill << " -KILL " << Vpnc_pid << " > /dev/null 2>&1\n"; - QFile ( GlobalConfig->Vpnc_pid_file ).remove(); + TQFile ( GlobalConfig->Vpnc_pid_file ).remove(); } // else // { @@ -9803,7 +9803,7 @@ void KVpnc::disconnectClicked() if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "Restoring default route before connection..." ), GlobalConfig->debug ); - QString OldDefaultroute = tmpPath + "default-route." + GlobalConfig->currentProfile->getName(); // default-route. + TQString OldDefaultroute = tmpPath + "default-route." + GlobalConfig->currentProfile->getName(); // default-route. stream << GlobalConfig->pathToIp + " route del default > /dev/null 2>&1\n"; stream << GlobalConfig->pathToIp + " route add $(cat \"" + OldDefaultroute + "\")\n"; // stream << GlobalConfig->pathToIp + " route add $(cat \"/var/run/vpnc/defaultroute\")\n"; @@ -9831,18 +9831,18 @@ void KVpnc::disconnectClicked() } //if (!restoreResolvConf()) - //GlobalConfig->appendLogEntry(i18n("Restore of %1 has been failed!").arg(""),GlobalConfig->error); + //GlobalConfig->appendLogEntry(i18n("Restore of %1 has been failed!").tqarg(""),GlobalConfig->error); stream << GlobalConfig->pathToIp + " route flush cache\n"; file.close(); - DisconnectProcess = new QProcess (); + DisconnectProcess = new TQProcess (); DisconnectProcess->addArgument ( GlobalConfig->InterpreterShell ); DisconnectProcess->addArgument ( VpncDisconnectScript ); - connect ( DisconnectProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_disconnect() ) ); - connect ( DisconnectProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_disconnect() ) ); + connect ( DisconnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_disconnect() ) ); + connect ( DisconnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_disconnect() ) ); if ( !DisconnectProcess->start ( env ) ) { @@ -9856,12 +9856,12 @@ void KVpnc::disconnectClicked() DisconnectProcess=0L; } - disconnect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) ); + disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); - setGuiStatus ( disconnected ); - disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) ); + setGuitqStatus ( disconnected ); + disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); timer.stop(); connectionEnded(); } @@ -9873,7 +9873,7 @@ void KVpnc::disconnectClicked() { CiscoVpncProcess->kill(); CiscoVpncProcess->tryTerminate(); - QTimer::singleShot ( 5000, CiscoVpncProcess, SLOT ( kill() ) ); + TQTimer::singleShot ( 5000, CiscoVpncProcess, TQT_SLOT ( kill() ) ); sleep ( 5 ); delete CiscoVpncProcess; @@ -9883,7 +9883,7 @@ void KVpnc::disconnectClicked() else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan || GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_freeswan ) { // iptables need the right interface (eth0:1 => eth0) - QString tmpInterface2 = ""; + TQString tmpInterface2 = ""; int pointPos = tmpInterface.find ( ':', 0, FALSE ); if ( pointPos > 1 ) { @@ -9894,12 +9894,12 @@ void KVpnc::disconnectClicked() if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_freeswan ) { -// if (QFile("/var/run/l2tpd.pid").exists()) +// if (TQFile("/var/run/l2tpd.pid").exists()) // { // if (GlobalConfig->KvpncDebugLevel > 1) // GlobalConfig->appendLogEntry(i18n("Using control interface for disconnecting l2tp connection"),GlobalConfig->debug); -// QFile L2tpdControlFile ( "/var/run/l2tp-control" ); -// QTextStream stream( &L2tpdControlFile ); +// TQFile L2tpdControlFile ( "/var/run/l2tp-control" ); +// TQTextStream stream( &L2tpdControlFile ); // if ( L2tpdControlFile.open( IO_WriteOnly ) ) { // stream << "d " << GlobalConfig->currentProfile->getName() << "\n"; // L2tpdControlFile.close(); @@ -9912,8 +9912,8 @@ void KVpnc::disconnectClicked() if ( L2tpdProcess != 0L ) { L2tpWaitForPppUpTimer.stop(); - disconnect ( this, SIGNAL ( L2tpdStdoutRecieved() ), this, SLOT ( processStdout_l2tpd() ) ); - disconnect ( this, SIGNAL ( L2tpdStderrRecieved() ), this, SLOT ( processStderr_l2tpd() ) ); + disconnect ( this, TQT_SIGNAL ( L2tpdStdoutRecieved() ), this, TQT_SLOT ( processStdout_l2tpd() ) ); + disconnect ( this, TQT_SIGNAL ( L2tpdStderrRecieved() ), this, TQT_SLOT ( processStderr_l2tpd() ) ); if ( L2tpdProcess->isRunning() ) { @@ -9931,14 +9931,14 @@ void KVpnc::disconnectClicked() if ( OpenL2tpProcess != 0L ) { - disconnect ( OpenL2tpProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_openl2tp() ) ); - disconnect ( OpenL2tpProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_openl2tp() ) ); + disconnect ( OpenL2tpProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_openl2tp() ) ); + disconnect ( OpenL2tpProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_openl2tp() ) ); OpenL2tpProcess->kill(); delete OpenL2tpProcess; OpenL2tpProcess=0L; - if ( QFile ( "/var/run/openl2tpd.pid" ).exists() ) - QFile ( "/var/run/openl2tpd.pid" ).remove(); + if ( TQFile ( "/var/run/openl2tpd.pid" ).exists() ) + TQFile ( "/var/run/openl2tpd.pid" ).remove(); if ( !Utils ( GlobalConfig, parent ).unloadKernelModule ( "slhc", parent ) ) { @@ -10000,22 +10000,22 @@ void KVpnc::disconnectClicked() } ToolInfo *tool = Utils ( GlobalConfig ).getToolInfo ( "ipsec" ); - QString realversion = tool->Version.section ( ' ', 1, 1 ).section ( '/', 0, 0 ).right ( tool->Version.section ( ' ', 1, 1 ).section ( '/', 0, 0 ).length() - 1 ); + TQString realversion = tool->Version.section ( ' ', 1, 1 ).section ( '/', 0, 0 ).right ( tool->Version.section ( ' ', 1, 1 ).section ( '/', 0, 0 ).length() - 1 ); int IpsecMajor= realversion.section ( '.',0,0 ).toInt(); int IpsecMinor= realversion.section ( '.',1,1 ).toInt(); int IpsecSubMinor= realversion.section ( '.',2,2 ).toInt(); - QString realtype = tool->Version.section ( ' ', 0, 0 ).lower(); + TQString realtype = tool->Version.section ( ' ', 0, 0 ).lower(); putenv ( ( char* ) ( "LC_ALL=C" ) ); - IpsecWhackDeleteProcess = new QProcess ( this ); + IpsecWhackDeleteProcess = new TQProcess ( this ); IpsecWhackDeleteProcess->addArgument ( GlobalConfig->pathToIpsec ); IpsecWhackDeleteProcess->addArgument ( "whack" ); IpsecWhackDeleteProcess->addArgument ( "--name" ); IpsecWhackDeleteProcess->addArgument ( GlobalConfig->currentProfile->getName() ); IpsecWhackDeleteProcess->addArgument ( "--delete" ); - connect ( IpsecWhackDeleteProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsecwhackdelete() ) ); - connect ( IpsecWhackDeleteProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsecwhackdelete() ) ); + connect ( IpsecWhackDeleteProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhackdelete() ) ); + connect ( IpsecWhackDeleteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhackdelete() ) ); if ( !IpsecWhackDeleteProcess->start ( env ) ) { @@ -10043,7 +10043,7 @@ void KVpnc::disconnectClicked() delete IpsecWhackDeleteProcess; IpsecWhackDeleteProcess=0L; - IpsecStartProcess = new QProcess ( this ); + IpsecStartProcess = new TQProcess ( this ); IpsecStartProcess->addArgument ( GlobalConfig->pathToIpsec ); if ( !IpsecType.contains ( "strongSwan", false ) ) { @@ -10055,9 +10055,9 @@ void KVpnc::disconnectClicked() IpsecStartProcess->addArgument ( "stop" ); } - connect ( IpsecStartProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStderr_ipsec() ) ); - connect ( IpsecStartProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsec() ) ); - // connect( IpsecStartProcess, SIGNAL( processExited () ), this, SLOT( removeRouteFreeswan() ) ); + connect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStderr_ipsec() ) ); + connect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsec() ) ); + // connect( IpsecStartProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT( removeRouteFreeswan() ) ); if ( !IpsecStartProcess->start ( env ) ) { @@ -10092,14 +10092,14 @@ void KVpnc::disconnectClicked() usleep ( 500 ); } } - disconnect ( IpsecStartProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStderr_ipsec() ) ); - disconnect ( IpsecStartProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsec() ) ); + disconnect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStderr_ipsec() ) ); + disconnect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsec() ) ); delete IpsecStartProcess; IpsecStartProcess=0L; // delRouteIpsec(); removeIptablesFreeswan(); - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); GlobalConfig->currentConnectRetry=0; @@ -10108,22 +10108,22 @@ void KVpnc::disconnectClicked() if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "Restoring original ipsec settings" ), KVpncConfig::debug ); // restore system files - QString IpsecPrefix = "/etc"; + TQString IpsecPrefix = "/etc"; // ipsec.conf - QFile originalIpsecConfFile ( "/etc/ipsec.conf.before.kvpnc" ); - QTextStream stream ( &originalIpsecConfFile ); - QString originalIpsecConfFileContent = ""; + TQFile originalIpsecConfFile ( "/etc/ipsec.conf.before.kvpnc" ); + TQTextStream stream ( &originalIpsecConfFile ); + TQString originalIpsecConfFileContent = ""; if ( originalIpsecConfFile.exists() ) { if ( originalIpsecConfFile.open ( IO_ReadOnly ) ) { - originalIpsecConfFileContent = QString ( originalIpsecConfFile.readAll() ); + originalIpsecConfFileContent = TQString ( originalIpsecConfFile.readAll() ); originalIpsecConfFile.close(); } } - QFile backupOriginalIpsecConfFile ( "/etc/ipsec.conf" ); + TQFile backupOriginalIpsecConfFile ( "/etc/ipsec.conf" ); stream.setDevice ( &backupOriginalIpsecConfFile ); if ( backupOriginalIpsecConfFile.open ( IO_WriteOnly ) ) { @@ -10133,19 +10133,19 @@ void KVpnc::disconnectClicked() stream.unsetDevice(); //if ( GlobalConfig->KvpncDebugLevel > 0 ) - // GlobalConfig->appendLogEntry( i18n( "%1 found in %2, assuming %3 as prefix for %4." ).arg( "ipsec.conf.before.kvpnc" ).arg( IpsecPrefix ).arg( IpsecPrefix ).arg( IpsecType ), GlobalConfig->debug ); + // GlobalConfig->appendLogEntry( i18n( "%1 found in %2, assuming %3 as prefix for %4." ).tqarg( "ipsec.conf.before.kvpnc" ).tqarg( IpsecPrefix ).tqarg( IpsecPrefix ).tqarg( IpsecType ), GlobalConfig->debug ); // ipsec.secret - QFile originalIpsecSecretFile ( "/etc/ipsec.secrets.before.kvpnc" ); + TQFile originalIpsecSecretFile ( "/etc/ipsec.secrets.before.kvpnc" ); stream.setDevice ( &originalIpsecSecretFile ); - QString originalIpsecSecretFileContent = ""; + TQString originalIpsecSecretFileContent = ""; if ( originalIpsecSecretFile.open ( IO_ReadOnly ) ) { - originalIpsecSecretFileContent = QString ( originalIpsecSecretFile.readAll() ); + originalIpsecSecretFileContent = TQString ( originalIpsecSecretFile.readAll() ); originalIpsecSecretFile.close(); } - QFile backupOriginalIpsecSecretFile ( "/etc/ipsec.secrets" ); + TQFile backupOriginalIpsecSecretFile ( "/etc/ipsec.secrets" ); stream.setDevice ( &backupOriginalIpsecSecretFile ); if ( backupOriginalIpsecSecretFile.open ( IO_WriteOnly ) ) { @@ -10159,14 +10159,14 @@ void KVpnc::disconnectClicked() if ( GlobalConfig->currentProfile->getAuthMethod() == "chap" || GlobalConfig->currentProfile->getAuthMethod() == "mschap" || GlobalConfig->currentProfile->getAuthMethod() == "mschap-v2" ) { // remove kvpnc entries from chap-secerets - QFile ChapSecretsFile ( "/etc/ppp/chap-secrets" ); + TQFile ChapSecretsFile ( "/etc/ppp/chap-secrets" ); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1" ).arg ( "/etc/ppp/chap-secrets" ), GlobalConfig->debug ); - QTextStream stream ( &ChapSecretsFile ); + TQTextStream stream ( &ChapSecretsFile ); if ( ChapSecretsFile.open ( IO_ReadOnly ) ) { - QString line = ""; - QString chapsecret_content = ""; + TQString line = ""; + TQString chapsecret_content = ""; bool kvpnc_start_marker_found = false; bool kvpnc_end_marker_found = false; while ( !stream.atEnd() ) @@ -10226,14 +10226,14 @@ void KVpnc::disconnectClicked() if ( GlobalConfig->currentProfile->getAuthMethod() == "pap" ) { // remove kvpnc entries from pap-secerets - QFile papSecretsFile ( "/etc/ppp/pap-secrets" ); + TQFile papSecretsFile ( "/etc/ppp/pap-secrets" ); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1" ).arg ( "/etc/ppp/chap-secrets" ), GlobalConfig->debug ); - QTextStream stream ( &papSecretsFile ); + TQTextStream stream ( &papSecretsFile ); if ( papSecretsFile.open ( IO_ReadOnly ) ) { - QString line = ""; - QString papsecret_content = ""; + TQString line = ""; + TQString papsecret_content = ""; bool kvpnc_start_marker_found = false; bool kvpnc_end_marker_found = false; while ( !stream.atEnd() ) @@ -10300,8 +10300,8 @@ void KVpnc::disconnectClicked() else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::racoon || GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_racoon ) { - QFile file2 ( tmpPath + "setkey." + GlobalConfig->currentProfile->getName() + ".remove_setkey.sh" ); - QTextStream stream2 ( &file2 ); + TQFile file2 ( tmpPath + "setkey." + GlobalConfig->currentProfile->getName() + ".remove_setkey.sh" ); + TQTextStream stream2 ( &file2 ); if ( file2.open ( IO_WriteOnly ) ) { stream2 << "#!"<< GlobalConfig->InterpreterShell << "\n"; @@ -10315,25 +10315,25 @@ void KVpnc::disconnectClicked() } else { - // KMessageBox::error( this, i18n( "\"%1\" write failed!" ).arg( "setkey (remove)" ) ); + // KMessageBox::error( this, i18n( "\"%1\" write failed!" ).tqarg( "setkey (remove)" ) ); GlobalConfig->appendLogEntry ( i18n ( "\"%1\" write failed!" ).arg ( "setkey (remove)" ) , GlobalConfig->error ); } // if (RacoonctlProcess !=0 && RacoonctlProcess->isRunning()) // { -// disconnect( RacoonctlProcess, SIGNAL( readyReadStdout() ), this, SLOT( readFromStdout_racoonctl() ) ); -// disconnect( RacoonctlProcess, SIGNAL( readyReadStderr() ), this, SLOT( readFromStderr_racoonctl() ) ); +// disconnect( RacoonctlProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_racoonctl() ) ); +// disconnect( RacoonctlProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_racoonctl() ) ); // // RacoonctlProcess->kill(); // } if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_racoon ) { - //if (QFile("/var/run/l2tpd.pid").exists()) + //if (TQFile("/var/run/l2tpd.pid").exists()) //{ // if (GlobalConfig->KvpncDebugLevel > 1) // GlobalConfig->appendLogEntry(i18n("Using control interface for disconnecting l2tp connection"),GlobalConfig->debug); - // QFile L2tpdControlFile ( "/var/run/l2tp-control" ); - // QTextStream stream( &L2tpdControlFile ); + // TQFile L2tpdControlFile ( "/var/run/l2tp-control" ); + // TQTextStream stream( &L2tpdControlFile ); // if ( L2tpdControlFile.open( IO_WriteOnly ) ) { // stream << "d " << GlobalConfig->currentProfile->getName() << "\n"; // L2tpdControlFile.close(); @@ -10341,12 +10341,12 @@ void KVpnc::disconnectClicked() //} //else //{ - // if (QFile("/var/run/l2tpd.pid").exists()) + // if (TQFile("/var/run/l2tpd.pid").exists()) // { // if (GlobalConfig->KvpncDebugLevel > 1) // GlobalConfig->appendLogEntry(i18n("Using control interface for disconnecting l2tp connection"),GlobalConfig->debug); - // QFile L2tpdControlFile ( "/var/run/l2tp-control" ); - // QTextStream stream( &L2tpdControlFile ); + // TQFile L2tpdControlFile ( "/var/run/l2tp-control" ); + // TQTextStream stream( &L2tpdControlFile ); // if ( L2tpdControlFile.open( IO_WriteOnly ) ) { // stream << "d " << GlobalConfig->currentProfile->getName() << "\n"; // L2tpdControlFile.close(); @@ -10359,8 +10359,8 @@ void KVpnc::disconnectClicked() { L2tpWaitForPppUpTimer.stop(); - disconnect ( this, SIGNAL ( L2tpdStdoutRecieved() ), this, SLOT ( processStdout_l2tpd() ) ); - disconnect ( this, SIGNAL ( L2tpdStderrRecieved() ), this, SLOT ( processStderr_l2tpd() ) ); + disconnect ( this, TQT_SIGNAL ( L2tpdStdoutRecieved() ), this, TQT_SLOT ( processStdout_l2tpd() ) ); + disconnect ( this, TQT_SIGNAL ( L2tpdStderrRecieved() ), this, TQT_SLOT ( processStderr_l2tpd() ) ); L2tpdProcess->kill(); if ( L2tpdProcess->isRunning() ) @@ -10374,8 +10374,8 @@ void KVpnc::disconnectClicked() { if ( OpenL2tpProcess != 0L && OpenL2tpProcess->isRunning() ) { - disconnect ( OpenL2tpProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_openl2tp() ) ); - disconnect ( OpenL2tpProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_openl2tp() ) ); + disconnect ( OpenL2tpProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_openl2tp() ) ); + disconnect ( OpenL2tpProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_openl2tp() ) ); OpenL2tpProcess->tryTerminate(); sleep ( 1 ); if ( OpenL2tpProcess->isRunning() ) @@ -10386,8 +10386,8 @@ void KVpnc::disconnectClicked() delete OpenL2tpProcess; OpenL2tpProcess=0L; - if ( QFile ( "/var/run/openl2tpd.pid" ).exists() ) - QFile ( "/var/run/openl2tpd.pid" ).remove(); + if ( TQFile ( "/var/run/openl2tpd.pid" ).exists() ) + TQFile ( "/var/run/openl2tpd.pid" ).remove(); } } @@ -10444,8 +10444,8 @@ void KVpnc::disconnectClicked() if ( RacoonTailProcess != 0 && RacoonTailProcess->isRunning() ) { - disconnect ( RacoonTailProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_tail_racoon() ) ); - disconnect ( RacoonTailProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_tail_racoon() ) ); + disconnect ( RacoonTailProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_tail_racoon() ) ); + disconnect ( RacoonTailProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_tail_racoon() ) ); // terminateConnection( RacoonTailProcess ); RacoonTailProcess->kill(); if ( GlobalConfig->KvpncDebugLevel > 2 ) @@ -10453,7 +10453,7 @@ void KVpnc::disconnectClicked() } if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "%1 tunnel state: %2" ).arg ( "racoon" ).arg ( QString().setNum ( racoon_tunnel_state ) ) , GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "%1 tunnel state: %2" ).arg ( "racoon" ).arg ( TQString().setNum ( racoon_tunnel_state ) ) , GlobalConfig->debug ); if ( racoon_tunnel_state==1 ) @@ -10477,8 +10477,8 @@ void KVpnc::disconnectClicked() if ( RacoonProcess != 0 && RacoonProcess->isRunning() ) { - disconnect ( RacoonProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_racoon() ) ); - disconnect ( RacoonProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_racoon() ) ); + disconnect ( RacoonProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_racoon() ) ); + disconnect ( RacoonProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_racoon() ) ); // terminateConnection( RacoonProcess ); if ( GlobalConfig->KvpncDebugLevel > 2 ) @@ -10498,14 +10498,14 @@ void KVpnc::disconnectClicked() if ( GlobalConfig->currentProfile->getAuthMethod() == "chap" || GlobalConfig->currentProfile->getAuthMethod() == "mschap" || GlobalConfig->currentProfile->getAuthMethod() == "mschap-v2" ) { // remove kvpnc entries from chap-secerets - QFile ChapSecretsFile ( "/etc/ppp/chap-secrets" ); + TQFile ChapSecretsFile ( "/etc/ppp/chap-secrets" ); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1" ).arg ( "/etc/ppp/chap-secrets" ), GlobalConfig->debug ); - QTextStream stream ( &ChapSecretsFile ); + TQTextStream stream ( &ChapSecretsFile ); if ( ChapSecretsFile.open ( IO_ReadOnly ) ) { - QString line = ""; - QString chapsecret_content = ""; + TQString line = ""; + TQString chapsecret_content = ""; bool kvpnc_start_marker_found = false; bool kvpnc_end_marker_found = false; while ( !stream.atEnd() ) @@ -10565,14 +10565,14 @@ void KVpnc::disconnectClicked() if ( GlobalConfig->currentProfile->getAuthMethod() == "pap" ) { // remove kvpnc entries from pap-secerets - QFile papSecretsFile ( "/etc/ppp/pap-secrets" ); + TQFile papSecretsFile ( "/etc/ppp/pap-secrets" ); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1" ).arg ( "/etc/ppp/chap-secrets" ), GlobalConfig->debug ); - QTextStream stream ( &papSecretsFile ); + TQTextStream stream ( &papSecretsFile ); if ( papSecretsFile.open ( IO_ReadOnly ) ) { - QString line = ""; - QString papsecret_content = ""; + TQString line = ""; + TQString papsecret_content = ""; bool kvpnc_start_marker_found = false; bool kvpnc_end_marker_found = false; while ( !stream.atEnd() ) @@ -10636,8 +10636,8 @@ void KVpnc::disconnectClicked() if ( PptpProcess != 0 && PptpProcess->isRunning()) { - disconnect ( PptpProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_pptp() ) ); - disconnect ( PptpProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_pptp() ) ); + disconnect ( PptpProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_pptp() ) ); + disconnect ( PptpProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_pptp() ) ); // try to kill the pptp process self PptpProcess->tryTerminate(); @@ -10650,7 +10650,7 @@ void KVpnc::disconnectClicked() // if ( PptpProcess != 0 && PptpProcess->isRunning()) // { -// QProcess *pptpdKillProcess = new QProcess ( this ); +// TQProcess *pptpdKillProcess = new TQProcess ( this ); // if ( GlobalConfig->KvpncDebugLevel > 2 ) // GlobalConfig->appendLogEntry ( i18n ( "No pid file, trying to terminate %1 with killall..." ).arg ( "pptp" ), GlobalConfig->debug ); // pptpdKillProcess->addArgument ( GlobalConfig->pathToKillall ); @@ -10659,12 +10659,12 @@ void KVpnc::disconnectClicked() // // if ( !pptpdKillProcess->start ( env ) ) // { -// KMessageBox::sorry ( this, i18n ( "\"%1\" start failed!" ).arg ( QString ( GlobalConfig->pathToKillall+" -TERM "+GlobalConfig->pathToPptp ) ) ); +// KMessageBox::sorry ( this, i18n ( "\"%1\" start failed!" ).arg ( TQString ( GlobalConfig->pathToKillall+" -TERM "+GlobalConfig->pathToPptp ) ) ); // } // else // { // if ( GlobalConfig->KvpncDebugLevel > 1 ) -// GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( QString ( GlobalConfig->pathToKillall+" -TERM "+GlobalConfig->pathToPptp ) ) , GlobalConfig->debug ); +// GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( TQString ( GlobalConfig->pathToKillall+" -TERM "+GlobalConfig->pathToPptp ) ) , GlobalConfig->debug ); // while ( pptpdKillProcess->isRunning() ) // { // sleep ( 1 ); @@ -10682,12 +10682,12 @@ void KVpnc::disconnectClicked() // { // if ( !pptpdKillProcess->start ( env ) ) // { -// KMessageBox::sorry ( this, i18n ( "\"%1\" start failed!" ).arg ( QString ( GlobalConfig->pathToKillall+" -KILL "+GlobalConfig->pathToPptp ) ) ); +// KMessageBox::sorry ( this, i18n ( "\"%1\" start failed!" ).arg ( TQString ( GlobalConfig->pathToKillall+" -KILL "+GlobalConfig->pathToPptp ) ) ); // } // else // { // if ( GlobalConfig->KvpncDebugLevel > 1 ) -// GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( QString ( GlobalConfig->pathToKillall+" -KILL "+GlobalConfig->pathToPptp ) ) , GlobalConfig->debug ); +// GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( TQString ( GlobalConfig->pathToKillall+" -KILL "+GlobalConfig->pathToPptp ) ) , GlobalConfig->debug ); // } // usleep ( 500 ); // if (GlobalConfig->appPointer->hasPendingEvents()) @@ -10706,12 +10706,12 @@ void KVpnc::disconnectClicked() // // if ( !pptpdKillProcess->start ( env ) ) // { -// KMessageBox::sorry ( this, i18n ( "\"%1\" start failed!" ).arg ( QString ( GlobalConfig->pathToKillall+" -SIGKILL "+GlobalConfig->pathToPptp ) ) ); +// KMessageBox::sorry ( this, i18n ( "\"%1\" start failed!" ).arg ( TQString ( GlobalConfig->pathToKillall+" -SIGKILL "+GlobalConfig->pathToPptp ) ) ); // } // else // { // if ( GlobalConfig->KvpncDebugLevel > 1 ) -// GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( QString ( GlobalConfig->pathToKillall+" -SIGKILL "+GlobalConfig->pathToPptp ) ) , GlobalConfig->debug ); +// GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( TQString ( GlobalConfig->pathToKillall+" -SIGKILL "+GlobalConfig->pathToPptp ) ) , GlobalConfig->debug ); // while ( pptpdKillProcess->isRunning() ) // { // usleep ( 500 ); @@ -10730,8 +10730,8 @@ void KVpnc::disconnectClicked() // write pppd..down - QFile downfile ( tmpPath + "pppd." + GlobalConfig->currentProfile->getName() + ".down" ); - QTextStream downstream ( &downfile ); + TQFile downfile ( tmpPath + "pppd." + GlobalConfig->currentProfile->getName() + ".down" ); + TQTextStream downstream ( &downfile ); if ( downfile.open ( IO_WriteOnly ) ) { downstream << "#!"<< GlobalConfig->InterpreterShell << "\n"; @@ -10768,7 +10768,7 @@ void KVpnc::disconnectClicked() downfile.close(); } - QProcess *pppdDownProcess = new QProcess ( this ); + TQProcess *pppdDownProcess = new TQProcess ( this ); pppdDownProcess->addArgument ( GlobalConfig->InterpreterShell ); pppdDownProcess->addArgument ( tmpPath + "pppd." + GlobalConfig->currentProfile->getName() + ".down" ); @@ -10815,14 +10815,14 @@ void KVpnc::disconnectClicked() if ( GlobalConfig->currentProfile->getAuthMethod() == "chap" || GlobalConfig->currentProfile->getAuthMethod() == "mschap" || GlobalConfig->currentProfile->getAuthMethod() == "mschap-v2" ) { // remove kvpnc entries from chap-secerets - QFile ChapSecretsFile ( "/etc/ppp/chap-secrets" ); + TQFile ChapSecretsFile ( "/etc/ppp/chap-secrets" ); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1" ).arg ( "/etc/ppp/chap-secrets" ), GlobalConfig->debug ); - QTextStream stream ( &ChapSecretsFile ); + TQTextStream stream ( &ChapSecretsFile ); if ( ChapSecretsFile.open ( IO_ReadOnly ) ) { - QString line = ""; - QString chapsecret_content = ""; + TQString line = ""; + TQString chapsecret_content = ""; bool kvpnc_start_marker_found = false; bool kvpnc_end_marker_found = false; while ( !stream.atEnd() ) @@ -10881,14 +10881,14 @@ void KVpnc::disconnectClicked() if ( GlobalConfig->currentProfile->getAuthMethod() == "pap" ) { // remove kvpnc entries from pap-secerets - QFile papSecretsFile ( "/etc/ppp/pap-secrets" ); + TQFile papSecretsFile ( "/etc/ppp/pap-secrets" ); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1" ).arg ( "/etc/ppp/chap-secrets" ), GlobalConfig->debug ); - QTextStream stream ( &papSecretsFile ); + TQTextStream stream ( &papSecretsFile ); if ( papSecretsFile.open ( IO_ReadOnly ) ) { - QString line = ""; - QString papsecret_content = ""; + TQString line = ""; + TQString papsecret_content = ""; bool kvpnc_start_marker_found = false; bool kvpnc_end_marker_found = false; while ( !stream.atEnd() ) @@ -10945,7 +10945,7 @@ void KVpnc::disconnectClicked() GlobalConfig->appendLogEntry ( i18n ( "File %1 could not opened!" ).arg ( "/etc/ppp/pap-secrets" ), GlobalConfig->error ); } } - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); GlobalConfig->status = GlobalConfig->disconnected; connectCounter = 0; connectionEnded(); @@ -10954,7 +10954,7 @@ void KVpnc::disconnectClicked() { if ( managementhandler ) { - disconnect ( managementhandler, SIGNAL ( terminate_openvpn() ), this, SLOT ( disconnectClicked() ) ); + disconnect ( managementhandler, TQT_SIGNAL ( terminate_openvpn() ), this, TQT_SLOT ( disconnectClicked() ) ); managementhandler->greetingtimer.stop(); managementhandler->closeConnection(); while( ! managementhandler->socketReallyClosed ) @@ -10966,13 +10966,13 @@ void KVpnc::disconnectClicked() delete managementhandler; } - disconnect ( OpenvpnProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readOutput_openvpn() ) ); - //disconnect( OpenvpnProcess, SIGNAL( readyReadStderr() ), this, SLOT( readOutput_openvpn() ) ); - //disconnect ( OpenvpnProcess, SIGNAL ( processExited() ), this, SLOT ( openvpn_exited() ) ); + disconnect ( OpenvpnProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readOutput_openvpn() ) ); + //disconnect( OpenvpnProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readOutput_openvpn() ) ); + //disconnect ( OpenvpnProcess, TQT_SIGNAL ( processExited() ), this, TQT_SLOT ( openvpn_exited() ) ); if ( OpenvpnProcess != 0 && OpenvpnProcess->isRunning() ) { //OpenvpnProcess->tryTerminate(); - //QTimer::singleShot ( 2000, OpenvpnProcess, SLOT ( kill() ) ); + //TQTimer::singleShot ( 2000, OpenvpnProcess, TQT_SLOT ( kill() ) ); OpenvpnProcess->kill(); } @@ -10988,19 +10988,19 @@ void KVpnc::disconnectClicked() if ( VtundProcess != 0 ) { VtundProcess->tryTerminate(); - QTimer::singleShot ( 2000, VtundProcess, SLOT ( kill() ) ); + TQTimer::singleShot ( 2000, VtundProcess, TQT_SLOT ( kill() ) ); } // terminateConnection( VtundProcess ); - // VtundProcess = new QProcess (); + // VtundProcess = new TQProcess (); // VtundProcess->addArgument( GlobalConfig->pathToKillall ); // VtundProcess->addArgument( "vtund" ); // - // connect( VtundProcess, SIGNAL( readyReadStdout() ), this, SLOT( readFromStdout_disconnect() ) ); - // connect( VtundProcess, SIGNAL( readyReadStderr() ), this, SLOT( readFromStderr_disconnect() ) ); + // connect( VtundProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_disconnect() ) ); + // connect( VtundProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_disconnect() ) ); // // if ( !DisconnectProcess->start(env) ) { - // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "killall vtund" ) ); + // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( "killall vtund" ) ); // } // else // { @@ -11009,7 +11009,7 @@ void KVpnc::disconnectClicked() // delete VtundProcess; // VtundProcess=0L; - disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); sleep ( 2 ); delete VtundProcess; VtundProcess=0L; @@ -11023,20 +11023,20 @@ void KVpnc::disconnectClicked() if ( SshProcess != 0 ) { // SshProcess->tryTerminate(); -// QTimer::singleShot ( 5000, SshProcess, SLOT ( kill() ) ); +// TQTimer::singleShot ( 5000, SshProcess, TQT_SLOT ( kill() ) ); SshProcess->kill(); } // terminateConnection( SshProcess ); - // SshProcess = new QProcess (); + // SshProcess = new TQProcess (); // SshProcess->addArgument( GlobalConfig->pathToKillall ); // SshProcess->addArgument( "openvpn" ); // - // connect( SshProcess, SIGNAL( readyReadStdout() ), this, SLOT( readFromStdout_disconnect() ) ); - // connect( SshProcess, SIGNAL( readyReadStderr() ), this, SLOT( readFromStderr_disconnect() ) ); + // connect( SshProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_disconnect() ) ); + // connect( SshProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_disconnect() ) ); // // if ( !DisconnectProcess->start(env) ) { - // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "killall ssh" ) ); + // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( "killall ssh" ) ); // } else { @@ -11045,11 +11045,11 @@ void KVpnc::disconnectClicked() delete SshProcess; SshProcess=0L; - disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); connectionEnded(); } //connectionEnded(); - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); ConnectingProcess = -1; } else @@ -11057,7 +11057,7 @@ void KVpnc::disconnectClicked() prevConnectionState = disconnected; if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "Not connected.\n" ), GlobalConfig->debug ); - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); ConnectingProcess = -1; } @@ -11070,51 +11070,51 @@ void KVpnc::helpClicked() /* mw->DebugOutput->append( "getting userID:\n" ); - QString leftid = getX509CertificateID( "/etc/racoon/certs/mykeys_thielecke.pem", true ); // we + TQString leftid = getX509CertificateID( "/etc/racoon/certs/mykeys_thielecke.pem", true ); // we mw->DebugOutput->append( "getting issuerID:\n" ); - QString rightid = getX509CertificateID( "/etc/racoon/certs/mykeys_thielecke.pem", false ); // remote + TQString rightid = getX509CertificateID( "/etc/racoon/certs/mykeys_thielecke.pem", false ); // remote */ //doPingTest(); - // QString buggystring= "aaaaa::::bbbb cccc$$$***//////"; - // mw->DebugOutput->append(QString("Buggy string: "+buggystring)); - // buggystring.replace(QRegExp("[*]+"),"_"); - // buggystring.replace(QRegExp("[+] +"),"_"); - // buggystring.replace(QRegExp("[$]+"),"_"); - // buggystring.replace(QRegExp(":+"),"_"); - // buggystring.replace(QRegExp("ￜ"),"_"); - // buggystring.replace(QRegExp("ￜ"),"_"); - // buggystring.replace(QRegExp("+"),"_"); - // buggystring.replace(QRegExp("ￜ"),"_"); - // buggystring.replace(QRegExp("ￜ"),"_"); - // buggystring.replace(QRegExp("ￜ"),"_"); - // buggystring.replace(QRegExp("ￜ"),"_"); - // buggystring.replace(QRegExp("\\+"),"_"); - // buggystring.replace(QRegExp("/+"),"_"); - // buggystring.replace(QRegExp(";+"),"_"); - // buggystring.replace(QRegExp(" "),"_"); - // buggystring.replace(QRegExp("_+"),"_"); + // TQString buggystring= "aaaaa::::bbbb cccc$$$***//////"; + // mw->DebugOutput->append(TQString("Buggy string: "+buggystring)); + // buggystring.replace(TQRegExp("[*]+"),"_"); + // buggystring.replace(TQRegExp("[+] +"),"_"); + // buggystring.replace(TQRegExp("[$]+"),"_"); + // buggystring.replace(TQRegExp(":+"),"_"); + // buggystring.replace(TQRegExp("ￜ"),"_"); + // buggystring.replace(TQRegExp("ￜ"),"_"); + // buggystring.replace(TQRegExp("+"),"_"); + // buggystring.replace(TQRegExp("ￜ"),"_"); + // buggystring.replace(TQRegExp("ￜ"),"_"); + // buggystring.replace(TQRegExp("ￜ"),"_"); + // buggystring.replace(TQRegExp("ￜ"),"_"); + // buggystring.replace(TQRegExp("\\+"),"_"); + // buggystring.replace(TQRegExp("/+"),"_"); + // buggystring.replace(TQRegExp(";+"),"_"); + // buggystring.replace(TQRegExp(" "),"_"); + // buggystring.replace(TQRegExp("_+"),"_"); // - // mw->DebugOutput->append(QString("Buggy string fixed: "+buggystring)); + // mw->DebugOutput->append(TQString("Buggy string fixed: "+buggystring)); // HelpDialog d1; // d1.exec(); // slotStatusMsg ( i18n( "Help dialog called." ), ID_FLASH_MSG ); - // QString host = "www.fdkldghgfdsfjhsjfgdjhsgfds.de"; - // QString ip = Utils( GlobalConfig, parent ).resolveName(host, parent); + // TQString host = "www.fdkldghgfdsfjhsjfgdjhsgfds.de"; + // TQString ip = Utils( GlobalConfig, parent ).resolveName(host, parent); // if (ip=="0.0.0.0") - // KMessageBox::error( this, i18n( "Host \"%1\" could not be resolved!" ).arg(host) ); + // KMessageBox::error( this, i18n( "Host \"%1\" could not be resolved!" ).tqarg(host) ); // else - // mw->DebugOutput->append( QString("first ip of "+host+": "+ip )); + // mw->DebugOutput->append( TQString("first ip of "+host+": "+ip )); // - // QString host2 = "www.hs-harz.de"; - // QString ip2 = Utils( GlobalConfig, parent ).resolveName(host2, parent); + // TQString host2 = "www.hs-harz.de"; + // TQString ip2 = Utils( GlobalConfig, parent ).resolveName(host2, parent); // if (ip2=="0.0.0.0") - // KMessageBox::error( this, i18n( "Host \"%1\" could not be resolved!" ).arg(host2) ); + // KMessageBox::error( this, i18n( "Host \"%1\" could not be resolved!" ).tqarg(host2) ); // else - // mw->DebugOutput->append( QString("first ip of "+host2+": "+ip2 )); + // mw->DebugOutput->append( TQString("first ip of "+host2+": "+ip2 )); // if (Utils( GlobalConfig, parent ).loadKernelModule("parport_pc",parent)) // mw->DebugOutput->append( "Loading module ok" ); @@ -11125,13 +11125,13 @@ void KVpnc::helpClicked() // appHelpActivated (); - // QString bin="/a/b/c/myexe"; + // TQString bin="/a/b/c/myexe"; // kdDebug() << "bin: " << bin.section('/',-1,-1) << endl; // kdDebug() << "path: " << bin.section('/',0,-2) << endl; // // looking for vpnc // if ( GlobalConfig->useDefaultPaths ){ - // GlobalConfig->pathToVpnc= KStandardDirs::findExe("vpnc",QString::null); + // GlobalConfig->pathToVpnc= KStandardDirs::findExe("vpnc",TQString()); // kdDebug() << "vpnc found at; " << GlobalConfig->pathToVpnc << endl; // } // if ( GlobalConfig->pathToVpnc.isEmpty() || KStandardDirs::findExe( GlobalConfig->pathToVpnc.section('/',-1,-1),GlobalConfig->pathToVpnc.section('/',0,-2)).isEmpty()) @@ -11143,13 +11143,13 @@ void KVpnc::helpClicked() /* network tests */ - // QString iface = "eth2"; + // TQString iface = "eth2"; // if ( Utils(GlobalConfig,this).isValidNetworkDevice(iface) ) // std::cout << iface <<" is a valid network interface" << "\n"; // else // std::cout << iface << " is not valid network interface" << "\n"; // - // QString iface2 = "eth3"; + // TQString iface2 = "eth3"; // if ( Utils(GlobalConfig,this).isValidNetworkDevice(iface2) ) // std::cout << iface2 <<" is a valid network interface" << "\n"; // else @@ -11157,41 +11157,41 @@ void KVpnc::helpClicked() /* NetworkInterface iface(GlobalConfig,parent); bool success = iface.interfaceExist( "eth0" ); - QString succString; + TQString succString; if ( success == true ) mw->DebugOutput->append( "Testing interface eth0: success" ); else mw->DebugOutput->append( "Testing interface eth0: failed" ); - QStringList list = iface.getAllNetworkInterfaces(); - QString netliststring=""; - for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) { - QString aa = QString( *it ); + TQStringList list = iface.getAllNetworkInterfaces(); + TQString netliststring=""; + for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) { + TQString aa = TQString( *it ); netliststring+=" "; netliststring+=aa; } mw->DebugOutput->append( "All network interfaces:"+netliststring ); - QString defaultinterface = iface.getDefaultInterface(); + TQString defaultinterface = iface.getDefaultInterface(); if ( defaultinterface.isEmpty() ) defaultinterface += "none"; mw->DebugOutput->append( "Defaultinterface: "+defaultinterface ); - QString interfaceaddress = "Interface address for ip 127.0.0.1: " + iface.getInterfaceAddress( "127.0.0.1" ); + TQString interfaceaddress = "Interface address for ip 127.0.0.1: " + iface.getInterfaceAddress( "127.0.0.1" ); if ( interfaceaddress.isEmpty() ) interfaceaddress += "none"; mw->DebugOutput->append( interfaceaddress ); - QString interfaceip = "Interface IP of eth1:2: " + iface.getInterfaceIP( "eth1:2" ); + TQString interfaceip = "Interface IP of eth1:2: " + iface.getInterfaceIP( "eth1:2" ); if ( interfaceip.isEmpty() ) interfaceip += "none"; mw->DebugOutput->append( interfaceip ); */ // NetworkInterface iface(GlobalConfig,parent); -// QString gatewayofdefaultinterface = "GW IP of default interface: " + iface.getGatewayOfDefaultInterface(); +// TQString gatewayofdefaultinterface = "GW IP of default interface: " + iface.getGatewayOfDefaultInterface(); // mw->DebugOutput->append( gatewayofdefaultinterface ); -// QString NetmaskOfInterface = "netmask IP of interface: " + iface.getNetmaskOfInterface("wlan0"); +// TQString NetmaskOfInterface = "netmask IP of interface: " + iface.getNetmaskOfInterface("wlan0"); // mw->DebugOutput->append( NetmaskOfInterface ); /* if (iface.inSameNetwork("192.168.10.253","255.255.255.0","192.168.10.222","255.255.255.0")) @@ -11205,20 +11205,20 @@ void KVpnc::helpClicked() mw->DebugOutput->append("192.168.10.253 in same network as 192.168.1.2: no"); */ /* - QString gatewayofinterface = "GW IP of interface eth1:1: " + iface.getGatewayOfInterface("eth1:1"); + TQString gatewayofinterface = "GW IP of interface eth1:1: " + iface.getGatewayOfInterface("eth1:1"); mw->DebugOutput->append( gatewayofinterface ); mw->DebugOutput->append( "www.sun.de => "+Utils(GlobalConfig).resolveName("www.sun.de") ); */ /* - QString ipstring = "aaa\ngot address 194.95.192.28\nbbbb\ncccc"; - mw->DebugOutput->append(QString("Ipstring: \n"+ipstring)); - QString ip = ipstring.section('\n',1,1); + TQString ipstring = "aaa\ngot address 194.95.192.28\nbbbb\ncccc"; + mw->DebugOutput->append(TQString("Ipstring: \n"+ipstring)); + TQString ip = ipstring.section('\n',1,1); ip = ip.right(ip.length()-12); - mw->DebugOutput->append(QString("Ip: "+ip)); + mw->DebugOutput->append(TQString("Ip: "+ip)); */ // NetworkInterface iface(parent); - // QString extIP = iface.getExternalIpAddress(); + // TQString extIP = iface.getExternalIpAddress(); // if ( extIP.isEmpty() ) // extIP += "none"; // @@ -11232,30 +11232,30 @@ void KVpnc::helpClicked() // if (GlobalConfig->wallet != 0) // { // - // QString walletname="kvpnc"; + // TQString walletname="kvpnc"; // // Check if folder exists, otherwise create it // // if (!GlobalConfig->wallet->hasFolder(walletname)) // { // bool walletOK = GlobalConfig->wallet->createFolder(walletname); // GlobalConfig->wallet->setFolder(walletname); - // QString account="HS"; + // TQString account="HS"; // - // QString loginname="masta"; - // QString pwd="secret"; + // TQString loginname="masta"; + // TQString pwd="secret"; // std::cout << "[set] account: " << account << ", loginname: " << loginname << ", password: " << pwd << std::endl; // - // bool pwdOK = (GlobalConfig->wallet->writePassword (QString(account+"_"+loginname), pwd) == 0); + // bool pwdOK = (GlobalConfig->wallet->writePassword (TQString(account+"_"+loginname), pwd) == 0); // std::cout << "success: " << pwdOK << std::endl; // } // // Read password entry // // { // GlobalConfig->wallet->setFolder(walletname); - // QString loginname="masta"; - // QString pwd=""; - // QString account="HS"; - // bool pwdOK = (GlobalConfig->wallet->readPassword(QString(account+"_"+loginname), pwd) == 0); + // TQString loginname="masta"; + // TQString pwd=""; + // TQString account="HS"; + // bool pwdOK = (GlobalConfig->wallet->readPassword(TQString(account+"_"+loginname), pwd) == 0); // std::cout << "success: " << pwdOK << std::endl; // std::cout << "[get]: loginname: " << loginname << ", password: " << pwd << std::endl; // @@ -11263,12 +11263,12 @@ void KVpnc::helpClicked() // } // } - // QStringList ciphers = Utils(GlobalConfig).getOpenvpnCiphers(); + // TQStringList ciphers = Utils(GlobalConfig).getOpenvpnCiphers(); // // std::cout << "ciphers: " << std::endl ; // - // for ( QStringList::Iterator it = ciphers.begin(); it != ciphers.end(); ++it ) { - // std::cout << QString(*it).ascii() << "\n"; + // for ( TQStringList::Iterator it = ciphers.begin(); it != ciphers.end(); ++it ) { + // std::cout << TQString(*it).ascii() << "\n"; // } // std::cout << std::endl; @@ -11280,9 +11280,9 @@ void KVpnc::helpClicked() // mw->DebugOutput->append("private key dont need a passprase "); /* - QString testfilename="sfsd/::::( *#v v###\\"; - QString cleanedUpName = Utils(this->GlobalConfig).removeSpecialCharsForFilename( testfilename); - cQString("testfilename: \"%1\", cleaned up: \"%2\"").arg(testfilename).arg(cleanedUpName)); + TQString testfilename="sfsd/::::( *#v v###\\"; + TQString cleanedUpName = Utils(this->GlobalConfig).removeSpecialCharsForFilename( testfilename); + cTQString("testfilename: \"%1\", cleaned up: \"%2\"").tqarg(testfilename).tqarg(cleanedUpName)); */ // GlobalConfig->exportKvpncConfig("./kvpnc_export.xml"); @@ -11331,19 +11331,19 @@ void KVpnc::helpClicked() // Utils::IpsecAlgos KernelCrypto = Utils ( GlobalConfig ).getKernelCrypto(); // // // phase 2 encr algos from kernel -// QString EncrAlgos=""; -// for ( QStringList::Iterator it = KernelCrypto.IpsecEspEncryptionAlgorithms.begin(); it != KernelCrypto.IpsecEspEncryptionAlgorithms.end(); ++it ) +// TQString EncrAlgos=""; +// for ( TQStringList::Iterator it = KernelCrypto.IpsecEspEncryptionAlgorithms.begin(); it != KernelCrypto.IpsecEspEncryptionAlgorithms.end(); ++it ) // { -// EncrAlgos+= QString(", "+*it ); +// EncrAlgos+= TQString(", "+*it ); // } // mw->DebugOutput->append( "Kernel encryption algos:\n"); // mw->DebugOutput->append( EncrAlgos+"\n"); // // // phase 2 auth algos from kernel -// QString AuthAlgos=""; -// for ( QStringList::Iterator it = KernelCrypto.IpsecEspAuthenticationAlgorithms.begin(); it != KernelCrypto.IpsecEspAuthenticationAlgorithms.end(); ++it ) +// TQString AuthAlgos=""; +// for ( TQStringList::Iterator it = KernelCrypto.IpsecEspAuthenticationAlgorithms.begin(); it != KernelCrypto.IpsecEspAuthenticationAlgorithms.end(); ++it ) // { -// AuthAlgos+= QString(", "+*it ); +// AuthAlgos+= TQString(", "+*it ); // } // mw->DebugOutput->append( "Kernel auth algos:\n"); // mw->DebugOutput->append( AuthAlgos+"\n"); @@ -11369,8 +11369,8 @@ void KVpnc::vpnTypesInfoClicked() void KVpnc::donateClicked() { this->slotStatusMsg ( i18n ( "Calling KVpnc website..." ), ID_FLASH_MSG ); - QString donateurl = "http://home.gna.org/kvpnc/en/donate.html"; - QString browser = QString ( KConfigGroup ( KGlobal::config(), "General" ).readEntry ( "BrowserApplication" ) ).remove ( "!", "" ); + TQString donateurl = "http://home.gna.org/kvpnc/en/donate.html"; + TQString browser = TQString ( KConfigGroup ( KGlobal::config(), "General" ).readEntry ( "BrowserApplication" ) ).remove ( "!", "" ); if ( browser.isEmpty() ) browser = "konqueror"; @@ -11379,12 +11379,12 @@ void KVpnc::donateClicked() if ( run ) ; -// DonateProcess = new QProcess ( this ); +// DonateProcess = new TQProcess ( this ); // DonateProcess->addArgument ( browser ); // DonateProcess->addArgument ( donateurl ); // -// // connect( DonateProcess, SIGNAL( readyReadStdout() ), this, SLOT( readFromStdout_bugreport() ) ); -// // connect( DonateProcess, SIGNAL( readyReadStderr() ), this, SLOT( readFromStderr_bugreport() ) ); +// // connect( DonateProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_bugreport() ) ); +// // connect( DonateProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_bugreport() ) ); // // if ( !DonateProcess->start(env) ) // { @@ -11406,8 +11406,8 @@ void KVpnc::donateClicked() void KVpnc::reportBugClicked() { - QString bugreporturl = "https://gna.org/bugs/?group=kvpnc"; - QString browser = QString ( KConfigGroup ( KGlobal::config(), "General" ).readEntry ( "BrowserApplication" ) ).remove ( "!", "" ); + TQString bugreporturl = "https://gna.org/bugs/?group=kvpnc"; + TQString browser = TQString ( KConfigGroup ( KGlobal::config(), "General" ).readEntry ( "BrowserApplication" ) ).remove ( "!", "" ); if ( browser.isEmpty() ) browser = "konqueror"; @@ -11416,12 +11416,12 @@ void KVpnc::reportBugClicked() // if ( run ) // ; - BugReportProcess = new QProcess ( this ); + BugReportProcess = new TQProcess ( this ); BugReportProcess->addArgument ( browser ); BugReportProcess->addArgument ( bugreporturl ); - // connect( BugReportProcess, SIGNAL( readyReadStdout() ), this, SLOT( readFromStdout_bugreport() ) ); - // connect( BugReportProcess, SIGNAL( readyReadStderr() ), this, SLOT( readFromStderr_bugreport() ) ); + // connect( BugReportProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_bugreport() ) ); + // connect( BugReportProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_bugreport() ) ); if ( !BugReportProcess->start ( env ) ) { @@ -11454,7 +11454,7 @@ void KVpnc::readOutputFrom_vpnc() while ( VpncProcess->canReadLineStdout() ) { ProcessMsg_connect = VpncProcess->readLineStdout(); - // ProcessMsg_connect = QString( VpncProcess->readStdout() ); + // ProcessMsg_connect = TQString( VpncProcess->readStdout() ); if ( deviceaddrstr2addr ) @@ -11462,13 +11462,13 @@ void KVpnc::readOutputFrom_vpnc() deviceaddrstr = ProcessMsg_connect; // if (GlobalConfig->KvpncDebugLevel > 0) - // this->GlobalConfig->appendLogEntry ( QString ( "deviceaddrstr: " + deviceaddrstr ),GlobalConfig->debug); - deviceaddr = "addr: " + QString ( deviceaddrstr.simplifyWhiteSpace ().section ( ' ', 1, 1 ) ).section ( ':', 1, 1 ); + // this->GlobalConfig->appendLogEntry ( TQString ( "deviceaddrstr: " + deviceaddrstr ),GlobalConfig->debug); + deviceaddr = "addr: " + TQString ( deviceaddrstr.simplifyWhiteSpace ().section ( ' ', 1, 1 ) ).section ( ':', 1, 1 ); // if (GlobalConfig->KvpncDebugLevel > 0) // this->GlobalConfig->appendLogEntry ( deviceaddr,GlobalConfig->debug); // deviceaddrstr2addr = false; - //disconnect( VpncProcess, SIGNAL( readyReadStdout() ), this, SLOT( readOutputFrom_vpnc() ) ); - //disconnect( VpncProcess, SIGNAL( readyReadStderr() ), this, SLOT( readOutputFrom_vpnc() ) ); + //disconnect( VpncProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutputFrom_vpnc() ) ); + //disconnect( VpncProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readOutputFrom_vpnc() ) ); } /* TMP !!!! */ @@ -11480,7 +11480,7 @@ void KVpnc::readOutputFrom_vpnc() - QString GrpPassStr = ""; + TQString GrpPassStr = ""; GrpPassStr = GlobalConfig->TmpGroupPassword; @@ -11488,7 +11488,7 @@ void KVpnc::readOutputFrom_vpnc() VpncProcess->writeToStdin ( "\n" ); if ( GlobalConfig->KvpncDebugLevel > 6 ) - GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "Group password: %1" ).arg(GrpPassStr), GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "Group password: %1" ).tqarg(GrpPassStr), GlobalConfig->debug ); } @@ -11499,12 +11499,12 @@ void KVpnc::readOutputFrom_vpnc() if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "User password requested, send it..." ), GlobalConfig->debug ); - QString UserPassStr = GlobalConfig->TmpPassword; + TQString UserPassStr = GlobalConfig->TmpPassword; VpncProcess->writeToStdin ( UserPassStr ); VpncProcess->writeToStdin ( "\n" ); if ( GlobalConfig->KvpncDebugLevel > 6 ) - GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "User password: %1" ).arg(UserPassStr), GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "User password: %1" ).tqarg(UserPassStr), GlobalConfig->debug ); } @@ -11516,8 +11516,8 @@ void KVpnc::readOutputFrom_vpnc() { if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "IPSec gateway address requested, send it..." ), GlobalConfig->debug ); - //QString GatewayStr = GlobalConfig->currentProfile->getGateway(); - QString GatewayStr = GlobalConfig->TmpGatewayIP; + //TQString GatewayStr = GlobalConfig->currentProfile->getGateway(); + TQString GatewayStr = GlobalConfig->TmpGatewayIP; VpncProcess->writeToStdin ( GatewayStr ); VpncProcess->writeToStdin ( "\n" ); } @@ -11528,7 +11528,7 @@ void KVpnc::readOutputFrom_vpnc() { if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "IPSec ID requested, send it..." ), GlobalConfig->debug ); - QString IpsecIDStr = GlobalConfig->currentProfile->getID(); + TQString IpsecIDStr = GlobalConfig->currentProfile->getID(); VpncProcess->writeToStdin ( IpsecIDStr ); VpncProcess->writeToStdin ( "\n" ); } @@ -11539,14 +11539,14 @@ void KVpnc::readOutputFrom_vpnc() if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "Username requested, send it..." ), GlobalConfig->debug ); - QString UsernameStr; + TQString UsernameStr; UsernameStr = GlobalConfig->TmpUsername; VpncProcess->writeToStdin ( UsernameStr ); VpncProcess->writeToStdin ( "\n" ); if ( GlobalConfig->KvpncDebugLevel > 6 ) - GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "User name: %1" ).arg(UsernameStr), GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "User name: %1" ).tqarg(UsernameStr), GlobalConfig->debug ); } @@ -11590,11 +11590,11 @@ void KVpnc::readOutputFrom_vpnc() GlobalConfig->status = GlobalConfig->connected; timer.stop(); connectCounter=0; - disconnect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) ); + disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); - connect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) ); + connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); durationTimer.start ( 1000, FALSE ); - setGuiStatus ( connected ); + setGuitqStatus ( connected ); connectSuccess = false; NetworkInterface iface ( GlobalConfig, parent ); @@ -11620,16 +11620,16 @@ void KVpnc::readOutputFrom_vpnc() bool abort = false; bool doContinue = true; - //ProcessMsg_connect = QString(VpncProcess->readStdout()); + //ProcessMsg_connect = TQString(VpncProcess->readStdout()); // if ( this->GlobalConfig->VpncDebugLevel > 0 ) - // this->GlobalConfig->appendLogEntry ( QString ( "[vpnc err] " + ProcessMsg_connect ) , GlobalConfig->error); + // this->GlobalConfig->appendLogEntry ( TQString ( "[vpnc err] " + ProcessMsg_connect ) , GlobalConfig->error); if ( ProcessMsg_connect.find ( "AUTHENTICATION_FAILED", 0, FALSE ) > -1 ) { timer.stop(); connectCounter=0; - disconnect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) ); + disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); KMessageBox::error ( this, i18n ( "Authentication failed (%1)!" ).arg ( i18n ( "group password" ) ) ); GlobalConfig->appendLogEntry ( i18n ( "Authentication failed (%1)!" ).arg ( i18n ( "group password" ) ) , GlobalConfig->error ); //abort = true; @@ -11643,12 +11643,12 @@ void KVpnc::readOutputFrom_vpnc() { timer.stop(); connectCounter=0; - disconnect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) ); + disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); KMessageBox::error ( this, i18n ( "Connection rejected because wrong settings sent to the VPN server. Please check your settings." ) ) ; GlobalConfig->appendLogEntry ( i18n ( "Connection rejected because wrong settings sent to the VPN server. Please check your settings." ) , GlobalConfig->error ); abort = true; AuthRetry = false; - disconnect ( VpncProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readOutputFrom_vpnc() ) ); + disconnect ( VpncProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readOutputFrom_vpnc() ) ); timer.stop(); connectClicked(); } @@ -11657,13 +11657,13 @@ void KVpnc::readOutputFrom_vpnc() { timer.stop(); connectCounter=0; - disconnect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) ); + disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); KMessageBox::error ( this, i18n ( "Authentication failed (%1)!" ).arg ( i18n ( "user password" ) ) ); GlobalConfig->appendLogEntry ( i18n ( "Authentication failed (%1)!" ).arg ( i18n ( "user password" ) ) , GlobalConfig->error ); //abort = true; AuthRetry = true; GlobalConfig->haveUserData = false; - disconnect ( VpncProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readOutputFrom_vpnc() ) ); + disconnect ( VpncProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readOutputFrom_vpnc() ) ); timer.stop(); connectClicked(); } @@ -11673,7 +11673,7 @@ void KVpnc::readOutputFrom_vpnc() { timer.stop(); connectCounter=0; - disconnect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) ); + disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); KMessageBox::error ( this, i18n ( "You have to enter a IP address for the remote gateway!" ) ); GlobalConfig->appendLogEntry ( i18n ( "You have to enter a IP address for the remote gateway!" ) , GlobalConfig->error ); abort = true; @@ -11684,7 +11684,7 @@ void KVpnc::readOutputFrom_vpnc() { timer.stop(); connectCounter=0; - disconnect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) ); + disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); KMessageBox::error ( this, i18n ( "No response from VPN server" ) ); GlobalConfig->appendLogEntry ( i18n ( "No response from VPN server" ) , GlobalConfig->error ); abort = true; @@ -11695,7 +11695,7 @@ void KVpnc::readOutputFrom_vpnc() { timer.stop(); connectCounter=0; - disconnect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) ); + disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); KMessageBox::error ( this, i18n ( "Tunnel interface can't be initalized" ) ); GlobalConfig->appendLogEntry ( i18n ( "Tunnel interface can't be initalized" ) , GlobalConfig->error ); abort = true; @@ -11718,7 +11718,7 @@ void KVpnc::readOutputFrom_vpnc() { timer.stop(); connectCounter=0; - disconnect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) ); + disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); KMessageBox::error ( this, i18n ( "Host unknown" ) ); GlobalConfig->appendLogEntry ( i18n ( "Host unknown" ) , GlobalConfig->error ); abort = true; @@ -11729,7 +11729,7 @@ void KVpnc::readOutputFrom_vpnc() { timer.stop(); connectCounter=0; - disconnect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) ); + disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); KMessageBox::error ( this, i18n ( "Socket creation failed" ) ); GlobalConfig->appendLogEntry ( i18n ( "Socket creation failed" ) , GlobalConfig->error ); abort = true; @@ -11739,7 +11739,7 @@ void KVpnc::readOutputFrom_vpnc() { timer.stop(); connectCounter=0; - disconnect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) ); + disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); KMessageBox::error ( this, i18n ( "Connection to the Cisco server was refused" ) ); GlobalConfig->appendLogEntry ( i18n ( "receiving packet: Connection refused" ) , GlobalConfig->error ); abort = true; @@ -11750,28 +11750,28 @@ void KVpnc::readOutputFrom_vpnc() { timer.stop(); connectCounter=0; - disconnect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) ); + disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); // if ( GlobalConfig->KvpncDebugLevel > 0 ) // GlobalConfig->appendLogEntry( i18n( "Binding to port failed. Another vpnc is running, terminate it and try reconnect ." ), GlobalConfig->debug ); - GlobalConfig->appendLogEntry ( QString ( "binding" + ProcessMsg_connect ), GlobalConfig->debug ); - // QFile oldpidfile( tmpPath + "vpnc-pid." + GlobalConfig->currentProfile->getName() + ".pid" ); + GlobalConfig->appendLogEntry ( TQString ( "binding" + ProcessMsg_connect ), GlobalConfig->debug ); + // TQFile oldpidfile( tmpPath + "vpnc-pid." + GlobalConfig->currentProfile->getName() + ".pid" ); // if (oldpidfile.exists()) // { // if ( GlobalConfig->KvpncDebugLevel > 0 ) - // GlobalConfig->appendLogEntry( i18n( "Old pid file found: %1" ).arg(oldpidfile.name()), GlobalConfig->debug ); - // QTextStream pidFileStream( &oldpidfile ); - // QString Vpnc_pid = ""; + // GlobalConfig->appendLogEntry( i18n( "Old pid file found: %1" ).tqarg(oldpidfile.name()), GlobalConfig->debug ); + // TQTextStream pidFileStream( &oldpidfile ); + // TQString Vpnc_pid = ""; // if ( oldpidfile.open( IO_ReadOnly ) ) // { // Vpnc_pid = pidFileStream.readLine(); // oldpidfile.close(); // } - // QProcess killvpncprocess(this); + // TQProcess killvpncprocess(this); // if ( !Vpnc_pid.isEmpty() ) // { // // if ( GlobalConfig->KvpncDebugLevel > 0 ) - // GlobalConfig->appendLogEntry( i18n( "Vpnc pid file contains a pid: %1, try to terminate the process with this pid." ).arg( Vpnc_pid ) , GlobalConfig->debug); + // GlobalConfig->appendLogEntry( i18n( "Vpnc pid file contains a pid: %1, try to terminate the process with this pid." ).tqarg( Vpnc_pid ) , GlobalConfig->debug); // killvpncprocess.addArgument(GlobalConfig->pathToKill); // killvpncprocess.addArgument("-3"); // killvpncprocess.addArgument(Vpnc_pid); @@ -11787,7 +11787,7 @@ void KVpnc::readOutputFrom_vpnc() // killvpncprocess.addArgument("vpnc"); // // if (!killvpncprocess.start()) - // GlobalConfig->appendLogEntry( i18n( "%1 could not be killed." ).arg("vpnc") ,GlobalConfig->error); + // GlobalConfig->appendLogEntry( i18n( "%1 could not be killed." ).tqarg("vpnc") ,GlobalConfig->error); // // while (killvpncprocess.isRunning()) // parent->processEvents(); @@ -11795,12 +11795,12 @@ void KVpnc::readOutputFrom_vpnc() // else // { // //kill vpnc - // QProcess killvpncprocess(this); + // TQProcess killvpncprocess(this); // killvpncprocess.addArgument(GlobalConfig->pathToKillall); // killvpncprocess.addArgument("vpnc"); // // if (!killvpncprocess.start()) - // GlobalConfig->appendLogEntry( i18n( "%1 could not be killed." ).arg("vpnc") ,GlobalConfig->error); + // GlobalConfig->appendLogEntry( i18n( "%1 could not be killed." ).tqarg("vpnc") ,GlobalConfig->error); // // while (killvpncprocess.isRunning()) // parent->processEvents(); @@ -11813,22 +11813,22 @@ void KVpnc::readOutputFrom_vpnc() // // VpncDisconnectScript = tmpPath + "vpnc-disconnect." + GlobalConfig->currentProfile->getID() + ".sh"; // - // QString OldDefaultroute=""; - // QString oldProfileName=""; + // TQString OldDefaultroute=""; + // TQString oldProfileName=""; // - // QDir tmpDir(tmpPath); + // TQDir tmpDir(tmpPath); // - // QStringList lst = tmpDir.entryList( "default-route.*" ); + // TQStringList lst = tmpDir.entryList( "default-route.*" ); // if (!lst.isEmpty()) // { // OldDefaultroute = lst.first(); // default-route. // // if ( GlobalConfig->KvpncDebugLevel > 0 ) - // GlobalConfig->appendLogEntry( i18n( "Old defaultroute file found: %1" ).arg(OldDefaultroute), GlobalConfig->debug ); + // GlobalConfig->appendLogEntry( i18n( "Old defaultroute file found: %1" ).tqarg(OldDefaultroute), GlobalConfig->debug ); // // - // QFile file( VpncDisconnectScript ); - // QTextStream stream( &file ); + // TQFile file( VpncDisconnectScript ); + // TQTextStream stream( &file ); // if ( file.open( IO_WriteOnly ) ) // { // // stream << "#!"<< GlobalConfig->InterpreterShell << "\n"; @@ -11848,7 +11848,7 @@ void KVpnc::readOutputFrom_vpnc() // stream << "if [ -f /sbin/resolvconf ] ; then\n"; // stream << "sbin/resolvconf -d "+GlobalConfig->DnsDevice+"\n"; // oldProfileName=OldDefaultroute.section('/',-2,-1); // /root/.kde/share/apps/kvpnc/default-route. -> - // if (!oldProfileName.isEmpty() &&QFile("/etc/resolv.conf.before.kvpnc_"+oldProfileName).exists() ) + // if (!oldProfileName.isEmpty() &&TQFile("/etc/resolv.conf.before.kvpnc_"+oldProfileName).exists() ) // { // if ( GlobalConfig->KvpncDebugLevel > 0 ) // GlobalConfig->appendLogEntry( i18n( "Old resolv.conf file found, restore it." ), GlobalConfig->debug ); @@ -11867,23 +11867,23 @@ void KVpnc::readOutputFrom_vpnc() // } // file.close(); // - // DisconnectProcess = new QProcess (); + // DisconnectProcess = new TQProcess (); // DisconnectProcess->addArgument( GlobalConfig->InterpreterShell ); // DisconnectProcess->addArgument( VpncDisconnectScript ); // - // connect( DisconnectProcess, SIGNAL( readyReadStdout() ), this, SLOT( readFromStdout_disconnect() ) ); - // connect( DisconnectProcess, SIGNAL( readyReadStderr() ), this, SLOT( readFromStderr_disconnect() ) ); + // connect( DisconnectProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_disconnect() ) ); + // connect( DisconnectProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_disconnect() ) ); // // if ( !DisconnectProcess->start(env) ) // { - // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "vpnc_disconnect" ) ); + // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( "vpnc_disconnect" ) ); // } // else // { // if ( GlobalConfig->KvpncDebugLevel > 0 ) // GlobalConfig->appendLogEntry( i18n( "Disconnect script started." ), GlobalConfig->debug ); // } - // setGuiStatus(disconnected); + // setGuitqStatus(disconnected); // connectionEnded(); // } // @@ -11892,15 +11892,15 @@ void KVpnc::readOutputFrom_vpnc() // // connectClicked(); - QString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( 500 ); + TQString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( 500 ); GlobalConfig->appendLogEntry ( i18n ( "NameAndPid: %1" ).arg ( NameAndPid ) , GlobalConfig->debug ); int pid = -1; - QString Name = ""; + TQString Name = ""; if ( !NameAndPid.isEmpty() ) { pid = NameAndPid.section ( '/', 0, 0 ).toInt(); Name = NameAndPid.section ( '/', 1, 1 ); - KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( QString().setNum ( 500 ) ).arg ( Name ).arg ( QString().setNum ( pid ) ) ); + KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( TQString().setNum ( 500 ) ).arg ( Name ).arg ( TQString().setNum ( pid ) ) ); } else KMessageBox::error ( this, i18n ( "Port binding failed" ) ); @@ -11922,24 +11922,24 @@ void KVpnc::readOutputFrom_vpnc() // if ( GlobalConfig->KvpncDebugLevel > 0 ) // GlobalConfig->appendLogEntry( i18n( "Binding to port failed. Another program is running at this port, terminate it and try reconnect ." ), GlobalConfig->debug ); /* - QFile oldpidfile( tmpPath + "vpnc-pid." + GlobalConfig->currentProfile->getName() + ".pid" ); + TQFile oldpidfile( tmpPath + "vpnc-pid." + GlobalConfig->currentProfile->getName() + ".pid" ); if (oldpidfile.exists()) { if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry( i18n( "Old pid file found: %1" ).arg(oldpidfile.name()), GlobalConfig->debug ); - QTextStream pidFileStream( &oldpidfile ); - QString Vpnc_pid = ""; + GlobalConfig->appendLogEntry( i18n( "Old pid file found: %1" ).tqarg(oldpidfile.name()), GlobalConfig->debug ); + TQTextStream pidFileStream( &oldpidfile ); + TQString Vpnc_pid = ""; if ( oldpidfile.open( IO_ReadOnly ) ) { Vpnc_pid = pidFileStream.readLine(); oldpidfile.close(); } - QProcess killvpncprocess(this); + TQProcess killvpncprocess(this); if ( !Vpnc_pid.isEmpty() ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry( i18n( "Vpnc pid file contains a pid: %1, try to terminate the process with this pid." ).arg( Vpnc_pid ) , GlobalConfig->debug); + GlobalConfig->appendLogEntry( i18n( "Vpnc pid file contains a pid: %1, try to terminate the process with this pid." ).tqarg( Vpnc_pid ) , GlobalConfig->debug); killvpncprocess.addArgument(GlobalConfig->pathToKill); killvpncprocess.addArgument("-3"); killvpncprocess.addArgument(Vpnc_pid); @@ -11955,7 +11955,7 @@ void KVpnc::readOutputFrom_vpnc() killvpncprocess.addArgument("vpnc"); if (!killvpncprocess.start()) - GlobalConfig->appendLogEntry( i18n( "%1 could not be killed." ).arg("vpnc") ,GlobalConfig->error); + GlobalConfig->appendLogEntry( i18n( "%1 could not be killed." ).tqarg("vpnc") ,GlobalConfig->error); while (killvpncprocess.isRunning()) parent->processEvents(); @@ -11963,12 +11963,12 @@ void KVpnc::readOutputFrom_vpnc() else { //kill vpnc - QProcess killvpncprocess(this); + TQProcess killvpncprocess(this); killvpncprocess.addArgument(GlobalConfig->pathToKillall); killvpncprocess.addArgument("vpnc"); if (!killvpncprocess.start()) - GlobalConfig->appendLogEntry( i18n( "%1 could not be killed." ).arg("vpnc") ,GlobalConfig->error); + GlobalConfig->appendLogEntry( i18n( "%1 could not be killed." ).tqarg("vpnc") ,GlobalConfig->error); while (killvpncprocess.isRunning()) parent->processEvents(); @@ -11990,7 +11990,7 @@ void KVpnc::readOutputFrom_vpnc() { timer.stop(); connectCounter=0; - disconnect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) ); + disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); KMessageBox::error ( this, i18n ( "No network reachable" ) ); GlobalConfig->appendLogEntry ( i18n ( "No network reachable" ) , GlobalConfig->error ); terminateConnection ( VpncProcess ); @@ -12001,7 +12001,7 @@ void KVpnc::readOutputFrom_vpnc() { timer.stop(); connectCounter=0; - disconnect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) ); + disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); KMessageBox::error ( this, i18n ( "Invalid ISAKMP exchange type received" ) ); GlobalConfig->appendLogEntry ( i18n ( "Invalid ISAKMP exchange type received" ) , GlobalConfig->error ); abort = true; @@ -12079,17 +12079,17 @@ void KVpnc::readOutputFrom_ciscovpnc() bool terminatedByClient=false; //mw->DebugOutput->append( "readOutputFrom_vpnc!\n" ); - QString line2 = QString ( CiscoVpncProcess->readStdout() ); - QStringList lines = QStringList::split ( '\n', line2 ); - for ( QStringList::Iterator it = lines.begin(); it != lines.end(); ++it ) + TQString line2 = TQString ( CiscoVpncProcess->readStdout() ); + TQStringList lines = TQStringList::split ( '\n', line2 ); + for ( TQStringList::Iterator it = lines.begin(); it != lines.end(); ++it ) // while ( CiscoVpncProcess->canReadLineStdout() ) { -// QString ProcessMsg_connect = CiscoVpncProcess->readLineStdout(); -// QString ProcessMsg_connect = QString( CiscoVpncProcess->readStdout() ); - QString ProcessMsg_connect = *it; +// TQString ProcessMsg_connect = CiscoVpncProcess->readLineStdout(); +// TQString ProcessMsg_connect = TQString( CiscoVpncProcess->readStdout() ); + TQString ProcessMsg_connect = *it; if ( GlobalConfig->KvpncDebugLevel> 3 ) - GlobalConfig->appendLogEntry ( QString ( "[vpnclient raw]: " ) +ProcessMsg_connect , GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( TQString ( "[vpnclient raw]: " ) +ProcessMsg_connect , GlobalConfig->debug ); if ( ProcessMsg_connect.find ( "illegal read", 0 , FALSE ) > -1 ) @@ -12116,17 +12116,17 @@ void KVpnc::readOutputFrom_ciscovpnc() { // if ( GlobalConfig->KvpncDebugLevel > 0 ) // GlobalConfig->appendLogEntry( i18n( "Binding to port failed. Another vpnc is running, terminate it and try reconnect ." ), GlobalConfig->debug ); - GlobalConfig->appendLogEntry ( QString ( "binding" + ProcessMsg_connect ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( TQString ( "binding" + ProcessMsg_connect ), GlobalConfig->debug ); - QString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( 500 ); + TQString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( 500 ); GlobalConfig->appendLogEntry ( i18n ( "NameAndPid: %1" ).arg ( NameAndPid ) , GlobalConfig->debug ); int pid = -1; - QString Name = ""; + TQString Name = ""; if ( !NameAndPid.isEmpty() ) { pid = NameAndPid.section ( '/', 0, 0 ).toInt(); Name = NameAndPid.section ( '/', 1, 1 ); - KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( QString().setNum ( 500 ) ).arg ( Name ).arg ( QString().setNum ( pid ) ) ); + KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( TQString().setNum ( 500 ) ).arg ( Name ).arg ( TQString().setNum ( pid ) ) ); } else KMessageBox::error ( this, i18n ( "Port binding failed" ) ); @@ -12169,7 +12169,7 @@ void KVpnc::readOutputFrom_ciscovpnc() if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( "[vpnclient] " + i18n ( "Username requested, send it...\n" ), GlobalConfig->debug ); - QString UsernameStr; + TQString UsernameStr; if ( !GlobalConfig->currentProfile->getDontSaveUsername() ) UsernameStr = GlobalConfig->currentProfile->getUserName(); else @@ -12186,7 +12186,7 @@ void KVpnc::readOutputFrom_ciscovpnc() if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( "[vpnclient] " + i18n ( "User password requested, send it...\n" ), GlobalConfig->debug ); - QString UserPassStr = ""; + TQString UserPassStr = ""; if ( !GlobalConfig->currentProfile->getSaveUserPassword() || AuthRetry ) UserPassStr = GlobalConfig->TmpPassword; else @@ -12205,7 +12205,7 @@ void KVpnc::readOutputFrom_ciscovpnc() { timer.stop(); connectCounter=0; - disconnect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) ); + disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); KMessageBox::error ( this, i18n ( "Authentication failed (%1)!" ).arg ( i18n ( "group password" ) ) ); GlobalConfig->appendLogEntry ( i18n ( "Authentication failed (%1)!" ).arg ( i18n ( "group password" ) ) , GlobalConfig->error ); //abort = true; @@ -12238,7 +12238,7 @@ void KVpnc::readOutputFrom_ciscovpnc() if ( GlobalConfig->VpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( "[vpnclient] " + i18n ( "Certificate password requested, send it...\n" ), GlobalConfig->debug ); - QString PrivKeyPassStr = ""; + TQString PrivKeyPassStr = ""; // if (GlobalConfig->currentProfile->getSavePsk()) PrivKeyPassStr = GlobalConfig->currentProfile->getPrivateKeyPass(); // else @@ -12246,14 +12246,14 @@ void KVpnc::readOutputFrom_ciscovpnc() if ( PrivKeyPassStr.isEmpty() ) { GlobalConfig->TmpPrivateKeyPass = ""; - QString pass=""; + TQString pass=""; bool allowEmptyPassword=true; EnterXauthInteractivePasscodeDialog dlg ( 0, allowEmptyPassword); dlg.setCaption(i18n ( "Enter certificate password" ) ); dlg.main->DescriptionLabel->setText ( i18n ( "Enter certificate password to unlock certificate:" ) ); dlg.main->LabelPassword->setText ( i18n ( "Certificate password:" ) ); dlg.main->SavePasswordCheckBox->setText ( i18n ( "Save certificate password" ) ); -// dlg.resize(QSize(dlg.width()+20,dlg.height())); +// dlg.resize(TQSize(dlg.width()+20,dlg.height())); dlg.main->PasswordEdit->setFocus(); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( "[vpnclient] " + i18n ( "Password for certificate requested...\n" ), GlobalConfig->debug ); @@ -12274,10 +12274,10 @@ void KVpnc::readOutputFrom_ciscovpnc() if ( dlg.main->SavePasswordCheckBox->isChecked() ) { GlobalConfig->currentProfile->setSavePrivateKeyPassword ( true ); - GlobalConfig->currentProfile->setPrivateKeyPass ( QString ( pass ) ); + GlobalConfig->currentProfile->setPrivateKeyPass ( TQString ( pass ) ); } - GlobalConfig->TmpPrivateKeyPass = QString ( pass ); + GlobalConfig->TmpPrivateKeyPass = TQString ( pass ); // if ( GlobalConfig->KvpncDebugLevel > 5 ) // GlobalConfig->appendLogEntry( "[vpnclient]: private key password: " + GlobalConfig->TmpPrivateKeyPass, GlobalConfig->debug ); @@ -12322,7 +12322,7 @@ void KVpnc::readOutputFrom_ciscovpnc() //abort = true; AuthRetry = true; GlobalConfig->haveUserData = false; - disconnect ( CiscoVpncProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readOutputFrom_ciscovpnc() ) ); + disconnect ( CiscoVpncProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readOutputFrom_ciscovpnc() ) ); timer.stop(); connectClicked(); } @@ -12358,14 +12358,14 @@ void KVpnc::readOutputFrom_ciscovpnc() if ( ProcessMsg_connect.find ( "Encryption:",0,FALSE ) > -1 ) { - QString Encryption = ProcessMsg_connect.section ( ':',1,1 ).stripWhiteSpace(); + TQString Encryption = ProcessMsg_connect.section ( ':',1,1 ).stripWhiteSpace(); if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "Encrypion algorithm used: %1" ).arg ( Encryption ),GlobalConfig->debug ); } if ( ProcessMsg_connect.find ( "Authentication:",0,FALSE ) > -1 ) { - QString Authentication = ProcessMsg_connect.section ( ':',1,1 ).stripWhiteSpace(); + TQString Authentication = ProcessMsg_connect.section ( ':',1,1 ).stripWhiteSpace(); if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "Authentication algorithm used: %1" ).arg ( Authentication ),GlobalConfig->debug ); } @@ -12380,11 +12380,11 @@ void KVpnc::readOutputFrom_ciscovpnc() GlobalConfig->status = GlobalConfig->connected; timer.stop(); connectCounter=0; - disconnect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) ); + disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); - connect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) ); + connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); durationTimer.start ( 1000, FALSE ); - setGuiStatus ( connected ); + setGuitqStatus ( connected ); connectSuccess = false; GlobalConfig->AuthRetryCount=0; @@ -12410,9 +12410,9 @@ void KVpnc::readOutputFrom_ciscovpnc() } - //ProcessMsg_connect = QString(CiscoVpncProcess->readStdout()); + //ProcessMsg_connect = TQString(CiscoVpncProcess->readStdout()); // if ( this->GlobalConfig->VpncDebugLevel > 0 ) - // this->GlobalConfig->appendLogEntry ( QString ( "[vpnc err] " + ProcessMsg_connect ) , GlobalConfig->error); + // this->GlobalConfig->appendLogEntry ( TQString ( "[vpnc err] " + ProcessMsg_connect ) , GlobalConfig->error); if ( abort ) { @@ -12451,12 +12451,12 @@ void KVpnc::wroteToStdin_vpncConfig() void KVpnc::readFromStdout_racoon() { bool abort = false; -// QString ProcessMsg_connect_raw = QString ( RacoonProcess->readStdout() ); +// TQString ProcessMsg_connect_raw = TQString ( RacoonProcess->readStdout() ); // if (ProcessMsg_connect_raw.length() ==0) // return; // -// QStringList ProcessMsg_connect_raw_list = QStringList::split( '\n', ProcessMsg_connect_raw); -// for ( QStringList::Iterator it = ProcessMsg_connect_raw_list.begin(); it != ProcessMsg_connect_raw_list.end(); ++it ) +// TQStringList ProcessMsg_connect_raw_list = TQStringList::split( '\n', ProcessMsg_connect_raw); +// for ( TQStringList::Iterator it = ProcessMsg_connect_raw_list.begin(); it != ProcessMsg_connect_raw_list.end(); ++it ) while ( RacoonProcess != 0L && RacoonProcess->canReadLineStdout() ) { @@ -12550,10 +12550,10 @@ void KVpnc::readFromStdout_racoon() GlobalConfig->status = GlobalConfig->connected; - disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) ); - connect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); + connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); durationTimer.start ( 1000, FALSE ); - setGuiStatus ( connected ); + setGuitqStatus ( connected ); doIptablesRacoon(); addRouteRacoon(); @@ -12607,10 +12607,10 @@ void KVpnc::readFromStdout_racoon() L2tpdProcess->kill(); } - QString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( 500 ); + TQString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( 500 ); GlobalConfig->appendLogEntry ( i18n ( "NameAndPid: %1" ).arg ( NameAndPid ) , GlobalConfig->debug ); int pid = -1; - QString Name = ""; + TQString Name = ""; if ( !NameAndPid.isEmpty() ) { pid = NameAndPid.section ( '/', 0, 0 ).toInt(); @@ -12619,23 +12619,23 @@ void KVpnc::readFromStdout_racoon() if ( Name == "racoon" ) { - //RacoonProcess->setCommunication ( QProcess::Stdin | QProcess::Stdout | QProcess::Stderr | QProcess::DupStderr ); -// disconnect ( RacoonProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_racoon() ) ); -// disconnect ( RacoonProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_racoon() ) ); + //RacoonProcess->setCommunication ( TQProcess::Stdin | TQProcess::Stdout | TQProcess::Stderr | TQProcess::DupStderr ); +// disconnect ( RacoonProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_racoon() ) ); +// disconnect ( RacoonProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_racoon() ) ); if ( GlobalConfig->doKillRacoonIfStillRunning && abort == false ) { if ( GlobalConfig->KvpncDebugLevel > 3 ) GlobalConfig->appendLogEntry ( i18n ( "%1 could not bind too port, tring to kill it...." ).arg ( "racoon" ) , GlobalConfig->error ); - QProcess killracoonprocess ( this ); + TQProcess killracoonprocess ( this ); killracoonprocess.addArgument ( GlobalConfig->pathToKillall ); killracoonprocess.addArgument ( "racoon" ); if ( !killracoonprocess.start() ) { GlobalConfig->appendLogEntry ( i18n ( "%1 could not be killed." ).arg ( "racoon" ) , GlobalConfig->error ); - GlobalConfig->appendLogEntry ( QString ( "[racoon err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( "racoon" ) ) , GlobalConfig->error ); + GlobalConfig->appendLogEntry ( TQString ( "[racoon err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( "racoon" ) ) , GlobalConfig->error ); abort = true; } else @@ -12653,7 +12653,7 @@ void KVpnc::readFromStdout_racoon() putenv ( ( char* ) ( "LC_ALL=C" ) ); - RacoonProcess = new QProcess ( this ); + RacoonProcess = new TQProcess ( this ); RacoonProcess->addArgument ( GlobalConfig->pathToRacoon ); RacoonProcess->addArgument ( "-F" ); // foreground we want :) // RacoonProcess->addArgument ( "-v" ); @@ -12665,16 +12665,16 @@ void KVpnc::readFromStdout_racoon() GlobalConfig->appendLogEntry ( "racoon: " + GlobalConfig->pathToRacoon + " -f " + tmpPath + "/racoon" + GlobalConfig->currentProfile->getName() + ".conf", GlobalConfig->debug ); - //RacoonProcess->setCommunication ( QProcess::Stdin | QProcess::Stdout | QProcess::Stderr | QProcess::DupStderr ); -// connect ( RacoonProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_racoon() ) ); -// connect ( RacoonProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_racoon() ) ); + //RacoonProcess->setCommunication ( TQProcess::Stdin | TQProcess::Stdout | TQProcess::Stderr | TQProcess::DupStderr ); +// connect ( RacoonProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_racoon() ) ); +// connect ( RacoonProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_racoon() ) ); if ( !RacoonProcess->start ( env ) ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "racoon" ), GlobalConfig->error ); - GlobalConfig->appendLogEntry ( QString ( "[racoon err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( "racoon" ) ) , GlobalConfig->error ); + GlobalConfig->appendLogEntry ( TQString ( "[racoon err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( "racoon" ) ) , GlobalConfig->error ); abort = false; } else @@ -12697,14 +12697,14 @@ void KVpnc::readFromStdout_racoon() } else { - KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( QString().setNum ( 500 ) ).arg ( Name ).arg ( QString().setNum ( pid ) ) ); + KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( TQString().setNum ( 500 ) ).arg ( Name ).arg ( TQString().setNum ( pid ) ) ); GlobalConfig->appendLogEntry ( i18n ( "Port binding failed" ) , GlobalConfig->error ); abort = true; } } else { - KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( QString().setNum ( 500 ) ).arg ( Name ).arg ( QString().setNum ( pid ) ) ); + KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( TQString().setNum ( 500 ) ).arg ( Name ).arg ( TQString().setNum ( pid ) ) ); abort = true; } } @@ -12732,7 +12732,7 @@ void KVpnc::readFromStdout_racoon() void KVpnc::readFromStderr_racoon() { bool abort = false; -// QString ProcessMsg_connect = QString ( RacoonProcess->readStderr() ); +// TQString ProcessMsg_connect = TQString ( RacoonProcess->readStderr() ); // if (ProcessMsg_connect.length() ==0) // return; while ( RacoonProcess != 0L && RacoonProcess->canReadLineStderr() ) @@ -12752,10 +12752,10 @@ void KVpnc::readFromStderr_racoon() L2tpdProcess->kill(); } - QString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( 500 ); + TQString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( 500 ); GlobalConfig->appendLogEntry ( i18n ( "NameAndPid: %1" ).arg ( NameAndPid ) , GlobalConfig->debug ); int pid = -1; - QString Name = ""; + TQString Name = ""; if ( !NameAndPid.isEmpty() ) { pid = NameAndPid.section ( '/', 0, 0 ).toInt(); @@ -12764,23 +12764,23 @@ void KVpnc::readFromStderr_racoon() if ( Name == "racoon" ) { - //RacoonProcess->setCommunication ( QProcess::Stdin | QProcess::Stdout | QProcess::Stderr | QProcess::DupStderr ); -// disconnect ( RacoonProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_racoon() ) ); -// disconnect ( RacoonProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_racoon() ) ); + //RacoonProcess->setCommunication ( TQProcess::Stdin | TQProcess::Stdout | TQProcess::Stderr | TQProcess::DupStderr ); +// disconnect ( RacoonProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_racoon() ) ); +// disconnect ( RacoonProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_racoon() ) ); if ( GlobalConfig->doKillRacoonIfStillRunning && abort == false ) { if ( GlobalConfig->KvpncDebugLevel > 3 ) GlobalConfig->appendLogEntry ( i18n ( "%1 could not bind too port, tring to kill it...." ).arg ( "racoon" ) , GlobalConfig->error ); - QProcess killracoonprocess ( this ); + TQProcess killracoonprocess ( this ); killracoonprocess.addArgument ( GlobalConfig->pathToKillall ); killracoonprocess.addArgument ( "racoon" ); if ( !killracoonprocess.start() ) { GlobalConfig->appendLogEntry ( i18n ( "%1 could not be killed." ).arg ( "racoon" ) , GlobalConfig->error ); - GlobalConfig->appendLogEntry ( QString ( "[racoon err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( "racoon" ) ) , GlobalConfig->error ); + GlobalConfig->appendLogEntry ( TQString ( "[racoon err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( "racoon" ) ) , GlobalConfig->error ); abort = true; } else @@ -12798,7 +12798,7 @@ void KVpnc::readFromStderr_racoon() putenv ( ( char* ) ( "LC_ALL=C" ) ); - RacoonProcess = new QProcess ( this ); + RacoonProcess = new TQProcess ( this ); RacoonProcess->addArgument ( GlobalConfig->pathToRacoon ); RacoonProcess->addArgument ( "-F" ); // foreground we want :) // RacoonProcess->addArgument ( "-v" ); @@ -12810,16 +12810,16 @@ void KVpnc::readFromStderr_racoon() GlobalConfig->appendLogEntry ( "racoon: " + GlobalConfig->pathToRacoon + " -f " + tmpPath + "/racoon" + GlobalConfig->currentProfile->getName() + ".conf", GlobalConfig->debug ); - //RacoonProcess->setCommunication ( QProcess::Stdin | QProcess::Stdout | QProcess::Stderr | QProcess::DupStderr ); -// connect ( RacoonProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_racoon() ) ); -// connect ( RacoonProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_racoon() ) ); + //RacoonProcess->setCommunication ( TQProcess::Stdin | TQProcess::Stdout | TQProcess::Stderr | TQProcess::DupStderr ); +// connect ( RacoonProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_racoon() ) ); +// connect ( RacoonProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_racoon() ) ); if ( !RacoonProcess->start ( env ) ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "racoon" ), GlobalConfig->error ); - GlobalConfig->appendLogEntry ( QString ( "[racoon err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( "racoon" ) ) , GlobalConfig->error ); + GlobalConfig->appendLogEntry ( TQString ( "[racoon err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( "racoon" ) ) , GlobalConfig->error ); abort = false; } else @@ -12842,14 +12842,14 @@ void KVpnc::readFromStderr_racoon() } else { - KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( QString().setNum ( 500 ) ).arg ( Name ).arg ( QString().setNum ( pid ) ) ); + KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( TQString().setNum ( 500 ) ).arg ( Name ).arg ( TQString().setNum ( pid ) ) ); GlobalConfig->appendLogEntry ( i18n ( "Port binding failed" ) , GlobalConfig->error ); abort = true; } } else { - KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( QString().setNum ( 500 ) ).arg ( Name ).arg ( QString().setNum ( pid ) ) ); + KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( TQString().setNum ( 500 ) ).arg ( Name ).arg ( TQString().setNum ( pid ) ) ); abort = true; } } @@ -12990,10 +12990,10 @@ void KVpnc::readFromStderr_racoon() GlobalConfig->status = GlobalConfig->connected; - disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) ); - connect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); + connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); durationTimer.start ( 1000, FALSE ); - setGuiStatus ( connected ); + setGuitqStatus ( connected ); doIptablesRacoon(); addRouteRacoon(); @@ -13077,7 +13077,7 @@ void KVpnc::readFromStdout_racoon_helper() while ( RacoonHelperProcess && RacoonHelperProcess->canReadLineStdout() ) { ProcessMsg_connect = RacoonHelperProcess->readLineStdout(); - // QString ProcessMsg_connect = QString ( RacoonHelperProcess->readStdout() ); + // TQString ProcessMsg_connect = TQString ( RacoonHelperProcess->readStdout() ); if ( GlobalConfig->KvpncDebugLevel > 3 ) GlobalConfig->appendLogEntry ( "[racoon helper] " + ProcessMsg_connect, GlobalConfig->debug ); } @@ -13090,7 +13090,7 @@ void KVpnc::readFromStderr_racoon_helper() while ( RacoonHelperProcess && RacoonHelperProcess->canReadLineStderr() ) { ProcessMsg_connect = RacoonHelperProcess->readLineStderr(); -// QString ProcessMsg_connect = QString ( RacoonHelperProcess->readStderr() ); +// TQString ProcessMsg_connect = TQString ( RacoonHelperProcess->readStderr() ); GlobalConfig->appendLogEntry ( "[racoon helper err] " + ProcessMsg_connect, GlobalConfig->error ); bool wrong_algo=false; @@ -13130,7 +13130,7 @@ void KVpnc::readFromStdout_ipsec() while ( IpsecStartProcess != 0 && IpsecStartProcess->canReadLineStdout() ) { ProcessMsg_connect = IpsecStartProcess->readLineStdout(); - // QString ProcessMsg_connect = QString( IpsecStartProcess->readStdout() ); + // TQString ProcessMsg_connect = TQString( IpsecStartProcess->readStdout() ); bool NormalMsg = true; bool ErrorMsg = false; @@ -13165,15 +13165,15 @@ void KVpnc::readFromStdout_ipsec() // FATAL ERROR: if ( ProcessMsg_connect.find ( "failed to bind", 0, FALSE ) > -1|| ProcessMsg_connect.find ( "Address already in use", 0, FALSE ) > -1 ) { - QString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( 500 ); + TQString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( 500 ); GlobalConfig->appendLogEntry ( i18n ( "NameAndPid: %1" ).arg ( NameAndPid ) , GlobalConfig->debug ); int pid = -1; - QString Name = ""; + TQString Name = ""; if ( !NameAndPid.isEmpty() ) { pid = NameAndPid.section ( '/', 0, 0 ).toInt(); Name = NameAndPid.section ( '/', 1, 1 ); - KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( QString().setNum ( 500 ) ).arg ( Name ).arg ( QString().setNum ( pid ) ) ); + KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( TQString().setNum ( 500 ) ).arg ( Name ).arg ( TQString().setNum ( pid ) ) ); } else KMessageBox::error ( this, i18n ( "Port binding failed" ) ); @@ -13185,9 +13185,9 @@ void KVpnc::readFromStdout_ipsec() else if ( ProcessMsg_connect.find ( "error fetching interface information: Device not found", 0, FALSE ) > -1 ) { - QString interfacemissing = ProcessMsg_connect.section(" ", 1,1).replace(':', ""); - KMessageBox::error ( this, i18n ( "Specified network device (%1) does not exist. Please specifiy an existing device or default at settings." ).arg(interfacemissing) ); - GlobalConfig->appendLogEntry ( i18n ( "Specified network device (%1) does not exist. Please specifiy an existing device or default at settings." ).arg(interfacemissing) , GlobalConfig->error ); + TQString interfacemissing = ProcessMsg_connect.section(" ", 1,1).replace(':', ""); + KMessageBox::error ( this, i18n ( "Specified network device (%1) does not exist. Please specifiy an existing device or default at settings." ).tqarg(interfacemissing) ); + GlobalConfig->appendLogEntry ( i18n ( "Specified network device (%1) does not exist. Please specifiy an existing device or default at settings." ).tqarg(interfacemissing) , GlobalConfig->error ); abort = true; IpsecGotError = true; IpsecWhackStatusTimer.stop(); @@ -13237,7 +13237,7 @@ void KVpnc::readFromStdout_ipsec() GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "ipsec" ) , GlobalConfig->debug ); disconnectClicked(); GlobalConfig->status = GlobalConfig->disconnected; - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return ; } } @@ -13251,19 +13251,19 @@ void KVpnc::readFromStderr_ipsec() while ( IpsecStartProcess->canReadLineStderr() ) { ProcessMsg_connect = IpsecStartProcess->readLineStderr(); - // QString ProcessMsg_connect = QString( IpsecStartProcess->readStderr() ); + // TQString ProcessMsg_connect = TQString( IpsecStartProcess->readStderr() ); if ( ProcessMsg_connect.find ( "failed to bind", 0, FALSE ) > -1|| ProcessMsg_connect.find ( "FATAL ERROR: bind() failed in find_raw_ifaces(). Errno 98: Address already in use", 0, FALSE ) > -1 ) { - QString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( 500 ); + TQString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( 500 ); GlobalConfig->appendLogEntry ( i18n ( "NameAndPid: %1" ).arg ( NameAndPid ) , GlobalConfig->debug ); int pid = -1; - QString Name = ""; + TQString Name = ""; if ( !NameAndPid.isEmpty() ) { pid = NameAndPid.section ( '/', 0, 0 ).toInt(); Name = NameAndPid.section ( '/', 1, 1 ); - KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( QString().setNum ( 500 ) ).arg ( Name ).arg ( QString().setNum ( pid ) ) ); + KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( TQString().setNum ( 500 ) ).arg ( Name ).arg ( TQString().setNum ( pid ) ) ); } else KMessageBox::error ( this, i18n ( "Port binding failed" ) ); @@ -13362,7 +13362,7 @@ void KVpnc::readFromStderr_ipsec() GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "l2tpd" ) , GlobalConfig->error ); disconnectClicked(); GlobalConfig->status = GlobalConfig->disconnected; - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return ; } } @@ -13373,7 +13373,7 @@ void KVpnc::readFromStdout_ipsecwhack() while ( IpsecWhackProcess->canReadLineStdout() ) { ProcessMsg_connect = IpsecWhackProcess->readLineStdout(); - // QString ProcessMsg_connect = QString( IpsecWhackProcess->readStdout() ); + // TQString ProcessMsg_connect = TQString( IpsecWhackProcess->readStdout() ); bool NormalMsg = true; bool ErrorMsg = false; @@ -13429,26 +13429,26 @@ void KVpnc::readFromStdout_ipsecwhack() else if ( ProcessMsg_connect.find ( "listening for IKE messages", 0 , FALSE ) > -1 ) { // strongswan after ipsec whack --listen - /* disconnect ( IpsecWhackProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsecwhack() ) ); - disconnect ( IpsecWhackProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsecwhack() ) ); + /* disconnect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhack() ) ); + disconnect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhack() ) ); delete(IpsecWhackProcess);*/ putenv ( ( char* ) ( "LC_ALL=C" ) ); - IpsecWhackProcess = new QProcess ( this ); + IpsecWhackProcess = new TQProcess ( this ); IpsecWhackProcess->addArgument ( GlobalConfig->pathToIpsec ); IpsecWhackProcess->addArgument ( "whack" ); IpsecWhackProcess->addArgument ( "--name" ); IpsecWhackProcess->addArgument ( GlobalConfig->currentProfile->getName() ); IpsecWhackProcess->addArgument ( "--initiate" ); - connect ( IpsecWhackProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsecwhack() ) ); - connect ( IpsecWhackProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsecwhack() ) ); - connect ( IpsecWhackProcess, SIGNAL ( exited() ), this, SLOT ( ipsecwhack_exited() ) ); + connect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhack() ) ); + connect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhack() ) ); + connect ( IpsecWhackProcess, TQT_SIGNAL ( exited() ), this, TQT_SLOT ( ipsecwhack_exited() ) ); if ( !IpsecWhackProcess->start ( env ) ) { - disconnect ( IpsecWhackProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsecwhack() ) ); - disconnect ( IpsecWhackProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsecwhack() ) ); - disconnect ( IpsecWhackProcess, SIGNAL ( exited() ), this, SLOT ( ipsecwhack_exited() ) ); + disconnect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhack() ) ); + disconnect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhack() ) ); + disconnect ( IpsecWhackProcess, TQT_SIGNAL ( exited() ), this, TQT_SLOT ( ipsecwhack_exited() ) ); delete IpsecWhackProcess; IpsecWhackProcess=0L; KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( GlobalConfig->pathToIpsec+" whack' --name "+GlobalConfig->currentProfile->getName() +" --initiate" ) ); @@ -13472,27 +13472,27 @@ void KVpnc::readFromStdout_ipsecwhack() sleep ( 3 ); //openswan putenv ( ( char* ) ( "LC_ALL=C" ) ); - IpsecWhackProcess = new QProcess ( this ); + IpsecWhackProcess = new TQProcess ( this ); IpsecWhackProcess->addArgument ( GlobalConfig->pathToIpsec ); IpsecWhackProcess->addArgument ( "whack" ); IpsecWhackProcess->addArgument ( "--name" ); IpsecWhackProcess->addArgument ( GlobalConfig->currentProfile->getName() ); IpsecWhackProcess->addArgument ( "--initiate" ); - connect ( IpsecWhackProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsecwhack() ) ); - connect ( IpsecWhackProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsecwhack() ) ); - connect ( IpsecWhackProcess, SIGNAL ( exited() ), this, SLOT ( ipsecwhack_exited() ) ); + connect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhack() ) ); + connect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhack() ) ); + connect ( IpsecWhackProcess, TQT_SIGNAL ( exited() ), this, TQT_SLOT ( ipsecwhack_exited() ) ); - QString LogPassword=""; + TQString LogPassword=""; if ( GlobalConfig->KvpncDebugLevel > 5 ) LogPassword=GlobalConfig->TmpPassword; else LogPassword="*****"; if ( !IpsecWhackProcess->start ( env ) ) { - disconnect ( IpsecWhackProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsecwhack() ) ); - disconnect ( IpsecWhackProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsecwhack() ) ); - disconnect ( IpsecWhackProcess, SIGNAL ( exited() ), this, SLOT ( ipsecwhack_exited() ) ); + disconnect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhack() ) ); + disconnect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhack() ) ); + disconnect ( IpsecWhackProcess, TQT_SIGNAL ( exited() ), this, TQT_SLOT ( ipsecwhack_exited() ) ); delete IpsecWhackProcess; IpsecWhackProcess=0L; KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( GlobalConfig->pathToIpsec+" whack' --name "+GlobalConfig->currentProfile->getName() +" --initiate" ) ); @@ -13527,27 +13527,27 @@ void KVpnc::readFromStdout_ipsecwhack() sleep ( 3 ); //openswan putenv ( ( char* ) ( "LC_ALL=C" ) ); - IpsecWhackProcess = new QProcess ( this ); + IpsecWhackProcess = new TQProcess ( this ); IpsecWhackProcess->addArgument ( GlobalConfig->pathToIpsec ); IpsecWhackProcess->addArgument ( "whack" ); IpsecWhackProcess->addArgument ( "--name" ); IpsecWhackProcess->addArgument ( GlobalConfig->currentProfile->getName() ); IpsecWhackProcess->addArgument ( "--initiate" ); - connect ( IpsecWhackProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsecwhack() ) ); - connect ( IpsecWhackProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsecwhack() ) ); - connect ( IpsecWhackProcess, SIGNAL ( exited() ), this, SLOT ( ipsecwhack_exited() ) ); + connect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhack() ) ); + connect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhack() ) ); + connect ( IpsecWhackProcess, TQT_SIGNAL ( exited() ), this, TQT_SLOT ( ipsecwhack_exited() ) ); - QString LogPassword=""; + TQString LogPassword=""; if ( GlobalConfig->KvpncDebugLevel > 5 ) LogPassword=GlobalConfig->TmpPassword; else LogPassword="*****"; if ( !IpsecWhackProcess->start ( env ) ) { - disconnect ( IpsecWhackProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsecwhack() ) ); - disconnect ( IpsecWhackProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsecwhack() ) ); - disconnect ( IpsecWhackProcess, SIGNAL ( exited() ), this, SLOT ( ipsecwhack_exited() ) ); + disconnect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhack() ) ); + disconnect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhack() ) ); + disconnect ( IpsecWhackProcess, TQT_SIGNAL ( exited() ), this, TQT_SLOT ( ipsecwhack_exited() ) ); delete IpsecWhackProcess; IpsecWhackProcess=0L; KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( GlobalConfig->pathToIpsec+" whack' --name "+GlobalConfig->currentProfile->getName() +" --initiate" ) ); @@ -13701,8 +13701,8 @@ void KVpnc::readFromStdout_ipsecwhack() } else if ( ProcessMsg_connect.find ( "we require peer to have ID", 0 , FALSE ) > -1 && ProcessMsg_connect.find ( "but peer declares", 0 , FALSE ) > -1 ) { - QString PeerID = ProcessMsg_connect.section ( '\'', 3, 3 ); - QString OurID = ProcessMsg_connect.section ( '\'', 1, 1 ); + TQString PeerID = ProcessMsg_connect.section ( '\'', 3, 3 ); + TQString OurID = ProcessMsg_connect.section ( '\'', 1, 1 ); KMessageBox::error ( this, i18n ( "Wrong ID \"%1\" from peer got, we expect \"%2\"." ).arg ( PeerID ).arg ( OurID ) ); GlobalConfig->appendLogEntry ( i18n ( "Wrong ID \"%1\" from peer got, we expect \"%2\"." ).arg ( PeerID ).arg ( OurID ) , GlobalConfig->error ); int result = KMessageBox::questionYesNo ( this, i18n ( "Do you want to use \"%1\" instead of \"%2\" as remote ID and reconnect?" ).arg ( PeerID ).arg ( OurID ), i18n ( "Fix remote ID?" ) ); @@ -13733,7 +13733,7 @@ void KVpnc::readFromStdout_ipsecwhack() IpsecGotError = true; IpsecWhackStatusTimer.stop(); } - else if ( ProcessMsg_connect.find ( "deleting state (STATE_QUICK_I1)", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "deleting state (STATE_MAIN_I3)", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "deleting state (STATE_MAIN_I2)", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "deleting state (STATE_TQUICK_I1)", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "deleting state (STATE_MAIN_I3)", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "deleting state (STATE_MAIN_I2)", 0 , FALSE ) > -1 ) { //KMessageBox::error ( this, i18n ( "Phase 1 was deleted. Disconnecting." ).arg ( IpsecType ) ); GlobalConfig->appendLogEntry ( i18n ( "Phase 1 was deleted. Disconnecting." ).arg ( IpsecType ) , GlobalConfig->error ); @@ -13761,7 +13761,7 @@ void KVpnc::readFromStdout_ipsecwhack() GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "ipsec whack --listen" ) , GlobalConfig->debug ); disconnectClicked(); GlobalConfig->status = GlobalConfig->disconnected; - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return ; } @@ -13778,7 +13778,7 @@ void KVpnc::readFromStderr_ipsecwhack() bool abort = false; ProcessMsg_connect = IpsecWhackProcess->readLineStderr(); - // QString ProcessMsg_connect = QString( IpsecWhackProcess->readStderr() ); + // TQString ProcessMsg_connect = TQString( IpsecWhackProcess->readStderr() ); GlobalConfig->appendLogEntry ( "[ipsec whack err] " + ProcessMsg_connect, GlobalConfig->error ); @@ -13795,14 +13795,14 @@ void KVpnc::readFromStderr_ipsecwhack() // // if (GlobalConfig->doKillIpsecIfStillRunning) // { - // QProcess killipsecprocess(this); + // TQProcess killipsecprocess(this); // killipsecprocess.addArgument(GlobalConfig->pathToKillall); // killipsecprocess.addArgument("ipsec"); // // if (!killipsecprocess.start()) // { - // GlobalConfig->appendLogEntry( i18n( "%1 could not be killed." ).arg("ipsec") ,GlobalConfig->error); - // GlobalConfig->appendLogEntry ( QString( "[ipsec err] " + i18n( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg("ipsec") ) , GlobalConfig->debug ); + // GlobalConfig->appendLogEntry( i18n( "%1 could not be killed." ).tqarg("ipsec") ,GlobalConfig->error); + // GlobalConfig->appendLogEntry ( TQString( "[ipsec err] " + i18n( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).tqarg("ipsec") ) , GlobalConfig->debug ); // abort = true; // } // else @@ -13817,7 +13817,7 @@ void KVpnc::readFromStderr_ipsecwhack() // // IpsecProcess->kill(); // // putenv( ( char* ) ( "LC_ALL=C" ) ); - // IpsecProcess = new QProcess ( this ); + // IpsecProcess = new TQProcess ( this ); // IpsecProcess->addArgument( GlobalConfig->pathToIpsec ); // IpsecProcess->addArgument( "-F" ); // foreground we want :) // IpsecProcess->addArgument( "-f" ); @@ -13830,15 +13830,15 @@ void KVpnc::readFromStderr_ipsecwhack() // if ( !IpsecProcess->start(env) ) // { // if ( GlobalConfig->KvpncDebugLevel > 0 ) - // GlobalConfig->appendLogEntry ( i18n( "\"%1\" start failed!" ).arg( "l2tpd" ), GlobalConfig->error ); + // GlobalConfig->appendLogEntry ( i18n( "\"%1\" start failed!" ).tqarg( "l2tpd" ), GlobalConfig->error ); // - // GlobalConfig->appendLogEntry ( QString( "[ipsec err] " + i18n( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg("ipsec") ) , GlobalConfig->debug ); + // GlobalConfig->appendLogEntry ( TQString( "[ipsec err] " + i18n( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).tqarg("ipsec") ) , GlobalConfig->debug ); // abort=false; // } // else // { // if ( GlobalConfig->KvpncDebugLevel > 0 ) - // GlobalConfig->appendLogEntry ( i18n( "%1 was already running. It was killed and restarted." ).arg( "ipsec" ), GlobalConfig->debug ); + // GlobalConfig->appendLogEntry ( i18n( "%1 was already running. It was killed and restarted." ).tqarg( "ipsec" ), GlobalConfig->debug ); // } // } // } @@ -13853,15 +13853,15 @@ void KVpnc::readFromStderr_ipsecwhack() if ( ProcessMsg_connect.find ( "failed to bind", 0, FALSE ) > -1|| ProcessMsg_connect.find ( "Address already in use", 0, FALSE ) > -1 ) { - QString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( 500 ); + TQString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( 500 ); GlobalConfig->appendLogEntry ( i18n ( "NameAndPid: %1" ).arg ( NameAndPid ) , GlobalConfig->debug ); int pid = -1; - QString Name = ""; + TQString Name = ""; if ( !NameAndPid.isEmpty() ) { pid = NameAndPid.section ( '/', 0, 0 ).toInt(); Name = NameAndPid.section ( '/', 1, 1 ); - KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( QString().setNum ( 500 ) ).arg ( Name ).arg ( QString().setNum ( pid ) ) ); + KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( TQString().setNum ( 500 ) ).arg ( Name ).arg ( TQString().setNum ( pid ) ) ); } else KMessageBox::error ( this, i18n ( "Port binding failed" ) ); @@ -13956,8 +13956,8 @@ void KVpnc::readFromStderr_ipsecwhack() } else if ( ProcessMsg_connect.find ( "we require peer to have ID", 0 , FALSE ) > -1 && ProcessMsg_connect.find ( "but peer declares", 0 , FALSE ) > -1 ) { - QString PeerID = ProcessMsg_connect.section ( '\'', 3, 3 ); - QString OurID = ProcessMsg_connect.section ( '\'', 1, 1 ); + TQString PeerID = ProcessMsg_connect.section ( '\'', 3, 3 ); + TQString OurID = ProcessMsg_connect.section ( '\'', 1, 1 ); KMessageBox::error ( this, i18n ( "Wrong ID \"%1\" from peer got, we expect \"%2\"." ).arg ( PeerID ).arg ( OurID ) ); GlobalConfig->appendLogEntry ( i18n ( "Wrong ID \"%1\" from peer got, we expect \"%2\"." ).arg ( PeerID ).arg ( OurID ) , GlobalConfig->error ); int result = KMessageBox::questionYesNo ( this, i18n ( "Do you want to use \"%1\" instead of \"%2\" as remote ID and reconnect?" ).arg ( PeerID ).arg ( OurID ), i18n ( "Fix remote ID?" ) ); @@ -13986,7 +13986,7 @@ void KVpnc::readFromStderr_ipsecwhack() GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "ipsec whack --initiate" ) , GlobalConfig->debug ); disconnectClicked(); GlobalConfig->status = GlobalConfig->disconnected; - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return ; } } @@ -13999,7 +13999,7 @@ void KVpnc::readFromStdout_ipsecwhacklisten() while ( IpsecWhackListenProcess->canReadLineStdout() ) { ProcessMsg_connect = IpsecWhackListenProcess->readLineStdout(); - // QString ProcessMsg_connect = QString( IpsecWhackListenProcess->readStdout() ); + // TQString ProcessMsg_connect = TQString( IpsecWhackListenProcess->readStdout() ); bool NormalMsg = true; bool ErrorMsg = false; @@ -14014,7 +14014,7 @@ void KVpnc::readFromStdout_ipsecwhacklisten() GlobalConfig->appendLogEntry ( "[ipsec whack listen] " + i18n ( "Listen was successful." ), GlobalConfig->debug ); start_ipsec_initiate(); } - else if ( ProcessMsg_connect.find ( "ISAKMP SA established", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "transition from state STATE_QUICK_I1 to state STATE_QUICK_I2", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "ISAKMP SA established", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "transition from state STATE_TQUICK_I1 to state STATE_TQUICK_I2", 0 , FALSE ) > -1 ) { timer.stop(); @@ -14093,10 +14093,10 @@ void KVpnc::readFromStdout_ipsecwhacklisten() GlobalConfig->status = GlobalConfig->connected; - disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) ); - connect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); + connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); durationTimer.start ( 1000, FALSE ); - setGuiStatus ( connected ); + setGuitqStatus ( connected ); setFirewallAfterConnect(); @@ -14136,7 +14136,7 @@ void KVpnc::readFromStdout_ipsecwhacklisten() // GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "ipsec whack --listen" ) , GlobalConfig->debug ); // disconnectClicked(); // GlobalConfig->status = GlobalConfig->disconnected; -// setGuiStatus ( disconnected ); +// setGuitqStatus ( disconnected ); // return ; // } } @@ -14150,7 +14150,7 @@ void KVpnc::readFromStderr_ipsecwhacklisten() while ( IpsecWhackListenProcess->canReadLineStderr() ) { ProcessMsg_connect = IpsecWhackListenProcess->readLineStderr(); - // QString ProcessMsg_connect = QString( IpsecWhackListenProcess->readStderr() ); + // TQString ProcessMsg_connect = TQString( IpsecWhackListenProcess->readStderr() ); // GlobalConfig->appendLogEntry ( "[ipsec whack listen err] " + ProcessMsg_connect, GlobalConfig->error ); @@ -14168,8 +14168,8 @@ void KVpnc::readFromStderr_ipsecwhacklisten() else { // we have to give some time to sleep and try again... - connect ( IpsecWhackListenProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsecwhacklisten() ) ); - connect ( IpsecWhackListenProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsecwhacklisten() ) ); + connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhacklisten() ) ); + connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhacklisten() ) ); IpsecWhackListenProcess->tryTerminate(); sleep ( 2 ); if ( IpsecWhackListenProcess->isRunning() ) @@ -14200,7 +14200,7 @@ void KVpnc::readFromStderr_ipsecwhacklisten() GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "ipsec whack --listen" ) , GlobalConfig->debug ); disconnectClicked(); GlobalConfig->status = GlobalConfig->disconnected; - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return ; } } @@ -14210,14 +14210,14 @@ void KVpnc::readFromStdout_ipsecwhackstatus() { if ( IpsecWhackStatusProcess ==0 || IpsecGotError ) return; -// QString ProcessMsg_connect_full = QString( IpsecWhackStatusProcess->readStdout() ); -// QStringList ProcessMsg_connect_list = QStringList::split('\n', ProcessMsg_connect_full); +// TQString ProcessMsg_connect_full = TQString( IpsecWhackStatusProcess->readStdout() ); +// TQStringList ProcessMsg_connect_list = TQStringList::split('\n', ProcessMsg_connect_full); while ( IpsecWhackStatusProcess !=0 && IpsecWhackStatusProcess->canReadLineStdout() ) -// for ( QStringList::Iterator it = ProcessMsg_connect_list.begin(); it != ProcessMsg_connect_list.end(); ++it ) +// for ( TQStringList::Iterator it = ProcessMsg_connect_list.begin(); it != ProcessMsg_connect_list.end(); ++it ) { -// QString ProcessMsg_connect = *it; - QString ProcessMsg_connect = IpsecWhackStatusProcess->readLineStdout(); - // QString ProcessMsg_connect = QString( IpsecWhackStatusProcess->readStdout() ); +// TQString ProcessMsg_connect = *it; + TQString ProcessMsg_connect = IpsecWhackStatusProcess->readLineStdout(); + // TQString ProcessMsg_connect = TQString( IpsecWhackStatusProcess->readStdout() ); bool NormalMsg = true; bool ErrorMsg = false; @@ -14226,10 +14226,10 @@ void KVpnc::readFromStdout_ipsecwhackstatus() if ( GlobalConfig->KvpncDebugLevel > 5 ) GlobalConfig->appendLogEntry ( "[ipsec whack status] " + ProcessMsg_connect, GlobalConfig->debug ); - if ( ProcessMsg_connect.find ( QString ( GlobalConfig->currentProfile->getName() ), 0, FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( TQString ( GlobalConfig->currentProfile->getName() ), 0, FALSE ) > -1 ) { - if ( ProcessMsg_connect.find ( "ISAKMP SA established", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "transition from state STATE_QUICK_I1 to state STATE_QUICK_I2", 0 , FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "ISAKMP SA established", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "transition from state STATE_TQUICK_I1 to state STATE_TQUICK_I2", 0 , FALSE ) > -1 ) { timer.stop(); @@ -14292,7 +14292,7 @@ void KVpnc::readFromStdout_ipsecwhackstatus() // GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "ipsec whack status" ) , GlobalConfig->debug ); // disconnectClicked(); // GlobalConfig->status = GlobalConfig->disconnected; -// setGuiStatus ( disconnected ); +// setGuitqStatus ( disconnected ); // return ; // } } @@ -14306,7 +14306,7 @@ void KVpnc::readFromStderr_ipsecwhackstatus() while ( IpsecWhackStatusProcess !=0 && IpsecWhackStatusProcess->canReadLineStderr() ) { ProcessMsg_connect = IpsecWhackStatusProcess->readLineStderr(); - // QString ProcessMsg_connect = QString( IpsecWhackStatusProcess->readStderr() ); + // TQString ProcessMsg_connect = TQString( IpsecWhackStatusProcess->readStderr() ); // if ( ProcessMsg_connect.find ( "failed to bind", 0, FALSE ) > -1|| ProcessMsg_connect.find ("FATAL ERROR: bind() failed in find_raw_ifaces(). Errno 98: Address already in use", 0, FALSE ) > -1 ) // { @@ -14353,7 +14353,7 @@ void KVpnc::readFromStderr_ipsecwhackstatus() // GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "l2tpd" ) , GlobalConfig->error ); // disconnectClicked(); // GlobalConfig->status = GlobalConfig->disconnected; -// setGuiStatus ( disconnected ); +// setGuitqStatus ( disconnected ); // return ; // } } @@ -14364,7 +14364,7 @@ void KVpnc::readFromStdout_ipsecwhackdelete() while ( IpsecWhackDeleteProcess->canReadLineStdout() ) { ProcessMsg_connect = IpsecWhackDeleteProcess->readLineStdout(); - // QString ProcessMsg_connect = QString( IpsecWhackDeleteProcess->readStdout() ); + // TQString ProcessMsg_connect = TQString( IpsecWhackDeleteProcess->readStdout() ); bool NormalMsg = true; bool ErrorMsg = false; @@ -14399,7 +14399,7 @@ void KVpnc::readFromStderr_ipsecwhackdelete() while ( IpsecWhackDeleteProcess->canReadLineStderr() ) { ProcessMsg_connect = IpsecWhackDeleteProcess->readLineStderr(); - // QString ProcessMsg_connect = QString( IpsecWhackDeleteProcess->readStderr() ); + // TQString ProcessMsg_connect = TQString( IpsecWhackDeleteProcess->readStderr() ); GlobalConfig->appendLogEntry ( "[ipsec whack delete err] " + ProcessMsg_connect, GlobalConfig->error ); @@ -14416,11 +14416,11 @@ void KVpnc::readFromStderr_ipsecwhackdelete() void KVpnc::readFromStdout_tail_racoon() { - // QString ProcessMsg_connect = QString( RacoonTailProcess->readStdout() ); + // TQString ProcessMsg_connect = TQString( RacoonTailProcess->readStdout() ); while ( RacoonTailProcess->canReadLineStdout() ) { - QString ProcessMsg_connect = RacoonTailProcess->readLineStdout() + "\n"; - // QString ProcessMsg_connect = RacoonTailProcess->readStdout(); + TQString ProcessMsg_connect = RacoonTailProcess->readLineStdout() + "\n"; + // TQString ProcessMsg_connect = RacoonTailProcess->readStdout(); bool abort = false; bool error_found = false; @@ -14447,10 +14447,10 @@ void KVpnc::readFromStdout_tail_racoon() // L2tpdProcess->kill(); // } // -// QString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( 500 ); +// TQString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( 500 ); // GlobalConfig->appendLogEntry ( i18n ( "NameAndPid: %1" ).arg ( NameAndPid ) , GlobalConfig->debug ); // int pid = -1; -// QString Name = ""; +// TQString Name = ""; // if ( !NameAndPid.isEmpty() ) // { // pid = NameAndPid.section ( '/', 0, 0 ).toInt(); @@ -14459,23 +14459,23 @@ void KVpnc::readFromStdout_tail_racoon() // if ( Name == "racoon" ) // { // -// //RacoonProcess->setCommunication ( QProcess::Stdin | QProcess::Stdout | QProcess::Stderr | QProcess::DupStderr ); -// // disconnect ( RacoonProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_racoon() ) ); -// // disconnect ( RacoonProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_racoon() ) ); +// //RacoonProcess->setCommunication ( TQProcess::Stdin | TQProcess::Stdout | TQProcess::Stderr | TQProcess::DupStderr ); +// // disconnect ( RacoonProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_racoon() ) ); +// // disconnect ( RacoonProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_racoon() ) ); // // if ( GlobalConfig->doKillRacoonIfStillRunning && abort == false ) // { // if ( GlobalConfig->KvpncDebugLevel > 3 ) // GlobalConfig->appendLogEntry ( i18n ( "%1 could not bind too port, tring to kill it...." ).arg ( "racoon" ) , GlobalConfig->error ); // -// QProcess killracoonprocess ( this ); +// TQProcess killracoonprocess ( this ); // killracoonprocess.addArgument ( GlobalConfig->pathToKillall ); // killracoonprocess.addArgument ( "racoon" ); // // if ( !killracoonprocess.start() ) // { // GlobalConfig->appendLogEntry ( i18n ( "%1 could not be killed." ).arg ( "racoon" ) , GlobalConfig->error ); -// GlobalConfig->appendLogEntry ( QString ( "[racoon err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( "racoon" ) ) , GlobalConfig->error ); +// GlobalConfig->appendLogEntry ( TQString ( "[racoon err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( "racoon" ) ) , GlobalConfig->error ); // abort = true; // } // else @@ -14494,7 +14494,7 @@ void KVpnc::readFromStdout_tail_racoon() // } // // putenv ( ( char* ) ( "LC_ALL=C" ) ); -// RacoonProcess = new QProcess ( this ); +// RacoonProcess = new TQProcess ( this ); // RacoonProcess->addArgument ( GlobalConfig->pathToRacoon ); // /*RacoonProcess->addArgument ( "-F" )*/; // foreground we want :) // // RacoonProcess->addArgument ( "-v" ); @@ -14506,16 +14506,16 @@ void KVpnc::readFromStdout_tail_racoon() // GlobalConfig->appendLogEntry ( "racoon: " + GlobalConfig->pathToRacoon + " -f " + tmpPath + "/racoon" + GlobalConfig->currentProfile->getName() + ".conf", GlobalConfig->debug ); // // -// //RacoonProcess->setCommunication ( QProcess::Stdin | QProcess::Stdout | QProcess::Stderr | QProcess::DupStderr ); -// // connect ( RacoonProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_racoon() ) ); -// // connect ( RacoonProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_racoon() ) ); +// //RacoonProcess->setCommunication ( TQProcess::Stdin | TQProcess::Stdout | TQProcess::Stderr | TQProcess::DupStderr ); +// // connect ( RacoonProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_racoon() ) ); +// // connect ( RacoonProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_racoon() ) ); // // if ( !RacoonProcess->start(env) ) // { // if ( GlobalConfig->KvpncDebugLevel > 0 ) // GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "racoon" ), GlobalConfig->error ); // -// GlobalConfig->appendLogEntry ( QString ( "[racoon err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( "racoon" ) ) , GlobalConfig->error ); +// GlobalConfig->appendLogEntry ( TQString ( "[racoon err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( "racoon" ) ) , GlobalConfig->error ); // abort = false; // } // else @@ -14538,14 +14538,14 @@ void KVpnc::readFromStdout_tail_racoon() // } // else // { -// KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( QString().setNum ( 500 ) ).arg ( Name ).arg ( QString().setNum ( pid ) ) ); +// KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( TQString().setNum ( 500 ) ).arg ( Name ).arg ( TQString().setNum ( pid ) ) ); // GlobalConfig->appendLogEntry ( i18n ( "Port binding failed" ) , GlobalConfig->error ); // abort = true; // } // } // else // { -// KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( QString().setNum ( 500 ) ).arg ( Name ).arg ( QString().setNum ( pid ) ) ); +// KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( TQString().setNum ( 500 ) ).arg ( Name ).arg ( TQString().setNum ( pid ) ) ); // abort = true; // } // } @@ -14702,34 +14702,34 @@ void KVpnc::readFromStdout_tail_racoon() if ( GlobalConfig->currentProfile->getUseModeConfig() ) { - QFile ModeCfgFile ( QString ( tmpPath + "/racoon-" + GlobalConfig->currentProfile->getName() + ".modecfg" ) ); + TQFile ModeCfgFile ( TQString ( tmpPath + "/racoon-" + GlobalConfig->currentProfile->getName() + ".modecfg" ) ); if ( ModeCfgFile.exists() ) { - QString TmpDns1=""; - QString TmpDns2=""; - QString internal_addr4=""; - QString internal_netmask4=""; - QString internal_cidr4=""; - QString internal_dns4=""; - QString internal_dns4_list=""; - QString internal_wins4=""; - QString internal_wins4_list=""; - QString split_include=""; - QString split_local=""; - QString default_domain=""; - QString resolvtemp=""; + TQString TmpDns1=""; + TQString TmpDns2=""; + TQString internal_addr4=""; + TQString internal_netmask4=""; + TQString internal_cidr4=""; + TQString internal_dns4=""; + TQString internal_dns4_list=""; + TQString internal_wins4=""; + TQString internal_wins4_list=""; + TQString split_include=""; + TQString split_local=""; + TQString default_domain=""; + TQString resolvtemp=""; if ( ModeCfgFile.open ( IO_ReadOnly ) ) { - QTextStream stream ( &ModeCfgFile ); - QString line=""; + TQTextStream stream ( &ModeCfgFile ); + TQString line=""; while ( !stream.atEnd() ) { line = stream.readLine(); // line of text excluding '\n' if ( GlobalConfig->KvpncDebugLevel > 5 ) GlobalConfig->appendLogEntry ( "[ModeCfg] "+line, GlobalConfig->debug ); - QString ModeCfgVar=line.section ( '=',0,0 ); - QString ModeCfgVal=line.section ( '=',1,-1 ); + TQString ModeCfgVar=line.section ( '=',0,0 ); + TQString ModeCfgVal=line.section ( '=',1,-1 ); if ( ModeCfgVal=="INTERNAL_ADDR4" ) internal_addr4 = ModeCfgVal; else if ( ModeCfgVal=="INTERNAL_NETMASK4" ) @@ -14758,11 +14758,11 @@ void KVpnc::readFromStdout_tail_racoon() TmpDns1 = internal_dns4; - QFile racoonupfile ( tmpPath + "racoon." + GlobalConfig->currentProfile->getName() + ".up" ); - QTextStream racoonupstream ( &racoonupfile ); + TQFile racoonupfile ( tmpPath + "racoon." + GlobalConfig->currentProfile->getName() + ".up" ); + TQTextStream racoonupstream ( &racoonupfile ); if ( racoonupfile.open ( IO_WriteOnly ) ) { - QString DefaultDevice = NetworkInterface ( GlobalConfig,parent ).getDefaultInterface(); + TQString DefaultDevice = NetworkInterface ( GlobalConfig,parent ).getDefaultInterface(); /* update dns? */ if ( GlobalConfig->currentProfile->getUseDnsUpdate() ) { @@ -14807,7 +14807,7 @@ void KVpnc::readFromStdout_tail_racoon() racoonupstream << "fi" << "\n"; } - QProcess *pppdUpProcess = new QProcess ( this ); + TQProcess *pppdUpProcess = new TQProcess ( this ); pppdUpProcess->addArgument ( GlobalConfig->InterpreterShell ); pppdUpProcess->addArgument ( tmpPath + "pppd." + GlobalConfig->currentProfile->getName() + ".up" ); @@ -14821,7 +14821,7 @@ void KVpnc::readFromStdout_tail_racoon() GlobalConfig->appendLogEntry ( i18n ( "\"%1\" (%2) started." ).arg ( "PppdUpScript" ).arg ( tmpPath + "pppd." + GlobalConfig->currentProfile->getName() + ".up" ) , GlobalConfig->debug ); while ( pppdUpProcess->isRunning() ) { - parent->QApplication::processEvents(); + parent->TQApplication::processEvents(); sleep ( 1 ); } @@ -14855,10 +14855,10 @@ void KVpnc::readFromStdout_tail_racoon() GlobalConfig->status = GlobalConfig->connected; - disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) ); - connect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); + connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); durationTimer.start ( 1000, FALSE ); - setGuiStatus ( connected ); + setGuitqStatus ( connected ); doIptablesRacoon(); @@ -14928,13 +14928,13 @@ void KVpnc::readFromStdout_tail_racoon() void KVpnc::readFromStderr_tail_racoon() { - // QString ProcessMsg_connect = QString( RacoonTailProcess->readStderr() ); + // TQString ProcessMsg_connect = TQString( RacoonTailProcess->readStderr() ); while ( RacoonTailProcess->canReadLineStderr() ) { bool error_found =false; bool abort = false; - QString ProcessMsg_connect = RacoonTailProcess->readLineStderr() + "\n"; - //QString ProcessMsg_connect = RacoonTailProcess->readStderr(); + TQString ProcessMsg_connect = RacoonTailProcess->readLineStderr() + "\n"; + //TQString ProcessMsg_connect = RacoonTailProcess->readStderr(); // if ( GlobalConfig->KvpncDebugLevel > 0 ) { GlobalConfig->appendLogEntry ( "[racoon tail err] " + ProcessMsg_connect, GlobalConfig->error ); @@ -14956,13 +14956,13 @@ void KVpnc::readFromStderr_tail_racoon() void KVpnc::readFromStdout_racoonctl() { - // QString ProcessMsg_connect = QString( RacoonctlProcess->readStdout() ); + // TQString ProcessMsg_connect = TQString( RacoonctlProcess->readStdout() ); while ( RacoonctlProcess->canReadLineStdout() ) { bool abort = false; - QString ProcessMsg_connect = RacoonctlProcess->readLineStdout() + "\n"; - //QString ProcessMsg_connect = RacoonctlProcess->readStdout(); + TQString ProcessMsg_connect = RacoonctlProcess->readLineStdout() + "\n"; + //TQString ProcessMsg_connect = RacoonctlProcess->readStdout(); // if ( GlobalConfig->KvpncDebugLevel > 3 ) { GlobalConfig->appendLogEntry ( "[racoonctl] " + ProcessMsg_connect, GlobalConfig->debug ); @@ -14996,9 +14996,9 @@ void KVpnc::readFromStdout_racoonctl() // sleep(2); // if (RacoonctlProcess->isRunning()) // { -// disconnect( RacoonctlProcess, SIGNAL( readyReadStdout() ), this, SLOT( readFromStdout_racoonctl() ) ); -// disconnect( RacoonctlProcess, SIGNAL( readyReadStderr() ), this, SLOT( readFromStderr_racoonctl() ) ); -// disconnect ( RacoonctlProcess, SIGNAL ( processExited () ), this, SLOT ( racoonctlExited() ) ); +// disconnect( RacoonctlProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_racoonctl() ) ); +// disconnect( RacoonctlProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_racoonctl() ) ); +// disconnect ( RacoonctlProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( racoonctlExited() ) ); // RacoonctlProcess->kill(); // sleep(1); // racoonStarted(); @@ -15025,7 +15025,7 @@ void KVpnc::readFromStdout_racoonctl() if ( GlobalConfig->VpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( "[racoonctl] " + i18n ( "User password requested, send it...\n" ), GlobalConfig->debug ); - QString UserPassStr = ""; + TQString UserPassStr = ""; // if ( !GlobalConfig->currentProfile->getSaveUserPassword() || AuthRetry ) UserPassStr = GlobalConfig->TmpPassword; // else @@ -15061,9 +15061,9 @@ void KVpnc::readFromStdout_racoonctl() // // GlobalConfig->status = GlobalConfig->connected; // -// connect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) ); +// connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); // durationTimer.start ( 1000, FALSE ); -// setGuiStatus ( connected ); +// setGuitqStatus ( connected ); // // setFirewallAfterConnect(); // if ( GlobalConfig->currentProfile->getExecuteCmdAfterConnect() ) @@ -15088,12 +15088,12 @@ void KVpnc::readFromStdout_racoonctl() void KVpnc::readFromStderr_racoonctl() { - // QString ProcessMsg_connect = QString( RacoonctlProcess->readStderr() ); + // TQString ProcessMsg_connect = TQString( RacoonctlProcess->readStderr() ); while ( RacoonctlProcess->canReadLineStderr() ) { bool abort = false; - QString ProcessMsg_connect = RacoonctlProcess->readLineStderr() + "\n"; - //QString ProcessMsg_connect = RacoonctlProcess->readStderr(); + TQString ProcessMsg_connect = RacoonctlProcess->readLineStderr() + "\n"; + //TQString ProcessMsg_connect = RacoonctlProcess->readStderr(); // if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( "[racoonctl err] " + ProcessMsg_connect, GlobalConfig->error ); @@ -15114,7 +15114,7 @@ void KVpnc::readFromStderr_racoonctl() if ( GlobalConfig->VpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( "[racoonctl err] " + i18n ( "User password requested, send it...\n" ), GlobalConfig->debug ); - QString UserPassStr = ""; + TQString UserPassStr = ""; // if ( !GlobalConfig->currentProfile->getSaveUserPassword() || AuthRetry ) UserPassStr = GlobalConfig->TmpPassword; // else @@ -15189,7 +15189,7 @@ void KVpnc::readFromStdout_pptp() { timer.stop(); connectCounter=0; - // disconnect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) ); + // disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); KMessageBox::error ( this, i18n ( "Authentication has been failed." ) ); GlobalConfig->appendLogEntry ( i18n ( "Authentication has been failed." ) , GlobalConfig->error ); //abort = true; @@ -15201,7 +15201,7 @@ void KVpnc::readFromStdout_pptp() { timer.stop(); connectCounter=0; - // disconnect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) ); + // disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); KMessageBox::error ( this, i18n ( "The peer refused to authenticate." ) ); GlobalConfig->appendLogEntry ( i18n ( "The peer refused to authenticate." ) , GlobalConfig->error ); abort = true; @@ -15240,7 +15240,7 @@ void KVpnc::readFromStdout_pptp() // NetworkInterface iface(GlobalConfig,parent); // TunnelInterfaceIP = iface.getInterfaceIP( PppdDevice ); // if (GlobalConfig->VpncDebugLevel > 0 ) - // GlobalConfig->appendLogEntry( "[pppd] "+i18n( "Tunnel IP:" ).arg(TunnelInterfaceIP) , GlobalConfig->debug); + // GlobalConfig->appendLogEntry( "[pppd] "+i18n( "Tunnel IP:" ).tqarg(TunnelInterfaceIP) , GlobalConfig->debug); // abort = false; @@ -15263,8 +15263,8 @@ void KVpnc::readFromStdout_pptp() { // example: primary DNS address 132.210.*.2 secondary DNS address 132.210.**.2 bool got2dns = false; - QString DNS1 = ProcessMsg_connect.section ( ' ', 3, 3 ); - QString DNS2 = ProcessMsg_connect.section ( ' ', 7, 7 ); + TQString DNS1 = ProcessMsg_connect.section ( ' ', 3, 3 ); + TQString DNS2 = ProcessMsg_connect.section ( ' ', 7, 7 ); got2dns = Utils ( GlobalConfig ).isValidIPv4Address ( DNS2 ); @@ -15300,7 +15300,7 @@ void KVpnc::readFromStdout_pptp() else if ( ProcessMsg_connect.find ( "local", 0 , FALSE ) > -1 ) { // if (GlobalConfig->KvpncDebugLevel > 0) - // GlobalConfig->appendLogEntry ( i18n( "adr: %1\n" ).arg( ProcessMsg_connect), GlobalConfig->debug); + // GlobalConfig->appendLogEntry ( i18n( "adr: %1\n" ).tqarg( ProcessMsg_connect), GlobalConfig->debug); TunnelInterfaceIP = ProcessMsg_connect.simplifyWhiteSpace().section ( ' ', 3, 3 ); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "Tunnel IP address: %1\n" ).arg ( TunnelInterfaceIP ), GlobalConfig->debug ); @@ -15324,10 +15324,10 @@ void KVpnc::readFromStdout_pptp() GlobalConfig->status = GlobalConfig->connected; - disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) ); - connect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); + connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); durationTimer.start ( 1000, FALSE ); - setGuiStatus ( connected ); + setGuitqStatus ( connected ); connectSuccess = false; GlobalConfig->appendLogEntry ( i18n ( "Connection established." ), GlobalConfig->success ); @@ -15335,9 +15335,9 @@ void KVpnc::readFromStdout_pptp() if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "Tunnel interface IP address: %1" ).arg ( TunnelInterfaceIP ), GlobalConfig->debug ); - // GlobalConfig->appendLogEntry( QString("connectstring: "+ProcessMsg_connect), GlobalConfig->debug ); + // GlobalConfig->appendLogEntry( TQString("connectstring: "+ProcessMsg_connect), GlobalConfig->debug ); - QString pppdev = ""; + TQString pppdev = ""; if ( !PppdDevice.isEmpty() ) pppdev = PppdDevice; else @@ -15345,8 +15345,8 @@ void KVpnc::readFromStdout_pptp() // write pppd..up - QFile pppdupfile ( tmpPath + "pppd." + GlobalConfig->currentProfile->getName() + ".up" ); - QTextStream pppdupstream ( &pppdupfile ); + TQFile pppdupfile ( tmpPath + "pppd." + GlobalConfig->currentProfile->getName() + ".up" ); + TQTextStream pppdupstream ( &pppdupfile ); if ( pppdupfile.open ( IO_WriteOnly ) ) { pppdupstream << "#!"<< GlobalConfig->InterpreterShell << "\n"; @@ -15362,7 +15362,7 @@ void KVpnc::readFromStdout_pptp() pppdupstream << " echo \"# generated by kvpnc. Do not edit it.\" > /etc/resolv.conf" << "\n"; pppdupstream << "fi\n"; - QString resolvtemp=""; + TQString resolvtemp=""; bool no_nameserver=true; if ( !GlobalConfig->currentProfile->getUseDnsServer() ) { @@ -15484,7 +15484,7 @@ void KVpnc::readFromStdout_pptp() pppdupstream << GlobalConfig->pathToRoute << " add default " << pppdev << "\n"; if ( GlobalConfig->KvpncDebugLevel > 4 ) - GlobalConfig->appendLogEntry ( i18n ( "default route count: %1" ).arg ( QString().setNum ( defaultroutecount ) ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "default route count: %1" ).arg ( TQString().setNum ( defaultroutecount ) ), GlobalConfig->debug ); if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "No default route found but replace it was requested, adding one over device %1 with gateway %2..." ).arg ( pppdev ).arg ( GlobalConfig->NewDefaultGw ), GlobalConfig->debug ); @@ -15504,7 +15504,7 @@ void KVpnc::readFromStdout_pptp() pppdupstream << GlobalConfig->pathToRoute << " add default " << pppdev << "\n"; if ( GlobalConfig->KvpncDebugLevel > 4 ) - GlobalConfig->appendLogEntry ( i18n ( "default route count: %1" ).arg ( QString().setNum ( defaultroutecount ) ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "default route count: %1" ).arg ( TQString().setNum ( defaultroutecount ) ), GlobalConfig->debug ); if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "More than one default route found, deleting all and adding one over device %1 with gateway %2..." ).arg ( pppdev ).arg ( GlobalConfig->NewDefaultGw ), GlobalConfig->debug ); @@ -15524,14 +15524,14 @@ void KVpnc::readFromStdout_pptp() // if (GlobalConfig->NewDefaultGw != "0.0.0.0") // { // if ( GlobalConfig->KvpncDebugLevel > 3 ) - // GlobalConfig->appendLogEntry ( i18n ( "Setting extra route: %1 over %2 gw %3" ).arg ( "0.0.0.0" ).arg( pppdev ).arg( GlobalConfig->NewDefaultGw), GlobalConfig->debug ); + // GlobalConfig->appendLogEntry ( i18n ( "Setting extra route: %1 over %2 gw %3" ).arg ( "0.0.0.0" ).tqarg( pppdev ).tqarg( GlobalConfig->NewDefaultGw), GlobalConfig->debug ); // pppdupstream << GlobalConfig->pathToIp + " route add 0.0.0.0 via " << GlobalConfig->NewDefaultGw << " dev " << pppdev << "\n"; // } pppdupfile.close(); } - QProcess *pppdUpProcess = new QProcess ( this ); + TQProcess *pppdUpProcess = new TQProcess ( this ); pppdUpProcess->addArgument ( GlobalConfig->InterpreterShell ); pppdUpProcess->addArgument ( tmpPath + "pppd." + GlobalConfig->currentProfile->getName() + ".up" ); @@ -15545,7 +15545,7 @@ void KVpnc::readFromStdout_pptp() GlobalConfig->appendLogEntry ( i18n ( "\"%1\" (%2) started." ).arg ( "PppdUpScript" ).arg ( tmpPath + "pppd." + GlobalConfig->currentProfile->getName() + ".up" ) , GlobalConfig->debug ); while ( pppdUpProcess->isRunning() ) { - parent->QApplication::processEvents(); + parent->TQApplication::processEvents(); sleep ( 1 ); } if ( GlobalConfig->KvpncDebugLevel > 0 ) @@ -15555,10 +15555,10 @@ void KVpnc::readFromStdout_pptp() delete pppdUpProcess; pppdUpProcess=0L; - QString iplocal=getenv ( "IPLOCAL" ); - QString ipremote=getenv ( "IPREMOTE" ); - QString ifname=getenv ( "IFNAME" ); - QString speed=getenv ( "SPEED" ); + TQString iplocal=getenv ( "IPLOCAL" ); + TQString ipremote=getenv ( "IPREMOTE" ); + TQString ifname=getenv ( "IFNAME" ); + TQString speed=getenv ( "SPEED" ); if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "Local IP address: %1, remote IP address: %2, device: %3, speed: %4" ).arg ( TunnelInterfaceIP ).arg ( ipremote ).arg ( ifname ).arg ( speed ), GlobalConfig->debug ); @@ -15573,28 +15573,28 @@ void KVpnc::readFromStdout_pptp() // if (! pppdHasReplacedefaultrouteSupport) // { // tmpPath = locateLocal ( "data", "kvpnc/" ); - // QString PppdReplaceDefaultRouteScript = tmpPath + "pppd_replace_defaultroute." + GlobalConfig->currentProfile->getName() + ".sh"; + // TQString PppdReplaceDefaultRouteScript = tmpPath + "pppd_replace_defaultroute." + GlobalConfig->currentProfile->getName() + ".sh"; // - // QFile file ( PppdReplaceDefaultRouteScript ); - // QTextStream stream ( &file ); + // TQFile file ( PppdReplaceDefaultRouteScript ); + // TQTextStream stream ( &file ); // if ( file.open ( IO_WriteOnly ) ) // { // stream << "# generated by kvpnc. Do not edit it." << "\n"; // stream << "\n"; // file.close(); - // ReplaceDefaultRouteProcess = new QProcess ( this ); + // ReplaceDefaultRouteProcess = new TQProcess ( this ); // ReplaceDefaultRouteProcess->addArgument ( GlobalConfig->InterpreterShell ); // ReplaceDefaultRouteProcess->addArgument ( PppdReplaceDefaultRouteScript ); // if ( !ReplaceDefaultRouteProcess->start(env) ) // { - // KMessageBox::sorry ( this, i18n ( "\"%1\" %2 start failed!" ).arg ( i18n ( "pppd replace route process" )).arg( tmpPath + "pppd_replace_defaultroute." + GlobalConfig->currentProfile->getName() + ".sh") ); + // KMessageBox::sorry ( this, i18n ( "\"%1\" %2 start failed!" ).arg ( i18n ( "pppd replace route process" )).tqarg( tmpPath + "pppd_replace_defaultroute." + GlobalConfig->currentProfile->getName() + ".sh") ); // // disconnectClicked(); - // // setGuiStatus(disconnected); + // // setGuitqStatus(disconnected); // } // else // { // if ( GlobalConfig->KvpncDebugLevel > 1 ) - // GlobalConfig->appendLogEntry ( i18n ( "\"%1\" (%2) started." ).arg ( i18n ( "pppd replace route process" )).arg( tmpPath + "pppd_replace_defaultroute." + GlobalConfig->currentProfile->getName() + ".sh") , GlobalConfig->debug ); + // GlobalConfig->appendLogEntry ( i18n ( "\"%1\" (%2) started." ).arg ( i18n ( "pppd replace route process" )).tqarg( tmpPath + "pppd_replace_defaultroute." + GlobalConfig->currentProfile->getName() + ".sh") , GlobalConfig->debug ); // while (ReplaceDefaultRouteProcess->isRunning()) // { // sleep(1); @@ -15605,7 +15605,7 @@ void KVpnc::readFromStdout_pptp() // } // else // { - // GlobalConfig->appendLogEntry ( i18n ( "Could not write: \"%1\" (%2)!" ).arg ( i18n ( "pppd replace route script" )).arg(PppdReplaceDefaultRouteScript), GlobalConfig->error ); + // GlobalConfig->appendLogEntry ( i18n ( "Could not write: \"%1\" (%2)!" ).arg ( i18n ( "pppd replace route script" )).tqarg(PppdReplaceDefaultRouteScript), GlobalConfig->error ); // } // // } @@ -15614,7 +15614,7 @@ void KVpnc::readFromStdout_pptp() // GlobalConfig->appendLogEntry ( i18n ( "pppd supports replacedefaultroute and replace the route it" ) , config->debug ); // } // } - // PptpRouteProcess = new QProcess( this ); + // PptpRouteProcess = new TQProcess( this ); // PptpRouteProcess->addArgument( GlobalConfig->pathToRoute ); // PptpRouteProcess->addArgument( "add" ); // PptpRouteProcess->addArgument( "-net" ); @@ -15623,9 +15623,9 @@ void KVpnc::readFromStdout_pptp() // if ( !PptpRouteProcess->start(env) ) // { - // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( i18n( "pppd route process" ) ) ); + // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( i18n( "pppd route process" ) ) ); // disconnectClicked(); - // setGuiStatus(disconnected); + // setGuitqStatus(disconnected); // } // else // { @@ -15635,7 +15635,7 @@ void KVpnc::readFromStdout_pptp() // } // delete PptpRouteProcess; // PptpRouteProcess=0L; - // GlobalConfig->appendLogEntry ( i18n( "\"%1\" started." ).arg( i18n( "pppd route process" ) ), GlobalConfig->info ); + // GlobalConfig->appendLogEntry ( i18n( "\"%1\" started." ).tqarg( i18n( "pppd route process" ) ), GlobalConfig->info ); if ( GlobalConfig->currentProfile->getUseAdditionalNetworkRoutes() && !GlobalConfig->currentProfile->getAdditionalNetworkRoutes().isEmpty() ) addAdditionalNetworkRoutes(); @@ -15655,21 +15655,21 @@ void KVpnc::readFromStdout_pptp() //terminateConnection ( PptpProcess ); disconnectClicked(); GlobalConfig->status = GlobalConfig->disconnected; - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); // // remove password entries // if (GlobalConfig->currentProfile->getAuthMethod() == "chap" || GlobalConfig->currentProfile->getAuthMethod() == "mschap" || GlobalConfig->currentProfile->getAuthMethod() == "mschap-v2" ) // { // // remove kvpnc entries from chap-secerets - // QFile ChapSecretsFile ( "/etc/ppp/chap-secrets" ); + // TQFile ChapSecretsFile ( "/etc/ppp/chap-secrets" ); // if ( GlobalConfig->KvpncDebugLevel > 0 ) - // GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1").arg("/etc/ppp/chap-secrets" ), GlobalConfig->debug ); - // QTextStream stream ( &ChapSecretsFile ); + // GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1").tqarg("/etc/ppp/chap-secrets" ), GlobalConfig->debug ); + // TQTextStream stream ( &ChapSecretsFile ); // if ( ChapSecretsFile.open ( IO_ReadOnly ) ) // { - // QString line = ""; - // QString chapsecret_content = ""; + // TQString line = ""; + // TQString chapsecret_content = ""; // bool kvpnc_start_marker_found = false; // bool kvpnc_end_marker_found = false; // while ( !stream.atEnd() ) @@ -15729,14 +15729,14 @@ void KVpnc::readFromStdout_pptp() // if (GlobalConfig->currentProfile->getAuthMethod() == "pap") // { // // remove kvpnc entries from pap-secerets - // QFile papSecretsFile ( "/etc/ppp/pap-secrets" ); + // TQFile papSecretsFile ( "/etc/ppp/pap-secrets" ); // if ( GlobalConfig->KvpncDebugLevel > 0 ) - // GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1").arg("/etc/ppp/chap-secrets" ), GlobalConfig->debug ); - // QTextStream stream ( &papSecretsFile ); + // GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1").tqarg("/etc/ppp/chap-secrets" ), GlobalConfig->debug ); + // TQTextStream stream ( &papSecretsFile ); // if ( papSecretsFile.open ( IO_ReadOnly ) ) // { - // QString line = ""; - // QString papsecret_content = ""; + // TQString line = ""; + // TQString papsecret_content = ""; // bool kvpnc_start_marker_found = false; // bool kvpnc_end_marker_found = false; // while ( !stream.atEnd() ) @@ -15924,7 +15924,7 @@ void KVpnc::readFromStderr_pptp() error_found=true; } - GlobalConfig->appendLogEntry ( QString ( "[pppd err] " + ProcessMsg_connect ) , GlobalConfig->error ); + GlobalConfig->appendLogEntry ( TQString ( "[pppd err] " + ProcessMsg_connect ) , GlobalConfig->error ); if ( abort ) { @@ -15933,7 +15933,7 @@ void KVpnc::readFromStderr_pptp() //terminateConnection ( PptpProcess ); disconnectClicked(); GlobalConfig->status = GlobalConfig->disconnected; - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); if ( allowReconnect && GlobalConfig->currentProfile->getDoReconnectAfterConnectionLost() ) { @@ -15958,17 +15958,17 @@ void KVpnc::readFromStderr_pptp() void KVpnc::readOutput_openvpn() { - QString ProcessMsg = ""; + TQString ProcessMsg = ""; bool stderr = false; bool connectSuccess = false; - QString NetworkDevice = ""; + TQString NetworkDevice = ""; while ( OpenvpnProcess != 0L && OpenvpnProcess->canReadLineStdout() ) { - ProcessMsg = QString ( OpenvpnProcess->readLineStdout() ); + ProcessMsg = TQString ( OpenvpnProcess->readLineStdout() ); - // ProcessMsg = QString( OpenvpnProcess->readStdout() ); + // ProcessMsg = TQString( OpenvpnProcess->readStdout() ); if ( !ProcessMsg.isEmpty() && GlobalConfig->KvpncDebugLevel > 4 ) { @@ -15977,7 +15977,7 @@ void KVpnc::readOutput_openvpn() // else // { // stderr=true; - // ProcessMsg = QString( OpenvpnProcess->readStderr() ); + // ProcessMsg = TQString( OpenvpnProcess->readStderr() ); // GlobalConfig->appendLogEntry ( "stderr openvpn: "+ProcessMsg, GlobalConfig->debug ); // } @@ -16006,29 +16006,29 @@ void KVpnc::readOutput_openvpn() { AuthRetry = true; GlobalConfig->haveUserData = false; - disconnect ( OpenvpnProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readOutput_openvpn() ) ); - // disconnect( OpenvpnProcess, SIGNAL( readyReadStderr() ), this, SLOT( readOutput_openvpn() ) ); + disconnect ( OpenvpnProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readOutput_openvpn() ) ); + // disconnect( OpenvpnProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readOutput_openvpn() ) ); connectClicked(); - // KMessageBox::error( this, i18n( "Authentication failed (%1)!" ).arg(i18n("user password") )); + // KMessageBox::error( this, i18n( "Authentication failed (%1)!" ).tqarg(i18n("user password") )); GlobalConfig->appendLogEntry ( i18n ( "Authentication failed (%1)!" ).arg ( i18n ( "user password" ) ) , GlobalConfig->error ); // abort=true; } else if ( ProcessMsg.find ( "ERROR: could not read Auth username/password from management interface", 0, FALSE ) > -1 ) { ; - disconnect ( OpenvpnProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readOutput_openvpn() ) ); - // disconnect( OpenvpnProcess, SIGNAL( readyReadStderr() ), this, SLOT( readOutput_openvpn() ) ); + disconnect ( OpenvpnProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readOutput_openvpn() ) ); + // disconnect( OpenvpnProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readOutput_openvpn() ) ); connectClicked(); - // KMessageBox::error( this, i18n( "Authentication failed (%1)!" ).arg(i18n("user password") )); + // KMessageBox::error( this, i18n( "Authentication failed (%1)!" ).tqarg(i18n("user password") )); GlobalConfig->appendLogEntry ( i18n ( "Username and password could not read from management interface!" ) , GlobalConfig->error ); abort = true; } else if ( ProcessMsg.find ( "ERROR: could not read eToken token username/password/ok from management interface", 0, FALSE ) > -1 ) { - disconnect ( OpenvpnProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readOutput_openvpn() ) ); - // disconnect( OpenvpnProcess, SIGNAL( readyReadStderr() ), this, SLOT( readOutput_openvpn() ) ); + disconnect ( OpenvpnProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readOutput_openvpn() ) ); + // disconnect( OpenvpnProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readOutput_openvpn() ) ); connectClicked(); - // KMessageBox::error( this, i18n( "Authentication failed (%1)!" ).arg(i18n("user password") )); + // KMessageBox::error( this, i18n( "Authentication failed (%1)!" ).tqarg(i18n("user password") )); GlobalConfig->appendLogEntry ( i18n ( "eToken password could not read from management interface!" ) , GlobalConfig->error ); abort = true; } @@ -16036,16 +16036,16 @@ void KVpnc::readOutput_openvpn() { AuthRetry = true; GlobalConfig->haveUserData = false; - disconnect ( OpenvpnProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readOutput_openvpn() ) ); - // disconnect( OpenvpnProcess, SIGNAL( readyReadStderr() ), this, SLOT( readOutput_openvpn() ) ); + disconnect ( OpenvpnProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readOutput_openvpn() ) ); + // disconnect( OpenvpnProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readOutput_openvpn() ) ); connectClicked(); - // KMessageBox::error( this, i18n( "Authentication failed (%1)!" ).arg(i18n("user password") )); + // KMessageBox::error( this, i18n( "Authentication failed (%1)!" ).tqarg(i18n("user password") )); GlobalConfig->appendLogEntry ( i18n ( "Insufficient key material or header text not found!" ) , GlobalConfig->error ); abort = true; } else if ( ProcessMsg.find ( "not found", 0, FALSE ) > -1 && ProcessMsg.find ( "Message hash algorithm", 0, FALSE ) > -1 ) { - QString hash_algo= ProcessMsg.section ( "'",1,1 ); + TQString hash_algo= ProcessMsg.section ( "'",1,1 ); KMessageBox::error ( this, i18n ( "Hash algorithm \"%1\"not found! Please choose another one." ).arg ( hash_algo ) ); GlobalConfig->appendLogEntry ( i18n ( "Hash algorithm \"%1\"not found! Please choose another one." ).arg ( hash_algo ) , GlobalConfig->error ); abort = true; @@ -16058,8 +16058,8 @@ void KVpnc::readOutput_openvpn() } else if ( ProcessMsg.find ( "'dev-type' is used inconsistently, local='dev-type tun', remote='dev-type tap'", 0 , FALSE ) > -1 ) { - // KMessageBox::error( this, i18n( "Local network type is %1 but remote network type is %2. This must be fixed.\nGo to OpenVPN settings and change it to %2." ).arg( "tun" ).arg( "tap" ) ); - // GlobalConfig->appendLogEntry( i18n( "Local network type is %1 but remote network type is %2. This must be fixed." ).arg( "tun" ).arg( "tap" ) , GlobalConfig->error ); + // KMessageBox::error( this, i18n( "Local network type is %1 but remote network type is %2. This must be fixed.\nGo to OpenVPN settings and change it to %2." ).tqarg( "tun" ).tqarg( "tap" ) ); + // GlobalConfig->appendLogEntry( i18n( "Local network type is %1 but remote network type is %2. This must be fixed." ).tqarg( "tun" ).tqarg( "tap" ) , GlobalConfig->error ); // abort = true; GlobalConfig->appendLogEntry ( i18n ( "Local network type is %1 but remote network type is %2. This will be fixed." ).arg ( "tun" ).arg ( "tap" ), GlobalConfig->info ); @@ -16070,8 +16070,8 @@ void KVpnc::readOutput_openvpn() } else if ( ProcessMsg.find ( "'dev-type' is used inconsistently, local='dev-type tap', remote='dev-type tun'", 0 , FALSE ) > -1 ) { - // KMessageBox::error( this, i18n( "Local network type is %1 but remote network type is %2. This must be fixed.\nGo to OpenVPN settings and change it to %2." ).arg( "tap" ).arg( "tun" ) ); - // GlobalConfig->appendLogEntry( i18n( "Local network type is %1 but remote network type is %2. This must be fixed." ).arg( "tap" ).arg( "tun" ), GlobalConfig->error ); + // KMessageBox::error( this, i18n( "Local network type is %1 but remote network type is %2. This must be fixed.\nGo to OpenVPN settings and change it to %2." ).tqarg( "tap" ).tqarg( "tun" ) ); + // GlobalConfig->appendLogEntry( i18n( "Local network type is %1 but remote network type is %2. This must be fixed." ).tqarg( "tap" ).tqarg( "tun" ), GlobalConfig->error ); // abort = true; GlobalConfig->appendLogEntry ( i18n ( "Local network type is %1 but remote network type is %2. This will be fixed." ).arg ( "tap" ).arg ( "tun" ), GlobalConfig->info ); @@ -16080,7 +16080,7 @@ void KVpnc::readOutput_openvpn() disconnectClicked(); connectClicked(); } - else if ( ProcessMsg.find ( "connect to " + QString ( GlobalConfig->currentProfile->getHttpProxy() + ":" + QString().setNum ( GlobalConfig->currentProfile->getHttpProxyPort() ) + " failed" ), 0, FALSE ) > -1 ) + else if ( ProcessMsg.find ( "connect to " + TQString ( GlobalConfig->currentProfile->getHttpProxy() + ":" + TQString().setNum ( GlobalConfig->currentProfile->getHttpProxyPort() ) + " failed" ), 0, FALSE ) > -1 ) { // else if ( ProcessMsg.find( "Connection refused", 0, FALSE ) > -1 ) { // if ( ProcessMsg.find( "failed", 0, FALSE ) > -1 ) { @@ -16101,15 +16101,15 @@ void KVpnc::readOutput_openvpn() // GlobalConfig->appendLogEntry ( i18n ( "The management port cant bind, please try again later." ).arg ( GlobalConfig->currentProfile->getHttpProxy() ).arg ( GlobalConfig->currentProfile->getHttpProxyPort() ) , GlobalConfig->error ); // KMessageBox::error ( this, i18n ( "The management port cant bind, please try again later." ) ); - QString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( GlobalConfig->OpenvpnManagementPort ); + TQString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( GlobalConfig->OpenvpnManagementPort ); GlobalConfig->appendLogEntry ( i18n ( "NameAndPid: %1" ).arg ( NameAndPid ) , GlobalConfig->debug ); int pid = -1; - QString Name = ""; + TQString Name = ""; if ( !NameAndPid.isEmpty() ) { pid = NameAndPid.section ( '/', 0, 0 ).toInt(); Name = NameAndPid.section ( '/', 1, 1 ); - KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( QString().setNum ( GlobalConfig->OpenvpnManagementPort ) ).arg ( Name ).arg ( QString().setNum ( pid ) ) ); + KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( TQString().setNum ( GlobalConfig->OpenvpnManagementPort ) ).arg ( Name ).arg ( TQString().setNum ( pid ) ) ); } else KMessageBox::error ( this, i18n ( "Port binding failed" ) ); @@ -16117,21 +16117,21 @@ void KVpnc::readOutput_openvpn() abort = true; } - else if ( ProcessMsg.find ( QString ( "MANAGEMENT: Socket bind failed on local address 127.0.0.1:"+QString().setNum ( GlobalConfig->OpenvpnManagementPort ) +": Address already in use" ), 0, FALSE ) > -1 ) + else if ( ProcessMsg.find ( TQString ( "MANAGEMENT: Socket bind failed on local address 127.0.0.1:"+TQString().setNum ( GlobalConfig->OpenvpnManagementPort ) +": Address already in use" ), 0, FALSE ) > -1 ) { // GlobalConfig->appendLogEntry ( i18n ( "The management port cant bind, please try again later." ) ) , GlobalConfig->error ); // KMessageBox::error ( this, i18n ( "The management port cant bind, please try again later." ) ); - QString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( GlobalConfig->OpenvpnManagementPort ); + TQString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( GlobalConfig->OpenvpnManagementPort ); GlobalConfig->appendLogEntry ( i18n ( "NameAndPid: %1" ).arg ( NameAndPid ) , GlobalConfig->debug ); int pid = -1; - QString Name = ""; + TQString Name = ""; if ( !NameAndPid.isEmpty() ) { pid = NameAndPid.section ( '/', 0, 0 ).toInt(); Name = NameAndPid.section ( '/', 1, 1 ); - KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( QString().setNum ( GlobalConfig->OpenvpnManagementPort ) ).arg ( Name ).arg ( QString().setNum ( pid ) ) ); + KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( TQString().setNum ( GlobalConfig->OpenvpnManagementPort ) ).arg ( Name ).arg ( TQString().setNum ( pid ) ) ); } else { @@ -16160,7 +16160,7 @@ void KVpnc::readOutput_openvpn() if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "Private key password requested, send it...\n" ), GlobalConfig->debug ); - QString PrivKeyPassStr = ""; + TQString PrivKeyPassStr = ""; // if (GlobalConfig->currentProfile->getSavePsk()) PrivKeyPassStr = GlobalConfig->currentProfile->getPrivateKeyPass(); // else @@ -16168,7 +16168,7 @@ void KVpnc::readOutput_openvpn() if ( PrivKeyPassStr.isEmpty() ) { GlobalConfig->TmpPrivateKeyPass = ""; - QString pass=""; + TQString pass=""; EnterXauthInteractivePasscodeDialog dlg ( 0); dlg.setCaption( i18n ( "Enter private key password" ) ); dlg.main->DescriptionLabel->setText ( i18n ( "Enter private key password to unlock private key:" ) ); @@ -16189,10 +16189,10 @@ void KVpnc::readOutput_openvpn() if ( dlg.main->SavePasswordCheckBox->isChecked() ) { GlobalConfig->currentProfile->setSavePrivateKeyPassword ( true ); - GlobalConfig->currentProfile->setPrivateKeyPass ( QString ( pass ) ); + GlobalConfig->currentProfile->setPrivateKeyPass ( TQString ( pass ) ); } - GlobalConfig->TmpPrivateKeyPass = QString ( pass ); + GlobalConfig->TmpPrivateKeyPass = TQString ( pass ); // if ( GlobalConfig->KvpncDebugLevel > 5 ) // GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: private key password: " + GlobalConfig->TmpPrivateKeyPass, GlobalConfig->debug ); @@ -16222,7 +16222,7 @@ void KVpnc::readOutput_openvpn() if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "User name requested, send it...\n" ), GlobalConfig->debug ); - QString UsernameStr = ""; + TQString UsernameStr = ""; if ( !GlobalConfig->currentProfile->getUserName().isEmpty() ) UsernameStr = GlobalConfig->currentProfile->getUserName(); else @@ -16297,10 +16297,10 @@ void KVpnc::readOutput_openvpn() } else if ( ProcessMsg.find ( "'auth' is used inconsistently", 0 , FALSE ) > -1 ) { - QString LocalAuth = ProcessMsg.section ( '=', 1, 1 ).section ( ',', 0, 0 ).section ( ' ', 1, 1 ).remove ( "'" ); - QString PeerAuth = ProcessMsg.section ( '=', 2, 2 ).section ( ' ', 1, 1 ).remove ( "'" ); - // KMessageBox::error( this, i18n( "Wrong authentication method used. We use \"%1\" but peer want \"%2\". Please change it in %3 settings." ).arg( LocalAuth ).arg( PeerAuth ).arg( i18n( "OpenVPN" ) ) ); - // GlobalConfig->appendLogEntry( i18n( "Wrong authentication method used. We use \"%1\" but peer want \"%2\". Please change it in %3 settings." ).arg( LocalAuth ).arg( PeerAuth ).arg( i18n( "OpenVPN" ) ) , GlobalConfig->error ); + TQString LocalAuth = ProcessMsg.section ( '=', 1, 1 ).section ( ',', 0, 0 ).section ( ' ', 1, 1 ).remove ( "'" ); + TQString PeerAuth = ProcessMsg.section ( '=', 2, 2 ).section ( ' ', 1, 1 ).remove ( "'" ); + // KMessageBox::error( this, i18n( "Wrong authentication method used. We use \"%1\" but peer want \"%2\". Please change it in %3 settings." ).tqarg( LocalAuth ).tqarg( PeerAuth ).tqarg( i18n( "OpenVPN" ) ) ); + // GlobalConfig->appendLogEntry( i18n( "Wrong authentication method used. We use \"%1\" but peer want \"%2\". Please change it in %3 settings." ).tqarg( LocalAuth ).tqarg( PeerAuth ).tqarg( i18n( "OpenVPN" ) ) , GlobalConfig->error ); // abort = true; GlobalConfig->appendLogEntry ( i18n ( "Wrong authentication method used. We use \"%1\" but peer want \"%2\", this will be fixed." ).arg ( LocalAuth ).arg ( PeerAuth ) , GlobalConfig->info ); @@ -16313,10 +16313,10 @@ void KVpnc::readOutput_openvpn() else if ( ProcessMsg.find ( "WARNING: 'cipher' is used inconsistently", 0 , FALSE ) > -1 ) { // example: WARNING: 'cipher' is used inconsistently, local='cipher BF-CBC', remote='cipher AES-128-CBC' - QString LocalCipher = ProcessMsg.section ( '=', 1, 1 ).section ( ',', 0, 0 ).section ( ' ', 1, 1 ).remove ( "'" ); - QString PeerCipher = ProcessMsg.section ( '=', 2, 2 ).section ( ' ', 1, 1 ).remove ( "'" ); - // KMessageBox::error( this, i18n( "Wrong cipher used. We use \"%1\" but peer want \"%2\". Please change it in %3 settings." ).arg( LocalCipher ).arg( PeerCipher ).arg( i18n( "OpenVPN" ) ) ); - // GlobalConfig->appendLogEntry( i18n( "Wrong chiper used. We use \"%1\" but peer want \"%2\". Please change it in %3 settings." ).arg( LocalCipher ).arg( PeerCipher ).arg( i18n( "OpenVPN" ) ) , GlobalConfig->error ); + TQString LocalCipher = ProcessMsg.section ( '=', 1, 1 ).section ( ',', 0, 0 ).section ( ' ', 1, 1 ).remove ( "'" ); + TQString PeerCipher = ProcessMsg.section ( '=', 2, 2 ).section ( ' ', 1, 1 ).remove ( "'" ); + // KMessageBox::error( this, i18n( "Wrong cipher used. We use \"%1\" but peer want \"%2\". Please change it in %3 settings." ).tqarg( LocalCipher ).tqarg( PeerCipher ).tqarg( i18n( "OpenVPN" ) ) ); + // GlobalConfig->appendLogEntry( i18n( "Wrong chiper used. We use \"%1\" but peer want \"%2\". Please change it in %3 settings." ).tqarg( LocalCipher ).tqarg( PeerCipher ).tqarg( i18n( "OpenVPN" ) ) , GlobalConfig->error ); // abort = true; GlobalConfig->appendLogEntry ( i18n ( "Wrong chipher used. We use \"%1\" but peer want \"%2\", this will be fixed." ).arg ( LocalCipher ).arg ( PeerCipher ) , GlobalConfig->info ); @@ -16414,7 +16414,7 @@ void KVpnc::readOutput_openvpn() GlobalConfig->appendLogEntry ( i18n ( "%1 is shutting down." ).arg ( "openvpn" ), GlobalConfig->debug ); connectionEnded(); - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); } else if ( ProcessMsg.find ( "Initialization Sequence Completed", 0, FALSE ) > -1 ) { @@ -16450,10 +16450,10 @@ void KVpnc::readOutput_openvpn() GlobalConfig->status = GlobalConfig->connected; - disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) ); - connect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); + connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); durationTimer.start ( 1000, FALSE ); - setGuiStatus ( connected ); + setGuitqStatus ( connected ); connectSuccess = false; if ( GlobalConfig->KvpncDebugLevel > 0 ) @@ -16492,10 +16492,10 @@ void KVpnc::readOutput_openvpn() while ( OpenvpnProcess != 0L && OpenvpnProcess->canReadLineStderr() ) { - ProcessMsg = QString ( OpenvpnProcess->readLineStderr() ); + ProcessMsg = TQString ( OpenvpnProcess->readLineStderr() ); - // ProcessMsg = QString( OpenvpnProcess->readStdout() ); + // ProcessMsg = TQString( OpenvpnProcess->readStdout() ); if ( !ProcessMsg.isEmpty() && GlobalConfig->KvpncDebugLevel > 2 ) { @@ -16506,7 +16506,7 @@ void KVpnc::readOutput_openvpn() void KVpnc::readFromStdout_l2tpd() { - L2tpdBufferStdoutString += QString ( L2tpdProcess->readStdout() ); + L2tpdBufferStdoutString += TQString ( L2tpdProcess->readStdout() ); emit L2tpdStdoutRecieved(); return; @@ -16514,7 +16514,7 @@ void KVpnc::readFromStdout_l2tpd() void KVpnc::readFromStderr_l2tpd() { - L2tpdBufferStderrString += QString ( L2tpdProcess->readStderr() ); + L2tpdBufferStderrString += TQString ( L2tpdProcess->readStderr() ); emit L2tpdStderrRecieved(); return; @@ -16523,17 +16523,17 @@ void KVpnc::readFromStderr_l2tpd() void KVpnc::processStdout_l2tpd() { - QString ProcessMsg_connect_raw = L2tpdBufferStdoutString; - QStringList ProcessMsg_connect_list = QStringList::split ( '\n',ProcessMsg_connect_raw ); + TQString ProcessMsg_connect_raw = L2tpdBufferStdoutString; + TQStringList ProcessMsg_connect_list = TQStringList::split ( '\n',ProcessMsg_connect_raw ); L2tpdBufferStdoutString =""; - for ( QStringList::Iterator it = ProcessMsg_connect_list.begin(); it != ProcessMsg_connect_list.end(); ++it ) + for ( TQStringList::Iterator it = ProcessMsg_connect_list.begin(); it != ProcessMsg_connect_list.end(); ++it ) { bool NormalMsg = true; bool ErrorMsg = false; - QString ProcessMsg_connect = *it; + TQString ProcessMsg_connect = *it; if ( GlobalConfig->KvpncDebugLevel > 7 ) - GlobalConfig->appendLogEntry ( QString ( "[l2tpd raw] " + ProcessMsg_connect ) , GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( TQString ( "[l2tpd raw] " + ProcessMsg_connect ) , GlobalConfig->debug ); bool abort = false; @@ -16543,13 +16543,13 @@ void KVpnc::processStdout_l2tpd() { bool kill_l2tpd=true; - QString deamon="xl2tpd"; - if ( !GlobalConfig->pathToXl2tpd.isEmpty() && QFile ( GlobalConfig->pathToXl2tpd ).exists() ) + TQString deamon="xl2tpd"; + if ( !GlobalConfig->pathToXl2tpd.isEmpty() && TQFile ( GlobalConfig->pathToXl2tpd ).exists() ) { deamon="xl2tpd"; if ( !GlobalConfig->doKillXl2tpdIfStillRunning ) { - GlobalConfig->appendLogEntry ( QString ( "[l2tpd err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( deamon ) ) , GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( TQString ( "[l2tpd err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( deamon ) ) , GlobalConfig->debug ); abort = true; kill_l2tpd=false; } @@ -16559,7 +16559,7 @@ void KVpnc::processStdout_l2tpd() deamon="l2tpd"; if ( !GlobalConfig->doKillL2tpdIfStillRunning ) { - GlobalConfig->appendLogEntry ( QString ( "[l2tpd err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( deamon ) ) , GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( TQString ( "[l2tpd err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( deamon ) ) , GlobalConfig->debug ); abort = true; kill_l2tpd=false; } @@ -16567,9 +16567,9 @@ void KVpnc::processStdout_l2tpd() if ( kill_l2tpd == true ) { - QProcess killl2tpdprocess ( this ); + TQProcess killl2tpdprocess ( this ); killl2tpdprocess.addArgument ( GlobalConfig->pathToKillall ); - if ( !GlobalConfig->pathToXl2tpd.isEmpty() && QFile ( GlobalConfig->pathToXl2tpd ).exists() ) + if ( !GlobalConfig->pathToXl2tpd.isEmpty() && TQFile ( GlobalConfig->pathToXl2tpd ).exists() ) killl2tpdprocess.addArgument ( "xl2tpd" ); else killl2tpdprocess.addArgument ( "l2tpd" ); @@ -16577,7 +16577,7 @@ void KVpnc::processStdout_l2tpd() if ( !killl2tpdprocess.start() ) { GlobalConfig->appendLogEntry ( i18n ( "%1 could not be killed." ).arg ( "l2tpd" ) , GlobalConfig->error ); - GlobalConfig->appendLogEntry ( QString ( "[l2tpd err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( deamon ) ) , GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( TQString ( "[l2tpd err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( deamon ) ) , GlobalConfig->debug ); abort = true; } else @@ -16593,9 +16593,9 @@ void KVpnc::processStdout_l2tpd() sleep ( 1 ); - L2tpdProcess = new QProcess ( this ); + L2tpdProcess = new TQProcess ( this ); // - if ( !GlobalConfig->pathToXl2tpd.isEmpty() && QFile ( GlobalConfig->pathToXl2tpd ).exists() ) + if ( !GlobalConfig->pathToXl2tpd.isEmpty() && TQFile ( GlobalConfig->pathToXl2tpd ).exists() ) { if ( GlobalConfig->KvpncDebugLevel > 1 ) GlobalConfig->appendLogEntry ( i18n ( "Using %1." ).arg ( "xl2tpd" ),GlobalConfig->debug ); @@ -16620,7 +16620,7 @@ void KVpnc::processStdout_l2tpd() if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "l2tpd" ), GlobalConfig->error ); KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( "l2tpd" ) ); - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); } else { @@ -16635,19 +16635,19 @@ void KVpnc::processStdout_l2tpd() else if ( ProcessMsg_connect.find ( "Connection closed to", 0 , FALSE ) > -1 ) { ErrorMsg=true; - GlobalConfig->appendLogEntry ( QString ( "[l2tpd err] " + i18n ( "Connection was closed." ) ) , GlobalConfig->error ); + GlobalConfig->appendLogEntry ( TQString ( "[l2tpd err] " + i18n ( "Connection was closed." ) ) , GlobalConfig->error ); abort = true; } else if ( ProcessMsg_connect.find ( "pppd exited for call", 0 , FALSE ) > -1 ) { ErrorMsg=true; - GlobalConfig->appendLogEntry ( QString ( "[l2tpd err] " + i18n ( "pppd exited for call" ) ) , GlobalConfig->error ); + GlobalConfig->appendLogEntry ( TQString ( "[l2tpd err] " + i18n ( "pppd exited for call" ) ) , GlobalConfig->error ); abort = true; } else if ( ProcessMsg_connect.find ( "unrecognized option", 0 , FALSE ) > -1 ) { ErrorMsg=true; - GlobalConfig->appendLogEntry ( QString ( "[l2tpd err] " + i18n ( "unknown option in generated config file, please report to maintainer." ) ) , GlobalConfig->error ); + GlobalConfig->appendLogEntry ( TQString ( "[l2tpd err] " + i18n ( "unknown option in generated config file, please report to maintainer." ) ) , GlobalConfig->error ); abort = true; } @@ -16670,21 +16670,21 @@ void KVpnc::processStdout_l2tpd() //terminateConnection ( L2tpdProcess ); disconnectClicked(); GlobalConfig->status = GlobalConfig->disconnected; - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); // remove kvpnc entries from secrets file if ( GlobalConfig->currentProfile->getAuthMethod() == "chap" || GlobalConfig->currentProfile->getAuthMethod() == "mschap" || GlobalConfig->currentProfile->getAuthMethod() == "mschap-v2" ) { // remove kvpnc entries from chap-secerets - QFile ChapSecretsFile ( "/etc/ppp/chap-secrets" ); + TQFile ChapSecretsFile ( "/etc/ppp/chap-secrets" ); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1" ).arg ( "/etc/ppp/chap-secrets" ), GlobalConfig->debug ); - QTextStream stream ( &ChapSecretsFile ); + TQTextStream stream ( &ChapSecretsFile ); if ( ChapSecretsFile.open ( IO_ReadOnly ) ) { - QString line = ""; - QString chapsecret_content = ""; + TQString line = ""; + TQString chapsecret_content = ""; bool kvpnc_start_marker_found = false; bool kvpnc_end_marker_found = false; while ( !stream.atEnd() ) @@ -16744,14 +16744,14 @@ void KVpnc::processStdout_l2tpd() if ( GlobalConfig->currentProfile->getAuthMethod() == "pap" ) { // remove kvpnc entries from pap-secerets - QFile papSecretsFile ( "/etc/ppp/pap-secrets" ); + TQFile papSecretsFile ( "/etc/ppp/pap-secrets" ); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1" ).arg ( "/etc/ppp/chap-secrets" ), GlobalConfig->debug ); - QTextStream stream ( &papSecretsFile ); + TQTextStream stream ( &papSecretsFile ); if ( papSecretsFile.open ( IO_ReadOnly ) ) { - QString line = ""; - QString papsecret_content = ""; + TQString line = ""; + TQString papsecret_content = ""; bool kvpnc_start_marker_found = false; bool kvpnc_end_marker_found = false; while ( !stream.atEnd() ) @@ -16820,10 +16820,10 @@ void KVpnc::processStdout_l2tpd() GlobalConfig->status = GlobalConfig->connected; - disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) ); - connect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); + connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); durationTimer.start ( 1000, FALSE ); - setGuiStatus ( connected ); + setGuitqStatus ( connected ); setFirewallAfterConnect(); @@ -16861,66 +16861,66 @@ void KVpnc::processStdout_l2tpd() void KVpnc::processStderr_l2tpd() { - QString ProcessMsg_connect_raw = L2tpdBufferStderrString; - QStringList ProcessMsg_connect_list = QStringList::split ( '\n',ProcessMsg_connect_raw ); + TQString ProcessMsg_connect_raw = L2tpdBufferStderrString; + TQStringList ProcessMsg_connect_list = TQStringList::split ( '\n',ProcessMsg_connect_raw ); L2tpdBufferStderrString =""; - for ( QStringList::Iterator it = ProcessMsg_connect_list.begin(); it != ProcessMsg_connect_list.end(); ++it ) + for ( TQStringList::Iterator it = ProcessMsg_connect_list.begin(); it != ProcessMsg_connect_list.end(); ++it ) { bool NormalMsg = true; bool ErrorMsg = false; - QString ProcessMsg_connect = *it; + TQString ProcessMsg_connect = *it; bool abort = false; bool connectSuccess = false; if ( GlobalConfig->KvpncDebugLevel > 7 ) - GlobalConfig->appendLogEntry ( QString ( "[l2tpd err raw] " + ProcessMsg_connect ) , GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( TQString ( "[l2tpd err raw] " + ProcessMsg_connect ) , GlobalConfig->debug ); // // if ( ProcessMsg_connect.length() > 3 ) { - // GlobalConfig->appendLogEntry ( QString( "[l2tpd err] " + ProcessMsg_connect ) , GlobalConfig->error ); + // GlobalConfig->appendLogEntry ( TQString( "[l2tpd err] " + ProcessMsg_connect ) , GlobalConfig->error ); if ( ProcessMsg_connect.find ( "Maximum retries exceeded for tunnel", 0 , FALSE ) > -1 ) { ErrorMsg=true; if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry ( QString ( "[l2tpd] " + i18n ( "Maximum retries of L2TP connect try exceeded for tunnel, waiting a moment..." ) ) , GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( TQString ( "[l2tpd] " + i18n ( "Maximum retries of L2TP connect try exceeded for tunnel, waiting a moment..." ) ) , GlobalConfig->debug ); // abort=true; } else if ( ProcessMsg_connect.find ( "l2tp_call:Connecting to host", 0 , FALSE ) > -1 ) { NormalMsg=true; if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry ( QString ( "[l2tpd] " + i18n ( "l2tp_call:Connecting to host" ) ) , GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( TQString ( "[l2tpd] " + i18n ( "l2tp_call:Connecting to host" ) ) , GlobalConfig->debug ); // abort=true; } else if ( ProcessMsg_connect.find ( "maximum retries exceeded.", 0 , FALSE ) > -1 ) { ErrorMsg=true; - GlobalConfig->appendLogEntry ( QString ( "[l2tpd err] " + i18n ( "Maximum of L2TP connect retries exceeded, giving up." ) ) , GlobalConfig->error ); + GlobalConfig->appendLogEntry ( TQString ( "[l2tpd err] " + i18n ( "Maximum of L2TP connect retries exceeded, giving up." ) ) , GlobalConfig->error ); abort = true; } else if ( ProcessMsg_connect.find ( "Connection closed to", 0 , FALSE ) > -1 ) { ErrorMsg=true; - GlobalConfig->appendLogEntry ( QString ( "[l2tpd err] " + i18n ( "Connection was closed." ) ) , GlobalConfig->error ); + GlobalConfig->appendLogEntry ( TQString ( "[l2tpd err] " + i18n ( "Connection was closed." ) ) , GlobalConfig->error ); abort = true; } else if ( ProcessMsg_connect.find ( "pppd exited for call", 0 , FALSE ) > -1 ) { ErrorMsg=true; - GlobalConfig->appendLogEntry ( QString ( "[l2tpd err] " + i18n ( "pppd exited for call" ) ) , GlobalConfig->error ); + GlobalConfig->appendLogEntry ( TQString ( "[l2tpd err] " + i18n ( "pppd exited for call" ) ) , GlobalConfig->error ); abort = true; } else if ( ProcessMsg_connect.find ( "Unable to load config file", 0 , FALSE ) > -1 ) { ErrorMsg=true; KMessageBox::error ( this, i18n ( "Syntax error in config detected. Please report that to the KVpnc maintainer." ) ); - GlobalConfig->appendLogEntry ( QString ( "[l2tpd err] " + i18n ( "Error in generated config file for l2tpd, please report to maintainer." ) ) , GlobalConfig->error ); + GlobalConfig->appendLogEntry ( TQString ( "[l2tpd err] " + i18n ( "Error in generated config file for l2tpd, please report to maintainer." ) ) , GlobalConfig->error ); abort = true; } else if ( ProcessMsg_connect.find ( "init_network: Unable to bind socket. Terminating", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "Unable to bind socket: Address already in use", 0 , FALSE ) > -1 ) @@ -16928,13 +16928,13 @@ void KVpnc::processStderr_l2tpd() ErrorMsg=true; bool kill_l2tpd=true; - QString deamon="xl2tpd"; - if ( !GlobalConfig->pathToXl2tpd.isEmpty() && QFile ( GlobalConfig->pathToXl2tpd ).exists() ) + TQString deamon="xl2tpd"; + if ( !GlobalConfig->pathToXl2tpd.isEmpty() && TQFile ( GlobalConfig->pathToXl2tpd ).exists() ) { deamon="xl2tpd"; if ( !GlobalConfig->doKillXl2tpdIfStillRunning ) { - GlobalConfig->appendLogEntry ( QString ( "[l2tpd err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( deamon ) ) , GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( TQString ( "[l2tpd err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( deamon ) ) , GlobalConfig->debug ); abort = true; kill_l2tpd=false; } @@ -16944,7 +16944,7 @@ void KVpnc::processStderr_l2tpd() deamon="l2tpd"; if ( !GlobalConfig->doKillL2tpdIfStillRunning ) { - GlobalConfig->appendLogEntry ( QString ( "[l2tpd err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( deamon ) ) , GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( TQString ( "[l2tpd err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( deamon ) ) , GlobalConfig->debug ); abort = true; kill_l2tpd=false; } @@ -16952,9 +16952,9 @@ void KVpnc::processStderr_l2tpd() if ( kill_l2tpd == true ) { - QProcess killl2tpdprocess ( this ); + TQProcess killl2tpdprocess ( this ); killl2tpdprocess.addArgument ( GlobalConfig->pathToKillall ); - if ( !GlobalConfig->pathToXl2tpd.isEmpty() && QFile ( GlobalConfig->pathToXl2tpd ).exists() ) + if ( !GlobalConfig->pathToXl2tpd.isEmpty() && TQFile ( GlobalConfig->pathToXl2tpd ).exists() ) killl2tpdprocess.addArgument ( "xl2tpd" ); else killl2tpdprocess.addArgument ( "l2tpd" ); @@ -16962,7 +16962,7 @@ void KVpnc::processStderr_l2tpd() if ( !killl2tpdprocess.start() ) { GlobalConfig->appendLogEntry ( i18n ( "%1 could not be killed." ).arg ( "l2tpd" ) , GlobalConfig->error ); - GlobalConfig->appendLogEntry ( QString ( "[l2tpd err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( deamon ) ) , GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( TQString ( "[l2tpd err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( deamon ) ) , GlobalConfig->debug ); abort = true; } else @@ -16978,9 +16978,9 @@ void KVpnc::processStderr_l2tpd() sleep ( 1 ); - L2tpdProcess = new QProcess ( this ); + L2tpdProcess = new TQProcess ( this ); // - if ( !GlobalConfig->pathToXl2tpd.isEmpty() && QFile ( GlobalConfig->pathToXl2tpd ).exists() ) + if ( !GlobalConfig->pathToXl2tpd.isEmpty() && TQFile ( GlobalConfig->pathToXl2tpd ).exists() ) { if ( GlobalConfig->KvpncDebugLevel > 1 ) GlobalConfig->appendLogEntry ( i18n ( "Using %1." ).arg ( "xl2tpd" ),GlobalConfig->debug ); @@ -17005,7 +17005,7 @@ void KVpnc::processStderr_l2tpd() if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "l2tpd" ), GlobalConfig->error ); KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( "l2tpd" ) ); - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); } else { @@ -17021,23 +17021,23 @@ void KVpnc::processStderr_l2tpd() else if ( ProcessMsg_connect.find ( "Connection established", 0 , FALSE ) > -1 ) { NormalMsg=true; - GlobalConfig->appendLogEntry ( QString ( "[l2tpd] " + i18n ( "Low level connection to %1 established." ).arg ( GlobalConfig->currentProfile->getGateway() ) ) , GlobalConfig->success ); + GlobalConfig->appendLogEntry ( TQString ( "[l2tpd] " + i18n ( "Low level connection to %1 established." ).arg ( GlobalConfig->currentProfile->getGateway() ) ) , GlobalConfig->success ); abort = false; } else if ( ProcessMsg_connect.find ( "Call established", 0 , FALSE ) > -1 ) { NormalMsg=true; - GlobalConfig->appendLogEntry ( QString ( "[l2tpd] " + i18n ( "Low level connection to %1 established." ).arg ( GlobalConfig->currentProfile->getGateway() ) ) , GlobalConfig->info ); + GlobalConfig->appendLogEntry ( TQString ( "[l2tpd] " + i18n ( "Low level connection to %1 established." ).arg ( GlobalConfig->currentProfile->getGateway() ) ) , GlobalConfig->info ); abort = false; - if ( !GlobalConfig->pathToXl2tpd.isEmpty() && QFile ( GlobalConfig->pathToXl2tpd ).exists() ) + if ( !GlobalConfig->pathToXl2tpd.isEmpty() && TQFile ( GlobalConfig->pathToXl2tpd ).exists() ) { - GlobalConfig->appendLogEntry ( QString ( "[l2tpd] " + i18n ( "Low level connection %1 established." ).arg ( GlobalConfig->currentProfile->getGateway() ) ) , GlobalConfig->info ); + GlobalConfig->appendLogEntry ( TQString ( "[l2tpd] " + i18n ( "Low level connection %1 established." ).arg ( GlobalConfig->currentProfile->getGateway() ) ) , GlobalConfig->info ); abort = false; } - disconnect ( &L2tpWaitForPppUpTimer, SIGNAL ( timeout() ), this, SLOT ( checkL2tpPppUp() ) ); - connect ( &L2tpWaitForPppUpTimer, SIGNAL ( timeout() ), this, SLOT ( checkL2tpPppUp() ) ); + disconnect ( &L2tpWaitForPppUpTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( checkL2tpPppUp() ) ); + connect ( &L2tpWaitForPppUpTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( checkL2tpPppUp() ) ); L2tpWaitForPppUpTimer.start ( 1000, FALSE ); } @@ -17059,7 +17059,7 @@ void KVpnc::processStderr_l2tpd() // cid is greather than 0 if ( ProcessMsg_connect.section ( ',', 1, 1 ).section ( '=', 1, 1 ).stripWhiteSpace() != "0" ) // check_control: control, cid = 17467, Ns = 2, Nr = 4 { - GlobalConfig->appendLogEntry ( QString ( "[l2tpd] " + i18n ( "L2TP tunnel to %1 established." ).arg ( GlobalConfig->currentProfile->getGateway() ) ) , GlobalConfig->success ); + GlobalConfig->appendLogEntry ( TQString ( "[l2tpd] " + i18n ( "L2TP tunnel to %1 established." ).arg ( GlobalConfig->currentProfile->getGateway() ) ) , GlobalConfig->success ); abort = false; connectSuccess = true; @@ -17067,11 +17067,11 @@ void KVpnc::processStderr_l2tpd() } else if ( ProcessMsg_connect.find ( "Connecting to host", 0 , FALSE ) > -1 ) { - GlobalConfig->appendLogEntry ( QString ( "[l2tpd] " + i18n ( "L2TP connection to %1 established." ).arg ( GlobalConfig->currentProfile->getGateway() ) ) , GlobalConfig->success ); + GlobalConfig->appendLogEntry ( TQString ( "[l2tpd] " + i18n ( "L2TP connection to %1 established." ).arg ( GlobalConfig->currentProfile->getGateway() ) ) , GlobalConfig->success ); abort = false; - if ( !GlobalConfig->pathToXl2tpd.isEmpty() && QFile ( GlobalConfig->pathToXl2tpd ).exists() ) + if ( !GlobalConfig->pathToXl2tpd.isEmpty() && TQFile ( GlobalConfig->pathToXl2tpd ).exists() ) { - GlobalConfig->appendLogEntry ( QString ( "[l2tpd] " + i18n ( "L2TP tunnel to %1 established." ).arg ( GlobalConfig->currentProfile->getGateway() ) ) , GlobalConfig->success ); + GlobalConfig->appendLogEntry ( TQString ( "[l2tpd] " + i18n ( "L2TP tunnel to %1 established." ).arg ( GlobalConfig->currentProfile->getGateway() ) ) , GlobalConfig->success ); abort = false; } @@ -17084,10 +17084,10 @@ void KVpnc::processStderr_l2tpd() GlobalConfig->status = GlobalConfig->connected; - disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) ); - connect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); + connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); durationTimer.start ( 1000, FALSE ); - setGuiStatus ( connected ); + setGuitqStatus ( connected ); setFirewallAfterConnect(); @@ -17123,19 +17123,19 @@ void KVpnc::processStderr_l2tpd() GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "l2tpd" ) , GlobalConfig->debug ); disconnectClicked(); GlobalConfig->status = GlobalConfig->disconnected; - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); if ( GlobalConfig->currentProfile->getAuthMethod() == "chap" || GlobalConfig->currentProfile->getAuthMethod() == "mschap" || GlobalConfig->currentProfile->getAuthMethod() == "mschap-v2" ) { // remove kvpnc entries from chap-secerets - QFile ChapSecretsFile ( "/etc/ppp/chap-secrets" ); + TQFile ChapSecretsFile ( "/etc/ppp/chap-secrets" ); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1" ).arg ( "/etc/ppp/chap-secrets" ), GlobalConfig->debug ); - QTextStream stream ( &ChapSecretsFile ); + TQTextStream stream ( &ChapSecretsFile ); if ( ChapSecretsFile.open ( IO_ReadOnly ) ) { - QString line = ""; - QString chapsecret_content = ""; + TQString line = ""; + TQString chapsecret_content = ""; bool kvpnc_start_marker_found = false; bool kvpnc_end_marker_found = false; while ( !stream.atEnd() ) @@ -17195,14 +17195,14 @@ void KVpnc::processStderr_l2tpd() if ( GlobalConfig->currentProfile->getAuthMethod() == "pap" ) { // remove kvpnc entries from pap-secerets - QFile papSecretsFile ( "/etc/ppp/pap-secrets" ); + TQFile papSecretsFile ( "/etc/ppp/pap-secrets" ); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1" ).arg ( "/etc/ppp/chap-secrets" ), GlobalConfig->debug ); - QTextStream stream ( &papSecretsFile ); + TQTextStream stream ( &papSecretsFile ); if ( papSecretsFile.open ( IO_ReadOnly ) ) { - QString line = ""; - QString papsecret_content = ""; + TQString line = ""; + TQString papsecret_content = ""; bool kvpnc_start_marker_found = false; bool kvpnc_end_marker_found = false; while ( !stream.atEnd() ) @@ -17340,10 +17340,10 @@ void KVpnc::readFromStdout_openl2tp() GlobalConfig->status = GlobalConfig->connected; - disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) ); - connect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); + connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); durationTimer.start ( 1000, FALSE ); - setGuiStatus ( connected ); + setGuitqStatus ( connected ); setFirewallAfterConnect(); @@ -17368,7 +17368,7 @@ void KVpnc::readFromStdout_openl2tp() GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "openl2tpd" ) , GlobalConfig->debug ); disconnectClicked(); GlobalConfig->status = GlobalConfig->disconnected; - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return ; } @@ -17405,7 +17405,7 @@ void KVpnc::readFromStderr_openl2tp() GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "l2tpd" ) , GlobalConfig->debug ); disconnectClicked(); GlobalConfig->status = GlobalConfig->disconnected; - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return ; } @@ -17437,7 +17437,7 @@ void KVpnc::readFromStdout_startstopOpenl2tp() GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "openl2tpd" ) , GlobalConfig->debug ); disconnectClicked(); GlobalConfig->status = GlobalConfig->disconnected; - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return ; } @@ -17460,7 +17460,7 @@ void KVpnc::readFromStderr_startstopOpenl2tp() GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "openl2tp" ) , GlobalConfig->debug ); disconnectClicked(); GlobalConfig->status = GlobalConfig->disconnected; - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return ; } @@ -17474,7 +17474,7 @@ void KVpnc::readFromStdout_vtun() bool NormalMsg = true; bool ErrorMsg = false; ProcessMsg_connect = VtundProcess->readLineStdout(); - // ProcessMsg_connect = QString( VtundProcess->readStdout() ); + // ProcessMsg_connect = TQString( VtundProcess->readStdout() ); //if ( !ProcessMsg_connect.isEmpty() ) @@ -17511,7 +17511,7 @@ void KVpnc::readFromStdout_vtun() //terminateConnection ( L2tpdProcess ); disconnectClicked(); GlobalConfig->status = GlobalConfig->disconnected; - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); } // success @@ -17522,10 +17522,10 @@ void KVpnc::readFromStdout_vtun() GlobalConfig->status = GlobalConfig->connected; - disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) ); - connect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); + connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); durationTimer.start ( 1000, FALSE ); - setGuiStatus ( connected ); + setGuitqStatus ( connected ); setFirewallAfterConnect(); @@ -17575,7 +17575,7 @@ void KVpnc::readFromStderr_vtun() bool NormalMsg = true; bool ErrorMsg = false; ProcessMsg_connect = VtundProcess->readLineStderr(); - // // ProcessMsg_connect = QString( L2tpdProcess->readStderr() ); + // // ProcessMsg_connect = TQString( L2tpdProcess->readStderr() ); // // if ( !ProcessMsg_connect.isEmpty() ) // bool abort = false; @@ -17613,7 +17613,7 @@ void KVpnc::readFromStderr_vtun() } // // if ( ProcessMsg_connect.find(" Exit ",0,FALSE) > -1 ) // // { -// // GlobalConfig->appendLogEntry(i18n("%1 has been exited.").arg("vtund"),GlobalConfig->error); +// // GlobalConfig->appendLogEntry(i18n("%1 has been exited.").tqarg("vtund"),GlobalConfig->error); // // abort=true; // // ErrorMsg=true; // // } @@ -17639,7 +17639,7 @@ void KVpnc::readFromStderr_vtun() if ( ProcessMsg_connect.find ( "allocate pseudo tty",0,FALSE ) > -1 ) { - KMessageBox::error ( this, i18n ( "Can't allocate pseudo tty.\nPlease check that your kernel has LEGACY PTY=y or recompile patched vtun. You can get the patch for UNIX98 PTS here: %1" ).arg ( QString ( "http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=451931" ) ) ); + KMessageBox::error ( this, i18n ( "Can't allocate pseudo tty.\nPlease check that your kernel has LEGACY PTY=y or recompile patched vtun. You can get the patch for UNIX98 PTS here: %1" ).arg ( TQString ( "http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=451931" ) ) ); GlobalConfig->appendLogEntry ( i18n ( "Can't allocate pseudo tty." ),GlobalConfig->error ); abort=true; ErrorMsg=true; @@ -17651,7 +17651,7 @@ void KVpnc::readFromStderr_vtun() // // cid is greather than 0 // if ( ProcessMsg_connect.section ( ',', 1, 1 ).section ( '=', 1, 1 ).stripWhiteSpace() != "0" ) // check_control: control, cid = 17467, Ns = 2, Nr = 4 // { -// GlobalConfig->appendLogEntry ( QString ( "[l2tpd] " + i18n ( "L2TP tunnel to %1 established." ).arg ( GlobalConfig->currentProfile->getGateway() ) ) , GlobalConfig->success ); +// GlobalConfig->appendLogEntry ( TQString ( "[l2tpd] " + i18n ( "L2TP tunnel to %1 established." ).arg ( GlobalConfig->currentProfile->getGateway() ) ) , GlobalConfig->success ); // // abort = false; // connectSuccess = true; @@ -17669,10 +17669,10 @@ void KVpnc::readFromStderr_vtun() GlobalConfig->status = GlobalConfig->connected; - disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) ); - connect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); + connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); durationTimer.start ( 1000, FALSE ); - setGuiStatus ( connected ); + setGuitqStatus ( connected ); connectSuccess = false; setFirewallAfterConnect(); @@ -17712,7 +17712,7 @@ void KVpnc::readFromStderr_vtun() GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "vtund" ) , GlobalConfig->debug ); disconnectClicked(); GlobalConfig->status = GlobalConfig->disconnected; - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return ; } GlobalConfig->appPointer->processEvents(); @@ -17724,13 +17724,13 @@ void KVpnc::readFromStdout_ssh ( KProcess *, char *buffer, int buflen ) // while ( SshProcess->canReadLineStdout() ) // { // ProcessMsg_connect = SshProcess->readLineStdout(); - // QString ProcessMsg_connect = QString( SshProcess->readStdout() ); + // TQString ProcessMsg_connect = TQString( SshProcess->readStdout() ); -// QString ProcessMsg_connect = QString::fromLatin1(buffer, buflen); - QString ProcessMsg_connect_raw = QString::fromLatin1 ( buffer, buflen ); - QStringList ProcessMsg_connect_raw_list = QStringList::split ( "debug1:",ProcessMsg_connect_raw ); +// TQString ProcessMsg_connect = TQString::tqfromLatin1(buffer, buflen); + TQString ProcessMsg_connect_raw = TQString::tqfromLatin1 ( buffer, buflen ); + TQStringList ProcessMsg_connect_raw_list = TQStringList::split ( "debug1:",ProcessMsg_connect_raw ); - for ( QStringList::Iterator it = ProcessMsg_connect_raw_list.begin(); it != ProcessMsg_connect_raw_list.end(); ++it ) + for ( TQStringList::Iterator it = ProcessMsg_connect_raw_list.begin(); it != ProcessMsg_connect_raw_list.end(); ++it ) { ProcessMsg_connect = *it; @@ -17786,7 +17786,7 @@ void KVpnc::readFromStdout_ssh ( KProcess *, char *buffer, int buflen ) KMessageBox::error(this, i18n("Permission denied.")); connectCounter = 0; GlobalConfig->appendLogEntry(i18n("Permission denied") , GlobalConfig->error); - // disconnect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) ); + // disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); abort = true; KMessageBox::error(this, i18n("Authentication has failed.")); GlobalConfig->appendLogEntry(i18n("Authentication has failed.") , GlobalConfig->error); //abort = true; @@ -17827,7 +17827,7 @@ void KVpnc::readFromStdout_ssh ( KProcess *, char *buffer, int buflen ) GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "ssh" ) , GlobalConfig->debug ); disconnectClicked(); GlobalConfig->status = GlobalConfig->disconnected; - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return ; } @@ -17838,15 +17838,15 @@ void KVpnc::readFromStdout_ssh ( KProcess *, char *buffer, int buflen ) GlobalConfig->status = GlobalConfig->connected; - disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) ); - connect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); + connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); durationTimer.start ( 1000, FALSE ); - setGuiStatus ( connected ); + setGuitqStatus ( connected ); connectSuccess = false; GlobalConfig->appendLogEntry ( i18n ( "Connection established." ), GlobalConfig->success ); - // GlobalConfig->appendLogEntry( QString("connectstring: "+ProcessMsg_connect), GlobalConfig->debug ); + // GlobalConfig->appendLogEntry( TQString("connectstring: "+ProcessMsg_connect), GlobalConfig->debug ); SshDevice = ""; if ( !PppdDevice.isEmpty() ) @@ -17860,8 +17860,8 @@ void KVpnc::readFromStdout_ssh ( KProcess *, char *buffer, int buflen ) } // write ssh..up - QFile sshupfile ( tmpPath + "ssh." + GlobalConfig->currentProfile->getName() + ".up" ); - QTextStream sshupstream ( &sshupfile ); + TQFile sshupfile ( tmpPath + "ssh." + GlobalConfig->currentProfile->getName() + ".up" ); + TQTextStream sshupstream ( &sshupfile ); if ( sshupfile.open ( IO_WriteOnly ) ) { sshupstream << "#!"<< GlobalConfig->InterpreterShell << "\n"; @@ -17894,7 +17894,7 @@ void KVpnc::readFromStdout_ssh ( KProcess *, char *buffer, int buflen ) if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( "[ssh] " + i18n ( "Tunnel IP: %1" ).arg ( TunnelInterfaceIP ) , GlobalConfig->debug ); - QString resolvtemp=""; + TQString resolvtemp=""; bool no_nameserver=true; /* update dns? */ if ( GlobalConfig->currentProfile->getUseDnsUpdate() ) @@ -18020,7 +18020,7 @@ void KVpnc::readFromStdout_ssh ( KProcess *, char *buffer, int buflen ) } - QProcess *SshUpProcess = new QProcess ( this ); + TQProcess *SshUpProcess = new TQProcess ( this ); SshUpProcess->addArgument ( GlobalConfig->InterpreterShell ); SshUpProcess->addArgument ( tmpPath + "ssh." + GlobalConfig->currentProfile->getName() + ".up" ); @@ -18034,7 +18034,7 @@ void KVpnc::readFromStdout_ssh ( KProcess *, char *buffer, int buflen ) GlobalConfig->appendLogEntry ( i18n ( "\"%1\" (%2) started." ).arg ( "SshUpScript" ).arg ( tmpPath + "ssh." + GlobalConfig->currentProfile->getName() + ".up" ) , GlobalConfig->debug ); while ( SshUpProcess->isRunning() ) { - parent->QApplication::processEvents(); + parent->TQApplication::processEvents(); sleep ( 1 ); } @@ -18051,23 +18051,23 @@ void KVpnc::readFromStdout_ssh ( KProcess *, char *buffer, int buflen ) if ( GlobalConfig->currentProfile->getReplaceDefaultRoute() ) { tmpPath = locateLocal ( "data", "kvpnc/" ); - QString SshReplaceDefaultRouteScript = tmpPath + "ssh_replace_defaultroute." + GlobalConfig->currentProfile->getName() + ".sh"; + TQString SshReplaceDefaultRouteScript = tmpPath + "ssh_replace_defaultroute." + GlobalConfig->currentProfile->getName() + ".sh"; - QFile file ( SshReplaceDefaultRouteScript ); - QTextStream stream ( &file ); + TQFile file ( SshReplaceDefaultRouteScript ); + TQTextStream stream ( &file ); if ( file.open ( IO_WriteOnly ) ) { stream << "# generated by kvpnc. Do not edit it." << "\n"; stream << "\n"; file.close(); - ReplaceDefaultRouteProcess = new QProcess ( this ); + ReplaceDefaultRouteProcess = new TQProcess ( this ); ReplaceDefaultRouteProcess->addArgument ( GlobalConfig->InterpreterShell ); ReplaceDefaultRouteProcess->addArgument ( SshReplaceDefaultRouteScript ); if ( !ReplaceDefaultRouteProcess->start ( env ) ) { KMessageBox::sorry ( this, i18n ( "\"%1\" %2 start failed!" ).arg ( i18n ( "ssh replace route process" ) ).arg ( tmpPath + "pppd_replace_defaultroute." + GlobalConfig->currentProfile->getName() + ".sh" ) ); // disconnectClicked(); - // setGuiStatus(disconnected); + // setGuitqStatus(disconnected); } else { @@ -18091,7 +18091,7 @@ void KVpnc::readFromStdout_ssh ( KProcess *, char *buffer, int buflen ) } - // PptpRouteProcess = new QProcess( this ); + // PptpRouteProcess = new TQProcess( this ); // PptpRouteProcess->addArgument( GlobalConfig->pathToRoute ); // PptpRouteProcess->addArgument( "add" ); // PptpRouteProcess->addArgument( "-net" ); @@ -18100,13 +18100,13 @@ void KVpnc::readFromStdout_ssh ( KProcess *, char *buffer, int buflen ) // if ( !PptpRouteProcess->start(env) ) // { - // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( i18n( "pppd route process" ) ) ); + // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( i18n( "pppd route process" ) ) ); // disconnectClicked(); - // setGuiStatus(disconnected); + // setGuitqStatus(disconnected); // } // else { - // GlobalConfig->appendLogEntry ( i18n( "\"%1\" started." ).arg( i18n( "pppd route process" ) ), GlobalConfig->info ); + // GlobalConfig->appendLogEntry ( i18n( "\"%1\" started." ).tqarg( i18n( "pppd route process" ) ), GlobalConfig->info ); // while (PptpRouteProcess->isRunning()) // { @@ -18138,13 +18138,13 @@ void KVpnc::readFromStderr_ssh ( KProcess *, char *buffer, int buflen ) // while ( SshProcess->canReadLineStderr() ) // { // ProcessMsg_connect = SshProcess->readLineStderr(); - // QString ProcessMsg_connect = QString( SshProcess->readStderr() ); -// QString ProcessMsg_connect = QString::fromLatin1(buffer, buflen); + // TQString ProcessMsg_connect = TQString( SshProcess->readStderr() ); +// TQString ProcessMsg_connect = TQString::tqfromLatin1(buffer, buflen); - QString ProcessMsg_connect_raw = QString::fromLatin1 ( buffer, buflen ); - QStringList ProcessMsg_connect_raw_list = QStringList::split ( "debug1:",ProcessMsg_connect_raw ); + TQString ProcessMsg_connect_raw = TQString::tqfromLatin1 ( buffer, buflen ); + TQStringList ProcessMsg_connect_raw_list = TQStringList::split ( "debug1:",ProcessMsg_connect_raw ); - for ( QStringList::Iterator it = ProcessMsg_connect_raw_list.begin(); it != ProcessMsg_connect_raw_list.end(); ++it ) + for ( TQStringList::Iterator it = ProcessMsg_connect_raw_list.begin(); it != ProcessMsg_connect_raw_list.end(); ++it ) { ProcessMsg_connect = *it; @@ -18223,7 +18223,7 @@ void KVpnc::readFromStderr_ssh ( KProcess *, char *buffer, int buflen ) GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "ssh" ) , GlobalConfig->debug ); disconnectClicked(); GlobalConfig->status = GlobalConfig->disconnected; - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return ; } } @@ -18233,19 +18233,19 @@ void KVpnc::readFromStdout_ping() { //while ( PingProcess->canReadLineStdout() ) { //ProcessMsg_connect = PingProcess->readLineStdout(); - ProcessMsg_connect = QString ( PingProcess->readStdout() ); + ProcessMsg_connect = TQString ( PingProcess->readStdout() ); //mw->DebugOutput->append( "raw out (pingtest): " + ProcessMsg_connect ); if ( ProcessMsg_connect.find ( "time=", 0, FALSE ) > -1 ) { GlobalConfig->appendLogEntry ( "[ping] " + ProcessMsg_connect, GlobalConfig->success ); - KNotifyClient::event ( topLevelWidget() ->winId(), "ping success", i18n ( "Ping was successful." ) ); + KNotifyClient::event ( tqtopLevelWidget() ->winId(), "ping success", i18n ( "Ping was successful." ) ); } else if ( ProcessMsg_connect.find ( "100 % packet loss", 0, FALSE ) > -1 ) { GlobalConfig->appendLogEntry ( "[ping err] " + ProcessMsg_connect, GlobalConfig->error ); - KNotifyClient::event ( topLevelWidget() ->winId(), "ping failed", i18n ( "Ping has failed." ) ); + KNotifyClient::event ( tqtopLevelWidget() ->winId(), "ping failed", i18n ( "Ping has failed." ) ); } else { @@ -18270,7 +18270,7 @@ void KVpnc::readFromStderr_ping() { // while ( PingProcess->canReadLineStderr() ) { // ProcessMsg_connect = PingProcess->readLineStderr(); - ProcessMsg_connect = QString ( PingProcess->readStderr() ); + ProcessMsg_connect = TQString ( PingProcess->readStderr() ); //mw->DebugOutput->append( "raw err (pingtest): " + ProcessMsg_connect ); if ( ProcessMsg_connect.find ( "time=", 0, FALSE ) > -1 ) @@ -18301,7 +18301,7 @@ void KVpnc::readFromStdout_route() { //while ( RouteProcess->canReadLineStdout() ) { //ProcessMsg_connect = RouteProcess->readLineStdout(); - ProcessMsg_connect = QString ( RouteProcess->readStdout() ); + ProcessMsg_connect = TQString ( RouteProcess->readStdout() ); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( "[route] " + ProcessMsg_connect, GlobalConfig->debug ); @@ -18313,7 +18313,7 @@ void KVpnc::readFromStderr_route() { // while ( RouteProcess->canReadLineStderr() ) { // ProcessMsg_connect = RouteProcess->readLineStderr(); - ProcessMsg_connect = QString ( RouteProcess->readStderr() ); + ProcessMsg_connect = TQString ( RouteProcess->readStderr() ); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( "[route err] " + ProcessMsg_connect, GlobalConfig->error ); @@ -18325,7 +18325,7 @@ void KVpnc::readFromStdout_disconnect() while ( DisconnectProcess->canReadLineStdout() ) { ProcessMsg_connect = DisconnectProcess->readLineStdout(); - //ProcessMsg_connect = QString( DisconnectProcess->readStdout() ); + //ProcessMsg_connect = TQString( DisconnectProcess->readStdout() ); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( "[disconnect] " + ProcessMsg_connect, GlobalConfig->debug ); @@ -18338,7 +18338,7 @@ void KVpnc::readFromStderr_disconnect() while ( DisconnectProcess->canReadLineStderr() ) { ProcessMsg_connect = DisconnectProcess->readLineStderr(); - //ProcessMsg_connect = QString( DisconnectProcess->readStderr() ); + //ProcessMsg_connect = TQString( DisconnectProcess->readStderr() ); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( "[disconnect err] " + ProcessMsg_connect, GlobalConfig->error ); @@ -18347,21 +18347,21 @@ void KVpnc::readFromStderr_disconnect() void KVpnc::readFromStdout_setVirtualIP() { - QString msg = QString ( SetVirtualIPProcess->readStdout() ); + TQString msg = TQString ( SetVirtualIPProcess->readStdout() ); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( msg, GlobalConfig->debug ); } void KVpnc::readFromStderr_setVirtualIP() { - QString msg = QString ( SetVirtualIPProcess->readStderr() ); + TQString msg = TQString ( SetVirtualIPProcess->readStderr() ); GlobalConfig->appendLogEntry ( msg, GlobalConfig->error ); setVirtualIPSuccess = false; } void KVpnc::readFromStdout_connectionStatusCheck() { - QString msg = QString ( ConnectionStatusCheckProcess->readStdout() ); + TQString msg = TQString ( ConnectionStatusCheckProcess->readStdout() ); if ( msg.find ( "PING ok.", 0 , FALSE ) > -1 ) { @@ -18386,16 +18386,16 @@ void KVpnc::readFromStdout_connectionStatusCheck() if ( GlobalConfig->currentProfile->getDoPingIP() ) { GlobalConfig->appendLogEntry ( i18n ( "Ping to %1 within %2 checks every %3s has been failed!" ).arg ( GlobalConfig->currentProfile->getPingHostIP() ).arg ( GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount() ).arg ( GlobalConfig->currentProfile->getConnectionStatusInterval() ), GlobalConfig->error ); - KNotifyClient::event ( topLevelWidget() ->winId(), "connection lost", i18n ( "Ping to %1 within %2 checks every %3s has been failed!" ).arg ( GlobalConfig->currentProfile->getPingHostIP() ).arg ( GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount() ).arg ( GlobalConfig->currentProfile->getConnectionStatusInterval() ) ); + KNotifyClient::event ( tqtopLevelWidget() ->winId(), "connection lost", i18n ( "Ping to %1 within %2 checks every %3s has been failed!" ).arg ( GlobalConfig->currentProfile->getPingHostIP() ).arg ( GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount() ).arg ( GlobalConfig->currentProfile->getConnectionStatusInterval() ) ); } else { GlobalConfig->appendLogEntry ( i18n ( "Ping to %1 within %2 checks every %3s has been failed!" ).arg ( GlobalConfig->currentProfile->getGateway() ).arg ( GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount() ).arg ( GlobalConfig->currentProfile->getConnectionStatusInterval() ), GlobalConfig->error ); - KNotifyClient::event ( topLevelWidget() ->winId(), "connection lost", i18n ( "Ping to %1 within %2 checks every %3s has been failed!" ).arg ( GlobalConfig->currentProfile->getGateway() ).arg ( GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount() ).arg ( GlobalConfig->currentProfile->getConnectionStatusInterval() ) ); + KNotifyClient::event ( tqtopLevelWidget() ->winId(), "connection lost", i18n ( "Ping to %1 within %2 checks every %3s has been failed!" ).arg ( GlobalConfig->currentProfile->getGateway() ).arg ( GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount() ).arg ( GlobalConfig->currentProfile->getConnectionStatusInterval() ) ); } } - disconnect ( ConnectionStatusCheckProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_connectionStatusCheck() ) ); - disconnect ( ConnectionStatusCheckProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_connectionStatusCheck() ) ); + disconnect ( ConnectionStatusCheckProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_connectionStatusCheck() ) ); + disconnect ( ConnectionStatusCheckProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_connectionStatusCheck() ) ); ConnectionStatusCheckProcess->kill(); // kill connection disconnectClicked(); @@ -18420,21 +18420,21 @@ void KVpnc::readFromStdout_connectionStatusCheck() void KVpnc::readFromStderr_connectionStatusCheck() { - QString msg = QString ( ConnectionStatusCheckProcess->readStderr() ); + TQString msg = TQString ( ConnectionStatusCheckProcess->readStderr() ); // if ( msg.find( "PING ok.", 0 , FALSE ) > -1 ) // { // /* Connection alive */ // if (GlobalConfig->KvpncDebugLevel > 0) - // GlobalConfig->appendLogEntry ( i18n("Ping to %1 within %2 checks every %3s was ok.").arg(GlobalConfig->currentProfile->getGateway()).arg(GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount()).arg(GlobalConfig->currentProfile->getConnectionStatusInterval()), GlobalConfig->debug ); + // GlobalConfig->appendLogEntry ( i18n("Ping to %1 within %2 checks every %3s was ok.").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount()).tqarg(GlobalConfig->currentProfile->getConnectionStatusInterval()), GlobalConfig->debug ); // // } // if ( msg.find( "PING failed!", 0 , FALSE ) > -1 ) // { // /* Connection dead?! */ // if (GlobalConfig->KvpncDebugLevel > 0) - // GlobalConfig->appendLogEntry ( i18n("Ping to %1 within %2 checks every %3s was ok.").arg(GlobalConfig->currentProfile->getGateway()).arg(GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount()).arg( GlobalConfig->currentProfile->getConnectionStatusInterval() ), GlobalConfig->error ); - // KNotifyClient::event( topLevelWidget()->winId(), "connection lost",i18n("Ping to %1 within %2 checks every %3s was ok.").arg(GlobalConfig->currentProfile->getGateway()).arg(GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount()).arg(GlobalConfig->currentProfile->getConnectionStatusInterval()) ); + // GlobalConfig->appendLogEntry ( i18n("Ping to %1 within %2 checks every %3s was ok.").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount()).tqarg( GlobalConfig->currentProfile->getConnectionStatusInterval() ), GlobalConfig->error ); + // KNotifyClient::event( tqtopLevelWidget()->winId(), "connection lost",i18n("Ping to %1 within %2 checks every %3s was ok.").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount()).tqarg(GlobalConfig->currentProfile->getConnectionStatusInterval()) ); // // kill connection // disconnectClicked(); // } @@ -18445,7 +18445,7 @@ void KVpnc::readFromStdout_executeCommandBeforeConnect() while ( CmdBeforeConnectProcess->canReadLineStdout() ) { ProcessMsg_connect = CmdBeforeConnectProcess->readLineStdout(); - //ProcessMsg_connect = QString( CmdBeforeConnectProcess->readStdout() ); + //ProcessMsg_connect = TQString( CmdBeforeConnectProcess->readStdout() ); if ( GlobalConfig->KvpncDebugLevel > 1 ) GlobalConfig->appendLogEntry ( "[CmdBeforeConnect] " + ProcessMsg_connect, GlobalConfig->debug ); @@ -18457,7 +18457,7 @@ void KVpnc::readFromStderr_executeCommandBeforeConnect() while ( CmdBeforeConnectProcess->canReadLineStderr() ) { ProcessMsg_connect = CmdBeforeConnectProcess->readLineStderr(); - //ProcessMsg_connect = QString( CmdBeforeConnectProcess->readStderr() ); + //ProcessMsg_connect = TQString( CmdBeforeConnectProcess->readStderr() ); GlobalConfig->appendLogEntry ( "[CmdBeforeConnect err] " + ProcessMsg_connect, GlobalConfig->error ); } @@ -18468,7 +18468,7 @@ void KVpnc::readFromStdout_executeCommandAfterConnect() while ( CmdAfterConnectProcess->canReadLineStdout() ) { ProcessMsg_connect = CmdAfterConnectProcess->readLineStdout(); - //ProcessMsg_connect = QString( CmdAfterConnectProcess->readStdout() ); + //ProcessMsg_connect = TQString( CmdAfterConnectProcess->readStdout() ); if ( GlobalConfig->KvpncDebugLevel > 1 ) GlobalConfig->appendLogEntry ( "[CmdAfterConnect] " + ProcessMsg_connect, GlobalConfig->debug ); @@ -18480,7 +18480,7 @@ void KVpnc::readFromStderr_executeCommandAfterConnect() while ( CmdAfterConnectProcess->canReadLineStderr() ) { ProcessMsg_connect = CmdAfterConnectProcess->readLineStderr(); - //ProcessMsg_connect = QString( CmdAfterConnectProcess->readStderr() ); + //ProcessMsg_connect = TQString( CmdAfterConnectProcess->readStderr() ); GlobalConfig->appendLogEntry ( "[CmdAfterConnect err] " + ProcessMsg_connect, GlobalConfig->error ); } @@ -18491,7 +18491,7 @@ void KVpnc::readFromStdout_executeCommandBeforeDisconnect() while ( CmdBeforeDisconnectProcess->canReadLineStdout() ) { ProcessMsg_connect = CmdBeforeDisconnectProcess->readLineStdout(); - //ProcessMsg_connect = QString( CmdBeforeDisconnectProcess->readStdout() ); + //ProcessMsg_connect = TQString( CmdBeforeDisconnectProcess->readStdout() ); if ( GlobalConfig->KvpncDebugLevel > 1 ) GlobalConfig->appendLogEntry ( "[CmdBeforeDisconnect] " + ProcessMsg_connect, GlobalConfig->debug ); @@ -18503,7 +18503,7 @@ void KVpnc::readFromStderr_executeCommandBeforeDisconnect() while ( CmdBeforeDisconnectProcess->canReadLineStderr() ) { ProcessMsg_connect = CmdBeforeDisconnectProcess->readLineStderr(); - //ProcessMsg_connect = QString( CmdBeforeDisconnectProcess->readStderr() ); + //ProcessMsg_connect = TQString( CmdBeforeDisconnectProcess->readStderr() ); GlobalConfig->appendLogEntry ( "[CmdBeforeDisconnect err] " + ProcessMsg_connect, GlobalConfig->error ); } @@ -18514,7 +18514,7 @@ void KVpnc::readFromStdout_executeCommandAfterDisconnect() while ( CmdAfterDisconnectProcess->canReadLineStdout() ) { ProcessMsg_connect = CmdAfterDisconnectProcess->readLineStdout(); - //ProcessMsg_connect = QString( CmdAfterDisconnectProcess->readStdout() ); + //ProcessMsg_connect = TQString( CmdAfterDisconnectProcess->readStdout() ); if ( GlobalConfig->KvpncDebugLevel > 1 ) GlobalConfig->appendLogEntry ( "[CmdAfterDisconnect] " + ProcessMsg_connect, GlobalConfig->debug ); @@ -18526,7 +18526,7 @@ void KVpnc::readFromStderr_executeCommandAfterDisconnect() while ( CmdAfterDisconnectProcess->canReadLineStderr() ) { ProcessMsg_connect = CmdAfterDisconnectProcess->readLineStderr(); - //ProcessMsg_connect = QString( CmdAfterDisconnectProcess->readStderr() ); + //ProcessMsg_connect = TQString( CmdAfterDisconnectProcess->readStderr() ); GlobalConfig->appendLogEntry ( "[CmdAfterDisconnect err] " + ProcessMsg_connect, GlobalConfig->error ); } @@ -18534,10 +18534,10 @@ void KVpnc::readFromStderr_executeCommandAfterDisconnect() void KVpnc::readCiscoVpncTestProcessOutput() { - QString msg = ""; + TQString msg = ""; while ( TestCiscoVpncProcess->canReadLineStdout() ) { - msg = QString ( TestCiscoVpncProcess->readLineStdout() ); + msg = TQString ( TestCiscoVpncProcess->readLineStdout() ); if ( GlobalConfig->KvpncDebugLevel > 3 ) GlobalConfig->appendLogEntry ( i18n ( "msg: %1" ).arg ( msg ), GlobalConfig->debug ); @@ -18561,7 +18561,7 @@ void KVpnc::readCiscoVpncTestProcessOutput() } } -void KVpnc::terminateConnection ( QProcess *proc ) +void KVpnc::terminateConnection ( TQProcess *proc ) { if ( proc->isRunning() ) { @@ -18569,14 +18569,14 @@ void KVpnc::terminateConnection ( QProcess *proc ) // proc->tryTerminate(); // proc->tryTerminate(); - // QTimer::singleShot( 5000, proc, SLOT( kill() ) ); + // TQTimer::singleShot( 5000, proc, TQT_SLOT( kill() ) ); } timer.stop(); durationTimer.stop(); GlobalConfig->status = GlobalConfig->disconnected; connectCounter = 0; - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); } @@ -18602,13 +18602,13 @@ void KVpnc::connectionEnded() else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ciscoorig ) { - QFile file ( QString ( "/etc/opt/cisco-vpnclient/Profiles/" ) +QString ( "kvpnc_" ) +QString ( GlobalConfig->currentProfile->getName() +".pcf" ) ); + TQFile file ( TQString ( "/etc/opt/cisco-vpnclient/Profiles/" ) +TQString ( "kvpnc_" ) +TQString ( GlobalConfig->currentProfile->getName() +".pcf" ) ); file.remove(); } else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::racoon ) { - QFile file ( tmpPath + "setkey." + GlobalConfig->currentProfile->getName() + ".conf" ); + TQFile file ( tmpPath + "setkey." + GlobalConfig->currentProfile->getName() + ".conf" ); file.remove(); file.setName ( tmpPath + "/setkey." + GlobalConfig->currentProfile->getName() + ".sh" ); file.remove(); @@ -18632,7 +18632,7 @@ void KVpnc::connectionEnded() else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan ) { - QFile file ( tmpPath + "iptables." + GlobalConfig->currentProfile->getName() + ".add_ipsec_freeswan.sh" ); + TQFile file ( tmpPath + "iptables." + GlobalConfig->currentProfile->getName() + ".add_ipsec_freeswan.sh" ); file.remove(); file.setName ( tmpPath + "iptables." + GlobalConfig->currentProfile->getName() + ".remove_ipsec_freeswan.sh" ); file.remove(); @@ -18653,8 +18653,8 @@ void KVpnc::connectionEnded() if ( prevConnectionState != 1 ) // connected { - QString durationString ( i18n ( "%1:%2:%3" ).arg ( QString().sprintf ( "%02u", hour ) ).arg ( QString().sprintf ( "%02u", min ) , QString().sprintf ( "%02u", sec ) ) ); - GlobalConfig->appendLogEntry ( i18n ( "Connection duration was %1 hours, %2 minutes, %3 seconds" ).arg ( QString().sprintf ( "%02u", hour ), QString().sprintf ( "%02u", min ) , QString().sprintf ( "%02u", sec ) ), GlobalConfig->info ); + TQString durationString ( i18n ( "%1:%2:%3" ).arg ( TQString().sprintf ( "%02u", hour ) ).arg ( TQString().sprintf ( "%02u", min ) , TQString().sprintf ( "%02u", sec ) ) ); + GlobalConfig->appendLogEntry ( i18n ( "Connection duration was %1 hours, %2 minutes, %3 seconds" ).arg ( TQString().sprintf ( "%02u", hour ), TQString().sprintf ( "%02u", min ) , TQString().sprintf ( "%02u", sec ) ), GlobalConfig->info ); } connectCounter = 0; GlobalConfig->TmpPassword = ""; @@ -18685,16 +18685,16 @@ void KVpnc::slotConnectTimedOut() this->ConnectAction->setEnabled ( true ); this->DisconnectAction->setEnabled ( false ); //parent->statusBar() ->insertItem( i18n( "Connected" ), 2, 0, true ); - KVpncDock->setStatus ( disconnected ); + KVpncDock->settqStatus ( disconnected ); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "Connection failed (timeout)." ), GlobalConfig->debug ); disconnectClicked(); slotStatusMsg ( i18n ( "Timeout while connecting to %1. %2 connect process will be killed.!" ).arg ( GlobalConfig->currentProfile->getGateway() ).arg ( "vpnc" ), ID_FLASH_MSG ); slotStatusMsg ( i18n ( "Disconnected" ), ID_CONNECTION_MSG ); - QToolTip::remove( KVpncDock ); - QToolTip::add( KVpncDock, i18n ( "Disconnected" ) ); + TQToolTip::remove( KVpncDock ); + TQToolTip::add( KVpncDock, i18n ( "Disconnected" ) ); connectCounter = 0; - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); KMessageBox::error ( this, i18n ( "Timeout while connecting to %1 (%2) after %3s. Please check if the VPN server is reachable and the settings (UDP/TCP, local port, UDP encapsulation port) are correct. Maybe the timeout must be increased too." ).arg ( GlobalConfig->currentProfile->getGateway() ).arg ( GlobalConfig->currentProfile->getName() ).arg ( GlobalConfig->tryConnectTimeout ) ); } else if ( GlobalConfig->currentProfile->getDoReconnectAfterConnectionLost() ) @@ -18723,19 +18723,19 @@ void KVpnc::newSessionClicked() VpnAccountData * it; bool nameOk = false; bool ok; - QString newName=newdlg.getName(); - QString Oldname = newdlg.getName(); + TQString newName=newdlg.getName(); + TQString Oldname = newdlg.getName(); while ( nameOk == false ) { for ( it = GlobalConfig->AccountList->first(); it; it = GlobalConfig->AccountList->next() ) { if ( ( it != GlobalConfig->currentProfile ) && ( it->getName() == newName ) ) { - //account->setName( QString( account->getName() + "_2" ) ); - // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).arg( account->getName() ), i18n( "Name exist, renamed" ) ); + //account->setName( TQString( account->getName() + "_2" ) ); + // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).tqarg( account->getName() ), i18n( "Name exist, renamed" ) ); KMessageBox::error ( this, i18n ( "Profile name exists!" ), i18n ( "Name Exists" ) ); - newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), QString ( Oldname + "_2" ), &ok ); + newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), TQString ( Oldname + "_2" ), &ok ); if ( ok == false ) { KMessageBox::information ( 0, i18n ( "Rename at new created profile was canceled." ) ); @@ -18806,7 +18806,7 @@ void KVpnc::newSessionClicked() void KVpnc::saveSessionClicked() { - GlobalConfig->appPointer->setOverrideCursor ( QCursor ( Qt::WaitCursor ) ); + GlobalConfig->appPointer->setOverrideCursor ( TQCursor ( TQt::WaitCursor ) ); GlobalConfig->appendLogEntry ( i18n ( "Saving profiles and global options..." ),GlobalConfig->info ); this->slotStatusMsg ( i18n ( "Saving profiles and global options..." ), ID_STATUS_MSG ); if ( !GlobalConfig->AccountList->isEmpty() ) @@ -18827,11 +18827,11 @@ void KVpnc::deleteSessionClicked() if ( GlobalConfig->currentProfile == 0 ) return ; - QString Name = GlobalConfig->currentProfile->getName(); + TQString Name = GlobalConfig->currentProfile->getName(); ToolInfo *IpsecToolInfo = Utils ( GlobalConfig ).getToolInfo ( "ipsec" ) ; - QString TypeString = i18n ( "unknown" ); + TQString TypeString = i18n ( "unknown" ); if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::cisco ) TypeString = i18n ( "Cisco" ); else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ciscoorig ) @@ -18919,20 +18919,20 @@ void KVpnc::renameSessionClicked () VpnAccountData * it; bool nameOk = false; bool ok = true; - QString newName=""; - QString Oldname = GlobalConfig->currentProfile->getName(); - newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), QString ( GlobalConfig->currentProfile->getName() ), &ok ); + TQString newName=""; + TQString Oldname = GlobalConfig->currentProfile->getName(); + newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), TQString ( GlobalConfig->currentProfile->getName() ), &ok ); while ( nameOk == false ) { for ( it = GlobalConfig->AccountList->first(); it; it = GlobalConfig->AccountList->next() ) { if ( ( it != GlobalConfig->currentProfile ) && ( it->getName() == GlobalConfig->currentProfile->getName() ) ) { - //account->setName( QString( account->getName() + "_2" ) ); - // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).arg( account->getName() ), i18n( "Name exist, renamed" ) ); + //account->setName( TQString( account->getName() + "_2" ) ); + // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).tqarg( account->getName() ), i18n( "Name exist, renamed" ) ); KMessageBox::error ( this, i18n ( "Profile name exists!" ), i18n ( "Name Exists" ) ); - newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), QString ( GlobalConfig->currentProfile->getName() + "_2" ), &ok ); + newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), TQString ( GlobalConfig->currentProfile->getName() + "_2" ), &ok ); if ( ok == false ) { KMessageBox::information ( 0, i18n ( "Rename was canceled." ) ); @@ -18994,7 +18994,7 @@ void KVpnc::renameSessionClicked () } } -void KVpnc::sessionToggled ( const QString& Name ) +void KVpnc::sessionToggled ( const TQString& Name ) { // mw->DebugOutput->append( "sessionToggled" ); if ( Name.isEmpty() || GlobalConfig->AccountList->isEmpty() ) @@ -19013,36 +19013,36 @@ void KVpnc::sessionToggled ( const QString& Name ) GlobalConfig->currentProfile = GlobalConfig->AccountList->first(); for ( it = GlobalConfig->AccountList->first(); it; it = GlobalConfig->AccountList->next() ) { - QString Name = mw->SessionCombo->currentText(); + TQString Name = mw->SessionCombo->currentText(); if ( !Name.isEmpty() ) { if ( it->getName() == Name ) { // profile found GlobalConfig->currentProfile = it; - QString ProfileInfo = ""; - QString TypeString = ""; - QString Gateway = it->getGateway(); - QString Username = it->getUserName(); + TQString ProfileInfo = ""; + TQString TypeString = ""; + TQString Gateway = it->getGateway(); + TQString Username = it->getUserName(); //if ( GlobalConfig->KvpncDebugLevel > 2 ) - // GlobalConfig->appendLogEntry (i18n("Username: \"%1").arg(Username), KVpncConfig::debug); + // GlobalConfig->appendLogEntry (i18n("Username: \"%1").tqarg(Username), KVpncConfig::debug); if (it->getDontSaveUsername() || (Username == "")) Username = i18n("<ask at connect>"); - QString IpsecId = ""; - QString RemotePort=0; - QString IkeOptions = ""; - QString EspOptions = ""; - QString TunnelDeviceType=it->getTunnelDeviceType(); + TQString IpsecId = ""; + TQString RemotePort=0; + TQString IkeOptions = ""; + TQString EspOptions = ""; + TQString TunnelDeviceType=it->getTunnelDeviceType(); this->ExportOpenvpnProfileAction->setEnabled ( FALSE ); - QString type = ""; // visible name - QString bin = ""; // executable name + TQString type = ""; // visible name + TQString bin = ""; // executable name ProfileInfo += ""; if ( GlobalConfig->KvpncDebugLevel > 2 ) - GlobalConfig->appendLogEntry ( i18n ( "connectionType raw: %1" ).arg ( QString().setNum ( GlobalConfig->currentProfile->getConnectionType() ) ), KVpncConfig::debug ); + GlobalConfig->appendLogEntry ( i18n ( "connectionType raw: %1" ).arg ( TQString().setNum ( GlobalConfig->currentProfile->getConnectionType() ) ), KVpncConfig::debug ); if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::cisco ) { @@ -19100,7 +19100,7 @@ void KVpnc::sessionToggled ( const QString& Name ) TypeString = i18n ( "PPTP" ); ProfileInfo += ""; ProfileInfo += ""; - QString PptpOptions = ""; + TQString PptpOptions = ""; PptpOptions += "
"+i18n("Type:")+""+TypeString+"
"+i18n("Gateway (VPN server):")+""+Gateway+"
"; if (it->getRequireMppe()) PptpOptions += ""; @@ -19154,7 +19154,7 @@ void KVpnc::sessionToggled ( const QString& Name ) PptpOptions += ""; else PptpOptions += ""; - QString NtDomainName = "-"; + TQString NtDomainName = "-"; if ( it->getUseNtDomainName() ) NtDomainName = it->getNtDomainName(); PptpOptions += ""; @@ -19179,7 +19179,7 @@ void KVpnc::sessionToggled ( const QString& Name ) int RemotePort = 1194; if (it->getUseRemotePort()) RemotePort = it->getRemotePort(); - ProfileInfo += ""; + ProfileInfo += ""; ProfileInfo += ""; ProfileInfo += ""; @@ -19258,8 +19258,8 @@ void KVpnc::sessionToggled ( const QString& Name ) GlobalConfig->appendLogEntry ( i18n ( "Selected connection type: %1." ).arg ( type ), GlobalConfig->debug ); int Authtype = it->getAuthType(); - QString AuthTypeText=""; - QString AuthTypePretty = ""; + TQString AuthTypeText=""; + TQString AuthTypePretty = ""; if ( Authtype == VpnAccountData::cert ) { AuthTypeText="cert"; @@ -19311,9 +19311,9 @@ void KVpnc::sessionToggled ( const QString& Name ) AuthTypePretty += i18n(" (using password)"); else if (it->getPskIsInFile()) - AuthTypePretty += i18n(" (using key: %1)").arg(it->getPreSharedKeyFile()); + AuthTypePretty += i18n(" (using key: %1)").tqarg(it->getPreSharedKeyFile()); else - AuthTypePretty += i18n(" (using key: %1)").arg(it->getPreSharedKey()); + AuthTypePretty += i18n(" (using key: %1)").tqarg(it->getPreSharedKey()); } if ( GlobalConfig->KvpncDebugLevel > 2 ) @@ -19323,7 +19323,7 @@ void KVpnc::sessionToggled ( const QString& Name ) // ToolInfo *it; // std::cout << "Tool (bin): " << bin << std::endl; - QString TypeRequirementStatus=""; + TQString TypeRequirementtqStatus=""; if ( !GlobalConfig->ToolList->isEmpty() ) { @@ -19349,7 +19349,7 @@ void KVpnc::sessionToggled ( const QString& Name ) if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "The required daemon (%1) is available, connect will be enabled." ).arg ( bin ), KVpncConfig::info ); - TypeRequirementStatus = i18n ( "Daemon (%1) available").arg(bin); + TypeRequirementtqStatus = i18n ( "Daemon (%1) available").tqarg(bin); } else { @@ -19358,7 +19358,7 @@ void KVpnc::sessionToggled ( const QString& Name ) this->ConnectAction->setEnabled ( FALSE ); mw->buttonConnect->setEnabled ( FALSE ); GlobalConfig->appendLogEntry ( i18n ( "The required helper program (%1) isn't available, connect will be disabled." ).arg ( "pkcs11-tool" ), KVpncConfig::error ); - TypeRequirementStatus = i18n ( "Daemon (%1) not available").arg ( "pkcs11-tool" ); + TypeRequirementtqStatus = i18n ( "Daemon (%1) not available").arg ( "pkcs11-tool" ); } else { @@ -19366,7 +19366,7 @@ void KVpnc::sessionToggled ( const QString& Name ) mw->buttonConnect->setEnabled ( TRUE ); if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "The required daemon (%1) and helper program (%2) is available, connect will be enabled." ).arg ( bin ).arg ( "pkcs11-tool" ), KVpncConfig::info ); - TypeRequirementStatus = i18n ( "Daemon (%1) and helper program (%2) not available").arg ( "pkcs11-tool" ).arg("pkcs11-tool"); + TypeRequirementtqStatus = i18n ( "Daemon (%1) and helper program (%2) not available").arg ( "pkcs11-tool" ).tqarg("pkcs11-tool"); } } } @@ -19375,7 +19375,7 @@ void KVpnc::sessionToggled ( const QString& Name ) this->ConnectAction->setEnabled ( FALSE ); mw->buttonConnect->setEnabled ( FALSE ); GlobalConfig->appendLogEntry ( i18n ( "The required daemon (%1) isn't available, connect will be disabled." ).arg ( bin ), KVpncConfig::error ); - TypeRequirementStatus = i18n ( "Daemon (%1) not available").arg(bin); + TypeRequirementtqStatus = i18n ( "Daemon (%1) not available").tqarg(bin); } } else @@ -19401,7 +19401,7 @@ void KVpnc::sessionToggled ( const QString& Name ) // programs are installed if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) are available, connect will be enabled." ).arg ( "racoon" ).arg ( "l2tpd" ), KVpncConfig::info ); - TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "racoon" ).arg ( "l2tpd" ); + TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "racoon" ).arg ( "l2tpd" ); this->ConnectAction->setEnabled ( TRUE ); mw->buttonConnect->setEnabled ( TRUE ); @@ -19412,7 +19412,7 @@ void KVpnc::sessionToggled ( const QString& Name ) if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) are available, connect will be enabled." ).arg ( "racoon" ).arg ( "xl2tpd" ), KVpncConfig::info ); - TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "racoon" ).arg ( "xl2tpd" ); + TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "racoon" ).arg ( "xl2tpd" ); this->ConnectAction->setEnabled ( TRUE ); mw->buttonConnect->setEnabled ( TRUE ); @@ -19420,7 +19420,7 @@ void KVpnc::sessionToggled ( const QString& Name ) else if ( racoon_and_l2tpd_available==false && racoon_and_xl2tpd_available==false ) { GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) are not available, connect will be disabled." ).arg ( "racoon" ).arg ( "l2tpd/xl2tpd" ), KVpncConfig::error ); - TypeRequirementStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "racoon" ).arg ( "xl2tpd" ); + TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "racoon" ).arg ( "xl2tpd" ); } } if ( GlobalConfig->currentProfile->getL2tpDaemon() == VpnAccountData::openl2tp ) @@ -19431,7 +19431,7 @@ void KVpnc::sessionToggled ( const QString& Name ) if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) are available, connect will be enabled." ).arg ( "racoon" ).arg ( "openl2tp" ), KVpncConfig::info ); - TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "racoon" ).arg ( "openl2tp" ); + TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "racoon" ).arg ( "openl2tp" ); this->ConnectAction->setEnabled ( TRUE ); mw->buttonConnect->setEnabled ( TRUE ); @@ -19453,7 +19453,7 @@ void KVpnc::sessionToggled ( const QString& Name ) ipsec_and_openl2tp_available = true; } - QString deamon=""; + TQString deamon=""; if ( ipsec_and_l2tpd_available ) deamon="l2tpd"; if ( ipsec_and_xl2tpd_available ) @@ -19473,7 +19473,7 @@ void KVpnc::sessionToggled ( const QString& Name ) if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) are available, connect will be enabled." ).arg ( "ipsec" ).arg ( "l2tpd" ), KVpncConfig::info ); - TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg ( "l2tpd" ); + TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg ( "l2tpd" ); this->ConnectAction->setEnabled ( TRUE ); mw->buttonConnect->setEnabled ( TRUE ); @@ -19484,7 +19484,7 @@ void KVpnc::sessionToggled ( const QString& Name ) if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) are available, connect will be enabled." ).arg ( "ipsec" ).arg ( "xl2tpd" ), KVpncConfig::info ); - TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg ( "xl2tpd" ); + TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg ( "xl2tpd" ); this->ConnectAction->setEnabled ( TRUE ); mw->buttonConnect->setEnabled ( TRUE ); @@ -19492,7 +19492,7 @@ void KVpnc::sessionToggled ( const QString& Name ) else if ( ipsec_and_l2tpd_available==false && ipsec_and_xl2tpd_available==false ) { GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) are not available, connect will be disabled." ).arg ( "ipsec" ).arg ( "l2tpd/xl2tpd" ), KVpncConfig::error ); - TypeRequirementStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "ipsec" ).arg ( "l2tpd/xl2tpd" ); + TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "ipsec" ).arg ( "l2tpd/xl2tpd" ); } } if ( GlobalConfig->currentProfile->getL2tpDaemon() == VpnAccountData::openl2tp ) @@ -19503,7 +19503,7 @@ void KVpnc::sessionToggled ( const QString& Name ) if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) are available, connect will be enabled." ).arg ( "ipsec" ).arg ( "openl2tp" ), KVpncConfig::info ); - TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg ( "openl2tp" ); + TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg ( "openl2tp" ); this->ConnectAction->setEnabled ( TRUE ); mw->buttonConnect->setEnabled ( TRUE ); @@ -19511,7 +19511,7 @@ void KVpnc::sessionToggled ( const QString& Name ) else if ( ipsec_and_openl2tp_available==false ) { GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) are not available, connect will be disabled." ).arg ( "ipsec" ).arg ( "openl2tp" ), KVpncConfig::error ); - TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg ( "openl2tp" ); + TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg ( "openl2tp" ); } } } @@ -19524,15 +19524,15 @@ void KVpnc::sessionToggled ( const QString& Name ) this->ConnectAction->setEnabled ( FALSE ); mw->buttonConnect->setEnabled ( FALSE ); GlobalConfig->appendLogEntry ( i18n ( "The required helper program (%1) isn't available, connect will be disabled." ).arg ( "pkcs11-tool" ), KVpncConfig::error ); - TypeRequirementStatus = i18n ( "Daemon (%1) not available").arg ( "pkcs11-tool" ); + TypeRequirementtqStatus = i18n ( "Daemon (%1) not available").arg ( "pkcs11-tool" ); } else { this->ConnectAction->setEnabled ( TRUE ); mw->buttonConnect->setEnabled ( TRUE ); if ( GlobalConfig->KvpncDebugLevel > 2 ) - GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) and helper program (%3) is available, connect will be enabled." ).arg ( "ipsec" ).arg ( QString(deamon) ).arg ( "pkcs11-tool" ), KVpncConfig::info ); - TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg(deamon).arg ( "pkcs11-tool" ); + GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) and helper program (%3) is available, connect will be enabled." ).arg ( "ipsec" ).arg ( TQString(deamon) ).arg ( "pkcs11-tool" ), KVpncConfig::info ); + TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).tqarg(deamon).arg ( "pkcs11-tool" ); } } } @@ -19540,7 +19540,7 @@ void KVpnc::sessionToggled ( const QString& Name ) else { GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) are not available, connect will be disabled." ).arg ( "ipsec" ).arg ( "l2tpd/xl2tpd" ), KVpncConfig::error ); - TypeRequirementStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "ipsec" ).arg ( "l2tpd/xl2pd" ); + TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "ipsec" ).arg ( "l2tpd/xl2pd" ); } } if ( type == "pptp" ) @@ -19556,7 +19556,7 @@ void KVpnc::sessionToggled ( const QString& Name ) // programs are installed if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) are available, connect will be enabled." ).arg ( "pppd" ).arg ( "pptp" ), KVpncConfig::info ); - TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "pppd" ).arg ( "pptp" ); + TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "pppd" ).arg ( "pptp" ); this->ConnectAction->setEnabled ( TRUE ); mw->buttonConnect->setEnabled ( TRUE ); @@ -19565,7 +19565,7 @@ void KVpnc::sessionToggled ( const QString& Name ) else { GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) are not available, connect will be disabled." ).arg ( "pppd" ).arg ( "pptp" ), KVpncConfig::error ); - TypeRequirementStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "pppd" ).arg ( "pptp" ); + TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "pppd" ).arg ( "pptp" ); } } if ( type == "ssh" ) @@ -19585,7 +19585,7 @@ void KVpnc::sessionToggled ( const QString& Name ) if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "The required programs (%1 and %2) are available, connect will be enabled." ).arg ( "ssh" ).arg ( "ksshaskpass" ), KVpncConfig::info ); - TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ssh" ).arg ( "ksshaskpass" ); + TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ssh" ).arg ( "ksshaskpass" ); this->ConnectAction->setEnabled ( TRUE ); mw->buttonConnect->setEnabled ( TRUE ); @@ -19597,7 +19597,7 @@ void KVpnc::sessionToggled ( const QString& Name ) if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "The required programs (%1 and %2) are available, connect will be enabled." ).arg ( "ssh" ).arg ( "gnome-ssh-askpass" ), KVpncConfig::info ); - TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ssh" ).arg ( "gnome-ssh-askpass" ); + TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ssh" ).arg ( "gnome-ssh-askpass" ); this->ConnectAction->setEnabled ( TRUE ); mw->buttonConnect->setEnabled ( TRUE ); @@ -19606,15 +19606,15 @@ void KVpnc::sessionToggled ( const QString& Name ) else { GlobalConfig->appendLogEntry ( i18n ( "The required programs (%1 and %2) are not available, connect will be disabled." ).arg ( "ssh" ).arg ( i18n ( "%1 or %2" ).arg ( "ksshaskpass" ).arg ( "gnome-ssh-askpass" ) ), KVpncConfig::error ); - TypeRequirementStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "ssh" ).arg ( i18n ( "%1 or %2" ).arg ( "ksshaskpass" ).arg ( "gnome-ssh-askpass" ) ); + TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "ssh" ).arg ( i18n ( "%1 or %2" ).arg ( "ksshaskpass" ).arg ( "gnome-ssh-askpass" ) ); } } } } - ProfileInfo += ""; + ProfileInfo += ""; ProfileInfo += "
"+i18n("Require MPPE:")+""+ i18n("yes")+"
"+i18n("Allow stateful mode:")+""+ i18n("yes")+"
"+i18n("Allow stateful mode:")+""+ i18n("no")+"
"+i18n("NT domain name:")+""+ NtDomainName+"
"+i18n("Remote port:")+""+QString().setNum(RemotePort)+"
"+i18n("Remote port:")+""+TQString().setNum(RemotePort)+"
"+i18n("Username:")+""+Username+"
"+i18n("Tunnel device type:")+""+TunnelDeviceType+"
"+i18n("Required tools:")+""+TypeRequirementStatus+"
"+i18n("Required tools:")+""+TypeRequirementtqStatus+"
"; - QToolTip::add( mw->SessionCombo, ProfileInfo ); + TQToolTip::add( mw->SessionCombo, ProfileInfo ); break; } } @@ -19642,9 +19642,9 @@ void KVpnc::slotDurationEvent() if ( !isHidden() ) { - QString StatusMsg = ""; - QString durationString(i18n("%1:%2:%3" ).arg( QString().sprintf("%02u", hour)).arg( QString().sprintf("%02u", min)).arg( QString().sprintf("%02u", sec))); - QString Username = ""; + TQString StatusMsg = ""; + TQString durationString(i18n("%1:%2:%3" ).tqarg( TQString().sprintf("%02u", hour)).tqarg( TQString().sprintf("%02u", min)).tqarg( TQString().sprintf("%02u", sec))); + TQString Username = ""; if (!GlobalConfig->TmpUsername.isEmpty()) Username = GlobalConfig->TmpUsername; @@ -19653,15 +19653,15 @@ void KVpnc::slotDurationEvent() if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::cisco) { - StatusMsg = i18n("Connected: %2@%1, [%3], %4").arg(Username).arg(GlobalConfig->currentProfile->getGateway()).arg(PrettyTypeString).arg(durationString); + StatusMsg = i18n("Connected: %2@%1, [%3], %4").tqarg(Username).tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(PrettyTypeString).tqarg(durationString); } else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ciscoorig) { - StatusMsg = i18n("Connected: %2@%1, [%3], %4").arg(Username).arg(GlobalConfig->currentProfile->getGateway()).arg(PrettyTypeString).arg(durationString); + StatusMsg = i18n("Connected: %2@%1, [%3], %4").tqarg(Username).tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(PrettyTypeString).tqarg(durationString); } else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::pptp) { - StatusMsg = i18n("Connected: %2@%1 [%3], %4").arg( GlobalConfig->currentProfile->getGateway()).arg( Username).arg( PrettyTypeString).arg(durationString); + StatusMsg = i18n("Connected: %2@%1 [%3], %4").tqarg( GlobalConfig->currentProfile->getGateway()).tqarg( Username).tqarg( PrettyTypeString).tqarg(durationString); } else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan || (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::openvpn && GlobalConfig->currentProfile->getAuthWithUsernameAndPassword() == true) || @@ -19672,37 +19672,37 @@ void KVpnc::slotDurationEvent() { if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan && !(GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan && GlobalConfig->currentProfile->getAuthWithUsernameAndPassword())) { - StatusMsg = i18n("Connected: %1 [%2], %3").arg( GlobalConfig->currentProfile->getGateway()).arg(PrettyTypeString).arg(durationString); + StatusMsg = i18n("Connected: %1 [%2], %3").tqarg( GlobalConfig->currentProfile->getGateway()).tqarg(PrettyTypeString).tqarg(durationString); } else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::racoon) { - StatusMsg = i18n("Connected: %1 [%2], %3").arg(GlobalConfig->currentProfile->getGateway()).arg(PrettyTypeString).arg(durationString); + StatusMsg = i18n("Connected: %1 [%2], %3").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(PrettyTypeString).tqarg(durationString); } else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_racoon) { - StatusMsg = i18n("Connected: %2@%1 [%3], %4").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(PrettyTypeString).arg(durationString); + StatusMsg = i18n("Connected: %2@%1 [%3], %4").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(PrettyTypeString).tqarg(durationString); } else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_freeswan || (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan && GlobalConfig->currentProfile->getAuthWithUsernameAndPassword())) { - StatusMsg = i18n("Connected: %2@%1 [%3], %4").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(PrettyTypeString).arg(durationString); + StatusMsg = i18n("Connected: %2@%1 [%3], %4").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(PrettyTypeString).tqarg(durationString); } else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::openvpn) { - StatusMsg = i18n("Connected: %2@%1 [%3], %4").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(PrettyTypeString).arg(durationString); + StatusMsg = i18n("Connected: %2@%1 [%3], %4").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(PrettyTypeString).tqarg(durationString); } } else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::openvpn) { - StatusMsg = i18n("Connected: %1, [%2], %3").arg(GlobalConfig->currentProfile->getGateway()).arg(PrettyTypeString).arg(durationString); + StatusMsg = i18n("Connected: %1, [%2], %3").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(PrettyTypeString).tqarg(durationString); } else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::vtun) { - StatusMsg = i18n("Connected: %1, [%2], %3").arg(QString(GlobalConfig->currentProfile->getGateway())).arg(QString(PrettyTypeString)).arg(durationString); + StatusMsg = i18n("Connected: %1, [%2], %3").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(TQString(PrettyTypeString)).tqarg(durationString); } else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ssh) { - StatusMsg = i18n("Connected: %1@%2 [%3], %4").arg(QString(Username)).arg(GlobalConfig->currentProfile->getGateway()).arg(PrettyTypeString).arg(durationString); + StatusMsg = i18n("Connected: %1@%2 [%3], %4").tqarg(TQString(Username)).tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(PrettyTypeString).tqarg(durationString); } @@ -19725,7 +19725,7 @@ void KVpnc::slotDurationEvent() void KVpnc::showDockTooltip() { - QString IP; + TQString IP; if (GlobalConfig->showInterfaceIPinTooltip) { if (TunnelInterfaceIP.isEmpty()) @@ -19757,22 +19757,22 @@ void KVpnc::showDockTooltip() if (IP.isEmpty()) IP = i18n("none"); } - QString durationString =""; - QString ToolTipMsg = ""; + TQString durationString =""; + TQString ToolTipMsg = "
"; - QString Username = ""; - QString ConnectionStatus=""; + TQString Username = ""; + TQString ConnectiontqStatus=""; if (GlobalConfig->status == GlobalConfig->connected || GlobalConfig->status == GlobalConfig->connecting) { if (GlobalConfig->status == GlobalConfig->connected) { - ConnectionStatus = i18n("connected"); - durationString = i18n("%1:%2:%3").arg( QString().sprintf("%02u", hour)).arg(QString().sprintf("%02u", min)).arg(QString().sprintf("%02u", sec)); + ConnectiontqStatus = i18n("connected"); + durationString = i18n("%1:%2:%3").tqarg( TQString().sprintf("%02u", hour)).tqarg(TQString().sprintf("%02u", min)).tqarg(TQString().sprintf("%02u", sec)); } else { - ConnectionStatus = i18n("connecting"); + ConnectiontqStatus = i18n("connecting"); } if (!GlobalConfig->TmpUsername.isEmpty()) @@ -19780,9 +19780,9 @@ void KVpnc::showDockTooltip() else Username = GlobalConfig->currentProfile->getUserName(); - ToolTipMsg += ""; - ToolTipMsg += ""; - ToolTipMsg += ""; + ToolTipMsg += ""; + ToolTipMsg += ""; + ToolTipMsg += ""; if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::cisco || GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ciscoorig) ToolTipMsg += ""; @@ -19792,14 +19792,14 @@ void KVpnc::showDockTooltip() GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_racoon || GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_freeswan || (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::openvpn && GlobalConfig->currentProfile->getAuthWithUsernameAndPassword())) { - ToolTipMsg += ""; + ToolTipMsg += ""; } if ((GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::cisco || GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ciscoorig || GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::pptp || GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_racoon || GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_freeswan || GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::openvpn || GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ssh) && GlobalConfig->showInterfaceIPinTooltip == true) - ToolTipMsg += ""; + ToolTipMsg += ""; if ( GlobalConfig->currentProfile->getUseLeftSourceIp() && (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::racoon || GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan) && GlobalConfig->showInterfaceIPinTooltip == true) { @@ -19809,7 +19809,7 @@ void KVpnc::showDockTooltip() if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::openvpn && GlobalConfig->currentProfile->getUseHttpProxy()) { - ToolTipMsg += ""; + ToolTipMsg += ""; if (GlobalConfig->currentProfile->getUseHttpProxyAuth()) { ToolTipMsg += ""; @@ -19820,7 +19820,7 @@ void KVpnc::showDockTooltip() if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::cisco || GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::openvpn || GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ssh) { - ToolTipMsg += ""; + ToolTipMsg += ""; } if (GlobalConfig->showConnectionTimeInTooltip) @@ -19828,33 +19828,33 @@ void KVpnc::showDockTooltip() } else if (GlobalConfig->status == GlobalConfig->disconnected) { - ConnectionStatus = i18n("disconnected"); - ToolTipMsg += ""; + ConnectiontqStatus = i18n("disconnected"); + ToolTipMsg += ""; } ToolTipMsg += "
"+i18n("Status:")+""+ConnectionStatus+"
"+i18n("Server:")+""+QString(GlobalConfig->currentProfile->getGateway())+"
"+i18n("Type:")+""+QString(PrettyTypeString)+"
"+i18n("Status:")+""+ConnectiontqStatus+"
"+i18n("Server:")+""+TQString(GlobalConfig->currentProfile->getGateway())+"
"+i18n("Type:")+""+TQString(PrettyTypeString)+"
"+i18n("IPSec ID:")+""+GlobalConfig->currentProfile->getID()+"
"+i18n("user:")+""+QString(Username)+"
"+i18n("user:")+""+TQString(Username)+"
"+i18n("tunnel IP:")+""+QString(IP)+"
"+i18n("tunnel IP:")+""+TQString(IP)+"
"+i18n("HTTP proxy:")+""+GlobalConfig->currentProfile->getHttpProxy()+":"+QString().setNum(GlobalConfig->currentProfile->getHttpProxyPort())+"
"+i18n("HTTP proxy:")+""+GlobalConfig->currentProfile->getHttpProxy()+":"+TQString().setNum(GlobalConfig->currentProfile->getHttpProxyPort())+"
"+i18n("HTTP proxy type:")+""+GlobalConfig->currentProfile->getHttpProxyAuthType().upper()+"
"+i18n("Tunnel device type:")+""+QString(GlobalConfig->currentProfile->getTunnelDeviceType())+"
"+i18n("Tunnel device type:")+""+TQString(GlobalConfig->currentProfile->getTunnelDeviceType())+"
"+i18n("State:")+""+ ConnectionStatus+"
"+i18n("State:")+""+ ConnectiontqStatus+"
"; - QToolTip::remove ( KVpncDock); - QToolTip::add ( KVpncDock, ToolTipMsg ); + TQToolTip::remove ( KVpncDock); + TQToolTip::add ( KVpncDock, ToolTipMsg ); } -void KVpnc::setGuiStatus ( int status ) +void KVpnc::setGuitqStatus ( int status ) { - QString durationString = ""; - QString DaemonString = ""; - QString ToolTipMsg = ""; - QString ConnectMsg = ""; - QString LogMsg = ""; - QString ConnectionStatus = i18n("unknown"); - QString Username = ""; + TQString durationString = ""; + TQString DaemonString = ""; + TQString ToolTipMsg = ""; + TQString ConnectMsg = ""; + TQString LogMsg = ""; + TQString ConnectiontqStatus = i18n("unknown"); + TQString Username = ""; if (status == GlobalConfig->connected) { setIcon ( connectedIcon ); - durationString = i18n ( "%1:%2:%3" ).arg ( QString().sprintf ( "%02u", hour ) ).arg ( QString().sprintf ( "%02u", min ) ).arg ( QString().sprintf ( "%02u", sec ) ) ; - QString ConnectMsg = ""; - QString LogMsg = ""; - QString ToolTipMsg = ""; - QString DeamonString = ""; - ConnectionStatus = i18n("connected"); + durationString = i18n ( "%1:%2:%3" ).arg ( TQString().sprintf ( "%02u", hour ) ).arg ( TQString().sprintf ( "%02u", min ) ).arg ( TQString().sprintf ( "%02u", sec ) ) ; + TQString ConnectMsg = ""; + TQString LogMsg = ""; + TQString ToolTipMsg = ""; + TQString DeamonString = ""; + ConnectiontqStatus = i18n("connected"); if ( !GlobalConfig->TmpUsername.isEmpty() ) Username=GlobalConfig->TmpUsername; @@ -19868,7 +19868,7 @@ void KVpnc::setGuiStatus ( int status ) ImportSessionAction->setEnabled ( false ); NewProfileWizardAction->setEnabled ( false ); - KVpncDock->setStatus ( connected ); + KVpncDock->settqStatus ( connected ); GlobalConfig->status = GlobalConfig->connected; statusColorLabel->setPixmap ( *connectedStatusPixmap ); mw->buttonConnect->setEnabled ( false ); @@ -19882,7 +19882,7 @@ void KVpnc::setGuiStatus ( int status ) PrefAction ->setEnabled ( false ); ToolTipMsg = ConnectMsg; - QToolTip::add + TQToolTip::add ( KVpncDock, ToolTipMsg ); slotStatusMsg ( i18n ( "Successful connected." ), ID_FLASH_MSG ); @@ -19894,7 +19894,7 @@ void KVpnc::setGuiStatus ( int status ) hide(); - QuickConnectMenu = new QPopupMenu ( KVpncDock->menu() ); + QuickConnectMenu = new TQPopupMenu ( KVpncDock->menu() ); //setItemEnabled ( int id, bool enable ) @@ -19911,7 +19911,7 @@ void KVpnc::setGuiStatus ( int status ) DeleteSessionAction->setEnabled ( false ); ImportSessionAction->setEnabled ( false ); - KVpncDock->setStatus ( connecting ); + KVpncDock->settqStatus ( connecting ); GlobalConfig->status = GlobalConfig->connecting; mw->SessionCombo->setEnabled ( false ); PreferencesAction->setEnabled ( false ); @@ -19919,7 +19919,7 @@ void KVpnc::setGuiStatus ( int status ) NewProfileWizardAction->setEnabled ( false ); PrefAction ->setEnabled ( false ); - ConnectionStatus = i18n("connecting"); + ConnectiontqStatus = i18n("connecting"); statusColorLabel->setPixmap ( *connectingStatusPixmap ); @@ -19941,15 +19941,15 @@ void KVpnc::setGuiStatus ( int status ) RenameSessionAction->setEnabled ( true ); DeleteSessionAction->setEnabled ( true ); ImportSessionAction->setEnabled ( true ); - KVpncDock->setStatus ( disconnected ); + KVpncDock->settqStatus ( disconnected ); mw->SessionCombo->setEnabled ( true ); PreferencesAction->setEnabled ( true ); ProfileManagerAction->setEnabled ( true ); NewProfileWizardAction->setEnabled ( true ); PrefAction ->setEnabled ( true ); - QToolTip::remove( KVpncDock ); - QToolTip::add( KVpncDock, i18n ( "Disconnected" ) ); + TQToolTip::remove( KVpncDock ); + TQToolTip::add( KVpncDock, i18n ( "Disconnected" ) ); statusColorLabel->setPixmap ( *disconnectedStatusPixmap ); @@ -19957,9 +19957,9 @@ void KVpnc::setGuiStatus ( int status ) slotStatusMsg ( i18n ( "Disconnected." ), ID_FLASH_MSG ); if ( prevConnectionState == GlobalConfig->connected ) - KNotifyClient::event ( topLevelWidget() ->winId(), "connection finished", i18n ( "Connection \"%1\" finished" ).arg ( GlobalConfig->currentProfile->getName() ) ); + KNotifyClient::event ( tqtopLevelWidget() ->winId(), "connection finished", i18n ( "Connection \"%1\" finished" ).arg ( GlobalConfig->currentProfile->getName() ) ); else if ( prevConnectionState == GlobalConfig->connecting ) - KNotifyClient::event ( topLevelWidget() ->winId(), "connect try canceled", i18n ( "Connect try to \"%1\" canceled" ).arg ( GlobalConfig->currentProfile->getName() ) ); + KNotifyClient::event ( tqtopLevelWidget() ->winId(), "connect try canceled", i18n ( "Connect try to \"%1\" canceled" ).arg ( GlobalConfig->currentProfile->getName() ) ); } if (status == GlobalConfig->connecting || status == GlobalConfig->connected) { @@ -19977,31 +19977,31 @@ void KVpnc::setGuiStatus ( int status ) } if (GlobalConfig->currentProfile->getAuthType() == VpnAccountData::psk) { - ToolTipMsg = i18n("\nstatus: %6\nserver: %1\nuser: %2\nIPSec ID: %3\nduration: %4\nprofile: %5").arg(GlobalConfig->currentProfile->getGateway()).arg(GlobalConfig->currentProfile->getUserName()).arg(GlobalConfig->currentProfile->getID()).arg(durationString).arg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]").arg(ConnectionStatus); + ToolTipMsg = i18n("\nstatus: %6\nserver: %1\nuser: %2\nIPSec ID: %3\nduration: %4\nprofile: %5").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(GlobalConfig->currentProfile->getUserName()).tqarg(GlobalConfig->currentProfile->getID()).tqarg(durationString).tqarg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]").tqarg(ConnectiontqStatus); - ConnectMsg = i18n("%5: %2@%1, %3 [%4]").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(durationString).arg(PrettyTypeString).arg(ConnectionStatus); + ConnectMsg = i18n("%5: %2@%1, %3 [%4]").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString).tqarg(PrettyTypeString).tqarg(ConnectiontqStatus); - LogMsg = i18n("Successful connected to server: \"%1\", user: \"%2\", IPSec ID: \"%3\" at %4").arg(GlobalConfig->currentProfile->getGateway()).arg(GlobalConfig->currentProfile->getUserName()).arg(GlobalConfig->currentProfile->getID()).arg(QDateTime::currentDateTime().toString(Qt::TextDate) + " [" + PrettyTypeString + "]"); + LogMsg = i18n("Successful connected to server: \"%1\", user: \"%2\", IPSec ID: \"%3\" at %4").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(GlobalConfig->currentProfile->getUserName()).tqarg(GlobalConfig->currentProfile->getID()).tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::TextDate) + " [" + PrettyTypeString + "]"); } if (GlobalConfig->currentProfile->getAuthType() == VpnAccountData::cert) { - ToolTipMsg = i18n("\nstatus: %6\nserver: %1\nuser: %2\nIPSec ID: %3\nduration: %4\nprofile: %5").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(durationString).arg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]").arg(ConnectionStatus); + ToolTipMsg = i18n("\nstatus: %6\nserver: %1\nuser: %2\nIPSec ID: %3\nduration: %4\nprofile: %5").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString).tqarg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]").tqarg(ConnectiontqStatus); - ConnectMsg = i18n("%5: %2@%1, %3 [%4]").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(durationString).arg(PrettyTypeString).arg(ConnectionStatus); + ConnectMsg = i18n("%5: %2@%1, %3 [%4]").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString).tqarg(PrettyTypeString).tqarg(ConnectiontqStatus); - LogMsg = i18n("Successful connected to server: \"%1\", user: \"%2\" at %3").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(QDateTime::currentDateTime().toString(Qt::TextDate) + " [" + PrettyTypeString + "]"); + LogMsg = i18n("Successful connected to server: \"%1\", user: \"%2\" at %3").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::TextDate) + " [" + PrettyTypeString + "]"); } } else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::pptp) { PrettyTypeString = i18n("PPTP"); DaemonString = "pppd, pptp"; - ToolTipMsg = i18n("status: %5\nserver: %1\nuser: %2\nduration: %3\nprofile %4").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(durationString , GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]").arg(ConnectionStatus); + ToolTipMsg = i18n("status: %5\nserver: %1\nuser: %2\nduration: %3\nprofile %4").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString , GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]").tqarg(ConnectiontqStatus); - ConnectMsg = i18n("Connected: %2@%1, %3").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(durationString); + ConnectMsg = i18n("Connected: %2@%1, %3").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString); - QString TypeString2 = " [" + i18n("%1" , PrettyTypeString) + QString("]"); - LogMsg = i18n("Successful connected to server \"%1\"\nuser: \"%2\" at %3").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(QString(QDateTime::currentDateTime().toString(Qt::TextDate)) + TypeString2); + TQString TypeString2 = " [" + i18n("%1" , PrettyTypeString) + TQString("]"); + LogMsg = i18n("Successful connected to server \"%1\"\nuser: \"%2\" at %3").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(TQString(TQDateTime::tqcurrentDateTime().toString(Qt::TextDate)) + TypeString2); } else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::racoon || GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_racoon || GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan || GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_freeswan) { @@ -20009,88 +20009,88 @@ void KVpnc::setGuiStatus ( int status ) { PrettyTypeString = i18n("racoon"); DaemonString = "racoon"; - ConnectMsg = i18n("Policy was successfully activated, daemon (%1) is running and tunnel is up.").arg(DaemonString); + ConnectMsg = i18n("Policy was successfully activated, daemon (%1) is running and tunnel is up.").tqarg(DaemonString); } else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan) { PrettyTypeString = IpsecType; // openswan, strongswan, ... DaemonString = "ipsec"; - ConnectMsg = i18n("Policy was successful activated and daemon (%1) is running.").arg(DaemonString); + ConnectMsg = i18n("Policy was successful activated and daemon (%1) is running.").tqarg(DaemonString); } else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_racoon) { PrettyTypeString = i18n("L2TP (racoon)"); DaemonString = "racoon, " + GlobalConfig->currentProfile->getL2tpDaemon(); - ToolTipMsg = i18n("status: %5\nserver: %1\nuser: %2\nduration: %3\nprofile %4").arg(QString(GlobalConfig->currentProfile->getGateway())).arg(Username).arg(durationString).arg(QString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]").arg(ConnectionStatus); + ToolTipMsg = i18n("status: %5\nserver: %1\nuser: %2\nduration: %3\nprofile %4").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(Username).tqarg(durationString).tqarg(TQString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]").tqarg(ConnectiontqStatus); - ConnectMsg = i18n("%5: %2@%1, %3 [%4]").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(durationString).arg(PrettyTypeString).arg(ConnectionStatus); + ConnectMsg = i18n("%5: %2@%1, %3 [%4]").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString).tqarg(PrettyTypeString).tqarg(ConnectiontqStatus); } else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_freeswan) { PrettyTypeString = IpsecType; - if (!GlobalConfig->pathToXl2tpd.isEmpty() && QFile(GlobalConfig->pathToXl2tpd).exists()) + if (!GlobalConfig->pathToXl2tpd.isEmpty() && TQFile(GlobalConfig->pathToXl2tpd).exists()) DaemonString = "ipsec, " + GlobalConfig->currentProfile->getL2tpDaemon(); - ToolTipMsg = i18n("status: %5\nserver: %1\nuser: %2\nduration: %3\nprofile %4").arg(QString(GlobalConfig->currentProfile->getGateway())).arg(Username).arg(durationString , QString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]").arg(ConnectionStatus); + ToolTipMsg = i18n("status: %5\nserver: %1\nuser: %2\nduration: %3\nprofile %4").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(Username).tqarg(durationString , TQString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]").tqarg(ConnectiontqStatus); - ConnectMsg = i18n("%4: %2@%1, %3").arg(QString(GlobalConfig->currentProfile->getGateway())).arg( Username).arg(durationString).arg(ConnectionStatus); + ConnectMsg = i18n("%4: %2@%1, %3").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg( Username).tqarg(durationString).tqarg(ConnectiontqStatus); } else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan && GlobalConfig->currentProfile->getAuthWithUsernameAndPassword()) { PrettyTypeString = IpsecType; DaemonString = "ipsec"; - ToolTipMsg = i18n("status: %5\nserver: %1\nuser: %2\nduration: %3\nprofile %4").arg(QString(GlobalConfig->currentProfile->getGateway())).arg(Username).arg(durationString , QString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]").arg(ConnectionStatus); + ToolTipMsg = i18n("status: %5\nserver: %1\nuser: %2\nduration: %3\nprofile %4").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(Username).tqarg(durationString , TQString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]").tqarg(ConnectiontqStatus); - ConnectMsg = i18n("Connected: %2@%1, %3").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(durationString); + ConnectMsg = i18n("Connected: %2@%1, %3").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString); } - LogMsg = i18n("Policy successful activated and daemon (%1) running for server \"%2\" (%3) at date %4, profile \"%5\".").arg(DaemonString).arg(GlobalConfig->currentProfile->getGateway()).arg(GlobalConfig->TmpGatewayIP).arg(QDateTime::currentDateTime().toString(Qt::TextDate)).arg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]"); + LogMsg = i18n("Policy successful activated and daemon (%1) running for server \"%2\" (%3) at date %4, profile \"%5\".").tqarg(DaemonString).tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(GlobalConfig->TmpGatewayIP).tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::TextDate)).tqarg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]"); } else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::openvpn) { PrettyTypeString = i18n("OpenVPN"); DaemonString = "openvpn"; - ToolTipMsg = i18n("status: %3 \nserver: %1\nduration: %2").arg(GlobalConfig->currentProfile->getGateway()).arg(durationString).arg(ConnectionStatus); + ToolTipMsg = i18n("status: %3 \nserver: %1\nduration: %2").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(durationString).tqarg(ConnectiontqStatus); - ConnectMsg = i18n("Connected: %1, %2, profile \"%3\"").arg(GlobalConfig->currentProfile->getGateway()).arg(durationString).arg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]"); + ConnectMsg = i18n("Connected: %1, %2, profile \"%3\"").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(durationString).tqarg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]"); - LogMsg = i18n("Successful connected to server \"%1\" at %2, profile \"%3\".").arg(GlobalConfig->currentProfile->getGateway()).arg(QDateTime::currentDateTime().toString(Qt::TextDate)).arg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]"); + LogMsg = i18n("Successful connected to server \"%1\" at %2, profile \"%3\".").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::TextDate)).tqarg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]"); } else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::vtun) { PrettyTypeString = i18n("Vtun"); DaemonString = "vtun"; - ToolTipMsg = i18n("status: %3\nserver: %1\nduration: %2").arg(QString(GlobalConfig->currentProfile->getGateway())).arg(durationString).arg(ConnectionStatus); + ToolTipMsg = i18n("status: %3\nserver: %1\nduration: %2").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(durationString).tqarg(ConnectiontqStatus); - ConnectMsg = i18n("Connected: %1, %2, profile \"%3\"").arg(QString(GlobalConfig->currentProfile->getGateway())).arg(durationString).arg(QString(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]")); + ConnectMsg = i18n("Connected: %1, %2, profile \"%3\"").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(durationString).tqarg(TQString(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]")); - LogMsg = i18n("Successful connected to server \"%1\" at %2, profile \"%3\".").arg(QString(GlobalConfig->currentProfile->getGateway())).arg(QDateTime::currentDateTime().toString(Qt::TextDate)).arg(QString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]"); + LogMsg = i18n("Successful connected to server \"%1\" at %2, profile \"%3\".").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::TextDate)).tqarg(TQString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]"); } else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ssh) { PrettyTypeString = i18n("SSH"); DaemonString = "ssh"; - ToolTipMsg = i18n("status: %3\nserver: %1\nduration: %2").arg(QString(GlobalConfig->currentProfile->getGateway())).arg(durationString).arg(ConnectionStatus); + ToolTipMsg = i18n("status: %3\nserver: %1\nduration: %2").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(durationString).tqarg(ConnectiontqStatus); - ConnectMsg = i18n("%4: %1, %2, profile \"%3\"").arg(QString(GlobalConfig->currentProfile->getGateway())).arg(durationString ).arg(QString(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]")); + ConnectMsg = i18n("%4: %1, %2, profile \"%3\"").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(durationString ).tqarg(TQString(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]")); - LogMsg = i18n("Successful connected to server \"%1\" at %2, profile \"%3\".").arg(GlobalConfig->currentProfile->getGateway()).arg(QDateTime::currentDateTime().toString(Qt::TextDate)).arg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]"); + LogMsg = i18n("Successful connected to server \"%1\" at %2, profile \"%3\".").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::TextDate)).tqarg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]"); } if (status == GlobalConfig->connected) - KNotifyClient::event ( topLevelWidget() ->winId(), "connection established", ConnectMsg ); + KNotifyClient::event ( tqtopLevelWidget() ->winId(), "connection established", ConnectMsg ); } } void KVpnc::importKvpncSettingsClicked() { - QString filename = KFileDialog::getOpenFileName ( QString ( "." ), QString ( "*.xml *.kvpnc" ), 0,i18n ( "KVpnc settings import" ) ); + TQString filename = KFileDialog::getOpenFileName ( TQString ( "." ), TQString ( "*.xml *.kvpnc" ), 0,i18n ( "KVpnc settings import" ) ); if ( !filename.isEmpty() ) { bool openProfileManager=false; - QString RetName=""; + TQString RetName=""; bool ret = GlobalConfig->importKvpncConfig ( filename,RetName,openProfileManager ); if ( ret == true ) { @@ -20121,7 +20121,7 @@ void KVpnc::importKvpncSettingsClicked() void KVpnc::exportKvpncSettingsClicked() { - QString filename = KFileDialog::getOpenFileName ( QString ( "." ), QString ( "*.xml *.kvpnc" ), 0,i18n ( "KVpnc settings export" ) ); + TQString filename = KFileDialog::getOpenFileName ( TQString ( "." ), TQString ( "*.xml *.kvpnc" ), 0,i18n ( "KVpnc settings export" ) ); if ( !filename.isEmpty() ) { @@ -20130,7 +20130,7 @@ void KVpnc::exportKvpncSettingsClicked() } } -void KVpnc::importProfileClicked ( QString file ) +void KVpnc::importProfileClicked ( TQString file ) { ImportProfileDialog dlg ( GlobalConfig, this, i18n ( "Import profile" ), file ); @@ -20152,11 +20152,11 @@ void KVpnc::importProfileClicked ( QString file ) { if ( it->getName() == account->getName() ) { - //account->setName( QString( account->getName() + "_2" ) ); - // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).arg( account->getName() ), i18n( "Name exist, renamed" ) ); + //account->setName( TQString( account->getName() + "_2" ) ); + // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).tqarg( account->getName() ), i18n( "Name exist, renamed" ) ); KMessageBox::error ( 0, i18n ( "Profile name exists!" ), i18n ( "Name Exists" ) ); nameOk = false; - QString newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), QString ( account->getName() + "_2" ), &ok ); + TQString newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), TQString ( account->getName() + "_2" ), &ok ); if (newName.isEmpty()) { KMessageBox::information ( 0, i18n ( "Import was canceled." ) ); @@ -20202,7 +20202,7 @@ void KVpnc::importProfileClicked ( QString file ) GlobalConfig->saveOptions(); // std::cout << "save done" << std::endl; - QString bin = "vpnc"; + TQString bin = "vpnc"; ToolInfo *tool; //std::cout << "Tool (bin): " << bin << std::endl; if ( !GlobalConfig->ToolList->isEmpty() ) @@ -20243,7 +20243,7 @@ void KVpnc::importOpenvpnProfileClicked() importOpenvpnProfileClicked ( "" ); } -void KVpnc::importOpenvpnProfileClicked ( QString file ) +void KVpnc::importOpenvpnProfileClicked ( TQString file ) { ImportOpenvpnProfileDialog dlg ( GlobalConfig, this, i18n ( "Import OpenVPN profile" ), file ); @@ -20264,11 +20264,11 @@ void KVpnc::importOpenvpnProfileClicked ( QString file ) { if ( it->getName() == account->getName() ) { - //account->setName( QString( account->getName() + "_2" ) ); - // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).arg( account->getName() ), i18n( "Name exist, renamed" ) ); + //account->setName( TQString( account->getName() + "_2" ) ); + // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).tqarg( account->getName() ), i18n( "Name exist, renamed" ) ); KMessageBox::error ( this, i18n ( "Profile name exists!" ), i18n ( "Name Exists" ) ); - QString newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), QString ( account->getName() + "_2" ), &ok ); + TQString newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), TQString ( account->getName() + "_2" ), &ok ); if ( ok == false ) { KMessageBox::information ( 0, i18n ( "Import was canceled." ) ); @@ -20312,7 +20312,7 @@ void KVpnc::importOpenvpnProfileClicked ( QString file ) GlobalConfig->saveOptions(); // std::cout << "save done" << std::endl; - QString bin = "openvpn"; + TQString bin = "openvpn"; ToolInfo *tool; //std::cout << "Tool (bin): " << bin << std::endl; if ( !GlobalConfig->ToolList->isEmpty() ) @@ -20341,12 +20341,12 @@ void KVpnc::importOpenvpnProfileClicked ( QString file ) void KVpnc::importIpsecProfileClicked () { - QString filename = KFileDialog::getOpenFileName ( QString ( "." ), QString ( "*.ipsec *.conf" ), 0,i18n ( "IPSec settings import" ) ); + TQString filename = KFileDialog::getOpenFileName ( TQString ( "." ), TQString ( "*.ipsec *.conf" ), 0,i18n ( "IPSec settings import" ) ); if ( !filename.isEmpty() ) { bool openProfileManager=false; - QString RetName=""; + TQString RetName=""; bool ret = GlobalConfig->importIpsecConfig ( filename,RetName,openProfileManager ); if ( ret == true ) { @@ -20380,12 +20380,12 @@ void KVpnc::importIpsecProfileClicked () void KVpnc::importFritzboxProfileClicked () { - QString filename = KFileDialog::getOpenFileName ( QString ( "." ), QString ( "vpnuser*.cfg" ), 0,i18n ( "Fritzbox VPN settings import" ) ); + TQString filename = KFileDialog::getOpenFileName ( TQString ( "." ), TQString ( "vpnuser*.cfg" ), 0,i18n ( "Fritzbox VPN settings import" ) ); if ( !filename.isEmpty() ) { bool openProfileManager=false; - QString RetName=""; + TQString RetName=""; bool ret = GlobalConfig->importFritzboxConfig ( filename,RetName,openProfileManager ); if ( ret == true ) { @@ -20427,30 +20427,30 @@ void KVpnc::addRouteRacoon() // if ( RacoonHelperProcess->normalExit () ) { - // disconnect( RacoonHelperProcess, SIGNAL( processExited () ), this, SLOT( addRouteRacoon() ) ); - // disconnect( RacoonHelperProcess, SIGNAL( readyReadStdout() ), this, SLOT( readFromStdout_racoon_helper() ) ); - // disconnect( RacoonHelperProcess, SIGNAL( readyReadStderr() ), this, SLOT( readFromStderr_racoon_helper() ) ); + // disconnect( RacoonHelperProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT( addRouteRacoon() ) ); + // disconnect( RacoonHelperProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_racoon_helper() ) ); + // disconnect( RacoonHelperProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_racoon_helper() ) ); tmpPath = locateLocal ( "data", "kvpnc/" ); - QString RacoonRouteSetScript = tmpPath + "/set_route." + GlobalConfig->currentProfile->getName() + ".sh"; + TQString RacoonRouteSetScript = tmpPath + "/set_route." + GlobalConfig->currentProfile->getName() + ".sh"; NetworkInterface iface ( GlobalConfig, parent ); - QString defaultinterface = iface.getDefaultInterface(); - QString dev = "lo"; + TQString defaultinterface = iface.getDefaultInterface(); + TQString dev = "lo"; - QString RemoteNetAddr = GlobalConfig->currentProfile->getRemoteNetAddr(); - QString RemoteNetMask = GlobalConfig->currentProfile->getRemoteNetMask(); - QString RemoteNet = RemoteNetAddr + "/" + RemoteNetMask; + TQString RemoteNetAddr = GlobalConfig->currentProfile->getRemoteNetAddr(); + TQString RemoteNetMask = GlobalConfig->currentProfile->getRemoteNetMask(); + TQString RemoteNet = RemoteNetAddr + "/" + RemoteNetMask; tmpInterface = iface.getDefaultInterface(); if ( GlobalConfig->currentProfile->getUseVirtualIP() ) - dev = QString ( dev + ":100" ); + dev = TQString ( dev + ":100" ); else dev = tmpInterface; - QFile RacoonSetRouteScript ( RacoonRouteSetScript ); - QTextStream stream ( &RacoonSetRouteScript ); + TQFile RacoonSetRouteScript ( RacoonRouteSetScript ); + TQTextStream stream ( &RacoonSetRouteScript ); if ( RacoonSetRouteScript.open ( IO_WriteOnly ) ) { if ( GlobalConfig->currentProfile->getReplaceDefaultRoute() ) @@ -20475,12 +20475,12 @@ void KVpnc::addRouteRacoon() } RacoonSetRouteScript.close(); - RouteProcess = new QProcess ( this ); + RouteProcess = new TQProcess ( this ); RouteProcess->addArgument ( GlobalConfig->InterpreterShell ); RouteProcess->addArgument ( RacoonRouteSetScript ); - connect ( RouteProcess, SIGNAL ( readyReadStdout () ), this, SLOT ( readFromStdout_route() ) ); - connect ( RouteProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_route() ) ); + connect ( RouteProcess, TQT_SIGNAL ( readyReadStdout () ), this, TQT_SLOT ( readFromStdout_route() ) ); + connect ( RouteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_route() ) ); if ( !RouteProcess->start ( env ) ) { @@ -20513,26 +20513,26 @@ void KVpnc::delRouteRacoon() // if ( DisconnectProcess != 0 ) { - disconnect ( DisconnectProcess, SIGNAL ( processExited () ), this, SLOT ( delRouteRacoon() ) ); + disconnect ( DisconnectProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( delRouteRacoon() ) ); tmpPath = locateLocal ( "data", "kvpnc/" ); - QString RacoonRouteSetScript = tmpPath + "/remove_route." + GlobalConfig->currentProfile->getName() + ".sh"; + TQString RacoonRouteSetScript = tmpPath + "/remove_route." + GlobalConfig->currentProfile->getName() + ".sh"; NetworkInterface iface ( GlobalConfig, parent ); - QString dev = "lo"; + TQString dev = "lo"; - QString RemoteNetAddr = GlobalConfig->currentProfile->getRemoteNetAddr(); - QString RemoteNetMask = GlobalConfig->currentProfile->getRemoteNetMask(); - QString RemoteNet = RemoteNetAddr + "/" + RemoteNetMask; + TQString RemoteNetAddr = GlobalConfig->currentProfile->getRemoteNetAddr(); + TQString RemoteNetMask = GlobalConfig->currentProfile->getRemoteNetMask(); + TQString RemoteNet = RemoteNetAddr + "/" + RemoteNetMask; tmpInterface = iface.getDefaultInterface(); if ( GlobalConfig->currentProfile->getUseVirtualIP() ) - dev = QString ( dev + ":100" ); + dev = TQString ( dev + ":100" ); else dev = tmpInterface; - QFile RacoonSetRouteScript ( RacoonRouteSetScript ); - QTextStream stream ( &RacoonSetRouteScript ); + TQFile RacoonSetRouteScript ( RacoonRouteSetScript ); + TQTextStream stream ( &RacoonSetRouteScript ); if ( RacoonSetRouteScript.open ( IO_WriteOnly ) ) { if ( GlobalConfig->currentProfile->getReplaceDefaultRoute() ) @@ -20553,13 +20553,13 @@ void KVpnc::delRouteRacoon() } RacoonSetRouteScript.close(); - RouteProcess = new QProcess ( this ); + RouteProcess = new TQProcess ( this ); RouteProcess->addArgument ( GlobalConfig->InterpreterShell ); RouteProcess->addArgument ( RacoonRouteSetScript ); - connect ( RouteProcess, SIGNAL ( readyReadStdout () ), this, SLOT ( readFromStdout_route() ) ); - connect ( RouteProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_route() ) ); - // connect( DisconnectProcess, SIGNAL( processExited () ), this, SLOT( removeIptablesRacoon() ) ); + connect ( RouteProcess, TQT_SIGNAL ( readyReadStdout () ), this, TQT_SLOT ( readFromStdout_route() ) ); + connect ( RouteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_route() ) ); + // connect( DisconnectProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT( removeIptablesRacoon() ) ); if ( !RouteProcess->start ( env ) ) { @@ -20592,16 +20592,16 @@ void KVpnc::doIptablesRacoon() // if ( ConnectProcess->normalExit () ) { // if ( ConnectProcess ) - // disconnect( ConnectProcess, SIGNAL( processExited () ), this, SLOT( doIptablesRacoon() ) ); + // disconnect( ConnectProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT( doIptablesRacoon() ) ); /* iptables -I INPUT -p 50 -i $IFACE -s $VPNGW_IP -j ACCEPT */ putenv ( ( char* ) ( "LC_ALL=C" ) ); - IptablesProcess = new QProcess ( this ); + IptablesProcess = new TQProcess ( this ); IptablesProcess->addArgument ( GlobalConfig->InterpreterShell ); IptablesProcess->addArgument ( tmpPath + "iptables." + GlobalConfig->currentProfile->getName() + ".add_racoon.sh" ); - // connect( IptablesProcess, SIGNAL( processExited () ), this, SLOT( doRacoon() ) ); + // connect( IptablesProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT( doRacoon() ) ); if ( !IptablesProcess->start ( env ) ) { @@ -20630,8 +20630,8 @@ void KVpnc::doPingKickupTunnel() GlobalConfig->appendLogEntry ( i18n ( "Sending ping for kicking up the tunnel..." ), GlobalConfig->debug ); /* first: kick up the tunnel */ putenv ( ( char* ) ( "LC_ALL=C" ) ); - QProcess PingProcess; - QString PathToPing = ""; + TQProcess PingProcess; + TQString PathToPing = ""; ToolInfo *Tool; for ( Tool = GlobalConfig->ToolList->first();Tool;Tool = GlobalConfig->ToolList->next() ) { @@ -20660,9 +20660,9 @@ void KVpnc::doPingKickupTunnel() void KVpnc::doRacoon() { - disconnect ( RacoonHelperProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_racoon_helper() ) ); - disconnect ( RacoonHelperProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_racoon_helper() ) ); - disconnect ( RacoonHelperProcess, SIGNAL ( processExited () ), this, SLOT ( doRacoon() ) ); + disconnect ( RacoonHelperProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_racoon_helper() ) ); + disconnect ( RacoonHelperProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_racoon_helper() ) ); + disconnect ( RacoonHelperProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doRacoon() ) ); @@ -20674,10 +20674,10 @@ void KVpnc::doRacoon() /* /usr/sbin/racoon -f -l */ - QFile f ( tmpPath + "racoon." + GlobalConfig->currentProfile->getName() + ".log" ); + TQFile f ( tmpPath + "racoon." + GlobalConfig->currentProfile->getName() + ".log" ); if ( f.exists() ) f.remove(); - QTextStream s ( &f ); + TQTextStream s ( &f ); if ( f.open ( IO_WriteOnly ) ) { s << "\n"; @@ -20686,7 +20686,7 @@ void KVpnc::doRacoon() s.unsetDevice(); putenv ( ( char* ) ( "LC_ALL=C" ) ); RacoonProcess = 0; - RacoonProcess = new QProcess ( this ); + RacoonProcess = new TQProcess ( this ); RacoonProcess->addArgument ( GlobalConfig->pathToRacoon ); RacoonProcess->addArgument ( "-F" ); // foreground we want :) // RacoonProcess->addArgument ( "-v" ); @@ -20698,16 +20698,16 @@ void KVpnc::doRacoon() if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( "racoon: " + GlobalConfig->pathToRacoon + " -f " + tmpPath + "/racoon." + GlobalConfig->currentProfile->getName() + ".conf", GlobalConfig->debug ); -// RacoonProcess->setCommunication ( QProcess::Stdin | QProcess::Stdout | QProcess::Stderr | QProcess::DupStderr ); +// RacoonProcess->setCommunication ( TQProcess::Stdin | TQProcess::Stdout | TQProcess::Stderr | TQProcess::DupStderr ); // RacoonProcess->closeStdin(); - connect ( RacoonProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_racoon() ) ); - connect ( RacoonProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_racoon() ) ); + connect ( RacoonProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_racoon() ) ); + connect ( RacoonProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_racoon() ) ); if ( !RacoonProcess->start ( env ) ) { - disconnect ( RacoonProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_racoon() ) ); - disconnect ( RacoonProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_racoon() ) ); + disconnect ( RacoonProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_racoon() ) ); + disconnect ( RacoonProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_racoon() ) ); delete RacoonProcess; RacoonProcess=0L; KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( "racoon" ) ); @@ -20730,7 +20730,7 @@ void KVpnc::doRacoon() // GlobalConfig->status = GlobalConfig->disconnected; // timer.stop(); - // connect( &durationTimer, SIGNAL( timeout() ), this, SLOT( slotDurationEvent() ) ); + // connect( &durationTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotDurationEvent() ) ); // durationTimer.start( 1000, FALSE ); } } @@ -20750,8 +20750,8 @@ void KVpnc::stopRacoon() GlobalConfig->appendLogEntry ( i18n ( "Stopping %1." ).arg ( "racoon" ), GlobalConfig->debug ); putenv ( ( char* ) ( "LC_ALL=C" ) ); - RacoonctlProcess = new QProcess ( this ); - QString PathToRacoonctl = ""; + RacoonctlProcess = new TQProcess ( this ); + TQString PathToRacoonctl = ""; ToolInfo* Tool = Utils ( GlobalConfig ).getToolInfo ( "racoonctl" ); PathToRacoonctl = Tool->PathToExec; @@ -20760,29 +20760,29 @@ void KVpnc::stopRacoon() RacoonctlProcess->addArgument ( GlobalConfig->TmpGatewayIP ); - connect ( RacoonctlProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_racoonctl() ) ); - connect ( RacoonctlProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_racoonctl() ) ); - connect ( RacoonctlProcess, SIGNAL ( processExited () ), this, SLOT ( racoonctlExited() ) ); + connect ( RacoonctlProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_racoonctl() ) ); + connect ( RacoonctlProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_racoonctl() ) ); + connect ( RacoonctlProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( racoonctlExited() ) ); if ( !RacoonctlProcess->start ( env ) ) - KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( QString ( "racoonctl vpn-disconnect "+GlobalConfig->TmpGatewayIP ) ) ); + KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( TQString ( "racoonctl vpn-disconnect "+GlobalConfig->TmpGatewayIP ) ) ); else { if ( GlobalConfig->KvpncDebugLevel > 2 ) - GlobalConfig->appendLogEntry ( i18n ( "%1 started. " ).arg ( QString ( "racoonctl vpn-disconnect "+GlobalConfig->TmpGatewayIP ) ), GlobalConfig->info ); + GlobalConfig->appendLogEntry ( i18n ( "%1 started. " ).arg ( TQString ( "racoonctl vpn-disconnect "+GlobalConfig->TmpGatewayIP ) ), GlobalConfig->info ); while ( RacoonctlProcess->isRunning() ) { usleep ( 500 ); - // parent->QApplication::processEvents(); + // parent->TQApplication::processEvents(); } if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry ( i18n ( "\"%1\" finished." ).arg ( QString ( "racoonctl vpn-disconnect "+GlobalConfig->TmpGatewayIP ) ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "\"%1\" finished." ).arg ( TQString ( "racoonctl vpn-disconnect "+GlobalConfig->TmpGatewayIP ) ), GlobalConfig->debug ); } - disconnect ( RacoonctlProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_racoonctl() ) ); - disconnect ( RacoonctlProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_racoonctl() ) ); - disconnect ( RacoonctlProcess, SIGNAL ( processExited () ), this, SLOT ( racoonctlExited() ) ); + disconnect ( RacoonctlProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_racoonctl() ) ); + disconnect ( RacoonctlProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_racoonctl() ) ); + disconnect ( RacoonctlProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( racoonctlExited() ) ); delete RacoonctlProcess; RacoonctlProcess=0L; } @@ -20790,20 +20790,20 @@ void KVpnc::stopRacoon() void KVpnc::doTailRacoonLog() { putenv ( ( char* ) ( "LC_ALL=C" ) ); - RacoonTailProcess = new QProcess ( this ); + RacoonTailProcess = new TQProcess ( this ); RacoonTailProcess->addArgument ( GlobalConfig->pathToTail ); RacoonTailProcess->addArgument ( "-n" ); RacoonTailProcess->addArgument ( "1000" ); RacoonTailProcess->addArgument ( "-f" ); RacoonTailProcess->addArgument ( tmpPath + "racoon." + GlobalConfig->currentProfile->getName() + ".log" ); - connect ( RacoonTailProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_tail_racoon() ) ); - connect ( RacoonTailProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_tail_racoon() ) ); + connect ( RacoonTailProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_tail_racoon() ) ); + connect ( RacoonTailProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_tail_racoon() ) ); if ( !RacoonTailProcess->start ( env ) ) { - disconnect ( RacoonTailProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_tail_racoon() ) ); - disconnect ( RacoonTailProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_tail_racoon() ) ); + disconnect ( RacoonTailProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_tail_racoon() ) ); + disconnect ( RacoonTailProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_tail_racoon() ) ); delete RacoonTailProcess; RacoonTailProcess=0L; KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( GlobalConfig->pathToTail+" -f " + tmpPath + "racoon." + GlobalConfig->currentProfile->getName() + ".log" ) ); @@ -20813,7 +20813,7 @@ void KVpnc::doTailRacoonLog() else { // status=connected; - // setGuiStatus(connected); + // setGuitqStatus(connected); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( GlobalConfig->pathToTail+" -f " + tmpPath + "racoon." + GlobalConfig->currentProfile->getName() + ".log" ), GlobalConfig->debug ); @@ -20827,10 +20827,10 @@ void KVpnc::removeIptablesRacoon() // if ( DisconnectProcess != 0 ) { // if ( DisconnectProcess ) - // disconnect( DisconnectProcess, SIGNAL( processExited () ), this, SLOT( removeIptablesRacoon() ) ); + // disconnect( DisconnectProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT( removeIptablesRacoon() ) ); putenv ( ( char* ) ( "LC_ALL=C" ) ); - DisconnectProcess = new QProcess ( this ); + DisconnectProcess = new TQProcess ( this ); DisconnectProcess->addArgument ( GlobalConfig->InterpreterShell ); DisconnectProcess->addArgument ( tmpPath + "iptables." + GlobalConfig->currentProfile->getName() + ".remove_racoon.sh" ); if ( !DisconnectProcess->start ( env ) ) @@ -20846,7 +20846,7 @@ void KVpnc::removeIptablesRacoon() while ( DisconnectProcess->isRunning() ) { usleep ( 500 ); - // parent->QApplication::processEvents(); + // parent->TQApplication::processEvents(); } } delete DisconnectProcess; @@ -20857,20 +20857,20 @@ void KVpnc::removeIptablesRacoon() void KVpnc::removeSetkey() { if ( DisconnectProcess ) - disconnect ( DisconnectProcess, SIGNAL ( processExited () ), this, SLOT ( removeSetkey() ) ); + disconnect ( DisconnectProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( removeSetkey() ) ); putenv ( ( char* ) ( "LC_ALL=C" ) ); - RemoveSetkeyProcess = new QProcess ( this ); + RemoveSetkeyProcess = new TQProcess ( this ); RemoveSetkeyProcess->addArgument ( GlobalConfig->InterpreterShell ); RemoveSetkeyProcess->addArgument ( tmpPath + "setkey." + GlobalConfig->currentProfile->getName() + ".remove_setkey.sh" ); - // connect( RemoveSetkeyProcess, SIGNAL( readyReadStdout() ), this, SLOT( readFromStdout_remove_setkey() ) ); - // connect( RemoveSetkeyProcess, SIGNAL( readyReadStderr() ), this, SLOT( readFromStderr_remove_setkey() ) ); - // connect( RemoveSetkeyProcess, SIGNAL( processExited () ), this, SLOT( delRouteRacoon() ) ); + // connect( RemoveSetkeyProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_remove_setkey() ) ); + // connect( RemoveSetkeyProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_remove_setkey() ) ); + // connect( RemoveSetkeyProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT( delRouteRacoon() ) ); if ( !RemoveSetkeyProcess->start ( env ) ) { - // KMessageBox::error( this, i18n( "\"%1\" start failed!" ).arg( "setkey (remove)" ) ); + // KMessageBox::error( this, i18n( "\"%1\" start failed!" ).tqarg( "setkey (remove)" ) ); GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "setkey (remove)" ) , GlobalConfig->error ); } else @@ -20880,7 +20880,7 @@ void KVpnc::removeSetkey() while ( RemoveSetkeyProcess->isRunning() ) { usleep ( 500 ); - // parent->QApplication::processEvents(); + // parent->TQApplication::processEvents(); } } delete RemoveSetkeyProcess; @@ -20893,12 +20893,12 @@ void KVpnc::doIptablesFreeswan() { // if ( ConnectProcess->normalExit () ) { - // disconnect( ConnectProcess, SIGNAL( processExited () ), this, SLOT( doIptablesFreeswan() ) ); + // disconnect( ConnectProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT( doIptablesFreeswan() ) ); /* iptables -I INPUT -p 50 -i $IFACE -s $VPNGW_IP -j ACCEPT */ putenv ( ( char* ) ( "LC_ALL=C" ) ); - IptablesProcess = new QProcess ( this ); + IptablesProcess = new TQProcess ( this ); IptablesProcess->addArgument ( GlobalConfig->InterpreterShell ); IptablesProcess->addArgument ( tmpPath + "iptables." + GlobalConfig->currentProfile->getName() + ".add_ipsec_freeswan.sh" ); @@ -20916,7 +20916,7 @@ void KVpnc::doIptablesFreeswan() while ( IptablesProcess->isRunning() ) { usleep ( 500 ); - // parent->QApplication::processEvents(); + // parent->TQApplication::processEvents(); } setFirewallAfterConnect(); @@ -20931,14 +20931,14 @@ void KVpnc::doIptablesFreeswan() void KVpnc::addRouteIpsec() { tmpPath = locateLocal ( "data", "kvpnc/" ); - QString IpsecRouteSetScript = tmpPath + "/set_route." + GlobalConfig->currentProfile->getName() + ".sh"; + TQString IpsecRouteSetScript = tmpPath + "/set_route." + GlobalConfig->currentProfile->getName() + ".sh"; NetworkInterface iface ( GlobalConfig, parent ); - QString defaultinterface = iface.getDefaultInterface(); - QString dev = "lo"; + TQString defaultinterface = iface.getDefaultInterface(); + TQString dev = "lo"; - QString RemoteNetAddr = GlobalConfig->currentProfile->getRemoteNetAddr(); - QString RemoteNetMask = GlobalConfig->currentProfile->getRemoteNetMask(); - QString RemoteNet = RemoteNetAddr + "/" + RemoteNetMask; + TQString RemoteNetAddr = GlobalConfig->currentProfile->getRemoteNetAddr(); + TQString RemoteNetMask = GlobalConfig->currentProfile->getRemoteNetMask(); + TQString RemoteNet = RemoteNetAddr + "/" + RemoteNetMask; if ( iface.interfaceExist ( "ipsec0" ) ) tmpInterface = "ipsec0"; @@ -20946,12 +20946,12 @@ void KVpnc::addRouteIpsec() tmpInterface = iface.getDefaultInterface(); if ( GlobalConfig->currentProfile->getUseVirtualIP() ) - dev = QString ( dev + ":100" ); + dev = TQString ( dev + ":100" ); else dev = tmpInterface; - QFile IpsecSetRouteScript ( IpsecRouteSetScript ); - QTextStream stream ( &IpsecSetRouteScript ); + TQFile IpsecSetRouteScript ( IpsecRouteSetScript ); + TQTextStream stream ( &IpsecSetRouteScript ); if ( IpsecSetRouteScript.open ( IO_WriteOnly ) ) { if ( GlobalConfig->currentProfile->getReplaceDefaultRoute() ) @@ -20964,12 +20964,12 @@ void KVpnc::addRouteIpsec() // stream << GlobalConfig->pathToRoute << " add -net " << RemoteNet << " " << dev << "\n"; // set by opnswan IpsecSetRouteScript.close(); - RouteProcess = new QProcess ( this ); + RouteProcess = new TQProcess ( this ); RouteProcess->addArgument ( GlobalConfig->InterpreterShell ); RouteProcess->addArgument ( IpsecRouteSetScript ); - connect ( RouteProcess, SIGNAL ( readyReadStdout () ), this, SLOT ( readFromStdout_route() ) ); - connect ( RouteProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_route() ) ); + connect ( RouteProcess, TQT_SIGNAL ( readyReadStdout () ), this, TQT_SLOT ( readFromStdout_route() ) ); + connect ( RouteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_route() ) ); if ( !RouteProcess->start ( env ) ) { @@ -20983,16 +20983,16 @@ void KVpnc::addRouteIpsec() { if ( GlobalConfig->currentProfile->getReplaceDefaultRoute() ) GlobalConfig->appendLogEntry ( i18n ( "route (%1): route add default gw " ).arg ( "ipsec" ) + GlobalConfig->currentProfile->getGateway() + " " + tmpInterface, GlobalConfig->debug ); - // GlobalConfig->appendLogEntry ( i18n( "route (%1): route add -net " ).arg("ipsec") + RemoteNet << " " + tmpInterface, GlobalConfig->debug ); + // GlobalConfig->appendLogEntry ( i18n( "route (%1): route add -net " ).tqarg("ipsec") + RemoteNet << " " + tmpInterface, GlobalConfig->debug ); while ( RouteProcess->isRunning() ) { usleep ( 500 ); - // parent->QApplication::processEvents(); + // parent->TQApplication::processEvents(); } } } - disconnect ( RouteProcess, SIGNAL ( readyReadStdout () ), this, SLOT ( readFromStdout_route() ) ); - disconnect ( RouteProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_route() ) ); + disconnect ( RouteProcess, TQT_SIGNAL ( readyReadStdout () ), this, TQT_SLOT ( readFromStdout_route() ) ); + disconnect ( RouteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_route() ) ); delete RouteProcess; RouteProcess=0L; } @@ -21001,13 +21001,13 @@ void KVpnc::addRouteIpsec() void KVpnc::delRouteIpsec() { tmpPath = locateLocal ( "data", "kvpnc/" ); - QString IpsecRouteSetScript = tmpPath + "/remove_route." + GlobalConfig->currentProfile->getName() + ".sh"; + TQString IpsecRouteSetScript = tmpPath + "/remove_route." + GlobalConfig->currentProfile->getName() + ".sh"; NetworkInterface iface ( GlobalConfig, parent ); - QString dev = "lo"; + TQString dev = "lo"; - QString RemoteNetAddr = GlobalConfig->currentProfile->getRemoteNetAddr(); - QString RemoteNetMask = GlobalConfig->currentProfile->getRemoteNetMask(); - QString RemoteNet = RemoteNetAddr + "/" + RemoteNetMask; + TQString RemoteNetAddr = GlobalConfig->currentProfile->getRemoteNetAddr(); + TQString RemoteNetMask = GlobalConfig->currentProfile->getRemoteNetMask(); + TQString RemoteNet = RemoteNetAddr + "/" + RemoteNetMask; if ( iface.interfaceExist ( "ipsec0" ) ) tmpInterface = "ipsec0"; @@ -21015,12 +21015,12 @@ void KVpnc::delRouteIpsec() tmpInterface = iface.getDefaultInterface(); if ( GlobalConfig->currentProfile->getUseVirtualIP() ) - dev = QString ( dev + ":100" ); + dev = TQString ( dev + ":100" ); else dev = tmpInterface; - QFile IpsecSetRouteScript ( IpsecRouteSetScript ); - QTextStream stream ( &IpsecSetRouteScript ); + TQFile IpsecSetRouteScript ( IpsecRouteSetScript ); + TQTextStream stream ( &IpsecSetRouteScript ); if ( IpsecSetRouteScript.open ( IO_WriteOnly ) ) { stream << "#!"<< GlobalConfig->InterpreterShell << "\n"; @@ -21035,16 +21035,16 @@ void KVpnc::delRouteIpsec() stream << GlobalConfig->pathToRoute << " del -net " << RemoteNet << " " << dev << "\n"; IpsecSetRouteScript.close(); - RouteProcess = new QProcess ( this ); + RouteProcess = new TQProcess ( this ); RouteProcess->addArgument ( GlobalConfig->InterpreterShell ); RouteProcess->addArgument ( IpsecRouteSetScript ); - connect ( RouteProcess, SIGNAL ( readyReadStdout () ), this, SLOT ( readFromStdout_route() ) ); - connect ( RouteProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_route() ) ); + connect ( RouteProcess, TQT_SIGNAL ( readyReadStdout () ), this, TQT_SLOT ( readFromStdout_route() ) ); + connect ( RouteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_route() ) ); if ( !RouteProcess->start ( env ) ) { - // KMessageBox::error( this, i18n( "\"%1\" start failed!" ).arg( "del route ("+IpsecType+")" ) ); + // KMessageBox::error( this, i18n( "\"%1\" start failed!" ).tqarg( "del route ("+IpsecType+")" ) ); GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "del route (" + IpsecType + ")" ) , GlobalConfig->error ); } else @@ -21055,11 +21055,11 @@ void KVpnc::delRouteIpsec() while ( RouteProcess->isRunning() ) { usleep ( 500 ); - // parent->QApplication::processEvents(); + // parent->TQApplication::processEvents(); } } - disconnect ( RouteProcess, SIGNAL ( readyReadStdout () ), this, SLOT ( readFromStdout_route() ) ); - disconnect ( RouteProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_route() ) ); + disconnect ( RouteProcess, TQT_SIGNAL ( readyReadStdout () ), this, TQT_SLOT ( readFromStdout_route() ) ); + disconnect ( RouteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_route() ) ); delete RouteProcess; RouteProcess=0L; } @@ -21069,15 +21069,15 @@ void KVpnc::removeIptablesFreeswan() { // if ( DisconnectProcess->normalExit () ) { - // disconnect( DisconnectProcess, SIGNAL( processExited () ), this, SLOT( removeIptablesFreeswan() ) ); + // disconnect( DisconnectProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT( removeIptablesFreeswan() ) ); putenv ( ( char* ) ( "LC_ALL=C" ) ); - DisconnectProcess = new QProcess ( this ); + DisconnectProcess = new TQProcess ( this ); DisconnectProcess->addArgument ( GlobalConfig->InterpreterShell ); DisconnectProcess->addArgument ( tmpPath + "iptables." + GlobalConfig->currentProfile->getName() + ".remove_ipsec_freeswan.sh" ); if ( !DisconnectProcess->start ( env ) ) { - // KMessageBox::error( this, i18n( "\"%1\" start failed!" ).arg( "iptables." + GlobalConfig->currentProfile->getName() + ".remove_ipsec_freeswan.sh" ) ); + // KMessageBox::error( this, i18n( "\"%1\" start failed!" ).tqarg( "iptables." + GlobalConfig->currentProfile->getName() + ".remove_ipsec_freeswan.sh" ) ); GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "iptables." + GlobalConfig->currentProfile->getName() + ".remove_ipsec_freeswan.sh" ), GlobalConfig->error ); } else @@ -21087,7 +21087,7 @@ void KVpnc::removeIptablesFreeswan() while ( DisconnectProcess->isRunning() ) { usleep ( 500 ); - // parent->QApplication::processEvents(); + // parent->TQApplication::processEvents(); } } delete DisconnectProcess; @@ -21100,23 +21100,23 @@ void KVpnc::doPingTest() /* ping -c3 -I */ - QString LocalIP; - QString Interface; + TQString LocalIP; + TQString Interface; NetworkInterface iface ( GlobalConfig, parent ); //LocalIP = iface.getInterfaceIP( iface.getDefaultInterface() ); if ( GlobalConfig->currentProfile->getNetworkDevice().isEmpty() ) Interface = iface.getInterfaceIP ( iface.getDefaultInterface() ); else Interface = GlobalConfig->currentProfile->getNetworkDevice(); - QString PingHostIP = GlobalConfig->currentProfile->getPingHostIP(); + TQString PingHostIP = GlobalConfig->currentProfile->getPingHostIP(); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "Host for ping: %1" ).arg ( PingHostIP ), GlobalConfig->debug ); /* first: kick up the tunnel */ putenv ( ( char* ) ( "LC_ALL=C" ) ); - PingProcess = new QProcess ( this ); + PingProcess = new TQProcess ( this ); - QString PathToPing = ""; + TQString PathToPing = ""; ToolInfo *Tool; for ( Tool = GlobalConfig->ToolList->first();Tool;Tool = GlobalConfig->ToolList->next() ) { @@ -21148,9 +21148,9 @@ void KVpnc::doPingTest() //PingProcess->addArgument( Interface ); PingProcess->addArgument ( PingHostIP ); - connect ( PingProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ping() ) ); - connect ( PingProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ping() ) ); - connect ( PingProcess, SIGNAL ( processExited() ), this, SLOT ( pingTestExited() ) ); + connect ( PingProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ping() ) ); + connect ( PingProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ping() ) ); + connect ( PingProcess, TQT_SIGNAL ( processExited() ), this, TQT_SLOT ( pingTestExited() ) ); pingtest = true; @@ -21170,9 +21170,9 @@ void KVpnc::doPingTest() { sleep ( 1 ); } - disconnect ( PingProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ping() ) ); - disconnect ( PingProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ping() ) ); - disconnect ( PingProcess, SIGNAL ( processExited() ), this, SLOT ( pingTestExited() ) ); + disconnect ( PingProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ping() ) ); + disconnect ( PingProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ping() ) ); + disconnect ( PingProcess, TQT_SIGNAL ( processExited() ), this, TQT_SLOT ( pingTestExited() ) ); } } @@ -21182,15 +21182,15 @@ void KVpnc::doPingTest() void KVpnc::pingTestExited() { - disconnect ( PingProcess, SIGNAL ( processExited () ), this, SLOT ( pingTestExited() ) ); - // disconnect( PingProcess, SIGNAL( readyReadStdout() ), this, SLOT( readFromStdout_ping() ) ); - // disconnect( PingProcess, SIGNAL( readyReadStderr() ), this, SLOT( readFromStderr_ping() ) ); + disconnect ( PingProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( pingTestExited() ) ); + // disconnect( PingProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_ping() ) ); + // disconnect( PingProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_ping() ) ); // pingtest = false; } void KVpnc::vpncStarted() { - disconnect ( VpncProcess, SIGNAL ( processExited () ), this, SLOT ( vpncStarted() ) ); + disconnect ( VpncProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( vpncStarted() ) ); /* doing some after tunnel is up */ @@ -21198,14 +21198,14 @@ void KVpnc::vpncStarted() // VpncProcess->addArgument( GlobalConfig->InterpreterShell ); // VpncProcess->addArgument( VpncConnectScript ); // - // connect( VpncProcess, SIGNAL( readyReadStdout() ), this, SLOT( readOutputFrom_vpnc() ) ); + // connect( VpncProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutputFrom_vpnc() ) ); // // if ( !VpncProcess->start(env) ) { - // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "vpnc-connect" ) ); + // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( "vpnc-connect" ) ); // } else { - // GlobalConfig->appendLogEntry ( i18n( "\"%1\" started." ).arg("vpnc-connect"),GlobalConfig->info ); + // GlobalConfig->appendLogEntry ( i18n( "\"%1\" started." ).tqarg("vpnc-connect"),GlobalConfig->info ); // - // // connect( &timer, SIGNAL( timeout() ), this, SLOT( slotConnectTimedOut() ) ); + // // connect( &timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotConnectTimedOut() ) ); // // timer.start( tryConnectTimeout * 1000, FALSE ); // // // // mw->buttonConnect->setEnabled( false ); @@ -21223,7 +21223,7 @@ void KVpnc::racoonStarted() int tryCounter=0; while ( !AdminSockExist && tryCounter < 20 ) { - AdminSockExist=QFile ( "/var/run/racoon/racoon.sock" ).exists(); + AdminSockExist=TQFile ( "/var/run/racoon/racoon.sock" ).exists(); tryCounter++; if ( tryCounter ==20 ) break; @@ -21247,8 +21247,8 @@ void KVpnc::racoonStarted() } putenv ( ( char* ) ( "LC_ALL=C" ) ); - RacoonctlProcess = new QProcess ( this ); - QString PathToRacoonctl = ""; + RacoonctlProcess = new TQProcess ( this ); + TQString PathToRacoonctl = ""; ToolInfo* Tool = Utils ( GlobalConfig ).getToolInfo ( "racoonctl" ); PathToRacoonctl = Tool->PathToExec; @@ -21263,24 +21263,24 @@ void KVpnc::racoonStarted() RacoonctlProcess->addArgument ( GlobalConfig->TmpGatewayIP ); - connect ( RacoonctlProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_racoonctl() ) ); - connect ( RacoonctlProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_racoonctl() ) ); - connect ( RacoonctlProcess, SIGNAL ( processExited () ), this, SLOT ( racoonctlExited() ) ); + connect ( RacoonctlProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_racoonctl() ) ); + connect ( RacoonctlProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_racoonctl() ) ); + connect ( RacoonctlProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( racoonctlExited() ) ); if ( !RacoonctlProcess->start ( env ) ) if ( GlobalConfig->currentProfile->getAuthWithUsernameAndPassword() ) - KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( QString ( "racoonctl vpn-connect -u "+GlobalConfig->TmpUsername+" "+GlobalConfig->TmpGatewayIP ) ) ); + KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( TQString ( "racoonctl vpn-connect -u "+GlobalConfig->TmpUsername+" "+GlobalConfig->TmpGatewayIP ) ) ); else - KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( QString ( "racoonctl vpn-connect "+GlobalConfig->TmpGatewayIP ) ) ); + KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( TQString ( "racoonctl vpn-connect "+GlobalConfig->TmpGatewayIP ) ) ); else { if ( GlobalConfig->KvpncDebugLevel > 0 ) { if ( GlobalConfig->currentProfile->getAuthWithUsernameAndPassword() ) - GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( QString ( "racoonctl vpn-connect -u "+GlobalConfig->TmpUsername+" "+GlobalConfig->TmpGatewayIP ) ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( TQString ( "racoonctl vpn-connect -u "+GlobalConfig->TmpUsername+" "+GlobalConfig->TmpGatewayIP ) ), GlobalConfig->debug ); else - GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( QString ( "racoonctl vpn-connect "+GlobalConfig->TmpGatewayIP ) ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( TQString ( "racoonctl vpn-connect "+GlobalConfig->TmpGatewayIP ) ), GlobalConfig->debug ); } if ( GlobalConfig->currentProfile->getAuthWithUsernameAndPassword() ) @@ -21292,7 +21292,7 @@ void KVpnc::racoonStarted() if ( GlobalConfig->VpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( "[racoonctl] " + i18n ( "User password requested, send it...\n" ), GlobalConfig->debug ); - QString UserPassStr = ""; + TQString UserPassStr = ""; //if ( !GlobalConfig->currentProfile->getSaveUserPassword() || AuthRetry ) UserPassStr = GlobalConfig->TmpPassword; //else @@ -21318,9 +21318,9 @@ void KVpnc::racoonStarted() GlobalConfig->appPointer->processEvents(); usleep ( 500 ); } - disconnect ( RacoonctlProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_racoonctl() ) ); - disconnect ( RacoonctlProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_racoonctl() ) ); - disconnect ( RacoonctlProcess, SIGNAL ( processExited () ), this, SLOT ( racoonctlExited() ) ); + disconnect ( RacoonctlProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_racoonctl() ) ); + disconnect ( RacoonctlProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_racoonctl() ) ); + disconnect ( RacoonctlProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( racoonctlExited() ) ); delete RacoonctlProcess; RacoonctlProcess=0L; } @@ -21335,9 +21335,9 @@ void KVpnc::racoonStarted() // // GlobalConfig->status = GlobalConfig->connected; // - // connect( &durationTimer, SIGNAL( timeout() ), this, SLOT( slotDurationEvent() ) ); + // connect( &durationTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotDurationEvent() ) ); // durationTimer.start( 1000, FALSE ); - // setGuiStatus( connected ); + // setGuitqStatus( connected ); // // setFirewallAfterConnect(); // if ( GlobalConfig->currentProfile->getExecuteCmdAfterConnect() ) @@ -21353,9 +21353,9 @@ void KVpnc::racoonStarted() void KVpnc::ipsecStarted() { - disconnect ( IpsecStartProcess, SIGNAL ( processExited () ), this, SLOT ( ipsecStarted() ) ); - disconnect ( IpsecStartProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsec() ) ); - disconnect ( IpsecStartProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsec() ) ); + disconnect ( IpsecStartProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( ipsecStarted() ) ); + disconnect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsec() ) ); + disconnect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsec() ) ); delete IpsecStartProcess; IpsecStartProcess=0L; @@ -21365,7 +21365,7 @@ void KVpnc::ipsecStarted() // GlobalConfig->appendLogEntry ( "[ipsec] " + i18n ( "Starting connection \"%1\"..." ).arg ( GlobalConfig->currentProfile->getName() ) , GlobalConfig->debug ); // /* Kick up the connection */ -// IpsecProcess = new QProcess ( this ); +// IpsecProcess = new TQProcess ( this ); // // // IpsecProcess->addArgument ( GlobalConfig->pathToIpsec ); // IpsecProcess->addArgument ( "auto" ); @@ -21375,9 +21375,9 @@ void KVpnc::ipsecStarted() // IpsecProcess->addArgument ( GlobalConfig->currentProfile->getName() ); // // -// connect ( IpsecStartProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStderr_ipsec() ) ); -// connect ( IpsecStartProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsec() ) ); -// // connect( IpsecStartProcess, SIGNAL( processExited () ), this, SLOT( doRouteFreeswan() ) ); +// connect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStderr_ipsec() ) ); +// connect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsec() ) ); +// // connect( IpsecStartProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT( doRouteFreeswan() ) ); // // if ( !IpsecStartProcess->start(env) ) // { @@ -21393,15 +21393,15 @@ void KVpnc::ipsecStarted() // { // sleep(1); // } -// disconnect ( IpsecStartProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStderr_ipsec() ) ); -// disconnect ( IpsecStartProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsec() ) ); -// // disconnect( IpsecStartProcess, SIGNAL( processExited () ), this, SLOT( doRouteFreeswan() ) ); +// disconnect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStderr_ipsec() ) ); +// disconnect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsec() ) ); +// // disconnect( IpsecStartProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT( doRouteFreeswan() ) ); // delete IpsecStartProcess; // IpsecStartProcess=0L; // } IpsecStatusCheck=true; - checkIpsecWhackStatus(); + checkIpsecWhacktqStatus(); IpsecStatusCheck=false; if ( GlobalConfig->KvpncDebugLevel > 0 ) @@ -21411,18 +21411,18 @@ void KVpnc::ipsecStarted() connectCounter=0; sleep ( 1 ); putenv ( ( char* ) ( "LC_ALL=C" ) ); - IpsecWhackListenProcess = new QProcess ( this ); + IpsecWhackListenProcess = new TQProcess ( this ); IpsecWhackListenProcess->addArgument ( GlobalConfig->pathToIpsec ); IpsecWhackListenProcess->addArgument ( "whack" ); IpsecWhackListenProcess->addArgument ( "--listen" ); - connect ( IpsecWhackListenProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsecwhacklisten() ) ); - connect ( IpsecWhackListenProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsecwhacklisten() ) ); + connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhacklisten() ) ); + connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhacklisten() ) ); if ( !IpsecWhackListenProcess->start ( env ) ) { - disconnect ( IpsecWhackListenProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsecwhacklisten() ) ); - disconnect ( IpsecWhackListenProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsecwhacklisten() ) ); + disconnect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhacklisten() ) ); + disconnect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhacklisten() ) ); delete IpsecWhackListenProcess; IpsecWhackListenProcess=0L; KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( GlobalConfig->pathToIpsec+" whack' --listen" ) ); @@ -21442,29 +21442,29 @@ void KVpnc::ipsecStarted() } } -void KVpnc::checkIpsecWhackStatus() +void KVpnc::checkIpsecWhacktqStatus() { putenv ( ( char* ) ( "LC_ALL=C" ) ); - IpsecWhackStatusProcess = new QProcess ( this ); + IpsecWhackStatusProcess = new TQProcess ( this ); IpsecWhackStatusProcess->addArgument ( GlobalConfig->pathToIpsec ); IpsecWhackStatusProcess->addArgument ( "whack" ); IpsecWhackStatusProcess->addArgument ( "--status" ); - disconnect ( IpsecWhackStatusProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsecwhackstatus() ) ); - disconnect ( IpsecWhackStatusProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsecwhackstatus() ) ); - connect ( IpsecWhackStatusProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsecwhackstatus() ) ); - connect ( IpsecWhackStatusProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsecwhackstatus() ) ); + disconnect ( IpsecWhackStatusProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhackstatus() ) ); + disconnect ( IpsecWhackStatusProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhackstatus() ) ); + connect ( IpsecWhackStatusProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhackstatus() ) ); + connect ( IpsecWhackStatusProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhackstatus() ) ); - connect ( IpsecWhackStatusProcess, SIGNAL ( processExited() ), this, SLOT ( IpsecWhackStatusProcessExited() ) ); + connect ( IpsecWhackStatusProcess, TQT_SIGNAL ( processExited() ), this, TQT_SLOT ( IpsecWhackStatusProcessExited() ) ); if ( !IpsecWhackStatusProcess->start ( env ) ) { if ( IpsecStatusCheck == false && IpsecPhase2Up==false ) { - disconnect ( IpsecWhackStatusProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsecwhackstatus() ) ); - disconnect ( IpsecWhackStatusProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsecwhackstatus() ) ); - disconnect ( IpsecWhackStatusProcess, SIGNAL ( processExited() ), this, SLOT ( IpsecWhackStatusProcessExited() ) ); + disconnect ( IpsecWhackStatusProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhackstatus() ) ); + disconnect ( IpsecWhackStatusProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhackstatus() ) ); + disconnect ( IpsecWhackStatusProcess, TQT_SIGNAL ( processExited() ), this, TQT_SLOT ( IpsecWhackStatusProcessExited() ) ); delete IpsecWhackStatusProcess; IpsecWhackStatusProcess=0L; KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( GlobalConfig->pathToIpsec+" whack' --status" ) ); @@ -21480,15 +21480,15 @@ void KVpnc::checkIpsecWhackStatus() { if ( !timer.isActive() ) { - disconnect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) ); - connect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) ); + disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); + connect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); // FIXME make connect timeout value in GUI available timer.start ( 2000 * 1000, FALSE ); } if ( !IpsecWhackStatusTimer.isActive() ) { - disconnect ( &IpsecWhackStatusTimer, SIGNAL ( timeout() ), this, SLOT ( checkIpsecWhackStatus() ) ); - connect ( &IpsecWhackStatusTimer, SIGNAL ( timeout() ), this, SLOT ( checkIpsecWhackStatus() ) ); + disconnect ( &IpsecWhackStatusTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( checkIpsecWhacktqStatus() ) ); + connect ( &IpsecWhackStatusTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( checkIpsecWhacktqStatus() ) ); IpsecWhackStatusTimer.start ( 5 * 1000, FALSE ); } } @@ -21500,7 +21500,7 @@ void KVpnc::startStopIpsec ( bool stop, bool silent ) ToolInfo *IpsecToolInfo = Utils ( GlobalConfig ).getToolInfo ( "ipsec" ) ; - IpsecStartProcess = new QProcess ( this ); + IpsecStartProcess = new TQProcess ( this ); if ( IpsecToolInfo->Version.contains ( "Openswan" , false ) ) { @@ -21561,8 +21561,8 @@ void KVpnc::startStopIpsec ( bool stop, bool silent ) if ( silent==false|| GlobalConfig->KvpncDebugLevel > 8 ) { - connect ( IpsecStartProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsec() ) ); - connect ( IpsecStartProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsec() ) ); + connect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsec() ) ); + connect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsec() ) ); } IpsecStartingInProgress=true; @@ -21612,8 +21612,8 @@ void KVpnc::startStopIpsec ( bool stop, bool silent ) IpsecStartingInProgress=false; if ( silent==false|| GlobalConfig->KvpncDebugLevel > 8 ) { - disconnect ( IpsecStartProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsec() ) ); - disconnect ( IpsecStartProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsec() ) ); + disconnect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsec() ) ); + disconnect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsec() ) ); } } } @@ -21627,8 +21627,8 @@ void KVpnc::addIpsecConnection() void KVpnc::start_ipsec_initiate() { // strongswan after ipsec whack --listen - /* disconnect ( IpsecWhackProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsecwhack() ) ); - disconnect ( IpsecWhackProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsecwhack() ) ); + /* disconnect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhack() ) ); + disconnect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhack() ) ); delete(IpsecWhackProcess);*/ if ( IpsecGotError) @@ -21636,21 +21636,21 @@ void KVpnc::start_ipsec_initiate() sleep ( 4 ); putenv ( ( char* ) ( "LC_ALL=C" ) ); - IpsecWhackProcess = new QProcess ( this ); + IpsecWhackProcess = new TQProcess ( this ); IpsecWhackProcess->addArgument ( GlobalConfig->pathToIpsec ); IpsecWhackProcess->addArgument ( "whack" ); IpsecWhackProcess->addArgument ( "--name" ); IpsecWhackProcess->addArgument ( GlobalConfig->currentProfile->getName() ); IpsecWhackProcess->addArgument ( "--initiate" ); - connect ( IpsecWhackProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsecwhack() ) ); - connect ( IpsecWhackProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsecwhack() ) ); - connect ( IpsecWhackProcess, SIGNAL ( exited() ), this, SLOT ( ipsecwhack_exited() ) ); + connect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhack() ) ); + connect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhack() ) ); + connect ( IpsecWhackProcess, TQT_SIGNAL ( exited() ), this, TQT_SLOT ( ipsecwhack_exited() ) ); if ( !IpsecWhackProcess->start ( env ) ) { - disconnect ( IpsecWhackProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsecwhack() ) ); - disconnect ( IpsecWhackProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsecwhack() ) ); - disconnect ( IpsecWhackProcess, SIGNAL ( exited() ), this, SLOT ( ipsecwhack_exited() ) ); + disconnect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhack() ) ); + disconnect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhack() ) ); + disconnect ( IpsecWhackProcess, TQT_SIGNAL ( exited() ), this, TQT_SLOT ( ipsecwhack_exited() ) ); delete IpsecWhackProcess; IpsecWhackProcess=0L; KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( GlobalConfig->pathToIpsec+" whack' --name "+GlobalConfig->currentProfile->getName() +" --initiate" ) ); @@ -21663,7 +21663,7 @@ void KVpnc::start_ipsec_initiate() GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( GlobalConfig->pathToIpsec+" whack --name "+GlobalConfig->currentProfile->getName() +" --initiate" ), GlobalConfig->debug ); if (!IpsecGotError) - checkIpsecWhackStatus(); + checkIpsecWhacktqStatus(); } @@ -21706,10 +21706,10 @@ void KVpnc::ipsecPhase2Established() GlobalConfig->status = GlobalConfig->connected; - disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) ); - connect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); + connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); durationTimer.start ( 1000, FALSE ); - setGuiStatus ( connected ); + setGuitqStatus ( connected ); setFirewallAfterConnect(); @@ -21727,24 +21727,24 @@ void KVpnc::ipsecPhase2Established() } -void KVpnc::doAddRemoveVirtualIp(QString vaction) +void KVpnc::doAddRemoveVirtualIp(TQString vaction) { if ( GlobalConfig->KvpncDebugLevel > 3 ) GlobalConfig->appendLogEntry ( i18n ( "doAddRemoveVirtualIp() action: %1" ).arg ( vaction ), GlobalConfig->debug ); - QString ActionPretty=i18n("Adding"); + TQString ActionPretty=i18n("Adding"); if (vaction =="del") ActionPretty=i18n("Removing"); if ( GlobalConfig->KvpncDebugLevel > 4 ) - GlobalConfig->appendLogEntry ( i18n ( "%1 virtual IP (%2) and special route..." ).arg(ActionPretty).arg(GlobalConfig->currentProfile->getLeftSourceIp()), GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "%1 virtual IP (%2) and special route..." ).tqarg(ActionPretty).tqarg(GlobalConfig->currentProfile->getLeftSourceIp()), GlobalConfig->debug ); // FIXME convert LeftSourceIp to Virtual IP - QString tmpPath = locateLocal ( "data", "kvpnc/" ); - QString IpsecVirtualIpFilename = tmpPath+"do-"+vaction+"-"+GlobalConfig->currentProfile->getName()+".virtualip.sh"; - QFile virtualfile ( IpsecVirtualIpFilename ); - QTextStream stream ( &virtualfile ); + TQString tmpPath = locateLocal ( "data", "kvpnc/" ); + TQString IpsecVirtualIpFilename = tmpPath+"do-"+vaction+"-"+GlobalConfig->currentProfile->getName()+".virtualip.sh"; + TQFile virtualfile ( IpsecVirtualIpFilename ); + TQTextStream stream ( &virtualfile ); if ( virtualfile.open ( IO_WriteOnly ) ) { stream << "#!"<< GlobalConfig->InterpreterShell << "\n"; @@ -21783,7 +21783,7 @@ void KVpnc::doAddRemoveVirtualIp(QString vaction) virtualfile.close(); - QProcess IpsecVirtualIpProcess; + TQProcess IpsecVirtualIpProcess; IpsecVirtualIpProcess.addArgument ( GlobalConfig->InterpreterShell ); IpsecVirtualIpProcess.addArgument ( IpsecVirtualIpFilename ); @@ -21807,15 +21807,15 @@ void KVpnc::doAddRemoveVirtualIp(QString vaction) } else { - GlobalConfig->appendLogEntry ( i18n ( "%1 file could not be written." ).arg("VirtualIpScript"), GlobalConfig->error ); + GlobalConfig->appendLogEntry ( i18n ( "%1 file could not be written." ).tqarg("VirtualIpScript"), GlobalConfig->error ); } } void KVpnc::pppdStarted() { -// disconnect ( PptpProcess, SIGNAL( processExited () ), this, SLOT( pppdStarted() ) ); -// disconnect ( pppdUpProcess, SIGNAL ( processExited () ), this, SLOT ( pppdStarted() ) ); +// disconnect ( PptpProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT( pppdStarted() ) ); +// disconnect ( pppdUpProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( pppdStarted() ) ); // if ( GlobalConfig->KvpncDebugLevel > 0 ) // GlobalConfig->appendLogEntry ( i18n ( "\"%1\" finished." ).arg ( "PppdUpScript" ), GlobalConfig->debug ); @@ -21824,7 +21824,7 @@ void KVpnc::pppdStarted() void KVpnc::openvpnStarted() { - disconnect ( OpenvpnProcess, SIGNAL ( processExited () ), this, SLOT ( openvpnStarted() ) ); + disconnect ( OpenvpnProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( openvpnStarted() ) ); } @@ -21833,7 +21833,7 @@ void KVpnc::startStopOpenl2tp ( bool stop, bool silent ) if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( "[openl2tp] " + i18n ( "Starting %1..." ).arg ( "/etc/init.d/openl2tpd" ) , GlobalConfig->debug ); - StartStopOpenl2tpProcess = new QProcess ( this ); + StartStopOpenl2tpProcess = new TQProcess ( this ); StartStopOpenl2tpProcess->addArgument ( "/etc/init.d/openl2tp" ); if ( stop==false ) @@ -21859,8 +21859,8 @@ void KVpnc::startStopOpenl2tp ( bool stop, bool silent ) if ( silent==false|| GlobalConfig->KvpncDebugLevel > 8 ) { - connect ( StartStopOpenl2tpProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_startstopOpenl2tp() ) ); - connect ( StartStopOpenl2tpProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( rreadFromStderr_startstopOpenl2tp() ) ); + connect ( StartStopOpenl2tpProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_startstopOpenl2tp() ) ); + connect ( StartStopOpenl2tpProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( rreadFromStderr_startstopOpenl2tp() ) ); } IpsecStartingInProgress=true; @@ -21939,7 +21939,7 @@ void KVpnc::startStopOpenl2tp ( bool stop, bool silent ) } -QString KVpnc::getX509CertificateID ( QString Cert, bool user ) +TQString KVpnc::getX509CertificateID ( TQString Cert, bool user ) { issuerID = ""; userID = ""; @@ -21952,7 +21952,7 @@ QString KVpnc::getX509CertificateID ( QString Cert, bool user ) openssl x509 -noout -subject -in mykeys.pem */ putenv ( ( char* ) ( "LC_ALL=C" ) ); - X509CertificateExtractProcess = new QProcess ( this ); + X509CertificateExtractProcess = new TQProcess ( this ); X509CertificateExtractProcess->addArgument ( GlobalConfig->pathToOpenssl ); X509CertificateExtractProcess->addArgument ( "x509" ); X509CertificateExtractProcess->addArgument ( "-noout" ); @@ -21966,15 +21966,15 @@ QString KVpnc::getX509CertificateID ( QString Cert, bool user ) X509CertificateExtractUser = user; - connect ( X509CertificateExtractProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_getX509CertificateID() ) ); - connect ( X509CertificateExtractProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_getX509CertificateID() ) ); - connect ( X509CertificateExtractProcess, SIGNAL ( processExited () ), this, SLOT ( openSSLEnded() ) ); + connect ( X509CertificateExtractProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_getX509CertificateID() ) ); + connect ( X509CertificateExtractProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_getX509CertificateID() ) ); + connect ( X509CertificateExtractProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( openSSLEnded() ) ); if ( !X509CertificateExtractProcess->start ( env ) ) { - disconnect ( X509CertificateExtractProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_getX509CertificateID() ) ); - disconnect ( X509CertificateExtractProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_getX509CertificateID() ) ); - disconnect ( X509CertificateExtractProcess, SIGNAL ( processExited () ), this, SLOT ( openSSLEnded() ) ); + disconnect ( X509CertificateExtractProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_getX509CertificateID() ) ); + disconnect ( X509CertificateExtractProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_getX509CertificateID() ) ); + disconnect ( X509CertificateExtractProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( openSSLEnded() ) ); delete X509CertificateExtractProcess; X509CertificateExtractProcess=0L; KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( "openssl" ) ); @@ -21983,7 +21983,7 @@ QString KVpnc::getX509CertificateID ( QString Cert, bool user ) } else { - //KMessageBox::information( this, i18n( "\"%1\" started." ).arg("openssl") ); + //KMessageBox::information( this, i18n( "\"%1\" started." ).tqarg("openssl") ); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( "openssl (getCertificate)" ), GlobalConfig->debug ); X509CertificateExtractRunning = true; @@ -21992,11 +21992,11 @@ QString KVpnc::getX509CertificateID ( QString Cert, bool user ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "Waiting for process end (getCertificate)." ), GlobalConfig->debug ); - parent->QApplication::processEvents(); + parent->TQApplication::processEvents(); } - disconnect ( X509CertificateExtractProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_getX509CertificateID() ) ); - disconnect ( X509CertificateExtractProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_getX509CertificateID() ) ); - disconnect ( X509CertificateExtractProcess, SIGNAL ( processExited () ), this, SLOT ( openSSLEnded() ) ); + disconnect ( X509CertificateExtractProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_getX509CertificateID() ) ); + disconnect ( X509CertificateExtractProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_getX509CertificateID() ) ); + disconnect ( X509CertificateExtractProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( openSSLEnded() ) ); delete X509CertificateExtractProcess; X509CertificateExtractProcess=0L; if ( user ) @@ -22009,7 +22009,7 @@ QString KVpnc::getX509CertificateID ( QString Cert, bool user ) void KVpnc::readFromStdout_getX509CertificateID() { - QString ProcessMsg = ""; + TQString ProcessMsg = ""; if ( X509CertificateExtractProcess->canReadLineStdout() ) ProcessMsg = X509CertificateExtractProcess->readLineStdout(); if ( !ProcessMsg.isEmpty() ) @@ -22035,7 +22035,7 @@ void KVpnc::readFromStdout_getX509CertificateID() void KVpnc::readFromStderr_getX509CertificateID() { - QString ProcessMsg = QString ( X509CertificateExtractProcess->readStderr() ); + TQString ProcessMsg = TQString ( X509CertificateExtractProcess->readStderr() ); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "getX509CertificateID() err: %1" ).arg ( ProcessMsg ), GlobalConfig->debug ); } @@ -22064,8 +22064,8 @@ void KVpnc::manageCiscoCertClicked() void KVpnc::enrollCiscoCertClicked() { - QString ciscoCertMgr = GlobalConfig->pathToCiscoCertMgr; - if (!ciscoCertMgr.isEmpty() && QFile::exists(ciscoCertMgr)) + TQString ciscoCertMgr = GlobalConfig->pathToCiscoCertMgr; + if (!ciscoCertMgr.isEmpty() && TQFile::exists(ciscoCertMgr)) { CiscoCertificateEnrollment dlg ( this, i18n ( "Enroll certificate..." ).ascii(), GlobalConfig ); dlg.exec(); @@ -22086,27 +22086,27 @@ void KVpnc::executeCommandBeforeConnect() { if ( GlobalConfig->currentProfile->getExecuteCmdBeforeConnect() && !GlobalConfig->currentProfile->getCommandBeforeConnect().isEmpty() ) { - QStringList cmds = QStringList::split ( '\n',GlobalConfig->currentProfile->getCommandBeforeConnect() ); + TQStringList cmds = TQStringList::split ( '\n',GlobalConfig->currentProfile->getCommandBeforeConnect() ); // write command after connect script - QString CmdBeforeConnectScript = tmpPath + "cmd_before_connect_script." + GlobalConfig->currentProfile->getName(); + TQString CmdBeforeConnectScript = tmpPath + "cmd_before_connect_script." + GlobalConfig->currentProfile->getName(); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( "CmdBeforeConnectScript: " + CmdBeforeConnectScript + "\n", GlobalConfig->debug ); - QFile file ( CmdBeforeConnectScript ); - QTextStream stream ( &file ); + TQFile file ( CmdBeforeConnectScript ); + TQTextStream stream ( &file ); if ( file.open ( IO_WriteOnly ) ) { - for ( QStringList::Iterator it = cmds.begin(); it != cmds.end(); ++it ) + for ( TQStringList::Iterator it = cmds.begin(); it != cmds.end(); ++it ) stream << *it << " ; "; file.close(); - CmdBeforeConnectProcess = new QProcess ( this ); + CmdBeforeConnectProcess = new TQProcess ( this ); CmdBeforeConnectProcess->addArgument ( GlobalConfig->InterpreterShell ); CmdBeforeConnectProcess->addArgument ( CmdBeforeConnectScript ); - connect ( CmdBeforeConnectProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_executeCommandBeforeConnect() ) ); - connect ( CmdBeforeConnectProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_executeCommandBeforeConnect() ) ); + connect ( CmdBeforeConnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_executeCommandBeforeConnect() ) ); + connect ( CmdBeforeConnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_executeCommandBeforeConnect() ) ); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "Executing command before connect:\n%1" ).arg ( cmds.join ( ";" ) ), GlobalConfig->debug ); @@ -22120,13 +22120,13 @@ void KVpnc::executeCommandBeforeConnect() if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( "CmdBeforeConnectScript" ), GlobalConfig->debug ); while ( CmdBeforeConnectProcess->isRunning() ) - parent->QApplication::processEvents(); + parent->TQApplication::processEvents(); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "\"%1\" finished." ).arg ( "CmdBeforeConnectScript" ), GlobalConfig->debug ); } - disconnect ( CmdBeforeConnectProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_executeCommandBeforeConnect() ) ); - disconnect ( CmdBeforeConnectProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_executeCommandBeforeConnect() ) ); + disconnect ( CmdBeforeConnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_executeCommandBeforeConnect() ) ); + disconnect ( CmdBeforeConnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_executeCommandBeforeConnect() ) ); delete CmdBeforeConnectProcess; CmdBeforeConnectProcess =0L; } @@ -22141,30 +22141,30 @@ void KVpnc::executeCommandAfterConnect() { if ( GlobalConfig->currentProfile->getExecuteCmdAfterConnect() && !GlobalConfig->currentProfile->getCommandAfterConnect().isEmpty() ) { - QStringList cmds = QStringList::split ( '\n',GlobalConfig->currentProfile->getCommandAfterConnect() ); + TQStringList cmds = TQStringList::split ( '\n',GlobalConfig->currentProfile->getCommandAfterConnect() ); // write command after connect script - QString CmdAfterConnectScript = tmpPath + "cmd_after_connect_script." + GlobalConfig->currentProfile->getName(); + TQString CmdAfterConnectScript = tmpPath + "cmd_after_connect_script." + GlobalConfig->currentProfile->getName(); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( "CmdAfterConnectScript: " + CmdAfterConnectScript + "\n", GlobalConfig->debug ); - QFile file ( CmdAfterConnectScript ); - QTextStream stream ( &file ); + TQFile file ( CmdAfterConnectScript ); + TQTextStream stream ( &file ); if ( file.open ( IO_WriteOnly ) ) { - for ( QStringList::Iterator it = cmds.begin(); it != cmds.end(); ++it ) + for ( TQStringList::Iterator it = cmds.begin(); it != cmds.end(); ++it ) stream << *it << " ; "; file.close(); - CmdAfterConnectProcess = new QProcess ( this ); + CmdAfterConnectProcess = new TQProcess ( this ); CmdAfterConnectProcess->addArgument ( GlobalConfig->InterpreterShell ); CmdAfterConnectProcess->addArgument ( CmdAfterConnectScript ); - connect ( CmdAfterConnectProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_executeCommandAfterConnect() ) ); - connect ( CmdAfterConnectProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_executeCommandAfterConnect() ) ); + connect ( CmdAfterConnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_executeCommandAfterConnect() ) ); + connect ( CmdAfterConnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_executeCommandAfterConnect() ) ); if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry ( i18n ( "Sleeping %1s before executing command after connect..." ).arg ( QString().setNum ( GlobalConfig->currentProfile->getCommandAfterConnectDelayTime() ) ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Sleeping %1s before executing command after connect..." ).arg ( TQString().setNum ( GlobalConfig->currentProfile->getCommandAfterConnectDelayTime() ) ), GlobalConfig->debug ); sleep ( GlobalConfig->currentProfile->getCommandAfterConnectDelayTime() ); if ( GlobalConfig->KvpncDebugLevel > 0 ) @@ -22179,13 +22179,13 @@ void KVpnc::executeCommandAfterConnect() if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( "CmdAfterConnectScript" ), GlobalConfig->debug ); while ( CmdAfterConnectProcess->isRunning() ) - parent->QApplication::processEvents(); + parent->TQApplication::processEvents(); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "\"%1\" finished." ).arg ( "CmdAfterConnectScript" ), GlobalConfig->debug ); } - disconnect ( CmdAfterConnectProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_executeCommandAfterConnect() ) ); - disconnect ( CmdAfterConnectProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_executeCommandAfterConnect() ) ); + disconnect ( CmdAfterConnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_executeCommandAfterConnect() ) ); + disconnect ( CmdAfterConnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_executeCommandAfterConnect() ) ); delete CmdAfterConnectProcess; CmdAfterConnectProcess=0L; @@ -22202,26 +22202,26 @@ void KVpnc::executeCommandBeforeDisconnect() { if ( GlobalConfig->currentProfile->getExecuteCmdBeforeDisconnect() && !GlobalConfig->currentProfile->getCommandBeforeDisconnect().isEmpty() ) { - QStringList cmds = QStringList::split ( '\n',GlobalConfig->currentProfile->getCommandBeforeDisconnect() ); + TQStringList cmds = TQStringList::split ( '\n',GlobalConfig->currentProfile->getCommandBeforeDisconnect() ); // write command after connect script - QString CmdBeforeDisconnectScript = tmpPath + "cmd_before_disconnect_script." + GlobalConfig->currentProfile->getName(); + TQString CmdBeforeDisconnectScript = tmpPath + "cmd_before_disconnect_script." + GlobalConfig->currentProfile->getName(); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( "CmdBeforeDisconnectScript: " + CmdBeforeDisconnectScript + "\n", GlobalConfig->debug ); - QFile file ( CmdBeforeDisconnectScript ); - QTextStream stream ( &file ); + TQFile file ( CmdBeforeDisconnectScript ); + TQTextStream stream ( &file ); if ( file.open ( IO_WriteOnly ) ) { - for ( QStringList::Iterator it = cmds.begin(); it != cmds.end(); ++it ) + for ( TQStringList::Iterator it = cmds.begin(); it != cmds.end(); ++it ) stream << *it << " ; "; file.close(); - CmdBeforeDisconnectProcess = new QProcess ( this ); + CmdBeforeDisconnectProcess = new TQProcess ( this ); CmdBeforeDisconnectProcess->addArgument ( GlobalConfig->InterpreterShell ); CmdBeforeDisconnectProcess->addArgument ( CmdBeforeDisconnectScript ); - connect ( CmdBeforeDisconnectProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_executeCommandBeforeDisconnect() ) ); - connect ( CmdBeforeDisconnectProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_executeCommandBeforeDisconnect() ) ); + connect ( CmdBeforeDisconnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_executeCommandBeforeDisconnect() ) ); + connect ( CmdBeforeDisconnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_executeCommandBeforeDisconnect() ) ); if ( !CmdBeforeDisconnectProcess->start ( env ) ) { @@ -22236,14 +22236,14 @@ void KVpnc::executeCommandBeforeDisconnect() while ( CmdBeforeDisconnectProcess->isRunning() ) { usleep ( 500 ); - // parent->QApplication::processEvents(); + // parent->TQApplication::processEvents(); } if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "\"%1\" finished." ).arg ( "CmdBeforeDisconnectScript" ), GlobalConfig->debug ); } - disconnect ( CmdBeforeDisconnectProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_executeCommandBeforeDisconnect() ) ); - disconnect ( CmdBeforeDisconnectProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_executeCommandBeforeDisconnect() ) ); + disconnect ( CmdBeforeDisconnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_executeCommandBeforeDisconnect() ) ); + disconnect ( CmdBeforeDisconnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_executeCommandBeforeDisconnect() ) ); delete CmdBeforeDisconnectProcess; CmdBeforeDisconnectProcess=0L; @@ -22261,27 +22261,27 @@ void KVpnc::executeCommandAfterDisconnect() { if ( GlobalConfig->currentProfile->getExecuteCmdAfterDisconnect() && !GlobalConfig->currentProfile->getCommandAfterDisconnect().isEmpty() ) { - QStringList cmds = QStringList::split ( '\n',GlobalConfig->currentProfile->getCommandAfterDisconnect() ); + TQStringList cmds = TQStringList::split ( '\n',GlobalConfig->currentProfile->getCommandAfterDisconnect() ); // write command after connect script - QString CmdAfterDisconnectScript = tmpPath + "cmd_after_disconnect_script." + GlobalConfig->currentProfile->getName(); + TQString CmdAfterDisconnectScript = tmpPath + "cmd_after_disconnect_script." + GlobalConfig->currentProfile->getName(); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( "CmdAfterDisconnectScript: " + CmdAfterDisconnectScript + "\n", GlobalConfig->debug ); - QFile file ( CmdAfterDisconnectScript ); - QTextStream stream ( &file ); + TQFile file ( CmdAfterDisconnectScript ); + TQTextStream stream ( &file ); if ( file.open ( IO_WriteOnly ) ) { - for ( QStringList::Iterator it = cmds.begin(); it != cmds.end(); ++it ) + for ( TQStringList::Iterator it = cmds.begin(); it != cmds.end(); ++it ) stream << *it << " ; "; file.close(); - CmdAfterDisconnectProcess = new QProcess ( this ); + CmdAfterDisconnectProcess = new TQProcess ( this ); CmdAfterDisconnectProcess->addArgument ( GlobalConfig->InterpreterShell ); CmdAfterDisconnectProcess->addArgument ( CmdAfterDisconnectScript ); - connect ( CmdAfterDisconnectProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_executeCommandAfterDisconnect() ) ); - connect ( CmdAfterDisconnectProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_executeCommandAfterDisconnect() ) ); + connect ( CmdAfterDisconnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_executeCommandAfterDisconnect() ) ); + connect ( CmdAfterDisconnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_executeCommandAfterDisconnect() ) ); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "Executing command after disconnect:\n%1" ).arg ( cmds.join ( ";" ) ), GlobalConfig->debug ); @@ -22297,14 +22297,14 @@ void KVpnc::executeCommandAfterDisconnect() while ( CmdAfterDisconnectProcess->isRunning() ) { usleep ( 500 ); - // parent->QApplication::processEvents(); + // parent->TQApplication::processEvents(); } if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "\"%1\" finished." ).arg ( "CmdAfterDisconnectScript" ), GlobalConfig->debug ); } - disconnect ( CmdAfterDisconnectProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_executeCommandAfterDisconnect() ) ); - disconnect ( CmdAfterDisconnectProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_executeCommandAfterDisconnect() ) ); + disconnect ( CmdAfterDisconnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_executeCommandAfterDisconnect() ) ); + disconnect ( CmdAfterDisconnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_executeCommandAfterDisconnect() ) ); delete CmdAfterDisconnectProcess; CmdAfterDisconnectProcess=0L; } @@ -22319,11 +22319,11 @@ void KVpnc::setFirewallAfterConnect() { // write firewall after connect script - QString SetFirewallAfterConnectScript = tmpPath + "firewall_after_connect_script." + GlobalConfig->currentProfile->getName(); + TQString SetFirewallAfterConnectScript = tmpPath + "firewall_after_connect_script." + GlobalConfig->currentProfile->getName(); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( "setFirewallAfterConnectScript: " + SetFirewallAfterConnectScript + "\n", GlobalConfig->debug ); - QFile file ( SetFirewallAfterConnectScript ); - QTextStream stream ( &file ); + TQFile file ( SetFirewallAfterConnectScript ); + TQTextStream stream ( &file ); if ( file.open ( IO_WriteOnly ) ) { if ( GlobalConfig->currentProfile->getFixPathMtuDiscoveryProblem() && Utils ( GlobalConfig ).getToolInfo ( "iptables" )->found ) @@ -22338,17 +22338,17 @@ void KVpnc::setFirewallAfterConnect() } file.close(); - SetFirewallAfterConnectProcess = new QProcess ( this ); + SetFirewallAfterConnectProcess = new TQProcess ( this ); SetFirewallAfterConnectProcess->addArgument ( GlobalConfig->InterpreterShell ); SetFirewallAfterConnectProcess->addArgument ( SetFirewallAfterConnectScript ); // if ( GlobalConfig->KvpncDebugLevel > 2 ) // { -// disconnect ( SetFirewallAfterConnectProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_setFirewallAfterConnect() ) ); -// disconnect ( SetFirewallAfterConnectProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_setFirewallAfterConnect() ) ); -// connect ( SetFirewallAfterConnectProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_setFirewallAfterConnect() ) ); -// connect ( SetFirewallAfterConnectProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_setFirewallAfterConnect() ) ); +// disconnect ( SetFirewallAfterConnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_setFirewallAfterConnect() ) ); +// disconnect ( SetFirewallAfterConnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_setFirewallAfterConnect() ) ); +// connect ( SetFirewallAfterConnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_setFirewallAfterConnect() ) ); +// connect ( SetFirewallAfterConnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_setFirewallAfterConnect() ) ); // } @@ -22374,8 +22374,8 @@ void KVpnc::setFirewallAfterConnect() if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "\"%1\" finished." ).arg ( "SetFirewallAfterConnectScript" ), GlobalConfig->debug ); } -// disconnect ( SetFirewallAfterConnectProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_setFirewallAfterConnect() ) ); -// disconnect ( SetFirewallAfterConnectProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_setFirewallAfterConnect() ) ); +// disconnect ( SetFirewallAfterConnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_setFirewallAfterConnect() ) ); +// disconnect ( SetFirewallAfterConnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_setFirewallAfterConnect() ) ); delete SetFirewallAfterConnectProcess; SetFirewallAfterConnectProcess=0L; @@ -22390,11 +22390,11 @@ void KVpnc::setFirewallAfterConnect() void KVpnc::setFirewallBeforeDisconnect() { // write firewall after connect script - QString SetFirewallBeforeDisconnect = tmpPath + "firewall_after_connect_script." + GlobalConfig->currentProfile->getName(); + TQString SetFirewallBeforeDisconnect = tmpPath + "firewall_after_connect_script." + GlobalConfig->currentProfile->getName(); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( "SetFirewallBeforeDisconnect: " + SetFirewallBeforeDisconnect + "\n", GlobalConfig->debug ); - QFile file ( SetFirewallBeforeDisconnect ); - QTextStream stream ( &file ); + TQFile file ( SetFirewallBeforeDisconnect ); + TQTextStream stream ( &file ); if ( file.open ( IO_WriteOnly ) ) { // see http://pptpclient.sourceforge.net/howto-diagnosis.phtml#connections_freeze @@ -22409,17 +22409,17 @@ void KVpnc::setFirewallBeforeDisconnect() } file.close(); - SetFirewallBeforeDisconnectProcess = new QProcess ( this ); + SetFirewallBeforeDisconnectProcess = new TQProcess ( this ); SetFirewallBeforeDisconnectProcess->addArgument ( GlobalConfig->InterpreterShell ); SetFirewallBeforeDisconnectProcess->addArgument ( SetFirewallBeforeDisconnect ); // if ( GlobalConfig->KvpncDebugLevel > 2 ) // { -// disconnect ( SetFirewallBeforeDisconnectProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_setFirewallBeforeDisconnect() ) ); -// disconnect ( SetFirewallBeforeDisconnectProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_setFirewallBeforeDisconnect() ) ); -// connect ( SetFirewallBeforeDisconnectProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_setFirewallBeforeDisconnect() ) ); -// connect ( SetFirewallBeforeDisconnectProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_setFirewallBeforeDisconnect() ) ); +// disconnect ( SetFirewallBeforeDisconnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_setFirewallBeforeDisconnect() ) ); +// disconnect ( SetFirewallBeforeDisconnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_setFirewallBeforeDisconnect() ) ); +// connect ( SetFirewallBeforeDisconnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_setFirewallBeforeDisconnect() ) ); +// connect ( SetFirewallBeforeDisconnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_setFirewallBeforeDisconnect() ) ); // } @@ -22437,14 +22437,14 @@ void KVpnc::setFirewallBeforeDisconnect() while ( SetFirewallBeforeDisconnectProcess->isRunning() ) { sleep ( 1 ); - parent->QApplication::processEvents(); + parent->TQApplication::processEvents(); } if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "\"%1\" finished." ).arg ( "setFirewallBeforeDisconnect" ), GlobalConfig->debug ); } -// disconnect ( SetFirewallBeforeDisconnectProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_setFirewallBeforeDisconnect() ) ); -// disconnect ( SetFirewallBeforeDisconnectProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_setFirewallBeforeDisconnect() ) ); +// disconnect ( SetFirewallBeforeDisconnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_setFirewallBeforeDisconnect() ) ); +// disconnect ( SetFirewallBeforeDisconnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_setFirewallBeforeDisconnect() ) ); delete SetFirewallBeforeDisconnectProcess; SetFirewallBeforeDisconnectProcess=0L; } @@ -22461,15 +22461,15 @@ void KVpnc::doRoutePptp() route add -net 192.168.1.0/24 eth0 */ putenv ( ( char* ) ( "LC_ALL=C" ) ); - RouteProcess = new QProcess ( this ); + RouteProcess = new TQProcess ( this ); RouteProcess->addArgument ( "/sbin/route" ); RouteProcess->addArgument ( "add" ); RouteProcess->addArgument ( "-net" ); - QString RemoteNetAddr = GlobalConfig->currentProfile->getRemoteNetAddr(); - QString RemoteNetMask = GlobalConfig->currentProfile->getRemoteNetMask(); - QString RemoteNet = RemoteNetAddr + "/" + RemoteNetMask; + TQString RemoteNetAddr = GlobalConfig->currentProfile->getRemoteNetAddr(); + TQString RemoteNetMask = GlobalConfig->currentProfile->getRemoteNetMask(); + TQString RemoteNet = RemoteNetAddr + "/" + RemoteNetMask; RouteProcess->addArgument ( RemoteNet ); - QString dev; + TQString dev; if ( !GlobalConfig->currentProfile->getNetworkDevice().isEmpty() ) dev = GlobalConfig->currentProfile->getNetworkDevice(); @@ -22479,15 +22479,15 @@ void KVpnc::doRoutePptp() if ( GlobalConfig->KvpncDebugLevel > 0 ) { NetworkInterface iface ( GlobalConfig, parent ); - QString defaultinterface = iface.getDefaultInterface(); + TQString defaultinterface = iface.getDefaultInterface(); GlobalConfig->appendLogEntry ( i18n ( "Default interface %1" ).arg ( defaultinterface ), GlobalConfig->debug ); } RouteProcess->addArgument ( dev ); tmpInterface = dev; - connect ( RouteProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_pptp() ) ); - connect ( RouteProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_pptp() ) ); + connect ( RouteProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_pptp() ) ); + connect ( RouteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_pptp() ) ); if ( !RouteProcess->start ( env ) ) { @@ -22504,15 +22504,15 @@ void KVpnc::doRoutePptp() sleep ( 1 ); } } - disconnect ( RouteProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_pptp() ) ); - disconnect ( RouteProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_pptp() ) ); + disconnect ( RouteProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_pptp() ) ); + disconnect ( RouteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_pptp() ) ); delete RouteProcess; RouteProcess=0L; } void KVpnc::slotConnecting() { - setGuiStatus ( connecting ); + setGuitqStatus ( connecting ); } void KVpnc::profileAddedOrDeleted() @@ -22574,12 +22574,12 @@ bool KVpnc::setVirtualIP() } setVirtualIPSuccess=true; - SetVirtualIPProcess = new QProcess(this); + SetVirtualIPProcess = new TQProcess(this); SetVirtualIPProcess->addArgument(GlobalConfig->pathToIfconfig); - SetVirtualIPProcess->addArgument(QString(NetworkDevice+":100")); + SetVirtualIPProcess->addArgument(TQString(NetworkDevice+":100")); SetVirtualIPProcess->addArgument(GlobalConfig->currentProfile->getVirtualIP()); - connect( SetVirtualIPProcess, SIGNAL( readyReadStdout() ), this, SLOT( readFromStdout_setVirtualIP() ) ); - connect( SetVirtualIPProcess, SIGNAL( readyReadStderr() ), this, SLOT( readFromStderr_setVirtualIP() ) ); + connect( SetVirtualIPProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_setVirtualIP() ) ); + connect( SetVirtualIPProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_setVirtualIP() ) ); if ( !SetVirtualIPProcess->start(env) ) { @@ -22608,7 +22608,7 @@ void KVpnc::toggleDebugConsole() GlobalConfig->showDebugConsole = true; DebugconsoleAction ->setChecked ( true ); mw->DebugOutput->show(); - //resize( minimumSizeHint() ); + //resize( tqminimumSizeHint() ); } else { @@ -22616,7 +22616,7 @@ void KVpnc::toggleDebugConsole() DebugconsoleAction ->setChecked ( false ); mw->DebugOutput->hide(); // setMinimumSize(0,0); - // this->resize( minimumSizeHint() ); + // this->resize( tqminimumSizeHint() ); } } @@ -22629,14 +22629,14 @@ void KVpnc::addAdditionalNetworkRoutes() { if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "Setting additional network routes..." ), GlobalConfig->debug ); - QStringList AdditionalNetworkRoutes = GlobalConfig->currentProfile->getAdditionalNetworkRoutes(); + TQStringList AdditionalNetworkRoutes = GlobalConfig->currentProfile->getAdditionalNetworkRoutes(); int count=1; - QString dev = GlobalConfig->currentProfile->getNetworkDevice(); + TQString dev = GlobalConfig->currentProfile->getNetworkDevice(); NetworkInterface iface ( GlobalConfig, parent ); - QString defaultinterface = iface.getDefaultInterface(); + TQString defaultinterface = iface.getDefaultInterface(); if ( dev.isEmpty() ) @@ -22654,24 +22654,24 @@ void KVpnc::addAdditionalNetworkRoutes() if ( GlobalConfig->KvpncDebugLevel > 1 ) GlobalConfig->appendLogEntry ( i18n ( "Default interface: %1" ).arg ( dev ), GlobalConfig->debug ); - QString tmpPath = locateLocal ( "data", "kvpnc/" ); - QFile file ( tmpPath + "addAdditionalNetworkRoutes." + GlobalConfig->currentProfile->getName() + ".sh" ); - QString Route=""; - QStringList RoutesList; - QTextStream stream ( &file ); + TQString tmpPath = locateLocal ( "data", "kvpnc/" ); + TQFile file ( tmpPath + "addAdditionalNetworkRoutes." + GlobalConfig->currentProfile->getName() + ".sh" ); + TQString Route=""; + TQStringList RoutesList; + TQTextStream stream ( &file ); if ( file.open ( IO_WriteOnly ) ) { stream << "#!"<< GlobalConfig->InterpreterShell << "\n"; - for ( QStringList::Iterator it = AdditionalNetworkRoutes.begin(); it != AdditionalNetworkRoutes.end();++it ) + for ( TQStringList::Iterator it = AdditionalNetworkRoutes.begin(); it != AdditionalNetworkRoutes.end();++it ) { - Route += "\t"+QString().setNum ( count ) +": "; + Route += "\t"+TQString().setNum ( count ) +": "; count++; - QString net = ( *it ).section ( '#', 0, 0 ); + TQString net = ( *it ).section ( '#', 0, 0 ); - QString Gateway = QString ( *it ).section ( '#', 1, 1 ); - QString GatewayString = ""; - QString Interface = QString ( *it ).section ( '#', 2, 2 ); - QString InterfaceString = ""; + TQString Gateway = TQString ( *it ).section ( '#', 1, 1 ); + TQString GatewayString = ""; + TQString Interface = TQString ( *it ).section ( '#', 2, 2 ); + TQString InterfaceString = ""; bool extended = false; Route += net; if ( !Gateway.isEmpty() && Gateway != "-" ) @@ -22705,13 +22705,13 @@ void KVpnc::addAdditionalNetworkRoutes() } file.close(); - RouteProcess = new QProcess ( this ); + RouteProcess = new TQProcess ( this ); RouteProcess->addArgument ( GlobalConfig->InterpreterShell ); RouteProcess->addArgument ( tmpPath + "addAdditionalNetworkRoutes." + GlobalConfig->currentProfile->getName() + ".sh" ); tmpInterface = dev; - connect ( RouteProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_route() ) ); - connect ( RouteProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_route() ) ); + connect ( RouteProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_route() ) ); + connect ( RouteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_route() ) ); if ( !RouteProcess->start ( env ) ) { @@ -22724,7 +22724,7 @@ void KVpnc::addAdditionalNetworkRoutes() if ( GlobalConfig->KvpncDebugLevel > 1 ) { GlobalConfig->appendLogEntry ( i18n ( "Adding the following additional network routes:" ), GlobalConfig->debug ); - for ( QStringList::Iterator it = RoutesList.begin(); it != RoutesList.end(); ++it ) + for ( TQStringList::Iterator it = RoutesList.begin(); it != RoutesList.end(); ++it ) GlobalConfig->appendLogEntry ( *it , GlobalConfig->debug ); } while ( RouteProcess->isRunning() ) @@ -22733,8 +22733,8 @@ void KVpnc::addAdditionalNetworkRoutes() // parent->processEvents(); } } - disconnect ( RouteProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_route() ) ); - disconnect ( RouteProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_route() ) ); + disconnect ( RouteProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_route() ) ); + disconnect ( RouteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_route() ) ); delete RouteProcess; RouteProcess=0L; } @@ -22745,11 +22745,11 @@ void KVpnc::removeAdditionalNetworkRoutes() { if ( !GlobalConfig->currentProfile->getAdditionalNetworkRoutes().isEmpty() ) { - QStringList AdditionalNetworkRoutes = GlobalConfig->currentProfile->getAdditionalNetworkRoutes(); - QString dev = GlobalConfig->currentProfile->getNetworkDevice(); + TQStringList AdditionalNetworkRoutes = GlobalConfig->currentProfile->getAdditionalNetworkRoutes(); + TQString dev = GlobalConfig->currentProfile->getNetworkDevice(); NetworkInterface iface ( GlobalConfig, parent ); - QString defaultinterface = iface.getDefaultInterface(); + TQString defaultinterface = iface.getDefaultInterface(); int count=1; if ( dev.isEmpty() ) @@ -22769,24 +22769,24 @@ void KVpnc::removeAdditionalNetworkRoutes() GlobalConfig->appendLogEntry ( i18n ( "Default interface: %1" ).arg ( defaultinterface ), GlobalConfig->debug ); tmpPath = locateLocal ( "data", "kvpnc/" ); - QFile file ( tmpPath + "delAdditionalNetworkRoutes." + GlobalConfig->currentProfile->getName() + ".sh" ); - QString Route=""; - QStringList RoutesList; - QTextStream stream ( &file ); + TQFile file ( tmpPath + "delAdditionalNetworkRoutes." + GlobalConfig->currentProfile->getName() + ".sh" ); + TQString Route=""; + TQStringList RoutesList; + TQTextStream stream ( &file ); if ( file.open ( IO_WriteOnly ) ) { stream << "#!"<< GlobalConfig->InterpreterShell << "\n"; - for ( QStringList::Iterator it = AdditionalNetworkRoutes.begin(); it != AdditionalNetworkRoutes.end();++it ) + for ( TQStringList::Iterator it = AdditionalNetworkRoutes.begin(); it != AdditionalNetworkRoutes.end();++it ) { - Route += "\t"+QString().setNum ( count ) +": "; + Route += "\t"+TQString().setNum ( count ) +": "; count++; - QString net = ( *it ).section ( '#', 0, 0 ); + TQString net = ( *it ).section ( '#', 0, 0 ); - QString Gateway = QString ( *it ).section ( '#', 1, 1 ); - QString GatewayString = ""; - QString Interface = QString ( *it ).section ( '#', 2, 2 ); - QString InterfaceString = ""; + TQString Gateway = TQString ( *it ).section ( '#', 1, 1 ); + TQString GatewayString = ""; + TQString Interface = TQString ( *it ).section ( '#', 2, 2 ); + TQString InterfaceString = ""; bool extended = false; Route += net; if ( !Gateway.isEmpty() && Gateway != "-" ) @@ -22821,7 +22821,7 @@ void KVpnc::removeAdditionalNetworkRoutes() } file.close(); - RouteProcess = new QProcess ( this ); + RouteProcess = new TQProcess ( this ); RouteProcess->addArgument ( GlobalConfig->InterpreterShell ); RouteProcess->addArgument ( tmpPath + "delAdditionalNetworkRoutes." + GlobalConfig->currentProfile->getName() + ".sh" ); tmpInterface = dev; @@ -22837,7 +22837,7 @@ void KVpnc::removeAdditionalNetworkRoutes() if ( GlobalConfig->KvpncDebugLevel > 1 ) { GlobalConfig->appendLogEntry ( i18n ( "Removing the following additional network routes:" ), GlobalConfig->debug ); - for ( QStringList::Iterator it = RoutesList.begin(); it != RoutesList.end(); ++it ) + for ( TQStringList::Iterator it = RoutesList.begin(); it != RoutesList.end(); ++it ) GlobalConfig->appendLogEntry ( *it , GlobalConfig->debug ); } while ( RouteProcess->isRunning() ) @@ -22863,7 +22863,7 @@ void KVpnc::showLogViewer() void KVpnc::doQuickConnect ( int id ) { - QString itemtext = QuickConnectMenu->text ( id ); + TQString itemtext = QuickConnectMenu->text ( id ); if ( GlobalConfig->KvpncDebugLevel > 4 ) GlobalConfig->appendLogEntry ( i18n ( "Quick connect to \"%1\" selected. Current profile: \"%2\"" ).arg ( itemtext ).arg ( GlobalConfig->currentProfile->getName() ), GlobalConfig->info ); @@ -22874,14 +22874,14 @@ void KVpnc::doQuickConnect ( int id ) GlobalConfig->appendLogEntry ( i18n ( "Connect to \"%1\" requested but still to \"%2\" connected, current connection will be terminated." ).arg ( GlobalConfig->currentProfile->getName() ).arg ( itemtext ), GlobalConfig->info ); disconnectClicked(); } - //KMessageBox::information(0,"item",QString("item: "+itemtext)); + //KMessageBox::information(0,"item",TQString("item: "+itemtext)); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "Connect to \"%1\" requested." ).arg ( itemtext ), GlobalConfig->debug ); if ( itemtext != GlobalConfig->currentProfile->getName() ) { if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "Switching to %1" , QString ( itemtext ) ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Switching to %1" , TQString ( itemtext ) ), GlobalConfig->debug ); bool profileInList = false; for ( uint i = 0; i < GlobalConfig->AccountList->count();i++ ) { @@ -22919,16 +22919,16 @@ void KVpnc::saveGuiOptions() void KVpnc::startConnectionStatusCheck() { KStandardDirs * dirs = KGlobal::dirs(); - QString PingCheckScript = QString ( dirs->findResource ( "data", "kvpnc/ping_check.sh" ) ); - //GlobalConfig->appendLogEntry( QString("PingCheckScript : " +PingCheckScript), GlobalConfig->debug); - ConnectionStatusCheckProcess = new QProcess ( this ); + TQString PingCheckScript = TQString ( dirs->findResource ( "data", "kvpnc/ping_check.sh" ) ); + //GlobalConfig->appendLogEntry( TQString("PingCheckScript : " +PingCheckScript), GlobalConfig->debug); + ConnectionStatusCheckProcess = new TQProcess ( this ); ConnectionStatusCheckProcess->addArgument ( GlobalConfig->InterpreterShell ); ConnectionStatusCheckProcess->addArgument ( PingCheckScript ); - QString PathToPing = Utils ( GlobalConfig ).getToolInfo ( "ping" ) ->PathToExec; + TQString PathToPing = Utils ( GlobalConfig ).getToolInfo ( "ping" ) ->PathToExec; ConnectionStatusCheckProcess->addArgument ( PathToPing ); - QString pingDevice="default"; + TQString pingDevice="default"; if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::cisco ) pingDevice = VpncDevice; else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ciscoorig ) @@ -22970,20 +22970,20 @@ void KVpnc::startConnectionStatusCheck() if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "Use gateway address (%1) for connection status check." ).arg ( GlobalConfig->currentProfile->getGateway() ), GlobalConfig->debug ); } - ConnectionStatusCheckProcess->addArgument ( QString().setNum ( GlobalConfig->currentProfile->getConnectionStatusInterval() ) ); - ConnectionStatusCheckProcess->addArgument ( QString().setNum ( GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount() ) ); - ConnectionStatusCheckProcess->addArgument ( QString().setNum ( 1 ) ); // verbosity + ConnectionStatusCheckProcess->addArgument ( TQString().setNum ( GlobalConfig->currentProfile->getConnectionStatusInterval() ) ); + ConnectionStatusCheckProcess->addArgument ( TQString().setNum ( GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount() ) ); + ConnectionStatusCheckProcess->addArgument ( TQString().setNum ( 1 ) ); // verbosity - connect ( ConnectionStatusCheckProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_connectionStatusCheck() ) ); - connect ( ConnectionStatusCheckProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_connectionStatusCheck() ) ); + connect ( ConnectionStatusCheckProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_connectionStatusCheck() ) ); + connect ( ConnectionStatusCheckProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_connectionStatusCheck() ) ); if ( !ConnectionStatusCheckProcess->start ( env ) ) { - disconnect ( ConnectionStatusCheckProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_connectionStatusCheck() ) ); - disconnect ( ConnectionStatusCheckProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_connectionStatusCheck() ) ); + disconnect ( ConnectionStatusCheckProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_connectionStatusCheck() ) ); + disconnect ( ConnectionStatusCheckProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_connectionStatusCheck() ) ); delete ConnectionStatusCheckProcess; ConnectionStatusCheckProcess=0L; - //KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "ping_check.sh" ) ); + //KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( "ping_check.sh" ) ); GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "ping_check.sh" ) , GlobalConfig->error ); } else @@ -23008,16 +23008,16 @@ void KVpnc::preserveNetworkEnvironment() GlobalConfig->appendLogEntry ( i18n ( "Preserving network environment" ), KVpncConfig::debug ); // resolv.conf - QFile originalResolvConfFile ( "/etc/resolv.conf" ); - QString originalResolvConfFileContent = ""; + TQFile originalResolvConfFile ( "/etc/resolv.conf" ); + TQString originalResolvConfFileContent = ""; if ( originalResolvConfFile.open ( IO_ReadOnly ) ) { - originalResolvConfFileContent = QString ( originalResolvConfFile.readAll() ); + originalResolvConfFileContent = TQString ( originalResolvConfFile.readAll() ); originalResolvConfFile.close(); } - QFile backupOriginalResolvConfFile ( "/etc/resolv.conf.before.kvpnc" ); - QTextStream stream ( &backupOriginalResolvConfFile ); + TQFile backupOriginalResolvConfFile ( "/etc/resolv.conf.before.kvpnc" ); + TQTextStream stream ( &backupOriginalResolvConfFile ); if ( backupOriginalResolvConfFile.open ( IO_WriteOnly ) ) { stream << originalResolvConfFileContent; @@ -23025,14 +23025,14 @@ void KVpnc::preserveNetworkEnvironment() } // defaultroute - QString tmpPath = locateLocal ( "data", "kvpnc/" ); + TQString tmpPath = locateLocal ( "data", "kvpnc/" ); - QString GetRouteScript = tmpPath + "get_route.sh"; + TQString GetRouteScript = tmpPath + "get_route.sh"; - QString backupOriginalRoute = locateLocal ( "data", "kvpnc/" ); + TQString backupOriginalRoute = locateLocal ( "data", "kvpnc/" ); backupOriginalRoute += "route_before_kvpnc"; - QFile file ( GetRouteScript ); + TQFile file ( GetRouteScript ); stream.setDevice ( &file ); if ( file.open ( IO_WriteOnly ) ) { @@ -23043,14 +23043,14 @@ void KVpnc::preserveNetworkEnvironment() } - QProcess *proc = new QProcess ( this ); + TQProcess *proc = new TQProcess ( this ); proc->addArgument ( GlobalConfig->InterpreterShell ); proc->addArgument ( GetRouteScript ); - // connect( proc, SIGNAL( readyReadStdout() ), this, SLOT( readFromStdout() ) ); - // connect( proc, SIGNAL( readyReadStderr() ), this, SLOT( readFromStderr() ) ); - // connect( proc, SIGNAL( processExited () ), this, SLOT( processHasFinished() ) ); + // connect( proc, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout() ) ); + // connect( proc, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr() ) ); + // connect( proc, TQT_SIGNAL( processExited () ), this, TQT_SLOT( processHasFinished() ) ); if ( !proc->start ( env ) ) { @@ -23063,9 +23063,9 @@ void KVpnc::preserveNetworkEnvironment() { parent->processEvents(); } - // disconnect( proc, SIGNAL( readyReadStdout() ), this, SLOT( readFromStdout() ) ); - // disconnect( proc, SIGNAL( readyReadStderr() ), this, SLOT( readFromStderr() ) ); - // disconnect( proc, SIGNAL( processExited () ), this, SLOT( processHasFinished() ) ); + // disconnect( proc, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout() ) ); + // disconnect( proc, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr() ) ); + // disconnect( proc, TQT_SIGNAL( processExited () ), this, TQT_SLOT( processHasFinished() ) ); delete proc; proc=0L; } @@ -23078,16 +23078,16 @@ void KVpnc::restoreNetworkEnvironment() GlobalConfig->appendLogEntry ( i18n ( "Restoring network environment" ), KVpncConfig::debug ); // resolv.conf - QFile originalResolvConfFile ( "/etc/resolv.conf.before.kvpnc" ); - QString originalResolvConfFileContent = ""; + TQFile originalResolvConfFile ( "/etc/resolv.conf.before.kvpnc" ); + TQString originalResolvConfFileContent = ""; if ( originalResolvConfFile.open ( IO_ReadOnly ) ) { - originalResolvConfFileContent = QString ( originalResolvConfFile.readAll() ); + originalResolvConfFileContent = TQString ( originalResolvConfFile.readAll() ); if ( originalResolvConfFileContent.length() > 0 ) { originalResolvConfFile.close(); - QFile backupOriginalResolvConfFile ( "/etc/resolv.conf" ); - QTextStream stream ( &backupOriginalResolvConfFile ); + TQFile backupOriginalResolvConfFile ( "/etc/resolv.conf" ); + TQTextStream stream ( &backupOriginalResolvConfFile ); if ( backupOriginalResolvConfFile.open ( IO_WriteOnly ) ) { stream << originalResolvConfFileContent; @@ -23103,27 +23103,27 @@ void KVpnc::restoreNetworkEnvironment() // default route // TODO - QString backupOriginalRoute = locateLocal ( "data", "kvpnc/" ); + TQString backupOriginalRoute = locateLocal ( "data", "kvpnc/" ); backupOriginalRoute += "route_before_kvpnc"; - QFile backupOriginalRouteFile ( backupOriginalRoute ); + TQFile backupOriginalRouteFile ( backupOriginalRoute ); // FIXME make it in GlobalConfig if ( backupOriginalRouteFile.open ( IO_ReadOnly ) ) { - QTextStream stream ( &backupOriginalRouteFile ) + TQTextStream stream ( &backupOriginalRouteFile ) ; - QString line; + TQString line; while ( !stream.atEnd() ) { line = stream.readLine(); if ( line.contains ( "default via", false ) ) // default via 192.168.0.5 dev eth0 { - QString tmpPath = locateLocal ( "data", "kvpnc/" ); - QString RestoreDefaultrouteKvpncExitScript = tmpPath + "restore_defaultroute_kvpnc_exit.sh"; + TQString tmpPath = locateLocal ( "data", "kvpnc/" ); + TQString RestoreDefaultrouteKvpncExitScript = tmpPath + "restore_defaultroute_kvpnc_exit.sh"; - QFile file ( RestoreDefaultrouteKvpncExitScript ); - QTextStream stream ( &file ); + TQFile file ( RestoreDefaultrouteKvpncExitScript ); + TQTextStream stream ( &file ); if ( file.open ( IO_WriteOnly ) ) { stream << "# generated by kvpnc. Do not edit it." << "\n"; @@ -23132,14 +23132,14 @@ void KVpnc::restoreNetworkEnvironment() file.close(); } - QProcess *proc = new QProcess ( this ); + TQProcess *proc = new TQProcess ( this ); proc->addArgument ( GlobalConfig->InterpreterShell ); proc->addArgument ( RestoreDefaultrouteKvpncExitScript ); - // connect( proc, SIGNAL( readyReadStdout() ), this, SLOT( readFromStdout() ) ); - // connect( proc, SIGNAL( readyReadStderr() ), this, SLOT( readFromStderr() ) ); - //connect( proc, SIGNAL( processExited () ), this, SLOT( processHasFinished() ) ); + // connect( proc, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout() ) ); + // connect( proc, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr() ) ); + //connect( proc, TQT_SIGNAL( processExited () ), this, TQT_SLOT( processHasFinished() ) ); if ( !proc->start ( env ) ) { @@ -23153,9 +23153,9 @@ void KVpnc::restoreNetworkEnvironment() // parent->processEvents(); } } - // disconnect( proc, SIGNAL( readyReadStdout() ), this, SLOT( readFromStdout() ) ); - // disconnect( proc, SIGNAL( readyReadStderr() ), this, SLOT( readFromStderr() ) ); - //disconnect( proc, SIGNAL( processExited () ), this, SLOT( processHasFinished() ) ); + // disconnect( proc, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout() ) ); + // disconnect( proc, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr() ) ); + //disconnect( proc, TQT_SIGNAL( processExited () ), this, TQT_SLOT( processHasFinished() ) ); delete proc; proc=0L; break; @@ -23168,20 +23168,20 @@ void KVpnc::restoreNetworkEnvironment() bool KVpnc::backupResolvConf() { bool success=true; - QString ResolvConfBackupProfile = tmpPath + "resolv.conf.before.kvpnc_" + GlobalConfig->currentProfile->getName(); + TQString ResolvConfBackupProfile = tmpPath + "resolv.conf.before.kvpnc_" + GlobalConfig->currentProfile->getName(); if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "Backup file of %1: %1" ).arg ( "resolv.conf" ).arg ( ResolvConfBackupProfile ), GlobalConfig->debug ); - QFile ResolvConfBackupProfileFile ( ResolvConfBackupProfile + ".sh" ); - QTextStream ResolvConfBackupProfileStream ( &ResolvConfBackupProfileFile ); + TQFile ResolvConfBackupProfileFile ( ResolvConfBackupProfile + ".sh" ); + TQTextStream ResolvConfBackupProfileStream ( &ResolvConfBackupProfileFile ); if ( ResolvConfBackupProfileFile.open ( IO_WriteOnly ) ) { ResolvConfBackupProfileStream << "# generated by kvpnc. Do not edit it." << "\n"; ResolvConfBackupProfileStream << "\n"; ResolvConfBackupProfileStream << "cat /etc/resolv.conf > " + ResolvConfBackupProfile + "\n"; ResolvConfBackupProfileFile.close(); - QProcess ResolvConfBackupProfileProcess ( this ); + TQProcess ResolvConfBackupProfileProcess ( this ); ResolvConfBackupProfileProcess.addArgument ( GlobalConfig->InterpreterShell ); ResolvConfBackupProfileProcess.addArgument ( ResolvConfBackupProfile + ".sh" ); if ( !ResolvConfBackupProfileProcess.start() ) @@ -23206,13 +23206,13 @@ bool KVpnc::backupResolvConf() bool KVpnc::restoreResolvConf() { bool success=true; - QString ResolvConfBackupProfile = tmpPath + "resolv.conf.before.kvpnc_" + GlobalConfig->currentProfile->getName(); + TQString ResolvConfBackupProfile = tmpPath + "resolv.conf.before.kvpnc_" + GlobalConfig->currentProfile->getName(); if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "Restore file of %1: %1" ).arg ( "resolv.conf" ).arg ( ResolvConfBackupProfile ), GlobalConfig->debug ); - QFile ResolvConfRestoreProfileFile ( ResolvConfBackupProfile + ".sh" ); - QTextStream ResolvConfRestoreProfileStream ( &ResolvConfRestoreProfileFile ); + TQFile ResolvConfRestoreProfileFile ( ResolvConfBackupProfile + ".sh" ); + TQTextStream ResolvConfRestoreProfileStream ( &ResolvConfRestoreProfileFile ); if ( ResolvConfRestoreProfileFile.open ( IO_WriteOnly ) ) { ResolvConfRestoreProfileStream << "# generated by kvpnc. Do not edit it." << "\n"; @@ -23220,7 +23220,7 @@ bool KVpnc::restoreResolvConf() // ResolvConfRestoreProfileStream << "chmod u+w /etc/resolv.conf" << "\n"; ResolvConfRestoreProfileStream << "cat " + ResolvConfBackupProfile + " > /etc/resolv.conf\n"; ResolvConfRestoreProfileFile.close(); - QProcess ResolvConfRestoreProfileProcess ( this ); + TQProcess ResolvConfRestoreProfileProcess ( this ); ResolvConfRestoreProfileProcess.addArgument ( GlobalConfig->InterpreterShell ); ResolvConfRestoreProfileProcess.addArgument ( ResolvConfBackupProfile + ".sh" ); if ( !ResolvConfRestoreProfileProcess.start() ) @@ -23251,11 +23251,11 @@ void KVpnc::backupIpsecSystemConfig() GlobalConfig->appendLogEntry ( i18n ( "Backing up %1" ).arg ( "ipsec.conf, ipsec.secrets" ), GlobalConfig->debug ); - QString IpsecPrefix = "/etc"; // prefix where ipsec.conf and ipsec.secrets + TQString IpsecPrefix = "/etc"; // prefix where ipsec.conf and ipsec.secrets // ipsec.conf - QFile originalIpsecConfFile ( "/etc/ipsec.conf" ); - QTextStream stream ( &originalIpsecConfFile ); - QString originalIpsecConfFileContent = ""; + TQFile originalIpsecConfFile ( "/etc/ipsec.conf" ); + TQTextStream stream ( &originalIpsecConfFile ); + TQString originalIpsecConfFileContent = ""; if ( !originalIpsecConfFile.exists() ) { originalIpsecConfFile.setName ( "/etc/ipsec.d/ipsec.conf" ); @@ -23276,12 +23276,12 @@ void KVpnc::backupIpsecSystemConfig() { if ( originalIpsecConfFile.open ( IO_ReadOnly ) ) { - originalIpsecConfFileContent = QString ( originalIpsecConfFile.readAll() ); + originalIpsecConfFileContent = TQString ( originalIpsecConfFile.readAll() ); originalIpsecConfFile.close(); } stream.unsetDevice(); } - QFile backupOriginalIpsecConfFile ( IpsecPrefix + "/ipsec.conf.before.kvpnc" ); + TQFile backupOriginalIpsecConfFile ( IpsecPrefix + "/ipsec.conf.before.kvpnc" ); stream.setDevice ( &backupOriginalIpsecConfFile ); if ( backupOriginalIpsecConfFile.open ( IO_WriteOnly ) ) { @@ -23291,7 +23291,7 @@ void KVpnc::backupIpsecSystemConfig() else { GlobalConfig->appendLogEntry ( i18n ( "%1 could not opened. Stop." ).arg ( IpsecPrefix + "/ipsec.conf.before.kvpnc" ),GlobalConfig->error ); - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return; } @@ -23301,15 +23301,15 @@ void KVpnc::backupIpsecSystemConfig() GlobalConfig->appendLogEntry ( i18n ( "%1 found in %2, assuming %3 as prefix for %4." ).arg ( "ipsec.conf" ).arg ( IpsecPrefix ).arg ( IpsecPrefix ).arg ( IpsecType ), GlobalConfig->debug ); // ipsec.secret - QFile originalIpsecSecretFile ( IpsecPrefix + "/ipsec.secrets" ); + TQFile originalIpsecSecretFile ( IpsecPrefix + "/ipsec.secrets" ); stream.setDevice ( &originalIpsecSecretFile ); - QString originalIpsecSecretFileContent = ""; + TQString originalIpsecSecretFileContent = ""; if ( originalIpsecSecretFile.open ( IO_ReadOnly ) ) { - originalIpsecSecretFileContent = QString ( originalIpsecSecretFile.readAll() ); + originalIpsecSecretFileContent = TQString ( originalIpsecSecretFile.readAll() ); originalIpsecSecretFile.close(); } - QFile backupOriginalIpsecSecretFile ( IpsecPrefix + "/ipsec.secrets.before.kvpnc" ); + TQFile backupOriginalIpsecSecretFile ( IpsecPrefix + "/ipsec.secrets.before.kvpnc" ); stream.setDevice ( &backupOriginalIpsecSecretFile ); if ( backupOriginalIpsecSecretFile.open ( IO_WriteOnly ) ) { @@ -23319,7 +23319,7 @@ void KVpnc::backupIpsecSystemConfig() else { GlobalConfig->appendLogEntry ( i18n ( "%1 could not opened. Stop." ).arg ( IpsecPrefix + "/ipsec.secrets.before.kvpnc" ),GlobalConfig->error ); - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); return; } stream.unsetDevice(); @@ -23328,16 +23328,16 @@ void KVpnc::backupIpsecSystemConfig() void KVpnc::backupDefaultRoute() { OldDefaultroute = tmpPath + "default-route." + GlobalConfig->currentProfile->getName(); // default-route. - QString OldDefaultrouteFilePath = tmpPath + "backup_default-route." + GlobalConfig->currentProfile->getName() +".sh"; // default-route. - QFile BackupDefaultRouteFile ( OldDefaultrouteFilePath ); // warning: static - QTextStream stream2 ( &BackupDefaultRouteFile ); + TQString OldDefaultrouteFilePath = tmpPath + "backup_default-route." + GlobalConfig->currentProfile->getName() +".sh"; // default-route. + TQFile BackupDefaultRouteFile ( OldDefaultrouteFilePath ); // warning: static + TQTextStream stream2 ( &BackupDefaultRouteFile ); if ( BackupDefaultRouteFile.open ( IO_WriteOnly ) ) { stream2 << " #!" << GlobalConfig->InterpreterShell << "\n"; stream2 << GlobalConfig->pathToIp << " route show | grep default > " << OldDefaultroute << "\n"; BackupDefaultRouteFile.close(); - QProcess BackupDefaultRouteProcess ( this ); + TQProcess BackupDefaultRouteProcess ( this ); BackupDefaultRouteProcess.addArgument ( GlobalConfig->InterpreterShell ); BackupDefaultRouteProcess.addArgument ( OldDefaultrouteFilePath ); @@ -23367,7 +23367,7 @@ void KVpnc::backupDefaultRoute() void KVpnc::showNewProfileWizardClicked() { NewProfileWizard wizard ( GlobalConfig ); - if ( wizard.exec() == QDialog::Accepted && wizard.newProfileCreated ) + if ( wizard.exec() == TQDialog::Accepted && wizard.newProfileCreated ) { bool importOK = true; @@ -23382,17 +23382,17 @@ void KVpnc::showNewProfileWizardClicked() VpnAccountData * it; bool nameOk = false; bool ok = false; - QString newName = wizard.getName(); + TQString newName = wizard.getName(); while ( nameOk == false ) { for ( it = GlobalConfig->AccountList->first(); it; it = GlobalConfig->AccountList->next() ) { if ( it->getName() == account->getName() ) { - //account->setName( QString( account->getName() + "_2" ) ); - // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).arg( account->getName() ), i18n( "Name exist, renamed" ) ); + //account->setName( TQString( account->getName() + "_2" ) ); + // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).tqarg( account->getName() ), i18n( "Name exist, renamed" ) ); KMessageBox::error ( this, i18n ( "Profile name exists!" ), i18n ( "Name Exists" ) ); - QString newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), QString ( account->getName() += "_2" ), &ok ); + TQString newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), TQString ( account->getName() += "_2" ), &ok ); if ( ok == false ) { KMessageBox::information ( 0, i18n ( "Import was canceled." ) ); @@ -23505,12 +23505,12 @@ void KVpnc::exportOpenvpnProfileClicked() if ( !GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::openvpn ) return ; - QString filename = KFileDialog::getOpenFileName ( QString ( "." ), QString ( "*.ovpn" ), 0, i18n ( "Enter filename for export profile %1:" ).arg ( GlobalConfig->currentProfile->getName() ) ); + TQString filename = KFileDialog::getOpenFileName ( TQString ( "." ), TQString ( "*.ovpn" ), 0, i18n ( "Enter filename for export profile %1:" ).arg ( GlobalConfig->currentProfile->getName() ) ); if ( !filename.isEmpty() ) { // write openvpn..conf - QFile openvpn_file ( filename ); - QTextStream openvpn_stream ( &openvpn_file ); + TQFile openvpn_file ( filename ); + TQTextStream openvpn_stream ( &openvpn_file ); if ( openvpn_file.open ( IO_WriteOnly ) ) { openvpn_stream << "# generated by kvpnc" << "\n"; @@ -23518,7 +23518,7 @@ void KVpnc::exportOpenvpnProfileClicked() openvpn_stream << "# verbosity" << "\n"; openvpn_stream << "verb " << GlobalConfig->OpenvpnDebugLevel << "\n\n"; - QString certPath = "/etc/openvpn"; + TQString certPath = "/etc/openvpn"; if ( !GlobalConfig->currentProfile->getCertPath().isEmpty() ) certPath = GlobalConfig->currentProfile->getCertPath(); @@ -23583,8 +23583,8 @@ void KVpnc::exportOpenvpnProfileClicked() else { // write openvpn..secret - QFile openvpn_secretfile ( tmpPath + "openvpn." + GlobalConfig->currentProfile->getName() + ".secret" ); - QTextStream openvpn_secretstream ( &openvpn_secretfile ); + TQFile openvpn_secretfile ( tmpPath + "openvpn." + GlobalConfig->currentProfile->getName() + ".secret" ); + TQTextStream openvpn_secretstream ( &openvpn_secretfile ); if ( openvpn_secretfile.open ( IO_WriteOnly ) ) { openvpn_secretstream << "# generated by kvpnc. Do not edit it." << "\n"; @@ -23638,9 +23638,9 @@ void KVpnc::exportOpenvpnProfileClicked() openvpn_stream << GlobalConfig->pathToIfconfig << " " << GlobalConfig->currentProfile->getLocalVirtualIP() << GlobalConfig->currentProfile->getRemoteVirtualIP() << "\n\n"; - QString RemoteNetAddr = GlobalConfig->currentProfile->getRemoteNetAddr(); + TQString RemoteNetAddr = GlobalConfig->currentProfile->getRemoteNetAddr(); int RemoteNetMaskNum = GlobalConfig->currentProfile->getRemoteNetMask().toInt(); - QString RemoteNetMask = "255.255.255.0"; + TQString RemoteNetMask = "255.255.255.0"; if ( RemoteNetMaskNum == 24 ) RemoteNetMask = "255.255.255.0"; else if ( RemoteNetMaskNum == 25 ) @@ -23739,7 +23739,7 @@ void KVpnc::exportOpenvpnProfileClicked() if ( GlobalConfig->currentProfile->getUseTlsAuth() && !GlobalConfig->currentProfile->getTlsAuthFile().isEmpty() ) { openvpn_stream << "# Add an additional layer of HMAC authentication on top of the TLS control channel to protect against DoS attacks\n"; - QString direction=""; + TQString direction=""; if ( GlobalConfig->currentProfile->getAuthenticationDirection() != "none" ) direction= GlobalConfig->currentProfile->getAuthenticationDirection(); openvpn_stream << "tls-auth " << GlobalConfig->currentProfile->getTlsAuthFile() << " " << direction << "\n\n"; @@ -23776,22 +23776,22 @@ void KVpnc::pptpProcessExited() // GlobalConfig->appendLogEntry ( i18n ( "Connection has been terminated." ), GlobalConfig->info ); // disconnectClicked(); -// if (QFile("/sbin/resolvconf").exists() && QFile("/etc/init.d/resolvconf").exists()) +// if (TQFile("/sbin/resolvconf").exists() && TQFile("/etc/init.d/resolvconf").exists()) // { // -// QFile downfile ( tmpPath + "pptpd." + GlobalConfig->currentProfile->getName() + ".down" ); -// QTextStream downstream ( &downfile ); +// TQFile downfile ( tmpPath + "pptpd." + GlobalConfig->currentProfile->getName() + ".down" ); +// TQTextStream downstream ( &downfile ); // if ( downfile.open ( IO_WriteOnly ) ) // { // downstream << "#!"<< GlobalConfig->InterpreterShell << "\n"; // downstream << "# generated by kvpnc. Do not edit it." << "\n"; // downstream << "# profile: " + GlobalConfig->currentProfile->getName() << "\n\n"; // -// if (QFile("/sbin/resolvconf").exists() && QFile("/etc/init.d/resolvconf").exists()) +// if (TQFile("/sbin/resolvconf").exists() && TQFile("/etc/init.d/resolvconf").exists()) // downstream << "/etc/init.d/resolvconf start\n"; // downfile.close(); // -// QProcess *pppdDownProcess = new QProcess ( this ); +// TQProcess *pppdDownProcess = new TQProcess ( this ); // pppdDownProcess->addArgument ( GlobalConfig->InterpreterShell ); // pppdDownProcess->addArgument ( tmpPath + "pptpd." + GlobalConfig->currentProfile->getName() + ".down" ); // @@ -23811,7 +23811,7 @@ void KVpnc::pptpProcessExited() void KVpnc::vtun_exited() { -// GlobalConfig->appendLogEntry(i18n("%1 has been exited.").arg("vtund"),GlobalConfig->error); +// GlobalConfig->appendLogEntry(i18n("%1 has been exited.").tqarg("vtund"),GlobalConfig->error); // sleep(2); // if (GlobalConfig->status == GlobalConfig->connecting || GlobalConfig->connected) // disconnectClicked(); @@ -23819,7 +23819,7 @@ void KVpnc::vtun_exited() void KVpnc::openvpn_exited() { - disconnect ( OpenvpnProcess, SIGNAL ( processExited() ), this, SLOT ( openvpn_exited() ) ); + disconnect ( OpenvpnProcess, TQT_SIGNAL ( processExited() ), this, TQT_SLOT ( openvpn_exited() ) ); } void KVpnc::sshExited() @@ -23829,25 +23829,25 @@ void KVpnc::sshExited() void KVpnc::ipsecwhack_exited() { - disconnect ( IpsecWhackProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsecwhack() ) ); - disconnect ( IpsecWhackProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsecwhack() ) ); + disconnect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhack() ) ); + disconnect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhack() ) ); delete ( IpsecWhackProcess ); } void KVpnc::IpsecWhackStatusProcessExited() { -// disconnect ( IpsecWhackStatusProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsecwhackstatus() ) ); -// disconnect ( IpsecWhackStatusProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsecwhackstatus() ) ); -// disconnect ( IpsecWhackStatusProcess, SIGNAL ( processExited() ), this, SLOT ( IpsecWhackStatusProcessExited() ) ); +// disconnect ( IpsecWhackStatusProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhackstatus() ) ); +// disconnect ( IpsecWhackStatusProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhackstatus() ) ); +// disconnect ( IpsecWhackStatusProcess, TQT_SIGNAL ( processExited() ), this, TQT_SLOT ( IpsecWhackStatusProcessExited() ) ); // delete(IpsecWhackStatusProcess); // IpsecWhackStatusProcess=0; } void KVpnc::racoonctlExited() { -// disconnect( RacoonctlProcess, SIGNAL( readyReadStdout() ), this, SLOT( readFromStdout_racoonctl() ) ); -// disconnect( RacoonctlProcess, SIGNAL( readyReadStderr() ), this, SLOT( readFromStderr_racoonctl() ) ); -// disconnect ( RacoonctlProcess, SIGNAL ( processExited () ), this, SLOT ( racoonctlExited() ) ); +// disconnect( RacoonctlProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_racoonctl() ) ); +// disconnect( RacoonctlProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_racoonctl() ) ); +// disconnect ( RacoonctlProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( racoonctlExited() ) ); } void KVpnc::prepareL2tpd() @@ -23856,11 +23856,11 @@ void KVpnc::prepareL2tpd() if ( GlobalConfig->currentProfile->getL2tpDaemon() == VpnAccountData::l2tpd ) { // bug in openswan: only 80 chars in line allowed!!! - int pppdoptionsfilepathlen = QString ( "pppoptfile = "+tmpPath + "options." + GlobalConfig->currentProfile->getName() + ".l2tpd" ).length(); + int pppdoptionsfilepathlen = TQString ( "pppoptfile = "+tmpPath + "options." + GlobalConfig->currentProfile->getName() + ".l2tpd" ).length(); if ( pppdoptionsfilepathlen > 80 ) { - KMessageBox::error ( this, i18n ( "The line length for pppoptfile is too longer than 80 chars: %1. Openswan has an bug and cant handle that. Please rename profile to a shorter name." ).arg ( QString().setNum ( pppdoptionsfilepathlen ) ) ); - GlobalConfig->appendLogEntry ( i18n ( "The line length for pppoptfile is too longer than 80 chars: %1. Openswan has an bug and cant handle that. Please rename profile to a shorter name." ).arg ( QString().setNum ( pppdoptionsfilepathlen ) ), GlobalConfig->error ); + KMessageBox::error ( this, i18n ( "The line length for pppoptfile is too longer than 80 chars: %1. Openswan has an bug and cant handle that. Please rename profile to a shorter name." ).arg ( TQString().setNum ( pppdoptionsfilepathlen ) ) ); + GlobalConfig->appendLogEntry ( i18n ( "The line length for pppoptfile is too longer than 80 chars: %1. Openswan has an bug and cant handle that. Please rename profile to a shorter name." ).arg ( TQString().setNum ( pppdoptionsfilepathlen ) ), GlobalConfig->error ); stopContinue = true; return; } @@ -23882,8 +23882,8 @@ void KVpnc::prepareL2tpd() } // write l2tpd.conf - QFile L2tpdConfigFile ( tmpPath + "l2tpd." + GlobalConfig->currentProfile->getName() + ".conf" ); - QTextStream stream ( &L2tpdConfigFile ); + TQFile L2tpdConfigFile ( tmpPath + "l2tpd." + GlobalConfig->currentProfile->getName() + ".conf" ); + TQTextStream stream ( &L2tpdConfigFile ); if ( L2tpdConfigFile.open ( IO_WriteOnly ) ) { stream << "[global]" << "\n"; @@ -23897,7 +23897,7 @@ void KVpnc::prepareL2tpd() stream << "port = 1701" << "\n"; - if ( !GlobalConfig->pathToXl2tpd.isEmpty() && QFile ( GlobalConfig->pathToXl2tpd ).exists() ) + if ( !GlobalConfig->pathToXl2tpd.isEmpty() && TQFile ( GlobalConfig->pathToXl2tpd ).exists() ) { if ( GlobalConfig->enableDebugXl2tpdNetwork ) stream << "debug network = yes" << "\n"; @@ -23932,7 +23932,7 @@ void KVpnc::prepareL2tpd() stream << "require pap = yes" << "\n"; } - QString UsernameStr=""; + TQString UsernameStr=""; if ( !GlobalConfig->currentProfile->getUserName().isEmpty() ) UsernameStr = GlobalConfig->currentProfile->getUserName(); @@ -23960,7 +23960,7 @@ void KVpnc::prepareL2tpd() // write options.l2tpd - QFile L2tpdPppdOptionsFile ( tmpPath + "options." + GlobalConfig->currentProfile->getName() + ".l2tpd" ); + TQFile L2tpdPppdOptionsFile ( tmpPath + "options." + GlobalConfig->currentProfile->getName() + ".l2tpd" ); stream.setDevice ( &L2tpdPppdOptionsFile ); if ( L2tpdPppdOptionsFile.open ( IO_WriteOnly ) ) { @@ -24020,8 +24020,8 @@ void KVpnc::prepareL2tpd() stream << pppdcap.RequireAuthPapOption << "\n"; } - QString deamon=""; - if ( !GlobalConfig->pathToXl2tpd.isEmpty() && QFile ( GlobalConfig->pathToXl2tpd ).exists() ) + TQString deamon=""; + if ( !GlobalConfig->pathToXl2tpd.isEmpty() && TQFile ( GlobalConfig->pathToXl2tpd ).exists() ) { if ( GlobalConfig->enableDebugPppd ) stream << "debug" << "\n"; @@ -24073,11 +24073,11 @@ void KVpnc::prepareL2tpd() } // // write l2tp secrets file -// QString L2tpSecrets = tmpPath + "l2tp-secrets." + GlobalConfig->currentProfile->getName(); +// TQString L2tpSecrets = tmpPath + "l2tp-secrets." + GlobalConfig->currentProfile->getName(); // // if ( GlobalConfig->KvpncDebugLevel > 0 ) // GlobalConfig->appendLogEntry ( i18n ( "l2tp secrets file: %1" ).arg ( tmpPath + "l2tp-secrets." + GlobalConfig->currentProfile->getName() ), GlobalConfig->debug ); -// QFile L2tpdSecretsFile ( L2tpSecrets ); +// TQFile L2tpdSecretsFile ( L2tpSecrets ); // stream.setDevice ( &L2tpdSecretsFile ); // if ( L2tpdSecretsFile.open ( IO_WriteOnly | IO_WriteOnly ) ) // { @@ -24087,7 +24087,7 @@ void KVpnc::prepareL2tpd() // if ( GlobalConfig->currentProfile->getSaveUserPassword() ) // GlobalConfig->TmpPassword = GlobalConfig->currentProfile->getUserPassword(); // -// QString UsernameStr; +// TQString UsernameStr; // if ( !GlobalConfig->currentProfile->getDontSaveUsername() ) // UsernameStr = GlobalConfig->currentProfile->getUserName(); // else @@ -24120,11 +24120,11 @@ void KVpnc::prepareL2tpd() Utils ( GlobalConfig, this ).doChmod ( "/etc/ppp/pap-secrets", "go-rwx" ); // write pppd /etc/ppp/chap-secrets - QString ChapSecrets = "/etc/ppp/chap-secrets"; // /etc/ppp/chap-secrets + TQString ChapSecrets = "/etc/ppp/chap-secrets"; // /etc/ppp/chap-secrets if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1" ).arg ( "/etc/ppp/chap-secrets" ), GlobalConfig->debug ); - QFile ChapSecretsFile ( ChapSecrets ); + TQFile ChapSecretsFile ( ChapSecrets ); stream.setDevice ( &ChapSecretsFile ); if ( ChapSecretsFile.open ( IO_WriteOnly | IO_Append ) ) { @@ -24134,7 +24134,7 @@ void KVpnc::prepareL2tpd() if ( GlobalConfig->currentProfile->getSaveUserPassword() ) GlobalConfig->TmpPassword = GlobalConfig->currentProfile->getUserPassword(); - QString UsernameStr; + TQString UsernameStr; if ( !GlobalConfig->currentProfile->getDontSaveUsername() ) UsernameStr = GlobalConfig->currentProfile->getUserName(); else @@ -24171,10 +24171,10 @@ void KVpnc::prepareL2tpd() Utils ( GlobalConfig, this ).doChmod ( "/etc/ppp/chap-secrets", "go-rwx" ); // write pppd /etc/ppp/pap-secrets - QString papSecrets = "/etc/ppp/pap-secrets"; // /etc/ppp/pap-secrets + TQString papSecrets = "/etc/ppp/pap-secrets"; // /etc/ppp/pap-secrets if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1" ).arg ( "/etc/ppp/pap-secrets" ), GlobalConfig->debug ); - QFile papSecretsFile ( papSecrets ); + TQFile papSecretsFile ( papSecrets ); papSecretsFile.setName ( papSecrets ); stream.setDevice ( &papSecretsFile ); if ( papSecretsFile.open ( IO_WriteOnly | IO_Append ) ) @@ -24185,7 +24185,7 @@ void KVpnc::prepareL2tpd() if ( GlobalConfig->currentProfile->getSaveUserPassword() ) GlobalConfig->TmpPassword = GlobalConfig->currentProfile->getUserPassword(); - QString UsernameStr; + TQString UsernameStr; if ( !GlobalConfig->currentProfile->getDontSaveUsername() ) UsernameStr = GlobalConfig->currentProfile->getUserName(); else @@ -24215,10 +24215,10 @@ void KVpnc::prepareL2tpd() if ( GlobalConfig->currentProfile->getL2tpDaemon() == VpnAccountData::openl2tp ) { // write openl2tp..conf - QString tmpPath = locateLocal ( "data", "kvpnc/" ); - QString OpenL2tpContName = tmpPath + "openl2tp." + GlobalConfig->currentProfile->getName() + ".conf"; - QFile OpenL2tpConfigFile ( OpenL2tpContName ); - QTextStream stream ( &OpenL2tpConfigFile ); + TQString tmpPath = locateLocal ( "data", "kvpnc/" ); + TQString OpenL2tpContName = tmpPath + "openl2tp." + GlobalConfig->currentProfile->getName() + ".conf"; + TQFile OpenL2tpConfigFile ( OpenL2tpContName ); + TQTextStream stream ( &OpenL2tpConfigFile ); if ( OpenL2tpConfigFile.open ( IO_WriteOnly ) ) { stream << "# generated by kvpnc. Do not edit it." << "\n"; @@ -24244,7 +24244,7 @@ void KVpnc::prepareL2tpd() if ( GlobalConfig->currentProfile->getSaveUserPassword() ) GlobalConfig->TmpPassword = GlobalConfig->currentProfile->getUserPassword(); - QString UsernameStr; + TQString UsernameStr; if ( !GlobalConfig->currentProfile->getDontSaveUsername() ) UsernameStr = GlobalConfig->currentProfile->getUserName(); else @@ -24301,10 +24301,10 @@ void KVpnc::prepareL2tpd() void KVpnc::start_l2tpd() { - QString daemon=""; + TQString daemon=""; if ( GlobalConfig->currentProfile->getL2tpDaemon() == VpnAccountData::l2tpd ) { - if ( !GlobalConfig->pathToXl2tpd.isEmpty() && QFile ( GlobalConfig->pathToXl2tpd ).exists() ) + if ( !GlobalConfig->pathToXl2tpd.isEmpty() && TQFile ( GlobalConfig->pathToXl2tpd ).exists() ) { if ( GlobalConfig->KvpncDebugLevel > 1 ) GlobalConfig->appendLogEntry ( i18n ( "Using %1." ).arg ( "xl2tpd" ),GlobalConfig->debug ); @@ -24319,14 +24319,14 @@ void KVpnc::start_l2tpd() bool control_interface_success=true; - QString L2tpdPid=""; + TQString L2tpdPid=""; if ( daemon == "xl2tpd" ) L2tpdPid="/var/run/xl2tpd.pid"; else L2tpdPid="/var/run/l2tpd.pid"; - QString L2tpdControl=""; + TQString L2tpdControl=""; if ( daemon == "xl2tpd" ) L2tpdControl="/var/run/l2tp-control"; else @@ -24334,19 +24334,19 @@ void KVpnc::start_l2tpd() -// if (QFile(L2tpdPid).exists()) +// if (TQFile(L2tpdPid).exists()) // { // if (GlobalConfig->KvpncDebugLevel > 1) // GlobalConfig->appendLogEntry(i18n("Using control interface for starting l2tp connection"),GlobalConfig->debug); // -// QString L2tpdControl=""; +// TQString L2tpdControl=""; // if (daemon == "xl2tpd") // L2tpdControl="/var/run/xl2tpd/l2tp-control"; // else // L2tpdControl="/var/run/l2tp-control"; // -// QFile L2tpdControlFile ( L2tpdControl ); -// QTextStream stream( &L2tpdControlFile ); +// TQFile L2tpdControlFile ( L2tpdControl ); +// TQTextStream stream( &L2tpdControlFile ); // if ( L2tpdControlFile.open( IO_WriteOnly ) ) { // stream << "c " << GlobalConfig->currentProfile->getName() << "\n"; // L2tpdControlFile.close(); @@ -24357,14 +24357,14 @@ void KVpnc::start_l2tpd() // GlobalConfig->appendLogEntry(i18n("Starting l2tp connection via control interface has been failed"),GlobalConfig->error); // } // } -// if (!QFile("/var/run/l2tpd.pid").exists() || control_interface_success==false) +// if (!TQFile("/var/run/l2tpd.pid").exists() || control_interface_success==false) { if ( GlobalConfig->KvpncDebugLevel > 1 ) GlobalConfig->appendLogEntry ( i18n ( "Starting l2tpd manually" ),GlobalConfig->debug ); sleep ( 2 ); // start l2tpd - L2tpdProcess = new QProcess ( this ); + L2tpdProcess = new TQProcess ( this ); // if ( daemon == "xl2tpd" ) { @@ -24394,28 +24394,28 @@ void KVpnc::start_l2tpd() if ( GlobalConfig->KvpncDebugLevel > 2 ) { - QString cmdline = ""; - QStringList cmdarguments = L2tpdProcess->arguments(); - for ( QStringList::Iterator it = cmdarguments.begin(); it != cmdarguments.end(); ++it ) + TQString cmdline = ""; + TQStringList cmdarguments = L2tpdProcess->arguments(); + for ( TQStringList::Iterator it = cmdarguments.begin(); it != cmdarguments.end(); ++it ) { - cmdline += " " + QString ( *it ); + cmdline += " " + TQString ( *it ); } if ( GlobalConfig->KvpncDebugLevel > 1 ) GlobalConfig->appendLogEntry ( "\""+daemon+"\" cmd line: " + cmdline , GlobalConfig->debug ); } - connect ( L2tpdProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_l2tpd() ) ); - connect ( L2tpdProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_l2tpd() ) ); + connect ( L2tpdProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_l2tpd() ) ); + connect ( L2tpdProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_l2tpd() ) ); - connect ( this, SIGNAL ( L2tpdStdoutRecieved() ), this, SLOT ( processStdout_l2tpd() ) ); - connect ( this, SIGNAL ( L2tpdStderrRecieved() ), this, SLOT ( processStderr_l2tpd() ) ); + connect ( this, TQT_SIGNAL ( L2tpdStdoutRecieved() ), this, TQT_SLOT ( processStdout_l2tpd() ) ); + connect ( this, TQT_SIGNAL ( L2tpdStderrRecieved() ), this, TQT_SLOT ( processStderr_l2tpd() ) ); if ( !L2tpdProcess->start ( env ) ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( daemon ), GlobalConfig->error ); KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( daemon ) ); - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); } else { @@ -24426,14 +24426,14 @@ void KVpnc::start_l2tpd() // if (GlobalConfig->KvpncDebugLevel > 1) // GlobalConfig->appendLogEntry(i18n("Using control interface for starting l2tp connection"),GlobalConfig->debug); // -// QString L2tpdControl=""; +// TQString L2tpdControl=""; // if (daemon == "xl2tpd") // L2tpdControl="/var/run/xl2tpd/l2tp-control"; // else // L2tpdControl="/var/run/l2tp-control"; // -// QFile L2tpdControlFile ( L2tpdControl ); -// QTextStream stream( &L2tpdControlFile ); +// TQFile L2tpdControlFile ( L2tpdControl ); +// TQTextStream stream( &L2tpdControlFile ); // if ( L2tpdControlFile.open( IO_WriteOnly ) ) { // stream << "c " << GlobalConfig->currentProfile->getName() << "\n"; // L2tpdControlFile.close(); @@ -24456,7 +24456,7 @@ void KVpnc::start_l2tpd() // bool control_interface_success=true; -// QString L2tpdPid=""; +// TQString L2tpdPid=""; // if (daemon == "xl2tpd") // L2tpdPid="/var/run/xl2tpd.pid"; // else @@ -24471,7 +24471,7 @@ void KVpnc::start_l2tpd() // sleep ( 2 ); // start openl2tpd - OpenL2tpProcess = new QProcess ( this ); + OpenL2tpProcess = new TQProcess ( this ); // if ( GlobalConfig->KvpncDebugLevel > 1 ) GlobalConfig->appendLogEntry ( i18n ( "Using %1." ).arg ( "openl2tpd" ),GlobalConfig->debug ); @@ -24486,8 +24486,8 @@ void KVpnc::start_l2tpd() OpenL2tpProcess->addArgument ( "-f" ); // foreground OpenL2tpProcess->addArgument ( "-c" ); - QString tmpPath = locateLocal ( "data", "kvpnc/" ); - QString OpenL2tpContName = tmpPath + "openl2tp." + GlobalConfig->currentProfile->getName() + ".conf"; + TQString tmpPath = locateLocal ( "data", "kvpnc/" ); + TQString OpenL2tpContName = tmpPath + "openl2tp." + GlobalConfig->currentProfile->getName() + ".conf"; OpenL2tpProcess->addArgument ( OpenL2tpContName ); @@ -24495,24 +24495,24 @@ void KVpnc::start_l2tpd() if ( GlobalConfig->KvpncDebugLevel > 2 ) { - QString cmdline = ""; - QStringList cmdarguments = OpenL2tpProcess->arguments(); - for ( QStringList::Iterator it = cmdarguments.begin(); it != cmdarguments.end(); ++it ) + TQString cmdline = ""; + TQStringList cmdarguments = OpenL2tpProcess->arguments(); + for ( TQStringList::Iterator it = cmdarguments.begin(); it != cmdarguments.end(); ++it ) { - cmdline += " " + QString ( *it ); + cmdline += " " + TQString ( *it ); } GlobalConfig->appendLogEntry ( "\""+daemon+"\" cmd line: " + cmdline , GlobalConfig->debug ); } - connect ( OpenL2tpProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_openl2tp() ) ); - connect ( OpenL2tpProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_openl2tp() ) ); + connect ( OpenL2tpProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_openl2tp() ) ); + connect ( OpenL2tpProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_openl2tp() ) ); if ( !OpenL2tpProcess->start ( env ) ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( daemon ), GlobalConfig->error ); KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( daemon ) ); - setGuiStatus ( disconnected ); + setGuitqStatus ( disconnected ); } else { @@ -24530,16 +24530,16 @@ void KVpnc::checkL2tpPppUp() { GlobalConfig->appendLogEntry ( i18n ( "Check ppp device..." ), GlobalConfig->debug ); - QString tmpPath = locateLocal ( "data", "kvpnc/" ); - QFile L2tpPppPidFile ( "/var/run/ppp-kvpnc." +GlobalConfig->currentProfile->getName() +".pid" ); + TQString tmpPath = locateLocal ( "data", "kvpnc/" ); + TQFile L2tpPppPidFile ( "/var/run/ppp-kvpnc." +GlobalConfig->currentProfile->getName() +".pid" ); if ( L2tpPppPidFile.exists() ) { if ( L2tpPppPidFile.open ( IO_ReadOnly ) ) { L2tpPppDevice=""; - QTextStream stream ( &L2tpPppPidFile ); - QString line = ""; + TQTextStream stream ( &L2tpPppPidFile ); + TQString line = ""; while ( !stream.atEnd() ) { line = stream.readLine(); @@ -24596,10 +24596,10 @@ void KVpnc::checkL2tpPppUp() GlobalConfig->status = GlobalConfig->connected; - disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) ); - connect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); + connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); durationTimer.start ( 1000, FALSE ); - setGuiStatus ( connected ); + setGuitqStatus ( connected ); setFirewallAfterConnect(); @@ -24628,22 +24628,22 @@ void KVpnc::checkL2tpPppUp() } -bool KVpnc::checkCiscoVpncStatus() +bool KVpnc::checkCiscoVpnctqStatus() { ciscoVpncRunning = false; - TestCiscoVpncProcess = new QProcess ( this ); - TestCiscoVpncProcess->setCommunication ( QProcess::Stdin | QProcess::Stdout | QProcess::Stderr | QProcess::DupStderr ); + TestCiscoVpncProcess = new TQProcess ( this ); + TestCiscoVpncProcess->setCommunication ( TQProcess::Stdin | TQProcess::Stdout | TQProcess::Stderr | TQProcess::DupStderr ); TestCiscoVpncProcess->addArgument ( GlobalConfig->InterpreterShell ); TestCiscoVpncProcess->addArgument ( "/etc/init.d/vpnclient_init" ); TestCiscoVpncProcess->addArgument ( "status" ); - connect ( TestCiscoVpncProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readCiscoVpncTestProcessOutput() ) ); - connect ( TestCiscoVpncProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readCiscoVpncTestProcessOutput() ) ); + connect ( TestCiscoVpncProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readCiscoVpncTestProcessOutput() ) ); + connect ( TestCiscoVpncProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readCiscoVpncTestProcessOutput() ) ); if ( !TestCiscoVpncProcess->start ( env ) ) { - disconnect ( TestCiscoVpncProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readCiscoVpncTestProcessOutput() ) ); - disconnect ( TestCiscoVpncProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readCiscoVpncTestProcessOutput() ) ); + disconnect ( TestCiscoVpncProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readCiscoVpncTestProcessOutput() ) ); + disconnect ( TestCiscoVpncProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readCiscoVpncTestProcessOutput() ) ); delete TestCiscoVpncProcess; TestCiscoVpncProcess=0L; GlobalConfig->appendLogEntry ( i18n ( "unable to start proc (%1)!" ).arg ( i18n ( "Test Cisco vpnclient" ) ) , KVpncConfig::error ); @@ -24656,8 +24656,8 @@ bool KVpnc::checkCiscoVpncStatus() usleep ( 500 ); parent->processEvents(); } - disconnect ( TestCiscoVpncProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readCiscoVpncTestProcessOutput() ) ); - disconnect ( TestCiscoVpncProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readCiscoVpncTestProcessOutput() ) ); + disconnect ( TestCiscoVpncProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readCiscoVpncTestProcessOutput() ) ); + disconnect ( TestCiscoVpncProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readCiscoVpncTestProcessOutput() ) ); delete TestCiscoVpncProcess; TestCiscoVpncProcess=0L; } @@ -24666,19 +24666,19 @@ bool KVpnc::checkCiscoVpncStatus() void KVpnc::startCiscoVpnc() { - TestCiscoVpncProcess = new QProcess ( this ); - TestCiscoVpncProcess->setCommunication ( QProcess::Stdin | QProcess::Stdout | QProcess::Stderr | QProcess::DupStderr ); + TestCiscoVpncProcess = new TQProcess ( this ); + TestCiscoVpncProcess->setCommunication ( TQProcess::Stdin | TQProcess::Stdout | TQProcess::Stderr | TQProcess::DupStderr ); TestCiscoVpncProcess->addArgument ( GlobalConfig->InterpreterShell ); TestCiscoVpncProcess->addArgument ( "/etc/init.d/vpnclient_init" ); TestCiscoVpncProcess->addArgument ( "start" ); -// connect ( TestCiscoVpncProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readCiscoVpncTestProcessOutput() ) ); -// connect ( TestCiscoVpncProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readCiscoVpncTestProcessOutput() ) ); +// connect ( TestCiscoVpncProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readCiscoVpncTestProcessOutput() ) ); +// connect ( TestCiscoVpncProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readCiscoVpncTestProcessOutput() ) ); if ( !TestCiscoVpncProcess->start ( env ) ) { -// disconnect ( TestCiscoVpncProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readCiscoVpncTestProcessOutput() ) ); -// disconnect ( TestCiscoVpncProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readCiscoVpncTestProcessOutput() ) ); +// disconnect ( TestCiscoVpncProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readCiscoVpncTestProcessOutput() ) ); +// disconnect ( TestCiscoVpncProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readCiscoVpncTestProcessOutput() ) ); delete TestCiscoVpncProcess; TestCiscoVpncProcess=0L; GlobalConfig->appendLogEntry ( i18n ( "unable to start proc (%1)!" ).arg ( i18n ( "Start Cisco vpnclient" ) ) , KVpncConfig::error ); @@ -24693,8 +24693,8 @@ void KVpnc::startCiscoVpnc() usleep ( 500 ); parent->processEvents(); } -// disconnect ( TestCiscoVpncProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readCiscoVpncTestProcessOutput() ) ); -// disconnect ( TestCiscoVpncProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readCiscoVpncTestProcessOutput() ) ); +// disconnect ( TestCiscoVpncProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readCiscoVpncTestProcessOutput() ) ); +// disconnect ( TestCiscoVpncProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readCiscoVpncTestProcessOutput() ) ); delete TestCiscoVpncProcess; TestCiscoVpncProcess=0L; } @@ -24703,7 +24703,7 @@ void KVpnc::startCiscoVpnc() void KVpnc::sendFeedbackMail() { FeedbackDialog = new KFeedbackDialog ( "crissi99@gmx.de", "feedback_mail" ); - connect ( FeedbackDialog->form(), SIGNAL ( mailSent() ), this, SLOT ( feedbackMailSent() ) ); + connect ( FeedbackDialog->form(), TQT_SIGNAL ( mailSent() ), this, TQT_SLOT ( feedbackMailSent() ) ); KFeedbackQuestionList * list = FeedbackDialog->form() ->questionList(); @@ -24820,7 +24820,7 @@ void KVpnc::feedbackMailSent() } // --- DCOP stuff --- -QString KVpnc::getVersion() +TQString KVpnc::getVersion() { return parent->aboutData() ->version(); } @@ -24847,7 +24847,7 @@ uint KVpnc::getConnectedTime() return 0; } -QString KVpnc::getStatus() +TQString KVpnc::gettqStatus() { if ( GlobalConfig->status == GlobalConfig->connected ) return "connected"; @@ -24859,12 +24859,12 @@ QString KVpnc::getStatus() return "unknown"; } -QString KVpnc::getCurrentProfile() +TQString KVpnc::getCurrentProfile() { return GlobalConfig->currentProfile->getName(); } -void KVpnc::setProfile ( QString profilename ) +void KVpnc::setProfile ( TQString profilename ) { for ( uint i = 0; i < GlobalConfig->AccountList->count();i++ ) { @@ -24908,7 +24908,7 @@ void KVpnc::doImportPcf() importProfileClicked ( "" ); } -void KVpnc::doImportPcf ( QString file ) +void KVpnc::doImportPcf ( TQString file ) { importProfileClicked ( file ); } @@ -24918,14 +24918,14 @@ void KVpnc::doImportOpenvpnConfig() importOpenvpnProfileClicked ( "" ); } -void KVpnc::doImportOpenvpnConfig ( QString file ) +void KVpnc::doImportOpenvpnConfig ( TQString file ) { importOpenvpnProfileClicked ( file ); } -QStringList KVpnc::profiles() +TQStringList KVpnc::profiles() { - QStringList profiles; + TQStringList profiles; VpnAccountData * it; if ( !GlobalConfig->AccountList->isEmpty() ) { @@ -24943,19 +24943,19 @@ void KVpnc::doQuit() quitCalled(); } -QStringList KVpnc::toolinfo() +TQStringList KVpnc::toolinfo() { - QStringList toolinfo; + TQStringList toolinfo; ToolInfo *tool = 0; for ( tool = GlobalConfig->ToolList->first(); tool; tool = GlobalConfig->ToolList->next() ) { - QString toolstring; + TQString toolstring; std::cout << "tool: " << tool->Name.ascii() << std::endl; // std::cout << "Version: " << tool->Version << std::endl; // std::cout << "Path: " << tool->PathToExec << std::endl << std::endl; - QString state = ""; - QString usability = ""; - QString comment = ""; + TQString state = ""; + TQString usability = ""; + TQString comment = ""; //FIXME how it could be better? if ( tool->Name == "vpnc" ) @@ -25202,9 +25202,9 @@ void KVpnc::doSendFeedbackMail() sendFeedbackMail(); } -QStringList KVpnc::getProfileTypes() +TQStringList KVpnc::getProfileTypes() { - QStringList ProfileTypes; + TQStringList ProfileTypes; ProfileTypes.append ( "Cisco (vpnc)" ); ProfileTypes.append ( "IPSec (racoon)" ); diff --git a/src/kvpnc.h b/src/kvpnc.h index 51e29fb..731fc3d 100644 --- a/src/kvpnc.h +++ b/src/kvpnc.h @@ -24,19 +24,19 @@ #ifndef __KVPNC_H__ #define __KVPNC_H__ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -72,6 +72,7 @@ class KVpnc : public KMainWindow , DCOPObject { Q_OBJECT + TQ_OBJECT K_DCOP public: /** @@ -79,7 +80,7 @@ public: * @param parent Parent widget * @param name Name of the Mainwindow */ - KVpnc( KApplication *parent, QWidget *qparent = 0, const char *name = 0 ); + KVpnc( KApplication *parent, TQWidget *qparent = 0, const char *name = 0 ); /** * Destruktor @@ -110,13 +111,13 @@ protected: * sets the gui status * @param status The status that will be set */ - void setGuiStatus( int status ); + void setGuitqStatus( int status ); /** * terminates the connection * @param proc the connect process */ - void terminateConnection ( QProcess *proc ); + void terminateConnection ( TQProcess *proc ); /** * called when quit requested */ @@ -134,18 +135,18 @@ public: * @param Cert certificate from wich should be extracted * @param user true if user id, false if issuer id */ - QString getX509CertificateID( QString Cert, bool user ); + TQString getX509CertificateID( TQString Cert, bool user ); void profileAddedOrDeleted(); bool setVirtualIP(); private: // FIXME also declared at kvpncconfig -> made it only in one place - enum ConnectionStatus {disconnected=0, connecting=1, connected=2}; + enum ConnectiontqStatus {disconnected=0, connecting=1, connected=2}; enum LogType {info=0, remote=1, error=2, success=3, debug=4}; KApplication *parent; - QStringList *env; + TQStringList *env; KVpncConfig *GlobalConfig; KVpncKicker* KVpncDock; //< kicker menu @@ -182,15 +183,15 @@ private: KToggleAction *DebugconsoleAction; //< toggle debug console KToggleAction *GenerateOpenvpnKeyAction; //< generate OpenVPN key MainView* mw; //< Main gui - QTimer timer; - QTimer durationTimer; //< timer for counting connection time - QTimer IpsecWhackStatusTimer; //< getting ipsec status periodically - QTimer L2tpWaitForPppUpTimer; //< getting ppp device + TQTimer timer; + TQTimer durationTimer; //< timer for counting connection time + TQTimer IpsecWhackStatusTimer; //< getting ipsec status periodically + TQTimer L2tpWaitForPppUpTimer; //< getting ppp device int connectCounter; //< counter for connecting int RacoonctlConnectCounter; //<< counter for waiting of adminsock int sec, min, hour; int racoon_tunnel_state; // 0 => no tunnel, 1 => first tunnel, 2 => second tunnel - int prevConnectionState; //< needed for setGuiStatus(), holds previous state before disconnect (connected, connecting) + int prevConnectionState; //< needed for setGuitqStatus(), holds previous state before disconnect (connected, connecting) bool cancelClicked; bool deviceaddrstr2addr; @@ -215,103 +216,103 @@ private: bool pppdHasReplacedefaultrouteSupport; - QString OldDefaultroute; - QString VpncConnectScript; - QString VpncDisconnectScript; - QString tmpPath; - QString ProcessMsg_connect; - QString ProcessMsg_disconnect; - QString deviceaddrstr; - QString deviceaddr; - QString tmpInterface; - QString LocalIP; - QString VpncGateway; - QString PptpGateway; - QString VpncScript; - QString issuerID; // for id extract - QString userID; // for id extract - QString TunnelInterfaceIP; - QString TmpDns1; - QString TmpDns2; - QString VpncDevice; - QString CiscoVpncDevice; - QString L2tpPppDevice; - QString PppdDevice; - QString OpenvpnDevice; - QString SshDevice; - QString IpsecType; //< openswan, strongswan, freeswan - QString Pkcs11PIN; - QString PrettyTypeString; - QString PrettyStatusMessage; - - QProcess *VpncProcess; + TQString OldDefaultroute; + TQString VpncConnectScript; + TQString VpncDisconnectScript; + TQString tmpPath; + TQString ProcessMsg_connect; + TQString ProcessMsg_disconnect; + TQString deviceaddrstr; + TQString deviceaddr; + TQString tmpInterface; + TQString LocalIP; + TQString VpncGateway; + TQString PptpGateway; + TQString VpncScript; + TQString issuerID; // for id extract + TQString userID; // for id extract + TQString TunnelInterfaceIP; + TQString TmpDns1; + TQString TmpDns2; + TQString VpncDevice; + TQString CiscoVpncDevice; + TQString L2tpPppDevice; + TQString PppdDevice; + TQString OpenvpnDevice; + TQString SshDevice; + TQString IpsecType; //< openswan, strongswan, freeswan + TQString Pkcs11PIN; + TQString PrettyTypeString; + TQString PrettyStatusMessage; + + TQProcess *VpncProcess; KProcess *IpsecConnectProcess; - QProcess *DisconnectProcess; - QProcess *CiscoVpncProcess; //< vpnclient - QProcess *RacoonProcess; //< racoon - QProcess *RacoonHelperProcess; - QProcess *IpsecProcess; //< freeswan/openswan/strongswan - QProcess *IpsecStartProcess; - QProcess *IpsecWhackProcess; //< ipsec whack --initate - QProcess *IpsecWhackStatusProcess; //< ipsec whack --status - QProcess *IpsecWhackListenProcess; //< ipsec whack --listen - QProcess *IpsecWhackDeleteProcess; //< ipsec whack --delete - QProcess *PingProcess; - QProcess *RacoonTailProcess; - QProcess *RacoonctlProcess; //< racoonctl - QProcess *X509CertificateExtractProcess; - QProcess *PptpProcess; - QProcess *OpenvpnProcess; - QProcess *CmdBeforeConnectProcess; - QProcess *CmdBeforeDisconnectProcess; - QProcess *CmdAfterConnectProcess; - QProcess *CmdAfterDisconnectProcess; - QProcess *SetFirewallAfterConnectProcess; - QProcess *SetFirewallBeforeDisconnectProcess; - QProcess *RouteProcess; - QProcess *SetVirtualIPProcess; - QProcess *ReplaceDefaultRouteProcess; - QProcess *ConnectionStatusCheckProcess; - QProcess *TestCiscoVpncProcess; - QProcess *IptablesProcess; - QProcess *KillProcess; - QProcess *PptpRouteProcess; - QProcess *ChmodProcess; - QProcess *pppdUpProcess; - QProcess *pppdDelDefaultRouteProcess; - QProcess *L2tpdProcess; - QProcess *OpenL2tpProcess; - QProcess *RemoveSetkeyProcess; - QProcess *BugReportProcess; - QProcess *DonateProcess; - QProcess *VtundProcess; - QProcess *StartStopOpenl2tpProcess; + TQProcess *DisconnectProcess; + TQProcess *CiscoVpncProcess; //< vpnclient + TQProcess *RacoonProcess; //< racoon + TQProcess *RacoonHelperProcess; + TQProcess *IpsecProcess; //< freeswan/openswan/strongswan + TQProcess *IpsecStartProcess; + TQProcess *IpsecWhackProcess; //< ipsec whack --initate + TQProcess *IpsecWhackStatusProcess; //< ipsec whack --status + TQProcess *IpsecWhackListenProcess; //< ipsec whack --listen + TQProcess *IpsecWhackDeleteProcess; //< ipsec whack --delete + TQProcess *PingProcess; + TQProcess *RacoonTailProcess; + TQProcess *RacoonctlProcess; //< racoonctl + TQProcess *X509CertificateExtractProcess; + TQProcess *PptpProcess; + TQProcess *OpenvpnProcess; + TQProcess *CmdBeforeConnectProcess; + TQProcess *CmdBeforeDisconnectProcess; + TQProcess *CmdAfterConnectProcess; + TQProcess *CmdAfterDisconnectProcess; + TQProcess *SetFirewallAfterConnectProcess; + TQProcess *SetFirewallBeforeDisconnectProcess; + TQProcess *RouteProcess; + TQProcess *SetVirtualIPProcess; + TQProcess *ReplaceDefaultRouteProcess; + TQProcess *ConnectionStatusCheckProcess; + TQProcess *TestCiscoVpncProcess; + TQProcess *IptablesProcess; + TQProcess *KillProcess; + TQProcess *PptpRouteProcess; + TQProcess *ChmodProcess; + TQProcess *pppdUpProcess; + TQProcess *pppdDelDefaultRouteProcess; + TQProcess *L2tpdProcess; + TQProcess *OpenL2tpProcess; + TQProcess *RemoveSetkeyProcess; + TQProcess *BugReportProcess; + TQProcess *DonateProcess; + TQProcess *VtundProcess; + TQProcess *StartStopOpenl2tpProcess; KProcess *SshProcess; - QProcess *backupDefaultRouteProcess; - QProcess *pptpdKillProcess; - QProcess *SshDownProcess; - QProcess *pppdDownProcess; - QProcess *killracoonprocess; - QProcess *killl2tpdprocess; - QProcess *SshUpProcess; + TQProcess *backupDefaultRouteProcess; + TQProcess *pptpdKillProcess; + TQProcess *SshDownProcess; + TQProcess *pppdDownProcess; + TQProcess *killracoonprocess; + TQProcess *killl2tpdprocess; + TQProcess *SshUpProcess; int TimeOutProcess; //< for timeout int ConnectingProcess; //< for killing process - QPixmap connectedIcon; - QPixmap disconnectedIcon; - QPixmap connectingIcon; - QPixmap *connectingStatusPixmap; - QPixmap *disconnectedStatusPixmap; - QPixmap *connectedStatusPixmap; + TQPixmap connectedIcon; + TQPixmap disconnectedIcon; + TQPixmap connectingIcon; + TQPixmap *connectingStatusPixmap; + TQPixmap *disconnectedStatusPixmap; + TQPixmap *connectedStatusPixmap; - QLabel *statusColorLabel; - QPopupMenu *QuickConnectMenu; + TQLabel *statusColorLabel; + TQPopupMenu *QuickConnectMenu; OpenvpnManagementHandler *managementhandler ; KFeedbackDialog *FeedbackDialog; - QString L2tpdBufferStdoutString; - QString L2tpdBufferStderrString; + TQString L2tpdBufferStdoutString; + TQString L2tpdBufferStderrString; PreferencesDialog *prefDlg; @@ -336,7 +337,7 @@ public slots: * @param text The text that will be set * @param id What type its is */ - void slotStatusMsg( const QString &text, int id = ID_STATUS_MSG ); + void slotStatusMsg( const TQString &text, int id = ID_STATUS_MSG ); void connectClicked(); void disconnectClicked(); @@ -344,7 +345,7 @@ public slots: void newSessionClicked(); void deleteSessionClicked(); void renameSessionClicked (); - void sessionToggled( const QString& ); + void sessionToggled( const TQString& ); void helpClicked(); void toolsInfoClicked(); void vpnTypesInfoClicked(); @@ -360,7 +361,7 @@ private slots: * called if close clicked * @param e the event which happen */ - void closeEvent( QCloseEvent* e ); + void closeEvent( TQCloseEvent* e ); bool queryClose(); void shutdownCalled(); void slotCancelClicked(); @@ -437,7 +438,7 @@ private slots: void racoonctlExited(); void prepareL2tpd(); //< write l2tpd conf etc. void start_ipsec_initiate(); - void doAddRemoveVirtualIp(QString action); + void doAddRemoveVirtualIp(TQString action); void importProfileClicked(); //< PCF import void importIpsecProfileClicked(); @@ -467,7 +468,7 @@ private slots: void vpncStarted(); void ipsecStarted(); void ipsecPhase2Established(); - void checkIpsecWhackStatus(); + void checkIpsecWhacktqStatus(); void addIpsecConnection(); void racoonStarted(); void pppdStarted(); @@ -500,7 +501,7 @@ private slots: void sendFeedbackMail(); void feedbackMailSent(); void start_l2tpd(); - bool checkCiscoVpncStatus(); + bool checkCiscoVpnctqStatus(); void startCiscoVpnc(); void startStopIpsec(bool stop=false, bool silent=false); void startStopOpenl2tp(bool stop=false, bool silent=false); @@ -508,39 +509,39 @@ private slots: signals: void L2tpdStdoutRecieved(); void L2tpdStderrRecieved(); - void newProfileCreated(QString Name); + void newProfileCreated(TQString Name); public: - void importOpenvpnProfileClicked(QString file); //< OpenVPN config file import - void importProfileClicked(QString file); //< PCF import + void importOpenvpnProfileClicked(TQString file); //< OpenVPN config file import + void importProfileClicked(TQString file); //< PCF import bool backupResolvConf(); bool restoreResolvConf(); public: k_dcop: - QString getVersion(); + TQString getVersion(); void doConnect(); void doDisconnect(); uint getConnectedTime(); - QString getStatus(); - QString getCurrentProfile(); - void setProfile(QString profilename); + TQString gettqStatus(); + TQString getCurrentProfile(); + void setProfile(TQString profilename); void createNewProfile(); void createNewProfileWithWizard(); void deleteCurrentProfile(); void openPreferences(); void doImportCert(); void doImportPcf(); - void doImportPcf(QString file); + void doImportPcf(TQString file); void doImportOpenvpnConfig(); - void doImportOpenvpnConfig(QString file); - QStringList profiles(); - QStringList toolinfo(); + void doImportOpenvpnConfig(TQString file); + TQStringList profiles(); + TQStringList toolinfo(); void doQuit(); void doGenerateOpenvpnKey(); void doSendFeedbackMail(); - QStringList getProfileTypes(); + TQStringList getProfileTypes(); }; diff --git a/src/kvpncconfig.cpp b/src/kvpncconfig.cpp index b232d86..802a070 100644 --- a/src/kvpncconfig.cpp +++ b/src/kvpncconfig.cpp @@ -28,12 +28,12 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -41,7 +41,7 @@ #include //END INCLUDES -KVpncConfig::KVpncConfig(QWidget *parent,KStatusBar *statusbar) +KVpncConfig::KVpncConfig(TQWidget *parent,KStatusBar *statusbar) { this->parent = parent; this->statusbar = statusbar; @@ -154,20 +154,20 @@ KVpncConfig::KVpncConfig(QWidget *parent,KStatusBar *statusbar) DebugBackgroundcolor=black; - ToolList = new QPtrList(); + ToolList = new TQPtrList(); ToolList->setAutoDelete( TRUE ); - AccountList = new QPtrList(); + AccountList = new TQPtrList(); AccountList->setAutoDelete( TRUE ); // the list owns the objects - InfoLogColor=Qt::black; - ErrorLogColor=Qt::red; - SuccessLogColor=Qt::darkGreen; - DebugLogColor=Qt::yellow; + InfoLogColor=TQt::black; + ErrorLogColor=TQt::red; + SuccessLogColor=TQt::darkGreen; + DebugLogColor=TQt::yellow; KStandardDirs *dirs = KGlobal::dirs(); - logfileName = QString(dirs->saveLocation( "data" )); - QString logfilePath = QString(logfileName + "/kvpnc/kvpnc.log"); + logfileName = TQString(dirs->saveLocation( "data" )); + TQString logfilePath = TQString(logfileName + "/kvpnc/kvpnc.log"); logfile.setName( logfilePath ); logFileStream.setDevice( &logfile ); @@ -180,12 +180,12 @@ KVpncConfig::~KVpncConfig() delete ToolList; } -void KVpncConfig::setLogOutput(QTextEdit *LogOutput) +void KVpncConfig::setLogOutput(TQTextEdit *LogOutput) { this->LogOutput = LogOutput; } -void KVpncConfig::appendLogEntry( QString msg, LogType type ) +void KVpncConfig::appendLogEntry( TQString msg, LogType type ) { // write to logfile @@ -194,7 +194,7 @@ void KVpncConfig::appendLogEntry( QString msg, LogType type ) if ( !logfile.isOpen() ) { KStandardDirs * dirs = KGlobal::dirs(); - QString logfileName = dirs->saveLocation( "data" ); + TQString logfileName = dirs->saveLocation( "data" ); logfileName += "/kvpnc/kvpnc.log"; // /root.kde/share/apps/kvpnc.log // KMessageBox::information( this, logfileName, "info" ); logfile.setName( logfileName ); @@ -202,18 +202,18 @@ void KVpncConfig::appendLogEntry( QString msg, LogType type ) KMessageBox::error( 0, i18n( "Log file can not be opened!" ) ); else { - // QTextStream s( &logfile ); + // TQTextStream s( &logfile ); logFileStream << i18n( "Log session started at: " ); - logFileStream << QDateTime::currentDateTime().toString( Qt::TextDate ); + logFileStream << TQDateTime::tqcurrentDateTime().toString( Qt::TextDate ); logFileStream << "\n"; logfile.flush(); } } else { - QString date = QDate().currentDate().toString(Qt::ISODate)+ " "; - QString time = QTime().currentTime().toString(Qt::ISODate)+ " "; - QString prefix=""; + TQString date = TQDate().tqcurrentDate().toString(Qt::ISODate)+ " "; + TQString time = TQTime().currentTime().toString(Qt::ISODate)+ " "; + TQString prefix=""; switch ( type ) { case info: @@ -240,11 +240,11 @@ void KVpncConfig::appendLogEntry( QString msg, LogType type ) } // write into debug console - QString prefix=""; - QString postfix=""; + TQString prefix=""; + TQString postfix=""; // font size - prefix+=""; + prefix+=""; postfix+="<\\font>"; if (useColorizedLogOutput) @@ -304,7 +304,7 @@ void KVpncConfig::appendLogEntry( QString msg, LogType type ) // appPointer->processEvents(); } -void KVpncConfig::slotStatusMsg( const QString &text, int id ) +void KVpncConfig::slotStatusMsg( const TQString &text, int id ) { if ( id != ID_FLASH_MSG ) { @@ -318,13 +318,13 @@ void KVpncConfig::slotStatusMsg( const QString &text, int id ) } -void KVpncConfig::saveOptions(bool saveOneProfile, QString Profile) +void KVpncConfig::saveOptions(bool saveOneProfile, TQString Profile) { if (saveOneProfile && Profile.isEmpty()) return; KStandardDirs * dirs = KGlobal::dirs(); - QString filePath = dirs->findResource ( "config", "kvpncrc" ); - QFile::remove + TQString filePath = dirs->findResource ( "config", "kvpncrc" ); + TQFile::remove ( filePath ); config->setGroup( "Notification Messages" ); @@ -453,13 +453,13 @@ void KVpncConfig::saveOptions(bool saveOneProfile, QString Profile) appendLogEntry(i18n( "Wallet disabled or not available, writing to config file." ),debug); } - QPtrList *TmpAccountList; + TQPtrList *TmpAccountList; if (!saveOneProfile) TmpAccountList = AccountList; else { - TmpAccountList = new QPtrList(); + TmpAccountList = new TQPtrList(); TmpAccountList->setAutoDelete( TRUE ); // the list owns the objects VpnAccountData *ProfileData; @@ -480,8 +480,8 @@ void KVpncConfig::saveOptions(bool saveOneProfile, QString Profile) if ( !it->getName().isEmpty() ) { - QString name = it->getName(); - QString ProfileName = "Profile_"; + TQString name = it->getName(); + TQString ProfileName = "Profile_"; ProfileName += name; config->setGroup( ProfileName ); @@ -496,7 +496,7 @@ void KVpncConfig::saveOptions(bool saveOneProfile, QString Profile) appendLogEntry(i18n( "Wallet enabled and available, writing to wallet." ),debug); if (wallet != 0) { - QString walletname="kvpnc"; + TQString walletname="kvpnc"; // Check if folder exists, otherwise create it bool walletOK=true; if (!wallet->hasFolder(walletname)) @@ -512,22 +512,22 @@ void KVpncConfig::saveOptions(bool saveOneProfile, QString Profile) //std::cout << "[set] account: " << ProfileName << ", loginname: " << loginname << ", password: " << pwd << std::endl; bool UserPasswordOK=true; if ( it->getSaveUserPassword() ) - UserPasswordOK = (wallet->writePassword (QString(name+"__user_pw"), it->getUserPassword()) == 0); + UserPasswordOK = (wallet->writePassword (TQString(name+"__user_pw"), it->getUserPassword()) == 0); else - UserPasswordOK = (wallet->writePassword (QString(name+"__user_pw"), "") == 0); + UserPasswordOK = (wallet->writePassword (TQString(name+"__user_pw"), "") == 0); // wallet->sync(); // appPointer->processEvents(); bool PskOK=true; if ( it->getSavePsk() ) - PskOK = (wallet->writePassword (QString(name+"__psk"), it->getPreSharedKey()) == 0); + PskOK = (wallet->writePassword (TQString(name+"__psk"), it->getPreSharedKey()) == 0); else - PskOK = (wallet->writePassword (QString(name+"__psk"), "") == 0); + PskOK = (wallet->writePassword (TQString(name+"__psk"), "") == 0); // wallet->sync(); // appPointer->processEvents(); - bool PskKeyPassOK = (wallet->writePassword (QString(name+"__priv_key_pwd"), it->getPrivateKeyPass()) == 0); + bool PskKeyPassOK = (wallet->writePassword (TQString(name+"__priv_key_pwd"), it->getPrivateKeyPass()) == 0); // // wallet->sync(); // appPointer->processEvents(); @@ -536,66 +536,66 @@ void KVpncConfig::saveOptions(bool saveOneProfile, QString Profile) { if (UserPasswordOK) if (KvpncDebugLevel > 2) - appendLogEntry(i18n( "write of %1 was ok." ).arg(i18n("user password")), debug); + appendLogEntry(i18n( "write of %1 was ok." ).tqarg(i18n("user password")), debug); else { // if ( KMessageBox::warningContinueCancel( 0, // i18n( "KVpnc is unable to save %1 password securely in your wallet.
" - // "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("user password")), - // i18n( "Unable to store secure %1" ).arg(i18n("user password")), - // KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) + // "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("user password")), + // i18n( "Unable to store secure %1" ).tqarg(i18n("user password")), + // KGuiItem( i18n( "Store &Unsafe" ), TQString::tqfromLatin1( "unlock" ),TQString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) // { // config->writeEntry( "User password", it->getUserPassword() ); // } - appendLogEntry(i18n( "write of %1 has failed." ).arg(i18n("user password")), error); + appendLogEntry(i18n( "write of %1 has failed." ).tqarg(i18n("user password")), error); } if (PskOK) if (KvpncDebugLevel > 2) - appendLogEntry(i18n( "write of %1 was successful." ).arg(i18n("preshared key")), debug); + appendLogEntry(i18n( "write of %1 was successful." ).tqarg(i18n("preshared key")), debug); else { // if ( KMessageBox::warningContinueCancel( 0, // i18n( "KVpnc is unable to save %1 password securely in your wallet.
" - // "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("pre shared key")), - // i18n( "Unable to store secure %1" ).arg(i18n("pre shared key")), - // KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) + // "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("pre shared key")), + // i18n( "Unable to store secure %1" ).tqarg(i18n("pre shared key")), + // KGuiItem( i18n( "Store &Unsafe" ), TQString::tqfromLatin1( "unlock" ),TQString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) // { // config->writeEntry( "Pre shared key", it->getPreSharedKey() ); // } - appendLogEntry(i18n( "write of %1 has failed." ).arg(i18n("preshared key")),error); + appendLogEntry(i18n( "write of %1 has failed." ).tqarg(i18n("preshared key")),error); } if (PskOK) if (KvpncDebugLevel > 2) - appendLogEntry(i18n( "write of %1 was successful." ).arg(i18n("preshared key")), debug); + appendLogEntry(i18n( "write of %1 was successful." ).tqarg(i18n("preshared key")), debug); else { // if ( KMessageBox::warningContinueCancel( 0, // i18n( "KVpnc is unable to save %1 password securely in your wallet.
" - // "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("preshared key password")), - // i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")), - // KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) + // "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("preshared key password")), + // i18n( "Unable to store secure %1" ).tqarg(i18n("reshared key password")), + // KGuiItem( i18n( "Store &Unsafe" ), TQString::tqfromLatin1( "unlock" ),TQString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) // { // config->writeEntry( "Pre shared key", it->getPreSharedKey() ); // } - appendLogEntry(i18n( "write of %1 has failed." ).arg(i18n("preshared key")),error); + appendLogEntry(i18n( "write of %1 has failed." ).tqarg(i18n("preshared key")),error); } if (PskKeyPassOK) if (KvpncDebugLevel > 2) - appendLogEntry(i18n( "write of %1 was successful." ).arg(i18n("preshared key password")), debug); + appendLogEntry(i18n( "write of %1 was successful." ).tqarg(i18n("preshared key password")), debug); else { // if ( KMessageBox::warningContinueCancel( 0, // i18n( "KVpnc is unable to save %1 password securely in your wallet.
" - // "Do you want to save the password in the unsafe configuration file instead?" ).arg(i18n("preshared key password")), - // i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")), - // KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) + // "Do you want to save the password in the unsafe configuration file instead?" ).tqarg(i18n("preshared key password")), + // i18n( "Unable to store secure %1" ).tqarg(i18n("reshared key password")), + // KGuiItem( i18n( "Store &Unsafe" ), TQString::tqfromLatin1( "unlock" ),TQString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) // { // config->writeEntry( "Pre shared key", it->getPreSharedKey() ); // } - appendLogEntry(i18n( "write of %1 has failed." ).arg(i18n("preshared key password")),error); + appendLogEntry(i18n( "write of %1 has failed." ).tqarg(i18n("preshared key password")),error); } //std::cout << "success: " << pwdOK << std::endl; } @@ -637,7 +637,7 @@ void KVpncConfig::saveOptions(bool saveOneProfile, QString Profile) // appPointer->processEvents(); -// KMessageBox::information(0,"connection type changed: "+QString().setNum(it->getConnectionType())+QString(" ")+it->getName(),QString("type set")); +// KMessageBox::information(0,"connection type changed: "+TQString().setNum(it->getConnectionType())+TQString(" ")+it->getName(),TQString("type set")); // normal config if ( it->getConnectionType() == VpnAccountData::cisco ) @@ -867,11 +867,11 @@ void KVpncConfig::saveOptions(bool saveOneProfile, QString Profile) // appPointer->processEvents(); - QString AdditionalNetworkRoutesString; - QStringList AdditionalNetworkRoutes = it->getAdditionalNetworkRoutes(); + TQString AdditionalNetworkRoutesString; + TQStringList AdditionalNetworkRoutes = it->getAdditionalNetworkRoutes(); // Networks delimited by a ',' - for ( QStringList::Iterator it2 = AdditionalNetworkRoutes.begin(); it2 != AdditionalNetworkRoutes.end(); ++it2 ) + for ( TQStringList::Iterator it2 = AdditionalNetworkRoutes.begin(); it2 != AdditionalNetworkRoutes.end(); ++it2 ) { AdditionalNetworkRoutesString+=*it2; AdditionalNetworkRoutesString+=","; @@ -881,9 +881,9 @@ void KVpncConfig::saveOptions(bool saveOneProfile, QString Profile) // wallet->sync(); /* give info */ -// slotStatusMsg ( i18n( "Profile \"%1\" saved." ).arg( ProfileName.remove("Profile_") ), ID_FLASH_MSG ); +// slotStatusMsg ( i18n( "Profile \"%1\" saved." ).tqarg( ProfileName.remove("Profile_") ), ID_FLASH_MSG ); - appendLogEntry ( i18n( "Profile \"%1\" saved." ).arg( ProfileName.remove("Profile_") ) , info); + appendLogEntry ( i18n( "Profile \"%1\" saved." ).tqarg( ProfileName.remove("Profile_") ) , info); // appPointer->processEvents(); } appPointer->processEvents(); @@ -916,8 +916,8 @@ void KVpncConfig::loadOptions() enableDebugPppd = config->readBoolEntry( "Enable pppd debug", false ); enableDebugPptpd = config->readBoolEntry( "Enable pptpd debug", false ); enableFreeswanVerbose = config->readBoolEntry( "Enable FreeSWAN verbose", false ); - PlutoDebug = QStringList::split(" ", config->readEntry( "Pluto Debug", "")); - KlipsDebug = QStringList::split(" ", config->readEntry( "Klips Debug", "")); + PlutoDebug = TQStringList::split(" ", config->readEntry( "Pluto Debug", "")); + KlipsDebug = TQStringList::split(" ", config->readEntry( "Klips Debug", "")); Vpnc_pid_file = config->readEntry( "Pid file for vpnc ", "/var/run/vpnc/pid" ); RacoonDebugLevel = config->readEntry( "Racoon debuglevel", "info" ); // we need to correct old int value @@ -974,7 +974,7 @@ void KVpncConfig::loadOptions() checkStandardPathValues(); - tryConnectTimeout = QString( config->readEntry( "Try connect timeout", "10" ) ).toInt(); + tryConnectTimeout = TQString( config->readEntry( "Try connect timeout", "10" ) ).toInt(); lastProfile = config->readEntry( "Last Profile", "" ); writeLogFile = config->readBoolEntry( "Write log file", true ); holdGeneratedScripts = config->readBoolEntry( "Hold generated scripts", true ); @@ -984,20 +984,20 @@ void KVpncConfig::loadOptions() if (programsInPath) useDefaultPaths=true; - InfoLogColor = config->readColorEntry ( "Info logwindow color", new QColor(Qt::black) ); - RemoteLogColor = config->readColorEntry ( "Remote logwindow color", new QColor(Qt::blue) ); - ErrorLogColor = config->readColorEntry( "Error logwindow color", new QColor(Qt::red )); - SuccessLogColor = config->readColorEntry( "Success logwindow color", new QColor(Qt::darkGreen) ); - DebugLogColor = config->readColorEntry( "Debug logwindow color", new QColor(255,175,0 )); - DebugBackgroundcolor = config->readColorEntry("Debug background color", new QColor (Qt::white) ); + InfoLogColor = config->readColorEntry ( "Info logwindow color", new TQColor(TQt::black) ); + RemoteLogColor = config->readColorEntry ( "Remote logwindow color", new TQColor(TQt::blue) ); + ErrorLogColor = config->readColorEntry( "Error logwindow color", new TQColor(TQt::red )); + SuccessLogColor = config->readColorEntry( "Success logwindow color", new TQColor(TQt::darkGreen) ); + DebugLogColor = config->readColorEntry( "Debug logwindow color", new TQColor(255,175,0 )); + DebugBackgroundcolor = config->readColorEntry("Debug background color", new TQColor (TQt::white) ); useColorizedLogOutput = config->readBoolEntry("Use colorized log output", true); showInterfaceIPinTooltip = config->readBoolEntry( "Show interface IP in tooltip", true ); AutoConnectProfile= config->readEntry( "Auto connect profile", "" ); doAutoConnectAtStartup = config->readBoolEntry( "Do auto connect at startup", false ); LogViewerFontSize = config->readNumEntry( "Log viewer font size", 2 ); - WindowSize = QSize( config->readNumEntry( "Mainwindow width", 50 ), this->config->readNumEntry( "Mainwindow height", 50 ) ); - WindowPos = QPoint ( config->readNumEntry( "Mainwindow position x", 10 ), this->config->readNumEntry( "Mainwindow position y", 50 ) ); + WindowSize = TQSize( config->readNumEntry( "Mainwindow width", 50 ), this->config->readNumEntry( "Mainwindow height", 50 ) ); + WindowPos = TQPoint ( config->readNumEntry( "Mainwindow position x", 10 ), this->config->readNumEntry( "Mainwindow position y", 50 ) ); OpenvpnManagementPort = config->readNumEntry("Openvpn management port", 2222 ); @@ -1008,15 +1008,15 @@ void KVpncConfig::loadOptions() { KStandardDirs *dirs = KGlobal::dirs(); - QDir AppFolder (QString(dirs->saveLocation( "data" )+"/kvpnc")); + TQDir AppFolder (TQString(dirs->saveLocation( "data" )+"/kvpnc")); if (!AppFolder.exists()) { - // KMessageBox::error( this, i18n( "creating dir: %1" ).arg(dirs->saveLocation( "data" )+"/kvpnc" )); - QDir AppFolder2(dirs->saveLocation( "data" )); + // KMessageBox::error( this, i18n( "creating dir: %1" ).tqarg(dirs->saveLocation( "data" )+"/kvpnc" )); + TQDir AppFolder2(dirs->saveLocation( "data" )); if(!AppFolder2.mkdir("kvpnc",true)) { - KMessageBox::error( 0, i18n( "The appdir for kvpnc could not be created. Be sure that you have write permission of \"%1\"." ).arg(dirs->saveLocation( "data" )) ); - appendLogEntry( i18n( "The appdir for kvpnc could not be created. Be sure that you have write permission of \"%1\"." ).arg(dirs->saveLocation( "data" )),error); + KMessageBox::error( 0, i18n( "The appdir for kvpnc could not be created. Be sure that you have write permission of \"%1\"." ).tqarg(dirs->saveLocation( "data" )) ); + appendLogEntry( i18n( "The appdir for kvpnc could not be created. Be sure that you have write permission of \"%1\"." ).tqarg(dirs->saveLocation( "data" )),error); } } @@ -1027,12 +1027,12 @@ void KVpncConfig::loadOptions() if ( !logfile.open( IO_WriteOnly | IO_Append ) ) { KMessageBox::error( 0, i18n( "Log file cant be opened!" ) ); - appendLogEntry(i18n( "Unable to find \"%1\"!" ).arg("pppd"),error); + appendLogEntry(i18n( "Unable to find \"%1\"!" ).tqarg("pppd"),error); } else { - QTextStream s( &logfile ); - s << i18n( "Log session started at: " ) << QDateTime::currentDateTime().toString( Qt::TextDate ) << endl; + TQTextStream s( &logfile ); + s << i18n( "Log session started at: " ) << TQDateTime::tqcurrentDateTime().toString( Qt::TextDate ) << endl; } } @@ -1069,14 +1069,14 @@ void KVpncConfig::loadOptions() Profile_XXXXX XXXXX is the account name (important: unique!) */ - QStringList configGroups = config->groupList(); + TQStringList configGroups = config->groupList(); bool oldConfigurationFound = false; bool sessionFound = false; - for ( QStringList::Iterator it = configGroups.begin(); it != configGroups.end(); ++it ) + for ( TQStringList::Iterator it = configGroups.begin(); it != configGroups.end(); ++it ) { - QString name = *it; + TQString name = *it; name.stripWhiteSpace(); if ( name.left( 7 ) == "Profile" && name.length() > 8 ) { @@ -1086,14 +1086,14 @@ void KVpncConfig::loadOptions() if ( KvpncDebugLevel > 2 ) { - QString tmp = i18n( "Profile found: " ); + TQString tmp = i18n( "Profile found: " ); tmp += name.right( ( name.length() ) - 8 ); appendLogEntry ( tmp, debug ); } config->setGroup( name ); - QString UserPassword=""; - QString PrivateKeyPass=""; - QString PreSharedKey =""; + TQString UserPassword=""; + TQString PrivateKeyPass=""; + TQString PreSharedKey =""; /* passwords with kwallet */ if (useKwallet && KWallet::Wallet::isEnabled()) @@ -1104,7 +1104,7 @@ void KVpncConfig::loadOptions() wallet = KWallet::Wallet::openWallet(KWallet::Wallet::LocalWallet()); if (wallet != 0) { - QString walletname="kvpnc"; + TQString walletname="kvpnc"; if (!wallet->hasFolder(walletname)) { @@ -1117,25 +1117,25 @@ void KVpncConfig::loadOptions() if (KvpncDebugLevel > 2) appendLogEntry(i18n( "Folder for kvpnc has been set." ),debug); - QString profilename = name.right( ( name.length() ) - 8 ); + TQString profilename = name.right( ( name.length() ) - 8 ); - if (wallet->readPassword(QString(profilename+"__user_pw"), UserPassword) != 0) - appendLogEntry(i18n( "read of %1 has failed." ).arg(i18n("user password")),error); + if (wallet->readPassword(TQString(profilename+"__user_pw"), UserPassword) != 0) + appendLogEntry(i18n( "read of %1 has failed." ).tqarg(i18n("user password")),error); else if (KvpncDebugLevel > 2) - appendLogEntry(i18n( "read of %1 was successful." ).arg(i18n("user password")),debug); + appendLogEntry(i18n( "read of %1 was successful." ).tqarg(i18n("user password")),debug); - if (wallet->readPassword(QString(profilename+"__psk"), PreSharedKey) != 0) - appendLogEntry(i18n( "read of %1 has failed." ).arg(i18n("preshared key")),error); + if (wallet->readPassword(TQString(profilename+"__psk"), PreSharedKey) != 0) + appendLogEntry(i18n( "read of %1 has failed." ).tqarg(i18n("preshared key")),error); else if (KvpncDebugLevel > 2) - appendLogEntry(i18n( "read of %1 was successful." ).arg(i18n("preshared key")),debug); + appendLogEntry(i18n( "read of %1 was successful." ).tqarg(i18n("preshared key")),debug); - if (wallet->readPassword(QString(profilename+"__priv_key_pwd"), PrivateKeyPass) != 0) - appendLogEntry(i18n( "read of %1 has failed." ).arg(i18n("preshared key password")),error); + if (wallet->readPassword(TQString(profilename+"__priv_key_pwd"), PrivateKeyPass) != 0) + appendLogEntry(i18n( "read of %1 has failed." ).tqarg(i18n("preshared key password")),error); else if (KvpncDebugLevel > 2) - appendLogEntry(i18n( "read of %1 was successful." ).arg(i18n("preshared key password")),debug); + appendLogEntry(i18n( "read of %1 was successful." ).tqarg(i18n("preshared key password")),debug); } else { @@ -1168,7 +1168,7 @@ void KVpncConfig::loadOptions() } VpnAccountData::ConnectionType ConnType = VpnAccountData::ConnectionType( VpnAccountData::cisco ); - QString type_string = config->readEntry( "Connection type", "cisco" ); + TQString type_string = config->readEntry( "Connection type", "cisco" ); if ( type_string == "cisco" ) ConnType = VpnAccountData::cisco; @@ -1193,7 +1193,7 @@ void KVpncConfig::loadOptions() else ConnType = VpnAccountData::other; - QString Name = name.right( name.length() - 8 ); + TQString Name = name.right( name.length() - 8 ); VpnAccountData *data = new VpnAccountData( ConnType, Name ); data->setGateway( config->readEntry( "VPN Gateway", "" )); data->setID( config->readEntry( "VPN ID", "" ) ); @@ -1280,9 +1280,9 @@ void KVpncConfig::loadOptions() data->setPskIsInFile( config->readBoolEntry( "PSK is in file", false )); data->setUseAdditionalNetworkRoutes( config->readBoolEntry( "Use additional network routes", false )); appPointer->processEvents(); - QString AdditionalNetworkRoutesString = config->readEntry( "Additional network routes", "" ); + TQString AdditionalNetworkRoutesString = config->readEntry( "Additional network routes", "" ); // Networks delimited by a ',' - QStringList AdditionalNetworkRoutes(QStringList::split( ",", AdditionalNetworkRoutesString )); + TQStringList AdditionalNetworkRoutes(TQStringList::split( ",", AdditionalNetworkRoutesString )); data->setAdditionalNetworkRoutes(AdditionalNetworkRoutes); data->setHashAlgo( config->readEntry( "Hash algorithm", "md5" )); data->setEncryptionAlgorithm( config->readEntry( "Encryption algorithm", "3des" )); @@ -1299,7 +1299,7 @@ void KVpncConfig::loadOptions() data->setDisableLzoCompression(config->readBoolEntry("Disable LZO compression", true)); data->setUserPassword( UserPassword ); data->setRemoteNetAddr( config->readEntry("Remote net address","") ); - data->setRemoteNetMask( QString().setNum(config->readNumEntry("Remote net mask",24 ))); + data->setRemoteNetMask( TQString().setNum(config->readNumEntry("Remote net mask",24 ))); data->setPreSharedKey( PreSharedKey ); data->setPrivateKeyPass( PrivateKeyPass ); data->setAuthWithUsernameAndPassword( config->readBoolEntry( "AuthWithUsernameAndPassword",false ) ); @@ -1407,13 +1407,13 @@ void KVpncConfig::loadOptions() { // old style configuration found config->setGroup( "Client Options" ); - QString Name = "Default"; + TQString Name = "Default"; VpnAccountData::ConnectionType ConnType = VpnAccountData::cisco; - QString Gateway = config->readEntry( "VPN Gateway", "" ); - QString ID = config->readEntry( "VPN ID", "" ); - QString Psk = config->readEntry( "Group password", "" ); - QString Username = config->readEntry( "Username", "" ); - QString UserPassword = config->readEntry( "Password", "" ); + TQString Gateway = config->readEntry( "VPN Gateway", "" ); + TQString ID = config->readEntry( "VPN ID", "" ); + TQString Psk = config->readEntry( "Group password", "" ); + TQString Username = config->readEntry( "Username", "" ); + TQString UserPassword = config->readEntry( "Password", "" ); bool saveUserPassword = config->readBoolEntry( "Save user password", false ); bool savePsk = config->readBoolEntry( "Save group password", false ); @@ -1438,7 +1438,7 @@ void KVpncConfig::loadOptions() appendLogEntry ( i18n( "Old configuration found, converted." ),info ); if ( KvpncDebugLevel > 2 ) - appendLogEntry( i18n( "Configuration for profile \"%1\" loaded." ).arg( Name ),info ); + appendLogEntry( i18n( "Configuration for profile \"%1\" loaded." ).tqarg( Name ),info ); appPointer->processEvents(); } @@ -1449,8 +1449,8 @@ void KVpncConfig::loadOptions() { // delete configuration file KStandardDirs * dirs = KGlobal::dirs(); - QString filePath = dirs->findResource ( "config", "kvpncrc" ); - QFile::remove + TQString filePath = dirs->findResource ( "config", "kvpncrc" ); + TQFile::remove ( filePath ); if ( KvpncDebugLevel > 2 ) appendLogEntry ( i18n( "Old configuration deleted." ), debug ); @@ -1544,12 +1544,12 @@ void KVpncConfig::checkStandardPathValues() pathToGnomeSshAskpass = "/usr/lib/openssh/gnome-ssh-askpass"; } -bool KVpncConfig::exportKvpncConfig(QString filename) +bool KVpncConfig::exportKvpncConfig(TQString filename) { bool ok=true; int exportCount=0; bool exportGlobal=false; - QFile exportfile (filename); + TQFile exportfile (filename); if (exportfile.exists()) { int res = KMessageBox::questionYesNo ( 0, i18n ( "\"%1\" still exists. Do you really want to overwrite it?" ).arg ( filename ), i18n ( "Overwrite?" ), i18n("&Overwrite") , KStdGuiItem::cancel() ); @@ -1561,7 +1561,7 @@ bool KVpncConfig::exportKvpncConfig(QString filename) { if( exportfile.open(IO_WriteOnly)) { - QPtrList *exportAccountList = new QPtrList(); + TQPtrList *exportAccountList = new TQPtrList(); exportAccountList->setAutoDelete( TRUE ); // the list owns the objects KvpncImportProfileSelectionBase selectdlg; VpnAccountData *it=NULL; @@ -1576,11 +1576,11 @@ bool KVpncConfig::exportKvpncConfig(QString filename) selectdlg.ImportProfileListView->addColumn(i18n("Name")); selectdlg.ImportProfileListView->addColumn(i18n("Type")); selectdlg.ImportProfileListView->addColumn(i18n("Gateway")); - QCheckListItem *item; + TQCheckListItem *item; for ( it = AccountList->first(); it; it = AccountList->next() ) { - QString name = it->getName(); - QString type; + TQString name = it->getName(); + TQString type; if ( it->getConnectionType() == VpnAccountData::cisco ) type = "cisco" ; else if ( it->getConnectionType() == VpnAccountData::ciscoorig ) @@ -1607,7 +1607,7 @@ bool KVpncConfig::exportKvpncConfig(QString filename) // litem->setSelectable(true); - item = new QCheckListItem(selectdlg.ImportProfileListView,it->getName(),QCheckListItem::CheckBox); + item = new TQCheckListItem(selectdlg.ImportProfileListView,it->getName(),TQCheckListItem::CheckBox); item->setText(1,type); item->setText(2,it->getGateway()); selectdlg.ImportProfileListView->insertItem(item); @@ -1618,15 +1618,15 @@ bool KVpncConfig::exportKvpncConfig(QString filename) bool ret = selectdlg.exec(); if (ret == true) { - QListViewItemIterator it2( selectdlg.ImportProfileListView ); + TQListViewItemIterator it2( selectdlg.ImportProfileListView ); for ( ; it2.current(); ++it2 ) { - if ( ( (QCheckListItem*)it2.current() )->isOn() ) + if ( ( (TQCheckListItem*)it2.current() )->isOn() ) { VpnAccountData *data=NULL; it = 0; for ( it = AccountList->first(); it; it = AccountList->next() ) - if ( it->getName() == ( (QCheckListItem*)it2.current() )->text() && ( (QCheckListItem*)it2.current() )->isOn() ) + if ( it->getName() == ( (TQCheckListItem*)it2.current() )->text() && ( (TQCheckListItem*)it2.current() )->isOn() ) data = it; exportAccountList->append(data); } @@ -1650,14 +1650,14 @@ bool KVpncConfig::exportKvpncConfig(QString filename) - QString date (__DATE__); - QString day= date.section(' ',0,0); - QString month= QString().setNum(QDate::fromString(date.section(' ',0,0),Qt::ISODate).month()); - QString year= date.section(' ',2,2); + TQString date (__DATE__); + TQString day= date.section(' ',0,0); + TQString month= TQString().setNum(TQDate::fromString(date.section(' ',0,0),Qt::ISODate).month()); + TQString year= date.section(' ',2,2); - QString currentdate ( date+" "+ QTime().currentTime().toString( "hh:mm" ) ); + TQString currentdate ( date+" "+ TQTime().currentTime().toString( "hh:mm" ) ); - QTextStream ExportStream ( &exportfile ); + TQTextStream ExportStream ( &exportfile ); ExportStream << "" << "\n"; ExportStream << "" << "\n"; ExportStream << "" << "\n"; @@ -1994,70 +1994,70 @@ bool KVpncConfig::exportKvpncConfig(QString filename) KMessageBox::information ( 0, i18n ( "Export canceled." ) ); return false; } - QString msg=""; + TQString msg=""; if (exportCount > 0 && exportGlobal==true) - msg = i18n("Export was successful. %1 profiles and global settings are exported.").arg(QString::number(exportCount)); + msg = i18n("Export was successful. %1 profiles and global settings are exported.").tqarg(TQString::number(exportCount)); if (exportCount > 0 && exportGlobal==false) - msg = i18n("Export was successful. %1 profiles are exported.").arg(QString::number(exportCount)); + msg = i18n("Export was successful. %1 profiles are exported.").tqarg(TQString::number(exportCount)); if (exportCount < 1 && exportGlobal==true) msg = i18n("Export was successful. Global settings are exported."); KMessageBox::information ( 0, msg,i18n("Export success") ); return true; } -bool KVpncConfig::importKvpncConfig(QString filename, QString& RetName, bool& openProfileManager) +bool KVpncConfig::importKvpncConfig(TQString filename, TQString& RetName, bool& openProfileManager) { - QFile importfile (filename); + TQFile importfile (filename); if (!importfile.exists()) { KMessageBox::error ( 0, i18n ( "Reading of \"%1\" has been failed!" ).arg ( filename ) ); return false; } - QString kvpncexportversion=""; - - QString pathToVpnc; - QString pathToCiscoVpnc; - QString pathToRacoon; - QString pathToRacoonctl; - QString pathToSetkey; - QString pathToIptables; - QString pathToOpenssl; - QString pathToIpsec; - QString pathToPppd; - QString pathToPptp; - QString pathToL2tpd; - QString pathToXl2tpd; - QString pathToOpenl2tp; - QString pathToKill; - QString pathToKillall; - QString pathToPing; - QString pathToOpenvpn; - QString pathToIp; - QString pathToIfconfig; - QString pathToRoute; - QString pathToNetstat; - QString pathToPkcs11Tool; - QString pathToVtund; - QString pathToCiscoCertMgr; - QString pathToTail; - QString pathToSsh; - QString pathToKsshAskpass; - QString pathToGnomeSshAskpass; - QString AutoConnectProfile; - QString RacoonDebugLevel; - QString Vpnc_pid_file; - QString Pppd_pid_file; - QString lastProfile; - QString logfileName; - - QString TmpPassword; //< from enter password dialog - QString TmpGroupPassword; //< from enter password dialog - QString TmpUsername; //< from enter password dialog - QString TmpPrivKeyPassStr; - QString TmpGatewayIP; - QString TmpXauthInterPasscode; //< from Xauth interactive passcode dialog - QString TmpPrivateKeyPass; - QString TmpHttpProxyPassword; + TQString kvpncexportversion=""; + + TQString pathToVpnc; + TQString pathToCiscoVpnc; + TQString pathToRacoon; + TQString pathToRacoonctl; + TQString pathToSetkey; + TQString pathToIptables; + TQString pathToOpenssl; + TQString pathToIpsec; + TQString pathToPppd; + TQString pathToPptp; + TQString pathToL2tpd; + TQString pathToXl2tpd; + TQString pathToOpenl2tp; + TQString pathToKill; + TQString pathToKillall; + TQString pathToPing; + TQString pathToOpenvpn; + TQString pathToIp; + TQString pathToIfconfig; + TQString pathToRoute; + TQString pathToNetstat; + TQString pathToPkcs11Tool; + TQString pathToVtund; + TQString pathToCiscoCertMgr; + TQString pathToTail; + TQString pathToSsh; + TQString pathToKsshAskpass; + TQString pathToGnomeSshAskpass; + TQString AutoConnectProfile; + TQString RacoonDebugLevel; + TQString Vpnc_pid_file; + TQString Pppd_pid_file; + TQString lastProfile; + TQString logfileName; + + TQString TmpPassword; //< from enter password dialog + TQString TmpGroupPassword; //< from enter password dialog + TQString TmpUsername; //< from enter password dialog + TQString TmpPrivKeyPassStr; + TQString TmpGatewayIP; + TQString TmpXauthInterPasscode; //< from Xauth interactive passcode dialog + TQString TmpPrivateKeyPass; + TQString TmpHttpProxyPassword; bool minimizeAfterConnect=true; bool showDebugConsole=true; @@ -2110,41 +2110,41 @@ bool KVpncConfig::importKvpncConfig(QString filename, QString& RetName, bool& op int runningCheckCounter=0; int runningCheckTimeout=0; int OpenvpnManagementPort=2222; - QPtrList *ImportedAccountList; + TQPtrList *ImportedAccountList; - QColor InfoLogColor; - QColor RemoteLogColor; - QColor ErrorLogColor; - QColor SuccessLogColor; - QColor DebugLogColor; - QColor DebugBackgroundcolor; + TQColor InfoLogColor; + TQColor RemoteLogColor; + TQColor ErrorLogColor; + TQColor SuccessLogColor; + TQColor DebugLogColor; + TQColor DebugBackgroundcolor; - QPoint pos; - QPoint WindowPos; - QSize WindowSize; + TQPoint pos; + TQPoint WindowPos; + TQSize WindowSize; bool importGlobal=false; int importCount=0; - QDomDocument doc( "kvpncsettingsdoc" ); + TQDomDocument doc( "kvpncsettingsdoc" ); if( importfile.open(IO_ReadOnly)) { - QApplication::setOverrideCursor( QCursor(Qt::WaitCursor) ); + TQApplication::setOverrideCursor( TQCursor(TQt::WaitCursor) ); if ( !doc.setContent( &importfile ) ) { importfile.close(); KMessageBox::error ( 0, i18n ( "Reading of \"%1\" has been failed!" ).arg ( filename ) ); appendLogEntry (i18n ( "Reading of \"%1\" has been failed!" ).arg ( filename ), error); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); return false; } importfile.close(); - // print out the element names of all elements that are direct children + // print out the element names of all elements that are direct tqchildren // of the outermost element. - QDomElement docElem = doc.documentElement(); + TQDomElement docElem = doc.documentElement(); - QDomNode n = docElem.firstChild(); + TQDomNode n = docElem.firstChild(); if (KvpncDebugLevel > 5) std::cout << "dom doc:" << std::endl; while( !n.isNull() ) @@ -2153,10 +2153,10 @@ bool KVpncConfig::importKvpncConfig(QString filename, QString& RetName, bool& op { if (KvpncDebugLevel > 5) std::cout << "version tag found." << std::endl; - QDomNodeList vsubnodes = n.toElement().childNodes(); + TQDomNodeList vsubnodes = n.toElement().childNodes(); for (int i=0;i<=(int)vsubnodes.count();i++) { - QDomNode n1 = vsubnodes.item(i); + TQDomNode n1 = vsubnodes.item(i); if (n1.toElement().tagName() == "app") { if (KvpncDebugLevel > 5) @@ -2175,10 +2175,10 @@ bool KVpncConfig::importKvpncConfig(QString filename, QString& RetName, bool& op { if (KvpncDebugLevel > 5) std::cout << "gobal tag found." << std::endl; - QDomNodeList vsubnodes = n.toElement().childNodes(); + TQDomNodeList vsubnodes = n.toElement().childNodes(); for (int i=0;i<=(int)vsubnodes.count();i++) { - QDomNode n1 = vsubnodes.item(i); + TQDomNode n1 = vsubnodes.item(i); if (n1.toElement().tagName() != "") { if (KvpncDebugLevel > 5) @@ -2194,8 +2194,8 @@ bool KVpncConfig::importKvpncConfig(QString filename, QString& RetName, bool& op else if ( n1.toElement().tagName() == "Enable xl2tpd debug" ) { enableDebugXl2tpd = n1.toElement().text().toInt(); } else if ( n1.toElement().tagName() == "Enable openl2tp debug" ) { enableDebugOpenl2tp = n1.toElement().text().toInt(); } else if ( n1.toElement().tagName() == "Enable FreeSWAN verbose" ) { enableFreeswanVerbose = n1.toElement().text().toInt(); } - else if ( n1.toElement().tagName() == "Pluto Debug" ) { PlutoDebug = QStringList::split(' ', n1.toElement().text()); } - else if ( n1.toElement().tagName() == "Klips Debug" ) { KlipsDebug = QStringList::split(' ', n1.toElement().text()); } + else if ( n1.toElement().tagName() == "Pluto Debug" ) { PlutoDebug = TQStringList::split(' ', n1.toElement().text()); } + else if ( n1.toElement().tagName() == "Klips Debug" ) { KlipsDebug = TQStringList::split(' ', n1.toElement().text()); } else if ( n1.toElement().tagName() == "Show debugconsole" ) { showDebugConsole = n1.toElement().text().toInt(); } else if ( n1.toElement().tagName() == "Pid file for vpnc " ) { Vpnc_pid_file = n1.toElement().text().toInt(); } else if ( n1.toElement().tagName() == "Vpnc debuglevel" ) { VpncDebugLevel = n1.toElement().text().toInt(); } @@ -2277,35 +2277,35 @@ bool KVpncConfig::importKvpncConfig(QString filename, QString& RetName, bool& op if (KvpncDebugLevel > 5) std::cout << "profiles tag found." << std::endl; - ImportedAccountList = new QPtrList(); + ImportedAccountList = new TQPtrList(); ImportedAccountList->setAutoDelete( TRUE ); // the list owns the objects - QDomNodeList profiles_subnodes = n.toElement().childNodes(); + TQDomNodeList profiles_subnodes = n.toElement().childNodes(); for (int i=0;i<=(int)profiles_subnodes.count();i++) { - QDomNode n1 = profiles_subnodes.item(i); + TQDomNode n1 = profiles_subnodes.item(i); if (n1.toElement().attribute("name") != "") { if (KvpncDebugLevel > 5) std::cout << "profile: " << n1.toElement().attribute("name") << std::endl; - QString name = n1.toElement().attribute("name"); + TQString name = n1.toElement().attribute("name"); VpnAccountData *data = new VpnAccountData( VpnAccountData::cisco, name); // cisco is a dummy here, it will be set later data->setDescription(i18n("import from ")+filename); - QDomNodeList profile_subnodes = n1.toElement().childNodes(); + TQDomNodeList profile_subnodes = n1.toElement().childNodes(); for (int j=0;j<=(int)profile_subnodes.count();j++) { - QDomNode n2 = profile_subnodes.item(j); + TQDomNode n2 = profile_subnodes.item(j); if (n2.toElement().attribute("name") != "") { - QString elementname= n2.toElement().attribute("name"); - QString elementvalue = n2.toElement().text(); + TQString elementname= n2.toElement().attribute("name"); + TQString elementvalue = n2.toElement().text(); if (KvpncDebugLevel > 5) std::cout << " => option: " << elementname << ", value: " << elementvalue << std::endl; // normal config if (elementname == "Connection type") { - QString type = elementvalue; + TQString type = elementvalue; VpnAccountData::ConnectionType ConnType = VpnAccountData::ConnectionType( VpnAccountData::cisco ); if ( type == "cisco" ) ConnType = VpnAccountData::cisco; @@ -2368,7 +2368,7 @@ bool KVpncConfig::importKvpncConfig(QString filename, QString& RetName, bool& op else if (elementname == "Auth type") { - QString Authtype = elementvalue; + TQString Authtype = elementvalue; if (Authtype == "cert") data->setAuthType(VpnAccountData::cert); else if (Authtype == "psk") @@ -2541,7 +2541,7 @@ bool KVpncConfig::importKvpncConfig(QString filename, QString& RetName, bool& op } appPointer->processEvents(); } - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); KvpncImportProfileSelectionDialog selectdlg; VpnAccountData *it=NULL; @@ -2553,11 +2553,11 @@ bool KVpncConfig::importKvpncConfig(QString filename, QString& RetName, bool& op selectdlg.ImportProfileListView->addColumn(i18n("Gateway")); selectdlg.ImportNamePrefixLineEdit->setText( "kvpnc_import_"); - QCheckListItem *item; + TQCheckListItem *item; for ( it = ImportedAccountList->first(); it; it = ImportedAccountList->next() ) { - QString name = it->getName(); - QString type; + TQString name = it->getName(); + TQString type; if ( it->getConnectionType() == VpnAccountData::cisco ) type = "cisco" ; else if ( it->getConnectionType() == VpnAccountData::ciscoorig ) @@ -2579,7 +2579,7 @@ bool KVpncConfig::importKvpncConfig(QString filename, QString& RetName, bool& op // litem->setSelectable(true); - item = new QCheckListItem(selectdlg.ImportProfileListView,it->getName(),QCheckListItem::CheckBox); + item = new TQCheckListItem(selectdlg.ImportProfileListView,it->getName(),TQCheckListItem::CheckBox); item->setText(1,type); item->setText(2,it->getGateway()); selectdlg.ImportProfileListView->insertItem(item); @@ -2592,16 +2592,16 @@ bool KVpncConfig::importKvpncConfig(QString filename, QString& RetName, bool& op if (ret == true) { importGlobal=selectdlg.ImportGlobalSettingsCheckBox->isChecked(); - QListViewItemIterator it2( selectdlg.ImportProfileListView ); + TQListViewItemIterator it2( selectdlg.ImportProfileListView ); for ( ; it2.current(); ++it2 ) { - if ( ( (QCheckListItem*)it2.current() )->isOn() ) + if ( ( (TQCheckListItem*)it2.current() )->isOn() ) { VpnAccountData *data=NULL; it = 0; for ( it = ImportedAccountList->first(); it; it = ImportedAccountList->next() ) { - if ( it->getName() == ( (QCheckListItem*)it2.current() )->text() && ( (QCheckListItem*)it2.current() )->isOn() ) + if ( it->getName() == ( (TQCheckListItem*)it2.current() )->text() && ( (TQCheckListItem*)it2.current() )->isOn() ) { data = it; importCount++; @@ -2620,11 +2620,11 @@ bool KVpncConfig::importKvpncConfig(QString filename, QString& RetName, bool& op { if ( it->getName() == data->getName() ) { - //account->setName( QString( account->getName() + "_2" ) ); - // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).arg( account->getName() ), i18n( "Name exist, renamed" ) ); + //account->setName( TQString( account->getName() + "_2" ) ); + // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).tqarg( account->getName() ), i18n( "Name exist, renamed" ) ); KMessageBox::error ( 0, i18n ( "Profile name exists!" ), i18n ( "Name Exists" ) ); nameOk = false; - QString newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), QString ( data->getName() + "_2" ), &ok ); + TQString newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), TQString ( data->getName() + "_2" ), &ok ); if (newName.isEmpty()) { KMessageBox::information ( 0, i18n ( "Import was canceled." ) ); @@ -2662,7 +2662,7 @@ bool KVpncConfig::importKvpncConfig(QString filename, QString& RetName, bool& op } } - QDomElement e = n.toElement(); // try to convert the node to an element. + TQDomElement e = n.toElement(); // try to convert the node to an element. if( !e.isNull() ) { std::cout << e.tagName() << std::endl; // the node really is an element. } @@ -2761,11 +2761,11 @@ bool KVpncConfig::importKvpncConfig(QString filename, QString& RetName, bool& op } saveOptions(); - QString msg=""; + TQString msg=""; if (importCount > 0 && importGlobal==true) - msg = i18n("Import was successful. %1 profiles and global settings are imported.").arg(QString::number(importCount)); + msg = i18n("Import was successful. %1 profiles and global settings are imported.").tqarg(TQString::number(importCount)); if (importCount > 0 && importGlobal==false) - msg = i18n("Import was successful. %1 profiles are imported.").arg(QString::number(importCount)); + msg = i18n("Import was successful. %1 profiles are imported.").tqarg(TQString::number(importCount)); if (importCount < 1 && importGlobal==false) msg = i18n("Import was successful. Global settings are imported."); KMessageBox::information ( 0, msg,i18n("Import success") ); @@ -2774,48 +2774,48 @@ bool KVpncConfig::importKvpncConfig(QString filename, QString& RetName, bool& op { KMessageBox::error ( 0, i18n ( "Reading of \"%1\" has been failed!" ).arg ( filename ) ); appendLogEntry (i18n ( "Reading of \"%1\" has been failed!" ).arg ( filename ), error); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); return false; } return true; } -bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& openProfileManager) +bool KVpncConfig::importIpsecConfig(TQString filename, TQString& RetName, bool& openProfileManager) { - QFile importfile (filename); + TQFile importfile (filename); if (!importfile.exists()) { KMessageBox::error ( 0, i18n ( "Reading of \"%1\" has been failed!" ).arg ( filename ) ); return false; } - QPtrList *ImportedAccountList = new QPtrList(); + TQPtrList *ImportedAccountList = new TQPtrList(); ImportedAccountList->setAutoDelete( TRUE ); // the list owns the objects - QPtrList *IpsecImportSectionList = new QPtrList(); + TQPtrList *IpsecImportSectionList = new TQPtrList(); bool isIpsecGlobalSection=false; bool firstSectionFound=false; bool defaultSectionFound=false; bool useNat=false; bool disableOpportunisticEncryption=true; - QStringList InterfaceList; + TQStringList InterfaceList; int IpsecVersion=1; // bool pskIsInFile=true; - QString PskFile="/etc/ipsec.secrets"; - QString CertPath="/etc/ipsec.d/certs"; + TQString PskFile="/etc/ipsec.secrets"; + TQString CertPath="/etc/ipsec.d/certs"; - QString IpsecConfigSection=""; + TQString IpsecConfigSection=""; bool validLineFound=false; if ( importfile.open(IO_ReadOnly)) { - QString line = NULL; - QString IpsecConfigSectionName=""; - QString IpsecConfigData=""; + TQString line = NULL; + TQString IpsecConfigSectionName=""; + TQString IpsecConfigData=""; bool sectionEndFound=false; // std::cout << "pass1: collecting sections" << std::endl; if (KvpncDebugLevel > 2) appendLogEntry(i18n ("import ipsec config: pass1: collecting sections"),debug); - QTextStream stream(&importfile); + TQTextStream stream(&importfile); while ( !stream.atEnd() ) { line = stream.readLine().replace("\"",""); @@ -2827,7 +2827,7 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op // end of section found // std::cout << "end of section " << IpsecConfigSectionName << " found." << std::endl; if (KvpncDebugLevel > 2) - appendLogEntry(i18n("import ipsec config: end of section %1 found.").arg(IpsecConfigSectionName), debug); + appendLogEntry(i18n("import ipsec config: end of section %1 found.").tqarg(IpsecConfigSectionName), debug); sectionEndFound=true; IpsecImportSection *section = new IpsecImportSection(); @@ -2877,11 +2877,11 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op } if (line.startsWith("version")) { - IpsecVersion=int(QString(line.simplifyWhiteSpace().section('#',0,0).section(" ",1,1).stripWhiteSpace()).toFloat()); + IpsecVersion=int(TQString(line.simplifyWhiteSpace().section('#',0,0).section(" ",1,1).stripWhiteSpace()).toFloat()); validLineFound=true; // std::cout << "ipsec version found: " << IpsecVersion << std::endl; if (KvpncDebugLevel > 2) - appendLogEntry(i18n ("import ipsec config: ipsec version found: ")+ QString().setNum(IpsecVersion) ,debug); + appendLogEntry(i18n ("import ipsec config: ipsec version found: ")+ TQString().setNum(IpsecVersion) ,debug); } if (line.startsWith("config setup")) { @@ -2895,7 +2895,7 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op if (isIpsecGlobalSection==true) { - QString line2 = removeWhiteSpaceAtBegin( line); + TQString line2 = removeWhiteSpaceAtBegin( line); // std::cout << "global section line: " << line2 << std::endl; if (line2.startsWith("plutodebug")) { @@ -2931,7 +2931,7 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op } else { - InterfaceList = QStringList::split(' ',line2.replace("interfaces=","").replace(QRegExp("ipsec[0-9]="),"")); + InterfaceList = TQStringList::split(' ',line2.replace("interfaces=","").replace(TQRegExp("ipsec[0-9]="),"")); // std::cout << "interface list: " << InterfaceList << std::endl; if (KvpncDebugLevel > 2) appendLogEntry(i18n ("import ipsec config: use interface from list:")+ " "+InterfaceList.join(", "),debug); @@ -2953,7 +2953,7 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op if (!sectionEndFound && firstSectionFound==true) { // collecting data - QString cleanLine = removeWhiteSpaceAtBegin(line)+"\n"; + TQString cleanLine = removeWhiteSpaceAtBegin(line)+"\n"; // std:: cout << "clean line: \"" << cleanLine << "\"" << std::endl; if (!cleanLine.startsWith("#") && !cleanLine.startsWith("include") && cleanLine != "" && !line.startsWith("conn") && cleanLine != "\n") { @@ -2992,15 +2992,15 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op // std::cout << "sections: IpsecImportSectionList: " << IpsecImportSectionList->count() << std::endl; if (KvpncDebugLevel > 2) - appendLogEntry(i18n ("import ipsec config: sections: ") + QString().setNum(IpsecImportSectionList->count()),debug); + appendLogEntry(i18n ("import ipsec config: sections: ") + TQString().setNum(IpsecImportSectionList->count()),debug); if (!IpsecImportSectionList->isEmpty()) { for ( int i=0; i< (int)IpsecImportSectionList->count();i++ ) { IpsecImportSection *section = IpsecImportSectionList->at(i); - QString Name= section->SectionName; - QStringList data = QStringList::split('\n',section->SectionData.join("\n")); + TQString Name= section->SectionName; + TQStringList data = TQStringList::split('\n',section->SectionData.join("\n")); // std::cout << " => processing section: \"" << Name << "\"" << std::endl; @@ -3009,9 +3009,9 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op if (KvpncDebugLevel > 2) appendLogEntry(i18n ("import ipsec config: => processing section: ")+"\"" + Name + "\"",debug); - for ( QStringList::Iterator it2 = data.begin(); it2 != data.end(); ++it2 ) + for ( TQStringList::Iterator it2 = data.begin(); it2 != data.end(); ++it2 ) { - QString dataline = *it2; + TQString dataline = *it2; // std::cout << "dataline found: \"" << dataline.remove("\n") << "\"" << std::endl; if (removeWhiteSpaceAtBegin( dataline).startsWith("also=")) { @@ -3019,11 +3019,11 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op if (KvpncDebugLevel > 2) appendLogEntry(i18n ("import ipsec config: also= found, looking for other section..."),debug); - QString newdata = QString(section->SectionData.join("\n")); - newdata.replace(QRegExp("^.*also=.*$"),""); + TQString newdata = TQString(section->SectionData.join("\n")); + newdata.replace(TQRegExp("^.*also=.*$"),""); section->SectionData= newdata; - QString OtherSection=dataline.simplifyWhiteSpace().section('#',0,0).section("=",1,1); + TQString OtherSection=dataline.simplifyWhiteSpace().section('#',0,0).section("=",1,1); // we have to find the other section and replace this line by the config data of the other section (after the =) bool section_found=false; for (IpsecImportSection * it3 = IpsecImportSectionList->first(); it3; it3 = IpsecImportSectionList->next() ) @@ -3032,29 +3032,29 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op { // std::cout << "section " << OtherSection << " found, appending:" << std::endl; if (KvpncDebugLevel > 2) - appendLogEntry(i18n ("import ipsec config: section %1 found, appending:").arg(OtherSection),debug); + appendLogEntry(i18n ("import ipsec config: section %1 found, appending:").tqarg(OtherSection),debug); // std::cout << "other data:" << std::endl << it3->SectionData.join("\n") << "--------" << std::endl; // std::cout << "section data:" << std::endl << section->SectionData.join("\n") << "--------" << std::endl; section_found=true; // data.remove(dataline); dataline=""; - // QStringList otherdata = QStringList::split("\n",QString(it3->SectionData.join("\n"))); - QString OtherData = QString(it3->SectionData.join("\n")); + // TQStringList otherdata = TQStringList::split("\n",TQString(it3->SectionData.join("\n"))); + TQString OtherData = TQString(it3->SectionData.join("\n")); - QStringList newdata; + TQStringList newdata; - for ( QStringList::Iterator it6 = data.begin(); it6 != data.end(); ++it6 ) + for ( TQStringList::Iterator it6 = data.begin(); it6 != data.end(); ++it6 ) { // std::cout << " also line: " << *it6 << std::endl; if (KvpncDebugLevel > 2) - appendLogEntry(i18n ("import ipsec config: also line: ") + QString(*it6),debug); + appendLogEntry(i18n ("import ipsec config: also line: ") + TQString(*it6),debug); - if (QString(*it6).find("also=") < 0) + if (TQString(*it6).find("also=") < 0) { // std::cout << " also= found." << std::endl; if (KvpncDebugLevel > 2) appendLogEntry(i18n ("import ipsec config: also= found."),debug); - newdata.append(QString(*it6)); + newdata.append(TQString(*it6)); } else { @@ -3073,7 +3073,7 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op { // std::cout << "section " << OtherSection << " not found, skipping" << std::endl; if (KvpncDebugLevel > 2) - appendLogEntry(i18n ("import ipsec config: section %1 not found, skipping").arg(OtherSection) ,debug); + appendLogEntry(i18n ("import ipsec config: section %1 not found, skipping").tqarg(OtherSection) ,debug); } } @@ -3087,17 +3087,17 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op for ( int i=0; i< (int)IpsecImportSectionList->count();i++ ) { IpsecImportSection *section2 = IpsecImportSectionList->at(i); - QString Name= section2->SectionName; + TQString Name= section2->SectionName; if (Name == "%default") { if (KvpncDebugLevel > 2) appendLogEntry(i18n ("import ipsec config: => appending %default section: ")+"\"" + section2->SectionData.join("\n") ,debug); - QStringList defaultdata = QStringList::split('\n',section2->SectionData.join("\n")); + TQStringList defaultdata = TQStringList::split('\n',section2->SectionData.join("\n")); - for ( QStringList::Iterator defaultit = defaultdata.begin(); defaultit != defaultdata.end(); ++defaultit ) + for ( TQStringList::Iterator defaultit = defaultdata.begin(); defaultit != defaultdata.end(); ++defaultit ) { if (KvpncDebugLevel > 2) appendLogEntry(i18n ("import ipsec config: => appending %default line: ")+"\"" + *defaultit,debug); @@ -3115,8 +3115,8 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op // IpsecImportSection *it5=NULL; // for ( it5 = IpsecImportSectionList->first(); it5; it5 = IpsecImportSectionList->next() ) // { -// QString SectionName= it5->SectionName; -// QStringList data = it5->SectionData; +// TQString SectionName= it5->SectionName; +// TQStringList data = it5->SectionData; // // std::cout << SectionName << std::endl; // std::cout << data.join("\n") << std::endl; @@ -3126,7 +3126,7 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op for ( int i=0; i< (int)IpsecImportSectionList->count();i++ ) { IpsecImportSection *section = IpsecImportSectionList->at(i); - QString Name= section->SectionName; + TQString Name= section->SectionName; if (Name == "%default") { IpsecImportSectionList->remove(IpsecImportSectionList->at(i)); @@ -3141,8 +3141,8 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op IpsecImportSection *it5=NULL; for ( it5 = IpsecImportSectionList->first(); it5; it5 = IpsecImportSectionList->next() ) { - QString SectionName= it5->SectionName; - QStringList data = it5->SectionData; + TQString SectionName= it5->SectionName; + TQStringList data = it5->SectionData; appendLogEntry(SectionName ,debug); appendLogEntry(data.join("\n") ,debug); @@ -3161,30 +3161,30 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op { IpsecImportSection *section = IpsecImportSectionList->at(i); - QStringList sectiondata = QStringList::split('\n',section->SectionData.join("\n")); + TQStringList sectiondata = TQStringList::split('\n',section->SectionData.join("\n")); // std::cout << " => processing section: \"" << section->SectionName << "\"" << std::endl; // std::cout << " => data: \"" << section->SectionData.join("\n") << "\"" << std::endl; if (KvpncDebugLevel > 2) appendLogEntry(i18n ("import ipsec config: => processing section: ")+"\"" + section->SectionName + "\"" ,debug); - VpnAccountData *profiledata = new VpnAccountData(VpnAccountData::freeswan,QString(section->SectionName)) ; + VpnAccountData *profiledata = new VpnAccountData(VpnAccountData::freeswan,TQString(section->SectionName)) ; - for ( QStringList::Iterator it2 = sectiondata.begin(); it2!= sectiondata.end() ; it2++ ) + for ( TQStringList::Iterator it2 = sectiondata.begin(); it2!= sectiondata.end() ; it2++ ) { - QString dataline = *it2; + TQString dataline = *it2; - QString line2 = removeWhiteSpaceAtBegin ( dataline ); // line of text excluding '\n' and replace all white chars with one blank + TQString line2 = removeWhiteSpaceAtBegin ( dataline ); // line of text excluding '\n' and replace all white chars with one blank // std::cout << "dataline: \"" << line2 << "\""; if ( line2.startsWith ( "rightsubnet=" ) ) { validLineFound=true; - QString RightSubnet=line2.section ( "rightsubnet=",1,-1 ); + TQString RightSubnet=line2.section ( "rightsubnet=",1,-1 ); // std::cout << "right subnet (remote) found: " << RightSubnet << std::endl; if ( KvpncDebugLevel > 2 ) appendLogEntry ( i18n ( "import ipsec config: right subnet (remote) found: " ) + RightSubnet ,debug ); @@ -3199,7 +3199,7 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op if ( line2.startsWith ( "leftsubnet=" ) ) { validLineFound=true; - QString LeftSubnet=line2.section ( "leftsubnet=",1,-1 ); + TQString LeftSubnet=line2.section ( "leftsubnet=",1,-1 ); // std::cout << "left subnet (local) found: " << LeftSubnet << std::endl; if ( KvpncDebugLevel > 2 ) appendLogEntry ( i18n ( "import ipsec config: left subnet (local) found: " ) + LeftSubnet ,debug ); @@ -3212,7 +3212,7 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op if ( line2.startsWith ( "rightnexthop=" ) ) { validLineFound=true; - QString RightNextHop=line2.section ( "rightnexthop=",1,-1 ); + TQString RightNextHop=line2.section ( "rightnexthop=",1,-1 ); // std::cout << "right next hop (remote) found: " << RightNextHop << std::endl; if ( KvpncDebugLevel > 2 ) appendLogEntry ( i18n ( "import ipsec config: right next hop (remote) found: " ) +RightNextHop ,debug ); @@ -3225,7 +3225,7 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op if ( line2.startsWith ( "leftnexthop=" ) ) { validLineFound=true; - QString LeftNextHop=line2.section ( "leftnexthop=",1,-1 ); + TQString LeftNextHop=line2.section ( "leftnexthop=",1,-1 ); std::cout << "left next hop (local) found: " << LeftNextHop << std::endl; if (KvpncDebugLevel > 2) appendLogEntry("import ipsec config: left next hop (local) found: " +LeftNextHop ,debug); @@ -3238,7 +3238,7 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op if ( line2.startsWith ( "left=" ) ) { validLineFound=true; - QString left=line2.section ( "left=",1,-1 ); + TQString left=line2.section ( "left=",1,-1 ); // local ip cant be set yet. // std::cout << "left found: " << left << std::endl; // if (KvpncDebugLevel > 2) @@ -3251,7 +3251,7 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op if ( line2.startsWith ( "right=" ) ) { validLineFound=true; - QString right=line2.section ( "right=",1,-1 ); + TQString right=line2.section ( "right=",1,-1 ); // std::cout << "right (remote gateway) found: " << right << std::endl; if ( KvpncDebugLevel > 2 ) appendLogEntry ( i18n ( "import ipsec config: right (remote gateway) found: " ) + right ,debug ); @@ -3263,7 +3263,7 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op if ( line2.startsWith ( "leftcert=" ) ) { validLineFound=true; - QString LeftCert=line2.section ( "leftcert=",1,-1 ); + TQString LeftCert=line2.section ( "leftcert=",1,-1 ); // std::cout << "left cert (local) found: " << LeftCert << std::endl; if ( KvpncDebugLevel > 2 ) appendLogEntry ( i18n ( "import ipsec config: left cert (local) found: " ) + LeftCert ,debug ); @@ -3275,7 +3275,7 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op if ( line2.startsWith ( "rightcert=" ) ) { validLineFound=true; - QString RightCert=line2.section("rightcert=",1,-1); + TQString RightCert=line2.section("rightcert=",1,-1); // std::cout << "right cert (remote) found: " << RightCert << std::endl; if (KvpncDebugLevel > 2) appendLogEntry(i18n ("import ipsec config: right cert (remote) found: ") + RightCert ,debug); @@ -3288,7 +3288,7 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op if ( line2.startsWith ( "rightca=" ) ) { validLineFound=true; - QString RightCA=line2.section ( "rightca=",1,-1 ); + TQString RightCA=line2.section ( "rightca=",1,-1 ); // std::cout << "right CA (remote) found: " << RightCA << std::endl; if ( KvpncDebugLevel > 2 ) appendLogEntry ( i18n ( "import ipsec config: right CA (remote) found: " ) +RightCA ,debug ); @@ -3300,7 +3300,7 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op if ( line2.startsWith ( "rightid=" ) ) { validLineFound=true; - QString RightID=line2.section ( "rightid=",1,-1 ); + TQString RightID=line2.section ( "rightid=",1,-1 ); // std::cout << "right ID (remote) found: " << RightID << std::endl; if ( KvpncDebugLevel > 2 ) appendLogEntry ( i18n ( "import ipsec config: right ID (remote) found: " ) + RightID ,debug ); @@ -3314,7 +3314,7 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op if ( line2.startsWith ( "leftid=" ) ) { validLineFound=true; - QString LeftID=line2.section ( "leftid=",1,-1 ); + TQString LeftID=line2.section ( "leftid=",1,-1 ); // std::cout << "local ID (local) found: " << LeftID << std::endl; if ( KvpncDebugLevel > 2 ) appendLogEntry ( i18n ( "import ipsec config: local ID (local) found: " ) + LeftID ,debug ); @@ -3328,7 +3328,7 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op if ( line2.startsWith ( "rightrsasigkey=" ) ) { validLineFound=true; - QString RightRsaSigKey=line2.section ( "rightrsasigkey=",1,-1 ); + TQString RightRsaSigKey=line2.section ( "rightrsasigkey=",1,-1 ); // std::cout << "right uses (remote) " << RightRsaSigKey << std::endl; if (RightRsaSigKey=="%cert") { @@ -3355,7 +3355,7 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op if ( line2.startsWith ( "leftrsasigkey=" ) ) { validLineFound=true; - QString LeftRsaSigKey=line2.section ( "leftrsasigkey=",1,-1 ); + TQString LeftRsaSigKey=line2.section ( "leftrsasigkey=",1,-1 ); // std::cout << "right uses (remote) " << LeftRsaSigKey << std::endl; if (LeftRsaSigKey=="%cert") { @@ -3381,7 +3381,7 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op if ( line2.startsWith ( "authby=" ) ) { validLineFound=true; - QString Authby=line2.simplifyWhiteSpace().section ( "authby=",1,1 ); + TQString Authby=line2.simplifyWhiteSpace().section ( "authby=",1,1 ); // std::cout << "left and right use certs " << std::endl; if ( Authby.find ( "rsasig", 0 , FALSE ) > -1 ) { @@ -3415,7 +3415,7 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op if ( line2.startsWith ( "auto=start" ) ) { // validLineFound=true; - // QString Authby=line2.simplifyWhiteSpace().section('#',0,0).section("=",1,1); + // TQString Authby=line2.simplifyWhiteSpace().section('#',0,0).section("=",1,1); // std::cout << "profile should be started" << std::endl; // if (KvpncDebugLevel > 2) // appendLogEntry("import ipsec config: profile should be started" ,debug); @@ -3427,7 +3427,7 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op if ( line2.startsWith ( "leftsourceip=" ) ) { validLineFound=true; - QString leftsourceip=line2.section ( "leftsourceip=",1,-1 ); + TQString leftsourceip=line2.section ( "leftsourceip=",1,-1 ); std::cout << "left (local) have to use IP address " << leftsourceip << std::endl; if (KvpncDebugLevel > 2) appendLogEntry("import ipsec config: left (local) have to use IP address " + leftsourceip ,debug); @@ -3439,7 +3439,7 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op if ( line2.startsWith ( "virtual_private=" ) ) { validLineFound=true; - QString virtualprivate=line2.section ( "virtual_private=",1,-1 ); + TQString virtualprivate=line2.section ( "virtual_private=",1,-1 ); std::cout << "virtual private networks " << virtualprivate << std::endl; if (KvpncDebugLevel > 2) appendLogEntry("import ipsec config: virtual private networks " +virtualprivate ,debug); @@ -3452,7 +3452,7 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op if ( line2.startsWith ( "rightsourceip=" ) ) { validLineFound=true; - QString rightsourceip=line2.section ( "rightsourceip=",1,-1 ); + TQString rightsourceip=line2.section ( "rightsourceip=",1,-1 ); std::cout << "right (remote) have to use IP address " << rightsourceip << std::endl; if (KvpncDebugLevel > 2) appendLogEntry("import ipsec config: right (remote) have to use IP address " + rightsourceip ,debug); @@ -3465,7 +3465,7 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op if ( line2.startsWith ( "esp=" ) ) { validLineFound=true; - QString IpsecEsp=line2.section ( "esp=",1,-1 ); + TQString IpsecEsp=line2.section ( "esp=",1,-1 ); // std::cout << "esp settings found: " << IpsecEsp << std::endl; if ( KvpncDebugLevel > 2 ) appendLogEntry ( i18n ( "import ipsec config: esp settings found: " ) + IpsecEsp ,debug ); @@ -3478,7 +3478,7 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op if ( line2.startsWith ( "ike=" ) ) { validLineFound=true; - QString IpsecIke=line2.section ( "ike=",1,-1 ); + TQString IpsecIke=line2.section ( "ike=",1,-1 ); // std::cout << "ike settings found: " << IpsecIke << std::endl; if ( KvpncDebugLevel > 2 ) appendLogEntry ( i18n ( "import ipsec config: ike settings found: " ) + IpsecIke ,debug ); @@ -3491,7 +3491,7 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op if ( line2.startsWith ( "type=" ) ) { validLineFound=true; - QString IpsecVpnMode=line2.section ( "type=",1,1 ); + TQString IpsecVpnMode=line2.section ( "type=",1,1 ); // std::cout << "IpsecType found: " << IpsecType << std::endl; if ( KvpncDebugLevel > 2 ) appendLogEntry ( i18n ( "import ipsec config: IPsec vpn mode found: " ) + IpsecVpnMode ,debug ); @@ -3506,7 +3506,7 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op if ( line2.startsWith ( "leftxauthclient=" ) ) { validLineFound=true; - QString useXauth=line2.section ( "leftxauthclient=",1,1 ); + TQString useXauth=line2.section ( "leftxauthclient=",1,1 ); if (useXauth=="yes") { //std::cout << "Use XAUTH: " << i18n("yes") << std::endl; @@ -3528,7 +3528,7 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op if ( line2.startsWith ( "rightxauthserver=" ) ) { validLineFound=true; - QString useXauth=line2.section ( "rightxauthserver=",1,-1 ); + TQString useXauth=line2.section ( "rightxauthserver=",1,-1 ); if (useXauth == "yes") { //std::cout << "Use XAUTH: " << i18n("yes") << std::endl; @@ -3550,10 +3550,10 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op if ( line2.startsWith ( "keyingtries=" ) ) { validLineFound=true; - int MaxConnectTries=QString(line2.section ( "keyingtries=",1,1 )).toInt(); + int MaxConnectTries=TQString(line2.section ( "keyingtries=",1,1 )).toInt(); // std::cout << "keyingtries found: " << MaxConnectTries << std::endl; if ( KvpncDebugLevel > 2 ) - appendLogEntry ( i18n ( "import ipsec config: keyingtries found: " ) + QString().setNum(MaxConnectTries) ,debug ); + appendLogEntry ( i18n ( "import ipsec config: keyingtries found: " ) + TQString().setNum(MaxConnectTries) ,debug ); profiledata->setMaxConnectTries ( MaxConnectTries ); // std::cout << " => set it for profile " << IpsecConfigSection << " ." << std::endl; // if (KvpncDebugLevel > 2) @@ -3562,7 +3562,7 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op if ( line2.startsWith ( "pfs=" ) ) { validLineFound=true; - QString UsePerfectForwardSecrety=line2.section ( "pfs=",1,1 ).remove ( '"' ); + TQString UsePerfectForwardSecrety=line2.section ( "pfs=",1,1 ).remove ( '"' ); if (UsePerfectForwardSecrety =="yes") { //std::cout << "Use PFS: " << i18n("yes") << std::endl; @@ -3584,7 +3584,7 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op if ( line2.startsWith ( "pfsgroup=" ) ) { validLineFound=true; - QString PerfectForwardSecrety=line2.section ( "pfsgroup=",1,1 ); + TQString PerfectForwardSecrety=line2.section ( "pfsgroup=",1,1 ); // std::cout << "keyingtries found: " << MaxConnectTries << std::endl; if ( KvpncDebugLevel > 2 ) appendLogEntry ( i18n ( "import ipsec config: PFS group found: " ) + PerfectForwardSecrety ,debug ); @@ -3596,7 +3596,7 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op if ( line2.startsWith ( "aggrmode=" ) ) { validLineFound=true; - QString UseAgressiveMode=line2.section ( "aggrmode=",1,1 ).remove ( '"' ); + TQString UseAgressiveMode=line2.section ( "aggrmode=",1,1 ).remove ( '"' ); if (UseAgressiveMode == "yes") { //std::cout << "Exchange mode: " << i18n("aggressive") << std::endl; @@ -3648,11 +3648,11 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op // FIXME we only use the first in list - QString Interface = InterfaceList.first(); + TQString Interface = InterfaceList.first(); profiledata->setNetworkDevice(Interface); profiledata->setName("kvpnc_import_"+profiledata->getName()); - profiledata->setDescription(QString(i18n("import from ")+filename)); + profiledata->setDescription(TQString(i18n("import from ")+filename)); ImportedAccountList->append(profiledata); } } @@ -3671,11 +3671,11 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op selectdlg.ImportProfileListView->addColumn(i18n("Gateway")); selectdlg.ImportProfileListView->addColumn(i18n("Authentication")); selectdlg.ImportProfileListView->addColumn(i18n("Remote network")); - QCheckListItem *item; + TQCheckListItem *item; for ( it = ImportedAccountList->first(); it; it = ImportedAccountList->next() ) { - QString name = it->getName(); - QString type=""; + TQString name = it->getName(); + TQString type=""; if ( it->getConnectionType() == VpnAccountData::cisco ) type = "cisco" ; else if ( it->getConnectionType() == VpnAccountData::ciscoorig ) @@ -3696,7 +3696,7 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op type = i18n("other"); // litem->setSelectable(true); - item = new QCheckListItem(selectdlg.ImportProfileListView,it->getName(),QCheckListItem::CheckBox); + item = new TQCheckListItem(selectdlg.ImportProfileListView,it->getName(),TQCheckListItem::CheckBox); item->setText(1,type); item->setText(2,it->getGateway()); if (it->getAuthType() == VpnAccountData::cert) @@ -3708,13 +3708,13 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op else item->setText(3,i18n("unknown")); selectdlg.ImportProfileListView->insertItem(item); - QString RemoteNetDiv="/"; + TQString RemoteNetDiv="/"; if (it->getRemoteNetAddr() == "") { it->setRemoteNetMask(""); RemoteNetDiv=""; } - item->setText(4,QString(it->getRemoteNetAddr()+RemoteNetDiv+it->getRemoteNetMask())); + item->setText(4,TQString(it->getRemoteNetAddr()+RemoteNetDiv+it->getRemoteNetMask())); // std::cout << "insert profile into listview: " << name << std::endl; } @@ -3723,16 +3723,16 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op if (ret == true) { - QListViewItemIterator it2( selectdlg.ImportProfileListView ); + TQListViewItemIterator it2( selectdlg.ImportProfileListView ); for ( ; it2.current(); ++it2 ) { - if ( ( (QCheckListItem*)it2.current() )->isOn() ) + if ( ( (TQCheckListItem*)it2.current() )->isOn() ) { VpnAccountData *data=NULL; it = 0; for ( it = ImportedAccountList->first(); it; it = ImportedAccountList->next() ) { - if ( it->getName() == ( (QCheckListItem*)it2.current() )->text() && ( (QCheckListItem*)it2.current() )->isOn() ) + if ( it->getName() == ( (TQCheckListItem*)it2.current() )->text() && ( (TQCheckListItem*)it2.current() )->isOn() ) { data = it; importCount++; @@ -3755,11 +3755,11 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op - QString msg=""; + TQString msg=""; if (importCount > 0 ) - msg = i18n("Import was successful. %1 profiles are imported.").arg(QString::number(importCount)); + msg = i18n("Import was successful. %1 profiles are imported.").tqarg(TQString::number(importCount)); else - msg = i18n("Import was canceled because no profiles are selected.").arg(QString::number(importCount)); + msg = i18n("Import was canceled because no profiles are selected.").tqarg(TQString::number(importCount)); KMessageBox::information ( 0, msg,i18n("Import success") ); @@ -3775,7 +3775,7 @@ bool KVpncConfig::importIpsecConfig(QString filename, QString& RetName, bool& op } -bool KVpncConfig::importFritzboxConfig(QString filename, QString& RetName, bool& openProfileManager) +bool KVpncConfig::importFritzboxConfig(TQString filename, TQString& RetName, bool& openProfileManager) { /* // example of vpn config fritzbox user @@ -3875,7 +3875,7 @@ bool KVpncConfig::importFritzboxConfig(QString filename, QString& RetName, bool& } */ - QFile importfile (filename); + TQFile importfile (filename); if (!importfile.exists()) { KMessageBox::error ( 0, i18n ( "Reading of \"%1\" has been failed!" ).arg ( filename ) ); @@ -3883,9 +3883,9 @@ bool KVpncConfig::importFritzboxConfig(QString filename, QString& RetName, bool& } if ( importfile.open(IO_ReadOnly)) { - QString line = NULL; + TQString line = NULL; VpnAccountData *profiledata = new VpnAccountData(VpnAccountData::freeswan,"fritzbox") ; - QTextStream stream(&importfile); + TQTextStream stream(&importfile); bool datapipecfgFound = false; bool policiesFound = false; bool targetsFound = false; @@ -3895,7 +3895,7 @@ bool KVpncConfig::importFritzboxConfig(QString filename, QString& RetName, bool& bool ipnetFound = false; bool nameFound = false; - profiledata->setDescription(QString(i18n("import from ")+filename)); + profiledata->setDescription(TQString(i18n("import from ")+filename)); profiledata->setConnectionType( VpnAccountData::racoon); profiledata->setUsePerfectForwardSecrety(true); profiledata->setPerfectForwardSecrety("modp1024"); @@ -3916,43 +3916,43 @@ bool KVpncConfig::importFritzboxConfig(QString filename, QString& RetName, bool& { line = removeWhiteSpaceAtBegin(stream.readLine()).simplifyWhiteSpace(); if (KvpncDebugLevel > 6) - appendLogEntry(i18n ("import fritzbox config: line: %1").arg(line), debug); + appendLogEntry(i18n ("import fritzbox config: line: %1").tqarg(line), debug); if (line.startsWith("datapipecfg")) { datapipecfgFound = true; if (KvpncDebugLevel > 2) - appendLogEntry(i18n ("import fritzbox config: %1 found").arg("datapipecfg"), debug); + appendLogEntry(i18n ("import fritzbox config: %1 found").tqarg("datapipecfg"), debug); } if (line.startsWith("policies")) { policiesFound = true; if (KvpncDebugLevel > 2) - appendLogEntry(i18n ("import fritzbox config: %1 found").arg("policies"), debug); + appendLogEntry(i18n ("import fritzbox config: %1 found").tqarg("policies"), debug); } if (line.startsWith("targets")) { targetsFound = true; if (KvpncDebugLevel > 2) - appendLogEntry(i18n ("import fritzbox config: %1 found").arg("targets"), debug); + appendLogEntry(i18n ("import fritzbox config: %1 found").tqarg("targets"), debug); } if (line.startsWith("localid")) { localidFound = true; if (KvpncDebugLevel > 2) - appendLogEntry(i18n ("import fritzbox config: %1 found").arg("localid"), debug); + appendLogEntry(i18n ("import fritzbox config: %1 found").tqarg("localid"), debug); } if (line.startsWith("phase2localid")) { phase2localidFound = true; if (KvpncDebugLevel > 2) - appendLogEntry(i18n ("import fritzbox config: %1 found").arg("phase2localid"), debug); + appendLogEntry(i18n ("import fritzbox config: %1 found").tqarg("phase2localid"), debug); } if (line.startsWith("phase2remoteid")) { phase2remoteidFound = true; if (KvpncDebugLevel > 2) - appendLogEntry(i18n ("import fritzbox config: %1 found").arg("phase2remoteid"), debug); + appendLogEntry(i18n ("import fritzbox config: %1 found").tqarg("phase2remoteid"), debug); } if (line.startsWith("ipnet")) { @@ -3968,9 +3968,9 @@ bool KVpncConfig::importFritzboxConfig(QString filename, QString& RetName, bool& { if (line.startsWith("name = ")) { - QString ProfileName=line.section("= ",1,1).replace("\"","").replace(";","").replace(" ","_"); + TQString ProfileName=line.section("= ",1,1).replace("\"","").replace(";","").replace(" ","_"); if (KvpncDebugLevel > 2) - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("name").arg(ProfileName) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("name").tqarg(ProfileName) ,debug); profiledata->setName(ProfileName); nameFound = true; } @@ -3981,9 +3981,9 @@ bool KVpncConfig::importFritzboxConfig(QString filename, QString& RetName, bool& reconnectAfterConnectionLost = true; if (KvpncDebugLevel > 2) if (reconnectAfterConnectionLost) - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("always_renew").arg(i18n("yes")) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("always_renew").tqarg(i18n("yes")) ,debug); else - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("always_renew").arg(i18n("no")) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("always_renew").tqarg(i18n("no")) ,debug); profiledata->setDoReconnectAfterConnectionLost(reconnectAfterConnectionLost); } if (line.startsWith("dont_filter_netbios = ")) @@ -3993,47 +3993,47 @@ bool KVpncConfig::importFritzboxConfig(QString filename, QString& RetName, bool& dont_filter_netbios = true; if (KvpncDebugLevel > 2) if (dont_filter_netbios) - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("dont_filter_netbios").arg(i18n("yes")) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("dont_filter_netbios").tqarg(i18n("yes")) ,debug); else - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("dont_filter_netbios").arg(i18n("no")) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("dont_filter_netbios").tqarg(i18n("no")) ,debug); // nothing to yet } if (line.startsWith("localip = ")) { - QString LocalIp=line.section("= ",1,1).replace("\"","").replace(";",""); + TQString LocalIp=line.section("= ",1,1).replace("\"","").replace(";",""); if (KvpncDebugLevel > 2) - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("localip").arg(LocalIp) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("localip").tqarg(LocalIp) ,debug); // nothing to do yet } if (line.startsWith("virtualip = ")) { - QString LocalVirtualIp=line.section("= ",1,1).replace("\"","").replace(";",""); + TQString LocalVirtualIp=line.section("= ",1,1).replace("\"","").replace(";",""); if (KvpncDebugLevel > 2) - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("virtualip").arg(LocalVirtualIp) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("virtualip").tqarg(LocalVirtualIp) ,debug); profiledata->setUseLeftSourceIp(true); profiledata->setLeftSourceIp(LocalVirtualIp); } if (line.startsWith("remoteip = ")) { - QString RemoteIp=line.section("= ",1,1).replace("\"","").replace(";",""); + TQString RemoteIp=line.section("= ",1,1).replace("\"","").replace(";",""); if (KvpncDebugLevel > 2) - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("remoteip").arg(RemoteIp) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("remoteip").tqarg(RemoteIp) ,debug); // nothing to do yet } if (line.startsWith("remotehostname = ")) { - QString Gateway=line.section("= ",1,1).replace("\"","").replace(";",""); + TQString Gateway=line.section("= ",1,1).replace("\"","").replace(";",""); if (KvpncDebugLevel > 2) - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("remotehostname").arg(Gateway) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("remotehostname").tqarg(Gateway) ,debug); profiledata->setGateway(Gateway); } if (localidFound) { if (line.startsWith("user_fqdn = ")) { - QString LocalId=line.section("= ",1,1).replace("\"","").replace(";",""); + TQString LocalId=line.section("= ",1,1).replace("\"","").replace(";",""); if (KvpncDebugLevel > 2) - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg(QString("user_fqdn")+" ("+i18n("local id")+")").arg(LocalId) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg(TQString("user_fqdn")+" ("+i18n("local id")+")").tqarg(LocalId) ,debug); profiledata->setSpecialLocalID(LocalId); profiledata->setUseSpecialLocalID(true); profiledata->setLocalIDType("user_fqdn"); @@ -4042,10 +4042,10 @@ bool KVpncConfig::importFritzboxConfig(QString filename, QString& RetName, bool& } if (line.startsWith("mode = ")) { - QString IpsecExchangeMode=line.section("= ",1,1).replace(";",""); + TQString IpsecExchangeMode=line.section("= ",1,1).replace(";",""); if (KvpncDebugLevel > 2) - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg(i18n("exchange mode")).arg(IpsecExchangeMode) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg(i18n("exchange mode")).tqarg(IpsecExchangeMode) ,debug); if (IpsecExchangeMode == "mode_aggressive") profiledata->setExchangeMode("aggressive"); @@ -4054,9 +4054,9 @@ bool KVpncConfig::importFritzboxConfig(QString filename, QString& RetName, bool& } if (line.startsWith("keytype = ")) { - QString AuthType=line.section("= ",1,1).replace(";",""); + TQString AuthType=line.section("= ",1,1).replace(";",""); if (KvpncDebugLevel > 2) - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("keytype").arg(AuthType) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("keytype").tqarg(AuthType) ,debug); if (AuthType == "keytype_pre_shared") profiledata->setAuthType(VpnAccountData::psk); @@ -4065,11 +4065,11 @@ bool KVpncConfig::importFritzboxConfig(QString filename, QString& RetName, bool& } if (line.startsWith("key = ")) { - QString PreshardKey=line.section("= ",1,1).replace("\"","").replace(";",""); + TQString PreshardKey=line.section("= ",1,1).replace("\"","").replace(";",""); if (KvpncDebugLevel > 2 && KvpncDebugLevel < 5) - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("key").arg("******") ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("key").tqarg("******") ,debug); if (KvpncDebugLevel > 5) - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("key").arg(PreshardKey) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("key").tqarg(PreshardKey) ,debug); profiledata->setPreSharedKey(PreshardKey); profiledata->setPskIsInFile(false); } @@ -4080,9 +4080,9 @@ bool KVpncConfig::importFritzboxConfig(QString filename, QString& RetName, bool& cert_do_server_auth = true; if (KvpncDebugLevel > 2) if (cert_do_server_auth) - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("cert_do_server_auth").arg(i18n("yes")) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("cert_do_server_auth").tqarg(i18n("yes")) ,debug); else - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("cert_do_server_auth").arg(i18n("no")) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("cert_do_server_auth").tqarg(i18n("no")) ,debug); // nothing to to yet } if (line.startsWith("use_nat_t = ")) @@ -4092,9 +4092,9 @@ bool KVpncConfig::importFritzboxConfig(QString filename, QString& RetName, bool& UseNat = true; if (KvpncDebugLevel > 2) if (UseNat) - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("use_nat_t").arg(i18n("yes")) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("use_nat_t").tqarg(i18n("yes")) ,debug); else - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("use_nat_t").arg(i18n("no")) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("use_nat_t").tqarg(i18n("no")) ,debug); profiledata->setUseNat(UseNat); profiledata->setUseUdp(true); } @@ -4105,9 +4105,9 @@ bool KVpncConfig::importFritzboxConfig(QString filename, QString& RetName, bool& UseXauth = true; if (KvpncDebugLevel > 2) if (UseXauth) - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("use_xauth").arg(i18n("yes")) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("use_xauth").tqarg(i18n("yes")) ,debug); else - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("use_xauth").arg(i18n("no")) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("use_xauth").tqarg(i18n("no")) ,debug); profiledata->setAuthWithUsernameAndPassword(UseXauth); } if (line.startsWith("use_cfgmode = ")) @@ -4117,18 +4117,18 @@ bool KVpncConfig::importFritzboxConfig(QString filename, QString& RetName, bool& ModeConfig = true; if (KvpncDebugLevel > 2) if (ModeConfig) - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("use_cfgmode").arg(i18n("yes")) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("use_cfgmode").tqarg(i18n("yes")) ,debug); else - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("use_cfgmode").arg(i18n("no")) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("use_cfgmode").tqarg(i18n("no")) ,debug); profiledata->setUseModeConfig(ModeConfig); } if (phase2localidFound) { if (line.startsWith("ipaddr = ")) { - QString Phase2LocalId=line.section("= ",1,1).replace("\"","").replace(";",""); + TQString Phase2LocalId=line.section("= ",1,1).replace("\"","").replace(";",""); if (KvpncDebugLevel > 2) - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg(i18n("ip addr for phase 2")).arg(Phase2LocalId) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg(i18n("ip addr for phase 2")).tqarg(Phase2LocalId) ,debug); // nothing to do yet } } @@ -4137,20 +4137,20 @@ bool KVpncConfig::importFritzboxConfig(QString filename, QString& RetName, bool& profiledata->setUseRemoteNetwork(true); if (line.startsWith("ipaddr = ")) { - QString RemoteNetWorkAddr=line.section("= ",1,1).replace(";",""); + TQString RemoteNetWorkAddr=line.section("= ",1,1).replace(";",""); if (KvpncDebugLevel > 2) - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg(i18n("remote network ip")).arg(RemoteNetWorkAddr) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg(i18n("remote network ip")).tqarg(RemoteNetWorkAddr) ,debug); profiledata->setRemoteNetAddr(RemoteNetWorkAddr); } if (line.startsWith("mask = ")) { - QString RemoteNetWorkMask=line.section("= ",1,1).replace(";",""); - QString RemoteNetWorkMaskNumeric = QString().setNum(Utils(this).dottedIpv4Netmask2NetmaskBytes(RemoteNetWorkMask)); + TQString RemoteNetWorkMask=line.section("= ",1,1).replace(";",""); + TQString RemoteNetWorkMaskNumeric = TQString().setNum(Utils(this).dottedIpv4Netmask2NetmaskBytes(RemoteNetWorkMask)); if (KvpncDebugLevel > 2) { - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg(i18n("remote network netmask")).arg(RemoteNetWorkMask) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg(i18n("remote network netmask")).tqarg(RemoteNetWorkMask) ,debug); - appendLogEntry(i18n("Netmask (dotted): %1, numeric value: %2").arg(RemoteNetWorkMask).arg(RemoteNetWorkMaskNumeric), debug); + appendLogEntry(i18n("Netmask (dotted): %1, numeric value: %2").tqarg(RemoteNetWorkMask).tqarg(RemoteNetWorkMaskNumeric), debug); } profiledata->setRemoteNetMask(RemoteNetWorkMaskNumeric); } @@ -4169,11 +4169,11 @@ bool KVpncConfig::importFritzboxConfig(QString filename, QString& RetName, bool& { if ( it->getName() == profiledata->getName() ) { - //account->setName( QString( account->getName() + "_2" ) ); - // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).arg( account->getName() ), i18n( "Name exist, renamed" ) ); + //account->setName( TQString( account->getName() + "_2" ) ); + // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).tqarg( account->getName() ), i18n( "Name exist, renamed" ) ); KMessageBox::error ( 0, i18n ( "Profile name exists!" ), i18n ( "Name Exists" ) ); nameOk = false; - QString newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), QString ( profiledata->getName() + "_2" ), &ok ); + TQString newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), TQString ( profiledata->getName() + "_2" ), &ok ); if (newName.isEmpty()) { KMessageBox::information ( 0, i18n ( "Import was canceled." ) ); @@ -4200,7 +4200,7 @@ bool KVpncConfig::importFritzboxConfig(QString filename, QString& RetName, bool& saveOptions(true, RetName); appendLogEntry ( i18n ( "Import of \"%1\" (%2) was successful." ).arg ( profiledata->getName() ).arg ( "Fritzbox" ), info ); - QString bin = "racoon"; + TQString bin = "racoon"; ToolInfo *tool; //std::cout << "Tool (bin): " << bin << std::endl; if ( !ToolList->isEmpty() ) @@ -4227,7 +4227,7 @@ bool KVpncConfig::importFritzboxConfig(QString filename, QString& RetName, bool& } } - QString msg=""; + TQString msg=""; if (policiesFound && nameFound) msg = i18n("Import was successful. 1 profile was imported."); else @@ -4245,7 +4245,7 @@ bool KVpncConfig::importFritzboxConfig(QString filename, QString& RetName, bool& } -VpnAccountData* KVpncConfig::findProfile(QPtrList *list,const QString& Name) +VpnAccountData* KVpncConfig::findProfile(TQPtrList *list,const TQString& Name) { VpnAccountData *it=NULL; bool found=false; @@ -4271,13 +4271,13 @@ VpnAccountData* KVpncConfig::findProfile(QPtrList *list,const QS } } -QString KVpncConfig::removeWhiteSpaceAtBegin(const QString str) +TQString KVpncConfig::removeWhiteSpaceAtBegin(const TQString str) { - QString newstr=""; + TQString newstr=""; int i=0; for (i=0;i<(int)str.length();i++) { - if (!QChar(str.at(i)).isSpace()) + if (!TQChar(str.at(i)).isSpace()) break; } newstr = str.right(str.length()-i); @@ -4287,16 +4287,16 @@ QString KVpncConfig::removeWhiteSpaceAtBegin(const QString str) void KVpncConfig::doBackupConfig() { KStandardDirs * dirs = KGlobal::dirs(); - QString config = QString(dirs->saveLocation( "config" )+"/kvpncrc"); - QFile OriginalConfFile( config ); - QFile backupOriginalConfFile( config+".backup" ); - QTextStream writestream( &backupOriginalConfFile ); - QTextStream readstream( &OriginalConfFile ); + TQString config = TQString(dirs->saveLocation( "config" )+"/kvpncrc"); + TQFile OriginalConfFile( config ); + TQFile backupOriginalConfFile( config+".backup" ); + TQTextStream writestream( &backupOriginalConfFile ); + TQTextStream readstream( &OriginalConfFile ); if ( OriginalConfFile.open( IO_ReadOnly ) ) { if (backupOriginalConfFile.open(IO_WriteOnly)) { - QString OriginalConfFileContent = QString( OriginalConfFile.readAll() ) ; + TQString OriginalConfFileContent = TQString( OriginalConfFile.readAll() ) ; writestream << OriginalConfFileContent; OriginalConfFile.close(); backupOriginalConfFile.close(); @@ -4307,16 +4307,16 @@ void KVpncConfig::doBackupConfig() void KVpncConfig::restoreBackupConfig() { KStandardDirs * dirs = KGlobal::dirs(); - QString config = QString(dirs->saveLocation( "config" )+"/kvpncrc"); - QFile OriginalConfFile( config+".backup" ); - QFile backupOriginalConfFile( config ); - QTextStream writestream( &backupOriginalConfFile ); - QTextStream readstream( &OriginalConfFile ); + TQString config = TQString(dirs->saveLocation( "config" )+"/kvpncrc"); + TQFile OriginalConfFile( config+".backup" ); + TQFile backupOriginalConfFile( config ); + TQTextStream writestream( &backupOriginalConfFile ); + TQTextStream readstream( &OriginalConfFile ); if ( OriginalConfFile.open( IO_ReadOnly ) ) { if (backupOriginalConfFile.open(IO_WriteOnly)) { - QString OriginalConfFileContent = QString( OriginalConfFile.readAll() ) ; + TQString OriginalConfFileContent = TQString( OriginalConfFile.readAll() ) ; writestream << OriginalConfFileContent; OriginalConfFile.close(); backupOriginalConfFile.close(); @@ -4337,10 +4337,10 @@ void KVpncConfig::getToolsInfo() } } -void KVpncConfig::removeEntry(QString Name) +void KVpncConfig::removeEntry(TQString Name) { KStandardDirs * dirs = KGlobal::dirs(); - QString filePath = dirs->findResource ( "config", "kvpncrc" ); + TQString filePath = dirs->findResource ( "config", "kvpncrc" ); appPointer->processEvents(); @@ -4354,11 +4354,11 @@ void KVpncConfig::removeEntry(QString Name) { if ( !it->getName().isEmpty() ) { - QString name = it->getName(); + TQString name = it->getName(); if (it->getName() == Name) { //std::cout << "Remove profile: " << it->getName() << std::endl; - QString ProfileName = "Profile_"; + TQString ProfileName = "Profile_"; ProfileName += name; config->setGroup( ProfileName ); @@ -4371,7 +4371,7 @@ void KVpncConfig::removeEntry(QString Name) wallet = KWallet::Wallet::openWallet(KWallet::Wallet::LocalWallet()); if (wallet != 0) { - QString walletname="kvpnc"; + TQString walletname="kvpnc"; // Check if folder exists, otherwise create it bool walletOK=true; if (!wallet->hasFolder(walletname)) @@ -4383,27 +4383,27 @@ void KVpncConfig::removeEntry(QString Name) { wallet->setFolder(walletname); //std::cout << "[set] account: " << ProfileName << ", loginname: " << loginname << ", password: " << pwd << std::endl; - bool UserPasswordOK = (wallet->removeEntry (QString(name+"__user_pw")) == 0); - bool PskOK= (wallet->removeEntry (QString(name+"__psk")) == 0); - bool PskKeyPassOK = (wallet->removeEntry (QString(name+"__priv_key_pwd")) == 0); + bool UserPasswordOK = (wallet->removeEntry (TQString(name+"__user_pw")) == 0); + bool PskOK= (wallet->removeEntry (TQString(name+"__psk")) == 0); + bool PskKeyPassOK = (wallet->removeEntry (TQString(name+"__priv_key_pwd")) == 0); // wallet->sync(); if (KvpncDebugLevel > 2) { if (UserPasswordOK) - appendLogEntry(i18n( "delete of %1 was ok." ).arg(i18n("user password")), debug); + appendLogEntry(i18n( "delete of %1 was ok." ).tqarg(i18n("user password")), debug); else - appendLogEntry(i18n( "delete of %1 has failed." ).arg(i18n("user password")), debug); + appendLogEntry(i18n( "delete of %1 has failed." ).tqarg(i18n("user password")), debug); // if (PskOK) - appendLogEntry(i18n( "delete of %1 was successful." ).arg(i18n("preshared key")), debug); + appendLogEntry(i18n( "delete of %1 was successful." ).tqarg(i18n("preshared key")), debug); else - appendLogEntry(i18n( "delete of %1 has failed." ).arg(i18n("preshared key")),debug); + appendLogEntry(i18n( "delete of %1 has failed." ).tqarg(i18n("preshared key")),debug); if (PskKeyPassOK) - appendLogEntry(i18n( "delete of %1 was successful." ).arg(i18n("private key password")), debug); + appendLogEntry(i18n( "delete of %1 was successful." ).tqarg(i18n("private key password")), debug); else - appendLogEntry(i18n( "delete of %1 has failed." ).arg(i18n("private key password")),debug); + appendLogEntry(i18n( "delete of %1 has failed." ).tqarg(i18n("private key password")),debug); // //std::cout << "success: " << pwdOK << std::endl; @@ -4509,8 +4509,8 @@ void KVpncConfig::removeEntry(QString Name) config->deleteGroup( ProfileName ); /* give info */ - //slotStatusMsg ( i18n( "Profile \"%1\" removed." ).arg( Name ), ID_FLASH_MSG ); - appendLogEntry ( i18n( "Profile \"%1\" removed." ).arg( Name ) , info); + //slotStatusMsg ( i18n( "Profile \"%1\" removed." ).tqarg( Name ), ID_FLASH_MSG ); + appendLogEntry ( i18n( "Profile \"%1\" removed." ).tqarg( Name ) , info); AccountList->remove(it); break; } diff --git a/src/kvpncconfig.h b/src/kvpncconfig.h index 4ea2ddd..18821f1 100644 --- a/src/kvpncconfig.h +++ b/src/kvpncconfig.h @@ -21,18 +21,18 @@ #define __KVPNCCONFIG_H__ //BEGIN INCLUDES -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -50,69 +50,69 @@ This class holds global configuration data. @author Christoph Thielecke */ -class KVpncConfig : public QObject +class KVpncConfig : public TQObject { public: - KVpncConfig(QWidget *parent,KStatusBar *statusbar); + KVpncConfig(TQWidget *parent,KStatusBar *statusbar); ~KVpncConfig(); public: - enum ConnectionStatus {disconnected=0, connecting=1, connected=2}; + enum ConnectiontqStatus {disconnected=0, connecting=1, connected=2}; enum LogType {info=0, remote=1, error=2, success=3, debug=4}; - QString pathToVpnc; - QString pathToCiscoVpnc; - QString pathToRacoon; - QString pathToRacoonctl; - QString pathToSetkey; - QString pathToIptables; - QString pathToOpenssl; - QString pathToIpsec; - QString pathToPppd; - QString pathToPptp; - QString pathToL2tpd; - QString pathToXl2tpd; - QString pathToOpenl2tp; - QString pathToKill; - QString pathToKillall; - QString pathToPing; - QString pathToOpenvpn; - QString pathToIp; - QString pathToIfconfig; - QString pathToRoute; - QString pathToNetstat; - QString pathToPkcs11Tool; - QString pathToVtund; - QString pathToCiscoCertMgr; - QString pathToTail; - QString pathToSsh; - QString pathToKsshAskpass; - QString pathToGnomeSshAskpass; - QString AutoConnectProfile; - QString RacoonDebugLevel; - QString Vpnc_pid_file; - QString Pppd_pid_file; - QString lastProfile; - QString logfileName; - QString InterpreterShell; - - QString TmpPassword; //< from enter password dialog - QString TmpGroupPassword; //< from enter password dialog - QString TmpUsername; //< from enter password dialog - QString TmpPrivKeyPassStr; - QString TmpGatewayIP; - QString TmpXauthInterPasscode; //< from Xauth interactive passcode dialog - QString TmpPrivateKeyPass; - QString TmpHttpProxyPassword; - QString DnsDevice; //< device which the dns entry was added - - QString OldDefaultGw; //< default gw before connect - QString OldDefaultDev; //< default gw dev before connect - - QString NewDefaultGw; - - QStringList PlutoDebug; - QStringList KlipsDebug; + TQString pathToVpnc; + TQString pathToCiscoVpnc; + TQString pathToRacoon; + TQString pathToRacoonctl; + TQString pathToSetkey; + TQString pathToIptables; + TQString pathToOpenssl; + TQString pathToIpsec; + TQString pathToPppd; + TQString pathToPptp; + TQString pathToL2tpd; + TQString pathToXl2tpd; + TQString pathToOpenl2tp; + TQString pathToKill; + TQString pathToKillall; + TQString pathToPing; + TQString pathToOpenvpn; + TQString pathToIp; + TQString pathToIfconfig; + TQString pathToRoute; + TQString pathToNetstat; + TQString pathToPkcs11Tool; + TQString pathToVtund; + TQString pathToCiscoCertMgr; + TQString pathToTail; + TQString pathToSsh; + TQString pathToKsshAskpass; + TQString pathToGnomeSshAskpass; + TQString AutoConnectProfile; + TQString RacoonDebugLevel; + TQString Vpnc_pid_file; + TQString Pppd_pid_file; + TQString lastProfile; + TQString logfileName; + TQString InterpreterShell; + + TQString TmpPassword; //< from enter password dialog + TQString TmpGroupPassword; //< from enter password dialog + TQString TmpUsername; //< from enter password dialog + TQString TmpPrivKeyPassStr; + TQString TmpGatewayIP; + TQString TmpXauthInterPasscode; //< from Xauth interactive passcode dialog + TQString TmpPrivateKeyPass; + TQString TmpHttpProxyPassword; + TQString DnsDevice; //< device which the dns entry was added + + TQString OldDefaultGw; //< default gw before connect + TQString OldDefaultDev; //< default gw dev before connect + + TQString NewDefaultGw; + + TQStringList PlutoDebug; + TQStringList KlipsDebug; bool minimizeAfterConnect; bool showDebugConsole; @@ -180,37 +180,37 @@ public: int maxConnectRetry; // max connect tries int currentConnectRetry; - QPtrList *ToolList; - QPtrList *AccountList; + TQPtrList *ToolList; + TQPtrList *AccountList; VpnAccountData *currentProfile; - QColor InfoLogColor; - QColor RemoteLogColor; - QColor ErrorLogColor; - QColor SuccessLogColor; - QColor DebugLogColor; - QColor DebugBackgroundcolor; - - QApplication *appPointer; - QPoint pos; - ConnectionStatus status; - QFile logfile; - QTextStream logFileStream; - QTextEdit *LogOutput; + TQColor InfoLogColor; + TQColor RemoteLogColor; + TQColor ErrorLogColor; + TQColor SuccessLogColor; + TQColor DebugLogColor; + TQColor DebugBackgroundcolor; + + TQApplication *appPointer; + TQPoint pos; + ConnectiontqStatus status; + TQFile logfile; + TQTextStream logFileStream; + TQTextEdit *LogOutput; KWallet::Wallet *wallet; KConfig* config; //< configuration data - QPoint WindowPos; - QSize WindowSize; + TQPoint WindowPos; + TQSize WindowSize; struct IpsecImportSection { - QString SectionName; - QStringList SectionData; + TQString SectionName; + TQStringList SectionData; }; - QPtrList *ImportedAccountList; + TQPtrList *ImportedAccountList; - QWidget *parent; + TQWidget *parent; KStatusBar *statusbar; /** @@ -218,18 +218,18 @@ public: * @param msg the text to append * @param type the type of the msg (info, debug, error, etc) */ - void appendLogEntry( QString msg, LogType type ); + void appendLogEntry( TQString msg, LogType type ); /** * Sets the output textedit for debug output * @param LogOutput */ - void setLogOutput(QTextEdit *LogOutput); + void setLogOutput(TQTextEdit *LogOutput); /** * save configuration */ - void saveOptions(bool saveOneProfile=false, QString Profile="" ); + void saveOptions(bool saveOneProfile=false, TQString Profile="" ); /** * load configuration @@ -251,20 +251,20 @@ public: * removes a entry from configuration file * @param Name the entry which should be removed */ - void removeEntry(QString Name); + void removeEntry(TQString Name); - VpnAccountData* findProfile(QPtrList *list,const QString& Name); - QString removeWhiteSpaceAtBegin(const QString); + VpnAccountData* findProfile(TQPtrList *list,const TQString& Name); + TQString removeWhiteSpaceAtBegin(const TQString); - void slotStatusMsg( const QString &text, int id = ID_STATUS_MSG ); + void slotStatusMsg( const TQString &text, int id = ID_STATUS_MSG ); void doBackupConfig(); void restoreBackupConfig(); - bool exportKvpncConfig(QString filename); - bool importKvpncConfig(QString filename, QString& Name, bool& openProfileManager); //< true if profiles imported + bool exportKvpncConfig(TQString filename); + bool importKvpncConfig(TQString filename, TQString& Name, bool& openProfileManager); //< true if profiles imported - bool importIpsecConfig(QString filename, QString& Name, bool& openProfileManager); - bool importFritzboxConfig(QString filename, QString& Name, bool& openProfileManager); + bool importIpsecConfig(TQString filename, TQString& Name, bool& openProfileManager); + bool importFritzboxConfig(TQString filename, TQString& Name, bool& openProfileManager); }; diff --git a/src/kvpncimportprofileselectiondialog.cpp b/src/kvpncimportprofileselectiondialog.cpp index 53c99a3..010277d 100644 --- a/src/kvpncimportprofileselectiondialog.cpp +++ b/src/kvpncimportprofileselectiondialog.cpp @@ -20,12 +20,12 @@ #include "kvpncimportprofileselectiondialog.h" #include #include -#include +#include KvpncImportProfileSelectionDialog::KvpncImportProfileSelectionDialog() { allSelected = false; - connect (ToggleAllPushButton, SIGNAL(clicked()), this, SLOT(importAllToggled())); + connect (ToggleAllPushButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(importAllToggled())); } @@ -35,10 +35,10 @@ KvpncImportProfileSelectionDialog::~KvpncImportProfileSelectionDialog() void KvpncImportProfileSelectionDialog::importAllToggled() { - QListViewItemIterator it2( (QListView *) ImportProfileListView ); + TQListViewItemIterator it2( (TQListView *) ImportProfileListView ); for ( ; it2.current(); ++it2 ) { - ((QCheckListItem*)it2.current())->setOn(!allSelected); + ((TQCheckListItem*)it2.current())->setOn(!allSelected); } allSelected=!allSelected; } diff --git a/src/kvpncimportprofileselectiondialog.h b/src/kvpncimportprofileselectiondialog.h index 0a451bd..0f509b2 100644 --- a/src/kvpncimportprofileselectiondialog.h +++ b/src/kvpncimportprofileselectiondialog.h @@ -28,6 +28,7 @@ class KvpncImportProfileSelectionDialog : public KvpncImportProfileSelectionBase { Q_OBJECT + TQ_OBJECT public: KvpncImportProfileSelectionDialog(); ~KvpncImportProfileSelectionDialog(); diff --git a/src/kvpncimportprofileselectiondialogbase.ui b/src/kvpncimportprofileselectiondialogbase.ui index 85e51db..8db6a06 100644 --- a/src/kvpncimportprofileselectiondialogbase.ui +++ b/src/kvpncimportprofileselectiondialogbase.ui @@ -1,6 +1,6 @@ KvpncImportProfileSelectionBase - + KvpncImportProfileSelectionBase @@ -19,15 +19,15 @@ unnamed - + - layout10 + tqlayout10 unnamed - + textLabel @@ -40,15 +40,15 @@ ImportProfileListView - + - layout9 + tqlayout9 unnamed - + ImportGlobalSettingsCheckBox @@ -59,7 +59,7 @@ Alt+G - + OpenProfileManagerCheckBox @@ -80,7 +80,7 @@ Expanding - + 271 21 @@ -89,9 +89,9 @@ - + - layout8 + tqlayout8 @@ -107,14 +107,14 @@ Expanding - + 271 21 - + textLabel1 @@ -126,7 +126,7 @@ ImportNamePrefixLineEdit - + 100 0 @@ -135,9 +135,9 @@ - + - layout7 + tqlayout7 @@ -161,7 +161,7 @@ Expanding - + 260 31 diff --git a/src/kvpnckicker.cpp b/src/kvpnckicker.cpp index 7f24699..bf452ee 100644 --- a/src/kvpnckicker.cpp +++ b/src/kvpnckicker.cpp @@ -18,8 +18,8 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include -#include +#include +#include #include #include #include @@ -27,7 +27,7 @@ #include "kvpnckicker.h" #include "kvpnc.h" -KVpncKicker::KVpncKicker( KVpncConfig *GlobalConfig,QWidget* parent, const char *name ) +KVpncKicker::KVpncKicker( KVpncConfig *GlobalConfig,TQWidget* parent, const char *name ) : KSystemTray( parent, name ) { this->parent = parent; this->initDockWindow(); @@ -35,31 +35,31 @@ KVpncKicker::KVpncKicker( KVpncConfig *GlobalConfig,QWidget* parent, const char KAction *quit = actionCollection()->action( "file_quit" ); quit->disconnect(); KVpnc *myParent = static_cast( parent ); - connect( quit, SIGNAL( activated() ), myParent, SLOT( quitCalledKicker() ) ); + connect( quit, TQT_SIGNAL( activated() ), myParent, TQT_SLOT( quitCalledKicker() ) ); show(); } KVpncKicker::~KVpncKicker() {} -void KVpncKicker::closeEvent( QCloseEvent *e ) +void KVpncKicker::closeEvent( TQCloseEvent *e ) { if ( GlobalConfig->KvpncDebugLevel > 1 ) - GlobalConfig->appendLogEntry ( i18n ( "CloseEvent recieved (reciever: %1)." ).arg("kvpnckicker"), GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "CloseEvent recieved (reciever: %1)." ).tqarg("kvpnckicker"), GlobalConfig->debug ); emit closeEventKicker(e); } -void KVpncKicker::enterEvent( QEvent* e ) +void KVpncKicker::enterEvent( TQEvent* e ) { - if (e->type() == QEvent::Enter) + if (e->type() == TQEvent::Enter) emit tooltipRequested(); KSystemTray::enterEvent(e); } -void KVpncKicker::setStatus( int status ) { +void KVpncKicker::settqStatus( int status ) { if ( status == connecting ) { setPixmap( connectingIcon ); } @@ -76,7 +76,7 @@ void KVpncKicker::initDockWindow() { connectingIcon = loadIcon( "connecting" ); //setFixedSize( DOCK_WIDTH, DOCK_HEIGHT ); setPixmap( disconnectedIcon ); - QToolTip::add(this, i18n("Disconnected")); + TQToolTip::add(this, i18n("Disconnected")); } KPopupMenu* KVpncKicker::menu() { diff --git a/src/kvpnckicker.h b/src/kvpnckicker.h index 60f94c5..6117d27 100644 --- a/src/kvpnckicker.h +++ b/src/kvpnckicker.h @@ -20,9 +20,9 @@ #ifndef __KVPNCKICKER_H__ #define __KVPNCKICKER_H__ -#include -#include -#include +#include +#include +#include #include #include @@ -30,29 +30,30 @@ class KVpncKicker : public KSystemTray { Q_OBJECT + TQ_OBJECT public: - KVpncKicker( KVpncConfig *GlobalConfig,QWidget*parent = 0, const char *name = 0 ); + KVpncKicker( KVpncConfig *GlobalConfig,TQWidget*parent = 0, const char *name = 0 ); ~KVpncKicker(); KPopupMenu* menu(); enum status {disconnected=0, connecting=1, connected=2}; - void setStatus( int status ); + void settqStatus( int status ); public slots: - void closeEvent( QCloseEvent* e ); - void enterEvent( QEvent* e ); + void closeEvent( TQCloseEvent* e ); + void enterEvent( TQEvent* e ); protected: void initDockWindow(); - QWidget *parent; + TQWidget *parent; KVpncConfig *GlobalConfig; private: // color - QColor currentStatus; + TQColor currenttqStatus; // icons - QPixmap connectedIcon; - QPixmap disconnectedIcon; - QPixmap connectingIcon; + TQPixmap connectedIcon; + TQPixmap disconnectedIcon; + TQPixmap connectingIcon; signals: - void closeEventKicker(QCloseEvent *e); + void closeEventKicker(TQCloseEvent *e); void tooltipRequested(); }; diff --git a/src/listviewtooltip.h b/src/listviewtooltip.h index 07c3293..1fbd9e2 100644 --- a/src/listviewtooltip.h +++ b/src/listviewtooltip.h @@ -19,48 +19,48 @@ ***************************************************************************/ #ifndef __LISTVIEWTOOLTIP_H__ #define __LISTVIEWTOOLTIP_H__ -#include -#include -#include +#include +#include +#include #include /** @author Christoph Thielecke */ -class ListViewToolTip : public QToolTip +class ListViewToolTip : public TQToolTip { public: - ListViewToolTip ( QListView* parent ); + ListViewToolTip ( TQListView* parent ); protected: - void maybeTip ( const QPoint& p ); + void maybeTip ( const TQPoint& p ); private: - QListView* listView; + TQListView* listView; }; -inline ListViewToolTip::ListViewToolTip ( QListView* parent ) : QToolTip ( parent->viewport() ), listView ( parent ) {} -inline void ListViewToolTip::maybeTip ( const QPoint& p ) +inline ListViewToolTip::ListViewToolTip ( TQListView* parent ) : TQToolTip ( parent->viewport() ), listView ( parent ) {} +inline void ListViewToolTip::maybeTip ( const TQPoint& p ) { if ( !listView ) return; - const QListViewItem* item = listView->itemAt ( p ); + const TQListViewItem* item = listView->itemAt ( p ); if ( !item ) return; - const QRect itemRect = listView->itemRect ( item ); - if ( !itemRect.isValid() ) + const TQRect tqitemRect = listView->tqitemRect ( item ); + if ( !tqitemRect.isValid() ) return; const int col = listView->header()->sectionAt ( p.x() ); const int row = listView->header()->sectionAt ( p.y() ); if ( col == -1 && row == -1 ) return; - const QRect headerRect = listView->header()->sectionRect ( col ); + const TQRect headerRect = listView->header()->sectionRect ( col ); if ( !headerRect.isValid() ) return; -// const QRect cellRect ( headerRect.left(), itemRect.top(), -// headerRect.width(), itemRect.height() ); - const QRect cellRect ( headerRect.left(), itemRect.top(), 400, 200 ); - QString tipStr; - tipStr = QString ( "

"+item->text ( 0 )+"

  • "+i18n("Path:")+" "+item->text(5)+"
  • "+i18n("Usability:")+" "+item->text(3)+"
  • "+i18n("Comment:")+ " "+item->text(6)+"
"); +// const TQRect cellRect ( headerRect.left(), tqitemRect.top(), +// headerRect.width(), tqitemRect.height() ); + const TQRect cellRect ( headerRect.left(), tqitemRect.top(), 400, 200 ); + TQString tipStr; + tipStr = TQString ( "

"+item->text ( 0 )+"

  • "+i18n("Path:")+" "+item->text(5)+"
  • "+i18n("Usability:")+" "+item->text(3)+"
  • "+i18n("Comment:")+ " "+item->text(6)+"
"); tip ( cellRect, tipStr ); } diff --git a/src/logviewerdialog.cpp b/src/logviewerdialog.cpp index dbedf89..8167ba6 100644 --- a/src/logviewerdialog.cpp +++ b/src/logviewerdialog.cpp @@ -20,10 +20,10 @@ #include "logviewerdialog.h" #include #include -#include +#include #include -#include -#include +#include +#include #include #include #include @@ -33,35 +33,35 @@ #include #include #include -#include -#include +#include +#include #include -LogViewerDialog::LogViewerDialog(QWidget *parent, QApplication *app, KVpncConfig *GlobalConfig,const QString& caption, int count) : KDialogBase( parent, "Show_log", false, caption, +LogViewerDialog::LogViewerDialog(TQWidget *parent, TQApplication *app, KVpncConfig *GlobalConfig,const TQString& caption, int count) : KDialogBase( parent, "Show_log", false, caption, KDialogBase::Ok|KDialogBase::Cancel,KDialogBase::Ok, true ) { main = new LogViewerDialogBase (this); setMainWidget(main); - // main->setMinimumSize(main->sizeHint()); + // main->setMinimumSize(main->tqsizeHint()); main->setMinimumSize(750,500); main->LineCountIntSpinBox->setValue(count); this->GlobalConfig = GlobalConfig; this->app = app; - // QPixmap info_icon = KGlobal::iconLoader()->loadIcon( "button_ok", KIcon::NoGroup, 16 ); - // QPixmap debug_icon = KGlobal::iconLoader()->loadIcon( "button_cancel", KIcon::NoGroup, 16 ); - // QPixmap error_icon = KGlobal::iconLoader()->loadIcon( "button_ok", KIcon::NoGroup, 16 ); - // QPixmap debug_icon = KGlobal::iconLoader()->loadIcon( "button_cancel", KIcon::NoGroup, 16 ); + // TQPixmap info_icon = KGlobal::iconLoader()->loadIcon( "button_ok", KIcon::NoGroup, 16 ); + // TQPixmap debug_icon = KGlobal::iconLoader()->loadIcon( "button_cancel", KIcon::NoGroup, 16 ); + // TQPixmap error_icon = KGlobal::iconLoader()->loadIcon( "button_ok", KIcon::NoGroup, 16 ); + // TQPixmap debug_icon = KGlobal::iconLoader()->loadIcon( "button_cancel", KIcon::NoGroup, 16 ); // InfoListView->setSorting(1); - connect (main->LineCountApplyPushButton,SIGNAL(clicked()),this, SLOT(updateLineCountClicked())); - connect (main->FindPushButton,SIGNAL(clicked()),this, SLOT(findLogEntryClicked())); + connect (main->LineCountApplyPushButton,TQT_SIGNAL(clicked()),this, TQT_SLOT(updateLineCountClicked())); + connect (main->FindPushButton,TQT_SIGNAL(clicked()),this, TQT_SLOT(findLogEntryClicked())); - QApplication::setOverrideCursor( QCursor(Qt::WaitCursor) ); + TQApplication::setOverrideCursor( TQCursor(TQt::WaitCursor) ); parseLog(); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); showLogPart(count*-1,count); } @@ -70,7 +70,7 @@ LogViewerDialog::~LogViewerDialog() void LogViewerDialog::accept() { - QDialog::accept(); + TQDialog::accept(); } @@ -78,9 +78,9 @@ void LogViewerDialog::parseLog() { KStandardDirs *dirs = KGlobal::dirs(); - QString logfileName = dirs->saveLocation( "data" ); + TQString logfileName = dirs->saveLocation( "data" ); logfileName += "/kvpnc/kvpnc.log"; - QFile logfile; + TQFile logfile; int linecount=0; //std::cout << "file exists: " << logfile.exists() << std::endl; logfile.setName( logfileName ); @@ -112,11 +112,11 @@ void LogViewerDialog::parseLog() if (logfile.open(IO_ReadOnly )) { - QTextStream stream( &logfile ); - QString line; - QString lines; - QString prefix; - QString postfix; + TQTextStream stream( &logfile ); + TQString line; + TQString lines; + TQString prefix; + TQString postfix; // int type=0; int i=0; int localcount=0; @@ -175,21 +175,21 @@ void LogViewerDialog::showLogPart(int start,int count, bool parseLogType) } -// QString msg = QString("start: "); -// msg+=QString().setNum(startval); -// msg+=QString(", count: "); -// msg+=QString().setNum(count); -// msg+=QString(", loglist.count: "); -// msg+=QString().setNum(LogList.count()); +// TQString msg = TQString("start: "); +// msg+=TQString().setNum(startval); +// msg+=TQString(", count: "); +// msg+=TQString().setNum(count); +// msg+=TQString(", loglist.count: "); +// msg+=TQString().setNum(LogList.count()); // KMessageBox::information(0,msg,"aaa"); for ( int index = startval;index <= startval+count;index++) { - QString prefix=""; - QString postfix=""; + TQString prefix=""; + TQString postfix=""; int type=KVpncConfig::info; - QString line = LogList[index]; + TQString line = LogList[index]; if (!line.isEmpty()) { if (parseLogType) @@ -251,17 +251,17 @@ void LogViewerDialog::showLogPart(int start,int count, bool parseLogType) } postfix+=""; - main->LogTextBrowser->append( QString().setNum(index)+" "+prefix+line+postfix) ; + main->LogTextBrowser->append( TQString().setNum(index)+" "+prefix+line+postfix) ; } else { - main->LogTextBrowser->append( QString().setNum(index)+" "+line) ; + main->LogTextBrowser->append( TQString().setNum(index)+" "+line) ; } } } } -void LogViewerDialog::find(QString what) +void LogViewerDialog::find(TQString what) { bool casesense=false; bool whooleword=false; diff --git a/src/logviewerdialog.h b/src/logviewerdialog.h index 3ca9389..720253a 100644 --- a/src/logviewerdialog.h +++ b/src/logviewerdialog.h @@ -22,11 +22,11 @@ #include "logviewerdialogbase.h" #include -#include -#include -#include +#include +#include +#include #include "kvpncconfig.h" -#include +#include /** @author Christoph Thielecke @@ -34,8 +34,9 @@ class LogViewerDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - LogViewerDialog(QWidget *parent,QApplication *app, KVpncConfig *GlobalConfig, const QString& caption, int count); + LogViewerDialog(TQWidget *parent,TQApplication *app, KVpncConfig *GlobalConfig, const TQString& caption, int count); ~LogViewerDialog(); void showLogPart(int start, int count,bool parseLogType=true); @@ -45,13 +46,13 @@ public slots: void parseLog(); void updateLineCountClicked(); void findLogEntryClicked(); - void find(QString what); + void find(TQString what); private: LogViewerDialogBase *main; KVpncConfig *GlobalConfig; - QApplication *app; - QValueVector LogList; + TQApplication *app; + TQValueVector LogList; int linecount; }; diff --git a/src/logviewerdialogbase.ui b/src/logviewerdialogbase.ui index 12f61cd..14478ec 100644 --- a/src/logviewerdialogbase.ui +++ b/src/logviewerdialogbase.ui @@ -1,6 +1,6 @@ LogViewerDialogBase - + LogViewerDialogBase @@ -12,7 +12,7 @@ 586 - + 700 500 @@ -25,9 +25,9 @@ unnamed - + - layout48 + tqlayout48 @@ -37,7 +37,7 @@ LogTextBrowser - + 0 120 @@ -47,15 +47,15 @@ - + - layout47 + tqlayout47 unnamed - + textLabel1 @@ -88,7 +88,7 @@ Alt+D - + textLabel2 diff --git a/src/main.cpp b/src/main.cpp index c599ea5..7c45fcf 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -27,30 +27,30 @@ #include #include -#include +#include // App includes #include "kvpnc.h" static const char *description = I18N_NOOP ( "KDE frontend for various vpn clients\nCurrently supported protocols:\n* Cisco (vpnc (free), vpnclient (propritary))\n* IPSec (FreeS/WAN, Openswan, strongSwan, racoon)\n* PPTP\n* OpenVPN\n* L2TP (l2tpd, xl2tpd, openl2tp) over IPSec (racoon, FreeS/WAN, Openswan, strongSwan)\n* Vtun\n* SSH" ); -// QDate().fromString(, Qt::LocalDate ).toString( "yyyyMMdd" ) -QString date ( __DATE__ ); -QString day= date.section ( ' ',0,0 ); -QString month= QString().setNum ( QDate::fromString ( date.section ( ' ',0,0 ),Qt::ISODate ).month() ); -QString year= date.section ( ' ',2,2 ); +// TQDate().fromString(, Qt::LocalDate ).toString( "yyyyMMdd" ) +TQString date ( __DATE__ ); +TQString day= date.section ( ' ',0,0 ); +TQString month= TQString().setNum ( TQDate::fromString ( date.section ( ' ',0,0 ),Qt::ISODate ).month() ); +TQString year= date.section ( ' ',2,2 ); -QString currentdate ( "+SVN(" + date+" "+ QTime().fromString ( QString ( __TIME__ ) ).toString ( "hhmm" ) + ")" ); +TQString currentdate ( "+SVN(" + date+" "+ TQTime().fromString ( TQString ( __TIME__ ) ).toString ( "hhmm" ) + ")" ); #define __is_release__ -QString versionstring1 = "0.9.6"; +TQString versionstring1 = "0.9.6"; #ifdef __is_release__ static const char *KVPNCVERSION = versionstring1.ascii(); -QString versionstring =QString ( KVPNCVERSION ); +TQString versionstring =TQString ( KVPNCVERSION ); #else -QString versionstring = versionstring1 + QString (" KDE3 ") + currentdate; +TQString versionstring = versionstring1 + TQString (" KDE3 ") + currentdate; static const char *KVPNCVERSION = versionstring.ascii() ; #endif @@ -146,12 +146,12 @@ int main ( int argc, char *argv[] ) if ( args->isSet ( "openvpnimport" ) ) { - QString openvpnimportfile = QString ( args->getOption ( "openvpnimport" ) ); + TQString openvpnimportfile = TQString ( args->getOption ( "openvpnimport" ) ); kvpnc->importOpenvpnProfileClicked ( openvpnimportfile ); } else if ( args->isSet ( "ciscoimport" ) ) { - QString ciscoimportfile = QString ( args->getOption ( "ciscoimport" ) ); + TQString ciscoimportfile = TQString ( args->getOption ( "ciscoimport" ) ); kvpnc->importOpenvpnProfileClicked ( ciscoimportfile ); } diff --git a/src/mainview.cpp b/src/mainview.cpp index d78ae1b..f25d038 100644 --- a/src/mainview.cpp +++ b/src/mainview.cpp @@ -20,29 +20,29 @@ #include #include -#include -#include +#include +#include #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include "mainview.h" -MainView::MainView( QWidget* parent, const char* name, bool, WFlags fl ) : MainViewBase( parent, name, fl ) +MainView::MainView( TQWidget* parent, const char* name, bool, WFlags fl ) : MainViewBase( parent, name, fl ) { DebugOutput = new DebugOutputTextEdit(this, "DebugOutput"); MainViewBaseLayout->addMultiCellWidget(DebugOutput,1,1,0,4); DebugOutput->setReadOnly(true); - DebugOutput->setText( QString::null ); - QToolTip::add( DebugOutput, tr2i18n( "Debug console" ) ); - QWhatsThis::add( DebugOutput, tr2i18n( "The debug console shows useful debug information to solve problems. You need to turn on debug features for the program you want to produce output in preferences dialog." ) ); + DebugOutput->setText( TQString() ); + TQToolTip::add( DebugOutput, tr2i18n( "Debug console" ) ); + TQWhatsThis::add( DebugOutput, tr2i18n( "The debug console shows useful debug information to solve problems. You need to turn on debug features for the program you want to produce output in preferences dialog." ) ); } diff --git a/src/mainview.h b/src/mainview.h index a8655dd..4a4c0b4 100644 --- a/src/mainview.h +++ b/src/mainview.h @@ -20,10 +20,10 @@ #ifndef __MAINVIEW_H__ #define __MAINVIEW_H__ -#include -#include +#include +#include #include -#include +#include #include #include "mainviewbase.h" #include "kvpnckicker.h" @@ -36,7 +36,7 @@ class MainView : public MainViewBase { public: - MainView( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + MainView( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~MainView(); DebugOutputTextEdit *DebugOutput; diff --git a/src/mainviewbase.ui b/src/mainviewbase.ui index 8b56a0b..dc2a5ab 100644 --- a/src/mainviewbase.ui +++ b/src/mainviewbase.ui @@ -1,6 +1,6 @@ MainViewBase - + MainViewBase @@ -27,15 +27,15 @@ unnamed - + - layout4 + tqlayout4 unnamed - + textLabel1 @@ -62,7 +62,7 @@ Here you can select the profile to use for connection. - + buttonConnect @@ -85,7 +85,7 @@ Connect button - + buttonDisconnect @@ -117,7 +117,7 @@ Expanding - + 20 31 @@ -131,9 +131,9 @@ buttonConnect buttonDisconnect - + advancedClicked() - + kcombobox.h diff --git a/src/manageciscocert.cpp b/src/manageciscocert.cpp index 611d185..c05ce1a 100644 --- a/src/manageciscocert.cpp +++ b/src/manageciscocert.cpp @@ -22,10 +22,10 @@ #include "importcertificatedialog.h" #include "displaycertdialog.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -38,19 +38,19 @@ #include -ManageCiscoCert::ManageCiscoCert(QWidget *parent, const char* caption, KVpncConfig *GlobalConfig) : KDialogBase (parent, i18n ( "Manage Cisco certificates..." ).ascii(), true, caption, KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true) +ManageCiscoCert::ManageCiscoCert(TQWidget *parent, const char* caption, KVpncConfig *GlobalConfig) : KDialogBase (parent, i18n ( "Manage Cisco certificates..." ).ascii(), true, caption, KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true) { main = new ManageCiscoCertBase ( this ); setMainWidget ( main ); - main->sizeHint(); + main->tqsizeHint(); // main->show(); -// main->setMinimumSize ( main->sizeHint() ); - sizeHint(); +// main->setMinimumSize ( main->tqsizeHint() ); + tqsizeHint(); this->GlobalConfig = GlobalConfig; - connect (main->ImportCertFilePushButton,SIGNAL(clicked()),this,SLOT(importCertClicked())); - connect (main->DeleteCertPushButton,SIGNAL(clicked()),this,SLOT(deleteCertClicked())); - connect (main->CertListView,SIGNAL(contextMenuRequested ( QListViewItem *, const QPoint &, int )),this,SLOT(contextMenuRequested ( QListViewItem *, const QPoint &, int ))); + connect (main->ImportCertFilePushButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(importCertClicked())); + connect (main->DeleteCertPushButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(deleteCertClicked())); + connect (main->CertListView,TQT_SIGNAL(contextMenuRequested ( TQListViewItem *, const TQPoint &, int )),this,TQT_SLOT(contextMenuRequested ( TQListViewItem *, const TQPoint &, int ))); checkList(); } @@ -63,17 +63,17 @@ void ManageCiscoCert::deleteCertClicked() { if ( main->CertListView->childCount() > 0 && main->CertListView->currentItem()!= 0 ) { - QListViewItem *item = main->CertListView->currentItem(); + TQListViewItem *item = main->CertListView->currentItem(); - int result = KMessageBox::questionYesNo ( this, i18n( "Do you really want to delete the cert \"%1\" (type: %2) from cert store?" ).arg(item->text(1).arg(item->text(2))), i18n( "Delete certificate?" ) ); + int result = KMessageBox::questionYesNo ( this, i18n( "Do you really want to delete the cert \"%1\" (type: %2) from cert store?" ).tqarg(item->text(1).tqarg(item->text(2))), i18n( "Delete certificate?" ) ); // if ( GlobalConfig->KvpncDebugLevel > 2 ) -// GlobalConfig->appendLogEntry( "Result: "+ QString().setNum(result), GlobalConfig->debug ) ; +// GlobalConfig->appendLogEntry( "Result: "+ TQString().setNum(result), GlobalConfig->debug ) ; if ( result == 3) // Yes { - DeleteProcess = new QProcess(0); + DeleteProcess = new TQProcess(0); DeleteProcess->addArgument ( GlobalConfig->pathToCiscoCertMgr ); if (item->text(2) == i18n("User")) @@ -85,11 +85,11 @@ void ManageCiscoCert::deleteCertClicked() DeleteProcess->addArgument ( "-ct" ); DeleteProcess->addArgument ( item->text(0) ); - connect ( DeleteProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_remove() ) ); - connect ( DeleteProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_remove() ) ); - connect ( DeleteProcess, SIGNAL ( processExited()) , this, SLOT(deleteProcessFinished())); + connect ( DeleteProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_remove() ) ); + connect ( DeleteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_remove() ) ); + connect ( DeleteProcess, TQT_SIGNAL ( processExited()) , this, TQT_SLOT(deleteProcessFinished())); - QStringList *env = new QStringList(); + TQStringList *env = new TQStringList(); *env << "LC_ALL=C" << "LANG=C" << "PATH=/bin:/usr/bin:/usr/sbin:/sbin"; if ( !DeleteProcess->start ( env ) ) @@ -103,7 +103,7 @@ void ManageCiscoCert::deleteCertClicked() if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "Process (%1) started." ).arg ("cisco_cert_mgr" ),GlobalConfig->debug ); - QCString password; + TQCString password; int result = KPasswordDialog::getPassword(password, i18n("Certificate password")); if (result == KPasswordDialog::Accepted) @@ -112,16 +112,16 @@ void ManageCiscoCert::deleteCertClicked() if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "Certicate password got from user, send it..." ),GlobalConfig->debug ); - DeleteProcess->writeToStdin( QString(password)+"\n"); + DeleteProcess->writeToStdin( TQString(password)+"\n"); while (DeleteProcess->isRunning()) { sleep(1); } checkList(); - disconnect ( DeleteProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_remove() ) ); - disconnect ( DeleteProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_remove() ) ); - disconnect ( DeleteProcess, SIGNAL ( processExited()) , this, SLOT(deleteProcessFinished())); + disconnect ( DeleteProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_remove() ) ); + disconnect ( DeleteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_remove() ) ); + disconnect ( DeleteProcess, TQT_SIGNAL ( processExited()) , this, TQT_SLOT(deleteProcessFinished())); delete DeleteProcess; DeleteProcess=0L; } @@ -160,11 +160,11 @@ void ManageCiscoCert::showCertClicked() { if ( main->CertListView->childCount() > 0 && main->CertListView->currentItem()!= 0 ) { - QListViewItem *item = main->CertListView->currentItem(); + TQListViewItem *item = main->CertListView->currentItem(); CertDataName=item->text(1); CertStartFound=false; - ShowProcess = new QProcess(0); + ShowProcess = new TQProcess(0); ShowProcess->addArgument ( GlobalConfig->pathToCiscoCertMgr ); if (item->text(2) == i18n("User")) @@ -182,14 +182,14 @@ void ManageCiscoCert::showCertClicked() ShowProcess->addArgument ( "-ct" ); ShowProcess->addArgument ( item->text(0) ); - connect ( ShowProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_display() ) ); - connect ( ShowProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_display() ) ); - connect ( ShowProcess, SIGNAL ( processExited()) , this, SLOT(showProcessFinished())); + connect ( ShowProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_display() ) ); + connect ( ShowProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_display() ) ); + connect ( ShowProcess, TQT_SIGNAL ( processExited()) , this, TQT_SLOT(showProcessFinished())); - QStringList *env = new QStringList(); + TQStringList *env = new TQStringList(); *env << "LC_ALL=C" << "LANG=C" << "PATH=/bin:/usr/bin:/usr/sbin:/sbin"; - GlobalConfig->appPointer->setOverrideCursor( QCursor(Qt::WaitCursor) ); + GlobalConfig->appPointer->setOverrideCursor( TQCursor(TQt::WaitCursor) ); if (GlobalConfig->KvpncDebugLevel > 2) GlobalConfig->appendLogEntry(i18n("Getting cert info from Cisco certificate store..."), GlobalConfig->debug); if ( !ShowProcess->start ( env ) ) @@ -206,9 +206,9 @@ void ManageCiscoCert::showCertClicked() GlobalConfig->appPointer->processEvents(); } } - disconnect ( ShowProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_display() ) ); - disconnect ( ShowProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_display() ) ); - disconnect ( ShowProcess, SIGNAL ( processExited()) , this, SLOT(showProcessFinished())); + disconnect ( ShowProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_display() ) ); + disconnect ( ShowProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_display() ) ); + disconnect ( ShowProcess, TQT_SIGNAL ( processExited()) , this, TQT_SLOT(showProcessFinished())); } } @@ -246,20 +246,20 @@ void ManageCiscoCert::checkList() { main->CertListView->clear(); - GlobalConfig->appPointer->setOverrideCursor( QCursor(Qt::WaitCursor) ); + GlobalConfig->appPointer->setOverrideCursor( TQCursor(TQt::WaitCursor) ); GlobalConfig->slotStatusMsg(i18n("Collecting cisco certs from Cisco certificate store..."), ID_STATUS_MSG); if (GlobalConfig->KvpncDebugLevel > 2) GlobalConfig->appendLogEntry(i18n("Looking for certs in Cisco certificate store..."), GlobalConfig->debug); - QStringList CiscoCerts = Utils(GlobalConfig).getCertsFromCiscoCertStore("user"); + TQStringList CiscoCerts = Utils(GlobalConfig).getCertsFromCiscoCertStore("user"); if (GlobalConfig->KvpncDebugLevel > 2) GlobalConfig->appendLogEntry(i18n("Done."), GlobalConfig->debug); GlobalConfig->slotStatusMsg(i18n("Collecting cisco CA certs from Cisco certificate store..."), ID_STATUS_MSG); if (GlobalConfig->KvpncDebugLevel > 2) GlobalConfig->appendLogEntry(i18n("Looking for CA certs in Cisco certificate store..."), GlobalConfig->debug); - QStringList CiscoCaCerts = Utils(GlobalConfig).getCertsFromCiscoCertStore("ca"); + TQStringList CiscoCaCerts = Utils(GlobalConfig).getCertsFromCiscoCertStore("ca"); if (GlobalConfig->KvpncDebugLevel > 2) GlobalConfig->appendLogEntry(i18n("Done."), GlobalConfig->debug); @@ -269,18 +269,18 @@ void ManageCiscoCert::checkList() main->CertListView->takeItem(main->CertListView->currentItem()); int current_user_idx=0; int current_ca_idx=0; - for ( QStringList::Iterator it = CiscoCerts.begin(); it != CiscoCerts.end(); ++it ) + for ( TQStringList::Iterator it = CiscoCerts.begin(); it != CiscoCerts.end(); ++it ) { if (GlobalConfig->KvpncDebugLevel > 2) - std::cout << "insert item (cisco certs): " << QString(*it) << std::endl; - main->CertListView->insertItem( new QListViewItem(main->CertListView, QString().setNum(current_user_idx),QString(*it),i18n("User"))); + std::cout << "insert item (cisco certs): " << TQString(*it) << std::endl; + main->CertListView->insertItem( new TQListViewItem(main->CertListView, TQString().setNum(current_user_idx),TQString(*it),i18n("User"))); current_user_idx++; } - for ( QStringList::Iterator it = CiscoCaCerts.begin(); it != CiscoCaCerts.end(); ++it ) + for ( TQStringList::Iterator it = CiscoCaCerts.begin(); it != CiscoCaCerts.end(); ++it ) { if (GlobalConfig->KvpncDebugLevel > 2) - std::cout << "insert item (cisco certs): " << QString(*it) << std::endl; - main->CertListView->insertItem( new QListViewItem(main->CertListView, QString().setNum(current_ca_idx),QString(*it),i18n("CA"))); + std::cout << "insert item (cisco certs): " << TQString(*it) << std::endl; + main->CertListView->insertItem( new TQListViewItem(main->CertListView, TQString().setNum(current_ca_idx),TQString(*it),i18n("CA"))); current_ca_idx++; } @@ -300,7 +300,7 @@ void ManageCiscoCert::readFromStdout_remove() { while ( DeleteProcess->canReadLineStdout() ) { - QString line = QString ( DeleteProcess->readLineStdout() ); + TQString line = TQString ( DeleteProcess->readLineStdout() ); if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( "[cisco_cert_mgr]: "+line,GlobalConfig->debug ); @@ -311,7 +311,7 @@ void ManageCiscoCert::readFromStderr_remove() { while ( DeleteProcess->canReadLineStderr() ) { - QString line = QString ( DeleteProcess->readLineStderr() ); + TQString line = TQString ( DeleteProcess->readLineStderr() ); GlobalConfig->appendLogEntry ( "[cisco_cert_mgr err]: "+line ,GlobalConfig->error ); } checkList(); @@ -322,7 +322,7 @@ void ManageCiscoCert::readFromStdout_display() { while ( ShowProcess->canReadLineStdout() ) { - QString line = QString ( ShowProcess->readLineStdout() ); + TQString line = TQString ( ShowProcess->readLineStdout() ); if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( "[cisco_cert_mgr]: "+line,GlobalConfig->debug ); @@ -349,15 +349,15 @@ void ManageCiscoCert::readFromStderr_display() { while ( ShowProcess->canReadLineStderr() ) { - QString line = QString ( ShowProcess->readLineStderr() ); + TQString line = TQString ( ShowProcess->readLineStderr() ); GlobalConfig->appendLogEntry ( "[cisco_cert_mgr err]: "+line ,GlobalConfig->error ); } } -void ManageCiscoCert::contextMenuRequested ( QListViewItem * item, const QPoint &pos, int ) +void ManageCiscoCert::contextMenuRequested ( TQListViewItem * item, const TQPoint &pos, int ) { - ContextMenu = new QPopupMenu ( 0 ); + ContextMenu = new TQPopupMenu ( 0 ); if (item != 0) { ContextMenu->insertItem(i18n("&Show...")); @@ -365,14 +365,14 @@ void ManageCiscoCert::contextMenuRequested ( QListViewItem * item, const QPoint ContextMenu->insertItem(i18n("&Delete...")); } ContextMenu->insertItem(i18n("&Add...")); - connect ( ContextMenu, SIGNAL ( activated ( int ) ), this, SLOT ( doContextMenuAction ( int ) ) ); + connect ( ContextMenu, TQT_SIGNAL ( activated ( int ) ), this, TQT_SLOT ( doContextMenuAction ( int ) ) ); ContextMenu->show(); ContextMenu->setGeometry(pos.x(),pos.y(), ContextMenu->width(),ContextMenu->height()); } void ManageCiscoCert::doContextMenuAction ( int action) { - QString itemtext = ContextMenu->text ( action ); + TQString itemtext = ContextMenu->text ( action ); // std::cout << "action: " << itemtext << std::endl; if (itemtext == i18n("&Delete...")) deleteCertClicked(); diff --git a/src/manageciscocert.h b/src/manageciscocert.h index ce499ad..64f9090 100644 --- a/src/manageciscocert.h +++ b/src/manageciscocert.h @@ -23,9 +23,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "kvpncconfig.h" @@ -35,20 +35,21 @@ class ManageCiscoCert : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ManageCiscoCert(QWidget *parent, const char* caption, KVpncConfig *GlobalConfig); + ManageCiscoCert(TQWidget *parent, const char* caption, KVpncConfig *GlobalConfig); ~ManageCiscoCert(); private: KVpncConfig *GlobalConfig; - QProcess *DeleteProcess; - QProcess *ShowProcess; - QPopupMenu *ContextMenu; - QStringList CertDataList; - QString CertDataName; - QString CertType; + TQProcess *DeleteProcess; + TQProcess *ShowProcess; + TQPopupMenu *ContextMenu; + TQStringList CertDataList; + TQString CertDataName; + TQString CertType; bool CertStartFound; private slots: @@ -62,7 +63,7 @@ class ManageCiscoCert : public KDialogBase void readFromStderr_remove(); void readFromStdout_display(); void readFromStderr_display(); - void contextMenuRequested ( QListViewItem * item, const QPoint &pos, int ); + void contextMenuRequested ( TQListViewItem * item, const TQPoint &pos, int ); void doContextMenuAction ( int action); public: diff --git a/src/manageciscocertbase.ui b/src/manageciscocertbase.ui index 1f0472f..9bc4b23 100644 --- a/src/manageciscocertbase.ui +++ b/src/manageciscocertbase.ui @@ -1,6 +1,6 @@ ManageCiscoCertBase - + ManageCiscoCertBase @@ -19,31 +19,31 @@ unnamed - + - layout69 + tqlayout69 unnamed - + - layout68 + tqlayout68 unnamed - + - layout67 + tqlayout67 unnamed - + textLabel1 @@ -51,7 +51,7 @@ <b>Certificates in the Cisco cert store:</b> - + # @@ -92,9 +92,9 @@ AutoOneFit - + - layout66 + tqlayout66 @@ -124,7 +124,7 @@ Expanding - + 230 21 @@ -133,9 +133,9 @@ - + - layout65 + tqlayout65 @@ -162,7 +162,7 @@ Expanding - + 221 20 @@ -185,7 +185,7 @@ Expanding - + 21 41 diff --git a/src/networkinterface.cpp b/src/networkinterface.cpp index e757339..cddd016 100644 --- a/src/networkinterface.cpp +++ b/src/networkinterface.cpp @@ -20,14 +20,14 @@ //BEGIN INCLUDES #include "networkinterface.h" #include -#include -#include +#include +#include #include #include #include #include -#include -#include +#include +#include #include #include #include @@ -35,22 +35,22 @@ #include //END INCLUDES -NetworkInterface::NetworkInterface( KVpncConfig* GlobalConfig,QApplication *app, QObject *parent, const char *name ) : QObject( parent, name ) +NetworkInterface::NetworkInterface( KVpncConfig* GlobalConfig,TQApplication *app, TQObject *parent, const char *name ) : TQObject( parent, name ) { this->app = app; interfaceTest = false; retrieveInterfaceAddress = false; - QPtrList*InterfaceList = new QPtrList(); + TQPtrList*InterfaceList = new TQPtrList(); InterfaceList->setAutoDelete( TRUE ); // the list owns the objects - QString InterfaceIP = ""; - QString InterfaceAddress = ""; + TQString InterfaceIP = ""; + TQString InterfaceAddress = ""; IPforInterface = ""; tmpInterface = ""; interfaceExists = false; defaultinterface="default"; readOutput=false; - env = new QStringList(); + env = new TQStringList(); *env << "LC_ALL=C" << "LANG=C" << "PATH=/bin:/usr/bin:/usr/sbin:/sbin"; this->GlobalConfig = GlobalConfig; } @@ -62,21 +62,21 @@ NetworkInterface::~NetworkInterface() defaultinterface == ""; } -bool NetworkInterface::interfaceExist( QString Interface ) +bool NetworkInterface::interfaceExist( TQString Interface ) { if ( !Interface.isEmpty() ) { - QFile NetdevFile( "/proc/net/dev" ); - QTextStream stream ( &NetdevFile ); + TQFile NetdevFile( "/proc/net/dev" ); + TQTextStream stream ( &NetdevFile ); if ( NetdevFile.open ( IO_ReadOnly ) ) { - QString line = ""; + TQString line = ""; while ( !stream.atEnd() ) { line = stream.readLine(); // line of text excluding '\n' and replace all white chars with one blank if ( line.find ( ':' ) > -1 ) { - QString tmpdev = line.section( ':', 0, 0 ).stripWhiteSpace(); + TQString tmpdev = line.section( ':', 0, 0 ).stripWhiteSpace(); if ( tmpdev == Interface ) { NetdevFile.close(); @@ -90,13 +90,13 @@ bool NetworkInterface::interfaceExist( QString Interface ) return false; } -QStringList NetworkInterface::getAllNetworkInterfaces() +TQStringList NetworkInterface::getAllNetworkInterfaces() { - QFile NetdevFile( "/proc/net/dev" ); - QTextStream stream ( &NetdevFile ); + TQFile NetdevFile( "/proc/net/dev" ); + TQTextStream stream ( &NetdevFile ); if ( NetdevFile.open ( IO_ReadOnly ) ) { - QString line = ""; + TQString line = ""; while ( !stream.atEnd() ) { line = stream.readLine(); // line of text excluding '\n' and replace all white chars with one blank @@ -111,14 +111,14 @@ QStringList NetworkInterface::getAllNetworkInterfaces() return InterfaceList; } -QString NetworkInterface::getInterfaceIP( QString Interface ) +TQString NetworkInterface::getInterfaceIP( TQString Interface ) { //FIXME why this dont work on ppp0 device of l2tp tunnel? // if ( !Interface.isEmpty() ) // { // int fd=-1; -// QString tmpip=""; +// TQString tmpip=""; // struct ifreq ifr; // fd = socket(AF_INET, SOCK_STREAM, 0); // if (fd >= 0){ @@ -129,22 +129,22 @@ QString NetworkInterface::getInterfaceIP( QString Interface ) // return tmpip; // } // else -// return QString(""); +// return TQString(""); // } // else -// return QString(""); +// return TQString(""); // } // else -// return QString(""); +// return TQString(""); return getInterfaceIP2(Interface); } -QString NetworkInterface::getInterfaceIP2( QString Interface ) +TQString NetworkInterface::getInterfaceIP2( TQString Interface ) { if ( !Interface.isEmpty() ) { - InterfaceIpProc = new QProcess(this); + InterfaceIpProc = new TQProcess(this); InterfaceIpProc->addArgument( GlobalConfig->pathToIp ); InterfaceIpProc->addArgument("addr"); InterfaceIpProc->addArgument("show"); @@ -153,13 +153,13 @@ QString NetworkInterface::getInterfaceIP2( QString Interface ) retrieveInterfaceIP=true; readOutput=true; - connect( InterfaceIpProc, SIGNAL( readyReadStdout() ), this, SLOT( readFromStdout_interfaceip() ) ); - connect( InterfaceIpProc, SIGNAL( readyReadStderr() ), this, SLOT( readFromStderr_interfaceip() ) ); - connect( InterfaceIpProc, SIGNAL( processExited () ), this, SLOT( processHasFinished() ) ); + connect( InterfaceIpProc, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_interfaceip() ) ); + connect( InterfaceIpProc, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_interfaceip() ) ); + connect( InterfaceIpProc, TQT_SIGNAL( processExited () ), this, TQT_SLOT( processHasFinished() ) ); if ( !InterfaceIpProc->start(env) ) { - GlobalConfig->appendLogEntry(i18n("unable to start proc (%1)!").arg(i18n("getting IP address from interface")), KVpncConfig::error); + GlobalConfig->appendLogEntry(i18n("unable to start proc (%1)!").tqarg(i18n("getting IP address from interface")), KVpncConfig::error); } else { @@ -173,9 +173,9 @@ QString NetworkInterface::getInterfaceIP2( QString Interface ) while ( readOutput) GlobalConfig->appPointer->processEvents();*/ } - disconnect( InterfaceIpProc, SIGNAL( readyReadStdout() ), this, SLOT( readFromStdout_interfaceip() ) ); - disconnect( InterfaceIpProc, SIGNAL( readyReadStderr() ), this, SLOT( readFromStderr_interfaceip() ) ); - disconnect( InterfaceIpProc, SIGNAL( processExited () ), this, SLOT( processHasFinished() ) ); + disconnect( InterfaceIpProc, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_interfaceip() ) ); + disconnect( InterfaceIpProc, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_interfaceip() ) ); + disconnect( InterfaceIpProc, TQT_SIGNAL( processExited () ), this, TQT_SLOT( processHasFinished() ) ); delete InterfaceIpProc; InterfaceIpProc=0L; } @@ -183,20 +183,20 @@ QString NetworkInterface::getInterfaceIP2( QString Interface ) } -QString NetworkInterface::getInterfaceAddress( QString IPforInterface ) +TQString NetworkInterface::getInterfaceAddress( TQString IPforInterface ) { /* // TODO fixme if ( !IPforInterface.isEmpty() ) { this->IPforInterface = IPforInterface; - QStringList devlist = getAllNetworkInterfaces(); + TQStringList devlist = getAllNetworkInterfaces(); tmpfile = new KTempFile(); - QString tmpPath = locateLocal ( "data", "kvpnc/" ); - QString GetIpForInterfaceScript = tmpPath + "get_interface_for_ip_"+IPforInterface+".sh"; + TQString tmpPath = locateLocal ( "data", "kvpnc/" ); + TQString GetIpForInterfaceScript = tmpPath + "get_interface_for_ip_"+IPforInterface+".sh"; - QFile file ( GetIpForInterfaceScript ); - QTextStream stream( &file ); + TQFile file ( GetIpForInterfaceScript ); + TQTextStream stream( &file ); if ( file.open( IO_WriteOnly ) ) { stream << "# generated by kvpnc. Do not edit it." << "\n"; @@ -206,20 +206,20 @@ QString NetworkInterface::getInterfaceAddress( QString IPforInterface ) - InterfaceAddressProc = new QProcess(this); + InterfaceAddressProc = new TQProcess(this); InterfaceAddressProc->addArgument( GlobalConfig->InterpreterShell ); InterfaceAddressProc->addArgument(GetIpForInterfaceScript); retrieveInterfaceAddress=true; readOutput=true; - //connect( InterfaceAddressProc, SIGNAL( readyReadStdout() ), this, SLOT( readFromStdout_interfaceaddress() ) ); - // connect( InterfaceAddressProc, SIGNAL( readyReadStderr() ), this, SLOT( readFromStderr_interfaceaddress() ) ); - connect( InterfaceAddressProc, SIGNAL( processExited () ), this, SLOT( processHasFinished() ) ); + //connect( InterfaceAddressProc, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_interfaceaddress() ) ); + // connect( InterfaceAddressProc, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_interfaceaddress() ) ); + connect( InterfaceAddressProc, TQT_SIGNAL( processExited () ), this, TQT_SLOT( processHasFinished() ) ); if ( !InterfaceAddressProc->start(env) ) { - GlobalConfig->appendLogEntry(i18n("unable to start proc (%1)!").arg(i18n("script for get interface from IP address")), KVpncConfig::error); + GlobalConfig->appendLogEntry(i18n("unable to start proc (%1)!").tqarg(i18n("script for get interface from IP address")), KVpncConfig::error); } else @@ -236,9 +236,9 @@ QString NetworkInterface::getInterfaceAddress( QString IPforInterface ) // GlobalConfig->appPointer->processEvents(); } - // disconnect( InterfaceAddressProc, SIGNAL( readyReadStdout() ), this, SLOT( readFromStdout_interfaceaddress() ) ); - // disconnect( InterfaceAddressProc, SIGNAL( readyReadStderr() ), this, SLOT( readFromStderr_interfaceaddress() ) ); - disconnect( InterfaceAddressProc, SIGNAL( processExited () ), this, SLOT( processHasFinished() ) ); + // disconnect( InterfaceAddressProc, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_interfaceaddress() ) ); + // disconnect( InterfaceAddressProc, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_interfaceaddress() ) ); + disconnect( InterfaceAddressProc, TQT_SIGNAL( processExited () ), this, TQT_SLOT( processHasFinished() ) ); //delete InterfaceAddressProc; } } @@ -247,12 +247,12 @@ QString NetworkInterface::getInterfaceAddress( QString IPforInterface ) if ( !IPforInterface.isEmpty() ) { this->IPforInterface = IPforInterface; - QStringList devlist = getAllNetworkInterfaces(); + TQStringList devlist = getAllNetworkInterfaces(); if (!devlist.isEmpty()) { - for ( QStringList::Iterator it = devlist.begin(); it != devlist.end(); ++it ) { + for ( TQStringList::Iterator it = devlist.begin(); it != devlist.end(); ++it ) { if (getInterfaceIP(*it) == IPforInterface) - return QString(*it); + return TQString(*it); } } else @@ -263,14 +263,14 @@ QString NetworkInterface::getInterfaceAddress( QString IPforInterface ) } -QString NetworkInterface::getNetmaskOfInterface(QString interface) +TQString NetworkInterface::getNetmaskOfInterface(TQString interface) { - QFile NetRouteFile ( "/proc/net/route" ); - QTextStream stream ( &NetRouteFile ); - QString tmpmask; + TQFile NetRouteFile ( "/proc/net/route" ); + TQTextStream stream ( &NetRouteFile ); + TQString tmpmask; if ( NetRouteFile .open ( IO_ReadOnly ) ) { - QString line = ""; + TQString line = ""; while ( !stream.atEnd() ) { line = stream.readLine(); // line of text excluding '\n' and replace all white chars with one blank @@ -293,18 +293,18 @@ QString NetworkInterface::getNetmaskOfInterface(QString interface) return "0.0.0.0"; } -QString NetworkInterface::getDefaultInterface() +TQString NetworkInterface::getDefaultInterface() { - QFile NetRouteFile ( "/proc/net/route" ); - QTextStream stream ( &NetRouteFile ); - QString tmpdev; + TQFile NetRouteFile ( "/proc/net/route" ); + TQTextStream stream ( &NetRouteFile ); + TQString tmpdev; if ( NetRouteFile .open ( IO_ReadOnly ) ) { - QString line = ""; + TQString line = ""; while ( !stream.atEnd() ) { line = stream.readLine(); // line of text excluding '\n' and replace all white chars with one blank - QString tmptarget = line.simplifyWhiteSpace().section( ' ', 1, 1 ); // return the value of the target which is 0.0.0.0 + TQString tmptarget = line.simplifyWhiteSpace().section( ' ', 1, 1 ); // return the value of the target which is 0.0.0.0 if ( tmptarget == "00000000" ) { tmpdev = line.simplifyWhiteSpace().section( ' ', 0, 0 ); // return the value of the target which is 0.0.0.0 @@ -320,16 +320,16 @@ QString NetworkInterface::getDefaultInterface() int NetworkInterface::getDefaultRouteCount() { - QFile NetRouteFile ( "/proc/net/route" ); - QTextStream stream ( &NetRouteFile ); + TQFile NetRouteFile ( "/proc/net/route" ); + TQTextStream stream ( &NetRouteFile ); int defaultroutecount=0; if ( NetRouteFile .open ( IO_ReadOnly ) ) { - QString line = ""; + TQString line = ""; while ( !stream.atEnd() ) { line = stream.readLine(); // line of text excluding '\n' and replace all white chars with one blank - QString tmptarget = line.simplifyWhiteSpace().section( ' ', 1, 1 ); // return the value of the target which is 0.0.0.0 + TQString tmptarget = line.simplifyWhiteSpace().section( ' ', 1, 1 ); // return the value of the target which is 0.0.0.0 if ( tmptarget == "00000000" ) defaultroutecount++; } @@ -339,14 +339,14 @@ int NetworkInterface::getDefaultRouteCount() return defaultroutecount; } -QString NetworkInterface::getGatewayOfInterface(QString interface) +TQString NetworkInterface::getGatewayOfInterface(TQString interface) { - QFile NetRouteFile ( "/proc/net/route" ); - QTextStream stream ( &NetRouteFile ); - QString tmpgw; + TQFile NetRouteFile ( "/proc/net/route" ); + TQTextStream stream ( &NetRouteFile ); + TQString tmpgw; if ( NetRouteFile .open ( IO_ReadOnly ) ) { - QString line = ""; + TQString line = ""; while ( !stream.atEnd() ) { line = stream.readLine(); // line of text excluding '\n' and replace all white chars with one blank @@ -367,14 +367,14 @@ QString NetworkInterface::getGatewayOfInterface(QString interface) return "0.0.0.0"; } -QString NetworkInterface::getGatewayOfDefaultInterface() +TQString NetworkInterface::getGatewayOfDefaultInterface() { - QFile NetRouteFile ( "/proc/net/route" ); - QTextStream stream ( &NetRouteFile ); - QString tmpgw; + TQFile NetRouteFile ( "/proc/net/route" ); + TQTextStream stream ( &NetRouteFile ); + TQString tmpgw; if ( NetRouteFile .open ( IO_ReadOnly ) ) { - QString line = ""; + TQString line = ""; while ( !stream.atEnd() ) { line = stream.readLine(); // line of text excluding '\n' and replace all white chars with one blank @@ -385,7 +385,7 @@ QString NetworkInterface::getGatewayOfDefaultInterface() bool ok=true; // std::cout << "gateway of default interface " << ": " << line.simplifyWhiteSpace().section( ' ', 2, 2 ).ascii() << "\n"; name.sin_addr.s_addr = line.simplifyWhiteSpace().section( ' ', 2, 2 ).toUInt(&ok,16); -// std::cout << "s_addr: " << QString().setNum(line.simplifyWhiteSpace().section( ' ', 2, 2 ).stripWhiteSpace().toUInt(&ok,16)) << std::endl; +// std::cout << "s_addr: " << TQString().setNum(line.simplifyWhiteSpace().section( ' ', 2, 2 ).stripWhiteSpace().toUInt(&ok,16)) << std::endl; tmpgw = inet_ntoa(name.sin_addr); // return the value of the gateway NetRouteFile .close(); // std::cout << "gateway of default interface (ascii)" << ": " << tmpgw<< "\n"; @@ -402,13 +402,13 @@ QString NetworkInterface::getGatewayOfDefaultInterface() return ""; } -QString NetworkInterface::getExternalIpAddress() +TQString NetworkInterface::getExternalIpAddress() { qInitNetworkProtocols(); ExternalIpAddress=""; getExternalIpAddressRunning=true; - http = new QHttp(); - connect (http,SIGNAL(readyRead(const QHttpResponseHeader &)), this, SLOT(externalIpDataRecieved(const QHttpResponseHeader &))); + http = new TQHttp(); + connect (http,TQT_SIGNAL(readyRead(const TQHttpResponseHeader &)), this, TQT_SLOT(externalIpDataRecieved(const TQHttpResponseHeader &))); // FIXME how it could be better? http->setHost( "checkip.dyndns.org" ); @@ -424,7 +424,7 @@ QString NetworkInterface::getExternalIpAddress() return ExternalIpAddress; } -bool NetworkInterface::inSameNetwork(QString ip1,QString Netmask1,QString ip2,QString Netmask2) +bool NetworkInterface::inSameNetwork(TQString ip1,TQString Netmask1,TQString ip2,TQString Netmask2) { // FIXME add valid ipv4 ip check // FIXME add netmask check (subnetworks!) @@ -456,8 +456,8 @@ void NetworkInterface::readFromStdout() { while ( proc->canReadLineStdout() ) { - QString line = proc->readLineStdout() ; - // QString line = QString(proc->readStdout()); + TQString line = proc->readLineStdout() ; + // TQString line = TQString(proc->readStdout()); /* @@ -490,8 +490,8 @@ void NetworkInterface::readFromStdout() void NetworkInterface::readFromStderr() { //while ( proc->canReadLineStderr() ) { - // QString line = proc->readLineStderr() ; - QString line = QString( proc->readStderr() ); + // TQString line = proc->readLineStderr() ; + TQString line = TQString( proc->readStderr() ); if ( interfaceTest ) { @@ -510,7 +510,7 @@ void NetworkInterface::processHasFinished() if (retrieveInterfaceAddress ) { // std::cout << "tmp file: " << tmpfile->name() << std::endl; - InterfaceAddress = QString(tmpfile->file()->readAll()).stripWhiteSpace(); + InterfaceAddress = TQString(tmpfile->file()->readAll()).stripWhiteSpace(); // KMessageBox::information( 0,this->defaultinterface,"default if"); // tmpfile->unlink(); retrieveInterfaceAddress=false; @@ -522,9 +522,9 @@ void NetworkInterface::processHasFinished() readOutput=false; } -void NetworkInterface::externalIpDataRecieved(const QHttpResponseHeader &) +void NetworkInterface::externalIpDataRecieved(const TQHttpResponseHeader &) { - ExternalIpAddress=QString(http->readAll()).stripWhiteSpace().remove ("Current IP Address: ").stripWhiteSpace(); + ExternalIpAddress=TQString(http->readAll()).stripWhiteSpace().remove ("Current IP Address: ").stripWhiteSpace(); getExternalIpAddressRunning=false; } @@ -532,8 +532,8 @@ void NetworkInterface::readFromStdout_interfaceip() { while ( InterfaceIpProc && InterfaceIpProc->canReadLineStdout() ) { - QString line = InterfaceIpProc->readLineStdout() ; - // QString line = QString(InterfaceIpProc->readStdout()); + TQString line = InterfaceIpProc->readLineStdout() ; + // TQString line = TQString(InterfaceIpProc->readStdout()); if (line.find( "inet ", 0 , FALSE ) != -1 ) { @@ -550,8 +550,8 @@ void NetworkInterface::readFromStderr_interfaceip() { while ( InterfaceIpProc && InterfaceIpProc->canReadLineStderr() ) { - QString line = InterfaceIpProc->readLineStderr() ; - // QString line = QString( InterfaceIpProc->readStderr() ); + TQString line = InterfaceIpProc->readLineStderr() ; + // TQString line = TQString( InterfaceIpProc->readStderr() ); if ( interfaceTest ) { diff --git a/src/networkinterface.h b/src/networkinterface.h index 99e71b9..83bf25a 100644 --- a/src/networkinterface.h +++ b/src/networkinterface.h @@ -20,14 +20,14 @@ #ifndef NETWORKINTERFACE_H #define NETWORKINTERFACE_H -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include -#include +#include +#include #include "kvpncconfig.h" /** @@ -35,9 +35,10 @@ Class for interaction with network interface @author Christoph Thielecke */ -class NetworkInterface : public QObject +class NetworkInterface : public TQObject { Q_OBJECT + TQ_OBJECT public: /** @@ -46,7 +47,7 @@ public: * @param name Name of the object * @return nothing */ - NetworkInterface( KVpncConfig* config,QApplication *app, QObject *parent = 0, const char *name = 0 ); + NetworkInterface( KVpncConfig* config,TQApplication *app, TQObject *parent = 0, const char *name = 0 ); /** * Destruktor @@ -59,50 +60,50 @@ public: * @param Interface The interface to test * @return True if interface exist */ - bool interfaceExist(QString Interface); + bool interfaceExist(TQString Interface); /** * Retrieves a list of all availiable interfaces * @return List with all interfaces */ - QStringList getAllNetworkInterfaces(); + TQStringList getAllNetworkInterfaces(); /** * Gets the IP from a given interface * @param Interface The interface from which the IP whould be given * @return The IP */ - QString getInterfaceIP(QString Interface); + TQString getInterfaceIP(TQString Interface); - QString getInterfaceIP2(QString Interface); // old style + TQString getInterfaceIP2(TQString Interface); // old style /** * Gets the device from a given IP * @param IP The IP which the target interface has * @return The interface where the IP is set */ - QString getInterfaceAddress(QString IP); + TQString getInterfaceAddress(TQString IP); /** * Gets the interface where the default route points * @return The interface */ - QString getDefaultInterface(); + TQString getDefaultInterface(); /** * Gets the gateway of a given interface * @return The interface */ - QString getGatewayOfInterface(QString interface); + TQString getGatewayOfInterface(TQString interface); - QString getNetmaskOfInterface(QString interface); + TQString getNetmaskOfInterface(TQString interface); - bool inSameNetwork(QString ip1,QString Netmask1,QString ip2,QString Netmask2); + bool inSameNetwork(TQString ip1,TQString Netmask1,TQString ip2,TQString Netmask2); /** * Gets the gateway of the default route * @return The interface */ - QString getGatewayOfDefaultInterface(); + TQString getGatewayOfDefaultInterface(); /** * Gets the count of default route entries @@ -114,9 +115,9 @@ public: * Gets the IP address which is used for communication with internet connections (same as local address if not behind router) * @return The external IP address */ - QString getExternalIpAddress(); + TQString getExternalIpAddress(); - bool inSameNetwork(QString ip1,QString ip2); + bool inSameNetwork(TQString ip1,TQString ip2); public slots: void readFromStdout(); @@ -124,33 +125,33 @@ public slots: void processHasFinished(); void readFromStdout_interfaceip(); void readFromStderr_interfaceip(); - void externalIpDataRecieved(const QHttpResponseHeader & resp); + void externalIpDataRecieved(const TQHttpResponseHeader & resp); protected: - QProcess *proc; //< The process for starting external programs - QProcess *InterfaceExitsProc; - QProcess *InterfaceIpProc; + TQProcess *proc; //< The process for starting external programs + TQProcess *InterfaceExitsProc; + TQProcess *InterfaceIpProc; bool interfaceTest; //< True if interface test is running bool retrieveInterfaceIP; //< True if retrieve interface IP is running bool retrieveInterfaceAddress; //< True if retrieve interface address is running - QStringList InterfaceList; //< List with interfaces - QString InterfaceIP; //< IP for interface - QString InterfaceAddress; //< Device for IP - QString GatewayAddress; //< Gateway of Device - QString GatewayOfInterfaceAddress; - QString GatewayOfDefaultInterfaceAddress; //< Gateway of Device + TQStringList InterfaceList; //< List with interfaces + TQString InterfaceIP; //< IP for interface + TQString InterfaceAddress; //< Device for IP + TQString GatewayAddress; //< Gateway of Device + TQString GatewayOfInterfaceAddress; + TQString GatewayOfDefaultInterfaceAddress; //< Gateway of Device bool interfaceExists; //< True if interface exists - QString ifconfigbin; //< Path to ifconfig - QString routebin; //< Path to route - QString defaultinterface; //< Interface with defaultroute - QString IPforInterface; //< The Ip for interface - QString tmpInterface; //< Interface for getting devname - QApplication *app; + TQString ifconfigbin; //< Path to ifconfig + TQString routebin; //< Path to route + TQString defaultinterface; //< Interface with defaultroute + TQString IPforInterface; //< The Ip for interface + TQString tmpInterface; //< Interface for getting devname + TQApplication *app; bool readOutput,getExternalIpAddressRunning; KTempFile *tmpfile; - QHttp *http; - QString ExternalIpAddress; - QStringList *env; + TQHttp *http; + TQString ExternalIpAddress; + TQStringList *env; KVpncConfig *GlobalConfig; }; diff --git a/src/newprofiledialog.cpp b/src/newprofiledialog.cpp index f9cb763..8fc7d21 100644 --- a/src/newprofiledialog.cpp +++ b/src/newprofiledialog.cpp @@ -21,18 +21,18 @@ #include "newprofiledialog.h" #include #include -#include +#include #include #include -#include +#include #include #include #include #include -#include +#include #include -#include +#include #include "utils.h" @@ -43,7 +43,7 @@ //END includes -NewProfileDialog::NewProfileDialog( QApplication *app,QWidget *parent, const QString& caption, KVpncConfig *GlobalConfig) +NewProfileDialog::NewProfileDialog( TQApplication *app,TQWidget *parent, const TQString& caption, KVpncConfig *GlobalConfig) : KDialogBase( parent, "New_profile", true, caption, KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ) { @@ -51,16 +51,16 @@ NewProfileDialog::NewProfileDialog( QApplication *app,QWidget *parent, const QSt main = new NewProfileDialogbase(this); setMainWidget(main); - main->setMinimumSize(main->sizeHint()); - - connect( main->ConnectionTypeComboBox, SIGNAL( activated( const QString& ) ), this, SLOT( connectiontypeChanged( const QString& ) ) ); - connect( main->AuthTypeComboBox , SIGNAL( activated( const QString& ) ), this, SLOT( authTypeChanged( const QString& ) ) ); - // connect( main->buttonCancel , SIGNAL( clicked () ), this, SLOT( reject() ) ); - connect( main->ImportCertificatePushButton, SIGNAL( clicked () ), this, SLOT( importCertificate() ) ); - connect( main->AdvancedSettingsPushButton, SIGNAL( clicked () ), this, SLOT( advancedSettingsClicked() ) ); - connect( main->ImportPcfProfilePushButton , SIGNAL( clicked () ), this, SLOT( importPcfFileClicked() ) ); - connect( main->GroupPasswordEdit, SIGNAL( textChanged(const QString&) ), this, SLOT( groupPasswordContentChanged() ) ); - connect( main->PasswordEdit, SIGNAL( textChanged(const QString&) ), this, SLOT( passwordContentChanged() ) ); + main->setMinimumSize(main->tqsizeHint()); + + connect( main->ConnectionTypeComboBox, TQT_SIGNAL( activated( const TQString& ) ), this, TQT_SLOT( connectiontypeChanged( const TQString& ) ) ); + connect( main->AuthTypeComboBox , TQT_SIGNAL( activated( const TQString& ) ), this, TQT_SLOT( authTypeChanged( const TQString& ) ) ); + // connect( main->buttonCancel , TQT_SIGNAL( clicked () ), this, TQT_SLOT( reject() ) ); + connect( main->ImportCertificatePushButton, TQT_SIGNAL( clicked () ), this, TQT_SLOT( importCertificate() ) ); + connect( main->AdvancedSettingsPushButton, TQT_SIGNAL( clicked () ), this, TQT_SLOT( advancedSettingsClicked() ) ); + connect( main->ImportPcfProfilePushButton , TQT_SIGNAL( clicked () ), this, TQT_SLOT( importPcfFileClicked() ) ); + connect( main->GroupPasswordEdit, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( groupPasswordContentChanged() ) ); + connect( main->PasswordEdit, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( passwordContentChanged() ) ); newProfileCreated = FALSE; Name = ""; @@ -127,11 +127,11 @@ NewProfileDialog::NewProfileDialog( QApplication *app,QWidget *parent, const QSt NetworkInterface iface(GlobalConfig,app); - QStringList list = iface.getAllNetworkInterfaces(); + TQStringList list = iface.getAllNetworkInterfaces(); main->NetworkDeviceComboBox->insertItem( "default" ); - for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) + for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) { - main->NetworkDeviceComboBox->insertItem( QString( *it ) ); + main->NetworkDeviceComboBox->insertItem( TQString( *it ) ); } main->NetworkDeviceComboBox->setEnabled( TRUE ); main->NetworkDeviceComboBox->setCurrentText( "default" ); @@ -297,7 +297,7 @@ void NewProfileDialog::accept() profileData->setName(Name); GlobalConfig->AccountList->append( profileData ); newProfileCreated = TRUE; - QDialog::accept(); + TQDialog::accept(); } } @@ -313,7 +313,7 @@ void NewProfileDialog::importCertificate() } -void NewProfileDialog::connectiontypeChanged( const QString& ) +void NewProfileDialog::connectiontypeChanged( const TQString& ) { // First we should set a type @@ -326,7 +326,7 @@ void NewProfileDialog::connectiontypeChanged( const QString& ) { - GlobalConfig->appendLogEntry( i18n("New type: %1").arg("cisco"),GlobalConfig->debug ); + GlobalConfig->appendLogEntry( i18n("New type: %1").tqarg("cisco"),GlobalConfig->debug ); profileData->setConnectionType( VpnAccountData::cisco ); @@ -372,7 +372,7 @@ void NewProfileDialog::connectiontypeChanged( const QString& ) { - GlobalConfig->appendLogEntry( i18n("New type: %1").arg("racoon"),GlobalConfig->debug ); + GlobalConfig->appendLogEntry( i18n("New type: %1").tqarg("racoon"),GlobalConfig->debug ); // KURLRequester* main->x509certURLRequester; // KComboBox* main->AuthTypeComboBox; // KPushButton* ImportCertificatePushButton; @@ -424,7 +424,7 @@ void NewProfileDialog::connectiontypeChanged( const QString& ) { - GlobalConfig->appendLogEntry( i18n("New type: %1").arg("freeswan"), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( i18n("New type: %1").tqarg("freeswan"), GlobalConfig->debug ); // KURLRequester* main->x509certURLRequester; // KComboBox* main->AuthTypeComboBox; // KPushButton* ImportCertificatePushButton; @@ -476,7 +476,7 @@ void NewProfileDialog::connectiontypeChanged( const QString& ) { - GlobalConfig->appendLogEntry( i18n("New type: %1").arg("pptp"),GlobalConfig->debug ); + GlobalConfig->appendLogEntry( i18n("New type: %1").tqarg("pptp"),GlobalConfig->debug ); // KURLRequester* main->x509certURLRequester; // KComboBox* main->AuthTypeComboBox; // KPushButton* ImportCertificatePushButton; @@ -526,7 +526,7 @@ void NewProfileDialog::connectiontypeChanged( const QString& ) else if ( item == VpnAccountData::ConnectionType(VpnAccountData::openvpn) ) { if (GlobalConfig->KvpncDebugLevel > 0) - GlobalConfig->appendLogEntry( i18n("New type: %1").arg("openvpn"),GlobalConfig->debug ); + GlobalConfig->appendLogEntry( i18n("New type: %1").tqarg("openvpn"),GlobalConfig->debug ); // KURLRequester* main->x509certURLRequester; // KComboBox* main->AuthTypeComboBox; // KPushButton* ImportCertificatePushButton; @@ -595,7 +595,7 @@ void NewProfileDialog::connectiontypeChanged( const QString& ) } } -void NewProfileDialog::authTypeChanged( const QString& ) +void NewProfileDialog::authTypeChanged( const TQString& ) { if ( main->AuthTypeComboBox->currentItem() == VpnAccountData::AuthenticationType(VpnAccountData::cert )) { @@ -626,10 +626,10 @@ void NewProfileDialog::authTypeChanged( const QString& ) void NewProfileDialog::reject() { - QDialog::reject(); + TQDialog::reject(); } -void NewProfileDialog::profileNameChanged( const QString& ) +void NewProfileDialog::profileNameChanged( const TQString& ) { // LogOutput->append ( "text changed!" ); // if ( main->ProfileLineEdit->text().isEmpty() ) @@ -638,7 +638,7 @@ void NewProfileDialog::profileNameChanged( const QString& ) // buttonOk->setEnabled( TRUE ); } -QString NewProfileDialog::getName() +TQString NewProfileDialog::getName() { return Name; } diff --git a/src/newprofiledialog.h b/src/newprofiledialog.h index 7fecfd4..03cd0bf 100644 --- a/src/newprofiledialog.h +++ b/src/newprofiledialog.h @@ -22,10 +22,10 @@ #include "newprofiledialogbase.h" #include "vpnaccountdata.h" -#include +#include #include -#include -#include +#include +#include #include "kvpncconfig.h" /** @@ -34,38 +34,39 @@ class NewProfileDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - NewProfileDialog( QApplication *app, QWidget *parent, const QString& caption, KVpncConfig *GlobalConfig); + NewProfileDialog( TQApplication *app, TQWidget *parent, const TQString& caption, KVpncConfig *GlobalConfig); ~NewProfileDialog(); - QString getName(); + TQString getName(); public slots: void accept(); void reject(); void importCertificate(); - void connectiontypeChanged( const QString& ); - void authTypeChanged( const QString& ); - void profileNameChanged(const QString&); + void connectiontypeChanged( const TQString& ); + void authTypeChanged( const TQString& ); + void profileNameChanged(const TQString&); void importPcfFileClicked(); void groupPasswordContentChanged(); void passwordContentChanged(); protected: NewProfileDialogbase *main; - QString ConnectionType; - QString Gateway; - QString ID; - QString Username; - QString UserPassword; - QString PreSharedKey; - QString ApplicationVersion; - QString NtDomainName; - QString PerfectForwardSecrecy; - QString IkeGroup; - QString DnsServer; //< userdefined DNS server for pptp - QString Name; - QString Description; + TQString ConnectionType; + TQString Gateway; + TQString ID; + TQString Username; + TQString UserPassword; + TQString PreSharedKey; + TQString ApplicationVersion; + TQString NtDomainName; + TQString PerfectForwardSecrecy; + TQString IkeGroup; + TQString DnsServer; //< userdefined DNS server for pptp + TQString Name; + TQString Description; bool saveUserPassword; bool savePsk; bool useApplicationVersion; diff --git a/src/newprofiledialogbase.ui b/src/newprofiledialogbase.ui index 7635225..8cce8f6 100644 --- a/src/newprofiledialogbase.ui +++ b/src/newprofiledialogbase.ui @@ -1,6 +1,6 @@ NewProfileDialogbase - + NewProfileDialogBase @@ -25,9 +25,9 @@ 6 - + - layout9 + tqlayout9 @@ -57,7 +57,7 @@ Expanding - + 321 20 @@ -66,9 +66,9 @@ - + - layout11 + tqlayout11 @@ -112,7 +112,7 @@ Expanding - + 110 20 @@ -131,7 +131,7 @@ Expanding - + 20 16 @@ -146,7 +146,7 @@ IPSec ID of the remote side - + LabelNetworkDevice @@ -176,7 +176,7 @@ Certificate file name - + LabelProfilename_2 @@ -187,7 +187,7 @@ Description: - + LabelPassword @@ -195,7 +195,7 @@ Password: - + LabelRemoteNetwork @@ -206,7 +206,7 @@ Remote network: - + CheckUserPass @@ -220,7 +220,7 @@ Save the user password in config file (or in KWallet if available) - + LabelID @@ -250,7 +250,7 @@ Enter the description of this profile here. - + LabelGroupPassword @@ -258,7 +258,7 @@ Group password: - + LabelCertificatePath @@ -285,7 +285,7 @@ Path to the certificates, used if no absolute path is given. - + GroupPasswordEdit @@ -296,7 +296,7 @@ Group password for remote side - + PasswordEdit @@ -307,7 +307,7 @@ Password for authentication - + LabelPsk @@ -336,14 +336,14 @@ Expanding - + 159 20 - + LabelGateway @@ -351,7 +351,7 @@ VPN gateway: - + CheckGroupPass @@ -365,7 +365,7 @@ Save the group password in config file (or in KWallet if available) - + LabelConnectionType @@ -373,7 +373,7 @@ Connection type: - + LabelAuthType @@ -391,14 +391,14 @@ Expanding - + 159 20 - + LabelCertificate @@ -414,7 +414,7 @@ Hostname or IP address of the VPN gateway - + LabelProfilename @@ -425,7 +425,7 @@ Profile name: - + LabelUsername @@ -443,7 +443,7 @@ Expanding - + 114 20 @@ -474,7 +474,7 @@ Expanding - + 75 20 @@ -499,9 +499,9 @@ Authentication type - + - layout8 + tqlayout8 @@ -518,7 +518,7 @@ This is the remote network where the connection should going to. <br>Use this at a PPTP connection for set another network than the retrieved IP is located. - + RemoteNetDividetextLabel @@ -670,12 +670,12 @@ ImportPcfProfilePushButton ImportCertificatePushButton - + profileNameChanged(const QString&) importPcfFileClicked() passwordContentChanged() groupPasswordContentChanged() - + kpushbutton.h diff --git a/src/newprofilewizard.cpp b/src/newprofilewizard.cpp index 296d80c..e627bb9 100644 --- a/src/newprofilewizard.cpp +++ b/src/newprofilewizard.cpp @@ -20,24 +20,24 @@ //BEGIN INCLUDES #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include -#include +#include #include #include #include #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -58,8 +58,8 @@ NewProfileWizard::NewProfileWizard ( KVpncConfig* GlobalConfig ) setCaption ( i18n ( "Add new profile..." ) ); //setMinimumSize( 400,300); - SetupPixmap = new QPixmap ( locate ( "data", "kvpnc/newprofilewizard.png" ) ); - SetupPixmapFinal = new QPixmap ( locate ( "data", "kvpnc/newprofilewizard_final.png" ) ); + SetupPixmap = new TQPixmap ( locate ( "data", "kvpnc/newprofilewizard.png" ) ); + SetupPixmapFinal = new TQPixmap ( locate ( "data", "kvpnc/newprofilewizard_final.png" ) ); // currently static for new profile VpnAccountData::ConnectionType ConnType = VpnAccountData::ConnectionType ( VpnAccountData::other ); @@ -157,66 +157,66 @@ void NewProfileWizard::accept() if ( newProfileCreated && profileData->getAuthType() == VpnAccountData::cert ) {} - QWizard::accept(); + TQWizard::accept(); } void NewProfileWizard::reject() { finished = false; - QWizard::reject(); + TQWizard::reject(); } void NewProfileWizard::setupPages() { // setup start page - page1 = new QHBox ( 0 ); + page1 = new TQHBox ( 0 ); // page1->setSpacing(8); - QLabel *setupPixmapContent1 = new QLabel ( page1 ); + TQLabel *setupPixmapContent1 = new TQLabel ( page1 ); setupPixmapContent1->setPixmap ( *SetupPixmap ); - setupPixmapContent1->resize ( setupPixmapContent1->sizeHint() ); + setupPixmapContent1->resize ( setupPixmapContent1->tqsizeHint() ); newprofilewizardstartcontent = new NewProfileWizardStart ( page1 ); - newprofilewizardstartcontent->resize ( newprofilewizardstartcontent->sizeHint() ); - page1->sizeHint(); + newprofilewizardstartcontent->resize ( newprofilewizardstartcontent->tqsizeHint() ); + page1->tqsizeHint(); addPage ( page1, "" + i18n ( "Welcome" ) + "" ); // type selection - newprofilewizardtypeselectionpage = new QHBox ( 0 ); + newprofilewizardtypeselectionpage = new TQHBox ( 0 ); // newprofilewizardtypeselectionpage->setSpacing(8); - QLabel *setupPixmapContent2 = new QLabel ( newprofilewizardtypeselectionpage ); + TQLabel *setupPixmapContent2 = new TQLabel ( newprofilewizardtypeselectionpage ); setupPixmapContent2->setPixmap ( *SetupPixmap ); - setupPixmapContent2->resize ( setupPixmapContent2->sizeHint() ); + setupPixmapContent2->resize ( setupPixmapContent2->tqsizeHint() ); newprofilewizardtypeselectionpagecontent = new NewProfileWizardTypeSelection ( newprofilewizardtypeselectionpage ); newprofilewizardtypeselectionpagecontent->FreeswanRadioButton->setText ( i18n ( "IPSec (%1)" ).arg ( "FreeS/WAN/Openswan/strongSwan" ) ); newprofilewizardtypeselectionpagecontent->L2tpFreeswanRadioButton->setText ( i18n ( "L2TP over IPSec (%1)" ).arg ( "FreeS/WAN/Openswan/strongSwan" ) ); - newprofilewizardtypeselectionpage->sizeHint(); + newprofilewizardtypeselectionpage->tqsizeHint(); addPage ( newprofilewizardtypeselectionpage, "" + i18n ( "Type selection" ) + "" ); // cisco - newprofilewizardciscoselectionpage = new QHBox ( 0 ); + newprofilewizardciscoselectionpage = new TQHBox ( 0 ); // newprofilewizardciscoselectionpage->setSpacing(8); - QLabel *setupPixmapContent3 = new QLabel ( newprofilewizardciscoselectionpage ); + TQLabel *setupPixmapContent3 = new TQLabel ( newprofilewizardciscoselectionpage ); setupPixmapContent3->setPixmap ( *SetupPixmap ); - setupPixmapContent3->resize ( setupPixmapContent3->sizeHint() ); + setupPixmapContent3->resize ( setupPixmapContent3->tqsizeHint() ); newprofilewizardciscoselectionpagecontent = new NewProfileWizardCiscoSelection ( newprofilewizardciscoselectionpage ); - newprofilewizardciscoselectionpage->sizeHint(); + newprofilewizardciscoselectionpage->tqsizeHint(); - newprofilewizardciscomanuallypage = new QHBox ( 0 ); + newprofilewizardciscomanuallypage = new TQHBox ( 0 ); // newprofilewizardciscomanuallypage->setSpacing(8); - QLabel *setupPixmapContent4 = new QLabel ( newprofilewizardciscomanuallypage ); + TQLabel *setupPixmapContent4 = new TQLabel ( newprofilewizardciscomanuallypage ); setupPixmapContent4->setPixmap ( *SetupPixmap ); - setupPixmapContent4->resize ( setupPixmapContent4->sizeHint() ); + setupPixmapContent4->resize ( setupPixmapContent4->tqsizeHint() ); newprofilewizardciscomanuallypagecontent = new NewProfileWizardCiscoManually ( newprofilewizardciscomanuallypage ); - newprofilewizardciscomanuallypage->sizeHint(); + newprofilewizardciscomanuallypage->tqsizeHint(); - connect ( newprofilewizardciscomanuallypagecontent->GroupPasswordLineEdit , SIGNAL ( textChanged ( const QString& ) ), this, SLOT ( pskToggled ( const QString& ) ) ); + connect ( newprofilewizardciscomanuallypagecontent->GroupPasswordLineEdit , TQT_SIGNAL ( textChanged ( const TQString& ) ), this, TQT_SLOT ( pskToggled ( const TQString& ) ) ); // racoon - newprofilewizardracoonpage = new QHBox ( 0 ); + newprofilewizardracoonpage = new TQHBox ( 0 ); // newprofilewizardracoonpage->setSpacing(8); - QLabel *setupPixmapContent5 = new QLabel ( newprofilewizardracoonpage ); + TQLabel *setupPixmapContent5 = new TQLabel ( newprofilewizardracoonpage ); setupPixmapContent5->setPixmap ( *SetupPixmap ); - setupPixmapContent5->resize ( setupPixmapContent5->sizeHint() ); + setupPixmapContent5->resize ( setupPixmapContent5->tqsizeHint() ); newprofilewizardracoonpagecontent = new NewProfileWizardRacoon ( newprofilewizardracoonpage ); newprofilewizardracoonpagecontent->ExchangeModeComboBox->insertItem ( "main", 0 ); newprofilewizardracoonpagecontent->ExchangeModeComboBox->insertItem ( "aggressive", 1 ); @@ -254,21 +254,21 @@ void NewProfileWizard::setupPages() newprofilewizardracoonpagecontent->RemoteIdTypeCombobox->insertItem("keyid"); newprofilewizardracoonpagecontent->RemoteIdTypeCombobox->insertItem("asn1dn"); - QToolTip::add( newprofilewizardracoonpagecontent->RemoteIdTypeCombobox, i18n("Remote ID type
" + TQToolTip::add( newprofilewizardracoonpagecontent->RemoteIdTypeCombobox, i18n("Remote ID type
" "" "" - "" - "" + "" + "" "" "" "
none:No ID
address:The type is the IP address. This is the default type if you do not specify an identifier to use
user_fqdn:The type is a USER_FQDN (user fully-qualified domain name)
fqdn:The type is a FQDN (fully-qualified domain name)
user_fqdn:The type is a USER_FTQDN (user fully-qualified domain name)
fqdn:The type is a FTQDN (fully-qualified domain name)
keyid (file):The type is a KEY_ID, read from the file
keyid:The type is a KEY_ID, specified in field
asn1dn:The type is an ASN.1 distinguished name. If empty, DN from the Subject field in the certificate will be used" "")); - QToolTip::add( newprofilewizardracoonpagecontent->LocalIdTypeCombobox, i18n("Local ID type
" + TQToolTip::add( newprofilewizardracoonpagecontent->LocalIdTypeCombobox, i18n("Local ID type
" "" "" - "" - "" + "" + "" "" "" "
none:No ID
address:The type is the IP address. This is the default type if you do not specify an identifier to use
user_fqdn:The type is a USER_FQDN (user fully-qualified domain name)
fqdn:The type is a FQDN (fully-qualified domain name)
user_fqdn:The type is a USER_FTQDN (user fully-qualified domain name)
fqdn:The type is a FTQDN (fully-qualified domain name)
keyid (file):The type is a KEY_ID, read from the file
keyid:The type is a KEY_ID, specified in field
asn1dn:The type is an ASN.1 distinguished name. If empty, DN from the Subject field in the certificate will be used" @@ -277,11 +277,11 @@ void NewProfileWizard::setupPages() newprofilewizardracoonpagecontent->PerfectForwardSecurityCheckbox->setChecked(true); newprofilewizardracoonpagecontent->PerfectForwardSecrecyCombobox->setCurrentText("modp2048"); - connect ( newprofilewizardracoonpagecontent->LocalIdTypeCombobox, SIGNAL ( highlighted ( const QString& ) ), this, SLOT ( localIDTypeRacoonToggled ( const QString& ) ) ); - connect ( newprofilewizardracoonpagecontent->RemoteIdTypeCombobox, SIGNAL ( highlighted ( const QString& ) ), this, SLOT ( remoteIDTypeRacoonToggled ( const QString& ) ) ); + connect ( newprofilewizardracoonpagecontent->LocalIdTypeCombobox, TQT_SIGNAL ( highlighted ( const TQString& ) ), this, TQT_SLOT ( localIDTypeRacoonToggled ( const TQString& ) ) ); + connect ( newprofilewizardracoonpagecontent->RemoteIdTypeCombobox, TQT_SIGNAL ( highlighted ( const TQString& ) ), this, TQT_SLOT ( remoteIDTypeRacoonToggled ( const TQString& ) ) ); - connect ( newprofilewizardracoonpagecontent->IkeGroupCheckbox, SIGNAL ( toggled ( bool ) ), this, SLOT ( ikeGroupToggled ( bool ) ) ); - connect ( newprofilewizardracoonpagecontent->UseXauthCheckBox, SIGNAL(toggled(bool)),this, SLOT(useXauthRacoonToggled(bool))); + connect ( newprofilewizardracoonpagecontent->IkeGroupCheckbox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( ikeGroupToggled ( bool ) ) ); + connect ( newprofilewizardracoonpagecontent->UseXauthCheckBox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(useXauthRacoonToggled(bool))); Utils::IpsecAlgos KernelCrypto = Utils ( GlobalConfig ).getKernelCrypto(); @@ -304,13 +304,13 @@ void NewProfileWizard::setupPages() // // phase 2 encr algos from kernel -// for ( QStringList::Iterator it = KernelCrypto.IpsecEspEncryptionAlgorithms.begin(); it != KernelCrypto.IpsecEspEncryptionAlgorithms.end(); ++it ) +// for ( TQStringList::Iterator it = KernelCrypto.IpsecEspEncryptionAlgorithms.begin(); it != KernelCrypto.IpsecEspEncryptionAlgorithms.end(); ++it ) // { // newprofilewizardracoonpagecontent->EncryptionAlgorithm2ComboBox->insertItem ( *it ); // } // // // phase 2 auth algos from kernel -// for ( QStringList::Iterator it = KernelCrypto.IpsecEspAuthenticationAlgorithms.begin(); it != KernelCrypto.IpsecEspAuthenticationAlgorithms.end(); ++it ) +// for ( TQStringList::Iterator it = KernelCrypto.IpsecEspAuthenticationAlgorithms.begin(); it != KernelCrypto.IpsecEspAuthenticationAlgorithms.end(); ++it ) // { // newprofilewizardracoonpagecontent->AuthenticationAlgorithm2ComboBox->insertItem ( *it ); // } @@ -347,32 +347,32 @@ void NewProfileWizard::setupPages() newprofilewizardracoonpagecontent->PerfectForwardSecurityCheckbox->hide(); newprofilewizardracoonpagecontent->PerfectForwardSecrecyCombobox->hide(); - newprofilewizardracoonpage->sizeHint(); + newprofilewizardracoonpage->tqsizeHint(); //freeswan - newprofilewizardfreeswanselectionpage = new QHBox ( 0 ); + newprofilewizardfreeswanselectionpage = new TQHBox ( 0 ); // newprofilewizardfreeswanselectionpage->setSpacing(8); - QLabel *setupPixmapContent711 = new QLabel ( newprofilewizardfreeswanselectionpage ); + TQLabel *setupPixmapContent711 = new TQLabel ( newprofilewizardfreeswanselectionpage ); setupPixmapContent711->setPixmap ( *SetupPixmap ); - setupPixmapContent711->resize ( setupPixmapContent711->sizeHint() ); + setupPixmapContent711->resize ( setupPixmapContent711->tqsizeHint() ); newprofilewizardfreeswanselectionpagecontent = new NewProfileWizardOpenvpnSelection ( newprofilewizardfreeswanselectionpage ); newprofilewizardfreeswanselectionpagecontent->OpenvpnImportRadioButton->setText(i18n("Import &Ipsec config file")); - newprofilewizardfreeswanselectionpage->sizeHint(); + newprofilewizardfreeswanselectionpage->tqsizeHint(); - newprofilewizardfreeswanpage = new QHBox ( 0 ); + newprofilewizardfreeswanpage = new TQHBox ( 0 ); // newprofilewizardfreeswanpage->setSpacing(8); - QLabel *setupPixmapContent6 = new QLabel ( newprofilewizardfreeswanpage ); + TQLabel *setupPixmapContent6 = new TQLabel ( newprofilewizardfreeswanpage ); setupPixmapContent6->setPixmap ( *SetupPixmap ); - setupPixmapContent6->resize ( setupPixmapContent6->sizeHint() ); + setupPixmapContent6->resize ( setupPixmapContent6->tqsizeHint() ); newprofilewizardfreeswanpagecontent = new NewProfileWizardFreeswan ( newprofilewizardfreeswanpage ); - newprofilewizardfreeswanpage->sizeHint(); + newprofilewizardfreeswanpage->tqsizeHint(); //freeswan - newprofilewizardfreeswanpage = new QHBox ( 0 ); + newprofilewizardfreeswanpage = new TQHBox ( 0 ); // newprofilewizardfreeswanpage->setSpacing(8); - QLabel *setupPixmapContent66 = new QLabel ( newprofilewizardfreeswanpage ); + TQLabel *setupPixmapContent66 = new TQLabel ( newprofilewizardfreeswanpage ); setupPixmapContent66->setPixmap ( *SetupPixmap ); - setupPixmapContent66->resize ( setupPixmapContent66->sizeHint() ); + setupPixmapContent66->resize ( setupPixmapContent66->tqsizeHint() ); newprofilewizardfreeswanpagecontent = new NewProfileWizardFreeswan ( newprofilewizardfreeswanpage ); newprofilewizardfreeswanpagecontent->LocalIdTypeCombobox->insertItem(i18n("Certificate ID")); @@ -397,45 +397,45 @@ void NewProfileWizard::setupPages() newprofilewizardfreeswanpagecontent->UseModeConfigCheckBox->hide(); newprofilewizardfreeswanpagecontent->PerfectForwardSecurityCheckbox->setChecked(true); - connect ( newprofilewizardfreeswanpagecontent->LocalIdTypeCombobox, SIGNAL ( highlighted ( const QString& ) ), this, SLOT ( localIDTypeIpsecToggled ( const QString& ) ) ); + connect ( newprofilewizardfreeswanpagecontent->LocalIdTypeCombobox, TQT_SIGNAL ( highlighted ( const TQString& ) ), this, TQT_SLOT ( localIDTypeIpsecToggled ( const TQString& ) ) ); - connect( newprofilewizardfreeswanpagecontent->UseCustomEspCheckBox, SIGNAL( toggled(bool) ), this, SLOT( useEspToogled(bool) ) ); - connect( newprofilewizardfreeswanpagecontent->UseCustomIkeCheckBox, SIGNAL( toggled(bool) ), this, SLOT( useIkeToggled(bool) ) ); - connect( newprofilewizardfreeswanpagecontent->UseLeftNextHopCheckBox, SIGNAL( toggled(bool) ), this, SLOT( useLeftNextHopToggled(bool) ) ); - connect( newprofilewizardfreeswanpagecontent->UseRightNextHopCheckBox, SIGNAL( toggled(bool) ), this, SLOT( useRightNextHopToggled(bool) ) ); - connect (newprofilewizardfreeswanpagecontent->UseXauthCheckBox, SIGNAL(toggled(bool)),this, SLOT(useXauthFreeswanToggled(bool))); + connect( newprofilewizardfreeswanpagecontent->UseCustomEspCheckBox, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( useEspToogled(bool) ) ); + connect( newprofilewizardfreeswanpagecontent->UseCustomIkeCheckBox, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( useIkeToggled(bool) ) ); + connect( newprofilewizardfreeswanpagecontent->UseLeftNextHopCheckBox, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( useLeftNextHopToggled(bool) ) ); + connect( newprofilewizardfreeswanpagecontent->UseRightNextHopCheckBox, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( useRightNextHopToggled(bool) ) ); + connect (newprofilewizardfreeswanpagecontent->UseXauthCheckBox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(useXauthFreeswanToggled(bool))); - connect ( newprofilewizardfreeswanpagecontent->LocalIdTypeCombobox, SIGNAL ( highlighted ( const QString& ) ), this, SLOT ( localIDTypeIpsecToggled ( const QString& ) ) ); - connect ( newprofilewizardfreeswanpagecontent->RemoteIdTypeCombobox, SIGNAL ( highlighted ( const QString& ) ), this, SLOT ( remoteIDTypeIpsecToggled ( const QString& ) ) ); + connect ( newprofilewizardfreeswanpagecontent->LocalIdTypeCombobox, TQT_SIGNAL ( highlighted ( const TQString& ) ), this, TQT_SLOT ( localIDTypeIpsecToggled ( const TQString& ) ) ); + connect ( newprofilewizardfreeswanpagecontent->RemoteIdTypeCombobox, TQT_SIGNAL ( highlighted ( const TQString& ) ), this, TQT_SLOT ( remoteIDTypeIpsecToggled ( const TQString& ) ) ); - newprofilewizardfreeswanpage->sizeHint(); + newprofilewizardfreeswanpage->tqsizeHint(); // openvpn - newprofilewizardopenvpnselectionpage = new QHBox ( 0 ); + newprofilewizardopenvpnselectionpage = new TQHBox ( 0 ); // newprofilewizardopenvpnselectionpage->setSpacing(8); - QLabel *setupPixmapContent7 = new QLabel ( newprofilewizardopenvpnselectionpage ); + TQLabel *setupPixmapContent7 = new TQLabel ( newprofilewizardopenvpnselectionpage ); setupPixmapContent7->setPixmap ( *SetupPixmap ); - setupPixmapContent7->resize ( setupPixmapContent7->sizeHint() ); + setupPixmapContent7->resize ( setupPixmapContent7->tqsizeHint() ); newprofilewizardopenvpnselectionpagecontent = new NewProfileWizardOpenvpnSelection ( newprofilewizardopenvpnselectionpage ); - newprofilewizardopenvpnselectionpage->sizeHint(); + newprofilewizardopenvpnselectionpage->tqsizeHint(); - newprofilewizardopenvpnauthpage = new QHBox ( 0 ); + newprofilewizardopenvpnauthpage = new TQHBox ( 0 ); // newprofilewizardopenvpnauthpage->setSpacing(8); - QLabel *setupPixmapContent71 = new QLabel ( newprofilewizardopenvpnauthpage ); + TQLabel *setupPixmapContent71 = new TQLabel ( newprofilewizardopenvpnauthpage ); setupPixmapContent71->setPixmap ( *SetupPixmap ); - setupPixmapContent71->resize ( setupPixmapContent71->sizeHint() ); + setupPixmapContent71->resize ( setupPixmapContent71->tqsizeHint() ); newprofilewizardopenvpnauthpagecontent = new NewProfileWizardOpenvpnAuth ( newprofilewizardopenvpnauthpage ); - newprofilewizardopenvpnauthpage->sizeHint(); - connect ( newprofilewizardopenvpnauthpagecontent->AuthWithUsernameAndPasswordCheckBox, SIGNAL ( toggled ( bool ) ), this, SLOT ( authenticateWithUsernameAndPasswordToggled ( bool ) ) ); - connect ( newprofilewizardopenvpnauthpagecontent->UseAuthenticationAlgorithmCheckBox, SIGNAL ( toggled ( bool ) ), this, SLOT ( useAuthenticationAlgorithmToggled ( bool ) ) ); + newprofilewizardopenvpnauthpage->tqsizeHint(); + connect ( newprofilewizardopenvpnauthpagecontent->AuthWithUsernameAndPasswordCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( authenticateWithUsernameAndPasswordToggled ( bool ) ) ); + connect ( newprofilewizardopenvpnauthpagecontent->UseAuthenticationAlgorithmCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( useAuthenticationAlgorithmToggled ( bool ) ) ); - newprofilewizardopenvpnpage = new QHBox ( 0 ); + newprofilewizardopenvpnpage = new TQHBox ( 0 ); // newprofilewizardopenvpnpage->setSpacing(8); - QLabel *setupPixmapContent8 = new QLabel ( newprofilewizardopenvpnpage ); + TQLabel *setupPixmapContent8 = new TQLabel ( newprofilewizardopenvpnpage ); setupPixmapContent8->setPixmap ( *SetupPixmap ); - setupPixmapContent8->resize ( setupPixmapContent8->sizeHint() ); + setupPixmapContent8->resize ( setupPixmapContent8->tqsizeHint() ); newprofilewizardopenvpnpagecontent = new NewProfileWizardOpenvpn ( newprofilewizardopenvpnpage ); - newprofilewizardopenvpnpage->sizeHint(); + newprofilewizardopenvpnpage->tqsizeHint(); newprofilewizardopenvpnpagecontent->TunnelDeviceTypeComboBox->insertItem ( "tun" ); newprofilewizardopenvpnpagecontent->TunnelDeviceTypeComboBox->insertItem ( "tap" ); newprofilewizardopenvpnpagecontent->NsCertTypeComboBox->insertItem ( "client" ); @@ -450,35 +450,35 @@ void NewProfileWizard::setupPages() newprofilewizardopenvpnpagecontent->UseUserdefiniedCipherCheckBox->setChecked ( false ); newprofilewizardopenvpnpagecontent->UseHttpProxyCheckBox->setChecked ( false ); - connect ( newprofilewizardopenvpnpagecontent->UseUserdefinedPortCheckBox , SIGNAL ( toggled ( bool ) ), this, SLOT ( userdefinedOpenvpnPortToggeled ( bool ) ) ); - connect ( newprofilewizardopenvpnpagecontent->UseNsCertTypeCheckBox , SIGNAL ( toggled ( bool ) ), this, SLOT ( nsCertTypeOpenvpnToggled ( bool ) ) ); - connect ( newprofilewizardopenvpnpagecontent->UseUserdefinedPortCheckBox, SIGNAL ( toggled ( bool ) ), this, SLOT ( userdefinedOpenvpnPortToggeled ( bool ) ) ); - connect ( newprofilewizardopenvpnpagecontent->UseTlsAuthCheckBox, SIGNAL ( toggled ( bool ) ), this, SLOT ( useTlsAuthToggled ( bool ) ) ); - connect ( newprofilewizardopenvpnpagecontent->UseTlsRemoteHostCheckBox, SIGNAL ( toggled ( bool ) ), this, SLOT ( useTlsRemoteHostToggled ( bool ) ) ); - connect ( newprofilewizardopenvpnpagecontent->UseUserdefiniedCipherCheckBox, SIGNAL ( toggled ( bool ) ), this, SLOT ( useUserdefiniedCipherToggled ( bool ) ) ); - connect ( newprofilewizardopenvpnpagecontent->UseHttpProxyCheckBox, SIGNAL ( toggled ( bool ) ), this, SLOT ( useHttpProxyToggeled ( bool ) ) ); + connect ( newprofilewizardopenvpnpagecontent->UseUserdefinedPortCheckBox , TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( userdefinedOpenvpnPortToggeled ( bool ) ) ); + connect ( newprofilewizardopenvpnpagecontent->UseNsCertTypeCheckBox , TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( nsCertTypeOpenvpnToggled ( bool ) ) ); + connect ( newprofilewizardopenvpnpagecontent->UseUserdefinedPortCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( userdefinedOpenvpnPortToggeled ( bool ) ) ); + connect ( newprofilewizardopenvpnpagecontent->UseTlsAuthCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( useTlsAuthToggled ( bool ) ) ); + connect ( newprofilewizardopenvpnpagecontent->UseTlsRemoteHostCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( useTlsRemoteHostToggled ( bool ) ) ); + connect ( newprofilewizardopenvpnpagecontent->UseUserdefiniedCipherCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( useUserdefiniedCipherToggled ( bool ) ) ); + connect ( newprofilewizardopenvpnpagecontent->UseHttpProxyCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( useHttpProxyToggeled ( bool ) ) ); - QStringList ciphers = Utils ( GlobalConfig ).getOpenvpnCiphers(); - QStringList digests = Utils ( GlobalConfig ).getOpenvpnDigests(); + TQStringList ciphers = Utils ( GlobalConfig ).getOpenvpnCiphers(); + TQStringList digests = Utils ( GlobalConfig ).getOpenvpnDigests(); - for ( QStringList::Iterator it = ciphers.begin(); it != ciphers.end(); ++it ) + for ( TQStringList::Iterator it = ciphers.begin(); it != ciphers.end(); ++it ) { newprofilewizardopenvpnpagecontent->UserdefiniedCipherComboBox->insertItem ( *it ); } - for ( QStringList::Iterator it = digests.begin(); it != digests.end(); ++it ) + for ( TQStringList::Iterator it = digests.begin(); it != digests.end(); ++it ) { newprofilewizardopenvpnauthpagecontent->UserdefiniedDigestComboBox->insertItem ( *it ); } // pptp - newprofilewizardpptppage = new QHBox ( 0 ); + newprofilewizardpptppage = new TQHBox ( 0 ); // newprofilewizardpptppage->setSpacing(8); - QLabel *setupPixmapContent9 = new QLabel ( newprofilewizardpptppage ); + TQLabel *setupPixmapContent9 = new TQLabel ( newprofilewizardpptppage ); setupPixmapContent9->setPixmap ( *SetupPixmap ); - setupPixmapContent9->resize ( setupPixmapContent9->sizeHint() ); + setupPixmapContent9->resize ( setupPixmapContent9->tqsizeHint() ); newprofilewizardpptppagecontent = new NewProfileWizardPptp ( newprofilewizardpptppage ); - newprofilewizardpptppage->sizeHint(); + newprofilewizardpptppage->tqsizeHint(); newprofilewizardpptppagecontent->DnsServerLineedit->setEnabled ( false ); newprofilewizardpptppagecontent->RequireMppeCheckbox->setChecked( profileData->getRequireMppe() ); newprofilewizardpptppagecontent->Refuse128BitEncryptionCheckbox->setChecked( profileData->getRefuse128BitEncryption() ); @@ -504,54 +504,54 @@ void NewProfileWizard::setupPages() newprofilewizardpptppagecontent->AuthMethodComboBox->insertItem ( "mschap" ); newprofilewizardpptppagecontent->AuthMethodComboBox->insertItem ( "mschap-v2" ); - connect( newprofilewizardpptppagecontent->DnsServerCheckbox, SIGNAL( toggled(bool) ), this, SLOT( useDnsServerToggled(bool) ) ); - connect( newprofilewizardpptppagecontent->UseSearchDomainInResolvConfCheckbox, SIGNAL( toggled(bool) ), this, SLOT( useSearchDomainInResolvConfToggled(bool) ) ); - connect( newprofilewizardpptppagecontent->UseDomainInResolvConfCheckbox, SIGNAL( toggled(bool) ), this, SLOT( useDomainInResolvConfToggled(bool) ) ); + connect( newprofilewizardpptppagecontent->DnsServerCheckbox, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( useDnsServerToggled(bool) ) ); + connect( newprofilewizardpptppagecontent->UseSearchDomainInResolvConfCheckbox, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( useSearchDomainInResolvConfToggled(bool) ) ); + connect( newprofilewizardpptppagecontent->UseDomainInResolvConfCheckbox, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( useDomainInResolvConfToggled(bool) ) ); // vtun - newprofilewizardvtunpage = new QHBox ( 0 ); + newprofilewizardvtunpage = new TQHBox ( 0 ); // newprofilewizardvtunpage->setSpacing(8); - QLabel *setupPixmapContent19 = new QLabel ( newprofilewizardvtunpage ); + TQLabel *setupPixmapContent19 = new TQLabel ( newprofilewizardvtunpage ); setupPixmapContent19->setPixmap ( *SetupPixmap ); - setupPixmapContent19->resize ( setupPixmapContent19->sizeHint() ); + setupPixmapContent19->resize ( setupPixmapContent19->tqsizeHint() ); newprofilewizardvtunpagecontent = new ProfileVtunOptions ( newprofilewizardvtunpage ); - newprofilewizardvtunpage->sizeHint(); - connect ( newprofilewizardvtunpagecontent->PortCheckbox, SIGNAL ( toggled ( bool ) ), this, SLOT ( usePortToggled ( bool ) ) ); + newprofilewizardvtunpage->tqsizeHint(); + connect ( newprofilewizardvtunpagecontent->PortCheckbox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( usePortToggled ( bool ) ) ); // ssh - newprofilewizardsshpage = new QHBox ( 0 ); + newprofilewizardsshpage = new TQHBox ( 0 ); // newprofilewizardsshpage->setSpacing(8); - QLabel *setupPixmapContent191 = new QLabel ( newprofilewizardsshpage ); + TQLabel *setupPixmapContent191 = new TQLabel ( newprofilewizardsshpage ); setupPixmapContent191->setPixmap ( *SetupPixmap ); - setupPixmapContent191->resize ( setupPixmapContent191->sizeHint() ); + setupPixmapContent191->resize ( setupPixmapContent191->tqsizeHint() ); newprofilewizardsshpagecontent = new ProfileSshOptions ( newprofilewizardsshpage ); - newprofilewizardsshpage->sizeHint(); + newprofilewizardsshpage->tqsizeHint(); - QString Home= QString(getenv("HOME")); + TQString Home= TQString(getenv("HOME")); if (!Home.isEmpty()) { - QDir dir( Home+"/.ssh" ); - QStringList KeyFiles = dir.entryList( "*" ); + TQDir dir( Home+"/.ssh" ); + TQStringList KeyFiles = dir.entryList( "*" ); //if (GlobalConfig->KvpncDebugLevel > 2) //{ - // GlobalConfig->appendLogEntry(i18n("SSH files: %1").arg(KeyFiles.join(",")),GlobalConfig->debug); + // GlobalConfig->appendLogEntry(i18n("SSH files: %1").tqarg(KeyFiles.join(",")),GlobalConfig->debug); //} if (KeyFiles.size() > 1) { - for ( QStringList::Iterator it = KeyFiles.begin(); it != KeyFiles.end(); ++it ) + for ( TQStringList::Iterator it = KeyFiles.begin(); it != KeyFiles.end(); ++it ) { - QString item = QString(*it); + TQString item = TQString(*it); if (GlobalConfig->KvpncDebugLevel > 2) { - //GlobalConfig->appendLogEntry(i18n("processing entry: %1").arg(item),GlobalConfig->debug); + //GlobalConfig->appendLogEntry(i18n("processing entry: %1").tqarg(item),GlobalConfig->debug); } if (!item.contains (".pub", false) && !item.contains ("authorized_keys", false) && !item.contains ("known_hosts", false) && !item.contains (".", false) && !item.contains ("..", false) && !item.contains ("config", false) ) { if (GlobalConfig->KvpncDebugLevel > 2) { - GlobalConfig->appendLogEntry(i18n("SSH key found: %1").arg(*it),GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("SSH key found: %1").tqarg(*it),GlobalConfig->debug); } newprofilewizardsshpagecontent->SshKeyComboBox->insertItem(*it); } @@ -560,97 +560,97 @@ void NewProfileWizard::setupPages() } - newprofilewizardauthselectionpage = new QHBox ( 0 ); + newprofilewizardauthselectionpage = new TQHBox ( 0 ); // newprofilewizardauthselectionpage->setSpacing(8); - QLabel *setupPixmapContent81 = new QLabel ( newprofilewizardauthselectionpage ); + TQLabel *setupPixmapContent81 = new TQLabel ( newprofilewizardauthselectionpage ); setupPixmapContent81->setPixmap ( *SetupPixmap ); - setupPixmapContent81->resize ( setupPixmapContent81->sizeHint() ); + setupPixmapContent81->resize ( setupPixmapContent81->tqsizeHint() ); newprofilewizardauthselectioncontent = new NewProfileWizardAuthSelection ( newprofilewizardauthselectionpage ); - newprofilewizardauthselectionpage->sizeHint(); + newprofilewizardauthselectionpage->tqsizeHint(); newprofilewizardauthselectioncontent->CertificateRadioButton->setChecked ( true ); newprofilewizardauthselectioncontent->HybridRadioButton->hide (); // virtual ip - newprofilewizardvirtualipaddresspage = new QHBox ( 0 ); - QLabel *setupPixmapContent_virtualip = new QLabel ( newprofilewizardvirtualipaddresspage ); + newprofilewizardvirtualipaddresspage = new TQHBox ( 0 ); + TQLabel *setupPixmapContent_virtualip = new TQLabel ( newprofilewizardvirtualipaddresspage ); setupPixmapContent_virtualip->setPixmap ( *SetupPixmap ); - setupPixmapContent_virtualip->resize ( setupPixmapContent_virtualip->sizeHint() ); + setupPixmapContent_virtualip->resize ( setupPixmapContent_virtualip->tqsizeHint() ); profilenetworkvirtualipoptionscontent = new ProfileNetworkVirtualIpOptions ( newprofilewizardvirtualipaddresspage ); - newprofilewizardvirtualipaddresspage->sizeHint(); + newprofilewizardvirtualipaddresspage->tqsizeHint(); insertPage ( newprofilewizardvirtualipaddresspage, "" + i18n ( "Virtual IP address options" ) + "",-1 ); - connect ( profilenetworkvirtualipoptionscontent->UseVirtualIPCheckBox, SIGNAL ( toggled ( bool ) ), this, SLOT ( useVirtualIpAddressToggled ( bool ) ) ); + connect ( profilenetworkvirtualipoptionscontent->UseVirtualIPCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( useVirtualIpAddressToggled ( bool ) ) ); // psk - newprofilewizardpskpage = new QHBox ( 0 ); + newprofilewizardpskpage = new TQHBox ( 0 ); // newprofilewizardpskpage->setSpacing(8); - QLabel *setupPixmapContent72 = new QLabel ( newprofilewizardpskpage ); + TQLabel *setupPixmapContent72 = new TQLabel ( newprofilewizardpskpage ); setupPixmapContent72->setPixmap ( *SetupPixmap ); - setupPixmapContent72->resize ( setupPixmapContent72->sizeHint() ); + setupPixmapContent72->resize ( setupPixmapContent72->tqsizeHint() ); newprofilewizardpskcontent = new NewProfileWizardPsk ( newprofilewizardpskpage ); - newprofilewizardpskpage->sizeHint(); + newprofilewizardpskpage->tqsizeHint(); - connect ( newprofilewizardpskcontent->PskInFileCheckBox , SIGNAL ( toggled ( bool ) ), this, SLOT ( pskIsInFileToggled ( bool ) ) ); - connect ( newprofilewizardpskcontent->PSKLineEdit , SIGNAL ( textChanged ( const QString & ) ), this, SLOT ( pskInputToggled ( const QString& ) ) ); + connect ( newprofilewizardpskcontent->PskInFileCheckBox , TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( pskIsInFileToggled ( bool ) ) ); + connect ( newprofilewizardpskcontent->PSKLineEdit , TQT_SIGNAL ( textChanged ( const TQString & ) ), this, TQT_SLOT ( pskInputToggled ( const TQString& ) ) ); - newprofilewizardp12certselectionpage = new QHBox ( 0 ); + newprofilewizardp12certselectionpage = new TQHBox ( 0 ); // newprofilewizardp12certselectionpage->setSpacing(8); - QLabel *setupPixmapContent74 = new QLabel ( newprofilewizardp12certselectionpage ); + TQLabel *setupPixmapContent74 = new TQLabel ( newprofilewizardp12certselectionpage ); setupPixmapContent74->setPixmap ( *SetupPixmap ); - setupPixmapContent74->resize ( setupPixmapContent74->sizeHint() ); + setupPixmapContent74->resize ( setupPixmapContent74->tqsizeHint() ); newprofilewizardp12certselectioncontent = new NewProfileWizardP12CertSelection ( newprofilewizardp12certselectionpage ); - newprofilewizardp12certselectionpage->sizeHint(); - connect ( newprofilewizardp12certselectioncontent->UseSmartcardCheckBox, SIGNAL ( toggled ( bool ) ), this, SLOT ( useSmartcardOnCertFormateToggled ( bool ) ) ); + newprofilewizardp12certselectionpage->tqsizeHint(); + connect ( newprofilewizardp12certselectioncontent->UseSmartcardCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( useSmartcardOnCertFormateToggled ( bool ) ) ); // cert - newprofilewizardcertpage = new QHBox ( 0 ); + newprofilewizardcertpage = new TQHBox ( 0 ); // newprofilewizardcertpage->setSpacing(8); - QLabel *setupPixmapContent73 = new QLabel ( newprofilewizardcertpage ); + TQLabel *setupPixmapContent73 = new TQLabel ( newprofilewizardcertpage ); setupPixmapContent73->setPixmap ( *SetupPixmap ); - setupPixmapContent73->resize ( setupPixmapContent73->sizeHint() ); + setupPixmapContent73->resize ( setupPixmapContent73->tqsizeHint() ); newprofilewizardcertcontent = new NewProfileWizardCert ( newprofilewizardcertpage ); - newprofilewizardcertpage->sizeHint(); - connect ( newprofilewizardcertcontent->UseSpecialServerCertificateCheckBox , SIGNAL ( toggled ( bool ) ), this, SLOT ( useSpecialServerCertificateToggled ( bool ) ) ); - connect ( newprofilewizardcertcontent->UseSmartcardCheckBox, SIGNAL ( toggled ( bool ) ), this, SLOT ( useSmartcardToggled ( bool ) ) ); - connect ( newprofilewizardcertcontent->UsePkcs11ProvidersCheckBox, SIGNAL ( toggled ( bool ) ), this, SLOT ( usePkcs11ProvidersToggled ( bool ) ) ); - connect ( newprofilewizardcertcontent->DetectPkcs11SlotsPushButton, SIGNAL ( clicked() ), this, SLOT ( detectPkcs11Slots() ) ); - connect ( newprofilewizardcertcontent->DetectPkcs11IdPushButton, SIGNAL ( clicked() ), this, SLOT ( detectPkcs11Ids() ) ); + newprofilewizardcertpage->tqsizeHint(); + connect ( newprofilewizardcertcontent->UseSpecialServerCertificateCheckBox , TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( useSpecialServerCertificateToggled ( bool ) ) ); + connect ( newprofilewizardcertcontent->UseSmartcardCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( useSmartcardToggled ( bool ) ) ); + connect ( newprofilewizardcertcontent->UsePkcs11ProvidersCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( usePkcs11ProvidersToggled ( bool ) ) ); + connect ( newprofilewizardcertcontent->DetectPkcs11SlotsPushButton, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( detectPkcs11Slots() ) ); + connect ( newprofilewizardcertcontent->DetectPkcs11IdPushButton, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( detectPkcs11Ids() ) ); newprofilewizardcertcontent->Pkcs11SlotTypeComboBox->setEnabled ( false ); newprofilewizardcertcontent->Pkcs11SlotTypeLabel->setEnabled ( false ); - newprofilewizardcertcontent->Pkcs11ProvidersURLRequester->setURL ( QString ( "/usr/local/lib/libetpkcs11.so" ) ); + newprofilewizardcertcontent->Pkcs11ProvidersURLRequester->setURL ( TQString ( "/usr/local/lib/libetpkcs11.so" ) ); // user - newprofilewizarduserpage = new QHBox ( 0 ); + newprofilewizarduserpage = new TQHBox ( 0 ); // newprofilewizarduserpage->setSpacing(8); - QLabel *setupPixmapContent75 = new QLabel ( newprofilewizarduserpage ); + TQLabel *setupPixmapContent75 = new TQLabel ( newprofilewizarduserpage ); setupPixmapContent75->setPixmap ( *SetupPixmap ); - setupPixmapContent75->resize ( setupPixmapContent75->sizeHint() ); + setupPixmapContent75->resize ( setupPixmapContent75->tqsizeHint() ); newprofilewizarduserpagecontent = new NewProfileWizardUser ( newprofilewizarduserpage ); - newprofilewizarduserpage->sizeHint(); + newprofilewizarduserpage->tqsizeHint(); - connect ( newprofilewizarduserpagecontent->PasswordEdit , SIGNAL ( textChanged ( const QString& ) ), this, SLOT ( userpassToggled ( const QString& ) ) ); - connect ( newprofilewizarduserpagecontent->UsernameLineEdit , SIGNAL ( textChanged ( const QString& ) ), this, SLOT ( usernameToggled ( const QString& ) ) ); - connect ( newprofilewizarduserpagecontent->NtDomainNameCheckbox, SIGNAL ( toggled ( bool ) ), this, SLOT ( domainNameToggled ( bool ) ) ); + connect ( newprofilewizarduserpagecontent->PasswordEdit , TQT_SIGNAL ( textChanged ( const TQString& ) ), this, TQT_SLOT ( userpassToggled ( const TQString& ) ) ); + connect ( newprofilewizarduserpagecontent->UsernameLineEdit , TQT_SIGNAL ( textChanged ( const TQString& ) ), this, TQT_SLOT ( usernameToggled ( const TQString& ) ) ); + connect ( newprofilewizarduserpagecontent->NtDomainNameCheckbox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( domainNameToggled ( bool ) ) ); newprofilewizarduserpagecontent ->NtDomainNameCheckbox->setEnabled ( true ); newprofilewizarduserpagecontent ->NtDomainNameCheckbox->hide(); newprofilewizarduserpagecontent ->NtDomainNameLineedit->hide(); // network - newprofilewizardnetworkpage = new QHBox ( 0 ); + newprofilewizardnetworkpage = new TQHBox ( 0 ); // newprofilewizardnetworkpage->setSpacing(8); - QLabel *setupPixmapContent76 = new QLabel ( newprofilewizardnetworkpage ); + TQLabel *setupPixmapContent76 = new TQLabel ( newprofilewizardnetworkpage ); setupPixmapContent76->setPixmap ( *SetupPixmap ); - setupPixmapContent76->resize ( setupPixmapContent76->sizeHint() ); + setupPixmapContent76->resize ( setupPixmapContent76->tqsizeHint() ); newprofilewizardnetworkcontent = new NewProfileWizardNetwork ( newprofilewizardnetworkpage ); - newprofilewizardnetworkpage->sizeHint(); + newprofilewizardnetworkpage->tqsizeHint(); newprofilewizardnetworkcontent->NetworkDeviceComboBox->insertItem ( "default" ); NetworkInterface iface ( GlobalConfig, GlobalConfig->appPointer ); - QStringList list = iface.getAllNetworkInterfaces(); - for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) - newprofilewizardnetworkcontent->NetworkDeviceComboBox->insertItem ( QString ( *it ) ); + TQStringList list = iface.getAllNetworkInterfaces(); + for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) + newprofilewizardnetworkcontent->NetworkDeviceComboBox->insertItem ( TQString ( *it ) ); newprofilewizardnetworkcontent->MtuSpinbox->hide(); newprofilewizardnetworkcontent->MtuCheckbox->hide(); @@ -663,85 +663,85 @@ void NewProfileWizard::setupPages() newprofilewizardnetworkcontent->TunnelDeviceTypeComboBox->insertItem("tun"); newprofilewizardnetworkcontent->TunnelDeviceTypeComboBox->insertItem("tap"); - connect ( newprofilewizardnetworkcontent->MtuCheckbox, SIGNAL ( toggled ( bool ) ), this, SLOT ( mtuToggled ( bool ) ) ); - connect ( newprofilewizardnetworkcontent->MtuCheckbox, SIGNAL ( toggled ( bool ) ), this, SLOT ( mtuToggled ( bool ) ) ); - connect ( newprofilewizardnetworkcontent->UseRemoteNetworkCheckBox, SIGNAL ( toggled ( bool ) ) , this, SLOT( useRemoteNetworkToggled (bool ))); - connect ( newprofilewizardnetworkcontent->TunnelDeviceTypeComboBox, SIGNAL(activated ( const QString & )),this, SLOT(tunnelDeviceTypeChanged(const QString& ))); + connect ( newprofilewizardnetworkcontent->MtuCheckbox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( mtuToggled ( bool ) ) ); + connect ( newprofilewizardnetworkcontent->MtuCheckbox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( mtuToggled ( bool ) ) ); + connect ( newprofilewizardnetworkcontent->UseRemoteNetworkCheckBox, TQT_SIGNAL ( toggled ( bool ) ) , this, TQT_SLOT( useRemoteNetworkToggled (bool ))); + connect ( newprofilewizardnetworkcontent->TunnelDeviceTypeComboBox, TQT_SIGNAL(activated ( const TQString & )),this, TQT_SLOT(tunnelDeviceTypeChanged(const TQString& ))); // network routes - newprofilewizardnetworkroutepage = new QHBox ( 0 ); + newprofilewizardnetworkroutepage = new TQHBox ( 0 ); // newprofilewizardnetworkroutepage->setSpacing(8); - QLabel *setupPixmapContent761 = new QLabel ( newprofilewizardnetworkroutepage ); + TQLabel *setupPixmapContent761 = new TQLabel ( newprofilewizardnetworkroutepage ); setupPixmapContent761->setPixmap ( *SetupPixmap ); - setupPixmapContent761->resize ( setupPixmapContent761->sizeHint() ); + setupPixmapContent761->resize ( setupPixmapContent761->tqsizeHint() ); newprofilewizardnetworkroutecontent = new ProfileNetworkRouteOptions ( newprofilewizardnetworkroutepage ); - newprofilewizardnetworkroutepage->sizeHint(); + newprofilewizardnetworkroutepage->tqsizeHint(); - connect(newprofilewizardnetworkroutecontent->DefaultRouteComboBox, SIGNAL(activated(const QString&)), this, SLOT(defaultRouteToggled(const QString&))); + connect(newprofilewizardnetworkroutecontent->DefaultRouteComboBox, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(defaultRouteToggled(const TQString&))); newprofilewizardnetworkroutecontent->DefaultRouteComboBox->setCurrentItem(1); // nat - newprofilewizardnatpage = new QHBox ( 0 ); + newprofilewizardnatpage = new TQHBox ( 0 ); // newprofilewizardnatpage->setSpacing(8); - QLabel *setupPixmapContent77 = new QLabel ( newprofilewizardnatpage ); + TQLabel *setupPixmapContent77 = new TQLabel ( newprofilewizardnatpage ); setupPixmapContent77->setPixmap ( *SetupPixmap ); - setupPixmapContent77->resize ( setupPixmapContent77->sizeHint() ); + setupPixmapContent77->resize ( setupPixmapContent77->tqsizeHint() ); newprofilewizardnatcontent = new NewProfileWizardNat ( newprofilewizardnatpage ); - newprofilewizardnatpage->sizeHint(); + newprofilewizardnatpage->tqsizeHint(); newprofilewizardnatcontent->UseUdpCheckbox->setChecked ( true ); newprofilewizardnatcontent->UseNatCheckbox->setChecked ( true ); - connect ( newprofilewizardnatcontent->UseNatCheckbox, SIGNAL ( toggled ( bool ) ), this, SLOT ( useNatToggled ( bool ) ) ); - connect ( newprofilewizardnatcontent->UdpPortCheckbox, SIGNAL ( toggled ( bool ) ), this, SLOT ( udpPortToggled ( bool ) ) ); + connect ( newprofilewizardnatcontent->UseNatCheckbox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( useNatToggled ( bool ) ) ); + connect ( newprofilewizardnatcontent->UdpPortCheckbox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( udpPortToggled ( bool ) ) ); useNatToggled(true); // connectionstatuscheck - newprofilewizardconnectionstatuscheckpage = new QHBox ( 0 ); + newprofilewizardconnectionstatuscheckpage = new TQHBox ( 0 ); // newprofilewizardconnectionstatuscheckpage->setSpacing(8); - QLabel *setupPixmapContent79 = new QLabel ( newprofilewizardconnectionstatuscheckpage ); + TQLabel *setupPixmapContent79 = new TQLabel ( newprofilewizardconnectionstatuscheckpage ); setupPixmapContent79->setPixmap ( *SetupPixmap ); - setupPixmapContent79->resize ( setupPixmapContent79->sizeHint() ); + setupPixmapContent79->resize ( setupPixmapContent79->tqsizeHint() ); newprofilewizardconnectionstatuscheckcontent = new NewProfileWizardConnectionStatusCheck ( newprofilewizardconnectionstatuscheckpage ); - newprofilewizardconnectionstatuscheckpage->sizeHint(); + newprofilewizardconnectionstatuscheckpage->tqsizeHint(); insertPage ( newprofilewizardconnectionstatuscheckpage, "" + i18n ( "Connection status check" ) + "", -1 ); - connect ( newprofilewizardconnectionstatuscheckcontent->PingUserdefiniedAddressCheckBox, SIGNAL ( toggled ( bool ) ), this, SLOT ( pingIpAfterConnectToggled ( bool ) ) ); - connect ( newprofilewizardconnectionstatuscheckcontent->UseConnectionStatusCheckCheckBox, SIGNAL ( toggled ( bool ) ), this, SLOT ( connectionStatusCheckToggled ( bool ) ) ); + connect ( newprofilewizardconnectionstatuscheckcontent->PingUserdefiniedAddressCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( pingIpAfterConnectToggled ( bool ) ) ); + connect ( newprofilewizardconnectionstatuscheckcontent->UseConnectionStatusCheckCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( connectionStatusCheckToggled ( bool ) ) ); // connectoptions - newprofilewizardconnectoptionspage = new QHBox ( 0 ); + newprofilewizardconnectoptionspage = new TQHBox ( 0 ); // newprofilewizardconnectoptionspage->setSpacing(8); - QLabel *setupPixmapContent80 = new QLabel ( newprofilewizardconnectoptionspage ); + TQLabel *setupPixmapContent80 = new TQLabel ( newprofilewizardconnectoptionspage ); setupPixmapContent80->setPixmap ( *SetupPixmap ); - setupPixmapContent80->resize ( setupPixmapContent80->sizeHint() ); + setupPixmapContent80->resize ( setupPixmapContent80->tqsizeHint() ); newprofilewizardconnectoptionscontent = new NewProfileWizardConnectOptions ( newprofilewizardconnectoptionspage ); - newprofilewizardconnectoptionspage->sizeHint(); + newprofilewizardconnectoptionspage->tqsizeHint(); newprofilewizardconnectoptionscontent->DoAutoConnectCheckBox->hide(); //TODO later newprofilewizardconnectoptionscontent->AutoConnectProfileComboBox->hide(); //TODO_ later insertPage ( newprofilewizardconnectoptionspage, "" + i18n ( "Connect options" ) + "", -1 ); // general - newprofilewizardgeneralpage = new QHBox ( 0 ); + newprofilewizardgeneralpage = new TQHBox ( 0 ); // newprofilewizardgeneralpage->setSpacing(8); - QLabel *setupPixmapContent78 = new QLabel ( newprofilewizardgeneralpage ); + TQLabel *setupPixmapContent78 = new TQLabel ( newprofilewizardgeneralpage ); setupPixmapContent78->setPixmap ( *SetupPixmap ); - setupPixmapContent78->resize ( setupPixmapContent78->sizeHint() ); + setupPixmapContent78->resize ( setupPixmapContent78->tqsizeHint() ); newprofilewizardgeneralpagecontent = new NewProfileWizardGeneral ( newprofilewizardgeneralpage ); - newprofilewizardgeneralpage->sizeHint(); + newprofilewizardgeneralpage->tqsizeHint(); insertPage ( newprofilewizardgeneralpage, "" + i18n ( "General settings" ) + "", -1 ); // setup end page - endpage = new QHBox ( 0 ); + endpage = new TQHBox ( 0 ); // endpage->setSpacing(8); - QLabel *setupPixmapContent11 = new QLabel ( endpage ); + TQLabel *setupPixmapContent11 = new TQLabel ( endpage ); setupPixmapContent11->setPixmap ( *SetupPixmapFinal ); - setupPixmapContent11->resize ( setupPixmapContent11->sizeHint() ); - QLabel *endpagecontent = new QLabel ( endpage ); + setupPixmapContent11->resize ( setupPixmapContent11->tqsizeHint() ); + TQLabel *endpagecontent = new TQLabel ( endpage ); endpagecontent->setMargin ( 11 ); endpagecontent->setText ( i18n ( "Now you have completed all steps for creating a new profile.\nClick \"Finish\" to continue." ) ); - endpagecontent->setMaximumSize ( endpagecontent->sizeHint() ); - endpage->sizeHint(); + endpagecontent->setMaximumSize ( endpagecontent->tqsizeHint() ); + endpage->tqsizeHint(); insertPage ( endpage, "" + i18n ( "Finish" ) + "", -1 ); // last page } @@ -749,7 +749,7 @@ void NewProfileWizard::next () { // called at each finish of a page bool ok = true; - QString msg = i18n ( "Please fill in all fields!" ); + TQString msg = i18n ( "Please fill in all fields!" ); if ( currentpage == page1 ) { @@ -765,7 +765,7 @@ void NewProfileWizard::next () } else { - QString Name = newprofilewizardgeneralpagecontent->NameLineEdit->text(); + TQString Name = newprofilewizardgeneralpagecontent->NameLineEdit->text(); bool nameOk = true; @@ -795,11 +795,11 @@ void NewProfileWizard::next () { if ( it->getName() == Name ) { - //account->setName( QString( account->getName() + "_2" ) ); - // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).arg( account->getName() ), i18n( "Name exist, renamed" ) ); + //account->setName( TQString( account->getName() + "_2" ) ); + // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).tqarg( account->getName() ), i18n( "Name exist, renamed" ) ); KMessageBox::error ( this, i18n ( "Profile name exists!" ), i18n ( "Name Exists" ) ); - QString newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), QString ( Name += "_2" ), &ok ); + TQString newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), TQString ( Name += "_2" ), &ok ); if ( !Name.isEmpty() ) { @@ -1011,7 +1011,7 @@ void NewProfileWizard::next () newprofilewizardracoonpagecontent->AuthenticationAlgorithm2ComboBox->setCurrentText( "hmac_md5" ); - for ( QStringList::Iterator it = KernelCrypto.IpsecEspEncryptionAlgorithms.begin(); it != KernelCrypto.IpsecEspEncryptionAlgorithms.end(); ++it ) + for ( TQStringList::Iterator it = KernelCrypto.IpsecEspEncryptionAlgorithms.begin(); it != KernelCrypto.IpsecEspEncryptionAlgorithms.end(); ++it ) { newprofilewizardracoonpagecontent->EncryptionAlgorithm2ComboBox->insertItem ( *it ); } @@ -1085,22 +1085,22 @@ void NewProfileWizard::next () newprofilewizardracoonpagecontent->AuthenticationAlgorithm2ComboBox->insertItem( "hmac_sha512" ); newprofilewizardracoonpagecontent->AuthenticationAlgorithm2ComboBox->insertItem( "non_auth" ); -// for ( QStringList::Iterator it = KernelCrypto.IpsecIkeEncryptionAlgorithms.begin(); it != KernelCrypto.IpsecIkeEncryptionAlgorithms.end(); ++it ) +// for ( TQStringList::Iterator it = KernelCrypto.IpsecIkeEncryptionAlgorithms.begin(); it != KernelCrypto.IpsecIkeEncryptionAlgorithms.end(); ++it ) // { // newprofilewizardracoonpagecontent->EncryptionAlgorithmComboBox->insertItem ( *it ); // } // -// for ( QStringList::Iterator it = KernelCrypto.IpsecIkeHashAlgorithms.begin(); it != KernelCrypto.IpsecIkeHashAlgorithms.end(); ++it ) +// for ( TQStringList::Iterator it = KernelCrypto.IpsecIkeHashAlgorithms.begin(); it != KernelCrypto.IpsecIkeHashAlgorithms.end(); ++it ) // { // newprofilewizardracoonpagecontent->HashAlgoComboBox->insertItem ( *it ); // } - for ( QStringList::Iterator it = KernelCrypto.IpsecEspEncryptionAlgorithms.begin(); it != KernelCrypto.IpsecEspEncryptionAlgorithms.end(); ++it ) + for ( TQStringList::Iterator it = KernelCrypto.IpsecEspEncryptionAlgorithms.begin(); it != KernelCrypto.IpsecEspEncryptionAlgorithms.end(); ++it ) { newprofilewizardracoonpagecontent->EncryptionAlgorithm2ComboBox->insertItem ( *it ); } -// for ( QStringList::Iterator it = KernelCrypto.IpsecEspAuthenticationAlgorithms.begin(); it != KernelCrypto.IpsecEspAuthenticationAlgorithms.end(); ++it ) +// for ( TQStringList::Iterator it = KernelCrypto.IpsecEspAuthenticationAlgorithms.begin(); it != KernelCrypto.IpsecEspAuthenticationAlgorithms.end(); ++it ) // { // newprofilewizardracoonpagecontent->AuthenticationAlgorithm2ComboBox->insertItem ( *it ); // } @@ -1189,7 +1189,7 @@ void NewProfileWizard::next () insertPage ( newprofilewizardopenvpnauthpage, "" + i18n ( "OpenVPN authentication settings" ) + "", indexOf ( currentpage ) + 1 ); - connect ( newprofilewizardopenvpnauthpagecontent->AuthWithUsernameAndPasswordCheckBox, SIGNAL ( toggled ( bool ) ), this, SLOT ( authenticateWithUsernameAndPasswordToggled ( bool ) ) ); + connect ( newprofilewizardopenvpnauthpagecontent->AuthWithUsernameAndPasswordCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( authenticateWithUsernameAndPasswordToggled ( bool ) ) ); newprofilewizardopenvpnauthpagecontent->UserdefiniedDigestComboBox->setCurrentText ( "SHA1" ); @@ -1326,8 +1326,8 @@ void NewProfileWizard::next () } - QString type = ""; // visible name - QString bin = ""; // executable name + TQString type = ""; // visible name + TQString bin = ""; // executable name if ( profileData->getConnectionType() == VpnAccountData::cisco ) { type = "vpnc"; @@ -1407,8 +1407,8 @@ void NewProfileWizard::next () if ( type == "ipsec" ) { - QString realversion = it->Version.section ( ' ', 1, 1 ).section ( '/', 0, 0 ).right ( it->Version.section ( ' ', 1, 1 ).section ( '/', 0, 0 ).length() - 1 ); - QString realtype = it->Version.section ( ' ', 0, 0 ).lower(); + TQString realversion = it->Version.section ( ' ', 1, 1 ).section ( '/', 0, 0 ).right ( it->Version.section ( ' ', 1, 1 ).section ( '/', 0, 0 ).length() - 1 ); + TQString realtype = it->Version.section ( ' ', 0, 0 ).lower(); if ( realversion.find ( "1.", 0, -1 ) > -1 ) { @@ -1635,8 +1635,8 @@ void NewProfileWizard::next () // ike + esp - QStringList IkeList; - QStringList EspList; + TQStringList IkeList; + TQStringList EspList; if (newprofilewizardfreeswanpagecontent->IkeAes256Sha1CheckBox->isChecked()) IkeList.append("aes256-sha1"); @@ -1664,17 +1664,17 @@ void NewProfileWizard::next () if (!newprofilewizardfreeswanpagecontent->OtherEspLineEdit->text().isEmpty()) EspList.append(newprofilewizardfreeswanpagecontent->OtherEspLineEdit->text()); -// for ( QStringList::Iterator ikeit = IkeList.begin(); ikeit != IkeList.end(); ++ikeit ) +// for ( TQStringList::Iterator ikeit = IkeList.begin(); ikeit != IkeList.end(); ++ikeit ) // std::cout << "ike: " << *ikeit << ":" << std::endl; -// for ( QStringList::Iterator espit = EspList.begin(); espit != EspList.end(); ++espit ) +// for ( TQStringList::Iterator espit = EspList.begin(); espit != EspList.end(); ++espit ) // std::cout << "esp: " << *espit << ":" << std::endl; if(newprofilewizardfreeswanpagecontent->UseCustomEspCheckBox->isChecked() && !EspList.isEmpty()) { profileData->setUseCustomEsp(true); if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry ( i18n ( "Use custom %1: %2" ).arg ( i18n("ESP") ).arg(i18n("yes")), KVpncConfig::debug ); + GlobalConfig->appendLogEntry ( i18n ( "Use custom %1: %2" ).arg ( i18n("ESP") ).tqarg(i18n("yes")), KVpncConfig::debug ); profileData->setIpsecEsp(EspList.join(",")); @@ -1692,14 +1692,14 @@ void NewProfileWizard::next () { profileData->setUseCustomEsp(false); if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry ( i18n ( "Use custom %1: %2" ).arg ( i18n("ESP") ).arg(i18n("no")), KVpncConfig::debug ); + GlobalConfig->appendLogEntry ( i18n ( "Use custom %1: %2" ).arg ( i18n("ESP") ).tqarg(i18n("no")), KVpncConfig::debug ); } if(newprofilewizardfreeswanpagecontent->UseCustomIkeCheckBox->isChecked() && !IkeList.isEmpty()) { profileData->setUseCustomIke(true); if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry ( i18n ( "Use custom %1: %2" ).arg ( i18n("IKE") ).arg(i18n("yes")), KVpncConfig::debug ); + GlobalConfig->appendLogEntry ( i18n ( "Use custom %1: %2" ).arg ( i18n("IKE") ).tqarg(i18n("yes")), KVpncConfig::debug ); profileData->setIpsecIke(IkeList.join(",")); @@ -1717,7 +1717,7 @@ void NewProfileWizard::next () { profileData->setUseCustomIke(false); if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry ( i18n ( "Use custom %1: %2" ).arg ( i18n("IKE") ).arg(i18n("false")), KVpncConfig::debug ); + GlobalConfig->appendLogEntry ( i18n ( "Use custom %1: %2" ).arg ( i18n("IKE") ).tqarg(i18n("false")), KVpncConfig::debug ); } if (ok) @@ -1978,7 +1978,7 @@ void NewProfileWizard::next () profileData->setAuthType ( VpnAccountData::cert ); newprofilewizardcertcontent->x509certURLRequester->show(); - newprofilewizardcertcontent->x509certURLRequester->sizeHint(); + newprofilewizardcertcontent->x509certURLRequester->tqsizeHint(); newprofilewizardcertcontent->x509certComboBox->hide(); @@ -2041,7 +2041,7 @@ void NewProfileWizard::next () newprofilewizardcertcontent->LabelPrivateKeyPath->hide(); newprofilewizardcertcontent->privkeypathURLRequester->hide(); newprofilewizardcertcontent->LabelCaCertificatePath->hide(); - newprofilewizardcertcontent->CertificateGroupBox->resize(newprofilewizardcertcontent->CertificateGroupBox->sizeHint()); + newprofilewizardcertcontent->CertificateGroupBox->resize(newprofilewizardcertcontent->CertificateGroupBox->tqsizeHint()); insertPage ( newprofilewizardcertpage, "" + i18n ( "Certificate settings" ) + "", indexOf ( currentpage ) + 1 ); @@ -2064,7 +2064,7 @@ void NewProfileWizard::next () // newprofilewizardcertcontent->LabelCertificate->setText(i18n("Certificate (enter name here):")); newprofilewizardcertcontent->x509certURLRequester->hide(); newprofilewizardcertcontent->x509certComboBox->show(); - newprofilewizardcertcontent->x509certComboBox->sizeHint(); + newprofilewizardcertcontent->x509certComboBox->tqsizeHint(); newprofilewizardcertcontent->x509certComboBox->setCurrentItem(0); } @@ -2331,7 +2331,7 @@ void NewProfileWizard::next () if ( newprofilewizardvtunpagecontent->PortCheckbox->isChecked() ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry ( i18n ( "Vtun: use userdefined port: %1" ).arg ( QString().setNum ( newprofilewizardvtunpagecontent->PortSpinbox->value() ) ), KVpncConfig::debug ); + GlobalConfig->appendLogEntry ( i18n ( "Vtun: use userdefined port: %1" ).arg ( TQString().setNum ( newprofilewizardvtunpagecontent->PortSpinbox->value() ) ), KVpncConfig::debug ); } if ( newprofilewizardvtunpagecontent->VtunProfileLineEdit->text().isEmpty() ) @@ -2353,7 +2353,7 @@ void NewProfileWizard::next () if ( newprofilewizardsshpagecontent->UseUserdefinedRemotePortCheckBox->isChecked() ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry ( i18n ( "SSH: use userdefined port: %1" ).arg ( QString().setNum ( newprofilewizardsshpagecontent->UserdefinedRemotePortSpinBox->value() ) ), KVpncConfig::debug ); + GlobalConfig->appendLogEntry ( i18n ( "SSH: use userdefined port: %1" ).arg ( TQString().setNum ( newprofilewizardsshpagecontent->UserdefinedRemotePortSpinBox->value() ) ), KVpncConfig::debug ); } // password or key auth @@ -2377,13 +2377,13 @@ void NewProfileWizard::next () profileData->setPskIsInFile(newprofilewizardsshpagecontent->CostumKeyRadioButton->isChecked()); profileData->setPreSharedKeyFile(newprofilewizardsshpagecontent->CostumkeyURLRequester->url()); if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry ( i18n ( "SSH: use costum key: %1" ).arg(newprofilewizardsshpagecontent->CostumkeyURLRequester->url()) , KVpncConfig::debug ); + GlobalConfig->appendLogEntry ( i18n ( "SSH: use costum key: %1" ).tqarg(newprofilewizardsshpagecontent->CostumkeyURLRequester->url()) , KVpncConfig::debug ); } else { profileData->setPreSharedKey(newprofilewizardsshpagecontent->SshKeyComboBox->currentText()); if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry ( i18n ( "SSH: use autotected key: %1" ).arg(newprofilewizardsshpagecontent->SshKeyComboBox->currentText()) , KVpncConfig::debug ); + GlobalConfig->appendLogEntry ( i18n ( "SSH: use autotected key: %1" ).tqarg(newprofilewizardsshpagecontent->SshKeyComboBox->currentText()) , KVpncConfig::debug ); } if (newprofilewizardsshpagecontent->UseSshConfigRemoteScriptCheckBox->isChecked() && !newprofilewizardsshpagecontent->SshConfigRemoteScriptLineEdit->text().isEmpty()) @@ -2392,7 +2392,7 @@ void NewProfileWizard::next () profileData->setSshConfigRemoteScript(newprofilewizardsshpagecontent->SshConfigRemoteScriptLineEdit->text()); if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry ( i18n ( "SSH: use ssh config remote script: %1" ).arg(newprofilewizardsshpagecontent->SshConfigRemoteScriptLineEdit->text()) , KVpncConfig::debug ); + GlobalConfig->appendLogEntry ( i18n ( "SSH: use ssh config remote script: %1" ).tqarg(newprofilewizardsshpagecontent->SshConfigRemoteScriptLineEdit->text()) , KVpncConfig::debug ); } else @@ -2402,7 +2402,7 @@ void NewProfileWizard::next () { ok = false; msg += "- " + i18n ( "Special server certificate" ) + "\n"; - GlobalConfig->appendLogEntry( i18n( "%1 cant be empty!" ).arg(i18n("ssh config remote script")), GlobalConfig->error); + GlobalConfig->appendLogEntry( i18n( "%1 cant be empty!" ).tqarg(i18n("ssh config remote script")), GlobalConfig->error); } } @@ -2410,12 +2410,12 @@ void NewProfileWizard::next () { msg = i18n ( "These fields must be filled in:\n" ); bool IPOk=true; - QString wrongAddress=""; + TQString wrongAddress=""; ok = true; if ( profilenetworkvirtualipoptionscontent->UseVirtualIPCheckBox->isChecked() && !profilenetworkvirtualipoptionscontent->LocalVirtualIpEdit->text().isEmpty() ) { - QString LocalVirtualIp = profilenetworkvirtualipoptionscontent->LocalVirtualIpEdit->text(); + TQString LocalVirtualIp = profilenetworkvirtualipoptionscontent->LocalVirtualIpEdit->text(); if ( Utils ( GlobalConfig ).isValidIPv4Address ( LocalVirtualIp ) == false ) { // KMessageBox::error ( this, i18n( "No valid IP address for local IP address entered!" ), i18n( "No Valid IP Address" ) ); @@ -2441,7 +2441,7 @@ void NewProfileWizard::next () { if ( profilenetworkvirtualipoptionscontent->UseVirtualIPCheckBox->isChecked() && !profilenetworkvirtualipoptionscontent->RemoteVirtualIpLineEdit->text().isEmpty() ) { - QString RemoteVirtualIp = profilenetworkvirtualipoptionscontent->RemoteVirtualIpLineEdit->text(); + TQString RemoteVirtualIp = profilenetworkvirtualipoptionscontent->RemoteVirtualIpLineEdit->text(); if ( Utils ( GlobalConfig ).isValidIPv4Address ( RemoteVirtualIp ) == false ) { @@ -2467,7 +2467,7 @@ void NewProfileWizard::next () } if (profileData->getTunnelDeviceType() == "tap") { - QString RemoteVirtualIp = profilenetworkvirtualipoptionscontent->RemoteVirtualIpLineEdit->text(); + TQString RemoteVirtualIp = profilenetworkvirtualipoptionscontent->RemoteVirtualIpLineEdit->text(); if (Utils( GlobalConfig ).isValidIPv4Netmask (RemoteVirtualIp) == false) { KMessageBox::error ( this, i18n( "No valid netmask entered!" ), i18n( "No valid netmask" ) ); @@ -2667,7 +2667,7 @@ void NewProfileWizard::next () // GlobalConfig->appendLogEntry( i18n( "ID for certificate at smartcard can't be empty!" ) ,GlobalConfig->error); ok = false; } - QString Pkcs11SlotType = newprofilewizardcertcontent->Pkcs11SlotTypeComboBox->currentText(); + TQString Pkcs11SlotType = newprofilewizardcertcontent->Pkcs11SlotTypeComboBox->currentText(); if ( Pkcs11SlotType == i18n ( "ID" ) ) profileData->setPkcs11SlotType ( "id" ); else if ( Pkcs11SlotType == i18n ( "Name" ) ) @@ -2675,7 +2675,7 @@ void NewProfileWizard::next () else profileData->setPkcs11SlotType ( "label" ); - QString Pkcs11IdType = newprofilewizardcertcontent->Pkcs11IdTypeComboBox->currentText(); + TQString Pkcs11IdType = newprofilewizardcertcontent->Pkcs11IdTypeComboBox->currentText(); if ( Pkcs11IdType == i18n ( "ID" ) ) profileData->setPkcs11IdType ( "id" ); else if ( Pkcs11IdType == i18n ( "Label" ) ) @@ -2683,7 +2683,7 @@ void NewProfileWizard::next () else profileData->setPkcs11IdType ( "subject" ); - QString Pkcs11SignMode = newprofilewizardcertcontent->Pkcs11SignModeComboBox->currentText(); + TQString Pkcs11SignMode = newprofilewizardcertcontent->Pkcs11SignModeComboBox->currentText(); if ( Pkcs11SignMode == i18n ( "auto" ) ) profileData->setPkcs11SignMode ( "auto" ); else if ( Pkcs11SignMode == i18n ( "sign" ) ) @@ -2789,17 +2789,17 @@ void NewProfileWizard::next () } else { - QString addr = newprofilewizardnetworkcontent->RemoteNetAddrLineEdit->text(); + TQString addr = newprofilewizardnetworkcontent->RemoteNetAddrLineEdit->text(); int part0 = addr.section ( '.', 0, 0 ).toInt(); int part1 = addr.section ( '.', 1, 1 ).toInt(); int part2 = addr.section ( '.', 2, 2 ).toInt(); int part3 = addr.section ( '.', 3, 3 ).toInt(); /* - LogOutput->append ("part0: "+QString().setNum(part0)); - LogOutput->append ("part1: "+QString().setNum(part1)); - LogOutput->append ("part2: "+QString().setNum(part2)); - LogOutput->append ("part3: "+QString().setNum(part3)); + LogOutput->append ("part0: "+TQString().setNum(part0)); + LogOutput->append ("part1: "+TQString().setNum(part1)); + LogOutput->append ("part2: "+TQString().setNum(part2)); + LogOutput->append ("part3: "+TQString().setNum(part3)); */ if ( ( part0 < 1 || part0 > 254 ) || ( part1 < 0 || part1 > 254 ) || ( part2 < 0 || part2 > 254 ) || ( part3 < 0 || part3 > 254 ) ) @@ -2813,7 +2813,7 @@ void NewProfileWizard::next () if ( validAddr == true ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry ( i18n ( "Use remote network: %1/%2" ).arg ( addr ).arg(newprofilewizardnetworkcontent->RemoteNetMaskComboBox->currentText()), KVpncConfig::debug ); + GlobalConfig->appendLogEntry ( i18n ( "Use remote network: %1/%2" ).arg ( addr ).tqarg(newprofilewizardnetworkcontent->RemoteNetMaskComboBox->currentText()), KVpncConfig::debug ); profileData->setUseRemoteNetwork(true); profileData->setRemoteNetAddr ( addr ); profileData->setRemoteNetMask ( newprofilewizardnetworkcontent->RemoteNetMaskComboBox->currentText() ); @@ -2886,13 +2886,13 @@ void NewProfileWizard::next () if ( GlobalConfig->KvpncDebugLevel > 1 ) GlobalConfig->appendLogEntry ( i18n ( "Network route options: use additional network routes" ) , GlobalConfig->debug ); - QStringList AdditionalNetworkRoutes; - QListViewItemIterator it ( newprofilewizardnetworkroutecontent->NetworkListView ); + TQStringList AdditionalNetworkRoutes; + TQListViewItemIterator it ( newprofilewizardnetworkroutecontent->NetworkListView ); for ( ; it.current(); ++it ) { // example entry: // /# - QString network = QString ( it.current() ->text ( 0 ) + "/" + it.current() ->text ( 1 ) ); + TQString network = TQString ( it.current() ->text ( 0 ) + "/" + it.current() ->text ( 1 ) ); network.append ( "#" ); network.append ( it.current() ->text ( 2 ) ); // gateway network.append ( "#" ); @@ -2924,7 +2924,7 @@ void NewProfileWizard::next () GlobalConfig->appendLogEntry ( i18n ( "NAT settings: use UDP" ), KVpncConfig::debug ); if ( profileData->getUseUdpPort() ) - GlobalConfig->appendLogEntry ( i18n ( "NAT settings: use userdefined Port: %1" ).arg ( QString().setNum ( profileData->getUdpPort() ) ), KVpncConfig::debug ); + GlobalConfig->appendLogEntry ( i18n ( "NAT settings: use userdefined Port: %1" ).arg ( TQString().setNum ( profileData->getUdpPort() ) ), KVpncConfig::debug ); } @@ -2985,8 +2985,8 @@ void NewProfileWizard::next () if ( GlobalConfig->KvpncDebugLevel > 0 ) { - GlobalConfig->appendLogEntry ( i18n ( "Connection status check: use connection interval: %1" ).arg ( QString().setNum ( newprofilewizardconnectionstatuscheckcontent->ConnectionStatusCheckIntervalNumInput->value() ) ), KVpncConfig::debug ); - GlobalConfig->appendLogEntry ( i18n ( "Connection status check: success count: %1" ).arg ( QString().setNum ( newprofilewizardconnectionstatuscheckcontent->ConnectionStatusSuccessCountNumInput->value() ) ), KVpncConfig::debug ); + GlobalConfig->appendLogEntry ( i18n ( "Connection status check: use connection interval: %1" ).arg ( TQString().setNum ( newprofilewizardconnectionstatuscheckcontent->ConnectionStatusCheckIntervalNumInput->value() ) ), KVpncConfig::debug ); + GlobalConfig->appendLogEntry ( i18n ( "Connection status check: success count: %1" ).arg ( TQString().setNum ( newprofilewizardconnectionstatuscheckcontent->ConnectionStatusSuccessCountNumInput->value() ) ), KVpncConfig::debug ); } if ( newprofilewizardconnectionstatuscheckcontent->UseConnectionStatusCheckCheckBox->isChecked() ) @@ -3016,7 +3016,7 @@ void NewProfileWizard::next () if ( ok ) { previouspage = currentpage; - QWizard::next(); + TQWizard::next(); } else { @@ -3137,10 +3137,10 @@ void NewProfileWizard::back() newprofilewizardnatcontent->UdpPortSpinbox->setValue(profileData->getUdpPort()); } */ - QWizard::back(); + TQWizard::back(); } -QString NewProfileWizard::getName() +TQString NewProfileWizard::getName() { return profileData->getName(); } @@ -3155,10 +3155,10 @@ bool NewProfileWizard::getFinished() // // } -void NewProfileWizard::showPage ( QWidget* page ) +void NewProfileWizard::showPage ( TQWidget* page ) { currentpage = page; - QWizard::showPage ( page ); + TQWizard::showPage ( page ); // FIXME set currentpage at back() @@ -3173,7 +3173,7 @@ void NewProfileWizard::showPage ( QWidget* page ) } } -void NewProfileWizard::dataChanged ( const QString & ) +void NewProfileWizard::dataChanged ( const TQString & ) { // if ( !firstName->text().isEmpty() && // !lastName->text().isEmpty() && @@ -3441,19 +3441,19 @@ bool NewProfileWizard::importCertificate() dlg.exec(); importOK = dlg.importOk; - QString filename = dlg.filename; + TQString filename = dlg.filename; if ( importOK ) { - QString certpath = dlg.certpath; - QString CertFullPath = dlg.CertFullPath; - QString CaCertFullPath = dlg.CaCertFullPath; - QString importpassword = dlg.main->ImportPasswordEdit->text(); - QString privatekeypassword = dlg.main->PrivateKeyPasswordEdit->password(); - QString certificate = QString ( "mykeys_" + dlg.certName + ".pem" ); - QString privatekey = QString ( dlg.certName + ".pem" ); + TQString certpath = dlg.certpath; + TQString CertFullPath = dlg.CertFullPath; + TQString CaCertFullPath = dlg.CaCertFullPath; + TQString importpassword = dlg.main->ImportPasswordEdit->text(); + TQString privatekeypassword = dlg.main->PrivateKeyPasswordEdit->password(); + TQString certificate = TQString ( "mykeys_" + dlg.certName + ".pem" ); + TQString privatekey = TQString ( dlg.certName + ".pem" ); - QString certpostfix = ""; - QString privatepostfix = ""; + TQString certpostfix = ""; + TQString privatepostfix = ""; if ( profileData->getConnectionType() == VpnAccountData::freeswan || profileData->getConnectionType() == VpnAccountData::l2tpd_freeswan ) { @@ -3505,7 +3505,7 @@ void NewProfileWizard::authenticateWithUsernameAndPasswordToggled ( bool ) newprofilewizardopenvpnauthpagecontent->UseOnlyCaCertAndUserAuthCheckBox->setEnabled ( false ); } -void NewProfileWizard::pskInputToggled ( const QString& ) +void NewProfileWizard::pskInputToggled ( const TQString& ) { if ( !newprofilewizardpskcontent->PSKLineEdit->text().isEmpty() ) newprofilewizardpskcontent->CheckSavePsk->setChecked ( true ); @@ -3513,7 +3513,7 @@ void NewProfileWizard::pskInputToggled ( const QString& ) newprofilewizardpskcontent->CheckSavePsk->setChecked ( false ); } -void NewProfileWizard::userpassToggled ( const QString& ) +void NewProfileWizard::userpassToggled ( const TQString& ) { if ( !newprofilewizarduserpagecontent->PasswordEdit->text().isEmpty() ) newprofilewizarduserpagecontent->CheckUserPass->setChecked ( true ); @@ -3521,7 +3521,7 @@ void NewProfileWizard::userpassToggled ( const QString& ) newprofilewizarduserpagecontent->CheckUserPass->setChecked ( false ); } -void NewProfileWizard::usernameToggled ( const QString& ) +void NewProfileWizard::usernameToggled ( const TQString& ) { // if (newprofilewizarduserpagecontent->UsernameLineEdit->text().isEmpty()) // newprofilewizarduserpagecontent->DontSaveUsernameCheckBox->setChecked(true); @@ -3529,7 +3529,7 @@ void NewProfileWizard::usernameToggled ( const QString& ) // newprofilewizarduserpagecontent->DontSaveUsernameCheckBox->setChecked(false); } -void NewProfileWizard::pskToggled ( const QString& ) +void NewProfileWizard::pskToggled ( const TQString& ) { if ( !newprofilewizardciscomanuallypagecontent->GroupPasswordLineEdit->text().isEmpty() ) newprofilewizardciscomanuallypagecontent->CheckSavePsk->setChecked ( true ); @@ -3573,11 +3573,11 @@ void NewProfileWizard::delNetworkRouteClicked() { if ( newprofilewizardnetworkroutecontent->NetworkListView->childCount() > 0 && newprofilewizardnetworkroutecontent->NetworkListView->currentItem() != 0 ) { - QListViewItem * item = newprofilewizardnetworkroutecontent->NetworkListView->currentItem(); - QString Network = item->text ( 0 ); - QString Netmask = item->text ( 1 ); + TQListViewItem * item = newprofilewizardnetworkroutecontent->NetworkListView->currentItem(); + TQString Network = item->text ( 0 ); + TQString Netmask = item->text ( 1 ); int result = KMessageBox::questionYesNo ( this, i18n ( "Do you really want to delete the network \"%1/%2\"?" ).arg ( Network ).arg ( Netmask ), i18n ( "Delete?" ) ); - //LogOutput->append( "Result: "+ QString().setNum(result) ) ; + //LogOutput->append( "Result: "+ TQString().setNum(result) ) ; if ( result == 3 ) // Yes { newprofilewizardnetworkroutecontent->NetworkListView->removeItem ( item ); @@ -3602,13 +3602,13 @@ void NewProfileWizard::addNetworkRouteClicked() if ( dlg.exec() ) { - QString gateway = dlg.getGateway(); - QString interface = dlg.getInterface(); + TQString gateway = dlg.getGateway(); + TQString interface = dlg.getInterface(); if ( !dlg.getUseGateway() ) gateway = "-"; if ( !dlg.getUseInterface() ) interface = "-"; - newprofilewizardnetworkroutecontent->NetworkListView->insertItem ( new QListViewItem ( newprofilewizardnetworkroutecontent->NetworkListView, dlg.getNetwork(), dlg.getNetmask(), gateway, interface ) ); + newprofilewizardnetworkroutecontent->NetworkListView->insertItem ( new TQListViewItem ( newprofilewizardnetworkroutecontent->NetworkListView, dlg.getNetwork(), dlg.getNetmask(), gateway, interface ) ); } } @@ -3650,7 +3650,7 @@ void NewProfileWizard::useSmartcardToggled ( bool ) // } // IpsecToolInfo.collectToolInfo(); // if (IpsecToolInfo.Version.contains("Openswan") || IpsecToolInfo.Version.contains("Free")) -// KMessageBox::information(0,i18n("%1 (IPSec) currently has no working smartcard support (pkcs11). Please use strongSwan instead with enabled smartcard support.").arg(IpsecToolInfo.Version.section(' ',0,0)),i18n("Unsupported IPSec version")); +// KMessageBox::information(0,i18n("%1 (IPSec) currently has no working smartcard support (pkcs11). Please use strongSwan instead with enabled smartcard support.").tqarg(IpsecToolInfo.Version.section(' ',0,0)),i18n("Unsupported IPSec version")); // } } @@ -3687,7 +3687,7 @@ void NewProfileWizard::useSmartcardOnCertFormateToggled ( bool ) // } // IpsecToolInfo.collectToolInfo(); // if (IpsecToolInfo.Version.contains("Openswan") || IpsecToolInfo.Version.contains("Free")) -// KMessageBox::information(0,i18n("%1 (IPSec) currently has no working smartcard support (pkcs11). Please use strongSwan instead with enabled smartcard support.").arg(IpsecToolInfo.Version.section(' ',0,0)),i18n("Unsupported IPSec version")); +// KMessageBox::information(0,i18n("%1 (IPSec) currently has no working smartcard support (pkcs11). Please use strongSwan instead with enabled smartcard support.").tqarg(IpsecToolInfo.Version.section(' ',0,0)),i18n("Unsupported IPSec version")); // } } else @@ -3716,11 +3716,11 @@ void NewProfileWizard::idTypeToggled() void NewProfileWizard::detectPkcs11Ids() { - GlobalConfig->appPointer->setOverrideCursor ( QCursor ( Qt::WaitCursor ) ); + GlobalConfig->appPointer->setOverrideCursor ( TQCursor ( TQt::WaitCursor ) ); newprofilewizardcertcontent->Pkcs11IdComboBox->clear(); int Pkcs11IdType = newprofilewizardcertcontent->Pkcs11IdTypeComboBox->currentItem(); - QString Pkcs11IdTypeTmp; + TQString Pkcs11IdTypeTmp; if ( Pkcs11IdType == 0 ) { Pkcs11IdTypeTmp = "id"; @@ -3741,16 +3741,16 @@ void NewProfileWizard::detectPkcs11Ids() GlobalConfig->appendLogEntry ( i18n ( "Pkcs11IdType: %1" ).arg ( Pkcs11IdTypeTmp ), KVpncConfig::debug ); } - QString ProviderLib = ""; + TQString ProviderLib = ""; if ( newprofilewizardcertcontent->UsePkcs11ProvidersCheckBox->isChecked() && !newprofilewizardcertcontent->Pkcs11ProvidersURLRequester->url().isEmpty() ) ProviderLib = newprofilewizardcertcontent->Pkcs11ProvidersURLRequester->url(); // we have to split slot id and name ("0 : foobar") => 0 - QString Pkcs11Slot = newprofilewizardcertcontent->Pkcs11SlotComboBox->currentText().section ( ':', 0, 0 ).stripWhiteSpace(); + TQString Pkcs11Slot = newprofilewizardcertcontent->Pkcs11SlotComboBox->currentText().section ( ':', 0, 0 ).stripWhiteSpace(); - QStringList Pkcs11Ids = Utils ( GlobalConfig ).getSmartcardCertsFromSlot ( Pkcs11Slot, Pkcs11IdTypeTmp, ProviderLib ); - for ( QStringList::Iterator it = Pkcs11Ids.begin(); it != Pkcs11Ids.end(); ++it ) - newprofilewizardcertcontent->Pkcs11IdComboBox->insertItem ( QString ( *it ) ); + TQStringList Pkcs11Ids = Utils ( GlobalConfig ).getSmartcardCertsFromSlot ( Pkcs11Slot, Pkcs11IdTypeTmp, ProviderLib ); + for ( TQStringList::Iterator it = Pkcs11Ids.begin(); it != Pkcs11Ids.end(); ++it ) + newprofilewizardcertcontent->Pkcs11IdComboBox->insertItem ( TQString ( *it ) ); if ( newprofilewizardcertcontent->Pkcs11SlotComboBox->currentText() == "" || newprofilewizardcertcontent->Pkcs11IdComboBox->currentText() == "" ) nextButton()->setEnabled ( false ); @@ -3762,14 +3762,14 @@ void NewProfileWizard::detectPkcs11Ids() void NewProfileWizard::detectPkcs11Slots() { - GlobalConfig->appPointer->setOverrideCursor ( QCursor ( Qt::WaitCursor ) ); + GlobalConfig->appPointer->setOverrideCursor ( TQCursor ( TQt::WaitCursor ) ); newprofilewizardcertcontent->Pkcs11SlotComboBox->clear(); - QString ProviderLib = ""; + TQString ProviderLib = ""; if ( newprofilewizardcertcontent->UsePkcs11ProvidersCheckBox->isChecked() && !newprofilewizardcertcontent->Pkcs11ProvidersURLRequester->url().isEmpty() ) ProviderLib = newprofilewizardcertcontent->Pkcs11ProvidersURLRequester->url(); - QStringList Pkcs11Slots = Utils ( GlobalConfig ).getSmartcardSlots ( ProviderLib ); - for ( QStringList::Iterator it = Pkcs11Slots.begin(); it != Pkcs11Slots.end(); ++it ) - newprofilewizardcertcontent->Pkcs11SlotComboBox->insertItem ( QString ( *it ) ); + TQStringList Pkcs11Slots = Utils ( GlobalConfig ).getSmartcardSlots ( ProviderLib ); + for ( TQStringList::Iterator it = Pkcs11Slots.begin(); it != Pkcs11Slots.end(); ++it ) + newprofilewizardcertcontent->Pkcs11SlotComboBox->insertItem ( TQString ( *it ) ); if ( !Pkcs11Slots.isEmpty() ) newprofilewizardcertcontent->Pkcs11IdTypeComboBox->setEnabled ( true ); @@ -3851,7 +3851,7 @@ void NewProfileWizard::useEspToogled(bool) newprofilewizardfreeswanpagecontent->EspGroupBox->setEnabled(false); } -void NewProfileWizard::remoteIDTypeRacoonToggled(const QString& text) +void NewProfileWizard::remoteIDTypeRacoonToggled(const TQString& text) { if (text == "asn1dn") { @@ -3865,7 +3865,7 @@ void NewProfileWizard::remoteIDTypeRacoonToggled(const QString& text) } } -void NewProfileWizard::localIDTypeRacoonToggled(const QString& text) +void NewProfileWizard::localIDTypeRacoonToggled(const TQString& text) { if (text == "none") { @@ -3879,7 +3879,7 @@ void NewProfileWizard::localIDTypeRacoonToggled(const QString& text) } } -void NewProfileWizard::remoteIDTypeIpsecToggled(const QString& text) +void NewProfileWizard::remoteIDTypeIpsecToggled(const TQString& text) { if (text == "asn1dn" || text == "none") { @@ -3894,7 +3894,7 @@ void NewProfileWizard::remoteIDTypeIpsecToggled(const QString& text) } -void NewProfileWizard::localIDTypeIpsecToggled(const QString& text) +void NewProfileWizard::localIDTypeIpsecToggled(const TQString& text) { if (text == "asn1dn" || text == i18n("Certificate ID")) { @@ -3908,7 +3908,7 @@ void NewProfileWizard::localIDTypeIpsecToggled(const QString& text) } } -void NewProfileWizard::defaultRouteToggled(const QString&) +void NewProfileWizard::defaultRouteToggled(const TQString&) { if (newprofilewizardnetworkroutecontent->DefaultRouteComboBox->currentText() == i18n("Keep default route") || newprofilewizardnetworkroutecontent->DefaultRouteComboBox->currentItem() == 0) @@ -3966,7 +3966,7 @@ void NewProfileWizard::useXauthRacoonToggled(bool) } } -void NewProfileWizard::tunnelDeviceTypeChanged(const QString & string ) +void NewProfileWizard::tunnelDeviceTypeChanged(const TQString & string ) { if ( profileData->getConnectionType() == VpnAccountData::openvpn || profileData->getConnectionType() == VpnAccountData::ssh) { diff --git a/src/newprofilewizard.h b/src/newprofilewizard.h index 770e66a..431960b 100644 --- a/src/newprofilewizard.h +++ b/src/newprofilewizard.h @@ -21,13 +21,13 @@ #ifndef NEWPROFILEWIZARD_H #define NEWPROFILEWIZARD_H -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include "kvpncconfig.h" @@ -69,15 +69,16 @@ Provides a wizard for creating a new profile @author Christoph Thielecke */ -class NewProfileWizard : public QWizard +class NewProfileWizard : public TQWizard { Q_OBJECT + TQ_OBJECT public: NewProfileWizard(KVpncConfig* GlobalConfig); - void dataChanged( const QString & ); - QString getName(); - QString getProfile(); + void dataChanged( const TQString & ); + TQString getName(); + TQString getProfile(); bool getFinished(); bool newProfileCreated; bool daemonavailable; //< true if required is found, used for connecting after creating @@ -85,7 +86,7 @@ public: VpnAccountData *profileData; public slots: - void showPage( QWidget* page ); + void showPage( TQWidget* page ); void next (); void back(); void accept(); @@ -106,10 +107,10 @@ public slots: void useTlsRemoteHostToggled(bool); void connectionStatusCheckToggled(bool); void authenticateWithUsernameAndPasswordToggled(bool); - void pskInputToggled(const QString& str); - void userpassToggled(const QString& str); - void usernameToggled(const QString& str); - void pskToggled(const QString& str); + void pskInputToggled(const TQString& str); + void userpassToggled(const TQString& str); + void usernameToggled(const TQString& str); + void pskToggled(const TQString& str); void useRightNextHopToggled(bool); void useLeftNextHopToggled(bool); void domainNameToggled(bool); @@ -127,34 +128,34 @@ public slots: void useRemoteNetworkToggled(bool); void useEspToogled(bool); void useIkeToggled(bool); - void remoteIDTypeRacoonToggled(const QString&); - void localIDTypeRacoonToggled(const QString&); - void remoteIDTypeIpsecToggled(const QString&); - void localIDTypeIpsecToggled(const QString&); - void defaultRouteToggled(const QString&); + void remoteIDTypeRacoonToggled(const TQString&); + void localIDTypeRacoonToggled(const TQString&); + void remoteIDTypeIpsecToggled(const TQString&); + void localIDTypeIpsecToggled(const TQString&); + void defaultRouteToggled(const TQString&); void ikeGroupToggled(bool); void useXauthFreeswanToggled(bool); void useXauthRacoonToggled(bool); - void tunnelDeviceTypeChanged(const QString &); + void tunnelDeviceTypeChanged(const TQString &); void useDnsServerToggled(bool); void useSearchDomainInResolvConfToggled(bool); void useDomainInResolvConfToggled(bool); //void reject(); protected: - QString ConnectionType; - QString Gateway; - QString ID; - QString Username; - QString UserPassword; - QString PreSharedKey; - QString ApplicationVersion; - QString NtDomainName; - QString PerfectForwardSecrecy; - QString IkeGroup; - QString DnsServer; //< userdefined DNS server for pptp - QString Name; - QString Description; + TQString ConnectionType; + TQString Gateway; + TQString ID; + TQString Username; + TQString UserPassword; + TQString PreSharedKey; + TQString ApplicationVersion; + TQString NtDomainName; + TQString PerfectForwardSecrecy; + TQString IkeGroup; + TQString DnsServer; //< userdefined DNS server for pptp + TQString Name; + TQString Description; bool saveUserPassword; bool savePsk; bool useApplicationVersion; @@ -183,32 +184,32 @@ private: void setupPages(); bool importProfile(VpnAccountData::ConnectionType ConnType); bool importCertificate(); - QHBox *page1; - QHBox *newprofilewizardtypeselectionpage; - QHBox *newprofilewizardgeneralpage; - QHBox *newprofilewizardciscoselectionpage; - QHBox *newprofilewizardciscomanuallypage; - QHBox *newprofilewizardracoonpage; - QHBox *newprofilewizardfreeswanpage; - QHBox *newprofilewizardfreeswanselectionpage; - QHBox *newprofilewizardopenvpnpage; - QHBox *newprofilewizardopenvpnselectionpage; - QHBox *newprofilewizardopenvpnauthpage; - QHBox *newprofilewizardpptppage; - QHBox *newprofilewizardvtunpage; - QHBox *newprofilewizardsshpage; - QHBox *newprofilewizardauthselectionpage; - QHBox *newprofilewizardpskpage; - QHBox *newprofilewizardcertpage; - QHBox *newprofilewizardp12certselectionpage; - QHBox *newprofilewizarduserpage; - QHBox *newprofilewizardnetworkpage; - QHBox *newprofilewizardvirtualipaddresspage; - QHBox *newprofilewizardnetworkroutepage; - QHBox *newprofilewizardnatpage; - QHBox *newprofilewizardconnectionstatuscheckpage; - QHBox *newprofilewizardconnectoptionspage; - QHBox *endpage; + TQHBox *page1; + TQHBox *newprofilewizardtypeselectionpage; + TQHBox *newprofilewizardgeneralpage; + TQHBox *newprofilewizardciscoselectionpage; + TQHBox *newprofilewizardciscomanuallypage; + TQHBox *newprofilewizardracoonpage; + TQHBox *newprofilewizardfreeswanpage; + TQHBox *newprofilewizardfreeswanselectionpage; + TQHBox *newprofilewizardopenvpnpage; + TQHBox *newprofilewizardopenvpnselectionpage; + TQHBox *newprofilewizardopenvpnauthpage; + TQHBox *newprofilewizardpptppage; + TQHBox *newprofilewizardvtunpage; + TQHBox *newprofilewizardsshpage; + TQHBox *newprofilewizardauthselectionpage; + TQHBox *newprofilewizardpskpage; + TQHBox *newprofilewizardcertpage; + TQHBox *newprofilewizardp12certselectionpage; + TQHBox *newprofilewizarduserpage; + TQHBox *newprofilewizardnetworkpage; + TQHBox *newprofilewizardvirtualipaddresspage; + TQHBox *newprofilewizardnetworkroutepage; + TQHBox *newprofilewizardnatpage; + TQHBox *newprofilewizardconnectionstatuscheckpage; + TQHBox *newprofilewizardconnectoptionspage; + TQHBox *endpage; NewProfileWizardTypeSelection *newprofilewizardtypeselectionpagecontent; NewProfileWizardGeneral *newprofilewizardgeneralpagecontent; NewProfileWizardCiscoSelection *newprofilewizardciscoselectionpagecontent; @@ -235,14 +236,14 @@ private: NewProfileWizardConnectOptions *newprofilewizardconnectoptionscontent; ProfileNetworkVirtualIpOptions *profilenetworkvirtualipoptionscontent; KVpncConfig* GlobalConfig; //< pointer to global config class - QWidget* currentpage; // pointer to current page - QWidget* previouspage; //< pointer to previous page + TQWidget* currentpage; // pointer to current page + TQWidget* previouspage; //< pointer to previous page bool finished; bool enterdatamanually; //< enter data manually bool useCert; //< use certificate for authentication bool importOK; //< import was successful - QPixmap *SetupPixmap; - QPixmap *SetupPixmapFinal; + TQPixmap *SetupPixmap; + TQPixmap *SetupPixmapFinal; }; diff --git a/src/newprofilewizardauthselection.ui b/src/newprofilewizardauthselection.ui index 455a964..ff86f20 100644 --- a/src/newprofilewizardauthselection.ui +++ b/src/newprofilewizardauthselection.ui @@ -1,6 +1,6 @@ NewProfileWizardAuthSelection - + NewProfileWizardAuthSelection @@ -19,7 +19,7 @@ unnamed - + buttonGroup2 @@ -30,7 +30,7 @@ unnamed - + PskRadioButton @@ -44,7 +44,7 @@ true - + CertificateRadioButton @@ -55,7 +55,7 @@ Alt+C - + HybridRadioButton @@ -78,7 +78,7 @@ Expanding - + 71 20 @@ -95,7 +95,7 @@ Expanding - + 20 51 diff --git a/src/newprofilewizardcert.ui b/src/newprofilewizardcert.ui index 8e06fad..ab798e7 100644 --- a/src/newprofilewizardcert.ui +++ b/src/newprofilewizardcert.ui @@ -1,6 +1,6 @@ NewProfileWizardCert - + NewProfileWizardCert @@ -19,31 +19,31 @@ unnamed - + - layout47 + tqlayout47 unnamed - + - layout46 + tqlayout46 unnamed - + - layout76 + tqlayout76 unnamed - + UseSmartcardCheckBox @@ -67,7 +67,7 @@ Expanding - + 221 20 @@ -76,7 +76,7 @@ - + CertificateGroupBox @@ -106,7 +106,7 @@ Special certificate file - + PrivkeyPasswordEdit @@ -139,9 +139,9 @@ CA certificate path - + - layout45 + tqlayout45 @@ -151,7 +151,7 @@ x509certURLRequester - + 250 0 @@ -168,15 +168,15 @@ - + - layout28 + tqlayout28 unnamed - + LabelCertificate @@ -194,7 +194,7 @@ Expanding - + 172 20 @@ -203,15 +203,15 @@ - + - layout29 + tqlayout29 unnamed - + LabelCertificatePath @@ -229,7 +229,7 @@ Expanding - + 134 20 @@ -238,15 +238,15 @@ - + - layout30 + tqlayout30 unnamed - + LabelCaCertificatePath @@ -264,7 +264,7 @@ Expanding - + 109 20 @@ -273,15 +273,15 @@ - + - layout32 + tqlayout32 unnamed - + UseSpecialServerCertificateCheckBox @@ -305,7 +305,7 @@ Expanding - + 34 20 @@ -314,15 +314,15 @@ - + - layout33 + tqlayout33 unnamed - + LabelPrivateKeyPath @@ -340,7 +340,7 @@ Expanding - + 134 20 @@ -349,15 +349,15 @@ - + - layout34 + tqlayout34 unnamed - + LabelPrivateKeyPassword @@ -375,7 +375,7 @@ Expanding - + 84 20 @@ -386,7 +386,7 @@ - + SmartcardGroupBox @@ -400,23 +400,23 @@ unnamed - + - layout90 + tqlayout90 unnamed - + - layout31 + tqlayout31 unnamed - + UsePkcs11ProvidersCheckBox @@ -437,9 +437,9 @@ - + - layout55 + tqlayout55 @@ -453,7 +453,7 @@ Detect - + textLabel3 @@ -461,7 +461,7 @@ Slot - + IdLabel @@ -523,23 +523,23 @@ - + - layout24 + tqlayout24 unnamed - + - layout23 + tqlayout23 unnamed - + Pkcs11SlotTypeLabel @@ -592,7 +592,7 @@ Pkcs11SlotTypeComboBox - + textLabel5 @@ -602,9 +602,9 @@ - + - layout22 + tqlayout22 @@ -620,7 +620,7 @@ Expanding - + 241 21 @@ -647,7 +647,7 @@ Pkcs11IdTypeComboBox - + textLabel2 @@ -673,7 +673,7 @@ Expanding - + 20 44 @@ -695,11 +695,11 @@ privkeypathURLRequester PrivkeyPasswordEdit - + useSmartcardToggled(bool) usePkcs11ProvidersToggled(bool) idTypeToggled() - + kurlrequester.h diff --git a/src/newprofilewizardciscomanually.ui b/src/newprofilewizardciscomanually.ui index bb3aeb0..e277c96 100644 --- a/src/newprofilewizardciscomanually.ui +++ b/src/newprofilewizardciscomanually.ui @@ -1,6 +1,6 @@ NewProfileWizardCiscoManually - + NewProfileWizardCiscoManually @@ -29,16 +29,16 @@ Expanding - + 20 71 - + - layout24 + tqlayout24 @@ -54,14 +54,14 @@ Expanding - + 171 20 - + CheckSavePsk @@ -85,14 +85,14 @@ Expanding - + 111 21 - + textLabel3 @@ -100,7 +100,7 @@ Cisco specific settings - + AllowEmptyGroupPasswordCheckBox @@ -114,9 +114,9 @@ Allow an empty group password (not recommended, insecure) - + - layout12 + tqlayout12 @@ -133,7 +133,7 @@ - + LabelID @@ -162,7 +162,7 @@ Expanding - + 70 20 @@ -179,14 +179,14 @@ Expanding - + 70 20 - + LabelPsk @@ -211,7 +211,7 @@ Expanding - + 20 20 diff --git a/src/newprofilewizardciscopcfimport.ui b/src/newprofilewizardciscopcfimport.ui index 858b467..5f42faf 100644 --- a/src/newprofilewizardciscopcfimport.ui +++ b/src/newprofilewizardciscopcfimport.ui @@ -1,6 +1,6 @@ Form1 - + Form1 diff --git a/src/newprofilewizardciscoselection.ui b/src/newprofilewizardciscoselection.ui index 2771220..cb6bd0f 100644 --- a/src/newprofilewizardciscoselection.ui +++ b/src/newprofilewizardciscoselection.ui @@ -1,6 +1,6 @@ NewProfileWizardCiscoSelection - + NewProfileWizardCiscoSelection @@ -19,7 +19,7 @@ unnamed - + buttonGroup2 @@ -30,7 +30,7 @@ unnamed - + PcfImportRadioButton @@ -44,7 +44,7 @@ true - + EnterManuallyRadioButton @@ -67,7 +67,7 @@ Expanding - + 31 311 @@ -84,7 +84,7 @@ Expanding - + 351 20 diff --git a/src/newprofilewizardconnectionstatuscheck.ui b/src/newprofilewizardconnectionstatuscheck.ui index fa23589..b10f46c 100644 --- a/src/newprofilewizardconnectionstatuscheck.ui +++ b/src/newprofilewizardconnectionstatuscheck.ui @@ -1,6 +1,6 @@ NewProfileWizardConnectionStatusCheck - + NewProfileWizardConnectionStatusCheck @@ -19,23 +19,23 @@ unnamed - + - layout8 + tqlayout8 unnamed - + - layout6 + tqlayout6 unnamed - + UseConnectionStatusCheckCheckBox @@ -68,7 +68,7 @@ Expanding - + 241 20 @@ -77,9 +77,9 @@ - + - layout5 + tqlayout5 @@ -120,7 +120,7 @@ Expanding - + 180 20 @@ -145,7 +145,7 @@ Expanding - + 290 20 @@ -162,15 +162,15 @@ - + - layout7 + tqlayout7 unnamed - + DoReconnectAfterConnectionLostCheckBox @@ -203,7 +203,7 @@ Expanding - + 201 20 @@ -212,15 +212,15 @@ - + - layout4 + tqlayout4 unnamed - + PingUserdefiniedAddressCheckBox @@ -268,7 +268,7 @@ Expanding - + 201 41 @@ -285,7 +285,7 @@ Expanding - + 20 121 diff --git a/src/newprofilewizardconnectoptions.ui b/src/newprofilewizardconnectoptions.ui index e10f45a..bca1f58 100644 --- a/src/newprofilewizardconnectoptions.ui +++ b/src/newprofilewizardconnectoptions.ui @@ -1,6 +1,6 @@ NewProfileWizardConnectOptions - + NewProfileWizardConnectOptions @@ -19,23 +19,23 @@ unnamed - + - layout37 + tqlayout37 unnamed - + - layout36 + tqlayout36 unnamed - + ConnectAfterCreatingProfileCheckBox @@ -56,7 +56,7 @@ Expanding - + 181 21 @@ -65,15 +65,15 @@ - + - layout12 + tqlayout12 unnamed - + DoAutoConnectCheckBox @@ -103,7 +103,7 @@ Expanding - + 59 20 @@ -132,7 +132,7 @@ Expanding - + 61 20 @@ -149,7 +149,7 @@ Expanding - + 20 91 diff --git a/src/newprofilewizardfreeswan.ui b/src/newprofilewizardfreeswan.ui index cd3adeb..3855921 100644 --- a/src/newprofilewizardfreeswan.ui +++ b/src/newprofilewizardfreeswan.ui @@ -1,6 +1,6 @@ NewProfileWizardFreeswan - + NewProfileWizardFreeswan @@ -22,31 +22,31 @@ unnamed - + - layout64 + tqlayout64 unnamed - + - layout63 + tqlayout63 unnamed - + - layout90_2 + tqlayout90_2 unnamed - + UseXauthCheckBox @@ -70,7 +70,7 @@ Expanding - + 100 20 @@ -79,15 +79,15 @@ - + - layout160 + tqlayout160 unnamed - + UseModeConfigCheckBox @@ -108,14 +108,14 @@ Expanding - + 20 20 - + PerfectForwardSecurityCheckbox @@ -131,7 +131,7 @@ - + RemoteIdentifierGroupBox @@ -142,23 +142,23 @@ unnamed - + - layout74_2 + tqlayout74_2 unnamed - + - layout73_2 + tqlayout73_2 unnamed - + HashAlgoTextLabel_2_2_2 @@ -176,7 +176,7 @@ Expanding - + 51 20 @@ -199,15 +199,15 @@ Value for the local ID - + - layout72_2_2 + tqlayout72_2_2 unnamed - + RemoteIDLabel @@ -225,7 +225,7 @@ Expanding - + 51 20 @@ -267,23 +267,23 @@ - + - layout158 + tqlayout158 unnamed - + - layout155 + tqlayout155 unnamed - + UseCustomIkeCheckBox @@ -291,7 +291,7 @@ Use custom IKE - + IkeGroupBox @@ -305,7 +305,7 @@ unnamed - + IkeAes256Sha1CheckBox @@ -316,7 +316,7 @@ Alt+6 - + IkeAes128Sha1CheckBox @@ -327,7 +327,7 @@ Alt+1 - + IkeDesSha1Modp2048CheckBox @@ -338,7 +338,7 @@ Alt+4 - + IkeDesSha1CheckBox @@ -349,7 +349,7 @@ - + IkeDesMd5CheckBox @@ -360,15 +360,15 @@ Alt+3 - + - layout52 + tqlayout52 unnamed - + textLabel1 @@ -387,15 +387,15 @@ - + - layout156 + tqlayout156 unnamed - + UseCustomEspCheckBox @@ -406,7 +406,7 @@ - + EspGroupBox @@ -420,7 +420,7 @@ unnamed - + EspAes256Sha1CheckBox @@ -431,7 +431,7 @@ Alt+5 - + EspAes128Sha1CheckBox @@ -442,7 +442,7 @@ Alt+8 - + EspDesSha1CheckBox @@ -453,7 +453,7 @@ - + Esp3desMd5CheckBox @@ -461,15 +461,15 @@ 3des-md5 - + - layout53 + tqlayout53 unnamed - + textLabel2 @@ -490,15 +490,15 @@ - + - layout9 + tqlayout9 unnamed - + UseRightNextHopCheckBox @@ -517,7 +517,7 @@ false - + UseLeftNextHopCheckBox @@ -541,7 +541,7 @@ - + LocalIdentifierGroupBox @@ -552,23 +552,23 @@ unnamed - + - layout74 + tqlayout74 unnamed - + - layout73 + tqlayout73 unnamed - + HashAlgoTextLabel_2_2 @@ -586,7 +586,7 @@ Expanding - + 51 20 @@ -609,15 +609,15 @@ Value for the local ID - + - layout72_2 + tqlayout72_2 unnamed - + LocalIDLabel @@ -635,7 +635,7 @@ Expanding - + 51 20 @@ -677,15 +677,15 @@ - + - layout90 + tqlayout90 unnamed - + DisableOpportunisticEncryptionCheckBox @@ -706,7 +706,7 @@ Expanding - + 100 20 @@ -725,22 +725,22 @@ Expanding - + 20 198 - + - layout16 + tqlayout16 unnamed - + ExchangeModeComboBox @@ -748,15 +748,15 @@ Internet Key Exchange mode - + - layout150 + tqlayout150 unnamed - + IPsecVpnModeTextLabel @@ -774,7 +774,7 @@ Expanding - + 28 20 @@ -783,15 +783,15 @@ - + - layout72 + tqlayout72 unnamed - + HashAlgoTextLabel_2 @@ -809,7 +809,7 @@ Expanding - + 91 21 @@ -861,7 +861,7 @@ Expanding - + 53 31 diff --git a/src/newprofilewizardgeneral.ui b/src/newprofilewizardgeneral.ui index 544c69a..098a3db 100644 --- a/src/newprofilewizardgeneral.ui +++ b/src/newprofilewizardgeneral.ui @@ -1,6 +1,6 @@ NewProfileWizardGeneral - + NewProfileWizardGeneral @@ -19,15 +19,15 @@ unnamed - + - layout29 + tqlayout29 unnamed - + textLabel2 @@ -35,9 +35,9 @@ General settings - + - layout28 + tqlayout28 @@ -51,7 +51,7 @@ Description of the new profile - + LabelGateway_2 @@ -70,7 +70,7 @@ - + LabelGateway @@ -89,7 +89,7 @@ - + LabelGateway_3 @@ -109,7 +109,7 @@ Expanding - + 21 43 @@ -128,7 +128,7 @@ Expanding - + 41 20 @@ -145,7 +145,7 @@ Expanding - + 20 41 diff --git a/src/newprofilewizardnat.ui b/src/newprofilewizardnat.ui index 719bbb5..cda9996 100644 --- a/src/newprofilewizardnat.ui +++ b/src/newprofilewizardnat.ui @@ -1,6 +1,6 @@ NewProfileWizardNat - + NewProfileWizardNat @@ -19,31 +19,31 @@ unnamed - + - layout10 + tqlayout10 unnamed - + - layout9 + tqlayout9 unnamed - + - layout8 + tqlayout8 unnamed - + UseUdpCheckbox @@ -70,14 +70,14 @@ Expanding - + 50 20 - + UseNatCheckbox @@ -93,15 +93,15 @@ - + - layout9 + tqlayout9 unnamed - + UdpPortCheckbox @@ -118,7 +118,7 @@ Use specified port number for IPSec NAT-T - + UdpPortSpinbox @@ -148,7 +148,7 @@ Expanding - + 46 21 @@ -167,7 +167,7 @@ Expanding - + 20 150 @@ -186,7 +186,7 @@ Expanding - + 201 21 diff --git a/src/newprofilewizardnetwork.ui b/src/newprofilewizardnetwork.ui index 2720385..dc15355 100644 --- a/src/newprofilewizardnetwork.ui +++ b/src/newprofilewizardnetwork.ui @@ -1,6 +1,6 @@ NewProfileWizardNetwork - + NewProfileWizardNetwork @@ -19,25 +19,25 @@ unnamed - + - layout28 + tqlayout28 unnamed - + - layout27 + tqlayout27 unnamed - + - layout11 + tqlayout11 @@ -53,14 +53,14 @@ Expanding - + 252 20 - + LabelNetworkDevice @@ -87,7 +87,7 @@ - + UseRemoteNetworkCheckBox @@ -98,7 +98,7 @@ Alt+U - + RemoteNetworkGroupBox @@ -112,7 +112,7 @@ unnamed - + LabelRemoteNetwork @@ -123,9 +123,9 @@ Remote network: - + - layout77 + tqlayout77 @@ -142,7 +142,7 @@ This is the remote network where the connection should going to. Use this at a PPTP connection for set another network than the retrieved IP is located. - + RemoteNetDividetextLabel @@ -287,15 +287,15 @@ - + - layout58 + tqlayout58 unnamed - + MtuCheckbox @@ -312,7 +312,7 @@ If you enable this you can set a own MTU size. - + MtuSpinbox @@ -345,14 +345,14 @@ Expanding - + 71 20 - + MruCheckbox @@ -369,7 +369,7 @@ If you enable this you can set a own MTU size. - + MruSpinbox @@ -394,15 +394,15 @@ - + - layout57 + tqlayout57 unnamed - + TunnelDeviceTypeLabel @@ -413,9 +413,9 @@ Tunnel device type: - + - layout22 + tqlayout22 @@ -431,7 +431,7 @@ Expanding - + 181 21 @@ -460,7 +460,7 @@ Expanding - + 20 30 @@ -479,7 +479,7 @@ Expanding - + 16 20 @@ -493,9 +493,9 @@ NetworkDeviceComboBox - + useRemoteNetworkToggled(bool) - + kcombobox.h diff --git a/src/newprofilewizardnetworkroute.ui b/src/newprofilewizardnetworkroute.ui index 65e1150..de0225b 100644 --- a/src/newprofilewizardnetworkroute.ui +++ b/src/newprofilewizardnetworkroute.ui @@ -1,6 +1,6 @@ NewProfileWizardNetworkRoute - + NewProfileWizardNetworkRoute @@ -27,17 +27,17 @@ unnamed - + - layout17 + tqlayout17 unnamed - + - layout14 + tqlayout14 @@ -68,7 +68,7 @@ Expanding - + 278 21 @@ -77,7 +77,7 @@ - + UseExtraNetworkRoutesCheckbox @@ -142,7 +142,7 @@ false - + 0 150 @@ -152,9 +152,9 @@ List of additional network routes - + - layout52 + tqlayout52 @@ -170,7 +170,7 @@ Expanding - + 241 20 @@ -243,11 +243,11 @@ AddRoutePushButton DeleteNetworkRoutePushButton - + additionalNetworkRoutesToggled(bool) addNetworkRouteClicked() delNetworkRouteClicked() - + kcombobox.h diff --git a/src/newprofilewizardopenvpn.ui b/src/newprofilewizardopenvpn.ui index 009a8fd..c9eeda3 100644 --- a/src/newprofilewizardopenvpn.ui +++ b/src/newprofilewizardopenvpn.ui @@ -1,7 +1,7 @@ NewProfileWizardOpenvpn Christoph Thielecke - + NewProfileWizardOpenvpn @@ -20,15 +20,15 @@ unnamed - + - layout50 + tqlayout50 unnamed - + textLabel3 @@ -36,15 +36,15 @@ OpenVPN specific settings - + - layout49 + tqlayout49 unnamed - + TlsRemoteHostLineEdit @@ -77,15 +77,15 @@ Cipher algorithm - + - layout47 + tqlayout47 unnamed - + UseTlsAuthCheckBox @@ -109,7 +109,7 @@ Expanding - + 101 20 @@ -118,15 +118,15 @@ - + - layout44 + tqlayout44 unnamed - + UseUserdefinedPortCheckBox @@ -147,7 +147,7 @@ Expanding - + 119 20 @@ -175,15 +175,15 @@ File name of the static key or passphrase file - + - layout48 + tqlayout48 unnamed - + UseTlsRemoteHostCheckBox @@ -207,7 +207,7 @@ Expanding - + 31 20 @@ -216,15 +216,15 @@ - + - layout18_2 + tqlayout18_2 unnamed - + AllowIpAddressChangeOfPeerCheckBox @@ -248,7 +248,7 @@ Expanding - + 191 20 @@ -257,7 +257,7 @@ - + UserdefinedPortSpinBox @@ -274,15 +274,15 @@ Port number - + - layout18 + tqlayout18 unnamed - + DisableLzoCompressionCheckBox @@ -306,7 +306,7 @@ Expanding - + 191 20 @@ -315,15 +315,15 @@ - + - layout46 + tqlayout46 unnamed - + UseUserdefiniedCipherCheckBox @@ -344,7 +344,7 @@ Expanding - + 119 20 @@ -353,15 +353,15 @@ - + - layout45 + tqlayout45 unnamed - + TunnelDeviceTypeLabel @@ -382,7 +382,7 @@ Expanding - + 119 21 @@ -391,15 +391,15 @@ - + - layout43 + tqlayout43 unnamed - + UseNsCertTypeCheckBox @@ -423,7 +423,7 @@ Expanding - + 119 20 @@ -434,7 +434,7 @@ - + groupBox1 @@ -445,15 +445,15 @@ unnamed - + - layout11 + tqlayout11 unnamed - + HttpProxyLineEdit @@ -464,15 +464,15 @@ Name or IP address of the proxy server - + - layout10 + tqlayout10 unnamed - + TimeoutTextLabel @@ -496,7 +496,7 @@ Expanding - + 101 21 @@ -519,7 +519,7 @@ - + PortTextextLabel @@ -533,7 +533,7 @@ Proxy server port number - + UseHttpProxyCheckBox @@ -547,7 +547,7 @@ Connect via HTTP proxy - + HostTextLabel @@ -571,7 +571,7 @@ Expanding - + 220 20 @@ -588,16 +588,16 @@ Expanding - + 221 20 - + - layout9_2 + tqlayout9_2 @@ -613,7 +613,7 @@ Expanding - + 110 21 @@ -656,7 +656,7 @@ Expanding - + 20 117 @@ -685,14 +685,14 @@ HttpProxyPortIntNumInput HttpProxyTimeoutIntSpinBox - + userdefinedOpenvpnPortToggeled(bool) useUserdefiniedCipherToggled(bool) useTlsAuthToggled(bool) useTlsRemoteHostToggled(bool) useHttpProxyToggeled(bool) authenticateWithUsernameAndPasswordToggled(bool) - + kcombobox.h diff --git a/src/newprofilewizardopenvpnauth.ui b/src/newprofilewizardopenvpnauth.ui index 9950816..9599331 100644 --- a/src/newprofilewizardopenvpnauth.ui +++ b/src/newprofilewizardopenvpnauth.ui @@ -1,7 +1,7 @@ NewProfileWizardOpenvpnAuth Christoph Thielecke - + NewProfileWizardOpenvpnAuth @@ -20,23 +20,23 @@ unnamed - + - layout66 + tqlayout66 unnamed - + - layout65 + tqlayout65 unnamed - + textLabel3 @@ -44,15 +44,15 @@ OpenVPN authentication settings - + - layout17 + tqlayout17 unnamed - + AuthWithUsernameAndPasswordCheckBox @@ -76,7 +76,7 @@ Expanding - + 191 20 @@ -85,15 +85,15 @@ - + - layout98 + tqlayout98 unnamed - + UseOnlyCaCertAndUserAuthCheckBox @@ -120,7 +120,7 @@ Expanding - + 46 20 @@ -129,23 +129,23 @@ - + - layout64 + tqlayout64 unnamed - + - layout63 + tqlayout63 unnamed - + UseAuthenticationAlgorithmCheckBox @@ -166,7 +166,7 @@ Expanding - + 233 20 @@ -198,7 +198,7 @@ Expanding - + 20 16 @@ -217,7 +217,7 @@ Expanding - + 494 20 @@ -231,13 +231,13 @@ AuthWithUsernameAndPasswordCheckBox - + useUserdefiniedCipherToggled(bool) useTlsAuthToggled(bool) useTlsRemoteHostToggled(bool) useHttpProxyToggeled(bool) userdefinedOpenvpnPortToggeled(bool) - + kcombobox.h diff --git a/src/newprofilewizardopenvpnselection.ui b/src/newprofilewizardopenvpnselection.ui index d064772..c556865 100644 --- a/src/newprofilewizardopenvpnselection.ui +++ b/src/newprofilewizardopenvpnselection.ui @@ -1,6 +1,6 @@ NewProfileWizardOpenvpnSelection - + NewProfileWizardOpenvpnSelection @@ -19,7 +19,7 @@ unnamed - + buttonGroup2 @@ -30,7 +30,7 @@ unnamed - + OpenvpnImportRadioButton @@ -44,7 +44,7 @@ true - + EnterManuallyRadioButton @@ -67,7 +67,7 @@ Expanding - + 31 311 @@ -84,7 +84,7 @@ Expanding - + 351 20 diff --git a/src/newprofilewizardp12certselection.ui b/src/newprofilewizardp12certselection.ui index 2868ab1..e3109a6 100644 --- a/src/newprofilewizardp12certselection.ui +++ b/src/newprofilewizardp12certselection.ui @@ -1,6 +1,6 @@ NewProfileWizardP12CertSelection - + NewProfileWizardP12CertSelection @@ -19,23 +19,23 @@ unnamed - + - layout81 + tqlayout81 unnamed - + - layout80 + tqlayout80 unnamed - + UseSmartcardCheckBox @@ -49,7 +49,7 @@ - + P12Group @@ -63,7 +63,7 @@ unnamed - + P12CertNoRadioButton @@ -74,7 +74,7 @@ Alt+N - + P12CertYesRadioButton @@ -100,7 +100,7 @@ Expanding - + 20 160 @@ -119,7 +119,7 @@ Expanding - + 111 20 diff --git a/src/newprofilewizardpptp.ui b/src/newprofilewizardpptp.ui index 08485fc..a513b4d 100644 --- a/src/newprofilewizardpptp.ui +++ b/src/newprofilewizardpptp.ui @@ -1,6 +1,6 @@ NewProfileWizardPptp - + NewProfileWizardPptp @@ -19,23 +19,23 @@ unnamed - + - layout14 + tqlayout14 unnamed - + - layout13 + tqlayout13 unnamed - + DnsGroupBox @@ -46,7 +46,7 @@ unnamed - + DnsServerCheckbox @@ -71,7 +71,7 @@ IP address of the DNS server (no hostname) - + UseSearchDomainInResolvConfCheckbox @@ -110,7 +110,7 @@ IP address of the DNS server (no hostname) - + UseDomainInResolvConfCheckbox @@ -123,7 +123,7 @@ - + PppOptionsGroupBox @@ -134,7 +134,7 @@ unnamed - + DisableCcpCheckbox @@ -151,7 +151,7 @@ Check to disabe CCP (Compression Control Protocol) negotiation. This option should only be required if the peer is buggy and gets confused by requests from pppd for CCP negotiation. - + UseNoDeflateCheckbox @@ -165,7 +165,7 @@ Do not use deflate decompression method (disabled by default) - + DisableProtocolFieldCompressionCheckbox @@ -182,7 +182,7 @@ Disable protocol field compression negotiation in both the receive and the transmit direction - + DisableAdressControlCompressionCheckbox @@ -199,7 +199,7 @@ Disable Address/Control compression in both directions (send and receive). - + UseNoBsdCompCheckbox @@ -213,7 +213,7 @@ Do not use BSD compression (disabled by default) - + UseNoIpDefaultCheckbox @@ -224,7 +224,7 @@ Alt+Y - + DisableMagicNumberNegotiationCheckbox @@ -241,7 +241,7 @@ Disable magic number negotiation. With this option, pppd cannot detect a looped-back line. This option should only be needed if the peer is buggy. - + DisableHeaderCompressionCheckbox @@ -258,7 +258,7 @@ Disables the Van Jacobson style TCP/IP header compression in both the transmit and the receive direction. - + DisableIpxCheckbox @@ -277,7 +277,7 @@ - + MppeOptionsGroupBox @@ -288,7 +288,7 @@ unnamed - + RequireMppeCheckbox @@ -302,7 +302,7 @@ Require Microsoft Point-To-Point Encrpytion (enabled by default) - + Refuse40BitEncryptionCheckbox @@ -316,7 +316,7 @@ Refuse 40 bit length encryption of MPPE - + Refuse128BitEncryptionCheckbox @@ -330,7 +330,7 @@ Refuse 128 bit length encryption of MPPE - + AllowStatefulModeCheckbox @@ -344,7 +344,7 @@ Check this for allow stateful mode of MPPE - + UseNoMPPECompressionCheckbox @@ -363,7 +363,7 @@ - + AuthGroupBox @@ -374,23 +374,23 @@ unnamed - + - layout8 + tqlayout8 unnamed - + - layout7 + tqlayout7 unnamed - + textLabel1 @@ -405,7 +405,7 @@ - + RequireEapCheckbox @@ -423,23 +423,23 @@ - + - layout7_2 + tqlayout7_2 unnamed - + - layout6 + tqlayout6 unnamed - + L2tpdDaemonLabel @@ -457,7 +457,7 @@ Expanding - + 111 21 @@ -493,7 +493,7 @@ Expanding - + 20 165 @@ -512,7 +512,7 @@ Expanding - + 49 31 @@ -523,9 +523,9 @@ - + useNtDomainNameToggled(bool) - + klineedit.h diff --git a/src/newprofilewizardpsk.ui b/src/newprofilewizardpsk.ui index e6d3462..d5b5b4e 100644 --- a/src/newprofilewizardpsk.ui +++ b/src/newprofilewizardpsk.ui @@ -1,6 +1,6 @@ NewProfileWizardPsk - + NewProfileWizardPsk @@ -19,23 +19,23 @@ unnamed - + - layout4 + tqlayout4 unnamed - + - layout3 + tqlayout3 unnamed - + LabelPsk @@ -46,7 +46,7 @@ Pre-shared key: - + CheckSavePsk @@ -60,7 +60,7 @@ Save Pre-shared key in config file (or in KWallet if available) - + LabelPskFile @@ -81,7 +81,7 @@ Expanding - + 130 20 @@ -98,7 +98,7 @@ Expanding - + 174 20 @@ -112,7 +112,7 @@ false - + 250 0 @@ -132,7 +132,7 @@ Expanding - + 165 20 @@ -163,14 +163,14 @@ Expanding - + 147 20 - + PskInFileCheckBox @@ -196,7 +196,7 @@ Expanding - + 20 301 @@ -215,7 +215,7 @@ Expanding - + 51 20 @@ -232,7 +232,7 @@ Expanding - + 20 41 diff --git a/src/newprofilewizardracoon.ui b/src/newprofilewizardracoon.ui index 39cd4e2..0f10acd 100644 --- a/src/newprofilewizardracoon.ui +++ b/src/newprofilewizardracoon.ui @@ -1,6 +1,6 @@ NewProfileWizardRacoon - + NewProfileWizardRacoon @@ -19,23 +19,23 @@ unnamed - + - layout66 + tqlayout66 unnamed - + - layout65 + tqlayout65 unnamed - + InfoLabel @@ -43,15 +43,15 @@ racoon + ipsec-tools specific settings (Linux &2.6 native or BSD) - + - layout62 + tqlayout62 unnamed - + EncryptionAlgorithm2ComboBox @@ -59,7 +59,7 @@ - + EncryptionAlgorithmComboBox @@ -67,7 +67,7 @@ - + AuthenticationAlgorithm2ComboBox @@ -75,15 +75,15 @@ - + - layout61 + tqlayout61 unnamed - + PerfectForwardSecurityCheckbox @@ -107,7 +107,7 @@ Expanding - + 101 20 @@ -116,15 +116,15 @@ - + - layout71_2 + tqlayout71_2 unnamed - + EncryptionAlgorithm2TextLabel_2 @@ -142,7 +142,7 @@ Expanding - + 101 21 @@ -151,7 +151,7 @@ - + ExchangeModeComboBox @@ -159,15 +159,15 @@ Internet Key Exchange mode - + - layout69 + tqlayout69 unnamed - + HashAlgoTextLabel @@ -188,7 +188,7 @@ Expanding - + 101 21 @@ -219,7 +219,7 @@ dh17 = modp6144 (only racoon) dh18 = modp8192 (only racoon) - + HashAlgoComboBox @@ -227,15 +227,15 @@ dh18 = modp8192 (only racoon) Use specified hash algorithm for IKE phase 1 - + - layout71 + tqlayout71 unnamed - + EncryptionAlgorithm2TextLabel @@ -253,7 +253,7 @@ dh18 = modp8192 (only racoon) Expanding - + 101 21 @@ -262,15 +262,15 @@ dh18 = modp8192 (only racoon) - + - layout37 + tqlayout37 unnamed - + IkeGroupCheckbox @@ -294,7 +294,7 @@ dh18 = modp8192 (only racoon) Expanding - + 61 21 @@ -329,15 +329,15 @@ dh17 = modp6144 (racoon only) dh18 = modp8192 (racoon only) - + - layout72 + tqlayout72 unnamed - + HashAlgoTextLabel_2 @@ -355,7 +355,7 @@ dh18 = modp8192 (racoon only) Expanding - + 91 21 @@ -364,15 +364,15 @@ dh18 = modp8192 (racoon only) - + - layout70_2 + tqlayout70_2 unnamed - + AuthenticationAlgorithm2TextLabel_2 @@ -390,7 +390,7 @@ dh18 = modp8192 (racoon only) Expanding - + 81 21 @@ -401,15 +401,15 @@ dh18 = modp8192 (racoon only) - + - layout75 + tqlayout75 unnamed - + UseModeConfigCheckBox @@ -422,15 +422,15 @@ dh18 = modp8192 (racoon only) - + - layout90_2 + tqlayout90_2 unnamed - + UseXauthCheckBox @@ -454,7 +454,7 @@ dh18 = modp8192 (racoon only) Expanding - + 100 20 @@ -463,7 +463,7 @@ dh18 = modp8192 (racoon only) - + RemoteIdentifierGroupBox @@ -474,23 +474,23 @@ dh18 = modp8192 (racoon only) unnamed - + - layout74_2 + tqlayout74_2 unnamed - + - layout73_2 + tqlayout73_2 unnamed - + HashAlgoTextLabel_2_2_2 @@ -508,7 +508,7 @@ dh18 = modp8192 (racoon only) Expanding - + 51 20 @@ -531,15 +531,15 @@ dh18 = modp8192 (racoon only) Value for the local ID - + - layout72_2 + tqlayout72_2 unnamed - + RemoteIDLabel @@ -557,7 +557,7 @@ dh18 = modp8192 (racoon only) Expanding - + 51 20 @@ -585,7 +585,7 @@ dh18 = modp8192 (racoon only) - + LocalIdentifierGroupBox @@ -596,23 +596,23 @@ dh18 = modp8192 (racoon only) unnamed - + - layout74 + tqlayout74 unnamed - + - layout73 + tqlayout73 unnamed - + HashAlgoTextLabel_2_2 @@ -630,7 +630,7 @@ dh18 = modp8192 (racoon only) Expanding - + 51 20 @@ -653,15 +653,15 @@ dh18 = modp8192 (racoon only) Value for the local ID - + - layout72_3 + tqlayout72_3 unnamed - + LocalIDLabel @@ -679,7 +679,7 @@ dh18 = modp8192 (racoon only) Expanding - + 51 20 @@ -717,7 +717,7 @@ dh18 = modp8192 (racoon only) Expanding - + 20 20 @@ -736,7 +736,7 @@ dh18 = modp8192 (racoon only) Expanding - + 51 20 @@ -761,12 +761,12 @@ dh18 = modp8192 (racoon only) remoteIDTypeToggled(const QString&) - + useLeftNextHopToggled(bool) useRightNextHopToggled(bool) remoteIDTypeToggled(const QString&) localIDTypeToggled(const QString&) - + kcombobox.h diff --git a/src/newprofilewizardstart.ui b/src/newprofilewizardstart.ui index a43b5e2..4bb29f2 100644 --- a/src/newprofilewizardstart.ui +++ b/src/newprofilewizardstart.ui @@ -1,6 +1,6 @@ NewProfileWizardStart - + NewProfileWizardStart @@ -19,7 +19,7 @@ unnamed - + textLabel1 @@ -39,7 +39,7 @@ Click "Next" to continue. Expanding - + 20 31 @@ -56,7 +56,7 @@ Click "Next" to continue. Expanding - + 61 20 diff --git a/src/newprofilewizardtypeselection.ui b/src/newprofilewizardtypeselection.ui index a1d9b04..dcbc132 100644 --- a/src/newprofilewizardtypeselection.ui +++ b/src/newprofilewizardtypeselection.ui @@ -1,6 +1,6 @@ NewProfileWizardTypeSelection - + NewProfileWizardTypeSelection @@ -19,23 +19,23 @@ unnamed - + - layout25 + tqlayout25 unnamed - + - layout24 + tqlayout24 unnamed - + textLabel1 @@ -43,7 +43,7 @@ Select the type of your VPN: - + buttonGroup1 @@ -54,7 +54,7 @@ unnamed - + CiscoRadioButton @@ -68,7 +68,7 @@ true - + L2tpFreeswanRadioButton @@ -79,7 +79,7 @@ Alt+L - + L2tpRacoonRadioButton @@ -90,7 +90,7 @@ Alt+6 - + PptpRadioButton @@ -101,7 +101,7 @@ Alt+M - + OpenvpnRadioButton @@ -112,7 +112,7 @@ Alt+V - + RacoonRadioButton @@ -123,7 +123,7 @@ Alt+2 - + FreeswanRadioButton @@ -134,7 +134,7 @@ Alt+I - + CiscoVpncRadioButton @@ -145,7 +145,7 @@ Alt+Y - + VtunRadioButton @@ -156,7 +156,7 @@ Alt+V - + SshRadioButton @@ -179,7 +179,7 @@ Expanding - + 20 105 @@ -198,7 +198,7 @@ Expanding - + 16 20 diff --git a/src/newprofilewizarduser.ui b/src/newprofilewizarduser.ui index 73387ff..7ba8f9f 100644 --- a/src/newprofilewizarduser.ui +++ b/src/newprofilewizarduser.ui @@ -1,6 +1,6 @@ NewProfileWizardUser - + NewProfileWizardUser @@ -19,17 +19,17 @@ unnamed - + - layout57 + tqlayout57 unnamed - + - layout56 + tqlayout56 @@ -46,7 +46,7 @@ NT domain name for authentication - + NtDomainNameCheckbox @@ -71,7 +71,7 @@ Username for authentication - + PasswordEdit @@ -82,15 +82,15 @@ Password for authentication - + - layout54 + tqlayout54 unnamed - + LabelUsername @@ -108,7 +108,7 @@ Expanding - + 211 21 @@ -117,15 +117,15 @@ - + - layout55 + tqlayout55 unnamed - + LabelPassword @@ -143,7 +143,7 @@ Expanding - + 211 21 @@ -154,15 +154,15 @@ - + - layout52 + tqlayout52 unnamed - + CheckUserPass @@ -176,7 +176,7 @@ Save user password in config file (or in KWallet if available) - + DontSaveUsernameCheckBox @@ -202,7 +202,7 @@ Expanding - + 20 48 @@ -213,9 +213,9 @@ - + domainNameToggled(bool) - + klineedit.h diff --git a/src/openvpnmanagementhandler.cpp b/src/openvpnmanagementhandler.cpp index 02e73f8..a30b8e0 100644 --- a/src/openvpnmanagementhandler.cpp +++ b/src/openvpnmanagementhandler.cpp @@ -21,12 +21,12 @@ ***************************************************************************/ //BEGIN INCLUDES #include "openvpnmanagementhandler.h" -#include -#include +#include +#include #include #include -#include -#include +#include +#include #include #include #include "kvpncconfig.h" @@ -34,7 +34,7 @@ #include "enterxauthinteractivepasscodedialog.h" //END INCLUDES -OpenvpnManagementHandler::OpenvpnManagementHandler( QObject *, KVpncConfig *GlobalConfig ) +OpenvpnManagementHandler::OpenvpnManagementHandler( TQObject *, KVpncConfig *GlobalConfig ) { this->GlobalConfig = GlobalConfig; fInHold = false; @@ -54,18 +54,18 @@ void OpenvpnManagementHandler::closeConnection() { if (socket) { - //disconnect( socket, SIGNAL( connected() ), this, SLOT( socketConnected() ) ); - disconnect( socket, SIGNAL( connectionClosed() ), this, SLOT( socketConnectionClosed() ) ); - disconnect( socket, SIGNAL( readyRead() ), this, SLOT( socketReadyRead() ) ); - disconnect( socket, SIGNAL( error( int ) ), this, SLOT( socketError( int ) ) ); - disconnect( socket, SIGNAL( hostFound() ), this, SLOT( hostFound() ) ); + //disconnect( socket, TQT_SIGNAL( connected() ), this, TQT_SLOT( socketConnected() ) ); + disconnect( socket, TQT_SIGNAL( connectionClosed() ), this, TQT_SLOT( socketConnectionClosed() ) ); + disconnect( socket, TQT_SIGNAL( readyRead() ), this, TQT_SLOT( socketReadyRead() ) ); + disconnect( socket, TQT_SIGNAL( error( int ) ), this, TQT_SLOT( socketError( int ) ) ); + disconnect( socket, TQT_SIGNAL( hostFound() ), this, TQT_SLOT( hostFound() ) ); socket->clearPendingData(); socket->close(); - if ( socket->state() == QSocket::Closing ) + if ( socket->state() == TQSocket::Closing ) { // We have a delayed close. - connect( socket, SIGNAL( delayedCloseFinished() ), this, SLOT( socketClosed() ) ); + connect( socket, TQT_SIGNAL( delayedCloseFinished() ), this, TQT_SLOT( socketClosed() ) ); } else { @@ -80,18 +80,18 @@ void OpenvpnManagementHandler::socketConnectionClosed() if ( GlobalConfig->KvpncDebugLevel > 1 ) - GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Disconnected to the OpenVPN manage port (%1)." ).arg( QString().setNum( GlobalConfig->OpenvpnManagementPort ) ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Disconnected to the OpenVPN manage port (%1)." ).tqarg( TQString().setNum( GlobalConfig->OpenvpnManagementPort ) ), GlobalConfig->debug ); } void OpenvpnManagementHandler::socketClosed() { socketReallyClosed = false; - disconnect( socket, SIGNAL( delayedCloseFinished() ), this, SLOT( socketClosed() ) ); + disconnect( socket, TQT_SIGNAL( delayedCloseFinished() ), this, TQT_SLOT( socketClosed() ) ); delete socket; greetingtimer.stop(); - disconnect ( &greetingtimer, SIGNAL ( timeout() ), this, SLOT ( greetingTimedOut() ) ); + disconnect ( &greetingtimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( greetingTimedOut() ) ); if ( GlobalConfig->KvpncDebugLevel > 1 ) - GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Socket to the OpenVPN manage port (%1) closed." ).arg( QString().setNum( GlobalConfig->OpenvpnManagementPort ) ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Socket to the OpenVPN manage port (%1) closed." ).tqarg( TQString().setNum( GlobalConfig->OpenvpnManagementPort ) ), GlobalConfig->debug ); socketReallyClosed = true; // emit terminate_openvpn(); } @@ -99,14 +99,14 @@ void OpenvpnManagementHandler::socketClosed() void OpenvpnManagementHandler::socketConnected() { - connect( socket, SIGNAL( connectionClosed() ), this, SLOT( socketConnectionClosed() ) ); - connect( socket, SIGNAL( readyRead() ), this, SLOT( socketReadyRead() ) ); + connect( socket, TQT_SIGNAL( connectionClosed() ), this, TQT_SLOT( socketConnectionClosed() ) ); + connect( socket, TQT_SIGNAL( readyRead() ), this, TQT_SLOT( socketReadyRead() ) ); -// KMessageBox::error ( 0, QString("bar"), QString("foo") ); +// KMessageBox::error ( 0, TQString("bar"), TQString("foo") ); connectedToManagementPort=true; if ( GlobalConfig->KvpncDebugLevel > 1 ) - GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Connected to the OpenVPN manage port (%1)." ).arg( QString().setNum( GlobalConfig->OpenvpnManagementPort ) ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Connected to the OpenVPN manage port (%1)." ).tqarg( TQString().setNum( GlobalConfig->OpenvpnManagementPort ) ), GlobalConfig->debug ); socketReadyRead(); @@ -115,17 +115,17 @@ void OpenvpnManagementHandler::socketConnected() void OpenvpnManagementHandler::socketError( int e ) { - // infoText->append( tr("Error number %1 occurred\n").arg(e) ); + // infoText->append( tr("Error number %1 occurred\n").tqarg(e) ); if ( e != 0 ) - GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + QString().setNum( e ) , GlobalConfig->error ); + GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + TQString().setNum( e ) , GlobalConfig->error ); } void OpenvpnManagementHandler::greetingTimedOut() { - disconnect ( &greetingtimer, SIGNAL ( timeout() ), this, SLOT ( greetingTimedOut() ) ); + disconnect ( &greetingtimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( greetingTimedOut() ) ); greetingtimer.stop(); - GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n("Got no greeting within %1 seconds from management interface, retrying.").arg("3"), GlobalConfig->error ); + GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n("Got no greeting within %1 seconds from management interface, retrying.").tqarg("3"), GlobalConfig->error ); closeConnection(); @@ -138,10 +138,10 @@ void OpenvpnManagementHandler::greetingTimedOut() doConnect(); } -void OpenvpnManagementHandler::sendToServer( QString cmd ) +void OpenvpnManagementHandler::sendToServer( TQString cmd ) { // write to the server - QTextStream os( socket ); + TQTextStream os( socket ); os << cmd << "\n"; } @@ -150,17 +150,17 @@ void OpenvpnManagementHandler::socketReadyRead() bool abort=false; if (socket) { - if (socket->state() != QSocket::Closing && socket->state() != QSocket::Idle) + if (socket->state() != TQSocket::Closing && socket->state() != TQSocket::Idle) { while ( !abort && socket->canReadLine() ) { - QString line = socket->readLine(); + TQString line = socket->readLine(); // { - // QCString s; + // TQCString s; // s.resize( socket->bytesAvailable() + 1 ); // socket->readBlock( s.data(), socket->bytesAvailable() ); - // QString line( s ); + // TQString line( s ); // { if ( GlobalConfig->KvpncDebugLevel > 2 ) @@ -173,7 +173,7 @@ void OpenvpnManagementHandler::socketReadyRead() // else if ( line.find( ">HOLD:", 0, FALSE ) > -1 ) { // // if ( GlobalConfig->KvpncDebugLevel > 2 ) - // GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message." ).arg("'hold'"), GlobalConfig->debug ); + // GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message." ).tqarg("'hold'"), GlobalConfig->debug ); // // fInHold = true; // int ret = 0; @@ -194,7 +194,7 @@ void OpenvpnManagementHandler::socketReadyRead() if ( line.find( "INFO:OpenVPN Management Interface", 0, FALSE ) > -1 ) { gotGreeting=true; - disconnect ( &greetingtimer, SIGNAL ( timeout() ), this, SLOT ( greetingTimedOut() ) ); + disconnect ( &greetingtimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( greetingTimedOut() ) ); greetingtimer.stop (); if ( GlobalConfig->KvpncDebugLevel > 2 ) @@ -205,16 +205,16 @@ void OpenvpnManagementHandler::socketReadyRead() { if ( GlobalConfig->KvpncDebugLevel > 2 ) - GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).arg("'need ok'"), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).tqarg("'need ok'"), GlobalConfig->debug ); - QString req = line.section( QRegExp( ".*'(.*)'. * MSG:( .* )" ), 0, 0 ); // $1; - QString msg = line.section( QRegExp( ".*'(.*)'. * MSG:( .* )" ), 1, 1 ); // $2; + TQString req = line.section( TQRegExp( ".*'(.*)'. * MSG:( .* )" ), 0, 0 ); // $1; + TQString msg = line.section( TQRegExp( ".*'(.*)'. * MSG:( .* )" ), 1, 1 ); // $2; if ( GlobalConfig->KvpncDebugLevel > 2 ) - GlobalConfig->appendLogEntry( QString("OpenvpnManagementHandler: req: ")+req+QString(", msg: ")+msg , GlobalConfig->debug ); + GlobalConfig->appendLogEntry( TQString("OpenvpnManagementHandler: req: ")+req+TQString(", msg: ")+msg , GlobalConfig->debug ); //TODO: look for possible messages, msg2 is the translatable msg - QString msg2 = msg; + TQString msg2 = msg; int ret = KMessageBox::questionYesNo ( 0, msg2, i18n( "OpenVPN" ) ); @@ -223,7 +223,7 @@ void OpenvpnManagementHandler::socketReadyRead() { if ( GlobalConfig->KvpncDebugLevel > 2 ) - GlobalConfig->appendLogEntry( QString("OpenvpnManagementHandler: ") + QString("'needok': ok") , GlobalConfig->debug ); + GlobalConfig->appendLogEntry( TQString("OpenvpnManagementHandler: ") + TQString("'needok': ok") , GlobalConfig->debug ); sendToServer( "needok \"" + req + "\" ok\n" ); } @@ -231,7 +231,7 @@ void OpenvpnManagementHandler::socketReadyRead() { if ( GlobalConfig->KvpncDebugLevel > 2 ) - GlobalConfig->appendLogEntry( QString("OpenvpnManagementHandler: ") +QString( "'needok': cancel") , GlobalConfig->debug ); + GlobalConfig->appendLogEntry( TQString("OpenvpnManagementHandler: ") +TQString( "'needok': cancel") , GlobalConfig->debug ); sendToServer( "needok \"" + req + "\" cancel\n" ); } @@ -240,18 +240,18 @@ void OpenvpnManagementHandler::socketReadyRead() // if ( line.find( " >PASSWORD:", 0, FALSE ) > -1 ) { // // if ( GlobalConfig->KvpncDebugLevel > 2 ) - // GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).arg("'password'"), GlobalConfig->debug ); + // GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).tqarg("'password'"), GlobalConfig->debug ); // - // QString req = line.section( QRegExp( ".*'(.*)'.*" ), 0, 0 ); // $1; - // QCString password; - // QString pass = ""; - // int result = KPasswordDialog::getPassword( password, QString( req + i18n( " password:" ) ) ); - // QTextStream os( socket ); - // // os.setEncoding( QTextStream::UnicodeUTF8 ); + // TQString req = line.section( TQRegExp( ".*'(.*)'.*" ), 0, 0 ); // $1; + // TQCString password; + // TQString pass = ""; + // int result = KPasswordDialog::getPassword( password, TQString( req + i18n( " password:" ) ) ); + // TQTextStream os( socket ); + // // os.setEncoding( TQTextStream::UnicodeUTF8 ); // if ( result == KPasswordDialog::Accepted ) { // if ( GlobalConfig->KvpncDebugLevel > 2 ) // GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "password got from user" ), GlobalConfig->debug ); - // pass = QString( password ); + // pass = TQString( password ); // // pass = pass.remove( '\r' ); // pass = pass.remove( '\n' ); @@ -264,7 +264,7 @@ void OpenvpnManagementHandler::socketReadyRead() { if ( GlobalConfig->KvpncDebugLevel > 2 ) - GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).arg("'need username/password'"), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).tqarg("'need username/password'"), GlobalConfig->debug ); if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Send username..." ), GlobalConfig->debug ); @@ -282,9 +282,9 @@ void OpenvpnManagementHandler::socketReadyRead() if ( GlobalConfig->TmpUsername.isEmpty() ) { bool ok = false; - QString username = KInputDialog::getText ( i18n( "User name" ), i18n( "Enter username:" ), "", &ok ); - QTextStream os( socket ); - os.setEncoding( QTextStream::UnicodeUTF8 ); + TQString username = KInputDialog::getText ( i18n( "User name" ), i18n( "Enter username:" ), "", &ok ); + TQTextStream os( socket ); + os.setEncoding( TQTextStream::UnicodeUTF8 ); if ( ok == true && !username.isEmpty() ) { if ( GlobalConfig->KvpncDebugLevel > 2 ) @@ -314,7 +314,7 @@ void OpenvpnManagementHandler::socketReadyRead() { if ( GlobalConfig->KvpncDebugLevel > 2 ) - GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).arg("SUCCESS: 'Auth' username entered"), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).tqarg("SUCCESS: 'Auth' username entered"), GlobalConfig->debug ); if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Send password..." ), GlobalConfig->debug ); @@ -331,16 +331,16 @@ void OpenvpnManagementHandler::socketReadyRead() { if ( GlobalConfig->TmpPassword.isEmpty() ) { - QCString password; - QString pass = ""; - int result = KPasswordDialog::getPassword( password, QString( i18n( " password:" ) ) ); - QTextStream os( socket ); - // os.setEncoding( QTextStream::UnicodeUTF8 ); + TQCString password; + TQString pass = ""; + int result = KPasswordDialog::getPassword( password, TQString( i18n( " password:" ) ) ); + TQTextStream os( socket ); + // os.setEncoding( TQTextStream::UnicodeUTF8 ); if ( result == KPasswordDialog::Accepted ) { if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "password got from user" ), GlobalConfig->debug ); - GlobalConfig->TmpPassword = QString( password ); + GlobalConfig->TmpPassword = TQString( password ); // if ( GlobalConfig->KvpncDebugLevel > 5 ) @@ -367,7 +367,7 @@ void OpenvpnManagementHandler::socketReadyRead() // else if ( line.find( "SUCCESS: 'Auth' username entered", 0, FALSE ) > -1 ) { // // if ( GlobalConfig->KvpncDebugLevel > 2 ) - // GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message, 2. step" ).arg("'need username/password'"), GlobalConfig->debug ); + // GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message, 2. step" ).tqarg("'need username/password'"), GlobalConfig->debug ); // // if ( GlobalConfig->KvpncDebugLevel > 2 ) // GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Send password..." ), GlobalConfig->debug ); @@ -383,7 +383,7 @@ void OpenvpnManagementHandler::socketReadyRead() { if ( GlobalConfig->KvpncDebugLevel > 2 ) - GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).arg("'HTTP Proxy password'"), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).tqarg("'HTTP Proxy password'"), GlobalConfig->debug ); if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Send HTTP Proxy username..." ), GlobalConfig->debug ); @@ -402,7 +402,7 @@ void OpenvpnManagementHandler::socketReadyRead() { if ( GlobalConfig->KvpncDebugLevel > 2 ) - GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).arg("SUCCESS: 'HTTP Proxy' username entered"), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).tqarg("SUCCESS: 'HTTP Proxy' username entered"), GlobalConfig->debug ); if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Send HTTP Proxy password..." ), GlobalConfig->debug ); @@ -418,11 +418,11 @@ void OpenvpnManagementHandler::socketReadyRead() { if ( GlobalConfig->TmpHttpProxyPassword.isEmpty() ) { - QCString password; - QString pass = ""; + TQCString password; + TQString pass = ""; - QTextStream os( socket ); - os.setEncoding( QTextStream::UnicodeUTF8 ); + TQTextStream os( socket ); + os.setEncoding( TQTextStream::UnicodeUTF8 ); GlobalConfig->TmpHttpProxyPassword = ""; EnterXauthInteractivePasscodeDialog dlg( 0); @@ -445,10 +445,10 @@ void OpenvpnManagementHandler::socketReadyRead() if ( dlg.main->SavePasswordCheckBox->isChecked() ) { // GlobalConfig->currentProfile->setSavePrivateKeyPassword(true); - GlobalConfig->currentProfile->setHttpProxyPass ( QString( pass ) ); + GlobalConfig->currentProfile->setHttpProxyPass ( TQString( pass ) ); } - GlobalConfig->TmpHttpProxyPassword = QString( pass ); + GlobalConfig->TmpHttpProxyPassword = TQString( pass ); if ( GlobalConfig->KvpncDebugLevel > 5 ) GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: HTTP proxy auth password: " + GlobalConfig->TmpHttpProxyPassword, GlobalConfig->debug ); @@ -476,7 +476,7 @@ void OpenvpnManagementHandler::socketReadyRead() if ( GlobalConfig->KvpncDebugLevel > 5 ) { GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: HTTP proxy auth password: " + GlobalConfig->TmpHttpProxyPassword, GlobalConfig->debug ); - GlobalConfig->appendLogEntry( QString( "OpenvpnManagementHandler: HTTP proxy auth password string: " ) + QString( "password \"HTTP Proxy\" " + GlobalConfig->TmpHttpProxyPassword + "\n" ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( TQString( "OpenvpnManagementHandler: HTTP proxy auth password string: " ) + TQString( "password \"HTTP Proxy\" " + GlobalConfig->TmpHttpProxyPassword + "\n" ), GlobalConfig->debug ); } } } @@ -486,7 +486,7 @@ void OpenvpnManagementHandler::socketReadyRead() { if ( GlobalConfig->KvpncDebugLevel > 2 ) - GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).arg("'private key password'"), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).tqarg("'private key password'"), GlobalConfig->debug ); if ( !GlobalConfig->currentProfile->getPrivateKeyPass().isEmpty() ) { @@ -504,11 +504,11 @@ void OpenvpnManagementHandler::socketReadyRead() if ( ( Utils(GlobalConfig).getNeedsPassphrase(GlobalConfig->TmpPrivateKeyPass) && GlobalConfig->TmpPrivateKeyPass.isEmpty() ) || GlobalConfig->currentProfile->getPrivateKeyPass().isEmpty() ) { GlobalConfig->TmpPassword = ""; - QCString password; - QString pass = ""; + TQCString password; + TQString pass = ""; - QTextStream os( socket ); - // os.setEncoding( QTextStream::UnicodeUTF8 ); + TQTextStream os( socket ); + // os.setEncoding( TQTextStream::UnicodeUTF8 ); GlobalConfig->TmpPrivateKeyPass = ""; EnterXauthInteractivePasscodeDialog dlg( 0); @@ -532,10 +532,10 @@ void OpenvpnManagementHandler::socketReadyRead() if ( dlg.main->SavePasswordCheckBox->isChecked() ) { GlobalConfig->currentProfile->setSavePrivateKeyPassword( true ); - GlobalConfig->currentProfile->setPrivateKeyPass( QString( pass ) ); + GlobalConfig->currentProfile->setPrivateKeyPass( TQString( pass ) ); } - GlobalConfig->TmpPrivateKeyPass = QString( pass ); + GlobalConfig->TmpPrivateKeyPass = TQString( pass ); // if ( GlobalConfig->KvpncDebugLevel > 5 ) // GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: private key password: " + GlobalConfig->TmpPrivateKeyPass, GlobalConfig->debug ); @@ -563,7 +563,7 @@ void OpenvpnManagementHandler::socketReadyRead() // if ( GlobalConfig->KvpncDebugLevel > 5 ) // { // GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: private key password: " + GlobalConfig->TmpPrivateKeyPass, GlobalConfig->debug ); - // GlobalConfig->appendLogEntry( QString("OpenvpnManagementHandler: private key password string: ") + QString("password \"Private Key\" " + GlobalConfig->TmpPrivateKeyPass + "\n"),GlobalConfig->debug); + // GlobalConfig->appendLogEntry( TQString("OpenvpnManagementHandler: private key password string: ") + TQString("password \"Private Key\" " + GlobalConfig->TmpPrivateKeyPass + "\n"),GlobalConfig->debug); // } } } @@ -576,11 +576,11 @@ void OpenvpnManagementHandler::socketReadyRead() GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "wrong private key password" ), GlobalConfig->debug ); GlobalConfig->TmpPassword = ""; - QCString password; - QString pass = ""; + TQCString password; + TQString pass = ""; - QTextStream os( socket ); - // os.setEncoding( QTextStream::UnicodeUTF8 ); + TQTextStream os( socket ); + // os.setEncoding( TQTextStream::UnicodeUTF8 ); GlobalConfig->TmpPrivateKeyPass = ""; EnterXauthInteractivePasscodeDialog dlg( 0); @@ -603,10 +603,10 @@ void OpenvpnManagementHandler::socketReadyRead() if ( dlg.main->SavePasswordCheckBox->isChecked() ) { GlobalConfig->currentProfile->setSavePrivateKeyPassword( true ); - GlobalConfig->currentProfile->setPrivateKeyPass( QString( pass ) ); + GlobalConfig->currentProfile->setPrivateKeyPass( TQString( pass ) ); } - GlobalConfig->TmpPrivateKeyPass = QString( pass ); + GlobalConfig->TmpPrivateKeyPass = TQString( pass ); // if ( GlobalConfig->KvpncDebugLevel > 5 ) // GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: private key password: " + GlobalConfig->TmpPrivateKeyPass, GlobalConfig->debug ); @@ -643,7 +643,7 @@ void OpenvpnManagementHandler::socketReadyRead() if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: password verification failed!" , GlobalConfig->error ); - GlobalConfig->appendLogEntry( i18n( "Authentication failed (%1)!" ).arg( i18n( "user password" ) ) , GlobalConfig->error ); + GlobalConfig->appendLogEntry( i18n( "Authentication failed (%1)!" ).tqarg( i18n( "user password" ) ) , GlobalConfig->error ); abort = true; } @@ -654,7 +654,7 @@ void OpenvpnManagementHandler::socketReadyRead() if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry( i18n("OpenvpnManagementHandler: CA certifcate file could not be loaded! Please check your CA certificate file.") , GlobalConfig->error ); - GlobalConfig->appendLogEntry( i18n( "Certificate load failed (%1)!" ).arg( i18n( "CA certificate" ) ) , GlobalConfig->error ); + GlobalConfig->appendLogEntry( i18n( "Certificate load failed (%1)!" ).tqarg( i18n( "CA certificate" ) ) , GlobalConfig->error ); abort = true; } @@ -663,9 +663,9 @@ void OpenvpnManagementHandler::socketReadyRead() { if ( GlobalConfig->KvpncDebugLevel > 2 ) - GlobalConfig->appendLogEntry( i18n("OpenvpnManagementHandler: Hash algorithm %1 could not found! Please check your OpenVPN settings.").arg(line.section(' ',3,3).remove('\'')) , GlobalConfig->error ); + GlobalConfig->appendLogEntry( i18n("OpenvpnManagementHandler: Hash algorithm %1 could not found! Please check your OpenVPN settings.").tqarg(line.section(' ',3,3).remove('\'')) , GlobalConfig->error ); - GlobalConfig->appendLogEntry( i18n( "Hash algorithm not found (%1)!" ).arg(line.section(' ',3,3).remove('\'') ) , GlobalConfig->error ); + GlobalConfig->appendLogEntry( i18n( "Hash algorithm not found (%1)!" ).tqarg(line.section(' ',3,3).remove('\'') ) , GlobalConfig->error ); abort = true; } @@ -673,16 +673,16 @@ void OpenvpnManagementHandler::socketReadyRead() else if ( line.find( "PASSWORD:Need 'eToken token' password", 0, FALSE ) > -1) { GlobalConfig->TmpPassword = ""; - QCString password; - QString pass = ""; + TQCString password; + TQString pass = ""; - QTextStream os( socket ); - // os.setEncoding( QTextStream::UnicodeUTF8 ); + TQTextStream os( socket ); + // os.setEncoding( TQTextStream::UnicodeUTF8 ); GlobalConfig->TmpPrivateKeyPass = ""; EnterXauthInteractivePasscodeDialog dlg( 0); dlg.setCaption( i18n( "Enter token pin" ) ); - dlg.main->DescriptionLabel->setText( i18n( "Enter eToken pin for unlocking token \"%1\":" ).arg(GlobalConfig->currentProfile->getPkcs11Id()) ); + dlg.main->DescriptionLabel->setText( i18n( "Enter eToken pin for unlocking token \"%1\":" ).tqarg(GlobalConfig->currentProfile->getPkcs11Id()) ); dlg.main->LabelPassword->setText( i18n( "eToken pin:" ) ); dlg.main->SavePasswordCheckBox->hide(); dlg.main->adjustSize(); @@ -700,7 +700,7 @@ void OpenvpnManagementHandler::socketReadyRead() GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "token password got from user" ), GlobalConfig->debug ); - GlobalConfig->TmpPrivateKeyPass = QString( pass ); + GlobalConfig->TmpPrivateKeyPass = TQString( pass ); // if ( GlobalConfig->KvpncDebugLevel > 5 ) // GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: token password: " + GlobalConfig->TmpPrivateKeyPass, GlobalConfig->debug ); @@ -727,27 +727,27 @@ void OpenvpnManagementHandler::socketReadyRead() else if ( line.find( "SUCCESS: 'eToken token' password entered, but not yet verified", 0, FALSE ) > -1 ) { if ( GlobalConfig->KvpncDebugLevel > 1 ) - GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).arg("SUCCESS for 'eToken token' password"), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).tqarg("SUCCESS for 'eToken token' password"), GlobalConfig->debug ); } else if ( line.find( ">PASSWORD:Need '", 0, FALSE) > -1 && line.find( "token' password", 0, FALSE ) > -1) { GlobalConfig->TmpPassword = ""; - QCString password; - QString pass = ""; - QString TokenName = line.section('\'',1,1); + TQCString password; + TQString pass = ""; + TQString TokenName = line.section('\'',1,1); if ( GlobalConfig->KvpncDebugLevel > 4 ) { - GlobalConfig->appendLogEntry ( "[openvpn] " + i18n( "token name detected: %1\n" ).arg(TokenName), GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( "[openvpn] " + i18n( "token name detected: %1\n" ).tqarg(TokenName), GlobalConfig->debug ); } - QTextStream os( socket ); - // os.setEncoding( QTextStream::UnicodeUTF8 ); + TQTextStream os( socket ); + // os.setEncoding( TQTextStream::UnicodeUTF8 ); GlobalConfig->TmpPrivateKeyPass = ""; EnterXauthInteractivePasscodeDialog dlg( 0); dlg.setCaption( i18n( "Enter token pin" ) ); - dlg.main->DescriptionLabel->setText( i18n( "Enter pin for unlocking token \"%1\":" ).arg(GlobalConfig->currentProfile->getPkcs11Id()) ); + dlg.main->DescriptionLabel->setText( i18n( "Enter pin for unlocking token \"%1\":" ).tqarg(GlobalConfig->currentProfile->getPkcs11Id()) ); dlg.main->LabelPassword->setText( i18n( "PIN:" ) ); dlg.main->SavePasswordCheckBox->hide(); dlg.main->adjustSize(); @@ -765,7 +765,7 @@ void OpenvpnManagementHandler::socketReadyRead() GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "token password got from user" ), GlobalConfig->debug ); - GlobalConfig->TmpPrivateKeyPass = QString( pass ); + GlobalConfig->TmpPrivateKeyPass = TQString( pass ); // if ( GlobalConfig->KvpncDebugLevel > 5 ) // GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: token password: " + GlobalConfig->TmpPrivateKeyPass, GlobalConfig->debug ); @@ -791,26 +791,26 @@ void OpenvpnManagementHandler::socketReadyRead() else if ( line.find( "SUCCESS: '", 0, FALSE ) > -1 && line.find( "token' password entered, but not yet verified", 0, FALSE ) > -1 ) { - QString TokenName = line.section('\'',1,1); + TQString TokenName = line.section('\'',1,1); if ( GlobalConfig->KvpncDebugLevel > 4 ) { - GlobalConfig->appendLogEntry ( "[openvpn] " + i18n( "token name detected: %1\n" ).arg(TokenName), GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( "[openvpn] " + i18n( "token name detected: %1\n" ).tqarg(TokenName), GlobalConfig->debug ); } if ( GlobalConfig->KvpncDebugLevel > 1 ) - GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).arg("SUCCESS for '%1' password").arg(TokenName), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).tqarg("SUCCESS for '%1' password").tqarg(TokenName), GlobalConfig->debug ); } else if ( line.find( "SUCCESS: 'Auth' password entered, but not yet verified", 0, FALSE ) > -1 ) { if ( GlobalConfig->KvpncDebugLevel > 1 ) - GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).arg("SUCCESS for user password"), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).tqarg("SUCCESS for user password"), GlobalConfig->debug ); } else if ( line.find( "Need 'token-insertion-request'", 0, FALSE ) > -1 ) { // if ( GlobalConfig->KvpncDebugLevel > 1 ) - GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).arg("token-insertion-request"), GlobalConfig->debug ); - KMessageBox::error ( 0, i18n("Token \"%1\" is not inserted!").arg(GlobalConfig->currentProfile->getPkcs11Id()), i18n("Token missing") ); + GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).tqarg("token-insertion-request"), GlobalConfig->debug ); + KMessageBox::error ( 0, i18n("Token \"%1\" is not inserted!").tqarg(GlobalConfig->currentProfile->getPkcs11Id()), i18n("Token missing") ); abort = true; } @@ -818,7 +818,7 @@ void OpenvpnManagementHandler::socketReadyRead() { if ( GlobalConfig->KvpncDebugLevel > 1 ) - GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).arg("SUCCESS for 'Private Key' password"), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).tqarg("SUCCESS for 'Private Key' password"), GlobalConfig->debug ); } else if ( line.find( "external program fork failed", 0, FALSE ) > -1 ) { @@ -830,22 +830,22 @@ void OpenvpnManagementHandler::socketReadyRead() else { if ( GlobalConfig->KvpncDebugLevel > 1 ) - GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got other management message: %1" ).arg(line), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got other management message: %1" ).tqarg(line), GlobalConfig->debug ); } if (abort) { if (socket) { - disconnect( socket, SIGNAL( connected() ), this, SLOT( socketConnected() ) ); - disconnect( socket, SIGNAL( connectionClosed() ), this, SLOT( socketConnectionClosed() ) ); - disconnect( socket, SIGNAL( readyRead() ), this, SLOT( socketReadyRead() ) ); - disconnect( socket, SIGNAL( error( int ) ), this, SLOT( socketError( int ) ) ); - disconnect( socket, SIGNAL( hostFound() ), this, SLOT( hostFound() ) ); + disconnect( socket, TQT_SIGNAL( connected() ), this, TQT_SLOT( socketConnected() ) ); + disconnect( socket, TQT_SIGNAL( connectionClosed() ), this, TQT_SLOT( socketConnectionClosed() ) ); + disconnect( socket, TQT_SIGNAL( readyRead() ), this, TQT_SLOT( socketReadyRead() ) ); + disconnect( socket, TQT_SIGNAL( error( int ) ), this, TQT_SLOT( socketError( int ) ) ); + disconnect( socket, TQT_SIGNAL( hostFound() ), this, TQT_SLOT( hostFound() ) ); socket->close(); - if ( socket->state() == QSocket::Closing ) + if ( socket->state() == TQSocket::Closing ) { // We have a delayed close. - connect( socket, SIGNAL(delayedCloseFinished()), this, SLOT(socketClosed()) ); + connect( socket, TQT_SIGNAL(delayedCloseFinished()), this, TQT_SLOT(socketClosed()) ); } else { @@ -861,7 +861,7 @@ void OpenvpnManagementHandler::socketReadyRead() { if ( GlobalConfig->KvpncDebugLevel > 4 ) { - GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Socket state is strange: %1" ).arg( QString().setNum( socket->state() ) ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Socket state is strange: %1" ).tqarg( TQString().setNum( socket->state() ) ), GlobalConfig->debug ); } } } @@ -876,23 +876,23 @@ bool OpenvpnManagementHandler::doConnect() { socket = 0L; - socket = new QSocket( this ); + socket = new TQSocket( this ); if (socket) { - connect( socket, SIGNAL( connected() ), this, SLOT( socketConnected() ) ); - connect( socket, SIGNAL( hostFound() ), this, SLOT( hostFound() ) ); - connect( socket, SIGNAL( error( int ) ), this, SLOT( socketError( int ) ) ); + connect( socket, TQT_SIGNAL( connected() ), this, TQT_SLOT( socketConnected() ) ); + connect( socket, TQT_SIGNAL( hostFound() ), this, TQT_SLOT( hostFound() ) ); + connect( socket, TQT_SIGNAL( error( int ) ), this, TQT_SLOT( socketError( int ) ) ); - if ( socket->state() == QSocket::Idle ) + if ( socket->state() == TQSocket::Idle ) { if ( GlobalConfig->KvpncDebugLevel > 1 ) { - GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Connecting to the OpenVPN manage port (%1)..." ).arg( QString().setNum( GlobalConfig->OpenvpnManagementPort ) ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Connecting to the OpenVPN manage port (%1)..." ).tqarg( TQString().setNum( GlobalConfig->OpenvpnManagementPort ) ), GlobalConfig->debug ); } socket->connectToHost( "127.0.0.1", GlobalConfig->OpenvpnManagementPort ); - connect ( &greetingtimer, SIGNAL ( timeout() ), this, SLOT ( greetingTimedOut() ) ); + connect ( &greetingtimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( greetingTimedOut() ) ); greetingtimer.start ( 3 * 1000, TRUE ); if ( GlobalConfig->KvpncDebugLevel > 2 ) @@ -916,10 +916,10 @@ bool OpenvpnManagementHandler::doConnect() void OpenvpnManagementHandler::hostFound() { -// KMessageBox::error ( 0, QString("bar"), QString("foo") ); +// KMessageBox::error ( 0, TQString("bar"), TQString("foo") ); if ( GlobalConfig->KvpncDebugLevel > 1 ) { - GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Connecting to the OpenVPN manage port (%1)... host found" ).arg( QString().setNum( GlobalConfig->OpenvpnManagementPort ) ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Connecting to the OpenVPN manage port (%1)... host found" ).tqarg( TQString().setNum( GlobalConfig->OpenvpnManagementPort ) ), GlobalConfig->debug ); } } diff --git a/src/openvpnmanagementhandler.h b/src/openvpnmanagementhandler.h index 7f553ec..f074c90 100644 --- a/src/openvpnmanagementhandler.h +++ b/src/openvpnmanagementhandler.h @@ -21,25 +21,26 @@ #define OPENVPNMANAGEMENTHANDLER_H #include -#include -#include +#include +#include #include "kvpncconfig.h" -class QSocket; +class TQSocket; /** @author Christoph Thielecke */ -class OpenvpnManagementHandler : public QObject { +class OpenvpnManagementHandler : public TQObject { Q_OBJECT + TQ_OBJECT public: - OpenvpnManagementHandler(QObject *parent, KVpncConfig *GlobalConfig ); + OpenvpnManagementHandler(TQObject *parent, KVpncConfig *GlobalConfig ); ~OpenvpnManagementHandler(); void closeConnection(); bool isConnectedToManagementPort(); bool doConnect(); - QTimer greetingtimer; + TQTimer greetingtimer; bool socketReallyClosed; protected slots: @@ -52,15 +53,15 @@ class OpenvpnManagementHandler : public QObject { void greetingTimedOut(); public slots: - void sendToServer(QString cmd); + void sendToServer(TQString cmd); private: KVpncConfig *GlobalConfig; bool fInHold; bool gotGreeting; bool connectedToManagementPort; - QSocket *socket; - QString errormsg; + TQSocket *socket; + TQString errormsg; signals: void terminate_openvpn(); diff --git a/src/preferencesdialog.cpp b/src/preferencesdialog.cpp index 4c80e95..4ea5460 100644 --- a/src/preferencesdialog.cpp +++ b/src/preferencesdialog.cpp @@ -22,21 +22,21 @@ ***************************************************************************/ //BEGIN INCLUDES #include "preferencesdialog.h" -#include -#include +#include +#include #include -#include -#include +#include +#include #include -#include -#include +#include +#include #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include @@ -44,11 +44,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "networkinterface.h" #include "utils.h" #include "importcertificatedialog.h" @@ -57,16 +57,16 @@ #include //END INCLUDES -PreferencesDialog::PreferencesDialog( QWidget *parent, QApplication *app, QTextEdit *LogOutput, KVpncConfig *GlobalConfig, bool showOnlyProfiles ) : KDialogBase ( KDialogBase::TreeList, i18n( "Preferences..." ), +PreferencesDialog::PreferencesDialog( TQWidget *parent, TQApplication *app, TQTextEdit *LogOutput, KVpncConfig *GlobalConfig, bool showOnlyProfiles ) : KDialogBase ( KDialogBase::TreeList, i18n( "Preferences..." ), KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel | KDialogBase::Help, KDialogBase::Ok, parent, "configdialog" ) { - GlobalConfig->appPointer->setOverrideCursor( QCursor(Qt::WaitCursor) ); + GlobalConfig->appPointer->setOverrideCursor( TQCursor(TQt::WaitCursor) ); GlobalConfig->prefDlgOpen = true; //main = new PreferencesDialogBase(this); //setMainWidget(main); - //main->setMinimumSize(main->sizeHint()) + //main->setMinimumSize(main->tqsizeHint()) this->AccountList = GlobalConfig->AccountList; this->LogOutput = LogOutput; @@ -221,21 +221,21 @@ PreferencesDialog::PreferencesDialog( QWidget *parent, QApplication *app, QTextE ConfigDaemonOptionsWidget->SshPathInput->setURL( GlobalConfig->pathToSsh ); - if ( VpncInfo->found && QFileInfo( VpncInfo->PathToExec ).isFile() && VpncInfo->found ) + if ( VpncInfo->found && TQFileInfo( VpncInfo->PathToExec ).isFile() && VpncInfo->found ) ConfigDaemonOptionsWidget->VpncStatePixmapLabel->setPixmap( ok_icon ); else ConfigDaemonOptionsWidget->CiscoVpncStatePixmapLabel->setPixmap( wrong_icon ); - if ( VpncInfo->found && QFileInfo( CiscoVpncInfo->PathToExec ).isFile() && CiscoVpncInfo->found ) + if ( VpncInfo->found && TQFileInfo( CiscoVpncInfo->PathToExec ).isFile() && CiscoVpncInfo->found ) ConfigDaemonOptionsWidget->CiscoVpncStatePixmapLabel->setPixmap( ok_icon ); else ConfigDaemonOptionsWidget->CiscoVpncStatePixmapLabel->setPixmap( wrong_icon ); - if ( VtunInfo->found && QFileInfo( VtunInfo->PathToExec ).isFile() && VtunInfo->found ) + if ( VtunInfo->found && TQFileInfo( VtunInfo->PathToExec ).isFile() && VtunInfo->found ) ConfigDaemonOptionsWidget->VtundStatePixmapLabel->setPixmap( ok_icon ); else ConfigDaemonOptionsWidget->VtundStatePixmapLabel->setPixmap( wrong_icon ); - if ( SshInfo->found && QFileInfo( SshInfo->PathToExec ).isFile() && SshInfo->found ) + if ( SshInfo->found && TQFileInfo( SshInfo->PathToExec ).isFile() && SshInfo->found ) ConfigDaemonOptionsWidget->SshStatePixmapLabel->setPixmap( ok_icon ); else ConfigDaemonOptionsWidget->SshStatePixmapLabel->setPixmap( wrong_icon ); @@ -419,7 +419,7 @@ PreferencesDialog::PreferencesDialog( QWidget *parent, QApplication *app, QTextE ConfigDaemonOptionsWidget->PppdKernelLogLevelComboBox->setCurrentText(i18n("general + packets")); ConfigDaemonOptionsWidget->DebugL2tpdCheckBox->setChecked( GlobalConfig->enableDebugL2tpd ); - for ( QStringList::Iterator it = GlobalConfig->PlutoDebug.begin(); it != GlobalConfig->PlutoDebug.end(); ++it ) + for ( TQStringList::Iterator it = GlobalConfig->PlutoDebug.begin(); it != GlobalConfig->PlutoDebug.end(); ++it ) { if (*it == "raw") ConfigDaemonOptionsWidget->IpsecRawDebugCheckBox->setChecked(true); @@ -438,7 +438,7 @@ PreferencesDialog::PreferencesDialog( QWidget *parent, QApplication *app, QTextE } - for ( QStringList::Iterator it = GlobalConfig->KlipsDebug.begin(); it != GlobalConfig->KlipsDebug.end(); ++it ) + for ( TQStringList::Iterator it = GlobalConfig->KlipsDebug.begin(); it != GlobalConfig->KlipsDebug.end(); ++it ) { if (*it == "tunnel-xmit") ConfigDaemonOptionsWidget->KlipsDebugTunnel_xmitCheckBox->setChecked(true); @@ -481,24 +481,24 @@ PreferencesDialog::PreferencesDialog( QWidget *parent, QApplication *app, QTextE LogOptionsWidget->LogFontSizeSpinBox->setValue( GlobalConfig->LogViewerFontSize ); /* keep english names! */ - ConfigDaemonOptionsWidget->KlipsDebugTunnel_xmitCheckBox->setText( QString( "&tunnel-xmit" ) ); - ConfigDaemonOptionsWidget->KlipsDebugPfkeyCheckBox->setText( QString( "pfkey" ) ); - ConfigDaemonOptionsWidget->KlipsDebugXformCheckBox->setText( QString( "xform" ) ); - ConfigDaemonOptionsWidget->KlipsDebugErouteCheckBox->setText( QString( "eroute" ) ); - ConfigDaemonOptionsWidget->KlipsDebugSpiCheckBox->setText( QString( "spi" ) ); - ConfigDaemonOptionsWidget->KlipsDebugRadijCheckBox->setText( QString( "radij" ) ); - ConfigDaemonOptionsWidget->KlipsDebugEspCheckBox->setText( QString( "esp" ) ); - ConfigDaemonOptionsWidget->KlipsDebugAhCheckBox->setText( QString( "ah" ) ); - ConfigDaemonOptionsWidget->KlipsDebugIpcompCheckBox->setText( QString( "ipcomp" ) ); - ConfigDaemonOptionsWidget->KlipsDebugVerboseCheckBox->setText( QString( "verbose" ) ); + ConfigDaemonOptionsWidget->KlipsDebugTunnel_xmitCheckBox->setText( TQString( "&tunnel-xmit" ) ); + ConfigDaemonOptionsWidget->KlipsDebugPfkeyCheckBox->setText( TQString( "pfkey" ) ); + ConfigDaemonOptionsWidget->KlipsDebugXformCheckBox->setText( TQString( "xform" ) ); + ConfigDaemonOptionsWidget->KlipsDebugErouteCheckBox->setText( TQString( "eroute" ) ); + ConfigDaemonOptionsWidget->KlipsDebugSpiCheckBox->setText( TQString( "spi" ) ); + ConfigDaemonOptionsWidget->KlipsDebugRadijCheckBox->setText( TQString( "radij" ) ); + ConfigDaemonOptionsWidget->KlipsDebugEspCheckBox->setText( TQString( "esp" ) ); + ConfigDaemonOptionsWidget->KlipsDebugAhCheckBox->setText( TQString( "ah" ) ); + ConfigDaemonOptionsWidget->KlipsDebugIpcompCheckBox->setText( TQString( "ipcomp" ) ); + ConfigDaemonOptionsWidget->KlipsDebugVerboseCheckBox->setText( TQString( "verbose" ) ); - ConfigDaemonOptionsWidget->IpsecEmittingDebugCheckBox->setText( QString( "emitting" ) ); - ConfigDaemonOptionsWidget->IpsecCryptDebugCheckBox->setText( QString( "cr&ypt" ) ); - ConfigDaemonOptionsWidget->IpsecRawDebugCheckBox->setText( QString( "&raw" ) ); - ConfigDaemonOptionsWidget->IpsecKlipsDebugCheckBox->setText( QString( "&klips" ) ); - ConfigDaemonOptionsWidget->IpsecParsingDebugCheckBox->setText( QString( "&parsing" ) ); - ConfigDaemonOptionsWidget->IpsecPrivateDebugCheckBox->setText( QString( "&private" ) ); - ConfigDaemonOptionsWidget->IpsecControlDebugCheckBox->setText( QString( "&control" ) ); + ConfigDaemonOptionsWidget->IpsecEmittingDebugCheckBox->setText( TQString( "emitting" ) ); + ConfigDaemonOptionsWidget->IpsecCryptDebugCheckBox->setText( TQString( "cr&ypt" ) ); + ConfigDaemonOptionsWidget->IpsecRawDebugCheckBox->setText( TQString( "&raw" ) ); + ConfigDaemonOptionsWidget->IpsecKlipsDebugCheckBox->setText( TQString( "&klips" ) ); + ConfigDaemonOptionsWidget->IpsecParsingDebugCheckBox->setText( TQString( "&parsing" ) ); + ConfigDaemonOptionsWidget->IpsecPrivateDebugCheckBox->setText( TQString( "&private" ) ); + ConfigDaemonOptionsWidget->IpsecControlDebugCheckBox->setText( TQString( "&control" ) ); bool profileInList = false; for ( uint i = 0; i < GlobalConfig->AccountList->count();i++ ) @@ -527,12 +527,12 @@ PreferencesDialog::PreferencesDialog( QWidget *parent, QApplication *app, QTextE // TODO read types from list ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "Cisco (vpnc)" ), VpnAccountData::cisco ); - ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "IPSec (%1)" ).arg("racoon"), VpnAccountData::racoon ); - ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "IPSec (%1)" ).arg("Openswan/strongSwan"), VpnAccountData::freeswan ); + ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "IPSec (%1)" ).tqarg("racoon"), VpnAccountData::racoon ); + ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "IPSec (%1)" ).tqarg("Openswan/strongSwan"), VpnAccountData::freeswan ); ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "PPTP" ), VpnAccountData::pptp ); ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "OpenVPN" ), VpnAccountData::openvpn ); - ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "L2TP (%1)" ).arg("racoon"), VpnAccountData::l2tpd_racoon ); - ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "L2TP (%1)" ).arg("Openswan/strongSwan"), VpnAccountData::l2tpd_freeswan ); + ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "L2TP (%1)" ).tqarg("racoon"), VpnAccountData::l2tpd_racoon ); + ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "L2TP (%1)" ).tqarg("Openswan/strongSwan"), VpnAccountData::l2tpd_freeswan ); ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "Cisco (proprietary)" ), VpnAccountData::ciscoorig ); ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "Vtun" ), VpnAccountData::vtun ); ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "SSH" ), VpnAccountData::ssh ); @@ -565,8 +565,8 @@ PreferencesDialog::PreferencesDialog( QWidget *parent, QApplication *app, QTextE /* none: No ID address: The type is the IP address. This is the default type if you do not specify an identifier to use - user_fqdn: The type is a USER_FQDN (user fully-qualified domain name) - fqdn: The type is a FQDN (fully-qualified domain name) + user_fqdn: The type is a USER_FTQDN (user fully-qualified domain name) + fqdn: The type is a FTQDN (fully-qualified domain name) keyid: The type is a KEY_ID, read from the file keyid: The type is a KEY_ID, specified in the quoted string asn1dn: The type is an ASN.1 distinguished name. If empty, DN from the Subject field in the certificate will be used @@ -627,13 +627,13 @@ PreferencesDialog::PreferencesDialog( QWidget *parent, QApplication *app, QTextE // // phase 2 encr algos from kernel -// for ( QStringList::Iterator it = KernelCrypto.IpsecEspEncryptionAlgorithms.begin(); it != KernelCrypto.IpsecEspEncryptionAlgorithms.end(); ++it ) +// for ( TQStringList::Iterator it = KernelCrypto.IpsecEspEncryptionAlgorithms.begin(); it != KernelCrypto.IpsecEspEncryptionAlgorithms.end(); ++it ) // { // ProfileRacoonOptionsWidget->EncryptionAlgorithm2ComboBox->insertItem ( *it ); // } // // // phase 2 auth algos from kernel -// for ( QStringList::Iterator it = KernelCrypto.IpsecEspAuthenticationAlgorithms.begin(); it != KernelCrypto.IpsecEspAuthenticationAlgorithms.end(); ++it ) +// for ( TQStringList::Iterator it = KernelCrypto.IpsecEspAuthenticationAlgorithms.begin(); it != KernelCrypto.IpsecEspAuthenticationAlgorithms.end(); ++it ) // { // ProfileRacoonOptionsWidget->AuthenticationAlgorithm2ComboBox->insertItem ( *it ); // } @@ -670,15 +670,15 @@ PreferencesDialog::PreferencesDialog( QWidget *parent, QApplication *app, QTextE slotStatusMsg ( i18n( "Collecting OpenVPN capabilities..."), ID_FLASH_MSG ); - QStringList ciphers = Utils( GlobalConfig ).getOpenvpnCiphers(); - QStringList digests = Utils( GlobalConfig ).getOpenvpnDigests(); + TQStringList ciphers = Utils( GlobalConfig ).getOpenvpnCiphers(); + TQStringList digests = Utils( GlobalConfig ).getOpenvpnDigests(); - for ( QStringList::Iterator it = ciphers.begin(); it != ciphers.end(); ++it ) + for ( TQStringList::Iterator it = ciphers.begin(); it != ciphers.end(); ++it ) { ProfileOpenvpnOptionsWidget->UserdefiniedCipherComboBox->insertItem( *it ); } - for ( QStringList::Iterator it = digests.begin(); it != digests.end(); ++it ) + for ( TQStringList::Iterator it = digests.begin(); it != digests.end(); ++it ) { ProfileOpenvpnOptionsWidget->UserdefiniedDigestComboBox->insertItem( *it ); } @@ -696,7 +696,7 @@ PreferencesDialog::PreferencesDialog( QWidget *parent, QApplication *app, QTextE ProfileCiscoOptionsWidget->CiscoNatModeComboBox->insertItem("force-natt"); ProfileCiscoOptionsWidget->CiscoNatModeComboBox->insertItem("cisco-udp"); ProfileCiscoOptionsWidget->CiscoNatModeComboBox->insertItem("none"); - connect (ProfileCiscoOptionsWidget->CiscoNatModeComboBox, SIGNAL(textChanged ( const QString &)), this, SLOT(natModeToggled( const QString &))); + connect (ProfileCiscoOptionsWidget->CiscoNatModeComboBox, TQT_SIGNAL(textChanged ( const TQString &)), this, TQT_SLOT(natModeToggled( const TQString &))); profileAddedOrDeleted = false; @@ -904,7 +904,7 @@ PreferencesDialog::PreferencesDialog( QWidget *parent, QApplication *app, QTextE NetworkInterface iface( GlobalConfig, GlobalConfig->appPointer ); - QStringList list = iface.getAllNetworkInterfaces(); + TQStringList list = iface.getAllNetworkInterfaces(); ProfileNetworkGeneralOptionsWidget->NetworkDeviceComboBox->insertItem( "default" ); // // pppd settings @@ -919,9 +919,9 @@ PreferencesDialog::PreferencesDialog( QWidget *parent, QApplication *app, QTextE // ProfileNetworkVirtualIpOptionsWidget->LabelRemoteVirtualIp->setEnabled( true ); // ProfileNetworkVirtualIpOptionsWidget->LabelLocalVirtualIp->setEnabled( true ); - for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) + for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) { - ProfileNetworkGeneralOptionsWidget->NetworkDeviceComboBox->insertItem( QString( *it ) ); + ProfileNetworkGeneralOptionsWidget->NetworkDeviceComboBox->insertItem( TQString( *it ) ); } ProfileNetworkGeneralOptionsWidget->NetworkDeviceComboBox->setEnabled( true ); ProfileNetworkGeneralOptionsWidget->LabelNetworkDevice->setEnabled( true ); @@ -942,14 +942,14 @@ void PreferencesDialog::setupGui() setShowIconsInTreeList( true ); - QStringList path; + TQStringList path; path.clear(); path << i18n( "KVpnc" ); setFolderIcon ( path, SmallIcon( "application", KIcon::SizeSmall ) ); path.clear(); - QVBoxLayout *lo; + TQVBoxLayout *lo; if ( !showOnlyProfiles ) { @@ -958,25 +958,25 @@ void PreferencesDialog::setupGui() // General page path << i18n( "Application" ) << i18n( "General" ); GeneralFrame = addPage( path, i18n( "General" ), BarIcon( "kvpnc", KIcon::SizeSmall ) ); - lo = new QVBoxLayout( GeneralFrame, 0, KDialog::spacingHint() ); + lo = new TQVBoxLayout( GeneralFrame, 0, KDialog::spacingHint() ); GeneralOptionsWidget = new ConfigGeneralOptions( GeneralFrame ); lo->addWidget( GeneralOptionsWidget ); - connect(GeneralOptionsWidget->useKwalletCheckBox, SIGNAL(toggled(bool)),this, SLOT(useKwalletToggled(bool))); + connect(GeneralOptionsWidget->useKwalletCheckBox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(useKwalletToggled(bool))); - // const QObjectList *GeneralOptionsWidgetList = GeneralOptionsWidget->queryList( "QCheckBox" ); - // QObjectListIt it( *GeneralOptionsWidgetList ); + // const TQObjectList *GeneralOptionsWidgetList = GeneralOptionsWidget->queryList( TQCHECKBOX_OBJECT_NAME_STRING ); + // TQObjectListIt it( *GeneralOptionsWidgetList ); // - // for ( QObject *child = it.current(); it; ++it) + // for ( TQObject *child = it.current(); it; ++it) // { // // std::cout << "name: " << child->name() << std::endl; - // connect(child, SIGNAL(stateChanged(int)), this, SLOT(checkboxStateChanged(int))); + // connect(child, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(checkboxStateChanged(int))); // } // Debug path.clear(); path << i18n( "Application" ) << i18n( "Debug" ); DebugFrame = addPage( path, i18n( "Debug" ), BarIcon( "bug", KIcon::SizeSmall ) ); - lo = new QVBoxLayout( DebugFrame ); + lo = new TQVBoxLayout( DebugFrame ); lo->setSpacing( KDialog::spacingHint() ); DebugOptionsWidget = new ConfigDebugOptions( DebugFrame, "Debug" ); lo->addWidget( DebugOptionsWidget ); @@ -984,7 +984,7 @@ void PreferencesDialog::setupGui() path.clear(); path << i18n( "Application" ) << i18n( "Connect" ); ConfigConnectOptionsFrame = addPage( path, i18n( "Connect" ), BarIcon( "connecting", KIcon::SizeSmall ) ); - lo = new QVBoxLayout( ConfigConnectOptionsFrame ); + lo = new TQVBoxLayout( ConfigConnectOptionsFrame ); lo->setSpacing( KDialog::spacingHint() ); ConnectOptionsWidget = new ConfigConnectOptions( ConfigConnectOptionsFrame ); lo->addWidget( ConnectOptionsWidget ); @@ -992,7 +992,7 @@ void PreferencesDialog::setupGui() path.clear(); path << i18n( "Application" ) << i18n( "Log" ); LogFrame = addPage( path, i18n( "Log" ), BarIcon( "text_center", KIcon::SizeSmall ) ); - lo = new QVBoxLayout( LogFrame ); + lo = new TQVBoxLayout( LogFrame ); lo->setSpacing( KDialog::spacingHint() ); LogOptionsWidget = new ConfigLogOptions( LogFrame ); lo->addWidget( LogOptionsWidget ); @@ -1003,10 +1003,10 @@ void PreferencesDialog::setupGui() path.clear(); path << i18n( "Programs" ) << i18n( "Daemons" ); DaemonOptionsFrame = addVBoxPage( path, i18n( "Daemons" ), BarIcon( "fork", KIcon::SizeSmall ) ); -// DaemonOptionsFrame->resize(DaemonOptionsFrame->sizeHint()); -// lo = new QVBoxLayout( DaemonOptionsFrame ); - DaemonScrollView = new QScrollView(DaemonOptionsFrame, "daemonscrollview"); - lo = new QVBoxLayout( DaemonScrollView ); +// DaemonOptionsFrame->resize(DaemonOptionsFrame->tqsizeHint()); +// lo = new TQVBoxLayout( DaemonOptionsFrame ); + DaemonScrollView = new TQScrollView(DaemonOptionsFrame, "daemonscrollview"); + lo = new TQVBoxLayout( DaemonScrollView ); lo->setSpacing( KDialog::spacingHint() ); lo->addWidget(DaemonScrollView); ConfigDaemonOptionsWidget = new ConfigDaemonOptions( DaemonScrollView->viewport() ); @@ -1016,29 +1016,29 @@ void PreferencesDialog::setupGui() // DaemonScrollView->adjustSize(); - QSize deamonsize = ConfigDaemonOptionsWidget->sizeHint(); - ConfigDaemonOptionsWidget->resize(QSize(deamonsize.width()-4,deamonsize.height())); - ConfigDaemonOptionsWidget->setFixedSize(QSize(deamonsize.width()-4,deamonsize.height())); -// DaemonScrollView->resize(sv->sizeHint()); + TQSize deamonsize = ConfigDaemonOptionsWidget->tqsizeHint(); + ConfigDaemonOptionsWidget->resize(TQSize(deamonsize.width()-4,deamonsize.height())); + ConfigDaemonOptionsWidget->setFixedSize(TQSize(deamonsize.width()-4,deamonsize.height())); +// DaemonScrollView->resize(sv->tqsizeHint()); // lo->addWidget( DaemonScrollView ); // DaemonFrame->adjustSize(); - connect(ConfigDaemonOptionsWidget->OpenvpnPathInput, SIGNAL( urlSelected( const QString& ) ), this, SLOT( OpenvpnPathChanged( const QString& ) ) ); - connect(ConfigDaemonOptionsWidget->FreeswanPathInput, SIGNAL( urlSelected( const QString& ) ), this, SLOT( FreeswanPathChanged( const QString& ) ) ); - connect(ConfigDaemonOptionsWidget->PppdPathInput, SIGNAL( urlSelected( const QString& ) ), this, SLOT( PppdPathChanged( const QString& ) ) ); - connect(ConfigDaemonOptionsWidget->PptpPathInput, SIGNAL( urlSelected( const QString& ) ), this, SLOT( PptpPathChanged( const QString& ) ) ); - connect(ConfigDaemonOptionsWidget->RacoonPathInput, SIGNAL( urlSelected( const QString& ) ), this, SLOT( RacoonPathChanged( const QString& ) ) ); - connect(ConfigDaemonOptionsWidget->VpncPathInput, SIGNAL( urlSelected( const QString& ) ), this, SLOT( VpncPathChanged( const QString& ) ) ); - connect(ConfigDaemonOptionsWidget->L2tpdPathInput, SIGNAL( urlSelected( const QString& ) ), this, SLOT( L2tpdPathChanged( const QString& ) ) ); - connect(ConfigDaemonOptionsWidget->Xl2tpdPathInput, SIGNAL( urlSelected( const QString& ) ), this, SLOT( Xl2tpdPathChanged( const QString& ) ) ); - connect(ConfigDaemonOptionsWidget->VtundPathInput, SIGNAL( urlSelected( const QString& ) ), this, SLOT( VtundPathChanged( const QString& ) ) ); - connect(ConfigDaemonOptionsWidget->SshPathInput, SIGNAL( urlSelected( const QString& ) ), this, SLOT( SshPathChanged( const QString& ) ) ); + connect(ConfigDaemonOptionsWidget->OpenvpnPathInput, TQT_SIGNAL( urlSelected( const TQString& ) ), this, TQT_SLOT( OpenvpnPathChanged( const TQString& ) ) ); + connect(ConfigDaemonOptionsWidget->FreeswanPathInput, TQT_SIGNAL( urlSelected( const TQString& ) ), this, TQT_SLOT( FreeswanPathChanged( const TQString& ) ) ); + connect(ConfigDaemonOptionsWidget->PppdPathInput, TQT_SIGNAL( urlSelected( const TQString& ) ), this, TQT_SLOT( PppdPathChanged( const TQString& ) ) ); + connect(ConfigDaemonOptionsWidget->PptpPathInput, TQT_SIGNAL( urlSelected( const TQString& ) ), this, TQT_SLOT( PptpPathChanged( const TQString& ) ) ); + connect(ConfigDaemonOptionsWidget->RacoonPathInput, TQT_SIGNAL( urlSelected( const TQString& ) ), this, TQT_SLOT( RacoonPathChanged( const TQString& ) ) ); + connect(ConfigDaemonOptionsWidget->VpncPathInput, TQT_SIGNAL( urlSelected( const TQString& ) ), this, TQT_SLOT( VpncPathChanged( const TQString& ) ) ); + connect(ConfigDaemonOptionsWidget->L2tpdPathInput, TQT_SIGNAL( urlSelected( const TQString& ) ), this, TQT_SLOT( L2tpdPathChanged( const TQString& ) ) ); + connect(ConfigDaemonOptionsWidget->Xl2tpdPathInput, TQT_SIGNAL( urlSelected( const TQString& ) ), this, TQT_SLOT( Xl2tpdPathChanged( const TQString& ) ) ); + connect(ConfigDaemonOptionsWidget->VtundPathInput, TQT_SIGNAL( urlSelected( const TQString& ) ), this, TQT_SLOT( VtundPathChanged( const TQString& ) ) ); + connect(ConfigDaemonOptionsWidget->SshPathInput, TQT_SIGNAL( urlSelected( const TQString& ) ), this, TQT_SLOT( SshPathChanged( const TQString& ) ) ); path.clear(); path << i18n( "Programs" ) << i18n( "Helper Programs" ); HelperProgramFrame = addPage( path, i18n( "Helper Programs" ), BarIcon( "tool", KIcon::SizeSmall ) ); - lo = new QVBoxLayout( HelperProgramFrame ); + lo = new TQVBoxLayout( HelperProgramFrame ); lo->setSpacing( KDialog::spacingHint() ); HelperProgramOptionsWidget = new ConfigHelperProgramOptions( HelperProgramFrame ); @@ -1055,14 +1055,14 @@ void PreferencesDialog::setupGui() path.clear(); path << i18n( "Profile" ) << i18n( "General" ); ProfileGeneralOptionsFrame = addPage( path, i18n( "General" ), BarIcon( "application", KIcon::SizeSmall ) ); - lo = new QVBoxLayout( ProfileGeneralOptionsFrame ); + lo = new TQVBoxLayout( ProfileGeneralOptionsFrame ); lo->setSpacing( KDialog::spacingHint() ); - QWidget *ProfileGeneralSelectorWidget = new QWidget( ProfileGeneralOptionsFrame ); - QHBoxLayout *ProfileGeneralSelectorLayout = new QHBoxLayout( ProfileGeneralSelectorWidget ); - QLabel *ProfileGeneralSelectorLabel = new QLabel( ProfileGeneralSelectorWidget ); + TQWidget *ProfileGeneralSelectorWidget = new TQWidget( ProfileGeneralOptionsFrame ); + TQHBoxLayout *ProfileGeneralSelectorLayout = new TQHBoxLayout( ProfileGeneralSelectorWidget ); + TQLabel *ProfileGeneralSelectorLabel = new TQLabel( ProfileGeneralSelectorWidget ); ProfileGeneralSelectorLabel->setText( i18n( "Profile:" ) ); - ProfileGeneralSelector = new QComboBox( ProfileGeneralSelectorWidget ); + ProfileGeneralSelector = new TQComboBox( ProfileGeneralSelectorWidget ); ProfileGeneralSelectorLayout->addWidget( ProfileGeneralSelectorLabel ); ProfileGeneralSelectorLayout->addWidget( ProfileGeneralSelector ); @@ -1075,14 +1075,14 @@ void PreferencesDialog::setupGui() path.clear(); path << i18n( "Profile" ) << i18n( "Authenticate" ) << i18n( "User data" ); ProfileUserOptionsFrame = addPage( path, i18n( "User Data" ), BarIcon( "user", KIcon::SizeSmall ) ); - lo = new QVBoxLayout( ProfileUserOptionsFrame ); + lo = new TQVBoxLayout( ProfileUserOptionsFrame ); lo->setSpacing( KDialog::spacingHint() ); - QWidget *ProfileUserSelectorWidget = new QWidget( ProfileUserOptionsFrame ); - QHBoxLayout *ProfileUserSelectorLayout = new QHBoxLayout( ProfileUserSelectorWidget ); - QLabel *ProfileUserSelectorLabel = new QLabel( ProfileUserSelectorWidget ); + TQWidget *ProfileUserSelectorWidget = new TQWidget( ProfileUserOptionsFrame ); + TQHBoxLayout *ProfileUserSelectorLayout = new TQHBoxLayout( ProfileUserSelectorWidget ); + TQLabel *ProfileUserSelectorLabel = new TQLabel( ProfileUserSelectorWidget ); ProfileUserSelectorLabel->setText( i18n( "Profile:" ) ); - ProfileUserSelector = new QComboBox( ProfileUserSelectorWidget ); + ProfileUserSelector = new TQComboBox( ProfileUserSelectorWidget ); ProfileUserSelectorLayout->addWidget( ProfileUserSelectorLabel ); ProfileUserSelectorLayout->addWidget( ProfileUserSelector ); @@ -1091,18 +1091,18 @@ void PreferencesDialog::setupGui() lo->addWidget( ProfileUserSelectorWidget ); lo->addWidget( ProfileUserOptionsWidget ); ProfileUserSelector->setEnabled( true ); - connect(ProfileUserOptionsWidget->NtDomainNameCheckbox, SIGNAL(toggled(bool)), ProfileUserOptionsWidget, SLOT( domainNameToggled(bool) )); + connect(ProfileUserOptionsWidget->NtDomainNameCheckbox, TQT_SIGNAL(toggled(bool)), ProfileUserOptionsWidget, TQT_SLOT( domainNameToggled(bool) )); path.clear(); path << i18n( "Profile" ) << i18n( "Authenticate" ) << i18n( "Certificate" ); ProfileCertOptionsFrame = addVBoxPage( path, i18n( "Certificate" ), BarIcon( "certimport", KIcon::SizeSmall ) ); - lo = new QVBoxLayout( ProfileCertOptionsFrame ); + lo = new TQVBoxLayout( ProfileCertOptionsFrame ); lo->setSpacing( KDialog::spacingHint() ); - QWidget *ProfileCertSelectorWidget = new QWidget( ProfileCertOptionsFrame ); - QHBoxLayout *ProfileCertSelectorLayout = new QHBoxLayout( ProfileCertSelectorWidget ); - QLabel *ProfileCertSelectorLabel = new QLabel( ProfileCertSelectorWidget ); + TQWidget *ProfileCertSelectorWidget = new TQWidget( ProfileCertOptionsFrame ); + TQHBoxLayout *ProfileCertSelectorLayout = new TQHBoxLayout( ProfileCertSelectorWidget ); + TQLabel *ProfileCertSelectorLabel = new TQLabel( ProfileCertSelectorWidget ); ProfileCertSelectorLabel->setText( i18n( "Profile:" ) ); - ProfileCertSelector = new QComboBox( ProfileCertSelectorWidget ); + ProfileCertSelector = new TQComboBox( ProfileCertSelectorWidget ); ProfileCertSelectorLayout->addWidget( ProfileCertSelectorLabel ); ProfileCertSelectorLayout->addWidget( ProfileCertSelector ); @@ -1110,20 +1110,20 @@ void PreferencesDialog::setupGui() lo->addWidget( ProfileCertSelectorWidget ); lo->addWidget( ProfileCertOptionsWidget ); ProfileCertSelector->setEnabled( true ); - connect(ProfileCertOptionsWidget->ImportCertificatePushButton, SIGNAL(clicked()), this, SLOT(importCertificate())); - connect(ProfileCertOptionsWidget->UseCiscoCertStoreCheckBox, SIGNAL(toggled(bool)), this, SLOT(useCiscoCertStoreToggled(bool))); + connect(ProfileCertOptionsWidget->ImportCertificatePushButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(importCertificate())); + connect(ProfileCertOptionsWidget->UseCiscoCertStoreCheckBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(useCiscoCertStoreToggled(bool))); path.clear(); path << i18n( "Profile" ) << i18n( "Authenticate" ) << i18n( "Smartcard" ); ProfileSmartcardOptionsFrame = addPage( path, i18n( "Smartcard" ), BarIcon( "smartcard", KIcon::SizeSmall ) ); - lo = new QVBoxLayout( ProfileSmartcardOptionsFrame ); + lo = new TQVBoxLayout( ProfileSmartcardOptionsFrame ); lo->setSpacing( KDialog::spacingHint() ); - QWidget *ProfileSmartcardSelectorWidget = new QWidget( ProfileSmartcardOptionsFrame ); - QHBoxLayout *ProfileSmartcardSelectorLayout = new QHBoxLayout( ProfileSmartcardSelectorWidget ); - QLabel *ProfileSmartcardSelectorLabel = new QLabel( ProfileSmartcardSelectorWidget ); + TQWidget *ProfileSmartcardSelectorWidget = new TQWidget( ProfileSmartcardOptionsFrame ); + TQHBoxLayout *ProfileSmartcardSelectorLayout = new TQHBoxLayout( ProfileSmartcardSelectorWidget ); + TQLabel *ProfileSmartcardSelectorLabel = new TQLabel( ProfileSmartcardSelectorWidget ); ProfileSmartcardSelectorLabel->setText( i18n( "Profile:" ) ); - ProfileSmartcardSelector = new QComboBox( ProfileSmartcardSelectorWidget ); + ProfileSmartcardSelector = new TQComboBox( ProfileSmartcardSelectorWidget ); ProfileSmartcardSelectorLayout->addWidget( ProfileSmartcardSelectorLabel ); ProfileSmartcardSelectorLayout->addWidget( ProfileSmartcardSelector ); @@ -1131,20 +1131,20 @@ void PreferencesDialog::setupGui() lo->addWidget( ProfileSmartcardSelectorWidget ); lo->addWidget( ProfileSmartcardOptionsWidget ); ProfileSmartcardSelector->setEnabled( true ); - connect(ProfileSmartcardOptionsWidget->DetectPkcs11SlotsPushButton, SIGNAL(clicked()), this, SLOT(detectPkcs11Slots())); - connect(ProfileSmartcardOptionsWidget->DetectPkcs11IdPushButton, SIGNAL(clicked()), this, SLOT(detectPkcs11Ids())); + connect(ProfileSmartcardOptionsWidget->DetectPkcs11SlotsPushButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(detectPkcs11Slots())); + connect(ProfileSmartcardOptionsWidget->DetectPkcs11IdPushButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(detectPkcs11Ids())); path.clear(); path << i18n( "Profile" ) << i18n( "Authenticate" ) << i18n( "PSK" ); ProfilePskOptionsFrame = addPage( path, i18n( "PSK" ), BarIcon( "password", KIcon::SizeSmall ) ); - lo = new QVBoxLayout( ProfilePskOptionsFrame ); + lo = new TQVBoxLayout( ProfilePskOptionsFrame ); lo->setSpacing( KDialog::spacingHint() ); - QWidget *ProfilePskSelectorWidget = new QWidget( ProfilePskOptionsFrame ); - QHBoxLayout *ProfilePskSelectorLayout = new QHBoxLayout( ProfilePskSelectorWidget ); - QLabel *ProfilePskSelectorLabel = new QLabel( ProfilePskSelectorWidget ); + TQWidget *ProfilePskSelectorWidget = new TQWidget( ProfilePskOptionsFrame ); + TQHBoxLayout *ProfilePskSelectorLayout = new TQHBoxLayout( ProfilePskSelectorWidget ); + TQLabel *ProfilePskSelectorLabel = new TQLabel( ProfilePskSelectorWidget ); ProfilePskSelectorLabel->setText( i18n( "Profile:" ) ); - ProfilePskSelector = new QComboBox( ProfilePskSelectorWidget ); + ProfilePskSelector = new TQComboBox( ProfilePskSelectorWidget ); ProfilePskSelectorLayout->addWidget( ProfilePskSelectorLabel ); ProfilePskSelectorLayout->addWidget( ProfilePskSelector ); @@ -1156,14 +1156,14 @@ void PreferencesDialog::setupGui() path.clear(); path << i18n( "Profile" ) << i18n( "Network" ) << i18n( "General" ); ProfileNetworkGeneralOptionsFrame = addPage( path, i18n( "General" ), BarIcon( "network", KIcon::SizeSmall ) ); - lo = new QVBoxLayout( ProfileNetworkGeneralOptionsFrame ); + lo = new TQVBoxLayout( ProfileNetworkGeneralOptionsFrame ); lo->setSpacing( KDialog::spacingHint() ); - QWidget *ProfileNetworkGeneralSelectorWidget = new QWidget( ProfileNetworkGeneralOptionsFrame ); - QHBoxLayout *ProfileNetworkGeneralSelectorLayout = new QHBoxLayout( ProfileNetworkGeneralSelectorWidget ); - QLabel *ProfileNetworkGeneralSelectorLabel = new QLabel( ProfileNetworkGeneralSelectorWidget ); + TQWidget *ProfileNetworkGeneralSelectorWidget = new TQWidget( ProfileNetworkGeneralOptionsFrame ); + TQHBoxLayout *ProfileNetworkGeneralSelectorLayout = new TQHBoxLayout( ProfileNetworkGeneralSelectorWidget ); + TQLabel *ProfileNetworkGeneralSelectorLabel = new TQLabel( ProfileNetworkGeneralSelectorWidget ); ProfileNetworkGeneralSelectorLabel->setText( i18n( "Profile:" ) ); - ProfileNetworkGeneralSelector = new QComboBox( ProfileNetworkGeneralSelectorWidget ); + ProfileNetworkGeneralSelector = new TQComboBox( ProfileNetworkGeneralSelectorWidget ); ProfileNetworkGeneralSelectorLayout->addWidget( ProfileNetworkGeneralSelectorLabel ); ProfileNetworkGeneralSelectorLayout->addWidget( ProfileNetworkGeneralSelector ); @@ -1176,14 +1176,14 @@ void PreferencesDialog::setupGui() path.clear(); path << i18n( "Profile" ) << i18n( "Network" ) << i18n( "Routes" ); ProfileNetworkRouteOptionsFrame = addPage( path, i18n( "Routes" ), BarIcon( "route", KIcon::SizeSmall ) ); - lo = new QVBoxLayout( ProfileNetworkRouteOptionsFrame ); + lo = new TQVBoxLayout( ProfileNetworkRouteOptionsFrame ); lo->setSpacing( KDialog::spacingHint() ); - QWidget *ProfileNetworkRouteSelectorWidget = new QWidget( ProfileNetworkRouteOptionsFrame ); - QHBoxLayout *ProfileNetworkRouteSelectorLayout = new QHBoxLayout( ProfileNetworkRouteSelectorWidget ); - QLabel *ProfileNetworkRouteSelectorLabel = new QLabel( ProfileNetworkRouteSelectorWidget ); + TQWidget *ProfileNetworkRouteSelectorWidget = new TQWidget( ProfileNetworkRouteOptionsFrame ); + TQHBoxLayout *ProfileNetworkRouteSelectorLayout = new TQHBoxLayout( ProfileNetworkRouteSelectorWidget ); + TQLabel *ProfileNetworkRouteSelectorLabel = new TQLabel( ProfileNetworkRouteSelectorWidget ); ProfileNetworkRouteSelectorLabel->setText( i18n( "Profile:" ) ); - ProfileNetworkRouteSelector = new QComboBox( ProfileNetworkRouteSelectorWidget ); + ProfileNetworkRouteSelector = new TQComboBox( ProfileNetworkRouteSelectorWidget ); ProfileNetworkRouteSelectorLayout->addWidget( ProfileNetworkRouteSelectorLabel ); ProfileNetworkRouteSelectorLayout->addWidget( ProfileNetworkRouteSelector ); @@ -1196,14 +1196,14 @@ void PreferencesDialog::setupGui() path.clear(); path << i18n( "Profile" ) << i18n( "Network" ) << i18n( "NAT" ); ProfileNetworkNatOptionsFrame = addPage( path, i18n( "NAT" ), BarIcon( "application", KIcon::SizeSmall ) ); - lo = new QVBoxLayout( ProfileNetworkNatOptionsFrame ); + lo = new TQVBoxLayout( ProfileNetworkNatOptionsFrame ); lo->setSpacing( KDialog::spacingHint() ); - QWidget *ProfileNetworkNatSelectorWidget = new QWidget( ProfileNetworkNatOptionsFrame ); - QHBoxLayout *ProfileNetworkNatSelectorLayout = new QHBoxLayout( ProfileNetworkNatSelectorWidget ); - QLabel *ProfileNetworkNatSelectorLabel = new QLabel( ProfileNetworkNatSelectorWidget ); + TQWidget *ProfileNetworkNatSelectorWidget = new TQWidget( ProfileNetworkNatOptionsFrame ); + TQHBoxLayout *ProfileNetworkNatSelectorLayout = new TQHBoxLayout( ProfileNetworkNatSelectorWidget ); + TQLabel *ProfileNetworkNatSelectorLabel = new TQLabel( ProfileNetworkNatSelectorWidget ); ProfileNetworkNatSelectorLabel->setText( i18n( "Profile:" ) ); - ProfileNetworkNatSelector = new QComboBox( ProfileNetworkNatSelectorWidget ); + ProfileNetworkNatSelector = new TQComboBox( ProfileNetworkNatSelectorWidget ); ProfileNetworkNatSelectorLayout->addWidget( ProfileNetworkNatSelectorLabel ); ProfileNetworkNatSelectorLayout->addWidget( ProfileNetworkNatSelector ); @@ -1216,14 +1216,14 @@ void PreferencesDialog::setupGui() path.clear(); path << i18n( "Profile" ) << i18n( "Network" ) << i18n( "HTTP proxy" ); ProfileNetworkHttpProxyOptionsFrame = addPage( path, i18n( "HTTP proxy" ), BarIcon( "application", KIcon::SizeSmall ) ); - lo = new QVBoxLayout( ProfileNetworkHttpProxyOptionsFrame ); + lo = new TQVBoxLayout( ProfileNetworkHttpProxyOptionsFrame ); lo->setSpacing( KDialog::spacingHint() ); - QWidget *ProfileNetworkHttpProxySelectorWidget = new QWidget( ProfileNetworkHttpProxyOptionsFrame ); - QHBoxLayout *ProfileNetworkHttpProxySelectorLayout = new QHBoxLayout( ProfileNetworkHttpProxySelectorWidget ); - QLabel *ProfileNetworkHttpProxySelectorLabel = new QLabel( ProfileNetworkHttpProxySelectorWidget ); + TQWidget *ProfileNetworkHttpProxySelectorWidget = new TQWidget( ProfileNetworkHttpProxyOptionsFrame ); + TQHBoxLayout *ProfileNetworkHttpProxySelectorLayout = new TQHBoxLayout( ProfileNetworkHttpProxySelectorWidget ); + TQLabel *ProfileNetworkHttpProxySelectorLabel = new TQLabel( ProfileNetworkHttpProxySelectorWidget ); ProfileNetworkHttpProxySelectorLabel->setText( i18n( "Profile:" ) ); - ProfileNetworkHttpProxySelector = new QComboBox( ProfileNetworkHttpProxySelectorWidget ); + ProfileNetworkHttpProxySelector = new TQComboBox( ProfileNetworkHttpProxySelectorWidget ); ProfileNetworkHttpProxySelectorLayout->addWidget( ProfileNetworkHttpProxySelectorLabel ); ProfileNetworkHttpProxySelectorLayout->addWidget( ProfileNetworkHttpProxySelector ); @@ -1237,14 +1237,14 @@ void PreferencesDialog::setupGui() path.clear(); path << i18n( "Profile" ) << i18n( "Network" ) << i18n( "Virtual IP" ); ProfileNetworkVirtualIpOptionsFrame = addPage( path, i18n( "Virtual IP" ), BarIcon( "application", KIcon::SizeSmall ) ); - lo = new QVBoxLayout( ProfileNetworkVirtualIpOptionsFrame ); + lo = new TQVBoxLayout( ProfileNetworkVirtualIpOptionsFrame ); lo->setSpacing( KDialog::spacingHint() ); - QWidget *ProfileNetworkVirtualIpSelectorWidget = new QWidget( ProfileNetworkVirtualIpOptionsFrame ); - QHBoxLayout *ProfileNetworkVirtualIpSelectorLayout = new QHBoxLayout( ProfileNetworkVirtualIpSelectorWidget ); - QLabel *ProfileNetworkVirtualIpSelectorLabel = new QLabel( ProfileNetworkVirtualIpSelectorWidget ); + TQWidget *ProfileNetworkVirtualIpSelectorWidget = new TQWidget( ProfileNetworkVirtualIpOptionsFrame ); + TQHBoxLayout *ProfileNetworkVirtualIpSelectorLayout = new TQHBoxLayout( ProfileNetworkVirtualIpSelectorWidget ); + TQLabel *ProfileNetworkVirtualIpSelectorLabel = new TQLabel( ProfileNetworkVirtualIpSelectorWidget ); ProfileNetworkVirtualIpSelectorLabel->setText( i18n( "Profile:" ) ); - ProfileNetworkVirtualIpSelector = new QComboBox( ProfileNetworkVirtualIpSelectorWidget ); + ProfileNetworkVirtualIpSelector = new TQComboBox( ProfileNetworkVirtualIpSelectorWidget ); ProfileNetworkVirtualIpSelectorLayout->addWidget( ProfileNetworkVirtualIpSelectorLabel ); ProfileNetworkVirtualIpSelectorLayout->addWidget( ProfileNetworkVirtualIpSelector ); @@ -1253,19 +1253,19 @@ void PreferencesDialog::setupGui() lo->addWidget( ProfileNetworkVirtualIpSelectorWidget ); lo->addWidget( ProfileNetworkVirtualIpOptionsWidget ); ProfileNetworkVirtualIpSelector->setEnabled( true ); - connect(ProfileNetworkGeneralOptionsWidget->TunnelDeviceTypeComboBox, SIGNAL(activated ( const QString & )),this, SLOT(tunnelDeviceTypeChanged(const QString& ))); + connect(ProfileNetworkGeneralOptionsWidget->TunnelDeviceTypeComboBox, TQT_SIGNAL(activated ( const TQString & )),this, TQT_SLOT(tunnelDeviceTypeChanged(const TQString& ))); path.clear(); path << i18n( "Profile" ) << i18n( "Connection specific" ) << i18n( "Cisco" ); ProfileCiscoOptionsFrame = addPage( path, i18n( "Cisco" ), BarIcon( "cisco", KIcon::SizeSmall ) ); - lo = new QVBoxLayout( ProfileCiscoOptionsFrame ); + lo = new TQVBoxLayout( ProfileCiscoOptionsFrame ); lo->setSpacing( KDialog::spacingHint() ); - QWidget *ProfileCiscoSelectorWidget = new QWidget( ProfileCiscoOptionsFrame ); - QHBoxLayout *ProfileCiscoSelectorLayout = new QHBoxLayout( ProfileCiscoSelectorWidget ); - QLabel *ProfileCiscoSelectorLabel = new QLabel( ProfileCiscoSelectorWidget ); + TQWidget *ProfileCiscoSelectorWidget = new TQWidget( ProfileCiscoOptionsFrame ); + TQHBoxLayout *ProfileCiscoSelectorLayout = new TQHBoxLayout( ProfileCiscoSelectorWidget ); + TQLabel *ProfileCiscoSelectorLabel = new TQLabel( ProfileCiscoSelectorWidget ); ProfileCiscoSelectorLabel->setText( i18n( "Profile:" ) ); - ProfileCiscoSelector = new QComboBox( ProfileCiscoSelectorWidget ); + ProfileCiscoSelector = new TQComboBox( ProfileCiscoSelectorWidget ); ProfileCiscoSelectorLayout->addWidget( ProfileCiscoSelectorLabel ); ProfileCiscoSelectorLayout->addWidget( ProfileCiscoSelector ); @@ -1274,12 +1274,12 @@ void PreferencesDialog::setupGui() lo->addWidget( ProfileCiscoSelectorWidget ); lo->addWidget( ProfileCiscoOptionsWidget ); ProfileCiscoSelector->setEnabled( true ); - connect (ProfileCiscoOptionsWidget->LocalPortCheckbox, SIGNAL(toggled(bool)),this, SLOT(localPortToggled(bool))); - connect (ProfileCiscoOptionsWidget->ApplicationVersionCheckbox, SIGNAL(toggled(bool)),this, SLOT(applicationVersionToggled(bool))); - connect (ProfileCiscoOptionsWidget->PerfectForwardSecurityCheckbox, SIGNAL(toggled(bool)),this, SLOT(perfectForwardSecurityToggled(bool))); - connect (ProfileCiscoOptionsWidget->IkeGroupCheckbox, SIGNAL(toggled(bool)),this, SLOT(IkeGroupToggled(bool))); - connect (ProfileCiscoOptionsWidget->SingleDesCheckbox, SIGNAL(toggled(bool)),this, SLOT(singleDesToggled(bool))); - connect (ProfileCiscoOptionsWidget->EnableDpdIdleTimeoutCheckbox, SIGNAL(toggled(bool)),this, SLOT(dpdToggled(bool))); + connect (ProfileCiscoOptionsWidget->LocalPortCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(localPortToggled(bool))); + connect (ProfileCiscoOptionsWidget->ApplicationVersionCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(applicationVersionToggled(bool))); + connect (ProfileCiscoOptionsWidget->PerfectForwardSecurityCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(perfectForwardSecurityToggled(bool))); + connect (ProfileCiscoOptionsWidget->IkeGroupCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(IkeGroupToggled(bool))); + connect (ProfileCiscoOptionsWidget->SingleDesCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(singleDesToggled(bool))); + connect (ProfileCiscoOptionsWidget->EnableDpdIdleTimeoutCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(dpdToggled(bool))); //ProfileCiscoOptionsWidget->PerfectForwardSecrecyCombobox->setEnabled( false ); ProfileCiscoOptionsWidget->PerfectForwardSecrecyCombobox->clear(); @@ -1298,14 +1298,14 @@ void PreferencesDialog::setupGui() path.clear(); path << i18n( "Profile" ) << i18n( "Connection specific" ) << i18n( "Racoon" ); ProfileRacoonOptionsFrame = addPage( path, i18n( "Racoon" ), BarIcon( "kame", KIcon::SizeSmall ) ); - lo = new QVBoxLayout( ProfileRacoonOptionsFrame ); + lo = new TQVBoxLayout( ProfileRacoonOptionsFrame ); lo->setSpacing( KDialog::spacingHint() ); - QWidget *ProfileRacoonSelectorWidget = new QWidget( ProfileRacoonOptionsFrame ); - QHBoxLayout *ProfileRacoonSelectorLayout = new QHBoxLayout( ProfileRacoonSelectorWidget ); - QLabel *ProfileRacoonSelectorLabel = new QLabel( ProfileRacoonSelectorWidget ); + TQWidget *ProfileRacoonSelectorWidget = new TQWidget( ProfileRacoonOptionsFrame ); + TQHBoxLayout *ProfileRacoonSelectorLayout = new TQHBoxLayout( ProfileRacoonSelectorWidget ); + TQLabel *ProfileRacoonSelectorLabel = new TQLabel( ProfileRacoonSelectorWidget ); ProfileRacoonSelectorLabel->setText( i18n( "Profile:" ) ); - ProfileRacoonSelector = new QComboBox( ProfileRacoonSelectorWidget ); + ProfileRacoonSelector = new TQComboBox( ProfileRacoonSelectorWidget ); ProfileRacoonSelectorLayout->addWidget( ProfileRacoonSelectorLabel ); ProfileRacoonSelectorLayout->addWidget( ProfileRacoonSelector ); @@ -1314,8 +1314,8 @@ void PreferencesDialog::setupGui() ProfileRacoonOptionsWidget->ExchangeModeComboBox->insertItem( "aggressive", 1 ); ProfileRacoonOptionsWidget->ExchangeModeComboBox->insertItem( "base", 2 ); ProfileRacoonOptionsWidget->ExchangeModeComboBox->setCurrentItem( 0 ); // main - connect (ProfileRacoonOptionsWidget->PerfectForwardSecurityCheckbox, SIGNAL(toggled(bool)),this, SLOT(perfectForwardSecurityToggled(bool))); - connect (ProfileRacoonOptionsWidget->IkeGroupCheckbox, SIGNAL(toggled(bool)),this, SLOT(IkeGroupToggled(bool))); + connect (ProfileRacoonOptionsWidget->PerfectForwardSecurityCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(perfectForwardSecurityToggled(bool))); + connect (ProfileRacoonOptionsWidget->IkeGroupCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(IkeGroupToggled(bool))); //ProfileRacoonOptionsWidget->PerfectForwardSecrecyCombobox->setEnabled( false ); ProfileRacoonOptionsWidget->PerfectForwardSecrecyCombobox->clear(); @@ -1346,20 +1346,20 @@ void PreferencesDialog::setupGui() path.clear(); path << i18n( "Profile" ) << i18n( "Connection specific" ) << i18n( "Openswan/strongSwan" ); ProfileIpsecOptionsFrame = addPage( path, i18n( "Openswan/strongSwan" ), BarIcon( "openswan", KIcon::SizeSmall ) ); - lo = new QVBoxLayout( ProfileIpsecOptionsFrame ); + lo = new TQVBoxLayout( ProfileIpsecOptionsFrame ); lo->setSpacing( KDialog::spacingHint() ); - QWidget *ProfileIpsecSelectorWidget = new QWidget( ProfileIpsecOptionsFrame ); - QHBoxLayout *ProfileIpsecSelectorLayout = new QHBoxLayout( ProfileIpsecSelectorWidget ); - QLabel *ProfileIpsecSelectorLabel = new QLabel( ProfileIpsecSelectorWidget ); + TQWidget *ProfileIpsecSelectorWidget = new TQWidget( ProfileIpsecOptionsFrame ); + TQHBoxLayout *ProfileIpsecSelectorLayout = new TQHBoxLayout( ProfileIpsecSelectorWidget ); + TQLabel *ProfileIpsecSelectorLabel = new TQLabel( ProfileIpsecSelectorWidget ); ProfileIpsecSelectorLabel->setText( i18n( "Profile:" ) ); - ProfileIpsecSelector = new QComboBox( ProfileIpsecSelectorWidget ); + ProfileIpsecSelector = new TQComboBox( ProfileIpsecSelectorWidget ); ProfileIpsecSelectorLayout->addWidget( ProfileIpsecSelectorLabel ); ProfileIpsecSelectorLayout->addWidget( ProfileIpsecSelector ); ProfileIpsecOptionsWidget = new ProfileIpsecOptions( ProfileIpsecOptionsFrame ); - connect (ProfileIpsecOptionsWidget->PerfectForwardSecurityCheckbox, SIGNAL(toggled(bool)),this, SLOT(perfectForwardSecurityToggled(bool))); - connect (ProfileIpsecOptionsWidget->UseXauthCheckBox, SIGNAL(toggled(bool)),this, SLOT(useXauthToggled(bool))); + connect (ProfileIpsecOptionsWidget->PerfectForwardSecurityCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(perfectForwardSecurityToggled(bool))); + connect (ProfileIpsecOptionsWidget->UseXauthCheckBox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(useXauthToggled(bool))); ProfileIpsecOptionsWidget->IpsecVpnModeCombobox->insertItem( "transport" ); ProfileIpsecOptionsWidget->IpsecVpnModeCombobox->insertItem( "tunnel" ); @@ -1386,14 +1386,14 @@ void PreferencesDialog::setupGui() path.clear(); path << i18n( "Profile" ) << i18n( "Connection specific" ) << i18n( "OpenVPN" ); ProfileOpenvpnOptionsFrame = addPage( path, i18n( "OpenVPN" ), BarIcon( "openvpn", KIcon::SizeSmall ) ); - lo = new QVBoxLayout( ProfileOpenvpnOptionsFrame ); + lo = new TQVBoxLayout( ProfileOpenvpnOptionsFrame ); lo->setSpacing( KDialog::spacingHint() ); - QWidget *ProfileOpenvpnSelectorWidget = new QWidget( ProfileOpenvpnOptionsFrame ); - QHBoxLayout *ProfileOpenvpnSelectorLayout = new QHBoxLayout( ProfileOpenvpnSelectorWidget ); - QLabel *ProfileOpenvpnSelectorLabel = new QLabel( ProfileOpenvpnSelectorWidget ); + TQWidget *ProfileOpenvpnSelectorWidget = new TQWidget( ProfileOpenvpnOptionsFrame ); + TQHBoxLayout *ProfileOpenvpnSelectorLayout = new TQHBoxLayout( ProfileOpenvpnSelectorWidget ); + TQLabel *ProfileOpenvpnSelectorLabel = new TQLabel( ProfileOpenvpnSelectorWidget ); ProfileOpenvpnSelectorLabel->setText( i18n( "Profile:" ) ); - ProfileOpenvpnSelector = new QComboBox( ProfileOpenvpnSelectorWidget ); + ProfileOpenvpnSelector = new TQComboBox( ProfileOpenvpnSelectorWidget ); ProfileOpenvpnSelectorLayout->addWidget( ProfileOpenvpnSelectorLabel ); ProfileOpenvpnSelectorLayout->addWidget( ProfileOpenvpnSelector ); @@ -1406,14 +1406,14 @@ void PreferencesDialog::setupGui() path.clear(); path << i18n( "Profile" ) << i18n( "Connection specific" ) << i18n( "PPTP/L2TP" ); ProfilePptpOptionsFrame = addPage( path, i18n( "PPTP/L2TP" ), BarIcon( "application", KIcon::SizeSmall ) ); - lo = new QVBoxLayout( ProfilePptpOptionsFrame ); + lo = new TQVBoxLayout( ProfilePptpOptionsFrame ); lo->setSpacing( KDialog::spacingHint() ); - QWidget *ProfilePptpSelectorWidget = new QWidget( ProfilePptpOptionsFrame ); - QHBoxLayout *ProfilePptpSelectorLayout = new QHBoxLayout( ProfilePptpSelectorWidget ); - QLabel *ProfilePptpSelectorLabel = new QLabel( ProfilePptpSelectorWidget ); + TQWidget *ProfilePptpSelectorWidget = new TQWidget( ProfilePptpOptionsFrame ); + TQHBoxLayout *ProfilePptpSelectorLayout = new TQHBoxLayout( ProfilePptpSelectorWidget ); + TQLabel *ProfilePptpSelectorLabel = new TQLabel( ProfilePptpSelectorWidget ); ProfilePptpSelectorLabel->setText( i18n( "Profile:" ) ); - ProfilePptpSelector = new QComboBox( ProfilePptpSelectorWidget ); + ProfilePptpSelector = new TQComboBox( ProfilePptpSelectorWidget ); ProfilePptpSelectorLayout->addWidget( ProfilePptpSelectorLabel ); ProfilePptpSelectorLayout->addWidget( ProfilePptpSelector ); @@ -1426,14 +1426,14 @@ void PreferencesDialog::setupGui() path.clear(); path << i18n( "Profile" ) << i18n( "Connection specific" ) << i18n( "Vtun" ); ProfileVtunOptionsFrame = addPage( path, i18n( "Vtun" ), BarIcon( "application", KIcon::SizeSmall ) ); - lo = new QVBoxLayout( ProfileVtunOptionsFrame ); + lo = new TQVBoxLayout( ProfileVtunOptionsFrame ); lo->setSpacing( KDialog::spacingHint() ); - QWidget *ProfileVtunSelectorWidget = new QWidget( ProfileVtunOptionsFrame ); - QHBoxLayout *ProfileVtunSelectorLayout = new QHBoxLayout( ProfileVtunSelectorWidget ); - QLabel *ProfileVtunSelectorLabel = new QLabel( ProfileVtunSelectorWidget ); + TQWidget *ProfileVtunSelectorWidget = new TQWidget( ProfileVtunOptionsFrame ); + TQHBoxLayout *ProfileVtunSelectorLayout = new TQHBoxLayout( ProfileVtunSelectorWidget ); + TQLabel *ProfileVtunSelectorLabel = new TQLabel( ProfileVtunSelectorWidget ); ProfileVtunSelectorLabel->setText( i18n( "Profile:" ) ); - ProfileVtunSelector = new QComboBox( ProfileVtunSelectorWidget ); + ProfileVtunSelector = new TQComboBox( ProfileVtunSelectorWidget ); ProfileVtunSelectorLayout->addWidget( ProfileVtunSelectorLabel ); ProfileVtunSelectorLayout->addWidget( ProfileVtunSelector ); @@ -1446,14 +1446,14 @@ void PreferencesDialog::setupGui() path.clear(); path << i18n( "Profile" ) << i18n( "Connection specific" ) << i18n( "SSH" ); ProfileSshOptionsFrame = addPage( path, i18n( "SSH" ), BarIcon( "openssh", KIcon::SizeSmall ) ); - lo = new QVBoxLayout( ProfileSshOptionsFrame ); + lo = new TQVBoxLayout( ProfileSshOptionsFrame ); lo->setSpacing( KDialog::spacingHint() ); - QWidget *ProfileSshSelectorWidget = new QWidget( ProfileSshOptionsFrame ); - QHBoxLayout *ProfileSshSelectorLayout = new QHBoxLayout( ProfileSshSelectorWidget ); - QLabel *ProfileSshSelectorLabel = new QLabel( ProfileSshSelectorWidget ); + TQWidget *ProfileSshSelectorWidget = new TQWidget( ProfileSshOptionsFrame ); + TQHBoxLayout *ProfileSshSelectorLayout = new TQHBoxLayout( ProfileSshSelectorWidget ); + TQLabel *ProfileSshSelectorLabel = new TQLabel( ProfileSshSelectorWidget ); ProfileSshSelectorLabel->setText( i18n( "Profile:" ) ); - ProfileSshSelector = new QComboBox( ProfileSshSelectorWidget ); + ProfileSshSelector = new TQComboBox( ProfileSshSelectorWidget ); ProfileSshSelectorLayout->addWidget( ProfileSshSelectorLabel ); ProfileSshSelectorLayout->addWidget( ProfileSshSelector ); @@ -1463,31 +1463,31 @@ void PreferencesDialog::setupGui() lo->addWidget( ProfileSshOptionsWidget ); ProfileSshSelector->setEnabled( true ); ProfileSshOptionsWidget->SshKeyComboBox->clear(); - QString Home= QString(getenv("HOME")); + TQString Home= TQString(getenv("HOME")); if (!Home.isEmpty()) { - QDir dir( Home+"/.ssh" ); - QStringList KeyFiles = dir.entryList( "*" ); + TQDir dir( Home+"/.ssh" ); + TQStringList KeyFiles = dir.entryList( "*" ); //if (GlobalConfig->KvpncDebugLevel > 2) //{ - // GlobalConfig->appendLogEntry(i18n("SSH files: %1").arg(KeyFiles.join(",")),GlobalConfig->debug); + // GlobalConfig->appendLogEntry(i18n("SSH files: %1").tqarg(KeyFiles.join(",")),GlobalConfig->debug); //} if (KeyFiles.size() > 1) { - for ( QStringList::Iterator it = KeyFiles.begin(); it != KeyFiles.end(); ++it ) + for ( TQStringList::Iterator it = KeyFiles.begin(); it != KeyFiles.end(); ++it ) { - QString item = QString(*it); + TQString item = TQString(*it); if (GlobalConfig->KvpncDebugLevel > 2) { - GlobalConfig->appendLogEntry(i18n("processing entry: %1").arg(item),GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("processing entry: %1").tqarg(item),GlobalConfig->debug); } if (!item.contains (".pub", false) && !item.contains ("authorized_keys", false) && !item.contains ("known_hosts", false) && !item.contains (".", false) && !item.contains ("..", false) && !item.contains ("config", false) ) { if (GlobalConfig->KvpncDebugLevel > 2) { - GlobalConfig->appendLogEntry(i18n("SSH key found: %1").arg(*it),GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("SSH key found: %1").tqarg(*it),GlobalConfig->debug); } ProfileSshOptionsWidget->SshKeyComboBox->insertItem(*it); } @@ -1500,14 +1500,14 @@ void PreferencesDialog::setupGui() path.clear(); path << i18n( "Profile" ) << i18n( "Command Execution" ) << i18n( "Before Connect" ); ProfileCmdExecBeforeConnectOptionsFrame = addPage( path, i18n( "Before Connect" ), BarIcon( "exec", KIcon::SizeSmall ) ); - lo = new QVBoxLayout( ProfileCmdExecBeforeConnectOptionsFrame ); + lo = new TQVBoxLayout( ProfileCmdExecBeforeConnectOptionsFrame ); lo->setSpacing( KDialog::spacingHint() ); - QWidget *ProfileCmdExecBeforeConnectSelectorWidget = new QWidget( ProfileCmdExecBeforeConnectOptionsFrame ); - QHBoxLayout *ProfileCmdExecBeforeConnectSelectorLayout = new QHBoxLayout( ProfileCmdExecBeforeConnectSelectorWidget ); - QLabel *ProfileCmdExecBeforeConnectSelectorLabel = new QLabel( ProfileCmdExecBeforeConnectSelectorWidget ); + TQWidget *ProfileCmdExecBeforeConnectSelectorWidget = new TQWidget( ProfileCmdExecBeforeConnectOptionsFrame ); + TQHBoxLayout *ProfileCmdExecBeforeConnectSelectorLayout = new TQHBoxLayout( ProfileCmdExecBeforeConnectSelectorWidget ); + TQLabel *ProfileCmdExecBeforeConnectSelectorLabel = new TQLabel( ProfileCmdExecBeforeConnectSelectorWidget ); ProfileCmdExecBeforeConnectSelectorLabel->setText( i18n( "Profile:" ) ); - ProfileCmdExecBeforeConnectSelector = new QComboBox( ProfileCmdExecBeforeConnectSelectorWidget ); + ProfileCmdExecBeforeConnectSelector = new TQComboBox( ProfileCmdExecBeforeConnectSelectorWidget ); ProfileCmdExecBeforeConnectSelectorLayout->addWidget( ProfileCmdExecBeforeConnectSelectorLabel ); ProfileCmdExecBeforeConnectSelectorLayout->addWidget( ProfileCmdExecBeforeConnectSelector ); @@ -1520,14 +1520,14 @@ void PreferencesDialog::setupGui() path.clear(); path << i18n( "Profile" ) << i18n( "Command Execution" ) << i18n( "After Connect" ); ProfileCmdExecAfterConnectOptionsFrame = addPage( path, i18n( "After Connect" ), BarIcon( "exec", KIcon::SizeSmall ) ); - lo = new QVBoxLayout( ProfileCmdExecAfterConnectOptionsFrame ); + lo = new TQVBoxLayout( ProfileCmdExecAfterConnectOptionsFrame ); lo->setSpacing( KDialog::spacingHint() ); - QWidget *ProfileCmdExecAfterConnectSelectorWidget = new QWidget( ProfileCmdExecAfterConnectOptionsFrame ); - QHBoxLayout *ProfileCmdExecAfterConnectSelectorLayout = new QHBoxLayout( ProfileCmdExecAfterConnectSelectorWidget ); - QLabel *ProfileCmdExecAfterConnectSelectorLabel = new QLabel( ProfileCmdExecAfterConnectSelectorWidget ); + TQWidget *ProfileCmdExecAfterConnectSelectorWidget = new TQWidget( ProfileCmdExecAfterConnectOptionsFrame ); + TQHBoxLayout *ProfileCmdExecAfterConnectSelectorLayout = new TQHBoxLayout( ProfileCmdExecAfterConnectSelectorWidget ); + TQLabel *ProfileCmdExecAfterConnectSelectorLabel = new TQLabel( ProfileCmdExecAfterConnectSelectorWidget ); ProfileCmdExecAfterConnectSelectorLabel->setText( i18n( "Profile:" ) ); - ProfileCmdExecAfterConnectSelector = new QComboBox( ProfileCmdExecAfterConnectSelectorWidget ); + ProfileCmdExecAfterConnectSelector = new TQComboBox( ProfileCmdExecAfterConnectSelectorWidget ); ProfileCmdExecAfterConnectSelectorLayout->addWidget( ProfileCmdExecAfterConnectSelectorLabel ); ProfileCmdExecAfterConnectSelectorLayout->addWidget( ProfileCmdExecAfterConnectSelector ); @@ -1539,14 +1539,14 @@ void PreferencesDialog::setupGui() path.clear(); path << i18n( "Profile" ) << i18n( "Command Execution" ) << i18n( "Before Disconnect" ); ProfileCmdExecBeforeDisconnectOptionsFrame = addPage( path, i18n( "Before Disconnect" ), BarIcon( "exec", KIcon::SizeSmall ) ); - lo = new QVBoxLayout( ProfileCmdExecBeforeDisconnectOptionsFrame ); + lo = new TQVBoxLayout( ProfileCmdExecBeforeDisconnectOptionsFrame ); lo->setSpacing( KDialog::spacingHint() ); - QWidget *ProfileCmdExecBeforeDisconnectSelectorWidget = new QWidget( ProfileCmdExecBeforeDisconnectOptionsFrame ); - QHBoxLayout *ProfileCmdExecBeforeDisconnectSelectorLayout = new QHBoxLayout( ProfileCmdExecBeforeDisconnectSelectorWidget ); - QLabel *ProfileCmdExecBeforeDisconnectSelectorLabel = new QLabel( ProfileCmdExecBeforeDisconnectSelectorWidget ); + TQWidget *ProfileCmdExecBeforeDisconnectSelectorWidget = new TQWidget( ProfileCmdExecBeforeDisconnectOptionsFrame ); + TQHBoxLayout *ProfileCmdExecBeforeDisconnectSelectorLayout = new TQHBoxLayout( ProfileCmdExecBeforeDisconnectSelectorWidget ); + TQLabel *ProfileCmdExecBeforeDisconnectSelectorLabel = new TQLabel( ProfileCmdExecBeforeDisconnectSelectorWidget ); ProfileCmdExecBeforeDisconnectSelectorLabel->setText( i18n( "Profile:" ) ); - ProfileCmdExecBeforeDisconnectSelector = new QComboBox( ProfileCmdExecBeforeDisconnectSelectorWidget ); + ProfileCmdExecBeforeDisconnectSelector = new TQComboBox( ProfileCmdExecBeforeDisconnectSelectorWidget ); ProfileCmdExecBeforeDisconnectSelectorLayout->addWidget( ProfileCmdExecBeforeDisconnectSelectorLabel ); ProfileCmdExecBeforeDisconnectSelectorLayout->addWidget( ProfileCmdExecBeforeDisconnectSelector ); @@ -1558,14 +1558,14 @@ void PreferencesDialog::setupGui() path.clear(); path << i18n( "Profile" ) << i18n( "Command Execution" ) << i18n( "After Disconnect" ); ProfileCmdExecAfterDisconnectOptionsFrame = addPage( path, i18n( "Command Execute After Disconnect" ), BarIcon( "exec", KIcon::SizeSmall ) ); - lo = new QVBoxLayout( ProfileCmdExecAfterDisconnectOptionsFrame ); + lo = new TQVBoxLayout( ProfileCmdExecAfterDisconnectOptionsFrame ); lo->setSpacing( KDialog::spacingHint() ); - QWidget *ProfileCmdExecAfterDisconnectSelectorWidget = new QWidget( ProfileCmdExecAfterDisconnectOptionsFrame ); - QHBoxLayout *ProfileCmdExecAfterDisconnectSelectorLayout = new QHBoxLayout( ProfileCmdExecAfterDisconnectSelectorWidget ); - QLabel *ProfileCmdExecAfterDisconnectSelectorLabel = new QLabel( ProfileCmdExecAfterDisconnectSelectorWidget ); + TQWidget *ProfileCmdExecAfterDisconnectSelectorWidget = new TQWidget( ProfileCmdExecAfterDisconnectOptionsFrame ); + TQHBoxLayout *ProfileCmdExecAfterDisconnectSelectorLayout = new TQHBoxLayout( ProfileCmdExecAfterDisconnectSelectorWidget ); + TQLabel *ProfileCmdExecAfterDisconnectSelectorLabel = new TQLabel( ProfileCmdExecAfterDisconnectSelectorWidget ); ProfileCmdExecAfterDisconnectSelectorLabel->setText( i18n( "Profile:" ) ); - ProfileCmdExecAfterDisconnectSelector = new QComboBox( ProfileCmdExecAfterDisconnectSelectorWidget ); + ProfileCmdExecAfterDisconnectSelector = new TQComboBox( ProfileCmdExecAfterDisconnectSelectorWidget ); ProfileCmdExecAfterDisconnectSelectorLayout->addWidget( ProfileCmdExecAfterDisconnectSelectorLabel ); ProfileCmdExecAfterDisconnectSelectorLayout->addWidget( ProfileCmdExecAfterDisconnectSelector ); @@ -1574,8 +1574,8 @@ void PreferencesDialog::setupGui() lo->addWidget( ProfileCmdExecAfterDisconnectOptionsWidget ); ProfileCmdExecAfterDisconnectSelector->setEnabled( true ); -// resize(QSize(800,600)); -// setFixedSize(QSize(800,600)); +// resize(TQSize(800,600)); +// setFixedSize(TQSize(800,600)); // adjustSize(); if ( !showOnlyProfiles ) @@ -1583,7 +1583,7 @@ void PreferencesDialog::setupGui() // DaemonScrollView->adjustSize(); // DaemonScrollView->updateContents(); // ConfigDaemonOptionsWidget->resize(ConfigDaemonOptionsWidget->height(),DaemonScrollView->visibleWidth()-100); - ConfigDaemonOptionsWidget->sizeHint(); + ConfigDaemonOptionsWidget->tqsizeHint(); } // CertScrollView->adjustSize(); // CertScrollView->updateContents(); @@ -1596,43 +1596,43 @@ void PreferencesDialog::setupGui() // enableButtonApply(false); /* connect profile combobox of each profile widget */ - connect( ProfileGeneralSelector, SIGNAL( activated ( const QString& ) ), this, SLOT( profileChanged( const QString& ) ) ); - connect( ProfileNetworkRouteSelector, SIGNAL( activated ( const QString& ) ), this, SLOT( profileChanged( const QString& ) ) ); - connect( ProfileNetworkGeneralSelector, SIGNAL( activated ( const QString& ) ), this, SLOT( profileChanged( const QString& ) ) ); - connect( ProfileNetworkNatSelector, SIGNAL( activated ( const QString& ) ), this, SLOT( profileChanged( const QString& ) ) ); - connect( ProfileNetworkHttpProxySelector, SIGNAL( activated ( const QString& ) ), this, SLOT( profileChanged( const QString& ) ) ); - connect( ProfileNetworkVirtualIpSelector, SIGNAL( activated ( const QString& ) ), this, SLOT( profileChanged( const QString& ) ) ); - connect( ProfileCertSelector, SIGNAL( activated ( const QString& ) ), this, SLOT( profileChanged( const QString& ) ) ); - connect( ProfileSmartcardSelector, SIGNAL( activated ( const QString& ) ), this, SLOT( profileChanged( const QString& ) ) ); - connect( ProfilePskSelector, SIGNAL( activated ( const QString& ) ), this, SLOT( profileChanged( const QString& ) ) ); - connect( ProfileUserSelector, SIGNAL( activated ( const QString& ) ), this, SLOT( profileChanged( const QString& ) ) ); - connect( ProfileOpenvpnSelector, SIGNAL( activated ( const QString& ) ), this, SLOT( profileChanged( const QString& ) ) ); - connect( ProfilePptpSelector, SIGNAL( activated ( const QString& ) ), this, SLOT( profileChanged( const QString& ) ) ); - connect( ProfileRacoonSelector, SIGNAL( activated ( const QString& ) ), this, SLOT( profileChanged( const QString& ) ) ); - connect( ProfileIpsecSelector, SIGNAL( activated ( const QString& ) ), this, SLOT( profileChanged( const QString& ) ) ); - connect( ProfileCiscoSelector, SIGNAL( activated ( const QString& ) ), this, SLOT( profileChanged( const QString& ) ) ); - connect( ProfileVtunSelector, SIGNAL( activated ( const QString& ) ), this, SLOT( profileChanged( const QString& ) ) ); - connect( ProfileSshSelector, SIGNAL( activated ( const QString& ) ), this, SLOT( profileChanged( const QString& ) ) ); - connect( ProfileCmdExecBeforeConnectSelector, SIGNAL( activated ( const QString& ) ), this, SLOT( profileChanged( const QString& ) ) ); - connect( ProfileCmdExecBeforeDisconnectSelector, SIGNAL( activated ( const QString& ) ), this, SLOT( profileChanged( const QString& ) ) ); - connect( ProfileCmdExecAfterConnectSelector, SIGNAL( activated ( const QString& ) ), this, SLOT( profileChanged( const QString& ) ) ); - connect( ProfileCmdExecAfterDisconnectSelector, SIGNAL( activated ( const QString& ) ), this, SLOT( profileChanged( const QString& ) ) ); - - connect( ProfileOpenvpnOptionsWidget->AuthWithUsernameAndPasswordCheckBox, SIGNAL( toggled ( bool ) ), this, SLOT( userAuthToggled( bool ) ) ); + connect( ProfileGeneralSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); + connect( ProfileNetworkRouteSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); + connect( ProfileNetworkGeneralSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); + connect( ProfileNetworkNatSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); + connect( ProfileNetworkHttpProxySelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); + connect( ProfileNetworkVirtualIpSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); + connect( ProfileCertSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); + connect( ProfileSmartcardSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); + connect( ProfilePskSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); + connect( ProfileUserSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); + connect( ProfileOpenvpnSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); + connect( ProfilePptpSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); + connect( ProfileRacoonSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); + connect( ProfileIpsecSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); + connect( ProfileCiscoSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); + connect( ProfileVtunSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); + connect( ProfileSshSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); + connect( ProfileCmdExecBeforeConnectSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); + connect( ProfileCmdExecBeforeDisconnectSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); + connect( ProfileCmdExecAfterConnectSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); + connect( ProfileCmdExecAfterDisconnectSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); + + connect( ProfileOpenvpnOptionsWidget->AuthWithUsernameAndPasswordCheckBox, TQT_SIGNAL( toggled ( bool ) ), this, TQT_SLOT( userAuthToggled( bool ) ) ); -// connect( ProfileCertOptionsWidget->UseSpecialServerSmartcardificateCheckBox, SIGNAL (toggled(bool)), SLOT(useSpecialServerSmartcardificateToggled(bool) ) ); - connect( ProfileCertOptionsWidget->AuthTypeComboBox, SIGNAL( activated ( int ) ), this, SLOT( authTypeChanged( int ) ) ); - connect( ProfilePskOptionsWidget->AuthTypeComboBox, SIGNAL( activated ( int ) ), this, SLOT( authTypeChanged( int ) ) ); +// connect( ProfileCertOptionsWidget->UseSpecialServerSmartcardificateCheckBox, TQT_SIGNAL (toggled(bool)), TQT_SLOT(useSpecialServerSmartcardificateToggled(bool) ) ); + connect( ProfileCertOptionsWidget->AuthTypeComboBox, TQT_SIGNAL( activated ( int ) ), this, TQT_SLOT( authTypeChanged( int ) ) ); + connect( ProfilePskOptionsWidget->AuthTypeComboBox, TQT_SIGNAL( activated ( int ) ), this, TQT_SLOT( authTypeChanged( int ) ) ); -// connect ( ProfileGeneralOptionsWidget->NewSessionPushButton , SIGNAL( clicked () ), this, SLOT( newSessionClicked() ) ); - connect ( ProfileGeneralOptionsWidget->SaveSessionPushButton, SIGNAL( clicked () ), this, SLOT( saveSessionClicked() ) ); - connect ( ProfileGeneralOptionsWidget->RenameSessionPushButton, SIGNAL( clicked () ), this, SLOT( renameSessionClicked() ) ); - connect ( ProfileGeneralOptionsWidget->DeleteSessionPushButton, SIGNAL( clicked () ), this, SLOT( deleteSessionClicked() ) ); - connect ( this, SIGNAL( aboutToShowPage( QWidget * ) ), this, SLOT( pageChanged( QWidget * ) ) ); - connect ( this, SIGNAL( applyClicked () ), this, SLOT( saveSessionClicked() ) ); +// connect ( ProfileGeneralOptionsWidget->NewSessionPushButton , TQT_SIGNAL( clicked () ), this, TQT_SLOT( newSessionClicked() ) ); + connect ( ProfileGeneralOptionsWidget->SaveSessionPushButton, TQT_SIGNAL( clicked () ), this, TQT_SLOT( saveSessionClicked() ) ); + connect ( ProfileGeneralOptionsWidget->RenameSessionPushButton, TQT_SIGNAL( clicked () ), this, TQT_SLOT( renameSessionClicked() ) ); + connect ( ProfileGeneralOptionsWidget->DeleteSessionPushButton, TQT_SIGNAL( clicked () ), this, TQT_SLOT( deleteSessionClicked() ) ); + connect ( this, TQT_SIGNAL( aboutToShowPage( TQWidget * ) ), this, TQT_SLOT( pageChanged( TQWidget * ) ) ); + connect ( this, TQT_SIGNAL( applyClicked () ), this, TQT_SLOT( saveSessionClicked() ) ); } @@ -1717,14 +1717,14 @@ void PreferencesDialog::accept() saveSessionClicked(); if ( canAccept ) - QDialog::accept(); + TQDialog::accept(); } void PreferencesDialog::reject() { if (configChanged) saveSessionClicked(); - QDialog::reject(); + TQDialog::reject(); } void PreferencesDialog::slotApply() @@ -1760,9 +1760,9 @@ void PreferencesDialog::connectionTypeChanged( int type ) if ( GlobalConfig->KvpncDebugLevel > 1 ) - GlobalConfig->appendLogEntry( i18n( "connectionTypeChanged(): %1" ).arg( QString().setNum( type ) ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( i18n( "connectionTypeChanged(): %1" ).tqarg( TQString().setNum( type ) ), GlobalConfig->debug ); - // KMessageBox::information(0,"connection type changed: "+QString().setNum(type),QString("type set")); + // KMessageBox::information(0,"connection type changed: "+TQString().setNum(type),TQString("type set")); if ( GlobalConfig->currentProfile == 0 ) return ; @@ -1832,27 +1832,27 @@ void PreferencesDialog::connectionTypeChanged( int type ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry( i18n( "New type: %1" ).arg( "racoon" ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( i18n( "New type: %1" ).tqarg( "racoon" ), GlobalConfig->debug ); } else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_racoon ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry( i18n( "New type: %1" ).arg( "l2tpd (racoon)" ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( i18n( "New type: %1" ).tqarg( "l2tpd (racoon)" ), GlobalConfig->debug ); } else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry( i18n( "New type: %1" ).arg( "ipsec (openswan/strongswan)" ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( i18n( "New type: %1" ).tqarg( "ipsec (openswan/strongswan)" ), GlobalConfig->debug ); } else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_freeswan ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry( i18n( "New type: %1" ).arg( "l2tpd (openswan/strongswan)" ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( i18n( "New type: %1" ).tqarg( "l2tpd (openswan/strongswan)" ), GlobalConfig->debug ); } else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::pptp ) { @@ -1862,7 +1862,7 @@ void PreferencesDialog::connectionTypeChanged( int type ) else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::openvpn ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry( i18n( "new type: %1" ).arg( "openvpn" ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( i18n( "new type: %1" ).tqarg( "openvpn" ), GlobalConfig->debug ); ProfileNetworkGeneralOptionsWidget->RemoteNetAddrLineEdit->setEnabled( false ); ProfileNetworkGeneralOptionsWidget->LabelRemoteNetwork->setEnabled( false ); @@ -1884,7 +1884,7 @@ void PreferencesDialog::connectionTypeChanged( int type ) else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::vtun ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry( i18n( "new type: %1" ).arg( "Vtun" ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( i18n( "new type: %1" ).tqarg( "Vtun" ), GlobalConfig->debug ); ProfileNetworkGeneralOptionsWidget->RemoteNetAddrLineEdit->setEnabled( false ); ProfileNetworkGeneralOptionsWidget->LabelRemoteNetwork->setEnabled( false ); @@ -1906,7 +1906,7 @@ void PreferencesDialog::connectionTypeChanged( int type ) else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ssh ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry( i18n( "new type: %1" ).arg( "SSH" ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( i18n( "new type: %1" ).tqarg( "SSH" ), GlobalConfig->debug ); ProfileNetworkGeneralOptionsWidget->RemoteNetAddrLineEdit->setEnabled( false ); ProfileNetworkGeneralOptionsWidget->LabelRemoteNetwork->setEnabled( false ); @@ -1988,7 +1988,7 @@ void PreferencesDialog::authTypeChanged( int authtype ) { if ( GlobalConfig->currentProfile == 0 ) return ; - QComboBox *signalsender = (QComboBox *) QObject::sender (); + TQComboBox *signalsender = (TQComboBox *) TQObject::sender (); VpnAccountData::AuthenticationType oldAuthType = GlobalConfig->currentProfile->getAuthType(); if (signalsender == ProfileCertOptionsWidget->AuthTypeComboBox) { @@ -2004,7 +2004,7 @@ void PreferencesDialog::authTypeChanged( int authtype ) authtype = VpnAccountData::hybrid; } } - GlobalConfig->appendLogEntry( i18n( "authtype changed by %1." ).arg( "ProfileCertOptionsWidget" ) , GlobalConfig->debug ); + GlobalConfig->appendLogEntry( i18n( "authtype changed by %1." ).tqarg( "ProfileCertOptionsWidget" ) , GlobalConfig->debug ); if ( ProfileCertOptionsWidget->AuthTypeComboBox->currentText() == i18n( "X.509 Certificate" )) GlobalConfig->currentProfile->setAuthType(VpnAccountData::cert); else if ( ProfileCertOptionsWidget->AuthTypeComboBox->currentText() == i18n( "Pre Shared Key" )) @@ -2027,7 +2027,7 @@ void PreferencesDialog::authTypeChanged( int authtype ) authtype = VpnAccountData::hybrid; } } - GlobalConfig->appendLogEntry( i18n( "authtype changed by %1." ).arg( "ProfilePskOptionsWidget" ) , GlobalConfig->debug ); + GlobalConfig->appendLogEntry( i18n( "authtype changed by %1." ).tqarg( "ProfilePskOptionsWidget" ) , GlobalConfig->debug ); if ( ProfilePskOptionsWidget->AuthTypeComboBox->currentText() == i18n( "X.509 Certificate" )) GlobalConfig->currentProfile->setAuthType(VpnAccountData::cert); else if ( ProfilePskOptionsWidget->AuthTypeComboBox->currentText() == i18n( "Pre Shared Key" )) @@ -2044,7 +2044,7 @@ void PreferencesDialog::authTypeChanged( int authtype ) if ( GlobalConfig->KvpncDebugLevel > 0 ) { - QString type="unknown"; + TQString type="unknown"; if ( GlobalConfig->currentProfile->getAuthType() == VpnAccountData::cert ) type = "cert"; else if ( GlobalConfig->currentProfile->getAuthType() == VpnAccountData::psk ) @@ -2055,7 +2055,7 @@ void PreferencesDialog::authTypeChanged( int authtype ) type ="unknown auth"; - GlobalConfig->appendLogEntry( i18n( "New authtype: \"%1\"." ).arg( type ) , GlobalConfig->debug ); + GlobalConfig->appendLogEntry( i18n( "New authtype: \"%1\"." ).tqarg( type ) , GlobalConfig->debug ); } ProfilePskOptionsWidget->PskGroupBox->setEnabled( false ); @@ -2385,7 +2385,7 @@ void PreferencesDialog::authTypeChanged( int authtype ) } } -void PreferencesDialog::profileChanged( const QString& itemtext ) +void PreferencesDialog::profileChanged( const TQString& itemtext ) { if ( !GlobalConfig->AccountList->isEmpty() && !itemtext.isEmpty() ) @@ -2420,7 +2420,7 @@ void PreferencesDialog::profileChanged( const QString& itemtext ) ProfileGeneralOptionsWidget->SaveSessionPushButton->setEnabled( true ); } - QString Name = itemtext; + TQString Name = itemtext; lastProfileName = Name; ProfileGeneralOptionsWidget->setEnabled( true ); @@ -2471,7 +2471,7 @@ void PreferencesDialog::profileChanged( const QString& itemtext ) ProfileCmdExecAfterDisconnectSelector->setCurrentText( lastProfileName ); if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry( i18n( "New profile: %1" ).arg( Name ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( i18n( "New profile: %1" ).tqarg( Name ), GlobalConfig->debug ); profileHasChanged=true; NewProfileName = Name; @@ -2529,7 +2529,7 @@ void PreferencesDialog::profileChanged( const QString& itemtext ) ProfileGeneralOptionsWidget->gatewayLineEdit->setText( it->getGateway() ); - if (GlobalConfig->currentProfile->getTunnelDeviceType() == QString("tap")) + if (GlobalConfig->currentProfile->getTunnelDeviceType() == TQString("tap")) ProfileNetworkGeneralOptionsWidget->TunnelDeviceTypeComboBox->setCurrentItem(1); else ProfileNetworkGeneralOptionsWidget->TunnelDeviceTypeComboBox->setCurrentItem(0); @@ -2541,18 +2541,18 @@ void PreferencesDialog::profileChanged( const QString& itemtext ) ProfileNetworkGeneralOptionsWidget->NetworkDeviceComboBox->setCurrentText( "default" ); if ( GlobalConfig->KvpncDebugLevel > 2 ) - GlobalConfig->appendLogEntry( i18n( "profile \"%1\": no network device defined, using \"default\"." ).arg( it->getName() ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( i18n( "profile \"%1\": no network device defined, using \"default\"." ).tqarg( it->getName() ), GlobalConfig->debug ); } else { ProfileNetworkGeneralOptionsWidget->NetworkDeviceComboBox->setCurrentText( it->getNetworkDevice() ); if ( GlobalConfig->KvpncDebugLevel > 2 ) - GlobalConfig->appendLogEntry( i18n( "profile \"%1\": network device defined, using \"%2\"." ).arg( it->getName() ).arg( it->getNetworkDevice() ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( i18n( "profile \"%1\": network device defined, using \"%2\"." ).tqarg( it->getName() ).tqarg( it->getNetworkDevice() ), GlobalConfig->debug ); } ProfileGeneralOptionsWidget->ConnectionTypeComboBox->setCurrentItem( it->getConnectionType() ); - // KMessageBox::information(0,"profilechanged() new conntype: "+QString().setNum(it->getConnectionType()),QString("type set")); + // KMessageBox::information(0,"profilechanged() new conntype: "+TQString().setNum(it->getConnectionType()),TQString("type set")); ProfileGeneralOptionsWidget->gatewayLineEdit->setText( it->getGateway() ); @@ -2593,9 +2593,9 @@ void PreferencesDialog::profileChanged( const QString& itemtext ) ProfileNetworkNatOptionsWidget->UdpPortCheckbox->setEnabled( false ); if ( it->getConnectionType() == VpnAccountData::openvpn ) - connect ( ProfileNetworkNatOptionsWidget->UseUdpCheckbox, SIGNAL( toggled( bool ) ), this, SLOT( useUdpToggled( bool ) ) ); + connect ( ProfileNetworkNatOptionsWidget->UseUdpCheckbox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( useUdpToggled( bool ) ) ); else - disconnect ( ProfileNetworkNatOptionsWidget->UseUdpCheckbox, SIGNAL( toggled( bool ) ), this, SLOT( useUdpToggled( bool ) ) ); + disconnect ( ProfileNetworkNatOptionsWidget->UseUdpCheckbox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( useUdpToggled( bool ) ) ); ProfileNetworkGeneralOptionsWidget->MtuCheckbox->setChecked( it->getUseMtu() ); @@ -2659,7 +2659,7 @@ void PreferencesDialog::profileChanged( const QString& itemtext ) ProfileCertOptionsWidget->LabelPrivateKeyPassword->setText(i18n("Private key passphrase:")); ProfileCertOptionsWidget->LabelCertificate->setText(i18n("Certificate:")); ProfileCertOptionsWidget->x509certURLRequester->show(); - ProfileCertOptionsWidget->x509certURLRequester->sizeHint(); + ProfileCertOptionsWidget->x509certURLRequester->tqsizeHint(); ProfileCertOptionsWidget->x509certComboBox->hide(); ProfileCertOptionsWidget->UseCiscoCertStoreCheckBox->hide(); ProfileCertOptionsWidget->VerifyCaCertCheckBox->setEnabled(false); @@ -2767,8 +2767,8 @@ void PreferencesDialog::profileChanged( const QString& itemtext ) ProfileCertOptionsWidget->x509certComboBox->show(); ProfileCertOptionsWidget->CaCertpathURLRequester->hide(); ProfileCertOptionsWidget->CaCertpathComboBox->show(); - ProfileCertOptionsWidget->x509certComboBox->sizeHint(); - ProfileCertOptionsWidget->sizeHint(); + ProfileCertOptionsWidget->x509certComboBox->tqsizeHint(); + ProfileCertOptionsWidget->tqsizeHint(); ProfileCertOptionsWidget->UseCiscoCertStoreCheckBox->setChecked(true); } else @@ -2777,32 +2777,32 @@ void PreferencesDialog::profileChanged( const QString& itemtext ) ProfileCertOptionsWidget->CaCertpathURLRequester->show(); ProfileCertOptionsWidget->x509certComboBox->hide(); ProfileCertOptionsWidget->CaCertpathComboBox->hide(); - ProfileCertOptionsWidget->x509certComboBox->sizeHint(); - ProfileCertOptionsWidget->sizeHint(); + ProfileCertOptionsWidget->x509certComboBox->tqsizeHint(); + ProfileCertOptionsWidget->tqsizeHint(); ProfileCertOptionsWidget->UseCiscoCertStoreCheckBox->setChecked(false); } ProfileCertOptionsWidget->x509certComboBox->clear(); - for ( QStringList::Iterator ciscoit = CiscoCerts.begin(); ciscoit != CiscoCerts.end(); ++ciscoit ) + for ( TQStringList::Iterator ciscoit = CiscoCerts.begin(); ciscoit != CiscoCerts.end(); ++ciscoit ) { - //std::cout << "insert item (cisco certs): " << QString(*ciscoit) << std::endl; + //std::cout << "insert item (cisco certs): " << TQString(*ciscoit) << std::endl; if (GlobalConfig->KvpncDebugLevel > 4) - GlobalConfig->appendLogEntry(i18n("insert cisco cert:")+" "+QString(*ciscoit),GlobalConfig->debug); - ProfileCertOptionsWidget->x509certComboBox->insertItem( QString(*ciscoit)); + GlobalConfig->appendLogEntry(i18n("insert cisco cert:")+" "+TQString(*ciscoit),GlobalConfig->debug); + ProfileCertOptionsWidget->x509certComboBox->insertItem( TQString(*ciscoit)); } if (!it->getX509Certificate().isEmpty()) ProfileCertOptionsWidget->x509certComboBox->setCurrentText( it->getX509Certificate() ); ProfileCertOptionsWidget->x509certURLRequester->setURL( it->getX509Certificate() ); ProfileCertOptionsWidget->CaCertpathComboBox->clear(); - for ( QStringList::Iterator ciscocait = CiscoCaCerts.begin(); ciscocait != CiscoCaCerts.end(); ++ciscocait ) + for ( TQStringList::Iterator ciscocait = CiscoCaCerts.begin(); ciscocait != CiscoCaCerts.end(); ++ciscocait ) { - //std::cout << "insert item (cisco certs): " << QString(*ciscocait) << std::endl; + //std::cout << "insert item (cisco certs): " << TQString(*ciscocait) << std::endl; if (GlobalConfig->KvpncDebugLevel > 4) - GlobalConfig->appendLogEntry(i18n("insert cisco ca cert:")+" "+QString(*ciscocait),GlobalConfig->debug); - ProfileCertOptionsWidget->CaCertpathComboBox->insertItem( QString(*ciscocait)); + GlobalConfig->appendLogEntry(i18n("insert cisco ca cert:")+" "+TQString(*ciscocait),GlobalConfig->debug); + ProfileCertOptionsWidget->CaCertpathComboBox->insertItem( TQString(*ciscocait)); } if (!it->getCaCertificate().isEmpty()) ProfileCertOptionsWidget->CaCertpathComboBox->setCurrentText( it->getCaCertificate() ); @@ -2886,7 +2886,7 @@ void PreferencesDialog::profileChanged( const QString& itemtext ) if ( vpnc_version_major ==0 && vpnc_version_minor < 3 ) { - GlobalConfig->appendLogEntry( i18n( "%1 is too old. Minimum requirement is %2, disabling Xauth interactive option." ).arg( "vpnc" ).arg( "0.3.x" ), GlobalConfig->error ); + GlobalConfig->appendLogEntry( i18n( "%1 is too old. Minimum requirement is %2, disabling Xauth interactive option." ).tqarg( "vpnc" ).tqarg( "0.3.x" ), GlobalConfig->error ); ProfileCiscoOptionsWidget->UseXauthInteractiveCheckBox->setEnabled( false ); } @@ -2906,13 +2906,13 @@ void PreferencesDialog::profileChanged( const QString& itemtext ) } ProfileCiscoOptionsWidget->EnableDpdIdleTimeoutCheckbox->show(); - QWhatsThis::add( ProfileCiscoOptionsWidget->EnableDpdIdleTimeoutCheckbox, i18n( "This enables DPD. Requires vpnc >= 0.5.0." ) ); + TQWhatsThis::add( ProfileCiscoOptionsWidget->EnableDpdIdleTimeoutCheckbox, i18n( "This enables DPD. Requires vpnc >= 0.5.0." ) ); } if ( it->getConnectionType() == VpnAccountData::ciscoorig) { ProfileCiscoOptionsWidget->EnableDpdIdleTimeoutCheckbox->setChecked(true); ProfileCiscoOptionsWidget->EnableDpdIdleTimeoutCheckbox->hide(); - QWhatsThis::add( ProfileCiscoOptionsWidget->EnableDpdIdleTimeoutCheckbox, i18n( "This enables DPD." ) ); + TQWhatsThis::add( ProfileCiscoOptionsWidget->EnableDpdIdleTimeoutCheckbox, i18n( "This enables DPD." ) ); } ProfileCiscoOptionsWidget->DpdIdleTimeoutSpinbox->setValue(it->getDpdIdleTimeout()); @@ -3198,12 +3198,12 @@ void PreferencesDialog::profileChanged( const QString& itemtext ) ProfileIpsecOptionsWidget->UseCustomIkeCheckBox->setChecked(false); } - QStringList IkeList= QStringList::split(",", it->getIpsecIke()); - QStringList EspList= QStringList::split(",", it->getIpsecEsp()); - QString IkeOther=""; - QString EspOther=""; + TQStringList IkeList= TQStringList::split(",", it->getIpsecIke()); + TQStringList EspList= TQStringList::split(",", it->getIpsecEsp()); + TQString IkeOther=""; + TQString EspOther=""; - for ( QStringList::Iterator ikeit = IkeList.begin(); ikeit != IkeList.end(); ++ikeit ) + for ( TQStringList::Iterator ikeit = IkeList.begin(); ikeit != IkeList.end(); ++ikeit ) { std::cout << "ike: " << *ikeit << ":" << std::endl; @@ -3227,7 +3227,7 @@ void PreferencesDialog::profileChanged( const QString& itemtext ) if (!IkeOther.isEmpty()) ProfileIpsecOptionsWidget->OtherIkeLineEdit->setText(IkeOther); - for ( QStringList::Iterator espit = EspList.begin(); espit != EspList.end(); ++espit ) + for ( TQStringList::Iterator espit = EspList.begin(); espit != EspList.end(); ++espit ) { std::cout << "esp: " << *espit << ":" << std::endl; @@ -3269,8 +3269,8 @@ void PreferencesDialog::profileChanged( const QString& itemtext ) ProfileNetworkGeneralOptionsWidget->RemoteNetMaskComboBox->setEnabled( true ); ToolInfo *tool = Utils( GlobalConfig ).getToolInfo ( "ipsec" ); - QString realversion = tool->Version.section( ' ', 1, 1 ).section( '/', 0, 0 ).right( tool->Version.section( ' ', 1, 1 ).section( '/', 0, 0 ).length() - 1 ); - QString realtype = tool->Version.section( ' ', 0, 0 ).lower(); + TQString realversion = tool->Version.section( ' ', 1, 1 ).section( '/', 0, 0 ).right( tool->Version.section( ' ', 1, 1 ).section( '/', 0, 0 ).length() - 1 ); + TQString realtype = tool->Version.section( ' ', 0, 0 ).lower(); if ( it->getConnectionType() == VpnAccountData::l2tpd_freeswan ) ProfileUserOptionsWidget->setEnabled( true ); @@ -3322,7 +3322,7 @@ void PreferencesDialog::profileChanged( const QString& itemtext ) } ToolInfo *IpsecToolInfo = Utils ( GlobalConfig ).getToolInfo ( "ipsec" ) ; - QString IpsecType; + TQString IpsecType; if ( IpsecToolInfo->Version.contains ( "Openswan" ) ) { ProfileIpsecOptionsWidget->ExchangeModeComboBox->setEnabled(true); @@ -3353,10 +3353,10 @@ void PreferencesDialog::profileChanged( const QString& itemtext ) // ProfilePskOptionsWidget->setEnabled(true); if (it->getPskIsInFile()) { - QFile PskFile(it->getPreSharedKeyFile()); - QString Psk=""; + TQFile PskFile(it->getPreSharedKeyFile()); + TQString Psk=""; if (PskFile.exists()) - Psk = QString(PskFile.readAll()); + Psk = TQString(PskFile.readAll()); ProfilePskOptionsWidget->PSKLineEdit->setText(Psk); } else @@ -3500,10 +3500,10 @@ void PreferencesDialog::profileChanged( const QString& itemtext ) // ProfilePskOptionsWidget->setEnabled(true); if (it->getPskIsInFile()) { - QFile PskFile(it->getPreSharedKeyFile()); - QString Psk=""; + TQFile PskFile(it->getPreSharedKeyFile()); + TQString Psk=""; if (PskFile.exists()) - Psk = QString(PskFile.readAll()); + Psk = TQString(PskFile.readAll()); ProfilePskOptionsWidget->PSKLineEdit->setText(Psk); } else @@ -3589,12 +3589,12 @@ void PreferencesDialog::profileChanged( const QString& itemtext ) // ProfileRacoonOptionsWidget->EncryptionAlgorithm2ComboBox->clear(); // ProfileRacoonOptionsWidget->AuthenticationAlgorithm2ComboBox->clear(); // -// QStringList KernelCrypto = Utils( GlobalConfig ).getKernelCrypto(); +// TQStringList KernelCrypto = Utils( GlobalConfig ).getKernelCrypto(); // // std::cout << "kernel crypto start " << std::endl; // -// for ( QStringList::Iterator it = KernelCrypto.begin(); it != KernelCrypto.end(); ++it ) +// for ( TQStringList::Iterator it = KernelCrypto.begin(); it != KernelCrypto.end(); ++it ) // { -// ProfileRacoonOptionsWidget->EncryptionAlgorithm2ComboBox->insertItem( QString(*it) ); +// ProfileRacoonOptionsWidget->EncryptionAlgorithm2ComboBox->insertItem( TQString(*it) ); // // std::cout << "kernel crypto: " << *it << std::endl; // } // //FIXME why this is not in kernel crypto list??? @@ -4262,19 +4262,19 @@ void PreferencesDialog::profileChanged( const QString& itemtext ) ProfileNetworkGeneralOptionsWidget->UseDnsUpdateCheckBox->setChecked( GlobalConfig->currentProfile->getUseDnsUpdate() ); ProfileNetworkRouteOptionsWidget->UseExtraNetworkRoutesCheckbox->setChecked( it->getUseAdditionalNetworkRoutes() ); - QStringList AdditionalNetworkRoutes = it->getAdditionalNetworkRoutes(); + TQStringList AdditionalNetworkRoutes = it->getAdditionalNetworkRoutes(); // example entry: // /# - for ( QStringList::Iterator it2 = AdditionalNetworkRoutes.begin() ; it2 != AdditionalNetworkRoutes.end(); ++it2 ) + for ( TQStringList::Iterator it2 = AdditionalNetworkRoutes.begin() ; it2 != AdditionalNetworkRoutes.end(); ++it2 ) { - QString networkstring = *it2; - QString Network = networkstring.section( '#', 0, 0 ).section( '/', 0, 0 ); - QString Netmask = networkstring.section( '#', 0, 0 ).section( '/', 1, 1 ); - QString Gateway = networkstring.section( '#', 1, 1 ).section( '/', 0, 0 ); - QString Interface = networkstring.section( '#', 2, 2 ); + TQString networkstring = *it2; + TQString Network = networkstring.section( '#', 0, 0 ).section( '/', 0, 0 ); + TQString Netmask = networkstring.section( '#', 0, 0 ).section( '/', 1, 1 ); + TQString Gateway = networkstring.section( '#', 1, 1 ).section( '/', 0, 0 ); + TQString Interface = networkstring.section( '#', 2, 2 ); - ProfileNetworkRouteOptionsWidget->NetworkListView->insertItem( new QListViewItem( ProfileNetworkRouteOptionsWidget->NetworkListView, Network, Netmask, Gateway, Interface ) ); + ProfileNetworkRouteOptionsWidget->NetworkListView->insertItem( new TQListViewItem( ProfileNetworkRouteOptionsWidget->NetworkListView, Network, Netmask, Gateway, Interface ) ); ProfileNetworkRouteOptionsWidget->checkList(); @@ -4299,7 +4299,7 @@ void PreferencesDialog::profileChanged( const QString& itemtext ) if (!it->getPkcs11Slot().isEmpty()) ProfileSmartcardOptionsWidget->Pkcs11SlotComboBox->insertItem(it->getPkcs11Slot()); -// QString Pkcs11SlotType = it->getPkcs11SlotType(); +// TQString Pkcs11SlotType = it->getPkcs11SlotType(); // if (Pkcs11SlotType == "id") // ProfileSmartcardOptionsWidget->Pkcs11SlotTypeComboBox->setCurrentText(i18n("ID")); // else if (Pkcs11SlotType == "name") @@ -4310,7 +4310,7 @@ void PreferencesDialog::profileChanged( const QString& itemtext ) ProfileSmartcardOptionsWidget->Pkcs11SlotTypeComboBox->setEnabled(false); ProfileSmartcardOptionsWidget->Pkcs11SlotTypeLabel->setEnabled(false); - QString Pkcs11IdType = it->getPkcs11IdType(); + TQString Pkcs11IdType = it->getPkcs11IdType(); if (Pkcs11IdType == "id") ProfileSmartcardOptionsWidget->Pkcs11IdTypeComboBox->setCurrentText(i18n("ID")); else if (Pkcs11IdType == "label") @@ -4321,7 +4321,7 @@ void PreferencesDialog::profileChanged( const QString& itemtext ) // ProfileSmartcardOptionsWidget->Pkcs11IdTypeComboBox->setCurrentText(i18n("ID")); // ProfileSmartcardOptionsWidget->Pkcs11IdTypeComboBox->setEnabled(false); - QString Pkcs11SignMode = it->getPkcs11SignMode(); + TQString Pkcs11SignMode = it->getPkcs11SignMode(); if (Pkcs11SignMode == "auto") ProfileSmartcardOptionsWidget->Pkcs11SignModeComboBox->setCurrentText(i18n("auto")); else if (Pkcs11SignMode == "sign") @@ -4497,15 +4497,15 @@ void PreferencesDialog::saveSessionClicked() if ( GlobalConfig->currentProfile == 0 || GlobalConfig->AccountList->isEmpty()) return ; - GlobalConfig->appPointer->setOverrideCursor( QCursor( Qt::WaitCursor ) ); + GlobalConfig->appPointer->setOverrideCursor( TQCursor( TQt::WaitCursor ) ); VpnAccountData *profile = GlobalConfig->currentProfile; - //QString itemString=ConnectionTypeComboBox->currentText(); + //TQString itemString=ConnectionTypeComboBox->currentText(); int item = ProfileGeneralOptionsWidget->ConnectionTypeComboBox->currentItem() ; GlobalConfig->currentProfile->setConnectionType( ( VpnAccountData::ConnectionType ) ( item ) ); -// KMessageBox::information(0,"connection type changed: "+QString().setNum(item),QString("type set")); +// KMessageBox::information(0,"connection type changed: "+TQString().setNum(item),TQString("type set")); profile->setDescription( ProfileGeneralOptionsWidget->DescriptionLineEdit->text() ); @@ -4664,17 +4664,17 @@ void PreferencesDialog::saveSessionClicked() } else { - QString addr = ProfileNetworkGeneralOptionsWidget->RemoteNetAddrLineEdit->text(); + TQString addr = ProfileNetworkGeneralOptionsWidget->RemoteNetAddrLineEdit->text(); int part0 = addr.section( '.', 0, 0 ).toInt(); int part1 = addr.section( '.', 1, 1 ).toInt(); int part2 = addr.section( '.', 2, 2 ).toInt(); int part3 = addr.section( '.', 3, 3 ).toInt(); /* - LogOutput->append ("part0: "+QString().setNum(part0)); - LogOutput->append ("part1: "+QString().setNum(part1)); - LogOutput->append ("part2: "+QString().setNum(part2)); - LogOutput->append ("part3: "+QString().setNum(part3)); + LogOutput->append ("part0: "+TQString().setNum(part0)); + LogOutput->append ("part1: "+TQString().setNum(part1)); + LogOutput->append ("part2: "+TQString().setNum(part2)); + LogOutput->append ("part3: "+TQString().setNum(part3)); */ if ( ( part0 < 1 || part0 > 254 ) || ( part1 < 0 || part1 > 254 ) || ( part2 < 0 || part2 > 254 ) || ( part3 < 0 || part3 > 254 ) ) { @@ -4745,14 +4745,14 @@ void PreferencesDialog::saveSessionClicked() { if (ProfilePskOptionsWidget->CheckSavePsk->isChecked()) { - QString Psk=ProfilePskOptionsWidget->PSKLineEdit->text(); + TQString Psk=ProfilePskOptionsWidget->PSKLineEdit->text(); if (ProfilePskOptionsWidget->PskInFileCheckBox->isChecked()) { - QString PskFileName = ProfilePskOptionsWidget->PSKFileURLRequester->url(); - QFile PskFile (PskFileName); + TQString PskFileName = ProfilePskOptionsWidget->PSKFileURLRequester->url(); + TQFile PskFile (PskFileName); if (PskFile.open(IO_WriteOnly)) { - QTextStream stream ( &PskFile ); + TQTextStream stream ( &PskFile ); stream << Psk; profile->setPskIsInFile(true); profile->setSavePsk(true); @@ -4776,7 +4776,7 @@ void PreferencesDialog::saveSessionClicked() profile->setUserName(ProfileUserOptionsWidget->UsernameLineEdit->text()); if (ProfileUserOptionsWidget->CheckUserPass->isChecked()) { - QString UserPassword = ProfileUserOptionsWidget->PasswordEdit->text(); + TQString UserPassword = ProfileUserOptionsWidget->PasswordEdit->text(); if (!UserPassword.isEmpty()) { profile->setUserPassword(UserPassword); @@ -4807,7 +4807,7 @@ void PreferencesDialog::saveSessionClicked() profile->setUserName(ProfileUserOptionsWidget->UsernameLineEdit->text()); if (ProfileUserOptionsWidget->CheckUserPass->isChecked()) { - QString UserPassword = ProfileUserOptionsWidget->PasswordEdit->text(); + TQString UserPassword = ProfileUserOptionsWidget->PasswordEdit->text(); if (!UserPassword.isEmpty()) { profile->setUserPassword(UserPassword); @@ -4876,8 +4876,8 @@ void PreferencesDialog::saveSessionClicked() profile->setSaveUserPassword ( ProfileCertOptionsWidget->SavePrivateKeyPasswordCheckBox->isChecked() ); // ike + esp - QStringList IkeList; - QStringList EspList; + TQStringList IkeList; + TQStringList EspList; if (ProfileIpsecOptionsWidget->IkeAes256Sha1CheckBox->isChecked()) IkeList.append("aes256-sha1"); @@ -4922,10 +4922,10 @@ void PreferencesDialog::saveSessionClicked() profile->setIpsecEsp(EspList.join(",")); profile->setIpsecIke(IkeList.join(",")); - for ( QStringList::Iterator ikeit = IkeList.begin(); ikeit != IkeList.end(); ++ikeit ) + for ( TQStringList::Iterator ikeit = IkeList.begin(); ikeit != IkeList.end(); ++ikeit ) std::cout << "ike: " << *ikeit << ":" << std::endl; - for ( QStringList::Iterator espit = EspList.begin(); espit != EspList.end(); ++espit ) + for ( TQStringList::Iterator espit = EspList.begin(); espit != EspList.end(); ++espit ) std::cout << "esp: " << *espit << ":" << std::endl; if(ProfileIpsecOptionsWidget->UseCustomEspCheckBox->isChecked() && !EspList.isEmpty()) @@ -4973,14 +4973,14 @@ void PreferencesDialog::saveSessionClicked() { if (ProfilePskOptionsWidget->CheckSavePsk->isChecked()) { - QString Psk=ProfilePskOptionsWidget->PSKLineEdit->text(); + TQString Psk=ProfilePskOptionsWidget->PSKLineEdit->text(); if (ProfilePskOptionsWidget->PskInFileCheckBox->isChecked()) { - QString PskFileName = ProfilePskOptionsWidget->PSKFileURLRequester->url(); - QFile PskFile (PskFileName); + TQString PskFileName = ProfilePskOptionsWidget->PSKFileURLRequester->url(); + TQFile PskFile (PskFileName); if (PskFile.open(IO_WriteOnly)) { - QTextStream stream ( &PskFile ); + TQTextStream stream ( &PskFile ); stream << Psk; profile->setPskIsInFile(true); profile->setSavePsk(true); @@ -5004,7 +5004,7 @@ void PreferencesDialog::saveSessionClicked() profile->setUserName(ProfileUserOptionsWidget->UsernameLineEdit->text()); if (ProfileUserOptionsWidget->CheckUserPass->isChecked()) { - QString UserPassword = ProfileUserOptionsWidget->PasswordEdit->text(); + TQString UserPassword = ProfileUserOptionsWidget->PasswordEdit->text(); if (!UserPassword.isEmpty()) { profile->setUserPassword(UserPassword); @@ -5247,17 +5247,17 @@ void PreferencesDialog::saveSessionClicked() } else { - QString addr = ProfileNetworkGeneralOptionsWidget->RemoteNetAddrLineEdit->text(); + TQString addr = ProfileNetworkGeneralOptionsWidget->RemoteNetAddrLineEdit->text(); int part0 = addr.section( '.', 0, 0 ).toInt(); int part1 = addr.section( '.', 1, 1 ).toInt(); int part2 = addr.section( '.', 2, 2 ).toInt(); int part3 = addr.section( '.', 3, 3 ).toInt(); /* - LogOutput->append ("part0: "+QString().setNum(part0)); - LogOutput->append ("part1: "+QString().setNum(part1)); - LogOutput->append ("part2: "+QString().setNum(part2)); - LogOutput->append ("part3: "+QString().setNum(part3)); + LogOutput->append ("part0: "+TQString().setNum(part0)); + LogOutput->append ("part1: "+TQString().setNum(part1)); + LogOutput->append ("part2: "+TQString().setNum(part2)); + LogOutput->append ("part3: "+TQString().setNum(part3)); */ if ( ( part0 < 1 || part0 > 254 ) || ( part1 < 0 || part1 > 254 ) || ( part2 < 0 || part2 > 254 ) || ( part3 < 0 || part3 > 254 ) ) @@ -5335,7 +5335,7 @@ void PreferencesDialog::saveSessionClicked() bool IPOk=true; if ( ProfileNetworkVirtualIpOptionsWidget->UseVirtualIPCheckBox->isChecked()) { - QString LocalVirtualIp = ProfileNetworkVirtualIpOptionsWidget->LocalVirtualIpEdit->text(); + TQString LocalVirtualIp = ProfileNetworkVirtualIpOptionsWidget->LocalVirtualIpEdit->text(); if (Utils( GlobalConfig ).isValidIPv4Address (LocalVirtualIp) == false) { KMessageBox::error ( this, i18n( "No valid IP address entered!" ), i18n( "No Valid IP Address" ) ); @@ -5346,7 +5346,7 @@ void PreferencesDialog::saveSessionClicked() profile->setLocalVirtualIP( LocalVirtualIp); } - QString RemoteVirtualIp = ProfileNetworkVirtualIpOptionsWidget->RemoteVirtualIpLineEdit->text(); + TQString RemoteVirtualIp = ProfileNetworkVirtualIpOptionsWidget->RemoteVirtualIpLineEdit->text(); if (Utils( GlobalConfig ).isValidIPv4Address(RemoteVirtualIp) == false) { KMessageBox::error ( this, i18n( "No valid IP address entered!" ), i18n( "No Valid IP Address" ) ); @@ -5378,17 +5378,17 @@ void PreferencesDialog::saveSessionClicked() } else { - QString addr = ProfileNetworkGeneralOptionsWidget->PingIPLineEdit->text(); + TQString addr = ProfileNetworkGeneralOptionsWidget->PingIPLineEdit->text(); // int part0 = addr.section( '.', 0, 0 ).toInt(); // int part1 = addr.section( '.', 1, 1 ).toInt(); // int part2 = addr.section( '.', 2, 2 ).toInt(); // int part3 = addr.section( '.', 3, 3 ).toInt(); /* - LogOutput->append ("part0: "+QString().setNum(part0)); - LogOutput->append ("part1: "+QString().setNum(part1)); - LogOutput->append ("part2: "+QString().setNum(part2)); - LogOutput->append ("part3: "+QString().setNum(part3)); + LogOutput->append ("part0: "+TQString().setNum(part0)); + LogOutput->append ("part1: "+TQString().setNum(part1)); + LogOutput->append ("part2: "+TQString().setNum(part2)); + LogOutput->append ("part3: "+TQString().setNum(part3)); */ // if ( ( part0 < 1 || part0 > 254 ) || ( part1 < 0 || part1 > 254 ) || ( part2 < 0 || part2 > 254 ) || ( part3 < 0 || part3 > 254 ) ) // { @@ -5403,7 +5403,7 @@ void PreferencesDialog::saveSessionClicked() bool IPOk=true; if (ProfileNetworkVirtualIpOptionsWidget->UseVirtualIPCheckBox->isChecked()) { - QString LocalVirtualIp = ProfileNetworkVirtualIpOptionsWidget->LocalVirtualIpEdit->text(); + TQString LocalVirtualIp = ProfileNetworkVirtualIpOptionsWidget->LocalVirtualIpEdit->text(); if (Utils( GlobalConfig ).isValidIPv4Address (LocalVirtualIp) == false) { KMessageBox::error ( this, i18n( "No valid IP address entered!" ), i18n( "No Valid IP Address" ) ); @@ -5414,7 +5414,7 @@ void PreferencesDialog::saveSessionClicked() profile->setLocalVirtualIP( LocalVirtualIp); } - QString RemoteVirtualIp = ProfileNetworkVirtualIpOptionsWidget->RemoteVirtualIpLineEdit->text(); + TQString RemoteVirtualIp = ProfileNetworkVirtualIpOptionsWidget->RemoteVirtualIpLineEdit->text(); if (ProfileNetworkGeneralOptionsWidget->TunnelDeviceTypeComboBox->currentText().lower() == "tun") { @@ -5589,7 +5589,7 @@ void PreferencesDialog::saveSessionClicked() bool IPOk=true; if (ProfileNetworkVirtualIpOptionsWidget->UseVirtualIPCheckBox->isChecked()) { - QString LocalVirtualIp = ProfileNetworkVirtualIpOptionsWidget->LocalVirtualIpEdit->text(); + TQString LocalVirtualIp = ProfileNetworkVirtualIpOptionsWidget->LocalVirtualIpEdit->text(); if (Utils( GlobalConfig ).isValidIPv4Address (LocalVirtualIp) == false) { KMessageBox::error ( this, i18n( "No valid IP address entered!" ), i18n( "No Valid IP Address" ) ); @@ -5600,7 +5600,7 @@ void PreferencesDialog::saveSessionClicked() profile->setLocalVirtualIP( LocalVirtualIp); } - QString RemoteVirtualIp = ProfileNetworkVirtualIpOptionsWidget->RemoteVirtualIpLineEdit->text(); + TQString RemoteVirtualIp = ProfileNetworkVirtualIpOptionsWidget->RemoteVirtualIpLineEdit->text(); if (ProfileNetworkGeneralOptionsWidget->TunnelDeviceTypeComboBox->currentText().lower() == "tun") { @@ -5642,7 +5642,7 @@ void PreferencesDialog::saveSessionClicked() if (ProfileNetworkVirtualIpOptionsWidget->UseVirtualIPCheckBox->isChecked()) { - QString LocalVirtualIp = ProfileNetworkVirtualIpOptionsWidget->LocalVirtualIpEdit->text(); + TQString LocalVirtualIp = ProfileNetworkVirtualIpOptionsWidget->LocalVirtualIpEdit->text(); if (Utils( GlobalConfig ).isValidIPv4Address (LocalVirtualIp) == false) { KMessageBox::error ( this, i18n( "No valid IP address entered!" ), i18n( "No Valid IP Address" ) ); @@ -5654,7 +5654,7 @@ void PreferencesDialog::saveSessionClicked() } - QString RemoteVirtualIp = ProfileNetworkVirtualIpOptionsWidget->RemoteVirtualIpLineEdit->text(); + TQString RemoteVirtualIp = ProfileNetworkVirtualIpOptionsWidget->RemoteVirtualIpLineEdit->text(); if (ProfileNetworkGeneralOptionsWidget->TunnelDeviceTypeComboBox->currentText().lower() == "tun") { @@ -5714,7 +5714,7 @@ void PreferencesDialog::saveSessionClicked() if (ProfileSshOptionsWidget->UseSshConfigRemoteScriptCheckBox->isChecked() && ProfileSshOptionsWidget->SshConfigRemoteScriptLineEdit->text().isEmpty()) { - KMessageBox::error ( this, i18n( "%1 cant be empty!" ).arg(i18n("ssh config remote script")), i18n( "%1 empty" ).arg(i18n("ssh config remote script")) ); + KMessageBox::error ( this, i18n( "%1 cant be empty!" ).tqarg(i18n("ssh config remote script")), i18n( "%1 empty" ).tqarg(i18n("ssh config remote script")) ); IPOk=false; } @@ -5727,7 +5727,7 @@ void PreferencesDialog::saveSessionClicked() } else { - if ( ProfileNetworkGeneralOptionsWidget->PingCheckBox->isChecked() && ProfileNetworkGeneralOptionsWidget->PingIPLineEdit->text() == QString( "" ) ) + if ( ProfileNetworkGeneralOptionsWidget->PingCheckBox->isChecked() && ProfileNetworkGeneralOptionsWidget->PingIPLineEdit->text() == TQString( "" ) ) { KMessageBox::error ( this, i18n( "No hostname/IP address (ping host) entered!" ), i18n( "No hostname/IP address" ) ); GlobalConfig->appendLogEntry( i18n( "No hostname/IP address (ping host) entered!" ) , GlobalConfig->error ); @@ -5878,7 +5878,7 @@ void PreferencesDialog::saveSessionClicked() } - QStringList AdditionalNetworkRoutes; + TQStringList AdditionalNetworkRoutes; if ( ProfileNetworkRouteOptionsWidget->UseExtraNetworkRoutesCheckbox->isChecked() ) profile->setUseAdditionalNetworkRoutes( true ); else @@ -5886,12 +5886,12 @@ void PreferencesDialog::saveSessionClicked() if (ProfileNetworkRouteOptionsWidget->NetworkListView->childCount() > 0) { - QListViewItemIterator it( ProfileNetworkRouteOptionsWidget->NetworkListView ); + TQListViewItemIterator it( ProfileNetworkRouteOptionsWidget->NetworkListView ); for ( ; it.current(); ++it ) { // example entry: // /# - QString network = QString( it.current() ->text( 0 ) + "/" + it.current() ->text( 1 ) ); + TQString network = TQString( it.current() ->text( 0 ) + "/" + it.current() ->text( 1 ) ); network.append( "#" ); network.append( it.current() ->text( 2 ) ); // gateway network.append( "#" ); @@ -5938,7 +5938,7 @@ void PreferencesDialog::saveSessionClicked() // GlobalConfig->appendLogEntry( i18n( "ID for certificate at smartcard can't be empty!" ) ,GlobalConfig->error); canAccept = false; } - QString Pkcs11SlotType = ProfileSmartcardOptionsWidget->Pkcs11SlotTypeComboBox->currentText(); + TQString Pkcs11SlotType = ProfileSmartcardOptionsWidget->Pkcs11SlotTypeComboBox->currentText(); if (Pkcs11SlotType == i18n("ID")) profile->setPkcs11SlotType("id"); else if (Pkcs11SlotType == i18n("Name")) @@ -5946,7 +5946,7 @@ void PreferencesDialog::saveSessionClicked() else profile->setPkcs11SlotType("label"); - QString Pkcs11IdType = ProfileSmartcardOptionsWidget->Pkcs11IdTypeComboBox->currentText(); + TQString Pkcs11IdType = ProfileSmartcardOptionsWidget->Pkcs11IdTypeComboBox->currentText(); if (Pkcs11IdType == i18n("ID")) profile->setPkcs11IdType("id"); else if (Pkcs11IdType == i18n("Label")) @@ -5954,7 +5954,7 @@ void PreferencesDialog::saveSessionClicked() else profile->setPkcs11IdType("subject"); - QString Pkcs11SignMode = ProfileSmartcardOptionsWidget->Pkcs11SignModeComboBox->currentText(); + TQString Pkcs11SignMode = ProfileSmartcardOptionsWidget->Pkcs11SignModeComboBox->currentText(); if (Pkcs11SignMode == i18n("auto")) profile->setPkcs11SignMode("auto"); else if (Pkcs11SignMode == i18n("sign")) @@ -5996,20 +5996,20 @@ void PreferencesDialog::saveSessionClicked() GlobalConfig->config->sync(); GlobalConfig->appPointer->restoreOverrideCursor(); - //GlobalConfig->appendLogEntry( i18n( "Profile \"%1\" saved." ).arg( newName ),GlobalConfig->debug); + //GlobalConfig->appendLogEntry( i18n( "Profile \"%1\" saved." ).tqarg( newName ),GlobalConfig->debug); // enableButtonApply(false); } void PreferencesDialog::deleteSessionClicked() { - QString Name = ProfileGeneralSelector->currentText(); + TQString Name = ProfileGeneralSelector->currentText(); ToolInfo *IpsecToolInfo = Utils ( GlobalConfig ).getToolInfo ( "ipsec" ) ; - QString IpsecType; + TQString IpsecType; - QString TypeString = i18n ( "unknown" ); + TQString TypeString = i18n ( "unknown" ); if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::cisco ) TypeString = i18n("Cisco"); else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ciscoorig ) @@ -6049,8 +6049,8 @@ void PreferencesDialog::deleteSessionClicked() if ( !ProfileGeneralSelector->currentText().isEmpty() ) { - int result = KMessageBox::questionYesNo ( this, i18n ( "Really delete profile \"%1\" (type: %2, Server: %3)?" ).arg ( GlobalConfig->currentProfile->getName() ).arg(TypeString).arg(GlobalConfig->currentProfile->getGateway()), i18n ( "Delete?" ), KStdGuiItem::del(), KStdGuiItem::cancel() ); - //LogOutput->append( "Result: "+ QString().setNum(result) ) ; + int result = KMessageBox::questionYesNo ( this, i18n ( "Really delete profile \"%1\" (type: %2, Server: %3)?" ).arg ( GlobalConfig->currentProfile->getName() ).tqarg(TypeString).tqarg(GlobalConfig->currentProfile->getGateway()), i18n ( "Delete?" ), KStdGuiItem::del(), KStdGuiItem::cancel() ); + //LogOutput->append( "Result: "+ TQString().setNum(result) ) ; if ( result == 3 ) // Yes { VpnAccountData * it; @@ -6122,12 +6122,12 @@ void PreferencesDialog::deleteSessionClicked() // CommandExecutionGroupBox->setEnabled( false ); } - // slotStatusMsg ( i18n( "Profile \"%1\" deleted." ).arg( Name ), ID_FLASH_MSG ); + // slotStatusMsg ( i18n( "Profile \"%1\" deleted." ).tqarg( Name ), ID_FLASH_MSG ); profileAddedOrDeleted = true; saveSessionClicked(); GlobalConfig->removeEntry( Name ); - GlobalConfig->appendLogEntry ( i18n( "Profile \"%1\" deleted." ).arg( Name ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n( "Profile \"%1\" deleted." ).tqarg( Name ), GlobalConfig->debug ); //saveOptions(); // TODO save, currently after closing dialog @@ -6151,19 +6151,19 @@ void PreferencesDialog::newSessionClicked() VpnAccountData * it; bool nameOk = false; bool ok; - QString newName=newdlg.getName(); - QString Oldname = newdlg.getName(); + TQString newName=newdlg.getName(); + TQString Oldname = newdlg.getName(); while ( nameOk == false ) { for ( it = GlobalConfig->AccountList->first(); it; it = GlobalConfig->AccountList->next() ) { if ( ( it != GlobalConfig->currentProfile ) && ( it->getName() == newName ) ) { - //account->setName( QString( account->getName() + "_2" ) ); - // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).arg( account->getName() ), i18n( "Name exist, renamed" ) ); + //account->setName( TQString( account->getName() + "_2" ) ); + // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).tqarg( account->getName() ), i18n( "Name exist, renamed" ) ); KMessageBox::error ( this, i18n ( "Profile name exists!" ), i18n ( "Name Exists" ) ); - newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), QString ( Oldname + "_2" ), &ok ); + newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), TQString ( Oldname + "_2" ), &ok ); if ( ok == false ) { KMessageBox::information ( 0, i18n ( "Rename at new created profile was canceled." ) ); @@ -6190,7 +6190,7 @@ void PreferencesDialog::newSessionClicked() if ( it->getName() == newName ) { if (GlobalConfig->KvpncDebugLevel > 3) - GlobalConfig->appendLogEntry ( i18n( "New created profile \"%1\" found in profile list." ).arg( newName ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n( "New created profile \"%1\" found in profile list." ).tqarg( newName ), GlobalConfig->debug ); profileAddedOrDeleted=true; ProfileGeneralSelector->insertItem( newName ); ProfileNetworkRouteSelector->insertItem( newName ); @@ -6230,10 +6230,10 @@ void PreferencesDialog::newSessionClicked() // GeneralGroupbox->setEnabled( true ); // CommandExecutionGroupBox->setEnabled( true ); - KMessageBox::information ( this, i18n( "Profile \"%1\" added.\nNow set the right type,\n fill in the fields\nand press \"Save\" to complete the profile." ).arg( newName ), i18n( "Complete Profile" ) ); - //slotStatusMsg ( i18n( "Profile \"%1\" added." ).arg( Name ), ID_FLASH_MSG ); + KMessageBox::information ( this, i18n( "Profile \"%1\" added.\nNow set the right type,\n fill in the fields\nand press \"Save\" to complete the profile." ).tqarg( newName ), i18n( "Complete Profile" ) ); + //slotStatusMsg ( i18n( "Profile \"%1\" added." ).tqarg( Name ), ID_FLASH_MSG ); - GlobalConfig->appendLogEntry ( i18n( "Profile \"%1\" added." ).arg( newName ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n( "Profile \"%1\" added." ).tqarg( newName ), GlobalConfig->debug ); profileAddedOrDeleted = true; configChanged=true; NewProfileName = newName; @@ -6261,12 +6261,12 @@ void PreferencesDialog::renameSessionClicked() { bool ok = true; bool nameOk = false; - QString oldName = GlobalConfig->currentProfile->getName(); - QString *newName; + TQString oldName = GlobalConfig->currentProfile->getName(); + TQString *newName; while ( nameOk == false ) { - newName = new QString( KInputDialog::getText ( i18n( "New Name" ), i18n( "Enter new name for profile:" ), oldName, &ok, this ) ); + newName = new TQString( KInputDialog::getText ( i18n( "New Name" ), i18n( "Enter new name for profile:" ), oldName, &ok, this ) ); if ( newName->contains( ' ' ) ) { KMessageBox::error ( this, i18n( "Blanks are not allowed in profile names!" ), i18n( "Illegal Character in Name" ) ); @@ -6352,13 +6352,13 @@ void PreferencesDialog::renameSessionClicked() profileAddedOrDeleted = true; configChanged=true; - GlobalConfig->lastProfile = QString(*newName); + GlobalConfig->lastProfile = TQString(*newName); saveSessionClicked(); GlobalConfig->removeEntry( oldName ); - KMessageBox::information ( 0, i18n ( "Rename of \"%1\" to \"%2\" was successful." ).arg ( oldName ).arg(GlobalConfig->currentProfile->getName()) ); - GlobalConfig->appendLogEntry ( i18n ( "Rename of \"%1\" to \"%2\" was successful." ).arg ( oldName ).arg(GlobalConfig->currentProfile->getName()), GlobalConfig->info ); + KMessageBox::information ( 0, i18n ( "Rename of \"%1\" to \"%2\" was successful." ).arg ( oldName ).tqarg(GlobalConfig->currentProfile->getName()) ); + GlobalConfig->appendLogEntry ( i18n ( "Rename of \"%1\" to \"%2\" was successful." ).arg ( oldName ).tqarg(GlobalConfig->currentProfile->getName()), GlobalConfig->info ); } @@ -6372,7 +6372,7 @@ void PreferencesDialog::importCertificate() dlg.exec(); } -void PreferencesDialog::pageChanged( QWidget* page ) +void PreferencesDialog::pageChanged( TQWidget* page ) { // std::cout << "page changed, new profile: "<< lastProfileName << std::endl; @@ -6554,7 +6554,7 @@ void PreferencesDialog::useUdpToggled( bool ) } } -void PreferencesDialog::OpenvpnPathChanged( const QString& ) +void PreferencesDialog::OpenvpnPathChanged( const TQString& ) { ToolInfo * OpenvpnInfo = Utils( GlobalConfig ).getToolInfo ( "openvpn" ); // OpenvpnInfo->PathToExec = ConfigDaemonOptionsWidget->OpenvpnPathInput->url(); @@ -6571,7 +6571,7 @@ void PreferencesDialog::OpenvpnPathChanged( const QString& ) ConfigDaemonOptionsWidget->OpenvpnStatePixmapLabel->setPixmap( wrong_icon ); } -void PreferencesDialog::FreeswanPathChanged( const QString& ) +void PreferencesDialog::FreeswanPathChanged( const TQString& ) { // KMessageBox::information(0,"path changed","ipsec"); @@ -6591,7 +6591,7 @@ void PreferencesDialog::FreeswanPathChanged( const QString& ) ConfigDaemonOptionsWidget->IpsecStatePixmapLabel->setPixmap( wrong_icon ); } -void PreferencesDialog::PppdPathChanged( const QString& ) +void PreferencesDialog::PppdPathChanged( const TQString& ) { // KMessageBox::information(0,"path changed","Pppd"); @@ -6611,7 +6611,7 @@ void PreferencesDialog::PppdPathChanged( const QString& ) ConfigDaemonOptionsWidget->PppdStatePixmapLabel->setPixmap( wrong_icon ); } -void PreferencesDialog::PptpPathChanged( const QString& ) +void PreferencesDialog::PptpPathChanged( const TQString& ) { // KMessageBox::information(0,"path changed","Pptp"); @@ -6631,7 +6631,7 @@ void PreferencesDialog::PptpPathChanged( const QString& ) ConfigDaemonOptionsWidget->PptpStatePixmapLabel->setPixmap( wrong_icon ); } -void PreferencesDialog::RacoonPathChanged( const QString& ) +void PreferencesDialog::RacoonPathChanged( const TQString& ) { // KMessageBox::information(0,"path changed","Racoon"); @@ -6645,8 +6645,8 @@ void PreferencesDialog::RacoonPathChanged( const QString& ) ConfigDaemonOptionsWidget->RacoonVersionLineEdit->setText( RacoonInfo->Version ); - QPixmap ok_icon = KGlobal::iconLoader() ->loadIcon( "button_ok", KIcon::NoGroup ); - QPixmap wrong_icon = KGlobal::iconLoader() ->loadIcon( "button_cancel", KIcon::NoGroup ); + TQPixmap ok_icon = KGlobal::iconLoader() ->loadIcon( "button_ok", KIcon::NoGroup ); + TQPixmap wrong_icon = KGlobal::iconLoader() ->loadIcon( "button_cancel", KIcon::NoGroup ); if ( RacoonInfo->found ) ConfigDaemonOptionsWidget->RacoonStatePixmapLabel->setPixmap( ok_icon ); @@ -6654,7 +6654,7 @@ void PreferencesDialog::RacoonPathChanged( const QString& ) ConfigDaemonOptionsWidget->RacoonStatePixmapLabel->setPixmap( wrong_icon ); } -void PreferencesDialog::VpncPathChanged( const QString& ) +void PreferencesDialog::VpncPathChanged( const TQString& ) { // KMessageBox::information(0,"path changed","Vpnc"); @@ -6678,7 +6678,7 @@ void PreferencesDialog::VpncPathChanged( const QString& ) ConfigDaemonOptionsWidget->VpncStatePixmapLabel->setPixmap( wrong_icon ); } -void PreferencesDialog::CiscoVpncPathChanged( const QString& ) +void PreferencesDialog::CiscoVpncPathChanged( const TQString& ) { // KMessageBox::information(0,"path changed","Vpnc"); @@ -6702,7 +6702,7 @@ void PreferencesDialog::CiscoVpncPathChanged( const QString& ) ConfigDaemonOptionsWidget->CiscoVpncStatePixmapLabel->setPixmap( wrong_icon ); } -void PreferencesDialog::L2tpdPathChanged( const QString& ) +void PreferencesDialog::L2tpdPathChanged( const TQString& ) { // KMessageBox::information(0,"path changed","L2tpd"); @@ -6727,7 +6727,7 @@ void PreferencesDialog::L2tpdPathChanged( const QString& ) ConfigDaemonOptionsWidget->L2tpdStatePixmapLabel->setPixmap( wrong_icon ); } -void PreferencesDialog::Xl2tpdPathChanged( const QString& ) +void PreferencesDialog::Xl2tpdPathChanged( const TQString& ) { // KMessageBox::information(0,"path changed","Xl2tpd"); @@ -6752,7 +6752,7 @@ void PreferencesDialog::Xl2tpdPathChanged( const QString& ) ConfigDaemonOptionsWidget->Xl2tpdStatePixmapLabel->setPixmap( wrong_icon ); } -void PreferencesDialog::Openl2tpPathChanged( const QString& ) +void PreferencesDialog::Openl2tpPathChanged( const TQString& ) { // KMessageBox::information(0,"path changed","Openl2tp"); @@ -6777,7 +6777,7 @@ void PreferencesDialog::Openl2tpPathChanged( const QString& ) ConfigDaemonOptionsWidget->Openl2tpStatePixmapLabel->setPixmap( wrong_icon ); } -void PreferencesDialog::VtundPathChanged( const QString& ) +void PreferencesDialog::VtundPathChanged( const TQString& ) { // KMessageBox::information(0,"path changed","vtund"); @@ -6802,7 +6802,7 @@ void PreferencesDialog::VtundPathChanged( const QString& ) ConfigDaemonOptionsWidget->VtundStatePixmapLabel->setPixmap( wrong_icon ); } -void PreferencesDialog::SshPathChanged( const QString& ) +void PreferencesDialog::SshPathChanged( const TQString& ) { // KMessageBox::information(0,"path changed","ssh"); @@ -6827,11 +6827,11 @@ void PreferencesDialog::SshPathChanged( const QString& ) ConfigDaemonOptionsWidget->SshStatePixmapLabel->setPixmap( wrong_icon ); } -void PreferencesDialog::showEvent(QShowEvent* e) +void PreferencesDialog::showEvent(TQShowEvent* e) { KDialogBase::showEvent(e); - QSplitter* splitter = ((QSplitter*)child(0, "QSplitter", true)); + TQSplitter* splitter = ((TQSplitter*)child(0, TQSPLITTER_OBJECT_NAME_STRING, true)); KListView* listView = ((KListView*)child(0, "KListView", true)); if (splitter && listView) @@ -6843,8 +6843,8 @@ void PreferencesDialog::showEvent(QShowEvent* e) { int shiftSplitterBy = content - visible; resize(width()+shiftSplitterBy, height()); - QValueList oldSizes = splitter->sizes(); - QValueList newSizes; + TQValueList oldSizes = splitter->sizes(); + TQValueList newSizes; newSizes << oldSizes[0] + shiftSplitterBy << oldSizes[1] - shiftSplitterBy; splitter->setSizes(newSizes); } @@ -6853,69 +6853,69 @@ void PreferencesDialog::showEvent(QShowEvent* e) void PreferencesDialog::detectPkcs11Ids() { - GlobalConfig->appPointer->setOverrideCursor( QCursor(Qt::WaitCursor) ); + GlobalConfig->appPointer->setOverrideCursor( TQCursor(TQt::WaitCursor) ); ProfileSmartcardOptionsWidget->Pkcs11IdComboBox->clear(); int Pkcs11IdType = ProfileSmartcardOptionsWidget->Pkcs11IdTypeComboBox->currentItem(); - QString Pkcs11IdTypeTmp; + TQString Pkcs11IdTypeTmp; if (Pkcs11IdType == 0) { Pkcs11IdTypeTmp="id"; if (KvpncDebugLevel > 1) - GlobalConfig->appendLogEntry(i18n("Pkcs11IdType: %1").arg(Pkcs11IdTypeTmp),KVpncConfig::debug); + GlobalConfig->appendLogEntry(i18n("Pkcs11IdType: %1").tqarg(Pkcs11IdTypeTmp),KVpncConfig::debug); } else if (Pkcs11IdType == 1) { Pkcs11IdTypeTmp="label"; if (KvpncDebugLevel > 1) - GlobalConfig->appendLogEntry(i18n("Pkcs11IdType: %1").arg(Pkcs11IdTypeTmp),KVpncConfig::debug); + GlobalConfig->appendLogEntry(i18n("Pkcs11IdType: %1").tqarg(Pkcs11IdTypeTmp),KVpncConfig::debug); } else { Pkcs11IdTypeTmp="subject"; if (KvpncDebugLevel > 1) - GlobalConfig->appendLogEntry(i18n("Pkcs11IdType: %1").arg(Pkcs11IdTypeTmp),KVpncConfig::debug); + GlobalConfig->appendLogEntry(i18n("Pkcs11IdType: %1").tqarg(Pkcs11IdTypeTmp),KVpncConfig::debug); } - QString ProviderLib=""; + TQString ProviderLib=""; bool isOpenvpn = GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::openvpn; if (ProfileSmartcardOptionsWidget->UsePkcs11ProvidersCheckBox->isChecked() && !ProfileSmartcardOptionsWidget->Pkcs11ProvidersURLRequester->url().isEmpty()) ProviderLib = ProfileSmartcardOptionsWidget->Pkcs11ProvidersURLRequester->url(); // we have to split slot id and name ("0 : foobar") => 0 - QString Pkcs11Slot = ProfileSmartcardOptionsWidget->Pkcs11SlotComboBox->currentText().section(':',0,0).stripWhiteSpace(); + TQString Pkcs11Slot = ProfileSmartcardOptionsWidget->Pkcs11SlotComboBox->currentText().section(':',0,0).stripWhiteSpace(); - QStringList Pkcs11Ids; + TQStringList Pkcs11Ids; if (isOpenvpn) Pkcs11Ids = Utils(GlobalConfig).getOpenvpnPkcs11Ids(ProviderLib); else Pkcs11Ids = Utils(GlobalConfig).getSmartcardCertsFromSlot(Pkcs11Slot,Pkcs11IdTypeTmp, ProviderLib ); - for ( QStringList::Iterator it = Pkcs11Ids.begin(); it != Pkcs11Ids.end(); ++it ) - ProfileSmartcardOptionsWidget->Pkcs11IdComboBox->insertItem( QString(*it)); + for ( TQStringList::Iterator it = Pkcs11Ids.begin(); it != Pkcs11Ids.end(); ++it ) + ProfileSmartcardOptionsWidget->Pkcs11IdComboBox->insertItem( TQString(*it)); GlobalConfig->appPointer->restoreOverrideCursor(); } void PreferencesDialog::detectPkcs11Slots() { - GlobalConfig->appPointer->setOverrideCursor( QCursor(Qt::WaitCursor) ); + GlobalConfig->appPointer->setOverrideCursor( TQCursor(TQt::WaitCursor) ); ProfileSmartcardOptionsWidget->Pkcs11SlotComboBox->clear(); - QString ProviderLib=""; + TQString ProviderLib=""; bool isOpenvpn = GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::openvpn; if (ProfileSmartcardOptionsWidget->UsePkcs11ProvidersCheckBox->isChecked() && !ProfileSmartcardOptionsWidget->Pkcs11ProvidersURLRequester->url().isEmpty()) ProviderLib = ProfileSmartcardOptionsWidget->Pkcs11ProvidersURLRequester->url(); - QStringList Pkcs11Slots; + TQStringList Pkcs11Slots; if (isOpenvpn) Pkcs11Slots.append("0"); else Pkcs11Slots = Utils(GlobalConfig).getSmartcardSlots(ProviderLib); - for ( QStringList::Iterator it = Pkcs11Slots.begin(); it != Pkcs11Slots.end(); ++it ) - ProfileSmartcardOptionsWidget->Pkcs11SlotComboBox->insertItem( QString(*it)); + for ( TQStringList::Iterator it = Pkcs11Slots.begin(); it != Pkcs11Slots.end(); ++it ) + ProfileSmartcardOptionsWidget->Pkcs11SlotComboBox->insertItem( TQString(*it)); GlobalConfig->appPointer->restoreOverrideCursor(); } @@ -6989,7 +6989,7 @@ if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::racoo void PreferencesDialog::singleDesToggled(bool) {} -void PreferencesDialog::tunnelDeviceTypeChanged(const QString & string ) +void PreferencesDialog::tunnelDeviceTypeChanged(const TQString & string ) { if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::openvpn || GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ssh) { @@ -7004,7 +7004,7 @@ void PreferencesDialog::tunnelDeviceTypeChanged(const QString & string ) } } -void PreferencesDialog::natModeToggled( const QString &) +void PreferencesDialog::natModeToggled( const TQString &) { if (ProfileCiscoOptionsWidget->CiscoNatModeComboBox->currentText() == "none") { @@ -7022,7 +7022,7 @@ void PreferencesDialog::useKwalletToggled(bool) { int result = KMessageBox::questionYesNo ( this, i18n ( "Do you really want disable the use of KWallet? KVpnc will save passwords and psk in config file if requested." ), i18n ( "Disable KWallet?" ) ); - //LogOutput->append( "Result: "+ QString().setNum(result) ) ; + //LogOutput->append( "Result: "+ TQString().setNum(result) ) ; if ( result == 2 || result == 4 ) // No or Cancel { GeneralOptionsWidget->useKwalletCheckBox->setChecked(true); @@ -7071,7 +7071,7 @@ void PreferencesDialog::useCiscoCertStoreToggled(bool) ProfileCertOptionsWidget->CaCertpathComboBox->show(); ProfileCertOptionsWidget->CaCertpathURLRequester->hide(); ProfileCertOptionsWidget->certpathURLRequester->hide(); - ProfileCertOptionsWidget->sizeHint(); + ProfileCertOptionsWidget->tqsizeHint(); } else { @@ -7080,7 +7080,7 @@ void PreferencesDialog::useCiscoCertStoreToggled(bool) ProfileCertOptionsWidget->CaCertpathComboBox->hide(); ProfileCertOptionsWidget->CaCertpathURLRequester->show(); ProfileCertOptionsWidget->certpathURLRequester->show(); - ProfileCertOptionsWidget->sizeHint(); + ProfileCertOptionsWidget->tqsizeHint(); } } @@ -7092,7 +7092,7 @@ bool PreferencesDialog::getVpncHasHybridSupport() { if (tool->Name == "vpnc") { - GlobalConfig->appendLogEntry ( i18n ( "vpnc capabilities: %1" ).arg( tool->Capabilities),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "vpnc capabilities: %1" ).tqarg( tool->Capabilities),GlobalConfig->debug ); if( tool->Capabilities.find(i18n("openssl (certificate) support"),0,-1) > -1 ) { hasHybridSupport = true; @@ -7104,7 +7104,7 @@ bool PreferencesDialog::getVpncHasHybridSupport() return hasHybridSupport; } -void PreferencesDialog::slotStatusMsg ( const QString &text, int id ) +void PreferencesDialog::slotStatusMsg ( const TQString &text, int id ) { if (!GlobalConfig->statusbar != 0) { @@ -7120,7 +7120,7 @@ void PreferencesDialog::slotStatusMsg ( const QString &text, int id ) } } -void PreferencesDialog::slotProfileCreated(QString Name) +void PreferencesDialog::slotProfileCreated(TQString Name) { ProfileGeneralSelector->insertItem( Name ); ProfileNetworkRouteSelector->insertItem( Name ); diff --git a/src/preferencesdialog.h b/src/preferencesdialog.h index 20b88db..ff89dea 100644 --- a/src/preferencesdialog.h +++ b/src/preferencesdialog.h @@ -22,11 +22,11 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "vpnaccountdata.h" @@ -66,6 +66,7 @@ class PreferencesDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** @@ -77,7 +78,7 @@ public: * @param showOnlyProfiles view mode. true: show as profile manager, false: show as preferences dialog * @return */ - PreferencesDialog( QWidget *parent, QApplication *app,QTextEdit *LogOutput, KVpncConfig *GlobalConfig, bool showOnlyProfiles); + PreferencesDialog( TQWidget *parent, TQApplication *app,TQTextEdit *LogOutput, KVpncConfig *GlobalConfig, bool showOnlyProfiles); ~PreferencesDialog(); public slots: @@ -86,13 +87,13 @@ public slots: void slotApply(); void authTypeChanged( int authtype ); void connectionTypeChanged( int connectiontype ); - void profileChanged( const QString& itemtext ); + void profileChanged( const TQString& itemtext ); void saveSessionClicked(); void deleteSessionClicked(); void renameSessionClicked(); void newSessionClicked(); void importCertificate(); - void pageChanged(QWidget *); + void pageChanged(TQWidget *); void userAuthToggled(bool); void useUdpToggled(bool); void useSpecialServerSmartcardificateToggled(bool); @@ -103,54 +104,54 @@ public slots: void useKwalletToggled(bool); void dpdToggled(bool); void useCiscoCertStoreToggled(bool); - void natModeToggled( const QString &); - void slotProfileCreated(QString Name); + void natModeToggled( const TQString &); + void slotProfileCreated(TQString Name); private slots: - void OpenvpnPathChanged(const QString&); - void FreeswanPathChanged(const QString&); - void PppdPathChanged(const QString&); - void PptpPathChanged(const QString&); - void RacoonPathChanged(const QString&); - void VpncPathChanged(const QString&); - void CiscoVpncPathChanged(const QString&); - void L2tpdPathChanged(const QString&); - void Xl2tpdPathChanged(const QString&); - void Openl2tpPathChanged(const QString&); - void VtundPathChanged(const QString&); - void SshPathChanged(const QString&); - void showEvent(QShowEvent* e); + void OpenvpnPathChanged(const TQString&); + void FreeswanPathChanged(const TQString&); + void PppdPathChanged(const TQString&); + void PptpPathChanged(const TQString&); + void RacoonPathChanged(const TQString&); + void VpncPathChanged(const TQString&); + void CiscoVpncPathChanged(const TQString&); + void L2tpdPathChanged(const TQString&); + void Xl2tpdPathChanged(const TQString&); + void Openl2tpPathChanged(const TQString&); + void VtundPathChanged(const TQString&); + void SshPathChanged(const TQString&); + void showEvent(TQShowEvent* e); void detectPkcs11Ids(); void detectPkcs11Slots(); void localPortToggled(bool); - void tunnelDeviceTypeChanged(const QString &); + void tunnelDeviceTypeChanged(const TQString &); void useXauthToggled(bool); - void slotStatusMsg ( const QString &text, int id ); + void slotStatusMsg ( const TQString &text, int id ); bool getVpncHasHybridSupport(); protected: void setupGui(); - QPtrList *AccountList; - QTextEdit *LogOutput; + TQPtrList *AccountList; + TQTextEdit *LogOutput; VpnAccountData *currentProfile; KVpncConfig *GlobalConfig; - QString lastProfileName; + TQString lastProfileName; int KvpncDebugLevel; bool canAccept; bool configChanged; - QPixmap ok_icon; - QPixmap wrong_icon; - QScrollView* DaemonScrollView; - QStringList CiscoCerts; - QStringList CiscoCaCerts; + TQPixmap ok_icon; + TQPixmap wrong_icon; + TQScrollView* DaemonScrollView; + TQStringList CiscoCerts; + TQStringList CiscoCaCerts; private: - QWidget *prev_page; - QWidget *current_page; + TQWidget *prev_page; + TQWidget *current_page; public: - QApplication *app; + TQApplication *app; /* -- option pages -- */ // Kvpnc @@ -186,63 +187,63 @@ public: ProfileCmdExecAfterConnectOptions *ProfileCmdExecAfterConnectOptionsWidget; ProfileCmdExecAfterDisconnectOptions *ProfileCmdExecAfterDisconnectOptionsWidget; - QFrame* ProfileNetworkRouteOptionsFrame; - QFrame* ConfigConnectOptionsFrame; - QFrame* DaemonOptionsFrame; - QFrame* DebugFrame; - QFrame* LogFrame; - QFrame* HelperProgramFrame; - QFrame* ProfileGeneralOptionsFrame; - QFrame* ProfileUserOptionsFrame; - QFrame* ProfileCertOptionsFrame; - QFrame* ProfileCiscoOptionsFrame; - QFrame* ProfileNetworkHttpProxyOptionsFrame; - QFrame* ProfileCmdExecAfterConnectOptionsFrame; - QFrame* ProfileCmdExecBeforeDisconnectOptionsFrame; - QFrame* ProfileCmdExecAfterDisconnectOptionsFrame; - QFrame* ProfileCmdExecBeforeConnectOptionsFrame; - QFrame* GeneralFrame; - QFrame* ProfileSmartcardOptionsFrame; - QFrame* ProfilePskOptionsFrame; - QFrame* ProfileNetworkGeneralOptionsFrame; - QFrame* ProfileNetworkNatOptionsFrame; - QFrame* ProfileNetworkVirtualIpOptionsFrame; - QFrame* ProfileRacoonOptionsFrame; - QFrame* ProfileIpsecOptionsFrame; - QFrame* ProfileOpenvpnOptionsFrame; - QFrame* ProfilePptpOptionsFrame; - QFrame* ProfileVtunOptionsFrame; - QFrame* ProfileSshOptionsFrame; - - - QComboBox *ProfileGeneralSelector; - QComboBox *ProfileNetworkRouteSelector; - QComboBox *ProfileNetworkGeneralSelector; - QComboBox *ProfileNetworkNatSelector; - QComboBox *ProfileNetworkVirtualIpSelector; - QComboBox *ProfileCertSelector; - QComboBox *ProfileSmartcardSelector; - QComboBox *ProfilePskSelector; - QComboBox *ProfileUserSelector; - QComboBox *ProfileOpenvpnSelector; - QComboBox *ProfileNetworkHttpProxySelector; - QComboBox *ProfilePptpSelector; - QComboBox *ProfileRacoonSelector; - QComboBox *ProfileIpsecSelector; - QComboBox *ProfileCiscoSelector; - QComboBox *ProfileVtunSelector; - QComboBox *ProfileSshSelector; - QComboBox *ProfileCmdExecBeforeConnectSelector; - QComboBox *ProfileCmdExecBeforeDisconnectSelector; - QComboBox *ProfileCmdExecAfterConnectSelector; - QComboBox *ProfileCmdExecAfterDisconnectSelector; + TQFrame* ProfileNetworkRouteOptionsFrame; + TQFrame* ConfigConnectOptionsFrame; + TQFrame* DaemonOptionsFrame; + TQFrame* DebugFrame; + TQFrame* LogFrame; + TQFrame* HelperProgramFrame; + TQFrame* ProfileGeneralOptionsFrame; + TQFrame* ProfileUserOptionsFrame; + TQFrame* ProfileCertOptionsFrame; + TQFrame* ProfileCiscoOptionsFrame; + TQFrame* ProfileNetworkHttpProxyOptionsFrame; + TQFrame* ProfileCmdExecAfterConnectOptionsFrame; + TQFrame* ProfileCmdExecBeforeDisconnectOptionsFrame; + TQFrame* ProfileCmdExecAfterDisconnectOptionsFrame; + TQFrame* ProfileCmdExecBeforeConnectOptionsFrame; + TQFrame* GeneralFrame; + TQFrame* ProfileSmartcardOptionsFrame; + TQFrame* ProfilePskOptionsFrame; + TQFrame* ProfileNetworkGeneralOptionsFrame; + TQFrame* ProfileNetworkNatOptionsFrame; + TQFrame* ProfileNetworkVirtualIpOptionsFrame; + TQFrame* ProfileRacoonOptionsFrame; + TQFrame* ProfileIpsecOptionsFrame; + TQFrame* ProfileOpenvpnOptionsFrame; + TQFrame* ProfilePptpOptionsFrame; + TQFrame* ProfileVtunOptionsFrame; + TQFrame* ProfileSshOptionsFrame; + + + TQComboBox *ProfileGeneralSelector; + TQComboBox *ProfileNetworkRouteSelector; + TQComboBox *ProfileNetworkGeneralSelector; + TQComboBox *ProfileNetworkNatSelector; + TQComboBox *ProfileNetworkVirtualIpSelector; + TQComboBox *ProfileCertSelector; + TQComboBox *ProfileSmartcardSelector; + TQComboBox *ProfilePskSelector; + TQComboBox *ProfileUserSelector; + TQComboBox *ProfileOpenvpnSelector; + TQComboBox *ProfileNetworkHttpProxySelector; + TQComboBox *ProfilePptpSelector; + TQComboBox *ProfileRacoonSelector; + TQComboBox *ProfileIpsecSelector; + TQComboBox *ProfileCiscoSelector; + TQComboBox *ProfileVtunSelector; + TQComboBox *ProfileSshSelector; + TQComboBox *ProfileCmdExecBeforeConnectSelector; + TQComboBox *ProfileCmdExecBeforeDisconnectSelector; + TQComboBox *ProfileCmdExecAfterConnectSelector; + TQComboBox *ProfileCmdExecAfterDisconnectSelector; bool profileAddedOrDeleted; bool profileHasChanged; bool showOnlyProfiles; - QString NewProfileName; + TQString NewProfileName; }; #endif diff --git a/src/profilecertoptions.cpp b/src/profilecertoptions.cpp index 3558144..f0db6de 100644 --- a/src/profilecertoptions.cpp +++ b/src/profilecertoptions.cpp @@ -19,17 +19,17 @@ ***************************************************************************/ #include "profilecertoptions.h" -#include -#include +#include +#include #include #include -#include +#include #include #include #include "widgetnotifyhelper.h" #include -ProfileCertOptions::ProfileCertOptions(QWidget *parent) +ProfileCertOptions::ProfileCertOptions(TQWidget *parent) : ProfileCertOptionsBase(parent) { WidgetNotifyHelper h; diff --git a/src/profilecertoptions.h b/src/profilecertoptions.h index 6aef6ba..9205069 100644 --- a/src/profilecertoptions.h +++ b/src/profilecertoptions.h @@ -21,7 +21,7 @@ #define PROFILECERTOPTIONS_H #include "profilecertoptionsbase.h" -#include +#include /** @author Christoph Thielecke @@ -29,8 +29,9 @@ class ProfileCertOptions : public ProfileCertOptionsBase { Q_OBJECT + TQ_OBJECT public: - ProfileCertOptions(QWidget *parent); + ProfileCertOptions(TQWidget *parent); ~ProfileCertOptions(); bool dialogModified; diff --git a/src/profilecertoptionsbase.ui b/src/profilecertoptionsbase.ui index 6fa704c..f022efd 100644 --- a/src/profilecertoptionsbase.ui +++ b/src/profilecertoptionsbase.ui @@ -1,6 +1,6 @@ ProfileCertOptionsBase - + ProfileCertOptionsBase @@ -27,39 +27,39 @@ unnamed - + - layout43 + tqlayout43 unnamed - + - layout42 + tqlayout42 unnamed - + - layout41 + tqlayout41 unnamed - + - layout65 + tqlayout65 unnamed - + UseMailAddressAsIdentifierCheckBox @@ -80,7 +80,7 @@ Expanding - + 80 21 @@ -89,9 +89,9 @@ - + - layout63 + tqlayout63 @@ -107,14 +107,14 @@ Expanding - + 21 20 - + AllowEmptyPrivateKeyPasswordCheckBox @@ -127,15 +127,15 @@ - + - layout38 + tqlayout38 unnamed - + LabelAuthType @@ -153,7 +153,7 @@ Expanding - + 330 20 @@ -178,15 +178,15 @@ Path to the private key file - + - layout9 + tqlayout9 unnamed - + LabelCertificatePath @@ -204,7 +204,7 @@ Expanding - + 115 20 @@ -213,9 +213,9 @@ - + - layout81 + tqlayout81 @@ -225,7 +225,7 @@ x509certURLRequester - + 50 0 @@ -242,15 +242,15 @@ - + - layout4 + tqlayout4 unnamed - + LabelPrivateKeyPassword @@ -268,7 +268,7 @@ Expanding - + 75 20 @@ -277,9 +277,9 @@ - + - layout41 + tqlayout41 @@ -295,7 +295,7 @@ Expanding - + 20 31 @@ -339,22 +339,22 @@ Expanding - + 267 21 - + - layout5 + tqlayout5 unnamed - + LabelPrivateKeyPath @@ -372,7 +372,7 @@ Expanding - + 109 20 @@ -381,9 +381,9 @@ - + - layout37 + tqlayout37 @@ -404,9 +404,9 @@ - + - layout63_2 + tqlayout63_2 @@ -422,14 +422,14 @@ Expanding - + 21 20 - + VerifyCaCertCheckBox @@ -445,15 +445,15 @@ - + - layout6_2 + tqlayout6_2 unnamed - + UseCiscoCertStoreCheckBox @@ -474,7 +474,7 @@ Expanding - + 16 20 @@ -483,7 +483,7 @@ - + PrivkeyPasswordEdit @@ -494,15 +494,15 @@ Passphrase to decrypt the private key - + - layout10 + tqlayout10 unnamed - + LabelCertificate @@ -520,7 +520,7 @@ Expanding - + 152 20 @@ -529,15 +529,15 @@ - + - layout8 + tqlayout8 unnamed - + LabelCaCertificatePath @@ -555,7 +555,7 @@ Expanding - + 93 20 @@ -564,15 +564,15 @@ - + - layout6 + tqlayout6 unnamed - + UseSpecialServerCertificateCheckBox @@ -593,7 +593,7 @@ Expanding - + 16 20 @@ -618,15 +618,15 @@ false - + - layout64 + tqlayout64 unnamed - + SavePrivateKeyPasswordCheckBox @@ -647,7 +647,7 @@ Expanding - + 100 20 @@ -668,7 +668,7 @@ Expanding - + 21 19 @@ -687,7 +687,7 @@ Expanding - + 16 20 @@ -720,10 +720,10 @@ AllowEmptyPrivateKeyPasswordCheckBox ImportCertificatePushButton - + useSpecialRemoteIDToggled(bool) useSpecialServerCertificateToggled(bool) - + kcombobox.h diff --git a/src/profileciscooptions.cpp b/src/profileciscooptions.cpp index fb4513a..99c31d3 100644 --- a/src/profileciscooptions.cpp +++ b/src/profileciscooptions.cpp @@ -22,7 +22,7 @@ #include "widgetnotifyhelper.h" #include -ProfileCiscoOptions::ProfileCiscoOptions(QWidget *parent) +ProfileCiscoOptions::ProfileCiscoOptions(TQWidget *parent) : ProfileCiscoOptionsBase(parent) { WidgetNotifyHelper h; diff --git a/src/profileciscooptions.h b/src/profileciscooptions.h index f68759f..5bc93c3 100644 --- a/src/profileciscooptions.h +++ b/src/profileciscooptions.h @@ -21,7 +21,7 @@ #define PROFILECISCOOPTIONS_H #include "profileciscooptionsbase.h" -#include +#include /** @author Christoph Thielecke @@ -29,8 +29,9 @@ class ProfileCiscoOptions : public ProfileCiscoOptionsBase { Q_OBJECT + TQ_OBJECT public: - ProfileCiscoOptions(QWidget *parent); + ProfileCiscoOptions(TQWidget *parent); ~ProfileCiscoOptions(); bool dialogModified; diff --git a/src/profileciscooptionsbase.ui b/src/profileciscooptionsbase.ui index 452bc20..485a185 100644 --- a/src/profileciscooptionsbase.ui +++ b/src/profileciscooptionsbase.ui @@ -1,6 +1,6 @@ ProfileCiscoOptionsBase - + ProfileCiscoOptionsBase @@ -19,31 +19,31 @@ unnamed - + - layout42 + tqlayout42 unnamed - + - layout41 + tqlayout41 unnamed - + - layout15 + tqlayout15 unnamed - + LabelID_2 @@ -64,7 +64,7 @@ Expanding - + 131 20 @@ -84,15 +84,15 @@ - + - layout36 + tqlayout36 unnamed - + ApplicationVersionCheckbox @@ -116,7 +116,7 @@ Expanding - + 121 21 @@ -125,15 +125,15 @@ - + - layout16 + tqlayout16 unnamed - + LocalPortCheckbox @@ -154,14 +154,14 @@ Expanding - + 81 21 - + LocalPortSpinbox @@ -180,15 +180,15 @@ - + - layout35_2 + tqlayout35_2 unnamed - + DisableDataEncryptionCheckbox @@ -215,7 +215,7 @@ Expanding - + 91 21 @@ -224,15 +224,15 @@ - + - layout26 + tqlayout26 unnamed - + CiscoNatModeLabel @@ -250,7 +250,7 @@ Expanding - + 87 20 @@ -284,15 +284,15 @@ - + - layout22 + tqlayout22 unnamed - + LabelID @@ -310,7 +310,7 @@ Expanding - + 50 20 @@ -327,15 +327,15 @@ - + - layout18 + tqlayout18 unnamed - + PerfectForwardSecurityCheckbox @@ -359,7 +359,7 @@ Expanding - + 16 20 @@ -394,15 +394,15 @@ dh18 = modp8192 (racoon only) - + - layout35 + tqlayout35 unnamed - + UseGlobalIpsecSecretCheckbox @@ -426,7 +426,7 @@ dh18 = modp8192 (racoon only) Expanding - + 91 21 @@ -449,15 +449,15 @@ dh18 = modp8192 (racoon only) Application version string - + - layout17 + tqlayout17 unnamed - + IkeGroupCheckbox @@ -481,7 +481,7 @@ dh18 = modp8192 (racoon only) Expanding - + 141 21 @@ -512,7 +512,7 @@ dh18 = modp8192 (only racoon) - + UseXauthInteractiveCheckBox @@ -526,15 +526,15 @@ dh18 = modp8192 (only racoon) - + - layout40 + tqlayout40 unnamed - + AllowEmptyGroupPasswordCheckBox @@ -558,7 +558,7 @@ dh18 = modp8192 (only racoon) Expanding - + 20 21 @@ -567,17 +567,17 @@ dh18 = modp8192 (only racoon) - + - layout118 + tqlayout118 unnamed - + - layout9 + tqlayout9 @@ -595,7 +595,7 @@ dh18 = modp8192 (only racoon) Expanding - + 439 21 @@ -604,15 +604,15 @@ dh18 = modp8192 (only racoon) - + - layout40 + tqlayout40 unnamed - + EnableDpdIdleTimeoutCheckbox @@ -639,14 +639,14 @@ dh18 = modp8192 (only racoon) Expanding - + 51 20 - + DpdIdleTimeoutSpinbox @@ -674,15 +674,15 @@ dh18 = modp8192 (only racoon) - + - layout39 + tqlayout39 unnamed - + SingleDesCheckbox @@ -706,7 +706,7 @@ dh18 = modp8192 (only racoon) Expanding - + 81 21 @@ -727,7 +727,7 @@ dh18 = modp8192 (only racoon) Expanding - + 20 37 diff --git a/src/profilecmdexecafterconnectoptions.cpp b/src/profilecmdexecafterconnectoptions.cpp index faa9ec8..f2c08ae 100644 --- a/src/profilecmdexecafterconnectoptions.cpp +++ b/src/profilecmdexecafterconnectoptions.cpp @@ -19,14 +19,14 @@ ***************************************************************************/ #include "profilecmdexecafterconnectoptions.h" -#include +#include #include #include -#include +#include #include "widgetnotifyhelper.h" #include -ProfileCmdExecAfterConnectOptions::ProfileCmdExecAfterConnectOptions(QWidget *parent) +ProfileCmdExecAfterConnectOptions::ProfileCmdExecAfterConnectOptions(TQWidget *parent) : ProfileCmdExecAfterConnectOptionsBase(parent) { WidgetNotifyHelper h; diff --git a/src/profilecmdexecafterconnectoptions.h b/src/profilecmdexecafterconnectoptions.h index ad47e45..012d2a2 100644 --- a/src/profilecmdexecafterconnectoptions.h +++ b/src/profilecmdexecafterconnectoptions.h @@ -21,7 +21,7 @@ #define PROFILECMDEXECAFTERCONNECTOPTIONS_H #include "profilecmdexecafterconnectoptionsbase.h" -#include +#include /** @author Christoph Thielecke @@ -29,8 +29,9 @@ class ProfileCmdExecAfterConnectOptions : public ProfileCmdExecAfterConnectOptionsBase { Q_OBJECT + TQ_OBJECT public: - ProfileCmdExecAfterConnectOptions(QWidget *parent); + ProfileCmdExecAfterConnectOptions(TQWidget *parent); ~ProfileCmdExecAfterConnectOptions(); bool dialogModified; diff --git a/src/profilecmdexecafterconnectoptionsbase.ui b/src/profilecmdexecafterconnectoptionsbase.ui index 2dd45ea..ab5f343 100644 --- a/src/profilecmdexecafterconnectoptionsbase.ui +++ b/src/profilecmdexecafterconnectoptionsbase.ui @@ -1,6 +1,6 @@ ProfileCmdExecAfterConnectOptionsBase - + ProfileCmdExecAfterConnectOptionsBase @@ -27,15 +27,15 @@ unnamed - + - layout2 + tqlayout2 unnamed - + ExcuteCmdAfterConnectCheckBox @@ -59,7 +59,7 @@ false - + 0 300 @@ -75,15 +75,15 @@ Command to execute after sucessful connect. <br>Normal shell commands are accepted. - + - layout1 + tqlayout1 unnamed - + CommandAfterConnectDelayTimeNumInputLabel @@ -101,7 +101,7 @@ Expanding - + 111 20 @@ -140,9 +140,9 @@ ExcuteCmdAfterConnectCheckBox CmdAfterConnectTextEdit - + execCmdAfterConnectToggled(bool) - + ktextedit.h diff --git a/src/profilecmdexecafterdisconnectoptions.cpp b/src/profilecmdexecafterdisconnectoptions.cpp index eed4bf6..97b0afe 100644 --- a/src/profilecmdexecafterdisconnectoptions.cpp +++ b/src/profilecmdexecafterdisconnectoptions.cpp @@ -19,14 +19,14 @@ ***************************************************************************/ #include "profilecmdexecafterdisconnectoptions.h" -#include +#include #include #include "widgetnotifyhelper.h" #include -ProfileCmdExecAfterDisconnectOptions::ProfileCmdExecAfterDisconnectOptions(QWidget *parent) +ProfileCmdExecAfterDisconnectOptions::ProfileCmdExecAfterDisconnectOptions(TQWidget *parent) : ProfileCmdExecAfterDisconnectOptionsBase(parent) { WidgetNotifyHelper h; diff --git a/src/profilecmdexecafterdisconnectoptions.h b/src/profilecmdexecafterdisconnectoptions.h index 4ed3d16..5d7f0df 100644 --- a/src/profilecmdexecafterdisconnectoptions.h +++ b/src/profilecmdexecafterdisconnectoptions.h @@ -21,7 +21,7 @@ #define PROFILECMDEXECAFTERDISCONNECTOPTIONS_H #include "profilecmdexecafterdisconnectoptionsbase.h" -#include +#include /** @author Christoph Thielecke @@ -29,8 +29,9 @@ class ProfileCmdExecAfterDisconnectOptions : public ProfileCmdExecAfterDisconnectOptionsBase { Q_OBJECT + TQ_OBJECT public: - ProfileCmdExecAfterDisconnectOptions(QWidget *parent); + ProfileCmdExecAfterDisconnectOptions(TQWidget *parent); ~ProfileCmdExecAfterDisconnectOptions(); bool dialogModified; diff --git a/src/profilecmdexecafterdisconnectoptionsbase.ui b/src/profilecmdexecafterdisconnectoptionsbase.ui index 7f859a4..0091871 100644 --- a/src/profilecmdexecafterdisconnectoptionsbase.ui +++ b/src/profilecmdexecafterdisconnectoptionsbase.ui @@ -1,6 +1,6 @@ ProfileCmdExecAfterDisconnectOptionsBase - + ProfileCmdExecAfterDisconnectOptionsBase @@ -27,7 +27,7 @@ unnamed - + ExcuteCmdAfterDisconnectCheckBox @@ -51,7 +51,7 @@ false - + 0 300 @@ -81,9 +81,9 @@ ExcuteCmdAfterDisconnectCheckBox CmdAfterDisconnectTextEdit - + execCmdAfterDisconnectToggled(bool) - + ktextedit.h diff --git a/src/profilecmdexecbeforeconnectoptions.cpp b/src/profilecmdexecbeforeconnectoptions.cpp index 44a7da7..aaf4277 100644 --- a/src/profilecmdexecbeforeconnectoptions.cpp +++ b/src/profilecmdexecbeforeconnectoptions.cpp @@ -19,12 +19,12 @@ ***************************************************************************/ #include "profilecmdexecbeforeconnectoptions.h" -#include +#include #include #include "widgetnotifyhelper.h" #include -ProfileCmdExecBeforeConnectOptions::ProfileCmdExecBeforeConnectOptions(QWidget *parent) +ProfileCmdExecBeforeConnectOptions::ProfileCmdExecBeforeConnectOptions(TQWidget *parent) : ProfileCmdExecBeforeConnectOptionsBase(parent) { WidgetNotifyHelper h; diff --git a/src/profilecmdexecbeforeconnectoptions.h b/src/profilecmdexecbeforeconnectoptions.h index 5515322..5d17245 100644 --- a/src/profilecmdexecbeforeconnectoptions.h +++ b/src/profilecmdexecbeforeconnectoptions.h @@ -21,7 +21,7 @@ #define PROFILECMDEXECBEFORECONNECTOPTIONS_H #include "profilecmdexecbeforeconnectoptionsbase.h" -#include +#include /** @author Christoph Thielecke @@ -29,8 +29,9 @@ class ProfileCmdExecBeforeConnectOptions : public ProfileCmdExecBeforeConnectOptionsBase { Q_OBJECT + TQ_OBJECT public: - ProfileCmdExecBeforeConnectOptions(QWidget *parent); + ProfileCmdExecBeforeConnectOptions(TQWidget *parent); ~ProfileCmdExecBeforeConnectOptions(); bool dialogModified; diff --git a/src/profilecmdexecbeforeconnectoptionsbase.ui b/src/profilecmdexecbeforeconnectoptionsbase.ui index f244c7c..c959b53 100644 --- a/src/profilecmdexecbeforeconnectoptionsbase.ui +++ b/src/profilecmdexecbeforeconnectoptionsbase.ui @@ -1,6 +1,6 @@ ProfileCmdExecBeforeConnectOptionsBase - + ProfileCmdExecBeforeConnectOptionsBase @@ -27,7 +27,7 @@ unnamed - + ExcuteCmdBeforeConnectCheckBox @@ -51,7 +51,7 @@ false - + 0 300 @@ -81,9 +81,9 @@ ExcuteCmdBeforeConnectCheckBox CmdBeforeConnectTextEdit - + execCmdBeforeConnectToggled(bool) - + ktextedit.h diff --git a/src/profilecmdexecbeforedisconnectoptions.cpp b/src/profilecmdexecbeforedisconnectoptions.cpp index b97847a..5123b50 100644 --- a/src/profilecmdexecbeforedisconnectoptions.cpp +++ b/src/profilecmdexecbeforedisconnectoptions.cpp @@ -19,12 +19,12 @@ ***************************************************************************/ #include "profilecmdexecbeforedisconnectoptions.h" -#include +#include #include #include "widgetnotifyhelper.h" #include -ProfileCmdExecBeforeDisconnectOptions::ProfileCmdExecBeforeDisconnectOptions(QWidget *parent) +ProfileCmdExecBeforeDisconnectOptions::ProfileCmdExecBeforeDisconnectOptions(TQWidget *parent) : ProfileCmdExecBeforeDisconnectOptionsBase(parent) { WidgetNotifyHelper h; diff --git a/src/profilecmdexecbeforedisconnectoptions.h b/src/profilecmdexecbeforedisconnectoptions.h index 1dcfe49..9fbb0ba 100644 --- a/src/profilecmdexecbeforedisconnectoptions.h +++ b/src/profilecmdexecbeforedisconnectoptions.h @@ -21,7 +21,7 @@ #define PROFILECMDEXECBEFOREDISCONNECTOPTIONS_H #include "profilecmdexecbeforedisconnectoptionsbase.h" -#include +#include /** @author Christoph Thielecke @@ -29,8 +29,9 @@ class ProfileCmdExecBeforeDisconnectOptions : public ProfileCmdExecBeforeDisconnectOptionsBase { Q_OBJECT + TQ_OBJECT public: - ProfileCmdExecBeforeDisconnectOptions(QWidget *parent); + ProfileCmdExecBeforeDisconnectOptions(TQWidget *parent); ~ProfileCmdExecBeforeDisconnectOptions(); bool dialogModified; diff --git a/src/profilecmdexecbeforedisconnectoptionsbase.ui b/src/profilecmdexecbeforedisconnectoptionsbase.ui index cf5813b..84aa977 100644 --- a/src/profilecmdexecbeforedisconnectoptionsbase.ui +++ b/src/profilecmdexecbeforedisconnectoptionsbase.ui @@ -1,6 +1,6 @@ ProfileCmdExecBeforeDisconnectOptionsBase - + ProfileCmdExecBeforeDisconnectOptionsBase @@ -27,7 +27,7 @@ unnamed - + ExcuteCmdBeforeDisconnectCheckBox @@ -51,7 +51,7 @@ false - + 0 300 @@ -81,9 +81,9 @@ ExcuteCmdBeforeDisconnectCheckBox CmdBeforeDisconnectTextEdit - + execCmdBeforeDisconnectToggled(bool) - + ktextedit.h diff --git a/src/profilegeneraloptions.cpp b/src/profilegeneraloptions.cpp index be04000..f535af3 100644 --- a/src/profilegeneraloptions.cpp +++ b/src/profilegeneraloptions.cpp @@ -19,8 +19,8 @@ ***************************************************************************/ #include "profilegeneraloptions.h" #include -#include -#include +#include +#include #include #include #include @@ -28,7 +28,7 @@ #include "widgetnotifyhelper.h" #include -ProfileGeneralOptions::ProfileGeneralOptions(QWidget *parent, KVpncConfig *GlobalConfig) : ProfileGeneralOptionsBase(parent) +ProfileGeneralOptions::ProfileGeneralOptions(TQWidget *parent, KVpncConfig *GlobalConfig) : ProfileGeneralOptionsBase(parent) { this->GlobalConfig = GlobalConfig; WidgetNotifyHelper h; diff --git a/src/profilegeneraloptions.h b/src/profilegeneraloptions.h index d830998..7589aed 100644 --- a/src/profilegeneraloptions.h +++ b/src/profilegeneraloptions.h @@ -21,7 +21,7 @@ #define PROFILEGENERALOPTIONS_H #include "profilegeneraloptionsbase.h" -#include +#include #include "kvpncconfig.h" /** @@ -30,8 +30,9 @@ class ProfileGeneralOptions : public ProfileGeneralOptionsBase { Q_OBJECT + TQ_OBJECT public: - ProfileGeneralOptions(QWidget *parent, KVpncConfig *GlobalConfig); + ProfileGeneralOptions(TQWidget *parent, KVpncConfig *GlobalConfig); ~ProfileGeneralOptions(); bool dialogModified; diff --git a/src/profilegeneraloptionsbase.ui b/src/profilegeneraloptionsbase.ui index 713e82c..59bc6b0 100644 --- a/src/profilegeneraloptionsbase.ui +++ b/src/profilegeneraloptionsbase.ui @@ -1,6 +1,6 @@ ProfileGeneralOptionsBase - + ProfileGeneralOptionsBase @@ -19,23 +19,23 @@ unnamed - + - layout49 + tqlayout49 unnamed - + - layout48 + tqlayout48 unnamed - + LabelGateway_2 @@ -43,7 +43,7 @@ Description: - + LabelGateway @@ -51,7 +51,7 @@ VPN gateway: - + LabelCommectionType @@ -98,16 +98,16 @@ Expanding - + 20 70 - + - layout11 + tqlayout11 @@ -123,7 +123,7 @@ Expanding - + 92 20 @@ -201,9 +201,9 @@ DeleteSessionPushButton NewSessionPushButton - + advancedSettingsClicked() - + klineedit.h diff --git a/src/profileipsecoptions.cpp b/src/profileipsecoptions.cpp index 8eb3c82..847cc0a 100644 --- a/src/profileipsecoptions.cpp +++ b/src/profileipsecoptions.cpp @@ -23,14 +23,14 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "widgetnotifyhelper.h" #include -ProfileIpsecOptions::ProfileIpsecOptions(QWidget *parent) : ProfileIpsecOptionsBase(parent) +ProfileIpsecOptions::ProfileIpsecOptions(TQWidget *parent) : ProfileIpsecOptionsBase(parent) { } @@ -79,7 +79,7 @@ void ProfileIpsecOptions::useEspToogled(bool) EspGroupBox->setEnabled(false); } -void ProfileIpsecOptions::localIDTypeToggled(const QString& text) +void ProfileIpsecOptions::localIDTypeToggled(const TQString& text) { if (text == "asn1dn" || text == i18n("Certificate ID")) { @@ -93,7 +93,7 @@ void ProfileIpsecOptions::localIDTypeToggled(const QString& text) } } -void ProfileIpsecOptions::remoteIDTypeToggled(const QString& text) +void ProfileIpsecOptions::remoteIDTypeToggled(const TQString& text) { if (text == "asn1dn" || text == "none") { @@ -111,14 +111,14 @@ void ProfileIpsecOptions::remoteIDTypeToggled(const QString& text) void ProfileIpsecOptions::ikeHelpClicked(int,int) { - QWhatsThis::display ( i18n("

IPSec IKE algorithms

You have to specify the IKE values in the following format:\n<encryption algorithm>-<authentication algorithm>\nor\n<encryption algorithm>-<authentication algorithm>-<diffie helman group>

"), QCursor::pos ( ), (QWidget *)IkeHelpActiveLabel); + TQWhatsThis::display ( i18n("

IPSec IKE algorithms

You have to specify the IKE values in the following format:\n<encryption algorithm>-<authentication algorithm>\nor\n<encryption algorithm>-<authentication algorithm>-<diffie helman group>

"), TQCursor::pos ( ), (TQWidget *)IkeHelpActiveLabel); } void ProfileIpsecOptions::espHelpClicked(int,int) { - QWhatsThis::display ( i18n("

IPSec ESP algorithms

You have to specify the ESP values in the following format:\n<encryption algorithm>-<authentication algorithm>\nor\n<encryption algorithm>-<authentication algorithm>

"), QCursor::pos ( ), (QWidget *)EspHelpActiveLabel); + TQWhatsThis::display ( i18n("

IPSec ESP algorithms

You have to specify the ESP values in the following format:\n<encryption algorithm>-<authentication algorithm>\nor\n<encryption algorithm>-<authentication algorithm>

"), TQCursor::pos ( ), (TQWidget *)EspHelpActiveLabel); } diff --git a/src/profileipsecoptions.h b/src/profileipsecoptions.h index fc8e9ef..9523eb1 100644 --- a/src/profileipsecoptions.h +++ b/src/profileipsecoptions.h @@ -27,14 +27,15 @@ #include "profileipsecoptionsbase.h" #include "kvpncconfig.h" -#include +#include class ProfileIpsecOptions : public ProfileIpsecOptionsBase { Q_OBJECT + TQ_OBJECT public: - ProfileIpsecOptions(QWidget *parent); + ProfileIpsecOptions(TQWidget *parent); ~ProfileIpsecOptions(); bool dialogModified; @@ -43,8 +44,8 @@ public slots: void useLeftNextHopToggled(bool); void useEspToogled(bool); void useIkeToggled(bool); - void localIDTypeToggled(const QString& text); - void remoteIDTypeToggled(const QString&); + void localIDTypeToggled(const TQString& text); + void remoteIDTypeToggled(const TQString&); void ikeHelpClicked(int,int); void espHelpClicked(int,int); void usePfsToogled(bool); diff --git a/src/profileipsecoptionsbase.ui b/src/profileipsecoptionsbase.ui index 118153a..9ecf3ce 100644 --- a/src/profileipsecoptionsbase.ui +++ b/src/profileipsecoptionsbase.ui @@ -1,6 +1,6 @@ ProfileIpsecOptionsBase - + ProfileIpsecOptionsBase @@ -19,11 +19,11 @@ unnamed - + tabWidget2 - + GeneralTab @@ -34,23 +34,23 @@ unnamed - + - layout33 + tqlayout33 unnamed - + - layout136 + tqlayout136 unnamed - + HashAlgoTextLabel_2 @@ -68,7 +68,7 @@ Expanding - + 199 21 @@ -77,7 +77,7 @@ - + ExchangeModeComboBox @@ -87,23 +87,23 @@ - + - layout137 + tqlayout137 unnamed - + - layout150 + tqlayout150 unnamed - + IPsecVpnModeTextLabel @@ -121,7 +121,7 @@ Expanding - + 28 20 @@ -161,15 +161,15 @@ - + - layout43 + tqlayout43 unnamed - + PerfectForwardSecurityCheckbox @@ -193,7 +193,7 @@ Expanding - + 160 21 @@ -228,15 +228,15 @@ dh18 = modp8192 (racoon only) - + - layout20 + tqlayout20 unnamed - + UseModeConfigCheckBox @@ -257,7 +257,7 @@ dh18 = modp8192 (racoon only) Expanding - + 16 20 @@ -266,9 +266,9 @@ dh18 = modp8192 (racoon only) - + - layout22 + tqlayout22 @@ -282,7 +282,7 @@ dh18 = modp8192 (racoon only) false - + UseLeftNextHopCheckBox @@ -293,7 +293,7 @@ dh18 = modp8192 (racoon only) Alt+L - + UseRightNextHopCheckBox @@ -317,15 +317,15 @@ dh18 = modp8192 (racoon only) - + - layout90 + tqlayout90 unnamed - + DisableOpportunisticEncryptionCheckBox @@ -346,7 +346,7 @@ dh18 = modp8192 (racoon only) Expanding - + 100 20 @@ -355,15 +355,15 @@ dh18 = modp8192 (racoon only) - + - layout90_2 + tqlayout90_2 unnamed - + UseXauthCheckBox @@ -387,7 +387,7 @@ dh18 = modp8192 (racoon only) Expanding - + 100 20 @@ -406,7 +406,7 @@ dh18 = modp8192 (racoon only) Expanding - + 20 82 @@ -415,7 +415,7 @@ dh18 = modp8192 (racoon only) - + IkeespTab @@ -426,39 +426,39 @@ dh18 = modp8192 (racoon only) unnamed - + - layout25 + tqlayout25 unnamed - + - layout49 + tqlayout49 unnamed - + - layout48 + tqlayout48 unnamed - + - layout37 + tqlayout37 unnamed - + UseCustomIkeCheckBox @@ -476,7 +476,7 @@ dh18 = modp8192 (racoon only) Expanding - + 16 20 @@ -496,7 +496,7 @@ dh18 = modp8192 (racoon only) - + IkeGroupBox @@ -510,7 +510,7 @@ dh18 = modp8192 (racoon only) unnamed - + IkeAes256Sha1CheckBox @@ -521,7 +521,7 @@ dh18 = modp8192 (racoon only) Alt+2 - + IkeAes128Sha1CheckBox @@ -532,7 +532,7 @@ dh18 = modp8192 (racoon only) Alt+1 - + IkeDesSha1Modp2048CheckBox @@ -543,7 +543,7 @@ dh18 = modp8192 (racoon only) Alt+0 - + IkeDesSha1CheckBox @@ -554,7 +554,7 @@ dh18 = modp8192 (racoon only) - + IkeDesMd5CheckBox @@ -565,15 +565,15 @@ dh18 = modp8192 (racoon only) Alt+3 - + - layout52 + tqlayout52 unnamed - + textLabel1 @@ -592,23 +592,23 @@ dh18 = modp8192 (racoon only) - + - layout47 + tqlayout47 unnamed - + - layout41 + tqlayout41 unnamed - + UseCustomEspCheckBox @@ -629,7 +629,7 @@ dh18 = modp8192 (racoon only) Expanding - + 61 21 @@ -655,15 +655,15 @@ dh18 = modp8192 (racoon only) - + - layout46 + tqlayout46 unnamed - + EspGroupBox @@ -677,7 +677,7 @@ dh18 = modp8192 (racoon only) unnamed - + EspAes128Sha1CheckBox @@ -688,7 +688,7 @@ dh18 = modp8192 (racoon only) Alt+8 - + EspDesSha1CheckBox @@ -699,7 +699,7 @@ dh18 = modp8192 (racoon only) - + Esp3desMd5CheckBox @@ -707,15 +707,15 @@ dh18 = modp8192 (racoon only) 3des-md5 - + - layout53 + tqlayout53 unnamed - + textLabel2 @@ -730,7 +730,7 @@ dh18 = modp8192 (racoon only) - + EspAes256Sha1CheckBox @@ -753,7 +753,7 @@ dh18 = modp8192 (racoon only) Expanding - + 20 21 @@ -776,7 +776,7 @@ dh18 = modp8192 (racoon only) Expanding - + 20 71 @@ -787,7 +787,7 @@ dh18 = modp8192 (racoon only) - + IdTab @@ -798,15 +798,15 @@ dh18 = modp8192 (racoon only) unnamed - + - layout26 + tqlayout26 unnamed - + LocalIdentifierGroupBox @@ -817,15 +817,15 @@ dh18 = modp8192 (racoon only) unnamed - + - layout97 + tqlayout97 unnamed - + LocalIDLabel @@ -843,7 +843,7 @@ dh18 = modp8192 (racoon only) Expanding - + 170 20 @@ -866,15 +866,15 @@ dh18 = modp8192 (racoon only) Value for the local ID, hint: if type address, you can enter a hostname here which will be resolved at connect - + - layout29 + tqlayout29 unnamed - + HashAlgoTextLabel_2_2 @@ -892,7 +892,7 @@ dh18 = modp8192 (racoon only) Expanding - + 137 20 @@ -932,7 +932,7 @@ dh18 = modp8192 (racoon only) - + RemoteIdentifierGroupBox @@ -943,23 +943,23 @@ dh18 = modp8192 (racoon only) unnamed - + - layout74_2 + tqlayout74_2 unnamed - + - layout73_2 + tqlayout73_2 unnamed - + HashAlgoTextLabel_2_2_2 @@ -977,7 +977,7 @@ dh18 = modp8192 (racoon only) Expanding - + 51 20 @@ -1000,15 +1000,15 @@ dh18 = modp8192 (racoon only) Value for the remote ID, hint: if type address, you can enter a hostname here which will be resolved at connect - + - layout72_2 + tqlayout72_2 unnamed - + RemoteIDLabel @@ -1026,7 +1026,7 @@ dh18 = modp8192 (racoon only) Expanding - + 51 20 @@ -1078,7 +1078,7 @@ dh18 = modp8192 (racoon only) Expanding - + 20 31 @@ -1148,7 +1148,7 @@ dh18 = modp8192 (racoon only) usePfsToogled(bool) - + useLeftNextHopToggled(bool) useRightNextHopToggled(bool) localIDTypeToggled(const QString&) @@ -1160,7 +1160,7 @@ dh18 = modp8192 (racoon only) espHelpClicked(int,int) remoteIDTypeToggled(const QString&) usePfsToogled(bool) - + kcombobox.h diff --git a/src/profilemanagerbase.cpp b/src/profilemanagerbase.cpp index bb769c1..1fdbf6c 100644 --- a/src/profilemanagerbase.cpp +++ b/src/profilemanagerbase.cpp @@ -11,25 +11,25 @@ #include "profilemanagerbase.h" -#include -#include -#include -#include +#include +#include +#include +#include /* * Constructs a ProfileManagerDialogBase as a child of 'parent', with the * name 'name' and widget flags set to 'f'. */ -ProfileManagerDialogBase::ProfileManagerDialogBase( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) +ProfileManagerDialogBase::ProfileManagerDialogBase( TQWidget* parent, const char* name, WFlags fl ) + : TQWidget( parent, name, fl ) { if ( !name ) setName( "ProfileManagerDialogBase" ); - setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)3, 0, 0, sizePolicy().hasHeightForWidth() ) ); - setMinimumSize( QSize( 550, 450 ) ); - ProfileManagerDialogBaseLayout = new QGridLayout( this, 1, 1, 11, 6, "ProfileManagerDialogBaseLayout"); + tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)3, 0, 0, sizePolicy().hasHeightForWidth() ) ); + setMinimumSize( TQSize( 550, 450 ) ); + ProfileManagerDialogBaseLayout = new TQGridLayout( this, 1, 1, 11, 6, "ProfileManagerDialogBaseLayout"); languageChange(); - resize( QSize(622, 622).expandedTo(minimumSizeHint()) ); + resize( TQSize(622, 622).expandedTo(tqminimumSizeHint()) ); clearWState( WState_Polished ); } @@ -38,7 +38,7 @@ ProfileManagerDialogBase::ProfileManagerDialogBase( QWidget* parent, const char* */ ProfileManagerDialogBase::~ProfileManagerDialogBase() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* diff --git a/src/profilenetworkgeneraloptions.cpp b/src/profilenetworkgeneraloptions.cpp index e875021..1a3a84e 100644 --- a/src/profilenetworkgeneraloptions.cpp +++ b/src/profilenetworkgeneraloptions.cpp @@ -19,17 +19,17 @@ ***************************************************************************/ #include "profilenetworkgeneraloptions.h" -#include -#include -#include +#include +#include +#include #include #include -#include +#include #include "widgetnotifyhelper.h" #include -ProfileNetworkGeneralOptions::ProfileNetworkGeneralOptions(QWidget *parent) : ProfileNetworkGeneralOptionsBase(parent) +ProfileNetworkGeneralOptions::ProfileNetworkGeneralOptions(TQWidget *parent) : ProfileNetworkGeneralOptionsBase(parent) { useConnectionStatusCheckToggled(UseConnectionStatusCheckCheckBox->isChecked()); WidgetNotifyHelper h; diff --git a/src/profilenetworkgeneraloptions.h b/src/profilenetworkgeneraloptions.h index e6e2ceb..f649ffa 100644 --- a/src/profilenetworkgeneraloptions.h +++ b/src/profilenetworkgeneraloptions.h @@ -21,7 +21,7 @@ #define PROFILENETWORKGENERALOPTIONS_H #include "profilenetworkgeneraloptionsbase.h" -#include +#include /** @author Christoph Thielecke @@ -29,8 +29,9 @@ class ProfileNetworkGeneralOptions : public ProfileNetworkGeneralOptionsBase { Q_OBJECT + TQ_OBJECT public: - ProfileNetworkGeneralOptions(QWidget *parent); + ProfileNetworkGeneralOptions(TQWidget *parent); ~ProfileNetworkGeneralOptions(); bool dialogModified; diff --git a/src/profilenetworkgeneraloptionsbase.ui b/src/profilenetworkgeneraloptionsbase.ui index c965f65..931a9e0 100644 --- a/src/profilenetworkgeneraloptionsbase.ui +++ b/src/profilenetworkgeneraloptionsbase.ui @@ -1,6 +1,6 @@ ProfileNetworkGeneralOptionsBase - + ProfileNetworkGeneralOptionsBase @@ -19,23 +19,23 @@ unnamed - + - layout60 + tqlayout60 unnamed - + - layout58 + tqlayout58 unnamed - + MtuCheckbox @@ -52,7 +52,7 @@ If you enable this you can set a own MTU size. - + MtuSpinbox @@ -85,14 +85,14 @@ Expanding - + 71 20 - + MruCheckbox @@ -109,7 +109,7 @@ If you enable this you can set a own MRU size. - + MruSpinbox @@ -134,23 +134,23 @@ - + - layout59 + tqlayout59 unnamed - + - layout56 + tqlayout56 unnamed - + UseRemoteNetworkCheckBox @@ -171,7 +171,7 @@ Expanding - + 41 21 @@ -180,15 +180,15 @@ - + - layout58 + tqlayout58 unnamed - + LabelNetworkDevice @@ -199,9 +199,9 @@ Network device - + - layout44 + tqlayout44 @@ -217,7 +217,7 @@ Expanding - + 227 20 @@ -252,14 +252,14 @@ Expanding - + 208 20 - + FixPathMtuDiscoveryProblemCheckBox @@ -277,15 +277,15 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refusing to forward ICMP fragmentation needed responses. - + - layout55 + tqlayout55 unnamed - + UseDnsUpdateCheckBox @@ -318,7 +318,7 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refu Expanding - + 71 21 @@ -327,15 +327,15 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refu - + - layout57 + tqlayout57 unnamed - + TunnelDeviceTypeLabel @@ -346,9 +346,9 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refu Tunnel device type: - + - layout22 + tqlayout22 @@ -364,7 +364,7 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refu Expanding - + 181 21 @@ -385,15 +385,15 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refu - + - layout58 + tqlayout58 unnamed - + UseRemoteNetworkGroupBox @@ -407,7 +407,7 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refu unnamed - + LabelRemoteNetwork @@ -418,9 +418,9 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refu Remote network: - + - layout77 + tqlayout77 @@ -437,7 +437,7 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refu This is the remote network where the connection should going to. Use this at a PPTP connection for set another network than the retrieved IP is located. - + RemoteNetDividetextLabel @@ -582,12 +582,12 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refu - + ConnectionStatusGroupBox - Connection Status Check + Connection tqStatus Check Options for connection status check @@ -599,15 +599,15 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refu unnamed - + - layout57 + tqlayout57 unnamed - + UseConnectionStatusCheckCheckBox @@ -640,7 +640,7 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refu Expanding - + 201 20 @@ -649,7 +649,7 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refu - + DoReconnectAfterConnectionLostCheckBox @@ -672,23 +672,23 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refu - + - layout118 + tqlayout118 unnamed - + - layout119 + tqlayout119 unnamed - + PingIntervalLabel @@ -709,7 +709,7 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refu Expanding - + 181 20 @@ -731,23 +731,23 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refu - + - layout117 + tqlayout117 unnamed - + - layout120 + tqlayout120 unnamed - + PingSuccessCountLabel @@ -768,7 +768,7 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refu Expanding - + 181 20 @@ -793,15 +793,15 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refu - + - layout4 + tqlayout4 unnamed - + PingCheckBox @@ -847,30 +847,30 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refu Expanding - + 181 21 - + - layout121 + tqlayout121 unnamed - + - layout121 + tqlayout121 unnamed - + UseReconnectDelayCheckBox @@ -903,7 +903,7 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refu Expanding - + 64 21 @@ -948,7 +948,7 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refu Expanding - + 20 16 @@ -1003,7 +1003,7 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refu useNetworkToggled(bool) - + mtuToggled(bool) mruToggled(bool) useConnectionStatusCheckToggled(bool) @@ -1012,7 +1012,7 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refu useReconnectDelayToggled(bool) UseDnsUpdateToggled(bool) useNetworkToggled(bool) - + kcombobox.h diff --git a/src/profilenetworkhttpproxyoptions.cpp b/src/profilenetworkhttpproxyoptions.cpp index ec8c331..664f631 100644 --- a/src/profilenetworkhttpproxyoptions.cpp +++ b/src/profilenetworkhttpproxyoptions.cpp @@ -18,18 +18,18 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ #include "profilenetworkhttpproxyoptions.h" -#include -#include +#include +#include #include #include -#include +#include #include #include #include "widgetnotifyhelper.h" #include -ProfileNetworkHttpProxyOptions::ProfileNetworkHttpProxyOptions(QWidget *parent) +ProfileNetworkHttpProxyOptions::ProfileNetworkHttpProxyOptions(TQWidget *parent) : ProfileNetworkHttpProxyOptionsBase(parent) { WidgetNotifyHelper h; diff --git a/src/profilenetworkhttpproxyoptions.h b/src/profilenetworkhttpproxyoptions.h index d7e8cf6..f1ec97f 100644 --- a/src/profilenetworkhttpproxyoptions.h +++ b/src/profilenetworkhttpproxyoptions.h @@ -21,7 +21,7 @@ #define PROFILENETWORKHTTPPROXYOPTIONS_H #include "profilenetworkhttpproxyoptionsbase.h" -#include +#include /** @author Christoph Thielecke @@ -29,8 +29,9 @@ class ProfileNetworkHttpProxyOptions : public ProfileNetworkHttpProxyOptionsBase { Q_OBJECT + TQ_OBJECT public: - ProfileNetworkHttpProxyOptions(QWidget *parent); + ProfileNetworkHttpProxyOptions(TQWidget *parent); ~ProfileNetworkHttpProxyOptions(); bool dialogModified; diff --git a/src/profilenetworkhttpproxyoptionsbase.ui b/src/profilenetworkhttpproxyoptionsbase.ui index a4892be..38d71da 100644 --- a/src/profilenetworkhttpproxyoptionsbase.ui +++ b/src/profilenetworkhttpproxyoptionsbase.ui @@ -1,6 +1,6 @@ ProfileNetworkHttpProxyOptionsBase - + ProfileNetworkHttpProxyOptionsBase @@ -19,23 +19,23 @@ unnamed - + - layout65 + tqlayout65 unnamed - + - layout64 + tqlayout64 unnamed - + UseHttpProxyCheckBox @@ -49,15 +49,15 @@ Connect via HTTP proxy - + - layout8 + tqlayout8 unnamed - + HttpProxyGroupBox @@ -71,7 +71,7 @@ unnamed - + PortTextextLabel @@ -85,7 +85,7 @@ Proxy server port number - + HostTextLabel @@ -99,7 +99,7 @@ Name or IP address of the proxy server - + HttpProxyPassTextLabel @@ -113,7 +113,7 @@ Name or IP address of the proxy server - + HttpProxyAuthTextLabel @@ -127,7 +127,7 @@ Name or IP address of the proxy server - + TimeoutTextLabel @@ -151,16 +151,16 @@ Expanding - + 41 21 - + - layout14 + tqlayout14 @@ -176,7 +176,7 @@ Expanding - + 91 21 @@ -203,16 +203,16 @@ Expanding - + 150 20 - + - layout13 + tqlayout13 @@ -228,7 +228,7 @@ Expanding - + 103 21 @@ -251,7 +251,7 @@ - + HttpProxyUserTextLabel @@ -265,7 +265,7 @@ Name or IP address of the proxy server - + HttpProxyUserLineEdit @@ -276,9 +276,9 @@ Name or IP address of the proxy server - + - layout9 + tqlayout9 @@ -294,7 +294,7 @@ Expanding - + 119 21 @@ -323,7 +323,7 @@ - + UseHttpProxyAuthCheckBox @@ -340,7 +340,7 @@ Connect via HTTP proxy - + HttpProxyLineEdit @@ -351,7 +351,7 @@ Name or IP address of the proxy server - + HttpProxyAuthPasswordEdit @@ -374,7 +374,7 @@ Expanding - + 41 110 @@ -395,7 +395,7 @@ Expanding - + 16 20 @@ -425,10 +425,10 @@ HttpProxyPortIntNumInput HttpProxyTimeoutIntSpinBox - + useHttpProxyToggeled(bool) useHttpProxyAuthToggeled(bool) - + kcombobox.h diff --git a/src/profilenetworknatoptions.cpp b/src/profilenetworknatoptions.cpp index 53f4687..da6015d 100644 --- a/src/profilenetworknatoptions.cpp +++ b/src/profilenetworknatoptions.cpp @@ -19,12 +19,12 @@ ***************************************************************************/ #include "profilenetworknatoptions.h" -#include -#include +#include +#include #include "widgetnotifyhelper.h" #include -ProfileNetworkNatOptions::ProfileNetworkNatOptions(QWidget *parent) +ProfileNetworkNatOptions::ProfileNetworkNatOptions(TQWidget *parent) : ProfileNetworkNatOptionsBase(parent) { WidgetNotifyHelper h; diff --git a/src/profilenetworknatoptions.h b/src/profilenetworknatoptions.h index 95d86c4..6da153e 100644 --- a/src/profilenetworknatoptions.h +++ b/src/profilenetworknatoptions.h @@ -21,7 +21,7 @@ #define PROFILENETWORKNATOPTIONS_H #include "profilenetworknatoptionsbase.h" -#include +#include /** @author Christoph Thielecke @@ -29,8 +29,9 @@ class ProfileNetworkNatOptions : public ProfileNetworkNatOptionsBase { Q_OBJECT + TQ_OBJECT public: - ProfileNetworkNatOptions(QWidget *parent); + ProfileNetworkNatOptions(TQWidget *parent); ~ProfileNetworkNatOptions(); bool dialogModified; diff --git a/src/profilenetworknatoptionsbase.ui b/src/profilenetworknatoptionsbase.ui index f2122a7..125e530 100644 --- a/src/profilenetworknatoptionsbase.ui +++ b/src/profilenetworknatoptionsbase.ui @@ -1,6 +1,6 @@ ProfileNetworkNatOptionsBase - + ProfileNetworkNatOptionsBase @@ -19,39 +19,39 @@ unnamed - + - layout71 + tqlayout71 unnamed - + - layout70 + tqlayout70 unnamed - + - layout69 + tqlayout69 unnamed - + - layout67 + tqlayout67 unnamed - + UseUdpCheckbox @@ -78,7 +78,7 @@ Expanding - + 40 20 @@ -87,7 +87,7 @@ - + UseNatCheckbox @@ -111,14 +111,14 @@ Expanding - + 116 21 - + UdpPortCheckbox @@ -135,7 +135,7 @@ Use specified port number for IPSec NAT-T - + UdpPortSpinbox @@ -167,7 +167,7 @@ Expanding - + 21 46 @@ -186,7 +186,7 @@ Expanding - + 31 20 @@ -216,10 +216,10 @@ UdpPortCheckbox UdpPortSpinbox - + useNatToggled(bool) useUdpToggled(bool) udpPortToggled(bool) - + diff --git a/src/profilenetworkrouteoptions.cpp b/src/profilenetworkrouteoptions.cpp index ad47bd2..55f1449 100644 --- a/src/profilenetworkrouteoptions.cpp +++ b/src/profilenetworkrouteoptions.cpp @@ -19,14 +19,14 @@ ***************************************************************************/ #include "profilenetworkrouteoptions.h" -#include +#include #include #include -#include +#include #include #include #include -#include +#include #include #include @@ -34,7 +34,7 @@ #include "addnetworkroutedialog.h" #include "widgetnotifyhelper.h" -ProfileNetworkRouteOptions::ProfileNetworkRouteOptions(QWidget *parent): ProfileNetworkRouteOptionsBase(parent) +ProfileNetworkRouteOptions::ProfileNetworkRouteOptions(TQWidget *parent): ProfileNetworkRouteOptionsBase(parent) { WidgetNotifyHelper h; h.setupChangedAction(this); @@ -68,11 +68,11 @@ void ProfileNetworkRouteOptions::delNetworkRouteClicked() { if ( NetworkListView->childCount() > 0 && NetworkListView->currentItem()!= 0 ) { - QListViewItem *item = NetworkListView->currentItem(); - QString Network = item->text(0); - QString Netmask = item->text(1); - int result = KMessageBox::questionYesNo ( this, i18n( "Do you really want to delete the network \"%1/%2\"?" ).arg( Network ).arg(Netmask), i18n( "Delete?" ) ); - //LogOutput->append( "Result: "+ QString().setNum(result) ) ; + TQListViewItem *item = NetworkListView->currentItem(); + TQString Network = item->text(0); + TQString Netmask = item->text(1); + int result = KMessageBox::questionYesNo ( this, i18n( "Do you really want to delete the network \"%1/%2\"?" ).tqarg( Network ).tqarg(Netmask), i18n( "Delete?" ) ); + //LogOutput->append( "Result: "+ TQString().setNum(result) ) ; if ( result == 3) // Yes { NetworkListView->removeItem(item); @@ -98,13 +98,13 @@ void ProfileNetworkRouteOptions::addNetworkRouteClicked() if (dlg.exec()) { - QString gateway = dlg.getGateway(); - QString interface = dlg.getInterface(); + TQString gateway = dlg.getGateway(); + TQString interface = dlg.getInterface(); if (!dlg.getUseGateway()) gateway="-"; if (!dlg.getUseInterface()) interface="-"; - NetworkListView->insertItem( new QListViewItem(NetworkListView, dlg.getNetwork(),dlg.getNetmask(), gateway,interface)); + NetworkListView->insertItem( new TQListViewItem(NetworkListView, dlg.getNetwork(),dlg.getNetmask(), gateway,interface)); if (dlg.dialogModified == true) dialogModified=true; } @@ -117,10 +117,10 @@ void ProfileNetworkRouteOptions::editNetworkRouteClicked() if ( NetworkListView->childCount() > 0 && NetworkListView->currentItem()!= 0 ) { AddNetworkRouteDialog dlg(this, i18n("Edit Network Route...")); - QString Network=NetworkListView->currentItem()->text(0); - QString Netmask=NetworkListView->currentItem()->text(1); - QString Gateway=NetworkListView->currentItem()->text(2); - QString Interface=NetworkListView->currentItem()->text(3); + TQString Network=NetworkListView->currentItem()->text(0); + TQString Netmask=NetworkListView->currentItem()->text(1); + TQString Gateway=NetworkListView->currentItem()->text(2); + TQString Interface=NetworkListView->currentItem()->text(3); dlg.main->InterfaceComboBox->insertItem("default"); // interface where default route points @@ -159,15 +159,15 @@ void ProfileNetworkRouteOptions::editNetworkRouteClicked() if (dlg.exec()) { - QString gateway = dlg.getGateway(); - QString interface = dlg.getInterface(); + TQString gateway = dlg.getGateway(); + TQString interface = dlg.getInterface(); if (!dlg.getUseGateway()) gateway="-"; if (!dlg.getUseInterface()) interface="-"; NetworkListView->takeItem(NetworkListView->currentItem()); - NetworkListView->insertItem( new QListViewItem(NetworkListView, dlg.getNetwork(),dlg.getNetmask(), gateway,interface)); + NetworkListView->insertItem( new TQListViewItem(NetworkListView, dlg.getNetwork(),dlg.getNetmask(), gateway,interface)); // NetworkListView->currentItem()->text(0) = dlg.getNetwork(); // NetworkListView->currentItem()->text(1) = dlg.getNetmask(); @@ -192,23 +192,23 @@ void ProfileNetworkRouteOptions::checkList() } } -void ProfileNetworkRouteOptions::contextMenuRequested ( QListViewItem * item, const QPoint &pos, int ) +void ProfileNetworkRouteOptions::contextMenuRequested ( TQListViewItem * item, const TQPoint &pos, int ) { - ContextMenu = new QPopupMenu ( 0 ); + ContextMenu = new TQPopupMenu ( 0 ); if (item != 0) { ContextMenu->insertItem(i18n("&Edit...")); ContextMenu->insertItem(i18n("&Delete...")); } ContextMenu->insertItem(i18n("&Add...")); - connect ( ContextMenu, SIGNAL ( activated ( int ) ), this, SLOT ( doContextMenuAction ( int ) ) ); + connect ( ContextMenu, TQT_SIGNAL ( activated ( int ) ), this, TQT_SLOT ( doContextMenuAction ( int ) ) ); ContextMenu->show(); ContextMenu->setGeometry(pos.x(),pos.y(), ContextMenu->width(),ContextMenu->height()); } void ProfileNetworkRouteOptions::doContextMenuAction ( int action) { - QString itemtext = ContextMenu->text ( action ); + TQString itemtext = ContextMenu->text ( action ); // std::cout << "action: " << itemtext << std::endl; if (itemtext == i18n("&Edit...")) editNetworkRouteClicked(); diff --git a/src/profilenetworkrouteoptions.h b/src/profilenetworkrouteoptions.h index 8df59ff..ccf3782 100644 --- a/src/profilenetworkrouteoptions.h +++ b/src/profilenetworkrouteoptions.h @@ -21,8 +21,8 @@ #define PROFILENETWORKROUTEOPTIONS_H #include "profilenetworkrouteoptionsbase.h" -#include -#include +#include +#include /** @author Christoph Thielecke @@ -30,8 +30,9 @@ class ProfileNetworkRouteOptions : public ProfileNetworkRouteOptionsBase { Q_OBJECT + TQ_OBJECT public: - ProfileNetworkRouteOptions(QWidget *parent); + ProfileNetworkRouteOptions(TQWidget *parent); ~ProfileNetworkRouteOptions(); bool dialogModified; @@ -42,11 +43,11 @@ public slots: void editNetworkRouteClicked(); void additionalNetworkRoutesToggled(bool); void checkList(); - void contextMenuRequested ( QListViewItem *, const QPoint &, int ); + void contextMenuRequested ( TQListViewItem *, const TQPoint &, int ); void doContextMenuAction ( int ); private: - QPopupMenu *ContextMenu; + TQPopupMenu *ContextMenu; private slots: void dialogChanged(); diff --git a/src/profilenetworkrouteoptionsbase.ui b/src/profilenetworkrouteoptionsbase.ui index 64f4a19..cf4322f 100644 --- a/src/profilenetworkrouteoptionsbase.ui +++ b/src/profilenetworkrouteoptionsbase.ui @@ -1,6 +1,6 @@ ProfileNetworkRouteOptionsBase - + ProfileNetworkRouteOptionsBase @@ -27,17 +27,17 @@ unnamed - + - layout5 + tqlayout5 unnamed - + - layout14 + tqlayout14 @@ -68,7 +68,7 @@ Expanding - + 278 21 @@ -77,7 +77,7 @@ - + UseExtraNetworkRoutesCheckbox @@ -142,7 +142,7 @@ false - + 0 150 @@ -152,9 +152,9 @@ List of additional network routes - + - layout4 + tqlayout4 @@ -170,7 +170,7 @@ Expanding - + 70 20 @@ -272,13 +272,13 @@ AddRoutePushButton DeleteNetworkRoutePushButton - + additionalNetworkRoutesToggled(bool) addNetworkRouteClicked() delNetworkRouteClicked() editNetworkRouteClicked() contextMenuRequested(QListViewItem*,const QPoint&,int) - + kcombobox.h diff --git a/src/profilenetworkvirtualipoptions.cpp b/src/profilenetworkvirtualipoptions.cpp index 3ffc81e..fe9c862 100644 --- a/src/profilenetworkvirtualipoptions.cpp +++ b/src/profilenetworkvirtualipoptions.cpp @@ -19,13 +19,13 @@ ***************************************************************************/ #include "profilenetworkvirtualipoptions.h" -#include -#include +#include +#include #include #include "widgetnotifyhelper.h" #include -ProfileNetworkVirtualIpOptions::ProfileNetworkVirtualIpOptions(QWidget *parent) +ProfileNetworkVirtualIpOptions::ProfileNetworkVirtualIpOptions(TQWidget *parent) : ProfileNetworkVirtualIpOptionsBase(parent) { WidgetNotifyHelper h; diff --git a/src/profilenetworkvirtualipoptions.h b/src/profilenetworkvirtualipoptions.h index ffbb2b9..1c729a6 100644 --- a/src/profilenetworkvirtualipoptions.h +++ b/src/profilenetworkvirtualipoptions.h @@ -21,15 +21,16 @@ #define PROFILENETWORKVIRTUALIPOPTIONS_H #include "profilenetworkvirtualipoptionsbase.h" -#include +#include /** @author Christoph Thielecke */ class ProfileNetworkVirtualIpOptions : public ProfileNetworkVirtualIpOptionsBase { Q_OBJECT + TQ_OBJECT public: - ProfileNetworkVirtualIpOptions(QWidget *parent); + ProfileNetworkVirtualIpOptions(TQWidget *parent); ~ProfileNetworkVirtualIpOptions(); bool dialogModified; diff --git a/src/profilenetworkvirtualipoptionsbase.ui b/src/profilenetworkvirtualipoptionsbase.ui index 5ff00cf..498b719 100644 --- a/src/profilenetworkvirtualipoptionsbase.ui +++ b/src/profilenetworkvirtualipoptionsbase.ui @@ -1,6 +1,6 @@ ProfileNetworkVirtualIpOptionsBase - + ProfileNetworkVirtualIpOptionsBase @@ -19,15 +19,15 @@ unnamed - + - layout66 + tqlayout66 unnamed - + VirtualIpGroupBox @@ -38,15 +38,15 @@ unnamed - + - layout183 + tqlayout183 unnamed - + LabelRemoteVirtualIp @@ -57,9 +57,9 @@ Remote IP (virtual): - + - layout77 + tqlayout77 @@ -78,7 +78,7 @@ Remote IP address (for tunnel) - + UseVirtualIPCheckBox @@ -106,7 +106,7 @@ - + LabelLocalVirtualIp @@ -121,7 +121,7 @@ - + SourceIpgroupBox @@ -132,17 +132,17 @@ unnamed - + - layout65 + tqlayout65 unnamed - + - layout49 + tqlayout49 @@ -156,7 +156,7 @@ false - + UseLeftSourceIpCheckBox @@ -167,7 +167,7 @@ Alt+L - + UseRightSourceIpCheckBox @@ -191,15 +191,15 @@ - + - layout64 + tqlayout64 unnamed - + UseVirtualSubnetsCheckBox @@ -217,7 +217,7 @@ false - + 200 0 @@ -243,7 +243,7 @@ Expanding - + 41 159 @@ -285,12 +285,12 @@ LocalVirtualIpEdit RemoteVirtualIpLineEdit - + useVirtualIpAddressToggled(bool) useLeftSourceIpToggeled(bool) useRightSourceIpToggeled(bool) useVirtualSubnetsToggled(bool) - + klineedit.h diff --git a/src/profileopenvpnoptions.cpp b/src/profileopenvpnoptions.cpp index 31128be..1c6a797 100644 --- a/src/profileopenvpnoptions.cpp +++ b/src/profileopenvpnoptions.cpp @@ -18,17 +18,17 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ #include "profileopenvpnoptions.h" -#include -#include +#include +#include #include #include -#include +#include #include #include #include "widgetnotifyhelper.h" #include -ProfileOpenvpnOptions::ProfileOpenvpnOptions(QWidget *parent) +ProfileOpenvpnOptions::ProfileOpenvpnOptions(TQWidget *parent) : ProfileOpenvpnOptionsBase(parent) { NsCertTypeComboBox->insertItem("client"); diff --git a/src/profileopenvpnoptions.h b/src/profileopenvpnoptions.h index 69f2c5d..95e7b24 100644 --- a/src/profileopenvpnoptions.h +++ b/src/profileopenvpnoptions.h @@ -21,7 +21,7 @@ #define PROFILEOPENVPNOPTIONS_H #include "profileopenvpnoptionsbase.h" -#include +#include /** @author Christoph Thielecke @@ -29,8 +29,9 @@ class ProfileOpenvpnOptions : public ProfileOpenvpnOptionsBase { Q_OBJECT + TQ_OBJECT public: - ProfileOpenvpnOptions(QWidget *parent); + ProfileOpenvpnOptions(TQWidget *parent); ~ProfileOpenvpnOptions(); bool dialogModified; diff --git a/src/profileopenvpnoptionsbase.ui b/src/profileopenvpnoptionsbase.ui index 9d48239..607a482 100644 --- a/src/profileopenvpnoptionsbase.ui +++ b/src/profileopenvpnoptionsbase.ui @@ -1,6 +1,6 @@ ProfileOpenvpnOptionsBase - + ProfileOpenvpnOptionsBase @@ -19,11 +19,11 @@ unnamed - + tabWidget4 - + GeneralTab @@ -34,23 +34,23 @@ unnamed - + - layout72 + tqlayout72 unnamed - + - layout71 + tqlayout71 unnamed - + UserdefinedPortSpinBox @@ -70,7 +70,7 @@ Port number - + UseUserdefinedPortCheckBox @@ -84,7 +84,7 @@ Specify local (source) port to use - + UseUserdefinedRemotePortCheckBox @@ -95,7 +95,7 @@ Use non standard TCP/UDP port - + DisableLzoCompressionCheckBox @@ -106,7 +106,7 @@ Alt+Z - + UserdefinedRemotePortSpinBox @@ -126,7 +126,7 @@ Port number - + DisableSocketBindCheckBox @@ -137,7 +137,7 @@ - + AllowIpAddressChangeOfPeerCheckBox @@ -163,7 +163,7 @@ Expanding - + 20 31 @@ -174,7 +174,7 @@ - + NetworkTab @@ -185,23 +185,23 @@ unnamed - + - layout74 + tqlayout74 unnamed - + - layout73 + tqlayout73 unnamed - + RenegSecSpinBox @@ -221,7 +221,7 @@ - + TunnelPingRestartCheckBox @@ -235,7 +235,7 @@ Specify local (source) port to use - + RenegSecCheckBox @@ -249,7 +249,7 @@ - + UseUserdefiniedCipherCheckBox @@ -260,7 +260,7 @@ Use non standard cipher algorithm - + TunnelPingRestartSpinBox @@ -280,7 +280,7 @@ - + UseUserdefinedFragmentationSizeCheckBox @@ -294,7 +294,7 @@ - + UserdefinedPacketSizeSpinBox @@ -327,7 +327,7 @@ Expanding - + 74 20 @@ -344,14 +344,14 @@ Expanding - + 74 20 - + UserdefinedFragmentSizeSpinBox @@ -371,7 +371,7 @@ Max packet size - + TunnelPingCheckBox @@ -395,14 +395,14 @@ Expanding - + 74 20 - + UseUserdefinedPacketSizeCheckBox @@ -413,7 +413,7 @@ Use specified max packet size after encapsulation - + TunnelPingSpinBox @@ -443,7 +443,7 @@ Expanding - + 74 20 @@ -471,7 +471,7 @@ Expanding - + 74 20 @@ -488,7 +488,7 @@ Expanding - + 74 20 @@ -507,7 +507,7 @@ Expanding - + 20 21 @@ -518,7 +518,7 @@ - + AuthenticationTab @@ -529,17 +529,17 @@ unnamed - + - layout76 + tqlayout76 unnamed - + - layout75 + tqlayout75 @@ -555,14 +555,14 @@ Expanding - + 74 20 - + UseAuthenticationAlgorithmCheckBox @@ -584,7 +584,7 @@ Digest algorithm - + UseNsCertTypeCheckBox @@ -598,7 +598,7 @@ Require that peer certificate was signed with an explicit nsCertType destination of "client" or "server" - + UseOnlyCaCertAndUserAuthCheckBox @@ -615,7 +615,7 @@ Authenticate with server using username and password - + UseTlsRemoteHostCheckBox @@ -640,7 +640,7 @@ Digest algorithm - + TlsRemoteHostLineEdit @@ -651,7 +651,7 @@ Common name, X509 name or common name prefix - + textLabel1_2 @@ -670,15 +670,15 @@ The NS cert type: - + - layout26 + tqlayout26 unnamed - + AuthWithUsernameAndPasswordCheckBox @@ -702,7 +702,7 @@ Expanding - + 16 20 @@ -711,7 +711,7 @@ - + UseTlsAuthCheckBox @@ -735,7 +735,7 @@ Expanding - + 74 20 @@ -763,7 +763,7 @@ Expanding - + 74 20 @@ -782,7 +782,7 @@ Expanding - + 20 21 @@ -892,7 +892,7 @@ DisableLzoCompressionCheckBox AuthWithUsernameAndPasswordCheckBox - + authenticateWithUsernameAndPasswordToggled(bool) userdefiniedPacketSizeToggled(bool) userdefiniedFragmentationSizeToggled(bool) @@ -906,7 +906,7 @@ renegSecToggled(bool) tunnelPingToggeled(bool) tunnelPingRestartToggeled(bool) - + kcombobox.h diff --git a/src/profilepptpoptions.cpp b/src/profilepptpoptions.cpp index 24ad5e7..407017e 100644 --- a/src/profilepptpoptions.cpp +++ b/src/profilepptpoptions.cpp @@ -19,13 +19,13 @@ ***************************************************************************/ #include "profilepptpoptions.h" -#include -#include +#include +#include #include #include "widgetnotifyhelper.h" #include -ProfilePptpOptions::ProfilePptpOptions(QWidget *parent) +ProfilePptpOptions::ProfilePptpOptions(TQWidget *parent) : ProfilePptpOptionsBase(parent) { WidgetNotifyHelper h; diff --git a/src/profilepptpoptions.h b/src/profilepptpoptions.h index 9846351..46b01e2 100644 --- a/src/profilepptpoptions.h +++ b/src/profilepptpoptions.h @@ -21,7 +21,7 @@ #define PROFILEPPTPOPTIONS_H #include "profilepptpoptionsbase.h" -#include +#include /** @author Christoph Thielecke @@ -29,8 +29,9 @@ class ProfilePptpOptions : public ProfilePptpOptionsBase { Q_OBJECT + TQ_OBJECT public: - ProfilePptpOptions(QWidget *parent); + ProfilePptpOptions(TQWidget *parent); ~ProfilePptpOptions(); bool dialogModified; diff --git a/src/profilepptpoptionsbase.ui b/src/profilepptpoptionsbase.ui index 1871e0d..4b25fa7 100644 --- a/src/profilepptpoptionsbase.ui +++ b/src/profilepptpoptionsbase.ui @@ -1,6 +1,6 @@ ProfilePptpOptionsBase - + ProfilePptpOptionsBase @@ -19,11 +19,11 @@ unnamed - + tabWidget5 - + MppeTab @@ -34,17 +34,17 @@ unnamed - + - layout85 + tqlayout85 unnamed - + - layout84 + tqlayout84 @@ -60,14 +60,14 @@ Expanding - + 196 20 - + RequireMppeCheckbox @@ -81,7 +81,7 @@ Require Microsoft Point-To-Point Encrpytion (enabled by default) - + AllowStatefulModeCheckbox @@ -95,7 +95,7 @@ Check this for allow stateful mode of MPPE - + Refuse40BitEncryptionCheckbox @@ -109,7 +109,7 @@ Refuse 40 bit length encryption of MPPE - + Refuse128BitEncryptionCheckbox @@ -123,7 +123,7 @@ Refuse 128 bit length encryption of MPPE - + UseNoMPPECompressionCheckbox @@ -152,7 +152,7 @@ Expanding - + 21 31 @@ -163,7 +163,7 @@ - + PppTab @@ -174,23 +174,23 @@ unnamed - + - layout92 + tqlayout92 unnamed - + - layout91 + tqlayout91 unnamed - + UseNoDeflateCheckbox @@ -204,7 +204,7 @@ Do not use deflate decompression method (disabled by default) - + DisableCcpCheckbox @@ -231,14 +231,14 @@ Expanding - + 181 21 - + DisableIpxCheckbox @@ -255,7 +255,7 @@ Disables the IPXCP and IPX protocols. This option should only be required if the peer is buggy and gets confused by requests from pppd for IPXCP negotiation. - + UseNoIpDefaultCheckbox @@ -266,7 +266,7 @@ Alt+Y - + UseNoBsdCompCheckbox @@ -280,7 +280,7 @@ Do not use BSD compression (disabled by default) - + DisableHeaderCompressionCheckbox @@ -297,7 +297,7 @@ Disables the Van Jacobson style TCP/IP header compression in both the transmit and the receive direction. - + DisableAdressControlCompressionCheckbox @@ -314,7 +314,7 @@ Disable Address/Control compression in both directions (send and receive). - + DisableMagicNumberNegotiationCheckbox @@ -331,7 +331,7 @@ Disable magic number negotiation. With this option, pppd cannot detect a looped-back line. This option should only be needed if the peer is buggy. - + DisableProtocolFieldCompressionCheckbox @@ -360,7 +360,7 @@ Expanding - + 20 138 @@ -371,7 +371,7 @@ - + AuthenticationTab @@ -382,31 +382,31 @@ unnamed - + - layout89 + tqlayout89 unnamed - + - layout88 + tqlayout88 unnamed - + - layout7 + tqlayout7 unnamed - + textLabel1 @@ -421,7 +421,7 @@ - + RequireEapCheckbox @@ -435,23 +435,23 @@ Require EAP (disabled by default), should be disabled - + - layout7 + tqlayout7 unnamed - + - layout6 + tqlayout6 unnamed - + L2tpdDaemonLabel @@ -469,7 +469,7 @@ Expanding - + 111 21 @@ -507,7 +507,7 @@ Expanding - + 20 51 @@ -518,7 +518,7 @@ - + DnsTab @@ -529,17 +529,17 @@ unnamed - + - layout87 + tqlayout87 unnamed - + - layout86 + tqlayout86 @@ -559,7 +559,7 @@ IP address of the DNS server (no hostname) - + DnsServerCheckbox @@ -584,7 +584,7 @@ IP address of the DNS server (no hostname) - + UseDomainInResolvConfCheckbox @@ -595,7 +595,7 @@ Use specified DNS server instead of retrieved from peer - + UseSearchDomainInResolvConfCheckbox @@ -632,7 +632,7 @@ Expanding - + 20 71 @@ -678,14 +678,14 @@ UseNoIpDefaultCheckbox UseNoMPPECompressionCheckbox - + mtuToggled(bool) useDnsServerToggled(bool) keepDefaultRouteToggled(bool) useNtDomainNameToggled(bool) useSearchDomainInResolvConfToggled(bool) useDomainInResolvConfToggled(bool) - + kcombobox.h diff --git a/src/profilepskoptions.cpp b/src/profilepskoptions.cpp index 2926d4d..e7c9065 100644 --- a/src/profilepskoptions.cpp +++ b/src/profilepskoptions.cpp @@ -19,17 +19,17 @@ ***************************************************************************/ #include "profilepskoptions.h" -#include -#include +#include +#include #include #include -#include +#include #include #include #include "widgetnotifyhelper.h" #include -ProfilePskOptions::ProfilePskOptions(QWidget *parent) +ProfilePskOptions::ProfilePskOptions(TQWidget *parent) : ProfilePskOptionsBase(parent) { WidgetNotifyHelper h; diff --git a/src/profilepskoptions.h b/src/profilepskoptions.h index 0898edb..a9861fa 100644 --- a/src/profilepskoptions.h +++ b/src/profilepskoptions.h @@ -21,7 +21,7 @@ #define PROFILEPSKOPTIONS_H #include "profilepskoptionsbase.h" -#include +#include /** @author Christoph Thielecke @@ -29,8 +29,9 @@ class ProfilePskOptions : public ProfilePskOptionsBase { Q_OBJECT + TQ_OBJECT public: - ProfilePskOptions(QWidget *parent); + ProfilePskOptions(TQWidget *parent); ~ProfilePskOptions(); bool dialogModified; diff --git a/src/profilepskoptionsbase.ui b/src/profilepskoptionsbase.ui index 6a8b86a..2343e89 100644 --- a/src/profilepskoptionsbase.ui +++ b/src/profilepskoptionsbase.ui @@ -1,6 +1,6 @@ ProfilePskOptionsBase - + ProfilePskOptionsBase @@ -29,30 +29,30 @@ Expanding - + 16 51 - + - layout21 + tqlayout21 unnamed - + - layout117 + tqlayout117 unnamed - + LabelAuthType @@ -70,7 +70,7 @@ Expanding - + 50 20 @@ -87,7 +87,7 @@ - + PskGroupBox @@ -119,7 +119,7 @@ PSKFileURLRequester - + 250 0 @@ -129,7 +129,7 @@ File which contains Pre-shared key (shared secret) - + LabelPsk @@ -150,14 +150,14 @@ Expanding - + 118 20 - + PskInFileCheckBox @@ -181,14 +181,14 @@ Expanding - + 80 20 - + LabelPskFile @@ -209,14 +209,14 @@ Expanding - + 94 20 - + CheckSavePsk @@ -240,7 +240,7 @@ Expanding - + 152 20 @@ -259,7 +259,7 @@ Expanding - + 21 20 @@ -285,10 +285,10 @@ PSKFileURLRequester PSKLineEdit - + pskIsInFileToggled(bool) useSpecialRemoteIDToggled(bool) - + kcombobox.h diff --git a/src/profileracoonoptions.cpp b/src/profileracoonoptions.cpp index c2368f7..cc060a4 100644 --- a/src/profileracoonoptions.cpp +++ b/src/profileracoonoptions.cpp @@ -22,34 +22,34 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include "widgetnotifyhelper.h" #include -ProfileRacoonOptions::ProfileRacoonOptions(QWidget *parent) +ProfileRacoonOptions::ProfileRacoonOptions(TQWidget *parent) : ProfileRacoonOptionsBase(parent) { WidgetNotifyHelper h; h.setupChangedAction(this); dialogModified=false; - QToolTip::add( RemoteIdTypeCombobox, i18n("Remote ID type
" + TQToolTip::add( RemoteIdTypeCombobox, i18n("Remote ID type
" "" "" - "" - "" + "" + "" "" "" "
none:No ID
address:The type is the IP address. This is the default type if you do not specify an identifier to use
user_fqdn:The type is a USER_FQDN (user fully-qualified domain name)
fqdn:The type is a FQDN (fully-qualified domain name)
user_fqdn:The type is a USER_FTQDN (user fully-qualified domain name)
fqdn:The type is a FTQDN (fully-qualified domain name)
keyid (file):The type is a KEY_ID, read from the file
keyid:The type is a KEY_ID, specified in field
asn1dn:The type is an ASN.1 distinguished name. If empty, DN from the Subject field in the certificate will be used" "")); - QToolTip::add( LocalIdTypeCombobox, i18n("Local ID type
" + TQToolTip::add( LocalIdTypeCombobox, i18n("Local ID type
" "" "" - "" - "" + "" + "" "" "" "
none:No ID
address:The type is the IP address. This is the default type if you do not specify an identifier to use
user_fqdn:The type is a USER_FQDN (user fully-qualified domain name)
fqdn:The type is a FQDN (fully-qualified domain name)
user_fqdn:The type is a USER_FTQDN (user fully-qualified domain name)
fqdn:The type is a FTQDN (fully-qualified domain name)
keyid (file):The type is a KEY_ID, read from the file
keyid:The type is a KEY_ID, specified in field
asn1dn:The type is an ASN.1 distinguished name. If empty, DN from the Subject field in the certificate will be used" @@ -62,7 +62,7 @@ ProfileRacoonOptions::ProfileRacoonOptions(QWidget *parent) ProfileRacoonOptions::~ProfileRacoonOptions() {} -void ProfileRacoonOptions::localIDTypeToggled(const QString& text) +void ProfileRacoonOptions::localIDTypeToggled(const TQString& text) { if (text == "none") { @@ -83,7 +83,7 @@ void ProfileRacoonOptions::dialogChanged() } -void ProfileRacoonOptions::remoteIDTypeToggled(const QString& text) +void ProfileRacoonOptions::remoteIDTypeToggled(const TQString& text) { if (text == "none") { diff --git a/src/profileracoonoptions.h b/src/profileracoonoptions.h index 01f73ac..25d0a28 100644 --- a/src/profileracoonoptions.h +++ b/src/profileracoonoptions.h @@ -21,7 +21,7 @@ #define PROFILERACOONOPTIONS_H #include "profileracoonoptionsbase.h" -#include +#include /** @author Christoph Thielecke @@ -29,14 +29,15 @@ class ProfileRacoonOptions : public ProfileRacoonOptionsBase { Q_OBJECT + TQ_OBJECT public: - ProfileRacoonOptions(QWidget *parent); + ProfileRacoonOptions(TQWidget *parent); ~ProfileRacoonOptions(); bool dialogModified; public slots: - void localIDTypeToggled(const QString&); - void remoteIDTypeToggled(const QString&); + void localIDTypeToggled(const TQString&); + void remoteIDTypeToggled(const TQString&); private slots: diff --git a/src/profileracoonoptionsbase.ui b/src/profileracoonoptionsbase.ui index 88449c7..306ffb7 100644 --- a/src/profileracoonoptionsbase.ui +++ b/src/profileracoonoptionsbase.ui @@ -1,6 +1,6 @@ ProfileRacoonOptionsBase - + ProfileRacoonOptionsBase @@ -19,15 +19,15 @@ unnamed - + - layout63 + tqlayout63 unnamed - + textLabel1 @@ -35,11 +35,11 @@ racoon + ipsec tools specific settings (Linux &2.6 native or BSD - + tabWidget3 - + GeneralTab @@ -50,31 +50,31 @@ unnamed - + - layout62 + tqlayout62 unnamed - + - layout61 + tqlayout61 unnamed - + - layout75 + tqlayout75 unnamed - + UseModeConfigCheckBox @@ -87,15 +87,15 @@ - + - layout42 + tqlayout42 unnamed - + ExchangeModeComboBox @@ -103,15 +103,15 @@ Internet Key Exchange mode - + - layout72 + tqlayout72 unnamed - + HashAlgoTextLabel_2 @@ -129,7 +129,7 @@ Expanding - + 91 21 @@ -138,7 +138,7 @@ - + EncryptionAlgorithm2ComboBox @@ -146,15 +146,15 @@ - + - layout69 + tqlayout69 unnamed - + HashAlgoTextLabel @@ -175,7 +175,7 @@ Expanding - + 101 21 @@ -184,7 +184,7 @@ - + EncryptionAlgorithmComboBox @@ -192,15 +192,15 @@ - + - layout39 + tqlayout39 unnamed - + PerfectForwardSecurityCheckbox @@ -224,7 +224,7 @@ Expanding - + 31 20 @@ -233,15 +233,15 @@ - + - layout71 + tqlayout71 unnamed - + EncryptionAlgorithm2TextLabel @@ -259,7 +259,7 @@ Expanding - + 101 21 @@ -268,15 +268,15 @@ - + - layout37 + tqlayout37 unnamed - + IkeGroupCheckbox @@ -300,7 +300,7 @@ Expanding - + 61 21 @@ -357,7 +357,7 @@ dh17 = modp6144 (only racoon) dh18 = modp8192 (only racoon) - + HashAlgoComboBox @@ -365,7 +365,7 @@ dh18 = modp8192 (only racoon) Use specified hash algorithm for IKE phase 1 - + AuthenticationAlgorithm2ComboBox @@ -373,15 +373,15 @@ dh18 = modp8192 (only racoon) - + - layout71_2 + tqlayout71_2 unnamed - + EncryptionAlgorithm2TextLabel_2 @@ -399,7 +399,7 @@ dh18 = modp8192 (only racoon) Expanding - + 101 21 @@ -408,15 +408,15 @@ dh18 = modp8192 (only racoon) - + - layout70_2 + tqlayout70_2 unnamed - + AuthenticationAlgorithm2TextLabel_2 @@ -434,7 +434,7 @@ dh18 = modp8192 (only racoon) Expanding - + 81 21 @@ -457,7 +457,7 @@ dh18 = modp8192 (only racoon) Expanding - + 20 21 @@ -468,7 +468,7 @@ dh18 = modp8192 (only racoon) - + IdTab @@ -479,15 +479,15 @@ dh18 = modp8192 (only racoon) unnamed - + - layout51 + tqlayout51 unnamed - + RemoteIdentifierGroupBox @@ -498,23 +498,23 @@ dh18 = modp8192 (only racoon) unnamed - + - layout74_2 + tqlayout74_2 unnamed - + - layout73_2 + tqlayout73_2 unnamed - + HashAlgoTextLabel_2_2_2 @@ -532,7 +532,7 @@ dh18 = modp8192 (only racoon) Expanding - + 51 20 @@ -555,15 +555,15 @@ dh18 = modp8192 (only racoon) Value for the local ID - + - layout72_2_2 + tqlayout72_2_2 unnamed - + RemoteIDLabel @@ -581,7 +581,7 @@ dh18 = modp8192 (only racoon) Expanding - + 51 20 @@ -623,7 +623,7 @@ dh18 = modp8192 (only racoon) - + LocalIdentifierGroupBox @@ -634,23 +634,23 @@ dh18 = modp8192 (only racoon) unnamed - + - layout74 + tqlayout74 unnamed - + - layout73 + tqlayout73 unnamed - + HashAlgoTextLabel_2_2 @@ -668,7 +668,7 @@ dh18 = modp8192 (only racoon) Expanding - + 51 20 @@ -691,15 +691,15 @@ dh18 = modp8192 (only racoon) Value for the local ID - + - layout72_2 + tqlayout72_2 unnamed - + LocalIDLabel @@ -717,7 +717,7 @@ dh18 = modp8192 (only racoon) Expanding - + 51 20 @@ -769,7 +769,7 @@ dh18 = modp8192 (only racoon) Expanding - + 20 51 @@ -780,7 +780,7 @@ dh18 = modp8192 (only racoon) - + AuthenticationTab @@ -791,23 +791,23 @@ dh18 = modp8192 (only racoon) unnamed - + - layout60 + tqlayout60 unnamed - + - layout90_2 + tqlayout90_2 unnamed - + UseXauthCheckBox @@ -831,7 +831,7 @@ dh18 = modp8192 (only racoon) Expanding - + 100 20 @@ -850,7 +850,7 @@ dh18 = modp8192 (only racoon) Expanding - + 21 191 @@ -866,12 +866,12 @@ dh18 = modp8192 (only racoon) - + useLeftNextHopToggled(bool) useRightNextHopToggled(bool) localIDTypeToggled(const QString&) remoteIDTypeToggled(const QString&) - + kcombobox.h diff --git a/src/profilesmartcardoptions.cpp b/src/profilesmartcardoptions.cpp index 1e220ea..3714145 100644 --- a/src/profilesmartcardoptions.cpp +++ b/src/profilesmartcardoptions.cpp @@ -19,17 +19,17 @@ ***************************************************************************/ #include "profilesmartcardoptions.h" -#include -#include +#include +#include #include #include -#include +#include #include #include #include "widgetnotifyhelper.h" #include -ProfileSmartcardOptions::ProfileSmartcardOptions(QWidget *parent) +ProfileSmartcardOptions::ProfileSmartcardOptions(TQWidget *parent) : ProfileSmartcardOptionsBase(parent) { WidgetNotifyHelper h; diff --git a/src/profilesmartcardoptions.h b/src/profilesmartcardoptions.h index bca0949..1959f85 100644 --- a/src/profilesmartcardoptions.h +++ b/src/profilesmartcardoptions.h @@ -21,7 +21,7 @@ #define PROFILESMARTCARDOPTIONS_H #include "profilesmartcardoptionsbase.h" -#include +#include @@ -31,8 +31,9 @@ class ProfileSmartcardOptions : public ProfileSmartcardOptionsBase { Q_OBJECT + TQ_OBJECT public: - ProfileSmartcardOptions(QWidget *parent); + ProfileSmartcardOptions(TQWidget *parent); ~ProfileSmartcardOptions(); bool dialogModified; diff --git a/src/profilesmartcardoptionsbase.ui b/src/profilesmartcardoptionsbase.ui index 6160343..868a6f4 100644 --- a/src/profilesmartcardoptionsbase.ui +++ b/src/profilesmartcardoptionsbase.ui @@ -1,6 +1,6 @@ ProfileSmartcardOptionsBase - + ProfileSmartcardOptionsBase @@ -27,39 +27,39 @@ unnamed - + - layout157 + tqlayout157 unnamed - + - layout156 + tqlayout156 unnamed - + - layout155 + tqlayout155 unnamed - + - layout154 + tqlayout154 unnamed - + UseSmartcardCheckBox @@ -83,7 +83,7 @@ Expanding - + 210 20 @@ -92,9 +92,9 @@ - + - layout41 + tqlayout41 @@ -102,7 +102,7 @@ - + SmartcardGroupBox @@ -116,31 +116,31 @@ unnamed - + - layout56 + tqlayout56 unnamed - + - layout24 + tqlayout24 unnamed - + - layout23 + tqlayout23 unnamed - + Pkcs11SlotTypeLabel @@ -201,7 +201,7 @@ - + textLabel5 @@ -211,9 +211,9 @@ - + - layout22 + tqlayout22 @@ -229,7 +229,7 @@ Expanding - + 241 21 @@ -256,7 +256,7 @@ Pkcs11IdTypeComboBox - + textLabel2 @@ -268,9 +268,9 @@ - + - layout55 + tqlayout55 @@ -284,7 +284,7 @@ Detect - + textLabel3 @@ -292,7 +292,7 @@ Slot - + IdLabel @@ -354,15 +354,15 @@ - + - layout31 + tqlayout31 unnamed - + UsePkcs11ProvidersCheckBox @@ -399,7 +399,7 @@ Expanding - + 21 40 @@ -418,7 +418,7 @@ Expanding - + 16 51 @@ -455,11 +455,11 @@ UsePkcs11ProvidersCheckBox Pkcs11ProvidersURLRequester - + usePkcs11ProvidersToggled(bool) useSmartcardToggled(bool) idTypeToggled() - + kcombobox.h diff --git a/src/profilesshoptions.cpp b/src/profilesshoptions.cpp index c6d1546..b627f24 100644 --- a/src/profilesshoptions.cpp +++ b/src/profilesshoptions.cpp @@ -23,16 +23,16 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include #include "widgetnotifyhelper.h" #include -ProfileSshOptions::ProfileSshOptions(QWidget *parent) +ProfileSshOptions::ProfileSshOptions(TQWidget *parent) : ProfileSshOptionsBase(parent) { WidgetNotifyHelper h; diff --git a/src/profilesshoptions.h b/src/profilesshoptions.h index 68a92db..78a2d19 100644 --- a/src/profilesshoptions.h +++ b/src/profilesshoptions.h @@ -21,7 +21,7 @@ #define PROFILESSHOPTIONS_H #include "profilesshoptionsbase.h" -#include +#include /** @author Christoph Thielecke @@ -29,8 +29,9 @@ class ProfileSshOptions : public ProfileSshOptionsBase { Q_OBJECT + TQ_OBJECT public: - ProfileSshOptions(QWidget *parent); + ProfileSshOptions(TQWidget *parent); ~ProfileSshOptions(); bool dialogModified; diff --git a/src/profilesshoptionsbase.ui b/src/profilesshoptionsbase.ui index 17d833f..49af726 100644 --- a/src/profilesshoptionsbase.ui +++ b/src/profilesshoptionsbase.ui @@ -1,6 +1,6 @@ ProfileSshOptionsBase - + ProfileSshOptionsBase @@ -19,23 +19,23 @@ unnamed - + - layout7 + tqlayout7 unnamed - + - layout209 + tqlayout209 unnamed - + UseUserdefinedRemotePortCheckBox @@ -59,14 +59,14 @@ Expanding - + 82 20 - + UserdefinedRemotePortSpinBox @@ -88,15 +88,15 @@ - + - layout6 + tqlayout6 unnamed - + UseSshConfigRemoteScriptCheckBox @@ -129,15 +129,15 @@ Parameter 3: remote ip address 1.2.3.5 (tun) - + - layout9 + tqlayout9 unnamed - + buttonGroup1 @@ -148,7 +148,7 @@ Parameter 3: remote ip address 1.2.3.5 (tun) unnamed - + AuthKeyRadioButton @@ -159,7 +159,7 @@ Parameter 3: remote ip address 1.2.3.5 (tun) Alt+K - + AuthPassRadioButton @@ -185,7 +185,7 @@ Parameter 3: remote ip address 1.2.3.5 (tun) Expanding - + 194 41 @@ -194,7 +194,7 @@ Parameter 3: remote ip address 1.2.3.5 (tun) - + SshkeyButtonGroup @@ -212,22 +212,22 @@ Parameter 3: remote ip address 1.2.3.5 (tun) SshKeyComboBox - + 200 0 - + - layout7 + tqlayout7 unnamed - + CostumKeyRadioButton @@ -245,7 +245,7 @@ Parameter 3: remote ip address 1.2.3.5 (tun) Expanding - + 51 20 @@ -259,15 +259,15 @@ Parameter 3: remote ip address 1.2.3.5 (tun) CostumkeyURLRequester - + - layout10 + tqlayout10 unnamed - + AutoKeyRadioButton @@ -291,7 +291,7 @@ Parameter 3: remote ip address 1.2.3.5 (tun) Expanding - + 41 21 @@ -312,7 +312,7 @@ Parameter 3: remote ip address 1.2.3.5 (tun) Expanding - + 20 140 @@ -355,12 +355,12 @@ Parameter 3: remote ip address 1.2.3.5 (tun) useSshConfigRemoteScriptToggled(bool) - + usePortToggled(bool) sshKeyToggled(bool) sshAuthToggled(bool) useSshConfigRemoteScriptToggled(bool) - + klineedit.h diff --git a/src/profileuseroptions.cpp b/src/profileuseroptions.cpp index 70336c9..c8c29e2 100644 --- a/src/profileuseroptions.cpp +++ b/src/profileuseroptions.cpp @@ -19,13 +19,13 @@ ***************************************************************************/ #include "profileuseroptions.h" -#include +#include #include #include "widgetnotifyhelper.h" #include -ProfileUserOptions::ProfileUserOptions(QWidget *parent) +ProfileUserOptions::ProfileUserOptions(TQWidget *parent) : ProfileUserOptionsBase(parent) { WidgetNotifyHelper h; diff --git a/src/profileuseroptions.h b/src/profileuseroptions.h index 98f4e91..7e48aa2 100644 --- a/src/profileuseroptions.h +++ b/src/profileuseroptions.h @@ -21,7 +21,7 @@ #define PROFILEUSEROPTIONS_H #include "profileuseroptionsbase.h" -#include +#include /** @author Christoph Thielecke @@ -29,8 +29,9 @@ class ProfileUserOptions : public ProfileUserOptionsBase { Q_OBJECT + TQ_OBJECT public: - ProfileUserOptions(QWidget *parent); + ProfileUserOptions(TQWidget *parent); ~ProfileUserOptions(); bool dialogModified; diff --git a/src/profileuseroptionsbase.ui b/src/profileuseroptionsbase.ui index 1c3d6a9..fd74e29 100644 --- a/src/profileuseroptionsbase.ui +++ b/src/profileuseroptionsbase.ui @@ -1,6 +1,6 @@ ProfileUserOptionsBase - + ProfileUserOptionsBase @@ -19,23 +19,23 @@ unnamed - + - layout7 + tqlayout7 unnamed - + - layout17 + tqlayout17 unnamed - + PasswordEdit @@ -46,15 +46,15 @@ Password for authentication - + - layout31 + tqlayout31 unnamed - + NtDomainNameCheckbox @@ -81,7 +81,7 @@ Expanding - + 121 21 @@ -111,7 +111,7 @@ Expanding - + 133 20 @@ -126,7 +126,7 @@ Username for authentication - + DontSaveUsernameCheckBox @@ -150,22 +150,22 @@ Expanding - + 133 20 - + - layout55 + tqlayout55 unnamed - + LabelPassword @@ -183,7 +183,7 @@ Expanding - + 211 21 @@ -192,15 +192,15 @@ - + - layout54 + tqlayout54 unnamed - + LabelUsername @@ -218,7 +218,7 @@ Expanding - + 211 21 @@ -227,7 +227,7 @@ - + CheckUserPass @@ -243,7 +243,7 @@ - + HideGroupPasswordInAccountDataDialogCheckBox @@ -257,7 +257,7 @@ Do not show group password field in dialog for request username/password. - + AskUserPasswordOnEachConnectCheckBox @@ -284,7 +284,7 @@ Expanding - + 20 43 @@ -304,9 +304,9 @@ DontSaveUsernameCheckBox HideGroupPasswordInAccountDataDialogCheckBox - + domainNameToggled(bool) - + klineedit.h diff --git a/src/profilevtunoptions.cpp b/src/profilevtunoptions.cpp index baa732e..8f57d55 100644 --- a/src/profilevtunoptions.cpp +++ b/src/profilevtunoptions.cpp @@ -20,13 +20,13 @@ #include "profilevtunoptions.h" #include -#include -#include -#include +#include +#include +#include #include "widgetnotifyhelper.h" #include -ProfileVtunOptions::ProfileVtunOptions(QWidget *parent) +ProfileVtunOptions::ProfileVtunOptions(TQWidget *parent) : ProfileVtunOptionsBase(parent) { WidgetNotifyHelper h; diff --git a/src/profilevtunoptions.h b/src/profilevtunoptions.h index 915c84a..ee67b5c 100644 --- a/src/profilevtunoptions.h +++ b/src/profilevtunoptions.h @@ -21,7 +21,7 @@ #define PROFILEVTUNOPTIONS_H #include "profilevtunoptionsbase.h" -#include +#include /** @author Christoph Thielecke @@ -29,8 +29,9 @@ class ProfileVtunOptions : public ProfileVtunOptionsBase { Q_OBJECT + TQ_OBJECT public: - ProfileVtunOptions(QWidget *parent); + ProfileVtunOptions(TQWidget *parent); ~ProfileVtunOptions(); bool dialogModified; diff --git a/src/profilevtunoptionsbase.ui b/src/profilevtunoptionsbase.ui index bc28153..9c6f634 100644 --- a/src/profilevtunoptionsbase.ui +++ b/src/profilevtunoptionsbase.ui @@ -1,6 +1,6 @@ ProfileVtunOptionsBase - + ProfileVtunOptionsBase @@ -19,17 +19,17 @@ unnamed - + - layout118 + tqlayout118 unnamed - + - layout9 + tqlayout9 @@ -47,7 +47,7 @@ Expanding - + 439 21 @@ -56,31 +56,31 @@ - + - layout28 + tqlayout28 unnamed - + - layout27 + tqlayout27 unnamed - + - layout22 + tqlayout22 unnamed - + LabelID @@ -98,7 +98,7 @@ Expanding - + 50 20 @@ -115,15 +115,15 @@ - + - layout16 + tqlayout16 unnamed - + PortCheckbox @@ -144,14 +144,14 @@ Expanding - + 81 21 - + PortSpinbox @@ -182,7 +182,7 @@ Expanding - + 20 22 @@ -204,9 +204,9 @@ VtunProfileLineEdit - + usePortToggled(bool) - + klineedit.h diff --git a/src/toolinfo.cpp b/src/toolinfo.cpp index 754467a..f59eed3 100644 --- a/src/toolinfo.cpp +++ b/src/toolinfo.cpp @@ -19,17 +19,17 @@ ***************************************************************************/ #include "toolinfo.h" -#include +#include #include #include #include #include #include -#include -#include -#include +#include +#include +#include -ToolInfo::ToolInfo( const QString &Name) +ToolInfo::ToolInfo( const TQString &Name) { this->Name = Name; this->programsInPath = programsInPath; @@ -43,7 +43,7 @@ ToolInfo::ToolInfo( const QString &Name) Version=i18n("No info"); - env = new QStringList(); + env = new TQStringList(); *env << "LC_ALL=C" << "LANG=C" << "PATH=/bin:/usr/bin:/usr/sbin:/sbin"; collectRunning=false; @@ -62,7 +62,7 @@ bool ToolInfo::collectToolInfo() addSearchPath("/usr/bin"); addSearchPath("/bin"); - addSearchPath(QString (QString(getenv("HOME"))+"/bin")); + addSearchPath(TQString (TQString(getenv("HOME"))+"/bin")); } bool success = false; @@ -71,8 +71,8 @@ bool ToolInfo::collectToolInfo() if ( TryPath_first.isEmpty() ) TryPath_first=Name; - QStringList::Iterator it; - if (QFile (TryPath_first).exists() && QFileInfo(TryPath_first).isFile() ) + TQStringList::Iterator it; + if (TQFile (TryPath_first).exists() && TQFileInfo(TryPath_first).isFile() ) { // if (GlobalConfig->KvpncDebugLevel > 2) // std::cout << Name.ascii() << "found at: " << TryPath_first.ascii() << ", was first try" << std::endl; @@ -83,20 +83,20 @@ bool ToolInfo::collectToolInfo() { // if (GlobalConfig->KvpncDebugLevel > 2) // { -// std::cout << QString(i18n("Trying first %1 at %2 has been failed, trying other paths").arg(Name).arg(TryPath_first)).ascii() << std::endl; +// std::cout << TQString(i18n("Trying first %1 at %2 has been failed, trying other paths").tqarg(Name).tqarg(TryPath_first)).ascii() << std::endl; // std::cout << "searchpath list: " << SearchPathList.join(" ").ascii() << std::endl; // } // std::cout << "searchpath list: " << SearchPathList.join(" ").ascii() << std::endl; - for (QStringList::Iterator it = SearchPathList.begin();it != SearchPathList.end();it++) + for (TQStringList::Iterator it = SearchPathList.begin();it != SearchPathList.end();it++) { - QString TryPath=QString(*it)+"/"+Name; + TQString TryPath=TQString(*it)+"/"+Name; // if (GlobalConfig->KvpncDebugLevel > 2) -// std::cout << QString (i18n("Trying %1 at: %2").arg(Name).arg(TryPath)).ascii() << std::endl; +// std::cout << TQString (i18n("Trying %1 at: %2").tqarg(Name).tqarg(TryPath)).ascii() << std::endl; - if (!TryPath.isEmpty() && QFile (TryPath).exists() && QFileInfo(TryPath).isFile() ) + if (!TryPath.isEmpty() && TQFile (TryPath).exists() && TQFileInfo(TryPath).isFile() ) { // if (GlobalConfig->KvpncDebugLevel > 2) -// std::cout << QString(i18n("%1 found at: %2").arg(Name).arg(TryPath)).ascii() << std::endl; +// std::cout << TQString(i18n("%1 found at: %2").tqarg(Name).tqarg(TryPath)).ascii() << std::endl; found=true; PathToExec=TryPath; break; @@ -107,11 +107,11 @@ bool ToolInfo::collectToolInfo() if ( found) { - CollectToolInfoProcess = new QProcess(this); + CollectToolInfoProcess = new TQProcess(this); CollectToolInfoProcess->clearArguments(); - connect( CollectToolInfoProcess, SIGNAL( readyReadStdout() ), this, SLOT( readStdOutCollectToolInfo() ) ); - connect( CollectToolInfoProcess, SIGNAL( readyReadStderr() ), this, SLOT( readStdErrCollectToolInfo() ) ); - //connect( CollectToolInfoProcess, SIGNAL( processExited () ), this, SLOT(processFinished() ) ); + connect( CollectToolInfoProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutCollectToolInfo() ) ); + connect( CollectToolInfoProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrCollectToolInfo() ) ); + //connect( CollectToolInfoProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT(processFinished() ) ); bool run=true; //FIXME how it could be better? @@ -126,7 +126,7 @@ bool ToolInfo::collectToolInfo() // we need to do some stupid hack... // /usr/sbin/racoon -> /usr/sbin/setkey CollectToolInfoProcess->clearArguments(); - CollectToolInfoProcess->addArgument(QString(PathToExec.left(PathToExec.length()-6)+"setkey")); + CollectToolInfoProcess->addArgument(TQString(PathToExec.left(PathToExec.length()-6)+"setkey")); CollectToolInfoProcess->addArgument("-V"); } else if (Name == "setkey") @@ -197,7 +197,7 @@ bool ToolInfo::collectToolInfo() if ( !PathToExec.isEmpty() && !CollectToolInfoProcess->start(env) ) { - std::cerr << (i18n("Unable to start collectToolInfo process (%1)!").arg(Name)).ascii() << std::endl; + std::cerr << (i18n("Unable to start collectToolInfo process (%1)!").tqarg(Name)).ascii() << std::endl; //delete CollectToolInfoProcess; collectRunning=false; success=false; @@ -215,16 +215,16 @@ bool ToolInfo::collectToolInfo() } } - //KMessageBox::information(0,QString("Name: "+Name+", Path: "+PathToExec+", Version: "+Version),"aaa"); - // disconnect( CollectToolInfoProcess, SIGNAL( readyReadStdout() ), this, SLOT( readStdOutCollectToolInfo() ) ); - // disconnect( CollectToolInfoProcess, SIGNAL( readyReadStderr() ), this, SLOT( readStdErrCollectToolInfo() ) ); + //KMessageBox::information(0,TQString("Name: "+Name+", Path: "+PathToExec+", Version: "+Version),"aaa"); + // disconnect( CollectToolInfoProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutCollectToolInfo() ) ); + // disconnect( CollectToolInfoProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrCollectToolInfo() ) ); // delete CollectToolInfoProcess; success=true; } } - disconnect( CollectToolInfoProcess, SIGNAL( readyReadStdout() ), this, SLOT( readStdOutCollectToolInfo() ) ); - disconnect( CollectToolInfoProcess, SIGNAL( readyReadStderr() ), this, SLOT( readStdErrCollectToolInfo() ) ); + disconnect( CollectToolInfoProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutCollectToolInfo() ) ); + disconnect( CollectToolInfoProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrCollectToolInfo() ) ); delete CollectToolInfoProcess; CollectToolInfoProcess=0L; @@ -237,7 +237,7 @@ bool ToolInfo::collectToolInfo() else { // if (GlobalConfig->KvpncDebugLevel > 2) -// std::cout << QString(i18n("%1 not found.").arg(Name)).ascii() << std::endl; +// std::cout << TQString(i18n("%1 not found.").tqarg(Name)).ascii() << std::endl; } return success; } @@ -248,11 +248,11 @@ void ToolInfo::getOpenvpnCapabilities() if (Name=="openvpn" && !PathToExec.isEmpty()) { - CollectOpenvpnCapabilitiesProcess = new QProcess(this); + CollectOpenvpnCapabilitiesProcess = new TQProcess(this); CollectOpenvpnCapabilitiesProcess->clearArguments(); - connect( CollectOpenvpnCapabilitiesProcess, SIGNAL( readyReadStdout() ), this, SLOT( readStdOutCollectOpenvpnCapabilies() ) ); - connect( CollectOpenvpnCapabilitiesProcess, SIGNAL( readyReadStderr() ), this, SLOT( readStdErrCollectOpenvpnCapabilies() ) ); - connect( CollectOpenvpnCapabilitiesProcess, SIGNAL( processExited () ), this, SLOT(processFinished() ) ); + connect( CollectOpenvpnCapabilitiesProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutCollectOpenvpnCapabilies() ) ); + connect( CollectOpenvpnCapabilitiesProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrCollectOpenvpnCapabilies() ) ); + connect( CollectOpenvpnCapabilitiesProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT(processFinished() ) ); //FIXME how it could be better? CollectOpenvpnCapabilitiesProcess->addArgument(PathToExec); @@ -263,7 +263,7 @@ void ToolInfo::getOpenvpnCapabilities() if ( !PathToExec.isEmpty() && !CollectOpenvpnCapabilitiesProcess->start(env) ) { - std::cerr << i18n("Unable to start collectToolInfo process (%1)!").arg(Name).ascii() << std::endl; + std::cerr << i18n("Unable to start collectToolInfo process (%1)!").tqarg(Name).ascii() << std::endl; //delete CollectToolInfoProcess; collectOpenvpnCapabilitiesRunning=false; @@ -276,37 +276,37 @@ void ToolInfo::getOpenvpnCapabilities() // wait... } - //KMessageBox::information(0,QString("Name: "+Name+", Path: "+PathToExec+", Version: "+Version),"aaa"); - // disconnect( CollectOpenvpnCapabilitiesProcess, SIGNAL( readyReadStdout() ), this, SLOT( readStdOutCollectOpenvpnCapabilies() ) ); - // disconnect( CollectOpenvpnCapabilitiesProcess, SIGNAL( readyReadStderr() ), this, SLOT( readStdErrCollectOpenvpnCapabilies() ) ); + //KMessageBox::information(0,TQString("Name: "+Name+", Path: "+PathToExec+", Version: "+Version),"aaa"); + // disconnect( CollectOpenvpnCapabilitiesProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutCollectOpenvpnCapabilies() ) ); + // disconnect( CollectOpenvpnCapabilitiesProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrCollectOpenvpnCapabilies() ) ); // delete CollectOpenvpnCapabilitiesProcess; } - disconnect( CollectOpenvpnCapabilitiesProcess, SIGNAL( readyReadStdout() ), this, SLOT( readStdOutCollectOpenvpnCapabilies() ) ); - disconnect( CollectOpenvpnCapabilitiesProcess, SIGNAL( readyReadStderr() ), this, SLOT( readStdErrCollectOpenvpnCapabilies() ) ); + disconnect( CollectOpenvpnCapabilitiesProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutCollectOpenvpnCapabilies() ) ); + disconnect( CollectOpenvpnCapabilitiesProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrCollectOpenvpnCapabilies() ) ); //std::cout << "Name: " << Name << ", Path: " << PathToExec << ", Version: " << Version << std::endl; } } -void ToolInfo::addSearchPath(const QString& path ) +void ToolInfo::addSearchPath(const TQString& path ) { // std::cout << "Path added: " << path << std::endl; if (!path.isEmpty()) - SearchPathList.insert(SearchPathList.end(), QString(path)); + SearchPathList.insert(SearchPathList.end(), TQString(path)); else return; } -void ToolInfo::removeSearchPath(const QString& path ) +void ToolInfo::removeSearchPath(const TQString& path ) { // std::cout << "Path removed: " << path << std::endl; if (!path.isEmpty()) - SearchPathList.remove(QString(path)); + SearchPathList.remove(TQString(path)); else return; @@ -321,8 +321,8 @@ void ToolInfo::readStdOutCollectToolInfo () { while (CollectToolInfoProcess->canReadLineStdout()) { - QString msg = QString( CollectToolInfoProcess->readLineStdout() ); - // QString msg = QString( CollectToolInfoProcess->readStdout() ); + TQString msg = TQString( CollectToolInfoProcess->readLineStdout() ); + // TQString msg = TQString( CollectToolInfoProcess->readStdout() ); // std::cout << "Checking for: " << Name.ascii() << std::endl; // std::cout << "stdout collectToolInfo: " << msg.ascii() < /usr/sbin/setkey - CollectToolInfoProcess->addArgument(QString(PathToExec.left(PathToExec.length()-6)+"setkey")); + CollectToolInfoProcess->addArgument(TQString(PathToExec.left(PathToExec.length()-6)+"setkey")); if ( msg.find( "ipsec-tools", 0, FALSE ) > -1 ) { //std::cout << "stdout collectToolInfo: " << msg << std::endl; @@ -514,7 +514,7 @@ void ToolInfo::readStdOutCollectToolInfo () } else { -// KMessageBox::information(0,QString("Name: "+Name+", Path: "+PathToExec+", Version: "+Version+", err: "+msg),"aaa"); +// KMessageBox::information(0,TQString("Name: "+Name+", Path: "+PathToExec+", Version: "+Version+", err: "+msg),"aaa"); } } collectRunning=false; @@ -524,7 +524,7 @@ void ToolInfo::readStdErrCollectToolInfo() { while (CollectToolInfoProcess->canReadLineStderr()) { - QString msg = QString( CollectToolInfoProcess->readLineStderr() ); + TQString msg = TQString( CollectToolInfoProcess->readLineStderr() ); // if (GlobalConfig->KvpncDebugLevel > 2) // { // std::cout << "Checking for: " << Name.ascii() << std::endl; @@ -549,7 +549,7 @@ void ToolInfo::readStdErrCollectToolInfo() } else if (Name == "ifconfig") { - //KMessageBox::information(0,QString("Name: "+Name+", Path: "+PathToExec+", Version: "+Version),"aaa"); + //KMessageBox::information(0,TQString("Name: "+Name+", Path: "+PathToExec+", Version: "+Version),"aaa"); if ( msg.find( "ifconfig", 0, FALSE ) > -1 ) { //std::cout << "stdout collectToolInfo: " << msg << std::endl; @@ -603,7 +603,7 @@ void ToolInfo::readStdErrCollectToolInfo() } else { -// KMessageBox::information(0,QString("Name: "+Name+", Path: "+PathToExec+", Version: "+Version+", err: "+msg),"aaa"); +// KMessageBox::information(0,TQString("Name: "+Name+", Path: "+PathToExec+", Version: "+Version+", err: "+msg),"aaa"); } } } @@ -612,8 +612,8 @@ void ToolInfo::readStdOutCollectOpenvpnCapabilies() { while (CollectOpenvpnCapabilitiesProcess->canReadLineStdout()) { - QString msg = QString( CollectOpenvpnCapabilitiesProcess->readLineStdout() ); - // QString msg = QString( CollectOpenvpnCapabilitiesProcess->readStdout() ); + TQString msg = TQString( CollectOpenvpnCapabilitiesProcess->readLineStdout() ); + // TQString msg = TQString( CollectOpenvpnCapabilitiesProcess->readStdout() ); // std::cout << "stdout collectOpenvpnCapabilities: " << msg.ascii() < -1 ) Capabilities+=i18n("pkcs11 support")+";"; @@ -626,7 +626,7 @@ void ToolInfo::readStdErrCollectOpenvpnCapabilies() { while (CollectOpenvpnCapabilitiesProcess->canReadLineStderr()) { - QString msg = QString( CollectOpenvpnCapabilitiesProcess->readLineStderr() ); + TQString msg = TQString( CollectOpenvpnCapabilitiesProcess->readLineStderr() ); // std::cout << "stderr collectOpenvpnCapabilities: " << msg.ascii() < -#include -#include -#include +#include +#include +#include +#include -class ToolInfo : public QObject +class ToolInfo : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Information about a helper program @@ -36,27 +37,27 @@ public: * @param Name Name of the tool * @return None */ - ToolInfo(const QString &Name); + ToolInfo(const TQString &Name); private: - QProcess *CollectToolInfoProcess; - QProcess *CollectOpenvpnCapabilitiesProcess; - QStringList SearchPathList; + TQProcess *CollectToolInfoProcess; + TQProcess *CollectOpenvpnCapabilitiesProcess; + TQStringList SearchPathList; bool collectRunning; bool collectOpenvpnCapabilitiesRunning; - QStringList *env; + TQStringList *env; public: - QString Name; //< Name of the tool - QString Version; //< Version number of the tool - QString PathToExec; //< Path to executable - QString Capabilities; - QString TryPath_first; //< try that path first before list + TQString Name; //< Name of the tool + TQString Version; //< Version number of the tool + TQString PathToExec; //< Path to executable + TQString Capabilities; + TQString TryPath_first; //< try that path first before list bool collectToolInfo(); //< Collects information of the tool bool programsInPath; bool found; - void addSearchPath(const QString &path); //< Adds a path for searching - void removeSearchPath(const QString &path); //< Removes a path for searching + void addSearchPath(const TQString &path); //< Adds a path for searching + void removeSearchPath(const TQString &path); //< Removes a path for searching void getOpenvpnCapabilities(); diff --git a/src/toolsinfodialog.cpp b/src/toolsinfodialog.cpp index 26e8041..e638238 100644 --- a/src/toolsinfodialog.cpp +++ b/src/toolsinfodialog.cpp @@ -21,48 +21,48 @@ #include "toolsinfodialog.h" #include "listviewtooltip.h" #include -//#include -#include +//#include +#include #include -#include +#include #include #include #include -#include +#include #include "utils.h" //END INCLUDES -ToolsInfoDialog::ToolsInfoDialog(KVpncConfig *GlobalConfig, QWidget *parent, const char *) +ToolsInfoDialog::ToolsInfoDialog(KVpncConfig *GlobalConfig, TQWidget *parent, const char *) :KDialogBase( parent, "Tool_information", true, "", KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ) { main = new ToolsInfoWidgetBase(this); setMainWidget(main); - main->InfoListView->setMinimumSize(main->InfoListView->sizeHint()); + main->InfoListView->setMinimumSize(main->InfoListView->tqsizeHint()); - QPixmap ok_icon = KGlobal::iconLoader()->loadIcon( "button_ok", KIcon::NoGroup, 16 ); - QPixmap wrong_icon = KGlobal::iconLoader()->loadIcon( "button_cancel", KIcon::NoGroup, 16 ); + TQPixmap ok_icon = KGlobal::iconLoader()->loadIcon( "button_ok", KIcon::NoGroup, 16 ); + TQPixmap wrong_icon = KGlobal::iconLoader()->loadIcon( "button_cancel", KIcon::NoGroup, 16 ); ToolInfo *tool=0; main->InfoListView->setSorting(1); - GlobalConfig->appPointer->setOverrideCursor( QCursor(Qt::WaitCursor) ); + GlobalConfig->appPointer->setOverrideCursor( TQCursor(TQt::WaitCursor) ); for ( tool = GlobalConfig->ToolList->first(); tool; tool = GlobalConfig->ToolList->next() ) { // std::cout << "tool: " << tool->Name.ascii() << std::endl; // std::cout << "Version: " << tool->Version << std::endl; // std::cout << "Path: " << tool->PathToExec << std::endl << std::endl; - QString state=""; - QString usability=""; - QString requiredBy=""; - QString comment=""; + TQString state=""; + TQString usability=""; + TQString requiredBy=""; + TQString comment=""; tool->programsInPath = GlobalConfig->programsInPath; // tool->collectToolInfo(); - if (!tool->PathToExec.isEmpty() && QFile (tool->PathToExec).exists() && QFileInfo(tool->PathToExec).isFile() ) + if (!tool->PathToExec.isEmpty() && TQFile (tool->PathToExec).exists() && TQFileInfo(tool->PathToExec).isFile() ) { // state=i18n("Found"); if (tool->Name == "vpnc") @@ -100,25 +100,25 @@ ToolsInfoDialog::ToolsInfoDialog(KVpncConfig *GlobalConfig, QWidget *parent, con else if (tool->Name == "ipsec") { // version is like this: "Openswan U2.4.4/K2.6.15" or "strongSwan U2.4.4/K2.6.15" - QString realversion=tool->Version.section(' ',1,1).section('/',0,0).right(tool->Version.section(' ',1,1).section('/',0,0).length()-1); + TQString realversion=tool->Version.section(' ',1,1).section('/',0,0).right(tool->Version.section(' ',1,1).section('/',0,0).length()-1); int majorversion = realversion.section('.',0,0).toInt(); int minorversion = realversion.section('.',1,1).toInt(); int subminorversion = realversion.section('.',2,2).toInt(); - QString realtype=tool->Version.section(' ',0,0).lower(); + TQString realtype=tool->Version.section(' ',0,0).lower(); if ( tool->Version.contains("Openswan")) { comment="Openswan"; - comment+=", "+i18n("kernel %1 support").arg("2.6"); + comment+=", "+i18n("kernel %1 support").tqarg("2.6"); comment+=", "+i18n("smartcard support"); } else if ( tool->Version.contains("strongSwan")) { comment="strongSwan"; comment+=", "+i18n("no aggressive mode"); - comment+=", "+i18n("kernel %1 support").arg("2.4"); + comment+=", "+i18n("kernel %1 support").tqarg("2.4"); if (!(majorversion <= 2 && minorversion <= 8 && subminorversion <= 1)) - comment+=", "+i18n("kernel %1 support").arg("2.6"); + comment+=", "+i18n("kernel %1 support").tqarg("2.6"); comment+=", "+i18n("smartcard support"); } else @@ -328,13 +328,13 @@ ToolsInfoDialog::ToolsInfoDialog(KVpncConfig *GlobalConfig, QWidget *parent, con } else if (tool->Name == "tail") { -// comment+=", "+i18n("kernel %1 support").arg("2.6"); +// comment+=", "+i18n("kernel %1 support").tqarg("2.6"); } else if (tool->Name == "ssh") { int major=tool->Version.section('.',0,0).toInt(); int minor=tool->Version.section('.',1,1).section('p',0,0).toInt(); -// std::cout << "ssh version: major: " << QString().setNum(major).ascii() << " minor: " << QString().setNum(minor).ascii() << std::endl; +// std::cout << "ssh version: major: " << TQString().setNum(major).ascii() << " minor: " << TQString().setNum(minor).ascii() << std::endl; if ( major > 4 || ( major == 4 && minor >= 3) ) { usability=i18n("full"); @@ -372,8 +372,8 @@ ToolsInfoDialog::ToolsInfoDialog(KVpncConfig *GlobalConfig, QWidget *parent, con } else if (tool->Name == "ipsec") { - QString realversion=tool->Version.section(' ',1,1).section('/',0,0).right(tool->Version.section(' ',1,1).section('/',0,0).length()-1); - QString realtype=tool->Version.section(' ',0,0).lower(); + TQString realversion=tool->Version.section(' ',1,1).section('/',0,0).right(tool->Version.section(' ',1,1).section('/',0,0).length()-1); + TQString realtype=tool->Version.section(' ',0,0).lower(); if ( tool->Version.contains("Openswan")) { @@ -505,7 +505,7 @@ ToolsInfoDialog::ToolsInfoDialog(KVpncConfig *GlobalConfig, QWidget *parent, con - QListViewItem *item = new QListViewItem(main->InfoListView, tool->Name,state, tool->Version, usability,requiredBy , tool->PathToExec, comment); + TQListViewItem *item = new TQListViewItem(main->InfoListView, tool->Name,state, tool->Version, usability,requiredBy , tool->PathToExec, comment); if (tool->found) item->setPixmap(1,ok_icon); else @@ -514,13 +514,13 @@ ToolsInfoDialog::ToolsInfoDialog(KVpncConfig *GlobalConfig, QWidget *parent, con } - QToolTip::remove( main->InfoListView ); + TQToolTip::remove( main->InfoListView ); new ListViewToolTip( main->InfoListView ); this->resize(800,600); - main->InfoListView->resize(main->InfoListView->sizeHint()); - main->resize(main->sizeHint()); - //this->resize(sizeHint()); + main->InfoListView->resize(main->InfoListView->tqsizeHint()); + main->resize(main->tqsizeHint()); + //this->resize(tqsizeHint()); GlobalConfig->appPointer->restoreOverrideCursor(); } diff --git a/src/toolsinfodialog.h b/src/toolsinfodialog.h index 29dd3d5..e3d191e 100644 --- a/src/toolsinfodialog.h +++ b/src/toolsinfodialog.h @@ -21,7 +21,7 @@ #define TOOLSINFODIALOG_H #include "toolsinfowidgetbase.h" -#include +#include #include #include "kvpnc.h" #include "kvpncconfig.h" @@ -29,7 +29,7 @@ class ToolsInfoDialog: public KDialogBase { public: - ToolsInfoDialog(KVpncConfig *GlobalConfig, QWidget *parent = 0, const char *name = 0); + ToolsInfoDialog(KVpncConfig *GlobalConfig, TQWidget *parent = 0, const char *name = 0); ToolsInfoWidgetBase *main; }; diff --git a/src/toolsinfowidgetbase.ui b/src/toolsinfowidgetbase.ui index 218279c..dd2ccf1 100644 --- a/src/toolsinfowidgetbase.ui +++ b/src/toolsinfowidgetbase.ui @@ -1,6 +1,6 @@ ToolsInfoWidgetBase - + ToolsInfoWidgetBase @@ -19,7 +19,7 @@ unnamed - + textLabel1 @@ -116,7 +116,7 @@ 0 - + 600 300 diff --git a/src/utils.cpp b/src/utils.cpp index 144422d..48e58ae 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -19,29 +19,29 @@ ***************************************************************************/ //BEGIN INCLUDES #include "utils.h" -#include -#include +#include +#include #include -#include -#include -#include +#include +#include +#include #include #include -#include +#include #include #include #include #include // name resolving #include -#include +#include #include //END INCLUDES -Utils::Utils( KVpncConfig* config, QObject *parent, const char *name ) - : QObject( parent, name ) +Utils::Utils( KVpncConfig* config, TQObject *parent, const char *name ) + : TQObject( parent, name ) { - env = new QStringList(); + env = new TQStringList(); *env << "LC_ALL=C" << "LANG=C" << "PATH=/bin:/usr/bin:/usr/sbin:/sbin"; this->config = config; retrieveValidNetworkdevice = false; @@ -56,14 +56,14 @@ Utils::~Utils() // delete NetworkDeviceTestProcess; } -bool Utils::isValidIPv4Address( QString Address ) +bool Utils::isValidIPv4Address( TQString Address ) { if ( Address.contains( '.' ) != 3 ) return false; else { //std::cout << "test1 succeed.\n"; - QString addr = Address; + TQString addr = Address; int part0 = addr.section( '.', 0, 0 ).toInt(); int part1 = addr.section( '.', 1, 1 ).toInt(); int part2 = addr.section( '.', 2, 2 ).toInt(); @@ -81,7 +81,7 @@ bool Utils::isValidIPv4Address( QString Address ) } } -bool Utils::isValidIPv4NetworkAddress( QString Address ) +bool Utils::isValidIPv4NetworkAddress( TQString Address ) { if ( isValidIPv4Address ( Address ) ) { @@ -94,7 +94,7 @@ bool Utils::isValidIPv4NetworkAddress( QString Address ) return false; } -bool Utils::isValidIPv4BroadcastAddress( QString Address ) +bool Utils::isValidIPv4BroadcastAddress( TQString Address ) { if ( isValidIPv4Address ( Address ) ) { @@ -108,14 +108,14 @@ bool Utils::isValidIPv4BroadcastAddress( QString Address ) return false; } -bool Utils::isValidIPv4Netmask(QString Netmask) +bool Utils::isValidIPv4Netmask(TQString Netmask) { if ( Netmask.contains( '.' ) != 3 ) return false; else { //std::cout << "test1 succeed.\n"; - QString addr = Netmask; + TQString addr = Netmask; int part0 = addr.section( '.', 0, 0 ).toInt(); int part1 = addr.section( '.', 1, 1 ).toInt(); int part2 = addr.section( '.', 2, 2 ).toInt(); @@ -135,7 +135,7 @@ bool Utils::isValidIPv4Netmask(QString Netmask) bool Utils::tunDevExists() { - if ( QFile ( "/dev/net/tun" ).exists() ) + if ( TQFile ( "/dev/net/tun" ).exists() ) return true; else return false; @@ -143,12 +143,12 @@ bool Utils::tunDevExists() bool Utils::createTunDev() { - createProcess = new QProcess( this ); - connect( createProcess, SIGNAL( readyReadStdout() ), this, SLOT( readStdOutCreateTunDev() ) ); - connect( createProcess, SIGNAL( readyReadStderr() ), this, SLOT( readStdErrCreateTunDev() ) ); + createProcess = new TQProcess( this ); + connect( createProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutCreateTunDev() ) ); + connect( createProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrCreateTunDev() ) ); // step one: create directory - if ( !QDir ( "/dev/net" ).exists() ) + if ( !TQDir ( "/dev/net" ).exists() ) { createProcess->addArgument("mkdir") ; //createProcess->addArgument("-p"); @@ -156,8 +156,8 @@ bool Utils::createTunDev() if ( !createProcess->start(env) ) { - disconnect( createProcess, SIGNAL( readyReadStdout() ), this, SLOT( readStdOutCreateTunDev() ) ); - disconnect( createProcess, SIGNAL( readyReadStderr() ), this, SLOT( readStdErrCreateTunDev() ) ); + disconnect( createProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutCreateTunDev() ) ); + disconnect( createProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrCreateTunDev() ) ); delete createProcess; createProcess=0L; kdError() << "Unable to create tunnel device file!" << endl; @@ -181,8 +181,8 @@ bool Utils::createTunDev() if ( !createProcess->start(env) ) { - disconnect( createProcess, SIGNAL( readyReadStdout() ), this, SLOT( readStdOutCreateTunDev() ) ); - disconnect( createProcess, SIGNAL( readyReadStderr() ), this, SLOT( readStdErrCreateTunDev() ) ); + disconnect( createProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutCreateTunDev() ) ); + disconnect( createProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrCreateTunDev() ) ); delete createProcess; createProcess = 0L; kdError() << "Unable to create tunnel device file!" << endl; @@ -194,8 +194,8 @@ bool Utils::createTunDev() { sleep ( 1 ); } - disconnect( createProcess, SIGNAL( readyReadStdout() ), this, SLOT( readStdOutCreateTunDev() ) ); - disconnect( createProcess, SIGNAL( readyReadStderr() ), this, SLOT( readStdErrCreateTunDev() ) ); + disconnect( createProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutCreateTunDev() ) ); + disconnect( createProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrCreateTunDev() ) ); delete createProcess; createProcess = 0L; return true; @@ -203,20 +203,20 @@ bool Utils::createTunDev() return false; } -bool Utils::loadKernelModule( QString Name, QApplication *app ) +bool Utils::loadKernelModule( TQString Name, TQApplication *app ) { if ( !Name.isEmpty() ) { modprobeSuccess = true; - ModprobeProcess = new QProcess( this ); + ModprobeProcess = new TQProcess( this ); ModprobeProcess->addArgument( "/sbin/modprobe" ); ModprobeProcess->addArgument( Name ); - connect( ModprobeProcess, SIGNAL( readyReadStdout() ), this, SLOT( readStdOutLoadKernelModule() ) ); - connect( ModprobeProcess, SIGNAL( readyReadStderr() ), this, SLOT( readStdErrLoadKernelModule() ) ); + connect( ModprobeProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutLoadKernelModule() ) ); + connect( ModprobeProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrLoadKernelModule() ) ); if ( !ModprobeProcess->start( env ) ) { - disconnect( ModprobeProcess, SIGNAL( readyReadStdout() ), this, SLOT( readStdOutLoadKernelModule() ) ); - disconnect( ModprobeProcess, SIGNAL( readyReadStderr() ), this, SLOT( readStdErrLoadKernelModule() ) ); + disconnect( ModprobeProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutLoadKernelModule() ) ); + disconnect( ModprobeProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrLoadKernelModule() ) ); delete ModprobeProcess; ModprobeProcess = 0L; return modprobeSuccess; @@ -231,8 +231,8 @@ bool Utils::loadKernelModule( QString Name, QApplication *app ) config->appPointer->processEvents(); usleep(250); } - disconnect( ModprobeProcess, SIGNAL( readyReadStdout() ), this, SLOT( readStdOutLoadKernelModule() ) ); - disconnect( ModprobeProcess, SIGNAL( readyReadStderr() ), this, SLOT( readStdErrLoadKernelModule() ) ); + disconnect( ModprobeProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutLoadKernelModule() ) ); + disconnect( ModprobeProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrLoadKernelModule() ) ); delete ModprobeProcess; ModprobeProcess = 0L; return modprobeSuccess; @@ -243,12 +243,12 @@ bool Utils::loadKernelModule( QString Name, QApplication *app ) return false; } -bool Utils::unloadKernelModule( QString Name, QApplication *app , bool force) +bool Utils::unloadKernelModule( TQString Name, TQApplication *app , bool force) { if ( !Name.isEmpty() ) { modprobeSuccess = true; - ModprobeProcess = new QProcess( this ); + ModprobeProcess = new TQProcess( this ); ModprobeProcess->addArgument( "/sbin/rmmod" ); if (force == true) @@ -256,11 +256,11 @@ bool Utils::unloadKernelModule( QString Name, QApplication *app , bool force) ModprobeProcess->addArgument( Name ); - connect( ModprobeProcess, SIGNAL( readyReadStdout() ), this, SLOT( readStdOutLoadKernelModule() ) ); - connect( ModprobeProcess, SIGNAL( readyReadStderr() ), this, SLOT( readStdErrLoadKernelModule() ) ); + connect( ModprobeProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutLoadKernelModule() ) ); + connect( ModprobeProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrLoadKernelModule() ) ); if ( !ModprobeProcess->start( env ) ) { - disconnect( ModprobeProcess, SIGNAL( readyReadStdout() ), this, SLOT( readStdOutLoadKernelModule() ) ); - disconnect( ModprobeProcess, SIGNAL( readyReadStderr() ), this, SLOT( readStdErrLoadKernelModule() ) ); + disconnect( ModprobeProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutLoadKernelModule() ) ); + disconnect( ModprobeProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrLoadKernelModule() ) ); delete ModprobeProcess; ModprobeProcess = 0L; return modprobeSuccess; @@ -275,8 +275,8 @@ bool Utils::unloadKernelModule( QString Name, QApplication *app , bool force) config->appPointer->processEvents(); usleep(250); } - disconnect( ModprobeProcess, SIGNAL( readyReadStdout() ), this, SLOT( readStdOutLoadKernelModule() ) ); - disconnect( ModprobeProcess, SIGNAL( readyReadStderr() ), this, SLOT( readStdErrLoadKernelModule() ) ); + disconnect( ModprobeProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutLoadKernelModule() ) ); + disconnect( ModprobeProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrLoadKernelModule() ) ); delete ModprobeProcess; ModprobeProcess = 0L; return modprobeSuccess; @@ -287,9 +287,9 @@ bool Utils::unloadKernelModule( QString Name, QApplication *app , bool force) return false; } -bool Utils::doChmod( QString file, QString mode ) +bool Utils::doChmod( TQString file, TQString mode ) { - config->appendLogEntry ( i18n( "\"%1\" begin." ).arg("chmod"),config->info ); + config->appendLogEntry ( i18n( "\"%1\" begin." ).tqarg("chmod"),config->info ); KProcess *chmodProcess = new KProcess; *chmodProcess << "/bin/chmod"; *chmodProcess << mode; @@ -297,27 +297,27 @@ bool Utils::doChmod( QString file, QString mode ) if ( !chmodProcess->start() ) { - // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "PppdUpScript" ) ); - config->appendLogEntry( i18n( "Chmod of %1 failed!" ).arg( file ), config->error ); + // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( "PppdUpScript" ) ); + config->appendLogEntry( i18n( "Chmod of %1 failed!" ).tqarg( file ), config->error ); delete chmodProcess; return false; } else { if ( config->KvpncDebugLevel > 0 ) - config->appendLogEntry ( i18n( "chmod of %1 (%2) started." ).arg( file ).arg( mode ) , config->debug ); + config->appendLogEntry ( i18n( "chmod of %1 (%2) started." ).tqarg( file ).tqarg( mode ) , config->debug ); int max_count = 9; int count=0; while ( count < max_count && chmodProcess->isRunning() ) { if ( config->KvpncDebugLevel > 6 ) - config->appendLogEntry ( i18n( "chmod of %1 (%2) running." ).arg( file ).arg( mode ) , config->debug ); + config->appendLogEntry ( i18n( "chmod of %1 (%2) running." ).tqarg( file ).tqarg( mode ) , config->debug ); usleep ( 250 ); if ( config->appPointer->hasPendingEvents () ) config->appPointer->processEvents(); count++; } - config->appendLogEntry ( i18n( "\"%1\" finished." ).arg("chmod"),config->info ); + config->appendLogEntry ( i18n( "\"%1\" finished." ).tqarg("chmod"),config->info ); delete chmodProcess; return true; } @@ -326,19 +326,19 @@ bool Utils::doChmod( QString file, QString mode ) bool Utils::resolvConfAvailable() { bool resolvConfAvailable=false; - if (QFile("/sbin/resolvconf").exists() && QFile("/etc/init.d/resolvconf").exists()) + if (TQFile("/sbin/resolvconf").exists() && TQFile("/etc/init.d/resolvconf").exists()) resolvConfAvailable=true; else resolvConfAvailable=false; return resolvConfAvailable; } -QPtrList* Utils::getToolList() +TQPtrList* Utils::getToolList() { - QPtrList *ToolList = new QPtrList(); + TQPtrList *ToolList = new TQPtrList(); //TODO move to KVpncConfig - QStringList *ToolNamesList = new QStringList(); + TQStringList *ToolNamesList = new TQStringList(); ToolNamesList->append( "vpnc" ); ToolNamesList->append( "vpnclient" ); ToolNamesList->append( "racoon" ); @@ -371,7 +371,7 @@ QPtrList* Utils::getToolList() ToolNamesList->append( "netstat" ); ToolInfo *currentTool; - for ( QStringList::Iterator it = ToolNamesList->begin(); it != ToolNamesList->end(); it++ ) { + for ( TQStringList::Iterator it = ToolNamesList->begin(); it != ToolNamesList->end(); it++ ) { //std::cout << "tool: " << *it << std::endl; currentTool = new ToolInfo( *it ); @@ -447,7 +447,7 @@ QPtrList* Utils::getToolList() } -ToolInfo* Utils::getToolInfo( QString name ) +ToolInfo* Utils::getToolInfo( TQString name ) { ToolInfo * Tool = 0; for ( Tool = config->ToolList->first();Tool;Tool = config->ToolList->next() ) @@ -458,7 +458,7 @@ ToolInfo* Utils::getToolInfo( QString name ) return Tool; } -QString Utils::resolveName( QString Name ) +TQString Utils::resolveName( TQString Name ) { resolvedIP = ""; resolveFinished = false; @@ -471,56 +471,56 @@ QString Utils::resolveName( QString Name ) std::cout << "gethostbyname failed" << std::endl; } else - resolvedIP = QString( inet_ntoa( *( struct in_addr* ) server_entry->h_addr_list[ 0 ] ) ); + resolvedIP = TQString( inet_ntoa( *( struct in_addr* ) server_entry->h_addr_list[ 0 ] ) ); return resolvedIP; } -QString Utils::removeSpecialCharsForFilename( QString filename ) +TQString Utils::removeSpecialCharsForFilename( TQString filename ) { - filename.replace( QRegExp( "[*]+" ), "_" ); - filename.replace( QRegExp( "[+] +" ), "_" ); - filename.replace( QRegExp( "[$]+" ), "_" ); - filename.replace( QRegExp( ":+" ), "_" ); - filename.replace( QRegExp( "ￜ" ), "_" ); - filename.replace( QRegExp( "ￜ" ), "_" ); - filename.replace( QRegExp( "+" ), "_" ); - filename.replace( QRegExp( "ￜ" ), "_" ); - filename.replace( QRegExp( "ￜ" ), "_" ); - filename.replace( QRegExp( "ￜ" ), "_" ); - filename.replace( QRegExp( "ￜ" ), "_" ); + filename.replace( TQRegExp( "[*]+" ), "_" ); + filename.replace( TQRegExp( "[+] +" ), "_" ); + filename.replace( TQRegExp( "[$]+" ), "_" ); + filename.replace( TQRegExp( ":+" ), "_" ); + filename.replace( TQRegExp( "ￜ" ), "_" ); + filename.replace( TQRegExp( "ￜ" ), "_" ); + filename.replace( TQRegExp( "+" ), "_" ); + filename.replace( TQRegExp( "ￜ" ), "_" ); + filename.replace( TQRegExp( "ￜ" ), "_" ); + filename.replace( TQRegExp( "ￜ" ), "_" ); + filename.replace( TQRegExp( "ￜ" ), "_" ); filename.replace( "\\" , "_" ); filename.replace( "/" , "_" ); - filename.replace( QRegExp( ";+" ), "_" ); - filename.replace( QRegExp( " " ), "_" ); - filename.replace( QRegExp( "_+" ), "_" ); + filename.replace( TQRegExp( ";+" ), "_" ); + filename.replace( TQRegExp( " " ), "_" ); + filename.replace( TQRegExp( "_+" ), "_" ); filename.replace( ")" , "_" ); filename.replace( "(" , "_" ); filename.replace( " " , "_" ); return filename; } -QStringList Utils::getOpenvpnCiphers() +TQStringList Utils::getOpenvpnCiphers() { OpenvpnCiphers.clear(); retrieveOpenvpnCiphers = false; ToolInfo *OpenvpnInfo = getToolInfo ( "openvpn" ); - QString pathToOpenvpn = OpenvpnInfo->PathToExec; + TQString pathToOpenvpn = OpenvpnInfo->PathToExec; if ( pathToOpenvpn.isEmpty() ) return OpenvpnCiphers; - OpenvpnCiphersProcess = new QProcess( this ); + OpenvpnCiphersProcess = new TQProcess( this ); OpenvpnCiphersProcess->addArgument( pathToOpenvpn ); OpenvpnCiphersProcess->addArgument( "--show-ciphers" ); - connect( OpenvpnCiphersProcess, SIGNAL( readyReadStdout() ), this, SLOT( readStdOutRetriveOpenvpnCiphers() ) ); - connect( OpenvpnCiphersProcess, SIGNAL( readyReadStderr() ), this, SLOT( readStdErrRetriveOpenvpnCiphers() ) ); + connect( OpenvpnCiphersProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutRetriveOpenvpnCiphers() ) ); + connect( OpenvpnCiphersProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrRetriveOpenvpnCiphers() ) ); if ( !OpenvpnCiphersProcess->start( env ) ) { - disconnect( OpenvpnCiphersProcess, SIGNAL( readyReadStdout() ), this, SLOT( readStdOutRetriveOpenvpnCiphers() ) ); - disconnect( OpenvpnCiphersProcess, SIGNAL( readyReadStderr() ), this, SLOT( readStdErrRetriveOpenvpnCiphers() ) ); + disconnect( OpenvpnCiphersProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutRetriveOpenvpnCiphers() ) ); + disconnect( OpenvpnCiphersProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrRetriveOpenvpnCiphers() ) ); delete OpenvpnCiphersProcess; OpenvpnCiphersProcess=0L; kdError() << "Unable to fetch openvpn ciphers!" << endl; @@ -533,8 +533,8 @@ QStringList Utils::getOpenvpnCiphers() config->appPointer->processEvents(); sleep ( 1 ); } - disconnect( OpenvpnCiphersProcess, SIGNAL( readyReadStdout() ), this, SLOT( readStdOutRetriveOpenvpnCiphers() ) ); - disconnect( OpenvpnCiphersProcess, SIGNAL( readyReadStderr() ), this, SLOT( readStdErrRetriveOpenvpnCiphers() ) ); + disconnect( OpenvpnCiphersProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutRetriveOpenvpnCiphers() ) ); + disconnect( OpenvpnCiphersProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrRetriveOpenvpnCiphers() ) ); delete OpenvpnCiphersProcess; OpenvpnCiphersProcess=0L; } @@ -555,22 +555,22 @@ Utils::IpsecAlgos Utils::getIpsecAlgos() retrieveIpsecAlgos = false; ToolInfo *IpsecInfo = getToolInfo ( "ipsec" ); - QString pathToIpsec = IpsecInfo->PathToExec; + TQString pathToIpsec = IpsecInfo->PathToExec; if ( pathToIpsec.isEmpty() ) return salgos; - IpsecAlgosProcess = new QProcess( this ); + IpsecAlgosProcess = new TQProcess( this ); IpsecAlgosProcess->addArgument( pathToIpsec); IpsecAlgosProcess->addArgument( "auto" ); IpsecAlgosProcess->addArgument( "--status" ); - connect( IpsecAlgosProcess, SIGNAL( readyReadStdout() ), this, SLOT( readStdOutRetriveIpsecAlgos() ) ); - connect( IpsecAlgosProcess, SIGNAL( readyReadStderr() ), this, SLOT( readStdErrRetriveIpsecAlgos() ) ); + connect( IpsecAlgosProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutRetriveIpsecAlgos() ) ); + connect( IpsecAlgosProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrRetriveIpsecAlgos() ) ); if ( !IpsecAlgosProcess->start( env ) ) { - disconnect( IpsecAlgosProcess, SIGNAL( readyReadStdout() ), this, SLOT( readStdOutRetriveIpsecAlgos() ) ); - disconnect( IpsecAlgosProcess, SIGNAL( readyReadStderr() ), this, SLOT( readStdErrRetriveIpsecAlgos() ) ); + disconnect( IpsecAlgosProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutRetriveIpsecAlgos() ) ); + disconnect( IpsecAlgosProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrRetriveIpsecAlgos() ) ); delete IpsecAlgosProcess; IpsecAlgosProcess=0L; kdError() << "Unable to fetch ipsec algos!" << endl; @@ -583,8 +583,8 @@ Utils::IpsecAlgos Utils::getIpsecAlgos() config->appPointer->processEvents(); sleep ( 1 ); } - disconnect( IpsecAlgosProcess, SIGNAL( readyReadStdout() ), this, SLOT( readStdOutRetriveIpsecAlgos() ) ); - disconnect( IpsecAlgosProcess, SIGNAL( readyReadStderr() ), this, SLOT( readStdErrRetriveIpsecAlgos() ) ); + disconnect( IpsecAlgosProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutRetriveIpsecAlgos() ) ); + disconnect( IpsecAlgosProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrRetriveIpsecAlgos() ) ); delete IpsecAlgosProcess; IpsecAlgosProcess=0L; } @@ -735,16 +735,16 @@ Utils::PppdCapabilities Utils::checkPppdCapabilities() testOldPppdStyle = false; testPppdRequireMppe=true; testPppdMppeRequired=false; - TestPppdProcess = new QProcess ( this ); + TestPppdProcess = new TQProcess ( this ); TestPppdProcess->addArgument ( config->pathToPppd ); TestPppdProcess->addArgument ( "/dev/null" ); TestPppdProcess->addArgument ( "require-mppe" ); - TestPppdProcess->setCommunication ( QProcess::Stdin | QProcess::Stdout | QProcess::Stderr | QProcess::DupStderr ); + TestPppdProcess->setCommunication ( TQProcess::Stdin | TQProcess::Stdout | TQProcess::Stderr | TQProcess::DupStderr ); TestPppdProcess->closeStdin (); - connect ( TestPppdProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readPppdtestProcessOutput() ) ); -// connect ( TestPppdProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readPppdtestProcessOutput() ) ); + connect ( TestPppdProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readPppdtestProcessOutput() ) ); +// connect ( TestPppdProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readPppdtestProcessOutput() ) ); if ( !TestPppdProcess->start ( env ) ) { @@ -772,8 +772,8 @@ Utils::PppdCapabilities Utils::checkPppdCapabilities() config->appendLogEntry ( "pppdHasRequireMppeSupport: false", config->debug ); } - disconnect ( TestPppdProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readPppdtestProcessOutput() ) ); -// disconnect ( TestPppdProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readPppdtestProcessOutput() ) ); + disconnect ( TestPppdProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readPppdtestProcessOutput() ) ); +// disconnect ( TestPppdProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readPppdtestProcessOutput() ) ); delete TestPppdProcess; TestPppdProcess=0L; @@ -781,17 +781,17 @@ Utils::PppdCapabilities Utils::checkPppdCapabilities() testPppdMppeRequired=true; - TestPppdProcess = new QProcess ( this ); + TestPppdProcess = new TQProcess ( this ); TestPppdProcess->addArgument ( config->pathToPppd ); TestPppdProcess->addArgument ( "/dev/null" ); TestPppdProcess->addArgument ( "mppe"); TestPppdProcess->addArgument ( "required" ); - TestPppdProcess->setCommunication ( QProcess::Stdin | QProcess::Stdout | QProcess::Stderr | QProcess::DupStderr ); + TestPppdProcess->setCommunication ( TQProcess::Stdin | TQProcess::Stdout | TQProcess::Stderr | TQProcess::DupStderr ); TestPppdProcess->closeStdin (); - connect ( TestPppdProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readPppdtestProcessOutput() ) ); -// connect ( TestPppdProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readPppdtestProcessOutput() ) ); + connect ( TestPppdProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readPppdtestProcessOutput() ) ); +// connect ( TestPppdProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readPppdtestProcessOutput() ) ); if ( !TestPppdProcess->start ( env ) ) { @@ -826,8 +826,8 @@ Utils::PppdCapabilities Utils::checkPppdCapabilities() config->appendLogEntry ( "PppdMppeRequired: false", config->debug ); } - disconnect ( TestPppdProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readPppdtestProcessOutput() ) ); -// disconnect ( TestPppdProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readPppdtestProcessOutput() ) ); + disconnect ( TestPppdProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readPppdtestProcessOutput() ) ); +// disconnect ( TestPppdProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readPppdtestProcessOutput() ) ); delete TestPppdProcess; testPppdMppeRequired=false; @@ -852,14 +852,14 @@ Utils::PppdCapabilities Utils::checkPppdCapabilities() //unrecognized option 'replacedefaultroute' // test defaultroute support of pppd testPppdReplacedefaultroute = false; - TestPppdProcess = new QProcess ( this ); + TestPppdProcess = new TQProcess ( this ); TestPppdProcess->addArgument ( config->pathToPppd ); TestPppdProcess->addArgument ( "replacedefaultroute" ); - TestPppdProcess->setCommunication ( QProcess::Stdin | QProcess::Stdout | QProcess::Stderr | QProcess::DupStderr ); + TestPppdProcess->setCommunication ( TQProcess::Stdin | TQProcess::Stdout | TQProcess::Stderr | TQProcess::DupStderr ); TestPppdProcess->closeStdin (); - connect ( TestPppdProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readPppdtestProcessOutput() ) ); - connect ( TestPppdProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readPppdtestProcessOutput() ) ); + connect ( TestPppdProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readPppdtestProcessOutput() ) ); + connect ( TestPppdProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readPppdtestProcessOutput() ) ); if ( !TestPppdProcess->start ( env ) ) @@ -887,15 +887,15 @@ Utils::PppdCapabilities Utils::checkPppdCapabilities() config->appendLogEntry ( i18n ( "Test support of replacedefaultroute pppd: %1" ).arg ( i18n ( "failed" ) ) , config->debug ); } } - disconnect ( TestPppdProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readPppdtestProcessOutput() ) ); - disconnect ( TestPppdProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readPppdtestProcessOutput() ) ); + disconnect ( TestPppdProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readPppdtestProcessOutput() ) ); + disconnect ( TestPppdProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readPppdtestProcessOutput() ) ); delete TestPppdProcess; TestPppdProcess=0L; return pppdcap; } -QStringList Utils::getOpenvpnDigests() +TQStringList Utils::getOpenvpnDigests() { OpenvpnDigests.clear(); retrieveOpenvpnDigests = false; @@ -903,21 +903,21 @@ QStringList Utils::getOpenvpnDigests() OpenvpnDigestString=""; ToolInfo *OpenvpnInfo = getToolInfo ( "openvpn" ); - QString pathToOpenvpn = OpenvpnInfo->PathToExec; + TQString pathToOpenvpn = OpenvpnInfo->PathToExec; if ( pathToOpenvpn.isEmpty() ) return OpenvpnDigests; - OpenvpnDigestProcess = new QProcess( this ); + OpenvpnDigestProcess = new TQProcess( this ); OpenvpnDigestProcess->addArgument( pathToOpenvpn ); OpenvpnDigestProcess->addArgument( "--show-digests" ); - connect( OpenvpnDigestProcess, SIGNAL( readyReadStdout() ), this, SLOT( readStdOutRetriveOpenvpnDigests() ) ); - connect( OpenvpnDigestProcess, SIGNAL( readyReadStderr() ), this, SLOT( readStdErrRetriveOpenvpnDigests() ) ); + connect( OpenvpnDigestProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutRetriveOpenvpnDigests() ) ); + connect( OpenvpnDigestProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrRetriveOpenvpnDigests() ) ); if ( !OpenvpnDigestProcess->start( env ) ) { - disconnect( OpenvpnDigestProcess, SIGNAL( readyReadStdout() ), this, SLOT( readStdOutRetriveOpenvpnDigests() ) ); - disconnect( OpenvpnDigestProcess, SIGNAL( readyReadStderr() ), this, SLOT( readStdErrRetriveOpenvpnDigests() ) ); + disconnect( OpenvpnDigestProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutRetriveOpenvpnDigests() ) ); + disconnect( OpenvpnDigestProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrRetriveOpenvpnDigests() ) ); delete OpenvpnDigestProcess; OpenvpnDigestProcess=0L; kdError() << "Unable to fetch openvpn digests!" << endl; @@ -932,14 +932,14 @@ QStringList Utils::getOpenvpnDigests() } - OpenvpnDigests = QStringList().split("#",OpenvpnDigestString); + OpenvpnDigests = TQStringList().split("#",OpenvpnDigestString); - for ( QStringList::Iterator it = OpenvpnDigests.begin(); it != OpenvpnDigests.end(); ++it ) - *it = QString(*it).section(' ',0,0); + for ( TQStringList::Iterator it = OpenvpnDigests.begin(); it != OpenvpnDigests.end(); ++it ) + *it = TQString(*it).section(' ',0,0); } - disconnect( OpenvpnDigestProcess, SIGNAL( readyReadStdout() ), this, SLOT( readStdOutRetriveOpenvpnDigests() ) ); - disconnect( OpenvpnDigestProcess, SIGNAL( readyReadStderr() ), this, SLOT( readStdErrRetriveOpenvpnDigests() ) ); + disconnect( OpenvpnDigestProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutRetriveOpenvpnDigests() ) ); + disconnect( OpenvpnDigestProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrRetriveOpenvpnDigests() ) ); delete OpenvpnDigestProcess; OpenvpnDigestProcess=0L; return OpenvpnDigests; @@ -954,14 +954,14 @@ Utils::IpsecAlgos Utils::getKernelCrypto() salgos.IpsecEspEncryptionAlgorithms.clear(); salgos.IpsecEspAuthenticationAlgorithms.clear(); salgos.IpsecCompressionAlgorithms.clear(); - QString IpsecAlgoNameCurrent=""; - QString IpsecAlgoTypeCurrent=""; - QFile cryptoprocfile( "/proc/crypto" ); + TQString IpsecAlgoNameCurrent=""; + TQString IpsecAlgoTypeCurrent=""; + TQFile cryptoprocfile( "/proc/crypto" ); if ( cryptoprocfile.open( IO_ReadOnly ) ) { - QTextStream stream( &cryptoprocfile ); - QString line; + TQTextStream stream( &cryptoprocfile ); + TQString line; if (config->KvpncDebugLevel > 4) std::cout << "Kernel crypto list: " << std::endl; while ( !stream.atEnd() ) @@ -1010,12 +1010,12 @@ Utils::IpsecAlgos Utils::getKernelCrypto() } else { - config->appendLogEntry(i18n("%1 cant be opened!").arg("/proc/crypto"),config->error); + config->appendLogEntry(i18n("%1 cant be opened!").tqarg("/proc/crypto"),config->error); } return salgos; } -QString Utils::getNameAndPidOfProgramListen( int port ) +TQString Utils::getNameAndPidOfProgramListen( int port ) { if ( port == 0 ) return ""; @@ -1023,16 +1023,16 @@ QString Utils::getNameAndPidOfProgramListen( int port ) ListenPort = port; retrieveNameAndPidOfProgramListen = false; - NameAndPidOfProgramListenProcess = new QProcess( this ); + NameAndPidOfProgramListenProcess = new TQProcess( this ); NameAndPidOfProgramListenProcess->addArgument( config->pathToNetstat ); NameAndPidOfProgramListenProcess->addArgument( "-ntupl" ); - connect( NameAndPidOfProgramListenProcess, SIGNAL( readyReadStdout() ), this, SLOT( readStdOutGetNameAndPidOfProgramListen() ) ); - connect( NameAndPidOfProgramListenProcess, SIGNAL( readyReadStderr() ), this, SLOT( readStdErrGetNameAndPidOfProgramListen() ) ); + connect( NameAndPidOfProgramListenProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutGetNameAndPidOfProgramListen() ) ); + connect( NameAndPidOfProgramListenProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrGetNameAndPidOfProgramListen() ) ); if ( !NameAndPidOfProgramListenProcess->start( env ) ) { - disconnect( NameAndPidOfProgramListenProcess, SIGNAL( readyReadStdout() ), this, SLOT( readStdOutGetNameAndPidOfProgramListen() ) ); - disconnect( NameAndPidOfProgramListenProcess, SIGNAL( readyReadStderr() ), this, SLOT( readStdErrGetNameAndPidOfProgramListen() ) ); + disconnect( NameAndPidOfProgramListenProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutGetNameAndPidOfProgramListen() ) ); + disconnect( NameAndPidOfProgramListenProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrGetNameAndPidOfProgramListen() ) ); delete NameAndPidOfProgramListenProcess; NameAndPidOfProgramListenProcess=0L; kdError() << "netstat fails!" << endl; @@ -1047,21 +1047,21 @@ QString Utils::getNameAndPidOfProgramListen( int port ) } - disconnect( NameAndPidOfProgramListenProcess, SIGNAL( readyReadStdout() ), this, SLOT( readStdOutGetNameAndPidOfProgramListen() ) ); - disconnect( NameAndPidOfProgramListenProcess, SIGNAL( readyReadStderr() ), this, SLOT( readStdErrGetNameAndPidOfProgramListen() ) ); + disconnect( NameAndPidOfProgramListenProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutGetNameAndPidOfProgramListen() ) ); + disconnect( NameAndPidOfProgramListenProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrGetNameAndPidOfProgramListen() ) ); delete NameAndPidOfProgramListenProcess; NameAndPidOfProgramListenProcess=0L; } return NameAndPidOfProgramListen; } -QString Utils::getEmailAddressOfCert(QString cert) +TQString Utils::getEmailAddressOfCert(TQString cert) { if (cert.isEmpty()) return ""; - GetEmailAddressOfCertProcess = new QProcess ( this ); - GetEmailAddressOfCertProcess->setCommunication( QProcess::Stdin | QProcess::Stdout | QProcess::Stderr | QProcess::DupStderr ); + GetEmailAddressOfCertProcess = new TQProcess ( this ); + GetEmailAddressOfCertProcess->setCommunication( TQProcess::Stdin | TQProcess::Stdout | TQProcess::Stderr | TQProcess::DupStderr ); GetEmailAddressOfCertProcess->addArgument( config->pathToOpenssl ); GetEmailAddressOfCertProcess->addArgument( "x509"); GetEmailAddressOfCertProcess->addArgument( "-noout"); @@ -1069,10 +1069,10 @@ QString Utils::getEmailAddressOfCert(QString cert) GetEmailAddressOfCertProcess->addArgument( cert ); GetEmailAddressOfCertProcess->addArgument( "-subject"); - connect( GetEmailAddressOfCertProcess, SIGNAL( readyReadStdout() ), this, SLOT( readOutGetEmailAddressOfCert() ) ); + connect( GetEmailAddressOfCertProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutGetEmailAddressOfCert() ) ); if ( !GetEmailAddressOfCertProcess->start( env ) ) { - disconnect( GetEmailAddressOfCertProcess, SIGNAL( readyReadStdout() ), this, SLOT( readOutGetEmailAddressOfCert() ) ); + disconnect( GetEmailAddressOfCertProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutGetEmailAddressOfCert() ) ); delete GetEmailAddressOfCertProcess; GetEmailAddressOfCertProcess=0L; kdError() << "GetEmailAddressOfCertProcess" << endl; @@ -1085,7 +1085,7 @@ QString Utils::getEmailAddressOfCert(QString cert) config->appPointer->processEvents(); sleep ( 1 ); } - disconnect( GetEmailAddressOfCertProcess, SIGNAL( readyReadStdout() ), this, SLOT( readOutGetEmailAddressOfCert() ) ); + disconnect( GetEmailAddressOfCertProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutGetEmailAddressOfCert() ) ); delete GetEmailAddressOfCertProcess; GetEmailAddressOfCertProcess=0L; } @@ -1093,7 +1093,7 @@ QString Utils::getEmailAddressOfCert(QString cert) return EmailAddressOfCert; } -QStringList Utils::getSmartcardSlots(QString ProviderLib) +TQStringList Utils::getSmartcardSlots(TQString ProviderLib) { SmartcardSlots.clear(); @@ -1101,7 +1101,7 @@ QStringList Utils::getSmartcardSlots(QString ProviderLib) Pkcs11ToolInfo->collectToolInfo(); // if (Pkcs11ToolInfo == 0) // return SmartcardSlots; - QString pathToPkcs11Tool; + TQString pathToPkcs11Tool; pathToPkcs11Tool = Pkcs11ToolInfo->PathToExec; if ( pathToPkcs11Tool.isEmpty() ) @@ -1117,11 +1117,11 @@ QStringList Utils::getSmartcardSlots(QString ProviderLib) } *GetSmartcardSlotsProcess << "-L" ; - connect( GetSmartcardSlotsProcess, SIGNAL( receivedStdout ( KProcess *, char *, int)), this, SLOT(readOutGetSmartcardSlots())); + connect( GetSmartcardSlotsProcess, TQT_SIGNAL( receivedStdout ( KProcess *, char *, int)), this, TQT_SLOT(readOutGetSmartcardSlots())); if ( !GetSmartcardSlotsProcess->start ( KProcess::NotifyOnExit, KProcess::All ) ) { - disconnect( GetSmartcardSlotsProcess, SIGNAL( receivedStdout ( KProcess *, char *, int)), this, SLOT(readOutGetSmartcardSlots())); + disconnect( GetSmartcardSlotsProcess, TQT_SIGNAL( receivedStdout ( KProcess *, char *, int)), this, TQT_SLOT(readOutGetSmartcardSlots())); delete GetSmartcardSlotsProcess; GetSmartcardCertsFromSlotProcess=0L; config->appendLogEntry(i18n("Unable to fetch smartcard slots via pkcs11-tool!"), config->error); @@ -1137,7 +1137,7 @@ QStringList Utils::getSmartcardSlots(QString ProviderLib) usleep ( 500 ); config->appPointer->processEvents(); } - disconnect( GetSmartcardSlotsProcess, SIGNAL( receivedStdout ( KProcess *, char *, int)), this, SLOT(readOutGetSmartcardSlots())); + disconnect( GetSmartcardSlotsProcess, TQT_SIGNAL( receivedStdout ( KProcess *, char *, int)), this, TQT_SLOT(readOutGetSmartcardSlots())); delete GetSmartcardSlotsProcess; GetSmartcardCertsFromSlotProcess=0L; if (config->KvpncDebugLevel > 5) @@ -1146,7 +1146,7 @@ QStringList Utils::getSmartcardSlots(QString ProviderLib) return SmartcardSlots; } -QStringList Utils::getSmartcardCertsFromSlot(QString slot,QString IdType,QString ProviderLib) +TQStringList Utils::getSmartcardCertsFromSlot(TQString slot,TQString IdType,TQString ProviderLib) { Pkcs11CertFound=false; SmartcardCertsFromSlot.clear(); @@ -1160,14 +1160,14 @@ QStringList Utils::getSmartcardCertsFromSlot(QString slot,QString IdType,QString Pkcs11ToolInfo->collectToolInfo(); // if (Pkcs11ToolInfo == 0) // return SmartcardSlots; - QString pathToPkcs11Tool; + TQString pathToPkcs11Tool; pathToPkcs11Tool = Pkcs11ToolInfo->PathToExec; if ( pathToPkcs11Tool.isEmpty() ) return SmartcardSlots; - GetSmartcardCertsFromSlotProcess = new QProcess( this ); - GetSmartcardCertsFromSlotProcess->setCommunication( QProcess::Stdin | QProcess::Stdout | QProcess::Stderr | QProcess::DupStderr ); + GetSmartcardCertsFromSlotProcess = new TQProcess( this ); + GetSmartcardCertsFromSlotProcess->setCommunication( TQProcess::Stdin | TQProcess::Stdout | TQProcess::Stderr | TQProcess::DupStderr ); GetSmartcardCertsFromSlotProcess->addArgument( pathToPkcs11Tool); if (!ProviderLib.isEmpty()) @@ -1184,10 +1184,10 @@ QStringList Utils::getSmartcardCertsFromSlot(QString slot,QString IdType,QString else GetSmartcardCertsFromSlotProcess->addArgument("0"); - connect( GetSmartcardCertsFromSlotProcess, SIGNAL( readyReadStdout() ), this, SLOT( readOutGetSmartcardCertsFromSlot() ) ); + connect( GetSmartcardCertsFromSlotProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutGetSmartcardCertsFromSlot() ) ); if ( !GetSmartcardCertsFromSlotProcess->start( env ) ) { - disconnect( GetSmartcardCertsFromSlotProcess, SIGNAL( readyReadStdout() ), this, SLOT( readOutGetSmartcardCertsFromSlot() ) ); + disconnect( GetSmartcardCertsFromSlotProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutGetSmartcardCertsFromSlot() ) ); delete GetSmartcardCertsFromSlotProcess; GetSmartcardCertsFromSlotProcess=0L; kdError() << "Unable to fetch smartcard slots via pkcs11-tool!" << endl; @@ -1201,7 +1201,7 @@ QStringList Utils::getSmartcardCertsFromSlot(QString slot,QString IdType,QString usleep ( 500 ); config->appPointer->processEvents(); } - disconnect( GetSmartcardCertsFromSlotProcess, SIGNAL( readyReadStdout() ), this, SLOT( readOutGetSmartcardCertsFromSlot() ) ); + disconnect( GetSmartcardCertsFromSlotProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutGetSmartcardCertsFromSlot() ) ); delete GetSmartcardCertsFromSlotProcess; GetSmartcardCertsFromSlotProcess=0L; } @@ -1209,14 +1209,14 @@ QStringList Utils::getSmartcardCertsFromSlot(QString slot,QString IdType,QString return SmartcardCertsFromSlot; } -QStringList Utils::getCertsFromCiscoCertStore(QString type) +TQStringList Utils::getCertsFromCiscoCertStore(TQString type) { if (type != "user" && type != "ca" && type != "enrollment") type="user"; if (config->KvpncDebugLevel > 2) - config->appendLogEntry("getCertsFromCiscoCertStore: "+i18n("type: %1").arg(type),config->debug ); + config->appendLogEntry("getCertsFromCiscoCertStore: "+i18n("type: %1").tqarg(type),config->debug ); CertsFromCiscoCertStore.clear(); CertsFromCiscoCertPos=0; @@ -1224,8 +1224,8 @@ QStringList Utils::getCertsFromCiscoCertStore(QString type) if ( config->pathToCiscoCertMgr.isEmpty() ) return CertsFromCiscoCertStore; - GetCertsFromCiscoCertStoreProcess = new QProcess( this ); - GetCertsFromCiscoCertStoreProcess->setCommunication( QProcess::Stdin | QProcess::Stdout | QProcess::Stderr | QProcess::DupStderr ); + GetCertsFromCiscoCertStoreProcess = new TQProcess( this ); + GetCertsFromCiscoCertStoreProcess->setCommunication( TQProcess::Stdin | TQProcess::Stdout | TQProcess::Stderr | TQProcess::DupStderr ); GetCertsFromCiscoCertStoreProcess->addArgument( config->pathToCiscoCertMgr ); if (type == "user") @@ -1240,11 +1240,11 @@ QStringList Utils::getCertsFromCiscoCertStore(QString type) GetCertsFromCiscoCertStoreProcess->addArgument( "list"); - connect( GetCertsFromCiscoCertStoreProcess, SIGNAL( readyReadStdout() ), this, SLOT( readOutGetCertsFromCiscoCertStoreSlot() ) ); + connect( GetCertsFromCiscoCertStoreProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutGetCertsFromCiscoCertStoreSlot() ) ); if ( !GetCertsFromCiscoCertStoreProcess->start( env ) ) { - disconnect( GetCertsFromCiscoCertStoreProcess, SIGNAL( readyReadStdout() ), this, SLOT( readOutGetCertsFromCiscoCertStoreSlot() ) ); + disconnect( GetCertsFromCiscoCertStoreProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutGetCertsFromCiscoCertStoreSlot() ) ); delete GetCertsFromCiscoCertStoreProcess; GetCertsFromCiscoCertStoreProcess=0L; kdError() << "Unable to fetch certificates via cisco_cert_mgr!" << endl; @@ -1259,7 +1259,7 @@ QStringList Utils::getCertsFromCiscoCertStore(QString type) if ( config->appPointer->hasPendingEvents () ) config->appPointer->processEvents(); } - disconnect( GetCertsFromCiscoCertStoreProcess, SIGNAL( readyReadStdout() ), this, SLOT( readOutGetCertsFromCiscoCertStoreSlot() ) ); + disconnect( GetCertsFromCiscoCertStoreProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutGetCertsFromCiscoCertStoreSlot() ) ); delete GetCertsFromCiscoCertStoreProcess; GetCertsFromCiscoCertStoreProcess=0L; } @@ -1267,12 +1267,12 @@ QStringList Utils::getCertsFromCiscoCertStore(QString type) return CertsFromCiscoCertStore; } -QStringList Utils::getOpenvpnPkcs11Ids(QString ProviderLib) +TQStringList Utils::getOpenvpnPkcs11Ids(TQString ProviderLib) { Pkcs11CertFound=false; OpenvpnPkcs11Ids.clear(); - OpenvpnPkcs11IdsProcess = new QProcess( this ); - OpenvpnPkcs11IdsProcess->setCommunication( QProcess::Stdin | QProcess::Stdout | QProcess::Stderr | QProcess::DupStderr ); + OpenvpnPkcs11IdsProcess = new TQProcess( this ); + OpenvpnPkcs11IdsProcess->setCommunication( TQProcess::Stdin | TQProcess::Stdout | TQProcess::Stderr | TQProcess::DupStderr ); //openvpn --show-pkcs11-ids /usr/lib/opensc-pkcs11.so OpenvpnPkcs11IdsProcess->addArgument(config->pathToOpenvpn); OpenvpnPkcs11IdsProcess->addArgument("--show-pkcs11-ids"); @@ -1280,10 +1280,10 @@ QStringList Utils::getOpenvpnPkcs11Ids(QString ProviderLib) OpenvpnPkcs11IdsProcess->addArgument( ProviderLib ); - connect( OpenvpnPkcs11IdsProcess, SIGNAL( readyReadStdout() ), this, SLOT( readOutGetOpenvpnPkcs11Ids() ) ); + connect( OpenvpnPkcs11IdsProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutGetOpenvpnPkcs11Ids() ) ); if ( !OpenvpnPkcs11IdsProcess->start( env ) ) { - disconnect( OpenvpnPkcs11IdsProcess, SIGNAL( readyReadStdout() ), this, SLOT( readOutGetOpenvpnPkcs11Ids() ) ); + disconnect( OpenvpnPkcs11IdsProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutGetOpenvpnPkcs11Ids() ) ); delete OpenvpnPkcs11IdsProcess; OpenvpnPkcs11IdsProcess=0L; kdError() << "Unable to fetch pkcs11 ids via openvpn!" << endl; @@ -1297,7 +1297,7 @@ QStringList Utils::getOpenvpnPkcs11Ids(QString ProviderLib) usleep ( 500 ); config->appPointer->processEvents(); } - disconnect( OpenvpnPkcs11IdsProcess, SIGNAL( readyReadStdout() ), this, SLOT( readOutGetOpenvpnPkcs11Ids() ) ); + disconnect( OpenvpnPkcs11IdsProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutGetOpenvpnPkcs11Ids() ) ); delete OpenvpnPkcs11IdsProcess; OpenvpnPkcs11IdsProcess=0L; } @@ -1305,10 +1305,10 @@ QStringList Utils::getOpenvpnPkcs11Ids(QString ProviderLib) return OpenvpnPkcs11Ids; } -bool Utils::getNeedsPassphrase(QString key) +bool Utils::getNeedsPassphrase(TQString key) { - if (key.isEmpty() || !QFile(key).exists()) + if (key.isEmpty() || !TQFile(key).exists()) return false; needsPassphrase=false; @@ -1318,13 +1318,13 @@ bool Utils::getNeedsPassphrase(QString key) ToolInfo *OpensslToolInfo = getToolInfo ( "openssl" ); OpensslToolInfo->collectToolInfo(); - QString pathToOpenssl = OpensslToolInfo->PathToExec; + TQString pathToOpenssl = OpensslToolInfo->PathToExec; if ( pathToOpenssl.isEmpty() ) return needsPassphrase; - NeedsPassphraseProcess = new QProcess( this ); - NeedsPassphraseProcess->setCommunication( QProcess::Stdin | QProcess::Stdout | QProcess::Stderr | QProcess::DupStderr ); + NeedsPassphraseProcess = new TQProcess( this ); + NeedsPassphraseProcess->setCommunication( TQProcess::Stdin | TQProcess::Stdout | TQProcess::Stderr | TQProcess::DupStderr ); NeedsPassphraseProcess->addArgument( pathToOpenssl); NeedsPassphraseProcess->addArgument("rsa"); NeedsPassphraseProcess->addArgument("-noout"); @@ -1334,10 +1334,10 @@ bool Utils::getNeedsPassphrase(QString key) NeedsPassphraseProcess->addArgument("pass:aaa"); - connect( NeedsPassphraseProcess, SIGNAL( readyReadStdout() ), this, SLOT( readOutNeedsPassphrase() ) ); + connect( NeedsPassphraseProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutNeedsPassphrase() ) ); if ( !NeedsPassphraseProcess->start( env ) ) { - disconnect( NeedsPassphraseProcess, SIGNAL( readyReadStdout() ), this, SLOT( readOutNeedsPassphrase() ) ); + disconnect( NeedsPassphraseProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutNeedsPassphrase() ) ); delete NetworkDeviceTestProcess; NeedsPassphraseProcess=0L; kdError() << "Unable to start openssl!" << endl; @@ -1350,7 +1350,7 @@ bool Utils::getNeedsPassphrase(QString key) usleep ( 500 ); config->appPointer->processEvents(); } - disconnect( NeedsPassphraseProcess, SIGNAL( readyReadStdout() ), this, SLOT( readOutNeedsPassphrase() ) ); + disconnect( NeedsPassphraseProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutNeedsPassphrase() ) ); delete NetworkDeviceTestProcess; NeedsPassphraseProcess=0L; } @@ -1358,18 +1358,18 @@ bool Utils::getNeedsPassphrase(QString key) return needsPassphrase; } -QString Utils::getHostname() +TQString Utils::getHostname() { Hostname="linux.local"; - GetHostnameProcess = new QProcess( this ); + GetHostnameProcess = new TQProcess( this ); GetHostnameProcess->addArgument( "hostname" ); - connect( GetHostnameProcess, SIGNAL( readyReadStdout() ), this, SLOT( readStdOutGetHostname() ) ); - connect( GetHostnameProcess, SIGNAL( readyReadStderr() ), this, SLOT( readStdErrGetHostname() ) ); + connect( GetHostnameProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutGetHostname() ) ); + connect( GetHostnameProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrGetHostname() ) ); if ( !GetHostnameProcess->start( env ) ) { - disconnect( GetHostnameProcess, SIGNAL( readyReadStdout() ), this, SLOT( readStdOutGetHostname() ) ); - disconnect( GetHostnameProcess, SIGNAL( readyReadStderr() ), this, SLOT( readStdErrGetHostname() ) ); + disconnect( GetHostnameProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutGetHostname() ) ); + disconnect( GetHostnameProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrGetHostname() ) ); delete GetHostnameProcess; GetHostnameProcess=0L; kdError() << "Unable to start getHostname process!" << endl; @@ -1381,8 +1381,8 @@ QString Utils::getHostname() { usleep(200); } - disconnect( GetHostnameProcess, SIGNAL( readyReadStdout() ), this, SLOT( readStdOutGetHostname() ) ); - disconnect( GetHostnameProcess, SIGNAL( readyReadStderr() ), this, SLOT( readStdErrGetHostname() ) ); + disconnect( GetHostnameProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutGetHostname() ) ); + disconnect( GetHostnameProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrGetHostname() ) ); delete GetHostnameProcess; GetHostnameProcess=0L; return Hostname; @@ -1393,26 +1393,26 @@ QString Utils::getHostname() /* === Slots === */ void Utils::readStdOutCreateTunDev() { - QString msg = QString( createProcess->readStderr() ); + TQString msg = TQString( createProcess->readStderr() ); kdDebug() << "readStdOutCreateTunDev(): " << msg << endl; } void Utils::readStdErrCreateTunDev() { - QString msg = QString( createProcess->readStderr() ); + TQString msg = TQString( createProcess->readStderr() ); kdError() << "readStdErrCreateTunDev" << msg << endl; } void Utils::readStdOutLoadKernelModule() { - QString msg = QString( ModprobeProcess->readStdout() ); + TQString msg = TQString( ModprobeProcess->readStdout() ); kdDebug() << "readStdErrreadStdOutLoadKernelModule" << msg << endl; } void Utils::readStdErrLoadKernelModule() { - QString msg = QString( ModprobeProcess->readStderr() ); + TQString msg = TQString( ModprobeProcess->readStderr() ); // kdDebug() << "readStdErrreadStderrLoadKernelModule" << msg << endl; /* FATAL: Module not found. */ @@ -1440,7 +1440,7 @@ void Utils::readStdErrToolsTest() void Utils::readStdOutRetriveOpenvpnCiphers() { while ( OpenvpnCiphersProcess->canReadLineStdout() ) { - QString msg = QString( OpenvpnCiphersProcess->readLineStdout() ); + TQString msg = TQString( OpenvpnCiphersProcess->readLineStdout() ); if ( msg.contains( "default key" ) ) { //std::cout << msg.ascii() << std::endl; OpenvpnCiphers.append( msg.section( ' ', 0, 0 ) ); @@ -1451,7 +1451,7 @@ void Utils::readStdOutRetriveOpenvpnCiphers() void Utils::readStdErrRetriveOpenvpnCiphers() { while ( OpenvpnCiphersProcess->canReadLineStderr() ) { - QString msg = QString( OpenvpnCiphersProcess->readLineStderr() ); + TQString msg = TQString( OpenvpnCiphersProcess->readLineStderr() ); } } @@ -1459,7 +1459,7 @@ void Utils::readStdErrRetriveOpenvpnCiphers() void Utils::readStdOutRetriveIpsecAlgos() { while ( IpsecAlgosProcess->canReadLineStdout() ) { - QString msg = QString( IpsecAlgosProcess->readLineStdout() ); + TQString msg = TQString( IpsecAlgosProcess->readLineStdout() ); bool newIpsecAlgoFound=false; // std::cout << "[ipsec algos raw] "<< msg.ascii() << std::endl; if (msg.find ( "000 algorithm", 0, -1 ) > -1) @@ -1468,12 +1468,12 @@ void Utils::readStdOutRetriveIpsecAlgos() if (msg.find ( "000 algorithm ESP", 0, -1 ) > -1) { - QString Algo = msg.stripWhiteSpace().section(":",1,1).section(",",1,1).section("=",1,1); - QString MinKeySize = msg.stripWhiteSpace().section(":",1,1).section(",",3,3).section("=",1,1); - QString MaxKeySize = msg.stripWhiteSpace().section(":",1,1).section(",",4,4).section("=",1,1); + TQString Algo = msg.stripWhiteSpace().section(":",1,1).section(",",1,1).section("=",1,1); + TQString MinKeySize = msg.stripWhiteSpace().section(":",1,1).section(",",3,3).section("=",1,1); + TQString MaxKeySize = msg.stripWhiteSpace().section(":",1,1).section(",",4,4).section("=",1,1); std::cout << "IKE encryption algo found: \"" << Algo << "\", Min: " << MinKeySize << ", Max: " << MaxKeySize << std::endl; -// QStringList AlgoOptList = QStringList::split("-",AlgoOpt); -// for (QStringList::Iterator it = AlgoOptList.begin(); it != AlgoOptList.end(); ++it) +// TQStringList AlgoOptList = TQStringList::split("-",AlgoOpt); +// for (TQStringList::Iterator it = AlgoOptList.begin(); it != AlgoOptList.end(); ++it) // { // std::cout << "IKE encryption algo subtypes found: \"" << Algo << "-" << *it << "\"" << std::endl; // } @@ -1486,16 +1486,16 @@ void Utils::readStdOutRetriveIpsecAlgos() void Utils::readStdErrRetriveIpsecAlgos() { while ( IpsecAlgosProcess->canReadLineStderr() ) { - QString msg = QString( IpsecAlgosProcess->readLineStderr() ); + TQString msg = TQString( IpsecAlgosProcess->readLineStderr() ); std::cout << "[ipsec algos raw err] "<< msg.ascii() << std::endl; } } void Utils::readPppdtestProcessOutput() { - QString msg = ""; - msg += QString ( TestPppdProcess->readStdout() ); -// msg += QString ( TestPppdProcess->readStderr() ); + TQString msg = ""; + msg += TQString ( TestPppdProcess->readStdout() ); +// msg += TQString ( TestPppdProcess->readStderr() ); // if ( msg == "" ) // return ; @@ -1581,13 +1581,13 @@ void Utils::readPppdtestProcessOutput() pppdcap.pppdHasReplacedefaultrouteSupport = false; if (config->KvpncDebugLevel > 1) - config->appendLogEntry(i18n("Testing %1: %2").arg("replacedefaultroute").arg(i18n("failed")),config->debug); + config->appendLogEntry(i18n("Testing %1: %2").tqarg("replacedefaultroute").tqarg(i18n("failed")),config->debug); } else { pppdcap.pppdHasReplacedefaultrouteSupport = true; if (config->KvpncDebugLevel > 1) - config->appendLogEntry(i18n("Testing %1: %2").arg("replacedefaultroute").arg(i18n("succeded")),config->debug); + config->appendLogEntry(i18n("Testing %1: %2").tqarg("replacedefaultroute").tqarg(i18n("succeded")),config->debug); } } @@ -1597,7 +1597,7 @@ void Utils::readPppdtestProcessOutput() void Utils::readStdOutRetriveOpenvpnDigests() { while ( OpenvpnDigestProcess->canReadLineStdout() ) { - QString msg = QString( OpenvpnDigestProcess->readLineStdout() ); + TQString msg = TQString( OpenvpnDigestProcess->readLineStdout() ); OpenvpnDigestCount+=1; if ( OpenvpnDigestCount > 5 ) { @@ -1610,7 +1610,7 @@ void Utils::readStdOutRetriveOpenvpnDigests() void Utils::readStdErrRetriveOpenvpnDigests() { while ( OpenvpnDigestProcess->canReadLineStderr() ) { - QString msg = QString( OpenvpnDigestProcess->readLineStderr() ); + TQString msg = TQString( OpenvpnDigestProcess->readLineStderr() ); } } @@ -1618,8 +1618,8 @@ void Utils::readStdErrRetriveOpenvpnDigests() void Utils::readStdOutGetNameAndPidOfProgramListen() { while ( NameAndPidOfProgramListenProcess->canReadLineStdout() ) { - QString msg = QString( NameAndPidOfProgramListenProcess->readLineStdout() ); - if ( msg.contains( "/" ) && msg.contains( QString().setNum( ListenPort ) ) && msg.simplifyWhiteSpace().section( ' ', 3, 3 ).section(':',1,1) == QString().setNum( ListenPort ) ) { + TQString msg = TQString( NameAndPidOfProgramListenProcess->readLineStdout() ); + if ( msg.contains( "/" ) && msg.contains( TQString().setNum( ListenPort ) ) && msg.simplifyWhiteSpace().section( ' ', 3, 3 ).section(':',1,1) == TQString().setNum( ListenPort ) ) { std::cout << msg.ascii() << std::endl; NameAndPidOfProgramListen = ( msg.simplifyWhiteSpace().section( ' ', 5, 5 ) ); if (NameAndPidOfProgramListen.contains( "LISTEN")) @@ -1632,7 +1632,7 @@ void Utils::readStdOutGetNameAndPidOfProgramListen() void Utils::readStdErrGetNameAndPidOfProgramListen() { while ( NameAndPidOfProgramListenProcess->canReadLineStderr() ) { - QString msg = QString( NameAndPidOfProgramListenProcess->readLineStderr() ); + TQString msg = TQString( NameAndPidOfProgramListenProcess->readLineStderr() ); } } @@ -1640,19 +1640,19 @@ void Utils::readStdErrGetNameAndPidOfProgramListen() void Utils::readOutGetEmailAddressOfCert() { while ( GetEmailAddressOfCertProcess->canReadLineStdout() ) { - QString msg = QString( GetEmailAddressOfCertProcess->readLineStdout() ); + TQString msg = TQString( GetEmailAddressOfCertProcess->readLineStdout() ); if ( msg.contains( "emailAddress" ) ) { std::cout << "msg: " << msg.ascii() << std::endl; - QStringList fields = QStringList::split( '/', msg); - for ( QStringList::iterator field = fields.begin(); field != fields.end();++field ) + TQStringList fields = TQStringList::split( '/', msg); + for ( TQStringList::iterator field = fields.begin(); field != fields.end();++field ) { - if (QString (*field).contains("emailAddress")) + if (TQString (*field).contains("emailAddress")) { if (config->KvpncDebugLevel > 2) - std::cout << "field: " << QString(*field).ascii() << std::endl; + std::cout << "field: " << TQString(*field).ascii() << std::endl; // subject= /C=de/L=WR/O=crissi/CN=Christoph Thielecke/emailAddress=crissi99@gxm.de // crissi99@gxm.de - EmailAddressOfCert = QString(*field).section('=',1,1); + EmailAddressOfCert = TQString(*field).section('=',1,1); break; } } @@ -1663,28 +1663,28 @@ void Utils::readOutGetEmailAddressOfCert() void Utils::readOutGetSmartcardSlots(KProcess * proc, char * buffer, int buflen) { - QString msg_raw = QString::fromLatin1(buffer, buflen); + TQString msg_raw = TQString::tqfromLatin1(buffer, buflen); if (config->KvpncDebugLevel > 5) - config->appendLogEntry ( QString("[readOutGetSmartcardSlots raw] "+QString(msg_raw)) ,config->debug ); + config->appendLogEntry ( TQString("[readOutGetSmartcardSlots raw] "+TQString(msg_raw)) ,config->debug ); - QStringList msg_raw_list = QStringList::split ( "\n",msg_raw ); + TQStringList msg_raw_list = TQStringList::split ( "\n",msg_raw ); - for ( QStringList::Iterator it = msg_raw_list.begin(); it != msg_raw_list.end(); ++it ) + for ( TQStringList::Iterator it = msg_raw_list.begin(); it != msg_raw_list.end(); ++it ) { - QString msg = *it; + TQString msg = *it; if (config->KvpncDebugLevel > 5) - config->appendLogEntry ( QString("[readOutGetSmartcardSlots] "+QString(msg)) ,config->debug ); + config->appendLogEntry ( TQString("[readOutGetSmartcardSlots] "+TQString(msg)) ,config->debug ); if ( msg.contains( "Slot" ) && !msg.contains("empty") ) { //std::cout << msg.ascii() << std::endl; -// KMessageBox::information( 0, i18n( "msg: %1" ).arg( msg.stripWhiteSpace() ), QString("foo") ); +// KMessageBox::information( 0, i18n( "msg: %1" ).tqarg( msg.stripWhiteSpace() ), TQString("foo") ); // we put in this format: : - QString id = msg.stripWhiteSpace().section( ' ', 1, 1 ); - QString name = msg.stripWhiteSpace().remove(QString("Slot "+id)).stripWhiteSpace(); - QString slot = id+" : "+name; + TQString id = msg.stripWhiteSpace().section( ' ', 1, 1 ); + TQString name = msg.stripWhiteSpace().remove(TQString("Slot "+id)).stripWhiteSpace(); + TQString slot = id+" : "+name; SmartcardSlots.append( slot ); } } @@ -1693,23 +1693,23 @@ void Utils::readOutGetSmartcardSlots(KProcess * proc, char * buffer, int b void Utils::readOutGetSmartcardCertsFromSlot() { while ( GetSmartcardCertsFromSlotProcess->canReadLineStdout() ) { - QString msg = QString( GetSmartcardCertsFromSlotProcess->readLineStdout() ); + TQString msg = TQString( GetSmartcardCertsFromSlotProcess->readLineStdout() ); if (config->KvpncDebugLevel > 5) - config->appendLogEntry ( QString("[readOutGetSmartcardCertsFromSlot] "+QString(msg)) ,config->debug ); + config->appendLogEntry ( TQString("[readOutGetSmartcardCertsFromSlot] "+TQString(msg)) ,config->debug ); if ( msg.contains( "Certificate Object" ) ) { -// KMessageBox::sorry( 0, QString("msg: "+msg), QString("foo1"),0 ); +// KMessageBox::sorry( 0, TQString("msg: "+msg), TQString("foo1"),0 ); Pkcs11CertFound=true; } -// KMessageBox::information( 0, i18n( "msg: %1" ).arg( msg ), QString("foo") ); +// KMessageBox::information( 0, i18n( "msg: %1" ).tqarg( msg ), TQString("foo") ); if (IdType == "id") { if ( msg.contains( "ID:" ) && Pkcs11CertFound==true ) { //std::cout << msg.ascii() << std::endl; - QString msg2 = msg.section( ':', 1, 1 ); + TQString msg2 = msg.section( ':', 1, 1 ); msg2 = msg2.stripWhiteSpace(); -// KMessageBox::sorry( 0, QString("id: "+msg), QString("foo"),0 ); +// KMessageBox::sorry( 0, TQString("id: "+msg), TQString("foo"),0 ); SmartcardCertsFromSlot.append( msg2 ); Pkcs11CertFound=false; } @@ -1718,9 +1718,9 @@ void Utils::readOutGetSmartcardCertsFromSlot() { if ( msg.contains( "label:" ) && Pkcs11CertFound==true ) { //std::cout << msg.ascii() << std::endl; - QString msg2 = msg.section( ':', 1, 1 ); + TQString msg2 = msg.section( ':', 1, 1 ); msg2 = msg2.stripWhiteSpace(); -// KMessageBox::sorry( 0, QString("label: "+msg2), QString("foo"),0 ); +// KMessageBox::sorry( 0, TQString("label: "+msg2), TQString("foo"),0 ); SmartcardCertsFromSlot.append( msg2 ); Pkcs11CertFound=false; } @@ -1729,9 +1729,9 @@ void Utils::readOutGetSmartcardCertsFromSlot() { if ( msg.contains( "Subject:" ) && Pkcs11CertFound==true ) { //std::cout << msg.ascii() << std::endl; - QString msg2 = msg.section( ':', 1, 1 ); + TQString msg2 = msg.section( ':', 1, 1 ); msg2 = msg2.stripWhiteSpace(); -// KMessageBox::sorry( 0, QString("subject: "+msg), QString("foo"),0 ); +// KMessageBox::sorry( 0, TQString("subject: "+msg), TQString("foo"),0 ); SmartcardCertsFromSlot.append( msg2 ); Pkcs11CertFound=false; } @@ -1743,7 +1743,7 @@ void Utils::readOutGetSmartcardCertsFromSlot() void Utils::readOutGetCertsFromCiscoCertStoreSlot() { while ( GetCertsFromCiscoCertStoreProcess->canReadLineStdout() ) { - QString msg = QString( GetCertsFromCiscoCertStoreProcess->readLineStdout() ); + TQString msg = TQString( GetCertsFromCiscoCertStoreProcess->readLineStdout() ); // samle output :( @@ -1787,7 +1787,7 @@ void Utils::readOutGetCertsFromCiscoCertStoreSlot() break; // if (config->KvpncDebugLevel > 2) // std::cout << "readOutGetCertsFromCiscoCertStoreSlot: idx2 " << idx2 << std::endl; - QString common_name = msg.right(msg.length()-idx2); + TQString common_name = msg.right(msg.length()-idx2); if (common_name.length() > 0) { // if (config->KvpncDebugLevel > 2) @@ -1803,7 +1803,7 @@ void Utils::readOutGetOpenvpnPkcs11Ids() { while ( OpenvpnPkcs11IdsProcess->canReadLineStdout() ) { - QString msg = QString( OpenvpnPkcs11IdsProcess->readLineStdout() ); + TQString msg = TQString( OpenvpnPkcs11IdsProcess->readLineStdout() ); /* sample output: @@ -1813,15 +1813,15 @@ void Utils::readOutGetOpenvpnPkcs11Ids() */ if (config->KvpncDebugLevel > 5) - config->appendLogEntry ( QString("[readOutGetOpenvpnPkcs11Ids] "+QString(msg)) ,config->debug ); + config->appendLogEntry ( TQString("[readOutGetOpenvpnPkcs11Ids] "+TQString(msg)) ,config->debug ); -// KMessageBox::information( 0, i18n( "msg: %1" ).arg( msg ), QString("foo") ); +// KMessageBox::information( 0, i18n( "msg: %1" ).tqarg( msg ), TQString("foo") ); if ( msg.contains( "Serialized id:" )) { //std::cout << msg.ascii() << std::endl; - QString msg2 = msg.section( ':', 1, 1 ); + TQString msg2 = msg.section( ':', 1, 1 ); msg2 = msg2.stripWhiteSpace(); -// KMessageBox::sorry( 0, QString("id: "+msg), QString("foo"),0 ); +// KMessageBox::sorry( 0, TQString("id: "+msg), TQString("foo"),0 ); OpenvpnPkcs11Ids.append( msg2 ); } } @@ -1830,8 +1830,8 @@ void Utils::readOutGetOpenvpnPkcs11Ids() void Utils::readOutNeedsPassphrase() { while ( NeedsPassphraseProcess->canReadLineStdout() ) { - QString msg = QString( NeedsPassphraseProcess->readLineStdout() ); -// KMessageBox::sorry( 0, QString("msg: "+msg), QString("foo1"),0 ); + TQString msg = TQString( NeedsPassphraseProcess->readLineStdout() ); +// KMessageBox::sorry( 0, TQString("msg: "+msg), TQString("foo1"),0 ); if ( msg.contains( "unable to load Private Key" ) ) { needsPassphrase=true; } @@ -1842,8 +1842,8 @@ void Utils::readOutNeedsPassphrase() void Utils::readStdOutGetHostname() { while ( GetHostnameProcess->canReadLineStdout() ) { - QString msg = QString( GetHostnameProcess->readLineStdout() ).simplifyWhiteSpace().section(' ',0,0); -// KMessageBox::sorry( 0, QString("msg: "+msg), QString("foo1"),0 ); + TQString msg = TQString( GetHostnameProcess->readLineStdout() ).simplifyWhiteSpace().section(' ',0,0); +// KMessageBox::sorry( 0, TQString("msg: "+msg), TQString("foo1"),0 ); if (!msg.isEmpty()) Hostname=msg; } @@ -1852,12 +1852,12 @@ void Utils::readStdOutGetHostname() void Utils::readStdErrGetHostname() { while ( GetHostnameProcess->canReadLineStderr() ) { - QString msg = QString( GetHostnameProcess->readLineStderr() ); - KMessageBox::error( 0, QString(msg), QString("getHostname()"),0 ); + TQString msg = TQString( GetHostnameProcess->readLineStderr() ); + KMessageBox::error( 0, TQString(msg), TQString("getHostname()"),0 ); } } -QString Utils::dec2bin(int n) +TQString Utils::dec2bin(int n) { if (0 == n) { @@ -1865,8 +1865,8 @@ QString Utils::dec2bin(int n) } else { - QString ret =""; - QString ret2 = dec2bin(n/2); + TQString ret =""; + TQString ret2 = dec2bin(n/2); ret+= ret2; if(n % 2) ret +="1"; @@ -1876,7 +1876,7 @@ QString Utils::dec2bin(int n) } } -int Utils::dottedIpv4Netmask2NetmaskBytes(QString dottedIpv4Netmask) +int Utils::dottedIpv4Netmask2NetmaskBytes(TQString dottedIpv4Netmask) { if (dottedIpv4Netmask.isEmpty() || dottedIpv4Netmask.contains( '.' ) != 3) return 0; @@ -1890,11 +1890,11 @@ int Utils::dottedIpv4Netmask2NetmaskBytes(QString dottedIpv4Netmask) std::cout << "part1: " << part1 << std::endl; std::cout << "part2: " << part2 << std::endl; std::cout << "part3: " << part3 << std::endl; - QString block=""; - QString block0 = dec2bin(part0); - QString block1 = dec2bin(part1); - QString block2 = dec2bin(part2); - QString block3 = dec2bin(part3); + TQString block=""; + TQString block0 = dec2bin(part0); + TQString block1 = dec2bin(part1); + TQString block2 = dec2bin(part2); + TQString block3 = dec2bin(part3); std::cout << "block0: " << block0 << std::endl; std::cout << "block1: " << block1 << std::endl; diff --git a/src/utils.h b/src/utils.h index 50492e0..a4a3d9d 100644 --- a/src/utils.h +++ b/src/utils.h @@ -20,13 +20,13 @@ #ifndef __UTILS_H____ #define __UTILS_H____ -#include -#include -#include +#include +#include +#include #include "kvpncconfig.h" #include "kvpnc.h" #include "toolinfo.h" -#include +#include #include /** @@ -34,48 +34,49 @@ Provides various help functions. @author Christoph Thielecke */ -class Utils : public QObject +class Utils : public TQObject { Q_OBJECT + TQ_OBJECT public: - Utils(KVpncConfig* config,QObject *parent = 0, const char *name = 0); + Utils(KVpncConfig* config,TQObject *parent = 0, const char *name = 0); ~Utils(); - bool isValidIPv4Address(QString Address); - bool isValidIPv4NetworkAddress(QString Address); - bool isValidIPv4BroadcastAddress(QString Address); - bool isValidIPv4Netmask(QString Netmask); + bool isValidIPv4Address(TQString Address); + bool isValidIPv4NetworkAddress(TQString Address); + bool isValidIPv4BroadcastAddress(TQString Address); + bool isValidIPv4Netmask(TQString Netmask); bool tunDevExists(); bool createTunDev(); - bool loadKernelModule(QString Name,QApplication *app); - bool unloadKernelModule(QString Name,QApplication *app, bool force=true); - bool doChmod(QString file, QString mode); + bool loadKernelModule(TQString Name,TQApplication *app); + bool unloadKernelModule(TQString Name,TQApplication *app, bool force=true); + bool doChmod(TQString file, TQString mode); bool resolvConfAvailable(); - QStringList getOpenvpnCiphers(); - QStringList getOpenvpnDigests(); - QPtrList* getToolList(); - ToolInfo* getToolInfo( QString name); - QString resolveName(QString Name); - QString removeSpecialCharsForFilename(QString filename); - QString getNameAndPidOfProgramListen(int port); - QString getEmailAddressOfCert(QString cert); - QString getHostname(); - QStringList getSmartcardSlots(QString ProviderLib); - QStringList getSmartcardCertsFromSlot(QString slot,QString IdType,QString ProviderLib); - QStringList getOpenvpnPkcs11Ids(QString ProviderLib); - bool getNeedsPassphrase(QString key); - QStringList getCertsFromCiscoCertStore(QString type="user"); - QString dec2bin(int n); - int dottedIpv4Netmask2NetmaskBytes(QString dottedIpv4Netmask); - QString IpsecAlgoCurrent; + TQStringList getOpenvpnCiphers(); + TQStringList getOpenvpnDigests(); + TQPtrList* getToolList(); + ToolInfo* getToolInfo( TQString name); + TQString resolveName(TQString Name); + TQString removeSpecialCharsForFilename(TQString filename); + TQString getNameAndPidOfProgramListen(int port); + TQString getEmailAddressOfCert(TQString cert); + TQString getHostname(); + TQStringList getSmartcardSlots(TQString ProviderLib); + TQStringList getSmartcardCertsFromSlot(TQString slot,TQString IdType,TQString ProviderLib); + TQStringList getOpenvpnPkcs11Ids(TQString ProviderLib); + bool getNeedsPassphrase(TQString key); + TQStringList getCertsFromCiscoCertStore(TQString type="user"); + TQString dec2bin(int n); + int dottedIpv4Netmask2NetmaskBytes(TQString dottedIpv4Netmask); + TQString IpsecAlgoCurrent; struct IpsecAlgos { - QStringList IpsecIkeEncryptionAlgorithms; - QStringList IpsecIkeHashAlgorithms; - QStringList IpsecIkeDhGroups; - QStringList IpsecEspEncryptionAlgorithms; - QStringList IpsecEspAuthenticationAlgorithms; - QStringList IpsecCompressionAlgorithms; + TQStringList IpsecIkeEncryptionAlgorithms; + TQStringList IpsecIkeHashAlgorithms; + TQStringList IpsecIkeDhGroups; + TQStringList IpsecEspEncryptionAlgorithms; + TQStringList IpsecEspAuthenticationAlgorithms; + TQStringList IpsecCompressionAlgorithms; }; struct PppdCapabilities { @@ -86,20 +87,20 @@ public: /* options for pppd depending on pppd version */ // MPPE - QString RequireMppeOption; - QString Require128BitMppeOption; - QString RefuseMppeOption; - QString Refuse40BitMppeOption; - QString Refuse128BitMppeOption; - QString RequireStatelessOption; - QString RequireStatefulOption; + TQString RequireMppeOption; + TQString Require128BitMppeOption; + TQString RefuseMppeOption; + TQString Refuse40BitMppeOption; + TQString Refuse128BitMppeOption; + TQString RequireStatelessOption; + TQString RequireStatefulOption; bool MppeOptionsInALine; // older pppd need all in one line // AUTH - QString RequireAuthChapOption; - QString RequireAuthMschapOption; - QString RequireAuthMschapv2Option; - QString RequireAuthPapOption; + TQString RequireAuthChapOption; + TQString RequireAuthMschapOption; + TQString RequireAuthMschapv2Option; + TQString RequireAuthPapOption; bool pppdHasMppeSupport; //< true if pppd has mppe support bool oldPppdStyle; //< true if old style was found ('mppe require') @@ -154,44 +155,44 @@ private: bool testPppdRequireMppe; bool testPppdMppeRequired; - QString tooltest_logfile; - QProcess *ModprobeProcess; - QProcess *createProcess; - QProcess *NetworkDeviceTestProcess; - QProcess *toolsTestProcess; - QProcess *OpenvpnCiphersProcess; - QProcess *OpenvpnDigestProcess; - QProcess *NameAndPidOfProgramListenProcess; - QProcess *GetEmailAddressOfCertProcess; + TQString tooltest_logfile; + TQProcess *ModprobeProcess; + TQProcess *createProcess; + TQProcess *NetworkDeviceTestProcess; + TQProcess *toolsTestProcess; + TQProcess *OpenvpnCiphersProcess; + TQProcess *OpenvpnDigestProcess; + TQProcess *NameAndPidOfProgramListenProcess; + TQProcess *GetEmailAddressOfCertProcess; KProcess *GetSmartcardSlotsProcess; - QProcess *GetSmartcardCertsFromSlotProcess; - QProcess *OpenvpnPkcs11IdsProcess; - QProcess *GetCertsFromCiscoCertStoreProcess; - QProcess *NeedsPassphraseProcess; - QProcess *IpsecAlgosProcess; - QProcess *TestPppdProcess; - QProcess *GetHostnameProcess; + TQProcess *GetSmartcardCertsFromSlotProcess; + TQProcess *OpenvpnPkcs11IdsProcess; + TQProcess *GetCertsFromCiscoCertStoreProcess; + TQProcess *NeedsPassphraseProcess; + TQProcess *IpsecAlgosProcess; + TQProcess *TestPppdProcess; + TQProcess *GetHostnameProcess; - QString resolvedIP; + TQString resolvedIP; bool resolveFinished; - QValueList list; - QStringList *env; + TQValueList list; + TQStringList *env; KVpncConfig *config; KTempFile *tmpfile; bool retrieveValidNetworkdevice; bool Pkcs11CertFound; - QStringList OpenvpnCiphers; - QStringList OpenvpnDigests; - QStringList KernelCrypto; - QString NameAndPidOfProgramListen; - QString EmailAddressOfCert; - QString OpenvpnDigestString; - QString IdType; - QString Hostname; - QStringList SmartcardSlots; - QStringList SmartcardCertsFromSlot; - QStringList CertsFromCiscoCertStore; - QStringList OpenvpnPkcs11Ids; + TQStringList OpenvpnCiphers; + TQStringList OpenvpnDigests; + TQStringList KernelCrypto; + TQString NameAndPidOfProgramListen; + TQString EmailAddressOfCert; + TQString OpenvpnDigestString; + TQString IdType; + TQString Hostname; + TQStringList SmartcardSlots; + TQStringList SmartcardCertsFromSlot; + TQStringList CertsFromCiscoCertStore; + TQStringList OpenvpnPkcs11Ids; int CertsFromCiscoCertPos; int ListenPort; diff --git a/src/vpnaccountdata.cpp b/src/vpnaccountdata.cpp index 44db7e8..15a7e43 100644 --- a/src/vpnaccountdata.cpp +++ b/src/vpnaccountdata.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "vpnaccountdata.h" -VpnAccountData::VpnAccountData( ConnectionType ConnType,const QString& Name) +VpnAccountData::VpnAccountData( ConnectionType ConnType,const TQString& Name) { this->RemoteNetAddr = ""; this->RemoteNetMask = "24"; @@ -317,7 +317,7 @@ VpnAccountData::VpnAccountData(const VpnAccountData& data) CiscoNatMode= data.CiscoNatMode; IpsecEsp= data.IpsecEsp; IpsecIke= data.IpsecIke; - AdditionalNetworkRoutes= data.QStringList AdditionalNetworkRoutes; + AdditionalNetworkRoutes= data.TQStringList AdditionalNetworkRoutes; saveUserPassword = data.saveUserPassword; savePsk = data.savePsk; useAdvancedSettings = data.useAdvancedSettings; @@ -405,7 +405,7 @@ VpnAccountData::VpnAccountData(const VpnAccountData& data) } */ -QString VpnAccountData::getName() const +TQString VpnAccountData::getName() const { return Name; } @@ -415,27 +415,27 @@ VpnAccountData::ConnectionType VpnAccountData::getConnectionType() const return connectiontype; } -QString VpnAccountData::getGateway() const +TQString VpnAccountData::getGateway() const { return Gateway; } -QString VpnAccountData::getID() const +TQString VpnAccountData::getID() const { return ID; } -QString VpnAccountData::getTunnelDeviceType() const +TQString VpnAccountData::getTunnelDeviceType() const { return TunnelDeviceType; } -QString VpnAccountData::getUserName() const +TQString VpnAccountData::getUserName() const { return Username; } -QString VpnAccountData::getUserPassword() const +TQString VpnAccountData::getUserPassword() const { return UserPassword; } @@ -450,32 +450,32 @@ bool VpnAccountData::getSavePsk() const return savePsk; } -QString VpnAccountData::getIkeGroup() const +TQString VpnAccountData::getIkeGroup() const { return IkeGroup; } -QString VpnAccountData::getEncryptionAlgorithm() const +TQString VpnAccountData::getEncryptionAlgorithm() const { return EncryptionAlgorithm; } -QString VpnAccountData::getAuthenticationAlgorithm() const +TQString VpnAccountData::getAuthenticationAlgorithm() const { return AuthenticationAlgorithm; } -QString VpnAccountData::getPerfectForwardSecrety() const +TQString VpnAccountData::getPerfectForwardSecrety() const { return PerfectForwardSecrecy; } -QString VpnAccountData::getNtDomainName() const +TQString VpnAccountData::getNtDomainName() const { return NtDomainName; } -QString VpnAccountData::getApplicationVersion() const +TQString VpnAccountData::getApplicationVersion() const { return ApplicationVersion; } @@ -536,40 +536,40 @@ int VpnAccountData::getRemotePort() const return RemotePort; } -QString VpnAccountData::getRemoteNetAddr() const +TQString VpnAccountData::getRemoteNetAddr() const { return RemoteNetAddr; } -QString VpnAccountData::getRemoteNetMask() const +TQString VpnAccountData::getRemoteNetMask() const { return RemoteNetMask; } -QString VpnAccountData::getPreSharedKey() const +TQString VpnAccountData::getPreSharedKey() const { return PreSharedKey; } -QString VpnAccountData::getX509Certificate() const +TQString VpnAccountData::getX509Certificate() const { return x509Certificate; } -QString VpnAccountData::getCaCertificate() const +TQString VpnAccountData::getCaCertificate() const { return CaCertificate; } -QString VpnAccountData::getNetworkDevice() const +TQString VpnAccountData::getNetworkDevice() const { - if (NetworkDevice != QString::null) + if (NetworkDevice != TQString()) return NetworkDevice; else return ""; } -QString VpnAccountData::getCertPath() const +TQString VpnAccountData::getCertPath() const { return CertPath; } @@ -584,17 +584,17 @@ bool VpnAccountData::getDoPingIP() const return doPingIP; } -QString VpnAccountData::getPingHostIP() const +TQString VpnAccountData::getPingHostIP() const { return pingHostIP; } -QString VpnAccountData::getPrivateKeyPass() const +TQString VpnAccountData::getPrivateKeyPass() const { return PrivateKeyPass; } -QString VpnAccountData::getPrivateKey() const +TQString VpnAccountData::getPrivateKey() const { return PrivateKey; } @@ -609,22 +609,22 @@ bool VpnAccountData::getUseSpecialLocalID() const return useSpecialLocalID; } -QString VpnAccountData::getSpecialRemoteID() const +TQString VpnAccountData::getSpecialRemoteID() const { return SpecialRemoteID; } -QString VpnAccountData::getSpecialLocalID() const +TQString VpnAccountData::getSpecialLocalID() const { return SpecialLocalID; } -QString VpnAccountData::getLocalIDType() const +TQString VpnAccountData::getLocalIDType() const { return LocalIDType; } -QString VpnAccountData::getRemoteIDType() const +TQString VpnAccountData::getRemoteIDType() const { return RemoteIDType; } @@ -654,7 +654,7 @@ bool VpnAccountData::getUseDnsServer() const return useDnsServer; } -QString VpnAccountData::getDnsServer() const +TQString VpnAccountData::getDnsServer() const { return DnsServer; } @@ -694,22 +694,22 @@ bool VpnAccountData::getUseSpecialServerCertificate() const return useSpecialServerCertificate; } -QString VpnAccountData::getSpecialServerCertificate() const +TQString VpnAccountData::getSpecialServerCertificate() const { return SpecialServerCertificate; } -QString VpnAccountData::getLocalVirtualIP() const +TQString VpnAccountData::getLocalVirtualIP() const { return LocalVirtualIP; } -QString VpnAccountData::getRemoteVirtualIP() const +TQString VpnAccountData::getRemoteVirtualIP() const { return RemoteVirtualIP; } -QString VpnAccountData::getPreSharedKeyFile() const +TQString VpnAccountData::getPreSharedKeyFile() const { return PreSharedKeyFile; } @@ -734,22 +734,22 @@ bool VpnAccountData::getExecuteCmdAfterDisconnect() const return executeCmdAfterDisconnect; } -QString VpnAccountData::getCommandBeforeConnect() const +TQString VpnAccountData::getCommandBeforeConnect() const { return CommandBeforeConnect; } -QString VpnAccountData::getCommandAfterConnect() const +TQString VpnAccountData::getCommandAfterConnect() const { return CommandAfterConnect; } -QString VpnAccountData::getCommandBeforeDisconnect() const +TQString VpnAccountData::getCommandBeforeDisconnect() const { return CommandBeforeDisconnect; } -QString VpnAccountData::getCommandAfterDisconnect() const +TQString VpnAccountData::getCommandAfterDisconnect() const { return CommandAfterDisconnect; } @@ -794,7 +794,7 @@ bool VpnAccountData::getUseVirtualIP() const return useVirtualIP; } -QString VpnAccountData::getVirtualIP() const +TQString VpnAccountData::getVirtualIP() const { return VirtualIP; } @@ -809,12 +809,12 @@ bool VpnAccountData::getUseAdditionalNetworkRoutes() const return useAdditionalNetworkRoutes; } -QStringList VpnAccountData::getAdditionalNetworkRoutes() const +TQStringList VpnAccountData::getAdditionalNetworkRoutes() const { return AdditionalNetworkRoutes; } -QString VpnAccountData::getHashAlgo() const +TQString VpnAccountData::getHashAlgo() const { return HashAlgo; } @@ -829,12 +829,12 @@ int VpnAccountData::getUserdefinedPort() const return UserdefinedPort; } -QString VpnAccountData::getDescription() const +TQString VpnAccountData::getDescription() const { return Description; } -QString VpnAccountData::getNsCertType() const +TQString VpnAccountData::getNsCertType() const { return NsCertType; } @@ -884,7 +884,7 @@ bool VpnAccountData::getUseUserdefiniedCipher() const return useUserdefiniedCipher; } -QString VpnAccountData::getUserdefiniedCipher() const +TQString VpnAccountData::getUserdefiniedCipher() const { return UserdefiniedCipher; } @@ -899,12 +899,12 @@ bool VpnAccountData::getUseTlsAuth() const return useTlsAuth; } -QString VpnAccountData::getTlsAuthFile() const +TQString VpnAccountData::getTlsAuthFile() const { return TlsAuthFile; } -QString VpnAccountData::getHttpProxy() const +TQString VpnAccountData::getHttpProxy() const { return HttpProxy; } @@ -934,7 +934,7 @@ bool VpnAccountData::getUseModeConfig() const return useModeConfig; } -QString VpnAccountData::getExchangeMode() const +TQString VpnAccountData::getExchangeMode() const { return ExchangeMode; } @@ -954,17 +954,17 @@ bool VpnAccountData::getUseTlsRemoteHost() const return useTlsRemoteHost; } -QString VpnAccountData::getTlsRemoteHost() const +TQString VpnAccountData::getTlsRemoteHost() const { return TlsRemoteHost; } -QString VpnAccountData::getRightNextHop() const +TQString VpnAccountData::getRightNextHop() const { return RightNextHop; } -QString VpnAccountData::getLeftNextHop() const +TQString VpnAccountData::getLeftNextHop() const { return LeftNextHop; } @@ -1024,17 +1024,17 @@ bool VpnAccountData::getUseHttpProxyAuth() const return useHttpProxyAuth; } -QString VpnAccountData::getHttpProxyAuthType() const +TQString VpnAccountData::getHttpProxyAuthType() const { return HttpProxyAuthType; } -QString VpnAccountData::getHttpProxyUser() const +TQString VpnAccountData::getHttpProxyUser() const { return HttpProxyUser; } -QString VpnAccountData::getHttpProxyPass() const +TQString VpnAccountData::getHttpProxyPass() const { return HttpProxyPass; } @@ -1059,32 +1059,32 @@ bool VpnAccountData::getUseLeftNextHop() const return useLeftNextHop; } -QString VpnAccountData::getPkcs11Providers() const +TQString VpnAccountData::getPkcs11Providers() const { return Pkcs11Providers; } -QString VpnAccountData::getPkcs11SlotType() const +TQString VpnAccountData::getPkcs11SlotType() const { return Pkcs11SlotType; } -QString VpnAccountData::getPkcs11Slot() const +TQString VpnAccountData::getPkcs11Slot() const { return Pkcs11Slot; } -QString VpnAccountData::getPkcs11IdType() const +TQString VpnAccountData::getPkcs11IdType() const { return Pkcs11IdType; } -QString VpnAccountData::getPkcs11Id() const +TQString VpnAccountData::getPkcs11Id() const { return Pkcs11Id; } -QString VpnAccountData::getPkcs11SignMode() const +TQString VpnAccountData::getPkcs11SignMode() const { return Pkcs11SignMode; } @@ -1104,7 +1104,7 @@ bool VpnAccountData::getAllowIpAddressChangeOfPeer() const return allowIpAddressChangeOfPeer; } -QString VpnAccountData::getAuthMethod() const +TQString VpnAccountData::getAuthMethod() const { return AuthMethod; } @@ -1124,37 +1124,37 @@ bool VpnAccountData::getUseDomainInResolvConf() const return useDomainInResolvConf; } -QString VpnAccountData::getSearchDomainInResolvConf() const +TQString VpnAccountData::getSearchDomainInResolvConf() const { return SearchDomainInResolvConf; } -QString VpnAccountData::getDomainInResolvConf() const +TQString VpnAccountData::getDomainInResolvConf() const { return DomainInResolvConf; } -QString VpnAccountData::getAuthenticationDirection() const +TQString VpnAccountData::getAuthenticationDirection() const { return AuthenticationDirection; } -QString VpnAccountData::getCiscoNatMode() const +TQString VpnAccountData::getCiscoNatMode() const { return CiscoNatMode; } -QString VpnAccountData::getIpsecEsp() const +TQString VpnAccountData::getIpsecEsp() const { return IpsecEsp; } -QString VpnAccountData::getIpsecIke() const +TQString VpnAccountData::getIpsecIke() const { return IpsecIke; } -QString VpnAccountData::getVtunProfile() const +TQString VpnAccountData::getVtunProfile() const { return VtunProfile; } @@ -1179,7 +1179,7 @@ bool VpnAccountData::getUseRemoteNetwork() const return useRemoteNetwork; } -QString VpnAccountData::getIpsecVpnMode() const +TQString VpnAccountData::getIpsecVpnMode() const { return IpsecVpnMode; } @@ -1259,12 +1259,12 @@ bool VpnAccountData::getUseRightSourceIp() const return useRightSourceIp; } -QString VpnAccountData::getLeftSourceIp() const +TQString VpnAccountData::getLeftSourceIp() const { return LeftSourceIp; } -QString VpnAccountData::getRightSourceIp() const +TQString VpnAccountData::getRightSourceIp() const { return RightSourceIp; } @@ -1274,7 +1274,7 @@ bool VpnAccountData::getUseVirtualSubnetworks() const return useVirtualSubnetworks; } -QString VpnAccountData::getVirtualSubnetworks() const +TQString VpnAccountData::getVirtualSubnetworks() const { return VirtualSubnetworks; } @@ -1329,7 +1329,7 @@ bool VpnAccountData::getUseSshConfigRemoteScript() const return useSshConfigRemoteScript; } -QString VpnAccountData::getSshConfigRemoteScript() const +TQString VpnAccountData::getSshConfigRemoteScript() const { return SshConfigRemoteScript; } @@ -1355,27 +1355,27 @@ void VpnAccountData::setConnectionType( ConnectionType type ) this->connectiontype = type; } -void VpnAccountData::setName( const QString &Name ) +void VpnAccountData::setName( const TQString &Name ) { this->Name = Name; } -void VpnAccountData::setGateway( const QString &Gateway ) +void VpnAccountData::setGateway( const TQString &Gateway ) { this->Gateway = Gateway; } -void VpnAccountData::setID( const QString &ID ) +void VpnAccountData::setID( const TQString &ID ) { this->ID = ID; } -void VpnAccountData::setUserName( const QString &Username ) +void VpnAccountData::setUserName( const TQString &Username ) { this->Username = Username; } -void VpnAccountData::setUserPassword( const QString& UserPassword ) +void VpnAccountData::setUserPassword( const TQString& UserPassword ) { this->UserPassword = UserPassword; } @@ -1390,32 +1390,32 @@ void VpnAccountData::setSavePsk( bool savePsk ) this->savePsk = savePsk; } -void VpnAccountData::setIkeGroup( const QString &IkeGroup ) +void VpnAccountData::setIkeGroup( const TQString &IkeGroup ) { this->IkeGroup = IkeGroup; } -void VpnAccountData::setEncryptionAlgorithm( const QString &EncryptionAlgorithm ) +void VpnAccountData::setEncryptionAlgorithm( const TQString &EncryptionAlgorithm ) { this->EncryptionAlgorithm = EncryptionAlgorithm; } -void VpnAccountData::setAuthenticationAlgorithm( const QString &AuthenticationAlgorithm) +void VpnAccountData::setAuthenticationAlgorithm( const TQString &AuthenticationAlgorithm) { this->AuthenticationAlgorithm= AuthenticationAlgorithm; } -void VpnAccountData::setPerfectForwardSecrety( const QString &PerfectForwardSecrecy ) +void VpnAccountData::setPerfectForwardSecrety( const TQString &PerfectForwardSecrecy ) { this->PerfectForwardSecrecy = PerfectForwardSecrecy; } -void VpnAccountData::setNtDomainName( const QString& Name ) +void VpnAccountData::setNtDomainName( const TQString& Name ) { this->NtDomainName = Name; } -void VpnAccountData::setApplicationVersion( const QString& version ) +void VpnAccountData::setApplicationVersion( const TQString& version ) { this->ApplicationVersion = version; } @@ -1475,37 +1475,37 @@ void VpnAccountData::setRemotePort( int port ) this->RemotePort = port; } -void VpnAccountData::setRemoteNetAddr( const QString& RemoteNetAddr ) +void VpnAccountData::setRemoteNetAddr( const TQString& RemoteNetAddr ) { this->RemoteNetAddr = RemoteNetAddr; } -void VpnAccountData::setRemoteNetMask( const QString& RemoteNetMask ) +void VpnAccountData::setRemoteNetMask( const TQString& RemoteNetMask ) { this->RemoteNetMask = RemoteNetMask; } -void VpnAccountData::setPreSharedKey( const QString& PreSharedKey ) +void VpnAccountData::setPreSharedKey( const TQString& PreSharedKey ) { this->PreSharedKey = PreSharedKey; } -void VpnAccountData::setX509Certificate( const QString& x509Certificate ) +void VpnAccountData::setX509Certificate( const TQString& x509Certificate ) { this->x509Certificate = x509Certificate; } -void VpnAccountData::setCaCertificate( const QString& CaCertificate ) +void VpnAccountData::setCaCertificate( const TQString& CaCertificate ) { this->CaCertificate = CaCertificate; } -void VpnAccountData::setNetworkDevice( const QString& NetworkDevice ) +void VpnAccountData::setNetworkDevice( const TQString& NetworkDevice ) { this->NetworkDevice = NetworkDevice; } -void VpnAccountData::setCertPath( const QString& CertPath ) +void VpnAccountData::setCertPath( const TQString& CertPath ) { this->CertPath = CertPath; } @@ -1520,17 +1520,17 @@ void VpnAccountData::setDoPingIP(bool doPingIP) this->doPingIP=doPingIP; } -void VpnAccountData::setPingHostIP(const QString& pingHostIP) +void VpnAccountData::setPingHostIP(const TQString& pingHostIP) { this->pingHostIP = pingHostIP; } -void VpnAccountData::setPrivateKeyPass(const QString& PrivateKeyPass) +void VpnAccountData::setPrivateKeyPass(const TQString& PrivateKeyPass) { this->PrivateKeyPass = PrivateKeyPass; } -void VpnAccountData::setPrivateKey(const QString& PrivateKey) +void VpnAccountData::setPrivateKey(const TQString& PrivateKey) { this->PrivateKey = PrivateKey; } @@ -1545,22 +1545,22 @@ void VpnAccountData::setUseSpecialLocalID(bool useSpecialLocalID) this->useSpecialLocalID = useSpecialLocalID; } -void VpnAccountData::setSpecialRemoteID(const QString& SpecialRemoteID) +void VpnAccountData::setSpecialRemoteID(const TQString& SpecialRemoteID) { this->SpecialRemoteID = SpecialRemoteID; } -void VpnAccountData::setSpecialLocalID(const QString& SpecialLocalID) +void VpnAccountData::setSpecialLocalID(const TQString& SpecialLocalID) { this->SpecialLocalID = SpecialLocalID; } -void VpnAccountData::setLocalIDType(const QString& LocalIDType) +void VpnAccountData::setLocalIDType(const TQString& LocalIDType) { this->LocalIDType = LocalIDType; } -void VpnAccountData::setRemoteIDType(const QString& RemoteIDType) +void VpnAccountData::setRemoteIDType(const TQString& RemoteIDType) { this->RemoteIDType = RemoteIDType; } @@ -1590,7 +1590,7 @@ void VpnAccountData::setUseDnsServer(bool useDnsServer ) this->useDnsServer = useDnsServer; } -void VpnAccountData::setDnsServer(const QString& DnsServer ) +void VpnAccountData::setDnsServer(const TQString& DnsServer ) { this->DnsServer = DnsServer; } @@ -1625,17 +1625,17 @@ void VpnAccountData::setDisableMPPEComp(bool disableMPPEComp ) this->disableMPPEComp = disableMPPEComp; } -void VpnAccountData::setLocalVirtualIP( const QString& LocalVirtualIP ) +void VpnAccountData::setLocalVirtualIP( const TQString& LocalVirtualIP ) { this->LocalVirtualIP = LocalVirtualIP; } -void VpnAccountData::setRemoteVirtualIP( const QString& RemoteVirtualIP ) +void VpnAccountData::setRemoteVirtualIP( const TQString& RemoteVirtualIP ) { this->RemoteVirtualIP = RemoteVirtualIP; } -void VpnAccountData::setPreSharedKeyFile( const QString& PreSharedKeyFile) +void VpnAccountData::setPreSharedKeyFile( const TQString& PreSharedKeyFile) { this->PreSharedKeyFile = PreSharedKeyFile; } @@ -1660,22 +1660,22 @@ void VpnAccountData::setExecuteCmdAfterDisconnect( bool executeCmdAfterDisconnec this->executeCmdAfterDisconnect = executeCmdAfterDisconnect; } -void VpnAccountData::setCommandBeforeConnect(const QString& CommandBeforeConnect) +void VpnAccountData::setCommandBeforeConnect(const TQString& CommandBeforeConnect) { this->CommandBeforeConnect = CommandBeforeConnect; } -void VpnAccountData::setCommandAfterConnect(const QString& CommandAfterConnect) +void VpnAccountData::setCommandAfterConnect(const TQString& CommandAfterConnect) { this->CommandAfterConnect = CommandAfterConnect; } -void VpnAccountData::setCommandBeforeDisconnect(const QString& CommandBeforeDisconnect) +void VpnAccountData::setCommandBeforeDisconnect(const TQString& CommandBeforeDisconnect) { this->CommandBeforeDisconnect = CommandBeforeDisconnect; } -void VpnAccountData::setCommandAfterDisconnect(const QString& CommandAfterDisconnect) +void VpnAccountData::setCommandAfterDisconnect(const TQString& CommandAfterDisconnect) { this->CommandAfterDisconnect = CommandAfterDisconnect; } @@ -1720,7 +1720,7 @@ void VpnAccountData::setUseVirtualIP(bool useVirtualIP ) this->useVirtualIP = useVirtualIP; } -void VpnAccountData::setVirtualIP(const QString& VirtualIP ) +void VpnAccountData::setVirtualIP(const TQString& VirtualIP ) { this->VirtualIP = VirtualIP; } @@ -1735,7 +1735,7 @@ void VpnAccountData::setUseAdditionalNetworkRoutes( bool useAdditionalNetworkRou this->useAdditionalNetworkRoutes = useAdditionalNetworkRoutes; } -void VpnAccountData::setAdditionalNetworkRoutes( QStringList AdditionalNetworkRoutes ) +void VpnAccountData::setAdditionalNetworkRoutes( TQStringList AdditionalNetworkRoutes ) { this->AdditionalNetworkRoutes = AdditionalNetworkRoutes; } @@ -1745,17 +1745,17 @@ void VpnAccountData::setUseSpecialServerCertificate(bool useSpecialServerCertifi this->useSpecialServerCertificate = useSpecialServerCertificate; } -void VpnAccountData::setSpecialServerCertificate(const QString& SpecialServerCertificate) +void VpnAccountData::setSpecialServerCertificate(const TQString& SpecialServerCertificate) { this->SpecialServerCertificate = SpecialServerCertificate; } -void VpnAccountData::setHashAlgo(const QString& HashAlgo) +void VpnAccountData::setHashAlgo(const TQString& HashAlgo) { this->HashAlgo = HashAlgo; } -void VpnAccountData::setTunnelDeviceType(const QString& TunnelDeviceType) +void VpnAccountData::setTunnelDeviceType(const TQString& TunnelDeviceType) { this->TunnelDeviceType = TunnelDeviceType; } @@ -1770,12 +1770,12 @@ void VpnAccountData::setUserdefinedPort(int UserdefinedPort) this->UserdefinedPort = UserdefinedPort; } -void VpnAccountData::setDescription(const QString& Description) +void VpnAccountData::setDescription(const TQString& Description) { this->Description = Description; } -void VpnAccountData::setNsCertType(const QString& NsCertType) +void VpnAccountData::setNsCertType(const TQString& NsCertType) { this->NsCertType = NsCertType; } @@ -1825,7 +1825,7 @@ void VpnAccountData::setUseUserdefiniedCipher( bool useUserdefiniedCipher ) this->useUserdefiniedCipher = useUserdefiniedCipher; } -void VpnAccountData::setUserdefiniedCipher( QString UserdefiniedCipher ) +void VpnAccountData::setUserdefiniedCipher( TQString UserdefiniedCipher ) { this->UserdefiniedCipher = UserdefiniedCipher; } @@ -1840,12 +1840,12 @@ void VpnAccountData::setUseTlsAuth( bool useTlsAuth ) this->useTlsAuth = useTlsAuth; } -void VpnAccountData::setTlsAuthFile( QString TlsAuthFile ) +void VpnAccountData::setTlsAuthFile( TQString TlsAuthFile ) { this->TlsAuthFile = TlsAuthFile; } -void VpnAccountData::setHttpProxy( QString HttpProxy ) +void VpnAccountData::setHttpProxy( TQString HttpProxy ) { this->HttpProxy = HttpProxy; } @@ -1875,7 +1875,7 @@ void VpnAccountData::setUseModeConfig( bool useModeConfig) this->useModeConfig = useModeConfig; } -void VpnAccountData::setExchangeMode( QString ExchangeMode ) +void VpnAccountData::setExchangeMode( TQString ExchangeMode ) { this->ExchangeMode = ExchangeMode; } @@ -1895,17 +1895,17 @@ void VpnAccountData::setUseTlsRemoteHost( bool useTlsRemoteHost ) this->useTlsRemoteHost = useTlsRemoteHost; } -void VpnAccountData::setTlsRemoteHost( QString TlsRemoteHost ) +void VpnAccountData::setTlsRemoteHost( TQString TlsRemoteHost ) { this->TlsRemoteHost = TlsRemoteHost; } -void VpnAccountData::setRightNextHop( QString RightNextHop ) +void VpnAccountData::setRightNextHop( TQString RightNextHop ) { this->RightNextHop = RightNextHop; } -void VpnAccountData::setLeftNextHop( QString LeftNextHop ) +void VpnAccountData::setLeftNextHop( TQString LeftNextHop ) { this->LeftNextHop = LeftNextHop; } @@ -1965,17 +1965,17 @@ void VpnAccountData::setUseHttpProxyAuth( bool useHttpProxyAuth ) this->useHttpProxyAuth = useHttpProxyAuth; } -void VpnAccountData::setHttpProxyAuthType(QString HttpProxyAuthType) +void VpnAccountData::setHttpProxyAuthType(TQString HttpProxyAuthType) { this->HttpProxyAuthType = HttpProxyAuthType; } -void VpnAccountData::setHttpProxyUser(QString HttpProxyUser) +void VpnAccountData::setHttpProxyUser(TQString HttpProxyUser) { this->HttpProxyUser = HttpProxyUser; } -void VpnAccountData::setHttpProxyPass( QString HttpProxyPass ) +void VpnAccountData::setHttpProxyPass( TQString HttpProxyPass ) { this->HttpProxyPass = HttpProxyPass; } @@ -2000,32 +2000,32 @@ void VpnAccountData::setUseLeftNextHop( bool useLeftNextHop ) this->useLeftNextHop = useLeftNextHop; } -void VpnAccountData::setPkcs11Providers( QString Pkcs11Providers) +void VpnAccountData::setPkcs11Providers( TQString Pkcs11Providers) { this->Pkcs11Providers = Pkcs11Providers; } -void VpnAccountData::setPkcs11SlotType(QString Pkcs11SlotType) +void VpnAccountData::setPkcs11SlotType(TQString Pkcs11SlotType) { this->Pkcs11SlotType = Pkcs11SlotType; } -void VpnAccountData::setPkcs11Slot(QString Pkcs11Slot) +void VpnAccountData::setPkcs11Slot(TQString Pkcs11Slot) { this->Pkcs11Slot = Pkcs11Slot; } -void VpnAccountData::setPkcs11IdType(QString Pkcs11IdType) +void VpnAccountData::setPkcs11IdType(TQString Pkcs11IdType) { this->Pkcs11IdType = Pkcs11IdType; } -void VpnAccountData::setPkcs11Id(QString Pkcs11Id) +void VpnAccountData::setPkcs11Id(TQString Pkcs11Id) { this->Pkcs11Id = Pkcs11Id; } -void VpnAccountData::setPkcs11SignMode(QString Pkcs11SignMode) +void VpnAccountData::setPkcs11SignMode(TQString Pkcs11SignMode) { this->Pkcs11SignMode = Pkcs11SignMode; } @@ -2045,7 +2045,7 @@ void VpnAccountData::setAllowIpAddressChangeOfPeer( bool allowIpAddressChangeOfP this->allowIpAddressChangeOfPeer = allowIpAddressChangeOfPeer; } -void VpnAccountData::setAuthMethod( QString AuthMethod ) +void VpnAccountData::setAuthMethod( TQString AuthMethod ) { this->AuthMethod = AuthMethod; } @@ -2065,37 +2065,37 @@ void VpnAccountData::setUseDomainInResolvConf( bool useDomainInResolvConf) this->useDomainInResolvConf = useDomainInResolvConf; } -void VpnAccountData::setSearchDomainInResolvConf(QString SearchDomainInResolvConf) +void VpnAccountData::setSearchDomainInResolvConf(TQString SearchDomainInResolvConf) { this->SearchDomainInResolvConf = SearchDomainInResolvConf; } -void VpnAccountData::setDomainInResolvConf(QString DomainInResolvConf) +void VpnAccountData::setDomainInResolvConf(TQString DomainInResolvConf) { this->DomainInResolvConf = DomainInResolvConf; } -void VpnAccountData::setAuthenticationDirection(QString AuthenticationDirection) +void VpnAccountData::setAuthenticationDirection(TQString AuthenticationDirection) { this->AuthenticationDirection = AuthenticationDirection; } -void VpnAccountData::setCiscoNatMode(QString CiscoNatMode) +void VpnAccountData::setCiscoNatMode(TQString CiscoNatMode) { this->CiscoNatMode = CiscoNatMode; } -void VpnAccountData::setIpsecEsp(QString IpsecEsp) +void VpnAccountData::setIpsecEsp(TQString IpsecEsp) { this->IpsecEsp = IpsecEsp; } -void VpnAccountData::setIpsecIke(QString IpsecIke) +void VpnAccountData::setIpsecIke(TQString IpsecIke) { this->IpsecIke = IpsecIke; } -void VpnAccountData::setVtunProfile(QString VtunProfile) +void VpnAccountData::setVtunProfile(TQString VtunProfile) { this->VtunProfile = VtunProfile; } @@ -2120,7 +2120,7 @@ void VpnAccountData::setUseRemoteNetwork(bool useRemoteNetwork) this->useRemoteNetwork=useRemoteNetwork; } -void VpnAccountData::setIpsecVpnMode(QString IpsecVpnMode) +void VpnAccountData::setIpsecVpnMode(TQString IpsecVpnMode) { this->IpsecVpnMode = IpsecVpnMode; } @@ -2200,12 +2200,12 @@ void VpnAccountData::setUseRightSourceIp(bool useRightSourceIp) this->useRightSourceIp = useRightSourceIp; } -void VpnAccountData::setLeftSourceIp(QString LeftSourceIp) +void VpnAccountData::setLeftSourceIp(TQString LeftSourceIp) { this->LeftSourceIp = LeftSourceIp; } -void VpnAccountData::setRightSourceIp(QString RightSourceIp) +void VpnAccountData::setRightSourceIp(TQString RightSourceIp) { this->RightSourceIp = RightSourceIp; } @@ -2215,7 +2215,7 @@ void VpnAccountData::setUseVirtualSubnetworks(bool useVirtualSubnetworks) this->useVirtualSubnetworks = useVirtualSubnetworks; } -void VpnAccountData::setVirtualSubnetworks(QString VirtualSubnetworks) +void VpnAccountData::setVirtualSubnetworks(TQString VirtualSubnetworks) { this->VirtualSubnetworks = VirtualSubnetworks; } @@ -2270,7 +2270,7 @@ void VpnAccountData::setUseSshConfigRemoteScript(bool useSshConfigRemoteScript) this->useSshConfigRemoteScript = useSshConfigRemoteScript; } -void VpnAccountData::setSshConfigRemoteScript(QString SshConfigRemoteScript) +void VpnAccountData::setSshConfigRemoteScript(TQString SshConfigRemoteScript) { this->SshConfigRemoteScript = SshConfigRemoteScript; } diff --git a/src/vpnaccountdata.h b/src/vpnaccountdata.h index ed83ce7..68ee694 100644 --- a/src/vpnaccountdata.h +++ b/src/vpnaccountdata.h @@ -20,15 +20,15 @@ #ifndef VPNACCOUNTDATA_H #define VPNACCOUNTDATA_H -#include -#include -#include +#include +#include +#include /** * holds the data for a account * @author Christoph Thielecke */ -class VpnAccountData : public QObject +class VpnAccountData : public TQObject { public: enum ConnectionType {cisco=0, racoon=1, freeswan=2, pptp=3,openvpn=4,l2tpd_racoon=5,l2tpd_freeswan=6,ciscoorig=7,vtun=8,ssh=9,other=99}; @@ -42,7 +42,7 @@ public: * @param Gateway The hostname/IP of the VPN gateway * @return nothing */ - VpnAccountData( ConnectionType ConnType, const QString &Name); + VpnAccountData( ConnectionType ConnType, const TQString &Name); /** * Destruktor @@ -55,74 +55,74 @@ public: VpnAccountData(const VpnAccountData&); ConnectionType getConnectionType() const; //< returns Connection type - QString getName() const; //< returns Name - QString getGateway() const; //< returns Gateway - QString getID() const; //< returns ID - QString getUserName() const; //< returns UserName - QString getUserPassword() const; //< returns UserPassword - QString getIkeGroup() const; //< returns IkeGroup - QString getEncryptionAlgorithm() const; //< returns EncryptionAlgorithm - QString getAuthenticationAlgorithm() const; //< returns AuthenticationAlgorithm - QString getPerfectForwardSecrety() const; //< returns PerfectForwardSecrecy - QString getNtDomainName() const; //< returns NtDomainName - QString getApplicationVersion() const; //< returns ApplicationVersion - QString getRemoteNetAddr() const; // -//#include -#include +//#include +#include #include -#include +#include #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "utils.h" /** @author Christoph Thielecke */ -class VpnTypesListViewToolTip : public QToolTip +class VpnTypesListViewToolTip : public TQToolTip { public: - VpnTypesListViewToolTip ( QListView* parent ); + VpnTypesListViewToolTip ( TQListView* parent ); protected: - void maybeTip ( const QPoint& p ); + void maybeTip ( const TQPoint& p ); private: - QListView* listView; + TQListView* listView; public: }; -inline VpnTypesListViewToolTip::VpnTypesListViewToolTip ( QListView* parent ) : QToolTip ( parent->viewport() ), listView ( parent ) {} -inline void VpnTypesListViewToolTip::maybeTip ( const QPoint& p ) +inline VpnTypesListViewToolTip::VpnTypesListViewToolTip ( TQListView* parent ) : TQToolTip ( parent->viewport() ), listView ( parent ) {} +inline void VpnTypesListViewToolTip::maybeTip ( const TQPoint& p ) { if ( !listView ) return; - const QListViewItem* item = listView->itemAt ( p ); + const TQListViewItem* item = listView->itemAt ( p ); if ( !item ) return; - const QRect itemRect = listView->itemRect ( item ); - if ( !itemRect.isValid() ) + const TQRect tqitemRect = listView->tqitemRect ( item ); + if ( !tqitemRect.isValid() ) return; const int col = listView->header()->sectionAt ( p.x() ); const int row = listView->header()->sectionAt ( p.y() ); if ( col == -1 && row == -1 ) return; - const QRect headerRect = listView->header()->sectionRect ( col ); + const TQRect headerRect = listView->header()->sectionRect ( col ); if ( !headerRect.isValid() ) return; -// const QRect cellRect ( headerRect.left(), itemRect.top(), -// headerRect.width(), itemRect.height() ); - const QRect cellRect ( headerRect.left(), itemRect.top(), 400, 200 ); - QString tipStr; +// const TQRect cellRect ( headerRect.left(), tqitemRect.top(), +// headerRect.width(), tqitemRect.height() ); + const TQRect cellRect ( headerRect.left(), tqitemRect.top(), 400, 200 ); + TQString tipStr; - QStringList RequirementsList = QStringList::split( ",",item->text(2)); - QString RequirementsString="
    "; - for ( QStringList::Iterator it = RequirementsList.begin(); it != RequirementsList.end(); ++it ) + TQStringList RequirementsList = TQStringList::split( ",",item->text(2)); + TQString RequirementsString="
      "; + for ( TQStringList::Iterator it = RequirementsList.begin(); it != RequirementsList.end(); ++it ) RequirementsString+="
    • "+*it+"
      • "; RequirementsString+="
    "; - tipStr = QString ( "

    "+item->text ( 0 )+"

    • "+i18n("Requirements:")+" "+RequirementsString+"
    • "+i18n("Comment:")+" "+item->text(3)+"
    "); + tipStr = TQString ( "

    "+item->text ( 0 )+"

    • "+i18n("Requirements:")+" "+RequirementsString+"
    • "+i18n("Comment:")+" "+item->text(3)+"
    "); tip ( cellRect, tipStr ); } -VpnTypesInfoDialog::VpnTypesInfoDialog ( KVpncConfig *GlobalConfig, QWidget *parent, const char * ) +VpnTypesInfoDialog::VpnTypesInfoDialog ( KVpncConfig *GlobalConfig, TQWidget *parent, const char * ) :KDialogBase ( parent, "Tool_information", true, "", KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ) { main = new ToolsInfoWidgetBase(this); setMainWidget(main); - main->InfoListView->setMinimumSize(main->InfoListView->sizeHint()); + main->InfoListView->setMinimumSize(main->InfoListView->tqsizeHint()); main->InfoListView->removeColumn(6); main->InfoListView->removeColumn(5); main->InfoListView->removeColumn(4); @@ -102,17 +102,17 @@ VpnTypesInfoDialog::VpnTypesInfoDialog ( KVpncConfig *GlobalConfig, QWidget *par main->textLabel1->setText(i18n("The following information about the VPN tyes has been collected:")); - QPixmap ok_icon = KGlobal::iconLoader()->loadIcon( "button_ok", KIcon::NoGroup, 16 ); - QPixmap wrong_icon = KGlobal::iconLoader()->loadIcon( "button_cancel", KIcon::NoGroup, 16 ); + TQPixmap ok_icon = KGlobal::iconLoader()->loadIcon( "button_ok", KIcon::NoGroup, 16 ); + TQPixmap wrong_icon = KGlobal::iconLoader()->loadIcon( "button_cancel", KIcon::NoGroup, 16 ); ToolInfo *tool=0; main->InfoListView->setSorting(1); - VpnTypesInfoList = new QPtrList(); + VpnTypesInfoList = new TQPtrList(); VpnTypesInfoList->setAutoDelete( TRUE ); // the list owns the objects VpnTypeInfo *it; - GlobalConfig->appPointer->setOverrideCursor( QCursor(Qt::WaitCursor) ); + GlobalConfig->appPointer->setOverrideCursor( TQCursor(TQt::WaitCursor) ); Utils UtilsInstance(GlobalConfig); @@ -127,12 +127,12 @@ VpnTypesInfoDialog::VpnTypesInfoDialog ( KVpncConfig *GlobalConfig, QWidget *par if (vpnc_found || vpnclient_found) { it->VpnState=true; - it->state=i18n("%1 found").arg(i18n("all tools")); + it->state=i18n("%1 found").tqarg(i18n("all tools")); } else { it->VpnState=false; - it->state=i18n("%1 missing").arg(i18n("some tools")); + it->state=i18n("%1 missing").tqarg(i18n("some tools")); } if (vpnc_found && !vpnclient_found ) @@ -148,7 +148,7 @@ VpnTypesInfoDialog::VpnTypesInfoDialog ( KVpncConfig *GlobalConfig, QWidget *par it->Comment+=", "+i18n("hybrid support only if vpnc compiled with OpenSSL support"); } - QListViewItem *item = new QListViewItem(main->InfoListView, it->VpnType,it->state, it->Requirements.join(" "+i18n("and")+" "), it->Comment); + TQListViewItem *item = new TQListViewItem(main->InfoListView, it->VpnType,it->state, it->Requirements.join(" "+i18n("and")+" "), it->Comment); if (it->VpnState == true) item->setPixmap(1,ok_icon); else @@ -169,12 +169,12 @@ VpnTypesInfoDialog::VpnTypesInfoDialog ( KVpncConfig *GlobalConfig, QWidget *par if (ipsec_found || racoon_found) { it->VpnState=true; - it->state=i18n("%1 found").arg(i18n("all tools")); + it->state=i18n("%1 found").tqarg(i18n("all tools")); } else { it->VpnState=false; - it->state=i18n("%1 missing").arg(i18n("some tools")); + it->state=i18n("%1 missing").tqarg(i18n("some tools")); } if (ipsec_found && ( !UtilsInstance.getToolInfo("ipsec")->Version.contains ( "Openswan" ) && !UtilsInstance.getToolInfo("ipsec")->Version.contains ( "strongswan" ) )) @@ -187,10 +187,10 @@ VpnTypesInfoDialog::VpnTypesInfoDialog ( KVpncConfig *GlobalConfig, QWidget *par } if (ipsec_found &&UtilsInstance.getToolInfo("ipsec")->Version.contains ( "strongswan" ) ) { - it->Comment+=i18n("%1 detected").arg(i18n("strongSwan")); + it->Comment+=i18n("%1 detected").tqarg(i18n("strongSwan")); } - item = new QListViewItem(main->InfoListView, it->VpnType,it->state, it->Requirements.join(" "+i18n("and")+" "), it->Comment); + item = new TQListViewItem(main->InfoListView, it->VpnType,it->state, it->Requirements.join(" "+i18n("and")+" "), it->Comment); if (it->VpnState == true) item->setPixmap(1,ok_icon); else @@ -213,34 +213,34 @@ VpnTypesInfoDialog::VpnTypesInfoDialog ( KVpncConfig *GlobalConfig, QWidget *par if (pppd_found && pptpd_found && (pppdcap.pppdHasMppeRequiredSupport || pppdcap.pppdHasRequireMppeSupport)) { it->VpnState=true; - it->state=i18n("%1 found").arg(i18n("all tools")); + it->state=i18n("%1 found").tqarg(i18n("all tools")); } else { it->VpnState=false; - it->state=i18n("%1 missing").arg(i18n("some tools")); + it->state=i18n("%1 missing").tqarg(i18n("some tools")); } if (pptpd_found && !pppd_found ) { - it->Comment+=i18n("%1 is missing").arg("pppd"); + it->Comment+=i18n("%1 is missing").tqarg("pppd"); } if (!pptpd_found && pppd_found) { - it->Comment+=i18n("%1 is missing").arg("pptpclient"); + it->Comment+=i18n("%1 is missing").tqarg("pptpclient"); } if (!pptpd_found && !pppd_found) { - it->Comment+=i18n("%1 are missing").arg(i18n("pptpclient and pppd")); + it->Comment+=i18n("%1 are missing").tqarg(i18n("pptpclient and pppd")); } if (!it->Comment.isEmpty()) it->Comment+=", "; if (!pppdcap.pppdHasMppeRequiredSupport && !pppdcap.pppdHasRequireMppeSupport ) - it->Comment+=i18n("%1 are missing").arg(i18n("MPPE support")); + it->Comment+=i18n("%1 are missing").tqarg(i18n("MPPE support")); - item = new QListViewItem(main->InfoListView, it->VpnType,it->state, it->Requirements.join(" "+i18n("and")+" "), it->Comment); + item = new TQListViewItem(main->InfoListView, it->VpnType,it->state, it->Requirements.join(" "+i18n("and")+" "), it->Comment); if (it->VpnState == true) item->setPixmap(1,ok_icon); else @@ -261,28 +261,28 @@ VpnTypesInfoDialog::VpnTypesInfoDialog ( KVpncConfig *GlobalConfig, QWidget *par if (openvpn_found && openssl_found) { it->VpnState=true; - it->state=i18n("%1 found").arg(i18n("all tools")); + it->state=i18n("%1 found").tqarg(i18n("all tools")); } else { it->VpnState=false; - it->state=i18n("%1 missing").arg(i18n("some tools")); + it->state=i18n("%1 missing").tqarg(i18n("some tools")); } if (!openvpn_found && openssl_found ) { - it->Comment+=i18n("%1 is missing").arg("openvpn"); + it->Comment+=i18n("%1 is missing").tqarg("openvpn"); } if (openvpn_found && !openssl_found ) { - it->Comment+=i18n("%1 is missing").arg("openssl"); + it->Comment+=i18n("%1 is missing").tqarg("openssl"); } if (!openvpn_found && !openssl_found) { - it->Comment+=i18n("%1 are missing").arg(i18n("openvpn and openssl")); + it->Comment+=i18n("%1 are missing").tqarg(i18n("openvpn and openssl")); } - item = new QListViewItem(main->InfoListView, it->VpnType,it->state, it->Requirements.join(" "+i18n("and")+" "), it->Comment); + item = new TQListViewItem(main->InfoListView, it->VpnType,it->state, it->Requirements.join(" "+i18n("and")+" "), it->Comment); if (it->VpnState == true) item->setPixmap(1,ok_icon); else @@ -307,12 +307,12 @@ VpnTypesInfoDialog::VpnTypesInfoDialog ( KVpncConfig *GlobalConfig, QWidget *par if ((ipsec_found || racoon_found) && (l2tpd_found || xl2tpd_found || openl2tp_found)) { it->VpnState=true; - it->state=i18n("%1 found").arg(i18n("all tools")); + it->state=i18n("%1 found").tqarg(i18n("all tools")); } else { it->VpnState=false; - it->state=i18n("%1 missing").arg(i18n("some tools")); + it->state=i18n("%1 missing").tqarg(i18n("some tools")); } if (ipsec_found && ( !UtilsInstance.getToolInfo("ipsec")->Version.contains ( "Openswan" ) && !UtilsInstance.getToolInfo("ipsec")->Version.contains ( "strongswan" ) )) @@ -325,26 +325,26 @@ VpnTypesInfoDialog::VpnTypesInfoDialog ( KVpncConfig *GlobalConfig, QWidget *par } if (ipsec_found && UtilsInstance.getToolInfo("ipsec")->Version.contains ( "strongswan" ) ) { - it->Comment+=i18n("%1 detected").arg(i18n("strongSwan")); + it->Comment+=i18n("%1 detected").tqarg(i18n("strongSwan")); } if (l2tpd_found) { it->Comment+=", "; - it->Comment+=i18n("%1 detected").arg(i18n("l2tpd")); + it->Comment+=i18n("%1 detected").tqarg(i18n("l2tpd")); } if (xl2tpd_found) { it->Comment+=", "; - it->Comment+=i18n("%1 detected").arg(i18n("xl2tpd")); + it->Comment+=i18n("%1 detected").tqarg(i18n("xl2tpd")); } if (openl2tp_found) { it->Comment+=", "; - it->Comment+=i18n("%1 detected").arg(i18n("openl2tp")); + it->Comment+=i18n("%1 detected").tqarg(i18n("openl2tp")); } - item = new QListViewItem(main->InfoListView, it->VpnType,it->state, it->Requirements.join(" "+i18n("and")+" "), it->Comment); + item = new TQListViewItem(main->InfoListView, it->VpnType,it->state, it->Requirements.join(" "+i18n("and")+" "), it->Comment); if (it->VpnState == true) item->setPixmap(1,ok_icon); else @@ -365,24 +365,24 @@ VpnTypesInfoDialog::VpnTypesInfoDialog ( KVpncConfig *GlobalConfig, QWidget *par if (vtund_found && pppd_found) { it->VpnState=true; - it->state=i18n("%1 found").arg(i18n("all tools")); + it->state=i18n("%1 found").tqarg(i18n("all tools")); } else { it->VpnState=false; - it->state=i18n("%1 are missing").arg(i18n("some tools")); + it->state=i18n("%1 are missing").tqarg(i18n("some tools")); } if (vtund_found && !pppd_found) { - it->Comment+=i18n("%1 is missing").arg("pppd"); + it->Comment+=i18n("%1 is missing").tqarg("pppd"); } if (!vtund_found && pppd_found ) { - it->Comment+=i18n("%1 is missing").arg("vtun"); + it->Comment+=i18n("%1 is missing").tqarg("vtun"); } - item = new QListViewItem(main->InfoListView, it->VpnType,it->state, it->Requirements.join(" "+i18n("and")+" "), it->Comment); + item = new TQListViewItem(main->InfoListView, it->VpnType,it->state, it->Requirements.join(" "+i18n("and")+" "), it->Comment); if (it->VpnState == true) item->setPixmap(1,ok_icon); else @@ -404,19 +404,19 @@ VpnTypesInfoDialog::VpnTypesInfoDialog ( KVpncConfig *GlobalConfig, QWidget *par if (ssh_found && (ksshaskpass_found || sshaskpassgnome_found)) { it->VpnState=true; - it->state=i18n("%1 found").arg(i18n("all tools")); + it->state=i18n("%1 found").tqarg(i18n("all tools")); } else { it->VpnState=false; if (!ssh_found && (ksshaskpass_found || sshaskpassgnome_found) ) - it->Comment+=i18n("%1 is missing").arg("ssh"); + it->Comment+=i18n("%1 is missing").tqarg("ssh"); else - it->Comment+=i18n("%1 is missing").arg(i18n("Password entry tool")); + it->Comment+=i18n("%1 is missing").tqarg(i18n("Password entry tool")); } - item = new QListViewItem(main->InfoListView, it->VpnType,it->state, it->Requirements.join(" "+i18n("and")+" "), it->Comment); + item = new TQListViewItem(main->InfoListView, it->VpnType,it->state, it->Requirements.join(" "+i18n("and")+" "), it->Comment); if (it->VpnState == true) item->setPixmap(1,ok_icon); else @@ -425,15 +425,15 @@ VpnTypesInfoDialog::VpnTypesInfoDialog ( KVpncConfig *GlobalConfig, QWidget *par main->InfoListView->insertItem(item); VpnTypesInfoList->append(it); - main->InfoListView->setResizeMode(QListView::NoColumn); -// main->InfoListView->setColumnWidthMode(0,QListView::Manual); -// main->InfoListView->setColumnWidthMode(1,QListView::Manual); -// main->InfoListView->setColumnWidthMode(2,QListView::Manual); -// main->InfoListView->setColumnWidthMode(3,QListView::Maximum); -// main->InfoListView->setColumnWidthMode(4,QListView::Maximum); + main->InfoListView->setResizeMode(TQListView::NoColumn); +// main->InfoListView->setColumnWidthMode(0,TQListView::Manual); +// main->InfoListView->setColumnWidthMode(1,TQListView::Manual); +// main->InfoListView->setColumnWidthMode(2,TQListView::Manual); +// main->InfoListView->setColumnWidthMode(3,TQListView::Maximum); +// main->InfoListView->setColumnWidthMode(4,TQListView::Maximum); resize(800,600); - QToolTip::remove( main->InfoListView ); + TQToolTip::remove( main->InfoListView ); new VpnTypesListViewToolTip( main->InfoListView ); GlobalConfig->appPointer->restoreOverrideCursor(); diff --git a/src/vpntypesinfodialog.h b/src/vpntypesinfodialog.h index 4b4fdcb..1c31ee9 100644 --- a/src/vpntypesinfodialog.h +++ b/src/vpntypesinfodialog.h @@ -20,7 +20,7 @@ #ifndef VPNTYPESINFODIALOG_H #define VPNTYPESINFODIALOG_H -#include +#include #include #include "kvpnc.h" #include "kvpncconfig.h" @@ -32,19 +32,19 @@ class VpnTypesInfoDialog: public KDialogBase { public: - VpnTypesInfoDialog(KVpncConfig *GlobalConfig, QWidget *parent = 0, const char *name = 0); + VpnTypesInfoDialog(KVpncConfig *GlobalConfig, TQWidget *parent = 0, const char *name = 0); ToolsInfoWidgetBase *main; ~VpnTypesInfoDialog(); struct VpnTypeInfo { - QString VpnType; - QString Name; - QString state; + TQString VpnType; + TQString Name; + TQString state; bool VpnState; - QString Comment; - QStringList Requirements; + TQString Comment; + TQStringList Requirements; }; - QPtrList *VpnTypesInfoList; + TQPtrList *VpnTypesInfoList; }; diff --git a/src/widgetnotifyhelper.cpp b/src/widgetnotifyhelper.cpp index 6140453..3bd0e3f 100644 --- a/src/widgetnotifyhelper.cpp +++ b/src/widgetnotifyhelper.cpp @@ -18,13 +18,13 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ #include "widgetnotifyhelper.h" -#include +#include #include -WidgetNotifyHelper::WidgetNotifyHelper(QObject *parent, const char *name) - : QObject(parent, name) +WidgetNotifyHelper::WidgetNotifyHelper(TQObject *parent, const char *name) + : TQObject(parent, name) { } @@ -33,61 +33,61 @@ WidgetNotifyHelper::~WidgetNotifyHelper() { } -void WidgetNotifyHelper::setupChangedAction(QWidget *w) +void WidgetNotifyHelper::setupChangedAction(TQWidget *w) { // connect changed signals to own signal - QObject *obj; - QObjectList *list; + TQObject *obj; + TQObjectList *list; - list = w->queryList( "QComboBox" ); + list = w->queryList( TQCOMBOBOX_OBJECT_NAME_STRING ); for ( obj = list->first(); obj; obj = list->next() ) { // std::cout << "obj found: " << obj->name() << std::endl; - connect(obj,SIGNAL(textChanged ( const QString & )),w,SIGNAL(changed())); + connect(obj,TQT_SIGNAL(textChanged ( const TQString & )),w,TQT_SIGNAL(changed())); } list = w->queryList( "KLineEdit" ); for ( obj = list->first(); obj; obj = list->next() ) { // std::cout << "obj found: " << obj->name() << std::endl; - connect(obj,SIGNAL(textChanged ( const QString & )),w,SIGNAL(changed())); + connect(obj,TQT_SIGNAL(textChanged ( const TQString & )),w,TQT_SIGNAL(changed())); } - list = w->queryList( "QLineEdit" ); + list = w->queryList( TQLINEEDIT_OBJECT_NAME_STRING ); for ( obj = list->first(); obj; obj = list->next() ) { // std::cout << "obj found: " << obj->name() << std::endl; - connect(obj,SIGNAL(textChanged (const QString & )),w,SIGNAL(changed())); + connect(obj,TQT_SIGNAL(textChanged (const TQString & )),w,TQT_SIGNAL(changed())); } list = w->queryList( "KUrlRquester" ); for ( obj = list->first(); obj; obj = list->next() ) { // std::cout << "obj found: " << obj->name() << std::endl; - connect(obj,SIGNAL(textChanged ( const QString & )),w,SIGNAL(changed())); + connect(obj,TQT_SIGNAL(textChanged ( const TQString & )),w,TQT_SIGNAL(changed())); } - list = w->queryList( "QSpinBox" ); + list = w->queryList( TQSPINBOX_OBJECT_NAME_STRING ); for ( obj = list->first(); obj; obj = list->next() ) { // std::cout << "obj found: " << obj->name() << std::endl; - connect(obj,SIGNAL(valueChanged ( int )),w,SIGNAL(changed())); + connect(obj,TQT_SIGNAL(valueChanged ( int )),w,TQT_SIGNAL(changed())); } - list = w->queryList( "QCheckBox" ); + list = w->queryList( TQCHECKBOX_OBJECT_NAME_STRING ); for ( obj = list->first(); obj; obj = list->next() ) { // std::cout << "obj found: " << obj->name() << std::endl; - connect(obj,SIGNAL(stateChanged ( int )),w,SIGNAL(changed())); + connect(obj,TQT_SIGNAL(stateChanged ( int )),w,TQT_SIGNAL(changed())); } - list = w->queryList( "QRadioButton" ); + list = w->queryList( TQRADIOBUTTON_OBJECT_NAME_STRING ); for ( obj = list->first(); obj; obj = list->next() ) { // std::cout << "obj found: " << obj->name() << std::endl; - connect(obj,SIGNAL(stateChanged ( int )),w,SIGNAL(changed())); + connect(obj,TQT_SIGNAL(stateChanged ( int )),w,TQT_SIGNAL(changed())); } // connect changed to slot - connect(w,SIGNAL(changed ()),w,SLOT(dialogChanged())); + connect(w,TQT_SIGNAL(changed ()),w,TQT_SLOT(dialogChanged())); } diff --git a/src/widgetnotifyhelper.h b/src/widgetnotifyhelper.h index 0f01671..5aaaaf1 100644 --- a/src/widgetnotifyhelper.h +++ b/src/widgetnotifyhelper.h @@ -20,20 +20,20 @@ #ifndef WIDGETNOTIFYHELPER_H #define WIDGETNOTIFYHELPER_H -#include -#include +#include +#include /** @author Christoph Thielecke */ -class WidgetNotifyHelper : public QObject +class WidgetNotifyHelper : public TQObject { public: - WidgetNotifyHelper(QObject *parent = 0, const char *name = 0); + WidgetNotifyHelper(TQObject *parent = 0, const char *name = 0); ~WidgetNotifyHelper(); public: - void setupChangedAction(QWidget *w); + void setupChangedAction(TQWidget *w); }; #endif -- cgit v1.2.1