From 2f791ecf181cebc107ea2f68f5f7b29456844f39 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 2 Jul 2011 07:29:25 +0000 Subject: TQt4 port wlassistant This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/wlassistant@1239055 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/ui_netparamswizard.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/ui_netparamswizard.cpp') diff --git a/src/ui_netparamswizard.cpp b/src/ui_netparamswizard.cpp index 9945eea..a2b46ce 100644 --- a/src/ui_netparamswizard.cpp +++ b/src/ui_netparamswizard.cpp @@ -22,16 +22,16 @@ #include "ui_netparamswizard.h" #include "netparams.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -ui_NetParamsWizard::ui_NetParamsWizard(QWidget* parent, const char* name, bool modal, WFlags fl) - : NetParamsWizard(parent,name, modal,fl) +ui_NetParamsWizard::ui_NetParamsWizard(TQWidget* tqparent, const char* name, bool modal, WFlags fl) + : NetParamsWizard(tqparent,name, modal,fl) { backButton()->setIconSet( SmallIconSet("back") ); nextButton()->setIconSet( SmallIconSet("forward") ); @@ -52,10 +52,10 @@ void ui_NetParamsWizard::setWepEnabled( bool w ) setAppropriate( page(4), w ); } -void ui_NetParamsWizard::setWpaEnabled( bool w, QStringList settings ) +void ui_NetParamsWizard::setWpaEnabled( bool w, TQStringList settings ) { setAppropriate( page(5), w ); - if (w) labelWpaSettings->setText( QString("%1").arg( settings.join("
") ) ); + if (w) labelWpaSettings->setText( TQString("%1").tqarg( settings.join("
") ) ); } @@ -68,7 +68,7 @@ void ui_NetParamsWizard::next() { if (indexOf(currentPage())==2) setAppropriate( page(3), radioManualConfig->isChecked() ); - QWizard::next(); + TQWizard::next(); } WANetParams ui_NetParamsWizard::readNetParams( WANetParams & np ) @@ -79,7 +79,7 @@ WANetParams ui_NetParamsWizard::readNetParams( WANetParams & np ) if (!np.dhcp) { // manual configuration option selected np.ip = ip->text(); np.broadcast = broadcast->text(); - np.netmask = netmask->text(); + np.nettqmask = nettqmask->text(); np.gateway = gateway->text(); np.domain = domain->text(); np.dns1 = dns1->text(); -- cgit v1.2.3