2 files changed, 20 insertions, 38 deletions
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);
     }