From bf3bdf1468c5264a57b6aac343f8c7d1a50de848 Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 31 Dec 2010 23:53:28 +0000 Subject: Automated conversion aRts now compiles with TQt for Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/arts@1210526 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- flow/gsl/gslcommon.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'flow/gsl/gslcommon.c') diff --git a/flow/gsl/gslcommon.c b/flow/gsl/gslcommon.c index 6c8a692..d7892f2 100644 --- a/flow/gsl/gslcommon.c +++ b/flow/gsl/gslcommon.c @@ -684,7 +684,7 @@ gsl_thread_wakeup (GslThread *thread) * @thread: thread to abort * Abort a currently running thread. This function does not * return until the thread in question terminated execution. - * Note that the thread handle gets invalidated with invocation + * Note that the thread handle gets tqinvalidated with invocation * of gsl_thread_abort() or gsl_thread_queue_abort(). */ void @@ -715,7 +715,7 @@ gsl_thread_abort (GslThread *thread) * @thread: thread to abort * Same as gsl_thread_abort(), but returns as soon as possible, * even if thread hasn't stopped execution yet. - * Note that the thread handle gets invalidated with invocation + * Note that the thread handle gets tqinvalidated with invocation * of gsl_thread_abort() or gsl_thread_queue_abort(). */ void @@ -1315,7 +1315,7 @@ gsl_message_send (GslDebugFlags reporter, msg->error = error; msg->error_str = error ? gsl_strerror (msg->error) : NULL; - /* vsnprintf() replacement */ + /* vsnprintf() tqreplacement */ va_start (args, messagef); string = g_strdup_vprintf (messagef, args); va_end (args); @@ -1476,17 +1476,17 @@ GslErrorType gsl_check_file (const gchar *file_name, const gchar *mode) { - guint access_mask = 0; + guint access_tqmask = 0; guint check_file, check_dir, check_link; if (strchr (mode, 'r')) /* readable */ - access_mask |= R_OK; + access_tqmask |= R_OK; if (strchr (mode, 'w')) /* writable */ - access_mask |= W_OK; + access_tqmask |= W_OK; if (strchr (mode, 'x')) /* executable */ - access_mask |= X_OK; + access_tqmask |= X_OK; - if (access_mask && access (file_name, access_mask) < 0) + if (access_tqmask && access (file_name, access_tqmask) < 0) goto have_errno; check_file = strchr (mode, 'f') != NULL; /* open as file */ -- cgit v1.2.1