1 files changed, 15 insertions, 15 deletions

diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index eead72522..5f6fd8ca7 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -34,7 +34,7 @@
 #include <tqpainter.h>
 #include <tqcursor.h>
 #include <tqlistbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 
 #include <kdebug.h>
@@ -78,7 +78,7 @@ void KOMonthCellToolTip::maybeTip( const TQPoint &pos )
 
   if( i && KOPrefs::instance()->mEnableToolTips ) {
     /* Calculate the rectangle. */
-    r=eventlist->tqitemRect( it );
+    r=eventlist->itemRect( it );
     /* Show the tip */
     TQString tipText( IncidenceFormatter::toolTipStr( mCalendar, i->incidence(), mDate ) );
     if ( !tipText.isEmpty() ) {
@@ -245,7 +245,7 @@ void MonthViewItem::paint( TQPainter *p )
   if ( mIncidence && mTodo ) {
     if ( static_cast<Todo*>( mIncidence )->isOverdue() ) {
       bgColor = KOPrefs::instance()->todoOverdueColor();
-    } else if ( static_cast<Todo*>( mIncidence )->dtDue().date() == TQDate::tqcurrentDate() ) {
+    } else if ( static_cast<Todo*>( mIncidence )->dtDue().date() == TQDate::currentDate() ) {
       bgColor = KOPrefs::instance()->todoDueTodayColor();
     }
   }
@@ -388,7 +388,7 @@ MonthViewCell::MonthViewCell( KOMonthView *parent)
   mLabel = new TQLabel( this );
   mLabel->setFrameStyle( TQFrame::Panel | TQFrame::Plain );
   mLabel->setLineWidth( 1 );
-  mLabel->tqsetAlignment( AlignCenter );
+  mLabel->setAlignment( AlignCenter );
 
   mItemList = new KNoScrollListBox( this );
   mItemList->setMinimumSize( 10, 10 );
@@ -425,8 +425,8 @@ void MonthViewCell::setDate( const TQDate &date )
   TQString text;
   if ( KOGlobals::self()->calendarSystem()->day( date ) == 1 ) {
     text = i18n("'Month day' for month view cells", "%1 %2")
-        .tqarg( KOGlobals::self()->calendarSystem()->monthName( date, true ) )
-        .tqarg( KOGlobals::self()->calendarSystem()->day(mDate) );
+        .arg( KOGlobals::self()->calendarSystem()->monthName( date, true ) )
+        .arg( KOGlobals::self()->calendarSystem()->day(mDate) );
     TQFontMetrics fm( mLabel->font() );
     mLabel->resize( mLabelSize + TQSize( fm.width( text ), 0 ) );
   } else {
@@ -451,7 +451,7 @@ TQDate MonthViewCell::date() const
 void MonthViewCell::setFrameWidth()
 {
   // show current day with a thicker frame
-  if ( mDate == TQDate::tqcurrentDate() ) {
+  if ( mDate == TQDate::currentDate() ) {
     mItemList->setLineWidth( 3 );
   } else if ( !isSelected ) {
     mItemList->setLineWidth( 1 );
@@ -496,7 +496,7 @@ void MonthViewCell::updateCell()
 {
   setFrameWidth();
 
-  if ( mDate == TQDate::tqcurrentDate() ) {
+  if ( mDate == TQDate::currentDate() ) {
     setPalette( mTodayPalette );
 
     TQPalette pal = mItemList->palette();
@@ -759,7 +759,7 @@ void MonthViewCell::select()
     enableScrollBars( true );
 
   // don't mess up the cell when it represents today
-  if( mDate != TQDate::tqcurrentDate() ) {
+  if( mDate != TQDate::currentDate() ) {
     mItemList->setFrameStyle( TQFrame::Sunken | TQFrame::Panel );
     mItemList->setLineWidth( 3 );
   }
@@ -828,14 +828,14 @@ KOMonthView::KOMonthView( Calendar *calendar, TQWidget *parent, const char *name
   // month name on top
   mLabel = new TQLabel( this );
   mLabel->setFont( mfont );
-  mLabel->tqsetAlignment( AlignCenter );
+  mLabel->setAlignment( AlignCenter );
   mLabel->setLineWidth( 0 );
   mLabel->setFrameStyle( TQFrame::Plain );
 
   dayLayout->addMultiCellWidget( mLabel, 0, 0, 0, mDaysPerWeek );
 
   // create the day of the week labels (Sun, Mon, etc) and add them to
-  // the tqlayout.
+  // the layout.
   mDayLabels.resize( mDaysPerWeek );
   int i;
   for( i = 0; i < mDaysPerWeek; i++ ) {
@@ -843,7 +843,7 @@ KOMonthView::KOMonthView( Calendar *calendar, TQWidget *parent, const char *name
     label->setFont( bfont );
     label->setFrameStyle( TQFrame::Panel | TQFrame::Raised );
     label->setLineWidth( 1 );
-    label->tqsetAlignment( AlignCenter );
+    label->setAlignment( AlignCenter );
 
     mDayLabels.insert( i, label );
 
@@ -886,7 +886,7 @@ int KOMonthView::maxDatesHint()
   return mNumCells;
 }
 
-int KOMonthView::tqcurrentDateCount()
+int KOMonthView::currentDateCount()
 {
   return mNumCells;
 }
@@ -976,8 +976,8 @@ void KOMonthView::showDates( const TQDate &start, const TQDate & )
   mStartDate = mStartDate.addDays( -weekdayCol );
 
   mLabel->setText( i18n( "monthname year", "%1 %2" )
-                   .tqarg( calSys->monthName( start ) )
-                   .tqarg( calSys->year( start ) ) );
+                   .arg( calSys->monthName( start ) )
+                   .arg( calSys->year( start ) ) );
 
   showLabel( !KOPrefs::instance()->fullViewMonth() );