1 files changed, 14 insertions, 14 deletions

diff --git a/korganizer/multiagendaview.cpp b/korganizer/multiagendaview.cpp
index 7d77a3da7..d613941c4 100644
--- a/korganizer/multiagendaview.cpp
+++ b/korganizer/multiagendaview.cpp
@@ -41,8 +41,8 @@ for(TQValueList<KOAgendaView*>::ConstIterator it = mAgendaViews.constBegin(); \
 using namespace KOrg;
 
 MultiAgendaView::MultiAgendaView( Calendar * cal, CalendarView *calendarView,
-                                 TQWidget * parent, const char *name ) :
-    AgendaView( cal, parent, name ),
+                                 TQWidget * tqparent, const char *name ) :
+    AgendaView( cal, tqparent, name ),
     mSelectedAgendaView( 0 ),
     mLastMovedSplitter( 0 ),
     mUpdateOnShow( false ),
@@ -57,10 +57,10 @@ MultiAgendaView::MultiAgendaView( Calendar * cal, CalendarView *calendarView,
   TQVBox *topSideBox = new TQVBox( this );
   mLeftTopSpacer = new TQWidget( topSideBox );
   mLeftTopSpacer->setFixedHeight( topLabelHeight );
-  mLeftSplitter = new TQSplitter( Qt::Vertical, topSideBox );
+  mLeftSplitter = new TQSplitter( TQt::Vertical, topSideBox );
   mLeftSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() );
   TQLabel *label = new TQLabel( i18n("All Day"), mLeftSplitter );
-  label->tqsetAlignment( Qt::AlignRight | Qt::AlignVCenter | Qt::WordBreak );
+  label->tqsetAlignment( TQt::AlignRight | TQt::AlignVCenter | TQt::WordBreak );
   TQVBox *sideBox = new TQVBox( mLeftSplitter );
   EventIndicator *eiSpacer = new EventIndicator( EventIndicator::Top, sideBox );
   eiSpacer->changeColumns( 0 );
@@ -81,14 +81,14 @@ MultiAgendaView::MultiAgendaView( Calendar * cal, CalendarView *calendarView,
   topSideBox = new TQVBox( this );
   mRightTopSpacer = new TQWidget( topSideBox );
   mRightTopSpacer->setFixedHeight( topLabelHeight );
-  mRightSplitter = new TQSplitter( Qt::Vertical, topSideBox );
+  mRightSplitter = new TQSplitter( TQt::Vertical, topSideBox );
   mRightSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() );
   new TQWidget( mRightSplitter );
   sideBox = new TQVBox( mRightSplitter );
   eiSpacer = new EventIndicator( EventIndicator::Top, sideBox );
   eiSpacer->setFixedHeight( eiSpacer->minimumHeight() );
   eiSpacer->changeColumns( 0 );
-  mScrollBar = new TQScrollBar( Qt::Vertical, sideBox );
+  mScrollBar = new TQScrollBar( TQt::Vertical, sideBox );
   eiSpacer = new EventIndicator( EventIndicator::Bottom, sideBox );
   eiSpacer->setFixedHeight( eiSpacer->minimumHeight() );
   eiSpacer->changeColumns( 0 );
@@ -265,7 +265,7 @@ void MultiAgendaView::setupViews()
 
   int minWidth = 0;
   for ( TQValueList<TQWidget*>::ConstIterator it = mAgendaWidgets.constBegin(); it != mAgendaWidgets.constEnd(); ++it )
-    minWidth = QMAX( minWidth, (*it)->tqminimumSizeHint().width() );
+    minWidth = TQMAX( minWidth, (*it)->tqminimumSizeHint().width() );
   for ( TQValueList<TQWidget*>::ConstIterator it = mAgendaWidgets.constBegin(); it != mAgendaWidgets.constEnd(); ++it )
     (*it)->setMinimumWidth( minWidth );
 }
@@ -427,7 +427,7 @@ void MultiAgendaView::resizeEvent(TQResizeEvent * ev)
 void MultiAgendaView::resizeScrollView(const TQSize & size)
 {
   const int widgetWidth = size.width() - mTimeLabels->width() - mScrollBar->width();
-  int width = QMAX( mTopBox->tqsizeHint().width(), widgetWidth );
+  int width = TQMAX( mTopBox->tqsizeHint().width(), widgetWidth );
   int height = size.height();
   if ( width > widgetWidth ) {
     const int sbHeight = mScrollView->horizontalScrollBar()->height();
@@ -459,17 +459,17 @@ void MultiAgendaView::updateConfig()
 
 bool MultiAgendaView::eventFilter(TQObject * obj, TQEvent * event)
 {
-  if ( obj->className() == TQCString("QSplitterHandle") ) {
+  if ( obj->className() == TQCString(TQSPLITTERHANDLE_OBJECT_NAME_STRING) ) {
     // KDE4: not needed anymore, TQSplitter has a moved signal there
     if ( (event->type() == TQEvent::MouseMove && KGlobalSettings::opaqueResize())
            || event->type() == TQEvent::MouseButtonRelease ) {
       FOREACH_VIEW( agenda ) {
-        if ( agenda->splitter() == obj->parent() )
+        if ( agenda->splitter() == obj->tqparent() )
           mLastMovedSplitter = agenda->splitter();
       }
-      if ( mLeftSplitter == obj->parent() )
+      if ( mLeftSplitter == obj->tqparent() )
         mLastMovedSplitter = mLeftSplitter;
-      else if ( mRightSplitter == obj->parent() )
+      else if ( mRightSplitter == obj->tqparent() )
         mLastMovedSplitter = mRightSplitter;
       TQTimer::singleShot( 0, this, TQT_SLOT(resizeSplitters()) );
     }
@@ -522,7 +522,7 @@ void MultiAgendaView::resizeSpacers( int newY )
 
 void MultiAgendaView::zoomView( const int delta, const TQPoint & pos, const Qt::Orientation ori )
 {
-  if ( ori == Qt::Vertical ) {
+  if ( ori == TQt::Vertical ) {
     if ( delta > 0 ) {
       if ( KOPrefs::instance()->mHourSize > 4 )
         KOPrefs::instance()->mHourSize--;
@@ -542,7 +542,7 @@ void MultiAgendaView::zoomView( const int delta, const TQPoint & pos, const Qt::
 // KDE4: not needed, use existing TQSplitter signals instead
 void MultiAgendaView::installSplitterEventFilter(TQSplitter * splitter)
 {
-  TQObjectList *objlist = splitter->queryList( "QSplitterHandle" );
+  TQObjectList *objlist = splitter->queryList( TQSPLITTERHANDLE_OBJECT_NAME_STRING );
   // HACK: when not being visible, the splitter handle is sometimes not found
   // for unknown reasons, so trigger an update when we are shown again
   if ( objlist->count() == 0 && !isVisible() )