From 5b8ab149469c8e186ee8b05d90c0103ae722dd85 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:23:24 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kdgantt/KDGanttViewSubwidgets.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'kdgantt') diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp index 31830dfd..c25d4e12 100644 --- a/kdgantt/KDGanttViewSubwidgets.cpp +++ b/kdgantt/KDGanttViewSubwidgets.cpp @@ -824,7 +824,7 @@ void KDTimeHeaderWidget::preparePopupMenu() TQString KDTimeHeaderWidget::getToolTipText(TQPoint p) { - return KGlobal::locale()->formatDateTime(getDateTimeForIndex(p.x())); + return TDEGlobal::locale()->formatDateTime(getDateTimeForIndex(p.x())); } void KDTimeHeaderWidget::addTickRight( int num ) { @@ -1962,7 +1962,7 @@ TQDateTime KDTimeHeaderWidget::getEvenTimeDate(TQDateTime tempdatetime ,Scale sc break; case KDGanttView::Week: tempdate = tempdatetime.date(); - while (tempdate.dayOfWeek ()!= KGlobal::locale()->weekStartDay()) + while (tempdate.dayOfWeek ()!= TDEGlobal::locale()->weekStartDay()) tempdate = tempdate.addDays(-1); //tempdate = tempdate.addDays(-7); tempdatetime = TQDateTime (tempdate, TQTime (0,0)); @@ -2229,7 +2229,7 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale) TQTime tempTime = myRealStart.time(); TQDateTime tempDateTime; int i; - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); switch (myRealScale) { case KDGanttView::Minute: @@ -2296,7 +2296,7 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale) tempDate = tempDate.addDays(tempMinorScaleCount); } tempDate = myRealStart.date(); - while (tempDate.dayOfWeek() != KGlobal::locale()->weekStartDay()) + while (tempDate.dayOfWeek() != TDEGlobal::locale()->weekStartDay()) tempDate = tempDate.addDays(1); while (tempDate < myRealEnd.date()) { majorTicks.append( getCoordX(tempDate)); @@ -2316,7 +2316,7 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale) tempDate = tempDate.addDays(7*tempMinorScaleCount); } tempDate = myRealStart.date(); - while (tempDate.day() != KGlobal::locale()->weekStartDay()) + while (tempDate.day() != TDEGlobal::locale()->weekStartDay()) tempDate = tempDate.addDays(1); while (tempDate < myRealEnd.date()) { majorTicks.append( getCoordX(tempDate)); -- cgit v1.2.1