From f4fae92b6768541e2952173c3d4b09040f95bf7e Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 16 Feb 2011 20:17:18 +0000 Subject: Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- korganizer/calendarview.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'korganizer/calendarview.cpp') diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index ba1bbe6e3..91b42b1e8 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -137,7 +137,7 @@ CalendarView::CalendarView( TQWidget *parent, const char *name ) TQBoxLayout *topLayout = new TQVBoxLayout( this ); #ifndef KORG_NOSPLITTER - // create the main layout frames. + // create the main tqlayout frames. mPanner = new TQSplitter( TQSplitter::Horizontal, this, "CalendarView::Panner" ); topLayout->addWidget( mPanner ); @@ -177,7 +177,7 @@ CalendarView::CalendarView( TQWidget *parent, const char *name ) mDateNavigatorContainer = new KDateNavigator( leftFrame, true, "CalendarView::DateNavigator", - TQDate::currentDate() ); + TQDate::tqcurrentDate() ); mTodoList = new KOTodoView( CalendarNull::self(), leftFrame, "todolist" ); mEventViewer = new KOEventViewer ( CalendarNull::self(), leftFrame, "EventViewer" ); @@ -185,7 +185,7 @@ CalendarView::CalendarView( TQWidget *parent, const char *name ) TQWidget *rightBox = new TQWidget( mainBox ); TQBoxLayout *rightLayout = new TQVBoxLayout( rightBox ); - mNavigatorBar = new NavigatorBar( TQDate::currentDate(), rightBox ); + mNavigatorBar = new NavigatorBar( TQDate::tqcurrentDate(), rightBox ); rightLayout->addWidget( mNavigatorBar ); mRightFrame = new TQWidgetStack( rightBox ); @@ -195,7 +195,7 @@ CalendarView::CalendarView( TQWidget *parent, const char *name ) if ( KOPrefs::instance()->mVerticalScreen ) { // mTodoList->setFixedHeight( 60 ); - mTodoList->setFixedHeight( mDateNavigatorContainer->sizeHint().height() ); + mTodoList->setFixedHeight( mDateNavigatorContainer->tqsizeHint().height() ); } #endif @@ -387,7 +387,7 @@ TQDate CalendarView::activeDate( bool fallbackToToday ) // When all else fails, use the navigator start date, or today. if ( fallbackToToday ) { - return TQDate::currentDate(); + return TQDate::tqcurrentDate(); } else { return mDateNavigator->selectedDates().first(); } @@ -547,7 +547,7 @@ void CalendarView::readSettings() TQValueList sizes = config->readIntListEntry( "Separator1" ); if ( sizes.count() != 2 ) { - sizes << mDateNavigatorContainer->minimumSizeHint().width(); + sizes << mDateNavigatorContainer->tqminimumSizeHint().width(); sizes << 300; } mPanner->setSizes( sizes ); @@ -779,14 +779,14 @@ void CalendarView::incidenceChanged( Incidence *oldIncidence, TQString description = i18n( "To-do completed: %1 (%2)" ).arg( newIncidence->summary() ).arg( timeStr ); - Journal::List journals = calendar()->journals( TQDate::currentDate() ); + Journal::List journals = calendar()->journals( TQDate::tqcurrentDate() ); Journal *journal; if ( journals.isEmpty() ) { journal = new Journal(); - journal->setDtStart( TQDateTime::currentDateTime() ); + journal->setDtStart( TQDateTime::tqcurrentDateTime() ); - TQString dateStr = KGlobal::locale()->formatDate( TQDate::currentDate() ); + TQString dateStr = KGlobal::locale()->formatDate( TQDate::tqcurrentDate() ); journal->setSummary( i18n("Journal of %1").arg( dateStr ) ); journal->setDescription( description ); @@ -1137,7 +1137,7 @@ KOEventEditor *CalendarView::newEventEditor( ResourceCalendar *res, const TQStri // let the current view change the default start/end datetime bool allDay = allDayParam; TQDateTime startDt( startDtParam ), endDt( endDtParam ); - // Adjust the start/end date times (i.e. replace invalid values by defaults, + // Adjust the start/end date times (i.e. tqreplace invalid values by defaults, // and let the view adjust the type. dateTimesForNewEvent( startDt, endDt, allDay ); @@ -1248,7 +1248,7 @@ void CalendarView::newTodo( ResourceCalendar *res, const TQString &subRes ) todoEditor->setResource( res, subRes ); if ( mViewManager->currentView()->isEventView() ) { dtDue.setDate( mDateNavigator->selectedDates().first() ); - TQDateTime dtDummy = TQDateTime::currentDateTime(); + TQDateTime dtDummy = TQDateTime::tqcurrentDateTime(); mViewManager->currentView()->eventDurationHint( dtDue, dtDummy, allday ); todoEditor->setDates( dtDue, allday ); } @@ -1669,7 +1669,7 @@ void CalendarView::schedule_forward( Incidence *incidence ) void CalendarView::mailFreeBusy( int daysToPublish ) { - TQDateTime start = TQDateTime::currentDateTime(); + TQDateTime start = TQDateTime::tqcurrentDateTime(); TQDateTime end = start.addDays(daysToPublish); FreeBusy *freebusy = new FreeBusy(mCalendar, start, end); @@ -1865,7 +1865,7 @@ void CalendarView::eventUpdated(Incidence *) void CalendarView::adaptNavigationUnits() { if (mViewManager->currentView()->isEventView()) { - int days = mViewManager->currentView()->currentDateCount(); + int days = mViewManager->currentView()->tqcurrentDateCount(); if (days == 1) { emit changeNavStringPrev(i18n("&Previous Day")); emit changeNavStringNext(i18n("&Next Day")); @@ -2797,7 +2797,7 @@ void CalendarView::getIncidenceHierarchy( Incidence *inc, Incidence::List &children ) { // protecion against looping hierarchies - if ( inc && !children.contains( inc ) ) { + if ( inc && !children.tqcontains( inc ) ) { Incidence::List::ConstIterator it; Incidence::List immediateChildren = inc->relations(); for ( it = immediateChildren.constBegin(); it != immediateChildren.constEnd(); ++it ) { -- cgit v1.2.1