--- rfb-0.6.1/lib/Framebuffer.cc.c++fixes 2002-02-25 02:58:40.000000000 +0100
+++ rfb-0.6.1/lib/Framebuffer.cc 2002-05-28 20:13:54.000000000 +0200
@@ -161,7 +161,7 @@ void Framebuffer::putPixel( unsigned int
unsigned int r,
unsigned int g,
unsigned int b,
- unsigned int m = 255 )
+ unsigned int m )
{
FramebufferPixel(this,x,y).setColor(r,g,b,m);
}
@@ -172,7 +172,7 @@ void Framebuffer::getPixel( unsigned int
unsigned int &r,
unsigned int &g,
unsigned int &b,
- unsigned int m = 255 )
+ unsigned int m )
{
FramebufferPixel(this,x,y).getColor(r,g,b,m);
}
@@ -181,7 +181,7 @@ void Framebuffer::getPixel( unsigned int
void FramebufferPixel::setColor( unsigned int r,
unsigned int g,
unsigned int b,
- unsigned int m = 255 )
+ unsigned int m )
{
unsigned int r_max = fb->pixelFormat.red_max;
unsigned int g_max = fb->pixelFormat.green_max;
@@ -246,7 +246,7 @@ void FramebufferPixel::setColor( unsigne
void FramebufferPixel::getColor( unsigned int &r,
unsigned int &g,
unsigned int &b,
- unsigned int m = 255 )
+ unsigned int m )
{
unsigned int r_max = fb->pixelFormat.red_max;
unsigned int g_max = fb->pixelFormat.green_max;
@@ -288,10 +288,10 @@ void FramebufferPixel::getColor( unsigne
int saveFramebufferAsPPM( int file, Framebuffer *fb,
- int x0 = 0,
- int y0 = 0,
- int width = -1,
- int height = -1 ) {
+ int x0,
+ int y0,
+ int width,
+ int height ) {
if ( width < 0 ) width = fb->width;
if ( height < 0 ) height = fb->height;
char tmp[255] = "";
--- rfb-0.6.1/lib/rfb.cc.c++fixes 2000-07-24 02:46:59.000000000 +0200
+++ rfb-0.6.1/lib/rfb.cc 2002-05-28 20:15:30.000000000 +0200
@@ -28,7 +28,7 @@ namespace rfb {
/* CARD16 */
/**************************************************/
-CARD16::CARD16( unsigned int _value = 0 )
+CARD16::CARD16( unsigned int _value )
{
value[1] = _value;
_value >>= 8;
@@ -55,7 +55,7 @@ CARD16& CARD16::operator=( unsigned int
/* CARD32 */
/**************************************************/
-CARD32::CARD32( unsigned int _value = 0 )
+CARD32::CARD32( unsigned int _value )
{
value[3] = _value;
_value >>= 8;
--- rfb-0.6.1/lib/rfbServer.cc.c++fixes 2002-02-11 19:36:58.000000000 +0100
+++ rfb-0.6.1/lib/rfbServer.cc 2002-05-28 20:18:40.000000000 +0200
@@ -20,15 +20,18 @@
#include "rfbServer.h"
+#include <iostream>
#include <stdlib.h>
#include <string.h>
#include "d3des.h"
+// (gb) namespace std does not have global scope...
+using std::cerr;
+using std::cout;
+using std::endl;
namespace rfb {
-
-
Server::Server()
: stateProtocolVersion( this )
, stateAuthentication( this )
@@ -349,7 +352,7 @@ void Server::sendIncrementalFramebufferU
message.framebufferUpdate.number_of_rectangles = hintList.size();
connection->send( (unsigned char*) &message, 4 );
- list< Hint >::iterator i = hintList.begin();
+ std::list< Hint >::iterator i = hintList.begin();
while ( i != hintList.end() ) {
sendEncodedRectangle( *i );
i++;
--- rfb-0.6.1/include/rfbServer.h.c++fixes 2002-02-11 19:22:41.000000000 +0100
+++ rfb-0.6.1/include/rfbServer.h 2002-05-28 20:14:30.000000000 +0200
@@ -325,7 +325,7 @@ class Server
bool framebufferUpdateRequested;
bool incrementalFramebufferUpdateRequested;
- list< Hint > hintList;
+ std::list< Hint > hintList;
void RequestRegionRefresh( unsigned int x,
unsigned int y,
--- rfb-0.6.1/include/rfbClient.h.c++fixes 2000-07-24 02:46:59.000000000 +0200
+++ rfb-0.6.1/include/rfbClient.h 2002-05-28 20:16:04.000000000 +0200
@@ -257,7 +257,7 @@ class ClientStateReadingRectangle: publi
protected:
Rectangle rectangle;
- friend ClientStateDecodingRaw;
+ friend class ClientStateDecodingRaw;
};
--- rfb-0.6.1/x0rfbserver/xclass++.h.c++fixes 2000-08-02 16:04:15.000000000 +0200
+++ rfb-0.6.1/x0rfbserver/xclass++.h 2002-05-28 20:23:38.000000000 +0200
@@ -4,7 +4,7 @@
#include <map>
-#define LAYOUT_HINTS map< OXFrame*, OLayoutHints* > layoutHints
+#define LAYOUT_HINTS std::map< OXFrame*, OLayoutHints* > layoutHints
#define DELETE_LAYOUT_HINTS \
while ( layoutHints.begin() != layoutHints.end() ) { \
--- rfb-0.6.1/x0rfbserver/XUpdateScanner.h.c++fixes 2002-02-13 00:57:01.000000000 +0100
+++ rfb-0.6.1/x0rfbserver/XUpdateScanner.h 2002-05-28 20:24:36.000000000 +0200
@@ -40,8 +40,8 @@ class XUpdateScanner
~XUpdateScanner();
- void checkTile( int x, int y, list< Hint > &hintList );
- void searchUpdates( list< Hint > &hintList );
+ void checkTile( int x, int y, std::list< Hint > &hintList );
+ void searchUpdates( std::list< Hint > &hintList );
void paintMousePointer(int x, int y);
void saveRegion(int x, int y, int w, int h);
--- rfb-0.6.1/x0rfbserver/XUpdateScanner.cc.c++fixes 2002-02-13 01:11:28.000000000 +0100
+++ rfb-0.6.1/x0rfbserver/XUpdateScanner.cc 2002-05-28 20:25:54.000000000 +0200
@@ -18,6 +18,7 @@
* USA.
*/
+#include <iostream>
#include <sys/ipc.h>
#include <sys/shm.h>
#include <X11/Xlib.h>
@@ -148,7 +149,7 @@ XUpdateScanner::~XUpdateScanner()
}
-void XUpdateScanner::checkTile( int x, int y, list< Hint > &hintList )
+void XUpdateScanner::checkTile( int x, int y, std::list< Hint > &hintList )
{
unsigned int maxWidth = fb->width - x;
unsigned int maxHeight = fb->height - y;
@@ -314,7 +315,7 @@ void XUpdateScanner::restoreRegion() {
}
-void XUpdateScanner::searchUpdates( list< Hint > &hintList )
+void XUpdateScanner::searchUpdates( std::list< Hint > &hintList )
{
restoreRegion();
@@ -382,7 +383,7 @@ void XUpdateScanner::searchUpdates( list
}
}
- cerr << "TILES: " << tilec << endl;
+ std::cerr << "TILES: " << tilec << std::endl;
if ( properties.showMousePointer ) {
--- rfb-0.6.1/x0rfbserver/x0rfbserver.cc.c++fixes 2002-02-26 07:07:28.000000000 +0100
+++ rfb-0.6.1/x0rfbserver/x0rfbserver.cc 2002-05-28 20:29:27.000000000 +0200
@@ -18,6 +18,7 @@
* USA.
*/
+#include <iostream>
#include "rfbServer.h"
#include "version.h"
#include "OXAbout.h"
@@ -69,6 +70,10 @@ OXClient *clientX;
const OXWindow *root;
Display *dpy;
+// (gb) namespace std does not have global scope!
+using std::cerr;
+using std::endl;
+
namespace rfb {
@@ -112,8 +117,8 @@ class OXServerMainFrame: public OXMainFr
OXServiceApplet *serviceApplet;
- map< OFileHandler*, BaseServer* > handleServerMap;
- list< BaseServer* > serverList;
+ std::map< OFileHandler*, BaseServer* > handleServerMap;
+ std::list< BaseServer* > serverList;
};
@@ -430,7 +435,7 @@ int OXServerMainFrame::HandleIdleEvent(
if ( properties.scanDelay ) {
if (!timer) timer = new OTimer( this, properties.scanDelay );
}
- list< BaseServer* >::iterator s;
+ std::list< BaseServer* >::iterator s;
int wantsUpdate = 0;
for ( s = serverList.begin(); s != serverList.end(); s++ )
if ( (*s)->framebufferUpdateRequested
@@ -451,13 +456,13 @@ int OXServerMainFrame::HandleIdleEvent(
void OXServerMainFrame::ScanUpdates()
{
- list< BaseServer* >::iterator s;
+ std::list< BaseServer* >::iterator s;
// cerr << "StartUpdates() start" << endl;
- list< Hint > hintList;
+ std::list< Hint > hintList;
scanner->searchUpdates( hintList );
- list< Hint >::iterator i;
+ std::list< Hint >::iterator i;
for ( i = hintList.begin(); i != hintList.end(); i++ )
for ( s = serverList.begin(); s != serverList.end(); s++ )
(*s)->handleHint( *i );
--- rfb-0.6.1/xrfbviewer/xclass++.h.c++fixes 2000-08-02 15:51:08.000000000 +0200
+++ rfb-0.6.1/xrfbviewer/xclass++.h 2002-05-28 20:20:53.000000000 +0200
@@ -4,7 +4,7 @@
#include <map>
-#define LAYOUT_HINTS map< OXFrame*, OLayoutHints* > layoutHints
+#define LAYOUT_HINTS std::map< OXFrame*, OLayoutHints* > layoutHints
#define DELETE_LAYOUT_HINTS \
while ( layoutHints.begin() != layoutHints.end() ) { \
--- rfb-0.6.1/xrfbviewer/OXViewerApplet.h.c++fixes 2000-11-03 13:22:03.000000000 +0100
+++ rfb-0.6.1/xrfbviewer/OXViewerApplet.h 2002-05-28 20:21:48.000000000 +0200
@@ -51,7 +51,7 @@ class OXViewerApplet: public OXMainFrame
private:
char *xrfbviewerCommand;
- map< OXFrame*, OLayoutHints* > layoutHints;
+ std::map< OXFrame*, OLayoutHints* > layoutHints;
OXPopupMenu *popupMenu;
rfb::ConnectionInfo connectionInfo;
--- rfb-0.6.1/xrfbviewer/OXViewerApplet.cc.c++fixes 2002-02-11 18:26:18.000000000 +0100
+++ rfb-0.6.1/xrfbviewer/OXViewerApplet.cc 2002-05-28 20:22:40.000000000 +0200
@@ -57,6 +57,10 @@
#include "version.h"
+// (gb) namespace std does not have global scope...
+using std::cout;
+using std::endl;
+
void createViewerProcess( rfb::ConnectionInfo &connectionInfo, int fd0, int fd1 );
--- rfb-0.6.1/rfbcat/rfbcat.cc.c++fixes 2002-02-25 03:28:03.000000000 +0100
+++ rfb-0.6.1/rfbcat/rfbcat.cc 2002-05-28 20:30:45.000000000 +0200
@@ -45,6 +45,9 @@
#ifdef DEBUG
#include <iostream>
+// (gb) namespace std does not have global scope!
+using std::cerr;
+using std::endl;
#define debug(msg) (cerr << msg << endl)
#else // DEBUG
#define debug(msg)
