Skip to content

GitLab

Commit 194e7f13 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Time to increase version 

Port emit->Q_EMIT / foreach->for(...:...)
Use more target-centric cmake code
parent 91261702
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 59 deletions
CMakeLists.txt
View file @ 194e7f13
......@@ -7,8 +7,8 @@ set (RELEASE_SERVICE_VERSION_MICRO "70")
set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
project(kcalc VERSION ${RELEASE_SERVICE_VERSION})
set(QT_MIN_VERSION "5.14.0")
set(KF5_MIN_VERSION "5.70.0")
set(QT_MIN_VERSION "5.15.0")
set(KF5_MIN_VERSION "5.83.0")
find_package (ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
set (CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
......@@ -76,8 +76,9 @@ check_type_size("unsigned long" SIZEOF_UNSIGNED_LONG)
configure_file(config-kcalc.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kcalc.h )
add_subdirectory(knumber)
add_executable(kcalc)
set(kcalc_SRCS
target_sources(kcalc PRIVATE
kcalc.cpp
bitbutton.cpp
kcalc_bitset.cpp
......@@ -89,14 +90,14 @@ set(kcalc_SRCS
kcalc_statusbar.cpp
stats.cpp )
ki18n_wrap_ui(kcalc_SRCS
ki18n_wrap_ui(kcalc
kcalc.ui
constants.ui
colors.ui
fonts.ui
general.ui)
kconfig_add_kcfg_files(kcalc_SRCS kcalc_settings.kcfgc )
kconfig_add_kcfg_files(kcalc kcalc_settings.kcfgc )
# Sets the icon on Windows and OSX
file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/*.png")
......@@ -109,7 +110,6 @@ if (INSTALL_ICONS)
ecm_install_icons( ICONS ${ICONS_SRCS} DESTINATION ${KDE_INSTALL_ICONDIR} )
endif()
add_executable(kcalc ${kcalc_SRCS})
target_link_libraries(kcalc
Qt5::Core
......
kcalc.cpp
View file @ 194e7f13
......@@ -686,7 +686,8 @@ void KCalculator::updateGeometry() {
margin = qMax(qMin(margin / 2, 3), 3);
// left pad
foreach(QObject *obj, leftPad->children()) {
const auto leftPadList = leftPad->children();
for (QObject *obj : leftPadList) {
if (auto const button = qobject_cast<KCalcButton *>(obj)) {
button->setFixedWidth(em.width() * 4 + margin * 2);
button->installEventFilter(this);
......@@ -694,7 +695,8 @@ void KCalculator::updateGeometry() {
}
// right pad
foreach(QObject *obj, rightPad->children()) {
const auto rightPadList = rightPad->children();
for (QObject *obj : rightPadList) {
auto const button = qobject_cast<KCalcButton *>(obj);
// let Shift expand freely
if (button && button != pbShift) {
......@@ -704,7 +706,8 @@ void KCalculator::updateGeometry() {
}
// numeric pad
foreach(QObject *obj, numericPad->children()) {
const auto numericPadList = numericPad->children();
for (QObject *obj : numericPadList) {
if (auto const button = qobject_cast<KCalcButton *>(obj)) {
// let pb0 expand freely
if (button != pb0) {
......@@ -779,11 +782,12 @@ void KCalculator::slotBaseSelected(QAbstractButton *button) {
// Disable buttons that make only sense with floating point numbers
if (current_base != NB_DECIMAL) {
foreach(QAbstractButton *btn, scientific_buttons_) {
for (QAbstractButton *btn : qAsConst(scientific_buttons_)) {
btn->setEnabled(false);
}
} else {
foreach(QAbstractButton *btn, scientific_buttons_) {
for (QAbstractButton *btn : qAsConst(scientific_buttons_)) {
btn->setEnabled(true);
}
}
......@@ -818,7 +822,7 @@ void KCalculator::keyPressEvent(QKeyEvent *e) {
}
if (e->key() == Qt::Key_Control) {
emit switchShowAccels(true);
Q_EMIT switchShowAccels(true);
}
// Workaround for bug #283521
......@@ -857,7 +861,7 @@ void KCalculator::keyPressEvent(QKeyEvent *e) {
void KCalculator::keyReleaseEvent(QKeyEvent *e) {
if (e->key() == Qt::Key_Control) {
emit switchShowAccels(false);
Q_EMIT switchShowAccels(false);
}
}
......@@ -906,7 +910,7 @@ void KCalculator::slotShifttoggled(bool flag) {
shift_mode_ = flag;
emit switchMode(ModeShift, flag);
Q_EMIT switchMode(ModeShift, flag);
statusBar()->setShiftIndicator(shift_mode_);
if (shift_mode_) {
......@@ -925,7 +929,7 @@ void KCalculator::slotHyptoggled(bool flag) {
// toggle between hyperbolic and standard trig functions
hyp_mode_ = flag;
emit switchMode(ModeHyperbolic, flag);
Q_EMIT switchMode(ModeHyperbolic, flag);
}
//------------------------------------------------------------------------------
......@@ -1903,11 +1907,11 @@ void KCalculator::slotBaseModeAmountChanged(const KNumber &number) {
void KCalculator::showMemButtons(bool toggled) {
if (toggled) {
foreach(QAbstractButton *btn, mem_button_list_) {
for (QAbstractButton *btn : qAsConst(mem_button_list_)) {
btn->show();
}
} else {
foreach(QAbstractButton *btn, mem_button_list_) {
for (QAbstractButton *btn : qAsConst(mem_button_list_)) {
btn->hide();
}
......@@ -1924,11 +1928,12 @@ void KCalculator::showMemButtons(bool toggled) {
void KCalculator::showStatButtons(bool toggled) {
if (toggled) {
foreach(QAbstractButton *btn, stat_buttons_) {
for (QAbstractButton *btn : qAsConst(stat_buttons_)) {
btn->show();
}
} else {
foreach(QAbstractButton *btn, stat_buttons_) {
for (QAbstractButton *btn : qAsConst(stat_buttons_)) {
btn->hide();
}
}
......@@ -1941,22 +1946,23 @@ void KCalculator::showStatButtons(bool toggled) {
void KCalculator::showScienceButtons(bool toggled) {
if (toggled) {
foreach(QAbstractButton* btn, scientific_buttons_) {
for (QAbstractButton *btn : qAsConst(scientific_buttons_)) {
btn->show();
}
foreach(QAbstractButton* btn, angle_choose_group_->buttons()) {
const auto buttons = angle_choose_group_->buttons();
for (QAbstractButton* btn : buttons) {
btn->show();
}
setAngle();
statusBar()->setAngleModeIndicatorVisible(true);
} else {
foreach(QAbstractButton* btn, scientific_buttons_) {
for (QAbstractButton *btn : qAsConst(scientific_buttons_)) {
btn->hide();
}
foreach(QAbstractButton* btn, angle_choose_group_->buttons()) {
const auto buttons = angle_choose_group_->buttons();
for (QAbstractButton* btn : buttons) {
btn->hide();
}
......@@ -1976,15 +1982,16 @@ void KCalculator::showLogicButtons(bool toggled) {
connect(mBitset, &KCalcBitset::valueChanged, this, &KCalculator::slotBitsetChanged);
connect(calc_display, &KCalcDisplay::changedAmount, this, &KCalculator::slotUpdateBitset);
foreach(QAbstractButton* btn, logic_buttons_) {
for (QAbstractButton *btn : qAsConst(logic_buttons_)) {
btn->show();
}
setBase();
statusBar()->setBaseIndicatorVisible(true);
foreach(QAbstractButton *btn, base_choose_group_->buttons()) {
btn->show();
const auto buttons = base_choose_group_->buttons();
for (QAbstractButton* btn : buttons) {
btn->show();
}
for (QLabel* lbl : base_conversion_labels_) {
......@@ -2000,14 +2007,15 @@ void KCalculator::showLogicButtons(bool toggled) {
disconnect(mBitset, &KCalcBitset::valueChanged, this, &KCalculator::slotBitsetChanged);
disconnect(calc_display, &KCalcDisplay::changedAmount, this, &KCalculator::slotUpdateBitset);
foreach(QAbstractButton* btn, logic_buttons_) {
for (QAbstractButton *btn : qAsConst(logic_buttons_)) {
btn->hide();
}
// Hide Hex-Buttons, but first switch back to decimal
decRadio->animateClick(0);
foreach(QAbstractButton *btn, base_choose_group_->buttons()) {
const auto buttons = base_choose_group_->buttons();
for (QAbstractButton* btn : buttons) {
btn->hide();
}
......@@ -2031,11 +2039,11 @@ void KCalculator::showLogicButtons(bool toggled) {
void KCalculator::slotConstantsShow(bool toggled) {
if (toggled) {
foreach(QAbstractButton *btn, const_buttons_) {
for(QAbstractButton *btn : qAsConst(const_buttons_)) {
btn->show();
}
} else {
foreach(QAbstractButton *btn, const_buttons_) {
for(QAbstractButton *btn : qAsConst(const_buttons_)) {
btn->hide();
}
}
......@@ -2063,7 +2071,7 @@ void KCalculator::slotBitsetshow(bool toggled) {
//------------------------------------------------------------------------------
void KCalculator::changeButtonNames() {
foreach(QAbstractButton *btn, const_buttons_) {
for (QAbstractButton *btn : qAsConst(const_buttons_)) {
if (auto const constbtn = qobject_cast<KCalcConstButton*>(btn)) {
constbtn->setLabelAndTooltip();
}
......@@ -2145,12 +2153,12 @@ void KCalculator::setColors() {
}
const QColor funcFontColor(KCalcSettings::functionFontsColor());
foreach(QAbstractButton *btn, function_button_list_) {
for (QAbstractButton *btn : qAsConst(function_button_list_)) {
qobject_cast<KCalcButton*>(btn)->setTextColor(funcFontColor);
}
const QColor statFontColor(KCalcSettings::statFontsColor());
foreach(QAbstractButton *btn, stat_buttons_) {
for (QAbstractButton *btn : qAsConst(stat_buttons_)) {
qobject_cast<KCalcButton*>(btn)->setTextColor(statFontColor);
}
......@@ -2160,17 +2168,17 @@ void KCalculator::setColors() {
}
const QColor memFontColor(KCalcSettings::memoryFontsColor());
foreach(QAbstractButton *btn, mem_button_list_) {
for (QAbstractButton *btn : qAsConst(mem_button_list_)) {
qobject_cast<KCalcButton*>(btn)->setTextColor(memFontColor);
}
const QColor opFontColor(KCalcSettings::operationFontsColor());
foreach(QAbstractButton *btn, operation_button_list_) {
for (QAbstractButton *btn : qAsConst(operation_button_list_)) {
qobject_cast<KCalcButton*>(btn)->setTextColor(opFontColor);
}
const QColor coFontColor(KCalcSettings::constantsFontsColor());
foreach(QAbstractButton *btn, const_buttons_) {
for (QAbstractButton *btn : qAsConst(const_buttons_)) {
qobject_cast<KCalcButton*>(btn)->setTextColor(coFontColor);
}
......@@ -2196,12 +2204,12 @@ void KCalculator::setColors() {
}
const QColor funcPal(KCalcSettings::functionButtonsColor());
foreach(QAbstractButton *btn, function_button_list_) {
for (QAbstractButton *btn : qAsConst(function_button_list_)) {
btn->setStyleSheet(sheet.arg(funcPal.name()));
}
const QColor statPal(KCalcSettings::statButtonsColor());
foreach(QAbstractButton *btn, stat_buttons_) {
for (QAbstractButton *btn : qAsConst(stat_buttons_)) {
btn->setStyleSheet(sheet.arg(statPal.name()));
}
......@@ -2211,17 +2219,17 @@ void KCalculator::setColors() {
}
const QColor memPal(KCalcSettings::memoryButtonsColor());
foreach(QAbstractButton *btn, mem_button_list_) {
for (QAbstractButton *btn : qAsConst(mem_button_list_)) {
btn->setStyleSheet(sheet.arg(memPal.name()));
}
const QColor opPal(KCalcSettings::operationButtonsColor());
foreach(QAbstractButton *btn, operation_button_list_) {
for (QAbstractButton *btn : qAsConst(operation_button_list_)) {
btn->setStyleSheet(sheet.arg(opPal.name()));
}
const QColor coPal(KCalcSettings::constantsButtonsColor());
foreach(QAbstractButton *btn, const_buttons_) {
for (QAbstractButton *btn : qAsConst(const_buttons_)) {
btn->setStyleSheet(sheet.arg(coPal.name()));
}
}
......@@ -2232,19 +2240,22 @@ void KCalculator::setColors() {
//------------------------------------------------------------------------------
void KCalculator::setFonts() {
foreach(QObject *obj, leftPad->children()) {
const auto leftPadLst = leftPad->children();
for (QObject *obj : leftPadLst) {
if (auto const button = qobject_cast<KCalcButton*>(obj)) {
button->setFont(KCalcSettings::buttonFont());
}
}
foreach(QObject *obj, numericPad->children()) {
const auto numericPadLst = numericPad->children();
for (QObject *obj : numericPadLst) {
if (auto const button = qobject_cast<KCalcButton*>(obj)) {
button->setFont(KCalcSettings::buttonFont());
}
}
foreach(QObject *obj, rightPad->children()) {
const auto rightPadLst = rightPad->children();
for (QObject *obj : rightPadLst) {
if (auto const button = qobject_cast<KCalcButton*>(obj)) {
button->setFont(KCalcSettings::buttonFont());
}
......
kcalc_bitset.cpp
View file @ 194e7f13
......@@ -153,7 +153,7 @@ void KCalcBitset::slotToggleBit(QAbstractButton *button) {
const int bit = bit_button_group_->id(button);
const quint64 nv = getValue() ^(1LL << bit);
setValue(nv);
emit valueChanged(value_);
Q_EMIT valueChanged(value_);
}
}
kcalc_const_button.cpp
View file @ 194e7f13
......@@ -137,6 +137,6 @@ void KCalcConstButton::slotChooseScientificConst(const science_constant &const_c
//------------------------------------------------------------------------------
void KCalcConstButton::slotClicked() {
emit clicked(button_num_);
Q_EMIT clicked(button_num_);
}
kcalc_const_menu.cpp
View file @ 194e7f13
......@@ -132,7 +132,7 @@ void KCalcConstMenu::slotPassSignalThrough(QAction *chosen_const)
{
bool tmp_bool;
int chosen_const_idx = (chosen_const->data()).toInt(& tmp_bool);
emit triggeredConstant(scienceConstantList.at(chosen_const_idx));
Q_EMIT triggeredConstant(scienceConstantList.at(chosen_const_idx));
}
KCalcConstMenu::KCalcConstMenu(const QString &title, QWidget * parent)
......
kcalc_statusbar.cpp
View file @ 194e7f13
......@@ -34,14 +34,14 @@ KCalcStatusBar::KCalcStatusBar(QWidget *parent)
setSizeGripEnabled(false);
}
QLabel *KCalcStatusBar::addIndicator(QList<QString> indicatorTexts)
QLabel *KCalcStatusBar::addIndicator(const QList<QString> &indicatorTexts)
{
auto l = new QLabel(indicatorTexts.at(0), this);
// find widest indicator text
QFontMetrics fm(l->font());
int maxWidth = 0;
foreach (const QString &text, indicatorTexts) {
for (const QString &text : indicatorTexts) {
maxWidth = qMax(maxWidth, fm.boundingRect(text).width());
}
// add some padding
......
kcalc_statusbar.h
View file @ 194e7f13
......@@ -48,7 +48,7 @@ public:
void setMemoryIndicator(bool memory);
private:
QLabel *addIndicator(QList<QString> indicatorTexts);
QLabel *addIndicator(const QList<QString> &indicatorTexts);
private:
QLabel * const shift_indicator_;
......
kcalcdisplay.cpp
View file @ 194e7f13
......@@ -394,7 +394,7 @@ void KCalcDisplay::mousePressEvent(QMouseEvent *e) {
button_ = Qt::MiddleButton;
}
emit clicked();
Q_EMIT clicked();
}
//------------------------------------------------------------------------------
......@@ -516,7 +516,7 @@ bool KCalcDisplay::setAmount(const KNumber &new_amount) {
}
setText(display_str);
emit changedAmount(display_amount_);
Q_EMIT changedAmount(display_amount_);
return true;
}
......@@ -564,7 +564,7 @@ void KCalcDisplay::setText(const QString &string)
}
update();
emit changedText(text_);
Q_EMIT changedText(text_);
}
//------------------------------------------------------------------------------
......@@ -763,7 +763,7 @@ void KCalcDisplay::updateDisplay() {
Q_ASSERT(0);
}
emit changedAmount(display_amount_);
Q_EMIT changedAmount(display_amount_);
}
//------------------------------------------------------------------------------
......
stats.cpp
View file @ 194e7f13
......@@ -69,8 +69,7 @@ void KStats::clearLast() {
KNumber KStats::sum() const {
KNumber result = KNumber::Zero;
Q_FOREACH(const KNumber &x, data_) {
for (const KNumber &x : qAsConst(data_)) {
result += x;
}
......@@ -120,7 +119,7 @@ KNumber KStats::std_kernel() {
const KNumber mean_value = mean();
if(mean_value.type() != KNumber::TYPE_ERROR) {
Q_FOREACH(const KNumber &x, data_) {
for (const KNumber &x : qAsConst(data_)) {
result += (x - mean_value) * (x - mean_value);
}
}
......@@ -136,7 +135,7 @@ KNumber KStats::sum_of_squares() const {
KNumber result = KNumber::Zero;
Q_FOREACH(const KNumber &x, data_) {
for (const KNumber &x : qAsConst(data_)) {
result += (x * x);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment