summaryrefslogtreecommitdiffstats
path: root/knetworkconf
diff options
context:
space:
mode:
Diffstat (limited to 'knetworkconf')
-rw-r--r--knetworkconf/backends/parse.pl.in10
-rw-r--r--knetworkconf/backends/replace.pl.in18
-rw-r--r--knetworkconf/backends/xml.pl.in68
-rw-r--r--knetworkconf/knetworkconf/knetworkconf.cpp6
-rw-r--r--knetworkconf/knetworkconf/knetworkconfigparser.cpp4
-rw-r--r--knetworkconf/knetworkconf/knetworkconfmodule.cpp2
-rw-r--r--knetworkconf/knetworkconf/kprofileslistviewtooltip.h20
-rw-r--r--knetworkconf/knetworkconf/kreloadnetworkdlg.ui2
8 files changed, 65 insertions, 65 deletions
diff --git a/knetworkconf/backends/parse.pl.in b/knetworkconf/backends/parse.pl.in
index 0a02012..25c9373 100644
--- a/knetworkconf/backends/parse.pl.in
+++ b/knetworkconf/backends/parse.pl.in
@@ -1451,12 +1451,12 @@ sub gst_parse_xml
sub gst_parse_xml_child_names
{
my ($file, $varpath) = @_;
- my ($model, $branch, @tqchildren);
+ my ($model, $branch, @children);
($model) = &gst_xml_model_scan ($file);
$branch = &gst_xml_model_find ($model, $varpath);
- if (!$branch) { return @tqchildren; }
+ if (!$branch) { return @children; }
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 @tqchildren, shift @list;
+ push @children, shift @list;
}
else
{
@@ -1475,7 +1475,7 @@ sub gst_parse_xml_child_names
shift @list;
}
- return @tqchildren;
+ return @children;
}
sub gst_parse_alchemist
@@ -1505,7 +1505,7 @@ sub gst_parse_alchemist_print_option
return undef if (!$branch);
- $options = &gst_xml_model_get_tqchildren ($branch);
+ $options = &gst_xml_model_get_children ($branch);
foreach $o (@$options)
{
diff --git a/knetworkconf/backends/replace.pl.in b/knetworkconf/backends/replace.pl.in
index 8114f19..a72e3ef 100644
--- a/knetworkconf/backends/replace.pl.in
+++ b/knetworkconf/backends/replace.pl.in
@@ -1457,22 +1457,22 @@ sub gst_replace_alchemist_ensure_list_types
for $elem (@path)
{
next if ($elem eq "");
- my @tqchildren = @$branch;
- shift @tqchildren; # Attributes
+ my @children = @$branch;
+ shift @children; # Attributes
$branch = undef;
- while (@tqchildren)
+ while (@children)
{
- if ($tqchildren [0] eq $elem)
+ if ($children [0] eq $elem)
{
- shift @tqchildren;
- $branch = shift @tqchildren;
+ shift @children;
+ $branch = shift @children;
&gst_xml_model_set_attribute ($branch, "TYPE", "LIST");
last;
}
- shift @tqchildren;
- shift @tqchildren;
+ shift @children;
+ shift @children;
}
last if ($branch == undef);
@@ -1532,7 +1532,7 @@ sub gst_replace_alchemist_print_option
# See if option is already defined.
- $options = &gst_xml_model_get_tqchildren ($branch);
+ $options = &gst_xml_model_get_children ($branch);
foreach $o (@$options)
{
diff --git a/knetworkconf/backends/xml.pl.in b/knetworkconf/backends/xml.pl.in
index cd2201c..b9810c6 100644
--- a/knetworkconf/backends/xml.pl.in
+++ b/knetworkconf/backends/xml.pl.in
@@ -352,34 +352,34 @@ sub gst_xml_model_print_recurse
my ($tree, $indent) = @_;
my ($string);
- my @tqchildren = @$tree;
- shift @tqchildren; # Attributes
+ my @children = @$tree;
+ shift @children; # Attributes
- while (@tqchildren)
+ while (@children)
{
- my $branch = $tqchildren [1];
+ my $branch = $children [1];
- if ($tqchildren [0] eq "__unparsed__")
+ if ($children [0] eq "__unparsed__")
{
- $string .= "<" . $tqchildren [1] . ">";
+ $string .= "<" . $children [1] . ">";
}
- elsif ($tqchildren [0] eq "0")
+ elsif ($children [0] eq "0")
{
- $string .= $tqchildren [1];
+ $string .= $children [1];
}
elsif (@$branch == 1) # Empty tag.
{
- $string .= "<" . $tqchildren [0] . &gst_xml_model_print_attributes ($branch) . "/>";
+ $string .= "<" . $children [0] . &gst_xml_model_print_attributes ($branch) . "/>";
}
else
{
- $string .= "<" . $tqchildren [0] . &gst_xml_model_print_attributes ($branch) . ">";
+ $string .= "<" . $children [0] . &gst_xml_model_print_attributes ($branch) . ">";
$string .= &gst_xml_model_print_recurse ($branch);
- $string .= "</" . $tqchildren [0] . ">";
+ $string .= "</" . $children [0] . ">";
}
- shift @tqchildren;
- shift @tqchildren;
+ shift @children;
+ shift @children;
}
# if ($branch)
@@ -825,21 +825,21 @@ sub gst_xml_model_find
for $elem (@path)
{
next if ($elem eq "");
- my @tqchildren = @$branch;
- shift @tqchildren; # Attributes
+ my @children = @$branch;
+ shift @children; # Attributes
$branch = undef;
- while (@tqchildren)
+ while (@children)
{
- if ($tqchildren [0] eq $elem)
+ if ($children [0] eq $elem)
{
- shift @tqchildren;
- $branch = shift @tqchildren;
+ shift @children;
+ $branch = shift @children;
last;
}
- shift @tqchildren;
- shift @tqchildren;
+ shift @children;
+ shift @children;
}
last if ($branch == undef);
@@ -890,23 +890,23 @@ sub gst_xml_model_ensure
{
next if ($elem eq "");
- my @tqchildren = @$branch;
+ my @children = @$branch;
my $parent_branch = $branch;
- shift @tqchildren; # Attributes
+ shift @children; # Attributes
$branch = undef;
- while (@tqchildren)
+ while (@children)
{
- if ($tqchildren [0] eq $elem)
+ if ($children [0] eq $elem)
{
- shift @tqchildren;
- $branch = shift @tqchildren;
+ shift @children;
+ $branch = shift @children;
last;
}
- shift @tqchildren;
- shift @tqchildren;
+ shift @children;
+ shift @children;
}
if ($branch == undef)
@@ -950,22 +950,22 @@ sub gst_xml_model_remove
return -1;
}
-sub gst_xml_model_get_tqchildren
+sub gst_xml_model_get_children
{
my ($branch) = @_;
- my (@tqchildren);
+ my (@children);
- if (!$branch) { return \@tqchildren; }
+ if (!$branch) { return \@children; }
for ($i = 1; $i < @$branch; $i += 2)
{
if (@$branch [$i] ne "__unparsed__" && @$branch [$i] ne "0")
{
- push @tqchildren, @$branch [$i + 1];
+ push @children, @$branch [$i + 1];
}
}
- return \@tqchildren;
+ return \@children;
}
sub gst_xml_model_get_pcdata
diff --git a/knetworkconf/knetworkconf/knetworkconf.cpp b/knetworkconf/knetworkconf/knetworkconf.cpp
index a769705..2a5c4c0 100644
--- a/knetworkconf/knetworkconf/knetworkconf.cpp
+++ b/knetworkconf/knetworkconf/knetworkconf.cpp
@@ -230,7 +230,7 @@ void KNetworkConf::configureDeviceSlot(){
if (item != NULL)
{
TQString currentDevice = item->text(0);
- configDlg.setCaption(i18n("Configure Device %1").tqarg(currentDevice));
+ configDlg.setCaption(i18n("Configure Device %1").arg(currentDevice));
KNetworkInterface *dev = getDeviceInfo(currentDevice);
KAddDeviceDlgExtension *advancedOptions = (KAddDeviceDlgExtension *)configDlg.extension();
@@ -677,9 +677,9 @@ 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>").tqarg(dev));
+ dialog->label->setText(i18n("Enabling interface <b>%1</b>").arg(dev));
else
- dialog->label->setText(i18n("Disabling interface <b>%1</b>").tqarg(dev));
+ dialog->label->setText(i18n("Disabling interface <b>%1</b>").arg(dev));
dialog->setModal(true);
dialog->show();
diff --git a/knetworkconf/knetworkconf/knetworkconfigparser.cpp b/knetworkconf/knetworkconf/knetworkconfigparser.cpp
index e6aa338..5f4d44e 100644
--- a/knetworkconf/knetworkconf/knetworkconfigparser.cpp
+++ b/knetworkconf/knetworkconf/knetworkconfigparser.cpp
@@ -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.").tqarg(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.").arg(BACKEND_PATH),
i18n("Could Not Find Network Configuration Backend Script"));
dialog->close();
//kapp->quit();
@@ -301,7 +301,7 @@ void KNetworkConfigParser::saveNetworkInfo(KNetworkInfo *networkInfo)
// 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);
dialog->setCaption(i18n("Reloading Network"));
- dialog->text->setText(i18n("%1Please wait while saving the network settings...%2").tqarg("<center>").tqarg("</center>"));
+ dialog->text->setText(i18n("%1Please wait while saving the network settings...%2").arg("<center>").arg("</center>"));
dialog->show();
xmlOuput = "";
diff --git a/knetworkconf/knetworkconf/knetworkconfmodule.cpp b/knetworkconf/knetworkconf/knetworkconfmodule.cpp
index f25c99d..3f67b0c 100644
--- a/knetworkconf/knetworkconf/knetworkconfmodule.cpp
+++ b/knetworkconf/knetworkconf/knetworkconfmodule.cpp
@@ -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").tqarg("<h1>").tqarg("</h1><p>").tqarg("</p>");
+ return i18n("%1Network configuration%2This module allows you to configure your TCP/IP settings.%3").arg("<h1>").arg("</h1><p>").arg("</p>");
}
//#include "knetworkconfmodule.moc"
diff --git a/knetworkconf/knetworkconf/kprofileslistviewtooltip.h b/knetworkconf/knetworkconf/kprofileslistviewtooltip.h
index 03bf9a4..dc30c12 100644
--- a/knetworkconf/knetworkconf/kprofileslistviewtooltip.h
+++ b/knetworkconf/knetworkconf/kprofileslistviewtooltip.h
@@ -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").tqarg(device->getDeviceName().latin1()));
- tipStr.append(i18n("<br><b>Type:</b> %1").tqarg(device->getType()));
+ tipStr.append(i18n("<p><b>Interface:</b> %1").arg(device->getDeviceName().latin1()));
+ tipStr.append(i18n("<br><b>Type:</b> %1").arg(device->getType()));
TQString bootProto;
if (device->getBootProto() == "none")
bootProto = "Manual";
else
bootProto = device->getBootProto();
- tipStr.append(i18n("<br><b>Boot Protocol:</b> %1").tqarg(bootProto));
+ tipStr.append(i18n("<br><b>Boot Protocol:</b> %1").arg(bootProto));
if (bootProto != "dhcp")
{
- 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>IP Address:</b> %1").arg(device->getIpAddress()));
+ tipStr.append(i18n("<br><b>Broadcast Address:</b> %1").arg(device->getBroadcast()));
}
- tipStr.append(i18n("<br><b>On Boot:</b> %1").tqarg(device->getOnBoot()));
+ tipStr.append(i18n("<br><b>On Boot:</b> %1").arg(device->getOnBoot()));
}
}
KRoutingInfo *route = profile->getRoutingInfo();
- tipStr.append(i18n("</p><p><b>Default Gateway:</b> %1").tqarg(route->getGateway()));
+ tipStr.append(i18n("</p><p><b>Default Gateway:</b> %1").arg(route->getGateway()));
KDNSInfo *dns = profile->getDNSInfo();
- tipStr.append(i18n("<br><b>Domain Name:</b> %1").tqarg(dns->getDomainName()));
- tipStr.append(i18n("<br><b>Machine Name:</b> %1").tqarg(dns->getMachineName()));
+ tipStr.append(i18n("<br><b>Domain Name:</b> %1").arg(dns->getDomainName()));
+ tipStr.append(i18n("<br><b>Machine Name:</b> %1").arg(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").tqarg((*it)));
+ tipStr.append(i18n("<br><b>DNS Name Server:</b> %1").arg((*it)));
}
}
}
diff --git a/knetworkconf/knetworkconf/kreloadnetworkdlg.ui b/knetworkconf/knetworkconf/kreloadnetworkdlg.ui
index f56d9ef..705396e 100644
--- a/knetworkconf/knetworkconf/kreloadnetworkdlg.ui
+++ b/knetworkconf/knetworkconf/kreloadnetworkdlg.ui
@@ -50,7 +50,7 @@
<property name="text">
<string></string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-16 09:54:12 +0000