summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-18 18:14:09 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-18 18:14:09 -0600
commit699e356180fde57a72e0c37af2170b87a95f90b4 (patch)
tree86bc3daf1c175ac5b88f56b127e31e544c323c4e /src
parent392b293dfeaa3e4241e50b833126d0c2d598761d (diff)
downloadkvpnc-699e356180fde57a72e0c37af2170b87a95f90b4.tar.gz
kvpnc-699e356180fde57a72e0c37af2170b87a95f90b4.zip
Rename old tq methods that no longer need a unique name
Diffstat (limited to 'src')
-rw-r--r--src/addnetworkroutedialog.cpp2
-rw-r--r--src/addnetworkroutedialogbase.ui4
-rw-r--r--src/advancedprofiledialogbase.ui2
-rw-r--r--src/advancedprofilesettingsdialogbase.ui20
-rw-r--r--src/advancedsettingsdialog.cpp2
-rw-r--r--src/ciscocertificateenrollment.cpp6
-rw-r--r--src/ciscocertificateenrollmentbase.ui6
-rw-r--r--src/ciscocertificateenrollmentdatadialogbase.ui18
-rw-r--r--src/configconnectoptionsbase.ui8
-rw-r--r--src/configdaemonoptionsbase.ui94
-rw-r--r--src/configdebugoptionsbase.ui10
-rw-r--r--src/configgeneraloptions.ui8
-rw-r--r--src/confighelperprogramoptionsbase.ui108
-rw-r--r--src/configlogoptionsbase.ui30
-rw-r--r--src/displaycertdialog.cpp2
-rw-r--r--src/displaycertdialogbase.ui64
-rw-r--r--src/enterpassworddialog.cpp2
-rw-r--r--src/enterpassworddialogbase.ui12
-rw-r--r--src/enterxauthinteractivepasscodedialog.cpp2
-rw-r--r--src/enterxauthinteractivepasscodedialogbase.ui6
-rw-r--r--src/generateopenvpnkeydialog.cpp2
-rw-r--r--src/helpdialogbase.ui4
-rw-r--r--src/importcertificatedialog.cpp2
-rw-r--r--src/importcertificatedialogbase.ui10
-rw-r--r--src/importipsecprofiledialog.cpp2
-rw-r--r--src/importopenvpnprofiledialog.cpp2
-rw-r--r--src/importopenvpnprofiledialogbase.ui4
-rw-r--r--src/importprofiledialog.cpp2
-rw-r--r--src/importprofiledialogbase.ui2
-rw-r--r--src/kfeedback.cpp6
-rw-r--r--src/kvpnc.cpp448
-rw-r--r--src/kvpnc.h12
-rw-r--r--src/kvpncconfig.cpp14
-rw-r--r--src/kvpncconfig.h4
-rw-r--r--src/kvpncimportprofileselectiondialogbase.ui8
-rw-r--r--src/kvpnckicker.cpp2
-rw-r--r--src/kvpnckicker.h4
-rw-r--r--src/listviewtooltip.h10
-rw-r--r--src/logviewerdialog.cpp2
-rw-r--r--src/logviewerdialogbase.ui4
-rw-r--r--src/mainviewbase.ui2
-rw-r--r--src/manageciscocert.cpp6
-rw-r--r--src/manageciscocertbase.ui6
-rw-r--r--src/newprofiledialog.cpp2
-rw-r--r--src/newprofiledialogbase.ui14
-rw-r--r--src/newprofilewizard.cpp118
-rw-r--r--src/newprofilewizardauthselection.ui4
-rw-r--r--src/newprofilewizardcert.ui20
-rw-r--r--src/newprofilewizardciscomanually.ui12
-rw-r--r--src/newprofilewizardciscoselection.ui4
-rw-r--r--src/newprofilewizardconnectionstatuscheck.ui12
-rw-r--r--src/newprofilewizardconnectoptions.ui8
-rw-r--r--src/newprofilewizardfreeswan.ui22
-rw-r--r--src/newprofilewizardgeneral.ui6
-rw-r--r--src/newprofilewizardnat.ui8
-rw-r--r--src/newprofilewizardnetwork.ui10
-rw-r--r--src/newprofilewizardnetworkroute.ui6
-rw-r--r--src/newprofilewizardopenvpn.ui26
-rw-r--r--src/newprofilewizardopenvpnauth.ui10
-rw-r--r--src/newprofilewizardopenvpnselection.ui4
-rw-r--r--src/newprofilewizardp12certselection.ui4
-rw-r--r--src/newprofilewizardpptp.ui6
-rw-r--r--src/newprofilewizardpsk.ui16
-rw-r--r--src/newprofilewizardracoon.ui28
-rw-r--r--src/newprofilewizardstart.ui4
-rw-r--r--src/newprofilewizardtypeselection.ui4
-rw-r--r--src/newprofilewizarduser.ui6
-rw-r--r--src/preferencesdialog.cpp24
-rw-r--r--src/profilecertoptionsbase.ui34
-rw-r--r--src/profileciscooptionsbase.ui28
-rw-r--r--src/profilecmdexecafterconnectoptionsbase.ui4
-rw-r--r--src/profilecmdexecafterdisconnectoptionsbase.ui2
-rw-r--r--src/profilecmdexecbeforeconnectoptionsbase.ui2
-rw-r--r--src/profilecmdexecbeforedisconnectoptionsbase.ui2
-rw-r--r--src/profilegeneraloptionsbase.ui4
-rw-r--r--src/profileipsecoptionsbase.ui32
-rw-r--r--src/profilemanagerbase.cpp4
-rw-r--r--src/profilenetworkgeneraloptionsbase.ui26
-rw-r--r--src/profilenetworkhttpproxyoptionsbase.ui14
-rw-r--r--src/profilenetworknatoptionsbase.ui8
-rw-r--r--src/profilenetworkrouteoptionsbase.ui6
-rw-r--r--src/profilenetworkvirtualipoptionsbase.ui4
-rw-r--r--src/profileopenvpnoptionsbase.ui26
-rw-r--r--src/profilepptpoptionsbase.ui14
-rw-r--r--src/profilepskoptionsbase.ui16
-rw-r--r--src/profileracoonoptionsbase.ui30
-rw-r--r--src/profilesmartcardoptionsbase.ui8
-rw-r--r--src/profilesshoptionsbase.ui12
-rw-r--r--src/profileuseroptionsbase.ui12
-rw-r--r--src/profilevtunoptionsbase.ui8
-rw-r--r--src/toolsinfodialog.cpp8
-rw-r--r--src/toolsinfowidgetbase.ui2
-rw-r--r--src/utils.cpp2
-rw-r--r--src/vpntypesinfodialog.cpp12
94 files changed, 831 insertions, 831 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..0d559f5 100644
--- a/src/addnetworkroutedialogbase.ui
+++ b/src/addnetworkroutedialogbase.ui
@@ -247,7 +247,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>49</width>
<height>20</height>
@@ -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..05626b8 100644
--- a/src/advancedprofilesettingsdialogbase.ui
+++ b/src/advancedprofilesettingsdialogbase.ui
@@ -119,7 +119,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>181</width>
<height>20</height>
@@ -176,7 +176,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>110</width>
<height>20</height>
@@ -283,7 +283,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>181</width>
<height>20</height>
@@ -346,7 +346,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>167</width>
<height>21</height>
@@ -414,7 +414,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>141</width>
<height>20</height>
@@ -472,7 +472,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>167</width>
<height>21</height>
@@ -515,7 +515,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>121</width>
<height>20</height>
@@ -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..e1ee74f 100644
--- a/src/ciscocertificateenrollmentbase.ui
+++ b/src/ciscocertificateenrollmentbase.ui
@@ -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..3703942 100644
--- a/src/ciscocertificateenrollmentdatadialogbase.ui
+++ b/src/ciscocertificateenrollmentdatadialogbase.ui
@@ -61,7 +61,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>21</height>
@@ -96,7 +96,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -141,7 +141,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -176,7 +176,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -211,7 +211,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>21</height>
@@ -251,7 +251,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -291,7 +291,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -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/configconnectoptionsbase.ui b/src/configconnectoptionsbase.ui
index eb15636..7a8c4f3 100644
--- a/src/configconnectoptionsbase.ui
+++ b/src/configconnectoptionsbase.ui
@@ -65,7 +65,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>154</width>
<height>20</height>
@@ -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>
@@ -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/configdaemonoptionsbase.ui b/src/configdaemonoptionsbase.ui
index 315ebae..527a75d 100644
--- a/src/configdaemonoptionsbase.ui
+++ b/src/configdaemonoptionsbase.ui
@@ -81,7 +81,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>71</width>
<height>31</height>
@@ -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>
@@ -281,7 +281,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -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>
@@ -468,7 +468,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -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>
@@ -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>
@@ -1099,7 +1099,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>117</width>
<height>20</height>
@@ -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>
@@ -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>
@@ -1379,7 +1379,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>21</height>
@@ -1423,7 +1423,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>21</height>
@@ -1502,7 +1502,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>80</width>
<height>21</height>
@@ -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>
@@ -1727,7 +1727,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>151</width>
<height>20</height>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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..ecd5036 100644
--- a/src/configdebugoptionsbase.ui
+++ b/src/configdebugoptionsbase.ui
@@ -62,7 +62,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>110</width>
<height>20</height>
@@ -106,7 +106,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>170</width>
<height>20</height>
@@ -170,7 +170,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>150</width>
<height>20</height>
@@ -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..e99ecdd 100644
--- a/src/configgeneraloptions.ui
+++ b/src/configgeneraloptions.ui
@@ -80,7 +80,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>110</width>
<height>20</height>
@@ -121,7 +121,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -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..0529052 100644
--- a/src/confighelperprogramoptionsbase.ui
+++ b/src/confighelperprogramoptionsbase.ui
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -506,7 +506,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>146</width>
<height>16</height>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -902,7 +902,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>146</width>
<height>20</height>
@@ -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>
@@ -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>
@@ -1351,7 +1351,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>146</width>
<height>20</height>
@@ -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..746120c 100644
--- a/src/configlogoptionsbase.ui
+++ b/src/configlogoptionsbase.ui
@@ -76,7 +76,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -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..e00c660 100644
--- a/src/displaycertdialogbase.ui
+++ b/src/displaycertdialogbase.ui
@@ -69,7 +69,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>21</height>
@@ -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>
@@ -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>
@@ -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>
@@ -279,7 +279,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -300,7 +300,7 @@
<property name="name">
<cstring>textLabel18</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
@@ -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>
@@ -372,7 +372,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>21</height>
@@ -407,7 +407,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -442,7 +442,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -737,7 +737,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>21</height>
@@ -772,7 +772,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>21</height>
@@ -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..d3d556a 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)
{
diff --git a/src/enterpassworddialogbase.ui b/src/enterpassworddialogbase.ui
index e475840..f226573 100644
--- a/src/enterpassworddialogbase.ui
+++ b/src/enterpassworddialogbase.ui
@@ -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..375d197 100644
--- a/src/enterxauthinteractivepasscodedialogbase.ui
+++ b/src/enterxauthinteractivepasscodedialogbase.ui
@@ -72,7 +72,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>151</width>
<height>21</height>
@@ -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..0e631f6 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" );
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..0fe7abe 100644
--- a/src/importcertificatedialog.cpp
+++ b/src/importcertificatedialog.cpp
@@ -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 = "";
diff --git a/src/importcertificatedialogbase.ui b/src/importcertificatedialogbase.ui
index 8213ac1..945cc99 100644
--- a/src/importcertificatedialogbase.ui
+++ b/src/importcertificatedialogbase.ui
@@ -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..2809a59 100644
--- a/src/importipsecprofiledialog.cpp
+++ b/src/importipsecprofiledialog.cpp
@@ -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..95a8e47 100644
--- a/src/importopenvpnprofiledialog.cpp
+++ b/src/importopenvpnprofiledialog.cpp
@@ -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" );
diff --git a/src/importopenvpnprofiledialogbase.ui b/src/importopenvpnprofiledialogbase.ui
index 7b9e459..afea88e 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>
@@ -52,7 +52,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>241</width>
<height>21</height>
diff --git a/src/importprofiledialog.cpp b/src/importprofiledialog.cpp
index bf5f1f8..67cfea8 100644
--- a/src/importprofiledialog.cpp
+++ b/src/importprofiledialog.cpp
@@ -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);
diff --git a/src/importprofiledialogbase.ui b/src/importprofiledialogbase.ui
index ef968e0..1da033e 100644
--- a/src/importprofiledialogbase.ui
+++ b/src/importprofiledialogbase.ui
@@ -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..b00013a 100644
--- a/src/kfeedback.cpp
+++ b/src/kfeedback.cpp
@@ -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..26eef17 100644
--- a/src/kvpnc.cpp
+++ b/src/kvpnc.cpp
@@ -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 ;
}
}
@@ -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 )
@@ -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;
// }
@@ -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 ;
}
@@ -6222,7 +6222,7 @@ void KVpnc::connectClicked()
// KMessageBox::error( this, i18n( "Unable to find \"%1\" at \"%2\"!" ).tqarg( "pkcs11-tool" ).tqarg( GlobalConfig->pathToPkcs11Tool) );
// GlobalConfig->appendLogEntry( i18n( "Unable to find \"%1\" at \"%2\"!" ).tqarg( "pkcs11-tool" ).tqarg( GlobalConfig->pathToPkcs11Tool ), GlobalConfig->error );
// ok = false;
- // 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 ;
}
}
@@ -6263,7 +6263,7 @@ void KVpnc::connectClicked()
// KMessageBox::error( 0, i18n( "Certificate file (%1) could not be found. Please check the path of it." ).tqarg( GlobalConfig->currentProfile->getX509Certificate() ), i18n( "File Not Found" ) );
// GlobalConfig->appendLogEntry( i18n( "Certificate file (%1) could not be found. Please check the path of it." ).tqarg( GlobalConfig->currentProfile->getX509Certificate() ), GlobalConfig->error );
// ok = false;
- // 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 ;
}
@@ -7366,7 +7366,7 @@ void KVpnc::connectClicked()
// GlobalConfig->appendLogEntry( i18n( "Could not connect to %1 management handler!" ).tqarg( "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 ;
}
@@ -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();
}
@@ -8753,7 +8753,7 @@ void KVpnc::disconnectClicked()
}
}
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.stop();
connectionEnded();
@@ -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();
@@ -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() ) );
@@ -9713,7 +9713,7 @@ void KVpnc::disconnectClicked()
}
// ConnectingProcess = 0L;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
if ( GlobalConfig->currentProfile->getExecuteCmdAfterDisconnect() )
executeCommandAfterDisconnect();
@@ -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;
@@ -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();
@@ -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;
}
@@ -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 );
@@ -11883,7 +11883,7 @@ void KVpnc::readOutputFrom_vpnc()
// if ( GlobalConfig->KvpncDebugLevel > 0 )
// GlobalConfig->appendLogEntry( i18n( "Disconnect script started." ), GlobalConfig->debug );
// }
- // setGuitqStatus(disconnected);
+ // setGuiStatus(disconnected);
// connectionEnded();
// }
//
@@ -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();
@@ -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 ;
}
@@ -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() )
@@ -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 );
@@ -15589,7 +15589,7 @@ void KVpnc::readFromStdout_pptp()
// {
// KMessageBox::sorry ( this, i18n ( "\"%1\" %2 start failed!" ).arg ( i18n ( "pppd replace route process" )).tqarg( tmpPath + "pppd_replace_defaultroute." + GlobalConfig->currentProfile->getName() + ".sh") );
// // disconnectClicked();
- // // setGuitqStatus(disconnected);
+ // // setGuiStatus(disconnected);
// }
// else
// {
@@ -15625,7 +15625,7 @@ void KVpnc::readFromStdout_pptp()
// {
// KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( i18n( "pppd route process" ) ) );
// disconnectClicked();
- // setGuitqStatus(disconnected);
+ // setGuiStatus(disconnected);
// }
// else
// {
@@ -15655,7 +15655,7 @@ void KVpnc::readFromStdout_pptp()
//terminateConnection ( PptpProcess );
disconnectClicked();
GlobalConfig->status = GlobalConfig->disconnected;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
// // remove password entries
@@ -15933,7 +15933,7 @@ void KVpnc::readFromStderr_pptp()
//terminateConnection ( PptpProcess );
disconnectClicked();
GlobalConfig->status = GlobalConfig->disconnected;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
if ( allowReconnect && GlobalConfig->currentProfile->getDoReconnectAfterConnectionLost() )
{
@@ -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();
@@ -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
{
@@ -18102,7 +18102,7 @@ void KVpnc::readFromStdout_ssh ( KProcess *, char *buffer, int buflen )
// {
// KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( i18n( "pppd route process" ) ) );
// disconnectClicked();
- // setGuitqStatus(disconnected);
+ // setGuiStatus(disconnected);
// }
// else
{
@@ -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() ) );
@@ -18434,7 +18434,7 @@ void KVpnc::readFromStderr_connectionStatusCheck()
// /* 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()) );
+ // KNotifyClient::event( topLevelWidget()->winId(), "connection lost",i18n("Ping to %1 within %2 checks every %3s was ok.").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount()).tqarg(GlobalConfig->currentProfile->getConnectionStatusInterval()) );
// // kill connection
// disconnectClicked();
// }
@@ -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() )
@@ -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").tqarg(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" ).tqarg("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").tqarg(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" ).tqarg(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;
@@ -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");
+ ConnectionStatus = i18n("connected");
durationString = i18n("%1:%2:%3").tqarg( TQString().sprintf("%02u", hour)).tqarg(TQString().sprintf("%02u", min)).tqarg(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").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(GlobalConfig->currentProfile->getUserName()).tqarg(GlobalConfig->currentProfile->getID()).tqarg(durationString).tqarg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]").tqarg(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]").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString).tqarg(PrettyTypeString).tqarg(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").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(GlobalConfig->currentProfile->getUserName()).tqarg(GlobalConfig->currentProfile->getID()).tqarg(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").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString).tqarg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]").tqarg(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]").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString).tqarg(PrettyTypeString).tqarg(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").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(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").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString , GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]").tqarg(ConnectionStatus);
ConnectMsg = i18n("Connected: %2@%1, %3").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(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").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(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)
{
@@ -20022,63 +20022,63 @@ void KVpnc::setGuitqStatus ( int status )
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").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(Username).tqarg(durationString).tqarg(TQString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]").tqarg(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]").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString).tqarg(PrettyTypeString).tqarg(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").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(Username).tqarg(durationString , TQString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]").tqarg(ConnectionStatus);
- ConnectMsg = i18n("%4: %2@%1, %3").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg( Username).tqarg(durationString).tqarg(ConnectiontqStatus);
+ ConnectMsg = i18n("%4: %2@%1, %3").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg( Username).tqarg(durationString).tqarg(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").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(Username).tqarg(durationString , TQString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]").tqarg(ConnectionStatus);
ConnectMsg = i18n("Connected: %2@%1, %3").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString);
}
- LogMsg = i18n("Policy successful activated and daemon (%1) running for server \"%2\" (%3) at date %4, profile \"%5\".").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\".").tqarg(DaemonString).tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(GlobalConfig->TmpGatewayIP).tqarg(TQDateTime::currentDateTime().toString(Qt::TextDate)).tqarg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]");
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::openvpn)
{
PrettyTypeString = i18n("OpenVPN");
DaemonString = "openvpn";
- ToolTipMsg = i18n("status: %3 \nserver: %1\nduration: %2").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(durationString).tqarg(ConnectiontqStatus);
+ ToolTipMsg = i18n("status: %3 \nserver: %1\nduration: %2").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(durationString).tqarg(ConnectionStatus);
ConnectMsg = i18n("Connected: %1, %2, profile \"%3\"").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(durationString).tqarg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]");
- LogMsg = i18n("Successful connected to server \"%1\" at %2, profile \"%3\".").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\".").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(TQDateTime::currentDateTime().toString(Qt::TextDate)).tqarg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]");
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::vtun)
{
PrettyTypeString = i18n("Vtun");
DaemonString = "vtun";
- ToolTipMsg = i18n("status: %3\nserver: %1\nduration: %2").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(durationString).tqarg(ConnectiontqStatus);
+ ToolTipMsg = i18n("status: %3\nserver: %1\nduration: %2").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(durationString).tqarg(ConnectionStatus);
ConnectMsg = i18n("Connected: %1, %2, profile \"%3\"").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(durationString).tqarg(TQString(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]"));
- LogMsg = i18n("Successful connected to server \"%1\" at %2, profile \"%3\".").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\".").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(TQDateTime::currentDateTime().toString(Qt::TextDate)).tqarg(TQString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]");
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ssh)
{
PrettyTypeString = i18n("SSH");
DaemonString = "ssh";
- ToolTipMsg = i18n("status: %3\nserver: %1\nduration: %2").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(durationString).tqarg(ConnectiontqStatus);
+ ToolTipMsg = i18n("status: %3\nserver: %1\nduration: %2").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(durationString).tqarg(ConnectionStatus);
ConnectMsg = i18n("%4: %1, %2, profile \"%3\"").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(durationString ).tqarg(TQString(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]"));
- LogMsg = i18n("Successful connected to server \"%1\" at %2, profile \"%3\".").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\".").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(TQDateTime::currentDateTime().toString(Qt::TextDate)).tqarg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]");
}
if (status == GlobalConfig->connected)
- KNotifyClient::event ( tqtopLevelWidget() ->winId(), "connection established", ConnectMsg );
+ KNotifyClient::event ( topLevelWidget() ->winId(), "connection established", ConnectMsg );
}
}
@@ -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 );
@@ -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();
@@ -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() );
}
}
@@ -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();
@@ -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..a74cf10 100644
--- a/src/kvpnc.h
+++ b/src/kvpnc.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..47ee54b 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 )
@@ -543,7 +543,7 @@ void KVpncConfig::saveOptions(bool saveOneProfile, TQString Profile)
// 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 )
+ // KGuiItem( i18n( "Store &Unsafe" ), TQString::fromLatin1( "unlock" ),TQString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue )
// {
// config->writeEntry( "User password", it->getUserPassword() );
// }
@@ -560,7 +560,7 @@ void KVpncConfig::saveOptions(bool saveOneProfile, TQString Profile)
// 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 )
+ // KGuiItem( i18n( "Store &Unsafe" ), TQString::fromLatin1( "unlock" ),TQString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue )
// {
// config->writeEntry( "Pre shared key", it->getPreSharedKey() );
// }
@@ -576,7 +576,7 @@ void KVpncConfig::saveOptions(bool saveOneProfile, TQString Profile)
// 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 )
+ // KGuiItem( i18n( "Store &Unsafe" ), TQString::fromLatin1( "unlock" ),TQString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue )
// {
// config->writeEntry( "Pre shared key", it->getPreSharedKey() );
// }
@@ -591,7 +591,7 @@ void KVpncConfig::saveOptions(bool saveOneProfile, TQString Profile)
// 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 )
+ // KGuiItem( i18n( "Store &Unsafe" ), TQString::fromLatin1( "unlock" ),TQString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue )
// {
// config->writeEntry( "Pre shared key", it->getPreSharedKey() );
// }
@@ -1032,7 +1032,7 @@ void KVpncConfig::loadOptions()
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;
}
}
diff --git a/src/kvpncconfig.h b/src/kvpncconfig.h
index 18821f1..65c8e74 100644
--- a/src/kvpncconfig.h
+++ b/src/kvpncconfig.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..63dc4d0 100644
--- a/src/kvpncimportprofileselectiondialogbase.ui
+++ b/src/kvpncimportprofileselectiondialogbase.ui
@@ -80,7 +80,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>271</width>
<height>21</height>
@@ -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>
@@ -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..9ddac49 100644
--- a/src/kvpnckicker.cpp
+++ b/src/kvpnckicker.cpp
@@ -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..aa429d2 100644
--- a/src/logviewerdialog.cpp
+++ b/src/logviewerdialog.cpp
@@ -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..165b79d 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>
@@ -37,7 +37,7 @@
<property name="name">
<cstring>LogTextBrowser</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>120</height>
diff --git a/src/mainviewbase.ui b/src/mainviewbase.ui
index dc2a5ab..42d8496 100644
--- a/src/mainviewbase.ui
+++ b/src/mainviewbase.ui
@@ -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..7d5d611 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()));
diff --git a/src/manageciscocertbase.ui b/src/manageciscocertbase.ui
index 9bc4b23..62b9263 100644
--- a/src/manageciscocertbase.ui
+++ b/src/manageciscocertbase.ui
@@ -124,7 +124,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>230</width>
<height>21</height>
@@ -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/newprofiledialog.cpp b/src/newprofiledialog.cpp
index 8fc7d21..b2f56b2 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& ) ) );
diff --git a/src/newprofiledialogbase.ui b/src/newprofiledialogbase.ui
index 8cce8f6..3724991 100644
--- a/src/newprofiledialogbase.ui
+++ b/src/newprofiledialogbase.ui
@@ -57,7 +57,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>321</width>
<height>20</height>
@@ -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>
diff --git a/src/newprofilewizard.cpp b/src/newprofilewizard.cpp
index e627bb9..09315dc 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())
@@ -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
}
@@ -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);
}
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..13c2d36 100644
--- a/src/newprofilewizardcert.ui
+++ b/src/newprofilewizardcert.ui
@@ -67,7 +67,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>221</width>
<height>20</height>
@@ -151,7 +151,7 @@
<property name="name">
<cstring>x509certURLRequester</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
@@ -194,7 +194,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>172</width>
<height>20</height>
@@ -229,7 +229,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>134</width>
<height>20</height>
@@ -264,7 +264,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>109</width>
<height>20</height>
@@ -305,7 +305,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>34</width>
<height>20</height>
@@ -340,7 +340,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>134</width>
<height>20</height>
@@ -375,7 +375,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>84</width>
<height>20</height>
@@ -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..3f265db 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>
@@ -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>
@@ -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..293881a 100644
--- a/src/newprofilewizardconnectionstatuscheck.ui
+++ b/src/newprofilewizardconnectionstatuscheck.ui
@@ -68,7 +68,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>241</width>
<height>20</height>
@@ -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>
@@ -203,7 +203,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>201</width>
<height>20</height>
@@ -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..edf5cea 100644
--- a/src/newprofilewizardconnectoptions.ui
+++ b/src/newprofilewizardconnectoptions.ui
@@ -56,7 +56,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>181</width>
<height>21</height>
@@ -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..52d66e0 100644
--- a/src/newprofilewizardfreeswan.ui
+++ b/src/newprofilewizardfreeswan.ui
@@ -70,7 +70,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>100</width>
<height>20</height>
@@ -108,7 +108,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -176,7 +176,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>20</height>
@@ -225,7 +225,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>20</height>
@@ -586,7 +586,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>20</height>
@@ -635,7 +635,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>20</height>
@@ -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>
@@ -774,7 +774,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>28</width>
<height>20</height>
@@ -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..e11d289 100644
--- a/src/newprofilewizardgeneral.ui
+++ b/src/newprofilewizardgeneral.ui
@@ -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..dc5646b 100644
--- a/src/newprofilewizardnat.ui
+++ b/src/newprofilewizardnat.ui
@@ -70,7 +70,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>50</width>
<height>20</height>
@@ -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..5d67662 100644
--- a/src/newprofilewizardnetwork.ui
+++ b/src/newprofilewizardnetwork.ui
@@ -53,7 +53,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>252</width>
<height>20</height>
@@ -345,7 +345,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>71</width>
<height>20</height>
@@ -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..95e3b19 100644
--- a/src/newprofilewizardnetworkroute.ui
+++ b/src/newprofilewizardnetworkroute.ui
@@ -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>
@@ -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..74a5be9 100644
--- a/src/newprofilewizardopenvpn.ui
+++ b/src/newprofilewizardopenvpn.ui
@@ -109,7 +109,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>101</width>
<height>20</height>
@@ -147,7 +147,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>119</width>
<height>20</height>
@@ -207,7 +207,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>20</height>
@@ -248,7 +248,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>191</width>
<height>20</height>
@@ -306,7 +306,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>191</width>
<height>20</height>
@@ -344,7 +344,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>119</width>
<height>20</height>
@@ -382,7 +382,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>119</width>
<height>21</height>
@@ -423,7 +423,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>119</width>
<height>20</height>
@@ -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>
@@ -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..323c777 100644
--- a/src/newprofilewizardopenvpnauth.ui
+++ b/src/newprofilewizardopenvpnauth.ui
@@ -76,7 +76,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>191</width>
<height>20</height>
@@ -120,7 +120,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>46</width>
<height>20</height>
@@ -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..12200b0 100644
--- a/src/newprofilewizardp12certselection.ui
+++ b/src/newprofilewizardp12certselection.ui
@@ -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..1f5eb74 100644
--- a/src/newprofilewizardpptp.ui
+++ b/src/newprofilewizardpptp.ui
@@ -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..51b6ec3 100644
--- a/src/newprofilewizardpsk.ui
+++ b/src/newprofilewizardpsk.ui
@@ -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..e10879d 100644
--- a/src/newprofilewizardracoon.ui
+++ b/src/newprofilewizardracoon.ui
@@ -107,7 +107,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>101</width>
<height>20</height>
@@ -142,7 +142,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>101</width>
<height>21</height>
@@ -188,7 +188,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>101</width>
<height>21</height>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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..8c47fdd 100644
--- a/src/newprofilewizardtypeselection.ui
+++ b/src/newprofilewizardtypeselection.ui
@@ -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..d1c6333 100644
--- a/src/newprofilewizarduser.ui
+++ b/src/newprofilewizarduser.ui
@@ -108,7 +108,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>211</width>
<height>21</height>
@@ -143,7 +143,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>211</width>
<height>21</height>
@@ -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/preferencesdialog.cpp b/src/preferencesdialog.cpp
index 4ea5460..26e842a 100644
--- a/src/preferencesdialog.cpp
+++ b/src/preferencesdialog.cpp
@@ -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;
@@ -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();
@@ -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();
@@ -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);
}
@@ -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();
}
}
diff --git a/src/profilecertoptionsbase.ui b/src/profilecertoptionsbase.ui
index f022efd..2ffce66 100644
--- a/src/profilecertoptionsbase.ui
+++ b/src/profilecertoptionsbase.ui
@@ -80,7 +80,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>80</width>
<height>21</height>
@@ -107,7 +107,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>20</height>
@@ -153,7 +153,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>330</width>
<height>20</height>
@@ -204,7 +204,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>115</width>
<height>20</height>
@@ -225,7 +225,7 @@
<property name="name">
<cstring>x509certURLRequester</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>50</width>
<height>0</height>
@@ -268,7 +268,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>75</width>
<height>20</height>
@@ -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>
@@ -372,7 +372,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>109</width>
<height>20</height>
@@ -422,7 +422,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>20</height>
@@ -474,7 +474,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -520,7 +520,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>152</width>
<height>20</height>
@@ -555,7 +555,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>93</width>
<height>20</height>
@@ -593,7 +593,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -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..7f079e2 100644
--- a/src/profileciscooptionsbase.ui
+++ b/src/profileciscooptionsbase.ui
@@ -64,7 +64,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>131</width>
<height>20</height>
@@ -116,7 +116,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>121</width>
<height>21</height>
@@ -154,7 +154,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>81</width>
<height>21</height>
@@ -215,7 +215,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>91</width>
<height>21</height>
@@ -250,7 +250,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>87</width>
<height>20</height>
@@ -310,7 +310,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>50</width>
<height>20</height>
@@ -359,7 +359,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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..ee9c1d5 100644
--- a/src/profilecmdexecafterconnectoptionsbase.ui
+++ b/src/profilecmdexecafterconnectoptionsbase.ui
@@ -59,7 +59,7 @@
<property name="enabled">
<bool>false</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>300</height>
@@ -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..ee627bd 100644
--- a/src/profilegeneraloptionsbase.ui
+++ b/src/profilegeneraloptionsbase.ui
@@ -98,7 +98,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>70</height>
@@ -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..06f5909 100644
--- a/src/profileipsecoptionsbase.ui
+++ b/src/profileipsecoptionsbase.ui
@@ -68,7 +68,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>199</width>
<height>21</height>
@@ -121,7 +121,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>28</width>
<height>20</height>
@@ -193,7 +193,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>160</width>
<height>21</height>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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..0cdca92 100644
--- a/src/profilemanagerbase.cpp
+++ b/src/profilemanagerbase.cpp
@@ -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..b7b42e2 100644
--- a/src/profilenetworkgeneraloptionsbase.ui
+++ b/src/profilenetworkgeneraloptionsbase.ui
@@ -85,7 +85,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>71</width>
<height>20</height>
@@ -171,7 +171,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>21</height>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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..a20405c 100644
--- a/src/profilenetworkhttpproxyoptionsbase.ui
+++ b/src/profilenetworkhttpproxyoptionsbase.ui
@@ -151,7 +151,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>21</height>
@@ -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>
@@ -228,7 +228,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>103</width>
<height>21</height>
@@ -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..ac4acde 100644
--- a/src/profilenetworknatoptionsbase.ui
+++ b/src/profilenetworknatoptionsbase.ui
@@ -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/profilenetworkrouteoptionsbase.ui b/src/profilenetworkrouteoptionsbase.ui
index cc27be3..8906761 100644
--- a/src/profilenetworkrouteoptionsbase.ui
+++ b/src/profilenetworkrouteoptionsbase.ui
@@ -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>
@@ -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..6d39e72 100644
--- a/src/profilenetworkvirtualipoptionsbase.ui
+++ b/src/profilenetworkvirtualipoptionsbase.ui
@@ -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..95446da 100644
--- a/src/profileopenvpnoptionsbase.ui
+++ b/src/profileopenvpnoptionsbase.ui
@@ -163,7 +163,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>31</height>
@@ -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>
@@ -555,7 +555,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>74</width>
<height>20</height>
@@ -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..e9a6cf4 100644
--- a/src/profilepptpoptionsbase.ui
+++ b/src/profilepptpoptionsbase.ui
@@ -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>
@@ -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>
@@ -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>
@@ -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..6e28405 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>
@@ -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..d41c1d5 100644
--- a/src/profileracoonoptionsbase.ui
+++ b/src/profileracoonoptionsbase.ui
@@ -129,7 +129,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>91</width>
<height>21</height>
@@ -175,7 +175,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>101</width>
<height>21</height>
@@ -224,7 +224,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>20</height>
@@ -259,7 +259,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>101</width>
<height>21</height>
@@ -300,7 +300,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>61</width>
<height>21</height>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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..d3b6384 100644
--- a/src/profilesmartcardoptionsbase.ui
+++ b/src/profilesmartcardoptionsbase.ui
@@ -83,7 +83,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>210</width>
<height>20</height>
@@ -229,7 +229,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>241</width>
<height>21</height>
@@ -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..4610ebd 100644
--- a/src/profilesshoptionsbase.ui
+++ b/src/profilesshoptionsbase.ui
@@ -59,7 +59,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>82</width>
<height>20</height>
@@ -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>
@@ -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>
@@ -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..ebf8792 100644
--- a/src/profileuseroptionsbase.ui
+++ b/src/profileuseroptionsbase.ui
@@ -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>
@@ -183,7 +183,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>211</width>
<height>21</height>
@@ -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..3de270f 100644
--- a/src/profilevtunoptionsbase.ui
+++ b/src/profilevtunoptionsbase.ui
@@ -47,7 +47,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>439</width>
<height>21</height>
@@ -98,7 +98,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>50</width>
<height>20</height>
@@ -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/toolsinfodialog.cpp b/src/toolsinfodialog.cpp
index e638238..1d64c5c 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 );
@@ -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..aaca26a 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -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 );
diff --git a/src/vpntypesinfodialog.cpp b/src/vpntypesinfodialog.cpp
index fb1b712..2eeb90d 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);