summaryrefslogtreecommitdiffstats
path: root/kxkb
diff options
context:
space:
mode:
Diffstat (limited to 'kxkb')
-rw-r--r--kxkb/extension.cpp2
-rw-r--r--kxkb/kcmmisc.cpp6
-rw-r--r--kxkb/layoutmap.cpp4
-rw-r--r--kxkb/rules.cpp2
4 files changed, 7 insertions, 7 deletions
diff --git a/kxkb/extension.cpp b/kxkb/extension.cpp
index 3817a8c4c..da1282b12 100644
--- a/kxkb/extension.cpp
+++ b/kxkb/extension.cpp
@@ -38,7 +38,7 @@ TQString XKBExtension::getPrecompiledLayoutFilename(const TQString& layoutKey)
XKBExtension::XKBExtension(Display *d)
{
if ( d == NULL )
- d = qt_xdisplay();
+ d = tqt_xdisplay();
m_dpy = d;
// TQStringList dirs = KGlobal::dirs()->findDirs ( "tmp", "" );
diff --git a/kxkb/kcmmisc.cpp b/kxkb/kcmmisc.cpp
index 8850d8906..14fdb2049 100644
--- a/kxkb/kcmmisc.cpp
+++ b/kxkb/kcmmisc.cpp
@@ -274,7 +274,7 @@ DEALINGS IN THE SOFTWARE.
#if defined(HAVE_XTEST) || defined(HAVE_XKB)
-Display* dpy = qt_xdisplay();
+Display* dpy = tqt_xdisplay();
/* the XKB stuff is based on code created by Oswald Buddenhagen <ossi@kde.org> */
#ifdef HAVE_XKB
@@ -487,7 +487,7 @@ void numlockx_change_numlock_state( bool ) {} // dummy
#include <X11/extensions/xf86misc.h>
void set_repeatrate(int delay, double rate)
{
- Display* dpy = qt_xdisplay();
+ Display* dpy = tqt_xdisplay();
XF86MiscKbdSettings values;
XF86MiscGetKbdSettings(dpy, &values);
@@ -500,7 +500,7 @@ void set_repeatrate(int delay, double rate)
void set_repeatrate(int delay, double rate)
{
#if HAVE_XKB
- Display* dpy = qt_xdisplay();
+ Display* dpy = tqt_xdisplay();
int xkbmajor = XkbMajorVersion, xkbminor = XkbMinorVersion;
int xkbopcode, xkbevent, xkberror;
diff --git a/kxkb/layoutmap.cpp b/kxkb/layoutmap.cpp
index 9c13fc49b..106f70950 100644
--- a/kxkb/layoutmap.cpp
+++ b/kxkb/layoutmap.cpp
@@ -42,7 +42,7 @@ void LayoutMap::setCurrentWindow(WId winId)
{
m_currentWinId = winId;
if( m_kxkbConfig.m_switchingPolicy == SWITCH_POLICY_WIN_CLASS )
- m_currentWinClass = X11Helper::getWindowClass(winId, qt_xdisplay());
+ m_currentWinClass = X11Helper::getWindowClass(winId, tqt_xdisplay());
}
// private
@@ -54,7 +54,7 @@ TQPtrQueue<LayoutState>& LayoutMap::getCurrentLayoutQueueInternal(WId winId)
switch( m_kxkbConfig.m_switchingPolicy ) {
case SWITCH_POLICY_WIN_CLASS: {
-// TQString winClass = X11Helper::getWindowClass(winId, qt_xdisplay());
+// TQString winClass = X11Helper::getWindowClass(winId, tqt_xdisplay());
return m_appLayouts[ m_currentWinClass ];
}
case SWITCH_POLICY_WINDOW:
diff --git a/kxkb/rules.cpp b/kxkb/rules.cpp
index 685c701fd..28d8f687c 100644
--- a/kxkb/rules.cpp
+++ b/kxkb/rules.cpp
@@ -26,7 +26,7 @@ XkbRules::XkbRules(bool layoutsOnly):
return;
}
- TQString rulesFile = X11Helper::findXkbRulesFile(X11_DIR, qt_xdisplay());
+ TQString rulesFile = X11Helper::findXkbRulesFile(X11_DIR, tqt_xdisplay());
if( rulesFile.isEmpty() ) {
kdError() << "Cannot find rules file in " << X11_DIR << endl;