1 files changed, 14 insertions, 14 deletions

diff --git a/knetworkconf/knetworkconf/kadddevicecontainer.cpp b/knetworkconf/knetworkconf/kadddevicecontainer.cpp
index 129d5c9..6690739 100644
--- a/knetworkconf/knetworkconf/kadddevicecontainer.cpp
+++ b/knetworkconf/knetworkconf/kadddevicecontainer.cpp
@@ -17,24 +17,24 @@
  ***************************************************************************/
 #include "kadddevicecontainer.h"
 
-KAddDeviceContainer::KAddDeviceContainer(TQWidget *parent, const char *name)
- : KDialog(parent, name)
+KAddDeviceContainer::KAddDeviceContainer(TQWidget *tqparent, const char *name)
+ : KDialog(tqparent, name)
 {
     _modified = false;   
     _advanced = false;
  
      //Setup extension dialog
     setExtension( new KAddDeviceDlgExtension( this ) );
-    setOrientation( Vertical );
+    setOrientation(Qt::Vertical );
    
     //Create dialog that contains the KAddDeviceDlg and KAddDeviceWifiExt (when 
     //configuring a wireless interface) widgets 
     TQPixmap activeEthernetDeviceImg(BarIcon("network_connected_lan_knc"));
     setIcon(activeEthernetDeviceImg);
-    //First create a main QHBoxLayout
+    //First create a main TQHBoxLayout
     mainLayout = new TQVBoxLayout( this, 10, 2, "mainLayout"); 
     
-    //Create the Addvanced settings, Ok and Cancel buttons and add them to a QHBoxLayout
+    //Create the Addvanced settings, Ok and Cancel buttons and add them to a TQHBoxLayout
     buttonsLayout = new TQHBoxLayout( 0, 0, 4, "buttonsLayout"); 
     kpbAdvanced = new KPushButton( this, "kpbAdvanced" );
     buttonsLayout->addWidget( kpbAdvanced );
@@ -49,7 +49,7 @@ KAddDeviceContainer::KAddDeviceContainer(TQWidget *parent, const char *name)
     kpbCancel = new KPushButton( this, "kpbCancel" );
     buttonsLayout->addWidget( kpbCancel );
             
-    setCaption( TQString::null );
+    setCaption( TQString() );
     kpbAdvanced->setText( i18n( "&Advanced Settings" ) );
     TQToolTip::add( kpbAdvanced, i18n( "Toggle between advanced and basic settings" ) );
     TQWhatsThis::add( kpbAdvanced, i18n( "Toggle between advanced and basic settings" ) );
@@ -58,7 +58,7 @@ KAddDeviceContainer::KAddDeviceContainer(TQWidget *parent, const char *name)
     kpbCancel->setText( i18n( "&Cancel" ) );
     TQToolTip::add( kpbCancel, i18n( "Forget changes" ) );
 
-    //Creat and add the KAddDeviceDlg widget to the main layout
+    //Creat and add the KAddDeviceDlg widget to the main tqlayout
     addDlg = new KAddDeviceDlg(this);
     mainLayout->addWidget(addDlg);
     mainLayout->setResizeMode(TQLayout::Auto);
@@ -67,14 +67,14 @@ KAddDeviceContainer::KAddDeviceContainer(TQWidget *parent, const char *name)
     connect((KAddDeviceDlgExtension*)extension(),TQT_SIGNAL(valueChangedSignal(int)),this,TQT_SLOT(toggleApplyButtonSlot(int)));
     connect(addDlg->kleIPAddress,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(toggleApplyButtonSlot(const TQString&)));
 //    connect(addDlg->kleGateway,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(toggleApplyButtonSlot(const TQString&)));
-    connect(addDlg->kcbNetmask,TQT_SIGNAL(activated(int)),this,TQT_SLOT(toggleApplyButtonSlot(int)));
+    connect(addDlg->kcbNettqmask,TQT_SIGNAL(activated(int)),this,TQT_SLOT(toggleApplyButtonSlot(int)));
     connect(addDlg->kcbAutoBootProto,TQT_SIGNAL(activated(const TQString&)),this,TQT_SLOT(toggleApplyButtonSlot(const TQString&)));
     connect(addDlg->kcbstartAtBoot,TQT_SIGNAL(stateChanged(int)),this,TQT_SLOT(toggleApplyButtonSlot(int)));
     connect(addDlg->rbBootProtoAuto,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(toggleAdvancedOptionsSlot(bool)));
     connect(addDlg->rbBootProtoAuto,TQT_SIGNAL(toggled(bool)),kpbAdvanced,TQT_SLOT(setDisabled(bool)));
     connect(addDlg->rbBootProtoAuto,TQT_SIGNAL(stateChanged(int)),this,TQT_SLOT(toggleApplyButtonSlot(int)));
    // connect(addDlg->rbBootProtoAuto,TQT_SIGNAL(toggled(bool)),addDlg->kleIPAddress,TQT_SLOT(setDisabled(bool)));
-   // connect(addDlg->rbBootProtoAuto,TQT_SIGNAL(toggled(bool)),addDlg->kcbNetmask,TQT_SLOT(setDisabled(bool)));        
+   // connect(addDlg->rbBootProtoAuto,TQT_SIGNAL(toggled(bool)),addDlg->kcbNettqmask,TQT_SLOT(setDisabled(bool)));        
    // connect(addDlg->rbBootProtoManual,TQT_SIGNAL(toggled(bool)),addDlg->kcbAutoBootProto,TQT_SLOT(setDisabled(bool)));
     connect(kpbCancel,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelSlot()));
     connect(kpbApply,TQT_SIGNAL(clicked()),this,TQT_SLOT(verifyDeviceInfoSlot()));
@@ -120,7 +120,7 @@ void KAddDeviceContainer::verifyDeviceInfoSlot()
   if (addDlg->rbBootProtoManual->isChecked())
   {	
     TQString ipAddress = addDlg->kleIPAddress->text();
-    TQString netmask = addDlg->kcbNetmask->currentText();
+    TQString nettqmask = addDlg->kcbNettqmask->currentText();
     TQString broadcast = advancedOptions->kleBroadcast->text();
     TQString gateway = advancedOptions->kleGateway->text();
     
@@ -128,8 +128,8 @@ void KAddDeviceContainer::verifyDeviceInfoSlot()
     {
       KMessageBox::error(this,i18n("The format of the specified IP address is not valid."),i18n("Invalid IP Address"));
     }    
-    else if (_advanced && !KAddressValidator::isNetmaskValid(netmask))
-        KMessageBox::error(this,i18n("The format of the specified netmask is not valid."),i18n("Invalid IP Address"));
+    else if (_advanced && !KAddressValidator::isNettqmaskValid(nettqmask))
+        KMessageBox::error(this,i18n("The format of the specified nettqmask is not valid."),i18n("Invalid IP Address"));
         
     else if (!broadcast.isEmpty() && _advanced && !KAddressValidator::isBroadcastValid(broadcast))
         KMessageBox::error(this,i18n("The format of the specified broadcast is not valid."),i18n("Invalid IP Address"));
@@ -172,12 +172,12 @@ void KAddDeviceContainer::advancedOptionsSlot()
     if (!_advanced)
     {
       kpbAdvanced->setText(i18n("Basic Settings"));
-      addDlg->kcbNetmask->setEditable(true);	
+      addDlg->kcbNettqmask->setEditable(true);	
     }
     else
     {
       kpbAdvanced->setText(i18n("Advanced Settings"));
-      addDlg->kcbNetmask->setEditable(false);      
+      addDlg->kcbNettqmask->setEditable(false);      
     }
     _advanced = !_advanced;
     showExtension(_advanced );