diff options
Diffstat (limited to 'src/svnqt')
| -rw-r--r-- | src/svnqt/CMakeLists.txt | 180 | ||||
| -rw-r--r-- | src/svnqt/LICENSE_SVN | 2 | ||||
| -rw-r--r-- | src/svnqt/annotate_line.h (renamed from src/svnqt/annotate_line.hpp) | 15 | ||||
| -rw-r--r-- | src/svnqt/apr.cpp | 4 | ||||
| -rw-r--r-- | src/svnqt/apr.h (renamed from src/svnqt/apr.hpp) | 7 | ||||
| -rw-r--r-- | src/svnqt/cache/DatabaseException.cpp | 2 | ||||
| -rw-r--r-- | src/svnqt/cache/DatabaseException.h (renamed from src/svnqt/cache/DatabaseException.hpp) | 2 | ||||
| -rw-r--r-- | src/svnqt/cache/LogCache.cpp | 6 | ||||
| -rw-r--r-- | src/svnqt/cache/LogCache.h (renamed from src/svnqt/cache/LogCache.hpp) | 4 | ||||
| -rw-r--r-- | src/svnqt/cache/ReposLog.cpp | 16 | ||||
| -rw-r--r-- | src/svnqt/cache/ReposLog.h (renamed from src/svnqt/cache/ReposLog.hpp) | 6 | ||||
| -rw-r--r-- | src/svnqt/cache/sqlite3/README | 11 | ||||
| -rw-r--r-- | src/svnqt/cache/sqlite3/qsql_sqlite3.cpp | 10 | ||||
| -rw-r--r-- | src/svnqt/cache/test/CMakeLists.txt | 29 | ||||
| -rw-r--r-- | src/svnqt/cache/test/sqlite.cpp | 29 | ||||
| -rw-r--r-- | src/svnqt/check.h (renamed from src/svnqt/check.hpp) | 7 | ||||
| -rw-r--r-- | src/svnqt/client.cpp | 14 | ||||
| -rw-r--r-- | src/svnqt/client.h (renamed from src/svnqt/client.hpp) | 115 | ||||
| -rw-r--r-- | src/svnqt/client_annotate.cpp | 8 | ||||
| -rw-r--r-- | src/svnqt/client_cat.cpp | 28 | ||||
| -rw-r--r-- | src/svnqt/client_diff.cpp | 30 | ||||
| -rw-r--r-- | src/svnqt/client_impl.cpp | 14 | ||||
| -rw-r--r-- | src/svnqt/client_impl.h (renamed from src/svnqt/client_impl.hpp) | 93 | ||||
| -rw-r--r-- | src/svnqt/client_lock.cpp | 14 | ||||
| -rw-r--r-- | src/svnqt/client_ls.cpp | 24 | ||||
| -rw-r--r-- | src/svnqt/client_merge.cpp | 20 | ||||
| -rw-r--r-- | src/svnqt/client_modify.cpp | 60 | ||||
| -rw-r--r-- | src/svnqt/client_property.cpp | 22 | ||||
| -rw-r--r-- | src/svnqt/client_status.cpp | 40 | ||||
| -rw-r--r-- | src/svnqt/cmakemodules/FindSqlite.cmake | 4 | ||||
| -rw-r--r-- | src/svnqt/cmakemodules/FindSubversion.cmake | 96 | ||||
| -rw-r--r-- | src/svnqt/commititem.cpp | 2 | ||||
| -rw-r--r-- | src/svnqt/commititem.h (renamed from src/svnqt/commititem.hpp) | 2 | ||||
| -rw-r--r-- | src/svnqt/conflictdescription.cpp | 4 | ||||
| -rw-r--r-- | src/svnqt/conflictdescription.h (renamed from src/svnqt/conflictdescription.hpp) | 4 | ||||
| -rw-r--r-- | src/svnqt/conflictresult.cpp | 4 | ||||
| -rw-r--r-- | src/svnqt/conflictresult.h (renamed from src/svnqt/conflictresult.hpp) | 4 | ||||
| -rw-r--r-- | src/svnqt/context.cpp | 16 | ||||
| -rw-r--r-- | src/svnqt/context.h (renamed from src/svnqt/context.hpp) | 15 | ||||
| -rw-r--r-- | src/svnqt/context_listener.h (renamed from src/svnqt/context_listener.hpp) | 15 | ||||
| -rw-r--r-- | src/svnqt/contextdata.cpp | 8 | ||||
| -rw-r--r-- | src/svnqt/contextdata.h (renamed from src/svnqt/contextdata.hpp) | 8 | ||||
| -rw-r--r-- | src/svnqt/datetime.cpp | 8 | ||||
| -rw-r--r-- | src/svnqt/datetime.h (renamed from src/svnqt/datetime.hpp) | 9 | ||||
| -rw-r--r-- | src/svnqt/diff_data.cpp | 10 | ||||
| -rw-r--r-- | src/svnqt/diff_data.h (renamed from src/svnqt/diff_data.hpp) | 8 | ||||
| -rw-r--r-- | src/svnqt/diffoptions.cpp | 6 | ||||
| -rw-r--r-- | src/svnqt/diffoptions.h (renamed from src/svnqt/diffoptions.hpp) | 2 | ||||
| -rw-r--r-- | src/svnqt/dirent.cpp | 14 | ||||
| -rw-r--r-- | src/svnqt/dirent.h (renamed from src/svnqt/dirent.hpp) | 13 | ||||
| -rw-r--r-- | src/svnqt/entry.cpp | 4 | ||||
| -rw-r--r-- | src/svnqt/entry.h (renamed from src/svnqt/entry.hpp) | 21 | ||||
| -rw-r--r-- | src/svnqt/exception.cpp | 11 | ||||
| -rw-r--r-- | src/svnqt/exception.h (renamed from src/svnqt/exception.hpp) | 9 | ||||
| -rw-r--r-- | src/svnqt/helper.h (renamed from src/svnqt/helper.hpp) | 4 | ||||
| -rw-r--r-- | src/svnqt/info_entry.cpp | 6 | ||||
| -rw-r--r-- | src/svnqt/info_entry.h (renamed from src/svnqt/info_entry.hpp) | 8 | ||||
| -rw-r--r-- | src/svnqt/lock_entry.cpp | 12 | ||||
| -rw-r--r-- | src/svnqt/lock_entry.h (renamed from src/svnqt/lock_entry.hpp) | 12 | ||||
| -rw-r--r-- | src/svnqt/log_entry.cpp | 6 | ||||
| -rw-r--r-- | src/svnqt/log_entry.h (renamed from src/svnqt/log_entry.hpp) | 11 | ||||
| -rw-r--r-- | src/svnqt/path.cpp | 20 | ||||
| -rw-r--r-- | src/svnqt/path.h (renamed from src/svnqt/path.hpp) | 11 | ||||
| -rw-r--r-- | src/svnqt/pool.cpp | 10 | ||||
| -rw-r--r-- | src/svnqt/pool.h (renamed from src/svnqt/pool.hpp) | 8 | ||||
| -rw-r--r-- | src/svnqt/repository.cpp | 16 | ||||
| -rw-r--r-- | src/svnqt/repository.h (renamed from src/svnqt/repository.hpp) | 16 | ||||
| -rw-r--r-- | src/svnqt/repositorydata.cpp | 10 | ||||
| -rw-r--r-- | src/svnqt/repositorydata.h (renamed from src/svnqt/repositorydata.hpp) | 8 | ||||
| -rw-r--r-- | src/svnqt/repositorylistener.cpp | 2 | ||||
| -rw-r--r-- | src/svnqt/repositorylistener.h (renamed from src/svnqt/repositorylistener.hpp) | 2 | ||||
| -rw-r--r-- | src/svnqt/revision.cpp | 14 | ||||
| -rw-r--r-- | src/svnqt/revision.h (renamed from src/svnqt/revision.hpp) | 13 | ||||
| -rw-r--r-- | src/svnqt/shared_pointer.h (renamed from src/svnqt/shared_pointer.hpp) | 6 | ||||
| -rw-r--r-- | src/svnqt/smart_pointer.h (renamed from src/svnqt/smart_pointer.hpp) | 2 | ||||
| -rw-r--r-- | src/svnqt/status.cpp | 10 | ||||
| -rw-r--r-- | src/svnqt/status.h (renamed from src/svnqt/status.hpp) | 35 | ||||
| -rw-r--r-- | src/svnqt/stringarray.cpp | 4 | ||||
| -rw-r--r-- | src/svnqt/stringarray.h (renamed from src/svnqt/stringarray.hpp) | 4 | ||||
| -rw-r--r-- | src/svnqt/svnfilestream.cpp | 2 | ||||
| -rw-r--r-- | src/svnqt/svnfilestream.h (renamed from src/svnqt/svnfilestream.hpp) | 2 | ||||
| -rw-r--r-- | src/svnqt/svnqt_defines.h.in (renamed from src/svnqt/svnqt_defines.hpp.in) | 0 | ||||
| -rw-r--r-- | src/svnqt/svnqttypes.h (renamed from src/svnqt/svnqttypes.hpp) | 6 | ||||
| -rw-r--r-- | src/svnqt/svnstream.cpp | 10 | ||||
| -rw-r--r-- | src/svnqt/svnstream.h (renamed from src/svnqt/svnstream.hpp) | 2 | ||||
| -rw-r--r-- | src/svnqt/targets.cpp | 16 | ||||
| -rw-r--r-- | src/svnqt/targets.h (renamed from src/svnqt/targets.hpp) | 11 | ||||
| -rw-r--r-- | src/svnqt/testmain.cpp | 13 | ||||
| -rw-r--r-- | src/svnqt/tests/CMakeLists.txt | 38 | ||||
| -rw-r--r-- | src/svnqt/tests/ckpath.cpp | 4 | ||||
| -rw-r--r-- | src/svnqt/tests/crepo.cpp | 14 | ||||
| -rw-r--r-- | src/svnqt/tests/lsdir.cpp | 18 | ||||
| -rw-r--r-- | src/svnqt/tests/testlistener.h | 2 | ||||
| -rw-r--r-- | src/svnqt/url.cpp | 12 | ||||
| -rw-r--r-- | src/svnqt/url.h (renamed from src/svnqt/url.hpp) | 12 | ||||
| -rw-r--r-- | src/svnqt/version_check.cpp | 2 | ||||
| -rw-r--r-- | src/svnqt/version_check.h (renamed from src/svnqt/version_check.hpp) | 2 | ||||
| -rw-r--r-- | src/svnqt/wc.cpp | 28 | ||||
| -rw-r--r-- | src/svnqt/wc.h (renamed from src/svnqt/wc.hpp) | 21 |
99 files changed, 671 insertions, 903 deletions
diff --git a/src/svnqt/CMakeLists.txt b/src/svnqt/CMakeLists.txt index 73d61cf..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 @@ -41,118 +41,118 @@ SET(SOURCES client_merge.cpp cache/LogCache.cpp cache/ReposLog.cpp - cache/DatabaseException.hpp + cache/DatabaseException.h cache/DatabaseException.cpp ) -SET(CACHEINST_HEADERS - cache/LogCache.hpp - cache/ReposLog.hpp - cache/DatabaseException.hpp +set(CACHEINST_HEADERS + cache/LogCache.h + cache/ReposLog.h + cache/DatabaseException.h ) -SET(INST_HEADERS - annotate_line.hpp - apr.hpp - check.hpp - client.hpp - commititem.hpp - context.hpp - context_listener.hpp - datetime.hpp - dirent.hpp - entry.hpp - exception.hpp - info_entry.hpp - lock_entry.hpp - log_entry.hpp - path.hpp - pool.hpp - repository.hpp - repositorylistener.hpp - revision.hpp - smart_pointer.hpp - shared_pointer.hpp - status.hpp - svnfilestream.hpp - svnstream.hpp - svnqttypes.hpp - targets.hpp - url.hpp - version_check.hpp - wc.hpp - stringarray.hpp - diffoptions.hpp - conflictdescription.hpp - conflictresult.hpp +set(INST_HEADERS + annotate_line.h + apr.h + check.h + client.h + commititem.h + context.h + context_listener.h + datetime.h + dirent.h + entry.h + exception.h + info_entry.h + lock_entry.h + log_entry.h + path.h + pool.h + repository.h + repositorylistener.h + revision.h + smart_pointer.h + shared_pointer.h + status.h + svnfilestream.h + svnstream.h + svnqttypes.h + targets.h + url.h + version_check.h + wc.h + stringarray.h + diffoptions.h + conflictdescription.h + conflictresult.h ) -FILE(GLOB svnhdr RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.hpp") -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( - "${CMAKE_CURRENT_SOURCE_DIR}/svnqt_defines.hpp.in" - "${CMAKE_CURRENT_BINARY_DIR}/svnqt_defines.hpp" +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.hpp) -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/LICENSE_SVN b/src/svnqt/LICENSE_SVN index 61d889a..687c45d 100644 --- a/src/svnqt/LICENSE_SVN +++ b/src/svnqt/LICENSE_SVN @@ -1,4 +1,4 @@ -A small section of code in client_impl.hpp and client_impl.cpp was taken and modified +A small section of code in client_impl.h and client_impl.cpp was taken and modified from the source code of subversion 1.8.10, which is released under the following license. --------------------------------------------------------------------------------- diff --git a/src/svnqt/annotate_line.hpp b/src/svnqt/annotate_line.h index c08b273..94dedbf 100644 --- a/src/svnqt/annotate_line.hpp +++ b/src/svnqt/annotate_line.h @@ -1,5 +1,5 @@ /* - * Port for usage with qt-framework and development for tdesvn + * Port for usage with tqt-framework and development for tdesvn * (C) 2005-2007 by Rajko Albrecht * http://tdesvn.alwins-world.de */ @@ -30,7 +30,7 @@ #ifndef _SVNCPP_ANNOTATE_LINE_HPP_ #define _SVNCPP_ANNOTATE_LINE_HPP_ -#include "svnqt/svnqt_defines.hpp" +#include "svnqt/svnqt_defines.h" #include <tqstring.h> #include <tqdatetime.h> @@ -49,7 +49,7 @@ namespace svn const char *date, const char *line) : m_line_no (line_no), m_revision (revision), - m_date( (date&&strlen(date))?TQDateTime::fromString(TQString::FROMUTF8(date),Qt::ISODate):TQDateTime()), + m_date( (date&&strlen(date))?TQDateTime::fromString(TQString::FROMUTF8(date),TQt::ISODate):TQDateTime()), m_line(line?line:""),m_author(author?author:""), m_merge_revision(-1), m_merge_date(TQDateTime()), @@ -69,10 +69,10 @@ namespace svn const char *merge_path ) : m_line_no (line_no), m_revision (revision), - m_date( (date&&strlen(date))?TQDateTime::fromString(TQString::FROMUTF8(date),Qt::ISODate):TQDateTime()), + m_date( (date&&strlen(date))?TQDateTime::fromString(TQString::FROMUTF8(date),TQt::ISODate):TQDateTime()), m_line(line?line:""),m_author(author?author:""), m_merge_revision(merge_revision), - m_merge_date( (merge_date&&strlen(merge_date))?TQDateTime::fromString(TQString::FROMUTF8(merge_date),Qt::ISODate):TQDateTime()), + m_merge_date( (merge_date&&strlen(merge_date))?TQDateTime::fromString(TQString::FROMUTF8(merge_date),TQt::ISODate):TQDateTime()), m_merge_author(merge_author?merge_author:""),m_merge_path(merge_path?merge_path:"") { } @@ -142,8 +142,3 @@ namespace svn } #endif -/* ----------------------------------------------------------------- - * local variables: - * eval: (load-file "../../rapidsvn-dev.el") - * end: - */ diff --git a/src/svnqt/apr.cpp b/src/svnqt/apr.cpp index 97bb3b8..2eb7ddf 100644 --- a/src/svnqt/apr.cpp +++ b/src/svnqt/apr.cpp @@ -1,5 +1,5 @@ /* - * Port for usage with qt-framework and development for tdesvn + * Port for usage with tqt-framework and development for tdesvn * (C) 2005-2007 by Rajko Albrecht * http://tdesvn.alwins-world.de */ @@ -32,7 +32,7 @@ #include "apr_general.h" // svncpp -#include "apr.hpp" +#include "apr.h" /** diff --git a/src/svnqt/apr.hpp b/src/svnqt/apr.h index ddefebd..bdfd8f3 100644 --- a/src/svnqt/apr.hpp +++ b/src/svnqt/apr.h @@ -1,5 +1,5 @@ /* - * Port for usage with qt-framework and development for tdesvn + * Port for usage with tqt-framework and development for tdesvn * (C) 2005-2007 by Rajko Albrecht * http://tdesvn.alwins-world.de */ @@ -62,8 +62,3 @@ namespace svn } #endif -/* ----------------------------------------------------------------- - * local variables: - * eval: (load-file "../../rapidsvn-dev.el") - * end: - */ diff --git a/src/svnqt/cache/DatabaseException.cpp b/src/svnqt/cache/DatabaseException.cpp index 199a5f9..7ca796a 100644 --- a/src/svnqt/cache/DatabaseException.cpp +++ b/src/svnqt/cache/DatabaseException.cpp @@ -1,4 +1,4 @@ -#include "DatabaseException.hpp" +#include "DatabaseException.h" /*! \fn svn::cache::DatabaseException::DatabaseException(const TQString&msg,int aNumber)throw() diff --git a/src/svnqt/cache/DatabaseException.hpp b/src/svnqt/cache/DatabaseException.h index 9e67cb9..c089beb 100644 --- a/src/svnqt/cache/DatabaseException.hpp +++ b/src/svnqt/cache/DatabaseException.h @@ -1,7 +1,7 @@ #ifndef _DATABASE_EXCEPTION_HPP #define _DATABASE_EXCEPTION_HPP -#include "svnqt/exception.hpp" +#include "svnqt/exception.h" namespace svn { diff --git a/src/svnqt/cache/LogCache.cpp b/src/svnqt/cache/LogCache.cpp index a3cb590..f6b7b3b 100644 --- a/src/svnqt/cache/LogCache.cpp +++ b/src/svnqt/cache/LogCache.cpp @@ -1,4 +1,4 @@ -#include "LogCache.hpp" +#include "LogCache.h" #include <tqdir.h> #include <tqsql.h> @@ -6,8 +6,8 @@ #include <tqthreadstorage.h> #include <tqmap.h> -#include "svnqt/path.hpp" -#include "svnqt/cache/DatabaseException.hpp" +#include "svnqt/path.h" +#include "svnqt/cache/DatabaseException.h" #ifndef NO_SQLITE3 #define SQLTYPE "TQSQLITE3" diff --git a/src/svnqt/cache/LogCache.hpp b/src/svnqt/cache/LogCache.h index eaaf37a..5e43b40 100644 --- a/src/svnqt/cache/LogCache.hpp +++ b/src/svnqt/cache/LogCache.h @@ -5,8 +5,8 @@ #include <tqdir.h> #include <tqmutex.h> -#include "svnqt/svnqt_defines.hpp" -#include "svnqt/shared_pointer.hpp" +#include "svnqt/svnqt_defines.h" +#include "svnqt/shared_pointer.h" namespace svn { namespace cache { diff --git a/src/svnqt/cache/ReposLog.cpp b/src/svnqt/cache/ReposLog.cpp index d8cd609..81b022b 100644 --- a/src/svnqt/cache/ReposLog.cpp +++ b/src/svnqt/cache/ReposLog.cpp @@ -1,11 +1,11 @@ -#include "ReposLog.hpp" - -#include "LogCache.hpp" -#include "svnqt/info_entry.hpp" -#include "svnqt/svnqttypes.hpp" -#include "svnqt/client.hpp" -#include "svnqt/context_listener.hpp" -#include "svnqt/cache/DatabaseException.hpp" +#include "ReposLog.h" + +#include "LogCache.h" +#include "svnqt/info_entry.h" +#include "svnqt/svnqttypes.h" +#include "svnqt/client.h" +#include "svnqt/context_listener.h" +#include "svnqt/cache/DatabaseException.h" #include <tqsqldatabase.h> diff --git a/src/svnqt/cache/ReposLog.hpp b/src/svnqt/cache/ReposLog.h index 1d28037..4d01fae 100644 --- a/src/svnqt/cache/ReposLog.hpp +++ b/src/svnqt/cache/ReposLog.h @@ -1,9 +1,9 @@ #ifndef _REPOS_LOG_HPP #define _REPOS_LOG_HPP -#include "svnqt/svnqt_defines.hpp" -#include "svnqt/svnqttypes.hpp" -#include "svnqt/revision.hpp" +#include "svnqt/svnqt_defines.h" +#include "svnqt/svnqttypes.h" +#include "svnqt/revision.h" #include <tqsqldatabase.h> #include <tqstring.h> diff --git a/src/svnqt/cache/sqlite3/README b/src/svnqt/cache/sqlite3/README index 854be9e..3ea0855 100644 --- a/src/svnqt/cache/sqlite3/README +++ b/src/svnqt/cache/sqlite3/README @@ -1,15 +1,12 @@ With this driver you can access the files created by sqlite3 through -the standard Qt sql module. The driver name is QSQLITE3. +the standard TQt sql module. The driver name is QSQLITE3. Although there are many other solutions to access such DB files, I think that using this driver has some advantages: ---> You use the standard Qt interface so you can reuse exinting code or +--> You use the standard TQt interface so you can reuse exinting code or switch to or from other DB types quite easily. ---> Soft transition to Qt 4: Qt 4 supports sqlite3, you can prepare your - application now. - --> The source of this driver is smaller than any other, you can incorporate it on your application with little overhead and without requiring external libraries. @@ -27,6 +24,6 @@ qmake make cp sqldrivers/libqsqlite3.so $TQTDIR/plugins/sqldrivers (probably as root) -use it as any other Qt sql driver. +use it as any other TQt sql driver. -Have fun, Stefano !!!
\ No newline at end of file +Have fun, Stefano !!! diff --git a/src/svnqt/cache/sqlite3/qsql_sqlite3.cpp b/src/svnqt/cache/sqlite3/qsql_sqlite3.cpp index 6160eae..69c3163 100644 --- a/src/svnqt/cache/sqlite3/qsql_sqlite3.cpp +++ b/src/svnqt/cache/sqlite3/qsql_sqlite3.cpp @@ -323,12 +323,12 @@ void TQSQLite3Driver::close() bool TQSQLite3Driver::ping() { if ( !isOpen() ) { - return FALSE; + return false; } // FIXME // Implement ping if available - return TRUE; + return true; } TQSqlQuery TQSQLite3Driver::createQuery() const @@ -389,7 +389,7 @@ TQStringList TQSQLite3Driver::tables(const TQString &typeName) const int type = typeName.toInt(); TQSqlQuery q = createQuery(); - q.setForwardOnly(TRUE); + q.setForwardOnly(true); if ((type & (int)TQSql::Tables) && (type & (int)TQSql::Views)) q.exec("SELECT name FROM sqlite_master WHERE type='table' OR type='view'"); else if (typeName.isEmpty() || (type & (int)TQSql::Tables)) @@ -419,7 +419,7 @@ TQSqlIndex TQSQLite3Driver::primaryIndex(const TQString &tblname) const return TQSqlIndex(); TQSqlQuery q = createQuery(); - q.setForwardOnly(TRUE); + q.setForwardOnly(true); // finrst find a UNIQUE INDEX q.exec("PRAGMA index_list('" + tblname + "');"); TQString indexname; @@ -451,7 +451,7 @@ TQSqlRecordInfo TQSQLite3Driver::recordInfo(const TQString &tbl) const return TQSqlRecordInfo(); TQSqlQuery q = createQuery(); - q.setForwardOnly(TRUE); + q.setForwardOnly(true); q.exec("SELECT * FROM " + tbl + " LIMIT 1"); return recordInfo(q); } diff --git a/src/svnqt/cache/test/CMakeLists.txt b/src/svnqt/cache/test/CMakeLists.txt index 09418e0..29e6145 100644 --- a/src/svnqt/cache/test/CMakeLists.txt +++ b/src/svnqt/cache/test/CMakeLists.txt @@ -1,19 +1,20 @@ -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}) + # FIXME: sqlite test relies on now defunc web service + # 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/cache/test/sqlite.cpp b/src/svnqt/cache/test/sqlite.cpp index 07b5148..fcb46a9 100644 --- a/src/svnqt/cache/test/sqlite.cpp +++ b/src/svnqt/cache/test/sqlite.cpp @@ -5,20 +5,13 @@ #include <tqapplication.h> #include <tqtextstream.h> -#include "svnqt/client.hpp" -#include "svnqt/svnqttypes.hpp" -#include "svnqt/log_entry.hpp" +#include "svnqt/client.h" +#include "svnqt/svnqttypes.h" -#include "svnqt/cache/LogCache.hpp" -#include "svnqt/cache/ReposLog.hpp" +#include "svnqt/cache/LogCache.h" +#include "svnqt/cache/ReposLog.h" #include "svnqt/cache/test/testconfig.h" -#include "svnqt/cache/DatabaseException.hpp" - -#if [[[TQT_VERSION IS DEPRECATED]]] < 0x040000 -#else -#include <TQSqlQuery> -#include <TQSqlError> -#endif +#include "svnqt/cache/DatabaseException.h" int main(int argc,char**argv) { @@ -43,19 +36,11 @@ int main(int argc,char**argv) } svn::cache::ReposLog rl(m_Svnclient,"http://www.alwins-world.de/repos/tdesvn"); TQDataBase db = rl.Database(); -#if [[[TQT_VERSION IS DEPRECATED]]] < 0x040000 if (!db) { -#else - if (!db.isValid()) { -#endif std::cerr << "No database object."<<std::endl; exit(-1); } -#if [[[TQT_VERSION IS DEPRECATED]]] < 0x040000 list = db->tables(); -#else - list = db.tables(); -#endif it = list.begin(); while( it != list.end() ) { std::cout << ( *it ).TOUTF8().data() << std::endl; @@ -91,10 +76,6 @@ int main(int argc,char**argv) q.exec(); std::cerr << "\n" << q.lastError().text().TOUTF8().data()<<std::endl; -#if [[[TQT_VERSION IS DEPRECATED]]] < 0x040000 -#else - db=TQSqlDatabase(); -#endif try { rl.log("/trunk/src/svnqt",1,1000,svn::Revision::UNDEFINED,lm,false,-1); } diff --git a/src/svnqt/check.hpp b/src/svnqt/check.h index 450d021..e2fbb48 100644 --- a/src/svnqt/check.hpp +++ b/src/svnqt/check.h @@ -1,5 +1,5 @@ /* - * Port for usage with qt-framework and development for tdesvn + * Port for usage with tqt-framework and development for tdesvn * (C) 2005-2007 by Rajko Albrecht * http://tdesvn.alwins-world.de */ @@ -43,8 +43,3 @@ (SVN_VER_MAJOR == (major) && SVN_VER_MINOR > (minor)) #endif -/* ----------------------------------------------------------------- - * local variables: - * eval: (load-file "../../rapidsvn-dev.el") - * end: - */ diff --git a/src/svnqt/client.cpp b/src/svnqt/client.cpp index f7560a4..cc5ded0 100644 --- a/src/svnqt/client.cpp +++ b/src/svnqt/client.cpp @@ -1,5 +1,5 @@ /* - * Port for usage with qt-framework and development for tdesvn + * Port for usage with tqt-framework and development for tdesvn * (C) 2005-2007 by Rajko Albrecht * http://tdesvn.alwins-world.de */ @@ -32,9 +32,9 @@ #endif // svncpp -#include "svnqt/client.hpp" -#include "svnqt/client_impl.hpp" -#include "svnqt/svnqt_defines.hpp" +#include "svnqt/client.h" +#include "svnqt/client_impl.h" +#include "svnqt/svnqt_defines.h" #include "svn_opt.h" @@ -96,9 +96,3 @@ namespace svn return 0L; } } - -/* ----------------------------------------------------------------- - * local variables: - * eval: (load-file "../../rapidsvn-dev.el") - * end: - */ diff --git a/src/svnqt/client.hpp b/src/svnqt/client.h index 68d0aa0..724507c 100644 --- a/src/svnqt/client.hpp +++ b/src/svnqt/client.h @@ -1,5 +1,5 @@ /* - * Port for usage with qt-framework and development for tdesvn + * Port for usage with tqt-framework and development for tdesvn * (C) 2005-2007 by Rajko Albrecht * http://tdesvn.alwins-world.de */ @@ -41,11 +41,11 @@ #pragma warning (disable: 4290) #endif -#include "svnqt/svnqt_defines.hpp" -#include "svnqt/svnqttypes.hpp" -#include "svnqt/svnstream.hpp" +#include "svnqt/svnqt_defines.h" +#include "svnqt/svnqttypes.h" +#include "svnqt/svnstream.h" -// qt +// tqt #include <tqglobal.h> #include <tqstring.h> @@ -54,17 +54,17 @@ #include <tqmap.h> // svnqt -#include "svnqt/context.hpp" -#include "svnqt/exception.hpp" -#include "svnqt/path.hpp" -#include "svnqt/entry.hpp" -#include "svnqt/revision.hpp" -#include "svnqt/log_entry.hpp" -#include "svnqt/info_entry.hpp" -#include "svnqt/annotate_line.hpp" -#include "svnqt/stringarray.hpp" -#include "svnqt/diffoptions.hpp" -#include "svnqt/conflictresult.hpp" +#include "svnqt/context.h" +#include "svnqt/exception.h" +#include "svnqt/path.h" +#include "svnqt/entry.h" +#include "svnqt/revision.h" +#include "svnqt/log_entry.h" +#include "svnqt/info_entry.h" +#include "svnqt/annotate_line.h" +#include "svnqt/stringarray.h" +#include "svnqt/diffoptions.h" +#include "svnqt/conflictresult.h" class TQStringList; @@ -136,7 +136,7 @@ namespace svn const Revision revision = svn::Revision::HEAD, bool detailed_remote = false, bool hide_externals = false, - const StringArray & changelists=StringArray() ) throw (ClientException) = 0; + const StringArray & changelists=StringArray() ) = 0; /** * Returns the status of a single file in the path. @@ -146,10 +146,10 @@ namespace svn * @param path File to gather status. * @param update if check against repository if new updates are there (for WC only) * @param revision list specific revision when browsing remote, on working copies parameter will ignored - * @return a Status with Statis.isVersioned = FALSE + * @return a Status with Statis.isVersioned = false */ virtual StatusPtr - singleStatus (const Path& path,bool update=false,const Revision revision = svn::Revision::HEAD) throw (ClientException)=0; + singleStatus (const Path& path,bool update=false,const Revision revision = svn::Revision::HEAD)=0; /** * Executes a revision checkout. @@ -169,7 +169,7 @@ namespace svn svn::Depth depth=DepthInfinity, bool ignore_externals=false, bool overwrite=false - ) throw (ClientException) = 0; + ) = 0; /** * relocate wc @a from to @a to @@ -177,7 +177,7 @@ namespace svn */ virtual void relocate (const Path & path, const TQString &from_url, - const TQString &to_url, bool recurse) throw (ClientException)=0; + const TQString &to_url, bool recurse)=0; /** * Sets a single file for deletion. @@ -186,7 +186,7 @@ namespace svn virtual svn::Revision remove (const Path & path, bool force, bool keep_local = true, - const PropertiesMap&revProps = PropertiesMap()) throw (ClientException)=0; + const PropertiesMap&revProps = PropertiesMap())=0; /** * Sets files for deletion. @@ -199,7 +199,7 @@ namespace svn remove (const Targets & targets, bool force, bool keep_local=true, - const PropertiesMap&revProps=PropertiesMap()) throw (ClientException) = 0; + const PropertiesMap&revProps=PropertiesMap()) = 0; /** * Reverts a couple of files to a pristiner state. @@ -209,7 +209,7 @@ namespace svn revert (const Targets & targets, Depth depth, const StringArray&changelist=StringArray() - ) throw (ClientException)=0; + )=0; /** @@ -222,7 +222,7 @@ namespace svn * @exception ClientException */ virtual void - add (const Path & path, svn::Depth depth,bool force=false, bool no_ignore=false, bool add_parents = true) throw (ClientException)=0; + add (const Path & path, svn::Depth depth,bool force=false, bool no_ignore=false, bool add_parents = true)=0; /** * Updates the file or directory. @@ -238,7 +238,7 @@ namespace svn virtual Revisions update (const Targets & path, const Revision & revision, Depth depth,bool ignore_externals,bool allow_unversioned, - bool sticky_depth) throw (ClientException) = 0; + bool sticky_depth) = 0; /** * Retrieves the contents for a specific @a revision of @@ -252,7 +252,7 @@ namespace svn virtual TQByteArray cat (const Path & path, const Revision & revision, - const Revision & peg_revision=svn_opt_revision_unspecified) throw (ClientException)=0; + const Revision & peg_revision=svn_opt_revision_unspecified)=0; /** * Retrieves the contents for a specific @a revision of * a @a path at @a peg_revision @@ -267,7 +267,7 @@ namespace svn cat(svn::stream::SvnStream&buffer, const Path & path, const Revision & revision, - const Revision & peg_revision) throw (ClientException)=0; + const Revision & peg_revision)=0; /** * Retrieves the contents for a specific @a revision of * a @a path at @a peg_revision @@ -282,7 +282,7 @@ namespace svn get (const Path & path, const TQString & target, const Revision & revision, - const Revision & peg_revision=svn_opt_revision_unspecified) throw (ClientException)=0; + const Revision & peg_revision=svn_opt_revision_unspecified)=0; /** * Retrieves the contents for a specific @a revision of @@ -303,7 +303,7 @@ namespace svn const DiffOptions&diffoptions = DiffOptions(), bool ignore_mimetypes = false, bool include_merged_revisions = false - ) throw (ClientException)=0; + )=0; /** * Commits changes to the repository. This usually requires @@ -324,7 +324,7 @@ namespace svn const svn::StringArray&contents=svn::StringArray(), const PropertiesMap&revProps=PropertiesMap(), bool keep_changelist=false - ) throw (ClientException)=0; + )=0; /** * Copies a versioned file with the history preserved. @@ -333,7 +333,7 @@ namespace svn virtual svn::Revision copy (const Path & srcPath, const Revision & srcRevision, - const Path & destPath) throw (ClientException)=0; + const Path & destPath)=0; /** * Copies a versioned file with the history preserved. * @since subversion 1.5 api @@ -345,7 +345,7 @@ namespace svn const Revision & srcRevision, const Revision & pegRevision, const Path & destPath, - bool asChild=false,bool makeParent=false,const PropertiesMap&revProps=PropertiesMap()) throw (ClientException)=0; + bool asChild=false,bool makeParent=false,const PropertiesMap&revProps=PropertiesMap())=0; /** * Moves or renames a file. @@ -354,7 +354,7 @@ namespace svn virtual svn::Revision move (const Path & srcPath, const Path & destPath, - bool force) throw (ClientException)=0; + bool force)=0; /** * Moves or renames a file. * @exception ClientException @@ -362,7 +362,7 @@ namespace svn virtual svn::Revision move (const Targets & srcPath, const Path & destPath, - bool force,bool asChild,bool makeParent,const PropertiesMap&revProps=PropertiesMap()) throw (ClientException)=0; + bool force,bool asChild,bool makeParent,const PropertiesMap&revProps=PropertiesMap())=0; /** * Creates a directory directly in a repository or creates a @@ -381,7 +381,7 @@ namespace svn const TQString& message, bool makeParent=true, const PropertiesMap&revProps=PropertiesMap() - ) throw (ClientException)=0; + )=0; /** * Creates a directory directly in a repository or creates a * directory on disk and schedules it for addition. If <i>path</i> @@ -398,7 +398,7 @@ namespace svn const TQString& message, bool makeParent=true, const PropertiesMap&revProps=PropertiesMap() - ) throw (ClientException)=0; + )=0; /** * Recursively cleans up a local directory, finishing any @@ -407,13 +407,13 @@ namespace svn * @exception ClientException */ virtual void - cleanup (const Path & path) throw (ClientException)=0; + cleanup (const Path & path)=0; /** * Removes the 'conflicted' state on a file. * @exception ClientException */ - virtual void resolve (const Path & path,Depth depth,const ConflictResult&resolution=ConflictResult()) throw (ClientException)=0; + virtual void resolve (const Path & path,Depth depth,const ConflictResult&resolution=ConflictResult())=0; /** * Exports the contents of either a subversion repository into a @@ -439,7 +439,7 @@ namespace svn const TQString&native_eol=TQString(), bool ignore_externals = false, svn::Depth depth=svn::DepthInfinity - ) throw (ClientException)=0; + )=0; /** * Update local copy to mirror a new url. This excapsulates the @@ -455,7 +455,7 @@ namespace svn bool sticky_depth = true, bool ignore_externals=false, bool allow_unversioned=false - ) throw (ClientException)=0; + )=0; /** * Import file or directory PATH into repository directory URL at @@ -473,7 +473,7 @@ namespace svn const TQString& message, svn::Depth depth, bool no_ignore,bool no_unknown_nodetype, - const PropertiesMap&revProps=PropertiesMap()) throw (ClientException)=0; + const PropertiesMap&revProps=PropertiesMap())=0; /** * Merge changes from two paths into a new local path. @@ -488,7 +488,7 @@ namespace svn bool dry_run=false, bool record_only=false, const StringArray&merge_options=StringArray() - ) throw (ClientException)=0; + )=0; virtual void merge_peg(const Path&src, @@ -501,7 +501,7 @@ namespace svn bool force=false, bool record_only=false, const StringArray&merge_options=StringArray() - ) throw (ClientException)=0; + )=0; virtual void merge_peg(const Path&src, @@ -513,7 +513,7 @@ namespace svn bool dry_run=false, bool force=false, const StringArray&merge_options=StringArray() - ) throw (ClientException)=0; + )=0; /** * Retrieve information for the given path @@ -531,7 +531,7 @@ namespace svn const Revision & rev, const Revision & peg_revision=svn_opt_revision_unspecified, const StringArray&changelists=StringArray() - ) throw (ClientException)=0; + )=0; /** * Retrieve log information for the given path @@ -558,7 +558,7 @@ namespace svn bool strictNodeHistory=true,int limit = 0, bool include_merged_revisions = false, const StringArray&revprops=StringArray() - ) throw (ClientException)=0; + )=0; /** * Retrieve log information for the given path @@ -586,7 +586,7 @@ namespace svn bool strictNodeHistory=true,int limit = 0, bool include_merged_revisions = false, const StringArray&revprops=StringArray() - ) throw (ClientException)=0; + )=0; /** * Produce diff output which describes the delta between @@ -618,7 +618,7 @@ namespace svn bool noDiffDeleted,bool ignore_contenttype, const StringArray&extra, const StringArray&changelists - ) throw (ClientException)=0; + )=0; /** * Same as other diff but extra options always set to empty list. @@ -627,7 +627,7 @@ namespace svn diff_peg (const Path & tmpPath, const Path & path,const Path&relativeTo, const Revision & revision1, const Revision & revision2, const Revision& peg_revision, Depth depth, bool ignoreAncestry, - bool noDiffDeleted,bool ignore_contenttype) throw (ClientException)=0; + bool noDiffDeleted,bool ignore_contenttype)=0; /** * Produce diff output which describes the delta between @@ -660,7 +660,7 @@ namespace svn bool noDiffDeleted,bool ignore_contenttype, const StringArray&extra, const StringArray&changelists - ) throw (ClientException)=0; + )=0; /** * Same as other diff but extra options and changelists always set to empty list. @@ -669,7 +669,7 @@ namespace svn diff (const Path & tmpPath, const Path & path1,const Path & path2,const Path&relativeTo, const Revision & revision1, const Revision & revision2, Depth depth, bool ignoreAncestry, - bool noDiffDeleted,bool ignore_contenttype) throw (ClientException)=0; + bool noDiffDeleted,bool ignore_contenttype)=0; /** * lists entries in @a pathOrUrl no matter whether local or @@ -690,7 +690,7 @@ namespace svn list (const Path& pathOrUrl, const Revision& revision, const Revision& peg, - svn::Depth depth,bool retrieve_locks) throw (ClientException)=0; + svn::Depth depth,bool retrieve_locks)=0; /** * lists properties in @a path no matter whether local or @@ -840,7 +840,7 @@ namespace svn virtual void lock (const Targets & targets, const TQString& message, - bool steal_lock) throw (ClientException)=0; + bool steal_lock)=0; /** * unlock files in repository or working copy * @param targets items to unlock @@ -848,7 +848,7 @@ namespace svn */ virtual void unlock (const Targets&targets, - bool break_lock) throw (ClientException)=0; + bool break_lock)=0; virtual void url2Revision(const TQString&revstring, @@ -871,8 +871,3 @@ namespace svn } #endif -/* ----------------------------------------------------------------- - * local variables: - * eval: (load-file "../../rapidsvn-dev.el") - * end: - */ diff --git a/src/svnqt/client_annotate.cpp b/src/svnqt/client_annotate.cpp index 94e5d71..541d07e 100644 --- a/src/svnqt/client_annotate.cpp +++ b/src/svnqt/client_annotate.cpp @@ -1,5 +1,5 @@ /* - * Port for usage with qt-framework and development for tdesvn + * Port for usage with tqt-framework and development for tdesvn * (C) 2005-2007 by Rajko Albrecht * http://tdesvn.alwins-world.de */ @@ -31,8 +31,8 @@ #pragma warning( disable: 4786 )// debug symbol truncated #endif // svncpp -#include "svnqt/client_impl.hpp" -#include "svnqt/svnqt_defines.hpp" +#include "svnqt/client_impl.h" +#include "svnqt/svnqt_defines.h" // Subversion api #include "svn_client.h" @@ -90,7 +90,7 @@ namespace svn const DiffOptions&diffoptions, bool ignore_mimetypes, bool include_merged_revisions - ) throw (ClientException) + ) { Pool pool; svn_error_t *error; diff --git a/src/svnqt/client_cat.cpp b/src/svnqt/client_cat.cpp index 0454642..fd9fabb 100644 --- a/src/svnqt/client_cat.cpp +++ b/src/svnqt/client_cat.cpp @@ -1,5 +1,5 @@ /* - * Port for usage with qt-framework and development for tdesvn + * Port for usage with tqt-framework and development for tdesvn * (C) 2005-2007 by Rajko Albrecht * http://tdesvn.alwins-world.de */ @@ -31,25 +31,25 @@ #pragma warning( disable: 4786 )// debug symbol truncated #endif // svncpp -#include "client_impl.hpp" +#include "client_impl.h" // Subversion api #include "svn_client.h" //#include "svn_io.h" -#include "svnqt/exception.hpp" -#include "svnqt/pool.hpp" -#include "svnqt/status.hpp" -#include "svnqt/svnqt_defines.hpp" -#include "svnqt/svnstream.hpp" -#include "svnqt/svnfilestream.hpp" +#include "svnqt/exception.h" +#include "svnqt/pool.h" +#include "svnqt/status.h" +#include "svnqt/svnqt_defines.h" +#include "svnqt/svnstream.h" +#include "svnqt/svnfilestream.h" namespace svn { TQByteArray Client_impl::cat(const Path & path, const Revision & revision, - const Revision & peg_revision) throw (ClientException) + const Revision & peg_revision) { svn::stream::SvnByteStream buffer(*m_context); svn_error_t * error = internal_cat(path,revision,peg_revision,buffer); @@ -63,7 +63,7 @@ namespace svn Client_impl::cat(svn::stream::SvnStream&buffer, const Path & path, const Revision & revision, - const Revision & peg_revision) throw (ClientException) + const Revision & peg_revision) { svn_error_t * error = internal_cat(path,revision,peg_revision,buffer); if (error != 0) @@ -74,7 +74,7 @@ namespace svn Client_impl::get (const Path & path, const TQString & target, const Revision & revision, - const Revision & peg_revision) throw (ClientException) + const Revision & peg_revision) { svn::stream::SvnFileOStream buffer(target,*m_context); svn_error_t * error = internal_cat(path,revision,peg_revision,buffer); @@ -97,9 +97,3 @@ namespace svn } } - -/* ----------------------------------------------------------------- - * local variables: - * eval: (load-file "../../rapidsvn-dev.el") - * end: - */ diff --git a/src/svnqt/client_diff.cpp b/src/svnqt/client_diff.cpp index 9229a45..de5bc75 100644 --- a/src/svnqt/client_diff.cpp +++ b/src/svnqt/client_diff.cpp @@ -1,5 +1,5 @@ /* - * Port for usage with qt-framework and development for tdesvn + * Port for usage with tqt-framework and development for tdesvn * (C) 2005-2007 by Rajko Albrecht * http://tdesvn.alwins-world.de */ @@ -31,18 +31,18 @@ #pragma warning( disable: 4786 )// debug symbol truncated #endif // svncpp -#include "svnqt/client_impl.hpp" +#include "svnqt/client_impl.h" // Subversion api #include "svn_client.h" #include "svn_path.h" -#include "svnqt/exception.hpp" -#include "svnqt/pool.hpp" -#include "svnqt/status.hpp" -#include "svnqt/svnqt_defines.hpp" -#include "svnqt/helper.hpp" -#include "diff_data.hpp" +#include "svnqt/exception.h" +#include "svnqt/pool.h" +#include "svnqt/status.h" +#include "svnqt/svnqt_defines.h" +#include "svnqt/helper.h" +#include "diff_data.h" #include <tqfile.h> #include <tqstringlist.h> @@ -55,7 +55,7 @@ namespace svn Client_impl::diff_peg (const Path & tmpPath, const Path & path,const Path&relativeTo, const Revision & revision1, const Revision & revision2, const Revision& peg_revision, Depth depth, const bool ignoreAncestry, - const bool noDiffDeleted,const bool ignore_contenttype) throw (ClientException) + const bool noDiffDeleted,const bool ignore_contenttype) { return diff_peg(tmpPath,path,relativeTo, revision1,revision2,peg_revision, @@ -68,7 +68,7 @@ namespace svn const Revision & revision1, const Revision & revision2, const Revision& peg_revision, Depth depth, const bool ignoreAncestry, const bool noDiffDeleted,const bool ignore_contenttype, - const StringArray&extra,const StringArray&changelists) throw (ClientException) + const StringArray&extra,const StringArray&changelists) { Pool pool; svn_error_t * error; @@ -119,7 +119,7 @@ namespace svn Client_impl::diff (const Path & tmpPath, const Path & path1,const Path&path2,const Path&relativeTo, const Revision & revision1, const Revision & revision2, Depth depth, const bool ignoreAncestry, - const bool noDiffDeleted,const bool ignore_contenttype) throw (ClientException) + const bool noDiffDeleted,const bool ignore_contenttype) { return diff(tmpPath,path1,path2,relativeTo, revision1,revision2, @@ -132,7 +132,7 @@ namespace svn const Revision & revision1, const Revision & revision2, Depth depth, const bool ignoreAncestry, const bool noDiffDeleted,const bool ignore_contenttype, - const StringArray&extra,const StringArray&changelists) throw (ClientException) + const StringArray&extra,const StringArray&changelists) { Pool pool; @@ -176,9 +176,3 @@ namespace svn } } - -/* ----------------------------------------------------------------- - * local variables: - * eval: (load-file "../../rapidsvn-dev.el") - * end: - */ diff --git a/src/svnqt/client_impl.cpp b/src/svnqt/client_impl.cpp index d138016..ced414c 100644 --- a/src/svnqt/client_impl.cpp +++ b/src/svnqt/client_impl.cpp @@ -1,5 +1,5 @@ /* - * Port for usage with qt-framework and development for tdesvn + * Port for usage with tqt-framework and development for tdesvn * (C) 2005-2007 by Rajko Albrecht * http://tdesvn.alwins-world.de */ @@ -32,9 +32,9 @@ #endif // svncpp -#include "svnqt/client_impl.hpp" +#include "svnqt/client_impl.h" #include "svn_opt.h" -#include "svnqt/svnqt_defines.hpp" +#include "svnqt/svnqt_defines.h" #include <tqmap.h> #include <tqstringlist.h> @@ -52,7 +52,7 @@ apr_array_header_t* svn_sort__hash(apr_hash_t *ht, ary = apr_array_make(pool, apr_hash_count(ht), sizeof(svn_sort_item_type)); /* loop over hash table and push all keys into the array */ - sorted = TRUE; + sorted = true; prev_item = NULL; for (hi = apr_hash_first(pool, ht); hi; hi = apr_hash_next(hi)) { @@ -156,9 +156,3 @@ namespace svn return hash; } } - -/* ----------------------------------------------------------------- - * local variables: - * eval: (load-file "../../rapidsvn-dev.el") - * end: - */ diff --git a/src/svnqt/client_impl.hpp b/src/svnqt/client_impl.h index 4760e39..b7baadf 100644 --- a/src/svnqt/client_impl.hpp +++ b/src/svnqt/client_impl.h @@ -1,5 +1,5 @@ /* - * Port for usage with qt-framework and development for tdesvn + * Port for usage with tqt-framework and development for tdesvn * (C) 2005-2007 by Rajko Albrecht * http://tdesvn.alwins-world.de */ @@ -34,8 +34,8 @@ #include "svn_sorts.h" #include <svn_version.h> -#include "svnqt/client.hpp" -#include "svnqt/svnqt_defines.hpp" +#include "svnqt/client.h" +#include "svnqt/svnqt_defines.h" // Ignore MSVC 6 compiler warning: debug symbol truncated #if defined (_MSC_VER) && _MSC_VER <= 1200 @@ -126,7 +126,7 @@ namespace svn const Revision revision = svn::Revision::HEAD, bool detailed_remote = false, bool hide_externals = false, - const StringArray & changelists=StringArray()) throw (ClientException); + const StringArray & changelists=StringArray()); /** * Returns the status of a single file in the path. @@ -136,10 +136,10 @@ namespace svn * @param path File to gather status. * @param update if check against repository if new updates are there (for WC only) * @param revision list specific revision when browsing remote, on working copies parameter will ignored - * @return a Status with Statis.isVersioned = FALSE + * @return a Status with Statis.isVersioned = false */ virtual StatusPtr - singleStatus (const Path& path,bool update=false,const Revision revision = svn::Revision::HEAD) throw (ClientException); + singleStatus (const Path& path,bool update=false,const Revision revision = svn::Revision::HEAD); /** * Executes a revision checkout. @@ -159,7 +159,7 @@ namespace svn svn::Depth depth=DepthInfinity, bool ignore_externals=false, bool overwrite=false - ) throw (ClientException); + ); /** * relocate wc @a from to @a to @@ -167,7 +167,7 @@ namespace svn */ virtual void relocate (const Path & path, const TQString &from_url, - const TQString &to_url, bool recurse) throw (ClientException); + const TQString &to_url, bool recurse); /** * Sets a single file for deletion. @@ -176,7 +176,7 @@ namespace svn virtual svn::Revision remove (const Path & path, bool force, bool keep_local = true, - const PropertiesMap&revProps = PropertiesMap()) throw (ClientException); + const PropertiesMap&revProps = PropertiesMap()); /** * Sets files for deletion. @@ -189,7 +189,7 @@ namespace svn remove (const Targets & targets, bool force, bool keep_local = true, - const PropertiesMap&revProps = PropertiesMap()) throw (ClientException); + const PropertiesMap&revProps = PropertiesMap()); /** * Reverts a couple of files to a pristiner state. @@ -199,7 +199,7 @@ namespace svn revert (const Targets & targets, Depth depth, const StringArray&changelist=StringArray() - ) throw (ClientException); + ); /** @@ -212,7 +212,7 @@ namespace svn * @exception ClientException * @sa svn::Depth */ - virtual void add (const Path & path, svn::Depth depth,bool force=false, bool no_ignore=false, bool add_parents = true) throw (ClientException); + virtual void add (const Path & path, svn::Depth depth,bool force=false, bool no_ignore=false, bool add_parents = true); /** * Updates the file or directory. @@ -228,7 +228,7 @@ namespace svn virtual Revisions update (const Targets & path, const Revision & revision, Depth depth,bool ignore_externals,bool allow_unversioned, - bool sticky_depth) throw (ClientException); + bool sticky_depth); /** * Retrieves the contents for a specific @a revision of @@ -243,7 +243,7 @@ namespace svn virtual TQByteArray cat (const Path & path, const Revision & revision, - const Revision & peg_revision=svn_opt_revision_unspecified) throw (ClientException); + const Revision & peg_revision=svn_opt_revision_unspecified); /** * Retrieves the contents for a specific @a revision of * a @a path at @a peg_revision @@ -258,7 +258,7 @@ namespace svn cat(svn::stream::SvnStream&buffer, const Path & path, const Revision & revision, - const Revision & peg_revision) throw (ClientException); + const Revision & peg_revision); /** * Retrieves the contents for a specific @a revision of @@ -274,7 +274,7 @@ namespace svn get (const Path & path, const TQString & target, const Revision & revision, - const Revision & peg_revision=svn_opt_revision_unspecified) throw (ClientException); + const Revision & peg_revision=svn_opt_revision_unspecified); /** * Retrieves the contents for a specific @a revision of @@ -295,7 +295,7 @@ namespace svn const DiffOptions&diffoptions = DiffOptions(), bool ignore_mimetypes = false, bool include_merged_revisions = false - ) throw (ClientException); + ); /** * Commits changes to the repository. This usually requires @@ -316,7 +316,7 @@ namespace svn const svn::StringArray&changelist=svn::StringArray(), const PropertiesMap&revProps=PropertiesMap(), bool keep_changelist=false - ) throw (ClientException); + ); /** * Copies a versioned file with the history preserved. @@ -325,7 +325,7 @@ namespace svn virtual svn::Revision copy (const Path & srcPath, const Revision & srcRevision, - const Path & destPath) throw (ClientException); + const Path & destPath); /** * Copies a versioned file with the history preserved. * @since subversion 1.5 api @@ -337,7 +337,7 @@ namespace svn const Revision & srcRevision, const Revision & pegRevision, const Path & destPath, - bool asChild=false,bool makeParent=false,const PropertiesMap&revProps=PropertiesMap()) throw (ClientException); + bool asChild=false,bool makeParent=false,const PropertiesMap&revProps=PropertiesMap()); /** * Moves or renames a file. @@ -346,7 +346,7 @@ namespace svn virtual svn::Revision move (const Path & srcPath, const Path & destPath, - bool force) throw (ClientException); + bool force); /** * Moves or renames a file. @@ -355,7 +355,7 @@ namespace svn virtual svn::Revision move (const Targets & srcPath, const Path & destPath, - bool force,bool asChild,bool makeParent,const PropertiesMap&revProps=PropertiesMap()) throw (ClientException); + bool force,bool asChild,bool makeParent,const PropertiesMap&revProps=PropertiesMap()); /** * Creates a directory directly in a repository or creates a @@ -372,7 +372,7 @@ namespace svn const TQString& message, bool makeParent=true, const PropertiesMap&revProps=PropertiesMap() - ) throw (ClientException); + ); /** * Creates a directory directly in a repository or creates a * directory on disk and schedules it for addition. If <i>path</i> @@ -388,7 +388,7 @@ namespace svn const TQString& message, bool makeParent=true, const PropertiesMap&revProps=PropertiesMap() - ) throw (ClientException); + ); /** * Recursively cleans up a local directory, finishing any @@ -397,13 +397,13 @@ namespace svn * @exception ClientException */ virtual void - cleanup (const Path & path) throw (ClientException); + cleanup (const Path & path); /** * Removes the 'conflicted' state on a file. * @exception ClientException */ - virtual void resolve (const Path & path,Depth depth,const ConflictResult&resolution=ConflictResult()) throw (ClientException); + virtual void resolve (const Path & path,Depth depth,const ConflictResult&resolution=ConflictResult()); /** * Exports the contents of either a subversion repository into a @@ -428,7 +428,7 @@ namespace svn const TQString&native_eol=TQString(), bool ignore_externals = false, svn::Depth depth=svn::DepthInfinity - ) throw (ClientException); + ); /** * Update local copy to mirror a new url. This excapsulates the @@ -444,7 +444,7 @@ namespace svn bool sticky_depth = true, bool ignore_externals=false, bool allow_unversioned=false - ) throw (ClientException); + ); /** * Import file or directory PATH into repository directory URL at @@ -462,7 +462,7 @@ namespace svn const TQString& message, svn::Depth depth, bool no_ignore,bool no_unknown_nodetype, - const PropertiesMap&revProps=PropertiesMap()) throw (ClientException); + const PropertiesMap&revProps=PropertiesMap()); /** * Merge changes from two paths into a new local path. @@ -477,7 +477,7 @@ namespace svn bool dry_run=false, bool record_only=false, const StringArray&merge_options=StringArray() - ) throw (ClientException); + ); virtual void merge_peg(const Path&src, @@ -490,7 +490,7 @@ namespace svn bool force=false, bool record_only=false, const StringArray&merge_options=StringArray() - ) throw (ClientException); + ); virtual void merge_peg(const Path&src, @@ -502,7 +502,7 @@ namespace svn bool dry_run, bool force, const StringArray&merge_options - ) throw (ClientException); + ); /** * Retrieve information for the given path @@ -522,7 +522,7 @@ namespace svn const Revision & rev, const Revision & peg_revision=svn_opt_revision_unspecified, const StringArray&changelists=StringArray() - ) throw (ClientException); + ); /** * Retrieve log information for the given path * Loads the log messages result set. The first @@ -549,7 +549,7 @@ namespace svn bool strictNodeHistory=true,int limit=0, bool include_merged_revisions = false, const StringArray&revprops=StringArray() - ) throw (ClientException); + ); /** * Retrieve log information for the given path * Loads the log messages result set. Result will stored @@ -577,7 +577,7 @@ namespace svn bool strictNodeHistory,int limit, bool include_merged_revisions = false, const StringArray&revprops=StringArray() - ) throw (ClientException); + ); /** * Produce diff output which describes the delta between @@ -610,7 +610,7 @@ namespace svn const StringArray&extra, const StringArray&changelists ) - throw (ClientException); + ; /** * Same as other diff but extra options and changelists always set to empty list. @@ -620,7 +620,7 @@ namespace svn const Revision & revision1, const Revision & revision2, const Revision& peg_revision, Depth depth, bool ignoreAncestry, bool noDiffDeleted,bool ignore_contenttype) - throw (ClientException); + ; /** * Produce diff output which describes the delta between @@ -654,7 +654,7 @@ namespace svn const StringArray&extra, const StringArray&changelists ) - throw (ClientException); + ; /** * Same as other diff but extra options always set to empty list. @@ -664,7 +664,7 @@ namespace svn const Revision & revision1, const Revision & revision2, Depth depth, bool ignoreAncestry, bool noDiffDeleted,bool ignore_contenttype) - throw (ClientException); + ; /** * lists entries in @a pathOrUrl no matter whether local or @@ -682,7 +682,7 @@ namespace svn list (const Path& pathOrUrl, const Revision& revision, const Revision& peg, - svn::Depth depth,bool retrieve_locks) throw (ClientException); + svn::Depth depth,bool retrieve_locks); /** * lists properties in @a path no matter whether local or @@ -830,7 +830,7 @@ namespace svn virtual void lock (const Targets & targets, const TQString& message, - bool steal_lock) throw (ClientException); + bool steal_lock); /** * unlock files in repository or working copy * @param targets items to unlock @@ -838,7 +838,7 @@ namespace svn */ virtual void unlock (const Targets&targets, - bool break_lock) throw (ClientException); + bool break_lock); virtual void url2Revision(const TQString&revstring, @@ -875,12 +875,12 @@ namespace svn list_simple(const Path& pathOrUrl, const Revision& revision, const Revision& peg, - bool recurse) throw (ClientException); + bool recurse); DirEntries list_locks(const Path& pathOrUrl, const Revision& revision, const Revision& peg, - bool recurse) throw (ClientException); + bool recurse); svn_error_t * internal_cat(const Path & path, const Revision & revision, @@ -893,8 +893,3 @@ namespace svn } #endif -/* ----------------------------------------------------------------- - * local variables: - * eval: (load-file "../../rapidsvn-dev.el") - * end: - */ diff --git a/src/svnqt/client_lock.cpp b/src/svnqt/client_lock.cpp index 830f215..18357d5 100644 --- a/src/svnqt/client_lock.cpp +++ b/src/svnqt/client_lock.cpp @@ -18,15 +18,15 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ // svncpp -#include "client_impl.hpp" +#include "client_impl.h" // subversion api #include "svn_client.h" -#include "svnqt/exception.hpp" -#include "svnqt/pool.hpp" -#include "svnqt/targets.hpp" -#include "svnqt/svnqt_defines.hpp" +#include "svnqt/exception.h" +#include "svnqt/pool.h" +#include "svnqt/targets.h" +#include "svnqt/svnqt_defines.h" namespace svn { @@ -34,7 +34,7 @@ namespace svn void Client_impl::lock (const Targets & targets, const TQString& message, - bool steal_lock) throw (ClientException) + bool steal_lock) { Pool pool; svn_error_t * error = @@ -49,7 +49,7 @@ namespace svn void Client_impl::unlock (const Targets&targets, - bool break_lock) throw (ClientException) + bool break_lock) { Pool pool; svn_error_t * error = diff --git a/src/svnqt/client_ls.cpp b/src/svnqt/client_ls.cpp index 054274c..477b856 100644 --- a/src/svnqt/client_ls.cpp +++ b/src/svnqt/client_ls.cpp @@ -1,5 +1,5 @@ /* - * Port for usage with qt-framework and development for tdesvn + * Port for usage with tqt-framework and development for tdesvn * (C) 2005-2007 by Rajko Albrecht * http://tdesvn.alwins-world.de */ @@ -33,18 +33,18 @@ // svncpp -#include "svnqt/client_impl.hpp" +#include "svnqt/client_impl.h" // subversion api #include "svn_client.h" #include "svn_path.h" //#include "svn_utf.h" -#include "svnqt/dirent.hpp" -#include "svnqt/exception.hpp" -#include "svnqt/svnqt_defines.hpp" +#include "svnqt/dirent.h" +#include "svnqt/exception.h" +#include "svnqt/svnqt_defines.h" -#include "svnqt/helper.hpp" +#include "svnqt/helper.h" namespace svn { @@ -53,7 +53,7 @@ namespace svn Client_impl::list_simple(const Path& _p, const Revision& revision, const Revision& peg, - bool recurse) throw (ClientException) + bool recurse) { Pool pool; @@ -102,7 +102,7 @@ namespace svn Client_impl::list_locks(const Path& pathOrUrl, const Revision& revision, const Revision& peg, - bool recurse) throw (ClientException) + bool recurse) { Pool pool; @@ -174,7 +174,7 @@ namespace svn Client_impl::list(const Path& pathOrUrl, const Revision& revision, const Revision& peg, - Depth depth,bool retrieve_locks) throw (ClientException) + Depth depth,bool retrieve_locks) { #if ((SVN_VER_MAJOR == 1) && (SVN_VER_MINOR >= 4)) || (SVN_VER_MAJOR > 1) @@ -222,9 +222,3 @@ namespace svn #endif } } - -/* ----------------------------------------------------------------- - * local variables: - * eval: (load-file "../../rapidsvn-dev.el") - * end: - */ diff --git a/src/svnqt/client_merge.cpp b/src/svnqt/client_merge.cpp index 0d84cc2..feb846c 100644 --- a/src/svnqt/client_merge.cpp +++ b/src/svnqt/client_merge.cpp @@ -1,15 +1,15 @@ -#include "svnqt/client_impl.hpp" +#include "svnqt/client_impl.h" // subversion api #include "svn_client.h" -#include "svnqt/exception.hpp" -#include "svnqt/pool.hpp" -#include "svnqt/targets.hpp" -#include "svnqt/svnqt_defines.hpp" -#include "svnqt/stringarray.hpp" +#include "svnqt/exception.h" +#include "svnqt/pool.h" +#include "svnqt/targets.h" +#include "svnqt/svnqt_defines.h" +#include "svnqt/stringarray.h" -#include "svnqt/helper.hpp" +#include "svnqt/helper.h" namespace svn { @@ -22,7 +22,7 @@ void Client_impl::merge (const Path & path1, const Revision & revision1, bool dry_run, bool record_only, const StringArray&merge_options - ) throw (ClientException) + ) { Pool pool; svn_error_t * error = 0; @@ -87,7 +87,7 @@ void Client_impl::merge (const Path & path1, const Revision & revision1, bool force, bool record_only, const StringArray&merge_options - ) throw (ClientException) + ) { #if ((SVN_VER_MAJOR == 1) && (SVN_VER_MINOR >= 5)) || (SVN_VER_MAJOR > 1) Pool pool; @@ -129,7 +129,7 @@ void Client_impl::merge (const Path & path1, const Revision & revision1, bool dry_run, bool force, const StringArray&merge_options - ) throw (ClientException) + ) { #if ((SVN_VER_MAJOR == 1) && (SVN_VER_MINOR >= 5)) || (SVN_VER_MAJOR > 1) RevisionRanges ranges; diff --git a/src/svnqt/client_modify.cpp b/src/svnqt/client_modify.cpp index 3d12dbd..6e55f39 100644 --- a/src/svnqt/client_modify.cpp +++ b/src/svnqt/client_modify.cpp @@ -1,5 +1,5 @@ /* - * Port for usage with qt-framework and development for tdesvn + * Port for usage with tqt-framework and development for tdesvn * (C) 2005-2007 by Rajko Albrecht * http://tdesvn.alwins-world.de */ @@ -31,18 +31,18 @@ #pragma warning( disable: 4786 )// debug symbol truncated #endif // svncpp -#include "svnqt/client_impl.hpp" +#include "svnqt/client_impl.h" // subversion api #include "svn_client.h" -#include "svnqt/exception.hpp" -#include "svnqt/pool.hpp" -#include "svnqt/targets.hpp" -#include "svnqt/svnqt_defines.hpp" -#include "svnqt/stringarray.hpp" +#include "svnqt/exception.h" +#include "svnqt/pool.h" +#include "svnqt/targets.h" +#include "svnqt/svnqt_defines.h" +#include "svnqt/stringarray.h" -#include "svnqt/helper.hpp" +#include "svnqt/helper.h" namespace svn { @@ -53,7 +53,7 @@ namespace svn svn::Depth depth, bool ignore_externals, bool overwrite - ) throw (ClientException) + ) { Pool subPool; svn_revnum_t revnum = 0; @@ -90,7 +90,7 @@ namespace svn Revision Client_impl::remove (const Path & path,bool force, bool keep_local, - const PropertiesMap&revProps) throw (ClientException) + const PropertiesMap&revProps) { Targets targets (path.path()); return remove(targets,force,keep_local,revProps); @@ -101,7 +101,7 @@ namespace svn bool force, bool keep_local, const PropertiesMap&revProps - ) throw (ClientException) + ) { Pool pool; @@ -141,7 +141,7 @@ namespace svn Client_impl::revert (const Targets & targets, Depth depth, const StringArray&changelist - ) throw (ClientException) + ) { Pool pool; @@ -169,7 +169,7 @@ namespace svn void Client_impl::add (const Path & path, - svn::Depth depth,bool force, bool no_ignore, bool add_parents) throw (ClientException) + svn::Depth depth,bool force, bool no_ignore, bool add_parents) { Pool pool; #if ((SVN_VER_MAJOR == 1) && (SVN_VER_MINOR >= 5)) || (SVN_VER_MAJOR > 1) @@ -202,7 +202,7 @@ namespace svn bool ignore_externals, bool allow_unversioned, bool sticky_depth - ) throw (ClientException) + ) { Pool pool; Revisions resulting; @@ -241,7 +241,7 @@ namespace svn svn::Depth depth,bool keep_locks, const svn::StringArray&changelist, const PropertiesMap&revProps, - bool keep_changelist) throw (ClientException) + bool keep_changelist) { Pool pool; @@ -292,7 +292,7 @@ namespace svn const Path & destPath, bool asChild,bool makeParent, const PropertiesMap&revProps - ) throw (ClientException) + ) { if (srcPaths.size()<1) { @@ -351,7 +351,7 @@ namespace svn Revision Client_impl::copy (const Path & srcPath, const Revision & srcRevision, - const Path & destPath) throw (ClientException) + const Path & destPath) { #if ((SVN_VER_MAJOR == 1) && (SVN_VER_MINOR >= 5)) || (SVN_VER_MAJOR > 1) return copy(srcPath,srcRevision,srcRevision,destPath,true,false); @@ -379,7 +379,7 @@ namespace svn svn::Revision Client_impl::move (const Path & srcPath, const Path & destPath, - bool force) throw (ClientException) + bool force) { #if ((SVN_VER_MAJOR == 1) && (SVN_VER_MINOR >= 5)) || (SVN_VER_MAJOR > 1) @@ -416,7 +416,7 @@ namespace svn bool force, bool asChild, bool makeParent, - const PropertiesMap&revProps) throw (ClientException) + const PropertiesMap&revProps) { #if ((SVN_VER_MAJOR == 1) && (SVN_VER_MINOR >= 5)) || (SVN_VER_MAJOR > 1) Pool pool; @@ -467,7 +467,7 @@ namespace svn const TQString& message, bool makeParent, const PropertiesMap&revProps - ) throw (ClientException) + ) { Targets targets(path.path()); return mkdir(targets,message,makeParent,revProps); @@ -478,7 +478,7 @@ namespace svn const TQString&msg, bool makeParent, const PropertiesMap&revProps - ) throw (ClientException) + ) { Pool pool; m_context->setLogMessage(msg); @@ -515,7 +515,7 @@ namespace svn } void - Client_impl::cleanup (const Path & path) throw (ClientException) + Client_impl::cleanup (const Path & path) { Pool subPool; apr_pool_t * apr_pool = subPool.pool (); @@ -527,7 +527,7 @@ namespace svn throw ClientException (error); } - void Client_impl::resolve(const Path & path,Depth depth,const ConflictResult&resolution) throw (ClientException) + void Client_impl::resolve(const Path & path,Depth depth,const ConflictResult&resolution) { Pool pool; #if ((SVN_VER_MAJOR == 1) && (SVN_VER_MINOR >= 5)) || (SVN_VER_MAJOR > 1) @@ -556,7 +556,7 @@ namespace svn bool overwrite, const TQString&native_eol, bool ignore_externals, - svn::Depth depth) throw (ClientException) + svn::Depth depth) { Pool pool; svn_revnum_t revnum = 0; @@ -608,7 +608,7 @@ namespace svn bool sticky_depth, bool ignore_externals, bool allow_unversioned - ) throw (ClientException) + ) { Pool pool; svn_revnum_t revnum = 0; @@ -655,7 +655,7 @@ namespace svn svn::Depth depth, bool no_ignore,bool no_unknown_nodetype, const PropertiesMap&revProps - ) throw (ClientException) + ) { svn_commit_info_t *commit_info = NULL; @@ -698,7 +698,7 @@ namespace svn Client_impl::relocate (const Path & path, const TQString& from_url, const TQString& to_url, - bool recurse) throw (ClientException) + bool recurse) { Pool pool; svn_error_t * error = @@ -714,9 +714,3 @@ namespace svn } } - -/* ----------------------------------------------------------------- - * local variables: - * eval: (load-file "../../rapidsvn-dev.el") - * end: - */ diff --git a/src/svnqt/client_property.cpp b/src/svnqt/client_property.cpp index 172a453..e217e2f 100644 --- a/src/svnqt/client_property.cpp +++ b/src/svnqt/client_property.cpp @@ -1,5 +1,5 @@ /* - * Port for usage with qt-framework and development for tdesvn + * Port for usage with tqt-framework and development for tdesvn * (C) 2005-2007 by Rajko Albrecht * http://tdesvn.alwins-world.de */ @@ -31,19 +31,19 @@ #pragma warning( disable: 4786 )// debug symbol truncated #endif // svncpp -#include "svnqt/client_impl.hpp" +#include "svnqt/client_impl.h" // subversion api #include "svn_client.h" //#include "svn_utf.h" -#include "svnqt/path.hpp" -#include "svnqt/exception.hpp" -#include "svnqt/pool.hpp" -#include "svnqt/revision.hpp" -#include "svnqt/svnqt_defines.hpp" +#include "svnqt/path.h" +#include "svnqt/exception.h" +#include "svnqt/pool.h" +#include "svnqt/revision.h" +#include "svnqt/svnqt_defines.h" -#include "svnqt/helper.hpp" +#include "svnqt/helper.h" namespace svn @@ -442,9 +442,3 @@ namespace svn } } - -/* ----------------------------------------------------------------- - * local variables: - * eval: (load-file "../../rapidsvn-dev.el") - * end: - */ diff --git a/src/svnqt/client_status.cpp b/src/svnqt/client_status.cpp index 4b437a3..7460745 100644 --- a/src/svnqt/client_status.cpp +++ b/src/svnqt/client_status.cpp @@ -1,5 +1,5 @@ /* - * Port for usage with qt-framework and development for tdesvn + * Port for usage with tqt-framework and development for tdesvn * (C) 2005-2008 by Rajko Albrecht * http://tdesvn.alwins-world.de */ @@ -33,23 +33,23 @@ // svncpp -#include "svnqt/client_impl.hpp" -#include "svnqt/helper.hpp" +#include "svnqt/client_impl.h" +#include "svnqt/helper.h" // Subversion api #include "svn_client.h" #include "svn_path.h" //#include "svn_utf.h" -#include "svnqt/dirent.hpp" -#include "svnqt/exception.hpp" -#include "svnqt/pool.hpp" -#include "svnqt/status.hpp" -#include "svnqt/targets.hpp" -#include "svnqt/info_entry.hpp" -#include "svnqt/url.hpp" -#include "svnqt/svnqt_defines.hpp" -#include "svnqt/context_listener.hpp" +#include "svnqt/dirent.h" +#include "svnqt/exception.h" +#include "svnqt/pool.h" +#include "svnqt/status.h" +#include "svnqt/targets.h" +#include "svnqt/info_entry.h" +#include "svnqt/url.h" +#include "svnqt/svnqt_defines.h" +#include "svnqt/context_listener.h" namespace svn { @@ -398,7 +398,7 @@ namespace svn const Revision revision, bool detailed_remote, const bool hide_externals, - const StringArray & changelists) throw (ClientException) + const StringArray & changelists) { if (Url::isValid (path.path())) { return remoteStatus (this, path, depth, get_all, update, @@ -483,7 +483,7 @@ namespace svn } StatusPtr - Client_impl::singleStatus (const Path& path,bool update,const Revision revision) throw (ClientException) + Client_impl::singleStatus (const Path& path,bool update,const Revision revision) { if (Url::isValid (path.path())) return remoteSingleStatus (this, path,revision, m_context); @@ -500,7 +500,7 @@ namespace svn bool strictNodeHistory,int limit, bool include_merged_revisions, const StringArray&revprops - ) throw (ClientException) + ) { Targets target(path); Pool pool; @@ -573,7 +573,7 @@ namespace svn bool strictNodeHistory,int limit, bool include_merged_revisions, const StringArray&revprops - ) throw (ClientException) + ) { Targets target(path); Pool pool; @@ -647,7 +647,7 @@ namespace svn const Revision & rev, const Revision & peg_revision, const StringArray&changelists - ) throw (ClientException) + ) { InfoEntries ientries; @@ -727,9 +727,3 @@ namespace svn } } - -/* ----------------------------------------------------------------- - * local variables: - * eval: (load-file "../../rapidsvn-dev.el") - * end: - */ 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/commititem.cpp b/src/svnqt/commititem.cpp index e39a2c4..8f9a5d6 100644 --- a/src/svnqt/commititem.cpp +++ b/src/svnqt/commititem.cpp @@ -17,7 +17,7 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include "commititem.hpp" +#include "commititem.h" #include <svn_client.h> #include <svn_props.h> diff --git a/src/svnqt/commititem.hpp b/src/svnqt/commititem.h index 5951e6f..3b65df5 100644 --- a/src/svnqt/commititem.hpp +++ b/src/svnqt/commititem.h @@ -20,7 +20,7 @@ #ifndef SVNCOMMITITEM_H #define SVNCOMMITITEM_H -#include "client.hpp" +#include "client.h" #include <svn_types.h> #include <apr.h> diff --git a/src/svnqt/conflictdescription.cpp b/src/svnqt/conflictdescription.cpp index 2ccaf38..1dc4e5d 100644 --- a/src/svnqt/conflictdescription.cpp +++ b/src/svnqt/conflictdescription.cpp @@ -17,8 +17,8 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include "conflictdescription.hpp" -#include "svnqt_defines.hpp" +#include "conflictdescription.h" +#include "svnqt_defines.h" #include <svn_wc.h> diff --git a/src/svnqt/conflictdescription.hpp b/src/svnqt/conflictdescription.h index f7e0ea7..1944827 100644 --- a/src/svnqt/conflictdescription.hpp +++ b/src/svnqt/conflictdescription.h @@ -22,8 +22,8 @@ struct svn_wc_conflict_description_t; -#include "svnqt/pool.hpp" -#include "svnqt/svnqt_defines.hpp" +#include "svnqt/pool.h" +#include "svnqt/svnqt_defines.h" #include <svn_types.h> #include <tqstring.h> diff --git a/src/svnqt/conflictresult.cpp b/src/svnqt/conflictresult.cpp index 798ebf6..f65bec2 100644 --- a/src/svnqt/conflictresult.cpp +++ b/src/svnqt/conflictresult.cpp @@ -18,9 +18,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include "conflictresult.hpp" +#include "conflictresult.h" -#include "svnqt_defines.hpp" +#include "svnqt_defines.h" #include <svn_wc.h> diff --git a/src/svnqt/conflictresult.hpp b/src/svnqt/conflictresult.h index 917b79a..50222a2 100644 --- a/src/svnqt/conflictresult.hpp +++ b/src/svnqt/conflictresult.h @@ -23,8 +23,8 @@ struct svn_wc_conflict_result_t; -#include "svnqt/pool.hpp" -#include "svnqt/svnqt_defines.hpp" +#include "svnqt/pool.h" +#include "svnqt/svnqt_defines.h" #include <svn_types.h> #include <tqstring.h> diff --git a/src/svnqt/context.cpp b/src/svnqt/context.cpp index 7c993ca..5ff7dea 100644 --- a/src/svnqt/context.cpp +++ b/src/svnqt/context.cpp @@ -1,5 +1,5 @@ /* - * Port for usage with qt-framework and development for tdesvn + * Port for usage with tqt-framework and development for tdesvn * (C) 2005-2007 by Rajko Albrecht * http://tdesvn.alwins-world.de */ @@ -38,10 +38,10 @@ //#include "svn_utf.h" // svncpp -#include "apr.hpp" -#include "context.hpp" -#include "context_listener.hpp" -#include "contextdata.hpp" +#include "apr.h" +#include "context.h" +#include "context_listener.h" +#include "contextdata.h" namespace svn { @@ -128,9 +128,3 @@ namespace svn m->reset(); } } - -/* ----------------------------------------------------------------- - * local variables: - * eval: (load-file "../../rapidsvn-dev.el") - * end: - */ diff --git a/src/svnqt/context.hpp b/src/svnqt/context.h index 6bb4ad0..00b9aa4 100644 --- a/src/svnqt/context.hpp +++ b/src/svnqt/context.h @@ -1,5 +1,5 @@ /* - * Port for usage with qt-framework and development for tdesvn + * Port for usage with tqt-framework and development for tdesvn * (C) 2005-2007 by Rajko Albrecht * http://tdesvn.alwins-world.de */ @@ -31,17 +31,17 @@ #ifndef _SVNCPP_CONTEXT_HPP_ #define _SVNCPP_CONTEXT_HPP_ -#include "svnqt/svnqt_defines.hpp" +#include "svnqt/svnqt_defines.h" -// qt +// tqt #include <tqstring.h> // Subversion api #include "svn_client.h" // svncpp -#include "svnqt/pool.hpp" -#include "svnqt/smart_pointer.hpp" +#include "svnqt/pool.h" +#include "svnqt/smart_pointer.h" namespace svn @@ -169,8 +169,3 @@ namespace svn } #endif -/* ----------------------------------------------------------------- - * local variables: - * eval: (load-file "../../rapidsvn-dev.el") - * end: - */ diff --git a/src/svnqt/context_listener.hpp b/src/svnqt/context_listener.h index df94c42..b2b42fe 100644 --- a/src/svnqt/context_listener.hpp +++ b/src/svnqt/context_listener.h @@ -1,5 +1,5 @@ /* - * Port for usage with qt-framework and development for tdesvn + * Port for usage with tqt-framework and development for tdesvn * (C) 2005-2007 by Rajko Albrecht * http://tdesvn.alwins-world.de */ @@ -32,10 +32,10 @@ #define _SVNCPP_CONTEXT_LISTENER_HPP_ // svncpp -#include "pool.hpp" -#include "commititem.hpp" -#include "svnqt_defines.hpp" -// qt +#include "pool.h" +#include "commititem.h" +#include "svnqt_defines.h" +// tqt #include <tqstring.h> // Subversion api #include <svn_client.h> @@ -264,8 +264,3 @@ namespace svn } #endif -/* ----------------------------------------------------------------- - * local variables: - * eval: (load-file "../../rapidsvn-dev.el") - * end: - */ diff --git a/src/svnqt/contextdata.cpp b/src/svnqt/contextdata.cpp index 59d724a..b670598 100644 --- a/src/svnqt/contextdata.cpp +++ b/src/svnqt/contextdata.cpp @@ -19,10 +19,10 @@ ***************************************************************************/ -#include "contextdata.hpp" -#include "context_listener.hpp" -#include "conflictresult.hpp" -#include "conflictdescription.hpp" +#include "contextdata.h" +#include "context_listener.h" +#include "conflictresult.h" +#include "conflictdescription.h" #include <svn_config.h> #include <svn_wc.h> diff --git a/src/svnqt/contextdata.hpp b/src/svnqt/contextdata.h index e38c6f2..6d41326 100644 --- a/src/svnqt/contextdata.hpp +++ b/src/svnqt/contextdata.h @@ -20,10 +20,10 @@ #ifndef SVNCONTEXTDATA_HPP #define SVNCONTEXTDATA_HPP -#include "svnqt/pool.hpp" -#include "svnqt/apr.hpp" -#include "svnqt/commititem.hpp" -#include "svnqt/svnqt_defines.hpp" +#include "svnqt/pool.h" +#include "svnqt/apr.h" +#include "svnqt/commititem.h" +#include "svnqt/svnqt_defines.h" #include <svn_client.h> #if (SVN_VER_MAJOR >= 1) && (SVN_VER_MINOR >= 4) diff --git a/src/svnqt/datetime.cpp b/src/svnqt/datetime.cpp index 51625b3..ad212e0 100644 --- a/src/svnqt/datetime.cpp +++ b/src/svnqt/datetime.cpp @@ -1,5 +1,5 @@ /* - * Port for usage with qt-framework and development for tdesvn + * Port for usage with tqt-framework and development for tdesvn * (C) 2005-2007 by Rajko Albrecht * http://tdesvn.alwins-world.de */ @@ -32,7 +32,7 @@ #include "apr_date.h" // svncpp -#include "datetime.hpp" +#include "datetime.h" namespace svn @@ -140,8 +140,8 @@ namespace svn void DateTime::setAprTime(apr_time_t aTime) { - if (aTime<0)m_time.setTime_t(0,Qt::LocalTime); - else m_time.setTime_t(aTime/(1000*1000),Qt::LocalTime); + if (aTime<0)m_time.setTime_t(0,TQt::LocalTime); + else m_time.setTime_t(aTime/(1000*1000),TQt::LocalTime); } TQString DateTime::toString(const TQString&format)const diff --git a/src/svnqt/datetime.hpp b/src/svnqt/datetime.h index f3a9236..13f4d29 100644 --- a/src/svnqt/datetime.hpp +++ b/src/svnqt/datetime.h @@ -1,5 +1,5 @@ /* - * Port for usage with qt-framework and development for tdesvn + * Port for usage with tqt-framework and development for tdesvn * (C) 2005-2007 by Rajko Albrecht * http://tdesvn.alwins-world.de */ @@ -31,7 +31,7 @@ #ifndef _SVNCPP_DATETIME_HPP_ #define _SVNCPP_DATETIME_HPP_ -#include "svnqt/svnqt_defines.hpp" +#include "svnqt/svnqt_defines.h" #include <tqdatetime.h> @@ -159,8 +159,3 @@ namespace svn } #endif -/* ----------------------------------------------------------------- - * local variables: - * eval: (load-file "../../rapidsvn-dev.el") - * end: - */ diff --git a/src/svnqt/diff_data.cpp b/src/svnqt/diff_data.cpp index 756e771..f9f21d8 100644 --- a/src/svnqt/diff_data.cpp +++ b/src/svnqt/diff_data.cpp @@ -17,9 +17,9 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include "diff_data.hpp" -#include "svnqt/svnqt_defines.hpp" -#include "svnqt/exception.hpp" +#include "diff_data.h" +#include "svnqt/svnqt_defines.h" +#include "svnqt/exception.h" #include <tqfile.h> @@ -50,7 +50,7 @@ namespace svn error = svn_io_open_unique_file (&m_outFile, &m_outFileName, m_tmpPath.path().TOUTF8(), ".tmp", - FALSE, m_Pool); + false, m_Pool); #endif if (error!=0) { clean(); @@ -65,7 +65,7 @@ namespace svn error = svn_io_open_unique_file (&m_errFile, &m_errFileName, m_tmpPath.path().TOUTF8(), ".tmp", - FALSE, m_Pool); + false, m_Pool); #endif if (error!=0) { clean(); diff --git a/src/svnqt/diff_data.hpp b/src/svnqt/diff_data.h index 92664b7..e0eb757 100644 --- a/src/svnqt/diff_data.hpp +++ b/src/svnqt/diff_data.h @@ -21,10 +21,10 @@ #ifndef __DIFF_DATA #define __DIFF_DATA -#include "svnqt/svnqt_defines.hpp" -#include "svnqt/pool.hpp" -#include "path.hpp" -#include "revision.hpp" +#include "svnqt/svnqt_defines.h" +#include "svnqt/pool.h" +#include "path.h" +#include "revision.h" #include <tqglobal.h> diff --git a/src/svnqt/diffoptions.cpp b/src/svnqt/diffoptions.cpp index 68681d9..499ff22 100644 --- a/src/svnqt/diffoptions.cpp +++ b/src/svnqt/diffoptions.cpp @@ -18,9 +18,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include "diffoptions.hpp" -#include "stringarray.hpp" -#include "pool.hpp" +#include "diffoptions.h" +#include "stringarray.h" +#include "pool.h" #include <svn_diff.h> diff --git a/src/svnqt/diffoptions.hpp b/src/svnqt/diffoptions.h index 17e9a98..fc72461 100644 --- a/src/svnqt/diffoptions.hpp +++ b/src/svnqt/diffoptions.h @@ -21,7 +21,7 @@ #ifndef _DIFF_OPTIONS_HPP #define _DIFF_OPTIONS_HPP -#include "svnqt/svnqt_defines.hpp" +#include "svnqt/svnqt_defines.h" namespace svn { class Pool; diff --git a/src/svnqt/dirent.cpp b/src/svnqt/dirent.cpp index 9015d13..19316f8 100644 --- a/src/svnqt/dirent.cpp +++ b/src/svnqt/dirent.cpp @@ -1,5 +1,5 @@ /* - * Port for usage with qt-framework and development for tdesvn + * Port for usage with tqt-framework and development for tdesvn * (C) 2005-2007 by Rajko Albrecht * http://tdesvn.alwins-world.de */ @@ -29,9 +29,9 @@ */ // svncpp -#include "svnqt/dirent.hpp" -#include "svnqt/lock_entry.hpp" -#include "svnqt/svnqt_defines.hpp" +#include "svnqt/dirent.h" +#include "svnqt/lock_entry.h" +#include "svnqt/svnqt_defines.h" #include <tqstring.h> @@ -178,9 +178,3 @@ namespace svn return *this; } } - -/* ----------------------------------------------------------------- - * local variables: - * eval: (load-file "../../rapidsvn-dev.el") - * end: - */ diff --git a/src/svnqt/dirent.hpp b/src/svnqt/dirent.h index 111b62e..e76fb8a 100644 --- a/src/svnqt/dirent.hpp +++ b/src/svnqt/dirent.h @@ -1,5 +1,5 @@ /* - * Port for usage with qt-framework and development for tdesvn + * Port for usage with tqt-framework and development for tdesvn * (C) 2005-2007 by Rajko Albrecht * http://tdesvn.alwins-world.de */ @@ -31,9 +31,9 @@ #ifndef _SVNCPP_DIRENT_HPP_ #define _SVNCPP_DIRENT_HPP_ -#include "svnqt/svnqt_defines.hpp" -#include "svnqt/lock_entry.hpp" -#include "svnqt/datetime.hpp" +#include "svnqt/svnqt_defines.h" +#include "svnqt/lock_entry.h" +#include "svnqt/datetime.h" // subversion api #include "svn_client.h" @@ -124,8 +124,3 @@ namespace svn } #endif -/* ----------------------------------------------------------------- - * local variables: - * eval: (load-file "../../rapidsvn-dev.el") - * end: - */ diff --git a/src/svnqt/entry.cpp b/src/svnqt/entry.cpp index 67090dc..ae29781 100644 --- a/src/svnqt/entry.cpp +++ b/src/svnqt/entry.cpp @@ -1,5 +1,5 @@ /* - * Port for usage with qt-framework and development for tdesvn + * Port for usage with tqt-framework and development for tdesvn * (C) 2005-2007 by Rajko Albrecht * http://tdesvn.alwins-world.de */ @@ -29,7 +29,7 @@ */ // svncpp -#include "entry.hpp" +#include "entry.h" namespace svn { diff --git a/src/svnqt/entry.hpp b/src/svnqt/entry.h index b04fdc3..8e8da87 100644 --- a/src/svnqt/entry.hpp +++ b/src/svnqt/entry.h @@ -1,5 +1,5 @@ /* - * Port for usage with qt-framework and development for tdesvn + * Port for usage with tqt-framework and development for tdesvn * (C) 2005-2007 by Rajko Albrecht * http://tdesvn.alwins-world.de */ @@ -31,12 +31,12 @@ #define _SVNCPP_ENTRY_HPP_ // svncpp -#include "svnqt/pool.hpp" -#include "svnqt/lock_entry.hpp" -#include "svnqt/dirent.hpp" -#include "svnqt/info_entry.hpp" -#include "svnqt/svnqt_defines.hpp" -#include "svnqt/svnqttypes.hpp" +#include "svnqt/pool.h" +#include "svnqt/lock_entry.h" +#include "svnqt/dirent.h" +#include "svnqt/info_entry.h" +#include "svnqt/svnqt_defines.h" +#include "svnqt/svnqttypes.h" // subversion api #include "svn_wc.h" @@ -131,7 +131,7 @@ namespace svn svn_wc_schedule_t schedule () const; /** - * @return TRUE if copied + * @return true if copied */ bool isCopied () const; @@ -238,8 +238,3 @@ namespace svn } #endif -/* ----------------------------------------------------------------- - * local variables: - * eval: (load-file "../../rapidsvn-dev.el") - * end: - */ diff --git a/src/svnqt/exception.cpp b/src/svnqt/exception.cpp index 925c5f5..203f4f0 100644 --- a/src/svnqt/exception.cpp +++ b/src/svnqt/exception.cpp @@ -1,5 +1,5 @@ /* - * Port for usage with qt-framework and development for tdesvn + * Port for usage with tqt-framework and development for tdesvn * (C) 2005-2007 by Rajko Albrecht * http://tdesvn.alwins-world.de */ @@ -30,8 +30,8 @@ // svncpp -#include "exception.hpp" -#include "svnqt/svnqt_defines.hpp" +#include "exception.h" +#include "svnqt/svnqt_defines.h" #include <tqstring.h> @@ -217,8 +217,3 @@ namespace svn } } -/* ----------------------------------------------------------------- - * local variables: - * eval: (load-file "../../rapidsvn-dev.el") - * end: - */ diff --git a/src/svnqt/exception.hpp b/src/svnqt/exception.h index f01ff85..ab255a0 100644 --- a/src/svnqt/exception.hpp +++ b/src/svnqt/exception.h @@ -1,5 +1,5 @@ /* - * Port for usage with qt-framework and development for tdesvn + * Port for usage with tqt-framework and development for tdesvn * (C) 2005-2007 by Rajko Albrecht * http://tdesvn.alwins-world.de */ @@ -31,7 +31,7 @@ #ifndef _SVNCPP_EXCEPTION_H_ #define _SVNCPP_EXCEPTION_H_ -#include "svnqt/svnqt_defines.hpp" +#include "svnqt/svnqt_defines.h" // subversion api #include "svn_client.h" #include <tqstring.h> @@ -131,8 +131,3 @@ namespace svn } #endif -/* ----------------------------------------------------------------- - * local variables: - * eval: (load-file "../../rapidsvn-dev.el") - * end: - */ diff --git a/src/svnqt/helper.hpp b/src/svnqt/helper.h index fca54d1..440fed3 100644 --- a/src/svnqt/helper.hpp +++ b/src/svnqt/helper.h @@ -21,8 +21,8 @@ #ifndef __HELPER_HPP #define __HELPER_HPP -#include "svnqttypes.hpp" -#include "revision.hpp" +#include "svnqttypes.h" +#include "revision.h" #include <svn_types.h> #include <iostream> diff --git a/src/svnqt/info_entry.cpp b/src/svnqt/info_entry.cpp index 6f76735..574d39f 100644 --- a/src/svnqt/info_entry.cpp +++ b/src/svnqt/info_entry.cpp @@ -17,9 +17,9 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include "svnqt/info_entry.hpp" -#include "svnqt/svnqt_defines.hpp" -#include "svnqt/pool.hpp" +#include "svnqt/info_entry.h" +#include "svnqt/svnqt_defines.h" +#include "svnqt/pool.h" #include <svn_client.h> #include <svn_path.h> diff --git a/src/svnqt/info_entry.hpp b/src/svnqt/info_entry.h index be86639..4ac06d0 100644 --- a/src/svnqt/info_entry.hpp +++ b/src/svnqt/info_entry.h @@ -20,10 +20,10 @@ #ifndef __INFO_ENTRY_H #define __INFO_ENTRY_H -#include <svnqt/lock_entry.hpp> -#include <svnqt/datetime.hpp> -#include <svnqt/revision.hpp> -#include <svnqt/svnqttypes.hpp> +#include <svnqt/lock_entry.h> +#include <svnqt/datetime.h> +#include <svnqt/revision.h> +#include <svnqt/svnqttypes.h> #include <tqstring.h> diff --git a/src/svnqt/lock_entry.cpp b/src/svnqt/lock_entry.cpp index 1ddb360..6b438dc 100644 --- a/src/svnqt/lock_entry.cpp +++ b/src/svnqt/lock_entry.cpp @@ -1,5 +1,5 @@ /* - * Port for usage with qt-framework and development for tdesvn + * Port for usage with tqt-framework and development for tdesvn * (C) 2005-2007 by Rajko Albrecht * http://tdesvn.alwins-world.de */ @@ -29,8 +29,8 @@ */ // svncpp -#include "lock_entry.hpp" -#include "pool.hpp" +#include "lock_entry.h" +#include "pool.h" // subversion api #include "svn_time.h" @@ -133,9 +133,3 @@ namespace svn comment = lock_comment?TQString::FROMUTF8(lock_comment):""; } } - -/* ----------------------------------------------------------------- - * local variables: - * eval: (load-file "../../rapidsvn-dev.el") - * end: - */ diff --git a/src/svnqt/lock_entry.hpp b/src/svnqt/lock_entry.h index 50eb3ef..d6f1162 100644 --- a/src/svnqt/lock_entry.hpp +++ b/src/svnqt/lock_entry.h @@ -1,5 +1,5 @@ /* - * Port for usage with qt-framework and development for tdesvn + * Port for usage with tqt-framework and development for tdesvn * (C) 2005-2007 by Rajko Albrecht * http://tdesvn.alwins-world.de */ @@ -31,8 +31,8 @@ #ifndef _SVNCPP_LOCK_ENTRY_H_ #define _SVNCPP_LOCK_ENTRY_H_ -#include "svnqt/svnqt_defines.hpp" -#include "svnqt/datetime.hpp" +#include "svnqt/svnqt_defines.h" +#include "svnqt/datetime.h" #include <tqstring.h> @@ -82,9 +82,3 @@ namespace svn } #endif -/* ----------------------------------------------------------------- - * local variables: - * eval: (load-file "../../rapidsvn-dev.el") - * end: - */ - diff --git a/src/svnqt/log_entry.cpp b/src/svnqt/log_entry.cpp index 720642d..69d3b12 100644 --- a/src/svnqt/log_entry.cpp +++ b/src/svnqt/log_entry.cpp @@ -1,5 +1,5 @@ /* - * Port for usage with qt-framework and development for tdesvn + * Port for usage with tqt-framework and development for tdesvn * (C) 2005-2007 by Rajko Albrecht * http://tdesvn.alwins-world.de */ @@ -28,8 +28,8 @@ * ==================================================================== */ // svncpp -#include "log_entry.hpp" -#include "pool.hpp" +#include "log_entry.h" +#include "pool.h" // subversion api #include "svn_time.h" diff --git a/src/svnqt/log_entry.hpp b/src/svnqt/log_entry.h index ebd4350..f7de2c2 100644 --- a/src/svnqt/log_entry.hpp +++ b/src/svnqt/log_entry.h @@ -1,5 +1,5 @@ /* - * Port for usage with qt-framework and development for tdesvn + * Port for usage with tqt-framework and development for tdesvn * (C) 2005-2007 by Rajko Albrecht * http://tdesvn.alwins-world.de */ @@ -31,8 +31,8 @@ #ifndef _SVNCPP_LOG_ENTRY_H_ #define _SVNCPP_LOG_ENTRY_H_ -#include "svnqt/svnqt_defines.hpp" -#include "svnqt/datetime.hpp" +#include "svnqt/svnqt_defines.h" +#include "svnqt/datetime.h" //TQt #include <tqglobal.h> @@ -118,8 +118,3 @@ SVNTQT_EXPORT TQDataStream &operator>>(TQDataStream&s,svn::LogEntry&r); SVNTQT_EXPORT TQDataStream &operator>>(TQDataStream&s,svn::LogChangePathEntry&r); #endif -/* ----------------------------------------------------------------- - * local variables: - * eval: (load-file "../../rapidsvn-dev.el") - * end: - */ diff --git a/src/svnqt/path.cpp b/src/svnqt/path.cpp index ae94789..0a09bd6 100644 --- a/src/svnqt/path.cpp +++ b/src/svnqt/path.cpp @@ -1,5 +1,5 @@ /* - * Port for usage with qt-framework and development for tdesvn + * Port for usage with tqt-framework and development for tdesvn * (C) 2005-2007 by Rajko Albrecht * http://tdesvn.alwins-world.de */ @@ -36,12 +36,12 @@ #include "apr_file_io.h" // svncpp -#include "svnqt/path.hpp" -#include "svnqt/pool.hpp" -#include "svnqt/url.hpp" -#include "svnqt/svnqt_defines.hpp" -#include "svnqt/revision.hpp" -#include "svnqt/exception.hpp" +#include "svnqt/path.h" +#include "svnqt/pool.h" +#include "svnqt/url.h" +#include "svnqt/svnqt_defines.h" +#include "svnqt/revision.h" +#include "svnqt/exception.h" #include <tqurl.h> @@ -270,9 +270,3 @@ namespace svn } } - -/* ----------------------------------------------------------------- - * local variables: - * eval: (load-file "../../rapidsvn-dev.el") - * end: - */ diff --git a/src/svnqt/path.hpp b/src/svnqt/path.h index 1ad5071..d06fa77 100644 --- a/src/svnqt/path.hpp +++ b/src/svnqt/path.h @@ -1,5 +1,5 @@ /* - * Port for usage with qt-framework and development for tdesvn + * Port for usage with tqt-framework and development for tdesvn * (C) 2005-2007 by Rajko Albrecht * http://tdesvn.alwins-world.de */ @@ -32,8 +32,8 @@ #define _SVNCPP_PATH_HPP_ #include <tqstring.h> -#include "svnqt/svnqt_defines.hpp" -#include "svnqt/svnqttypes.hpp" +#include "svnqt/svnqt_defines.h" +#include "svnqt/svnqttypes.h" namespace svn { @@ -193,8 +193,3 @@ namespace svn } #endif -/* ----------------------------------------------------------------- - * local variables: - * eval: (load-file "../../rapidsvn-dev.el") - * end: - */ diff --git a/src/svnqt/pool.cpp b/src/svnqt/pool.cpp index d564909..ae876ec 100644 --- a/src/svnqt/pool.cpp +++ b/src/svnqt/pool.cpp @@ -1,5 +1,5 @@ /* - * Port for usage with qt-framework and development for tdesvn + * Port for usage with tqt-framework and development for tdesvn * (C) 2005-2007 by Rajko Albrecht * http://tdesvn.alwins-world.de */ @@ -29,7 +29,7 @@ */ // svncpp -#include "pool.hpp" +#include "pool.h" namespace svn @@ -86,9 +86,3 @@ namespace svn // return *this; // } } - -/* ----------------------------------------------------------------- - * local variables: - * eval: (load-file "../../rapidsvn-dev.el") - * end: - */ diff --git a/src/svnqt/pool.hpp b/src/svnqt/pool.h index ffea1ca..a2879c8 100644 --- a/src/svnqt/pool.hpp +++ b/src/svnqt/pool.h @@ -1,5 +1,5 @@ /* - * Port for usage with qt-framework and development for tdesvn + * Port for usage with tqt-framework and development for tdesvn * (C) 2005-2007 by Rajko Albrecht * http://tdesvn.alwins-world.de */ @@ -84,9 +84,3 @@ namespace svn } #endif - -/* ----------------------------------------------------------------- - * local variables: - * eval: (load-file "../../rapidsvn-dev.el") - * end: - */ diff --git a/src/svnqt/repository.cpp b/src/svnqt/repository.cpp index 327340b..ed8d9b3 100644 --- a/src/svnqt/repository.cpp +++ b/src/svnqt/repository.cpp @@ -17,8 +17,8 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include "repository.hpp" -#include "repositorydata.hpp" +#include "repository.h" +#include "repositorydata.h" namespace svn { @@ -39,7 +39,7 @@ Repository::~Repository() /*! \fn svn::Repository::Open(const TQString&) */ -void Repository::Open(const TQString&name) throw (ClientException) +void Repository::Open(const TQString&name) { svn_error_t * error = m_Data->Open(name); if (error!=0) { @@ -47,7 +47,7 @@ void Repository::Open(const TQString&name) throw (ClientException) } } -void Repository::CreateOpen(const TQString&path, const TQString&fstype, bool _bdbnosync, bool _bdbautologremove, bool _pre_1_4_compat, bool _pre_1_5_compat) throw (ClientException) +void Repository::CreateOpen(const TQString&path, const TQString&fstype, bool _bdbnosync, bool _bdbautologremove, bool _pre_1_4_compat, bool _pre_1_5_compat) { svn_error_t * error = m_Data->CreateOpen(path,fstype,_bdbnosync,_bdbautologremove,_pre_1_4_compat,_pre_1_5_compat); if (error!=0) { @@ -57,9 +57,9 @@ void Repository::CreateOpen(const TQString&path, const TQString&fstype, bool _bd /*! - \fn svn::Repository::dump(const TQString&output,const svn::Revision&start,const svn::Revision&end, bool incremental, bool use_deltas)throw (ClientException) + \fn svn::Repository::dump(const TQString&output,const svn::Revision&start,const svn::Revision&end, bool incremental, bool use_deltas) */ -void Repository::dump(const TQString&output,const svn::Revision&start,const svn::Revision&end, bool incremental, bool use_deltas)throw (ClientException) +void Repository::dump(const TQString&output,const svn::Revision&start,const svn::Revision&end, bool incremental, bool use_deltas) { svn_error_t * error = m_Data->dump(output,start,end,incremental,use_deltas); if (error!=0) { @@ -67,7 +67,7 @@ void Repository::dump(const TQString&output,const svn::Revision&start,const svn: } } -void Repository::loaddump(const TQString&dump,LOAD_UUID uuida, const TQString&parentFolder, bool usePre, bool usePost)throw (ClientException) +void Repository::loaddump(const TQString&dump,LOAD_UUID uuida, const TQString&parentFolder, bool usePre, bool usePost) { svn_repos_load_uuid uuid_action; switch (uuida) { @@ -91,7 +91,7 @@ void Repository::loaddump(const TQString&dump,LOAD_UUID uuida, const TQString&pa /*! \fn svn::Repository::hotcopy(const TQString&src,const TQString&dest,bool cleanlogs) */ -void Repository::hotcopy(const TQString&src,const TQString&dest,bool cleanlogs)throw (ClientException) +void Repository::hotcopy(const TQString&src,const TQString&dest,bool cleanlogs) { svn_error_t * error = RepositoryData::hotcopy(src,dest,cleanlogs); if (error!=0) { diff --git a/src/svnqt/repository.hpp b/src/svnqt/repository.h index 7f79f52..ddff4f6 100644 --- a/src/svnqt/repository.hpp +++ b/src/svnqt/repository.h @@ -25,9 +25,9 @@ #pragma warning (disable: 4290) #endif -#include "svnqt/exception.hpp" -#include "svnqt/revision.hpp" -#include "svnqt/svnqt_defines.hpp" +#include "svnqt/exception.h" +#include "svnqt/revision.h" +#include "svnqt/svnqt_defines.h" #include <tqstring.h> @@ -63,7 +63,7 @@ public: \param path Path to a local repository, must not be an url \exception ClientException will be thrown in case of an error */ - void Open(const TQString&path) throw (ClientException); + void Open(const TQString&path); //! Creates and open a new repository /*! * Creates a new repository in path with type fstype. If create succeeded open and assigns with the object. @@ -75,7 +75,7 @@ public: * \param _pre_1_4_compat Create repository compatibel to version earlier than 1.4 (only used with subversion 1.4) */ void CreateOpen(const TQString&path, const TQString&fstype, bool _bdbnosync = false, - bool _bdbautologremove = true, bool _pre_1_4_compat=false, bool _pre_1_5_compat=false) throw (ClientException); + bool _bdbautologremove = true, bool _pre_1_4_compat=false, bool _pre_1_5_compat=false); //! dump content of repository to a file /*! The repository must opend before. Progress message go trough the assigned svn::repository::RepositoryListener object. @@ -87,7 +87,7 @@ public: \param use_deltas use deltas in dump output \exception ClientException will be thrown in case of an error */ - void dump(const TQString&output,const svn::Revision&start,const svn::Revision&end, bool incremental, bool use_deltas)throw (ClientException); + void dump(const TQString&output,const svn::Revision&start,const svn::Revision&end, bool incremental, bool use_deltas); //! load a dump into repository /*! The repository must opened before. Progress message go trough the assigned svn::repository::RepositoryListener object. @@ -98,7 +98,7 @@ public: \param usePost use post-commit-hook \exception ClientException will be thrown in case of an error */ - void loaddump(const TQString&dump,LOAD_UUID uuida, const TQString&parentFolder, bool usePre, bool usePost)throw (ClientException); + void loaddump(const TQString&dump,LOAD_UUID uuida, const TQString&parentFolder, bool usePre, bool usePost); //! copy a repository to a new location /*! \param src the repository path to copy @@ -106,7 +106,7 @@ public: \param cleanlogs remove redundand log files from source \exception ClientException will be thrown in case of an error */ - static void hotcopy(const TQString&src,const TQString&dest,bool cleanlogs)throw (ClientException); + static void hotcopy(const TQString&src,const TQString&dest,bool cleanlogs); private: RepositoryData*m_Data; diff --git a/src/svnqt/repositorydata.cpp b/src/svnqt/repositorydata.cpp index 4e6f2ba..320139f 100644 --- a/src/svnqt/repositorydata.cpp +++ b/src/svnqt/repositorydata.cpp @@ -17,11 +17,11 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include "svnqt/repositorydata.hpp" -#include "svnqt/svnqt_defines.hpp" -#include "svnqt/exception.hpp" -#include "svnqt/repositorylistener.hpp" -#include "svnqt/svnfilestream.hpp" +#include "svnqt/repositorydata.h" +#include "svnqt/svnqt_defines.h" +#include "svnqt/exception.h" +#include "svnqt/repositorylistener.h" +#include "svnqt/svnfilestream.h" #include <svn_fs.h> #include <svn_path.h> diff --git a/src/svnqt/repositorydata.hpp b/src/svnqt/repositorydata.h index 5abe2ca..0efb891 100644 --- a/src/svnqt/repositorydata.hpp +++ b/src/svnqt/repositorydata.h @@ -20,10 +20,10 @@ #ifndef SVNREPOSITORYDATA_H #define SVNREPOSITORYDATA_H -#include "svnqt/pool.hpp" -#include "svnqt/revision.hpp" -#include "svnqt/apr.hpp" -#include "svnqt/svnqt_defines.hpp" +#include "svnqt/pool.h" +#include "svnqt/revision.h" +#include "svnqt/apr.h" +#include "svnqt/svnqt_defines.h" #include <tqstring.h> diff --git a/src/svnqt/repositorylistener.cpp b/src/svnqt/repositorylistener.cpp index 9c809a8..90b0be7 100644 --- a/src/svnqt/repositorylistener.cpp +++ b/src/svnqt/repositorylistener.cpp @@ -17,7 +17,7 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include "repositorylistener.hpp" +#include "repositorylistener.h" namespace svn { diff --git a/src/svnqt/repositorylistener.hpp b/src/svnqt/repositorylistener.h index b5e7d7c..a2b357a 100644 --- a/src/svnqt/repositorylistener.hpp +++ b/src/svnqt/repositorylistener.h @@ -24,7 +24,7 @@ @author Rajko Albrecht <ral@alwins-world.de> */ -#include "svnqt/svnqt_defines.hpp" +#include "svnqt/svnqt_defines.h" #include <tqstring.h> namespace svn { diff --git a/src/svnqt/revision.cpp b/src/svnqt/revision.cpp index a5a72c8..758acf6 100644 --- a/src/svnqt/revision.cpp +++ b/src/svnqt/revision.cpp @@ -1,5 +1,5 @@ /* - * Port for usage with qt-framework and development for tdesvn + * Port for usage with tqt-framework and development for tdesvn * (C) 2005-2007 by Rajko Albrecht * http://tdesvn.alwins-world.de */ @@ -30,10 +30,10 @@ // svncpp -#include "revision.hpp" -#include "pool.hpp" +#include "revision.h" +#include "pool.h" -// qt +// tqt #include "tqdatetime.h" namespace svn @@ -291,9 +291,3 @@ namespace svn } } - -/* ----------------------------------------------------------------- - * local variables: - * eval: (load-file "../../rapidsvn-dev.el") - * end: - */ diff --git a/src/svnqt/revision.hpp b/src/svnqt/revision.h index 5acaab2..381b523 100644 --- a/src/svnqt/revision.hpp +++ b/src/svnqt/revision.h @@ -1,5 +1,5 @@ /* - * Port for usage with qt-framework and development for tdesvn + * Port for usage with tqt-framework and development for tdesvn * (C) 2005-2007 by Rajko Albrecht * http://tdesvn.alwins-world.de */ @@ -32,10 +32,10 @@ #define _SVNCPP_REVISION_HPP_ // svncpp -#include <svnqt/datetime.hpp> -#include <svnqt/svnqt_defines.hpp> +#include <svnqt/datetime.h> +#include <svnqt/svnqt_defines.h> -// qt +// tqt #include <tqglobal.h> #include <tqstring.h> #include <tqtextstream.h> @@ -211,8 +211,3 @@ inline TQTextStream& operator<<(TQTextStream&s,svn::Revision&r) } #endif -/* ----------------------------------------------------------------- - * local variables: - * eval: (load-file "../../rapidsvn-dev.el") - * end: - */ diff --git a/src/svnqt/shared_pointer.hpp b/src/svnqt/shared_pointer.h index 4e5ca5b..fa9aa2f 100644 --- a/src/svnqt/shared_pointer.hpp +++ b/src/svnqt/shared_pointer.h @@ -21,12 +21,12 @@ #ifndef SVNTQT_SHARED_POINTER_HPP #define SVNTQT_SHARED_POINTER_HPP -#include "svnqt/smart_pointer.hpp" +#include "svnqt/smart_pointer.h" /*! - * \file shared_pointer.hpp + * \file shared_pointer.h * \brief shared pointer adapter - * \sa smart_pointer.hpp + * \sa smart_pointer.h */ namespace svn diff --git a/src/svnqt/smart_pointer.hpp b/src/svnqt/smart_pointer.h index f579160..5d6dd63 100644 --- a/src/svnqt/smart_pointer.hpp +++ b/src/svnqt/smart_pointer.h @@ -24,7 +24,7 @@ #include "tqmutex.h" #endif -#include "svnqt/svnqt_defines.hpp" +#include "svnqt/svnqt_defines.h" /*! * \file smart_pointer.h diff --git a/src/svnqt/status.cpp b/src/svnqt/status.cpp index c5e47a3..54170b8 100644 --- a/src/svnqt/status.cpp +++ b/src/svnqt/status.cpp @@ -1,5 +1,5 @@ /* - * Port for usage with qt-framework and development for tdesvn + * Port for usage with tqt-framework and development for tdesvn * (C) 2005-2007 by Rajko Albrecht * http://tdesvn.alwins-world.de */ @@ -29,10 +29,10 @@ */ // svncpp -#include "status.hpp" -#include "svnqt/svnqt_defines.hpp" -#include "svnqt/path.hpp" -#include "svnqt/url.hpp" +#include "status.h" +#include "svnqt/svnqt_defines.h" +#include "svnqt/path.h" +#include "svnqt/url.h" #include "svn_path.h" diff --git a/src/svnqt/status.hpp b/src/svnqt/status.h index 281f905..9f285ac 100644 --- a/src/svnqt/status.hpp +++ b/src/svnqt/status.h @@ -1,5 +1,5 @@ /* - * Port for usage with qt-framework and development for tdesvn + * Port for usage with tqt-framework and development for tdesvn * (C) 2005-2007 by Rajko Albrecht * http://tdesvn.alwins-world.de */ @@ -34,13 +34,13 @@ #include "svn_wc.h" // svncpp -#include "svnqt/svnqttypes.hpp" -#include "svnqt/entry.hpp" -#include "svnqt/pool.hpp" -#include "svnqt/lock_entry.hpp" -#include "svnqt/dirent.hpp" -#include "svnqt/info_entry.hpp" -#include "svnqt/svnqt_defines.hpp" +#include "svnqt/svnqttypes.h" +#include "svnqt/entry.h" +#include "svnqt/pool.h" +#include "svnqt/lock_entry.h" +#include "svnqt/dirent.h" +#include "svnqt/info_entry.h" +#include "svnqt/svnqt_defines.h" namespace svn { @@ -48,7 +48,7 @@ namespace svn * Subversion status API. This class wraps around * @a svn_wc_status_t. * - * @see svn_wc.hpp + * @see svn_wc.h * @see svn_wc_status_t */ class Status_private; @@ -114,37 +114,37 @@ namespace svn propStatus () const; /** - * @retval TRUE if under version control + * @retval true if under version control */ bool isVersioned () const; /** - * @retval TRUE if under version control and not ignored + * @retval true if under version control and not ignored */ bool isRealVersioned()const; /** - * @retval TRUE if under version control and local modified + * @retval true if under version control and local modified */ bool isModified()const; /** - * @retval TRUE if locked + * @retval true if locked */ bool isLocked () const; /** - * @retval TRUE if copied + * @retval true if copied */ bool isCopied () const; /** - * @retval TRUE if switched + * @retval true if switched */ bool isSwitched () const; @@ -180,8 +180,3 @@ namespace svn } #endif -/* ----------------------------------------------------------------- - * local variables: - * eval: (load-file "../../rapidsvn-dev.el") - * end: - */ diff --git a/src/svnqt/stringarray.cpp b/src/svnqt/stringarray.cpp index 7be5039..db6209e 100644 --- a/src/svnqt/stringarray.cpp +++ b/src/svnqt/stringarray.cpp @@ -18,8 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include "svnqt/stringarray.hpp" -#include "svnqt/pool.hpp" +#include "svnqt/stringarray.h" +#include "svnqt/pool.h" #include <svn_types.h> // apr api diff --git a/src/svnqt/stringarray.hpp b/src/svnqt/stringarray.h index 3f2c3d5..5310d68 100644 --- a/src/svnqt/stringarray.hpp +++ b/src/svnqt/stringarray.h @@ -21,8 +21,8 @@ #ifndef _STRING_ARRAY_HPP #define _STRING_ARRAY_HPP -#include "svnqt/svnqt_defines.hpp" -#include "svnqt/svnqttypes.hpp" +#include "svnqt/svnqt_defines.h" +#include "svnqt/svnqttypes.h" #include <tqglobal.h> #include <tqstringlist.h> diff --git a/src/svnqt/svnfilestream.cpp b/src/svnqt/svnfilestream.cpp index b160003..32aaa66 100644 --- a/src/svnqt/svnfilestream.cpp +++ b/src/svnqt/svnfilestream.cpp @@ -17,7 +17,7 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include "svnfilestream.hpp" +#include "svnfilestream.h" #include <tqfile.h> diff --git a/src/svnqt/svnfilestream.hpp b/src/svnqt/svnfilestream.h index e3a9201..cd46b65 100644 --- a/src/svnqt/svnfilestream.hpp +++ b/src/svnqt/svnfilestream.h @@ -20,7 +20,7 @@ #ifndef SVN_STREAMSVNFILESTREAM_HPP #define SVN_STREAMSVNFILESTREAM_HPP -#include "svnstream.hpp" +#include "svnstream.h" namespace svn { diff --git a/src/svnqt/svnqt_defines.hpp.in b/src/svnqt/svnqt_defines.h.in index 7d35ad7..7d35ad7 100644 --- a/src/svnqt/svnqt_defines.hpp.in +++ b/src/svnqt/svnqt_defines.h.in diff --git a/src/svnqt/svnqttypes.hpp b/src/svnqt/svnqttypes.h index 5d16658..66ed28f 100644 --- a/src/svnqt/svnqttypes.hpp +++ b/src/svnqt/svnqttypes.h @@ -21,10 +21,10 @@ #ifndef _SVNTQT_TYPES_HPP #define _SVNTQT_TYPES_HPP -#include "svnqt/svnqt_defines.hpp" -#include "svnqt/shared_pointer.hpp" +#include "svnqt/svnqt_defines.h" +#include "svnqt/shared_pointer.h" -// qt +// tqt #include <tqglobal.h> #include <tqstring.h> diff --git a/src/svnqt/svnstream.cpp b/src/svnqt/svnstream.cpp index 53d115e..ca4563a 100644 --- a/src/svnqt/svnstream.cpp +++ b/src/svnqt/svnstream.cpp @@ -17,9 +17,9 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include "svnqt/svnstream.hpp" -#include "svnqt/pool.hpp" -#include "svnqt/apr.hpp" +#include "svnqt/svnstream.h" +#include "svnqt/pool.h" +#include "svnqt/apr.h" // Subversion api #include "svn_client.h" @@ -207,7 +207,7 @@ SvnByteStream::SvnByteStream(svn_client_ctx_t * ctx) { m_ByteData = new SvnByteStream_private; if (!m_ByteData->mBuf.isOpen()) { - setError(TQT_TQIODEVICE_OBJECT(m_ByteData->mBuf).status()); + setError(m_ByteData->mBuf.status()); } } @@ -220,7 +220,7 @@ long SvnByteStream::write(const char*aData,const unsigned long max) { long i = m_ByteData->mBuf.writeBlock(aData,max); if (i<0) { - setError(TQT_TQIODEVICE_OBJECT(m_ByteData->mBuf).status()); + setError(m_ByteData->mBuf.status()); } return i; } diff --git a/src/svnqt/svnstream.hpp b/src/svnqt/svnstream.h index 6a14640..e71034b 100644 --- a/src/svnqt/svnstream.hpp +++ b/src/svnqt/svnstream.h @@ -20,7 +20,7 @@ #ifndef SVNSVNSTREAM_HPP #define SVNSVNSTREAM_HPP -#include "svnqt/svnqt_defines.hpp" +#include "svnqt/svnqt_defines.h" #include <tqstring.h> diff --git a/src/svnqt/targets.cpp b/src/svnqt/targets.cpp index b73d768..ae6d57c 100644 --- a/src/svnqt/targets.cpp +++ b/src/svnqt/targets.cpp @@ -1,5 +1,5 @@ /* - * Port for usage with qt-framework and development for tdesvn + * Port for usage with tqt-framework and development for tdesvn * (C) 2005-2007 by Rajko Albrecht * http://tdesvn.alwins-world.de */ @@ -36,10 +36,10 @@ #include "apr_strings.h" // svncpp -#include "svnqt/targets.hpp" -#include "svnqt/path.hpp" -#include "svnqt/pool.hpp" -#include "svnqt/svnqt_defines.hpp" +#include "svnqt/targets.h" +#include "svnqt/path.h" +#include "svnqt/pool.h" +#include "svnqt/svnqt_defines.h" #include <tqstringlist.h> @@ -162,9 +162,3 @@ namespace svn } } } - -/* ----------------------------------------------------------------- - * local variables: - * eval: (load-file "../../rapidsvn-dev.el") - * end: - */ diff --git a/src/svnqt/targets.hpp b/src/svnqt/targets.h index 305c0a2..a4de848 100644 --- a/src/svnqt/targets.hpp +++ b/src/svnqt/targets.h @@ -1,5 +1,5 @@ /* - * Port for usage with qt-framework and development for tdesvn + * Port for usage with tqt-framework and development for tdesvn * (C) 2005-2007 by Rajko Albrecht * http://tdesvn.alwins-world.de */ @@ -31,8 +31,8 @@ #ifndef _SVNCPP_TARGETS_HPP_ #define _SVNCPP_TARGETS_HPP_ -#include "svnqt/svnqt_defines.hpp" -#include "svnqt/svnqttypes.hpp" +#include "svnqt/svnqt_defines.h" +#include "svnqt/svnqttypes.h" #include <tqglobal.h> #include <tqvaluelist.h> @@ -157,8 +157,3 @@ namespace svn } #endif -/* ----------------------------------------------------------------- - * local variables: - * eval: (load-file "../../rapidsvn-dev.el") - * end: - */ diff --git a/src/svnqt/testmain.cpp b/src/svnqt/testmain.cpp index fd46e9b..727e557 100644 --- a/src/svnqt/testmain.cpp +++ b/src/svnqt/testmain.cpp @@ -17,10 +17,9 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include "client.hpp" -#include "repository.hpp" -#include "context.hpp" -#include "datetime.hpp" +#include "client.h" +#include "repository.h" +#include "context.h" #include <tqdatastream.h> @@ -31,9 +30,7 @@ int main(int,char**) svn::ContextP myContext = new svn::Context(); TQByteArray tout; -#if [[[TQT_VERSION IS DEPRECATED]]] < 0x040000 TQDataStream out(tout,IO_WriteOnly); -#endif svn::Client*m_Svnclient = svn::Client::getobject(0,0); svn::ContextP m_CurrentContext = new svn::Context(); m_Svnclient->setContext(m_CurrentContext); @@ -45,7 +42,6 @@ int main(int,char**) } catch (svn::ClientException ce) { gotit = false; } -#if [[[TQT_VERSION IS DEPRECATED]]] < 0x040000 if (gotit) { out << m_OldHistory; svn::LogEntriesMap m_NewHistory; @@ -57,6 +53,5 @@ int main(int,char**) tqDebug("%lu %s %s",it.key(),it.data().author.ascii(),it.data().message.ascii()); } } -#endif - return 1; + return 1; } diff --git a/src/svnqt/tests/CMakeLists.txt b/src/svnqt/tests/CMakeLists.txt index 78344ad..60193d0 100644 --- a/src/svnqt/tests/CMakeLists.txt +++ b/src/svnqt/tests/CMakeLists.txt @@ -1,23 +1,25 @@ -SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}) +include_directories( ${CMAKE_SOURCE_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) + build_test(crepo) + build_test(lsdir) + build_test(ckpath) + + # lsdir relies on output from crepo + set_tests_properties(crepo lsdir PROPERTIES RUN_SERIAL TRUE) +endif(BUILD_TESTS) diff --git a/src/svnqt/tests/ckpath.cpp b/src/svnqt/tests/ckpath.cpp index 64a57ca..a404e50 100644 --- a/src/svnqt/tests/ckpath.cpp +++ b/src/svnqt/tests/ckpath.cpp @@ -1,4 +1,4 @@ -#include "src/svnqt/path.hpp" +#include "src/svnqt/path.h" #include <iostream> int main(int,char**) @@ -15,7 +15,7 @@ int main(int,char**) } unsigned j = 0; while (pa.length()>0) { - std::cout << pa.path() << std::endl; + std::cout << pa.path().local8Bit() << std::endl; pa.removeLast(); ++j; } diff --git a/src/svnqt/tests/crepo.cpp b/src/svnqt/tests/crepo.cpp index fa43d90..baaf444 100644 --- a/src/svnqt/tests/crepo.cpp +++ b/src/svnqt/tests/crepo.cpp @@ -1,8 +1,8 @@ -#include "src/svnqt/client.hpp" +#include "src/svnqt/client.h" #include "src/svnqt/tests/testconfig.h" -#include "src/svnqt/repository.hpp" -#include "src/svnqt/repositorylistener.hpp" -#include "src/svnqt/targets.hpp" +#include "src/svnqt/repository.h" +#include "src/svnqt/repositorylistener.h" +#include "src/svnqt/targets.h" #include "testlistener.h" @@ -17,17 +17,19 @@ class Listener:public svn::repository::RepositoryListener virtual ~Listener(){} virtual void sendWarning(const TQString&msg) { - std::cout << msg << std::endl; + std::cout << msg.local8Bit() << std::endl; } virtual void sendError(const TQString&msg) { - std::cout << msg << std::endl; + std::cout << msg.local8Bit() << std::endl; } virtual bool isCanceld(){return false;} }; int main(int,char**) { + system("/bin/rm -rvf -- " TESTREPOPATH " " TESTCOPATH); + TQString p = TESTREPOPATH; Listener ls; svn::repository::Repository rp(&ls); diff --git a/src/svnqt/tests/lsdir.cpp b/src/svnqt/tests/lsdir.cpp index f3a2f6f..c8db993 100644 --- a/src/svnqt/tests/lsdir.cpp +++ b/src/svnqt/tests/lsdir.cpp @@ -1,8 +1,8 @@ -#include "src/svnqt/client.hpp" +#include "src/svnqt/client.h" #include "src/svnqt/tests/testconfig.h" -#include "src/svnqt/status.hpp" -#include "src/svnqt/svnqttypes.hpp" +#include "src/svnqt/status.h" +#include "src/svnqt/svnqttypes.h" #include <iostream> int main(int,char**) @@ -28,8 +28,8 @@ int main(int,char**) std::cout << "List 1 "<<dlist.size()<<std::endl; for (unsigned int i=0; i < dlist.size();++i) { TQDateTime dt = svn::DateTime(dlist[i]->time()); - std::cout << dlist[i]->name() << " " - << dlist[i]->lastAuthor() << " " + std::cout << dlist[i]->name().local8Bit() << " " + << dlist[i]->lastAuthor().local8Bit() << " " << dlist[i]->size() << " " << dt.toTime_t() << std::endl; } @@ -44,8 +44,8 @@ int main(int,char**) std::cout << "List 2 "<<dlist.size()<<std::endl; for (unsigned int i=0; i < dlist.size();++i) { TQDateTime dt = svn::DateTime(dlist[i]->time()); - std::cout << dlist[i]->name() << " " - << dlist[i]->lastAuthor() << " " + std::cout << dlist[i]->name().local8Bit() << " " + << dlist[i]->lastAuthor().local8Bit() << " " << dlist[i]->size() << " " << dt.toTime_t() << std::endl; } @@ -59,7 +59,7 @@ int main(int,char**) return -1; } for (unsigned int i=0; i < slist.size();++i) { - std::cout << slist[i]->path()<< std::endl; + std::cout << slist[i]->path().local8Bit() << std::endl; } std::cout << "================"<<std::endl; std::cout << "Second status:"<<std::endl; @@ -71,7 +71,7 @@ int main(int,char**) return -1; } for (unsigned int i=0; i < slist.size();++i) { - std::cout << slist[i]->path()<< std::endl; + std::cout << slist[i]->path().local8Bit() << std::endl; } return 0; diff --git a/src/svnqt/tests/testlistener.h b/src/svnqt/tests/testlistener.h index 3efa96d..8d1300a 100644 --- a/src/svnqt/tests/testlistener.h +++ b/src/svnqt/tests/testlistener.h @@ -1,7 +1,7 @@ #ifndef _TESTLISTENER_ #define _TESTLISTENER_ -#include "src/svnqt/context_listener.hpp" +#include "src/svnqt/context_listener.h" class TestListener:public svn::ContextListener { diff --git a/src/svnqt/url.cpp b/src/svnqt/url.cpp index 64edb06..0e32af0 100644 --- a/src/svnqt/url.cpp +++ b/src/svnqt/url.cpp @@ -1,5 +1,5 @@ /* - * Port for usage with qt-framework and development for tdesvn + * Port for usage with tqt-framework and development for tdesvn * (C) 2005-2007 by Rajko Albrecht * http://tdesvn.alwins-world.de */ @@ -33,8 +33,8 @@ // svncpp -#include "pool.hpp" -#include "url.hpp" +#include "pool.h" +#include "url.h" #include <tqglobal.h> #include <tqvaluelist.h> @@ -173,9 +173,3 @@ namespace svn return mSchemas; } } - -/* ----------------------------------------------------------------- - * local variables: - * eval: (load-file "../../rapidsvn-dev.el") - * end: - */ diff --git a/src/svnqt/url.hpp b/src/svnqt/url.h index baaab46..a8c17b0 100644 --- a/src/svnqt/url.hpp +++ b/src/svnqt/url.h @@ -1,5 +1,5 @@ /* - * Port for usage with qt-framework and development for tdesvn + * Port for usage with tqt-framework and development for tdesvn * (C) 2005-2007 by Rajko Albrecht * http://tdesvn.alwins-world.de */ @@ -31,9 +31,9 @@ #ifndef _SVNCPP_URL_H_ #define _SVNCPP_URL_H_ -#include "svnqt/svnqt_defines.hpp" +#include "svnqt/svnqt_defines.h" -// qt +// tqt #include <tqglobal.h> #include <tqstring.h> @@ -84,9 +84,3 @@ namespace svn } #endif -/* ----------------------------------------------------------------- - * local variables: - * eval: (load-file "../../rapidsvn-dev.el") - * end: - */ - diff --git a/src/svnqt/version_check.cpp b/src/svnqt/version_check.cpp index ceb8e49..fa63a00 100644 --- a/src/svnqt/version_check.cpp +++ b/src/svnqt/version_check.cpp @@ -17,7 +17,7 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include "version_check.hpp" +#include "version_check.h" #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/svnqt/version_check.hpp b/src/svnqt/version_check.h index a16f233..f6129ac 100644 --- a/src/svnqt/version_check.hpp +++ b/src/svnqt/version_check.h @@ -20,7 +20,7 @@ #ifndef __VERSION_CHECK_HPP #define __VERSION_CHECK_HPP -#include "svnqt/svnqt_defines.hpp" +#include "svnqt/svnqt_defines.h" class TQString; diff --git a/src/svnqt/wc.cpp b/src/svnqt/wc.cpp index bf3b5dd..413fb10 100644 --- a/src/svnqt/wc.cpp +++ b/src/svnqt/wc.cpp @@ -1,5 +1,5 @@ /* - * Port for usage with qt-framework and development for tdesvn + * Port for usage with tqt-framework and development for tdesvn * (C) 2005-2007 by Rajko Albrecht * http://tdesvn.alwins-world.de */ @@ -32,10 +32,10 @@ #include "svn_wc.h" // svncpp -#include "exception.hpp" -#include "path.hpp" -#include "pool.hpp" -#include "wc.hpp" +#include "exception.h" +#include "path.h" +#include "pool.h" +#include "wc.h" namespace svn { @@ -62,7 +62,7 @@ namespace svn void Wc::ensureAdm (const TQString& dir, const TQString& uuid, - const TQString& url, const Revision & revision) throw (ClientException) + const TQString& url, const Revision & revision) { Pool pool; Path dirPath (dir); @@ -79,18 +79,18 @@ namespace svn throw ClientException (error); } - const svn_wc_entry_t *Wc::getEntry( const TQString &path ) throw ( ClientException ) + const svn_wc_entry_t *Wc::getEntry( const TQString &path ) { Pool pool; Path itemPath(path); svn_error_t * error = 0; svn_wc_adm_access_t *adm_access; const svn_wc_entry_t *entry; - error = svn_wc_adm_probe_open2(&adm_access,0,itemPath.path().TOUTF8(),FALSE,0,pool); + error = svn_wc_adm_probe_open2(&adm_access,0,itemPath.path().TOUTF8(),false,0,pool); if (error!=0) { throw ClientException(error); } - error = svn_wc_entry(&entry,itemPath.path().TOUTF8(),adm_access,FALSE,pool); + error = svn_wc_entry(&entry,itemPath.path().TOUTF8(),adm_access,false,pool); if (error!=0) { throw ClientException(error); } @@ -101,7 +101,7 @@ namespace svn return entry; } - TQString Wc::getUrl(const TQString&path) throw (ClientException) + TQString Wc::getUrl(const TQString&path) { TQString result = ""; const svn_wc_entry_t *entry; @@ -111,7 +111,7 @@ namespace svn return result; } - TQString Wc::getRepos(const TQString&path) throw (ClientException) + TQString Wc::getRepos(const TQString&path) { TQString result = ""; const svn_wc_entry_t *entry; @@ -121,9 +121,3 @@ namespace svn return result; } } - -/* ----------------------------------------------------------------- - * local variables: - * eval: (load-file "../../rapidsvn-dev.el") - * end: - */ diff --git a/src/svnqt/wc.hpp b/src/svnqt/wc.h index 43041ec..02c85b6 100644 --- a/src/svnqt/wc.hpp +++ b/src/svnqt/wc.h @@ -1,5 +1,5 @@ /* - * Port for usage with qt-framework and development for tdesvn + * Port for usage with tqt-framework and development for tdesvn * (C) 2005-2007 by Rajko Albrecht * http://tdesvn.alwins-world.de */ @@ -37,9 +37,9 @@ #endif // svncpp -#include "svnqt/exception.hpp" -#include "svnqt/revision.hpp" -#include "svnqt/svnqt_defines.hpp" +#include "svnqt/exception.h" +#include "svnqt/revision.h" +#include "svnqt/svnqt_defines.h" #include <tqstring.h> @@ -71,26 +71,21 @@ namespace svn */ static void ensureAdm (const TQString& dir, const TQString& uuid, - const TQString& url, const Revision & revision) throw (ClientException); + const TQString& url, const Revision & revision); /** * retrieve the url of a given working copy item * @param path the working copy item to check * @return the repository url of @a path */ - static TQString getUrl(const TQString&path) throw (ClientException); - static TQString getRepos(const TQString&path) throw (ClientException); + static TQString getUrl(const TQString&path); + static TQString getRepos(const TQString&path); static const char * ADM_DIR_NAME; private: - static const svn_wc_entry_t *getEntry( const TQString &path ) throw ( ClientException ); + static const svn_wc_entry_t *getEntry( const TQString &path ); }; } #endif -/* ----------------------------------------------------------------- - * local variables: - * eval: (load-file "../../rapidsvn-dev.el") - * end: - */ |