Update of /cvsroot/wpdev/wolfpack/win
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18560
Modified Files:
config_win.cpp console_win.cpp
Log Message:
applied coding standard rules.
Index: console_win.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/win/console_win.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** console_win.cpp 20 Jul 2004 12:03:38 -0000 1.24
--- console_win.cpp 10 Aug 2004 03:19:08 -0000 1.25
***************
*** 52,59 ****
#include "../sqlite/sqlite.h"
#if defined(MYSQL_DRIVER)
! #if defined(Q_OS_WIN32)
! #include <winsock.h>
! #endif
! #include <mysql.h>
#endif
--- 52,59 ----
#include "../sqlite/sqlite.h"
#if defined(MYSQL_DRIVER)
! #if defined(Q_OS_WIN32)
! #include <winsock.h>
! #endif
! #include <mysql.h>
#endif
***************
*** 226,240 ****
pythonBuild = pythonBuild.left( pythonBuild.find( ' ' ) );
! #if defined(Py_ENABLE_SHARED)
credits += QString( "Python: %1 Shared (Compiled: %2)\n" ).arg( pythonBuild ).arg( PY_VERSION );
! #else
credits += QString( "Python: %1 Static (Compiled: %2)\n" ).arg( pythonBuild ).arg( PY_VERSION );
! #endif
credits += "Compiled with SQLite " SQLITE_VERSION "\n";
! #if defined (MYSQL_DRIVER)
! credits += QString("Compiled for MySQL " MYSQL_SERVER_VERSION " (Using: %1)\n").arg(mysql_get_client_info());
! #else
credits += "MySQL Support: disabled\n";
! #endif
cr.cpMin = GetWindowTextLength( richtext );
--- 226,240 ----
pythonBuild = pythonBuild.left( pythonBuild.find( ' ' ) );
! #if defined(Py_ENABLE_SHARED)
credits += QString( "Python: %1 Shared (Compiled: %2)\n" ).arg( pythonBuild ).arg( PY_VERSION );
! #else
credits += QString( "Python: %1 Static (Compiled: %2)\n" ).arg( pythonBuild ).arg( PY_VERSION );
! #endif
credits += "Compiled with SQLite " SQLITE_VERSION "\n";
! #if defined (MYSQL_DRIVER)
! credits += QString( "Compiled for MySQL " MYSQL_SERVER_VERSION " (Using: %1)\n" ).arg( mysql_get_client_info() );
! #else
credits += "MySQL Support: disabled\n";
! #endif
cr.cpMin = GetWindowTextLength( richtext );
***************
*** 521,530 ****
{
/*MSGFILTER *msg = (MSGFILTER*)notify;
! // Append to the Input Control
! if( msg->msg == WM_CHAR )
! {
! SendMessage( inputWindow, WM_SETFOCUS, 0, 0 );
! SendMessage( inputWindow, WM_CHAR, msg->wParam, msg->lParam );
! }*/
}
}
--- 521,530 ----
{
/*MSGFILTER *msg = (MSGFILTER*)notify;
! // Append to the Input Control
! if( msg->msg == WM_CHAR )
! {
! SendMessage( inputWindow, WM_SETFOCUS, 0, 0 );
! SendMessage( inputWindow, WM_CHAR, msg->wParam, msg->lParam );
! }*/
}
}
***************
*** 579,585 ****
QMemArray<pchar> argv( 8 );
/*
! Since Windows programs don't get passed the command name as the
! first argument, we need to fetch it explicitly.
! */
static char appFileName[256];
GetModuleFileNameA( 0, appFileName, sizeof( appFileName ) );
--- 579,585 ----
QMemArray<pchar> argv( 8 );
/*
! Since Windows programs don't get passed the command name as the
! first argument, we need to fetch it explicitly.
! */
static char appFileName[256];
GetModuleFileNameA( 0, appFileName, sizeof( appFileName ) );
***************
*** 588,596 ****
/*
! Parse the Windows command line string. If an argument begins with a
! double quote, then spaces are considered part of the argument until the
! next double quote. The argument terminates at the second quote. Note
! that this is different from the usual Unix semantics.
! */
char* p = cmdLine;
--- 588,596 ----
/*
! Parse the Windows command line string. If an argument begins with a
! double quote, then spaces are considered part of the argument until the
! next double quote. The argument terminates at the second quote. Note
! that this is different from the usual Unix semantics.
! */
char* p = cmdLine;
***************
*** 661,669 ****
coninfo.dwSize.Y = 500;
SetConsoleScreenBufferSize(GetStdHandle(STD_OUTPUT_HANDLE), coninfo.dwSize);
-
int hConHandle;
long lStdHandle;
FILE *fp;
-
lStdHandle = (long)GetStdHandle(STD_OUTPUT_HANDLE);
hConHandle = _open_osfhandle(lStdHandle, _O_TEXT);
--- 661,667 ----
***************
*** 671,675 ****
*stdout = *fp;
setvbuf( stdout, NULL, _IONBF, 0 );
-
lStdHandle = (long)GetStdHandle(STD_ERROR_HANDLE);
hConHandle = _open_osfhandle(lStdHandle, _O_TEXT);
--- 669,672 ----
***************
*** 677,681 ****
*stderr = *fp;
setvbuf( stderr, NULL, _IONBF, 0 );
-
QString consoleTitle = QString("%1 %2 %3 - Debug Console").arg(productString()).arg(productBeta()).arg(productVersion());
SetConsoleTitle(consoleTitle.latin1());*/
--- 674,677 ----
***************
*** 778,782 ****
char command[512] =
{
! 0,
};
GetWindowText( inputWindow, command, 512 );
--- 774,778 ----
char command[512] =
{
! 0,
};
GetWindowText( inputWindow, command, 512 );
***************
*** 887,891 ****
char buffer[1024] =
{
! 0,
};
( ( short * ) buffer )[0] = 1024;
--- 883,887 ----
char buffer[1024] =
{
! 0,
};
( ( short * ) buffer )[0] = 1024;
Index: config_win.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/win/config_win.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** config_win.cpp 4 Aug 2004 23:17:40 -0000 1.4
--- config_win.cpp 10 Aug 2004 03:19:08 -0000 1.5
***************
*** 177,181 ****
Q_UINT8 part2 = ( ip & 0x00FF0000 ) >> 16;
! if ( ( part1 == 127 ) || //this one is class A too.
( part1 == 10 ) || ( ( part1 == 192 ) && ( part2 == 168 ) ) || ( ( part1 == 172 ) && ( part2 >= 16 ) && ( part2 <= 31 ) ) || ( ( part1 == 169 ) && ( part2 == 254 ) ) // DHCP Space Stuff
)
--- 177,181 ----
Q_UINT8 part2 = ( ip & 0x00FF0000 ) >> 16;
! if ( ( part1 == 127 ) || //this one is class A too.
( part1 == 10 ) || ( ( part1 == 192 ) && ( part2 == 168 ) ) || ( ( part1 == 172 ) && ( part2 >= 16 ) && ( part2 <= 31 ) ) || ( ( part1 == 169 ) && ( part2 == 254 ) ) // DHCP Space Stuff
)
|
