Fixed unintentional renaming QT => TQT.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

7 files changed, 25 insertions, 25 deletions

diff --git a/kstars/kstars/indi/apogee/CameraIO_Linux.cpp b/kstars/kstars/indi/apogee/CameraIO_Linux.cpp
index 45c16e13..67d217ec 100644
--- a/kstars/kstars/indi/apogee/CameraIO_Linux.cpp
+++ b/kstars/kstars/indi/apogee/CameraIO_Linux.cpp
@@ -88,7 +88,7 @@ CCameraIO::CCameraIO()
 
 	m_FastShutterBits_Mode = 0;
 	m_FastShutterBits_Test = 0;
-        m_IRTQMask = 0;
+        m_IRQMask = 0;
         saveIRQS = 0;
 
 }
diff --git a/kstars/kstars/indi/apogee/CameraIO_Linux.h b/kstars/kstars/indi/apogee/CameraIO_Linux.h
index 47b08f43..cd2f07fc 100644
--- a/kstars/kstars/indi/apogee/CameraIO_Linux.h
+++ b/kstars/kstars/indi/apogee/CameraIO_Linux.h
@@ -357,7 +357,7 @@ public:
 										// 1 or CMOS: Complementary Metal-Oxide-Silicon
 
 	Camera_CoolerStatus m_CoolerStatus;		// Last known cooler status.
-	unsigned int m_IRTQMask;     	// Set of IRQs masked on user request										// 0: Off
+	unsigned int m_IRQMask;     	// Set of IRQs masked on user request										// 0: Off
 											// 1: Ramping to set point
 											// 2: Correcting
 											// 3: Ramping to ambient
diff --git a/kstars/kstars/indi/webcam/port.cpp b/kstars/kstars/indi/webcam/port.cpp
index 793f0959..d5b68d40 100644
--- a/kstars/kstars/indi/webcam/port.cpp
+++ b/kstars/kstars/indi/webcam/port.cpp
@@ -20,9 +20,9 @@
 // I/O ports wrapper code
 // This file might need tweaking if you're trying to port my code to other
 // x86 Unix platforms.  Code is already available for Linux, FreeBSD, and    
-// TQNX; see the Makefile.
+// QNX; see the Makefile.
 //
-// TQNX code by: Anders Arpteg <aa11ac@hik.se>
+// QNX code by: Anders Arpteg <aa11ac@hik.se>
 // FreeBSD code by: Patrick Reynolds <reynolds@cs.duke.edu> and Charles
 //                  Henrich <henrich@msu.edu>
 
@@ -43,7 +43,7 @@
   #else
   #include <sys/io.h>
   #endif /* arm */
-#elif defined(TQNX)
+#elif defined(QNX)
 #include <conio.h>
 #elif defined(__FreeBSD__)
 #include <sys/types.h>
diff --git a/kstars/kstars/indi/webcam/port.h b/kstars/kstars/indi/webcam/port.h
index 4009ec2a..70dd9d4d 100644
--- a/kstars/kstars/indi/webcam/port.h
+++ b/kstars/kstars/indi/webcam/port.h
@@ -20,9 +20,9 @@
 // I/O ports wrapper definitions and prototypes
 // This file might need tweaking if you're trying to port my code to other
 // x86 Unix platforms.  Code is already available for Linux, FreeBSD, and 
-// TQNX; see the Makefile.
+// QNX; see the Makefile.
 //
-// TQNX code by: Anders Arpteg <aa11ac@hik.se>
+// QNX code by: Anders Arpteg <aa11ac@hik.se>
 // FreeBSD code by: Patrick Reynolds <reynolds@cs.duke.edu> and Charles 
 //                  Henrich <henrich@msu.edu>
 // Inlining implemented by: Philip Blundell <philip.blundell@pobox.com>
@@ -38,7 +38,7 @@
   #if !defined(arm) && !defined(__aarch64__) && !defined(__hppa__) && !defined(__sparc__) && !defined(__ppc__) && !defined(__powerpc__) && !defined(__s390__) && !defined(__s390x__) && !defined(__mips__) && !defined(__mc68000__)
   #include <sys/io.h>
   #endif /* !arm */
-#elif defined(TQNX)
+#elif defined(QNX)
 #include <conio.h>
 #elif defined(__FreeBSD__)
 #include <machine/cpufunc.h>
@@ -90,7 +90,7 @@ public:
   inline void write_control(int data) { outb(control_reg = data, port2); }
   inline void setbit_control(int data) { outb(control_reg |= data, port2); }
   inline void clearbit_control(int data) { outb(control_reg &= ~data, port2); }
-#else // Solaris, TQNX, and *BSD use (port, data) instead
+#else // Solaris, QNX, and *BSD use (port, data) instead
   inline void write_data(int data) { outb(port, data); }
   inline void write_control(int data) { outb(port2, control_reg = data); }
   inline void setbit_control(int data) { outb(port2, control_reg |= data); }
diff --git a/kstars/kstars/indi/webcam/v4l2_base.cpp b/kstars/kstars/indi/webcam/v4l2_base.cpp
index ffb168ec..26ec3d51 100644
--- a/kstars/kstars/indi/webcam/v4l2_base.cpp
+++ b/kstars/kstars/indi/webcam/v4l2_base.cpp
@@ -168,7 +168,7 @@ int V4L2_Base::read_frame(char *errmsg)
             	buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
             	buf.memory = V4L2_MEMORY_MMAP;
 
-    		if (-1 == xioctl (fd, VIDIOC_DTQBUF, &buf)) {
+    		if (-1 == xioctl (fd, VIDIOC_DQBUF, &buf)) {
             		switch (errno) {
             		case EAGAIN:
                     		return 0;
@@ -179,7 +179,7 @@ int V4L2_Base::read_frame(char *errmsg)
 				/* fall through */
 
 			default:
-				return errno_exit ("VIDIOC_DTQBUF", errmsg);
+				return errno_exit ("VIDIOC_DQBUF", errmsg);
 			}
 		}
 
@@ -206,8 +206,8 @@ int V4L2_Base::read_frame(char *errmsg)
                          break;
                 }
 
-		if (-1 == xioctl (fd, VIDIOC_TQBUF, &buf))
-			return errno_exit ("VIDIOC_TQBUF", errmsg);
+		if (-1 == xioctl (fd, VIDIOC_QBUF, &buf))
+			return errno_exit ("VIDIOC_QBUF", errmsg);
                   
                 if (dropFrame)
                 {
@@ -227,7 +227,7 @@ int V4L2_Base::read_frame(char *errmsg)
     		buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
     		buf.memory = V4L2_MEMORY_USERPTR;
 
-		if (-1 == xioctl (fd, VIDIOC_DTQBUF, &buf)) {
+		if (-1 == xioctl (fd, VIDIOC_DQBUF, &buf)) {
 			switch (errno) {
 			case EAGAIN:
 				return 0;
@@ -238,7 +238,7 @@ int V4L2_Base::read_frame(char *errmsg)
 				/* fall through */
 
 			default:
-				errno_exit ("VIDIOC_DTQBUF", errmsg);
+				errno_exit ("VIDIOC_DQBUF", errmsg);
 			}
 		}
 
@@ -251,8 +251,8 @@ int V4L2_Base::read_frame(char *errmsg)
 
     		//process_image ((void *) buf.m.userptr);
 
-		if (-1 == xioctl (fd, VIDIOC_TQBUF, &buf))
-			errno_exit ("VIDIOC_TQBUF", errmsg);
+		if (-1 == xioctl (fd, VIDIOC_QBUF, &buf))
+			errno_exit ("VIDIOC_QBUF", errmsg);
 
 		break;
 	}
@@ -309,8 +309,8 @@ int V4L2_Base::start_capturing(char * errmsg)
         		buf.memory      = V4L2_MEMORY_MMAP;
         		buf.index       = i;
 
-        		if (-1 == xioctl (fd, VIDIOC_TQBUF, &buf))
-                    		return errno_exit ("VIDIOC_TQBUF", errmsg);
+        		if (-1 == xioctl (fd, VIDIOC_QBUF, &buf))
+                    		return errno_exit ("VIDIOC_QBUF", errmsg);
 
 		}
 		
@@ -336,8 +336,8 @@ int V4L2_Base::start_capturing(char * errmsg)
         		buf.m.userptr	= (unsigned long) buffers[i].start;
 			buf.length      = buffers[i].length;
 
-        		if (-1 == xioctl (fd, VIDIOC_TQBUF, &buf))
-                    		return errno_exit ("VIDIOC_TQBUF", errmsg);
+        		if (-1 == xioctl (fd, VIDIOC_QBUF, &buf))
+                    		return errno_exit ("VIDIOC_QBUF", errmsg);
 		}
 
 
diff --git a/kstars/kstars/indi/webcam/videodev.h b/kstars/kstars/indi/webcam/videodev.h
index a7929058..a5b0aec7 100644
--- a/kstars/kstars/indi/webcam/videodev.h
+++ b/kstars/kstars/indi/webcam/videodev.h
@@ -302,9 +302,9 @@ struct video_code
 
 
 #define VID_HARDWARE_BT848	1
-#define VID_HARDWARE_TQCAM_BW	2
+#define VID_HARDWARE_QCAM_BW	2
 #define VID_HARDWARE_PMS	3
-#define VID_HARDWARE_TQCAM_C	4
+#define VID_HARDWARE_QCAM_C	4
 #define VID_HARDWARE_PSEUDO	5
 #define VID_HARDWARE_SAA5249	6
 #define VID_HARDWARE_AZTECH	7
diff --git a/kstars/kstars/indi/webcam/videodev2.h b/kstars/kstars/indi/webcam/videodev2.h
index a82697b9..e3dab3a6 100644
--- a/kstars/kstars/indi/webcam/videodev2.h
+++ b/kstars/kstars/indi/webcam/videodev2.h
@@ -843,8 +843,8 @@ struct v4l2_streamparm
 #define VIDIOC_G_FBUF		_IOR  ('V', 10, struct v4l2_framebuffer)
 #define VIDIOC_S_FBUF		_IOW  ('V', 11, struct v4l2_framebuffer)
 #define VIDIOC_OVERLAY		_IOW  ('V', 14, int)
-#define VIDIOC_TQBUF		_IOWR ('V', 15, struct v4l2_buffer)
-#define VIDIOC_DTQBUF		_IOWR ('V', 17, struct v4l2_buffer)
+#define VIDIOC_QBUF		_IOWR ('V', 15, struct v4l2_buffer)
+#define VIDIOC_DQBUF		_IOWR ('V', 17, struct v4l2_buffer)
 #define VIDIOC_STREAMON		_IOW  ('V', 18, int)
 #define VIDIOC_STREAMOFF	_IOW  ('V', 19, int)
 #define VIDIOC_G_PARM		_IOWR ('V', 21, struct v4l2_streamparm)