diff options
Diffstat (limited to 'src/gnudiff_diff.h')
| -rw-r--r-- | src/gnudiff_diff.h | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/gnudiff_diff.h b/src/gnudiff_diff.h index 930424e..1d54b7d 100644 --- a/src/gnudiff_diff.h +++ b/src/gnudiff_diff.h @@ -27,14 +27,14 @@ #include "gnudiff_system.h" #include <stdio.h> -#include <qstring.h> +#include <tqstring.h> #define TAB_WIDTH 8 class GnuDiff { public: -/* What kind of changes a hunk contains. */ +/* What kind of changes a hunk tqcontains. */ enum changes { /* No changes: lines common to both files. */ @@ -110,23 +110,23 @@ bool brief; bool expand_tabs; /* Use a tab in the output, rather than a space, before the text of an - input line, so as to keep the proper alignment in the input line + input line, so as to keep the proper tqalignment in the input line without changing the characters in it (-T). */ bool initial_tab; /* In directory comparison, specify file to start with (-S). This is used for resuming an aborted comparison. All file names less than this name are ignored. */ -const QChar *starting_file; +const TQChar *starting_file; /* Pipe each file's output through pr (-l). */ bool paginate; /* Line group formats for unchanged, old, new, and changed groups. */ -const QChar *group_format[CHANGED + 1]; +const TQChar *group_format[CHANGED + 1]; /* Line formats for unchanged, old, and new lines. */ -const QChar *line_format[NEW + 1]; +const TQChar *line_format[NEW + 1]; /* If using OUTPUT_SDIFF print extra information to help the sdiff filter. */ bool sdiff_merge_assist; @@ -180,9 +180,9 @@ struct change struct file_data { /* Buffer in which text of file is read. */ - const QChar* buffer; + const TQChar* buffer; - /* Allocated size of buffer, in QChars. Always a multiple of + /* Allocated size of buffer, in TQChars. Always a multiple of sizeof *buffer. */ size_t bufsize; @@ -190,7 +190,7 @@ struct file_data { size_t buffered; /* Array of pointers to lines in the file. */ - const QChar **linbuf; + const TQChar **linbuf; /* linbuf_base <= buffered_lines <= valid_lines <= alloc_lines. linebuf[linbuf_base ... buffered_lines - 1] are possibly differing. @@ -199,14 +199,14 @@ struct file_data { lin linbuf_base, buffered_lines, valid_lines, alloc_lines; /* Pointer to end of prefix of this file to ignore when hashing. */ - const QChar *prefix_end; + const TQChar *prefix_end; /* Count of lines in the prefix. There are this many lines in the file before linbuf[0]. */ lin prefix_lines; /* Pointer to start of suffix of this file to ignore when hashing. */ - const QChar *suffix_begin; + const TQChar *suffix_begin; /* Vector, indexed by line number, containing an equivalence code for each line. It is this vector that is actually compared with that @@ -242,7 +242,7 @@ struct file_data { struct comparison { struct file_data file[2]; - struct comparison const *parent; /* parent, if a recursive comparison */ + struct comparison const *tqparent; /* tqparent, if a recursive comparison */ }; /* Describe the two files currently being compared. */ @@ -263,7 +263,7 @@ void print_context_header (struct file_data[], bool); void print_context_script (struct change *, bool); /* dir.c */ -int diff_dirs (struct comparison const *, int (*) (struct comparison const *, const QChar *, const QChar *)); +int diff_dirs (struct comparison const *, int (*) (struct comparison const *, const TQChar *, const TQChar *)); /* ed.c */ void print_ed_script (struct change *); @@ -286,8 +286,8 @@ void print_rcs_script (struct change *); void print_sdiff_script (struct change *); /* util.c */ -QChar *concat (const QChar *, const QChar *, const QChar *); -bool lines_differ ( const QChar *, size_t, const QChar *, size_t ); +TQChar *concat (const TQChar *, const TQChar *, const TQChar *); +bool lines_differ ( const TQChar *, size_t, const TQChar *, size_t ); lin translate_line_number (struct file_data const *, lin); struct change *find_change (struct change *); struct change *find_reverse_change (struct change *); @@ -296,15 +296,15 @@ enum changes analyze_hunk (struct change *, lin *, lin *, lin *, lin *); void begin_output (void); void debug_script (struct change *); void finish_output (void); -void message (const QChar *, const QChar *, const QChar *); -void message5 (const QChar *, const QChar *, const QChar *, const QChar *, const QChar *); -void output_1_line (const QChar *, const QChar *, const QChar *, const QChar *); -void perror_with_name (const QChar *); -void setup_output (const QChar *, const QChar *, bool); +void message (const TQChar *, const TQChar *, const TQChar *); +void message5 (const TQChar *, const TQChar *, const TQChar *, const TQChar *, const TQChar *); +void output_1_line (const TQChar *, const TQChar *, const TQChar *, const TQChar *); +void perror_with_name (const TQChar *); +void setup_output (const TQChar *, const TQChar *, bool); void translate_range (struct file_data const *, lin, lin, long *, long *); /* version.c */ -//extern const QChar version_string[]; +//extern const TQChar version_string[]; private: // gnudiff_analyze.cpp @@ -325,7 +325,7 @@ private: void *xrealloc(void *p, size_t n); void xalloc_die (void); - inline bool isWhite( QChar c ) + inline bool isWhite( TQChar c ) { return c==' ' || c=='\t' || c=='\r'; } |