diff --git a/knetworkmanager-0.9/src/connection_editor.ui b/knetworkmanager-0.9/src/connection_editor.ui
index 3a68f2c..27a69ba 100644
--- a/knetworkmanager-0.9/src/connection_editor.ui
+++ b/knetworkmanager-0.9/src/connection_editor.ui
@@ -78,7 +78,7 @@
Expanding
-
+
20
240
diff --git a/knetworkmanager-0.9/src/connection_setting_cdma.ui b/knetworkmanager-0.9/src/connection_setting_cdma.ui
index 5a81378..af1d3e6 100644
--- a/knetworkmanager-0.9/src/connection_setting_cdma.ui
+++ b/knetworkmanager-0.9/src/connection_setting_cdma.ui
@@ -94,7 +94,7 @@
Expanding
-
+
146
20
@@ -113,7 +113,7 @@
Expanding
-
+
20
16
diff --git a/knetworkmanager-0.9/src/connection_setting_gsm.ui b/knetworkmanager-0.9/src/connection_setting_gsm.ui
index c03e11e..3809673 100644
--- a/knetworkmanager-0.9/src/connection_setting_gsm.ui
+++ b/knetworkmanager-0.9/src/connection_setting_gsm.ui
@@ -186,7 +186,7 @@
Expanding
-
+
171
20
@@ -270,7 +270,7 @@
Expanding
-
+
20
51
diff --git a/knetworkmanager-0.9/src/connection_setting_info.ui b/knetworkmanager-0.9/src/connection_setting_info.ui
index bc99ca2..72a6e87 100644
--- a/knetworkmanager-0.9/src/connection_setting_info.ui
+++ b/knetworkmanager-0.9/src/connection_setting_info.ui
@@ -42,7 +42,7 @@
Expanding
-
+
20
30
diff --git a/knetworkmanager-0.9/src/connection_setting_ppp.ui b/knetworkmanager-0.9/src/connection_setting_ppp.ui
index 0b47e61..4f051a7 100644
--- a/knetworkmanager-0.9/src/connection_setting_ppp.ui
+++ b/knetworkmanager-0.9/src/connection_setting_ppp.ui
@@ -48,7 +48,7 @@
Expanding
-
+
20
50
@@ -286,7 +286,7 @@
Expanding
-
+
20
41
diff --git a/knetworkmanager-0.9/src/connection_setting_serial.ui b/knetworkmanager-0.9/src/connection_setting_serial.ui
index 67e0586..ef2fec4 100644
--- a/knetworkmanager-0.9/src/connection_setting_serial.ui
+++ b/knetworkmanager-0.9/src/connection_setting_serial.ui
@@ -165,7 +165,7 @@
Expanding
-
+
20
141
diff --git a/knetworkmanager-0.9/src/connection_setting_wireless.ui b/knetworkmanager-0.9/src/connection_setting_wireless.ui
index 49df622..9415ce4 100644
--- a/knetworkmanager-0.9/src/connection_setting_wireless.ui
+++ b/knetworkmanager-0.9/src/connection_setting_wireless.ui
@@ -50,7 +50,7 @@
Expanding
-
+
282
20
diff --git a/knetworkmanager-0.9/src/connection_setting_wireless_security_wpacipher.ui b/knetworkmanager-0.9/src/connection_setting_wireless_security_wpacipher.ui
index 430ff9c..a402e66 100644
--- a/knetworkmanager-0.9/src/connection_setting_wireless_security_wpacipher.ui
+++ b/knetworkmanager-0.9/src/connection_setting_wireless_security_wpacipher.ui
@@ -105,7 +105,7 @@
Expanding
-
+
60
20
diff --git a/knetworkmanager-0.9/src/connection_setting_wireless_security_wpaversion.ui b/knetworkmanager-0.9/src/connection_setting_wireless_security_wpaversion.ui
index 83729e2..11b1655 100644
--- a/knetworkmanager-0.9/src/connection_setting_wireless_security_wpaversion.ui
+++ b/knetworkmanager-0.9/src/connection_setting_wireless_security_wpaversion.ui
@@ -65,7 +65,7 @@
Expanding
-
+
50
20
diff --git a/knetworkmanager-0.9/src/connection_settings.ui b/knetworkmanager-0.9/src/connection_settings.ui
index 794c0e3..c7994de 100644
--- a/knetworkmanager-0.9/src/connection_settings.ui
+++ b/knetworkmanager-0.9/src/connection_settings.ui
@@ -82,7 +82,7 @@
Expanding
-
+
180
20
diff --git a/knetworkmanager-0.9/src/knetworkmanager-device_tray.cpp b/knetworkmanager-0.9/src/knetworkmanager-device_tray.cpp
index 219508f..e8d80b5 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-device_tray.cpp
+++ b/knetworkmanager-0.9/src/knetworkmanager-device_tray.cpp
@@ -266,7 +266,7 @@ void DeviceTray::updateActiveConnection(NMDeviceState state)
{
Info* info = dynamic_cast(active_conn->getSetting(NM_SETTING_CONNECTION_SETTING_NAME));
if (info)
- info->setTimestamp(TQDateTime::tqcurrentDateTime());
+ info->setTimestamp(TQDateTime::currentDateTime());
}
}
diff --git a/knetworkmanager-0.9/src/knetworkmanager-pluginmanager.cpp b/knetworkmanager-0.9/src/knetworkmanager-pluginmanager.cpp
index 8bd3f85..b09f72d 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-pluginmanager.cpp
+++ b/knetworkmanager-0.9/src/knetworkmanager-pluginmanager.cpp
@@ -42,7 +42,7 @@ PluginManager::PluginManager(TQObject* parent, const char* name)
: TQObject(parent, name)
{
// get list of available plugins
- this->_plugins = KPluginInfo::fromServices( KTrader::self()->query( TQString::tqfromLatin1( "KNetworkManager/Plugin" )));
+ this->_plugins = KPluginInfo::fromServices( KTrader::self()->query( TQString::fromLatin1( "KNetworkManager/Plugin" )));
// a bit debug output
for(TQValueList::ConstIterator it = _plugins.begin(); it != _plugins.end(); ++it)
@@ -125,8 +125,8 @@ Plugin* PluginManager::loadPlugin(const TQString& pluginID)
// try to load Plugin
int error = 0;
KPluginInfo* info = infoForPluginID(pluginID);
- Plugin *plugin = KParts::ComponentFactory::createInstanceFromQuery( TQString::tqfromLatin1( "KNetworkManager/Plugin" ),
- TQString::tqfromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).tqarg( pluginID ), this, 0, TQStringList(), &error );
+ Plugin *plugin = KParts::ComponentFactory::createInstanceFromQuery( TQString::fromLatin1( "KNetworkManager/Plugin" ),
+ TQString::fromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).tqarg( pluginID ), this, 0, TQStringList(), &error );
// plugin loaded?
if (plugin)
diff --git a/knetworkmanager-0.9/src/knetworkmanager-tray.cpp b/knetworkmanager-0.9/src/knetworkmanager-tray.cpp
index 24a91a9..43ec333 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-tray.cpp
+++ b/knetworkmanager-0.9/src/knetworkmanager-tray.cpp
@@ -991,7 +991,7 @@ void Tray::updateActiveConnection(NMDeviceState state)
{
Info* info = dynamic_cast(active_conn->getSetting(NM_SETTING_CONNECTION_SETTING_NAME));
if (info)
- info->setTimestamp(TQDateTime::tqcurrentDateTime());
+ info->setTimestamp(TQDateTime::currentDateTime());
}
}
}
diff --git a/knetworkmanager-0.9/src/knetworkmanager-vpnauthenticationdialog.cpp b/knetworkmanager-0.9/src/knetworkmanager-vpnauthenticationdialog.cpp
index 45ea830..6f334d4 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-vpnauthenticationdialog.cpp
+++ b/knetworkmanager-0.9/src/knetworkmanager-vpnauthenticationdialog.cpp
@@ -109,7 +109,7 @@ VPNAuthenticationDialog::VPNAuthenticationDialog(VPNConnection* conn, TQWidget*
widget->setFocus();
// resize
- this->resize(tqminimumSizeHint());
+ this->resize(minimumSizeHint());
}
VPNAuthenticationDialog::~VPNAuthenticationDialog()
diff --git a/knetworkmanager-0.9/src/knetworkmanager-wireless_menuitem.cpp b/knetworkmanager-0.9/src/knetworkmanager-wireless_menuitem.cpp
index 387d052..e9157f3 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-wireless_menuitem.cpp
+++ b/knetworkmanager-0.9/src/knetworkmanager-wireless_menuitem.cpp
@@ -115,7 +115,7 @@ WirelessNetworkItem::paint (TQPainter *p, const TQColorGroup &/*cg*/, bool highl
{
int spacer = 0;
pbarStrength->setTotalSteps (100);
- pbarStrength->tqsetSizePolicy (TQSizePolicy ((TQSizePolicy::SizeType) 0, (TQSizePolicy::SizeType) 0, 0, 0, pbarStrength->sizePolicy ().hasHeightForWidth ()));
+ pbarStrength->setSizePolicy (TQSizePolicy ((TQSizePolicy::SizeType) 0, (TQSizePolicy::SizeType) 0, 0, 0, pbarStrength->sizePolicy ().hasHeightForWidth ()));
pbarStrength->setFixedHeight (_height - 2);
pbarStrength->setProgress (_net.getStrength());
pbarStrength->setPercentageVisible (false);
@@ -130,20 +130,20 @@ WirelessNetworkItem::paint (TQPainter *p, const TQColorGroup &/*cg*/, bool highl
if (_net.isEncrypted()) {
TQPixmap pmLock = SmallIcon ("lock", TQIconSet::Automatic);
- p->drawPixmap (parent->tqsizeHint ().width () - pbarStrength->width () - _space - pmLock.size ().width () - 6, y + _border, pmLock);
+ p->drawPixmap (parent->sizeHint ().width () - pbarStrength->width () - _space - pmLock.size ().width () - 6, y + _border, pmLock);
spacer = pmLock.size ().width () + 4;
}
if (_adhoc) {
TQPixmap pmAdHoc = SmallIcon ("system", TQIconSet::Automatic);
- p->drawPixmap (parent->tqsizeHint ().width () - pbarStrength->width () - _space - pmAdHoc.size ().width () - spacer - 6, y + _border, pmAdHoc);
+ p->drawPixmap (parent->sizeHint ().width () - pbarStrength->width () - _space - pmAdHoc.size ().width () - spacer - 6, y + _border, pmAdHoc);
}
- p->drawPixmap (parent->tqsizeHint ().width () - pbarStrength->width () - _space, y +_border, TQPixmap::grabWidget (pbarStrength));
+ p->drawPixmap (parent->sizeHint ().width () - pbarStrength->width () - _space, y +_border, TQPixmap::grabWidget (pbarStrength));
}
TQSize
-WirelessNetworkItem::tqsizeHint ()
+WirelessNetworkItem::sizeHint ()
{
return TQSize (_width, _height);
}
@@ -169,7 +169,7 @@ WirelessNetworkItem::WirelessNetworkItem (TQWidget* p, Device* dev, WirelessNetw
// figure out the height of the text
_textHeight = kapp->fontMetrics ().size (AlignLeft | AlignVCenter | DontClip | ShowPrefix, _net.getDisplaySsid()).height ();
// the item is height of the text plus the default frame width
- _height = _textHeight + kapp->tqstyle ().tqpixelMetric (TQStyle::PM_DefaultFrameWidth);
+ _height = _textHeight + kapp->tqstyle ().pixelMetric (TQStyle::PM_DefaultFrameWidth);
/* _height needs to be at least the height of a SmallIcon plus a border of one px (top & bottom)*/
if (_height < _widgetHeight) {
_height = _widgetHeight + 2;
@@ -177,8 +177,8 @@ WirelessNetworkItem::WirelessNetworkItem (TQWidget* p, Device* dev, WirelessNetw
/* border required for pmLock and pbarStrength */
_border = 1;
- if (_border == kapp->tqstyle ().tqpixelMetric (TQStyle::PM_DefaultFrameWidth))
- _border += 2 * kapp->tqstyle ().tqpixelMetric (TQStyle::PM_DefaultFrameWidth);
+ if (_border == kapp->tqstyle ().pixelMetric (TQStyle::PM_DefaultFrameWidth))
+ _border += 2 * kapp->tqstyle ().pixelMetric (TQStyle::PM_DefaultFrameWidth);
if (_border == 0)
_border ++;
@@ -209,7 +209,7 @@ WirelessNetworkItem::WirelessNetworkItem (TQWidget* p, Device* dev, WirelessNetw
// figure out the height of the text
_textHeight = kapp->fontMetrics ().size (AlignLeft | AlignVCenter | DontClip | ShowPrefix, _net.getDisplaySsid()).height ();
// the item is height of the text plus the default frame width
- _height = _textHeight + kapp->tqstyle ().tqpixelMetric (TQStyle::PM_DefaultFrameWidth);
+ _height = _textHeight + kapp->tqstyle ().pixelMetric (TQStyle::PM_DefaultFrameWidth);
/* _height needs to be at least the height of a SmallIcon plus a border of one px (top & bottom)*/
if (_height < _widgetHeight) {
_height = _widgetHeight + 2;
@@ -217,8 +217,8 @@ WirelessNetworkItem::WirelessNetworkItem (TQWidget* p, Device* dev, WirelessNetw
/* border required for pmLock and pbarStrength */
_border = 1;
- if (_border == kapp->tqstyle ().tqpixelMetric (TQStyle::PM_DefaultFrameWidth))
- _border += 2 * kapp->tqstyle ().tqpixelMetric (TQStyle::PM_DefaultFrameWidth);
+ if (_border == kapp->tqstyle ().pixelMetric (TQStyle::PM_DefaultFrameWidth))
+ _border += 2 * kapp->tqstyle ().pixelMetric (TQStyle::PM_DefaultFrameWidth);
if (_border == 0)
_border ++;
diff --git a/knetworkmanager-0.9/src/knetworkmanager-wireless_menuitem.h b/knetworkmanager-0.9/src/knetworkmanager-wireless_menuitem.h
index c66c694..11edbde 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-wireless_menuitem.h
+++ b/knetworkmanager-0.9/src/knetworkmanager-wireless_menuitem.h
@@ -60,7 +60,7 @@ class WirelessNetworkItem : public NetworkMenuItem, public TQCustomMenuItem
TQProgressBar* pbarStrength;
void paint (TQPainter*, const TQColorGroup&, bool, bool, int, int, int, int);
- TQSize tqsizeHint ();
+ TQSize sizeHint ();
public slots:
void slotActivate();
diff --git a/knetworkmanager-0.9/src/vpnauthentication.ui b/knetworkmanager-0.9/src/vpnauthentication.ui
index 0c49472..b62216a 100644
--- a/knetworkmanager-0.9/src/vpnauthentication.ui
+++ b/knetworkmanager-0.9/src/vpnauthentication.ui
@@ -64,7 +64,7 @@
Expanding
-
+
40
20
@@ -92,7 +92,7 @@
Expanding
-
+
20
20
diff --git a/knetworkmanager-0.9/vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp b/knetworkmanager-0.9/vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp
index 0593a08..8ce99a8 100644
--- a/knetworkmanager-0.9/vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp
+++ b/knetworkmanager-0.9/vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp
@@ -166,7 +166,7 @@ TQString OpenVPNConfig::findOpenVPNBinary()
void OpenVPNConfig::receiveCipherData(KProcess*, char* buffer, int len)
{
// add possible cipher modes to the combobox
- TQStringList cipherModes = TQStringList::split("\n", TQString::tqfromLatin1(buffer, len), false );
+ TQStringList cipherModes = TQStringList::split("\n", TQString::fromLatin1(buffer, len), false );
for (TQStringList::ConstIterator it = cipherModes.begin(); it != cipherModes.end(); ++it)
{
_openvpnWidget->cboCipher->insertItem((*it));
@@ -181,7 +181,7 @@ void OpenVPNConfig::getCipherModes()
{
KProcess* cipherHelper = new KProcess();
cipherHelper->setUseShell(true, "/bin/sh");
- *cipherHelper << TQString::tqfromLatin1("%1 --show-ciphers | awk '/^[A-Z][A-Z0-9]+-/ { print $1 }'").tqarg(openvpn);
+ *cipherHelper << TQString::fromLatin1("%1 --show-ciphers | awk '/^[A-Z][A-Z0-9]+-/ { print $1 }'").tqarg(openvpn);
connect (cipherHelper, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), this, TQT_SLOT(receiveCipherData(KProcess*, char*, int)));
kdDebug() << "starting openvpn to get cipher modes" << endl;
if (!cipherHelper->start(KProcess::Block, KProcess::Stdout))
diff --git a/knetworkmanager-0.9/vpn-plugins/openvpn/src/openvpnauth.ui b/knetworkmanager-0.9/vpn-plugins/openvpn/src/openvpnauth.ui
index 4cb6578..3bea9b4 100644
--- a/knetworkmanager-0.9/vpn-plugins/openvpn/src/openvpnauth.ui
+++ b/knetworkmanager-0.9/vpn-plugins/openvpn/src/openvpnauth.ui
@@ -40,7 +40,7 @@
Expanding
-
+
40
20
@@ -57,7 +57,7 @@
Expanding
-
+
20
40
diff --git a/knetworkmanager-0.9/vpn-plugins/openvpn/src/openvpnprop.ui b/knetworkmanager-0.9/vpn-plugins/openvpn/src/openvpnprop.ui
index c136050..a6d0945 100644
--- a/knetworkmanager-0.9/vpn-plugins/openvpn/src/openvpnprop.ui
+++ b/knetworkmanager-0.9/vpn-plugins/openvpn/src/openvpnprop.ui
@@ -44,7 +44,7 @@
Expanding
-
+
20
16
@@ -444,7 +444,7 @@
Expanding
-
+
20
30
diff --git a/knetworkmanager-0.9/vpn-plugins/pptp/src/pptpauth.ui b/knetworkmanager-0.9/vpn-plugins/pptp/src/pptpauth.ui
index 5388561..4078684 100644
--- a/knetworkmanager-0.9/vpn-plugins/pptp/src/pptpauth.ui
+++ b/knetworkmanager-0.9/vpn-plugins/pptp/src/pptpauth.ui
@@ -32,7 +32,7 @@
Expanding
-
+
20
20
diff --git a/knetworkmanager-0.9/vpn-plugins/pptp/src/pptpprop.ui b/knetworkmanager-0.9/vpn-plugins/pptp/src/pptpprop.ui
index b57e065..c966535 100644
--- a/knetworkmanager-0.9/vpn-plugins/pptp/src/pptpprop.ui
+++ b/knetworkmanager-0.9/vpn-plugins/pptp/src/pptpprop.ui
@@ -60,7 +60,7 @@
Expanding
-
+
20
30
@@ -99,7 +99,7 @@
Expanding
-
+
20
40
@@ -124,7 +124,7 @@
Expanding
-
+
220
20
@@ -141,7 +141,7 @@
Expanding
-
+
230
20
diff --git a/knetworkmanager-0.9/vpn-plugins/strongswan/src/strongswanauth.ui b/knetworkmanager-0.9/vpn-plugins/strongswan/src/strongswanauth.ui
index 332d3c8..244a6ac 100644
--- a/knetworkmanager-0.9/vpn-plugins/strongswan/src/strongswanauth.ui
+++ b/knetworkmanager-0.9/vpn-plugins/strongswan/src/strongswanauth.ui
@@ -32,7 +32,7 @@
Expanding
-
+
20
100
@@ -75,7 +75,7 @@
Expanding
-
+
130
20
diff --git a/knetworkmanager-0.9/vpn-plugins/strongswan/src/strongswanprop.ui b/knetworkmanager-0.9/vpn-plugins/strongswan/src/strongswanprop.ui
index d55c066..a728a1d 100644
--- a/knetworkmanager-0.9/vpn-plugins/strongswan/src/strongswanprop.ui
+++ b/knetworkmanager-0.9/vpn-plugins/strongswan/src/strongswanprop.ui
@@ -143,7 +143,7 @@
Expanding
-
+
20
16
@@ -197,7 +197,7 @@
Expanding
-
+
20
51
@@ -214,7 +214,7 @@
Expanding
-
+
231
31
diff --git a/knetworkmanager-0.9/vpn-plugins/vpnc/src/vpncprop.ui b/knetworkmanager-0.9/vpn-plugins/vpnc/src/vpncprop.ui
index ab2b8fc..c9fbd43 100644
--- a/knetworkmanager-0.9/vpn-plugins/vpnc/src/vpncprop.ui
+++ b/knetworkmanager-0.9/vpn-plugins/vpnc/src/vpncprop.ui
@@ -132,7 +132,7 @@
Expanding
-
+
20
40
@@ -253,7 +253,7 @@
Expanding
-
+
20
20