diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:44:46 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:44:46 -0600 |
| commit | cee429821aa6f1acc97fb482d325fb4eb37376ca (patch) | |
| tree | 4f55e04b7f000c854fe2b8347dcdb62d97de3c73 /kbruch/src | |
| parent | ab801f72ab45e8066a8ec6c533ef13c2da67e559 (diff) | |
| download | tdeedu-cee429821aa6f1acc97fb482d325fb4eb37376ca.tar.gz tdeedu-cee429821aa6f1acc97fb482d325fb4eb37376ca.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kbruch/src')
| -rw-r--r-- | kbruch/src/exerciseconvert.cpp | 38 | ||||
| -rw-r--r-- | kbruch/src/kbruch.kcfg | 2 |
2 files changed, 20 insertions, 20 deletions
diff --git a/kbruch/src/exerciseconvert.cpp b/kbruch/src/exerciseconvert.cpp index a3b61ab1..cb3843e5 100644 --- a/kbruch/src/exerciseconvert.cpp +++ b/kbruch/src/exerciseconvert.cpp @@ -224,98 +224,98 @@ void ExerciseConvert::createTask() // rational numbers to fractions, but it is not worth the effort here switch(int((double(rand()) / RAND_MAX) * 18 + 1)) { - case 0 : m_number = KGlobal::locale()->formatNumber(0.5, 1); + case 0 : m_number = TDEGlobal::locale()->formatNumber(0.5, 1); m_periodStart = 2; m_periodLength = 0; m_result = ratio(1, 2); break; - case 1 : m_number = KGlobal::locale()->formatNumber(0.3, 1); + case 1 : m_number = TDEGlobal::locale()->formatNumber(0.3, 1); m_periodStart = 2; m_periodLength = 1; m_result = ratio(1, 3); break; - case 2 : m_number = KGlobal::locale()->formatNumber(0.6, 1); + case 2 : m_number = TDEGlobal::locale()->formatNumber(0.6, 1); m_periodStart = 2; m_periodLength = 1; m_result = ratio(2, 3); break; - case 3 : m_number = KGlobal::locale()->formatNumber(0.25, 2); + case 3 : m_number = TDEGlobal::locale()->formatNumber(0.25, 2); m_periodStart = 2; m_periodLength = 0; m_result = ratio(1, 4); break; - case 4 : m_number = KGlobal::locale()->formatNumber(0.75, 2); + case 4 : m_number = TDEGlobal::locale()->formatNumber(0.75, 2); m_periodStart = 2; m_periodLength = 0; m_result = ratio(3, 4); break; - case 5 : m_number = KGlobal::locale()->formatNumber(0.2, 1); + case 5 : m_number = TDEGlobal::locale()->formatNumber(0.2, 1); m_periodStart = 2; m_periodLength = 0; m_result = ratio(1, 5); break; - case 6 : m_number = KGlobal::locale()->formatNumber(0.4, 1); + case 6 : m_number = TDEGlobal::locale()->formatNumber(0.4, 1); m_periodStart = 2; m_periodLength = 0; m_result = ratio(2, 5); break; - case 7 : m_number = KGlobal::locale()->formatNumber(0.6, 1); + case 7 : m_number = TDEGlobal::locale()->formatNumber(0.6, 1); m_periodStart = 2; m_periodLength = 0; m_result = ratio(3, 5); break; - case 8 : m_number = KGlobal::locale()->formatNumber(0.8, 1); + case 8 : m_number = TDEGlobal::locale()->formatNumber(0.8, 1); m_periodStart = 2; m_periodLength = 0; m_result = ratio(4, 5); break; - case 9 : m_number = KGlobal::locale()->formatNumber(0.16, 2); + case 9 : m_number = TDEGlobal::locale()->formatNumber(0.16, 2); m_periodStart = 3; m_periodLength = 1; m_result = ratio(1, 6); break; - case 10 : m_number = KGlobal::locale()->formatNumber(0.142857, 6); + case 10 : m_number = TDEGlobal::locale()->formatNumber(0.142857, 6); m_periodStart = 2; m_periodLength = 6; m_result = ratio(1, 7); break; - case 11 : m_number = KGlobal::locale()->formatNumber(0.125, 3); + case 11 : m_number = TDEGlobal::locale()->formatNumber(0.125, 3); m_periodStart = 2; m_periodLength = 0; m_result = ratio(1, 8); break; - case 12 : m_number = KGlobal::locale()->formatNumber(0.375, 3); + case 12 : m_number = TDEGlobal::locale()->formatNumber(0.375, 3); m_periodStart = 2; m_periodLength = 0; m_result = ratio(3, 8); break; - case 13 : m_number = KGlobal::locale()->formatNumber(0.1, 1); + case 13 : m_number = TDEGlobal::locale()->formatNumber(0.1, 1); m_periodStart = 2; m_periodLength = 1; m_result = ratio(1, 9); break; - case 14 : m_number = KGlobal::locale()->formatNumber(0.1, 1); + case 14 : m_number = TDEGlobal::locale()->formatNumber(0.1, 1); m_periodStart = 2; m_periodLength = 0; m_result = ratio(1, 10); break; - case 15 : m_number = KGlobal::locale()->formatNumber(0.05, 2); + case 15 : m_number = TDEGlobal::locale()->formatNumber(0.05, 2); m_periodStart = 2; m_periodLength = 0; m_result = ratio(1, 20); break; - case 16 : m_number = KGlobal::locale()->formatNumber(0.01, 2); + case 16 : m_number = TDEGlobal::locale()->formatNumber(0.01, 2); m_periodStart = 2; m_periodLength = 0; m_result = ratio(1, 100); break; - case 17 : m_number = KGlobal::locale()->formatNumber(0.83, 2); + case 17 : m_number = TDEGlobal::locale()->formatNumber(0.83, 2); m_periodStart = 3; m_periodLength = 1; m_result = ratio(5, 6); break; default : - case 18 : m_number = KGlobal::locale()->formatNumber(0.001, 3); + case 18 : m_number = TDEGlobal::locale()->formatNumber(0.001, 3); m_periodStart = 2; m_periodLength = 0; m_result = ratio(1, 1000); diff --git a/kbruch/src/kbruch.kcfg b/kbruch/src/kbruch.kcfg index 98103a2a..ae13463d 100644 --- a/kbruch/src/kbruch.kcfg +++ b/kbruch/src/kbruch.kcfg @@ -68,7 +68,7 @@ <entry type="Font" key="taskFont"> <label>Font used for the task view</label> <whatsthis>Font used for the task view</whatsthis> - <default code="true">KGlobalSettings::generalFont()</default> + <default code="true">TDEGlobalSettings::generalFont()</default> </entry> <entry type="Bool" key="showSpecialRatioNotation"> <label>Enable showing the result also as a mixed number</label> |