From f87f0646de94e24fc77ec751b176c71633cf86e0 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Wed, 10 Nov 2010 12:09:26 +0000
Subject: [PATCH] 2010-11-10 13:08 UTC+0100 Viktor Szakats (harbour.01
 syenar.hu)   * contrib/hbzebra/hbzebra.hbp   - contrib/hbzebra/cairo.c   +
 contrib/hbzebra/d_cairo.c   - contrib/hbzebra/tests/test1.prg   +
 contrib/hbzebra/tests/testcair.prg     * Renames.

---
 harbour/ChangeLog                                    |  8 ++++++++
 harbour/contrib/hbzebra/{cairo.c => d_cairo.c}       |  0
 harbour/contrib/hbzebra/hbzebra.hbp                  |  2 +-
 .../hbzebra/tests/{test1.prg => testcair.prg}        | 12 ++++++------
 4 files changed, 15 insertions(+), 7 deletions(-)
 rename harbour/contrib/hbzebra/{cairo.c => d_cairo.c} (100%)
 rename harbour/contrib/hbzebra/tests/{test1.prg => testcair.prg} (95%)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 1f12bc60ed..1e22c86938 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,14 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-11-10 13:08 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbzebra/hbzebra.hbp
+  - contrib/hbzebra/cairo.c
+  + contrib/hbzebra/d_cairo.c
+  - contrib/hbzebra/tests/test1.prg
+  + contrib/hbzebra/tests/testcair.prg
+    * Renames.
+
 2010-11-10 13:03 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbzebra/hbzebra.hbp
   + contrib/hbzebra/d_hpdf.c
diff --git a/harbour/contrib/hbzebra/cairo.c b/harbour/contrib/hbzebra/d_cairo.c
similarity index 100%
rename from harbour/contrib/hbzebra/cairo.c
rename to harbour/contrib/hbzebra/d_cairo.c
diff --git a/harbour/contrib/hbzebra/hbzebra.hbp b/harbour/contrib/hbzebra/hbzebra.hbp
index 01606c59f5..9e6d6af71f 100644
--- a/harbour/contrib/hbzebra/hbzebra.hbp
+++ b/harbour/contrib/hbzebra/hbzebra.hbp
@@ -36,7 +36,7 @@ msi.c
 -depimplibd=cairo:cairo
 -depfinish=cairo
 
-{HBMK_HAS_CAIRO}cairo.c
+{HBMK_HAS_CAIRO}d_cairo.c
 {HBMK_HAS_CAIRO}../hbcairo/hbcairo.hbc
 
 {allwin}d_win.c
diff --git a/harbour/contrib/hbzebra/tests/test1.prg b/harbour/contrib/hbzebra/tests/testcair.prg
similarity index 95%
rename from harbour/contrib/hbzebra/tests/test1.prg
rename to harbour/contrib/hbzebra/tests/testcair.prg
index b5792dbbd1..31c0b34fe6 100644
--- a/harbour/contrib/hbzebra/tests/test1.prg
+++ b/harbour/contrib/hbzebra/tests/testcair.prg
@@ -5,8 +5,8 @@
 #include "hbzebra.ch"
 #include "hbcairo.ch"
 
-PROC main()
-LOCAL hCairo, hSurface
+PROCEDURE main()
+   LOCAL hCairo, hSurface
 
    hSurface := cairo_pdf_surface_create( "test1.pdf", 567, 794 )  // A4
 
@@ -43,11 +43,11 @@ LOCAL hCairo, hSurface
    cairo_destroy( hCairo )
    cairo_surface_write_to_png( hSurface, "test1.png" )
    cairo_surface_destroy( hSurface )
-RETURN
+   RETURN
 
 
-PROC DrawBarcode( hCairo, nY, nLineWidth, cType, cCode, nFlags )
-LOCAL hZebra
+PROCEDURE DrawBarcode( hCairo, nY, nLineWidth, cType, cCode, nFlags )
+   LOCAL hZebra
    IF cType == "EAN13"
       hZebra := hb_zebra_create_ean13( cCode, nFlags )
    ELSEIF cType == "EAN8"
@@ -85,4 +85,4 @@ LOCAL hZebra
    ELSE
       ? "Invalid barcode type", cType
    ENDIF
-RETURN
+   RETURN