rename the document class

13 files changed, 43 insertions, 43 deletions

diff --git a/build/win32/libsw602.dsp b/build/win32/libsw602.dsp
index e35e715..c9539d8 100644
--- a/build/win32/libsw602.dsp
+++ b/build/win32/libsw602.dsp
@@ -87,7 +87,7 @@ LIB32=link.exe -lib
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

 # Begin Source File

 

-SOURCE=..\..\src\lib\Software602Document.cpp

+SOURCE=..\..\src\lib\SW602Document.cpp

 # End Source File

 # Begin Source File

 

@@ -103,7 +103,7 @@ SOURCE=..\..\src\lib\libsw602_utils.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"

 # Begin Source File

 

-SOURCE=..\..\inc\libsw602\Software602Document.h

+SOURCE=..\..\inc\libsw602\SW602Document.h

 # End Source File

 # Begin Source File

 

diff --git a/build/win32/libsw602.vcproj b/build/win32/libsw602.vcproj
index 98a3c70..115c071 100644
--- a/build/win32/libsw602.vcproj
+++ b/build/win32/libsw602.vcproj
@@ -173,7 +173,7 @@
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
 			<File
-				RelativePath="..\..\src\lib\Software602Document.cpp"
+				RelativePath="..\..\src\lib\SW602Document.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -244,7 +244,7 @@
 			Filter="h;hpp;hxx;hm;inl"
 			>
 			<File
-				RelativePath="..\..\inc\libsw602\Software602Document.h"
+				RelativePath="..\..\inc\libsw602\SW602Document.h"
 				>
 			</File>
 			<File
diff --git a/build/win32/libsw602.vcxproj b/build/win32/libsw602.vcxproj
index c51a1ca..d4bdb3f 100644
--- a/build/win32/libsw602.vcxproj
+++ b/build/win32/libsw602.vcxproj
@@ -102,7 +102,7 @@
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\src\lib\Software602Document.cpp">
+    <ClCompile Include="..\..\src\lib\SW602Document.cpp">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -122,7 +122,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <CInclude Include="..\..\inc\libsw602\Software602Document.h" />
+    <CInclude Include="..\..\inc\libsw602\SW602Document.h" />
     <CInclude Include="..\..\inc\libsw602\libsw602.h" />
     <CInclude Include="..\..\src\lib\WinText602Parser.h" />
     <CInclude Include="..\..\src\lib\libsw602_utils.h" />
diff --git a/inc/libsw602/Makefile.am b/inc/libsw602/Makefile.am
index acc94ad..dfb302b 100644
--- a/inc/libsw602/Makefile.am
+++ b/inc/libsw602/Makefile.am
@@ -2,4 +2,4 @@ libsw602dir = $(includedir)/libsw602-@SW602_MAJOR_VERSION@.@SW602_MINOR_VERSION@
 
 dist_libsw602_HEADERS = \
 	libsw602.h \
-	Software602Document.h
+	SW602Document.h
diff --git a/inc/libsw602/Software602Document.h b/inc/libsw602/SW602Document.h
index 663491a..3acdbc6 100644
--- a/inc/libsw602/Software602Document.h
+++ b/inc/libsw602/SW602Document.h
@@ -29,7 +29,7 @@
 namespace libsw602
 {
 
-class Software602Document
+class SW602Document
 {
 public:
   /** Likelihood that the file format is supported.
diff --git a/inc/libsw602/libsw602.h b/inc/libsw602/libsw602.h
index f36f27c..c03f391 100644
--- a/inc/libsw602/libsw602.h
+++ b/inc/libsw602/libsw602.h
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_LIBSW602_LIBSW602_H
 #define INCLUDED_LIBSW602_LIBSW602_H
 
-#include "Software602Document.h"
+#include "SW602Document.h"
 
 #endif // INCLUDED_LIBSW602_LIBSW602_H
 
diff --git a/src/conv/html/sw6022html.cpp b/src/conv/html/sw6022html.cpp
index 1c08d76..7356ef9 100644
--- a/src/conv/html/sw6022html.cpp
+++ b/src/conv/html/sw6022html.cpp
@@ -52,7 +52,7 @@ int printVersion()
 
 } // anonymous namespace
 
-using libsw602::Software602Document;
+using libsw602::SW602Document;
 
 int main(int argc, char *argv[])
 {
@@ -76,16 +76,16 @@ int main(int argc, char *argv[])
 
   librevenge::RVNGFileStream input(file);
 
-  Software602Document::Kind kind = Software602Document::KIND_UNKNOWN;
-  const Software602Document::Confidence confidence = Software602Document::isSupported(&input, kind);
-  if ((kind != Software602Document::KIND_TEXT) || (confidence != Software602Document::CONFIDENCE_EXCELLENT))
+  SW602Document::Kind kind = SW602Document::KIND_UNKNOWN;
+  const SW602Document::Confidence confidence = SW602Document::isSupported(&input, kind);
+  if ((kind != SW602Document::KIND_TEXT) || (confidence != SW602Document::CONFIDENCE_EXCELLENT))
     fprintf(stderr, "unsupported file format\n");
   return 1;
 
   librevenge::RVNGString document;
 
   librevenge::RVNGHTMLTextGenerator documentGenerator(document);
-  if (Software602Document::parse(&input, &documentGenerator) != Software602Document::RESULT_OK)
+  if (SW602Document::parse(&input, &documentGenerator) != SW602Document::RESULT_OK)
   {
     fprintf(stderr, "parsing failed\n");
     return 1;
diff --git a/src/conv/raw/sw6022raw.cpp b/src/conv/raw/sw6022raw.cpp
index fae6dc7..17bfe3b 100644
--- a/src/conv/raw/sw6022raw.cpp
+++ b/src/conv/raw/sw6022raw.cpp
@@ -56,7 +56,7 @@ int printVersion()
 
 } // anonymous namespace
 
-using libsw602::Software602Document;
+using libsw602::SW602Document;
 
 int main(int argc, char *argv[])
 {
@@ -83,25 +83,25 @@ int main(int argc, char *argv[])
 
   librevenge::RVNGFileStream input(file);
 
-  Software602Document::Kind kind = Software602Document::KIND_UNKNOWN;
-  const Software602Document::Confidence confidence = Software602Document::isSupported(&input, kind);
-  if (confidence != Software602Document::CONFIDENCE_EXCELLENT)
+  SW602Document::Kind kind = SW602Document::KIND_UNKNOWN;
+  const SW602Document::Confidence confidence = SW602Document::isSupported(&input, kind);
+  if (confidence != SW602Document::CONFIDENCE_EXCELLENT)
     fprintf(stderr, "unsupported file format\n");
   return 1;
 
   switch (kind)
   {
-  case Software602Document::KIND_TEXT:
+  case SW602Document::KIND_TEXT:
   {
     librevenge::RVNGRawTextGenerator documentGenerator(printIndentLevel);
-    return Software602Document::parse(&input, &documentGenerator) == Software602Document::RESULT_OK;
+    return SW602Document::parse(&input, &documentGenerator) == SW602Document::RESULT_OK;
   }
-  case Software602Document::KIND_SPREADSHEET:
-  case Software602Document::KIND_CHART:
-  case Software602Document::KIND_DATABASE:
+  case SW602Document::KIND_SPREADSHEET:
+  case SW602Document::KIND_CHART:
+  case SW602Document::KIND_DATABASE:
   {
     librevenge::RVNGRawSpreadsheetGenerator documentGenerator(printIndentLevel);
-    return Software602Document::parse(&input, &documentGenerator) == Software602Document::RESULT_OK;
+    return SW602Document::parse(&input, &documentGenerator) == SW602Document::RESULT_OK;
   }
   default:
     fprintf(stderr, "unsupported file format\n");
diff --git a/src/conv/text/sw6022text.cpp b/src/conv/text/sw6022text.cpp
index b6cbaa3..7ed80bb 100644
--- a/src/conv/text/sw6022text.cpp
+++ b/src/conv/text/sw6022text.cpp
@@ -53,7 +53,7 @@ int printVersion()
 
 } // anonymous namespace
 
-using libsw602::Software602Document;
+using libsw602::SW602Document;
 
 int main(int argc, char *argv[])
 {
@@ -80,16 +80,16 @@ int main(int argc, char *argv[])
 
   librevenge::RVNGFileStream input(szInputFile);
 
-  Software602Document::Kind kind = Software602Document::KIND_UNKNOWN;
-  const Software602Document::Confidence confidence = Software602Document::isSupported(&input, kind);
-  if ((kind != Software602Document::KIND_TEXT) || (confidence != Software602Document::CONFIDENCE_EXCELLENT))
+  SW602Document::Kind kind = SW602Document::KIND_UNKNOWN;
+  const SW602Document::Confidence confidence = SW602Document::isSupported(&input, kind);
+  if ((kind != SW602Document::KIND_TEXT) || (confidence != SW602Document::CONFIDENCE_EXCELLENT))
     fprintf(stderr, "unsupported file format\n");
   return 1;
 
   librevenge::RVNGString document;
 
   librevenge::RVNGTextTextGenerator documentGenerator(document, isInfo);
-  if (Software602Document::parse(&input, &documentGenerator) != Software602Document::RESULT_OK)
+  if (SW602Document::parse(&input, &documentGenerator) != SW602Document::RESULT_OK)
   {
     fprintf(stderr, "parsing failed\n");
     return 1;
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 40960dc..d36d8af 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -12,13 +12,13 @@ libsw602_@SW602_MAJOR_VERSION@_@SW602_MINOR_VERSION@_la_LIBADD  = $(REVENGE_LIBS
 libsw602_@SW602_MAJOR_VERSION@_@SW602_MINOR_VERSION@_la_DEPENDENCIES = @LIBSW602_WIN32_RESOURCE@
 libsw602_@SW602_MAJOR_VERSION@_@SW602_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined
 libsw602_@SW602_MAJOR_VERSION@_@SW602_MINOR_VERSION@_la_SOURCES = \
-	Software602Document.cpp \
 	SW602Cell.cpp \
 	SW602Cell.h \
 	SW602Chart.cpp \
 	SW602Chart.h \
 	SW602Debug.cpp \
 	SW602Debug.h \
+	SW602Document.cpp \
 	SW602Entry.h \
 	SW602Font.cpp \
 	SW602Font.h \
diff --git a/src/lib/Software602Document.cpp b/src/lib/SW602Document.cpp
index 9019b4c..2be0e20 100644
--- a/src/lib/Software602Document.cpp
+++ b/src/lib/SW602Document.cpp
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <libsw602/Software602Document.h>
+#include <libsw602/SW602Document.h>
 
 #include <boost/shared_ptr.hpp>
 
@@ -41,7 +41,7 @@ shared_ptr<RVNGInputStream> getContent(librevenge::RVNGInputStream *const ip)
 
 }
 
-Software602Document::Confidence Software602Document::isSupported(librevenge::RVNGInputStream *const input, Kind &kind, Type *const type, bool *const needsEncoding) try
+SW602Document::Confidence SW602Document::isSupported(librevenge::RVNGInputStream *const input, Kind &kind, Type *const type, bool *const needsEncoding) try
 {
   if (!input)
     return CONFIDENCE_NONE;
@@ -70,22 +70,22 @@ catch (...)
   return CONFIDENCE_NONE;
 }
 
-Software602Document::Result Software602Document::parse(librevenge::RVNGInputStream *const input, librevenge::RVNGTextInterface *const document, const char *const password)
+SW602Document::Result SW602Document::parse(librevenge::RVNGInputStream *const input, librevenge::RVNGTextInterface *const document, const char *const password)
 {
   return parse(input, document, TYPE_UNKNOWN, ENCODING_UNSPECIFIED, password);
 }
 
-Software602Document::Result Software602Document::parse(librevenge::RVNGInputStream *const input, librevenge::RVNGTextInterface *const document, const Type type, const char *const password)
+SW602Document::Result SW602Document::parse(librevenge::RVNGInputStream *const input, librevenge::RVNGTextInterface *const document, const Type type, const char *const password)
 {
   return parse(input, document, type, ENCODING_UNSPECIFIED, password);
 }
 
-Software602Document::Result Software602Document::parse(librevenge::RVNGInputStream *const input, librevenge::RVNGTextInterface *const document, const Encoding encoding, const char *const password)
+SW602Document::Result SW602Document::parse(librevenge::RVNGInputStream *const input, librevenge::RVNGTextInterface *const document, const Encoding encoding, const char *const password)
 {
   return parse(input, document, TYPE_UNKNOWN, encoding, password);
 }
 
-Software602Document::Result Software602Document::parse(librevenge::RVNGInputStream *const input, librevenge::RVNGTextInterface *const document, Type type, Encoding /*encoding*/, const char * /*password*/) try
+SW602Document::Result SW602Document::parse(librevenge::RVNGInputStream *const input, librevenge::RVNGTextInterface *const document, Type type, Encoding /*encoding*/, const char * /*password*/) try
 {
   if (!document)
     return RESULT_OK;
@@ -95,7 +95,7 @@ Software602Document::Result Software602Document::parse(librevenge::RVNGInputStre
   if (type == TYPE_UNKNOWN)
   {
     Kind kind = KIND_UNKNOWN;
-    const Confidence confidence = Software602Document::isSupported(input, kind, &type);
+    const Confidence confidence = SW602Document::isSupported(input, kind, &type);
     if ((kind != KIND_TEXT) || ((confidence != CONFIDENCE_EXCELLENT) && (confidence != CONFIDENCE_SUPPORTED_ENCRYPTION)))
       return RESULT_UNSUPPORTED_FORMAT;
   }
@@ -125,22 +125,22 @@ catch (...)
   return RESULT_UNKNOWN_ERROR;
 }
 
-Software602Document::Result Software602Document::parse(librevenge::RVNGInputStream *input, librevenge::RVNGSpreadsheetInterface *document, const char *password)
+SW602Document::Result SW602Document::parse(librevenge::RVNGInputStream *input, librevenge::RVNGSpreadsheetInterface *document, const char *password)
 {
   return parse(input, document, TYPE_UNKNOWN, ENCODING_UNSPECIFIED, password);
 }
 
-Software602Document::Result Software602Document::parse(librevenge::RVNGInputStream *input, librevenge::RVNGSpreadsheetInterface *document, Type type, const char *password)
+SW602Document::Result SW602Document::parse(librevenge::RVNGInputStream *input, librevenge::RVNGSpreadsheetInterface *document, Type type, const char *password)
 {
   return parse(input, document, type, ENCODING_UNSPECIFIED, password);
 }
 
-Software602Document::Result Software602Document::parse(librevenge::RVNGInputStream *input, librevenge::RVNGSpreadsheetInterface *document, Encoding encoding, const char *password)
+SW602Document::Result SW602Document::parse(librevenge::RVNGInputStream *input, librevenge::RVNGSpreadsheetInterface *document, Encoding encoding, const char *password)
 {
   return parse(input, document, TYPE_UNKNOWN, encoding, password);
 }
 
-Software602Document::Result Software602Document::parse(librevenge::RVNGInputStream * /*input*/, librevenge::RVNGSpreadsheetInterface * /*document*/, Type /*type*/, Encoding /*encoding*/, const char * /*password*/) try
+SW602Document::Result SW602Document::parse(librevenge::RVNGInputStream * /*input*/, librevenge::RVNGSpreadsheetInterface * /*document*/, Type /*type*/, Encoding /*encoding*/, const char * /*password*/) try
 {
   // TODO: implement me
   return RESULT_UNKNOWN_ERROR;
diff --git a/src/lib/SW602Parser.cpp b/src/lib/SW602Parser.cpp
index 52202cc..528ad0f 100644
--- a/src/lib/SW602Parser.cpp
+++ b/src/lib/SW602Parser.cpp
@@ -19,7 +19,7 @@ namespace libsw602
 {
 
 SW602ParserState::SW602ParserState(SW602ParserState::Type type, boost::shared_ptr<librevenge::RVNGInputStream> input) :
-  m_type(type), m_kind(Software602Document::KIND_TEXT), m_version(0), m_input(input), m_pageSpan(),
+  m_type(type), m_kind(SW602Document::KIND_TEXT), m_version(0), m_input(input), m_pageSpan(),
   m_graphicListener(), m_listManager(), m_spreadsheetListener(), m_textListener(), m_asciiFile(input)
 {
   m_listManager.reset(new SW602ListManager);
diff --git a/src/lib/SW602Parser.h b/src/lib/SW602Parser.h
index dd20d41..7e5190d 100644
--- a/src/lib/SW602Parser.h
+++ b/src/lib/SW602Parser.h
@@ -38,7 +38,7 @@ public:
   //! the state type
   Type m_type;
   //! the document kind
-  Software602Document::Kind m_kind;
+  SW602Document::Kind m_kind;
   //! the actual version
   int m_version;
   //! the input