diff options
Diffstat (limited to 'kalarm/alarmlistview.cpp')
| -rw-r--r-- | kalarm/alarmlistview.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/kalarm/alarmlistview.cpp b/kalarm/alarmlistview.cpp index 355cc4e3e..3e3db18d4 100644 --- a/kalarm/alarmlistview.cpp +++ b/kalarm/alarmlistview.cpp @@ -167,7 +167,7 @@ void AlarmListView::populate() KAEvent event; KCal::Event::List events; KCal::Event::List::ConstIterator it; - TQDateTime now = TQDateTime::tqcurrentDateTime(); + TQDateTime now = TQDateTime::currentDateTime(); if (mShowExpired) { AlarmCalendar* cal = AlarmCalendar::expiredCalendarOpen(); @@ -257,7 +257,7 @@ void AlarmListView::updateTimeToAlarms(bool forceDisplay) { if (forceDisplay || columnWidth(mColumn[TIME_TO_COLUMN])) { - TQDateTime now = TQDateTime::tqcurrentDateTime(); + TQDateTime now = TQDateTime::currentDateTime(); for (AlarmListViewItem* item = firstChild(); item; item = item->nextSibling()) item->updateTimeToAlarm(now, forceDisplay); } @@ -269,7 +269,7 @@ void AlarmListView::updateTimeToAlarms(bool forceDisplay) */ void AlarmListView::addEvent(const KAEvent& event, EventListViewBase* view) { - TQDateTime now = TQDateTime::tqcurrentDateTime(); + TQDateTime now = TQDateTime::currentDateTime(); for (InstanceListConstIterator it = mInstanceList.begin(); it != mInstanceList.end(); ++it) static_cast<AlarmListView*>(*it)->addEntry(event, now, true, (*it == view)); } @@ -290,7 +290,7 @@ AlarmListViewItem* AlarmListView::addEntry(const KAEvent& event, const TQDateTim */ EventListViewItemBase* AlarmListView::createItem(const KAEvent& event) { - return new AlarmListViewItem(this, event, TQDateTime::tqcurrentDateTime()); + return new AlarmListViewItem(this, event, TQDateTime::currentDateTime()); } /****************************************************************************** @@ -373,7 +373,7 @@ void AlarmListView::contentsMouseMoveEvent(TQMouseEvent* e) // Create a calendar object containing all the currently selected alarms kdDebug(5950) << "AlarmListView::contentsMouseMoveEvent(): drag started" << endl; mMousePressed = false; - KCal::CalendarLocal cal(TQString::tqfromLatin1("UTC")); + KCal::CalendarLocal cal(TQString::fromLatin1("UTC")); cal.setLocalTime(); // write out using local time (i.e. no time zone) TQValueList<EventListViewItemBase*> items = selectedItems(); if (!items.count()) @@ -503,7 +503,7 @@ TQString AlarmListViewItem::alarmTimeText(const DateTime& dateTime) const { // Initialise the position of the hour within the time string, if leading // zeroes are omitted, so that displayed times can be aligned with each other. - mTimeHourPos = -1; // default = tqalignment isn't possible/sensible + mTimeHourPos = -1; // default = alignment isn't possible/sensible if (!TQApplication::reverseLayout()) // don't try to align right-to-left languages { TQString fmt = locale->timeFormat(); @@ -514,7 +514,7 @@ TQString AlarmListViewItem::alarmTimeText(const DateTime& dateTime) const } if (mTimeHourPos >= 0 && (int)time.length() > mTimeHourPos + 1 && time[mTimeHourPos].isDigit() && !time[mTimeHourPos + 1].isDigit()) - dateTimeText += '~'; // improve tqalignment of times with no leading zeroes + dateTimeText += '~'; // improve alignment of times with no leading zeroes dateTimeText += time; } return dateTimeText + ' '; @@ -531,7 +531,7 @@ TQString AlarmListViewItem::timeToAlarmText(const TQDateTime& now) const if (dateTime.isDateOnly()) { int days = now.date().daysTo(dateTime.date()); - return i18n("n days", " %1d ").tqarg(days); + return i18n("n days", " %1d ").arg(days); } int mins = (now.secsTo(dateTime.dateTime()) + 59) / 60; if (mins < 0) @@ -540,10 +540,10 @@ TQString AlarmListViewItem::timeToAlarmText(const TQDateTime& now) const minutes[0] = (mins%60) / 10 + '0'; minutes[1] = (mins%60) % 10 + '0'; if (mins < 24*60) - return i18n("hours:minutes", " %1:%2 ").tqarg(mins/60).tqarg(minutes); + return i18n("hours:minutes", " %1:%2 ").arg(mins/60).arg(minutes); int days = mins / (24*60); mins = mins % (24*60); - return i18n("days hours:minutes", " %1d %2:%3 ").tqarg(days).tqarg(mins/60).tqarg(minutes); + return i18n("days hours:minutes", " %1d %2:%3 ").arg(days).arg(mins/60).arg(minutes); } /****************************************************************************** @@ -652,7 +652,7 @@ void AlarmListViewItem::paintCell(TQPainter* painter, const TQColorGroup& cg, in */ int AlarmListViewItem::typeIconWidth(AlarmListView* v) { - return iconWidth() + 2 * v->tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth); + return iconWidth() + 2 * v->tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth); } /****************************************************************************** @@ -700,7 +700,7 @@ void AlarmListTooltip::maybeTip(const TQPoint& pt) if (columnX + widthNeeded <= listView->viewport()->width()) return; } - TQRect rect = listView->tqitemRect(item); + TQRect rect = listView->itemRect(item); rect.setLeft(columnX); rect.setWidth(columnWidth); kdDebug(5950) << "AlarmListTooltip::maybeTip(): display\n"; |