[Kde-cygwin-cvs] CVS: qt-3/src/kernel qapplication_win.cpp,1.1.2.30.2.94,1.1.2.30.2.95

[Christian E. <che...@us...>]

Update of /cvsroot/kde-cygwin/qt-3/src/kernel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26072/src/kernel

Modified Files:
      Tag: QT_WIN32_3_3_BRANCH
	qapplication_win.cpp 
Log Message:
removed some unused variables / commandline args

Index: qapplication_win.cpp
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/src/kernel/Attic/qapplication_win.cpp,v
retrieving revision 1.1.2.30.2.94
retrieving revision 1.1.2.30.2.95
diff -u -r1.1.2.30.2.94 -r1.1.2.30.2.95
--- qapplication_win.cpp	14 Oct 2005 04:53:43 -0000	1.1.2.30.2.94
+++ qapplication_win.cpp	24 Oct 2005 17:33:29 -0000	1.1.2.30.2.95
@@ -89,8 +89,6 @@
 #define TRACE {}
 #endif
 
-#define GetPointSize( hdc, h ) ((int)QABS(h*72/GetDeviceCaps(hdc, LOGPIXELSY)))
-
 /* from qclipboard_win.cpp */
 extern HWND hwndNextViewer;
 extern bool clipboardHasChanged;
@@ -148,20 +146,16 @@
 
 QWidget *qt_button_down = 0;  // widget got last button-down
 
-static void     unregWinClasses();
+static void unregWinClasses();
 
-static HWND        autoCaptureWnd = 0;
-static void        setAutoCapture(HWND);                // automatic capture
-static void        releaseAutoCapture();
-
-static char *appFont = 0;  // application font
-static char *appStyle = 0;  // application style
-static char *appBGCol = 0;  // application bg color
-static char *appFGCol = 0;  // application fg color
-static char *appBTNCol = 0;  // application btn color
-static char *mwGeometry = 0;  // main widget geometry
-static char *mwTitle = 0;  // main widget title
-static bool mwIconic = false; // main widget iconified
+static HWND autoCaptureWnd = 0;
+static void setAutoCapture(HWND);                // automatic capture
+static void releaseAutoCapture();
+
+static char *appStyle = 0;      // application style
+static char *mwGeometry = 0;    // main widget geometry
+static char *mwTitle = 0;       // main widget title
+static bool mwIconic = false;   // main widget iconified
 
 typedef int (*QwinEventFilter) (MSG*);
 QwinEventFilter qt_set_win_event_filter (QwinEventFilter filter);
@@ -188,8 +182,6 @@
 char* getMsgName( UINT msgID );
 #endif
 
-static QTextCodec * input_mapper = 0;
-
 // mouse event handling
 static UINT WM95_MOUSEWHEEL = 0;
 
@@ -207,10 +199,6 @@
 #define WM_MOUSELEAVE                   0x02A3
 #endif
 
-int qt_ncols_option = 216;  // used in qcolor_x11.cpp
-int qt_visual_option = -1;
-bool qt_cmap_option = false;
-
 extern bool qt_is_gui_used; // qapplication.cpp
 
 extern void qt_dispatchEnterLeave( QWidget*, QWidget* ); // qapplication.cpp
@@ -634,19 +622,7 @@
             continue;
         }
         QString arg = QString( argv[ i ] ).lower();
-        if ( arg == "-fn" || arg == "-font" ) {
-            if ( ++i < argc )
-                appFont = argv[ i ];
-        } else if ( arg == "-bg" || arg == "-background" ) {
-            if ( ++i < argc )
-                appBGCol = argv[ i ];
-        } else if ( arg == "-btn" || arg == "-button" ) {
-            if ( ++i < argc )
-                appBTNCol = argv[ i ];
-        } else if ( arg == "-fg" || arg == "-foreground" ) {
-            if ( ++i < argc )
-                appFGCol = argv[ i ];
-        } else if ( arg == "-name" ) {
+        if ( arg == "-name" ) {
             if ( ++i < argc )
                 appName = argv[ i ];
         } else if ( arg == "-style" ) {
@@ -660,20 +636,6 @@
                 mwGeometry = argv[ i ];
         } else if ( arg == "-iconic" ) {
             mwIconic = !mwIconic;
-        } else if ( arg == "-ncols" ) {   // xv and netscape use this name
-            if ( ++i < argc )
-                qt_ncols_option = QMAX( 0, atoi( argv[ i ] ) );
-        } else if ( arg == "-visual" ) {  // xv and netscape use this name
-            if ( ++i < argc ) {
-                QCString s = QCString( argv[ i ] ).lower();
-                /*      if ( s == "truecolor" ) {
-                   qt_visual_option = TrueColor;
-                      } else {
-                   // ### Should we honor any others?
-                      }*/
-            }
-        } else if ( arg == "-cmap" ) {    // xv uses this name
-            qt_cmap_option = TRUE;
         }
 #if defined(DEBUG)
         else if ( arg == "-nograb" )