Continue of refactoring: files lvstring.{h,cpp} splitted to the next files with corresponding classess:

crlog.{h,cpp}
serialbuf.{h,cpp}
lvstring8collection.{h,cpp}
lvstring16collection.{h,cpp}
lvstring16hashedcollection.{h,cpp}.
From file lvtypes.h extracted class CRTimerUtil (into file crtimerutil.h).

Author: virxkane

android/app/CMakeLists.txt

@@ -44,6 +44,11 @@ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO  ${CMAKE_C_FLAGS_RELWITHDEBINFO})
 set(CRENGINE_SRC_FILES
     ${CR3_ROOT}/crengine/src/cp_stats.cpp
     ${CR3_ROOT}/crengine/src/lvstring.cpp
+    ${CR3_ROOT}/crengine/src/lvstring8collection.cpp
+    ${CR3_ROOT}/crengine/src/lvstring16collection.cpp
+    ${CR3_ROOT}/crengine/src/lvstring16hashedcollection.cpp
+    ${CR3_ROOT}/crengine/src/crlog.cpp
+    ${CR3_ROOT}/crengine/src/serialbuf.cpp
     ${CR3_ROOT}/crengine/src/props.cpp
     ${CR3_ROOT}/crengine/src/lstridmap.cpp
     ${CR3_ROOT}/crengine/src/rtfimp.cpp

android/jni/Android.mk

@@ -40,6 +40,11 @@ LOCAL_CFLAGS += -g -O1 -fexceptions -flto
 CRENGINE_SRC_FILES := \
     ../../crengine/src/cp_stats.cpp \
     ../../crengine/src/lvstring.cpp \
+    ../../crengine/src/lvstring8collection.cpp \
+    ../../crengine/src/lvstring16collection.cpp \
+    ../../crengine/src/lvstring16hashedcollection.cpp \
+    ../../crengine/src/crlog.cpp \
+    ../../crengine/src/serialbuf.cpp \
     ../../crengine/src/props.cpp \
     ../../crengine/src/lstridmap.cpp \
     ../../crengine/src/rtfimp.cpp \

android/jni/cr3java.cpp

@@ -1,4 +1,5 @@
 #include "cr3java.h"
+#include "../../crengine/include/crlog.h"
 
 #include <dlfcn.h>
 

android/jni/gen_jni_studio

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 sdk="/opt/android-sdk-update-manager"
-binclass_path=../app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes
+binclass_path=../app/build/intermediates/javac/debug/classes
 
 export CLASSPATH="${CLASSPATH}:${sdk}/platforms/android-17/*:${binclass_path}"
 

crengine/CMakeLists.txt

@@ -3,64 +3,69 @@ option(BUILD_TOOLS "Build tools" OFF)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/fc-lang)
 
-SET (CRENGINE_SOURCES 
-src/cp_stats.cpp  
-src/lvstring.cpp  
-src/props.cpp
-src/lstridmap.cpp  
-src/rtfimp.cpp
-src/cri18n.cpp    
-src/lvmemman.cpp        
-src/lvstyles.cpp  
-src/crtxtenc.cpp  
-src/lvtinydom.cpp 
-src/lvstream.cpp  
-src/lvxml.cpp     
-src/lvstsheet.cpp 
-src/txtselector.cpp
-#src/xutils.cpp
-src/crtest.cpp
-fc-lang/fc-lang-cat.c
+SET (CRENGINE_SOURCES
+    src/cp_stats.cpp
+    src/lvstring.cpp
+    src/lvstring8collection.cpp
+    src/lvstring16collection.cpp
+    src/lvstring16hashedcollection.cpp
+    src/serialbuf.cpp
+    src/crlog.cpp
+    src/props.cpp
+    src/lstridmap.cpp
+    src/rtfimp.cpp
+    src/cri18n.cpp
+    src/lvmemman.cpp
+    src/lvstyles.cpp
+    src/crtxtenc.cpp
+    src/lvtinydom.cpp
+    src/lvstream.cpp
+    src/lvxml.cpp
+    src/lvstsheet.cpp
+    src/txtselector.cpp
+    #src/xutils.cpp
+    src/crtest.cpp
+    fc-lang/fc-lang-cat.c
 )
 
 if ( NOT ${GUI} STREQUAL FB2PROPS )
     SET (CRENGINE_SOURCES ${CRENGINE_SOURCES}
-    src/lvbmpbuf.cpp   
-    src/lvfnt.cpp      
-    src/hyphman.cpp  
-    src/lvembeddedfont.cpp
-    src/lvfont.cpp
-    src/lvfntman.cpp        
-    src/crgui.cpp     
-    src/lvimg.cpp           
-    src/crskin.cpp    
-    src/lvdrawbuf.cpp  
-    src/lvdocview.cpp  
-    src/lvpagesplitter.cpp  
-    src/lvtextfm.cpp
-    src/lvrend.cpp
-    src/wolutil.cpp
-    src/hist.cpp      
-    src/chmfmt.cpp     
-    src/epubfmt.cpp     
-    src/pdbfmt.cpp     
-    src/wordfmt.cpp
-    src/lvopc.cpp
-    src/docxfmt.cpp
-    src/fb3fmt.cpp
-    src/crconcurrent.cpp
-    src/private/lvbasefont.cpp
-    src/private/lvbitmapfont.cpp
-    src/private/lvbitmapfontman.cpp
-    src/private/lvfontglyphcache.cpp
-    src/private/lvfontcache.cpp
-    src/private/lvfontboldtransform.cpp
-    src/private/lvfontdef.cpp
-    src/private/lvwin32font.cpp
-    src/private/lvwin32fontman.cpp
-    src/private/lvfreetypeface.cpp
-    src/private/lvfreetypefontman.cpp
-    #src/xutils.cpp
+        src/lvbmpbuf.cpp   
+        src/lvfnt.cpp      
+        src/hyphman.cpp  
+        src/lvembeddedfont.cpp
+        src/lvfont.cpp
+        src/lvfntman.cpp        
+        src/crgui.cpp     
+        src/lvimg.cpp           
+        src/crskin.cpp    
+        src/lvdrawbuf.cpp  
+        src/lvdocview.cpp  
+        src/lvpagesplitter.cpp  
+        src/lvtextfm.cpp
+        src/lvrend.cpp
+        src/wolutil.cpp
+        src/hist.cpp      
+        src/chmfmt.cpp     
+        src/epubfmt.cpp     
+        src/pdbfmt.cpp     
+        src/wordfmt.cpp
+        src/lvopc.cpp
+        src/docxfmt.cpp
+        src/fb3fmt.cpp
+        src/crconcurrent.cpp
+        src/private/lvbasefont.cpp
+        src/private/lvbitmapfont.cpp
+        src/private/lvbitmapfontman.cpp
+        src/private/lvfontglyphcache.cpp
+        src/private/lvfontcache.cpp
+        src/private/lvfontboldtransform.cpp
+        src/private/lvfontdef.cpp
+        src/private/lvwin32font.cpp
+        src/private/lvwin32fontman.cpp
+        src/private/lvfreetypeface.cpp
+        src/private/lvfreetypefontman.cpp
+        #src/xutils.cpp
     )
 endif (NOT ${GUI} STREQUAL FB2PROPS)
 

crengine/Tools/HyphConv/CMakeLists.txt

@@ -9,6 +9,8 @@ set(crengine_part_SRC_LIST
     ../../src/lvmemman.cpp
     ../../src/cp_stats.cpp
     ../../src/lvstream.cpp
+    ../../src/crlog.cpp
+    ../../src/serialbuf.cpp
 )
 
 if(UNIX)

crengine/Tools/langstat/CMakeLists.txt

@@ -9,6 +9,8 @@ set(crengine_part_SRC_LIST
     ../../src/lvmemman.cpp
     ../../src/lvstream.cpp
     ../../src/lvstring.cpp
+    ../../src/crlog.cpp
+    ../../src/serialbuf.cpp
 )
 
 add_definitions(-DBUILD_LITE=1)

crengine/Tools/langstat2/CMakeLists.txt

@@ -9,6 +9,8 @@ set(crengine_part_SRC_LIST
     ../../src/lvmemman.cpp
     ../../src/lvstream.cpp
     ../../src/lvstring.cpp
+    ../../src/crlog.cpp
+    ../../src/serialbuf.cpp
 )
 
 if(UNIX)

crengine/Tools/wtf8-test/CMakeLists.txt

@@ -9,6 +9,8 @@ set(crengine_part_SRC_LIST
     ../../src/lvmemman.cpp
     ../../src/lvstream.cpp
     ../../src/lvstring.cpp
+    ../../src/crlog.cpp
+    ../../src/serialbuf.cpp
 )
 
 #add_definitions(-DBUILD_LITE=1)

crengine/include/crlog.h

@@ -0,0 +1,68 @@
+/** \file crlog.h
+   \brief logging class interface
+
+   CoolReader Engine
+
+   (c) Vadim Lopatin, 2000-2006
+   This source code is distributed under the terms of
+   GNU General Public License.
+
+   See LICENSE file for details.
+*/
+
+#ifndef __CR_LOG_H_INCLUDED__
+#define __CR_LOG_H_INCLUDED__
+
+#include <stdarg.h>
+
+/// Logger
+class CRLog
+{
+public:
+    /// log levels
+    enum log_level {
+        LL_FATAL,
+        LL_ERROR,
+        LL_WARN,
+        LL_INFO,
+        LL_DEBUG,
+        LL_TRACE
+    };
+    /// set current log level
+    static void setLogLevel( log_level level );
+    /// returns current log level
+    static log_level getLogLevel();
+    /// returns true if specified log level is enabled
+    static bool isLogLevelEnabled( log_level level );
+    /// returns true if log level is DEBUG or lower
+    static bool inline isDebugEnabled() { return isLogLevelEnabled( LL_DEBUG ); }
+    /// returns true if log level is TRACE
+    static bool inline isTraceEnabled() { return isLogLevelEnabled( LL_TRACE ); }
+    /// returns true if log level is INFO or lower
+    static bool inline isInfoEnabled() { return isLogLevelEnabled( LL_INFO ); }
+    /// returns true if log level is WARN or lower
+    static bool inline isWarnEnabled() { return isLogLevelEnabled( LL_WARN ); }
+    static void fatal( const char * msg, ... );
+    static void error( const char * msg, ... );
+    static void warn( const char * msg, ... );
+    static void info( const char * msg, ... );
+    static void debug( const char * msg, ... );
+    static void trace( const char * msg, ... );
+    /// sets logger instance
+    static void setLogger( CRLog * logger );
+    virtual ~CRLog();
+
+    /// write log to specified file, flush after every message if autoFlush parameter is true
+    static void setFileLogger( const char * fname, bool autoFlush=false );
+    /// use stdout for output
+    static void setStdoutLogger();
+    /// use stderr for output
+    static void setStderrLogger();
+protected:
+    CRLog();
+    virtual void log( const char * level, const char * msg, va_list args ) = 0;
+    log_level curr_level;
+    static CRLog * CRLOG;
+};
+
+#endif // __CR_LOG_H_INCLUDED__