[ros-diffs] [akhaldi] 61527: [CALC] * Remove one time inclusions from the main header and put them back where they belong. * Cleanup the main header. CORE-7716

Author: akhaldi
Date: Sat Jan  4 14:00:02 2014
New Revision: 61527

URL: http://svn.reactos.org/svn/reactos?rev=61527&view=rev
Log:
[CALC]
* Remove one time inclusions from the main header and put them back where they belong.
* Cleanup the main header.
CORE-7716

Modified:
    trunk/reactos/base/applications/calc/calc.h
    trunk/reactos/base/applications/calc/function.c
    trunk/reactos/base/applications/calc/winmain.c

Modified: trunk/reactos/base/applications/calc/calc.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/calc...
==============================================================================
--- trunk/reactos/base/applications/calc/calc.h	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/calc.h	[iso-8859-1] Sat Jan  4 14:00:02 2014
@@ -1,19 +1,13 @@
 #include <stdarg.h>
 #include <windef.h>
-#include <winbase.h>
 #include <winuser.h>
-#include <wingdi.h>
-#include <winreg.h>
 #include <tchar.h>
-//#include <stdio.h>
-//#include <string.h>
 #include <math.h>
 #include <float.h>
 #include <malloc.h>
 #ifndef DISABLE_HTMLHELP_SUPPORT
 #include <htmlhelp.h>
 #endif
-#include <limits.h>

/* Messages reserved for the main dialog */
 #define WM_CLOSE_STATS      (WM_APP+1)
@@ -160,7 +154,6 @@

extern calc_t calc;

-//
 #define CALC_E      2.7182818284590452354

#define CALC_PI_2   1.57079632679489661923
@@ -223,17 +216,11 @@
 void rpn_alloc(calc_number_t *c);
 void rpn_free(calc_number_t *c);

-//
-
 void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base);
 void convert_text2number_2(calc_number_t *a);
 void convert_real_integer(unsigned int base);

-//
-
 INT_PTR CALLBACK AboutDlgProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp);
-
-//

void ConvExecute(HWND hWnd);
 void ConvAdjust(HWND hWnd, int n_cat);

Modified: trunk/reactos/base/applications/calc/function.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/func...
==============================================================================
--- trunk/reactos/base/applications/calc/function.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/function.c	[iso-8859-1] Sat Jan  4 14:00:02 2014
@@ -1,4 +1,6 @@
 #include "calc.h"
+
+#include <limits.h>

void apply_int_mask(calc_number_t *r)
 {

Modified: trunk/reactos/base/applications/calc/winmain.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/winm...
==============================================================================
--- trunk/reactos/base/applications/calc/winmain.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/winmain.c	[iso-8859-1] Sat Jan  4 14:00:02 2014
@@ -1,4 +1,8 @@
 #include "calc.h"
+
+#include <winbase.h>
+#include <wingdi.h>
+#include <winreg.h>

#define HTMLHELP_PATH(_pt)  TEXT("%systemroot%\Help\calc.chm::") TEXT(_pt)