Git commit f13ca1724057a779e789ef2b21b0f4fe08241848 by Sebastian Stein. Committed on 28/02/2014 at 22:45. Pushed by sstein into branch 'renaming'. camel case classes and sources - camel case all classes - camel case all source files - ignore KDevelop settings file and directory M +2 -0 .gitignore M +1 -1 src/AppMenuWidget.h M +18 -18 src/CMakeLists.txt R +3 -3 src/ExerciseBase.cpp [from: src/exercisebase.cpp - 092% simi= larity] R +1 -1 src/ExerciseBase.h [from: src/exercisebase.h - 096% similari= ty] R +5 -5 src/ExerciseCompare.cpp [from: src/exercisecompare.cpp - 097= % similarity] R +7 -7 src/ExerciseCompare.h [from: src/exercisecompare.h - 094% si= milarity] R +25 -25 src/ExerciseConvert.cpp [from: src/exerciseconvert.cpp - 094= % similarity] R +4 -4 src/ExerciseConvert.h [from: src/exerciseconvert.h - 096% si= milarity] R +10 -10 src/ExerciseFactorize.cpp [from: src/exercisefactorize.cpp -= 098% similarity] R +4 -4 src/ExerciseFactorize.h [from: src/exercisefactorize.h - 097= % similarity] M +7 -7 src/ExerciseMixedNumbers.cpp M +5 -5 src/ExerciseMixedNumbers.h R +7 -7 src/ExercisePercentage.cpp [from: src/exercisepercentage.cpp= - 098% similarity] R +4 -4 src/ExercisePercentage.h [from: src/exercisepercentage.h - 0= 96% similarity] R +4 -4 src/FractionBaseWidget.cpp [from: src/fractionbasewidget.cpp= - 097% similarity] R +3 -3 src/FractionBaseWidget.h [from: src/fractionbasewidget.h - 0= 94% similarity] M +4 -4 src/FractionPainter.cpp M +6 -6 src/FractionPainter.h M +4 -4 src/FractionRingWidget.cpp M +4 -4 src/FractionRingWidget.h R +3 -3 src/KBruch.cpp [from: src/kbruch.cpp - 096% similarity] R +3 -3 src/KBruch.h [from: src/kbruch.h - 094% similarity] R +0 -0 src/KBruchVersion.h [from: src/kbruch_version.h - 100% simil= arity] R +9 -9 src/MainQtWidget.cpp [from: src/mainqtwidget.cpp - 099% simi= larity] R +1 -1 src/MainQtWidget.h [from: src/mainqtwidget.h - 099% similari= ty] R +16 -16 src/PrimeNumber.cpp [from: src/primenumber.cpp - 090% simila= rity] R +4 -4 src/PrimeNumber.h [from: src/primenumber.h - 096% similarity] R +35 -35 src/Ratio.cpp [from: src/ratio.cpp - 087% similarity] R +15 -15 src/Ratio.h [from: src/ratio.h - 085% similarity] R +5 -5 src/RatioWidget.cpp [from: src/ratiowidget.cpp - 092% simila= rity] R +6 -6 src/RatioWidget.h [from: src/ratiowidget.h - 087% similarity] R +3 -3 src/RationalWidget.cpp [from: src/rationalwidget.cpp - 097% = similarity] R +2 -2 src/RationalWidget.h [from: src/rationalwidget.h - 095% simi= larity] R +5 -5 src/ResultWidget.cpp [from: src/resultwidget.cpp - 097% simi= larity] R +6 -6 src/ResultWidget.h [from: src/resultwidget.h - 090% similari= ty] R +3 -3 src/StatisticsBarWidget.cpp [from: src/statisticsbarwidget.c= pp - 097% similarity] R +1 -1 src/StatisticsBarWidget.h [from: src/statisticsbarwidget.h -= 097% similarity] R +4 -4 src/StatisticsView.cpp [from: src/statisticsview.cpp - 097% = similarity] R +1 -1 src/StatisticsView.h [from: src/statisticsview.h - 097% simi= larity] R +34 -34 src/Task.cpp [from: src/task.cpp - 093% similarity] R +13 -13 src/Task.h [from: src/task.h - 091% similarity] M +1 -1 src/TaskColors.h R +6 -6 src/TaskView.cpp [from: src/taskview.cpp - 098% similarity] R +8 -8 src/TaskView.h [from: src/taskview.h - 094% similarity] R +5 -5 src/TaskWidget.cpp [from: src/taskwidget.cpp - 095% similari= ty] R +6 -6 src/TaskWidget.h [from: src/taskwidget.h - 088% similarity] M +1 -1 src/kbruch.kcfg http://commits.kde.org/kbruch/f13ca1724057a779e789ef2b21b0f4fe08241848 diff --git a/.gitignore b/.gitignore index d5a1572..0f55fbb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ *.swp build +.kdev4 +kbruch.kdev4 diff --git a/src/AppMenuWidget.h b/src/AppMenuWidget.h index 60b30e1..366e149 100644 --- a/src/AppMenuWidget.h +++ b/src/AppMenuWidget.h @@ -28,7 +28,7 @@ = #include = -#include "mainqtwidget.h" +#include "MainQtWidget.h" #include "FractionRingWidget.h" = class QHBoxLayout; diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bb00992..6d106df 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -6,25 +6,25 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ) = set(kbruch_SRCS PrimeFactorsLineEdit.cpp - exercisebase.cpp = - task.cpp = - ratio.cpp = - taskview.cpp = - statisticsview.cpp = - primenumber.cpp = - kbruch.cpp = - mainqtwidget.cpp = - taskwidget.cpp = - fractionbasewidget.cpp = - resultwidget.cpp = - exercisecompare.cpp = - exercisepercentage.cpp = + ExerciseBase.cpp + Task.cpp + Ratio.cpp + TaskView.cpp + StatisticsView.cpp + PrimeNumber.cpp + KBruch.cpp + MainQtWidget.cpp + TaskWidget.cpp + FractionBaseWidget.cpp + ResultWidget.cpp + ExerciseCompare.cpp + ExercisePercentage.cpp ExerciseMixedNumbers.cpp - ratiowidget.cpp = - rationalwidget.cpp = - exerciseconvert.cpp = - statisticsbarwidget.cpp - exercisefactorize.cpp + RatioWidget.cpp + RationalWidget.cpp + ExerciseConvert.cpp + StatisticsBarWidget.cpp + ExerciseFactorize.cpp AppMenuWidget.cpp FractionPainter.cpp FractionRingWidget.cpp ) diff --git a/src/exercisebase.cpp b/src/ExerciseBase.cpp similarity index 92% rename from src/exercisebase.cpp rename to src/ExerciseBase.cpp index 04ac243..82b8be4 100644 --- a/src/exercisebase.cpp +++ b/src/ExerciseBase.cpp @@ -1,5 +1,5 @@ /*************************************************************************= ** - exercisebase.cpp + ExerciseBase.cpp ------------------- begin : 2004/06/03 copyright : (C) 2004 by Sebastian Stein @@ -15,8 +15,8 @@ * = * *************************************************************************= **/ = -#include "exercisebase.h" -#include "exercisebase.moc" +#include "ExerciseBase.h" +#include "ExerciseBase.moc" = /* these includes are needed for KDE support */ #include diff --git a/src/exercisebase.h b/src/ExerciseBase.h similarity index 96% rename from src/exercisebase.h rename to src/ExerciseBase.h index 0b30343..956e26a 100644 --- a/src/exercisebase.h +++ b/src/ExerciseBase.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - exercisebase.h + ExerciseBase.h ------------------- begin : 2004/06/03 copyright : (C) 2004 by Sebastian Stein diff --git a/src/exercisecompare.cpp b/src/ExerciseCompare.cpp similarity index 97% rename from src/exercisecompare.cpp rename to src/ExerciseCompare.cpp index 633afe1..6af6de7 100644 --- a/src/exercisecompare.cpp +++ b/src/ExerciseCompare.cpp @@ -1,5 +1,5 @@ /*************************************************************************= ** - exercisecompare.cpp + ExerciseCompare.cpp ------------------- begin : 2004/06/03 copyright : (C) 2004 by Sebastian Stein @@ -18,8 +18,8 @@ * = * *************************************************************************= **/ = -#include "exercisecompare.h" -#include "exercisecompare.moc" +#include "ExerciseCompare.h" +#include "ExerciseCompare.moc" = /* these includes are needed for KDE support */ #include @@ -204,12 +204,12 @@ void ExerciseCompare::update() void ExerciseCompare::createTask() { // generate the first ratio - m_firstRatio =3D ratio(int ((double(rand()) / RAND_MAX) * 10 + 1), int= ((double(rand()) / RAND_MAX) * 10 + 1)); + m_firstRatio =3D Ratio(int ((double(rand()) / RAND_MAX) * 10 + 1), int= ((double(rand()) / RAND_MAX) * 10 + 1)); = // now the second ratio, but make sure, the second ratio is different = from // the first one do { - m_secondRatio =3D ratio(int ((double(rand()) / RAND_MAX) * 10 + 1)= , int ((double(rand()) / RAND_MAX) * 10 + 1)); + m_secondRatio =3D Ratio(int ((double(rand()) / RAND_MAX) * 10 + 1)= , int ((double(rand()) / RAND_MAX) * 10 + 1)); } while (m_firstRatio =3D=3D m_secondRatio); = return; diff --git a/src/exercisecompare.h b/src/ExerciseCompare.h similarity index 94% rename from src/exercisecompare.h rename to src/ExerciseCompare.h index 208c466..6a39b46 100644 --- a/src/exercisecompare.h +++ b/src/ExerciseCompare.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - exercisecompare.h + ExerciseCompare.h ------------------- begin : 2004/06/03 copyright : (C) 2004 by Sebastian Stein @@ -27,10 +27,10 @@ #include #endif = -#include "exercisebase.h" -#include "ratio.h" -#include "ratiowidget.h" -#include "resultwidget.h" +#include "ExerciseBase.h" +#include "Ratio.h" +#include "RatioWidget.h" +#include "ResultWidget.h" //Added by qt3to4: #include #include @@ -94,8 +94,8 @@ private: QPushButton * m_minorButton; QPushButton * m_equalButton; = - ratio m_firstRatio; - ratio m_secondRatio; + Ratio m_firstRatio; + Ratio m_secondRatio; = // Layout Structures QGridLayout * checkLayout; diff --git a/src/exerciseconvert.cpp b/src/ExerciseConvert.cpp similarity index 94% rename from src/exerciseconvert.cpp rename to src/ExerciseConvert.cpp index 84f671e..17f1ae0 100644 --- a/src/exerciseconvert.cpp +++ b/src/ExerciseConvert.cpp @@ -1,5 +1,5 @@ /*************************************************************************= ** - exerciseconvert.cpp + ExerciseConvert.cpp ------------------- begin : 2004/06/04 copyright : (C) 2004 by Sebastian Stein @@ -18,8 +18,8 @@ * = * *************************************************************************= **/ = -#include "exerciseconvert.h" -#include "exerciseconvert.moc" +#include "ExerciseConvert.h" +#include "ExerciseConvert.moc" = /* these includes are needed for KDE support */ #include @@ -40,8 +40,8 @@ /* standard C++ library includes */ #include = -#include "rationalwidget.h" -#include "resultwidget.h" +#include "RationalWidget.h" +#include "ResultWidget.h" #include "settingsclass.h" = /* ----- public member functions ----- */ @@ -215,98 +215,98 @@ void ExerciseConvert::createTask() case 0 : m_number =3D KGlobal::locale()->formatNumber(0.5, 1); m_periodStart =3D 2; m_periodLength =3D 0; - m_result =3D ratio(1, 2); + m_result =3D Ratio(1, 2); break; case 1 : m_number =3D KGlobal::locale()->formatNumber(0.3, 1); m_periodStart =3D 2; m_periodLength =3D 1; - m_result =3D ratio(1, 3); + m_result =3D Ratio(1, 3); break; case 2 : m_number =3D KGlobal::locale()->formatNumber(0.6, 1); m_periodStart =3D 2; m_periodLength =3D 1; - m_result =3D ratio(2, 3); + m_result =3D Ratio(2, 3); break; case 3 : m_number =3D KGlobal::locale()->formatNumber(0.25, 2); m_periodStart =3D 2; m_periodLength =3D 0; - m_result =3D ratio(1, 4); + m_result =3D Ratio(1, 4); break; case 4 : m_number =3D KGlobal::locale()->formatNumber(0.75, 2); m_periodStart =3D 2; m_periodLength =3D 0; - m_result =3D ratio(3, 4); + m_result =3D Ratio(3, 4); break; case 5 : m_number =3D KGlobal::locale()->formatNumber(0.2, 1); m_periodStart =3D 2; m_periodLength =3D 0; - m_result =3D ratio(1, 5); + m_result =3D Ratio(1, 5); break; case 6 : m_number =3D KGlobal::locale()->formatNumber(0.4, 1); m_periodStart =3D 2; m_periodLength =3D 0; - m_result =3D ratio(2, 5); + m_result =3D Ratio(2, 5); break; case 7 : m_number =3D KGlobal::locale()->formatNumber(0.6, 1); m_periodStart =3D 2; m_periodLength =3D 0; - m_result =3D ratio(3, 5); + m_result =3D Ratio(3, 5); break; case 8 : m_number =3D KGlobal::locale()->formatNumber(0.8, 1); m_periodStart =3D 2; m_periodLength =3D 0; - m_result =3D ratio(4, 5); + m_result =3D Ratio(4, 5); break; case 9 : m_number =3D KGlobal::locale()->formatNumber(0.16, 2); m_periodStart =3D 3; m_periodLength =3D 1; - m_result =3D ratio(1, 6); + m_result =3D Ratio(1, 6); break; case 10 : m_number =3D KGlobal::locale()->formatNumber(0.142857, 6); m_periodStart =3D 2; m_periodLength =3D 6; - m_result =3D ratio(1, 7); + m_result =3D Ratio(1, 7); break; case 11 : m_number =3D KGlobal::locale()->formatNumber(0.125, 3); m_periodStart =3D 2; m_periodLength =3D 0; - m_result =3D ratio(1, 8); + m_result =3D Ratio(1, 8); break; case 12 : m_number =3D KGlobal::locale()->formatNumber(0.375, 3); m_periodStart =3D 2; m_periodLength =3D 0; - m_result =3D ratio(3, 8); + m_result =3D Ratio(3, 8); break; case 13 : m_number =3D KGlobal::locale()->formatNumber(0.1, 1); m_periodStart =3D 2; m_periodLength =3D 1; - m_result =3D ratio(1, 9); + m_result =3D Ratio(1, 9); break; case 14 : m_number =3D KGlobal::locale()->formatNumber(0.1, 1); m_periodStart =3D 2; m_periodLength =3D 0; - m_result =3D ratio(1, 10); + m_result =3D Ratio(1, 10); break; case 15 : m_number =3D KGlobal::locale()->formatNumber(0.05, 2); m_periodStart =3D 2; m_periodLength =3D 0; - m_result =3D ratio(1, 20); + m_result =3D Ratio(1, 20); break; case 16 : m_number =3D KGlobal::locale()->formatNumber(0.01, 2); m_periodStart =3D 2; m_periodLength =3D 0; - m_result =3D ratio(1, 100); + m_result =3D Ratio(1, 100); break; case 17 : m_number =3D KGlobal::locale()->formatNumber(0.83, 2); m_periodStart =3D 3; m_periodLength =3D 1; - m_result =3D ratio(5, 6); + m_result =3D Ratio(5, 6); break; default : case 18 : m_number =3D KGlobal::locale()->formatNumber(0.001, 3); m_periodStart =3D 2; m_periodLength =3D 0; - m_result =3D ratio(1, 1000); + m_result =3D Ratio(1, 1000); break; } = @@ -319,7 +319,7 @@ void ExerciseConvert::showResult() { QString tmp_str; /* to build a string for a label */ QPalette pal; - ratio entered_result; + Ratio entered_result; = // change the tooltip of the check button m_checkButton->setToolTip(i18n("Click on this button to get to the nex= t question.")); diff --git a/src/exerciseconvert.h b/src/ExerciseConvert.h similarity index 96% rename from src/exerciseconvert.h rename to src/ExerciseConvert.h index 9cb4ee6..db449a6 100644 --- a/src/exerciseconvert.h +++ b/src/ExerciseConvert.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - exerciseconvert.h + ExerciseConvert.h ------------------- begin : 2004/06/04 copyright : (C) 2004 by Sebastian Stein @@ -25,8 +25,8 @@ #include #endif = -#include "exercisebase.h" -#include "ratio.h" +#include "ExerciseBase.h" +#include "Ratio.h" //Added by qt3to4: #include #include @@ -81,7 +81,7 @@ private: QString m_number; uint m_periodStart; uint m_periodLength; - ratio m_result; + Ratio m_result; = // Visible components RationalWidget * m_rationalWidget; diff --git a/src/exercisefactorize.cpp b/src/ExerciseFactorize.cpp similarity index 98% rename from src/exercisefactorize.cpp rename to src/ExerciseFactorize.cpp index 577c937..f51a5f3 100644 --- a/src/exercisefactorize.cpp +++ b/src/ExerciseFactorize.cpp @@ -1,5 +1,5 @@ /*************************************************************************= ** - exercisefactorize.cpp + ExerciseFactorize.cpp ------------------- begin : 2004/06/04 copyright : (C) 2004 by Sebastian Stein @@ -18,8 +18,8 @@ * = * *************************************************************************= **/ = -#include "exercisefactorize.h" -#include "exercisefactorize.moc" +#include "ExerciseFactorize.h" +#include "ExerciseFactorize.moc" = /* these includes are needed for KDE support */ #include @@ -40,9 +40,9 @@ #include = #include "PrimeFactorsLineEdit.h" -#include "primenumber.h" -#include "rationalwidget.h" -#include "resultwidget.h" +#include "PrimeNumber.h" +#include "RationalWidget.h" +#include "ResultWidget.h" #include "settingsclass.h" = /* ----- public member functions ----- */ @@ -333,7 +333,7 @@ void ExerciseFactorize::update() void ExerciseFactorize::createTask() { uint uint_number; - primenumber tmp_primenumber; + PrimeNumber tmp_primenumber; = // just pick one number out of the possible numbers to factorize m_taskNumber =3D possibleTasks[uint((double(rand()) / RAND_MAX) * numb= erPossibleTasks)]; @@ -399,13 +399,13 @@ void ExerciseFactorize::showResult() signalExerciseSolvedCorrect(); = /* yes, the user entered the correct result */ - m_resultWidget->setResult(ratio(), 1); + m_resultWidget->setResult(Ratio(), 1); } else { // emit the signal for wrong signalExerciseSolvedWrong(); = /* no, the user entered the wrong result */ - m_resultWidget->setResult(ratio(), 0); + m_resultWidget->setResult(Ratio(), 0); } /* if (entered_result =3D=3D result) */ = m_edit =3D false; @@ -433,7 +433,7 @@ void ExerciseFactorize::nextTask() // disable the factor removal button, there are no factors to be remov= ed yet m_removeLastFactorButton->setEnabled(false); = - m_resultWidget->setResult(ratio(), -1); + m_resultWidget->setResult(Ratio(), -1); = /* clear user input */ m_factorsEntered.clear(); diff --git a/src/exercisefactorize.h b/src/ExerciseFactorize.h similarity index 97% rename from src/exercisefactorize.h rename to src/ExerciseFactorize.h index ff763c4..72d8181 100644 --- a/src/exercisefactorize.h +++ b/src/ExerciseFactorize.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - exercisefactorize.h + ExerciseFactorize.h ------------------- begin : 2004/06/04 copyright : (C) 2004 by Sebastian Stein @@ -33,9 +33,9 @@ #include #include = -#include "exercisebase.h" -#include "resultwidget.h" -#include "ratio.h" +#include "ExerciseBase.h" +#include "ResultWidget.h" +#include "Ratio.h" #include "PrimeFactorsLineEdit.h" = class ResultWidget; diff --git a/src/ExerciseMixedNumbers.cpp b/src/ExerciseMixedNumbers.cpp index 518cfe9..8001423 100644 --- a/src/ExerciseMixedNumbers.cpp +++ b/src/ExerciseMixedNumbers.cpp @@ -147,7 +147,7 @@ ExerciseMixedNumbers::ExerciseMixedNumbers(QWidget * pa= rent) : // set up check layout // // add result widget - m_resultWidget =3D new ResultWidget(m_checkWidget, ratio()); + m_resultWidget =3D new ResultWidget(m_checkWidget, Ratio()); m_resultWidget->setObjectName("m_resultWidget"); m_checkLayout->addWidget(m_resultWidget, 0, 0, 1, 2); = @@ -211,7 +211,7 @@ void ExerciseMixedNumbers::createTask() // - reduced // - numerator is larger than denominator // - denominator is not 1 - ratio tmpRatio =3D ratio(); + Ratio tmpRatio =3D Ratio(); int numerator =3D 0; int denominator =3D 1; do { @@ -229,7 +229,7 @@ void ExerciseMixedNumbers::createTask() } while (tmpRatio.denominator() =3D=3D 1); = // store new task - m_task =3D task(); + m_task =3D Task(); m_task.add_ratio(tmpRatio); = return; @@ -248,10 +248,10 @@ void ExerciseMixedNumbers::nextTask() = // update the task widget m_taskWidget->setQuestionMixed(m_isMixedTask); - m_taskWidget->setTask((const task) m_task); + m_taskWidget->setTask((const Task) m_task); = // hide result widget - m_resultWidget->setResult(ratio(), -1); + m_resultWidget->setResult(Ratio(), -1); = // change check button m_checkButton->setToolTip(i18n("Click this button to check your result= . The button will not work if you have not entered a result yet.")); @@ -330,12 +330,12 @@ void ExerciseMixedNumbers::showResult() } = // create result ratio, but don't try to reduce it yet - ratio resultRatio =3D ratio(); + Ratio resultRatio =3D Ratio(); resultRatio.setRatio(resultInteger, resultNumerator, resultDenominator, false); = // check for correct solution - ratio solutionRatio =3D m_task.get_ratio_n(0); + Ratio solutionRatio =3D m_task.get_ratio_n(0); if (!(resultRatio =3D=3D solutionRatio)) { wrong =3D true; } diff --git a/src/ExerciseMixedNumbers.h b/src/ExerciseMixedNumbers.h index 9bbb484..525367e 100644 --- a/src/ExerciseMixedNumbers.h +++ b/src/ExerciseMixedNumbers.h @@ -25,10 +25,10 @@ #include #endif = -#include "exercisebase.h" -#include "resultwidget.h" -#include "task.h" -#include "taskwidget.h" +#include "ExerciseBase.h" +#include "ResultWidget.h" +#include "Task.h" +#include "TaskWidget.h" = = class KLineEdit; @@ -76,7 +76,7 @@ private: bool m_isMixedTask; = /** task currently to be solved */ - task m_task; + Task m_task; = // components to enter result KLineEdit * m_integerEdit; diff --git a/src/exercisepercentage.cpp b/src/ExercisePercentage.cpp similarity index 98% rename from src/exercisepercentage.cpp rename to src/ExercisePercentage.cpp index c6a814b..d0175d1 100644 --- a/src/exercisepercentage.cpp +++ b/src/ExercisePercentage.cpp @@ -1,5 +1,5 @@ /*************************************************************************= ** - exercisepercentage.cpp + ExercisePercentage.cpp ------------------- begin : 2008/10/10 copyright : (C) 2008 by Tiago Porangaba @@ -15,8 +15,8 @@ * = * *************************************************************************= **/ = -#include "exercisepercentage.h" -#include "exercisepercentage.moc" +#include "ExercisePercentage.h" +#include "ExercisePercentage.moc" = /* these includes are needed for KDE support */ #include @@ -37,8 +37,8 @@ /* standard C++ library includes */ #include = -#include "rationalwidget.h" -#include "resultwidget.h" +#include "RationalWidget.h" +#include "ResultWidget.h" #include "settingsclass.h" = /* ----- public member functions ----- */ @@ -326,8 +326,8 @@ void ExercisePercentage::showResult() QString tmp_str; /* to build a string for a label */ QPalette pal; int tmp_result; - ratio entered_result; - ratio correct_result; + Ratio entered_result; + Ratio correct_result; = // change the tooltip of the check button m_checkButton->setToolTip(i18n("Click on this button to get to the nex= t question.")); diff --git a/src/exercisepercentage.h b/src/ExercisePercentage.h similarity index 96% rename from src/exercisepercentage.h rename to src/ExercisePercentage.h index 45c3dd0..cf83fdc 100644 --- a/src/exercisepercentage.h +++ b/src/ExercisePercentage.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - exercisepercentage.h + ExercisePercentage.h ------------------- begin : 2008/10/10 copyright : (C) 2008 by Tiago Porangaba @@ -22,8 +22,8 @@ #include #endif = -#include "exercisebase.h" -#include "ratio.h" +#include "ExerciseBase.h" +#include "Ratio.h" //Added by qt3to4: #include #include @@ -76,7 +76,7 @@ signals: private: short m_currentState; = - ratio m_result; + Ratio m_result; = QString m_numberPercentage; QString m_numberPercentageOf; diff --git a/src/fractionbasewidget.cpp b/src/FractionBaseWidget.cpp similarity index 97% rename from src/fractionbasewidget.cpp rename to src/FractionBaseWidget.cpp index 8b41bf1..2a9c5db 100644 --- a/src/fractionbasewidget.cpp +++ b/src/FractionBaseWidget.cpp @@ -1,5 +1,5 @@ /*************************************************************************= ** - fractionbasewidget.cpp - base fraction painting + FractionBaseWidget.cpp - base fraction painting ------------------- begin : 2004/05/30 copyright : (C) 2004 by Sebastian Stein @@ -19,8 +19,8 @@ * = * *************************************************************************= **/ = -#include "fractionbasewidget.h" -#include "fractionbasewidget.moc" +#include "FractionBaseWidget.h" +#include "FractionBaseWidget.moc" = /* these includes are needed for KDE support */ #include @@ -54,7 +54,7 @@ void FractionBaseWidget::updateAndRepaint() update(); } = -void FractionBaseWidget::paintRatio(QPainter & paint, ratio tmp_ratio, int= & x_pos, int & y_pos, QFontMetrics & fm, bool show_mixed, bool addMargin, = bool show_center) +void FractionBaseWidget::paintRatio(QPainter & paint, Ratio tmp_ratio, int= & x_pos, int & y_pos, QFontMetrics & fm, bool show_mixed, bool addMargin, = bool show_center) { QPen pen =3D paint.pen(); // get the pen int fontHeight =3D fm.lineSpacing(); // get the font height diff --git a/src/fractionbasewidget.h b/src/FractionBaseWidget.h similarity index 94% rename from src/fractionbasewidget.h rename to src/FractionBaseWidget.h index f499c3f..ddf69e1 100644 --- a/src/fractionbasewidget.h +++ b/src/FractionBaseWidget.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - fractionbasewidget.h - base fraction painting + FractionBaseWidget.h - base fraction painting ------------------- begin : 2004/05/30 copyright : (C) 2004 by Sebastian Stein @@ -29,7 +29,7 @@ #include #endif = -#include "ratio.h" +#include "Ratio.h" = #include //Added by qt3to4: @@ -70,7 +70,7 @@ protected: //virtual void paintEvent(QPaintEvent*) =3D 0; = /** paints a ratio at the given position */ - void paintRatio(QPainter & paint, ratio tmp_ratio, int & x_pos, int & = y_pos, QFontMetrics & fm, bool addMargin =3D true, bool show_mixed =3D true= , bool show_center =3D false); + void paintRatio(QPainter & paint, Ratio tmp_ratio, int & x_pos, int & = y_pos, QFontMetrics & fm, bool addMargin =3D true, bool show_mixed =3D true= , bool show_center =3D false); = /** paints a string in the vertical middle (aligned to the operation s= igns) */ void paintMiddle(QPainter & paint, const QString& paint_str, int & x_p= os, int & y_pos, QFontMetrics & fm, const QColor &color, bool addMargin =3D= true); diff --git a/src/FractionPainter.cpp b/src/FractionPainter.cpp index 66362e4..3da887d 100644 --- a/src/FractionPainter.cpp +++ b/src/FractionPainter.cpp @@ -49,8 +49,8 @@ void FractionPainter::paintEvent(QPaintEvent *) paintWidget(paint); } = -void FractionPainter::paintFraction(const QString & op, ratio & lr, int lm, - ratio & rr, int rm) +void FractionPainter::paintFraction(const QString & op, Ratio & lr, int lm, + Ratio & rr, int rm) { str_operation =3D op; leftRatio =3D lr; @@ -86,7 +86,7 @@ void FractionPainter::paintWidget(QPainter & paint) setMaximumHeight(2 * fm.lineSpacing() + 10); = // get the current ratio and paint it - paintRatio(paint, ratio(leftRatio.numerator() * leftMult, leftRatio.de= nominator() * leftMult, false), old_x, old_y, fm); + paintRatio(paint, Ratio(leftRatio.numerator() * leftMult, leftRatio.de= nominator() * leftMult, false), old_x, old_y, fm); = if (leftRatio.denominator() * leftMult < 10) old_x +=3D 40; @@ -102,7 +102,7 @@ void FractionPainter::paintWidget(QPainter & paint) old_x +=3D 25; = // get the current ratio and paint it - paintRatio(paint, ratio(rightRatio.numerator() * rightMult, rightRatio= .denominator() * rightMult, false), old_x, old_y, fm); + paintRatio(paint, Ratio(rightRatio.numerator() * rightMult, rightRatio= .denominator() * rightMult, false), old_x, old_y, fm); = // stop the painter paint.end(); diff --git a/src/FractionPainter.h b/src/FractionPainter.h index a1ea2f7..c9179df 100644 --- a/src/FractionPainter.h +++ b/src/FractionPainter.h @@ -27,8 +27,8 @@ #include #endif = -#include "ratio.h" -#include "ratiowidget.h" +#include "Ratio.h" +#include "RatioWidget.h" = #include //Added by qt3to4: @@ -51,8 +51,8 @@ public: /** destructor */ ~FractionPainter(); = - void paintFraction(const QString & str_operation, ratio & leftRatio, i= nt leftMult, - ratio & rightRatio, int rightMult); + void paintFraction(const QString & str_operation, Ratio & leftRatio, i= nt leftMult, + Ratio & rightRatio, int rightMult); protected: /** Function is called every time the screen need to be painted. **/ @@ -61,9 +61,9 @@ protected: = private: QString str_operation; - ratio leftRatio; + Ratio leftRatio; int leftMult; - ratio rightRatio; + Ratio rightRatio; int rightMult; = public slots: diff --git a/src/FractionRingWidget.cpp b/src/FractionRingWidget.cpp index a9550b9..11f80a4 100644 --- a/src/FractionRingWidget.cpp +++ b/src/FractionRingWidget.cpp @@ -1,5 +1,5 @@ /*************************************************************************= ** - fractionringwidget.cpp + FractionRingWidget.cpp ------------------- begin : 2008/09/16 copyright : (C) 2008 by Danilo Balzaque @@ -41,7 +41,7 @@ #include #include = -#include "ratio.h" +#include "Ratio.h" #include "FractionPainter.h" #include "ui_taskfontsbase.h" #include "settingsclass.h" @@ -416,14 +416,14 @@ void FractionRingWidget::resetFraction(bool flag =3D = true) int denominator =3D int ((double(rand()) / RAND_MAX) * 5) + 2; int numerator =3D int ((double(rand()) / RAND_MAX) * (denominator - 1)= ) + 1; = - rLeft =3D ratio(numerator, denominator, false); + rLeft =3D Ratio(numerator, denominator, false); = int denominator2 =3D int ((double(rand()) / RAND_MAX) * 5) + 2; while (denominator2 =3D=3D denominator) { denominator2 =3D int ((double(rand()) / RAND_MAX) * 5) + 2; } int numerator2 =3D int ((double(rand()) / RAND_MAX) * (denominator2 - = 1)) + 1; - rRight =3D ratio(numerator2, denominator2, false); + rRight =3D Ratio(numerator2, denominator2, false); = multLeft =3D 1; multRight =3D 1; diff --git a/src/FractionRingWidget.h b/src/FractionRingWidget.h index a1b5c46..0611f7a 100644 --- a/src/FractionRingWidget.h +++ b/src/FractionRingWidget.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - fractionringwidget.h + FractionRingWidget.h ------------------- begin : 2008/09/16 copyright : (C) 2008 by Danilo Balzaque @@ -38,7 +38,7 @@ #include = #include "AppMenuWidget.h" -#include "ratio.h" +#include "Ratio.h" #include "FractionPainter.h" = class KAction; @@ -108,8 +108,8 @@ private: KAction * m_BackAction; KAction * m_HintAction; = - ratio rLeft; - ratio rRight; + Ratio rLeft; + Ratio rRight; = int numLeft; int denLeft; diff --git a/src/kbruch.cpp b/src/KBruch.cpp similarity index 96% rename from src/kbruch.cpp rename to src/KBruch.cpp index 8019eb9..7d26824 100644 --- a/src/kbruch.cpp +++ b/src/KBruch.cpp @@ -1,5 +1,5 @@ /*************************************************************************= ** - kbruch.cpp - Main File of KBruch + KBruch.cpp - Main File of KBruch ------------------- begin : Tue Nov 27 16:40:42 CET 2001 copyright : (C) 2001 by Sebastian Stein @@ -19,9 +19,9 @@ * = * *************************************************************************= **/ = -#include "kbruch.h" +#include "KBruch.h" = -#include "kbruch_version.h" +#include "KBruchVersion.h" = /* standard C++ library includes */ #include diff --git a/src/kbruch.h b/src/KBruch.h similarity index 94% rename from src/kbruch.h rename to src/KBruch.h index 335fb44..6ecc392 100644 --- a/src/kbruch.h +++ b/src/KBruch.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - kbruch.h - Header File + KBruch.h - Header File ------------------- begin : Tue Nov 27 16:40:42 CET 2001 copyright : (C) 2001 by Sebastian Stein @@ -27,12 +27,12 @@ /* for the I18N_NOOP macro */ #include = -#include "task.h" +#include "Task.h" #include "AppMenuWidget.h" = static const char description[] =3D I18N_NOOP("KBruch"); = -class task; +class Task; = #endif /* ifndef BRUCH_H */ diff --git a/src/kbruch_version.h b/src/KBruchVersion.h similarity index 100% rename from src/kbruch_version.h rename to src/KBruchVersion.h diff --git a/src/mainqtwidget.cpp b/src/MainQtWidget.cpp similarity index 99% rename from src/mainqtwidget.cpp rename to src/MainQtWidget.cpp index dec37fd..20740f3 100644 --- a/src/mainqtwidget.cpp +++ b/src/MainQtWidget.cpp @@ -1,5 +1,5 @@ /*************************************************************************= ** - mainqtwidget.cpp - The main Qt/KDE window + MainQtWidget.cpp - The main Qt/KDE window ------------------- begin : Tue Mar 16 00:00:00 CET 2003 copyright : (C) 2003-2004 by Sebastian Stein @@ -18,7 +18,7 @@ * (at your option) any later version. = * * = * *************************************************************************= **/ -#include "mainqtwidget.h" +#include "MainQtWidget.h" = #include #include @@ -47,14 +47,14 @@ = #include = -#include "exercisecompare.h" -#include "exerciseconvert.h" -#include "exercisefactorize.h" -#include "exercisepercentage.h" +#include "ExerciseCompare.h" +#include "ExerciseConvert.h" +#include "ExerciseFactorize.h" +#include "ExercisePercentage.h" #include "ExerciseMixedNumbers.h" -#include "taskview.h" +#include "TaskView.h" #include "ui_taskfontsbase.h" -#include "statisticsview.h" +#include "StatisticsView.h" #include "AppMenuWidget.h" #include "TaskColors.h" = @@ -999,4 +999,4 @@ void MainQtWidget::goBack() close(); } = -#include "mainqtwidget.moc" +#include "MainQtWidget.moc" diff --git a/src/mainqtwidget.h b/src/MainQtWidget.h similarity index 99% rename from src/mainqtwidget.h rename to src/MainQtWidget.h index 5b931cf..7d25921 100644 --- a/src/mainqtwidget.h +++ b/src/MainQtWidget.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - mainqtwidget.h - The main Qt/KDE window + MainQtWidget.h - The main Qt/KDE window ------------------- begin : Tue Mar 16 00:00:00 CET 2003 copyright : (C) 2003-2004 by Sebastian Stein diff --git a/src/primenumber.cpp b/src/PrimeNumber.cpp similarity index 90% rename from src/primenumber.cpp rename to src/PrimeNumber.cpp index 29d3e2d..d6f9f8a 100644 --- a/src/primenumber.cpp +++ b/src/PrimeNumber.cpp @@ -1,5 +1,5 @@ /*************************************************************************= ** - primenumber.cpp - source code of class primenu= mber + PrimeNumber.cpp - source code of class PrimeNu= mber ------------------- begin : Tue Nov 27 16:40:42 CET 2001 copyright : (C) 2001 by Sebastian Stein @@ -15,17 +15,17 @@ * = * *************************************************************************= **/ = -#include "primenumber.h" +#include "PrimeNumber.h" = #include = /* ----- the global prime number vector ----- */ -UnsignedIntArray primenumber::prim_vector; +UnsignedIntArray PrimeNumber::prim_vector; = /* ----- public member functions ----- */ = /* constructor for class primenumber */ -primenumber::primenumber() +PrimeNumber::PrimeNumber() { /* if the vector is empty, we will add the first 2 prime numbers */ if (prim_vector.empty()) { @@ -43,7 +43,7 @@ primenumber::primenumber() } = /* destructor for class primenumber */ -primenumber::~primenumber() +PrimeNumber::~PrimeNumber() { #ifdef DEBUG kDebug() << "destructor primenumber"; @@ -52,7 +52,7 @@ primenumber::~primenumber() = /* check, if the given number is a prime number; * return 0 if no, 1 if yes */ -short primenumber::isPrimeNumber(uint number) +short PrimeNumber::isPrimeNumber(uint number) { #ifdef DEBUG kDebug() << "primenumber::isPrimeNumber(" << number << ")"; @@ -80,7 +80,7 @@ short primenumber::isPrimeNumber(uint number) } = /* returns next prime number */ -unsigned int primenumber::get_next() +unsigned int PrimeNumber::get_next() { /* if we do not know the next number, we have to find it first */ if (current_pos =3D=3D prim_vector.end() || @@ -96,19 +96,19 @@ unsigned int primenumber::get_next() } = /* returns the first prime number of the vector */ -unsigned int primenumber::get_first() const +unsigned int PrimeNumber::get_first() const { return *prim_vector.begin(); } = /* returns the last prime number in the vector */ -unsigned int primenumber::get_last() const +unsigned int PrimeNumber::get_last() const { return * (prim_vector.end() - 1); } = /* returns currently selected prime number */ -unsigned int primenumber::get_current() const +unsigned int PrimeNumber::get_current() const { if (current_pos =3D=3D prim_vector.end() + 1) return get_last(); @@ -116,19 +116,19 @@ unsigned int primenumber::get_current() const } = /* set current_pos to the first prime number */ -void primenumber::move_first() +void PrimeNumber::move_first() { current_pos =3D prim_vector.begin(); } = /* set current_pos to the last prime number */ -void primenumber::move_last() +void PrimeNumber::move_last() { current_pos =3D prim_vector.end() - 1; } = /* move to the next prime number */ -void primenumber::move_forward() +void PrimeNumber::move_forward() { /* if we are at the end of prim_vector, we have to find a new number */ if (current_pos =3D=3D prim_vector.end() || @@ -139,7 +139,7 @@ void primenumber::move_forward() } = /* move one prime number back */ -void primenumber::move_back() +void PrimeNumber::move_back() { /* current_pos must be at least pointing to the first element * of our vector after this function */ @@ -148,7 +148,7 @@ void primenumber::move_back() } = /* displays the whole prim_vector on stdout; just for debugging */ -void primenumber::display_all() +void PrimeNumber::display_all() { unsigned int dummy =3D 0; // count the numbers = @@ -163,7 +163,7 @@ void primenumber::display_all() /* ----- private member functions ----- */ = /* finds next prime number and adds it to the vector */ -void primenumber::find_next() +void PrimeNumber::find_next() { /* our new prime number, must be bigger than the last one */ unsigned int new_prim =3D * (prim_vector.end() - 1); diff --git a/src/primenumber.h b/src/PrimeNumber.h similarity index 96% rename from src/primenumber.h rename to src/PrimeNumber.h index 0ef8187..a12c87f 100644 --- a/src/primenumber.h +++ b/src/PrimeNumber.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - primenumber.h - class primenumber + PrimeNumber.h - class PrimeNumber ------------------- begin : Tue Nov 27 16:40:42 CET 2001 copyright : (C) 2001 by Sebastian Stein @@ -30,14 +30,14 @@ typedef QVector UnsignedIntArray; * algorithm should reduce calculation time and speed up every program us= ing * this prime number class. * \author Sebastian Stein */ -class primenumber +class PrimeNumber { public: /** constructor */ - primenumber(); + PrimeNumber(); = /** destructor */ - ~primenumber(); + ~PrimeNumber(); = /** returns whether the given number is a prime number */ short isPrimeNumber(uint number); diff --git a/src/ratio.cpp b/src/Ratio.cpp similarity index 87% rename from src/ratio.cpp rename to src/Ratio.cpp index 2e90693..4ef4ef1 100644 --- a/src/ratio.cpp +++ b/src/Ratio.cpp @@ -1,5 +1,5 @@ /*************************************************************************= ** - ratio.cpp - source code of class ratio + Ratio.cpp - source code of class Ratio ------------------- begin : Tue Nov 27 16:40:42 CET 2001 copyright : (C) 2001-2004 by Sebastian Stein @@ -18,18 +18,18 @@ * = * *************************************************************************= **/ = -#include "ratio.h" +#include "Ratio.h" = #include = -#include "primenumber.h" +#include "PrimeNumber.h" //Added by qt3to4: #include = /* ----- public member functions ----- */ = /* constructor */ -ratio::ratio(int pnumerator, int pdenominator) : m_numerator(pnumerator), = m_denominator(pdenominator) +Ratio::Ratio(int pnumerator, int pdenominator) : m_numerator(pnumerator), = m_denominator(pdenominator) { #ifdef DEBUG kDebug() << "constructor ratio"; @@ -43,7 +43,7 @@ ratio::ratio(int pnumerator, int pdenominator) : m_numera= tor(pnumerator), m_deno reduce(); } = -ratio::ratio(int pnumerator, int pdenominator, bool reduce_fraction) : m_n= umerator(pnumerator), m_denominator(pdenominator) +Ratio::Ratio(int pnumerator, int pdenominator, bool reduce_fraction) : m_n= umerator(pnumerator), m_denominator(pdenominator) { #ifdef DEBUG kDebug() << "constructor ratio"; @@ -59,7 +59,7 @@ ratio::ratio(int pnumerator, int pdenominator, bool reduc= e_fraction) : m_numerat } = /* copy constructor */ -ratio::ratio(const ratio & copy_ratio) +Ratio::Ratio(const Ratio & copy_ratio) { #ifdef DEBUG kDebug() << "copy constructor ratio"; @@ -69,7 +69,7 @@ ratio::ratio(const ratio & copy_ratio) } = /* destructor */ -ratio::~ratio() +Ratio::~Ratio() { #ifdef DEBUG kDebug() << "destructor ratio"; @@ -77,7 +77,7 @@ ratio::~ratio() } = /* displays the ratio on stdout; just for debugging */ -QTextStream & ratio::display(QTextStream & str) const +QTextStream & Ratio::display(QTextStream & str) const { int tmp_width =3D str.fieldWidth(); str << qSetFieldWidth(5) << " "; @@ -89,19 +89,19 @@ QTextStream & ratio::display(QTextStream & str) const } = /* return the numerator */ -int ratio::numerator() const +int Ratio::numerator() const { return m_numerator; } = /* return the denominator */ -int ratio::denominator() const +int Ratio::denominator() const { return m_denominator; } = /* set the numerator */ -void ratio::setNumerator(int pnumerator, bool reduce_it) +void Ratio::setNumerator(int pnumerator, bool reduce_it) { m_numerator =3D pnumerator; = @@ -113,7 +113,7 @@ void ratio::setNumerator(int pnumerator, bool reduce_it) } = /* set the denominator */ -void ratio::setDenominator(int pdenominator, bool reduce_it) +void Ratio::setDenominator(int pdenominator, bool reduce_it) { /* denominator is not allowed to be 0 */ if (!pdenominator) @@ -129,7 +129,7 @@ void ratio::setDenominator(int pdenominator, bool reduc= e_it) } = /* set completely new ratio */ -void ratio::setRatio(int pnumerator, int pdenominator, bool reduce_it) +void Ratio::setRatio(int pnumerator, int pdenominator, bool reduce_it) { setNumerator(pnumerator, false); setDenominator(pdenominator, false); @@ -143,7 +143,7 @@ void ratio::setRatio(int pnumerator, int pdenominator, = bool reduce_it) } = /* set completely new ratio using mixed numbers */ -void ratio::setRatio(int pinteger, int pnumerator, int pdenominator, bool = reduce_it) +void Ratio::setRatio(int pinteger, int pnumerator, int pdenominator, bool = reduce_it) { // calculate new Numerator, but ignore negative values int newNumerator =3D qAbs(pinteger * pdenominator) + qAbs(pnumerator); @@ -159,10 +159,10 @@ void ratio::setRatio(int pinteger, int pnumerator, in= t pdenominator, bool reduce = = /* add a ratio to a ratio like c =3D a + b */ -ratio ratio::operator+ (ratio addend) +Ratio Ratio::operator+ (Ratio addend) { // this object will be returned as the sum - ratio sum(0, 1); + Ratio sum(0, 1); = // calculate and set the numerator without reducing sum.setNumerator(m_numerator * addend.denominator() @@ -178,10 +178,10 @@ ratio ratio::operator+ (ratio addend) } = /* sub a ratio from a ratio like c =3D a - b */ -ratio ratio::operator- (ratio subtrahend) +Ratio Ratio::operator- (Ratio subtrahend) { /* this object will be returned as the difference */ - ratio diff(0, 1); + Ratio diff(0, 1); = /* change the sign of the subtrahend, so we can handle it as an additi= on */ subtrahend.change_sign(); @@ -195,10 +195,10 @@ ratio ratio::operator- (ratio subtrahend) } = /* mul a ratio with a ratio like c =3D a * b */ -ratio ratio::operator*(ratio factor) +Ratio Ratio::operator*(Ratio factor) { // this object will be returned as the product - ratio product(0, 1); + Ratio product(0, 1); = // calculate and set numerator and denominator without reducing product.setNumerator(m_numerator * factor.numerator(), false); @@ -211,10 +211,10 @@ ratio ratio::operator*(ratio factor) } = /* div a ratio with a ratio like c =3D a / b */ -ratio ratio::operator/ (ratio divisor) +Ratio Ratio::operator/ (Ratio divisor) { /* this object will be returned as the quotient */ - ratio quotient(0, 1); + Ratio quotient(0, 1); = /* exchange numerator and denominator so we can handle as multiplicati= on */ divisor.reziproc(); @@ -228,7 +228,7 @@ ratio ratio::operator/ (ratio divisor) = /* we need this for initialization during a function prototyp; * ratio fraction =3D 0 */ -ratio ratio::operator=3D (int dummy) +Ratio Ratio::operator=3D (int dummy) { m_numerator =3D dummy; m_denominator =3D 1; @@ -237,7 +237,7 @@ ratio ratio::operator=3D (int dummy) } = /* check, if the ratios are equivalent; -1/2 =3D=3D 1/-2 -> true */ -bool ratio::operator=3D=3D (ratio right) +bool Ratio::operator=3D=3D (Ratio right) { signed short orig_sign =3D 1, right_sign =3D 1; = @@ -263,13 +263,13 @@ bool ratio::operator=3D=3D (ratio right) return true; } = -bool ratio::operator< (ratio right) +bool Ratio::operator< (Ratio right) { signed short sign =3D 1; - ratio tmp_ratio =3D ratio(m_numerator, m_denominator) - right; + Ratio tmp_ratio =3D Ratio(m_numerator, m_denominator) - right; = // check for this =3D=3D right - if (tmp_ratio =3D=3D ratio(0, 1)) + if (tmp_ratio =3D=3D Ratio(0, 1)) return false; = // get the presign of the diff @@ -286,13 +286,13 @@ bool ratio::operator< (ratio right) } } = -bool ratio::operator> (ratio right) +bool Ratio::operator> (Ratio right) { signed short sign =3D 1; - ratio tmp_ratio =3D ratio(m_numerator, m_denominator) - right; + Ratio tmp_ratio =3D Ratio(m_numerator, m_denominator) - right; = // check for this =3D=3D right - if (tmp_ratio =3D=3D ratio(0, 1)) + if (tmp_ratio =3D=3D Ratio(0, 1)) return false; = // get the presign of the diff @@ -312,10 +312,10 @@ bool ratio::operator> (ratio right) /* ----- private member functions ----- */ = /* reduce the ratio */ -void ratio::reduce() +void Ratio::reduce() { /* we try prime numbers as divisors; I think it is the fastet way to d= o */ - primenumber number; + PrimeNumber number; short sign_numerator =3D 0, sign_denominator =3D 0; = /* make the whole ratio positive; save the signs; it is easier to redu= ce @@ -372,7 +372,7 @@ void ratio::reduce() } = /* exchange numerator and denominator */ -void ratio::reziproc() +void Ratio::reziproc() { int temp =3D m_numerator; m_numerator =3D m_denominator; @@ -384,7 +384,7 @@ void ratio::reziproc() /* ------ private member functions ------ */ = /* change the sign of the ratio; ratio =3D ratio * -1 */ -void ratio::change_sign() +void Ratio::change_sign() { /* this would be enough to change the sign of the ratio */ m_numerator *=3D -1; @@ -403,7 +403,7 @@ void ratio::change_sign() /* ------ some prototyps of non class functions ------ */ = // it is possible to stram ratio_object -QTextStream & operator<< (QTextStream & str, const ratio & pratio) +QTextStream & operator<< (QTextStream & str, const Ratio & pratio) { return pratio.display(str); } diff --git a/src/ratio.h b/src/Ratio.h similarity index 85% rename from src/ratio.h rename to src/Ratio.h index 1a90065..f30ffc6 100644 --- a/src/ratio.h +++ b/src/Ratio.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - ratio.h - class ratio + Ratio.h - class Ratio ------------------- begin : Tue Nov 27 16:40:42 CET 2001 copyright : (C) 2001-2004 by Sebastian Stein @@ -29,20 +29,20 @@ * objects of the class ratio. Overloaded operation functions are provide= d for * this task. * \author Sebastian Stein */ -class ratio +class Ratio { public: /** constructor */ - explicit ratio(int pnumerator =3D 0, int pdenominator =3D 1); + explicit Ratio(int pnumerator =3D 0, int pdenominator =3D 1); = /** constructor with reduce option */ - ratio(int pnumerator, int pdenominator, bool reduce_fraction); + Ratio(int pnumerator, int pdenominator, bool reduce_fraction); = /** copy constructor */ - ratio(const ratio & copy_ratio); + Ratio(const Ratio & copy_ratio); = /** destructor */ - ~ratio(); + ~Ratio(); = /** returns the ratio as QTextStream object */ QTextStream & display(QTextStream & str) const; @@ -70,28 +70,28 @@ public: void setRatio(int pinteger, int pnumerator, int pdenominator, bool red= uce =3D true); = /** operator overloading for: c =3D object + summand */ - ratio operator+ (ratio addend); + Ratio operator+ (Ratio addend); = /** operator overloading for: c =3D object - subtrahend */ - ratio operator- (ratio subtrahend); + Ratio operator- (Ratio subtrahend); = /** operator overloading for: c =3D object * factor */ - ratio operator*(ratio factor); + Ratio operator*(Ratio factor); = /** operator overloading for: c =3D object / divisor */ - ratio operator/ (ratio divisor); + Ratio operator/ (Ratio divisor); = /** set numerator with dummy and denominator =3D 1 */ - ratio operator=3D (int dummy); + Ratio operator=3D (int dummy); = /** compares the current ratio with a given one */ - bool operator=3D=3D (ratio right); + bool operator=3D=3D (Ratio right); = /** compares the current ratio with a given one */ - bool operator< (ratio right); + bool operator< (Ratio right); = /** compares the current ratio with a given one */ - bool operator> (ratio right); + bool operator> (Ratio right); = /** exchange numerator and denominator */ void reziproc(); @@ -114,6 +114,6 @@ private: /* ------ some prototyps of non class functions ------ */ = /** it is possible to code: cout << ratio_object << endl; */ -QTextStream & operator<< (QTextStream & str, const ratio & pratio); +QTextStream & operator<< (QTextStream & str, const Ratio & pratio); = #endif diff --git a/src/ratiowidget.cpp b/src/RatioWidget.cpp similarity index 92% rename from src/ratiowidget.cpp rename to src/RatioWidget.cpp index b2b2e37..52f484d 100644 --- a/src/ratiowidget.cpp +++ b/src/RatioWidget.cpp @@ -1,5 +1,5 @@ /*************************************************************************= ** - ratiowidget.h - paint a ratio + RatioWidget.h - paint a ratio ------------------- begin : 2004/06/03 copyright : (C) 2004 by Sebastian Stein @@ -18,8 +18,8 @@ * = * *************************************************************************= **/ = -#include "ratiowidget.h" -#include "ratiowidget.moc" +#include "RatioWidget.h" +#include "RatioWidget.moc" = /* these includes are needed for Qt support */ #include @@ -27,7 +27,7 @@ #include = RatioWidget::RatioWidget(QWidget * parent, - const ratio para_ratio) : + const Ratio para_ratio) : FractionBaseWidget(parent), m_ratio(para_ratio) { #ifdef DEBUG @@ -42,7 +42,7 @@ RatioWidget::~RatioWidget() #endif } = -void RatioWidget::setRatio(const ratio para_ratio) +void RatioWidget::setRatio(const Ratio para_ratio) { m_ratio =3D para_ratio; update(); diff --git a/src/ratiowidget.h b/src/RatioWidget.h similarity index 87% rename from src/ratiowidget.h rename to src/RatioWidget.h index 65ee5ed..bf4a92a 100644 --- a/src/ratiowidget.h +++ b/src/RatioWidget.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - ratiowidget.h - paint a ratio + RatioWidget.h - paint a ratio ------------------- begin : 2004/06/03 copyright : (C) 2004 by Sebastian Stein @@ -25,8 +25,8 @@ #include #endif = -#include "fractionbasewidget.h" -#include "ratio.h" +#include "FractionBaseWidget.h" +#include "Ratio.h" = #include //Added by qt3to4: @@ -41,20 +41,20 @@ class RatioWidget : public FractionBaseWidget = public: /** constructor */ - explicit RatioWidget(QWidget * parent =3D 0, const ratio para_ratio = =3D ratio()); + explicit RatioWidget(QWidget * parent =3D 0, const Ratio para_ratio = =3D Ratio()); = /** destructor */ ~RatioWidget(); = /** set the task to be displayed */ - void setRatio(const ratio para_ratio); + void setRatio(const Ratio para_ratio); = void setQuestionMixed(bool value); = private: = /** the ratio to be displayed */ - ratio m_ratio; + Ratio m_ratio; = /*identify if the fraction will appear in mixed form or not*/ bool m_questionMixed; diff --git a/src/rationalwidget.cpp b/src/RationalWidget.cpp similarity index 97% rename from src/rationalwidget.cpp rename to src/RationalWidget.cpp index 87c014a..5a73aa0 100644 --- a/src/rationalwidget.cpp +++ b/src/RationalWidget.cpp @@ -1,5 +1,5 @@ /*************************************************************************= ** - rationalwidget.h - paint a rational number + RationalWidget.h - paint a rational number ------------------- begin : 2004/06/04 copyright : (C) 2004 by Sebastian Stein @@ -19,8 +19,8 @@ * = * *************************************************************************= **/ = -#include "rationalwidget.h" -#include "rationalwidget.moc" +#include "RationalWidget.h" +#include "RationalWidget.moc" = /* these includes are needed for KDE support */ #include diff --git a/src/rationalwidget.h b/src/RationalWidget.h similarity index 95% rename from src/rationalwidget.h rename to src/RationalWidget.h index fb37014..952bb61 100644 --- a/src/rationalwidget.h +++ b/src/RationalWidget.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - rationalwidget.h - paint a rational number + RationalWidget.h - paint a rational number ------------------- begin : 2004/06/04 copyright : (C) 2004 by Sebastian Stein @@ -24,7 +24,7 @@ #include #endif = -#include "fractionbasewidget.h" +#include "FractionBaseWidget.h" //Added by qt3to4: #include = diff --git a/src/resultwidget.cpp b/src/ResultWidget.cpp similarity index 97% rename from src/resultwidget.cpp rename to src/ResultWidget.cpp index ef8901d..70c8b53 100644 --- a/src/resultwidget.cpp +++ b/src/ResultWidget.cpp @@ -1,5 +1,5 @@ /*************************************************************************= ** - resultwidget.h - paint the result + ResultWidget.h - paint the result ------------------- begin : 2004/05/30 copyright : (C) 2004 by Sebastian Stein @@ -18,8 +18,8 @@ * = * *************************************************************************= **/ = -#include "resultwidget.h" -#include "resultwidget.moc" +#include "ResultWidget.h" +#include "ResultWidget.moc" = /* these includes are needed for Qt support */ #include @@ -43,7 +43,7 @@ ResultWidget::ResultWidget(QWidget * parent, const uintLi= st para_factors) : } = ResultWidget::ResultWidget(QWidget * parent, - const ratio para_result) : + const Ratio para_result) : FractionBaseWidget(parent), m_result(para_result) { #ifdef DEBUG @@ -162,7 +162,7 @@ void ResultWidget::showResult() update(); } = -void ResultWidget::setResult(const ratio para_result, int k) +void ResultWidget::setResult(const Ratio para_result, int k) { #ifdef DEBUG kDebug() << "ResultWidget::setResult"; diff --git a/src/resultwidget.h b/src/ResultWidget.h similarity index 90% rename from src/resultwidget.h rename to src/ResultWidget.h index 1f43835..adfa931 100644 --- a/src/resultwidget.h +++ b/src/ResultWidget.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - resultwidget.h - paint the result + ResultWidget.h - paint the result ------------------- begin : 2004/05/30 copyright : (C) 2004 by Sebastian Stein @@ -25,8 +25,8 @@ #include #endif = -#include "fractionbasewidget.h" -#include "ratio.h" +#include "FractionBaseWidget.h" +#include "Ratio.h" = #include //Added by qt3to4: @@ -48,7 +48,7 @@ class ResultWidget : public FractionBaseWidget = public: /** constructors */ - ResultWidget(QWidget * parent, const ratio para_result); + ResultWidget(QWidget * parent, const Ratio para_result); ResultWidget(QWidget * parent, const uintList para_factors); explicit ResultWidget(QWidget * parent =3D 0); = @@ -56,7 +56,7 @@ public: ~ResultWidget(); = /** set the task to be displayed */ - void setResult(const ratio para_result, int k); + void setResult(const Ratio para_result, int k); void setResult(int k); = int KindView(); @@ -84,7 +84,7 @@ private: short m_ExerciseView; = /** the ratio to be displayed */ - ratio m_result; + Ratio m_result; = /** overrideing the paint event of FractionBaseWidget */ void paintEvent(QPaintEvent*); diff --git a/src/statisticsbarwidget.cpp b/src/StatisticsBarWidget.cpp similarity index 97% rename from src/statisticsbarwidget.cpp rename to src/StatisticsBarWidget.cpp index a4a939a..bd503e3 100644 --- a/src/statisticsbarwidget.cpp +++ b/src/StatisticsBarWidget.cpp @@ -1,5 +1,5 @@ /*************************************************************************= ** - statisticsbarwidget.cpp + StatisticsBarWidget.cpp ------------------- begin : 2008/09/02 copyright : (C) 2008 by Danilo Balzaque @@ -17,8 +17,8 @@ * = * *************************************************************************= **/ = -#include "statisticsbarwidget.h" -#include "statisticsbarwidget.moc" +#include "StatisticsBarWidget.h" +#include "StatisticsBarWidget.moc" = /* these includes are needed for KDE support */ #include diff --git a/src/statisticsbarwidget.h b/src/StatisticsBarWidget.h similarity index 97% rename from src/statisticsbarwidget.h rename to src/StatisticsBarWidget.h index c394f17..77bb496 100644 --- a/src/statisticsbarwidget.h +++ b/src/StatisticsBarWidget.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - statisticsbarwidget.h + StatisticsBarWidget.h ------------------- begin : 2008/09/02 copyright : (C) 2008 by Danilo Balzaque diff --git a/src/statisticsview.cpp b/src/StatisticsView.cpp similarity index 97% rename from src/statisticsview.cpp rename to src/StatisticsView.cpp index f050dd8..7b3ef14 100644 --- a/src/statisticsview.cpp +++ b/src/StatisticsView.cpp @@ -1,5 +1,5 @@ /*************************************************************************= ** - statisticsview.cpp - the statistic window + StatisticsView.cpp - the statistic window ------------------- begin : Tue Mar 08 17:20:00 CET 2002 copyright : (C) 2001 - 2004 by Sebastian Stein, Eva Brucher= seifer @@ -19,8 +19,8 @@ * = * *************************************************************************= **/ = -#include "statisticsview.h" -#include "statisticsview.moc" +#include "StatisticsView.h" +#include "StatisticsView.moc" = /* the includes are needed for Qt support */ #include @@ -34,7 +34,7 @@ #include = #include "settingsclass.h" -#include "statisticsbarwidget.h" +#include "StatisticsBarWidget.h" = /* constructor */ StatisticsView::StatisticsView(QWidget * parent) : diff --git a/src/statisticsview.h b/src/StatisticsView.h similarity index 97% rename from src/statisticsview.h rename to src/StatisticsView.h index 138f23e..9ab2225 100644 --- a/src/statisticsview.h +++ b/src/StatisticsView.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - statisticsview.cpp - Header File + StatisticsView.cpp - Header File ------------------- begin : Tue Mar 08 17:20:00 CET 2002 copyright : (C) 2001 - 2004 by Sebastian Stein, Eva Brucher= seifer diff --git a/src/task.cpp b/src/Task.cpp similarity index 93% rename from src/task.cpp rename to src/Task.cpp index 65a077b..8c6ffbf 100644 --- a/src/task.cpp +++ b/src/Task.cpp @@ -1,5 +1,5 @@ /*************************************************************************= ** - task.cpp - source code of class task + Task.cpp - source code of class Task ------------------- begin : Tue Nov 27 16:40:42 CET 2001 copyright : (C) 2001 by Sebastian Stein @@ -19,7 +19,7 @@ * = * *************************************************************************= **/ = -#include "task.h" +#include "Task.h" = #include = @@ -30,7 +30,7 @@ #include = /** constructor of class task */ -task::task() +Task::Task() { srand(time(NULL)); #ifdef DEBUG @@ -39,7 +39,7 @@ task::task() } = /** destructor of class task */ -task::~task() +Task::~Task() { #ifdef DEBUG kDebug() << "destructor task"; @@ -51,7 +51,7 @@ task::~task() * pmax_md: maximum main denominator * pnr_ratios: number of ratios -> pnr_ratios - 1 operations */ -void task::create_task(unsigned int pmax_md, short pnr_ratios, +void Task::create_task(unsigned int pmax_md, short pnr_ratios, short padd_add, short padd_div, short padd_mult, short padd_sub) { @@ -103,7 +103,7 @@ void task::create_task(unsigned int pmax_md, short pnr_= ratios, } = /** set ratio n in the ratio_vector */ -void task::set_ratio_n(unsigned short number, int numerator, int denominat= or) +void Task::set_ratio_n(unsigned short number, int numerator, int denominat= or) { /* do not set something outside our vector */ if (number > ratio_vector.size() - 1) @@ -114,7 +114,7 @@ void task::set_ratio_n(unsigned short number, int numer= ator, int denominator) } = /** set ratio n in the ratio_vector */ -void task::set_ratio_n(unsigned short number, ratio fraction) +void Task::set_ratio_n(unsigned short number, Ratio fraction) { /* do not set something outside our vector */ if (number > ratio_vector.size() - 1) @@ -125,7 +125,7 @@ void task::set_ratio_n(unsigned short number, ratio fra= ction) } = /** returns the ratio given by number from the ratio_vector */ -ratio task::get_ratio_n(unsigned short number) const +Ratio Task::get_ratio_n(unsigned short number) const { /* do not set something outside our vector */ if (number > ratio_vector.size() - 1) @@ -134,7 +134,7 @@ ratio task::get_ratio_n(unsigned short number) const } = /** set operation given by the number in the op_vector */ -void task::set_op_n(unsigned short number, short operation) +void Task::set_op_n(unsigned short number, short operation) { /* do not set something outside our vector */ if (number > op_vector.size() - 1) @@ -144,7 +144,7 @@ void task::set_op_n(unsigned short number, short operat= ion) } = /** returns the operation given by number from the op_vector */ -short task::get_op_n(unsigned short number) const +short Task::get_op_n(unsigned short number) const { /* do not set something outside our vector */ if (number > op_vector.size() - 1) @@ -153,29 +153,29 @@ short task::get_op_n(unsigned short number) const } = /** add a new ratio at the end of the ratio vector */ -void task::add_ratio(ratio new_ratio) +void Task::add_ratio(Ratio new_ratio) { ratio_vector.push_back(new_ratio); return; } = /** add a new ratio at the end of the ratio vector */ -void task::add_ratio(int numerator, int denominator) +void Task::add_ratio(int numerator, int denominator) { - ratio new_ratio(numerator, denominator); + Ratio new_ratio(numerator, denominator); ratio_vector.push_back(new_ratio); return; } = /** add a new operation at the end of the operation vector */ -void task::add_operation(short operation) +void Task::add_operation(short operation) { op_vector.push_back(operation); return; } = /** just outputs the whole given task to stdout; for debugging */ -QTextStream & task::display(QTextStream & str) +QTextStream & Task::display(QTextStream & str) { #ifdef DEBUG kDebug() << "task::display()"; @@ -237,9 +237,9 @@ QTextStream & task::display(QTextStream & str) } = /** solves the given task and returns the result as a ratio */ -ratio task::solve() +Ratio Task::solve() { - ratio ergebnis(0, 1); /* that is the starting point */ + Ratio ergebnis(0, 1); /* that is the starting point */ = /* this is our pointer on the ratio_vector, set it to the beginning */ RatioArray::iterator ratio_pointer =3D ratio_vector.begin(); @@ -322,7 +322,7 @@ ratio task::solve() } = /* returns the number of ratios in the vector */ -int task::getNumberOfRatios() const +int Task::getNumberOfRatios() const { #ifdef DEBUG kDebug() << "task::getNumberOfRatios()"; @@ -331,7 +331,7 @@ int task::getNumberOfRatios() const } = /* returns the number of operations in the vector */ -int task::getNumberOfOperations() const +int Task::getNumberOfOperations() const { #ifdef DEBUG kDebug() << "task::getNumberOfOperations()"; @@ -340,7 +340,7 @@ int task::getNumberOfOperations() const } = /* removes all ratios and operations from the given task */ -void task::clean() +void Task::clean() { #ifdef DEBUG kDebug() << "task::clean()"; @@ -353,7 +353,7 @@ void task::clean() = /** this function is called by the solving function to compute a given * product (or div) and return the solution */ -ratio task::product(RatioArray::iterator & ratio_pointer, +Ratio Task::product(RatioArray::iterator & ratio_pointer, ShortArray::iterator & op_pointer) { #ifdef DEBUG @@ -361,7 +361,7 @@ ratio task::product(RatioArray::iterator & ratio_pointe= r, #endif /* the function's parameters are pointing to the next ratio; * to the starting point of the product */ - ratio product(ratio_pointer->numerator(), ratio_pointer->denominator()= ); + Ratio product(ratio_pointer->numerator(), ratio_pointer->denominator()= ); = ++ratio_pointer; do { @@ -392,7 +392,7 @@ ratio task::product(RatioArray::iterator & ratio_pointe= r, = /** generate the operations randomly; return how many mul or div * are in one block */ -unsigned short task::make_operation(short padd_add, short padd_div, short = padd_mult, short padd_sub, +unsigned short Task::make_operation(short padd_add, short padd_div, short = padd_mult, short padd_sub, short pnr_ratios) { #ifdef DEBUG @@ -493,7 +493,7 @@ unsigned short task::make_operation(short padd_add, sho= rt padd_div, short padd_m } = /** find a denominator for the task */ -int task::make_main_dn(unsigned int pmax_md, unsigned short max_product_le= ngth) +int Task::make_main_dn(unsigned int pmax_md, unsigned short max_product_le= ngth) { int denominator; = @@ -509,26 +509,26 @@ int task::make_main_dn(unsigned int pmax_md, unsigned= short max_product_length) = /** returns the count number's prime factors and stores the prime factors * in the prim_fac_vektor vektor */ -unsigned short task::prim_factor_nr(int number) +unsigned short Task::prim_factor_nr(int number) { unsigned int tmp_number =3D number; - primenumber primenumber; + PrimeNumber primeNumber; Tprime_factor prim_fac_struct; = /* delete all the prime factors of the old main denominator */ prim_fac_vector.clear(); = /* test if we can find prime factors */ - for (primenumber.move_first(); primenumber.get_current() <=3D tmp_numb= er;) { + for (primeNumber.move_first(); primeNumber.get_current() <=3D tmp_numb= er;) { /* if the current selected prime number is a divisor */ - if (tmp_number % primenumber.get_current() !=3D 0) { - primenumber.move_forward(); /* no, test next one */ + if (tmp_number % primeNumber.get_current() !=3D 0) { + primeNumber.move_forward(); /* no, test next one */ } else { /* yes, we found a new prime factor; so first we use the divis= or */ - tmp_number =3D int (tmp_number / primenumber.get_current()); + tmp_number =3D int (tmp_number / primeNumber.get_current()); = /* now we add the prime factor to our prime factor vector */ - prim_fac_struct.factor =3D primenumber.get_current(); + prim_fac_struct.factor =3D primeNumber.get_current(); prim_fac_struct.flag =3D UNUSED; prim_fac_vector.push_back(prim_fac_struct); } @@ -547,7 +547,7 @@ unsigned short task::prim_factor_nr(int number) } = /** set the numerators randomly */ -void task::make_numerators(int main_denominator, short pnr_ratios) +void Task::make_numerators(int main_denominator, short pnr_ratios) { /* I think it is to easy to deal with ratios like 1/1 or 4/4; so * I limit the maximum of a numerator */ @@ -562,7 +562,7 @@ void task::make_numerators(int main_denominator, short = pnr_ratios) } = /** create the ratios' denominators */ -void task::make_denominators(int main_denominator, short pmax_md, +void Task::make_denominators(int main_denominator, short pmax_md, short padd_div, short padd_mult) { /* this is our pointer on the ratio_vector, set it to the beginning */ @@ -709,7 +709,7 @@ void task::make_denominators(int main_denominator, shor= t pmax_md, /* ------ some prototyps of non class functions ------ */ = /** it is possible to code: cout << task_object << endl; */ -QTextStream & operator<< (QTextStream & str, task & ptask) +QTextStream & operator<< (QTextStream & str, Task & ptask) { return ptask.display(str); } diff --git a/src/task.h b/src/Task.h similarity index 91% rename from src/task.h rename to src/Task.h index 41ed00c..a09cc57 100644 --- a/src/task.h +++ b/src/Task.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - task.h - class task + Task.h - class Task ------------------- begin : Tue Nov 27 16:40:42 CET 2001 copyright : (C) 2001 by Sebastian Stein @@ -22,8 +22,8 @@ #ifndef TASK_H #define TASK_H = -#include "ratio.h" -#include "primenumber.h" +#include "Ratio.h" +#include "PrimeNumber.h" = #include //Added by qt3to4: @@ -57,7 +57,7 @@ typedef struct PRIME_FACTOR { Tprime_factor; = /** we use the vector template class to create 3 dynamic types */ -typedef QVector RatioArray; +typedef QVector RatioArray; typedef QVector ShortArray; typedef QVector PrimeFactorArray; = @@ -67,14 +67,14 @@ typedef QVector PrimeFactorArray; * - a task has at least 1 operation * * \author Sebastian Stein */ -class task +class Task { public: /** constructor */ - task(); + Task(); = /** destructor */ - ~task(); + ~Task(); = /** automatically generate a new task with the given parameters */ void create_task(unsigned int pmax_md =3D 10, short pnr_ratios =3D 2, @@ -85,10 +85,10 @@ public: int denominator =3D 1); = /** set ratio n */ - void set_ratio_n(unsigned short number, ratio fraction); + void set_ratio_n(unsigned short number, Ratio fraction); = /** returns ration n */ - ratio get_ratio_n(unsigned short number =3D 0) const; + Ratio get_ratio_n(unsigned short number =3D 0) const; = /** set operation n */ void set_op_n(unsigned short number =3D 0, short operation =3D ADD); @@ -97,7 +97,7 @@ public: short get_op_n(unsigned short number =3D 0) const; = /** add a ratio to the end of the task */ - void add_ratio(ratio new_ratio); + void add_ratio(Ratio new_ratio); = /** add a ratio to the end of the task */ void add_ratio(int numerator =3D 0, int denominator =3D 1); @@ -109,7 +109,7 @@ public: QTextStream & display(QTextStream & str); = /** solves the task and returns the result as ratio */ - ratio solve(); + Ratio solve(); = /** returns the number of ratios in the vector */ int getNumberOfRatios() const; @@ -143,7 +143,7 @@ private: PrimeFactorArray prim_fac_vector; = /** this function is needed by solve() */ - ratio product(RatioArray::iterator & ratio_pointer, + Ratio product(RatioArray::iterator & ratio_pointer, ShortArray::iterator & op_pointer); = /** generate the operations randomly; return how many mul or div @@ -170,6 +170,6 @@ private: /* ------ some prototypes of non class functions ------ */ = /** it is possible to code: cout << task_object << endl; */ -QTextStream & operator<< (QTextStream & str, task & ptask); +QTextStream & operator<< (QTextStream & str, Task & ptask); = #endif diff --git a/src/TaskColors.h b/src/TaskColors.h index ed731e7..652649f 100644 --- a/src/TaskColors.h +++ b/src/TaskColors.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - fractionringwidget.cpp + TaskColors.h ------------------- begin : 2009/08/10 copyright : (C) 2008 by Danilo Balzaque diff --git a/src/taskview.cpp b/src/TaskView.cpp similarity index 98% rename from src/taskview.cpp rename to src/TaskView.cpp index 6d2c999..e8aa500 100644 --- a/src/taskview.cpp +++ b/src/TaskView.cpp @@ -1,5 +1,5 @@ /*************************************************************************= ** - taskview.cpp - The task window + TaskView.cpp - The task window ------------------- begin : Tue Feb 08 13:41:00 CET 2002 copyright : (C) 2001 - 2004 by Sebastian Stein @@ -18,8 +18,8 @@ * = * *************************************************************************= **/ = -#include "taskview.h" -#include "taskview.moc" +#include "TaskView.h" +#include "TaskView.moc" = /* these includes are needed for KDE support */ #include @@ -144,7 +144,7 @@ TaskView::TaskView(QWidget * parent, taskLayout->addWidget(deno_edit, 3, 4); = // next is the result widget - m_resultWidget =3D new ResultWidget(checkWidget, ratio()); + m_resultWidget =3D new ResultWidget(checkWidget, Ratio()); m_resultWidget->setObjectName("m_resultWidget"); checkLayout->addWidget(m_resultWidget, 0, 0, 1, 2); = @@ -372,7 +372,7 @@ void TaskView::showResult() i18n("You entered 0 as the denominato= r. This means division by zero, which is not allowed. This question will be= counted as not correctly solved.")); } else { /* maybe the entered ratio was not reduced */ - ratio tmp_result =3D ratio(entered_result); + Ratio tmp_result =3D Ratio(entered_result); tmp_result.reduce(); if ((tmp_result =3D=3D solution) && !(tmp_result =3D=3D entere= d_result)) { KMessageBox::information(this, @@ -423,7 +423,7 @@ void TaskView::nextTask() QApplication::restoreOverrideCursor(); /* show the normal cursor */ = // update the task widget - m_taskWidget->setTask((const task)(current_task)); + m_taskWidget->setTask((const Task)(current_task)); } = /* ------ private slots ------ */ diff --git a/src/taskview.h b/src/TaskView.h similarity index 94% rename from src/taskview.h rename to src/TaskView.h index 8dba658..56bee88 100644 --- a/src/taskview.h +++ b/src/TaskView.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - taskview.cpp - Header File + TaskView.cpp - Header File ------------------- begin : Tue Feb 08 13:42:00 CET 2002 copyright : (C) 2001 - 2004 by Sebastian Stein @@ -24,10 +24,10 @@ #define _CHECK_TASK 0 #define _NEXT_TASK 1 = -#include "exercisebase.h" -#include "resultwidget.h" -#include "task.h" -#include "taskwidget.h" +#include "ExerciseBase.h" +#include "ResultWidget.h" +#include "Task.h" +#include "TaskWidget.h" = #ifdef DEBUG #include @@ -125,9 +125,9 @@ private: QWidget * checkWidget; QWidget * taskWidget; = - task current_task; - ratio solution; - ratio entered_result; + Task current_task; + Ratio solution; + Ratio entered_result; QFont defaultFont; = void showResult(); diff --git a/src/taskwidget.cpp b/src/TaskWidget.cpp similarity index 95% rename from src/taskwidget.cpp rename to src/TaskWidget.cpp index b57ee4e..95b5d7c 100644 --- a/src/taskwidget.cpp +++ b/src/TaskWidget.cpp @@ -1,5 +1,5 @@ /*************************************************************************= ** - taskwidget.cpp - paint a task + TaskWidget.cpp - paint a task ------------------- begin : 2004/05/30 copyright : (C) 2004 by Sebastian Stein @@ -18,8 +18,8 @@ * = * *************************************************************************= **/ = -#include "taskwidget.h" -#include "taskwidget.moc" +#include "TaskWidget.h" +#include "TaskWidget.moc" = /* these includes are needed for KDE support */ #include @@ -31,7 +31,7 @@ #include = TaskWidget::TaskWidget(QWidget * parent, - const task para_task) : + const Task para_task) : FractionBaseWidget(parent), m_task(para_task) { #ifdef DEBUG @@ -46,7 +46,7 @@ TaskWidget::~TaskWidget() #endif } = -void TaskWidget::setTask(const task para_task) +void TaskWidget::setTask(const Task para_task) { m_task =3D para_task; update(); diff --git a/src/taskwidget.h b/src/TaskWidget.h similarity index 88% rename from src/taskwidget.h rename to src/TaskWidget.h index a168668..afe8679 100644 --- a/src/taskwidget.h +++ b/src/TaskWidget.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - taskwidget.h - paint a task + TaskWidget.h - paint a task ------------------- begin : 2004/05/30 copyright : (C) 2004 by Sebastian Stein @@ -25,8 +25,8 @@ #include #endif = -#include "fractionbasewidget.h" -#include "task.h" +#include "FractionBaseWidget.h" +#include "Task.h" = #include //Added by qt3to4: @@ -51,20 +51,20 @@ class TaskWidget : public FractionBaseWidget = public: /** constructor */ - explicit TaskWidget(QWidget * parent =3D 0, const task para_task =3D t= ask()); + explicit TaskWidget(QWidget * parent =3D 0, const Task para_task =3D T= ask()); = /** destructor */ ~TaskWidget(); = /** set the task to be displayed */ - void setTask(const task para_task); + void setTask(const Task para_task); = void setQuestionMixed(bool value); = private: = /** the task to be displayed */ - task m_task; + Task m_task; = bool m_questionMixed; = diff --git a/src/kbruch.kcfg b/src/kbruch.kcfg index 8f813ef..594ede2 100644 --- a/src/kbruch.kcfg +++ b/src/kbruch.kcfg @@ -3,7 +3,7 @@ xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation=3D"http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > -mainqtwidget.h +MainQtWidget.h =