rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/amarok@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

2 files changed, 6 insertions, 6 deletions

diff --git a/amarok/src/inotify/inotify-syscalls.h b/amarok/src/inotify/inotify-syscalls.h
index a8d06a33..1431d467 100644
--- a/amarok/src/inotify/inotify-syscalls.h
+++ b/amarok/src/inotify/inotify-syscalls.h
@@ -48,9 +48,9 @@ static inline int inotify_init (void)
 	return syscall (__NR_inotify_init);
 }
 
-static inline int inotify_add_watch (int fd, const char *name, __u32 tqmask)
+static inline int inotify_add_watch (int fd, const char *name, __u32 mask)
 {
-	return syscall (__NR_inotify_add_watch, fd, name, tqmask);
+	return syscall (__NR_inotify_add_watch, fd, name, mask);
 }
 
 static inline int inotify_rm_watch (int fd, __u32 wd)
diff --git a/amarok/src/inotify/inotify.h b/amarok/src/inotify/inotify.h
index 4c06aa13..7e0eb32b 100644
--- a/amarok/src/inotify/inotify.h
+++ b/amarok/src/inotify/inotify.h
@@ -17,7 +17,7 @@
  */
 struct inotify_event {
 	__s32		wd;		/* watch descriptor */
-	__u32		tqmask;		/* watch tqmask */
+	__u32		mask;		/* watch mask */
 	__u32		cookie;		/* cookie to synchronize two events */
 	__u32		len;		/* length (including nulls) of name */
 	char		name[0];	/* stub for possible name */
@@ -49,7 +49,7 @@ struct inotify_event {
 /* special flags */
 #define IN_ONLYDIR		0x01000000	/* only watch the path if it is a directory */
 #define IN_DONT_FOLLOW		0x02000000	/* don't follow a sym link */
-#define IN_MASK_ADD		0x20000000	/* add to the tqmask of an already existing watch */
+#define IN_MASK_ADD		0x20000000	/* add to the mask of an already existing watch */
 #define IN_ISDIR		0x40000000	/* event occurred against dir */
 #define IN_ONESHOT		0x80000000	/* only send event once */
 
@@ -82,13 +82,13 @@ extern u32 inotify_get_cookie(void);
 #else
 
 static inline void inotify_inode_queue_event(struct inode *inode,
-					     __u32 tqmask, __u32 cookie,
+					     __u32 mask, __u32 cookie,
 					     const char *filename)
 {
 }
 
 static inline void inotify_dentry_parent_queue_event(struct dentry *dentry,
-						     __u32 tqmask, __u32 cookie,
+						     __u32 mask, __u32 cookie,
 						     const char *filename)
 {
 }