summaryrefslogtreecommitdiffstats
path: root/kcontrol/info
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:43:14 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:43:14 -0600
commit79b21d47bce1ee428affc97534cd8b257232a871 (patch)
tree0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kcontrol/info
parent9a898d493f493adbc404f7223043c85f3817472b (diff)
downloadtdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz
tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/info')
-rw-r--r--kcontrol/info/info.cpp12
-rw-r--r--kcontrol/info/info_linux.cpp2
-rw-r--r--kcontrol/info/memory.cpp8
3 files changed, 11 insertions, 11 deletions
diff --git a/kcontrol/info/info.cpp b/kcontrol/info/info.cpp
index 017f9477b..0837209d6 100644
--- a/kcontrol/info/info.cpp
+++ b/kcontrol/info/info.cpp
@@ -73,7 +73,7 @@ static bool sorting_allowed; /* is sorting allowed by user ? */
static const TQString Value( int val, int numbers=1 )
{
- return KGlobal::locale()->formatNumber(val, 0).rightJustify(numbers);
+ return TDEGlobal::locale()->formatNumber(val, 0).rightJustify(numbers);
}
static const TQString HexStr(unsigned long val, int digits )
@@ -189,8 +189,8 @@ static TQListViewItem* XServer_fill_screen_info( TQListViewItem *lBox, TQListVie
Value((int)DisplayCells(dpy, scr)));
last = new TQListViewItem(item, last, i18n("Preallocated Pixels"),
i18n("Black %1, White %2")
- .arg(KGlobal::locale()->formatNumber(BlackPixel(dpy,scr), 0))
- .arg(KGlobal::locale()->formatNumber(WhitePixel(dpy,scr), 0)));
+ .arg(TDEGlobal::locale()->formatNumber(BlackPixel(dpy,scr), 0))
+ .arg(TDEGlobal::locale()->formatNumber(WhitePixel(dpy,scr), 0)));
TQString YES(i18n("Yes"));
TQString NO(i18n("No"));
@@ -239,7 +239,7 @@ static const TQString ByteString( unsigned long n )
return i18n("1 Byte"); // singular form: "1 Byte" (yes, it's "1", not "%1"!)
return i18n("%1 Bytes") // plural form: "%1 Bytes"
- .arg(KGlobal::locale()->formatNumber(n,0));
+ .arg(TDEGlobal::locale()->formatNumber(n,0));
}
static bool GetInfo_XServer_Generic( TQListView *lBox )
@@ -370,7 +370,7 @@ void KInfoListWidget::load()
/* is the user allowed to use sorting ? */
lBox->header()->setClickEnabled(sorting_allowed);
- lBox->header()->setFont(KGlobalSettings::generalFont());
+ lBox->header()->setFont(TDEGlobalSettings::generalFont());
lBox->setShowSortIndicator(sorting_allowed);
if (ok)
@@ -420,7 +420,7 @@ KInfoListWidget::KInfoListWidget(const TQString &_title, TQWidget *parent, const
lBox = new TQListView(widgetStack);
widgetStack->addWidget(lBox, 0);
lBox->setMinimumSize(200,120);
- lBox->setFont(KGlobalSettings::generalFont()); /* default font */
+ lBox->setFont(TDEGlobalSettings::generalFont()); /* default font */
lBox->setAllColumnsShowFocus(true);
TQWhatsThis::add( lBox, i18n( "This list displays system information on the selected category." ) );
NoInfoText = new TQLabel(widgetStack);
diff --git a/kcontrol/info/info_linux.cpp b/kcontrol/info/info_linux.cpp
index 18287c45f..dc3872f01 100644
--- a/kcontrol/info/info_linux.cpp
+++ b/kcontrol/info/info_linux.cpp
@@ -140,7 +140,7 @@ bool GetInfo_CPU(TQListView * lBox)
bool GetInfo_IRQ(TQListView * lBox)
{
- lBox->setFont(KGlobalSettings::fixedFont());
+ lBox->setFont(TDEGlobalSettings::fixedFont());
return GetInfo_ReadfromFile(lBox, INFO_IRQ, 0);
}
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)));
}