propagated renaming fixes to .cc files

darcs-hash:20040414070831-5007d-63f2744d8235f4d313467356fd4025202e2fa7a5.gz

diff --git a/src/org/ibex/plat/Darwin.cc b/src/org/ibex/plat/Darwin.cc
index 0ce47ac..4a3eea6 100644 (file)
--- a/src/org/ibex/plat/Darwin.cc
+++ b/src/org/ibex/plat/Darwin.cc
@@ -740,7 +740,7 @@ void Darwin$CarbonSurface::natDispose() {
     WC(DisposeWindow)(window);
 }
 
     WC(DisposeWindow)(window);
 }
 

-void Darwin$CarbonSurface::natSetIcon(org::ibex::Picture *_p) {
+void Darwin$CarbonSurface::natSetIcon(org::ibex::graphics::Picture *_p) {

 }
 
 void Darwin$CarbonSurface::natSetLocation() {
 }
 
 void Darwin$CarbonSurface::natSetLocation() {

@@ -889,9 +889,8 @@ void Darwin::natSetClipBoard(jstring js) {
     checkStatus(r,"PutScrapFlavor");
 }
 
     checkStatus(r,"PutScrapFlavor");
 }
 

-HTTP$Proxy *Darwin::natDetectProxy() {
-    using org::ibex::HTTP$Proxy;
-    HTTP$Proxy *p=0;
+org::ibex::net::HTTP$Proxy *Darwin::natDetectProxy() {
+    org::ibex::net::HTTP$Proxy *p=0;

     CFStringRef string;
     CFNumberRef number;
     SmartCFString smartString;
     CFStringRef string;
     CFNumberRef number;
     SmartCFString smartString;

@@ -910,7 +909,7 @@ HTTP$Proxy *Darwin::natDetectProxy() {
         number = (CFNumberRef) WC(CFDictionaryGetValue)(proxyInfo, kSCPropNetProxies ## proto ## Port); \
         if(number != NULL && WC(CFGetTypeID)(number) != WC(CFNumberGetTypeID)()) number = NULL;    \
         if(string && number && WC(CFNumberGetValue)(number,kCFNumberIntType,&i) && i) {        \
         number = (CFNumberRef) WC(CFDictionaryGetValue)(proxyInfo, kSCPropNetProxies ## proto ## Port); \
         if(number != NULL && WC(CFGetTypeID)(number) != WC(CFNumberGetTypeID)()) number = NULL;    \
         if(string && number && WC(CFNumberGetValue)(number,kCFNumberIntType,&i) && i) {        \

-            if(!p) p = new HTTP$Proxy();                                                        \
+            if(!p) p = new org::ibex::net::HTTP$Proxy();                                                        \

             p->var ## ProxyHost = cfStringToJString(string);                           \
             p->var ## ProxyPort = i;                                                   \
         }                                                                                  \
             p->var ## ProxyHost = cfStringToJString(string);                           \
             p->var ## ProxyPort = i;                                                   \
         }                                                                                  \

diff --git a/src/org/ibex/plat/GCJ.cc b/src/org/ibex/plat/GCJ.cc
index 53e7f19..73e7851 100644 (file)
--- a/src/org/ibex/plat/GCJ.cc
+++ b/src/org/ibex/plat/GCJ.cc
@@ -4,8 +4,8 @@
 
 #include <gcj/cni.h>
 #include <gcj/array.h>
 
 #include <gcj/cni.h>
 #include <gcj/array.h>

-#include <org/ibex/Platform.h>
-#include <org/ibex/Picture.h>
+#include <org/ibex/plat/Platform.h>
+#include <org/ibex/graphics/Picture.h>

 #include <org/ibex/plat/GCJ.h>
 #include <java/io/InputStream.h>
 #include <java/io/ByteArrayInputStream.h>
 #include <org/ibex/plat/GCJ.h>
 #include <java/io/InputStream.h>
 #include <java/io/ByteArrayInputStream.h>

@@ -99,7 +99,7 @@ void skip_input_data (j_decompress_ptr cinfo, long num_bytes) {
     src->pub.bytes_in_buffer -= num_bytes;
 }
 
     src->pub.bytes_in_buffer -= num_bytes;
 }
 

-void org::ibex::plat::GCJ::_decodeJPEG(java::io::InputStream* is, org::ibex::Picture* p) {
+void org::ibex::plat::GCJ::_decodeJPEG(java::io::InputStream* is, org::ibex::graphics::Picture* p) {

     struct jpeg_decompress_struct cinfo;
     my_error_mgr_t jerr;
     my_source_mgr_t src;
     struct jpeg_decompress_struct cinfo;
     my_error_mgr_t jerr;
     my_source_mgr_t src;

diff --git a/src/org/ibex/plat/POSIX.cc b/src/org/ibex/plat/POSIX.cc
index 0fe7dc1..d37fbcc 100644 (file)
--- a/src/org/ibex/plat/POSIX.cc
+++ b/src/org/ibex/plat/POSIX.cc
@@ -2,12 +2,12 @@
 // see below for copyright information on the second portion of this file
 
 #include <java/lang/String.h>
 // see below for copyright information on the second portion of this file
 
 #include <java/lang/String.h>

-#include <org/ibex/Surface.h>
-#include <org/ibex/Picture.h>
+#include <org/ibex/graphics/Surface.h>
+#include <org/ibex/graphics/Picture.h>

 #include <org/ibex/js/JS.h>
 #include <org/ibex/js/JS.h>

-#include <org/ibex/Box.h>
+#include <org/ibex/core/Box.h>

 #include <org/ibex/util/Semaphore.h>
 #include <org/ibex/util/Semaphore.h>

-#include <org/ibex/Platform.h>
+#include <org/ibex/plat/Platform.h>

 #include <java/lang/Long.h>
 #include <java/util/Hashtable.h>
 #include <org/ibex/util/Log.h>
 #include <java/lang/Long.h>
 #include <java/util/Hashtable.h>
 #include <org/ibex/util/Log.h>

diff --git a/src/org/ibex/plat/Win32.cc b/src/org/ibex/plat/Win32.cc
index 4c0369f..d6016d6 100644 (file)
--- a/src/org/ibex/plat/Win32.cc
+++ b/src/org/ibex/plat/Win32.cc
@@ -373,7 +373,7 @@ static jint scratch_h = 0;
 #define max(a,b) ((a)>(b)?(a):(b))
 #define min(a,b) ((a)<(b)?(a):(b))
 
 #define max(a,b) ((a)>(b)?(a):(b))
 #define min(a,b) ((a)<(b)?(a):(b))
 

-void org::ibex::plat::Win32$Win32PixelBuffer::drawPicture(org::ibex::Picture* source0,
+void org::ibex::plat::Win32$Win32PixelBuffer::drawPicture(org::ibex::graphics::Picture* source0,

                                                          jint dx, jint dy,
                                                          jint cx1, jint cy1, jint cx2, jint cy2,
                                                          jint rgb, jboolean alphaOnly) {
                                                          jint dx, jint dy,
                                                          jint cx1, jint cy1, jint cx2, jint cy2,
                                                          jint rgb, jboolean alphaOnly) {

@@ -456,7 +456,7 @@ void org::ibex::plat::Win32$Win32PixelBuffer::fillRect(jint x, jint y, jint x2,
     DeleteObject(brush);
 }
 
     DeleteObject(brush);
 }
 

-void org::ibex::plat::Win32$Win32Surface::blit(org::ibex::PixelBuffer* s, jint sx, jint sy, jint dx, jint dy, jint dx2, jint dy2) {
+void org::ibex::plat::Win32$Win32Surface::blit(org::ibex::graphics::PixelBuffer* s, jint sx, jint sy, jint dx, jint dy, jint dx2, jint dy2) {

     // we create the DC lazily to get around some strange race condition in WinXP
     if (hdc == 0) hdc = (jint)GetDC((HWND)hwnd);
     BitBlt((HDC)hdc, dx, dy, dx2 - dx, dy2 - dy, (HDC)(((org::ibex::plat::Win32$Win32PixelBuffer*)s)->hdc), sx, sy, SRCCOPY);
     // we create the DC lazily to get around some strange race condition in WinXP
     if (hdc == 0) hdc = (jint)GetDC((HWND)hwnd);
     BitBlt((HDC)hdc, dx, dy, dx2 - dx, dy2 - dy, (HDC)(((org::ibex::plat::Win32$Win32PixelBuffer*)s)->hdc), sx, sy, SRCCOPY);

@@ -579,7 +579,7 @@ void org::ibex::plat::Win32$Win32Surface::setTitleBarText(java::lang::String* ti
     SetWindowText((HWND)hwnd, buf);
 }
 
     SetWindowText((HWND)hwnd, buf);
 }
 

-void org::ibex::plat::Win32$Win32Surface::setIcon(org::ibex::Picture* p0) {
+void org::ibex::plat::Win32$Win32Surface::setIcon(org::ibex::graphics::Picture* p0) {

 
     org::ibex::plat::Win32$Win32Picture* p = (org::ibex::plat::Win32$Win32Picture*)p0;
     int icon_width = GetSystemMetrics(SM_CXSMICON);
 
     org::ibex::plat::Win32$Win32Picture* p = (org::ibex::plat::Win32$Win32Picture*)p0;
     int icon_width = GetSystemMetrics(SM_CXSMICON);

diff --git a/src/org/ibex/plat/X11.cc b/src/org/ibex/plat/X11.cc
index 0e91ece..f8bd199 100644 (file)
--- a/src/org/ibex/plat/X11.cc
+++ b/src/org/ibex/plat/X11.cc
@@ -11,15 +11,15 @@
 #include <X11/Xmu/StdCmap.h>
 
 #include <java/lang/String.h>
 #include <X11/Xmu/StdCmap.h>
 
 #include <java/lang/String.h>

-#include <org/ibex/Surface.h>
-#include <org/ibex/Picture.h>
-#include <org/ibex/Box.h>
+#include <org/ibex/graphics/Surface.h>
+#include <org/ibex/graphics/Picture.h>
+#include <org/ibex/core/Box.h>

 #include <org/ibex/plat/X11.h>
 #include <org/ibex/plat/X11$X11Surface.h>
 #include <org/ibex/plat/X11$X11Picture.h>
 #include <org/ibex/plat/X11$X11PixelBuffer.h>
 #include <org/ibex/util/Semaphore.h>
 #include <org/ibex/plat/X11.h>
 #include <org/ibex/plat/X11$X11Surface.h>
 #include <org/ibex/plat/X11$X11Picture.h>
 #include <org/ibex/plat/X11$X11PixelBuffer.h>
 #include <org/ibex/util/Semaphore.h>

-#include <org/ibex/Platform.h>
+#include <org/ibex/plat/Platform.h>

 #include <java/lang/Long.h>
 #include <java/util/Hashtable.h>
 #include <org/ibex/util/Log.h>
 #include <java/lang/Long.h>
 #include <java/util/Hashtable.h>
 #include <org/ibex/util/Log.h>

@@ -66,7 +66,7 @@ static void ensureShmSize(int size) {
     }
 }
 
     }
 }
 

-void org::ibex::plat::X11$X11PixelBuffer::fastDrawPicture(org::ibex::Picture* s,
+void org::ibex::plat::X11$X11PixelBuffer::fastDrawPicture(org::ibex::graphics::Picture* s,

                                                          jint dx, jint dy, jint cx1, jint cy1, jint cx2, jint cy2) {
     org::ibex::plat::X11$X11Picture* source = (org::ibex::plat::X11$X11Picture*)s;
 
                                                          jint dx, jint dy, jint cx1, jint cy1, jint cx2, jint cy2) {
     org::ibex::plat::X11$X11Picture* source = (org::ibex::plat::X11$X11Picture*)s;
 

@@ -82,7 +82,7 @@ void org::ibex::plat::X11$X11PixelBuffer::fastDrawPicture(org::ibex::Picture* s,
               cx1 - dx, cy1 - dy, cx2 - cx1, cy2 - cy1, cx1, cy1);
 }
 
               cx1 - dx, cy1 - dy, cx2 - cx1, cy2 - cy1, cx1, cy1);
 }
 

-void org::ibex::plat::X11$X11PixelBuffer::slowDrawPicture(org::ibex::Picture* s,
+void org::ibex::plat::X11$X11PixelBuffer::slowDrawPicture(org::ibex::graphics::Picture* s,

                                                          jint dx, jint dy, jint cx1, jint cy1, jint cx2, jint cy2,
                                                          jint rgb, jboolean alphaOnly) {
 
                                                          jint dx, jint dy, jint cx1, jint cy1, jint cx2, jint cy2,
                                                          jint rgb, jboolean alphaOnly) {
 

@@ -138,7 +138,7 @@ void org::ibex::plat::X11$X11PixelBuffer::slowDrawPicture(org::ibex::Picture* s,
                            (((int)*(current_pixel + 1)) << 8) |
                            (((int)*(current_pixel + 2))); break;
                 case 32: targetpixel = *((int*)current_pixel); break;
                            (((int)*(current_pixel + 1)) << 8) |
                            (((int)*(current_pixel + 2))); break;
                 case 32: targetpixel = *((int*)current_pixel); break;

-                default: org::ibex::Platform::criticalAbort(JvNewStringLatin1("ERROR: bpp not a multiple of 8!"));
+                default: org::ibex::plat::Platform::criticalAbort(JvNewStringLatin1("ERROR: bpp not a multiple of 8!"));

                 }
                 targetpixel -= colormap_info->base_pixel;
 
                 }
                 targetpixel -= colormap_info->base_pixel;
 

@@ -173,7 +173,7 @@ void org::ibex::plat::X11$X11PixelBuffer::slowDrawPicture(org::ibex::Picture* s,
                 break;
             }
             case 32: *((uint32_t*)current_pixel) = destpixel; break;
                 break;
             }
             case 32: *((uint32_t*)current_pixel) = destpixel; break;

-            default: org::ibex::Platform::criticalAbort(JvNewStringLatin1("ERROR: bpp not a multiple of 8!"));
+            default: org::ibex::plat::Platform::criticalAbort(JvNewStringLatin1("ERROR: bpp not a multiple of 8!"));

             }
         }
     }
             }
         }
     }

@@ -275,7 +275,7 @@ void org::ibex::plat::X11$X11PixelBuffer::createStipple(org::ibex::plat::X11$X11
     XPutImage(display, (*((Pixmap*)stipple)), stipple_gc, &xi, 0, 0, 0, 0, width, height);
 }
 
     XPutImage(display, (*((Pixmap*)stipple)), stipple_gc, &xi, 0, 0, 0, 0, width, height);
 }
 

-void org::ibex::plat::X11$X11Surface::blit(org::ibex::PixelBuffer* db, jint sx, jint sy, jint dx, jint dy, jint dx2, jint dy2) {
+void org::ibex::plat::X11$X11Surface::blit(org::ibex::graphics::PixelBuffer* db, jint sx, jint sy, jint dx, jint dy, jint dx2, jint dy2) {

     org::ibex::plat::X11$X11PixelBuffer *xdb = (org::ibex::plat::X11$X11PixelBuffer*)db;
     XCopyArea(display, *((Pixmap*)xdb->pm), *((Window*)window), *((GC*)gc), sx, sy, dx2 - dx, dy2 - dy, dx, dy);
     XFlush(display);
     org::ibex::plat::X11$X11PixelBuffer *xdb = (org::ibex::plat::X11$X11PixelBuffer*)db;
     XCopyArea(display, *((Pixmap*)xdb->pm), *((Window*)window), *((GC*)gc), sx, sy, dx2 - dx, dy2 - dy, dx, dy);
     XFlush(display);

@@ -304,7 +304,7 @@ void org::ibex::plat::X11$X11PixelBuffer::fillRect (jint x, jint y, jint x2, jin
 
 // X11Surface //////////////////////////////////////////////////////////////////////
 
 
 // X11Surface //////////////////////////////////////////////////////////////////////
 

-void org::ibex::plat::X11$X11Surface::setIcon(org::ibex::Picture* pic) {
+void org::ibex::plat::X11$X11Surface::setIcon(org::ibex::graphics::Picture* pic) {

     org::ibex::plat::X11$X11Picture* p = ((org::ibex::plat::X11$X11Picture*)pic);
     org::ibex::plat::X11$X11PixelBuffer* old_dbuf = p->doublebuf;
     p->buildPixelBuffer(1);
     org::ibex::plat::X11$X11Picture* p = ((org::ibex::plat::X11$X11Picture*)pic);
     org::ibex::plat::X11$X11PixelBuffer* old_dbuf = p->doublebuf;
     p->buildPixelBuffer(1);

@@ -676,14 +676,14 @@ int errorHandler(Display* d, XErrorEvent* e) {
 void org::ibex::plat::X11::natInit() {
 
     if (!XInitThreads())
 void org::ibex::plat::X11::natInit() {
 
     if (!XInitThreads())

-        org::ibex::Platform::criticalAbort(JvNewStringLatin1("Your X11 libraries do not support multithreaded programs"));
+        org::ibex::plat::Platform::criticalAbort(JvNewStringLatin1("Your X11 libraries do not support multithreaded programs"));

 
     char* DISPLAY = getenv("DISPLAY");
     if (DISPLAY == NULL || strlen(DISPLAY) == 0) DISPLAY = ":0.0";
     display = XOpenDisplay(DISPLAY);
 
     if (display == 0)
 
     char* DISPLAY = getenv("DISPLAY");
     if (DISPLAY == NULL || strlen(DISPLAY) == 0) DISPLAY = ":0.0";
     display = XOpenDisplay(DISPLAY);
 
     if (display == 0)

-        org::ibex::Platform::criticalAbort(JvNewStringLatin1("Unable to connect to X11 display server"));
+        org::ibex::plat::Platform::criticalAbort(JvNewStringLatin1("Unable to connect to X11 display server"));

 
     screen_num = XDefaultScreen(display);
     colorDepth = (jint)(DefaultDepth(((Display*)display), 0));
 
     screen_num = XDefaultScreen(display);
     colorDepth = (jint)(DefaultDepth(((Display*)display), 0));

@@ -746,15 +746,15 @@ void org::ibex::plat::X11::natInit() {
 
     // FIXME: don't know why (True, False) is the best solution...
     if(XmuLookupStandardColormap(display, screen_num, visual->visualid, colorDepth, XA_RGB_BEST_MAP, True, False) == 0)
 
     // FIXME: don't know why (True, False) is the best solution...
     if(XmuLookupStandardColormap(display, screen_num, visual->visualid, colorDepth, XA_RGB_BEST_MAP, True, False) == 0)

-        org::ibex::Platform::criticalAbort(JvNewStringLatin1("ERROR: XmuLookupStandardColormap failed"));
+        org::ibex::plat::Platform::criticalAbort(JvNewStringLatin1("ERROR: XmuLookupStandardColormap failed"));

     XStandardColormap* best_map_info = NULL;
     int count;
     if (XGetRGBColormaps(display, RootWindow(display, screen_num), &best_map_info, &count, XA_RGB_BEST_MAP) == 0)
     XStandardColormap* best_map_info = NULL;
     int count;
     if (XGetRGBColormaps(display, RootWindow(display, screen_num), &best_map_info, &count, XA_RGB_BEST_MAP) == 0)

-        org::ibex::Platform::criticalAbort(JvNewStringLatin1("ERROR: couldn't allocate a standard colormap"));
+        org::ibex::plat::Platform::criticalAbort(JvNewStringLatin1("ERROR: couldn't allocate a standard colormap"));

     if (!best_map_info->colormap)
     if (!best_map_info->colormap)

-        org::ibex::Platform::criticalAbort(JvNewStringLatin1("ERROR: XmuLookupStandardColomap succeded, but no colormap was found on the root window"));
+        org::ibex::plat::Platform::criticalAbort(JvNewStringLatin1("ERROR: XmuLookupStandardColomap succeded, but no colormap was found on the root window"));

     if (best_map_info->red_max == 0)
     if (best_map_info->red_max == 0)

-        org::ibex::Platform::criticalAbort(JvNewStringLatin1("ERROR: standard colormap exists, but was improperly allocated"));
+        org::ibex::plat::Platform::criticalAbort(JvNewStringLatin1("ERROR: standard colormap exists, but was improperly allocated"));

     s_colormap = best_map_info->colormap;
     colormap_info = best_map_info;
 
     s_colormap = best_map_info->colormap;
     colormap_info = best_map_info;