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 /tdm | |
parent | e8a1cdc01d38125bea12d5494db977ae6429919a (diff) | |
download | tdebase-8bd291c0e8a9d8b6eec6f5217e4d5c2f1fd06b96.tar.gz tdebase-8bd291c0e8a9d8b6eec6f5217e4d5c2f1fd06b96.zip |
Rename additional global functions and variables for tqt3
Diffstat (limited to 'tdm')
-rw-r--r-- | tdm/kfrontend/kfdialog.cpp | 4 | ||||
-rw-r--r-- | tdm/kfrontend/kgapp.cpp | 6 | ||||
-rw-r--r-- | tdm/kfrontend/kgverify.cpp | 2 | ||||
-rw-r--r-- | tdm/kfrontend/krootimage.cpp | 6 | ||||
-rw-r--r-- | tdm/kfrontend/sakdlg.cc | 4 |
5 files changed, 11 insertions, 11 deletions
diff --git a/tdm/kfrontend/kfdialog.cpp b/tdm/kfrontend/kfdialog.cpp index 98b5773c2..a2338cd67 100644 --- a/tdm/kfrontend/kfdialog.cpp +++ b/tdm/kfrontend/kfdialog.cpp @@ -47,8 +47,8 @@ FDialog::FDialog( TQWidget *parent, bool framed ) if (framed) { // Signal that we do not want any window controls to be shown at all Atom kde_wm_system_modal_notification; - kde_wm_system_modal_notification = XInternAtom(qt_xdisplay(), "_KDE_WM_MODAL_SYS_NOTIFICATION", False); - XChangeProperty(qt_xdisplay(), winId(), kde_wm_system_modal_notification, XA_INTEGER, 32, PropModeReplace, (unsigned char *) "TRUE", 1L); + kde_wm_system_modal_notification = XInternAtom(tqt_xdisplay(), "_KDE_WM_MODAL_SYS_NOTIFICATION", False); + XChangeProperty(tqt_xdisplay(), winId(), kde_wm_system_modal_notification, XA_INTEGER, 32, PropModeReplace, (unsigned char *) "TRUE", 1L); } if (framed) { diff --git a/tdm/kfrontend/kgapp.cpp b/tdm/kfrontend/kgapp.cpp index f6123891c..e35f16d0b 100644 --- a/tdm/kfrontend/kgapp.cpp +++ b/tdm/kfrontend/kgapp.cpp @@ -118,7 +118,7 @@ void GreeterApp::timerEvent( TQTimerEvent * ) { alarm( 0 ); - if (!PingServer( qt_xdisplay() )) + if (!PingServer( tqt_xdisplay() )) ::exit( EX_RESERVER_DPY ); alarm( pingInterval * 70 ); // sic! give the "proper" pinger enough time } @@ -259,7 +259,7 @@ kg_main( const char *argv0 ) TQString login_user; TQString login_session_wm; - Display *dpy = qt_xdisplay(); + Display *dpy = tqt_xdisplay(); if (!_GUIStyle.isEmpty()) app->setStyle( _GUIStyle ); @@ -466,7 +466,7 @@ kg_main( const char *argv0 ) UnsecureDisplay( dpy ); restore_modifiers(); - XSetInputFocus( qt_xdisplay(), PointerRoot, PointerRoot, CurrentTime ); + XSetInputFocus( tqt_xdisplay(), PointerRoot, PointerRoot, CurrentTime ); delete app; } diff --git a/tdm/kfrontend/kgverify.cpp b/tdm/kfrontend/kgverify.cpp index ec0bfae6c..5b65a0b5b 100644 --- a/tdm/kfrontend/kgverify.cpp +++ b/tdm/kfrontend/kgverify.cpp @@ -834,7 +834,7 @@ KGVerify::updateLockStatus() unsigned int lmask; Window dummy1, dummy2; int dummy3, dummy4, dummy5, dummy6; - XQueryPointer( qt_xdisplay(), DefaultRootWindow( qt_xdisplay() ), + XQueryPointer( tqt_xdisplay(), DefaultRootWindow( tqt_xdisplay() ), &dummy1, &dummy2, &dummy3, &dummy4, &dummy5, &dummy6, &lmask ); capsLocked = lmask & LockMask; diff --git a/tdm/kfrontend/krootimage.cpp b/tdm/kfrontend/krootimage.cpp index b51367485..8fac7d76a 100644 --- a/tdm/kfrontend/krootimage.cpp +++ b/tdm/kfrontend/krootimage.cpp @@ -59,7 +59,7 @@ MyApplication::MyApplication( const char *conf ) renderer.start(); if( !properties_inited ) { - prop_root = XInternAtom(qt_xdisplay(), "_XROOTPMAP_ID", False); + prop_root = XInternAtom(tqt_xdisplay(), "_XROOTPMAP_ID", False); properties_inited = true; } } @@ -77,7 +77,7 @@ MyApplication::renderDone() // ...and export it via Esetroot-style so that composition managers can use it! Pixmap bgPm = pm.handle(); // fetch the actual X handle to it - XChangeProperty(qt_xdisplay(), qt_xrootwin(), prop_root, XA_PIXMAP, 32, PropModeReplace, (unsigned char *) &bgPm, 1); + XChangeProperty(tqt_xdisplay(), tqt_xrootwin(), prop_root, XA_PIXMAP, 32, PropModeReplace, (unsigned char *) &bgPm, 1); renderer.saveCacheFile(); renderer.cleanup(); @@ -132,7 +132,7 @@ main( int argc, char *argv[] ) app.flushX(); // Keep color resources after termination - XSetCloseDownMode( qt_xdisplay(), RetainTemporary ); + XSetCloseDownMode( tqt_xdisplay(), RetainTemporary ); return 0; } diff --git a/tdm/kfrontend/sakdlg.cc b/tdm/kfrontend/sakdlg.cc index c1da24d6e..255e36567 100644 --- a/tdm/kfrontend/sakdlg.cc +++ b/tdm/kfrontend/sakdlg.cc @@ -91,8 +91,8 @@ SAKDlg::SAKDlg(TQWidget *parent) if (trinity_desktop_lock_use_system_modal_dialogs) { // Signal that we do not want any window controls to be shown at all Atom kde_wm_system_modal_notification; - kde_wm_system_modal_notification = XInternAtom(qt_xdisplay(), "_KDE_WM_MODAL_SYS_NOTIFICATION", False); - XChangeProperty(qt_xdisplay(), winId(), kde_wm_system_modal_notification, XA_INTEGER, 32, PropModeReplace, (unsigned char *) "TRUE", 1L); + kde_wm_system_modal_notification = XInternAtom(tqt_xdisplay(), "_KDE_WM_MODAL_SYS_NOTIFICATION", False); + XChangeProperty(tqt_xdisplay(), winId(), kde_wm_system_modal_notification, XA_INTEGER, 32, PropModeReplace, (unsigned char *) "TRUE", 1L); } setCaption(TDM_LOGIN_SCREEN_BASE_TITLE); |