diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 10:00:17 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 10:00:17 -0600 |
| commit | 955e20356d63ed405198c8143617a8a0ca8bfc02 (patch) | |
| tree | 9a9ab22c86d212a5655014ad752e96b04c0c86a9 /klaptopdaemon/portable.cpp | |
| parent | bf280726d5d22f33d33e4f9e771220c725249407 (diff) | |
| download | tdeutils-955e20356d63ed405198c8143617a8a0ca8bfc02.tar.gz tdeutils-955e20356d63ed405198c8143617a8a0ca8bfc02.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit bf280726d5d22f33d33e4f9e771220c725249407.
Diffstat (limited to 'klaptopdaemon/portable.cpp')
| -rw-r--r-- | klaptopdaemon/portable.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/klaptopdaemon/portable.cpp b/klaptopdaemon/portable.cpp index 18c64fc..dbcb57c 100644 --- a/klaptopdaemon/portable.cpp +++ b/klaptopdaemon/portable.cpp @@ -87,7 +87,7 @@ #include <tqobject.h> #include <tqregexp.h> #include <tqiodevice.h> -#include <layout.h> +#include <tqlayout.h> #include <tqvgroupbox.h> #include <tqvaluevector.h> @@ -199,7 +199,7 @@ pmu_read(apm_info *ap) int timerem = 0; int maxcharge = 0; for (int i = 0; i < bcnt; i++) { - TQFile bf(TQString("/proc/pmu/battery_%1").arg(i)); + TQFile bf(TQString("/proc/pmu/battery_%1").tqarg(i)); if (!bf.exists() || !bf.open(IO_ReadOnly)) continue; @@ -1226,7 +1226,7 @@ laptop_portable::get_battery_status(int &num_batteries, TQStringList &names, TQS for(unsigned int i = 0; i < acpi_batteries.count(); ++i) { acpi_battery_info& bat = acpi_batteries[i]; names.append(bat.name); - values.append(TQString("%1").arg(bat.percentage)); + values.append(TQString("%1").tqarg(bat.percentage)); state.append(bat.present ? "yes" : "no"); } return; @@ -1330,11 +1330,11 @@ TQString laptop_portable::cpu_frequency() { continue; if (ll.first().stripWhiteSpace() == "cpu MHz") { - rc = i18n("%1 MHz (%2)").arg(ll.last().stripWhiteSpace()).arg(rc); + rc = i18n("%1 MHz (%2)").tqarg(ll.last().stripWhiteSpace()).tqarg(rc); break; } else if (ll.first().stripWhiteSpace() == "clock") { - rc = TQString("%1 (%2)").arg(ll.last().stripWhiteSpace()).arg(rc); + rc = TQString("%1 (%2)").tqarg(ll.last().stripWhiteSpace()).tqarg(rc); break; } } @@ -1581,7 +1581,7 @@ get_acpi_list(char p, int *map, const char *dev, TQStringList &list, int &index, TQString l; f.readLine(l, 500); if (l.contains("active limit", false)) { - TQRegExp rx(TQString("%1(\\d+)").arg(p)); + TQRegExp rx(TQString("%1(\\d+)").tqarg(p)); if (rx.search(l) >= 0) { bool ok; int min = rx.cap(1).toInt(&ok); @@ -1706,7 +1706,7 @@ static int get_cpufreq_24_state(TQStringList &states, int ¤t, const TQStri f.close(); cpufreq_minmax_frequency[i] = buffer; unsigned int val = buffer.toUInt() / 1000; - states.append(i18n("%1 MHz").arg(val)); + states.append(i18n("%1 MHz").tqarg(val)); if(buffer.stripWhiteSpace() == cur) current = i; } @@ -2267,7 +2267,7 @@ laptop_portable::apm_set_mask(bool , bool ) // adds extra widgets to the battery panel // void -laptop_portable::extra_config(TQWidget * /*parent*/, KConfig * /*config*/, TQVBoxLayout * /*layout*/) +laptop_portable::extra_config(TQWidget * /*parent*/, KConfig * /*config*/, TQVBoxLayout * /*tqlayout*/) { // INSERT HERE } @@ -2945,7 +2945,7 @@ int laptop_portable::has_apm(int) // adds extra widgets to the battery panel // void -laptop_portable::extra_config(TQWidget *parent, KConfig *config, TQVBoxLayout *layout) +laptop_portable::extra_config(TQWidget *parent, KConfig *config, TQVBoxLayout *tqlayout) { // INSERT HERE } |