Initial TQt conversion

1 files changed, 9 insertions, 9 deletions

diff --git a/kkbswitch/xkeyboard.cpp b/kkbswitch/xkeyboard.cpp
index 085abbf..ff3b5cd 100644
--- a/kkbswitch/xkeyboard.cpp
+++ b/kkbswitch/xkeyboard.cpp
@@ -17,8 +17,8 @@
 
 #include "xkeyboard.h"
 
-#include <qwindowdefs.h>
-#include <qstringlist.h>
+#include <ntqwindowdefs.h>
+#include <ntqstringlist.h>
 
 #include <kdebug.h>
 #include <klocale.h>
@@ -27,7 +27,7 @@ XKeyboard *XKeyboard::m_self = 0;
 
 XKeyboard::XKeyboard()
 {
-  Display *display = qt_xdisplay();
+  Display *display = tqt_xdisplay();
 #ifdef HAVE_LIBXKLAVIER
 //  XklSetDebugLevel(0);
   XklSetLogAppender(XklLogAppender);
@@ -102,7 +102,7 @@ void XKeyboard::setGroupNo(int groupno){
 #ifdef HAVE_LIBXKLAVIER
   XklLockGroup(groupno);
 #else
-  XkbLockGroup(qt_xdisplay(), XkbUseCoreKbd, groupno);
+  XkbLockGroup(tqt_xdisplay(), XkbUseCoreKbd, groupno);
 #endif  
 }
 
@@ -115,7 +115,7 @@ extern "C" {
 #endif
 
 /** Get the names of the currently configured keyboard groups */
-void XKeyboard::getGroupNames(QStringList &list){
+void XKeyboard::getGroupNames(TQStringList &list){
 #ifdef HAVE_LIBXKLAVIER
   const char** groupnames = XklGetGroupNames();
   int numgroups = XklGetNumGroups();
@@ -123,7 +123,7 @@ void XKeyboard::getGroupNames(QStringList &list){
     list.append(groupnames[i]);
 #else
   XkbDescRec xkb;
-  Display *display = qt_xdisplay();
+  Display *display = tqt_xdisplay();
   char *names[XkbNumKbdGroups];
 
   memset(&xkb, 0, sizeof(xkb));
@@ -142,7 +142,7 @@ void XKeyboard::getGroupNames(QStringList &list){
       list.append(names[i]);
       XFree(names[i]);
     }
-    else list.append(QString::null);
+    else list.append(TQString::null);
   }
   XkbFreeNames(&xkb, XkbGroupNamesMask, 1);
 #endif  
@@ -159,7 +159,7 @@ int XKeyboard::getGroupNo(){
   return XklGetCurrentState()->group;
 #else
   XkbStateRec rec;
-  XkbGetState(qt_xdisplay(), XkbUseCoreKbd, &rec);
+  XkbGetState(tqt_xdisplay(), XkbUseCoreKbd, &rec);
   return (int) rec.group;
 #endif  
 }
@@ -191,7 +191,7 @@ void XKeyboard::retrieveNumKbdGroups(){
   it returns BadImplementation status code, and you have to specify
   xkb.device_spec = XkbUseCoreKbd. */
   xkb.device_spec = XkbUseCoreKbd;
-  XkbGetControls(qt_xdisplay(), XkbGroupsWrapMask, &xkb);
+  XkbGetControls(tqt_xdisplay(), XkbGroupsWrapMask, &xkb);
   m_numgroups = xkb.ctrls->num_groups;
   XkbFreeControls(&xkb, XkbGroupsWrapMask, 1);
 }