summaryrefslogtreecommitdiff
blob: 1237ba72378dcd08429b5327b78a216940d661d0 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
--- avifile-0.6.0-20011109/samples/qtvidcap/parsecl.h~	Mon Apr  9 16:17:03 2001
+++ avifile-0.6.0-20011109/samples/qtvidcap/parsecl.h	Mon Nov 12 15:38:09 2001
@@ -25,7 +25,7 @@
 #include <qlist.h>
 #include <qstrlist.h>
 
-struct option
+struct option2
 {
   QString olong, oshort;
   QString options, help;
@@ -53,7 +53,7 @@
 
   QStrList * list;
 
-  QList<option> * oplist;
+  QList<option2> * oplist;
 };
 
 #endif
--- avifile-0.6.0-20011109/samples/qtvidcap/parsecl.cpp~	Sat Sep 29 19:08:47 2001
+++ avifile-0.6.0-20011109/samples/qtvidcap/parsecl.cpp	Mon Nov 12 15:38:58 2001
@@ -37,7 +37,7 @@
   argv=_argv;
 
   list= new QStrList; // do deep copies
-  oplist= new QList<option>;
+  oplist= new QList<option2>;
 }
 
 parsecl::~parsecl()
@@ -94,7 +94,7 @@
 	QString outstr;
 
 	fprintf(stderr,"usage: kWinTV [options]\noptions:\n");
-	option *op= oplist->first();
+	option2 *op= oplist->first();
 	while( op ) {
 	  outstr.remove( 0, outstr.length() );
 	  outstr+=op->oshort;
@@ -139,7 +139,7 @@
 bool parsecl::addOption( int oid, const char * oshort, const char * olong, 
 			 const char * options, const char * help )
 {
-  option *op;
+  option2 *op;
   if ( !oplist->isEmpty() ) {
     op= oplist->first();
     while( op ) {
@@ -152,7 +152,7 @@
     }
   }
 
-  op= new option;
+  op= new option2;
   op->oshort= oshort;
   op->olong= olong;
   op->options= options;
@@ -169,7 +169,7 @@
   debug("parsecl: checkOptionBool %d, default %d",oid,odefault);
 #endif
   if ( !oplist->isEmpty() ) {
-    option *op= oplist->first();
+    option2 *op= oplist->first();
     while( op ) {
       if ( ( op->oid == oid ) ) break;
       op= oplist->next();
@@ -188,7 +188,7 @@
   debug("parsecl: checkOptionInt  %d, default %d",oid,odefault);
 #endif
   if ( !oplist->isEmpty() ) {
-    option *op= oplist->first();
+    option2 *op= oplist->first();
     while( op ) {
       if ( ( op->oid == oid ) ) break;
       op= oplist->next();
@@ -218,7 +218,7 @@
   debug("parsecl: checkOptionBool %d, default %s",oid,odefault);
 #endif
   if ( !oplist->isEmpty() ) {
-    option *op= oplist->first();
+    option2 *op= oplist->first();
     while( op ) {
       if ( ( op->oid == oid ) ) break;
       op= oplist->next();
@@ -236,7 +236,7 @@
   debug("parsecl: checkOptionSwitch %d, default %d",oid,odefault);
 #endif
   if ( !oplist->isEmpty() ) {
-    option *op= oplist->first();
+    option2 *op= oplist->first();
     while( op ) {
       if ( ( op->oid == oid ) ) break;
       op= oplist->next();