summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:33:13 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:33:13 -0600
commit1d9c18c8a07f4833695c6a2ab978698ae1cc90e7 (patch)
treec61f8778c1c540d79ed77c3f69018fcba0bca646 /src
parent2622d5ad003c636cda4bc36246df8a7fe9ac5d9f (diff)
downloadkvpnc-1d9c18c8a07f4833695c6a2ab978698ae1cc90e7.tar.gz
kvpnc-1d9c18c8a07f4833695c6a2ab978698ae1cc90e7.zip
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'src')
-rw-r--r--src/addnetworkroutedialog.cpp2
-rw-r--r--src/addnetworkroutedialogbase.ui12
-rw-r--r--src/advancedprofiledialogbase.ui2
-rw-r--r--src/advancedprofilesettingsdialogbase.ui42
-rw-r--r--src/advancedsettingsdialog.cpp2
-rw-r--r--src/ciscocertificateenrollment.cpp6
-rw-r--r--src/ciscocertificateenrollmentbase.ui8
-rw-r--r--src/ciscocertificateenrollmentdatadialogbase.ui38
-rw-r--r--src/ciscopasswddecoder.cpp6
-rw-r--r--src/configconnectoptionsbase.ui14
-rw-r--r--src/configdaemonoptions.cpp2
-rw-r--r--src/configdaemonoptionsbase.ui210
-rw-r--r--src/configdebugoptionsbase.ui18
-rw-r--r--src/configgeneraloptions.ui18
-rw-r--r--src/confighelperprogramoptionsbase.ui140
-rw-r--r--src/configlogoptionsbase.ui36
-rw-r--r--src/displaycertdialog.cpp2
-rw-r--r--src/displaycertdialogbase.ui102
-rw-r--r--src/enterpassworddialog.cpp4
-rw-r--r--src/enterpassworddialogbase.ui22
-rw-r--r--src/enterxauthinteractivepasscodedialog.cpp2
-rw-r--r--src/enterxauthinteractivepasscodedialogbase.ui14
-rw-r--r--src/generateopenvpnkeydialog.cpp12
-rw-r--r--src/generateopenvpnkeydialogbase.ui4
-rw-r--r--src/helpdialogbase.ui4
-rw-r--r--src/importcertificatedialog.cpp36
-rw-r--r--src/importcertificatedialogbase.ui12
-rw-r--r--src/importipsecprofiledialog.cpp4
-rw-r--r--src/importopenvpnprofiledialog.cpp30
-rw-r--r--src/importopenvpnprofiledialogbase.ui10
-rw-r--r--src/importprofiledialog.cpp56
-rw-r--r--src/importprofiledialogbase.ui10
-rw-r--r--src/kfeedback.cpp12
-rw-r--r--src/kvpnc.cpp702
-rw-r--r--src/kvpnc.h14
-rw-r--r--src/kvpncconfig.cpp178
-rw-r--r--src/kvpncconfig.h8
-rw-r--r--src/kvpncimportprofileselectiondialogbase.ui16
-rw-r--r--src/kvpnckicker.cpp4
-rw-r--r--src/kvpnckicker.h4
-rw-r--r--src/listviewtooltip.h10
-rw-r--r--src/logviewerdialog.cpp4
-rw-r--r--src/logviewerdialogbase.ui8
-rw-r--r--src/mainview.cpp4
-rw-r--r--src/mainviewbase.ui4
-rw-r--r--src/manageciscocert.cpp8
-rw-r--r--src/manageciscocertbase.ui16
-rw-r--r--src/networkinterface.cpp6
-rw-r--r--src/newprofiledialog.cpp12
-rw-r--r--src/newprofiledialog.h2
-rw-r--r--src/newprofiledialogbase.ui20
-rw-r--r--src/newprofilewizard.cpp148
-rw-r--r--src/newprofilewizardauthselection.ui4
-rw-r--r--src/newprofilewizardcert.ui52
-rw-r--r--src/newprofilewizardciscomanually.ui16
-rw-r--r--src/newprofilewizardciscoselection.ui4
-rw-r--r--src/newprofilewizardconnectionstatuscheck.ui22
-rw-r--r--src/newprofilewizardconnectoptions.ui14
-rw-r--r--src/newprofilewizardfreeswan.ui62
-rw-r--r--src/newprofilewizardgeneral.ui10
-rw-r--r--src/newprofilewizardnat.ui16
-rw-r--r--src/newprofilewizardnetwork.ui24
-rw-r--r--src/newprofilewizardnetworkroute.ui12
-rw-r--r--src/newprofilewizardopenvpn.ui52
-rw-r--r--src/newprofilewizardopenvpnauth.ui22
-rw-r--r--src/newprofilewizardopenvpnselection.ui4
-rw-r--r--src/newprofilewizardp12certselection.ui8
-rw-r--r--src/newprofilewizardpptp.ui18
-rw-r--r--src/newprofilewizardpsk.ui20
-rw-r--r--src/newprofilewizardracoon.ui64
-rw-r--r--src/newprofilewizardstart.ui4
-rw-r--r--src/newprofilewizardtypeselection.ui8
-rw-r--r--src/newprofilewizarduser.ui16
-rw-r--r--src/openvpnmanagementhandler.cpp66
-rw-r--r--src/preferencesdialog.cpp102
-rw-r--r--src/preferencesdialog.h2
-rw-r--r--src/profilecertoptionsbase.ui70
-rw-r--r--src/profileciscooptionsbase.ui60
-rw-r--r--src/profilecmdexecafterconnectoptionsbase.ui8
-rw-r--r--src/profilecmdexecafterdisconnectoptionsbase.ui2
-rw-r--r--src/profilecmdexecbeforeconnectoptionsbase.ui2
-rw-r--r--src/profilecmdexecbeforedisconnectoptionsbase.ui2
-rw-r--r--src/profilegeneraloptionsbase.ui10
-rw-r--r--src/profileipsecoptionsbase.ui80
-rw-r--r--src/profilemanagerbase.cpp6
-rw-r--r--src/profilenetworkgeneraloptionsbase.ui64
-rw-r--r--src/profilenetworkhttpproxyoptionsbase.ui26
-rw-r--r--src/profilenetworknatoptionsbase.ui16
-rw-r--r--src/profilenetworkrouteoptions.cpp2
-rw-r--r--src/profilenetworkrouteoptionsbase.ui12
-rw-r--r--src/profilenetworkvirtualipoptionsbase.ui16
-rw-r--r--src/profileopenvpnoptionsbase.ui40
-rw-r--r--src/profilepptpoptionsbase.ui36
-rw-r--r--src/profilepskoptionsbase.ui20
-rw-r--r--src/profileracoonoptionsbase.ui72
-rw-r--r--src/profilesmartcardoptionsbase.ui30
-rw-r--r--src/profilesshoptionsbase.ui24
-rw-r--r--src/profileuseroptionsbase.ui22
-rw-r--r--src/profilevtunoptionsbase.ui20
-rw-r--r--src/toolinfo.cpp12
-rw-r--r--src/toolsinfodialog.cpp16
-rw-r--r--src/toolsinfowidgetbase.ui2
-rw-r--r--src/utils.cpp28
-rw-r--r--src/vpntypesinfodialog.cpp70
104 files changed, 1725 insertions, 1725 deletions
diff --git a/src/addnetworkroutedialog.cpp b/src/addnetworkroutedialog.cpp
index b823884..b36ceb3 100644
--- a/src/addnetworkroutedialog.cpp
+++ b/src/addnetworkroutedialog.cpp
@@ -31,7 +31,7 @@ AddNetworkRouteDialog::AddNetworkRouteDialog(TQWidget *parent, const TQString& c
{
main = new AddNetworkRouteDialogBase (this);
setMainWidget(main);
- main->setMinimumSize(main->tqsizeHint());
+ main->setMinimumSize(main->sizeHint());
connect(main->UseGatewayCheckBox,TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(useGatewayToggled(bool)));
connect(main->UseInterfaceCheckBox,TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(useInterfaceToggled(bool)));
diff --git a/src/addnetworkroutedialogbase.ui b/src/addnetworkroutedialogbase.ui
index bb2c355..5bc5684 100644
--- a/src/addnetworkroutedialogbase.ui
+++ b/src/addnetworkroutedialogbase.ui
@@ -27,7 +27,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout12</cstring>
+ <cstring>layout12</cstring>
</property>
<vbox>
<property name="name">
@@ -35,7 +35,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<hbox>
<property name="name">
@@ -214,7 +214,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@@ -247,7 +247,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>49</width>
<height>20</height>
@@ -272,7 +272,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout11</cstring>
+ <cstring>layout11</cstring>
</property>
<hbox>
<property name="name">
@@ -305,7 +305,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>88</width>
<height>20</height>
diff --git a/src/advancedprofiledialogbase.ui b/src/advancedprofiledialogbase.ui
index 2bba094..c073d20 100644
--- a/src/advancedprofiledialogbase.ui
+++ b/src/advancedprofiledialogbase.ui
@@ -43,7 +43,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>56</height>
diff --git a/src/advancedprofilesettingsdialogbase.ui b/src/advancedprofilesettingsdialogbase.ui
index 8092d5a..fb80693 100644
--- a/src/advancedprofilesettingsdialogbase.ui
+++ b/src/advancedprofilesettingsdialogbase.ui
@@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout15</cstring>
+ <cstring>layout15</cstring>
</property>
<vbox>
<property name="name">
@@ -54,7 +54,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout39</cstring>
+ <cstring>layout39</cstring>
</property>
<vbox>
<property name="name">
@@ -62,7 +62,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout38</cstring>
+ <cstring>layout38</cstring>
</property>
<grid>
<property name="name">
@@ -92,7 +92,7 @@
</widget>
<widget class="TQLayoutWidget" row="12" column="1">
<property name="name">
- <cstring>tqlayout75_2</cstring>
+ <cstring>layout75_2</cstring>
</property>
<hbox>
<property name="name">
@@ -119,7 +119,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>181</width>
<height>20</height>
@@ -149,7 +149,7 @@
</widget>
<widget class="TQLayoutWidget" row="10" column="1">
<property name="name">
- <cstring>tqlayout76</cstring>
+ <cstring>layout76</cstring>
</property>
<hbox>
<property name="name">
@@ -176,7 +176,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>110</width>
<height>20</height>
@@ -256,7 +256,7 @@
</widget>
<widget class="TQLayoutWidget" row="11" column="1">
<property name="name">
- <cstring>tqlayout75</cstring>
+ <cstring>layout75</cstring>
</property>
<hbox>
<property name="name">
@@ -283,7 +283,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>181</width>
<height>20</height>
@@ -316,7 +316,7 @@
</widget>
<widget class="TQLayoutWidget" row="5" column="1">
<property name="name">
- <cstring>tqlayout15</cstring>
+ <cstring>layout15</cstring>
</property>
<hbox>
<property name="name">
@@ -346,7 +346,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>167</width>
<height>21</height>
@@ -387,7 +387,7 @@
</widget>
<widget class="TQLayoutWidget" row="4" column="1">
<property name="name">
- <cstring>tqlayout78</cstring>
+ <cstring>layout78</cstring>
</property>
<hbox>
<property name="name">
@@ -414,7 +414,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>141</width>
<height>20</height>
@@ -436,7 +436,7 @@
</widget>
<widget class="TQLayoutWidget" row="14" column="1">
<property name="name">
- <cstring>tqlayout15_2</cstring>
+ <cstring>layout15_2</cstring>
</property>
<hbox>
<property name="name">
@@ -472,7 +472,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>167</width>
<height>21</height>
@@ -488,7 +488,7 @@
</widget>
<widget class="TQLayoutWidget" row="9" column="1">
<property name="name">
- <cstring>tqlayout77</cstring>
+ <cstring>layout77</cstring>
</property>
<hbox>
<property name="name">
@@ -515,7 +515,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>121</width>
<height>20</height>
@@ -537,7 +537,7 @@
</widget>
<widget class="TQLayoutWidget" row="13" column="1">
<property name="name">
- <cstring>tqlayout75_2_2</cstring>
+ <cstring>layout75_2_2</cstring>
</property>
<hbox>
<property name="name">
@@ -564,7 +564,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>181</width>
<height>20</height>
@@ -585,7 +585,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -637,7 +637,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/src/advancedsettingsdialog.cpp b/src/advancedsettingsdialog.cpp
index 08a4fe9..8459ed0 100644
--- a/src/advancedsettingsdialog.cpp
+++ b/src/advancedsettingsdialog.cpp
@@ -35,7 +35,7 @@ AdvancedSettingsDialog::AdvancedSettingsDialog(TQWidget *parent, const TQString&
{
main = new AdvancedProfileDialogBase(this);
setMainWidget(main);
- main->setMinimumSize(main->tqsizeHint());
+ main->setMinimumSize(main->sizeHint());
this->currentProfile = currentProfile;
this->connectionType = connectionType;
diff --git a/src/ciscocertificateenrollment.cpp b/src/ciscocertificateenrollment.cpp
index 02eb4af..f1e1ae5 100644
--- a/src/ciscocertificateenrollment.cpp
+++ b/src/ciscocertificateenrollment.cpp
@@ -103,7 +103,7 @@ void CiscoCertificateEnrollment::setupPages()
{
GlobalConfig->appPointer->setOverrideCursor( TQCursor(TQt::WaitCursor) );
selectionpage = new CiscoCertificateEnrollmentBase ( 0 );
- selectionpage->tqsizeHint();
+ selectionpage->sizeHint();
addPage ( selectionpage, "<b>" + i18n ( "Select enrollment type..." ) + "</b>" );
connect ( selectionpage->FileEnrollementRadioButton, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( enrollmentToggled ( bool ) ) );
@@ -127,11 +127,11 @@ void CiscoCertificateEnrollment::setupPages()
}
datapage = new CiscoCertificateEnrollmentDataDialog ( 0, "datapage",GlobalConfig );
- datapage->tqsizeHint();
+ datapage->sizeHint();
addPage ( datapage, "<b>" + i18n ( "Enter certificate data..." ) + "</b>" );
finishpage = new CiscoCertificateEnrollmentFinishWidgetBase ( 0 );
- finishpage->tqsizeHint();
+ finishpage->sizeHint();
addPage ( finishpage, "<b>" + i18n ( "Finish" ) + "</b>" );
GlobalConfig->appPointer->restoreOverrideCursor();
diff --git a/src/ciscocertificateenrollmentbase.ui b/src/ciscocertificateenrollmentbase.ui
index 9d05906..bb2f312 100644
--- a/src/ciscocertificateenrollmentbase.ui
+++ b/src/ciscocertificateenrollmentbase.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout71</cstring>
+ <cstring>layout71</cstring>
</property>
<vbox>
<property name="name">
@@ -96,7 +96,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>331</width>
<height>21</height>
@@ -113,7 +113,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>331</width>
<height>21</height>
@@ -236,7 +236,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/src/ciscocertificateenrollmentdatadialogbase.ui b/src/ciscocertificateenrollmentdatadialogbase.ui
index ae65436..56f5bb9 100644
--- a/src/ciscocertificateenrollmentdatadialogbase.ui
+++ b/src/ciscocertificateenrollmentdatadialogbase.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout73</cstring>
+ <cstring>layout73</cstring>
</property>
<vbox>
<property name="name">
@@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout72</cstring>
+ <cstring>layout72</cstring>
</property>
<grid>
<property name="name">
@@ -37,7 +37,7 @@
</property>
<widget class="TQLayoutWidget" row="3" column="0">
<property name="name">
- <cstring>tqlayout69</cstring>
+ <cstring>layout69</cstring>
</property>
<hbox>
<property name="name">
@@ -61,7 +61,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>21</height>
@@ -72,7 +72,7 @@
</widget>
<widget class="TQLayoutWidget" row="6" column="0">
<property name="name">
- <cstring>tqlayout65</cstring>
+ <cstring>layout65</cstring>
</property>
<hbox>
<property name="name">
@@ -96,7 +96,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -117,7 +117,7 @@
</widget>
<widget class="TQLayoutWidget" row="4" column="0">
<property name="name">
- <cstring>tqlayout68</cstring>
+ <cstring>layout68</cstring>
</property>
<hbox>
<property name="name">
@@ -141,7 +141,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -152,7 +152,7 @@
</widget>
<widget class="TQLayoutWidget" row="5" column="0">
<property name="name">
- <cstring>tqlayout67</cstring>
+ <cstring>layout67</cstring>
</property>
<hbox>
<property name="name">
@@ -176,7 +176,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -187,7 +187,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout63</cstring>
+ <cstring>layout63</cstring>
</property>
<hbox>
<property name="name">
@@ -211,7 +211,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>21</height>
@@ -227,7 +227,7 @@
</widget>
<widget class="TQLayoutWidget" row="7" column="0">
<property name="name">
- <cstring>tqlayout64</cstring>
+ <cstring>layout64</cstring>
</property>
<hbox>
<property name="name">
@@ -251,7 +251,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -267,7 +267,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
- <cstring>tqlayout70</cstring>
+ <cstring>layout70</cstring>
</property>
<hbox>
<property name="name">
@@ -291,7 +291,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -322,7 +322,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout62</cstring>
+ <cstring>layout62</cstring>
</property>
<hbox>
<property name="name">
@@ -346,7 +346,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>21</height>
@@ -367,7 +367,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>41</height>
diff --git a/src/ciscopasswddecoder.cpp b/src/ciscopasswddecoder.cpp
index 3529373..771b979 100644
--- a/src/ciscopasswddecoder.cpp
+++ b/src/ciscopasswddecoder.cpp
@@ -21,7 +21,7 @@
#include "ciscopasswddecoder.h"
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <kmessagebox.h>
#include <klocale.h>
@@ -78,7 +78,7 @@ TQString p;
int i, l;
for (i = 0; str[i] != '\0'; i++)
- if (hex2bin_c(TQChar(str[i]).tqunicode()) == -1)
+ if (hex2bin_c(TQChar(str[i]).unicode()) == -1)
return EINVAL;
l = i;
@@ -87,7 +87,7 @@ TQString p;
l /= 2;
for (i = 0; i < l; i++)
- p+= hex2bin_c(TQChar(str[i*2]).tqunicode()) << 4 | hex2bin_c(TQChar(str[i*2+1]).tqunicode());
+ p+= hex2bin_c(TQChar(str[i*2]).unicode()) << 4 | hex2bin_c(TQChar(str[i*2+1]).unicode());
bin = p;
if (len)
diff --git a/src/configconnectoptionsbase.ui b/src/configconnectoptionsbase.ui
index eb15636..2192f86 100644
--- a/src/configconnectoptionsbase.ui
+++ b/src/configconnectoptionsbase.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout10</cstring>
+ <cstring>layout10</cstring>
</property>
<hbox>
<property name="name">
@@ -65,7 +65,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>154</width>
<height>20</height>
@@ -76,7 +76,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout11</cstring>
+ <cstring>layout11</cstring>
</property>
<hbox>
<property name="name">
@@ -115,7 +115,7 @@ about the active connecions</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>210</width>
<height>20</height>
@@ -134,7 +134,7 @@ about the active connecions</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>16</height>
@@ -143,7 +143,7 @@ about the active connecions</string>
</spacer>
<widget class="TQLayoutWidget" row="3" column="0">
<property name="name">
- <cstring>tqlayout12</cstring>
+ <cstring>layout12</cstring>
</property>
<hbox>
<property name="name">
@@ -176,7 +176,7 @@ about the active connecions</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>59</width>
<height>20</height>
diff --git a/src/configdaemonoptions.cpp b/src/configdaemonoptions.cpp
index 8f76f63..6bd707a 100644
--- a/src/configdaemonoptions.cpp
+++ b/src/configdaemonoptions.cpp
@@ -31,7 +31,7 @@
#include <tqlabel.h>
#include <kurlrequester.h>
#include <kcombobox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
diff --git a/src/configdaemonoptionsbase.ui b/src/configdaemonoptionsbase.ui
index 315ebae..929d145 100644
--- a/src/configdaemonoptionsbase.ui
+++ b/src/configdaemonoptionsbase.ui
@@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout154</cstring>
+ <cstring>layout154</cstring>
</property>
<hbox>
<property name="name">
@@ -37,7 +37,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout153</cstring>
+ <cstring>layout153</cstring>
</property>
<vbox>
<property name="name">
@@ -45,7 +45,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout39</cstring>
+ <cstring>layout39</cstring>
</property>
<hbox>
<property name="name">
@@ -81,7 +81,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>71</width>
<height>31</height>
@@ -123,7 +123,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<vbox>
<property name="name">
@@ -131,7 +131,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@@ -158,7 +158,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -177,7 +177,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -197,7 +197,7 @@
<property name="enabled">
<bool>true</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
@@ -217,7 +217,7 @@
<property name="scaledContents">
<bool>true</bool>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignJustify|AlignVCenter</set>
</property>
<property name="toolTip" stdset="0">
@@ -228,7 +228,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@@ -281,7 +281,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -310,7 +310,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout7_2</cstring>
+ <cstring>layout7_2</cstring>
</property>
<vbox>
<property name="name">
@@ -318,7 +318,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout6_2</cstring>
+ <cstring>layout6_2</cstring>
</property>
<hbox>
<property name="name">
@@ -345,7 +345,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -364,7 +364,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -384,7 +384,7 @@
<property name="enabled">
<bool>true</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
@@ -404,7 +404,7 @@
<property name="scaledContents">
<bool>true</bool>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignJustify|AlignVCenter</set>
</property>
<property name="toolTip" stdset="0">
@@ -415,7 +415,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout4_2</cstring>
+ <cstring>layout4_2</cstring>
</property>
<hbox>
<property name="name">
@@ -468,7 +468,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -497,7 +497,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout15</cstring>
+ <cstring>layout15</cstring>
</property>
<vbox>
<property name="name">
@@ -505,7 +505,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<hbox>
<property name="name">
@@ -532,7 +532,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>60</width>
<height>20</height>
@@ -551,7 +551,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -571,7 +571,7 @@
<property name="enabled">
<bool>true</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
@@ -591,7 +591,7 @@
<property name="scaledContents">
<bool>true</bool>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignJustify|AlignVCenter</set>
</property>
<property name="toolTip" stdset="0">
@@ -604,7 +604,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout162</cstring>
+ <cstring>layout162</cstring>
</property>
<hbox>
<property name="name">
@@ -623,7 +623,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout158</cstring>
+ <cstring>layout158</cstring>
</property>
<vbox>
<property name="name">
@@ -631,7 +631,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout157</cstring>
+ <cstring>layout157</cstring>
</property>
<grid>
<property name="name">
@@ -775,7 +775,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout161</cstring>
+ <cstring>layout161</cstring>
</property>
<vbox>
<property name="name">
@@ -783,7 +783,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout160</cstring>
+ <cstring>layout160</cstring>
</property>
<hbox>
<property name="name">
@@ -791,7 +791,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout159</cstring>
+ <cstring>layout159</cstring>
</property>
<grid>
<property name="name">
@@ -938,7 +938,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout71</cstring>
+ <cstring>layout71</cstring>
</property>
<vbox>
<property name="name">
@@ -946,7 +946,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout10</cstring>
+ <cstring>layout10</cstring>
</property>
<grid>
<property name="name">
@@ -959,7 +959,7 @@
<property name="enabled">
<bool>true</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
@@ -979,7 +979,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>87</width>
<height>20</height>
@@ -1006,7 +1006,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -1029,7 +1029,7 @@
<property name="scaledContents">
<bool>true</bool>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignJustify|AlignVCenter</set>
</property>
<property name="toolTip" stdset="0">
@@ -1040,7 +1040,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout70</cstring>
+ <cstring>layout70</cstring>
</property>
<hbox>
<property name="name">
@@ -1048,7 +1048,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout69</cstring>
+ <cstring>layout69</cstring>
</property>
<hbox>
<property name="name">
@@ -1083,7 +1083,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout68</cstring>
+ <cstring>layout68</cstring>
</property>
<hbox>
<property name="name">
@@ -1099,7 +1099,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>117</width>
<height>20</height>
@@ -1144,7 +1144,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout13</cstring>
+ <cstring>layout13</cstring>
</property>
<hbox>
<property name="name">
@@ -1171,7 +1171,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>82</width>
<height>20</height>
@@ -1190,7 +1190,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -1210,7 +1210,7 @@
<property name="enabled">
<bool>true</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
@@ -1230,7 +1230,7 @@
<property name="scaledContents">
<bool>true</bool>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignJustify|AlignVCenter</set>
</property>
<property name="toolTip" stdset="0">
@@ -1241,7 +1241,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout13_2</cstring>
+ <cstring>layout13_2</cstring>
</property>
<hbox>
<property name="name">
@@ -1268,7 +1268,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>82</width>
<height>20</height>
@@ -1287,7 +1287,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -1307,7 +1307,7 @@
<property name="enabled">
<bool>true</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
@@ -1327,7 +1327,7 @@
<property name="scaledContents">
<bool>true</bool>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignJustify|AlignVCenter</set>
</property>
<property name="toolTip" stdset="0">
@@ -1338,7 +1338,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout36</cstring>
+ <cstring>layout36</cstring>
</property>
<hbox>
<property name="name">
@@ -1346,7 +1346,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout34</cstring>
+ <cstring>layout34</cstring>
</property>
<hbox>
<property name="name">
@@ -1379,7 +1379,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>21</height>
@@ -1390,7 +1390,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout33</cstring>
+ <cstring>layout33</cstring>
</property>
<hbox>
<property name="name">
@@ -1423,7 +1423,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>21</height>
@@ -1436,7 +1436,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="0">
<property name="name">
- <cstring>tqlayout56</cstring>
+ <cstring>layout56</cstring>
</property>
<hbox>
<property name="name">
@@ -1486,7 +1486,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="1">
<property name="name">
- <cstring>tqlayout57</cstring>
+ <cstring>layout57</cstring>
</property>
<hbox>
<property name="name">
@@ -1502,7 +1502,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>80</width>
<height>21</height>
@@ -1569,7 +1569,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout18</cstring>
+ <cstring>layout18</cstring>
</property>
<vbox>
<property name="name">
@@ -1577,7 +1577,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout16</cstring>
+ <cstring>layout16</cstring>
</property>
<hbox>
<property name="name">
@@ -1604,7 +1604,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>87</width>
<height>20</height>
@@ -1623,7 +1623,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -1643,7 +1643,7 @@
<property name="enabled">
<bool>true</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
@@ -1663,7 +1663,7 @@
<property name="scaledContents">
<bool>true</bool>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignJustify|AlignVCenter</set>
</property>
<property name="toolTip" stdset="0">
@@ -1674,7 +1674,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout17</cstring>
+ <cstring>layout17</cstring>
</property>
<hbox>
<property name="name">
@@ -1727,7 +1727,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>151</width>
<height>20</height>
@@ -1756,7 +1756,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout36</cstring>
+ <cstring>layout36</cstring>
</property>
<vbox>
<property name="name">
@@ -1764,7 +1764,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout16_2</cstring>
+ <cstring>layout16_2</cstring>
</property>
<hbox>
<property name="name">
@@ -1791,7 +1791,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>87</width>
<height>20</height>
@@ -1810,7 +1810,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -1830,7 +1830,7 @@
<property name="enabled">
<bool>true</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
@@ -1850,7 +1850,7 @@
<property name="scaledContents">
<bool>true</bool>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignJustify|AlignVCenter</set>
</property>
<property name="toolTip" stdset="0">
@@ -1861,7 +1861,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout35</cstring>
+ <cstring>layout35</cstring>
</property>
<hbox>
<property name="name">
@@ -1917,7 +1917,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout16_2_2</cstring>
+ <cstring>layout16_2_2</cstring>
</property>
<hbox>
<property name="name">
@@ -1944,7 +1944,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>87</width>
<height>20</height>
@@ -1963,7 +1963,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -1983,7 +1983,7 @@
<property name="enabled">
<bool>true</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
@@ -2003,7 +2003,7 @@
<property name="scaledContents">
<bool>true</bool>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignJustify|AlignVCenter</set>
</property>
<property name="toolTip" stdset="0">
@@ -2014,7 +2014,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout37</cstring>
+ <cstring>layout37</cstring>
</property>
<hbox>
<property name="name">
@@ -2022,7 +2022,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout65_2</cstring>
+ <cstring>layout65_2</cstring>
</property>
<hbox>
<property name="name">
@@ -2045,7 +2045,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
- <cstring>tqlayout37</cstring>
+ <cstring>layout37</cstring>
</property>
<grid>
<property name="name">
@@ -2115,7 +2115,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout36_2</cstring>
+ <cstring>layout36_2</cstring>
</property>
<vbox>
<property name="name">
@@ -2123,7 +2123,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout16_2_3</cstring>
+ <cstring>layout16_2_3</cstring>
</property>
<hbox>
<property name="name">
@@ -2150,7 +2150,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>87</width>
<height>20</height>
@@ -2169,7 +2169,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -2189,7 +2189,7 @@
<property name="enabled">
<bool>true</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
@@ -2209,7 +2209,7 @@
<property name="scaledContents">
<bool>true</bool>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignJustify|AlignVCenter</set>
</property>
<property name="toolTip" stdset="0">
@@ -2220,7 +2220,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout35_2</cstring>
+ <cstring>layout35_2</cstring>
</property>
<hbox>
<property name="name">
@@ -2268,7 +2268,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout16_2_2_2</cstring>
+ <cstring>layout16_2_2_2</cstring>
</property>
<hbox>
<property name="name">
@@ -2295,7 +2295,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>87</width>
<height>20</height>
@@ -2314,7 +2314,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -2334,7 +2334,7 @@
<property name="enabled">
<bool>true</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
@@ -2354,7 +2354,7 @@
<property name="scaledContents">
<bool>true</bool>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignJustify|AlignVCenter</set>
</property>
<property name="toolTip" stdset="0">
@@ -2381,7 +2381,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout140</cstring>
+ <cstring>layout140</cstring>
</property>
<vbox>
<property name="name">
@@ -2389,7 +2389,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout16_2_2_2_2</cstring>
+ <cstring>layout16_2_2_2_2</cstring>
</property>
<hbox>
<property name="name">
@@ -2416,7 +2416,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>87</width>
<height>20</height>
@@ -2435,7 +2435,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -2455,7 +2455,7 @@
<property name="enabled">
<bool>true</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
@@ -2475,7 +2475,7 @@
<property name="scaledContents">
<bool>true</bool>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignJustify|AlignVCenter</set>
</property>
<property name="toolTip" stdset="0">
@@ -2486,7 +2486,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout139</cstring>
+ <cstring>layout139</cstring>
</property>
<hbox>
<property name="name">
@@ -2539,7 +2539,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>365</width>
<height>20</height>
@@ -2562,7 +2562,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -2581,7 +2581,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>21</height>
diff --git a/src/configdebugoptionsbase.ui b/src/configdebugoptionsbase.ui
index 274a5ce..e72eee3 100644
--- a/src/configdebugoptionsbase.ui
+++ b/src/configdebugoptionsbase.ui
@@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@@ -62,7 +62,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>110</width>
<height>20</height>
@@ -73,7 +73,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<hbox>
<property name="name">
@@ -106,7 +106,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>170</width>
<height>20</height>
@@ -117,7 +117,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<hbox>
<property name="name">
@@ -170,7 +170,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>150</width>
<height>20</height>
@@ -181,7 +181,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="0">
<property name="name">
- <cstring>tqlayout10</cstring>
+ <cstring>layout10</cstring>
</property>
<hbox>
<property name="name">
@@ -211,7 +211,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>110</width>
<height>20</height>
@@ -230,7 +230,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
diff --git a/src/configgeneraloptions.ui b/src/configgeneraloptions.ui
index fbcef37..1286932 100644
--- a/src/configgeneraloptions.ui
+++ b/src/configgeneraloptions.ui
@@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<hbox>
<property name="name">
@@ -39,7 +39,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<vbox>
<property name="name">
@@ -47,7 +47,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@@ -80,7 +80,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>110</width>
<height>20</height>
@@ -91,7 +91,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout11</cstring>
+ <cstring>layout11</cstring>
</property>
<hbox>
<property name="name">
@@ -121,7 +121,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -132,7 +132,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout11_2</cstring>
+ <cstring>layout11_2</cstring>
</property>
<hbox>
<property name="name">
@@ -162,7 +162,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -181,7 +181,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>80</height>
diff --git a/src/confighelperprogramoptionsbase.ui b/src/confighelperprogramoptionsbase.ui
index 9ee6be2..452047c 100644
--- a/src/confighelperprogramoptionsbase.ui
+++ b/src/confighelperprogramoptionsbase.ui
@@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout233</cstring>
+ <cstring>layout233</cstring>
</property>
<vbox>
<property name="name">
@@ -32,7 +32,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout232</cstring>
+ <cstring>layout232</cstring>
</property>
<grid>
<property name="name">
@@ -40,7 +40,7 @@
</property>
<widget class="TQLayoutWidget" row="7" column="0">
<property name="name">
- <cstring>tqlayout21</cstring>
+ <cstring>layout21</cstring>
</property>
<hbox>
<property name="name">
@@ -67,7 +67,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>146</width>
<height>20</height>
@@ -80,7 +80,7 @@
<property name="name">
<cstring>IptablesStatePixmapLabel</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
@@ -119,7 +119,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -139,7 +139,7 @@
<property name="enabled">
<bool>true</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
@@ -153,7 +153,7 @@
<property name="name">
<cstring>KillStatePixmapLabel</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
@@ -181,7 +181,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -198,7 +198,7 @@
<property name="name">
<cstring>IpStatePixmapLabel</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
@@ -226,7 +226,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -241,7 +241,7 @@
</widget>
<widget class="TQLayoutWidget" row="9" column="0">
<property name="name">
- <cstring>tqlayout23</cstring>
+ <cstring>layout23</cstring>
</property>
<hbox>
<property name="name">
@@ -268,7 +268,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>146</width>
<height>16</height>
@@ -284,7 +284,7 @@
<property name="enabled">
<bool>true</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
@@ -298,7 +298,7 @@
<property name="name">
<cstring>OpensslStatePixmapLabel</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
@@ -316,7 +316,7 @@
</widget>
<widget class="TQLayoutWidget" row="10" column="0">
<property name="name">
- <cstring>tqlayout24</cstring>
+ <cstring>layout24</cstring>
</property>
<hbox>
<property name="name">
@@ -343,7 +343,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>146</width>
<height>16</height>
@@ -364,7 +364,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -389,7 +389,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -404,7 +404,7 @@
</widget>
<widget class="TQLayoutWidget" row="5" column="0">
<property name="name">
- <cstring>tqlayout19</cstring>
+ <cstring>layout19</cstring>
</property>
<hbox>
<property name="name">
@@ -431,7 +431,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>146</width>
<height>20</height>
@@ -447,7 +447,7 @@
<property name="enabled">
<bool>true</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
@@ -461,7 +461,7 @@
<property name="name">
<cstring>Pkcs11ToolStatePixmapLabel</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
@@ -479,7 +479,7 @@
</widget>
<widget class="TQLayoutWidget" row="12" column="0">
<property name="name">
- <cstring>tqlayout24_2_2</cstring>
+ <cstring>layout24_2_2</cstring>
</property>
<hbox>
<property name="name">
@@ -506,7 +506,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>146</width>
<height>16</height>
@@ -517,7 +517,7 @@
</widget>
<widget class="TQLayoutWidget" row="13" column="0">
<property name="name">
- <cstring>tqlayout24_2_3</cstring>
+ <cstring>layout24_2_3</cstring>
</property>
<hbox>
<property name="name">
@@ -544,7 +544,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>146</width>
<height>16</height>
@@ -560,7 +560,7 @@
<property name="enabled">
<bool>true</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
@@ -577,7 +577,7 @@
<property name="enabled">
<bool>true</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
@@ -589,7 +589,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout15</cstring>
+ <cstring>layout15</cstring>
</property>
<hbox>
<property name="name">
@@ -616,7 +616,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>146</width>
<height>20</height>
@@ -629,7 +629,7 @@
<property name="name">
<cstring>KsshaskpassStatePixmapLabel</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
@@ -657,7 +657,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -682,7 +682,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -697,7 +697,7 @@
</widget>
<widget class="TQLayoutWidget" row="4" column="0">
<property name="name">
- <cstring>tqlayout18</cstring>
+ <cstring>layout18</cstring>
</property>
<hbox>
<property name="name">
@@ -724,7 +724,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>146</width>
<height>20</height>
@@ -737,7 +737,7 @@
<property name="name">
<cstring>CiscoCertMgrStatePixmapLabel</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
@@ -765,7 +765,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -782,7 +782,7 @@
<property name="name">
<cstring>GnomeaskpassStatePixmapLabel</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
@@ -800,7 +800,7 @@
</widget>
<widget class="TQLayoutWidget" row="8" column="0">
<property name="name">
- <cstring>tqlayout22</cstring>
+ <cstring>layout22</cstring>
</property>
<hbox>
<property name="name">
@@ -827,7 +827,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>146</width>
<height>16</height>
@@ -843,7 +843,7 @@
<property name="enabled">
<bool>true</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
@@ -857,7 +857,7 @@
<property name="name">
<cstring>IfconfigStatePixmapLabel</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
@@ -875,7 +875,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout25</cstring>
+ <cstring>layout25</cstring>
</property>
<hbox>
<property name="name">
@@ -902,7 +902,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>146</width>
<height>20</height>
@@ -913,7 +913,7 @@
</widget>
<widget class="TQLayoutWidget" row="6" column="0">
<property name="name">
- <cstring>tqlayout20</cstring>
+ <cstring>layout20</cstring>
</property>
<hbox>
<property name="name">
@@ -940,7 +940,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>146</width>
<height>20</height>
@@ -956,7 +956,7 @@
<property name="enabled">
<bool>true</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
@@ -973,7 +973,7 @@
<property name="enabled">
<bool>true</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
@@ -985,7 +985,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
- <cstring>tqlayout16</cstring>
+ <cstring>layout16</cstring>
</property>
<hbox>
<property name="name">
@@ -1012,7 +1012,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>146</width>
<height>20</height>
@@ -1028,7 +1028,7 @@
<property name="enabled">
<bool>true</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
@@ -1050,7 +1050,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -1070,7 +1070,7 @@
<property name="enabled">
<bool>true</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
@@ -1103,7 +1103,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -1128,7 +1128,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -1145,7 +1145,7 @@
<property name="name">
<cstring>TailStatePixmapLabel</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
@@ -1165,7 +1165,7 @@
<property name="name">
<cstring>KillallStatePixmapLabel</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
@@ -1185,7 +1185,7 @@
<property name="name">
<cstring>PingStatePixmapLabel</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
@@ -1213,7 +1213,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -1230,7 +1230,7 @@
<property name="name">
<cstring>RouteStatePixmapLabel</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
@@ -1253,7 +1253,7 @@
<property name="enabled">
<bool>true</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
@@ -1275,7 +1275,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -1295,7 +1295,7 @@
<property name="enabled">
<bool>true</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
@@ -1312,7 +1312,7 @@
<property name="enabled">
<bool>true</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
@@ -1324,7 +1324,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="0">
<property name="name">
- <cstring>tqlayout17</cstring>
+ <cstring>layout17</cstring>
</property>
<hbox>
<property name="name">
@@ -1351,7 +1351,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>146</width>
<height>20</height>
@@ -1362,7 +1362,7 @@
</widget>
<widget class="TQLayoutWidget" row="11" column="0">
<property name="name">
- <cstring>tqlayout24_2</cstring>
+ <cstring>layout24_2</cstring>
</property>
<hbox>
<property name="name">
@@ -1389,7 +1389,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>146</width>
<height>16</height>
@@ -1410,7 +1410,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>130</height>
diff --git a/src/configlogoptionsbase.ui b/src/configlogoptionsbase.ui
index 6e3bc31..79bb662 100644
--- a/src/configlogoptionsbase.ui
+++ b/src/configlogoptionsbase.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<vbox>
<property name="name">
@@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout57_3</cstring>
+ <cstring>layout57_3</cstring>
</property>
<hbox>
<property name="name">
@@ -76,7 +76,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -87,7 +87,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout211</cstring>
+ <cstring>layout211</cstring>
</property>
<hbox>
<property name="name">
@@ -117,7 +117,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>61</width>
<height>20</height>
@@ -152,7 +152,7 @@
<property name="name">
<cstring>RemoteLogLabel</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>25</width>
<height>25</height>
@@ -176,7 +176,7 @@
<property name="name">
<cstring>InfoLogLabel</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>25</width>
<height>25</height>
@@ -203,7 +203,7 @@
<property name="name">
<cstring>ErrorLogLabel</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>25</width>
<height>25</height>
@@ -233,7 +233,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>173</width>
<height>20</height>
@@ -250,7 +250,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>173</width>
<height>20</height>
@@ -289,7 +289,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>173</width>
<height>20</height>
@@ -306,7 +306,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>173</width>
<height>20</height>
@@ -364,7 +364,7 @@
<property name="name">
<cstring>SuccessLogLabel</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>25</width>
<height>25</height>
@@ -405,7 +405,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>173</width>
<height>20</height>
@@ -430,7 +430,7 @@
<property name="name">
<cstring>DebugLogLabel</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>25</width>
<height>25</height>
@@ -471,7 +471,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>43</width>
<height>20</height>
@@ -496,7 +496,7 @@
<property name="name">
<cstring>BackgroundLogLabel</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>25</width>
<height>25</height>
@@ -539,7 +539,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>20</height>
diff --git a/src/displaycertdialog.cpp b/src/displaycertdialog.cpp
index 802314b..4bf4be6 100644
--- a/src/displaycertdialog.cpp
+++ b/src/displaycertdialog.cpp
@@ -29,7 +29,7 @@ DisplayCertDialog::DisplayCertDialog(TQWidget *parent, const char* caption, KVpn
{
main = new DisplayCertDialogBase ( this );
setMainWidget ( main );
- main->setMinimumSize ( main->tqsizeHint() );
+ main->setMinimumSize ( main->sizeHint() );
this->GlobalConfig = GlobalConfig;
}
diff --git a/src/displaycertdialogbase.ui b/src/displaycertdialogbase.ui
index 3f09e98..43a02d1 100644
--- a/src/displaycertdialogbase.ui
+++ b/src/displaycertdialogbase.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout131</cstring>
+ <cstring>layout131</cstring>
</property>
<vbox>
<property name="name">
@@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout130</cstring>
+ <cstring>layout130</cstring>
</property>
<grid>
<property name="name">
@@ -45,7 +45,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
- <cstring>tqlayout62</cstring>
+ <cstring>layout62</cstring>
</property>
<hbox>
<property name="name">
@@ -69,7 +69,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>21</height>
@@ -80,7 +80,7 @@
</widget>
<widget class="TQLayoutWidget" row="12" column="0">
<property name="name">
- <cstring>tqlayout64_2_3</cstring>
+ <cstring>layout64_2_3</cstring>
</property>
<hbox>
<property name="name">
@@ -104,7 +104,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -117,7 +117,7 @@
<property name="name">
<cstring>SerialLineEdit</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>350</width>
<height>0</height>
@@ -131,7 +131,7 @@
<property name="name">
<cstring>KeySizeLineEdit</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>350</width>
<height>0</height>
@@ -145,7 +145,7 @@
<property name="name">
<cstring>DomainLineEdit</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>350</width>
<height>0</height>
@@ -157,7 +157,7 @@
</widget>
<widget class="TQLayoutWidget" row="13" column="0">
<property name="name">
- <cstring>tqlayout64_2_3_2</cstring>
+ <cstring>layout64_2_3_2</cstring>
</property>
<hbox>
<property name="name">
@@ -181,7 +181,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -194,7 +194,7 @@
<property name="name">
<cstring>EmailLineEdit</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>350</width>
<height>0</height>
@@ -206,7 +206,7 @@
</widget>
<widget class="TQLayoutWidget" row="10" column="0">
<property name="name">
- <cstring>tqlayout64_2</cstring>
+ <cstring>layout64_2</cstring>
</property>
<hbox>
<property name="name">
@@ -230,7 +230,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -243,7 +243,7 @@
<property name="name">
<cstring>SubjectLineEdit</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>350</width>
<height>0</height>
@@ -255,7 +255,7 @@
</widget>
<widget class="TQLayoutWidget" row="15" column="0">
<property name="name">
- <cstring>tqlayout64_2_3_3_2</cstring>
+ <cstring>layout64_2_3_3_2</cstring>
</property>
<hbox>
<property name="name">
@@ -279,7 +279,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -290,7 +290,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout109</cstring>
+ <cstring>layout109</cstring>
</property>
<hbox>
<property name="name">
@@ -300,7 +300,7 @@
<property name="name">
<cstring>textLabel18</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
@@ -309,7 +309,7 @@
<property name="text">
<string>&lt;b&gt;Data of certificate:&lt;/b&gt;</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter</set>
</property>
</widget>
@@ -323,7 +323,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>21</height>
@@ -336,7 +336,7 @@
<property name="name">
<cstring>ValidToLineEdit</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>350</width>
<height>0</height>
@@ -348,7 +348,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="0">
<property name="name">
- <cstring>tqlayout63</cstring>
+ <cstring>layout63</cstring>
</property>
<hbox>
<property name="name">
@@ -372,7 +372,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>21</height>
@@ -383,7 +383,7 @@
</widget>
<widget class="TQLayoutWidget" row="7" column="0">
<property name="name">
- <cstring>tqlayout67</cstring>
+ <cstring>layout67</cstring>
</property>
<hbox>
<property name="name">
@@ -407,7 +407,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -418,7 +418,7 @@
</widget>
<widget class="TQLayoutWidget" row="9" column="0">
<property name="name">
- <cstring>tqlayout64</cstring>
+ <cstring>layout64</cstring>
</property>
<hbox>
<property name="name">
@@ -442,7 +442,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -453,7 +453,7 @@
</widget>
<widget class="TQLayoutWidget" row="8" column="0">
<property name="name">
- <cstring>tqlayout65</cstring>
+ <cstring>layout65</cstring>
</property>
<hbox>
<property name="name">
@@ -477,7 +477,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -490,7 +490,7 @@
<property name="name">
<cstring>NameLineEdit</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>350</width>
<height>0</height>
@@ -504,7 +504,7 @@
<property name="name">
<cstring>CompanyLineEdit</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>350</width>
<height>0</height>
@@ -516,7 +516,7 @@
</widget>
<widget class="TQLayoutWidget" row="14" column="0">
<property name="name">
- <cstring>tqlayout64_2_3_3</cstring>
+ <cstring>layout64_2_3_3</cstring>
</property>
<hbox>
<property name="name">
@@ -540,7 +540,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -553,7 +553,7 @@
<property name="name">
<cstring>ValidFromLineEdit</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>350</width>
<height>0</height>
@@ -565,7 +565,7 @@
</widget>
<widget class="TQLayoutWidget" row="6" column="0">
<property name="name">
- <cstring>tqlayout68</cstring>
+ <cstring>layout68</cstring>
</property>
<hbox>
<property name="name">
@@ -589,7 +589,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -602,7 +602,7 @@
<property name="name">
<cstring>IssuerLineEdit</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>350</width>
<height>0</height>
@@ -616,7 +616,7 @@
<property name="name">
<cstring>DepartmentLineEdit</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>350</width>
<height>0</height>
@@ -630,7 +630,7 @@
<property name="name">
<cstring>CountryLineEdit</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>350</width>
<height>0</height>
@@ -652,7 +652,7 @@
<property name="name">
<cstring>IpLineEdit</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>350</width>
<height>0</height>
@@ -664,7 +664,7 @@
</widget>
<widget class="TQLayoutWidget" row="11" column="0">
<property name="name">
- <cstring>tqlayout64_2_2</cstring>
+ <cstring>layout64_2_2</cstring>
</property>
<hbox>
<property name="name">
@@ -688,7 +688,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -701,7 +701,7 @@
<property name="name">
<cstring>StateLineEdit</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>350</width>
<height>0</height>
@@ -713,7 +713,7 @@
</widget>
<widget class="TQLayoutWidget" row="5" column="0">
<property name="name">
- <cstring>tqlayout69</cstring>
+ <cstring>layout69</cstring>
</property>
<hbox>
<property name="name">
@@ -737,7 +737,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>21</height>
@@ -748,7 +748,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout62_2</cstring>
+ <cstring>layout62_2</cstring>
</property>
<hbox>
<property name="name">
@@ -772,7 +772,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>21</height>
@@ -783,7 +783,7 @@
</widget>
<widget class="TQLayoutWidget" row="4" column="0">
<property name="name">
- <cstring>tqlayout70</cstring>
+ <cstring>layout70</cstring>
</property>
<hbox>
<property name="name">
@@ -807,7 +807,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -828,7 +828,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>30</height>
diff --git a/src/enterpassworddialog.cpp b/src/enterpassworddialog.cpp
index 0946d2b..be96482 100644
--- a/src/enterpassworddialog.cpp
+++ b/src/enterpassworddialog.cpp
@@ -36,7 +36,7 @@ EnterUsernamePasswordDialog::EnterUsernamePasswordDialog(TQWidget *parent, const
main = new EnterUsernamePasswordDialogBase(this);
setMainWidget(main);
- main->setMinimumSize(main->tqsizeHint());
+ main->setMinimumSize(main->sizeHint());
if (!askForGrouppassword)
{
@@ -83,7 +83,7 @@ void EnterUsernamePasswordDialog::accept()
}
if (!msg.isEmpty())
{
- KMessageBox::sorry( 0, i18n( "All fields must be filled in. Please check:\n%1").tqarg(msg));
+ KMessageBox::sorry( 0, i18n( "All fields must be filled in. Please check:\n%1").arg(msg));
ok=false;
}
diff --git a/src/enterpassworddialogbase.ui b/src/enterpassworddialogbase.ui
index e475840..21e0268 100644
--- a/src/enterpassworddialogbase.ui
+++ b/src/enterpassworddialogbase.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout12</cstring>
+ <cstring>layout12</cstring>
</property>
<vbox>
<property name="name">
@@ -37,7 +37,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@@ -45,7 +45,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<vbox>
<property name="name">
@@ -53,7 +53,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<vbox>
<property name="name">
@@ -61,7 +61,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<grid>
<property name="name">
@@ -99,7 +99,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>156</width>
<height>20</height>
@@ -144,7 +144,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>88</width>
<height>20</height>
@@ -172,7 +172,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>156</width>
<height>20</height>
@@ -231,7 +231,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>156</width>
<height>20</height>
@@ -294,7 +294,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -313,7 +313,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>21</height>
diff --git a/src/enterxauthinteractivepasscodedialog.cpp b/src/enterxauthinteractivepasscodedialog.cpp
index 32d0e3c..94771ad 100644
--- a/src/enterxauthinteractivepasscodedialog.cpp
+++ b/src/enterxauthinteractivepasscodedialog.cpp
@@ -31,7 +31,7 @@ EnterXauthInteractivePasscodeDialog::EnterXauthInteractivePasscodeDialog( TQWidg
this->allowEmptyPassword = allowEmptyPassword;
main = new EnterXauthInteractivePasscodeDialogBase( this );
setMainWidget( main );
- main->setMinimumSize( main->tqsizeHint() );
+ main->setMinimumSize( main->sizeHint() );
}
EnterXauthInteractivePasscodeDialog::~ EnterXauthInteractivePasscodeDialog() {
diff --git a/src/enterxauthinteractivepasscodedialogbase.ui b/src/enterxauthinteractivepasscodedialogbase.ui
index 8f8c090..0f5903e 100644
--- a/src/enterxauthinteractivepasscodedialogbase.ui
+++ b/src/enterxauthinteractivepasscodedialogbase.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout138</cstring>
+ <cstring>layout138</cstring>
</property>
<vbox>
<property name="name">
@@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout137</cstring>
+ <cstring>layout137</cstring>
</property>
<grid>
<property name="name">
@@ -48,7 +48,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout136</cstring>
+ <cstring>layout136</cstring>
</property>
<hbox>
<property name="name">
@@ -72,7 +72,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>151</width>
<height>21</height>
@@ -83,7 +83,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<grid>
<property name="name">
@@ -99,7 +99,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>83</width>
<height>20</height>
@@ -139,7 +139,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>45</height>
diff --git a/src/generateopenvpnkeydialog.cpp b/src/generateopenvpnkeydialog.cpp
index 04e13e9..8fdc1ae 100644
--- a/src/generateopenvpnkeydialog.cpp
+++ b/src/generateopenvpnkeydialog.cpp
@@ -39,7 +39,7 @@ GenerateOpenvpnKeyDialog::GenerateOpenvpnKeyDialog(KVpncConfig *GlobalConfig,TQW
genOk = false;
main = new GenerateOpenvpnKeyDialogBase(this);
setMainWidget(main);
- //main->setMinimumSize(main->tqsizeHint());
+ //main->setMinimumSize(main->sizeHint());
main->FilenameUrlrequester->setFilter( "*.key" );
@@ -91,12 +91,12 @@ void GenerateOpenvpnKeyDialog::canAccept()
connect( generateOpenvpnKeyProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdErr() ) );
if ( !generateOpenvpnKeyProcess->start(env) )
{
- KMessageBox::sorry( this, i18n( "Generating of %1 key failed!" ).tqarg( "openvpn" ) );
- GlobalConfig->appendLogEntry(i18n( "\"%1\" start failed!" ).tqarg( "openvpn" ),GlobalConfig->error);
+ KMessageBox::sorry( this, i18n( "Generating of %1 key failed!" ).arg( "openvpn" ) );
+ GlobalConfig->appendLogEntry(i18n( "\"%1\" start failed!" ).arg( "openvpn" ),GlobalConfig->error);
}
else
{
- GlobalConfig->appendLogEntry( i18n("Generating of %1 key was successful.").tqarg("openvpn"), GlobalConfig->info);
+ GlobalConfig->appendLogEntry( i18n("Generating of %1 key was successful.").arg("openvpn"), GlobalConfig->info);
genOk = true;
}
@@ -109,9 +109,9 @@ void GenerateOpenvpnKeyDialog::canAccept()
delete generateOpenvpnKeyProcess;
generateOpenvpnKeyProcess = 0L;
if (genOk)
- KMessageBox::information( this, i18n( "Generating the key in \"%1\" was successful." ).tqarg( filename ) );
+ KMessageBox::information( this, i18n( "Generating the key in \"%1\" was successful." ).arg( filename ) );
else
- KMessageBox::sorry( this, i18n( "Generating the key in \"%1\" failed!" ).tqarg( filename ) );
+ KMessageBox::sorry( this, i18n( "Generating the key in \"%1\" failed!" ).arg( filename ) );
//std::cout << "accept" << std::endl;
TQDialog::accept();
}
diff --git a/src/generateopenvpnkeydialogbase.ui b/src/generateopenvpnkeydialogbase.ui
index 8316804..d968cf4 100644
--- a/src/generateopenvpnkeydialogbase.ui
+++ b/src/generateopenvpnkeydialogbase.ui
@@ -22,7 +22,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<vbox>
<property name="name">
@@ -30,7 +30,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<grid>
<property name="name">
diff --git a/src/helpdialogbase.ui b/src/helpdialogbase.ui
index 0c8e5f8..dfe21c4 100644
--- a/src/helpdialogbase.ui
+++ b/src/helpdialogbase.ui
@@ -12,7 +12,7 @@
<height>604</height>
</rect>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>800</width>
<height>600</height>
@@ -81,7 +81,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/src/importcertificatedialog.cpp b/src/importcertificatedialog.cpp
index e6b0030..3ed4456 100644
--- a/src/importcertificatedialog.cpp
+++ b/src/importcertificatedialog.cpp
@@ -33,7 +33,7 @@
#include <iostream>
#include <tqfile.h>
#include <tqdir.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqcursor.h>
#include <tqcheckbox.h>
#include <tqurl.h>
@@ -48,7 +48,7 @@ ImportCertificateDialog::ImportCertificateDialog ( TQWidget *parent, const char*
{
main = new ImportCertificateDialogBase ( this );
setMainWidget ( main );
- main->setMinimumSize ( main->tqsizeHint() );
+ main->setMinimumSize ( main->sizeHint() );
this->GlobalConfig = GlobalConfig;
filename = "";
@@ -490,7 +490,7 @@ void ImportCertificateDialog::accept()
processname="openssl";
if ( GlobalConfig->KvpncDebugLevel >3 )
- GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2" ).tqarg("accept()").arg ( i18n ( " import password" ) ),GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2" ).arg("accept()").arg ( i18n ( " import password" ) ),GlobalConfig->debug );
if ( main->ImportPasswordEdit->text().isEmpty() )
ImportProcess->writeToStdin ( "\n" );
@@ -642,7 +642,7 @@ void ImportCertificateDialog::doCacert()
{
disconnect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doCacert() ) );
if ( GlobalConfig->KvpncDebugLevel > 3 )
- GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).tqarg("doCacert()"),GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).arg("doCacert()"),GlobalConfig->debug );
if ( ImportProcess->normalExit () )
{
@@ -695,7 +695,7 @@ void ImportCertificateDialog::doCacert()
{
if ( GlobalConfig->KvpncDebugLevel > 3 )
- GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2" ).tqarg("doCacert()").arg ( i18n ( " import password" ) ),GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2" ).arg("doCacert()").arg ( i18n ( " import password" ) ),GlobalConfig->debug );
if ( main->ImportPasswordEdit->text().isEmpty() )
ImportProcess->writeToStdin ( "\n" );
@@ -766,7 +766,7 @@ void ImportCertificateDialog::doPrivateKey()
{
if ( GlobalConfig->KvpncDebugLevel > 3 )
- GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2" ).tqarg("doPrivateKey()").arg ( i18n ( " import password" ) ),GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2" ).arg("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..." ).tqarg("doPrivateKey").arg ( i18n ( " private key password" ) ),GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).arg("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..." ).tqarg("doPrivateKey").arg ( i18n ( " private key password dummy" ) ),GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).arg("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..." ).tqarg("doPrivateKey").arg ( i18n ( " private key password" ) ),GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).arg("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..." ).tqarg("doPrivateKey").arg ( i18n ( " private key password dummy" ) ),GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).arg("doPrivateKey").arg ( i18n ( " private key password dummy" ) ),GlobalConfig->debug );
// we need 4 chars here
ImportProcess->writeToStdin ( "abcd\n" );
@@ -826,7 +826,7 @@ void ImportCertificateDialog::doCreateHash()
disconnect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doCreateHash() ) );
if ( GlobalConfig->KvpncDebugLevel > 3 )
- GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).tqarg("doCreateHash()"),GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).arg("doCreateHash()"),GlobalConfig->debug );
if ( ImportProcess->normalExit () )
{
@@ -866,7 +866,7 @@ void ImportCertificateDialog::doCreateHash()
{
if ( GlobalConfig->KvpncDebugLevel > 3 )
- GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2" ).tqarg("doCreateHash()").arg ( i18n ( " import password" ) ),GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2" ).arg("doCreateHash()").arg ( i18n ( " import password" ) ),GlobalConfig->debug );
if ( main->ImportPasswordEdit->text().isEmpty() )
ImportProcess->writeToStdin ( "\n" );
@@ -894,7 +894,7 @@ void ImportCertificateDialog::doLink()
{
disconnect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doLink() ) );
if ( GlobalConfig->KvpncDebugLevel > 3 )
- GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).tqarg("doLink()"),GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).arg("doLink()"),GlobalConfig->debug );
if ( ImportProcess->normalExit () )
{
@@ -957,7 +957,7 @@ void ImportCertificateDialog::doLink()
void ImportCertificateDialog::exit()
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
- GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).tqarg("exit()"),GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).arg("exit()"),GlobalConfig->debug );
if ( (ImportProcess != 0L && ImportProcess->normalExit() ) || ImportProcess == 0L )
@@ -1021,14 +1021,14 @@ void ImportCertificateDialog::readFromStdout_import()
if ( main->UsePrivateKeyPasswordCheckBox->isChecked() )
{
if ( GlobalConfig->KvpncDebugLevel > 3 )
- GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).tqarg("doPrivateKey").arg ( i18n ( " private key password" ) ),GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).arg("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..." ).tqarg("doPrivateKey").arg ( i18n ( " private key password dummy" ) ),GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).arg("doPrivateKey").arg ( i18n ( " private key password dummy" ) ),GlobalConfig->debug );
// we need 4 chars here
ImportProcess->writeToStdin ( "abcd\n" );
@@ -1313,7 +1313,7 @@ void ImportCertificateDialog::removePrivateKey()
{
disconnect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( removePrivateKey() ) );
if ( GlobalConfig->KvpncDebugLevel > 3 )
- GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).tqarg("removePrivateKey()"),GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).arg("removePrivateKey()"),GlobalConfig->debug );
if ( ImportProcess->normalExit () )
{
@@ -1349,7 +1349,7 @@ void ImportCertificateDialog::removePrivateKey()
{
if ( GlobalConfig->KvpncDebugLevel > 3 )
- GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).tqarg("removePrivateKey()").arg ( i18n ( " private key password dummy" ) ),GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).arg("removePrivateKey()").arg ( i18n ( " private key password dummy" ) ),GlobalConfig->debug );
// we need 4 chars here
ImportProcess->writeToStdin ( "abcd\n" );
diff --git a/src/importcertificatedialogbase.ui b/src/importcertificatedialogbase.ui
index 8213ac1..94a94b5 100644
--- a/src/importcertificatedialogbase.ui
+++ b/src/importcertificatedialogbase.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout19</cstring>
+ <cstring>layout19</cstring>
</property>
<vbox>
<property name="name">
@@ -80,7 +80,7 @@
<property name="name">
<cstring>FilenameUrlrequester</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
@@ -100,7 +100,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>100</width>
<height>20</height>
@@ -172,7 +172,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>80</width>
<height>20</height>
@@ -189,7 +189,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>60</width>
<height>20</height>
@@ -302,7 +302,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>20</height>
diff --git a/src/importipsecprofiledialog.cpp b/src/importipsecprofiledialog.cpp
index c448819..77ebefb 100644
--- a/src/importipsecprofiledialog.cpp
+++ b/src/importipsecprofiledialog.cpp
@@ -37,7 +37,7 @@
#include <tqfile.h>
#include <tqurl.h>
#include <kurl.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqcheckbox.h>
#include <tqlistview.h>
#include <string>
@@ -70,7 +70,7 @@ ImportIpsecProfileDialog::ImportIpsecProfileDialog ( KVpncConfig *GlobalConfig,
main = new ImportOpenvpnProfileDialogBase ( this );
setMainWidget ( main );
- //main->setMinimumSize(main->tqsizeHint());
+ //main->setMinimumSize(main->sizeHint());
main->FilenameUrlrequester->setFilter ( "*.conf" );
main->FilenameUrlrequester->setURL ( filename );
diff --git a/src/importopenvpnprofiledialog.cpp b/src/importopenvpnprofiledialog.cpp
index 61ed32e..54980c5 100644
--- a/src/importopenvpnprofiledialog.cpp
+++ b/src/importopenvpnprofiledialog.cpp
@@ -36,7 +36,7 @@
#include <tqfile.h>
#include <tqurl.h>
#include <kurl.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqcheckbox.h>
#include <string>
#include <tqprocess.h>
@@ -63,7 +63,7 @@ ImportOpenvpnProfileDialog::ImportOpenvpnProfileDialog ( KVpncConfig *config, TQ
main = new ImportOpenvpnProfileDialogBase ( this );
setMainWidget ( main );
- //main->setMinimumSize(main->tqsizeHint());
+ //main->setMinimumSize(main->sizeHint());
main->FilenameUrlrequester->setFilter ( "*.ovpn *.conf" );
@@ -761,7 +761,7 @@ void ImportOpenvpnProfileDialog::canAccept()
{
acc->setAuthenticationDirection(tlsauthdirection);
if ( config->KvpncDebugLevel > 0 )
- config->appendLogEntry ( i18n ( "OpenVPN import: use TLS auth direction: %1" ).tqarg(tlsauthdirection), config->debug );
+ config->appendLogEntry ( i18n ( "OpenVPN import: use TLS auth direction: %1" ).arg(tlsauthdirection), config->debug );
}
}
else if ( line.startsWith ( "redirect-gateway" ) )
@@ -965,7 +965,7 @@ void ImportOpenvpnProfileDialog::canAccept()
// TQTextStream CaCertDstStream( &CaCertFileDst );
//
// if ( config->KvpncDebugLevel > 1 )
-// config->appendLogEntry( i18n( "OpenVPN import: try to copy ca cert file %1 to %2." ).tqarg( CaCertFileSrc.name() ).tqarg( CaCertFileDst.name() ), config->debug );
+// config->appendLogEntry( i18n( "OpenVPN import: try to copy ca cert file %1 to %2." ).arg( CaCertFileSrc.name() ).arg( CaCertFileDst.name() ), config->debug );
//
//
// if ( CaCertFileSrc.open( IO_ReadOnly ) ) {
@@ -974,17 +974,17 @@ void ImportOpenvpnProfileDialog::canAccept()
// CaCertDstStream << CaCertFileString;
// CaCertFileDst.close();
// if ( config->KvpncDebugLevel > 1 )
-// config->appendLogEntry( i18n( "OpenVPN import: ca cert file %1 copied to %2." ).tqarg( CaCertFileSrc.name() ).tqarg( CaCertFileDst.name() ), config->debug );
+// config->appendLogEntry( i18n( "OpenVPN import: ca cert file %1 copied to %2." ).arg( CaCertFileSrc.name() ).arg( CaCertFileDst.name() ), config->debug );
// } else {
// if ( config->KvpncDebugLevel > 2 )
-// config->appendLogEntry( i18n( "OpenVPN import: ca cert file %1 could not open for writing." ).tqarg( CaCertFileDst.name() ), config->debug );
+// config->appendLogEntry( i18n( "OpenVPN import: ca cert file %1 could not open for writing." ).arg( 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." ).tqarg( CaCertFileSrc.name() ), config->debug );
+// config->appendLogEntry( i18n( "OpenVPN import: ca cert file %1 could not open for reading." ).arg( CaCertFileSrc.name() ), config->debug );
//
// // return;
// }
@@ -1001,7 +1001,7 @@ void ImportOpenvpnProfileDialog::canAccept()
// TQTextStream X509CertDstStream( &X509CertFileDst );
//
// if ( config->KvpncDebugLevel > 1 )
-// config->appendLogEntry( i18n( "OpenVPN import: try to copy pre shared key file %1 to %2." ).tqarg( X509CertFileSrc.name() ).tqarg( X509CertFileDst.name() ), config->debug );
+// config->appendLogEntry( i18n( "OpenVPN import: try to copy pre shared key file %1 to %2." ).arg( X509CertFileSrc.name() ).arg( X509CertFileDst.name() ), config->debug );
//
//
// if ( X509CertFileSrc.open( IO_ReadOnly ) ) {
@@ -1010,17 +1010,17 @@ void ImportOpenvpnProfileDialog::canAccept()
// X509CertDstStream << X509CertFileString;
// X509CertFileDst.close();
// if ( config->KvpncDebugLevel > 2 )
-// config->appendLogEntry( i18n( "OpenVPN import: X509 cert file %1 copied to %2." ).tqarg( X509CertFileSrc.name() ).tqarg( X509CertFileDst.name() ), config->debug );
+// config->appendLogEntry( i18n( "OpenVPN import: X509 cert file %1 copied to %2." ).arg( X509CertFileSrc.name() ).arg( X509CertFileDst.name() ), config->debug );
// } else {
// if ( config->KvpncDebugLevel > 2 )
-// config->appendLogEntry( i18n( "OpenVPN import: X509 cert file %1 could not open for writing." ).tqarg( X509CertFileDst.name() ), config->debug );
+// config->appendLogEntry( i18n( "OpenVPN import: X509 cert file %1 could not open for writing." ).arg( 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." ).tqarg( X509CertFileSrc.name() ), config->debug );
+// config->appendLogEntry( i18n( "OpenVPN import: X509 cert file %1 could not open for reading." ).arg( X509CertFileSrc.name() ), config->debug );
//
// // return;
// }
@@ -1037,7 +1037,7 @@ void ImportOpenvpnProfileDialog::canAccept()
// TQTextStream PreSharedKeyDstStream( &PreSharedKeyFileDst );
//
// if ( config->KvpncDebugLevel > 1 )
-// config->appendLogEntry( i18n( "OpenVPN import: try to copy pre shared key file %1 to %2." ).tqarg( PreSharedKeyFileSrc.name() ).tqarg( PreSharedKeyFileDst.name() ), config->debug );
+// config->appendLogEntry( i18n( "OpenVPN import: try to copy pre shared key file %1 to %2." ).arg( PreSharedKeyFileSrc.name() ).arg( PreSharedKeyFileDst.name() ), config->debug );
//
// if ( PreSharedKeyFileSrc.open( IO_ReadOnly ) ) {
// if ( PreSharedKeyFileDst.open( IO_WriteOnly ) ) {
@@ -1045,17 +1045,17 @@ void ImportOpenvpnProfileDialog::canAccept()
// PreSharedKeyDstStream << PreSharedKeyFileString;
// PreSharedKeyFileDst.close();
// if ( config->KvpncDebugLevel > 2 )
-// config->appendLogEntry( i18n( "OpenVPN import: pre shared key file %1 copied to %2." ).tqarg( PreSharedKeyFileSrc.name() ).tqarg( PreSharedKeyFileDst.name() ), config->debug );
+// config->appendLogEntry( i18n( "OpenVPN import: pre shared key file %1 copied to %2." ).arg( PreSharedKeyFileSrc.name() ).arg( PreSharedKeyFileDst.name() ), config->debug );
// } else {
// if ( config->KvpncDebugLevel > 2 )
-// config->appendLogEntry( i18n( "OpenVPN import: pre shared key file %1 could not open for writing." ).tqarg( PreSharedKeyFileDst.name() ), config->debug );
+// config->appendLogEntry( i18n( "OpenVPN import: pre shared key file %1 could not open for writing." ).arg( 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." ).tqarg( PreSharedKeyFileSrc.name() ), config->debug );
+// config->appendLogEntry( i18n( "OpenVPN import: pre shared key file %1 could not open for reading." ).arg( PreSharedKeyFileSrc.name() ), config->debug );
//
// // return;
// }
diff --git a/src/importopenvpnprofiledialogbase.ui b/src/importopenvpnprofiledialogbase.ui
index 7b9e459..7cf5bae 100644
--- a/src/importopenvpnprofiledialogbase.ui
+++ b/src/importopenvpnprofiledialogbase.ui
@@ -13,7 +13,7 @@
<height>143</height>
</rect>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>400</width>
<height>0</height>
@@ -28,7 +28,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout52</cstring>
+ <cstring>layout52</cstring>
</property>
<grid>
<property name="name">
@@ -36,7 +36,7 @@
</property>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
- <cstring>tqlayout51</cstring>
+ <cstring>layout51</cstring>
</property>
<grid>
<property name="name">
@@ -52,7 +52,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>241</width>
<height>21</height>
@@ -74,7 +74,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout204</cstring>
+ <cstring>layout204</cstring>
</property>
<hbox>
<property name="name">
diff --git a/src/importprofiledialog.cpp b/src/importprofiledialog.cpp
index bf5f1f8..f6bdbed 100644
--- a/src/importprofiledialog.cpp
+++ b/src/importprofiledialog.cpp
@@ -30,7 +30,7 @@
#include <tqfile.h>
#include <tqurl.h>
#include <kurl.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqcheckbox.h>
#include <tqfileinfo.h>
#include <string>
@@ -57,7 +57,7 @@ ImportProfileDialog::ImportProfileDialog(KVpncConfig *GlobalConfig, TQWidget *pa
main = new ImportProfileDialogBase(this);
setMainWidget(main);
- main->setMinimumSize(main->tqsizeHint());
+ main->setMinimumSize(main->sizeHint());
main->FilenameUrlrequester->setFilter( "*.pcf" );
main->FilenameUrlrequester->setURL(filename);
@@ -108,7 +108,7 @@ void ImportProfileDialog::canAccept()
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);
+ GlobalConfig->appendLogEntry(i18n("PCF import: groups found: [ %1 ]").arg(groups), GlobalConfig->debug);
}
config.setGroup( "main" );
@@ -154,12 +154,12 @@ void ImportProfileDialog::canAccept()
TQString Description = config.readEntry( "Description", "" );
if (Description.isEmpty())
- Description = config.readEntry("!Description",i18n("Profile imported from file %1.").tqarg(filename));
+ Description = config.readEntry("!Description",i18n("Profile imported from file %1.").arg(filename));
if (!Description.isEmpty())
{
if (GlobalConfig->KvpncDebugLevel > 0)
- GlobalConfig->appendLogEntry(i18n("PCF import: description found: %1").tqarg(Description), GlobalConfig->debug);
+ GlobalConfig->appendLogEntry(i18n("PCF import: description found: %1").arg(Description), GlobalConfig->debug);
acc->setDescription( Description );
}
@@ -172,7 +172,7 @@ void ImportProfileDialog::canAccept()
if (!Gateway.isEmpty())
{
if (GlobalConfig->KvpncDebugLevel > 0)
- GlobalConfig->appendLogEntry(i18n("PCF import: gateway found: %1").tqarg(Gateway), GlobalConfig->debug);
+ GlobalConfig->appendLogEntry(i18n("PCF import: gateway found: %1").arg(Gateway), GlobalConfig->debug);
acc->setGateway( Gateway );
}
@@ -193,7 +193,7 @@ void ImportProfileDialog::canAccept()
if (!GroupName.isEmpty())
{
if (GlobalConfig->KvpncDebugLevel > 0)
- GlobalConfig->appendLogEntry(i18n("PCF import: group name found: %1").tqarg(GroupName), GlobalConfig->debug);
+ GlobalConfig->appendLogEntry(i18n("PCF import: group name found: %1").arg(GroupName), GlobalConfig->debug);
acc->setID( GroupName );
}
@@ -204,7 +204,7 @@ void ImportProfileDialog::canAccept()
if (!NtDomain.isEmpty())
{
if (GlobalConfig->KvpncDebugLevel > 0)
- GlobalConfig->appendLogEntry(i18n("PCF import: NT domain found: %1").tqarg(NtDomain), GlobalConfig->debug);
+ GlobalConfig->appendLogEntry(i18n("PCF import: NT domain found: %1").arg(NtDomain), GlobalConfig->debug);
acc->setNtDomainName( NtDomain );
}
@@ -217,7 +217,7 @@ void ImportProfileDialog::canAccept()
TQString CertName = config.readEntry( "CertName", "" );
if (GlobalConfig->KvpncDebugLevel > 0)
- GlobalConfig->appendLogEntry(i18n("PCF import: certificate name found: %1").tqarg(CertName), GlobalConfig->debug);
+ GlobalConfig->appendLogEntry(i18n("PCF import: certificate name found: %1").arg(CertName), GlobalConfig->debug);
TQString CertPath = config.readEntry( "CertPath", "" );
TQString CertSubjectName = config.readEntry( "CertSubjectName", "" );
@@ -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").tqarg(TQString().setNum(int(useCertStore))), GlobalConfig->debug);
+ GlobalConfig->appendLogEntry(i18n("PCF import: certificate should be stored into cisco cert store: %1").arg(TQString().setNum(int(useCertStore))), GlobalConfig->debug);
if (useCertStore)
{
@@ -328,13 +328,13 @@ void ImportProfileDialog::canAccept()
if (useUdp)
{
if (GlobalConfig->KvpncDebugLevel > 0)
- GlobalConfig->appendLogEntry(i18n("PCF import: using %1 for tunneling").tqarg("UDP"), GlobalConfig->debug);
+ GlobalConfig->appendLogEntry(i18n("PCF import: using %1 for tunneling").arg("UDP"), GlobalConfig->debug);
acc->setUseUdp( true);
}
else
{
if (GlobalConfig->KvpncDebugLevel > 0)
- GlobalConfig->appendLogEntry(i18n("PCF import: using %1 for tunneling").tqarg("TCP"), GlobalConfig->debug);
+ GlobalConfig->appendLogEntry(i18n("PCF import: using %1 for tunneling").arg("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").tqarg(i18n("yes")), GlobalConfig->debug);
+ GlobalConfig->appendLogEntry(i18n("PCF import: enable NAT mode: %1").arg(i18n("yes")), GlobalConfig->debug);
acc->setUseNat(true);
}
else
{
if (GlobalConfig->KvpncDebugLevel > 0)
- GlobalConfig->appendLogEntry(i18n("PCF import: enable NAT mode: %1").tqarg(i18n("no")), GlobalConfig->debug);
+ GlobalConfig->appendLogEntry(i18n("PCF import: enable NAT mode: %1").arg(i18n("no")), GlobalConfig->debug);
acc->setUseNat(false);
}
@@ -375,7 +375,7 @@ void ImportProfileDialog::canAccept()
if (DHGroup != -1 )
{
if (GlobalConfig->KvpncDebugLevel > 0)
- GlobalConfig->appendLogEntry(i18n("PCF import: Diffie Hellman group found: %1").tqarg(TQString().setNum(DHGroup)), GlobalConfig->debug);
+ GlobalConfig->appendLogEntry(i18n("PCF import: Diffie Hellman group found: %1").arg(TQString().setNum(DHGroup)), GlobalConfig->debug);
IkeGroup = "dh" + TQString().setNum( DHGroup ) ;
useIkeGroup = true;
acc->setIkeGroup( IkeGroup );
@@ -385,7 +385,7 @@ void ImportProfileDialog::canAccept()
if (PeerTimeout > -1 )
{
if (GlobalConfig->KvpncDebugLevel > 0)
- GlobalConfig->appendLogEntry(i18n("PCF import: peer timeout found: %1").tqarg(TQString().setNum(PeerTimeout)), GlobalConfig->debug);
+ GlobalConfig->appendLogEntry(i18n("PCF import: peer timeout found: %1").arg(TQString().setNum(PeerTimeout)), GlobalConfig->debug);
// read minutes but store seconds
acc->setPeerTimeout( PeerTimeout*60 );
}
@@ -394,7 +394,7 @@ void ImportProfileDialog::canAccept()
if (!Username.isEmpty())
{
if (GlobalConfig->KvpncDebugLevel > 0)
- GlobalConfig->appendLogEntry(i18n("PCF import: user name found: %1").tqarg(Username), GlobalConfig->debug);
+ GlobalConfig->appendLogEntry(i18n("PCF import: user name found: %1").arg(Username), GlobalConfig->debug);
acc->setUserName( Username );
}
@@ -405,7 +405,7 @@ void ImportProfileDialog::canAccept()
if (!UserPassword.isEmpty())
{
if (GlobalConfig->KvpncDebugLevel > 0)
- GlobalConfig->appendLogEntry(i18n("PCF import: clear text user password found: %1").tqarg(UserPassword), GlobalConfig->debug);
+ GlobalConfig->appendLogEntry(i18n("PCF import: clear text user password found: %1").arg(UserPassword), GlobalConfig->debug);
acc->setUserPassword( UserPassword );
}
@@ -416,7 +416,7 @@ void ImportProfileDialog::canAccept()
if (!enc_UserPassword.isEmpty())
{
if (GlobalConfig->KvpncDebugLevel > 0)
- GlobalConfig->appendLogEntry(i18n("PCF import: encrypted user password found: %1").tqarg(enc_UserPassword), GlobalConfig->debug);
+ GlobalConfig->appendLogEntry(i18n("PCF import: encrypted user password found: %1").arg(enc_UserPassword), GlobalConfig->debug);
}
CiscoPasswdDecoder dec (filename);
@@ -438,15 +438,15 @@ void ImportProfileDialog::canAccept()
if (!userpasswd.isEmpty())
{
if (GlobalConfig->KvpncDebugLevel > 3)
- GlobalConfig->appendLogEntry(i18n("PCF import: decrypted user password found: %1").tqarg(userpasswd), GlobalConfig->debug);
+ GlobalConfig->appendLogEntry(i18n("PCF import: decrypted user password found: %1").arg(userpasswd), GlobalConfig->debug);
acc->setUserPassword( userpasswd );
}
if (GlobalConfig->KvpncDebugLevel > 0)
if (saveUserPassword)
- GlobalConfig->appendLogEntry(i18n("PCF import: save user pass : %1").tqarg(i18n("yes")), GlobalConfig->debug);
+ GlobalConfig->appendLogEntry(i18n("PCF import: save user pass : %1").arg(i18n("yes")), GlobalConfig->debug);
else
- GlobalConfig->appendLogEntry(i18n("PCF import: save user pass : %1").tqarg(i18n("no")), GlobalConfig->debug);
+ GlobalConfig->appendLogEntry(i18n("PCF import: save user pass : %1").arg(i18n("no")), GlobalConfig->debug);
acc->setSaveUserPassword( saveUserPassword );
bool saveGroupPwd = true;
@@ -457,7 +457,7 @@ void ImportProfileDialog::canAccept()
if (!GroupPwd.isEmpty())
{
if (GlobalConfig->KvpncDebugLevel > 3)
- GlobalConfig->appendLogEntry(i18n("PCF import: clear text group password found: %1").tqarg(GroupPwd), GlobalConfig->debug);
+ GlobalConfig->appendLogEntry(i18n("PCF import: clear text group password found: %1").arg(GroupPwd), GlobalConfig->debug);
acc->setPreSharedKey( 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").tqarg(grouppasswd), GlobalConfig->debug);
+ GlobalConfig->appendLogEntry(i18n("PCF import: decrypted group password found: %1").arg(grouppasswd), GlobalConfig->debug);
acc->setPreSharedKey( grouppasswd );
}
@@ -502,13 +502,13 @@ void ImportProfileDialog::canAccept()
if (GlobalConfig->KvpncDebugLevel > 0)
if (AuthType ==1)
- GlobalConfig->appendLogEntry(i18n("PCF import: authentication type found: %1").tqarg(i18n("PSK")), GlobalConfig->debug);
+ GlobalConfig->appendLogEntry(i18n("PCF import: authentication type found: %1").arg(i18n("PSK")), GlobalConfig->debug);
else if (AuthType ==3)
- GlobalConfig->appendLogEntry(i18n("PCF import: authentication type found: %1").tqarg(i18n("certificate")), GlobalConfig->debug);
+ GlobalConfig->appendLogEntry(i18n("PCF import: authentication type found: %1").arg(i18n("certificate")), GlobalConfig->debug);
else if (AuthType ==5)
- GlobalConfig->appendLogEntry(i18n("PCF import: authentication type found: %1").tqarg(i18n("hybrid")), GlobalConfig->debug);
+ GlobalConfig->appendLogEntry(i18n("PCF import: authentication type found: %1").arg(i18n("hybrid")), GlobalConfig->debug);
else
- GlobalConfig->appendLogEntry(i18n("PCF import: no authentication type found, assuming %1").tqarg(i18n("PSK")), GlobalConfig->debug);
+ GlobalConfig->appendLogEntry(i18n("PCF import: no authentication type found, assuming %1").arg(i18n("PSK")), GlobalConfig->debug);
if (AuthType == 3 || AuthType == 5)
{
diff --git a/src/importprofiledialogbase.ui b/src/importprofiledialogbase.ui
index ef968e0..7dc4507 100644
--- a/src/importprofiledialogbase.ui
+++ b/src/importprofiledialogbase.ui
@@ -22,7 +22,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<vbox>
<property name="name">
@@ -30,7 +30,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout203</cstring>
+ <cstring>layout203</cstring>
</property>
<vbox>
<property name="name">
@@ -46,7 +46,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout202</cstring>
+ <cstring>layout202</cstring>
</property>
<hbox>
<property name="name">
@@ -74,7 +74,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@@ -90,7 +90,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>258</width>
<height>21</height>
diff --git a/src/kfeedback.cpp b/src/kfeedback.cpp
index e6af794..5f55c00 100644
--- a/src/kfeedback.cpp
+++ b/src/kfeedback.cpp
@@ -10,7 +10,7 @@
#include <tqheader.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqglobal.h>
#include <tqmultilineedit.h>
@@ -35,7 +35,7 @@ KFeedbackDialog::KFeedbackDialog( const TQString & feedbackMailAddress,
| ( helpTopic.isEmpty() ? 0 : (int) Help ), // buttonMask
Apply ) // defaultButton
{
- TQVBoxLayout * tqlayout = new TQVBoxLayout( plainPage(), 0, spacingHint() );
+ TQVBoxLayout * layout = new TQVBoxLayout( plainPage(), 0, spacingHint() );
setButtonApply( KGuiItem( i18n( "&Mail this..." ) ) );
if ( ! helpTopic.isEmpty() )
@@ -44,7 +44,7 @@ KFeedbackDialog::KFeedbackDialog( const TQString & feedbackMailAddress,
_form = new KFeedbackForm( feedbackMailAddress, plainPage() );
Q_CHECK_PTR( _form );
- tqlayout->addWidget( _form );
+ layout->addWidget( _form );
checkSendButton();
connect( this, TQT_SIGNAL( applyClicked() ),
@@ -113,16 +113,16 @@ KFeedbackForm::KFeedbackForm( const TQString & feedbackMailAddress,
label = new TQLabel( i18n( "Questions marked with " ), hbox );
Q_CHECK_PTR( label );
- label->tqsetSizePolicy( pol );
+ label->setSizePolicy( pol );
label = new TQLabel( hbox );
Q_CHECK_PTR( label );
label->setPixmap( KGlobal::iconLoader()->loadIcon( "edit", KIcon::Small ) );
- label->tqsetSizePolicy( pol );
+ label->setSizePolicy( pol );
label = new TQLabel( i18n( " must be answered before a mail can be sent.") , hbox );
Q_CHECK_PTR( label );
- label->tqsetSizePolicy( pol );
+ label->setSizePolicy( pol );
new TQWidget( hbox ); // Fill any leftover space to the right.
diff --git a/src/kvpnc.cpp b/src/kvpnc.cpp
index 23c24e4..fc23e27 100644
--- a/src/kvpnc.cpp
+++ b/src/kvpnc.cpp
@@ -33,7 +33,7 @@
#include <tqcolor.h>
#include <tqcheckbox.h>
#include <tqspinbox.h>
-#include <tqtextedit.h>
+#include <textedit.h>
#include "debugoutputtextedit.h"
#include <tqpushbutton.h>
#include <tqtooltip.h>
@@ -45,7 +45,7 @@
#include <tqcombobox.h>
#include <tqfile.h>
#include <tqdatetime.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqsocket.h>
#include <tqstatusbar.h>
#include <tqcolor.h>
@@ -179,7 +179,7 @@ KVpnc::KVpnc ( KApplication *parent, TQWidget*, const char *name ) : KMainWindow
TQTextStream stream ( &file );
if ( file.open ( IO_WriteOnly ) )
{
- stream << "created at: " << TQDate().tqcurrentDate().toString ( "yyyyMMdd" ) << TQTime().currentTime().toString ( "hhmm" ) << "\n";
+ stream << "created at: " << TQDate().currentDate().toString ( "yyyyMMdd" ) << TQTime().currentTime().toString ( "hhmm" ) << "\n";
file.close();
}
else
@@ -215,7 +215,7 @@ KVpnc::KVpnc ( KApplication *parent, TQWidget*, const char *name ) : KMainWindow
{
mw->DebugOutput->hide();
// setMinimumSize(0,0);
- // this->resize( tqminimumSizeHint() );
+ // this->resize( minimumSizeHint() );
}
DebugconsoleAction ->setChecked ( GlobalConfig->showDebugConsole );
GlobalConfig->LogOutput->setPaper ( TQBrush ( TQColor ( GlobalConfig->DebugBackgroundcolor ) ) );
@@ -524,13 +524,13 @@ void KVpnc::slotSettings()
if ( GlobalConfig->showDebugConsole )
{
mw->DebugOutput->show();
- //resize( tqminimumSizeHint() );
+ //resize( minimumSizeHint() );
}
else
{
mw->DebugOutput->hide();
setMinimumSize ( 0, 0 );
- this->resize ( tqminimumSizeHint() );
+ this->resize ( minimumSizeHint() );
}
if ( GlobalConfig->writeLogFile )
@@ -549,7 +549,7 @@ void KVpnc::slotSettings()
}
else
{
- GlobalConfig->logFileStream << i18n ( "Log session started at: " ) << TQDateTime::tqcurrentDateTime().toString ( Qt::TextDate ) << endl;
+ GlobalConfig->logFileStream << i18n ( "Log session started at: " ) << TQDateTime::currentDateTime().toString ( Qt::TextDate ) << endl;
}
}
}
@@ -558,7 +558,7 @@ void KVpnc::slotSettings()
if ( GlobalConfig->logfile.isOpen() )
{
//TQTextStream s( &logfile );
- GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::tqcurrentDateTime().toString ( Qt::TextDate ) << endl;
+ GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::currentDateTime().toString ( Qt::TextDate ) << endl;
GlobalConfig->logfile.close();
}
}
@@ -686,7 +686,7 @@ void KVpnc:: quitCalled()
if ( GlobalConfig->logfile.isOpen() )
{
// TQTextStream s( &logfile );
- GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::tqcurrentDateTime().toString ( Qt::TextDate ) << endl;
+ GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::currentDateTime().toString ( Qt::TextDate ) << endl;
GlobalConfig->logfile.flush();
GlobalConfig->logfile.close();
GlobalConfig->appPointer->processEvents();
@@ -713,7 +713,7 @@ void KVpnc:: quitCalled()
if ( GlobalConfig->logfile.isOpen() )
{
// TQTextStream s( &logfile );
- GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::tqcurrentDateTime().toString ( Qt::TextDate ) << endl;
+ GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::currentDateTime().toString ( Qt::TextDate ) << endl;
GlobalConfig->logfile.flush();
GlobalConfig->logfile.close();
GlobalConfig->appPointer->processEvents();
@@ -740,7 +740,7 @@ void KVpnc:: quitCalled()
if ( GlobalConfig->logfile.isOpen() )
{
// TQTextStream s( &logfile );
- GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::tqcurrentDateTime().toString ( Qt::TextDate ) << endl;
+ GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::currentDateTime().toString ( Qt::TextDate ) << endl;
GlobalConfig->logfile.flush();
GlobalConfig->logfile.close();
GlobalConfig->appPointer->processEvents();
@@ -769,7 +769,7 @@ void KVpnc:: quitCalled()
if ( GlobalConfig->logfile.isOpen() )
{
// TQTextStream s( &logfile );
- GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::tqcurrentDateTime().toString ( Qt::TextDate ) << endl;
+ GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::currentDateTime().toString ( Qt::TextDate ) << endl;
GlobalConfig->logfile.flush();
GlobalConfig->logfile.close();
GlobalConfig->appPointer->processEvents();
@@ -868,7 +868,7 @@ void KVpnc::closeEvent ( TQCloseEvent *e )
if ( GlobalConfig->logfile.isOpen() )
{
// TQTextStream s( &logfile );
- GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::tqcurrentDateTime().toString ( Qt::TextDate ) << endl;
+ GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::currentDateTime().toString ( Qt::TextDate ) << endl;
GlobalConfig->logfile.close();
GlobalConfig->appPointer->processEvents();
}
@@ -918,7 +918,7 @@ void KVpnc::closeEvent ( TQCloseEvent *e )
{
if ( GlobalConfig->logfile.isOpen() )
{
- GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::tqcurrentDateTime().toString ( Qt::TextDate ) << endl;
+ GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::currentDateTime().toString ( Qt::TextDate ) << endl;
GlobalConfig->logfile.flush();
GlobalConfig->logfile.close();
GlobalConfig->appPointer->processEvents();
@@ -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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
@@ -1095,7 +1095,7 @@ void KVpnc::connectClicked()
if ( GlobalConfig->currentProfile != 0 && GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::cisco )
{
- //setGuitqStatus(connecting);
+ //setGuiStatus(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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( 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 );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return;
}
}
@@ -1905,7 +1905,7 @@ void KVpnc::connectClicked()
else
{
GlobalConfig->appendLogEntry ( i18n ( "Creating %1 has been failed." ).arg ( TQString ( "VpncScript" ) ), GlobalConfig->error );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
timer.stop();
return ;
}
@@ -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();
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
GlobalConfig->status = GlobalConfig->disconnected;
return ;
}
@@ -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();
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
GlobalConfig->status = GlobalConfig->disconnected;
return ;
}
@@ -2059,7 +2059,7 @@ 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();
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
GlobalConfig->status = GlobalConfig->disconnected;
return ;
}
@@ -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();
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
}
else
{
@@ -2368,7 +2368,7 @@ void KVpnc::connectClicked()
{
VpncScript = tmpPath + "vpnc-script." + GlobalConfig->currentProfile->getName(); // vpnc-script.<name>
GlobalConfig->appendLogEntry ( i18n ( "Making %1 (%2) excutable failed!" ).arg ( "VpncScript" ).arg ( VpncScript ), GlobalConfig->error );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( 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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
@@ -2391,10 +2391,10 @@ void KVpnc::connectClicked()
GlobalConfig->appendLogEntry ( i18n ( "vpnclient: %1" ) .arg ( GlobalConfig->pathToCiscoVpnc ), GlobalConfig->debug );
- if ( checkCiscoVpnctqStatus() == false )
+ if ( checkCiscoVpncStatus() == false )
{
startCiscoVpnc();
- if ( checkCiscoVpnctqStatus() == false )
+ if ( checkCiscoVpncStatus() == 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 );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return;
}
GlobalConfig->TmpPassword= GlobalConfig->currentProfile->getUserPassword();
@@ -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();
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
}
else
{
@@ -2862,14 +2862,14 @@ void KVpnc::connectClicked()
{
// file could not written
GlobalConfig->appendLogEntry ( i18n ( "Connect canceled because profile file could not be written." ), GlobalConfig->error );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
}
else
{
// ok is false
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
}
@@ -2881,7 +2881,7 @@ void KVpnc::connectClicked()
if ( GlobalConfig->KvpncDebugLevel > 1 )
GlobalConfig->appendLogEntry ( i18n ( "racoon" ), GlobalConfig->debug );
- //setGuitqStatus(connecting);
+ //setGuiStatus(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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( 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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
}
@@ -2917,7 +2917,7 @@ void KVpnc::connectClicked()
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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
@@ -2927,7 +2927,7 @@ void KVpnc::connectClicked()
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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return;
}
else
@@ -3786,7 +3786,7 @@ void KVpnc::connectClicked()
else
{
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" write failed!" ).arg ( file.name() ), GlobalConfig->error );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return;
}
@@ -3835,7 +3835,7 @@ void KVpnc::connectClicked()
else
{
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" write failed!" ).arg ( file1.name() ), GlobalConfig->error );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return;
}
@@ -3942,7 +3942,7 @@ void KVpnc::connectClicked()
else
{
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" write failed!" ).arg ( upfile.name() ), GlobalConfig->error );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return;
}
@@ -3995,7 +3995,7 @@ void KVpnc::connectClicked()
else
{
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" write failed!" ).arg ( downfile.name() ), GlobalConfig->error );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return;
}
@@ -4031,7 +4031,7 @@ void KVpnc::connectClicked()
// if (GlobalConfig->currentProfile->useVirtualIP()){
// if (!setVirtualIP()){
- // setGuitqStatus(disconnected);
+ // setGuiStatus(disconnected);
// return;
// }
//
@@ -4069,7 +4069,7 @@ void KVpnc::connectClicked()
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" ) );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
}
else
{
@@ -4106,7 +4106,7 @@ void KVpnc::connectClicked()
return;
}
- //setGuitqStatus(connecting);
+ //setGuiStatus(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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( 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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
}
@@ -4169,15 +4169,15 @@ void KVpnc::connectClicked()
// if ( !Utils( GlobalConfig, parent ).loadKernelModule( "esp4", parent ) )
// {
- // KMessageBox::information( this, i18n( "Loading of module \"%1\" failed!" ).tqarg( "esp4" ) );
- // GlobalConfig->appendLogEntry( i18n( "Loading module \"%1\" has failed: stop." ).tqarg( "esp4" ), GlobalConfig->error );
+ // KMessageBox::information( this, i18n( "Loading of module \"%1\" failed!" ).arg( "esp4" ) );
+ // GlobalConfig->appendLogEntry( i18n( "Loading module \"%1\" has failed: stop." ).arg( "esp4" ), GlobalConfig->error );
// ok = false;
// }
//
// if ( !Utils( GlobalConfig, parent ).loadKernelModule( "ah4", parent ) )
// {
- // KMessageBox::information( this, i18n( "Loading of module \"%1\" failed!" ).tqarg( "ah4" ) );
- // GlobalConfig->appendLogEntry( i18n( "Loading module \"%1\" has failed: stop." ).tqarg( "ah4" ), GlobalConfig->error );
+ // KMessageBox::information( this, i18n( "Loading of module \"%1\" failed!" ).arg( "ah4" ) );
+ // GlobalConfig->appendLogEntry( i18n( "Loading module \"%1\" has failed: stop." ).arg( "ah4" ), GlobalConfig->error );
// ok = false;
// }
@@ -4894,13 +4894,13 @@ void KVpnc::connectClicked()
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.").tqarg(GlobalConfig->currentProfile->getSpecialRemoteID()), GlobalConfig->error );
+ GlobalConfig->appendLogEntry( i18n("Remote ID \"%1\" (type: address) could not resolved, ommiting right id.").arg(GlobalConfig->currentProfile->getSpecialRemoteID()), GlobalConfig->error );
}
else
{
if (GlobalConfig->KvpncDebugLevel > 3)
- GlobalConfig->appendLogEntry( i18n("Remote ID \"%1\" (type: address) resolved to: %2").tqarg(GlobalConfig->currentProfile->getSpecialRemoteID()).tqarg(resolvedIp), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( i18n("Remote ID \"%1\" (type: address) resolved to: %2").arg(GlobalConfig->currentProfile->getSpecialRemoteID()).arg(resolvedIp), GlobalConfig->debug );
stream << " rightid=" + resolvedIp << "\n";
}
}
@@ -4923,13 +4923,13 @@ void KVpnc::connectClicked()
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.").tqarg(GlobalConfig->currentProfile->getSpecialLocalID()), GlobalConfig->error );
+ GlobalConfig->appendLogEntry( i18n("Local ID \"%1\" (type: address) could not resolved, ommiting left id.").arg(GlobalConfig->currentProfile->getSpecialLocalID()), GlobalConfig->error );
}
else
{
if (GlobalConfig->KvpncDebugLevel > 3)
- GlobalConfig->appendLogEntry( i18n("Local ID \"%1\" (type: address) resolved to: %2").tqarg(GlobalConfig->currentProfile->getSpecialLocalID()).tqarg(resolvedIp), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( i18n("Local ID \"%1\" (type: address) resolved to: %2").arg(GlobalConfig->currentProfile->getSpecialLocalID()).arg(resolvedIp), GlobalConfig->debug );
stream << " leftid=" + resolvedIp << "\n";
}
}
@@ -5050,7 +5050,7 @@ void KVpnc::connectClicked()
else
{
GlobalConfig->appendLogEntry ( i18n ( "%1 could not opened. Stop." ).arg ( IpsecConfigFile.name() ),GlobalConfig->error );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return;
}
@@ -5101,7 +5101,7 @@ void KVpnc::connectClicked()
else
{
GlobalConfig->appendLogEntry ( i18n ( "%1 could not opened. Stop." ).arg ( tmpPath + "iptables." + GlobalConfig->currentProfile->getName() + ".add_ipsec_freeswan.sh" ),GlobalConfig->error );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return;
}
stream.unsetDevice();
@@ -5138,7 +5138,7 @@ void KVpnc::connectClicked()
else
{
GlobalConfig->appendLogEntry ( i18n ( "%1 could not opened. Stop." ).arg ( tmpPath + "iptables." + GlobalConfig->currentProfile->getName() + ".remove_ipsec_freeswan.sh" ),GlobalConfig->error );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return;
}
@@ -5167,7 +5167,7 @@ void KVpnc::connectClicked()
// if (GlobalConfig->currentProfile->useVirtualIP()){
// if (!setVirtualIP()){
- // setGuitqStatus(disconnected);
+ // setGuiStatus(disconnected);
// return;
// }
// }
@@ -5227,7 +5227,7 @@ void KVpnc::connectClicked()
delete IpsecStartProcess;
IpsecStartProcess = 0L;
disconnectClicked();
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
}
else
{
@@ -5285,20 +5285,20 @@ void KVpnc::connectClicked()
else
{
GlobalConfig->appendLogEntry ( i18n ( "%1 could not opened. Stop." ).arg ( IpsecSecretsFile.name() ),GlobalConfig->error );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return;
}
}
else
{
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
}
} // freeswan
/* ============ pptp ================ */
else if ( GlobalConfig->currentProfile != 0 && GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::pptp )
{
- //setGuitqStatus(connecting);
+ //setGuiStatus(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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
if ( GlobalConfig->KvpncDebugLevel > 0 )
@@ -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)." ).tqarg("GRE"), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( i18n ( "Support for %1 found (compiled into kernel or kernel module already loaded)." ).arg("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();
- setGuitqStatus ( disconnected );
+ setGuiStatus ( 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;
- // setGuitqStatus(disconnected);
+ // setGuiStatus(disconnected);
// return;
// }
@@ -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!" ).tqarg("\"ppp-compress-18\" (ppp_mppe)"));
+ //KMessageBox::information( this, i18n( "Loading of module \"%1\" failed!" ).arg("\"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 );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
disconnectClicked();
load_module_ok=false;
}
@@ -6155,7 +6155,7 @@ void KVpnc::connectClicked()
disconnect ( PptpProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_pptp() ) );
disconnect ( PptpProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_pptp() ) );
disconnectClicked();
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
}
else
{
@@ -6183,7 +6183,7 @@ void KVpnc::connectClicked()
{
if (AuthRetry)
disconnectClicked();
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
} // pptp
@@ -6191,7 +6191,7 @@ void KVpnc::connectClicked()
/* ============ openvpn ================ */
else if ( GlobalConfig->currentProfile != 0 && GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::openvpn )
{
- //setGuitqStatus(connecting);
+ //setGuiStatus(connecting);
tmpPath = locateLocal ( "data", "kvpnc/" );
TQString OpenvpnSecrectPath = tmpPath + "openvpn." + GlobalConfig->currentProfile->getName() + ".secret";
@@ -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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( 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\"!" ).tqarg( "pkcs11-tool" ).tqarg( GlobalConfig->pathToPkcs11Tool) );
- // GlobalConfig->appendLogEntry( i18n( "Unable to find \"%1\" at \"%2\"!" ).tqarg( "pkcs11-tool" ).tqarg( GlobalConfig->pathToPkcs11Tool ), GlobalConfig->error );
+ // 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 );
// ok = false;
- // setGuitqStatus( disconnected );
+ // setGuiStatus( 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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( 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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
if ( GlobalConfig->currentProfile->getUsePkcs11Providers() && GlobalConfig->currentProfile->getPkcs11Providers().isEmpty() )
@@ -6247,7 +6247,7 @@ void KVpnc::connectClicked()
KMessageBox::error ( this, i18n ( "Pkcs11 providers cant be empty!" ) );
GlobalConfig->appendLogEntry ( i18n ( "Pkcs11 providers cant be empty!" ), GlobalConfig->error );
ok = false;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
}
@@ -6260,10 +6260,10 @@ void KVpnc::connectClicked()
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." ).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 );
+ // 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 );
// ok = false;
- // setGuitqStatus( disconnected );
+ // setGuiStatus( 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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
}
@@ -6286,7 +6286,7 @@ 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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
}
@@ -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();
- setGuitqStatus ( disconnected );
+ setGuiStatus ( 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();
- setGuitqStatus ( disconnected );
+ setGuiStatus ( 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!" ).tqarg(GlobalConfig->currentProfile->getGateway()) );
- // GlobalConfig->appendLogEntry(i18n( "Host \"%1\" could not be resolved!" ).tqarg(GlobalConfig->currentProfile->getGateway()),GlobalConfig->error);
+ // 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;
// }
// else
// {
- // GlobalConfig->appendLogEntry( i18n( "Gateway hostname (%1) resolved to \"%2\"." ).tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(GlobalConfig->TmpGatewayIP), GlobalConfig->info );
+ // GlobalConfig->appendLogEntry( i18n( "Gateway hostname (%1) resolved to \"%2\"." ).arg(GlobalConfig->currentProfile->getGateway()).arg(GlobalConfig->TmpGatewayIP), GlobalConfig->info );
// }
bool askUsernamePass = false;
@@ -7352,21 +7352,21 @@ void KVpnc::connectClicked()
// if (managementhandler->isConnectedToManagementPort())
// {
// if (! GlobalConfig->KvpncDebugLevel > 1 )
- // GlobalConfig->appendLogEntry( i18n( "Connect to %1 management handler was sucessful" ).tqarg( "openvpn" ) , GlobalConfig->debug );
+ // GlobalConfig->appendLogEntry( i18n( "Connect to %1 management handler was sucessful" ).arg( "openvpn" ) , GlobalConfig->debug );
// break;
// }
// if (! GlobalConfig->KvpncDebugLevel > 1 )
- // GlobalConfig->appendLogEntry( i18n( "Trying to connect to %1 management handler..." ).tqarg( "openvpn" ) , GlobalConfig->debug );
+ // GlobalConfig->appendLogEntry( i18n( "Trying to connect to %1 management handler..." ).arg( "openvpn" ) , GlobalConfig->debug );
// }
// // managementhandler->sendToServer("help");
// // }
// if (failManagementHandlerConnectCheckCount >= maxfailManagementHandlerConnectCheckCount)
// {
- // // 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 );
+ // // 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 );
// if (OpenvpnProcess != 0)
// OpenvpnProcess->kill();
- // setGuitqStatus(disconnected);
+ // setGuiStatus(disconnected);
// return;
// }
@@ -7385,7 +7385,7 @@ void KVpnc::connectClicked()
} // openvpn
else
{
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
}
@@ -7394,7 +7394,7 @@ void KVpnc::connectClicked()
/* ============ vtun ================ */
else if ( GlobalConfig->currentProfile != 0 && GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::vtun )
{
- //setGuitqStatus(connecting);
+ //setGuiStatus(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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
@@ -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();
- setGuitqStatus ( disconnected );
+ setGuiStatus ( 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();
- setGuitqStatus ( disconnected );
+ setGuiStatus ( 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!" ).tqarg(GlobalConfig->currentProfile->getGateway()) );
- // GlobalConfig->appendLogEntry(i18n( "Host \"%1\" could not be resolved!" ).tqarg(GlobalConfig->currentProfile->getGateway()),GlobalConfig->error);
+ // 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;
// }
// else
// {
- // GlobalConfig->appendLogEntry( i18n( "Gateway hostname (%1) resolved to \"%2\"." ).tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(GlobalConfig->TmpGatewayIP), GlobalConfig->info );
+ // GlobalConfig->appendLogEntry( i18n( "Gateway hostname (%1) resolved to \"%2\"." ).arg(GlobalConfig->currentProfile->getGateway()).arg(GlobalConfig->TmpGatewayIP), GlobalConfig->info );
// }
bool askUsernamePass = false;
@@ -7718,14 +7718,14 @@ void KVpnc::connectClicked()
}
else
{
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
}
/* ============ ssh ================ */
else if ( GlobalConfig->currentProfile != 0 && GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ssh )
{
- //setGuitqStatus(connecting);
+ //setGuiStatus(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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
@@ -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();
- setGuitqStatus ( disconnected );
+ setGuiStatus ( 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();
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
GlobalConfig->status = GlobalConfig->disconnected;
return ;
}
@@ -7998,7 +7998,7 @@ void KVpnc::connectClicked()
// else
// {
// GlobalConfig->appendLogEntry ( i18n ( "\"%1\" write failed!" ).arg ( askpassfile.name() ), GlobalConfig->error );
-// setGuitqStatus ( disconnected );
+// setGuiStatus ( disconnected );
// return;
// }
//
@@ -8206,7 +8206,7 @@ void KVpnc::connectClicked()
}
else
{
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
}
@@ -8386,7 +8386,7 @@ void KVpnc::disconnectClicked()
DisconnectProcess=0L;
}
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
durationTimer.stop();
disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
connectionEnded();
@@ -8474,7 +8474,7 @@ void KVpnc::disconnectClicked()
delete CiscoVpncProcess;
CiscoVpncProcess=0L;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
connectionEnded();
}
@@ -8496,7 +8496,7 @@ void KVpnc::disconnectClicked()
// if ( setkey.exists() )
// GlobalConfig->pathToSetkey = "/usr/bin/setkey";
// else {
- // KMessageBox::error( this, i18n( "Unable to find \"%1\"!" ).tqarg("setkey") );
+ // KMessageBox::error( this, i18n( "Unable to find \"%1\"!" ).arg("setkey") );
// ok = false;
// }
// }
@@ -8520,7 +8520,7 @@ void KVpnc::disconnectClicked()
}
else
{
- // KMessageBox::error( this, i18n( "\"%1\" write failed!" ).tqarg( "setkey (remove)" ) );
+ // KMessageBox::error( this, i18n( "\"%1\" write failed!" ).arg( "setkey (remove)" ) );
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" write failed!" ).arg ( "setkey (remove)" ) , GlobalConfig->error );
}
@@ -8753,7 +8753,7 @@ void KVpnc::disconnectClicked()
}
}
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.stop();
connectionEnded();
@@ -8768,11 +8768,11 @@ void KVpnc::disconnectClicked()
// connect( DisconnectProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT( removeSetkey() ) );
//
// if ( !DisconnectProcess->start(env) )
- // KMessageBox::error( this, i18n( "\"%1\" start failed!" ).tqarg("killall -3 racoon") );
+ // KMessageBox::error( this, i18n( "\"%1\" start failed!" ).arg("killall -3 racoon") );
// else {
// RacoonTailProcess->tryTerminate();
// if ( GlobalConfig->KvpncDebugLevel > 0 )
- // GlobalConfig->appendLogEntry( i18n( "\"%1\" was successful." ).tqarg("killall -3 racoon"), GlobalConfig->debug );
+ // GlobalConfig->appendLogEntry( i18n( "\"%1\" was successful." ).arg("killall -3 racoon"), GlobalConfig->debug );
// }
// }
@@ -9005,7 +9005,7 @@ void KVpnc::disconnectClicked()
delRouteIpsec();
removeIptablesFreeswan();
disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
durationTimer.stop();
GlobalConfig->currentConnectRetry=0;
connectionEnded();
@@ -9039,7 +9039,7 @@ void KVpnc::disconnectClicked()
stream.unsetDevice();
//if ( GlobalConfig->KvpncDebugLevel > 0 )
- // 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 );
+ // 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 );
// ipsec.secret
TQFile originalIpsecSecretFile ( "/etc/ipsec.secrets.before.kvpnc" );
@@ -9489,7 +9489,7 @@ void KVpnc::disconnectClicked()
GlobalConfig->appendLogEntry ( i18n ( "File %1 could not opened!" ).arg ( "/etc/ppp/pap-secrets" ), GlobalConfig->error );
}
}
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
GlobalConfig->status = GlobalConfig->disconnected;
connectCounter = 0;
disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
@@ -9554,7 +9554,7 @@ void KVpnc::disconnectClicked()
// connect( VtundProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_disconnect() ) );
//
// if ( !DisconnectProcess->start(env) ) {
- // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( "killall vtund" ) );
+ // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "killall vtund" ) );
// else
// {
// sleep(1);
@@ -9590,7 +9590,7 @@ void KVpnc::disconnectClicked()
// connect( SshProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_disconnect() ) );
//
// if ( !DisconnectProcess->start(env) ) {
- // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( "killall ssh" ) );
+ // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "killall ssh" ) );
// }
else
{
@@ -9713,7 +9713,7 @@ void KVpnc::disconnectClicked()
}
// ConnectingProcess = 0L;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
if ( GlobalConfig->currentProfile->getExecuteCmdAfterDisconnect() )
executeCommandAfterDisconnect();
@@ -9831,7 +9831,7 @@ void KVpnc::disconnectClicked()
}
//if (!restoreResolvConf())
- //GlobalConfig->appendLogEntry(i18n("Restore of %1 has been failed!").tqarg(""),GlobalConfig->error);
+ //GlobalConfig->appendLogEntry(i18n("Restore of %1 has been failed!").arg(""),GlobalConfig->error);
stream << GlobalConfig->pathToIp + " route flush cache\n";
@@ -9860,7 +9860,7 @@ void KVpnc::disconnectClicked()
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
timer.stop();
connectionEnded();
@@ -10099,7 +10099,7 @@ void KVpnc::disconnectClicked()
// delRouteIpsec();
removeIptablesFreeswan();
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
GlobalConfig->currentConnectRetry=0;
@@ -10133,7 +10133,7 @@ void KVpnc::disconnectClicked()
stream.unsetDevice();
//if ( GlobalConfig->KvpncDebugLevel > 0 )
- // 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 );
+ // 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 );
// ipsec.secret
TQFile originalIpsecSecretFile ( "/etc/ipsec.secrets.before.kvpnc" );
@@ -10315,7 +10315,7 @@ void KVpnc::disconnectClicked()
}
else
{
- // KMessageBox::error( this, i18n( "\"%1\" write failed!" ).tqarg( "setkey (remove)" ) );
+ // KMessageBox::error( this, i18n( "\"%1\" write failed!" ).arg( "setkey (remove)" ) );
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" write failed!" ).arg ( "setkey (remove)" ) , GlobalConfig->error );
}
@@ -10945,7 +10945,7 @@ void KVpnc::disconnectClicked()
GlobalConfig->appendLogEntry ( i18n ( "File %1 could not opened!" ).arg ( "/etc/ppp/pap-secrets" ), GlobalConfig->error );
}
}
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
GlobalConfig->status = GlobalConfig->disconnected;
connectCounter = 0;
connectionEnded();
@@ -11000,7 +11000,7 @@ void KVpnc::disconnectClicked()
// connect( VtundProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_disconnect() ) );
//
// if ( !DisconnectProcess->start(env) ) {
- // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( "killall vtund" ) );
+ // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "killall vtund" ) );
// }
// else
// {
@@ -11036,7 +11036,7 @@ void KVpnc::disconnectClicked()
// connect( SshProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_disconnect() ) );
//
// if ( !DisconnectProcess->start(env) ) {
- // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( "killall ssh" ) );
+ // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "killall ssh" ) );
// }
else
{
@@ -11049,7 +11049,7 @@ void KVpnc::disconnectClicked()
connectionEnded();
}
//connectionEnded();
- setGuitqStatus ( disconnected );
+ setGuiStatus ( 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 );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
ConnectingProcess = -1;
}
@@ -11105,14 +11105,14 @@ void KVpnc::helpClicked()
// 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!" ).tqarg(host) );
+ // KMessageBox::error( this, i18n( "Host \"%1\" could not be resolved!" ).arg(host) );
// else
// mw->DebugOutput->append( TQString("first ip of "+host+": "+ip ));
//
// 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!" ).tqarg(host2) );
+ // KMessageBox::error( this, i18n( "Host \"%1\" could not be resolved!" ).arg(host2) );
// else
// mw->DebugOutput->append( TQString("first ip of "+host2+": "+ip2 ));
@@ -11282,7 +11282,7 @@ void KVpnc::helpClicked()
/*
TQString testfilename="sfsd/::::( *#v v###\\";
TQString cleanedUpName = Utils(this->GlobalConfig).removeSpecialCharsForFilename( testfilename);
- cTQString("testfilename: \"%1\", cleaned up: \"%2\"").tqarg(testfilename).tqarg(cleanedUpName));
+ cTQString("testfilename: \"%1\", cleaned up: \"%2\"").arg(testfilename).arg(cleanedUpName));
*/
// GlobalConfig->exportKvpncConfig("./kvpnc_export.xml");
@@ -11488,7 +11488,7 @@ void KVpnc::readOutputFrom_vpnc()
VpncProcess->writeToStdin ( "\n" );
if ( GlobalConfig->KvpncDebugLevel > 6 )
- GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "Group password: %1" ).tqarg(GrpPassStr), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "Group password: %1" ).arg(GrpPassStr), GlobalConfig->debug );
}
@@ -11504,7 +11504,7 @@ void KVpnc::readOutputFrom_vpnc()
VpncProcess->writeToStdin ( "\n" );
if ( GlobalConfig->KvpncDebugLevel > 6 )
- GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "User password: %1" ).tqarg(UserPassStr), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "User password: %1" ).arg(UserPassStr), GlobalConfig->debug );
}
@@ -11546,7 +11546,7 @@ void KVpnc::readOutputFrom_vpnc()
VpncProcess->writeToStdin ( "\n" );
if ( GlobalConfig->KvpncDebugLevel > 6 )
- GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "User name: %1" ).tqarg(UsernameStr), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "User name: %1" ).arg(UsernameStr), GlobalConfig->debug );
}
@@ -11594,7 +11594,7 @@ void KVpnc::readOutputFrom_vpnc()
connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuitqStatus ( connected );
+ setGuiStatus ( connected );
connectSuccess = false;
NetworkInterface iface ( GlobalConfig, parent );
@@ -11758,7 +11758,7 @@ void KVpnc::readOutputFrom_vpnc()
// if (oldpidfile.exists())
// {
// if ( GlobalConfig->KvpncDebugLevel > 0 )
- // GlobalConfig->appendLogEntry( i18n( "Old pid file found: %1" ).tqarg(oldpidfile.name()), GlobalConfig->debug );
+ // GlobalConfig->appendLogEntry( i18n( "Old pid file found: %1" ).arg(oldpidfile.name()), GlobalConfig->debug );
// TQTextStream pidFileStream( &oldpidfile );
// TQString Vpnc_pid = "";
// if ( oldpidfile.open( IO_ReadOnly ) )
@@ -11771,7 +11771,7 @@ void KVpnc::readOutputFrom_vpnc()
// {
//
// if ( GlobalConfig->KvpncDebugLevel > 0 )
- // GlobalConfig->appendLogEntry( i18n( "Vpnc pid file contains a pid: %1, try to terminate the process with this pid." ).tqarg( Vpnc_pid ) , GlobalConfig->debug);
+ // GlobalConfig->appendLogEntry( i18n( "Vpnc pid file contains a pid: %1, try to terminate the process with this pid." ).arg( 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." ).tqarg("vpnc") ,GlobalConfig->error);
+ // GlobalConfig->appendLogEntry( i18n( "%1 could not be killed." ).arg("vpnc") ,GlobalConfig->error);
//
// while (killvpncprocess.isRunning())
// parent->processEvents();
@@ -11800,7 +11800,7 @@ void KVpnc::readOutputFrom_vpnc()
// killvpncprocess.addArgument("vpnc");
//
// if (!killvpncprocess.start())
- // GlobalConfig->appendLogEntry( i18n( "%1 could not be killed." ).tqarg("vpnc") ,GlobalConfig->error);
+ // GlobalConfig->appendLogEntry( i18n( "%1 could not be killed." ).arg("vpnc") ,GlobalConfig->error);
//
// while (killvpncprocess.isRunning())
// parent->processEvents();
@@ -11824,7 +11824,7 @@ void KVpnc::readOutputFrom_vpnc()
// OldDefaultroute = lst.first(); // default-route.<id>
//
// if ( GlobalConfig->KvpncDebugLevel > 0 )
- // GlobalConfig->appendLogEntry( i18n( "Old defaultroute file found: %1" ).tqarg(OldDefaultroute), GlobalConfig->debug );
+ // GlobalConfig->appendLogEntry( i18n( "Old defaultroute file found: %1" ).arg(OldDefaultroute), GlobalConfig->debug );
//
//
// TQFile file( VpncDisconnectScript );
@@ -11876,14 +11876,14 @@ void KVpnc::readOutputFrom_vpnc()
//
// if ( !DisconnectProcess->start(env) )
// {
- // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( "vpnc_disconnect" ) );
+ // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "vpnc_disconnect" ) );
// }
// else
// {
// if ( GlobalConfig->KvpncDebugLevel > 0 )
// GlobalConfig->appendLogEntry( i18n( "Disconnect script started." ), GlobalConfig->debug );
// }
- // setGuitqStatus(disconnected);
+ // setGuiStatus(disconnected);
// connectionEnded();
// }
//
@@ -11926,7 +11926,7 @@ void KVpnc::readOutputFrom_vpnc()
if (oldpidfile.exists())
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
- GlobalConfig->appendLogEntry( i18n( "Old pid file found: %1" ).tqarg(oldpidfile.name()), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( i18n( "Old pid file found: %1" ).arg(oldpidfile.name()), GlobalConfig->debug );
TQTextStream pidFileStream( &oldpidfile );
TQString Vpnc_pid = "";
if ( oldpidfile.open( IO_ReadOnly ) )
@@ -11939,7 +11939,7 @@ void KVpnc::readOutputFrom_vpnc()
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
- GlobalConfig->appendLogEntry( i18n( "Vpnc pid file contains a pid: %1, try to terminate the process with this pid." ).tqarg( Vpnc_pid ) , GlobalConfig->debug);
+ GlobalConfig->appendLogEntry( i18n( "Vpnc pid file contains a pid: %1, try to terminate the process with this pid." ).arg( 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." ).tqarg("vpnc") ,GlobalConfig->error);
+ GlobalConfig->appendLogEntry( i18n( "%1 could not be killed." ).arg("vpnc") ,GlobalConfig->error);
while (killvpncprocess.isRunning())
parent->processEvents();
@@ -11968,7 +11968,7 @@ void KVpnc::readOutputFrom_vpnc()
killvpncprocess.addArgument("vpnc");
if (!killvpncprocess.start())
- GlobalConfig->appendLogEntry( i18n( "%1 could not be killed." ).tqarg("vpnc") ,GlobalConfig->error);
+ GlobalConfig->appendLogEntry( i18n( "%1 could not be killed." ).arg("vpnc") ,GlobalConfig->error);
while (killvpncprocess.isRunning())
parent->processEvents();
@@ -12384,7 +12384,7 @@ void KVpnc::readOutputFrom_ciscovpnc()
connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuitqStatus ( connected );
+ setGuiStatus ( connected );
connectSuccess = false;
GlobalConfig->AuthRetryCount=0;
@@ -12553,7 +12553,7 @@ void KVpnc::readFromStdout_racoon()
disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuitqStatus ( connected );
+ setGuiStatus ( connected );
doIptablesRacoon();
addRouteRacoon();
@@ -12993,7 +12993,7 @@ void KVpnc::readFromStderr_racoon()
disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuitqStatus ( connected );
+ setGuiStatus ( connected );
doIptablesRacoon();
addRouteRacoon();
@@ -13186,8 +13186,8 @@ void KVpnc::readFromStdout_ipsec()
else if ( ProcessMsg_connect.find ( "error fetching interface information: Device not found", 0, FALSE ) > -1 )
{
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 );
+ 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 );
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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
}
@@ -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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
}
@@ -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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
@@ -13801,8 +13801,8 @@ void KVpnc::readFromStderr_ipsecwhack()
//
// if (!killipsecprocess.start())
// {
- // 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 );
+ // GlobalConfig->appendLogEntry( i18n( "%1 could not be killed." ).arg("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." ).arg("ipsec") ) , GlobalConfig->debug );
// abort = true;
// }
// else
@@ -13830,15 +13830,15 @@ void KVpnc::readFromStderr_ipsecwhack()
// if ( !IpsecProcess->start(env) )
// {
// if ( GlobalConfig->KvpncDebugLevel > 0 )
- // GlobalConfig->appendLogEntry ( i18n( "\"%1\" start failed!" ).tqarg( "l2tpd" ), GlobalConfig->error );
+ // GlobalConfig->appendLogEntry ( i18n( "\"%1\" start failed!" ).arg( "l2tpd" ), 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 );
+ // GlobalConfig->appendLogEntry ( TQString( "[ipsec err] " + i18n( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg("ipsec") ) , GlobalConfig->debug );
// abort=false;
// }
// else
// {
// if ( GlobalConfig->KvpncDebugLevel > 0 )
- // GlobalConfig->appendLogEntry ( i18n( "%1 was already running. It was killed and restarted." ).tqarg( "ipsec" ), GlobalConfig->debug );
+ // GlobalConfig->appendLogEntry ( i18n( "%1 was already running. It was killed and restarted." ).arg( "ipsec" ), GlobalConfig->debug );
// }
// }
// }
@@ -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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
}
@@ -14096,7 +14096,7 @@ void KVpnc::readFromStdout_ipsecwhacklisten()
disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuitqStatus ( connected );
+ setGuiStatus ( 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;
-// setGuitqStatus ( disconnected );
+// setGuiStatus ( disconnected );
// return ;
// }
}
@@ -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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
}
@@ -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;
-// setGuitqStatus ( disconnected );
+// setGuiStatus ( disconnected );
// return ;
// }
}
@@ -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;
-// setGuitqStatus ( disconnected );
+// setGuiStatus ( disconnected );
// return ;
// }
}
@@ -14858,7 +14858,7 @@ void KVpnc::readFromStdout_tail_racoon()
disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuitqStatus ( connected );
+ setGuiStatus ( connected );
doIptablesRacoon();
@@ -15063,7 +15063,7 @@ void KVpnc::readFromStdout_racoonctl()
//
// connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
// durationTimer.start ( 1000, FALSE );
-// setGuitqStatus ( connected );
+// setGuiStatus ( connected );
//
// setFirewallAfterConnect();
// if ( GlobalConfig->currentProfile->getExecuteCmdAfterConnect() )
@@ -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:" ).tqarg(TunnelInterfaceIP) , GlobalConfig->debug);
+ // GlobalConfig->appendLogEntry( "[pppd] "+i18n( "Tunnel IP:" ).arg(TunnelInterfaceIP) , GlobalConfig->debug);
//
abort = false;
@@ -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" ).tqarg( ProcessMsg_connect), GlobalConfig->debug);
+ // GlobalConfig->appendLogEntry ( i18n( "adr: %1\n" ).arg( 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 );
@@ -15327,7 +15327,7 @@ void KVpnc::readFromStdout_pptp()
disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuitqStatus ( connected );
+ setGuiStatus ( connected );
connectSuccess = false;
GlobalConfig->appendLogEntry ( i18n ( "Connection established." ), GlobalConfig->success );
@@ -15524,7 +15524,7 @@ 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" ).tqarg( pppdev ).tqarg( GlobalConfig->NewDefaultGw), GlobalConfig->debug );
+ // GlobalConfig->appendLogEntry ( i18n ( "Setting extra route: %1 over %2 gw %3" ).arg ( "0.0.0.0" ).arg( pppdev ).arg( GlobalConfig->NewDefaultGw), GlobalConfig->debug );
// pppdupstream << GlobalConfig->pathToIp + " route add 0.0.0.0 via " << GlobalConfig->NewDefaultGw << " dev " << pppdev << "\n";
// }
pppdupfile.close();
@@ -15587,14 +15587,14 @@ void KVpnc::readFromStdout_pptp()
// ReplaceDefaultRouteProcess->addArgument ( PppdReplaceDefaultRouteScript );
// if ( !ReplaceDefaultRouteProcess->start(env) )
// {
- // KMessageBox::sorry ( this, i18n ( "\"%1\" %2 start failed!" ).arg ( i18n ( "pppd replace route process" )).tqarg( tmpPath + "pppd_replace_defaultroute." + GlobalConfig->currentProfile->getName() + ".sh") );
+ // KMessageBox::sorry ( this, i18n ( "\"%1\" %2 start failed!" ).arg ( i18n ( "pppd replace route process" )).arg( tmpPath + "pppd_replace_defaultroute." + GlobalConfig->currentProfile->getName() + ".sh") );
// // disconnectClicked();
- // // setGuitqStatus(disconnected);
+ // // setGuiStatus(disconnected);
// }
// else
// {
// if ( GlobalConfig->KvpncDebugLevel > 1 )
- // GlobalConfig->appendLogEntry ( i18n ( "\"%1\" (%2) started." ).arg ( i18n ( "pppd replace route process" )).tqarg( tmpPath + "pppd_replace_defaultroute." + GlobalConfig->currentProfile->getName() + ".sh") , GlobalConfig->debug );
+ // GlobalConfig->appendLogEntry ( i18n ( "\"%1\" (%2) started." ).arg ( i18n ( "pppd replace route process" )).arg( 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" )).tqarg(PppdReplaceDefaultRouteScript), GlobalConfig->error );
+ // GlobalConfig->appendLogEntry ( i18n ( "Could not write: \"%1\" (%2)!" ).arg ( i18n ( "pppd replace route script" )).arg(PppdReplaceDefaultRouteScript), GlobalConfig->error );
// }
//
// }
@@ -15623,9 +15623,9 @@ void KVpnc::readFromStdout_pptp()
// if ( !PptpRouteProcess->start(env) )
// {
- // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( i18n( "pppd route process" ) ) );
+ // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( i18n( "pppd route process" ) ) );
// disconnectClicked();
- // setGuitqStatus(disconnected);
+ // setGuiStatus(disconnected);
// }
// else
// {
@@ -15635,7 +15635,7 @@ void KVpnc::readFromStdout_pptp()
// }
// delete PptpRouteProcess;
// PptpRouteProcess=0L;
- // GlobalConfig->appendLogEntry ( i18n( "\"%1\" started." ).tqarg( i18n( "pppd route process" ) ), GlobalConfig->info );
+ // GlobalConfig->appendLogEntry ( i18n( "\"%1\" started." ).arg( i18n( "pppd route process" ) ), GlobalConfig->info );
if ( GlobalConfig->currentProfile->getUseAdditionalNetworkRoutes() && !GlobalConfig->currentProfile->getAdditionalNetworkRoutes().isEmpty() )
addAdditionalNetworkRoutes();
@@ -15655,7 +15655,7 @@ void KVpnc::readFromStdout_pptp()
//terminateConnection ( PptpProcess );
disconnectClicked();
GlobalConfig->status = GlobalConfig->disconnected;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
// // remove password entries
@@ -15664,7 +15664,7 @@ void KVpnc::readFromStdout_pptp()
// // remove kvpnc entries from chap-secerets
// TQFile ChapSecretsFile ( "/etc/ppp/chap-secrets" );
// if ( GlobalConfig->KvpncDebugLevel > 0 )
- // GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1").tqarg("/etc/ppp/chap-secrets" ), GlobalConfig->debug );
+ // GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1").arg("/etc/ppp/chap-secrets" ), GlobalConfig->debug );
// TQTextStream stream ( &ChapSecretsFile );
// if ( ChapSecretsFile.open ( IO_ReadOnly ) )
// {
@@ -15731,7 +15731,7 @@ void KVpnc::readFromStdout_pptp()
// // remove kvpnc entries from pap-secerets
// TQFile papSecretsFile ( "/etc/ppp/pap-secrets" );
// if ( GlobalConfig->KvpncDebugLevel > 0 )
- // GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1").tqarg("/etc/ppp/chap-secrets" ), GlobalConfig->debug );
+ // GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1").arg("/etc/ppp/chap-secrets" ), GlobalConfig->debug );
// TQTextStream stream ( &papSecretsFile );
// if ( papSecretsFile.open ( IO_ReadOnly ) )
// {
@@ -15933,7 +15933,7 @@ void KVpnc::readFromStderr_pptp()
//terminateConnection ( PptpProcess );
disconnectClicked();
GlobalConfig->status = GlobalConfig->disconnected;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
if ( allowReconnect && GlobalConfig->currentProfile->getDoReconnectAfterConnectionLost() )
{
@@ -16009,7 +16009,7 @@ void KVpnc::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)!" ).tqarg(i18n("user password") ));
+ // 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;
}
@@ -16019,7 +16019,7 @@ void KVpnc::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)!" ).tqarg(i18n("user password") ));
+ // KMessageBox::error( this, i18n( "Authentication failed (%1)!" ).arg(i18n("user password") ));
GlobalConfig->appendLogEntry ( i18n ( "Username and password could not read from management interface!" ) , GlobalConfig->error );
abort = true;
}
@@ -16028,7 +16028,7 @@ void KVpnc::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)!" ).tqarg(i18n("user password") ));
+ // KMessageBox::error( this, i18n( "Authentication failed (%1)!" ).arg(i18n("user password") ));
GlobalConfig->appendLogEntry ( i18n ( "eToken password could not read from management interface!" ) , GlobalConfig->error );
abort = true;
}
@@ -16039,7 +16039,7 @@ void KVpnc::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)!" ).tqarg(i18n("user password") ));
+ // KMessageBox::error( this, i18n( "Authentication failed (%1)!" ).arg(i18n("user password") ));
GlobalConfig->appendLogEntry ( i18n ( "Insufficient key material or header text not found!" ) , 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." ).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 );
+ // 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 );
// 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." ).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 );
+ // 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 );
// 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 );
@@ -16299,8 +16299,8 @@ void KVpnc::readOutput_openvpn()
{
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 );
+ // 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 );
// 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 );
@@ -16315,8 +16315,8 @@ void KVpnc::readOutput_openvpn()
// example: WARNING: 'cipher' is used inconsistently, local='cipher BF-CBC', remote='cipher AES-128-CBC'
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 );
+ // 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 );
// 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();
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
}
else if ( ProcessMsg.find ( "Initialization Sequence Completed", 0, FALSE ) > -1 )
{
@@ -16453,7 +16453,7 @@ void KVpnc::readOutput_openvpn()
disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuitqStatus ( connected );
+ setGuiStatus ( connected );
connectSuccess = false;
if ( GlobalConfig->KvpncDebugLevel > 0 )
@@ -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" ) );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
}
else
{
@@ -16670,7 +16670,7 @@ void KVpnc::processStdout_l2tpd()
//terminateConnection ( L2tpdProcess );
disconnectClicked();
GlobalConfig->status = GlobalConfig->disconnected;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
// remove kvpnc entries from secrets file
@@ -16823,7 +16823,7 @@ void KVpnc::processStdout_l2tpd()
disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuitqStatus ( connected );
+ setGuiStatus ( connected );
setFirewallAfterConnect();
@@ -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" ) );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
}
else
{
@@ -17087,7 +17087,7 @@ void KVpnc::processStderr_l2tpd()
disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuitqStatus ( connected );
+ setGuiStatus ( connected );
setFirewallAfterConnect();
@@ -17123,7 +17123,7 @@ 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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
if ( GlobalConfig->currentProfile->getAuthMethod() == "chap" || GlobalConfig->currentProfile->getAuthMethod() == "mschap" || GlobalConfig->currentProfile->getAuthMethod() == "mschap-v2" )
{
@@ -17343,7 +17343,7 @@ void KVpnc::readFromStdout_openl2tp()
disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuitqStatus ( connected );
+ setGuiStatus ( 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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( 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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( 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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( 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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
@@ -17511,7 +17511,7 @@ void KVpnc::readFromStdout_vtun()
//terminateConnection ( L2tpdProcess );
disconnectClicked();
GlobalConfig->status = GlobalConfig->disconnected;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
}
// success
@@ -17525,7 +17525,7 @@ void KVpnc::readFromStdout_vtun()
disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuitqStatus ( connected );
+ setGuiStatus ( connected );
setFirewallAfterConnect();
@@ -17613,7 +17613,7 @@ void KVpnc::readFromStderr_vtun()
}
// // if ( ProcessMsg_connect.find(" Exit ",0,FALSE) > -1 )
// // {
-// // GlobalConfig->appendLogEntry(i18n("%1 has been exited.").tqarg("vtund"),GlobalConfig->error);
+// // GlobalConfig->appendLogEntry(i18n("%1 has been exited.").arg("vtund"),GlobalConfig->error);
// // abort=true;
// // ErrorMsg=true;
// // }
@@ -17672,7 +17672,7 @@ void KVpnc::readFromStderr_vtun()
disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuitqStatus ( connected );
+ setGuiStatus ( 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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
GlobalConfig->appPointer->processEvents();
@@ -17726,8 +17726,8 @@ void KVpnc::readFromStdout_ssh ( KProcess *, char *buffer, int buflen )
// ProcessMsg_connect = SshProcess->readLineStdout();
// TQString ProcessMsg_connect = TQString( SshProcess->readStdout() );
-// TQString ProcessMsg_connect = TQString::tqfromLatin1(buffer, buflen);
- TQString ProcessMsg_connect_raw = TQString::tqfromLatin1 ( buffer, buflen );
+// TQString ProcessMsg_connect = TQString::fromLatin1(buffer, buflen);
+ TQString ProcessMsg_connect_raw = TQString::fromLatin1 ( buffer, buflen );
TQStringList ProcessMsg_connect_raw_list = TQStringList::split ( "debug1:",ProcessMsg_connect_raw );
for ( TQStringList::Iterator it = ProcessMsg_connect_raw_list.begin(); it != ProcessMsg_connect_raw_list.end(); ++it )
@@ -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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
@@ -17841,7 +17841,7 @@ void KVpnc::readFromStdout_ssh ( KProcess *, char *buffer, int buflen )
disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuitqStatus ( connected );
+ setGuiStatus ( connected );
connectSuccess = false;
GlobalConfig->appendLogEntry ( i18n ( "Connection established." ), GlobalConfig->success );
@@ -18067,7 +18067,7 @@ void KVpnc::readFromStdout_ssh ( KProcess *, char *buffer, int buflen )
{
KMessageBox::sorry ( this, i18n ( "\"%1\" %2 start failed!" ).arg ( i18n ( "ssh replace route process" ) ).arg ( tmpPath + "pppd_replace_defaultroute." + GlobalConfig->currentProfile->getName() + ".sh" ) );
// disconnectClicked();
- // setGuitqStatus(disconnected);
+ // setGuiStatus(disconnected);
}
else
{
@@ -18100,13 +18100,13 @@ void KVpnc::readFromStdout_ssh ( KProcess *, char *buffer, int buflen )
// if ( !PptpRouteProcess->start(env) )
// {
- // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( i18n( "pppd route process" ) ) );
+ // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( i18n( "pppd route process" ) ) );
// disconnectClicked();
- // setGuitqStatus(disconnected);
+ // setGuiStatus(disconnected);
// }
// else
{
- // GlobalConfig->appendLogEntry ( i18n( "\"%1\" started." ).tqarg( i18n( "pppd route process" ) ), GlobalConfig->info );
+ // GlobalConfig->appendLogEntry ( i18n( "\"%1\" started." ).arg( i18n( "pppd route process" ) ), GlobalConfig->info );
// while (PptpRouteProcess->isRunning())
// {
@@ -18139,9 +18139,9 @@ void KVpnc::readFromStderr_ssh ( KProcess *, char *buffer, int buflen )
// {
// ProcessMsg_connect = SshProcess->readLineStderr();
// TQString ProcessMsg_connect = TQString( SshProcess->readStderr() );
-// TQString ProcessMsg_connect = TQString::tqfromLatin1(buffer, buflen);
+// TQString ProcessMsg_connect = TQString::fromLatin1(buffer, buflen);
- TQString ProcessMsg_connect_raw = TQString::tqfromLatin1 ( buffer, buflen );
+ TQString ProcessMsg_connect_raw = TQString::fromLatin1 ( buffer, buflen );
TQStringList ProcessMsg_connect_raw_list = TQStringList::split ( "debug1:",ProcessMsg_connect_raw );
for ( TQStringList::Iterator it = ProcessMsg_connect_raw_list.begin(); it != ProcessMsg_connect_raw_list.end(); ++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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
}
@@ -18240,12 +18240,12 @@ void KVpnc::readFromStdout_ping()
if ( ProcessMsg_connect.find ( "time=", 0, FALSE ) > -1 )
{
GlobalConfig->appendLogEntry ( "[ping] " + ProcessMsg_connect, GlobalConfig->success );
- KNotifyClient::event ( tqtopLevelWidget() ->winId(), "ping success", i18n ( "Ping was successful." ) );
+ KNotifyClient::event ( topLevelWidget() ->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 ( tqtopLevelWidget() ->winId(), "ping failed", i18n ( "Ping has failed." ) );
+ KNotifyClient::event ( topLevelWidget() ->winId(), "ping failed", i18n ( "Ping has failed." ) );
}
else
{
@@ -18386,12 +18386,12 @@ 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 ( 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() ) );
+ 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() ) );
}
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 ( 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() ) );
+ 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() ) );
}
}
disconnect ( ConnectionStatusCheckProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_connectionStatusCheck() ) );
@@ -18426,15 +18426,15 @@ void KVpnc::readFromStderr_connectionStatusCheck()
// {
// /* Connection alive */
// if (GlobalConfig->KvpncDebugLevel > 0)
- // 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 );
+ // 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 );
//
// }
// 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.").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()) );
+ // 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()) );
// // kill connection
// disconnectClicked();
// }
@@ -18576,7 +18576,7 @@ void KVpnc::terminateConnection ( TQProcess *proc )
durationTimer.stop();
GlobalConfig->status = GlobalConfig->disconnected;
connectCounter = 0;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
}
@@ -18685,7 +18685,7 @@ void KVpnc::slotConnectTimedOut()
this->ConnectAction->setEnabled ( true );
this->DisconnectAction->setEnabled ( false );
//parent->statusBar() ->insertItem( i18n( "Connected" ), 2, 0, true );
- KVpncDock->settqStatus ( disconnected );
+ KVpncDock->setStatus ( disconnected );
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "Connection failed (timeout)." ), GlobalConfig->debug );
disconnectClicked();
@@ -18694,7 +18694,7 @@ void KVpnc::slotConnectTimedOut()
TQToolTip::remove( KVpncDock );
TQToolTip::add( KVpncDock, i18n ( "Disconnected" ) );
connectCounter = 0;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( 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() )
@@ -18732,7 +18732,7 @@ void KVpnc::newSessionClicked()
if ( ( it != GlobalConfig->currentProfile ) && ( it->getName() == newName ) )
{
//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::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).arg( 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:" ), TQString ( Oldname + "_2" ), &ok );
@@ -18929,7 +18929,7 @@ void KVpnc::renameSessionClicked ()
if ( ( it != GlobalConfig->currentProfile ) && ( it->getName() == GlobalConfig->currentProfile->getName() ) )
{
//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::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).arg( 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:" ), TQString ( GlobalConfig->currentProfile->getName() + "_2" ), &ok );
@@ -19025,7 +19025,7 @@ void KVpnc::sessionToggled ( const TQString& Name )
TQString Gateway = it->getGateway();
TQString Username = it->getUserName();
//if ( GlobalConfig->KvpncDebugLevel > 2 )
- // GlobalConfig->appendLogEntry (i18n("Username: \"%1").tqarg(Username), KVpncConfig::debug);
+ // GlobalConfig->appendLogEntry (i18n("Username: \"%1").arg(Username), KVpncConfig::debug);
if (it->getDontSaveUsername() || (Username == ""))
Username = i18n("&lt;ask at connect&gt;");
TQString IpsecId = "";
@@ -19311,9 +19311,9 @@ void KVpnc::sessionToggled ( const TQString& Name )
AuthTypePretty += i18n(" (using password)");
else
if (it->getPskIsInFile())
- AuthTypePretty += i18n(" (using key: %1)").tqarg(it->getPreSharedKeyFile());
+ AuthTypePretty += i18n(" (using key: %1)").arg(it->getPreSharedKeyFile());
else
- AuthTypePretty += i18n(" (using key: %1)").tqarg(it->getPreSharedKey());
+ AuthTypePretty += i18n(" (using key: %1)").arg(it->getPreSharedKey());
}
if ( GlobalConfig->KvpncDebugLevel > 2 )
@@ -19323,7 +19323,7 @@ void KVpnc::sessionToggled ( const TQString& Name )
// ToolInfo *it;
// std::cout << "Tool (bin): " << bin << std::endl;
- TQString TypeRequirementtqStatus="";
+ TQString TypeRequirementStatus="";
if ( !GlobalConfig->ToolList->isEmpty() )
{
@@ -19349,7 +19349,7 @@ void KVpnc::sessionToggled ( const TQString& Name )
if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry ( i18n ( "The required daemon (%1) is available, connect will be enabled." ).arg ( bin ), KVpncConfig::info );
- TypeRequirementtqStatus = i18n ( "Daemon (%1) available").tqarg(bin);
+ TypeRequirementStatus = i18n ( "Daemon (%1) available").arg(bin);
}
else
{
@@ -19358,7 +19358,7 @@ void KVpnc::sessionToggled ( const TQString& 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 );
- TypeRequirementtqStatus = i18n ( "Daemon (%1) not available").arg ( "pkcs11-tool" );
+ TypeRequirementStatus = i18n ( "Daemon (%1) not available").arg ( "pkcs11-tool" );
}
else
{
@@ -19366,7 +19366,7 @@ void KVpnc::sessionToggled ( const TQString& 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 );
- TypeRequirementtqStatus = i18n ( "Daemon (%1) and helper program (%2) not available").arg ( "pkcs11-tool" ).tqarg("pkcs11-tool");
+ TypeRequirementStatus = i18n ( "Daemon (%1) and helper program (%2) not available").arg ( "pkcs11-tool" ).arg("pkcs11-tool");
}
}
}
@@ -19375,7 +19375,7 @@ void KVpnc::sessionToggled ( const TQString& 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 );
- TypeRequirementtqStatus = i18n ( "Daemon (%1) not available").tqarg(bin);
+ TypeRequirementStatus = i18n ( "Daemon (%1) not available").arg(bin);
}
}
else
@@ -19401,7 +19401,7 @@ void KVpnc::sessionToggled ( const TQString& 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 );
- TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "racoon" ).arg ( "l2tpd" );
+ TypeRequirementStatus = 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 TQString& 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 );
- TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "racoon" ).arg ( "xl2tpd" );
+ TypeRequirementStatus = 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 TQString& 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 );
- TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "racoon" ).arg ( "xl2tpd" );
+ TypeRequirementStatus = 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 TQString& 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 );
- TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "racoon" ).arg ( "openl2tp" );
+ TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "racoon" ).arg ( "openl2tp" );
this->ConnectAction->setEnabled ( TRUE );
mw->buttonConnect->setEnabled ( TRUE );
@@ -19473,7 +19473,7 @@ void KVpnc::sessionToggled ( const TQString& 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 );
- TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg ( "l2tpd" );
+ TypeRequirementStatus = 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 TQString& 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 );
- TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg ( "xl2tpd" );
+ TypeRequirementStatus = 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 TQString& 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 );
- TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "ipsec" ).arg ( "l2tpd/xl2tpd" );
+ TypeRequirementStatus = 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 TQString& 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 );
- TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg ( "openl2tp" );
+ TypeRequirementStatus = 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 TQString& 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 );
- TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg ( "openl2tp" );
+ TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg ( "openl2tp" );
}
}
}
@@ -19524,7 +19524,7 @@ void KVpnc::sessionToggled ( const TQString& 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 );
- TypeRequirementtqStatus = i18n ( "Daemon (%1) not available").arg ( "pkcs11-tool" );
+ TypeRequirementStatus = i18n ( "Daemon (%1) not available").arg ( "pkcs11-tool" );
}
else
{
@@ -19532,7 +19532,7 @@ void KVpnc::sessionToggled ( const TQString& Name )
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 ( TQString(deamon) ).arg ( "pkcs11-tool" ), KVpncConfig::info );
- TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).tqarg(deamon).arg ( "pkcs11-tool" );
+ TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg(deamon).arg ( "pkcs11-tool" );
}
}
}
@@ -19540,7 +19540,7 @@ void KVpnc::sessionToggled ( const TQString& 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 );
- TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "ipsec" ).arg ( "l2tpd/xl2pd" );
+ TypeRequirementStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "ipsec" ).arg ( "l2tpd/xl2pd" );
}
}
if ( type == "pptp" )
@@ -19556,7 +19556,7 @@ void KVpnc::sessionToggled ( const TQString& 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 );
- TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "pppd" ).arg ( "pptp" );
+ TypeRequirementStatus = 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 TQString& Name )
else
{
GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) are not available, connect will be disabled." ).arg ( "pppd" ).arg ( "pptp" ), KVpncConfig::error );
- TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "pppd" ).arg ( "pptp" );
+ TypeRequirementStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "pppd" ).arg ( "pptp" );
}
}
if ( type == "ssh" )
@@ -19585,7 +19585,7 @@ void KVpnc::sessionToggled ( const TQString& 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 );
- TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ssh" ).arg ( "ksshaskpass" );
+ TypeRequirementStatus = 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 TQString& 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 );
- TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ssh" ).arg ( "gnome-ssh-askpass" );
+ TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ssh" ).arg ( "gnome-ssh-askpass" );
this->ConnectAction->setEnabled ( TRUE );
mw->buttonConnect->setEnabled ( TRUE );
@@ -19606,13 +19606,13 @@ void KVpnc::sessionToggled ( const TQString& 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 );
- TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "ssh" ).arg ( i18n ( "%1 or %2" ).arg ( "ksshaskpass" ).arg ( "gnome-ssh-askpass" ) );
+ TypeRequirementStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "ssh" ).arg ( i18n ( "%1 or %2" ).arg ( "ksshaskpass" ).arg ( "gnome-ssh-askpass" ) );
}
}
}
}
- ProfileInfo += "<tr><td>"+i18n("Required tools:")+"</td><td>"+TypeRequirementtqStatus+"</td></tr>";
+ ProfileInfo += "<tr><td>"+i18n("Required tools:")+"</td><td>"+TypeRequirementStatus+"</td></tr>";
ProfileInfo += "</table>";
TQToolTip::add( mw->SessionCombo, ProfileInfo );
break;
@@ -19643,7 +19643,7 @@ void KVpnc::slotDurationEvent()
if ( !isHidden() )
{
TQString StatusMsg = "";
- TQString durationString(i18n("%1:%2:%3" ).tqarg( TQString().sprintf("%02u", hour)).tqarg( TQString().sprintf("%02u", min)).tqarg( TQString().sprintf("%02u", sec)));
+ TQString durationString(i18n("%1:%2:%3" ).arg( TQString().sprintf("%02u", hour)).arg( TQString().sprintf("%02u", min)).arg( TQString().sprintf("%02u", sec)));
TQString Username = "";
if (!GlobalConfig->TmpUsername.isEmpty())
@@ -19653,15 +19653,15 @@ void KVpnc::slotDurationEvent()
if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::cisco)
{
- StatusMsg = i18n("Connected: %2@%1, [%3], %4").tqarg(Username).tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(PrettyTypeString).tqarg(durationString);
+ StatusMsg = i18n("Connected: %2@%1, [%3], %4").arg(Username).arg(GlobalConfig->currentProfile->getGateway()).arg(PrettyTypeString).arg(durationString);
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ciscoorig)
{
- StatusMsg = i18n("Connected: %2@%1, [%3], %4").tqarg(Username).tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(PrettyTypeString).tqarg(durationString);
+ StatusMsg = i18n("Connected: %2@%1, [%3], %4").arg(Username).arg(GlobalConfig->currentProfile->getGateway()).arg(PrettyTypeString).arg(durationString);
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::pptp)
{
- StatusMsg = i18n("Connected: %2@%1 [%3], %4").tqarg( GlobalConfig->currentProfile->getGateway()).tqarg( Username).tqarg( PrettyTypeString).tqarg(durationString);
+ StatusMsg = i18n("Connected: %2@%1 [%3], %4").arg( GlobalConfig->currentProfile->getGateway()).arg( Username).arg( PrettyTypeString).arg(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").tqarg( GlobalConfig->currentProfile->getGateway()).tqarg(PrettyTypeString).tqarg(durationString);
+ StatusMsg = i18n("Connected: %1 [%2], %3").arg( GlobalConfig->currentProfile->getGateway()).arg(PrettyTypeString).arg(durationString);
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::racoon)
{
- StatusMsg = i18n("Connected: %1 [%2], %3").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(PrettyTypeString).tqarg(durationString);
+ StatusMsg = i18n("Connected: %1 [%2], %3").arg(GlobalConfig->currentProfile->getGateway()).arg(PrettyTypeString).arg(durationString);
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_racoon)
{
- StatusMsg = i18n("Connected: %2@%1 [%3], %4").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(PrettyTypeString).tqarg(durationString);
+ StatusMsg = i18n("Connected: %2@%1 [%3], %4").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(PrettyTypeString).arg(durationString);
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_freeswan || (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan && GlobalConfig->currentProfile->getAuthWithUsernameAndPassword()))
{
- StatusMsg = i18n("Connected: %2@%1 [%3], %4").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(PrettyTypeString).tqarg(durationString);
+ StatusMsg = i18n("Connected: %2@%1 [%3], %4").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(PrettyTypeString).arg(durationString);
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::openvpn)
{
- StatusMsg = i18n("Connected: %2@%1 [%3], %4").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(PrettyTypeString).tqarg(durationString);
+ StatusMsg = i18n("Connected: %2@%1 [%3], %4").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(PrettyTypeString).arg(durationString);
}
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::openvpn)
{
- StatusMsg = i18n("Connected: %1, [%2], %3").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(PrettyTypeString).tqarg(durationString);
+ StatusMsg = i18n("Connected: %1, [%2], %3").arg(GlobalConfig->currentProfile->getGateway()).arg(PrettyTypeString).arg(durationString);
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::vtun)
{
- StatusMsg = i18n("Connected: %1, [%2], %3").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(TQString(PrettyTypeString)).tqarg(durationString);
+ StatusMsg = i18n("Connected: %1, [%2], %3").arg(TQString(GlobalConfig->currentProfile->getGateway())).arg(TQString(PrettyTypeString)).arg(durationString);
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ssh)
{
- StatusMsg = i18n("Connected: %1@%2 [%3], %4").tqarg(TQString(Username)).tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(PrettyTypeString).tqarg(durationString);
+ StatusMsg = i18n("Connected: %1@%2 [%3], %4").arg(TQString(Username)).arg(GlobalConfig->currentProfile->getGateway()).arg(PrettyTypeString).arg(durationString);
}
@@ -19761,18 +19761,18 @@ void KVpnc::showDockTooltip()
TQString ToolTipMsg = "<table>";
TQString Username = "";
- TQString ConnectiontqStatus="";
+ TQString ConnectionStatus="";
if (GlobalConfig->status == GlobalConfig->connected || GlobalConfig->status == GlobalConfig->connecting)
{
if (GlobalConfig->status == GlobalConfig->connected)
{
- ConnectiontqStatus = i18n("connected");
- durationString = i18n("%1:%2:%3").tqarg( TQString().sprintf("%02u", hour)).tqarg(TQString().sprintf("%02u", min)).tqarg(TQString().sprintf("%02u", sec));
+ ConnectionStatus = i18n("connected");
+ durationString = i18n("%1:%2:%3").arg( TQString().sprintf("%02u", hour)).arg(TQString().sprintf("%02u", min)).arg(TQString().sprintf("%02u", sec));
}
else
{
- ConnectiontqStatus = i18n("connecting");
+ ConnectionStatus = i18n("connecting");
}
if (!GlobalConfig->TmpUsername.isEmpty())
@@ -19780,7 +19780,7 @@ void KVpnc::showDockTooltip()
else
Username = GlobalConfig->currentProfile->getUserName();
- ToolTipMsg += "<tr><td>"+i18n("Status:")+"</td><td>"+ConnectiontqStatus+"</td></tr>";
+ ToolTipMsg += "<tr><td>"+i18n("Status:")+"</td><td>"+ConnectionStatus+"</td></tr>";
ToolTipMsg += "<tr><td>"+i18n("Server:")+"</td><td>"+TQString(GlobalConfig->currentProfile->getGateway())+"</td></tr>";
ToolTipMsg += "<tr><td>"+i18n("Type:")+"</td><td>"+TQString(PrettyTypeString)+"</td></tr>";
@@ -19828,22 +19828,22 @@ void KVpnc::showDockTooltip()
}
else if (GlobalConfig->status == GlobalConfig->disconnected)
{
- ConnectiontqStatus = i18n("disconnected");
- ToolTipMsg += "<tr><td>"+i18n("State:")+"</td><td>"+ ConnectiontqStatus+"</td></tr>";
+ ConnectionStatus = i18n("disconnected");
+ ToolTipMsg += "<tr><td>"+i18n("State:")+"</td><td>"+ ConnectionStatus+"</td></tr>";
}
ToolTipMsg += "</table>";
TQToolTip::remove ( KVpncDock);
TQToolTip::add ( KVpncDock, ToolTipMsg );
}
-void KVpnc::setGuitqStatus ( int status )
+void KVpnc::setGuiStatus ( int status )
{
TQString durationString = "";
TQString DaemonString = "";
TQString ToolTipMsg = "";
TQString ConnectMsg = "";
TQString LogMsg = "";
- TQString ConnectiontqStatus = i18n("unknown");
+ TQString ConnectionStatus = i18n("unknown");
TQString Username = "";
if (status == GlobalConfig->connected)
{
@@ -19854,7 +19854,7 @@ void KVpnc::setGuitqStatus ( int status )
TQString LogMsg = "";
TQString ToolTipMsg = "";
TQString DeamonString = "";
- ConnectiontqStatus = i18n("connected");
+ ConnectionStatus = i18n("connected");
if ( !GlobalConfig->TmpUsername.isEmpty() )
Username=GlobalConfig->TmpUsername;
@@ -19868,7 +19868,7 @@ void KVpnc::setGuitqStatus ( int status )
ImportSessionAction->setEnabled ( false );
NewProfileWizardAction->setEnabled ( false );
- KVpncDock->settqStatus ( connected );
+ KVpncDock->setStatus ( connected );
GlobalConfig->status = GlobalConfig->connected;
statusColorLabel->setPixmap ( *connectedStatusPixmap );
mw->buttonConnect->setEnabled ( false );
@@ -19911,7 +19911,7 @@ void KVpnc::setGuitqStatus ( int status )
DeleteSessionAction->setEnabled ( false );
ImportSessionAction->setEnabled ( false );
- KVpncDock->settqStatus ( connecting );
+ KVpncDock->setStatus ( connecting );
GlobalConfig->status = GlobalConfig->connecting;
mw->SessionCombo->setEnabled ( false );
PreferencesAction->setEnabled ( false );
@@ -19919,7 +19919,7 @@ void KVpnc::setGuitqStatus ( int status )
NewProfileWizardAction->setEnabled ( false );
PrefAction ->setEnabled ( false );
- ConnectiontqStatus = i18n("connecting");
+ ConnectionStatus = i18n("connecting");
statusColorLabel->setPixmap ( *connectingStatusPixmap );
@@ -19941,7 +19941,7 @@ void KVpnc::setGuitqStatus ( int status )
RenameSessionAction->setEnabled ( true );
DeleteSessionAction->setEnabled ( true );
ImportSessionAction->setEnabled ( true );
- KVpncDock->settqStatus ( disconnected );
+ KVpncDock->setStatus ( disconnected );
mw->SessionCombo->setEnabled ( true );
PreferencesAction->setEnabled ( true );
ProfileManagerAction->setEnabled ( true );
@@ -19957,9 +19957,9 @@ void KVpnc::setGuitqStatus ( int status )
slotStatusMsg ( i18n ( "Disconnected." ), ID_FLASH_MSG );
if ( prevConnectionState == GlobalConfig->connected )
- KNotifyClient::event ( tqtopLevelWidget() ->winId(), "connection finished", i18n ( "Connection \"%1\" finished" ).arg ( GlobalConfig->currentProfile->getName() ) );
+ KNotifyClient::event ( topLevelWidget() ->winId(), "connection finished", i18n ( "Connection \"%1\" finished" ).arg ( GlobalConfig->currentProfile->getName() ) );
else if ( prevConnectionState == GlobalConfig->connecting )
- KNotifyClient::event ( tqtopLevelWidget() ->winId(), "connect try canceled", i18n ( "Connect try to \"%1\" canceled" ).arg ( GlobalConfig->currentProfile->getName() ) );
+ KNotifyClient::event ( topLevelWidget() ->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::setGuitqStatus ( int status )
}
if (GlobalConfig->currentProfile->getAuthType() == VpnAccountData::psk)
{
- 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);
+ 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);
- ConnectMsg = i18n("%5: %2@%1, %3 [%4]").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString).tqarg(PrettyTypeString).tqarg(ConnectiontqStatus);
+ ConnectMsg = i18n("%5: %2@%1, %3 [%4]").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(durationString).arg(PrettyTypeString).arg(ConnectionStatus);
- 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 + "]");
+ 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(TQDateTime::currentDateTime().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").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString).tqarg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]").tqarg(ConnectiontqStatus);
+ 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);
- ConnectMsg = i18n("%5: %2@%1, %3 [%4]").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString).tqarg(PrettyTypeString).tqarg(ConnectiontqStatus);
+ ConnectMsg = i18n("%5: %2@%1, %3 [%4]").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(durationString).arg(PrettyTypeString).arg(ConnectionStatus);
- LogMsg = i18n("Successful connected to server: \"%1\", user: \"%2\" at %3").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::TextDate) + " [" + PrettyTypeString + "]");
+ LogMsg = i18n("Successful connected to server: \"%1\", user: \"%2\" at %3").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(TQDateTime::currentDateTime().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").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString , GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]").tqarg(ConnectiontqStatus);
+ 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);
- ConnectMsg = i18n("Connected: %2@%1, %3").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString);
+ ConnectMsg = i18n("Connected: %2@%1, %3").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(durationString);
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);
+ LogMsg = i18n("Successful connected to server \"%1\"\nuser: \"%2\" at %3").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(TQString(TQDateTime::currentDateTime().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,76 +20009,76 @@ void KVpnc::setGuitqStatus ( int status )
{
PrettyTypeString = i18n("racoon");
DaemonString = "racoon";
- ConnectMsg = i18n("Policy was successfully activated, daemon (%1) is running and tunnel is up.").tqarg(DaemonString);
+ ConnectMsg = i18n("Policy was successfully activated, daemon (%1) is running and tunnel is up.").arg(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.").tqarg(DaemonString);
+ ConnectMsg = i18n("Policy was successful activated and daemon (%1) is running.").arg(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").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(Username).tqarg(durationString).tqarg(TQString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]").tqarg(ConnectiontqStatus);
+ ToolTipMsg = i18n("status: %5\nserver: %1\nuser: %2\nduration: %3\nprofile %4").arg(TQString(GlobalConfig->currentProfile->getGateway())).arg(Username).arg(durationString).arg(TQString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]").arg(ConnectionStatus);
- ConnectMsg = i18n("%5: %2@%1, %3 [%4]").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString).tqarg(PrettyTypeString).tqarg(ConnectiontqStatus);
+ ConnectMsg = i18n("%5: %2@%1, %3 [%4]").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(durationString).arg(PrettyTypeString).arg(ConnectionStatus);
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_freeswan)
{
PrettyTypeString = IpsecType;
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").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(Username).tqarg(durationString , TQString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]").tqarg(ConnectiontqStatus);
+ ToolTipMsg = i18n("status: %5\nserver: %1\nuser: %2\nduration: %3\nprofile %4").arg(TQString(GlobalConfig->currentProfile->getGateway())).arg(Username).arg(durationString , TQString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]").arg(ConnectionStatus);
- ConnectMsg = i18n("%4: %2@%1, %3").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg( Username).tqarg(durationString).tqarg(ConnectiontqStatus);
+ ConnectMsg = i18n("%4: %2@%1, %3").arg(TQString(GlobalConfig->currentProfile->getGateway())).arg( Username).arg(durationString).arg(ConnectionStatus);
}
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").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(Username).tqarg(durationString , TQString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]").tqarg(ConnectiontqStatus);
+ ToolTipMsg = i18n("status: %5\nserver: %1\nuser: %2\nduration: %3\nprofile %4").arg(TQString(GlobalConfig->currentProfile->getGateway())).arg(Username).arg(durationString , TQString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]").arg(ConnectionStatus);
- ConnectMsg = i18n("Connected: %2@%1, %3").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString);
+ ConnectMsg = i18n("Connected: %2@%1, %3").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(durationString);
}
- 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 + "]");
+ 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(TQDateTime::currentDateTime().toString(Qt::TextDate)).arg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]");
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::openvpn)
{
PrettyTypeString = i18n("OpenVPN");
DaemonString = "openvpn";
- ToolTipMsg = i18n("status: %3 \nserver: %1\nduration: %2").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(durationString).tqarg(ConnectiontqStatus);
+ ToolTipMsg = i18n("status: %3 \nserver: %1\nduration: %2").arg(GlobalConfig->currentProfile->getGateway()).arg(durationString).arg(ConnectionStatus);
- ConnectMsg = i18n("Connected: %1, %2, profile \"%3\"").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(durationString).tqarg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]");
+ ConnectMsg = i18n("Connected: %1, %2, profile \"%3\"").arg(GlobalConfig->currentProfile->getGateway()).arg(durationString).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 + "]");
+ LogMsg = i18n("Successful connected to server \"%1\" at %2, profile \"%3\".").arg(GlobalConfig->currentProfile->getGateway()).arg(TQDateTime::currentDateTime().toString(Qt::TextDate)).arg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]");
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::vtun)
{
PrettyTypeString = i18n("Vtun");
DaemonString = "vtun";
- ToolTipMsg = i18n("status: %3\nserver: %1\nduration: %2").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(durationString).tqarg(ConnectiontqStatus);
+ ToolTipMsg = i18n("status: %3\nserver: %1\nduration: %2").arg(TQString(GlobalConfig->currentProfile->getGateway())).arg(durationString).arg(ConnectionStatus);
- ConnectMsg = i18n("Connected: %1, %2, profile \"%3\"").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(durationString).tqarg(TQString(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]"));
+ ConnectMsg = i18n("Connected: %1, %2, profile \"%3\"").arg(TQString(GlobalConfig->currentProfile->getGateway())).arg(durationString).arg(TQString(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 + "]");
+ LogMsg = i18n("Successful connected to server \"%1\" at %2, profile \"%3\".").arg(TQString(GlobalConfig->currentProfile->getGateway())).arg(TQDateTime::currentDateTime().toString(Qt::TextDate)).arg(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").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(durationString).tqarg(ConnectiontqStatus);
+ ToolTipMsg = i18n("status: %3\nserver: %1\nduration: %2").arg(TQString(GlobalConfig->currentProfile->getGateway())).arg(durationString).arg(ConnectionStatus);
- ConnectMsg = i18n("%4: %1, %2, profile \"%3\"").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(durationString ).tqarg(TQString(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]"));
+ ConnectMsg = i18n("%4: %1, %2, profile \"%3\"").arg(TQString(GlobalConfig->currentProfile->getGateway())).arg(durationString ).arg(TQString(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 + "]");
+ LogMsg = i18n("Successful connected to server \"%1\" at %2, profile \"%3\".").arg(GlobalConfig->currentProfile->getGateway()).arg(TQDateTime::currentDateTime().toString(Qt::TextDate)).arg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]");
}
if (status == GlobalConfig->connected)
- KNotifyClient::event ( tqtopLevelWidget() ->winId(), "connection established", ConnectMsg );
+ KNotifyClient::event ( topLevelWidget() ->winId(), "connection established", ConnectMsg );
}
}
@@ -20153,7 +20153,7 @@ void KVpnc::importProfileClicked ( TQString file )
if ( it->getName() == account->getName() )
{
//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::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).arg( account->getName() ), i18n( "Name exist, renamed" ) );
KMessageBox::error ( 0, i18n ( "Profile name exists!" ), i18n ( "Name Exists" ) );
nameOk = false;
TQString newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), TQString ( account->getName() + "_2" ), &ok );
@@ -20265,7 +20265,7 @@ void KVpnc::importOpenvpnProfileClicked ( TQString file )
if ( it->getName() == account->getName() )
{
//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::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).arg( account->getName() ), i18n( "Name exist, renamed" ) );
KMessageBox::error ( this, i18n ( "Profile name exists!" ), i18n ( "Name Exists" ) );
TQString newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), TQString ( account->getName() + "_2" ), &ok );
@@ -20813,7 +20813,7 @@ void KVpnc::doTailRacoonLog()
else
{
// status=connected;
- // setGuitqStatus(connected);
+ // setGuiStatus(connected);
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( GlobalConfig->pathToTail+" -f " + tmpPath + "racoon." + GlobalConfig->currentProfile->getName() + ".log" ), GlobalConfig->debug );
@@ -20870,7 +20870,7 @@ void KVpnc::removeSetkey()
if ( !RemoveSetkeyProcess->start ( env ) )
{
- // KMessageBox::error( this, i18n( "\"%1\" start failed!" ).tqarg( "setkey (remove)" ) );
+ // KMessageBox::error( this, i18n( "\"%1\" start failed!" ).arg( "setkey (remove)" ) );
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "setkey (remove)" ) , GlobalConfig->error );
}
else
@@ -20983,7 +20983,7 @@ 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 " ).tqarg("ipsec") + RemoteNet << " " + tmpInterface, GlobalConfig->debug );
+ // GlobalConfig->appendLogEntry ( i18n( "route (%1): route add -net " ).arg("ipsec") + RemoteNet << " " + tmpInterface, GlobalConfig->debug );
while ( RouteProcess->isRunning() )
{
usleep ( 500 );
@@ -21044,7 +21044,7 @@ void KVpnc::delRouteIpsec()
if ( !RouteProcess->start ( env ) )
{
- // KMessageBox::error( this, i18n( "\"%1\" start failed!" ).tqarg( "del route ("+IpsecType+")" ) );
+ // KMessageBox::error( this, i18n( "\"%1\" start failed!" ).arg( "del route ("+IpsecType+")" ) );
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "del route (" + IpsecType + ")" ) , GlobalConfig->error );
}
else
@@ -21077,7 +21077,7 @@ void KVpnc::removeIptablesFreeswan()
DisconnectProcess->addArgument ( tmpPath + "iptables." + GlobalConfig->currentProfile->getName() + ".remove_ipsec_freeswan.sh" );
if ( !DisconnectProcess->start ( env ) )
{
- // KMessageBox::error( this, i18n( "\"%1\" start failed!" ).tqarg( "iptables." + GlobalConfig->currentProfile->getName() + ".remove_ipsec_freeswan.sh" ) );
+ // KMessageBox::error( this, i18n( "\"%1\" start failed!" ).arg( "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
@@ -21201,9 +21201,9 @@ void KVpnc::vpncStarted()
// connect( VpncProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutputFrom_vpnc() ) );
//
// if ( !VpncProcess->start(env) ) {
- // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( "vpnc-connect" ) );
+ // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "vpnc-connect" ) );
// } else {
- // GlobalConfig->appendLogEntry ( i18n( "\"%1\" started." ).tqarg("vpnc-connect"),GlobalConfig->info );
+ // GlobalConfig->appendLogEntry ( i18n( "\"%1\" started." ).arg("vpnc-connect"),GlobalConfig->info );
//
// // connect( &timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotConnectTimedOut() ) );
// // timer.start( tryConnectTimeout * 1000, FALSE );
@@ -21337,7 +21337,7 @@ void KVpnc::racoonStarted()
//
// connect( &durationTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotDurationEvent() ) );
// durationTimer.start( 1000, FALSE );
- // setGuitqStatus( connected );
+ // setGuiStatus( connected );
//
// setFirewallAfterConnect();
// if ( GlobalConfig->currentProfile->getExecuteCmdAfterConnect() )
@@ -21401,7 +21401,7 @@ void KVpnc::ipsecStarted()
// }
IpsecStatusCheck=true;
- checkIpsecWhacktqStatus();
+ checkIpsecWhackStatus();
IpsecStatusCheck=false;
if ( GlobalConfig->KvpncDebugLevel > 0 )
@@ -21442,7 +21442,7 @@ void KVpnc::ipsecStarted()
}
}
-void KVpnc::checkIpsecWhacktqStatus()
+void KVpnc::checkIpsecWhackStatus()
{
putenv ( ( char* ) ( "LC_ALL=C" ) );
@@ -21487,8 +21487,8 @@ void KVpnc::checkIpsecWhacktqStatus()
}
if ( !IpsecWhackStatusTimer.isActive() )
{
- disconnect ( &IpsecWhackStatusTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( checkIpsecWhacktqStatus() ) );
- connect ( &IpsecWhackStatusTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( checkIpsecWhacktqStatus() ) );
+ disconnect ( &IpsecWhackStatusTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( checkIpsecWhackStatus() ) );
+ connect ( &IpsecWhackStatusTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( checkIpsecWhackStatus() ) );
IpsecWhackStatusTimer.start ( 5 * 1000, FALSE );
}
}
@@ -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)
- checkIpsecWhacktqStatus();
+ checkIpsecWhackStatus();
}
@@ -21709,7 +21709,7 @@ void KVpnc::ipsecPhase2Established()
disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuitqStatus ( connected );
+ setGuiStatus ( connected );
setFirewallAfterConnect();
@@ -21737,7 +21737,7 @@ void KVpnc::doAddRemoveVirtualIp(TQString vaction)
ActionPretty=i18n("Removing");
if ( GlobalConfig->KvpncDebugLevel > 4 )
- GlobalConfig->appendLogEntry ( i18n ( "%1 virtual IP (%2) and special route..." ).tqarg(ActionPretty).tqarg(GlobalConfig->currentProfile->getLeftSourceIp()), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( i18n ( "%1 virtual IP (%2) and special route..." ).arg(ActionPretty).arg(GlobalConfig->currentProfile->getLeftSourceIp()), GlobalConfig->debug );
// FIXME convert LeftSourceIp to Virtual IP
@@ -21807,7 +21807,7 @@ void KVpnc::doAddRemoveVirtualIp(TQString vaction)
}
else
{
- GlobalConfig->appendLogEntry ( i18n ( "%1 file could not be written." ).tqarg("VirtualIpScript"), GlobalConfig->error );
+ GlobalConfig->appendLogEntry ( i18n ( "%1 file could not be written." ).arg("VirtualIpScript"), GlobalConfig->error );
}
}
@@ -21983,7 +21983,7 @@ TQString KVpnc::getX509CertificateID ( TQString Cert, bool user )
}
else
{
- //KMessageBox::information( this, i18n( "\"%1\" started." ).tqarg("openssl") );
+ //KMessageBox::information( this, i18n( "\"%1\" started." ).arg("openssl") );
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( "openssl (getCertificate)" ), GlobalConfig->debug );
X509CertificateExtractRunning = true;
@@ -22512,7 +22512,7 @@ void KVpnc::doRoutePptp()
void KVpnc::slotConnecting()
{
- setGuitqStatus ( connecting );
+ setGuiStatus ( connecting );
}
void KVpnc::profileAddedOrDeleted()
@@ -22608,7 +22608,7 @@ void KVpnc::toggleDebugConsole()
GlobalConfig->showDebugConsole = true;
DebugconsoleAction ->setChecked ( true );
mw->DebugOutput->show();
- //resize( tqminimumSizeHint() );
+ //resize( minimumSizeHint() );
}
else
{
@@ -22616,7 +22616,7 @@ void KVpnc::toggleDebugConsole()
DebugconsoleAction ->setChecked ( false );
mw->DebugOutput->hide();
// setMinimumSize(0,0);
- // this->resize( tqminimumSizeHint() );
+ // this->resize( minimumSizeHint() );
}
}
@@ -22983,7 +22983,7 @@ void KVpnc::startConnectionStatusCheck()
disconnect ( ConnectionStatusCheckProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_connectionStatusCheck() ) );
delete ConnectionStatusCheckProcess;
ConnectionStatusCheckProcess=0L;
- //KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( "ping_check.sh" ) );
+ //KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "ping_check.sh" ) );
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "ping_check.sh" ) , GlobalConfig->error );
}
else
@@ -23291,7 +23291,7 @@ void KVpnc::backupIpsecSystemConfig()
else
{
GlobalConfig->appendLogEntry ( i18n ( "%1 could not opened. Stop." ).arg ( IpsecPrefix + "/ipsec.conf.before.kvpnc" ),GlobalConfig->error );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return;
}
@@ -23319,7 +23319,7 @@ void KVpnc::backupIpsecSystemConfig()
else
{
GlobalConfig->appendLogEntry ( i18n ( "%1 could not opened. Stop." ).arg ( IpsecPrefix + "/ipsec.secrets.before.kvpnc" ),GlobalConfig->error );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return;
}
stream.unsetDevice();
@@ -23390,7 +23390,7 @@ void KVpnc::showNewProfileWizardClicked()
if ( it->getName() == account->getName() )
{
//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::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).arg( account->getName() ), i18n( "Name exist, renamed" ) );
KMessageBox::error ( this, i18n ( "Profile name exists!" ), i18n ( "Name Exists" ) );
TQString newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), TQString ( account->getName() += "_2" ), &ok );
if ( ok == false )
@@ -23811,7 +23811,7 @@ void KVpnc::pptpProcessExited()
void KVpnc::vtun_exited()
{
-// GlobalConfig->appendLogEntry(i18n("%1 has been exited.").tqarg("vtund"),GlobalConfig->error);
+// GlobalConfig->appendLogEntry(i18n("%1 has been exited.").arg("vtund"),GlobalConfig->error);
// sleep(2);
// if (GlobalConfig->status == GlobalConfig->connecting || GlobalConfig->connected)
// disconnectClicked();
@@ -24415,7 +24415,7 @@ void KVpnc::start_l2tpd()
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( daemon ), GlobalConfig->error );
KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( daemon ) );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
}
else
{
@@ -24512,7 +24512,7 @@ void KVpnc::start_l2tpd()
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( daemon ), GlobalConfig->error );
KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( daemon ) );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
}
else
{
@@ -24599,7 +24599,7 @@ void KVpnc::checkL2tpPppUp()
disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuitqStatus ( connected );
+ setGuiStatus ( connected );
setFirewallAfterConnect();
@@ -24628,7 +24628,7 @@ void KVpnc::checkL2tpPppUp()
}
-bool KVpnc::checkCiscoVpnctqStatus()
+bool KVpnc::checkCiscoVpncStatus()
{
ciscoVpncRunning = false;
TestCiscoVpncProcess = new TQProcess ( this );
@@ -24847,7 +24847,7 @@ uint KVpnc::getConnectedTime()
return 0;
}
-TQString KVpnc::gettqStatus()
+TQString KVpnc::getStatus()
{
if ( GlobalConfig->status == GlobalConfig->connected )
return "connected";
diff --git a/src/kvpnc.h b/src/kvpnc.h
index e1827cc..5ec0d8a 100644
--- a/src/kvpnc.h
+++ b/src/kvpnc.h
@@ -32,7 +32,7 @@
#include <tqdatetime.h>
#include <tqptrlist.h>
#include <tqlabel.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqpixmap.h>
#include <tqpoint.h>
#include <tqsize.h>
@@ -111,7 +111,7 @@ protected:
* sets the gui status
* @param status The status that will be set
*/
- void setGuitqStatus( int status );
+ void setGuiStatus( int status );
/**
* terminates the connection
@@ -142,7 +142,7 @@ public:
private:
// FIXME also declared at kvpncconfig -> made it only in one place
- enum ConnectiontqStatus {disconnected=0, connecting=1, connected=2};
+ enum ConnectionStatus {disconnected=0, connecting=1, connected=2};
enum LogType {info=0, remote=1, error=2, success=3, debug=4};
KApplication *parent;
@@ -191,7 +191,7 @@ private:
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 setGuitqStatus(), holds previous state before disconnect (connected, connecting)
+ int prevConnectionState; //< needed for setGuiStatus(), holds previous state before disconnect (connected, connecting)
bool cancelClicked;
bool deviceaddrstr2addr;
@@ -468,7 +468,7 @@ private slots:
void vpncStarted();
void ipsecStarted();
void ipsecPhase2Established();
- void checkIpsecWhacktqStatus();
+ void checkIpsecWhackStatus();
void addIpsecConnection();
void racoonStarted();
void pppdStarted();
@@ -501,7 +501,7 @@ private slots:
void sendFeedbackMail();
void feedbackMailSent();
void start_l2tpd();
- bool checkCiscoVpnctqStatus();
+ bool checkCiscoVpncStatus();
void startCiscoVpnc();
void startStopIpsec(bool stop=false, bool silent=false);
void startStopOpenl2tp(bool stop=false, bool silent=false);
@@ -524,7 +524,7 @@ k_dcop:
void doConnect();
void doDisconnect();
uint getConnectedTime();
- TQString gettqStatus();
+ TQString getStatus();
TQString getCurrentProfile();
void setProfile(TQString profilename);
void createNewProfile();
diff --git a/src/kvpncconfig.cpp b/src/kvpncconfig.cpp
index 802a070..46c10ea 100644
--- a/src/kvpncconfig.cpp
+++ b/src/kvpncconfig.cpp
@@ -204,14 +204,14 @@ void KVpncConfig::appendLogEntry( TQString msg, LogType type )
{
// TQTextStream s( &logfile );
logFileStream << i18n( "Log session started at: " );
- logFileStream << TQDateTime::tqcurrentDateTime().toString( Qt::TextDate );
+ logFileStream << TQDateTime::currentDateTime().toString( Qt::TextDate );
logFileStream << "\n";
logfile.flush();
}
}
else
{
- TQString date = TQDate().tqcurrentDate().toString(Qt::ISODate)+ " ";
+ TQString date = TQDate().currentDate().toString(Qt::ISODate)+ " ";
TQString time = TQTime().currentTime().toString(Qt::ISODate)+ " ";
TQString prefix="";
switch ( type )
@@ -536,66 +536,66 @@ void KVpncConfig::saveOptions(bool saveOneProfile, TQString Profile)
{
if (UserPasswordOK)
if (KvpncDebugLevel > 2)
- appendLogEntry(i18n( "write of %1 was ok." ).tqarg(i18n("user password")), debug);
+ appendLogEntry(i18n( "write of %1 was ok." ).arg(i18n("user password")), debug);
else
{
// if ( KMessageBox::warningContinueCancel( 0,
// i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>"
- // "Do you want to save the password in the <b>unsafe</b> 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 )
+ // "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("user password")),
+ // i18n( "Unable to store secure %1" ).arg(i18n("user password")),
+ // KGuiItem( i18n( "Store &Unsafe" ), TQString::fromLatin1( "unlock" ),TQString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue )
// {
// config->writeEntry( "User password", it->getUserPassword() );
// }
- appendLogEntry(i18n( "write of %1 has failed." ).tqarg(i18n("user password")), error);
+ appendLogEntry(i18n( "write of %1 has failed." ).arg(i18n("user password")), error);
}
if (PskOK)
if (KvpncDebugLevel > 2)
- appendLogEntry(i18n( "write of %1 was successful." ).tqarg(i18n("preshared key")), debug);
+ appendLogEntry(i18n( "write of %1 was successful." ).arg(i18n("preshared key")), debug);
else
{
// if ( KMessageBox::warningContinueCancel( 0,
// i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>"
- // "Do you want to save the password in the <b>unsafe</b> 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 )
+ // "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("pre shared key")),
+ // i18n( "Unable to store secure %1" ).arg(i18n("pre shared key")),
+ // KGuiItem( i18n( "Store &Unsafe" ), TQString::fromLatin1( "unlock" ),TQString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue )
// {
// config->writeEntry( "Pre shared key", it->getPreSharedKey() );
// }
- appendLogEntry(i18n( "write of %1 has failed." ).tqarg(i18n("preshared key")),error);
+ appendLogEntry(i18n( "write of %1 has failed." ).arg(i18n("preshared key")),error);
}
if (PskOK)
if (KvpncDebugLevel > 2)
- appendLogEntry(i18n( "write of %1 was successful." ).tqarg(i18n("preshared key")), debug);
+ appendLogEntry(i18n( "write of %1 was successful." ).arg(i18n("preshared key")), debug);
else
{
// if ( KMessageBox::warningContinueCancel( 0,
// i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>"
- // "Do you want to save the password in the <b>unsafe</b> 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 )
+ // "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("preshared key password")),
+ // i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")),
+ // KGuiItem( i18n( "Store &Unsafe" ), TQString::fromLatin1( "unlock" ),TQString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue )
// {
// config->writeEntry( "Pre shared key", it->getPreSharedKey() );
// }
- appendLogEntry(i18n( "write of %1 has failed." ).tqarg(i18n("preshared key")),error);
+ appendLogEntry(i18n( "write of %1 has failed." ).arg(i18n("preshared key")),error);
}
if (PskKeyPassOK)
if (KvpncDebugLevel > 2)
- appendLogEntry(i18n( "write of %1 was successful." ).tqarg(i18n("preshared key password")), debug);
+ appendLogEntry(i18n( "write of %1 was successful." ).arg(i18n("preshared key password")), debug);
else
{
// if ( KMessageBox::warningContinueCancel( 0,
// i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>"
- // "Do you want to save the password in the <b>unsafe</b> 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 )
+ // "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("preshared key password")),
+ // i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")),
+ // KGuiItem( i18n( "Store &Unsafe" ), TQString::fromLatin1( "unlock" ),TQString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue )
// {
// config->writeEntry( "Pre shared key", it->getPreSharedKey() );
// }
- appendLogEntry(i18n( "write of %1 has failed." ).tqarg(i18n("preshared key password")),error);
+ appendLogEntry(i18n( "write of %1 has failed." ).arg(i18n("preshared key password")),error);
}
//std::cout << "success: " << pwdOK << std::endl;
}
@@ -881,9 +881,9 @@ void KVpncConfig::saveOptions(bool saveOneProfile, TQString Profile)
// wallet->sync();
/* give info */
-// slotStatusMsg ( i18n( "Profile \"%1\" saved." ).tqarg( ProfileName.remove("Profile_") ), ID_FLASH_MSG );
+// slotStatusMsg ( i18n( "Profile \"%1\" saved." ).arg( ProfileName.remove("Profile_") ), ID_FLASH_MSG );
- appendLogEntry ( i18n( "Profile \"%1\" saved." ).tqarg( ProfileName.remove("Profile_") ) , info);
+ appendLogEntry ( i18n( "Profile \"%1\" saved." ).arg( ProfileName.remove("Profile_") ) , info);
// appPointer->processEvents();
}
appPointer->processEvents();
@@ -1011,12 +1011,12 @@ void KVpncConfig::loadOptions()
TQDir AppFolder (TQString(dirs->saveLocation( "data" )+"/kvpnc"));
if (!AppFolder.exists())
{
- // KMessageBox::error( this, i18n( "creating dir: %1" ).tqarg(dirs->saveLocation( "data" )+"/kvpnc" ));
+ // KMessageBox::error( this, i18n( "creating dir: %1" ).arg(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\"." ).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);
+ 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);
}
}
@@ -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\"!" ).tqarg("pppd"),error);
+ appendLogEntry(i18n( "Unable to find \"%1\"!" ).arg("pppd"),error);
}
else
{
TQTextStream s( &logfile );
- s << i18n( "Log session started at: " ) << TQDateTime::tqcurrentDateTime().toString( Qt::TextDate ) << endl;
+ s << i18n( "Log session started at: " ) << TQDateTime::currentDateTime().toString( Qt::TextDate ) << endl;
}
}
@@ -1120,22 +1120,22 @@ void KVpncConfig::loadOptions()
TQString profilename = name.right( ( name.length() ) - 8 );
if (wallet->readPassword(TQString(profilename+"__user_pw"), UserPassword) != 0)
- appendLogEntry(i18n( "read of %1 has failed." ).tqarg(i18n("user password")),error);
+ appendLogEntry(i18n( "read of %1 has failed." ).arg(i18n("user password")),error);
else
if (KvpncDebugLevel > 2)
- appendLogEntry(i18n( "read of %1 was successful." ).tqarg(i18n("user password")),debug);
+ appendLogEntry(i18n( "read of %1 was successful." ).arg(i18n("user password")),debug);
if (wallet->readPassword(TQString(profilename+"__psk"), PreSharedKey) != 0)
- appendLogEntry(i18n( "read of %1 has failed." ).tqarg(i18n("preshared key")),error);
+ appendLogEntry(i18n( "read of %1 has failed." ).arg(i18n("preshared key")),error);
else
if (KvpncDebugLevel > 2)
- appendLogEntry(i18n( "read of %1 was successful." ).tqarg(i18n("preshared key")),debug);
+ appendLogEntry(i18n( "read of %1 was successful." ).arg(i18n("preshared key")),debug);
if (wallet->readPassword(TQString(profilename+"__priv_key_pwd"), PrivateKeyPass) != 0)
- appendLogEntry(i18n( "read of %1 has failed." ).tqarg(i18n("preshared key password")),error);
+ appendLogEntry(i18n( "read of %1 has failed." ).arg(i18n("preshared key password")),error);
else
if (KvpncDebugLevel > 2)
- appendLogEntry(i18n( "read of %1 was successful." ).tqarg(i18n("preshared key password")),debug);
+ appendLogEntry(i18n( "read of %1 was successful." ).arg(i18n("preshared key password")),debug);
}
else
{
@@ -1438,7 +1438,7 @@ void KVpncConfig::loadOptions()
appendLogEntry ( i18n( "Old configuration found, converted." ),info );
if ( KvpncDebugLevel > 2 )
- appendLogEntry( i18n( "Configuration for profile \"%1\" loaded." ).tqarg( Name ),info );
+ appendLogEntry( i18n( "Configuration for profile \"%1\" loaded." ).arg( Name ),info );
appPointer->processEvents();
}
@@ -1996,9 +1996,9 @@ bool KVpncConfig::exportKvpncConfig(TQString filename)
}
TQString msg="";
if (exportCount > 0 && exportGlobal==true)
- msg = i18n("Export was successful. %1 profiles and global settings are exported.").tqarg(TQString::number(exportCount));
+ msg = i18n("Export was successful. %1 profiles and global settings are exported.").arg(TQString::number(exportCount));
if (exportCount > 0 && exportGlobal==false)
- msg = i18n("Export was successful. %1 profiles are exported.").tqarg(TQString::number(exportCount));
+ msg = i18n("Export was successful. %1 profiles are exported.").arg(TQString::number(exportCount));
if (exportCount < 1 && exportGlobal==true)
msg = i18n("Export was successful. Global settings are exported.");
KMessageBox::information ( 0, msg,i18n("Export success") );
@@ -2140,7 +2140,7 @@ bool KVpncConfig::importKvpncConfig(TQString filename, TQString& RetName, bool&
}
importfile.close();
- // print out the element names of all elements that are direct tqchildren
+ // print out the element names of all elements that are direct children
// of the outermost element.
TQDomElement docElem = doc.documentElement();
@@ -2621,7 +2621,7 @@ bool KVpncConfig::importKvpncConfig(TQString filename, TQString& RetName, bool&
if ( it->getName() == data->getName() )
{
//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::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).arg( account->getName() ), i18n( "Name exist, renamed" ) );
KMessageBox::error ( 0, i18n ( "Profile name exists!" ), i18n ( "Name Exists" ) );
nameOk = false;
TQString newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), TQString ( data->getName() + "_2" ), &ok );
@@ -2763,9 +2763,9 @@ bool KVpncConfig::importKvpncConfig(TQString filename, TQString& RetName, bool&
TQString msg="";
if (importCount > 0 && importGlobal==true)
- msg = i18n("Import was successful. %1 profiles and global settings are imported.").tqarg(TQString::number(importCount));
+ msg = i18n("Import was successful. %1 profiles and global settings are imported.").arg(TQString::number(importCount));
if (importCount > 0 && importGlobal==false)
- msg = i18n("Import was successful. %1 profiles are imported.").tqarg(TQString::number(importCount));
+ msg = i18n("Import was successful. %1 profiles are imported.").arg(TQString::number(importCount));
if (importCount < 1 && importGlobal==false)
msg = i18n("Import was successful. Global settings are imported.");
KMessageBox::information ( 0, msg,i18n("Import success") );
@@ -2827,7 +2827,7 @@ bool KVpncConfig::importIpsecConfig(TQString filename, TQString& RetName, bool&
// 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.").tqarg(IpsecConfigSectionName), debug);
+ appendLogEntry(i18n("import ipsec config: end of section %1 found.").arg(IpsecConfigSectionName), debug);
sectionEndFound=true;
IpsecImportSection *section = new IpsecImportSection();
@@ -3032,7 +3032,7 @@ bool KVpncConfig::importIpsecConfig(TQString filename, TQString& RetName, bool&
{
// std::cout << "section " << OtherSection << " found, appending:" << std::endl;
if (KvpncDebugLevel > 2)
- appendLogEntry(i18n ("import ipsec config: section %1 found, appending:").tqarg(OtherSection),debug);
+ appendLogEntry(i18n ("import ipsec config: section %1 found, appending:").arg(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;
@@ -3073,7 +3073,7 @@ bool KVpncConfig::importIpsecConfig(TQString filename, TQString& RetName, bool&
{
// std::cout << "section " << OtherSection << " not found, skipping" << std::endl;
if (KvpncDebugLevel > 2)
- appendLogEntry(i18n ("import ipsec config: section %1 not found, skipping").tqarg(OtherSection) ,debug);
+ appendLogEntry(i18n ("import ipsec config: section %1 not found, skipping").arg(OtherSection) ,debug);
}
}
@@ -3757,9 +3757,9 @@ bool KVpncConfig::importIpsecConfig(TQString filename, TQString& RetName, bool&
TQString msg="";
if (importCount > 0 )
- msg = i18n("Import was successful. %1 profiles are imported.").tqarg(TQString::number(importCount));
+ msg = i18n("Import was successful. %1 profiles are imported.").arg(TQString::number(importCount));
else
- msg = i18n("Import was canceled because no profiles are selected.").tqarg(TQString::number(importCount));
+ msg = i18n("Import was canceled because no profiles are selected.").arg(TQString::number(importCount));
KMessageBox::information ( 0, msg,i18n("Import success") );
@@ -3916,43 +3916,43 @@ bool KVpncConfig::importFritzboxConfig(TQString filename, TQString& RetName, boo
{
line = removeWhiteSpaceAtBegin(stream.readLine()).simplifyWhiteSpace();
if (KvpncDebugLevel > 6)
- appendLogEntry(i18n ("import fritzbox config: line: %1").tqarg(line), debug);
+ appendLogEntry(i18n ("import fritzbox config: line: %1").arg(line), debug);
if (line.startsWith("datapipecfg"))
{
datapipecfgFound = true;
if (KvpncDebugLevel > 2)
- appendLogEntry(i18n ("import fritzbox config: %1 found").tqarg("datapipecfg"), debug);
+ appendLogEntry(i18n ("import fritzbox config: %1 found").arg("datapipecfg"), debug);
}
if (line.startsWith("policies"))
{
policiesFound = true;
if (KvpncDebugLevel > 2)
- appendLogEntry(i18n ("import fritzbox config: %1 found").tqarg("policies"), debug);
+ appendLogEntry(i18n ("import fritzbox config: %1 found").arg("policies"), debug);
}
if (line.startsWith("targets"))
{
targetsFound = true;
if (KvpncDebugLevel > 2)
- appendLogEntry(i18n ("import fritzbox config: %1 found").tqarg("targets"), debug);
+ appendLogEntry(i18n ("import fritzbox config: %1 found").arg("targets"), debug);
}
if (line.startsWith("localid"))
{
localidFound = true;
if (KvpncDebugLevel > 2)
- appendLogEntry(i18n ("import fritzbox config: %1 found").tqarg("localid"), debug);
+ appendLogEntry(i18n ("import fritzbox config: %1 found").arg("localid"), debug);
}
if (line.startsWith("phase2localid"))
{
phase2localidFound = true;
if (KvpncDebugLevel > 2)
- appendLogEntry(i18n ("import fritzbox config: %1 found").tqarg("phase2localid"), debug);
+ appendLogEntry(i18n ("import fritzbox config: %1 found").arg("phase2localid"), debug);
}
if (line.startsWith("phase2remoteid"))
{
phase2remoteidFound = true;
if (KvpncDebugLevel > 2)
- appendLogEntry(i18n ("import fritzbox config: %1 found").tqarg("phase2remoteid"), debug);
+ appendLogEntry(i18n ("import fritzbox config: %1 found").arg("phase2remoteid"), debug);
}
if (line.startsWith("ipnet"))
{
@@ -3970,7 +3970,7 @@ bool KVpncConfig::importFritzboxConfig(TQString filename, TQString& RetName, boo
{
TQString ProfileName=line.section("= ",1,1).replace("\"","").replace(";","").replace(" ","_");
if (KvpncDebugLevel > 2)
- appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("name").tqarg(ProfileName) ,debug);
+ appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("name").arg(ProfileName) ,debug);
profiledata->setName(ProfileName);
nameFound = true;
}
@@ -3981,9 +3981,9 @@ bool KVpncConfig::importFritzboxConfig(TQString filename, TQString& RetName, boo
reconnectAfterConnectionLost = true;
if (KvpncDebugLevel > 2)
if (reconnectAfterConnectionLost)
- appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("always_renew").tqarg(i18n("yes")) ,debug);
+ appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("always_renew").arg(i18n("yes")) ,debug);
else
- appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("always_renew").tqarg(i18n("no")) ,debug);
+ appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("always_renew").arg(i18n("no")) ,debug);
profiledata->setDoReconnectAfterConnectionLost(reconnectAfterConnectionLost);
}
if (line.startsWith("dont_filter_netbios = "))
@@ -3993,23 +3993,23 @@ bool KVpncConfig::importFritzboxConfig(TQString filename, TQString& RetName, boo
dont_filter_netbios = true;
if (KvpncDebugLevel > 2)
if (dont_filter_netbios)
- appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("dont_filter_netbios").tqarg(i18n("yes")) ,debug);
+ appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("dont_filter_netbios").arg(i18n("yes")) ,debug);
else
- appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("dont_filter_netbios").tqarg(i18n("no")) ,debug);
+ appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("dont_filter_netbios").arg(i18n("no")) ,debug);
// nothing to yet
}
if (line.startsWith("localip = "))
{
TQString LocalIp=line.section("= ",1,1).replace("\"","").replace(";","");
if (KvpncDebugLevel > 2)
- appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("localip").tqarg(LocalIp) ,debug);
+ appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("localip").arg(LocalIp) ,debug);
// nothing to do yet
}
if (line.startsWith("virtualip = "))
{
TQString LocalVirtualIp=line.section("= ",1,1).replace("\"","").replace(";","");
if (KvpncDebugLevel > 2)
- appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("virtualip").tqarg(LocalVirtualIp) ,debug);
+ appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("virtualip").arg(LocalVirtualIp) ,debug);
profiledata->setUseLeftSourceIp(true);
profiledata->setLeftSourceIp(LocalVirtualIp);
}
@@ -4017,14 +4017,14 @@ bool KVpncConfig::importFritzboxConfig(TQString filename, TQString& RetName, boo
{
TQString RemoteIp=line.section("= ",1,1).replace("\"","").replace(";","");
if (KvpncDebugLevel > 2)
- appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("remoteip").tqarg(RemoteIp) ,debug);
+ appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("remoteip").arg(RemoteIp) ,debug);
// nothing to do yet
}
if (line.startsWith("remotehostname = "))
{
TQString Gateway=line.section("= ",1,1).replace("\"","").replace(";","");
if (KvpncDebugLevel > 2)
- appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("remotehostname").tqarg(Gateway) ,debug);
+ appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("remotehostname").arg(Gateway) ,debug);
profiledata->setGateway(Gateway);
}
if (localidFound)
@@ -4033,7 +4033,7 @@ bool KVpncConfig::importFritzboxConfig(TQString filename, TQString& RetName, boo
{
TQString LocalId=line.section("= ",1,1).replace("\"","").replace(";","");
if (KvpncDebugLevel > 2)
- appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg(TQString("user_fqdn")+" ("+i18n("local id")+")").tqarg(LocalId) ,debug);
+ appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg(TQString("user_fqdn")+" ("+i18n("local id")+")").arg(LocalId) ,debug);
profiledata->setSpecialLocalID(LocalId);
profiledata->setUseSpecialLocalID(true);
profiledata->setLocalIDType("user_fqdn");
@@ -4045,7 +4045,7 @@ bool KVpncConfig::importFritzboxConfig(TQString filename, TQString& RetName, boo
TQString IpsecExchangeMode=line.section("= ",1,1).replace(";","");
if (KvpncDebugLevel > 2)
- appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg(i18n("exchange mode")).tqarg(IpsecExchangeMode) ,debug);
+ appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg(i18n("exchange mode")).arg(IpsecExchangeMode) ,debug);
if (IpsecExchangeMode == "mode_aggressive")
profiledata->setExchangeMode("aggressive");
@@ -4056,7 +4056,7 @@ bool KVpncConfig::importFritzboxConfig(TQString filename, TQString& RetName, boo
{
TQString AuthType=line.section("= ",1,1).replace(";","");
if (KvpncDebugLevel > 2)
- appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("keytype").tqarg(AuthType) ,debug);
+ appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("keytype").arg(AuthType) ,debug);
if (AuthType == "keytype_pre_shared")
profiledata->setAuthType(VpnAccountData::psk);
@@ -4067,9 +4067,9 @@ bool KVpncConfig::importFritzboxConfig(TQString filename, TQString& RetName, boo
{
TQString PreshardKey=line.section("= ",1,1).replace("\"","").replace(";","");
if (KvpncDebugLevel > 2 && KvpncDebugLevel < 5)
- appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("key").tqarg("******") ,debug);
+ appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("key").arg("******") ,debug);
if (KvpncDebugLevel > 5)
- appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("key").tqarg(PreshardKey) ,debug);
+ appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("key").arg(PreshardKey) ,debug);
profiledata->setPreSharedKey(PreshardKey);
profiledata->setPskIsInFile(false);
}
@@ -4080,9 +4080,9 @@ bool KVpncConfig::importFritzboxConfig(TQString filename, TQString& RetName, boo
cert_do_server_auth = true;
if (KvpncDebugLevel > 2)
if (cert_do_server_auth)
- appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("cert_do_server_auth").tqarg(i18n("yes")) ,debug);
+ appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("cert_do_server_auth").arg(i18n("yes")) ,debug);
else
- appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("cert_do_server_auth").tqarg(i18n("no")) ,debug);
+ appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("cert_do_server_auth").arg(i18n("no")) ,debug);
// nothing to to yet
}
if (line.startsWith("use_nat_t = "))
@@ -4092,9 +4092,9 @@ bool KVpncConfig::importFritzboxConfig(TQString filename, TQString& RetName, boo
UseNat = true;
if (KvpncDebugLevel > 2)
if (UseNat)
- appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("use_nat_t").tqarg(i18n("yes")) ,debug);
+ appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("use_nat_t").arg(i18n("yes")) ,debug);
else
- appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("use_nat_t").tqarg(i18n("no")) ,debug);
+ appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("use_nat_t").arg(i18n("no")) ,debug);
profiledata->setUseNat(UseNat);
profiledata->setUseUdp(true);
}
@@ -4105,9 +4105,9 @@ bool KVpncConfig::importFritzboxConfig(TQString filename, TQString& RetName, boo
UseXauth = true;
if (KvpncDebugLevel > 2)
if (UseXauth)
- appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("use_xauth").tqarg(i18n("yes")) ,debug);
+ appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("use_xauth").arg(i18n("yes")) ,debug);
else
- appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("use_xauth").tqarg(i18n("no")) ,debug);
+ appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("use_xauth").arg(i18n("no")) ,debug);
profiledata->setAuthWithUsernameAndPassword(UseXauth);
}
if (line.startsWith("use_cfgmode = "))
@@ -4117,9 +4117,9 @@ bool KVpncConfig::importFritzboxConfig(TQString filename, TQString& RetName, boo
ModeConfig = true;
if (KvpncDebugLevel > 2)
if (ModeConfig)
- appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("use_cfgmode").tqarg(i18n("yes")) ,debug);
+ appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("use_cfgmode").arg(i18n("yes")) ,debug);
else
- appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("use_cfgmode").tqarg(i18n("no")) ,debug);
+ appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("use_cfgmode").arg(i18n("no")) ,debug);
profiledata->setUseModeConfig(ModeConfig);
}
if (phase2localidFound)
@@ -4128,7 +4128,7 @@ bool KVpncConfig::importFritzboxConfig(TQString filename, TQString& RetName, boo
{
TQString Phase2LocalId=line.section("= ",1,1).replace("\"","").replace(";","");
if (KvpncDebugLevel > 2)
- appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg(i18n("ip addr for phase 2")).tqarg(Phase2LocalId) ,debug);
+ appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg(i18n("ip addr for phase 2")).arg(Phase2LocalId) ,debug);
// nothing to do yet
}
}
@@ -4139,7 +4139,7 @@ bool KVpncConfig::importFritzboxConfig(TQString filename, TQString& RetName, boo
{
TQString RemoteNetWorkAddr=line.section("= ",1,1).replace(";","");
if (KvpncDebugLevel > 2)
- appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg(i18n("remote network ip")).tqarg(RemoteNetWorkAddr) ,debug);
+ appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg(i18n("remote network ip")).arg(RemoteNetWorkAddr) ,debug);
profiledata->setRemoteNetAddr(RemoteNetWorkAddr);
}
if (line.startsWith("mask = "))
@@ -4148,9 +4148,9 @@ bool KVpncConfig::importFritzboxConfig(TQString filename, TQString& RetName, boo
TQString RemoteNetWorkMaskNumeric = TQString().setNum(Utils(this).dottedIpv4Netmask2NetmaskBytes(RemoteNetWorkMask));
if (KvpncDebugLevel > 2)
{
- appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg(i18n("remote network netmask")).tqarg(RemoteNetWorkMask) ,debug);
+ appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg(i18n("remote network netmask")).arg(RemoteNetWorkMask) ,debug);
- appendLogEntry(i18n("Netmask (dotted): %1, numeric value: %2").tqarg(RemoteNetWorkMask).tqarg(RemoteNetWorkMaskNumeric), debug);
+ appendLogEntry(i18n("Netmask (dotted): %1, numeric value: %2").arg(RemoteNetWorkMask).arg(RemoteNetWorkMaskNumeric), debug);
}
profiledata->setRemoteNetMask(RemoteNetWorkMaskNumeric);
}
@@ -4170,7 +4170,7 @@ bool KVpncConfig::importFritzboxConfig(TQString filename, TQString& RetName, boo
if ( it->getName() == profiledata->getName() )
{
//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::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).arg( account->getName() ), i18n( "Name exist, renamed" ) );
KMessageBox::error ( 0, i18n ( "Profile name exists!" ), i18n ( "Name Exists" ) );
nameOk = false;
TQString newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), TQString ( profiledata->getName() + "_2" ), &ok );
@@ -4391,19 +4391,19 @@ void KVpncConfig::removeEntry(TQString Name)
if (KvpncDebugLevel > 2)
{
if (UserPasswordOK)
- appendLogEntry(i18n( "delete of %1 was ok." ).tqarg(i18n("user password")), debug);
+ appendLogEntry(i18n( "delete of %1 was ok." ).arg(i18n("user password")), debug);
else
- appendLogEntry(i18n( "delete of %1 has failed." ).tqarg(i18n("user password")), debug);
+ appendLogEntry(i18n( "delete of %1 has failed." ).arg(i18n("user password")), debug);
//
if (PskOK)
- appendLogEntry(i18n( "delete of %1 was successful." ).tqarg(i18n("preshared key")), debug);
+ appendLogEntry(i18n( "delete of %1 was successful." ).arg(i18n("preshared key")), debug);
else
- appendLogEntry(i18n( "delete of %1 has failed." ).tqarg(i18n("preshared key")),debug);
+ appendLogEntry(i18n( "delete of %1 has failed." ).arg(i18n("preshared key")),debug);
if (PskKeyPassOK)
- appendLogEntry(i18n( "delete of %1 was successful." ).tqarg(i18n("private key password")), debug);
+ appendLogEntry(i18n( "delete of %1 was successful." ).arg(i18n("private key password")), debug);
else
- appendLogEntry(i18n( "delete of %1 has failed." ).tqarg(i18n("private key password")),debug);
+ appendLogEntry(i18n( "delete of %1 has failed." ).arg(i18n("private key password")),debug);
// //std::cout << "success: " << pwdOK << std::endl;
@@ -4509,8 +4509,8 @@ void KVpncConfig::removeEntry(TQString Name)
config->deleteGroup( ProfileName );
/* give info */
- //slotStatusMsg ( i18n( "Profile \"%1\" removed." ).tqarg( Name ), ID_FLASH_MSG );
- appendLogEntry ( i18n( "Profile \"%1\" removed." ).tqarg( Name ) , info);
+ //slotStatusMsg ( i18n( "Profile \"%1\" removed." ).arg( Name ), ID_FLASH_MSG );
+ appendLogEntry ( i18n( "Profile \"%1\" removed." ).arg( Name ) , info);
AccountList->remove(it);
break;
}
diff --git a/src/kvpncconfig.h b/src/kvpncconfig.h
index 18821f1..5b6c814 100644
--- a/src/kvpncconfig.h
+++ b/src/kvpncconfig.h
@@ -29,8 +29,8 @@
#include <tqpoint.h>
#include <tqsize.h>
#include <tqfile.h>
-#include <tqtextstream.h>
-#include <tqtextedit.h>
+#include <textstream.h>
+#include <textedit.h>
#include <tqcolor.h>
#include <tqstringlist.h>
#include <kconfig.h>
@@ -57,7 +57,7 @@ public:
~KVpncConfig();
public:
- enum ConnectiontqStatus {disconnected=0, connecting=1, connected=2};
+ enum ConnectionStatus {disconnected=0, connecting=1, connected=2};
enum LogType {info=0, remote=1, error=2, success=3, debug=4};
TQString pathToVpnc;
@@ -193,7 +193,7 @@ public:
TQApplication *appPointer;
TQPoint pos;
- ConnectiontqStatus status;
+ ConnectionStatus status;
TQFile logfile;
TQTextStream logFileStream;
TQTextEdit *LogOutput;
diff --git a/src/kvpncimportprofileselectiondialogbase.ui b/src/kvpncimportprofileselectiondialogbase.ui
index 8db6a06..2480904 100644
--- a/src/kvpncimportprofileselectiondialogbase.ui
+++ b/src/kvpncimportprofileselectiondialogbase.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout10</cstring>
+ <cstring>layout10</cstring>
</property>
<vbox>
<property name="name">
@@ -42,7 +42,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<hbox>
<property name="name">
@@ -80,7 +80,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>271</width>
<height>21</height>
@@ -91,7 +91,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<hbox>
<property name="name">
@@ -107,7 +107,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>271</width>
<height>21</height>
@@ -126,7 +126,7 @@
<property name="name">
<cstring>ImportNamePrefixLineEdit</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -137,7 +137,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@@ -161,7 +161,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>260</width>
<height>31</height>
diff --git a/src/kvpnckicker.cpp b/src/kvpnckicker.cpp
index bf452ee..c957ddf 100644
--- a/src/kvpnckicker.cpp
+++ b/src/kvpnckicker.cpp
@@ -45,7 +45,7 @@ KVpncKicker::~KVpncKicker() {}
void KVpncKicker::closeEvent( TQCloseEvent *e )
{
if ( GlobalConfig->KvpncDebugLevel > 1 )
- GlobalConfig->appendLogEntry ( i18n ( "CloseEvent recieved (reciever: %1)." ).tqarg("kvpnckicker"), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( i18n ( "CloseEvent recieved (reciever: %1)." ).arg("kvpnckicker"), GlobalConfig->debug );
emit closeEventKicker(e);
}
@@ -59,7 +59,7 @@ void KVpncKicker::enterEvent( TQEvent* e )
}
-void KVpncKicker::settqStatus( int status ) {
+void KVpncKicker::setStatus( int status ) {
if ( status == connecting ) {
setPixmap( connectingIcon );
}
diff --git a/src/kvpnckicker.h b/src/kvpnckicker.h
index 6117d27..5d6ae72 100644
--- a/src/kvpnckicker.h
+++ b/src/kvpnckicker.h
@@ -36,7 +36,7 @@ public:
~KVpncKicker();
KPopupMenu* menu();
enum status {disconnected=0, connecting=1, connected=2};
- void settqStatus( int status );
+ void setStatus( int status );
public slots:
void closeEvent( TQCloseEvent* e );
void enterEvent( TQEvent* e );
@@ -47,7 +47,7 @@ protected:
private:
// color
- TQColor currenttqStatus;
+ TQColor currentStatus;
// icons
TQPixmap connectedIcon;
TQPixmap disconnectedIcon;
diff --git a/src/listviewtooltip.h b/src/listviewtooltip.h
index 1fbd9e2..62ecb36 100644
--- a/src/listviewtooltip.h
+++ b/src/listviewtooltip.h
@@ -45,8 +45,8 @@ inline void ListViewToolTip::maybeTip ( const TQPoint& p )
const TQListViewItem* item = listView->itemAt ( p );
if ( !item )
return;
- const TQRect tqitemRect = listView->tqitemRect ( item );
- if ( !tqitemRect.isValid() )
+ const TQRect itemRect = listView->itemRect ( item );
+ if ( !itemRect.isValid() )
return;
const int col = listView->header()->sectionAt ( p.x() );
const int row = listView->header()->sectionAt ( p.y() );
@@ -56,9 +56,9 @@ inline void ListViewToolTip::maybeTip ( const TQPoint& p )
const TQRect headerRect = listView->header()->sectionRect ( col );
if ( !headerRect.isValid() )
return;
-// const TQRect cellRect ( headerRect.left(), tqitemRect.top(),
-// headerRect.width(), tqitemRect.height() );
- const TQRect cellRect ( headerRect.left(), tqitemRect.top(), 400, 200 );
+// const TQRect cellRect ( headerRect.left(), itemRect.top(),
+// headerRect.width(), itemRect.height() );
+ const TQRect cellRect ( headerRect.left(), itemRect.top(), 400, 200 );
TQString tipStr;
tipStr = TQString ( "<h2>"+item->text ( 0 )+"</h2><ul><li>"+i18n("Path:")+" "+item->text(5)+"</li><li>"+i18n("Usability:")+" "+item->text(3)+"</li><li>"+i18n("Comment:")+ " "+item->text(6)+"</li></ul>");
diff --git a/src/logviewerdialog.cpp b/src/logviewerdialog.cpp
index 8167ba6..fbbc064 100644
--- a/src/logviewerdialog.cpp
+++ b/src/logviewerdialog.cpp
@@ -34,7 +34,7 @@
#include <iostream>
#include <kvpnc.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <kmessagebox.h>
LogViewerDialog::LogViewerDialog(TQWidget *parent, TQApplication *app, KVpncConfig *GlobalConfig,const TQString& caption, int count) : KDialogBase( parent, "Show_log", false, caption,
@@ -42,7 +42,7 @@ KDialogBase::Ok|KDialogBase::Cancel,KDialogBase::Ok, true )
{
main = new LogViewerDialogBase (this);
setMainWidget(main);
- // main->setMinimumSize(main->tqsizeHint());
+ // main->setMinimumSize(main->sizeHint());
main->setMinimumSize(750,500);
main->LineCountIntSpinBox->setValue(count);
diff --git a/src/logviewerdialogbase.ui b/src/logviewerdialogbase.ui
index 14478ec..db90e80 100644
--- a/src/logviewerdialogbase.ui
+++ b/src/logviewerdialogbase.ui
@@ -12,7 +12,7 @@
<height>586</height>
</rect>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>700</width>
<height>500</height>
@@ -27,7 +27,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout48</cstring>
+ <cstring>layout48</cstring>
</property>
<vbox>
<property name="name">
@@ -37,7 +37,7 @@
<property name="name">
<cstring>LogTextBrowser</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>120</height>
@@ -49,7 +49,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout47</cstring>
+ <cstring>layout47</cstring>
</property>
<hbox>
<property name="name">
diff --git a/src/mainview.cpp b/src/mainview.cpp
index f25d038..2c565f8 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -26,12 +26,12 @@
#include <kpassdlg.h>
#include <kmessagebox.h>
#include <tqprocess.h>
-#include <tqtextedit.h>
+#include <textedit.h>
#include <tqwidget.h>
#include <tqframe.h>
#include <tqwhatsthis.h>
#include <tqtooltip.h>
-#include <tqlayout.h>
+#include <layout.h>
#include "mainview.h"
diff --git a/src/mainviewbase.ui b/src/mainviewbase.ui
index dc2a5ab..7c80088 100644
--- a/src/mainviewbase.ui
+++ b/src/mainviewbase.ui
@@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@@ -117,7 +117,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>31</height>
diff --git a/src/manageciscocert.cpp b/src/manageciscocert.cpp
index c05ce1a..e6601f3 100644
--- a/src/manageciscocert.cpp
+++ b/src/manageciscocert.cpp
@@ -42,10 +42,10 @@ ManageCiscoCert::ManageCiscoCert(TQWidget *parent, const char* caption, KVpncCon
{
main = new ManageCiscoCertBase ( this );
setMainWidget ( main );
- main->tqsizeHint();
+ main->sizeHint();
// main->show();
-// main->setMinimumSize ( main->tqsizeHint() );
- tqsizeHint();
+// main->setMinimumSize ( main->sizeHint() );
+ sizeHint();
this->GlobalConfig = GlobalConfig;
connect (main->ImportCertFilePushButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(importCertClicked()));
@@ -65,7 +65,7 @@ void ManageCiscoCert::deleteCertClicked()
{
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?" ).tqarg(item->text(1).tqarg(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?" ).arg(item->text(1).arg(item->text(2))), i18n( "Delete certificate?" ) );
// if ( GlobalConfig->KvpncDebugLevel > 2 )
// GlobalConfig->appendLogEntry( "Result: "+ TQString().setNum(result), GlobalConfig->debug ) ;
diff --git a/src/manageciscocertbase.ui b/src/manageciscocertbase.ui
index 9bc4b23..ea6c029 100644
--- a/src/manageciscocertbase.ui
+++ b/src/manageciscocertbase.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout69</cstring>
+ <cstring>layout69</cstring>
</property>
<vbox>
<property name="name">
@@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout68</cstring>
+ <cstring>layout68</cstring>
</property>
<hbox>
<property name="name">
@@ -37,7 +37,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout67</cstring>
+ <cstring>layout67</cstring>
</property>
<vbox>
<property name="name">
@@ -94,7 +94,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout66</cstring>
+ <cstring>layout66</cstring>
</property>
<hbox>
<property name="name">
@@ -124,7 +124,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>230</width>
<height>21</height>
@@ -135,7 +135,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout65</cstring>
+ <cstring>layout65</cstring>
</property>
<hbox>
<property name="name">
@@ -162,7 +162,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>221</width>
<height>20</height>
@@ -185,7 +185,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>41</height>
diff --git a/src/networkinterface.cpp b/src/networkinterface.cpp
index cddd016..dc5d057 100644
--- a/src/networkinterface.cpp
+++ b/src/networkinterface.cpp
@@ -21,7 +21,7 @@
#include "networkinterface.h"
#include <iostream>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <kmessagebox.h>
#include <klocale.h>
#include <kglobal.h>
@@ -159,7 +159,7 @@ TQString NetworkInterface::getInterfaceIP2( TQString Interface )
if ( !InterfaceIpProc->start(env) )
{
- GlobalConfig->appendLogEntry(i18n("unable to start proc (%1)!").tqarg(i18n("getting IP address from interface")), KVpncConfig::error);
+ GlobalConfig->appendLogEntry(i18n("unable to start proc (%1)!").arg(i18n("getting IP address from interface")), KVpncConfig::error);
}
else
{
@@ -219,7 +219,7 @@ TQString NetworkInterface::getInterfaceAddress( TQString IPforInterface )
if ( !InterfaceAddressProc->start(env) )
{
- GlobalConfig->appendLogEntry(i18n("unable to start proc (%1)!").tqarg(i18n("script for get interface from IP address")), KVpncConfig::error);
+ GlobalConfig->appendLogEntry(i18n("unable to start proc (%1)!").arg(i18n("script for get interface from IP address")), KVpncConfig::error);
}
else
diff --git a/src/newprofiledialog.cpp b/src/newprofiledialog.cpp
index 8fc7d21..479b75b 100644
--- a/src/newprofiledialog.cpp
+++ b/src/newprofiledialog.cpp
@@ -51,7 +51,7 @@ NewProfileDialog::NewProfileDialog( TQApplication *app,TQWidget *parent, const T
main = new NewProfileDialogbase(this);
setMainWidget(main);
- main->setMinimumSize(main->tqsizeHint());
+ main->setMinimumSize(main->sizeHint());
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& ) ) );
@@ -326,7 +326,7 @@ void NewProfileDialog::connectiontypeChanged( const TQString& )
{
- GlobalConfig->appendLogEntry( i18n("New type: %1").tqarg("cisco"),GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( i18n("New type: %1").arg("cisco"),GlobalConfig->debug );
profileData->setConnectionType( VpnAccountData::cisco );
@@ -372,7 +372,7 @@ void NewProfileDialog::connectiontypeChanged( const TQString& )
{
- GlobalConfig->appendLogEntry( i18n("New type: %1").tqarg("racoon"),GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( i18n("New type: %1").arg("racoon"),GlobalConfig->debug );
// KURLRequester* main->x509certURLRequester;
// KComboBox* main->AuthTypeComboBox;
// KPushButton* ImportCertificatePushButton;
@@ -424,7 +424,7 @@ void NewProfileDialog::connectiontypeChanged( const TQString& )
{
- GlobalConfig->appendLogEntry( i18n("New type: %1").tqarg("freeswan"), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( i18n("New type: %1").arg("freeswan"), GlobalConfig->debug );
// KURLRequester* main->x509certURLRequester;
// KComboBox* main->AuthTypeComboBox;
// KPushButton* ImportCertificatePushButton;
@@ -476,7 +476,7 @@ void NewProfileDialog::connectiontypeChanged( const TQString& )
{
- GlobalConfig->appendLogEntry( i18n("New type: %1").tqarg("pptp"),GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( i18n("New type: %1").arg("pptp"),GlobalConfig->debug );
// KURLRequester* main->x509certURLRequester;
// KComboBox* main->AuthTypeComboBox;
// KPushButton* ImportCertificatePushButton;
@@ -526,7 +526,7 @@ void NewProfileDialog::connectiontypeChanged( const TQString& )
else if ( item == VpnAccountData::ConnectionType(VpnAccountData::openvpn) )
{
if (GlobalConfig->KvpncDebugLevel > 0)
- GlobalConfig->appendLogEntry( i18n("New type: %1").tqarg("openvpn"),GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( i18n("New type: %1").arg("openvpn"),GlobalConfig->debug );
// KURLRequester* main->x509certURLRequester;
// KComboBox* main->AuthTypeComboBox;
// KPushButton* ImportCertificatePushButton;
diff --git a/src/newprofiledialog.h b/src/newprofiledialog.h
index 03cd0bf..5a83ef6 100644
--- a/src/newprofiledialog.h
+++ b/src/newprofiledialog.h
@@ -22,7 +22,7 @@
#include "newprofiledialogbase.h"
#include "vpnaccountdata.h"
-#include <tqtextedit.h>
+#include <textedit.h>
#include <kdialogbase.h>
#include <tqobject.h>
#include <tqptrlist.h>
diff --git a/src/newprofiledialogbase.ui b/src/newprofiledialogbase.ui
index 8cce8f6..10185a0 100644
--- a/src/newprofiledialogbase.ui
+++ b/src/newprofiledialogbase.ui
@@ -27,7 +27,7 @@
</property>
<widget class="TQLayoutWidget" row="16" column="0" rowspan="1" colspan="4">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<hbox>
<property name="name">
@@ -57,7 +57,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>321</width>
<height>20</height>
@@ -68,7 +68,7 @@
</widget>
<widget class="TQLayoutWidget" row="17" column="0" rowspan="1" colspan="4">
<property name="name">
- <cstring>tqlayout11</cstring>
+ <cstring>layout11</cstring>
</property>
<hbox>
<property name="name">
@@ -112,7 +112,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>110</width>
<height>20</height>
@@ -131,7 +131,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -336,7 +336,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>159</width>
<height>20</height>
@@ -391,7 +391,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>159</width>
<height>20</height>
@@ -443,7 +443,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>114</width>
<height>20</height>
@@ -474,7 +474,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>75</width>
<height>20</height>
@@ -501,7 +501,7 @@
</widget>
<widget class="TQLayoutWidget" row="5" column="1" rowspan="1" colspan="3">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<hbox>
<property name="name">
diff --git a/src/newprofilewizard.cpp b/src/newprofilewizard.cpp
index e627bb9..69fec28 100644
--- a/src/newprofilewizard.cpp
+++ b/src/newprofilewizard.cpp
@@ -174,10 +174,10 @@ void NewProfileWizard::setupPages()
// page1->setSpacing(8);
TQLabel *setupPixmapContent1 = new TQLabel ( page1 );
setupPixmapContent1->setPixmap ( *SetupPixmap );
- setupPixmapContent1->resize ( setupPixmapContent1->tqsizeHint() );
+ setupPixmapContent1->resize ( setupPixmapContent1->sizeHint() );
newprofilewizardstartcontent = new NewProfileWizardStart ( page1 );
- newprofilewizardstartcontent->resize ( newprofilewizardstartcontent->tqsizeHint() );
- page1->tqsizeHint();
+ newprofilewizardstartcontent->resize ( newprofilewizardstartcontent->sizeHint() );
+ page1->sizeHint();
addPage ( page1, "<b>" + i18n ( "Welcome" ) + "</b>" );
// type selection
@@ -185,11 +185,11 @@ void NewProfileWizard::setupPages()
// newprofilewizardtypeselectionpage->setSpacing(8);
TQLabel *setupPixmapContent2 = new TQLabel ( newprofilewizardtypeselectionpage );
setupPixmapContent2->setPixmap ( *SetupPixmap );
- setupPixmapContent2->resize ( setupPixmapContent2->tqsizeHint() );
+ setupPixmapContent2->resize ( setupPixmapContent2->sizeHint() );
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->tqsizeHint();
+ newprofilewizardtypeselectionpage->sizeHint();
addPage ( newprofilewizardtypeselectionpage, "<b>" + i18n ( "Type selection" ) + "</b>" );
// cisco
@@ -197,17 +197,17 @@ void NewProfileWizard::setupPages()
// newprofilewizardciscoselectionpage->setSpacing(8);
TQLabel *setupPixmapContent3 = new TQLabel ( newprofilewizardciscoselectionpage );
setupPixmapContent3->setPixmap ( *SetupPixmap );
- setupPixmapContent3->resize ( setupPixmapContent3->tqsizeHint() );
+ setupPixmapContent3->resize ( setupPixmapContent3->sizeHint() );
newprofilewizardciscoselectionpagecontent = new NewProfileWizardCiscoSelection ( newprofilewizardciscoselectionpage );
- newprofilewizardciscoselectionpage->tqsizeHint();
+ newprofilewizardciscoselectionpage->sizeHint();
newprofilewizardciscomanuallypage = new TQHBox ( 0 );
// newprofilewizardciscomanuallypage->setSpacing(8);
TQLabel *setupPixmapContent4 = new TQLabel ( newprofilewizardciscomanuallypage );
setupPixmapContent4->setPixmap ( *SetupPixmap );
- setupPixmapContent4->resize ( setupPixmapContent4->tqsizeHint() );
+ setupPixmapContent4->resize ( setupPixmapContent4->sizeHint() );
newprofilewizardciscomanuallypagecontent = new NewProfileWizardCiscoManually ( newprofilewizardciscomanuallypage );
- newprofilewizardciscomanuallypage->tqsizeHint();
+ newprofilewizardciscomanuallypage->sizeHint();
connect ( newprofilewizardciscomanuallypagecontent->GroupPasswordLineEdit , TQT_SIGNAL ( textChanged ( const TQString& ) ), this, TQT_SLOT ( pskToggled ( const TQString& ) ) );
@@ -216,7 +216,7 @@ void NewProfileWizard::setupPages()
// newprofilewizardracoonpage->setSpacing(8);
TQLabel *setupPixmapContent5 = new TQLabel ( newprofilewizardracoonpage );
setupPixmapContent5->setPixmap ( *SetupPixmap );
- setupPixmapContent5->resize ( setupPixmapContent5->tqsizeHint() );
+ setupPixmapContent5->resize ( setupPixmapContent5->sizeHint() );
newprofilewizardracoonpagecontent = new NewProfileWizardRacoon ( newprofilewizardracoonpage );
newprofilewizardracoonpagecontent->ExchangeModeComboBox->insertItem ( "main", 0 );
newprofilewizardracoonpagecontent->ExchangeModeComboBox->insertItem ( "aggressive", 1 );
@@ -347,32 +347,32 @@ void NewProfileWizard::setupPages()
newprofilewizardracoonpagecontent->PerfectForwardSecurityCheckbox->hide();
newprofilewizardracoonpagecontent->PerfectForwardSecrecyCombobox->hide();
- newprofilewizardracoonpage->tqsizeHint();
+ newprofilewizardracoonpage->sizeHint();
//freeswan
newprofilewizardfreeswanselectionpage = new TQHBox ( 0 );
// newprofilewizardfreeswanselectionpage->setSpacing(8);
TQLabel *setupPixmapContent711 = new TQLabel ( newprofilewizardfreeswanselectionpage );
setupPixmapContent711->setPixmap ( *SetupPixmap );
- setupPixmapContent711->resize ( setupPixmapContent711->tqsizeHint() );
+ setupPixmapContent711->resize ( setupPixmapContent711->sizeHint() );
newprofilewizardfreeswanselectionpagecontent = new NewProfileWizardOpenvpnSelection ( newprofilewizardfreeswanselectionpage );
newprofilewizardfreeswanselectionpagecontent->OpenvpnImportRadioButton->setText(i18n("Import &Ipsec config file"));
- newprofilewizardfreeswanselectionpage->tqsizeHint();
+ newprofilewizardfreeswanselectionpage->sizeHint();
newprofilewizardfreeswanpage = new TQHBox ( 0 );
// newprofilewizardfreeswanpage->setSpacing(8);
TQLabel *setupPixmapContent6 = new TQLabel ( newprofilewizardfreeswanpage );
setupPixmapContent6->setPixmap ( *SetupPixmap );
- setupPixmapContent6->resize ( setupPixmapContent6->tqsizeHint() );
+ setupPixmapContent6->resize ( setupPixmapContent6->sizeHint() );
newprofilewizardfreeswanpagecontent = new NewProfileWizardFreeswan ( newprofilewizardfreeswanpage );
- newprofilewizardfreeswanpage->tqsizeHint();
+ newprofilewizardfreeswanpage->sizeHint();
//freeswan
newprofilewizardfreeswanpage = new TQHBox ( 0 );
// newprofilewizardfreeswanpage->setSpacing(8);
TQLabel *setupPixmapContent66 = new TQLabel ( newprofilewizardfreeswanpage );
setupPixmapContent66->setPixmap ( *SetupPixmap );
- setupPixmapContent66->resize ( setupPixmapContent66->tqsizeHint() );
+ setupPixmapContent66->resize ( setupPixmapContent66->sizeHint() );
newprofilewizardfreeswanpagecontent = new NewProfileWizardFreeswan ( newprofilewizardfreeswanpage );
newprofilewizardfreeswanpagecontent->LocalIdTypeCombobox->insertItem(i18n("Certificate ID"));
@@ -408,24 +408,24 @@ void NewProfileWizard::setupPages()
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->tqsizeHint();
+ newprofilewizardfreeswanpage->sizeHint();
// openvpn
newprofilewizardopenvpnselectionpage = new TQHBox ( 0 );
// newprofilewizardopenvpnselectionpage->setSpacing(8);
TQLabel *setupPixmapContent7 = new TQLabel ( newprofilewizardopenvpnselectionpage );
setupPixmapContent7->setPixmap ( *SetupPixmap );
- setupPixmapContent7->resize ( setupPixmapContent7->tqsizeHint() );
+ setupPixmapContent7->resize ( setupPixmapContent7->sizeHint() );
newprofilewizardopenvpnselectionpagecontent = new NewProfileWizardOpenvpnSelection ( newprofilewizardopenvpnselectionpage );
- newprofilewizardopenvpnselectionpage->tqsizeHint();
+ newprofilewizardopenvpnselectionpage->sizeHint();
newprofilewizardopenvpnauthpage = new TQHBox ( 0 );
// newprofilewizardopenvpnauthpage->setSpacing(8);
TQLabel *setupPixmapContent71 = new TQLabel ( newprofilewizardopenvpnauthpage );
setupPixmapContent71->setPixmap ( *SetupPixmap );
- setupPixmapContent71->resize ( setupPixmapContent71->tqsizeHint() );
+ setupPixmapContent71->resize ( setupPixmapContent71->sizeHint() );
newprofilewizardopenvpnauthpagecontent = new NewProfileWizardOpenvpnAuth ( newprofilewizardopenvpnauthpage );
- newprofilewizardopenvpnauthpage->tqsizeHint();
+ newprofilewizardopenvpnauthpage->sizeHint();
connect ( newprofilewizardopenvpnauthpagecontent->AuthWithUsernameAndPasswordCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( authenticateWithUsernameAndPasswordToggled ( bool ) ) );
connect ( newprofilewizardopenvpnauthpagecontent->UseAuthenticationAlgorithmCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( useAuthenticationAlgorithmToggled ( bool ) ) );
@@ -433,9 +433,9 @@ void NewProfileWizard::setupPages()
// newprofilewizardopenvpnpage->setSpacing(8);
TQLabel *setupPixmapContent8 = new TQLabel ( newprofilewizardopenvpnpage );
setupPixmapContent8->setPixmap ( *SetupPixmap );
- setupPixmapContent8->resize ( setupPixmapContent8->tqsizeHint() );
+ setupPixmapContent8->resize ( setupPixmapContent8->sizeHint() );
newprofilewizardopenvpnpagecontent = new NewProfileWizardOpenvpn ( newprofilewizardopenvpnpage );
- newprofilewizardopenvpnpage->tqsizeHint();
+ newprofilewizardopenvpnpage->sizeHint();
newprofilewizardopenvpnpagecontent->TunnelDeviceTypeComboBox->insertItem ( "tun" );
newprofilewizardopenvpnpagecontent->TunnelDeviceTypeComboBox->insertItem ( "tap" );
newprofilewizardopenvpnpagecontent->NsCertTypeComboBox->insertItem ( "client" );
@@ -476,9 +476,9 @@ void NewProfileWizard::setupPages()
// newprofilewizardpptppage->setSpacing(8);
TQLabel *setupPixmapContent9 = new TQLabel ( newprofilewizardpptppage );
setupPixmapContent9->setPixmap ( *SetupPixmap );
- setupPixmapContent9->resize ( setupPixmapContent9->tqsizeHint() );
+ setupPixmapContent9->resize ( setupPixmapContent9->sizeHint() );
newprofilewizardpptppagecontent = new NewProfileWizardPptp ( newprofilewizardpptppage );
- newprofilewizardpptppage->tqsizeHint();
+ newprofilewizardpptppage->sizeHint();
newprofilewizardpptppagecontent->DnsServerLineedit->setEnabled ( false );
newprofilewizardpptppagecontent->RequireMppeCheckbox->setChecked( profileData->getRequireMppe() );
newprofilewizardpptppagecontent->Refuse128BitEncryptionCheckbox->setChecked( profileData->getRefuse128BitEncryption() );
@@ -513,9 +513,9 @@ void NewProfileWizard::setupPages()
// newprofilewizardvtunpage->setSpacing(8);
TQLabel *setupPixmapContent19 = new TQLabel ( newprofilewizardvtunpage );
setupPixmapContent19->setPixmap ( *SetupPixmap );
- setupPixmapContent19->resize ( setupPixmapContent19->tqsizeHint() );
+ setupPixmapContent19->resize ( setupPixmapContent19->sizeHint() );
newprofilewizardvtunpagecontent = new ProfileVtunOptions ( newprofilewizardvtunpage );
- newprofilewizardvtunpage->tqsizeHint();
+ newprofilewizardvtunpage->sizeHint();
connect ( newprofilewizardvtunpagecontent->PortCheckbox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( usePortToggled ( bool ) ) );
// ssh
@@ -523,9 +523,9 @@ void NewProfileWizard::setupPages()
// newprofilewizardsshpage->setSpacing(8);
TQLabel *setupPixmapContent191 = new TQLabel ( newprofilewizardsshpage );
setupPixmapContent191->setPixmap ( *SetupPixmap );
- setupPixmapContent191->resize ( setupPixmapContent191->tqsizeHint() );
+ setupPixmapContent191->resize ( setupPixmapContent191->sizeHint() );
newprofilewizardsshpagecontent = new ProfileSshOptions ( newprofilewizardsshpage );
- newprofilewizardsshpage->tqsizeHint();
+ newprofilewizardsshpage->sizeHint();
TQString Home= TQString(getenv("HOME"));
if (!Home.isEmpty())
@@ -535,7 +535,7 @@ void NewProfileWizard::setupPages()
//if (GlobalConfig->KvpncDebugLevel > 2)
//{
- // GlobalConfig->appendLogEntry(i18n("SSH files: %1").tqarg(KeyFiles.join(",")),GlobalConfig->debug);
+ // GlobalConfig->appendLogEntry(i18n("SSH files: %1").arg(KeyFiles.join(",")),GlobalConfig->debug);
//}
if (KeyFiles.size() > 1)
@@ -545,13 +545,13 @@ void NewProfileWizard::setupPages()
TQString item = TQString(*it);
if (GlobalConfig->KvpncDebugLevel > 2)
{
- //GlobalConfig->appendLogEntry(i18n("processing entry: %1").tqarg(item),GlobalConfig->debug);
+ //GlobalConfig->appendLogEntry(i18n("processing entry: %1").arg(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").tqarg(*it),GlobalConfig->debug);
+ GlobalConfig->appendLogEntry(i18n("SSH key found: %1").arg(*it),GlobalConfig->debug);
}
newprofilewizardsshpagecontent->SshKeyComboBox->insertItem(*it);
}
@@ -564,9 +564,9 @@ void NewProfileWizard::setupPages()
// newprofilewizardauthselectionpage->setSpacing(8);
TQLabel *setupPixmapContent81 = new TQLabel ( newprofilewizardauthselectionpage );
setupPixmapContent81->setPixmap ( *SetupPixmap );
- setupPixmapContent81->resize ( setupPixmapContent81->tqsizeHint() );
+ setupPixmapContent81->resize ( setupPixmapContent81->sizeHint() );
newprofilewizardauthselectioncontent = new NewProfileWizardAuthSelection ( newprofilewizardauthselectionpage );
- newprofilewizardauthselectionpage->tqsizeHint();
+ newprofilewizardauthselectionpage->sizeHint();
newprofilewizardauthselectioncontent->CertificateRadioButton->setChecked ( true );
newprofilewizardauthselectioncontent->HybridRadioButton->hide ();
@@ -575,9 +575,9 @@ void NewProfileWizard::setupPages()
newprofilewizardvirtualipaddresspage = new TQHBox ( 0 );
TQLabel *setupPixmapContent_virtualip = new TQLabel ( newprofilewizardvirtualipaddresspage );
setupPixmapContent_virtualip->setPixmap ( *SetupPixmap );
- setupPixmapContent_virtualip->resize ( setupPixmapContent_virtualip->tqsizeHint() );
+ setupPixmapContent_virtualip->resize ( setupPixmapContent_virtualip->sizeHint() );
profilenetworkvirtualipoptionscontent = new ProfileNetworkVirtualIpOptions ( newprofilewizardvirtualipaddresspage );
- newprofilewizardvirtualipaddresspage->tqsizeHint();
+ newprofilewizardvirtualipaddresspage->sizeHint();
insertPage ( newprofilewizardvirtualipaddresspage, "<b>" + i18n ( "Virtual IP address options" ) + "</b>",-1 );
connect ( profilenetworkvirtualipoptionscontent->UseVirtualIPCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( useVirtualIpAddressToggled ( bool ) ) );
@@ -586,9 +586,9 @@ void NewProfileWizard::setupPages()
// newprofilewizardpskpage->setSpacing(8);
TQLabel *setupPixmapContent72 = new TQLabel ( newprofilewizardpskpage );
setupPixmapContent72->setPixmap ( *SetupPixmap );
- setupPixmapContent72->resize ( setupPixmapContent72->tqsizeHint() );
+ setupPixmapContent72->resize ( setupPixmapContent72->sizeHint() );
newprofilewizardpskcontent = new NewProfileWizardPsk ( newprofilewizardpskpage );
- newprofilewizardpskpage->tqsizeHint();
+ newprofilewizardpskpage->sizeHint();
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& ) ) );
@@ -597,9 +597,9 @@ void NewProfileWizard::setupPages()
// newprofilewizardp12certselectionpage->setSpacing(8);
TQLabel *setupPixmapContent74 = new TQLabel ( newprofilewizardp12certselectionpage );
setupPixmapContent74->setPixmap ( *SetupPixmap );
- setupPixmapContent74->resize ( setupPixmapContent74->tqsizeHint() );
+ setupPixmapContent74->resize ( setupPixmapContent74->sizeHint() );
newprofilewizardp12certselectioncontent = new NewProfileWizardP12CertSelection ( newprofilewizardp12certselectionpage );
- newprofilewizardp12certselectionpage->tqsizeHint();
+ newprofilewizardp12certselectionpage->sizeHint();
connect ( newprofilewizardp12certselectioncontent->UseSmartcardCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( useSmartcardOnCertFormateToggled ( bool ) ) );
// cert
@@ -607,9 +607,9 @@ void NewProfileWizard::setupPages()
// newprofilewizardcertpage->setSpacing(8);
TQLabel *setupPixmapContent73 = new TQLabel ( newprofilewizardcertpage );
setupPixmapContent73->setPixmap ( *SetupPixmap );
- setupPixmapContent73->resize ( setupPixmapContent73->tqsizeHint() );
+ setupPixmapContent73->resize ( setupPixmapContent73->sizeHint() );
newprofilewizardcertcontent = new NewProfileWizardCert ( newprofilewizardcertpage );
- newprofilewizardcertpage->tqsizeHint();
+ newprofilewizardcertpage->sizeHint();
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 ) ) );
@@ -625,9 +625,9 @@ void NewProfileWizard::setupPages()
// newprofilewizarduserpage->setSpacing(8);
TQLabel *setupPixmapContent75 = new TQLabel ( newprofilewizarduserpage );
setupPixmapContent75->setPixmap ( *SetupPixmap );
- setupPixmapContent75->resize ( setupPixmapContent75->tqsizeHint() );
+ setupPixmapContent75->resize ( setupPixmapContent75->sizeHint() );
newprofilewizarduserpagecontent = new NewProfileWizardUser ( newprofilewizarduserpage );
- newprofilewizarduserpage->tqsizeHint();
+ newprofilewizarduserpage->sizeHint();
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& ) ) );
@@ -642,9 +642,9 @@ void NewProfileWizard::setupPages()
// newprofilewizardnetworkpage->setSpacing(8);
TQLabel *setupPixmapContent76 = new TQLabel ( newprofilewizardnetworkpage );
setupPixmapContent76->setPixmap ( *SetupPixmap );
- setupPixmapContent76->resize ( setupPixmapContent76->tqsizeHint() );
+ setupPixmapContent76->resize ( setupPixmapContent76->sizeHint() );
newprofilewizardnetworkcontent = new NewProfileWizardNetwork ( newprofilewizardnetworkpage );
- newprofilewizardnetworkpage->tqsizeHint();
+ newprofilewizardnetworkpage->sizeHint();
newprofilewizardnetworkcontent->NetworkDeviceComboBox->insertItem ( "default" );
NetworkInterface iface ( GlobalConfig, GlobalConfig->appPointer );
@@ -673,9 +673,9 @@ void NewProfileWizard::setupPages()
// newprofilewizardnetworkroutepage->setSpacing(8);
TQLabel *setupPixmapContent761 = new TQLabel ( newprofilewizardnetworkroutepage );
setupPixmapContent761->setPixmap ( *SetupPixmap );
- setupPixmapContent761->resize ( setupPixmapContent761->tqsizeHint() );
+ setupPixmapContent761->resize ( setupPixmapContent761->sizeHint() );
newprofilewizardnetworkroutecontent = new ProfileNetworkRouteOptions ( newprofilewizardnetworkroutepage );
- newprofilewizardnetworkroutepage->tqsizeHint();
+ newprofilewizardnetworkroutepage->sizeHint();
connect(newprofilewizardnetworkroutecontent->DefaultRouteComboBox, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(defaultRouteToggled(const TQString&)));
@@ -687,9 +687,9 @@ void NewProfileWizard::setupPages()
// newprofilewizardnatpage->setSpacing(8);
TQLabel *setupPixmapContent77 = new TQLabel ( newprofilewizardnatpage );
setupPixmapContent77->setPixmap ( *SetupPixmap );
- setupPixmapContent77->resize ( setupPixmapContent77->tqsizeHint() );
+ setupPixmapContent77->resize ( setupPixmapContent77->sizeHint() );
newprofilewizardnatcontent = new NewProfileWizardNat ( newprofilewizardnatpage );
- newprofilewizardnatpage->tqsizeHint();
+ newprofilewizardnatpage->sizeHint();
newprofilewizardnatcontent->UseUdpCheckbox->setChecked ( true );
newprofilewizardnatcontent->UseNatCheckbox->setChecked ( true );
connect ( newprofilewizardnatcontent->UseNatCheckbox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( useNatToggled ( bool ) ) );
@@ -701,9 +701,9 @@ void NewProfileWizard::setupPages()
// newprofilewizardconnectionstatuscheckpage->setSpacing(8);
TQLabel *setupPixmapContent79 = new TQLabel ( newprofilewizardconnectionstatuscheckpage );
setupPixmapContent79->setPixmap ( *SetupPixmap );
- setupPixmapContent79->resize ( setupPixmapContent79->tqsizeHint() );
+ setupPixmapContent79->resize ( setupPixmapContent79->sizeHint() );
newprofilewizardconnectionstatuscheckcontent = new NewProfileWizardConnectionStatusCheck ( newprofilewizardconnectionstatuscheckpage );
- newprofilewizardconnectionstatuscheckpage->tqsizeHint();
+ newprofilewizardconnectionstatuscheckpage->sizeHint();
insertPage ( newprofilewizardconnectionstatuscheckpage, "<b>" + i18n ( "Connection status check" ) + "</b>", -1 );
connect ( newprofilewizardconnectionstatuscheckcontent->PingUserdefiniedAddressCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( pingIpAfterConnectToggled ( bool ) ) );
connect ( newprofilewizardconnectionstatuscheckcontent->UseConnectionStatusCheckCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( connectionStatusCheckToggled ( bool ) ) );
@@ -714,9 +714,9 @@ void NewProfileWizard::setupPages()
// newprofilewizardconnectoptionspage->setSpacing(8);
TQLabel *setupPixmapContent80 = new TQLabel ( newprofilewizardconnectoptionspage );
setupPixmapContent80->setPixmap ( *SetupPixmap );
- setupPixmapContent80->resize ( setupPixmapContent80->tqsizeHint() );
+ setupPixmapContent80->resize ( setupPixmapContent80->sizeHint() );
newprofilewizardconnectoptionscontent = new NewProfileWizardConnectOptions ( newprofilewizardconnectoptionspage );
- newprofilewizardconnectoptionspage->tqsizeHint();
+ newprofilewizardconnectoptionspage->sizeHint();
newprofilewizardconnectoptionscontent->DoAutoConnectCheckBox->hide(); //TODO later
newprofilewizardconnectoptionscontent->AutoConnectProfileComboBox->hide(); //TODO_ later
insertPage ( newprofilewizardconnectoptionspage, "<b>" + i18n ( "Connect options" ) + "</b>", -1 );
@@ -726,9 +726,9 @@ void NewProfileWizard::setupPages()
// newprofilewizardgeneralpage->setSpacing(8);
TQLabel *setupPixmapContent78 = new TQLabel ( newprofilewizardgeneralpage );
setupPixmapContent78->setPixmap ( *SetupPixmap );
- setupPixmapContent78->resize ( setupPixmapContent78->tqsizeHint() );
+ setupPixmapContent78->resize ( setupPixmapContent78->sizeHint() );
newprofilewizardgeneralpagecontent = new NewProfileWizardGeneral ( newprofilewizardgeneralpage );
- newprofilewizardgeneralpage->tqsizeHint();
+ newprofilewizardgeneralpage->sizeHint();
insertPage ( newprofilewizardgeneralpage, "<b>" + i18n ( "General settings" ) + "</b>", -1 );
// setup end page
@@ -736,12 +736,12 @@ void NewProfileWizard::setupPages()
// endpage->setSpacing(8);
TQLabel *setupPixmapContent11 = new TQLabel ( endpage );
setupPixmapContent11->setPixmap ( *SetupPixmapFinal );
- setupPixmapContent11->resize ( setupPixmapContent11->tqsizeHint() );
+ setupPixmapContent11->resize ( setupPixmapContent11->sizeHint() );
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->tqsizeHint() );
- endpage->tqsizeHint();
+ endpagecontent->setMaximumSize ( endpagecontent->sizeHint() );
+ endpage->sizeHint();
insertPage ( endpage, "<b>" + i18n ( "Finish" ) + "</b>", -1 ); // last page
}
@@ -796,7 +796,7 @@ void NewProfileWizard::next ()
if ( it->getName() == Name )
{
//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::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).arg( account->getName() ), i18n( "Name exist, renamed" ) );
KMessageBox::error ( this, i18n ( "Profile name exists!" ), i18n ( "Name Exists" ) );
TQString newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), TQString ( Name += "_2" ), &ok );
@@ -1674,7 +1674,7 @@ void NewProfileWizard::next ()
{
profileData->setUseCustomEsp(true);
if ( GlobalConfig->KvpncDebugLevel > 0 )
- GlobalConfig->appendLogEntry ( i18n ( "Use custom %1: %2" ).arg ( i18n("ESP") ).tqarg(i18n("yes")), KVpncConfig::debug );
+ GlobalConfig->appendLogEntry ( i18n ( "Use custom %1: %2" ).arg ( i18n("ESP") ).arg(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") ).tqarg(i18n("no")), KVpncConfig::debug );
+ GlobalConfig->appendLogEntry ( i18n ( "Use custom %1: %2" ).arg ( i18n("ESP") ).arg(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") ).tqarg(i18n("yes")), KVpncConfig::debug );
+ GlobalConfig->appendLogEntry ( i18n ( "Use custom %1: %2" ).arg ( i18n("IKE") ).arg(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") ).tqarg(i18n("false")), KVpncConfig::debug );
+ GlobalConfig->appendLogEntry ( i18n ( "Use custom %1: %2" ).arg ( i18n("IKE") ).arg(i18n("false")), KVpncConfig::debug );
}
if (ok)
@@ -1978,7 +1978,7 @@ void NewProfileWizard::next ()
profileData->setAuthType ( VpnAccountData::cert );
newprofilewizardcertcontent->x509certURLRequester->show();
- newprofilewizardcertcontent->x509certURLRequester->tqsizeHint();
+ newprofilewizardcertcontent->x509certURLRequester->sizeHint();
newprofilewizardcertcontent->x509certComboBox->hide();
@@ -2041,7 +2041,7 @@ void NewProfileWizard::next ()
newprofilewizardcertcontent->LabelPrivateKeyPath->hide();
newprofilewizardcertcontent->privkeypathURLRequester->hide();
newprofilewizardcertcontent->LabelCaCertificatePath->hide();
- newprofilewizardcertcontent->CertificateGroupBox->resize(newprofilewizardcertcontent->CertificateGroupBox->tqsizeHint());
+ newprofilewizardcertcontent->CertificateGroupBox->resize(newprofilewizardcertcontent->CertificateGroupBox->sizeHint());
insertPage ( newprofilewizardcertpage, "<b>" + i18n ( "Certificate settings" ) + "</b>", 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->tqsizeHint();
+ newprofilewizardcertcontent->x509certComboBox->sizeHint();
newprofilewizardcertcontent->x509certComboBox->setCurrentItem(0);
}
@@ -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" ).tqarg(newprofilewizardsshpagecontent->CostumkeyURLRequester->url()) , KVpncConfig::debug );
+ GlobalConfig->appendLogEntry ( i18n ( "SSH: use costum key: %1" ).arg(newprofilewizardsshpagecontent->CostumkeyURLRequester->url()) , KVpncConfig::debug );
}
else
{
profileData->setPreSharedKey(newprofilewizardsshpagecontent->SshKeyComboBox->currentText());
if ( GlobalConfig->KvpncDebugLevel > 0 )
- GlobalConfig->appendLogEntry ( i18n ( "SSH: use autotected key: %1" ).tqarg(newprofilewizardsshpagecontent->SshKeyComboBox->currentText()) , KVpncConfig::debug );
+ GlobalConfig->appendLogEntry ( i18n ( "SSH: use autotected key: %1" ).arg(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" ).tqarg(newprofilewizardsshpagecontent->SshConfigRemoteScriptLineEdit->text()) , KVpncConfig::debug );
+ GlobalConfig->appendLogEntry ( i18n ( "SSH: use ssh config remote script: %1" ).arg(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!" ).tqarg(i18n("ssh config remote script")), GlobalConfig->error);
+ GlobalConfig->appendLogEntry( i18n( "%1 cant be empty!" ).arg(i18n("ssh config remote script")), GlobalConfig->error);
}
}
@@ -2813,7 +2813,7 @@ void NewProfileWizard::next ()
if ( validAddr == true )
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
- GlobalConfig->appendLogEntry ( i18n ( "Use remote network: %1/%2" ).arg ( addr ).tqarg(newprofilewizardnetworkcontent->RemoteNetMaskComboBox->currentText()), KVpncConfig::debug );
+ GlobalConfig->appendLogEntry ( i18n ( "Use remote network: %1/%2" ).arg ( addr ).arg(newprofilewizardnetworkcontent->RemoteNetMaskComboBox->currentText()), KVpncConfig::debug );
profileData->setUseRemoteNetwork(true);
profileData->setRemoteNetAddr ( addr );
profileData->setRemoteNetMask ( newprofilewizardnetworkcontent->RemoteNetMaskComboBox->currentText() );
@@ -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.").tqarg(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.").arg(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.").tqarg(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.").arg(IpsecToolInfo.Version.section(' ',0,0)),i18n("Unsupported IPSec version"));
// }
}
else
diff --git a/src/newprofilewizardauthselection.ui b/src/newprofilewizardauthselection.ui
index ff86f20..eae4f64 100644
--- a/src/newprofilewizardauthselection.ui
+++ b/src/newprofilewizardauthselection.ui
@@ -78,7 +78,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>71</width>
<height>20</height>
@@ -95,7 +95,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>51</height>
diff --git a/src/newprofilewizardcert.ui b/src/newprofilewizardcert.ui
index ab798e7..de5a91f 100644
--- a/src/newprofilewizardcert.ui
+++ b/src/newprofilewizardcert.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout47</cstring>
+ <cstring>layout47</cstring>
</property>
<hbox>
<property name="name">
@@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout46</cstring>
+ <cstring>layout46</cstring>
</property>
<vbox>
<property name="name">
@@ -37,7 +37,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout76</cstring>
+ <cstring>layout76</cstring>
</property>
<hbox>
<property name="name">
@@ -67,7 +67,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>221</width>
<height>20</height>
@@ -141,7 +141,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
- <cstring>tqlayout45</cstring>
+ <cstring>layout45</cstring>
</property>
<hbox>
<property name="name">
@@ -151,7 +151,7 @@
<property name="name">
<cstring>x509certURLRequester</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
@@ -170,7 +170,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout28</cstring>
+ <cstring>layout28</cstring>
</property>
<hbox>
<property name="name">
@@ -194,7 +194,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>172</width>
<height>20</height>
@@ -205,7 +205,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout29</cstring>
+ <cstring>layout29</cstring>
</property>
<hbox>
<property name="name">
@@ -229,7 +229,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>134</width>
<height>20</height>
@@ -240,7 +240,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
- <cstring>tqlayout30</cstring>
+ <cstring>layout30</cstring>
</property>
<hbox>
<property name="name">
@@ -264,7 +264,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>109</width>
<height>20</height>
@@ -275,7 +275,7 @@
</widget>
<widget class="TQLayoutWidget" row="4" column="0">
<property name="name">
- <cstring>tqlayout32</cstring>
+ <cstring>layout32</cstring>
</property>
<hbox>
<property name="name">
@@ -305,7 +305,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>34</width>
<height>20</height>
@@ -316,7 +316,7 @@
</widget>
<widget class="TQLayoutWidget" row="5" column="0">
<property name="name">
- <cstring>tqlayout33</cstring>
+ <cstring>layout33</cstring>
</property>
<hbox>
<property name="name">
@@ -340,7 +340,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>134</width>
<height>20</height>
@@ -351,7 +351,7 @@
</widget>
<widget class="TQLayoutWidget" row="6" column="0">
<property name="name">
- <cstring>tqlayout34</cstring>
+ <cstring>layout34</cstring>
</property>
<hbox>
<property name="name">
@@ -375,7 +375,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>84</width>
<height>20</height>
@@ -402,7 +402,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout90</cstring>
+ <cstring>layout90</cstring>
</property>
<vbox>
<property name="name">
@@ -410,7 +410,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout31</cstring>
+ <cstring>layout31</cstring>
</property>
<hbox>
<property name="name">
@@ -439,7 +439,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout55</cstring>
+ <cstring>layout55</cstring>
</property>
<grid>
<property name="name">
@@ -525,7 +525,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout24</cstring>
+ <cstring>layout24</cstring>
</property>
<hbox>
<property name="name">
@@ -533,7 +533,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout23</cstring>
+ <cstring>layout23</cstring>
</property>
<grid>
<property name="name">
@@ -604,7 +604,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout22</cstring>
+ <cstring>layout22</cstring>
</property>
<grid>
<property name="name">
@@ -620,7 +620,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>241</width>
<height>21</height>
@@ -673,7 +673,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>44</height>
diff --git a/src/newprofilewizardciscomanually.ui b/src/newprofilewizardciscomanually.ui
index e277c96..4d24416 100644
--- a/src/newprofilewizardciscomanually.ui
+++ b/src/newprofilewizardciscomanually.ui
@@ -29,7 +29,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>71</height>
@@ -38,7 +38,7 @@
</spacer>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout24</cstring>
+ <cstring>layout24</cstring>
</property>
<grid>
<property name="name">
@@ -54,7 +54,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>171</width>
<height>20</height>
@@ -85,7 +85,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>111</width>
<height>21</height>
@@ -116,7 +116,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="3">
<property name="name">
- <cstring>tqlayout12</cstring>
+ <cstring>layout12</cstring>
</property>
<grid>
<property name="name">
@@ -162,7 +162,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>70</width>
<height>20</height>
@@ -179,7 +179,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>70</width>
<height>20</height>
@@ -211,7 +211,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/src/newprofilewizardciscoselection.ui b/src/newprofilewizardciscoselection.ui
index cb6bd0f..633ff31 100644
--- a/src/newprofilewizardciscoselection.ui
+++ b/src/newprofilewizardciscoselection.ui
@@ -67,7 +67,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>311</height>
@@ -84,7 +84,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>351</width>
<height>20</height>
diff --git a/src/newprofilewizardconnectionstatuscheck.ui b/src/newprofilewizardconnectionstatuscheck.ui
index b10f46c..926950e 100644
--- a/src/newprofilewizardconnectionstatuscheck.ui
+++ b/src/newprofilewizardconnectionstatuscheck.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<vbox>
<property name="name">
@@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@@ -68,7 +68,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>241</width>
<height>20</height>
@@ -79,7 +79,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<grid>
<property name="name">
@@ -120,7 +120,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>180</width>
<height>20</height>
@@ -145,7 +145,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>290</width>
<height>20</height>
@@ -164,7 +164,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@@ -203,7 +203,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>201</width>
<height>20</height>
@@ -214,7 +214,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@@ -268,7 +268,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>201</width>
<height>41</height>
@@ -285,7 +285,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>121</height>
diff --git a/src/newprofilewizardconnectoptions.ui b/src/newprofilewizardconnectoptions.ui
index bca1f58..d48bc39 100644
--- a/src/newprofilewizardconnectoptions.ui
+++ b/src/newprofilewizardconnectoptions.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout37</cstring>
+ <cstring>layout37</cstring>
</property>
<grid>
<property name="name">
@@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout36</cstring>
+ <cstring>layout36</cstring>
</property>
<hbox>
<property name="name">
@@ -56,7 +56,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>181</width>
<height>21</height>
@@ -67,7 +67,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout12</cstring>
+ <cstring>layout12</cstring>
</property>
<hbox>
<property name="name">
@@ -103,7 +103,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>59</width>
<height>20</height>
@@ -132,7 +132,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>61</width>
<height>20</height>
@@ -149,7 +149,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>91</height>
diff --git a/src/newprofilewizardfreeswan.ui b/src/newprofilewizardfreeswan.ui
index 3855921..86797e1 100644
--- a/src/newprofilewizardfreeswan.ui
+++ b/src/newprofilewizardfreeswan.ui
@@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout64</cstring>
+ <cstring>layout64</cstring>
</property>
<hbox>
<property name="name">
@@ -32,7 +32,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout63</cstring>
+ <cstring>layout63</cstring>
</property>
<grid>
<property name="name">
@@ -40,7 +40,7 @@
</property>
<widget class="TQLayoutWidget" row="7" column="0">
<property name="name">
- <cstring>tqlayout90_2</cstring>
+ <cstring>layout90_2</cstring>
</property>
<hbox>
<property name="name">
@@ -70,7 +70,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>100</width>
<height>20</height>
@@ -81,7 +81,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
- <cstring>tqlayout160</cstring>
+ <cstring>layout160</cstring>
</property>
<hbox>
<property name="name">
@@ -108,7 +108,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -144,7 +144,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout74_2</cstring>
+ <cstring>layout74_2</cstring>
</property>
<grid>
<property name="name">
@@ -152,7 +152,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout73_2</cstring>
+ <cstring>layout73_2</cstring>
</property>
<hbox>
<property name="name">
@@ -176,7 +176,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>20</height>
@@ -201,7 +201,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0" rowspan="2" colspan="1">
<property name="name">
- <cstring>tqlayout72_2_2</cstring>
+ <cstring>layout72_2_2</cstring>
</property>
<hbox>
<property name="name">
@@ -225,7 +225,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>20</height>
@@ -269,7 +269,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout158</cstring>
+ <cstring>layout158</cstring>
</property>
<hbox>
<property name="name">
@@ -277,7 +277,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout155</cstring>
+ <cstring>layout155</cstring>
</property>
<vbox>
<property name="name">
@@ -362,7 +362,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout52</cstring>
+ <cstring>layout52</cstring>
</property>
<hbox>
<property name="name">
@@ -389,7 +389,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout156</cstring>
+ <cstring>layout156</cstring>
</property>
<vbox>
<property name="name">
@@ -463,7 +463,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout53</cstring>
+ <cstring>layout53</cstring>
</property>
<hbox>
<property name="name">
@@ -492,7 +492,7 @@
</widget>
<widget class="TQLayoutWidget" row="5" column="0">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<grid>
<property name="name">
@@ -554,7 +554,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout74</cstring>
+ <cstring>layout74</cstring>
</property>
<grid>
<property name="name">
@@ -562,7 +562,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout73</cstring>
+ <cstring>layout73</cstring>
</property>
<hbox>
<property name="name">
@@ -586,7 +586,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>20</height>
@@ -611,7 +611,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0" rowspan="2" colspan="1">
<property name="name">
- <cstring>tqlayout72_2</cstring>
+ <cstring>layout72_2</cstring>
</property>
<hbox>
<property name="name">
@@ -635,7 +635,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>20</height>
@@ -679,7 +679,7 @@
</widget>
<widget class="TQLayoutWidget" row="6" column="0">
<property name="name">
- <cstring>tqlayout90</cstring>
+ <cstring>layout90</cstring>
</property>
<hbox>
<property name="name">
@@ -706,7 +706,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>100</width>
<height>20</height>
@@ -725,7 +725,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>198</height>
@@ -734,7 +734,7 @@
</spacer>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout16</cstring>
+ <cstring>layout16</cstring>
</property>
<grid>
<property name="name">
@@ -750,7 +750,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout150</cstring>
+ <cstring>layout150</cstring>
</property>
<hbox>
<property name="name">
@@ -774,7 +774,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>28</width>
<height>20</height>
@@ -785,7 +785,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout72</cstring>
+ <cstring>layout72</cstring>
</property>
<hbox>
<property name="name">
@@ -809,7 +809,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>91</width>
<height>21</height>
@@ -861,7 +861,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>53</width>
<height>31</height>
diff --git a/src/newprofilewizardgeneral.ui b/src/newprofilewizardgeneral.ui
index 098a3db..64a6fc9 100644
--- a/src/newprofilewizardgeneral.ui
+++ b/src/newprofilewizardgeneral.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout29</cstring>
+ <cstring>layout29</cstring>
</property>
<vbox>
<property name="name">
@@ -37,7 +37,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout28</cstring>
+ <cstring>layout28</cstring>
</property>
<grid>
<property name="name">
@@ -109,7 +109,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>43</height>
@@ -128,7 +128,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>20</height>
@@ -145,7 +145,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>41</height>
diff --git a/src/newprofilewizardnat.ui b/src/newprofilewizardnat.ui
index cda9996..5c89a0b 100644
--- a/src/newprofilewizardnat.ui
+++ b/src/newprofilewizardnat.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout10</cstring>
+ <cstring>layout10</cstring>
</property>
<hbox>
<property name="name">
@@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<vbox>
<property name="name">
@@ -37,7 +37,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<hbox>
<property name="name">
@@ -70,7 +70,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>50</width>
<height>20</height>
@@ -95,7 +95,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<hbox>
<property name="name">
@@ -148,7 +148,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>46</width>
<height>21</height>
@@ -167,7 +167,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>150</height>
@@ -186,7 +186,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>201</width>
<height>21</height>
diff --git a/src/newprofilewizardnetwork.ui b/src/newprofilewizardnetwork.ui
index dc15355..b65642b 100644
--- a/src/newprofilewizardnetwork.ui
+++ b/src/newprofilewizardnetwork.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout28</cstring>
+ <cstring>layout28</cstring>
</property>
<hbox>
<property name="name">
@@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout27</cstring>
+ <cstring>layout27</cstring>
</property>
<vbox>
<property name="name">
@@ -37,7 +37,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout11</cstring>
+ <cstring>layout11</cstring>
</property>
<grid>
<property name="name">
@@ -53,7 +53,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>252</width>
<height>20</height>
@@ -125,7 +125,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
- <cstring>tqlayout77</cstring>
+ <cstring>layout77</cstring>
</property>
<hbox>
<property name="name">
@@ -289,7 +289,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout58</cstring>
+ <cstring>layout58</cstring>
</property>
<hbox>
<property name="name">
@@ -345,7 +345,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>71</width>
<height>20</height>
@@ -396,7 +396,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout57</cstring>
+ <cstring>layout57</cstring>
</property>
<hbox>
<property name="name">
@@ -415,7 +415,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout22</cstring>
+ <cstring>layout22</cstring>
</property>
<hbox>
<property name="name">
@@ -431,7 +431,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>181</width>
<height>21</height>
@@ -460,7 +460,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>30</height>
@@ -479,7 +479,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
diff --git a/src/newprofilewizardnetworkroute.ui b/src/newprofilewizardnetworkroute.ui
index de0225b..c0fe482 100644
--- a/src/newprofilewizardnetworkroute.ui
+++ b/src/newprofilewizardnetworkroute.ui
@@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout17</cstring>
+ <cstring>layout17</cstring>
</property>
<vbox>
<property name="name">
@@ -37,7 +37,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout14</cstring>
+ <cstring>layout14</cstring>
</property>
<hbox>
<property name="name">
@@ -68,7 +68,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>278</width>
<height>21</height>
@@ -142,7 +142,7 @@
<property name="enabled">
<bool>false</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>150</height>
@@ -154,7 +154,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout52</cstring>
+ <cstring>layout52</cstring>
</property>
<hbox>
<property name="name">
@@ -170,7 +170,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>241</width>
<height>20</height>
diff --git a/src/newprofilewizardopenvpn.ui b/src/newprofilewizardopenvpn.ui
index c9eeda3..cdadb2c 100644
--- a/src/newprofilewizardopenvpn.ui
+++ b/src/newprofilewizardopenvpn.ui
@@ -22,7 +22,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout50</cstring>
+ <cstring>layout50</cstring>
</property>
<vbox>
<property name="name">
@@ -38,7 +38,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout49</cstring>
+ <cstring>layout49</cstring>
</property>
<grid>
<property name="name">
@@ -79,7 +79,7 @@
</widget>
<widget class="TQLayoutWidget" row="5" column="0">
<property name="name">
- <cstring>tqlayout47</cstring>
+ <cstring>layout47</cstring>
</property>
<hbox>
<property name="name">
@@ -109,7 +109,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>101</width>
<height>20</height>
@@ -120,7 +120,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0" rowspan="2" colspan="1">
<property name="name">
- <cstring>tqlayout44</cstring>
+ <cstring>layout44</cstring>
</property>
<hbox>
<property name="name">
@@ -147,7 +147,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>119</width>
<height>20</height>
@@ -177,7 +177,7 @@
</widget>
<widget class="TQLayoutWidget" row="6" column="0">
<property name="name">
- <cstring>tqlayout48</cstring>
+ <cstring>layout48</cstring>
</property>
<hbox>
<property name="name">
@@ -207,7 +207,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>20</height>
@@ -218,7 +218,7 @@
</widget>
<widget class="TQLayoutWidget" row="8" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout18_2</cstring>
+ <cstring>layout18_2</cstring>
</property>
<hbox>
<property name="name">
@@ -248,7 +248,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>191</width>
<height>20</height>
@@ -276,7 +276,7 @@
</widget>
<widget class="TQLayoutWidget" row="7" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout18</cstring>
+ <cstring>layout18</cstring>
</property>
<hbox>
<property name="name">
@@ -306,7 +306,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>191</width>
<height>20</height>
@@ -317,7 +317,7 @@
</widget>
<widget class="TQLayoutWidget" row="4" column="0">
<property name="name">
- <cstring>tqlayout46</cstring>
+ <cstring>layout46</cstring>
</property>
<hbox>
<property name="name">
@@ -344,7 +344,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>119</width>
<height>20</height>
@@ -355,7 +355,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout45</cstring>
+ <cstring>layout45</cstring>
</property>
<hbox>
<property name="name">
@@ -382,7 +382,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>119</width>
<height>21</height>
@@ -393,7 +393,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="0">
<property name="name">
- <cstring>tqlayout43</cstring>
+ <cstring>layout43</cstring>
</property>
<hbox>
<property name="name">
@@ -423,7 +423,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>119</width>
<height>20</height>
@@ -447,7 +447,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout11</cstring>
+ <cstring>layout11</cstring>
</property>
<grid>
<property name="name">
@@ -466,7 +466,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="2">
<property name="name">
- <cstring>tqlayout10</cstring>
+ <cstring>layout10</cstring>
</property>
<hbox>
<property name="name">
@@ -496,7 +496,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>101</width>
<height>21</height>
@@ -571,7 +571,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>220</width>
<height>20</height>
@@ -588,7 +588,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>221</width>
<height>20</height>
@@ -597,7 +597,7 @@
</spacer>
<widget class="TQLayoutWidget" row="2" column="1">
<property name="name">
- <cstring>tqlayout9_2</cstring>
+ <cstring>layout9_2</cstring>
</property>
<hbox>
<property name="name">
@@ -613,7 +613,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>110</width>
<height>21</height>
@@ -656,7 +656,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>117</height>
diff --git a/src/newprofilewizardopenvpnauth.ui b/src/newprofilewizardopenvpnauth.ui
index 9599331..cde6f7e 100644
--- a/src/newprofilewizardopenvpnauth.ui
+++ b/src/newprofilewizardopenvpnauth.ui
@@ -22,7 +22,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout66</cstring>
+ <cstring>layout66</cstring>
</property>
<hbox>
<property name="name">
@@ -30,7 +30,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout65</cstring>
+ <cstring>layout65</cstring>
</property>
<vbox>
<property name="name">
@@ -46,7 +46,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout17</cstring>
+ <cstring>layout17</cstring>
</property>
<hbox>
<property name="name">
@@ -76,7 +76,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>191</width>
<height>20</height>
@@ -87,7 +87,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout98</cstring>
+ <cstring>layout98</cstring>
</property>
<hbox>
<property name="name">
@@ -120,7 +120,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>46</width>
<height>20</height>
@@ -131,7 +131,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout64</cstring>
+ <cstring>layout64</cstring>
</property>
<hbox>
<property name="name">
@@ -139,7 +139,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout63</cstring>
+ <cstring>layout63</cstring>
</property>
<hbox>
<property name="name">
@@ -166,7 +166,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>233</width>
<height>20</height>
@@ -198,7 +198,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -217,7 +217,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>494</width>
<height>20</height>
diff --git a/src/newprofilewizardopenvpnselection.ui b/src/newprofilewizardopenvpnselection.ui
index c556865..aeccfcc 100644
--- a/src/newprofilewizardopenvpnselection.ui
+++ b/src/newprofilewizardopenvpnselection.ui
@@ -67,7 +67,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>311</height>
@@ -84,7 +84,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>351</width>
<height>20</height>
diff --git a/src/newprofilewizardp12certselection.ui b/src/newprofilewizardp12certselection.ui
index e3109a6..3cdd3ca 100644
--- a/src/newprofilewizardp12certselection.ui
+++ b/src/newprofilewizardp12certselection.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout81</cstring>
+ <cstring>layout81</cstring>
</property>
<hbox>
<property name="name">
@@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout80</cstring>
+ <cstring>layout80</cstring>
</property>
<vbox>
<property name="name">
@@ -100,7 +100,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>160</height>
@@ -119,7 +119,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>111</width>
<height>20</height>
diff --git a/src/newprofilewizardpptp.ui b/src/newprofilewizardpptp.ui
index a513b4d..581b03d 100644
--- a/src/newprofilewizardpptp.ui
+++ b/src/newprofilewizardpptp.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout14</cstring>
+ <cstring>layout14</cstring>
</property>
<hbox>
<property name="name">
@@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout13</cstring>
+ <cstring>layout13</cstring>
</property>
<vbox>
<property name="name">
@@ -376,7 +376,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<hbox>
<property name="name">
@@ -384,7 +384,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@@ -425,7 +425,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout7_2</cstring>
+ <cstring>layout7_2</cstring>
</property>
<hbox>
<property name="name">
@@ -433,7 +433,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@@ -457,7 +457,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>111</width>
<height>21</height>
@@ -493,7 +493,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>165</height>
@@ -512,7 +512,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>49</width>
<height>31</height>
diff --git a/src/newprofilewizardpsk.ui b/src/newprofilewizardpsk.ui
index d5b5b4e..1d918fd 100644
--- a/src/newprofilewizardpsk.ui
+++ b/src/newprofilewizardpsk.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<vbox>
<property name="name">
@@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<grid>
<property name="name">
@@ -81,7 +81,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>130</width>
<height>20</height>
@@ -98,7 +98,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>174</width>
<height>20</height>
@@ -112,7 +112,7 @@
<property name="enabled">
<bool>false</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
@@ -132,7 +132,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>165</width>
<height>20</height>
@@ -163,7 +163,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>147</width>
<height>20</height>
@@ -196,7 +196,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>301</height>
@@ -215,7 +215,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>20</height>
@@ -232,7 +232,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>41</height>
diff --git a/src/newprofilewizardracoon.ui b/src/newprofilewizardracoon.ui
index 0f10acd..1c7e521 100644
--- a/src/newprofilewizardracoon.ui
+++ b/src/newprofilewizardracoon.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout66</cstring>
+ <cstring>layout66</cstring>
</property>
<hbox>
<property name="name">
@@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout65</cstring>
+ <cstring>layout65</cstring>
</property>
<vbox>
<property name="name">
@@ -45,7 +45,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout62</cstring>
+ <cstring>layout62</cstring>
</property>
<grid>
<property name="name">
@@ -77,7 +77,7 @@
</widget>
<widget class="TQLayoutWidget" row="6" column="0">
<property name="name">
- <cstring>tqlayout61</cstring>
+ <cstring>layout61</cstring>
</property>
<hbox>
<property name="name">
@@ -107,7 +107,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>101</width>
<height>20</height>
@@ -118,7 +118,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="0">
<property name="name">
- <cstring>tqlayout71_2</cstring>
+ <cstring>layout71_2</cstring>
</property>
<hbox>
<property name="name">
@@ -142,7 +142,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>101</width>
<height>21</height>
@@ -161,7 +161,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout69</cstring>
+ <cstring>layout69</cstring>
</property>
<hbox>
<property name="name">
@@ -188,7 +188,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>101</width>
<height>21</height>
@@ -229,7 +229,7 @@ dh18 = modp8192 (only racoon)</string>
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout71</cstring>
+ <cstring>layout71</cstring>
</property>
<hbox>
<property name="name">
@@ -253,7 +253,7 @@ dh18 = modp8192 (only racoon)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>101</width>
<height>21</height>
@@ -264,7 +264,7 @@ dh18 = modp8192 (only racoon)</string>
</widget>
<widget class="TQLayoutWidget" row="5" column="0">
<property name="name">
- <cstring>tqlayout37</cstring>
+ <cstring>layout37</cstring>
</property>
<hbox>
<property name="name">
@@ -294,7 +294,7 @@ dh18 = modp8192 (only racoon)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>61</width>
<height>21</height>
@@ -331,7 +331,7 @@ dh18 = modp8192 (racoon only)</string>
</widget>
<widget class="TQLayoutWidget" row="4" column="0">
<property name="name">
- <cstring>tqlayout72</cstring>
+ <cstring>layout72</cstring>
</property>
<hbox>
<property name="name">
@@ -355,7 +355,7 @@ dh18 = modp8192 (racoon only)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>91</width>
<height>21</height>
@@ -366,7 +366,7 @@ dh18 = modp8192 (racoon only)</string>
</widget>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
- <cstring>tqlayout70_2</cstring>
+ <cstring>layout70_2</cstring>
</property>
<hbox>
<property name="name">
@@ -390,7 +390,7 @@ dh18 = modp8192 (racoon only)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>81</width>
<height>21</height>
@@ -403,7 +403,7 @@ dh18 = modp8192 (racoon only)</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout75</cstring>
+ <cstring>layout75</cstring>
</property>
<hbox>
<property name="name">
@@ -424,7 +424,7 @@ dh18 = modp8192 (racoon only)</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout90_2</cstring>
+ <cstring>layout90_2</cstring>
</property>
<hbox>
<property name="name">
@@ -454,7 +454,7 @@ dh18 = modp8192 (racoon only)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>100</width>
<height>20</height>
@@ -476,7 +476,7 @@ dh18 = modp8192 (racoon only)</string>
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout74_2</cstring>
+ <cstring>layout74_2</cstring>
</property>
<grid>
<property name="name">
@@ -484,7 +484,7 @@ dh18 = modp8192 (racoon only)</string>
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout73_2</cstring>
+ <cstring>layout73_2</cstring>
</property>
<hbox>
<property name="name">
@@ -508,7 +508,7 @@ dh18 = modp8192 (racoon only)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>20</height>
@@ -533,7 +533,7 @@ dh18 = modp8192 (racoon only)</string>
</widget>
<widget class="TQLayoutWidget" row="1" column="0" rowspan="2" colspan="1">
<property name="name">
- <cstring>tqlayout72_2</cstring>
+ <cstring>layout72_2</cstring>
</property>
<hbox>
<property name="name">
@@ -557,7 +557,7 @@ dh18 = modp8192 (racoon only)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>20</height>
@@ -598,7 +598,7 @@ dh18 = modp8192 (racoon only)</string>
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout74</cstring>
+ <cstring>layout74</cstring>
</property>
<grid>
<property name="name">
@@ -606,7 +606,7 @@ dh18 = modp8192 (racoon only)</string>
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout73</cstring>
+ <cstring>layout73</cstring>
</property>
<hbox>
<property name="name">
@@ -630,7 +630,7 @@ dh18 = modp8192 (racoon only)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>20</height>
@@ -655,7 +655,7 @@ dh18 = modp8192 (racoon only)</string>
</widget>
<widget class="TQLayoutWidget" row="1" column="0" rowspan="2" colspan="1">
<property name="name">
- <cstring>tqlayout72_3</cstring>
+ <cstring>layout72_3</cstring>
</property>
<hbox>
<property name="name">
@@ -679,7 +679,7 @@ dh18 = modp8192 (racoon only)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>20</height>
@@ -717,7 +717,7 @@ dh18 = modp8192 (racoon only)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -736,7 +736,7 @@ dh18 = modp8192 (racoon only)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>20</height>
diff --git a/src/newprofilewizardstart.ui b/src/newprofilewizardstart.ui
index 4bb29f2..83504ad 100644
--- a/src/newprofilewizardstart.ui
+++ b/src/newprofilewizardstart.ui
@@ -39,7 +39,7 @@ Click "Next" to continue.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>31</height>
@@ -56,7 +56,7 @@ Click "Next" to continue.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>61</width>
<height>20</height>
diff --git a/src/newprofilewizardtypeselection.ui b/src/newprofilewizardtypeselection.ui
index dcbc132..a0ef233 100644
--- a/src/newprofilewizardtypeselection.ui
+++ b/src/newprofilewizardtypeselection.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout25</cstring>
+ <cstring>layout25</cstring>
</property>
<hbox>
<property name="name">
@@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout24</cstring>
+ <cstring>layout24</cstring>
</property>
<vbox>
<property name="name">
@@ -179,7 +179,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>105</height>
@@ -198,7 +198,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
diff --git a/src/newprofilewizarduser.ui b/src/newprofilewizarduser.ui
index 7ba8f9f..b435e3d 100644
--- a/src/newprofilewizarduser.ui
+++ b/src/newprofilewizarduser.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout57</cstring>
+ <cstring>layout57</cstring>
</property>
<vbox>
<property name="name">
@@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout56</cstring>
+ <cstring>layout56</cstring>
</property>
<grid>
<property name="name">
@@ -84,7 +84,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout54</cstring>
+ <cstring>layout54</cstring>
</property>
<hbox>
<property name="name">
@@ -108,7 +108,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>211</width>
<height>21</height>
@@ -119,7 +119,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout55</cstring>
+ <cstring>layout55</cstring>
</property>
<hbox>
<property name="name">
@@ -143,7 +143,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>211</width>
<height>21</height>
@@ -156,7 +156,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout52</cstring>
+ <cstring>layout52</cstring>
</property>
<hbox>
<property name="name">
@@ -202,7 +202,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>48</height>
diff --git a/src/openvpnmanagementhandler.cpp b/src/openvpnmanagementhandler.cpp
index a30b8e0..cab0c76 100644
--- a/src/openvpnmanagementhandler.cpp
+++ b/src/openvpnmanagementhandler.cpp
@@ -22,7 +22,7 @@
//BEGIN INCLUDES
#include "openvpnmanagementhandler.h"
#include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <kpassdlg.h>
#include <klocale.h>
#include <tqlabel.h>
@@ -80,7 +80,7 @@ void OpenvpnManagementHandler::socketConnectionClosed()
if ( GlobalConfig->KvpncDebugLevel > 1 )
- GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Disconnected to the OpenVPN manage port (%1)." ).tqarg( TQString().setNum( GlobalConfig->OpenvpnManagementPort ) ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Disconnected to the OpenVPN manage port (%1)." ).arg( TQString().setNum( GlobalConfig->OpenvpnManagementPort ) ), GlobalConfig->debug );
}
void OpenvpnManagementHandler::socketClosed()
@@ -91,7 +91,7 @@ void OpenvpnManagementHandler::socketClosed()
greetingtimer.stop();
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." ).tqarg( TQString().setNum( GlobalConfig->OpenvpnManagementPort ) ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Socket to the OpenVPN manage port (%1) closed." ).arg( TQString().setNum( GlobalConfig->OpenvpnManagementPort ) ), GlobalConfig->debug );
socketReallyClosed = true;
// emit terminate_openvpn();
}
@@ -106,7 +106,7 @@ void OpenvpnManagementHandler::socketConnected()
connectedToManagementPort=true;
if ( GlobalConfig->KvpncDebugLevel > 1 )
- GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Connected to the OpenVPN manage port (%1)." ).tqarg( TQString().setNum( GlobalConfig->OpenvpnManagementPort ) ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Connected to the OpenVPN manage port (%1)." ).arg( TQString().setNum( GlobalConfig->OpenvpnManagementPort ) ), GlobalConfig->debug );
socketReadyRead();
@@ -115,7 +115,7 @@ void OpenvpnManagementHandler::socketConnected()
void OpenvpnManagementHandler::socketError( int e )
{
- // infoText->append( tr("Error number %1 occurred\n").tqarg(e) );
+ // infoText->append( tr("Error number %1 occurred\n").arg(e) );
if ( e != 0 )
GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + TQString().setNum( e ) , GlobalConfig->error );
}
@@ -125,7 +125,7 @@ void OpenvpnManagementHandler::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.").tqarg("3"), GlobalConfig->error );
+ GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n("Got no greeting within %1 seconds from management interface, retrying.").arg("3"), GlobalConfig->error );
closeConnection();
@@ -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." ).tqarg("'hold'"), GlobalConfig->debug );
+ // GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message." ).arg("'hold'"), GlobalConfig->debug );
//
// fInHold = true;
// int ret = 0;
@@ -205,7 +205,7 @@ void OpenvpnManagementHandler::socketReadyRead()
{
if ( GlobalConfig->KvpncDebugLevel > 2 )
- GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).tqarg("'need ok'"), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).arg("'need ok'"), GlobalConfig->debug );
TQString req = line.section( TQRegExp( ".*'(.*)'. * MSG:( .* )" ), 0, 0 ); // $1;
TQString msg = line.section( TQRegExp( ".*'(.*)'. * MSG:( .* )" ), 1, 1 ); // $2;
@@ -240,7 +240,7 @@ void OpenvpnManagementHandler::socketReadyRead()
// if ( line.find( " >PASSWORD:", 0, FALSE ) > -1 ) {
//
// if ( GlobalConfig->KvpncDebugLevel > 2 )
- // GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).tqarg("'password'"), GlobalConfig->debug );
+ // GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).arg("'password'"), GlobalConfig->debug );
//
// TQString req = line.section( TQRegExp( ".*'(.*)'.*" ), 0, 0 ); // $1;
// TQCString password;
@@ -264,7 +264,7 @@ void OpenvpnManagementHandler::socketReadyRead()
{
if ( GlobalConfig->KvpncDebugLevel > 2 )
- GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).tqarg("'need username/password'"), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).arg("'need username/password'"), GlobalConfig->debug );
if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Send username..." ), GlobalConfig->debug );
@@ -314,7 +314,7 @@ void OpenvpnManagementHandler::socketReadyRead()
{
if ( GlobalConfig->KvpncDebugLevel > 2 )
- GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).tqarg("SUCCESS: 'Auth' username entered"), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).arg("SUCCESS: 'Auth' username entered"), GlobalConfig->debug );
if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Send password..." ), GlobalConfig->debug );
@@ -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" ).tqarg("'need username/password'"), GlobalConfig->debug );
+ // GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message, 2. step" ).arg("'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" ).tqarg("'HTTP Proxy password'"), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).arg("'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" ).tqarg("SUCCESS: 'HTTP Proxy' username entered"), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).arg("SUCCESS: 'HTTP Proxy' username entered"), GlobalConfig->debug );
if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Send HTTP Proxy password..." ), GlobalConfig->debug );
@@ -486,7 +486,7 @@ void OpenvpnManagementHandler::socketReadyRead()
{
if ( GlobalConfig->KvpncDebugLevel > 2 )
- GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).tqarg("'private key password'"), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).arg("'private key password'"), GlobalConfig->debug );
if ( !GlobalConfig->currentProfile->getPrivateKeyPass().isEmpty() )
{
@@ -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)!" ).tqarg( i18n( "user password" ) ) , GlobalConfig->error );
+ GlobalConfig->appendLogEntry( i18n( "Authentication failed (%1)!" ).arg( 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)!" ).tqarg( i18n( "CA certificate" ) ) , GlobalConfig->error );
+ GlobalConfig->appendLogEntry( i18n( "Certificate load failed (%1)!" ).arg( 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.").tqarg(line.section(' ',3,3).remove('\'')) , GlobalConfig->error );
+ 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( "Hash algorithm not found (%1)!" ).tqarg(line.section(' ',3,3).remove('\'') ) , GlobalConfig->error );
+ GlobalConfig->appendLogEntry( i18n( "Hash algorithm not found (%1)!" ).arg(line.section(' ',3,3).remove('\'') ) , GlobalConfig->error );
abort = true;
}
@@ -682,7 +682,7 @@ void OpenvpnManagementHandler::socketReadyRead()
GlobalConfig->TmpPrivateKeyPass = "";
EnterXauthInteractivePasscodeDialog dlg( 0);
dlg.setCaption( i18n( "Enter token pin" ) );
- dlg.main->DescriptionLabel->setText( i18n( "Enter eToken pin for unlocking token \"%1\":" ).tqarg(GlobalConfig->currentProfile->getPkcs11Id()) );
+ dlg.main->DescriptionLabel->setText( i18n( "Enter eToken pin for unlocking token \"%1\":" ).arg(GlobalConfig->currentProfile->getPkcs11Id()) );
dlg.main->LabelPassword->setText( i18n( "eToken pin:" ) );
dlg.main->SavePasswordCheckBox->hide();
dlg.main->adjustSize();
@@ -727,7 +727,7 @@ 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" ).tqarg("SUCCESS for 'eToken token' password"), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).arg("SUCCESS for 'eToken token' password"), GlobalConfig->debug );
}
else if ( line.find( ">PASSWORD:Need '", 0, FALSE) > -1 && line.find( "token' password", 0, FALSE ) > -1)
@@ -738,7 +738,7 @@ void OpenvpnManagementHandler::socketReadyRead()
TQString TokenName = line.section('\'',1,1);
if ( GlobalConfig->KvpncDebugLevel > 4 )
{
- GlobalConfig->appendLogEntry ( "[openvpn] " + i18n( "token name detected: %1\n" ).tqarg(TokenName), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( "[openvpn] " + i18n( "token name detected: %1\n" ).arg(TokenName), GlobalConfig->debug );
}
TQTextStream os( socket );
@@ -747,7 +747,7 @@ void OpenvpnManagementHandler::socketReadyRead()
GlobalConfig->TmpPrivateKeyPass = "";
EnterXauthInteractivePasscodeDialog dlg( 0);
dlg.setCaption( i18n( "Enter token pin" ) );
- dlg.main->DescriptionLabel->setText( i18n( "Enter pin for unlocking token \"%1\":" ).tqarg(GlobalConfig->currentProfile->getPkcs11Id()) );
+ dlg.main->DescriptionLabel->setText( i18n( "Enter pin for unlocking token \"%1\":" ).arg(GlobalConfig->currentProfile->getPkcs11Id()) );
dlg.main->LabelPassword->setText( i18n( "PIN:" ) );
dlg.main->SavePasswordCheckBox->hide();
dlg.main->adjustSize();
@@ -794,23 +794,23 @@ void OpenvpnManagementHandler::socketReadyRead()
TQString TokenName = line.section('\'',1,1);
if ( GlobalConfig->KvpncDebugLevel > 4 )
{
- GlobalConfig->appendLogEntry ( "[openvpn] " + i18n( "token name detected: %1\n" ).tqarg(TokenName), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( "[openvpn] " + i18n( "token name detected: %1\n" ).arg(TokenName), GlobalConfig->debug );
}
if ( GlobalConfig->KvpncDebugLevel > 1 )
- GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).tqarg("SUCCESS for '%1' password").tqarg(TokenName), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).arg("SUCCESS for '%1' password").arg(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" ).tqarg("SUCCESS for user password"), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).arg("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" ).tqarg("token-insertion-request"), GlobalConfig->debug );
- KMessageBox::error ( 0, i18n("Token \"%1\" is not inserted!").tqarg(GlobalConfig->currentProfile->getPkcs11Id()), i18n("Token missing") );
+ 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") );
abort = true;
}
@@ -818,7 +818,7 @@ void OpenvpnManagementHandler::socketReadyRead()
{
if ( GlobalConfig->KvpncDebugLevel > 1 )
- GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).tqarg("SUCCESS for 'Private Key' password"), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).arg("SUCCESS for 'Private Key' password"), GlobalConfig->debug );
}
else if ( line.find( "external program fork failed", 0, FALSE ) > -1 )
{
@@ -830,7 +830,7 @@ void OpenvpnManagementHandler::socketReadyRead()
else
{
if ( GlobalConfig->KvpncDebugLevel > 1 )
- GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got other management message: %1" ).tqarg(line), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got other management message: %1" ).arg(line), GlobalConfig->debug );
}
if (abort)
{
@@ -861,7 +861,7 @@ void OpenvpnManagementHandler::socketReadyRead()
{
if ( GlobalConfig->KvpncDebugLevel > 4 )
{
- GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Socket state is strange: %1" ).tqarg( TQString().setNum( socket->state() ) ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Socket state is strange: %1" ).arg( TQString().setNum( socket->state() ) ), GlobalConfig->debug );
}
}
}
@@ -888,7 +888,7 @@ bool OpenvpnManagementHandler::doConnect()
{
if ( GlobalConfig->KvpncDebugLevel > 1 )
{
- GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Connecting to the OpenVPN manage port (%1)..." ).tqarg( TQString().setNum( GlobalConfig->OpenvpnManagementPort ) ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Connecting to the OpenVPN manage port (%1)..." ).arg( TQString().setNum( GlobalConfig->OpenvpnManagementPort ) ), GlobalConfig->debug );
}
socket->connectToHost( "127.0.0.1", GlobalConfig->OpenvpnManagementPort );
@@ -919,7 +919,7 @@ void OpenvpnManagementHandler::hostFound()
// KMessageBox::error ( 0, TQString("bar"), TQString("foo") );
if ( GlobalConfig->KvpncDebugLevel > 1 )
{
- GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Connecting to the OpenVPN manage port (%1)... host found" ).tqarg( TQString().setNum( GlobalConfig->OpenvpnManagementPort ) ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Connecting to the OpenVPN manage port (%1)... host found" ).arg( TQString().setNum( GlobalConfig->OpenvpnManagementPort ) ), GlobalConfig->debug );
}
}
diff --git a/src/preferencesdialog.cpp b/src/preferencesdialog.cpp
index 4ea5460..7b05675 100644
--- a/src/preferencesdialog.cpp
+++ b/src/preferencesdialog.cpp
@@ -44,7 +44,7 @@
#include <klistview.h>
#include <ktextedit.h>
#include <kpassdlg.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqhbox.h>
#include <tqcursor.h>
#include <tqradiobutton.h>
@@ -66,7 +66,7 @@ PreferencesDialog::PreferencesDialog( TQWidget *parent, TQApplication *app, TQTe
//main = new PreferencesDialogBase(this);
//setMainWidget(main);
- //main->setMinimumSize(main->tqsizeHint())
+ //main->setMinimumSize(main->sizeHint())
this->AccountList = GlobalConfig->AccountList;
this->LogOutput = LogOutput;
@@ -527,12 +527,12 @@ PreferencesDialog::PreferencesDialog( TQWidget *parent, TQApplication *app, TQTe
// TODO read types from list
ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "Cisco (vpnc)" ), VpnAccountData::cisco );
- 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( "IPSec (%1)" ).arg("racoon"), VpnAccountData::racoon );
+ ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "IPSec (%1)" ).arg("Openswan/strongSwan"), VpnAccountData::freeswan );
ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "PPTP" ), VpnAccountData::pptp );
ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "OpenVPN" ), VpnAccountData::openvpn );
- 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( "L2TP (%1)" ).arg("racoon"), VpnAccountData::l2tpd_racoon );
+ ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "L2TP (%1)" ).arg("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 );
@@ -1003,7 +1003,7 @@ void PreferencesDialog::setupGui()
path.clear();
path << i18n( "Programs" ) << i18n( "Daemons" );
DaemonOptionsFrame = addVBoxPage( path, i18n( "Daemons" ), BarIcon( "fork", KIcon::SizeSmall ) );
-// DaemonOptionsFrame->resize(DaemonOptionsFrame->tqsizeHint());
+// DaemonOptionsFrame->resize(DaemonOptionsFrame->sizeHint());
// lo = new TQVBoxLayout( DaemonOptionsFrame );
DaemonScrollView = new TQScrollView(DaemonOptionsFrame, "daemonscrollview");
lo = new TQVBoxLayout( DaemonScrollView );
@@ -1016,10 +1016,10 @@ void PreferencesDialog::setupGui()
// DaemonScrollView->adjustSize();
- TQSize deamonsize = ConfigDaemonOptionsWidget->tqsizeHint();
+ TQSize deamonsize = ConfigDaemonOptionsWidget->sizeHint();
ConfigDaemonOptionsWidget->resize(TQSize(deamonsize.width()-4,deamonsize.height()));
ConfigDaemonOptionsWidget->setFixedSize(TQSize(deamonsize.width()-4,deamonsize.height()));
-// DaemonScrollView->resize(sv->tqsizeHint());
+// DaemonScrollView->resize(sv->sizeHint());
// lo->addWidget( DaemonScrollView );
// DaemonFrame->adjustSize();
@@ -1471,7 +1471,7 @@ void PreferencesDialog::setupGui()
//if (GlobalConfig->KvpncDebugLevel > 2)
//{
- // GlobalConfig->appendLogEntry(i18n("SSH files: %1").tqarg(KeyFiles.join(",")),GlobalConfig->debug);
+ // GlobalConfig->appendLogEntry(i18n("SSH files: %1").arg(KeyFiles.join(",")),GlobalConfig->debug);
//}
if (KeyFiles.size() > 1)
@@ -1481,13 +1481,13 @@ void PreferencesDialog::setupGui()
TQString item = TQString(*it);
if (GlobalConfig->KvpncDebugLevel > 2)
{
- GlobalConfig->appendLogEntry(i18n("processing entry: %1").tqarg(item),GlobalConfig->debug);
+ GlobalConfig->appendLogEntry(i18n("processing entry: %1").arg(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").tqarg(*it),GlobalConfig->debug);
+ GlobalConfig->appendLogEntry(i18n("SSH key found: %1").arg(*it),GlobalConfig->debug);
}
ProfileSshOptionsWidget->SshKeyComboBox->insertItem(*it);
}
@@ -1583,7 +1583,7 @@ void PreferencesDialog::setupGui()
// DaemonScrollView->adjustSize();
// DaemonScrollView->updateContents();
// ConfigDaemonOptionsWidget->resize(ConfigDaemonOptionsWidget->height(),DaemonScrollView->visibleWidth()-100);
- ConfigDaemonOptionsWidget->tqsizeHint();
+ ConfigDaemonOptionsWidget->sizeHint();
}
// CertScrollView->adjustSize();
// CertScrollView->updateContents();
@@ -1760,7 +1760,7 @@ void PreferencesDialog::connectionTypeChanged( int type )
if ( GlobalConfig->KvpncDebugLevel > 1 )
- GlobalConfig->appendLogEntry( i18n( "connectionTypeChanged(): %1" ).tqarg( TQString().setNum( type ) ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( i18n( "connectionTypeChanged(): %1" ).arg( TQString().setNum( type ) ), GlobalConfig->debug );
// KMessageBox::information(0,"connection type changed: "+TQString().setNum(type),TQString("type set"));
@@ -1832,27 +1832,27 @@ void PreferencesDialog::connectionTypeChanged( int type )
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
- GlobalConfig->appendLogEntry( i18n( "New type: %1" ).tqarg( "racoon" ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( i18n( "New type: %1" ).arg( "racoon" ), GlobalConfig->debug );
}
else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_racoon )
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
- GlobalConfig->appendLogEntry( i18n( "New type: %1" ).tqarg( "l2tpd (racoon)" ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( i18n( "New type: %1" ).arg( "l2tpd (racoon)" ), GlobalConfig->debug );
}
else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan )
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
- GlobalConfig->appendLogEntry( i18n( "New type: %1" ).tqarg( "ipsec (openswan/strongswan)" ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( i18n( "New type: %1" ).arg( "ipsec (openswan/strongswan)" ), GlobalConfig->debug );
}
else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_freeswan )
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
- GlobalConfig->appendLogEntry( i18n( "New type: %1" ).tqarg( "l2tpd (openswan/strongswan)" ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( i18n( "New type: %1" ).arg( "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" ).tqarg( "openvpn" ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( i18n( "new type: %1" ).arg( "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" ).tqarg( "Vtun" ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( i18n( "new type: %1" ).arg( "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" ).tqarg( "SSH" ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( i18n( "new type: %1" ).arg( "SSH" ), GlobalConfig->debug );
ProfileNetworkGeneralOptionsWidget->RemoteNetAddrLineEdit->setEnabled( false );
ProfileNetworkGeneralOptionsWidget->LabelRemoteNetwork->setEnabled( false );
@@ -2004,7 +2004,7 @@ void PreferencesDialog::authTypeChanged( int authtype )
authtype = VpnAccountData::hybrid;
}
}
- GlobalConfig->appendLogEntry( i18n( "authtype changed by %1." ).tqarg( "ProfileCertOptionsWidget" ) , GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( i18n( "authtype changed by %1." ).arg( "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." ).tqarg( "ProfilePskOptionsWidget" ) , GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( i18n( "authtype changed by %1." ).arg( "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" ))
@@ -2055,7 +2055,7 @@ void PreferencesDialog::authTypeChanged( int authtype )
type ="unknown auth";
- GlobalConfig->appendLogEntry( i18n( "New authtype: \"%1\"." ).tqarg( type ) , GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( i18n( "New authtype: \"%1\"." ).arg( type ) , GlobalConfig->debug );
}
ProfilePskOptionsWidget->PskGroupBox->setEnabled( false );
@@ -2471,7 +2471,7 @@ void PreferencesDialog::profileChanged( const TQString& itemtext )
ProfileCmdExecAfterDisconnectSelector->setCurrentText( lastProfileName );
if ( GlobalConfig->KvpncDebugLevel > 0 )
- GlobalConfig->appendLogEntry( i18n( "New profile: %1" ).tqarg( Name ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( i18n( "New profile: %1" ).arg( Name ), GlobalConfig->debug );
profileHasChanged=true;
NewProfileName = Name;
@@ -2541,14 +2541,14 @@ void PreferencesDialog::profileChanged( const TQString& itemtext )
ProfileNetworkGeneralOptionsWidget->NetworkDeviceComboBox->setCurrentText( "default" );
if ( GlobalConfig->KvpncDebugLevel > 2 )
- GlobalConfig->appendLogEntry( i18n( "profile \"%1\": no network device defined, using \"default\"." ).tqarg( it->getName() ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( i18n( "profile \"%1\": no network device defined, using \"default\"." ).arg( it->getName() ), GlobalConfig->debug );
}
else
{
ProfileNetworkGeneralOptionsWidget->NetworkDeviceComboBox->setCurrentText( it->getNetworkDevice() );
if ( GlobalConfig->KvpncDebugLevel > 2 )
- GlobalConfig->appendLogEntry( i18n( "profile \"%1\": network device defined, using \"%2\"." ).tqarg( it->getName() ).tqarg( it->getNetworkDevice() ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( i18n( "profile \"%1\": network device defined, using \"%2\"." ).arg( it->getName() ).arg( it->getNetworkDevice() ), GlobalConfig->debug );
}
ProfileGeneralOptionsWidget->ConnectionTypeComboBox->setCurrentItem( it->getConnectionType() );
@@ -2659,7 +2659,7 @@ void PreferencesDialog::profileChanged( const TQString& itemtext )
ProfileCertOptionsWidget->LabelPrivateKeyPassword->setText(i18n("Private key passphrase:"));
ProfileCertOptionsWidget->LabelCertificate->setText(i18n("Certificate:"));
ProfileCertOptionsWidget->x509certURLRequester->show();
- ProfileCertOptionsWidget->x509certURLRequester->tqsizeHint();
+ ProfileCertOptionsWidget->x509certURLRequester->sizeHint();
ProfileCertOptionsWidget->x509certComboBox->hide();
ProfileCertOptionsWidget->UseCiscoCertStoreCheckBox->hide();
ProfileCertOptionsWidget->VerifyCaCertCheckBox->setEnabled(false);
@@ -2767,8 +2767,8 @@ void PreferencesDialog::profileChanged( const TQString& itemtext )
ProfileCertOptionsWidget->x509certComboBox->show();
ProfileCertOptionsWidget->CaCertpathURLRequester->hide();
ProfileCertOptionsWidget->CaCertpathComboBox->show();
- ProfileCertOptionsWidget->x509certComboBox->tqsizeHint();
- ProfileCertOptionsWidget->tqsizeHint();
+ ProfileCertOptionsWidget->x509certComboBox->sizeHint();
+ ProfileCertOptionsWidget->sizeHint();
ProfileCertOptionsWidget->UseCiscoCertStoreCheckBox->setChecked(true);
}
else
@@ -2777,8 +2777,8 @@ void PreferencesDialog::profileChanged( const TQString& itemtext )
ProfileCertOptionsWidget->CaCertpathURLRequester->show();
ProfileCertOptionsWidget->x509certComboBox->hide();
ProfileCertOptionsWidget->CaCertpathComboBox->hide();
- ProfileCertOptionsWidget->x509certComboBox->tqsizeHint();
- ProfileCertOptionsWidget->tqsizeHint();
+ ProfileCertOptionsWidget->x509certComboBox->sizeHint();
+ ProfileCertOptionsWidget->sizeHint();
ProfileCertOptionsWidget->UseCiscoCertStoreCheckBox->setChecked(false);
}
@@ -2886,7 +2886,7 @@ void PreferencesDialog::profileChanged( const TQString& 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." ).tqarg( "vpnc" ).tqarg( "0.3.x" ), GlobalConfig->error );
+ GlobalConfig->appendLogEntry( i18n( "%1 is too old. Minimum requirement is %2, disabling Xauth interactive option." ).arg( "vpnc" ).arg( "0.3.x" ), GlobalConfig->error );
ProfileCiscoOptionsWidget->UseXauthInteractiveCheckBox->setEnabled( false );
}
@@ -5714,7 +5714,7 @@ void PreferencesDialog::saveSessionClicked()
if (ProfileSshOptionsWidget->UseSshConfigRemoteScriptCheckBox->isChecked() && ProfileSshOptionsWidget->SshConfigRemoteScriptLineEdit->text().isEmpty())
{
- KMessageBox::error ( this, i18n( "%1 cant be empty!" ).tqarg(i18n("ssh config remote script")), i18n( "%1 empty" ).tqarg(i18n("ssh config remote script")) );
+ KMessageBox::error ( this, i18n( "%1 cant be empty!" ).arg(i18n("ssh config remote script")), i18n( "%1 empty" ).arg(i18n("ssh config remote script")) );
IPOk=false;
}
@@ -5996,7 +5996,7 @@ void PreferencesDialog::saveSessionClicked()
GlobalConfig->config->sync();
GlobalConfig->appPointer->restoreOverrideCursor();
- //GlobalConfig->appendLogEntry( i18n( "Profile \"%1\" saved." ).tqarg( newName ),GlobalConfig->debug);
+ //GlobalConfig->appendLogEntry( i18n( "Profile \"%1\" saved." ).arg( newName ),GlobalConfig->debug);
// enableButtonApply(false);
}
@@ -6049,7 +6049,7 @@ 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() ).tqarg(TypeString).tqarg(GlobalConfig->currentProfile->getGateway()), i18n ( "Delete?" ), KStdGuiItem::del(), KStdGuiItem::cancel() );
+ 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: "+ TQString().setNum(result) ) ;
if ( result == 3 ) // Yes
{
@@ -6122,12 +6122,12 @@ void PreferencesDialog::deleteSessionClicked()
// CommandExecutionGroupBox->setEnabled( false );
}
- // slotStatusMsg ( i18n( "Profile \"%1\" deleted." ).tqarg( Name ), ID_FLASH_MSG );
+ // slotStatusMsg ( i18n( "Profile \"%1\" deleted." ).arg( Name ), ID_FLASH_MSG );
profileAddedOrDeleted = true;
saveSessionClicked();
GlobalConfig->removeEntry( Name );
- GlobalConfig->appendLogEntry ( i18n( "Profile \"%1\" deleted." ).tqarg( Name ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( i18n( "Profile \"%1\" deleted." ).arg( Name ), GlobalConfig->debug );
//saveOptions(); // TODO save, currently after closing dialog
@@ -6160,7 +6160,7 @@ void PreferencesDialog::newSessionClicked()
if ( ( it != GlobalConfig->currentProfile ) && ( it->getName() == newName ) )
{
//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::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).arg( 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:" ), TQString ( Oldname + "_2" ), &ok );
@@ -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." ).tqarg( newName ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( i18n( "New created profile \"%1\" found in profile list." ).arg( 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." ).tqarg( newName ), i18n( "Complete Profile" ) );
- //slotStatusMsg ( i18n( "Profile \"%1\" added." ).tqarg( 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." ).arg( newName ), i18n( "Complete Profile" ) );
+ //slotStatusMsg ( i18n( "Profile \"%1\" added." ).arg( Name ), ID_FLASH_MSG );
- GlobalConfig->appendLogEntry ( i18n( "Profile \"%1\" added." ).tqarg( newName ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( i18n( "Profile \"%1\" added." ).arg( newName ), GlobalConfig->debug );
profileAddedOrDeleted = true;
configChanged=true;
NewProfileName = newName;
@@ -6357,8 +6357,8 @@ void PreferencesDialog::renameSessionClicked()
saveSessionClicked();
GlobalConfig->removeEntry( oldName );
- 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 );
+ 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 );
}
@@ -6863,19 +6863,19 @@ void PreferencesDialog::detectPkcs11Ids()
Pkcs11IdTypeTmp="id";
if (KvpncDebugLevel > 1)
- GlobalConfig->appendLogEntry(i18n("Pkcs11IdType: %1").tqarg(Pkcs11IdTypeTmp),KVpncConfig::debug);
+ GlobalConfig->appendLogEntry(i18n("Pkcs11IdType: %1").arg(Pkcs11IdTypeTmp),KVpncConfig::debug);
}
else if (Pkcs11IdType == 1)
{
Pkcs11IdTypeTmp="label";
if (KvpncDebugLevel > 1)
- GlobalConfig->appendLogEntry(i18n("Pkcs11IdType: %1").tqarg(Pkcs11IdTypeTmp),KVpncConfig::debug);
+ GlobalConfig->appendLogEntry(i18n("Pkcs11IdType: %1").arg(Pkcs11IdTypeTmp),KVpncConfig::debug);
}
else
{
Pkcs11IdTypeTmp="subject";
if (KvpncDebugLevel > 1)
- GlobalConfig->appendLogEntry(i18n("Pkcs11IdType: %1").tqarg(Pkcs11IdTypeTmp),KVpncConfig::debug);
+ GlobalConfig->appendLogEntry(i18n("Pkcs11IdType: %1").arg(Pkcs11IdTypeTmp),KVpncConfig::debug);
}
TQString ProviderLib="";
@@ -7071,7 +7071,7 @@ void PreferencesDialog::useCiscoCertStoreToggled(bool)
ProfileCertOptionsWidget->CaCertpathComboBox->show();
ProfileCertOptionsWidget->CaCertpathURLRequester->hide();
ProfileCertOptionsWidget->certpathURLRequester->hide();
- ProfileCertOptionsWidget->tqsizeHint();
+ ProfileCertOptionsWidget->sizeHint();
}
else
{
@@ -7080,7 +7080,7 @@ void PreferencesDialog::useCiscoCertStoreToggled(bool)
ProfileCertOptionsWidget->CaCertpathComboBox->hide();
ProfileCertOptionsWidget->CaCertpathURLRequester->show();
ProfileCertOptionsWidget->certpathURLRequester->show();
- ProfileCertOptionsWidget->tqsizeHint();
+ ProfileCertOptionsWidget->sizeHint();
}
}
@@ -7092,7 +7092,7 @@ bool PreferencesDialog::getVpncHasHybridSupport()
{
if (tool->Name == "vpnc")
{
- GlobalConfig->appendLogEntry ( i18n ( "vpnc capabilities: %1" ).tqarg( tool->Capabilities),GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( i18n ( "vpnc capabilities: %1" ).arg( tool->Capabilities),GlobalConfig->debug );
if( tool->Capabilities.find(i18n("openssl (certificate) support"),0,-1) > -1 )
{
hasHybridSupport = true;
diff --git a/src/preferencesdialog.h b/src/preferencesdialog.h
index ff89dea..0d3ef35 100644
--- a/src/preferencesdialog.h
+++ b/src/preferencesdialog.h
@@ -24,7 +24,7 @@
#include <tqptrlist.h>
#include <tqstringlist.h>
-#include <tqtextedit.h>
+#include <textedit.h>
#include <tqcolor.h>
#include <tqscrollview.h>
diff --git a/src/profilecertoptionsbase.ui b/src/profilecertoptionsbase.ui
index f022efd..2b81673 100644
--- a/src/profilecertoptionsbase.ui
+++ b/src/profilecertoptionsbase.ui
@@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout43</cstring>
+ <cstring>layout43</cstring>
</property>
<hbox>
<property name="name">
@@ -37,7 +37,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout42</cstring>
+ <cstring>layout42</cstring>
</property>
<vbox>
<property name="name">
@@ -45,7 +45,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout41</cstring>
+ <cstring>layout41</cstring>
</property>
<grid>
<property name="name">
@@ -53,7 +53,7 @@
</property>
<widget class="TQLayoutWidget" row="10" column="0">
<property name="name">
- <cstring>tqlayout65</cstring>
+ <cstring>layout65</cstring>
</property>
<hbox>
<property name="name">
@@ -80,7 +80,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>80</width>
<height>21</height>
@@ -91,7 +91,7 @@
</widget>
<widget class="TQLayoutWidget" row="9" column="1">
<property name="name">
- <cstring>tqlayout63</cstring>
+ <cstring>layout63</cstring>
</property>
<hbox>
<property name="name">
@@ -107,7 +107,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>20</height>
@@ -129,7 +129,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout38</cstring>
+ <cstring>layout38</cstring>
</property>
<hbox>
<property name="name">
@@ -153,7 +153,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>330</width>
<height>20</height>
@@ -180,7 +180,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<hbox>
<property name="name">
@@ -204,7 +204,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>115</width>
<height>20</height>
@@ -215,7 +215,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="1">
<property name="name">
- <cstring>tqlayout81</cstring>
+ <cstring>layout81</cstring>
</property>
<hbox>
<property name="name">
@@ -225,7 +225,7 @@
<property name="name">
<cstring>x509certURLRequester</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>50</width>
<height>0</height>
@@ -244,7 +244,7 @@
</widget>
<widget class="TQLayoutWidget" row="8" column="0">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@@ -268,7 +268,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>75</width>
<height>20</height>
@@ -279,7 +279,7 @@
</widget>
<widget class="TQLayoutWidget" row="11" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout41</cstring>
+ <cstring>layout41</cstring>
</property>
<hbox>
<property name="name">
@@ -295,7 +295,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>31</height>
@@ -339,7 +339,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>267</width>
<height>21</height>
@@ -348,7 +348,7 @@
</spacer>
<widget class="TQLayoutWidget" row="7" column="0">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@@ -372,7 +372,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>109</width>
<height>20</height>
@@ -383,7 +383,7 @@
</widget>
<widget class="TQLayoutWidget" row="4" column="1">
<property name="name">
- <cstring>tqlayout37</cstring>
+ <cstring>layout37</cstring>
</property>
<hbox>
<property name="name">
@@ -406,7 +406,7 @@
</widget>
<widget class="TQLayoutWidget" row="10" column="1">
<property name="name">
- <cstring>tqlayout63_2</cstring>
+ <cstring>layout63_2</cstring>
</property>
<hbox>
<property name="name">
@@ -422,7 +422,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>20</height>
@@ -447,7 +447,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout6_2</cstring>
+ <cstring>layout6_2</cstring>
</property>
<hbox>
<property name="name">
@@ -474,7 +474,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -496,7 +496,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="0">
<property name="name">
- <cstring>tqlayout10</cstring>
+ <cstring>layout10</cstring>
</property>
<hbox>
<property name="name">
@@ -520,7 +520,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>152</width>
<height>20</height>
@@ -531,7 +531,7 @@
</widget>
<widget class="TQLayoutWidget" row="4" column="0">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<hbox>
<property name="name">
@@ -555,7 +555,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>93</width>
<height>20</height>
@@ -566,7 +566,7 @@
</widget>
<widget class="TQLayoutWidget" row="6" column="0">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@@ -593,7 +593,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -620,7 +620,7 @@
</widget>
<widget class="TQLayoutWidget" row="9" column="0">
<property name="name">
- <cstring>tqlayout64</cstring>
+ <cstring>layout64</cstring>
</property>
<hbox>
<property name="name">
@@ -647,7 +647,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>100</width>
<height>20</height>
@@ -668,7 +668,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>19</height>
@@ -687,7 +687,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
diff --git a/src/profileciscooptionsbase.ui b/src/profileciscooptionsbase.ui
index 485a185..5fae0fd 100644
--- a/src/profileciscooptionsbase.ui
+++ b/src/profileciscooptionsbase.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout42</cstring>
+ <cstring>layout42</cstring>
</property>
<vbox>
<property name="name">
@@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout41</cstring>
+ <cstring>layout41</cstring>
</property>
<grid>
<property name="name">
@@ -37,7 +37,7 @@
</property>
<widget class="TQLayoutWidget" row="1" column="1">
<property name="name">
- <cstring>tqlayout15</cstring>
+ <cstring>layout15</cstring>
</property>
<hbox>
<property name="name">
@@ -64,7 +64,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>131</width>
<height>20</height>
@@ -86,7 +86,7 @@
</widget>
<widget class="TQLayoutWidget" row="5" column="0">
<property name="name">
- <cstring>tqlayout36</cstring>
+ <cstring>layout36</cstring>
</property>
<hbox>
<property name="name">
@@ -116,7 +116,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>121</width>
<height>21</height>
@@ -127,7 +127,7 @@
</widget>
<widget class="TQLayoutWidget" row="4" column="0">
<property name="name">
- <cstring>tqlayout16</cstring>
+ <cstring>layout16</cstring>
</property>
<hbox>
<property name="name">
@@ -154,7 +154,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>81</width>
<height>21</height>
@@ -182,7 +182,7 @@
</widget>
<widget class="TQLayoutWidget" row="4" column="1">
<property name="name">
- <cstring>tqlayout35_2</cstring>
+ <cstring>layout35_2</cstring>
</property>
<hbox>
<property name="name">
@@ -215,7 +215,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>91</width>
<height>21</height>
@@ -226,7 +226,7 @@
</widget>
<widget class="TQLayoutWidget" row="7" column="0">
<property name="name">
- <cstring>tqlayout26</cstring>
+ <cstring>layout26</cstring>
</property>
<hbox>
<property name="name">
@@ -250,7 +250,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>87</width>
<height>20</height>
@@ -286,7 +286,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout22</cstring>
+ <cstring>layout22</cstring>
</property>
<hbox>
<property name="name">
@@ -310,7 +310,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>50</width>
<height>20</height>
@@ -329,7 +329,7 @@
</widget>
<widget class="TQLayoutWidget" row="6" column="1">
<property name="name">
- <cstring>tqlayout18</cstring>
+ <cstring>layout18</cstring>
</property>
<hbox>
<property name="name">
@@ -359,7 +359,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -396,7 +396,7 @@ dh18 = modp8192 (racoon only)</string>
</widget>
<widget class="TQLayoutWidget" row="3" column="1">
<property name="name">
- <cstring>tqlayout35</cstring>
+ <cstring>layout35</cstring>
</property>
<hbox>
<property name="name">
@@ -426,7 +426,7 @@ dh18 = modp8192 (racoon only)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>91</width>
<height>21</height>
@@ -451,7 +451,7 @@ dh18 = modp8192 (racoon only)</string>
</widget>
<widget class="TQLayoutWidget" row="6" column="0">
<property name="name">
- <cstring>tqlayout17</cstring>
+ <cstring>layout17</cstring>
</property>
<hbox>
<property name="name">
@@ -481,7 +481,7 @@ dh18 = modp8192 (racoon only)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>141</width>
<height>21</height>
@@ -528,7 +528,7 @@ dh18 = modp8192 (only racoon)</string>
</widget>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
- <cstring>tqlayout40</cstring>
+ <cstring>layout40</cstring>
</property>
<hbox>
<property name="name">
@@ -558,7 +558,7 @@ dh18 = modp8192 (only racoon)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -569,7 +569,7 @@ dh18 = modp8192 (only racoon)</string>
</widget>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout118</cstring>
+ <cstring>layout118</cstring>
</property>
<hbox>
<property name="name">
@@ -577,7 +577,7 @@ dh18 = modp8192 (only racoon)</string>
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<hbox>
<property name="name">
@@ -595,7 +595,7 @@ dh18 = modp8192 (only racoon)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>439</width>
<height>21</height>
@@ -606,7 +606,7 @@ dh18 = modp8192 (only racoon)</string>
</widget>
<widget class="TQLayoutWidget" row="7" column="1">
<property name="name">
- <cstring>tqlayout40</cstring>
+ <cstring>layout40</cstring>
</property>
<hbox>
<property name="name">
@@ -639,7 +639,7 @@ dh18 = modp8192 (only racoon)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>20</height>
@@ -676,7 +676,7 @@ dh18 = modp8192 (only racoon)</string>
</widget>
<widget class="TQLayoutWidget" row="2" column="1">
<property name="name">
- <cstring>tqlayout39</cstring>
+ <cstring>layout39</cstring>
</property>
<hbox>
<property name="name">
@@ -706,7 +706,7 @@ dh18 = modp8192 (only racoon)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>81</width>
<height>21</height>
@@ -727,7 +727,7 @@ dh18 = modp8192 (only racoon)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>37</height>
diff --git a/src/profilecmdexecafterconnectoptionsbase.ui b/src/profilecmdexecafterconnectoptionsbase.ui
index ab5f343..1f6ab22 100644
--- a/src/profilecmdexecafterconnectoptionsbase.ui
+++ b/src/profilecmdexecafterconnectoptionsbase.ui
@@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<vbox>
<property name="name">
@@ -59,7 +59,7 @@
<property name="enabled">
<bool>false</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>300</height>
@@ -77,7 +77,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@@ -101,7 +101,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>111</width>
<height>20</height>
diff --git a/src/profilecmdexecafterdisconnectoptionsbase.ui b/src/profilecmdexecafterdisconnectoptionsbase.ui
index 0091871..e3c89df 100644
--- a/src/profilecmdexecafterdisconnectoptionsbase.ui
+++ b/src/profilecmdexecafterdisconnectoptionsbase.ui
@@ -51,7 +51,7 @@
<property name="enabled">
<bool>false</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>300</height>
diff --git a/src/profilecmdexecbeforeconnectoptionsbase.ui b/src/profilecmdexecbeforeconnectoptionsbase.ui
index c959b53..08c2a50 100644
--- a/src/profilecmdexecbeforeconnectoptionsbase.ui
+++ b/src/profilecmdexecbeforeconnectoptionsbase.ui
@@ -51,7 +51,7 @@
<property name="enabled">
<bool>false</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>300</height>
diff --git a/src/profilecmdexecbeforedisconnectoptionsbase.ui b/src/profilecmdexecbeforedisconnectoptionsbase.ui
index 84aa977..c53b10f 100644
--- a/src/profilecmdexecbeforedisconnectoptionsbase.ui
+++ b/src/profilecmdexecbeforedisconnectoptionsbase.ui
@@ -51,7 +51,7 @@
<property name="enabled">
<bool>false</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>300</height>
diff --git a/src/profilegeneraloptionsbase.ui b/src/profilegeneraloptionsbase.ui
index 59bc6b0..ee81910 100644
--- a/src/profilegeneraloptionsbase.ui
+++ b/src/profilegeneraloptionsbase.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout49</cstring>
+ <cstring>layout49</cstring>
</property>
<vbox>
<property name="name">
@@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout48</cstring>
+ <cstring>layout48</cstring>
</property>
<grid>
<property name="name">
@@ -98,7 +98,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>70</height>
@@ -107,7 +107,7 @@
</spacer>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout11</cstring>
+ <cstring>layout11</cstring>
</property>
<hbox>
<property name="name">
@@ -123,7 +123,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>92</width>
<height>20</height>
diff --git a/src/profileipsecoptionsbase.ui b/src/profileipsecoptionsbase.ui
index 9ecf3ce..33d1d52 100644
--- a/src/profileipsecoptionsbase.ui
+++ b/src/profileipsecoptionsbase.ui
@@ -36,7 +36,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout33</cstring>
+ <cstring>layout33</cstring>
</property>
<hbox>
<property name="name">
@@ -44,7 +44,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout136</cstring>
+ <cstring>layout136</cstring>
</property>
<hbox>
<property name="name">
@@ -68,7 +68,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>199</width>
<height>21</height>
@@ -89,7 +89,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout137</cstring>
+ <cstring>layout137</cstring>
</property>
<hbox>
<property name="name">
@@ -97,7 +97,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout150</cstring>
+ <cstring>layout150</cstring>
</property>
<hbox>
<property name="name">
@@ -121,7 +121,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>28</width>
<height>20</height>
@@ -163,7 +163,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
- <cstring>tqlayout43</cstring>
+ <cstring>layout43</cstring>
</property>
<hbox>
<property name="name">
@@ -193,7 +193,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>160</width>
<height>21</height>
@@ -230,7 +230,7 @@ dh18 = modp8192 (racoon only)</string>
</widget>
<widget class="TQLayoutWidget" row="3" column="0">
<property name="name">
- <cstring>tqlayout20</cstring>
+ <cstring>layout20</cstring>
</property>
<hbox>
<property name="name">
@@ -257,7 +257,7 @@ dh18 = modp8192 (racoon only)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -268,7 +268,7 @@ dh18 = modp8192 (racoon only)</string>
</widget>
<widget class="TQLayoutWidget" row="4" column="0">
<property name="name">
- <cstring>tqlayout22</cstring>
+ <cstring>layout22</cstring>
</property>
<grid>
<property name="name">
@@ -319,7 +319,7 @@ dh18 = modp8192 (racoon only)</string>
</widget>
<widget class="TQLayoutWidget" row="5" column="0">
<property name="name">
- <cstring>tqlayout90</cstring>
+ <cstring>layout90</cstring>
</property>
<hbox>
<property name="name">
@@ -346,7 +346,7 @@ dh18 = modp8192 (racoon only)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>100</width>
<height>20</height>
@@ -357,7 +357,7 @@ dh18 = modp8192 (racoon only)</string>
</widget>
<widget class="TQLayoutWidget" row="6" column="0">
<property name="name">
- <cstring>tqlayout90_2</cstring>
+ <cstring>layout90_2</cstring>
</property>
<hbox>
<property name="name">
@@ -387,7 +387,7 @@ dh18 = modp8192 (racoon only)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>100</width>
<height>20</height>
@@ -406,7 +406,7 @@ dh18 = modp8192 (racoon only)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>82</height>
@@ -428,7 +428,7 @@ dh18 = modp8192 (racoon only)</string>
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout25</cstring>
+ <cstring>layout25</cstring>
</property>
<vbox>
<property name="name">
@@ -436,7 +436,7 @@ dh18 = modp8192 (racoon only)</string>
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout49</cstring>
+ <cstring>layout49</cstring>
</property>
<hbox>
<property name="name">
@@ -444,7 +444,7 @@ dh18 = modp8192 (racoon only)</string>
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout48</cstring>
+ <cstring>layout48</cstring>
</property>
<vbox>
<property name="name">
@@ -452,7 +452,7 @@ dh18 = modp8192 (racoon only)</string>
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout37</cstring>
+ <cstring>layout37</cstring>
</property>
<hbox>
<property name="name">
@@ -476,7 +476,7 @@ dh18 = modp8192 (racoon only)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -567,7 +567,7 @@ dh18 = modp8192 (racoon only)</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout52</cstring>
+ <cstring>layout52</cstring>
</property>
<hbox>
<property name="name">
@@ -594,7 +594,7 @@ dh18 = modp8192 (racoon only)</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout47</cstring>
+ <cstring>layout47</cstring>
</property>
<vbox>
<property name="name">
@@ -602,7 +602,7 @@ dh18 = modp8192 (racoon only)</string>
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout41</cstring>
+ <cstring>layout41</cstring>
</property>
<hbox>
<property name="name">
@@ -629,7 +629,7 @@ dh18 = modp8192 (racoon only)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>61</width>
<height>21</height>
@@ -657,7 +657,7 @@ dh18 = modp8192 (racoon only)</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout46</cstring>
+ <cstring>layout46</cstring>
</property>
<vbox>
<property name="name">
@@ -709,7 +709,7 @@ dh18 = modp8192 (racoon only)</string>
</widget>
<widget class="TQLayoutWidget" row="4" column="0">
<property name="name">
- <cstring>tqlayout53</cstring>
+ <cstring>layout53</cstring>
</property>
<hbox>
<property name="name">
@@ -753,7 +753,7 @@ dh18 = modp8192 (racoon only)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -776,7 +776,7 @@ dh18 = modp8192 (racoon only)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>71</height>
@@ -800,7 +800,7 @@ dh18 = modp8192 (racoon only)</string>
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout26</cstring>
+ <cstring>layout26</cstring>
</property>
<grid>
<property name="name">
@@ -819,7 +819,7 @@ dh18 = modp8192 (racoon only)</string>
</property>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout97</cstring>
+ <cstring>layout97</cstring>
</property>
<hbox>
<property name="name">
@@ -843,7 +843,7 @@ dh18 = modp8192 (racoon only)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>170</width>
<height>20</height>
@@ -868,7 +868,7 @@ dh18 = modp8192 (racoon only)</string>
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout29</cstring>
+ <cstring>layout29</cstring>
</property>
<hbox>
<property name="name">
@@ -892,7 +892,7 @@ dh18 = modp8192 (racoon only)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>137</width>
<height>20</height>
@@ -945,7 +945,7 @@ dh18 = modp8192 (racoon only)</string>
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout74_2</cstring>
+ <cstring>layout74_2</cstring>
</property>
<grid>
<property name="name">
@@ -953,7 +953,7 @@ dh18 = modp8192 (racoon only)</string>
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout73_2</cstring>
+ <cstring>layout73_2</cstring>
</property>
<hbox>
<property name="name">
@@ -977,7 +977,7 @@ dh18 = modp8192 (racoon only)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>20</height>
@@ -1002,7 +1002,7 @@ dh18 = modp8192 (racoon only)</string>
</widget>
<widget class="TQLayoutWidget" row="1" column="0" rowspan="2" colspan="1">
<property name="name">
- <cstring>tqlayout72_2</cstring>
+ <cstring>layout72_2</cstring>
</property>
<hbox>
<property name="name">
@@ -1026,7 +1026,7 @@ dh18 = modp8192 (racoon only)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>20</height>
@@ -1078,7 +1078,7 @@ dh18 = modp8192 (racoon only)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>31</height>
diff --git a/src/profilemanagerbase.cpp b/src/profilemanagerbase.cpp
index 1fdbf6c..03d32f4 100644
--- a/src/profilemanagerbase.cpp
+++ b/src/profilemanagerbase.cpp
@@ -12,7 +12,7 @@
#include "profilemanagerbase.h"
#include <tqvariant.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
@@ -25,11 +25,11 @@ ProfileManagerDialogBase::ProfileManagerDialogBase( TQWidget* parent, const char
{
if ( !name )
setName( "ProfileManagerDialogBase" );
- tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)3, 0, 0, sizePolicy().hasHeightForWidth() ) );
+ setSizePolicy( 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( TQSize(622, 622).expandedTo(tqminimumSizeHint()) );
+ resize( TQSize(622, 622).expandedTo(minimumSizeHint()) );
clearWState( WState_Polished );
}
diff --git a/src/profilenetworkgeneraloptionsbase.ui b/src/profilenetworkgeneraloptionsbase.ui
index 931a9e0..64b2d2c 100644
--- a/src/profilenetworkgeneraloptionsbase.ui
+++ b/src/profilenetworkgeneraloptionsbase.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout60</cstring>
+ <cstring>layout60</cstring>
</property>
<vbox>
<property name="name">
@@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout58</cstring>
+ <cstring>layout58</cstring>
</property>
<hbox>
<property name="name">
@@ -85,7 +85,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>71</width>
<height>20</height>
@@ -136,7 +136,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout59</cstring>
+ <cstring>layout59</cstring>
</property>
<grid>
<property name="name">
@@ -144,7 +144,7 @@
</property>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
- <cstring>tqlayout56</cstring>
+ <cstring>layout56</cstring>
</property>
<hbox>
<property name="name">
@@ -171,7 +171,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>21</height>
@@ -182,7 +182,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout58</cstring>
+ <cstring>layout58</cstring>
</property>
<hbox>
<property name="name">
@@ -201,7 +201,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout44</cstring>
+ <cstring>layout44</cstring>
</property>
<hbox>
<property name="name">
@@ -217,7 +217,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>227</width>
<height>20</height>
@@ -252,7 +252,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>208</width>
<height>20</height>
@@ -279,7 +279,7 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refu
</widget>
<widget class="TQLayoutWidget" row="2" column="1">
<property name="name">
- <cstring>tqlayout55</cstring>
+ <cstring>layout55</cstring>
</property>
<hbox>
<property name="name">
@@ -318,7 +318,7 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refu
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>71</width>
<height>21</height>
@@ -329,7 +329,7 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refu
</widget>
<widget class="TQLayoutWidget" row="1" column="1">
<property name="name">
- <cstring>tqlayout57</cstring>
+ <cstring>layout57</cstring>
</property>
<hbox>
<property name="name">
@@ -348,7 +348,7 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refu
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout22</cstring>
+ <cstring>layout22</cstring>
</property>
<hbox>
<property name="name">
@@ -364,7 +364,7 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refu
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>181</width>
<height>21</height>
@@ -387,7 +387,7 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refu
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout58</cstring>
+ <cstring>layout58</cstring>
</property>
<vbox>
<property name="name">
@@ -420,7 +420,7 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refu
</widget>
<widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
- <cstring>tqlayout77</cstring>
+ <cstring>layout77</cstring>
</property>
<hbox>
<property name="name">
@@ -587,7 +587,7 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refu
<cstring>ConnectionStatusGroupBox</cstring>
</property>
<property name="title">
- <string>Connection tqStatus Check</string>
+ <string>Connection Status Check</string>
</property>
<property name="toolTip" stdset="0">
<string>Options for connection status check</string>
@@ -601,7 +601,7 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refu
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout57</cstring>
+ <cstring>layout57</cstring>
</property>
<hbox>
<property name="name">
@@ -640,7 +640,7 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refu
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>201</width>
<height>20</height>
@@ -674,7 +674,7 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refu
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout118</cstring>
+ <cstring>layout118</cstring>
</property>
<hbox>
<property name="name">
@@ -682,7 +682,7 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refu
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout119</cstring>
+ <cstring>layout119</cstring>
</property>
<hbox>
<property name="name">
@@ -709,7 +709,7 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refu
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>181</width>
<height>20</height>
@@ -733,7 +733,7 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refu
</widget>
<widget class="TQLayoutWidget" row="1" column="1">
<property name="name">
- <cstring>tqlayout117</cstring>
+ <cstring>layout117</cstring>
</property>
<hbox>
<property name="name">
@@ -741,7 +741,7 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refu
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout120</cstring>
+ <cstring>layout120</cstring>
</property>
<hbox>
<property name="name">
@@ -768,7 +768,7 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refu
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>181</width>
<height>20</height>
@@ -795,7 +795,7 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refu
</widget>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@@ -847,7 +847,7 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refu
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>181</width>
<height>21</height>
@@ -856,7 +856,7 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refu
</spacer>
<widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout121</cstring>
+ <cstring>layout121</cstring>
</property>
<hbox>
<property name="name">
@@ -864,7 +864,7 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refu
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout121</cstring>
+ <cstring>layout121</cstring>
</property>
<hbox>
<property name="name">
@@ -903,7 +903,7 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refu
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>64</width>
<height>21</height>
@@ -948,7 +948,7 @@ Diagnosis: path MTU discovery may not be working, due to hosts on the route refu
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
diff --git a/src/profilenetworkhttpproxyoptionsbase.ui b/src/profilenetworkhttpproxyoptionsbase.ui
index 38d71da..b17b2c3 100644
--- a/src/profilenetworkhttpproxyoptionsbase.ui
+++ b/src/profilenetworkhttpproxyoptionsbase.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout65</cstring>
+ <cstring>layout65</cstring>
</property>
<hbox>
<property name="name">
@@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout64</cstring>
+ <cstring>layout64</cstring>
</property>
<vbox>
<property name="name">
@@ -51,7 +51,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<vbox>
<property name="name">
@@ -151,7 +151,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>21</height>
@@ -160,7 +160,7 @@
</spacer>
<widget class="TQLayoutWidget" row="3" column="3">
<property name="name">
- <cstring>tqlayout14</cstring>
+ <cstring>layout14</cstring>
</property>
<hbox>
<property name="name">
@@ -176,7 +176,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>91</width>
<height>21</height>
@@ -203,7 +203,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>150</width>
<height>20</height>
@@ -212,7 +212,7 @@
</spacer>
<widget class="TQLayoutWidget" row="1" column="3">
<property name="name">
- <cstring>tqlayout13</cstring>
+ <cstring>layout13</cstring>
</property>
<hbox>
<property name="name">
@@ -228,7 +228,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>103</width>
<height>21</height>
@@ -278,7 +278,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="1">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<hbox>
<property name="name">
@@ -294,7 +294,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>119</width>
<height>21</height>
@@ -374,7 +374,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>110</height>
@@ -395,7 +395,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
diff --git a/src/profilenetworknatoptionsbase.ui b/src/profilenetworknatoptionsbase.ui
index 125e530..c73f764 100644
--- a/src/profilenetworknatoptionsbase.ui
+++ b/src/profilenetworknatoptionsbase.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout71</cstring>
+ <cstring>layout71</cstring>
</property>
<hbox>
<property name="name">
@@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout70</cstring>
+ <cstring>layout70</cstring>
</property>
<vbox>
<property name="name">
@@ -37,7 +37,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout69</cstring>
+ <cstring>layout69</cstring>
</property>
<grid>
<property name="name">
@@ -45,7 +45,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout67</cstring>
+ <cstring>layout67</cstring>
</property>
<hbox>
<property name="name">
@@ -78,7 +78,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -111,7 +111,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>116</width>
<height>21</height>
@@ -167,7 +167,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>46</height>
@@ -186,7 +186,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>20</height>
diff --git a/src/profilenetworkrouteoptions.cpp b/src/profilenetworkrouteoptions.cpp
index 55f1449..37424f6 100644
--- a/src/profilenetworkrouteoptions.cpp
+++ b/src/profilenetworkrouteoptions.cpp
@@ -71,7 +71,7 @@ void ProfileNetworkRouteOptions::delNetworkRouteClicked()
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?" ) );
+ 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: "+ TQString().setNum(result) ) ;
if ( result == 3) // Yes
{
diff --git a/src/profilenetworkrouteoptionsbase.ui b/src/profilenetworkrouteoptionsbase.ui
index cc27be3..3c43d97 100644
--- a/src/profilenetworkrouteoptionsbase.ui
+++ b/src/profilenetworkrouteoptionsbase.ui
@@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<vbox>
<property name="name">
@@ -37,7 +37,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout14</cstring>
+ <cstring>layout14</cstring>
</property>
<hbox>
<property name="name">
@@ -68,7 +68,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>278</width>
<height>21</height>
@@ -142,7 +142,7 @@
<property name="enabled">
<bool>false</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>150</height>
@@ -154,7 +154,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@@ -170,7 +170,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>70</width>
<height>20</height>
diff --git a/src/profilenetworkvirtualipoptionsbase.ui b/src/profilenetworkvirtualipoptionsbase.ui
index 498b719..7d96196 100644
--- a/src/profilenetworkvirtualipoptionsbase.ui
+++ b/src/profilenetworkvirtualipoptionsbase.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout66</cstring>
+ <cstring>layout66</cstring>
</property>
<vbox>
<property name="name">
@@ -40,7 +40,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout183</cstring>
+ <cstring>layout183</cstring>
</property>
<grid>
<property name="name">
@@ -59,7 +59,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="1">
<property name="name">
- <cstring>tqlayout77</cstring>
+ <cstring>layout77</cstring>
</property>
<hbox>
<property name="name">
@@ -134,7 +134,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout65</cstring>
+ <cstring>layout65</cstring>
</property>
<vbox>
<property name="name">
@@ -142,7 +142,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout49</cstring>
+ <cstring>layout49</cstring>
</property>
<grid>
<property name="name">
@@ -193,7 +193,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout64</cstring>
+ <cstring>layout64</cstring>
</property>
<hbox>
<property name="name">
@@ -217,7 +217,7 @@
<property name="enabled">
<bool>false</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -243,7 +243,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>159</height>
diff --git a/src/profileopenvpnoptionsbase.ui b/src/profileopenvpnoptionsbase.ui
index 607a482..fa45bea 100644
--- a/src/profileopenvpnoptionsbase.ui
+++ b/src/profileopenvpnoptionsbase.ui
@@ -36,7 +36,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout72</cstring>
+ <cstring>layout72</cstring>
</property>
<vbox>
<property name="name">
@@ -44,7 +44,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout71</cstring>
+ <cstring>layout71</cstring>
</property>
<grid>
<property name="name">
@@ -163,7 +163,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>31</height>
@@ -187,7 +187,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout74</cstring>
+ <cstring>layout74</cstring>
</property>
<vbox>
<property name="name">
@@ -195,7 +195,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout73</cstring>
+ <cstring>layout73</cstring>
</property>
<grid>
<property name="name">
@@ -327,7 +327,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>74</width>
<height>20</height>
@@ -344,7 +344,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>74</width>
<height>20</height>
@@ -395,7 +395,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>74</width>
<height>20</height>
@@ -443,7 +443,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>74</width>
<height>20</height>
@@ -471,7 +471,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>74</width>
<height>20</height>
@@ -488,7 +488,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>74</width>
<height>20</height>
@@ -507,7 +507,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -531,7 +531,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout76</cstring>
+ <cstring>layout76</cstring>
</property>
<vbox>
<property name="name">
@@ -539,7 +539,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout75</cstring>
+ <cstring>layout75</cstring>
</property>
<grid>
<property name="name">
@@ -555,7 +555,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>74</width>
<height>20</height>
@@ -672,7 +672,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="3">
<property name="name">
- <cstring>tqlayout26</cstring>
+ <cstring>layout26</cstring>
</property>
<hbox>
<property name="name">
@@ -702,7 +702,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -735,7 +735,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>74</width>
<height>20</height>
@@ -763,7 +763,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>74</width>
<height>20</height>
@@ -782,7 +782,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
diff --git a/src/profilepptpoptionsbase.ui b/src/profilepptpoptionsbase.ui
index 4b25fa7..32067d1 100644
--- a/src/profilepptpoptionsbase.ui
+++ b/src/profilepptpoptionsbase.ui
@@ -36,7 +36,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout85</cstring>
+ <cstring>layout85</cstring>
</property>
<vbox>
<property name="name">
@@ -44,7 +44,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout84</cstring>
+ <cstring>layout84</cstring>
</property>
<grid>
<property name="name">
@@ -60,7 +60,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>196</width>
<height>20</height>
@@ -152,7 +152,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>31</height>
@@ -176,7 +176,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout92</cstring>
+ <cstring>layout92</cstring>
</property>
<vbox>
<property name="name">
@@ -184,7 +184,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout91</cstring>
+ <cstring>layout91</cstring>
</property>
<grid>
<property name="name">
@@ -231,7 +231,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>181</width>
<height>21</height>
@@ -360,7 +360,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>138</height>
@@ -384,7 +384,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout89</cstring>
+ <cstring>layout89</cstring>
</property>
<vbox>
<property name="name">
@@ -392,7 +392,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout88</cstring>
+ <cstring>layout88</cstring>
</property>
<grid>
<property name="name">
@@ -400,7 +400,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@@ -437,7 +437,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@@ -445,7 +445,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@@ -469,7 +469,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>111</width>
<height>21</height>
@@ -507,7 +507,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>51</height>
@@ -531,7 +531,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout87</cstring>
+ <cstring>layout87</cstring>
</property>
<vbox>
<property name="name">
@@ -539,7 +539,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout86</cstring>
+ <cstring>layout86</cstring>
</property>
<grid>
<property name="name">
@@ -632,7 +632,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>71</height>
diff --git a/src/profilepskoptionsbase.ui b/src/profilepskoptionsbase.ui
index 2343e89..4323820 100644
--- a/src/profilepskoptionsbase.ui
+++ b/src/profilepskoptionsbase.ui
@@ -29,7 +29,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>51</height>
@@ -38,7 +38,7 @@
</spacer>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout21</cstring>
+ <cstring>layout21</cstring>
</property>
<vbox>
<property name="name">
@@ -46,7 +46,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout117</cstring>
+ <cstring>layout117</cstring>
</property>
<hbox>
<property name="name">
@@ -70,7 +70,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>50</width>
<height>20</height>
@@ -119,7 +119,7 @@
<property name="name">
<cstring>PSKFileURLRequester</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
@@ -150,7 +150,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>118</width>
<height>20</height>
@@ -181,7 +181,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>80</width>
<height>20</height>
@@ -209,7 +209,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>94</width>
<height>20</height>
@@ -240,7 +240,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>152</width>
<height>20</height>
@@ -259,7 +259,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>20</height>
diff --git a/src/profileracoonoptionsbase.ui b/src/profileracoonoptionsbase.ui
index 306ffb7..4b9d893 100644
--- a/src/profileracoonoptionsbase.ui
+++ b/src/profileracoonoptionsbase.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout63</cstring>
+ <cstring>layout63</cstring>
</property>
<vbox>
<property name="name">
@@ -52,7 +52,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout62</cstring>
+ <cstring>layout62</cstring>
</property>
<vbox>
<property name="name">
@@ -60,7 +60,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout61</cstring>
+ <cstring>layout61</cstring>
</property>
<grid>
<property name="name">
@@ -68,7 +68,7 @@
</property>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout75</cstring>
+ <cstring>layout75</cstring>
</property>
<hbox>
<property name="name">
@@ -89,7 +89,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout42</cstring>
+ <cstring>layout42</cstring>
</property>
<grid>
<property name="name">
@@ -105,7 +105,7 @@
</widget>
<widget class="TQLayoutWidget" row="4" column="0">
<property name="name">
- <cstring>tqlayout72</cstring>
+ <cstring>layout72</cstring>
</property>
<hbox>
<property name="name">
@@ -129,7 +129,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>91</width>
<height>21</height>
@@ -148,7 +148,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout69</cstring>
+ <cstring>layout69</cstring>
</property>
<hbox>
<property name="name">
@@ -175,7 +175,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>101</width>
<height>21</height>
@@ -194,7 +194,7 @@
</widget>
<widget class="TQLayoutWidget" row="6" column="0">
<property name="name">
- <cstring>tqlayout39</cstring>
+ <cstring>layout39</cstring>
</property>
<hbox>
<property name="name">
@@ -224,7 +224,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>20</height>
@@ -235,7 +235,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout71</cstring>
+ <cstring>layout71</cstring>
</property>
<hbox>
<property name="name">
@@ -259,7 +259,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>101</width>
<height>21</height>
@@ -270,7 +270,7 @@
</widget>
<widget class="TQLayoutWidget" row="5" column="0">
<property name="name">
- <cstring>tqlayout37</cstring>
+ <cstring>layout37</cstring>
</property>
<hbox>
<property name="name">
@@ -300,7 +300,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>61</width>
<height>21</height>
@@ -375,7 +375,7 @@ dh18 = modp8192 (only racoon)</string>
</widget>
<widget class="TQLayoutWidget" row="3" column="0">
<property name="name">
- <cstring>tqlayout71_2</cstring>
+ <cstring>layout71_2</cstring>
</property>
<hbox>
<property name="name">
@@ -399,7 +399,7 @@ dh18 = modp8192 (only racoon)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>101</width>
<height>21</height>
@@ -410,7 +410,7 @@ dh18 = modp8192 (only racoon)</string>
</widget>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
- <cstring>tqlayout70_2</cstring>
+ <cstring>layout70_2</cstring>
</property>
<hbox>
<property name="name">
@@ -434,7 +434,7 @@ dh18 = modp8192 (only racoon)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>81</width>
<height>21</height>
@@ -457,7 +457,7 @@ dh18 = modp8192 (only racoon)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -481,7 +481,7 @@ dh18 = modp8192 (only racoon)</string>
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout51</cstring>
+ <cstring>layout51</cstring>
</property>
<vbox>
<property name="name">
@@ -500,7 +500,7 @@ dh18 = modp8192 (only racoon)</string>
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout74_2</cstring>
+ <cstring>layout74_2</cstring>
</property>
<grid>
<property name="name">
@@ -508,7 +508,7 @@ dh18 = modp8192 (only racoon)</string>
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout73_2</cstring>
+ <cstring>layout73_2</cstring>
</property>
<hbox>
<property name="name">
@@ -532,7 +532,7 @@ dh18 = modp8192 (only racoon)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>20</height>
@@ -557,7 +557,7 @@ dh18 = modp8192 (only racoon)</string>
</widget>
<widget class="TQLayoutWidget" row="1" column="0" rowspan="2" colspan="1">
<property name="name">
- <cstring>tqlayout72_2_2</cstring>
+ <cstring>layout72_2_2</cstring>
</property>
<hbox>
<property name="name">
@@ -581,7 +581,7 @@ dh18 = modp8192 (only racoon)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>20</height>
@@ -636,7 +636,7 @@ dh18 = modp8192 (only racoon)</string>
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout74</cstring>
+ <cstring>layout74</cstring>
</property>
<grid>
<property name="name">
@@ -644,7 +644,7 @@ dh18 = modp8192 (only racoon)</string>
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout73</cstring>
+ <cstring>layout73</cstring>
</property>
<hbox>
<property name="name">
@@ -668,7 +668,7 @@ dh18 = modp8192 (only racoon)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>20</height>
@@ -693,7 +693,7 @@ dh18 = modp8192 (only racoon)</string>
</widget>
<widget class="TQLayoutWidget" row="1" column="0" rowspan="2" colspan="1">
<property name="name">
- <cstring>tqlayout72_2</cstring>
+ <cstring>layout72_2</cstring>
</property>
<hbox>
<property name="name">
@@ -717,7 +717,7 @@ dh18 = modp8192 (only racoon)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>20</height>
@@ -769,7 +769,7 @@ dh18 = modp8192 (only racoon)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>51</height>
@@ -793,7 +793,7 @@ dh18 = modp8192 (only racoon)</string>
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout60</cstring>
+ <cstring>layout60</cstring>
</property>
<vbox>
<property name="name">
@@ -801,7 +801,7 @@ dh18 = modp8192 (only racoon)</string>
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout90_2</cstring>
+ <cstring>layout90_2</cstring>
</property>
<hbox>
<property name="name">
@@ -831,7 +831,7 @@ dh18 = modp8192 (only racoon)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>100</width>
<height>20</height>
@@ -850,7 +850,7 @@ dh18 = modp8192 (only racoon)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>191</height>
diff --git a/src/profilesmartcardoptionsbase.ui b/src/profilesmartcardoptionsbase.ui
index 868a6f4..391b07d 100644
--- a/src/profilesmartcardoptionsbase.ui
+++ b/src/profilesmartcardoptionsbase.ui
@@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout157</cstring>
+ <cstring>layout157</cstring>
</property>
<hbox>
<property name="name">
@@ -37,7 +37,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout156</cstring>
+ <cstring>layout156</cstring>
</property>
<vbox>
<property name="name">
@@ -45,7 +45,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout155</cstring>
+ <cstring>layout155</cstring>
</property>
<vbox>
<property name="name">
@@ -53,7 +53,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout154</cstring>
+ <cstring>layout154</cstring>
</property>
<hbox>
<property name="name">
@@ -83,7 +83,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>210</width>
<height>20</height>
@@ -94,7 +94,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout41</cstring>
+ <cstring>layout41</cstring>
</property>
<hbox>
<property name="name">
@@ -118,7 +118,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout56</cstring>
+ <cstring>layout56</cstring>
</property>
<vbox>
<property name="name">
@@ -126,7 +126,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout24</cstring>
+ <cstring>layout24</cstring>
</property>
<hbox>
<property name="name">
@@ -134,7 +134,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout23</cstring>
+ <cstring>layout23</cstring>
</property>
<grid>
<property name="name">
@@ -213,7 +213,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout22</cstring>
+ <cstring>layout22</cstring>
</property>
<grid>
<property name="name">
@@ -229,7 +229,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>241</width>
<height>21</height>
@@ -270,7 +270,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout55</cstring>
+ <cstring>layout55</cstring>
</property>
<grid>
<property name="name">
@@ -356,7 +356,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout31</cstring>
+ <cstring>layout31</cstring>
</property>
<hbox>
<property name="name">
@@ -399,7 +399,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>40</height>
@@ -418,7 +418,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>51</height>
diff --git a/src/profilesshoptionsbase.ui b/src/profilesshoptionsbase.ui
index 49af726..e818387 100644
--- a/src/profilesshoptionsbase.ui
+++ b/src/profilesshoptionsbase.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<vbox>
<property name="name">
@@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout209</cstring>
+ <cstring>layout209</cstring>
</property>
<hbox>
<property name="name">
@@ -59,7 +59,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>82</width>
<height>20</height>
@@ -90,7 +90,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@@ -131,7 +131,7 @@ Parameter 3: remote ip address 1.2.3.5 (tun)</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<hbox>
<property name="name">
@@ -185,7 +185,7 @@ Parameter 3: remote ip address 1.2.3.5 (tun)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>194</width>
<height>41</height>
@@ -212,7 +212,7 @@ Parameter 3: remote ip address 1.2.3.5 (tun)</string>
<property name="name">
<cstring>SshKeyComboBox</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -221,7 +221,7 @@ Parameter 3: remote ip address 1.2.3.5 (tun)</string>
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@@ -245,7 +245,7 @@ Parameter 3: remote ip address 1.2.3.5 (tun)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>20</height>
@@ -261,7 +261,7 @@ Parameter 3: remote ip address 1.2.3.5 (tun)</string>
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout10</cstring>
+ <cstring>layout10</cstring>
</property>
<hbox>
<property name="name">
@@ -291,7 +291,7 @@ Parameter 3: remote ip address 1.2.3.5 (tun)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>21</height>
@@ -312,7 +312,7 @@ Parameter 3: remote ip address 1.2.3.5 (tun)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>140</height>
diff --git a/src/profileuseroptionsbase.ui b/src/profileuseroptionsbase.ui
index fd74e29..58e9a0b 100644
--- a/src/profileuseroptionsbase.ui
+++ b/src/profileuseroptionsbase.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<vbox>
<property name="name">
@@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout17</cstring>
+ <cstring>layout17</cstring>
</property>
<grid>
<property name="name">
@@ -48,7 +48,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
- <cstring>tqlayout31</cstring>
+ <cstring>layout31</cstring>
</property>
<hbox>
<property name="name">
@@ -81,7 +81,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>121</width>
<height>21</height>
@@ -111,7 +111,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>133</width>
<height>20</height>
@@ -150,7 +150,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>133</width>
<height>20</height>
@@ -159,7 +159,7 @@
</spacer>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout55</cstring>
+ <cstring>layout55</cstring>
</property>
<hbox>
<property name="name">
@@ -183,7 +183,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>211</width>
<height>21</height>
@@ -194,7 +194,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout54</cstring>
+ <cstring>layout54</cstring>
</property>
<hbox>
<property name="name">
@@ -218,7 +218,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>211</width>
<height>21</height>
@@ -284,7 +284,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>43</height>
diff --git a/src/profilevtunoptionsbase.ui b/src/profilevtunoptionsbase.ui
index 9c6f634..81632e6 100644
--- a/src/profilevtunoptionsbase.ui
+++ b/src/profilevtunoptionsbase.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout118</cstring>
+ <cstring>layout118</cstring>
</property>
<hbox>
<property name="name">
@@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<hbox>
<property name="name">
@@ -47,7 +47,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>439</width>
<height>21</height>
@@ -58,7 +58,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout28</cstring>
+ <cstring>layout28</cstring>
</property>
<vbox>
<property name="name">
@@ -66,7 +66,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout27</cstring>
+ <cstring>layout27</cstring>
</property>
<grid>
<property name="name">
@@ -74,7 +74,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout22</cstring>
+ <cstring>layout22</cstring>
</property>
<hbox>
<property name="name">
@@ -98,7 +98,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>50</width>
<height>20</height>
@@ -117,7 +117,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="0">
<property name="name">
- <cstring>tqlayout16</cstring>
+ <cstring>layout16</cstring>
</property>
<hbox>
<property name="name">
@@ -144,7 +144,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>81</width>
<height>21</height>
@@ -182,7 +182,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>22</height>
diff --git a/src/toolinfo.cpp b/src/toolinfo.cpp
index f59eed3..06765d5 100644
--- a/src/toolinfo.cpp
+++ b/src/toolinfo.cpp
@@ -83,7 +83,7 @@ bool ToolInfo::collectToolInfo()
{
// if (GlobalConfig->KvpncDebugLevel > 2)
// {
-// 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 << TQString(i18n("Trying first %1 at %2 has been failed, trying other paths").arg(Name).arg(TryPath_first)).ascii() << std::endl;
// std::cout << "searchpath list: " << SearchPathList.join(" ").ascii() << std::endl;
// }
// std::cout << "searchpath list: " << SearchPathList.join(" ").ascii() << std::endl;
@@ -91,12 +91,12 @@ bool ToolInfo::collectToolInfo()
{
TQString TryPath=TQString(*it)+"/"+Name;
// if (GlobalConfig->KvpncDebugLevel > 2)
-// std::cout << TQString (i18n("Trying %1 at: %2").tqarg(Name).tqarg(TryPath)).ascii() << std::endl;
+// std::cout << TQString (i18n("Trying %1 at: %2").arg(Name).arg(TryPath)).ascii() << std::endl;
if (!TryPath.isEmpty() && TQFile (TryPath).exists() && TQFileInfo(TryPath).isFile() )
{
// if (GlobalConfig->KvpncDebugLevel > 2)
-// std::cout << TQString(i18n("%1 found at: %2").tqarg(Name).tqarg(TryPath)).ascii() << std::endl;
+// std::cout << TQString(i18n("%1 found at: %2").arg(Name).arg(TryPath)).ascii() << std::endl;
found=true;
PathToExec=TryPath;
break;
@@ -197,7 +197,7 @@ bool ToolInfo::collectToolInfo()
if ( !PathToExec.isEmpty() && !CollectToolInfoProcess->start(env) )
{
- std::cerr << (i18n("Unable to start collectToolInfo process (%1)!").tqarg(Name)).ascii() << std::endl;
+ std::cerr << (i18n("Unable to start collectToolInfo process (%1)!").arg(Name)).ascii() << std::endl;
//delete CollectToolInfoProcess;
collectRunning=false;
success=false;
@@ -237,7 +237,7 @@ bool ToolInfo::collectToolInfo()
else
{
// if (GlobalConfig->KvpncDebugLevel > 2)
-// std::cout << TQString(i18n("%1 not found.").tqarg(Name)).ascii() << std::endl;
+// std::cout << TQString(i18n("%1 not found.").arg(Name)).ascii() << std::endl;
}
return success;
}
@@ -263,7 +263,7 @@ void ToolInfo::getOpenvpnCapabilities()
if ( !PathToExec.isEmpty() && !CollectOpenvpnCapabilitiesProcess->start(env) )
{
- std::cerr << i18n("Unable to start collectToolInfo process (%1)!").tqarg(Name).ascii() << std::endl;
+ std::cerr << i18n("Unable to start collectToolInfo process (%1)!").arg(Name).ascii() << std::endl;
//delete CollectToolInfoProcess;
collectOpenvpnCapabilitiesRunning=false;
diff --git a/src/toolsinfodialog.cpp b/src/toolsinfodialog.cpp
index e638238..0c8ed10 100644
--- a/src/toolsinfodialog.cpp
+++ b/src/toolsinfodialog.cpp
@@ -39,7 +39,7 @@ ToolsInfoDialog::ToolsInfoDialog(KVpncConfig *GlobalConfig, TQWidget *parent, co
{
main = new ToolsInfoWidgetBase(this);
setMainWidget(main);
- main->InfoListView->setMinimumSize(main->InfoListView->tqsizeHint());
+ main->InfoListView->setMinimumSize(main->InfoListView->sizeHint());
TQPixmap ok_icon = KGlobal::iconLoader()->loadIcon( "button_ok", KIcon::NoGroup, 16 );
TQPixmap wrong_icon = KGlobal::iconLoader()->loadIcon( "button_cancel", KIcon::NoGroup, 16 );
@@ -109,16 +109,16 @@ ToolsInfoDialog::ToolsInfoDialog(KVpncConfig *GlobalConfig, TQWidget *parent, co
if ( tool->Version.contains("Openswan"))
{
comment="Openswan";
- comment+=", "+i18n("kernel %1 support").tqarg("2.6");
+ comment+=", "+i18n("kernel %1 support").arg("2.6");
comment+=", "+i18n("smartcard support");
}
else if ( tool->Version.contains("strongSwan"))
{
comment="strongSwan";
comment+=", "+i18n("no aggressive mode");
- comment+=", "+i18n("kernel %1 support").tqarg("2.4");
+ comment+=", "+i18n("kernel %1 support").arg("2.4");
if (!(majorversion <= 2 && minorversion <= 8 && subminorversion <= 1))
- comment+=", "+i18n("kernel %1 support").tqarg("2.6");
+ comment+=", "+i18n("kernel %1 support").arg("2.6");
comment+=", "+i18n("smartcard support");
}
else
@@ -328,7 +328,7 @@ ToolsInfoDialog::ToolsInfoDialog(KVpncConfig *GlobalConfig, TQWidget *parent, co
}
else if (tool->Name == "tail")
{
-// comment+=", "+i18n("kernel %1 support").tqarg("2.6");
+// comment+=", "+i18n("kernel %1 support").arg("2.6");
}
else if (tool->Name == "ssh")
{
@@ -518,9 +518,9 @@ ToolsInfoDialog::ToolsInfoDialog(KVpncConfig *GlobalConfig, TQWidget *parent, co
new ListViewToolTip( main->InfoListView );
this->resize(800,600);
- main->InfoListView->resize(main->InfoListView->tqsizeHint());
- main->resize(main->tqsizeHint());
- //this->resize(tqsizeHint());
+ main->InfoListView->resize(main->InfoListView->sizeHint());
+ main->resize(main->sizeHint());
+ //this->resize(sizeHint());
GlobalConfig->appPointer->restoreOverrideCursor();
}
diff --git a/src/toolsinfowidgetbase.ui b/src/toolsinfowidgetbase.ui
index dd2ccf1..5acf0d7 100644
--- a/src/toolsinfowidgetbase.ui
+++ b/src/toolsinfowidgetbase.ui
@@ -116,7 +116,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>600</width>
<height>300</height>
diff --git a/src/utils.cpp b/src/utils.cpp
index 48e58ae..b457bd3 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -289,7 +289,7 @@ bool Utils::unloadKernelModule( TQString Name, TQApplication *app , bool force)
bool Utils::doChmod( TQString file, TQString mode )
{
- config->appendLogEntry ( i18n( "\"%1\" begin." ).tqarg("chmod"),config->info );
+ config->appendLogEntry ( i18n( "\"%1\" begin." ).arg("chmod"),config->info );
KProcess *chmodProcess = new KProcess;
*chmodProcess << "/bin/chmod";
*chmodProcess << mode;
@@ -297,27 +297,27 @@ bool Utils::doChmod( TQString file, TQString mode )
if ( !chmodProcess->start() )
{
- // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( "PppdUpScript" ) );
- config->appendLogEntry( i18n( "Chmod of %1 failed!" ).tqarg( file ), config->error );
+ // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "PppdUpScript" ) );
+ config->appendLogEntry( i18n( "Chmod of %1 failed!" ).arg( file ), config->error );
delete chmodProcess;
return false;
}
else
{
if ( config->KvpncDebugLevel > 0 )
- config->appendLogEntry ( i18n( "chmod of %1 (%2) started." ).tqarg( file ).tqarg( mode ) , config->debug );
+ config->appendLogEntry ( i18n( "chmod of %1 (%2) started." ).arg( file ).arg( 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." ).tqarg( file ).tqarg( mode ) , config->debug );
+ config->appendLogEntry ( i18n( "chmod of %1 (%2) running." ).arg( file ).arg( mode ) , config->debug );
usleep ( 250 );
if ( config->appPointer->hasPendingEvents () )
config->appPointer->processEvents();
count++;
}
- config->appendLogEntry ( i18n( "\"%1\" finished." ).tqarg("chmod"),config->info );
+ config->appendLogEntry ( i18n( "\"%1\" finished." ).arg("chmod"),config->info );
delete chmodProcess;
return true;
}
@@ -1010,7 +1010,7 @@ Utils::IpsecAlgos Utils::getKernelCrypto()
}
else
{
- config->appendLogEntry(i18n("%1 cant be opened!").tqarg("/proc/crypto"),config->error);
+ config->appendLogEntry(i18n("%1 cant be opened!").arg("/proc/crypto"),config->error);
}
return salgos;
}
@@ -1216,7 +1216,7 @@ TQStringList Utils::getCertsFromCiscoCertStore(TQString type)
type="user";
if (config->KvpncDebugLevel > 2)
- config->appendLogEntry("getCertsFromCiscoCertStore: "+i18n("type: %1").tqarg(type),config->debug );
+ config->appendLogEntry("getCertsFromCiscoCertStore: "+i18n("type: %1").arg(type),config->debug );
CertsFromCiscoCertStore.clear();
CertsFromCiscoCertPos=0;
@@ -1581,13 +1581,13 @@ void Utils::readPppdtestProcessOutput()
pppdcap.pppdHasReplacedefaultrouteSupport = false;
if (config->KvpncDebugLevel > 1)
- config->appendLogEntry(i18n("Testing %1: %2").tqarg("replacedefaultroute").tqarg(i18n("failed")),config->debug);
+ config->appendLogEntry(i18n("Testing %1: %2").arg("replacedefaultroute").arg(i18n("failed")),config->debug);
}
else
{
pppdcap.pppdHasReplacedefaultrouteSupport = true;
if (config->KvpncDebugLevel > 1)
- config->appendLogEntry(i18n("Testing %1: %2").tqarg("replacedefaultroute").tqarg(i18n("succeded")),config->debug);
+ config->appendLogEntry(i18n("Testing %1: %2").arg("replacedefaultroute").arg(i18n("succeded")),config->debug);
}
}
@@ -1663,7 +1663,7 @@ void Utils::readOutGetEmailAddressOfCert()
void Utils::readOutGetSmartcardSlots(KProcess * proc, char * buffer, int buflen)
{
- TQString msg_raw = TQString::tqfromLatin1(buffer, buflen);
+ TQString msg_raw = TQString::fromLatin1(buffer, buflen);
if (config->KvpncDebugLevel > 5)
config->appendLogEntry ( TQString("[readOutGetSmartcardSlots raw] "+TQString(msg_raw)) ,config->debug );
@@ -1680,7 +1680,7 @@ void Utils::readOutGetSmartcardSlots(KProcess * proc, char * buffer, int b
if ( msg.contains( "Slot" ) && !msg.contains("empty") )
{
//std::cout << msg.ascii() << std::endl;
-// KMessageBox::information( 0, i18n( "msg: %1" ).tqarg( msg.stripWhiteSpace() ), TQString("foo") );
+// KMessageBox::information( 0, i18n( "msg: %1" ).arg( msg.stripWhiteSpace() ), TQString("foo") );
// we put in this format: <id>:<name>
TQString id = msg.stripWhiteSpace().section( ' ', 1, 1 );
TQString name = msg.stripWhiteSpace().remove(TQString("Slot "+id)).stripWhiteSpace();
@@ -1702,7 +1702,7 @@ void Utils::readOutGetSmartcardCertsFromSlot()
// KMessageBox::sorry( 0, TQString("msg: "+msg), TQString("foo1"),0 );
Pkcs11CertFound=true;
}
-// KMessageBox::information( 0, i18n( "msg: %1" ).tqarg( msg ), TQString("foo") );
+// KMessageBox::information( 0, i18n( "msg: %1" ).arg( msg ), TQString("foo") );
if (IdType == "id")
{
if ( msg.contains( "ID:" ) && Pkcs11CertFound==true ) {
@@ -1815,7 +1815,7 @@ void Utils::readOutGetOpenvpnPkcs11Ids()
if (config->KvpncDebugLevel > 5)
config->appendLogEntry ( TQString("[readOutGetOpenvpnPkcs11Ids] "+TQString(msg)) ,config->debug );
-// KMessageBox::information( 0, i18n( "msg: %1" ).tqarg( msg ), TQString("foo") );
+// KMessageBox::information( 0, i18n( "msg: %1" ).arg( msg ), TQString("foo") );
if ( msg.contains( "Serialized id:" ))
{
//std::cout << msg.ascii() << std::endl;
diff --git a/src/vpntypesinfodialog.cpp b/src/vpntypesinfodialog.cpp
index fb1b712..862494f 100644
--- a/src/vpntypesinfodialog.cpp
+++ b/src/vpntypesinfodialog.cpp
@@ -54,8 +54,8 @@ inline void VpnTypesListViewToolTip::maybeTip ( const TQPoint& p )
const TQListViewItem* item = listView->itemAt ( p );
if ( !item )
return;
- const TQRect tqitemRect = listView->tqitemRect ( item );
- if ( !tqitemRect.isValid() )
+ const TQRect itemRect = listView->itemRect ( item );
+ if ( !itemRect.isValid() )
return;
const int col = listView->header()->sectionAt ( p.x() );
const int row = listView->header()->sectionAt ( p.y() );
@@ -65,9 +65,9 @@ inline void VpnTypesListViewToolTip::maybeTip ( const TQPoint& p )
const TQRect headerRect = listView->header()->sectionRect ( col );
if ( !headerRect.isValid() )
return;
-// const TQRect cellRect ( headerRect.left(), tqitemRect.top(),
-// headerRect.width(), tqitemRect.height() );
- const TQRect cellRect ( headerRect.left(), tqitemRect.top(), 400, 200 );
+// const TQRect cellRect ( headerRect.left(), itemRect.top(),
+// headerRect.width(), itemRect.height() );
+ const TQRect cellRect ( headerRect.left(), itemRect.top(), 400, 200 );
TQString tipStr;
@@ -90,7 +90,7 @@ VpnTypesInfoDialog::VpnTypesInfoDialog ( KVpncConfig *GlobalConfig, TQWidget *pa
{
main = new ToolsInfoWidgetBase(this);
setMainWidget(main);
- main->InfoListView->setMinimumSize(main->InfoListView->tqsizeHint());
+ main->InfoListView->setMinimumSize(main->InfoListView->sizeHint());
main->InfoListView->removeColumn(6);
main->InfoListView->removeColumn(5);
main->InfoListView->removeColumn(4);
@@ -127,12 +127,12 @@ VpnTypesInfoDialog::VpnTypesInfoDialog ( KVpncConfig *GlobalConfig, TQWidget *pa
if (vpnc_found || vpnclient_found)
{
it->VpnState=true;
- it->state=i18n("%1 found").tqarg(i18n("all tools"));
+ it->state=i18n("%1 found").arg(i18n("all tools"));
}
else
{
it->VpnState=false;
- it->state=i18n("%1 missing").tqarg(i18n("some tools"));
+ it->state=i18n("%1 missing").arg(i18n("some tools"));
}
if (vpnc_found && !vpnclient_found )
@@ -169,12 +169,12 @@ VpnTypesInfoDialog::VpnTypesInfoDialog ( KVpncConfig *GlobalConfig, TQWidget *pa
if (ipsec_found || racoon_found)
{
it->VpnState=true;
- it->state=i18n("%1 found").tqarg(i18n("all tools"));
+ it->state=i18n("%1 found").arg(i18n("all tools"));
}
else
{
it->VpnState=false;
- it->state=i18n("%1 missing").tqarg(i18n("some tools"));
+ it->state=i18n("%1 missing").arg(i18n("some tools"));
}
if (ipsec_found && ( !UtilsInstance.getToolInfo("ipsec")->Version.contains ( "Openswan" ) && !UtilsInstance.getToolInfo("ipsec")->Version.contains ( "strongswan" ) ))
@@ -187,7 +187,7 @@ VpnTypesInfoDialog::VpnTypesInfoDialog ( KVpncConfig *GlobalConfig, TQWidget *pa
}
if (ipsec_found &&UtilsInstance.getToolInfo("ipsec")->Version.contains ( "strongswan" ) )
{
- it->Comment+=i18n("%1 detected").tqarg(i18n("strongSwan"));
+ it->Comment+=i18n("%1 detected").arg(i18n("strongSwan"));
}
item = new TQListViewItem(main->InfoListView, it->VpnType,it->state, it->Requirements.join(" "+i18n("and")+" "), it->Comment);
@@ -213,32 +213,32 @@ VpnTypesInfoDialog::VpnTypesInfoDialog ( KVpncConfig *GlobalConfig, TQWidget *pa
if (pppd_found && pptpd_found && (pppdcap.pppdHasMppeRequiredSupport || pppdcap.pppdHasRequireMppeSupport))
{
it->VpnState=true;
- it->state=i18n("%1 found").tqarg(i18n("all tools"));
+ it->state=i18n("%1 found").arg(i18n("all tools"));
}
else
{
it->VpnState=false;
- it->state=i18n("%1 missing").tqarg(i18n("some tools"));
+ it->state=i18n("%1 missing").arg(i18n("some tools"));
}
if (pptpd_found && !pppd_found )
{
- it->Comment+=i18n("%1 is missing").tqarg("pppd");
+ it->Comment+=i18n("%1 is missing").arg("pppd");
}
if (!pptpd_found && pppd_found)
{
- it->Comment+=i18n("%1 is missing").tqarg("pptpclient");
+ it->Comment+=i18n("%1 is missing").arg("pptpclient");
}
if (!pptpd_found && !pppd_found)
{
- it->Comment+=i18n("%1 are missing").tqarg(i18n("pptpclient and pppd"));
+ it->Comment+=i18n("%1 are missing").arg(i18n("pptpclient and pppd"));
}
if (!it->Comment.isEmpty())
it->Comment+=", ";
if (!pppdcap.pppdHasMppeRequiredSupport && !pppdcap.pppdHasRequireMppeSupport )
- it->Comment+=i18n("%1 are missing").tqarg(i18n("MPPE support"));
+ it->Comment+=i18n("%1 are missing").arg(i18n("MPPE support"));
item = new TQListViewItem(main->InfoListView, it->VpnType,it->state, it->Requirements.join(" "+i18n("and")+" "), it->Comment);
if (it->VpnState == true)
@@ -261,25 +261,25 @@ VpnTypesInfoDialog::VpnTypesInfoDialog ( KVpncConfig *GlobalConfig, TQWidget *pa
if (openvpn_found && openssl_found)
{
it->VpnState=true;
- it->state=i18n("%1 found").tqarg(i18n("all tools"));
+ it->state=i18n("%1 found").arg(i18n("all tools"));
}
else
{
it->VpnState=false;
- it->state=i18n("%1 missing").tqarg(i18n("some tools"));
+ it->state=i18n("%1 missing").arg(i18n("some tools"));
}
if (!openvpn_found && openssl_found )
{
- it->Comment+=i18n("%1 is missing").tqarg("openvpn");
+ it->Comment+=i18n("%1 is missing").arg("openvpn");
}
if (openvpn_found && !openssl_found )
{
- it->Comment+=i18n("%1 is missing").tqarg("openssl");
+ it->Comment+=i18n("%1 is missing").arg("openssl");
}
if (!openvpn_found && !openssl_found)
{
- it->Comment+=i18n("%1 are missing").tqarg(i18n("openvpn and openssl"));
+ it->Comment+=i18n("%1 are missing").arg(i18n("openvpn and openssl"));
}
item = new TQListViewItem(main->InfoListView, it->VpnType,it->state, it->Requirements.join(" "+i18n("and")+" "), it->Comment);
@@ -307,12 +307,12 @@ VpnTypesInfoDialog::VpnTypesInfoDialog ( KVpncConfig *GlobalConfig, TQWidget *pa
if ((ipsec_found || racoon_found) && (l2tpd_found || xl2tpd_found || openl2tp_found))
{
it->VpnState=true;
- it->state=i18n("%1 found").tqarg(i18n("all tools"));
+ it->state=i18n("%1 found").arg(i18n("all tools"));
}
else
{
it->VpnState=false;
- it->state=i18n("%1 missing").tqarg(i18n("some tools"));
+ it->state=i18n("%1 missing").arg(i18n("some tools"));
}
if (ipsec_found && ( !UtilsInstance.getToolInfo("ipsec")->Version.contains ( "Openswan" ) && !UtilsInstance.getToolInfo("ipsec")->Version.contains ( "strongswan" ) ))
@@ -325,23 +325,23 @@ VpnTypesInfoDialog::VpnTypesInfoDialog ( KVpncConfig *GlobalConfig, TQWidget *pa
}
if (ipsec_found && UtilsInstance.getToolInfo("ipsec")->Version.contains ( "strongswan" ) )
{
- it->Comment+=i18n("%1 detected").tqarg(i18n("strongSwan"));
+ it->Comment+=i18n("%1 detected").arg(i18n("strongSwan"));
}
if (l2tpd_found)
{
it->Comment+=", ";
- it->Comment+=i18n("%1 detected").tqarg(i18n("l2tpd"));
+ it->Comment+=i18n("%1 detected").arg(i18n("l2tpd"));
}
if (xl2tpd_found)
{
it->Comment+=", ";
- it->Comment+=i18n("%1 detected").tqarg(i18n("xl2tpd"));
+ it->Comment+=i18n("%1 detected").arg(i18n("xl2tpd"));
}
if (openl2tp_found)
{
it->Comment+=", ";
- it->Comment+=i18n("%1 detected").tqarg(i18n("openl2tp"));
+ it->Comment+=i18n("%1 detected").arg(i18n("openl2tp"));
}
item = new TQListViewItem(main->InfoListView, it->VpnType,it->state, it->Requirements.join(" "+i18n("and")+" "), it->Comment);
@@ -365,21 +365,21 @@ VpnTypesInfoDialog::VpnTypesInfoDialog ( KVpncConfig *GlobalConfig, TQWidget *pa
if (vtund_found && pppd_found)
{
it->VpnState=true;
- it->state=i18n("%1 found").tqarg(i18n("all tools"));
+ it->state=i18n("%1 found").arg(i18n("all tools"));
}
else
{
it->VpnState=false;
- it->state=i18n("%1 are missing").tqarg(i18n("some tools"));
+ it->state=i18n("%1 are missing").arg(i18n("some tools"));
}
if (vtund_found && !pppd_found)
{
- it->Comment+=i18n("%1 is missing").tqarg("pppd");
+ it->Comment+=i18n("%1 is missing").arg("pppd");
}
if (!vtund_found && pppd_found )
{
- it->Comment+=i18n("%1 is missing").tqarg("vtun");
+ it->Comment+=i18n("%1 is missing").arg("vtun");
}
item = new TQListViewItem(main->InfoListView, it->VpnType,it->state, it->Requirements.join(" "+i18n("and")+" "), it->Comment);
@@ -404,15 +404,15 @@ VpnTypesInfoDialog::VpnTypesInfoDialog ( KVpncConfig *GlobalConfig, TQWidget *pa
if (ssh_found && (ksshaskpass_found || sshaskpassgnome_found))
{
it->VpnState=true;
- it->state=i18n("%1 found").tqarg(i18n("all tools"));
+ it->state=i18n("%1 found").arg(i18n("all tools"));
}
else
{
it->VpnState=false;
if (!ssh_found && (ksshaskpass_found || sshaskpassgnome_found) )
- it->Comment+=i18n("%1 is missing").tqarg("ssh");
+ it->Comment+=i18n("%1 is missing").arg("ssh");
else
- it->Comment+=i18n("%1 is missing").tqarg(i18n("Password entry tool"));
+ it->Comment+=i18n("%1 is missing").arg(i18n("Password entry tool"));
}