[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kdeui
From:       Martin Koller <m.koller () surfeu ! at>
Date:       2006-02-28 22:16:47
Message-ID: 1141165007.848314.19489.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 514642 by mkoller:

get rid of Qt3 QColorGroup


 M  +17 -16    kdatetable.cpp  


--- trunk/KDE/kdelibs/kdeui/kdatetable.cpp #514641:514642
@@ -219,10 +219,11 @@
       if ( daynum == calendar->weekDayOfPray() ||
          ( daynum == 6 && calendar->calendarName() == "gregorian" ) )
           normalday=false;
-         QColorGroup colorGroup(palette());
-			QBrush brushInvertTitle(colorGroup.base());
-			QColor titleColor(isEnabled()?( KGlobalSettings::activeTitleColor() ):( \
                KGlobalSettings::inactiveTitleColor() ) );
-			QColor textColor(isEnabled()?( KGlobalSettings::activeTextColor() ):( \
KGlobalSettings::inactiveTextColor() ) ); +
+      QBrush brushInvertTitle(palette().base());
+      QColor titleColor(isEnabled()?( KGlobalSettings::activeTitleColor() ):( \
KGlobalSettings::inactiveTitleColor() ) ); +      QColor textColor(isEnabled()?( \
KGlobalSettings::activeTextColor() ):( KGlobalSettings::inactiveTextColor() ) ); +
       if (!normalday)
         {
           painter->setPen(textColor);
@@ -237,7 +238,7 @@
         }
       painter->drawText(0, 0, w, h-1, Qt::AlignCenter,
                         calendar->weekDayName(daynum, true), -1, &rect);
-      painter->setPen(QColorGroup(palette()).text());
+      painter->setPen(palette().text());
       painter->drawLine(0, h-1, w-1, h-1);
       // ----- draw the weekday:
     } else {
@@ -253,7 +254,7 @@
           //  ° 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( QColorGroup(palette()).mid() );
+          painter->setPen( palette().mid() );
 //          painter->setPen(gray);
         } else { // paint a day of the current month
           if ( d->useCustomColors )
@@ -278,9 +279,9 @@
               }
               painter->setPen( mode->fgColor );
             } else
-              painter->setPen(QColorGroup(palette()).text());
+              painter->setPen(palette().text());
           } else //if ( firstWeekDay < 4 ) // <- this doesn' make sense at all!
-          painter->setPen(QColorGroup(palette()).text());
+          painter->setPen(palette().text());
         }
 
       pen=painter->pen();
@@ -294,25 +295,25 @@
            // draw the currently selected date
 	   if (isEnabled())
 	   {
-           painter->setPen(QColorGroup(palette()).highlight());
-           painter->setBrush(QColorGroup(palette()).highlight());
+           painter->setPen(palette().highlight());
+           painter->setBrush(palette().highlight());
 	   }
 	   else
 	   {
-	   painter->setPen(QColorGroup(palette()).text());
-           painter->setBrush(QColorGroup(palette()).text());
+	   painter->setPen(palette().text());
+           painter->setBrush(palette().text());
 	   }
-           pen=QColorGroup(palette()).highlightedText();
+           pen=palette().highlightedText().color();
         } else {
           painter->setBrush(palette().color(backgroundRole()));
           painter->setPen(palette().color(backgroundRole()));
-//          painter->setBrush(QColorGroup(palette()).base());
-//          painter->setPen(QColorGroup(palette()).base());
+//          painter->setBrush(palette().base());
+//          painter->setPen(palette().base());
         }
 
       if ( pCellDate == QDate::currentDate() )
       {
-         painter->setPen(QColorGroup(palette()).text());
+         painter->setPen(palette().text());
       }
 
       if ( paintRect ) painter->drawRect(0, 0, w, h);


[prev in list] [next in list] [prev in thread] [next in thread]