[TELNET]

* Move the main header up one level.
* Move some inclusions to the main header.
* Remove inclusions and definitions that already exist in the main header.
* Cleanup the main header.
CORE-7716

svn path=/trunk/; revision=61561

diff --git a/reactos/base/applications/network/telnet/precomp.h b/reactos/base/applications/network/telnet/precomp.h
new file mode 100644 (file)
index 0000000..603c816
--- /dev/null
+++ b/reactos/base/applications/network/telnet/precomp.h
@@ -0,0 +1,29 @@
+#include <stdarg.h>
+
+#define WIN32_NO_STATUS
+
+#include <windef.h>
+#include <winbase.h>
+#include <winuser.h>
+#include <wincon.h>
+#define _INC_WINDOWS
+#include <winsock.h>
+
+#if defined(__BORLANDC__) && (__BORLANDC < 0x0500)
+#include <mem.h>
+#endif
+
+#ifdef __BORLANDC__
+#include <fstream.h>
+#else
+#include <fstream>
+#endif
+
+#include "src/tnconfig.h"
+#include "src/tnmsg.h"
+#include "src/tparser.h"
+#include "src/ansiprsr.h"
+#include "src/tmapldr.h"
+#include "src/tnclass.h"
+#include "src/tnmisc.h"
+#include "src/tncon.h"

diff --git a/reactos/base/applications/network/telnet/src/ansiprsr.cpp b/reactos/base/applications/network/telnet/src/ansiprsr.cpp
index 1263733..8634a4f 100644 (file)
--- a/reactos/base/applications/network/telnet/src/ansiprsr.cpp
+++ b/reactos/base/applications/network/telnet/src/ansiprsr.cpp
@@ -49,7 +49,6 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-//#include <windows.h>
 #include "precomp.h"
 
 const int ANSIColors[] = {BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE};

diff --git a/reactos/base/applications/network/telnet/src/ansiprsr.h b/reactos/base/applications/network/telnet/src/ansiprsr.h
index 858ad6e..9eaa372 100644 (file)
--- a/reactos/base/applications/network/telnet/src/ansiprsr.h
+++ b/reactos/base/applications/network/telnet/src/ansiprsr.h
@@ -1,12 +1,5 @@
 #pragma once
 
-//#include <stdio.h>
-//#include <stdlib.h>
-//#include <ctype.h>
-//#include <string.h>
-#include "tnconfig.h"
-#include "tparser.h"
-
 // added this color table to make things go faster (Paul Branann 5/8/98)
 enum Colors {BLACK=0, BLUE, GREEN, CYAN, RED, MAGENTA, YELLOW, WHITE};
 extern const int ANSIColors[];

diff --git a/reactos/base/applications/network/telnet/src/precomp.h b/reactos/base/applications/network/telnet/src/precomp.h
deleted file mode 100644 (file)
index 1c8f900..0000000
--- a/reactos/base/applications/network/telnet/src/precomp.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#include "ansiprsr.h"
-
-#if defined(__BORLANDC__) && (__BORLANDC < 0x0500)
-#include <mem.h>
-//#else
-//#include <memory.h>
-#endif
-
-#ifdef __BORLANDC__
-#include <fstream.h>
-#else
-//#include <string>
-#include <fstream>
-#endif
-
-//#include <windows.h>
-//#include <stdlib.h>
-//#include <stdio.h>
-//#include <stdarg.h>
-//#include <string.h>
-#include <locale.h>
-#include <io.h>
-#include <time.h>
-//#include <ctype.h>
-//#include <sys/types.h>
-#include <sys/stat.h>
-
-//#include "keytrans.h"
-//#include "tnerror.h"
-//#include "tcharmap.h"
-//#include "tnconfig.h"
-//#include "tconsole.h"
-//#include "tkeydef.h"
-//#include "tkeymap.h"
-#include "tmapldr.h"
-//#include "tmouse.h"
-#include "tnclass.h"
-#include "tnmisc.h"
-//#include "tnclip.h"
-#include "tncon.h"
-//#include "ttelhndl.h"
-//#include "tnetwork.h"
-#include "tnmain.h"
-#include "tscript.h"
-//#include "tscroll.h"
-#include "telnet.h"
-//#include "tparams.h"

diff --git a/reactos/base/applications/network/telnet/src/tnconfig.cpp b/reactos/base/applications/network/telnet/src/tnconfig.cpp
index 24d2da8..105b829 100644 (file)
--- a/reactos/base/applications/network/telnet/src/tnconfig.cpp
+++ b/reactos/base/applications/network/telnet/src/tnconfig.cpp
@@ -32,6 +32,10 @@
 
 #include "precomp.h"
 
+#include <locale.h>
+#include <io.h>
+#include <sys/stat.h>
+
 // Turn off the "forcing value to bool 'true' or 'false'" warning
 #ifdef _MSC_VER
 #pragma warning(disable: 4800)

diff --git a/reactos/base/applications/network/telnet/src/tnerror.cpp b/reactos/base/applications/network/telnet/src/tnerror.cpp
index 1a77ed9..5278cd2 100644 (file)
--- a/reactos/base/applications/network/telnet/src/tnerror.cpp
+++ b/reactos/base/applications/network/telnet/src/tnerror.cpp
@@ -44,6 +44,8 @@
 
 #include "precomp.h"
 
+#include <time.h>
+
 #ifndef LANG_USER_DEFAULT
 #define LANG_USER_DEFAULT 400
 #endif

diff --git a/reactos/base/applications/network/telnet/src/tnerror.h b/reactos/base/applications/network/telnet/src/tnerror.h
index 6302e7c..8b8fb95 100644 (file)
--- a/reactos/base/applications/network/telnet/src/tnerror.h
+++ b/reactos/base/applications/network/telnet/src/tnerror.h
@@ -1,18 +1,5 @@
 #pragma once
 
-#ifndef __WINDOWS_H
-#define WIN32_NO_STATUS
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winuser.h>
-#include <wincon.h>
-#define _INC_WINDOWS
-#include <winsock.h>
-#endif
-
-#include "tnmsg.h"
-
 extern int Telnet_Redir;
 
 int printm(LPTSTR szModule, BOOL fSystem, DWORD dwMessageId, ...);

diff --git a/reactos/base/applications/network/telnet/src/tnmain.cpp b/reactos/base/applications/network/telnet/src/tnmain.cpp
index 0fc983b..d930dc1 100644 (file)
--- a/reactos/base/applications/network/telnet/src/tnmain.cpp
+++ b/reactos/base/applications/network/telnet/src/tnmain.cpp
@@ -44,6 +44,8 @@
 
 #include "precomp.h"
 
+#include "tnmain.h"
+
 int telCommandLine (Telnet &MyConnection);
 
 void waitforkey() {

diff --git a/reactos/base/applications/network/telnet/src/tscript.cpp b/reactos/base/applications/network/telnet/src/tscript.cpp
index 24774a7..e0692d4 100644 (file)
--- a/reactos/base/applications/network/telnet/src/tscript.cpp
+++ b/reactos/base/applications/network/telnet/src/tscript.cpp
@@ -25,6 +25,8 @@
 
 #include "precomp.h"
 
+#include "tscript.h"
+
 // FIX ME!!  This code not yet functional.
 
 #define TERMINATOR '~'

diff --git a/reactos/base/applications/network/telnet/src/ttelhndl.cpp b/reactos/base/applications/network/telnet/src/ttelhndl.cpp
index 9caabc1..f9690ea 100644 (file)
--- a/reactos/base/applications/network/telnet/src/ttelhndl.cpp
+++ b/reactos/base/applications/network/telnet/src/ttelhndl.cpp
@@ -40,6 +40,8 @@
 
 #include "precomp.h"
 
+#include "telnet.h"
+
 int naws_string(char *buf, int width, int height);
 
 // This helps make the code more readable (Paul Brannan 1/1/99)