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

List:       kde-commits
Subject:    KDE/kdeartwork/kwin-styles
From:       Laurent Montel <montel () kde ! org>
Date:       2005-10-27 16:30:41
Message-ID: 1130430641.473179.1348.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 474910 by mlaurent:

Fix some error


 M  +1 -1      riscos/Manager.cpp  
 M  +6 -6      system/systemclient.cpp  


--- trunk/KDE/kdeartwork/kwin-styles/riscos/Manager.cpp #474909:474910
@@ -316,7 +316,7 @@
    p.setFont(options()->font(active));
 
    p.drawText(4, 2, tr.width() - 8, Static::instance()->titleHeight() - 4,
-              AlignCenter, caption());
+              Qt::AlignCenter, caption());
 
    p.drawPixmap(tr.width() - 3, 0, s->titleTextRight(active));
 }
--- trunk/KDE/kdeartwork/kwin-styles/system/systemclient.cpp #474909:474910
@@ -247,7 +247,7 @@
             p->drawPixmap(0, 0, isDown() ? *iBtnPixDown : *iBtnPix);
     }
     else{
-        QColorGroup g = KDecoration::options()->colorGroup(KDecorationOptions::ColorFrame,
+        QColorGroup g = KDecoration::options()->color(KDecorationOptions::ColorFrame,
                                             client->isActive());
         int x2 = width()-1;
         int y2 = height()-1;
@@ -353,7 +353,7 @@
 void SystemClient::addButtons(QBoxLayout *hb, const QString& s)
 {
     unsigned char *minmax_bits;
-    int l_max = KDecoration::options()->titleButtonsLeft().find('A');
+    int l_max = KDecoration::options()->titleButtonsLeft().count('A');
     if (s.length() > 0) {
         for (unsigned n=0; n < s.length(); n++) {
             switch (s[n]) {
@@ -530,7 +530,7 @@
     p.setFont(options()->font(true));
 
     p.drawText(t.x()+((t.width()-fm.width(caption()))/2)-4,
-               0, fm.width(caption())+8, 18, AlignCenter, caption());
+               0, fm.width(caption())+8, 18, Qt::AlignCenter, caption());
     p.setClipping(false);
     p.end();
     oldTitle = caption();
@@ -574,13 +574,13 @@
             p.fillRect(0, 0, width(), 18, fillBrush);
         p.setPen(options()->color(KDecorationOptions::ColorFont, isActive()));
         p.setFont(options()->font(isActive()));
-        p.drawText(t, AlignCenter, caption() );
+        p.drawText(t, Qt::AlignCenter, caption() );
     }
 
-    p.setPen(options()->colorGroup(KDecorationOptions::ColorFrame, isActive()).light());
+    p.setPen(options()->color(KDecorationOptions::ColorFrame, isActive()).light());
     p.drawLine(width()-20, height()-7, width()-10,  height()-7);
     p.drawLine(width()-20, height()-5, width()-10,  height()-5);
-    p.setPen(options()->colorGroup(KDecorationOptions::ColorFrame, isActive()).dark());
+    p.setPen(options()->color(KDecorationOptions::ColorFrame, isActive()).dark());
     p.drawLine(width()-20, height()-6, width()-10,  height()-6);
     p.drawLine(width()-20, height()-4, width()-10,  height()-4);
 
[prev in list] [next in list] [prev in thread] [next in thread]