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

[Oliver Kellogg]

SVN commit 465753 by okellogg:

move closer to trunk

 M  +0 -1      import_utils.h  
 M  +7 -7      kplayerslideraction.cpp  
 M  +3 -3      kplayerslideraction.h  
 M  +1 -1      kstartuplogo.cpp  
 M  +1 -1      worktoolbar.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/umbrello/import_utils.h #465752:465753
@@ -12,7 +12,6 @@
 #ifndef IMPORT_UTILS_H
 #define IMPORT_UTILS_H
 
-#include <qptrlist.h>
 #include <qstringlist.h>
 #include "umlnamespace.h"
 #include "umlattributelist.h"
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/kplayerslideraction.cpp #465752:465753
@@ -33,11 +33,11 @@
 {
     switch ( ev -> key() )
     {
-    case Key_Alt:
-    case Key_Tab:
-    case Key_Escape:
-    case Key_Return:
-    case Key_Enter:
+    case Qt::Key_Alt:
+    case Qt::Key_Tab:
+    case Qt::Key_Escape:
+    case Qt::Key_Return:
+    case Qt::Key_Enter:
         close();
     }
 }
@@ -248,7 +248,7 @@
     }
 }*/
 
-void KPlayerSliderAction::orientationChanged (Orientation orientation)
+void KPlayerSliderAction::orientationChanged (Qt::Orientation orientation)
 {
     //if ( sender() && sender() -> inherits ("KToolBar") )
     //  setupToolbar (orientation, (KToolBar*) sender());
@@ -315,7 +315,7 @@
     return hint;
 }
 
-void KPlayerSlider::setOrientation (Orientation o)
+void KPlayerSlider::setOrientation (Qt::Orientation o)
 {
     if ( o == orientation() )
         return;
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/kplayerslideraction.h #465752:465753
@@ -78,7 +78,7 @@
     void setup (int minValue, int maxValue, int value, int pageStep, int lineStep = 1);
     /** Sets the slider orientation.
       */
-    virtual void setOrientation (Orientation);
+    virtual void setOrientation (Qt::Orientation);
 
 signals:
     /** Emitted when the slider value changes.
@@ -109,7 +109,7 @@
     /** The KPlayerPopupFrame constructor. Parameters are passed on to QFrame.
       */
     KPlayerPopupFrame (QWidget* parent = 0, const char* name = 0)
-            : QFrame (parent, name, WType_Popup) { }
+            : QFrame (parent, name, Qt::WType_Popup) { }
     /** The KPlayerPopupFrame destructor. Does nothing.
       */
     virtual ~KPlayerPopupFrame() { }
@@ -191,7 +191,7 @@
 protected slots:
     /** Changes the slider orientation when the toolbar orientation changes.
       */
-    void orientationChanged (Orientation);
+    void orientationChanged (Qt::Orientation);
 
 protected:
     /** The slider.
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/kstartuplogo.cpp #465752:465753
@@ -18,7 +18,7 @@
 #include <qtimer.h>
 
 KStartupLogo::KStartupLogo(QWidget * parent, const char *name)
-        : QWidget(parent,name, WStyle_NoBorder | WStyle_Customize | WDestructiveClose )
+        : QWidget(parent,name, Qt::WStyle_NoBorder | Qt::WStyle_Customize | Qt::WDestructiveClose )
 ,m_bReadyToHide(false) {
     //pm.load(locate("appdata", "pics/startlogo.png"));
     KStandardDirs * dirs = KGlobal::dirs();
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/worktoolbar.cpp #465752:465753
@@ -33,7 +33,7 @@
     loadPixmaps();
     m_Type = Uml::dt_Class; /* first time in just want it to load arrow,
                            needs anything but dt_Undefined  */
-    setOrientation( Vertical );
+    setOrientation( Qt::Vertical );
     setVerticalStretchable( true );
     //intialize old tool map, everything starts with select tool (arrow)
     m_map.insert(Uml::dt_UseCase,tbb_Arrow);