diff options
Diffstat (limited to 'kplato')
-rw-r--r-- | kplato/kptaccountsview.cc | 4 | ||||
-rw-r--r-- | kplato/kptcalendarpanel.cc | 10 | ||||
-rw-r--r-- | kplato/kptconfigdialog.cc | 2 | ||||
-rw-r--r-- | kplato/kptdatetable.cc | 66 | ||||
-rw-r--r-- | kplato/kptdoublelistviewbase.cc | 6 | ||||
-rw-r--r-- | kplato/kptduration.cc | 8 | ||||
-rw-r--r-- | kplato/kptdurationwidget.ui.h | 12 | ||||
-rw-r--r-- | kplato/kptganttview.cc | 8 | ||||
-rw-r--r-- | kplato/kptreportview.cc | 2 | ||||
-rw-r--r-- | kplato/kptresource.cc | 8 | ||||
-rw-r--r-- | kplato/kptresourceappointmentsview.cc | 2 | ||||
-rw-r--r-- | kplato/kptresourcedialog.cc | 8 | ||||
-rw-r--r-- | kplato/kptresourceview.cc | 8 | ||||
-rw-r--r-- | kplato/kptstandardworktimedialog.cc | 6 | ||||
-rw-r--r-- | kplato/kpttaskappointmentsview.cc | 2 | ||||
-rw-r--r-- | kplato/kpttaskappointmentsview.ui.h | 12 | ||||
-rw-r--r-- | kplato/kpttaskcostpanel.cc | 8 |
17 files changed, 86 insertions, 86 deletions
diff --git a/kplato/kptaccountsview.cc b/kplato/kptaccountsview.cc index d2a38927..2527b5fe 100644 --- a/kplato/kptaccountsview.cc +++ b/kplato/kptaccountsview.cc @@ -90,7 +90,7 @@ AccountsView::AccountItem::AccountItem(TQString text, Account *a, TQListViewItem void AccountsView::AccountItem::add(int col, const TQDate &date, const EffortCost &ec) { EffortCost &cm = costMap.add(date, ec); if (m_slaveItem) - m_slaveItem->setText(col, KGlobal::locale()->formatMoney(cm.cost(), "", 0)); + m_slaveItem->setText(col, TDEGlobal::locale()->formatMoney(cm.cost(), "", 0)); } AccountsView::AccountsView(Project &project, View *view, TQWidget *parent) @@ -209,7 +209,7 @@ void AccountsView::slotUpdate() { //kdDebug()<<k_funcinfo<<endl; TQApplication::setOverrideCursor(TQt::waitCursor); createPeriods(); - KLocale *locale = KGlobal::locale(); + KLocale *locale = TDEGlobal::locale(); const KCalendarSystem *cal = locale->calendar(); TQString t; diff --git a/kplato/kptcalendarpanel.cc b/kplato/kptcalendarpanel.cc index 4010afa3..fec4088b 100644 --- a/kplato/kptcalendarpanel.cc +++ b/kplato/kptcalendarpanel.cc @@ -208,9 +208,9 @@ void CalendarPanel::dateChangedSlot(TQDate date) { //kdDebug() << "CalendarPanel::dateChangedSlot: date changed (" << date.year() << "/" << date.month() << "/" << date.day() << ")." << endl; - line->setText(KGlobal::locale()->formatDate(date, true)); + line->setText(TDEGlobal::locale()->formatDate(date, true)); d->selectWeek->setText(i18n("Week %1").arg(weekOfYear(date))); - selectMonth->setText(KGlobal::locale()->calendar()->monthName(date.month(), false)); + selectMonth->setText(TDEGlobal::locale()->calendar()->monthName(date.month(), false)); selectYear->setText(date.toString("yyyy")); emit(dateChanged(date)); } @@ -243,10 +243,10 @@ CalendarPanel::setDate(const TQDate& date) // ----- table->setDate(date); d->selectWeek->setText(i18n("Week %1").arg(weekOfYear(date))); - selectMonth->setText(KGlobal::locale()->calendar()->monthName(date.month(), false)); + selectMonth->setText(TDEGlobal::locale()->calendar()->monthName(date.month(), false)); temp.setNum(date.year()); selectYear->setText(temp); - line->setText(KGlobal::locale()->formatDate(date, true)); + line->setText(TDEGlobal::locale()->formatDate(date, true)); return true; } else { kdDebug() << "CalendarPanel::setDate: refusing to set invalid date." << endl; @@ -472,7 +472,7 @@ CalendarPanel::setFontSize(int s) TQFontMetrics metrics(selectMonth->fontMetrics()); for(int i=1; i <= 12; ++i) { // maxMonthRect is used by sizeHint() - r=metrics.boundingRect(KGlobal::locale()->calendar()->monthName(i, false)); + r=metrics.boundingRect(TDEGlobal::locale()->calendar()->monthName(i, false)); maxMonthRect.setWidth(TQMAX(r.width(), maxMonthRect.width())); maxMonthRect.setHeight(TQMAX(r.height(), maxMonthRect.height())); } diff --git a/kplato/kptconfigdialog.cc b/kplato/kptconfigdialog.cc index 2186d400..187a2101 100644 --- a/kplato/kptconfigdialog.cc +++ b/kplato/kptconfigdialog.cc @@ -40,7 +40,7 @@ namespace KPlato // little helper stolen from kmail/kword static inline TQPixmap loadIcon( const char * name ) { - return KGlobal::instance()->iconLoader() + return TDEGlobal::instance()->iconLoader() ->loadIcon( TQString::fromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium ); } diff --git a/kplato/kptdatetable.cc b/kplato/kptdatetable.cc index 2fc19d4f..8bb467a8 100644 --- a/kplato/kptdatetable.cc +++ b/kplato/kptdatetable.cc @@ -57,7 +57,7 @@ DateValidator::validate(TQString& text, int&) const TQValidator::State DateValidator::date(const TQString& text, TQDate& d) const { - TQDate tmp = KGlobal::locale()->readDate(text); + TQDate tmp = TDEGlobal::locale()->readDate(text); if (!tmp.isNull()) { d = tmp; @@ -96,7 +96,7 @@ DateTable::DateTable(TQWidget *parent, TQDate date_, const char* name, WFlags f) setHScrollBarMode(AlwaysOff); setVScrollBarMode(AlwaysOff); - viewport()->setEraseColor(KGlobalSettings::baseColor()); + viewport()->setEraseColor(TDEGlobalSettings::baseColor()); setDate(date_); // this initializes firstday, numdays, numDaysPrevMonth colorBackgroundHoliday = TQColor(0, 245, 255, TQColor::Hsv); @@ -106,8 +106,8 @@ DateTable::DateTable(TQWidget *parent, TQDate date_, const char* name, WFlags f) colorTextHoliday = black; colorTextWorkday = black; colorLine = black; - backgroundSelectColor = KGlobalSettings::highlightColor(); - penSelectColor=KGlobalSettings::baseColor(); + backgroundSelectColor = TDEGlobalSettings::highlightColor(); + penSelectColor=TDEGlobalSettings::baseColor(); } @@ -116,7 +116,7 @@ void DateTable::paintWeekday(TQPainter *painter, int col) { int w=cellWidth(); int h=cellHeight(); - TQFont font = KGlobalSettings::generalFont(); + TQFont font = TDEGlobalSettings::generalFont(); font.setBold(true); if (!m_enabled) font.setItalic(true); @@ -126,10 +126,10 @@ void DateTable::paintWeekday(TQPainter *painter, int col) { //kdDebug()<<k_funcinfo<<" col="<<col<<" day="<<day<<" name="<<daystr<<endl; - painter->setBrush(KGlobalSettings::baseColor()); - painter->setPen(KGlobalSettings::baseColor()); + painter->setBrush(TDEGlobalSettings::baseColor()); + painter->setPen(TDEGlobalSettings::baseColor()); painter->drawRect(0, 0, w, h); - painter->setPen(KGlobalSettings::textColor()); + painter->setPen(TDEGlobalSettings::textColor()); if (m_markedWeekdays.state(day) == Map::Working) { painter->setPen(colorBackgroundWorkday); @@ -148,7 +148,7 @@ void DateTable::paintWeekday(TQPainter *painter, int col) { painter->drawRect(2, 2, w-4, h-4); painter->setPen(penSelectColor); } - painter->drawText(0, 0, w, h-1, AlignCenter, KGlobal::locale()->calendar()->weekDayName(day, true), -1, &rect); + painter->drawText(0, 0, w, h-1, AlignCenter, TDEGlobal::locale()->calendar()->weekDayName(day, true), -1, &rect); painter->setPen(colorLine); painter->moveTo(0, h-1); painter->lineTo(w-1, h-1); @@ -164,16 +164,16 @@ void DateTable::paintWeekNumber(TQPainter *painter, int row) { int w=cellWidth(); int h=cellHeight(); - TQFont font=KGlobalSettings::generalFont(); + TQFont font=TDEGlobalSettings::generalFont(); font.setBold(true); if (!m_enabled) font.setItalic(true); painter->setFont(font); - painter->setBrush(KGlobalSettings::baseColor()); - painter->setPen(KGlobalSettings::baseColor()); + painter->setBrush(TDEGlobalSettings::baseColor()); + painter->setPen(TDEGlobalSettings::baseColor()); painter->drawRect(0, 0, w, h); - painter->setPen(KGlobalSettings::textColor()); + painter->setPen(TDEGlobalSettings::textColor()); painter->drawText(0, 0, w, h-1, AlignCenter, TQString("%1").arg(m_weeks[row].first), -1, &rect); painter->setPen(colorLine); @@ -190,7 +190,7 @@ void DateTable::paintDay(TQPainter *painter, int row, int col) { int w=cellWidth(); int h=cellHeight(); - TQFont font=KGlobalSettings::generalFont(); + TQFont font=TDEGlobalSettings::generalFont(); font.setPointSize(fontsize); if (!m_enabled) font.setItalic(true); @@ -198,8 +198,8 @@ void DateTable::paintDay(TQPainter *painter, int row, int col) { TQDate d = getDate(position(row, col)); - painter->setBrush(KGlobalSettings::baseColor()); - painter->setPen(KGlobalSettings::baseColor()); + painter->setBrush(TDEGlobalSettings::baseColor()); + painter->setPen(TDEGlobalSettings::baseColor()); painter->drawRect(0, 0, w, h); // First paint the dates background @@ -238,7 +238,7 @@ void DateTable::paintDay(TQPainter *painter, int row, int col) { } // and now the day number - d.month() == date.month() ? painter->setPen(KGlobalSettings::textColor()) : painter->setPen(gray); + d.month() == date.month() ? painter->setPen(TDEGlobalSettings::textColor()) : painter->setPen(gray); painter->drawText(0, 0, w, h, AlignCenter, TQString().setNum(d.day()), -1, &rect); if(rect.width()>maxCell.width()) maxCell.setWidth(rect.width()); @@ -252,7 +252,7 @@ void DateTable::paintCell(TQPainter *painter, int row, int col) { int w=cellWidth(); int h=cellHeight(); painter->setPen(colorLine); - painter->setBrush(KGlobalSettings::baseColor()); + painter->setBrush(TDEGlobalSettings::baseColor()); painter->moveTo(w-1, 0); painter->lineTo(w-1, h-1); painter->lineTo(0, h-1); @@ -348,7 +348,7 @@ void DateTable::setFontSize(int size) { maxCell.setHeight(0); for(count=0; count<7; ++count) { - rect=metrics.boundingRect(KGlobal::locale()->calendar()->weekDayName(count+1, true)); + rect=metrics.boundingRect(TDEGlobal::locale()->calendar()->weekDayName(count+1, true)); maxCell.setWidth(TQMAX(maxCell.width(), rect.width())); maxCell.setHeight(TQMAX(maxCell.height(), rect.height())); } @@ -507,7 +507,7 @@ bool DateTable::selectDate(const TQDate& date_) { } temp.setYMD(date.year(), date.month(), 1); - firstday=column(KGlobal::locale()->calendar()->dayOfWeek(temp)); + firstday=column(TDEGlobal::locale()->calendar()->dayOfWeek(temp)); if(firstday==1) firstday=8; // Reserve row 1 for previous month numdays=date.daysInMonth(); if(date.month()==1) { // set to december of previous year @@ -543,9 +543,9 @@ bool DateTable::setDate(const TQDate& date_, bool repaint) { //m_selectedDates.clear(); temp.setYMD(date.year(), date.month(), 1); - firstday=column(KGlobal::locale()->calendar()->dayOfWeek(temp)); + firstday=column(TDEGlobal::locale()->calendar()->dayOfWeek(temp)); if(firstday==1) firstday=8; - //kdDebug()<<k_funcinfo<<"date="<<temp<<"day="<<(KGlobal::locale()->calendar()->dayOfWeek(temp))<<" firstday="<<firstday<<endl; + //kdDebug()<<k_funcinfo<<"date="<<temp<<"day="<<(TDEGlobal::locale()->calendar()->dayOfWeek(temp))<<" firstday="<<firstday<<endl; numdays=date.daysInMonth(); if(date.month()==1) { // set to december of previous year temp.setYMD(date.year()-1, 12, 1); @@ -661,16 +661,16 @@ TQDate DateTable::getDate(int pos) const { } int DateTable::weekday(int col) const { - int day = col - m_dateStartCol + KGlobal::locale()->weekStartDay(); + int day = col - m_dateStartCol + TDEGlobal::locale()->weekStartDay(); if (day > 7) day %= 7; - //kdDebug()<<k_funcinfo<<"col="<<col<<" day="<<day<<" StartCol="<<m_dateStartCol<<" weekStartDay="<<KGlobal::locale()->weekStartDay()<<endl; + //kdDebug()<<k_funcinfo<<"col="<<col<<" day="<<day<<" StartCol="<<m_dateStartCol<<" weekStartDay="<<TDEGlobal::locale()->weekStartDay()<<endl; return day; } int DateTable::column(int weekday) const { - int col = weekday - KGlobal::locale()->weekStartDay(); + int col = weekday - TDEGlobal::locale()->weekStartDay(); if (col < 0) col += 7; - //kdDebug()<<k_funcinfo<<"col="<<col<<" day="<<col<<" StartCol="<<m_dateStartCol<<" weekStartDay="<<KGlobal::locale()->weekStartDay()<<endl; + //kdDebug()<<k_funcinfo<<"col="<<col<<" day="<<col<<" StartCol="<<m_dateStartCol<<" weekStartDay="<<TDEGlobal::locale()->weekStartDay()<<endl; return col + m_dateStartCol; } @@ -720,7 +720,7 @@ DateInternalWeekSelector::DateInternalWeekSelector { TQFont font; // ----- - font=KGlobalSettings::generalFont(); + font=TDEGlobalSettings::generalFont(); font.setPointSize(fontsize); setFont(font); setFrameStyle(TQFrame::NoFrame); @@ -770,7 +770,7 @@ DateInternalMonthPicker::DateInternalMonthPicker // ----- activeCol = -1; activeRow = -1; - font=KGlobalSettings::generalFont(); + font=TDEGlobalSettings::generalFont(); font.setPointSize(fontsize); setFont(font); setHScrollBarMode(AlwaysOff); @@ -780,13 +780,13 @@ DateInternalMonthPicker::DateInternalMonthPicker setNumCols(3); // enable to find drawing failures: // setTableFlags(Tbl_clipCellPainting); - viewport()->setEraseColor(KGlobalSettings::baseColor()); // for consistency with the datepicker + viewport()->setEraseColor(TDEGlobalSettings::baseColor()); // for consistency with the datepicker // ----- find the preferred size // (this is slow, possibly, but unfortunatly it is needed here): TQFontMetrics metrics(font); for(int i=1; i <= 12; ++i) { - rect=metrics.boundingRect(KGlobal::locale()->calendar()->monthName(i, false)); + rect=metrics.boundingRect(TDEGlobal::locale()->calendar()->monthName(i, false)); if(max.width()<rect.width()) max.setWidth(rect.width()); if(max.height()<rect.height()) max.setHeight(rect.height()); } @@ -809,7 +809,7 @@ DateInternalMonthPicker::getResult() const void DateInternalMonthPicker::setupPainter(TQPainter *p) { - p->setPen(KGlobalSettings::textColor()); + p->setPen(TDEGlobalSettings::textColor()); } void @@ -826,7 +826,7 @@ DateInternalMonthPicker::paintCell(TQPainter* painter, int row, int col) TQString text; // ----- find the number of the cell: index=3*row+col+1; - text=KGlobal::locale()->calendar()->monthName(index, false); + text=TDEGlobal::locale()->calendar()->monthName(index, false); painter->drawText(0, 0, cellWidth(), cellHeight(), AlignCenter, text); if ( activeCol == col && activeRow == row ) painter->drawRect( 0, 0, cellWidth(), cellHeight() ); @@ -932,7 +932,7 @@ DateInternalYearSelector::DateInternalYearSelector { TQFont font; // ----- - font=KGlobalSettings::generalFont(); + font=TDEGlobalSettings::generalFont(); font.setPointSize(fontsize); setFont(font); setFrameStyle(TQFrame::NoFrame); diff --git a/kplato/kptdoublelistviewbase.cc b/kplato/kptdoublelistviewbase.cc index 4a04c1b0..5f641792 100644 --- a/kplato/kptdoublelistviewbase.cc +++ b/kplato/kptdoublelistviewbase.cc @@ -129,7 +129,7 @@ void DoubleListViewBase::SlaveListItem::clearColumn(int col) { void DoubleListViewBase::SlaveListItem::setColumn(int col, double value) { if (col < listView()->columns()) { //setText(col, TQString("%1").arg(value, m_fieldwidth, m_fmt, m_prec)); - setText(col, KGlobal::locale()->formatNumber(value, m_prec)); + setText(col, TDEGlobal::locale()->formatNumber(value, m_prec)); m_valueMap.replace(col, value); //kdDebug()<<k_funcinfo<<m_masterItem->text(0)<<": column["<<col<<"]="<<value<<endl; } @@ -241,14 +241,14 @@ void DoubleListViewBase::MasterListItem::slaveItemDeleted() { void DoubleListViewBase::MasterListItem::setTotal(double tot) { m_value = tot; //setText(1, TQString("%1").arg(tot, m_fieldwidth, m_fmt, m_prec)); - setText(1, KGlobal::locale()->formatNumber(tot, m_prec)); + setText(1, TDEGlobal::locale()->formatNumber(tot, m_prec)); //kdDebug()<<k_funcinfo<<text(0)<<"="<<tot<<endl; } void DoubleListViewBase::MasterListItem::addToTotal(double v) { m_value += v; //setText(1, TQString("%1").arg(m_value, m_fieldwidth, m_fmt, m_prec)); - setText(1, KGlobal::locale()->formatNumber(m_value, m_prec)); + setText(1, TDEGlobal::locale()->formatNumber(m_value, m_prec)); } double DoubleListViewBase::MasterListItem::calcTotal() { diff --git a/kplato/kptduration.cc b/kplato/kptduration.cc index 0a2296b0..ec817195 100644 --- a/kplato/kptduration.cc +++ b/kplato/kptduration.cc @@ -148,7 +148,7 @@ TQString Duration::toString(Format format) const { result.sprintf("%u %02u:%02u:%02u.%u", (unsigned)days, hours, minutes, seconds, (unsigned)ms); break; case Format_HourFraction: - result = KGlobal::locale()->formatNumber(toDouble(Unit_h), 2); + result = TDEGlobal::locale()->formatNumber(toDouble(Unit_h), 2); break; // i18n case Format_i18nHour: @@ -159,7 +159,7 @@ TQString Duration::toString(Format format) const { result = i18n("<hours>h:<minutes>m", "%1h:%2m").arg(hours).arg(minutes); break; case Format_i18nDay: - result = KGlobal::locale()->formatNumber(toDouble(Unit_d), 2); + result = TDEGlobal::locale()->formatNumber(toDouble(Unit_d), 2); break; case Format_i18nDayTime: ms = m_ms; @@ -178,7 +178,7 @@ TQString Duration::toString(Format format) const { } break; case Format_i18nHourFraction: - result = KGlobal::locale()->formatNumber(toDouble(Unit_h), 2); + result = TDEGlobal::locale()->formatNumber(toDouble(Unit_h), 2); break; default: kdFatal()<<k_funcinfo<<"Unknown format"<<endl; @@ -218,7 +218,7 @@ Duration Duration::fromString(const TQString &s, Format format, bool *ok) { case Format_HourFraction: { // should be in double format bool res; - double f = KGlobal::locale()->readNumber(s, &res); + double f = TDEGlobal::locale()->readNumber(s, &res); if (ok) *ok = res; if (res) { return Duration((TQ_INT64)(f*3600.0)); diff --git a/kplato/kptdurationwidget.ui.h b/kplato/kptdurationwidget.ui.h index 4380c92e..837114d8 100644 --- a/kplato/kptdurationwidget.ui.h +++ b/kplato/kptdurationwidget.ui.h @@ -81,7 +81,7 @@ do \ void DurationWidget::init() { // Use the user's decimal point! - m_decimalPoint = KGlobal::locale()->decimalSymbol(); + m_decimalPoint = TDEGlobal::locale()->decimalSymbol(); //NOTE: // This isn't as flexible/general as Shaheed once made it. @@ -305,7 +305,7 @@ void DurationWidget::handleLostFocus( // Get the text and start processing... TQString newValue(current->text()); - double v = KGlobal::locale()->readNumber(newValue); + double v = TDEGlobal::locale()->readNumber(newValue); unsigned currentValue = 0; TQString tmp; //kdDebug()<<k_funcinfo<<field<<": value="<<v<<" v="<<v<<endl; @@ -319,7 +319,7 @@ void DurationWidget::handleLostFocus( // Get remainder. v = v - (tmp.toUInt() * leftScale); - newValue = KGlobal::locale()->formatNumber(v); + newValue = TDEGlobal::locale()->formatNumber(v); } int point = newValue.find(m_decimalPoint); if (point != -1) @@ -332,11 +332,11 @@ void DurationWidget::handleLostFocus( //kdDebug()<<k_funcinfo<<field<<": value="<<newValue<<" rightScale="<<rightScale<<" frac="<<frac<<" ("<<newValue.mid(point)<<")"<<endl; // Propagate fraction v = rightScale * (frac*power(10.0, -p)); - frac = fraction(KGlobal::locale()->formatNumber(v, 19), 0); + frac = fraction(TDEGlobal::locale()->formatNumber(v, 19), 0); //kdDebug()<<k_funcinfo<<field<<": v="<<v<<" ("<<(unsigned)v<<") rest="<<frac<<endl; if (frac > 0.0) { - tmp = KGlobal::locale()->formatNumber(v, 19); + tmp = TDEGlobal::locale()->formatNumber(v, 19); right->setText(tmp); handleLostFocus(field + 1); } else { @@ -449,7 +449,7 @@ double DurationWidget::fraction(TQString number, int *exp) { } else { v = number.mid(point); } - return KGlobal::locale()->readNumber(v); + return TDEGlobal::locale()->readNumber(v); } } //KPlato namespace diff --git a/kplato/kptganttview.cc b/kplato/kptganttview.cc index 28ef7a57..db077819 100644 --- a/kplato/kptganttview.cc +++ b/kplato/kptganttview.cc @@ -482,7 +482,7 @@ void GanttView::modifyProject(KDGanttViewItem *item, Node *node) void GanttView::modifySummaryTask(KDGanttViewItem *item, Task *task) { //kdDebug()<<k_funcinfo<<endl; - KLocale *locale = KGlobal::locale(); + KLocale *locale = TDEGlobal::locale(); //kdDebug()<<k_funcinfo<<task->name()<<": "<<task->currentSchedule()<<", "<<task->notScheduled()<<", "<<(m_project ? m_project->notScheduled() : false)<<endl; if (task->currentSchedule() == 0) { item->setShowNoInformation(m_showNoInformation); @@ -530,7 +530,7 @@ void GanttView::modifySummaryTask(KDGanttViewItem *item, Task *task) void GanttView::modifyTask(KDGanttViewItem *item, Task *task) { //kdDebug()<<k_funcinfo<<endl; - KLocale *locale = KGlobal::locale(); + KLocale *locale = TDEGlobal::locale(); //kdDebug()<<k_funcinfo<<task->name()<<": "<<task->currentSchedule()<<", "<<task->notScheduled()<<", "<<(m_project ? m_project->notScheduled() : false)<<endl; item->setListViewText(task->name()); item->setListViewText(1, task->wbs()); @@ -652,7 +652,7 @@ void GanttView::modifyTask(KDGanttViewItem *item, Task *task) void GanttView::modifyMilestone(KDGanttViewItem *item, Task *task) { //kdDebug()<<k_funcinfo<<endl; - KLocale *locale = KGlobal::locale(); + KLocale *locale = TDEGlobal::locale(); //kdDebug()<<k_funcinfo<<task->name()<<": "<<task->currentSchedule()<<", "<<task->notScheduled()<<", "<<(m_project ? m_project->notScheduled() : false)<<endl; if (task->currentSchedule() == 0) { item->setShowNoInformation(m_showNoInformation); @@ -1048,7 +1048,7 @@ void GanttView::print(KPrinter &prt) { p.drawRect(0,0,metrics.width(),metrics.height()); TQString text; int hei = 0; - text = KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()); + text = TDEGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()); TQRect r = p.boundingRect(metrics.width()-1,0,0,0, TQt::AlignRight, text ); p.drawText( r, TQt::AlignRight, text ); hei = r.height(); diff --git a/kplato/kptreportview.cc b/kplato/kptreportview.cc index a07ea359..97d15dd5 100644 --- a/kplato/kptreportview.cc +++ b/kplato/kptreportview.cc @@ -79,7 +79,7 @@ public: TQString getData(TQString tag) const { //kdDebug()<<k_funcinfo<<"tag="<<tag<<endl; - KLocale *l = KGlobal::locale(); + KLocale *l = TDEGlobal::locale(); if (!tag.contains('.')) { // global tags if (tag == "currentdate") { diff --git a/kplato/kptresource.cc b/kplato/kptresource.cc index 2c218fe9..00fe8aaa 100644 --- a/kplato/kptresource.cc +++ b/kplato/kptresource.cc @@ -360,8 +360,8 @@ bool Resource::load(TQDomElement &element) { if (s != "") m_availableUntil = DateTime::fromString(s); - cost.normalRate = KGlobal::locale()->readMoney(element.attribute("normal-rate")); - cost.overtimeRate = KGlobal::locale()->readMoney(element.attribute("overtime-rate")); + cost.normalRate = TDEGlobal::locale()->readMoney(element.attribute("normal-rate")); + cost.overtimeRate = TDEGlobal::locale()->readMoney(element.attribute("overtime-rate")); return true; } @@ -380,8 +380,8 @@ void Resource::save(TQDomElement &element) const { me.setAttribute("units", m_units); me.setAttribute("available-from", m_availableFrom.toString(Qt::ISODate)); me.setAttribute("available-until", m_availableUntil.toString(Qt::ISODate)); - me.setAttribute("normal-rate", KGlobal::locale()->formatMoney(cost.normalRate)); - me.setAttribute("overtime-rate", KGlobal::locale()->formatMoney(cost.overtimeRate)); + me.setAttribute("normal-rate", TDEGlobal::locale()->formatMoney(cost.normalRate)); + me.setAttribute("overtime-rate", TDEGlobal::locale()->formatMoney(cost.overtimeRate)); } bool Resource::isAvailable(Task */*task*/) { diff --git a/kplato/kptresourceappointmentsview.cc b/kplato/kptresourceappointmentsview.cc index 5531156f..082892d2 100644 --- a/kplato/kptresourceappointmentsview.cc +++ b/kplato/kptresourceappointmentsview.cc @@ -126,7 +126,7 @@ void ResourceAppointmentsView::slotUpdate() { return; TQApplication::setOverrideCursor(TQt::waitCursor); createSlaveItems(); - KLocale *locale = KGlobal::locale(); + KLocale *locale = TDEGlobal::locale(); const KCalendarSystem *cal = locale->calendar(); const Calendar *resCal = m_resource->calendar(); const TQDateTime availFrom = m_resource->availableFrom(); diff --git a/kplato/kptresourcedialog.cc b/kplato/kptresourcedialog.cc index 4746f1fc..85af224c 100644 --- a/kplato/kptresourcedialog.cc +++ b/kplato/kptresourcedialog.cc @@ -135,8 +135,8 @@ ResourceDialog::ResourceDialog(Project &project, Resource *resource, TQWidget *p dia->units->setValue(resource->units()); dia->availableFrom->setDateTime(resource->availableFrom()); dia->availableUntil->setDateTime(resource->availableUntil()); - dia->rateEdit->setText(KGlobal::locale()->formatMoney(resource->normalRate())); - dia->overtimeEdit->setText(KGlobal::locale()->formatMoney(resource->overtimeRate())); + dia->rateEdit->setText(TDEGlobal::locale()->formatMoney(resource->normalRate())); + dia->overtimeEdit->setText(TDEGlobal::locale()->formatMoney(resource->overtimeRate())); int cal = 0; dia->calendarList->insertItem(i18n("None")); @@ -173,8 +173,8 @@ void ResourceDialog::slotOk() { m_resource.setType((Resource::Type)(dia->type->currentItem())); m_resource.setUnits(dia->units->value()); - m_resource.setNormalRate(KGlobal::locale()->readMoney(dia->rateEdit->text())); - m_resource.setOvertimeRate(KGlobal::locale()->readMoney(dia->overtimeEdit->text())); + m_resource.setNormalRate(TDEGlobal::locale()->readMoney(dia->rateEdit->text())); + m_resource.setOvertimeRate(TDEGlobal::locale()->readMoney(dia->overtimeEdit->text())); m_resource.setCalendar(m_calendars[dia->calendarList->currentItem()]); m_resource.setAvailableFrom(dia->availableFrom->dateTime()); m_resource.setAvailableUntil(dia->availableUntil->dateTime()); diff --git a/kplato/kptresourceview.cc b/kplato/kptresourceview.cc index 58ea413e..5ce557cd 100644 --- a/kplato/kptresourceview.cc +++ b/kplato/kptresourceview.cc @@ -492,11 +492,11 @@ void ResourceView::drawResources(const Project &proj, TQListViewItem *parent, Re item->setText(2, r->initials()); item->setText(3, r->email()); item->setText(4, r->calendar() ? r->calendar()->name() : i18n("None")); - item->setText(5, KGlobal::locale()->formatDateTime(r->availableFrom())); - item->setText(6, KGlobal::locale()->formatDateTime(r->availableUntil())); + item->setText(5, TDEGlobal::locale()->formatDateTime(r->availableFrom())); + item->setText(6, TDEGlobal::locale()->formatDateTime(r->availableUntil())); item->setText(7, TQString().setNum(r->units())); - item->setText(8, KGlobal::locale()->formatMoney(r->normalRate())); - item->setText(9, KGlobal::locale()->formatMoney(r->overtimeRate())); + item->setText(8, TDEGlobal::locale()->formatMoney(r->normalRate())); + item->setText(9, TDEGlobal::locale()->formatMoney(r->overtimeRate())); if (!m_selectedItem) { m_selectedItem = item; } diff --git a/kplato/kptstandardworktimedialog.cc b/kplato/kptstandardworktimedialog.cc index fb5a9c0e..d7c2c759 100644 --- a/kplato/kptstandardworktimedialog.cc +++ b/kplato/kptstandardworktimedialog.cc @@ -60,7 +60,7 @@ public: if (day->state() == Map::NonWorking) { setHours(); } else { - setText(1, KGlobal::locale()->formatNumber(day->duration().toDouble(Duration::Unit_h))); + setText(1, TDEGlobal::locale()->formatNumber(day->duration().toDouble(Duration::Unit_h))); } } ~WeekdayListItem() { @@ -72,7 +72,7 @@ public: } void setIntervals(TQPtrList<TQPair<TQTime, TQTime> > intervals) { day->setIntervals(intervals); - setText(1, KGlobal::locale()->formatNumber(day->duration().toDouble(Duration::Unit_h))); + setText(1, TDEGlobal::locale()->formatNumber(day->duration().toDouble(Duration::Unit_h))); } void setState(int st) { day->setState(st+1); @@ -166,7 +166,7 @@ StandardWorktimeDialogImpl::StandardWorktimeDialogImpl(StandardWorktime *std, TQ weekdayList->setSorting(-1); weekdayList->header()->setStretchEnabled(true); - const KCalendarSystem * cs = KGlobal::locale()->calendar(); + const KCalendarSystem * cs = TDEGlobal::locale()->calendar(); Calendar *cal = m_std->calendar(); if (cal) { WeekdayListItem *item = 0; diff --git a/kplato/kpttaskappointmentsview.cc b/kplato/kpttaskappointmentsview.cc index 387e75e5..7c9288a3 100644 --- a/kplato/kpttaskappointmentsview.cc +++ b/kplato/kpttaskappointmentsview.cc @@ -108,7 +108,7 @@ void TaskAppointmentsView::slotUpdate() { return; TQApplication::setOverrideCursor(TQt::waitCursor); createSlaveItems(); - KLocale *locale = KGlobal::locale(); + KLocale *locale = TDEGlobal::locale(); const KCalendarSystem *cal = locale->calendar(); // Add columns for selected period/periods diff --git a/kplato/kpttaskappointmentsview.ui.h b/kplato/kpttaskappointmentsview.ui.h index b06fb4be..b638597e 100644 --- a/kplato/kpttaskappointmentsview.ui.h +++ b/kplato/kpttaskappointmentsview.ui.h @@ -63,9 +63,9 @@ void TaskAppointmentsView::draw(Task *task) item->setText(i++, it.current()->startTime().date().toString(ISODate)); item->setText(i++, it.current()->endTime().date().toString(ISODate)); item->setText(i++, it.current()->plannedEffort().toString(Duration::Format_HourFraction)); - item->setText(i++, KGlobal::locale()->formatMoney(r->normalRate())); - item->setText(i++, KGlobal::locale()->formatMoney(r->overtimeRate())); - item->setText(i++, KGlobal::locale()->formatMoney(r->fixedCost())); + item->setText(i++, TDEGlobal::locale()->formatMoney(r->normalRate())); + item->setText(i++, TDEGlobal::locale()->formatMoney(r->overtimeRate())); + item->setText(i++, TDEGlobal::locale()->formatMoney(r->fixedCost())); TQPtrListIterator<AppointmentInterval> ait = it.current()->intervals(); for (; ait.current(); ++ait) { TQListViewItem *sub = new TQListViewItem(item, ""); @@ -98,9 +98,9 @@ void TaskAppointmentsView::drawCostEffort() { if (m_task == 0) return; - m_actualCost->setText(KGlobal::locale()->formatMoney(m_task->actualCostTo(m_date->date()))); - m_plannedCost->setText(KGlobal::locale()->formatMoney(m_task->plannedCostTo(m_date->date()))); - m_plannedCostTotal->setText(KGlobal::locale()->formatMoney(m_task->plannedCost())); + m_actualCost->setText(TDEGlobal::locale()->formatMoney(m_task->actualCostTo(m_date->date()))); + m_plannedCost->setText(TDEGlobal::locale()->formatMoney(m_task->plannedCostTo(m_date->date()))); + m_plannedCostTotal->setText(TDEGlobal::locale()->formatMoney(m_task->plannedCost())); m_actualEffort->setText(m_task->actualEffortTo(m_date->date()).toString(Duration::Format_HourFraction)); m_plannedEffort->setText(m_task->plannedEffortTo(m_date->date()).toString(Duration::Format_HourFraction)); diff --git a/kplato/kpttaskcostpanel.cc b/kplato/kpttaskcostpanel.cc index 8e1ce0d0..a2447f6b 100644 --- a/kplato/kpttaskcostpanel.cc +++ b/kplato/kpttaskcostpanel.cc @@ -51,14 +51,14 @@ void TaskCostPanel::setStartValues(Task &task) { setCurrentItem(runningAccount, m_oldrunning->name()); } - startupCost->setText(KGlobal::locale()->formatMoney(task.startupCost())); + startupCost->setText(TDEGlobal::locale()->formatMoney(task.startupCost())); startupAccount->insertStringList(m_accountList); m_oldstartup = m_accounts.findStartupAccount(task); if (m_oldstartup) { setCurrentItem(startupAccount, m_oldstartup->name()); } - shutdownCost->setText(KGlobal::locale()->formatMoney(task.shutdownCost())); + shutdownCost->setText(TDEGlobal::locale()->formatMoney(task.shutdownCost())); shutdownAccount->insertStringList(m_accountList); m_oldshutdown = m_accounts.findShutdownAccount(task); if (m_oldshutdown) { @@ -95,12 +95,12 @@ KCommand *TaskCostPanel::buildCommand(Part *part) { cmd->addCommand(new NodeModifyShutdownAccountCmd(part, m_task, m_oldshutdown, m_accounts.findAccount(shutdownAccount->currentText()))); modified = true; } - double money = KGlobal::locale()->readMoney(startupCost->text()); + double money = TDEGlobal::locale()->readMoney(startupCost->text()); if (money != m_task.startupCost()) { cmd->addCommand(new NodeModifyStartupCostCmd(part, m_task, money)); modified = true; } - money = KGlobal::locale()->readMoney(shutdownCost->text()); + money = TDEGlobal::locale()->readMoney(shutdownCost->text()); if (money != m_task.shutdownCost()) { cmd->addCommand(new NodeModifyShutdownCostCmd(part, m_task, money)); modified = true; |