Merge "Pixel" type in to PixelFormat header

It's a type specific to that class, so let's keep them close for
clarity.

common/rfb/CMsgHandler.h

@@ -26,7 +26,6 @@
 
 #include <stdint.h>
 
-#include <rfb/Pixel.h>
 #include <rfb/ServerParams.h>
 #include <rfb/Rect.h>
 #include <rfb/ScreenSet.h>

common/rfb/Pixel.h

@@ -1,26 +0,0 @@
-/* Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
- * 
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
- * USA.
- */
-#ifndef __RFB_PIXEL_H__
-#define __RFB_PIXEL_H__
-
-#include <stdint.h>
-
-namespace rfb {
-  typedef uint32_t Pixel; // must be big enough to hold any pixel value
-}
-#endif

common/rfb/PixelBuffer.h

@@ -27,7 +27,6 @@
 
 #include <rfb/PixelFormat.h>
 #include <rfb/Rect.h>
-#include <rfb/Pixel.h>
 
 namespace rfb {
 

common/rfb/PixelFormat.h

@@ -34,12 +34,14 @@
 #ifndef __RFB_PIXELFORMAT_H__
 #define __RFB_PIXELFORMAT_H__
 
-#include <rfb/Pixel.h>
+#include <stdint.h>
 
 namespace rdr { class InStream; class OutStream; }
 
 namespace rfb {
 
+  typedef uint32_t Pixel; // must be big enough to hold any pixel value
+
   class PixelFormat {
   public:
     PixelFormat(int b, int d, bool e, bool t,

vncviewer/DesktopWindow.h

@@ -25,7 +25,6 @@
 #include <sys/time.h>
 
 #include <rfb/Rect.h>
-#include <rfb/Pixel.h>
 
 #include <FL/Fl_Window.H>