[Tora-cvs] SF.net SVN: tora:[3214] branches/tora-trotl

[<ibr...@us...>]

Revision: 3214
          http://tora.svn.sourceforge.net/tora/?rev=3214&view=rev
Author:   ibre5041
Date:     2009-07-12 22:30:05 +0000 (Sun, 12 Jul 2009)

Log Message:
-----------
upstream merged. small bug fixed

Modified Paths:
--------------
    branches/tora-trotl/CMakeLists.txt
    branches/tora-trotl/Makefile.am
    branches/tora-trotl/README.CMAKE
    branches/tora-trotl/README.OSX
    branches/tora-trotl/src/CMakeLists.txt
    branches/tora-trotl/src/toconnectionpool.cpp
    branches/tora-trotl/src/tooracleconnection.cpp
    branches/tora-trotl/src/toqsqlconnection.cpp
    branches/tora-trotl/src/toresulttableview.cpp
    branches/tora-trotl/src/toresultview.cpp

Added Paths:
-----------
    branches/tora-trotl/osx_tools/
    branches/tora-trotl/osx_tools/CompleteBundle.cmake.in
    branches/tora-trotl/osx_tools/CreateBundle.sh.in
    branches/tora-trotl/src/icons/tora.icns

Removed Paths:
-------------
    branches/tora-trotl/osx_tools/CompleteBundle.cmake.in
    branches/tora-trotl/osx_tools/CreateBundle.sh.in

Property Changed:
----------------
    branches/tora-trotl/


Property changes on: branches/tora-trotl
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk/tora:3192-3213

Modified: branches/tora-trotl/CMakeLists.txt
===================================================================
--- branches/tora-trotl/CMakeLists.txt	2009-07-08 22:43:32 UTC (rev 3213)
+++ branches/tora-trotl/CMakeLists.txt	2009-07-12 22:30:05 UTC (rev 3214)
@@ -32,7 +32,7 @@
 SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
 
 #Project Setup
-PROJECT(tora)
+PROJECT(TOra)
 #Set our version values
 #Final version is ${VERSION} = ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX}
 #where VERSION_SUFFIX is of the form "", "cvs" or "Ncvs" (N being the minor patch level)
@@ -123,21 +123,37 @@
 ENDIF (MSVC)
 
 
-#Based on our build type, setup our build options
-IF(APPLE)
-  SET( ENV{MACOSX_DEPLOYMENT_TARGET} 10.3 ) 
-  SET( ENV{LD_PREBIND} 1 )
-  SET( ENV{LD_PREBIND_ALLOW_OVERLAP} 1 )
-  SET(CMAKE_CXX_FLAGS_DEBUG "-O2 -g3 -fno-inline-functions ${CXX_WARNINGS}")
-  SET(CMAKE_C_FLAGS_DEBUG "-O2 -g3 -fno-inline-functions ${CXX_WARNINGS}")
-ELSE(APPLE)
-  SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -ggdb3 -fno-inline ${CXX_WARNINGS} -fstrict-aliasing")
-  SET(CMAKE_C_FLAGS_DEBUG "-O0 -ggbb3 -fno-inline ${CXX_WARNINGS} -fstrict-aliasing")
-ENDIF(APPLE)
+# --- If we are on OS X copy all the embedded libraries to the app bundle
+IF (APPLE AND WANT_BUNDLE)
+  # -------- Function to build OS X Stand Alone Bundles -----------------
+  function(MakeOSXBundleApp target binary_dir)
+    #-- Set some useful variables
+    SET (OSX_MAKE_STANDALONE_BUNDLE_CMAKE_SCRIPT "${binary_dir}/${target}_OSX_MakeStandAloneBundle.cmake")
+    SET (OSX_MAKE_STANDALONE_BUNDLE_BASH_SCRIPT "${binary_dir}/${target}_OSX_MakeStandAloneBundle.sh")
+    #-- Configure the cmake file and the shell script
+    CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/osx_tools/CompleteBundle.cmake.in"
+      "${OSX_MAKE_STANDALONE_BUNDLE_CMAKE_SCRIPT}" @ONLY IMMEDIATE)
+    CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/osx_tools/CreateBundle.sh.in"
+      "${OSX_MAKE_STANDALONE_BUNDLE_BASH_SCRIPT}" @ONLY IMMEDIATE)
+    #-- Create the installation code
+    install(SCRIPT "${OSX_MAKE_STANDALONE_BUNDLE_CMAKE_SCRIPT}")
 
+  endfunction(MakeOSXBundleApp)
 
+  #IF(CMAKE_BUILD_TYPE MATCHES "Debug")
+  #    MakeOSXBundleApp( "QtTest${EXE_DEBUG_EXTENSION}" ${PROJECT_BINARY_DIR})
+  #ELSE (CMAKE_BUILD_TYPE MATCHES "Debug")
+      MakeOSXBundleApp(TOra ${PROJECT_BINARY_DIR})
+  #ENDIF(CMAKE_BUILD_TYPE MATCHES "Debug")
+
+ENDIF (APPLE AND WANT_BUNDLE)
+
+
+#SET(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CXX_WARNINGS}")
+#SET(CMAKE_C_FLAGS_RELEASE "-O2 ${CXX_WARNINGS}")
 SET(CMAKE_CXX_FLAGS_RELEASE "-O0 -ggdb3 -fno-inline ${CXX_WARNINGS}")
 SET(CMAKE_C_FLAGS_RELEASE "-O0 -ggdb3 -fno-inline ${CXX_WARNINGS}")
+
 # Required for win wjen there is used an external qscintilla lib
 IF (WIN32 AND NOT DEFINED WANT_INTERNAL_QSCINTILLA)
   SET(CMAKE_CXX_FLAGS_RELEASE "/DQSCINTILLA_DLL ${CMAKE_CXX_FLAGS_RELEASE}")
@@ -270,6 +286,7 @@
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(doc)
 
+IF (NOT WANT_BUNDLE)
 #Install our READMEs etc.
 INSTALL(FILES
     AUTHORS
@@ -291,6 +308,7 @@
     TODO
     DESTINATION ${TORA_DOC_DIR}
 )
+ENDIF (NOT WANT_BUNDLE)
 
 # packaging related stuff
 #SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Toolkit for Oracle")

Modified: branches/tora-trotl/Makefile.am
===================================================================
--- branches/tora-trotl/Makefile.am	2009-07-08 22:43:32 UTC (rev 3213)
+++ branches/tora-trotl/Makefile.am	2009-07-12 22:30:05 UTC (rev 3214)
@@ -45,6 +45,7 @@
 	README.CODESTYLE \
 	README.LICENSE \
 	README.OSX \
+	README.LAYOUT \
 	README.CMAKE \
 	README.SVN \
 	README.BINARIES \

Modified: branches/tora-trotl/README.CMAKE
===================================================================
--- branches/tora-trotl/README.CMAKE	2009-07-08 22:43:32 UTC (rev 3213)
+++ branches/tora-trotl/README.CMAKE	2009-07-12 22:30:05 UTC (rev 3214)
@@ -58,6 +58,11 @@
 etc.
 
 
+TOra allows to be built as "bundle" application on Mac OS X.
+-DWANT_BUNDLE=1
+The bundle will be created in the CMAKE_INSTALL_PREFIX.
+
+
 Search following for more info:
 http://cmake.org
 http://docs.scribus.net/index.php?lang=en&page=install4

Modified: branches/tora-trotl/README.OSX
===================================================================
--- branches/tora-trotl/README.OSX	2009-07-08 22:43:32 UTC (rev 3213)
+++ branches/tora-trotl/README.OSX	2009-07-12 22:30:05 UTC (rev 3214)
@@ -1,6 +1,7 @@
 TOra is reported to build on Mac OS X (10.4 Tiger and later).
 
 Only Cmake build method is tested. See README.CMAKE.
+Mac OS X bundle can be created with WANT_BUNDLE. See README.CMAKE.
 
 
 Notes on Oracle Instantclient:
@@ -18,3 +19,7 @@
 It's caused by Oracle - you'll need to fix Instantclient libraries yourself:
 ln -s /path/to/instantclient/libclntsh.dylib.10.2 /path/to/instantclient/libclntsh.dylib
 ln -s /path/to/instantclient/libocci.dylib.10.2 /path/to/instantclient/libocci.dylib
+
+3) Keyboard shortcuts for Tool windows swicthing (AppleKey+number) can conflict with
+Mac's Open Spaces shortcuts in some cases.
+

Deleted: branches/tora-trotl/osx_tools/CompleteBundle.cmake.in
===================================================================
--- trunk/tora/osx_tools/CompleteBundle.cmake.in	2009-07-08 22:43:32 UTC (rev 3213)
+++ branches/tora-trotl/osx_tools/CompleteBundle.cmake.in	2009-07-12 22:30:05 UTC (rev 3214)
@@ -1,69 +0,0 @@
-#-- Need this for link line stuff?
-if(COMMAND cmake_policy)
-  cmake_policy(SET CMP0009 NEW)
-endif(COMMAND cmake_policy)
-
-
-# gp_item_default_embedded_path item default_embedded_path_var
-#
-# Return the path that others should refer to the item by when the item
-# is embedded inside a bundle.
-#
-# Override on a per-project basis by providing a project-specific
-# gp_item_default_embedded_path_override function.
-#
-function(gp_item_default_embedded_path_override item default_embedded_path_var)
-  #
-  # The assumption here is that all executables in the bundle will be
-  # in same-level-directories inside the bundle. The parent directory
-  # of an executable inside the bundle should be MacOS or a sibling of
-  # MacOS and all embedded paths returned from here will begin with
-  # "@loader_path/../" and will work from all executables in all
-  # such same-level-directories inside the bundle.
-  #
-
-  # By default, embed things right next to the main bundle executable:
-  #
-  set (install_name_prefix "@executable_path")
-  # -------------------------------------------------------------------
-  # If your application uses plugins then you should consider using the following
-  #  instead but will limit your deployment to OS X 10.4. There is also a patch
-  #  needed for CMake that as of Sept 30, 2008 has NOT been applied to CMake.
-  #  set (install_name_prefix "@loader_path")
-  
-  set(path "${install_name_prefix}/../../Contents/MacOS")
-
-  set(overridden 0)
-
-  # Embed .dylibs in the Libraries Directory
-  #
-  if(item MATCHES "\\.dylib$")
-    set(path "${install_name_prefix}/../Libraries")
-    set(overridden 1)
-  endif(item MATCHES "\\.dylib$")
-
-  # Embed .so files in the Plugins directory
-  #
-  if(item MATCHES "\\.so$")
-    set(path "${install_name_prefix}/../Plugins")
-    set(overridden 1)
-  endif(item MATCHES "\\.so$")
-  
-  # Embed frameworks in the embedded "Frameworks" directory (sibling of MacOS):
-  #
-  if(NOT overridden)
-    if(item MATCHES "[^/]+\\.framework/")
-      set(path "${install_name_prefix}/../Frameworks")
-      set(overridden 1)
-    endif(item MATCHES "[^/]+\\.framework/")
-  endif(NOT overridden)
-
-  set(${default_embedded_path_var} "${path}" PARENT_SCOPE)
-endfunction(gp_item_default_embedded_path_override)
-
-# -- Copy the App bundle to the installation location first
-EXECUTE_PROCESS( COMMAND "@OSX_MAKE_STANDALONE_BUNDLE_BASH_SCRIPT@" )
-
-# -- Run the BundleUtilities cmake code
-include(BundleUtilities)
-fixup_bundle("@CMAKE_INSTALL_PREFIX@/@target@.app" "${PluginList}" "Plugins")

Copied: branches/tora-trotl/osx_tools/CompleteBundle.cmake.in (from rev 3213, trunk/tora/osx_tools/CompleteBundle.cmake.in)
===================================================================
--- branches/tora-trotl/osx_tools/CompleteBundle.cmake.in	                        (rev 0)
+++ branches/tora-trotl/osx_tools/CompleteBundle.cmake.in	2009-07-12 22:30:05 UTC (rev 3214)
@@ -0,0 +1,69 @@
+#-- Need this for link line stuff?
+if(COMMAND cmake_policy)
+  cmake_policy(SET CMP0009 NEW)
+endif(COMMAND cmake_policy)
+
+
+# gp_item_default_embedded_path item default_embedded_path_var
+#
+# Return the path that others should refer to the item by when the item
+# is embedded inside a bundle.
+#
+# Override on a per-project basis by providing a project-specific
+# gp_item_default_embedded_path_override function.
+#
+function(gp_item_default_embedded_path_override item default_embedded_path_var)
+  #
+  # The assumption here is that all executables in the bundle will be
+  # in same-level-directories inside the bundle. The parent directory
+  # of an executable inside the bundle should be MacOS or a sibling of
+  # MacOS and all embedded paths returned from here will begin with
+  # "@loader_path/../" and will work from all executables in all
+  # such same-level-directories inside the bundle.
+  #
+
+  # By default, embed things right next to the main bundle executable:
+  #
+  set (install_name_prefix "@executable_path")
+  # -------------------------------------------------------------------
+  # If your application uses plugins then you should consider using the following
+  #  instead but will limit your deployment to OS X 10.4. There is also a patch
+  #  needed for CMake that as of Sept 30, 2008 has NOT been applied to CMake.
+  #  set (install_name_prefix "@loader_path")
+  
+  set(path "${install_name_prefix}/../../Contents/MacOS")
+
+  set(overridden 0)
+
+  # Embed .dylibs in the Libraries Directory
+  #
+  if(item MATCHES "\\.dylib$")
+    set(path "${install_name_prefix}/../Libraries")
+    set(overridden 1)
+  endif(item MATCHES "\\.dylib$")
+
+  # Embed .so files in the Plugins directory
+  #
+  if(item MATCHES "\\.so$")
+    set(path "${install_name_prefix}/../Plugins")
+    set(overridden 1)
+  endif(item MATCHES "\\.so$")
+  
+  # Embed frameworks in the embedded "Frameworks" directory (sibling of MacOS):
+  #
+  if(NOT overridden)
+    if(item MATCHES "[^/]+\\.framework/")
+      set(path "${install_name_prefix}/../Frameworks")
+      set(overridden 1)
+    endif(item MATCHES "[^/]+\\.framework/")
+  endif(NOT overridden)
+
+  set(${default_embedded_path_var} "${path}" PARENT_SCOPE)
+endfunction(gp_item_default_embedded_path_override)
+
+# -- Copy the App bundle to the installation location first
+EXECUTE_PROCESS( COMMAND "@OSX_MAKE_STANDALONE_BUNDLE_BASH_SCRIPT@" )
+
+# -- Run the BundleUtilities cmake code
+include(BundleUtilities)
+fixup_bundle("@CMAKE_INSTALL_PREFIX@/@target@.app" "${PluginList}" "Plugins")

Deleted: branches/tora-trotl/osx_tools/CreateBundle.sh.in
===================================================================
--- trunk/tora/osx_tools/CreateBundle.sh.in	2009-07-08 22:43:32 UTC (rev 3213)
+++ branches/tora-trotl/osx_tools/CreateBundle.sh.in	2009-07-12 22:30:05 UTC (rev 3214)
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-# Are we using Xcode to compile. If we are then the CMake variable
-# XCODE will be '1' otherwise it will be blank
-Xcode="@XCODE@x"
-InstallPrefix="@CMAKE_INSTALL_PREFIX@"
-ProjectBinaryDir="@binary_dir@"
-OSX_App_Name="@target@"
-
-# Check for a Debug build. Note that the EXE_DEBUG_EXTENSION was set
-# in the CMakeLists.txt file
-if [[ $Xcode == "1x" ]]; then
-  if [[ $BUILD_STYLE == "Debug" ]]; then
-    OSX_App_Name="@target@@EXE_DEBUG_EXTENSION@"
-  fi
-  OSX_App="@EXECUTABLE_OUTPUT_PATH@/$BUILD_STYLE/$OSX_App_Name.app"
-else
-  OSX_App="@EXECUTABLE_OUTPUT_PATH@/$OSX_App_Name.app"
-fi
-
-
-# Remove the previous @target@ app package so we start with a clean bundle
-echo "Removing Previous $OSX_App_Name.app bundle at $InstallPrefix/"
-rm -rf "$InstallPrefix/$OSX_App_Name.app"
-
-# copy the @target@.app bundle to the installation location
-echo "Copying $OSX_App_Name.app from the build tree to $InstallPrefix/"
-cp -Rp "$OSX_App" "$InstallPrefix/"
-
-OSX_App="@CMAKE_INSTALL_PREFIX@/$OSX_App_Name.app"
-ContentsDir="$OSX_App/Contents"
-SupportDir="$OSX_App/Contents/Support"
-LibrariesDir="$OSX_App/Contents/Libraries"
-FrameworksDir="$OSX_App/Contents/Frameworks"
-PluginsDir="$OSX_App/Contents/Plugins"
-
-
-# create directories in the @target@.app bundle
-mkdir -p "$SupportDir"
-if [ ! -e $LibrariesDir ]
-  then
-  mkdir -p "$LibrariesDir"
-fi
-
-

Copied: branches/tora-trotl/osx_tools/CreateBundle.sh.in (from rev 3213, trunk/tora/osx_tools/CreateBundle.sh.in)
===================================================================
--- branches/tora-trotl/osx_tools/CreateBundle.sh.in	                        (rev 0)
+++ branches/tora-trotl/osx_tools/CreateBundle.sh.in	2009-07-12 22:30:05 UTC (rev 3214)
@@ -0,0 +1,45 @@
+#!/bin/sh
+
+# Are we using Xcode to compile. If we are then the CMake variable
+# XCODE will be '1' otherwise it will be blank
+Xcode="@XCODE@x"
+InstallPrefix="@CMAKE_INSTALL_PREFIX@"
+ProjectBinaryDir="@binary_dir@"
+OSX_App_Name="@target@"
+
+# Check for a Debug build. Note that the EXE_DEBUG_EXTENSION was set
+# in the CMakeLists.txt file
+if [[ $Xcode == "1x" ]]; then
+  if [[ $BUILD_STYLE == "Debug" ]]; then
+    OSX_App_Name="@target@@EXE_DEBUG_EXTENSION@"
+  fi
+  OSX_App="@EXECUTABLE_OUTPUT_PATH@/$BUILD_STYLE/$OSX_App_Name.app"
+else
+  OSX_App="@EXECUTABLE_OUTPUT_PATH@/$OSX_App_Name.app"
+fi
+
+
+# Remove the previous @target@ app package so we start with a clean bundle
+echo "Removing Previous $OSX_App_Name.app bundle at $InstallPrefix/"
+rm -rf "$InstallPrefix/$OSX_App_Name.app"
+
+# copy the @target@.app bundle to the installation location
+echo "Copying $OSX_App_Name.app from the build tree to $InstallPrefix/"
+cp -Rp "$OSX_App" "$InstallPrefix/"
+
+OSX_App="@CMAKE_INSTALL_PREFIX@/$OSX_App_Name.app"
+ContentsDir="$OSX_App/Contents"
+SupportDir="$OSX_App/Contents/Support"
+LibrariesDir="$OSX_App/Contents/Libraries"
+FrameworksDir="$OSX_App/Contents/Frameworks"
+PluginsDir="$OSX_App/Contents/Plugins"
+
+
+# create directories in the @target@.app bundle
+mkdir -p "$SupportDir"
+if [ ! -e $LibrariesDir ]
+  then
+  mkdir -p "$LibrariesDir"
+fi
+
+

Modified: branches/tora-trotl/src/CMakeLists.txt
===================================================================
--- branches/tora-trotl/src/CMakeLists.txt	2009-07-08 22:43:32 UTC (rev 3213)
+++ branches/tora-trotl/src/CMakeLists.txt	2009-07-12 22:30:05 UTC (rev 3214)
@@ -483,22 +483,31 @@
 ENDIF (WANT_INTERNAL_QSCINTILLA)
 
 
+# Handle win/mac special stuff - it's left empty for linux/unix
+SET (GUI_TYPE)
+
 IF(WIN32)
     IF (MSVC)
         # this is a must to switch off subsystem:console (console window poping up)
         # WinMain wrapper from QT_QTMAIN_LIBRARY is used and liner must be modified
         LINK_LIBRARIES(${QT_QTMAIN_LIBRARY})
-        SET (WIN32_SUBSYSTEM WIN32)
-		IF (WANT_DEBUG)
+        SET (GUI_TYPE WIN32)
+	IF (WANT_DEBUG)
 	        SET (CMAKE_EXE_LINKER_FLAGS "/NODEFAULTLIB:msvcrtd.lib ${CMAKE_EXE_LINKER_FLAGS}")
-		ELSE (WANT_DEBUG)
+	ELSE (WANT_DEBUG)
             SET (CMAKE_EXE_LINKER_FLAGS "/NODEFAULTLIB:msvcrt.lib ${CMAKE_EXE_LINKER_FLAGS}")
-		ENDIF (WANT_DEBUG)
+	ENDIF (WANT_DEBUG)
     ENDIF (MSVC)
 ENDIF(WIN32)
 
+IF (APPLE AND WANT_BUNDLE)
+    SET(GUI_TYPE MACOSX_BUNDLE)
+    SET(MACOSX_BUNDLE_ICON_FILE ${CMAKE_SOURCE_DIR}/src/icons/tora.icns)
+    SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/src/icons/tora.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+ENDIF (APPLE AND WANT_BUNDLE)
 
-ADD_EXECUTABLE(${EXE_NAME} ${WIN32_SUBSYSTEM}
+
+ADD_EXECUTABLE(${EXE_NAME} ${GUI_TYPE}
   ${TORA_I18N_QM}
   ${TORA_MOC_SOURCES}
   ${TORA_SOURCES}
@@ -534,7 +543,11 @@
 IF (WIN32)
     INSTALL(TARGETS ${EXE_NAME} RUNTIME DESTINATION .)
 ELSE (WIN32)
-    INSTALL(TARGETS ${EXE_NAME} RUNTIME DESTINATION bin LIBRARY DESTINATION lib)
+    IF (NOT WANT_BUNDLE)
+        INSTALL(TARGETS ${EXE_NAME} RUNTIME DESTINATION bin LIBRARY DESTINATION lib)
+    ELSE (NOT WANT_BUNDLE)
+        INSTALL(TARGETS ${EXE_NAME} BUNDLE DESTINATION ${CMAKE_INSTALL_PREFIX})
+    ENDIF (NOT WANT_BUNDLE)
 ENDIF (WIN32)
 
 

Copied: branches/tora-trotl/src/icons/tora.icns (from rev 3213, trunk/tora/src/icons/tora.icns)
===================================================================
(Binary files differ)

Modified: branches/tora-trotl/src/toconnectionpool.cpp
===================================================================
--- branches/tora-trotl/src/toconnectionpool.cpp	2009-07-08 22:43:32 UTC (rev 3213)
+++ branches/tora-trotl/src/toconnectionpool.cpp	2009-07-12 22:30:05 UTC (rev 3214)
@@ -48,14 +48,13 @@
 
 #include "toconnectionpool.h"
 #include "tosql.h"
-#include "tothread.h"
 
 #include <QTimer>
 #include <QCoreApplication>
 #include <QApplication>
 
 
-static const int TEST_MSEC = 50000;
+static const int TEST_MSEC = 5000000;
 
 
 toConnectionPoolTest::toConnectionPoolTest(toConnectionPool *pool)
@@ -179,6 +178,11 @@
 
 toConnectionPool::~toConnectionPool() {
     QMetaObject::invokeMethod(TestThread, "quit", Qt::QueuedConnection);
+#ifdef Q_WS_MAC
+	// This is propably mandatory on Mac. If it's missing, the TestThread->wait()
+	// will block entire GUI for ever.
+	TestThread->quit();
+#endif
     // must call this or the queued call never executes while we wait
     // on the thread. Awesome.
     qApp->processEvents();

Modified: branches/tora-trotl/src/tooracleconnection.cpp
===================================================================
--- branches/tora-trotl/src/tooracleconnection.cpp	2009-07-08 22:43:32 UTC (rev 3213)
+++ branches/tora-trotl/src/tooracleconnection.cpp	2009-07-12 22:30:05 UTC (rev 3214)
@@ -1201,7 +1201,8 @@
 		//otl_null null;
 		for (toQList::iterator i = query()->params().begin();i != query()->params().end();i++)
 		{
-			const ::trotl::BindPar& bp = (*Query).get_next_in_bindpar();
+ 			const ::trotl::BindPar& bp = (*Query).get_curr_in_bindpar();
+			
 			if( (bp._bind_type & ( ::trotl::BindPar::BIND_IN | ::trotl::BindPar::BIND_OUT )) == 0)
 				throw toConnection::exception(QString::fromLatin1("Fatal pruser error - invalid BindPar"));
 			
@@ -1210,13 +1211,22 @@
 				get_log().ts( std::string(__HERE_SHORT__))
 					<< "VERY VERY TODO: bind param:" << (*i).toInt() << std::endl;
 			} else if( bp.bind_typename == "char" && (*i).isString()) {
+				std::string param((const char*)((*i).toString().toUtf8().constData()));
+				get_log().ts( std::string(__HERE_SHORT__))
+					<< "VERY VERY TODO: bind param:"
+					<< bp.bind_name << '\t'
+					<< param << " of:" << query()->params().size() << std::endl;
+
 			        (*Query) << (const char*)((*i).toString().toUtf8().constData());
 				get_log().ts( std::string(__HERE_SHORT__))
 					<< "VERY VERY TODO: bind param:"
 					<< (const char*)((*i).toString().toUtf8().constData()) << std::endl;
-			} else				
+			} else {
+				std::cerr << "Fatal pruser error - unsupported BindPar:" << std::endl;
+				exit(-1);
 				throw toConnection::exception(
 					QString::fromLatin1("Fatal pruser error - unsupported BindPar:") + bp.bind_typename.c_str());
+			}
 			
 			
 			// TODO

Modified: branches/tora-trotl/src/toqsqlconnection.cpp
===================================================================
--- branches/tora-trotl/src/toqsqlconnection.cpp	2009-07-08 22:43:32 UTC (rev 3213)
+++ branches/tora-trotl/src/toqsqlconnection.cpp	2009-07-12 22:30:05 UTC (rev 3214)
@@ -1750,14 +1750,19 @@
         }
     }
 
+
     ~toQSqlProvider()
     {
+#ifdef Q_WS_MAC
+#warning "toQSqlProvider is disabled for Mac OS X due crashes. Maybe it is not a correct solution..."
+#else
         for (int i = 0;i < Drivers.count();i++)
         {
             QString t = fromQSqlName(Drivers[i]);
             if (!t.isEmpty())
                 removeProvider(t);
         }
+#endif
     }
 
     virtual QWidget *providerConfigurationTab(const QString &provider,

Modified: branches/tora-trotl/src/toresulttableview.cpp
===================================================================
--- branches/tora-trotl/src/toresulttableview.cpp	2009-07-08 22:43:32 UTC (rev 3213)
+++ branches/tora-trotl/src/toresulttableview.cpp	2009-07-12 22:30:05 UTC (rev 3214)
@@ -52,7 +52,7 @@
 #include "toresultlistformat.h"
 #include "tolistviewformatter.h"
 #include "tolistviewformatterfactory.h"
-#include "tolistviewformatteridentifier.h"
+//#include "tolistviewformatteridentifier.h"
 #include "toworkingwidget.h"
 #include "tosearchreplace.h"
 

Modified: branches/tora-trotl/src/toresultview.cpp
===================================================================
--- branches/tora-trotl/src/toresultview.cpp	2009-07-08 22:43:32 UTC (rev 3213)
+++ branches/tora-trotl/src/toresultview.cpp	2009-07-12 22:30:05 UTC (rev 3214)
@@ -44,7 +44,7 @@
 #include "toconf.h"
 #include "tolistviewformatter.h"
 #include "tolistviewformatterfactory.h"
-#include "tolistviewformatteridentifier.h"
+//#include "tolistviewformatteridentifier.h"
 #include "tomain.h"
 #include "tomemoeditor.h"
 #include "toparamget.h"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.