Some renaming cleanup

9 files changed, 29 insertions, 26 deletions

diff --git a/src/lib/Pict1Parser.h b/src/lib/Pict1Parser.h
index 780dbbf..ddadc5d 100644
--- a/src/lib/Pict1Parser.h
+++ b/src/lib/Pict1Parser.h
@@ -25,8 +25,8 @@
  * Corel Corporation or Corel Corporation Limited."
  */
 
-#ifndef __Pict1PARSER_H__
-#define __Pict1PARSER_H__
+#ifndef __PICT1PARSER_H__
+#define __PICT1PARSER_H__
 
 #include "PictXParser.h"
 #include "PictDashArray.h"
@@ -87,4 +87,4 @@ private:
 	::WPXPropertyListVector m_gradient;
 };
 
-#endif // __Pict1PARSER_H__
+#endif // __PICT1PARSER_H__
diff --git a/src/lib/Pict2Parser.h b/src/lib/Pict2Parser.h
index d1c39c1..e0236e1 100644
--- a/src/lib/Pict2Parser.h
+++ b/src/lib/Pict2Parser.h
@@ -25,8 +25,8 @@
  * Corel Corporation or Corel Corporation Limited."
  */
 
-#ifndef __Pict2PARSER_H__
-#define __Pict2PARSER_H__
+#ifndef __PICT2PARSER_H__
+#define __PICT2PARSER_H__
 
 #include "PictXParser.h"
 #include "PictDashArray.h"
@@ -264,4 +264,4 @@ private:
 	bool m_embedded;
 };
 
-#endif // __Pict2PARSER_H__
+#endif // __PICT2PARSER_H__
diff --git a/src/lib/PictBitmap.h b/src/lib/PictBitmap.h
index daa0db4..c469aed 100644
--- a/src/lib/PictBitmap.h
+++ b/src/lib/PictBitmap.h
@@ -24,8 +24,8 @@
  * Corel Corporation or Corel Corporation Limited."
  */
 
-#ifndef __PictBITMAP_H__
-#define __PictBITMAP_H__
+#ifndef __PICTBITMAP_H__
+#define __PICTBITMAP_H__
 
 #include "PictColor.h"
 #include <libwpd/libwpd.h>
@@ -69,4 +69,4 @@ private:
 
 } // namespace libpict
 
-#endif // __PictBITMAP_H__
+#endif // __PICTBITMAP_H__
diff --git a/src/lib/PictColor.h b/src/lib/PictColor.h
index 828e7a1..fc624cf 100644
--- a/src/lib/PictColor.h
+++ b/src/lib/PictColor.h
@@ -23,8 +23,8 @@
  * Corel Corporation or Corel Corporation Limited."
  */
 
-#ifndef __PictCOLOR_H__
-#define __PictCOLOR_H__
+#ifndef __PICTCOLOR_H__
+#define __PICTCOLOR_H__
 
 #include <libwpd/libwpd.h>
 
@@ -53,4 +53,4 @@ public:
 
 } // namespace libpict
 
-#endif // __PictCOLOR_H__
+#endif // __PICTCOLOR_H__
diff --git a/src/lib/PictDashArray.h b/src/lib/PictDashArray.h
index b60c490..2119652 100644
--- a/src/lib/PictDashArray.h
+++ b/src/lib/PictDashArray.h
@@ -23,8 +23,8 @@
  * Corel Corporation or Corel Corporation Limited."
  */
 
-#ifndef __PictDASHARRAY_H__
-#define __PictDASHARRAY_H__
+#ifndef __PICTDASHARRAY_H__
+#define __PICTDASHARRAY_H__
 
 namespace libpict
 {
@@ -49,4 +49,4 @@ private:
 } // namespace libpict
 
 
-#endif // __PictDASHARRAY_H__
+#endif // __PICTDASHARRAY_H__
diff --git a/src/lib/PictHeader.h b/src/lib/PictHeader.h
index 460508d..6ea4735 100644
--- a/src/lib/PictHeader.h
+++ b/src/lib/PictHeader.h
@@ -23,8 +23,8 @@
  * Corel Corporation or Corel Corporation Limited."
  */
 
-#ifndef __PictHEADER_H__
-#define __PictHEADER_H__
+#ifndef __PICTHEADER_H__
+#define __PICTHEADER_H__
 
 #include <libwpd-stream/WPXStream.h>
 
@@ -54,6 +54,9 @@ private:
 	unsigned short m_yUpperLeft;
 	unsigned short m_xLowerRight;
 	unsigned short m_yLowerRigth;
+	
+	bool loadPict1Header(WPXInputStream *input);
+	bool loadPict2Header(WPXInputStream *input);
 };
 
 #endif // PictHEADER
diff --git a/src/lib/PictImage.h b/src/lib/PictImage.h
index 31cca01..56d6f1b 100644
--- a/src/lib/PictImage.h
+++ b/src/lib/PictImage.h
@@ -23,8 +23,8 @@
  * Corel Corporation or Corel Corporation Limited."
  */
 
-#ifndef __PictRAPHICS_H__
-#define __PictRAPHICS_H__
+#ifndef __PICTRAPHICS_H__
+#define __PICTRAPHICS_H__
 
 #include <libwpd/libwpd.h>
 #include <libwpd-stream/libwpd-stream.h>
@@ -48,4 +48,4 @@ public:
 
 } // namespace libpict
 
-#endif //  __PictRAPHICS_H__
+#endif //  __PICTRAPHICS_H__
diff --git a/src/lib/PictSVGGenerator.h b/src/lib/PictSVGGenerator.h
index 3e56914..2053a6e 100644
--- a/src/lib/PictSVGGenerator.h
+++ b/src/lib/PictSVGGenerator.h
@@ -24,8 +24,8 @@
  * Corel Corporation or Corel Corporation Limited."
  */
 
-#ifndef __PictSVGGENERATOR_H__
-#define __PictSVGGENERATOR_H__
+#ifndef __PICTSVGGENERATOR_H__
+#define __PICTSVGGENERATOR_H__
 
 #include <stdio.h>
 #include <iostream>
@@ -76,4 +76,4 @@ private:
 
 } // namespace libpict
 
-#endif // __PictSVGGENERATOR_H__
+#endif // __PICTSVGGENERATOR_H__
diff --git a/src/lib/PictXParser.h b/src/lib/PictXParser.h
index c17e433..3fee480 100644
--- a/src/lib/PictXParser.h
+++ b/src/lib/PictXParser.h
@@ -25,8 +25,8 @@
  * Corel Corporation or Corel Corporation Limited."
  */
 
-#ifndef __PictXPARSER_H__
-#define __PictXPARSER_H__
+#ifndef __PICTXPARSER_H__
+#define __PICTXPARSER_H__
 
 #include <libwpg/libwpg.h>
 #include <libwpd-stream/WPXStream.h>
@@ -147,4 +147,4 @@ private:
 };
 
 
-#endif // __PictXPARSER_H__
+#endif // __PICTXPARSER_H__