From c48e769eb275917717e2b55eb869f7e559293ac8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:48:31 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kppp/logview/monthly.cpp | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'kppp/logview') diff --git a/kppp/logview/monthly.cpp b/kppp/logview/monthly.cpp index 0844f85a..0838417d 100644 --- a/kppp/logview/monthly.cpp +++ b/kppp/logview/monthly.cpp @@ -38,9 +38,9 @@ static void formatBytes(double bytes, TQString &result) { if(bytes < 1024) result.setNum(bytes); else if(bytes < 1024*1024) - result = i18n("%1 KB").arg(KGlobal::locale()->formatNumber((float)bytes / 1024.0, 1)); + result = i18n("%1 KB").arg(TDEGlobal::locale()->formatNumber((float)bytes / 1024.0, 1)); else - result = i18n("%1 MB").arg(KGlobal::locale()->formatNumber((float)bytes / 1024.0 / 1024.0, 1)); + result = i18n("%1 MB").arg(TDEGlobal::locale()->formatNumber((float)bytes / 1024.0 / 1024.0, 1)); } static void formatBytesMonth(double bytes, TQString &result) { @@ -54,9 +54,9 @@ static void formatBytesMonth(double bytes, TQString &result) { if(bytes < 1024) result.setNum(bytes); else if(bytes < 1024*1024) - result = i18n("%1 KB").arg(KGlobal::locale()->formatNumber((float)bytes / 1024.0, 1)); + result = i18n("%1 KB").arg(TDEGlobal::locale()->formatNumber((float)bytes / 1024.0, 1)); else - result = i18n("%1 MB").arg(KGlobal::locale()->formatNumber((float)bytes / 1024.0 / 1024.0, 1)); + result = i18n("%1 MB").arg(TDEGlobal::locale()->formatNumber((float)bytes / 1024.0 / 1024.0, 1)); } static void formatDuration(int seconds, TQString &result) { @@ -292,7 +292,7 @@ void MonthlyWidget::plotMonth() { selectionItem = 0L; lv2->clear(); - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); TQDate startDate = periodeFirst(); for(int i = 0; i < (int)logList.count(); i++) { @@ -354,9 +354,9 @@ void MonthlyWidget::plotMonth() { s_duration); TQString s_lifrom, s_liuntil, s_costs; - s_lifrom = KGlobal::locale()->formatTime(li->from().time(), false); - s_liuntil = KGlobal::locale()->formatTime(li->until().time(), false); - s_costs = KGlobal::locale()->formatMoney(li->sessionCosts()); + s_lifrom = TDEGlobal::locale()->formatTime(li->from().time(), false); + s_liuntil = TDEGlobal::locale()->formatTime(li->until().time(), false); + s_costs = TDEGlobal::locale()->formatMoney(li->sessionCosts()); (void) new LogListItem(li, lv, con, day, s_lifrom, s_liuntil, s_duration, s_costs, _bin, _bout); } @@ -384,7 +384,7 @@ void MonthlyWidget::plotMonth() { formatDuration(duration, s_duration); - TQString s_costs(KGlobal::locale()->formatMoney(costs, TQString(), 2)); + TQString s_costs(TDEGlobal::locale()->formatMoney(costs, TQString(), 2)); selectionItem = new LogListItem(0, lv2, i18n("Selection (%n connection)", "Selection (%n connections)", 0), @@ -394,7 +394,7 @@ void MonthlyWidget::plotMonth() { i18n("%n connection", "%n connections", count), s_duration, s_costs, _bin, _bout, TQString(), TQString(), TQString()); - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); if(calendar->month(periodeFirst()) == calendar->month(TQDate::currentDate())) { @@ -414,7 +414,7 @@ void MonthlyWidget::plotMonth() { formatDurationMonth(duration, m_duration); costsMonth(costs, costs); - TQString m_costs(KGlobal::locale()->formatMoney(costs, TQString(), 2)); + TQString m_costs(TDEGlobal::locale()->formatMoney(costs, TQString(), 2)); (void) new TQListViewItem(lv2, selectionItem, i18n("Monthly estimates"), m_duration, m_costs, m_bin, m_bout, @@ -443,19 +443,19 @@ void MonthlyWidget::slotConnections(int) { } void MonthlyWidget::nextMonth() { - m_periodeFirst = KGlobal::locale()->calendar()->addMonths(m_periodeFirst, 1); + m_periodeFirst = TDEGlobal::locale()->calendar()->addMonths(m_periodeFirst, 1); plotMonth(); } void MonthlyWidget::prevMonth() { - m_periodeFirst = KGlobal::locale()->calendar()->addMonths(m_periodeFirst, -1); + m_periodeFirst = TDEGlobal::locale()->calendar()->addMonths(m_periodeFirst, -1); plotMonth(); } void MonthlyWidget::currentMonth() { - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); TQDate dt = TQDate::currentDate(); calendar->setYMD(m_periodeFirst, calendar->year(dt), calendar->month(dt), 1); @@ -463,7 +463,7 @@ void MonthlyWidget::currentMonth() { } void MonthlyWidget::exportWizard() { - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); TQString date = TQString::fromLatin1("%1-%2") // e.g.: June-2001 .arg(calendar->monthName(periodeFirst())) .arg(calendar->year(periodeFirst())); @@ -565,9 +565,9 @@ void MonthlyWidget::exportWizard() { s_duration); TQString s_lifrom, s_liuntil, s_costs; - s_lifrom = KGlobal::locale()->formatTime(li->from().time(), false); - s_liuntil = KGlobal::locale()->formatTime(li->until().time(), false); - s_costs = KGlobal::locale()->formatMoney(li->sessionCosts()); + s_lifrom = TDEGlobal::locale()->formatTime(li->from().time(), false); + s_liuntil = TDEGlobal::locale()->formatTime(li->until().time(), false); + s_costs = TDEGlobal::locale()->formatMoney(li->sessionCosts()); // call export method exportIFace->addDataline(con, day, s_lifrom, s_liuntil, s_duration, @@ -593,9 +593,9 @@ void MonthlyWidget::exportWizard() { formatDurationMonth(duration, m_duration); costsMonth(costs, costs); - TQString m_costs(KGlobal::locale()->formatMoney(costs, TQString(), 2)); + TQString m_costs(TDEGlobal::locale()->formatMoney(costs, TQString(), 2)); - TQString datetime = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), true); + TQString datetime = TDEGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), true); exportIFace->addEmptyLine(); exportIFace->addDataline(i18n("Monthly estimates (%1)").arg(datetime), @@ -624,7 +624,7 @@ void MonthlyWidget::exportWizard() { formatDuration(duration, s_duration); - TQString s_costs(KGlobal::locale()->formatMoney(costs, TQString(), 2)); + TQString s_costs(TDEGlobal::locale()->formatMoney(costs, TQString(), 2)); // call export methods exportIFace->addEmptyLine(); @@ -650,7 +650,7 @@ TQDate MonthlyWidget::periodeFirst() const TQDate MonthlyWidget::periodeLast() const { - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); // One month minus one day return calendar->addDays(calendar->addMonths(m_periodeFirst, 1), -1); @@ -716,7 +716,7 @@ void MonthlyWidget::slotSelectionChanged() formatDuration(duration, s_duration); - TQString s_costs(KGlobal::locale()->formatMoney(costs, TQString(), 2)); + TQString s_costs(TDEGlobal::locale()->formatMoney(costs, TQString(), 2)); selectionItem->setText(0, i18n("Selection (%n connection)", "Selection (%n connections)", count)); selectionItem->setText(1, s_duration); selectionItem->setText(2, s_costs); -- cgit v1.2.1