[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kjsembed/kjsembed
From:       Ian Reinhart Geiser <geiseri () kde ! org>
Date:       2006-04-08 16:16:54
Message-ID: 1144513014.429683.22179.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 527550 by geiseri:

Since matt is doing all of the real work, i might
as well do some bitch work and fill in the QEvents
that are missing.

Core kjsembed should not link against anything 
outside of kdecore.



 M  +2 -2      CMakeLists.txt  
 M  +16 -11    jseventutils.cpp  
 M  +1 -1      jseventutils.h  


--- trunk/KDE/kdelibs/kjsembed/kjsembed/CMakeLists.txt #527549:527550
@@ -2,7 +2,7 @@
 
 project(kjsembed-kjsembed)
 
-include_directories( ${KDE4_KDEUI_INCLUDES} )
+include_directories( ${KDE4_KDECORE_INCLUDES} )
 include_directories( ${CMAKE_SOURCE_DIR}/kjs )
 
 
@@ -39,7 +39,7 @@
 
 kde4_add_library(kjsembed SHARED ${kjsembed_LIB_SRCS})
 
-target_link_libraries(kjsembed ${KDE4_KDEUI_LIBS} ${QT_QTSVG_LIBRARY} \
${QT_QTXML_LIBRARY} ${QT_QTDESIGNER_LIBRARY} kjs ) +target_link_libraries(kjsembed \
${KDE4_KDECORE_LIBS} ${QT_QTSVG_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTDESIGNER_LIBRARY} \
kjs )  
 set_target_properties(kjsembed PROPERTIES VERSION 1.0.0 SOVERSION 1 )
 install_targets(${LIB_INSTALL_DIR} kjsembed )
--- trunk/KDE/kdelibs/kjsembed/kjsembed/jseventutils.cpp #527549:527550
@@ -34,10 +34,14 @@
                 return convertEvent( exec, (QResizeEvent*)ev );
                 break;
             case QEvent::Timer:
+                return convertEvent( exec, (QTimerEvent*)ev );
+                break;
             case QEvent::MouseButtonPress:
             case QEvent::MouseButtonRelease:
             case QEvent::MouseButtonDblClick:
             case QEvent::MouseMove:
+            case QEvent::Enter:
+            case QEvent::Leave:
                 return convertEvent( exec, (QMouseEvent*)ev );
                 break;
             case QEvent::KeyPress:
@@ -46,8 +50,8 @@
                 break;
             case QEvent::FocusIn:
             case QEvent::FocusOut:
-            case QEvent::Enter:
-            case QEvent::Leave:
+                return convertEvent( exec, (QFocusEvent*)ev );
+                break;
             case QEvent::Paint:
                 return convertEvent( exec, (QPaintEvent*)ev );
                 break;
@@ -224,15 +228,6 @@
         return rev;
     }
 
-    KJS::JSObject *convertEvent( KJS::ExecState *exec, const QFocusEvent *ev)
-    {
-        KJS::JSObject *fev = convertEvent( exec, (QEvent *)ev );
-
-        fev->put( exec, "gotFocus", KJS::Boolean(ev->gotFocus()) );
-        fev->put( exec, "lostFocus", KJS::Boolean(ev->lostFocus()) );
-        return fev;
-    }
-
     KJS::JSObject *convertEvent( KJS::ExecState *exec, const QCloseEvent *ev)
     {
         KJS::JSObject *cev = convertEvent( exec, (QEvent *)ev );
@@ -305,5 +300,15 @@
         cxev->put( exec, "reason", KJS::Number((int)ev->reason()) );
         return cxev;
     }
+
+    KJS::JSObject *convertEvent( KJS::ExecState *exec, const QFocusEvent *ev)
+    {
+         KJS::JSObject *dev = convertEvent( exec, (QEvent *)ev );
+         dev->put( exec, "gotFocus", KJS::Boolean( ev->gotFocus() ) );
+         dev->put( exec, "lostFocus", KJS::Boolean( ev->lostFocus() ));
+         //Gold star trolltech!
+         dev->put( exec, "reason", KJS::Number((int) const_cast<QFocusEvent*>( ev \
)->reason() ) ); +         return dev;
+    }
 }// namespace JSEventUtils
 }// namespace KJSEmbed
--- trunk/KDE/kdelibs/kjsembed/kjsembed/jseventutils.h #527549:527550
@@ -59,7 +59,6 @@
     KJS::JSObject *convertEvent( KJS::ExecState *exec, const QKeyEvent *ev);
     KJS::JSObject *convertEvent( KJS::ExecState *exec, const QInputMethodEvent *ev);
     KJS::JSObject *convertEvent( KJS::ExecState *exec, const QResizeEvent *ev);
-    KJS::JSObject *convertEvent( KJS::ExecState *exec, const QFocusEvent *ev);
     KJS::JSObject *convertEvent( KJS::ExecState *exec, const QCloseEvent *ev);
     KJS::JSObject *convertEvent( KJS::ExecState *exec, const QMoveEvent *ev);
     KJS::JSObject *convertEvent( KJS::ExecState *exec, const QWheelEvent *ev);
@@ -67,6 +66,7 @@
     KJS::JSObject *convertEvent( KJS::ExecState *exec, const QDragMoveEvent *ev);
     KJS::JSObject *convertEvent( KJS::ExecState *exec, const QTimerEvent *ev);
     KJS::JSObject *convertEvent( KJS::ExecState *exec, const QContextMenuEvent *ev);
+    KJS::JSObject *convertEvent( KJS::ExecState *exec, const QFocusEvent *ev);
 }
 
 } // KJSEmbed


[prev in list] [next in list] [prev in thread] [next in thread]