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

[Oliver Kellogg]

SVN commit 468009 by okellogg:

sync with trunk

 M  +1 -1      exportviewaction.cpp  
 M  +2 -1      uml.cpp  
 M  +2 -0      umllistview.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/umbrello/exportviewaction.cpp #468008:468009
@@ -35,7 +35,7 @@
 
 ExportViewAction::ExportViewAction(QString extension, QObject *parent) :
     KAction(i18n("Export All Diagrams as Images"),
-            SmallIconSet("image"), 0, parent),
+            SmallIconSet("image"), KShortcut::null(), parent),
     m_extension(extension) {
     m_mimetype = "unknown";
     updateMimetype();
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/uml.cpp #468008:468009
@@ -211,7 +211,7 @@
 
     deleteSelectedWidget = new KAction( i18n("Delete &Selected"),
                                         SmallIconSet("editdelete"),
-                                        KShortcut(Key_Delete), this,
+                                        KShortcut(Qt::Key_Delete), this,
                                         SLOT( slotDeleteSelectedWidget() ), actionCollection(),
                                         "delete_selected" );
 
@@ -1116,6 +1116,7 @@
     m_config -> setGroup( "UI Options" );
     m_optionState.uiState.useFillColor = m_config -> readBoolEntry( "useFillColor", true );
     QColor defaultYellow = QColor( 255, 255, 192 );
+    QColor red ( Qt::red );
 
     m_optionState.uiState.fillColor = m_config -> readColorEntry( "fillColor", &defaultYellow );
     m_optionState.uiState.lineColor = m_config -> readColorEntry( "lineColor", &red );
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/umllistview.cpp #468008:468009
@@ -61,6 +61,7 @@
 #include "dialogs/umloperationdialog.h"
 #include "dialogs/umltemplatedialog.h"
 
+#ifdef WANT_LVTOOLTIP
 class LVToolTip : public QToolTip
 {
 public:
@@ -88,6 +89,7 @@
         tip(rect, text);
     }
 };
+#endif
 
 
 UMLListView::UMLListView(QWidget *parent, const char *name)