summaryrefslogtreecommitdiffstats
path: root/libk3b/tools/libisofs
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-05-27 19:21:21 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-05-27 19:21:21 +0000
commitd8cc8bdfa7fa624a526d5aa1626974e1444cb799 (patch)
treef295f1c545b319963d5357af79fe08991d8141d9 /libk3b/tools/libisofs
parent2a39a080579fb52a2599c02b2939795385b89093 (diff)
downloadk3b-d8cc8bdfa7fa624a526d5aa1626974e1444cb799.tar.gz
k3b-d8cc8bdfa7fa624a526d5aa1626974e1444cb799.zip
TQt4 port k3b
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b@1233803 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'libk3b/tools/libisofs')
-rw-r--r--libk3b/tools/libisofs/COPYING4
-rw-r--r--libk3b/tools/libisofs/iso_fs.h4
-rw-r--r--libk3b/tools/libisofs/isofs.h4
3 files changed, 6 insertions, 6 deletions
diff --git a/libk3b/tools/libisofs/COPYING b/libk3b/tools/libisofs/COPYING
index 9fe1a71..3f277a2 100644
--- a/libk3b/tools/libisofs/COPYING
+++ b/libk3b/tools/libisofs/COPYING
@@ -59,7 +59,7 @@ modification follow.
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- 0. This License applies to any program or other work which contains
+ 0. This License applies to any program or other work which tqcontains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License. The "Program", below,
refers to any such program or work, and a "work based on the Program"
@@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following:
The source code for a work means the preferred form of the work for
making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
+code means all the source code for all modules it tqcontains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable. However, as a
special exception, the source code distributed need not include
diff --git a/libk3b/tools/libisofs/iso_fs.h b/libk3b/tools/libisofs/iso_fs.h
index 43353b0..b726b9f 100644
--- a/libk3b/tools/libisofs/iso_fs.h
+++ b/libk3b/tools/libisofs/iso_fs.h
@@ -131,13 +131,13 @@ struct hs_primary_descriptor {
char root_directory_record [ISODCL (181, 214)]; /* 9.1 */
};
-/* We use this to help us look up the parent inode numbers. */
+/* We use this to help us look up the tqparent inode numbers. */
struct iso_path_table{
char name_len[1]; /* 711 */
char ext_attr_length[1]; /* 711 */
char extent[4]; /* 731 */
- char parent[2]; /* 721 */
+ char tqparent[2]; /* 721 */
char name[1];
};
diff --git a/libk3b/tools/libisofs/isofs.h b/libk3b/tools/libisofs/isofs.h
index f284903..6f2fe2d 100644
--- a/libk3b/tools/libisofs/isofs.h
+++ b/libk3b/tools/libisofs/isofs.h
@@ -43,7 +43,7 @@ typedef struct _rr_entry {
int serno;
int dev_major;
int dev_minor;
- int pl; /* parent location */
+ int pl; /* tqparent location */
int cl; /* child location */
int re; /* relocated */
char z_algo[2]; /* zizofs algorithm */
@@ -60,7 +60,7 @@ typedef struct _iso_vol_desc {
typedef struct _boot_entry {
struct _boot_entry *next;
struct _boot_entry *prev;
- struct _boot_entry *parent;
+ struct _boot_entry *tqparent;
struct _boot_entry *child;
char data[32];
} boot_entry;