summaryrefslogtreecommitdiffstats
path: root/korganizer/koagenda.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'korganizer/koagenda.cpp')
-rw-r--r--korganizer/koagenda.cpp90
1 files changed, 45 insertions, 45 deletions
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index b242c306..b7a0e1de 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -69,7 +69,7 @@ MarcusBains::MarcusBains(KOAgenda *_agenda,const char *name )
setMargin(0);
setBackgroundColor(TQt::red);
minutes = new TQTimer(this);
- connect(minutes, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateLocation()));
+ connect(minutes, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateLocation()));
minutes->start(0, true);
mTimeBox = new TQLabel(this);
@@ -255,10 +255,10 @@ void KOAgenda::init()
// Grab key strokes for keyboard navigation of agenda. Seems to have no
// effect. Has to be fixed.
- setFocusPolicy( TQ_WheelFocus );
+ setFocusPolicy( TQWidget::WheelFocus );
- connect( &mScrollUpTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( scrollUp() ) );
- connect( &mScrollDownTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( scrollDown() ) );
+ connect( &mScrollUpTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( scrollUp() ) );
+ connect( &mScrollDownTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( scrollDown() ) );
mStartCell = TQPoint( 0, 0 );
mEndCell = TQPoint( 0, 0 );
@@ -274,7 +274,7 @@ void KOAgenda::init()
mClickedItem = 0;
mActionItem = 0;
- mResPair = tqMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
+ mResPair = qMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
mActionType = NOP;
mItemMoved = false;
@@ -291,7 +291,7 @@ void KOAgenda::init()
viewport()->update();
viewport()->setBackgroundMode( NoBackground );
- viewport()->setFocusPolicy( TQ_WheelFocus );
+ viewport()->setFocusPolicy( TQWidget::WheelFocus );
setMinimumSize( 30, int( mGridSpacingY + 1 ) );
// setMaximumHeight(mGridSpacingY * mRows + 5);
@@ -305,8 +305,8 @@ void KOAgenda::init()
calculateWorkingHours();
- connect( verticalScrollBar(), TQT_SIGNAL( valueChanged( int ) ),
- TQT_SLOT( checkScrollBoundaries( int ) ) );
+ connect( verticalScrollBar(), TQ_SIGNAL( valueChanged( int ) ),
+ TQ_SLOT( checkScrollBoundaries( int ) ) );
// Create the Marcus Bains line.
if( mAllDayMode ) {
@@ -384,19 +384,19 @@ bool KOAgenda::eventFilter ( TQObject *object, TQEvent *event )
case TQEvent::MouseButtonDblClick:
case TQEvent::MouseButtonRelease:
case TQEvent::MouseMove:
- return eventFilter_mouse( object, TQT_TQMOUSEEVENT( event ) );
+ return eventFilter_mouse( object, static_cast<TQMouseEvent*>( event ) );
#ifndef TQT_NO_WHEELEVENT
case TQEvent::Wheel:
- return eventFilter_wheel( object, TQT_TQWHEELEVENT( event ) );
+ return eventFilter_wheel( object, static_cast<TQWheelEvent*>( event ) );
#endif
case TQEvent::KeyPress:
case TQEvent::KeyRelease:
- return eventFilter_key( object, TQT_TQKEYEVENT( event ) );
+ return eventFilter_key( object, static_cast<TQKeyEvent*>( event ) );
case ( TQEvent::Leave ):
if ( !mActionItem )
setCursor( arrowCursor );
- if ( TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(viewport()) )
+ if ( object == viewport() )
emit leaveAgenda();
return true;
@@ -422,8 +422,8 @@ bool KOAgenda::eventFilter_drag( TQObject *object, TQDropEvent *de )
{
#ifndef KORG_NODND
TQPoint viewportPos;
- if ( TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(viewport()) && TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(this) ) {
- viewportPos = TQT_TQWIDGET( object )->mapToParent( de->pos() );
+ if ( object != viewport() && object != this ) {
+ viewportPos = static_cast<TQWidget*>( object )->mapToParent( de->pos() );
} else {
viewportPos = de->pos();
}
@@ -462,7 +462,7 @@ bool KOAgenda::eventFilter_drag( TQObject *object, TQDropEvent *de )
// FIXME: This is a bad hack, as the viewportToContents seems to be off by
// 2000 (which is the left upper corner of the viewport). It works correctly
// for agendaItems.
- if ( TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(this) ) {
+ if ( object == this ) {
pos = viewportPos + TQPoint( contentsX(), contentsY() );
} else {
pos = viewportToContents( viewportPos );
@@ -526,10 +526,10 @@ bool KOAgenda::eventFilter_key( TQObject *, TQKeyEvent *ke )
case Key_Alt:
break;
default:
- mTypeAheadEvents.append( TQT_TQEVENT( new TQKeyEvent( ke->type(), ke->key(),
+ mTypeAheadEvents.append( new TQKeyEvent( ke->type(), ke->key(),
ke->ascii(), ke->state(),
ke->text(), ke->isAutoRepeat(),
- ke->count() ) ) );
+ ke->count() ) );
if ( !mTypeAhead ) {
mTypeAhead = true;
emitNewEventForSelection();
@@ -565,7 +565,7 @@ bool KOAgenda::eventFilter_wheel ( TQObject *object, TQWheelEvent *e )
TQPoint viewportPos;
bool accepted=false;
if ( ( e->state() & ShiftButton) == ShiftButton ) {
- if ( TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(viewport()) ) {
+ if ( object != viewport() ) {
viewportPos = ( (TQWidget *) object )->mapToParent( e->pos() );
} else {
viewportPos = e->pos();
@@ -574,19 +574,19 @@ bool KOAgenda::eventFilter_wheel ( TQObject *object, TQWheelEvent *e )
// e->type()<<" delta: "<< e->delta()<< endl;
emit zoomView( -e->delta() ,
contentsToGrid( viewportToContents( viewportPos ) ),
- Qt::Horizontal );
+ TQt::Horizontal );
accepted=true;
}
if ( ( e->state() & ControlButton ) == ControlButton ){
- if ( TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(viewport()) ) {
+ if ( object != viewport() ) {
viewportPos = ( (TQWidget *)object )->mapToParent( e->pos() );
} else {
viewportPos = e->pos();
}
emit zoomView( -e->delta() ,
contentsToGrid( viewportToContents( viewportPos ) ),
- Qt::Vertical );
+ TQt::Vertical );
emit mousePosSignal(gridToContents(contentsToGrid(viewportToContents( viewportPos ))));
accepted=true;
}
@@ -597,7 +597,7 @@ bool KOAgenda::eventFilter_wheel ( TQObject *object, TQWheelEvent *e )
bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me)
{
TQPoint viewportPos;
- if (TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(viewport())) {
+ if (object != viewport()) {
viewportPos = ((TQWidget *)object)->mapToParent(me->pos());
} else {
viewportPos = me->pos();
@@ -606,8 +606,8 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me)
switch (me->type()) {
case TQEvent::MouseButtonPress:
// kdDebug(5850) << "koagenda: filtered button press" << endl;
- if (TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(viewport())) {
- if (me->button() == Qt::RightButton) {
+ if (object != viewport()) {
+ if (me->button() == TQt::RightButton) {
mClickedItem = dynamic_cast<KOAgendaItem *>(object);
if (mClickedItem) {
selectItem(mClickedItem);
@@ -615,7 +615,7 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me)
mClickedItem->incidence(),
mClickedItem->itemDate() );
} else {
- return TQScrollView::eventFilter( TQT_TQOBJECT(object), TQT_TQEVENT(me) ); // pass through for use by multiagenda
+ return TQScrollView::eventFilter( object, me ); // pass through for use by multiagenda
}
} else {
KOAgendaItem* item = dynamic_cast<KOAgendaItem *>(object);
@@ -623,7 +623,7 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me)
Incidence *incidence = item->incidence();
if ( incidence->isReadOnly() ) {
mActionItem = 0;
- mResPair = tqMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
+ mResPair = qMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
} else {
mActionItem = item;
mResPair = CalHelper::incSubResourceCalendar( mCalendar, incidence );
@@ -635,11 +635,11 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me)
// null.
selectItem( item );
} else {
- return TQScrollView::eventFilter( TQT_TQOBJECT(object), TQT_TQEVENT(me) ); // pass through for use by multiagenda
+ return TQScrollView::eventFilter( object, me ); // pass through for use by multiagenda
}
}
} else {
- if ( me->button() == Qt::RightButton ) {
+ if ( me->button() == TQt::RightButton ) {
// if mouse pointer is not in selection, select the cell below the cursor
TQPoint gpos = contentsToGrid( viewportToContents( viewportPos ) );
if ( !ptInSelection( gpos ) ) {
@@ -657,12 +657,12 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me)
if ( !ptInSelection( gpos ) ) {
selectItem(0);
mActionItem = 0;
- mResPair = tqMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
+ mResPair = qMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
setCursor(arrowCursor);
startSelectAction(viewportPos);
}
}
- return TQScrollView::eventFilter( TQT_TQOBJECT(object), TQT_TQEVENT(me) ); // pass through for use by multiagenda
+ return TQScrollView::eventFilter( object, me ); // pass through for use by multiagenda
}
break;
@@ -683,7 +683,7 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me)
// avoid an offset of a few pixels. Don't ask me why...
TQPoint indicatorPos = gridToContents(contentsToGrid(
viewportToContents( viewportPos )));
- if (TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(viewport())) {
+ if (object != viewport()) {
KOAgendaItem *moveItem = dynamic_cast<KOAgendaItem *>(object);
if (moveItem && !moveItem->incidence()->isReadOnly() ) {
if (!mActionItem)
@@ -722,7 +722,7 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me)
break; }
case TQEvent::MouseButtonDblClick:
- if (TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(viewport())) {
+ if (object == viewport()) {
selectItem(0);
TQPair<ResourceCalendar *, TQString>p = mCalendarView->viewSubResourceCalendar();
emit newEventSignal( p.first, p.second );
@@ -918,7 +918,7 @@ void KOAgenda::performItemAction(const TQPoint& viewportPos)
emit startDragSignal( mActionItem->incidence() );
setCursor( arrowCursor );
mActionItem = 0;
- mResPair = tqMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
+ mResPair = qMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
mActionType = NOP;
mItemMoved = false;
return;
@@ -952,7 +952,7 @@ void KOAgenda::performItemAction(const TQPoint& viewportPos)
placeSubCells( mActionItem );
setCursor( arrowCursor );
mActionItem = 0;
- mResPair = tqMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
+ mResPair = qMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
mActionType = NOP;
mItemMoved = false;
return;
@@ -1192,7 +1192,7 @@ void KOAgenda::endItemAction()
}
mActionItem = 0;
- mResPair = tqMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
+ mResPair = qMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
mItemMoved = false;
if ( multiModify ) {
@@ -1604,10 +1604,10 @@ KOAgendaItem *KOAgenda::insertItem( Incidence *incidence, const TQDate &qd, int
mActionType = NOP;
KOAgendaItem *agendaItem = new KOAgendaItem( mCalendar, incidence, qd, viewport(), itemPos, itemCount );
- connect( agendaItem, TQT_SIGNAL( removeAgendaItem( KOAgendaItem * ) ),
- TQT_SLOT( removeAgendaItem( KOAgendaItem * ) ) );
- connect( agendaItem, TQT_SIGNAL( showAgendaItem( KOAgendaItem * ) ),
- TQT_SLOT( showAgendaItem( KOAgendaItem * ) ) );
+ connect( agendaItem, TQ_SIGNAL( removeAgendaItem( KOAgendaItem * ) ),
+ TQ_SLOT( removeAgendaItem( KOAgendaItem * ) ) );
+ connect( agendaItem, TQ_SIGNAL( showAgendaItem( KOAgendaItem * ) ),
+ TQ_SLOT( showAgendaItem( KOAgendaItem * ) ) );
if ( YBottom <= YTop ) {
kdDebug(5850) << "KOAgenda::insertItem(): Text: " << agendaItem->text() << " YSize<0" << endl;
@@ -1649,10 +1649,10 @@ KOAgendaItem *KOAgenda::insertAllDayItem( Incidence *event, const TQDate &qd,
mActionType = NOP;
KOAgendaItem *agendaItem = new KOAgendaItem( mCalendar, event, qd, viewport(), 1, 1 );
- connect( agendaItem, TQT_SIGNAL( removeAgendaItem( KOAgendaItem* ) ),
- TQT_SLOT( removeAgendaItem( KOAgendaItem* ) ) );
- connect( agendaItem, TQT_SIGNAL( showAgendaItem( KOAgendaItem* ) ),
- TQT_SLOT( showAgendaItem( KOAgendaItem* ) ) );
+ connect( agendaItem, TQ_SIGNAL( removeAgendaItem( KOAgendaItem* ) ),
+ TQ_SLOT( removeAgendaItem( KOAgendaItem* ) ) );
+ connect( agendaItem, TQ_SIGNAL( showAgendaItem( KOAgendaItem* ) ),
+ TQ_SLOT( showAgendaItem( KOAgendaItem* ) ) );
agendaItem->setCellXY( XBegin, 0, 0 );
agendaItem->setCellXRight( XEnd );
@@ -1799,7 +1799,7 @@ bool KOAgenda::removeAgendaItem( KOAgendaItem *item )
}
mItemsToDelete.append( thisItem );
- TQTimer::singleShot( 0, this, TQT_SLOT( deleteItemsToDelete() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( deleteItemsToDelete() ) );
return taken;
}
@@ -1843,7 +1843,7 @@ void KOAgenda::resizeEvent ( TQResizeEvent *ev )
mGridSpacingY = mDesiredGridSpacingY;
}
calculateWorkingHours();
- TQTimer::singleShot( 0, this, TQT_SLOT( resizeAllContents() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( resizeAllContents() ) );
emit gridSpacingYChanged( mGridSpacingY * 4 );
TQScrollView::resizeEvent(ev);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 16:02:00 +0000