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

List:       kde-commits
Subject:    KDE/kdelibs/kjsembed
From:       David Faure <faure () kde ! org>
Date:       2007-10-22 21:20:41
Message-ID: 1193088041.264059.8008.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 728274 by dfaure:

Fix enable-final


 M  +0 -2      CMakeLists.txt  
 M  +2 -2      kjsembed/builtins.h  
 M  +3 -4      kjsembed/slotproxy.cpp  


--- trunk/KDE/kdelibs/kjsembed/CMakeLists.txt #728273:728274
@@ -1,5 +1,3 @@
-KDE4_NO_ENABLE_FINAL(kjsembed)
-
 include_directories(
     ${CMAKE_SOURCE_DIR}
     ${CMAKE_SOURCE_DIR}/kjsembed 
--- trunk/KDE/kdelibs/kjsembed/kjsembed/builtins.h #728273:728274
@@ -21,8 +21,8 @@
 */
 
 
-#ifndef BUILTINS_H
-#define BUILTINS_h
+#ifndef KJSEMBED_BUILTINS_H
+#define KJSEMBED_BUILTINS_H
 
 #include <kjs/object.h>
 #include <kjsembed/object_binding.h>
--- trunk/KDE/kdelibs/kjsembed/kjsembed/slotproxy.cpp #728273:728274
@@ -34,7 +34,6 @@
 //#define DEBUG_SLOTPROXY 1
 
 using namespace KJSEmbed;
-using namespace KJS;
 
 SlotProxy::SlotProxy(KJS::JSObject *obj, KJS::Interpreter *interpreter, QObject \
*parent, const QByteArray &signature)  : QObject(parent), m_interpreter(interpreter), \
m_object(obj) @@ -118,12 +117,12 @@
                             id.ascii(),
                             methodName.data(),
                             QString(m_signature));
-        
+
         retValue = throwError(exec, KJS::TypeError, msg);
     }
     else
         retValue = fun->call(exec, m_object, args);
-    
+
     if( exec->hadException() )
     {
 #ifdef DEBUG_SLOTPROXY
@@ -143,7 +142,7 @@
 
         // clear it so it doesn't stop other things
         exec->clearException();
-        
+
         return KJS::jsNull();
     }
     else


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