Moved Quartz graphics driver to the new naming scheme

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11057 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

14 files changed, 17 insertions, 11 deletions

diff --git a/FL/Fl_Device.H b/FL/Fl_Device.H
index 6621c390b..0fa8d7493 100644
--- a/FL/Fl_Device.H
+++ b/FL/Fl_Device.H
@@ -276,7 +276,7 @@ protected:
 
 // FIXME: add Fl_Quartz_Printer_Graphics_Driver
 // FIXME: it should not be required to include this file here. This is nothing that the user should have access to.
-#include "src/cfg_gfx/quartz.H"
+#include "src/drivers/Quartz/Fl_Quartz_Graphics_Driver.h"
 
 #elif defined(WIN32) || defined(FL_DOXYGEN)
 
diff --git a/src/cfg_gfx/quartz.H b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.h
index ae597fe13..ae597fe13 100644
--- a/src/cfg_gfx/quartz.H
+++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.h
diff --git a/src/cfg_gfx/quartz_arci.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_arci.cxx
index d3fd185a9..c6288d7fe 100644
--- a/src/cfg_gfx/quartz_arci.cxx
+++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_arci.cxx
@@ -19,6 +19,8 @@
 #ifndef FL_CFG_GFX_QUARTZ_ARCI_CXX
 #define FL_CFG_GFX_QUARTZ_ARCI_CXX
 
+#include "Fl_Quartz_Graphics_Driver.h"
+
 /**
   \file quartz_arci.cxx
   \brief Utility functions for drawing circles using integers
diff --git a/src/cfg_gfx/quartz_color.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_color.cxx
index b4ca35f7c..178fb6604 100644
--- a/src/cfg_gfx/quartz_color.cxx
+++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_color.cxx
@@ -24,13 +24,15 @@
 // matt: Neither Quartz nor Quickdraw support colormaps in this implementation
 // matt: Quartz support done
 
+#include "Fl_Quartz_Graphics_Driver.h"
+
 #include <config.h>
 #include <FL/Fl.H>
 #include <FL/x.H>
 #include <FL/fl_draw.H>
 
 static unsigned fl_cmap[256] = {
-#include "../fl_cmap.h" // this is a file produced by "cmap.cxx":
+#include "../../fl_cmap.h" // this is a file produced by "cmap.cxx":
 };
 
 void Fl_Quartz_Graphics_Driver::color(Fl_Color i) {
diff --git a/src/cfg_gfx/quartz_font.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx
index 84a2a707e..b48a14f4a 100644
--- a/src/cfg_gfx/quartz_font.cxx
+++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx
@@ -16,6 +16,8 @@
 //     http://www.fltk.org/str.php
 //
 
+#include "Fl_Quartz_Graphics_Driver.h"
+
 #include <config.h>
 #include <math.h>
 
diff --git a/src/cfg_gfx/quartz_line_style.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_line_style.cxx
index 8a43180e9..a70a067b6 100644
--- a/src/cfg_gfx/quartz_line_style.cxx
+++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_line_style.cxx
@@ -24,7 +24,7 @@
   \brief Line style drawing utility hiding different platforms.
 */
 
-#include "quartz.H"
+#include "Fl_Quartz_Graphics_Driver.h"
 
 float fl_quartz_line_width_ = 1.0f;
 static /*enum*/ CGLineCap fl_quartz_line_cap_ = kCGLineCapButt;
diff --git a/src/cfg_gfx/quartz_rect.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_rect.cxx
index dd139ef6c..63dcd07a8 100644
--- a/src/cfg_gfx/quartz_rect.cxx
+++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_rect.cxx
@@ -27,7 +27,7 @@
 */
 
 
-#include "quartz.H"
+#include "Fl_Quartz_Graphics_Driver.h"
 
 
 extern float fl_quartz_line_width_;
diff --git a/src/cfg_gfx/quartz_vertex.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_vertex.cxx
index 6c63a245a..b7404e299 100644
--- a/src/cfg_gfx/quartz_vertex.cxx
+++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_vertex.cxx
@@ -25,7 +25,7 @@
           simple 2D transformations, implemented for OS X Quartz.
 */
 
-#include "quartz.H"
+#include "Fl_Quartz_Graphics_Driver.h"
 
 #include <FL/fl_draw.H>
 #include <FL/x.H>
diff --git a/src/fl_arci.cxx b/src/fl_arci.cxx
index 11f6d4273..97e2e08c7 100644
--- a/src/fl_arci.cxx
+++ b/src/fl_arci.cxx
@@ -40,7 +40,7 @@
 
 #ifdef FL_CFG_GFX_QUARTZ
 
-# include "cfg_gfx/quartz_arci.cxx"
+# include "drivers/Quartz/Fl_Quartz_Graphics_Driver_arci.cxx"
 
 #endif
 
diff --git a/src/fl_color.cxx b/src/fl_color.cxx
index 1bf3a19f6..aebd17670 100644
--- a/src/fl_color.cxx
+++ b/src/fl_color.cxx
@@ -32,7 +32,7 @@
 
 #ifdef FL_CFG_GFX_QUARTZ
 
-# include "cfg_gfx/quartz_color.cxx"
+# include "drivers/Quartz/Fl_Quartz_Graphics_Driver_color.cxx"
 
 #endif
 
diff --git a/src/fl_font.cxx b/src/fl_font.cxx
index 9308b4505..b7e90790e 100644
--- a/src/fl_font.cxx
+++ b/src/fl_font.cxx
@@ -48,7 +48,7 @@
 #ifdef WIN32
 #  include "fl_font_win32.cxx"
 #elif defined(__APPLE__)
-#  include "cfg_gfx/quartz_font.cxx"
+#  include "drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx"
 #elif USE_XFT
 #  include "drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx"
 #elif defined(FL_PORTING)
diff --git a/src/fl_line_style.cxx b/src/fl_line_style.cxx
index 83a373394..dd62f69a0 100644
--- a/src/fl_line_style.cxx
+++ b/src/fl_line_style.cxx
@@ -40,7 +40,7 @@ int fl_line_width_ = 0;
 
 #ifdef FL_CFG_GFX_QUARTZ
 
-# include "cfg_gfx/quartz_line_style.cxx"
+# include "drivers/Quartz/Fl_Quartz_Graphics_Driver_line_style.cxx"
 
 #endif
 
diff --git a/src/fl_rect.cxx b/src/fl_rect.cxx
index 39af2e20c..bdf682dec 100644
--- a/src/fl_rect.cxx
+++ b/src/fl_rect.cxx
@@ -67,7 +67,7 @@ Fl_Region Fl_Graphics_Driver::clip_region() {
 
 #ifdef FL_CFG_GFX_QUARTZ
 
-# include "cfg_gfx/quartz_rect.cxx"
+# include "drivers/Quartz/Fl_Quartz_Graphics_Driver_rect.cxx"
 
 #endif
 
diff --git a/src/fl_vertex.cxx b/src/fl_vertex.cxx
index d891794c0..23b56e7a4 100644
--- a/src/fl_vertex.cxx
+++ b/src/fl_vertex.cxx
@@ -150,7 +150,7 @@ void Fl_Graphics_Driver::fixloop() {  // remove equal points from closed path
 
 #ifdef FL_CFG_GFX_QUARTZ
 
-# include "cfg_gfx/quartz_vertex.cxx"
+# include "drivers/Quartz/Fl_Quartz_Graphics_Driver_vertex.cxx"
 
 #endif