rhodes 5.5.0.22 → 5.5.2

data/platform/shared/common/RhoTime.cpp

@@ -1,18 +1,18 @@
 /*------------------------------------------------------------------------
 * (The MIT License)
-*
+* 
 * Copyright (c) 2008-2011 Rhomobile, Inc.
-*
+* 
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
 * in the Software without restriction, including without limitation the rights
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
-*
+* 
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
-*
+* 
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -20,39 +20,13 @@
 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
-*
+* 
 * http://rhomobile.com
 *------------------------------------------------------------------------*/
 
 #include "common/RhoTime.h"
 #include "common/RhodesApp.h"
 
-#include "common/RhoConf.h"
-
-
-#include "logging/RhoLog.h"
-
-#undef DEFAULT_LOGCATEGORY
-#define DEFAULT_LOGCATEGORY "RhoTimer"
-
-
-static bool is_net_trace() {
-    static int res = -1;
-    if (res == -1) {
-        if (rho_conf_getBool("net_trace") ) {
-            res = 1;
-        }
-        else {
-            res = 0;
-        }
-    }
-    return res == 1;
-}
-
-
-
-
-
 namespace rho{
 namespace common{
 
@@ -169,34 +143,33 @@ boolean CRhoTimer::checkTimers()
     for( int i = (int)m_arItems.size()-1; i >= 0; i--)
     {
         CTimerItem oItem = m_arItems.elementAt(i);
-        
-            if(oItem.m_overflow==false)
-            {
-                
-                if ( curTime.toULong() >= oItem.m_oFireTime.toULong() )
-                {
+		if(oItem.m_overflow==false)
+		{
+
+			if ( curTime.toULong() >= oItem.m_oFireTime.toULong() )
+			{
+                RAWTRACE("CRhoTimer::checkTimers: firing timer");
+				m_arItems.removeElementAt(i);
+				if ( RHODESAPP().callTimerCallback(oItem.m_strCallback, oItem.m_strCallbackData) )
+					bRet = true;
+			}
+
+		}
+		else
+		{
+			if ( curTime.toULong() >= oItem.m_oFireTime.toULong() )
+			{
+				if((curTime.toULong()-oItem.m_oFireTime.toULong())<=oItem.m_nInterval)
+				{
                     RAWTRACE("CRhoTimer::checkTimers: firing timer");
-                    m_arItems.removeElementAt(i);
-                    if ( RHODESAPP().callTimerCallback(oItem.m_strCallback, oItem.m_strCallbackData) )
-                        bRet = true;
-                }
-                
-            }
-            else
-            {
-                if ( curTime.toULong() >= oItem.m_oFireTime.toULong() )
-                {
-                    if((curTime.toULong()-oItem.m_oFireTime.toULong())<=oItem.m_nInterval)
-                    {
-                        RAWTRACE("CRhoTimer::checkTimers: firing timer");
-                        m_arItems.removeElementAt(i);
-                        if ( RHODESAPP().callTimerCallback(oItem.m_strCallback, oItem.m_strCallbackData) )
-                            bRet = true;
-                    }
-                    
-                }
-                
-            }
+					m_arItems.removeElementAt(i);
+					if ( RHODESAPP().callTimerCallback(oItem.m_strCallback, oItem.m_strCallbackData) )
+						bRet = true;
+				}
+
+			}
+
+		}
     }
 
     for( int i = (int)m_arNativeItems.size()-1; i >= 0; i--)
@@ -204,42 +177,28 @@ boolean CRhoTimer::checkTimers()
         CNativeTimerItem oItem = m_arNativeItems.elementAt(i);
         
         if(oItem.m_overflow==false)
-        {
+		{
             if ( curTime.toULong() >= oItem.m_oFireTime.toULong() )
             {
                 RAWTRACE("CRhoTimer::checkTimers: firing native timer");
                 m_arNativeItems.removeElementAt(i);
-                if (is_net_trace()) {
-                    RAWTRACE("$NetRequestProcess$ PRE ONTIMER CRhoTimer::checkTimers() 1 TIMER");
-                }
-                if ( oItem.m_pCallback->onTimer() ) {
+                if ( oItem.m_pCallback->onTimer() )
                     bRet = true;
-                }
-                if (is_net_trace()) {
-                    RAWTRACE("$NetRequestProcess$ POST ONTIMER CRhoTimer::checkTimers() 1 TIMER");
-                }
             }
         }
         else
         {
             if ( curTime.toULong() >= oItem.m_oFireTime.toULong() )
-            {
-                if((curTime.toULong()-oItem.m_oFireTime.toULong())<=oItem.m_nInterval)
-                {
+			{
+				if((curTime.toULong()-oItem.m_oFireTime.toULong())<=oItem.m_nInterval)
+				{
                     RAWTRACE("CRhoTimer::checkTimers: firing native timer");
                     m_arNativeItems.removeElementAt(i);
-                    if (is_net_trace()) {
-                        RAWTRACE("$NetRequestProcess$ PRE ONTIMER CRhoTimer::checkTimers() 2 TIMER");
-                    }
-                    if ( oItem.m_pCallback->onTimer() ) {
+                    if ( oItem.m_pCallback->onTimer() )
                         bRet = true;
-                    }
-                    if (is_net_trace()) {
-                        RAWTRACE("$NetRequestProcess$ POST ONTIMER CRhoTimer::checkTimers() 2 TIMER");
-                    }
-                }
-                
-            }
+				}
+
+			}
         }
     }
 

data/platform/shared/db/DBAdapter.cpp

@@ -633,39 +633,6 @@ void CDBAdapter::copyTable(String tableName, CDBAdapter& dbFrom, CDBAdapter& dbT
         }
     }
 }
-    
-// add file.blob attrib_type for blob attribs in changed_values
-void CDBAdapter::updateAllBlobAttribChanges()
-    {
-        //Check for attrib = object
-        IDBResult res = executeSQL("SELECT object, source_id, attrib "
-                                   "FROM changed_values where update_type = 'update' and sent=0");
-        
-        if ( res.isEnd() )
-            return;
-        
-        startTransaction();
-        
-        Vector<String> arObj, arAttrib;
-        Vector<int> arSrcID;
-        for( ; !res.isEnd(); res.next() )
-        {
-            arObj.addElement(res.getStringByIdx(0));
-            arSrcID.addElement(res.getIntByIdx(1));
-            arAttrib.addElement(res.getStringByIdx(2));
-        }
-        
-        for( int i = 0; i < (int)arObj.size(); i++ )
-        {
-            String attribType = getAttrMgr().isBlobAttr(arSrcID.elementAt(i), arAttrib.elementAt(i).c_str()) ? "blob.file" : "";
-            if (attribType.length() > 0) {
-                executeSQL("UPDATE changed_values SET attrib_type=? WHERE source_id=? and object=? and attrib=? and sent=0", attribType, arSrcID.elementAt(i), arObj.elementAt(i), arAttrib.elementAt(i));
-            }
-        }
-        
-        endTransaction();
-    }
-    
 
 void CDBAdapter::updateAllAttribChanges()
 {

data/platform/shared/db/DBAdapter.h

@@ -359,12 +359,7 @@ public:
 	
     DBResultPtr prepareStatement( const char* szSt );
     DBResultPtr executeStatement(common::CAutoPtr<CDBResult>& res, const char* szSt);
-
-    // unpack object in changed_values with update_type==create to set of objects's attribs
     void updateAllAttribChanges();
-    
-    // add file.blob attrib_type for blob attribs in changed_values
-    void updateAllBlobAttribChanges();
     void updateFullUpdateChanges(int nSrcID);
 
 	String exportDatabase();

data/platform/shared/net/HttpServer.cpp

@@ -81,24 +81,6 @@ typedef unsigned __int16 uint16_t;
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "HttpServer"
 
-
-static bool is_net_trace() {
-    static int res = -1;
-    if (res == -1) {
-        if (rho_conf_getBool("net_trace") ) {
-            res = 1;
-        }
-        else {
-            res = 0;
-        }
-    }
-    return res == 1;
-}
-
-
-
-
-
 //extern "C" void rho_sync_addobjectnotify_bysrcname(const char* szSrcName, const char* szObject);
 
 namespace rho
@@ -1515,13 +1497,8 @@ bool CHttpServer::decide(String const &method, String const &arg_uri, String con
 #ifdef OS_MACOSX
 String CHttpServer::directRequest( const String& method, const String& uri, const String& query, const HeaderList& headers ,const String& body )
 {
-  if (is_net_trace()) {
-      RAWTRACE1("$NetRequestProcess$ PRE LOCK CHttpServer::directRequest uri = %s", uri.c_str());
-  }
   common::CMutexLock lock(m_mxSyncRequest);
-  if (is_net_trace()) {
-      RAWTRACE1("$NetRequestProcess$ POST LOCK CHttpServer::directRequest uri = %s", uri.c_str());
-  }
+  
   String ret;
   if ( m_pQueue != 0 )
   {
@@ -1549,9 +1526,6 @@ String CHttpServer::directRequest( const String& method, const String& uri, cons
     
     ret = m_pQueue->getResponse();
   }
-    if (is_net_trace()) {
-        RAWTRACE1("$NetRequestProcess$ FINISH CHttpServer::directRequest uri = %s", uri.c_str());
-    }
   
   return ret;
  

data/platform/shared/net/INetRequest.cpp

@@ -1,18 +1,18 @@
 /*------------------------------------------------------------------------
 * (The MIT License)
-*
+* 
 * Copyright (c) 2008-2011 Rhomobile, Inc.
-*
+* 
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
 * in the Software without restriction, including without limitation the rights
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
-*
+* 
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
-*
+* 
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -20,7 +20,7 @@
 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
-*
+* 
 * http://rhomobile.com
 *------------------------------------------------------------------------*/
 
@@ -31,28 +31,6 @@
 #include "common/RhoFilePath.h"
 #include "net/URI.h"
 
-#include "common/RhoConf.h"
-#include "logging/RhoLog.h"
-
-#undef DEFAULT_LOGCATEGORY
-#define DEFAULT_LOGCATEGORY "NetRequestTimer"
-
-
-static bool is_net_trace() {
-    static int res = -1;
-    if (res == -1) {
-        if (rho_conf_getBool("net_trace") ) {
-            res = 1;
-        }
-        else {
-            res = 0;
-        }
-    }
-    return res == 1;
-}
-
-
-
 namespace rho {
 namespace net {
 
@@ -72,17 +50,12 @@ void CNetRequestHolder::setRequest(INetRequestImpl* pReq)
 
 void CNetRequestHolder::cancel()
 {
-    if (is_net_trace()) {
-        RAWTRACE("$NetRequestProcess$ PRE SYNCHRONIZED CNetRequestHolder::cancel() TIMER");
-    }
     synchronized(m_mxReq)
     {
         m_bCancel = true;
         if ( m_pReq != 0 )
             m_pReq->cancel();
-        if (is_net_trace()) {
-            RAWTRACE("$NetRequestProcess$ POST SYNCHRONIZED CNetRequestHolder::cancel() TIMER");
-        }
+
         m_pReq = 0;
     }
 }

data/platform/shared/qt/rhodes/qkineticscroller.cpp

@@ -38,8 +38,8 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "qkineticscroller.h"
-#include "qkineticscroller_p.h"
+#include <qkineticscroller.h>
+#include <qkineticscroller_p.h>
 #include <QMap>
 #include <QApplication>
 #include <QDesktopWidget>

data/platform/shared/qt/rhodes/qkineticscroller_p.h

@@ -53,7 +53,7 @@
 #include <QTime>
 #include <QPointer>
 #include <QObject>
-#include "qkineticscroller.h"
+#include <qkineticscroller.h>
 #include <QEvent>
 #if QT_VERSION < 0x040700
 #  include <QTime>

data/platform/shared/qt/rhodes/qtscrollerfilter.cpp

@@ -1,6 +1,6 @@
-#include "qtscrollerfilter_p.h"
-#include "qtscrollevent.h"
-#include "qtscroller.h"
+#include <qtscrollerfilter_p.h>
+#include <qtscrollevent.h>
+#include <qtscroller.h>
 #include <QAbstractItemView>
 #include <QScrollBar>
 #include <QGestureEvent>

data/platform/shared/qt/rhodes/qtscrollevent.cpp

@@ -1,5 +1,5 @@
-#include "qtscrollevent.h"
-#include "qtscrollevent_p.h"
+#include <qtscrollevent.h>
+#include <qtscrollevent_p.h>
 
 /*!
     \class QtScrollPrepareEvent

data/platform/shared/qt/rhodes/qwebviewkineticscroller.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qwebviewkineticscroller.h"
+#include <qwebviewkineticscroller.h>
 #include <QApplication>
 #include <QGraphicsView>
 #include <QWebView>

data/platform/shared/qt/rhodes/qwebviewkineticscroller.h

@@ -42,7 +42,7 @@
 #ifndef QWEBVIEWKINETICSCROLLER_H
 #define QWEBVIEWKINETICSCROLLER_H
 
-#include "qkineticscroller.h"
+#include <qkineticscroller.h>
 #include <QWebView>
 
 QT_BEGIN_HEADER

data/platform/wm/build/wm.rake

@@ -135,10 +135,8 @@ module WM
     $build_persistent_cab = Jake.getBuildBoolProp("persistent")
     $run_on_startup = Jake.getBuildBoolProp("startAtBoot")
     $build_cab = true
-    $is_webkit_engine = false
-    #$is_webkit_engine = true if !$app_config["wm"]["extensions"]["webkit"].nil? 
-    #$app_config["wm"]["webengine"] == "webkit" if !$app_config["wm"]["webengine"].nil?
-    #$is_webkit_engine = false if $is_webkit_engine.nil?
+    $is_webkit_engine = $app_config["wm"]["webengine"] == "Webkit" if !$app_config["wm"]["webengine"].nil?
+    $is_webkit_engine = true if $is_webkit_engine.nil?
 
     if $wk_data_dir.nil?
       $wk_data_dir = File.join($startdir, "libs/data") #"/Program Files" # its fake value for running without symbol extensions. do not delete
@@ -574,17 +572,15 @@ def build_cab
     makePersistentFiles($srcdir, additional_dlls_persistent_paths, nil, $webkit_out_of_process, reg_keys_filename)
   end
 
-=begin
   webkit = 'none'
   if $is_webkit_engine && $webkit_capability 
     webkit = $webkit_out_of_process ? 'out_of_process' : 'in_process'
   end
-=end
 
   #TODO TAU
   webkit = 'none'
   
-  if $is_webkit_engine #&& $webkit_capability 
+  if $is_webkit_engine && $webkit_capability 
     webkit = 'in_process'
   end