[Uml-devel] KDE/kdesdk/umbrello/umbrello

[Andi Fischer]

SVN commit 1238453 by fischer:

Fixing compiler warnings.

 M  +2 -2      dialogs/settingsdlg.cpp  
 M  +6 -7      umlviewcanvas.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/settingsdlg.cpp #1238452:1238453
@@ -526,7 +526,7 @@
 {
     if (value == false) {
         QPalette palette;
-        m_UiWidgets.gridColorB->setColor( palette.alternateBase() );
+        m_UiWidgets.gridColorB->setColor( palette.alternateBase().color() );
         m_UiWidgets.gridColorB->setDisabled(true);
     }
     else {
@@ -538,7 +538,7 @@
 {
     if (value == false) {
         QPalette palette;
-        m_UiWidgets.bgColorB->setColor( palette.base() );
+        m_UiWidgets.bgColorB->setColor( palette.base().color() );
         m_UiWidgets.bgColorB->setDisabled(true);
     }
     else {
--- trunk/KDE/kdesdk/umbrello/umbrello/umlviewcanvas.cpp #1238452:1238453
@@ -11,13 +11,13 @@
 // own header
 #include "umlviewcanvas.h"
 
-// qt/kde includes
-#include <qpainter.h>
-
 // app includes
 #include "umlview.h"
-#include <QPalette>
 
+// qt/kde includes
+#include <QtGui/QPainter>
+#include <QtGui/QPalette>
+
 /**
  * Constructor
  */
@@ -26,12 +26,12 @@
     m_pView = pView;
     
     QPalette palette;
-    setColors(palette.base(), option.uiState.gridDotColor);
+    setColors(palette.base().color(), option.uiState.gridDotColor);
     //setColors(option.uiState.backgroundColor, option.uiState.gridDotColor); //TODO Somehow, it does not work, it should
 }
 
 /**
- * Deconstructor
+ * Destructor.
  */
 UMLViewCanvas::~UMLViewCanvas()
 {
@@ -69,4 +69,3 @@
                 painter.drawPoint( x * gridX, y * gridY );
     }
 }
-