diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-03-02 02:07:20 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-03-02 02:07:20 -0600 |
| commit | 8e79845b532c15533f5b3915124fe7b941162f15 (patch) | |
| tree | e25bf4a27cddd594cf28d9dccfb8703bb57685a0 | |
| parent | 10f31d618a018cfccf21366f6fd1787d161c23d8 (diff) | |
| download | twin-style-crystal-8e79845b.tar.gz twin-style-crystal-8e79845b.zip | |
Rename additional global functions and variables for tqt3
| -rw-r--r-- | client/crystalclient.cc | 10 | ||||
| -rw-r--r-- | client/myrootpixmap.cc | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/client/crystalclient.cc b/client/crystalclient.cc index 1b7d74a..4bb10d5 100644 --- a/client/crystalclient.cc +++ b/client/crystalclient.cc @@ -864,8 +864,8 @@ bool CrystalClient::isModalSystemNotification() int format, result; unsigned long n, left; Atom kde_wm_system_modal_notification; - kde_wm_system_modal_notification = XInternAtom(qt_xdisplay(), "_KDE_WM_MODAL_SYS_NOTIFICATION", False); - result = XGetWindowProperty(qt_xdisplay(), windowId(), kde_wm_system_modal_notification, 0L, 1L, False, XA_CARDINAL, &actual, &format, &n, &left, /*(unsigned char **)*/ &data); + kde_wm_system_modal_notification = XInternAtom(tqt_xdisplay(), "_KDE_WM_MODAL_SYS_NOTIFICATION", False); + result = XGetWindowProperty(tqt_xdisplay(), windowId(), kde_wm_system_modal_notification, 0L, 1L, False, XA_CARDINAL, &actual, &format, &n, &left, /*(unsigned char **)*/ &data); if (result == Success && data != None && format == 32 ) { return TRUE; @@ -1176,13 +1176,13 @@ void CrystalClient::ClientWindows(Window* v_frame,Window* v_wrapper,Window *v_cl if (v_wrapper) *v_wrapper=0; if (v_client) *v_client=0; // Our Deco is the child of a frame, get our parent - if (XQueryTree(qt_xdisplay(),widget()->winId(),&root,&frame,&children,&numc) == 0) + if (XQueryTree(tqt_xdisplay(),widget()->winId(),&root,&frame,&children,&numc) == 0) return; if (children!=NULL)XFree(children); children=NULL; // frame has two children, us and a wrapper, get the wrapper - if (XQueryTree(qt_xdisplay(),frame,&root,&parent,&children,&numc)==0) + if (XQueryTree(tqt_xdisplay(),frame,&root,&parent,&children,&numc)==0) return; for (uint i=0;i<numc;i++) @@ -1193,7 +1193,7 @@ void CrystalClient::ClientWindows(Window* v_frame,Window* v_wrapper,Window *v_cl children=NULL; // wrapper has only one child, which is the client. We want this!! - if (XQueryTree(qt_xdisplay(),wrapper,&root,&parent,&children,&numc)==0) + if (XQueryTree(tqt_xdisplay(),wrapper,&root,&parent,&children,&numc)==0) return; if (numc==1)client=children[0]; if (children!=NULL)XFree(children); diff --git a/client/myrootpixmap.cc b/client/myrootpixmap.cc index d986076..b06fec1 100644 --- a/client/myrootpixmap.cc +++ b/client/myrootpixmap.cc @@ -71,7 +71,7 @@ KMyRootPixmap::~KMyRootPixmap() int KMyRootPixmap::currentDesktop() const { - NETRootInfo rinfo( qt_xdisplay(), NET::CurrentDesktop ); + NETRootInfo rinfo( tqt_xdisplay(), NET::CurrentDesktop ); rinfo.activate(); return rinfo.currentDesktop(); } @@ -125,7 +125,7 @@ bool KMyRootPixmap::isAvailable() TQString KMyRootPixmap::pixmapName(int desk) { TQString pattern = TQString("DESKTOP%1"); - int screen_number = DefaultScreen(qt_xdisplay()); + int screen_number = DefaultScreen(tqt_xdisplay()); if (screen_number) { pattern = TQString("SCREEN%1-DESKTOP").arg(screen_number) + "%1"; } @@ -144,7 +144,7 @@ void KMyRootPixmap::enableExports() args << 1; TQCString appname( "kdesktop" ); - int screen_number = DefaultScreen(qt_xdisplay()); + int screen_number = DefaultScreen(tqt_xdisplay()); if ( screen_number ) appname.sprintf("kdesktop-screen-%d", screen_number ); |