Update of /cvsroot/tora/tora In directory sc8-pr-cvs1:/tmp/cvs-serv21534 Modified Files: INSTALL LICENSE.txt Makefile.OSX Makefile.sample NEWS README configure configure.pl main.cpp otlv4.h setlicense.pl toabout.cpp toabout.h toalert.cpp toalert.h toanalyze.cpp toanalyze.h tobackground.cpp tobackground.h tobackup.cpp tobackup.h tobarchart.cpp tobarchart.h tobrowser.cpp tobrowser.h tochangeconnection.cpp tochangeconnection.h tochartmanager.cpp tochartmanager.h toconf.h toconnection.cpp toconnection.h tocurrent.cpp tocurrent.h todebug.cpp todebug.h todebugtext.cpp todebugtext.h todefaultkeywords.h toeditextensions.cpp toeditextensions.h toeditwidget.cpp toeditwidget.h toextract.cpp toextract.h toextratranslations.cpp tofilesize.cpp tofilesize.h toglobalsetting.cpp toglobalsetting.h tohelp.cpp tohelp.h tohelpbrowser.h tohighlightedtext.cpp tohighlightedtext.h tohtml.cpp tohtml.h toinvalid.cpp toinvalid.h tolegendchart.cpp tolegendchart.h tolinechart.cpp tolinechart.h tomain.cpp tomain.h tomainwindow.h tomainwindow.kde.h tomarkedtext.2.h tomarkedtext.3.h tomarkedtext.cpp tomarkedtext.h tomemoeditor.cpp tomemoeditor.h tomysqlconnection.cpp tonewconnection.cpp tonewconnection.h tonoblockquery.cpp tonoblockquery.h toocistub.cpp tooracleconnection.cpp tooracleextract.cpp tooraclepreload.cpp tooutput.cpp tooutput.h toparamget.cpp toparamget.h topassword.cpp topiechart.cpp topiechart.h topreferences.cpp topreferences.h toprofiler.cpp toprofiler.h toproject.cpp toproject.h toqsqlconnection.cpp toqvalue.h tora_se.ts toreport.cpp toreport.h toresult.cpp toresult.h toresultbar.cpp toresultbar.h toresultcols.cpp toresultcols.h toresultcombo.cpp toresultcombo.h toresultconstraint.cpp toresultconstraint.h toresultcontent.cpp toresultcontent.h toresultdepend.cpp toresultdepend.h toresultextract.cpp toresultextract.h toresultfield.cpp toresultfield.h toresultindexes.cpp toresultindexes.h toresultitem.cpp toresultitem.h toresultlabel.cpp toresultlabel.h toresultline.cpp toresultline.h toresultlock.cpp toresultlock.h toresultlong.cpp toresultlong.h toresultparam.cpp toresultparam.h toresultpie.cpp toresultpie.h toresultplan.cpp toresultplan.h toresultreferences.cpp toresultreferences.h toresultresources.h toresultstats.cpp toresultstats.h toresultstorage.cpp toresultstorage.h toresultview.cpp toresultview.h torollback.cpp torollback.h toscript.cpp toscript.h tosearchreplace.cpp tosearchreplace.h tosecurity.cpp tosecurity.h tosession.cpp tosession.h tosgastatement.cpp tosgastatement.h tosgatrace.cpp tosgatrace.h tosmtp.cpp tosmtp.h tosql.cpp tosql.h tosqledit.cpp tosqledit.h tosqlparse.cpp tosqlparse.h tostorage.cpp tostorage.h tostoragedefinition.cpp tostoragedefinition.h tosyntaxsetup.cpp tosyntaxsetup.h totabwidget.cpp totabwidget.h totemplate.cpp totemplate.h totemplateprovider.cpp totemporary.cpp totemporary.h totextview.cpp totextview.h tothread.cpp tothread.h totool.cpp totool.h totuning.cpp totuning.h tovisualize.cpp tovisualize.h towaitevents.cpp towaitevents.h toworksheet.cpp toworksheet.h toworksheetstatistic.cpp toworksheetstatistic.h utils.cpp utils.h Log Message: Index: INSTALL =================================================================== RCS file: /cvsroot/tora/tora/INSTALL,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** INSTALL 26 Jul 2003 23:47:03 -0000 1.26 --- INSTALL 12 Jan 2004 01:06:04 -0000 1.27 *************** *** 86,88 **** /Henrik "Mauritz" Johnson ! Underscore AB \ No newline at end of file --- 86,88 ---- /Henrik "Mauritz" Johnson ! Quest Software, Inc \ No newline at end of file Index: LICENSE.txt =================================================================== RCS file: /cvsroot/tora/tora/LICENSE.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** LICENSE.txt 3 Oct 2002 14:53:14 -0000 1.1 --- LICENSE.txt 12 Jan 2004 01:06:04 -0000 1.2 *************** *** 1,4 **** ! The Toolkit for Oracle is Copyright (C) 2000-2001,2001 Underscore AB. You may use, distribute and copy Toolkit for Oracle under the terms of --- 1,4 ---- ! The Toolkit for Oracle is Copyright (C) 2003 Quest Software, Inc. You may use, distribute and copy Toolkit for Oracle under the terms of Index: Makefile.OSX =================================================================== RCS file: /cvsroot/tora/tora/Makefile.OSX,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.OSX 18 Nov 2003 15:45:33 -0000 1.2 --- Makefile.OSX 12 Jan 2004 01:06:04 -0000 1.3 *************** *** 2,6 **** # # TOra - An Oracle Toolkit for DBA's and developers ! # Copyright (C) 2000-2001,2001 Underscore AB # # This program is free software; you can redistribute it and/or --- 2,6 ---- # # TOra - An Oracle Toolkit for DBA's and developers ! # Copyright (C) 2003 Quest Software, Inc # # This program is free software; you can redistribute it and/or *************** *** 26,31 **** # Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. # And you are not permitted to distribute binaries compiled against ! # these libraries without written consent from Underscore AB. Observe ! # that this does not disallow linking to the Qt Free Edition. # # All trademarks belong to their respective owners. --- 26,31 ---- # Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. # And you are not permitted to distribute binaries compiled against ! # these libraries without written consent from Quest Software, Inc. ! # Observe that this does not disallow linking to the Qt Free Edition. # # All trademarks belong to their respective owners. *************** *** 118,122 **** # TO_NEW_CHECK - Disable new version check globally # TO_KDE - Compile as KDE application ! DEFINES+=-DOTL_ORA9I -DOTL_ORA_TIMESTAMP DEFINES+=-D_REENTRANT -DDEFAULT_PLUGIN_DIR=\"$(INSTALLLIB)/tora\" DEFINES+=-DTOMONOLITHIC --- 118,122 ---- # TO_NEW_CHECK - Disable new version check globally # TO_KDE - Compile as KDE application ! DEFINES+=-DOTL_ORA9I -DOTL_ORA_TIMESTAMP -DOTL_ANSI_CPP DEFINES+=-D_REENTRANT -DDEFAULT_PLUGIN_DIR=\"$(INSTALLLIB)/tora\" DEFINES+=-DTOMONOLITHIC Index: Makefile.sample =================================================================== RCS file: /cvsroot/tora/tora/Makefile.sample,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Makefile.sample 1 Aug 2003 00:37:02 -0000 1.17 --- Makefile.sample 12 Jan 2004 01:06:04 -0000 1.18 *************** *** 2,6 **** # # TOra - An Oracle Toolkit for DBA's and developers ! # Copyright (C) 2000-2001,2001 Underscore AB # # This program is free software; you can redistribute it and/or --- 2,6 ---- # # TOra - An Oracle Toolkit for DBA's and developers ! # Copyright (C) 2003 Quest Software, Inc # # This program is free software; you can redistribute it and/or *************** *** 26,31 **** # Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. # And you are not permitted to distribute binaries compiled against ! # these libraries without written consent from Underscore AB. Observe ! # that this does not disallow linking to the Qt Free Edition. # # All trademarks belong to their respective owners. --- 26,31 ---- # Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. # And you are not permitted to distribute binaries compiled against ! # these libraries without written consent from Quest Software, Inc. ! # Observe that this does not disallow linking to the Qt Free Edition. # # All trademarks belong to their respective owners. *************** *** 111,115 **** # TO_NEW_CHECK - Disable new version check globally # TO_KDE - Compile as KDE application ! DEFINES+=-DOTL_ORA8I -DOTL_ORA_TIMESTAMP DEFINES+=-D_REENTRANT -DDEFAULT_PLUGIN_DIR=\"$(INSTALLLIB)/tora\" DEFINES+=-DQT_THREAD_SUPPORT --- 111,115 ---- # TO_NEW_CHECK - Disable new version check globally # TO_KDE - Compile as KDE application ! DEFINES+=-DOTL_ORA8I -DOTL_ORA_TIMESTAMP -DOTL_ANSI_CPP DEFINES+=-D_REENTRANT -DDEFAULT_PLUGIN_DIR=\"$(INSTALLLIB)/tora\" DEFINES+=-DQT_THREAD_SUPPORT Index: NEWS =================================================================== RCS file: /cvsroot/tora/tora/NEWS,v retrieving revision 1.932 retrieving revision 1.933 diff -C2 -d -r1.932 -r1.933 *** NEWS 21 Nov 2003 11:09:56 -0000 1.932 --- NEWS 12 Jan 2004 01:06:04 -0000 1.933 *************** *** 1,4 **** ! 1.3.13: 2003-11-21: Fixed bug with package code completion. (Thanx Francesco Dandrea) 2003-11-21: Added close all editors to debugger. (Thanx Francesco Dandrea) --- 1,12 ---- ! 1.3.13: Released 2004-01-12 + 2004-01-11: Fixed uncought exceptions from enabling or disbling constraints in browser. + 2004-01-06: Changed copyright from Underscore to Quest Software. + 2003-12-24: Fixed parsing problem with ' at end of line in multiline strings. + 2003-12-23: Clear debugger object selection when current editor is closed. (Thanx Francesco Dandrea) + 2003-12-23: Fixed bug which changed schema for open debugger editors. (Thanx Francesco Dandrea) + 2003-12-23: Pass on option OTL_ANSI_CPP to OTL. + 2003-12-23: Upgraded OTL to 4.0.70. + 2003-12-16: Fixed problem in debugger with scaning source and disappearing contenttree. 2003-11-21: Fixed bug with package code completion. (Thanx Francesco Dandrea) 2003-11-21: Added close all editors to debugger. (Thanx Francesco Dandrea) Index: README =================================================================== RCS file: /cvsroot/tora/tora/README,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** README 7 Nov 2003 16:10:24 -0000 1.16 --- README 12 Jan 2004 01:06:04 -0000 1.17 *************** *** 1,5 **** TOra - Toolkit for Oracle ========================= ! Copyright (C) 2000-2001,2001 Underscore AB (http://www.underscore.se) For information about license see the LICENSE file. It is distributed under GPL --- 1,5 ---- TOra - Toolkit for Oracle ========================= ! Copyright (C) 2003 Quest Software, Inc (http://www.quest.com/) For information about license see the LICENSE file. It is distributed under GPL *************** *** 73,77 **** For installation instructions se the file INSTALL. ! TOra is developed by Henrik Johnson of Underscore AB (http://www.underscore.se) and has the homepage http://www.globecom.se/tora. If you encounter problems you can find both mailinglists and bugtracking tools from this page. --- 73,77 ---- For installation instructions se the file INSTALL. ! TOra is developed by Henrik Johnson of Quest Software, Inc (http://www.quest.com/) and has the homepage http://www.globecom.se/tora. If you encounter problems you can find both mailinglists and bugtracking tools from this page. *************** *** 89,93 **** 1. The code given is public domain without any associated copyright. ! 2. The copyright of the code given is assigned to Underscore AB. 3. The code is licensed under LGPL and part of a separate library. --- 89,93 ---- 1. The code given is public domain without any associated copyright. ! 2. The copyright of the code given is assigned to Quest Software, Inc. 3. The code is licensed under LGPL and part of a separate library. Index: configure =================================================================== RCS file: /cvsroot/tora/tora/configure,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** configure 20 Nov 2003 12:50:04 -0000 1.42 --- configure 12 Jan 2004 01:06:04 -0000 1.43 *************** *** 3,7 **** # # TOra - An Oracle Toolkit for DBA's and developers ! # Copyright (C) 2000-2001,2001 Underscore AB # # This program is free software; you can redistribute it and/or --- 3,7 ---- # # TOra - An Oracle Toolkit for DBA's and developers ! # Copyright (C) 2003 Quest Software, Inc # # This program is free software; you can redistribute it and/or *************** *** 27,32 **** # Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. # And you are not permitted to distribute binaries compiled against ! # these libraries without written consent from Underscore AB. Observe ! # that this does not disallow linking to the Qt Free Edition. # # All trademarks belong to their respective owners. --- 27,32 ---- # Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. # And you are not permitted to distribute binaries compiled against ! # these libraries without written consent from Quest Software, Inc. ! # Observe that this does not disallow linking to the Qt Free Edition. # # All trademarks belong to their respective owners. *************** *** 126,136 **** echo '"</PRE>";' >> LICENSE.h - echo $ac_n "ordering CD from http://www.globecom.se/tora/wish .$ac_c" - sleep 1 - echo $ac_n ".$ac_c" - sleep 1 - echo $ac_n ".$ac_c" - echo " just kidding ;)" - echo echo "------------------------------------------------------------------------" --- 126,129 ---- *************** *** 140,147 **** echo "If you have any problems check the top of the Makefile for the settings." echo - echo " ... that wishlist mentioned above does really exist. So if" - echo "you feel like showing your appreciation for TOra, this is the" - echo "place to go. I just love CDs and DVDs" - echo echo " Henrik Johnson" echo "------------------------------------------------------------------------" --- 133,137 ---- echo "If you have any problems check the top of the Makefile for the settings." echo echo " Henrik Johnson" + echo " Quest Software, Inc" echo "------------------------------------------------------------------------" Index: configure.pl =================================================================== RCS file: /cvsroot/tora/tora/configure.pl,v retrieving revision 1.171 retrieving revision 1.172 diff -C2 -d -r1.171 -r1.172 *** configure.pl 20 Nov 2003 12:50:04 -0000 1.171 --- configure.pl 12 Jan 2004 01:06:04 -0000 1.172 *************** *** 2,6 **** # # TOra - An Oracle Toolkit for DBA's and developers ! # Copyright (C) 2000-2001,2001 Underscore AB # # This program is free software; you can redistribute it and/or --- 2,6 ---- # # TOra - An Oracle Toolkit for DBA's and developers ! # Copyright (C) 2003 Quest Software, Inc # # This program is free software; you can redistribute it and/or *************** *** 26,31 **** # Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. # And you are not permitted to distribute binaries compiled against ! # these libraries without written consent from Underscore AB. Observe ! # that this does not disallow linking to the Qt Free Edition. # # All trademarks belong to their respective owners. --- 26,31 ---- # Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. # And you are not permitted to distribute binaries compiled against ! # these libraries without written consent from Quest Software, Inc. ! # Observe that this does not disallow linking to the Qt Free Edition. # # All trademarks belong to their respective owners. *************** *** 441,444 **** --- 441,445 ---- print TEMP "#define OTL_ORA8I\n"; } + print TEMP "#define OTL_ANSI_CPP\n"; print TEMP <<__TEMP__; *************** *** 1223,1227 **** # # TOra - An Oracle Toolkit for DBA's and developers ! # Copyright (C) 2000-2001,2001 Underscore AB # # This program is free software; you can redistribute it and/or --- 1224,1228 ---- # # TOra - An Oracle Toolkit for DBA's and developers ! # Copyright (C) 2003 Quest Software, Inc # # This program is free software; you can redistribute it and/or *************** *** 1247,1252 **** # Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. # And you are not permitted to distribute binaries compiled against ! # these libraries without written consent from Underscore AB. Observe ! # that this does not disallow linking to the Qt Free Edition. # # All trademarks belong to their respective owners. --- 1248,1253 ---- # Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. # And you are not permitted to distribute binaries compiled against ! # these libraries without written consent from Quest Software, Inc. ! # Observe that this does not disallow linking to the Qt Free Edition. # # All trademarks belong to their respective owners. *************** *** 1363,1371 **** if ($OracleRelease =~ /^8.0/) { ! print MAKEFILE "DEFINES+=-DOTL_ORA8\n"; } elsif ($OracleRelease ge "9") { ! print MAKEFILE "DEFINES+=-DOTL_ORA9I -DOTL_ORA_TIMESTAMP\n"; } else { ! print MAKEFILE "DEFINES+=-DOTL_ORA8I -DOTL_ORA_TIMESTAMP\n"; } if (!$NewCheck) { --- 1364,1372 ---- if ($OracleRelease =~ /^8.0/) { ! print MAKEFILE "DEFINES+=-DOTL_ORA8 -DOTL_ANSI_CPP\n"; } elsif ($OracleRelease ge "9") { ! print MAKEFILE "DEFINES+=-DOTL_ORA9I -DOTL_ORA_TIMESTAMP -DOTL_ANSI_CPP\n"; } else { ! print MAKEFILE "DEFINES+=-DOTL_ORA8I -DOTL_ORA_TIMESTAMP -DOTL_ANSI_CPP\n"; } if (!$NewCheck) { Index: main.cpp =================================================================== RCS file: /cvsroot/tora/tora/main.cpp,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** main.cpp 13 Oct 2003 23:09:18 -0000 1.69 --- main.cpp 12 Jan 2004 01:06:04 -0000 1.70 *************** *** 2,6 **** /* * TOra - An Oracle Toolkit for DBA's and developers ! * Copyright (C) 2000-2001,2001 Underscore AB * * This program is free software; you can redistribute it and/or --- 2,6 ---- /* * TOra - An Oracle Toolkit for DBA's and developers ! * Copyright (C) 2003 Quest Software, Inc * * This program is free software; you can redistribute it and/or *************** *** 26,31 **** * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. * And you are not permitted to distribute binaries compiled against ! * these libraries without written consent from Underscore AB. Observe ! * that this does not disallow linking to the Qt Free Edition. * * All trademarks belong to their respective owners. --- 26,31 ---- * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. * And you are not permitted to distribute binaries compiled against ! * these libraries without written consent from Quest Software, Inc. ! * Observe that this does not disallow linking to the Qt Free Edition. * * All trademarks belong to their respective owners. Index: otlv4.h =================================================================== RCS file: /cvsroot/tora/tora/otlv4.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** otlv4.h 7 Nov 2003 16:10:24 -0000 1.17 --- otlv4.h 12 Jan 2004 01:06:04 -0000 1.18 *************** *** 1,4 **** // ============================================================== ! // Oracle, ODBC and DB2/CLI Template Library, Version 4.0.68, // Copyright (C) Sergei Kuchin, 1996,2003 // Author: Sergei Kuchin --- 1,4 ---- // ============================================================== ! // Oracle, ODBC and DB2/CLI Template Library, Version 4.0.70, // Copyright (C) Sergei Kuchin, 1996,2003 // Author: Sergei Kuchin *************** *** 14,18 **** #define __OTL_H__ ! #define OTL_VERSION_NUMBER (0x040044L) #include <string.h> --- 14,18 ---- #define __OTL_H__ ! #define OTL_VERSION_NUMBER (0x040046L) #include <string.h> *************** *** 423,427 **** #if (defined(OTL_ORA7) || defined(OTL_ORA8) || \ ! defined(OTL_ORA8I) || defined(OTL_OAR9I) ) && \ defined(OTL_BIGINT) && \ !(defined(OTL_ODBC) || defined(OTL_DB2_CLI)) --- 423,427 ---- #if (defined(OTL_ORA7) || defined(OTL_ORA8) || \ ! defined(OTL_ORA8I) || defined(OTL_ORA9I) ) && \ defined(OTL_BIGINT) && \ !(defined(OTL_ODBC) || defined(OTL_DB2_CLI)) *************** *** 478,481 **** --- 478,483 ---- #define OTL_CCAST(_t,_e) const_cast<_t >(_e) + #define OTL_CONST_EXCEPTION const + #if defined OTL_FUNC_THROW_SPEC_ON #define OTL_THROWS_OTL_EXCEPTION throw(otl_exception) *************** *** 494,497 **** --- 496,500 ---- #define OTL_DCAST(_t,_e) ((_t)(_e)) #define OTL_CCAST(_t,_e) ((_t)(_e)) + #define OTL_CONST_EXCEPTION #define OTL_THROWS_OTL_EXCEPTION #define OTL_NO_THROW *************** *** 3876,3883 **** cur.exec(); return cur.cursor_struct.get_rpc(); ! }catch(otl_tmpl_exception <TExceptionStruct, TConnectStruct, ! TCursorStruct>){ if(exception_enabled){ connect.throw_count++; --- 3879,3886 ---- cur.exec(); return cur.cursor_struct.get_rpc(); ! }catch(OTL_CONST_EXCEPTION otl_tmpl_exception <TExceptionStruct, TConnectStruct, ! TCursorStruct>&){ if(exception_enabled){ connect.throw_count++; *************** *** 4721,4728 **** null_fetched=0; } ! }catch(otl_tmpl_exception <TExceptionStruct, TConnectStruct, ! TCursorStruct>){ cleanup(); if(this->adb)this->adb->throw_count++; --- 4724,4731 ---- null_fetched=0; } ! }catch(OTL_CONST_EXCEPTION otl_tmpl_exception <TExceptionStruct, TConnectStruct, ! TCursorStruct>&){ cleanup(); if(this->adb)this->adb->throw_count++; *************** *** 5901,5908 **** bind(*(this->vl[i])); } ! }catch(otl_tmpl_exception <TExceptionStruct, TConnectStruct, ! TCursorStruct>){ cleanup(); if(this->adb)this->adb->throw_count++; --- 5904,5911 ---- bind(*(this->vl[i])); } ! }catch(OTL_CONST_EXCEPTION otl_tmpl_exception <TExceptionStruct, TConnectStruct, ! TCursorStruct>&){ cleanup(); if(this->adb)this->adb->throw_count++; *************** *** 7109,7116 **** this->bind(*in_vl[j]); rewind(); ! }catch(otl_tmpl_exception <TExceptionStruct, TConnectStruct, ! TCursorStruct>){ cleanup(); if(this->adb)this->adb->throw_count++; --- 7112,7119 ---- this->bind(*in_vl[j]); rewind(); ! }catch(OTL_CONST_EXCEPTION otl_tmpl_exception <TExceptionStruct, TConnectStruct, ! TCursorStruct>&){ cleanup(); if(this->adb)this->adb->throw_count++; *************** *** 10598,10601 **** --- 10601,10614 ---- } + private: + + otl_connect& operator=(const otl_connect&) + { + return *this; + } + + otl_connect(const otl_connect&) + : otl_ora8_connect() + {} }; *************** *** 10795,10799 **** rewind(); null_fetched=0; ! }catch(otl_exception){ cleanup(); if(this->adb)this->adb->throw_count++; --- 10808,10812 ---- rewind(); null_fetched=0; ! }catch(OTL_CONST_EXCEPTION otl_exception&){ cleanup(); if(this->adb)this->adb->throw_count++; *************** *** 11402,11405 **** --- 11415,11428 ---- } + private: + + otl_refcur_stream& operator=(const otl_refcur_stream&) + { + return *this; + } + + otl_refcur_stream(const otl_refcur_stream&) + :otl_refcur_base_cursor() + {} }; *************** *** 12022,12026 **** null_fetched=0; } ! }catch(otl_exception){ cleanup(); if(this->adb)this->adb->throw_count++; --- 12045,12049 ---- null_fetched=0; } ! }catch(OTL_CONST_EXCEPTION otl_exception&){ cleanup(); if(this->adb)this->adb->throw_count++; *************** *** 13661,13665 **** (*io)->flush_flag2=true; } ! }catch(otl_exception&){ if(shell!=0){ if((*io)!=0) --- 13684,13688 ---- (*io)->flush_flag2=true; } ! }catch(OTL_CONST_EXCEPTION otl_exception&){ if(shell!=0){ if((*io)!=0) *************** *** 13844,13848 **** (*io)->flush_flag=shell->flush_flag; } ! }catch(otl_exception&){ shell_pt.destroy(); throw; --- 13867,13871 ---- (*io)->flush_flag=shell->flush_flag; } ! }catch(OTL_CONST_EXCEPTION otl_exception&){ shell_pt.destroy(); throw; *************** *** 13867,13871 **** try{ (*ref_ss)->close(); ! }catch(otl_exception&){ delete (*ref_ss); (*ref_ss)=0; --- 13890,13894 ---- try{ (*ref_ss)->close(); ! }catch(OTL_CONST_EXCEPTION otl_exception&){ delete (*ref_ss); (*ref_ss)=0; *************** *** 13879,13883 **** try{ (*ss)->close(); ! }catch(otl_exception&){ delete (*ss); (*ss)=0; --- 13902,13906 ---- try{ (*ss)->close(); ! }catch(OTL_CONST_EXCEPTION otl_exception&){ delete (*ss); (*ss)=0; *************** *** 13891,13895 **** try{ (*io)->flush(); ! }catch(otl_exception&){ clean(1); delete (*io); --- 13914,13918 ---- try{ (*io)->flush(); ! }catch(OTL_CONST_EXCEPTION otl_exception&){ clean(1); delete (*io); *************** *** 13922,13926 **** this->flush(); this->clean(1); ! }catch(otl_exception&){ this->clean(1); throw; --- 13945,13949 ---- this->flush(); this->clean(1); ! }catch(OTL_CONST_EXCEPTION otl_exception&){ this->clean(1); throw; *************** *** 14608,14611 **** --- 14631,14643 ---- return *this; } + + private: + + otl_stream& operator=(const otl_stream&) + { + return *this; + } + + otl_stream(const otl_stream&){} }; Index: setlicense.pl =================================================================== RCS file: /cvsroot/tora/tora/setlicense.pl,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** setlicense.pl 8 Nov 2001 17:33:59 -0000 1.11 --- setlicense.pl 12 Jan 2004 01:06:04 -0000 1.12 *************** *** 3,7 **** # # TOra - An Oracle Toolkit for DBA's and developers ! # Copyright (C) 2000-2001,2001 Underscore AB # # This program is free software; you can redistribute it and/or --- 3,7 ---- # # TOra - An Oracle Toolkit for DBA's and developers ! # Copyright (C) 2003 Quest Software, Inc # # This program is free software; you can redistribute it and/or *************** *** 27,32 **** # Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. # And you are not permitted to distribute binaries compiled against ! # these libraries without written consent from Underscore AB. Observe ! # that this does not disallow linking to the Qt Free Edition. # # All trademarks belong to their respective owners. --- 27,32 ---- # Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. # And you are not permitted to distribute binaries compiled against ! # these libraries without written consent from Quest Software, Inc. ! # Observe that this does not disallow linking to the Qt Free Edition. # # All trademarks belong to their respective owners. *************** *** 40,44 **** /* * TOra - An Oracle Toolkit for DBA\'s and developers ! * Copyright (C) 2000-2001,2001 Underscore AB * * This program is free software; you can redistribute it and/or --- 40,44 ---- /* * TOra - An Oracle Toolkit for DBA\'s and developers ! * Copyright (C) 2003 Quest Software, Inc * * This program is free software; you can redistribute it and/or *************** *** 64,69 **** * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. * And you are not permitted to distribute binaries compiled against ! * these libraries without written consent from Underscore AB. Observe ! * that this does not disallow linking to the Qt Free Edition. * * All trademarks belong to their respective owners. --- 64,69 ---- * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. * And you are not permitted to distribute binaries compiled against ! * these libraries without written consent from Quest Software, Inc. ! * Observe that this does not disallow linking to the Qt Free Edition. * * All trademarks belong to their respective owners. Index: toabout.cpp =================================================================== RCS file: /cvsroot/tora/tora/toabout.cpp,v retrieving revision 1.80 retrieving revision 1.81 diff -C2 -d -r1.80 -r1.81 *** toabout.cpp 21 Oct 2003 08:52:26 -0000 1.80 --- toabout.cpp 12 Jan 2004 01:06:04 -0000 1.81 *************** *** 2,6 **** /* * TOra - An Oracle Toolkit for DBA's and developers ! * Copyright (C) 2000-2001,2001 Underscore AB * * This program is free software; you can redistribute it and/or --- 2,6 ---- /* * TOra - An Oracle Toolkit for DBA's and developers ! * Copyright (C) 2003 Quest Software, Inc * * This program is free software; you can redistribute it and/or *************** *** 26,31 **** * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. * And you are not permitted to distribute binaries compiled against ! * these libraries without written consent from Underscore AB. Observe ! * that this does not disallow linking to the Qt Free Edition. * * All trademarks belong to their respective owners. --- 26,31 ---- * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. * And you are not permitted to distribute binaries compiled against ! * these libraries without written consent from Quest Software, Inc. ! * Observe that this does not disallow linking to the Qt Free Edition. * * All trademarks belong to their respective owners. *************** *** 62,67 **** "Version %1 (<A HREF=http://www.globecom.se/tora>http://www.globecom.se/tora</A>)\n" "<P>\n" ! "© 2000-2001,2001 copyright of Underscore AB\n" ! "(<A HREF=http://www.underscore.se>http://www.underscore.se/</a>).<P>\n" "Written by Henrik Johnson.<P>\n" "Webhosting by GlobeCom AB (<A HREF=http://www.globecom.se>www.globecom.se</A>).<P>\n" --- 62,67 ---- "Version %1 (<A HREF=http://www.globecom.se/tora>http://www.globecom.se/tora</A>)\n" "<P>\n" ! "© 2003 copyright of Quest Software, Inc\n" ! "(<A HREF=http://www.quest.com>http://www.quest.com/</a>).<P>\n" "Written by Henrik Johnson.<P>\n" "Webhosting by GlobeCom AB (<A HREF=http://www.globecom.se>www.globecom.se</A>).<P>\n" *************** *** 82,93 **** "Version %1 (<A HREF=http://www.globecom.se/tora>http://www.globecom.se/tora</A>)\n" "<P>\n" ! "© 2000-2001,2001 copyright of Underscore AB\n" ! "(<A HREF=http://www.underscore.se>http://www.underscore.se/</a>).<P>\n" "Written by Henrik Johnson.<P>\n" "Webhosting by GlobeCom AB (<A HREF=http://www.globecom.se>www.globecom.se</A>).<P>\n" - "<b>If you find this program usefull please have a look at my Amazon wish list at\n" - "<A HREF=http://www.globecom.se/tora/wish>" - "http://www.globecom.se/tora/wish</A> if you feel like showing your appreciation for this\n" - "program.</b><P>" "This program is available\n" "under the GNU General Public License.\n" --- 82,89 ---- "Version %1 (<A HREF=http://www.globecom.se/tora>http://www.globecom.se/tora</A>)\n" "<P>\n" ! "© 2003 copyright of Quest Software, Inc\n" ! "(<A HREF=http://www.quest.com>http://www.quest.com/</a>).<P>\n" "Written by Henrik Johnson.<P>\n" "Webhosting by GlobeCom AB (<A HREF=http://www.globecom.se>www.globecom.se</A>).<P>\n" "This program is available\n" "under the GNU General Public License.\n" Index: toabout.h =================================================================== RCS file: /cvsroot/tora/tora/toabout.h,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** toabout.h 16 Dec 2001 01:17:03 -0000 1.16 --- toabout.h 12 Jan 2004 01:06:04 -0000 1.17 *************** *** 2,6 **** /* * TOra - An Oracle Toolkit for DBA's and developers ! * Copyright (C) 2000-2001,2001 Underscore AB * * This program is free software; you can redistribute it and/or --- 2,6 ---- /* * TOra - An Oracle Toolkit for DBA's and developers ! * Copyright (C) 2003 Quest Software, Inc * * This program is free software; you can redistribute it and/or *************** *** 26,31 **** * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. * And you are not permitted to distribute binaries compiled against ! * these libraries without written consent from Underscore AB. Observe ! * that this does not disallow linking to the Qt Free Edition. * * All trademarks belong to their respective owners. --- 26,31 ---- * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. * And you are not permitted to distribute binaries compiled against ! * these libraries without written consent from Quest Software, Inc. ! * Observe that this does not disallow linking to the Qt Free Edition. * * All trademarks belong to their respective owners. Index: toalert.cpp =================================================================== RCS file: /cvsroot/tora/tora/toalert.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** toalert.cpp 10 Feb 2003 23:11:39 -0000 1.28 --- toalert.cpp 12 Jan 2004 01:06:04 -0000 1.29 *************** *** 2,6 **** /* * TOra - An Oracle Toolkit for DBA's and developers ! * Copyright (C) 2000-2001,2001 Underscore AB * * This program is free software; you can redistribute it and/or --- 2,6 ---- /* * TOra - An Oracle Toolkit for DBA's and developers ! * Copyright (C) 2003 Quest Software, Inc * * This program is free software; you can redistribute it and/or *************** *** 26,31 **** * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. * And you are not permitted to distribute binaries compiled against ! * these libraries without written consent from Underscore AB. Observe ! * that this does not disallow linking to the Qt Free Edition. * * All trademarks belong to their respective owners. --- 26,31 ---- * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. * And you are not permitted to distribute binaries compiled against ! * these libraries without written consent from Quest Software, Inc. ! * Observe that this does not disallow linking to the Qt Free Edition. * * All trademarks belong to their respective owners. Index: toalert.h =================================================================== RCS file: /cvsroot/tora/tora/toalert.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** toalert.h 6 Feb 2003 22:34:49 -0000 1.7 --- toalert.h 12 Jan 2004 01:06:04 -0000 1.8 *************** *** 2,6 **** /* * TOra - An Oracle Toolkit for DBA's and developers ! * Copyright (C) 2000-2001,2001 Underscore AB * * This program is free software; you can redistribute it and/or --- 2,6 ---- /* * TOra - An Oracle Toolkit for DBA's and developers ! * Copyright (C) 2003 Quest Software, Inc * * This program is free software; you can redistribute it and/or *************** *** 26,31 **** * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. * And you are not permitted to distribute binaries compiled against ! * these libraries without written consent from Underscore AB. Observe ! * that this does not disallow linking to the Qt Free Edition. * * All trademarks belong to their respective owners. --- 26,31 ---- * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. * And you are not permitted to distribute binaries compiled against ! * these libraries without written consent from Quest Software, Inc. ! * Observe that this does not disallow linking to the Qt Free Edition. * * All trademarks belong to their respective owners. Index: toanalyze.cpp =================================================================== RCS file: /cvsroot/tora/tora/toanalyze.cpp,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** toanalyze.cpp 24 Jul 2003 13:48:03 -0000 1.37 --- toanalyze.cpp 12 Jan 2004 01:06:04 -0000 1.38 *************** *** 2,6 **** /* * TOra - An Oracle Toolkit for DBA's and developers ! * Copyright (C) 2000-2001,2001 Underscore AB * * This program is free software; you can redistribute it and/or --- 2,6 ---- /* * TOra - An Oracle Toolkit for DBA's and developers ! * Copyright (C) 2003 Quest Software, Inc * * This program is free software; you can redistribute it and/or *************** *** 26,31 **** * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. * And you are not permitted to distribute binaries compiled against ! * these libraries without written consent from Underscore AB. Observe ! * that this does not disallow linking to the Qt Free Edition. * * All trademarks belong to their respective owners. --- 26,31 ---- * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. * And you are not permitted to distribute binaries compiled against ! * these libraries without written consent from Quest Software, Inc. ! * Observe that this does not disallow linking to the Qt Free Edition. * * All trademarks belong to their respective owners. Index: toanalyze.h =================================================================== RCS file: /cvsroot/tora/tora/toanalyze.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** toanalyze.h 23 Apr 2003 01:37:11 -0000 1.9 --- toanalyze.h 12 Jan 2004 01:06:05 -0000 1.10 *************** *** 2,6 **** /* * TOra - An Oracle Toolkit for DBA's and developers ! * Copyright (C) 2000-2001,2001 Underscore AB * * This program is free software; you can redistribute it and/or --- 2,6 ---- /* * TOra - An Oracle Toolkit for DBA's and developers ! * Copyright (C) 2003 Quest Software, Inc * * This program is free software; you can redistribute it and/or *************** *** 26,31 **** * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. * And you are not permitted to distribute binaries compiled against ! * these libraries without written consent from Underscore AB. Observe ! * that this does not disallow linking to the Qt Free Edition. * * All trademarks belong to their respective owners. --- 26,31 ---- * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. * And you are not permitted to distribute binaries compiled against ! * these libraries without written consent from Quest Software, Inc. ! * Observe that this does not disallow linking to the Qt Free Edition. * * All trademarks belong to their respective owners. Index: tobackground.cpp =================================================================== RCS file: /cvsroot/tora/tora/tobackground.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** tobackground.cpp 27 Jul 2003 23:54:15 -0000 1.16 --- tobackground.cpp 12 Jan 2004 01:06:05 -0000 1.17 *************** *** 2,6 **** /* * TOra - An Oracle Toolkit for DBA's and developers ! * Copyright (C) 2000-2001,2001 Underscore AB * * This program is free software; you can redistribute it and/or --- 2,6 ---- /* * TOra - An Oracle Toolkit for DBA's and developers ! * Copyright (C) 2003 Quest Software, Inc * * This program is free software; you can redistribute it and/or *************** *** 26,31 **** * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. * And you are not permitted to distribute binaries compiled against ! * these libraries without written consent from Underscore AB. Observe ! * that this does not disallow linking to the Qt Free Edition. * * All trademarks belong to their respective owners. --- 26,31 ---- * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. * And you are not permitted to distribute binaries compiled against ! * these libraries without written consent from Quest Software, Inc. ! * Observe that this does not disallow linking to the Qt Free Edition. * * All trademarks belong to their respective owners. Index: tobackground.h =================================================================== RCS file: /cvsroot/tora/tora/tobackground.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tobackground.h 10 Feb 2003 23:11:42 -0000 1.6 --- tobackground.h 12 Jan 2004 01:06:05 -0000 1.7 *************** *** 2,6 **** /* * TOra - An Oracle Toolkit for DBA's and developers ! * Copyright (C) 2000-2001,2001 Underscore AB * * This program is free software; you can redistribute it and/or --- 2,6 ---- /* * TOra - An Oracle Toolkit for DBA's and developers ! * Copyright (C) 2003 Quest Software, Inc * * This program is free software; you can redistribute it and/or *************** *** 26,31 **** * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. * And you are not permitted to distribute binaries compiled against ! * these libraries without written consent from Underscore AB. Observe ! * that this does not disallow linking to the Qt Free Edition. * * All trademarks belong to their respective owners. --- 26,31 ---- * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. * And you are not permitted to distribute binaries compiled against ! * these libraries without written consent from Quest Software, Inc. ! * Observe that this does not disallow linking to the Qt Free Edition. * * All trademarks belong to their respective owners. Index: tobackup.cpp =================================================================== RCS file: /cvsroot/tora/tora/tobackup.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tobackup.cpp 2 Sep 2002 20:25:38 -0000 1.6 --- tobackup.cpp 12 Jan 2004 01:06:05 -0000 1.7 *************** *** 2,6 **** /* * TOra - An Oracle Toolkit for DBA's and developers ! * Copyright (C) 2000-2001,2001 Underscore AB * * This program is free software; you can redistribute it and/or --- 2,6 ---- /* * TOra - An Oracle Toolkit for DBA's and developers ! * Copyright (C) 2003 Quest Software, Inc * * This program is free software; you can redistribute it and/or *************** *** 26,31 **** * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. * And you are not permitted to distribute binaries compiled against ! * these libraries without written consent from Underscore AB. Observe ! * that this does not disallow linking to the Qt Free Edition. * * All trademarks belong to their respective owners. --- 26,31 ---- * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. * And you are not permitted to distribute binaries compiled against ! * these libraries without written consent from Quest Software, Inc. ! * Observe that this does not disallow linking to the Qt Free Edition. * * All trademarks belong to their respective owners. Index: tobackup.h =================================================================== RCS file: /cvsroot/tora/tora/tobackup.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tobackup.h 26 May 2003 17:51:44 -0000 1.3 --- tobackup.h 12 Jan 2004 01:06:05 -0000 1.4 *************** *** 2,6 **** /* * TOra - An Oracle Toolkit for DBA's and developers ! * Copyright (C) 2000-2001,2001 Underscore AB * * This program is free software; you can redistribute it and/or --- 2,6 ---- /* * TOra - An Oracle Toolkit for DBA's and developers ! * Copyright (C) 2003 Quest Software, Inc * * This program is free software; you can redistribute it and/or *************** *** 26,31 **** * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. * And you are not permitted to distribute binaries compiled against ! * these libraries without written consent from Underscore AB. Observe ! * that this does not disallow linking to the Qt Free Edition. * * All trademarks belong to their respective owners. --- 26,31 ---- * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. * And you are not permitted to distribute binaries compiled against ! * these libraries without written consent from Quest Software, Inc. ! * Observe that this does not disallow linking to the Qt Free Edition. * * All trademarks belong to their respective owners. Index: tobarchart.cpp =================================================================== RCS file: /cvsroot/tora/tora/tobarchart.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** tobarchart.cpp 22 Jul 2003 00:15:01 -0000 1.30 --- tobarchart.cpp 12 Jan 2004 01:06:05 -0000 1.31 *************** *** 2,6 **** /* * TOra - An Oracle Toolkit for DBA's and developers ! * Copyright (C) 2000-2001,2001 Underscore AB * * This program is free software; you can redistribute it and/or --- 2,6 ---- /* * TOra - An Oracle Toolkit for DBA's and developers ! * Copyright (C) 2003 Quest Software, Inc * * This program is free software; you can redistribute it and/or *************** *** 26,31 **** * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. * And you are not permitted to distribute binaries compiled against ! * these libraries without written consent from Underscore AB. Observe ! * that this does not disallow linking to the Qt Free Edition. * * All trademarks belong to their respective owners. --- 26,31 ---- * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. * And you are not permitted to distribute binaries compiled against ! * these libraries without written consent from Quest Software, Inc. ! * Observe that this does not disallow linking to the Qt Free Edition. * * All trademarks belong to their respective owners. Index: tobarchart.h =================================================================== RCS file: /cvsroot/tora/tora/tobarchart.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** tobarchart.h 28 Dec 2001 19:02:47 -0000 1.15 --- tobarchart.h 12 Jan 2004 01:06:05 -0000 1.16 *************** *** 2,6 **** /* * TOra - An Oracle Toolkit for DBA's and developers ! * Copyright (C) 2000-2001,2001 Underscore AB * * This program is free software; you can redistribute it and/or --- 2,6 ---- /* * TOra - An Oracle Toolkit for DBA's and developers ! * Copyright (C) 2003 Quest Software, Inc * * This program is free software; you can redistribute it and/or *************** *** 26,31 **** * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. * And you are not permitted to distribute binaries compiled against ! * these libraries without written consent from Underscore AB. Observe ! * that this does not disallow linking to the Qt Free Edition. * * All trademarks belong to their respective owners. --- 26,31 ---- * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. * And you are not permitted to distribute binaries compiled against ! * these libraries without written consent from Quest Software, Inc. ! * Observe that this does not disallow linking to the Qt Free Edition. * * All trademarks belong to their respective owners. Index: tobrowser.cpp =================================================================== RCS file: /cvsroot/tora/tora/tobrowser.cpp,v retrieving revision 1.125 retrieving revision 1.126 diff -C2 -d -r1.125 -r1.126 *** tobrowser.cpp 20 Oct 2003 07:52:18 -0000 1.125 --- tobrowser.cpp 12 Jan 2004 01:06:05 -0000 1.126 *************** *** 2,6 **** /* * TOra - An Oracle Toolkit for DBA's and developers ! * Copyright (C) 2000-2001,2001 Underscore AB * * This program is free software; you can redistribute it and/or --- 2,6 ---- /* * TOra - An Oracle Toolkit for DBA's and developers ! * Copyright (C) 2003 Quest Software, Inc * * This program is free software; you can redistribute it and/or *************** *** 26,31 **** * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. * And you are not permitted to distribute binaries compiled against ! * these libraries without written consent from Underscore AB. Observe ! * that this does not disallow linking to the Qt Free Edition. * * All trademarks belong to their respective owners. --- 26,31 ---- * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. * And you are not permitted to distribute binaries compiled against ! * these libraries without written consent from Quest Software, Inc. ! * Observe that this does not disallow linking to the Qt Free Edition. * * All trademarks belong to their respective owners. *************** *** 2033,2058 **** void toBrowser::enableDisableConstraints(const QString &what) { ! if (SecondTab) { ! toResultView *lst=dynamic_cast<toResultConstraint *>(SecondTab); ! toConnection &conn=connection(); ! std::list<QString> migrate; ! if (lst) { ! for(QListViewItem *item=lst->firstChild();item;item=item->nextSibling()) { ! if (item->isSelected()) { ! toResultViewItem *res=dynamic_cast<toResultViewItem *>(item); ! if (res) { ! toPush(migrate, ! conn.quote(schema())+":"+ ! "TABLE:"+ ! conn.quote(SecondText)+":"+ ! "CONSTRAINT:"+ ! conn.quote(res->allText(0))+":"+ ! "DEFINITION:"+ ! what); ! } ! } ! } ! } else { ! lst=dynamic_cast<toResultReferences *>(SecondTab); if (lst) { for(QListViewItem *item=lst->firstChild();item;item=item->nextSibling()) { --- 2033,2041 ---- void toBrowser::enableDisableConstraints(const QString &what) { ! try { ! if (SecondTab) { ! toResultView *lst=dynamic_cast<toResultConstraint *>(SecondTab); ! toConnection &conn=connection(); ! std::list<QString> migrate; if (lst) { for(QListViewItem *item=lst->firstChild();item;item=item->nextSibling()) { *************** *** 2061,2069 **** if (res) { toPush(migrate, ! conn.quote(res->allText(0))+":"+ "TABLE:"+ ! conn.quote(res->allText(1))+":"+ "CONSTRAINT:"+ ! conn.quote(res->allText(2))+":"+ "DEFINITION:"+ what); --- 2044,2052 ---- if (res) { toPush(migrate, ! conn.quote(schema())+":"+ "TABLE:"+ ! conn.quote(SecondText)+":"+ "CONSTRAINT:"+ ! conn.quote(res->allText(0))+":"+ "DEFINITION:"+ what); *************** *** 2072,2089 **** } } else { ! lst=dynamic_cast<toResultView *>(SecondTab); ! if (lst&&lst->sqlName()=="toBrowser:TableTrigger") { } } } ! if (migrate.begin()!=migrate.end()) { ! std::list<QString> drop; ! toExtract extract(conn,this); ! extract.setPrompt(false); ! extract.setHeading(false); ! QString sql=extract.migrate(drop,migrate); ! conn.execute("BEGIN\n"+sql+"\nEND;"); ! } ! } } --- 2055,2092 ---- } } else { ! lst=dynamic_cast<toResultReferences *>(SecondTab); ! if (lst) { ! for(QListViewItem *item=lst->firstChild();item;item=item->nextSibling()) { ! if (item->isSelected()) { ! toResultViewItem *res=dynamic_cast<toResultViewItem *>(item); ! if (res) { ! toPush(migrate, ! conn.quote(res->allText(0))+":"+ ! "TABLE:"+ ! conn.quote(res->allText(1))+":"+ ! "CONSTRAINT:"+ ! conn.quote(res->allText(2))+":"+ ! "DEFINITION:"+ ! what); ! } ! } ! } ! } else { ! lst=dynamic_cast<toResultView *>(SecondTab); ! if (lst&&lst->sqlName()=="toBrowser:TableTrigger") { ! // Need work ! } } } + if (migrate.begin()!=migrate.end()) { + std::list<QString> drop; + toExtract extract(conn,this); + extract.setPrompt(false); + extract.setHeading(false); + QString sql=extract.migrate(drop,migrate); + conn.execute("BEGIN\n"+sql+"\nEND;"); + } } ! } TOCATCH } Index: tobrowser.h =================================================================== RCS file: /cvsroot/tora/tora/tobrowser.h,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** tobrowser.h 30 Jul 2003 14:34:13 -0000 1.37 --- tobrowser.h 12 Jan 2004 01:06:05 -0000 1.38 *************** *** 2,6 **** /* * TOra - An Oracle Toolkit for DBA's and developers ! * Copyright (C) 2000-2001,2001 Underscore AB * * This program is free software; you can redistribute it and/or --- 2,6 ---- /* * TOra - An Oracle Toolkit for DBA's and developers ! * Copyright (C) 2003 Quest Software, Inc * * This program is free software; you can redistribute it and/or *************** *** 26,31 **** * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. * And you are not permitted to distribute binaries compiled against ! * these libraries without written consent from Underscore AB. Observe ! * that this does not disallow linking to the Qt Free Edition. * * All trademarks belong to their respective owners. --- 26,31 ---- * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. * And you are not permitted to distribute binaries compiled against ! * these libraries without written consent from Quest Software, Inc. ! * Observe that this does not disallow linking to the Qt Free Edition. * * All trademarks belong to their respective owners. Index: tochangeconnection.cpp =================================================================== RCS file: /cvsroot/tora/tora/tochangeconnection.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** tochangeconnection.cpp 17 Jul 2002 10:39:07 -0000 1.17 --- tochangeconnection.cpp 12 Jan 2004 01:06:05 -0000 1.18 *************** *** 2,6 **** /* * TOra - An Oracle Toolkit for DBA's and developers ! * Copyright (C) 2000-2001,2001 Underscore AB * * This program is free software; you can redistribute it and/or --- 2,6 ---- /* * TOra - An Oracle Toolkit for DBA's and developers ! * Copyright (C) 2003 Quest Software, Inc * * This program is free software; you can redistribute it and/or *************** *** 26,31 **** * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. * And you are not permitted to distribute binaries compiled against ! * these libraries without written consent from Underscore AB. Observe ! * that this does not disallow linking to the Qt Free Edition. * * All trademarks belong to their respective owners. --- 26,31 ---- * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. * And you are not permitted to distribute binaries compiled against ! * these libraries without written consent from Quest Software, Inc. ! * Observe that this does not disallow linking to the Qt Free Edition. * * All trademarks belong to their respective owners. Index: tochangeconnection.h =================================================================== RCS file: /cvsroot/tora/tora/tochangeconnection.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tochangeconnection.h 16 Dec 2001 01:17:03 -0000 1.6 --- tochangeconnection.h 12 Jan 2004 01:06:05 -0000 1.7 *************** *** 2,6 **** /* * TOra - An Oracle Toolkit for DBA's and developers ! * Copyright (C) 2000-2001,2001 Underscore AB * * This program is free software; you can redistribute it and/or --- 2,6 ---- /* * TOra - An Oracle Toolkit for DBA's and developers ! * Copyright (C) 2003 Quest Software, Inc * * This program is free software; you can redistribute it and/or *************** *** 26,31 **** * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. * And you are not permitted to distribute binaries compiled against ! * these libraries without written consent from Underscore AB. Observe ! * that this does not disallow linking to the Qt Free Edition. * * All trademarks belong to their respective owners. --- 26,31 ---- * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. * And you are not permitted to distribute binaries compiled against ! * these libraries without written consent from Quest Software, Inc. ! * Observe that this does not disallow linking to the Qt Free Edition. * * All trademarks belong to their respective owners. Index: tochartmanager.cpp =================================================================== RCS file: /cvsroot/tora/tora/tochartmanager.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** tochartmanager.cpp 22 Jul 2003 01:51:32 -0000 1.15 --- tochartmanager.cpp 12 Jan 2004 01:06:05 -0000 1.16 *************** *** 2,6 **** /* * TOra - An Oracle Toolkit for DBA's and developers ! * Copyright (C) 2000-2001,2001 Underscore AB * * This program is free software; you can redistribute it and/or --- 2,6 ---- /* * TOra - An Oracle Toolkit for DBA's and developers ! * Copyright (C) 2003 Quest Software, Inc * * This program is free software; you can redistribute it and/or *************** *** 26,31 **** * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. * And you are not permitted to distribute binaries compiled against ! * these libraries without written consent from Underscore AB. Observe ! * that this does not disallow linking to the Qt Free Edition. * * All trademarks belong to their respective owners. --- 26,31 ---- * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. * And you are not permitted to distribute binaries compiled against ! * these libraries without written consent from Quest Software, Inc. ! * Observe that this does not disallow linking to the Qt Free Edition. * * All trademarks belong to their respective owners. Index: tochartmanager.h =================================================================== RCS file: /cvsroot/tora/tora/tochartmanager.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tochartmanager.h 31 Jul 2003 22:42:46 -0000 1.6 --- tochartmanager.h 12 Jan 2004 01:06:05 -0000 1.7 *************** *** 2,6 **** /* * TOra - An Oracle Toolkit for DBA's and developers ! * Copyright (C) 2000-2001,2001 Underscore AB * * This program is free software; you can redistribute it and/or --- 2,6 ---- /* * TOra - An Oracle Toolkit for DBA's and developers ! * Copyright (C) 2003 Quest Software, Inc * * This program is free software; you can redistribute it and/or *************** *** 26,31 **** * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. * And you are not permitted to distribute binaries compiled against ! * these libraries without written consent from Underscore AB. Observe ! * that this does not disallow linking to the Qt Free Edition. * * All trademarks belong to their respective owners. --- 26,31 ---- * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. * And you are not permitted to distribute binaries compiled against ! * these libraries without written consent from Quest Software, Inc. ! * Observe that this does not disallow linking to the Qt Free Edition. * * All trademarks belong to their respective owners. Index: toconf.h ===============================================================... [truncated message content] |