From 8bda2730f29c4417985c8f936d5373c6660f4e92 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 4 Jan 2014 15:01:58 +0000 Subject: [PATCH] [CARDLIB] * Move some inclusions to the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716 svn path=/trunk/; revision=61532 --- reactos/lib/3rdparty/cardlib/card.h | 2 +- reactos/lib/3rdparty/cardlib/cardbitmaps.cpp | 11 +---------- reactos/lib/3rdparty/cardlib/cardbutton.cpp | 8 -------- reactos/lib/3rdparty/cardlib/cardbutton.h | 4 +--- reactos/lib/3rdparty/cardlib/cardcolor.cpp | 5 +---- reactos/lib/3rdparty/cardlib/cardcolor.h | 1 + reactos/lib/3rdparty/cardlib/cardcount.cpp | 1 + reactos/lib/3rdparty/cardlib/cardcount.h | 14 +------------- reactos/lib/3rdparty/cardlib/cardlib.cpp | 5 ----- reactos/lib/3rdparty/cardlib/cardlib.h | 14 ++++++++------ reactos/lib/3rdparty/cardlib/cardregion.cpp | 7 ------- reactos/lib/3rdparty/cardlib/cardregion.h | 7 +------ reactos/lib/3rdparty/cardlib/cardrgndraw.cpp | 7 ------- reactos/lib/3rdparty/cardlib/cardrgnmouse.cpp | 11 ++--------- reactos/lib/3rdparty/cardlib/cardstack.cpp | 6 ------ reactos/lib/3rdparty/cardlib/cardstack.h | 5 ++--- reactos/lib/3rdparty/cardlib/cardwindow.cpp | 12 +----------- reactos/lib/3rdparty/cardlib/cardwindow.h | 6 +----- reactos/lib/3rdparty/cardlib/dropzone.cpp | 6 ------ reactos/lib/3rdparty/cardlib/dropzone.h | 2 +- reactos/lib/3rdparty/cardlib/globals.h | 2 +- 21 files changed, 24 insertions(+), 112 deletions(-) diff --git a/reactos/lib/3rdparty/cardlib/card.h b/reactos/lib/3rdparty/cardlib/card.h index dc85896e0ac..95400396585 100644 --- a/reactos/lib/3rdparty/cardlib/card.h +++ b/reactos/lib/3rdparty/cardlib/card.h @@ -102,4 +102,4 @@ private: bool fFaceUp; }; -#endif +#endif /* _CARD_INCLUDED */ diff --git a/reactos/lib/3rdparty/cardlib/cardbitmaps.cpp b/reactos/lib/3rdparty/cardlib/cardbitmaps.cpp index aa594f8f52d..cbc893256e6 100644 --- a/reactos/lib/3rdparty/cardlib/cardbitmaps.cpp +++ b/reactos/lib/3rdparty/cardlib/cardbitmaps.cpp @@ -5,16 +5,7 @@ // Copyright J Brown 2001 // -//#include -#define WIN32_NO_STATUS -#include -#include -#include -#include -#include - -#include "globals.h" -#include "cardcolor.h" +#include "cardlib.h" #ifndef __REACTOS__ #pragma comment( lib, "..\\CardLib\\cards16.lib" ) diff --git a/reactos/lib/3rdparty/cardlib/cardbutton.cpp b/reactos/lib/3rdparty/cardlib/cardbutton.cpp index 921d59cdebd..76957a4453a 100644 --- a/reactos/lib/3rdparty/cardlib/cardbutton.cpp +++ b/reactos/lib/3rdparty/cardlib/cardbutton.cpp @@ -4,16 +4,8 @@ // Freeware // Copyright J Brown 2001 // -//#include -//#include - -#define WIN32_NO_STATUS -#include #include "cardlib.h" -//#include "cardwindow.h" -//#include "cardbutton.h" -#include "cardcolor.h" HPALETTE UseNicePalette(HDC, HPALETTE); void RestorePalette(HDC, HPALETTE); diff --git a/reactos/lib/3rdparty/cardlib/cardbutton.h b/reactos/lib/3rdparty/cardlib/cardbutton.h index 541ca09da6b..d9306da2736 100644 --- a/reactos/lib/3rdparty/cardlib/cardbutton.h +++ b/reactos/lib/3rdparty/cardlib/cardbutton.h @@ -3,8 +3,6 @@ #define MAXBUTTONTEXT 64 -//#include "cardlib.h" - class CardButton { friend class CardWindow; @@ -98,4 +96,4 @@ private: pButtonProc ButtonCallback; }; -#endif +#endif /* CARDBUTTON_INCLUDED */ diff --git a/reactos/lib/3rdparty/cardlib/cardcolor.cpp b/reactos/lib/3rdparty/cardlib/cardcolor.cpp index eb76c42a3bb..f92713c49c8 100644 --- a/reactos/lib/3rdparty/cardlib/cardcolor.cpp +++ b/reactos/lib/3rdparty/cardlib/cardcolor.cpp @@ -1,11 +1,8 @@ // // Colour support // -//#include -#define WIN32_NO_STATUS -#include -#include +#include "cardlib.h" #define MakeRGB RGB diff --git a/reactos/lib/3rdparty/cardlib/cardcolor.h b/reactos/lib/3rdparty/cardlib/cardcolor.h index a8a633f27cf..2ec36bcf326 100644 --- a/reactos/lib/3rdparty/cardlib/cardcolor.h +++ b/reactos/lib/3rdparty/cardlib/cardcolor.h @@ -1,3 +1,4 @@ +#pragma once COLORREF ColorScaleRGB( const COLORREF Col1, const COLORREF Col2, diff --git a/reactos/lib/3rdparty/cardlib/cardcount.cpp b/reactos/lib/3rdparty/cardlib/cardcount.cpp index df86a886754..29e5cf7dca0 100644 --- a/reactos/lib/3rdparty/cardlib/cardcount.cpp +++ b/reactos/lib/3rdparty/cardlib/cardcount.cpp @@ -18,6 +18,7 @@ // // count.Clear(); // + #include "cardcount.h" CardCount::CardCount() diff --git a/reactos/lib/3rdparty/cardlib/cardcount.h b/reactos/lib/3rdparty/cardlib/cardcount.h index 17135195132..eb1c26da066 100644 --- a/reactos/lib/3rdparty/cardlib/cardcount.h +++ b/reactos/lib/3rdparty/cardlib/cardcount.h @@ -1,18 +1,6 @@ #ifndef _CARDCOUNT_INCLUDED #define _CARDCOUNT_INCLUDED -//#include - -#define WIN32_NO_STATUS -#include -#include -#include -#include -#include -#include - -#include "cardstack.h" - class CardCount { public: @@ -36,4 +24,4 @@ private: //(ace,2,3,4,5,6,7,8,9,10,J,Q,K) }; -#endif +#endif /* _CARDCOUNT_INCLUDED */ diff --git a/reactos/lib/3rdparty/cardlib/cardlib.cpp b/reactos/lib/3rdparty/cardlib/cardlib.cpp index ff2666e153f..ac051a8fea1 100644 --- a/reactos/lib/3rdparty/cardlib/cardlib.cpp +++ b/reactos/lib/3rdparty/cardlib/cardlib.cpp @@ -4,13 +4,8 @@ // Freeware // Copyright J Brown 2001 // -//#include - -#define WIN32_NO_STATUS -#include #include "cardlib.h" -//#include "globals.h" void LoadCardBitmaps(void); diff --git a/reactos/lib/3rdparty/cardlib/cardlib.h b/reactos/lib/3rdparty/cardlib/cardlib.h index 581c029e2e3..df622ee3861 100644 --- a/reactos/lib/3rdparty/cardlib/cardlib.h +++ b/reactos/lib/3rdparty/cardlib/cardlib.h @@ -2,11 +2,13 @@ #define CARDLIB_INCLUDED #include +#include #define WIN32_NO_STATUS #include #include #include +#include #define CARDLIBPROC __stdcall @@ -91,12 +93,13 @@ typedef int (CARDLIBPROC *pDropZoneProc) (int dzid, const CardStack &cards); 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 @@ typedef bool (CARDLIBPROC *pDebugClickProc) (CardRegion &stackobj); void CardLib_SetStackClickProc(pDebugClickProc proc); #endif - -#endif +#endif /* CARDLIB_INCLUDED */ diff --git a/reactos/lib/3rdparty/cardlib/cardregion.cpp b/reactos/lib/3rdparty/cardlib/cardregion.cpp index e382a829583..bab7cda52c6 100644 --- a/reactos/lib/3rdparty/cardlib/cardregion.cpp +++ b/reactos/lib/3rdparty/cardlib/cardregion.cpp @@ -4,15 +4,8 @@ // Freeware // Copyright J Brown 2001 // -//#include - -#define WIN32_NO_STATUS -#include #include "cardlib.h" -//#include "cardregion.h" -//#include "cardwindow.h" -//#include "cardcolor.h" HBITMAP CreateSinkBmp(HDC hdcCompat, HDC hdc, int width, int height); diff --git a/reactos/lib/3rdparty/cardlib/cardregion.h b/reactos/lib/3rdparty/cardlib/cardregion.h index 3b831e6c680..ad0c7b5d103 100644 --- a/reactos/lib/3rdparty/cardlib/cardregion.h +++ b/reactos/lib/3rdparty/cardlib/cardregion.h @@ -1,10 +1,6 @@ #ifndef CARDREGION_INCLUDED #define CARDREGION_INCLUDED -#include "globals.h" -#include "cardstack.h" -//#include "cardlib.h" - class CardWindow; // @@ -215,5 +211,4 @@ private: HANDLE mxlock; }; -#endif - +#endif /* CARDREGION_INCLUDED */ diff --git a/reactos/lib/3rdparty/cardlib/cardrgndraw.cpp b/reactos/lib/3rdparty/cardlib/cardrgndraw.cpp index a97d70da04e..a5c20e34f09 100644 --- a/reactos/lib/3rdparty/cardlib/cardrgndraw.cpp +++ b/reactos/lib/3rdparty/cardlib/cardrgndraw.cpp @@ -4,15 +4,8 @@ // Freeware // Copyright J Brown 2001 // -//#include -#define WIN32_NO_STATUS -#include - -//#include #include "cardlib.h" -//#include "cardregion.h" -//#include "cardcolor.h" HPALETTE UseNicePalette(HDC hdc, HPALETTE hPalette); void PaintRect(HDC hdc, RECT *rect, COLORREF colour); diff --git a/reactos/lib/3rdparty/cardlib/cardrgnmouse.cpp b/reactos/lib/3rdparty/cardlib/cardrgnmouse.cpp index 3829b03852b..08d99e6a836 100644 --- a/reactos/lib/3rdparty/cardlib/cardrgnmouse.cpp +++ b/reactos/lib/3rdparty/cardlib/cardrgnmouse.cpp @@ -4,17 +4,10 @@ // Freeware // Copyright J Brown 2001 // -//#include - -#define WIN32_NO_STATUS -#include - -#include -//#include #include "cardlib.h" -//#include "cardwindow.h" -//#include "cardregion.h" + +#include #if 1 #define TRACE(s) diff --git a/reactos/lib/3rdparty/cardlib/cardstack.cpp b/reactos/lib/3rdparty/cardlib/cardstack.cpp index 41d27abbb3c..4e891c11e56 100644 --- a/reactos/lib/3rdparty/cardlib/cardstack.cpp +++ b/reactos/lib/3rdparty/cardlib/cardstack.cpp @@ -4,12 +4,6 @@ // Freeware // Copyright J Brown 2001 // -//#include - -#define WIN32_NO_STATUS -#include - -#include #include "cardstack.h" diff --git a/reactos/lib/3rdparty/cardlib/cardstack.h b/reactos/lib/3rdparty/cardlib/cardstack.h index a7898d79551..69769a7f3ee 100644 --- a/reactos/lib/3rdparty/cardlib/cardstack.h +++ b/reactos/lib/3rdparty/cardlib/cardstack.h @@ -1,8 +1,6 @@ #ifndef CARDSTACK_INCLUDED #define CARDSTACK_INCLUDED -#include "card.h" - #define MAX_CARDSTACK_SIZE 128 class CardStack @@ -50,4 +48,5 @@ private: int nNumCards; }; -#endif +#endif /* CARDSTACK_INCLUDED */ + diff --git a/reactos/lib/3rdparty/cardlib/cardwindow.cpp b/reactos/lib/3rdparty/cardlib/cardwindow.cpp index e759901aad0..d157691b7c0 100644 --- a/reactos/lib/3rdparty/cardlib/cardwindow.cpp +++ b/reactos/lib/3rdparty/cardlib/cardwindow.cpp @@ -4,20 +4,10 @@ // Freeware // Copyright J Brown 2001 // -//#include -#define WIN32_NO_STATUS -#include +#include "cardlib.h" #include -//#include - -//#include "globals.h" -#include "cardlib.h" -//#include "cardbutton.h" -//#include "cardregion.h" -//#include "cardwindow.h" -#include "cardcolor.h" extern HPALETTE __holdplacepal; diff --git a/reactos/lib/3rdparty/cardlib/cardwindow.h b/reactos/lib/3rdparty/cardlib/cardwindow.h index 195422e4c51..3c84acf39cb 100644 --- a/reactos/lib/3rdparty/cardlib/cardwindow.h +++ b/reactos/lib/3rdparty/cardlib/cardwindow.h @@ -5,9 +5,6 @@ #define MAXCARDSTACKS 32 #define MAXDROPZONES 8 -#include "dropzone.h" -//#include "cardlib.h" - class CardRegion; class CardButton; @@ -116,5 +113,4 @@ static LRESULT CALLBACK CardWndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM }; - -#endif +#endif /* CARDBOARD_INCLUDED */ diff --git a/reactos/lib/3rdparty/cardlib/dropzone.cpp b/reactos/lib/3rdparty/cardlib/dropzone.cpp index 092c20179f9..ae62470fc85 100644 --- a/reactos/lib/3rdparty/cardlib/dropzone.cpp +++ b/reactos/lib/3rdparty/cardlib/dropzone.cpp @@ -4,14 +4,8 @@ // Freeware // Copyright J Brown 2001 // -//#include - -#define WIN32_NO_STATUS -#include #include "cardlib.h" -//#include "cardwindow.h" -//#include "dropzone.h" bool CardWindow::RegisterDropZone(int id, RECT *rect, pDropZoneProc proc) { diff --git a/reactos/lib/3rdparty/cardlib/dropzone.h b/reactos/lib/3rdparty/cardlib/dropzone.h index 1c7e0e538d5..6d546e6a57c 100644 --- a/reactos/lib/3rdparty/cardlib/dropzone.h +++ b/reactos/lib/3rdparty/cardlib/dropzone.h @@ -36,4 +36,4 @@ private: pDropZoneProc DropZoneCallback; }; -#endif +#endif /* DROPZONE_INCLUDED */ diff --git a/reactos/lib/3rdparty/cardlib/globals.h b/reactos/lib/3rdparty/cardlib/globals.h index 329d2520852..46ac6db8fd7 100644 --- a/reactos/lib/3rdparty/cardlib/globals.h +++ b/reactos/lib/3rdparty/cardlib/globals.h @@ -12,4 +12,4 @@ extern HBITMAP __hbmPlaceHolder; extern HPALETTE __hPalette; -#endif +#endif /* GLOBALS_INCLUDED */