From 2943dd3424f5363483d65eb10d0cae34bd2051c7 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Fri, 13 Apr 2012 02:20:30 -0500 Subject: Fix inadvertent "TQ" changes. --- kmymoney2/widgets/kmymoneycalculator.cpp | 14 +++++++------- kmymoney2/widgets/kmymoneycalculator.h | 4 ++-- kmymoney2/widgets/kmymoneycalendar.cpp | 2 +- kmymoney2/widgets/kmymoneydatetbl.cpp | 12 ++++++------ kmymoney2/widgets/kmymoneydatetbl.h | 2 +- kmymoney2/widgets/kmymoneyonlinequoteconfig.h | 4 ++-- kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp | 4 ++-- 7 files changed, 21 insertions(+), 21 deletions(-) (limited to 'kmymoney2/widgets') diff --git a/kmymoney2/widgets/kmymoneycalculator.cpp b/kmymoney2/widgets/kmymoneycalculator.cpp index 47d45ed..e3b72a4 100644 --- a/kmymoney2/widgets/kmymoneycalculator.cpp +++ b/kmymoney2/widgets/kmymoneycalculator.cpp @@ -67,7 +67,7 @@ kMyMoneyCalculator::kMyMoneyCalculator(TQWidget* parent, const char *name) buttons[MINUS] = new KPushButton("-", this); buttons[STAR] = new KPushButton("X", this); buttons[COMMA] = new KPushButton(m_comma, this); - buttons[ETQUAL] = new KPushButton("=", this); + buttons[EQUAL] = new KPushButton("=", this); buttons[SLASH] = new KPushButton("/", this); buttons[CLEAR] = new KPushButton("C", this); buttons[CLEARALL] = new KPushButton("AC", this); @@ -90,13 +90,13 @@ kMyMoneyCalculator::kMyMoneyCalculator(TQWidget* parent, const char *name) grid->addWidget(buttons[MINUS], 4, 3); grid->addWidget(buttons[STAR], 3, 4); grid->addWidget(buttons[SLASH], 4, 4); - grid->addWidget(buttons[ETQUAL], 4, 2); + grid->addWidget(buttons[EQUAL], 4, 2); grid->addWidget(buttons[PLUSMINUS], 2, 3); grid->addWidget(buttons[PERCENT], 2, 4); grid->addWidget(buttons[CLEAR], 1, 3); grid->addWidget(buttons[CLEARALL], 1, 4); - buttons[ETQUAL]->setFocus(); + buttons[EQUAL]->setFocus(); op1 = 0.0; stackedOp = op = 0; @@ -113,7 +113,7 @@ kMyMoneyCalculator::kMyMoneyCalculator(TQWidget* parent, const char *name) // connect the calculation operations through another mapper mapper = new TQSignalMapper(TQT_TQOBJECT(this)); - for(int i = PLUS; i <= ETQUAL; ++i) { + for(int i = PLUS; i <= EQUAL; ++i) { mapper->setMapping(TQT_TQOBJECT(buttons[i]), i); connect(buttons[i], TQT_SIGNAL(clicked()), mapper, TQT_SLOT(map())); } @@ -184,7 +184,7 @@ void kMyMoneyCalculator::plusminusClicked(void) void kMyMoneyCalculator::calculationClicked(int button) { - if(operand.length() == 0 && op != 0 && button == ETQUAL) { + if(operand.length() == 0 && op != 0 && button == EQUAL) { op = 0; m_result = normalizeString(op1); changeDisplay(m_result); @@ -249,7 +249,7 @@ void kMyMoneyCalculator::calculationClicked(int button) changeDisplay(m_result); } - if(button != ETQUAL) { + if(button != EQUAL) { op = button; } else { op = 0; @@ -396,7 +396,7 @@ void kMyMoneyCalculator::keyPressEvent(TQKeyEvent* ev) case TQt::Key_Return: case TQt::Key_Enter: case TQt::Key_Equal: - button = ETQUAL; + button = EQUAL; break; case TQt::Key_Escape: button = CLEARALL; diff --git a/kmymoney2/widgets/kmymoneycalculator.h b/kmymoney2/widgets/kmymoneycalculator.h index 3eaf055..a73b13a 100644 --- a/kmymoney2/widgets/kmymoneycalculator.h +++ b/kmymoney2/widgets/kmymoneycalculator.h @@ -222,7 +222,7 @@ private: /* 0-9 are used by digits */ COMMA = 10, /* - * make sure, that PLUS through ETQUAL remain in + * make sure, that PLUS through EQUAL remain in * the order they are. Otherwise, check the calculation * signal mapper */ @@ -230,7 +230,7 @@ private: MINUS, SLASH, STAR, - ETQUAL, + EQUAL, PLUSMINUS, PERCENT, CLEAR, diff --git a/kmymoney2/widgets/kmymoneycalendar.cpp b/kmymoney2/widgets/kmymoneycalendar.cpp index 7aae4ad..28ee506 100644 --- a/kmymoney2/widgets/kmymoneycalendar.cpp +++ b/kmymoney2/widgets/kmymoneycalendar.cpp @@ -623,7 +623,7 @@ void kMyMoneyCalendar::slotSetStyleMonthly() void kMyMoneyCalendar::slotSetStyleQuarterly() { - setType(kMyMoneyDateTbl::TQUARTERLY); + setType(kMyMoneyDateTbl::QUARTERLY); } void kMyMoneyCalendar::setUserButton1(bool enable, TQPushButton* pb) diff --git a/kmymoney2/widgets/kmymoneydatetbl.cpp b/kmymoney2/widgets/kmymoneydatetbl.cpp index 37d1311..2a51307 100644 --- a/kmymoney2/widgets/kmymoneydatetbl.cpp +++ b/kmymoney2/widgets/kmymoneydatetbl.cpp @@ -178,7 +178,7 @@ kMyMoneyDateTbl::paintCell(TQPainter *painter, int row, int col) if(rect.height()>maxCell.height()) maxCell.setHeight(rect.height()); } - else if (m_type == TQUARTERLY) + else if (m_type == QUARTERLY) { int athird = width()/3; @@ -253,7 +253,7 @@ kMyMoneyDateTbl::paintCell(TQPainter *painter, int row, int col) drawDate = date.addDays(diff); } - else if (m_type == TQUARTERLY) + else if (m_type == QUARTERLY) { } @@ -444,7 +444,7 @@ kMyMoneyDateTbl::contentsMouseReleaseEvent(TQMouseEvent *e) setDate(date.addDays(diff)); updateCell(dayOfWeek, 0); } - else if (m_type == TQUARTERLY) + else if (m_type == QUARTERLY) { } @@ -538,11 +538,11 @@ void kMyMoneyDateTbl::setType(calendarType type) m_colCount = 1; m_type = WEEKLY; } - else if (type == TQUARTERLY) + else if (type == QUARTERLY) { m_rowCount = 7; m_colCount = 21; - m_type = TQUARTERLY; + m_type = QUARTERLY; } else // default to monthly { @@ -628,7 +628,7 @@ void kMyMoneyDateTbl::contentsMouseMoveEvent(TQMouseEvent* e) drawDate = date.addDays(diff); } - else if (m_type == TQUARTERLY) + else if (m_type == QUARTERLY) { } diff --git a/kmymoney2/widgets/kmymoneydatetbl.h b/kmymoney2/widgets/kmymoneydatetbl.h index 015e2cc..21da84d 100644 --- a/kmymoney2/widgets/kmymoneydatetbl.h +++ b/kmymoney2/widgets/kmymoneydatetbl.h @@ -68,7 +68,7 @@ class kMyMoneyDateTbl : public TQGridView { public: enum calendarType { WEEKLY, MONTHLY, - TQUARTERLY }; + QUARTERLY }; public: /** diff --git a/kmymoney2/widgets/kmymoneyonlinequoteconfig.h b/kmymoney2/widgets/kmymoneyonlinequoteconfig.h index 069b664..1fdc1db 100644 --- a/kmymoney2/widgets/kmymoneyonlinequoteconfig.h +++ b/kmymoney2/widgets/kmymoneyonlinequoteconfig.h @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#ifndef KMYMONEYONLINETQUOTECONFIG_H -#define KMYMONEYONLINETQUOTECONFIG_H +#ifndef KMYMONEYONLINEQUOTECONFIG_H +#define KMYMONEYONLINEQUOTECONFIG_H // ---------------------------------------------------------------------------- // QT Includes diff --git a/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp b/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp index f15773c..ad96947 100644 --- a/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp +++ b/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp @@ -337,7 +337,7 @@ void kMyMoneyScheduledDateTbl::drawCellContents(TQPainter *painter, int /*row*/, painter->drawText(0, 0, w, h, AlignCenter, text, -1, &rect); } - else if (m_type == TQUARTERLY) + else if (m_type == QUARTERLY) { painter->setBrush(KGlobalSettings::baseColor()); @@ -434,7 +434,7 @@ void kMyMoneyScheduledDateTbl::contentsMouseMoveEvent(TQMouseEvent* e) drawDate = date.addDays(diff); } - else if (m_type == TQUARTERLY) + else if (m_type == QUARTERLY) { } -- cgit v1.2.1