[Kst] kdeextragear-2/kst/kst/extensions/js/kjsembed/qtbindings

[George Staikos]

CVS commit by staikos: 

compile.  How do you want to fix this for real?
CCMAIL: kjsembed at kde.org


  M +6 -0      qcanvasitem_imp.cpp   1.3
  M +4 -0      qcanvasitem_imp.h   1.2
  M +7 -1      qt_imp.cpp   1.3


--- kdeextragear-2/kst/kst/extensions/js/kjsembed/qtbindings/qcanvasitem_imp.cpp  #1.2:1.3
@@ -124,8 +124,10 @@ void QCanvasItemImp::addBindings( KJS::E
         { Method_setActive_31, "setActive" },
         { Method_isActive_32, "isActive" },
+#ifndef QT_NO_COMPAT
         { Method_visible_33, "visible" },
         { Method_selected_34, "selected" },
         { Method_enabled_35, "enabled" },
         { Method_active_36, "active" },
+#endif
         { Method_rtti_37, "rtti" },
         { Method_boundingRect_38, "boundingRect" },
@@ -353,4 +355,5 @@ KJS::Value QCanvasItemImp::call( KJS::Ex
         break;
 
+#ifndef QT_NO_COMPAT
     case Method_visible_33:
         return visible_33( exec, self, args );
@@ -368,4 +371,5 @@ KJS::Value QCanvasItemImp::call( KJS::Ex
         return active_36( exec, self, args );
         break;
+#endif
 
     case Method_rtti_37:
@@ -716,4 +720,5 @@ KJS::Value QCanvasItemImp::isActive_32( 
 }
 
+#ifndef QT_NO_COMPAT
 KJS::Value QCanvasItemImp::visible_33( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
@@ -751,4 +756,5 @@ KJS::Value QCanvasItemImp::active_36( KJ
 
 }
+#endif
 
 KJS::Value QCanvasItemImp::rtti_37( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )

--- kdeextragear-2/kst/kst/extensions/js/kjsembed/qtbindings/qcanvasitem_imp.h  #1.1:1.2
@@ -65,8 +65,10 @@ public:
        Method_setActive_31,
        Method_isActive_32,
+#ifndef QT_NO_COMPAT
        Method_visible_33,
        Method_selected_34,
        Method_enabled_35,
        Method_active_36,
+#endif
        Method_rtti_37,
        Method_boundingRect_38,
@@ -133,8 +135,10 @@ public:
    KJS::Value setActive_31( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args );
    KJS::Value isActive_32( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args );
+#ifndef QT_NO_COMPAT
    KJS::Value visible_33( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args );
    KJS::Value selected_34( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args );
    KJS::Value enabled_35( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args );
    KJS::Value active_36( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args );
+#endif
    KJS::Value rtti_37( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args );
    KJS::Value boundingRect_38( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args );

--- kdeextragear-2/kst/kst/extensions/js/kjsembed/qtbindings/qt_imp.cpp  #1.2:1.3
@@ -170,8 +170,10 @@ void QtImp::addStaticBindings( KJS::Exec
         { "WStyle_Splash", Qt::WStyle_Splash },
         { "WNoAutoErase", Qt::WNoAutoErase },
+#ifndef QT_NO_COMPAT
         { "WNorthWestGravity", Qt::WNorthWestGravity },
         { "WType_Modal", Qt::WType_Modal },
         { "WStyle_Dialog", Qt::WStyle_Dialog },
         { "WStyle_NoBorderEx", Qt::WStyle_NoBorderEx },
+#endif
         // enum WindowState
         { "WindowNoState", Qt::WindowNoState },
@@ -202,4 +204,5 @@ void QtImp::addStaticBindings( KJS::Exec
         { "OpaqueMode", Qt::OpaqueMode },
         // enum PaintUnit
+#ifndef QT_NO_COMPAT
         { "PixelUnit", Qt::PixelUnit },
         { "LoMetricUnit", Qt::LoMetricUnit },
@@ -210,7 +213,8 @@ void QtImp::addStaticBindings( KJS::Exec
         // enum GUIStyle
         { "MacStyle", Qt::MacStyle },
-        { "WindowsStyle", Qt::WindowsStyle },
         { "Win3Style", Qt::Win3Style },
         { "PMStyle", Qt::PMStyle },
+#endif
+        { "WindowsStyle", Qt::WindowsStyle },
         { "MotifStyle", Qt::MotifStyle },
         // enum SequenceMatch
@@ -638,4 +642,5 @@ void QtImp::addStaticBindings( KJS::Exec
         { "DockLeft", Qt::DockLeft },
         { "DockMinimized", Qt::DockMinimized },
+#ifndef QT_NO_COMPAT
         { "Unmanaged", Qt::Unmanaged },
         { "TornOff", Qt::TornOff },
@@ -645,4 +650,5 @@ void QtImp::addStaticBindings( KJS::Exec
         { "Left", Qt::Left },
         { "Minimized", Qt::Minimized },
+#endif
         // enum DateFormat
         { "TextDate", Qt::TextDate },