diff options
Diffstat (limited to 'knetworkconf')
19 files changed, 194 insertions, 194 deletions
diff --git a/knetworkconf/backends/file.pl.in b/knetworkconf/backends/file.pl.in index f147474..ac73301 100644 --- a/knetworkconf/backends/file.pl.in +++ b/knetworkconf/backends/file.pl.in @@ -456,11 +456,11 @@ sub gst_file_open_write_compressed sub gst_file_run_pipe { - my ($cmd, $mode_tqmask, $stderr) = @_; + my ($cmd, $mode_mask, $stderr) = @_; my ($command); local *PIPE; - $mode_tqmask = $GST_FILE_READ if $mode_tqmask eq undef; + $mode_mask = $GST_FILE_READ if $mode_mask eq undef; &gst_report_enter (); @@ -480,8 +480,8 @@ sub gst_file_run_pipe return undef; } - $command .= " |" if $mode_tqmask & $GST_FILE_READ; - $command = "| $command > /dev/null" if $mode_tqmask & $GST_FILE_WRITE; + $command .= " |" if $mode_mask & $GST_FILE_READ; + $command = "| $command > /dev/null" if $mode_mask & $GST_FILE_WRITE; open PIPE, $command; &gst_report ("file_run_pipe_success", $command); diff --git a/knetworkconf/backends/guess_system.sh b/knetworkconf/backends/guess_system.sh index 0f0a457..9b7bfa9 100755 --- a/knetworkconf/backends/guess_system.sh +++ b/knetworkconf/backends/guess_system.sh @@ -84,7 +84,7 @@ main: .prologue 0 .long 0x47e03d80 # implver $0 lda \$2,259 - .long 0x47e20c21 # atqmask $2,$1 + .long 0x47e20c21 # amask $2,$1 srl \$1,8,\$2 sll \$2,2,\$2 sll \$0,3,\$0 @@ -711,7 +711,7 @@ EOF .prologue 0 .long 0x47e03d80 # implver $0 lda \$2,259 - .long 0x47e20c21 # atqmask $2,$1 + .long 0x47e20c21 # amask $2,$1 srl \$1,8,\$2 sll \$2,2,\$2 sll \$0,3,\$0 diff --git a/knetworkconf/backends/network.pl.in b/knetworkconf/backends/network.pl.in index ed36e40..19c021a 100644 --- a/knetworkconf/backends/network.pl.in +++ b/knetworkconf/backends/network.pl.in @@ -161,10 +161,10 @@ sub gst_network_config_wireless sub gst_network_enable_iface { my ($hash, $dev, $command_ifconfig) = @_; - my ($address, $nettqmask, $bootproto, $remote_address); + my ($address, $netmask, $bootproto, $remote_address); $address = $$hash{"configuration"}{"address"}; - $nettqmask = $$hash{"configuration"}{"nettqmask"}; + $netmask = $$hash{"configuration"}{"netmask"}; $bootproto = $$hash{"configuration"}{"bootproto"}; $remote_address = $$hash{"configuration"}{"remote_address"}; @@ -188,7 +188,7 @@ sub gst_network_enable_iface $command = $command_ifconfig; $command .= " $dev"; $command .= " $address" if ($address); - $command .= " nettqmask $nettqmask" if ($nettqmask); + $command .= " netmask $netmask" if ($netmask); $command .= " dstaddr $remote_address" if ($remote_address); $command .= " up"; } @@ -432,11 +432,11 @@ sub gst_network_ipv4_vec2str # Gets the subnet, in bitmap. sub gst_network_ipv4_calc_subnet_vec { - my ($addr, $tqmask) = @_; + my ($addr, $mask) = @_; my ($addrvec, $maskvec); $addrvec = &gst_network_ipv4_str2vec ($addr); - $maskvec = &gst_network_ipv4_str2vec ($tqmask); + $maskvec = &gst_network_ipv4_str2vec ($mask); return $addrvec & $maskvec; } @@ -444,7 +444,7 @@ sub gst_network_ipv4_calc_subnet_vec # What you're looking for. sub gst_network_ipv4_calc_subnet { - my ($addr, $tqmask) = @_; + my ($addr, $mask) = @_; return &gst_network_ipv4_vec2str (&gst_network_ipv4_calc_subnet_vec); } @@ -452,10 +452,10 @@ sub gst_network_ipv4_calc_subnet # The broadcast, bitmap. sub gst_network_ipv4_calc_bcast_vec { - my ($addr, $tqmask) = @_; + my ($addr, $mask) = @_; $addrvec = &gst_network_ipv4_str2vec ($addr); - $maskvec = &gst_network_ipv4_str2vec ($tqmask); + $maskvec = &gst_network_ipv4_str2vec ($mask); return $addrvec | ~$maskvec; } @@ -463,7 +463,7 @@ sub gst_network_ipv4_calc_bcast_vec # And this returning the quad-dot notation. sub gst_network_ipv4_calc_bcast { - my ($addr, $tqmask) = @_; + my ($addr, $mask) = @_; return &gst_network_ipv4_vec2str (&gst_network_ipv4_calc_bcast_vec); } @@ -870,7 +870,7 @@ sub gst_network_freebsd_interfaces_get_info { $ifaces{$dev}{"hwaddr"} = $1 if /ether[ \t]+([^ \t]+)/i; $ifaces{$dev}{"addr"} = $1 if /inet[ \t]+([^ \t]+)/i; - $ifaces{$dev}{"tqmask"} = $1 if /nettqmask[ \t]+([^ \t]+)/i; + $ifaces{$dev}{"mask"} = $1 if /netmask[ \t]+([^ \t]+)/i; $ifaces{$dev}{"bcast"} = $1 if /broadcast[ \t]+([^ \t]+)/i; } } @@ -905,7 +905,7 @@ sub gst_network_linux_interfaces_get_info { $ifaces{$dev}{"hwaddr"} = $1 if /HWaddr[ \t]+([^ \t]+)/i; $ifaces{$dev}{"addr"} = $1 if /addr:([^ \t]+)/i; - $ifaces{$dev}{"tqmask"} = $1 if /tqmask:([^ \t]+)/i; + $ifaces{$dev}{"mask"} = $1 if /mask:([^ \t]+)/i; $ifaces{$dev}{"bcast"} = $1 if /bcast:([^ \t]+)/i; $ifaces{$dev}{"enabled"} = 1 if /^UP[ \t]/i; } @@ -1028,17 +1028,17 @@ sub gst_network_interface_ensure_broadcast_and_network { my ($iface) = @_; - if (exists $$iface{"nettqmask"} && + if (exists $$iface{"netmask"} && exists $$iface{"address"}) { if (! exists $$iface{"broadcast"}) { - $$iface{"broadcast"} = &gst_network_ipv4_calc_bcast ($$iface{"address"}, $$iface{"nettqmask"}); + $$iface{"broadcast"} = &gst_network_ipv4_calc_bcast ($$iface{"address"}, $$iface{"netmask"}); } if (! exists $$iface{"network"}) { - $$iface{"network"} = &gst_network_ipv4_calc_subnet ($$iface{"address"}, $$iface{"nettqmask"}); + $$iface{"network"} = &gst_network_ipv4_calc_subnet ($$iface{"address"}, $$iface{"netmask"}); } } } @@ -1660,7 +1660,7 @@ sub gst_network_interfaces_get { delete $$hash{$i}{"addr"}; delete $$hash{$i}{"bcast"}; - delete $$hash{$i}{"tqmask"}; + delete $$hash{$i}{"mask"}; } foreach $i (@ifaces) @@ -2182,7 +2182,7 @@ sub gst_network_suse70_interface_activate sub gst_network_slackware91_interface_activate_by_dev { my ($dev, $enabled) = @_; - my ($address, $nettqmask, $gateway); + my ($address, $netmask, $gateway); my ($file) = "/etc/rc.d/rc.inet1.conf"; my ($ret) = 0; @@ -2206,10 +2206,10 @@ sub gst_network_slackware91_interface_activate_by_dev else { $address = &gst_parse_rcinet1conf ($file, $dev, "IPADDR"); - $nettqmask = &gst_parse_rcinet1conf ($file, $dev, "NETMASK"); - $gateway = &gst_network_get_gateway ($file, "GATEWAY", $address, $nettqmask); + $netmask = &gst_parse_rcinet1conf ($file, $dev, "NETMASK"); + $gateway = &gst_network_get_gateway ($file, "GATEWAY", $address, $netmask); - $ret = &gst_file_run ("ifconfig $dev $address nettqmask $nettqmask up"); + $ret = &gst_file_run ("ifconfig $dev $address netmask $netmask up"); # Add the gateway if necessary if ($gateway ne undef) @@ -3526,11 +3526,11 @@ sub gst_network_suse90_set_auto } } -# Return IP address or nettqmask, depending on $what +# Return IP address or netmask, depending on $what sub gst_network_pld10_get_ipaddr { my ($file, $key, $what) = @_; - my ($ipaddr, $nettqmask, $ret, $i); + my ($ipaddr, $netmask, $ret, $i); my @netmask_prefixes = (0, 128, 192, 224, 240, 248, 252, 254, 255); $ipaddr = &gst_parse_sh($file, $key); @@ -3538,22 +3538,22 @@ sub gst_network_pld10_get_ipaddr if($ipaddr =~ /([^\/]*)\/([[:digit:]]*)/) { - $nettqmask = $2; - return undef if $nettqmask eq ""; + $netmask = $2; + return undef if $netmask eq ""; if($what eq "address") { return $1; } - for($i = 0; $i < int($nettqmask/8); $i++) + for($i = 0; $i < int($netmask/8); $i++) { $ret .= "255."; } - $ret .= "$netmask_prefixes[$b%8]." if $nettqmask < 32; + $ret .= "$netmask_prefixes[$b%8]." if $netmask < 32; - for($i = int($nettqmask/8) + 1; $i < 4; $i++) + for($i = int($netmask/8) + 1; $i < 4; $i++) { $ret .= "0."; } @@ -3564,7 +3564,7 @@ sub gst_network_pld10_get_ipaddr return undef; } -# Writes IP address or nettqmask, depending in $what, to $file +# Writes IP address or netmask, depending in $what, to $file sub gst_network_pld10_set_ipaddr { my ($file, $key, $what, $value) = @_; @@ -3580,7 +3580,7 @@ sub gst_network_pld10_set_ipaddr "254" => 7, "255" => 8 ); - my ($ipaddr, $nettqmask); + my ($ipaddr, $netmask); $ipaddr = &gst_parse_sh($file, $key); return undef if $ipaddr eq ""; @@ -3593,8 +3593,8 @@ sub gst_network_pld10_set_ipaddr { if($value =~ /([[:digit:]]*).([[:digit:]]*).([[:digit:]]*).([[:digit:]]*)/) { - $nettqmask = $prefixes{$1} + $prefixes{$2} + $prefixes{$3} + $prefixes{$4}; - $ipaddr =~ s/\/[[:digit:]]*/\/$nettqmask/; + $netmask = $prefixes{$1} + $prefixes{$2} + $prefixes{$3} + $prefixes{$4}; + $ipaddr =~ s/\/[[:digit:]]*/\/$netmask/; } } @@ -3605,25 +3605,25 @@ sub gst_network_pld10_set_ipaddr # it checks if a IP address is in the same network than another sub gst_network_is_ip_in_same_network { - my ($address1, $address2, $nettqmask) = @_; - my (@add1, @add2, @tqmask); + my ($address1, $address2, $netmask) = @_; + my (@add1, @add2, @mask); my ($i); return 0 if (($address1 eq undef) || ($address2 eq undef) || - ($nettqmask eq undef)); + ($netmask eq undef)); @add1 = split (/\./, $address1); @add2 = split (/\./, $address2); - @tqmask = split (/\./, $nettqmask); + @mask = split (/\./, $netmask); for ($i = 0; $i < 4; $i++) { $add1[$i] += 0; $add2[$i] += 0; - $tqmask[$i] += 0; + $mask[$i] += 0; - return 0 if (($add1[$i] & $tqmask[$i]) != ($add2[$i] & $tqmask[$i])); + return 0 if (($add1[$i] & $mask[$i]) != ($add2[$i] & $mask[$i])); } return 1; @@ -3633,14 +3633,14 @@ sub gst_network_is_ip_in_same_network sub gst_network_get_gateway_dev_from_address { my ($interface, $gateway) = @_; - my ($address, $nettqmask, $key); + my ($address, $netmask, $key); foreach $key (keys %$interface) { $address = $$interface{$key}{"address"}; - $nettqmask = $$interface{$key}{"nettqmask"}; + $netmask = $$interface{$key}{"netmask"}; - return $$interface{$key}{"dev"} if (&gst_network_is_ip_in_same_network ($address, $gateway, $nettqmask)); + return $$interface{$key}{"dev"} if (&gst_network_is_ip_in_same_network ($address, $gateway, $netmask)); } return undef; @@ -3658,23 +3658,23 @@ sub gst_network_get_plip_gateway sub gst_network_get_gateway { - my ($file, $key, $address, $nettqmask) = @_; + my ($file, $key, $address, $netmask) = @_; my ($gateway); return undef if ($address eq undef); $gateway = &gst_parse_sh ($file, $key); - return $gateway if &gst_network_is_ip_in_same_network ($address, $gateway, $nettqmask); + return $gateway if &gst_network_is_ip_in_same_network ($address, $gateway, $netmask); return undef; } sub gst_network_suse90_get_gateway { - my ($file, $address, $nettqmask) = @_; + my ($file, $address, $netmask) = @_; my ($gateway) = &gst_parse_split_first_array_pos ($file, "default", 0, "[ \t]+", "[ \t]+"); - return $gateway if &gst_network_is_ip_in_same_network ($address, $gateway, $nettqmask); + return $gateway if &gst_network_is_ip_in_same_network ($address, $gateway, $netmask); return undef; } @@ -3689,10 +3689,10 @@ sub gst_network_suse90_get_plip_gateway sub gst_network_suse90_replace_gateway { - my ($file, $dev, $address, $nettqmask, $value) = @_; + my ($file, $dev, $address, $netmask, $value) = @_; - return &gst_replace_split ($file, "default", "[ \t]+", "$value \- $dev") if &gst_network_is_ip_in_same_network ($address, $value, $nettqmask); + return &gst_replace_split ($file, "default", "[ \t]+", "$value \- $dev") if &gst_network_is_ip_in_same_network ($address, $value, $netmask); # return &gst_replace_split ($file, "default", "[ \t]+", "$value \- $dev") ; return undef; @@ -4039,7 +4039,7 @@ sub gst_network_ensure_loopback_interface "user" => 0, "dev" => "lo", "address" => "127.0.0.1", - "nettqmask" => "255.0.0.0", + "netmask" => "255.0.0.0", "broadcast" => "127.255.255.255", "network" => "127.0.0.0", "bootproto" => "none", @@ -4674,7 +4674,7 @@ sub gst_network_get_interface_parse_table # [ "user", \&gst_parse_sh_bool, IFCFG, USERCTL ], [ "dev", \&gst_parse_sh, IFCFG, DEVICE ], [ "address", \&gst_parse_sh, IFCFG, IPADDR ], - [ "nettqmask", \&gst_parse_sh, IFCFG, NETMASK ], + [ "netmask", \&gst_parse_sh, IFCFG, NETMASK ], [ "broadcast", \&gst_parse_sh, IFCFG, BROADCAST ], [ "network", \&gst_parse_sh, IFCFG, NETWORK ], [ "gateway", \&gst_parse_sh, IFCFG, GATEWAY ], @@ -4737,7 +4737,7 @@ sub gst_network_get_interface_parse_table # [ "name", \&gst_parse_trivial, IFACE ], [ "dev", \&gst_parse_sh, IFCFG, DEVICE ], [ "address", \&gst_parse_sh, IFCFG, IPADDR ], - [ "nettqmask", \&gst_parse_sh, IFCFG, NETMASK ], + [ "netmask", \&gst_parse_sh, IFCFG, NETMASK ], [ "broadcast", \&gst_parse_sh, IFCFG, BROADCAST ], [ "network", \&gst_parse_sh, IFCFG, NETWORK ], [ "gateway", \&gst_parse_sh, IFCFG, GATEWAY ], @@ -4807,7 +4807,7 @@ sub gst_network_get_interface_parse_table # [ "name", \&gst_parse_trivial, IFACE ], [ "dev", \&gst_parse_sh, IFCFG, DEVICE ], [ "address", \&gst_parse_sh, IFCFG, IPADDR ], - [ "nettqmask", \&gst_parse_sh, IFCFG, NETMASK ], + [ "netmask", \&gst_parse_sh, IFCFG, NETMASK ], [ "broadcast", \&gst_parse_sh, IFCFG, BROADCAST ], [ "network", \&gst_parse_sh, IFCFG, NETWORK ], [ "gateway", \&gst_parse_sh, IFCFG, GATEWAY ], @@ -4874,7 +4874,7 @@ sub gst_network_get_interface_parse_table # [ "name", \&gst_parse_sh, IFCFG, NAME ], [ "dev", \&gst_parse_sh, IFCFG, DEVICE ], [ "address", \&gst_parse_sh, IFCFG, IPADDR ], - [ "nettqmask", \&gst_parse_sh, IFCFG, NETMASK ], + [ "netmask", \&gst_parse_sh, IFCFG, NETMASK ], [ "broadcast", \&gst_parse_sh, IFCFG, BROADCAST ], [ "network", \&gst_parse_sh, IFCFG, NETWORK ], [ "gateway", \&gst_parse_sh, IFCFG, GATEWAY ], @@ -4938,7 +4938,7 @@ sub gst_network_get_interface_parse_table # [ "name", \&gst_parse_sh, IFCFG, NAME ], [ "dev", \&gst_parse_sh, IFCFG, DEVICE ], [ "address", \&gst_parse_sh, IFCFG, IPADDR ], - [ "nettqmask", \&gst_parse_sh, IFCFG, NETMASK ], + [ "netmask", \&gst_parse_sh, IFCFG, NETMASK ], [ "broadcast", \&gst_parse_sh, IFCFG, BROADCAST ], [ "network", \&gst_parse_sh, IFCFG, NETWORK ], [ "gateway", \&gst_parse_sh, IFCFG, GATEWAY ], @@ -5003,7 +5003,7 @@ sub gst_network_get_interface_parse_table # [ "name", \&gst_parse_sh, IFCFG, NAME ], [ "dev", \&gst_parse_sh, IFCFG, DEVICE ], [ "address", \&gst_parse_sh, IFCFG, IPADDR ], - [ "nettqmask", \&gst_parse_sh, IFCFG, NETMASK ], + [ "netmask", \&gst_parse_sh, IFCFG, NETMASK ], [ "broadcast", \&gst_parse_sh, IFCFG, BROADCAST ], [ "network", \&gst_parse_sh, IFCFG, NETWORK ], [ "gateway", \&gst_parse_sh, IFCFG, GATEWAY ], @@ -5069,7 +5069,7 @@ sub gst_network_get_interface_parse_table [ "auto", \&gst_parse_interfaces_option_kw_not, [INTERFACES, IFACE], "noauto" ], # [ "name", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "name" ], [ "address", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "address" ], - [ "nettqmask", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "nettqmask" ], + [ "netmask", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "netmask" ], [ "broadcast", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "broadcast" ], [ "network", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "network" ], [ "gateway", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "gateway" ], @@ -5124,7 +5124,7 @@ sub gst_network_get_interface_parse_table [ "auto", \&gst_network_debian_woody_get_auto, [INTERFACES, IFACE]], # [ "name", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "name" ], [ "address", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "address" ], - [ "nettqmask", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "nettqmask" ], + [ "netmask", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "netmask" ], [ "broadcast", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "broadcast" ], [ "network", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "network" ], [ "gateway", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "gateway" ], @@ -5176,7 +5176,7 @@ sub gst_network_get_interface_parse_table [ "name", \&gst_network_suse70_parse_iface_sh, [IFCFG, IFACE], GST_IFACE_NAME ], [ "dev", \&gst_network_suse70_parse_iface_sh, [IFCFG, IFACE], NETDEV ], [ "address", \&gst_network_suse70_parse_iface_sh, [IFCFG, IFACE], IPADDR ], - [ "nettqmask", \&gst_network_suse70_get_ifconfig_arg, [IFCFG, IFACE], nettqmask ], + [ "netmask", \&gst_network_suse70_get_ifconfig_arg, [IFCFG, IFACE], netmask ], [ "broadcast", \&gst_network_suse70_get_ifconfig_arg, [IFCFG, IFACE], broadcast ], # [ "network", \&gst_parse_trivial, 0 ], # not supported. # [ "gateway", \&gst_parse_sh, IFCFG, GATEWAY ], # not supported @@ -5203,12 +5203,12 @@ sub gst_network_get_interface_parse_table [ "auto", \&gst_network_suse90_get_auto, IFCFG, STARTMODE ], [ "bootproto", \&gst_network_parse_bootproto, IFCFG, BOOTPROTO ], [ "address", \&gst_parse_sh, IFCFG, IPADDR ], - [ "nettqmask", \&gst_parse_sh, IFCFG, NETMASK ], + [ "netmask", \&gst_parse_sh, IFCFG, NETMASK ], [ "remote_address", \&gst_parse_sh, IFCFG, REMOTE_IPADDR ], [ "essid", \&gst_parse_sh, IFCFG, WIRELESS_ESSID ], [ "key_type", \&gst_network_get_wep_key_type, [ \&gst_parse_sh, IFCFG, WIRELESS_KEY ]], [ "key", \&gst_network_get_wep_key, [ \&gst_parse_sh, IFCFG, WIRELESS_KEY ]], - [ "gateway", \&gst_network_suse90_get_gateway, ROUTE_CONF, "%address%", "%nettqmask%" ], + [ "gateway", \&gst_network_suse90_get_gateway, ROUTE_CONF, "%address%", "%netmask%" ], [ "gateway", \&gst_network_suse90_get_plip_gateway, ROUTE_CONF, "%remote_address%" ], # Modem stuff goes here [ "serial_port", \&gst_parse_sh, IFCFG, MODEM_DEVICE ], @@ -5252,7 +5252,7 @@ sub gst_network_get_interface_parse_table # [ "name", \&gst_parse_sh, IFCFG, DEVICE ], [ "dev", \&gst_parse_sh, IFCFG, DEVICE ], [ "address", \&gst_network_pld10_get_ipaddr, IFCFG, IPADDR, "address" ], - [ "nettqmask", \&gst_network_pld10_get_ipaddr, IFCFG, IPADDR, "nettqmask" ], + [ "netmask", \&gst_network_pld10_get_ipaddr, IFCFG, IPADDR, "netmask" ], # [ "broadcast", \&gst_parse_sh, IFCFG, BROADCAST ], # [ "network", \&gst_parse_sh, IFCFG, NETWORK ], [ "gateway", \&gst_parse_sh, IFCFG, GATEWAY ], @@ -5300,8 +5300,8 @@ sub gst_network_get_interface_parse_table [ "user", \&gst_parse_trivial, 0 ], # not supported. [ "dev", \&gst_parse_trivial, IFACE ], [ "address", \&gst_parse_rcinet1conf, [RC_INET_CONF, IFACE], IPADDR ], - [ "nettqmask", \&gst_parse_rcinet1conf, [RC_INET_CONF, IFACE], NETMASK ], - [ "gateway", \&gst_network_get_gateway, RC_INET_CONF, GATEWAY, "%address%", "%nettqmask%" ], + [ "netmask", \&gst_parse_rcinet1conf, [RC_INET_CONF, IFACE], NETMASK ], + [ "gateway", \&gst_network_get_gateway, RC_INET_CONF, GATEWAY, "%address%", "%netmask%" ], [ "auto", \&gst_network_slackware91_get_auto, [RC_INET, RC_LOCAL, IFACE]], [ "bootproto", \&gst_network_slackware91_parse_bootproto, [RC_INET_CONF, IFACE]], [ "essid", \&gst_parse_wireless_opts, [ WIRELESS, IFACE ], \&gst_network_get_wireless_ifaces, ESSID ], @@ -5348,7 +5348,7 @@ sub gst_network_get_interface_parse_table [ "user", \&gst_parse_trivial, 0 ], # not supported. [ "dev", \&gst_parse_trivial, IFACE ], [ "address", \&gst_parse_confd_net_re, NET, "config_%dev%", "^[ \t]*([0-9\.]+)" ], - [ "nettqmask", \&gst_parse_confd_net_re, NET, "config_%dev%", "nettqmask[ \t]+([0-9\.]*)" ], + [ "netmask", \&gst_parse_confd_net_re, NET, "config_%dev%", "netmask[ \t]+([0-9\.]*)" ], [ "remote_address", \&gst_parse_confd_net_re, NET, "config_%dev%", "dest_address[ \t]+([0-9\.]*)" ], # [ "gateway", \&gst_parse_sh_re, NET, "gateway", "%dev%/([0-9\.\:]*)" ], [ "gateway", \&gst_network_gentoo_parse_gateway, [ NET, IFACE ]], @@ -5396,15 +5396,15 @@ sub gst_network_get_interface_parse_table # we need to double check these values both in the start_if and in the rc.conf files, in this order [ "address", \&gst_parse_startif, STARTIF, "inet[ \t]+([0-9\.]+)" ], [ "address", \&gst_parse_sh_re, RC_CONF, "ifconfig_%dev%", "inet[ \t]+([0-9\.]+)" ], - [ "nettqmask", \&gst_parse_startif, STARTIF, "nettqmask[ \t]+([0-9\.]+)" ], - [ "nettqmask", \&gst_parse_sh_re, RC_CONF, "ifconfig_%dev%", "nettqmask[ \t]+([0-9\.]+)" ], + [ "netmask", \&gst_parse_startif, STARTIF, "netmask[ \t]+([0-9\.]+)" ], + [ "netmask", \&gst_parse_sh_re, RC_CONF, "ifconfig_%dev%", "netmask[ \t]+([0-9\.]+)" ], [ "remote_address", \&gst_parse_startif, STARTIF, "dest_address[ \t]+([0-9\.]+)" ], [ "remote_address", \&gst_parse_sh_re, RC_CONF, "ifconfig_%dev%", "dest_address[ \t]+([0-9\.]+)" ], [ "essid", \&gst_parse_startif, STARTIF, "ssid[ \t]+(\".*\"|[^\"][^ ]+)" ], [ "essid", \&gst_parse_sh_re, RC_CONF, "ifconfig_%dev%", "ssid[ \t]+([^ ]*)" ], # this is for plip interfaces [ "gateway", \&gst_network_get_plip_gateway, RC_CONF, "defaultrouter", "%remote_address%" ], - [ "gateway", \&gst_network_get_gateway, RC_CONF, "defaultrouter", "%address%", "%nettqmask%" ], + [ "gateway", \&gst_network_get_gateway, RC_CONF, "defaultrouter", "%address%", "%netmask%" ], [ "enabled", \&gst_network_interface_active, IFACE, \&gst_network_freebsd5_active_interfaces_get ], [ "bootproto", \&gst_network_parse_bootproto, RC_CONF, "ifconfig_%dev%" ], # Modem stuff @@ -5961,7 +5961,7 @@ sub gst_network_get_interface_replace_table [ "dev", \&gst_replace_sh, IFCFG, NAME ], [ "dev", \&gst_replace_sh, IFCFG, DEVICE ], [ "address", \&gst_replace_sh, IFCFG, IPADDR ], - [ "nettqmask", \&gst_replace_sh, IFCFG, NETMASK ], + [ "netmask", \&gst_replace_sh, IFCFG, NETMASK ], [ "broadcast", \&gst_replace_sh, IFCFG, BROADCAST ], [ "network", \&gst_replace_sh, IFCFG, NETWORK ], [ "gateway", \&gst_replace_sh, IFCFG, GATEWAY ], @@ -6020,7 +6020,7 @@ sub gst_network_get_interface_replace_table [ "name", \&gst_replace_sh, IFCFG, NAME ], [ "dev", \&gst_replace_sh, IFCFG, DEVICE ], [ "address", \&gst_replace_sh, IFCFG, IPADDR ], - [ "nettqmask", \&gst_replace_sh, IFCFG, NETMASK ], + [ "netmask", \&gst_replace_sh, IFCFG, NETMASK ], [ "broadcast", \&gst_replace_sh, IFCFG, BROADCAST ], [ "network", \&gst_replace_sh, IFCFG, NETWORK ], [ "gateway", \&gst_replace_sh, IFCFG, GATEWAY ], @@ -6082,7 +6082,7 @@ sub gst_network_get_interface_replace_table [ "name", \&gst_replace_sh, IFCFG, NAME ], [ "dev", \&gst_replace_sh, IFCFG, DEVICE ], [ "address", \&gst_replace_sh, IFCFG, IPADDR ], - [ "nettqmask", \&gst_replace_sh, IFCFG, NETMASK ], + [ "netmask", \&gst_replace_sh, IFCFG, NETMASK ], [ "broadcast", \&gst_replace_sh, IFCFG, BROADCAST ], [ "network", \&gst_replace_sh, IFCFG, NETWORK ], [ "gateway", \&gst_replace_sh, IFCFG, GATEWAY ], @@ -6142,7 +6142,7 @@ sub gst_network_get_interface_replace_table [ "name", \&gst_replace_sh, IFCFG, NAME ], [ "dev", \&gst_replace_sh, IFCFG, DEVICE ], [ "address", \&gst_replace_sh, IFCFG, IPADDR ], - [ "nettqmask", \&gst_replace_sh, IFCFG, NETMASK ], + [ "netmask", \&gst_replace_sh, IFCFG, NETMASK ], [ "broadcast", \&gst_replace_sh, IFCFG, BROADCAST ], [ "network", \&gst_replace_sh, IFCFG, NETWORK ], [ "gateway", \&gst_replace_sh, IFCFG, GATEWAY ], @@ -6202,7 +6202,7 @@ sub gst_network_get_interface_replace_table [ "name", \&gst_replace_sh, IFCFG, NAME ], [ "dev", \&gst_replace_sh, IFCFG, DEVICE ], [ "address", \&gst_replace_sh, IFCFG, IPADDR ], - [ "nettqmask", \&gst_replace_sh, IFCFG, NETMASK ], + [ "netmask", \&gst_replace_sh, IFCFG, NETMASK ], [ "broadcast", \&gst_replace_sh, IFCFG, BROADCAST ], [ "network", \&gst_replace_sh, IFCFG, NETWORK ], [ "gateway", \&gst_replace_sh, IFCFG, GATEWAY ], @@ -6262,7 +6262,7 @@ sub gst_network_get_interface_replace_table [ "name", \&gst_replace_sh, IFCFG, NAME ], [ "dev", \&gst_replace_sh, IFCFG, DEVICE ], [ "address", \&gst_replace_sh, IFCFG, IPADDR ], - [ "nettqmask", \&gst_replace_sh, IFCFG, NETMASK ], + [ "netmask", \&gst_replace_sh, IFCFG, NETMASK ], [ "broadcast", \&gst_replace_sh, IFCFG, BROADCAST ], [ "network", \&gst_replace_sh, IFCFG, NETWORK ], [ "gateway", \&gst_replace_sh, IFCFG, GATEWAY ], @@ -6324,7 +6324,7 @@ sub gst_network_get_interface_replace_table [ "auto", \&gst_replace_interfaces_option_kw_not, [INTERFACES, IFACE], "noauto" ], [ "name", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "name" ], [ "address", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "address" ], - [ "nettqmask", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "nettqmask" ], + [ "netmask", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "netmask" ], [ "broadcast", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "broadcast" ], [ "network", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "network" ], [ "gateway", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "gateway" ], @@ -6372,7 +6372,7 @@ sub gst_network_get_interface_replace_table [ "bootproto", \&gst_network_deb22_replace_bootproto, [INTERFACES, IFACE]], [ "auto", \&gst_network_debian_woody_set_auto, [INTERFACES, IFACE]], [ "address", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "address" ], - [ "nettqmask", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "nettqmask" ], + [ "netmask", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "netmask" ], [ "gateway", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "gateway" ], [ "essid", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "wireless-essid" ], [ "key", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "wireless-key" ], @@ -6432,7 +6432,7 @@ sub gst_network_get_interface_replace_table [ "name", \&gst_network_suse70_replace_iface_sh, [IFCFG, IFACE], GST_IFACE_NAME ], [ "address", \&gst_network_suse70_replace_iface_sh, [IFCFG, IFACE], IPADDR ], [ "address", \&gst_network_suse70_set_ifconfig_ip, [IFCFG, IFACE] ], - [ "nettqmask", \&gst_network_suse70_set_ifconfig_arg, [IFCFG, IFACE], nettqmask ], + [ "netmask", \&gst_network_suse70_set_ifconfig_arg, [IFCFG, IFACE], netmask ], [ "broadcast", \&gst_network_suse70_set_ifconfig_arg, [IFCFG, IFACE], broadcast ], # [ "network", \&gst_parse_trivial, 0 ], # not supported. # [ "gateway", \&gst_parse_sh, IFCFG, GATEWAY ], # not supported @@ -6458,7 +6458,7 @@ sub gst_network_get_interface_replace_table [ "auto", \&gst_network_suse90_set_auto, IFCFG, STARTMODE ], [ "bootproto", \&gst_network_suse90_replace_bootproto, IFCFG, BOOTPROTO ], [ "address", \&gst_replace_sh, IFCFG, IPADDR ], - [ "nettqmask", \&gst_replace_sh, IFCFG, NETMASK ], + [ "netmask", \&gst_replace_sh, IFCFG, NETMASK ], [ "remote_address", \&gst_replace_sh, IFCFG, REMOTE_IPADDR ], [ "essid", \&gst_replace_sh, IFCFG, WIRELESS_ESSID ], [ "key", \&gst_replace_sh, IFCFG, WIRELESS_KEY ], @@ -6506,7 +6506,7 @@ sub gst_network_get_interface_replace_table # [ "name", \&gst_replace_sh, IFCFG, NAME ], [ "dev", \&gst_replace_sh, IFCFG, DEVICE ], [ "address", \&gst_network_pld10_set_ipaddr, IFCFG, IPADDR, "address" ], - [ "nettqmask", \&gst_network_pld10_set_ipaddr, IFCFG, IPADDR, "nettqmask" ], + [ "netmask", \&gst_network_pld10_set_ipaddr, IFCFG, IPADDR, "netmask" ], # [ "broadcast", \&gst_replace_sh, IFCFG, BROADCAST ], # [ "network", \&gst_replace_sh, IFCFG, NETWORK ], [ "gateway", \&gst_replace_sh, IFCFG, GATEWAY ], @@ -6551,7 +6551,7 @@ sub gst_network_get_interface_replace_table table => [ [ "address", \&gst_replace_rcinet1conf, [ RC_INET_CONF, IFACE ], IPADDR ], - [ "nettqmask", \&gst_replace_rcinet1conf, [ RC_INET_CONF, IFACE ], NETMASK ], + [ "netmask", \&gst_replace_rcinet1conf, [ RC_INET_CONF, IFACE ], NETMASK ], [ "gateway", \&gst_replace_rcinet1conf_global, RC_INET_CONF, GATEWAY ], [ "bootproto", \&gst_network_slackware91_replace_bootproto, [ RC_INET_CONF, IFACE ] ], [ "auto", \&gst_network_slackware91_set_auto, [ RC_INET, RC_LOCAL, IFACE ] ], @@ -6603,7 +6603,7 @@ sub gst_network_get_interface_replace_table [ "bootproto", \&gst_network_gentoo_replace_bootproto, [ NET, IFACE ]], [ "address", \&gst_replace_confd_net_re, NET, "config_%dev%", "^[ \t]*([0-9\.]+)" ], [ "address", \&gst_replace_confd_net_re, NET, "config_%dev%", "^[ \t]*([0-9\.]+)" ], - [ "nettqmask", \&gst_replace_confd_net_re, NET, "config_%dev%", "[ \t]+nettqmask[ \t]+[0-9\.]*", " nettqmask %nettqmask%"], + [ "netmask", \&gst_replace_confd_net_re, NET, "config_%dev%", "[ \t]+netmask[ \t]+[0-9\.]*", " netmask %netmask%"], [ "broadcast", \&gst_replace_confd_net_re, NET, "config_%dev%", "[ \t]+broadcast[ \t]+[0-9\.]*", " broadcast %broadcast%" ], [ "remote_address", \&gst_replace_confd_net_re, NET, "config_%dev%", "[ \t]+dest_address[ \t]+[0-9\.]*", " dest_address %remote_address%" ], [ "gateway", \&gst_replace_confd_net_re, NET, "routes_%dev%", "[ \t]*default[ \t]+(via|gw)[ \t]+[0-9\.\:]*", "default via %gateway%" ], @@ -6648,7 +6648,7 @@ sub gst_network_get_interface_replace_table [ "auto", \&gst_network_freebsd5_set_auto, [ RC_CONF, IFACE ]], [ "bootproto", \&gst_network_freebsd5_replace_bootproto, [ RC_CONF, IFACE ]], [ "address", \&gst_replace_sh_re, RC_CONF, "ifconfig_%dev%", "inet[ \t]+([0-9\.]+)", "inet %address%" ], - [ "nettqmask", \&gst_replace_sh_re, RC_CONF, "ifconfig_%dev%", "nettqmask[ \t]+([0-9\.]+)", " nettqmask %nettqmask%" ], + [ "netmask", \&gst_replace_sh_re, RC_CONF, "ifconfig_%dev%", "netmask[ \t]+([0-9\.]+)", " netmask %netmask%" ], [ "remote_address", \&gst_replace_sh_re, RC_CONF, "ifconfig_%dev%", "dest_address[ \t]+([0-9\.]+)", " dest_address %remote_address%" ], [ "essid", \&gst_network_freebsd5_replace_essid, [ RC_CONF, STARTIF, IFACE ]], # Modem stuff diff --git a/knetworkconf/backends/util.pl.in b/knetworkconf/backends/util.pl.in index e6c5893..b175fb8 100644 --- a/knetworkconf/backends/util.pl.in +++ b/knetworkconf/backends/util.pl.in @@ -279,7 +279,7 @@ sub gst_get_key_for_subkey_and_subvalues # --- IP calculation --- # -# &gst_ip_calc_network (<IP>, <nettqmask>) +# &gst_ip_calc_network (<IP>, <netmask>) # # Calculates the network address and returns it as a string. @@ -300,7 +300,7 @@ sub gst_ip_calc_network } -# &gst_ip_calc_network (<IP>, <nettqmask>) +# &gst_ip_calc_network (<IP>, <netmask>) # # Calculates the broadcast address and returns it as a string. diff --git a/knetworkconf/backends/xml.pl.in b/knetworkconf/backends/xml.pl.in index eed6b88..cd2201c 100644 --- a/knetworkconf/backends/xml.pl.in +++ b/knetworkconf/backends/xml.pl.in @@ -238,7 +238,7 @@ sub gst_xml_print_arrays } } -# Pass a hash, create a tqparent tag $tag and print <key>val</key> for every +# Pass a hash, create a parent tag $tag and print <key>val</key> for every # value pair in the hash. If structure refs are found, these are recursively # printed with print_structure. sub gst_xml_print_hash diff --git a/knetworkconf/knetworkconf/kadddevicecontainer.cpp b/knetworkconf/knetworkconf/kadddevicecontainer.cpp index f8bba5d..361f893 100644 --- a/knetworkconf/knetworkconf/kadddevicecontainer.cpp +++ b/knetworkconf/knetworkconf/kadddevicecontainer.cpp @@ -17,8 +17,8 @@ ***************************************************************************/ #include "kadddevicecontainer.h" -KAddDeviceContainer::KAddDeviceContainer(TQWidget *tqparent, const char *name) - : KDialog(tqparent, name) +KAddDeviceContainer::KAddDeviceContainer(TQWidget *parent, const char *name) + : KDialog(parent, name) { _modified = false; _advanced = false; @@ -67,14 +67,14 @@ KAddDeviceContainer::KAddDeviceContainer(TQWidget *tqparent, 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->kcbNettqmask,TQT_SIGNAL(activated(int)),this,TQT_SLOT(toggleApplyButtonSlot(int))); + connect(addDlg->kcbNetmask,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->kcbNettqmask,TQT_SLOT(setDisabled(bool))); + // connect(addDlg->rbBootProtoAuto,TQT_SIGNAL(toggled(bool)),addDlg->kcbNetmask,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 nettqmask = addDlg->kcbNettqmask->currentText(); + TQString netmask = addDlg->kcbNetmask->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(nettqmask)) - KMessageBox::error(this,i18n("The format of the specified nettqmask 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 (!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->kcbNettqmask->setEditable(true); + addDlg->kcbNetmask->setEditable(true); } else { kpbAdvanced->setText(i18n("Advanced Settings")); - addDlg->kcbNettqmask->setEditable(false); + addDlg->kcbNetmask->setEditable(false); } _advanced = !_advanced; showExtension(_advanced ); diff --git a/knetworkconf/knetworkconf/kadddevicecontainer.h b/knetworkconf/knetworkconf/kadddevicecontainer.h index 17c3f15..e4c118e 100644 --- a/knetworkconf/knetworkconf/kadddevicecontainer.h +++ b/knetworkconf/knetworkconf/kadddevicecontainer.h @@ -48,7 +48,7 @@ class KAddDeviceContainer : public KDialog Q_OBJECT TQ_OBJECT public: - KAddDeviceContainer(TQWidget *tqparent = 0, const char *name = 0); + KAddDeviceContainer(TQWidget *parent = 0, const char *name = 0); ~KAddDeviceContainer(); KPushButton* kpbAdvanced; diff --git a/knetworkconf/knetworkconf/kadddevicedlg.ui b/knetworkconf/knetworkconf/kadddevicedlg.ui index a3f2a23..2066705 100644 --- a/knetworkconf/knetworkconf/kadddevicedlg.ui +++ b/knetworkconf/knetworkconf/kadddevicedlg.ui @@ -228,16 +228,16 @@ </property> </item> <property name="name"> - <cstring>kcbNettqmask</cstring> + <cstring>kcbNetmask</cstring> </property> <property name="editable"> <bool>false</bool> </property> <property name="toolTip" stdset="0"> - <string>Subnettqmask of the network device</string> + <string>Subnetmask of the network device</string> </property> <property name="whatsThis" stdset="0"> - <string><p>Please enter the desired subnettqmask for the interface here.</p> + <string><p>Please enter the desired subnetmask for the interface here.</p> <p>For small private networks, 255.255.255.0 will most often be a reasonable default value.</p> <p>This field will change from a popup box to a combo box as soon as you enable the advanced settings below.</p></string> </property> @@ -281,13 +281,13 @@ <cstring>TextLabel1_2</cstring> </property> <property name="text"> - <string>Nettqmask:</string> + <string>Netmask:</string> </property> <property name="toolTip" stdset="0"> - <string>The nettqmask defines a range of IP numbers which will build a subnet inside the network.</string> + <string>The netmask defines a range of IP numbers which will build a subnet inside the network.</string> </property> <property name="whatsThis" stdset="0"> - <string>The nettqmask defines a range of IP numbers which will build a subnet inside the network.</string> + <string>The netmask defines a range of IP numbers which will build a subnet inside the network.</string> </property> </widget> <widget class="KLineEdit" row="2" column="3" rowspan="1" colspan="2"> @@ -384,7 +384,7 @@ <connection> <sender>rbBootProtoAuto</sender> <signal>toggled(bool)</signal> - <receiver>kcbNettqmask</receiver> + <receiver>kcbNetmask</receiver> <slot>setDisabled(bool)</slot> </connection> </connections> @@ -393,7 +393,7 @@ <tabstop>kcbAutoBootProto</tabstop> <tabstop>rbBootProtoManual</tabstop> <tabstop>kleIPAddress</tabstop> - <tabstop>kcbNettqmask</tabstop> + <tabstop>kcbNetmask</tabstop> <tabstop>kcbstartAtBoot</tabstop> </tabstops> <includes> diff --git a/knetworkconf/knetworkconf/kaddressvalidator.cpp b/knetworkconf/knetworkconf/kaddressvalidator.cpp index c1f086a..03d21c6 100644 --- a/knetworkconf/knetworkconf/kaddressvalidator.cpp +++ b/knetworkconf/knetworkconf/kaddressvalidator.cpp @@ -123,37 +123,37 @@ bool KAddressValidator::isBroadcastValid(TQString addr){ } -/** \fn unsigned long int prefix2tqmask(int bits) - \brief creates a nettqmask from a specified number of bits +/** \fn unsigned long int prefix2mask(int bits) + \brief creates a netmask from a specified number of bits - This function converts a prefix length to a nettqmask. As CIDR (classless + This function converts a prefix length to a netmask. As CIDR (classless internet domain internet domain routing) has taken off, more an more IP addresses are being specified in the format address/prefix - (i.e. 192.168.2.3/24, with a corresponding nettqmask 255.255.255.0). If you - need to see what nettqmask corresponds to the prefix part of the address, this - is the function. See also \ref tqmask2prefix. + (i.e. 192.168.2.3/24, with a corresponding netmask 255.255.255.0). If you + need to see what netmask corresponds to the prefix part of the address, this + is the function. See also \ref mask2prefix. - \param prefix is the number of bits to create a tqmask for. - \return a network tqmask, in network byte order. + \param prefix is the number of bits to create a mask for. + \return a network mask, in network byte order. */ -unsigned long int KAddressValidator::prefix2tqmask(int prefix){ +unsigned long int KAddressValidator::prefix2mask(int prefix){ return htonl(~((2 << (31 - prefix)) - 1)); } -/** \fn int tqmask2prefix(unsigned long int tqmask) - \brief calculates the number of bits masked off by a nettqmask. +/** \fn int mask2prefix(unsigned long int mask) + \brief calculates the number of bits masked off by a netmask. This function calculates the significant bits in an IP address as specified by - a nettqmask. See also \ref prefix2tqmask. + a netmask. See also \ref prefix2mask. - \param tqmask is the nettqmask, specified as an unsigned long integer in network byte order. + \param mask is the netmask, specified as an unsigned long integer in network byte order. \return the number of significant bits. */ -int KAddressValidator::tqmask2prefix(unsigned long int tqmask){ +int KAddressValidator::mask2prefix(unsigned long int mask){ unsigned i; int count = IPBITS; for (i = 0; i < IPBITS; i++) { - if (!(ntohl(tqmask) & ((2 << i) - 1))) + if (!(ntohl(mask) & ((2 << i) - 1))) count--; } @@ -170,7 +170,7 @@ int KAddressValidator::tqmask2prefix(unsigned long int tqmask){ \return the calculated broadcast address for the network, in network byte order. */ unsigned long int KAddressValidator::calc_broadcast(unsigned long int addr, int prefix){ - return (addr & prefix2tqmask(prefix)) | ~prefix2tqmask(prefix); + return (addr & prefix2mask(prefix)) | ~prefix2mask(prefix); } /** \fn unsigned long int calc_network(unsigned long int addr, int prefix) \brief calculates the network address for a specified address and prefix. @@ -180,25 +180,25 @@ unsigned long int KAddressValidator::calc_broadcast(unsigned long int addr, int \return the base address of the network that addr is associated with, in network byte order. */ unsigned long int KAddressValidator::calc_network(unsigned long int addr, int prefix){ - return (addr & prefix2tqmask(prefix)); + return (addr & prefix2mask(prefix)); } -/** Is a wrapper function to calc_network that receives the IP address and netstqmask as TQString and +/** Is a wrapper function to calc_network that receives the IP address and netsmask as TQString and returns the network value also as a TQString, or NULL if it couldn't be calculated. */ -TQString KAddressValidator::calculateNetwork(TQString addr,TQString nettqmask){ - struct in_addr _addr, _nettqmask, _network; +TQString KAddressValidator::calculateNetwork(TQString addr,TQString netmask){ + struct in_addr _addr, _netmask, _network; int prefix = 0; TQString s; - if (addr.isNull() || nettqmask.isNull()) + if (addr.isNull() || netmask.isNull()) return NULL; //bad address if (!inet_pton(AF_INET,addr.latin1(),&_addr)) return NULL; //bad address else { - if (!inet_pton(AF_INET,nettqmask.latin1(),&_nettqmask)) + if (!inet_pton(AF_INET,netmask.latin1(),&_netmask)) return NULL; //bad address else { - prefix = tqmask2prefix(_nettqmask.s_addr); + prefix = mask2prefix(_netmask.s_addr); _network.s_addr = calc_network(_addr.s_addr, prefix); char * char_network = new char[20]; if (!inet_ntop(AF_INET,&_network,char_network,20)) @@ -210,23 +210,23 @@ TQString KAddressValidator::calculateNetwork(TQString addr,TQString nettqmask){ return s; } -/** Is a wrapper function to calc_broadcast that receives the IP address and netstqmask as TQString and +/** Is a wrapper function to calc_broadcast that receives the IP address and netsmask as TQString and returns the broadcast value also as a TQString, or NULL if it couldn't be calculated. */ -TQString KAddressValidator::calculateBroadcast(TQString addr, TQString nettqmask){ - struct in_addr _addr, _nettqmask, _network; +TQString KAddressValidator::calculateBroadcast(TQString addr, TQString netmask){ + struct in_addr _addr, _netmask, _network; int prefix = 0; TQString s; - if (addr.isNull() || nettqmask.isNull()) + if (addr.isNull() || netmask.isNull()) return NULL; //bad address if (!inet_pton(AF_INET,addr.latin1(),&_addr)) return NULL; //bad address else { - if (!inet_pton(AF_INET,nettqmask.latin1(),&_nettqmask)) + if (!inet_pton(AF_INET,netmask.latin1(),&_netmask)) return NULL; //bad address else { - prefix = tqmask2prefix(_nettqmask.s_addr); + prefix = mask2prefix(_netmask.s_addr); _network.s_addr = calc_broadcast(_addr.s_addr, prefix); char * char_network = new char[20]; if (!inet_ntop(AF_INET,&_network,char_network,20)) diff --git a/knetworkconf/knetworkconf/kaddressvalidator.h b/knetworkconf/knetworkconf/kaddressvalidator.h index fa8b8ca..790703d 100644 --- a/knetworkconf/knetworkconf/kaddressvalidator.h +++ b/knetworkconf/knetworkconf/kaddressvalidator.h @@ -55,19 +55,19 @@ public: ~KAddressValidator(); /** Validates if the address written by the user is a valid one. Return true if it is and false if not. */ static bool isValidIPAddress(TQString addr); - /** Validates if the Nettqmask written by the user is a valid one. Return true if it is and false if not. */ + /** Validates if the Netmask written by the user is a valid one. Return true if it is and false if not. */ static bool isNetmaskValid(TQString addr); /** Validates if the Network written by the user is a valid one. Return true if it is and false if not. */ static bool isNetworkValid(const TQString &addr); /** Validates if the Broadcast written by the user is a valid one. Return true if it is and false if not. */ static bool isBroadcastValid(TQString addr); - /** Is a wrapper function to calc_network that receives the IP address and netstqmask as TQString and + /** Is a wrapper function to calc_network that receives the IP address and netsmask as TQString and returns the network value also as a TQString, or NULL if it couldn't be calculated. */ - static TQString calculateNetwork(TQString addr,TQString nettqmask); -/** Is a wrapper function to calc_broadcast that receives the IP address and netstqmask as TQString and + static TQString calculateNetwork(TQString addr,TQString netmask); +/** Is a wrapper function to calc_broadcast that receives the IP address and netsmask as TQString and returns the broadcast value also as a TQString, or NULL if it couldn't be calculated. */ - static TQString calculateBroadcast(TQString addr, TQString nettqmask); + static TQString calculateBroadcast(TQString addr, TQString netmask); private: // Private methods /** \fn unsigned long int calc_broadcast(unsigned long int addr, int prefix) @@ -88,29 +88,29 @@ private: // Private methods \return the base address of the network that addr is associated with, in network byte order. */ static unsigned long int calc_network(unsigned long int addr, int prefix); - /** \fn unsigned long int prefix2tqmask(int bits) - \brief creates a nettqmask from a specified number of bits + /** \fn unsigned long int prefix2mask(int bits) + \brief creates a netmask from a specified number of bits - This function converts a prefix length to a nettqmask. As CIDR (classless + This function converts a prefix length to a netmask. As CIDR (classless internet domain internet domain routing) has taken off, more an more IP addresses are being specified in the format address/prefix - (i.e. 192.168.2.3/24, with a corresponding nettqmask 255.255.255.0). If you - need to see what nettqmask corresponds to the prefix part of the address, this - is the function. See also \ref tqmask2prefix. + (i.e. 192.168.2.3/24, with a corresponding netmask 255.255.255.0). If you + need to see what netmask corresponds to the prefix part of the address, this + is the function. See also \ref mask2prefix. - \param prefix is the number of bits to create a tqmask for. - \return a network tqmask, in network byte order. + \param prefix is the number of bits to create a mask for. + \return a network mask, in network byte order. */ - static unsigned long int prefix2tqmask(int prefix); - /** \fn int tqmask2prefix(unsigned long int tqmask) - \brief calculates the number of bits masked off by a nettqmask. + static unsigned long int prefix2mask(int prefix); + /** \fn int mask2prefix(unsigned long int mask) + \brief calculates the number of bits masked off by a netmask. This function calculates the significant bits in an IP address as specified by - a nettqmask. See also \ref prefix2tqmask. + a netmask. See also \ref prefix2mask. - \param tqmask is the nettqmask, specified as an unsigned long integer in network byte order. + \param mask is the netmask, specified as an unsigned long integer in network byte order. \return the number of significant bits. */ - static int tqmask2prefix(unsigned long int tqmask); + static int mask2prefix(unsigned long int mask); }; #endif diff --git a/knetworkconf/knetworkconf/knetworkconf.cpp b/knetworkconf/knetworkconf/knetworkconf.cpp index c03b762..1d8efd9 100644 --- a/knetworkconf/knetworkconf/knetworkconf.cpp +++ b/knetworkconf/knetworkconf/knetworkconf.cpp @@ -19,7 +19,7 @@ #include "knetworkconf.h" -KNetworkConf::KNetworkConf(TQWidget *tqparent, const char *name) : DCOPObject("KNetworkConfIface"), KNetworkConfDlg(tqparent, name) +KNetworkConf::KNetworkConf(TQWidget *parent, const char *name) : DCOPObject("KNetworkConfIface"), KNetworkConfDlg(parent, name) { netInfo = 0L; makeButtonsResizeable(); @@ -245,7 +245,7 @@ void KNetworkConf::configureDeviceSlot(){ configDlg.addDlg->rbBootProtoManual->setChecked(false); configDlg.addDlg->rbBootProtoAuto->setChecked(true); configDlg.addDlg->kleIPAddress->setEnabled(false); - configDlg.addDlg->kcbNettqmask->setEnabled(false); + configDlg.addDlg->kcbNetmask->setEnabled(false); configDlg.kpbAdvanced->setEnabled(false); } else if (dev->getBootProto().lower() == "bootp") @@ -266,12 +266,12 @@ void KNetworkConf::configureDeviceSlot(){ if (!dev->getBroadcast().isEmpty()) advancedOptions->kleBroadcast->setText(dev->getBroadcast()); else - advancedOptions->kleBroadcast->setText(KAddressValidator::calculateBroadcast(dev->getIpAddress(),dev->getNettqmask())); + advancedOptions->kleBroadcast->setText(KAddressValidator::calculateBroadcast(dev->getIpAddress(),dev->getNetmask())); advancedOptions->kleGateway->setText(dev->getGateway()); - if (!dev->getNettqmask().isEmpty()) - configDlg.addDlg->kcbNettqmask->setCurrentText(dev->getNettqmask()); + if (!dev->getNetmask().isEmpty()) + configDlg.addDlg->kcbNetmask->setCurrentText(dev->getNetmask()); if (readOnly) { @@ -305,7 +305,7 @@ void KNetworkConf::configureDeviceSlot(){ dev->setBootProto("none"); } //If the selected boot protocol is dhcp or bootp (Auto), then we don't need the - //past IP address, nettqmask, network and broadcast, as a new one will be assigned by + //past IP address, netmask, network and broadcast, as a new one will be assigned by //the dhcp server. else if (configDlg.addDlg->rbBootProtoAuto->isChecked()) { @@ -314,7 +314,7 @@ void KNetworkConf::configureDeviceSlot(){ dev->setIpAddress(""); configDlg.addDlg->kleIPAddress->setText(""); dev->setGateway(""); - dev->setNettqmask(""); + dev->setNetmask(""); dev->setNetwork(""); dev->setBroadcast(""); } @@ -326,7 +326,7 @@ void KNetworkConf::configureDeviceSlot(){ if (valuesChanged(dev, configDlg.addDlg->kcbAutoBootProto->currentText(), - configDlg.addDlg->kcbNettqmask->currentText(), + configDlg.addDlg->kcbNetmask->currentText(), configDlg.addDlg->kleIPAddress->text(), advancedOptions->kleGateway->text(), configDlg.addDlg->kcbstartAtBoot->isChecked(), @@ -335,12 +335,12 @@ void KNetworkConf::configureDeviceSlot(){ { dev->setIpAddress(configDlg.addDlg->kleIPAddress->text().stripWhiteSpace()); dev->setGateway(advancedOptions->kleGateway->text().stripWhiteSpace()); - dev->setNettqmask(configDlg.addDlg->kcbNettqmask->currentText().stripWhiteSpace()); - TQString network = KAddressValidator::calculateNetwork(dev->getIpAddress().stripWhiteSpace(),dev->getNettqmask().stripWhiteSpace()); + dev->setNetmask(configDlg.addDlg->kcbNetmask->currentText().stripWhiteSpace()); + TQString network = KAddressValidator::calculateNetwork(dev->getIpAddress().stripWhiteSpace(),dev->getNetmask().stripWhiteSpace()); dev->setNetwork(network); TQString broadcast = advancedOptions->kleBroadcast->text().stripWhiteSpace(); if (broadcast.isEmpty()) - broadcast = KAddressValidator::calculateBroadcast(dev->getIpAddress().stripWhiteSpace(),dev->getNettqmask().stripWhiteSpace()); + broadcast = KAddressValidator::calculateBroadcast(dev->getIpAddress().stripWhiteSpace(),dev->getNetmask().stripWhiteSpace()); dev->setBroadcast(broadcast); dev->setDescription(advancedOptions->kleDescription->text()); @@ -789,14 +789,14 @@ TQStringList KNetworkConf::getDeviceList(){ /** No descriptions */ bool KNetworkConf::valuesChanged(KNetworkInterface *dev, TQString bootProto, - TQString nettqmask, + TQString netmask, TQString ipAddr, TQString gateway, bool onBoot, TQString desc, TQString broadcast){ if ((dev->getBootProto() != bootProto) || - (dev->getNettqmask() != nettqmask) || + (dev->getNetmask() != netmask) || (dev->getIpAddress() != ipAddr) || (dev->getGateway() != gateway) || ((dev->getOnBoot() == "yes") && !(onBoot)) || diff --git a/knetworkconf/knetworkconf/knetworkconf.h b/knetworkconf/knetworkconf/knetworkconf.h index af034b4..d5cf482 100644 --- a/knetworkconf/knetworkconf/knetworkconf.h +++ b/knetworkconf/knetworkconf/knetworkconf.h @@ -79,7 +79,7 @@ class KNetworkConf : public KNetworkConfDlg, virtual public KNetworkConfIface TQ_OBJECT public: /** construtor */ - KNetworkConf(TQWidget* tqparent=0, const char *name=0); + KNetworkConf(TQWidget* parent=0, const char *name=0); /** destructor */ ~KNetworkConf(); /** Puts the application in read-only mode. This happens when the user runing the application isn't root. */ @@ -165,7 +165,7 @@ class KNetworkConf : public KNetworkConfDlg, virtual public KNetworkConfIface virtual void removeServerSlot(); bool valuesChanged(KNetworkInterface *dev, TQString bootProto, - TQString nettqmask, + TQString netmask, TQString ipAddr, TQString gateway, bool onBoot, diff --git a/knetworkconf/knetworkconf/knetworkconfigparser.cpp b/knetworkconf/knetworkconf/knetworkconfigparser.cpp index 1bba25c..e6aa338 100644 --- a/knetworkconf/knetworkconf/knetworkconfigparser.cpp +++ b/knetworkconf/knetworkconf/knetworkconfigparser.cpp @@ -142,8 +142,8 @@ void KNetworkConfigParser::readListIfacesSlot(){ originalDevice->setIpAddress(tempDevice->getIpAddress()); if (!tempDevice->getMacAddress().isEmpty()) originalDevice->setMacAddress(tempDevice->getMacAddress()); - if (!tempDevice->getNettqmask().isEmpty()) - originalDevice->setNettqmask(tempDevice->getNettqmask()); + if (!tempDevice->getNetmask().isEmpty()) + originalDevice->setNetmask(tempDevice->getNetmask()); if (!tempDevice->getNetwork().isEmpty()) originalDevice->setNetwork(tempDevice->getNetwork()); } @@ -299,7 +299,7 @@ void KNetworkConfigParser::saveNetworkInfo(KNetworkInfo *networkInfo) procSaveNetworkInfo->addArgument( "--set" ); // KDetectDistroDlg* dialog = new KDetectDistroDlg(0, 0, true,TQDialog::WStyle_Customize|TQDialog::WStyle_NormalBorder|TQDialog::WStyle_Title|TQDialog::WStyle_SysMenu); //made it semi-modal - KDetectDistroDlg* dialog = new KDetectDistroDlg((TQWidget*)tqparent(), 0, true); + KDetectDistroDlg* dialog = new KDetectDistroDlg((TQWidget*)parent(), 0, true); dialog->setCaption(i18n("Reloading Network")); dialog->text->setText(i18n("%1Please wait while saving the network settings...%2").tqarg("<center>").tqarg("</center>")); dialog->show(); @@ -410,11 +410,11 @@ void KNetworkConfigParser::addNetworkInterfacesToXMLDoc(TQDomDocument *doc, TQDo t = doc->createTextNode( device->getBroadcast() ); innerTag.appendChild( t ); } - if (!device->getNettqmask().isEmpty()) + if (!device->getNetmask().isEmpty()) { - innerTag = doc->createElement( "nettqmask" ); + innerTag = doc->createElement( "netmask" ); configurationTag.appendChild( innerTag ); - t = doc->createTextNode( device->getNettqmask() ); + t = doc->createTextNode( device->getNetmask() ); innerTag.appendChild( t ); } if (!device->getNetwork().isEmpty()) @@ -677,11 +677,11 @@ KNetworkInterface * KNetworkConfigParser::getInterfaceInfo(TQDomElement interfac if (!e.text().isEmpty()) tempDevice->setGateway(e.text()); } - else if ( configNodeName == "nettqmask" || configNodeName == "tqmask") + else if ( configNodeName == "netmask" || configNodeName == "mask") { TQDomElement e = configNode.toElement(); if (!e.text().isEmpty()) - tempDevice->setNettqmask(e.text()); + tempDevice->setNetmask(e.text()); } else if ( configNodeName == "network" ) { @@ -707,11 +707,11 @@ KNetworkInterface * KNetworkConfigParser::getInterfaceInfo(TQDomElement interfac if (!e.text().isEmpty()) tempDevice->setIpAddress(e.text()); } - else if ( nodeName == "tqmask") + else if ( nodeName == "mask") { TQDomElement e = node.toElement(); if (!e.text().isEmpty()) - tempDevice->setNettqmask(e.text()); + tempDevice->setNetmask(e.text()); } else if ( nodeName == "bdcast") { @@ -769,7 +769,7 @@ KNetworkInterface * KNetworkConfigParser::getInterfaceInfo(TQDomElement interfac if ((tempDevice->getBootProto().lower() == "dhcp") || (tempDevice->getBootProto().lower() == "bootp")) { tempDevice->setIpAddress(""); - tempDevice->setNettqmask(""); + tempDevice->setNetmask(""); tempDevice->setNetwork(""); tempDevice->setBroadcast(""); } diff --git a/knetworkconf/knetworkconf/knetworkconfmodule.cpp b/knetworkconf/knetworkconf/knetworkconfmodule.cpp index ddaaa60..f25c99d 100644 --- a/knetworkconf/knetworkconf/knetworkconfmodule.cpp +++ b/knetworkconf/knetworkconf/knetworkconfmodule.cpp @@ -23,8 +23,8 @@ -KNetworkConfModule::KNetworkConfModule(TQWidget* tqparent, const char *name/*, TQStringList list*/) - : KCModule(tqparent,name) +KNetworkConfModule::KNetworkConfModule(TQWidget* parent, const char *name/*, TQStringList list*/) + : KCModule(parent,name) { TQVBoxLayout *top = new TQVBoxLayout(this); diff --git a/knetworkconf/knetworkconf/knetworkconfmodule.h b/knetworkconf/knetworkconf/knetworkconfmodule.h index 2e30e27..a9cae41 100644 --- a/knetworkconf/knetworkconf/knetworkconfmodule.h +++ b/knetworkconf/knetworkconf/knetworkconfmodule.h @@ -28,7 +28,7 @@ class KNetworkConfModule : public KCModule TQ_OBJECT public: - KNetworkConfModule(TQWidget* tqparent, const char *name/*, TQStringList list*/); + KNetworkConfModule(TQWidget* parent, const char *name/*, TQStringList list*/); ~KNetworkConfModule(); void load(); diff --git a/knetworkconf/knetworkconf/knetworkinterface.cpp b/knetworkconf/knetworkconf/knetworkinterface.cpp index 1db8dee..0a7fad5 100644 --- a/knetworkconf/knetworkconf/knetworkinterface.cpp +++ b/knetworkconf/knetworkconf/knetworkinterface.cpp @@ -34,8 +34,8 @@ TQString KNetworkInterface::getDeviceName(){ TQString KNetworkInterface::getIpAddress(){ return ipAddress; } -TQString KNetworkInterface::getNettqmask(){ - return nettqmask; +TQString KNetworkInterface::getNetmask(){ + return netmask; } TQString KNetworkInterface::getNetwork(){ return network; @@ -59,8 +59,8 @@ void KNetworkInterface::setDeviceName(const TQString &deviceName){ void KNetworkInterface::setIpAddress(const TQString &ipAddress){ KNetworkInterface::ipAddress = ipAddress; } -void KNetworkInterface::setNettqmask(const TQString &nettqmask){ - KNetworkInterface::nettqmask = nettqmask; +void KNetworkInterface::setNetmask(const TQString &netmask){ + KNetworkInterface::netmask = netmask; } void KNetworkInterface::setNetwork(const TQString &network){ KNetworkInterface::network = network; diff --git a/knetworkconf/knetworkconf/knetworkinterface.h b/knetworkconf/knetworkconf/knetworkinterface.h index 4a64641..65ccfc0 100644 --- a/knetworkconf/knetworkconf/knetworkinterface.h +++ b/knetworkconf/knetworkconf/knetworkinterface.h @@ -33,7 +33,7 @@ class KNetworkInterface { TQString getBroadcast(); TQString getDeviceName(); TQString getIpAddress(); - TQString getNettqmask(); + TQString getNetmask(); TQString getNetwork(); TQString getOnBoot(); TQString getGateway(); @@ -41,7 +41,7 @@ class KNetworkInterface { void setBroadcast(const TQString &broadcast); void setDeviceName(const TQString &deviceName); void setIpAddress(const TQString &ipAddress); - void setNettqmask(const TQString &nettqmask); + void setNetmask(const TQString &netmask); void setNetwork(const TQString &network); void setOnBoot(const TQString &onBoot); void setGateway(const TQString &gateway); @@ -61,8 +61,8 @@ class KNetworkInterface { TQString bootProto; /** IPv4 address of the interface. */ TQString ipAddress; - /** The Nettqmask. */ - TQString nettqmask; + /** The Netmask. */ + TQString netmask; /** The network. */ TQString network; /** The broadcast. */ diff --git a/knetworkconf/knetworkconf/kprofileslistviewtooltip.h b/knetworkconf/knetworkconf/kprofileslistviewtooltip.h index 15dfde8..579f0e4 100644 --- a/knetworkconf/knetworkconf/kprofileslistviewtooltip.h +++ b/knetworkconf/knetworkconf/kprofileslistviewtooltip.h @@ -28,7 +28,7 @@ class KProfilesListViewToolTip : public TQToolTip { public: - KProfilesListViewToolTip(TQListView* tqparent); + KProfilesListViewToolTip(TQListView* parent); void setProfiles(TQPtrList<KNetworkInfo> profiles_); ~KProfilesListViewToolTip(); @@ -47,7 +47,7 @@ inline void KProfilesListViewToolTip::setProfiles(TQPtrList<KNetworkInfo> profil profiles = profiles_; } -inline KProfilesListViewToolTip::KProfilesListViewToolTip( TQListView* tqparent ):TQToolTip( tqparent->viewport() ), listView( tqparent ) {} +inline KProfilesListViewToolTip::KProfilesListViewToolTip( TQListView* parent ):TQToolTip( parent->viewport() ), listView( parent ) {} inline void KProfilesListViewToolTip::maybeTip( const TQPoint& p ) { diff --git a/knetworkconf/knetworkconf/main.cpp b/knetworkconf/knetworkconf/main.cpp index 9ee6be9..8ebe038 100644 --- a/knetworkconf/knetworkconf/main.cpp +++ b/knetworkconf/knetworkconf/main.cpp @@ -40,10 +40,10 @@ K_EXPORT_COMPONENT_FACTORY( knetworkconfmodule, KDEDFactory( "kcm_knetworkconfmo extern "C" { - KDE_EXPORT KCModule *create_knetworkconfmodule(TQWidget *tqparent, const char *name) + KDE_EXPORT KCModule *create_knetworkconfmodule(TQWidget *parent, const char *name) { KGlobal::locale()->insertCatalogue("knetworkconf"); - return new KNetworkConfModule(tqparent, name); + return new KNetworkConfModule(parent, name); } } |