summaryrefslogtreecommitdiffstats
path: root/knetworkconf/backends
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-09 02:23:29 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-09 02:23:29 +0000
commitdbb67f90e8177bba3f6527852af1e5f4b7a00325 (patch)
treeb3ec423edc172fee393480c6cd4cfe4ae5746017 /knetworkconf/backends
parente1fedebd35564879715ec11012b5acaf3068edb9 (diff)
downloadtdeadmin-dbb67f90e8177bba3f6527852af1e5f4b7a00325.tar.gz
tdeadmin-dbb67f90e8177bba3f6527852af1e5f4b7a00325.zip
Remove the tq in front of these incorrectly TQt4-converted methods/data members:
tqrepaint[...] tqinvalidate[...] tqparent[...] tqmask[...] tqlayout[...] tqalignment[...] git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeadmin@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'knetworkconf/backends')
-rw-r--r--knetworkconf/backends/network.pl.in14
-rw-r--r--knetworkconf/backends/replace.pl.in2
-rw-r--r--knetworkconf/backends/xml.pl.in6
3 files changed, 11 insertions, 11 deletions
diff --git a/knetworkconf/backends/network.pl.in b/knetworkconf/backends/network.pl.in
index 6441761..42d1629 100644
--- a/knetworkconf/backends/network.pl.in
+++ b/knetworkconf/backends/network.pl.in
@@ -433,12 +433,12 @@ sub gst_network_ipv4_vec2str
sub gst_network_ipv4_calc_subnet_vec
{
my ($addr, $tqmask) = @_;
- my ($addrvec, $tqmaskvec);
+ my ($addrvec, $maskvec);
$addrvec = &gst_network_ipv4_str2vec ($addr);
- $tqmaskvec = &gst_network_ipv4_str2vec ($tqmask);
+ $maskvec = &gst_network_ipv4_str2vec ($tqmask);
- return $addrvec & $tqmaskvec;
+ return $addrvec & $maskvec;
}
# What you're looking for.
@@ -455,9 +455,9 @@ sub gst_network_ipv4_calc_bcast_vec
my ($addr, $tqmask) = @_;
$addrvec = &gst_network_ipv4_str2vec ($addr);
- $tqmaskvec = &gst_network_ipv4_str2vec ($tqmask);
+ $maskvec = &gst_network_ipv4_str2vec ($tqmask);
- return $addrvec | ~$tqmaskvec;
+ return $addrvec | ~$maskvec;
}
# And this returning the quad-dot notation.
@@ -3531,7 +3531,7 @@ sub gst_network_pld10_get_ipaddr
{
my ($file, $key, $what) = @_;
my ($ipaddr, $nettqmask, $ret, $i);
- my @nettqmask_prefixes = (0, 128, 192, 224, 240, 248, 252, 254, 255);
+ my @netmask_prefixes = (0, 128, 192, 224, 240, 248, 252, 254, 255);
$ipaddr = &gst_parse_sh($file, $key);
return undef if $ipaddr eq "";
@@ -3551,7 +3551,7 @@ sub gst_network_pld10_get_ipaddr
$ret .= "255.";
}
- $ret .= "$nettqmask_prefixes[$b%8]." if $nettqmask < 32;
+ $ret .= "$netmask_prefixes[$b%8]." if $nettqmask < 32;
for($i = int($nettqmask/8) + 1; $i < 4; $i++)
{
diff --git a/knetworkconf/backends/replace.pl.in b/knetworkconf/backends/replace.pl.in
index 30ec359..bac1f9a 100644
--- a/knetworkconf/backends/replace.pl.in
+++ b/knetworkconf/backends/replace.pl.in
@@ -477,7 +477,7 @@ sub gst_replace_join_hash
return $res;
}
-# Find $re matching send string and replace tqparenthesyzed
+# Find $re matching send string and replace parenthesyzed
# part of $re with $value. FIXME: apply meeks' more general impl.
sub gst_replace_chat
{
diff --git a/knetworkconf/backends/xml.pl.in b/knetworkconf/backends/xml.pl.in
index 9421f75..dfd41cd 100644
--- a/knetworkconf/backends/xml.pl.in
+++ b/knetworkconf/backends/xml.pl.in
@@ -891,7 +891,7 @@ sub gst_xml_model_ensure
next if ($elem eq "");
my @tqchildren = @$branch;
- my $tqparent_branch = $branch;
+ my $parent_branch = $branch;
shift @tqchildren; # Attributes
$branch = undef;
@@ -918,8 +918,8 @@ sub gst_xml_model_ensure
push @list, \%hash;
- push @$tqparent_branch, $elem;
- push @$tqparent_branch, $branch;
+ push @$parent_branch, $elem;
+ push @$parent_branch, $branch;
}
}