Rename old tq methods that no longer need a unique name

(cherry picked from commit 984c25aa6969e55896e9a13c8e7f7b8a58991a4e)

1 files changed, 14 insertions, 14 deletions

diff --git a/kdeui/kdatetbl.cpp b/kdeui/kdatetbl.cpp
index e139ffd90..69fbc083b 100644
--- a/kdeui/kdatetbl.cpp
+++ b/kdeui/kdatetbl.cpp
@@ -233,7 +233,7 @@ KDateTable::paintCell(TQPainter *painter, int row, int col)
          ( daynum == 6 && calendar->calendarName() == "gregorian" ) )
           normalday=false;
 
-			TQBrush brushInvertTitle(tqcolorGroup().base());
+			TQBrush brushInvertTitle(colorGroup().base());
 			TQColor titleColor(isEnabled()?( KGlobalSettings::activeTitleColor() ):( KGlobalSettings::inactiveTitleColor() ) );
 			TQColor textColor(isEnabled()?( KGlobalSettings::activeTextColor() ):( KGlobalSettings::inactiveTextColor() ) );
       if (!normalday)
@@ -250,7 +250,7 @@ KDateTable::paintCell(TQPainter *painter, int row, int col)
         }
       painter->drawText(0, 0, w, h-1, AlignCenter,
                         calendar->weekDayName(daynum, true), -1, &rect);
-      painter->setPen(tqcolorGroup().text());
+      painter->setPen(colorGroup().text());
       painter->moveTo(0, h-1);
       painter->lineTo(w-1, h-1);
       // ----- draw the weekday:
@@ -267,7 +267,7 @@ KDateTable::paintCell(TQPainter *painter, int row, int col)
           // ° painting a day of the previous month or
           // ° painting a day of the following month
           // TODO: don't hardcode gray here! Use a color with less contrast to the background than normal text.
-          painter->setPen( tqcolorGroup().mid() );
+          painter->setPen( colorGroup().mid() );
 //          painter->setPen(gray);
         } else { // paint a day of the current month
           if ( d->useCustomColors )
@@ -292,9 +292,9 @@ KDateTable::paintCell(TQPainter *painter, int row, int col)
               }
               painter->setPen( mode->fgColor );
             } else
-              painter->setPen(tqcolorGroup().text());
+              painter->setPen(colorGroup().text());
           } else //if ( firstWeekDay < 4 ) // <- this doesn' make sense at all!
-          painter->setPen(tqcolorGroup().text());
+          painter->setPen(colorGroup().text());
         }
 
       pen=painter->pen();
@@ -308,25 +308,25 @@ KDateTable::paintCell(TQPainter *painter, int row, int col)
            // draw the currently selected date
 	   if (isEnabled())
 	   {
-           painter->setPen(tqcolorGroup().highlight());
-           painter->setBrush(tqcolorGroup().highlight());
+           painter->setPen(colorGroup().highlight());
+           painter->setBrush(colorGroup().highlight());
 	   }
 	   else
 	   {
-	   painter->setPen(tqcolorGroup().text());
-           painter->setBrush(tqcolorGroup().text());
+	   painter->setPen(colorGroup().text());
+           painter->setBrush(colorGroup().text());
 	   }
-           pen=TQPen(tqcolorGroup().highlightedText());
+           pen=TQPen(colorGroup().highlightedText());
         } else {
           painter->setBrush(paletteBackgroundColor());
           painter->setPen(paletteBackgroundColor());
-//          painter->setBrush(tqcolorGroup().base());
-//          painter->setPen(tqcolorGroup().base());
+//          painter->setBrush(colorGroup().base());
+//          painter->setPen(colorGroup().base());
         }
 
       if ( pCellDate == TQDate::currentDate() )
       {
-         painter->setPen(tqcolorGroup().text());
+         painter->setPen(colorGroup().text());
       }
 
       if ( paintRect ) painter->drawRect(0, 0, w, h);
@@ -439,7 +439,7 @@ KDateTable::setFontSize(int size)
       maxCell.setHeight(QMAX(maxCell.height(), rect.height()));
     }
   // ----- compare with a real wide number and add some space:
-  rect=metrics.boundingRect(TQString::tqfromLatin1("88"));
+  rect=metrics.boundingRect(TQString::fromLatin1("88"));
   maxCell.setWidth(QMAX(maxCell.width()+2, rect.width()));
   maxCell.setHeight(QMAX(maxCell.height()+4, rect.height()));
 }