global structures/functions should have "rfb", "sra" or "zrle" as prefix,

while structure members should not

6 files changed, 8 insertions, 8 deletions

diff --git a/examples/colourmaptest.c b/examples/colourmaptest.c
index 156781c..e403164 100644
--- a/examples/colourmaptest.c
+++ b/examples/colourmaptest.c
@@ -8,7 +8,7 @@ int main(int argc,char** argv)
 
   rfbScreenInfoPtr server=rfbGetScreen(&argc,argv,256,256,8,1,1);
 
-  server->rfbServerFormat.trueColour=FALSE;
+  server->serverFormat.trueColour=FALSE;
   server->colourMap.count=256;
   server->colourMap.is16=FALSE;
   for(i=0;i<256;i++) {
diff --git a/examples/example.c b/examples/example.c
index f722d94..f0084c1 100644
--- a/examples/example.c
+++ b/examples/example.c
@@ -157,7 +157,7 @@ void doptr(int buttonMask,int x,int y,rfbClientPtr cl)
 
       cd->oldx=x; cd->oldy=y; cd->oldButton=buttonMask;
    }
-   defaultPtrAddEvent(buttonMask,x,y,cl);
+   rfbDefaultPtrAddEvent(buttonMask,x,y,cl);
 }
 
 /* aux function to draw a character to x, y */
@@ -277,7 +277,7 @@ int main(int argc,char** argv)
     rfbGetScreen(&argc,argv,maxx,maxy,8,3,bpp);
   rfbScreen->desktopName = "LibVNCServer Example";
   rfbScreen->frameBuffer = (char*)malloc(maxx*maxy*bpp);
-  rfbScreen->rfbAlwaysShared = TRUE;
+  rfbScreen->alwaysShared = TRUE;
   rfbScreen->ptrAddEvent = doptr;
   rfbScreen->kbdAddEvent = dokey;
   rfbScreen->newClientHook = newclient;
diff --git a/examples/pnmshow.c b/examples/pnmshow.c
index 99676d8..b40cf53 100644
--- a/examples/pnmshow.c
+++ b/examples/pnmshow.c
@@ -64,7 +64,7 @@ int main(int argc,char** argv)
     rfbScreen->desktopName = argv[1];
   else
     rfbScreen->desktopName = "Picture";
-  rfbScreen->rfbAlwaysShared = TRUE;
+  rfbScreen->alwaysShared = TRUE;
   rfbScreen->kbdAddEvent = HandleKey;
 
   /* enable http */
@@ -76,7 +76,7 @@ int main(int argc,char** argv)
   fclose(in);
 
   if(picType!=TRUECOLOUR) {
-	  rfbScreen->rfbServerFormat.trueColour=FALSE;
+	  rfbScreen->serverFormat.trueColour=FALSE;
 	  rfbScreen->colourMap.count=256;
 	  rfbScreen->colourMap.is16=FALSE;
 	  rfbScreen->colourMap.data.bytes=malloc(256*3);
diff --git a/examples/pnmshow24.c b/examples/pnmshow24.c
index 41e0335..bcee3e4 100644
--- a/examples/pnmshow24.c
+++ b/examples/pnmshow24.c
@@ -57,7 +57,7 @@ int main(int argc,char** argv)
     rfbScreen->desktopName = argv[1];
   else
     rfbScreen->desktopName = "Picture";
-  rfbScreen->rfbAlwaysShared = TRUE;
+  rfbScreen->alwaysShared = TRUE;
   rfbScreen->kbdAddEvent = HandleKey;
 
   /* enable http */
diff --git a/examples/storepasswd.c b/examples/storepasswd.c
index cc55569..d0a3f7e 100644
--- a/examples/storepasswd.c
+++ b/examples/storepasswd.c
@@ -36,7 +36,7 @@ int main(int argc, char *argv[])
     if (argc != 3) 
         usage();
 
-    if (vncEncryptAndStorePasswd(argv[1], argv[2]) != 0) {
+    if (rfbEncryptAndStorePasswd(argv[1], argv[2]) != 0) {
         printf("storing password failed.\n");
         return 1;
     } else {
diff --git a/examples/vncev.c b/examples/vncev.c
index 34128f7..e032529 100644
--- a/examples/vncev.c
+++ b/examples/vncev.c
@@ -105,7 +105,7 @@ int main(int argc,char** argv)
    s->colourMap.is16=FALSE;
    s->colourMap.count=2;
    s->colourMap.data.bytes=(unsigned char*)"\xd0\xd0\xd0\x30\x01\xe0";
-   s->rfbServerFormat.trueColour=FALSE;
+   s->serverFormat.trueColour=FALSE;
    s->frameBuffer=f;
    s->kbdAddEvent=dokey;
    s->ptrAddEvent=doptr;