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

6 files changed, 16 insertions, 16 deletions

diff --git a/soundserver/artsshell.cc b/soundserver/artsshell.cc
index 59390c8..ebda656 100644
--- a/soundserver/artsshell.cc
+++ b/soundserver/artsshell.cc
@@ -254,7 +254,7 @@ int suspend(Arts::SoundServer server)
 // Display server status information
 void status(Arts::SoundServerV2 server)
 {
-	Arts::RealtimeStatus rtStatus = server.realtimeStatus();
+	Arts::RealtimetqStatus rttqStatus = server.realtimetqStatus();
 	long seconds = server.secondsUntilSuspend();
 
 	cout << "server status: ";
@@ -274,7 +274,7 @@ void status(Arts::SoundServerV2 server)
 	}
 
 	cout << "real-time status: ";
-	switch (rtStatus)
+	switch (rttqStatus)
 	{
 	  case Arts::rtRealtime:
 		  cout << "real-time" << endl;
diff --git a/soundserver/crashhandler.cc b/soundserver/crashhandler.cc
index 5864d89..441ef1d 100644
--- a/soundserver/crashhandler.cc
+++ b/soundserver/crashhandler.cc
@@ -65,27 +65,27 @@ CrashHandler::setCrashHandler (HandlerType handler)
   if (!handler)
     handler = SIG_DFL;
 
-  sigset_t mask;
-  sigemptyset(&mask);
+  sigset_t tqmask;
+  sigemptyset(&tqmask);
 
 #ifdef SIGSEGV
   signal (SIGSEGV, handler);
-  sigaddset(&mask, SIGSEGV);
+  sigaddset(&tqmask, SIGSEGV);
 #endif
 #ifdef SIGFPE
   signal (SIGFPE, handler);
-  sigaddset(&mask, SIGFPE);
+  sigaddset(&tqmask, SIGFPE);
 #endif
 #ifdef SIGILL
   signal (SIGILL, handler);
-  sigaddset(&mask, SIGILL);
+  sigaddset(&tqmask, SIGILL);
 #endif
 #ifdef SIGABRT
   signal (SIGABRT, handler);
-  sigaddset(&mask, SIGABRT);
+  sigaddset(&tqmask, SIGABRT);
 #endif
 
-  sigprocmask(SIG_UNBLOCK, &mask, 0);
+  sigprocmask(SIG_UNBLOCK, &tqmask, 0);
 
   _crashHandler = handler;
 }
diff --git a/soundserver/kmedia2.idl b/soundserver/kmedia2.idl
index cdcb101..ca17d67 100644
--- a/soundserver/kmedia2.idl
+++ b/soundserver/kmedia2.idl
@@ -1,6 +1,6 @@
 /*
 
-NEW KMedia2 layout:
+NEW KMedia2 tqlayout:
 ===================
 
 KMedia1 itself doesn't play anything. Instead it has a backend for every
@@ -47,7 +47,7 @@ enum poCapabilities {
 /**
  * KMedia2 time information
  *
- * This is a time value which contains either milliseconds & seconds, or
+ * This is a time value which tqcontains either milliseconds & seconds, or
  * a custom unit or both. It is a flexible time base.
  *
  * If a value isn't there, it is set to -1.
diff --git a/soundserver/soundserver.idl b/soundserver/soundserver.idl
index 7c2cc41..8cdc2d1 100644
--- a/soundserver/soundserver.idl
+++ b/soundserver/soundserver.idl
@@ -163,7 +163,7 @@ interface SimpleSoundServer : PlayObjectFactory
 	object createObject(string name);
 };
 
-enum RealtimeStatus { rtRealtime, rtNoSupport, rtNoWrapper, rtNoRealtime };
+enum RealtimetqStatus { rtRealtime, rtNoSupport, rtNoWrapper, rtNoRealtime };
 
 /**
  * This is an enhanced sound server interface which can be used to
@@ -171,7 +171,7 @@ enum RealtimeStatus { rtRealtime, rtNoSupport, rtNoWrapper, rtNoRealtime };
  */
 interface SoundServer : SimpleSoundServer
 {
-	readonly attribute RealtimeStatus realtimeStatus;
+	readonly attribute RealtimetqStatus realtimetqStatus;
 
 	/**
 	 * Returns how many seconds you have to wait _now_ for the soundserver
diff --git a/soundserver/soundserver_impl.cc b/soundserver/soundserver_impl.cc
index 7c84792..b922692 100644
--- a/soundserver/soundserver_impl.cc
+++ b/soundserver/soundserver_impl.cc
@@ -39,14 +39,14 @@ using namespace Arts;
 
 #ifdef HAVE_REALTIME_SCHED
 #include <sched.h>
-RealtimeStatus SoundServer_impl::realtimeStatus() {
+RealtimetqStatus SoundServer_impl::realtimetqStatus() {
 	int sched = sched_getscheduler(0);
 	if (sched == SCHED_FIFO || sched == SCHED_RR) return rtRealtime;
 	if (!getenv("STARTED_THROUGH_ARTSWRAPPER")) return rtNoWrapper;
 	return rtNoRealtime;
 }
 #else
-RealtimeStatus SoundServer_impl::realtimeStatus() {
+RealtimetqStatus SoundServer_impl::realtimetqStatus() {
 	return rtNoSupport;
 }
 #endif
diff --git a/soundserver/soundserver_impl.h b/soundserver/soundserver_impl.h
index 670b146..87ce72c 100644
--- a/soundserver/soundserver_impl.h
+++ b/soundserver/soundserver_impl.h
@@ -35,7 +35,7 @@ namespace Arts {
 	class SoundServer_impl : virtual public SoundServer_skel,
 							 public SimpleSoundServer_impl
 	{
-		RealtimeStatus realtimeStatus();
+		RealtimetqStatus realtimetqStatus();
 		long secondsUntilSuspend();
 		bool suspend();
 		bool suspended();