Thread: [Tora-cvs] SF.net SVN: tora: [2122] trunk/tora (Page 2)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Revision: 2122
          http://tora.svn.sourceforge.net/tora/?rev=2122&view=rev
Author:   nneul
Date:     2007-09-15 15:19:54 -0700 (Sat, 15 Sep 2007)

Log Message:
-----------
change to using .html consistently

Modified Paths:
--------------
    trunk/tora/NEWS
    trunk/tora/doc/Makefile.am
    trunk/tora/doc/help/additionalhelp.texi
    trunk/tora/doc/help/preferences.texi
    trunk/tora/src/tohelp.cpp
    trunk/tora/src/tohelp.h
    trunk/tora/src/tomain.cpp
    trunk/tora/src/utils.cpp

Modified: trunk/tora/NEWS
===================================================================

--- trunk/tora/NEWS	2007-09-13 15:52:31 UTC (rev 2121)
+++ trunk/tora/NEWS	2007-09-15 22:19:54 UTC (rev 2122)
@@ -25,6 +25,7 @@
 2007-09-13: Applied patches from Andreas Piesk for config build support for Ora 10gR2
 2007-09-13: Updated to latest OTL release 4.0.157
 2007-09-13: Fixed Makefile.am for building html in docs
+2007-09-15: Change code to consistently use .html extension
 
 1.3.21:
 

Modified: trunk/tora/doc/Makefile.am
===================================================================
--- trunk/tora/doc/Makefile.am	2007-09-13 15:52:31 UTC (rev 2121)
+++ trunk/tora/doc/Makefile.am	2007-09-15 22:19:54 UTC (rev 2122)
@@ -8,7 +8,7 @@
 install-data-hook:
 	rm -rf $(tora_docdir)/help
 	cp -dpR $(top_builddir)/doc/help/tora $(tora_docdir)/help 
-	cp $(tora_docdir)/help/index.html $(tora_docdir)/help/toc.htm
+	cp $(tora_docdir)/help/index.html $(tora_docdir)/help/toc.html
 	cp -dpR $(top_srcdir)/doc/help/images $(tora_docdir)/help
 	cp -dpR $(top_srcdir)/doc/help/api $(tora_docdir)/help
 

Modified: trunk/tora/doc/help/additionalhelp.texi
===================================================================
--- trunk/tora/doc/help/additionalhelp.texi	2007-09-13 15:52:31 UTC (rev 2121)
+++ trunk/tora/doc/help/additionalhelp.texi	2007-09-15 22:19:54 UTC (rev 2122)
@@ -18,7 +18,7 @@
 @samp{Oracle Manuals}
 
 @item Add path
-Add a manual to the list of manuals. This pop up a dialog asking for the name of the manual and the location of the manuals table of contents HTML file (toc.htm).
+Add a manual to the list of manuals. This pop up a dialog asking for the name of the manual and the location of the manuals table of contents HTML file (toc.html).
 @samp{Add path}
 
 @end table

Modified: trunk/tora/doc/help/preferences.texi
===================================================================
--- trunk/tora/doc/help/preferences.texi	2007-09-13 15:52:31 UTC (rev 2121)
+++ trunk/tora/doc/help/preferences.texi	2007-09-15 22:19:54 UTC (rev 2122)
@@ -32,7 +32,7 @@
 
 @multitable @columnfractions .2 .8 
 @item @strong{Custom SQL} @tab The file in which to store your custom SQL. For more information about custom SQL and the SQL dictionary (@pxref{sqledit,SQL Editor tool}. The string @strong{@env{$HOME}} will be replaced by your home directory on UNIX or documents directory in Windows.
-@item @strong{Help directory} @tab Should point to where the TOra help table of contents file is stored (toc.htm). This should be set up correctly if you made a normal install. 	
+@item @strong{Help directory} @tab Should point to where the TOra help table of contents file is stored (toc.html). This should be set up correctly if you made a normal install. 	
 @item @strong{Plugin directory} @tab This option is only available in a plugin based TOra installation. It should point to the directory where the plugins for TOra are located. It should be set up correctly on installation if needed. 	
 @item @strong{Cache directory} @tab Should point to where the TOra Disk Cache files are stored. There is one file for each Connection. 	
 @item @strong{Change current connection with active window} @tab If this option is set, changing the current window will also change the current connection to that of the active window. The connection is only changed when you change window so if you want to change the connection to something else you can still do so as long as you don't change the window.

Modified: trunk/tora/src/tohelp.cpp
===================================================================
--- trunk/tora/src/tohelp.cpp	2007-09-13 15:52:31 UTC (rev 2121)
+++ trunk/tora/src/tohelp.cpp	2007-09-15 22:19:54 UTC (rev 2122)
@@ -534,7 +534,7 @@
         }
         cur = cur->parentWidget();
     }
-    toHelp::displayHelp(QString::fromLatin1("toc.htm"), parent);
+    toHelp::displayHelp(QString::fromLatin1("toc.html"), parent);
 }
 
 void toHelp::connectDialog(QDialog *dialog)
@@ -587,7 +587,7 @@
         {
             QString path = toHelp::path(parent->text(2));
             QString filename = path;
-            filename += QString::fromLatin1("index.htm");
+            filename.append(QString::fromLatin1("index.html"));
             try
             {
                 toHtml file(toReadFile(filename));

Modified: trunk/tora/src/tohelp.h
===================================================================
--- trunk/tora/src/tohelp.h	2007-09-13 15:52:31 UTC (rev 2121)
+++ trunk/tora/src/tohelp.h	2007-09-15 22:19:54 UTC (rev 2122)
@@ -114,7 +114,7 @@
  * Display a help browser. A help manual consists of HTML pages where at least
  * two pages are mandatory.
  *
- * The first one is toc.htm which is parsed for links which are added to the left
+ * The first one is toc.html which is parsed for links which are added to the left
  * pane tree view. Indentation is handled with the tag dl which open and close a
  * tree branch.
  *

Modified: trunk/tora/src/tomain.cpp
===================================================================
--- trunk/tora/src/tomain.cpp	2007-09-13 15:52:31 UTC (rev 2121)
+++ trunk/tora/src/tomain.cpp	2007-09-15 22:19:54 UTC (rev 2122)
@@ -812,7 +812,7 @@
             contextHelp();
             break;
         case TO_HELP_CONTENTS:
-            toHelp::displayHelp(QString::fromLatin1("toc.htm"));
+            toHelp::displayHelp(QString::fromLatin1("toc.html"));
             break;
         case TO_HELP_ABOUT:
         case TO_HELP_LICENSE:

Modified: trunk/tora/src/utils.cpp
===================================================================
--- trunk/tora/src/utils.cpp	2007-09-13 15:52:31 UTC (rev 2121)
+++ trunk/tora/src/utils.cpp	2007-09-15 22:19:54 UTC (rev 2122)
@@ -820,7 +820,7 @@
     if (str.isEmpty())
     {
         str = toPluginPath();
-        str += QString::fromLatin1("/help/toc.htm");
+        str += QString::fromLatin1("/help/toc.html");
     }
     return str;
 }
@@ -1533,7 +1533,7 @@
 
 int countChars(const QString &source, const char find) {
     int found = 0;
-    int i;
+    unsigned int i;
 
     for(i = 0; i < source.length(); i++) {
         if(source[i] == find)


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




Thread: [Tora-cvs] SF.net SVN: tora: [2122] trunk/tora (Page 2)

tora-cvs