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

[Laurent Montel]

SVN commit 554094 by mlaurent:

Port++


 M  +3 -3      codegenerationpolicy.cpp  
 M  +3 -3      codegenerator.cpp  
 M  +5 -4      kplayerslideraction.cpp  
 M  +1 -1      kplayerslideraction.h  


--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerationpolicy.cpp #554093:554094
@@ -488,9 +488,9 @@
 
     config->setGroup("Code Generation");
 
-    config->writeEntry("defaultAttributeAccessorScope",getAttributeAccessorScope());
-    config->writeEntry("defaultAssocFieldScope",getAssociationFieldScope());
-    config->writeEntry("commentStyle",getCommentStyle());
+    config->writeEntry("defaultAttributeAccessorScope",( int )getAttributeAccessorScope());
+    config->writeEntry("defaultAssocFieldScope",( int )getAssociationFieldScope());
+    config->writeEntry("commentStyle",( int )getCommentStyle());
     config->writeEntry("autoGenEmptyConstructors",getAutoGenerateConstructors());
     //config->writeEntry("newCodegen", getNewCodegen());
     config->writeEntry("forceDoc",getCodeVerboseDocumentComments());
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerator.cpp #554093:554094
@@ -408,7 +408,7 @@
         break;
     case CodeGenerationPolicy::Ask:            //ask if we can overwrite
         switch(overwriteDialog.exec()) {
-        case KDialogBase::Yes:  //overwrite file
+        case KDialog::Yes:  //overwrite file
             if ( overwriteDialog.applyToAllRemaining() ) {
                 pol->setOverwritePolicy(CodeGenerationPolicy::Ok);
                 filename = name + extension;
@@ -416,7 +416,7 @@
                 m_applyToAllRemaining = false;
             }
             break;
-        case KDialogBase::No: //generate similar name
+        case KDialog::No: //generate similar name
             suffix = 1;
             while (1) {
                 filename = name + "__" + QString::number(suffix) + extension;
@@ -430,7 +430,7 @@
                 m_applyToAllRemaining = false;
             }
             break;
-        case KDialogBase::Cancel: //don't output anything
+        case KDialog::Cancel: //don't output anything
             if ( overwriteDialog.applyToAllRemaining() ) {
                 pol->setOverwritePolicy(CodeGenerationPolicy::Cancel);
             } else {
--- trunk/KDE/kdesdk/umbrello/umbrello/kplayerslideraction.cpp #554093:554094
@@ -25,7 +25,8 @@
 //Added by qt3to4:
 #include <Q3Frame>
 #include <QKeyEvent>
-
+#include <k3widgetaction.h>
+#include <QDesktopWidget>
 #include <kdebug.h>
 
 //CHANGED #include "kplayersettings.h"
@@ -162,7 +163,7 @@
 
 KPlayerSliderAction::KPlayerSliderAction (const QString& text, const KShortcut& cut,
         const QObject* receiver, const char* slot, KActionCollection* parent, const char* name)
-        : KWidgetAction (new KPlayerSlider (Qt::Horizontal, 0, name), text, cut, receiver, slot, parent, name)
+        : K3WidgetAction (new KPlayerSlider (Qt::Horizontal, 0, name), text, cut, receiver, slot, parent, name)
         //: KAction (text, 0, parent, name)
 {
     setAutoSized (true);
@@ -185,7 +186,7 @@
     //  return -1;
     //if ( kapp && ! kapp -> authorizeKAction (name()) )
     //  return -1;
-    int result = KWidgetAction::plug (widget, index);
+    int result = K3WidgetAction::plug (widget, index);
     if ( result < 0 )
         return result;
     KToolBar* toolbar = (KToolBar*) widget;
@@ -215,7 +216,7 @@
     //Q_ASSERT (m_slider);
     //Q_ASSERT (isPlugged());
     //Q_ASSERT (widget -> inherits ("KToolBar"));
-    KWidgetAction::unplug (widget);
+    K3WidgetAction::unplug (widget);
     if ( ! slider() || ! isPlugged() || widget != slider() -> parent() )
         return;
     //KToolBar* toolbar = (KToolBar*) widget;
--- trunk/KDE/kdesdk/umbrello/umbrello/kplayerslideraction.h #554093:554094
@@ -167,7 +167,7 @@
 /**Slider action suitable for insertion into a toolbar.
   *@author kiriuja
   */
-class KPlayerSliderAction : public KWidgetAction
+class KPlayerSliderAction : public K3WidgetAction
 {
     Q_OBJECT