Ignore:
Timestamp:
04/12/13 08:40:12 (20 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.1-release, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
bb72d33
Parents:
afd00d6
Message:

Add all the changes for related using of split pcbsd-utils libs

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-netmanager/src/wificonfig/wificonfigwidgetbase.cpp

    r1f0939e r0cfe72f  
    4949        } 
    5050         
    51         if ( ! Utils::validateIPV4(lineIP->text()) ) { 
     51        if ( ! pcbsd::Utils::validateIPV4(lineIP->text()) ) { 
    5252            QMessageBox::warning( this, tr("Warning"), 
    5353            tr("IP Address is out of range! (") + lineIP->text() + tr(") Fields must be between 0-255.") ); 
     
    5555               } 
    5656         
    57         if ( ! Utils::validateIPV4(lineNetmask->text()) ) { 
     57        if ( ! pcbsd::Utils::validateIPV4(lineNetmask->text()) ) { 
    5858            QMessageBox::warning( this, tr("Warning"), 
    5959            tr("Netmask is out of range! (") + lineNetmask->text() + tr(") Fields must be between 0-255.") ); 
     
    8888    if ( checkDisableWireless->isChecked() ) 
    8989    { 
    90          Utils::setConfFileValue( "/etc/rc.conf", "ifconfig_" + DeviceName, "", -1); 
     90         pcbsd::Utils::setConfFileValue( "/etc/rc.conf", "ifconfig_" + DeviceName, "", -1); 
    9191         runCommand("ifconfig " + DeviceName + " down"); 
    9292         pushApply->setEnabled(FALSE); 
     
    9595 
    9696    // Save the config 
    97     Utils::setConfFileValue( "/etc/rc.conf", "ifconfig_lagg0", "", -1); 
    98     Utils::setConfFileValue( "/etc/rc.conf", "ifconfig_" + DeviceName, \ 
     97    pcbsd::Utils::setConfFileValue( "/etc/rc.conf", "ifconfig_lagg0", "", -1); 
     98    pcbsd::Utils::setConfFileValue( "/etc/rc.conf", "ifconfig_" + DeviceName, \ 
    9999         "ifconfig_" + DeviceName + "=\"WPA " + ifConfigLine + "\"", -1); 
    100100 
     
    108108    // Restart the network 
    109109    buttonCancel->setEnabled(false); 
    110     Utils::restartNetworking(); 
     110    pcbsd::Utils::restartNetworking(); 
    111111 
    112112    buttonCancel->setEnabled(true); 
     
    218218    if ( listEmpty  && ! WPAONLY ){ 
    219219       fileout.remove(); 
    220        Utils::setConfFileValue( "/etc/rc.conf", "ifconfig_lagg0", "", -1); 
    221        Utils::setConfFileValue( "/etc/rc.conf", "ifconfig_" + DeviceName, "ifconfig_" + DeviceName + "=\"SYNCDHCP\""); 
     220       pcbsd::Utils::setConfFileValue( "/etc/rc.conf", "ifconfig_lagg0", "", -1); 
     221       pcbsd::Utils::setConfFileValue( "/etc/rc.conf", "ifconfig_" + DeviceName, "ifconfig_" + DeviceName + "=\"SYNCDHCP\""); 
    222222    }   
    223223 
     
    322322             
    323323    // Start the scan and get the output 
    324     ifconfout = Utils::runShellCommand("ifconfig -v " + DeviceName + " up list scan"); 
     324    ifconfout = pcbsd::Utils::runShellCommand("ifconfig -v " + DeviceName + " up list scan"); 
    325325 
    326326    //display the info for each wifi access point 
     
    10761076   // Get the ifconfig string 
    10771077   if ( usingLagg ) 
    1078      tmp = Utils::getConfFileValue( "/etc/rc.conf", "ifconfig_lagg0=", 1 ); 
     1078     tmp = pcbsd::Utils::getConfFileValue( "/etc/rc.conf", "ifconfig_lagg0=", 1 ); 
    10791079 
    10801080   if ( tmp.isEmpty() ) 
    1081      tmp = Utils::getConfFileValue( "/etc/rc.conf", "ifconfig_" + DeviceName + "=", 1 ); 
     1081     tmp = pcbsd::Utils::getConfFileValue( "/etc/rc.conf", "ifconfig_" + DeviceName + "=", 1 ); 
    10821082 
    10831083   if ( tmp.isEmpty() || tmp.indexOf("OFF") != -1 )  { 
     
    11391139    
    11401140   // Look for a country code 
    1141    tmp = Utils::getConfFileValue( "/etc/rc.conf", "ifconfig_" + DeviceName + "=", 1 ); 
     1141   tmp = pcbsd::Utils::getConfFileValue( "/etc/rc.conf", "ifconfig_" + DeviceName + "=", 1 ); 
    11421142   if ( tmp.indexOf("country ") != -1 ) { 
    11431143       tmp.remove(0, tmp.lastIndexOf("country") + 8); 
Note: See TracChangeset for help on using the changeset viewer.