From 9cc13dcbb01a96c9e60a07ca63c61d24b374f50d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:59:50 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12. --- korganizer/koagenda.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'korganizer/koagenda.cpp') diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index 6c1c79521..5600682f1 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp @@ -73,7 +73,7 @@ MarcusBains::MarcusBains(KOAgenda *_agenda,const char *name ) minutes->start(0, true); mTimeBox = new TQLabel(this); - mTimeBox->setAlignment(TQt::AlignRight | TQt::AlignBottom); + mTimeBox->tqsetAlignment(TQt::AlignRight | TQt::AlignBottom); TQPalette pal = mTimeBox->palette(); pal.setColor(TQColorGroup::Foreground, TQt::red); mTimeBox->setPalette(pal); @@ -92,13 +92,13 @@ MarcusBains::~MarcusBains() int MarcusBains::todayColumn() { - TQDate currentDate = TQDate::currentDate(); + TQDate tqcurrentDate = TQDate::tqcurrentDate(); DateList dateList = agenda->dateList(); DateList::ConstIterator it; int col = 0; for(it = dateList.begin(); it != dateList.end(); ++it) { - if((*it) == currentDate) + if((*it) == tqcurrentDate) return KOGlobals::self()->reverseLayout() ? agenda->columns() - 1 - col : col; ++col; @@ -296,7 +296,7 @@ void KOAgenda::init() setMinimumSize( 30, int( mGridSpacingY + 1 ) ); // setMaximumHeight(mGridSpacingY * mRows + 5); - // Disable horizontal scrollbar. This is a hack. The geometry should be + // Disable horizontal scrollbar. This is a hack. The tqgeometry should be // controlled in a way that the contents horizontally always fits. Then it is // not necessary to turn off the scrollbar. setHScrollBarMode( AlwaysOff ); @@ -1300,11 +1300,11 @@ void KOAgenda::placeAgendaItem( KOAgendaItem *item, double subCellWidth ) xpos = pt.x() + int( subCellPos ); ypos = pt.y(); } - if ( KOGlobals::self()->reverseLayout() ) { // RTL language/layout + if ( KOGlobals::self()->reverseLayout() ) { // RTL language/tqlayout xpos += width; width = -width; } - if ( height<0 ) { // BTT (bottom-to-top) layout ?!? + if ( height<0 ) { // BTT (bottom-to-top) tqlayout ?!? ypos += height; height = -height; } @@ -1708,7 +1708,7 @@ void KOAgenda::insertMultiItem( Event *event, const TQDate &qd, int XBegin, int cellYBottom = rows() - 1; } - newtext = TQString("(%1/%2): ").arg( count ).arg( width ); + newtext = TQString("(%1/%2): ").tqarg( count ).tqarg( width ); newtext.append( event->summary() ); current = insertItem( event, qd, cellX, cellYTop, cellYBottom, count, width ); -- cgit v1.2.1