From 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:50:21 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- korganizer/koagendaview.cpp | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'korganizer/koagendaview.cpp') diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index ba565a8d2..cb604fcf7 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #ifndef KORG_NOSPLITTER #include #endif @@ -137,7 +137,7 @@ KOAlternateLabel::KOAlternateLabel(const TQString &shortlabel, const TQString &l : TQLabel(parent, name), mTextTypeFixed(false), mShortText(shortlabel), mLongText(longlabel), mExtensiveText(extensivelabel) { - tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + setSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); if (mExtensiveText.isEmpty()) mExtensiveText = mLongText; squeezeTextToLabel(); } @@ -235,9 +235,9 @@ void KOAlternateLabel::resizeEvent( TQResizeEvent * ) squeezeTextToLabel(); } -TQSize KOAlternateLabel::tqminimumSizeHint() const +TQSize KOAlternateLabel::minimumSizeHint() const { - TQSize sh = TQLabel::tqminimumSizeHint(); + TQSize sh = TQLabel::minimumSizeHint(); sh.setWidth(-1); return sh; } @@ -258,7 +258,7 @@ KOAgendaView::KOAgendaView( Calendar *cal, mPendingChanges( true ), mAreDatesInitialized( false ) { - mSelectedDates.append(TQDate::tqcurrentDate()); + mSelectedDates.append(TQDate::currentDate()); mLayoutDayLabels = 0; mDayLabelsFrame = 0; @@ -313,12 +313,12 @@ KOAgendaView::KOAgendaView( Calendar *cal, if ( KOPrefs::instance()->compactDialogs() ) { mExpandButton = new TQPushButton(mDummyAllDayLeft); mExpandButton->setPixmap( mNotExpandedPixmap ); - mExpandButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, + mExpandButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); connect( mExpandButton, TQT_SIGNAL( clicked() ), TQT_SIGNAL( toggleExpand() ) ); } else { TQLabel *label = new TQLabel( i18n("All Day"), mDummyAllDayLeft ); - label->tqsetAlignment( TQt::AlignRight | TQt::AlignVCenter | TQt::WordBreak ); + label->setAlignment( TQt::AlignRight | TQt::AlignVCenter | TQt::WordBreak ); } mAllDayAgenda = new KOAgenda( 1, calendarView, mAllDayFrame ); @@ -476,7 +476,7 @@ void KOAgendaView::zoomInVertically( ) mTimeLabels->updateConfig(); mTimeLabels->positionChanged(); - mTimeLabels->tqrepaint(); + mTimeLabels->repaint(); updateView(); } @@ -493,7 +493,7 @@ void KOAgendaView::zoomOutVertically( ) mTimeLabels->updateConfig(); mTimeLabels->positionChanged(); - mTimeLabels->tqrepaint(); + mTimeLabels->repaint(); updateView(); } @@ -627,16 +627,16 @@ void KOAgendaView::createDayLabels( bool force ) int dW = calsys->dayOfWeek(date); TQString veryLongStr = KGlobal::locale()->formatDate( date ); TQString longstr = i18n( "short_weekday date (e.g. Mon 13)","%1 %2" ) - .tqarg( calsys->weekDayName( dW, true ) ) - .tqarg( calsys->day(date) ); + .arg( calsys->weekDayName( dW, true ) ) + .arg( calsys->day(date) ); TQString shortstr = TQString::number(calsys->day(date)); KOAlternateLabel *dayLabel = new KOAlternateLabel(shortstr, longstr, veryLongStr, mDayLabels); dayLabel->useShortText(); // will be recalculated in updateDayLabelSizes() anyway dayLabel->setMinimumWidth(1); - dayLabel->tqsetAlignment(TQLabel::AlignHCenter); - if (date == TQDate::tqcurrentDate()) { + dayLabel->setAlignment(TQLabel::AlignHCenter); + if (date == TQDate::currentDate()) { TQFont font = dayLabel->font(); font.setBold(true); dayLabel->setFont(font); @@ -651,7 +651,7 @@ void KOAgendaView::createDayLabels( bool force ) // use a KOAlternateLabel so when the text doesn't fit any more a tooltip is used KOAlternateLabel*label = new KOAlternateLabel( (*textit), (*textit), TQString(), mDayLabels ); label->setMinimumWidth(1); - label->tqsetAlignment(AlignCenter); + label->setAlignment(AlignCenter); dayLayout->addWidget(label); } @@ -664,7 +664,7 @@ void KOAgendaView::createDayLabels( bool force ) // use a KOAlternateLabel so when the text doesn't fit any more a tooltip is used KOAlternateLabel*label = new KOAlternateLabel( text, text, TQString(), mDayLabels ); label->setMinimumWidth(1); - label->tqsetAlignment(AlignCenter); + label->setAlignment(AlignCenter); dayLayout->addWidget(label); } } @@ -696,7 +696,7 @@ int KOAgendaView::maxDatesHint() return 0; } -int KOAgendaView::tqcurrentDateCount() +int KOAgendaView::currentDateCount() { return mSelectedDates.count(); } @@ -783,7 +783,7 @@ void KOAgendaView::updateConfig() { // kdDebug(5850) << "KOAgendaView::updateConfig()" << endl; - // update config for tqchildren + // update config for children mTimeLabels->updateConfig(); mAgenda->updateConfig(); mAllDayAgenda->updateConfig(); @@ -793,7 +793,7 @@ void KOAgendaView::updateConfig() mTimeLabels->positionChanged(); // for some reason, this needs to be called explicitly - mTimeLabels->tqrepaint(); + mTimeLabels->repaint(); updateTimeBarWidth(); @@ -1343,7 +1343,7 @@ void KOAgendaView::changeIncidenceDisplay( Incidence *incidence, int mode ) } // HACK: Update the view if the all-day agenda has been modified. - // Do this because there are some tqlayout problems in the + // Do this because there are some layout problems in the // all-day agenda that are not easily solved, but clearing // and redrawing works ok. if ( incidence->doesFloat() ) { @@ -1420,7 +1420,7 @@ void KOAgendaView::fillAgenda() void KOAgendaView::displayIncidence( Incidence *incidence ) { - TQDate today = TQDate::tqcurrentDate(); + TQDate today = TQDate::currentDate(); DateTimeList::iterator t; // FIXME: use a visitor here @@ -1523,7 +1523,7 @@ void KOAgendaView::clearView() CalPrinterBase::PrintType KOAgendaView::printType() { - if ( tqcurrentDateCount() == 1 ) return CalPrinterBase::Day; + if ( currentDateCount() == 1 ) return CalPrinterBase::Day; else return CalPrinterBase::Week; } -- cgit v1.2.1