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

List:       kde-commits
Subject:    KDE/kdebase
From:       Stephan Kulow <coolo () kde ! org>
Date:       2006-04-30 18:08:43
Message-ID: 1146420523.415127.14003.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 535917 by coolo:

replaced QColorGroup:: with QPalette::


 M  +1 -1      kate/app/katefilelist.cpp  
 M  +2 -2      kate/app/kateviewspace.cpp  
 M  +1 -1      kdeprint/kdeprintfax/kdeprintfax.cpp  
 M  +1 -1      konqueror/konq_combo.cc  
 M  +2 -2      konqueror/listview/konq_infolistviewitem.cc  
 M  +2 -2      konqueror/listview/konq_listviewitems.cc  
 M  +3 -3      konqueror/listview/konq_textviewitem.cc  
 M  +7 -7      kpager/desktop.cpp  


--- trunk/KDE/kdebase/kate/app/katefilelist.cpp #535916:535917
@@ -514,7 +514,7 @@
           (int)((b.blue()*(1-t)) + (shade.blue()*t))
               );
 
-      cgNew.setColor(QColorGroup::Base, b);
+      cgNew.setColor(QPalette::Base, b);
     }
 
     Q3ListViewItem::paintCell( painter, cgNew, column, width, align );
--- trunk/KDE/kdebase/kate/app/kateviewspace.cpp #535916:535917
@@ -178,8 +178,8 @@
   QPalette pal( palette() );
   if ( ! active )
   {
-    pal.setColor( QColorGroup::Window, pal.color(QPalette::Window).dark() );
-    pal.setColor( QColorGroup::Light, pal.color(QPalette::Light).light() );
+    pal.setColor( QPalette::Window, pal.color(QPalette::Window).dark() );
+    pal.setColor( QPalette::Light, pal.color(QPalette::Light).light() );
   }
 
   mStatusBar->setPalette( pal );
--- trunk/KDE/kdebase/kdeprint/kdeprintfax/kdeprintfax.cpp #535916:535917
@@ -465,7 +465,7 @@
 {
 	QString	cmd = m_faxctrl->faxCommand();
 	m_comment->setEnabled(cmd.indexOf("%comment") != -1);
-	//m_comment->setPaper(m_comment->isEnabled() ? \
colorGroup().brush(QColorGroup::Base) : colorGroup().brush(QColorGroup::Background)); \
+	//m_comment->setPaper(m_comment->isEnabled() ? colorGroup().brush(QPalette::Base) : \
colorGroup().brush(QPalette::Background));  if (!m_comment->isEnabled())
 	{
 		m_comment->setText("");
--- trunk/KDE/kdebase/konqueror/konq_combo.cc #535916:535917
@@ -662,7 +662,7 @@
         r.setRight( re.right() );
         if ( r != edit->geometry() )
             edit->setGeometry( r );
-        edit->setPaletteBackgroundColor( QApplication::palette( edit ).color( \
QPalette::Active, QColorGroup::Base ) ); +        edit->setPaletteBackgroundColor( \
QApplication::palette( edit ).color( QPalette::Active, QPalette::Base ) );  }
 }
 
--- trunk/KDE/kdebase/konqueror/listview/konq_infolistviewitem.cc #535916:535917
@@ -216,7 +216,7 @@
         _painter->setFont( m_pListViewWidget->itemFont() );
     }
 
-    cg.setColor( QColorGroup::Text, m_pListViewWidget->itemColor() );
+    cg.setColor( QPalette::Text, m_pListViewWidget->itemColor() );
 
     K3ListView *lv = static_cast< K3ListView* >( listView() );
     const QPixmap *pm = lv->viewport()->paletteBackgroundPixmap();
@@ -227,7 +227,7 @@
             newWidth = _width;
         if ( pm && !pm->isNull() )
         {
-            cg.setBrush( QColorGroup::Base, QBrush( backgroundColor(_column), *pm ) \
); +            cg.setBrush( QPalette::Base, QBrush( backgroundColor(_column), *pm ) \
);  QPoint o = _painter->brushOrigin();
             _painter->setBrushOrigin( o.x() - lv->contentsX(), o.y() - \
                lv->contentsY() );
             const QPalette::ColorRole crole = lv->viewport()->backgroundRole();
--- trunk/KDE/kdebase/konqueror/listview/konq_listviewitems.cc #535916:535917
@@ -287,7 +287,7 @@
         _painter->setFont( m_pListViewWidget->itemFont() );
     }
 
-    cg.setColor( QColorGroup::Text, m_pListViewWidget->itemColor() );
+    cg.setColor( QPalette::Text, m_pListViewWidget->itemColor() );
 
     K3ListView *lv = static_cast< K3ListView* >( listView() );
     const QPixmap *pm = lv->viewport()->paletteBackgroundPixmap();
@@ -298,7 +298,7 @@
             newWidth = _width;
         if ( pm && !pm->isNull() )
         {
-            cg.setBrush( QColorGroup::Base, QBrush( backgroundColor(_column), *pm ) \
); +            cg.setBrush( QPalette::Base, QBrush( backgroundColor(_column), *pm ) \
);  QPoint o = _painter->brushOrigin();
             _painter->setBrushOrigin( o.x() - lv->contentsX(), o.y() - \
                lv->contentsY() );
             const QPalette::ColorRole crole = lv->viewport()->backgroundRole();
--- trunk/KDE/kdebase/konqueror/listview/konq_textviewitem.cc #535916:535917
@@ -199,10 +199,10 @@
 void KonqTextViewItem::paintCell( QPainter *_painter, const QColorGroup & _cg, int \
_column, int _width, int _alignment )  {
    QColorGroup cg( _cg );
-   cg.setColor(QColorGroup::Text, static_cast<KonqTextViewWidget \
*>(listView())->colors[type]); +   cg.setColor(QPalette::Text, \
static_cast<KonqTextViewWidget *>(listView())->colors[type]);  // Don't do that! Keep \
                things readable whatever the selection background color is
-//   cg.setColor(QColorGroup::HighlightedText, static_cast<KonqTextViewWidget \
                *>(listView())->highlight[type]);
-//   cg.setColor(QColorGroup::Highlight, Qt::darkGray);
+//   cg.setColor(QPalette::HighlightedText, static_cast<KonqTextViewWidget \
*>(listView())->highlight[type]); +//   cg.setColor(QPalette::Highlight, \
Qt::darkGray);  
    K3ListViewItem::paintCell( _painter, cg, _column, _width, _alignment );
 }
--- trunk/KDE/kdebase/kpager/desktop.cpp #535916:535917
@@ -289,7 +289,7 @@
 
     p.begin(pixmap);
     p.setFont(font());
-    p.fillRect( r, QColorGroup( palette() ).brush(QColorGroup::Dark));
+    p.fillRect( r, QColorGroup( palette() ).brush(QPalette::Dark));
     paintWindow(p, info, false);
     p.end();
 
@@ -407,7 +407,7 @@
   if ( active )
      p.setPen(Qt::yellow);
   else
-     p.setPen(QColorGroup::Base);
+     p.setPen(QPalette::Base);
   p.drawRect(rect());
   p.end();
 }
@@ -419,7 +419,7 @@
 
   p.begin(&pixmap);
 //  p.setFont(font());
-//  p.fillRect(rect(), colorGroup().brush(QColorGroup::Dark));
+//  p.fillRect(rect(), colorGroup().brush(QPalette::Dark));
 //  p.setPen(Qt::black);
 //  p.drawRect(rect());
 
@@ -444,13 +444,13 @@
      else pixmap.fill(Qt::gray);
   }
   else
-    p.fillRect(rect(), palette().brush(QColorGroup::Mid));
+    p.fillRect(rect(), palette().brush(QPalette::Mid));
 
     // set in/active pen
   if (isCurrent())
     p.setPen(Qt::yellow);
   else
-    p.setPen(QColorGroup::Base);
+    p.setPen(QPalette::Base);
 
     // paint number & name
     bool sname=KPagerConfigDialog::m_showName;
@@ -517,8 +517,8 @@
 
   QBrush brush;
 
-  if ( isActive ) brush=palette().brush( QColorGroup::Highlight );
-  else brush=palette().brush(  QColorGroup::Button );
+  if ( isActive ) brush=palette().brush( QPalette::Highlight );
+  else brush=palette().brush(  QPalette::Button );
 
   if ( m_transparentMode==AllWindows
       || (m_transparentMode==MaximizedWindows && ( info->state() & NET::Max )) )


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