diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
| commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
| tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kcontrol/info/memory.cpp | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/info/memory.cpp')
| -rw-r--r-- | kcontrol/info/memory.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kcontrol/info/memory.cpp b/kcontrol/info/memory.cpp index 483f7dd1d..49cb03dde 100644 --- a/kcontrol/info/memory.cpp +++ b/kcontrol/info/memory.cpp @@ -80,11 +80,11 @@ static TQString formatted_unit(t_memsize value) { if (value > (1024 * 1024)) if (value > (1024 * 1024 * 1024)) - return i18n("%1 GB").arg(KGlobal::locale()->formatNumber(value / (1024 * 1024 * 1024.0), 2)); + return i18n("%1 GB").arg(TDEGlobal::locale()->formatNumber(value / (1024 * 1024 * 1024.0), 2)); else - return i18n("%1 MB").arg(KGlobal::locale()->formatNumber(value / (1024 * 1024.0), 2)); + return i18n("%1 MB").arg(TDEGlobal::locale()->formatNumber(value / (1024 * 1024.0), 2)); else - return i18n("%1 KB").arg(KGlobal::locale()->formatNumber(value / 1024.0, 2)); + return i18n("%1 KB").arg(TDEGlobal::locale()->formatNumber(value / 1024.0, 2)); } KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name) @@ -368,7 +368,7 @@ void KMemoryWidget::update_Values() label->clear(); else label->setText(i18n("%1 bytes ="). - arg(KGlobal::locale()-> + arg(TDEGlobal::locale()-> formatNumber(Memory_Info[i], 0))); } |