From 377fa3a2775cdb3194315bb83e21744dc7c97bbf Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:58:15 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit d1248617107f659af9d03cf1ef6d783571a0cba8. --- knetworkconf/backends/parse.pl.in | 10 ++-- knetworkconf/backends/replace.pl.in | 18 +++--- knetworkconf/backends/xml.pl.in | 68 +++++++++++----------- knetworkconf/knetworkconf/kadddevicecontainer.cpp | 2 +- knetworkconf/knetworkconf/kadddevicecontainer.h | 2 +- knetworkconf/knetworkconf/kadddevicedlg.ui | 18 +++--- knetworkconf/knetworkconf/kadddnsserverdlg.ui | 10 ++-- knetworkconf/knetworkconf/kaddknownhostdlg.ui | 20 +++---- knetworkconf/knetworkconf/kdetectdistrodlg.ui | 2 +- knetworkconf/knetworkconf/kinterfaceupdowndlg.ui | 6 +- knetworkconf/knetworkconf/knetworkconf.cpp | 6 +- knetworkconf/knetworkconf/knetworkconf.h | 2 +- knetworkconf/knetworkconf/knetworkconfdlg.ui | 54 ++++++++--------- knetworkconf/knetworkconf/knetworkconfigparser.cpp | 4 +- knetworkconf/knetworkconf/knetworkconfmodule.cpp | 4 +- .../knetworkconf/kprofileslistviewtooltip.h | 26 ++++----- knetworkconf/knetworkconf/kreloadnetworkdlg.ui | 8 +-- knetworkconf/knetworkconf/kselectdistrodlg.ui | 2 +- 18 files changed, 131 insertions(+), 131 deletions(-) (limited to 'knetworkconf') diff --git a/knetworkconf/backends/parse.pl.in b/knetworkconf/backends/parse.pl.in index 25c9373..0a02012 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, @children); + my ($model, $branch, @tqchildren); ($model) = &gst_xml_model_scan ($file); $branch = &gst_xml_model_find ($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 @@ -1505,7 +1505,7 @@ sub gst_parse_alchemist_print_option return undef if (!$branch); - $options = &gst_xml_model_get_children ($branch); + $options = &gst_xml_model_get_tqchildren ($branch); foreach $o (@$options) { diff --git a/knetworkconf/backends/replace.pl.in b/knetworkconf/backends/replace.pl.in index a72e3ef..8114f19 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 @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); @@ -1532,7 +1532,7 @@ 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) { diff --git a/knetworkconf/backends/xml.pl.in b/knetworkconf/backends/xml.pl.in index b9810c6..cd2201c 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 @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 .= ""; + $string .= ""; } - shift @children; - shift @children; + shift @tqchildren; + shift @tqchildren; } # if ($branch) @@ -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); @@ -890,23 +890,23 @@ sub gst_xml_model_ensure { next if ($elem eq ""); - my @children = @$branch; + my @tqchildren = @$branch; my $parent_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) @@ -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/kadddevicecontainer.cpp b/knetworkconf/knetworkconf/kadddevicecontainer.cpp index d68dffe..361f893 100644 --- a/knetworkconf/knetworkconf/kadddevicecontainer.cpp +++ b/knetworkconf/knetworkconf/kadddevicecontainer.cpp @@ -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); diff --git a/knetworkconf/knetworkconf/kadddevicecontainer.h b/knetworkconf/knetworkconf/kadddevicecontainer.h index 97b4792..e4c118e 100644 --- a/knetworkconf/knetworkconf/kadddevicecontainer.h +++ b/knetworkconf/knetworkconf/kadddevicecontainer.h @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/knetworkconf/knetworkconf/kadddevicedlg.ui b/knetworkconf/knetworkconf/kadddevicedlg.ui index 60a720f..2066705 100644 --- a/knetworkconf/knetworkconf/kadddevicedlg.ui +++ b/knetworkconf/knetworkconf/kadddevicedlg.ui @@ -22,13 +22,13 @@ 0 - + 0 0 - + 32767 32767 @@ -80,7 +80,7 @@ Expanding - + 130 20 @@ -118,7 +118,7 @@ Expanding - + 50 20 @@ -166,7 +166,7 @@ Expanding - + 16 20 @@ -252,7 +252,7 @@ Expanding - + 16 20 @@ -269,7 +269,7 @@ Expanding - + 16 20 @@ -321,7 +321,7 @@ Expanding - + 16 20 @@ -352,7 +352,7 @@ Expanding - + 16 20 diff --git a/knetworkconf/knetworkconf/kadddnsserverdlg.ui b/knetworkconf/knetworkconf/kadddnsserverdlg.ui index f79401d..4bacfab 100644 --- a/knetworkconf/knetworkconf/kadddnsserverdlg.ui +++ b/knetworkconf/knetworkconf/kadddnsserverdlg.ui @@ -12,13 +12,13 @@ 81 - + 0 0 - + 32767 32767 @@ -44,7 +44,7 @@ Expanding - + 80 16 @@ -69,7 +69,7 @@ Expanding - + 20 16 @@ -116,7 +116,7 @@ Expanding - + 20 16 diff --git a/knetworkconf/knetworkconf/kaddknownhostdlg.ui b/knetworkconf/knetworkconf/kaddknownhostdlg.ui index c111143..397df4c 100644 --- a/knetworkconf/knetworkconf/kaddknownhostdlg.ui +++ b/knetworkconf/knetworkconf/kaddknownhostdlg.ui @@ -24,7 +24,7 @@ - layout12 + tqlayout12 @@ -48,7 +48,7 @@ Preferred - + 16 20 @@ -70,7 +70,7 @@ Expanding - + 80 20 @@ -89,7 +89,7 @@ Expanding - + 180 20 @@ -114,7 +114,7 @@ Expanding - + 20 16 @@ -139,7 +139,7 @@ Expanding - + 20 16 @@ -164,7 +164,7 @@ - layout25 + tqlayout25 @@ -174,7 +174,7 @@ kpbAddHost - + 32767 32767 @@ -191,7 +191,7 @@ kpbEditHost - + 32767 32767 @@ -208,7 +208,7 @@ kpbRemoveHost - + 32767 32767 diff --git a/knetworkconf/knetworkconf/kdetectdistrodlg.ui b/knetworkconf/knetworkconf/kdetectdistrodlg.ui index af91fc8..e4ad380 100644 --- a/knetworkconf/knetworkconf/kdetectdistrodlg.ui +++ b/knetworkconf/knetworkconf/kdetectdistrodlg.ui @@ -21,7 +21,7 @@ - layout4 + tqlayout4 diff --git a/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui b/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui index 37098be..0986db4 100644 --- a/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui +++ b/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui @@ -43,7 +43,7 @@ Expanding - + 21 20 @@ -54,7 +54,7 @@ label - + 150 0 @@ -74,7 +74,7 @@ Expanding - + 20 20 diff --git a/knetworkconf/knetworkconf/knetworkconf.cpp b/knetworkconf/knetworkconf/knetworkconf.cpp index 2a5c4c0..a769705 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").arg(currentDevice)); + configDlg.setCaption(i18n("Configure Device %1").tqarg(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 %1").arg(dev)); + dialog->label->setText(i18n("Enabling interface %1").tqarg(dev)); else - dialog->label->setText(i18n("Disabling interface %1").arg(dev)); + dialog->label->setText(i18n("Disabling interface %1").tqarg(dev)); dialog->setModal(true); dialog->show(); diff --git a/knetworkconf/knetworkconf/knetworkconf.h b/knetworkconf/knetworkconf/knetworkconf.h index 467ad67..d5cf482 100644 --- a/knetworkconf/knetworkconf/knetworkconf.h +++ b/knetworkconf/knetworkconf/knetworkconf.h @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/knetworkconf/knetworkconf/knetworkconfdlg.ui b/knetworkconf/knetworkconf/knetworkconfdlg.ui index 7e2a4da..2405333 100644 --- a/knetworkconf/knetworkconf/knetworkconfdlg.ui +++ b/knetworkconf/knetworkconf/knetworkconfdlg.ui @@ -20,13 +20,13 @@ 0 - + 510 410 - + 32767 32767 @@ -71,7 +71,7 @@ - layout16 + tqlayout16 @@ -95,7 +95,7 @@ Expanding - + 301 20 @@ -177,7 +177,7 @@ - layout11 + tqlayout11 @@ -231,7 +231,7 @@ Expanding - + 20 230 @@ -306,7 +306,7 @@ Expanding - + 181 0 @@ -358,7 +358,7 @@ Expanding - + 31 0 @@ -385,13 +385,13 @@ 0 - + 70 0 - + 65 32767 @@ -415,7 +415,7 @@ Expanding - + 0 90 @@ -462,7 +462,7 @@ - layout23 + tqlayout23 @@ -478,7 +478,7 @@ Expanding - + 16 20 @@ -523,7 +523,7 @@ Expanding - + 16 16 @@ -534,7 +534,7 @@ - layout25 + tqlayout25 @@ -550,7 +550,7 @@ Expanding - + 20 21 @@ -561,7 +561,7 @@ kpbAddDomainServer - + 32767 32767 @@ -578,7 +578,7 @@ kpbEditDomainServer - + 32767 32767 @@ -595,7 +595,7 @@ kpbRemoveDomainServer - + 32767 32767 @@ -618,7 +618,7 @@ Expanding - + 20 21 @@ -669,7 +669,7 @@ - layout20 + tqlayout20 @@ -679,7 +679,7 @@ kpbAddKnownHost - + 32767 32767 @@ -696,7 +696,7 @@ kpbEditKnownHost - + 32767 32767 @@ -713,7 +713,7 @@ kpbRemoveKnownHost - + 32767 32767 @@ -807,7 +807,7 @@ - layout28 + tqlayout28 @@ -857,7 +857,7 @@ Expanding - + 21 51 @@ -876,7 +876,7 @@ Expanding - + 20 150 diff --git a/knetworkconf/knetworkconf/knetworkconfigparser.cpp b/knetworkconf/knetworkconf/knetworkconfigparser.cpp index 5f4d44e..e6aa338 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.").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(); @@ -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").arg("
").arg("
")); + dialog->text->setText(i18n("%1Please wait while saving the network settings...%2").tqarg("
").tqarg("
")); dialog->show(); xmlOuput = ""; diff --git a/knetworkconf/knetworkconf/knetworkconfmodule.cpp b/knetworkconf/knetworkconf/knetworkconfmodule.cpp index 2deac9e..f25c99d 100644 --- a/knetworkconf/knetworkconf/knetworkconfmodule.cpp +++ b/knetworkconf/knetworkconf/knetworkconfmodule.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include "knetworkconfmodule.h" @@ -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("

").arg("

").arg("

"); + return i18n("%1Network configuration%2This module allows you to configure your TCP/IP settings.%3").tqarg("

").tqarg("

").tqarg("

"); } //#include "knetworkconfmodule.moc" diff --git a/knetworkconf/knetworkconf/kprofileslistviewtooltip.h b/knetworkconf/knetworkconf/kprofileslistviewtooltip.h index dc30c12..579f0e4 100644 --- a/knetworkconf/knetworkconf/kprofileslistviewtooltip.h +++ b/knetworkconf/knetworkconf/kprofileslistviewtooltip.h @@ -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("

Interface: %1").arg(device->getDeviceName().latin1())); - tipStr.append(i18n("
Type: %1").arg(device->getType())); + tipStr.append(i18n("

Interface: %1").tqarg(device->getDeviceName().latin1())); + tipStr.append(i18n("
Type: %1").tqarg(device->getType())); TQString bootProto; if (device->getBootProto() == "none") bootProto = "Manual"; else bootProto = device->getBootProto(); - tipStr.append(i18n("
Boot Protocol: %1").arg(bootProto)); + tipStr.append(i18n("
Boot Protocol: %1").tqarg(bootProto)); if (bootProto != "dhcp") { - tipStr.append(i18n("
IP Address: %1").arg(device->getIpAddress())); - tipStr.append(i18n("
Broadcast Address: %1").arg(device->getBroadcast())); + tipStr.append(i18n("
IP Address: %1").tqarg(device->getIpAddress())); + tipStr.append(i18n("
Broadcast Address: %1").tqarg(device->getBroadcast())); } - tipStr.append(i18n("
On Boot: %1").arg(device->getOnBoot())); + tipStr.append(i18n("
On Boot: %1").tqarg(device->getOnBoot())); } } KRoutingInfo *route = profile->getRoutingInfo(); - tipStr.append(i18n("

Default Gateway: %1").arg(route->getGateway())); + tipStr.append(i18n("

Default Gateway: %1").tqarg(route->getGateway())); KDNSInfo *dns = profile->getDNSInfo(); - tipStr.append(i18n("
Domain Name: %1").arg(dns->getDomainName())); - tipStr.append(i18n("
Machine Name: %1").arg(dns->getMachineName())); + tipStr.append(i18n("
Domain Name: %1").tqarg(dns->getDomainName())); + tipStr.append(i18n("
Machine Name: %1").tqarg(dns->getMachineName())); TQStringList nameServers = dns->getNameServers(); for ( TQStringList::Iterator it = nameServers.begin(); it != nameServers.end(); ++it) { - tipStr.append(i18n("
DNS Name Server: %1").arg((*it))); + tipStr.append(i18n("
DNS Name Server: %1").tqarg((*it))); } } } diff --git a/knetworkconf/knetworkconf/kreloadnetworkdlg.ui b/knetworkconf/knetworkconf/kreloadnetworkdlg.ui index 705396e..9a1f62d 100644 --- a/knetworkconf/knetworkconf/kreloadnetworkdlg.ui +++ b/knetworkconf/knetworkconf/kreloadnetworkdlg.ui @@ -12,13 +12,13 @@ 130 - + 342 130 - + 342 130 @@ -32,7 +32,7 @@ - tlNetworkStatus + tlNetworktqStatus @@ -50,7 +50,7 @@ - + AlignCenter diff --git a/knetworkconf/knetworkconf/kselectdistrodlg.ui b/knetworkconf/knetworkconf/kselectdistrodlg.ui index 496502b..2bbfd95 100644 --- a/knetworkconf/knetworkconf/kselectdistrodlg.ui +++ b/knetworkconf/knetworkconf/kselectdistrodlg.ui @@ -79,7 +79,7 @@ Expanding - + 130 20 -- cgit v1.2.1