summaryrefslogtreecommitdiffstats
path: root/kcalc
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-24 13:50:20 -0600
committerTimothy Pearson <[email protected]>2013-01-24 13:50:20 -0600
commitaef5eada7f51ee48f3d21448db290bd8f06953a8 (patch)
tree9d6e7572ebcc27e402501d6966f9b46361a1702c /kcalc
parent95d05392f9bc01594738a1e06ebf23123b3d3e6e (diff)
downloadtdeutils-aef5eada7f51ee48f3d21448db290bd8f06953a8.tar.gz
tdeutils-aef5eada7f51ee48f3d21448db290bd8f06953a8.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kcalc')
-rw-r--r--kcalc/kcalc.cpp2
-rw-r--r--kcalc/kcalc.kcfg2
-rw-r--r--kcalc/kcalcdisplay.cpp6
3 files changed, 5 insertions, 5 deletions
diff --git a/kcalc/kcalc.cpp b/kcalc/kcalc.cpp
index 5242cc4..8e1b7d2 100644
--- a/kcalc/kcalc.cpp
+++ b/kcalc/kcalc.cpp
@@ -584,7 +584,7 @@ TQWidget* KCalculator::setupNumericKeys(TQWidget *parent)
pbMinus, TQT_SLOT(slotSetAccelDisplayMode(bool)));
connect(pbMinus, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotMinusclicked(void)));
- pbPeriod = new KCalcButton(KGlobal::locale()->decimalSymbol(), thisPage,
+ pbPeriod = new KCalcButton(TDEGlobal::locale()->decimalSymbol(), thisPage,
"Period-Button", i18n("Decimal point"));
connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
TQT_TQOBJECT(pbPeriod), TQT_SLOT(slotSetAccelDisplayMode(bool)));
diff --git a/kcalc/kcalc.kcfg b/kcalc/kcalc.kcfg
index 26cdbf1..25b2361 100644
--- a/kcalc/kcalc.kcfg
+++ b/kcalc/kcalc.kcfg
@@ -45,7 +45,7 @@
<group name="Font">
<entry name="Font" type="Font">
<label>The font to use in the display.</label>
- <default code="true">TQFont(KGlobalSettings::generalFont().family(), 14, TQFont::Bold)</default>
+ <default code="true">TQFont(TDEGlobalSettings::generalFont().family(), 14, TQFont::Bold)</default>
</entry>
</group>
<group name="Precision">
diff --git a/kcalc/kcalcdisplay.cpp b/kcalc/kcalcdisplay.cpp
index 17ad67a..f768ffa 100644
--- a/kcalc/kcalcdisplay.cpp
+++ b/kcalc/kcalcdisplay.cpp
@@ -268,10 +268,10 @@ void KCalcDisplay::setText(TQString const &string)
// truncating, formatting and appending again
if (string.endsWith(".")) {
localizedString.truncate(localizedString.length() - 1);
- localizedString = KGlobal::locale()->formatNumber(localizedString, false, 0); // Note: rounding happened already above!
- localizedString.append(KGlobal::locale()->decimalSymbol());
+ localizedString = TDEGlobal::locale()->formatNumber(localizedString, false, 0); // Note: rounding happened already above!
+ localizedString.append(TDEGlobal::locale()->decimalSymbol());
} else
- localizedString = KGlobal::locale()->formatNumber(string, false, 0); // Note: rounding happened already above!
+ localizedString = TDEGlobal::locale()->formatNumber(string, false, 0); // Note: rounding happened already above!
TQLabel::setText(localizedString);
emit changedText(localizedString);