[ros-diffs] [akhaldi] 61532: [CARDLIB] * Move some inclusions to the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716

Author: akhaldi
Date: Sat Jan  4 15:01:58 2014
New Revision: 61532

URL: http://svn.reactos.org/svn/reactos?rev=61532&view=rev
Log:
[CARDLIB]
* Move some inclusions to the main header.
* Remove inclusions and definitions that already exist in the main header.
CORE-7716

Modified:
    trunk/reactos/lib/3rdparty/cardlib/card.h
    trunk/reactos/lib/3rdparty/cardlib/cardbitmaps.cpp
    trunk/reactos/lib/3rdparty/cardlib/cardbutton.cpp
    trunk/reactos/lib/3rdparty/cardlib/cardbutton.h
    trunk/reactos/lib/3rdparty/cardlib/cardcolor.cpp
    trunk/reactos/lib/3rdparty/cardlib/cardcolor.h
    trunk/reactos/lib/3rdparty/cardlib/cardcount.cpp
    trunk/reactos/lib/3rdparty/cardlib/cardcount.h
    trunk/reactos/lib/3rdparty/cardlib/cardlib.cpp
    trunk/reactos/lib/3rdparty/cardlib/cardlib.h
    trunk/reactos/lib/3rdparty/cardlib/cardregion.cpp
    trunk/reactos/lib/3rdparty/cardlib/cardregion.h
    trunk/reactos/lib/3rdparty/cardlib/cardrgndraw.cpp
    trunk/reactos/lib/3rdparty/cardlib/cardrgnmouse.cpp
    trunk/reactos/lib/3rdparty/cardlib/cardstack.cpp
    trunk/reactos/lib/3rdparty/cardlib/cardstack.h
    trunk/reactos/lib/3rdparty/cardlib/cardwindow.cpp
    trunk/reactos/lib/3rdparty/cardlib/cardwindow.h
    trunk/reactos/lib/3rdparty/cardlib/dropzone.cpp
    trunk/reactos/lib/3rdparty/cardlib/dropzone.h
    trunk/reactos/lib/3rdparty/cardlib/globals.h

Modified: trunk/reactos/lib/3rdparty/cardlib/card.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/card.…
==============================================================================
--- trunk/reactos/lib/3rdparty/cardlib/card.h	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/cardlib/card.h	[iso-8859-1] Sat Jan  4 15:01:58 2014
@@ -102,4 +102,4 @@
 	bool fFaceUp;
 };
 
-#endif
+#endif /* _CARD_INCLUDED */

Modified: trunk/reactos/lib/3rdparty/cardlib/cardbitmaps.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardb…
==============================================================================
--- trunk/reactos/lib/3rdparty/cardlib/cardbitmaps.cpp	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/cardlib/cardbitmaps.cpp	[iso-8859-1] Sat Jan  4 15:01:58
2014
@@ -5,16 +5,7 @@
 //    Copyright J Brown 2001
 //
 
-//#include <windows.h>
-#define WIN32_NO_STATUS
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-#include <winuser.h>
-
-#include "globals.h"
-#include "cardcolor.h"
+#include "cardlib.h"
 
 #ifndef __REACTOS__
 #pragma comment( lib, "..\\CardLib\\cards16.lib" )

Modified: trunk/reactos/lib/3rdparty/cardlib/cardbutton.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardb…
==============================================================================
--- trunk/reactos/lib/3rdparty/cardlib/cardbutton.cpp	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/cardlib/cardbutton.cpp	[iso-8859-1] Sat Jan  4 15:01:58
2014
@@ -4,16 +4,8 @@
 //    Freeware
 //    Copyright J Brown 2001
 //
-//#include <windows.h>
-//#include <tchar.h>
-
-#define WIN32_NO_STATUS
-#include <windef.h>
 
 #include "cardlib.h"
-//#include "cardwindow.h"
-//#include "cardbutton.h"
-#include "cardcolor.h"
 
 HPALETTE UseNicePalette(HDC, HPALETTE);
 void     RestorePalette(HDC, HPALETTE);

Modified: trunk/reactos/lib/3rdparty/cardlib/cardbutton.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardb…
==============================================================================
--- trunk/reactos/lib/3rdparty/cardlib/cardbutton.h	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/cardlib/cardbutton.h	[iso-8859-1] Sat Jan  4 15:01:58 2014
@@ -2,8 +2,6 @@
 #define CARDBUTTON_INCLUDED
 
 #define MAXBUTTONTEXT 64
-
-//#include "cardlib.h"
 
 class CardButton
 {
@@ -98,4 +96,4 @@
 	pButtonProc	ButtonCallback;
 };
 
-#endif
+#endif /* CARDBUTTON_INCLUDED */

Modified: trunk/reactos/lib/3rdparty/cardlib/cardcolor.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardc…
==============================================================================
--- trunk/reactos/lib/3rdparty/cardlib/cardcolor.cpp	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/cardlib/cardcolor.cpp	[iso-8859-1] Sat Jan  4 15:01:58
2014
@@ -1,11 +1,8 @@
 //
 //    Colour support
 //
-//#include <windows.h>
-
-#define WIN32_NO_STATUS
-#include <windef.h>
-#include <wingdi.h>
+
+#include "cardlib.h"
 
 #define MakeRGB RGB
 

Modified: trunk/reactos/lib/3rdparty/cardlib/cardcolor.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardc…
==============================================================================
--- trunk/reactos/lib/3rdparty/cardlib/cardcolor.h	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/cardlib/cardcolor.h	[iso-8859-1] Sat Jan  4 15:01:58 2014
@@ -1,3 +1,4 @@
+#pragma once
 
 COLORREF ColorScaleRGB(	const COLORREF Col1,
 						const COLORREF Col2,

Modified: trunk/reactos/lib/3rdparty/cardlib/cardcount.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardc…
==============================================================================
--- trunk/reactos/lib/3rdparty/cardlib/cardcount.cpp	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/cardlib/cardcount.cpp	[iso-8859-1] Sat Jan  4 15:01:58
2014
@@ -18,6 +18,7 @@
 //
 //        count.Clear();
 //
+
 #include "cardcount.h"
 
 CardCount::CardCount()

Modified: trunk/reactos/lib/3rdparty/cardlib/cardcount.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardc…
==============================================================================
--- trunk/reactos/lib/3rdparty/cardlib/cardcount.h	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/cardlib/cardcount.h	[iso-8859-1] Sat Jan  4 15:01:58 2014
@@ -1,17 +1,5 @@
 #ifndef _CARDCOUNT_INCLUDED
 #define _CARDCOUNT_INCLUDED
-
-//#include <windows.h>
-
-#define WIN32_NO_STATUS
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <stdlib.h>
-
-#include "cardstack.h"
 
 class CardCount
 {
@@ -36,4 +24,4 @@
 					//(ace,2,3,4,5,6,7,8,9,10,J,Q,K)
 };
 
-#endif
+#endif /* _CARDCOUNT_INCLUDED */

Modified: trunk/reactos/lib/3rdparty/cardlib/cardlib.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardl…
==============================================================================
--- trunk/reactos/lib/3rdparty/cardlib/cardlib.cpp	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/cardlib/cardlib.cpp	[iso-8859-1] Sat Jan  4 15:01:58 2014
@@ -4,13 +4,8 @@
 //    Freeware
 //    Copyright J Brown 2001
 //
-//#include <windows.h>
-
-#define WIN32_NO_STATUS
-#include <windef.h>
 
 #include "cardlib.h"
-//#include "globals.h"
 
 void LoadCardBitmaps(void);
 

Modified: trunk/reactos/lib/3rdparty/cardlib/cardlib.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardl…
==============================================================================
--- trunk/reactos/lib/3rdparty/cardlib/cardlib.h	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/cardlib/cardlib.h	[iso-8859-1] Sat Jan  4 15:01:58 2014
@@ -2,11 +2,13 @@
 #define CARDLIB_INCLUDED
 
 #include <stdarg.h>
+#include <stdlib.h>
 
 #define WIN32_NO_STATUS
 #include <windef.h>
 #include <winbase.h>
 #include <wingdi.h>
+#include <winuser.h>
 
 #define CARDLIBPROC __stdcall
 
@@ -91,12 +93,13 @@
 
 typedef void (CARDLIBPROC *pButtonProc)		(CardButton &pButton);
 
-
-//#include "card.h"
+#include "globals.h"
+#include "card.h"
 #include "cardbutton.h"
-//#include "cardstack.h"
+#include "cardcolor.h"
+#include "cardstack.h"
 #include "cardregion.h"
-#include "cardcount.h"
+#include "dropzone.h"
 #include "cardwindow.h"
 
 #ifdef _DEBUG
@@ -104,5 +107,4 @@
 void CardLib_SetStackClickProc(pDebugClickProc proc);
 #endif
 
-
-#endif
+#endif /* CARDLIB_INCLUDED */

Modified: trunk/reactos/lib/3rdparty/cardlib/cardregion.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardr…
==============================================================================
--- trunk/reactos/lib/3rdparty/cardlib/cardregion.cpp	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/cardlib/cardregion.cpp	[iso-8859-1] Sat Jan  4 15:01:58
2014
@@ -4,15 +4,8 @@
 //    Freeware
 //    Copyright J Brown 2001
 //
-//#include <windows.h>
-
-#define WIN32_NO_STATUS
-#include <windef.h>
 
 #include "cardlib.h"
-//#include "cardregion.h"
-//#include "cardwindow.h"
-//#include "cardcolor.h"
 
 HBITMAP CreateSinkBmp(HDC hdcCompat, HDC hdc, int width, int height);
 

Modified: trunk/reactos/lib/3rdparty/cardlib/cardregion.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardr…
==============================================================================
--- trunk/reactos/lib/3rdparty/cardlib/cardregion.h	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/cardlib/cardregion.h	[iso-8859-1] Sat Jan  4 15:01:58 2014
@@ -1,9 +1,5 @@
 #ifndef CARDREGION_INCLUDED
 #define CARDREGION_INCLUDED
-
-#include "globals.h"
-#include "cardstack.h"
-//#include "cardlib.h"
 
 class CardWindow;
 
@@ -215,5 +211,4 @@
 	HANDLE			mxlock;
 };
 
-#endif
-
+#endif /* CARDREGION_INCLUDED */

Modified: trunk/reactos/lib/3rdparty/cardlib/cardrgndraw.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardr…
==============================================================================
--- trunk/reactos/lib/3rdparty/cardlib/cardrgndraw.cpp	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/cardlib/cardrgndraw.cpp	[iso-8859-1] Sat Jan  4 15:01:58
2014
@@ -4,15 +4,8 @@
 //    Freeware
 //    Copyright J Brown 2001
 //
-//#include <windows.h>
-
-#define WIN32_NO_STATUS
-#include <windef.h>
-
-//#include <stdlib.h>
+
 #include "cardlib.h"
-//#include "cardregion.h"
-//#include "cardcolor.h"
 
 HPALETTE UseNicePalette(HDC hdc, HPALETTE hPalette);
 void PaintRect(HDC hdc, RECT *rect, COLORREF colour);

Modified: trunk/reactos/lib/3rdparty/cardlib/cardrgnmouse.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardr…
==============================================================================
--- trunk/reactos/lib/3rdparty/cardlib/cardrgnmouse.cpp	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/cardlib/cardrgnmouse.cpp	[iso-8859-1] Sat Jan  4 15:01:58
2014
@@ -4,17 +4,10 @@
 //    Freeware
 //    Copyright J Brown 2001
 //
-//#include <windows.h>
-
-#define WIN32_NO_STATUS
-#include <windef.h>
+
+#include "cardlib.h"
 
 #include <math.h>
-//#include <stdio.h>
-
-#include "cardlib.h"
-//#include "cardwindow.h"
-//#include "cardregion.h"
 
 #if 1
 #define TRACE(s)

Modified: trunk/reactos/lib/3rdparty/cardlib/cardstack.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cards…
==============================================================================
--- trunk/reactos/lib/3rdparty/cardlib/cardstack.cpp	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/cardlib/cardstack.cpp	[iso-8859-1] Sat Jan  4 15:01:58
2014
@@ -4,12 +4,6 @@
 //    Freeware
 //    Copyright J Brown 2001
 //
-//#include <windows.h>
-
-#define WIN32_NO_STATUS
-#include <windef.h>
-
-#include <stdlib.h>
 
 #include "cardstack.h"
 

Modified: trunk/reactos/lib/3rdparty/cardlib/cardstack.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cards…
==============================================================================
--- trunk/reactos/lib/3rdparty/cardlib/cardstack.h	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/cardlib/cardstack.h	[iso-8859-1] Sat Jan  4 15:01:58 2014
@@ -1,7 +1,5 @@
 #ifndef CARDSTACK_INCLUDED
 #define CARDSTACK_INCLUDED
-
-#include "card.h"
 
 #define MAX_CARDSTACK_SIZE 128
 
@@ -50,4 +48,5 @@
 	int  nNumCards;
 };
 
-#endif
+#endif /* CARDSTACK_INCLUDED */
+

Modified: trunk/reactos/lib/3rdparty/cardlib/cardwindow.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardw…
==============================================================================
--- trunk/reactos/lib/3rdparty/cardlib/cardwindow.cpp	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/cardlib/cardwindow.cpp	[iso-8859-1] Sat Jan  4 15:01:58
2014
@@ -4,20 +4,10 @@
 //    Freeware
 //    Copyright J Brown 2001
 //
-//#include <windows.h>
-
-#define WIN32_NO_STATUS
-#include <windef.h>
+
+#include "cardlib.h"
 
 #include <tchar.h>
-//#include <stdlib.h>
-
-//#include "globals.h"
-#include "cardlib.h"
-//#include "cardbutton.h"
-//#include "cardregion.h"
-//#include "cardwindow.h"
-#include "cardcolor.h"
 
 extern HPALETTE __holdplacepal;
 

Modified: trunk/reactos/lib/3rdparty/cardlib/cardwindow.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardw…
==============================================================================
--- trunk/reactos/lib/3rdparty/cardlib/cardwindow.h	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/cardlib/cardwindow.h	[iso-8859-1] Sat Jan  4 15:01:58 2014
@@ -4,9 +4,6 @@
 #define MAXBUTTONS		32
 #define MAXCARDSTACKS	32
 #define MAXDROPZONES	8
-
-#include "dropzone.h"
-//#include "cardlib.h"
 
 class CardRegion;
 class CardButton;
@@ -116,5 +113,4 @@
 
 };
 
-
-#endif
+#endif /* CARDBOARD_INCLUDED */

Modified: trunk/reactos/lib/3rdparty/cardlib/dropzone.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/dropz…
==============================================================================
--- trunk/reactos/lib/3rdparty/cardlib/dropzone.cpp	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/cardlib/dropzone.cpp	[iso-8859-1] Sat Jan  4 15:01:58 2014
@@ -4,14 +4,8 @@
 //    Freeware
 //    Copyright J Brown 2001
 //
-//#include <windows.h>
-
-#define WIN32_NO_STATUS
-#include <windef.h>
 
 #include "cardlib.h"
-//#include "cardwindow.h"
-//#include "dropzone.h"
 
 bool CardWindow::RegisterDropZone(int id, RECT *rect, pDropZoneProc proc)
 {

Modified: trunk/reactos/lib/3rdparty/cardlib/dropzone.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/dropz…
==============================================================================
--- trunk/reactos/lib/3rdparty/cardlib/dropzone.h	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/cardlib/dropzone.h	[iso-8859-1] Sat Jan  4 15:01:58 2014
@@ -36,4 +36,4 @@
 	pDropZoneProc DropZoneCallback;
 };
 
-#endif
+#endif /* DROPZONE_INCLUDED */

Modified: trunk/reactos/lib/3rdparty/cardlib/globals.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/globa…
==============================================================================
--- trunk/reactos/lib/3rdparty/cardlib/globals.h	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/cardlib/globals.h	[iso-8859-1] Sat Jan  4 15:01:58 2014
@@ -12,4 +12,4 @@
 
 extern HPALETTE __hPalette;
 
-#endif
+#endif /* GLOBALS_INCLUDED */