CVS: rdesktop/uiports qtewin.cpp,1.1,1.2

Update of /cvsroot/rdesktop/rdesktop/uiports
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20041/uiports

Modified Files:
	qtewin.cpp 
Log Message:
change HANDLE to NTHANDLE to avoid conflics

Index: qtewin.cpp
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/uiports/qtewin.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** qtewin.cpp	12 Aug 2004 02:34:51 -0000	1.1
--- qtewin.cpp	2 Oct 2004 01:30:33 -0000	1.2
***************
*** 2,7 ****
     rdesktop: A Remote Desktop Protocol client.
     User interface services - X Window System
!    Copyright (C) Matthew Chapman 1999-2004
!    qte.cpp by Jay Sorg
  
     This program is free software; you can redistribute it and/or modify
--- 2,6 ----
     rdesktop: A Remote Desktop Protocol client.
     User interface services - X Window System
!    Copyright (C) Jay Sorg 2004
  
     This program is free software; you can redistribute it and/or modify
***************
*** 22,26 ****
  //#define SHARP
  
- #include "../rdesktop.h"
  #ifdef SHARP
  #include <qpe/qpeapplication.h>
--- 21,24 ----
***************
*** 42,49 ****
  #include <qcheckbox.h>
  #include <qpopupmenu.h>
- #include "qtewin.h"
  #include <stdlib.h>
  #include <stdarg.h> // va_list va_start va_end
  
  uint32 g_flags = 0;
  char g_server[64] = "";
--- 40,63 ----
  #include <qcheckbox.h>
  #include <qpopupmenu.h>
  #include <stdlib.h>
  #include <stdarg.h> // va_list va_start va_end
  
+ #include "../rdesktop.h"
+ #include "qtewin.h"
+ 
+ /* types */
+ struct QColorMap
+ {
+   uint32 RGBColors[256];
+   int NumColors;
+ };
+ 
+ struct bitmap
+ {
+   int w;
+   int h;
+   uint8* data;
+ };
+ 
  uint32 g_flags = 0;
  char g_server[64] = "";
***************
*** 80,106 ****
  QApplication* g_App = 0;
  #endif
! QMyMainWindow* g_MW = 0;
! QMyScrollView* g_SV = 0;
! struct QColorMap
! {
!   uint32 RGBColors[256];
!   int NumColors;
! };
! struct QColorMap* g_CM = 0;
! uint8* g_BS = 0;
! 
! int g_clipx = 0;
! int g_clipy = 0;
! int g_clipcx = 0;
! int g_clipcy = 0;
! 
! struct bitmap
! {
!   int w;
!   int h;
!   uint8* data;
! };
  
! int owncolmap = False;
  
  //*****************************************************************************
--- 94,106 ----
  QApplication* g_App = 0;
  #endif
! static QMyMainWindow *g_MW = 0;
! static QMyScrollView *g_SV = 0;
! static struct QColorMap *g_CM = 0;
! static uint8 *g_BS = 0;
  
! static int g_clipx = 0;
! static int g_clipy = 0;
! static int g_clipcx = 0;
! static int g_clipcy = 0;
  
  //*****************************************************************************



-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl