diff options
Diffstat (limited to 'knetworkconf')
42 files changed, 515 insertions, 511 deletions
diff --git a/knetworkconf/Doxyfile b/knetworkconf/Doxyfile index c227a40..df7555c 100644 --- a/knetworkconf/Doxyfile +++ b/knetworkconf/Doxyfile @@ -82,7 +82,7 @@ FILE_PATTERNS = *.c \ *.tlh \ *.diff \ *.patch \ - *.moc \ + *.tqmoc \ *.xpm RECURSIVE = yes EXCLUDE = diff --git a/knetworkconf/backends/file.pl.in b/knetworkconf/backends/file.pl.in index ac73301..35d17cb 100644 --- a/knetworkconf/backends/file.pl.in +++ b/knetworkconf/backends/file.pl.in @@ -81,7 +81,7 @@ sub gst_file_get_data_path } -# Give a command, and it will put in C locale, some sane PATH values and find +# Give a command, and it will put in C locale, some sane PATH values and tqfind # the program to run in the path. Redirects stderr to null. sub get_cmd_path { @@ -456,11 +456,11 @@ sub gst_file_open_write_compressed sub gst_file_run_pipe { - my ($cmd, $mode_mask, $stderr) = @_; + my ($cmd, $mode_tqmask, $stderr) = @_; my ($command); local *PIPE; - $mode_mask = $GST_FILE_READ if $mode_mask eq undef; + $mode_tqmask = $GST_FILE_READ if $mode_tqmask eq undef; &gst_report_enter (); @@ -480,8 +480,8 @@ sub gst_file_run_pipe return undef; } - $command .= " |" if $mode_mask & $GST_FILE_READ; - $command = "| $command > /dev/null" if $mode_mask & $GST_FILE_WRITE; + $command .= " |" if $mode_tqmask & $GST_FILE_READ; + $command = "| $command > /dev/null" if $mode_tqmask & $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 9b7bfa9..0f0a457 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 # amask $2,$1 + .long 0x47e20c21 # atqmask $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 # amask $2,$1 + .long 0x47e20c21 # atqmask $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 19c021a..6441761 100644 --- a/knetworkconf/backends/network.pl.in +++ b/knetworkconf/backends/network.pl.in @@ -37,7 +37,7 @@ if ($SCRIPTSDIR =~ /^@scriptsdir[@]/) require "$SCRIPTSDIR/general.pl$DOTIN"; require "$SCRIPTSDIR/file.pl$DOTIN"; require "$SCRIPTSDIR/parse.pl$DOTIN"; -require "$SCRIPTSDIR/replace.pl$DOTIN"; +require "$SCRIPTSDIR/tqreplace.pl$DOTIN"; require "$SCRIPTSDIR/service.pl$DOTIN"; require "$SCRIPTSDIR/util.pl$DOTIN"; require "$SCRIPTSDIR/xml.pl$DOTIN"; @@ -161,10 +161,10 @@ sub gst_network_config_wireless sub gst_network_enable_iface { my ($hash, $dev, $command_ifconfig) = @_; - my ($address, $netmask, $bootproto, $remote_address); + my ($address, $nettqmask, $bootproto, $remote_address); $address = $$hash{"configuration"}{"address"}; - $netmask = $$hash{"configuration"}{"netmask"}; + $nettqmask = $$hash{"configuration"}{"nettqmask"}; $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 .= " netmask $netmask" if ($netmask); + $command .= " nettqmask $nettqmask" if ($nettqmask); $command .= " dstaddr $remote_address" if ($remote_address); $command .= " up"; } @@ -432,19 +432,19 @@ sub gst_network_ipv4_vec2str # Gets the subnet, in bitmap. sub gst_network_ipv4_calc_subnet_vec { - my ($addr, $mask) = @_; - my ($addrvec, $maskvec); + my ($addr, $tqmask) = @_; + my ($addrvec, $tqmaskvec); $addrvec = &gst_network_ipv4_str2vec ($addr); - $maskvec = &gst_network_ipv4_str2vec ($mask); + $tqmaskvec = &gst_network_ipv4_str2vec ($tqmask); - return $addrvec & $maskvec; + return $addrvec & $tqmaskvec; } # What you're looking for. sub gst_network_ipv4_calc_subnet { - my ($addr, $mask) = @_; + my ($addr, $tqmask) = @_; return &gst_network_ipv4_vec2str (&gst_network_ipv4_calc_subnet_vec); } @@ -452,18 +452,18 @@ sub gst_network_ipv4_calc_subnet # The broadcast, bitmap. sub gst_network_ipv4_calc_bcast_vec { - my ($addr, $mask) = @_; + my ($addr, $tqmask) = @_; $addrvec = &gst_network_ipv4_str2vec ($addr); - $maskvec = &gst_network_ipv4_str2vec ($mask); + $tqmaskvec = &gst_network_ipv4_str2vec ($tqmask); - return $addrvec | ~$maskvec; + return $addrvec | ~$tqmaskvec; } # And this returning the quad-dot notation. sub gst_network_ipv4_calc_bcast { - my ($addr, $mask) = @_; + my ($addr, $tqmask) = @_; 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}{"mask"} = $1 if /netmask[ \t]+([^ \t]+)/i; + $ifaces{$dev}{"tqmask"} = $1 if /nettqmask[ \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}{"mask"} = $1 if /mask:([^ \t]+)/i; + $ifaces{$dev}{"tqmask"} = $1 if /tqmask:([^ \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{"netmask"} && + if (exists $$iface{"nettqmask"} && exists $$iface{"address"}) { if (! exists $$iface{"broadcast"}) { - $$iface{"broadcast"} = &gst_network_ipv4_calc_bcast ($$iface{"address"}, $$iface{"netmask"}); + $$iface{"broadcast"} = &gst_network_ipv4_calc_bcast ($$iface{"address"}, $$iface{"nettqmask"}); } if (! exists $$iface{"network"}) { - $$iface{"network"} = &gst_network_ipv4_calc_subnet ($$iface{"address"}, $$iface{"netmask"}); + $$iface{"network"} = &gst_network_ipv4_calc_subnet ($$iface{"address"}, $$iface{"nettqmask"}); } } } @@ -1660,7 +1660,7 @@ sub gst_network_interfaces_get { delete $$hash{$i}{"addr"}; delete $$hash{$i}{"bcast"}; - delete $$hash{$i}{"mask"}; + delete $$hash{$i}{"tqmask"}; } 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, $netmask, $gateway); + my ($address, $nettqmask, $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"); - $netmask = &gst_parse_rcinet1conf ($file, $dev, "NETMASK"); - $gateway = &gst_network_get_gateway ($file, "GATEWAY", $address, $netmask); + $nettqmask = &gst_parse_rcinet1conf ($file, $dev, "NETMASK"); + $gateway = &gst_network_get_gateway ($file, "GATEWAY", $address, $nettqmask); - $ret = &gst_file_run ("ifconfig $dev $address netmask $netmask up"); + $ret = &gst_file_run ("ifconfig $dev $address nettqmask $nettqmask up"); # Add the gateway if necessary if ($gateway ne undef) @@ -3526,34 +3526,34 @@ sub gst_network_suse90_set_auto } } -# Return IP address or netmask, depending on $what +# Return IP address or nettqmask, depending on $what sub gst_network_pld10_get_ipaddr { my ($file, $key, $what) = @_; - my ($ipaddr, $netmask, $ret, $i); - my @netmask_prefixes = (0, 128, 192, 224, 240, 248, 252, 254, 255); + my ($ipaddr, $nettqmask, $ret, $i); + my @nettqmask_prefixes = (0, 128, 192, 224, 240, 248, 252, 254, 255); $ipaddr = &gst_parse_sh($file, $key); return undef if $ipaddr eq ""; if($ipaddr =~ /([^\/]*)\/([[:digit:]]*)/) { - $netmask = $2; - return undef if $netmask eq ""; + $nettqmask = $2; + return undef if $nettqmask eq ""; if($what eq "address") { return $1; } - for($i = 0; $i < int($netmask/8); $i++) + for($i = 0; $i < int($nettqmask/8); $i++) { $ret .= "255."; } - $ret .= "$netmask_prefixes[$b%8]." if $netmask < 32; + $ret .= "$nettqmask_prefixes[$b%8]." if $nettqmask < 32; - for($i = int($netmask/8) + 1; $i < 4; $i++) + for($i = int($nettqmask/8) + 1; $i < 4; $i++) { $ret .= "0."; } @@ -3564,7 +3564,7 @@ sub gst_network_pld10_get_ipaddr return undef; } -# Writes IP address or netmask, depending in $what, to $file +# Writes IP address or nettqmask, 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, $netmask); + my ($ipaddr, $nettqmask); $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:]]*)/) { - $netmask = $prefixes{$1} + $prefixes{$2} + $prefixes{$3} + $prefixes{$4}; - $ipaddr =~ s/\/[[:digit:]]*/\/$netmask/; + $nettqmask = $prefixes{$1} + $prefixes{$2} + $prefixes{$3} + $prefixes{$4}; + $ipaddr =~ s/\/[[:digit:]]*/\/$nettqmask/; } } @@ -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, $netmask) = @_; - my (@add1, @add2, @mask); + my ($address1, $address2, $nettqmask) = @_; + my (@add1, @add2, @tqmask); my ($i); return 0 if (($address1 eq undef) || ($address2 eq undef) || - ($netmask eq undef)); + ($nettqmask eq undef)); @add1 = split (/\./, $address1); @add2 = split (/\./, $address2); - @mask = split (/\./, $netmask); + @tqmask = split (/\./, $nettqmask); for ($i = 0; $i < 4; $i++) { $add1[$i] += 0; $add2[$i] += 0; - $mask[$i] += 0; + $tqmask[$i] += 0; - return 0 if (($add1[$i] & $mask[$i]) != ($add2[$i] & $mask[$i])); + return 0 if (($add1[$i] & $tqmask[$i]) != ($add2[$i] & $tqmask[$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, $netmask, $key); + my ($address, $nettqmask, $key); foreach $key (keys %$interface) { $address = $$interface{$key}{"address"}; - $netmask = $$interface{$key}{"netmask"}; + $nettqmask = $$interface{$key}{"nettqmask"}; - return $$interface{$key}{"dev"} if (&gst_network_is_ip_in_same_network ($address, $gateway, $netmask)); + return $$interface{$key}{"dev"} if (&gst_network_is_ip_in_same_network ($address, $gateway, $nettqmask)); } return undef; @@ -3658,23 +3658,23 @@ sub gst_network_get_plip_gateway sub gst_network_get_gateway { - my ($file, $key, $address, $netmask) = @_; + my ($file, $key, $address, $nettqmask) = @_; 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, $netmask); + return $gateway if &gst_network_is_ip_in_same_network ($address, $gateway, $nettqmask); return undef; } sub gst_network_suse90_get_gateway { - my ($file, $address, $netmask) = @_; + my ($file, $address, $nettqmask) = @_; 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, $netmask); + return $gateway if &gst_network_is_ip_in_same_network ($address, $gateway, $nettqmask); return undef; } @@ -3689,10 +3689,10 @@ sub gst_network_suse90_get_plip_gateway sub gst_network_suse90_replace_gateway { - my ($file, $dev, $address, $netmask, $value) = @_; + my ($file, $dev, $address, $nettqmask, $value) = @_; - 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") if &gst_network_is_ip_in_same_network ($address, $value, $nettqmask); # 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", - "netmask" => "255.0.0.0", + "nettqmask" => "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 ], - [ "netmask", \&gst_parse_sh, IFCFG, NETMASK ], + [ "nettqmask", \&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 ], - [ "netmask", \&gst_parse_sh, IFCFG, NETMASK ], + [ "nettqmask", \&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 ], - [ "netmask", \&gst_parse_sh, IFCFG, NETMASK ], + [ "nettqmask", \&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 ], - [ "netmask", \&gst_parse_sh, IFCFG, NETMASK ], + [ "nettqmask", \&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 ], - [ "netmask", \&gst_parse_sh, IFCFG, NETMASK ], + [ "nettqmask", \&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 ], - [ "netmask", \&gst_parse_sh, IFCFG, NETMASK ], + [ "nettqmask", \&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" ], - [ "netmask", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "netmask" ], + [ "nettqmask", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "nettqmask" ], [ "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" ], - [ "netmask", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "netmask" ], + [ "nettqmask", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "nettqmask" ], [ "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 ], - [ "netmask", \&gst_network_suse70_get_ifconfig_arg, [IFCFG, IFACE], netmask ], + [ "nettqmask", \&gst_network_suse70_get_ifconfig_arg, [IFCFG, IFACE], nettqmask ], [ "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 ], - [ "netmask", \&gst_parse_sh, IFCFG, NETMASK ], + [ "nettqmask", \&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%", "%netmask%" ], + [ "gateway", \&gst_network_suse90_get_gateway, ROUTE_CONF, "%address%", "%nettqmask%" ], [ "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" ], - [ "netmask", \&gst_network_pld10_get_ipaddr, IFCFG, IPADDR, "netmask" ], + [ "nettqmask", \&gst_network_pld10_get_ipaddr, IFCFG, IPADDR, "nettqmask" ], # [ "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 ], - [ "netmask", \&gst_parse_rcinet1conf, [RC_INET_CONF, IFACE], NETMASK ], - [ "gateway", \&gst_network_get_gateway, RC_INET_CONF, GATEWAY, "%address%", "%netmask%" ], + [ "nettqmask", \&gst_parse_rcinet1conf, [RC_INET_CONF, IFACE], NETMASK ], + [ "gateway", \&gst_network_get_gateway, RC_INET_CONF, GATEWAY, "%address%", "%nettqmask%" ], [ "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\.]+)" ], - [ "netmask", \&gst_parse_confd_net_re, NET, "config_%dev%", "netmask[ \t]+([0-9\.]*)" ], + [ "nettqmask", \&gst_parse_confd_net_re, NET, "config_%dev%", "nettqmask[ \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\.]+)" ], - [ "netmask", \&gst_parse_startif, STARTIF, "netmask[ \t]+([0-9\.]+)" ], - [ "netmask", \&gst_parse_sh_re, RC_CONF, "ifconfig_%dev%", "netmask[ \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\.]+)" ], [ "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%", "%netmask%" ], + [ "gateway", \&gst_network_get_gateway, RC_CONF, "defaultrouter", "%address%", "%nettqmask%" ], [ "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 ], - [ "netmask", \&gst_replace_sh, IFCFG, NETMASK ], + [ "nettqmask", \&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 ], - [ "netmask", \&gst_replace_sh, IFCFG, NETMASK ], + [ "nettqmask", \&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 ], - [ "netmask", \&gst_replace_sh, IFCFG, NETMASK ], + [ "nettqmask", \&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 ], - [ "netmask", \&gst_replace_sh, IFCFG, NETMASK ], + [ "nettqmask", \&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 ], - [ "netmask", \&gst_replace_sh, IFCFG, NETMASK ], + [ "nettqmask", \&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 ], - [ "netmask", \&gst_replace_sh, IFCFG, NETMASK ], + [ "nettqmask", \&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" ], - [ "netmask", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "netmask" ], + [ "nettqmask", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "nettqmask" ], [ "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" ], - [ "netmask", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "netmask" ], + [ "nettqmask", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "nettqmask" ], [ "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] ], - [ "netmask", \&gst_network_suse70_set_ifconfig_arg, [IFCFG, IFACE], netmask ], + [ "nettqmask", \&gst_network_suse70_set_ifconfig_arg, [IFCFG, IFACE], nettqmask ], [ "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 ], - [ "netmask", \&gst_replace_sh, IFCFG, NETMASK ], + [ "nettqmask", \&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" ], - [ "netmask", \&gst_network_pld10_set_ipaddr, IFCFG, IPADDR, "netmask" ], + [ "nettqmask", \&gst_network_pld10_set_ipaddr, IFCFG, IPADDR, "nettqmask" ], # [ "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 ], - [ "netmask", \&gst_replace_rcinet1conf, [ RC_INET_CONF, IFACE ], NETMASK ], + [ "nettqmask", \&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\.]+)" ], - [ "netmask", \&gst_replace_confd_net_re, NET, "config_%dev%", "[ \t]+netmask[ \t]+[0-9\.]*", " netmask %netmask%"], + [ "nettqmask", \&gst_replace_confd_net_re, NET, "config_%dev%", "[ \t]+nettqmask[ \t]+[0-9\.]*", " nettqmask %nettqmask%"], [ "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%" ], - [ "netmask", \&gst_replace_sh_re, RC_CONF, "ifconfig_%dev%", "netmask[ \t]+([0-9\.]+)", " netmask %netmask%" ], + [ "nettqmask", \&gst_replace_sh_re, RC_CONF, "ifconfig_%dev%", "nettqmask[ \t]+([0-9\.]+)", " nettqmask %nettqmask%" ], [ "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/parse.pl.in b/knetworkconf/backends/parse.pl.in index 25c9373..7064536 100644 --- a/knetworkconf/backends/parse.pl.in +++ b/knetworkconf/backends/parse.pl.in @@ -1437,7 +1437,7 @@ sub gst_parse_xml my ($model, $branch); ($model) = &gst_xml_model_scan ($file); - $branch = &gst_xml_model_find ($model, $varpath); + $branch = &gst_xml_model_tqfind ($model, $varpath); if ($branch) { @@ -1451,12 +1451,12 @@ sub gst_parse_xml sub gst_parse_xml_child_names { my ($file, $varpath) = @_; - my ($model, $branch, @children); + my ($model, $branch, @tqchildren); ($model) = &gst_xml_model_scan ($file); - $branch = &gst_xml_model_find ($model, $varpath); + $branch = &gst_xml_model_tqfind ($model, $varpath); - if (!$branch) { return @children; } + if (!$branch) { return @tqchildren; } my @list = @$branch; shift @list; # Attributes @@ -1465,7 +1465,7 @@ sub gst_parse_xml_child_names { if ($list [0] ne "__unparsed__" && $list [0] ne "0") { - push @children, shift @list; + push @tqchildren, shift @list; } else { @@ -1475,7 +1475,7 @@ sub gst_parse_xml_child_names shift @list; } - return @children; + return @tqchildren; } sub gst_parse_alchemist @@ -1500,16 +1500,16 @@ sub gst_parse_alchemist_print_option my ($varpath, $model, $branch, $fd, $options, $option); ($model) = &gst_xml_model_scan ($file); - $branch = &gst_xml_model_find ($model, "/adm_context/datatree/printconf/print_queues/" . $printer . + $branch = &gst_xml_model_tqfind ($model, "/adm_context/datatree/printconf/print_queues/" . $printer . "/filter_data/foomatic_defaults"); return undef if (!$branch); - $options = &gst_xml_model_get_children ($branch); + $options = &gst_xml_model_get_tqchildren ($branch); foreach $o (@$options) { - my $opt_node = &gst_xml_model_find ($o, "name"); + my $opt_node = &gst_xml_model_tqfind ($o, "name"); next if (!$opt_node); if (&gst_xml_model_get_attribute ($opt_node, "VALUE") eq $name) @@ -1521,7 +1521,7 @@ sub gst_parse_alchemist_print_option return undef if (!$option); - my $node = &gst_xml_model_find ($option, "default"); + my $node = &gst_xml_model_tqfind ($option, "default"); return undef if (!$node); return &gst_xml_model_get_attribute ($node, "VALUE"); diff --git a/knetworkconf/backends/replace.pl.in b/knetworkconf/backends/replace.pl.in index a72e3ef..30ec359 100644 --- a/knetworkconf/backends/replace.pl.in +++ b/knetworkconf/backends/replace.pl.in @@ -1,7 +1,7 @@ #!/usr/bin/env perl #-*- Mode: perl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -# replace.pl: Common in-line replacing stuff for the ximian-setup-tools backends. +# tqreplace.pl: Common in-line replacing stuff for the ximian-setup-tools backends. # # Copyright (C) 2000-2001 Ximian, Inc. # @@ -59,7 +59,7 @@ require "$SCRIPTSDIR/parse.pl$DOTIN"; # Additional abstraction: replace table entries can have # arrays inside. The replace proc will be ran with every # combination that the arrays provide. Ex: -# ["user", \&gst_replace_foo, [0, 1], [2, 3] ] will replace +# ["user", \&gst_replace_foo, [0, 1], [2, 3] ] will tqreplace # using all possibilities in the combinatory of [0, 1]x[2, 3]. # Check RedHat 7.2's network replace table for further # enlightenment. @@ -264,7 +264,7 @@ sub gst_replace_join_first_array return &gst_replace_split ($file, $key, $re1, join (&gst_replace_regexp_to_separator ($re2), @$value)); } -# Escape $value in /bin/sh way, find/append key and set escaped value. +# Escape $value in /bin/sh way, tqfind/append key and set escaped value. sub gst_replace_sh { my ($file, $key, $value) = @_; @@ -289,7 +289,7 @@ sub gst_replace_sh return $ret; } -# Escape $value in /bin/sh way, find/append key and set escaped value, make sure line har +# Escape $value in /bin/sh way, tqfind/append key and set escaped value, make sure line har sub gst_replace_sh_export { my ($file, $key, $value) = @_; @@ -443,7 +443,7 @@ sub gst_replace_line_first return 0; } -# For every key in %$value, replace/append the corresponding key/value pair. +# For every key in %$value, tqreplace/append the corresponding key/value pair. # The separator for $re1 sub gst_replace_join_hash { @@ -477,7 +477,7 @@ sub gst_replace_join_hash return $res; } -# Find $re matching send string and replace parenthesyzed +# Find $re matching send string and replace tqparenthesyzed # part of $re with $value. FIXME: apply meeks' more general impl. sub gst_replace_chat { @@ -550,7 +550,7 @@ sub gst_replace_chat return $ret; } -# Find/append $section in ini $file and replace/append +# Find/append $section in ini $file and tqreplace/append # $var = $value pair. FIXME: should reimplement with # interfaces style. This is too large. sub gst_replace_ini @@ -1149,7 +1149,7 @@ sub gst_replace_interfaces_iface_stanza_delete return &gst_file_buffer_save ($buff, $file); } -# Find $iface stanza line and replace $pos value (ie the method). +# Find $iface stanza line and tqreplace $pos value (ie the method). sub gst_replace_interfaces_stanza_value { my ($file, $iface, $pos, $value) = @_; @@ -1323,7 +1323,7 @@ sub gst_replace_pump_add_device } # Find a "device" section for $iface and -# replace/add/delete the $key option inside the section. +# tqreplace/add/delete the $key option inside the section. sub gst_replace_pump_iface_option_str { my ($file, $iface, $key, $value) = @_; @@ -1448,31 +1448,31 @@ sub gst_replace_alchemist_ensure_list_types my ($model, $varpath, $setpath) = @_; my ($branch, @path); - $branch = &gst_xml_model_find ($model, $varpath); + $branch = &gst_xml_model_tqfind ($model, $varpath); @path = split /\//, $setpath; # NOTE: The following could be done with a depth-iterator callback from a func - # similar to gst_xml_model_find (). + # similar to gst_xml_model_tqfind (). for $elem (@path) { next if ($elem eq ""); - my @children = @$branch; - shift @children; # Attributes + my @tqchildren = @$branch; + shift @tqchildren; # Attributes $branch = undef; - while (@children) + while (@tqchildren) { - if ($children [0] eq $elem) + if ($tqchildren [0] eq $elem) { - shift @children; - $branch = shift @children; + shift @tqchildren; + $branch = shift @tqchildren; &gst_xml_model_set_attribute ($branch, "TYPE", "LIST"); last; } - shift @children; - shift @children; + shift @tqchildren; + shift @tqchildren; } last if ($branch == undef); @@ -1511,7 +1511,7 @@ sub gst_replace_alchemist_print &gst_xml_model_set_attribute ($branch, "VALUE", $value); &gst_xml_model_set_attribute ($branch, "TYPE", $type); - $branch = &gst_xml_model_find ($model, "/adm_context/datatree/printconf/print_queues/" . $printer); + $branch = &gst_xml_model_tqfind ($model, "/adm_context/datatree/printconf/print_queues/" . $printer); &gst_xml_model_set_attribute ($branch, "ATOMIC", "TRUE"); return &gst_xml_model_save ($model, $file, $compressed); @@ -1532,11 +1532,11 @@ sub gst_replace_alchemist_print_option # See if option is already defined. - $options = &gst_xml_model_get_children ($branch); + $options = &gst_xml_model_get_tqchildren ($branch); foreach $o (@$options) { - my $opt_node = &gst_xml_model_find ($o, "name"); + my $opt_node = &gst_xml_model_tqfind ($o, "name"); next if (!$opt_node); if (&gst_xml_model_get_attribute ($opt_node, "VALUE") eq $name) diff --git a/knetworkconf/backends/report.pl.in b/knetworkconf/backends/report.pl.in index 68326dd..ceaadd6 100644 --- a/knetworkconf/backends/report.pl.in +++ b/knetworkconf/backends/report.pl.in @@ -260,7 +260,7 @@ sub gst_report "file_open_read_failed" => ["warn", "Could not open [%s] for reading."], "file_open_read_success" => ["info", "Reading options from [%s]."], "file_open_write_failed" => ["error", "Failed to write to [%s]."], - "file_open_write_create" => ["warn", "Could not find [%s] for writing. Creating [%s]."], + "file_open_write_create" => ["warn", "Could not tqfind [%s] for writing. Creating [%s]."], "file_open_write_success" => ["info", "Writing to [%s]."], "file_run_pipe_failed" => ["warn", "Failed to pipe command [%s] for reading."], "file_run_pipe_success" => ["info", "Piping command [%s] for reading."], @@ -269,7 +269,7 @@ sub gst_report "file_backup_rotate" => ["info", "Backup directory [%s] was rotated."], "file_backup_success" => ["info", "Saved backup for [%s]."], "file_open_filter_failed" => ["warn", "No file to patch: [%s]."], - "file_open_filter_create" => ["warn", "Could not find [%s] for patching. Creating [%s]."], + "file_open_filter_create" => ["warn", "Could not tqfind [%s] for patching. Creating [%s]."], "file_open_filter_success" => ["info", "Found [%s]. Patching [%s]."], "file_buffer_load" => ["info", "Loading file [%s] to buffer."], "file_buffer_save" => ["info", "Saving buffer to file [%s]."], diff --git a/knetworkconf/backends/type1inst b/knetworkconf/backends/type1inst index 86d6425..bb624be 100755 --- a/knetworkconf/backends/type1inst +++ b/knetworkconf/backends/type1inst @@ -876,7 +876,7 @@ sub font_sample { die_bug("Bad argument(s) to font_sample()!\n"); } -# Here we create a full page sample for the current font. It contains +# Here we create a full page sample for the current font. It tqcontains # a large point-size version, a normal sized version, and a small version. $text = <<"TEXT"; diff --git a/knetworkconf/backends/util.pl.in b/knetworkconf/backends/util.pl.in index b175fb8..e6c5893 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>, <netmask>) +# &gst_ip_calc_network (<IP>, <nettqmask>) # # Calculates the network address and returns it as a string. @@ -300,7 +300,7 @@ sub gst_ip_calc_network } -# &gst_ip_calc_network (<IP>, <netmask>) +# &gst_ip_calc_network (<IP>, <nettqmask>) # # 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 b9810c6..9421f75 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 parent tag $tag and print <key>val</key> for every +# Pass a hash, create a tqparent 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 @@ -352,34 +352,34 @@ sub gst_xml_model_print_recurse my ($tree, $indent) = @_; my ($string); - my @children = @$tree; - shift @children; # Attributes + my @tqchildren = @$tree; + shift @tqchildren; # Attributes - while (@children) + while (@tqchildren) { - my $branch = $children [1]; + my $branch = $tqchildren [1]; - if ($children [0] eq "__unparsed__") + if ($tqchildren [0] eq "__unparsed__") { - $string .= "<" . $children [1] . ">"; + $string .= "<" . $tqchildren [1] . ">"; } - elsif ($children [0] eq "0") + elsif ($tqchildren [0] eq "0") { - $string .= $children [1]; + $string .= $tqchildren [1]; } elsif (@$branch == 1) # Empty tag. { - $string .= "<" . $children [0] . &gst_xml_model_print_attributes ($branch) . "/>"; + $string .= "<" . $tqchildren [0] . &gst_xml_model_print_attributes ($branch) . "/>"; } else { - $string .= "<" . $children [0] . &gst_xml_model_print_attributes ($branch) . ">"; + $string .= "<" . $tqchildren [0] . &gst_xml_model_print_attributes ($branch) . ">"; $string .= &gst_xml_model_print_recurse ($branch); - $string .= "</" . $children [0] . ">"; + $string .= "</" . $tqchildren [0] . ">"; } - shift @children; - shift @children; + shift @tqchildren; + shift @tqchildren; } # if ($branch) @@ -814,7 +814,7 @@ sub gst_xml_get_state # XML model operations. # Locate a node from the branch leading up to it. -sub gst_xml_model_find +sub gst_xml_model_tqfind { my ($model, $varpath) = @_; my ($branch, @path); @@ -825,21 +825,21 @@ sub gst_xml_model_find for $elem (@path) { next if ($elem eq ""); - my @children = @$branch; - shift @children; # Attributes + my @tqchildren = @$branch; + shift @tqchildren; # Attributes $branch = undef; - while (@children) + while (@tqchildren) { - if ($children [0] eq $elem) + if ($tqchildren [0] eq $elem) { - shift @children; - $branch = shift @children; + shift @tqchildren; + $branch = shift @tqchildren; last; } - shift @children; - shift @children; + shift @tqchildren; + shift @tqchildren; } last if ($branch == undef); @@ -855,7 +855,7 @@ sub gst_xml_model_add my ($branch, @path); @path = split /\//, $addpath; - $branch = &gst_xml_model_find ($model, $varpath); + $branch = &gst_xml_model_tqfind ($model, $varpath); if ($branch == undef) { return -1; @@ -890,23 +890,23 @@ sub gst_xml_model_ensure { next if ($elem eq ""); - my @children = @$branch; - my $parent_branch = $branch; + my @tqchildren = @$branch; + my $tqparent_branch = $branch; - shift @children; # Attributes + shift @tqchildren; # Attributes $branch = undef; - while (@children) + while (@tqchildren) { - if ($children [0] eq $elem) + if ($tqchildren [0] eq $elem) { - shift @children; - $branch = shift @children; + shift @tqchildren; + $branch = shift @tqchildren; last; } - shift @children; - shift @children; + shift @tqchildren; + shift @tqchildren; } if ($branch == undef) @@ -918,8 +918,8 @@ sub gst_xml_model_ensure push @list, \%hash; - push @$parent_branch, $elem; - push @$parent_branch, $branch; + push @$tqparent_branch, $elem; + push @$tqparent_branch, $branch; } } @@ -932,7 +932,7 @@ sub gst_xml_model_remove my ($branch, $i); @path = split /\//, $addpath; - $branch = &gst_xml_model_find ($model, $varpath); + $branch = &gst_xml_model_tqfind ($model, $varpath); if ($branch == undef) { return -1; @@ -950,22 +950,22 @@ sub gst_xml_model_remove return -1; } -sub gst_xml_model_get_children +sub gst_xml_model_get_tqchildren { my ($branch) = @_; - my (@children); + my (@tqchildren); - if (!$branch) { return \@children; } + if (!$branch) { return \@tqchildren; } for ($i = 1; $i < @$branch; $i += 2) { if (@$branch [$i] ne "__unparsed__" && @$branch [$i] ne "0") { - push @children, @$branch [$i + 1]; + push @tqchildren, @$branch [$i + 1]; } } - return \@children; + return \@tqchildren; } sub gst_xml_model_get_pcdata diff --git a/knetworkconf/knetworkconf-mdk.spec b/knetworkconf/knetworkconf-mdk.spec index ce65b36..4267f34 100644 --- a/knetworkconf/knetworkconf-mdk.spec +++ b/knetworkconf/knetworkconf-mdk.spec @@ -80,7 +80,7 @@ rm -rf $RPM_BUILD_ROOT/* %files -f %name.lang -#Quick Hack: for some reason the %find_lang command doesn't find +#Quick Hack: for some reason the %find_lang command doesn't tqfind #the translations files, it outputs a knetworkconf.lang file full #of empty lines instead of the following ones: %lang(de) /usr/share/locale/de/LC_MESSAGES/knetworkconfmodule.mo 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 ); diff --git a/knetworkconf/knetworkconf/kadddevicecontainer.h b/knetworkconf/knetworkconf/kadddevicecontainer.h index d749576..17c3f15 100644 --- a/knetworkconf/knetworkconf/kadddevicecontainer.h +++ b/knetworkconf/knetworkconf/kadddevicecontainer.h @@ -46,8 +46,9 @@ Network interface configuration dialog. This dialog contains the KAddDeviceDlg a class KAddDeviceContainer : public KDialog { Q_OBJECT + TQ_OBJECT public: - KAddDeviceContainer(TQWidget *parent = 0, const char *name = 0); + KAddDeviceContainer(TQWidget *tqparent = 0, const char *name = 0); ~KAddDeviceContainer(); KPushButton* kpbAdvanced; diff --git a/knetworkconf/knetworkconf/kadddevicedlg.ui b/knetworkconf/knetworkconf/kadddevicedlg.ui index eecf497..dd99d94 100644 --- a/knetworkconf/knetworkconf/kadddevicedlg.ui +++ b/knetworkconf/knetworkconf/kadddevicedlg.ui @@ -2,7 +2,7 @@ <class>KAddDeviceDlg</class> <comment>Dialog to add/configure an network device.</comment> <author>Juan Luis Baptiste</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KAddDeviceDlg</cstring> </property> @@ -22,13 +22,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -53,7 +53,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>gbBasicDeviceInfo</cstring> </property> @@ -80,7 +80,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>130</width> <height>20</height> @@ -118,14 +118,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>50</width> <height>20</height> </size> </property> </spacer> - <widget class="QRadioButton" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>rbBootProtoManual</cstring> </property> @@ -140,7 +140,7 @@ <p>In this case, please use the fields below to enter the desired values manually.</p></string> </property> </widget> - <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>rbBootProtoAuto</cstring> </property> @@ -166,14 +166,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="5"> + <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>kcbstartAtBoot</cstring> </property> @@ -228,16 +228,16 @@ </property> </item> <property name="name"> - <cstring>kcbNetmask</cstring> + <cstring>kcbNettqmask</cstring> </property> <property name="editable"> <bool>false</bool> </property> <property name="toolTip" stdset="0"> - <string>Subnetmask of the network device</string> + <string>Subnettqmask of the network device</string> </property> <property name="whatsThis" stdset="0"> - <string><p>Please enter the desired subnetmask for the interface here.</p> + <string><p>Please enter the desired subnettqmask 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> @@ -252,7 +252,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -269,25 +269,25 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="3" column="1"> + <widget class="TQLabel" row="3" column="1"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> <property name="text"> - <string>Netmask:</string> + <string>Nettqmask:</string> </property> <property name="toolTip" stdset="0"> - <string>The netmask defines a range of IP numbers which will build a subnet inside the network.</string> + <string>The nettqmask defines a range of IP numbers which will build a subnet inside the network.</string> </property> <property name="whatsThis" stdset="0"> - <string>The netmask defines a range of IP numbers which will build a subnet inside the network.</string> + <string>The nettqmask 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"> @@ -321,14 +321,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -352,7 +352,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -384,7 +384,7 @@ <connection> <sender>rbBootProtoAuto</sender> <signal>toggled(bool)</signal> - <receiver>kcbNetmask</receiver> + <receiver>kcbNettqmask</receiver> <slot>setDisabled(bool)</slot> </connection> </connections> @@ -393,7 +393,7 @@ <tabstop>kcbAutoBootProto</tabstop> <tabstop>rbBootProtoManual</tabstop> <tabstop>kleIPAddress</tabstop> - <tabstop>kcbNetmask</tabstop> + <tabstop>kcbNettqmask</tabstop> <tabstop>kcbstartAtBoot</tabstop> </tabstops> <includes> @@ -402,7 +402,7 @@ <functions> <function access="private" specifier="non virtual">init()</function> </functions> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>kcombobox.h</includehint> diff --git a/knetworkconf/knetworkconf/kadddevicedlg.ui.h b/knetworkconf/knetworkconf/kadddevicedlg.ui.h index bf3f21b..658941e 100644 --- a/knetworkconf/knetworkconf/kadddevicedlg.ui.h +++ b/knetworkconf/knetworkconf/kadddevicedlg.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ diff --git a/knetworkconf/knetworkconf/kadddevicedlgextension.ui b/knetworkconf/knetworkconf/kadddevicedlgextension.ui index 35d4927..31657ec 100644 --- a/knetworkconf/knetworkconf/kadddevicedlgextension.ui +++ b/knetworkconf/knetworkconf/kadddevicedlgextension.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KAddDeviceDlgExtension</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KAddDeviceDlgExtension</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>gbAdvancedDeviceInfo</cstring> </property> @@ -33,7 +33,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -72,7 +72,7 @@ <string>The Broadcast is a special address. All devices of a network respond if packages are sent to this address.</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel1_3</cstring> </property> @@ -103,7 +103,7 @@ <string><p>Here you should enter the default gateway for the network device.</p></string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1_2_2</cstring> </property> @@ -118,36 +118,36 @@ <connections> <connection> <sender>kleBroadcast</sender> - <signal>textChanged(const QString&)</signal> + <signal>textChanged(const TQString&)</signal> <receiver>KAddDeviceDlgExtension</receiver> - <slot>valueChanged(const QString&)</slot> + <slot>valueChanged(const TQString&)</slot> </connection> <connection> <sender>kleDescription</sender> - <signal>textChanged(const QString&)</signal> + <signal>textChanged(const TQString&)</signal> <receiver>KAddDeviceDlgExtension</receiver> - <slot>valueChanged(const QString&)</slot> + <slot>valueChanged(const TQString&)</slot> </connection> <connection> <sender>kleGateway</sender> - <signal>textChanged(const QString&)</signal> + <signal>textChanged(const TQString&)</signal> <receiver>KAddDeviceDlgExtension</receiver> - <slot>valueChanged(const QString&)</slot> + <slot>valueChanged(const TQString&)</slot> </connection> </connections> <includes> <include location="local" impldecl="in implementation">kadddevicedlgextension.ui.h</include> </includes> -<signals> +<Q_SIGNALS> <signal>valueChangedSignal(int)</signal> -</signals> -<slots> - <slot access="private">valueChanged( const QString & s )</slot> -</slots> +</Q_SIGNALS> +<Q_SLOTS> + <slot access="private">valueChanged( const TQString & s )</slot> +</Q_SLOTS> <functions> <function access="private" specifier="non virtual">init()</function> </functions> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/knetworkconf/knetworkconf/kadddevicedlgextension.ui.h b/knetworkconf/knetworkconf/kadddevicedlgextension.ui.h index 1e38f60..2d08799 100644 --- a/knetworkconf/knetworkconf/kadddevicedlgextension.ui.h +++ b/knetworkconf/knetworkconf/kadddevicedlgextension.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ diff --git a/knetworkconf/knetworkconf/kadddevicewifiext.ui b/knetworkconf/knetworkconf/kadddevicewifiext.ui index d8d728a..6b04eb6 100644 --- a/knetworkconf/knetworkconf/kadddevicewifiext.ui +++ b/knetworkconf/knetworkconf/kadddevicewifiext.ui @@ -2,7 +2,7 @@ <class>KAddDeviceWifiExt</class> <comment>Extension to the KAddDeviceDlg dialog to configure wireless settings.</comment> <author>Juan Luis Baptiste</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KAddDeviceWifiExt</cstring> </property> @@ -24,7 +24,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>gbWirelessSettings</cstring> </property> @@ -35,7 +35,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -53,7 +53,7 @@ <cstring>kleWepKey</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -61,7 +61,7 @@ <string>ESSID:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -69,7 +69,7 @@ <string>Key type:</string> </property> </widget> - <widget class="QComboBox" row="2" column="1"> + <widget class="TQComboBox" row="2" column="1"> <item> <property name="text"> <string>ASCII</string> @@ -88,7 +88,7 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kpassdlg.h</includehint> diff --git a/knetworkconf/knetworkconf/kadddnsserverdlg.ui b/knetworkconf/knetworkconf/kadddnsserverdlg.ui index 2df997e..57094a5 100644 --- a/knetworkconf/knetworkconf/kadddnsserverdlg.ui +++ b/knetworkconf/knetworkconf/kadddnsserverdlg.ui @@ -12,13 +12,13 @@ <height>81</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -44,7 +44,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>80</width> <height>16</height> @@ -69,14 +69,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lIPAddress</cstring> </property> @@ -116,7 +116,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -147,16 +147,16 @@ <includes> <include location="local" impldecl="in implementation">kadddnsserverdlg.ui.h</include> </includes> -<slots> +<Q_SLOTS> <slot access="private">validateAddressSlot()</slot> <slot access="private">makeButtonsResizeable()</slot> -</slots> +</Q_SLOTS> <functions> <function specifier="non virtual">setAddingAlias( bool add )</function> <function returnType="bool">modified()</function> <function access="private" specifier="non virtual">init()</function> </functions> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kdialog.h</includehint> <includehint>klineedit.h</includehint> diff --git a/knetworkconf/knetworkconf/kadddnsserverdlg.ui.h b/knetworkconf/knetworkconf/kadddnsserverdlg.ui.h index 0d34f67..dd6057f 100644 --- a/knetworkconf/knetworkconf/kadddnsserverdlg.ui.h +++ b/knetworkconf/knetworkconf/kadddnsserverdlg.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ diff --git a/knetworkconf/knetworkconf/kaddknownhostdlg.ui b/knetworkconf/knetworkconf/kaddknownhostdlg.ui index 22782ba..96cf559 100644 --- a/knetworkconf/knetworkconf/kaddknownhostdlg.ui +++ b/knetworkconf/knetworkconf/kaddknownhostdlg.ui @@ -22,15 +22,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -48,7 +48,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -70,7 +70,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>80</width> <height>20</height> @@ -89,7 +89,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>180</width> <height>20</height> @@ -114,7 +114,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -139,14 +139,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -162,9 +162,9 @@ <cstring>klbAliases</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout25</cstring> + <cstring>tqlayout25</cstring> </property> <vbox> <property name="name"> @@ -174,7 +174,7 @@ <property name="name"> <cstring>kpbAddHost</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -191,7 +191,7 @@ <property name="name"> <cstring>kpbEditHost</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -208,7 +208,7 @@ <property name="name"> <cstring>kpbRemoveHost</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -278,18 +278,18 @@ <includes> <include location="local" impldecl="in implementation">kaddknownhostdlg.ui.h</include> </includes> -<slots> +<Q_SLOTS> <slot access="private">validateAddressSlot()</slot> <slot access="private">makeButtonsResizeable()</slot> <slot access="private">editHostSlot()</slot> <slot access="private">removeHostSlot()</slot> <slot access="private">addHostSlot()</slot> -</slots> +</Q_SLOTS> <functions> <function access="private" specifier="non virtual">init()</function> <function specifier="non virtual" returnType="bool">modified()</function> </functions> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kdialog.h</includehint> <includehint>klineedit.h</includehint> diff --git a/knetworkconf/knetworkconf/kaddknownhostdlg.ui.h b/knetworkconf/knetworkconf/kaddknownhostdlg.ui.h index 701e1b2..1ace4eb 100644 --- a/knetworkconf/knetworkconf/kaddknownhostdlg.ui.h +++ b/knetworkconf/knetworkconf/kaddknownhostdlg.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ diff --git a/knetworkconf/knetworkconf/kaddressvalidator.cpp b/knetworkconf/knetworkconf/kaddressvalidator.cpp index 03d21c6..d7d23bc 100644 --- a/knetworkconf/knetworkconf/kaddressvalidator.cpp +++ b/knetworkconf/knetworkconf/kaddressvalidator.cpp @@ -18,7 +18,7 @@ #include "kaddressvalidator.h" /* - Class for validating IP address and netmasks, and to calculate network and broadcast values. + Class for validating IP address and nettqmasks, and to calculate network and broadcast values. The functions to do the last two things where taken from the code of ipcalc.c, made by Erik Troan <ewt@redhat.com> and Preston Brown <pbrown@redhat.com> from Red Hat Inc. . */ @@ -33,7 +33,7 @@ bool KAddressValidator::isValidIPAddress(TQString addr){ int i; int number; bool ok; - if ((addr.contains('.') > 3) || (addr.length() > 15)) + if ((addr.tqcontains('.') > 3) || (addr.length() > 15)) return false; for (i = 0; i < 4; i++) { @@ -53,7 +53,7 @@ bool KAddressValidator::isValidIPAddress(TQString addr){ else return false; } -bool KAddressValidator::isNetmaskValid(TQString addr){ +bool KAddressValidator::isNettqmaskValid(TQString addr){ TQString s = ""; int i; int number; @@ -123,37 +123,37 @@ bool KAddressValidator::isBroadcastValid(TQString addr){ } -/** \fn unsigned long int prefix2mask(int bits) - \brief creates a netmask from a specified number of bits +/** \fn unsigned long int prefix2tqmask(int bits) + \brief creates a nettqmask from a specified number of bits - This function converts a prefix length to a netmask. As CIDR (classless + This function converts a prefix length to a nettqmask. 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 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. + (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. - \param prefix is the number of bits to create a mask for. - \return a network mask, in network byte order. + \param prefix is the number of bits to create a tqmask for. + \return a network tqmask, in network byte order. */ -unsigned long int KAddressValidator::prefix2mask(int prefix){ +unsigned long int KAddressValidator::prefix2tqmask(int prefix){ return htonl(~((2 << (31 - prefix)) - 1)); } -/** \fn int mask2prefix(unsigned long int mask) - \brief calculates the number of bits masked off by a netmask. +/** \fn int tqmask2prefix(unsigned long int tqmask) + \brief calculates the number of bits tqmasked off by a nettqmask. This function calculates the significant bits in an IP address as specified by - a netmask. See also \ref prefix2mask. + a nettqmask. See also \ref prefix2tqmask. - \param mask is the netmask, specified as an unsigned long integer in network byte order. + \param tqmask is the nettqmask, specified as an unsigned long integer in network byte order. \return the number of significant bits. */ -int KAddressValidator::mask2prefix(unsigned long int mask){ +int KAddressValidator::tqmask2prefix(unsigned long int tqmask){ unsigned i; int count = IPBITS; for (i = 0; i < IPBITS; i++) { - if (!(ntohl(mask) & ((2 << i) - 1))) + if (!(ntohl(tqmask) & ((2 << i) - 1))) count--; } @@ -170,7 +170,7 @@ int KAddressValidator::mask2prefix(unsigned long int mask){ \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 & prefix2mask(prefix)) | ~prefix2mask(prefix); + return (addr & prefix2tqmask(prefix)) | ~prefix2tqmask(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 & prefix2mask(prefix)); + return (addr & prefix2tqmask(prefix)); } -/** Is a wrapper function to calc_network that receives the IP address and netsmask as TQString and +/** Is a wrapper function to calc_network that receives the IP address and netstqmask 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 netmask){ - struct in_addr _addr, _netmask, _network; +TQString KAddressValidator::calculateNetwork(TQString addr,TQString nettqmask){ + struct in_addr _addr, _nettqmask, _network; int prefix = 0; TQString s; - if (addr.isNull() || netmask.isNull()) + if (addr.isNull() || nettqmask.isNull()) return NULL; //bad address if (!inet_pton(AF_INET,addr.latin1(),&_addr)) return NULL; //bad address else { - if (!inet_pton(AF_INET,netmask.latin1(),&_netmask)) + if (!inet_pton(AF_INET,nettqmask.latin1(),&_nettqmask)) return NULL; //bad address else { - prefix = mask2prefix(_netmask.s_addr); + prefix = tqmask2prefix(_nettqmask.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 netmask){ return s; } -/** Is a wrapper function to calc_broadcast that receives the IP address and netsmask as TQString and +/** Is a wrapper function to calc_broadcast that receives the IP address and netstqmask 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 netmask){ - struct in_addr _addr, _netmask, _network; +TQString KAddressValidator::calculateBroadcast(TQString addr, TQString nettqmask){ + struct in_addr _addr, _nettqmask, _network; int prefix = 0; TQString s; - if (addr.isNull() || netmask.isNull()) + if (addr.isNull() || nettqmask.isNull()) return NULL; //bad address if (!inet_pton(AF_INET,addr.latin1(),&_addr)) return NULL; //bad address else { - if (!inet_pton(AF_INET,netmask.latin1(),&_netmask)) + if (!inet_pton(AF_INET,nettqmask.latin1(),&_nettqmask)) return NULL; //bad address else { - prefix = mask2prefix(_netmask.s_addr); + prefix = tqmask2prefix(_nettqmask.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 9e1df59..5a05d84 100644 --- a/knetworkconf/knetworkconf/kaddressvalidator.h +++ b/knetworkconf/knetworkconf/kaddressvalidator.h @@ -19,7 +19,7 @@ #define KADDRESSVALIDATOR_H /* - Class for validating IP address and netmasks, and to calculate network and broadcast values. + Class for validating IP address and nettqmasks, and to calculate network and broadcast values. The functions to do the last two things where taken from the code of ipcalc.c, made by Erik Troan <ewt@redhat.com> and Preston Brown <pbrown@redhat.com> from Red Hat Inc. */ @@ -30,12 +30,12 @@ \def IPBITS \brief the number of bits in an IP address. */ -#define IPBITS (sizeof(Q_UINT32) * 8) +#define IPBITS (sizeof(TQ_UINT32) * 8) /*! \def IPBYTES \brief the number of bytes in an IP address. */ -#define IPBYTES (sizeof(Q_UINT32)) +#define IPBYTES (sizeof(TQ_UINT32)) #include <sys/types.h> #include <sys/socket.h> @@ -43,7 +43,7 @@ #include <netinet/in.h> #include <tqstring.h> -/**Class that has simple methods for validating IP addresses, netmasks, calculating +/**Class that has simple methods for validating IP addresses, nettqmasks, calculating broadcast and network addresses. *@author Juan Luis Baptiste @@ -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 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 Nettqmask written by the user is a valid one. Return true if it is and false if not. */ + static bool isNettqmaskValid(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 netsmask as TQString and + /** Is a wrapper function to calc_network that receives the IP address and netstqmask 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 netmask); -/** Is a wrapper function to calc_broadcast that receives the IP address and netsmask as TQString and + static TQString calculateNetwork(TQString addr,TQString nettqmask); +/** Is a wrapper function to calc_broadcast that receives the IP address and netstqmask 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 netmask); + static TQString calculateBroadcast(TQString addr, TQString nettqmask); 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 prefix2mask(int bits) - \brief creates a netmask from a specified number of bits + /** \fn unsigned long int prefix2tqmask(int bits) + \brief creates a nettqmask from a specified number of bits - This function converts a prefix length to a netmask. As CIDR (classless + This function converts a prefix length to a nettqmask. 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 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. + (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. - \param prefix is the number of bits to create a mask for. - \return a network mask, in network byte order. + \param prefix is the number of bits to create a tqmask for. + \return a network tqmask, in network byte order. */ - 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. + static unsigned long int prefix2tqmask(int prefix); + /** \fn int tqmask2prefix(unsigned long int tqmask) + \brief calculates the number of bits tqmasked off by a nettqmask. This function calculates the significant bits in an IP address as specified by - a netmask. See also \ref prefix2mask. + a nettqmask. See also \ref prefix2tqmask. - \param mask is the netmask, specified as an unsigned long integer in network byte order. + \param tqmask is the nettqmask, specified as an unsigned long integer in network byte order. \return the number of significant bits. */ - static int mask2prefix(unsigned long int mask); + static int tqmask2prefix(unsigned long int tqmask); }; #endif diff --git a/knetworkconf/knetworkconf/kdetectdistrodlg.ui b/knetworkconf/knetworkconf/kdetectdistrodlg.ui index bb97b4c..8391d6c 100644 --- a/knetworkconf/knetworkconf/kdetectdistrodlg.ui +++ b/knetworkconf/knetworkconf/kdetectdistrodlg.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KDetectDistroDlg</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KDetectDistroDlg</cstring> </property> @@ -19,15 +19,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>pixmapLabel1</cstring> </property> @@ -52,7 +52,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>text</cstring> </property> @@ -69,5 +69,5 @@ <data format="PNG" length="983">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000039e4944415418959595cd6b1d5518c67f934e9a776452cf40948e74915b2af6aa2897a6602a2e6e6a5d74e3dafe03d28f8d0b71292eba312808052964e34297154442119b2e44234aaca8ed151332c586ccd85cef1cc9e8bcd6938e8b9b7b136b6e4b5e18e683f33ef39ce77738c7abaa8a9dcaf33c2ebc7761e2e48993171179aaf75d7c50b7fd2e80822f557a3399bff4f1a557cf4f9f5ff47754dd2c33660e8931b50fafa6233a1c1019417c41a42baa4e290b8bae433caa4c3d1d3f89cf38707f6141867078577fb6941210858a31029b5d5a802d20cf721ae3c2e4213c600ff4870ca8615094b2005be44084aaed3bc6416e736ca1d876371175ca8385bbaeb13627d5a0eb3214284000ab8a1690decaa99b685be60f10ee0d1209d0a224b742a08a88609d82425e28b89e5301d7edf507d15ffd7515750c810ecfbc5627d8a42fbe30f753c247f342aa10f942eec088e9c6b369d587ddd39f3c1c33fb6302614ceee75da7b209747bc6bba53f7518ce4e8219035cb4a1ae048767dbd99f38fedaca7897f44b85bcc89150aa74256d6769f6a53a4d739bb7922469010cfd8f7e66b1ed9cbc2849db25a52d49db39d676e9ab2aea203631511879c7268e3ddc6834464a5b7e3077756ee6ec99b3edad28764bdf29eaba20adda3daa1a59b57beb8fd7ef1c7fe978b515850ff88288101b4142c184d29f8b55bd977e952c267fb4165bd7b4d0ebc952f2496bb1f5c3ece5d9fec6d35bc71e289111ac0fb18990b03b13754aa0c1bdf437d276ba9265f67d33666e34269aa5d95f9366f364f1fa1be7b61cdb759b0baccf9caeed5347d5fd1143aadd455faa828baa3e7d9beda9d7eb4fc4fbf55d09644dc2e0ae647c7eedfbefde02cabe70b2947c3b373cf7b6f85257a7e3b503b51722138d0294ae449d56c9cde4efec56f67be94ac17157550b2d744d9d2e4b68ee264baddfec9afdef1ebcf0d58277ea9553233317679acb3796bfe8dceedce9ac76aaceed4ed559ed54cbbf2c579dd54eb9f0cdc2a7d3e7a78f365f6c8e5cf9ec8a075055d58ed710c0916347aac644e31f09855cf31155f5d429aa8a557b5ffa83cadbfe72e6f499d1da78edb9c8442f9bd03c1bc5d133a52d35cbb3ebdbe87f3d7b7976bdd733f004ea3d4cbf333314c0a366bf79c86676b474fafcd489e6b9f9f9f9b56429b960c6cc8dda817a99acdc5c179f768ffe20e1feb669db69101c88df8c1f898f9ad16838f0794cc04c361a074d680e0ea23fa8fac2c94ab291173649b3741fb0577c10118b036b6de7bef477a87f018b9f681dd4db618a0000000049454e44ae426082</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui b/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui index 68285c4..ac0b9e0 100644 --- a/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui +++ b/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui @@ -22,7 +22,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>pixmapLabel1</cstring> </property> @@ -43,18 +43,18 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>label</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>0</height> @@ -74,7 +74,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -94,10 +94,10 @@ <includes> <include location="local" impldecl="in implementation">kinterfaceupdowndlg.ui.h</include> </includes> -<slots> +<Q_SLOTS> <slot>close()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kdialog.h</includehint> </includehints> diff --git a/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui.h b/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui.h index 4a5fc41..060c5cf 100644 --- a/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui.h +++ b/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ diff --git a/knetworkconf/knetworkconf/knetworkconf.cpp b/knetworkconf/knetworkconf/knetworkconf.cpp index 8723d4b..11dbad0 100644 --- a/knetworkconf/knetworkconf/knetworkconf.cpp +++ b/knetworkconf/knetworkconf/knetworkconf.cpp @@ -19,7 +19,7 @@ #include "knetworkconf.h" -KNetworkConf::KNetworkConf(TQWidget *parent, const char *name) : DCOPObject("KNetworkConfIface"), KNetworkConfDlg(parent, name) +KNetworkConf::KNetworkConf(TQWidget *tqparent, const char *name) : DCOPObject("KNetworkConfIface"), KNetworkConfDlg(tqparent, name) { netInfo = 0L; makeButtonsResizeable(); @@ -104,7 +104,7 @@ void KNetworkConf::loadNetworkDevicesInfo() { if ( device->getType() != "loopback" ) { - if (klvCardList->findItem(device->getDeviceName(),0,CaseSensitive|ExactMatch) == 0) + if (klvCardList->tqfindItem(device->getDeviceName(),0,CaseSensitive|ExactMatch) == 0) { TQListViewItem * item = new TQListViewItem( klvCardList, 0 ); @@ -230,7 +230,7 @@ void KNetworkConf::configureDeviceSlot(){ if (item != NULL) { TQString currentDevice = item->text(0); - configDlg.setCaption(i18n("Configure Device %1").arg(currentDevice)); + configDlg.setCaption(i18n("Configure Device %1").tqarg(currentDevice)); KNetworkInterface *dev = getDeviceInfo(currentDevice); KAddDeviceDlgExtension *advancedOptions = (KAddDeviceDlgExtension *)configDlg.extension(); @@ -245,7 +245,7 @@ void KNetworkConf::configureDeviceSlot(){ configDlg.addDlg->rbBootProtoManual->setChecked(false); configDlg.addDlg->rbBootProtoAuto->setChecked(true); configDlg.addDlg->kleIPAddress->setEnabled(false); - configDlg.addDlg->kcbNetmask->setEnabled(false); + configDlg.addDlg->kcbNettqmask->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->getNetmask())); + advancedOptions->kleBroadcast->setText(KAddressValidator::calculateBroadcast(dev->getIpAddress(),dev->getNettqmask())); advancedOptions->kleGateway->setText(dev->getGateway()); - if (!dev->getNetmask().isEmpty()) - configDlg.addDlg->kcbNetmask->setCurrentText(dev->getNetmask()); + if (!dev->getNettqmask().isEmpty()) + configDlg.addDlg->kcbNettqmask->setCurrentText(dev->getNettqmask()); 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, netmask, network and broadcast, as a new one will be assigned by + //past IP address, nettqmask, 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->setNetmask(""); + dev->setNettqmask(""); dev->setNetwork(""); dev->setBroadcast(""); } @@ -326,7 +326,7 @@ void KNetworkConf::configureDeviceSlot(){ if (valuesChanged(dev, configDlg.addDlg->kcbAutoBootProto->currentText(), - configDlg.addDlg->kcbNetmask->currentText(), + configDlg.addDlg->kcbNettqmask->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->setNetmask(configDlg.addDlg->kcbNetmask->currentText().stripWhiteSpace()); - TQString network = KAddressValidator::calculateNetwork(dev->getIpAddress().stripWhiteSpace(),dev->getNetmask().stripWhiteSpace()); + dev->setNettqmask(configDlg.addDlg->kcbNettqmask->currentText().stripWhiteSpace()); + TQString network = KAddressValidator::calculateNetwork(dev->getIpAddress().stripWhiteSpace(),dev->getNettqmask().stripWhiteSpace()); dev->setNetwork(network); TQString broadcast = advancedOptions->kleBroadcast->text().stripWhiteSpace(); if (broadcast.isEmpty()) - broadcast = KAddressValidator::calculateBroadcast(dev->getIpAddress().stripWhiteSpace(),dev->getNetmask().stripWhiteSpace()); + broadcast = KAddressValidator::calculateBroadcast(dev->getIpAddress().stripWhiteSpace(),dev->getNettqmask().stripWhiteSpace()); dev->setBroadcast(broadcast); dev->setDescription(advancedOptions->kleDescription->text()); @@ -677,19 +677,19 @@ void KNetworkConf::changeDeviceState(const TQString &dev, int state){ KInterfaceUpDownDlg* dialog = new KInterfaceUpDownDlg(this,"Changing device state"); if (state == DEVICE_UP) - dialog->label->setText(i18n("Enabling interface <b>%1</b>").arg(dev)); + dialog->label->setText(i18n("Enabling interface <b>%1</b>").tqarg(dev)); else - dialog->label->setText(i18n("Disabling interface <b>%1</b>").arg(dev)); + dialog->label->setText(i18n("Disabling interface <b>%1</b>").tqarg(dev)); dialog->setModal(true); dialog->show(); - procDeviceState = new TQProcess(this); + procDeviceState = new TQProcess(TQT_TQOBJECT(this)); TQString cmd; procDeviceState->addArgument( locate("data",BACKEND_PATH) ); //If the platform couldn't be autodetected specify it manually - if (netInfo->getPlatformName() != TQString::null) + if (netInfo->getPlatformName() != TQString()) { procDeviceState->addArgument( "--platform" ); procDeviceState->addArgument( netInfo->getPlatformName() ); @@ -740,7 +740,7 @@ void KNetworkConf::verifyDeviceStateChanged(){ } else if (commandOutput == "\n<!-- GST: end of request -->") { - TQListViewItem *item = klvCardList->findItem(currentDevice,0,ExactMatch); + TQListViewItem *item = klvCardList->tqfindItem(currentDevice,0,ExactMatch); if (item != NULL) { dev = getDeviceInfo(currentDevice); @@ -789,14 +789,14 @@ TQStringList KNetworkConf::getDeviceList(){ /** No descriptions */ bool KNetworkConf::valuesChanged(KNetworkInterface *dev, TQString bootProto, - TQString netmask, + TQString nettqmask, TQString ipAddr, TQString gateway, bool onBoot, TQString desc, TQString broadcast){ if ((dev->getBootProto() != bootProto) || - (dev->getNetmask() != netmask) || + (dev->getNettqmask() != nettqmask) || (dev->getIpAddress() != ipAddr) || (dev->getGateway() != gateway) || ((dev->getOnBoot() == "yes") && !(onBoot)) || @@ -1000,7 +1000,7 @@ void KNetworkConf::showInterfaceContextMenuSlot(KListView* lv, TQListViewItem* l context->insertSeparator(2); context->insertItem( "&Configure Interface...", this, TQT_SLOT(configureDeviceSlot())); context->popup(pt); - //context->insertItem( "About &Qt", this, TQT_SLOT(aboutQt()) ); + //context->insertItem( "About &TQt", this, TQT_SLOT(aboutTQt()) ); } void KNetworkConf::enableSignals() @@ -1057,7 +1057,7 @@ void KNetworkConf::createProfileSlot() bool ok; TQString newProfileName = KInputDialog::getText(i18n("Create New Network Profile"), i18n("Name of new profile:"), - TQString::null, &ok, this ); + TQString(), &ok, this ); if ( ok && !newProfileName.isEmpty() ) { TQPtrList<KNetworkInfo> profiles = netInfo->getProfilesList(); diff --git a/knetworkconf/knetworkconf/knetworkconf.h b/knetworkconf/knetworkconf/knetworkconf.h index 813b150..af034b4 100644 --- a/knetworkconf/knetworkconf/knetworkconf.h +++ b/knetworkconf/knetworkconf/knetworkconf.h @@ -75,10 +75,11 @@ /** KNetworkConf is the base class of the project */ class KNetworkConf : public KNetworkConfDlg, virtual public KNetworkConfIface { - Q_OBJECT + Q_OBJECT + TQ_OBJECT public: /** construtor */ - KNetworkConf(TQWidget* parent=0, const char *name=0); + KNetworkConf(TQWidget* tqparent=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. */ @@ -164,7 +165,7 @@ class KNetworkConf : public KNetworkConfDlg, virtual public KNetworkConfIface virtual void removeServerSlot(); bool valuesChanged(KNetworkInterface *dev, TQString bootProto, - TQString netmask, + TQString nettqmask, TQString ipAddr, TQString gateway, bool onBoot, diff --git a/knetworkconf/knetworkconf/knetworkconfdlg.ui b/knetworkconf/knetworkconf/knetworkconfdlg.ui index a2fa917..a184930 100644 --- a/knetworkconf/knetworkconf/knetworkconfdlg.ui +++ b/knetworkconf/knetworkconf/knetworkconfdlg.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KNetworkConfDlg</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KNetworkConfDlg</cstring> </property> @@ -20,13 +20,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>510</width> <height>410</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -48,7 +48,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabWidget</cstring> </property> @@ -58,7 +58,7 @@ <property name="toolTip" stdset="0"> <string></string> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -69,15 +69,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout16</cstring> + <cstring>tqlayout16</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -95,7 +95,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>301</width> <height>20</height> @@ -175,9 +175,9 @@ <string>List of configured network devices</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <hbox> <property name="name"> @@ -231,7 +231,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>230</height> @@ -240,7 +240,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -257,7 +257,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>gbDefaultGateway</cstring> </property> @@ -274,7 +274,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout11</cstring> </property> @@ -288,7 +288,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -306,7 +306,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>181</width> <height>0</height> @@ -315,7 +315,7 @@ </spacer> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout27</cstring> </property> @@ -358,14 +358,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>0</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -385,13 +385,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>70</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>65</width> <height>32767</height> @@ -415,7 +415,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>90</height> @@ -424,7 +424,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -435,7 +435,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>gbDNSServersList</cstring> </property> @@ -460,9 +460,9 @@ <string></string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout23</cstring> + <cstring>tqlayout23</cstring> </property> <vbox> <property name="name"> @@ -478,7 +478,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -523,7 +523,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>16</height> @@ -532,9 +532,9 @@ </spacer> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout25</cstring> + <cstring>tqlayout25</cstring> </property> <vbox> <property name="name"> @@ -550,7 +550,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>21</height> @@ -561,7 +561,7 @@ <property name="name"> <cstring>kpbAddDomainServer</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -578,7 +578,7 @@ <property name="name"> <cstring>kpbEditDomainServer</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -595,7 +595,7 @@ <property name="name"> <cstring>kpbRemoveDomainServer</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -618,7 +618,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>21</height> @@ -629,7 +629,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>gbKnownHostsList</cstring> </property> @@ -667,9 +667,9 @@ <cstring>klvKnownHosts</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout20</cstring> + <cstring>tqlayout20</cstring> </property> <hbox> <property name="name"> @@ -679,7 +679,7 @@ <property name="name"> <cstring>kpbAddKnownHost</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -696,7 +696,7 @@ <property name="name"> <cstring>kpbEditKnownHost</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -713,7 +713,7 @@ <property name="name"> <cstring>kpbRemoveKnownHost</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -730,7 +730,7 @@ </widget> </vbox> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>tlHostName</cstring> </property> @@ -754,7 +754,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>tlDomainName</cstring> </property> @@ -764,7 +764,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -775,7 +775,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup2</cstring> </property> @@ -805,9 +805,9 @@ <bool>true</bool> </property> </widget> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>layout28</cstring> + <cstring>tqlayout28</cstring> </property> <vbox> <property name="name"> @@ -857,7 +857,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>51</height> @@ -876,7 +876,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>150</height> @@ -920,13 +920,13 @@ </connection> <connection> <sender>klvCardList</sender> - <signal>rightButtonClicked(QListViewItem*,const QPoint&,int)</signal> + <signal>rightButtonClicked(TQListViewItem*,const QPoint&,int)</signal> <receiver>KNetworkConfDlg</receiver> <slot>showInterfaceContextMenuSlot()</slot> </connection> <connection> <sender>klvCardList</sender> - <signal>doubleClicked(QListViewItem*)</signal> + <signal>doubleClicked(TQListViewItem*)</signal> <receiver>KNetworkConfDlg</receiver> <slot>configureDeviceSlot()</slot> </connection> @@ -938,7 +938,7 @@ </connection> <connection> <sender>klbDomainServerList</sender> - <signal>doubleClicked(QListBoxItem*)</signal> + <signal>doubleClicked(TQListBoxItem*)</signal> <receiver>KNetworkConfDlg</receiver> <slot>editServerSlot()</slot> </connection> @@ -992,21 +992,21 @@ </connection> <connection> <sender>klvKnownHosts</sender> - <signal>doubleClicked(QListViewItem*)</signal> + <signal>doubleClicked(TQListViewItem*)</signal> <receiver>KNetworkConfDlg</receiver> <slot>editKnownHostSlot()</slot> </connection> <connection> <sender>kcbGwDevice</sender> - <signal>activated(const QString&)</signal> + <signal>activated(const TQString&)</signal> <receiver>KNetworkConfDlg</receiver> - <slot>enableApplyButtonSlot(const QString&)</slot> + <slot>enableApplyButtonSlot(const TQString&)</slot> </connection> <connection> <sender>klvProfilesList</sender> - <signal>itemRenamed(QListViewItem*)</signal> + <signal>itemRenamed(TQListViewItem*)</signal> <receiver>KNetworkConfDlg</receiver> - <slot>updateProfileNameSlot(QListViewItem*)</slot> + <slot>updateProfileNameSlot(TQListViewItem*)</slot> </connection> <connection> <sender>kpbCreateProfile</sender> @@ -1016,9 +1016,9 @@ </connection> <connection> <sender>klvProfilesList</sender> - <signal>itemRenamed(QListViewItem*)</signal> + <signal>itemRenamed(TQListViewItem*)</signal> <receiver>KNetworkConfDlg</receiver> - <slot>updateProfileNameSlot(QListViewItem*)</slot> + <slot>updateProfileNameSlot(TQListViewItem*)</slot> </connection> <connection> <sender>kpbDeleteProfile</sender> @@ -1042,7 +1042,7 @@ <includes> <include location="local" impldecl="in implementation">knetworkconfdlg.ui.h</include> </includes> -<slots> +<Q_SLOTS> <slot access="private">enableButtonsSlot()</slot> <slot access="private">quitSlot()</slot> <slot access="private">moveUpServerSlot()</slot> @@ -1050,7 +1050,7 @@ <slot>helpSlot()</slot> <slot access="private">configureDeviceSlot()</slot> <slot access="private">enableApplyButtonSlot( bool )</slot> - <slot access="private">enableApplyButtonSlot( const QString & )</slot> + <slot access="private">enableApplyButtonSlot( const TQString & )</slot> <slot>aboutSlot()</slot> <slot access="private">addServerSlot()</slot> <slot access="private">removeServerSlot()</slot> @@ -1068,11 +1068,11 @@ <slot access="private">enableProfileSlot()</slot> <slot access="private">createProfileSlot()</slot> <slot>updateProfileNameSlot()</slot> - <slot access="private">updateProfileNameSlot(QListViewItem *item)</slot> + <slot access="private">updateProfileNameSlot(TQListViewItem *item)</slot> <slot access="private">removeProfileSlot()</slot> <slot access="private">updateProfileSlot()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/knetworkconf/knetworkconf/knetworkconfdlg.ui.h b/knetworkconf/knetworkconf/knetworkconfdlg.ui.h index 68bb00f..4d77089 100644 --- a/knetworkconf/knetworkconf/knetworkconfdlg.ui.h +++ b/knetworkconf/knetworkconf/knetworkconfdlg.ui.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ui.h extension file, included from the uic-generated form implementation. ** -** If you wish to add, delete or rename slots use Qt Designer which will +** If you wish to add, delete or rename slots use TQt Designer which will ** update this file, preserving your code. Create an init() slot in place of ** a constructor, and a destroy() slot in place of a destructor. *****************************************************************************/ diff --git a/knetworkconf/knetworkconf/knetworkconfigparser.cpp b/knetworkconf/knetworkconf/knetworkconfigparser.cpp index ceacdac..093ab9f 100644 --- a/knetworkconf/knetworkconf/knetworkconfigparser.cpp +++ b/knetworkconf/knetworkconf/knetworkconfigparser.cpp @@ -27,7 +27,7 @@ KNetworkConfigParser::KNetworkConfigParser(){ if (!askAgain || platform.length() > 0) runDetectionScript(platform); else - runDetectionScript(TQString::null); + runDetectionScript(TQString()); } /** Runs the gst backend to get network values. You can pass to the script a specific platform to load using the platform parameter. */ void KNetworkConfigParser::runDetectionScript(TQString platform){ @@ -38,7 +38,7 @@ void KNetworkConfigParser::runDetectionScript(TQString platform){ if (pathToProgram.isEmpty()) { KMessageBox::error(0, - i18n("Could not find the backend script for the network configuration detection. Something is wrong with your installation.\n Please check that \n{KDE_PATH}/%1 \nfile is present.").arg(BACKEND_PATH), + i18n("Could not find the backend script for the network configuration detection. Something is wrong with your installation.\n Please check that \n{KDE_PATH}/%1 \nfile is present.").tqarg(BACKEND_PATH), i18n("Could Not Find Network Configuration Backend Script")); dialog->close(); //kapp->quit(); @@ -46,7 +46,7 @@ void KNetworkConfigParser::runDetectionScript(TQString platform){ else { procDetect->addArgument( pathToProgram ); - if (platform != TQString::null) + if (platform != TQString()) { procDetect->addArgument( "--platform" ); procDetect->addArgument( platform ); @@ -73,7 +73,7 @@ $knetworkconf_home/backends/networkconf [--platform platform] -d list_ifaces. */ void KNetworkConfigParser::listIfaces(const TQString &platform){ procDetect = new TQProcess(this); procDetect->addArgument( locate("data",BACKEND_PATH) ); - if (platform != TQString::null) + if (platform != TQString()) { procDetect->addArgument( "--platform" ); procDetect->addArgument( platform ); @@ -123,7 +123,7 @@ void KNetworkConfigParser::readListIfacesSlot(){ { TQDomElement interface = node.toElement(); KNetworkInterface *tempDevice = new KNetworkInterface(); - tempDevice = getInterfaceInfo(interface,TQString::null); + tempDevice = getInterfaceInfo(interface,TQString()); if (tempDevice->getType().lower() != LOOPBACK_IFACE_TYPE) { @@ -142,8 +142,8 @@ void KNetworkConfigParser::readListIfacesSlot(){ originalDevice->setIpAddress(tempDevice->getIpAddress()); if (!tempDevice->getMacAddress().isEmpty()) originalDevice->setMacAddress(tempDevice->getMacAddress()); - if (!tempDevice->getNetmask().isEmpty()) - originalDevice->setNetmask(tempDevice->getNetmask()); + if (!tempDevice->getNettqmask().isEmpty()) + originalDevice->setNettqmask(tempDevice->getNettqmask()); if (!tempDevice->getNetwork().isEmpty()) originalDevice->setNetwork(tempDevice->getNetwork()); } @@ -212,7 +212,7 @@ void KNetworkConfigParser::loadRoutingInfo( KRoutingInfo *routingInfo){ f.close(); #endif } -QString +TQString KNetworkConfigParser::hexIPv4ToDecIPv4(const TQString &hex) { bool ok; @@ -221,7 +221,7 @@ KNetworkConfigParser::hexIPv4ToDecIPv4(const TQString &hex) TQString temp = ""; TQString temp2 = ""; -#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN +#if Q_BYTE_ORDER == TQ_LITTLE_ENDIAN temp = hex.mid(6,2); temp2 = temp2.setNum(temp.toInt(&ok,16)); dec.append(temp2); @@ -299,9 +299,9 @@ 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*)parent(), 0, true); + KDetectDistroDlg* dialog = new KDetectDistroDlg((TQWidget*)tqparent(), 0, true); dialog->setCaption(i18n("Reloading Network")); - dialog->text->setText(i18n("%1Please wait while saving the network settings...%2").arg("<center>").arg("</center>")); + dialog->text->setText(i18n("%1Please wait while saving the network settings...%2").tqarg("<center>").tqarg("</center>")); dialog->show(); xmlOuput = ""; @@ -410,11 +410,11 @@ void KNetworkConfigParser::addNetworkInterfacesToXMLDoc(TQDomDocument *doc, TQDo t = doc->createTextNode( device->getBroadcast() ); innerTag.appendChild( t ); } - if (!device->getNetmask().isEmpty()) + if (!device->getNettqmask().isEmpty()) { - innerTag = doc->createElement( "netmask" ); + innerTag = doc->createElement( "nettqmask" ); configurationTag.appendChild( innerTag ); - t = doc->createTextNode( device->getNetmask() ); + t = doc->createTextNode( device->getNettqmask() ); 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 == "netmask" || configNodeName == "mask") + else if ( configNodeName == "nettqmask" || configNodeName == "tqmask") { TQDomElement e = configNode.toElement(); if (!e.text().isEmpty()) - tempDevice->setNetmask(e.text()); + tempDevice->setNettqmask(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 == "mask") + else if ( nodeName == "tqmask") { TQDomElement e = node.toElement(); if (!e.text().isEmpty()) - tempDevice->setNetmask(e.text()); + tempDevice->setNettqmask(e.text()); } else if ( nodeName == "bdcast") { @@ -747,7 +747,7 @@ KNetworkInterface * KNetworkConfigParser::getInterfaceInfo(TQDomElement interfac } node = node.nextSibling(); } - if (type != TQString::null) + if (type != TQString()) tempDevice->setType(type); TQString description; @@ -769,7 +769,7 @@ KNetworkInterface * KNetworkConfigParser::getInterfaceInfo(TQDomElement interfac if ((tempDevice->getBootProto().lower() == "dhcp") || (tempDevice->getBootProto().lower() == "bootp")) { tempDevice->setIpAddress(""); - tempDevice->setNetmask(""); + tempDevice->setNettqmask(""); tempDevice->setNetwork(""); tempDevice->setBroadcast(""); } @@ -820,7 +820,7 @@ void KNetworkConfigParser::readNetworkInfo() //If the platform where knetworkconf is running isn't supported, show the //user a dialog with all the supported platforms to choose. - if (xmlErr.contains("platform_unsup::")) + if (xmlErr.tqcontains("platform_unsup::")) { connect( this, TQT_SIGNAL(readyLoadingSupportedPlatforms()), this, TQT_SLOT(showSupportedPlatformsDialogSlot()) ); loadSupportedPlatforms(); @@ -1081,92 +1081,92 @@ void KNetworkConfigParser::showSupportedPlatformsDialogSlot(){ key = key.section(":",0,0); TQString name = (*it); name = name.section(":",1,1); - if (key.contains("debian")) + if (key.tqcontains("debian")) { TQPixmap distroImg(locate("data","knetworkconf/pixmaps/debian.png")); dialog->klbDistroList->insertItem(distroImg, name); } - else if (key.contains("mandriva")) + else if (key.tqcontains("mandriva")) { TQPixmap distroImg(locate("data","knetworkconf/pixmaps/mandriva.png")); dialog->klbDistroList->insertItem(distroImg, name); } - else if (key.contains("conectiva")) + else if (key.tqcontains("conectiva")) { TQPixmap distroImg(locate("data","knetworkconf/pixmaps/conectiva.png")); dialog->klbDistroList->insertItem(distroImg, name); } - else if (key.contains("pld")) + else if (key.tqcontains("pld")) { TQPixmap distroImg(locate("data","knetworkconf/pixmaps/pld.png")); dialog->klbDistroList->insertItem(distroImg, name); } - else if (key.contains("redhat")) + else if (key.tqcontains("redhat")) { TQPixmap distroImg(locate("data","knetworkconf/pixmaps/redhat.png")); dialog->klbDistroList->insertItem(distroImg, name); } - else if (key.contains("suse")) + else if (key.tqcontains("suse")) { TQPixmap distroImg(locate("data","knetworkconf/pixmaps/suse.png")); dialog->klbDistroList->insertItem(distroImg, name); } - else if (key.contains("turbolinux")) + else if (key.tqcontains("turbolinux")) { TQPixmap distroImg(locate("data","knetworkconf/pixmaps/turbolinux.png")); dialog->klbDistroList->insertItem(distroImg, name); } - else if (key.contains("fedora")) + else if (key.tqcontains("fedora")) { TQPixmap distroImg(locate("data","knetworkconf/pixmaps/fedora.png")); dialog->klbDistroList->insertItem(distroImg, name); } - else if (key.contains("openna")) + else if (key.tqcontains("openna")) { TQPixmap distroImg(locate("data","knetworkconf/pixmaps/openna.png")); dialog->klbDistroList->insertItem(distroImg, name); } - else if (key.contains("slackware")) + else if (key.tqcontains("slackware")) { TQPixmap distroImg(locate("data","knetworkconf/pixmaps/slackware.png")); dialog->klbDistroList->insertItem(distroImg, name); } - else if (key.contains("freebsd")) + else if (key.tqcontains("freebsd")) { TQPixmap distroImg(locate("data","knetworkconf/pixmaps/freebsd.png")); dialog->klbDistroList->insertItem(distroImg, name); } - else if (key.contains("gentoo")) + else if (key.tqcontains("gentoo")) { TQPixmap distroImg(locate("data","knetworkconf/pixmaps/gentoo.png")); dialog->klbDistroList->insertItem(distroImg, name); } - else if (key.contains("blackpanther")) + else if (key.tqcontains("blackpanther")) { TQPixmap distroImg(locate("data","knetworkconf/pixmaps/blackpanther.png")); dialog->klbDistroList->insertItem(distroImg, name); } - else if (key.contains("rpath")) + else if (key.tqcontains("rpath")) { TQPixmap distroImg(locate("data","knetworkconf/pixmaps/rpath.png")); dialog->klbDistroList->insertItem(distroImg, name); } - else if (key.contains("vine")) + else if (key.tqcontains("vine")) { TQPixmap distroImg(locate("data","knetworkconf/pixmaps/vine.png")); dialog->klbDistroList->insertItem(distroImg, name); } - else if (key.contains("ubuntu")) + else if (key.tqcontains("ubuntu")) { TQPixmap distroImg(locate("data","knetworkconf/pixmaps/kubuntu.png")); dialog->klbDistroList->insertItem(distroImg, name); } - else if (key.contains("yoper")) + else if (key.tqcontains("yoper")) { TQPixmap distroImg(locate("data","knetworkconf/pixmaps/yoper.png")); dialog->klbDistroList->insertItem(distroImg, name); } - else if (key.contains("ark")) + else if (key.tqcontains("ark")) { TQPixmap distroImg(locate("data","knetworkconf/pixmaps/ark.png")); dialog->klbDistroList->insertItem(distroImg, name); diff --git a/knetworkconf/knetworkconf/knetworkconfigparser.h b/knetworkconf/knetworkconf/knetworkconfigparser.h index f0af15f..6bb688b 100644 --- a/knetworkconf/knetworkconf/knetworkconfigparser.h +++ b/knetworkconf/knetworkconf/knetworkconfigparser.h @@ -59,6 +59,7 @@ class KNetworkConfigParser : public TQObject { Q_OBJECT + TQ_OBJECT public: KNetworkConfigParser(); ~KNetworkConfigParser(); diff --git a/knetworkconf/knetworkconf/knetworkconfmodule.cpp b/knetworkconf/knetworkconf/knetworkconfmodule.cpp index 3f67b0c..ddaaa60 100644 --- a/knetworkconf/knetworkconf/knetworkconfmodule.cpp +++ b/knetworkconf/knetworkconf/knetworkconfmodule.cpp @@ -23,8 +23,8 @@ -KNetworkConfModule::KNetworkConfModule(TQWidget* parent, const char *name/*, TQStringList list*/) - : KCModule(parent,name) +KNetworkConfModule::KNetworkConfModule(TQWidget* tqparent, const char *name/*, TQStringList list*/) + : KCModule(tqparent,name) { TQVBoxLayout *top = new TQVBoxLayout(this); @@ -110,7 +110,7 @@ KAboutData *aboutData = new KAboutData( "knetworkconf", I18N_NOOP("KNetworkConf" TQString KNetworkConfModule::quickHelp() const { - return i18n("%1Network configuration%2This module allows you to configure your TCP/IP settings.%3").arg("<h1>").arg("</h1><p>").arg("</p>"); + return i18n("%1Network configuration%2This module allows you to configure your TCP/IP settings.%3").tqarg("<h1>").tqarg("</h1><p>").tqarg("</p>"); } //#include "knetworkconfmodule.moc" diff --git a/knetworkconf/knetworkconf/knetworkconfmodule.h b/knetworkconf/knetworkconf/knetworkconfmodule.h index 6dedaed..2e30e27 100644 --- a/knetworkconf/knetworkconf/knetworkconfmodule.h +++ b/knetworkconf/knetworkconf/knetworkconfmodule.h @@ -25,9 +25,10 @@ class KNetworkConfModule : public KCModule { Q_OBJECT + TQ_OBJECT public: - KNetworkConfModule(TQWidget* parent, const char *name/*, TQStringList list*/); + KNetworkConfModule(TQWidget* tqparent, const char *name/*, TQStringList list*/); ~KNetworkConfModule(); void load(); diff --git a/knetworkconf/knetworkconf/knetworkinterface.cpp b/knetworkconf/knetworkconf/knetworkinterface.cpp index 0a7fad5..1db8dee 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::getNetmask(){ - return netmask; +TQString KNetworkInterface::getNettqmask(){ + return nettqmask; } 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::setNetmask(const TQString &netmask){ - KNetworkInterface::netmask = netmask; +void KNetworkInterface::setNettqmask(const TQString &nettqmask){ + KNetworkInterface::nettqmask = nettqmask; } void KNetworkInterface::setNetwork(const TQString &network){ KNetworkInterface::network = network; diff --git a/knetworkconf/knetworkconf/knetworkinterface.h b/knetworkconf/knetworkconf/knetworkinterface.h index 65ccfc0..4a64641 100644 --- a/knetworkconf/knetworkconf/knetworkinterface.h +++ b/knetworkconf/knetworkconf/knetworkinterface.h @@ -33,7 +33,7 @@ class KNetworkInterface { TQString getBroadcast(); TQString getDeviceName(); TQString getIpAddress(); - TQString getNetmask(); + TQString getNettqmask(); 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 setNetmask(const TQString &netmask); + void setNettqmask(const TQString &nettqmask); 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 Netmask. */ - TQString netmask; + /** The Nettqmask. */ + TQString nettqmask; /** The network. */ TQString network; /** The broadcast. */ diff --git a/knetworkconf/knetworkconf/kprofileslistviewtooltip.h b/knetworkconf/knetworkconf/kprofileslistviewtooltip.h index ec65c68..15dfde8 100644 --- a/knetworkconf/knetworkconf/kprofileslistviewtooltip.h +++ b/knetworkconf/knetworkconf/kprofileslistviewtooltip.h @@ -25,10 +25,10 @@ #include "knetworkinfo.h" #include "knetworkconfigparser.h" -class KProfilesListViewToolTip : public QToolTip +class KProfilesListViewToolTip : public TQToolTip { public: - KProfilesListViewToolTip(TQListView* parent); + KProfilesListViewToolTip(TQListView* tqparent); void setProfiles(TQPtrList<KNetworkInfo> profiles_); ~KProfilesListViewToolTip(); @@ -47,7 +47,7 @@ inline void KProfilesListViewToolTip::setProfiles(TQPtrList<KNetworkInfo> profil profiles = profiles_; } -inline KProfilesListViewToolTip::KProfilesListViewToolTip( TQListView* parent ):TQToolTip( parent->viewport() ), listView( parent ) {} +inline KProfilesListViewToolTip::KProfilesListViewToolTip( TQListView* tqparent ):TQToolTip( tqparent->viewport() ), listView( tqparent ) {} inline void KProfilesListViewToolTip::maybeTip( const TQPoint& p ) { @@ -60,9 +60,9 @@ inline void KProfilesListViewToolTip::maybeTip( const TQPoint& p ) if ( !item ) return; - const TQRect itemRect = listView->itemRect( item ); + const TQRect tqitemRect = listView->tqitemRect( item ); - if ( !itemRect.isValid() ) + if ( !tqitemRect.isValid() ) return; const int col = listView->header()->sectionAt( p.x() ); @@ -75,7 +75,7 @@ inline void KProfilesListViewToolTip::maybeTip( const TQPoint& p ) if ( !headerRect.isValid() ) return; - const TQRect cellRect( headerRect.left(), itemRect.top(),headerRect.width() + 60, itemRect.height() ); + const TQRect cellRect( headerRect.left(), tqitemRect.top(),headerRect.width() + 60, tqitemRect.height() ); TQString tipStr; @@ -91,31 +91,31 @@ inline void KProfilesListViewToolTip::maybeTip( const TQPoint& p ) { if (device->getType() != LOOPBACK_IFACE_TYPE) { - tipStr.append(i18n("<p><b>Interface:</b> %1").arg(device->getDeviceName().latin1())); - tipStr.append(i18n("<br><b>Type:</b> %1").arg(device->getType())); + tipStr.append(i18n("<p><b>Interface:</b> %1").tqarg(device->getDeviceName().latin1())); + tipStr.append(i18n("<br><b>Type:</b> %1").tqarg(device->getType())); TQString bootProto; if (device->getBootProto() == "none") bootProto = "Manual"; else bootProto = device->getBootProto(); - tipStr.append(i18n("<br><b>Boot Protocol:</b> %1").arg(bootProto)); + tipStr.append(i18n("<br><b>Boot Protocol:</b> %1").tqarg(bootProto)); if (bootProto != "dhcp") { - tipStr.append(i18n("<br><b>IP Address:</b> %1").arg(device->getIpAddress())); - tipStr.append(i18n("<br><b>Broadcast Address:</b> %1").arg(device->getBroadcast())); + tipStr.append(i18n("<br><b>IP Address:</b> %1").tqarg(device->getIpAddress())); + tipStr.append(i18n("<br><b>Broadcast Address:</b> %1").tqarg(device->getBroadcast())); } - tipStr.append(i18n("<br><b>On Boot:</b> %1").arg(device->getOnBoot())); + tipStr.append(i18n("<br><b>On Boot:</b> %1").tqarg(device->getOnBoot())); } } KRoutingInfo *route = profile->getRoutingInfo(); - tipStr.append(i18n("</p><p><b>Default Gateway:</b> %1").arg(route->getGateway())); + tipStr.append(i18n("</p><p><b>Default Gateway:</b> %1").tqarg(route->getGateway())); KDNSInfo *dns = profile->getDNSInfo(); - tipStr.append(i18n("<br><b>Domain Name:</b> %1").arg(dns->getDomainName())); - tipStr.append(i18n("<br><b>Machine Name:</b> %1").arg(dns->getMachineName())); + tipStr.append(i18n("<br><b>Domain Name:</b> %1").tqarg(dns->getDomainName())); + tipStr.append(i18n("<br><b>Machine Name:</b> %1").tqarg(dns->getMachineName())); TQStringList nameServers = dns->getNameServers(); for ( TQStringList::Iterator it = nameServers.begin(); it != nameServers.end(); ++it) { - tipStr.append(i18n("<br><b>DNS Name Server:</b> %1").arg((*it))); + tipStr.append(i18n("<br><b>DNS Name Server:</b> %1").tqarg((*it))); } } } diff --git a/knetworkconf/knetworkconf/kreloadnetworkdlg.ui b/knetworkconf/knetworkconf/kreloadnetworkdlg.ui index 3041186..816f4ab 100644 --- a/knetworkconf/knetworkconf/kreloadnetworkdlg.ui +++ b/knetworkconf/knetworkconf/kreloadnetworkdlg.ui @@ -12,13 +12,13 @@ <height>130</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>342</width> <height>130</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>342</width> <height>130</height> @@ -30,9 +30,9 @@ <property name="icon"> <pixmap>image0</pixmap> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> - <cstring>tlNetworkStatus</cstring> + <cstring>tlNetworktqStatus</cstring> </property> <property name="geometry"> <rect> @@ -50,7 +50,7 @@ <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -76,7 +76,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>PixmapLabel1</cstring> </property> @@ -95,7 +95,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -129,7 +129,7 @@ the changes can take effect.</string> <slot>close()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kdialog.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/knetworkconf/knetworkconf/kselectdistrodlg.ui b/knetworkconf/knetworkconf/kselectdistrodlg.ui index 4bed8ea..e982f42 100644 --- a/knetworkconf/knetworkconf/kselectdistrodlg.ui +++ b/knetworkconf/knetworkconf/kselectdistrodlg.ui @@ -61,7 +61,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="3" column="0"> + <widget class="TQCheckBox" row="3" column="0"> <property name="name"> <cstring>cbAskAgain</cstring> </property> @@ -79,14 +79,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>130</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="4"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -94,7 +94,7 @@ <string><font size="+1"><p align="center"><b>Your Platform is Not Supported</b></p></font></string> </property> </widget> - <widget class="QLabel" row="1" column="0" rowspan="1" colspan="4"> + <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -129,10 +129,10 @@ <slot>accept()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>exitSlot()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kdialog.h</includehint> <includehint>klistbox.h</includehint> diff --git a/knetworkconf/knetworkconf/main.cpp b/knetworkconf/knetworkconf/main.cpp index 8ebe038..9ee6be9 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 *parent, const char *name) + KDE_EXPORT KCModule *create_knetworkconfmodule(TQWidget *tqparent, const char *name) { KGlobal::locale()->insertCatalogue("knetworkconf"); - return new KNetworkConfModule(parent, name); + return new KNetworkConfModule(tqparent, name); } } diff --git a/knetworkconf/update_backends.sh b/knetworkconf/update_backends.sh index 9b77d13..d6a5e0c 100755 --- a/knetworkconf/update_backends.sh +++ b/knetworkconf/update_backends.sh @@ -35,7 +35,7 @@ fi diractual=`pwd` cd $1; -cp -f AUTHORS debug.pl.in file.pl.in general.pl.in guess_system.sh mkinstalldirs network-conf.in network.pl.in NEWS parse.pl.in platform.pl.in README replace.pl.in report.pl.in service-list.pl.in service.pl.in system-tools-backends.pc.in type1inst util.pl.in xml.pl.in process.pl.in $2 +cp -f AUTHORS debug.pl.in file.pl.in general.pl.in guess_system.sh mkinstalldirs network-conf.in network.pl.in NEWS parse.pl.in platform.pl.in README tqreplace.pl.in report.pl.in service-list.pl.in service.pl.in system-tools-backends.pc.in type1inst util.pl.in xml.pl.in process.pl.in $2 echo echo 'Ready, dont forget to check configure.in.in or Makefile.am to see if they need further updating.' |