diff options
| author | Timothy Pearson <[email protected]> | 2012-03-02 02:13:02 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2012-03-02 02:13:02 -0600 |
| commit | 8bd291c0e8a9d8b6eec6f5217e4d5c2f1fd06b96 (patch) | |
| tree | bf71d4bfa94d0561e80456400ae5fe2bb501fbd8 /konsole | |
| parent | e8a1cdc01d38125bea12d5494db977ae6429919a (diff) | |
| download | tdebase-8bd291c0e8a9d8b6eec6f5217e4d5c2f1fd06b96.tar.gz tdebase-8bd291c0e8a9d8b6eec6f5217e4d5c2f1fd06b96.zip | |
Rename additional global functions and variables for tqt3
Diffstat (limited to 'konsole')
| -rw-r--r-- | konsole/konsole/TEmuVt102.cpp | 12 | ||||
| -rw-r--r-- | konsole/konsole/konsole.cpp | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/konsole/konsole/TEmuVt102.cpp b/konsole/konsole/TEmuVt102.cpp index e8ee73b64..76772ab7f 100644 --- a/konsole/konsole/TEmuVt102.cpp +++ b/konsole/konsole/TEmuVt102.cpp @@ -1321,7 +1321,7 @@ static int xkb_init() int xkb_lmaj = XkbMajorVersion; int xkb_lmin = XkbMinorVersion; return XkbLibraryVersion( &xkb_lmaj, &xkb_lmin ) - && XkbQueryExtension( qt_xdisplay(), &xkb_opcode, &xkb_event, &xkb_error, + && XkbQueryExtension( tqt_xdisplay(), &xkb_opcode, &xkb_event, &xkb_error, &xkb_lmaj, &xkb_lmin ); } @@ -1355,7 +1355,7 @@ static unsigned int xkb_mask_modifier( XkbDescPtr xkb, const char *name ) static unsigned int xkb_scrolllock_mask() { XkbDescPtr xkb; - if(( xkb = XkbGetKeyboard( qt_xdisplay(), XkbAllComponentsMask, XkbUseCoreKbd )) != NULL ) + if(( xkb = XkbGetKeyboard( tqt_xdisplay(), XkbAllComponentsMask, XkbUseCoreKbd )) != NULL ) { unsigned int mask = xkb_mask_modifier( xkb, "ScrollLock" ); XkbFreeKeyboard( xkb, 0, True ); @@ -1368,8 +1368,8 @@ static unsigned int xkb_scrolllock_mask() static unsigned int xkb_scrolllock_mask() { int scrolllock_mask = 0; - XModifierKeymap* map = XGetModifierMapping( qt_xdisplay() ); - KeyCode scrolllock_keycode = XKeysymToKeycode( qt_xdisplay(), XK_Scroll_Lock ); + XModifierKeymap* map = XGetModifierMapping( tqt_xdisplay() ); + KeyCode scrolllock_keycode = XKeysymToKeycode( tqt_xdisplay(), XK_Scroll_Lock ); if( scrolllock_keycode == NoSymbol ) { XFreeModifiermap(map); return 0; @@ -1400,7 +1400,7 @@ static int xkb_set_on() if( scrolllock_mask == 0 ) return 0; } - XkbLockModifiers ( qt_xdisplay(), XkbUseCoreKbd, scrolllock_mask, scrolllock_mask); + XkbLockModifiers ( tqt_xdisplay(), XkbUseCoreKbd, scrolllock_mask, scrolllock_mask); return 1; } @@ -1414,7 +1414,7 @@ static int xkb_set_off() if( scrolllock_mask == 0 ) return 0; } - XkbLockModifiers ( qt_xdisplay(), XkbUseCoreKbd, scrolllock_mask, 0); + XkbLockModifiers ( tqt_xdisplay(), XkbUseCoreKbd, scrolllock_mask, 0); return 1; } diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp index cb60e228e..87ad18e20 100644 --- a/konsole/konsole/konsole.cpp +++ b/konsole/konsole/konsole.cpp @@ -350,8 +350,8 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo // Signal that we want to be transparent to the desktop, not to windows behind us... Atom kde_wm_transparent_to_desktop; - kde_wm_transparent_to_desktop = XInternAtom(qt_xdisplay(), "_KDE_TRANSPARENT_TO_DESKTOP", False); - XChangeProperty(qt_xdisplay(), winId(), kde_wm_transparent_to_desktop, XA_INTEGER, 32, PropModeReplace, (unsigned char *) "TRUE", 1L); + kde_wm_transparent_to_desktop = XInternAtom(tqt_xdisplay(), "_KDE_TRANSPARENT_TO_DESKTOP", False); + XChangeProperty(tqt_xdisplay(), winId(), kde_wm_transparent_to_desktop, XA_INTEGER, 32, PropModeReplace, (unsigned char *) "TRUE", 1L); } |