diff --git a/CMakeLists.txt b/CMakeLists.txt
index d54a32f..4dafd72 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,24 +55,24 @@ option( BUILD_TESTS "Building the tests yes or no (default off)" OFF)
 
 ##### testing ###################################
 
-SET(TESTINGBUILD OFF CACHE BOOL "Enable/Disable special testing flags")
-IF (TESTINGBUILD)
-   ADD_DEFINITIONS("-DTESTING_RC=\"\\\"\${CMAKE_SOURCE_DIR}/src/tdesvnui.rc\\\"\" -DTESTING_PARTRC=\"\\\"\${CMAKE_SOURCE_DIR}/src/tdesvn_part.rc\\\"\"")
-   ADD_DEFINITIONS("-DFORCE_ASKPASS=\"\\\"\${CMAKE_BINARY_DIR}/bin/tdesvnaskpass\\\"\"")
-ENDIF (TESTINGBUILD)
+set(TESTINGBUILD OFF CACHE BOOL "Enable/Disable special testing flags")
+if (TESTINGBUILD)
+   add_definitions("-DTESTING_RC=\"\\\"\${CMAKE_SOURCE_DIR}/src/tdesvnui.rc\\\"\" -DTESTING_PARTRC=\"\\\"\${CMAKE_SOURCE_DIR}/src/tdesvn_part.rc\\\"\"")
+   add_definitions("-DFORCE_ASKPASS=\"\\\"\${CMAKE_BINARY_DIR}/bin/tdesvnaskpass\\\"\"")
+endif (TESTINGBUILD)
 
-IF(BUILD_TESTS)
-  ENABLE_TESTING()
-ENDIF(BUILD_TESTS)
+if(BUILD_TESTS)
+  enable_testing()
+endif(BUILD_TESTS)
 
 
 ##### versioning ################################
 
-SET(BASE_VERSION 1.0.4)
-SET(KDESVN_VERSION "$ENV{KDESVN_VERSION}")
-IF(NOT KDESVN_VERSION)
-	SET(KDESVN_VERSION ${BASE_VERSION})
-ENDIF(NOT KDESVN_VERSION)
+set(BASE_VERSION 1.0.4)
+set(KDESVN_VERSION "$ENV{KDESVN_VERSION}")
+if(NOT KDESVN_VERSION)
+	set(KDESVN_VERSION ${BASE_VERSION})
+endif(NOT KDESVN_VERSION)
 
 
 ##### configure checks ##########################
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 37ba88d..ac26c4d 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -38,400 +38,400 @@ check_include_file( linux/inotify.h HAVE_INOTIFY )
 
 check_function_exists( statvfs HAVE_STATVFS )
 
-IF (SQLITE_INCLUDE_DIR AND SQLITE_LIBRARIES)
-    SET(SQLITE_FOUND TRUE)
-ELSE (SQLITE_INCLUDE_DIR AND SQLITE_LIBRARIES)
- INCLUDE(UsePkgConfig)
- PKGCONFIG(sqlite3 _sqliteincdir _sqlitelibdir _sqlitelinkflags _sqlitecflags)
+if (SQLITE_INCLUDE_DIR AND SQLITE_LIBRARIES)
+    set(SQLITE_FOUND TRUE)
+else (SQLITE_INCLUDE_DIR AND SQLITE_LIBRARIES)
+ include(UsePkgConfig)
+ pkgconfig(sqlite3 _sqliteincdir _sqlitelibdir _sqlitelinkflags _sqlitecflags)
 
- FIND_PATH(SQLITE_INCLUDE_DIR sqlite3.h
+ find_path(SQLITE_INCLUDE_DIR sqlite3.h
    ${_sqliteincdir}
    /usr/include
    /usr/local/include
   )
- FIND_LIBRARY(SQLITE_LIBRARIES NAMES sqlite3
+ find_library(SQLITE_LIBRARIES NAMES sqlite3
    PATHS
    ${_sqlitelibdir}
    /usr/lib
    /usr/local/lib
  )
 
- IF (SQLITE_INCLUDE_DIR AND SQLITE_LIBRARIES)
-   SET(SQLITE_FOUND TRUE)
- ENDIF (SQLITE_INCLUDE_DIR AND SQLITE_LIBRARIES)
+ if (SQLITE_INCLUDE_DIR AND SQLITE_LIBRARIES)
+   set(SQLITE_FOUND TRUE)
+ endif (SQLITE_INCLUDE_DIR AND SQLITE_LIBRARIES)
 
- IF (SQLITE_FOUND)
-   MESSAGE(STATUS "Found sqlite3: ${SQLITE_LIBRARIES}")
- ELSE (SQLITE_FOUND)
-   MESSAGE(STATUS "Could not find sqlite3")
-   ADD_DEFINITIONS(-DNO_SQLITE3)
- ENDIF (SQLITE_FOUND)
+ if (SQLITE_FOUND)
+   message(STATUS "Found sqlite3: ${SQLITE_LIBRARIES}")
+ else (SQLITE_FOUND)
+   message(STATUS "Could not find sqlite3")
+   add_definitions(-DNO_SQLITE3)
+ endif (SQLITE_FOUND)
 
- MARK_AS_ADVANCED(SQLITE_LIBRARIES SQLITE_INCLUDE_DIR)
+ mark_as_advanced(SQLITE_LIBRARIES SQLITE_INCLUDE_DIR)
 
-ENDIF (SQLITE_INCLUDE_DIR AND SQLITE_LIBRARIES)
+endif (SQLITE_INCLUDE_DIR AND SQLITE_LIBRARIES)
 
-SET(SUBVERSIONFOUND)
-SET(SUBVERSION_ALL_LIBS)
+set(SUBVERSIONFOUND)
+set(SUBVERSION_ALL_LIBS)
 
-INCLUDE (CheckIncludeFiles)
+include (CheckIncludeFiles)
 
 #search libraries for UNIX
-IF (UNIX)
+if (UNIX)
 
-  MACRO(FIND_SUB_LIB targetvar libname)
-    IF (SUBVERSION_INSTALL_PATH)
-        FIND_LIBRARY(${targetvar} ${libname}
+  macro(find_sub_lib targetvar libname)
+    if (SUBVERSION_INSTALL_PATH)
+        find_library(${targetvar} ${libname}
             PATHS
             ${SUBVERSION_INSTALL_PATH}/lib
             NO_DEFAULT_PATH
         )
-    ENDIF(SUBVERSION_INSTALL_PATH)
-    FIND_LIBRARY(${targetvar} ${libname}
+    endif(SUBVERSION_INSTALL_PATH)
+    find_library(${targetvar} ${libname}
         PATHS
         /usr/lib
         /usr/local/lib
         )
-  ENDMACRO(FIND_SUB_LIB)
+  endmacro(find_sub_lib)
 
-  IF (SUBVERSION_INSTALL_PATH)
-    FIND_PATH(SUBVERSION_INCLUDE_DIR svn_client.h
+  if (SUBVERSION_INSTALL_PATH)
+    find_path(SUBVERSION_INCLUDE_DIR svn_client.h
         PATHS
         ${SUBVERSION_INSTALL_PATH}/include/subversion-1
         NO_DEFAULT_PATH
     )
-  ENDIF (SUBVERSION_INSTALL_PATH)
-  FIND_PATH(SUBVERSION_INCLUDE_DIR svn_client.h
+  endif (SUBVERSION_INSTALL_PATH)
+  find_path(SUBVERSION_INCLUDE_DIR svn_client.h
         /usr/include/subversion-1
         /usr/local/include/subversion-1)
 
-  FIND_SUB_LIB(SUBVERSION_CLIENTLIB svn_client-1)
-  FIND_SUB_LIB(SUBVERSION_REPOSITORYLIB svn_repos-1)
-  FIND_SUB_LIB(SUBVERSION_WCLIB svn_wc-1)
-  FIND_SUB_LIB(SUBVERSION_FSLIB svn_fs-1)
-  FIND_SUB_LIB(SUBVERSION_SUBRLIB svn_subr-1)
-  FIND_SUB_LIB(SUBVERSION_RALIB svn_ra-1)
-  FIND_SUB_LIB(SUBVERSION_DIFFLIB svn_diff-1)
+  find_sub_lib(SUBVERSION_CLIENTLIB svn_client-1)
+  find_sub_lib(SUBVERSION_REPOSITORYLIB svn_repos-1)
+  find_sub_lib(SUBVERSION_WCLIB svn_wc-1)
+  find_sub_lib(SUBVERSION_FSLIB svn_fs-1)
+  find_sub_lib(SUBVERSION_SUBRLIB svn_subr-1)
+  find_sub_lib(SUBVERSION_RALIB svn_ra-1)
+  find_sub_lib(SUBVERSION_DIFFLIB svn_diff-1)
 
-  FIND_PROGRAM(APR_CONFIG NAMES apr-config apr-1-config
+  find_program(APR_CONFIG NAMES apr-config apr-1-config
     PATHS
     /usr/local/apr/bin
   )
 
-  FIND_PROGRAM(APU_CONFIG NAMES apu-config apu-1-config
+  find_program(APU_CONFIG NAMES apu-config apu-1-config
     PATHS
     /usr/local/apr/bin
   )
 
   if(NOT APR_CONFIG)
-    MESSAGE(SEND_ERROR "Error: no apr-config found")
+    message(SEND_ERROR "Error: no apr-config found")
   endif(NOT APR_CONFIG)
 
   if(NOT APU_CONFIG)
-    MESSAGE(SEND_ERROR "Error: no apu-config found")
+    message(SEND_ERROR "Error: no apu-config found")
   endif(NOT APU_CONFIG)
 
-  EXEC_PROGRAM(${APR_CONFIG} ARGS "--includedir" OUTPUT_VARIABLE APR_INCLUDE_DIR_INT)
+  exec_program(${APR_CONFIG} ARGS "--includedir" OUTPUT_VARIABLE APR_INCLUDE_DIR_INT)
 
   pkg_search_module( APR apr-1 )
   if( NOT APR_FOUND )
     tde_message_fatal( "apr-1 is required, but was not found on your system" )
   endif( )
 
-  EXEC_PROGRAM(${APU_CONFIG} ARGS "--includedir" OUTPUT_VARIABLE APU_INCLUDE_DIR_INT)
-  SET(APR_INCLUDE_DIR "${APR_INCLUDE_DIR_INT}" CACHE INTERNAL "")
-  SET(APU_INCLUDE_DIR "${APU_INCLUDE_DIR_INT}" CACHE INTERNAL "")
+  exec_program(${APU_CONFIG} ARGS "--includedir" OUTPUT_VARIABLE APU_INCLUDE_DIR_INT)
+  set(APR_INCLUDE_DIR "${APR_INCLUDE_DIR_INT}" CACHE INTERNAL "")
+  set(APU_INCLUDE_DIR "${APU_INCLUDE_DIR_INT}" CACHE INTERNAL "")
 
-  EXEC_PROGRAM(${APR_CONFIG} ARGS "--cppflags" OUTPUT_VARIABLE APR_CPP_FLAGS_INT)
-  EXEC_PROGRAM(${APU_CONFIG} ARGS "--includes" OUTPUT_VARIABLE APU_CPP_FLAGS_INT)
-  SET(APR_CPP_FLAGS "${APR_CPP_FLAGS_INT}" CACHE INTERNAL "")
-  SET(APU_CPP_FLAGS "${APU_CPP_FLAGS_INT}" CACHE INTERNAL "")
+  exec_program(${APR_CONFIG} ARGS "--cppflags" OUTPUT_VARIABLE APR_CPP_FLAGS_INT)
+  exec_program(${APU_CONFIG} ARGS "--includes" OUTPUT_VARIABLE APU_CPP_FLAGS_INT)
+  set(APR_CPP_FLAGS "${APR_CPP_FLAGS_INT}" CACHE INTERNAL "")
+  set(APU_CPP_FLAGS "${APU_CPP_FLAGS_INT}" CACHE INTERNAL "")
 
-  EXEC_PROGRAM(${APR_CONFIG} ARGS "--ldflags --libs --link-ld" OUTPUT_VARIABLE APR_EXTRA_LIBFLAGS_INT)
-  EXEC_PROGRAM(${APU_CONFIG} ARGS "--ldflags --libs --link-ld" OUTPUT_VARIABLE APU_EXTRA_LIBFLAGS_INT)
-  SET(APR_EXTRA_LIBFLAGS "${APR_EXTRA_LIBFLAGS_INT}" CACHE INTERNAL "")
-  SET(APU_EXTRA_LIBFLAGS "${APU_EXTRA_LIBFLAGS_INT}" CACHE INTERNAL "")
+  exec_program(${APR_CONFIG} ARGS "--ldflags --libs --link-ld" OUTPUT_VARIABLE APR_EXTRA_LIBFLAGS_INT)
+  exec_program(${APU_CONFIG} ARGS "--ldflags --libs --link-ld" OUTPUT_VARIABLE APU_EXTRA_LIBFLAGS_INT)
+  set(APR_EXTRA_LIBFLAGS "${APR_EXTRA_LIBFLAGS_INT}" CACHE INTERNAL "")
+  set(APU_EXTRA_LIBFLAGS "${APU_EXTRA_LIBFLAGS_INT}" CACHE INTERNAL "")
 
-  CHECK_INCLUDE_FILES(execinfo.h HAS_BACKTRACE_H)
+  check_include_files(execinfo.h HAS_BACKTRACE_H)
 
-ENDIF (UNIX)
+endif (UNIX)
 
 #search libaries for Windows
-IF (WIN32)
+if (WIN32)
 
   # search for pathes
-  FIND_PATH (SUBVERSION_BIN_DIR svn.exe
+  find_path (SUBVERSION_BIN_DIR svn.exe
     "$ENV{ProgramFiles}/Subversion/bin"
   )
 
-  FIND_PATH (SUBVERSION_INCLUDE_DIR svn_client.h
+  find_path (SUBVERSION_INCLUDE_DIR svn_client.h
     "$ENV{ProgramFiles}/Subversion/include"
   )
 
-  FIND_PATH(APR_INCLUDE_DIR apr.h
+  find_path(APR_INCLUDE_DIR apr.h
     "$ENV{ProgramFiles}/Subversion/include/apr"
   )
 
-  FIND_PATH(APU_INCLUDE_DIR apu.h
+  find_path(APU_INCLUDE_DIR apu.h
     "$ENV{ProgramFiles}/Subversion/include/apr-util"
   )
 
   # search for libraries
-  FIND_LIBRARY(APR_LIB libapr
+  find_library(APR_LIB libapr
     "$ENV{ProgramFiles}/Subversion/lib/apr"
   )
 
-  FIND_LIBRARY(APRICONV_LIB libapriconv
+  find_library(APRICONV_LIB libapriconv
     "$ENV{ProgramFiles}/Subversion/lib/apr-iconv"
   )
 
-  FIND_LIBRARY(APU_LIB libaprutil
+  find_library(APU_LIB libaprutil
     "$ENV{ProgramFiles}/Subversion/lib/apr-util"
   )
 
-  FIND_LIBRARY(APU_XMLLIB xml
+  find_library(APU_XMLLIB xml
     "$ENV{ProgramFiles}/Subversion/lib/apr-util"
   )
 
-  FIND_LIBRARY(NEON_LIB libneon
+  find_library(NEON_LIB libneon
     "$ENV{ProgramFiles}/Subversion/lib/neon"
   )
 
-  FIND_LIBRARY(NEON_ZLIBSTATLIB zlibstat
+  find_library(NEON_ZLIBSTATLIB zlibstat
     "$ENV{ProgramFiles}/Subversion/lib/neon"
   )
 
-  FIND_LIBRARY(INTL3LIB intl3_svn
+  find_library(INTL3LIB intl3_svn
     "$ENV{ProgramFiles}/Subversion/lib"
   )
 
-  FIND_LIBRARY(DB44_LIB libdb44
+  find_library(DB44_LIB libdb44
     "$ENV{ProgramFiles}/Subversion/lib"
   )
 
-  FIND_LIBRARY(SUBVERSION_CLIENTLIB libsvn_client-1
+  find_library(SUBVERSION_CLIENTLIB libsvn_client-1
     "$ENV{ProgramFiles}/Subversion/lib"
   )
 
-  FIND_LIBRARY(SUBVERSION_DELTALIB libsvn_delta-1
+  find_library(SUBVERSION_DELTALIB libsvn_delta-1
     "$ENV{ProgramFiles}/Subversion/lib"
   )
 
-  FIND_LIBRARY(SUBVERSION_DIFFLIB libsvn_diff-1
+  find_library(SUBVERSION_DIFFLIB libsvn_diff-1
     "$ENV{ProgramFiles}/Subversion/lib"
   )
 
-  FIND_LIBRARY(SUBVERSION_FSBASELIB libsvn_fs_base-1
+  find_library(SUBVERSION_FSBASELIB libsvn_fs_base-1
     "$ENV{ProgramFiles}/Subversion/lib"
   )
 
-  FIND_LIBRARY(SUBVERSION_FSFSLIB libsvn_fs_fs-1
+  find_library(SUBVERSION_FSFSLIB libsvn_fs_fs-1
     "$ENV{ProgramFiles}/Subversion/lib"
   )
 
-  FIND_LIBRARY(SUBVERSION_FSUTILLIB libsvn_fs_util-1
+  find_library(SUBVERSION_FSUTILLIB libsvn_fs_util-1
     "$ENV{ProgramFiles}/Subversion/lib"
   )
 
-  FIND_LIBRARY(SUBVERSION_FSLIB libsvn_fs-1
+  find_library(SUBVERSION_FSLIB libsvn_fs-1
     "$ENV{ProgramFiles}/Subversion/lib"
   )
 
-  FIND_LIBRARY(SUBVERSION_RALOCALLIB libsvn_ra_local-1
+  find_library(SUBVERSION_RALOCALLIB libsvn_ra_local-1
     "$ENV{ProgramFiles}/Subversion/lib"
   )
 
-  FIND_LIBRARY(SUBVERSION_RANEONLIB libsvn_ra_neon-1
+  find_library(SUBVERSION_RANEONLIB libsvn_ra_neon-1
     "$ENV{ProgramFiles}/Subversion/lib"
   )
 
-  FIND_LIBRARY(SUBVERSION_RASVNLIB libsvn_ra_svn-1
+  find_library(SUBVERSION_RASVNLIB libsvn_ra_svn-1
     "$ENV{ProgramFiles}/Subversion/lib"
   )
 
-  FIND_LIBRARY(SUBVERSION_RALIB libsvn_ra-1
+  find_library(SUBVERSION_RALIB libsvn_ra-1
     "$ENV{ProgramFiles}/Subversion/lib"
   )
 
-  FIND_LIBRARY(SUBVERSION_REPOSITORYLIB libsvn_repos-1
+  find_library(SUBVERSION_REPOSITORYLIB libsvn_repos-1
     "$ENV{ProgramFiles}/Subversion/lib"
   )
 
-  FIND_LIBRARY(SUBVERSION_SUBRLIB libsvn_subr-1
+  find_library(SUBVERSION_SUBRLIB libsvn_subr-1
     "$ENV{ProgramFiles}/Subversion/lib"
   )
 
-  FIND_LIBRARY(SUBVERSION_WCLIB libsvn_wc-1
+  find_library(SUBVERSION_WCLIB libsvn_wc-1
     "$ENV{ProgramFiles}/Subversion/lib"
   )
 
-  SET(APR_EXTRA_LIBFLAGS )
-  SET(APU_EXTRA_LIBFLAGS )
+  set(APR_EXTRA_LIBFLAGS )
+  set(APU_EXTRA_LIBFLAGS )
 
 
   # check found libraries
   if (NOT APR_LIB)
-    MESSAGE(SEND_ERROR "No apr lib found!")
-  ELSE (NOT APR_LIB)
-    MESSAGE(STATUS "Found apr lib: ${APR_LIB}")
-    SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APR_LIB})
+    message(SEND_ERROR "No apr lib found!")
+  else (NOT APR_LIB)
+    message(STATUS "Found apr lib: ${APR_LIB}")
+    set(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APR_LIB})
   endif(NOT APR_LIB)
 
   if (NOT APRICONV_LIB)
-    MESSAGE(SEND_ERROR "No apriconv lib found!")
-  ELSE (NOT APRICONV_LIB)
-    MESSAGE(STATUS "Found apriconv lib: ${APRICONV_LIB}")
-    SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APRICONV_LIB})
+    message(SEND_ERROR "No apriconv lib found!")
+  else (NOT APRICONV_LIB)
+    message(STATUS "Found apriconv lib: ${APRICONV_LIB}")
+    set(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APRICONV_LIB})
   endif(NOT APRICONV_LIB)
 
   if (NOT APU_LIB)
-    MESSAGE(SEND_ERROR "No aprutil lib found!")
-  ELSE (NOT APU_LIB)
-    MESSAGE(STATUS "Found aprutil lib: ${APU_LIB}")
-    SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APU_LIB})
+    message(SEND_ERROR "No aprutil lib found!")
+  else (NOT APU_LIB)
+    message(STATUS "Found aprutil lib: ${APU_LIB}")
+    set(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APU_LIB})
   endif(NOT APU_LIB)
 
   if (NOT APU_XMLLIB)
-    MESSAGE(SEND_ERROR "No xml lib found!")
-  ELSE (NOT APU_XMLLIB)
-    MESSAGE(STATUS "Found xml lib: ${APU_XMLLIB}")
-    SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APU_XMLLIB})
+    message(SEND_ERROR "No xml lib found!")
+  else (NOT APU_XMLLIB)
+    message(STATUS "Found xml lib: ${APU_XMLLIB}")
+    set(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APU_XMLLIB})
   endif(NOT APU_XMLLIB)
 
   if (NOT NEON_LIB)
-    MESSAGE(SEND_ERROR "No neon lib found!")
-  ELSE (NOT NEON_LIB)
-    MESSAGE(STATUS "Found neon lib: ${NEON_LIB}")
-    SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${NEON_LIB})
+    message(SEND_ERROR "No neon lib found!")
+  else (NOT NEON_LIB)
+    message(STATUS "Found neon lib: ${NEON_LIB}")
+    set(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${NEON_LIB})
   endif(NOT NEON_LIB)
 
   if (NOT NEON_ZLIBSTATLIB)
-    MESSAGE(SEND_ERROR "No zlibstat lib found!")
-  ELSE (NOT APRICONV_LIB)
-    MESSAGE(STATUS "Found zlibstat lib: ${NEON_ZLIBSTATLIB}")
-    SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${NEON_ZLIBSTATLIB})
+    message(SEND_ERROR "No zlibstat lib found!")
+  else (NOT APRICONV_LIB)
+    message(STATUS "Found zlibstat lib: ${NEON_ZLIBSTATLIB}")
+    set(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${NEON_ZLIBSTATLIB})
   endif(NOT NEON_ZLIBSTATLIB)
 
   if (NOT INTL3LIB)
-    MESSAGE(SEND_ERROR "No intl3 lib found!")
-  ELSE (NOT INTL3LIB)
-    MESSAGE(STATUS "Found intl3 lib: ${INTL3LIB}")
-    SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${INTL3LIB})
+    message(SEND_ERROR "No intl3 lib found!")
+  else (NOT INTL3LIB)
+    message(STATUS "Found intl3 lib: ${INTL3LIB}")
+    set(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${INTL3LIB})
   endif(NOT INTL3LIB)
 
   if (NOT DB44_LIB)
-    MESSAGE(SEND_ERROR "No db44 lib found!")
-  ELSE (NOT DB44_LIB)
-    MESSAGE(STATUS "Found db44 lib: ${DB44_LIB}")
-    SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${DB44_LIB})
+    message(SEND_ERROR "No db44 lib found!")
+  else (NOT DB44_LIB)
+    message(STATUS "Found db44 lib: ${DB44_LIB}")
+    set(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${DB44_LIB})
   endif(NOT DB44_LIB)
 
   if (NOT SUBVERSION_DELTALIB)
-    MESSAGE(SEND_ERROR "No subversion delta lib found!")
-  ELSE (NOT SUBVERSION_DELTALIB)
-    MESSAGE(STATUS "Found subversion delta lib: ${SUBVERSION_DELTALIB}")
-    SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_DELTALIB})
+    message(SEND_ERROR "No subversion delta lib found!")
+  else (NOT SUBVERSION_DELTALIB)
+    message(STATUS "Found subversion delta lib: ${SUBVERSION_DELTALIB}")
+    set(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_DELTALIB})
   endif(NOT SUBVERSION_DELTALIB)
 
   if (NOT SUBVERSION_FSBASELIB)
-    MESSAGE(SEND_ERROR "No subversion fs base lib found!")
-  ELSE (NOT SUBVERSION_FSBASELIB)
-    MESSAGE(STATUS "Found subversion fs base lib: ${SUBVERSION_FSBASELIB}")
-    SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_FSBASELIB})
+    message(SEND_ERROR "No subversion fs base lib found!")
+  else (NOT SUBVERSION_FSBASELIB)
+    message(STATUS "Found subversion fs base lib: ${SUBVERSION_FSBASELIB}")
+    set(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_FSBASELIB})
   endif(NOT SUBVERSION_FSBASELIB)
 
   if (NOT SUBVERSION_FSFSLIB)
-    MESSAGE(SEND_ERROR "No subversion fs fs lib found!")
-  ELSE (NOT SUBVERSION_FSFSLIB)
-    MESSAGE(STATUS "Found subversion fs fs lib: ${SUBVERSION_FSFSLIB}")
-    SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_FSFSLIB})
+    message(SEND_ERROR "No subversion fs fs lib found!")
+  else (NOT SUBVERSION_FSFSLIB)
+    message(STATUS "Found subversion fs fs lib: ${SUBVERSION_FSFSLIB}")
+    set(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_FSFSLIB})
   endif(NOT SUBVERSION_FSFSLIB)
 
   if (NOT SUBVERSION_FSUTILLIB)
-    MESSAGE(SEND_ERROR "No subversion fs util lib found!")
-  ELSE (NOT SUBVERSION_FSUTILLIB)
-    MESSAGE(STATUS "Found subversion fs util lib: ${SUBVERSION_FSUTILLIB}")
-    SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_FSUTILLIB})
+    message(SEND_ERROR "No subversion fs util lib found!")
+  else (NOT SUBVERSION_FSUTILLIB)
+    message(STATUS "Found subversion fs util lib: ${SUBVERSION_FSUTILLIB}")
+    set(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_FSUTILLIB})
   endif(NOT SUBVERSION_FSUTILLIB)
 
   if (NOT SUBVERSION_RALOCALLIB)
-    MESSAGE(SEND_ERROR "No subversion ra local lib found!")
-  ELSE (NOT SUBVERSION_RALOCALLIB)
-    MESSAGE(STATUS "Found subversion ra local lib: ${SUBVERSION_RALOCALLIB}")
-    SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_RALOCALLIB})
+    message(SEND_ERROR "No subversion ra local lib found!")
+  else (NOT SUBVERSION_RALOCALLIB)
+    message(STATUS "Found subversion ra local lib: ${SUBVERSION_RALOCALLIB}")
+    set(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_RALOCALLIB})
   endif(NOT SUBVERSION_RALOCALLIB)
 
   if (NOT SUBVERSION_RANEONLIB)
-    MESSAGE(SEND_ERROR "No subversion ra neon lib found!")
-  ELSE (NOT SUBVERSION_RANEONLIB)
-    MESSAGE(STATUS "Found subversion ra neon lib: ${SUBVERSION_RANEONLIB}")
-    SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_RANEONLIB})
+    message(SEND_ERROR "No subversion ra neon lib found!")
+  else (NOT SUBVERSION_RANEONLIB)
+    message(STATUS "Found subversion ra neon lib: ${SUBVERSION_RANEONLIB}")
+    set(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_RANEONLIB})
   endif(NOT SUBVERSION_RANEONLIB)
 
   if (NOT SUBVERSION_RASVNLIB)
-    MESSAGE(SEND_ERROR "No subversion ra svn lib found!")
-  ELSE (NOT SUBVERSION_RASVNLIB)
-    MESSAGE(STATUS "Found subversion ra svn lib: ${SUBVERSION_RASVNLIB}")
-    SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_RASVNLIB})
+    message(SEND_ERROR "No subversion ra svn lib found!")
+  else (NOT SUBVERSION_RASVNLIB)
+    message(STATUS "Found subversion ra svn lib: ${SUBVERSION_RASVNLIB}")
+    set(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_RASVNLIB})
   endif(NOT SUBVERSION_RASVNLIB)
 
-ENDIF (WIN32)
+endif (WIN32)
 
 
-IF(NOT SUBVERSION_INCLUDE_DIR)
-  MESSAGE(SEND_ERROR "No subversion includes found!")
-ELSE(NOT SUBVERSION_INCLUDE_DIR)
-  MESSAGE(STATUS "Found subversion include: ${SUBVERSION_INCLUDE_DIR}")
-ENDIF(NOT SUBVERSION_INCLUDE_DIR)
+if(NOT SUBVERSION_INCLUDE_DIR)
+  message(SEND_ERROR "No subversion includes found!")
+else(NOT SUBVERSION_INCLUDE_DIR)
+  message(STATUS "Found subversion include: ${SUBVERSION_INCLUDE_DIR}")
+endif(NOT SUBVERSION_INCLUDE_DIR)
 
 if (NOT SUBVERSION_CLIENTLIB)
- MESSAGE(SEND_ERROR "No subversion client libs found!")
-ELSE (NOT SUBVERSION_CLIENTLIB)
- MESSAGE(STATUS "Found subversion client lib: ${SUBVERSION_CLIENTLIB}")
- SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_CLIENTLIB})
+ message(SEND_ERROR "No subversion client libs found!")
+else (NOT SUBVERSION_CLIENTLIB)
+ message(STATUS "Found subversion client lib: ${SUBVERSION_CLIENTLIB}")
+ set(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_CLIENTLIB})
 endif(NOT SUBVERSION_CLIENTLIB)
 
 if (NOT SUBVERSION_DIFFLIB)
- MESSAGE(SEND_ERROR "No subversion diff lib found!")
-ELSE (NOT SUBVERSION_DIFFLIB)
- MESSAGE(STATUS "Found subversion diff lib: ${SUBVERSION_DIFFLIB}")
- SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_DIFFLIB})
+ message(SEND_ERROR "No subversion diff lib found!")
+else (NOT SUBVERSION_DIFFLIB)
+ message(STATUS "Found subversion diff lib: ${SUBVERSION_DIFFLIB}")
+ set(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_DIFFLIB})
 endif(NOT SUBVERSION_DIFFLIB)
 
 if (NOT SUBVERSION_FSLIB)
- MESSAGE(SEND_ERROR "No subversion fs lib found!")
-ELSE (NOT SUBVERSION_FSLIB)
- MESSAGE(STATUS "Found subversion fs lib: ${SUBVERSION_FSLIB}")
- SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_FSLIB})
+ message(SEND_ERROR "No subversion fs lib found!")
+else (NOT SUBVERSION_FSLIB)
+ message(STATUS "Found subversion fs lib: ${SUBVERSION_FSLIB}")
+ set(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_FSLIB})
 endif(NOT SUBVERSION_FSLIB)
 
 if (NOT SUBVERSION_RALIB)
- MESSAGE(SEND_ERROR "No subversion ra lib found!")
-ELSE (NOT SUBVERSION_RALIB)
- MESSAGE(STATUS "Found subversion ra lib: ${SUBVERSION_RALIB}")
- SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_RALIB})
+ message(SEND_ERROR "No subversion ra lib found!")
+else (NOT SUBVERSION_RALIB)
+ message(STATUS "Found subversion ra lib: ${SUBVERSION_RALIB}")
+ set(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_RALIB})
 endif(NOT SUBVERSION_RALIB)
 
 if (NOT SUBVERSION_REPOSITORYLIB)
- MESSAGE(SEND_ERROR "No subversion repository lib found!")
-ELSE (NOT SUBVERSION_REPOSITORYLIB)
- MESSAGE(STATUS "Found subversion repository lib: ${SUBVERSION_REPOSITORYLIB}")
- SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_REPOSITORYLIB})
+ message(SEND_ERROR "No subversion repository lib found!")
+else (NOT SUBVERSION_REPOSITORYLIB)
+ message(STATUS "Found subversion repository lib: ${SUBVERSION_REPOSITORYLIB}")
+ set(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_REPOSITORYLIB})
 endif(NOT SUBVERSION_REPOSITORYLIB)
 
 if (NOT SUBVERSION_SUBRLIB)
- MESSAGE(SEND_ERROR "No subversion subr lib found!")
-ELSE (NOT SUBVERSION_SUBRLIB)
- MESSAGE(STATUS "Found subversion subr lib: ${SUBVERSION_SUBRLIB}")
- SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_SUBRLIB})
+ message(SEND_ERROR "No subversion subr lib found!")
+else (NOT SUBVERSION_SUBRLIB)
+ message(STATUS "Found subversion subr lib: ${SUBVERSION_SUBRLIB}")
+ set(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_SUBRLIB})
 endif(NOT SUBVERSION_SUBRLIB)
 
 if (NOT SUBVERSION_WCLIB)
- MESSAGE(SEND_ERROR "No subversion wc lib found!")
-ELSE (NOT SUBVERSION_WCLIB)
- MESSAGE(STATUS "Found subversion wc lib: ${SUBVERSION_WCLIB}")
- SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_WCLIB})
+ message(SEND_ERROR "No subversion wc lib found!")
+else (NOT SUBVERSION_WCLIB)
+ message(STATUS "Found subversion wc lib: ${SUBVERSION_WCLIB}")
+ set(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_WCLIB})
 endif(NOT SUBVERSION_WCLIB)
 
 
-SET(SUBVERSIONFOUND true)
+set(SUBVERSIONFOUND true)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 38e6fa7..d9d1f0e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -36,8 +36,8 @@ link_directories(
 
 ##### other data ################################
 
-INSTALL(FILES tdesvnui.rc DESTINATION ${DATA_INSTALL_DIR}/tdesvn)
-INSTALL(FILES tdesvn_part.rc DESTINATION ${DATA_INSTALL_DIR}/tdesvnpart)
+install(FILES tdesvnui.rc DESTINATION ${DATA_INSTALL_DIR}/tdesvn)
+install(FILES tdesvn_part.rc DESTINATION ${DATA_INSTALL_DIR}/tdesvnpart)
 tde_create_translated_desktop( tdesvn.desktop )
 
 
diff --git a/src/svnqt/CMakeLists.txt b/src/svnqt/CMakeLists.txt
index 0e51db0..904c2b7 100644
--- a/src/svnqt/CMakeLists.txt
+++ b/src/svnqt/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(SOURCES
+set(SOURCES
     apr.cpp
     client_annotate.cpp
     client_cat.cpp
@@ -45,13 +45,13 @@ SET(SOURCES
     cache/DatabaseException.cpp
     )
 
-SET(CACHEINST_HEADERS
+set(CACHEINST_HEADERS
     cache/LogCache.h
     cache/ReposLog.h
     cache/DatabaseException.h
 )
 
-SET(INST_HEADERS
+set(INST_HEADERS
     annotate_line.h
     apr.h
     check.h
@@ -87,72 +87,72 @@ SET(INST_HEADERS
     conflictresult.h
     )
 
-FILE(GLOB svnhdr RELATIVE  ${CMAKE_CURRENT_SOURCE_DIR} "*.h")
-SET(svnhdr ${svnhdr} ${CACHE_INST_HEADERS})
+file(GLOB svnhdr RELATIVE  ${CMAKE_CURRENT_SOURCE_DIR} "*.h")
+set(svnhdr ${svnhdr} ${CACHE_INST_HEADERS})
 
 
-        SET(TOUTF8 "utf8")
-        SET(FROMUTF8 "fromUtf8")
-        SET(QLIST "TQValueList")
-        SET(TOASCII "latin1")
-        SET(HOMEDIR "homeDirPath")
-        SET(QDATABASE "TQSqlDatabase*")
-        SET(QLONG "TQ_LLONG")
-    SET(svnqt-name svnqt)
+        set(TOUTF8 "utf8")
+        set(FROMUTF8 "fromUtf8")
+        set(QLIST "TQValueList")
+        set(TOASCII "latin1")
+        set(HOMEDIR "homeDirPath")
+        set(QDATABASE "TQSqlDatabase*")
+        set(QLONG "TQ_LLONG")
+    set(svnqt-name svnqt)
 
-IF (HAVE_GCC_VISIBILITY)
-    SET(_SVNQT_EXPORT "__attribute__ ((visibility(\"default\")))")
-    SET(_SVNQT_NOEXPORT "__attribute__ ((visibility(\"hidden\")))")
-ENDIF (HAVE_GCC_VISIBILITY)
+if (HAVE_GCC_VISIBILITY)
+    set(_SVNQT_EXPORT "__attribute__ ((visibility(\"default\")))")
+    set(_SVNQT_NOEXPORT "__attribute__ ((visibility(\"hidden\")))")
+endif (HAVE_GCC_VISIBILITY)
 
-CONFIGURE_FILE(
+configure_file(
     "${CMAKE_CURRENT_SOURCE_DIR}/svnqt_defines.h.in"
     "${CMAKE_CURRENT_BINARY_DIR}/svnqt_defines.h"
     IMMEDIATE
     @ONLY)
 
-SET(INST_HEADERS ${INST_HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/svnqt_defines.h)
-INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
+set(INST_HEADERS ${INST_HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/svnqt_defines.h)
+include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
 
-ADD_LIBRARY(${svnqt-name} SHARED ${SOURCES} ${svnhdr})
-    SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib${LIB_SUFFIX})
-    SET_TARGET_PROPERTIES(${svnqt-name}
+add_library(${svnqt-name} SHARED ${SOURCES} ${svnhdr})
+    set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib${LIB_SUFFIX})
+    set_target_properties(${svnqt-name}
         PROPERTIES
         COMPILE_FLAGS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS})
 
-SET(LIB_MAJOR 4)
-SET(LIB_MINOR 2)
-SET(LIB_RELEASE 2)
+set(LIB_MAJOR 4)
+set(LIB_MINOR 2)
+set(LIB_RELEASE 2)
 
-SET(_soversion ${LIB_MAJOR}.${LIB_MINOR}.${LIB_RELEASE})
+set(_soversion ${LIB_MAJOR}.${LIB_MINOR}.${LIB_RELEASE})
 
-SET_TARGET_PROPERTIES(${svnqt-name} PROPERTIES
+set_target_properties(${svnqt-name} PROPERTIES
     SOVERSION ${LIB_MAJOR}
     VERSION ${_soversion})
 
-SET(ALL_LINKFLAGS ${APR_EXTRA_LIBFLAGS})
-SET(ALL_LINKFLAGS "${ALL_LINKFLAGS} ${APU_EXTRA_LIBFLAGS}")
-SET_TARGET_PROPERTIES(${svnqt-name} PROPERTIES LINK_FLAGS "${ALL_LINKFLAGS} ${LINK_NO_UNDEFINED}")
-TARGET_LINK_LIBRARIES(${svnqt-name} ${TQT_LIBRARIES} ${SUBVERSION_ALL_LIBS} ${ALL_LINKFLAGS})
+set(ALL_LINKFLAGS ${APR_EXTRA_LIBFLAGS})
+set(ALL_LINKFLAGS "${ALL_LINKFLAGS} ${APU_EXTRA_LIBFLAGS}")
+set_target_properties(${svnqt-name} PROPERTIES LINK_FLAGS "${ALL_LINKFLAGS} ${LINK_NO_UNDEFINED}")
+target_link_libraries(${svnqt-name} ${TQT_LIBRARIES} ${SUBVERSION_ALL_LIBS} ${ALL_LINKFLAGS})
 
-# IF (SQLITE_FOUND)
-    TARGET_LINK_LIBRARIES(${svnqt-name} ${SQLITE_LIBRARIES})
-    INCLUDE_DIRECTORIES(${SQLITE_INCLUDE_DIR})
-# ELSE (SQLITE_FOUND)
-#     TARGET_LINK_LIBRARIES(${svnqt-name} ${QT_QTSQL_LIBRARY})
-# ENDIF (SQLITE_FOUND)
+# if (SQLITE_FOUND)
+    target_link_libraries(${svnqt-name} ${SQLITE_LIBRARIES})
+    include_directories(${SQLITE_INCLUDE_DIR})
+# else (SQLITE_FOUND)
+#     target_link_libraries(${svnqt-name} ${QT_QTSQL_LIBRARY})
+# endif (SQLITE_FOUND)
 
 # Just a small linking test
-IF (BUILD_TESTS)
-    ADD_EXECUTABLE(testlink testmain.cpp)
-    TARGET_LINK_LIBRARIES(testlink ${svnqt-name})
-ENDIF (BUILD_TESTS)
-
-    INSTALL(TARGETS ${svnqt-name} DESTINATION ${LIB_INSTALL_DIR})
-    INSTALL(FILES ${INST_HEADERS} DESTINATION include/${svnqt-name})
-    INSTALL(FILES ${CACHEINST_HEADERS} DESTINATION include/${svnqt-name}/cache)
-
-IF (BUILD_TESTS)
-  ADD_SUBDIRECTORY(tests)
-  ADD_SUBDIRECTORY(cache/test)
-ENDIF (BUILD_TESTS)
+if (BUILD_TESTS)
+    add_executable(testlink testmain.cpp)
+    target_link_libraries(testlink ${svnqt-name})
+endif (BUILD_TESTS)
+
+    install(TARGETS ${svnqt-name} DESTINATION ${LIB_INSTALL_DIR})
+    install(FILES ${INST_HEADERS} DESTINATION include/${svnqt-name})
+    install(FILES ${CACHEINST_HEADERS} DESTINATION include/${svnqt-name}/cache)
+
+if (BUILD_TESTS)
+  add_subdirectory(tests)
+  add_subdirectory(cache/test)
+endif (BUILD_TESTS)
diff --git a/src/svnqt/cache/test/CMakeLists.txt b/src/svnqt/cache/test/CMakeLists.txt
index 09418e0..7ea8c33 100644
--- a/src/svnqt/cache/test/CMakeLists.txt
+++ b/src/svnqt/cache/test/CMakeLists.txt
@@ -1,19 +1,19 @@
-SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
+set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
 
-MACRO(BUILD_TEST tname)
-  SET(${tname}-src ${tname}.cpp)
-  IF (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${tname}.h)
-        SET(${tname}-src ${${tname}-src} ${tname}.h)
-  ENDIF (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${tname}.h)
-  ADD_EXECUTABLE(${tname} ${${tname}-src})
-  TARGET_LINK_LIBRARIES(${tname} ${svnqt-name} ${TQT_LIBRARIES})
-  ADD_TEST(${tname} ${CMAKE_CURRENT_BINARY_DIR}/${tname})
-ENDMACRO(BUILD_TEST)
+macro(build_TEST tname)
+  set(${tname}-src ${tname}.cpp)
+  if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${tname}.h)
+        set(${tname}-src ${${tname}-src} ${tname}.h)
+  endif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${tname}.h)
+  add_executable(${tname} ${${tname}-src})
+  target_link_libraries(${tname} ${svnqt-name} ${TQT_LIBRARIES})
+  add_test(${tname} ${CMAKE_CURRENT_BINARY_DIR}/${tname})
+endmaCRO(BUILD_TEST)
 
-IF (BUILD_TESTS)
-    CONFIGURE_FILE(
+if (BUILD_TESTS)
+    configure_file(
         ${CMAKE_CURRENT_SOURCE_DIR}/testconfig.h.in
         ${CMAKE_CURRENT_BINARY_DIR}/testconfig.h
     )
-    BUILD_TEST(sqlite)
-ENDIF(BUILD_TESTS)
+    build_test(sqlite)
+endif(BUILD_TESTS)
diff --git a/src/svnqt/cmakemodules/FindSqlite.cmake b/src/svnqt/cmakemodules/FindSqlite.cmake
index 3c50d33..29e624a 100644
--- a/src/svnqt/cmakemodules/FindSqlite.cmake
+++ b/src/svnqt/cmakemodules/FindSqlite.cmake
@@ -21,9 +21,9 @@ ELSE (SQLITE_INCLUDE_DIR AND SQLITE_LIBRARIES)
  ENDIF (SQLITE_INCLUDE_DIR AND SQLITE_LIBRARIES)
 
  IF (SQLITE_FOUND)
-   MESSAGE(STATUS "Found sqlite3: ${SQLITE_LIBRARIES}")
+   message(STATUS "Found sqlite3: ${SQLITE_LIBRARIES}")
  ELSE (SQLITE_FOUND)
-   MESSAGE(STATUS "Could not find sqlite3")
+   message(STATUS "Could not find sqlite3")
    ADD_DEFINITIONS(-DNO_SQLITE3)
  ENDIF (SQLITE_FOUND)
 
diff --git a/src/svnqt/cmakemodules/FindSubversion.cmake b/src/svnqt/cmakemodules/FindSubversion.cmake
index 358ee3a..cc9f168 100644
--- a/src/svnqt/cmakemodules/FindSubversion.cmake
+++ b/src/svnqt/cmakemodules/FindSubversion.cmake
@@ -51,11 +51,11 @@ IF (UNIX)
   )
 
   if(NOT APR_CONFIG)
-    MESSAGE(SEND_ERROR "Error: no apr-config found")
+    message(SEND_ERROR "Error: no apr-config found")
   endif(NOT APR_CONFIG)
 
   if(NOT APU_CONFIG)
-    MESSAGE(SEND_ERROR "Error: no apu-config found")
+    message(SEND_ERROR "Error: no apu-config found")
   endif(NOT APU_CONFIG)
 
   EXEC_PROGRAM(${APR_CONFIG} ARGS "--includedir" OUTPUT_VARIABLE APR_INCLUDE_DIR)
@@ -186,107 +186,107 @@ IF (WIN32)
 
   # check found libraries
   if (NOT APR_LIB)
-    MESSAGE(SEND_ERROR "No apr lib found!")
+    message(SEND_ERROR "No apr lib found!")
   ELSE (NOT APR_LIB)
-    MESSAGE(STATUS "Found apr lib: ${APR_LIB}")
+    message(STATUS "Found apr lib: ${APR_LIB}")
     SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APR_LIB})
   endif(NOT APR_LIB)
 
   if (NOT APRICONV_LIB)
-    MESSAGE(SEND_ERROR "No apriconv lib found!")
+    message(SEND_ERROR "No apriconv lib found!")
   ELSE (NOT APRICONV_LIB)
-    MESSAGE(STATUS "Found apriconv lib: ${APRICONV_LIB}")
+    message(STATUS "Found apriconv lib: ${APRICONV_LIB}")
     SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APRICONV_LIB})
   endif(NOT APRICONV_LIB)
 
   if (NOT APU_LIB)
-    MESSAGE(SEND_ERROR "No aprutil lib found!")
+    message(SEND_ERROR "No aprutil lib found!")
   ELSE (NOT APU_LIB)
-    MESSAGE(STATUS "Found aprutil lib: ${APU_LIB}")
+    message(STATUS "Found aprutil lib: ${APU_LIB}")
     SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APU_LIB})
   endif(NOT APU_LIB)
 
   if (NOT APU_XMLLIB)
-    MESSAGE(SEND_ERROR "No xml lib found!")
+    message(SEND_ERROR "No xml lib found!")
   ELSE (NOT APU_XMLLIB)
-    MESSAGE(STATUS "Found xml lib: ${APU_XMLLIB}")
+    message(STATUS "Found xml lib: ${APU_XMLLIB}")
     SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APU_XMLLIB})
   endif(NOT APU_XMLLIB)
 
   if (NOT NEON_LIB)
-    MESSAGE(SEND_ERROR "No neon lib found!")
+    message(SEND_ERROR "No neon lib found!")
   ELSE (NOT NEON_LIB)
-    MESSAGE(STATUS "Found neon lib: ${NEON_LIB}")
+    message(STATUS "Found neon lib: ${NEON_LIB}")
     SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${NEON_LIB})
   endif(NOT NEON_LIB)
 
   if (NOT NEON_ZLIBSTATLIB)
-    MESSAGE(SEND_ERROR "No zlibstat lib found!")
+    message(SEND_ERROR "No zlibstat lib found!")
   ELSE (NOT APRICONV_LIB)
-    MESSAGE(STATUS "Found zlibstat lib: ${NEON_ZLIBSTATLIB}")
+    message(STATUS "Found zlibstat lib: ${NEON_ZLIBSTATLIB}")
     SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${NEON_ZLIBSTATLIB})
   endif(NOT NEON_ZLIBSTATLIB)
 
   if (NOT INTL3LIB)
-    MESSAGE(SEND_ERROR "No intl3 lib found!")
+    message(SEND_ERROR "No intl3 lib found!")
   ELSE (NOT INTL3LIB)
-    MESSAGE(STATUS "Found intl3 lib: ${INTL3LIB}")
+    message(STATUS "Found intl3 lib: ${INTL3LIB}")
     SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${INTL3LIB})
   endif(NOT INTL3LIB)
 
   if (NOT DB44_LIB)
-    MESSAGE(SEND_ERROR "No db44 lib found!")
+    message(SEND_ERROR "No db44 lib found!")
   ELSE (NOT DB44_LIB)
-    MESSAGE(STATUS "Found db44 lib: ${DB44_LIB}")
+    message(STATUS "Found db44 lib: ${DB44_LIB}")
     SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${DB44_LIB})
   endif(NOT DB44_LIB)
 
   if (NOT SUBVERSION_DELTALIB)
-    MESSAGE(SEND_ERROR "No subversion delta lib found!")
+    message(SEND_ERROR "No subversion delta lib found!")
   ELSE (NOT SUBVERSION_DELTALIB)
-    MESSAGE(STATUS "Found subversion delta lib: ${SUBVERSION_DELTALIB}")
+    message(STATUS "Found subversion delta lib: ${SUBVERSION_DELTALIB}")
     SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_DELTALIB})
   endif(NOT SUBVERSION_DELTALIB)
 
   if (NOT SUBVERSION_FSBASELIB)
-    MESSAGE(SEND_ERROR "No subversion fs base lib found!")
+    message(SEND_ERROR "No subversion fs base lib found!")
   ELSE (NOT SUBVERSION_FSBASELIB)
-    MESSAGE(STATUS "Found subversion fs base lib: ${SUBVERSION_FSBASELIB}")
+    message(STATUS "Found subversion fs base lib: ${SUBVERSION_FSBASELIB}")
     SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_FSBASELIB})
   endif(NOT SUBVERSION_FSBASELIB)
 
   if (NOT SUBVERSION_FSFSLIB)
-    MESSAGE(SEND_ERROR "No subversion fs fs lib found!")
+    message(SEND_ERROR "No subversion fs fs lib found!")
   ELSE (NOT SUBVERSION_FSFSLIB)
-    MESSAGE(STATUS "Found subversion fs fs lib: ${SUBVERSION_FSFSLIB}")
+    message(STATUS "Found subversion fs fs lib: ${SUBVERSION_FSFSLIB}")
     SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_FSFSLIB})
   endif(NOT SUBVERSION_FSFSLIB)
 
   if (NOT SUBVERSION_FSUTILLIB)
-    MESSAGE(SEND_ERROR "No subversion fs util lib found!")
+    message(SEND_ERROR "No subversion fs util lib found!")
   ELSE (NOT SUBVERSION_FSUTILLIB)
-    MESSAGE(STATUS "Found subversion fs util lib: ${SUBVERSION_FSUTILLIB}")
+    message(STATUS "Found subversion fs util lib: ${SUBVERSION_FSUTILLIB}")
     SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_FSUTILLIB})
   endif(NOT SUBVERSION_FSUTILLIB)
 
   if (NOT SUBVERSION_RALOCALLIB)
-    MESSAGE(SEND_ERROR "No subversion ra local lib found!")
+    message(SEND_ERROR "No subversion ra local lib found!")
   ELSE (NOT SUBVERSION_RALOCALLIB)
-    MESSAGE(STATUS "Found subversion ra local lib: ${SUBVERSION_RALOCALLIB}")
+    message(STATUS "Found subversion ra local lib: ${SUBVERSION_RALOCALLIB}")
     SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_RALOCALLIB})
   endif(NOT SUBVERSION_RALOCALLIB)
 
   if (NOT SUBVERSION_RANEONLIB)
-    MESSAGE(SEND_ERROR "No subversion ra neon lib found!")
+    message(SEND_ERROR "No subversion ra neon lib found!")
   ELSE (NOT SUBVERSION_RANEONLIB)
-    MESSAGE(STATUS "Found subversion ra neon lib: ${SUBVERSION_RANEONLIB}")
+    message(STATUS "Found subversion ra neon lib: ${SUBVERSION_RANEONLIB}")
     SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_RANEONLIB})
   endif(NOT SUBVERSION_RANEONLIB)
 
   if (NOT SUBVERSION_RASVNLIB)
-    MESSAGE(SEND_ERROR "No subversion ra svn lib found!")
+    message(SEND_ERROR "No subversion ra svn lib found!")
   ELSE (NOT SUBVERSION_RASVNLIB)
-    MESSAGE(STATUS "Found subversion ra svn lib: ${SUBVERSION_RASVNLIB}")
+    message(STATUS "Found subversion ra svn lib: ${SUBVERSION_RASVNLIB}")
     SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_RASVNLIB})
   endif(NOT SUBVERSION_RASVNLIB)
 
@@ -294,57 +294,57 @@ ENDIF (WIN32)
 
 
 IF(NOT SUBVERSION_INCLUDE_DIR)
-  MESSAGE(SEND_ERROR "No subversion includes found!")
+  message(SEND_ERROR "No subversion includes found!")
 ELSE(NOT SUBVERSION_INCLUDE_DIR)
-  MESSAGE(STATUS "Found subversion include: ${SUBVERSION_INCLUDE_DIR}")
+  message(STATUS "Found subversion include: ${SUBVERSION_INCLUDE_DIR}")
 ENDIF(NOT SUBVERSION_INCLUDE_DIR)
 
 if (NOT SUBVERSION_CLIENTLIB)
- MESSAGE(SEND_ERROR "No subversion client libs found!")
+ message(SEND_ERROR "No subversion client libs found!")
 ELSE (NOT SUBVERSION_CLIENTLIB)
- MESSAGE(STATUS "Found subversion client lib: ${SUBVERSION_CLIENTLIB}")
+ message(STATUS "Found subversion client lib: ${SUBVERSION_CLIENTLIB}")
  SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_CLIENTLIB})
 endif(NOT SUBVERSION_CLIENTLIB)
 
 if (NOT SUBVERSION_DIFFLIB)
- MESSAGE(SEND_ERROR "No subversion diff lib found!")
+ message(SEND_ERROR "No subversion diff lib found!")
 ELSE (NOT SUBVERSION_DIFFLIB)
- MESSAGE(STATUS "Found subversion diff lib: ${SUBVERSION_DIFFLIB}")
+ message(STATUS "Found subversion diff lib: ${SUBVERSION_DIFFLIB}")
  SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_DIFFLIB})
 endif(NOT SUBVERSION_DIFFLIB)
 
 if (NOT SUBVERSION_FSLIB)
- MESSAGE(SEND_ERROR "No subversion fs lib found!")
+ message(SEND_ERROR "No subversion fs lib found!")
 ELSE (NOT SUBVERSION_FSLIB)
- MESSAGE(STATUS "Found subversion fs lib: ${SUBVERSION_FSLIB}")
+ message(STATUS "Found subversion fs lib: ${SUBVERSION_FSLIB}")
  SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_FSLIB})
 endif(NOT SUBVERSION_FSLIB)
 
 if (NOT SUBVERSION_RALIB)
- MESSAGE(SEND_ERROR "No subversion ra lib found!")
+ message(SEND_ERROR "No subversion ra lib found!")
 ELSE (NOT SUBVERSION_RALIB)
- MESSAGE(STATUS "Found subversion ra lib: ${SUBVERSION_RALIB}")
+ message(STATUS "Found subversion ra lib: ${SUBVERSION_RALIB}")
  SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_RALIB})
 endif(NOT SUBVERSION_RALIB)
 
 if (NOT SUBVERSION_REPOSITORYLIB)
- MESSAGE(SEND_ERROR "No subversion repository lib found!")
+ message(SEND_ERROR "No subversion repository lib found!")
 ELSE (NOT SUBVERSION_REPOSITORYLIB)
- MESSAGE(STATUS "Found subversion repository lib: ${SUBVERSION_REPOSITORYLIB}")
+ message(STATUS "Found subversion repository lib: ${SUBVERSION_REPOSITORYLIB}")
  SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_REPOSITORYLIB})
 endif(NOT SUBVERSION_REPOSITORYLIB)
 
 if (NOT SUBVERSION_SUBRLIB)
- MESSAGE(SEND_ERROR "No subversion subr lib found!")
+ message(SEND_ERROR "No subversion subr lib found!")
 ELSE (NOT SUBVERSION_SUBRLIB)
- MESSAGE(STATUS "Found subversion subr lib: ${SUBVERSION_SUBRLIB}")
+ message(STATUS "Found subversion subr lib: ${SUBVERSION_SUBRLIB}")
  SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_SUBRLIB})
 endif(NOT SUBVERSION_SUBRLIB)
 
 if (NOT SUBVERSION_WCLIB)
- MESSAGE(SEND_ERROR "No subversion wc lib found!")
+ message(SEND_ERROR "No subversion wc lib found!")
 ELSE (NOT SUBVERSION_WCLIB)
- MESSAGE(STATUS "Found subversion wc lib: ${SUBVERSION_WCLIB}")
+ message(STATUS "Found subversion wc lib: ${SUBVERSION_WCLIB}")
  SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_WCLIB})
 endif(NOT SUBVERSION_WCLIB)
 
diff --git a/src/svnqt/tests/CMakeLists.txt b/src/svnqt/tests/CMakeLists.txt
index 78344ad..6b15073 100644
--- a/src/svnqt/tests/CMakeLists.txt
+++ b/src/svnqt/tests/CMakeLists.txt
@@ -1,23 +1,23 @@
-SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
+set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
 
-MACRO(BUILD_TEST tname)
-  SET(${tname}-src ${tname}.cpp)
-  IF (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${tname}.h)
-        SET(${tname}-src ${${tname}-src} ${tname}.h)
-  ENDIF (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${tname}.h)
-  ADD_EXECUTABLE(${tname} ${${tname}-src})
-  TARGET_LINK_LIBRARIES(${tname} ${svnqt-name} ${TQT_LIBRARIES})
-  ADD_TEST(${tname} ${CMAKE_CURRENT_BINARY_DIR}/${tname})
-ENDMACRO(BUILD_TEST)
+macro(build_test tname)
+  set(${tname}-src ${tname}.cpp)
+  if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${tname}.h)
+        set(${tname}-src ${${tname}-src} ${tname}.h)
+  endif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${tname}.h)
+  add_executable(${tname} ${${tname}-src})
+  target_link_libraries(${tname} ${svnqt-name} ${TQT_LIBRARIES})
+  add_test(${tname} ${CMAKE_CURRENT_BINARY_DIR}/${tname})
+endmacro(BUILD_TEST)
 
-IF (BUILD_TESTS)
-    CONFIGURE_FILE(
+if (BUILD_TESTS)
+    configure_file(
         ${CMAKE_CURRENT_SOURCE_DIR}/testconfig.h.in
         ${CMAKE_CURRENT_BINARY_DIR}/testconfig.h
     )
-    ADD_TEST(rmrepo "/bin/rm" "-rvf" "${CMAKE_CURRENT_BINARY_DIR}/repo")
-    ADD_TEST(rmco "/bin/rm" "-rvf" "${CMAKE_CURRENT_BINARY_DIR}/co")
-    BUILD_TEST(crepo)
-    BUILD_TEST(lsdir)
-    BUILD_TEST(ckpath)
-ENDIF(BUILD_TESTS)
+    add_test(rmrepo "/bin/rm" "-rvf" "${CMAKE_CURRENT_BINARY_DIR}/repo")
+    add_test(rmco "/bin/rm" "-rvf" "${CMAKE_CURRENT_BINARY_DIR}/co")
+    build_test(crepo)
+    build_test(lsdir)
+    build_test(ckpath)
+endif(BUILD_TESTS)